From 7a31d093563fa9f152245f6fcb16f0025706a363 Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Thu, 17 Aug 2023 12:49:06 -0600
Subject: [PATCH 001/341] feature: Include the start init files.

This includes the docker commands to get things compressed.
And this is the start of the rpc, but needs lots of work, or very little, not sure yet anymore.
I beleive that the things that are missing are the rpc, and the effects. So, lots of work, but is still good to have I suppose.
---
 libs/start_init/.gitignore                |    6 +
 libs/start_init/initSrc/CallbackHolder.ts |   22 +
 libs/start_init/initSrc/Effects.ts        |  184 ++
 libs/start_init/initSrc/Runtime.ts        |  174 ++
 libs/start_init/initSrc/index.ts          |   35 +
 libs/start_init/package-lock.json         | 2782 +++++++++++++++++++++
 libs/start_init/package.json              |   36 +
 libs/start_init/readme.md                 |   86 +
 libs/start_init/tsconfig.json             |   26 +
 9 files changed, 3351 insertions(+)
 create mode 100644 libs/start_init/.gitignore
 create mode 100644 libs/start_init/initSrc/CallbackHolder.ts
 create mode 100644 libs/start_init/initSrc/Effects.ts
 create mode 100644 libs/start_init/initSrc/Runtime.ts
 create mode 100644 libs/start_init/initSrc/index.ts
 create mode 100644 libs/start_init/package-lock.json
 create mode 100644 libs/start_init/package.json
 create mode 100644 libs/start_init/readme.md
 create mode 100644 libs/start_init/tsconfig.json

diff --git a/libs/start_init/.gitignore b/libs/start_init/.gitignore
new file mode 100644
index 000000000..e1584097d
--- /dev/null
+++ b/libs/start_init/.gitignore
@@ -0,0 +1,6 @@
+node_modules/
+dist/
+bundle.js
+startInit.js
+service/
+service.js
\ No newline at end of file
diff --git a/libs/start_init/initSrc/CallbackHolder.ts b/libs/start_init/initSrc/CallbackHolder.ts
new file mode 100644
index 000000000..16d4ac264
--- /dev/null
+++ b/libs/start_init/initSrc/CallbackHolder.ts
@@ -0,0 +1,22 @@
+
+
+export class CallbackHolder {
+    constructor() {
+
+    }
+    private root = (Math.random() + 1).toString(36).substring(7);
+    private inc = 0
+    private callbacks = new Map<string, Function>()
+    private newId() {
+        return this.root + (this.inc++).toString(36)
+    }
+    addCallback(callback: Function) {
+        return this.callbacks.set(this.newId(), callback);
+    }
+    callCallback(index: string, args: any[]): Promise<unknown> {
+        const callback = this.callbacks.get(index)
+        if (!callback) throw new Error(`Callback ${index} does not exist`)        
+        this.callbacks.delete(index)
+        return Promise.resolve().then(() => callback(...args))
+    }
+}
\ No newline at end of file
diff --git a/libs/start_init/initSrc/Effects.ts b/libs/start_init/initSrc/Effects.ts
new file mode 100644
index 000000000..13eb9ce0d
--- /dev/null
+++ b/libs/start_init/initSrc/Effects.ts
@@ -0,0 +1,184 @@
+import * as T from "@start9labs/start-sdk/lib/types"
+import * as net from "net"
+import { CallbackHolder } from "./CallbackHolder"
+
+const path = "/start9/sockets/rpcOut.sock"
+const MAIN = "main" as const
+export class Effects implements T.Effects {
+  constructor(readonly method: string, readonly callbackHolder: CallbackHolder) {}
+  id = 0
+  rpcRound(method: string, params: unknown) {
+    const id = this.id++;
+    const client = net.createConnection(path, () => {
+        client.write(JSON.stringify({
+          id,
+          method,
+          params
+        }));
+    });
+    return new Promise((resolve, reject) => {
+      client.on('data', (data) => {
+        try {
+          resolve(JSON.parse(data.toString())?.result)
+        } catch (error) {
+          reject(error)
+        }
+        client.end();
+      });
+    })
+  }
+  started= this.method !== MAIN ? null : ()=> {
+    return this.rpcRound('started', null)
+  }
+  bind(...[options]: Parameters<T.Effects["bind"]>) {
+    return this.rpcRound('bind', (options)) as ReturnType<T.Effects["bind"]>
+  }
+  clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
+    return this.rpcRound('clearBindings', null) as ReturnType<T.Effects["clearBindings"]>
+  }
+  clearNetworkInterfaces(
+    ...[]: Parameters<T.Effects["clearNetworkInterfaces"]>
+  ) {
+    return this.rpcRound('clearNetworkInterfaces', null) as ReturnType<T.Effects["clearNetworkInterfaces"]>
+  }
+  executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
+    return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
+  }
+  exists(...[packageId]: Parameters<T.Effects["exists"]>) {
+    return this.rpcRound('exists', packageId) as ReturnType<T.Effects["exists"]>
+  }
+  exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
+    return this.rpcRound('exportAction', (options)) as ReturnType<T.Effects["exportAction"]>
+  }
+  exportNetworkInterface(
+    ...[options]: Parameters<T.Effects["exportNetworkInterface"]>
+  ) {
+    return this.rpcRound('exportNetworkInterface', (options)) as ReturnType<T.Effects["exportNetworkInterface"]>
+  }
+  exposeForDependents(...[options]: any) {
+    
+    return this.rpcRound('exposeForDependents', (null)) as ReturnType<T.Effects["exposeForDependents"]>
+  }
+  exposeUi(...[options]: Parameters<T.Effects["exposeUi"]>) {
+    
+    return this.rpcRound('exposeUi', (options)) as ReturnType<T.Effects["exposeUi"]>
+  }
+  getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
+    
+    return this.rpcRound('getConfigured',null) as ReturnType<T.Effects["getConfigured"]>
+  }
+  getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
+    
+    return this.rpcRound('getContainerIp', null) as ReturnType<T.Effects["getContainerIp"]>
+  }
+  getHostnames: any = (...[allOptions]: any[]) => {
+    const options = {
+      ...allOptions,
+      callback: this.callbackHolder.addCallback(allOptions.callback)
+    }
+    return this.rpcRound('getHostnames', options) as ReturnType<T.Effects["getHostnames"]>
+  }
+  getInterface(...[options]: Parameters<T.Effects["getInterface"]>) {
+    
+    return this.rpcRound('getInterface', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["getInterface"]>
+  }
+  getIPHostname(...[]: Parameters<T.Effects["getIPHostname"]>) {
+    
+    return this.rpcRound('getIPHostname', (null)) as ReturnType<T.Effects["getIPHostname"]>
+  }
+  getLocalHostname(...[]: Parameters<T.Effects["getLocalHostname"]>) {
+    
+    return this.rpcRound('getLocalHostname', null) as ReturnType<T.Effects["getLocalHostname"]>
+  }
+  getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
+    
+    return this.rpcRound('getPrimaryUrl', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["getPrimaryUrl"]>
+  }
+  getServicePortForward(
+    ...[options]: Parameters<T.Effects["getServicePortForward"]>
+  ) {
+    
+    return this.rpcRound('getServicePortForward', (options)) as ReturnType<T.Effects["getServicePortForward"]>
+  }
+  getServiceTorHostname(
+    ...[interfaceId, packageId]: Parameters<T.Effects["getServiceTorHostname"]>
+  ) {
+    
+    return this.rpcRound('getServiceTorHostname', ({interfaceId, packageId})) as ReturnType<T.Effects["getServiceTorHostname"]>
+  }
+  getSslCertificate(...[packageId, algorithm]: Parameters<T.Effects["getSslCertificate"]>) {
+    
+    return this.rpcRound('getSslCertificate', ({packageId, algorithm})) as ReturnType<T.Effects["getSslCertificate"]>
+  }
+  getSslKey(...[packageId, algorithm]: Parameters<T.Effects["getSslKey"]>) {
+    
+    return this.rpcRound('getSslKey', ({packageId, algorithm})) as ReturnType<T.Effects["getSslKey"]>
+  }
+  getSystemSmtp(...[options]: Parameters<T.Effects["getSystemSmtp"]>) {
+    
+    return this.rpcRound('getSystemSmtp', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["getSystemSmtp"]>
+  }
+  is_sandboxed(...[]: Parameters<T.Effects["is_sandboxed"]>) {
+    
+    return this.rpcRound('is_sandboxed', (null)) as ReturnType<T.Effects["is_sandboxed"]>
+  }
+  listInterface(...[options]: Parameters<T.Effects["listInterface"]>) {
+    
+    return this.rpcRound('listInterface', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["listInterface"]>
+  }
+  mount(...[options]: Parameters<T.Effects["mount"]>) {
+    
+    return this.rpcRound('mount', options) as ReturnType<T.Effects["mount"]>
+  }
+  removeAction(...[options]: Parameters<T.Effects["removeAction"]>) {
+    
+    return this.rpcRound('removeAction', options) as ReturnType<T.Effects["removeAction"]>
+  }
+  removeAddress(...[options]: Parameters<T.Effects["removeAddress"]>) {
+    
+    return this.rpcRound('removeAddress', options) as ReturnType<T.Effects["removeAddress"]>
+  }
+  restart(...[]: Parameters<T.Effects["restart"]>) {
+    
+    this.rpcRound('restart', null) 
+  }
+  reverseProxy(...[options]: Parameters<T.Effects["reverseProxy"]>) {
+    
+    return this.rpcRound('reverseProxy', options) as ReturnType<T.Effects["reverseProxy"]>
+  }
+  running(...[packageId]: Parameters<T.Effects["running"]>) {
+    
+    return this.rpcRound('running', {packageId}) as ReturnType<T.Effects["running"]>
+  }
+  // runRsync(...[options]: Parameters<T.Effects[""]>) {
+  //   
+    // return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
+  //   
+    // return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
+  // }
+  setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
+    
+    return this.rpcRound('setConfigured', {configured}) as ReturnType<T.Effects["setConfigured"]>
+  }
+  setDependencies(...[dependencies]: Parameters<T.Effects["setDependencies"]>) {
+    
+    return this.rpcRound('setDependencies', {dependencies}) as ReturnType<T.Effects["setDependencies"]>
+  }
+  setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
+    
+    return this.rpcRound('setHealth', options) as ReturnType<T.Effects["setHealth"]>
+  }
+  shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
+    
+    return this.rpcRound('shutdown', null) 
+  }
+  stopped(...[packageId]: Parameters<T.Effects["stopped"]>) {
+    
+    return this.rpcRound('stopped', {packageId}) as ReturnType<T.Effects["stopped"]>
+  }
+  store: T.Effects['store'] = {
+    get:(options) => this.rpcRound('getStore', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["store"]['get']>,
+    set:(options) => this.rpcRound('setStore', options) as ReturnType<T.Effects["store"]['set']>
+    
+  }
+}
diff --git a/libs/start_init/initSrc/Runtime.ts b/libs/start_init/initSrc/Runtime.ts
new file mode 100644
index 000000000..b40b987f5
--- /dev/null
+++ b/libs/start_init/initSrc/Runtime.ts
@@ -0,0 +1,174 @@
+// @ts-check
+
+import * as net from "net"
+import {
+  object,
+  some,
+  string,
+  literal,
+  array,
+  number,
+  matches,
+} from "ts-matches"
+import { Effects } from "./Effects"
+import { CallbackHolder } from "./CallbackHolder"
+
+import * as CP from "child_process"
+import * as Mod from "module"
+
+const childProcesses = new Map<number, CP.ChildProcess[]>()
+let childProcessIndex = 0
+const require = Mod.prototype.require
+const setupRequire = () => {
+  const requireChildProcessIndex = childProcessIndex++
+  // @ts-ignore
+  Mod.prototype.require = (name, ...rest) => {
+    if (["child_process", "node:child_process"].indexOf(name) !== -1) {
+      return {
+        exec(...args: any[]) {
+          const returning = CP.exec.apply(null, args as any)
+          const childProcessArray =
+            childProcesses.get(requireChildProcessIndex) ?? []
+          childProcessArray.push(returning)
+          childProcesses.set(requireChildProcessIndex, childProcessArray)
+          return returning
+        },
+        execFile(...args: any[]) {
+          const returning = CP.execFile.apply(null, args as any)
+          const childProcessArray =
+            childProcesses.get(requireChildProcessIndex) ?? []
+          childProcessArray.push(returning)
+          childProcesses.set(requireChildProcessIndex, childProcessArray)
+          return returning
+        },
+        execFileSync: CP.execFileSync,
+        execSync: CP.execSync,
+        fork(...args: any[]) {
+          const returning = CP.fork.apply(null, args as any)
+          const childProcessArray =
+            childProcesses.get(requireChildProcessIndex) ?? []
+          childProcessArray.push(returning)
+          childProcesses.set(requireChildProcessIndex, childProcessArray)
+          return returning
+        },
+        spawn(...args: any[]) {
+          const returning = CP.spawn.apply(null, args as any)
+          const childProcessArray =
+            childProcesses.get(requireChildProcessIndex) ?? []
+          childProcessArray.push(returning)
+          childProcesses.set(requireChildProcessIndex, childProcessArray)
+          return returning
+        },
+        spawnSync: CP.spawnSync,
+      } as typeof CP
+    }
+    console.log("require", name)
+    return require(name, ...rest)
+  }
+  return requireChildProcessIndex
+}
+
+const cleanupRequire = (requireChildProcessIndex: number) => {
+  const foundChildren = childProcesses.get(requireChildProcessIndex)
+  if (!foundChildren) return
+  childProcesses.delete(requireChildProcessIndex)
+  foundChildren.forEach((x) => x.kill())
+}
+
+const idType = some(string, number)
+const path = "/start9/sockets/rpc.sock"
+const runType = object({
+  id: idType,
+  method: literal("run"),
+  params: object({
+    methodName: string.map((x) => {
+      const splitValue = x.split("/")
+      if (splitValue.length === 1)
+        throw new Error(`X (${x}) is not a valid path`)
+      return splitValue.slice(1)
+    }),
+    methodArgs: object,
+  }),
+})
+const callbackType = object({
+  id: idType,
+  method: literal("callback"),
+  params: object({
+    callback: string,
+    args: array,
+  }),
+})
+const dealWithInput = async (callbackHolder: CallbackHolder, input: unknown) =>
+  matches(input)
+    .when(runType, async ({ id, params: { methodName, methodArgs } }) => {
+      const index = setupRequire()
+      const effects = new Effects(`/${methodName.join("/")}`, callbackHolder)
+      // @ts-ignore
+      return import("/services/service.js")
+        .then((x) => methodName.reduce(reduceMethod(methodArgs, effects), x))
+        .then()
+        .then((result) => ({ id, result }))
+        .catch((error) => ({
+          id,
+          error: { message: error?.message ?? String(error) },
+        }))
+        .finally(() => cleanupRequire(index))
+    })
+    .when(callbackType, async ({ id, params: { callback, args } }) =>
+      Promise.resolve(callbackHolder.callCallback(callback, args))
+        .then((result) => ({ id, result }))
+        .catch((error) => ({
+          id,
+          error: { message: error?.message ?? String(error) },
+        })),
+    )
+
+    .defaultToLazy(() => {
+      console.warn(`Coudln't parse the following input ${input}`)
+      return {
+        error: { message: "Could not figure out shape" },
+      }
+    })
+
+const jsonParse = (x: Buffer) => JSON.parse(x.toString())
+export class Runtime {
+  unixSocketServer = net.createServer(async (server) => {})
+  private callbacks = new CallbackHolder()
+  constructor() {
+    this.unixSocketServer.listen(path)
+
+    this.unixSocketServer.on("connection", (s) => {
+      s.on("data", (a) =>
+        Promise.resolve(a)
+          .then(jsonParse)
+          .then(dealWithInput.bind(null, this.callbacks))
+          .then((x) => {
+            console.log("x", JSON.stringify(x), typeof x)
+            return x
+          })
+          .catch((error) => ({
+            error: { message: error?.message ?? String(error) },
+          }))
+          .then(JSON.stringify)
+          .then((x) => new Promise((resolve) => s.write("" + x, resolve)))
+          .finally(() => void s.end()),
+      )
+    })
+  }
+}
+function reduceMethod(
+  methodArgs: object,
+  effects: Effects,
+): (previousValue: any, currentValue: string) => any {
+  return (x: any, method: string) =>
+    Promise.resolve(x)
+      .then((x) => x[method])
+      .then((x) =>
+        typeof x !== "function"
+          ? x
+          : x({
+              ...methodArgs,
+              effects,
+            }),
+      )
+}
\ No newline at end of file
diff --git a/libs/start_init/initSrc/index.ts b/libs/start_init/initSrc/index.ts
new file mode 100644
index 000000000..8621daa5e
--- /dev/null
+++ b/libs/start_init/initSrc/index.ts
@@ -0,0 +1,35 @@
+import { Runtime } from "./Runtime"
+
+new Runtime()
+
+/**
+
+So, this is going to be sent into a running comtainer along with any of the other node modules that are going to be needed and used.
+
+Once the container is started, we will go into a loading/ await state.
+This is the init system, and it will always be running, and it will be waiting for a command to be sent to it.
+
+Each command will be a stopable promise. And an example is going to be something like an action/ main/ or just a query into the types.
+
+A command will be sent an object which are the effects, and the effects will be things like the file system, the network, the process, and the os.
+
+
+ */
+// So OS Adapter
+// ==============
+
+/**
+* Why: So when the we call from the os we enter or leave here? 
+    
+ */
+
+/**
+Command: This is a command that the 
+
+There are 
+ */
+
+/**
+TODO:
+Should I seperate those adapter in/out?
+ */
diff --git a/libs/start_init/package-lock.json b/libs/start_init/package-lock.json
new file mode 100644
index 000000000..2ccaca591
--- /dev/null
+++ b/libs/start_init/package-lock.json
@@ -0,0 +1,2782 @@
+{
+  "name": "start-init",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "start-init",
+      "version": "0.0.0",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@start9labs/start-sdk": "=0.4.0-rev0.lib0.rc8.alpha3",
+        "esbuild": "0.18.4",
+        "esbuild-plugin-resolve": "^2.0.0",
+        "filebrowser": "^1.0.0",
+        "isomorphic-fetch": "^3.0.0",
+        "ts-matches": "^5.4.1",
+        "tslib": "^2.5.3",
+        "typescript": "^5.1.3",
+        "yaml": "^2.3.1"
+      },
+      "devDependencies": {
+        "@swc/cli": "^0.1.62",
+        "@swc/core": "^1.3.65",
+        "@types/node": "^20.2.5",
+        "prettier": "^2.8.8",
+        "rollup": "^3.25.1"
+      }
+    },
+    "../start-sdk": {
+      "name": "@start9labs/start-sdk",
+      "version": "0.4.0-rev0.lib0.rc5",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "ts-matches": "^5.4.1",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "jest": "^29.4.3",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "tsc-multi": "^0.6.1",
+        "tsconfig-paths": "^3.14.2",
+        "typescript": "^5.0.4",
+        "vitest": "^0.29.2"
+      }
+    },
+    "../tmp/service": {
+      "extraneous": true,
+      "dependencies": {
+        "@start9labs/start-sdk": "0.4.0-rev0.lib0.rc7",
+        "filebrowser": "git+https://github.com/start9labs/filebrowser-wrapper.git#32e05d3d2157038b099329c11453b00d29ccca78",
+        "ts-matches": "^5.4.1"
+      },
+      "devDependencies": {
+        "@types/node": "^20.0.0",
+        "@vercel/ncc": "^0.36.1",
+        "prettier": "^2.8.4",
+        "typescript": "^5.1.3"
+      }
+    },
+    "@start9labs/start-sdk@0.4.0-rev0.lib0.rc8.alpha1": {
+      "extraneous": true
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.4.tgz",
+      "integrity": "sha512-yKmQC9IiuvHdsNEbPHSprnMHg6OhL1cSeQZLzPpgzJBJ9ppEg9GAZN8MKj1TcmB4tZZUrq5xjK7KCmhwZP8iDA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.4.tgz",
+      "integrity": "sha512-yQVgO+V307hA2XhzELQ6F91CBGX7gSnlVGAj5YIqjQOxThDpM7fOcHT2YLJbE6gNdPtgRSafQrsK8rJ9xHCaZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.4.tgz",
+      "integrity": "sha512-yLKXMxQg6sk1ntftxQ5uwyVgG4/S2E7UoOCc5N4YZW7fdkfRiYEXqm7CMuIfY2Vs3FTrNyKmSfNevIuIvJnMww==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.4.tgz",
+      "integrity": "sha512-MVPEoZjZpk2xQ1zckZrb8eQuQib+QCzdmMs3YZAYEQPg+Rztk5pUxGyk8htZOC8Z38NMM29W+MqY9Sqo/sDGKw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.4.tgz",
+      "integrity": "sha512-uEsRtYRUDsz7i2tXg/t/SyF+5gU1cvi9B6B8i5ebJgtUUHJYWyIPIesmIOL4/+bywjxsDMA/XrNFMgMffLnh5A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.4.tgz",
+      "integrity": "sha512-I8EOigqWnOHRin6Zp5Y1cfH3oT54bd7Sdz/VnpUNksbOtfp8IWRTH4pgkgO5jWaRQPjCpJcOpdRjYAMjPt8wXg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.4.tgz",
+      "integrity": "sha512-1bHfgMz/cNMjbpsYxjVgMJ1iwKq+NdDPlACBrWULD7ZdFmBQrhMicMaKb5CdmdVyvIwXmasOuF4r6Iq574kUTA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.4.tgz",
+      "integrity": "sha512-4XCGqM/Ay1LCXUBH59bL4JbSbbTK1K22dWHymWMGaEh2sQCDOUw+OQxozYV/YdBb91leK2NbuSrE2BRamwgaYw==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.4.tgz",
+      "integrity": "sha512-J42vLHaYREyiBwH0eQE4/7H1DTfZx8FuxyWSictx4d7ezzuKE3XOkIvOg+SQzRz7T9HLVKzq2tvbAov4UfufBw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.4.tgz",
+      "integrity": "sha512-4ksIqFwhq7OExty7Sl1n0vqQSCqTG4sU6i99G2yuMr28CEOUZ/60N+IO9hwI8sIxBqmKmDgncE1n5CMu/3m0IA==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.4.tgz",
+      "integrity": "sha512-bsWtoVHkGQgAsFXioDueXRiUIfSGrVkJjBBz4gcBJxXcD461cWFQFyu8Fxdj9TP+zEeqJ8C/O4LFFMBNi6Fscw==",
+      "cpu": [
+        "loong64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.4.tgz",
+      "integrity": "sha512-LRD9Fu8wJQgIOOV1o3nRyzrheFYjxA0C1IVWZ93eNRRWBKgarYFejd5WBtrp43cE4y4D4t3qWWyklm73Mrsd/g==",
+      "cpu": [
+        "mips64el"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.4.tgz",
+      "integrity": "sha512-jtQgoZjM92gauVRxNaaG/TpL3Pr4WcL3Pwqi9QgdrBGrEXzB+twohQiWNSTycs6lUygakos4mm2h0B9/SHveng==",
+      "cpu": [
+        "ppc64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.4.tgz",
+      "integrity": "sha512-7WaU/kRZG0VCV09Xdlkg6LNAsfU9SAxo6XEdaZ8ffO4lh+DZoAhGTx7+vTMOXKxa+r2w1LYDGxfJa2rcgagMRA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.4.tgz",
+      "integrity": "sha512-D19ed0xreKQvC5t+ArE2njSnm18WPpE+1fhwaiJHf+Xwqsq+/SUaV8Mx0M27nszdU+Atq1HahrgCOZCNNEASUg==",
+      "cpu": [
+        "s390x"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.4.tgz",
+      "integrity": "sha512-Rx3AY1sxyiO/gvCGP00nL69L60dfmWyjKWY06ugpB8Ydpdsfi3BHW58HWC24K3CAjAPSwxcajozC2PzA9JBS1g==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.4.tgz",
+      "integrity": "sha512-AaShPmN9c6w1mKRpliKFlaWcSkpBT4KOlk93UfFgeI3F3cbjzdDKGsbKnOZozmYbE1izZKLmNJiW0sFM+A5JPA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.4.tgz",
+      "integrity": "sha512-tRGvGwou3BrvHVvF8HxTqEiC5VtPzySudS9fh2jBIKpLX7HCW8jIkW+LunkFDNwhslx4xMAgh0jAHsx/iCymaQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.4.tgz",
+      "integrity": "sha512-acORFDI95GKhmAnlH8EarBeuqoy/j3yxIU+FDB91H3+ZON+8HhTadtT450YkaMzX6lEWbhi+mjVUCj00M5yyOQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.4.tgz",
+      "integrity": "sha512-1NxP+iOk8KSvS1L9SSxEvBAJk39U0GiGZkiiJGbuDF9G4fG7DSDw6XLxZMecAgmvQrwwx7yVKdNN3GgNh0UfKg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.4.tgz",
+      "integrity": "sha512-OKr8jze93vbgqZ/r23woWciTixUwLa976C9W7yNBujtnVHyvsL/ocYG61tsktUfJOpyIz5TsohkBZ6Lo2+PCcQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.4.tgz",
+      "integrity": "sha512-qJr3wVvcLjPFcV4AMDS3iquhBfTef2zo/jlm8RMxmiRp3Vy2HY8WMxrykJlcbCnqLXZPA0YZxZGND6eug85ogg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@iarna/toml": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
+    "node_modules/@mole-inc/bin-wrapper": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@mole-inc/bin-wrapper/-/bin-wrapper-8.0.1.tgz",
+      "integrity": "sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==",
+      "dev": true,
+      "dependencies": {
+        "bin-check": "^4.1.0",
+        "bin-version-check": "^5.0.0",
+        "content-disposition": "^0.5.4",
+        "ext-name": "^5.0.0",
+        "file-type": "^17.1.6",
+        "filenamify": "^5.0.2",
+        "got": "^11.8.5",
+        "os-filter-obj": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@start9labs/start-sdk": {
+      "version": "0.4.0-rev0.lib0.rc8.alpha3",
+      "resolved": "https://registry.npmjs.org/@start9labs/start-sdk/-/start-sdk-0.4.0-rev0.lib0.rc8.alpha3.tgz",
+      "integrity": "sha512-7thHf2iHJovkwsyKbd4lfV0/bOCv5vbPB3EYahPyLtN3rEY+siLDzu/Tmc7XdtsCKLVlLawqYkGPEakmaFs8FQ==",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "isomorphic-fetch": "^3.0.0",
+        "ts-matches": "^5.4.1",
+        "yaml": "^2.2.2"
+      }
+    },
+    "node_modules/@swc/cli": {
+      "version": "0.1.62",
+      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.62.tgz",
+      "integrity": "sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==",
+      "dev": true,
+      "dependencies": {
+        "@mole-inc/bin-wrapper": "^8.0.1",
+        "commander": "^7.1.0",
+        "fast-glob": "^3.2.5",
+        "semver": "^7.3.8",
+        "slash": "3.0.0",
+        "source-map": "^0.7.3"
+      },
+      "bin": {
+        "spack": "bin/spack.js",
+        "swc": "bin/swc.js",
+        "swcx": "bin/swcx.js"
+      },
+      "engines": {
+        "node": ">= 12.13"
+      },
+      "peerDependencies": {
+        "@swc/core": "^1.2.66",
+        "chokidar": "^3.5.1"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@swc/cli/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@swc/core": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.65.tgz",
+      "integrity": "sha512-d5iDiKWf12FBo6h9Fro2pcnLK6HSPbyZ7A1U5iFNpRRx8XEd4uGdKtf5NoXJ3GDLQDLXnNSLA82Cl6SfrJ1lyw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/swc"
+      },
+      "optionalDependencies": {
+        "@swc/core-darwin-arm64": "1.3.65",
+        "@swc/core-darwin-x64": "1.3.65",
+        "@swc/core-linux-arm-gnueabihf": "1.3.65",
+        "@swc/core-linux-arm64-gnu": "1.3.65",
+        "@swc/core-linux-arm64-musl": "1.3.65",
+        "@swc/core-linux-x64-gnu": "1.3.65",
+        "@swc/core-linux-x64-musl": "1.3.65",
+        "@swc/core-win32-arm64-msvc": "1.3.65",
+        "@swc/core-win32-ia32-msvc": "1.3.65",
+        "@swc/core-win32-x64-msvc": "1.3.65"
+      },
+      "peerDependencies": {
+        "@swc/helpers": "^0.5.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/helpers": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.65.tgz",
+      "integrity": "sha512-fQIXZgr7CD/+1ADqrVbz/gHvSoIMmggHvPzguQjV8FggBuS9Efm1D1ZrdUSqptggKvuLLHMZf+49tENq8NWWcg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.65.tgz",
+      "integrity": "sha512-kGuWP7OP9mwOiIcJpEVa+ydC3Wxf0fPQ1MK0hUIPFcR6tAUEdOvdAuCzP6U20RX/JbbgwfI/Qq6ugT7VL6omgg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.65.tgz",
+      "integrity": "sha512-Bjbzldp8n4mWSdAvBt4VuLiHlfFM5pyftjJvJnmSY4H1IzbxkByyT60OHOedcIPRiZveD8NJzUJqutqrgTmtLg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.65.tgz",
+      "integrity": "sha512-GmxtcCymeQqEqT9n5mo857koRsUbEwmuijrBA4OeD5KOPW9gqAmUxr+ZgwgYHwyJ3CiN+UbK8uEqPsL6UVQmLg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.65.tgz",
+      "integrity": "sha512-yv9jP3gbfMsYrqswT2MwK5Q1+avSwRXAKo+LYUknTeoLQNNlukDfqSLHajNq23XrVDRP4B3Pjn7kaqjxRcihbg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.65.tgz",
+      "integrity": "sha512-GQkwysEPTlAOQ3jiTiedObzh6pBaf9RLaQqpGdCp+iKze9+BR+STBP0IIKhZDMPG/nWWNhrYFD/VMQxRoYPjfw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.65.tgz",
+      "integrity": "sha512-ETzhOhtDluYFK4x73OTM9gVTMyzGd2WeWGlCu3WoT1EPPUwCqQpcAqI3TfEcP1ljFDG0pPkpYzVpwNf8yjQElg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.65.tgz",
+      "integrity": "sha512-3weD0I6F8bggN0KOnbZkvYC1PBrT5wrvohpvtgijRsODxjoWwztozjawJxF3rqgVqlSI/+nA+JkrN48e2cxJjQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.65.tgz",
+      "integrity": "sha512-i6c3D7E9Ca41HteW3+hn1OKQfjIabc2P0p1mJRXBkn+igwb+Ba6gXJc7NqhrlF8uZsDhhcGZTsAqBBtfcfTuHQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-x64-msvc": {
+      "version": "1.3.65",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.65.tgz",
+      "integrity": "sha512-tQ9hEDtwPZxQ2sYb2n8ypfmdMjobKAf6VSnChteLMktofU7o562op5pLS6D6QCP2AtL3lcwe1piTCgIhk4vmjA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/helpers": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz",
+      "integrity": "sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "dev": true,
+      "dependencies": {
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@tokenizer/token": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
+      "dev": true
+    },
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
+      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
+      }
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "dev": true
+    },
+    "node_modules/@types/keyv": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
+      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.2.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz",
+      "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==",
+      "dev": true
+    },
+    "node_modules/@types/responselike": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
+      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/arch": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "node_modules/bin-check": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
+      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^0.7.0",
+        "executable": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/bin-version": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-6.0.0.tgz",
+      "integrity": "sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0",
+        "find-versions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bin-version-check": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-5.0.0.tgz",
+      "integrity": "sha512-Q3FMQnS5eZmrBGqmDXLs4dbAn/f+52voP6ykJYmweSA60t6DyH4UTSwZhtbK5UH+LBoWvDljILUQMLRUtsynsA==",
+      "dev": true,
+      "dependencies": {
+        "bin-version": "^6.0.0",
+        "semver": "^7.3.5",
+        "semver-truncate": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bin-version/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/bin-version/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/bin-version/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bin-version/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bin-version/node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bin-version/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bin-version/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bin-version/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bin-version/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.6.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
+      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
+      "dev": true,
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "node_modules/cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.18.4",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.4.tgz",
+      "integrity": "sha512-9rxWV/Cb2DMUXfe9aUsYtqg0KTlw146ElFH22kYeK9KVV1qT082X4lpmiKsa12ePiCcIcB686TQJxaGAa9TFvA==",
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.18.4",
+        "@esbuild/android-arm64": "0.18.4",
+        "@esbuild/android-x64": "0.18.4",
+        "@esbuild/darwin-arm64": "0.18.4",
+        "@esbuild/darwin-x64": "0.18.4",
+        "@esbuild/freebsd-arm64": "0.18.4",
+        "@esbuild/freebsd-x64": "0.18.4",
+        "@esbuild/linux-arm": "0.18.4",
+        "@esbuild/linux-arm64": "0.18.4",
+        "@esbuild/linux-ia32": "0.18.4",
+        "@esbuild/linux-loong64": "0.18.4",
+        "@esbuild/linux-mips64el": "0.18.4",
+        "@esbuild/linux-ppc64": "0.18.4",
+        "@esbuild/linux-riscv64": "0.18.4",
+        "@esbuild/linux-s390x": "0.18.4",
+        "@esbuild/linux-x64": "0.18.4",
+        "@esbuild/netbsd-x64": "0.18.4",
+        "@esbuild/openbsd-x64": "0.18.4",
+        "@esbuild/sunos-x64": "0.18.4",
+        "@esbuild/win32-arm64": "0.18.4",
+        "@esbuild/win32-ia32": "0.18.4",
+        "@esbuild/win32-x64": "0.18.4"
+      }
+    },
+    "node_modules/esbuild-plugin-resolve": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/esbuild-plugin-resolve/-/esbuild-plugin-resolve-2.0.0.tgz",
+      "integrity": "sha512-eJy9B8yDW5X/J48eWtR1uVmv+DKfHvYYnrrcqQoe/nUkVHVOTZlJnSevkYyGOz6hI90t036Y5QIPDrGzmppxfg=="
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/executable": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/ext-list": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "^1.28.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ext-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "dev": true,
+      "dependencies": {
+        "ext-list": "^2.0.0",
+        "sort-keys-length": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-type": {
+      "version": "17.1.6",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz",
+      "integrity": "sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==",
+      "dev": true,
+      "dependencies": {
+        "readable-web-to-node-stream": "^3.0.2",
+        "strtok3": "^7.0.0-alpha.9",
+        "token-types": "^5.0.0-alpha.2"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/file-type?sponsor=1"
+      }
+    },
+    "node_modules/filebrowser": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/filebrowser/-/filebrowser-1.0.0.tgz",
+      "integrity": "sha512-RRONYpCDzbmWPhBX43T4dE+ptqLznJ7lKfbMaZLChB2i2ZIdFXoqT9qZTi70Dpq6fnJHuvcdeiRqMIPZKhVgTQ==",
+      "dependencies": {
+        "commander": "^2.9.0",
+        "content-disposition": "^0.5.1",
+        "express": "^4.14.0"
+      }
+    },
+    "node_modules/filename-reserved-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz",
+      "integrity": "sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/filenamify": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-5.1.1.tgz",
+      "integrity": "sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==",
+      "dev": true,
+      "dependencies": {
+        "filename-reserved-regex": "^3.0.0",
+        "strip-outer": "^2.0.0",
+        "trim-repeated": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/find-versions": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-5.1.0.tgz",
+      "integrity": "sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==",
+      "dev": true,
+      "dependencies": {
+        "semver-regex": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/got": {
+      "version": "11.8.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "dev": true,
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isomorphic-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+      "dependencies": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/keyv": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
+      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
+      "dependencies": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/os-filter-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
+      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
+      "dev": true,
+      "dependencies": {
+        "arch": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "node_modules/peek-readable": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0.tgz",
+      "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readable-web-to-node-stream": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
+      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true
+    },
+    "node_modules/responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "3.25.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz",
+      "integrity": "sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=14.18.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/semver": {
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-regex": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-4.0.5.tgz",
+      "integrity": "sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semver-truncate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-2.0.0.tgz",
+      "integrity": "sha512-Rh266MLDYNeML5h90ttdMwfXe1+Nc4LAWd9X1KdJe8pPHP4kFmvLZALtsMNHNdvTyQygbEC0D59sIz47DIaq8w==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/semver-truncate/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sort-keys-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+      "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
+      "dev": true,
+      "dependencies": {
+        "sort-keys": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-outer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-2.0.0.tgz",
+      "integrity": "sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/strtok3": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz",
+      "integrity": "sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==",
+      "dev": true,
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0",
+        "peek-readable": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/token-types": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz",
+      "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==",
+      "dev": true,
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0",
+        "ieee754": "^1.2.1"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/trim-repeated": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-2.0.0.tgz",
+      "integrity": "sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/ts-matches": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.4.1.tgz",
+      "integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
+    },
+    "node_modules/tslib": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz",
+      "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-fetch": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "service": {
+      "extraneous": true,
+      "dependencies": {
+        "@start9labs/start-sdk": "0.4.0-rev0.lib0.rc7",
+        "filebrowser": "git+https://github.com/start9labs/filebrowser-wrapper.git#32e05d3d2157038b099329c11453b00d29ccca78",
+        "ts-matches": "^5.4.1"
+      },
+      "devDependencies": {
+        "@types/node": "^20.0.0",
+        "@vercel/ncc": "^0.36.1",
+        "prettier": "^2.8.4",
+        "typescript": "^5.1.3"
+      }
+    }
+  }
+}
diff --git a/libs/start_init/package.json b/libs/start_init/package.json
new file mode 100644
index 000000000..73f7c9cde
--- /dev/null
+++ b/libs/start_init/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "start-init",
+  "version": "0.0.0",
+  "description": "We want to be the sdk intermitent for the system",
+  "scripts": {
+    "bundle:esbuild": "esbuild initSrc/index.ts --platform=node --bundle --outfile=startInit.js",
+    "bundle:service": "esbuild /service/startos/procedures/index.ts --platform=node --bundle --outfile=service.js",
+    "run:manifest": "esbuild /service/startos/procedures/index.ts --platform=node --bundle --outfile=service.js"
+  },
+  "author": "",
+  "prettier": {
+    "trailingComma": "all",
+    "tabWidth": 2,
+    "semi": false,
+    "singleQuote": false
+  },
+  "dependencies": {
+    "@iarna/toml": "^2.2.5",
+    "@start9labs/start-sdk": "=0.4.0-rev0.lib0.rc8.alpha3",
+    "esbuild": "0.18.4",
+    "esbuild-plugin-resolve": "^2.0.0",
+    "filebrowser": "^1.0.0",
+    "isomorphic-fetch": "^3.0.0",
+    "ts-matches": "^5.4.1",
+    "tslib": "^2.5.3",
+    "typescript": "^5.1.3",
+    "yaml": "^2.3.1"
+  },
+  "devDependencies": {
+    "@swc/cli": "^0.1.62",
+    "@swc/core": "^1.3.65",
+    "@types/node": "^20.2.5",
+    "prettier": "^2.8.8",
+    "rollup": "^3.25.1"
+  }
+}
diff --git a/libs/start_init/readme.md b/libs/start_init/readme.md
new file mode 100644
index 000000000..023091463
--- /dev/null
+++ b/libs/start_init/readme.md
@@ -0,0 +1,86 @@
+## Testing
+
+So, we are going to
+
+1. create a fake server
+2. pretend socket server os (while the fake server is running)
+3. Run a fake effects system (while 1/2 are running)
+
+In order to simulate that we created a server like the start-os and
+a fake server (in this case I am using syncthing-wrapper)
+
+### TODO
+
+Undo the packing that I have done earlier, and hijack the embassy.js to use the bundle service + code
+
+Converting embassy.js -> service.js
+
+```sequence {theme="hand"}
+startOs ->> startInit.js: Rpc Call
+startInit.js ->> service.js: Rpc Converted into js code
+```
+
+### Create a fake server
+
+```bash
+run_test () {
+    (
+        set -e
+        libs=/home/jh/Projects/start-os/libs/start_init
+        sockets=/tmp/start9
+        service=/home/jh/Projects/syncthing-wrapper
+
+        docker run  \
+            -v $libs:/libs \
+            -v $service:/service \
+            -w /libs \
+            --rm node:18-alpine \
+            sh -c "
+                npm i &&
+                npm run bundle:esbuild  &&
+                npm run bundle:service
+            "
+
+
+
+        docker run  \
+            -v ./libs/start_init/:/libs \
+            -w /libs \
+            --rm node:18-alpine \
+            sh -c "
+                npm i &&
+                npm run bundle:esbuild
+            "
+
+
+
+        rm -rf $sockets  || true
+        mkdir -p $sockets/sockets
+        cd $service
+        docker run \
+            -v $libs:/start-init \
+            -v $sockets:/start9 \
+            --rm -it $(docker build -q .) sh -c "
+                apk add nodejs &&
+                node /start-init/bundleEs.js
+            "
+    )
+}
+run_test
+```
+
+### Pretend Socket Server OS
+
+First we are going to create our fake server client with the bash then send it the json possible data
+
+```bash
+sudo socat - unix-client:/tmp/start9/sockets/rpc.sock
+```
+
+<!-- prettier-ignore -->
+```json
+{"id":"a","method":"run","params":{"methodName":"/dependencyMounts","methodArgs":[]}}
+{"id":"a","method":"run","params":{"methodName":"/actions/test","methodArgs":{"input":{"id": 1}}}}
+{"id":"b","method":"run","params":{"methodName":"/actions/test","methodArgs":{"id": 1}}}
+
+```
diff --git a/libs/start_init/tsconfig.json b/libs/start_init/tsconfig.json
new file mode 100644
index 000000000..3af74fc39
--- /dev/null
+++ b/libs/start_init/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "include": [
+    "./**/*.mjs",
+    "./**/*.js",
+    "initSrc/Runtime.ts",
+    "initSrc/index.ts",
+    "effects.ts"
+  ],
+  "exclude": [],
+  "inputs": ["./lib/index.ts"],
+  "compilerOptions": {
+    "target": "es2022",
+    "module": "es2022",
+    "moduleResolution": "node",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "ts-node": {
+    "compilerOptions": {
+      "module": "commonjs"
+    }
+  }
+}

From 40b19c5e67b05216fdf60ad4ad1b1c2553d8308a Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:35:08 -0700
Subject: [PATCH 002/341] chore: Remove the long running from the docker

---
 backend/src/manager/manager_container.rs    |  30 ++----
 backend/src/manager/mod.rs                  | 100 +++++++-------------
 backend/src/manager/persistent_container.rs |   8 +-
 backend/src/procedure/mod.rs                |   2 +-
 4 files changed, 44 insertions(+), 96 deletions(-)

diff --git a/backend/src/manager/manager_container.rs b/backend/src/manager/manager_container.rs
index 32e11c2e5..ba13a652d 100644
--- a/backend/src/manager/manager_container.rs
+++ b/backend/src/manager/manager_container.rs
@@ -138,7 +138,7 @@ async fn create_service_manager(
     desired_state: Arc<Sender<StartStop>>,
     seed: Arc<manager_seed::ManagerSeed>,
     current_state: Arc<Sender<StartStop>>,
-    persistent_container: Arc<Option<super::persistent_container::PersistentContainer>>,
+    persistent_container: Arc<super::persistent_container::PersistentContainer>,
 ) {
     let mut desired_state_receiver = desired_state.subscribe();
     let mut running_service: Option<NonDetachingJoinHandle<()>> = None;
@@ -149,23 +149,12 @@ async fn create_service_manager(
         match (current, desired) {
             (StartStop::Start, StartStop::Start) => (),
             (StartStop::Start, StartStop::Stop) => {
-                if persistent_container.is_none() {
-                    if let Err(err) = seed.stop_container().await {
-                        tracing::error!("Could not stop container");
-                        tracing::debug!("{:?}", err)
-                    }
-                    running_service = None;
-                } else if let Some(current_service) = running_service.take() {
-                    tokio::select! {
-                        _ = current_service => (),
-                        _ = tokio::time::sleep(Duration::from_secs_f64(seed.manifest
-                            .containers
-                            .as_ref()
-                            .and_then(|c| c.main.sigterm_timeout).map(|x| x.as_secs_f64()).unwrap_or_default())) => {
-                            tracing::error!("Could not stop service");
-                        }
-                    }
+                if let Err(err) = seed.stop_container().await {
+                    tracing::error!("Could not stop container");
+                    tracing::debug!("{:?}", err)
                 }
+                running_service = None;
+
                 current_state.send_modify(|x| *x = StartStop::Stop);
             }
             (StartStop::Stop, StartStop::Start) => starting_service(
@@ -243,12 +232,7 @@ fn starting_service(
     let set_stopped = { move || current_state.send_modify(|x| *x = StartStop::Stop) };
     let running_main_loop = async move {
         while desired_state.borrow().is_start() {
-            let result = run_main(
-                seed.clone(),
-                persistent_container.clone(),
-                set_running.clone(),
-            )
-            .await;
+            let result = run_main(seed.clone()).await;
             set_stopped();
             run_main_log_result(result, seed.clone()).await;
         }
diff --git a/backend/src/manager/mod.rs b/backend/src/manager/mod.rs
index cf4457b9f..b34e29efb 100644
--- a/backend/src/manager/mod.rs
+++ b/backend/src/manager/mod.rs
@@ -40,7 +40,7 @@ use crate::procedure::docker::{DockerContainer, DockerProcedure, LongRunning};
 use crate::procedure::{NoOutput, ProcedureName};
 use crate::s9pk::manifest::Manifest;
 use crate::status::MainStatus;
-use crate::util::docker::{get_container_ip, kill_container};
+use crate::util::docker::get_container_ip;
 use crate::util::NonDetachingJoinHandle;
 use crate::volume::Volume;
 use crate::Error;
@@ -61,7 +61,7 @@ use self::manager_seed::ManagerSeed;
 pub const HEALTH_CHECK_COOLDOWN_SECONDS: u64 = 15;
 pub const HEALTH_CHECK_GRACE_PERIOD_SECONDS: u64 = 5;
 
-type ManagerPersistentContainer = Arc<Option<PersistentContainer>>;
+type ManagerPersistentContainer = Arc<PersistentContainer>;
 type BackupGuard = Arc<Mutex<BackupMountGuard<TmpMountGuard>>>;
 pub enum BackupReturn {
     Error(Error),
@@ -221,10 +221,8 @@ impl Manager {
     }
 
     /// Used as a getter, but also used in procedure
-    pub fn rpc_client(&self) -> Option<Arc<UnixRpcClient>> {
-        (*self.persistent_container)
-            .as_ref()
-            .map(|x| x.rpc_client())
+    pub fn rpc_client(&self) -> Arc<UnixRpcClient> {
+        self.persistent_container.rpc_client()
     }
 
     async fn _transition_abort(&self) {
@@ -428,7 +426,7 @@ async fn configure(
     if !configure_context.dry_run {
         // run config action
         let res = action
-            .set(ctx, id, version, &dependencies, volumes, &config)
+            .set(ctx, id, version, dependencies, volumes, &config)
             .await?;
 
         // track dependencies with no pointers
@@ -462,7 +460,7 @@ async fn configure(
     }
 
     let dependency_config_errs =
-        compute_dependency_config_errs(&ctx, &db, &manifest, &current_dependencies, overrides)
+        compute_dependency_config_errs(ctx, &db, &manifest, &current_dependencies, overrides)
             .await?;
 
     // cache current config for dependents
@@ -650,37 +648,14 @@ pub enum OnStop {
 type RunMainResult = Result<Result<NoOutput, (i32, String)>, Error>;
 
 #[instrument(skip_all)]
-async fn run_main(
-    seed: Arc<ManagerSeed>,
-    persistent_container: ManagerPersistentContainer,
-    started: Arc<impl Fn()>,
-) -> RunMainResult {
-    let mut runtime = NonDetachingJoinHandle::from(tokio::spawn(start_up_image(seed.clone())));
-    let ip = match persistent_container.is_some() {
-        false => Some(match get_running_ip(&seed, &mut runtime).await {
-            GetRunningIp::Ip(x) => x,
-            GetRunningIp::Error(e) => return Err(e),
-            GetRunningIp::EarlyExit(x) => return Ok(x),
-        }),
-        true => None,
-    };
-
-    let svc = if let Some(ip) = ip {
-        let net = add_network_for_main(&seed, ip).await?;
-        started();
-        Some(net)
-    } else {
-        None
-    };
+async fn run_main(seed: Arc<ManagerSeed>) -> RunMainResult {
+    let runtime = NonDetachingJoinHandle::from(tokio::spawn(start_up_image(seed.clone())));
 
     let health = main_health_check_daemon(seed.clone());
     let res = tokio::select! {
         a = runtime => a.map_err(|_| Error::new(eyre!("Manager runtime panicked!"), crate::ErrorKind::Docker)).and_then(|a| a),
         _ = health => Err(Error::new(eyre!("Health check daemon exited!"), crate::ErrorKind::Unknown))
     };
-    if let Some(svc) = svc {
-        remove_network_for_main(svc).await?;
-    }
     res
 }
 
@@ -847,41 +822,30 @@ async fn send_signal(manager: &Manager, gid: Arc<Gid>, signal: Signal) -> Result
     //     .commit_health_check_results
     //     .store(false, Ordering::SeqCst);
 
-    if let Some(rpc_client) = manager.rpc_client() {
-        let main_gid = *gid.main_gid.0.borrow();
-        let next_gid = gid.new_gid();
-        #[cfg(feature = "js_engine")]
-        if let Err(e) = crate::procedure::js_scripts::JsProcedure::default()
-            .execute::<_, NoOutput>(
-                &manager.seed.ctx.datadir,
-                &manager.seed.manifest.id,
-                &manager.seed.manifest.version,
-                ProcedureName::Signal,
-                &manager.seed.manifest.volumes,
-                Some(embassy_container_init::SignalGroupParams {
-                    gid: main_gid,
-                    signal: signal as u32,
-                }),
-                None, // TODO
-                next_gid,
-                Some(rpc_client),
-            )
-            .await?
-        {
-            tracing::error!("Failed to send js signal: {}", e.1);
-            tracing::debug!("{:?}", e);
-        }
-    } else {
-        // send signal to container
-        kill_container(&manager.seed.container_name, Some(signal))
-            .await
-            .or_else(|e| {
-                if e.kind == ErrorKind::NotFound {
-                    Ok(())
-                } else {
-                    Err(e)
-                }
-            })?;
+    let rpc_client = manager.rpc_client();
+
+    let main_gid = *gid.main_gid.0.borrow();
+    let next_gid = gid.new_gid();
+    #[cfg(feature = "js_engine")]
+    if let Err(e) = crate::procedure::js_scripts::JsProcedure::default()
+        .execute::<_, NoOutput>(
+            &manager.seed.ctx.datadir,
+            &manager.seed.manifest.id,
+            &manager.seed.manifest.version,
+            ProcedureName::Signal,
+            &manager.seed.manifest.volumes,
+            Some(embassy_container_init::SignalGroupParams {
+                gid: main_gid,
+                signal: signal as u32,
+            }),
+            None, // TODO
+            next_gid,
+            Some(rpc_client),
+        )
+        .await?
+    {
+        tracing::error!("Failed to send js signal: {}", e.1);
+        tracing::debug!("{:?}", e);
     }
 
     Ok(())
diff --git a/backend/src/manager/persistent_container.rs b/backend/src/manager/persistent_container.rs
index d9868a622..da51f6ea0 100644
--- a/backend/src/manager/persistent_container.rs
+++ b/backend/src/manager/persistent_container.rs
@@ -25,16 +25,16 @@ pub struct PersistentContainer {
 
 impl PersistentContainer {
     #[instrument(skip_all)]
-    pub async fn init(seed: &Arc<ManagerSeed>) -> Result<Option<Self>, Error> {
+    pub async fn init(seed: &Arc<ManagerSeed>) -> Result<Self, Error> {
         Ok(if let Some(containers) = &seed.manifest.containers {
             let (running_docker, rpc_client) =
                 spawn_persistent_container(seed.clone(), containers.main.clone()).await?;
-            Some(Self {
+            Self {
                 _running_docker: running_docker,
                 rpc_client,
-            })
+            }
         } else {
-            None
+            todo!("No containers in manifest")
         })
     }
 
diff --git a/backend/src/procedure/mod.rs b/backend/src/procedure/mod.rs
index 62f4de9cf..02449a076 100644
--- a/backend/src/procedure/mod.rs
+++ b/backend/src/procedure/mod.rs
@@ -109,7 +109,7 @@ impl PackageProcedure {
                         input,
                         timeout,
                         gid,
-                        rpc_client,
+                        Some(rpc_client),
                     )
                     .await
             }

From 18cd6c81a3686807004d5cf3f9ae797e5c2774bb Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:53:29 -0700
Subject: [PATCH 003/341] chore: Make sure the test is testing something is
 correct shape

---
 backend/src/procedure/mod.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/procedure/mod.rs b/backend/src/procedure/mod.rs
index 02449a076..7c02a03d5 100644
--- a/backend/src/procedure/mod.rs
+++ b/backend/src/procedure/mod.rs
@@ -179,5 +179,7 @@ impl<'de> Deserialize<'de> for NoOutput {
 #[test]
 fn test_deser_no_output() {
     serde_json::from_str::<NoOutput>("").unwrap();
-    serde_json::from_str::<Result<NoOutput, NoOutput>>("{\"Ok\": null}").unwrap();
+    serde_json::from_str::<Result<NoOutput, NoOutput>>("{\"Ok\": null}")
+        .unwrap()
+        .unwrap();
 }

From b5da076e2cf7e7b17f1d65052b1681b77e7a4156 Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 8 Nov 2023 17:19:30 -0700
Subject: [PATCH 004/341] chore: Add in some modifications to make the
 sandboxed and execute in the container

---
 backend/src/manager/manager_container.rs    | 12 ++-
 backend/src/manager/persistent_container.rs | 84 ++++++++++++++++++++-
 2 files changed, 86 insertions(+), 10 deletions(-)

diff --git a/backend/src/manager/manager_container.rs b/backend/src/manager/manager_container.rs
index ba13a652d..00937fc5c 100644
--- a/backend/src/manager/manager_container.rs
+++ b/backend/src/manager/manager_container.rs
@@ -223,16 +223,14 @@ fn starting_service(
     persistent_container: ManagerPersistentContainer,
     running_service: &mut Option<NonDetachingJoinHandle<()>>,
 ) {
-    let set_running = {
-        let current_state = current_state.clone();
-        Arc::new(move || {
-            current_state.send_modify(|x| *x = StartStop::Start);
-        })
-    };
     let set_stopped = { move || current_state.send_modify(|x| *x = StartStop::Stop) };
     let running_main_loop = async move {
         while desired_state.borrow().is_start() {
-            let result = run_main(seed.clone()).await;
+            let result = persistent_container
+                .execute(models::ProcedureName::Main, Value::Null, None)
+                .await;
+
+            run_main(seed.clone()).await;
             set_stopped();
             run_main_log_result(result, seed.clone()).await;
         }
diff --git a/backend/src/manager/persistent_container.rs b/backend/src/manager/persistent_container.rs
index da51f6ea0..0753a9bb4 100644
--- a/backend/src/manager/persistent_container.rs
+++ b/backend/src/manager/persistent_container.rs
@@ -3,8 +3,10 @@ use std::time::Duration;
 
 use color_eyre::eyre::eyre;
 use helpers::UnixRpcClient;
-use tokio::sync::oneshot;
+use models::ProcedureName;
+use serde::de::DeserializeOwned;
 use tokio::sync::watch::{self, Receiver};
+use tokio::sync::{oneshot, Mutex};
 use tracing::instrument;
 
 use super::manager_seed::ManagerSeed;
@@ -12,15 +14,20 @@ use super::{
     add_network_for_main, get_long_running_ip, long_running_docker, remove_network_for_main,
     GetRunningIp,
 };
+use crate::prelude::*;
 use crate::procedure::docker::DockerContainer;
 use crate::util::NonDetachingJoinHandle;
-use crate::Error;
+
+struct ProcedureId(u64);
 
 /// Persistant container are the old containers that need to run all the time
 /// The goal is that all services will be persistent containers, waiting to run the main system.
 pub struct PersistentContainer {
     _running_docker: NonDetachingJoinHandle<()>,
+    // TODO: Drb: Implement to spec https://github.com/Start9Labs/start-sdk/blob/master/lib/types.ts#L223
     pub rpc_client: Receiver<Arc<UnixRpcClient>>,
+    manager_seed: Arc<ManagerSeed>,
+    procedures: Mutex<Vec<(ProcedureName, ProcedureId)>>,
 }
 
 impl PersistentContainer {
@@ -32,15 +39,86 @@ impl PersistentContainer {
             Self {
                 _running_docker: running_docker,
                 rpc_client,
+                manager_seed: seed.clone(),
+                procedures: Default::default(),
             }
         } else {
-            todo!("No containers in manifest")
+            todo!("DRB No containers in manifest")
         })
     }
 
     pub fn rpc_client(&self) -> Arc<UnixRpcClient> {
         self.rpc_client.borrow().clone()
     }
+
+    pub async fn execute<O>(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<Result<O, (i32, String)>, Error>
+    where
+        O: DeserializeOwned,
+    {
+        match self._execute(name, input, timeout).await {
+            Ok(Ok(a)) => Ok(Ok(imbl_value::from_value(a).map_err(|e| {
+                Error::new(
+                    eyre!("Error deserializing output: {}", e),
+                    crate::ErrorKind::Deserialization,
+                )
+            })?)),
+            Ok(Err(e)) => Ok(Err(e)),
+            Err(e) => Err(e),
+        }
+    }
+    pub async fn sanboxed<O>(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<Result<O, (i32, String)>, Error>
+    where
+        O: DeserializeOwned,
+    {
+        match self._sandboxed(name, input, timeout).await {
+            Ok(Ok(a)) => Ok(Ok(imbl_value::from_value(a).map_err(|e| {
+                Error::new(
+                    eyre!("Error deserializing output: {}", e),
+                    crate::ErrorKind::Deserialization,
+                )
+            })?)),
+            Ok(Err(e)) => Ok(Err(e)),
+            Err(e) => Err(e),
+        }
+    }
+    async fn _execute(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<Result<Value, (i32, String)>, Error> {
+        todo!(
+            r#"""
+            DRB
+            Call into the persistant via rpc, start a procedure.
+            Procedure already has access to rpc to call back, maybe an id to track?
+            Should be able to cancel.
+            Note(Main): Only one should be running at a time
+            Note(Main): Has additional effect of setRunning 
+            Note: The input (Option<I>) is not generic because we don't want to clone this fn for each type of input
+            Note: The output is not generic because we don't want to clone this fn for each type of output
+        """#
+        )
+    }
+
+    async fn _sandboxed(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<Result<Value, (i32, String)>, Error> {
+        todo!("DRB")
+    }
 }
 
 pub async fn spawn_persistent_container(

From 94d22ed1aa1ccb29b3c921d53b64a9eb244215aa Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 10 Nov 2023 09:26:00 -0700
Subject: [PATCH 005/341] chore: Remove the other procedures since all are now
 via the js

---
 backend/src/bins/start_deno.rs              |  14 +-
 backend/src/manager/mod.rs                  |  66 +-
 backend/src/manager/persistent_container.rs |   9 +
 backend/src/procedure/docker.rs             | 437 -------------
 backend/src/procedure/js_scripts.rs         | 684 --------------------
 backend/src/procedure/mod.rs                |  92 +--
 6 files changed, 77 insertions(+), 1225 deletions(-)

diff --git a/backend/src/bins/start_deno.rs b/backend/src/bins/start_deno.rs
index 0be507082..870821734 100644
--- a/backend/src/bins/start_deno.rs
+++ b/backend/src/bins/start_deno.rs
@@ -34,9 +34,10 @@ async fn execute(
         input,
     } = arg;
     PackageLogger::init(&pkg_id);
-    procedure
-        .execute_impl(&directory, &pkg_id, &pkg_version, name, &volumes, input)
-        .await
+    // procedure
+    //     .execute_impl(&directory, &pkg_id, &pkg_version, name, &volumes, input)
+    //     .await
+    todo!("@DRB Remove")
 }
 #[command(cli_only, display(display_serializable))]
 async fn sandbox(
@@ -52,9 +53,10 @@ async fn sandbox(
         input,
     } = arg;
     PackageLogger::init(&pkg_id);
-    procedure
-        .sandboxed_impl(&directory, &pkg_id, &pkg_version, &volumes, input, name)
-        .await
+    // procedure
+    //     .sandboxed_impl(&directory, &pkg_id, &pkg_version, &volumes, input, name)
+    //     .await
+    todo!("@DRB Remove")
 }
 
 use tracing::Subscriber;
diff --git a/backend/src/manager/mod.rs b/backend/src/manager/mod.rs
index b34e29efb..56fa408fd 100644
--- a/backend/src/manager/mod.rs
+++ b/backend/src/manager/mod.rs
@@ -13,6 +13,7 @@ use models::{ErrorKind, OptionExt, PackageId};
 use nix::sys::signal::Signal;
 use persistent_container::PersistentContainer;
 use rand::SeedableRng;
+use serde::de::DeserializeOwned;
 use sqlx::Connection;
 use start_stop::StartStop;
 use tokio::sync::watch::{self, Sender};
@@ -328,6 +329,38 @@ impl Manager {
         let transition = self.transition.borrow();
         matches!(*transition, TransitionState::BackingUp(_))
     }
+
+    pub async fn execute<O>(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<Result<O, (i32, String)>, Error>
+    where
+        O: DeserializeOwned,
+    {
+        self.persistent_container
+            .execute(name, input, timeout)
+            .await
+    }
+
+    pub async fn sanboxed<O>(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<Result<O, (i32, String)>, Error>
+    where
+        O: DeserializeOwned,
+    {
+        self.persistent_container
+            .sanboxed(name, input, timeout)
+            .await
+    }
+
+    pub async fn send_signal(&self, gid: Arc<Gid>, signal: Signal) -> Result<(), Error> {
+        self.persistent_container.send_signal(gid, signal).await
+    }
 }
 
 #[instrument(skip_all)]
@@ -817,36 +850,5 @@ async fn get_running_ip(seed: &ManagerSeed, mut runtime: &mut RuntimeOfCommand)
 }
 
 async fn send_signal(manager: &Manager, gid: Arc<Gid>, signal: Signal) -> Result<(), Error> {
-    // stop health checks from committing their results
-    // shared
-    //     .commit_health_check_results
-    //     .store(false, Ordering::SeqCst);
-
-    let rpc_client = manager.rpc_client();
-
-    let main_gid = *gid.main_gid.0.borrow();
-    let next_gid = gid.new_gid();
-    #[cfg(feature = "js_engine")]
-    if let Err(e) = crate::procedure::js_scripts::JsProcedure::default()
-        .execute::<_, NoOutput>(
-            &manager.seed.ctx.datadir,
-            &manager.seed.manifest.id,
-            &manager.seed.manifest.version,
-            ProcedureName::Signal,
-            &manager.seed.manifest.volumes,
-            Some(embassy_container_init::SignalGroupParams {
-                gid: main_gid,
-                signal: signal as u32,
-            }),
-            None, // TODO
-            next_gid,
-            Some(rpc_client),
-        )
-        .await?
-    {
-        tracing::error!("Failed to send js signal: {}", e.1);
-        tracing::debug!("{:?}", e);
-    }
-
-    Ok(())
+    manager.send_signal(gid, signal).await
 }
diff --git a/backend/src/manager/persistent_container.rs b/backend/src/manager/persistent_container.rs
index 0753a9bb4..e6380bf49 100644
--- a/backend/src/manager/persistent_container.rs
+++ b/backend/src/manager/persistent_container.rs
@@ -4,6 +4,7 @@ use std::time::Duration;
 use color_eyre::eyre::eyre;
 use helpers::UnixRpcClient;
 use models::ProcedureName;
+use nix::sys::signal::Signal;
 use serde::de::DeserializeOwned;
 use tokio::sync::watch::{self, Receiver};
 use tokio::sync::{oneshot, Mutex};
@@ -30,6 +31,9 @@ pub struct PersistentContainer {
     procedures: Mutex<Vec<(ProcedureName, ProcedureId)>>,
 }
 
+// BLUJ TODO Need to get the only action is this and not procedure/<docker,js_scripts>
+// BLUJ Modify the rpc client to match the new type
+
 impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn init(seed: &Arc<ManagerSeed>) -> Result<Self, Error> {
@@ -71,6 +75,7 @@ impl PersistentContainer {
             Err(e) => Err(e),
         }
     }
+
     pub async fn sanboxed<O>(
         &self,
         name: ProcedureName,
@@ -119,6 +124,10 @@ impl PersistentContainer {
     ) -> Result<Result<Value, (i32, String)>, Error> {
         todo!("DRB")
     }
+
+    pub async fn send_signal(&self, gid: Arc<super::Gid>, signal: Signal) -> Result<(), Error> {
+        todo!("DRB")
+    }
 }
 
 pub async fn spawn_persistent_container(
diff --git a/backend/src/procedure/docker.rs b/backend/src/procedure/docker.rs
index 57207d5c9..c6912c97f 100644
--- a/backend/src/procedure/docker.rs
+++ b/backend/src/procedure/docker.rs
@@ -217,443 +217,6 @@ impl DockerProcedure {
         Ok(())
     }
 
-    #[instrument(skip_all)]
-    pub async fn execute<I: Serialize, O: DeserializeOwned>(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        name: ProcedureName,
-        volumes: &Volumes,
-        input: Option<I>,
-        timeout: Option<Duration>,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        let name = name.docker_name();
-        let name: Option<&str> = name.as_deref();
-        let mut cmd = tokio::process::Command::new(CONTAINER_TOOL);
-        let container_name = Self::container_name(pkg_id, name);
-        cmd.arg("run")
-            .arg("--rm")
-            .arg("--network=start9")
-            .arg(format!("--add-host=embassy:{}", Ipv4Addr::from(HOST_IP)))
-            .arg("--name")
-            .arg(&container_name)
-            .arg(format!("--hostname={}", &container_name))
-            .arg("--no-healthcheck")
-            .kill_on_drop(true);
-        remove_container(&container_name, true).await?;
-        cmd.args(self.docker_args(ctx, pkg_id, pkg_version, volumes).await?);
-        let input_buf = if let (Some(input), Some(format)) = (&input, &self.io_format) {
-            cmd.stdin(std::process::Stdio::piped());
-            Some(format.to_vec(input)?)
-        } else {
-            None
-        };
-        cmd.stdout(std::process::Stdio::piped());
-        cmd.stderr(std::process::Stdio::piped());
-        tracing::trace!(
-            "{}",
-            format!("{:?}", cmd)
-                .split(r#"" ""#)
-                .collect::<Vec<&str>>()
-                .join(" ")
-        );
-        let mut handle = cmd.spawn().with_kind(crate::ErrorKind::Docker)?;
-        let id = handle.id();
-        let timeout_fut = if let Some(timeout) = timeout {
-            EitherFuture::Right(async move {
-                tokio::time::sleep(timeout).await;
-
-                Ok(())
-            })
-        } else {
-            EitherFuture::Left(futures::future::pending::<Result<_, Error>>())
-        };
-        if let (Some(input), Some(mut stdin)) = (&input_buf, handle.stdin.take()) {
-            use tokio::io::AsyncWriteExt;
-            stdin
-                .write_all(input)
-                .await
-                .with_kind(crate::ErrorKind::Docker)?;
-            stdin.flush().await?;
-            stdin.shutdown().await?;
-            drop(stdin);
-        }
-        enum Race<T> {
-            Done(T),
-            TimedOut,
-        }
-
-        let io_format = self.io_format;
-        let mut output = BufReader::new(
-            handle
-                .stdout
-                .take()
-                .ok_or_else(|| eyre!("Can't takeout stdout in execute"))
-                .with_kind(crate::ErrorKind::Docker)?,
-        );
-        let output = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            match async {
-                if let Some(format) = io_format {
-                    return match max_by_lines(&mut output, None).await {
-                        MaxByLines::Done(buffer) => {
-                            Ok::<Value, Error>(
-                                match format.from_slice(buffer.as_bytes()) {
-                                    Ok(a) => a,
-                                    Err(e) => {
-                                        tracing::trace!(
-                                        "Failed to deserialize stdout from {}: {}, falling back to UTF-8 string.",
-                                        format,
-                                        e
-                                    );
-                                        Value::String(buffer)
-                                    }
-                                },
-                            )
-                        },
-                        MaxByLines::Error(e) => Err(e),
-                        MaxByLines::Overflow(buffer) => Ok(Value::String(buffer))
-                    }
-                }
-
-                let lines = buf_reader_to_lines(&mut output, 1000).await?;
-                if lines.is_empty() {
-                    return Ok(Value::Null);
-                }
-
-                let joined_output = lines.join("\n");
-                Ok(Value::String(joined_output))
-            }.await {
-                Ok(a) => Ok((a, output)),
-                Err(e) => Err((e, output))
-            }
-        }));
-        let err_output = BufReader::new(
-            handle
-                .stderr
-                .take()
-                .ok_or_else(|| eyre!("Can't takeout std err"))
-                .with_kind(crate::ErrorKind::Docker)?,
-        );
-
-        let err_output = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            let lines = buf_reader_to_lines(err_output, 1000).await?;
-            let joined_output = lines.join("\n");
-            Ok::<_, Error>(joined_output)
-        }));
-
-        let res = tokio::select! {
-            res = handle.wait() => Race::Done(res.with_kind(crate::ErrorKind::Docker)?),
-            res = timeout_fut => {
-                res?;
-                Race::TimedOut
-            },
-        };
-        let exit_status = match res {
-            Race::Done(x) => x,
-            Race::TimedOut => {
-                if let Some(id) = id {
-                    signal::kill(Pid::from_raw(id as i32), signal::SIGKILL)
-                        .with_kind(crate::ErrorKind::Docker)?;
-                }
-                return Ok(Err((143, "Timed out. Retrying soon...".to_owned())));
-            }
-        };
-        Ok(
-            if exit_status.success() || exit_status.code() == Some(143) {
-                Ok(serde_json::from_value(
-                    output
-                        .await
-                        .with_kind(crate::ErrorKind::Unknown)?
-                        .map(|(v, _)| v)
-                        .map_err(|(e, _)| tracing::warn!("{}", e))
-                        .unwrap_or_default(),
-                )
-                .with_kind(crate::ErrorKind::Deserialization)?)
-            } else {
-                Err((
-                    exit_status.code().unwrap_or_default(),
-                    err_output.await.with_kind(crate::ErrorKind::Unknown)??,
-                ))
-            },
-        )
-    }
-
-    #[instrument(skip_all)]
-    pub async fn inject<I: Serialize, O: DeserializeOwned>(
-        &self,
-        _ctx: &RpcContext,
-        pkg_id: &PackageId,
-        _pkg_version: &Version,
-        _name: ProcedureName,
-        _volumes: &Volumes,
-        input: Option<I>,
-        timeout: Option<Duration>,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        let mut cmd = tokio::process::Command::new(CONTAINER_TOOL);
-
-        cmd.arg("exec");
-
-        cmd.args(self.docker_args_inject(pkg_id));
-        let input_buf = if let (Some(input), Some(format)) = (&input, &self.io_format) {
-            cmd.stdin(std::process::Stdio::piped());
-            Some(format.to_vec(input)?)
-        } else {
-            None
-        };
-        cmd.stdout(std::process::Stdio::piped());
-        cmd.stderr(std::process::Stdio::piped());
-        tracing::trace!(
-            "{}",
-            format!("{:?}", cmd)
-                .split(r#"" ""#)
-                .collect::<Vec<&str>>()
-                .join(" ")
-        );
-        let mut handle = cmd.spawn().with_kind(crate::ErrorKind::Docker)?;
-        let id = handle.id();
-        let timeout_fut = if let Some(timeout) = timeout {
-            EitherFuture::Right(async move {
-                tokio::time::sleep(timeout).await;
-
-                Ok(())
-            })
-        } else {
-            EitherFuture::Left(futures::future::pending::<Result<_, Error>>())
-        };
-        if let (Some(input), Some(mut stdin)) = (&input_buf, handle.stdin.take()) {
-            use tokio::io::AsyncWriteExt;
-            stdin
-                .write_all(input)
-                .await
-                .with_kind(crate::ErrorKind::Docker)?;
-            stdin.flush().await?;
-            stdin.shutdown().await?;
-            drop(stdin);
-        }
-        enum Race<T> {
-            Done(T),
-            TimedOut,
-        }
-
-        let io_format = self.io_format;
-        let mut output = BufReader::new(
-            handle
-                .stdout
-                .take()
-                .ok_or_else(|| eyre!("Can't takeout stdout in inject"))
-                .with_kind(crate::ErrorKind::Docker)?,
-        );
-        let output = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            match async {
-                if let Some(format) = io_format {
-                    return match max_by_lines(&mut output, None).await {
-                        MaxByLines::Done(buffer) => {
-                            Ok::<Value, Error>(
-                                match format.from_slice(buffer.as_bytes()) {
-                                    Ok(a) => a,
-                                    Err(e) => {
-                                        tracing::trace!(
-                                        "Failed to deserialize stdout from {}: {}, falling back to UTF-8 string.",
-                                        format,
-                                        e
-                                    );
-                                        Value::String(buffer)
-                                    }
-                                },
-                            )
-                        },
-                        MaxByLines::Error(e) => Err(e),
-                        MaxByLines::Overflow(buffer) => Ok(Value::String(buffer))
-                    }
-                }
-
-                let lines = buf_reader_to_lines(&mut output, 1000).await?;
-                if lines.is_empty() {
-                    return Ok(Value::Null);
-                }
-
-                let joined_output = lines.join("\n");
-                Ok(Value::String(joined_output))
-            }.await {
-                Ok(a) => Ok((a, output)),
-                Err(e) => Err((e, output))
-            }
-        }));
-        let err_output = BufReader::new(
-            handle
-                .stderr
-                .take()
-                .ok_or_else(|| eyre!("Can't takeout std err"))
-                .with_kind(crate::ErrorKind::Docker)?,
-        );
-
-        let err_output = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            let lines = buf_reader_to_lines(err_output, 1000).await?;
-            let joined_output = lines.join("\n");
-            Ok::<_, Error>(joined_output)
-        }));
-
-        let res = tokio::select! {
-            res = handle.wait() => Race::Done(res.with_kind(crate::ErrorKind::Docker)?),
-            res = timeout_fut => {
-                res?;
-                Race::TimedOut
-            },
-        };
-        let exit_status = match res {
-            Race::Done(x) => x,
-            Race::TimedOut => {
-                if let Some(id) = id {
-                    signal::kill(Pid::from_raw(id as i32), signal::SIGKILL)
-                        .with_kind(crate::ErrorKind::Docker)?;
-                }
-                return Ok(Err((143, "Timed out. Retrying soon...".to_owned())));
-            }
-        };
-        Ok(
-            if exit_status.success() || exit_status.code() == Some(143) {
-                Ok(serde_json::from_value(
-                    output
-                        .await
-                        .with_kind(crate::ErrorKind::Unknown)?
-                        .map(|(v, _)| v)
-                        .map_err(|(e, _)| tracing::warn!("{}", e))
-                        .unwrap_or_default(),
-                )
-                .with_kind(crate::ErrorKind::Deserialization)?)
-            } else {
-                Err((
-                    exit_status.code().unwrap_or_default(),
-                    err_output.await.with_kind(crate::ErrorKind::Unknown)??,
-                ))
-            },
-        )
-    }
-
-    #[instrument(skip_all)]
-    pub async fn sandboxed<I: Serialize, O: DeserializeOwned>(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-        input: Option<I>,
-        timeout: Option<Duration>,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        let mut cmd = tokio::process::Command::new(CONTAINER_TOOL);
-        cmd.arg("run").arg("--rm").arg("--network=none");
-        cmd.args(
-            self.docker_args(ctx, pkg_id, pkg_version, &volumes.to_readonly())
-                .await?,
-        );
-        let input_buf = if let (Some(input), Some(format)) = (&input, &self.io_format) {
-            cmd.stdin(std::process::Stdio::piped());
-            Some(format.to_vec(input)?)
-        } else {
-            None
-        };
-        cmd.stdout(std::process::Stdio::piped());
-        cmd.stderr(std::process::Stdio::piped());
-        let mut handle = cmd.spawn().with_kind(crate::ErrorKind::Docker)?;
-        if let (Some(input), Some(stdin)) = (&input_buf, &mut handle.stdin) {
-            use tokio::io::AsyncWriteExt;
-            stdin
-                .write_all(input)
-                .await
-                .with_kind(crate::ErrorKind::Docker)?;
-        }
-
-        let err_output = BufReader::new(
-            handle
-                .stderr
-                .take()
-                .ok_or_else(|| eyre!("Can't takeout std err"))
-                .with_kind(crate::ErrorKind::Docker)?,
-        );
-        let err_output = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            let lines = buf_reader_to_lines(err_output, 1000).await?;
-            let joined_output = lines.join("\n");
-            Ok::<_, Error>(joined_output)
-        }));
-
-        let io_format = self.io_format;
-        let mut output = BufReader::new(
-            handle
-                .stdout
-                .take()
-                .ok_or_else(|| eyre!("Can't takeout stdout in sandboxed"))
-                .with_kind(crate::ErrorKind::Docker)?,
-        );
-        let output = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            match async {
-                if let Some(format) = io_format {
-                    return match max_by_lines(&mut output, None).await {
-                        MaxByLines::Done(buffer) => {
-                            Ok::<Value, Error>(
-                                match format.from_slice(buffer.as_bytes()) {
-                                    Ok(a) => a,
-                                    Err(e) => {
-                                        tracing::trace!(
-                                        "Failed to deserialize stdout from {}: {}, falling back to UTF-8 string.",
-                                        format,
-                                        e
-                                    );
-                                        Value::String(buffer)
-                                    }
-                                },
-                            )
-                        },
-                        MaxByLines::Error(e) => Err(e),
-                        MaxByLines::Overflow(buffer) => Ok(Value::String(buffer))
-                    }
-                }
-
-                let lines = buf_reader_to_lines(&mut output, 1000).await?;
-                if lines.is_empty() {
-                    return Ok(Value::Null);
-                }
-
-                let joined_output = lines.join("\n");
-                Ok(Value::String(joined_output))
-            }.await {
-                Ok(a) => Ok((a, output)),
-                Err(e) => Err((e, output))
-            }
-        }));
-
-        let handle = if let Some(dur) = timeout {
-            async move {
-                tokio::time::timeout(dur, handle.wait())
-                    .await
-                    .with_kind(crate::ErrorKind::Docker)?
-                    .with_kind(crate::ErrorKind::Docker)
-            }
-            .boxed()
-        } else {
-            async { handle.wait().await.with_kind(crate::ErrorKind::Docker) }.boxed()
-        };
-        let exit_status = handle.await?;
-        Ok(
-            if exit_status.success() || exit_status.code() == Some(143) {
-                Ok(serde_json::from_value(
-                    output
-                        .await
-                        .with_kind(crate::ErrorKind::Unknown)?
-                        .map(|(v, _)| v)
-                        .map_err(|(e, _)| tracing::warn!("{}", e))
-                        .unwrap_or_default(),
-                )
-                .with_kind(crate::ErrorKind::Deserialization)?)
-            } else {
-                Err((
-                    exit_status.code().unwrap_or_default(),
-                    err_output.await.with_kind(crate::ErrorKind::Unknown)??,
-                ))
-            },
-        )
-    }
-
     pub fn container_name(pkg_id: &PackageId, name: Option<&str>) -> String {
         if let Some(name) = name {
             format!("{}_{}.{}", pkg_id, name, NET_TLD)
diff --git a/backend/src/procedure/js_scripts.rs b/backend/src/procedure/js_scripts.rs
index 27756b4a3..c27fae29b 100644
--- a/backend/src/procedure/js_scripts.rs
+++ b/backend/src/procedure/js_scripts.rs
@@ -67,125 +67,6 @@ impl JsProcedure {
     pub fn validate(&self, _volumes: &Volumes) -> Result<(), color_eyre::eyre::Report> {
         Ok(())
     }
-
-    #[instrument(skip_all)]
-    pub async fn execute<I: Serialize, O: DeserializeOwned>(
-        &self,
-        directory: &PathBuf,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        name: ProcedureName,
-        volumes: &Volumes,
-        input: Option<I>,
-        timeout: Option<Duration>,
-        _gid: ProcessGroupId,
-        _rpc_client: Option<Arc<UnixRpcClient>>,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        Command::new("start-deno")
-            .arg("execute")
-            .input(Some(&mut std::io::Cursor::new(IoFormat::Json.to_vec(
-                &ExecuteArgs {
-                    procedure: self.clone(),
-                    directory: directory.clone(),
-                    pkg_id: pkg_id.clone(),
-                    pkg_version: pkg_version.clone(),
-                    name,
-                    volumes: volumes.clone(),
-                    input: input.and_then(|x| serde_json::to_value(x).ok()),
-                },
-            )?)))
-            .timeout(timeout)
-            .invoke(ErrorKind::Javascript)
-            .await
-            .and_then(|res| IoFormat::Json.from_slice(&res))
-    }
-
-    #[instrument(skip_all)]
-    pub async fn sandboxed<I: Serialize, O: DeserializeOwned>(
-        &self,
-        directory: &PathBuf,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-        input: Option<I>,
-        timeout: Option<Duration>,
-        name: ProcedureName,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        Command::new("start-deno")
-            .arg("sandbox")
-            .input(Some(&mut std::io::Cursor::new(IoFormat::Json.to_vec(
-                &ExecuteArgs {
-                    procedure: self.clone(),
-                    directory: directory.clone(),
-                    pkg_id: pkg_id.clone(),
-                    pkg_version: pkg_version.clone(),
-                    name,
-                    volumes: volumes.clone(),
-                    input: input.and_then(|x| serde_json::to_value(x).ok()),
-                },
-            )?)))
-            .timeout(timeout)
-            .invoke(ErrorKind::Javascript)
-            .await
-            .and_then(|res| IoFormat::Json.from_slice(&res))
-    }
-
-    #[instrument(skip_all)]
-    pub async fn execute_impl<I: Serialize, O: DeserializeOwned>(
-        &self,
-        directory: &PathBuf,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        name: ProcedureName,
-        volumes: &Volumes,
-        input: Option<I>,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        let res = async move {
-            let running_action = JsExecutionEnvironment::load_from_package(
-                directory,
-                pkg_id,
-                pkg_version,
-                Box::new(volumes.clone()),
-            )
-            .await?
-            .run_action(name, input, self.args.clone());
-            let output: Option<ErrorValue> = running_action.await?;
-            let output: O = unwrap_known_error(output)?;
-            Ok(output)
-        }
-        .await
-        .map_err(|(error, message)| (error.as_code_num(), message));
-
-        Ok(res)
-    }
-
-    #[instrument(skip_all)]
-    pub async fn sandboxed_impl<I: Serialize, O: DeserializeOwned>(
-        &self,
-        directory: &PathBuf,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-        input: Option<I>,
-        name: ProcedureName,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        Ok(async move {
-            let running_action = JsExecutionEnvironment::load_from_package(
-                directory,
-                pkg_id,
-                pkg_version,
-                Box::new(volumes.clone()),
-            )
-            .await?
-            .read_only_effects()
-            .run_action(name, input, self.args.clone());
-            let output: Option<ErrorValue> = running_action.await?;
-            let output: O = unwrap_known_error(output)?;
-            Ok(output)
-        }
-        .await
-        .map_err(|(error, message)| (error.as_code_num(), message)))
-    }
 }
 
 fn unwrap_known_error<O: DeserializeOwned>(
@@ -211,568 +92,3 @@ fn unwrap_known_error<O: DeserializeOwned>(
         },
     }
 }
-
-#[tokio::test]
-async fn js_action_execute() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::GetConfig;
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = Some(serde_json::json!({"test":123}));
-    let timeout = Some(Duration::from_secs(10));
-    let _output: crate::config::action::ConfigRes = js_action
-        .execute(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-    assert_eq!(
-        &std::fs::read_to_string(
-            "test/js_action_execute/package-data/volumes/test-package/data/main/test.log"
-        )
-        .unwrap(),
-        "This is a test"
-    );
-    std::fs::remove_file(
-        "test/js_action_execute/package-data/volumes/test-package/data/main/test.log",
-    )
-    .unwrap();
-}
-
-#[tokio::test]
-async fn js_action_execute_error() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::SetConfig;
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    let output: Result<serde_json::Value, _> = js_action
-        .execute(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap();
-    assert_eq!("Err((2, \"Not setup\"))", &format!("{:?}", output));
-}
-
-#[tokio::test]
-async fn js_action_fetch() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("fetch".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
-
-#[tokio::test]
-async fn js_test_slow() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("slow".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    tracing::debug!("testing start");
-    tokio::select! {
-        a = js_action
-            .execute::<serde_json::Value, serde_json::Value>(
-                &path,
-                &package_id,
-                &package_version,
-                name,
-                &volumes,
-                input,
-                timeout,
-                ProcessGroupId(0),
-                None,
-            ) => { a.unwrap().unwrap(); },
-        _ = tokio::time::sleep(Duration::from_secs(1)) => ()
-    }
-    tracing::debug!("testing end should");
-    tokio::time::sleep(Duration::from_secs(2)).await;
-    tracing::debug!("Done");
-}
-#[tokio::test]
-async fn js_action_var_arg() {
-    let js_action = JsProcedure {
-        args: vec![42.into()],
-    };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("js-action-var-arg".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
-
-#[tokio::test]
-async fn js_action_test_rename() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("test-rename".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
-
-#[tokio::test]
-async fn js_action_test_deep_dir() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("test-deep-dir".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
-#[tokio::test]
-async fn js_action_test_deep_dir_escape() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("test-deep-dir-escape".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
-#[tokio::test]
-async fn js_action_test_zero_dir() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("test-zero-dir".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
-#[tokio::test]
-async fn js_action_test_read_dir() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("test-read-dir".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
-
-#[tokio::test]
-async fn js_rsync() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("test-rsync".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
-
-#[tokio::test]
-async fn js_disk_usage() {
-    let js_action = JsProcedure { args: vec![] };
-    let path: PathBuf = "test/js_action_execute/"
-        .parse::<PathBuf>()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let package_id = "test-package".parse().unwrap();
-    let package_version: Version = "0.3.0.3".parse().unwrap();
-    let name = ProcedureName::Action("test-disk-usage".parse().unwrap());
-    let volumes: Volumes = serde_json::from_value(serde_json::json!({
-        "main": {
-            "type": "data"
-        },
-        "compat": {
-            "type": "assets"
-        },
-        "filebrowser" :{
-            "package-id": "filebrowser",
-            "path": "data",
-            "readonly": true,
-            "type": "pointer",
-            "volume-id": "main",
-        }
-    }))
-    .unwrap();
-    let input: Option<serde_json::Value> = None;
-    let timeout = Some(Duration::from_secs(10));
-    js_action
-        .execute::<serde_json::Value, serde_json::Value>(
-            &path,
-            &package_id,
-            &package_version,
-            name,
-            &volumes,
-            input,
-            timeout,
-            ProcessGroupId(0),
-            None,
-        )
-        .await
-        .unwrap()
-        .unwrap();
-}
diff --git a/backend/src/procedure/mod.rs b/backend/src/procedure/mod.rs
index 7c02a03d5..68b295af9 100644
--- a/backend/src/procedure/mod.rs
+++ b/backend/src/procedure/mod.rs
@@ -69,51 +69,19 @@ impl PackageProcedure {
         timeout: Option<Duration>,
     ) -> Result<Result<O, (i32, String)>, Error> {
         tracing::trace!("Procedure execute {} {} - {:?}", self, pkg_id, name);
-        match self {
-            PackageProcedure::Docker(procedure) if procedure.inject == true => {
-                procedure
-                    .inject(ctx, pkg_id, pkg_version, name, volumes, input, timeout)
-                    .await
-            }
-            PackageProcedure::Docker(procedure) => {
-                procedure
-                    .execute(ctx, pkg_id, pkg_version, name, volumes, input, timeout)
-                    .await
-            }
-            #[cfg(feature = "js_engine")]
-            PackageProcedure::Script(procedure) => {
-                let man = ctx
-                    .managers
-                    .get(&(pkg_id.clone(), pkg_version.clone()))
-                    .await
-                    .ok_or_else(|| {
-                        Error::new(
-                            eyre!("No manager found for {}", pkg_id),
-                            ErrorKind::NotFound,
-                        )
-                    })?;
-                let rpc_client = man.rpc_client();
-                let gid = if matches!(name, ProcedureName::Main) {
-                    man.gid.new_main_gid()
-                } else {
-                    man.gid.new_gid()
-                };
-
-                procedure
-                    .execute(
-                        &ctx.datadir,
-                        pkg_id,
-                        pkg_version,
-                        name,
-                        volumes,
-                        input,
-                        timeout,
-                        gid,
-                        Some(rpc_client),
-                    )
-                    .await
-            }
-        }
+        let manager = ctx
+            .managers
+            .get(&(pkg_id.clone(), pkg_version.clone()))
+            .await
+            .ok_or_else(|| {
+                Error::new(
+                    eyre!("No manager found for {}", pkg_id),
+                    ErrorKind::NotFound,
+                )
+            })?;
+        manager
+            .execute(name, imbl_value::to_value(&input)?, timeout)
+            .await
     }
 
     #[instrument(skip_all)]
@@ -128,27 +96,19 @@ impl PackageProcedure {
         name: ProcedureName,
     ) -> Result<Result<O, (i32, String)>, Error> {
         tracing::trace!("Procedure sandboxed {} {} - {:?}", self, pkg_id, name);
-        match self {
-            PackageProcedure::Docker(procedure) => {
-                procedure
-                    .sandboxed(ctx, pkg_id, pkg_version, volumes, input, timeout)
-                    .await
-            }
-            #[cfg(feature = "js_engine")]
-            PackageProcedure::Script(procedure) => {
-                procedure
-                    .sandboxed(
-                        &ctx.datadir,
-                        pkg_id,
-                        pkg_version,
-                        volumes,
-                        input,
-                        timeout,
-                        name,
-                    )
-                    .await
-            }
-        }
+        let manager = ctx
+            .managers
+            .get(&(pkg_id.clone(), pkg_version.clone()))
+            .await
+            .ok_or_else(|| {
+                Error::new(
+                    eyre!("No manager found for {}", pkg_id),
+                    ErrorKind::NotFound,
+                )
+            })?;
+        manager
+            .sanboxed(name, imbl_value::to_value(&input)?, timeout)
+            .await
     }
 }
 

From fd9685988302800d48250a13a084b3dbdda7f98a Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 10 Nov 2023 14:57:21 -0700
Subject: [PATCH 006/341] [feature]: s9pk v2 (#2507)

* feature: s9pk v2

wip

wip

wip

wip

refactor

* use WriteQueue

* fix proptest

* LoopDev
eager directory hash verification
---
 backend/Cargo.lock                            |  25 ++
 backend/Cargo.toml                            |   2 +
 backend/src/disk/mount/filesystem/loop_dev.rs |  89 ++++++
 backend/src/disk/mount/filesystem/mod.rs      |   1 +
 backend/src/prelude.rs                        |   1 +
 .../s9pk/merkle_archive/directory_contents.rs | 199 +++++++++++++
 .../src/s9pk/merkle_archive/file_contents.rs  |  82 ++++++
 backend/src/s9pk/merkle_archive/hash.rs       |  97 +++++++
 backend/src/s9pk/merkle_archive/mod.rs        | 268 ++++++++++++++++++
 backend/src/s9pk/merkle_archive/sink.rs       |  70 +++++
 .../src/s9pk/merkle_archive/source/http.rs    |  91 ++++++
 backend/src/s9pk/merkle_archive/source/mod.rs | 120 ++++++++
 .../source/multi_cursor_file.rs               |  84 ++++++
 backend/src/s9pk/merkle_archive/test.rs       | 138 +++++++++
 backend/src/s9pk/merkle_archive/varint.rs     | 159 +++++++++++
 .../src/s9pk/merkle_archive/write_queue.rs    |  47 +++
 backend/src/s9pk/mod.rs                       | 249 +---------------
 backend/src/s9pk/specv2.md                    |  28 --
 backend/src/s9pk/{ => v1}/builder.rs          |   0
 backend/src/s9pk/{ => v1}/docker.rs           |   0
 backend/src/s9pk/{ => v1}/git_hash.rs         |   0
 backend/src/s9pk/{ => v1}/header.rs           |   0
 backend/src/s9pk/{ => v1}/manifest.rs         |   0
 backend/src/s9pk/v1/mod.rs                    | 246 ++++++++++++++++
 backend/src/s9pk/{ => v1}/reader.rs           |   0
 backend/src/s9pk/v2/mod.rs                    |  41 +++
 backend/src/s9pk/v2/specv2.md                 |  89 ++++++
 backend/src/util/mod.rs                       |  24 ++
 28 files changed, 1877 insertions(+), 273 deletions(-)
 create mode 100644 backend/src/disk/mount/filesystem/loop_dev.rs
 create mode 100644 backend/src/s9pk/merkle_archive/directory_contents.rs
 create mode 100644 backend/src/s9pk/merkle_archive/file_contents.rs
 create mode 100644 backend/src/s9pk/merkle_archive/hash.rs
 create mode 100644 backend/src/s9pk/merkle_archive/mod.rs
 create mode 100644 backend/src/s9pk/merkle_archive/sink.rs
 create mode 100644 backend/src/s9pk/merkle_archive/source/http.rs
 create mode 100644 backend/src/s9pk/merkle_archive/source/mod.rs
 create mode 100644 backend/src/s9pk/merkle_archive/source/multi_cursor_file.rs
 create mode 100644 backend/src/s9pk/merkle_archive/test.rs
 create mode 100644 backend/src/s9pk/merkle_archive/varint.rs
 create mode 100644 backend/src/s9pk/merkle_archive/write_queue.rs
 delete mode 100644 backend/src/s9pk/specv2.md
 rename backend/src/s9pk/{ => v1}/builder.rs (100%)
 rename backend/src/s9pk/{ => v1}/docker.rs (100%)
 rename backend/src/s9pk/{ => v1}/git_hash.rs (100%)
 rename backend/src/s9pk/{ => v1}/header.rs (100%)
 rename backend/src/s9pk/{ => v1}/manifest.rs (100%)
 create mode 100644 backend/src/s9pk/v1/mod.rs
 rename backend/src/s9pk/{ => v1}/reader.rs (100%)
 create mode 100644 backend/src/s9pk/v2/mod.rs
 create mode 100644 backend/src/s9pk/v2/specv2.md

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 1607bf7f2..bc9a4f09a 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -452,6 +452,19 @@ dependencies = [
  "constant_time_eq",
 ]
 
+[[package]]
+name = "blake3"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if 1.0.0",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
@@ -2385,6 +2398,16 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "integer-encoding"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924df4f0e24e2e7f9cdd90babb0b96f93b20f3ecfa949ea9e6613756b8c8e1bf"
+dependencies = [
+ "async-trait",
+ "tokio",
+]
+
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -4898,6 +4921,7 @@ dependencies = [
  "base64 0.21.4",
  "base64ct",
  "basic-cookies",
+ "blake3",
  "bytes",
  "chrono",
  "ciborium",
@@ -4929,6 +4953,7 @@ dependencies = [
  "include_dir",
  "indexmap 2.0.2",
  "indicatif",
+ "integer-encoding",
  "ipnet",
  "iprange",
  "isocountry",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 444ad3cf3..c7b433f1c 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -52,6 +52,7 @@ base32 = "0.4.0"
 base64 = "0.21.4"
 base64ct = "1.6.0"
 basic-cookies = "0.1.4"
+blake3 = "1.5.0"
 bytes = "1"
 chrono = { version = "0.4.31", features = ["serde"] }
 clap = "3.2.25"
@@ -89,6 +90,7 @@ imbl-value = { git = "https://github.com/Start9Labs/imbl-value.git" }
 include_dir = "0.7.3"
 indexmap = { version = "2.0.2", features = ["serde"] }
 indicatif = { version = "0.17.7", features = ["tokio"] }
+integer-encoding = { version = "4.0.0", features = ["tokio_async"] }
 ipnet = { version = "2.8.0", features = ["serde"] }
 iprange = { version = "0.6.7", features = ["serde"] }
 isocountry = "0.3.2"
diff --git a/backend/src/disk/mount/filesystem/loop_dev.rs b/backend/src/disk/mount/filesystem/loop_dev.rs
new file mode 100644
index 000000000..28a18597d
--- /dev/null
+++ b/backend/src/disk/mount/filesystem/loop_dev.rs
@@ -0,0 +1,89 @@
+use std::os::unix::ffi::OsStrExt;
+use std::path::Path;
+
+use async_trait::async_trait;
+use digest::generic_array::GenericArray;
+use digest::{Digest, OutputSizeUser};
+use serde::{Deserialize, Serialize};
+use sha2::Sha256;
+
+use super::{FileSystem, MountType, ReadOnly};
+use crate::util::Invoke;
+use crate::{Error, ResultExt};
+
+pub async fn mount(
+    logicalname: impl AsRef<Path>,
+    offset: u64,
+    size: u64,
+    mountpoint: impl AsRef<Path>,
+    mount_type: MountType,
+) -> Result<(), Error> {
+    tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
+    let mut opts = format!("loop,offset={offset},sizelimit={size}");
+    if mount_type == ReadOnly {
+        opts += ",ro";
+    }
+
+    tokio::process::Command::new("mount")
+        .arg(logicalname.as_ref())
+        .arg(mountpoint.as_ref())
+        .arg("-o")
+        .arg(opts)
+        .invoke(crate::ErrorKind::Filesystem)
+        .await?;
+    Ok(())
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct LoopDev<LogicalName: AsRef<Path>> {
+    logicalname: LogicalName,
+    offset: u64,
+    size: u64,
+}
+impl<LogicalName: AsRef<Path>> LoopDev<LogicalName> {
+    pub fn new(logicalname: LogicalName, offset: u64, size: u64) -> Self {
+        Self {
+            logicalname,
+            offset,
+            size,
+        }
+    }
+}
+#[async_trait]
+impl<LogicalName: AsRef<Path> + Send + Sync> FileSystem for LoopDev<LogicalName> {
+    async fn mount<P: AsRef<Path> + Send + Sync>(
+        &self,
+        mountpoint: P,
+        mount_type: MountType,
+    ) -> Result<(), Error> {
+        mount(
+            self.logicalname.as_ref(),
+            self.offset,
+            self.size,
+            mountpoint,
+            mount_type,
+        )
+        .await
+    }
+    async fn source_hash(
+        &self,
+    ) -> Result<GenericArray<u8, <Sha256 as OutputSizeUser>::OutputSize>, Error> {
+        let mut sha = Sha256::new();
+        sha.update("LoopDev");
+        sha.update(
+            tokio::fs::canonicalize(self.logicalname.as_ref())
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        self.logicalname.as_ref().display().to_string(),
+                    )
+                })?
+                .as_os_str()
+                .as_bytes(),
+        );
+        sha.update(&u64::to_be_bytes(self.offset)[..]);
+        Ok(sha.finalize())
+    }
+}
diff --git a/backend/src/disk/mount/filesystem/mod.rs b/backend/src/disk/mount/filesystem/mod.rs
index 00247e0dd..11a6671df 100644
--- a/backend/src/disk/mount/filesystem/mod.rs
+++ b/backend/src/disk/mount/filesystem/mod.rs
@@ -14,6 +14,7 @@ pub mod ecryptfs;
 pub mod efivarfs;
 pub mod httpdirfs;
 pub mod label;
+pub mod loop_dev;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum MountType {
diff --git a/backend/src/prelude.rs b/backend/src/prelude.rs
index ab5de1d38..3f70b7a2b 100644
--- a/backend/src/prelude.rs
+++ b/backend/src/prelude.rs
@@ -1,5 +1,6 @@
 pub use color_eyre::eyre::eyre;
 pub use models::OptionExt;
+pub use tracing::instrument;
 
 pub use crate::db::prelude::*;
 pub use crate::ensure_code;
diff --git a/backend/src/s9pk/merkle_archive/directory_contents.rs b/backend/src/s9pk/merkle_archive/directory_contents.rs
new file mode 100644
index 000000000..f662300b6
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/directory_contents.rs
@@ -0,0 +1,199 @@
+use std::collections::BTreeMap;
+use std::path::Path;
+
+use futures::future::BoxFuture;
+use futures::FutureExt;
+use imbl_value::InternedString;
+use tokio::io::AsyncRead;
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::hash::{Hash, HashWriter};
+use crate::s9pk::merkle_archive::sink::{Sink, TrackingWriter};
+use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource, Section};
+use crate::s9pk::merkle_archive::write_queue::WriteQueue;
+use crate::s9pk::merkle_archive::{varint, Entry, EntryContents};
+
+#[derive(Debug)]
+pub struct DirectoryContents<S>(BTreeMap<InternedString, Entry<S>>);
+impl<S> DirectoryContents<S> {
+    pub fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+
+    #[instrument(skip_all)]
+    pub fn get_path(&self, path: impl AsRef<Path>) -> Option<&Entry<S>> {
+        let mut dir = Some(self);
+        let mut res = None;
+        for segment in path.as_ref().into_iter() {
+            let segment = segment.to_str()?;
+            if segment == "/" {
+                continue;
+            }
+            res = dir?.get(segment);
+            if let Some(EntryContents::Directory(d)) = res.as_ref().map(|e| e.as_contents()) {
+                dir = Some(d);
+            } else {
+                dir = None
+            }
+        }
+        res
+    }
+
+    pub fn insert_path(&mut self, path: impl AsRef<Path>, entry: Entry<S>) -> Result<(), Error> {
+        let path = path.as_ref();
+        let (parent, Some(file)) = (path.parent(), path.file_name().and_then(|f| f.to_str()))
+        else {
+            return Err(Error::new(
+                eyre!("cannot create file at root"),
+                ErrorKind::Pack,
+            ));
+        };
+        let mut dir = self;
+        for segment in parent.into_iter().flatten() {
+            let segment = segment
+                .to_str()
+                .ok_or_else(|| Error::new(eyre!("non-utf8 path segment"), ErrorKind::Utf8))?;
+            if segment == "/" {
+                continue;
+            }
+            if !dir.contains_key(segment) {
+                dir.insert(
+                    segment.into(),
+                    Entry::new(EntryContents::Directory(DirectoryContents::new())),
+                );
+            }
+            if let Some(EntryContents::Directory(d)) =
+                dir.get_mut(segment).map(|e| e.as_contents_mut())
+            {
+                dir = d;
+            } else {
+                return Err(Error::new(eyre!("failed to insert entry at path {path:?}: ancestor exists and is not a directory"), ErrorKind::Pack));
+            }
+        }
+        dir.insert(file.into(), entry);
+        Ok(())
+    }
+
+    pub const fn header_size() -> u64 {
+        8 // position: u64 BE
+        + 8 // size: u64 BE
+    }
+
+    #[instrument(skip_all)]
+    pub async fn serialize_header<W: Sink>(&self, position: u64, w: &mut W) -> Result<u64, Error> {
+        use tokio::io::AsyncWriteExt;
+
+        let size = self.toc_size();
+
+        w.write_all(&position.to_be_bytes()).await?;
+        w.write_all(&size.to_be_bytes()).await?;
+
+        Ok(position)
+    }
+
+    pub fn toc_size(&self) -> u64 {
+        self.0.iter().fold(
+            varint::serialized_varint_size(self.0.len() as u64),
+            |acc, (name, entry)| {
+                acc + varint::serialized_varstring_size(&**name) + entry.header_size()
+            },
+        )
+    }
+}
+impl<S: ArchiveSource> DirectoryContents<Section<S>> {
+    #[instrument(skip_all)]
+    pub fn deserialize<'a>(
+        source: &'a S,
+        header: &'a mut (impl AsyncRead + Unpin + Send),
+        sighash: Hash,
+    ) -> BoxFuture<'a, Result<Self, Error>> {
+        async move {
+            use tokio::io::AsyncReadExt;
+
+            let mut position = [0u8; 8];
+            header.read_exact(&mut position).await?;
+            let position = u64::from_be_bytes(position);
+
+            let mut size = [0u8; 8];
+            header.read_exact(&mut size).await?;
+            let size = u64::from_be_bytes(size);
+
+            let mut toc_reader = source.fetch(position, size).await?;
+
+            let len = varint::deserialize_varint(&mut toc_reader).await?;
+            let mut entries = BTreeMap::new();
+            for _ in 0..len {
+                entries.insert(
+                    varint::deserialize_varstring(&mut toc_reader).await?.into(),
+                    Entry::deserialize(source, &mut toc_reader).await?,
+                );
+            }
+
+            let res = Self(entries);
+
+            if res.sighash().await? == sighash {
+                Ok(res)
+            } else {
+                Err(Error::new(
+                    eyre!("hash sum does not match"),
+                    ErrorKind::InvalidSignature,
+                ))
+            }
+        }
+        .boxed()
+    }
+}
+impl<S: FileSource> DirectoryContents<S> {
+    #[instrument(skip_all)]
+    pub fn update_hashes<'a>(&'a mut self, only_missing: bool) -> BoxFuture<'a, Result<(), Error>> {
+        async move {
+            for (_, entry) in &mut self.0 {
+                entry.update_hash(only_missing).await?;
+            }
+            Ok(())
+        }
+        .boxed()
+    }
+
+    #[instrument(skip_all)]
+    pub fn sighash<'a>(&'a self) -> BoxFuture<'a, Result<Hash, Error>> {
+        async move {
+            let mut hasher = TrackingWriter::new(0, HashWriter::new());
+            let mut sig_contents = BTreeMap::new();
+            for (name, entry) in &self.0 {
+                sig_contents.insert(name.clone(), entry.to_missing().await?);
+            }
+            Self(sig_contents)
+                .serialize_toc(&mut WriteQueue::new(0), &mut hasher)
+                .await?;
+            Ok(hasher.into_inner().finalize())
+        }
+        .boxed()
+    }
+
+    #[instrument(skip_all)]
+    pub async fn serialize_toc<'a, W: Sink>(
+        &'a self,
+        queue: &mut WriteQueue<'a, S>,
+        w: &mut W,
+    ) -> Result<(), Error> {
+        varint::serialize_varint(self.0.len() as u64, w).await?;
+        for (name, entry) in self.0.iter() {
+            varint::serialize_varstring(&**name, w).await?;
+            entry.serialize_header(queue.add(entry).await?, w).await?;
+        }
+
+        Ok(())
+    }
+}
+impl<S> std::ops::Deref for DirectoryContents<S> {
+    type Target = BTreeMap<InternedString, Entry<S>>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl<S> std::ops::DerefMut for DirectoryContents<S> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/file_contents.rs b/backend/src/s9pk/merkle_archive/file_contents.rs
new file mode 100644
index 000000000..c02c0e879
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/file_contents.rs
@@ -0,0 +1,82 @@
+use tokio::io::AsyncRead;
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::hash::{Hash, HashWriter};
+use crate::s9pk::merkle_archive::sink::{Sink, TrackingWriter};
+use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource, Section};
+
+#[derive(Debug)]
+pub struct FileContents<S>(S);
+impl<S> FileContents<S> {
+    pub fn new(source: S) -> Self {
+        Self(source)
+    }
+    pub const fn header_size() -> u64 {
+        8 // position: u64 BE
+        + 8 // size: u64 BE
+    }
+}
+impl<S: ArchiveSource> FileContents<Section<S>> {
+    #[instrument(skip_all)]
+    pub async fn deserialize(
+        source: &S,
+        header: &mut (impl AsyncRead + Unpin + Send),
+    ) -> Result<Self, Error> {
+        use tokio::io::AsyncReadExt;
+
+        let mut position = [0u8; 8];
+        header.read_exact(&mut position).await?;
+        let position = u64::from_be_bytes(position);
+
+        let mut size = [0u8; 8];
+        header.read_exact(&mut size).await?;
+        let size = u64::from_be_bytes(size);
+
+        Ok(Self(source.section(position, size)))
+    }
+}
+impl<S: FileSource> FileContents<S> {
+    pub async fn hash(&self) -> Result<Hash, Error> {
+        let mut hasher = TrackingWriter::new(0, HashWriter::new());
+        self.serialize_body(&mut hasher, None).await?;
+        Ok(hasher.into_inner().finalize())
+    }
+    #[instrument(skip_all)]
+    pub async fn serialize_header<W: Sink>(&self, position: u64, w: &mut W) -> Result<u64, Error> {
+        use tokio::io::AsyncWriteExt;
+
+        let size = self.0.size().await?;
+
+        w.write_all(&position.to_be_bytes()).await?;
+        w.write_all(&size.to_be_bytes()).await?;
+
+        Ok(position)
+    }
+    #[instrument(skip_all)]
+    pub async fn serialize_body<W: Sink>(
+        &self,
+        w: &mut W,
+        verify: Option<Hash>,
+    ) -> Result<(), Error> {
+        let start = if verify.is_some() {
+            Some(w.current_position().await?)
+        } else {
+            None
+        };
+        self.0.copy_verify(w, verify).await?;
+        if let Some(start) = start {
+            ensure_code!(
+                w.current_position().await? - start == self.0.size().await?,
+                ErrorKind::Pack,
+                "FileSource::copy wrote a number of bytes that does not match FileSource::size"
+            );
+        }
+        Ok(())
+    }
+}
+impl<S> std::ops::Deref for FileContents<S> {
+    type Target = S;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/hash.rs b/backend/src/s9pk/merkle_archive/hash.rs
new file mode 100644
index 000000000..ae2829012
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/hash.rs
@@ -0,0 +1,97 @@
+pub use blake3::Hash;
+use blake3::Hasher;
+use tokio::io::AsyncWrite;
+
+use crate::prelude::*;
+
+#[pin_project::pin_project]
+pub struct HashWriter {
+    hasher: Hasher,
+}
+impl HashWriter {
+    pub fn new() -> Self {
+        Self {
+            hasher: Hasher::new(),
+        }
+    }
+    pub fn finalize(self) -> Hash {
+        self.hasher.finalize()
+    }
+}
+impl AsyncWrite for HashWriter {
+    fn poll_write(
+        self: std::pin::Pin<&mut Self>,
+        _cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> std::task::Poll<Result<usize, std::io::Error>> {
+        self.project().hasher.update(buf);
+        std::task::Poll::Ready(Ok(buf.len()))
+    }
+    fn poll_flush(
+        self: std::pin::Pin<&mut Self>,
+        _cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        std::task::Poll::Ready(Ok(()))
+    }
+    fn poll_shutdown(
+        self: std::pin::Pin<&mut Self>,
+        _cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        std::task::Poll::Ready(Ok(()))
+    }
+}
+
+#[pin_project::pin_project]
+pub struct VerifyingWriter<W> {
+    verify: Option<(Hasher, Hash)>,
+    #[pin]
+    writer: W,
+}
+impl<W: AsyncWrite> VerifyingWriter<W> {
+    pub fn new(w: W, verify: Option<Hash>) -> Self {
+        Self {
+            verify: verify.map(|v| (Hasher::new(), v)),
+            writer: w,
+        }
+    }
+    pub fn verify(self) -> Result<W, Error> {
+        if let Some((actual, expected)) = self.verify {
+            ensure_code!(
+                actual.finalize() == expected,
+                ErrorKind::InvalidSignature,
+                "hash sum does not match"
+            );
+        }
+        Ok(self.writer)
+    }
+}
+impl<W: AsyncWrite> AsyncWrite for VerifyingWriter<W> {
+    fn poll_write(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> std::task::Poll<Result<usize, std::io::Error>> {
+        let this = self.project();
+        match this.writer.poll_write(cx, buf) {
+            std::task::Poll::Ready(Ok(written)) => {
+                if let Some((h, _)) = this.verify {
+                    h.update(&buf[..written]);
+                }
+                std::task::Poll::Ready(Ok(written))
+            }
+            a => a,
+        }
+    }
+    fn poll_flush(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        self.project().writer.poll_flush(cx)
+    }
+    fn poll_shutdown(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        self.project().writer.poll_shutdown(cx)
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/mod.rs b/backend/src/s9pk/merkle_archive/mod.rs
new file mode 100644
index 000000000..f83cd2464
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/mod.rs
@@ -0,0 +1,268 @@
+use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
+use tokio::io::AsyncRead;
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
+use crate::s9pk::merkle_archive::file_contents::FileContents;
+use crate::s9pk::merkle_archive::hash::Hash;
+use crate::s9pk::merkle_archive::sink::Sink;
+use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource, Section};
+use crate::s9pk::merkle_archive::write_queue::WriteQueue;
+
+pub mod directory_contents;
+pub mod file_contents;
+pub mod hash;
+pub mod sink;
+pub mod source;
+#[cfg(test)]
+mod test;
+pub mod varint;
+pub mod write_queue;
+
+#[derive(Debug)]
+enum Signer {
+    Signed(VerifyingKey, Signature),
+    Signer(SigningKey),
+}
+
+#[derive(Debug)]
+pub struct MerkleArchive<S> {
+    signer: Signer,
+    contents: DirectoryContents<S>,
+}
+impl<S> MerkleArchive<S> {
+    pub fn new(contents: DirectoryContents<S>, signer: SigningKey) -> Self {
+        Self {
+            signer: Signer::Signer(signer),
+            contents,
+        }
+    }
+    pub const fn header_size() -> u64 {
+        32 // pubkey
+                 + 64 // signature
+                 + DirectoryContents::<Section<S>>::header_size()
+    }
+    pub fn contents(&self) -> &DirectoryContents<S> {
+        &self.contents
+    }
+}
+impl<S: ArchiveSource> MerkleArchive<Section<S>> {
+    #[instrument(skip_all)]
+    pub async fn deserialize(
+        source: &S,
+        header: &mut (impl AsyncRead + Unpin + Send),
+    ) -> Result<Self, Error> {
+        use tokio::io::AsyncReadExt;
+
+        let mut pubkey = [0u8; 32];
+        header.read_exact(&mut pubkey).await?;
+        let pubkey = VerifyingKey::from_bytes(&pubkey)?;
+
+        let mut signature = [0u8; 64];
+        header.read_exact(&mut signature).await?;
+        let signature = Signature::from_bytes(&signature);
+
+        let mut sighash = [0u8; 32];
+        header.read_exact(&mut sighash).await?;
+        let sighash = Hash::from_bytes(sighash);
+
+        let contents = DirectoryContents::deserialize(source, header, sighash).await?;
+
+        pubkey.verify_strict(contents.sighash().await?.as_bytes(), &signature)?;
+
+        Ok(Self {
+            signer: Signer::Signed(pubkey, signature),
+            contents,
+        })
+    }
+}
+impl<S: FileSource> MerkleArchive<S> {
+    pub async fn update_hashes(&mut self, only_missing: bool) -> Result<(), Error> {
+        self.contents.update_hashes(only_missing).await
+    }
+    #[instrument(skip_all)]
+    pub async fn serialize<W: Sink>(&self, w: &mut W, verify: bool) -> Result<(), Error> {
+        use tokio::io::AsyncWriteExt;
+
+        let sighash = self.contents.sighash().await?;
+
+        let (pubkey, signature) = match &self.signer {
+            Signer::Signed(pubkey, signature) => (*pubkey, *signature),
+            Signer::Signer(s) => (s.into(), ed25519_dalek::Signer::sign(s, sighash.as_bytes())),
+        };
+
+        w.write_all(pubkey.as_bytes()).await?;
+        w.write_all(&signature.to_bytes()).await?;
+        w.write_all(sighash.as_bytes()).await?;
+        let mut next_pos = w.current_position().await?;
+        next_pos += DirectoryContents::<S>::header_size();
+        self.contents.serialize_header(next_pos, w).await?;
+        next_pos += self.contents.toc_size();
+        let mut queue = WriteQueue::new(next_pos);
+        self.contents.serialize_toc(&mut queue, w).await?;
+        queue.serialize(w, verify).await?;
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub struct Entry<S> {
+    hash: Option<Hash>,
+    contents: EntryContents<S>,
+}
+impl<S> Entry<S> {
+    pub fn new(contents: EntryContents<S>) -> Self {
+        Self {
+            hash: None,
+            contents,
+        }
+    }
+    pub fn hash(&self) -> Option<Hash> {
+        self.hash
+    }
+    pub fn as_contents(&self) -> &EntryContents<S> {
+        &self.contents
+    }
+    pub fn as_contents_mut(&mut self) -> &mut EntryContents<S> {
+        self.hash = None;
+        &mut self.contents
+    }
+    pub fn into_contents(self) -> EntryContents<S> {
+        self.contents
+    }
+    pub fn header_size(&self) -> u64 {
+        32 // hash
+        + self.contents.header_size()
+    }
+}
+impl<S: ArchiveSource> Entry<Section<S>> {
+    #[instrument(skip_all)]
+    pub async fn deserialize(
+        source: &S,
+        header: &mut (impl AsyncRead + Unpin + Send),
+    ) -> Result<Self, Error> {
+        use tokio::io::AsyncReadExt;
+
+        let mut hash = [0u8; 32];
+        header.read_exact(&mut hash).await?;
+        let hash = Hash::from_bytes(hash);
+
+        let contents = EntryContents::deserialize(source, header, hash).await?;
+
+        Ok(Self {
+            hash: Some(hash),
+            contents,
+        })
+    }
+}
+impl<S: FileSource> Entry<S> {
+    pub async fn to_missing(&self) -> Result<Self, Error> {
+        let hash = if let Some(hash) = self.hash {
+            hash
+        } else {
+            self.contents.hash().await?
+        };
+        Ok(Self {
+            hash: Some(hash),
+            contents: EntryContents::Missing,
+        })
+    }
+    pub async fn update_hash(&mut self, only_missing: bool) -> Result<(), Error> {
+        if let EntryContents::Directory(d) = &mut self.contents {
+            d.update_hashes(only_missing).await?;
+        }
+        self.hash = Some(self.contents.hash().await?);
+        Ok(())
+    }
+    #[instrument(skip_all)]
+    pub async fn serialize_header<W: Sink>(
+        &self,
+        position: u64,
+        w: &mut W,
+    ) -> Result<Option<u64>, Error> {
+        use tokio::io::AsyncWriteExt;
+
+        let hash = if let Some(hash) = self.hash {
+            hash
+        } else {
+            self.contents.hash().await?
+        };
+        w.write_all(hash.as_bytes()).await?;
+        self.contents.serialize_header(position, w).await
+    }
+}
+
+#[derive(Debug)]
+pub enum EntryContents<S> {
+    Missing,
+    File(FileContents<S>),
+    Directory(DirectoryContents<S>),
+}
+impl<S> EntryContents<S> {
+    fn type_id(&self) -> u8 {
+        match self {
+            Self::Missing => 0,
+            Self::File(_) => 1,
+            Self::Directory(_) => 2,
+        }
+    }
+    pub fn header_size(&self) -> u64 {
+        1 // type
+        + match self {
+            Self::Missing => 0,
+            Self::File(_) => FileContents::<S>::header_size(),
+            Self::Directory(_) => DirectoryContents::<S>::header_size(),
+        }
+    }
+}
+impl<S: ArchiveSource> EntryContents<Section<S>> {
+    #[instrument(skip_all)]
+    pub async fn deserialize(
+        source: &S,
+        header: &mut (impl AsyncRead + Unpin + Send),
+        hash: Hash,
+    ) -> Result<Self, Error> {
+        use tokio::io::AsyncReadExt;
+
+        let mut type_id = [0u8];
+        header.read_exact(&mut type_id).await?;
+        match type_id[0] {
+            0 => Ok(Self::Missing),
+            1 => Ok(Self::File(FileContents::deserialize(source, header).await?)),
+            2 => Ok(Self::Directory(
+                DirectoryContents::deserialize(source, header, hash).await?,
+            )),
+            id => Err(Error::new(
+                eyre!("Unknown type id {id} found in MerkleArchive"),
+                ErrorKind::ParseS9pk,
+            )),
+        }
+    }
+}
+impl<S: FileSource> EntryContents<S> {
+    pub async fn hash(&self) -> Result<Hash, Error> {
+        match self {
+            Self::Missing => Err(Error::new(
+                eyre!("Cannot compute hash of missing file"),
+                ErrorKind::Pack,
+            )),
+            Self::File(f) => f.hash().await,
+            Self::Directory(d) => d.sighash().await,
+        }
+    }
+    #[instrument(skip_all)]
+    pub async fn serialize_header<W: Sink>(
+        &self,
+        position: u64,
+        w: &mut W,
+    ) -> Result<Option<u64>, Error> {
+        use tokio::io::AsyncWriteExt;
+
+        w.write_all(&[self.type_id()]).await?;
+        Ok(match self {
+            Self::Missing => None,
+            Self::File(f) => Some(f.serialize_header(position, w).await?),
+            Self::Directory(d) => Some(d.serialize_header(position, w).await?),
+        })
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/sink.rs b/backend/src/s9pk/merkle_archive/sink.rs
new file mode 100644
index 000000000..c71377808
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/sink.rs
@@ -0,0 +1,70 @@
+use tokio::io::{AsyncSeek, AsyncWrite};
+
+use crate::prelude::*;
+
+#[async_trait::async_trait]
+pub trait Sink: AsyncWrite + Unpin + Send {
+    async fn current_position(&mut self) -> Result<u64, Error>;
+}
+
+#[async_trait::async_trait]
+impl<S: AsyncWrite + AsyncSeek + Unpin + Send> Sink for S {
+    async fn current_position(&mut self) -> Result<u64, Error> {
+        use tokio::io::AsyncSeekExt;
+
+        Ok(self.stream_position().await?)
+    }
+}
+
+#[async_trait::async_trait]
+impl<W: AsyncWrite + Unpin + Send> Sink for TrackingWriter<W> {
+    async fn current_position(&mut self) -> Result<u64, Error> {
+        Ok(self.position)
+    }
+}
+
+#[pin_project::pin_project]
+pub struct TrackingWriter<W> {
+    position: u64,
+    #[pin]
+    writer: W,
+}
+impl<W> TrackingWriter<W> {
+    pub fn new(start: u64, w: W) -> Self {
+        Self {
+            position: start,
+            writer: w,
+        }
+    }
+    pub fn into_inner(self) -> W {
+        self.writer
+    }
+}
+impl<W: AsyncWrite + Unpin + Send> AsyncWrite for TrackingWriter<W> {
+    fn poll_write(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> std::task::Poll<Result<usize, std::io::Error>> {
+        let this = self.project();
+        match this.writer.poll_write(cx, buf) {
+            std::task::Poll::Ready(Ok(written)) => {
+                *this.position += written as u64;
+                std::task::Poll::Ready(Ok(written))
+            }
+            a => a,
+        }
+    }
+    fn poll_flush(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        self.project().writer.poll_flush(cx)
+    }
+    fn poll_shutdown(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        self.project().writer.poll_shutdown(cx)
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/source/http.rs b/backend/src/s9pk/merkle_archive/source/http.rs
new file mode 100644
index 000000000..f38fd7028
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/source/http.rs
@@ -0,0 +1,91 @@
+use std::sync::Arc;
+
+use bytes::Bytes;
+use futures::stream::BoxStream;
+use futures::{StreamExt, TryStreamExt};
+use http::header::{ACCEPT_RANGES, RANGE};
+use reqwest::{Client, Url};
+use tokio::io::AsyncRead;
+use tokio::sync::Mutex;
+use tokio_util::io::StreamReader;
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::ArchiveSource;
+
+#[derive(Clone)]
+pub struct HttpSource {
+    url: Url,
+    client: Client,
+    range_support: Result<
+        (),
+        (), // Arc<Mutex<Option<RangelessReader>>>
+    >,
+}
+impl HttpSource {
+    pub async fn new(client: Client, url: Url) -> Result<Self, Error> {
+        let range_support = client
+            .head(url.clone())
+            .send()
+            .await
+            .with_kind(ErrorKind::Network)?
+            .error_for_status()
+            .with_kind(ErrorKind::Network)?
+            .headers()
+            .get(ACCEPT_RANGES)
+            .and_then(|s| s.to_str().ok())
+            == Some("bytes");
+        Ok(Self {
+            url,
+            client,
+            range_support: if range_support {
+                Ok(())
+            } else {
+                todo!() // Err(Arc::new(Mutex::new(None)))
+            },
+        })
+    }
+}
+#[async_trait::async_trait]
+impl ArchiveSource for HttpSource {
+    type Reader = HttpReader;
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+        match self.range_support {
+            Ok(_) => Ok(HttpReader::Range(StreamReader::new(if size > 0 {
+                self.client
+                    .get(self.url.clone())
+                    .header(RANGE, format!("bytes={}-{}", position, position + size - 1))
+                    .send()
+                    .await
+                    .with_kind(ErrorKind::Network)?
+                    .error_for_status()
+                    .with_kind(ErrorKind::Network)?
+                    .bytes_stream()
+                    .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+                    .boxed()
+            } else {
+                futures::stream::empty().boxed()
+            }))),
+            _ => todo!(),
+        }
+    }
+}
+
+#[pin_project::pin_project(project = HttpReaderProj)]
+pub enum HttpReader {
+    Range(#[pin] StreamReader<BoxStream<'static, Result<Bytes, std::io::Error>>, Bytes>),
+    // Rangeless(#[pin] RangelessReader),
+}
+impl AsyncRead for HttpReader {
+    fn poll_read(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &mut tokio::io::ReadBuf<'_>,
+    ) -> std::task::Poll<std::io::Result<()>> {
+        match self.project() {
+            HttpReaderProj::Range(r) => r.poll_read(cx, buf),
+            // HttpReaderProj::Rangeless(r) => r.poll_read(cx, buf),
+        }
+    }
+}
+
+// type RangelessReader = StreamReader<BoxStream<'static, Bytes>, Bytes>;
diff --git a/backend/src/s9pk/merkle_archive/source/mod.rs b/backend/src/s9pk/merkle_archive/source/mod.rs
new file mode 100644
index 000000000..3a7d60a40
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/source/mod.rs
@@ -0,0 +1,120 @@
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use blake3::Hash;
+use tokio::fs::File;
+use tokio::io::{AsyncRead, AsyncWrite};
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::hash::VerifyingWriter;
+
+pub mod http;
+pub mod multi_cursor_file;
+
+#[async_trait::async_trait]
+pub trait FileSource: Send + Sync + Sized + 'static {
+    type Reader: AsyncRead + Unpin + Send;
+    async fn size(&self) -> Result<u64, Error>;
+    async fn reader(&self) -> Result<Self::Reader, Error>;
+    async fn copy<W: AsyncWrite + Unpin + Send>(&self, w: &mut W) -> Result<(), Error> {
+        tokio::io::copy(&mut self.reader().await?, w).await?;
+        Ok(())
+    }
+    async fn copy_verify<W: AsyncWrite + Unpin + Send>(
+        &self,
+        w: &mut W,
+        verify: Option<Hash>,
+    ) -> Result<(), Error> {
+        let mut w = VerifyingWriter::new(w, verify);
+        tokio::io::copy(&mut self.reader().await?, &mut w).await?;
+        w.verify()?;
+        Ok(())
+    }
+    async fn to_vec(&self, verify: Option<Hash>) -> Result<Vec<u8>, Error> {
+        let mut vec = Vec::with_capacity(self.size().await? as usize);
+        self.copy_verify(&mut vec, verify).await?;
+        Ok(vec)
+    }
+}
+
+#[async_trait::async_trait]
+impl FileSource for PathBuf {
+    type Reader = File;
+    async fn size(&self) -> Result<u64, Error> {
+        Ok(tokio::fs::metadata(self).await?.len())
+    }
+    async fn reader(&self) -> Result<Self::Reader, Error> {
+        Ok(File::open(self).await?)
+    }
+}
+
+#[async_trait::async_trait]
+impl FileSource for Arc<[u8]> {
+    type Reader = std::io::Cursor<Self>;
+    async fn size(&self) -> Result<u64, Error> {
+        Ok(self.len() as u64)
+    }
+    async fn reader(&self) -> Result<Self::Reader, Error> {
+        Ok(std::io::Cursor::new(self.clone()))
+    }
+    async fn copy<W: AsyncWrite + Unpin + Send>(&self, w: &mut W) -> Result<(), Error> {
+        use tokio::io::AsyncWriteExt;
+
+        w.write_all(&*self).await?;
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+pub trait ArchiveSource: Clone + Send + Sync + Sized + 'static {
+    type Reader: AsyncRead + Unpin + Send;
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error>;
+    async fn copy_to<W: AsyncWrite + Unpin + Send>(
+        &self,
+        position: u64,
+        size: u64,
+        w: &mut W,
+    ) -> Result<(), Error> {
+        tokio::io::copy(&mut self.fetch(position, size).await?, w).await?;
+        Ok(())
+    }
+    fn section(&self, position: u64, size: u64) -> Section<Self> {
+        Section {
+            source: self.clone(),
+            position,
+            size,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl ArchiveSource for Arc<[u8]> {
+    type Reader = tokio::io::Take<std::io::Cursor<Self>>;
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+        use tokio::io::AsyncReadExt;
+
+        let mut cur = std::io::Cursor::new(self.clone());
+        cur.set_position(position);
+        Ok(cur.take(size))
+    }
+}
+
+#[derive(Debug)]
+pub struct Section<S> {
+    source: S,
+    position: u64,
+    size: u64,
+}
+#[async_trait::async_trait]
+impl<S: ArchiveSource> FileSource for Section<S> {
+    type Reader = S::Reader;
+    async fn size(&self) -> Result<u64, Error> {
+        Ok(self.size)
+    }
+    async fn reader(&self) -> Result<Self::Reader, Error> {
+        self.source.fetch(self.position, self.size).await
+    }
+    async fn copy<W: AsyncWrite + Unpin + Send>(&self, w: &mut W) -> Result<(), Error> {
+        self.source.copy_to(self.position, self.size, w).await
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/backend/src/s9pk/merkle_archive/source/multi_cursor_file.rs
new file mode 100644
index 000000000..cda3e5103
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/source/multi_cursor_file.rs
@@ -0,0 +1,84 @@
+use std::io::SeekFrom;
+use std::os::fd::{AsRawFd, RawFd};
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use tokio::fs::File;
+use tokio::io::AsyncRead;
+use tokio::sync::{Mutex, OwnedMutexGuard};
+
+use crate::disk::mount::filesystem::loop_dev::LoopDev;
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::{ArchiveSource, Section};
+
+#[derive(Clone)]
+pub struct MultiCursorFile {
+    fd: RawFd,
+    file: Arc<Mutex<File>>,
+}
+impl MultiCursorFile {
+    fn path(&self) -> PathBuf {
+        Path::new("/proc/self/fd").join(self.fd.to_string())
+    }
+}
+impl From<File> for MultiCursorFile {
+    fn from(value: File) -> Self {
+        Self {
+            fd: value.as_raw_fd(),
+            file: Arc::new(Mutex::new(value)),
+        }
+    }
+}
+
+#[pin_project::pin_project]
+pub struct FileSectionReader {
+    #[pin]
+    file: OwnedMutexGuard<File>,
+    remaining: u64,
+}
+impl AsyncRead for FileSectionReader {
+    fn poll_read(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &mut tokio::io::ReadBuf<'_>,
+    ) -> std::task::Poll<std::io::Result<()>> {
+        let this = self.project();
+        if *this.remaining == 0 {
+            return std::task::Poll::Ready(Ok(()));
+        }
+        let before = buf.filled().len() as u64;
+        let res = std::pin::Pin::new(&mut **this.file.get_mut())
+            .poll_read(cx, &mut buf.take(*this.remaining as usize));
+        *this.remaining = this
+            .remaining
+            .saturating_sub(buf.filled().len() as u64 - before);
+        res
+    }
+}
+
+#[async_trait::async_trait]
+impl ArchiveSource for MultiCursorFile {
+    type Reader = FileSectionReader;
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+        use tokio::io::AsyncSeekExt;
+
+        let mut file = if let Ok(file) = self.file.clone().try_lock_owned() {
+            file
+        } else {
+            Arc::new(Mutex::new(File::open(self.path()).await?))
+                .try_lock_owned()
+                .expect("freshly created")
+        };
+        file.seek(SeekFrom::Start(position)).await?;
+        Ok(Self::Reader {
+            file,
+            remaining: size,
+        })
+    }
+}
+
+impl From<Section<MultiCursorFile>> for LoopDev<PathBuf> {
+    fn from(value: Section<MultiCursorFile>) -> Self {
+        LoopDev::new(value.source.path(), value.position, value.size)
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/test.rs b/backend/src/s9pk/merkle_archive/test.rs
new file mode 100644
index 000000000..430ab4f31
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/test.rs
@@ -0,0 +1,138 @@
+use std::collections::BTreeMap;
+use std::io::Cursor;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use ed25519_dalek::SigningKey;
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
+use crate::s9pk::merkle_archive::file_contents::FileContents;
+use crate::s9pk::merkle_archive::sink::TrackingWriter;
+use crate::s9pk::merkle_archive::source::FileSource;
+use crate::s9pk::merkle_archive::{Entry, EntryContents, MerkleArchive};
+
+/// Creates a MerkleArchive (a1) with the provided files at the provided paths. NOTE: later files can overwrite previous files/directories at the same path
+/// Tests:
+///     - a1.update_hashes(): returns Ok(_)
+///     - a1.serialize(verify: true): returns Ok(s1)
+///     - MerkleArchive::deserialize(s1): returns Ok(a2)
+///     - a2: contains all expected files with expected content
+///     - a2.serialize(verify: true): returns Ok(s2)
+///     - s1 == s2
+#[instrument]
+fn test(files: Vec<(PathBuf, String)>) -> Result<(), Error> {
+    let mut root = DirectoryContents::<Arc<[u8]>>::new();
+    let mut check_set = BTreeMap::<PathBuf, String>::new();
+    for (path, content) in files {
+        if let Err(e) = root.insert_path(
+            &path,
+            Entry::new(EntryContents::File(FileContents::new(
+                content.clone().into_bytes().into(),
+            ))),
+        ) {
+            eprintln!("failed to insert file at {path:?}: {e}");
+        } else {
+            let path = path.strip_prefix("/").unwrap_or(&path);
+            let mut remaining = check_set.split_off(path);
+            while {
+                if let Some((p, s)) = remaining.pop_first() {
+                    if !p.starts_with(path) {
+                        remaining.insert(p, s);
+                        false
+                    } else {
+                        true
+                    }
+                } else {
+                    false
+                }
+            } {}
+            check_set.append(&mut remaining);
+            check_set.insert(path.to_owned(), content);
+        }
+    }
+    let key = SigningKey::generate(&mut rand::thread_rng());
+    let mut a1 = MerkleArchive::new(root, key);
+    tokio::runtime::Builder::new_current_thread()
+        .enable_io()
+        .build()
+        .unwrap()
+        .block_on(async move {
+            a1.update_hashes(true).await?;
+            let mut s1 = Vec::new();
+            a1.serialize(&mut TrackingWriter::new(0, &mut s1), true)
+                .await?;
+            let s1: Arc<[u8]> = s1.into();
+            let a2 = MerkleArchive::deserialize(&s1, &mut Cursor::new(s1.clone())).await?;
+
+            for (path, content) in check_set {
+                match a2
+                    .contents
+                    .get_path(&path)
+                    .map(|e| (e.as_contents(), e.hash()))
+                {
+                    Some((EntryContents::File(f), hash)) => {
+                        ensure_code!(
+                            &f.to_vec(hash).await? == content.as_bytes(),
+                            ErrorKind::ParseS9pk,
+                            "File at {path:?} does not match input"
+                        )
+                    }
+                    _ => {
+                        return Err(Error::new(
+                            eyre!("expected file at {path:?}"),
+                            ErrorKind::ParseS9pk,
+                        ))
+                    }
+                }
+            }
+
+            let mut s2 = Vec::new();
+            a2.serialize(&mut TrackingWriter::new(0, &mut s2), true)
+                .await?;
+            let s2: Arc<[u8]> = s2.into();
+            ensure_code!(s1 == s2, ErrorKind::Pack, "s1 does not match s2");
+
+            Ok(())
+        })
+}
+
+proptest::proptest! {
+    #[test]
+    fn property_test(files: Vec<(PathBuf, String)>) {
+        let files: Vec<(PathBuf, String)> = files.into_iter().filter(|(p, _)| p.file_name().is_some() && p.iter().all(|s| s.to_str().is_some())).collect();
+        if let Err(e) = test(files.clone()) {
+            panic!("{e}\nInput: {files:#?}\n{e:?}");
+        }
+    }
+}
+
+#[test]
+fn test_example_1() {
+    if let Err(e) = test(vec![(Path::new("foo").into(), "bar".into())]) {
+        panic!("{e}\n{e:?}");
+    }
+}
+
+#[test]
+fn test_example_2() {
+    if let Err(e) = test(vec![
+        (Path::new("a/a.txt").into(), "a.txt".into()),
+        (Path::new("a/b/a.txt").into(), "a.txt".into()),
+        (Path::new("a/b/b/a.txt").into(), "a.txt".into()),
+        (Path::new("a/b/c.txt").into(), "c.txt".into()),
+        (Path::new("a/c.txt").into(), "c.txt".into()),
+    ]) {
+        panic!("{e}\n{e:?}");
+    }
+}
+
+#[test]
+fn test_example_3() {
+    if let Err(e) = test(vec![
+        (Path::new("b/a").into(), "𑦪".into()),
+        (Path::new("a/c/a").into(), "·".into()),
+    ]) {
+        panic!("{e}\n{e:?}");
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/varint.rs b/backend/src/s9pk/merkle_archive/varint.rs
new file mode 100644
index 000000000..479b488e6
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/varint.rs
@@ -0,0 +1,159 @@
+use integer_encoding::VarInt;
+use tokio::io::{AsyncRead, AsyncWrite};
+
+use crate::prelude::*;
+
+/// Most-significant byte, == 0x80
+pub const MSB: u8 = 0b1000_0000;
+
+const MAX_STR_LEN: u64 = 1024 * 1024; // 1 MiB
+
+pub fn serialized_varint_size(n: u64) -> u64 {
+    VarInt::required_space(n) as u64
+}
+
+pub async fn serialize_varint<W: AsyncWrite + Unpin + Send>(
+    n: u64,
+    w: &mut W,
+) -> Result<(), Error> {
+    use tokio::io::AsyncWriteExt;
+
+    let mut buf = [0 as u8; 10];
+    let b = n.encode_var(&mut buf);
+    w.write_all(&buf[0..b]).await?;
+
+    Ok(())
+}
+
+pub fn serialized_varstring_size(s: &str) -> u64 {
+    serialized_varint_size(s.len() as u64) + s.len() as u64
+}
+
+pub async fn serialize_varstring<W: AsyncWrite + Unpin + Send>(
+    s: &str,
+    w: &mut W,
+) -> Result<(), Error> {
+    use tokio::io::AsyncWriteExt;
+    serialize_varint(s.len() as u64, w).await?;
+    w.write_all(s.as_bytes()).await?;
+    Ok(())
+}
+
+#[derive(Default)]
+struct VarIntProcessor {
+    buf: [u8; 10],
+    maxsize: usize,
+    i: usize,
+}
+
+impl VarIntProcessor {
+    fn new() -> VarIntProcessor {
+        VarIntProcessor {
+            maxsize: (std::mem::size_of::<u64>() * 8 + 7) / 7,
+            ..VarIntProcessor::default()
+        }
+    }
+    fn push(&mut self, b: u8) -> Result<(), Error> {
+        if self.i >= self.maxsize {
+            return Err(Error::new(
+                eyre!("Unterminated varint"),
+                ErrorKind::ParseS9pk,
+            ));
+        }
+        self.buf[self.i] = b;
+        self.i += 1;
+        Ok(())
+    }
+    fn finished(&self) -> bool {
+        self.i > 0 && (self.buf[self.i - 1] & MSB == 0)
+    }
+    fn decode(&self) -> Option<u64> {
+        Some(u64::decode_var(&self.buf[0..self.i])?.0)
+    }
+}
+
+pub async fn deserialize_varint<R: AsyncRead + Unpin>(r: &mut R) -> Result<u64, Error> {
+    use tokio::io::AsyncReadExt;
+
+    let mut buf = [0 as u8; 1];
+    let mut p = VarIntProcessor::new();
+
+    while !p.finished() {
+        r.read_exact(&mut buf).await?;
+
+        p.push(buf[0])?;
+    }
+
+    p.decode()
+        .ok_or_else(|| Error::new(eyre!("Reached EOF"), ErrorKind::ParseS9pk))
+}
+
+pub async fn deserialize_varstring<R: AsyncRead + Unpin>(r: &mut R) -> Result<String, Error> {
+    use tokio::io::AsyncReadExt;
+
+    let len = std::cmp::min(deserialize_varint(r).await?, MAX_STR_LEN);
+    let mut res = String::with_capacity(len as usize);
+    r.take(len).read_to_string(&mut res).await?;
+    Ok(res)
+}
+
+#[cfg(test)]
+mod test {
+    use std::io::Cursor;
+
+    use crate::prelude::*;
+
+    fn test_int(n: u64) -> Result<(), Error> {
+        let n1 = n;
+        tokio::runtime::Builder::new_current_thread()
+            .enable_io()
+            .build()
+            .unwrap()
+            .block_on(async move {
+                let mut v = Vec::new();
+                super::serialize_varint(n1, &mut v).await?;
+                let n2 = super::deserialize_varint(&mut Cursor::new(v)).await?;
+
+                ensure_code!(n1 == n2, ErrorKind::Deserialization, "n1 does not match n2");
+
+                Ok(())
+            })
+    }
+
+    fn test_string(s: &str) -> Result<(), Error> {
+        let s1 = s;
+        tokio::runtime::Builder::new_current_thread()
+            .enable_io()
+            .build()
+            .unwrap()
+            .block_on(async move {
+                let mut v: Vec<u8> = Vec::new();
+                super::serialize_varstring(&s1, &mut v).await?;
+                let s2 = super::deserialize_varstring(&mut Cursor::new(v)).await?;
+
+                ensure_code!(
+                    s1 == &s2,
+                    ErrorKind::Deserialization,
+                    "s1 does not match s2"
+                );
+
+                Ok(())
+            })
+    }
+
+    proptest::proptest! {
+        #[test]
+        fn proptest_int(n: u64) {
+            if let Err(e) = test_int(n) {
+                panic!("{e}\nInput: {n}\n{e:?}");
+            }
+        }
+
+        #[test]
+        fn proptest_string(s: String) {
+            if let Err(e) = test_string(&s) {
+                panic!("{e}\nInput: {s:?}\n{e:?}");
+            }
+        }
+    }
+}
diff --git a/backend/src/s9pk/merkle_archive/write_queue.rs b/backend/src/s9pk/merkle_archive/write_queue.rs
new file mode 100644
index 000000000..973ffcf30
--- /dev/null
+++ b/backend/src/s9pk/merkle_archive/write_queue.rs
@@ -0,0 +1,47 @@
+use std::collections::VecDeque;
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::sink::Sink;
+use crate::s9pk::merkle_archive::source::FileSource;
+use crate::s9pk::merkle_archive::{Entry, EntryContents};
+use crate::util::MaybeOwned;
+
+pub struct WriteQueue<'a, S> {
+    next_available_position: u64,
+    queue: VecDeque<&'a Entry<S>>,
+}
+
+impl<'a, S> WriteQueue<'a, S> {
+    pub fn new(next_available_position: u64) -> Self {
+        Self {
+            next_available_position,
+            queue: VecDeque::new(),
+        }
+    }
+}
+impl<'a, S: FileSource> WriteQueue<'a, S> {
+    pub async fn add(&mut self, entry: &'a Entry<S>) -> Result<u64, Error> {
+        let res = self.next_available_position;
+        let size = match entry.as_contents() {
+            EntryContents::Missing => return Ok(0),
+            EntryContents::File(f) => f.size().await?,
+            EntryContents::Directory(d) => d.toc_size(),
+        };
+        self.next_available_position += size;
+        self.queue.push_back(entry);
+        Ok(res)
+    }
+    pub async fn serialize<W: Sink>(&mut self, w: &mut W, verify: bool) -> Result<(), Error> {
+        loop {
+            let Some(next) = self.queue.pop_front() else {
+                break;
+            };
+            match next.as_contents() {
+                EntryContents::Missing => (),
+                EntryContents::File(f) => f.serialize_body(w, next.hash.filter(|_| verify)).await?,
+                EntryContents::Directory(d) => d.serialize_toc(self, w).await?,
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/backend/src/s9pk/mod.rs b/backend/src/s9pk/mod.rs
index e1bf4caba..6720f2999 100644
--- a/backend/src/s9pk/mod.rs
+++ b/backend/src/s9pk/mod.rs
@@ -1,246 +1,5 @@
-use std::ffi::OsStr;
-use std::path::PathBuf;
+pub mod merkle_archive;
+pub mod v1;
+pub mod v2;
 
-use color_eyre::eyre::eyre;
-use futures::TryStreamExt;
-use imbl::OrdMap;
-use rpc_toolkit::command;
-use serde_json::Value;
-use tokio::io::AsyncRead;
-use tracing::instrument;
-
-use crate::context::SdkContext;
-use crate::s9pk::builder::S9pkPacker;
-use crate::s9pk::docker::DockerMultiArch;
-use crate::s9pk::git_hash::GitHash;
-use crate::s9pk::manifest::Manifest;
-use crate::s9pk::reader::S9pkReader;
-use crate::util::display_none;
-use crate::util::io::BufferedWriteReader;
-use crate::util::serde::IoFormat;
-use crate::volume::Volume;
-use crate::{Error, ErrorKind, ResultExt};
-
-pub mod builder;
-pub mod docker;
-pub mod git_hash;
-pub mod header;
-pub mod manifest;
-pub mod reader;
-
-pub const SIG_CONTEXT: &[u8] = b"s9pk";
-
-#[command(cli_only, display(display_none))]
-#[instrument(skip_all)]
-pub async fn pack(#[context] ctx: SdkContext, #[arg] path: Option<PathBuf>) -> Result<(), Error> {
-    use tokio::fs::File;
-
-    let path = if let Some(path) = path {
-        path
-    } else {
-        std::env::current_dir()?
-    };
-    let manifest_value: Value = if path.join("manifest.toml").exists() {
-        IoFormat::Toml
-            .from_async_reader(File::open(path.join("manifest.toml")).await?)
-            .await?
-    } else if path.join("manifest.yaml").exists() {
-        IoFormat::Yaml
-            .from_async_reader(File::open(path.join("manifest.yaml")).await?)
-            .await?
-    } else if path.join("manifest.json").exists() {
-        IoFormat::Json
-            .from_async_reader(File::open(path.join("manifest.json")).await?)
-            .await?
-    } else {
-        return Err(Error::new(
-            eyre!("manifest not found"),
-            crate::ErrorKind::Pack,
-        ));
-    };
-
-    let manifest: Manifest = serde_json::from_value::<Manifest>(manifest_value.clone())
-        .with_kind(crate::ErrorKind::Deserialization)?
-        .with_git_hash(GitHash::from_path(&path).await?);
-    let extra_keys =
-        enumerate_extra_keys(&serde_json::to_value(&manifest).unwrap(), &manifest_value);
-    for k in extra_keys {
-        tracing::warn!("Unrecognized Manifest Key: {}", k);
-    }
-
-    let outfile_path = path.join(format!("{}.s9pk", manifest.id));
-    let mut outfile = File::create(outfile_path).await?;
-    S9pkPacker::builder()
-        .manifest(&manifest)
-        .writer(&mut outfile)
-        .license(
-            File::open(path.join(manifest.assets.license_path()))
-                .await
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::Filesystem,
-                        manifest.assets.license_path().display().to_string(),
-                    )
-                })?,
-        )
-        .icon(
-            File::open(path.join(manifest.assets.icon_path()))
-                .await
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::Filesystem,
-                        manifest.assets.icon_path().display().to_string(),
-                    )
-                })?,
-        )
-        .instructions(
-            File::open(path.join(manifest.assets.instructions_path()))
-                .await
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::Filesystem,
-                        manifest.assets.instructions_path().display().to_string(),
-                    )
-                })?,
-        )
-        .docker_images({
-            let docker_images_path = path.join(manifest.assets.docker_images_path());
-            let res: Box<dyn AsyncRead + Unpin + Send + Sync> = if tokio::fs::metadata(&docker_images_path).await?.is_dir() {
-                let tars: Vec<_> = tokio_stream::wrappers::ReadDirStream::new(tokio::fs::read_dir(&docker_images_path).await?).try_collect().await?;
-                let mut arch_info = DockerMultiArch::default();
-                for tar in &tars {
-                    if tar.path().extension() == Some(OsStr::new("tar")) {
-                        arch_info.available.insert(tar.path().file_stem().unwrap_or_default().to_str().unwrap_or_default().to_owned());
-                    }
-                }
-                if arch_info.available.contains("aarch64") {
-                    arch_info.default = "aarch64".to_owned();
-                } else {
-                    arch_info.default = arch_info.available.iter().next().cloned().unwrap_or_default();
-                }
-                let arch_info_cbor = IoFormat::Cbor.to_vec(&arch_info)?;
-                Box::new(BufferedWriteReader::new(|w| async move {
-                    let mut docker_images = tokio_tar::Builder::new(w);
-                    let mut multiarch_header = tokio_tar::Header::new_gnu();
-                    multiarch_header.set_path("multiarch.cbor")?;
-                    multiarch_header.set_size(arch_info_cbor.len() as u64);
-                    multiarch_header.set_cksum();
-                    docker_images.append(&multiarch_header, std::io::Cursor::new(arch_info_cbor)).await?;
-                    for tar in tars
-                    {
-                        docker_images
-                            .append_path_with_name(
-                                tar.path(),
-                                tar.file_name(),
-                            )
-                            .await?;
-                    }
-                    Ok::<_, std::io::Error>(())
-                }, 1024 * 1024))
-            } else {
-                Box::new(File::open(docker_images_path)
-                    .await
-                    .with_ctx(|_| {
-                        (
-                            crate::ErrorKind::Filesystem,
-                            manifest.assets.docker_images_path().display().to_string(),
-                        )
-                    })?)
-            };
-            res
-        })
-        .assets({
-            let asset_volumes = manifest
-            .volumes
-            .iter()
-            .filter(|(_, v)| matches!(v, &&Volume::Assets {})).map(|(id, _)| id.clone()).collect::<Vec<_>>();
-            let assets_path = manifest.assets.assets_path().to_owned();
-            let path = path.clone();
-
-            BufferedWriteReader::new(|w| async move {
-                let mut assets = tokio_tar::Builder::new(w);
-                for asset_volume in asset_volumes
-                {
-                    assets
-                        .append_dir_all(
-                            &asset_volume,
-                            path.join(&assets_path).join(&asset_volume),
-                        )
-                        .await?;
-                }
-                Ok::<_, std::io::Error>(())
-            }, 1024 * 1024)
-        })
-        .scripts({
-            let script_path = path.join(manifest.assets.scripts_path()).join("embassy.js");
-            let needs_script = manifest.package_procedures().any(|a| a.is_script());
-            let has_script = script_path.exists();
-            match (needs_script, has_script) {
-                (true, true) => Some(File::open(script_path).await?),
-                (true, false) => {
-                    return Err(Error::new(eyre!("Script is declared in manifest, but no such script exists at ./scripts/embassy.js"), ErrorKind::Pack).into())
-                }
-                (false, true) => {
-                    tracing::warn!("Manifest does not declare any actions that use scripts, but a script exists at ./scripts/embassy.js");
-                    None
-                }
-                (false, false) => None
-            }
-        })
-        .build()
-        .pack(&ctx.developer_key()?)
-        .await?;
-    outfile.sync_all().await?;
-
-    Ok(())
-}
-
-#[command(rename = "s9pk", cli_only, display(display_none))]
-pub async fn verify(#[arg] path: PathBuf) -> Result<(), Error> {
-    let mut s9pk = S9pkReader::open(path, true).await?;
-    s9pk.validate().await?;
-
-    Ok(())
-}
-
-fn enumerate_extra_keys(reference: &Value, candidate: &Value) -> Vec<String> {
-    match (reference, candidate) {
-        (Value::Object(m_r), Value::Object(m_c)) => {
-            let om_r: OrdMap<String, Value> = m_r.clone().into_iter().collect();
-            let om_c: OrdMap<String, Value> = m_c.clone().into_iter().collect();
-            let common = om_r.clone().intersection(om_c.clone());
-            let top_extra = common.clone().symmetric_difference(om_c.clone());
-            let mut all_extra = top_extra
-                .keys()
-                .map(|s| format!(".{}", s))
-                .collect::<Vec<String>>();
-            for (k, v) in common {
-                all_extra.extend(
-                    enumerate_extra_keys(&v, om_c.get(&k).unwrap())
-                        .into_iter()
-                        .map(|s| format!(".{}{}", k, s)),
-                )
-            }
-            all_extra
-        }
-        (_, Value::Object(m1)) => m1.clone().keys().map(|s| format!(".{}", s)).collect(),
-        _ => Vec::new(),
-    }
-}
-
-#[test]
-fn test_enumerate_extra_keys() {
-    use serde_json::json;
-    let extras = enumerate_extra_keys(
-        &json!({
-            "test": 1,
-            "test2": null,
-        }),
-        &json!({
-            "test": 1,
-            "test2": { "test3": null },
-            "test4": null
-        }),
-    );
-    println!("{:?}", extras)
-}
+pub use v1::*;
diff --git a/backend/src/s9pk/specv2.md b/backend/src/s9pk/specv2.md
deleted file mode 100644
index 9bf993463..000000000
--- a/backend/src/s9pk/specv2.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Header
-
-### Magic
-
-2B: `0x3b3b`
-
-### Version
-
-varint: `0x02`
-
-### Pubkey
-
-32B: ed25519 pubkey
-
-### TOC
-
-- number of sections (varint)
-- FOREACH section
-  - sig (32B: ed25519 signature of BLAKE-3 of rest of section)
-  - name (varstring)
-  - TYPE (varint)
-    - TYPE=FILE (`0x01`)
-      - mime (varstring)
-      - pos (32B: u64 BE)
-      - len (32B: u64 BE)
-      - hash (32B: BLAKE-3 of file contents)
-    - TYPE=TOC (`0x02`)
-      - recursively defined
diff --git a/backend/src/s9pk/builder.rs b/backend/src/s9pk/v1/builder.rs
similarity index 100%
rename from backend/src/s9pk/builder.rs
rename to backend/src/s9pk/v1/builder.rs
diff --git a/backend/src/s9pk/docker.rs b/backend/src/s9pk/v1/docker.rs
similarity index 100%
rename from backend/src/s9pk/docker.rs
rename to backend/src/s9pk/v1/docker.rs
diff --git a/backend/src/s9pk/git_hash.rs b/backend/src/s9pk/v1/git_hash.rs
similarity index 100%
rename from backend/src/s9pk/git_hash.rs
rename to backend/src/s9pk/v1/git_hash.rs
diff --git a/backend/src/s9pk/header.rs b/backend/src/s9pk/v1/header.rs
similarity index 100%
rename from backend/src/s9pk/header.rs
rename to backend/src/s9pk/v1/header.rs
diff --git a/backend/src/s9pk/manifest.rs b/backend/src/s9pk/v1/manifest.rs
similarity index 100%
rename from backend/src/s9pk/manifest.rs
rename to backend/src/s9pk/v1/manifest.rs
diff --git a/backend/src/s9pk/v1/mod.rs b/backend/src/s9pk/v1/mod.rs
new file mode 100644
index 000000000..e1bf4caba
--- /dev/null
+++ b/backend/src/s9pk/v1/mod.rs
@@ -0,0 +1,246 @@
+use std::ffi::OsStr;
+use std::path::PathBuf;
+
+use color_eyre::eyre::eyre;
+use futures::TryStreamExt;
+use imbl::OrdMap;
+use rpc_toolkit::command;
+use serde_json::Value;
+use tokio::io::AsyncRead;
+use tracing::instrument;
+
+use crate::context::SdkContext;
+use crate::s9pk::builder::S9pkPacker;
+use crate::s9pk::docker::DockerMultiArch;
+use crate::s9pk::git_hash::GitHash;
+use crate::s9pk::manifest::Manifest;
+use crate::s9pk::reader::S9pkReader;
+use crate::util::display_none;
+use crate::util::io::BufferedWriteReader;
+use crate::util::serde::IoFormat;
+use crate::volume::Volume;
+use crate::{Error, ErrorKind, ResultExt};
+
+pub mod builder;
+pub mod docker;
+pub mod git_hash;
+pub mod header;
+pub mod manifest;
+pub mod reader;
+
+pub const SIG_CONTEXT: &[u8] = b"s9pk";
+
+#[command(cli_only, display(display_none))]
+#[instrument(skip_all)]
+pub async fn pack(#[context] ctx: SdkContext, #[arg] path: Option<PathBuf>) -> Result<(), Error> {
+    use tokio::fs::File;
+
+    let path = if let Some(path) = path {
+        path
+    } else {
+        std::env::current_dir()?
+    };
+    let manifest_value: Value = if path.join("manifest.toml").exists() {
+        IoFormat::Toml
+            .from_async_reader(File::open(path.join("manifest.toml")).await?)
+            .await?
+    } else if path.join("manifest.yaml").exists() {
+        IoFormat::Yaml
+            .from_async_reader(File::open(path.join("manifest.yaml")).await?)
+            .await?
+    } else if path.join("manifest.json").exists() {
+        IoFormat::Json
+            .from_async_reader(File::open(path.join("manifest.json")).await?)
+            .await?
+    } else {
+        return Err(Error::new(
+            eyre!("manifest not found"),
+            crate::ErrorKind::Pack,
+        ));
+    };
+
+    let manifest: Manifest = serde_json::from_value::<Manifest>(manifest_value.clone())
+        .with_kind(crate::ErrorKind::Deserialization)?
+        .with_git_hash(GitHash::from_path(&path).await?);
+    let extra_keys =
+        enumerate_extra_keys(&serde_json::to_value(&manifest).unwrap(), &manifest_value);
+    for k in extra_keys {
+        tracing::warn!("Unrecognized Manifest Key: {}", k);
+    }
+
+    let outfile_path = path.join(format!("{}.s9pk", manifest.id));
+    let mut outfile = File::create(outfile_path).await?;
+    S9pkPacker::builder()
+        .manifest(&manifest)
+        .writer(&mut outfile)
+        .license(
+            File::open(path.join(manifest.assets.license_path()))
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        manifest.assets.license_path().display().to_string(),
+                    )
+                })?,
+        )
+        .icon(
+            File::open(path.join(manifest.assets.icon_path()))
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        manifest.assets.icon_path().display().to_string(),
+                    )
+                })?,
+        )
+        .instructions(
+            File::open(path.join(manifest.assets.instructions_path()))
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        manifest.assets.instructions_path().display().to_string(),
+                    )
+                })?,
+        )
+        .docker_images({
+            let docker_images_path = path.join(manifest.assets.docker_images_path());
+            let res: Box<dyn AsyncRead + Unpin + Send + Sync> = if tokio::fs::metadata(&docker_images_path).await?.is_dir() {
+                let tars: Vec<_> = tokio_stream::wrappers::ReadDirStream::new(tokio::fs::read_dir(&docker_images_path).await?).try_collect().await?;
+                let mut arch_info = DockerMultiArch::default();
+                for tar in &tars {
+                    if tar.path().extension() == Some(OsStr::new("tar")) {
+                        arch_info.available.insert(tar.path().file_stem().unwrap_or_default().to_str().unwrap_or_default().to_owned());
+                    }
+                }
+                if arch_info.available.contains("aarch64") {
+                    arch_info.default = "aarch64".to_owned();
+                } else {
+                    arch_info.default = arch_info.available.iter().next().cloned().unwrap_or_default();
+                }
+                let arch_info_cbor = IoFormat::Cbor.to_vec(&arch_info)?;
+                Box::new(BufferedWriteReader::new(|w| async move {
+                    let mut docker_images = tokio_tar::Builder::new(w);
+                    let mut multiarch_header = tokio_tar::Header::new_gnu();
+                    multiarch_header.set_path("multiarch.cbor")?;
+                    multiarch_header.set_size(arch_info_cbor.len() as u64);
+                    multiarch_header.set_cksum();
+                    docker_images.append(&multiarch_header, std::io::Cursor::new(arch_info_cbor)).await?;
+                    for tar in tars
+                    {
+                        docker_images
+                            .append_path_with_name(
+                                tar.path(),
+                                tar.file_name(),
+                            )
+                            .await?;
+                    }
+                    Ok::<_, std::io::Error>(())
+                }, 1024 * 1024))
+            } else {
+                Box::new(File::open(docker_images_path)
+                    .await
+                    .with_ctx(|_| {
+                        (
+                            crate::ErrorKind::Filesystem,
+                            manifest.assets.docker_images_path().display().to_string(),
+                        )
+                    })?)
+            };
+            res
+        })
+        .assets({
+            let asset_volumes = manifest
+            .volumes
+            .iter()
+            .filter(|(_, v)| matches!(v, &&Volume::Assets {})).map(|(id, _)| id.clone()).collect::<Vec<_>>();
+            let assets_path = manifest.assets.assets_path().to_owned();
+            let path = path.clone();
+
+            BufferedWriteReader::new(|w| async move {
+                let mut assets = tokio_tar::Builder::new(w);
+                for asset_volume in asset_volumes
+                {
+                    assets
+                        .append_dir_all(
+                            &asset_volume,
+                            path.join(&assets_path).join(&asset_volume),
+                        )
+                        .await?;
+                }
+                Ok::<_, std::io::Error>(())
+            }, 1024 * 1024)
+        })
+        .scripts({
+            let script_path = path.join(manifest.assets.scripts_path()).join("embassy.js");
+            let needs_script = manifest.package_procedures().any(|a| a.is_script());
+            let has_script = script_path.exists();
+            match (needs_script, has_script) {
+                (true, true) => Some(File::open(script_path).await?),
+                (true, false) => {
+                    return Err(Error::new(eyre!("Script is declared in manifest, but no such script exists at ./scripts/embassy.js"), ErrorKind::Pack).into())
+                }
+                (false, true) => {
+                    tracing::warn!("Manifest does not declare any actions that use scripts, but a script exists at ./scripts/embassy.js");
+                    None
+                }
+                (false, false) => None
+            }
+        })
+        .build()
+        .pack(&ctx.developer_key()?)
+        .await?;
+    outfile.sync_all().await?;
+
+    Ok(())
+}
+
+#[command(rename = "s9pk", cli_only, display(display_none))]
+pub async fn verify(#[arg] path: PathBuf) -> Result<(), Error> {
+    let mut s9pk = S9pkReader::open(path, true).await?;
+    s9pk.validate().await?;
+
+    Ok(())
+}
+
+fn enumerate_extra_keys(reference: &Value, candidate: &Value) -> Vec<String> {
+    match (reference, candidate) {
+        (Value::Object(m_r), Value::Object(m_c)) => {
+            let om_r: OrdMap<String, Value> = m_r.clone().into_iter().collect();
+            let om_c: OrdMap<String, Value> = m_c.clone().into_iter().collect();
+            let common = om_r.clone().intersection(om_c.clone());
+            let top_extra = common.clone().symmetric_difference(om_c.clone());
+            let mut all_extra = top_extra
+                .keys()
+                .map(|s| format!(".{}", s))
+                .collect::<Vec<String>>();
+            for (k, v) in common {
+                all_extra.extend(
+                    enumerate_extra_keys(&v, om_c.get(&k).unwrap())
+                        .into_iter()
+                        .map(|s| format!(".{}{}", k, s)),
+                )
+            }
+            all_extra
+        }
+        (_, Value::Object(m1)) => m1.clone().keys().map(|s| format!(".{}", s)).collect(),
+        _ => Vec::new(),
+    }
+}
+
+#[test]
+fn test_enumerate_extra_keys() {
+    use serde_json::json;
+    let extras = enumerate_extra_keys(
+        &json!({
+            "test": 1,
+            "test2": null,
+        }),
+        &json!({
+            "test": 1,
+            "test2": { "test3": null },
+            "test4": null
+        }),
+    );
+    println!("{:?}", extras)
+}
diff --git a/backend/src/s9pk/reader.rs b/backend/src/s9pk/v1/reader.rs
similarity index 100%
rename from backend/src/s9pk/reader.rs
rename to backend/src/s9pk/v1/reader.rs
diff --git a/backend/src/s9pk/v2/mod.rs b/backend/src/s9pk/v2/mod.rs
new file mode 100644
index 000000000..be42d0612
--- /dev/null
+++ b/backend/src/s9pk/v2/mod.rs
@@ -0,0 +1,41 @@
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::sink::Sink;
+use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource, Section};
+use crate::s9pk::merkle_archive::MerkleArchive;
+
+const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x02];
+
+pub struct S9pk<S>(MerkleArchive<S>);
+impl<S: FileSource> S9pk<S> {
+    pub async fn serialize<W: Sink>(&mut self, w: &mut W, verify: bool) -> Result<(), Error> {
+        use tokio::io::AsyncWriteExt;
+
+        w.write_all(MAGIC_AND_VERSION).await?;
+        self.0.serialize(w, verify).await?;
+
+        Ok(())
+    }
+}
+
+impl<S: ArchiveSource> S9pk<Section<S>> {
+    pub async fn deserialize(source: &S) -> Result<Self, Error> {
+        use tokio::io::AsyncReadExt;
+
+        let mut header = source
+            .fetch(
+                0,
+                MAGIC_AND_VERSION.len() as u64 + MerkleArchive::<Section<S>>::header_size(),
+            )
+            .await?;
+
+        let mut magic_version = [0u8; 3];
+        header.read_exact(&mut magic_version).await?;
+        ensure_code!(
+            &magic_version == MAGIC_AND_VERSION,
+            ErrorKind::ParseS9pk,
+            "Invalid Magic or Unexpected Version"
+        );
+
+        Ok(Self(MerkleArchive::deserialize(source, &mut header).await?))
+    }
+}
diff --git a/backend/src/s9pk/v2/specv2.md b/backend/src/s9pk/v2/specv2.md
new file mode 100644
index 000000000..08dc3336e
--- /dev/null
+++ b/backend/src/s9pk/v2/specv2.md
@@ -0,0 +1,89 @@
+## Magic
+
+`0x3b3b`
+
+## Version
+
+`0x02` (varint)
+
+## Merkle Archive
+
+### Header
+
+- ed25519 pubkey (32B)
+- ed25519 signature of TOC sighash (64B)
+- TOC sighash: (32B)
+- TOC position: (8B: u64 BE)
+- TOC size: (8B: u64 BE)
+
+### TOC
+
+- number of entries (varint)
+- FOREACH section
+  - name (varstring)
+  - hash (32B: BLAKE-3 of file contents / TOC sighash)
+  - TYPE (1B)
+    - TYPE=MISSING (`0x00`)
+    - TYPE=FILE (`0x01`)
+      - position (8B: u64 BE)
+      - size (8B: u64 BE)
+    - TYPE=TOC (`0x02`)
+      - position (8B: u64 BE)
+      - size (8B: u64 BE)
+
+#### SigHash
+Hash of TOC with all contents MISSING
+
+### FILE
+
+`<File contents>`
+
+# Example
+
+`foo/bar/baz.txt`
+
+ROOT TOC:
+  - 1 section
+    - name: foo
+      hash: sighash('a)
+      type: TOC
+      position: 'a
+      length: _
+
+'a:
+  - 1 section
+    - name: bar
+      hash: sighash('b)
+      type: TOC
+      position: 'b
+      size: _
+
+'b:
+  - 2 sections
+    - name: baz.txt
+      hash: hash('c)
+      type: FILE
+      position: 'c
+      length: _
+    - name: qux
+      hash: `<unverifiable>`
+      type: MISSING
+
+'c: `<CONTENTS OF baz.txt>`
+
+"foo/"
+hash: _
+size: 15b
+
+"bar.txt"
+hash: _
+size: 5b
+
+`<CONTENTS OF foo/>` (
+  "baz.txt"
+  hash: _
+  size: 2b
+)
+`<CONTENTS OF bar.txt>` ("hello")
+`<CONTENTS OF baz.txt>` ("hi")
+
diff --git a/backend/src/util/mod.rs b/backend/src/util/mod.rs
index 2683f23c8..34c05934b 100644
--- a/backend/src/util/mod.rs
+++ b/backend/src/util/mod.rs
@@ -466,3 +466,27 @@ impl FileLock {
 pub fn assure_send<T: Send>(x: T) -> T {
     x
 }
+
+pub enum MaybeOwned<'a, T> {
+    Borrowed(&'a T),
+    Owned(T),
+}
+impl<'a, T> std::ops::Deref for MaybeOwned<'a, T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        match self {
+            Self::Borrowed(a) => *a,
+            Self::Owned(a) => a,
+        }
+    }
+}
+impl<'a, T> From<T> for MaybeOwned<'a, T> {
+    fn from(value: T) -> Self {
+        MaybeOwned::Owned(value)
+    }
+}
+impl<'a, T> From<&'a T> for MaybeOwned<'a, T> {
+    fn from(value: &'a T) -> Self {
+        MaybeOwned::Borrowed(value)
+    }
+}

From 38a624fecf3109a648e243458660506c729dfa8a Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 13 Nov 2023 10:55:39 -0700
Subject: [PATCH 007/341] chore: Remove the todoes that we have done.

Leaving in the thing about  the rpc client because that will be part of the rewrite, and some of the previous logic should be usefull for the next version of the api. We do need a bidirection but that should world
---
 backend/src/manager/persistent_container.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/backend/src/manager/persistent_container.rs b/backend/src/manager/persistent_container.rs
index e6380bf49..ac141679d 100644
--- a/backend/src/manager/persistent_container.rs
+++ b/backend/src/manager/persistent_container.rs
@@ -31,9 +31,6 @@ pub struct PersistentContainer {
     procedures: Mutex<Vec<(ProcedureName, ProcedureId)>>,
 }
 
-// BLUJ TODO Need to get the only action is this and not procedure/<docker,js_scripts>
-// BLUJ Modify the rpc client to match the new type
-
 impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn init(seed: &Arc<ManagerSeed>) -> Result<Self, Error> {

From a36ab71600632d3a0242a612548e16389c7de3d7 Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:16:21 -0700
Subject: [PATCH 008/341] chore: Add some more comments for DrBones

---
 backend/src/manager/mod.rs                  | 4 ++--
 backend/src/manager/persistent_container.rs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/manager/mod.rs b/backend/src/manager/mod.rs
index 56fa408fd..474ca7e58 100644
--- a/backend/src/manager/mod.rs
+++ b/backend/src/manager/mod.rs
@@ -682,7 +682,7 @@ type RunMainResult = Result<Result<NoOutput, (i32, String)>, Error>;
 
 #[instrument(skip_all)]
 async fn run_main(seed: Arc<ManagerSeed>) -> RunMainResult {
-    let runtime = NonDetachingJoinHandle::from(tokio::spawn(start_up_image(seed.clone())));
+    let runtime = NonDetachingJoinHandle::from(tokio::spawn(execute_main(seed.clone())));
 
     let health = main_health_check_daemon(seed.clone());
     let res = tokio::select! {
@@ -694,7 +694,7 @@ async fn run_main(seed: Arc<ManagerSeed>) -> RunMainResult {
 
 /// We want to start up the manifest, but in this case we want to know that we have generated the certificates.
 /// Note for _generated_certificate: Needed to know that before we start the state we have generated the certificate
-async fn start_up_image(seed: Arc<ManagerSeed>) -> Result<Result<NoOutput, (i32, String)>, Error> {
+async fn execute_main(seed: Arc<ManagerSeed>) -> Result<Result<NoOutput, (i32, String)>, Error> {
     seed.manifest
         .main
         .execute::<(), NoOutput>(
diff --git a/backend/src/manager/persistent_container.rs b/backend/src/manager/persistent_container.rs
index ac141679d..f71b98646 100644
--- a/backend/src/manager/persistent_container.rs
+++ b/backend/src/manager/persistent_container.rs
@@ -21,6 +21,8 @@ use crate::util::NonDetachingJoinHandle;
 
 struct ProcedureId(u64);
 
+// @DRB Need to have a way of starting the the procudures and getting the information back
+// @DRB On top of this we need to also have  the procedures to have the effects and get the results back for them, maybe lock them to the running instance?
 /// Persistant container are the old containers that need to run all the time
 /// The goal is that all services will be persistent containers, waiting to run the main system.
 pub struct PersistentContainer {

From 46f594ab71f9a53a14c25deca8c221cecd03635b Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:18:51 -0700
Subject: [PATCH 009/341] chore: Add in the changes that where discussed with
 @Dr_Bonez in the room

---
 libs/start_init/initSrc/Effects.ts | 4 ++--
 libs/start_init/initSrc/Runtime.ts | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libs/start_init/initSrc/Effects.ts b/libs/start_init/initSrc/Effects.ts
index 13eb9ce0d..7c376b0be 100644
--- a/libs/start_init/initSrc/Effects.ts
+++ b/libs/start_init/initSrc/Effects.ts
@@ -2,14 +2,14 @@ import * as T from "@start9labs/start-sdk/lib/types"
 import * as net from "net"
 import { CallbackHolder } from "./CallbackHolder"
 
-const path = "/start9/sockets/rpcOut.sock"
+const SOCKET_PATH = "/start9/sockets/startDaemon.sock"
 const MAIN = "main" as const
 export class Effects implements T.Effects {
   constructor(readonly method: string, readonly callbackHolder: CallbackHolder) {}
   id = 0
   rpcRound(method: string, params: unknown) {
     const id = this.id++;
-    const client = net.createConnection(path, () => {
+    const client = net.createConnection(SOCKET_PATH, () => {
         client.write(JSON.stringify({
           id,
           method,
diff --git a/libs/start_init/initSrc/Runtime.ts b/libs/start_init/initSrc/Runtime.ts
index b40b987f5..0c4b764c2 100644
--- a/libs/start_init/initSrc/Runtime.ts
+++ b/libs/start_init/initSrc/Runtime.ts
@@ -16,6 +16,10 @@ import { CallbackHolder } from "./CallbackHolder"
 import * as CP from "child_process"
 import * as Mod from "module"
 
+
+const SOCKET_PATH = "/start9/sockets/rpc.sock"
+const LOCATION_OF_SERVICE_JS = "/services/service.js"
+
 const childProcesses = new Map<number, CP.ChildProcess[]>()
 let childProcessIndex = 0
 const require = Mod.prototype.require
@@ -76,7 +80,6 @@ const cleanupRequire = (requireChildProcessIndex: number) => {
 }
 
 const idType = some(string, number)
-const path = "/start9/sockets/rpc.sock"
 const runType = object({
   id: idType,
   method: literal("run"),
@@ -104,7 +107,7 @@ const dealWithInput = async (callbackHolder: CallbackHolder, input: unknown) =>
       const index = setupRequire()
       const effects = new Effects(`/${methodName.join("/")}`, callbackHolder)
       // @ts-ignore
-      return import("/services/service.js")
+      return import(LOCATION_OF_SERVICE_JS)
         .then((x) => methodName.reduce(reduceMethod(methodArgs, effects), x))
         .then()
         .then((result) => ({ id, result }))
@@ -135,7 +138,7 @@ export class Runtime {
   unixSocketServer = net.createServer(async (server) => {})
   private callbacks = new CallbackHolder()
   constructor() {
-    this.unixSocketServer.listen(path)
+    this.unixSocketServer.listen(SOCKET_PATH)
 
     this.unixSocketServer.on("connection", (s) => {
       s.on("data", (a) =>

From 5f40d9400ca58b2b1930d31dbcd2765b96943879 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 13 Nov 2023 15:29:27 -0700
Subject: [PATCH 010/341] move container init system to project root

---
 {libs/start_init => container-runtime}/.gitignore                | 0
 {libs/start_init => container-runtime}/initSrc/CallbackHolder.ts | 0
 {libs/start_init => container-runtime}/initSrc/Effects.ts        | 0
 {libs/start_init => container-runtime}/initSrc/Runtime.ts        | 0
 {libs/start_init => container-runtime}/initSrc/index.ts          | 0
 {libs/start_init => container-runtime}/package-lock.json         | 0
 {libs/start_init => container-runtime}/package.json              | 0
 {libs/start_init => container-runtime}/readme.md                 | 0
 {libs/start_init => container-runtime}/tsconfig.json             | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename {libs/start_init => container-runtime}/.gitignore (100%)
 rename {libs/start_init => container-runtime}/initSrc/CallbackHolder.ts (100%)
 rename {libs/start_init => container-runtime}/initSrc/Effects.ts (100%)
 rename {libs/start_init => container-runtime}/initSrc/Runtime.ts (100%)
 rename {libs/start_init => container-runtime}/initSrc/index.ts (100%)
 rename {libs/start_init => container-runtime}/package-lock.json (100%)
 rename {libs/start_init => container-runtime}/package.json (100%)
 rename {libs/start_init => container-runtime}/readme.md (100%)
 rename {libs/start_init => container-runtime}/tsconfig.json (100%)

diff --git a/libs/start_init/.gitignore b/container-runtime/.gitignore
similarity index 100%
rename from libs/start_init/.gitignore
rename to container-runtime/.gitignore
diff --git a/libs/start_init/initSrc/CallbackHolder.ts b/container-runtime/initSrc/CallbackHolder.ts
similarity index 100%
rename from libs/start_init/initSrc/CallbackHolder.ts
rename to container-runtime/initSrc/CallbackHolder.ts
diff --git a/libs/start_init/initSrc/Effects.ts b/container-runtime/initSrc/Effects.ts
similarity index 100%
rename from libs/start_init/initSrc/Effects.ts
rename to container-runtime/initSrc/Effects.ts
diff --git a/libs/start_init/initSrc/Runtime.ts b/container-runtime/initSrc/Runtime.ts
similarity index 100%
rename from libs/start_init/initSrc/Runtime.ts
rename to container-runtime/initSrc/Runtime.ts
diff --git a/libs/start_init/initSrc/index.ts b/container-runtime/initSrc/index.ts
similarity index 100%
rename from libs/start_init/initSrc/index.ts
rename to container-runtime/initSrc/index.ts
diff --git a/libs/start_init/package-lock.json b/container-runtime/package-lock.json
similarity index 100%
rename from libs/start_init/package-lock.json
rename to container-runtime/package-lock.json
diff --git a/libs/start_init/package.json b/container-runtime/package.json
similarity index 100%
rename from libs/start_init/package.json
rename to container-runtime/package.json
diff --git a/libs/start_init/readme.md b/container-runtime/readme.md
similarity index 100%
rename from libs/start_init/readme.md
rename to container-runtime/readme.md
diff --git a/libs/start_init/tsconfig.json b/container-runtime/tsconfig.json
similarity index 100%
rename from libs/start_init/tsconfig.json
rename to container-runtime/tsconfig.json

From 3b3e1e37b9a35d074d2eb12b17ccd85de42839b8 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 13 Nov 2023 15:38:44 -0700
Subject: [PATCH 011/341] readd core/startos/src/s9pk/mod.rs

---
 core/src/s9pk/mod.rs | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 core/src/s9pk/mod.rs

diff --git a/core/src/s9pk/mod.rs b/core/src/s9pk/mod.rs
new file mode 100644
index 000000000..6720f2999
--- /dev/null
+++ b/core/src/s9pk/mod.rs
@@ -0,0 +1,5 @@
+pub mod merkle_archive;
+pub mod v1;
+pub mod v2;
+
+pub use v1::*;

From 5f7ff460fb440392f45400e7842bcfaf063b2276 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 13 Nov 2023 15:41:35 -0700
Subject: [PATCH 012/341] fix merge

---
 core/src/s9pk/mod.rs                                         | 5 -----
 .../src/s9pk/merkle_archive/directory_contents.rs            | 0
 core/{ => startos}/src/s9pk/merkle_archive/file_contents.rs  | 0
 core/{ => startos}/src/s9pk/merkle_archive/hash.rs           | 0
 core/{ => startos}/src/s9pk/merkle_archive/mod.rs            | 0
 core/{ => startos}/src/s9pk/merkle_archive/sink.rs           | 0
 core/{ => startos}/src/s9pk/merkle_archive/source/http.rs    | 0
 core/{ => startos}/src/s9pk/merkle_archive/source/mod.rs     | 0
 .../src/s9pk/merkle_archive/source/multi_cursor_file.rs      | 0
 core/{ => startos}/src/s9pk/merkle_archive/test.rs           | 0
 core/{ => startos}/src/s9pk/merkle_archive/varint.rs         | 0
 core/{ => startos}/src/s9pk/merkle_archive/write_queue.rs    | 0
 core/{ => startos}/src/s9pk/v1/builder.rs                    | 0
 core/{ => startos}/src/s9pk/v1/docker.rs                     | 0
 core/{ => startos}/src/s9pk/v1/git_hash.rs                   | 0
 core/{ => startos}/src/s9pk/v1/header.rs                     | 0
 core/{ => startos}/src/s9pk/v1/manifest.rs                   | 0
 core/{ => startos}/src/s9pk/v1/mod.rs                        | 0
 core/{ => startos}/src/s9pk/v1/reader.rs                     | 0
 core/{ => startos}/src/s9pk/v2/mod.rs                        | 0
 core/{ => startos}/src/s9pk/v2/specv2.md                     | 0
 21 files changed, 5 deletions(-)
 delete mode 100644 core/src/s9pk/mod.rs
 rename core/{ => startos}/src/s9pk/merkle_archive/directory_contents.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/file_contents.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/hash.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/mod.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/sink.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/source/http.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/source/mod.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/source/multi_cursor_file.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/test.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/varint.rs (100%)
 rename core/{ => startos}/src/s9pk/merkle_archive/write_queue.rs (100%)
 rename core/{ => startos}/src/s9pk/v1/builder.rs (100%)
 rename core/{ => startos}/src/s9pk/v1/docker.rs (100%)
 rename core/{ => startos}/src/s9pk/v1/git_hash.rs (100%)
 rename core/{ => startos}/src/s9pk/v1/header.rs (100%)
 rename core/{ => startos}/src/s9pk/v1/manifest.rs (100%)
 rename core/{ => startos}/src/s9pk/v1/mod.rs (100%)
 rename core/{ => startos}/src/s9pk/v1/reader.rs (100%)
 rename core/{ => startos}/src/s9pk/v2/mod.rs (100%)
 rename core/{ => startos}/src/s9pk/v2/specv2.md (100%)

diff --git a/core/src/s9pk/mod.rs b/core/src/s9pk/mod.rs
deleted file mode 100644
index 6720f2999..000000000
--- a/core/src/s9pk/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod merkle_archive;
-pub mod v1;
-pub mod v2;
-
-pub use v1::*;
diff --git a/core/src/s9pk/merkle_archive/directory_contents.rs b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/directory_contents.rs
rename to core/startos/src/s9pk/merkle_archive/directory_contents.rs
diff --git a/core/src/s9pk/merkle_archive/file_contents.rs b/core/startos/src/s9pk/merkle_archive/file_contents.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/file_contents.rs
rename to core/startos/src/s9pk/merkle_archive/file_contents.rs
diff --git a/core/src/s9pk/merkle_archive/hash.rs b/core/startos/src/s9pk/merkle_archive/hash.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/hash.rs
rename to core/startos/src/s9pk/merkle_archive/hash.rs
diff --git a/core/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/mod.rs
rename to core/startos/src/s9pk/merkle_archive/mod.rs
diff --git a/core/src/s9pk/merkle_archive/sink.rs b/core/startos/src/s9pk/merkle_archive/sink.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/sink.rs
rename to core/startos/src/s9pk/merkle_archive/sink.rs
diff --git a/core/src/s9pk/merkle_archive/source/http.rs b/core/startos/src/s9pk/merkle_archive/source/http.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/source/http.rs
rename to core/startos/src/s9pk/merkle_archive/source/http.rs
diff --git a/core/src/s9pk/merkle_archive/source/mod.rs b/core/startos/src/s9pk/merkle_archive/source/mod.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/source/mod.rs
rename to core/startos/src/s9pk/merkle_archive/source/mod.rs
diff --git a/core/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/source/multi_cursor_file.rs
rename to core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
diff --git a/core/src/s9pk/merkle_archive/test.rs b/core/startos/src/s9pk/merkle_archive/test.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/test.rs
rename to core/startos/src/s9pk/merkle_archive/test.rs
diff --git a/core/src/s9pk/merkle_archive/varint.rs b/core/startos/src/s9pk/merkle_archive/varint.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/varint.rs
rename to core/startos/src/s9pk/merkle_archive/varint.rs
diff --git a/core/src/s9pk/merkle_archive/write_queue.rs b/core/startos/src/s9pk/merkle_archive/write_queue.rs
similarity index 100%
rename from core/src/s9pk/merkle_archive/write_queue.rs
rename to core/startos/src/s9pk/merkle_archive/write_queue.rs
diff --git a/core/src/s9pk/v1/builder.rs b/core/startos/src/s9pk/v1/builder.rs
similarity index 100%
rename from core/src/s9pk/v1/builder.rs
rename to core/startos/src/s9pk/v1/builder.rs
diff --git a/core/src/s9pk/v1/docker.rs b/core/startos/src/s9pk/v1/docker.rs
similarity index 100%
rename from core/src/s9pk/v1/docker.rs
rename to core/startos/src/s9pk/v1/docker.rs
diff --git a/core/src/s9pk/v1/git_hash.rs b/core/startos/src/s9pk/v1/git_hash.rs
similarity index 100%
rename from core/src/s9pk/v1/git_hash.rs
rename to core/startos/src/s9pk/v1/git_hash.rs
diff --git a/core/src/s9pk/v1/header.rs b/core/startos/src/s9pk/v1/header.rs
similarity index 100%
rename from core/src/s9pk/v1/header.rs
rename to core/startos/src/s9pk/v1/header.rs
diff --git a/core/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
similarity index 100%
rename from core/src/s9pk/v1/manifest.rs
rename to core/startos/src/s9pk/v1/manifest.rs
diff --git a/core/src/s9pk/v1/mod.rs b/core/startos/src/s9pk/v1/mod.rs
similarity index 100%
rename from core/src/s9pk/v1/mod.rs
rename to core/startos/src/s9pk/v1/mod.rs
diff --git a/core/src/s9pk/v1/reader.rs b/core/startos/src/s9pk/v1/reader.rs
similarity index 100%
rename from core/src/s9pk/v1/reader.rs
rename to core/startos/src/s9pk/v1/reader.rs
diff --git a/core/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
similarity index 100%
rename from core/src/s9pk/v2/mod.rs
rename to core/startos/src/s9pk/v2/mod.rs
diff --git a/core/src/s9pk/v2/specv2.md b/core/startos/src/s9pk/v2/specv2.md
similarity index 100%
rename from core/src/s9pk/v2/specv2.md
rename to core/startos/src/s9pk/v2/specv2.md

From 0e2fc07881847157599127858304ee325bc561b0 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 13 Nov 2023 16:22:35 -0700
Subject: [PATCH 013/341] remove js-engine

---
 core/Cargo.lock                               |   22 -
 core/Cargo.toml                               |    9 +-
 core/js-engine/Cargo.toml                     |   23 -
 .../src/artifacts/JS_SNAPSHOT.aarch64.bin     |  Bin 547549 -> 0 bytes
 .../src/artifacts/JS_SNAPSHOT.x86_64.bin      |  Bin 493225 -> 0 bytes
 core/js-engine/src/artifacts/loadModule.js    |  242 ----
 core/js-engine/src/lib.rs                     | 1219 -----------------
 core/startos/Cargo.toml                       |    3 +-
 core/startos/src/bins/mod.rs                  |    4 -
 core/startos/src/procedure/js_scripts.rs      |   43 -
 core/startos/src/procedure/mod.rs             |    6 -
 core/startos/src/s9pk/builder.rs              |  145 --
 core/startos/src/s9pk/docker.rs               |   95 --
 core/startos/src/s9pk/git_hash.rs             |   41 -
 core/startos/src/s9pk/header.rs               |  187 ---
 core/startos/src/s9pk/manifest.rs             |  211 ---
 core/startos/src/s9pk/reader.rs               |  406 ------
 core/startos/src/s9pk/specv2.md               |   28 -
 core/startos/src/s9pk/v1/reader.rs            |   10 -
 19 files changed, 2 insertions(+), 2692 deletions(-)
 delete mode 100644 core/js-engine/Cargo.toml
 delete mode 100644 core/js-engine/src/artifacts/JS_SNAPSHOT.aarch64.bin
 delete mode 100644 core/js-engine/src/artifacts/JS_SNAPSHOT.x86_64.bin
 delete mode 100644 core/js-engine/src/artifacts/loadModule.js
 delete mode 100644 core/js-engine/src/lib.rs
 delete mode 100644 core/startos/src/s9pk/builder.rs
 delete mode 100644 core/startos/src/s9pk/docker.rs
 delete mode 100644 core/startos/src/s9pk/git_hash.rs
 delete mode 100644 core/startos/src/s9pk/header.rs
 delete mode 100644 core/startos/src/s9pk/manifest.rs
 delete mode 100644 core/startos/src/s9pk/reader.rs
 delete mode 100644 core/startos/src/s9pk/specv2.md

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 8a6c1dd5c..3c3b693a2 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -2560,27 +2560,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "js-engine"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "container-init",
- "dashmap",
- "deno_ast",
- "deno_core",
- "helpers",
- "itertools 0.11.0",
- "lazy_static",
- "models",
- "reqwest",
- "serde",
- "serde_json",
- "sha2 0.10.8",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.65"
@@ -4995,7 +4974,6 @@ dependencies = [
  "jaq-core",
  "jaq-std",
  "josekit",
- "js-engine",
  "jsonpath_lib",
  "lazy_static",
  "libc",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 894362522..143a830fc 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,10 +1,3 @@
 [workspace]
 
-members = [
-    "container-init",
-    "helpers",
-    "js-engine",
-    "models",
-    "snapshot-creator",
-    "startos",
-]
+members = ["container-init", "helpers", "models", "snapshot-creator", "startos"]
diff --git a/core/js-engine/Cargo.toml b/core/js-engine/Cargo.toml
deleted file mode 100644
index 14205109b..000000000
--- a/core/js-engine/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "js-engine"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-async-trait = "0.1.74"
-dashmap = "5.5.3"
-deno_core = "=0.222.0"
-deno_ast = { version = "=0.29.5", features = ["transpiling"] }
-container-init = { path = "../container-init" }
-reqwest = { version = "0.11.22" }
-sha2 = "0.10.8"
-itertools = "0.11.0"
-lazy_static = "1.4.0"
-models = { path = "../models" }
-helpers = { path = "../helpers" }
-serde = { version = "1.0", features = ["derive", "rc"] }
-serde_json = "1.0"
-tokio = { version = "1", features = ["full"] }
-tracing = "0.1"
diff --git a/core/js-engine/src/artifacts/JS_SNAPSHOT.aarch64.bin b/core/js-engine/src/artifacts/JS_SNAPSHOT.aarch64.bin
deleted file mode 100644
index 305aa2d4cb7922ecf830fd7131b70087418bebd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 547549
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%0DKw7NT7j
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%0AGZyhwiB{T=s#RV`58P!
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
Um+J;v_1sa6xN@WfdoK9-A1@}8+W-In

diff --git a/core/js-engine/src/artifacts/JS_SNAPSHOT.x86_64.bin b/core/js-engine/src/artifacts/JS_SNAPSHOT.x86_64.bin
deleted file mode 100644
index 7f7d106897416a1875ee2ab96c7a5ea07f5d9871..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 493225
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%0DGu
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
JU;_j_{{tuFMBxAc

diff --git a/core/js-engine/src/artifacts/loadModule.js b/core/js-engine/src/artifacts/loadModule.js
deleted file mode 100644
index de30eac89..000000000
--- a/core/js-engine/src/artifacts/loadModule.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import Deno from "/deno_global.js";
-import * as mainModule from "/embassy.js";
-
-function requireParam(param) {
-  throw new Error(`Missing required parameter ${param}`);
-}
-
-/**
- * This is using the simplified json pointer spec, using no escapes and arrays
- * @param {object} obj
- * @param {string} pointer
- * @returns
- */
-function jsonPointerValue(obj, pointer) {
-  const paths = pointer.substring(1).split("/");
-  for (const path of paths) {
-    if (obj == null) {
-      return null;
-    }
-    obj = (obj || {})[path];
-  }
-  return obj;
-}
-
-function maybeDate(value) {
-  if (!value) return value;
-  return new Date(value);
-}
-const writeFile = (
-  {
-    path = requireParam("path"),
-    volumeId = requireParam("volumeId"),
-    toWrite = requireParam("toWrite"),
-  } = requireParam("options"),
-) => Deno.core.opAsync("write_file", volumeId, path, toWrite);
-
-const readFile = (
-  { volumeId = requireParam("volumeId"), path = requireParam("path") } = requireParam("options"),
-) => Deno.core.opAsync("read_file", volumeId, path);
-
-
-
-const runDaemon = (
-  { command = requireParam("command"), args = [] } = requireParam("options"),
-) => {
-  let id = Deno.core.opAsync("start_command", command, args, "inherit", null);
-  let processId = id.then(x => x.processId)
-  let waitPromise = null;
-  return {
-    processId,
-    async wait() {
-      waitPromise = waitPromise || Deno.core.opAsync("wait_command", await processId)
-      return waitPromise
-    },
-    async term(signal = 15) {
-      return Deno.core.opAsync("send_signal", await processId, 15)
-    }
-  }
-};
-const runCommand = async (
-  { command = requireParam("command"), args = [], timeoutMillis = 30000 } = requireParam("options"),
-) => {
-  let id = Deno.core.opAsync("start_command", command, args, "collect", timeoutMillis);
-  let pid = id.then(x => x.processId)
-  return Deno.core.opAsync("wait_command", await pid)
-};
-const signalGroup = async (
-  { gid = requireParam("gid"), signal = requireParam("signal") } = requireParam("gid and signal")
-) => {
-  return Deno.core.opAsync("signal_group", gid, signal);
-};
-const sleep = (timeMs = requireParam("timeMs"),
-) => Deno.core.opAsync("sleep", timeMs);
-
-const rename = (
-  {
-    srcVolume = requireParam("srcVolume"),
-    dstVolume = requirePapram("dstVolume"),
-    srcPath = requireParam("srcPath"),
-    dstPath = requireParam("dstPath"),
-  } = requireParam("options"),
-) => Deno.core.opAsync("rename", srcVolume, srcPath, dstVolume, dstPath);
-const metadata = async (
-  { volumeId = requireParam("volumeId"), path = requireParam("path") } = requireParam("options"),
-) => {
-  const data = await Deno.core.opAsync("metadata", volumeId, path);
-  return {
-    ...data,
-    modified: maybeDate(data.modified),
-    created: maybeDate(data.created),
-    accessed: maybeDate(data.accessed),
-  };
-};
-const removeFile = (
-  { volumeId = requireParam("volumeId"), path = requireParam("path") } = requireParam("options"),
-) => Deno.core.opAsync("remove_file", volumeId, path);
-const isSandboxed = () => Deno.core.ops["is_sandboxed"]();
-
-const writeJsonFile = (
-  {
-    volumeId = requireParam("volumeId"),
-    path = requireParam("path"),
-    toWrite = requireParam("toWrite"),
-  } = requireParam("options"),
-) =>
-  writeFile({
-    volumeId,
-    path,
-    toWrite: JSON.stringify(toWrite),
-  });
-
-const chown = async (
-  {
-    volumeId = requireParam("volumeId"),
-    path = requireParam("path"),
-    uid = requireParam("uid"),
-  } = requireParam("options"),
-) => {
-  return await Deno.core.opAsync("chown", volumeId, path, uid);
-};
-
-const chmod = async (
-  {
-    volumeId = requireParam("volumeId"),
-    path = requireParam("path"),
-    mode = requireParam("mode"),
-  } = requireParam("options"),
-) => {
-  return await Deno.core.opAsync("chmod", volumeId, path, mode);
-};
-const readJsonFile = async (
-  { volumeId = requireParam("volumeId"), path = requireParam("path") } = requireParam("options"),
-) => JSON.parse(await readFile({ volumeId, path }));
-const createDir = (
-  { volumeId = requireParam("volumeId"), path = requireParam("path") } = requireParam("options"),
-) => Deno.core.opAsync("create_dir", volumeId, path);
-
-const readDir = (
-  { volumeId = requireParam("volumeId"), path = requireParam("path") } = requireParam("options"),
-) => Deno.core.opAsync("read_dir", volumeId, path);
-const removeDir = (
-  { volumeId = requireParam("volumeId"), path = requireParam("path") } = requireParam("options"),
-) => Deno.core.opAsync("remove_dir", volumeId, path);
-const trace = (whatToTrace = requireParam('whatToTrace')) => Deno.core.opAsync("log_trace", whatToTrace);
-const warn = (whatToTrace = requireParam('whatToTrace')) => Deno.core.opAsync("log_warn", whatToTrace);
-const error = (whatToTrace = requireParam('whatToTrace')) => Deno.core.opAsync("log_error", whatToTrace);
-const debug = (whatToTrace = requireParam('whatToTrace')) => Deno.core.opAsync("log_debug", whatToTrace);
-const info = (whatToTrace = requireParam('whatToTrace')) => Deno.core.opAsync("log_info", whatToTrace);
-const fetch = async (url = requireParam ('url'), options = null) => {
-  const { body, ...response } = await Deno.core.opAsync("fetch", url, options);
-  const textValue = Promise.resolve(body);
-  return {
-    ...response,
-    text() {
-      return textValue;
-    },
-    json() {
-      return textValue.then((x) => JSON.parse(x));
-    },
-  };
-};
-
-const runRsync = (
-  { 
-    srcVolume = requireParam("srcVolume"),
-    dstVolume = requireParam("dstVolume"),
-    srcPath = requireParam("srcPath"),
-    dstPath = requireParam("dstPath"),
-    options = requireParam("options"),
- } = requireParam("options"),
-) => {
-  let id = Deno.core.opAsync("rsync", srcVolume, srcPath, dstVolume, dstPath, options);
-  let waitPromise = null;
-  return {
-    async id() {
-      return id
-    },
-    async wait() {
-      waitPromise = waitPromise || Deno.core.opAsync("rsync_wait", await id)
-      return waitPromise
-    },
-    async progress() {
-      return Deno.core.opAsync("rsync_progress", await id)
-    }
-  }
-};
-
-const diskUsage = async ({
-  volumeId = requireParam("volumeId"),
-  path = requireParam("path"),
-} = { volumeId: null, path: null }) => {
-  const [used, total] = await Deno.core.opAsync("disk_usage", volumeId, path);
-  return { used, total }
-}
-
-const currentFunction = Deno.core.ops.current_function();
-const input = Deno.core.ops.get_input();
-const variable_args = Deno.core.ops.get_variable_args();
-const setState = (x) => Deno.core.ops.set_value(x);
-const effects = {
-  chmod,
-  chown,
-  writeFile,
-  readFile,
-  writeJsonFile,
-  readJsonFile,
-  error,
-  warn,
-  debug,
-  trace,
-  info,
-  isSandboxed,
-  fetch,
-  removeFile,
-  createDir,
-  removeDir,
-  metadata,
-  rename,
-  runCommand,
-  sleep,
-  runDaemon,
-  signalGroup,
-  runRsync,
-  readDir,
-  diskUsage,
-};
-
-const defaults = {
-  "handleSignal": (effects, { gid, signal }) => {
-    return effects.signalGroup({ gid, signal })
-  }
-}
-
-const runFunction = jsonPointerValue(mainModule, currentFunction) || jsonPointerValue(defaults, currentFunction);
-(async () => {
-  if (typeof runFunction !== "function") {
-    error(`Expecting ${currentFunction} to be a function`);
-    throw new Error(`Expecting ${currentFunction} to be a function`);
-  }
-  const answer = await runFunction(effects, input, ...variable_args);
-  setState(answer);
-})();
diff --git a/core/js-engine/src/lib.rs b/core/js-engine/src/lib.rs
deleted file mode 100644
index b0b9bea37..000000000
--- a/core/js-engine/src/lib.rs
+++ /dev/null
@@ -1,1219 +0,0 @@
-use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
-use std::pin::Pin;
-use std::sync::Arc;
-use std::time::SystemTime;
-
-use deno_core::anyhow::{anyhow, bail};
-use deno_core::error::AnyError;
-use deno_core::{
-    resolve_import, Extension, FastString, JsRuntime, ModuleLoader, ModuleSource,
-    ModuleSourceFuture, ModuleSpecifier, ModuleType, OpDecl, ResolutionKind, RuntimeOptions,
-    Snapshot,
-};
-use helpers::{script_dir, spawn_local, Rsync};
-use models::{PackageId, ProcedureName, Version, VolumeId};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use tokio::io::AsyncReadExt;
-use tokio::sync::Mutex;
-
-lazy_static::lazy_static! {
-    static ref DENO_GLOBAL_JS: ModuleSpecifier = "file:///deno_global.js".parse().unwrap();
-    static ref LOAD_MODULE_JS: ModuleSpecifier = "file:///loadModule.js".parse().unwrap();
-    static ref EMBASSY_JS: ModuleSpecifier = "file:///embassy.js".parse().unwrap();
-}
-
-pub trait PathForVolumeId: Send + Sync {
-    fn path_for(
-        &self,
-        data_dir: &Path,
-        package_id: &PackageId,
-        version: &Version,
-        volume_id: &VolumeId,
-    ) -> Option<PathBuf>;
-    fn readonly(&self, volume_id: &VolumeId) -> bool;
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct JsCode(Arc<str>);
-
-#[derive(Debug, Clone, Copy)]
-pub enum JsError {
-    Unknown,
-    Javascript,
-    Engine,
-    BoundryLayerSerDe,
-    Tokio,
-    FileSystem,
-    Code(i32),
-    Timeout,
-    NotValidProcedureName,
-}
-
-impl JsError {
-    pub fn as_code_num(&self) -> i32 {
-        match self {
-            JsError::Unknown => 1,
-            JsError::Javascript => 2,
-            JsError::Engine => 3,
-            JsError::BoundryLayerSerDe => 4,
-            JsError::Tokio => 5,
-            JsError::FileSystem => 6,
-            JsError::NotValidProcedureName => 7,
-            JsError::Code(code) => *code,
-            JsError::Timeout => 143,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MetadataJs {
-    file_type: String,
-    is_dir: bool,
-    is_file: bool,
-    is_symlink: bool,
-    len: u64,
-    modified: Option<u64>,
-    accessed: Option<u64>,
-    created: Option<u64>,
-    readonly: bool,
-    gid: u32,
-    mode: u32,
-    uid: u32,
-}
-
-#[cfg(target_arch = "x86_64")]
-const SNAPSHOT_BYTES: &[u8] = include_bytes!("./artifacts/JS_SNAPSHOT.x86_64.bin");
-
-#[cfg(target_arch = "aarch64")]
-const SNAPSHOT_BYTES: &[u8] = include_bytes!("./artifacts/JS_SNAPSHOT.aarch64.bin");
-
-#[derive(Clone)]
-struct JsContext {
-    sandboxed: bool,
-    datadir: PathBuf,
-    run_function: String,
-    version: Version,
-    package_id: PackageId,
-    volumes: Arc<dyn PathForVolumeId>,
-    input: Value,
-    variable_args: Vec<serde_json::Value>,
-    rsyncs: Arc<Mutex<(usize, BTreeMap<usize, Rsync>)>>,
-}
-#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "kebab-case")]
-enum ResultType {
-    Error(String),
-    ErrorCode(i32, String),
-    Result(serde_json::Value),
-}
-#[derive(Clone, Default)]
-struct AnswerState(std::sync::Arc<deno_core::parking_lot::Mutex<Value>>);
-
-#[derive(Clone, Debug)]
-struct ModsLoader {
-    code: JsCode,
-}
-
-impl ModuleLoader for ModsLoader {
-    fn resolve(
-        &self,
-        specifier: &str,
-        referrer: &str,
-        _is_main: ResolutionKind,
-    ) -> Result<ModuleSpecifier, AnyError> {
-        if referrer.contains("embassy") {
-            bail!("Embassy.js cannot import anything else");
-        }
-        let s = resolve_import(specifier, referrer).unwrap();
-        Ok(s)
-    }
-
-    fn load(
-        &self,
-        module_specifier: &ModuleSpecifier,
-        maybe_referrer: Option<&ModuleSpecifier>,
-        is_dyn_import: bool,
-    ) -> Pin<Box<ModuleSourceFuture>> {
-        let module_specifier = module_specifier.as_str().to_owned();
-        let module = match &*module_specifier {
-            "file:///deno_global.js" => Ok(ModuleSource::new(
-                ModuleType::JavaScript,
-                FastString::Static("const old_deno = Deno; Deno = null; export default old_deno"),
-                &DENO_GLOBAL_JS,
-            )),
-            "file:///loadModule.js" => Ok(ModuleSource::new(
-                ModuleType::JavaScript,
-                FastString::Static(include_str!("./artifacts/loadModule.js")),
-                &LOAD_MODULE_JS,
-            )),
-            "file:///embassy.js" => Ok(ModuleSource::new(
-                ModuleType::JavaScript,
-                self.code.0.clone().into(),
-                &EMBASSY_JS,
-            )),
-
-            x => Err(anyhow!("Not allowed to import: {}", x)),
-        };
-        let module = module.and_then(|m| {
-            if is_dyn_import {
-                bail!("Will not import dynamic");
-            }
-            match &maybe_referrer {
-                Some(x) if x.as_str() == "file:///embassy.js" => {
-                    bail!("StartJS is not allowed to import")
-                }
-                _ => (),
-            }
-            Ok(m)
-        });
-        Box::pin(async move { module })
-    }
-}
-
-pub struct JsExecutionEnvironment {
-    sandboxed: bool,
-    base_directory: PathBuf,
-    module_loader: ModsLoader,
-    package_id: PackageId,
-    version: Version,
-    volumes: Arc<dyn PathForVolumeId>,
-}
-
-impl JsExecutionEnvironment {
-    pub async fn load_from_package(
-        data_directory: impl AsRef<std::path::Path>,
-        package_id: &PackageId,
-        version: &Version,
-        volumes: Box<dyn PathForVolumeId>,
-    ) -> Result<JsExecutionEnvironment, (JsError, String)> {
-        let data_dir = data_directory.as_ref();
-        let base_directory = data_dir;
-        let js_code = JsCode({
-            let file_path = script_dir(data_dir, package_id, version).join("embassy.js");
-            let mut file = match tokio::fs::File::open(file_path.clone()).await {
-                Ok(x) => x,
-                Err(e) => {
-                    tracing::debug!("path: {:?}", file_path);
-                    tracing::debug!("{:?}", e);
-                    return Err((
-                        JsError::FileSystem,
-                        format!("The file opening '{:?}' created error: {}", file_path, e),
-                    ));
-                }
-            };
-            let mut buffer = Default::default();
-            if let Err(err) = file.read_to_string(&mut buffer).await {
-                tracing::debug!("{:?}", err);
-                return Err((
-                    JsError::FileSystem,
-                    format!("The file reading created error: {}", err),
-                ));
-            };
-            buffer.into()
-        });
-        Ok(JsExecutionEnvironment {
-            base_directory: base_directory.to_owned(),
-            module_loader: ModsLoader { code: js_code },
-            package_id: package_id.clone(),
-            version: version.clone(),
-            volumes: volumes.into(),
-            sandboxed: false,
-        })
-    }
-    pub fn read_only_effects(mut self) -> Self {
-        self.sandboxed = true;
-        self
-    }
-
-    pub async fn run_action<I: Serialize, O: for<'de> Deserialize<'de>>(
-        self,
-        procedure_name: ProcedureName,
-        input: Option<I>,
-        variable_args: Vec<serde_json::Value>,
-    ) -> Result<O, (JsError, String)> {
-        let input = match serde_json::to_value(input) {
-            Ok(a) => a,
-            Err(err) => {
-                tracing::error!("{}", err);
-                tracing::debug!("{:?}", err);
-                return Err((
-                    JsError::BoundryLayerSerDe,
-                    "Couldn't convert input".to_string(),
-                ));
-            }
-        };
-        let safer_handle = spawn_local(|| self.execute(procedure_name, input, variable_args)).await;
-        let output = safer_handle.await.unwrap()?;
-        match serde_json::from_value(output.clone()) {
-            Ok(x) => Ok(x),
-            Err(err) => {
-                tracing::error!("{}", err);
-                tracing::debug!("{:?}", err);
-                Err((
-                    JsError::BoundryLayerSerDe,
-                    format!(
-                        "Couldn't convert output = {:#?} to the correct type",
-                        serde_json::to_string_pretty(&output).unwrap_or_default()
-                    ),
-                ))
-            }
-        }
-    }
-    fn declarations() -> Vec<OpDecl> {
-        vec![
-            fns::chown::decl(),
-            fns::chmod::decl(),
-            fns::fetch::decl(),
-            fns::read_file::decl(),
-            fns::metadata::decl(),
-            fns::write_file::decl(),
-            fns::rename::decl(),
-            fns::remove_file::decl(),
-            fns::create_dir::decl(),
-            fns::remove_dir::decl(),
-            fns::read_dir::decl(),
-            fns::disk_usage::decl(),
-            fns::current_function::decl(),
-            fns::log_trace::decl(),
-            fns::log_warn::decl(),
-            fns::log_error::decl(),
-            fns::log_debug::decl(),
-            fns::log_info::decl(),
-            fns::get_input::decl(),
-            fns::get_variable_args::decl(),
-            fns::set_value::decl(),
-            fns::is_sandboxed::decl(),
-            fns::sleep::decl(),
-            fns::rsync::decl(),
-            fns::rsync_wait::decl(),
-            fns::rsync_progress::decl(),
-        ]
-    }
-
-    async fn execute(
-        self,
-        procedure_name: ProcedureName,
-        input: Value,
-        variable_args: Vec<serde_json::Value>,
-    ) -> Result<Value, (JsError, String)> {
-        let base_directory = self.base_directory.clone();
-        let answer_state = AnswerState::default();
-        let ext_answer_state = answer_state.clone();
-        let js_ctx = JsContext {
-            datadir: base_directory,
-            run_function: procedure_name
-                .js_function_name()
-                .map(Ok)
-                .unwrap_or_else(|| {
-                    Err((
-                        JsError::NotValidProcedureName,
-                        format!("procedure is not value: {:?}", procedure_name),
-                    ))
-                })?,
-            package_id: self.package_id.clone(),
-            volumes: self.volumes.clone(),
-            version: self.version.clone(),
-            sandboxed: self.sandboxed,
-            input,
-            variable_args,
-            rsyncs: Default::default(),
-        };
-        let ext = Extension::builder("embassy")
-            .ops(Self::declarations())
-            .state(move |state| {
-                state.put(ext_answer_state.clone());
-                state.put(js_ctx);
-            })
-            .build();
-
-        let loader = std::rc::Rc::new(self.module_loader.clone());
-        let runtime_options = RuntimeOptions {
-            module_loader: Some(loader),
-            extensions: vec![ext],
-            startup_snapshot: Some(Snapshot::Static(SNAPSHOT_BYTES)),
-            ..Default::default()
-        };
-        let mut runtime = JsRuntime::new(runtime_options);
-
-        let future = async move {
-            let mod_id = runtime
-                .load_main_module(&"file:///loadModule.js".parse().unwrap(), None)
-                .await?;
-            let evaluated = runtime.mod_evaluate(mod_id);
-            let res = runtime.run_event_loop(false).await;
-            res?;
-            evaluated.await??;
-            Ok::<_, AnyError>(())
-        };
-
-        future.await.map_err(|e| {
-            tracing::debug!("{:?}", e);
-            (JsError::Javascript, format!("{}", e))
-        })?;
-
-        let answer = answer_state.0.lock().clone();
-        Ok(answer)
-    }
-}
-
-/// Note: Make sure that we have the assumption that all these methods are callable at any time, and all call restrictions should be in rust
-mod fns {
-    use std::cell::RefCell;
-    use std::collections::BTreeMap;
-    use std::convert::TryFrom;
-    use std::fs::Permissions;
-    use std::os::unix::fs::MetadataExt;
-    use std::os::unix::prelude::PermissionsExt;
-    use std::path::{Path, PathBuf};
-    use std::rc::Rc;
-    use std::time::Duration;
-
-    use container_init::ProcessId;
-    use deno_core::anyhow::{anyhow, bail};
-    use deno_core::error::AnyError;
-    use deno_core::*;
-    use helpers::{to_tmp_path, AtomicFile, Rsync, RsyncOptions};
-    use itertools::Itertools;
-    use models::VolumeId;
-    use serde::{Deserialize, Serialize};
-    use serde_json::Value;
-    use tokio::io::AsyncWriteExt;
-    use tokio::process::Command;
-
-    use super::{AnswerState, JsContext};
-    use crate::{system_time_as_unix_ms, MetadataJs};
-
-    #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Default)]
-    struct FetchOptions {
-        method: Option<String>,
-        headers: Option<BTreeMap<String, String>>,
-        body: Option<String>,
-    }
-    #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, Default)]
-    struct FetchResponse {
-        method: String,
-        ok: bool,
-        status: u32,
-        headers: BTreeMap<String, String>,
-        body: Option<String>,
-    }
-    #[op]
-    async fn fetch(
-        state: Rc<RefCell<OpState>>,
-        url: url::Url,
-        options: Option<FetchOptions>,
-    ) -> Result<FetchResponse, AnyError> {
-        let sandboxed = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            ctx.sandboxed
-        };
-
-        if sandboxed {
-            bail!("Will not run fetch in sandboxed mode");
-        }
-
-        let client = reqwest::Client::new();
-        let options = options.unwrap_or_default();
-        let method = options
-            .method
-            .unwrap_or_else(|| "GET".to_string())
-            .to_uppercase();
-        let mut request_builder = match &*method {
-            "GET" => client.get(url),
-            "POST" => client.post(url),
-            "PUT" => client.put(url),
-            "DELETE" => client.delete(url),
-            "HEAD" => client.head(url),
-            "PATCH" => client.patch(url),
-            x => bail!("Unsupported method: {}", x),
-        };
-        if let Some(headers) = options.headers {
-            for (key, value) in headers {
-                request_builder = request_builder.header(key, value);
-            }
-        }
-        if let Some(body) = options.body {
-            request_builder = request_builder.body(body);
-        }
-        let response = request_builder.send().await?;
-
-        let fetch_response = FetchResponse {
-            method,
-            ok: response.status().is_success(),
-            status: response.status().as_u16() as u32,
-            headers: response
-                .headers()
-                .iter()
-                .filter_map(|(head, value)| {
-                    Some((format!("{}", head), value.to_str().ok()?.to_string()))
-                })
-                .collect(),
-            body: response.text().await.ok(),
-        };
-
-        Ok(fetch_response)
-    }
-
-    #[op]
-    async fn read_file(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-    ) -> Result<String, AnyError> {
-        let volume_path = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            ctx.volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?
-        };
-        //get_path_for in volume.rs
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-        if !is_subset(&volume_path, &new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        let answer = tokio::fs::read_to_string(new_file).await?;
-        Ok(answer)
-    }
-    #[op]
-    async fn metadata(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-    ) -> Result<MetadataJs, AnyError> {
-        let volume_path = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            ctx.volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?
-        };
-        //get_path_for in volume.rs
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-        if !is_subset(&volume_path, &new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        let answer = tokio::fs::metadata(new_file).await?;
-        let metadata_js = MetadataJs {
-            file_type: format!("{:?}", answer.file_type()),
-            is_dir: answer.is_dir(),
-            is_file: answer.is_file(),
-            is_symlink: answer.is_symlink(),
-            len: answer.len(),
-            modified: answer
-                .modified()
-                .ok()
-                .as_ref()
-                .and_then(system_time_as_unix_ms),
-            accessed: answer
-                .accessed()
-                .ok()
-                .as_ref()
-                .and_then(system_time_as_unix_ms),
-            created: answer
-                .created()
-                .ok()
-                .as_ref()
-                .and_then(system_time_as_unix_ms),
-            readonly: answer.permissions().readonly(),
-            gid: answer.gid(),
-            mode: answer.mode(),
-            uid: answer.uid(),
-        };
-
-        Ok(metadata_js)
-    }
-    #[op]
-    async fn write_file(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-        write: String,
-    ) -> Result<(), AnyError> {
-        let (volumes, volume_path) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?;
-            (ctx.volumes.clone(), volume_path)
-        };
-        if volumes.readonly(&volume_id) {
-            bail!("Volume {} is readonly", volume_id);
-        }
-
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-        let parent_new_file = new_file
-            .parent()
-            .ok_or_else(|| anyhow!("Expecting that file is not root"))?;
-        // With the volume check
-        if !is_subset(&volume_path, &parent_new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        let new_volume_tmp = to_tmp_path(&volume_path).map_err(|e| anyhow!("{}", e))?;
-        let hashed_name = {
-            use std::os::unix::ffi::OsStrExt;
-
-            use sha2::{Digest, Sha256};
-            let mut hasher = Sha256::new();
-
-            hasher.update(path_in.as_os_str().as_bytes());
-            let result = hasher.finalize();
-            format!("{:X}", result)
-        };
-        let temp_file = new_volume_tmp.join(&hashed_name);
-        let mut file = AtomicFile::new(&new_file, Some(&temp_file))
-            .await
-            .map_err(|e| anyhow!("{}", e))?;
-        file.write_all(write.as_bytes()).await?;
-        file.save().await.map_err(|e| anyhow!("{}", e))?;
-        Ok(())
-    }
-    #[op]
-    async fn rename(
-        state: Rc<RefCell<OpState>>,
-        src_volume: VolumeId,
-        src_path: PathBuf,
-        dst_volume: VolumeId,
-        dst_path: PathBuf,
-    ) -> Result<(), AnyError> {
-        let (volumes, volume_path, volume_path_out) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &src_volume)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", src_volume))?;
-            let volume_path_out = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &dst_volume)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", dst_volume))?;
-            (ctx.volumes.clone(), volume_path, volume_path_out)
-        };
-        if volumes.readonly(&dst_volume) {
-            bail!("Volume {} is readonly", dst_volume);
-        }
-
-        let src_path = src_path.strip_prefix("/").unwrap_or(&src_path);
-        let old_file = volume_path.join(src_path);
-        let parent_old_file = old_file
-            .parent()
-            .ok_or_else(|| anyhow!("Expecting that file is not root"))?;
-        // With the volume check
-        if !is_subset(&volume_path, &parent_old_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                old_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-
-        let dst_path = dst_path.strip_prefix("/").unwrap_or(&dst_path);
-        let new_file = volume_path_out.join(dst_path);
-        let parent_new_file = new_file
-            .parent()
-            .ok_or_else(|| anyhow!("Expecting that file is not root"))?;
-        // With the volume check
-        if !is_subset(&volume_path_out, &parent_new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path_out.to_string_lossy(),
-            );
-        }
-        tokio::fs::rename(old_file, new_file).await?;
-        Ok(())
-    }
-
-    #[op]
-    async fn rsync(
-        state: Rc<RefCell<OpState>>,
-        src_volume: VolumeId,
-        src_path: PathBuf,
-        dst_volume: VolumeId,
-        dst_path: PathBuf,
-        options: RsyncOptions,
-    ) -> Result<usize, AnyError> {
-        let (volumes, volume_path, volume_path_out, rsyncs) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &src_volume)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", src_volume))?;
-            let volume_path_out = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &dst_volume)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", dst_volume))?;
-            (
-                ctx.volumes.clone(),
-                volume_path,
-                volume_path_out,
-                ctx.rsyncs.clone(),
-            )
-        };
-        if volumes.readonly(&dst_volume) {
-            bail!("Volume {} is readonly", dst_volume);
-        }
-
-        let src_path = src_path.strip_prefix("/").unwrap_or(&src_path);
-        let src = volume_path.join(src_path);
-        // With the volume check
-        if !is_subset(&volume_path, &src).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                src.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        if tokio::fs::metadata(&src).await.is_err() {
-            bail!("Source at {} does not exists", src.to_string_lossy());
-        }
-
-        let dst_path = src_path.strip_prefix("/").unwrap_or(&dst_path);
-        let dst = volume_path_out.join(dst_path);
-        // With the volume check
-        if !is_subset(&volume_path_out, &dst).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                dst.to_string_lossy(),
-                volume_path_out.to_string_lossy(),
-            );
-        }
-
-        let running_rsync = Rsync::new(src, dst, options)
-            .await
-            .map_err(|e| anyhow::anyhow!("{:?}", e.source))?;
-        let insert_id = {
-            let mut rsyncs = rsyncs.lock().await;
-            let next = rsyncs.0 + 1;
-            rsyncs.0 = next;
-            rsyncs.1.insert(next, running_rsync);
-            next
-        };
-        Ok(insert_id)
-    }
-
-    #[op]
-    async fn rsync_wait(state: Rc<RefCell<OpState>>, id: usize) -> Result<(), AnyError> {
-        let rsyncs = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            ctx.rsyncs.clone()
-        };
-        let running_rsync = match rsyncs.lock().await.1.remove(&id) {
-            Some(a) => a,
-            None => bail!("Couldn't find rsync at id {id}"),
-        };
-        running_rsync
-            .wait()
-            .await
-            .map_err(|x| anyhow::anyhow!("{}", x.source))?;
-        Ok(())
-    }
-    #[op]
-    async fn rsync_progress(state: Rc<RefCell<OpState>>, id: usize) -> Result<f64, AnyError> {
-        use futures::StreamExt;
-        let rsyncs = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            ctx.rsyncs.clone()
-        };
-        let mut running_rsync = match rsyncs.lock().await.1.remove(&id) {
-            Some(a) => a,
-            None => bail!("Couldn't find rsync at id {id}"),
-        };
-        let progress = running_rsync.progress.next().await.unwrap_or_default();
-        rsyncs.lock().await.1.insert(id, running_rsync);
-        Ok(progress)
-    }
-    #[op]
-    async fn remove_file(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-    ) -> Result<(), AnyError> {
-        let (volumes, volume_path) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?;
-            (ctx.volumes.clone(), volume_path)
-        };
-        if volumes.readonly(&volume_id) {
-            bail!("Volume {} is readonly", volume_id);
-        }
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-        // With the volume check
-        if !is_subset(&volume_path, &new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        tokio::fs::remove_file(new_file).await?;
-        Ok(())
-    }
-    #[op]
-    async fn remove_dir(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-    ) -> Result<(), AnyError> {
-        let (volumes, volume_path) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?;
-            (ctx.volumes.clone(), volume_path)
-        };
-        if volumes.readonly(&volume_id) {
-            bail!("Volume {} is readonly", volume_id);
-        }
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-        // With the volume check
-        if !is_subset(&volume_path, &new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        tokio::fs::remove_dir_all(new_file).await?;
-        Ok(())
-    }
-    #[op]
-    async fn create_dir(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-    ) -> Result<(), AnyError> {
-        let (volumes, volume_path) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?;
-            (ctx.volumes.clone(), volume_path)
-        };
-        if volumes.readonly(&volume_id) {
-            bail!("Volume {} is readonly", volume_id);
-        }
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-
-        // With the volume check
-        if !is_subset(&volume_path, &new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        tokio::fs::create_dir_all(new_file).await?;
-        Ok(())
-    }
-    #[op]
-    async fn read_dir(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-    ) -> Result<Vec<String>, AnyError> {
-        let volume_path = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            ctx.volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?
-        };
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-
-        // With the volume check
-        if !is_subset(&volume_path, &new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        let mut reader = tokio::fs::read_dir(&new_file).await?;
-        let mut paths: Vec<String> = Vec::new();
-        let origin_path = format!("{}/", new_file.to_str().unwrap_or_default());
-        let remove_new_file = |other_path: String| other_path.replacen(&origin_path, "", 1);
-        let has_origin_path = |other_path: &String| other_path.starts_with(&origin_path);
-        while let Some(entry) = reader.next_entry().await? {
-            entry
-                .path()
-                .to_str()
-                .into_iter()
-                .map(ToString::to_string)
-                .filter(&has_origin_path)
-                .map(&remove_new_file)
-                .for_each(|x| paths.push(x));
-        }
-        paths.sort();
-        Ok(paths)
-    }
-
-    #[op]
-    async fn disk_usage(
-        state: Rc<RefCell<OpState>>,
-        volume_id: Option<VolumeId>,
-        path_in: Option<PathBuf>,
-    ) -> Result<(u64, u64), AnyError> {
-        let (base_path, volume_path) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = if let Some(volume_id) = volume_id {
-                Some(
-                    ctx.volumes
-                        .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                        .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?,
-                )
-            } else {
-                None
-            };
-            (ctx.datadir.join("package-data"), volume_path)
-        };
-        let path = if let (Some(volume_path), Some(path_in)) = (volume_path, path_in) {
-            let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-            Some(volume_path.join(path_in))
-        } else {
-            None
-        };
-
-        if let Some(path) = path {
-            let size = String::from_utf8(
-                Command::new("df")
-                    .arg("--output=size")
-                    .arg("--block-size=1")
-                    .arg(&base_path)
-                    .stdout(std::process::Stdio::piped())
-                    .output()
-                    .await?
-                    .stdout,
-            )?
-            .lines()
-            .nth(1)
-            .unwrap_or_default()
-            .parse()?;
-            let used = String::from_utf8(
-                Command::new("du")
-                    .arg("-s")
-                    .arg("--block-size=1")
-                    .arg(path)
-                    .stdout(std::process::Stdio::piped())
-                    .output()
-                    .await?
-                    .stdout,
-            )?
-            .split_ascii_whitespace()
-            .next()
-            .unwrap_or_default()
-            .parse()?;
-            Ok((used, size))
-        } else {
-            String::from_utf8(
-                Command::new("df")
-                    .arg("--output=used,size")
-                    .arg("--block-size=1")
-                    .arg(&base_path)
-                    .stdout(std::process::Stdio::piped())
-                    .output()
-                    .await?
-                    .stdout,
-            )?
-            .lines()
-            .nth(1)
-            .unwrap_or_default()
-            .split_ascii_whitespace()
-            .next_tuple()
-            .and_then(|(used, size)| Some((used.parse().ok()?, size.parse().ok()?)))
-            .ok_or_else(|| anyhow!("invalid output from df"))
-        }
-    }
-
-    #[op]
-    fn current_function(state: &mut OpState) -> Result<String, AnyError> {
-        let ctx = state.borrow::<JsContext>();
-        Ok(ctx.run_function.clone())
-    }
-
-    #[op]
-    async fn log_trace(state: Rc<RefCell<OpState>>, input: String) -> Result<(), AnyError> {
-        let ctx = {
-            let state = state.borrow();
-            state.borrow::<JsContext>().clone()
-        };
-        tracing::trace!(
-            package_id = tracing::field::display(&ctx.package_id),
-            run_function = tracing::field::display(&ctx.run_function),
-            "{}",
-            input
-        );
-        Ok(())
-    }
-    #[op]
-    async fn log_warn(state: Rc<RefCell<OpState>>, input: String) -> Result<(), AnyError> {
-        let ctx = {
-            let state = state.borrow();
-            state.borrow::<JsContext>().clone()
-        };
-        tracing::warn!(
-            package_id = tracing::field::display(&ctx.package_id),
-            run_function = tracing::field::display(&ctx.run_function),
-            "{}",
-            input
-        );
-        Ok(())
-    }
-    #[op]
-    async fn log_error(state: Rc<RefCell<OpState>>, input: String) -> Result<(), AnyError> {
-        let ctx = {
-            let state = state.borrow();
-            state.borrow::<JsContext>().clone()
-        };
-        tracing::error!(
-            package_id = tracing::field::display(&ctx.package_id),
-            run_function = tracing::field::display(&ctx.run_function),
-            "{}",
-            input
-        );
-        Ok(())
-    }
-    #[op]
-    async fn log_debug(state: Rc<RefCell<OpState>>, input: String) -> Result<(), AnyError> {
-        let ctx = {
-            let state = state.borrow();
-            state.borrow::<JsContext>().clone()
-        };
-        tracing::debug!(
-            package_id = tracing::field::display(&ctx.package_id),
-            run_function = tracing::field::display(&ctx.run_function),
-            "{}",
-            input
-        );
-        Ok(())
-    }
-    #[op]
-    async fn log_info(state: Rc<RefCell<OpState>>, input: String) -> Result<(), AnyError> {
-        let (package_id, run_function) = {
-            let state = state.borrow();
-            let ctx: JsContext = state.borrow::<JsContext>().clone();
-            (ctx.package_id, ctx.run_function)
-        };
-        tracing::info!(
-            package_id = tracing::field::display(&package_id),
-            run_function = tracing::field::display(&run_function),
-            "{}",
-            input
-        );
-        Ok(())
-    }
-
-    #[op]
-    fn get_input(state: &mut OpState) -> Result<Value, AnyError> {
-        let ctx = state.borrow::<JsContext>();
-        Ok(ctx.input.clone())
-    }
-    #[op]
-    fn get_variable_args(state: &mut OpState) -> Result<Vec<Value>, AnyError> {
-        let ctx = state.borrow::<JsContext>();
-        Ok(ctx.variable_args.clone())
-    }
-    #[op]
-    fn set_value(state: &mut OpState, value: Value) -> Result<(), AnyError> {
-        let mut answer = state.borrow::<AnswerState>().0.lock();
-        *answer = value;
-        Ok(())
-    }
-    #[op]
-    fn is_sandboxed(state: &mut OpState) -> Result<bool, AnyError> {
-        let ctx = state.borrow::<JsContext>();
-        Ok(ctx.sandboxed)
-    }
-
-    #[derive(Debug, Clone, Serialize, Deserialize)]
-    #[serde(rename_all = "camelCase")]
-    pub struct StartCommand {
-        process_id: ProcessId,
-    }
-
-    #[op]
-    async fn sleep(time_ms: u64) -> Result<(), AnyError> {
-        tokio::time::sleep(Duration::from_millis(time_ms)).await;
-
-        Ok(())
-    }
-
-    #[op]
-    async fn chown(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-        ownership: u32,
-    ) -> Result<(), AnyError> {
-        let sandboxed = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            ctx.sandboxed
-        };
-
-        if sandboxed {
-            bail!("Will not run chown in sandboxed mode");
-        }
-
-        let (volumes, volume_path) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?;
-            (ctx.volumes.clone(), volume_path)
-        };
-        if volumes.readonly(&volume_id) {
-            bail!("Volume {} is readonly", volume_id);
-        }
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-        // With the volume check
-        if !is_subset(&volume_path, &new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        let output = tokio::process::Command::new("chown")
-            .arg("--recursive")
-            .arg(format!("{ownership}"))
-            .arg(new_file.as_os_str())
-            .output()
-            .await?;
-        if !output.status.success() {
-            return Err(anyhow!("Chown Error"));
-        }
-        Ok(())
-    }
-    #[op]
-    async fn chmod(
-        state: Rc<RefCell<OpState>>,
-        volume_id: VolumeId,
-        path_in: PathBuf,
-        mode: u32,
-    ) -> Result<(), AnyError> {
-        let sandboxed = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            ctx.sandboxed
-        };
-
-        if sandboxed {
-            bail!("Will not run chmod in sandboxed mode");
-        }
-
-        let (volumes, volume_path) = {
-            let state = state.borrow();
-            let ctx: &JsContext = state.borrow();
-            let volume_path = ctx
-                .volumes
-                .path_for(&ctx.datadir, &ctx.package_id, &ctx.version, &volume_id)
-                .ok_or_else(|| anyhow!("There is no {} in volumes", volume_id))?;
-            (ctx.volumes.clone(), volume_path)
-        };
-        if volumes.readonly(&volume_id) {
-            bail!("Volume {} is readonly", volume_id);
-        }
-        let path_in = path_in.strip_prefix("/").unwrap_or(&path_in);
-        let new_file = volume_path.join(path_in);
-        // With the volume check
-        if !is_subset(&volume_path, &new_file).await? {
-            bail!(
-                "Path '{}' has broken away from parent '{}'",
-                new_file.to_string_lossy(),
-                volume_path.to_string_lossy(),
-            );
-        }
-        tokio::fs::set_permissions(new_file, Permissions::from_mode(mode)).await?;
-        Ok(())
-    }
-    /// We need to make sure that during the file accessing, we don't reach beyond our scope of control
-    async fn is_subset(
-        parent: impl AsRef<Path>,
-        child: impl AsRef<Path>,
-    ) -> Result<bool, AnyError> {
-        let child = {
-            let mut child_count = 0;
-            let mut child = child.as_ref();
-            loop {
-                if child.ends_with("..") {
-                    child_count += 1;
-                } else if child_count > 0 {
-                    child_count -= 1;
-                } else {
-                    let meta = tokio::fs::metadata(child).await;
-                    if meta.is_ok() {
-                        break;
-                    }
-                }
-                child = match child.parent() {
-                    Some(child) => child,
-                    None => {
-                        return Ok(false);
-                    }
-                };
-            }
-            tokio::fs::canonicalize(child).await?
-        };
-        let parent = tokio::fs::canonicalize(parent).await?;
-        Ok(child.starts_with(parent))
-    }
-
-    #[tokio::test]
-    async fn test_is_subset() {
-        let home = std::env::var("HOME").unwrap();
-        let home = Path::new(&home);
-        assert!(!is_subset(home, &home.join("code/fakedir/../../.."))
-            .await
-            .unwrap())
-    }
-}
-
-fn system_time_as_unix_ms(system_time: &SystemTime) -> Option<u64> {
-    system_time
-        .duration_since(SystemTime::UNIX_EPOCH)
-        .ok()?
-        .as_millis()
-        .try_into()
-        .ok()
-}
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index bd1beba64..bad982996 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -30,7 +30,7 @@ avahi = ["avahi-sys"]
 avahi-alias = ["avahi"]
 cli = []
 daemon = []
-default = ["cli", "sdk", "daemon", "js-engine"]
+default = ["cli", "sdk", "daemon"]
 dev = []
 docker = []
 sdk = []
@@ -98,7 +98,6 @@ itertools = "0.11.0"
 jaq-core = "0.10.1"
 jaq-std = "0.10.0"
 josekit = "0.8.4"
-js-engine = { path = '../js-engine', optional = true }
 jsonpath_lib = { git = "https://github.com/Start9Labs/jsonpath.git" }
 lazy_static = "1.4.0"
 libc = "0.2.149"
diff --git a/core/startos/src/bins/mod.rs b/core/startos/src/bins/mod.rs
index c391338fe..76329e094 100644
--- a/core/startos/src/bins/mod.rs
+++ b/core/startos/src/bins/mod.rs
@@ -5,8 +5,6 @@ pub mod avahi_alias;
 pub mod deprecated;
 #[cfg(feature = "cli")]
 pub mod start_cli;
-#[cfg(feature = "js-engine")]
-pub mod start_deno;
 #[cfg(feature = "daemon")]
 pub mod start_init;
 #[cfg(feature = "sdk")]
@@ -18,8 +16,6 @@ fn select_executable(name: &str) -> Option<fn()> {
     match name {
         #[cfg(feature = "avahi-alias")]
         "avahi-alias" => Some(avahi_alias::main),
-        #[cfg(feature = "js_engine")]
-        "start-deno" => Some(start_deno::main),
         #[cfg(feature = "cli")]
         "start-cli" => Some(start_cli::main),
         #[cfg(feature = "sdk")]
diff --git a/core/startos/src/procedure/js_scripts.rs b/core/startos/src/procedure/js_scripts.rs
index 88f240e4f..131ceef84 100644
--- a/core/startos/src/procedure/js_scripts.rs
+++ b/core/startos/src/procedure/js_scripts.rs
@@ -4,8 +4,6 @@ use std::time::Duration;
 
 use container_init::ProcessGroupId;
 use helpers::UnixRpcClient;
-pub use js_engine::JsError;
-use js_engine::{JsExecutionEnvironment, PathForVolumeId};
 use models::VolumeId;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
@@ -28,23 +26,6 @@ enum ErrorValue {
     Result(serde_json::Value),
 }
 
-impl PathForVolumeId for Volumes {
-    fn path_for(
-        &self,
-        data_dir: &Path,
-        package_id: &PackageId,
-        version: &Version,
-        volume_id: &VolumeId,
-    ) -> Option<PathBuf> {
-        let volume = self.get(volume_id)?;
-        Some(volume.path_for(data_dir, package_id, version, volume_id))
-    }
-
-    fn readonly(&self, volume_id: &VolumeId) -> bool {
-        self.get(volume_id).map(|x| x.readonly()).unwrap_or(false)
-    }
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct ExecuteArgs {
     pub procedure: JsProcedure,
@@ -68,27 +49,3 @@ impl JsProcedure {
         Ok(())
     }
 }
-
-fn unwrap_known_error<O: DeserializeOwned>(
-    error_value: Option<ErrorValue>,
-) -> Result<O, (JsError, String)> {
-    let error_value = error_value.unwrap_or_else(|| ErrorValue::Result(serde_json::Value::Null));
-    match error_value {
-        ErrorValue::Error(error) => Err((JsError::Javascript, error)),
-        ErrorValue::ErrorCode((code, message)) => Err((JsError::Code(code), message)),
-        ErrorValue::Result(ref value) => match serde_json::from_value(value.clone()) {
-            Ok(a) => Ok(a),
-            Err(err) => {
-                tracing::error!("{}", err);
-                tracing::debug!("{:?}", err);
-                Err((
-                    JsError::BoundryLayerSerDe,
-                    format!(
-                        "Couldn't convert output = {:#?} to the correct type",
-                        serde_json::to_string_pretty(&error_value).unwrap_or_default()
-                    ),
-                ))
-            }
-        },
-    }
-}
diff --git a/core/startos/src/procedure/mod.rs b/core/startos/src/procedure/mod.rs
index be074c2b5..aa3d4092d 100644
--- a/core/startos/src/procedure/mod.rs
+++ b/core/startos/src/procedure/mod.rs
@@ -17,7 +17,6 @@ use crate::volume::Volumes;
 use crate::{Error, ErrorKind};
 
 pub mod docker;
-#[cfg(feature = "js-engine")]
 pub mod js_scripts;
 pub use models::ProcedureName;
 
@@ -27,15 +26,12 @@ pub use models::ProcedureName;
 #[model = "Model<Self>"]
 pub enum PackageProcedure {
     Docker(DockerProcedure),
-
-    #[cfg(feature = "js-engine")]
     Script(js_scripts::JsProcedure),
 }
 
 impl PackageProcedure {
     pub fn is_script(&self) -> bool {
         match self {
-            #[cfg(feature = "js-engine")]
             Self::Script(_) => true,
             _ => false,
         }
@@ -52,7 +48,6 @@ impl PackageProcedure {
             PackageProcedure::Docker(action) => {
                 action.validate(eos_version, volumes, image_ids, expected_io)
             }
-            #[cfg(feature = "js-engine")]
             PackageProcedure::Script(action) => action.validate(volumes),
         }
     }
@@ -116,7 +111,6 @@ impl std::fmt::Display for PackageProcedure {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             PackageProcedure::Docker(_) => write!(f, "Docker")?,
-            #[cfg(feature = "js-engine")]
             PackageProcedure::Script(_) => write!(f, "JS")?,
         }
         Ok(())
diff --git a/core/startos/src/s9pk/builder.rs b/core/startos/src/s9pk/builder.rs
deleted file mode 100644
index 199742439..000000000
--- a/core/startos/src/s9pk/builder.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-use sha2::{Digest, Sha512};
-use tokio::io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt, SeekFrom};
-use tracing::instrument;
-use typed_builder::TypedBuilder;
-
-use super::header::{FileSection, Header};
-use super::manifest::Manifest;
-use super::SIG_CONTEXT;
-use crate::util::io::to_cbor_async_writer;
-use crate::util::HashWriter;
-use crate::{Error, ResultExt};
-
-#[derive(TypedBuilder)]
-pub struct S9pkPacker<
-    'a,
-    W: AsyncWriteExt + AsyncSeekExt,
-    RLicense: AsyncReadExt + Unpin,
-    RInstructions: AsyncReadExt + Unpin,
-    RIcon: AsyncReadExt + Unpin,
-    RDockerImages: AsyncReadExt + Unpin,
-    RAssets: AsyncReadExt + Unpin,
-    RScripts: AsyncReadExt + Unpin,
-> {
-    writer: W,
-    manifest: &'a Manifest,
-    license: RLicense,
-    instructions: RInstructions,
-    icon: RIcon,
-    docker_images: RDockerImages,
-    assets: RAssets,
-    scripts: Option<RScripts>,
-}
-impl<
-        'a,
-        W: AsyncWriteExt + AsyncSeekExt + Unpin,
-        RLicense: AsyncReadExt + Unpin,
-        RInstructions: AsyncReadExt + Unpin,
-        RIcon: AsyncReadExt + Unpin,
-        RDockerImages: AsyncReadExt + Unpin,
-        RAssets: AsyncReadExt + Unpin,
-        RScripts: AsyncReadExt + Unpin,
-    > S9pkPacker<'a, W, RLicense, RInstructions, RIcon, RDockerImages, RAssets, RScripts>
-{
-    /// BLOCKING
-    #[instrument(skip_all)]
-    pub async fn pack(mut self, key: &ed25519_dalek::SigningKey) -> Result<(), Error> {
-        let header_pos = self.writer.stream_position().await?;
-        if header_pos != 0 {
-            tracing::warn!("Appending to non-empty file.");
-        }
-        let mut header = Header::placeholder();
-        header.serialize(&mut self.writer).await.with_ctx(|_| {
-            (
-                crate::ErrorKind::Serialization,
-                "Writing Placeholder Header",
-            )
-        })?;
-        let mut position = self.writer.stream_position().await?;
-
-        let mut writer = HashWriter::new(Sha512::new(), &mut self.writer);
-        // manifest
-        to_cbor_async_writer(&mut writer, self.manifest).await?;
-        let new_pos = writer.inner_mut().stream_position().await?;
-        header.table_of_contents.manifest = FileSection {
-            position,
-            length: new_pos - position,
-        };
-        position = new_pos;
-        // license
-        tokio::io::copy(&mut self.license, &mut writer)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, "Copying License"))?;
-        let new_pos = writer.inner_mut().stream_position().await?;
-        header.table_of_contents.license = FileSection {
-            position,
-            length: new_pos - position,
-        };
-        position = new_pos;
-        // instructions
-        tokio::io::copy(&mut self.instructions, &mut writer)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, "Copying Instructions"))?;
-        let new_pos = writer.inner_mut().stream_position().await?;
-        header.table_of_contents.instructions = FileSection {
-            position,
-            length: new_pos - position,
-        };
-        position = new_pos;
-        // icon
-        tokio::io::copy(&mut self.icon, &mut writer)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, "Copying Icon"))?;
-        let new_pos = writer.inner_mut().stream_position().await?;
-        header.table_of_contents.icon = FileSection {
-            position,
-            length: new_pos - position,
-        };
-        position = new_pos;
-        // docker_images
-        tokio::io::copy(&mut self.docker_images, &mut writer)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, "Copying Docker Images"))?;
-        let new_pos = writer.inner_mut().stream_position().await?;
-        header.table_of_contents.docker_images = FileSection {
-            position,
-            length: new_pos - position,
-        };
-        position = new_pos;
-        // assets
-        tokio::io::copy(&mut self.assets, &mut writer)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, "Copying Assets"))?;
-        let new_pos = writer.inner_mut().stream_position().await?;
-        header.table_of_contents.assets = FileSection {
-            position,
-            length: new_pos - position,
-        };
-        position = new_pos;
-        // scripts
-        if let Some(mut scripts) = self.scripts {
-            tokio::io::copy(&mut scripts, &mut writer)
-                .await
-                .with_ctx(|_| (crate::ErrorKind::Filesystem, "Copying Scripts"))?;
-            let new_pos = writer.inner_mut().stream_position().await?;
-            header.table_of_contents.scripts = Some(FileSection {
-                position,
-                length: new_pos - position,
-            });
-            position = new_pos;
-        }
-
-        // header
-        let (hash, _) = writer.finish();
-        self.writer.seek(SeekFrom::Start(header_pos)).await?;
-        header.pubkey = key.into();
-        header.signature = key.sign_prehashed(hash, Some(SIG_CONTEXT))?;
-        header
-            .serialize(&mut self.writer)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Serialization, "Writing Header"))?;
-        self.writer.seek(SeekFrom::Start(position)).await?;
-
-        Ok(())
-    }
-}
diff --git a/core/startos/src/s9pk/docker.rs b/core/startos/src/s9pk/docker.rs
deleted file mode 100644
index be93905fb..000000000
--- a/core/startos/src/s9pk/docker.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use std::borrow::Cow;
-use std::collections::BTreeSet;
-use std::io::SeekFrom;
-use std::path::Path;
-
-use color_eyre::eyre::eyre;
-use futures::{FutureExt, TryStreamExt};
-use serde::{Deserialize, Serialize};
-use tokio::io::{AsyncRead, AsyncSeek, AsyncSeekExt};
-use tokio_tar::{Archive, Entry};
-
-use crate::util::io::from_cbor_async_reader;
-use crate::{Error, ErrorKind, ARCH};
-
-#[derive(Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct DockerMultiArch {
-    pub default: String,
-    pub available: BTreeSet<String>,
-}
-
-#[pin_project::pin_project(project = DockerReaderProject)]
-#[derive(Debug)]
-pub enum DockerReader<R: AsyncRead + Unpin> {
-    SingleArch(#[pin] R),
-    MultiArch(#[pin] Entry<Archive<R>>),
-}
-impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> DockerReader<R> {
-    pub async fn new(mut rdr: R) -> Result<Self, Error> {
-        let arch = if let Some(multiarch) = tokio_tar::Archive::new(&mut rdr)
-            .entries()?
-            .try_filter_map(|e| {
-                async move {
-                    Ok(if &*e.path()? == Path::new("multiarch.cbor") {
-                        Some(e)
-                    } else {
-                        None
-                    })
-                }
-                .boxed()
-            })
-            .try_next()
-            .await?
-        {
-            let multiarch: DockerMultiArch = from_cbor_async_reader(multiarch).await?;
-            Some(if multiarch.available.contains(&**ARCH) {
-                Cow::Borrowed(&**ARCH)
-            } else {
-                Cow::Owned(multiarch.default)
-            })
-        } else {
-            None
-        };
-        rdr.seek(SeekFrom::Start(0)).await?;
-        if let Some(arch) = arch {
-            if let Some(image) = tokio_tar::Archive::new(rdr)
-                .entries()?
-                .try_filter_map(|e| {
-                    let arch = arch.clone();
-                    async move {
-                        Ok(if &*e.path()? == Path::new(&format!("{}.tar", arch)) {
-                            Some(e)
-                        } else {
-                            None
-                        })
-                    }
-                    .boxed()
-                })
-                .try_next()
-                .await?
-            {
-                Ok(Self::MultiArch(image))
-            } else {
-                Err(Error::new(
-                    eyre!("Docker image section does not contain tarball for architecture"),
-                    ErrorKind::ParseS9pk,
-                ))
-            }
-        } else {
-            Ok(Self::SingleArch(rdr))
-        }
-    }
-}
-impl<R: AsyncRead + Unpin + Send + Sync> AsyncRead for DockerReader<R> {
-    fn poll_read(
-        self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-        buf: &mut tokio::io::ReadBuf<'_>,
-    ) -> std::task::Poll<std::io::Result<()>> {
-        match self.project() {
-            DockerReaderProject::SingleArch(r) => r.poll_read(cx, buf),
-            DockerReaderProject::MultiArch(r) => r.poll_read(cx, buf),
-        }
-    }
-}
diff --git a/core/startos/src/s9pk/git_hash.rs b/core/startos/src/s9pk/git_hash.rs
deleted file mode 100644
index b2990a111..000000000
--- a/core/startos/src/s9pk/git_hash.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use std::path::Path;
-
-use crate::Error;
-
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
-pub struct GitHash(String);
-
-impl GitHash {
-    pub async fn from_path(path: impl AsRef<Path>) -> Result<GitHash, Error> {
-        let hash = tokio::process::Command::new("git")
-            .args(["describe", "--always", "--abbrev=40", "--dirty=-modified"])
-            .current_dir(path)
-            .output()
-            .await?;
-        if !hash.status.success() {
-            return Err(Error::new(
-                color_eyre::eyre::eyre!("Could not get hash: {}", String::from_utf8(hash.stderr)?),
-                crate::ErrorKind::Filesystem,
-            ));
-        }
-        Ok(GitHash(String::from_utf8(hash.stdout)?))
-    }
-}
-
-impl AsRef<str> for GitHash {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-// #[tokio::test]
-// async fn test_githash_for_current() {
-//     let answer: GitHash = GitHash::from_path(std::env::current_dir().unwrap())
-//         .await
-//         .unwrap();
-//     let answer_str: &str = answer.as_ref();
-//     assert!(
-//         !answer_str.is_empty(),
-//         "Should have a hash for this current working"
-//     );
-// }
diff --git a/core/startos/src/s9pk/header.rs b/core/startos/src/s9pk/header.rs
deleted file mode 100644
index 4f77ad855..000000000
--- a/core/startos/src/s9pk/header.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use std::collections::BTreeMap;
-
-use color_eyre::eyre::eyre;
-use ed25519_dalek::{Signature, VerifyingKey};
-use tokio::io::{AsyncRead, AsyncReadExt, AsyncWriteExt};
-
-use crate::Error;
-
-pub const MAGIC: [u8; 2] = [59, 59];
-pub const VERSION: u8 = 1;
-
-#[derive(Debug)]
-pub struct Header {
-    pub pubkey: VerifyingKey,
-    pub signature: Signature,
-    pub table_of_contents: TableOfContents,
-}
-impl Header {
-    pub fn placeholder() -> Self {
-        Header {
-            pubkey: VerifyingKey::default(),
-            signature: Signature::from_bytes(&[0; 64]),
-            table_of_contents: Default::default(),
-        }
-    }
-    // MUST BE SAME SIZE REGARDLESS OF DATA
-    pub async fn serialize<W: AsyncWriteExt + Unpin>(&self, mut writer: W) -> std::io::Result<()> {
-        writer.write_all(&MAGIC).await?;
-        writer.write_all(&[VERSION]).await?;
-        writer.write_all(self.pubkey.as_bytes()).await?;
-        writer.write_all(&self.signature.to_bytes()).await?;
-        self.table_of_contents.serialize(writer).await?;
-        Ok(())
-    }
-    pub async fn deserialize<R: AsyncRead + Unpin>(mut reader: R) -> Result<Self, Error> {
-        let mut magic = [0; 2];
-        reader.read_exact(&mut magic).await?;
-        if magic != MAGIC {
-            return Err(Error::new(
-                eyre!("Incorrect Magic: {:?}", magic),
-                crate::ErrorKind::ParseS9pk,
-            ));
-        }
-        let mut version = [0];
-        reader.read_exact(&mut version).await?;
-        if version[0] != VERSION {
-            return Err(Error::new(
-                eyre!("Unknown Version: {}", version[0]),
-                crate::ErrorKind::ParseS9pk,
-            ));
-        }
-        let mut pubkey_bytes = [0; 32];
-        reader.read_exact(&mut pubkey_bytes).await?;
-        let pubkey = VerifyingKey::from_bytes(&pubkey_bytes)
-            .map_err(|e| Error::new(e, crate::ErrorKind::ParseS9pk))?;
-        let mut sig_bytes = [0; 64];
-        reader.read_exact(&mut sig_bytes).await?;
-        let signature = Signature::from_bytes(&sig_bytes);
-        let table_of_contents = TableOfContents::deserialize(reader).await?;
-
-        Ok(Header {
-            pubkey,
-            signature,
-            table_of_contents,
-        })
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct TableOfContents {
-    pub manifest: FileSection,
-    pub license: FileSection,
-    pub instructions: FileSection,
-    pub icon: FileSection,
-    pub docker_images: FileSection,
-    pub assets: FileSection,
-    pub scripts: Option<FileSection>,
-}
-impl TableOfContents {
-    pub async fn serialize<W: AsyncWriteExt + Unpin>(&self, mut writer: W) -> std::io::Result<()> {
-        let len: u32 = ((1 + "manifest".len() + 16)
-            + (1 + "license".len() + 16)
-            + (1 + "instructions".len() + 16)
-            + (1 + "icon".len() + 16)
-            + (1 + "docker_images".len() + 16)
-            + (1 + "assets".len() + 16)
-            + (1 + "scripts".len() + 16)) as u32;
-        writer.write_all(&u32::to_be_bytes(len)).await?;
-        self.manifest
-            .serialize_entry("manifest", &mut writer)
-            .await?;
-        self.license.serialize_entry("license", &mut writer).await?;
-        self.instructions
-            .serialize_entry("instructions", &mut writer)
-            .await?;
-        self.icon.serialize_entry("icon", &mut writer).await?;
-        self.docker_images
-            .serialize_entry("docker_images", &mut writer)
-            .await?;
-        self.assets.serialize_entry("assets", &mut writer).await?;
-        self.scripts
-            .unwrap_or_default()
-            .serialize_entry("scripts", &mut writer)
-            .await?;
-        Ok(())
-    }
-    pub async fn deserialize<R: AsyncRead + Unpin>(mut reader: R) -> std::io::Result<Self> {
-        let mut toc_len = [0; 4];
-        reader.read_exact(&mut toc_len).await?;
-        let toc_len = u32::from_be_bytes(toc_len);
-        let mut reader = reader.take(toc_len as u64);
-        let mut table = BTreeMap::new();
-        while let Some((label, section)) = FileSection::deserialize_entry(&mut reader).await? {
-            table.insert(label, section);
-        }
-        fn from_table(
-            table: &BTreeMap<Vec<u8>, FileSection>,
-            label: &str,
-        ) -> std::io::Result<FileSection> {
-            table.get(label.as_bytes()).copied().ok_or_else(|| {
-                std::io::Error::new(
-                    std::io::ErrorKind::UnexpectedEof,
-                    format!("Missing Required Label: {}", label),
-                )
-            })
-        }
-        #[allow(dead_code)]
-        fn as_opt(fs: FileSection) -> Option<FileSection> {
-            if fs.position | fs.length == 0 {
-                // 0/0 is not a valid file section
-                None
-            } else {
-                Some(fs)
-            }
-        }
-        Ok(TableOfContents {
-            manifest: from_table(&table, "manifest")?,
-            license: from_table(&table, "license")?,
-            instructions: from_table(&table, "instructions")?,
-            icon: from_table(&table, "icon")?,
-            docker_images: from_table(&table, "docker_images")?,
-            assets: from_table(&table, "assets")?,
-            scripts: table.get("scripts".as_bytes()).cloned(),
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct FileSection {
-    pub position: u64,
-    pub length: u64,
-}
-impl FileSection {
-    pub async fn serialize_entry<W: AsyncWriteExt + Unpin>(
-        self,
-        label: &str,
-        mut writer: W,
-    ) -> std::io::Result<()> {
-        writer.write_all(&[label.len() as u8]).await?;
-        writer.write_all(label.as_bytes()).await?;
-        writer.write_all(&u64::to_be_bytes(self.position)).await?;
-        writer.write_all(&u64::to_be_bytes(self.length)).await?;
-        Ok(())
-    }
-    pub async fn deserialize_entry<R: AsyncRead + Unpin>(
-        mut reader: R,
-    ) -> std::io::Result<Option<(Vec<u8>, Self)>> {
-        let mut label_len = [0];
-        let read = reader.read(&mut label_len).await?;
-        if read == 0 {
-            return Ok(None);
-        }
-        let mut label = vec![0; label_len[0] as usize];
-        reader.read_exact(&mut label).await?;
-        let mut pos = [0; 8];
-        reader.read_exact(&mut pos).await?;
-        let mut len = [0; 8];
-        reader.read_exact(&mut len).await?;
-        Ok(Some((
-            label,
-            FileSection {
-                position: u64::from_be_bytes(pos),
-                length: u64::from_be_bytes(len),
-            },
-        )))
-    }
-}
diff --git a/core/startos/src/s9pk/manifest.rs b/core/startos/src/s9pk/manifest.rs
deleted file mode 100644
index 3eee540ed..000000000
--- a/core/startos/src/s9pk/manifest.rs
+++ /dev/null
@@ -1,211 +0,0 @@
-use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
-
-use color_eyre::eyre::eyre;
-pub use models::PackageId;
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-use super::git_hash::GitHash;
-use crate::action::Actions;
-use crate::backup::BackupActions;
-use crate::config::action::ConfigActions;
-use crate::dependencies::Dependencies;
-use crate::migration::Migrations;
-use crate::net::interface::Interfaces;
-use crate::prelude::*;
-use crate::procedure::docker::DockerContainers;
-use crate::procedure::PackageProcedure;
-use crate::status::health_check::HealthChecks;
-use crate::util::serde::Regex;
-use crate::util::Version;
-use crate::version::{Current, VersionT};
-use crate::volume::Volumes;
-use crate::Error;
-
-fn current_version() -> Version {
-    Current::new().semver().into()
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct Manifest {
-    #[serde(default = "current_version")]
-    pub eos_version: Version,
-    pub id: PackageId,
-    #[serde(default)]
-    pub git_hash: Option<GitHash>,
-    pub title: String,
-    pub version: Version,
-    pub description: Description,
-    #[serde(default)]
-    pub assets: Assets,
-    #[serde(default)]
-    pub build: Option<Vec<String>>,
-    pub release_notes: String,
-    pub license: String, // type of license
-    pub wrapper_repo: Url,
-    pub upstream_repo: Url,
-    pub support_site: Option<Url>,
-    pub marketing_site: Option<Url>,
-    pub donation_url: Option<Url>,
-    #[serde(default)]
-    pub alerts: Alerts,
-    pub main: PackageProcedure,
-    pub health_checks: HealthChecks,
-    pub config: Option<ConfigActions>,
-    pub properties: Option<PackageProcedure>,
-    pub volumes: Volumes,
-    // #[serde(default)]
-    pub interfaces: Interfaces,
-    // #[serde(default)]
-    pub backup: BackupActions,
-    #[serde(default)]
-    pub migrations: Migrations,
-    #[serde(default)]
-    pub actions: Actions,
-    // #[serde(default)]
-    // pub permissions: Permissions,
-    #[serde(default)]
-    pub dependencies: Dependencies,
-    pub containers: Option<DockerContainers>,
-
-    #[serde(default)]
-    pub replaces: Vec<String>,
-
-    #[serde(default)]
-    pub hardware_requirements: HardwareRequirements,
-}
-
-impl Manifest {
-    pub fn package_procedures(&self) -> impl Iterator<Item = &PackageProcedure> {
-        use std::iter::once;
-        let main = once(&self.main);
-        let cfg_get = self.config.as_ref().map(|a| &a.get).into_iter();
-        let cfg_set = self.config.as_ref().map(|a| &a.set).into_iter();
-        let props = self.properties.iter();
-        let backups = vec![&self.backup.create, &self.backup.restore].into_iter();
-        let migrations = self
-            .migrations
-            .to
-            .values()
-            .chain(self.migrations.from.values());
-        let actions = self.actions.0.values().map(|a| &a.implementation);
-        main.chain(cfg_get)
-            .chain(cfg_set)
-            .chain(props)
-            .chain(backups)
-            .chain(migrations)
-            .chain(actions)
-    }
-
-    pub fn with_git_hash(mut self, git_hash: GitHash) -> Self {
-        self.git_hash = Some(git_hash);
-        self
-    }
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct HardwareRequirements {
-    #[serde(default)]
-    device: BTreeMap<String, Regex>,
-    ram: Option<u64>,
-    pub arch: Option<Vec<String>>,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct Assets {
-    #[serde(default)]
-    pub license: Option<PathBuf>,
-    #[serde(default)]
-    pub instructions: Option<PathBuf>,
-    #[serde(default)]
-    pub icon: Option<PathBuf>,
-    #[serde(default)]
-    pub docker_images: Option<PathBuf>,
-    #[serde(default)]
-    pub assets: Option<PathBuf>,
-    #[serde(default)]
-    pub scripts: Option<PathBuf>,
-}
-impl Assets {
-    pub fn license_path(&self) -> &Path {
-        self.license
-            .as_ref()
-            .map(|a| a.as_path())
-            .unwrap_or(Path::new("LICENSE.md"))
-    }
-    pub fn instructions_path(&self) -> &Path {
-        self.instructions
-            .as_ref()
-            .map(|a| a.as_path())
-            .unwrap_or(Path::new("INSTRUCTIONS.md"))
-    }
-    pub fn icon_path(&self) -> &Path {
-        self.icon
-            .as_ref()
-            .map(|a| a.as_path())
-            .unwrap_or(Path::new("icon.png"))
-    }
-    pub fn icon_type(&self) -> &str {
-        self.icon
-            .as_ref()
-            .and_then(|icon| icon.extension())
-            .and_then(|ext| ext.to_str())
-            .unwrap_or("png")
-    }
-    pub fn docker_images_path(&self) -> &Path {
-        self.docker_images
-            .as_ref()
-            .map(|a| a.as_path())
-            .unwrap_or(Path::new("docker-images"))
-    }
-    pub fn assets_path(&self) -> &Path {
-        self.assets
-            .as_ref()
-            .map(|a| a.as_path())
-            .unwrap_or(Path::new("assets"))
-    }
-    pub fn scripts_path(&self) -> &Path {
-        self.scripts
-            .as_ref()
-            .map(|a| a.as_path())
-            .unwrap_or(Path::new("scripts"))
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct Description {
-    pub short: String,
-    pub long: String,
-}
-impl Description {
-    pub fn validate(&self) -> Result<(), Error> {
-        if self.short.chars().skip(160).next().is_some() {
-            return Err(Error::new(
-                eyre!("Short description must be 160 characters or less."),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if self.long.chars().skip(5000).next().is_some() {
-            return Err(Error::new(
-                eyre!("Long description must be 5000 characters or less."),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        Ok(())
-    }
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct Alerts {
-    pub install: Option<String>,
-    pub uninstall: Option<String>,
-    pub restore: Option<String>,
-    pub start: Option<String>,
-    pub stop: Option<String>,
-}
diff --git a/core/startos/src/s9pk/reader.rs b/core/startos/src/s9pk/reader.rs
deleted file mode 100644
index 61b5e46a8..000000000
--- a/core/startos/src/s9pk/reader.rs
+++ /dev/null
@@ -1,406 +0,0 @@
-use std::collections::BTreeSet;
-use std::io::SeekFrom;
-use std::ops::Range;
-use std::path::Path;
-use std::pin::Pin;
-use std::str::FromStr;
-use std::task::{Context, Poll};
-
-use color_eyre::eyre::eyre;
-use digest::Output;
-use ed25519_dalek::VerifyingKey;
-use futures::TryStreamExt;
-use models::ImageId;
-use sha2::{Digest, Sha512};
-use tokio::fs::File;
-use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt, ReadBuf};
-use tracing::instrument;
-
-use super::header::{FileSection, Header, TableOfContents};
-use super::manifest::{Manifest, PackageId};
-use super::SIG_CONTEXT;
-use crate::install::progress::InstallProgressTracker;
-use crate::s9pk::docker::DockerReader;
-use crate::util::Version;
-use crate::{Error, ResultExt};
-
-const MAX_REPLACES: usize = 10;
-const MAX_TITLE_LEN: usize = 30;
-
-#[pin_project::pin_project]
-#[derive(Debug)]
-pub struct ReadHandle<'a, R = File> {
-    pos: &'a mut u64,
-    range: Range<u64>,
-    #[pin]
-    rdr: &'a mut R,
-}
-impl<'a, R: AsyncRead + Unpin> ReadHandle<'a, R> {
-    pub async fn to_vec(mut self) -> std::io::Result<Vec<u8>> {
-        let mut buf = vec![0; (self.range.end - self.range.start) as usize];
-        self.read_exact(&mut buf).await?;
-        Ok(buf)
-    }
-}
-impl<'a, R: AsyncRead + Unpin> AsyncRead for ReadHandle<'a, R> {
-    fn poll_read(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut ReadBuf<'_>,
-    ) -> Poll<std::io::Result<()>> {
-        let this = self.project();
-        let start = buf.filled().len();
-        let mut take_buf = buf.take(this.range.end.saturating_sub(**this.pos) as usize);
-        let res = AsyncRead::poll_read(this.rdr, cx, &mut take_buf);
-        let n = take_buf.filled().len();
-        unsafe { buf.assume_init(start + n) };
-        buf.advance(n);
-        **this.pos += n as u64;
-        res
-    }
-}
-impl<'a, R: AsyncSeek + Unpin> AsyncSeek for ReadHandle<'a, R> {
-    fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> std::io::Result<()> {
-        let this = self.project();
-        AsyncSeek::start_seek(
-            this.rdr,
-            match position {
-                SeekFrom::Current(n) => SeekFrom::Current(n),
-                SeekFrom::End(n) => SeekFrom::Start((this.range.end as i64 + n) as u64),
-                SeekFrom::Start(n) => SeekFrom::Start(this.range.start + n),
-            },
-        )
-    }
-    fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<u64>> {
-        let this = self.project();
-        match AsyncSeek::poll_complete(this.rdr, cx) {
-            Poll::Ready(Ok(n)) => {
-                let res = n.saturating_sub(this.range.start);
-                **this.pos = this.range.start + res;
-                Poll::Ready(Ok(res))
-            }
-            a => a,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct ImageTag {
-    pub package_id: PackageId,
-    pub image_id: ImageId,
-    pub version: Version,
-}
-impl ImageTag {
-    #[instrument(skip_all)]
-    pub fn validate(&self, id: &PackageId, version: &Version) -> Result<(), Error> {
-        if id != &self.package_id {
-            return Err(Error::new(
-                eyre!(
-                    "Contains image for incorrect package: id {}",
-                    self.package_id,
-                ),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if version != &self.version {
-            return Err(Error::new(
-                eyre!(
-                    "Contains image with incorrect version: expected {} received {}",
-                    version,
-                    self.version,
-                ),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        Ok(())
-    }
-}
-impl FromStr for ImageTag {
-    type Err = Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let rest = s.strip_prefix("start9/").ok_or_else(|| {
-            Error::new(
-                eyre!("Invalid image tag prefix: expected start9/"),
-                crate::ErrorKind::ValidateS9pk,
-            )
-        })?;
-        let (package, rest) = rest.split_once("/").ok_or_else(|| {
-            Error::new(
-                eyre!("Image tag missing image id"),
-                crate::ErrorKind::ValidateS9pk,
-            )
-        })?;
-        let (image, version) = rest.split_once(":").ok_or_else(|| {
-            Error::new(
-                eyre!("Image tag missing version"),
-                crate::ErrorKind::ValidateS9pk,
-            )
-        })?;
-        Ok(ImageTag {
-            package_id: package.parse()?,
-            image_id: image.parse()?,
-            version: version.parse()?,
-        })
-    }
-}
-
-pub struct S9pkReader<R: AsyncRead + AsyncSeek + Unpin + Send + Sync = File> {
-    hash: Option<Output<Sha512>>,
-    hash_string: Option<String>,
-    developer_key: VerifyingKey,
-    toc: TableOfContents,
-    pos: u64,
-    rdr: R,
-}
-impl S9pkReader {
-    pub async fn open<P: AsRef<Path>>(path: P, check_sig: bool) -> Result<Self, Error> {
-        let p = path.as_ref();
-        let rdr = File::open(p)
-            .await
-            .with_ctx(|_| (crate::error::ErrorKind::Filesystem, p.display().to_string()))?;
-
-        Self::from_reader(rdr, check_sig).await
-    }
-}
-impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<InstallProgressTracker<R>> {
-    pub fn validated(&mut self) {
-        self.rdr.validated()
-    }
-}
-impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<R> {
-    #[instrument(skip_all)]
-    pub async fn validate(&mut self) -> Result<(), Error> {
-        if self.toc.icon.length > 102_400 {
-            // 100 KiB
-            return Err(Error::new(
-                eyre!("icon must be less than 100KiB"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        let image_tags = self.image_tags().await?;
-        let man = self.manifest().await?;
-        let containers = &man.containers;
-        let validated_image_ids = image_tags
-            .into_iter()
-            .map(|i| i.validate(&man.id, &man.version).map(|_| i.image_id))
-            .collect::<Result<BTreeSet<ImageId>, _>>()?;
-        man.description.validate()?;
-        man.actions.0.iter().try_for_each(|(_, action)| {
-            action.validate(
-                containers,
-                &man.eos_version,
-                &man.volumes,
-                &validated_image_ids,
-            )
-        })?;
-        man.backup.validate(
-            containers,
-            &man.eos_version,
-            &man.volumes,
-            &validated_image_ids,
-        )?;
-        if let Some(cfg) = &man.config {
-            cfg.validate(
-                containers,
-                &man.eos_version,
-                &man.volumes,
-                &validated_image_ids,
-            )?;
-        }
-        man.health_checks
-            .validate(&man.eos_version, &man.volumes, &validated_image_ids)?;
-        man.interfaces.validate()?;
-        man.main
-            .validate(&man.eos_version, &man.volumes, &validated_image_ids, false)
-            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Main"))?;
-        man.migrations.validate(
-            containers,
-            &man.eos_version,
-            &man.volumes,
-            &validated_image_ids,
-        )?;
-
-        #[cfg(feature = "js-engine")]
-        if man.containers.is_some()
-            || matches!(man.main, crate::procedure::PackageProcedure::Script(_))
-        {
-            return Err(Error::new(
-                eyre!("Right now we don't support the containers and the long running main"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-
-        if man.replaces.len() >= MAX_REPLACES {
-            return Err(Error::new(
-                eyre!("Cannot have more than {MAX_REPLACES} replaces"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if let Some(too_big) = man.replaces.iter().find(|x| x.len() >= MAX_REPLACES) {
-            return Err(Error::new(
-                eyre!("We have found a replaces of ({too_big}) that exceeds the max length of {MAX_TITLE_LEN} "),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if man.title.len() >= MAX_TITLE_LEN {
-            return Err(Error::new(
-                eyre!("Cannot have more than a length of {MAX_TITLE_LEN} for title"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-
-        if man.containers.is_some()
-            && matches!(man.main, crate::procedure::PackageProcedure::Docker(_))
-        {
-            return Err(Error::new(
-                eyre!("Cannot have a main docker and a main in containers"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if let Some(props) = &man.properties {
-            props
-                .validate(&man.eos_version, &man.volumes, &validated_image_ids, true)
-                .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Properties"))?;
-        }
-        man.volumes.validate(&man.interfaces)?;
-
-        Ok(())
-    }
-    #[instrument(skip_all)]
-    pub async fn image_tags(&mut self) -> Result<Vec<ImageTag>, Error> {
-        let mut tar = tokio_tar::Archive::new(self.docker_images().await?);
-        let mut entries = tar.entries()?;
-        while let Some(mut entry) = entries.try_next().await? {
-            if &*entry.path()? != Path::new("manifest.json") {
-                continue;
-            }
-            let mut buf = Vec::with_capacity(entry.header().size()? as usize);
-            entry.read_to_end(&mut buf).await?;
-            #[derive(serde::Deserialize)]
-            struct ManEntry {
-                #[serde(rename = "RepoTags")]
-                tags: Vec<String>,
-            }
-            let man_entries = serde_json::from_slice::<Vec<ManEntry>>(&buf)
-                .with_ctx(|_| (crate::ErrorKind::Deserialization, "manifest.json"))?;
-            return man_entries
-                .iter()
-                .flat_map(|e| &e.tags)
-                .map(|t| t.parse())
-                .collect();
-        }
-        Err(Error::new(
-            eyre!("image.tar missing manifest.json"),
-            crate::ErrorKind::ParseS9pk,
-        ))
-    }
-    #[instrument(skip_all)]
-    pub async fn from_reader(mut rdr: R, check_sig: bool) -> Result<Self, Error> {
-        let header = Header::deserialize(&mut rdr).await?;
-
-        let (hash, hash_string) = if check_sig {
-            let mut hasher = Sha512::new();
-            let mut buf = [0; 1024];
-            let mut read;
-            while {
-                read = rdr.read(&mut buf).await?;
-                read != 0
-            } {
-                hasher.update(&buf[0..read]);
-            }
-            let hash = hasher.clone().finalize();
-            header
-                .pubkey
-                .verify_prehashed(hasher, Some(SIG_CONTEXT), &header.signature)?;
-            (
-                Some(hash),
-                Some(base32::encode(
-                    base32::Alphabet::RFC4648 { padding: false },
-                    hash.as_slice(),
-                )),
-            )
-        } else {
-            (None, None)
-        };
-
-        let pos = rdr.stream_position().await?;
-
-        Ok(S9pkReader {
-            hash_string,
-            hash,
-            developer_key: header.pubkey,
-            toc: header.table_of_contents,
-            pos,
-            rdr,
-        })
-    }
-
-    pub fn hash(&self) -> Option<&Output<Sha512>> {
-        self.hash.as_ref()
-    }
-
-    pub fn hash_str(&self) -> Option<&str> {
-        self.hash_string.as_ref().map(|s| s.as_str())
-    }
-
-    pub fn developer_key(&self) -> &VerifyingKey {
-        &self.developer_key
-    }
-
-    pub async fn reset(&mut self) -> Result<(), Error> {
-        self.rdr.seek(SeekFrom::Start(0)).await?;
-        Ok(())
-    }
-
-    async fn read_handle<'a>(
-        &'a mut self,
-        section: FileSection,
-    ) -> Result<ReadHandle<'a, R>, Error> {
-        if self.pos != section.position {
-            self.rdr.seek(SeekFrom::Start(section.position)).await?;
-            self.pos = section.position;
-        }
-        Ok(ReadHandle {
-            range: self.pos..(self.pos + section.length),
-            pos: &mut self.pos,
-            rdr: &mut self.rdr,
-        })
-    }
-
-    pub async fn manifest_raw(&mut self) -> Result<ReadHandle<'_, R>, Error> {
-        self.read_handle(self.toc.manifest).await
-    }
-
-    pub async fn manifest(&mut self) -> Result<Manifest, Error> {
-        let slice = self.manifest_raw().await?.to_vec().await?;
-        serde_cbor::de::from_reader(slice.as_slice())
-            .with_ctx(|_| (crate::ErrorKind::ParseS9pk, "Deserializing Manifest (CBOR)"))
-    }
-
-    pub async fn license(&mut self) -> Result<ReadHandle<'_, R>, Error> {
-        self.read_handle(self.toc.license).await
-    }
-
-    pub async fn instructions(&mut self) -> Result<ReadHandle<'_, R>, Error> {
-        self.read_handle(self.toc.instructions).await
-    }
-
-    pub async fn icon(&mut self) -> Result<ReadHandle<'_, R>, Error> {
-        self.read_handle(self.toc.icon).await
-    }
-
-    pub async fn docker_images(&mut self) -> Result<DockerReader<ReadHandle<'_, R>>, Error> {
-        DockerReader::new(self.read_handle(self.toc.docker_images).await?).await
-    }
-
-    pub async fn assets(&mut self) -> Result<ReadHandle<'_, R>, Error> {
-        self.read_handle(self.toc.assets).await
-    }
-
-    pub async fn scripts(&mut self) -> Result<Option<ReadHandle<'_, R>>, Error> {
-        Ok(match self.toc.scripts {
-            None => None,
-            Some(a) => Some(self.read_handle(a).await?),
-        })
-    }
-}
diff --git a/core/startos/src/s9pk/specv2.md b/core/startos/src/s9pk/specv2.md
deleted file mode 100644
index 9bf993463..000000000
--- a/core/startos/src/s9pk/specv2.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Header
-
-### Magic
-
-2B: `0x3b3b`
-
-### Version
-
-varint: `0x02`
-
-### Pubkey
-
-32B: ed25519 pubkey
-
-### TOC
-
-- number of sections (varint)
-- FOREACH section
-  - sig (32B: ed25519 signature of BLAKE-3 of rest of section)
-  - name (varstring)
-  - TYPE (varint)
-    - TYPE=FILE (`0x01`)
-      - mime (varstring)
-      - pos (32B: u64 BE)
-      - len (32B: u64 BE)
-      - hash (32B: BLAKE-3 of file contents)
-    - TYPE=TOC (`0x02`)
-      - recursively defined
diff --git a/core/startos/src/s9pk/v1/reader.rs b/core/startos/src/s9pk/v1/reader.rs
index 61b5e46a8..e901b1a14 100644
--- a/core/startos/src/s9pk/v1/reader.rs
+++ b/core/startos/src/s9pk/v1/reader.rs
@@ -220,16 +220,6 @@ impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<R> {
             &validated_image_ids,
         )?;
 
-        #[cfg(feature = "js-engine")]
-        if man.containers.is_some()
-            || matches!(man.main, crate::procedure::PackageProcedure::Script(_))
-        {
-            return Err(Error::new(
-                eyre!("Right now we don't support the containers and the long running main"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-
         if man.replaces.len() >= MAX_REPLACES {
             return Err(Error::new(
                 eyre!("Cannot have more than {MAX_REPLACES} replaces"),

From 685e865b428b98141e6b082a41bfd909fad59095 Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Tue, 19 Dec 2023 10:16:18 -0700
Subject: [PATCH 014/341] fix: Docker stopping will include a timeout (#2540)

* fix sdk build script

* fix: Docker stopping will include a timeoute

So the timeout that was included in the original is not working therefore we move to a doublinig with a timeout

* fix: Adding in the missing suggestions that Aiden has poinited out

* Update install-sdk.sh

* Update install-sdk.sh

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/src/manager/manager_seed.rs | 10 +++++++++-
 core/startos/src/util/docker.rs          |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/startos/src/manager/manager_seed.rs b/core/startos/src/manager/manager_seed.rs
index f90e7739f..35ebee409 100644
--- a/core/startos/src/manager/manager_seed.rs
+++ b/core/startos/src/manager/manager_seed.rs
@@ -29,7 +29,15 @@ impl ManagerSeed {
         )
         .await
         {
-            Err(e) if e.kind == ErrorKind::NotFound => (), // Already stopped
+            Err(e) if e.kind == ErrorKind::NotFound => {
+                tracing::info!(
+                    "Command for package {command_id} should already be stopped",
+                    command_id = &self.manifest.id
+                );
+            } // Already stopped
+            Err(e) if e.kind == ErrorKind::Timeout => {
+                tracing::warn!("Command for package {command_id} had to be timed out, but we have dropped which means it should be killed", command_id = &self.manifest.id);
+            } // Already stopped In theory
             a => a?,
         }
         Ok(())
diff --git a/core/startos/src/util/docker.rs b/core/startos/src/util/docker.rs
index fb6bc15f4..db6aa30c0 100644
--- a/core/startos/src/util/docker.rs
+++ b/core/startos/src/util/docker.rs
@@ -113,6 +113,7 @@ pub async fn stop_container(
     signal: Option<Signal>,
 ) -> Result<(), Error> {
     let mut cmd = Command::new(CONTAINER_TOOL);
+    let mut cmd = cmd.timeout(timeout);
     cmd.arg("stop");
     if let Some(dur) = timeout {
         cmd.arg("-t").arg(dur.as_secs().to_string());

From cb63025078859951e002bdacea281a068b56317e Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 20 Dec 2023 14:58:24 -0700
Subject: [PATCH 015/341] chore: Initial commit for the bump to 0.3.5.2 (#2541)

* chore: Initial commit for the bump

* wip(fix): build

* chore: Update the os welcome page to include the previous release of the 0.3.5.1
---
 core/Cargo.lock                               |  2 +-
 core/startos/Cargo.toml                       |  2 +-
 core/startos/src/version/mod.rs               |  7 +++-
 core/startos/src/version/v0_3_5_2.rs          | 32 +++++++++++++++++++
 web/package.json                              |  2 +-
 web/patchdb-ui-seed.json                      |  2 +-
 .../modals/os-welcome/os-welcome.page.html    | 17 ++++++++--
 .../ui/src/app/services/api/api.fixures.ts    |  3 +-
 .../ui/src/app/services/api/mock-patch.ts     |  2 +-
 9 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 core/startos/src/version/v0_3_5_2.rs

diff --git a/core/Cargo.lock b/core/Cargo.lock
index cc7698271..6b5c1667e 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -4924,7 +4924,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.5-rev.1"
+version = "0.3.5-rev.2"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 65d01b1db..99a9d2119 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.5-rev.1"
+version = "0.3.5-rev.2"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 4c6f157a5..6d9f65b8a 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -15,8 +15,9 @@ mod v0_3_4_3;
 mod v0_3_4_4;
 mod v0_3_5;
 mod v0_3_5_1;
+mod v0_3_5_2;
 
-pub type Current = v0_3_5_1::Version;
+pub type Current = v0_3_5_2::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
@@ -28,6 +29,7 @@ enum Version {
     V0_3_4_4(Wrapper<v0_3_4_4::Version>),
     V0_3_5(Wrapper<v0_3_5::Version>),
     V0_3_5_1(Wrapper<v0_3_5_1::Version>),
+    V0_3_5_2(Wrapper<v0_3_5_2::Version>),
     Other(emver::Version),
 }
 
@@ -50,6 +52,7 @@ impl Version {
             Version::V0_3_4_4(Wrapper(x)) => x.semver(),
             Version::V0_3_5(Wrapper(x)) => x.semver(),
             Version::V0_3_5_1(Wrapper(x)) => x.semver(),
+            Version::V0_3_5_2(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -176,6 +179,7 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> {
         Version::V0_3_4_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
         Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
         Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
+        Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -215,6 +219,7 @@ mod tests {
             Just(Version::V0_3_4_4(Wrapper(v0_3_4_4::Version::new()))),
             Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))),
             Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))),
+            Just(Version::V0_3_5_2(Wrapper(v0_3_5_2::Version::new()))),
             em_version().prop_map(Version::Other),
         ]
     }
diff --git a/core/startos/src/version/v0_3_5_2.rs b/core/startos/src/version/v0_3_5_2.rs
new file mode 100644
index 000000000..860a0ce56
--- /dev/null
+++ b/core/startos/src/version/v0_3_5_2.rs
@@ -0,0 +1,32 @@
+use async_trait::async_trait;
+use emver::VersionRange;
+use sqlx::PgPool;
+
+use super::VersionT;
+use super::{v0_3_4::V0_3_0_COMPAT, v0_3_5_1};
+use crate::prelude::*;
+
+const V0_3_5_2: emver::Version = emver::Version::new(0, 3, 5, 2);
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+#[async_trait]
+impl VersionT for Version {
+    type Previous = v0_3_5_1::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> emver::Version {
+        V0_3_5_2
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/web/package.json b/web/package.json
index 7784543fe..80ee91e39 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.5.1",
+  "version": "0.3.5.2",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "scripts": {
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 0a678d4e8..30eb8900b 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -1,6 +1,6 @@
 {
   "name": null,
-  "ack-welcome": "0.3.5.1",
+  "ack-welcome": "0.3.5.2",
   "marketplace": {
     "selected-url": "https://registry.start9.com/",
     "known-hosts": {
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 23bc7e1fd..292480e09 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,11 +12,11 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.5.1</h4>
+  <h4>0.3.5.2</h4>
   <p class="note-padding">
     View the complete
     <a
-      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.1"
+      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.2"
       target="_blank"
       noreferrer
     >
@@ -32,6 +32,19 @@ <h6>Highlights</h6>
 
   <h2>Previous 0.3.5.x Releases</h2>
 
+  <h4>0.3.5.1</h4>
+  <p class="note-padding">
+    View the complete
+    <a
+      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.1"
+      target="_blank"
+      noreferrer
+    >
+      release notes
+    </a>
+    for more details.
+  </p>
+
   <h4>0.3.5</h4>
   <p class="note-padding">
     View the complete
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 17460609a..76c43c755 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -21,9 +21,10 @@ export module Mock {
     'shutting-down': false,
   }
   export const MarketplaceEos: RR.GetMarketplaceEosRes = {
-    version: '0.3.5.1',
+    version: '0.3.5.2',
     headline: 'Our biggest release ever.',
     'release-notes': {
+      '0.3.5.2': 'Some **Markdown** release _notes_ for 0.3.5.2',
       '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1',
       '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4',
       '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3',
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 1dc7abd66..51689d49d 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -42,7 +42,7 @@ export const mockPatchData: DataModel = {
   },
   'server-info': {
     id: 'abcdefgh',
-    version: '0.3.5.1',
+    version: '0.3.5.2',
     'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(),
     'lan-address': 'https://adjective-noun.local',
     'tor-address': 'https://myveryownspecialtoraddress.onion',

From d44de670cd02b5d8c6b0065e214123453311070f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:20:01 -0700
Subject: [PATCH 016/341] Add socat to base dependencies (#2544)

---
 build/dpkg-deps/depends | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index a712d4a52..d53721f3f 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -41,6 +41,7 @@ qemu-guest-agent
 rsync
 samba-common-bin
 smartmontools
+socat
 sqlite3
 squashfs-tools
 sudo

From fab13db4b428a6b5a9e525094e3052c785f8fb3e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Sat, 17 Feb 2024 11:14:14 -0700
Subject: [PATCH 017/341] Feature/lxc container runtime (#2514)

* wip: static-server errors

* wip: fix wifi

* wip: Fix the service_effects

* wip: Fix cors in the middleware

* wip(chore): Auth clean up the lint.

* wip(fix): Vhost

* wip: continue manager refactor

Co-authored-by: J H <Blu-J@users.noreply.github.com>

* wip: service manager refactor

* wip: Some fixes

* wip(fix): Fix the lib.rs

* wip

* wip(fix): Logs

* wip: bins

* wip(innspect): Add in the inspect

* wip: config

* wip(fix): Diagnostic

* wip(fix): Dependencies

* wip: context

* wip(fix) Sorta auth

* wip: warnings

* wip(fix): registry/admin

* wip(fix) marketplace

* wip(fix) Some more converted and fixed with the linter and config

* wip: Working on the static server

* wip(fix)static server

* wip: Remove some asynnc

* wip: Something about the request and regular rpc

* wip: gut install

Co-authored-by: J H <Blu-J@users.noreply.github.com>

* wip: Convert the static server into the new system

* wip delete file

* test

* wip(fix) vhost does not need the with safe defaults

* wip: Adding in the wifi

* wip: Fix the developer and the verify

* wip: new install flow

Co-authored-by: J H <Blu-J@users.noreply.github.com>

* fix middleware

* wip

* wip: Fix the auth

* wip

* continue service refactor

* feature: Service get_config

* feat: Action

* wip: Fighting the great fight against the borrow checker

* wip: Remove an error in a file that I just need to deel with later

* chore: Add in some more lifetime stuff to the services

* wip: Install fix on lifetime

* cleanup

* wip: Deal with the borrow later

* more cleanup

* resolve borrowchecker errors

* wip(feat): add in the handler for the socket, for now

* wip(feat): Update the service_effect_handler::action

* chore: Add in the changes to make sure the from_service goes to context

* chore: Change the

* refactor service map

* fix references to service map

* fill out restore

* wip: Before I work on the store stuff

* fix backup module

* handle some warnings

* feat: add in the ui components on the rust side

* feature: Update the procedures

* chore: Update the js side of the main and a few of the others

* chore: Update the rpc listener to match the persistant container

* wip: Working on updating some things to have a better name

* wip(feat): Try and get the rpc to return the correct shape?

* lxc wip

* wip(feat): Try and get the rpc to return the correct shape?

* build for container runtime wip

* remove container-init

* fix build

* fix error

* chore: Update to work I suppose

* lxc wip

* remove docker module and feature

* download alpine squashfs automatically

* overlays effect

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* chore: Add the overlay effect

* feat: Add the mounter in the main

* chore: Convert to use the mounts, still need to work with the sandbox

* install fixes

* fix ssl

* fixes from testing

* implement tmpfile for upload

* wip

* misc fixes

* cleanup

* cleanup

* better progress reporting

* progress for sideload

* return real guid

* add devmode script

* fix lxc rootfs path

* fix percentage bar

* fix progress bar styling

* fix build for unstable

* tweaks

* label progress

* tweaks

* update progress more often

* make symlink in rpc_client

* make socket dir

* fix parent path

* add start-cli to container

* add echo and gitInfo commands

* wip: Add the init + errors

* chore: Add in the exit effect for the system

* chore: Change the type to null for failure to parse

* move sigterm timeout to stopping status

* update order

* chore: Update the return type

* remove dbg

* change the map error

* chore: Update the thing to capture id

* chore add some life changes

* chore: Update the loging

* chore: Update the package to run module

* us From for RpcError

* chore: Update to use import instead

* chore: update

* chore: Use require for the backup

* fix a default

* update the type that is wrong

* chore: Update the type of the manifest

* chore: Update to make null

* only symlink if not exists

* get rid of double result

* better debug info for ErrorCollection

* chore: Update effects

* chore: fix

* mount assets and volumes

* add exec instead of spawn

* fix mounting in image

* fix overlay mounts

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* misc fixes

* feat: Fix two

* fix: systemForEmbassy main

* chore: Fix small part of main loop

* chore: Modify the bundle

* merge

* fixMain loop"

* move tsc to makefile

* chore: Update the return types of the health check

* fix client

* chore: Convert the todo to use tsmatches

* add in the fixes for the seen and create the hack to allow demo

* chore: Update to include the systemForStartOs

* chore UPdate to the latest types from the expected outout

* fixes

* fix typo

* Don't emit if failure on tsc

* wip

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* add s9pk api

* add inspection

* add inspect manifest

* newline after display serializable

* fix squashfs in image name

* edit manifest

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* wait for response on repl

* ignore sig for now

* ignore sig for now

* re-enable sig verification

* fix

* wip

* env and chroot

* add profiling logs

* set uid & gid in squashfs to 100000

* set uid of sqfs to 100000

* fix mksquashfs args

* add env to compat

* fix

* re-add docker feature flag

* fix docker output format being stupid

* here be dragons

* chore: Add in the cross compiling for something

* fix npm link

* extract logs from container on exit

* chore: Update for testing

* add log capture to drop trait

* chore: add in the modifications that I make

* chore: Update small things for no updates

* chore: Update the types of something

* chore: Make main not complain

* idmapped mounts

* idmapped volumes

* re-enable kiosk

* chore: Add in some logging for the new system

* bring in start-sdk

* remove avahi

* chore: Update the deps

* switch to musl

* chore: Update the version of prettier

* chore: Organize'

* chore: Update some of the headers back to the standard of fetch

* fix musl build

* fix idmapped mounts

* fix cross build

* use cross compiler for correct arch

* feat: Add in the faked ssl stuff for the effects

* @dr_bonez Did a solution here

* chore: Something that DrBonez

* chore: up

* wip: We have a working server!!!

* wip

* uninstall

* wip

* tes

---------

Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: J H <Blu-J@users.noreply.github.com>
Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com>
---
 .github/workflows/startos-iso.yaml            |    3 -
 .gitignore                                    |    3 +-
 Makefile                                      |   61 +-
 build-cargo-dep.sh                            |    4 +-
 build/.gitignore                              |    5 +-
 build/dpkg-deps/depends                       |    2 +-
 build/dpkg-deps/docker.depends                |    5 -
 build/lib/firmware.json                       |    8 +-
 container-runtime/.gitignore                  |    4 +-
 container-runtime/Dockerfile                  |    4 +
 container-runtime/RPCSpec.md                  |   59 +
 container-runtime/containerRuntime.rc         |   10 +
 container-runtime/download-base-image.sh      |   18 +
 container-runtime/initSrc/CallbackHolder.ts   |   22 -
 container-runtime/initSrc/Effects.ts          |  184 -
 container-runtime/initSrc/Runtime.ts          |  177 -
 container-runtime/install-dist-deps.sh        |   10 +
 container-runtime/mkcontainer.sh              |   28 +
 container-runtime/package-lock.json           | 2791 +++++++++--
 container-runtime/package.json                |   17 +-
 container-runtime/rmcontainer.sh              |   12 +
 .../src/Adapters/HostSystemStartOs.ts         |  320 ++
 container-runtime/src/Adapters/RpcListener.ts |  303 ++
 .../DockerProcedureContainer.ts               |   76 +
 .../Systems/SystemForEmbassy/MainLoop.ts      |  150 +
 .../Systems/SystemForEmbassy/index.ts         |  900 ++++
 .../Systems/SystemForEmbassy/matchManifest.ts |  119 +
 .../Systems/SystemForEmbassy/matchVolume.ts   |   35 +
 .../SystemForEmbassy/oldEmbassyTypes.ts       |  482 ++
 .../SystemForEmbassy/polyfillEffects.ts       |  215 +
 .../src/Adapters/Systems/SystemForStartOs.ts  |  150 +
 .../src/Adapters/Systems/index.ts             |    6 +
 .../src/Interfaces/AllGetDependencies.ts      |    6 +
 .../src/Interfaces/GetDependency.ts           |    3 +
 .../src/Interfaces/HostSystem.ts              |    7 +
 container-runtime/src/Interfaces/System.ts    |   31 +
 .../src/Models/CallbackHolder.ts              |   18 +
 .../src/Models/DockerProcedure.ts             |   45 +
 container-runtime/src/Models/Effects.ts       |    5 +
 container-runtime/src/Models/JsonPath.ts      |   42 +
 container-runtime/src/Models/Volume.ts        |   19 +
 container-runtime/{initSrc => src}/index.ts   |   15 +-
 container-runtime/tsconfig.json               |   25 +-
 container-runtime/update-image.sh             |   41 +
 core/Cargo.lock                               | 2977 +++++-------
 core/Cargo.toml                               |    2 +-
 core/README.md                                |    5 -
 core/build-prod.sh                            |   18 +-
 core/build-v8-snapshot.sh                     |   39 -
 core/container-init/Cargo.toml                |   39 -
 core/container-init/src/lib.rs                |  214 -
 core/container-init/src/main.rs               |  428 --
 core/helpers/Cargo.toml                       |    2 +-
 core/helpers/src/lib.rs                       |    2 -
 core/{install-sdk.sh => install-cli.sh}       |    5 +-
 core/models/Cargo.toml                        |    1 +
 core/models/src/errors.rs                     |  138 +-
 core/models/src/id/image.rs                   |    6 +
 core/models/src/procedure_name.rs             |   67 +-
 core/snapshot-creator/Cargo.toml              |   11 -
 core/snapshot-creator/src/main.rs             |   11 -
 core/startos/Cargo.toml                       |   54 +-
 core/startos/deny.toml                        |   10 +-
 core/startos/src/action.rs                    |  156 +-
 core/startos/src/auth.rs                      |  257 +-
 core/startos/src/backup/backup_bulk.rs        |  164 +-
 core/startos/src/backup/mod.rs                |  201 +-
 core/startos/src/backup/restore.rs            |  424 +-
 core/startos/src/backup/target/cifs.rs        |   96 +-
 core/startos/src/backup/target/mod.rs         |  116 +-
 core/startos/src/bins/avahi_alias.rs          |  163 -
 core/startos/src/bins/container_cli.rs        |   38 +
 core/startos/src/bins/mod.rs                  |   55 +-
 core/startos/src/bins/start_cli.rs            |   61 +-
 core/startos/src/bins/start_deno.rs           |  142 -
 core/startos/src/bins/start_init.rs           |   58 +-
 core/startos/src/bins/start_sdk.rs            |   61 -
 core/startos/src/bins/startd.rs               |   39 +-
 core/startos/src/config/action.rs             |   98 +-
 core/startos/src/config/mod.rs                |  206 +-
 core/startos/src/config/spec.rs               |   40 +-
 core/startos/src/context/cli.rs               |  194 +-
 core/startos/src/context/config.rs            |  175 +
 core/startos/src/context/diagnostic.rs        |   43 +-
 core/startos/src/context/install.rs           |   25 +-
 core/startos/src/context/mod.rs               |   34 +-
 core/startos/src/context/rpc.rs               |  244 +-
 core/startos/src/context/sdk.rs               |   28 +-
 core/startos/src/context/setup.rs             |   62 +-
 core/startos/src/control.rs                   |   87 +-
 core/startos/src/core/rpc_continuations.rs    |   83 +-
 core/startos/src/db/mod.rs                    |  254 +-
 core/startos/src/db/model.rs                  |   52 +-
 core/startos/src/db/package.rs                |   22 -
 core/startos/src/db/prelude.rs                |    3 +-
 core/startos/src/dependencies.rs              |  310 +-
 core/startos/src/developer/mod.rs             |   12 +-
 core/startos/src/diagnostic.rs                |   77 +-
 core/startos/src/disk/main.rs                 |   12 +-
 core/startos/src/disk/mod.rs                  |   48 +-
 core/startos/src/disk/mount/backup.rs         |   97 +-
 .../startos/src/disk/mount/filesystem/bind.rs |   27 +-
 .../src/disk/mount/filesystem/block_dev.rs    |   30 +-
 .../startos/src/disk/mount/filesystem/cifs.rs |    6 +-
 .../src/disk/mount/filesystem/ecryptfs.rs     |   65 +-
 .../src/disk/mount/filesystem/efivarfs.rs     |   28 +-
 .../src/disk/mount/filesystem/httpdirfs.rs    |    4 +-
 .../src/disk/mount/filesystem/idmapped.rs     |   88 +
 .../src/disk/mount/filesystem/label.rs        |   33 +-
 .../src/disk/mount/filesystem/loop_dev.rs     |   56 +-
 core/startos/src/disk/mount/filesystem/mod.rs |   86 +-
 .../src/disk/mount/filesystem/overlayfs.rs    |  153 +
 core/startos/src/disk/mount/guard.rs          |   94 +-
 core/startos/src/disk/mount/util.rs           |    2 +-
 core/startos/src/disk/util.rs                 |    5 +-
 core/startos/src/error.rs                     |   14 +-
 core/startos/src/firmware.rs                  |    9 +-
 core/startos/src/init.rs                      |   83 +-
 core/startos/src/inspect.rs                   |   93 +-
 core/startos/src/install/cleanup.rs           |  241 -
 core/startos/src/install/mod.rs               | 1439 ++----
 core/startos/src/install/progress.rs          |  228 -
 core/startos/src/install/update.rs            |    2 +-
 core/startos/src/lib.rs                       |  269 +-
 core/startos/src/logs.rs                      |  200 +-
 core/startos/src/lxc/config.template          |   19 +
 core/startos/src/lxc/mod.rs                   |  536 ++
 core/startos/src/manager/health.rs            |   56 -
 core/startos/src/manager/manager_container.rs |  282 --
 core/startos/src/manager/manager_map.rs       |   96 -
 core/startos/src/manager/manager_seed.rs      |   37 -
 core/startos/src/manager/mod.rs               |  854 ----
 .../src/manager/persistent_container.rs       |  187 -
 core/startos/src/manager/transition_state.rs  |   35 -
 core/startos/src/middleware/auth.rs           |  303 +-
 core/startos/src/middleware/cors.rs           |  112 +-
 core/startos/src/middleware/db.rs             |   90 +-
 core/startos/src/middleware/diagnostic.rs     |   72 +-
 core/startos/src/middleware/encrypt.rs        |  115 -
 core/startos/src/middleware/mod.rs            |    1 -
 core/startos/src/migration.rs                 |  141 -
 core/startos/src/net/dhcp.rs                  |   30 +-
 core/startos/src/net/interface.rs             |    2 +-
 core/startos/src/net/keys.rs                  |   82 +-
 core/startos/src/net/mdns.rs                  |   68 -
 core/startos/src/net/mod.rs                   |   28 +-
 core/startos/src/net/net_controller.rs        |   32 +-
 core/startos/src/net/ssl.rs                   |   12 +-
 core/startos/src/net/static_server.rs         |  329 +-
 core/startos/src/net/tor.rs                   |  130 +-
 core/startos/src/net/utils.rs                 |   54 +-
 core/startos/src/net/vhost.rs                 |  104 +-
 core/startos/src/net/web_server.rs            |   45 +-
 core/startos/src/net/wifi.rs                  |  161 +-
 core/startos/src/net/ws_server.rs             |   94 -
 core/startos/src/notifications.rs             |  117 +-
 core/startos/src/os_install/mod.rs            |   80 +-
 core/startos/src/prelude.rs                   |    1 +
 core/startos/src/procedure/build.rs           |    0
 core/startos/src/procedure/docker.rs          |  533 --
 core/startos/src/procedure/js_scripts.rs      |   51 -
 core/startos/src/procedure/mod.rs             |  139 -
 core/startos/src/progress.rs                  |  442 ++
 core/startos/src/properties.rs                |   56 +-
 core/startos/src/registry/admin.rs            |   45 +-
 core/startos/src/registry/marketplace.rs      |   21 +-
 .../s9pk/merkle_archive/directory_contents.rs |  189 +-
 .../src/s9pk/merkle_archive/file_contents.rs  |    7 +-
 core/startos/src/s9pk/merkle_archive/mod.rs   |  104 +-
 .../src/s9pk/merkle_archive/source/http.rs    |   22 +-
 .../src/s9pk/merkle_archive/source/mod.rs     |   86 +-
 .../source/multi_cursor_file.rs               |   52 +-
 .../src/s9pk/merkle_archive/write_queue.rs    |    1 -
 core/startos/src/s9pk/mod.rs                  |   36 +-
 core/startos/src/s9pk/rpc.rs                  |  227 +
 core/startos/src/s9pk/v1/manifest.rs          |  106 +-
 core/startos/src/s9pk/v1/mod.rs               |  240 +-
 core/startos/src/s9pk/v1/reader.rs            |  113 +-
 core/startos/src/s9pk/v2/compat.rs            |  358 ++
 core/startos/src/s9pk/v2/manifest.rs          |   95 +
 core/startos/src/s9pk/v2/mod.rs               |  205 +-
 core/startos/src/service/cli.rs               |   66 +
 core/startos/src/service/config.rs            |   22 +
 core/startos/src/service/control.rs           |   45 +
 core/startos/src/service/fake.cert.key        |    5 +
 core/startos/src/service/fake.cert.pem        |   13 +
 core/startos/src/service/mod.rs               |  542 +++
 .../src/service/persistent_container.rs       |  365 ++
 core/startos/src/service/rpc.rs               |   96 +
 .../src/service/service_effect_handler.rs     |  684 +++
 core/startos/src/service/service_map.rs       |  384 ++
 .../src/{manager => service}/start_stop.rs    |    2 +-
 core/startos/src/service/transition/backup.rs |    1 +
 core/startos/src/service/transition/mod.rs    |   74 +
 .../startos/src/service/transition/restart.rs |   39 +
 core/startos/src/service/util.rs              |   14 +
 core/startos/src/setup.rs                     |  132 +-
 core/startos/src/shutdown.rs                  |   36 +-
 core/startos/src/ssh.rs                       |   87 +-
 core/startos/src/status/health_check.rs       |  102 -
 core/startos/src/status/mod.rs                |   37 +-
 core/startos/src/system.rs                    |  229 +-
 core/startos/src/update/mod.rs                |   21 +-
 core/startos/src/upload.rs                    |  272 ++
 core/startos/src/util/actor.rs                |  192 +
 core/startos/src/util/clap.rs                 |   36 +
 core/startos/src/util/config.rs               |   58 -
 core/startos/src/util/crypto.rs               |  116 +
 core/startos/src/util/docker.rs               |  239 -
 core/startos/src/util/future.rs               |  119 +
 core/startos/src/util/http_reader.rs          |   23 +-
 core/startos/src/util/io.rs                   |   79 +-
 core/startos/src/util/mod.rs                  |   35 +-
 .../src => startos/src/util}/rpc_client.rs    |   67 +-
 core/startos/src/util/serde.rs                |  305 +-
 core/startos/src/version/mod.rs               |    7 +-
 core/startos/src/volume.rs                    |    2 +-
 core/startos/startd.service                   |    3 -
 debian/postinst                               |    6 +
 devmode.sh                                    |    4 +
 image-recipe/README.md                        |    6 +-
 image-recipe/build.sh                         |   37 +-
 image-recipe/prepare.sh                       |   13 +
 patch-db                                      |    2 +-
 sdk/.gitignore                                |    5 +
 sdk/LICENSE                                   |   21 +
 sdk/Makefile                                  |   44 +
 sdk/README.md                                 |   18 +
 sdk/jest.config.js                            |    8 +
 sdk/lib/StartSdk.ts                           |  534 ++
 sdk/lib/actions/createAction.ts               |  101 +
 sdk/lib/actions/index.ts                      |    3 +
 sdk/lib/actions/setupActions.ts               |   42 +
 sdk/lib/backup/Backups.ts                     |  181 +
 sdk/lib/backup/index.ts                       |    3 +
 sdk/lib/backup/setupBackups.ts                |   43 +
 sdk/lib/config/builder/config.ts              |  139 +
 sdk/lib/config/builder/index.ts               |    4 +
 sdk/lib/config/builder/list.ts                |  279 ++
 sdk/lib/config/builder/value.ts               |  783 +++
 sdk/lib/config/builder/variants.ts            |  120 +
 sdk/lib/config/configConstants.ts             |   80 +
 sdk/lib/config/configDependencies.ts          |   25 +
 sdk/lib/config/configTypes.ts                 |  249 +
 sdk/lib/config/index.ts                       |    5 +
 sdk/lib/config/setupConfig.ts                 |   98 +
 sdk/lib/dependency/mountDependencies.ts       |   43 +
 sdk/lib/dependency/setupDependencyMounts.ts   |   72 +
 sdk/lib/dependencyConfig/DependencyConfig.ts  |   47 +
 sdk/lib/dependencyConfig/index.ts             |    9 +
 .../dependencyConfig/setupDependencyConfig.ts |   22 +
 sdk/lib/emverLite/mod.ts                      |  307 ++
 sdk/lib/health/HealthCheck.ts                 |   65 +
 sdk/lib/health/HealthReceipt.ts               |    4 +
 sdk/lib/health/checkFns/CheckResult.ts        |    6 +
 sdk/lib/health/checkFns/checkPortListening.ts |   67 +
 sdk/lib/health/checkFns/checkWebUrl.ts        |   32 +
 sdk/lib/health/checkFns/index.ts              |   11 +
 sdk/lib/health/checkFns/runHealthScript.ts    |   38 +
 sdk/lib/health/index.ts                       |    3 +
 sdk/lib/index.ts                              |   23 +
 sdk/lib/inits/index.ts                        |    3 +
 sdk/lib/inits/migrations/Migration.ts         |   48 +
 sdk/lib/inits/migrations/setupMigrations.ts   |   76 +
 sdk/lib/inits/setupExports.ts                 |   18 +
 sdk/lib/inits/setupInit.ts                    |   42 +
 sdk/lib/inits/setupInstall.ts                 |   33 +
 sdk/lib/inits/setupUninstall.ts               |   33 +
 sdk/lib/interfaces/AddressReceipt.ts          |    4 +
 sdk/lib/interfaces/Host.ts                    |  205 +
 sdk/lib/interfaces/NetworkInterfaceBuilder.ts |   73 +
 sdk/lib/interfaces/Origin.ts                  |   33 +
 sdk/lib/interfaces/interfaceReceipt.ts        |    4 +
 sdk/lib/interfaces/setupInterfaces.ts         |   28 +
 sdk/lib/mainFn/Daemons.ts                     |  155 +
 sdk/lib/mainFn/index.ts                       |   35 +
 sdk/lib/manifest/ManifestTypes.ts             |  105 +
 sdk/lib/manifest/index.ts                     |    2 +
 sdk/lib/manifest/setupManifest.ts             |   20 +
 sdk/lib/store/getStore.ts                     |   61 +
 sdk/lib/test/configBuilder.test.ts            |  818 ++++
 sdk/lib/test/configTypes.test.ts              |   32 +
 sdk/lib/test/emverList.test.ts                |  262 +
 sdk/lib/test/health.readyCheck.test.ts        |   17 +
 sdk/lib/test/host.test.ts                     |   27 +
 sdk/lib/test/makeOutput.ts                    |  428 ++
 sdk/lib/test/mountDependencies.test.ts        |  125 +
 sdk/lib/test/output.sdk.ts                    |   45 +
 sdk/lib/test/output.test.ts                   |  152 +
 sdk/lib/test/setupDependencyConfig.test.ts    |   27 +
 sdk/lib/test/store.test.ts                    |  115 +
 sdk/lib/test/util.deepMerge.test.ts           |   26 +
 sdk/lib/test/util.getNetworkInterface.test.ts |   20 +
 sdk/lib/test/utils.splitCommand.test.ts       |   42 +
 sdk/lib/trigger/TriggerInput.ts               |    6 +
 sdk/lib/trigger/changeOnFirstSuccess.ts       |   30 +
 sdk/lib/trigger/cooldownTrigger.ts            |    8 +
 sdk/lib/trigger/defaultTrigger.ts             |    8 +
 sdk/lib/trigger/index.ts                      |    7 +
 sdk/lib/trigger/successFailure.ts             |   32 +
 sdk/lib/types.ts                              |  526 ++
 sdk/lib/util/GetSystemSmtp.ts                 |   37 +
 sdk/lib/util/Overlay.ts                       |  154 +
 sdk/lib/util/deepEqual.ts                     |   19 +
 sdk/lib/util/deepMerge.ts                     |   17 +
 sdk/lib/util/fileHelper.ts                    |  147 +
 sdk/lib/util/getDefaultString.ts              |   10 +
 sdk/lib/util/getNetworkInterface.ts           |  313 ++
 sdk/lib/util/getNetworkInterfaces.ts          |  120 +
 sdk/lib/util/getRandomCharInSet.ts            |   98 +
 sdk/lib/util/getRandomString.ts               |   11 +
 sdk/lib/util/index.ts                         |   36 +
 sdk/lib/util/nullIfEmpty.ts                   |   12 +
 sdk/lib/util/once.ts                          |    9 +
 sdk/lib/util/patterns.ts                      |   59 +
 sdk/lib/util/regexes.ts                       |   34 +
 sdk/lib/util/splitCommand.ts                  |   17 +
 sdk/lib/util/stringFromStdErrOut.ts           |    6 +
 sdk/lib/util/utils.ts                         |  293 ++
 sdk/package-lock.json                         | 4320 +++++++++++++++++
 sdk/package.json                              |   59 +
 sdk/scripts/oldSpecToBuilder.ts               |  413 ++
 sdk/tsconfig-base.json                        |   19 +
 sdk/tsconfig-cjs.json                         |    8 +
 sdk/tsconfig.json                             |    8 +
 system-images/compat/Cargo.lock               | 2320 +++++----
 326 files changed, 31768 insertions(+), 14047 deletions(-)
 delete mode 100644 build/dpkg-deps/docker.depends
 create mode 100644 container-runtime/Dockerfile
 create mode 100644 container-runtime/RPCSpec.md
 create mode 100644 container-runtime/containerRuntime.rc
 create mode 100755 container-runtime/download-base-image.sh
 delete mode 100644 container-runtime/initSrc/CallbackHolder.ts
 delete mode 100644 container-runtime/initSrc/Effects.ts
 delete mode 100644 container-runtime/initSrc/Runtime.ts
 create mode 100755 container-runtime/install-dist-deps.sh
 create mode 100644 container-runtime/mkcontainer.sh
 create mode 100644 container-runtime/rmcontainer.sh
 create mode 100644 container-runtime/src/Adapters/HostSystemStartOs.ts
 create mode 100644 container-runtime/src/Adapters/RpcListener.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/matchVolume.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForStartOs.ts
 create mode 100644 container-runtime/src/Adapters/Systems/index.ts
 create mode 100644 container-runtime/src/Interfaces/AllGetDependencies.ts
 create mode 100644 container-runtime/src/Interfaces/GetDependency.ts
 create mode 100644 container-runtime/src/Interfaces/HostSystem.ts
 create mode 100644 container-runtime/src/Interfaces/System.ts
 create mode 100644 container-runtime/src/Models/CallbackHolder.ts
 create mode 100644 container-runtime/src/Models/DockerProcedure.ts
 create mode 100644 container-runtime/src/Models/Effects.ts
 create mode 100644 container-runtime/src/Models/JsonPath.ts
 create mode 100644 container-runtime/src/Models/Volume.ts
 rename container-runtime/{initSrc => src}/index.ts (65%)
 create mode 100755 container-runtime/update-image.sh
 delete mode 100755 core/build-v8-snapshot.sh
 delete mode 100644 core/container-init/Cargo.toml
 delete mode 100644 core/container-init/src/lib.rs
 delete mode 100644 core/container-init/src/main.rs
 rename core/{install-sdk.sh => install-cli.sh} (61%)
 delete mode 100644 core/snapshot-creator/Cargo.toml
 delete mode 100644 core/snapshot-creator/src/main.rs
 delete mode 100644 core/startos/src/bins/avahi_alias.rs
 create mode 100644 core/startos/src/bins/container_cli.rs
 delete mode 100644 core/startos/src/bins/start_deno.rs
 delete mode 100644 core/startos/src/bins/start_sdk.rs
 create mode 100644 core/startos/src/context/config.rs
 delete mode 100644 core/startos/src/db/package.rs
 create mode 100644 core/startos/src/disk/mount/filesystem/idmapped.rs
 create mode 100644 core/startos/src/disk/mount/filesystem/overlayfs.rs
 delete mode 100644 core/startos/src/install/cleanup.rs
 delete mode 100644 core/startos/src/install/progress.rs
 create mode 100644 core/startos/src/lxc/config.template
 create mode 100644 core/startos/src/lxc/mod.rs
 delete mode 100644 core/startos/src/manager/health.rs
 delete mode 100644 core/startos/src/manager/manager_container.rs
 delete mode 100644 core/startos/src/manager/manager_map.rs
 delete mode 100644 core/startos/src/manager/manager_seed.rs
 delete mode 100644 core/startos/src/manager/mod.rs
 delete mode 100644 core/startos/src/manager/persistent_container.rs
 delete mode 100644 core/startos/src/manager/transition_state.rs
 delete mode 100644 core/startos/src/middleware/encrypt.rs
 delete mode 100644 core/startos/src/migration.rs
 delete mode 100644 core/startos/src/net/ws_server.rs
 delete mode 100644 core/startos/src/procedure/build.rs
 delete mode 100644 core/startos/src/procedure/docker.rs
 delete mode 100644 core/startos/src/procedure/js_scripts.rs
 delete mode 100644 core/startos/src/procedure/mod.rs
 create mode 100644 core/startos/src/progress.rs
 create mode 100644 core/startos/src/s9pk/rpc.rs
 create mode 100644 core/startos/src/s9pk/v2/compat.rs
 create mode 100644 core/startos/src/s9pk/v2/manifest.rs
 create mode 100644 core/startos/src/service/cli.rs
 create mode 100644 core/startos/src/service/config.rs
 create mode 100644 core/startos/src/service/control.rs
 create mode 100644 core/startos/src/service/fake.cert.key
 create mode 100644 core/startos/src/service/fake.cert.pem
 create mode 100644 core/startos/src/service/mod.rs
 create mode 100644 core/startos/src/service/persistent_container.rs
 create mode 100644 core/startos/src/service/rpc.rs
 create mode 100644 core/startos/src/service/service_effect_handler.rs
 create mode 100644 core/startos/src/service/service_map.rs
 rename core/startos/src/{manager => service}/start_stop.rs (93%)
 create mode 100644 core/startos/src/service/transition/backup.rs
 create mode 100644 core/startos/src/service/transition/mod.rs
 create mode 100644 core/startos/src/service/transition/restart.rs
 create mode 100644 core/startos/src/service/util.rs
 create mode 100644 core/startos/src/upload.rs
 create mode 100644 core/startos/src/util/actor.rs
 create mode 100644 core/startos/src/util/clap.rs
 delete mode 100644 core/startos/src/util/config.rs
 delete mode 100644 core/startos/src/util/docker.rs
 create mode 100644 core/startos/src/util/future.rs
 rename core/{helpers/src => startos/src/util}/rpc_client.rs (69%)
 create mode 100755 devmode.sh
 create mode 100644 sdk/.gitignore
 create mode 100644 sdk/LICENSE
 create mode 100644 sdk/Makefile
 create mode 100644 sdk/README.md
 create mode 100644 sdk/jest.config.js
 create mode 100644 sdk/lib/StartSdk.ts
 create mode 100644 sdk/lib/actions/createAction.ts
 create mode 100644 sdk/lib/actions/index.ts
 create mode 100644 sdk/lib/actions/setupActions.ts
 create mode 100644 sdk/lib/backup/Backups.ts
 create mode 100644 sdk/lib/backup/index.ts
 create mode 100644 sdk/lib/backup/setupBackups.ts
 create mode 100644 sdk/lib/config/builder/config.ts
 create mode 100644 sdk/lib/config/builder/index.ts
 create mode 100644 sdk/lib/config/builder/list.ts
 create mode 100644 sdk/lib/config/builder/value.ts
 create mode 100644 sdk/lib/config/builder/variants.ts
 create mode 100644 sdk/lib/config/configConstants.ts
 create mode 100644 sdk/lib/config/configDependencies.ts
 create mode 100644 sdk/lib/config/configTypes.ts
 create mode 100644 sdk/lib/config/index.ts
 create mode 100644 sdk/lib/config/setupConfig.ts
 create mode 100644 sdk/lib/dependency/mountDependencies.ts
 create mode 100644 sdk/lib/dependency/setupDependencyMounts.ts
 create mode 100644 sdk/lib/dependencyConfig/DependencyConfig.ts
 create mode 100644 sdk/lib/dependencyConfig/index.ts
 create mode 100644 sdk/lib/dependencyConfig/setupDependencyConfig.ts
 create mode 100644 sdk/lib/emverLite/mod.ts
 create mode 100644 sdk/lib/health/HealthCheck.ts
 create mode 100644 sdk/lib/health/HealthReceipt.ts
 create mode 100644 sdk/lib/health/checkFns/CheckResult.ts
 create mode 100644 sdk/lib/health/checkFns/checkPortListening.ts
 create mode 100644 sdk/lib/health/checkFns/checkWebUrl.ts
 create mode 100644 sdk/lib/health/checkFns/index.ts
 create mode 100644 sdk/lib/health/checkFns/runHealthScript.ts
 create mode 100644 sdk/lib/health/index.ts
 create mode 100644 sdk/lib/index.ts
 create mode 100644 sdk/lib/inits/index.ts
 create mode 100644 sdk/lib/inits/migrations/Migration.ts
 create mode 100644 sdk/lib/inits/migrations/setupMigrations.ts
 create mode 100644 sdk/lib/inits/setupExports.ts
 create mode 100644 sdk/lib/inits/setupInit.ts
 create mode 100644 sdk/lib/inits/setupInstall.ts
 create mode 100644 sdk/lib/inits/setupUninstall.ts
 create mode 100644 sdk/lib/interfaces/AddressReceipt.ts
 create mode 100644 sdk/lib/interfaces/Host.ts
 create mode 100644 sdk/lib/interfaces/NetworkInterfaceBuilder.ts
 create mode 100644 sdk/lib/interfaces/Origin.ts
 create mode 100644 sdk/lib/interfaces/interfaceReceipt.ts
 create mode 100644 sdk/lib/interfaces/setupInterfaces.ts
 create mode 100644 sdk/lib/mainFn/Daemons.ts
 create mode 100644 sdk/lib/mainFn/index.ts
 create mode 100644 sdk/lib/manifest/ManifestTypes.ts
 create mode 100644 sdk/lib/manifest/index.ts
 create mode 100644 sdk/lib/manifest/setupManifest.ts
 create mode 100644 sdk/lib/store/getStore.ts
 create mode 100644 sdk/lib/test/configBuilder.test.ts
 create mode 100644 sdk/lib/test/configTypes.test.ts
 create mode 100644 sdk/lib/test/emverList.test.ts
 create mode 100644 sdk/lib/test/health.readyCheck.test.ts
 create mode 100644 sdk/lib/test/host.test.ts
 create mode 100644 sdk/lib/test/makeOutput.ts
 create mode 100644 sdk/lib/test/mountDependencies.test.ts
 create mode 100644 sdk/lib/test/output.sdk.ts
 create mode 100644 sdk/lib/test/output.test.ts
 create mode 100644 sdk/lib/test/setupDependencyConfig.test.ts
 create mode 100644 sdk/lib/test/store.test.ts
 create mode 100644 sdk/lib/test/util.deepMerge.test.ts
 create mode 100644 sdk/lib/test/util.getNetworkInterface.test.ts
 create mode 100644 sdk/lib/test/utils.splitCommand.test.ts
 create mode 100644 sdk/lib/trigger/TriggerInput.ts
 create mode 100644 sdk/lib/trigger/changeOnFirstSuccess.ts
 create mode 100644 sdk/lib/trigger/cooldownTrigger.ts
 create mode 100644 sdk/lib/trigger/defaultTrigger.ts
 create mode 100644 sdk/lib/trigger/index.ts
 create mode 100644 sdk/lib/trigger/successFailure.ts
 create mode 100644 sdk/lib/types.ts
 create mode 100644 sdk/lib/util/GetSystemSmtp.ts
 create mode 100644 sdk/lib/util/Overlay.ts
 create mode 100644 sdk/lib/util/deepEqual.ts
 create mode 100644 sdk/lib/util/deepMerge.ts
 create mode 100644 sdk/lib/util/fileHelper.ts
 create mode 100644 sdk/lib/util/getDefaultString.ts
 create mode 100644 sdk/lib/util/getNetworkInterface.ts
 create mode 100644 sdk/lib/util/getNetworkInterfaces.ts
 create mode 100644 sdk/lib/util/getRandomCharInSet.ts
 create mode 100644 sdk/lib/util/getRandomString.ts
 create mode 100644 sdk/lib/util/index.ts
 create mode 100644 sdk/lib/util/nullIfEmpty.ts
 create mode 100644 sdk/lib/util/once.ts
 create mode 100644 sdk/lib/util/patterns.ts
 create mode 100644 sdk/lib/util/regexes.ts
 create mode 100644 sdk/lib/util/splitCommand.ts
 create mode 100644 sdk/lib/util/stringFromStdErrOut.ts
 create mode 100644 sdk/lib/util/utils.ts
 create mode 100644 sdk/package-lock.json
 create mode 100644 sdk/package.json
 create mode 100644 sdk/scripts/oldSpecToBuilder.ts
 create mode 100644 sdk/tsconfig-base.json
 create mode 100644 sdk/tsconfig-cjs.json
 create mode 100644 sdk/tsconfig.json

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 60b642e19..47e0266cd 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -12,9 +12,6 @@ on:
           - dev
           - unstable
           - dev-unstable
-          - docker
-          - dev-docker
-          - dev-unstable-docker
       runner:
         type: choice
         description: Runner
diff --git a/.gitignore b/.gitignore
index d33151e91..1df3692ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,5 @@ secrets.db
 /dpkg-workdir
 /compiled.tar
 /compiled-*.tar
-/firmware
\ No newline at end of file
+/firmware
+/tmp
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 65d4d79dd..f28bc8d5c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,10 @@ BASENAME := $(shell ./basename.sh)
 PLATFORM := $(shell if [ -f ./PLATFORM.txt ]; then cat ./PLATFORM.txt; else echo unknown; fi)
 ARCH := $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo aarch64; else echo $(PLATFORM) | sed 's/-nonfree$$//g'; fi)
 IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo iso; fi)
-BINS := core/target/$(ARCH)-unknown-linux-gnu/release/startbox core/target/aarch64-unknown-linux-musl/release/container-init core/target/x86_64-unknown-linux-musl/release/container-init
+BINS := core/target/$(ARCH)-unknown-linux-musl/release/startbox core/target/$(ARCH)-unknown-linux-musl/release/containerbox
 WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/diagnostic-ui web/dist/raw/install-wizard
 FIRMWARE_ROMS := ./firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json)
-BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts $(FIRMWARE_ROMS)
+BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts build/lib/container-runtime/rootfs.squashfs $(FIRMWARE_ROMS)
 DEBIAN_SRC := $(shell git ls-files debian/)
 IMAGE_RECIPE_SRC := $(shell git ls-files image-recipe/)
 STARTD_SRC := core/startos/startd.service $(BUILD_SRC)
@@ -26,7 +26,7 @@ PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client
 GZIP_BIN := $(shell which pigz || which gzip)
 TAR_BIN := $(shell which gtar || which tar)
 COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar
-ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-gnu/release/tokio-console; fi') $(PLATFORM_FILE)
+ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE)
 
 ifeq ($(REMOTE),)
 	mkdir = mkdir -p $1
@@ -49,7 +49,7 @@ endif
 
 .DELETE_ON_ERROR:
 
-.PHONY: all metadata install clean format sdk snapshots uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole test
+.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole test
 
 all: $(ALL_TARGETS)
 
@@ -74,6 +74,11 @@ clean:
 	rm -rf image-recipe/deb
 	rm -rf results
 	rm -rf build/lib/firmware
+	rm -rf container-runtime/dist
+	rm -rf container-runtime/node_modules
+	rm -f build/lib/container-runtime/rootfs.squashfs
+	rm -rf sdk/dist
+	rm -rf sdk/node_modules
 	rm -f ENVIRONMENT.txt
 	rm -f PLATFORM.txt
 	rm -f GIT_HASH.txt
@@ -85,8 +90,8 @@ format:
 test: $(CORE_SRC) $(ENVIRONMENT_FILE)
 	cd core && cargo build && cargo test
 
-sdk:
-	cd core && ./install-sdk.sh
+cli:
+	cd core && ./install-cli.sh
 
 deb: results/$(BASENAME).deb
 
@@ -106,15 +111,13 @@ results/$(BASENAME).$(IMAGE_TYPE) results/$(BASENAME).squashfs: $(IMAGE_RECIPE_S
 # For creating os images. DO NOT USE
 install: $(ALL_TARGETS)
 	$(call mkdir,$(DESTDIR)/usr/bin)
-	$(call cp,core/target/$(ARCH)-unknown-linux-gnu/release/startbox,$(DESTDIR)/usr/bin/startbox)
+	$(call cp,core/target/$(ARCH)-unknown-linux-musl/release/startbox,$(DESTDIR)/usr/bin/startbox)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/startd)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-cli)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-sdk)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-deno)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/avahi-alias)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/embassy-cli)
-	if [ "$(PLATFORM)" = "raspberrypi" ]; then $(call cp,cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep,$(DESTDIR)/usr/bin/pi-beep); fi
-	if /bin/bash -c '[[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]'; then $(call cp,cargo-deps/$(ARCH)-unknown-linux-gnu/release/tokio-console,$(DESTDIR)/usr/bin/tokio-console); fi
+	if [ "$(PLATFORM)" = "raspberrypi" ]; then $(call cp,cargo-deps/aarch64-unknown-linux-musl/release/pi-beep,$(DESTDIR)/usr/bin/pi-beep); fi
+	if /bin/bash -c '[[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]'; then $(call cp,cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console,$(DESTDIR)/usr/bin/tokio-console); fi
 	
 	$(call mkdir,$(DESTDIR)/lib/systemd/system)
 	$(call cp,core/startos/startd.service,$(DESTDIR)/lib/systemd/system/startd.service)
@@ -128,10 +131,6 @@ install: $(ALL_TARGETS)
 	$(call cp,GIT_HASH.txt,$(DESTDIR)/usr/lib/startos/GIT_HASH.txt)
 	$(call cp,VERSION.txt,$(DESTDIR)/usr/lib/startos/VERSION.txt)
 
-	$(call mkdir,$(DESTDIR)/usr/lib/startos/container)
-	$(call cp,core/target/aarch64-unknown-linux-musl/release/container-init,$(DESTDIR)/usr/lib/startos/container/container-init.arm64)
-	$(call cp,core/target/x86_64-unknown-linux-musl/release/container-init,$(DESTDIR)/usr/lib/startos/container/container-init.amd64)
-
 	$(call mkdir,$(DESTDIR)/usr/lib/startos/system-images)
 	$(call cp,system-images/compat/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/compat.tar)
 	$(call cp,system-images/utils/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/utils.tar)
@@ -148,8 +147,8 @@ update-overlay: $(ALL_TARGETS)
 	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) PLATFORM=$(PLATFORM)
 	$(call ssh,"sudo systemctl start startd")
 
-wormhole: core/target/$(ARCH)-unknown-linux-gnu/release/startbox
-	@wormhole send core/target/$(ARCH)-unknown-linux-gnu/release/startbox 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade \"cd /usr/bin && rm startbox && wormhole receive --accept-file %s && chmod +x startbox\"\n", $$3 }'
+wormhole: core/target/$(ARCH)-unknown-linux-musl/release/startbox
+	@wormhole send core/target/$(ARCH)-unknown-linux-musl/release/startbox 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade \"cd /usr/bin && rm startbox && wormhole receive --accept-file %s && chmod +x startbox\"\n", $$3 }'
 
 update: $(ALL_TARGETS)
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
@@ -166,6 +165,26 @@ emulate-reflash: $(ALL_TARGETS)
 upload-ota: results/$(BASENAME).squashfs
 	TARGET=$(TARGET) KEY=$(KEY) ./upload-ota.sh
 
+container-runtime/alpine.squashfs: $(PLATFORM_FILE)
+	ARCH=$(ARCH) ./container-runtime/download-base-image.sh
+
+container-runtime/node_modules: container-runtime/package.json container-runtime/package-lock.json sdk/dist
+	npm --prefix container-runtime ci
+	touch container-runtime/node_modules
+
+sdk/dist: $(shell git ls-files sdk)
+	(cd sdk && make bundle)
+
+container-runtime/dist: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
+	npm --prefix container-runtime run build
+
+container-runtime/dist/node_modules container-runtime/dist/package.json container-runtime/dist/package-lock.json: container-runtime/package.json container-runtime/package-lock.json sdk/dist container-runtime/install-dist-deps.sh
+	./container-runtime/install-dist-deps.sh
+	touch container-runtime/dist/node_modules
+
+build/lib/container-runtime/rootfs.squashfs: container-runtime/alpine.squashfs container-runtime/containerRuntime.rc container-runtime/update-image.sh container-runtime/dist container-runtime/dist/node_modules core/target/$(ARCH)-unknown-linux-musl/release/containerbox $(PLATFORM_FILE) | sudo
+	ARCH=$(ARCH) ./container-runtime/update-image.sh
+
 build/lib/depends build/lib/conflicts: build/dpkg-deps/*
 	build/dpkg-deps/generate.sh
 
@@ -181,10 +200,6 @@ system-images/utils/docker-images/$(ARCH).tar: $(UTILS_SRC)
 system-images/binfmt/docker-images/$(ARCH).tar: $(BINFMT_SRC)
 	cd system-images/binfmt && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
 
-snapshots: core/snapshot-creator/Cargo.toml
-	cd core/ && ARCH=aarch64 ./build-v8-snapshot.sh
-	cd core/ && ARCH=x86_64 ./build-v8-snapshot.sh
-
 $(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE)
 	cd core && ARCH=$(ARCH) ./build-prod.sh
 	touch $(BINS)
@@ -231,8 +246,8 @@ uis: $(WEB_UIS)
 # this is a convenience step to build the UI
 ui: web/dist/raw/ui
 
-cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep:
+cargo-deps/aarch64-unknown-linux-musl/release/pi-beep:
 	ARCH=aarch64 ./build-cargo-dep.sh pi-beep
 
-cargo-deps/$(ARCH)-unknown-linux-gnu/release/tokio-console:
+cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console:
 	ARCH=$(ARCH) ./build-cargo-dep.sh tokio-console
\ No newline at end of file
diff --git a/build-cargo-dep.sh b/build-cargo-dep.sh
index f3cb8e969..5c8f9ceed 100755
--- a/build-cargo-dep.sh
+++ b/build-cargo-dep.sh
@@ -18,8 +18,8 @@ if [ -z "$ARCH" ]; then
 fi
 
 mkdir -p cargo-deps
-alias 'rust-arm64-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/usr/local/cargo/registry -v "$(pwd)"/cargo-deps:/home/rust/src -P start9/rust-arm-cross:aarch64'
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
 
-rust-arm64-builder cargo install "$1" --target-dir /home/rust/src --target=$ARCH-unknown-linux-gnu
+rust-musl-builder cargo install "$1" --target-dir /home/rust/src --target=$ARCH-unknown-linux-musl
 sudo chown -R $USER cargo-deps
 sudo chown -R $USER ~/.cargo
\ No newline at end of file
diff --git a/build/.gitignore b/build/.gitignore
index 357c0e49f..f24aa0255 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,2 +1,3 @@
-lib/depends
-lib/conflicts
\ No newline at end of file
+/lib/depends
+/lib/conflicts
+/lib/container-runtime/rootfs.squashfs
\ No newline at end of file
diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index a712d4a52..5438432e4 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -20,12 +20,12 @@ httpdirfs
 iotop
 iw
 jq
-libavahi-client3
 libyajl2
 linux-cpupower
 lm-sensors
 lshw
 lvm2
+lxc
 magic-wormhole
 man-db
 ncdu
diff --git a/build/dpkg-deps/docker.depends b/build/dpkg-deps/docker.depends
deleted file mode 100644
index dd78be8a1..000000000
--- a/build/dpkg-deps/docker.depends
+++ /dev/null
@@ -1,5 +0,0 @@
-+ containerd.io
-+ docker-ce
-+ docker-ce-cli
-+ docker-compose-plugin
-- podman
\ No newline at end of file
diff --git a/build/lib/firmware.json b/build/lib/firmware.json
index 9637aa70a..07def2c1e 100644
--- a/build/lib/firmware.json
+++ b/build/lib/firmware.json
@@ -1,13 +1,13 @@
 [
   {
-    "id": "pureboot-librem_mini_v2-basic_usb_autoboot_blob_jail-Release-28.3",
+    "id": "pureboot-librem_mini_v2-basic_usb_autoboot_blob_jail-Release-29",
     "platform": ["x86_64"],
     "system-product-name": "librem_mini_v2",
     "bios-version": {
       "semver-prefix": "PureBoot-Release-",
-      "semver-range": "<28.3"
+      "semver-range": "<29"
     },
-    "url": "https://source.puri.sm/firmware/releases/-/raw/master/librem_mini_v2/custom/pureboot-librem_mini_v2-basic_usb_autoboot_blob_jail-Release-28.3.rom.gz",
-    "shasum": "5019bcf53f7493c7aa74f8ef680d18b5fc26ec156c705a841433aaa2fdef8f35"
+    "url": "https://source.puri.sm/firmware/releases/-/raw/master/librem_mini_v2/custom/pureboot-librem_mini_v2-basic_usb_autoboot_blob_jail-Release-29.rom.gz",
+    "shasum": "96ec04f21b1cfe8e28d9a2418f1ff533efe21f9bbbbf16e162f7c814761b068b"
   }
 ]
diff --git a/container-runtime/.gitignore b/container-runtime/.gitignore
index e1584097d..1764c1d17 100644
--- a/container-runtime/.gitignore
+++ b/container-runtime/.gitignore
@@ -3,4 +3,6 @@ dist/
 bundle.js
 startInit.js
 service/
-service.js
\ No newline at end of file
+service.js
+alpine.squashfs
+/tmp
\ No newline at end of file
diff --git a/container-runtime/Dockerfile b/container-runtime/Dockerfile
new file mode 100644
index 000000000..f936ee11b
--- /dev/null
+++ b/container-runtime/Dockerfile
@@ -0,0 +1,4 @@
+FROM node:18-alpine
+
+ADD ./startInit.js /usr/local/lib/startInit.js
+ADD ./entrypoint.sh /usr/local/bin/entrypoint.sh
\ No newline at end of file
diff --git a/container-runtime/RPCSpec.md b/container-runtime/RPCSpec.md
new file mode 100644
index 000000000..679671614
--- /dev/null
+++ b/container-runtime/RPCSpec.md
@@ -0,0 +1,59 @@
+# Container RPC SERVER Specification
+
+## Methods
+
+### init
+initialize runtime (mount `/proc`, `/sys`, `/dev`, and `/run` to each image in `/media/images`)
+
+called after os has mounted js and images to the container
+#### args
+`[]`
+#### response
+`null`
+
+### exit
+shutdown runtime
+#### args
+`[]`
+#### response
+`null`
+
+### start
+run main method if not already running
+#### args
+`[]`
+#### response
+`null`
+
+### stop
+stop main method by sending SIGTERM to child processes, and SIGKILL after timeout
+#### args
+`{ timeout: millis }`
+#### response
+`null`
+
+### execute
+run a specific package procedure
+#### args 
+```ts
+{
+    procedure: JsonPath,
+    input: any,
+    timeout: millis,
+}
+```
+#### response
+`any`
+
+### sandbox
+run a specific package procedure in sandbox mode
+#### args 
+```ts
+{
+    procedure: JsonPath,
+    input: any,
+    timeout: millis,
+}
+```
+#### response
+`any`
diff --git a/container-runtime/containerRuntime.rc b/container-runtime/containerRuntime.rc
new file mode 100644
index 000000000..203b99659
--- /dev/null
+++ b/container-runtime/containerRuntime.rc
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+
+name=containerRuntime
+#cfgfile="/etc/containerRuntime/containerRuntime.conf"
+command="/usr/bin/node"
+command_args="--experimental-detect-module --unhandled-rejections=warn /usr/lib/startos/init/index.js"
+pidfile="/run/containerRuntime.pid"
+command_background="yes"
+output_log="/var/log/containerRuntime.log"
+error_log="/var/log/containerRuntime.err"
diff --git a/container-runtime/download-base-image.sh b/container-runtime/download-base-image.sh
new file mode 100755
index 000000000..e708478e1
--- /dev/null
+++ b/container-runtime/download-base-image.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -e
+
+DISTRO=alpine
+VERSION=3.19
+ARCH=${ARCH:-$(uname -m)}
+FLAVOR=default
+
+if [ "$ARCH" = "x86_64" ]; then
+    ARCH=amd64
+elif [ "$ARCH" = "aarch64" ]; then
+    ARCH=arm64
+fi
+
+curl https://images.linuxcontainers.org/$(curl --silent https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs --output alpine.squashfs
\ No newline at end of file
diff --git a/container-runtime/initSrc/CallbackHolder.ts b/container-runtime/initSrc/CallbackHolder.ts
deleted file mode 100644
index 16d4ac264..000000000
--- a/container-runtime/initSrc/CallbackHolder.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-export class CallbackHolder {
-    constructor() {
-
-    }
-    private root = (Math.random() + 1).toString(36).substring(7);
-    private inc = 0
-    private callbacks = new Map<string, Function>()
-    private newId() {
-        return this.root + (this.inc++).toString(36)
-    }
-    addCallback(callback: Function) {
-        return this.callbacks.set(this.newId(), callback);
-    }
-    callCallback(index: string, args: any[]): Promise<unknown> {
-        const callback = this.callbacks.get(index)
-        if (!callback) throw new Error(`Callback ${index} does not exist`)        
-        this.callbacks.delete(index)
-        return Promise.resolve().then(() => callback(...args))
-    }
-}
\ No newline at end of file
diff --git a/container-runtime/initSrc/Effects.ts b/container-runtime/initSrc/Effects.ts
deleted file mode 100644
index 7c376b0be..000000000
--- a/container-runtime/initSrc/Effects.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import * as T from "@start9labs/start-sdk/lib/types"
-import * as net from "net"
-import { CallbackHolder } from "./CallbackHolder"
-
-const SOCKET_PATH = "/start9/sockets/startDaemon.sock"
-const MAIN = "main" as const
-export class Effects implements T.Effects {
-  constructor(readonly method: string, readonly callbackHolder: CallbackHolder) {}
-  id = 0
-  rpcRound(method: string, params: unknown) {
-    const id = this.id++;
-    const client = net.createConnection(SOCKET_PATH, () => {
-        client.write(JSON.stringify({
-          id,
-          method,
-          params
-        }));
-    });
-    return new Promise((resolve, reject) => {
-      client.on('data', (data) => {
-        try {
-          resolve(JSON.parse(data.toString())?.result)
-        } catch (error) {
-          reject(error)
-        }
-        client.end();
-      });
-    })
-  }
-  started= this.method !== MAIN ? null : ()=> {
-    return this.rpcRound('started', null)
-  }
-  bind(...[options]: Parameters<T.Effects["bind"]>) {
-    return this.rpcRound('bind', (options)) as ReturnType<T.Effects["bind"]>
-  }
-  clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
-    return this.rpcRound('clearBindings', null) as ReturnType<T.Effects["clearBindings"]>
-  }
-  clearNetworkInterfaces(
-    ...[]: Parameters<T.Effects["clearNetworkInterfaces"]>
-  ) {
-    return this.rpcRound('clearNetworkInterfaces', null) as ReturnType<T.Effects["clearNetworkInterfaces"]>
-  }
-  executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
-    return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
-  }
-  exists(...[packageId]: Parameters<T.Effects["exists"]>) {
-    return this.rpcRound('exists', packageId) as ReturnType<T.Effects["exists"]>
-  }
-  exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
-    return this.rpcRound('exportAction', (options)) as ReturnType<T.Effects["exportAction"]>
-  }
-  exportNetworkInterface(
-    ...[options]: Parameters<T.Effects["exportNetworkInterface"]>
-  ) {
-    return this.rpcRound('exportNetworkInterface', (options)) as ReturnType<T.Effects["exportNetworkInterface"]>
-  }
-  exposeForDependents(...[options]: any) {
-    
-    return this.rpcRound('exposeForDependents', (null)) as ReturnType<T.Effects["exposeForDependents"]>
-  }
-  exposeUi(...[options]: Parameters<T.Effects["exposeUi"]>) {
-    
-    return this.rpcRound('exposeUi', (options)) as ReturnType<T.Effects["exposeUi"]>
-  }
-  getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
-    
-    return this.rpcRound('getConfigured',null) as ReturnType<T.Effects["getConfigured"]>
-  }
-  getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
-    
-    return this.rpcRound('getContainerIp', null) as ReturnType<T.Effects["getContainerIp"]>
-  }
-  getHostnames: any = (...[allOptions]: any[]) => {
-    const options = {
-      ...allOptions,
-      callback: this.callbackHolder.addCallback(allOptions.callback)
-    }
-    return this.rpcRound('getHostnames', options) as ReturnType<T.Effects["getHostnames"]>
-  }
-  getInterface(...[options]: Parameters<T.Effects["getInterface"]>) {
-    
-    return this.rpcRound('getInterface', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["getInterface"]>
-  }
-  getIPHostname(...[]: Parameters<T.Effects["getIPHostname"]>) {
-    
-    return this.rpcRound('getIPHostname', (null)) as ReturnType<T.Effects["getIPHostname"]>
-  }
-  getLocalHostname(...[]: Parameters<T.Effects["getLocalHostname"]>) {
-    
-    return this.rpcRound('getLocalHostname', null) as ReturnType<T.Effects["getLocalHostname"]>
-  }
-  getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
-    
-    return this.rpcRound('getPrimaryUrl', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["getPrimaryUrl"]>
-  }
-  getServicePortForward(
-    ...[options]: Parameters<T.Effects["getServicePortForward"]>
-  ) {
-    
-    return this.rpcRound('getServicePortForward', (options)) as ReturnType<T.Effects["getServicePortForward"]>
-  }
-  getServiceTorHostname(
-    ...[interfaceId, packageId]: Parameters<T.Effects["getServiceTorHostname"]>
-  ) {
-    
-    return this.rpcRound('getServiceTorHostname', ({interfaceId, packageId})) as ReturnType<T.Effects["getServiceTorHostname"]>
-  }
-  getSslCertificate(...[packageId, algorithm]: Parameters<T.Effects["getSslCertificate"]>) {
-    
-    return this.rpcRound('getSslCertificate', ({packageId, algorithm})) as ReturnType<T.Effects["getSslCertificate"]>
-  }
-  getSslKey(...[packageId, algorithm]: Parameters<T.Effects["getSslKey"]>) {
-    
-    return this.rpcRound('getSslKey', ({packageId, algorithm})) as ReturnType<T.Effects["getSslKey"]>
-  }
-  getSystemSmtp(...[options]: Parameters<T.Effects["getSystemSmtp"]>) {
-    
-    return this.rpcRound('getSystemSmtp', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["getSystemSmtp"]>
-  }
-  is_sandboxed(...[]: Parameters<T.Effects["is_sandboxed"]>) {
-    
-    return this.rpcRound('is_sandboxed', (null)) as ReturnType<T.Effects["is_sandboxed"]>
-  }
-  listInterface(...[options]: Parameters<T.Effects["listInterface"]>) {
-    
-    return this.rpcRound('listInterface', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["listInterface"]>
-  }
-  mount(...[options]: Parameters<T.Effects["mount"]>) {
-    
-    return this.rpcRound('mount', options) as ReturnType<T.Effects["mount"]>
-  }
-  removeAction(...[options]: Parameters<T.Effects["removeAction"]>) {
-    
-    return this.rpcRound('removeAction', options) as ReturnType<T.Effects["removeAction"]>
-  }
-  removeAddress(...[options]: Parameters<T.Effects["removeAddress"]>) {
-    
-    return this.rpcRound('removeAddress', options) as ReturnType<T.Effects["removeAddress"]>
-  }
-  restart(...[]: Parameters<T.Effects["restart"]>) {
-    
-    this.rpcRound('restart', null) 
-  }
-  reverseProxy(...[options]: Parameters<T.Effects["reverseProxy"]>) {
-    
-    return this.rpcRound('reverseProxy', options) as ReturnType<T.Effects["reverseProxy"]>
-  }
-  running(...[packageId]: Parameters<T.Effects["running"]>) {
-    
-    return this.rpcRound('running', {packageId}) as ReturnType<T.Effects["running"]>
-  }
-  // runRsync(...[options]: Parameters<T.Effects[""]>) {
-  //   
-    // return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
-  //   
-    // return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
-  // }
-  setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
-    
-    return this.rpcRound('setConfigured', {configured}) as ReturnType<T.Effects["setConfigured"]>
-  }
-  setDependencies(...[dependencies]: Parameters<T.Effects["setDependencies"]>) {
-    
-    return this.rpcRound('setDependencies', {dependencies}) as ReturnType<T.Effects["setDependencies"]>
-  }
-  setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
-    
-    return this.rpcRound('setHealth', options) as ReturnType<T.Effects["setHealth"]>
-  }
-  shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
-    
-    return this.rpcRound('shutdown', null) 
-  }
-  stopped(...[packageId]: Parameters<T.Effects["stopped"]>) {
-    
-    return this.rpcRound('stopped', {packageId}) as ReturnType<T.Effects["stopped"]>
-  }
-  store: T.Effects['store'] = {
-    get:(options) => this.rpcRound('getStore', {...options, callback: this.callbackHolder.addCallback(options.callback)}) as ReturnType<T.Effects["store"]['get']>,
-    set:(options) => this.rpcRound('setStore', options) as ReturnType<T.Effects["store"]['set']>
-    
-  }
-}
diff --git a/container-runtime/initSrc/Runtime.ts b/container-runtime/initSrc/Runtime.ts
deleted file mode 100644
index 0c4b764c2..000000000
--- a/container-runtime/initSrc/Runtime.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-// @ts-check
-
-import * as net from "net"
-import {
-  object,
-  some,
-  string,
-  literal,
-  array,
-  number,
-  matches,
-} from "ts-matches"
-import { Effects } from "./Effects"
-import { CallbackHolder } from "./CallbackHolder"
-
-import * as CP from "child_process"
-import * as Mod from "module"
-
-
-const SOCKET_PATH = "/start9/sockets/rpc.sock"
-const LOCATION_OF_SERVICE_JS = "/services/service.js"
-
-const childProcesses = new Map<number, CP.ChildProcess[]>()
-let childProcessIndex = 0
-const require = Mod.prototype.require
-const setupRequire = () => {
-  const requireChildProcessIndex = childProcessIndex++
-  // @ts-ignore
-  Mod.prototype.require = (name, ...rest) => {
-    if (["child_process", "node:child_process"].indexOf(name) !== -1) {
-      return {
-        exec(...args: any[]) {
-          const returning = CP.exec.apply(null, args as any)
-          const childProcessArray =
-            childProcesses.get(requireChildProcessIndex) ?? []
-          childProcessArray.push(returning)
-          childProcesses.set(requireChildProcessIndex, childProcessArray)
-          return returning
-        },
-        execFile(...args: any[]) {
-          const returning = CP.execFile.apply(null, args as any)
-          const childProcessArray =
-            childProcesses.get(requireChildProcessIndex) ?? []
-          childProcessArray.push(returning)
-          childProcesses.set(requireChildProcessIndex, childProcessArray)
-          return returning
-        },
-        execFileSync: CP.execFileSync,
-        execSync: CP.execSync,
-        fork(...args: any[]) {
-          const returning = CP.fork.apply(null, args as any)
-          const childProcessArray =
-            childProcesses.get(requireChildProcessIndex) ?? []
-          childProcessArray.push(returning)
-          childProcesses.set(requireChildProcessIndex, childProcessArray)
-          return returning
-        },
-        spawn(...args: any[]) {
-          const returning = CP.spawn.apply(null, args as any)
-          const childProcessArray =
-            childProcesses.get(requireChildProcessIndex) ?? []
-          childProcessArray.push(returning)
-          childProcesses.set(requireChildProcessIndex, childProcessArray)
-          return returning
-        },
-        spawnSync: CP.spawnSync,
-      } as typeof CP
-    }
-    console.log("require", name)
-    return require(name, ...rest)
-  }
-  return requireChildProcessIndex
-}
-
-const cleanupRequire = (requireChildProcessIndex: number) => {
-  const foundChildren = childProcesses.get(requireChildProcessIndex)
-  if (!foundChildren) return
-  childProcesses.delete(requireChildProcessIndex)
-  foundChildren.forEach((x) => x.kill())
-}
-
-const idType = some(string, number)
-const runType = object({
-  id: idType,
-  method: literal("run"),
-  params: object({
-    methodName: string.map((x) => {
-      const splitValue = x.split("/")
-      if (splitValue.length === 1)
-        throw new Error(`X (${x}) is not a valid path`)
-      return splitValue.slice(1)
-    }),
-    methodArgs: object,
-  }),
-})
-const callbackType = object({
-  id: idType,
-  method: literal("callback"),
-  params: object({
-    callback: string,
-    args: array,
-  }),
-})
-const dealWithInput = async (callbackHolder: CallbackHolder, input: unknown) =>
-  matches(input)
-    .when(runType, async ({ id, params: { methodName, methodArgs } }) => {
-      const index = setupRequire()
-      const effects = new Effects(`/${methodName.join("/")}`, callbackHolder)
-      // @ts-ignore
-      return import(LOCATION_OF_SERVICE_JS)
-        .then((x) => methodName.reduce(reduceMethod(methodArgs, effects), x))
-        .then()
-        .then((result) => ({ id, result }))
-        .catch((error) => ({
-          id,
-          error: { message: error?.message ?? String(error) },
-        }))
-        .finally(() => cleanupRequire(index))
-    })
-    .when(callbackType, async ({ id, params: { callback, args } }) =>
-      Promise.resolve(callbackHolder.callCallback(callback, args))
-        .then((result) => ({ id, result }))
-        .catch((error) => ({
-          id,
-          error: { message: error?.message ?? String(error) },
-        })),
-    )
-
-    .defaultToLazy(() => {
-      console.warn(`Coudln't parse the following input ${input}`)
-      return {
-        error: { message: "Could not figure out shape" },
-      }
-    })
-
-const jsonParse = (x: Buffer) => JSON.parse(x.toString())
-export class Runtime {
-  unixSocketServer = net.createServer(async (server) => {})
-  private callbacks = new CallbackHolder()
-  constructor() {
-    this.unixSocketServer.listen(SOCKET_PATH)
-
-    this.unixSocketServer.on("connection", (s) => {
-      s.on("data", (a) =>
-        Promise.resolve(a)
-          .then(jsonParse)
-          .then(dealWithInput.bind(null, this.callbacks))
-          .then((x) => {
-            console.log("x", JSON.stringify(x), typeof x)
-            return x
-          })
-          .catch((error) => ({
-            error: { message: error?.message ?? String(error) },
-          }))
-          .then(JSON.stringify)
-          .then((x) => new Promise((resolve) => s.write("" + x, resolve)))
-          .finally(() => void s.end()),
-      )
-    })
-  }
-}
-function reduceMethod(
-  methodArgs: object,
-  effects: Effects,
-): (previousValue: any, currentValue: string) => any {
-  return (x: any, method: string) =>
-    Promise.resolve(x)
-      .then((x) => x[method])
-      .then((x) =>
-        typeof x !== "function"
-          ? x
-          : x({
-              ...methodArgs,
-              effects,
-            }),
-      )
-}
\ No newline at end of file
diff --git a/container-runtime/install-dist-deps.sh b/container-runtime/install-dist-deps.sh
new file mode 100755
index 000000000..d155ed4f2
--- /dev/null
+++ b/container-runtime/install-dist-deps.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -e
+
+cat ./package.json | sed 's/file:\.\([.\/]\)/file:..\/.\1/g' > ./dist/package.json
+cat ./package-lock.json | sed 's/"\.\([.\/]\)/"..\/.\1/g' > ./dist/package-lock.json
+
+npm --prefix dist ci --omit=dev
\ No newline at end of file
diff --git a/container-runtime/mkcontainer.sh b/container-runtime/mkcontainer.sh
new file mode 100644
index 000000000..90de54671
--- /dev/null
+++ b/container-runtime/mkcontainer.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+IMAGE=$1
+
+if [ -z "$IMAGE" ]; then
+    >&2 echo "usage: $0 <image id>"
+    exit 1
+fi
+
+if ! [ -d "/media/images/$IMAGE" ]; then
+    >&2 echo "image does not exist"
+    exit 1
+fi
+
+container=$(mktemp -d)
+mkdir -p $container/rootfs $container/upper $container/work
+mount -t overlay -olowerdir=/media/images/$IMAGE,upperdir=$container/upper,workdir=$container/work overlay $container/rootfs
+
+rootfs=$container/rootfs
+
+for special in dev sys proc run; do
+    mkdir -p $rootfs/$special
+    mount --bind /$special $rootfs/$special
+done
+
+echo $rootfs
\ No newline at end of file
diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index 2ccaca591..74551217e 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -1,7 +1,7 @@
 {
   "name": "start-init",
   "version": "0.0.0",
-  "lockfileVersion": 3,
+  "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
@@ -9,11 +9,11 @@
       "version": "0.0.0",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
-        "@start9labs/start-sdk": "=0.4.0-rev0.lib0.rc8.alpha3",
-        "esbuild": "0.18.4",
+        "@start9labs/start-sdk": "file:../sdk/dist",
         "esbuild-plugin-resolve": "^2.0.0",
         "filebrowser": "^1.0.0",
         "isomorphic-fetch": "^3.0.0",
+        "node-fetch": "^3.1.0",
         "ts-matches": "^5.4.1",
         "tslib": "^2.5.3",
         "typescript": "^5.1.3",
@@ -22,18 +22,19 @@
       "devDependencies": {
         "@swc/cli": "^0.1.62",
         "@swc/core": "^1.3.65",
-        "@types/node": "^20.2.5",
-        "prettier": "^2.8.8",
-        "rollup": "^3.25.1"
+        "@types/node": "^20.11.13",
+        "esbuild": "^0.20.0",
+        "prettier": "^3.2.5",
+        "typescript": ">5.2"
       }
     },
-    "../start-sdk": {
+    "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-rev0.lib0.rc5",
-      "extraneous": true,
+      "version": "0.4.0-rev0.lib0.rc8.beta7",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
+        "isomorphic-fetch": "^3.0.0",
         "ts-matches": "^5.4.1",
         "yaml": "^2.2.2"
       },
@@ -42,36 +43,34 @@
         "jest": "^29.4.3",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
-        "tsc-multi": "^0.6.1",
-        "tsconfig-paths": "^3.14.2",
-        "typescript": "^5.0.4",
-        "vitest": "^0.29.2"
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
       }
     },
-    "../tmp/service": {
-      "extraneous": true,
-      "dependencies": {
-        "@start9labs/start-sdk": "0.4.0-rev0.lib0.rc7",
-        "filebrowser": "git+https://github.com/start9labs/filebrowser-wrapper.git#32e05d3d2157038b099329c11453b00d29ccca78",
-        "ts-matches": "^5.4.1"
-      },
-      "devDependencies": {
-        "@types/node": "^20.0.0",
-        "@vercel/ncc": "^0.36.1",
-        "prettier": "^2.8.4",
-        "typescript": "^5.1.3"
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz",
+      "integrity": "sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "@start9labs/start-sdk@0.4.0-rev0.lib0.rc8.alpha1": {
-      "extraneous": true
-    },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.4.tgz",
-      "integrity": "sha512-yKmQC9IiuvHdsNEbPHSprnMHg6OhL1cSeQZLzPpgzJBJ9ppEg9GAZN8MKj1TcmB4tZZUrq5xjK7KCmhwZP8iDA==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.0.tgz",
+      "integrity": "sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==",
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -81,12 +80,13 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.4.tgz",
-      "integrity": "sha512-yQVgO+V307hA2XhzELQ6F91CBGX7gSnlVGAj5YIqjQOxThDpM7fOcHT2YLJbE6gNdPtgRSafQrsK8rJ9xHCaZg==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz",
+      "integrity": "sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -96,12 +96,13 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.4.tgz",
-      "integrity": "sha512-yLKXMxQg6sk1ntftxQ5uwyVgG4/S2E7UoOCc5N4YZW7fdkfRiYEXqm7CMuIfY2Vs3FTrNyKmSfNevIuIvJnMww==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.0.tgz",
+      "integrity": "sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -111,12 +112,13 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.4.tgz",
-      "integrity": "sha512-MVPEoZjZpk2xQ1zckZrb8eQuQib+QCzdmMs3YZAYEQPg+Rztk5pUxGyk8htZOC8Z38NMM29W+MqY9Sqo/sDGKw==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz",
+      "integrity": "sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -126,12 +128,13 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.4.tgz",
-      "integrity": "sha512-uEsRtYRUDsz7i2tXg/t/SyF+5gU1cvi9B6B8i5ebJgtUUHJYWyIPIesmIOL4/+bywjxsDMA/XrNFMgMffLnh5A==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz",
+      "integrity": "sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -141,12 +144,13 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.4.tgz",
-      "integrity": "sha512-I8EOigqWnOHRin6Zp5Y1cfH3oT54bd7Sdz/VnpUNksbOtfp8IWRTH4pgkgO5jWaRQPjCpJcOpdRjYAMjPt8wXg==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz",
+      "integrity": "sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -156,12 +160,13 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.4.tgz",
-      "integrity": "sha512-1bHfgMz/cNMjbpsYxjVgMJ1iwKq+NdDPlACBrWULD7ZdFmBQrhMicMaKb5CdmdVyvIwXmasOuF4r6Iq574kUTA==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz",
+      "integrity": "sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -171,12 +176,13 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.4.tgz",
-      "integrity": "sha512-4XCGqM/Ay1LCXUBH59bL4JbSbbTK1K22dWHymWMGaEh2sQCDOUw+OQxozYV/YdBb91leK2NbuSrE2BRamwgaYw==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz",
+      "integrity": "sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==",
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -186,12 +192,13 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.4.tgz",
-      "integrity": "sha512-J42vLHaYREyiBwH0eQE4/7H1DTfZx8FuxyWSictx4d7ezzuKE3XOkIvOg+SQzRz7T9HLVKzq2tvbAov4UfufBw==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz",
+      "integrity": "sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -201,12 +208,13 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.4.tgz",
-      "integrity": "sha512-4ksIqFwhq7OExty7Sl1n0vqQSCqTG4sU6i99G2yuMr28CEOUZ/60N+IO9hwI8sIxBqmKmDgncE1n5CMu/3m0IA==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz",
+      "integrity": "sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==",
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -216,12 +224,13 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.4.tgz",
-      "integrity": "sha512-bsWtoVHkGQgAsFXioDueXRiUIfSGrVkJjBBz4gcBJxXcD461cWFQFyu8Fxdj9TP+zEeqJ8C/O4LFFMBNi6Fscw==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz",
+      "integrity": "sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==",
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -231,12 +240,13 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.4.tgz",
-      "integrity": "sha512-LRD9Fu8wJQgIOOV1o3nRyzrheFYjxA0C1IVWZ93eNRRWBKgarYFejd5WBtrp43cE4y4D4t3qWWyklm73Mrsd/g==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz",
+      "integrity": "sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==",
       "cpu": [
         "mips64el"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -246,12 +256,13 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.4.tgz",
-      "integrity": "sha512-jtQgoZjM92gauVRxNaaG/TpL3Pr4WcL3Pwqi9QgdrBGrEXzB+twohQiWNSTycs6lUygakos4mm2h0B9/SHveng==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz",
+      "integrity": "sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==",
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -261,12 +272,13 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.4.tgz",
-      "integrity": "sha512-7WaU/kRZG0VCV09Xdlkg6LNAsfU9SAxo6XEdaZ8ffO4lh+DZoAhGTx7+vTMOXKxa+r2w1LYDGxfJa2rcgagMRA==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz",
+      "integrity": "sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==",
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -276,12 +288,13 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.4.tgz",
-      "integrity": "sha512-D19ed0xreKQvC5t+ArE2njSnm18WPpE+1fhwaiJHf+Xwqsq+/SUaV8Mx0M27nszdU+Atq1HahrgCOZCNNEASUg==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz",
+      "integrity": "sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==",
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -291,12 +304,13 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.4.tgz",
-      "integrity": "sha512-Rx3AY1sxyiO/gvCGP00nL69L60dfmWyjKWY06ugpB8Ydpdsfi3BHW58HWC24K3CAjAPSwxcajozC2PzA9JBS1g==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz",
+      "integrity": "sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -306,12 +320,13 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.4.tgz",
-      "integrity": "sha512-AaShPmN9c6w1mKRpliKFlaWcSkpBT4KOlk93UfFgeI3F3cbjzdDKGsbKnOZozmYbE1izZKLmNJiW0sFM+A5JPA==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz",
+      "integrity": "sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "netbsd"
@@ -321,12 +336,13 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.4.tgz",
-      "integrity": "sha512-tRGvGwou3BrvHVvF8HxTqEiC5VtPzySudS9fh2jBIKpLX7HCW8jIkW+LunkFDNwhslx4xMAgh0jAHsx/iCymaQ==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz",
+      "integrity": "sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "openbsd"
@@ -336,12 +352,13 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.4.tgz",
-      "integrity": "sha512-acORFDI95GKhmAnlH8EarBeuqoy/j3yxIU+FDB91H3+ZON+8HhTadtT450YkaMzX6lEWbhi+mjVUCj00M5yyOQ==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz",
+      "integrity": "sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "sunos"
@@ -351,12 +368,13 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.4.tgz",
-      "integrity": "sha512-1NxP+iOk8KSvS1L9SSxEvBAJk39U0GiGZkiiJGbuDF9G4fG7DSDw6XLxZMecAgmvQrwwx7yVKdNN3GgNh0UfKg==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz",
+      "integrity": "sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -366,12 +384,13 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.4.tgz",
-      "integrity": "sha512-OKr8jze93vbgqZ/r23woWciTixUwLa976C9W7yNBujtnVHyvsL/ocYG61tsktUfJOpyIz5TsohkBZ6Lo2+PCcQ==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz",
+      "integrity": "sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==",
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -381,12 +400,13 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.4.tgz",
-      "integrity": "sha512-qJr3wVvcLjPFcV4AMDS3iquhBfTef2zo/jlm8RMxmiRp3Vy2HY8WMxrykJlcbCnqLXZPA0YZxZGND6eug85ogg==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz",
+      "integrity": "sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -467,25 +487,19 @@
       }
     },
     "node_modules/@start9labs/start-sdk": {
-      "version": "0.4.0-rev0.lib0.rc8.alpha3",
-      "resolved": "https://registry.npmjs.org/@start9labs/start-sdk/-/start-sdk-0.4.0-rev0.lib0.rc8.alpha3.tgz",
-      "integrity": "sha512-7thHf2iHJovkwsyKbd4lfV0/bOCv5vbPB3EYahPyLtN3rEY+siLDzu/Tmc7XdtsCKLVlLawqYkGPEakmaFs8FQ==",
-      "dependencies": {
-        "@iarna/toml": "^2.2.5",
-        "isomorphic-fetch": "^3.0.0",
-        "ts-matches": "^5.4.1",
-        "yaml": "^2.2.2"
-      }
+      "resolved": "../sdk/dist",
+      "link": true
     },
     "node_modules/@swc/cli": {
-      "version": "0.1.62",
-      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.62.tgz",
-      "integrity": "sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==",
+      "version": "0.1.65",
+      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.65.tgz",
+      "integrity": "sha512-4NcgsvJVHhA7trDnMmkGLLvWMHu2kSy+qHx6QwRhhJhdiYdNUrhdp+ERxen73sYtaeEOYeLJcWrQ60nzKi6rpg==",
       "dev": true,
       "dependencies": {
         "@mole-inc/bin-wrapper": "^8.0.1",
         "commander": "^7.1.0",
         "fast-glob": "^3.2.5",
+        "minimatch": "^9.0.3",
         "semver": "^7.3.8",
         "slash": "3.0.0",
         "source-map": "^0.7.3"
@@ -508,21 +522,16 @@
         }
       }
     },
-    "node_modules/@swc/cli/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@swc/core": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.65.tgz",
-      "integrity": "sha512-d5iDiKWf12FBo6h9Fro2pcnLK6HSPbyZ7A1U5iFNpRRx8XEd4uGdKtf5NoXJ3GDLQDLXnNSLA82Cl6SfrJ1lyw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.4.1.tgz",
+      "integrity": "sha512-3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ==",
       "dev": true,
       "hasInstallScript": true,
+      "dependencies": {
+        "@swc/counter": "^0.1.2",
+        "@swc/types": "^0.1.5"
+      },
       "engines": {
         "node": ">=10"
       },
@@ -531,16 +540,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.3.65",
-        "@swc/core-darwin-x64": "1.3.65",
-        "@swc/core-linux-arm-gnueabihf": "1.3.65",
-        "@swc/core-linux-arm64-gnu": "1.3.65",
-        "@swc/core-linux-arm64-musl": "1.3.65",
-        "@swc/core-linux-x64-gnu": "1.3.65",
-        "@swc/core-linux-x64-musl": "1.3.65",
-        "@swc/core-win32-arm64-msvc": "1.3.65",
-        "@swc/core-win32-ia32-msvc": "1.3.65",
-        "@swc/core-win32-x64-msvc": "1.3.65"
+        "@swc/core-darwin-arm64": "1.4.1",
+        "@swc/core-darwin-x64": "1.4.1",
+        "@swc/core-linux-arm-gnueabihf": "1.4.1",
+        "@swc/core-linux-arm64-gnu": "1.4.1",
+        "@swc/core-linux-arm64-musl": "1.4.1",
+        "@swc/core-linux-x64-gnu": "1.4.1",
+        "@swc/core-linux-x64-musl": "1.4.1",
+        "@swc/core-win32-arm64-msvc": "1.4.1",
+        "@swc/core-win32-ia32-msvc": "1.4.1",
+        "@swc/core-win32-x64-msvc": "1.4.1"
       },
       "peerDependencies": {
         "@swc/helpers": "^0.5.0"
@@ -552,9 +561,9 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.65.tgz",
-      "integrity": "sha512-fQIXZgr7CD/+1ADqrVbz/gHvSoIMmggHvPzguQjV8FggBuS9Efm1D1ZrdUSqptggKvuLLHMZf+49tENq8NWWcg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.1.tgz",
+      "integrity": "sha512-ePyfx0348UbR4DOAW24TedeJbafnzha8liXFGuQ4bdXtEVXhLfPngprrxKrAddCuv42F9aTxydlF6+adD3FBhA==",
       "cpu": [
         "arm64"
       ],
@@ -568,9 +577,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.65.tgz",
-      "integrity": "sha512-kGuWP7OP9mwOiIcJpEVa+ydC3Wxf0fPQ1MK0hUIPFcR6tAUEdOvdAuCzP6U20RX/JbbgwfI/Qq6ugT7VL6omgg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.1.tgz",
+      "integrity": "sha512-eLf4JSe6VkCMdDowjM8XNC5rO+BrgfbluEzAVtKR8L2HacNYukieumN7EzpYCi0uF1BYwu1ku6tLyG2r0VcGxA==",
       "cpu": [
         "x64"
       ],
@@ -584,9 +593,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.65.tgz",
-      "integrity": "sha512-Bjbzldp8n4mWSdAvBt4VuLiHlfFM5pyftjJvJnmSY4H1IzbxkByyT60OHOedcIPRiZveD8NJzUJqutqrgTmtLg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.1.tgz",
+      "integrity": "sha512-K8VtTLWMw+rkN/jDC9o/Q9SMmzdiHwYo2CfgkwVT29NsGccwmNhCQx6XoYiPKyKGIFKt4tdQnJHKUFzxUqQVtQ==",
       "cpu": [
         "arm"
       ],
@@ -600,9 +609,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.65.tgz",
-      "integrity": "sha512-GmxtcCymeQqEqT9n5mo857koRsUbEwmuijrBA4OeD5KOPW9gqAmUxr+ZgwgYHwyJ3CiN+UbK8uEqPsL6UVQmLg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.1.tgz",
+      "integrity": "sha512-0e8p4g0Bfkt8lkiWgcdiENH3RzkcqKtpRXIVNGOmVc0OBkvc2tpm2WTx/eoCnes2HpTT4CTtR3Zljj4knQ4Fvw==",
       "cpu": [
         "arm64"
       ],
@@ -616,9 +625,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.65.tgz",
-      "integrity": "sha512-yv9jP3gbfMsYrqswT2MwK5Q1+avSwRXAKo+LYUknTeoLQNNlukDfqSLHajNq23XrVDRP4B3Pjn7kaqjxRcihbg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.1.tgz",
+      "integrity": "sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA==",
       "cpu": [
         "arm64"
       ],
@@ -632,9 +641,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.65.tgz",
-      "integrity": "sha512-GQkwysEPTlAOQ3jiTiedObzh6pBaf9RLaQqpGdCp+iKze9+BR+STBP0IIKhZDMPG/nWWNhrYFD/VMQxRoYPjfw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.1.tgz",
+      "integrity": "sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ==",
       "cpu": [
         "x64"
       ],
@@ -648,9 +657,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.65.tgz",
-      "integrity": "sha512-ETzhOhtDluYFK4x73OTM9gVTMyzGd2WeWGlCu3WoT1EPPUwCqQpcAqI3TfEcP1ljFDG0pPkpYzVpwNf8yjQElg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.1.tgz",
+      "integrity": "sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg==",
       "cpu": [
         "x64"
       ],
@@ -664,9 +673,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.65.tgz",
-      "integrity": "sha512-3weD0I6F8bggN0KOnbZkvYC1PBrT5wrvohpvtgijRsODxjoWwztozjawJxF3rqgVqlSI/+nA+JkrN48e2cxJjQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.1.tgz",
+      "integrity": "sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA==",
       "cpu": [
         "arm64"
       ],
@@ -680,9 +689,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.65.tgz",
-      "integrity": "sha512-i6c3D7E9Ca41HteW3+hn1OKQfjIabc2P0p1mJRXBkn+igwb+Ba6gXJc7NqhrlF8uZsDhhcGZTsAqBBtfcfTuHQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.1.tgz",
+      "integrity": "sha512-MBuc3/QfKX9FnLOU7iGN+6yHRTQaPQ9WskiC8s8JFiKQ+7I2p25tay2RplR9dIEEGgVAu6L7auv96LbNTh+FaA==",
       "cpu": [
         "ia32"
       ],
@@ -696,9 +705,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.3.65",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.65.tgz",
-      "integrity": "sha512-tQ9hEDtwPZxQ2sYb2n8ypfmdMjobKAf6VSnChteLMktofU7o562op5pLS6D6QCP2AtL3lcwe1piTCgIhk4vmjA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.1.tgz",
+      "integrity": "sha512-lu4h4wFBb/bOK6N2MuZwg7TrEpwYXgpQf5R7ObNSXL65BwZ9BG8XRzD+dLJmALu8l5N08rP/TrpoKRoGT4WSxw==",
       "cpu": [
         "x64"
       ],
@@ -711,16 +720,17 @@
         "node": ">=10"
       }
     },
-    "node_modules/@swc/helpers": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz",
-      "integrity": "sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
+    "node_modules/@swc/counter": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "dev": true
+    },
+    "node_modules/@swc/types": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz",
+      "integrity": "sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==",
+      "dev": true
     },
     "node_modules/@szmarczak/http-timer": {
       "version": "4.0.6",
@@ -753,9 +763,9 @@
       }
     },
     "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
+      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
       "dev": true
     },
     "node_modules/@types/keyv": {
@@ -768,15 +778,18 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.2.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz",
-      "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==",
-      "dev": true
+      "version": "20.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz",
+      "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
     "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
+      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -819,6 +832,12 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
     "node_modules/bin-check": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
@@ -849,14 +868,14 @@
       }
     },
     "node_modules/bin-version-check": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-5.0.0.tgz",
-      "integrity": "sha512-Q3FMQnS5eZmrBGqmDXLs4dbAn/f+52voP6ykJYmweSA60t6DyH4UTSwZhtbK5UH+LBoWvDljILUQMLRUtsynsA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-5.1.0.tgz",
+      "integrity": "sha512-bYsvMqJ8yNGILLz1KP9zKLzQ6YpljV3ln1gqhuLkUtyfGi3qXKGuK2p+U4NAvjVFzDFiBBtOpCOSFNuYYEGZ5g==",
       "dev": true,
       "dependencies": {
         "bin-version": "^6.0.0",
-        "semver": "^7.3.5",
-        "semver-truncate": "^2.0.0"
+        "semver": "^7.5.3",
+        "semver-truncate": "^3.0.0"
       },
       "engines": {
         "node": ">=12"
@@ -1006,6 +1025,15 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/braces": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
@@ -1069,12 +1097,18 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1093,9 +1127,13 @@
       }
     },
     "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
@@ -1140,6 +1178,14 @@
         "which": "^1.2.9"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1184,6 +1230,22 @@
         "node": ">=10"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -1223,10 +1285,30 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/esbuild": {
-      "version": "0.18.4",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.4.tgz",
-      "integrity": "sha512-9rxWV/Cb2DMUXfe9aUsYtqg0KTlw146ElFH22kYeK9KVV1qT082X4lpmiKsa12ePiCcIcB686TQJxaGAa9TFvA==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.0.tgz",
+      "integrity": "sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==",
+      "dev": true,
       "hasInstallScript": true,
       "bin": {
         "esbuild": "bin/esbuild"
@@ -1235,28 +1317,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.18.4",
-        "@esbuild/android-arm64": "0.18.4",
-        "@esbuild/android-x64": "0.18.4",
-        "@esbuild/darwin-arm64": "0.18.4",
-        "@esbuild/darwin-x64": "0.18.4",
-        "@esbuild/freebsd-arm64": "0.18.4",
-        "@esbuild/freebsd-x64": "0.18.4",
-        "@esbuild/linux-arm": "0.18.4",
-        "@esbuild/linux-arm64": "0.18.4",
-        "@esbuild/linux-ia32": "0.18.4",
-        "@esbuild/linux-loong64": "0.18.4",
-        "@esbuild/linux-mips64el": "0.18.4",
-        "@esbuild/linux-ppc64": "0.18.4",
-        "@esbuild/linux-riscv64": "0.18.4",
-        "@esbuild/linux-s390x": "0.18.4",
-        "@esbuild/linux-x64": "0.18.4",
-        "@esbuild/netbsd-x64": "0.18.4",
-        "@esbuild/openbsd-x64": "0.18.4",
-        "@esbuild/sunos-x64": "0.18.4",
-        "@esbuild/win32-arm64": "0.18.4",
-        "@esbuild/win32-ia32": "0.18.4",
-        "@esbuild/win32-x64": "0.18.4"
+        "@esbuild/aix-ppc64": "0.20.0",
+        "@esbuild/android-arm": "0.20.0",
+        "@esbuild/android-arm64": "0.20.0",
+        "@esbuild/android-x64": "0.20.0",
+        "@esbuild/darwin-arm64": "0.20.0",
+        "@esbuild/darwin-x64": "0.20.0",
+        "@esbuild/freebsd-arm64": "0.20.0",
+        "@esbuild/freebsd-x64": "0.20.0",
+        "@esbuild/linux-arm": "0.20.0",
+        "@esbuild/linux-arm64": "0.20.0",
+        "@esbuild/linux-ia32": "0.20.0",
+        "@esbuild/linux-loong64": "0.20.0",
+        "@esbuild/linux-mips64el": "0.20.0",
+        "@esbuild/linux-ppc64": "0.20.0",
+        "@esbuild/linux-riscv64": "0.20.0",
+        "@esbuild/linux-s390x": "0.20.0",
+        "@esbuild/linux-x64": "0.20.0",
+        "@esbuild/netbsd-x64": "0.20.0",
+        "@esbuild/openbsd-x64": "0.20.0",
+        "@esbuild/sunos-x64": "0.20.0",
+        "@esbuild/win32-arm64": "0.20.0",
+        "@esbuild/win32-ia32": "0.20.0",
+        "@esbuild/win32-x64": "0.20.0"
       }
     },
     "node_modules/esbuild-plugin-resolve": {
@@ -1386,9 +1469,9 @@
       }
     },
     "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -1402,14 +1485,36 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
     "node_modules/file-type": {
       "version": "17.1.6",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz",
@@ -1437,6 +1542,11 @@
         "express": "^4.14.0"
       }
     },
+    "node_modules/filebrowser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+    },
     "node_modules/filename-reserved-regex": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz",
@@ -1510,6 +1620,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -1526,34 +1647,27 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1580,6 +1694,17 @@
         "node": ">= 6"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/got": {
       "version": "11.8.6",
       "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
@@ -1605,15 +1730,15 @@
         "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
-        "function-bind": "^1.1.1"
+        "es-define-property": "^1.0.0"
       },
-      "engines": {
-        "node": ">= 0.4.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
@@ -1638,6 +1763,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
+      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
@@ -1788,6 +1924,25 @@
         "whatwg-fetch": "^3.4.1"
       }
     },
+    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -1795,9 +1950,9 @@
       "dev": true
     },
     "node_modules/keyv": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
-      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
@@ -1919,6 +2074,21 @@
         "node": ">=4"
       }
     },
+    "node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -1932,23 +2102,39 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
     "node_modules/node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
       }
     },
     "node_modules/normalize-url": {
@@ -1976,9 +2162,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2105,15 +2291,15 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
       "dev": true,
       "bin": {
-        "prettier": "bin-prettier.js"
+        "prettier": "bin/prettier.cjs"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/prettier/prettier?sponsor=1"
@@ -2273,22 +2459,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rollup": {
-      "version": "3.25.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz",
-      "integrity": "sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==",
-      "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=14.18.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -2337,9 +2507,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -2364,24 +2534,18 @@
       }
     },
     "node_modules/semver-truncate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-2.0.0.tgz",
-      "integrity": "sha512-Rh266MLDYNeML5h90ttdMwfXe1+Nc4LAWd9X1KdJe8pPHP4kFmvLZALtsMNHNdvTyQygbEC0D59sIz47DIaq8w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-3.0.0.tgz",
+      "integrity": "sha512-LJWA9kSvMolR51oDE6PN3kALBNaUdkxzAGcexw8gjMA8xr5zUqK0JiR3CgARSqanYF3Z1YHvsErb1KDgh+v7Rg==",
       "dev": true,
       "dependencies": {
-        "semver": "^6.0.0"
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/semver-truncate/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/semver/node_modules/lru-cache": {
@@ -2444,7 +2608,23 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/setprototypeof": {
+    "node_modules/set-function-length": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
+      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
+      "dependencies": {
+        "define-data-property": "^1.1.2",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
@@ -2471,13 +2651,17 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
+      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2655,9 +2839,9 @@
       "integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
     },
     "node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/type-is": {
       "version": "1.6.18",
@@ -2672,9 +2856,10 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz",
-      "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -2683,6 +2868,12 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -2713,15 +2904,23 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz",
+      "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "node_modules/whatwg-fetch": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+      "version": "3.6.20",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
     },
     "node_modules/whatwg-url": {
       "version": "5.0.0",
@@ -2757,26 +2956,1942 @@
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
+      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
       "engines": {
         "node": ">= 14"
       }
+    }
+  },
+  "dependencies": {
+    "@esbuild/aix-ppc64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz",
+      "integrity": "sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==",
+      "dev": true,
+      "optional": true
     },
-    "service": {
-      "extraneous": true,
-      "dependencies": {
-        "@start9labs/start-sdk": "0.4.0-rev0.lib0.rc7",
-        "filebrowser": "git+https://github.com/start9labs/filebrowser-wrapper.git#32e05d3d2157038b099329c11453b00d29ccca78",
-        "ts-matches": "^5.4.1"
+    "@esbuild/android-arm": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.0.tgz",
+      "integrity": "sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-arm64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz",
+      "integrity": "sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/android-x64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.0.tgz",
+      "integrity": "sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-arm64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz",
+      "integrity": "sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/darwin-x64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz",
+      "integrity": "sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-arm64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz",
+      "integrity": "sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/freebsd-x64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz",
+      "integrity": "sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz",
+      "integrity": "sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-arm64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz",
+      "integrity": "sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ia32": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz",
+      "integrity": "sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz",
+      "integrity": "sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-mips64el": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz",
+      "integrity": "sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-ppc64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz",
+      "integrity": "sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-riscv64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz",
+      "integrity": "sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-s390x": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz",
+      "integrity": "sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-x64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz",
+      "integrity": "sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/netbsd-x64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz",
+      "integrity": "sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/openbsd-x64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz",
+      "integrity": "sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/sunos-x64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz",
+      "integrity": "sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-arm64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz",
+      "integrity": "sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-ia32": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz",
+      "integrity": "sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/win32-x64": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz",
+      "integrity": "sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==",
+      "dev": true,
+      "optional": true
+    },
+    "@iarna/toml": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
+    "@mole-inc/bin-wrapper": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@mole-inc/bin-wrapper/-/bin-wrapper-8.0.1.tgz",
+      "integrity": "sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==",
+      "dev": true,
+      "requires": {
+        "bin-check": "^4.1.0",
+        "bin-version-check": "^5.0.0",
+        "content-disposition": "^0.5.4",
+        "ext-name": "^5.0.0",
+        "file-type": "^17.1.6",
+        "filenamify": "^5.0.2",
+        "got": "^11.8.5",
+        "os-filter-obj": "^2.0.0"
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "dev": true
+    },
+    "@start9labs/start-sdk": {
+      "version": "file:../sdk/dist",
+      "requires": {
+        "@iarna/toml": "^2.2.5",
+        "@types/jest": "^29.4.0",
+        "isomorphic-fetch": "^3.0.0",
+        "jest": "^29.4.3",
+        "ts-jest": "^29.0.5",
+        "ts-matches": "^5.4.1",
+        "ts-node": "^10.9.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4",
+        "yaml": "^2.2.2"
+      }
+    },
+    "@swc/cli": {
+      "version": "0.1.65",
+      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.65.tgz",
+      "integrity": "sha512-4NcgsvJVHhA7trDnMmkGLLvWMHu2kSy+qHx6QwRhhJhdiYdNUrhdp+ERxen73sYtaeEOYeLJcWrQ60nzKi6rpg==",
+      "dev": true,
+      "requires": {
+        "@mole-inc/bin-wrapper": "^8.0.1",
+        "commander": "^7.1.0",
+        "fast-glob": "^3.2.5",
+        "minimatch": "^9.0.3",
+        "semver": "^7.3.8",
+        "slash": "3.0.0",
+        "source-map": "^0.7.3"
+      }
+    },
+    "@swc/core": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.4.1.tgz",
+      "integrity": "sha512-3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ==",
+      "dev": true,
+      "requires": {
+        "@swc/core-darwin-arm64": "1.4.1",
+        "@swc/core-darwin-x64": "1.4.1",
+        "@swc/core-linux-arm-gnueabihf": "1.4.1",
+        "@swc/core-linux-arm64-gnu": "1.4.1",
+        "@swc/core-linux-arm64-musl": "1.4.1",
+        "@swc/core-linux-x64-gnu": "1.4.1",
+        "@swc/core-linux-x64-musl": "1.4.1",
+        "@swc/core-win32-arm64-msvc": "1.4.1",
+        "@swc/core-win32-ia32-msvc": "1.4.1",
+        "@swc/core-win32-x64-msvc": "1.4.1",
+        "@swc/counter": "^0.1.2",
+        "@swc/types": "^0.1.5"
+      }
+    },
+    "@swc/core-darwin-arm64": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.1.tgz",
+      "integrity": "sha512-ePyfx0348UbR4DOAW24TedeJbafnzha8liXFGuQ4bdXtEVXhLfPngprrxKrAddCuv42F9aTxydlF6+adD3FBhA==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-darwin-x64": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.1.tgz",
+      "integrity": "sha512-eLf4JSe6VkCMdDowjM8XNC5rO+BrgfbluEzAVtKR8L2HacNYukieumN7EzpYCi0uF1BYwu1ku6tLyG2r0VcGxA==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-linux-arm-gnueabihf": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.1.tgz",
+      "integrity": "sha512-K8VtTLWMw+rkN/jDC9o/Q9SMmzdiHwYo2CfgkwVT29NsGccwmNhCQx6XoYiPKyKGIFKt4tdQnJHKUFzxUqQVtQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-linux-arm64-gnu": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.1.tgz",
+      "integrity": "sha512-0e8p4g0Bfkt8lkiWgcdiENH3RzkcqKtpRXIVNGOmVc0OBkvc2tpm2WTx/eoCnes2HpTT4CTtR3Zljj4knQ4Fvw==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-linux-arm64-musl": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.1.tgz",
+      "integrity": "sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-linux-x64-gnu": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.1.tgz",
+      "integrity": "sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-linux-x64-musl": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.1.tgz",
+      "integrity": "sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-win32-arm64-msvc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.1.tgz",
+      "integrity": "sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-win32-ia32-msvc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.1.tgz",
+      "integrity": "sha512-MBuc3/QfKX9FnLOU7iGN+6yHRTQaPQ9WskiC8s8JFiKQ+7I2p25tay2RplR9dIEEGgVAu6L7auv96LbNTh+FaA==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/core-win32-x64-msvc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.1.tgz",
+      "integrity": "sha512-lu4h4wFBb/bOK6N2MuZwg7TrEpwYXgpQf5R7ObNSXL65BwZ9BG8XRzD+dLJmALu8l5N08rP/TrpoKRoGT4WSxw==",
+      "dev": true,
+      "optional": true
+    },
+    "@swc/counter": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "dev": true
+    },
+    "@swc/types": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz",
+      "integrity": "sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==",
+      "dev": true
+    },
+    "@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^2.0.0"
+      }
+    },
+    "@tokenizer/token": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
+      "dev": true
+    },
+    "@types/cacheable-request": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
+      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "dev": true,
+      "requires": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
+      }
+    },
+    "@types/http-cache-semantics": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
+      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
+      "dev": true
+    },
+    "@types/keyv": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
+      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/node": {
+      "version": "20.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz",
+      "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==",
+      "dev": true,
+      "requires": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "@types/responselike": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
+      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "requires": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      }
+    },
+    "arch": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "bin-check": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
+      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
+      "dev": true,
+      "requires": {
+        "execa": "^0.7.0",
+        "executable": "^4.1.0"
+      }
+    },
+    "bin-version": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-6.0.0.tgz",
+      "integrity": "sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw==",
+      "dev": true,
+      "requires": {
+        "execa": "^5.0.0",
+        "find-versions": "^5.0.0"
       },
-      "devDependencies": {
-        "@types/node": "^20.0.0",
-        "@vercel/ncc": "^0.36.1",
-        "prettier": "^2.8.4",
-        "typescript": "^5.1.3"
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+          "dev": true
+        },
+        "npm-run-path": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
+    },
+    "bin-version-check": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-5.1.0.tgz",
+      "integrity": "sha512-bYsvMqJ8yNGILLz1KP9zKLzQ6YpljV3ln1gqhuLkUtyfGi3qXKGuK2p+U4NAvjVFzDFiBBtOpCOSFNuYYEGZ5g==",
+      "dev": true,
+      "requires": {
+        "bin-version": "^6.0.0",
+        "semver": "^7.5.3",
+        "semver-truncate": "^3.0.0"
+      }
+    },
+    "body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "requires": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      }
+    },
+    "brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+    },
+    "cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "dev": true
+    },
+    "cacheable-request": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
+      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
+      "dev": true,
+      "requires": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        }
+      }
+    },
+    "call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      }
+    },
+    "clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "requires": {
+        "safe-buffer": "5.2.1"
+      }
+    },
+    "content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
+    },
+    "cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^3.1.0"
+      },
+      "dependencies": {
+        "mimic-response": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+          "dev": true
+        }
+      }
+    },
+    "defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true
+    },
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
+    },
+    "depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+    },
+    "destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.4"
+      }
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
+    "esbuild": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.0.tgz",
+      "integrity": "sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==",
+      "dev": true,
+      "requires": {
+        "@esbuild/aix-ppc64": "0.20.0",
+        "@esbuild/android-arm": "0.20.0",
+        "@esbuild/android-arm64": "0.20.0",
+        "@esbuild/android-x64": "0.20.0",
+        "@esbuild/darwin-arm64": "0.20.0",
+        "@esbuild/darwin-x64": "0.20.0",
+        "@esbuild/freebsd-arm64": "0.20.0",
+        "@esbuild/freebsd-x64": "0.20.0",
+        "@esbuild/linux-arm": "0.20.0",
+        "@esbuild/linux-arm64": "0.20.0",
+        "@esbuild/linux-ia32": "0.20.0",
+        "@esbuild/linux-loong64": "0.20.0",
+        "@esbuild/linux-mips64el": "0.20.0",
+        "@esbuild/linux-ppc64": "0.20.0",
+        "@esbuild/linux-riscv64": "0.20.0",
+        "@esbuild/linux-s390x": "0.20.0",
+        "@esbuild/linux-x64": "0.20.0",
+        "@esbuild/netbsd-x64": "0.20.0",
+        "@esbuild/openbsd-x64": "0.20.0",
+        "@esbuild/sunos-x64": "0.20.0",
+        "@esbuild/win32-arm64": "0.20.0",
+        "@esbuild/win32-ia32": "0.20.0",
+        "@esbuild/win32-x64": "0.20.0"
+      }
+    },
+    "esbuild-plugin-resolve": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/esbuild-plugin-resolve/-/esbuild-plugin-resolve-2.0.0.tgz",
+      "integrity": "sha512-eJy9B8yDW5X/J48eWtR1uVmv+DKfHvYYnrrcqQoe/nUkVHVOTZlJnSevkYyGOz6hI90t036Y5QIPDrGzmppxfg=="
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "executable": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+      "dev": true,
+      "requires": {
+        "pify": "^2.2.0"
+      }
+    },
+    "express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "requires": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      }
+    },
+    "ext-list": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "dev": true,
+      "requires": {
+        "mime-db": "^1.28.0"
+      }
+    },
+    "ext-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "dev": true,
+      "requires": {
+        "ext-list": "^2.0.0",
+        "sort-keys-length": "^1.0.0"
+      }
+    },
+    "fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      }
+    },
+    "fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "requires": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      }
+    },
+    "file-type": {
+      "version": "17.1.6",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz",
+      "integrity": "sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==",
+      "dev": true,
+      "requires": {
+        "readable-web-to-node-stream": "^3.0.2",
+        "strtok3": "^7.0.0-alpha.9",
+        "token-types": "^5.0.0-alpha.2"
+      }
+    },
+    "filebrowser": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/filebrowser/-/filebrowser-1.0.0.tgz",
+      "integrity": "sha512-RRONYpCDzbmWPhBX43T4dE+ptqLznJ7lKfbMaZLChB2i2ZIdFXoqT9qZTi70Dpq6fnJHuvcdeiRqMIPZKhVgTQ==",
+      "requires": {
+        "commander": "^2.9.0",
+        "content-disposition": "^0.5.1",
+        "express": "^4.14.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+        }
+      }
+    },
+    "filename-reserved-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz",
+      "integrity": "sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==",
+      "dev": true
+    },
+    "filenamify": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-5.1.1.tgz",
+      "integrity": "sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==",
+      "dev": true,
+      "requires": {
+        "filename-reserved-regex": "^3.0.0",
+        "strip-outer": "^2.0.0",
+        "trim-repeated": "^2.0.0"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      }
+    },
+    "find-versions": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-5.1.0.tgz",
+      "integrity": "sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==",
+      "dev": true,
+      "requires": {
+        "semver-regex": "^4.0.5"
+      }
+    },
+    "formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "requires": {
+        "fetch-blob": "^3.1.2"
+      }
+    },
+    "forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+    },
+    "function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+    },
+    "get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "requires": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      }
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+      "dev": true
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      }
+    },
+    "got": {
+      "version": "11.8.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+      "dev": true,
+      "requires": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      }
+    },
+    "has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "requires": {
+        "es-define-property": "^1.0.0"
+      }
+    },
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "hasown": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
+      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
+    "http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "requires": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      }
+    },
+    "http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "dev": true,
+      "requires": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      }
+    },
+    "human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "isomorphic-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+      "requires": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+          "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        }
+      }
+    },
+    "json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
+    },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^2.0.1"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+    },
+    "node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
+    },
+    "node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "requires": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      }
+    },
+    "normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "object-inspect": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
+    },
+    "on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "os-filter-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
+      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
+      "dev": true,
+      "requires": {
+        "arch": "^2.1.0"
+      }
+    },
+    "p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "peek-readable": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0.tgz",
+      "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true
+    },
+    "prettier": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "dev": true
+    },
+    "proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "requires": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      }
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    },
+    "raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "requires": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "readable-web-to-node-stream": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
+      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^3.6.0"
+      }
+    },
+    "resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true
+    },
+    "responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^2.0.0"
+      }
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "semver-regex": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-4.0.5.tgz",
+      "integrity": "sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==",
+      "dev": true
+    },
+    "semver-truncate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-3.0.0.tgz",
+      "integrity": "sha512-LJWA9kSvMolR51oDE6PN3kALBNaUdkxzAGcexw8gjMA8xr5zUqK0JiR3CgARSqanYF3Z1YHvsErb1KDgh+v7Rg==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.3.5"
+      }
+    },
+    "send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      }
+    },
+    "set-function-length": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
+      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
+      "requires": {
+        "define-data-property": "^1.1.2",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.1"
+      }
+    },
+    "setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true
+    },
+    "side-channel": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
+      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
+      "requires": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "sort-keys-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+      "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
+      "dev": true,
+      "requires": {
+        "sort-keys": "^1.0.0"
+      }
+    },
+    "source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true
+    },
+    "statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+      "dev": true
+    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
+    },
+    "strip-outer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-2.0.0.tgz",
+      "integrity": "sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==",
+      "dev": true
+    },
+    "strtok3": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz",
+      "integrity": "sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==",
+      "dev": true,
+      "requires": {
+        "@tokenizer/token": "^0.3.0",
+        "peek-readable": "^5.0.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+    },
+    "token-types": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz",
+      "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==",
+      "dev": true,
+      "requires": {
+        "@tokenizer/token": "^0.3.0",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "trim-repeated": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-2.0.0.tgz",
+      "integrity": "sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^5.0.0"
+      }
+    },
+    "ts-matches": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.4.1.tgz",
+      "integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
+    },
+    "tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typescript": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "dev": true
+    },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+    },
+    "web-streams-polyfill": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz",
+      "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ=="
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "whatwg-fetch": {
+      "version": "3.6.20",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+      "dev": true
+    },
+    "yaml": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
+      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA=="
     }
   }
 }
diff --git a/container-runtime/package.json b/container-runtime/package.json
index 73f7c9cde..2fa407408 100644
--- a/container-runtime/package.json
+++ b/container-runtime/package.json
@@ -2,10 +2,11 @@
   "name": "start-init",
   "version": "0.0.0",
   "description": "We want to be the sdk intermitent for the system",
+  "module": "./index.js",
   "scripts": {
-    "bundle:esbuild": "esbuild initSrc/index.ts --platform=node --bundle --outfile=startInit.js",
-    "bundle:service": "esbuild /service/startos/procedures/index.ts --platform=node --bundle --outfile=service.js",
-    "run:manifest": "esbuild /service/startos/procedures/index.ts --platform=node --bundle --outfile=service.js"
+    "check": "tsc --noEmit",
+    "build": "prettier --write '**/*.ts' && rm -rf dist && tsc",
+    "tsc": "rm -rf dist; tsc"
   },
   "author": "",
   "prettier": {
@@ -16,11 +17,11 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@start9labs/start-sdk": "=0.4.0-rev0.lib0.rc8.alpha3",
-    "esbuild": "0.18.4",
+    "@start9labs/start-sdk": "file:../sdk/dist",
     "esbuild-plugin-resolve": "^2.0.0",
     "filebrowser": "^1.0.0",
     "isomorphic-fetch": "^3.0.0",
+    "node-fetch": "^3.1.0",
     "ts-matches": "^5.4.1",
     "tslib": "^2.5.3",
     "typescript": "^5.1.3",
@@ -29,8 +30,8 @@
   "devDependencies": {
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.65",
-    "@types/node": "^20.2.5",
-    "prettier": "^2.8.8",
-    "rollup": "^3.25.1"
+    "@types/node": "^20.11.13",
+    "prettier": "^3.2.5",
+    "typescript": ">5.2"
   }
 }
diff --git a/container-runtime/rmcontainer.sh b/container-runtime/rmcontainer.sh
new file mode 100644
index 000000000..69912eeba
--- /dev/null
+++ b/container-runtime/rmcontainer.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+rootfs=$1
+if [ -z "$rootfs" ]; then
+    >&2 echo "usage: $0 <container rootfs path>"
+    exit 1
+fi
+
+umount --recursive $rootfs
+rm -rf $rootfs/..
\ No newline at end of file
diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
new file mode 100644
index 000000000..b9dc7725a
--- /dev/null
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -0,0 +1,320 @@
+import { types as T } from "@start9labs/start-sdk"
+import * as net from "net"
+import { object, string, number, literals, some, unknown } from "ts-matches"
+import { Effects } from "../Models/Effects"
+
+import { CallbackHolder } from "../Models/CallbackHolder"
+const matchRpcError = object({
+  error: object(
+    {
+      code: number,
+      message: string,
+      data: some(
+        string,
+        object(
+          {
+            details: string,
+            debug: string,
+          },
+          ["debug"],
+        ),
+      ),
+    },
+    ["data"],
+  ),
+})
+const testRpcError = matchRpcError.test
+const testRpcResult = object({
+  result: unknown,
+}).test
+type RpcError = typeof matchRpcError._TYPE
+
+const SOCKET_PATH = "/media/startos/rpc/host.sock"
+const MAIN = "/main" as const
+export class HostSystemStartOs implements Effects {
+  static of(callbackHolder: CallbackHolder) {
+    return new HostSystemStartOs(callbackHolder)
+  }
+
+  constructor(readonly callbackHolder: CallbackHolder) {}
+  id = 0
+  rpcRound(method: string, params: unknown) {
+    const id = this.id++
+    const client = net.createConnection({ path: SOCKET_PATH }, () => {
+      client.write(
+        JSON.stringify({
+          id,
+          method,
+          params,
+        }) + "\n",
+      )
+    })
+    let bufs: Buffer[] = []
+    return new Promise((resolve, reject) => {
+      client.on("data", (data) => {
+        try {
+          bufs.push(data)
+          if (data.reduce((acc, x) => acc || x == 10, false)) {
+            const res: unknown = JSON.parse(
+              Buffer.concat(bufs).toString().split("\n")[0],
+            )
+            if (testRpcError(res)) {
+              let message = res.error.message
+              console.error({ method, params, hostSystemStartOs: true })
+              if (string.test(res.error.data)) {
+                message += ": " + res.error.data
+                console.error(res.error.data)
+              } else {
+                if (res.error.data?.details) {
+                  message += ": " + res.error.data.details
+                  console.error(res.error.data.details)
+                }
+                if (res.error.data?.debug) {
+                  message += "\n" + res.error.data.debug
+                  console.error("Debug: " + res.error.data.debug)
+                }
+              }
+              reject(new Error(message))
+            } else if (testRpcResult(res)) {
+              resolve(res.result)
+            } else {
+              reject(new Error(`malformed response ${JSON.stringify(res)}`))
+            }
+          }
+        } catch (error) {
+          reject(error)
+        }
+        client.end()
+      })
+      client.on("error", (error) => {
+        reject(error)
+      })
+    })
+  }
+  started =
+    // @ts-ignore
+    this.method !== MAIN
+      ? null
+      : () => {
+          return this.rpcRound("started", null)
+        }
+  bind(...[options]: Parameters<T.Effects["bind"]>) {
+    return this.rpcRound("bind", options) as ReturnType<T.Effects["bind"]>
+  }
+  clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
+    return this.rpcRound("clearBindings", null) as ReturnType<
+      T.Effects["clearBindings"]
+    >
+  }
+  clearNetworkInterfaces(
+    ...[]: Parameters<T.Effects["clearNetworkInterfaces"]>
+  ) {
+    return this.rpcRound("clearNetworkInterfaces", null) as ReturnType<
+      T.Effects["clearNetworkInterfaces"]
+    >
+  }
+  createOverlayedImage(options: { imageId: string }): Promise<string> {
+    return this.rpcRound("createOverlayedImage", options) as ReturnType<
+      T.Effects["createOverlayedImage"]
+    >
+  }
+  executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
+    return this.rpcRound("executeAction", options) as ReturnType<
+      T.Effects["executeAction"]
+    >
+  }
+  exists(...[packageId]: Parameters<T.Effects["exists"]>) {
+    return this.rpcRound("exists", packageId) as ReturnType<T.Effects["exists"]>
+  }
+  exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
+    return this.rpcRound("exportAction", options) as ReturnType<
+      T.Effects["exportAction"]
+    >
+  }
+  exportNetworkInterface(
+    ...[options]: Parameters<T.Effects["exportNetworkInterface"]>
+  ) {
+    return this.rpcRound("exportNetworkInterface", options) as ReturnType<
+      T.Effects["exportNetworkInterface"]
+    >
+  }
+  exposeForDependents(...[options]: any) {
+    return this.rpcRound("exposeForDependents", null) as ReturnType<
+      T.Effects["exposeForDependents"]
+    >
+  }
+  exposeUi(...[options]: Parameters<T.Effects["exposeUi"]>) {
+    return this.rpcRound("exposeUi", options) as ReturnType<
+      T.Effects["exposeUi"]
+    >
+  }
+  getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
+    return this.rpcRound("getConfigured", null) as ReturnType<
+      T.Effects["getConfigured"]
+    >
+  }
+  getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
+    return this.rpcRound("getContainerIp", null) as ReturnType<
+      T.Effects["getContainerIp"]
+    >
+  }
+  getHostnames: any = (...[allOptions]: any[]) => {
+    const options = {
+      ...allOptions,
+      callback: this.callbackHolder.addCallback(allOptions.callback),
+    }
+    return this.rpcRound("getHostnames", options) as ReturnType<
+      T.Effects["getHostnames"]
+    >
+  }
+  getInterface(...[options]: Parameters<T.Effects["getInterface"]>) {
+    return this.rpcRound("getInterface", {
+      ...options,
+      callback: this.callbackHolder.addCallback(options.callback),
+    }) as ReturnType<T.Effects["getInterface"]>
+  }
+  getIPHostname(...[]: Parameters<T.Effects["getIPHostname"]>) {
+    return this.rpcRound("getIPHostname", null) as ReturnType<
+      T.Effects["getIPHostname"]
+    >
+  }
+  getLocalHostname(...[]: Parameters<T.Effects["getLocalHostname"]>) {
+    return this.rpcRound("getLocalHostname", null) as ReturnType<
+      T.Effects["getLocalHostname"]
+    >
+  }
+  getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
+    return this.rpcRound("getPrimaryUrl", {
+      ...options,
+      callback: this.callbackHolder.addCallback(options.callback),
+    }) as ReturnType<T.Effects["getPrimaryUrl"]>
+  }
+  getServicePortForward(
+    ...[options]: Parameters<T.Effects["getServicePortForward"]>
+  ) {
+    return this.rpcRound("getServicePortForward", options) as ReturnType<
+      T.Effects["getServicePortForward"]
+    >
+  }
+  getServiceTorHostname(
+    ...[interfaceId, packageId]: Parameters<T.Effects["getServiceTorHostname"]>
+  ) {
+    return this.rpcRound("getServiceTorHostname", {
+      interfaceId,
+      packageId,
+    }) as ReturnType<T.Effects["getServiceTorHostname"]>
+  }
+  getSslCertificate(
+    ...[packageId, algorithm]: Parameters<T.Effects["getSslCertificate"]>
+  ) {
+    return this.rpcRound("getSslCertificate", {
+      packageId,
+      algorithm,
+    }) as ReturnType<T.Effects["getSslCertificate"]>
+  }
+  getSslKey(...[packageId, algorithm]: Parameters<T.Effects["getSslKey"]>) {
+    return this.rpcRound("getSslKey", { packageId, algorithm }) as ReturnType<
+      T.Effects["getSslKey"]
+    >
+  }
+  getSystemSmtp(...[options]: Parameters<T.Effects["getSystemSmtp"]>) {
+    return this.rpcRound("getSystemSmtp", {
+      ...options,
+      callback: this.callbackHolder.addCallback(options.callback),
+    }) as ReturnType<T.Effects["getSystemSmtp"]>
+  }
+  listInterface(...[options]: Parameters<T.Effects["listInterface"]>) {
+    return this.rpcRound("listInterface", {
+      ...options,
+      callback: this.callbackHolder.addCallback(options.callback),
+    }) as ReturnType<T.Effects["listInterface"]>
+  }
+  mount(...[options]: Parameters<T.Effects["mount"]>) {
+    return this.rpcRound("mount", options) as ReturnType<T.Effects["mount"]>
+  }
+  removeAction(...[options]: Parameters<T.Effects["removeAction"]>) {
+    return this.rpcRound("removeAction", options) as ReturnType<
+      T.Effects["removeAction"]
+    >
+  }
+  removeAddress(...[options]: Parameters<T.Effects["removeAddress"]>) {
+    return this.rpcRound("removeAddress", options) as ReturnType<
+      T.Effects["removeAddress"]
+    >
+  }
+  restart(...[]: Parameters<T.Effects["restart"]>) {
+    return this.rpcRound("restart", null)
+  }
+  reverseProxy(...[options]: Parameters<T.Effects["reverseProxy"]>) {
+    return this.rpcRound("reverseProxy", options) as ReturnType<
+      T.Effects["reverseProxy"]
+    >
+  }
+  running(...[packageId]: Parameters<T.Effects["running"]>) {
+    return this.rpcRound("running", { packageId }) as ReturnType<
+      T.Effects["running"]
+    >
+  }
+  // runRsync(...[options]: Parameters<T.Effects[""]>) {
+  //
+  // return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
+  //
+  // return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
+  // }
+  setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
+    return this.rpcRound("setConfigured", { configured }) as ReturnType<
+      T.Effects["setConfigured"]
+    >
+  }
+  setDependencies(
+    ...[dependencies]: Parameters<T.Effects["setDependencies"]>
+  ): ReturnType<T.Effects["setDependencies"]> {
+    return this.rpcRound("setDependencies", { dependencies }) as ReturnType<
+      T.Effects["setDependencies"]
+    >
+  }
+  setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
+    return this.rpcRound("setHealth", options) as ReturnType<
+      T.Effects["setHealth"]
+    >
+  }
+
+  setMainStatus(o: { status: "running" | "stopped" }): Promise<void> {
+    return this.rpcRound("setMainStatus", o) as ReturnType<
+      T.Effects["setHealth"]
+    >
+  }
+
+  shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
+    return this.rpcRound("shutdown", null)
+  }
+  stopped(...[packageId]: Parameters<T.Effects["stopped"]>) {
+    return this.rpcRound("stopped", { packageId }) as ReturnType<
+      T.Effects["stopped"]
+    >
+  }
+  store: T.Effects["store"] = {
+    get: async (options: any) =>
+      this.rpcRound("getStore", {
+        ...options,
+        callback: this.callbackHolder.addCallback(options.callback),
+      }) as any,
+    set: async (options: any) =>
+      this.rpcRound("setStore", options) as ReturnType<
+        T.Effects["store"]["set"]
+      >,
+  }
+
+  /**
+   * So, this is created
+   * @param options
+   * @returns
+   */
+  embassyGetInterface(options: {
+    target: "tor-key" | "tor-address" | "lan-address"
+    packageId: string
+    interface: string
+  }) {
+    return this.rpcRound("embassyGetInterface", options) as Promise<string>
+  }
+}
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
new file mode 100644
index 000000000..c9cbe9fef
--- /dev/null
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -0,0 +1,303 @@
+// @ts-check
+
+import * as net from "net"
+import {
+  object,
+  some,
+  string,
+  literal,
+  array,
+  number,
+  matches,
+  any,
+  shape,
+} from "ts-matches"
+
+import { types as T } from "@start9labs/start-sdk"
+import * as CP from "child_process"
+import * as Mod from "module"
+import * as fs from "fs"
+
+import { CallbackHolder } from "../Models/CallbackHolder"
+import { AllGetDependencies } from "../Interfaces/AllGetDependencies"
+import { HostSystem } from "../Interfaces/HostSystem"
+import { jsonPath } from "../Models/JsonPath"
+import { System } from "../Interfaces/System"
+type MaybePromise<T> = T | Promise<T>
+type SocketResponse = { jsonrpc: "2.0"; id: IdType } & (
+  | { result: unknown }
+  | {
+      error: {
+        code: number
+        message: string
+        data: { details: string; debug?: string }
+      }
+    }
+)
+const SOCKET_PARENT = "/media/startos/rpc"
+const SOCKET_PATH = "/media/startos/rpc/service.sock"
+const jsonrpc = "2.0" as const
+
+const idType = some(string, number, literal(null))
+type IdType = null | string | number
+const runType = object({
+  id: idType,
+  method: literal("execute"),
+  params: object(
+    {
+      procedure: string,
+      input: any,
+      timeout: number,
+    },
+    ["timeout"],
+  ),
+})
+const sandboxRunType = object({
+  id: idType,
+  method: literal("sandbox"),
+  params: object(
+    {
+      procedure: string,
+      input: any,
+      timeout: number,
+    },
+    ["timeout"],
+  ),
+})
+const callbackType = object({
+  id: idType,
+  method: literal("callback"),
+  params: object({
+    callback: string,
+    args: array,
+  }),
+})
+const initType = object({
+  id: idType,
+  method: literal("init"),
+})
+const exitType = object({
+  id: idType,
+  method: literal("exit"),
+})
+const evalType = object({
+  id: idType,
+  method: literal("eval"),
+  params: object({
+    script: string,
+  }),
+})
+
+const jsonParse = (x: Buffer) => JSON.parse(x.toString())
+function reduceMethod(
+  methodArgs: object,
+  effects: HostSystem,
+): (previousValue: any, currentValue: string) => any {
+  return (x: any, method: string) =>
+    Promise.resolve(x)
+      .then((x) => x[method])
+      .then((x) =>
+        typeof x !== "function"
+          ? x
+          : x({
+              ...methodArgs,
+              effects,
+            }),
+      )
+}
+
+const hasId = object({ id: idType }).test
+export class RpcListener {
+  unixSocketServer = net.createServer(async (server) => {})
+  private _system: System | undefined
+  private _effects: HostSystem | undefined
+
+  constructor(
+    readonly getDependencies: AllGetDependencies,
+    private callbacks = new CallbackHolder(),
+  ) {
+    if (!fs.existsSync(SOCKET_PARENT)) {
+      fs.mkdirSync(SOCKET_PARENT, { recursive: true })
+    }
+    this.unixSocketServer.listen(SOCKET_PATH)
+
+    this.unixSocketServer.on("connection", (s) => {
+      let id: IdType = null
+      const captureId = <X>(x: X) => {
+        if (hasId(x)) id = x.id
+        return x
+      }
+      const logData =
+        (location: string) =>
+        <X>(x: X) => {
+          console.log({
+            location,
+            stringified: JSON.stringify(x),
+            type: typeof x,
+            id,
+          })
+          return x
+        }
+      const mapError = (error: any): SocketResponse => ({
+        jsonrpc,
+        id,
+        error: {
+          message: typeof error,
+          data: {
+            details: error?.message ?? String(error),
+            debug: error?.stack,
+          },
+          code: 0,
+        },
+      })
+      const writeDataToSocket = (x: SocketResponse) =>
+        new Promise((resolve) => s.write(JSON.stringify(x), resolve))
+      s.on("data", (a) =>
+        Promise.resolve(a)
+          .then(logData("dataIn"))
+          .then(jsonParse)
+          .then(captureId)
+          .then((x) => this.dealWithInput(x))
+          .catch(mapError)
+          .then(logData("response"))
+          .then(writeDataToSocket)
+          .finally(() => void s.end()),
+      )
+    })
+  }
+
+  private get effects() {
+    return this.getDependencies.hostSystem()(this.callbacks)
+  }
+
+  private get system() {
+    if (!this._system) throw new Error("System not initialized")
+    return this._system
+  }
+
+  private dealWithInput(input: unknown): MaybePromise<SocketResponse> {
+    return matches(input)
+      .when(some(runType, sandboxRunType), async ({ id, params }) => {
+        const system = this.system
+        const procedure = jsonPath.unsafeCast(params.procedure)
+        return system
+          .execute(this.effects, {
+            procedure,
+            input: params.input,
+            timeout: params.timeout,
+          })
+          .then((result) =>
+            "ok" in result
+              ? {
+                  jsonrpc,
+                  id,
+                  result: result.ok === undefined ? null : result.ok,
+                }
+              : {
+                  jsonrpc,
+                  id,
+                  error: {
+                    code: result.err.code,
+                    message: "Package Root Error",
+                    data: { details: result.err.message },
+                  },
+                },
+          )
+          .catch((error) => ({
+            jsonrpc,
+            id,
+            error: {
+              code: 0,
+              message: typeof error,
+              data: { details: "" + error, debug: error?.stack },
+            },
+          }))
+      })
+      .when(callbackType, async ({ id, params: { callback, args } }) =>
+        Promise.resolve(this.callbacks.callCallback(callback, args))
+          .then((result) => ({
+            jsonrpc,
+            id,
+            result,
+          }))
+          .catch((error) => ({
+            jsonrpc,
+            id,
+
+            error: {
+              code: 0,
+              message: typeof error,
+              data: {
+                details: error?.message ?? String(error),
+                debug: error?.stack,
+              },
+            },
+          })),
+      )
+      .when(exitType, async ({ id }) => {
+        if (this._system) this._system.exit(this.effects)
+        delete this._system
+        delete this._effects
+
+        return {
+          jsonrpc,
+          id,
+          result: null,
+        }
+      })
+      .when(initType, async ({ id }) => {
+        this._system = await this.getDependencies.system()
+
+        return {
+          jsonrpc,
+          id,
+          result: null,
+        }
+      })
+      .when(evalType, async ({ id, params }) => {
+        const result = await new Function(
+          `return (async () => { return (${params.script}) }).call(this)`,
+        ).call({
+          listener: this,
+          require: require,
+        })
+        return {
+          jsonrpc,
+          id,
+          result: !["string", "number", "boolean", "null", "object"].includes(
+            typeof result,
+          )
+            ? null
+            : result,
+        }
+      })
+      .when(shape({ id: idType, method: string }), ({ id, method }) => ({
+        jsonrpc,
+        id,
+        error: {
+          code: -32601,
+          message: `Method not found`,
+          data: {
+            details: method,
+          },
+        },
+      }))
+
+      .defaultToLazy(() => {
+        console.warn(
+          `Coudln't parse the following input ${JSON.stringify(input)}`,
+        )
+        return {
+          jsonrpc,
+          id: (input as any)?.id,
+          error: {
+            code: -32602,
+            message: "invalid params",
+            data: {
+              details: JSON.stringify(input),
+            },
+          },
+        }
+      })
+  }
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
new file mode 100644
index 000000000..9cbda69dd
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -0,0 +1,76 @@
+import * as fs from "fs/promises"
+import * as cp from "child_process"
+import { Overlay, types as T } from "@start9labs/start-sdk"
+import { promisify } from "util"
+import { DockerProcedure, VolumeId } from "../../../Models/DockerProcedure"
+import { Volume } from "./matchVolume"
+export const exec = promisify(cp.exec)
+export const execFile = promisify(cp.execFile)
+
+export class DockerProcedureContainer {
+  private constructor(readonly overlay: Overlay) {}
+  // static async readonlyOf(data: DockerProcedure) {
+  //   return DockerProcedureContainer.of(data, ["-o", "ro"])
+  // }
+  static async of(
+    effects: T.Effects,
+    data: DockerProcedure,
+    volumes: { [id: VolumeId]: Volume },
+  ) {
+    const overlay = await Overlay.of(effects, data.image)
+
+    if (data.mounts) {
+      const mounts = data.mounts
+      for (const mount in mounts) {
+        const path = mounts[mount].startsWith("/")
+          ? `${overlay.rootfs}${mounts[mount]}`
+          : `${overlay.rootfs}/${mounts[mount]}`
+        await fs.mkdir(path, { recursive: true })
+        const volumeMount = volumes[mount]
+        if (volumeMount.type === "data") {
+          await overlay.mount({ type: "volume", id: mount }, mounts[mount])
+        } else if (volumeMount.type === "assets") {
+          await overlay.mount({ type: "assets", id: mount }, mounts[mount])
+        } else if (volumeMount.type === "certificate") {
+          volumeMount
+          const certChain = await effects.getSslCertificate()
+          const key = await effects.getSslKey()
+          await fs.writeFile(
+            `${path}/${volumeMount["interface-id"]}.cert.pem`,
+            certChain.join("\n"),
+          )
+          await fs.writeFile(
+            `${path}/${volumeMount["interface-id"]}.key.pem`,
+            key,
+          )
+        } else if (volumeMount.type === "pointer") {
+          await effects.mount({
+            location: path,
+            target: {
+              packageId: volumeMount["package-id"],
+              path: volumeMount.path,
+              readonly: volumeMount.readonly,
+              volumeId: volumeMount["volume-id"],
+            },
+          })
+        } else if (volumeMount.type === "backup") {
+          throw new Error("TODO")
+        }
+      }
+    }
+
+    return new DockerProcedureContainer(overlay)
+  }
+
+  async exec(commands: string[]) {
+    try {
+      return await this.overlay.exec(commands)
+    } finally {
+      await this.overlay.destroy()
+    }
+  }
+
+  async spawn(commands: string[]): Promise<cp.ChildProcessWithoutNullStreams> {
+    return await this.overlay.spawn(commands)
+  }
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
new file mode 100644
index 000000000..484e02c24
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -0,0 +1,150 @@
+import { PolyfillEffects } from "./polyfillEffects"
+import { DockerProcedureContainer } from "./DockerProcedureContainer"
+import { SystemForEmbassy } from "."
+import { HostSystemStartOs } from "../../HostSystemStartOs"
+import { util, Daemons, types as T } from "@start9labs/start-sdk"
+
+const EMBASSY_HEALTH_INTERVAL = 15 * 1000
+const EMBASSY_PROPERTIES_LOOP = 30 * 1000
+/**
+ * We wanted something to represent what the main loop is doing, and
+ * in this case it used to run the properties, health, and the docker/ js main.
+ * Also, this has an ability to clean itself up too if need be.
+ */
+export class MainLoop {
+  private healthLoops:
+    | {
+        name: string
+        interval: NodeJS.Timeout
+      }[]
+    | undefined
+
+  private mainEvent:
+    | Promise<{
+        daemon: T.DaemonReturned
+        wait: Promise<unknown>
+      }>
+    | undefined
+  private propertiesEvent: NodeJS.Timeout | undefined
+  constructor(
+    readonly system: SystemForEmbassy,
+    readonly effects: HostSystemStartOs,
+    readonly runProperties: () => Promise<void>,
+  ) {
+    this.healthLoops = this.constructHealthLoops()
+    this.mainEvent = this.constructMainEvent()
+    this.propertiesEvent = this.constructPropertiesEvent()
+  }
+
+  private async constructMainEvent() {
+    const { system, effects } = this
+    const utils = util.createUtils(effects)
+    const currentCommand: [string, ...string[]] = [
+      system.manifest.main.entrypoint,
+      ...system.manifest.main.args,
+    ]
+
+    await effects.setMainStatus({ status: "running" })
+    const jsMain = (this.system.moduleCode as any)?.jsMain
+    const dockerProcedureContainer = await DockerProcedureContainer.of(
+      effects,
+      this.system.manifest.main,
+      this.system.manifest.volumes,
+    )
+    if (jsMain) {
+      const daemons = Daemons.of({
+        effects,
+        started: async (_) => {},
+        healthReceipts: [],
+      })
+      throw new Error("todo")
+      // return {
+      //   daemon,
+      //   wait: daemon.wait().finally(() => {
+      //     this.clean()
+      //     effects.setMainStatus({ status: "stopped" })
+      //   }),
+      // }
+    }
+    const daemon = await utils.runDaemon(
+      this.system.manifest.main.image,
+      currentCommand,
+      {
+        overlay: dockerProcedureContainer.overlay,
+      },
+    )
+    return {
+      daemon,
+      wait: daemon.wait().finally(() => {
+        this.clean()
+        effects
+          .setMainStatus({ status: "stopped" })
+          .catch((e) => console.error("Could not set the status to stopped"))
+      }),
+    }
+  }
+
+  public async clean(options?: { timeout?: number }) {
+    const { mainEvent, healthLoops, propertiesEvent } = this
+    delete this.mainEvent
+    delete this.healthLoops
+    delete this.propertiesEvent
+    if (mainEvent) await (await mainEvent).daemon.term()
+    clearInterval(propertiesEvent)
+    if (healthLoops) healthLoops.forEach((x) => clearInterval(x.interval))
+  }
+
+  private constructPropertiesEvent() {
+    const { runProperties } = this
+    return setInterval(() => {
+      runProperties()
+    }, EMBASSY_PROPERTIES_LOOP)
+  }
+
+  private constructHealthLoops() {
+    const { manifest } = this.system
+    const effects = this.effects
+    const start = Date.now()
+    return Object.values(manifest["health-checks"]).map((value) => {
+      const name = value.name
+      const interval = setInterval(async () => {
+        const actionProcedure = value
+        const timeChanged = Date.now() - start
+        if (actionProcedure.type === "docker") {
+          const container = await DockerProcedureContainer.of(
+            effects,
+            actionProcedure,
+            manifest.volumes,
+          )
+          const executed = await container.exec([
+            actionProcedure.entrypoint,
+            ...actionProcedure.args,
+            JSON.stringify(timeChanged),
+          ])
+          const stderr = executed.stderr.toString()
+          if (stderr)
+            console.error(`Error running health check ${value.name}: ${stderr}`)
+          return executed.stdout.toString()
+        } else {
+          const moduleCode = await this.system.moduleCode
+          const method = moduleCode.health?.[value.name]
+          if (!method)
+            return console.error(
+              `Expecting that thejs health check ${value.name} exists`,
+            )
+          return (await method(
+            new PolyfillEffects(effects, this.system.manifest),
+            timeChanged,
+          ).then((x) => {
+            if ("result" in x) return x.result
+            if ("error" in x)
+              return console.error("Error getting config: " + x.error)
+            return console.error("Error getting config: " + x["error-code"][1])
+          })) as any
+        }
+      }, EMBASSY_HEALTH_INTERVAL)
+
+      return { name, interval }
+    })
+  }
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
new file mode 100644
index 000000000..ca1a69d2e
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -0,0 +1,900 @@
+import { types as T, util, EmVer } from "@start9labs/start-sdk"
+import * as fs from "fs/promises"
+
+import { PolyfillEffects } from "./polyfillEffects"
+import { ExecuteResult, System } from "../../../Interfaces/System"
+import { matchManifest, Manifest, Procedure } from "./matchManifest"
+import { create } from "domain"
+import * as childProcess from "node:child_process"
+import { Volume } from "../../../Models/Volume"
+import { DockerProcedure } from "../../../Models/DockerProcedure"
+import { DockerProcedureContainer } from "./DockerProcedureContainer"
+import { promisify } from "node:util"
+import * as U from "./oldEmbassyTypes"
+import { MainLoop } from "./MainLoop"
+import {
+  matches,
+  boolean,
+  dictionary,
+  literal,
+  literals,
+  object,
+  string,
+  unknown,
+  any,
+  tuple,
+  number,
+} from "ts-matches"
+import { HostSystemStartOs } from "../../HostSystemStartOs"
+import { JsonPath, unNestPath } from "../../../Models/JsonPath"
+import { HostSystem } from "../../../Interfaces/HostSystem"
+
+type Optional<A> = A | undefined | null
+function todo(): never {
+  throw new Error("Not implemented")
+}
+const execFile = promisify(childProcess.execFile)
+
+const MANIFEST_LOCATION = "/usr/lib/startos/package/embassyManifest.json"
+const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
+const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig"
+
+export class SystemForEmbassy implements System {
+  currentRunning: MainLoop | undefined
+  static async of(manifestLocation: string = MANIFEST_LOCATION) {
+    const moduleCode = await import(EMBASSY_JS_LOCATION)
+      .catch((_) => require(EMBASSY_JS_LOCATION))
+      .catch(async (_) => {
+        console.error("Could not load the js")
+        console.error({
+          exists: await fs.stat(EMBASSY_JS_LOCATION),
+        })
+        return {}
+      })
+    const manifestData = await fs.readFile(manifestLocation, "utf-8")
+    return new SystemForEmbassy(
+      matchManifest.unsafeCast(JSON.parse(manifestData)),
+      moduleCode,
+    )
+  }
+  constructor(
+    readonly manifest: Manifest,
+    readonly moduleCode: Partial<U.ExpectedExports>,
+  ) {}
+  async execute(
+    effects: HostSystemStartOs,
+    options: {
+      procedure: JsonPath
+      input: unknown
+      timeout?: number | undefined
+    },
+  ): Promise<ExecuteResult> {
+    return this._execute(effects, options)
+      .then((x) =>
+        matches(x)
+          .when(
+            object({
+              result: any,
+            }),
+            (x) => ({
+              ok: x.result,
+            }),
+          )
+          .when(
+            object({
+              error: string,
+            }),
+            (x) => ({
+              err: {
+                code: 0,
+                message: x.error,
+              },
+            }),
+          )
+          .when(
+            object({
+              "error-code": tuple(number, string),
+            }),
+            ({ "error-code": [code, message] }) => ({
+              err: {
+                code,
+                message,
+              },
+            }),
+          )
+          .defaultTo({ ok: x }),
+      )
+      .catch((error) => ({
+        err: {
+          code: 0,
+          message: "" + error,
+        },
+      }))
+  }
+  async exit(effects: HostSystemStartOs): Promise<void> {
+    if (this.currentRunning) await this.currentRunning.clean()
+    delete this.currentRunning
+  }
+  async _execute(
+    effects: HostSystemStartOs,
+    options: {
+      procedure: JsonPath
+      input: unknown
+      timeout?: number | undefined
+    },
+  ): Promise<unknown> {
+    const input = options.input
+    switch (options.procedure) {
+      case "/backup/create":
+        return this.createBackup(effects)
+      case "/backup/restore":
+        return this.restoreBackup(effects)
+      case "/config/get":
+        return this.getConfig(effects)
+      case "/config/set":
+        return this.setConfig(effects, input)
+      case "/actions/metadata":
+        return todo()
+      case "/init":
+        return this.init(effects, string.optional().unsafeCast(input))
+      case "/uninit":
+        return this.uninit(effects, string.optional().unsafeCast(input))
+      case "/main/start":
+        return this.mainStart(effects)
+      case "/main/stop":
+        return this.mainStop(effects)
+      default:
+        const procedures = unNestPath(options.procedure)
+        switch (true) {
+          case procedures[1] === "actions" && procedures[3] === "get":
+            return this.action(effects, procedures[2], input)
+          case procedures[1] === "actions" && procedures[3] === "run":
+            return this.action(effects, procedures[2], input)
+          case procedures[1] === "dependencies" && procedures[3] === "query":
+            return this.dependenciesAutoconfig(effects, procedures[2], input)
+
+          case procedures[1] === "dependencies" && procedures[3] === "update":
+            return this.dependenciesAutoconfig(effects, procedures[2], input)
+        }
+    }
+  }
+  private async init(
+    effects: HostSystemStartOs,
+    previousVersion: Optional<string>,
+  ): Promise<void> {
+    console.log("here1")
+    if (previousVersion) await this.migration(effects, previousVersion)
+    console.log("here2")
+    await this.properties(effects)
+    console.log("here3")
+    await effects.setMainStatus({ status: "stopped" })
+    console.log("here4")
+  }
+  private async uninit(
+    effects: HostSystemStartOs,
+    nextVersion: Optional<string>,
+  ): Promise<void> {
+    // TODO Do a migration down if the version exists
+    await effects.setMainStatus({ status: "stopped" })
+  }
+  private async mainStart(effects: HostSystemStartOs): Promise<void> {
+    if (!!this.currentRunning) return
+
+    this.currentRunning = new MainLoop(this, effects, () =>
+      this.properties(effects),
+    )
+  }
+  private async mainStop(
+    effects: HostSystemStartOs,
+    options?: { timeout?: number },
+  ): Promise<void> {
+    const { currentRunning } = this
+    delete this.currentRunning
+    if (currentRunning) {
+      await currentRunning.clean({
+        timeout: options?.timeout || this.manifest.main["sigterm-timeout"],
+      })
+    }
+  }
+  private async createBackup(effects: HostSystemStartOs): Promise<void> {
+    const backup = this.manifest.backup.create
+    if (backup.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        backup,
+        this.manifest.volumes,
+      )
+      await container.exec([backup.entrypoint, ...backup.args])
+    } else {
+      const moduleCode = await this.moduleCode
+      await moduleCode.createBackup?.(
+        new PolyfillEffects(effects, this.manifest),
+      )
+    }
+  }
+  private async restoreBackup(effects: HostSystemStartOs): Promise<void> {
+    const restoreBackup = this.manifest.backup.restore
+    if (restoreBackup.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        restoreBackup,
+        this.manifest.volumes,
+      )
+      await container.exec([restoreBackup.entrypoint, ...restoreBackup.args])
+    } else {
+      const moduleCode = await this.moduleCode
+      await moduleCode.restoreBackup?.(
+        new PolyfillEffects(effects, this.manifest),
+      )
+    }
+  }
+  private async getConfig(effects: HostSystemStartOs): Promise<T.ConfigRes> {
+    return this.getConfigUncleaned(effects).then(removePointers)
+  }
+  private async getConfigUncleaned(
+    effects: HostSystemStartOs,
+  ): Promise<T.ConfigRes> {
+    const config = this.manifest.config?.get
+    if (!config) return { spec: {} }
+    if (config.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        config,
+        this.manifest.volumes,
+      )
+      // TODO: yaml
+      return JSON.parse(
+        (
+          await container.exec([config.entrypoint, ...config.args])
+        ).stdout.toString(),
+      )
+    } else {
+      const moduleCode = await this.moduleCode
+      const method = moduleCode.getConfig
+      if (!method) throw new Error("Expecting that the method getConfig exists")
+      return (await method(new PolyfillEffects(effects, this.manifest)).then(
+        (x) => {
+          if ("result" in x) return x.result
+          if ("error" in x) throw new Error("Error getting config: " + x.error)
+          throw new Error("Error getting config: " + x["error-code"][1])
+        },
+      )) as any
+    }
+  }
+  private async setConfig(
+    effects: HostSystemStartOs,
+    newConfigWithoutPointers: unknown,
+  ): Promise<T.SetResult> {
+    const newConfig = structuredClone(newConfigWithoutPointers)
+    await updateConfig(
+      effects,
+      await this.getConfigUncleaned(effects).then((x) => x.spec),
+      newConfig,
+    )
+    const setConfigValue = this.manifest.config?.set
+    if (!setConfigValue) return { signal: "SIGTERM", "depends-on": {} }
+    if (setConfigValue.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        setConfigValue,
+        this.manifest.volumes,
+      )
+      return JSON.parse(
+        (
+          await container.exec([
+            setConfigValue.entrypoint,
+            ...setConfigValue.args,
+            JSON.stringify(newConfig),
+          ])
+        ).stdout.toString(),
+      )
+    } else if (setConfigValue.type === "script") {
+      const moduleCode = await this.moduleCode
+      const method = moduleCode.setConfig
+      if (!method) throw new Error("Expecting that the method setConfig exists")
+      return await method(
+        new PolyfillEffects(effects, this.manifest),
+        newConfig as U.Config,
+      ).then((x): T.SetResult => {
+        if ("result" in x)
+          return {
+            "depends-on": x.result["depends-on"],
+            signal: x.result.signal === "SIGEMT" ? "SIGTERM" : x.result.signal,
+          }
+        if ("error" in x) throw new Error("Error getting config: " + x.error)
+        throw new Error("Error getting config: " + x["error-code"][1])
+      })
+    } else {
+      return {
+        "depends-on": {},
+        signal: "SIGTERM",
+      }
+    }
+  }
+  private async migration(
+    effects: HostSystemStartOs,
+    fromVersion: string,
+  ): Promise<T.MigrationRes> {
+    const fromEmver = EmVer.from(fromVersion)
+    const currentEmver = EmVer.from(this.manifest.version)
+    if (!this.manifest.migrations) return { configured: true }
+    const fromMigration = Object.entries(this.manifest.migrations.from)
+      .map(([version, procedure]) => [EmVer.from(version), procedure] as const)
+      .find(
+        ([versionEmver, procedure]) =>
+          versionEmver.greaterThan(fromEmver) &&
+          versionEmver.lessThanOrEqual(currentEmver),
+      )
+    const toMigration = Object.entries(this.manifest.migrations.to)
+      .map(([version, procedure]) => [EmVer.from(version), procedure] as const)
+      .find(
+        ([versionEmver, procedure]) =>
+          versionEmver.greaterThan(fromEmver) &&
+          versionEmver.lessThanOrEqual(currentEmver),
+      )
+
+    // prettier-ignore
+    const migration = (
+        fromEmver.greaterThan(currentEmver) ? [toMigration, fromMigration] :
+        [fromMigration, toMigration]).filter(Boolean)[0]
+
+    if (migration) {
+      const [version, procedure] = migration
+      if (procedure.type === "docker") {
+        const container = await DockerProcedureContainer.of(
+          effects,
+          procedure,
+          this.manifest.volumes,
+        )
+        return JSON.parse(
+          (
+            await container.exec([
+              procedure.entrypoint,
+              ...procedure.args,
+              JSON.stringify(fromVersion),
+            ])
+          ).stdout.toString(),
+        )
+      } else if (procedure.type === "script") {
+        const moduleCode = await this.moduleCode
+        const method = moduleCode.migration
+        if (!method)
+          throw new Error("Expecting that the method migration exists")
+        return (await method(
+          new PolyfillEffects(effects, this.manifest),
+          fromVersion as string,
+        ).then((x) => {
+          if ("result" in x) return x.result
+          if ("error" in x) throw new Error("Error getting config: " + x.error)
+          throw new Error("Error getting config: " + x["error-code"][1])
+        })) as any
+      }
+    }
+    return { configured: true }
+  }
+  private async properties(effects: HostSystemStartOs): Promise<undefined> {
+    // TODO BLU-J set the properties ever so often
+    const setConfigValue = this.manifest.properties
+    if (!setConfigValue) return
+    if (setConfigValue.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        setConfigValue,
+        this.manifest.volumes,
+      )
+      return JSON.parse(
+        (
+          await container.exec([
+            setConfigValue.entrypoint,
+            ...setConfigValue.args,
+          ])
+        ).stdout.toString(),
+      )
+    } else if (setConfigValue.type === "script") {
+      const moduleCode = this.moduleCode
+      const method = moduleCode.properties
+      if (!method)
+        throw new Error("Expecting that the method properties exists")
+      await method(new PolyfillEffects(effects, this.manifest)).then((x) => {
+        if ("result" in x) return x.result
+        if ("error" in x) throw new Error("Error getting config: " + x.error)
+        throw new Error("Error getting config: " + x["error-code"][1])
+      })
+    }
+  }
+  private async health(
+    effects: HostSystemStartOs,
+    healthId: string,
+    timeSinceStarted: unknown,
+  ): Promise<void> {
+    const healthProcedure = this.manifest["health-checks"][healthId]
+    if (!healthProcedure) return
+    if (healthProcedure.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        healthProcedure,
+        this.manifest.volumes,
+      )
+      return JSON.parse(
+        (
+          await container.exec([
+            healthProcedure.entrypoint,
+            ...healthProcedure.args,
+            JSON.stringify(timeSinceStarted),
+          ])
+        ).stdout.toString(),
+      )
+    } else if (healthProcedure.type === "script") {
+      const moduleCode = await this.moduleCode
+      const method = moduleCode.health?.[healthId]
+      if (!method) throw new Error("Expecting that the method health exists")
+      await method(
+        new PolyfillEffects(effects, this.manifest),
+        Number(timeSinceStarted),
+      ).then((x) => {
+        if ("result" in x) return x.result
+        if ("error" in x) throw new Error("Error getting config: " + x.error)
+        throw new Error("Error getting config: " + x["error-code"][1])
+      })
+    }
+  }
+  private async action(
+    effects: HostSystemStartOs,
+    actionId: string,
+    formData: unknown,
+  ): Promise<T.ActionResult> {
+    const actionProcedure = this.manifest.actions?.[actionId]?.implementation
+    if (!actionProcedure) return { message: "Action not found", value: null }
+    if (actionProcedure.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        actionProcedure,
+        this.manifest.volumes,
+      )
+      return JSON.parse(
+        (
+          await container.exec([
+            actionProcedure.entrypoint,
+            ...actionProcedure.args,
+            JSON.stringify(formData),
+          ])
+        ).stdout.toString(),
+      )
+    } else {
+      const moduleCode = await this.moduleCode
+      const method = moduleCode.action?.[actionId]
+      if (!method) throw new Error("Expecting that the method action exists")
+      return (await method(
+        new PolyfillEffects(effects, this.manifest),
+        formData as any,
+      ).then((x) => {
+        if ("result" in x) return x.result
+        if ("error" in x) throw new Error("Error getting config: " + x.error)
+        throw new Error("Error getting config: " + x["error-code"][1])
+      })) as any
+    }
+  }
+  private async dependenciesCheck(
+    effects: HostSystemStartOs,
+    id: string,
+    oldConfig: unknown,
+  ): Promise<object> {
+    const actionProcedure = this.manifest.dependencies?.[id]?.config?.check
+    if (!actionProcedure) return { message: "Action not found", value: null }
+    if (actionProcedure.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        actionProcedure,
+        this.manifest.volumes,
+      )
+      return JSON.parse(
+        (
+          await container.exec([
+            actionProcedure.entrypoint,
+            ...actionProcedure.args,
+            JSON.stringify(oldConfig),
+          ])
+        ).stdout.toString(),
+      )
+    } else if (actionProcedure.type === "script") {
+      const moduleCode = await this.moduleCode
+      const method = moduleCode.dependencies?.[id]?.check
+      if (!method)
+        throw new Error(
+          `Expecting that the method dependency check ${id} exists`,
+        )
+      return (await method(
+        new PolyfillEffects(effects, this.manifest),
+        oldConfig as any,
+      ).then((x) => {
+        if ("result" in x) return x.result
+        if ("error" in x) throw new Error("Error getting config: " + x.error)
+        throw new Error("Error getting config: " + x["error-code"][1])
+      })) as any
+    } else {
+      return {}
+    }
+  }
+  private async dependenciesAutoconfig(
+    effects: HostSystemStartOs,
+    id: string,
+    oldConfig: unknown,
+  ): Promise<void> {
+    const moduleCode = await this.moduleCode
+    const method = moduleCode.dependencies?.[id]?.autoConfigure
+    if (!method)
+      throw new Error(
+        `Expecting that the method dependency autoConfigure ${id} exists`,
+      )
+    return (await method(
+      new PolyfillEffects(effects, this.manifest),
+      oldConfig as any,
+    ).then((x) => {
+      if ("result" in x) return x.result
+      if ("error" in x) throw new Error("Error getting config: " + x.error)
+      throw new Error("Error getting config: " + x["error-code"][1])
+    })) as any
+  }
+  // private async sandbox(
+  //   effects: HostSystemStartOs,
+  //   options: {
+  //     procedure:
+  //       | "/createBackup"
+  //       | "/restoreBackup"
+  //       | "/getConfig"
+  //       | "/setConfig"
+  //       | "migration"
+  //       | "/properties"
+  //       | `/action/${string}`
+  //       | `/dependencies/${string}/check`
+  //       | `/dependencies/${string}/autoConfigure`
+  //     input: unknown
+  //     timeout?: number | undefined
+  //   },
+  // ): Promise<unknown> {
+  //   const input = options.input
+  //   switch (options.procedure) {
+  //     case "/createBackup":
+  //       return this.roCreateBackup(effects)
+  //     case "/restoreBackup":
+  //       return this.roRestoreBackup(effects)
+  //     case "/getConfig":
+  //       return this.roGetConfig(effects)
+  //     case "/setConfig":
+  //       return this.roSetConfig(effects, input)
+  //     case "migration":
+  //       return this.roMigration(effects, input)
+  //     case "/properties":
+  //       return this.roProperties(effects)
+  //     default:
+  //       const procedure = options.procedure.split("/")
+  //       switch (true) {
+  //         case options.procedure.startsWith("/action/"):
+  //           return this.roAction(effects, procedure[2], input)
+  //         case options.procedure.startsWith("/dependencies/") &&
+  //           procedure[3] === "check":
+  //           return this.roDependenciesCheck(effects, procedure[2], input)
+
+  //         case options.procedure.startsWith("/dependencies/") &&
+  //           procedure[3] === "autoConfigure":
+  //           return this.roDependenciesAutoconfig(effects, procedure[2], input)
+  //       }
+  //   }
+  // }
+
+  // private async roCreateBackup(effects: HostSystemStartOs): Promise<void> {
+  //   const backup = this.manifest.backup.create
+  //   if (backup.type === "docker") {
+  //     const container = await DockerProcedureContainer.readonlyOf(backup)
+  //     await container.exec([backup.entrypoint, ...backup.args])
+  //   } else {
+  //     const moduleCode = await this.moduleCode
+  //     await moduleCode.createBackup?.(new PolyfillEffects(effects))
+  //   }
+  // }
+  // private async roRestoreBackup(effects: HostSystemStartOs): Promise<void> {
+  //   const restoreBackup = this.manifest.backup.restore
+  //   if (restoreBackup.type === "docker") {
+  //     const container = await DockerProcedureContainer.readonlyOf(restoreBackup)
+  //     await container.exec([restoreBackup.entrypoint, ...restoreBackup.args])
+  //   } else {
+  //     const moduleCode = await this.moduleCode
+  //     await moduleCode.restoreBackup?.(new PolyfillEffects(effects))
+  //   }
+  // }
+  // private async roGetConfig(effects: HostSystemStartOs): Promise<T.ConfigRes> {
+  //   const config = this.manifest.config?.get
+  //   if (!config) return { spec: {} }
+  //   if (config.type === "docker") {
+  //     const container = await DockerProcedureContainer.readonlyOf(config)
+  //     return JSON.parse(
+  //       (await container.exec([config.entrypoint, ...config.args])).stdout,
+  //     )
+  //   } else {
+  //     const moduleCode = await this.moduleCode
+  //     const method = moduleCode.getConfig
+  //     if (!method) throw new Error("Expecting that the method getConfig exists")
+  //     return (await method(new PolyfillEffects(effects)).then((x) => {
+  //       if ("result" in x) return x.result
+  //       if ("error" in x) throw new Error("Error getting config: " + x.error)
+  //       throw new Error("Error getting config: " + x["error-code"][1])
+  //     })) as any
+  //   }
+  // }
+  // private async roSetConfig(
+  //   effects: HostSystemStartOs,
+  //   newConfig: unknown,
+  // ): Promise<T.SetResult> {
+  //   const setConfigValue = this.manifest.config?.set
+  //   if (!setConfigValue) return { signal: "SIGTERM", "depends-on": {} }
+  //   if (setConfigValue.type === "docker") {
+  //     const container = await DockerProcedureContainer.readonlyOf(
+  //       setConfigValue,
+  //     )
+  //     return JSON.parse(
+  //       (
+  //         await container.exec([
+  //           setConfigValue.entrypoint,
+  //           ...setConfigValue.args,
+  //           JSON.stringify(newConfig),
+  //         ])
+  //       ).stdout,
+  //     )
+  //   } else {
+  //     const moduleCode = await this.moduleCode
+  //     const method = moduleCode.setConfig
+  //     if (!method) throw new Error("Expecting that the method setConfig exists")
+  //     return await method(
+  //       new PolyfillEffects(effects),
+  //       newConfig as U.Config,
+  //     ).then((x) => {
+  //       if ("result" in x) return x.result
+  //       if ("error" in x) throw new Error("Error getting config: " + x.error)
+  //       throw new Error("Error getting config: " + x["error-code"][1])
+  //     })
+  //   }
+  // }
+  // private async roMigration(
+  //   effects: HostSystemStartOs,
+  //   fromVersion: unknown,
+  // ): Promise<T.MigrationRes> {
+  //   throw new Error("Migrations should never be ran in the sandbox mode")
+  // }
+  // private async roProperties(effects: HostSystemStartOs): Promise<unknown> {
+  //   const setConfigValue = this.manifest.properties
+  //   if (!setConfigValue) return {}
+  //   if (setConfigValue.type === "docker") {
+  //     const container = await DockerProcedureContainer.readonlyOf(
+  //       setConfigValue,
+  //     )
+  //     return JSON.parse(
+  //       (
+  //         await container.exec([
+  //           setConfigValue.entrypoint,
+  //           ...setConfigValue.args,
+  //         ])
+  //       ).stdout,
+  //     )
+  //   } else {
+  //     const moduleCode = await this.moduleCode
+  //     const method = moduleCode.properties
+  //     if (!method)
+  //       throw new Error("Expecting that the method properties exists")
+  //     return await method(new PolyfillEffects(effects)).then((x) => {
+  //       if ("result" in x) return x.result
+  //       if ("error" in x) throw new Error("Error getting config: " + x.error)
+  //       throw new Error("Error getting config: " + x["error-code"][1])
+  //     })
+  //   }
+  // }
+  // private async roHealth(
+  //   effects: HostSystemStartOs,
+  //   healthId: string,
+  //   timeSinceStarted: unknown,
+  // ): Promise<void> {
+  //   const healthProcedure = this.manifest["health-checks"][healthId]
+  //   if (!healthProcedure) return
+  //   if (healthProcedure.type === "docker") {
+  //     const container = await DockerProcedureContainer.readonlyOf(
+  //       healthProcedure,
+  //     )
+  //     return JSON.parse(
+  //       (
+  //         await container.exec([
+  //           healthProcedure.entrypoint,
+  //           ...healthProcedure.args,
+  //           JSON.stringify(timeSinceStarted),
+  //         ])
+  //       ).stdout,
+  //     )
+  //   } else {
+  //     const moduleCode = await this.moduleCode
+  //     const method = moduleCode.health?.[healthId]
+  //     if (!method) throw new Error("Expecting that the method health exists")
+  //     await method(new PolyfillEffects(effects), Number(timeSinceStarted)).then(
+  //       (x) => {
+  //         if ("result" in x) return x.result
+  //         if ("error" in x) throw new Error("Error getting config: " + x.error)
+  //         throw new Error("Error getting config: " + x["error-code"][1])
+  //       },
+  //     )
+  //   }
+  // }
+  // private async roAction(
+  //   effects: HostSystemStartOs,
+  //   actionId: string,
+  //   formData: unknown,
+  // ): Promise<T.ActionResult> {
+  //   const actionProcedure = this.manifest.actions?.[actionId]?.implementation
+  //   if (!actionProcedure) return { message: "Action not found", value: null }
+  //   if (actionProcedure.type === "docker") {
+  //     const container = await DockerProcedureContainer.readonlyOf(
+  //       actionProcedure,
+  //     )
+  //     return JSON.parse(
+  //       (
+  //         await container.exec([
+  //           actionProcedure.entrypoint,
+  //           ...actionProcedure.args,
+  //           JSON.stringify(formData),
+  //         ])
+  //       ).stdout,
+  //     )
+  //   } else {
+  //     const moduleCode = await this.moduleCode
+  //     const method = moduleCode.action?.[actionId]
+  //     if (!method) throw new Error("Expecting that the method action exists")
+  //     return (await method(new PolyfillEffects(effects), formData as any).then(
+  //       (x) => {
+  //         if ("result" in x) return x.result
+  //         if ("error" in x) throw new Error("Error getting config: " + x.error)
+  //         throw new Error("Error getting config: " + x["error-code"][1])
+  //       },
+  //     )) as any
+  //   }
+  // }
+  // private async roDependenciesCheck(
+  //   effects: HostSystemStartOs,
+  //   id: string,
+  //   oldConfig: unknown,
+  // ): Promise<object> {
+  //   const actionProcedure = this.manifest.dependencies?.[id]?.config?.check
+  //   if (!actionProcedure) return { message: "Action not found", value: null }
+  //   if (actionProcedure.type === "docker") {
+  //     const container = await DockerProcedureContainer.readonlyOf(
+  //       actionProcedure,
+  //     )
+  //     return JSON.parse(
+  //       (
+  //         await container.exec([
+  //           actionProcedure.entrypoint,
+  //           ...actionProcedure.args,
+  //           JSON.stringify(oldConfig),
+  //         ])
+  //       ).stdout,
+  //     )
+  //   } else {
+  //     const moduleCode = await this.moduleCode
+  //     const method = moduleCode.dependencies?.[id]?.check
+  //     if (!method)
+  //       throw new Error(
+  //         `Expecting that the method dependency check ${id} exists`,
+  //       )
+  //     return (await method(new PolyfillEffects(effects), oldConfig as any).then(
+  //       (x) => {
+  //         if ("result" in x) return x.result
+  //         if ("error" in x) throw new Error("Error getting config: " + x.error)
+  //         throw new Error("Error getting config: " + x["error-code"][1])
+  //       },
+  //     )) as any
+  //   }
+  // }
+  // private async roDependenciesAutoconfig(
+  //   effects: HostSystemStartOs,
+  //   id: string,
+  //   oldConfig: unknown,
+  // ): Promise<void> {
+  //   const moduleCode = await this.moduleCode
+  //   const method = moduleCode.dependencies?.[id]?.autoConfigure
+  //   if (!method)
+  //     throw new Error(
+  //       `Expecting that the method dependency autoConfigure ${id} exists`,
+  //     )
+  //   return (await method(new PolyfillEffects(effects), oldConfig as any).then(
+  //     (x) => {
+  //       if ("result" in x) return x.result
+  //       if ("error" in x) throw new Error("Error getting config: " + x.error)
+  //       throw new Error("Error getting config: " + x["error-code"][1])
+  //     },
+  //   )) as any
+  // }
+}
+async function removePointers(value: T.ConfigRes): Promise<T.ConfigRes> {
+  const startingSpec = structuredClone(value.spec)
+  const spec = cleanSpecOfPointers(startingSpec)
+
+  return { ...value, spec }
+}
+
+const matchPointer = object({
+  type: literal("pointer"),
+})
+
+const matchPointerPackage = object({
+  subtype: literal("package"),
+  target: literals("tor-key", "tor-address", "lan-address"),
+  "package-id": string,
+  interface: string,
+})
+const matchPointerConfig = object({
+  subtype: literal("package"),
+  target: literals("config"),
+  "package-id": string,
+  selector: string,
+  multi: boolean,
+})
+const matchSpec = object({
+  spec: object,
+})
+const matchVariants = object({ variants: dictionary([string, unknown]) })
+function cleanSpecOfPointers<T>(mutSpec: T): T {
+  if (!object.test(mutSpec)) return mutSpec
+  for (const key in mutSpec) {
+    const value = mutSpec[key]
+    if (matchSpec.test(value)) value.spec = cleanSpecOfPointers(value.spec)
+    if (matchVariants.test(value))
+      value.variants = Object.fromEntries(
+        Object.entries(value.variants).map(([key, value]) => [
+          key,
+          cleanSpecOfPointers(value),
+        ]),
+      )
+    if (!matchPointer.test(value)) continue
+    delete mutSpec[key]
+    // // if (value.target === )
+  }
+
+  return mutSpec
+}
+
+async function updateConfig(
+  effects: HostSystemStartOs,
+  spec: unknown,
+  mutConfigValue: unknown,
+) {
+  if (!dictionary([string, unknown]).test(spec)) return
+  if (!dictionary([string, unknown]).test(mutConfigValue)) return
+  for (const key in spec) {
+    const specValue = spec[key]
+
+    const newConfigValue = mutConfigValue[key]
+    if (matchSpec.test(specValue)) {
+      const updateObject = { spec: null }
+      await updateConfig(effects, { spec: specValue.spec }, updateObject)
+      mutConfigValue[key] = updateObject.spec
+    }
+    if (
+      matchVariants.test(specValue) &&
+      object({ tag: object({ id: string }) }).test(newConfigValue) &&
+      newConfigValue.tag.id in specValue.variants
+    ) {
+      // Not going to do anything on the variants...
+    }
+    if (!matchPointer.test(specValue)) continue
+    if (matchPointerConfig.test(specValue)) {
+      const configValue = (await effects.store.get({
+        packageId: specValue["package-id"],
+        callback() {},
+        path: `${EMBASSY_POINTER_PATH_PREFIX}${specValue.selector}` as any,
+      })) as any
+      mutConfigValue[key] = configValue
+    }
+    if (matchPointerPackage.test(specValue)) {
+      mutConfigValue[key] = await effects.embassyGetInterface({
+        target: specValue.target,
+        packageId: specValue["package-id"],
+        interface: specValue["interface"],
+      })
+    }
+  }
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
new file mode 100644
index 000000000..9b70f884b
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
@@ -0,0 +1,119 @@
+import {
+  object,
+  literal,
+  string,
+  array,
+  boolean,
+  dictionary,
+  literals,
+  number,
+  unknown,
+  some,
+  every,
+} from "ts-matches"
+import { matchVolume } from "./matchVolume"
+import { matchDockerProcedure } from "../../../Models/DockerProcedure"
+
+const matchJsProcedure = object(
+  {
+    type: literal("script"),
+    args: array(unknown),
+  },
+  ["args"],
+  {
+    args: [],
+  },
+)
+
+const matchProcedure = some(matchDockerProcedure, matchJsProcedure)
+export type Procedure = typeof matchProcedure._TYPE
+
+const matchAction = object(
+  {
+    name: string,
+    description: string,
+    warning: string,
+    implementation: matchProcedure,
+    "allowed-statuses": array(literals("running", "stopped")),
+    "input-spec": unknown,
+  },
+  ["warning", "input-spec", "input-spec"],
+)
+export const matchManifest = object(
+  {
+    id: string,
+    version: string,
+    main: matchDockerProcedure,
+    assets: object(
+      {
+        assets: string,
+        scripts: string,
+      },
+      ["assets", "scripts"],
+    ),
+    "health-checks": dictionary([
+      string,
+      every(
+        matchProcedure,
+        object({
+          name: string,
+        }),
+      ),
+    ]),
+    config: object({
+      get: matchProcedure,
+      set: matchProcedure,
+    }),
+    properties: matchProcedure,
+    volumes: dictionary([string, matchVolume]),
+    interfaces: dictionary([
+      string,
+      object({
+        name: string,
+        "tor-config": object({}),
+        "lan-config": object({}),
+        ui: boolean,
+        protocols: array(string),
+      }),
+    ]),
+    backup: object({
+      create: matchProcedure,
+      restore: matchProcedure,
+    }),
+    migrations: object({
+      to: dictionary([string, matchProcedure]),
+      from: dictionary([string, matchProcedure]),
+    }),
+    dependencies: dictionary([
+      string,
+      object(
+        {
+          version: string,
+          requirement: some(
+            object({
+              type: literal("opt-in"),
+              how: string,
+            }),
+            object({
+              type: literal("opt-out"),
+              how: string,
+            }),
+            object({
+              type: literal("required"),
+            }),
+          ),
+          description: string,
+          config: object({
+            check: matchProcedure,
+            "auto-configure": matchProcedure,
+          }),
+        },
+        ["description", "config"],
+      ),
+    ]),
+
+    actions: dictionary([string, matchAction]),
+  },
+  ["config", "actions", "properties", "migrations", "dependencies"],
+)
+export type Manifest = typeof matchManifest._TYPE
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchVolume.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchVolume.ts
new file mode 100644
index 000000000..7aa579ecf
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchVolume.ts
@@ -0,0 +1,35 @@
+import { object, literal, string, boolean, some } from "ts-matches"
+
+const matchDataVolume = object(
+  {
+    type: literal("data"),
+    readonly: boolean,
+  },
+  ["readonly"],
+)
+const matchAssetVolume = object({
+  type: literal("assets"),
+})
+const matchPointerVolume = object({
+  type: literal("pointer"),
+  "package-id": string,
+  "volume-id": string,
+  path: string,
+  readonly: boolean,
+})
+const matchCertificateVolume = object({
+  type: literal("certificate"),
+  "interface-id": string,
+})
+const matchBackupVolume = object({
+  type: literal("backup"),
+  readonly: boolean,
+})
+export const matchVolume = some(
+  matchDataVolume,
+  matchAssetVolume,
+  matchPointerVolume,
+  matchCertificateVolume,
+  matchBackupVolume,
+)
+export type Volume = typeof matchVolume._TYPE
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
new file mode 100644
index 000000000..072a1171c
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
@@ -0,0 +1,482 @@
+// deno-lint-ignore no-namespace
+export type ExpectedExports = {
+  version: 2
+  /** Set configuration is called after we have modified and saved the configuration in the embassy ui. Use this to make a file for the docker to read from for configuration.  */
+  setConfig: (effects: Effects, input: Config) => Promise<ResultType<SetResult>>
+  /** Get configuration returns a shape that describes the format that the embassy ui will generate, and later send to the set config  */
+  getConfig: (effects: Effects) => Promise<ResultType<ConfigRes>>
+  /** These are how we make sure the our dependency configurations are valid and if not how to fix them. */
+  dependencies: Dependencies
+  /** For backing up service data though the embassyOS UI */
+  createBackup: (effects: Effects) => Promise<ResultType<unknown>>
+  /** For restoring service data that was previously backed up using the embassyOS UI create backup flow. Backup restores are also triggered via the embassyOS UI, or doing a system restore flow during setup. */
+  restoreBackup: (effects: Effects) => Promise<ResultType<unknown>>
+  /**  Properties are used to get values from the docker, like a username + password, what ports we are hosting from */
+  properties: (effects: Effects) => Promise<ResultType<Properties>>
+  health: {
+    /** Should be the health check id */
+    [id: string]: (
+      effects: Effects,
+      dateMs: number,
+    ) => Promise<ResultType<unknown>>
+  }
+  migration: (
+    effects: Effects,
+    version: string,
+    ...args: unknown[]
+  ) => Promise<ResultType<MigrationRes>>
+  action: {
+    [id: string]: (
+      effects: Effects,
+      config?: Config,
+    ) => Promise<ResultType<ActionResult>>
+  }
+
+  /**
+   * This is the entrypoint for the main container. Used to start up something like the service that the
+   * package represents, like running a bitcoind in a bitcoind-wrapper.
+   */
+  main: (effects: Effects) => Promise<ResultType<unknown>>
+}
+
+/** Used to reach out from the pure js runtime */
+export type Effects = {
+  /** Usable when not sandboxed */
+  writeFile(input: {
+    path: string
+    volumeId: string
+    toWrite: string
+  }): Promise<void>
+  readFile(input: { volumeId: string; path: string }): Promise<string>
+  metadata(input: { volumeId: string; path: string }): Promise<Metadata>
+  /** Create a directory. Usable when not sandboxed */
+  createDir(input: { volumeId: string; path: string }): Promise<string>
+
+  readDir(input: { volumeId: string; path: string }): Promise<string[]>
+  /** Remove a directory. Usable when not sandboxed */
+  removeDir(input: { volumeId: string; path: string }): Promise<string>
+  removeFile(input: { volumeId: string; path: string }): Promise<void>
+
+  /** Write a json file into an object. Usable when not sandboxed */
+  writeJsonFile(input: {
+    volumeId: string
+    path: string
+    toWrite: Record<string, unknown>
+  }): Promise<void>
+
+  /** Read a json file into an object */
+  readJsonFile(input: {
+    volumeId: string
+    path: string
+  }): Promise<Record<string, unknown>>
+
+  runCommand(input: {
+    command: string
+    args?: string[]
+    timeoutMillis?: number
+  }): Promise<ResultType<string>>
+  runDaemon(input: { command: string; args?: string[] }): {
+    wait(): Promise<ResultType<string>>
+    term(): Promise<void>
+  }
+
+  chown(input: { volumeId: string; path: string; uid: string }): Promise<null>
+  chmod(input: { volumeId: string; path: string; mode: string }): Promise<null>
+
+  sleep(timeMs: number): Promise<null>
+
+  /** Log at the trace level */
+  trace(whatToPrint: string): void
+  /** Log at the warn level */
+  warn(whatToPrint: string): void
+  /** Log at the error level */
+  error(whatToPrint: string): void
+  /** Log at the debug level */
+  debug(whatToPrint: string): void
+  /** Log at the info level */
+  info(whatToPrint: string): void
+
+  /** Sandbox mode lets us read but not write */
+  is_sandboxed(): boolean
+
+  exists(input: { volumeId: string; path: string }): Promise<boolean>
+  bindLocal(options: {
+    internalPort: number
+    name: string
+    externalPort: number
+  }): Promise<string>
+  bindTor(options: {
+    internalPort: number
+    name: string
+    externalPort: number
+  }): Promise<string>
+
+  fetch(
+    url: string,
+    options?: {
+      method?: "GET" | "POST" | "PUT" | "DELETE" | "HEAD" | "PATCH"
+      headers?: Record<string, string>
+      body?: string
+    },
+  ): Promise<{
+    method: string
+    ok: boolean
+    status: number
+    headers: Record<string, string>
+    body?: string | null
+    /// Returns the body as a string
+    text(): Promise<string>
+    /// Returns the body as a json
+    json(): Promise<unknown>
+  }>
+
+  runRsync(options: {
+    srcVolume: string
+    dstVolume: string
+    srcPath: string
+    dstPath: string
+    // rsync options: https://linux.die.net/man/1/rsync
+    options: BackupOptions
+  }): {
+    id: () => Promise<string>
+    wait: () => Promise<null>
+    progress: () => Promise<number>
+  }
+}
+
+// rsync options: https://linux.die.net/man/1/rsync
+export type BackupOptions = {
+  delete: boolean
+  force: boolean
+  ignoreExisting: boolean
+  exclude: string[]
+}
+export type Metadata = {
+  fileType: string
+  isDir: boolean
+  isFile: boolean
+  isSymlink: boolean
+  len: number
+  modified?: Date
+  accessed?: Date
+  created?: Date
+  readonly: boolean
+  uid: number
+  gid: number
+  mode: number
+}
+
+export type MigrationRes = {
+  configured: boolean
+}
+
+export type ActionResult = {
+  version: "0"
+  message: string
+  value?: string
+  copyable: boolean
+  qr: boolean
+}
+
+export type ConfigRes = {
+  /** This should be the previous config, that way during set config we start with the previous */
+  config?: Config
+  /** Shape that is describing the form in the ui */
+  spec: ConfigSpec
+}
+export type Config = {
+  [propertyName: string]: unknown
+}
+
+export type ConfigSpec = {
+  /** Given a config value, define what it should render with the following spec */
+  [configValue: string]: ValueSpecAny
+}
+export type WithDefault<T, Default> = T & {
+  default: Default
+}
+export type WithNullableDefault<T, Default> = T & {
+  default?: Default
+}
+
+export type WithDescription<T> = T & {
+  description?: string
+  name: string
+  warning?: string
+}
+
+export type WithOptionalDescription<T> = T & {
+  /** @deprecated - optional only for backwards compatibility */
+  description?: string
+  /** @deprecated - optional only for backwards compatibility */
+  name?: string
+  warning?: string
+}
+
+export type ListSpec<T> = {
+  spec: T
+  range: string
+}
+
+export type Tag<T extends string, V> = V & {
+  type: T
+}
+
+export type Subtype<T extends string, V> = V & {
+  subtype: T
+}
+
+export type Target<T extends string, V> = V & {
+  target: T
+}
+
+export type UniqueBy =
+  | {
+      any: UniqueBy[]
+    }
+  | string
+  | null
+
+export type WithNullable<T> = T & {
+  nullable: boolean
+}
+export type DefaultString =
+  | string
+  | {
+      /** The chars available for the random generation */
+      charset?: string
+      /** Length that we generate to */
+      len: number
+    }
+
+export type ValueSpecString = // deno-lint-ignore ban-types
+  (
+    | {}
+    | {
+        pattern: string
+        "pattern-description": string
+      }
+  ) & {
+    copyable?: boolean
+    masked?: boolean
+    placeholder?: string
+  }
+export type ValueSpecNumber = {
+  /** Something like [3,6] or [0, *) */
+  range?: string
+  integral?: boolean
+  /** Used a description of the units */
+  units?: string
+  placeholder?: number
+}
+export type ValueSpecBoolean = Record<string, unknown>
+export type ValueSpecAny =
+  | Tag<"boolean", WithDescription<WithDefault<ValueSpecBoolean, boolean>>>
+  | Tag<
+      "string",
+      WithDescription<
+        WithNullableDefault<WithNullable<ValueSpecString>, DefaultString>
+      >
+    >
+  | Tag<
+      "number",
+      WithDescription<
+        WithNullableDefault<WithNullable<ValueSpecNumber>, number>
+      >
+    >
+  | Tag<
+      "enum",
+      WithDescription<
+        WithDefault<
+          {
+            values: readonly string[] | string[]
+            "value-names": {
+              [key: string]: string
+            }
+          },
+          string
+        >
+      >
+    >
+  | Tag<"list", ValueSpecList>
+  | Tag<"object", WithDescription<WithNullableDefault<ValueSpecObject, Config>>>
+  | Tag<"union", WithOptionalDescription<WithDefault<ValueSpecUnion, string>>>
+  | Tag<
+      "pointer",
+      WithDescription<
+        | Subtype<
+            "package",
+            | Target<
+                "tor-key",
+                {
+                  "package-id": string
+                  interface: string
+                }
+              >
+            | Target<
+                "tor-address",
+                {
+                  "package-id": string
+                  interface: string
+                }
+              >
+            | Target<
+                "lan-address",
+                {
+                  "package-id": string
+                  interface: string
+                }
+              >
+            | Target<
+                "config",
+                {
+                  "package-id": string
+                  selector: string
+                  multi: boolean
+                }
+              >
+          >
+        | Subtype<"system", Record<string, unknown>>
+      >
+    >
+export type ValueSpecUnion = {
+  /** What tag for the specification, for tag unions */
+  tag: {
+    id: string
+    name: string
+    description?: string
+    "variant-names": {
+      [key: string]: string
+    }
+  }
+  /** The possible enum values */
+  variants: {
+    [key: string]: ConfigSpec
+  }
+  "display-as"?: string
+  "unique-by"?: UniqueBy
+}
+export type ValueSpecObject = {
+  spec: ConfigSpec
+  "display-as"?: string
+  "unique-by"?: UniqueBy
+}
+export type ValueSpecList =
+  | Subtype<
+      "boolean",
+      WithDescription<WithDefault<ListSpec<ValueSpecBoolean>, boolean[]>>
+    >
+  | Subtype<
+      "string",
+      WithDescription<WithDefault<ListSpec<ValueSpecString>, string[]>>
+    >
+  | Subtype<
+      "number",
+      WithDescription<WithDefault<ListSpec<ValueSpecNumber>, number[]>>
+    >
+  | Subtype<
+      "enum",
+      WithDescription<WithDefault<ListSpec<ValueSpecEnum>, string[]>>
+    >
+  | Subtype<
+      "object",
+      WithDescription<
+        WithNullableDefault<
+          ListSpec<ValueSpecObject>,
+          Record<string, unknown>[]
+        >
+      >
+    >
+  | Subtype<
+      "union",
+      WithDescription<WithDefault<ListSpec<ValueSpecUnion>, string[]>>
+    >
+export type ValueSpecEnum = {
+  values: string[]
+  "value-names": { [key: string]: string }
+}
+
+export type SetResult = {
+  /** These are the unix process signals */
+  signal:
+    | "SIGTERM"
+    | "SIGHUP"
+    | "SIGINT"
+    | "SIGQUIT"
+    | "SIGILL"
+    | "SIGTRAP"
+    | "SIGABRT"
+    | "SIGBUS"
+    | "SIGFPE"
+    | "SIGKILL"
+    | "SIGUSR1"
+    | "SIGSEGV"
+    | "SIGUSR2"
+    | "SIGPIPE"
+    | "SIGALRM"
+    | "SIGSTKFLT"
+    | "SIGCHLD"
+    | "SIGCONT"
+    | "SIGSTOP"
+    | "SIGTSTP"
+    | "SIGTTIN"
+    | "SIGTTOU"
+    | "SIGURG"
+    | "SIGXCPU"
+    | "SIGXFSZ"
+    | "SIGVTALRM"
+    | "SIGPROF"
+    | "SIGWINCH"
+    | "SIGIO"
+    | "SIGPWR"
+    | "SIGSYS"
+    | "SIGEMT"
+    | "SIGINFO"
+  "depends-on": DependsOn
+}
+
+export type DependsOn = {
+  [packageId: string]: string[]
+}
+
+export type KnownError =
+  | { error: string }
+  | {
+      "error-code": [number, string] | readonly [number, string]
+    }
+export type ResultType<T> = KnownError | { result: T }
+
+export type PackagePropertiesV2 = {
+  [name: string]: PackagePropertyObject | PackagePropertyString
+}
+export type PackagePropertyString = {
+  type: "string"
+  description?: string
+  value: string
+  /** Let's the ui make this copyable button */
+  copyable?: boolean
+  /** Let the ui create a qr for this field */
+  qr?: boolean
+  /** Hiding the value unless toggled off for field */
+  masked?: boolean
+}
+export type PackagePropertyObject = {
+  value: PackagePropertiesV2
+  type: "object"
+  description: string
+}
+
+export type Properties = {
+  version: 2
+  data: PackagePropertiesV2
+}
+
+export type Dependencies = {
+  /** Id is the id of the package, should be the same as the manifest */
+  [id: string]: {
+    /** Checks are called to make sure that our dependency is in the correct shape. If a known error is returned we know that the dependency needs modification */
+    check(effects: Effects, input: Config): Promise<ResultType<void | null>>
+    /** This is called after we know that the dependency package needs a new configuration, this would be a transform for defaults */
+    autoConfigure(effects: Effects, input: Config): Promise<ResultType<Config>>
+  }
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
new file mode 100644
index 000000000..65a827103
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -0,0 +1,215 @@
+import * as fs from "fs/promises"
+import * as oet from "./oldEmbassyTypes"
+import { Volume } from "../../../Models/Volume"
+import * as child_process from "child_process"
+import { promisify } from "util"
+import { util, Utils } from "@start9labs/start-sdk"
+import { Manifest } from "./matchManifest"
+import { HostSystemStartOs } from "../../HostSystemStartOs"
+import "isomorphic-fetch"
+
+const { createUtils } = util
+
+const execFile = promisify(child_process.execFile)
+
+export class PolyfillEffects implements oet.Effects {
+  private utils: Utils<any, any>
+  constructor(
+    readonly effects: HostSystemStartOs,
+    private manifest: Manifest,
+  ) {
+    this.utils = createUtils(effects as any)
+  }
+  async writeFile(input: {
+    path: string
+    volumeId: string
+    toWrite: string
+  }): Promise<void> {
+    await fs.writeFile(
+      new Volume(input.volumeId, input.path).path,
+      input.toWrite,
+    )
+  }
+  async readFile(input: { volumeId: string; path: string }): Promise<string> {
+    return (
+      await fs.readFile(new Volume(input.volumeId, input.path).path)
+    ).toString()
+  }
+  async metadata(input: {
+    volumeId: string
+    path: string
+  }): Promise<oet.Metadata> {
+    const stats = await fs.stat(new Volume(input.volumeId, input.path).path)
+    return {
+      fileType: stats.isFile() ? "file" : "directory",
+      gid: stats.gid,
+      uid: stats.uid,
+      mode: stats.mode,
+      isDir: stats.isDirectory(),
+      isFile: stats.isFile(),
+      isSymlink: stats.isSymbolicLink(),
+      len: stats.size,
+      readonly: (stats.mode & 0o200) > 0,
+    }
+  }
+  async createDir(input: { volumeId: string; path: string }): Promise<string> {
+    const path = new Volume(input.volumeId, input.path).path
+    await fs.mkdir(path, { recursive: true })
+    return path
+  }
+  async readDir(input: { volumeId: string; path: string }): Promise<string[]> {
+    return fs.readdir(new Volume(input.volumeId, input.path).path)
+  }
+  async removeDir(input: { volumeId: string; path: string }): Promise<string> {
+    const path = new Volume(input.volumeId, input.path).path
+    await fs.rmdir(new Volume(input.volumeId, input.path).path, {
+      recursive: true,
+    })
+    return path
+  }
+  removeFile(input: { volumeId: string; path: string }): Promise<void> {
+    return fs.rm(new Volume(input.volumeId, input.path).path)
+  }
+  async writeJsonFile(input: {
+    volumeId: string
+    path: string
+    toWrite: Record<string, unknown>
+  }): Promise<void> {
+    await fs.writeFile(
+      new Volume(input.volumeId, input.path).path,
+      JSON.stringify(input.toWrite),
+    )
+  }
+  async readJsonFile(input: {
+    volumeId: string
+    path: string
+  }): Promise<Record<string, unknown>> {
+    return JSON.parse(
+      (
+        await fs.readFile(new Volume(input.volumeId, input.path).path)
+      ).toString(),
+    )
+  }
+  runCommand({
+    command,
+    args,
+    timeoutMillis,
+  }: {
+    command: string
+    args?: string[] | undefined
+    timeoutMillis?: number | undefined
+  }): Promise<oet.ResultType<string>> {
+    return this.utils
+      .runCommand(this.manifest.main.image, [command, ...(args || [])], {})
+      .then((x) => ({
+        stderr: x.stderr.toString(),
+        stdout: x.stdout.toString(),
+      }))
+      .then((x) => (!!x.stderr ? { error: x.stderr } : { result: x.stdout }))
+  }
+  runDaemon(input: { command: string; args?: string[] | undefined }): {
+    wait(): Promise<oet.ResultType<string>>
+    term(): Promise<void>
+  } {
+    throw new Error("Method not implemented.")
+  }
+  chown(input: { volumeId: string; path: string; uid: string }): Promise<null> {
+    throw new Error("Method not implemented.")
+  }
+  chmod(input: {
+    volumeId: string
+    path: string
+    mode: string
+  }): Promise<null> {
+    throw new Error("Method not implemented.")
+  }
+  sleep(timeMs: number): Promise<null> {
+    return new Promise((resolve) => setTimeout(resolve, timeMs))
+  }
+  trace(whatToPrint: string): void {
+    console.trace(whatToPrint)
+  }
+  warn(whatToPrint: string): void {
+    console.warn(whatToPrint)
+  }
+  error(whatToPrint: string): void {
+    console.error(whatToPrint)
+  }
+  debug(whatToPrint: string): void {
+    console.debug(whatToPrint)
+  }
+  info(whatToPrint: string): void {
+    console.log(false)
+  }
+  is_sandboxed(): boolean {
+    return false
+  }
+  exists(input: { volumeId: string; path: string }): Promise<boolean> {
+    return this.metadata(input)
+      .then(() => true)
+      .catch(() => false)
+  }
+  bindLocal(options: {
+    internalPort: number
+    name: string
+    externalPort: number
+  }): Promise<string> {
+    throw new Error("Method not implemented.")
+  }
+  bindTor(options: {
+    internalPort: number
+    name: string
+    externalPort: number
+  }): Promise<string> {
+    throw new Error("Method not implemented.")
+  }
+  async fetch(
+    url: string,
+    options?:
+      | {
+          method?:
+            | "GET"
+            | "POST"
+            | "PUT"
+            | "DELETE"
+            | "HEAD"
+            | "PATCH"
+            | undefined
+          headers?: Record<string, string> | undefined
+          body?: string | undefined
+        }
+      | undefined,
+  ): Promise<{
+    method: string
+    ok: boolean
+    status: number
+    headers: Record<string, string>
+    body?: string | null | undefined
+    text(): Promise<string>
+    json(): Promise<unknown>
+  }> {
+    const fetched = await fetch(url, options)
+    return {
+      method: fetched.type,
+      ok: fetched.ok,
+      status: fetched.status,
+      headers: Object.fromEntries(fetched.headers.entries()),
+      body: await fetched.text(),
+      text: () => fetched.text(),
+      json: () => fetched.json(),
+    }
+  }
+  runRsync(options: {
+    srcVolume: string
+    dstVolume: string
+    srcPath: string
+    dstPath: string
+    options: oet.BackupOptions
+  }): {
+    id: () => Promise<string>
+    wait: () => Promise<null>
+    progress: () => Promise<number>
+  } {
+    throw new Error("Method not implemented.")
+  }
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
new file mode 100644
index 000000000..9d2dcd4b8
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -0,0 +1,150 @@
+import { ExecuteResult, System } from "../../Interfaces/System"
+import { unNestPath } from "../../Models/JsonPath"
+import { string } from "ts-matches"
+import { HostSystemStartOs } from "../HostSystemStartOs"
+import { Effects } from "../../Models/Effects"
+const LOCATION = "/usr/lib/startos/package/startos"
+export class SystemForStartOs implements System {
+  private onTerm: (() => Promise<void>) | undefined
+  static of() {
+    return new SystemForStartOs()
+  }
+  constructor() {}
+  async execute(
+    effects: HostSystemStartOs,
+    options: {
+      procedure:
+        | "/init"
+        | "/uninit"
+        | "/main/start"
+        | "/main/stop"
+        | "/config/set"
+        | "/config/get"
+        | "/backup/create"
+        | "/backup/restore"
+        | "/actions/metadata"
+        | `/actions/${string}/get`
+        | `/actions/${string}/run`
+        | `/dependencies/${string}/query`
+        | `/dependencies/${string}/update`
+      input: unknown
+      timeout?: number | undefined
+    },
+  ): Promise<ExecuteResult> {
+    return { ok: await this._execute(effects, options) }
+  }
+  async _execute(
+    effects: Effects,
+    options: {
+      procedure:
+        | "/init"
+        | "/uninit"
+        | "/main/start"
+        | "/main/stop"
+        | "/config/set"
+        | "/config/get"
+        | "/backup/create"
+        | "/backup/restore"
+        | "/actions/metadata"
+        | `/actions/${string}/get`
+        | `/actions/${string}/run`
+        | `/dependencies/${string}/query`
+        | `/dependencies/${string}/update`
+      input: unknown
+      timeout?: number | undefined
+    },
+  ): Promise<unknown> {
+    switch (options.procedure) {
+      case "/init": {
+        const path = `${LOCATION}/procedures/init`
+        const procedure: any = await import(path).catch(() => require(path))
+        const previousVersion = string.optional().unsafeCast(options)
+        return procedure.init({ effects, previousVersion })
+      }
+      case "/uninit": {
+        const path = `${LOCATION}/procedures/init`
+        const procedure: any = await import(path).catch(() => require(path))
+        const nextVersion = string.optional().unsafeCast(options)
+        return procedure.uninit({ effects, nextVersion })
+      }
+      case "/main/start": {
+        const path = `${LOCATION}/procedures/main`
+        const procedure: any = await import(path).catch(() => require(path))
+        const started = async (onTerm: () => Promise<void>) => {
+          await effects.setMainStatus({ status: "running" })
+          if (this.onTerm) await this.onTerm()
+          this.onTerm = onTerm
+        }
+        return procedure.main({ effects, started })
+      }
+      case "/main/stop": {
+        await effects.setMainStatus({ status: "stopped" })
+        if (this.onTerm) await this.onTerm()
+        delete this.onTerm
+        return
+      }
+      case "/config/set": {
+        const path = `${LOCATION}/procedures/config`
+        const procedure: any = await import(path).catch(() => require(path))
+        const input = options.input
+        return procedure.setConfig({ effects, input })
+      }
+      case "/config/get": {
+        const path = `${LOCATION}/procedures/config`
+        const procedure: any = await import(path).catch(() => require(path))
+        return procedure.getConfig({ effects })
+      }
+      case "/backup/create":
+      case "/backup/restore":
+        throw new Error("this should be called with the init/unit")
+      case "/actions/metadata": {
+        const path = `${LOCATION}/procedures/actions`
+        const procedure: any = await import(path).catch(() => require(path))
+        return procedure.actionsMetadata({ effects })
+      }
+      default:
+        const procedures = unNestPath(options.procedure)
+        const id = procedures[2]
+        switch (true) {
+          case procedures[1] === "actions" && procedures[3] === "get": {
+            const path = `${LOCATION}/procedures/actions`
+            const action: any = (await import(path).catch(() => require(path)))
+              .actions[id]
+            if (!action) throw new Error(`Action ${id} not found`)
+            return action.get({ effects })
+          }
+          case procedures[1] === "actions" && procedures[3] === "run": {
+            const path = `${LOCATION}/procedures/actions`
+            const action: any = (await import(path).catch(() => require(path)))
+              .actions[id]
+            if (!action) throw new Error(`Action ${id} not found`)
+            const input = options.input
+            return action.run({ effects, input })
+          }
+          case procedures[1] === "dependencies" && procedures[3] === "query": {
+            const path = `${LOCATION}/procedures/dependencies`
+            const dependencyConfig: any = (
+              await import(path).catch(() => require(path))
+            ).dependencyConfig[id]
+            if (!dependencyConfig)
+              throw new Error(`dependencyConfig ${id} not found`)
+            const localConfig = options.input
+            return dependencyConfig.query({ effects, localConfig })
+          }
+          case procedures[1] === "dependencies" && procedures[3] === "update": {
+            const path = `${LOCATION}/procedures/dependencies`
+            const dependencyConfig: any = (
+              await import(path).catch(() => require(path))
+            ).dependencyConfig[id]
+            if (!dependencyConfig)
+              throw new Error(`dependencyConfig ${id} not found`)
+            return dependencyConfig.update(options.input)
+          }
+        }
+    }
+    throw new Error("Method not implemented.")
+  }
+  exit(effects: Effects): Promise<void> {
+    throw new Error("Method not implemented.")
+  }
+}
diff --git a/container-runtime/src/Adapters/Systems/index.ts b/container-runtime/src/Adapters/Systems/index.ts
new file mode 100644
index 000000000..eadc67318
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/index.ts
@@ -0,0 +1,6 @@
+import { System } from "../../Interfaces/System"
+import { SystemForEmbassy } from "./SystemForEmbassy"
+import { SystemForStartOs } from "./SystemForStartOs"
+export async function getSystem(): Promise<System> {
+  return SystemForEmbassy.of()
+}
diff --git a/container-runtime/src/Interfaces/AllGetDependencies.ts b/container-runtime/src/Interfaces/AllGetDependencies.ts
new file mode 100644
index 000000000..88a200900
--- /dev/null
+++ b/container-runtime/src/Interfaces/AllGetDependencies.ts
@@ -0,0 +1,6 @@
+import { GetDependency } from "./GetDependency"
+import { System } from "./System"
+import { GetHostSystem, HostSystem } from "./HostSystem"
+
+export type AllGetDependencies = GetDependency<"system", Promise<System>> &
+  GetDependency<"hostSystem", GetHostSystem>
diff --git a/container-runtime/src/Interfaces/GetDependency.ts b/container-runtime/src/Interfaces/GetDependency.ts
new file mode 100644
index 000000000..c4bce8733
--- /dev/null
+++ b/container-runtime/src/Interfaces/GetDependency.ts
@@ -0,0 +1,3 @@
+export type GetDependency<K extends string, T> = {
+  [OtherK in K]: () => T
+}
diff --git a/container-runtime/src/Interfaces/HostSystem.ts b/container-runtime/src/Interfaces/HostSystem.ts
new file mode 100644
index 000000000..4e04bbcc8
--- /dev/null
+++ b/container-runtime/src/Interfaces/HostSystem.ts
@@ -0,0 +1,7 @@
+import { types as T } from "@start9labs/start-sdk"
+
+import { CallbackHolder } from "../Models/CallbackHolder"
+import { Effects } from "../Models/Effects"
+
+export type HostSystem = Effects
+export type GetHostSystem = (callbackHolder: CallbackHolder) => HostSystem
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
new file mode 100644
index 000000000..7dcde3c52
--- /dev/null
+++ b/container-runtime/src/Interfaces/System.ts
@@ -0,0 +1,31 @@
+import { types as T } from "@start9labs/start-sdk"
+import { JsonPath } from "../Models/JsonPath"
+import { HostSystemStartOs } from "../Adapters/HostSystemStartOs"
+export type ExecuteResult =
+  | { ok: unknown }
+  | { err: { code: number; message: string } }
+export interface System {
+  // init(effects: Effects): Promise<void>
+  // exit(effects: Effects): Promise<void>
+  // start(effects: Effects): Promise<void>
+  // stop(effects: Effects, options: { timeout: number, signal?: number }): Promise<void>
+
+  execute(
+    effects: T.Effects,
+    options: {
+      procedure: JsonPath
+      input: unknown
+      timeout?: number
+    },
+  ): Promise<ExecuteResult>
+  // sandbox(
+  //   effects: Effects,
+  //   options: {
+  //     procedure: JsonPath
+  //     input: unknown
+  //     timeout?: number
+  //   },
+  // ): Promise<unknown>
+
+  exit(effects: T.Effects): Promise<void>
+}
diff --git a/container-runtime/src/Models/CallbackHolder.ts b/container-runtime/src/Models/CallbackHolder.ts
new file mode 100644
index 000000000..3aa4392ce
--- /dev/null
+++ b/container-runtime/src/Models/CallbackHolder.ts
@@ -0,0 +1,18 @@
+export class CallbackHolder {
+  constructor() {}
+  private root = (Math.random() + 1).toString(36).substring(7)
+  private inc = 0
+  private callbacks = new Map<string, Function>()
+  private newId() {
+    return this.root + (this.inc++).toString(36)
+  }
+  addCallback(callback: Function) {
+    return this.callbacks.set(this.newId(), callback)
+  }
+  callCallback(index: string, args: any[]): Promise<unknown> {
+    const callback = this.callbacks.get(index)
+    if (!callback) throw new Error(`Callback ${index} does not exist`)
+    this.callbacks.delete(index)
+    return Promise.resolve().then(() => callback(...args))
+  }
+}
diff --git a/container-runtime/src/Models/DockerProcedure.ts b/container-runtime/src/Models/DockerProcedure.ts
new file mode 100644
index 000000000..91ae73b5f
--- /dev/null
+++ b/container-runtime/src/Models/DockerProcedure.ts
@@ -0,0 +1,45 @@
+import {
+  object,
+  literal,
+  string,
+  boolean,
+  array,
+  dictionary,
+  literals,
+  number,
+  Parser,
+} from "ts-matches"
+
+const VolumeId = string
+const Path = string
+
+export type VolumeId = string
+export type Path = string
+export const matchDockerProcedure = object(
+  {
+    type: literal("docker"),
+    image: string,
+    system: boolean,
+    entrypoint: string,
+    args: array(string),
+    mounts: dictionary([VolumeId, Path]),
+    "io-format": literals(
+      "json",
+      "json-pretty",
+      "yaml",
+      "cbor",
+      "toml",
+      "toml-pretty",
+    ),
+    "sigterm-timeout": number,
+    inject: boolean,
+  },
+  ["io-format", "sigterm-timeout", "system", "args", "inject", "mounts"],
+  {
+    "sigterm-timeout": 30,
+    inject: false,
+    args: [],
+  },
+)
+
+export type DockerProcedure = typeof matchDockerProcedure._TYPE
diff --git a/container-runtime/src/Models/Effects.ts b/container-runtime/src/Models/Effects.ts
new file mode 100644
index 000000000..757d51238
--- /dev/null
+++ b/container-runtime/src/Models/Effects.ts
@@ -0,0 +1,5 @@
+import { types as T } from "@start9labs/start-sdk"
+
+export type Effects = T.Effects & {
+  setMainStatus(o: { status: "running" | "stopped" }): Promise<void>
+}
diff --git a/container-runtime/src/Models/JsonPath.ts b/container-runtime/src/Models/JsonPath.ts
new file mode 100644
index 000000000..627eb3be2
--- /dev/null
+++ b/container-runtime/src/Models/JsonPath.ts
@@ -0,0 +1,42 @@
+import { literals, some, string } from "ts-matches"
+
+type NestedPath<A extends string, B extends string> = `/${A}/${string}/${B}`
+type NestedPaths =
+  | NestedPath<"actions", "run" | "get">
+  | NestedPath<"dependencies", "query" | "update">
+// prettier-ignore
+type UnNestPaths<A> = 
+  A extends `${infer A}/${infer B}` ? [...UnNestPaths<A>, ... UnNestPaths<B>] : 
+  [A]
+
+export function unNestPath<A extends string>(a: A): UnNestPaths<A> {
+  return a.split("/") as UnNestPaths<A>
+}
+function isNestedPath(path: string): path is NestedPaths {
+  const paths = path.split("/")
+  if (paths.length !== 4) return false
+  if (paths[1] === "action" && (paths[3] === "run" || paths[3] === "get"))
+    return true
+  if (
+    paths[1] === "dependencyConfig" &&
+    (paths[3] === "query" || paths[3] === "update")
+  )
+    return true
+  return false
+}
+export const jsonPath = some(
+  literals(
+    "/init",
+    "/uninit",
+    "/main/start",
+    "/main/stop",
+    "/config/set",
+    "/config/get",
+    "/backup/create",
+    "/backup/restore",
+    "/actions/metadata",
+  ),
+  string.refine(isNestedPath, "isNestedPath"),
+)
+
+export type JsonPath = typeof jsonPath._TYPE
diff --git a/container-runtime/src/Models/Volume.ts b/container-runtime/src/Models/Volume.ts
new file mode 100644
index 000000000..ebf013b68
--- /dev/null
+++ b/container-runtime/src/Models/Volume.ts
@@ -0,0 +1,19 @@
+import * as fs from "node:fs/promises"
+
+export class Volume {
+  readonly path: string
+  constructor(
+    readonly volumeId: string,
+    _path = "",
+  ) {
+    const path = (this.path = `/media/startos/volumes/${volumeId}${
+      !_path ? "" : `/${_path}`
+    }`)
+  }
+  async exists() {
+    return fs.stat(this.path).then(
+      () => true,
+      () => false,
+    )
+  }
+}
diff --git a/container-runtime/initSrc/index.ts b/container-runtime/src/index.ts
similarity index 65%
rename from container-runtime/initSrc/index.ts
rename to container-runtime/src/index.ts
index 8621daa5e..d86111ecb 100644
--- a/container-runtime/initSrc/index.ts
+++ b/container-runtime/src/index.ts
@@ -1,6 +1,15 @@
-import { Runtime } from "./Runtime"
-
-new Runtime()
+import { RpcListener } from "./Adapters/RpcListener"
+import { SystemForEmbassy } from "./Adapters/Systems/SystemForEmbassy"
+import { HostSystemStartOs } from "./Adapters/HostSystemStartOs"
+import { AllGetDependencies } from "./Interfaces/AllGetDependencies"
+import { getSystem } from "./Adapters/Systems"
+
+const getDependencies: AllGetDependencies = {
+  system: getSystem,
+  hostSystem: () => HostSystemStartOs.of,
+}
+
+new RpcListener(getDependencies)
 
 /**
 
diff --git a/container-runtime/tsconfig.json b/container-runtime/tsconfig.json
index 3af74fc39..fd93d5154 100644
--- a/container-runtime/tsconfig.json
+++ b/container-runtime/tsconfig.json
@@ -2,20 +2,25 @@
   "include": [
     "./**/*.mjs",
     "./**/*.js",
-    "initSrc/Runtime.ts",
-    "initSrc/index.ts",
+    "src/Adapters/RpcListener.ts",
+    "src/index.ts",
     "effects.ts"
   ],
-  "exclude": [],
-  "inputs": ["./lib/index.ts"],
+  "exclude": ["dist"],
+  "inputs": ["./src/index.ts"],
   "compilerOptions": {
-    "target": "es2022",
-    "module": "es2022",
-    "moduleResolution": "node",
-    "allowJs": true,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
+    "module": "Node16",
     "strict": true,
+    "outDir": "dist",
+    "preserveConstEnums": true,
+    "sourceMap": true,
+    "target": "ES2022",
+    "pretty": true,
+    "declaration": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "types": ["node"],
+    "moduleResolution": "Node16",
     "skipLibCheck": true
   },
   "ts-node": {
diff --git a/container-runtime/update-image.sh b/container-runtime/update-image.sh
new file mode 100755
index 000000000..64ca503cf
--- /dev/null
+++ b/container-runtime/update-image.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -e
+
+
+
+if mountpoint tmp/combined; then sudo umount tmp/combined; fi
+if mountpoint tmp/lower; then sudo umount tmp/lower; fi
+mkdir -p tmp/lower tmp/upper tmp/work tmp/combined
+sudo mount alpine.squashfs tmp/lower
+sudo mount -t overlay -olowerdir=tmp/lower,upperdir=tmp/upper,workdir=tmp/work overlay tmp/combined
+
+QEMU=
+if [ "$ARCH" != "$(uname -m)" ]; then
+    QEMU=/usr/bin/qemu-${ARCH}-static
+    sudo cp $(which qemu-$ARCH-static) tmp/combined${QEMU}
+fi
+
+echo "nameserver 8.8.8.8" | sudo tee tmp/combined/etc/resolv.conf # TODO - delegate to host resolver?
+sudo chroot tmp/combined $QEMU /sbin/apk add nodejs
+sudo mkdir -p tmp/combined/usr/lib/startos/
+sudo rsync -a --copy-unsafe-links dist/ tmp/combined/usr/lib/startos/init/
+sudo cp containerRuntime.rc tmp/combined/etc/init.d/containerRuntime
+sudo cp ../core/target/$ARCH-unknown-linux-musl/release/containerbox tmp/combined/usr/bin/start-cli
+sudo chmod +x tmp/combined/etc/init.d/containerRuntime
+sudo chroot tmp/combined $QEMU /sbin/rc-update add containerRuntime default
+
+if [ -n "$QEMU" ]; then
+    sudo rm tmp/combined${QEMU}
+fi
+
+sudo truncate -s 0 tmp/combined/etc/resolv.conf
+sudo chown -R 0:0 tmp/combined
+rm -f ../build/lib/container-runtime/rootfs.squashfs
+mkdir -p ../build/lib/container-runtime
+sudo mksquashfs tmp/combined ../build/lib/container-runtime/rootfs.squashfs
+sudo umount tmp/combined
+sudo umount tmp/lower
+sudo rm -rf tmp
\ No newline at end of file
diff --git a/core/Cargo.lock b/core/Cargo.lock
index dec795cf2..ec677308d 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -2,16 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.21.0"
@@ -33,7 +23,7 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cipher 0.3.0",
  "cpufeatures",
  "ctr",
@@ -46,19 +36,19 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
- "cfg-if 1.0.0",
- "getrandom 0.2.11",
+ "cfg-if",
+ "getrandom 0.2.12",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -110,19 +100,58 @@ dependencies = [
 ]
 
 [[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "anstream"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
 dependencies = [
- "winapi",
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "arrayref"
@@ -145,19 +174,6 @@ dependencies = [
  "term",
 ]
 
-[[package]]
-name = "ast_node"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24"
-dependencies = [
- "pmutil",
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.39",
-]
-
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -171,9 +187,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2"
+checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c"
 dependencies = [
  "brotli",
  "flate2",
@@ -202,18 +218,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -225,6 +241,16 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "atomic-write-file"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436"
+dependencies = [
+ "nix 0.27.1",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -243,28 +269,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
-name = "avahi-sys"
-version = "0.10.0"
-source = "git+https://github.com/Start9Labs/avahi-sys?branch=feature/dynamic-linking#12bef9e435cfb0d36cb229b9d08e2114c176ea7a"
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
- "bindgen",
- "libc",
+ "async-trait",
+ "axum-core 0.3.4",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper",
+ "tower",
+ "tower-layer",
+ "tower-service",
 ]
 
 [[package]]
 name = "axum"
-version = "0.6.20"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
 dependencies = [
  "async-trait",
- "axum-core",
- "bitflags 1.3.2",
+ "axum-core 0.4.3",
+ "base64 0.21.7",
  "bytes",
  "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.1.0",
+ "hyper-util",
  "itoa",
  "matchit",
  "memchr",
@@ -273,10 +320,17 @@ dependencies = [
  "pin-project-lite",
  "rustversion",
  "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sha1",
  "sync_wrapper",
+ "tokio",
+ "tokio-tungstenite",
  "tower",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -288,14 +342,54 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http",
- "http-body",
+ "http 0.2.11",
+ "http-body 0.4.6",
  "mime",
  "rustversion",
  "tower-layer",
  "tower-service",
 ]
 
+[[package]]
+name = "axum-core"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-server"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ad46c3ec4e12f4a4b6835e173ba21c25e484c9d02b49770bf006ce5367c036"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.1.0",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower",
+ "tower-service",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.69"
@@ -304,7 +398,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -331,9 +425,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -343,24 +437,15 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "basic-cookies"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38"
+checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7"
 dependencies = [
  "lalrpop",
  "lalrpop-util",
  "regex",
 ]
 
-[[package]]
-name = "better_scoped_tls"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de"
-dependencies = [
- "scoped-tls",
-]
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -370,30 +455,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.55.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b13ce559e6433d360c26305643803cb52cfbabbc2b9c47ce04a58493dfb443"
-dependencies = [
- "bitflags 1.3.2",
- "cexpr",
- "cfg-if 0.1.10",
- "clang-sys",
- "clap 2.34.0",
- "env_logger 0.7.1",
- "lazy_static",
- "lazycell",
- "log",
- "peeking_take_while",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "which 3.1.1",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -417,9 +478,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 dependencies = [
  "serde",
 ]
@@ -462,7 +523,7 @@ dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "constant_time_eq",
 ]
 
@@ -532,28 +593,13 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.0.84"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cexpr"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
-dependencies = [
- "nom 5.1.3",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -562,9 +608,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -572,7 +618,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -581,14 +627,14 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
 dependencies = [
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
 name = "ciborium"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -597,18 +643,18 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
- "half",
+ "half 2.3.1",
 ]
 
 [[package]]
@@ -631,44 +677,52 @@ dependencies = [
 ]
 
 [[package]]
-name = "clang-sys"
-version = "1.6.1"
+name = "clap"
+version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
- "glob",
- "libc",
- "libloading",
+ "atty",
+ "bitflags 1.3.2",
+ "clap_lex 0.2.4",
+ "indexmap 1.9.3",
+ "strsim",
+ "termcolor",
+ "textwrap",
 ]
 
 [[package]]
 name = "clap"
-version = "2.34.0"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim 0.8.0",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
+ "clap_builder",
+ "clap_derive",
 ]
 
 [[package]]
-name = "clap"
-version = "3.2.25"
+name = "clap_builder"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_lex",
- "indexmap 1.9.3",
- "strsim 0.10.0",
- "termcolor",
- "textwrap 0.16.0",
+ "anstream",
+ "anstyle",
+ "clap_lex 0.6.0",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -680,6 +734,12 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+
 [[package]]
 name = "color-eyre"
 version = "0.6.2"
@@ -697,9 +757,9 @@ dependencies = [
 
 [[package]]
 name = "color-spantrace"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
 dependencies = [
  "once_cell",
  "owo-colors",
@@ -707,26 +767,32 @@ dependencies = [
  "tracing-error",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "concurrent-queue"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
+checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -753,7 +819,7 @@ dependencies = [
  "crossbeam-utils",
  "futures-task",
  "hdrhistogram",
- "humantime 2.1.0",
+ "humantime",
  "prost-types",
  "serde",
  "serde_json",
@@ -768,9 +834,9 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const_format"
@@ -798,28 +864,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
-[[package]]
-name = "container-init"
-version = "0.1.0"
-dependencies = [
- "async-stream",
- "color-eyre",
- "futures",
- "helpers",
- "imbl",
- "nix 0.27.1",
- "procfs",
- "serde",
- "serde_json",
- "tokio",
- "tokio-stream",
- "tracing",
- "tracing-error",
- "tracing-futures",
- "tracing-subscriber",
- "yajrc 0.1.0 (git+https://github.com/dr-bonez/yajrc.git?branch=develop)",
-]
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -903,9 +947,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -913,15 +957,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
@@ -947,36 +991,57 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
 dependencies = [
- "cfg-if 1.0.0",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
 dependencies = [
- "cfg-if 1.0.0",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "crossterm"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
+dependencies = [
+ "bitflags 2.4.2",
+ "crossterm_winapi",
+ "futures-core",
+ "libc",
+ "mio",
+ "parking_lot",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
 dependencies = [
- "cfg-if 1.0.0",
+ "winapi",
 ]
 
 [[package]]
@@ -987,9 +1052,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28f85c3514d2a6e64160359b45a3918c3b4178bcbf4ae5d03ab2d02e521c479a"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -1009,9 +1074,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-mac"
-version = "0.11.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
 dependencies = [
  "generic-array",
  "subtle",
@@ -1072,13 +1137,13 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
  "platforms",
- "rustc_version 0.4.0",
+ "rustc_version",
  "subtle",
  "zeroize",
 ]
@@ -1091,7 +1156,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1114,8 +1179,8 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
- "syn 2.0.39",
+ "strsim",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1126,201 +1191,46 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if 1.0.0",
- "hashbrown 0.14.2",
- "lock_api",
- "once_cell",
- "parking_lot_core",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
-name = "data-url"
-version = "0.3.0"
+name = "der"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
 
 [[package]]
-name = "debugid"
-version = "0.8.0"
+name = "deranged"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
+ "powerfmt",
  "serde",
- "uuid",
 ]
 
 [[package]]
-name = "deno-proc-macro-rules"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f"
-dependencies = [
- "deno-proc-macro-rules-macros",
- "proc-macro2",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "deno-proc-macro-rules-macros"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3047b312b7451e3190865713a4dd6e1f821aed614ada219766ebc3024a690435"
-dependencies = [
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "deno_ast"
-version = "0.29.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a8adb6aeb787db71d015d8e9f63f6e004eeb09c86babb4ded00878be18619b1"
-dependencies = [
- "anyhow",
- "base64 0.13.1",
- "deno_media_type",
- "dprint-swc-ext",
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_config_macro",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_codegen_macros",
- "swc_ecma_loader",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_transforms_proposal",
- "swc_ecma_transforms_react",
- "swc_ecma_transforms_typescript",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_eq_ignore_macros",
- "swc_macros_common",
- "swc_visit",
- "swc_visit_macros",
- "text_lines",
- "url",
-]
-
-[[package]]
-name = "deno_core"
-version = "0.222.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13c81b9ea8462680e7b77088a44fc36390bab3dbfa5a205a285e11b64e0919c"
-dependencies = [
- "anyhow",
- "bytes",
- "deno_ops",
- "deno_unsync",
- "futures",
- "indexmap 2.1.0",
- "libc",
- "log",
- "once_cell",
- "parking_lot",
- "pin-project",
- "serde",
- "serde_json",
- "serde_v8",
- "smallvec",
- "sourcemap 7.0.1",
- "tokio",
- "url",
- "v8",
-]
-
-[[package]]
-name = "deno_media_type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a798670c20308e5770cc0775de821424ff9e85665b602928509c8c70430b3ee0"
-dependencies = [
- "data-url",
- "serde",
- "url",
-]
-
-[[package]]
-name = "deno_ops"
-version = "0.98.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf89da1a3e50ff7c89956495b53d9bcad29e1f1b3f3d2bc54cad7155f55419c4"
-dependencies = [
- "deno-proc-macro-rules",
- "lazy-regex",
- "once_cell",
- "pmutil",
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "regex",
- "strum",
- "strum_macros",
- "syn 2.0.39",
- "thiserror",
-]
-
-[[package]]
-name = "deno_unsync"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a8f3722afd50e566ecfc783cc8a3a046bc4dd5eb45007431dfb2776aeb8993"
-dependencies = [
- "tokio",
-]
-
-[[package]]
-name = "der"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
-dependencies = [
- "const-oid",
- "pem-rfc7468",
- "zeroize",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
-dependencies = [
- "powerfmt",
- "serde",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
+name = "derive_more"
+version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.0",
+ "rustc_version",
  "syn 1.0.109",
 ]
 
@@ -1357,7 +1267,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "dirs-sys-next",
 ]
 
@@ -1384,22 +1294,6 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
-[[package]]
-name = "dprint-swc-ext"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0a2492465344a58a37ae119de59e81fe5a2885f2711c7b5048ef0dfa14ce42"
-dependencies = [
- "bumpalo",
- "num-bigint",
- "rustc-hash",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "text_lines",
-]
-
 [[package]]
 name = "drain"
 version = "0.1.1"
@@ -1417,15 +1311,15 @@ checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
 
 [[package]]
 name = "ecdsa"
-version = "0.16.8"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
  "der",
  "digest 0.10.7",
  "elliptic-curve",
  "rfc6979",
- "signature 2.0.0",
+ "signature 2.2.0",
  "spki",
 ]
 
@@ -1446,7 +1340,7 @@ checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
  "serde",
- "signature 2.0.0",
+ "signature 2.2.0",
 ]
 
 [[package]]
@@ -1465,16 +1359,17 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
+checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
  "curve25519-dalek 4.1.1",
  "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
+ "subtle",
  "zeroize",
 ]
 
@@ -1489,9 +1384,9 @@ dependencies = [
 
 [[package]]
 name = "elliptic-curve"
-version = "0.13.6"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct",
  "crypto-bigint",
@@ -1514,7 +1409,7 @@ source = "git+https://github.com/Start9Labs/emver-rs.git#61cf0bc96711b4d6f3f30df
 dependencies = [
  "either",
  "fp-core",
- "nom 7.1.3",
+ "nom",
  "serde",
 ]
 
@@ -1545,7 +1440,7 @@ version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1557,33 +1452,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
-dependencies = [
- "humantime 2.1.0",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1594,12 +1463,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1608,7 +1477,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "home",
  "windows-sys 0.48.0",
 ]
@@ -1621,9 +1490,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "eyre"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799"
 dependencies = [
  "indenter",
  "once_cell",
@@ -1656,20 +1525,20 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd"
+checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
 
 [[package]]
 name = "filetime"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1728,9 +1597,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -1744,28 +1613,6 @@ dependencies = [
  "itertools 0.8.2",
 ]
 
-[[package]]
-name = "from_variant"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f"
-dependencies = [
- "pmutil",
- "proc-macro2",
- "swc_macros_common",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "fslock"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57eafdd0c16f57161105ae1b98a1238f97645f2f588438b2949c99a2af9616bf"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1774,9 +1621,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1789,9 +1636,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1799,15 +1646,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1827,38 +1674,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1889,33 +1736,27 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "gpt"
@@ -1923,7 +1764,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8283e7331b8c93b9756e0cfdbcfb90312852f953c6faf9bf741e684cc3b6ad69"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "crc",
  "log",
  "uuid",
@@ -1942,17 +1783,36 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
- "indexmap 1.9.3",
+ "http 0.2.11",
+ "indexmap 2.1.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 1.0.0",
+ "indexmap 2.1.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1965,6 +1825,16 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
+[[package]]
+name = "half"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1977,16 +1847,16 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.7",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.7",
  "allocator-api2",
 ]
 
@@ -1996,19 +1866,19 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
 name = "hdrhistogram"
-version = "7.5.3"
+version = "7.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5b38e5c02b7c7be48c8dc5217c4f1634af2ea221caae2e024bffc7a7651c691"
+checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
  "byteorder",
  "flate2",
- "nom 7.1.3",
+ "nom",
  "num-traits",
 ]
 
@@ -2030,12 +1900,12 @@ dependencies = [
  "lazy_async_pool",
  "models",
  "pin-project",
+ "rpc-toolkit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_json",
  "tokio",
  "tokio-stream",
  "tracing",
- "yajrc 0.1.0 (git+https://github.com/dr-bonez/yajrc.git?branch=develop)",
 ]
 
 [[package]]
@@ -2049,9 +1919,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
 
 [[package]]
 name = "hex"
@@ -2067,9 +1937,9 @@ checksum = "85ef6b41c333e6dd2a4aaa59125a19b633cd17e7aaf372b2260809777bcdef4a"
 
 [[package]]
 name = "hkdf"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac 0.12.1",
 ]
@@ -2095,11 +1965,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.5"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2113,14 +1983,48 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.11",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.0.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
 dependencies = [
  "bytes",
- "http",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
  "pin-project-lite",
 ]
 
@@ -2136,15 +2040,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
-
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -2153,35 +2048,54 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.24",
+ "http 0.2.11",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.2",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "hyper-timeout"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper",
+ "hyper 0.14.28",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2194,34 +2108,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper",
+ "hyper 0.14.28",
  "native-tls",
  "tokio",
  "tokio-native-tls",
 ]
 
 [[package]]
-name = "hyper-ws-listener"
-version = "0.3.0"
+name = "hyper-util"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbfe4981e45b0a7403a55d4af12f8d30e173e722409658c3857243990e72180"
+checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67"
 dependencies = [
- "anyhow",
- "base64 0.21.5",
- "env_logger 0.10.1",
- "futures",
- "hyper",
- "log",
- "sha-1",
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "hyper 1.1.0",
+ "pin-project-lite",
+ "socket2",
  "tokio",
- "tokio-tungstenite",
+ "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.58"
+version = "0.1.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2278,10 +2193,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "if_chain"
-version = "1.0.2"
+name = "idna"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
 
 [[package]]
 name = "imbl"
@@ -2299,9 +2218,9 @@ dependencies = [
 
 [[package]]
 name = "imbl-sized-chunks"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076"
+checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63"
 dependencies = [
  "bitmaps",
 ]
@@ -2309,7 +2228,7 @@ dependencies = [
 [[package]]
 name = "imbl-value"
 version = "0.1.0"
-source = "git+https://github.com/Start9Labs/imbl-value.git#929395141c3a882ac366c12ac9402d0ebaa2201b"
+source = "git+https://github.com/Start9Labs/imbl-value.git#48dc39a762a3b4f9300d3b9f850cbd394e777ae0"
 dependencies = [
  "imbl",
  "serde",
@@ -2361,7 +2280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
  "serde",
 ]
 
@@ -2394,7 +2313,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -2407,17 +2326,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi 0.3.3",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.9.0"
@@ -2437,28 +2345,15 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "is-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e"
-dependencies = [
- "Inflector",
- "pmutil",
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
 [[package]]
 name = "is-terminal"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
 dependencies = [
- "hermit-abi 0.3.3",
- "rustix 0.38.21",
- "windows-sys 0.48.0",
+ "hermit-abi 0.3.4",
+ "rustix",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2498,11 +2393,20 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jaq-core"
@@ -2544,12 +2448,12 @@ dependencies = [
 
 [[package]]
 name = "josekit"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5754487a088f527b1407df470db8e654e4064dccbbe1fe850e0773721e9962b7"
+checksum = "cd20997283339a19226445db97d632c8dc7adb6b8172537fe0e9e540fb141df2"
 dependencies = [
  "anyhow",
- "base64 0.21.5",
+ "base64 0.21.7",
  "flate2",
  "once_cell",
  "openssl",
@@ -2562,9 +2466,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2602,18 +2506,18 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
 
 [[package]]
 name = "lalrpop"
-version = "0.19.12"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b"
+checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
 dependencies = [
  "ascii-canvas",
  "bit-set",
@@ -2623,8 +2527,9 @@ dependencies = [
  "itertools 0.10.5",
  "lalrpop-util",
  "petgraph",
+ "pico-args",
  "regex",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.7.5",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -2633,34 +2538,11 @@ dependencies = [
 
 [[package]]
 name = "lalrpop-util"
-version = "0.19.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed"
-dependencies = [
- "regex",
-]
-
-[[package]]
-name = "lazy-regex"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c"
-dependencies = [
- "lazy-regex-proc_macros",
- "once_cell",
- "regex",
-]
-
-[[package]]
-name = "lazy-regex-proc_macros"
-version = "3.1.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b"
+checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
 dependencies = [
- "proc-macro2",
- "quote",
  "regex",
- "syn 2.0.39",
 ]
 
 [[package]]
@@ -2673,6 +2555,12 @@ dependencies = [
  "futures",
 ]
 
+[[package]]
+name = "lazy_format"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e479e99b287d578ed5f6cd4c92cdf48db219088adb9c5b14f7c155b71dfba792"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -2682,27 +2570,11 @@ dependencies = [
  "spin 0.5.2",
 ]
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "libc"
-version = "0.2.150"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi",
-]
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libm"
@@ -2716,16 +2588,16 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "libc",
  "redox_syscall 0.4.1",
 ]
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2734,15 +2606,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
@@ -2800,15 +2666,15 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "digest 0.10.7",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memoffset"
@@ -2851,11 +2717,12 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
  "libc",
+ "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
@@ -2864,19 +2731,20 @@ dependencies = [
 name = "models"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "color-eyre",
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek 2.1.0",
  "emver",
  "ipnet",
  "lazy_static",
  "mbrman",
+ "num_enum",
  "openssl",
  "patch-db",
  "rand 0.8.5",
  "regex",
  "reqwest",
- "rpc-toolkit",
+ "rpc-toolkit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_json",
  "sqlx",
@@ -2929,7 +2797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
  "bitflags 1.3.2",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "memoffset 0.6.5",
 ]
@@ -2941,7 +2809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags 1.3.2",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "memoffset 0.7.1",
  "pin-utils",
@@ -2953,21 +2821,11 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.1",
- "cfg-if 1.0.0",
+ "bitflags 2.4.2",
+ "cfg-if",
  "libc",
 ]
 
-[[package]]
-name = "nom"
-version = "5.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b"
-dependencies = [
- "memchr",
- "version_check",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -3011,8 +2869,6 @@ dependencies = [
  "autocfg",
  "num-integer",
  "num-traits",
- "rand 0.8.5",
- "serde",
 ]
 
 [[package]]
@@ -3090,29 +2946,29 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 2.0.0",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3123,18 +2979,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
@@ -3148,7 +3004,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c75a0ec2d1b302412fb503224289325fcc0e44600176864804c7211b055cfd58"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "byteorder",
  "md-5",
  "sha2 0.10.8",
@@ -3157,12 +3013,12 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.59"
+version = "0.10.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33"
+checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
 dependencies = [
- "bitflags 2.4.1",
- "cfg-if 1.0.0",
+ "bitflags 2.4.2",
+ "cfg-if",
  "foreign-types",
  "libc",
  "once_cell",
@@ -3178,7 +3034,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3189,18 +3045,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.1.6+3.1.4"
+version = "300.2.1+3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
+checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.95"
+version = "0.9.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9"
+checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
 dependencies = [
  "cc",
  "libc",
@@ -3251,6 +3107,20 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
+[[package]]
+name = "p521"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2"
+dependencies = [
+ "base16ct",
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "rand_core 0.6.4",
+ "sha2 0.10.8",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -3267,7 +3137,7 @@ version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall 0.4.1",
  "smallvec",
@@ -3321,12 +3191,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -3337,12 +3201,6 @@ dependencies = [
  "hmac 0.12.1",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -3354,9 +3212,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
@@ -3368,41 +3226,6 @@ dependencies = [
  "indexmap 2.1.0",
 ]
 
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_macros",
- "phf_shared",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.10.0"
@@ -3412,24 +3235,30 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3467,32 +3296,21 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
 
 [[package]]
 name = "platforms"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0"
-
-[[package]]
-name = "pmutil"
-version = "0.6.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
+checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
 
 [[package]]
 name = "portable-atomic"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
 
 [[package]]
 name = "powerfmt"
@@ -3528,62 +3346,31 @@ dependencies = [
 
 [[package]]
 name = "primeorder"
-version = "0.13.3"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
 dependencies = [
  "elliptic-curve",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "2.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.20.7",
+ "toml_edit 0.21.0",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "procfs"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f"
-dependencies = [
- "bitflags 1.3.2",
- "byteorder",
- "chrono",
- "flate2",
- "hex",
- "lazy_static",
- "rustix 0.36.17",
-]
-
 [[package]]
 name = "proptest"
 version = "1.4.0"
@@ -3592,7 +3379,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -3617,9 +3404,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
+checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -3627,22 +3414,22 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
+checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
 dependencies = [
  "anyhow",
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
+checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
 dependencies = [
  "prost",
 ]
@@ -3653,15 +3440,6 @@ version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
 
-[[package]]
-name = "psm"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "publicsuffix"
 version = "2.2.3"
@@ -3680,9 +3458,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -3752,7 +3530,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
 ]
 
 [[package]]
@@ -3797,15 +3575,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -3821,20 +3590,20 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
+ "regex-automata 0.4.5",
  "regex-syntax 0.8.2",
 ]
 
@@ -3849,9 +3618,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3864,6 +3633,12 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -3872,21 +3647,21 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "cookie 0.16.2",
  "cookie_store 0.16.2",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.24",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
  "hyper-tls",
  "ipnet",
  "js-sys",
@@ -3937,12 +3712,12 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.5"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
- "getrandom 0.2.11",
+ "getrandom 0.2.12",
  "libc",
  "spin 0.9.8",
  "untrusted",
@@ -3962,24 +3737,53 @@ dependencies = [
 
 [[package]]
 name = "rpc-toolkit"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5353673ffd8265292281141560d2b851e4da49e83e2f5e255fd473736d45ee10"
+checksum = "c48252a30abb9426a3239fa8dfd2c8dd2647bb24db0b6145db2df04ae53fe647"
 dependencies = [
  "clap 3.2.25",
  "futures",
- "hyper",
+ "hyper 0.14.28",
  "lazy_static",
  "openssl",
  "reqwest",
- "rpc-toolkit-macro",
+ "rpc-toolkit-macro 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_cbor 0.11.2",
  "serde_json",
  "thiserror",
  "tokio",
  "url",
- "yajrc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yajrc",
+]
+
+[[package]]
+name = "rpc-toolkit"
+version = "0.2.3"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#8d714d09a327249f16f77a8f5a160a2b7cfbf380"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum 0.7.4",
+ "clap 4.4.18",
+ "futures",
+ "http 1.0.0",
+ "http-body-util",
+ "imbl-value",
+ "itertools 0.12.0",
+ "lazy_format",
+ "lazy_static",
+ "openssl",
+ "pin-project",
+ "reqwest",
+ "rpc-toolkit-macro 0.2.2 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "url",
+ "yajrc",
 ]
 
 [[package]]
@@ -3989,7 +3793,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8e4b9cb00baf2d61bcd35e98d67dcb760382a3b4540df7e63b38d053c8a7b8b"
 dependencies = [
  "proc-macro2",
- "rpc-toolkit-macro-internals",
+ "rpc-toolkit-macro-internals 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rpc-toolkit-macro"
+version = "0.2.2"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#8d714d09a327249f16f77a8f5a160a2b7cfbf380"
+dependencies = [
+ "proc-macro2",
+ "rpc-toolkit-macro-internals 0.2.2 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
  "syn 1.0.109",
 ]
 
@@ -4005,11 +3819,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "rsa"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d"
-dependencies = [
+name = "rpc-toolkit-macro-internals"
+version = "0.2.2"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#8d714d09a327249f16f77a8f5a160a2b7cfbf380"
+dependencies = [
+ "itertools 0.12.0",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+dependencies = [
  "const-oid",
  "digest 0.10.7",
  "num-bigint-dig",
@@ -4019,7 +3844,7 @@ dependencies = [
  "pkcs8",
  "rand_core 0.6.4",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
  "spki",
  "subtle",
  "zeroize",
@@ -4037,11 +3862,11 @@ dependencies = [
 
 [[package]]
 name = "rust-argon2"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e71971821b3ae0e769e4a4328dbcb517607b434db7697e9aba17203ec14e46a"
+checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "blake2b_simd",
  "constant_time_eq",
 ]
@@ -4052,67 +3877,51 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.20",
+ "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.17"
+version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "errno",
- "io-lifetimes",
  "libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.45.0",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "rustix"
-version = "0.38.21"
+name = "rustls"
+version = "0.21.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
 dependencies = [
- "bitflags 2.4.1",
- "errno",
- "libc",
- "linux-raw-sys 0.4.11",
- "windows-sys 0.48.0",
+ "ring",
+ "rustls-webpki 0.101.7",
+ "sct",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.8"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
+checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki",
- "sct",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.1",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -4121,9 +3930,15 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
 ]
 
+[[package]]
+name = "rustls-pki-types"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -4134,6 +3949,17 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@@ -4152,27 +3978,37 @@ dependencies = [
  "wait-timeout",
 ]
 
+[[package]]
+name = "rustyline-async"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca4447465ceb8c01c253cc81660b242547c58e4a59c85b13294a6e70de8b9e"
+dependencies = [
+ "crossterm",
+ "futures-channel",
+ "futures-util",
+ "pin-project",
+ "thingbuf",
+ "thiserror",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -4228,33 +4064,18 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
 dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
@@ -4268,20 +4089,11 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_bytes"
-version = "0.11.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_cbor"
 version = "0.11.1"
 dependencies = [
- "half",
+ "half 1.8.2",
  "serde",
 ]
 
@@ -4291,26 +4103,26 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
- "half",
+ "half 1.8.2",
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed"
 dependencies = [
  "indexmap 2.1.0",
  "itoa",
@@ -4318,11 +4130,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c"
+dependencies = [
+ "itoa",
+ "serde",
+]
+
 [[package]]
 name = "serde_spanned"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
  "serde",
 ]
@@ -4339,29 +4161,13 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_v8"
-version = "0.131.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cafa16d0a4288d75925351bb54d06d2e830118ad3fad393947bb11f91b18f3"
-dependencies = [
- "bytes",
- "derive_more",
- "num-bigint",
- "serde",
- "serde_bytes",
- "smallvec",
- "thiserror",
- "v8",
-]
-
 [[package]]
 name = "serde_with"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "chrono",
  "hex",
  "indexmap 1.9.3",
@@ -4374,21 +4180,21 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.27"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
+checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38"
 dependencies = [
  "indexmap 2.1.0",
  "itoa",
@@ -4397,24 +4203,13 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.7",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.7",
 ]
@@ -4426,7 +4221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
  "opaque-debug",
@@ -4438,7 +4233,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.7",
 ]
@@ -4465,10 +4260,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "shlex"
-version = "0.1.1"
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
+checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+dependencies = [
+ "libc",
+ "mio",
+ "signal-hook",
+]
 
 [[package]]
 name = "signal-hook-registry"
@@ -4487,9 +4303,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
 [[package]]
 name = "signature"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
  "rand_core 0.6.4",
@@ -4523,39 +4339,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
-
-[[package]]
-name = "smartstring"
-version = "1.0.1"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
-dependencies = [
- "autocfg",
- "static_assertions",
- "version_check",
-]
-
-[[package]]
-name = "snapshot_creator"
-version = "0.1.0"
-dependencies = [
- "dashmap",
- "deno_ast",
- "deno_core",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "socket2"
@@ -4567,38 +4353,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "sourcemap"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90"
-dependencies = [
- "data-encoding",
- "debugid",
- "if_chain",
- "rustc_version 0.2.3",
- "serde",
- "serde_json",
- "unicode-id",
- "url",
-]
-
-[[package]]
-name = "sourcemap"
-version = "7.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10da010a590ed2fa9ca8467b00ce7e9c5a8017742c0c09c45450efc172208c4b"
-dependencies = [
- "data-encoding",
- "debugid",
- "if_chain",
- "rustc_version 0.2.3",
- "serde",
- "serde_json",
- "unicode-id",
- "url",
-]
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -4616,9 +4370,9 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
  "der",
@@ -4626,20 +4380,20 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85"
+checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
 dependencies = [
- "itertools 0.11.0",
- "nom 7.1.3",
+ "itertools 0.12.0",
+ "nom",
  "unicode_categories",
 ]
 
 [[package]]
 name = "sqlx"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33"
+checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -4650,11 +4404,11 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
+checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.7",
  "atoi",
  "byteorder",
  "bytes",
@@ -4677,7 +4431,7 @@ dependencies = [
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls",
+ "rustls 0.21.10",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -4694,9 +4448,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec"
+checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4707,10 +4461,11 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc"
+checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841"
 dependencies = [
+ "atomic-write-file",
  "dotenvy",
  "either",
  "heck",
@@ -4733,13 +4488,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
+checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4"
 dependencies = [
  "atoi",
- "base64 0.21.5",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.4.2",
  "byteorder",
  "bytes",
  "chrono",
@@ -4776,13 +4531,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
+checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24"
 dependencies = [
  "atoi",
- "base64 0.21.5",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.4.2",
  "byteorder",
  "chrono",
  "crc",
@@ -4816,9 +4571,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f"
+checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490"
 dependencies = [
  "atoi",
  "chrono",
@@ -4835,6 +4590,7 @@ dependencies = [
  "sqlx-core",
  "tracing",
  "url",
+ "urlencoding",
 ]
 
 [[package]]
@@ -4859,8 +4615,8 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex-syntax 0.6.29",
- "strsim 0.10.0",
- "syn 2.0.39",
+ "strsim",
+ "syn 2.0.48",
  "unicode-width",
 ]
 
@@ -4887,43 +4643,25 @@ dependencies = [
 
 [[package]]
 name = "ssh-key"
-version = "0.6.2"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2180b3bc4955efd5661a97658d3cf4c8107e0d132f619195afe9486c13cca313"
+checksum = "01f8f4ea73476c0aa5d5e6a75ce1e8634e2c3f82005ef3bbed21547ac57f2bf7"
 dependencies = [
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek 2.1.0",
  "p256",
  "p384",
+ "p521",
  "rand_core 0.6.4",
  "rsa",
  "sec1",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
  "ssh-cipher",
  "ssh-encoding",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "stacker"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
-dependencies = [
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "psm",
- "winapi",
-]
-
 [[package]]
 name = "start-os"
 version = "0.3.5-rev.1"
@@ -4932,20 +4670,20 @@ dependencies = [
  "async-compression",
  "async-stream",
  "async-trait",
- "avahi-sys",
+ "axum 0.7.4",
+ "axum-server",
  "base32",
- "base64 0.21.5",
+ "base64 0.21.7",
  "base64ct",
  "basic-cookies",
  "blake3",
  "bytes",
  "chrono",
  "ciborium",
- "clap 3.2.25",
+ "clap 4.4.18",
  "color-eyre",
  "console",
  "console-subscriber",
- "container-init",
  "cookie 0.18.0",
  "cookie_store 0.20.0",
  "current_platform",
@@ -4953,540 +4691,144 @@ dependencies = [
  "divrem",
  "ed25519 2.2.3",
  "ed25519-dalek 1.0.1",
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek 2.1.0",
  "emver",
  "fd-lock-rs",
  "futures",
  "gpt",
- "helpers",
- "hex",
- "hmac 0.12.1",
- "http",
- "hyper",
- "hyper-ws-listener",
- "imbl",
- "imbl-value",
- "include_dir",
- "indexmap 2.1.0",
- "indicatif",
- "integer-encoding",
- "ipnet",
- "iprange",
- "isocountry",
- "itertools 0.11.0",
- "jaq-core",
- "jaq-std",
- "josekit",
- "jsonpath_lib",
- "lazy_static",
- "libc",
- "log",
- "mbrman",
- "models",
- "new_mime_guess",
- "nix 0.27.1",
- "nom 7.1.3",
- "num",
- "num_enum",
- "openssh-keys",
- "openssl",
- "p256",
- "patch-db",
- "pbkdf2",
- "pin-project",
- "pkcs8",
- "prettytable-rs",
- "proptest",
- "proptest-derive",
- "rand 0.8.5",
- "regex",
- "reqwest",
- "reqwest_cookie_store",
- "rpassword",
- "rpc-toolkit",
- "rust-argon2",
- "scopeguard",
- "semver 1.0.20",
- "serde",
- "serde_json",
- "serde_with",
- "serde_yaml",
- "sha2 0.10.8",
- "simple-logging",
- "sqlx",
- "sscanf",
- "ssh-key",
- "stderrlog",
- "tar",
- "thiserror",
- "tokio",
- "tokio-rustls",
- "tokio-socks",
- "tokio-stream",
- "tokio-tar",
- "tokio-tungstenite",
- "tokio-util",
- "toml 0.8.8",
- "torut",
- "tracing",
- "tracing-error",
- "tracing-futures",
- "tracing-journald",
- "tracing-subscriber",
- "trust-dns-server",
- "typed-builder",
- "url",
- "urlencoding",
- "uuid",
- "zeroize",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "stderrlog"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b"
-dependencies = [
- "atty",
- "chrono",
- "log",
- "termcolor",
- "thread_local",
-]
-
-[[package]]
-name = "string_cache"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot",
- "phf_shared",
- "precomputed-hash",
- "serde",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "string_enum"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252"
-dependencies = [
- "pmutil",
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "stringprep"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
-dependencies = [
- "finl_unicode",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strum"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "swc_atoms"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f54563d7dcba626d4acfe14ed12def7ecc28e004debe3ecd2c3ee07cc47e449"
-dependencies = [
- "once_cell",
- "rustc-hash",
- "serde",
- "string_cache",
- "string_cache_codegen",
- "triomphe",
-]
-
-[[package]]
-name = "swc_common"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cb7fcd56655c8ae7dcf2344f0be6cbff4d9c7cb401fe3ec8e56e1de8dfe582"
-dependencies = [
- "ast_node",
- "better_scoped_tls",
- "cfg-if 1.0.0",
- "either",
- "from_variant",
- "new_debug_unreachable",
- "num-bigint",
- "once_cell",
- "rustc-hash",
- "serde",
- "siphasher",
- "sourcemap 6.4.1",
- "string_cache",
- "swc_atoms",
- "swc_eq_ignore_macros",
- "swc_visit",
- "tracing",
- "unicode-width",
- "url",
-]
-
-[[package]]
-name = "swc_config"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba1c7a40d38f9dd4e9a046975d3faf95af42937b34b2b963be4d8f01239584b"
-dependencies = [
- "indexmap 1.9.3",
- "serde",
- "serde_json",
- "swc_config_macro",
-]
-
-[[package]]
-name = "swc_config_macro"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829"
-dependencies = [
- "pmutil",
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "swc_ecma_ast"
-version = "0.109.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc2286cedd688a68f214faa1c19bb5cceab7c9c54d0cbe3273e4c1704e38f69"
-dependencies = [
- "bitflags 2.4.1",
- "is-macro",
- "num-bigint",
- "scoped-tls",
- "serde",
- "string_enum",
- "swc_atoms",
- "swc_common",
- "unicode-id",
-]
-
-[[package]]
-name = "swc_ecma_codegen"
-version = "0.144.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e62ba2c0ed1f119fc1a76542d007f1b2c12854d54dea15f5491363227debe11"
-dependencies = [
- "memchr",
- "num-bigint",
- "once_cell",
- "rustc-hash",
- "serde",
- "sourcemap 6.4.1",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_codegen_macros",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_codegen_macros"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384"
-dependencies = [
- "pmutil",
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "swc_ecma_loader"
-version = "0.44.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d7c322462657ae27ac090a2c89f7e456c94416284a2f5ecf66c43a6a3c19d1"
-dependencies = [
- "anyhow",
- "pathdiff",
- "serde",
- "swc_common",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_parser"
-version = "0.139.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eab46cb863bc5cd61535464e07e5b74d5f792fa26a27b9f6fd4c8daca9903b7"
-dependencies = [
- "either",
- "num-bigint",
- "num-traits",
- "serde",
- "smallvec",
- "smartstring",
- "stacker",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "tracing",
- "typed-arena",
-]
-
-[[package]]
-name = "swc_ecma_transforms_base"
-version = "0.132.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ffd4a8149052bfc1ec1832fcbe04f317846ce635a49ec438df33b06db27d26"
-dependencies = [
- "better_scoped_tls",
- "bitflags 2.4.1",
- "indexmap 1.9.3",
- "once_cell",
- "phf",
- "rustc-hash",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_classes"
-version = "0.121.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4b7fee0e2c6f12456d2aefb2418f2f26529b995945d493e1dce35a5a22584fc"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_macros"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8188eab297da773836ef5cf2af03ee5cca7a563e1be4b146f8141452c28cc690"
-dependencies = [
- "pmutil",
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "swc_ecma_transforms_proposal"
-version = "0.166.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122fd9a69f464694edefbf9c59106b3c15e5cc8cb8575a97836e4fb79018e98f"
-dependencies = [
- "either",
- "rustc-hash",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_react"
-version = "0.178.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "675b5c755b0448268830e85e59429095d3423c0ce4a850b209c6f0eeab069f63"
-dependencies = [
- "base64 0.13.1",
- "dashmap",
- "indexmap 1.9.3",
+ "helpers",
+ "hex",
+ "hmac 0.12.1",
+ "http 1.0.0",
+ "imbl",
+ "imbl-value",
+ "include_dir",
+ "indexmap 2.1.0",
+ "indicatif",
+ "integer-encoding",
+ "ipnet",
+ "iprange",
+ "isocountry",
+ "itertools 0.12.0",
+ "jaq-core",
+ "jaq-std",
+ "josekit",
+ "jsonpath_lib",
+ "lazy_async_pool",
+ "lazy_format",
+ "lazy_static",
+ "libc",
+ "log",
+ "mbrman",
+ "models",
+ "new_mime_guess",
+ "nix 0.27.1",
+ "nom",
+ "num",
+ "num_enum",
  "once_cell",
+ "openssh-keys",
+ "openssl",
+ "p256",
+ "patch-db",
+ "pbkdf2",
+ "pin-project",
+ "pkcs8",
+ "prettytable-rs",
+ "proptest",
+ "proptest-derive",
+ "rand 0.8.5",
+ "regex",
+ "reqwest",
+ "reqwest_cookie_store",
+ "rpassword",
+ "rpc-toolkit 0.2.3 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
+ "rust-argon2",
+ "rustyline-async",
+ "semver",
  "serde",
- "sha-1",
- "string_enum",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_typescript"
-version = "0.182.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eba97b1ea71739fcf278aedad4677a3cacb52288a3f3566191b70d16a889de6"
-dependencies = [
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_react",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_utils"
-version = "0.122.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11006a3398ffd4693c4d3b0a1b1a5030edbdc04228159f5301120a6178144708"
-dependencies = [
- "indexmap 1.9.3",
- "num_cpus",
- "once_cell",
- "rustc-hash",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_visit",
+ "serde_json",
+ "serde_with",
+ "serde_yaml",
+ "sha2 0.10.8",
+ "shell-words",
+ "simple-logging",
+ "sqlx",
+ "sscanf",
+ "ssh-key",
+ "stderrlog",
+ "tar",
+ "thiserror",
+ "tokio",
+ "tokio-rustls",
+ "tokio-socks",
+ "tokio-stream",
+ "tokio-tar",
+ "tokio-tungstenite",
+ "tokio-util",
+ "toml 0.8.8",
+ "torut",
  "tracing",
- "unicode-id",
+ "tracing-error",
+ "tracing-futures",
+ "tracing-journald",
+ "tracing-subscriber",
+ "trust-dns-server",
+ "typed-builder",
+ "url",
+ "urlencoding",
+ "uuid",
+ "zeroize",
 ]
 
 [[package]]
-name = "swc_ecma_visit"
-version = "0.95.0"
+name = "stderrlog"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f628ec196e76e67892441e14eef2e423a738543d32bffdabfeec20c29582117"
+checksum = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b"
 dependencies = [
- "num-bigint",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_visit",
- "tracing",
+ "atty",
+ "chrono",
+ "log",
+ "termcolor",
+ "thread_local",
 ]
 
 [[package]]
-name = "swc_eq_ignore_macros"
-version = "0.1.2"
+name = "string_cache"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
 dependencies = [
- "pmutil",
- "proc-macro2",
- "quote",
- "syn 2.0.39",
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot",
+ "phf_shared",
+ "precomputed-hash",
 ]
 
 [[package]]
-name = "swc_macros_common"
-version = "0.3.8"
+name = "stringprep"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832"
+checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
 dependencies = [
- "pmutil",
- "proc-macro2",
- "quote",
- "syn 2.0.39",
+ "finl_unicode",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
-name = "swc_visit"
-version = "0.5.7"
+name = "strsim"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87c337fbb2d191bf371173dea6a957f01899adb8f189c6c31b122a6cfc98fc3"
-dependencies = [
- "either",
- "swc_visit_macros",
-]
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
-name = "swc_visit_macros"
-version = "0.5.8"
+name = "subtle"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99"
-dependencies = [
- "Inflector",
- "pmutil",
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.39",
-]
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
@@ -5501,9 +4843,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5551,20 +4893,20 @@ checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
 dependencies = [
  "filetime",
  "libc",
- "xattr 1.0.1",
+ "xattr 1.3.1",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
  "redox_syscall 0.4.1",
- "rustix 0.38.21",
- "windows-sys 0.48.0",
+ "rustix",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5588,47 +4930,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "text_lines"
-version = "0.6.0"
+name = "textwrap"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf"
-dependencies = [
- "serde",
-]
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
-name = "textwrap"
-version = "0.11.0"
+name = "thingbuf"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+checksum = "4706f1bfb859af03f099ada2de3cea3e515843c2d3e93b7893f16d94a37f9415"
 dependencies = [
- "unicode-width",
+ "parking_lot",
+ "pin-project",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5648,15 +4982,15 @@ version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
 dependencies = [
  "deranged",
  "itoa",
@@ -5674,9 +5008,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
 dependencies = [
  "time-core",
 ]
@@ -5707,9 +5041,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5719,7 +5053,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2",
  "tokio-macros",
  "tracing",
  "windows-sys 0.48.0",
@@ -5743,7 +5077,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5758,11 +5092,12 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls",
+ "rustls 0.22.2",
+ "rustls-pki-types",
  "tokio",
 ]
 
@@ -5806,9 +5141,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
+checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
 dependencies = [
  "futures-util",
  "log",
@@ -5878,17 +5213,6 @@ dependencies = [
  "winnow",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.20.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
-dependencies = [
- "indexmap 2.1.0",
- "toml_datetime",
- "winnow",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.21.0"
@@ -5910,13 +5234,13 @@ checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum",
- "base64 0.21.5",
+ "axum 0.6.20",
+ "base64 0.21.7",
  "bytes",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.24",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -6001,7 +5325,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -6083,16 +5407,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "triomphe"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f"
-dependencies = [
- "serde",
- "stable_deref_trait",
-]
-
 [[package]]
 name = "trust-dns-proto"
 version = "0.23.2"
@@ -6100,7 +5414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
 dependencies = [
  "async-trait",
- "cfg-if 1.0.0",
+ "cfg-if",
  "data-encoding",
  "enum-as-inner",
  "futures-channel",
@@ -6126,7 +5440,7 @@ checksum = "c540f73c2b2ec2f6c54eabd0900e7aafb747a820224b742f556e8faabb461bc7"
 dependencies = [
  "async-trait",
  "bytes",
- "cfg-if 1.0.0",
+ "cfg-if",
  "drain",
  "enum-as-inner",
  "futures-executor",
@@ -6142,20 +5456,20 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "tungstenite"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
 dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http",
+ "http 1.0.0",
  "httparse",
  "log",
  "native-tls",
@@ -6166,30 +5480,24 @@ dependencies = [
  "utf-8",
 ]
 
-[[package]]
-name = "typed-arena"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
-
 [[package]]
 name = "typed-builder"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c6a006a6d3d6a6f143fda41cf4d1ad35110080687628c9f2117bd3cc7924f3"
+checksum = "444d8748011b93cb168770e8092458cb0f8854f931ff82fdf6ddfbd72a9c933e"
 dependencies = [
  "typed-builder-macro",
 ]
 
 [[package]]
 name = "typed-builder-macro"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fa054ee5e2346187d631d2f1d1fd3b33676772d6d03a2d84e1c5213b31674ee"
+checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -6215,15 +5523,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-
-[[package]]
-name = "unicode-id"
-version = "0.3.4"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
@@ -6266,9 +5568,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
 
 [[package]]
 name = "untrusted"
@@ -6278,12 +5580,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 0.4.0",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
@@ -6301,24 +5603,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
-name = "uuid"
-version = "1.5.0"
+name = "utf8parse"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
-dependencies = [
- "getrandom 0.2.11",
-]
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
-name = "v8"
-version = "0.79.2"
+name = "uuid"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15561535230812a1db89a696f1f16a12ae6c2c370c6b2241c68d4cb33963faf"
+checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
- "bitflags 1.3.2",
- "fslock",
- "once_cell",
- "which 4.4.2",
+ "getrandom 0.2.12",
 ]
 
 [[package]]
@@ -6333,12 +5629,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -6377,36 +5667,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.38"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
+checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -6414,9 +5704,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6424,22 +5714,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
 name = "wasm-streams"
@@ -6456,9 +5746,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6466,33 +5756,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
-dependencies = [
- "rustls-webpki",
-]
-
-[[package]]
-name = "which"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "which"
-version = "4.4.2"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix 0.38.21",
-]
+checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
 
 [[package]]
 name = "whoami"
@@ -6533,20 +5799,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -6559,18 +5816,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.42.2"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -6589,10 +5840,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+name = "windows-targets"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
@@ -6601,10 +5861,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -6613,10 +5873,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
+name = "windows_aarch64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -6625,10 +5885,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+name = "windows_i686_gnu"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -6637,10 +5897,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+name = "windows_i686_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -6649,10 +5909,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+name = "windows_x86_64_gnu"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -6661,10 +5921,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -6672,11 +5932,17 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "winnow"
-version = "0.5.19"
+version = "0.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
+checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d"
 dependencies = [
  "memchr",
 ]
@@ -6687,7 +5953,7 @@ version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
@@ -6711,29 +5977,20 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.0.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
+ "linux-raw-sys",
+ "rustix",
 ]
 
 [[package]]
 name = "yajrc"
-version = "0.1.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40687b4c165cb760e35730055c8840f36897e7c98099b2d3d66ba8cb624c79a"
-dependencies = [
- "anyhow",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "yajrc"
-version = "0.1.0"
-source = "git+https://github.com/dr-bonez/yajrc.git?branch=develop#72a22f7ac2197d7a5cdce4be601cf20e5280eec5"
+checksum = "ce7af47ad983c2f8357333ef87d859e66deb7eef4bf6f9e1ae7b5e99044a48bf"
 dependencies = [
  "anyhow",
  "serde",
@@ -6747,7 +6004,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f355ab62ebe30b758c1f4ab096a306722c4b7dbfb9d8c07d18c70d71a945588"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.7",
  "hashbrown 0.13.2",
  "lazy_static",
  "serde",
@@ -6755,29 +6012,29 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.25"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.25"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 dependencies = [
  "zeroize_derive",
 ]
@@ -6790,5 +6047,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.48",
 ]
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 143a830fc..5b6823df2 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
 
-members = ["container-init", "helpers", "models", "snapshot-creator", "startos"]
+members = ["helpers", "models", "startos"]
diff --git a/core/README.md b/core/README.md
index 7a4be62a1..76f4d4c86 100644
--- a/core/README.md
+++ b/core/README.md
@@ -8,9 +8,6 @@
 ## Structure
 
 - `startos`: This contains the core library for StartOS that supports building `startbox`.
-- `container-init` (ignore: deprecated)
-- `js-engine`: This contains the library required to build `deno` to support running `.js` maintainer scripts for v0.3
-- `snapshot-creator`: This contains a binary used to build `v8` runtime snapshots, required for initializing `start-deno`
 - `helpers`: This contains utility functions used across both `startos` and `js-engine`
 - `models`: This contains types that are shared across `startos`, `js-engine`, and `helpers`
 
@@ -24,8 +21,6 @@ several different names for different behaviour:
   `startd` and control it similarly to the UI
 - `start-sdk`: This is a CLI tool that aids in building and packaging services
   you wish to deploy to StartOS
-- `start-deno`: This is a CLI tool invoked by startd to run `.js` maintainer scripts for v0.3
-- `avahi-alias`: This is a CLI tool invoked by startd to create aliases in `avahi` for mDNS
 
 ## Questions
 
diff --git a/core/build-prod.sh b/core/build-prod.sh
index 214429727..0588384dc 100755
--- a/core/build-prod.sh
+++ b/core/build-prod.sh
@@ -18,22 +18,22 @@ cd ..
 FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
 RUSTFLAGS=""
 
-alias 'rust-gnu-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/usr/local/cargo/registry -v "$(pwd)":/home/rust/src -w /home/rust/src -P start9/rust-arm-cross:aarch64'
-alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
+	RUSTFLAGS="--cfg tokio_unstable"
+fi
+
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
 
 set +e
 fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-gnu-builder sh -c "(cd core && cargo build --release --features avahi-alias,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-gnu)"; then 
+if ! rust-musl-builder sh -c "(cd core && cargo build --release $(if [ -n "$FEATURES" ]; then echo "--features $FEATURES"; fi) --locked --bin startbox --target=$ARCH-unknown-linux-musl)"; then 
+	fail=true
+fi
+if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl)"; then 
 	fail=true
 fi
-for ARCH in x86_64 aarch64
-do
-	if ! rust-musl-builder sh -c "(cd core && cargo build --release --locked --bin container-init)"; then 
-		fail=true
-	fi
-done
 set -e
 cd core
 
diff --git a/core/build-v8-snapshot.sh b/core/build-v8-snapshot.sh
deleted file mode 100755
index 58ff27c79..000000000
--- a/core/build-v8-snapshot.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# Reason for this being is that we need to create a snapshot for the deno runtime. It wants to pull 3 files from build, and during the creation it gets embedded, but for some 
-# reason during the actual runtime it is looking for them. So this will create a docker in arm that creates the snaphot needed for the arm
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-set -e
-shopt -s expand_aliases
-
-if [ -z "$ARCH" ]; then
-	ARCH=$(uname -m)
-fi
-
-USE_TTY=
-if tty -s; then
-	USE_TTY="-it"
-fi
-
-alias 'rust-gnu-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/usr/local/cargo/registry -v "$(pwd)":/home/rust/src -w /home/rust/src -P start9/rust-arm-cross:aarch64'
-
-echo "Building "
-cd ..
-rust-gnu-builder sh -c "(cd core/ && cargo build -p snapshot_creator --release --target=${ARCH}-unknown-linux-gnu)"
-cd -
-
-if [ "$ARCH" = "aarch64" ]; then
-	DOCKER_ARCH='arm64/v8'
-elif [ "$ARCH" = "x86_64" ]; then
-	DOCKER_ARCH='amd64'
-fi
-
-echo "Creating Arm v8 Snapshot"
-docker run  $USE_TTY --platform "linux/${DOCKER_ARCH}" --mount type=bind,src=$(pwd),dst=/mnt ubuntu:22.04 /bin/sh -c "cd /mnt && /mnt/target/${ARCH}-unknown-linux-gnu/release/snapshot_creator"
-sudo chown -R $USER target
-sudo chown -R $USER ~/.cargo
-sudo chown $USER JS_SNAPSHOT.bin
-sudo chmod 0644 JS_SNAPSHOT.bin
-
-sudo mv -f JS_SNAPSHOT.bin ./js-engine/src/artifacts/JS_SNAPSHOT.${ARCH}.bin
\ No newline at end of file
diff --git a/core/container-init/Cargo.toml b/core/container-init/Cargo.toml
deleted file mode 100644
index 8229973d7..000000000
--- a/core/container-init/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-name = "container-init"
-version = "0.1.0"
-edition = "2021"
-rust = "1.66"
-
-[features]
-dev = []
-metal = []
-sound = []
-unstable = []
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-[dependencies]
-async-stream = "0.3"
-# cgroups-rs = "0.2"
-color-eyre = "0.6"
-futures = "0.3"
-serde = { version = "1", features = ["derive", "rc"] }
-serde_json = "1"
-helpers = { path = "../helpers" }
-imbl = "2"
-nix = { version = "0.27", features = ["process", "signal"] }
-tokio = { version = "1", features = ["full"] }
-tokio-stream = { version = "0.1", features = ["io-util", "sync", "net"] }
-tracing = "0.1"
-tracing-error = "0.2"
-tracing-futures = "0.2"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-yajrc = { version = "*", git = "https://github.com/dr-bonez/yajrc.git", branch = "develop" }
-
-[target.'cfg(target_os = "linux")'.dependencies]
-procfs = "0.15"
-
-[profile.test]
-opt-level = 3
-
-[profile.dev.package.backtrace]
-opt-level = 3
diff --git a/core/container-init/src/lib.rs b/core/container-init/src/lib.rs
deleted file mode 100644
index 63d3380a7..000000000
--- a/core/container-init/src/lib.rs
+++ /dev/null
@@ -1,214 +0,0 @@
-use nix::unistd::Pid;
-use serde::{Deserialize, Serialize, Serializer};
-use yajrc::RpcMethod;
-
-/// Know what the process is called
-#[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ProcessId(pub u32);
-impl From<ProcessId> for Pid {
-    fn from(pid: ProcessId) -> Self {
-        Pid::from_raw(pid.0 as i32)
-    }
-}
-impl From<Pid> for ProcessId {
-    fn from(pid: Pid) -> Self {
-        ProcessId(pid.as_raw() as u32)
-    }
-}
-impl From<i32> for ProcessId {
-    fn from(pid: i32) -> Self {
-        ProcessId(pid as u32)
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ProcessGroupId(pub u32);
-
-#[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[serde(rename_all = "kebab-case")]
-pub enum OutputStrategy {
-    Inherit,
-    Collect,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct RunCommand;
-impl Serialize for RunCommand {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        Serialize::serialize(Self.as_str(), serializer)
-    }
-}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct RunCommandParams {
-    pub gid: Option<ProcessGroupId>,
-    pub command: String,
-    pub args: Vec<String>,
-    pub output: OutputStrategy,
-}
-impl RpcMethod for RunCommand {
-    type Params = RunCommandParams;
-    type Response = ProcessId;
-    fn as_str<'a>(&'a self) -> &'a str {
-        "command"
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum LogLevel {
-    Trace(String),
-    Warn(String),
-    Error(String),
-    Info(String),
-    Debug(String),
-}
-impl LogLevel {
-    pub fn trace(&self) {
-        match self {
-            LogLevel::Trace(x) => tracing::trace!("{}", x),
-            LogLevel::Warn(x) => tracing::warn!("{}", x),
-            LogLevel::Error(x) => tracing::error!("{}", x),
-            LogLevel::Info(x) => tracing::info!("{}", x),
-            LogLevel::Debug(x) => tracing::debug!("{}", x),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct Log;
-impl Serialize for Log {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        Serialize::serialize(Self.as_str(), serializer)
-    }
-}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct LogParams {
-    pub gid: Option<ProcessGroupId>,
-    pub level: LogLevel,
-}
-impl RpcMethod for Log {
-    type Params = LogParams;
-    type Response = ();
-    fn as_str<'a>(&'a self) -> &'a str {
-        "log"
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct ReadLineStdout;
-impl Serialize for ReadLineStdout {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        Serialize::serialize(Self.as_str(), serializer)
-    }
-}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ReadLineStdoutParams {
-    pub pid: ProcessId,
-}
-impl RpcMethod for ReadLineStdout {
-    type Params = ReadLineStdoutParams;
-    type Response = String;
-    fn as_str<'a>(&'a self) -> &'a str {
-        "read-line-stdout"
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct ReadLineStderr;
-impl Serialize for ReadLineStderr {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        Serialize::serialize(Self.as_str(), serializer)
-    }
-}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ReadLineStderrParams {
-    pub pid: ProcessId,
-}
-impl RpcMethod for ReadLineStderr {
-    type Params = ReadLineStderrParams;
-    type Response = String;
-    fn as_str<'a>(&'a self) -> &'a str {
-        "read-line-stderr"
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct Output;
-impl Serialize for Output {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        Serialize::serialize(Self.as_str(), serializer)
-    }
-}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OutputParams {
-    pub pid: ProcessId,
-}
-impl RpcMethod for Output {
-    type Params = OutputParams;
-    type Response = String;
-    fn as_str<'a>(&'a self) -> &'a str {
-        "output"
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct SendSignal;
-impl Serialize for SendSignal {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        Serialize::serialize(Self.as_str(), serializer)
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SendSignalParams {
-    pub pid: ProcessId,
-    pub signal: u32,
-}
-impl RpcMethod for SendSignal {
-    type Params = SendSignalParams;
-    type Response = ();
-    fn as_str<'a>(&'a self) -> &'a str {
-        "signal"
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct SignalGroup;
-impl Serialize for SignalGroup {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        Serialize::serialize(Self.as_str(), serializer)
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SignalGroupParams {
-    pub gid: ProcessGroupId,
-    pub signal: u32,
-}
-impl RpcMethod for SignalGroup {
-    type Params = SignalGroupParams;
-    type Response = ();
-    fn as_str<'a>(&'a self) -> &'a str {
-        "signal-group"
-    }
-}
diff --git a/core/container-init/src/main.rs b/core/container-init/src/main.rs
deleted file mode 100644
index 997537808..000000000
--- a/core/container-init/src/main.rs
+++ /dev/null
@@ -1,428 +0,0 @@
-use std::collections::BTreeMap;
-use std::ops::DerefMut;
-use std::os::unix::process::ExitStatusExt;
-use std::process::Stdio;
-use std::sync::Arc;
-
-use container_init::{
-    LogParams, OutputParams, OutputStrategy, ProcessGroupId, ProcessId, RunCommandParams,
-    SendSignalParams, SignalGroupParams,
-};
-use futures::StreamExt;
-use helpers::NonDetachingJoinHandle;
-use nix::errno::Errno;
-use nix::sys::signal::Signal;
-use serde::{Deserialize, Serialize};
-use serde_json::json;
-use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
-use tokio::process::{Child, Command};
-use tokio::select;
-use tokio::sync::{watch, Mutex};
-use yajrc::{Id, RpcError};
-
-/// Outputs embedded in the JSONRpc output of the executable.
-#[derive(Debug, Clone, Serialize)]
-#[serde(untagged)]
-enum Output {
-    Command(ProcessId),
-    ReadLineStdout(String),
-    ReadLineStderr(String),
-    Output(String),
-    Log,
-    Signal,
-    SignalGroup,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "method", content = "params", rename_all = "kebab-case")]
-enum Input {
-    /// Run a new command, with the args
-    Command(RunCommandParams),
-    /// Want to log locall on the service rather than the eos
-    Log(LogParams),
-    // /// Get a line of stdout from the command
-    // ReadLineStdout(ReadLineStdoutParams),
-    // /// Get a line of stderr from the command
-    // ReadLineStderr(ReadLineStderrParams),
-    /// Get output of command
-    Output(OutputParams),
-    /// Send the sigterm to the process
-    Signal(SendSignalParams),
-    /// Signal a group of processes
-    SignalGroup(SignalGroupParams),
-}
-
-#[derive(Deserialize)]
-struct IncomingRpc {
-    id: Id,
-    #[serde(flatten)]
-    input: Input,
-}
-
-struct ChildInfo {
-    gid: Option<ProcessGroupId>,
-    child: Arc<Mutex<Option<Child>>>,
-    output: Option<InheritOutput>,
-}
-
-struct InheritOutput {
-    _thread: NonDetachingJoinHandle<()>,
-    stdout: watch::Receiver<String>,
-    stderr: watch::Receiver<String>,
-}
-
-struct HandlerMut {
-    processes: BTreeMap<ProcessId, ChildInfo>,
-    // groups: BTreeMap<ProcessGroupId, Cgroup>,
-}
-
-#[derive(Clone)]
-struct Handler {
-    children: Arc<Mutex<HandlerMut>>,
-}
-impl Handler {
-    fn new() -> Self {
-        Handler {
-            children: Arc::new(Mutex::new(HandlerMut {
-                processes: BTreeMap::new(),
-                // groups: BTreeMap::new(),
-            })),
-        }
-    }
-    async fn handle(&self, req: Input) -> Result<Output, RpcError> {
-        Ok(match req {
-            Input::Command(RunCommandParams {
-                gid,
-                command,
-                args,
-                output,
-            }) => Output::Command(self.command(gid, command, args, output).await?),
-            // Input::ReadLineStdout(ReadLineStdoutParams { pid }) => {
-            //     Output::ReadLineStdout(self.read_line_stdout(pid).await?)
-            // }
-            // Input::ReadLineStderr(ReadLineStderrParams { pid }) => {
-            //     Output::ReadLineStderr(self.read_line_stderr(pid).await?)
-            // }
-            Input::Log(LogParams { gid: _, level }) => {
-                level.trace();
-                Output::Log
-            }
-            Input::Output(OutputParams { pid }) => Output::Output(self.output(pid).await?),
-            Input::Signal(SendSignalParams { pid, signal }) => {
-                self.signal(pid, signal).await?;
-                Output::Signal
-            }
-            Input::SignalGroup(SignalGroupParams { gid, signal }) => {
-                self.signal_group(gid, signal).await?;
-                Output::SignalGroup
-            }
-        })
-    }
-
-    async fn command(
-        &self,
-        gid: Option<ProcessGroupId>,
-        command: String,
-        args: Vec<String>,
-        output: OutputStrategy,
-    ) -> Result<ProcessId, RpcError> {
-        let mut cmd = Command::new(command);
-        cmd.args(args);
-        cmd.kill_on_drop(true);
-        cmd.stdout(Stdio::piped());
-        cmd.stderr(Stdio::piped());
-        let mut child = cmd.spawn().map_err(|e| {
-            let mut err = yajrc::INTERNAL_ERROR.clone();
-            err.data = Some(json!(e.to_string()));
-            err
-        })?;
-        let pid = ProcessId(child.id().ok_or_else(|| {
-            let mut err = yajrc::INTERNAL_ERROR.clone();
-            err.data = Some(json!("Child has no pid"));
-            err
-        })?);
-        let output = match output {
-            OutputStrategy::Inherit => {
-                let (stdout_send, stdout) = watch::channel(String::new());
-                let (stderr_send, stderr) = watch::channel(String::new());
-                if let (Some(child_stdout), Some(child_stderr)) =
-                    (child.stdout.take(), child.stderr.take())
-                {
-                    Some(InheritOutput {
-                        _thread: tokio::spawn(async move {
-                            tokio::join!(
-                                async {
-                                    if let Err(e) = async {
-                                        let mut lines = BufReader::new(child_stdout).lines();
-                                        while let Some(line) = lines.next_line().await? {
-                                            tracing::info!("({}): {}", pid.0, line);
-                                            let _ = stdout_send.send(line);
-                                        }
-                                        Ok::<_, std::io::Error>(())
-                                    }
-                                    .await
-                                    {
-                                        tracing::error!(
-                                            "Error reading stdout of pid {}: {}",
-                                            pid.0,
-                                            e
-                                        );
-                                    }
-                                },
-                                async {
-                                    if let Err(e) = async {
-                                        let mut lines = BufReader::new(child_stderr).lines();
-                                        while let Some(line) = lines.next_line().await? {
-                                            tracing::warn!("({}): {}", pid.0, line);
-                                            let _ = stderr_send.send(line);
-                                        }
-                                        Ok::<_, std::io::Error>(())
-                                    }
-                                    .await
-                                    {
-                                        tracing::error!(
-                                            "Error reading stdout of pid {}: {}",
-                                            pid.0,
-                                            e
-                                        );
-                                    }
-                                }
-                            );
-                        })
-                        .into(),
-                        stdout,
-                        stderr,
-                    })
-                } else {
-                    None
-                }
-            }
-            OutputStrategy::Collect => None,
-        };
-        self.children.lock().await.processes.insert(
-            pid,
-            ChildInfo {
-                gid,
-                child: Arc::new(Mutex::new(Some(child))),
-                output,
-            },
-        );
-        Ok(pid)
-    }
-
-    async fn output(&self, pid: ProcessId) -> Result<String, RpcError> {
-        let not_found = || {
-            let mut err = yajrc::INTERNAL_ERROR.clone();
-            err.data = Some(json!(format!("Child with pid {} not found", pid.0)));
-            err
-        };
-        let mut child = {
-            self.children
-                .lock()
-                .await
-                .processes
-                .get(&pid)
-                .ok_or_else(not_found)?
-                .child
-                .clone()
-        }
-        .lock_owned()
-        .await;
-        if let Some(child) = child.take() {
-            let output = child.wait_with_output().await?;
-            if output.status.success() {
-                Ok(String::from_utf8(output.stdout).map_err(|_| yajrc::PARSE_ERROR)?)
-            } else {
-                Err(RpcError {
-                    code: output
-                        .status
-                        .code()
-                        .or_else(|| output.status.signal().map(|s| 128 + s))
-                        .unwrap_or(0),
-                    message: "Command failed".into(),
-                    data: Some(json!(String::from_utf8(if output.stderr.is_empty() {
-                        output.stdout
-                    } else {
-                        output.stderr
-                    })
-                    .map_err(|_| yajrc::PARSE_ERROR)?)),
-                })
-            }
-        } else {
-            Err(not_found())
-        }
-    }
-
-    async fn signal(&self, pid: ProcessId, signal: u32) -> Result<(), RpcError> {
-        let not_found = || {
-            let mut err = yajrc::INTERNAL_ERROR.clone();
-            err.data = Some(json!(format!("Child with pid {} not found", pid.0)));
-            err
-        };
-
-        Self::killall(pid, Signal::try_from(signal as i32)?)?;
-
-        if signal == 9 {
-            self.children
-                .lock()
-                .await
-                .processes
-                .remove(&pid)
-                .ok_or_else(not_found)?;
-        }
-        Ok(())
-    }
-
-    async fn signal_group(&self, gid: ProcessGroupId, signal: u32) -> Result<(), RpcError> {
-        let mut to_kill = Vec::new();
-        {
-            let mut children_ref = self.children.lock().await;
-            let children = std::mem::take(&mut children_ref.deref_mut().processes);
-            for (pid, child_info) in children {
-                if child_info.gid == Some(gid) {
-                    to_kill.push(pid);
-                } else {
-                    children_ref.processes.insert(pid, child_info);
-                }
-            }
-        }
-        for pid in to_kill {
-            tracing::info!("Killing pid {}", pid.0);
-            Self::killall(pid, Signal::try_from(signal as i32)?)?;
-        }
-
-        Ok(())
-    }
-
-    fn killall(pid: ProcessId, signal: Signal) -> Result<(), RpcError> {
-        for proc in procfs::process::all_processes()? {
-            let stat = proc?.stat()?;
-            if ProcessId::from(stat.ppid) == pid {
-                Self::killall(stat.pid.into(), signal)?;
-            }
-        }
-        if let Err(e) = nix::sys::signal::kill(pid.into(), Some(signal)) {
-            if e != Errno::ESRCH {
-                tracing::error!("Failed to kill pid {}: {}", pid.0, e);
-            }
-        }
-        Ok(())
-    }
-
-    async fn graceful_exit(self) {
-        let kill_all = futures::stream::iter(
-            std::mem::take(&mut self.children.lock().await.deref_mut().processes).into_iter(),
-        )
-        .for_each_concurrent(None, |(pid, child)| async move {
-            let _ = Self::killall(pid, Signal::SIGTERM);
-            if let Some(child) = child.child.lock().await.take() {
-                let _ = child.wait_with_output().await;
-            }
-        });
-        kill_all.await
-    }
-}
-
-#[tokio::main]
-async fn main() {
-    use tokio::signal::unix::{signal, SignalKind};
-    let mut sigint = signal(SignalKind::interrupt()).unwrap();
-    let mut sigterm = signal(SignalKind::terminate()).unwrap();
-    let mut sigquit = signal(SignalKind::quit()).unwrap();
-    let mut sighangup = signal(SignalKind::hangup()).unwrap();
-
-    use tracing_error::ErrorLayer;
-    use tracing_subscriber::prelude::*;
-    use tracing_subscriber::{fmt, EnvFilter};
-
-    let filter_layer = EnvFilter::new("container_init=debug");
-    let fmt_layer = fmt::layer().with_target(true);
-
-    tracing_subscriber::registry()
-        .with(filter_layer)
-        .with(fmt_layer)
-        .with(ErrorLayer::default())
-        .init();
-    color_eyre::install().unwrap();
-
-    let handler = Handler::new();
-    let handler_thread = async {
-        let listener = tokio::net::UnixListener::bind("/start9/sockets/rpc.sock")?;
-        loop {
-            let (stream, _) = listener.accept().await?;
-            let (r, w) = stream.into_split();
-            let mut lines = BufReader::new(r).lines();
-            let handler = handler.clone();
-            tokio::spawn(async move {
-                let w = Arc::new(Mutex::new(w));
-                while let Some(line) = lines.next_line().await.transpose() {
-                    let handler = handler.clone();
-                    let w = w.clone();
-                    tokio::spawn(async move {
-                        if let Err(e) = async {
-                            let req = serde_json::from_str::<IncomingRpc>(&line?)?;
-                            match handler.handle(req.input).await {
-                                Ok(output) => {
-                                    if  w.lock().await.write_all(
-                                        format!("{}\n", json!({ "id": req.id, "jsonrpc": "2.0", "result": output }))
-                                            .as_bytes(),
-                                    )
-                                    .await.is_err() {
-                                        tracing::error!("Error sending to {id:?}", id = req.id);
-                                    }
-                                }
-                                Err(e) =>
-                                if  w
-                                    .lock()
-                                    .await
-                                    .write_all(
-                                        format!("{}\n", json!({ "id": req.id, "jsonrpc": "2.0", "error": e }))
-                                            .as_bytes(),
-                                    )
-                                    .await.is_err() {
-
-                                        tracing::error!("Handle + Error sending to {id:?}", id = req.id);
-                                    },
-                            }
-                            Ok::<_, color_eyre::Report>(())
-                        }
-                        .await
-                        {
-                            tracing::error!("Error parsing RPC request: {}", e);
-                            tracing::debug!("{:?}", e);
-                        }
-                    });
-                }
-                Ok::<_, std::io::Error>(())
-            });
-        }
-        #[allow(unreachable_code)]
-        Ok::<_, std::io::Error>(())
-    };
-
-    select! {
-        res = handler_thread => {
-            match res {
-                Ok(()) => tracing::debug!("Done with inputs/outputs"),
-                Err(e) => {
-                    tracing::error!("Error reading RPC input: {}", e);
-                    tracing::debug!("{:?}", e);
-                }
-            }
-        },
-        _ = sigint.recv() => {
-            tracing::debug!("SIGINT");
-        },
-        _ = sigterm.recv() => {
-            tracing::debug!("SIGTERM");
-        },
-        _ = sigquit.recv() => {
-            tracing::debug!("SIGQUIT");
-        },
-        _ = sighangup.recv() => {
-            tracing::debug!("SIGHUP");
-        }
-    }
-    handler.graceful_exit().await;
-    ::std::process::exit(0)
-}
diff --git a/core/helpers/Cargo.toml b/core/helpers/Cargo.toml
index 83e1fd788..228f3ef54 100644
--- a/core/helpers/Cargo.toml
+++ b/core/helpers/Cargo.toml
@@ -11,9 +11,9 @@ futures = "0.3.28"
 lazy_async_pool = "0.3.3"
 models = { path = "../models" }
 pin-project = "1.1.3"
+rpc-toolkit = "0.2.3"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = { version = "0.1.14", features = ["io-util", "sync"] }
 tracing = "0.1.39"
-yajrc = { version = "*", git = "https://github.com/dr-bonez/yajrc.git", branch = "develop" }
diff --git a/core/helpers/src/lib.rs b/core/helpers/src/lib.rs
index 226787590..d913aefee 100644
--- a/core/helpers/src/lib.rs
+++ b/core/helpers/src/lib.rs
@@ -11,11 +11,9 @@ use tokio::sync::oneshot;
 use tokio::task::{JoinError, JoinHandle, LocalSet};
 
 mod byte_replacement_reader;
-mod rpc_client;
 mod rsync;
 mod script_dir;
 pub use byte_replacement_reader::*;
-pub use rpc_client::{RpcClient, UnixRpcClient};
 pub use rsync::*;
 pub use script_dir::*;
 
diff --git a/core/install-sdk.sh b/core/install-cli.sh
similarity index 61%
rename from core/install-sdk.sh
rename to core/install-cli.sh
index 3eec40012..f4fe712ee 100755
--- a/core/install-sdk.sh
+++ b/core/install-cli.sh
@@ -12,7 +12,4 @@ if [ -z "$PLATFORM" ]; then
   export PLATFORM=$(uname -m)
 fi
 
-cargo install --path=./startos --no-default-features --features=js_engine,sdk,cli --locked
-startbox_loc=$(which startbox)
-ln -sf $startbox_loc $(dirname $startbox_loc)/start-cli
-ln -sf $startbox_loc $(dirname $startbox_loc)/start-sdk
+cargo install --path=./startos --no-default-features --features=cli,docker --bin start-cli --locked
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index 9d75f92c4..c6fc76f55 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -15,6 +15,7 @@ emver = { version = "0.1", git = "https://github.com/Start9Labs/emver-rs.git", f
   "serde",
 ] }
 ipnet = "2.8.0"
+num_enum = "0.7.1"
 openssl = { version = "0.10.57", features = ["vendored"] }
 patch-db = { version = "*", path = "../../patch-db/patch-db", features = [
   "trace",
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index f22624d36..15bc90b9f 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -1,14 +1,19 @@
-use std::fmt::Display;
+use std::fmt::{Debug, Display};
 
 use color_eyre::eyre::eyre;
+use num_enum::TryFromPrimitive;
 use patch_db::Revision;
 use rpc_toolkit::hyper::http::uri::InvalidUri;
 use rpc_toolkit::reqwest;
-use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::yajrc::{
+    RpcError, INVALID_PARAMS_ERROR, INVALID_REQUEST_ERROR, METHOD_NOT_FOUND_ERROR, PARSE_ERROR,
+};
+use serde::{Deserialize, Serialize};
 
 use crate::InvalidId;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, TryFromPrimitive)]
+#[repr(i32)]
 pub enum ErrorKind {
     Unknown = 1,
     Filesystem = 2,
@@ -81,6 +86,8 @@ pub enum ErrorKind {
     CpuSettings = 69,
     Firmware = 70,
     Timeout = 71,
+    Lxc = 72,
+    Cancelled = 73,
 }
 impl ErrorKind {
     pub fn as_str(&self) -> &'static str {
@@ -157,6 +164,8 @@ impl ErrorKind {
             CpuSettings => "CPU Settings Error",
             Firmware => "Firmware Error",
             Timeout => "Timeout Error",
+            Lxc => "LXC Error",
+            Cancelled => "Cancelled",
         }
     }
 }
@@ -186,6 +195,17 @@ impl Error {
             revision: None,
         }
     }
+    pub fn clone_output(&self) -> Self {
+        Error {
+            source: ErrorData {
+                details: format!("{}", self.source),
+                debug: format!("{:?}", self.source),
+            }
+            .into(),
+            kind: self.kind,
+            revision: self.revision.clone(),
+        }
+    }
 }
 impl From<InvalidId> for Error {
     fn from(err: InvalidId) -> Self {
@@ -300,6 +320,53 @@ impl From<patch_db::value::Error> for Error {
     }
 }
 
+#[derive(Clone, Deserialize, Serialize)]
+pub struct ErrorData {
+    pub details: String,
+    pub debug: String,
+}
+impl Display for ErrorData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        Display::fmt(&self.details, f)
+    }
+}
+impl Debug for ErrorData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        Display::fmt(&self.debug, f)
+    }
+}
+impl std::error::Error for ErrorData {}
+impl From<&RpcError> for ErrorData {
+    fn from(value: &RpcError) -> Self {
+        Self {
+            details: value
+                .data
+                .as_ref()
+                .and_then(|d| {
+                    d.as_object()
+                        .and_then(|d| {
+                            d.get("details")
+                                .and_then(|d| d.as_str().map(|s| s.to_owned()))
+                        })
+                        .or_else(|| d.as_str().map(|s| s.to_owned()))
+                })
+                .unwrap_or_else(|| value.message.clone().into_owned()),
+            debug: value
+                .data
+                .as_ref()
+                .and_then(|d| {
+                    d.as_object()
+                        .and_then(|d| {
+                            d.get("debug")
+                                .and_then(|d| d.as_str().map(|s| s.to_owned()))
+                        })
+                        .or_else(|| d.as_str().map(|s| s.to_owned()))
+                })
+                .unwrap_or_else(|| value.message.clone().into_owned()),
+        }
+    }
+}
+
 impl From<Error> for RpcError {
     fn from(e: Error) -> Self {
         let mut data_object = serde_json::Map::with_capacity(3);
@@ -318,10 +385,40 @@ impl From<Error> for RpcError {
         RpcError {
             code: e.kind as i32,
             message: e.kind.as_str().into(),
-            data: Some(data_object.into()),
+            data: Some(
+                match serde_json::to_value(&ErrorData {
+                    details: format!("{}", e.source),
+                    debug: format!("{:?}", e.source),
+                }) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        tracing::warn!("Error serializing revision for Error object: {}", e);
+                        serde_json::Value::Null
+                    }
+                },
+            ),
         }
     }
 }
+impl From<RpcError> for Error {
+    fn from(e: RpcError) -> Self {
+        Error::new(
+            ErrorData::from(&e),
+            if let Ok(kind) = e.code.try_into() {
+                kind
+            } else if e.code == METHOD_NOT_FOUND_ERROR.code {
+                ErrorKind::NotFound
+            } else if e.code == PARSE_ERROR.code
+                || e.code == INVALID_PARAMS_ERROR.code
+                || e.code == INVALID_REQUEST_ERROR.code
+            {
+                ErrorKind::Deserialization
+            } else {
+                ErrorKind::Unknown
+            },
+        )
+    }
+}
 
 #[derive(Debug, Default)]
 pub struct ErrorCollection(Vec<Error>);
@@ -377,10 +474,7 @@ where
     Self: Sized,
 {
     fn with_kind(self, kind: ErrorKind) -> Result<T, Error>;
-    fn with_ctx<F: FnOnce(&E) -> (ErrorKind, D), D: Display + Send + Sync + 'static>(
-        self,
-        f: F,
-    ) -> Result<T, Error>;
+    fn with_ctx<F: FnOnce(&E) -> (ErrorKind, D), D: Display>(self, f: F) -> Result<T, Error>;
 }
 impl<T, E> ResultExt<T, E> for Result<T, E>
 where
@@ -394,10 +488,7 @@ where
         })
     }
 
-    fn with_ctx<F: FnOnce(&E) -> (ErrorKind, D), D: Display + Send + Sync + 'static>(
-        self,
-        f: F,
-    ) -> Result<T, Error> {
+    fn with_ctx<F: FnOnce(&E) -> (ErrorKind, D), D: Display>(self, f: F) -> Result<T, Error> {
         self.map_err(|e| {
             let (kind, ctx) = f(&e);
             let source = color_eyre::eyre::Error::from(e);
@@ -411,6 +502,29 @@ where
         })
     }
 }
+impl<T> ResultExt<T, Error> for Result<T, Error> {
+    fn with_kind(self, kind: ErrorKind) -> Result<T, Error> {
+        self.map_err(|e| Error {
+            source: e.source,
+            kind,
+            revision: e.revision,
+        })
+    }
+
+    fn with_ctx<F: FnOnce(&Error) -> (ErrorKind, D), D: Display>(self, f: F) -> Result<T, Error> {
+        self.map_err(|e| {
+            let (kind, ctx) = f(&e);
+            let source = e.source;
+            let ctx = format!("{}: {}", ctx, source);
+            let source = source.wrap_err(ctx);
+            Error {
+                kind,
+                source,
+                revision: e.revision,
+            }
+        })
+    }
+}
 
 pub trait OptionExt<T>
 where
diff --git a/core/models/src/id/image.rs b/core/models/src/id/image.rs
index 10ef0451d..8a4f87175 100644
--- a/core/models/src/id/image.rs
+++ b/core/models/src/id/image.rs
@@ -1,4 +1,5 @@
 use std::fmt::Debug;
+use std::path::Path;
 use std::str::FromStr;
 
 use serde::{Deserialize, Deserializer, Serialize};
@@ -7,6 +8,11 @@ use crate::{Id, InvalidId, PackageId, Version};
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
 pub struct ImageId(Id);
+impl AsRef<Path> for ImageId {
+    fn as_ref(&self) -> &Path {
+        self.0.as_ref().as_ref()
+    }
+}
 impl std::fmt::Display for ImageId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", &self.0)
diff --git a/core/models/src/procedure_name.rs b/core/models/src/procedure_name.rs
index 6a092955a..841f8df7d 100644
--- a/core/models/src/procedure_name.rs
+++ b/core/models/src/procedure_name.rs
@@ -4,54 +4,37 @@ use crate::{ActionId, HealthCheckId, PackageId};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ProcedureName {
-    Main, // Usually just run container
-    CreateBackup,
-    RestoreBackup,
+    StartMain,
+    StopMain,
     GetConfig,
     SetConfig,
-    Migration,
-    Properties,
-    LongRunning,
-    Check(PackageId),
-    AutoConfig(PackageId),
-    Health(HealthCheckId),
-    Action(ActionId),
-    Signal,
+    CreateBackup,
+    RestoreBackup,
+    ActionMetadata,
+    RunAction(ActionId),
+    GetAction(ActionId),
+    QueryDependency(ActionId),
+    UpdateDependency(ActionId),
+    Init,
+    Uninit,
 }
 
 impl ProcedureName {
-    pub fn docker_name(&self) -> Option<String> {
-        match self {
-            ProcedureName::Main => None,
-            ProcedureName::LongRunning => None,
-            ProcedureName::CreateBackup => Some("CreateBackup".to_string()),
-            ProcedureName::RestoreBackup => Some("RestoreBackup".to_string()),
-            ProcedureName::GetConfig => Some("GetConfig".to_string()),
-            ProcedureName::SetConfig => Some("SetConfig".to_string()),
-            ProcedureName::Migration => Some("Migration".to_string()),
-            ProcedureName::Properties => Some(format!("Properties-{}", rand::random::<u64>())),
-            ProcedureName::Health(id) => Some(format!("{}Health", id)),
-            ProcedureName::Action(id) => Some(format!("{}Action", id)),
-            ProcedureName::Check(_) => None,
-            ProcedureName::AutoConfig(_) => None,
-            ProcedureName::Signal => None,
-        }
-    }
-    pub fn js_function_name(&self) -> Option<String> {
+    pub fn js_function_name(&self) -> String {
         match self {
-            ProcedureName::Main => Some("/main".to_string()),
-            ProcedureName::LongRunning => None,
-            ProcedureName::CreateBackup => Some("/createBackup".to_string()),
-            ProcedureName::RestoreBackup => Some("/restoreBackup".to_string()),
-            ProcedureName::GetConfig => Some("/getConfig".to_string()),
-            ProcedureName::SetConfig => Some("/setConfig".to_string()),
-            ProcedureName::Migration => Some("/migration".to_string()),
-            ProcedureName::Properties => Some("/properties".to_string()),
-            ProcedureName::Health(id) => Some(format!("/health/{}", id)),
-            ProcedureName::Action(id) => Some(format!("/action/{}", id)),
-            ProcedureName::Check(id) => Some(format!("/dependencies/{}/check", id)),
-            ProcedureName::AutoConfig(id) => Some(format!("/dependencies/{}/autoConfigure", id)),
-            ProcedureName::Signal => Some("/handleSignal".to_string()),
+            ProcedureName::Init => "/init".to_string(),
+            ProcedureName::Uninit => "/uninit".to_string(),
+            ProcedureName::StartMain => "/main/start".to_string(),
+            ProcedureName::StopMain => "/main/stop".to_string(),
+            ProcedureName::SetConfig => "/config/set".to_string(),
+            ProcedureName::GetConfig => "/config/get".to_string(),
+            ProcedureName::CreateBackup => "/backup/create".to_string(),
+            ProcedureName::RestoreBackup => "/backup/restore".to_string(),
+            ProcedureName::ActionMetadata => "/actions/metadata".to_string(),
+            ProcedureName::RunAction(id) => format!("/actions/{}/run", id),
+            ProcedureName::GetAction(id) => format!("/actions/{}/get", id),
+            ProcedureName::QueryDependency(id) => format!("/dependencies/{}/query", id),
+            ProcedureName::UpdateDependency(id) => format!("/dependencies/{}/update", id),
         }
     }
 }
diff --git a/core/snapshot-creator/Cargo.toml b/core/snapshot-creator/Cargo.toml
deleted file mode 100644
index 628cd3161..000000000
--- a/core/snapshot-creator/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "snapshot_creator"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-dashmap = "5.3.4"
-deno_core = "=0.222.0"
-deno_ast = { version = "=0.29.5", features = ["transpiling"] }
diff --git a/core/snapshot-creator/src/main.rs b/core/snapshot-creator/src/main.rs
deleted file mode 100644
index ad7330484..000000000
--- a/core/snapshot-creator/src/main.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use deno_core::JsRuntimeForSnapshot;
-
-fn main() {
-    let runtime = JsRuntimeForSnapshot::new(Default::default());
-    let snapshot = runtime.snapshot();
-
-    let snapshot_slice: &[u8] = &*snapshot;
-    println!("Snapshot size: {}", snapshot_slice.len());
-
-    std::fs::write("JS_SNAPSHOT.bin", snapshot_slice).unwrap();
-}
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index e92799b3a..3fce87089 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -21,20 +21,26 @@ license = "MIT"
 name = "startos"
 path = "src/lib.rs"
 
+[[bin]]
+name = "containerbox"
+path = "src/main.rs"
+
+[[bin]]
+name = "start-cli"
+path = "src/main.rs"
+
 [[bin]]
 name = "startbox"
 path = "src/main.rs"
 
 [features]
-avahi = ["avahi-sys"]
-avahi-alias = ["avahi"]
 cli = []
+container-runtime = []
 daemon = []
-default = ["cli", "sdk", "daemon"]
+default = ["cli", "daemon"]
 dev = []
-docker = []
-sdk = []
 unstable = ["console-subscriber", "tokio/tracing"]
+docker = []
 
 [dependencies]
 aes = { version = "0.7.5", features = ["ctr"] }
@@ -45,9 +51,8 @@ async-compression = { version = "0.4.4", features = [
 ] }
 async-stream = "0.3.5"
 async-trait = "0.1.74"
-avahi-sys = { git = "https://github.com/Start9Labs/avahi-sys", version = "0.10.0", branch = "feature/dynamic-linking", features = [
-  "dynamic",
-], optional = true }
+axum = { version = "0.7.3", features = ["ws"] }
+axum-server = "0.6.0"
 base32 = "0.4.0"
 base64 = "0.21.4"
 base64ct = "1.6.0"
@@ -55,7 +60,7 @@ basic-cookies = "0.1.4"
 blake3 = "1.5.0"
 bytes = "1"
 chrono = { version = "0.4.31", features = ["serde"] }
-clap = "3.2.25"
+clap = "4.4.12"
 color-eyre = "0.6.2"
 console = "0.15.7"
 console-subscriber = { version = "0.2", optional = true }
@@ -72,7 +77,6 @@ ed25519-dalek = { version = "2.0.0", features = [
   "digest",
 ] }
 ed25519-dalek-v1 = { package = "ed25519-dalek", version = "1" }
-container-init = { path = "../container-init" }
 emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
   "serde",
 ] }
@@ -82,9 +86,15 @@ gpt = "3.1.0"
 helpers = { path = "../helpers" }
 hex = "0.4.3"
 hmac = "0.12.1"
-http = "0.2.9"
-hyper = { version = "0.14.27", features = ["full"] }
-hyper-ws-listener = "0.3.0"
+http = "1.0.0"
+# http-body-util = "0.1.0"
+# hyper = { version = "1.1.0", features = ["full"] }
+# hyper-util = { version = "0.1.2", features = [
+#   "server",
+#   "server-auto",
+#   "tokio",
+# ] }
+# hyper-ws-listener = "0.3.0"
 imbl = "2.0.2"
 imbl-value = { git = "https://github.com/Start9Labs/imbl-value.git" }
 include_dir = "0.7.3"
@@ -94,11 +104,13 @@ integer-encoding = { version = "4.0.0", features = ["tokio_async"] }
 ipnet = { version = "2.8.0", features = ["serde"] }
 iprange = { version = "0.6.7", features = ["serde"] }
 isocountry = "0.3.2"
-itertools = "0.11.0"
+itertools = "0.12.0"
 jaq-core = "0.10.1"
 jaq-std = "0.10.0"
 josekit = "0.8.4"
 jsonpath_lib = { git = "https://github.com/Start9Labs/jsonpath.git" }
+lazy_async_pool = "0.3.3"
+lazy_format = "2.0"
 lazy_static = "1.4.0"
 libc = "0.2.149"
 log = "0.4.20"
@@ -109,6 +121,7 @@ nix = { version = "0.27.1", features = ["user", "process", "signal", "fs"] }
 nom = "7.1.3"
 num = "0.4.1"
 num_enum = "0.7.0"
+once_cell = "1.19.0"
 openssh-keys = "0.6.2"
 openssl = { version = "0.10.57", features = ["vendored"] }
 p256 = { version = "0.13.2", features = ["pem"] }
@@ -123,12 +136,12 @@ proptest = "1.3.1"
 proptest-derive = "0.4.0"
 rand = { version = "0.8.5", features = ["std"] }
 regex = "1.10.2"
-reqwest = { version = "0.11.22", features = ["stream", "json", "socks"] }
+reqwest = { version = "0.11.23", features = ["stream", "json", "socks"] }
 reqwest_cookie_store = "0.6.0"
 rpassword = "7.2.0"
-rpc-toolkit = "0.2.2"
+rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "refactor/traits" }
 rust-argon2 = "2.0.0"
-scopeguard = "1.1" # because avahi-sys fucks your shit up
+rustyline-async = "0.4.1"
 semver = { version = "1.0.20", features = ["serde"] }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_cbor = { package = "ciborium", version = "0.2.1" }
@@ -137,6 +150,7 @@ serde_toml = { package = "toml", version = "0.8.2" }
 serde_with = { version = "3.4.0", features = ["macros", "json"] }
 serde_yaml = "0.9.25"
 sha2 = "0.10.2"
+shell-words = "1"
 simple-logging = "2.0.2"
 sqlx = { version = "0.7.2", features = [
   "chrono",
@@ -149,11 +163,11 @@ stderrlog = "0.5.4"
 tar = "0.4.40"
 thiserror = "1.0.49"
 tokio = { version = "1", features = ["full"] }
-tokio-rustls = "0.24.1"
+tokio-rustls = "0.25.0"
 tokio-socks = "0.5.1"
 tokio-stream = { version = "0.1.14", features = ["io-util", "sync", "net"] }
 tokio-tar = { git = "https://github.com/dr-bonez/tokio-tar.git" }
-tokio-tungstenite = { version = "0.20.1", features = ["native-tls"] }
+tokio-tungstenite = { version = "0.21.0", features = ["native-tls"] }
 tokio-util = { version = "0.7.9", features = ["io"] }
 torut = "0.2.1"
 tracing = "0.1.39"
@@ -162,7 +176,7 @@ tracing-futures = "0.2.5"
 tracing-journald = "0.3.0"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 trust-dns-server = "0.23.1"
-typed-builder = "0.17.0"
+typed-builder = "0.18.0"
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.4.1", features = ["v4"] }
diff --git a/core/startos/deny.toml b/core/startos/deny.toml
index 7b4924cdc..5a42f7378 100644
--- a/core/startos/deny.toml
+++ b/core/startos/deny.toml
@@ -14,9 +14,15 @@ allow = [
     "BSD-3-Clause",
     "LGPL-3.0",
     "OpenSSL",
+    "Unicode-DFS-2016",
+    "Zlib",
 ]
 
 clarify = [
-    { name = "webpki", expression = "ISC", license-files = [ { path = "LICENSE", hash = 0x001c7e6c } ] },
-    { name = "ring", expression = "OpenSSL", license-files = [ { path = "LICENSE", hash = 0xbd0eed23 } ] },
+    { name = "webpki", expression = "ISC", license-files = [
+        { path = "LICENSE", hash = 0x001c7e6c },
+    ] },
+    { name = "ring", expression = "OpenSSL", license-files = [
+        { path = "LICENSE", hash = 0xbd0eed23 },
+    ] },
 ]
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index 3223aaa86..13a943a60 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -1,26 +1,14 @@
-use std::collections::{BTreeMap, BTreeSet};
-
-use clap::ArgMatches;
-use color_eyre::eyre::eyre;
-use indexmap::IndexSet;
+use clap::Parser;
 pub use models::ActionId;
-use models::ImageId;
+use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
-use crate::config::{Config, ConfigSpec};
+use crate::config::Config;
 use crate::context::RpcContext;
 use crate::prelude::*;
-use crate::procedure::docker::DockerContainers;
-use crate::procedure::{PackageProcedure, ProcedureName};
-use crate::s9pk::manifest::PackageId;
-use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
-use crate::util::Version;
-use crate::volume::Volumes;
-use crate::{Error, ResultExt};
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct Actions(pub BTreeMap<ActionId, Action>);
+use crate::util::serde::{display_serializable, StdinDeserializable, WithIoFormat};
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "version")]
@@ -44,72 +32,11 @@ pub enum DockerStatus {
     Stopped,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct Action {
-    pub name: String,
-    pub description: String,
-    #[serde(default)]
-    pub warning: Option<String>,
-    pub implementation: PackageProcedure,
-    pub allowed_statuses: IndexSet<DockerStatus>,
-    #[serde(default)]
-    pub input_spec: ConfigSpec,
-}
-impl Action {
-    #[instrument(skip_all)]
-    pub fn validate(
-        &self,
-        _container: &Option<DockerContainers>,
-        eos_version: &Version,
-        volumes: &Volumes,
-        image_ids: &BTreeSet<ImageId>,
-    ) -> Result<(), Error> {
-        self.implementation
-            .validate(eos_version, volumes, image_ids, true)
-            .with_ctx(|_| {
-                (
-                    crate::ErrorKind::ValidateS9pk,
-                    format!("Action {}", self.name),
-                )
-            })
-    }
-
-    #[instrument(skip_all)]
-    pub async fn execute(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        action_id: &ActionId,
-        volumes: &Volumes,
-        input: Option<Config>,
-    ) -> Result<ActionResult, Error> {
-        if let Some(ref input) = input {
-            self.input_spec
-                .matches(&input)
-                .with_kind(crate::ErrorKind::ConfigSpecViolation)?;
-        }
-        self.implementation
-            .execute(
-                ctx,
-                pkg_id,
-                pkg_version,
-                ProcedureName::Action(action_id.clone()),
-                volumes,
-                input,
-                None,
-            )
-            .await?
-            .map_err(|e| Error::new(eyre!("{}", e.1), crate::ErrorKind::Action))
+pub fn display_action_result(params: WithIoFormat<ActionParams>, result: ActionResult) {
+    if let Some(format) = params.format {
+        return display_serializable(format, result);
     }
-}
-
-fn display_action_result(action_result: ActionResult, matches: &ArgMatches) {
-    if matches.is_present("format") {
-        return display_serializable(action_result, matches);
-    }
-    match action_result {
+    match result {
         ActionResult::V0(ar) => {
             println!(
                 "{}: {}",
@@ -120,44 +47,39 @@ fn display_action_result(action_result: ActionResult, matches: &ArgMatches) {
     }
 }
 
-#[command(about = "Executes an action", display(display_action_result))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ActionParams {
+    #[arg(id = "id")]
+    #[serde(rename = "id")]
+    pub package_id: PackageId,
+    #[arg(id = "action-id")]
+    #[serde(rename = "action-id")]
+    pub action_id: ActionId,
+    #[command(flatten)]
+    pub input: StdinDeserializable<Option<Config>>,
+}
+// impl C
+
+// #[command(about = "Executes an action", display(display_action_result))]
 #[instrument(skip_all)]
 pub async fn action(
-    #[context] ctx: RpcContext,
-    #[arg(rename = "id")] pkg_id: PackageId,
-    #[arg(rename = "action-id")] action_id: ActionId,
-    #[arg(stdin, parse(parse_stdin_deserializable))] input: Option<Config>,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
+    ctx: RpcContext,
+    ActionParams {
+        package_id,
+        action_id,
+        input: StdinDeserializable(input),
+    }: ActionParams,
 ) -> Result<ActionResult, Error> {
-    let manifest = ctx
-        .db
-        .peek()
+    ctx.services
+        .get(&package_id)
+        .await
+        .as_ref()
+        .or_not_found(lazy_format!("Manager for {}", package_id))?
+        .action(
+            action_id,
+            input.map(|c| to_value(&c)).transpose()?.unwrap_or_default(),
+        )
         .await
-        .as_package_data()
-        .as_idx(&pkg_id)
-        .or_not_found(&pkg_id)?
-        .as_installed()
-        .or_not_found(&pkg_id)?
-        .as_manifest()
-        .de()?;
-
-    if let Some(action) = manifest.actions.0.get(&action_id) {
-        action
-            .execute(
-                &ctx,
-                &manifest.id,
-                &manifest.version,
-                &action_id,
-                &manifest.volumes,
-                input,
-            )
-            .await
-    } else {
-        Err(Error::new(
-            eyre!("Action not found in manifest"),
-            crate::ErrorKind::NotFound,
-        ))
-    }
 }
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index a6ae2fff0..cdf2a4591 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -1,24 +1,23 @@
 use std::collections::BTreeMap;
-use std::marker::PhantomData;
 
 use chrono::{DateTime, Utc};
-use clap::ArgMatches;
+use clap::{ArgMatches, Parser};
 use color_eyre::eyre::eyre;
+use imbl_value::{json, InternedString};
 use josekit::jwk::Jwk;
-use rpc_toolkit::command;
-use rpc_toolkit::command_helpers::prelude::{RequestParts, ResponseParts};
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{command, from_fn_async, AnyContext, CallRemote, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
 use sqlx::{Executor, Postgres};
 use tracing::instrument;
 
 use crate::context::{CliContext, RpcContext};
-use crate::middleware::auth::{AsLogoutSessionId, HasLoggedOutSessions, HashSessionToken};
-use crate::middleware::encrypt::EncryptedWire;
+use crate::middleware::auth::{
+    AsLogoutSessionId, HasLoggedOutSessions, HashSessionToken, LoginRes,
+};
 use crate::prelude::*;
-use crate::util::display_none;
-use crate::util::serde::{display_serializable, IoFormat};
+use crate::util::crypto::EncryptedWire;
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::{ensure_code, Error, ResultExt};
 #[derive(Clone, Serialize, Deserialize)]
 #[serde(untagged)]
@@ -61,14 +60,43 @@ impl std::str::FromStr for PasswordType {
         })
     }
 }
-
-#[command(subcommands(login, logout, session, reset_password, get_pubkey))]
-pub fn auth() -> Result<(), Error> {
-    Ok(())
+pub fn auth() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "login",
+            from_fn_async(login_impl)
+                .with_metadata("login", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand("login", from_fn_async(cli_login).no_display())
+        .subcommand(
+            "logout",
+            from_fn_async(logout)
+                .with_metadata("get-session", Value::Bool(true))
+                .with_remote_cli::<CliContext>()
+                // TODO @dr-bonez
+                .no_display(),
+        )
+        .subcommand("session", session())
+        .subcommand(
+            "reset-password",
+            from_fn_async(reset_password_impl).no_cli(),
+        )
+        .subcommand(
+            "reset-password",
+            from_fn_async(cli_reset_password).no_display(),
+        )
+        .subcommand(
+            "get-pubkey",
+            from_fn_async(get_pubkey)
+                .with_metadata("authenticated", Value::Bool(false))
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
 pub fn cli_metadata() -> Value {
-    serde_json::json!({
+    imbl_value::json!({
         "platforms": ["cli"],
     })
 }
@@ -89,12 +117,17 @@ fn gen_pwd() {
         .unwrap()
     )
 }
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct CliLoginParams {
+    password: Option<PasswordType>,
+}
 
 #[instrument(skip_all)]
 async fn cli_login(
     ctx: CliContext,
-    password: Option<PasswordType>,
-    metadata: Value,
+    CliLoginParams { password }: CliLoginParams,
 ) -> Result<(), RpcError> {
     let password = if let Some(password) = password {
         password.decrypt(&ctx)?
@@ -102,14 +135,16 @@ async fn cli_login(
         rpassword::prompt_password("Password: ")?
     };
 
-    rpc_toolkit::command_helpers::call_remote(
-        ctx,
+    ctx.call_remote(
         "auth.login",
-        serde_json::json!({ "password": password, "metadata": metadata }),
-        PhantomData::<()>,
+        json!({
+            "password": password,
+            "metadata": {
+                "platforms": ["cli"],
+            },
+        }),
     )
-    .await?
-    .result?;
+    .await?;
 
     Ok(())
 }
@@ -140,30 +175,27 @@ where
     Ok(())
 }
 
-#[command(
-    custom_cli(cli_login(async, context(CliContext))),
-    display(display_none),
-    metadata(authenticated = false)
-)]
-#[instrument(skip_all)]
-pub async fn login(
-    #[context] ctx: RpcContext,
-    #[request] req: &RequestParts,
-    #[response] res: &mut ResponseParts,
-    #[arg] password: Option<PasswordType>,
-    #[arg(
-        parse(parse_metadata),
-        default = "cli_metadata",
-        help = "RPC Only: This value cannot be overidden from the cli"
-    )]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct LoginParams {
+    password: Option<PasswordType>,
+    #[arg(skip = cli_metadata())]
+    #[serde(default)]
     metadata: Value,
-) -> Result<(), Error> {
+}
+
+#[instrument(skip_all)]
+pub async fn login_impl(
+    ctx: RpcContext,
+    LoginParams { password, metadata }: LoginParams,
+) -> Result<LoginRes, Error> {
     let password = password.unwrap_or_default().decrypt(&ctx)?;
     let mut handle = ctx.secret_store.acquire().await?;
     check_password_against_db(handle.as_mut(), &password).await?;
 
     let hash_token = HashSessionToken::new();
-    let user_agent = req.headers.get("user-agent").and_then(|h| h.to_str().ok());
+    let user_agent = "".to_string(); // todo!() as String;
     let metadata = serde_json::to_string(&metadata).with_kind(crate::ErrorKind::Database)?;
     let hash_token_hashed = hash_token.hashed();
     sqlx::query!(
@@ -174,25 +206,24 @@ pub async fn login(
     )
     .execute(handle.as_mut())
     .await?;
-    res.headers.insert(
-        "set-cookie",
-        hash_token.header_value()?, // Should be impossible, but don't want to panic
-    );
 
-    Ok(())
+    Ok(hash_token.to_login_res())
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct LogoutParams {
+    session: InternedString,
 }
 
-#[command(display(display_none), metadata(authenticated = false))]
-#[instrument(skip_all)]
 pub async fn logout(
-    #[context] ctx: RpcContext,
-    #[request] req: &RequestParts,
+    ctx: RpcContext,
+    LogoutParams { session }: LogoutParams,
 ) -> Result<Option<HasLoggedOutSessions>, Error> {
-    let auth = match HashSessionToken::from_request_parts(req) {
-        Err(_) => return Ok(None),
-        Ok(a) => a,
-    };
-    Ok(Some(HasLoggedOutSessions::new(vec![auth], &ctx).await?))
+    Ok(Some(
+        HasLoggedOutSessions::new(vec![HashSessionToken::from_token(session)], &ctx).await?,
+    ))
 }
 
 #[derive(Deserialize, Serialize)]
@@ -211,16 +242,31 @@ pub struct SessionList {
     sessions: BTreeMap<String, Session>,
 }
 
-#[command(subcommands(list, kill))]
-pub async fn session() -> Result<(), Error> {
-    Ok(())
+pub fn session() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "list",
+            from_fn_async(list)
+                .with_metadata("get-session", Value::Bool(true))
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(display_sessions(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "kill",
+            from_fn_async(kill)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
-fn display_sessions(arg: SessionList, matches: &ArgMatches) {
+fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) {
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(arg, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, arg);
     }
 
     let mut table = Table::new();
@@ -249,17 +295,22 @@ fn display_sessions(arg: SessionList, matches: &ArgMatches) {
     table.print_tty(false).unwrap();
 }
 
-#[command(display(display_sessions))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ListParams {
+    #[arg(skip)]
+    session: InternedString,
+}
+
+// #[command(display(display_sessions))]
 #[instrument(skip_all)]
 pub async fn list(
-    #[context] ctx: RpcContext,
-    #[request] req: &RequestParts,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
+    ctx: RpcContext,
+    ListParams { session, .. }: ListParams,
 ) -> Result<SessionList, Error> {
     Ok(SessionList {
-        current: HashSessionToken::from_request_parts(req)?.as_hash(),
+        current: HashSessionToken::from_token(session).hashed().to_owned(),
         sessions: sqlx::query!(
             "SELECT * FROM session WHERE logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP"
         )
@@ -287,29 +338,50 @@ fn parse_comma_separated(arg: &str, _: &ArgMatches) -> Result<Vec<String>, RpcEr
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-struct KillSessionId(String);
+struct KillSessionId(InternedString);
+
+impl KillSessionId {
+    fn new(id: String) -> Self {
+        Self(InternedString::from(id))
+    }
+}
 
 impl AsLogoutSessionId for KillSessionId {
-    fn as_logout_session_id(self) -> String {
+    fn as_logout_session_id(self) -> InternedString {
         self.0
     }
 }
 
-#[command(display(display_none))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct KillParams {
+    ids: Vec<String>,
+}
+
 #[instrument(skip_all)]
-pub async fn kill(
-    #[context] ctx: RpcContext,
-    #[arg(parse(parse_comma_separated))] ids: Vec<String>,
-) -> Result<(), Error> {
-    HasLoggedOutSessions::new(ids.into_iter().map(KillSessionId), &ctx).await?;
+pub async fn kill(ctx: RpcContext, KillParams { ids }: KillParams) -> Result<(), Error> {
+    HasLoggedOutSessions::new(ids.into_iter().map(KillSessionId::new), &ctx).await?;
     Ok(())
 }
 
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ResetPasswordParams {
+    #[arg(name = "old-password")]
+    old_password: Option<PasswordType>,
+    #[arg(name = "new-password")]
+    new_password: Option<PasswordType>,
+}
+
 #[instrument(skip_all)]
 async fn cli_reset_password(
     ctx: CliContext,
-    old_password: Option<PasswordType>,
-    new_password: Option<PasswordType>,
+    ResetPasswordParams {
+        old_password,
+        new_password,
+    }: ResetPasswordParams,
 ) -> Result<(), RpcError> {
     let old_password = if let Some(old_password) = old_password {
         old_password.decrypt(&ctx)?
@@ -331,28 +403,22 @@ async fn cli_reset_password(
         new_password
     };
 
-    rpc_toolkit::command_helpers::call_remote(
-        ctx,
+    ctx.call_remote(
         "auth.reset-password",
-        serde_json::json!({ "old-password": old_password, "new-password": new_password }),
-        PhantomData::<()>,
+        imbl_value::json!({ "old-password": old_password, "new-password": new_password }),
     )
-    .await?
-    .result?;
+    .await?;
 
     Ok(())
 }
 
-#[command(
-    rename = "reset-password",
-    custom_cli(cli_reset_password(async, context(CliContext))),
-    display(display_none)
-)]
 #[instrument(skip_all)]
-pub async fn reset_password(
-    #[context] ctx: RpcContext,
-    #[arg(rename = "old-password")] old_password: Option<PasswordType>,
-    #[arg(rename = "new-password")] new_password: Option<PasswordType>,
+pub async fn reset_password_impl(
+    ctx: RpcContext,
+    ResetPasswordParams {
+        old_password,
+        new_password,
+    }: ResetPasswordParams,
 ) -> Result<(), Error> {
     let old_password = old_password.unwrap_or_default().decrypt(&ctx)?;
     let new_password = new_password.unwrap_or_default().decrypt(&ctx)?;
@@ -378,13 +444,8 @@ pub async fn reset_password(
         .await
 }
 
-#[command(
-    rename = "get-pubkey",
-    display(display_none),
-    metadata(authenticated = false)
-)]
 #[instrument(skip_all)]
-pub async fn get_pubkey(#[context] ctx: RpcContext) -> Result<Jwk, RpcError> {
+pub async fn get_pubkey(ctx: RpcContext) -> Result<Jwk, RpcError> {
     let secret = ctx.as_ref().clone();
     let pub_key = secret.to_public_key()?;
     Ok(pub_key)
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 21eedbaf2..5c68753c7 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -4,14 +4,13 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use chrono::Utc;
-use clap::ArgMatches;
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use helpers::AtomicFile;
 use imbl::OrdSet;
-use models::Version;
-use rpc_toolkit::command;
+use models::PackageId;
+use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWriteExt;
-use tokio::sync::Mutex;
 use tracing::instrument;
 
 use super::target::BackupTargetId;
@@ -21,42 +20,37 @@ use crate::backup::os::OsBackup;
 use crate::backup::{BackupReport, ServerBackupReport};
 use crate::context::RpcContext;
 use crate::db::model::BackupProgress;
-use crate::db::package::get_packages;
 use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::ReadWrite;
-use crate::disk::mount::guard::TmpMountGuard;
-use crate::manager::BackupReturn;
+use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
 use crate::notifications::NotificationLevel;
 use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::util::display_none;
 use crate::util::io::dir_copy;
 use crate::util::serde::IoFormat;
 use crate::version::VersionT;
 
-fn parse_comma_separated(arg: &str, _: &ArgMatches) -> Result<OrdSet<PackageId>, Error> {
-    arg.split(',')
-        .map(|s| s.trim().parse::<PackageId>().map_err(Error::from))
-        .collect()
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct BackupParams {
+    target_id: BackupTargetId,
+    #[arg(long = "old-password")]
+    old_password: Option<crate::auth::PasswordType>,
+    #[arg(long = "package-ids")]
+    package_ids: Option<Vec<PackageId>>,
+    password: crate::auth::PasswordType,
 }
 
-#[command(rename = "create", display(display_none))]
 #[instrument(skip(ctx, old_password, password))]
 pub async fn backup_all(
-    #[context] ctx: RpcContext,
-    #[arg(rename = "target-id")] target_id: BackupTargetId,
-    #[arg(rename = "old-password", long = "old-password")] old_password: Option<
-        crate::auth::PasswordType,
-    >,
-    #[arg(
-        rename = "package-ids",
-        long = "package-ids",
-        parse(parse_comma_separated)
-    )]
-    package_ids: Option<OrdSet<PackageId>>,
-    #[arg] password: crate::auth::PasswordType,
+    ctx: RpcContext,
+    BackupParams {
+        target_id,
+        old_password,
+        package_ids,
+        password,
+    }: BackupParams,
 ) -> Result<(), Error> {
-    let db = ctx.db.peek().await;
     let old_password_decrypted = old_password
         .as_ref()
         .unwrap_or(&password)
@@ -73,20 +67,9 @@ pub async fn backup_all(
     )
     .await?;
     let package_ids = if let Some(ids) = package_ids {
-        ids.into_iter()
-            .flat_map(|package_id| {
-                let version = db
-                    .as_package_data()
-                    .as_idx(&package_id)?
-                    .as_manifest()
-                    .as_version()
-                    .de()
-                    .ok()?;
-                Some((package_id, version))
-            })
-            .collect()
+        ids.into_iter().collect()
     } else {
-        get_packages(db.clone())?.into_iter().collect()
+        todo!("all installed packages");
     };
     if old_password.is_some() {
         backup_guard.change_password(&password)?;
@@ -108,10 +91,7 @@ pub async fn backup_all(
                             attempted: true,
                             error: None,
                         },
-                        packages: report
-                            .into_iter()
-                            .map(|((package_id, _), value)| (package_id, value))
-                            .collect(),
+                        packages: report,
                     },
                     None,
                 )
@@ -130,10 +110,7 @@ pub async fn backup_all(
                             attempted: true,
                             error: None,
                         },
-                        packages: report
-                            .into_iter()
-                            .map(|((package_id, _), value)| (package_id, value))
-                            .collect(),
+                        packages: report,
                     },
                     None,
                 )
@@ -178,7 +155,7 @@ pub async fn backup_all(
 #[instrument(skip(db, packages))]
 async fn assure_backing_up(
     db: &PatchDb,
-    packages: impl IntoIterator<Item = &(PackageId, Version)> + UnwindSafe + Send,
+    packages: impl IntoIterator<Item = &PackageId> + UnwindSafe + Send,
 ) -> Result<(), Error> {
     db.mutate(|v| {
         let backing_up = v
@@ -205,7 +182,7 @@ async fn assure_backing_up(
         backing_up.ser(&Some(
             packages
                 .into_iter()
-                .map(|(x, _)| (x.clone(), BackupProgress { complete: false }))
+                .map(|x| (x.clone(), BackupProgress { complete: false }))
                 .collect(),
         ))?;
         Ok(())
@@ -217,62 +194,39 @@ async fn assure_backing_up(
 async fn perform_backup(
     ctx: &RpcContext,
     backup_guard: BackupMountGuard<TmpMountGuard>,
-    package_ids: &OrdSet<(PackageId, Version)>,
-) -> Result<BTreeMap<(PackageId, Version), PackageBackupReport>, Error> {
+    package_ids: &OrdSet<PackageId>,
+) -> Result<BTreeMap<PackageId, PackageBackupReport>, Error> {
     let mut backup_report = BTreeMap::new();
-    let backup_guard = Arc::new(Mutex::new(backup_guard));
+    let backup_guard = Arc::new(backup_guard);
 
-    for package_id in package_ids {
-        let (response, _report) = match ctx
-            .managers
-            .get(package_id)
-            .await
-            .ok_or_else(|| Error::new(eyre!("Manager not found"), ErrorKind::InvalidRequest))?
-            .backup(backup_guard.clone())
-            .await
-        {
-            BackupReturn::Ran { report, res } => (res, report),
-            BackupReturn::AlreadyRunning(report) => {
-                backup_report.insert(package_id.clone(), report);
-                continue;
-            }
-            BackupReturn::Error(error) => {
-                tracing::warn!("Backup thread error");
-                tracing::debug!("{error:?}");
-                backup_report.insert(
-                    package_id.clone(),
-                    PackageBackupReport {
-                        error: Some("Backup thread error".to_owned()),
-                    },
-                );
-                continue;
-            }
-        };
-        backup_report.insert(
-            package_id.clone(),
-            PackageBackupReport {
-                error: response.as_ref().err().map(|e| e.to_string()),
-            },
-        );
-
-        if let Ok(pkg_meta) = response {
-            backup_guard
-                .lock()
-                .await
-                .metadata
-                .package_backups
-                .insert(package_id.0.clone(), pkg_meta);
+    for id in package_ids {
+        if let Some(service) = &*ctx.services.get(id).await {
+            backup_report.insert(
+                id.clone(),
+                PackageBackupReport {
+                    error: service
+                        .backup(backup_guard.package_backup(id))
+                        .await
+                        .err()
+                        .map(|e| e.to_string()),
+                },
+            );
         }
     }
 
+    let mut backup_guard = Arc::try_unwrap(backup_guard).map_err(|_| {
+        Error::new(
+            eyre!("leaked reference to BackupMountGuard"),
+            ErrorKind::Incoherent,
+        )
+    })?;
+
     let ui = ctx.db.peek().await.into_ui().de()?;
 
-    let mut os_backup_file = AtomicFile::new(
-        backup_guard.lock().await.as_ref().join("os-backup.cbor"),
-        None::<PathBuf>,
-    )
-    .await
-    .with_kind(ErrorKind::Filesystem)?;
+    let mut os_backup_file =
+        AtomicFile::new(backup_guard.path().join("os-backup.cbor"), None::<PathBuf>)
+            .await
+            .with_kind(ErrorKind::Filesystem)?;
     os_backup_file
         .write_all(&IoFormat::Cbor.to_vec(&OsBackup {
             account: ctx.account.read().await.clone(),
@@ -284,11 +238,11 @@ async fn perform_backup(
         .await
         .with_kind(ErrorKind::Filesystem)?;
 
-    let luks_folder_old = backup_guard.lock().await.as_ref().join("luks.old");
+    let luks_folder_old = backup_guard.path().join("luks.old");
     if tokio::fs::metadata(&luks_folder_old).await.is_ok() {
         tokio::fs::remove_dir_all(&luks_folder_old).await?;
     }
-    let luks_folder_bak = backup_guard.lock().await.as_ref().join("luks");
+    let luks_folder_bak = backup_guard.path().join("luks");
     if tokio::fs::metadata(&luks_folder_bak).await.is_ok() {
         tokio::fs::rename(&luks_folder_bak, &luks_folder_old).await?;
     }
@@ -298,14 +252,6 @@ async fn perform_backup(
     }
 
     let timestamp = Some(Utc::now());
-    let mut backup_guard = Arc::try_unwrap(backup_guard)
-        .map_err(|_err| {
-            Error::new(
-                eyre!("Backup guard could not ensure that the others where dropped"),
-                ErrorKind::Unknown,
-            )
-        })?
-        .into_inner();
 
     backup_guard.unencrypted_metadata.version = crate::version::Current::new().semver().into();
     backup_guard.unencrypted_metadata.full = true;
diff --git a/core/startos/src/backup/mod.rs b/core/startos/src/backup/mod.rs
index 2f3f9bd8f..d1fd57898 100644
--- a/core/startos/src/backup/mod.rs
+++ b/core/startos/src/backup/mod.rs
@@ -1,33 +1,16 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
+use std::collections::BTreeMap;
 
 use chrono::{DateTime, Utc};
-use color_eyre::eyre::eyre;
-use helpers::AtomicFile;
-use models::{ImageId, OptionExt};
+use models::PackageId;
 use reqwest::Url;
-use rpc_toolkit::command;
+use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use tokio::fs::File;
-use tokio::io::AsyncWriteExt;
-use tracing::instrument;
 
-use self::target::PackageBackupInfo;
-use crate::context::RpcContext;
-use crate::install::PKG_ARCHIVE_DIR;
-use crate::manager::manager_seed::ManagerSeed;
+use crate::context::CliContext;
 use crate::net::interface::InterfaceId;
-use crate::net::keys::Key;
+#[allow(unused_imports)]
 use crate::prelude::*;
-use crate::procedure::docker::DockerContainers;
-use crate::procedure::{NoOutput, PackageProcedure, ProcedureName};
-use crate::s9pk::manifest::PackageId;
-use crate::util::serde::{Base32, Base64, IoFormat};
-use crate::util::Version;
-use crate::version::{Current, VersionT};
-use crate::volume::{backup_dir, Volume, VolumeId, Volumes, BACKUP_DIR};
-use crate::{Error, ErrorKind, ResultExt};
+use crate::util::serde::{Base32, Base64};
 
 pub mod backup_bulk;
 pub mod os;
@@ -51,14 +34,16 @@ pub struct PackageBackupReport {
     pub error: Option<String>,
 }
 
-#[command(subcommands(backup_bulk::backup_all, target::target))]
-pub fn backup() -> Result<(), Error> {
-    Ok(())
-}
-
-#[command(rename = "backup", subcommands(restore::restore_packages_rpc))]
-pub fn package_backup() -> Result<(), Error> {
-    Ok(())
+// #[command(subcommands(backup_bulk::backup_all, target::target))]
+pub fn backup() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "create",
+            from_fn_async(backup_bulk::backup_all)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("target", target::target())
 }
 
 #[derive(Deserialize, Serialize)]
@@ -70,157 +55,3 @@ struct BackupMetadata {
     pub tor_keys: BTreeMap<InterfaceId, Base32<[u8; 64]>>, // DEPRECATED
     pub marketplace_url: Option<Url>,
 }
-
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[model = "Model<Self>"]
-pub struct BackupActions {
-    pub create: PackageProcedure,
-    pub restore: PackageProcedure,
-}
-impl BackupActions {
-    pub fn validate(
-        &self,
-        _container: &Option<DockerContainers>,
-        eos_version: &Version,
-        volumes: &Volumes,
-        image_ids: &BTreeSet<ImageId>,
-    ) -> Result<(), Error> {
-        self.create
-            .validate(eos_version, volumes, image_ids, false)
-            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Backup Create"))?;
-        self.restore
-            .validate(eos_version, volumes, image_ids, false)
-            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Backup Restore"))?;
-        Ok(())
-    }
-
-    #[instrument(skip_all)]
-    pub async fn create(&self, seed: Arc<ManagerSeed>) -> Result<PackageBackupInfo, Error> {
-        let manifest = &seed.manifest;
-        let mut volumes = seed.manifest.volumes.to_readonly();
-        let ctx = &seed.ctx;
-        let pkg_id = &manifest.id;
-        let pkg_version = &manifest.version;
-        volumes.insert(VolumeId::Backup, Volume::Backup { readonly: false });
-        let backup_dir = backup_dir(&manifest.id);
-        if tokio::fs::metadata(&backup_dir).await.is_err() {
-            tokio::fs::create_dir_all(&backup_dir).await?
-        }
-        self.create
-            .execute::<(), NoOutput>(
-                ctx,
-                pkg_id,
-                pkg_version,
-                ProcedureName::CreateBackup,
-                &volumes,
-                None,
-                None,
-            )
-            .await?
-            .map_err(|e| eyre!("{}", e.1))
-            .with_kind(crate::ErrorKind::Backup)?;
-        let (network_keys, tor_keys): (Vec<_>, Vec<_>) =
-            Key::for_package(&ctx.secret_store, pkg_id)
-                .await?
-                .into_iter()
-                .filter_map(|k| {
-                    let interface = k.interface().map(|(_, i)| i)?;
-                    Some((
-                        (interface.clone(), Base64(k.as_bytes())),
-                        (interface, Base32(k.tor_key().as_bytes())),
-                    ))
-                })
-                .unzip();
-        let marketplace_url = ctx
-            .db
-            .peek()
-            .await
-            .as_package_data()
-            .as_idx(&pkg_id)
-            .or_not_found(pkg_id)?
-            .expect_as_installed()?
-            .as_installed()
-            .as_marketplace_url()
-            .de()?;
-        let tmp_path = Path::new(BACKUP_DIR)
-            .join(pkg_id)
-            .join(format!("{}.s9pk", pkg_id));
-        let s9pk_path = ctx
-            .datadir
-            .join(PKG_ARCHIVE_DIR)
-            .join(pkg_id)
-            .join(pkg_version.as_str())
-            .join(format!("{}.s9pk", pkg_id));
-        let mut infile = File::open(&s9pk_path).await?;
-        let mut outfile = AtomicFile::new(&tmp_path, None::<PathBuf>)
-            .await
-            .with_kind(ErrorKind::Filesystem)?;
-        tokio::io::copy(&mut infile, &mut *outfile)
-            .await
-            .with_ctx(|_| {
-                (
-                    crate::ErrorKind::Filesystem,
-                    format!("cp {} -> {}", s9pk_path.display(), tmp_path.display()),
-                )
-            })?;
-        outfile.save().await.with_kind(ErrorKind::Filesystem)?;
-        let timestamp = Utc::now();
-        let metadata_path = Path::new(BACKUP_DIR).join(pkg_id).join("metadata.cbor");
-        let mut outfile = AtomicFile::new(&metadata_path, None::<PathBuf>)
-            .await
-            .with_kind(ErrorKind::Filesystem)?;
-        let network_keys = network_keys.into_iter().collect();
-        let tor_keys = tor_keys.into_iter().collect();
-        outfile
-            .write_all(&IoFormat::Cbor.to_vec(&BackupMetadata {
-                timestamp,
-                network_keys,
-                tor_keys,
-                marketplace_url,
-            })?)
-            .await?;
-        outfile.save().await.with_kind(ErrorKind::Filesystem)?;
-        Ok(PackageBackupInfo {
-            os_version: Current::new().semver().into(),
-            title: manifest.title.clone(),
-            version: pkg_version.clone(),
-            timestamp,
-        })
-    }
-
-    #[instrument(skip_all)]
-    pub async fn restore(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-    ) -> Result<Option<Url>, Error> {
-        let mut volumes = volumes.clone();
-        volumes.insert(VolumeId::Backup, Volume::Backup { readonly: true });
-        self.restore
-            .execute::<(), NoOutput>(
-                ctx,
-                pkg_id,
-                pkg_version,
-                ProcedureName::RestoreBackup,
-                &volumes,
-                None,
-                None,
-            )
-            .await?
-            .map_err(|e| eyre!("{}", e.1))
-            .with_kind(crate::ErrorKind::Restore)?;
-        let metadata_path = Path::new(BACKUP_DIR).join(pkg_id).join("metadata.cbor");
-        let metadata: BackupMetadata = IoFormat::Cbor.from_slice(
-            &tokio::fs::read(&metadata_path).await.with_ctx(|_| {
-                (
-                    crate::ErrorKind::Filesystem,
-                    metadata_path.display().to_string(),
-                )
-            })?,
-        )?;
-
-        Ok(metadata.marketplace_url)
-    }
-}
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index b72b319e2..404c12c6b 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -1,55 +1,46 @@
 use std::collections::BTreeMap;
-use std::path::Path;
-use std::sync::atomic::Ordering;
 use std::sync::Arc;
-use std::time::Duration;
 
-use clap::ArgMatches;
-use futures::future::BoxFuture;
-use futures::{stream, FutureExt, StreamExt};
+use clap::Parser;
+use futures::{stream, StreamExt};
+use models::PackageId;
 use openssl::x509::X509;
-use rpc_toolkit::command;
-use sqlx::Connection;
-use tokio::fs::File;
+use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
 use tracing::instrument;
 
 use super::target::BackupTargetId;
 use crate::backup::os::OsBackup;
-use crate::backup::BackupMetadata;
-use crate::context::rpc::RpcContextConfig;
 use crate::context::{RpcContext, SetupContext};
-use crate::db::model::{PackageDataEntry, PackageDataEntryRestoring, StaticFiles};
-use crate::disk::mount::backup::{BackupMountGuard, PackageBackupMountGuard};
+use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::ReadWrite;
-use crate::disk::mount::guard::TmpMountGuard;
+use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
 use crate::hostname::Hostname;
 use crate::init::init;
-use crate::install::progress::InstallProgress;
-use crate::install::{download_install_s9pk, PKG_PUBLIC_DIR};
-use crate::notifications::NotificationLevel;
 use crate::prelude::*;
-use crate::s9pk::manifest::{Manifest, PackageId};
-use crate::s9pk::reader::S9pkReader;
-use crate::setup::SetupStatus;
-use crate::util::display_none;
-use crate::util::io::dir_size;
+use crate::s9pk::S9pk;
+use crate::service::service_map::DownloadInstallFuture;
 use crate::util::serde::IoFormat;
-use crate::volume::{backup_dir, BACKUP_DIR, PKG_VOLUME_DIR};
 
-fn parse_comma_separated(arg: &str, _: &ArgMatches) -> Result<Vec<PackageId>, Error> {
-    arg.split(',')
-        .map(|s| s.trim().parse().map_err(Error::from))
-        .collect()
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct RestorePackageParams {
+    pub ids: Vec<PackageId>,
+    pub target_id: BackupTargetId,
+    pub password: String,
 }
 
-#[command(rename = "restore", display(display_none))]
+// TODO dr Why doesn't anything use this
+// #[command(rename = "restore", display(display_none))]
 #[instrument(skip(ctx, password))]
 pub async fn restore_packages_rpc(
-    #[context] ctx: RpcContext,
-    #[arg(parse(parse_comma_separated))] ids: Vec<PackageId>,
-    #[arg(rename = "target-id")] target_id: BackupTargetId,
-    #[arg] password: String,
+    ctx: RpcContext,
+    RestorePackageParams {
+        ids,
+        target_id,
+        password,
+    }: RestorePackageParams,
 ) -> Result<(), Error> {
     let fs = target_id
         .load(ctx.secret_store.acquire().await?.as_mut())
@@ -57,114 +48,25 @@ pub async fn restore_packages_rpc(
     let backup_guard =
         BackupMountGuard::mount(TmpMountGuard::mount(&fs, ReadWrite).await?, &password).await?;
 
-    let (backup_guard, tasks, _) = restore_packages(&ctx, backup_guard, ids).await?;
+    let tasks = restore_packages(&ctx, backup_guard, ids).await?;
 
     tokio::spawn(async move {
-        stream::iter(tasks.into_iter().map(|x| (x, ctx.clone())))
-            .for_each_concurrent(5, |(res, ctx)| async move {
-                match res.await {
-                    (Ok(_), _) => (),
-                    (Err(err), package_id) => {
-                        if let Err(err) = ctx
-                            .notification_manager
-                            .notify(
-                                ctx.db.clone(),
-                                Some(package_id.clone()),
-                                NotificationLevel::Error,
-                                "Restoration Failure".to_string(),
-                                format!("Error restoring package {}: {}", package_id, err),
-                                (),
-                                None,
-                            )
-                            .await
-                        {
-                            tracing::error!("Failed to notify: {}", err);
-                            tracing::debug!("{:?}", err);
-                        };
-                        tracing::error!("Error restoring package {}: {}", package_id, err);
+        stream::iter(tasks)
+            .for_each_concurrent(5, |(id, res)| async move {
+                match async { res.await?.await }.await {
+                    Ok(_) => (),
+                    Err(err) => {
+                        tracing::error!("Error restoring package {}: {}", id, err);
                         tracing::debug!("{:?}", err);
                     }
                 }
             })
             .await;
-        if let Err(e) = backup_guard.unmount().await {
-            tracing::error!("Error unmounting backup drive: {}", e);
-            tracing::debug!("{:?}", e);
-        }
     });
 
     Ok(())
 }
 
-async fn approximate_progress(
-    rpc_ctx: &RpcContext,
-    progress: &mut ProgressInfo,
-) -> Result<(), Error> {
-    for (id, size) in &mut progress.target_volume_size {
-        let dir = rpc_ctx.datadir.join(PKG_VOLUME_DIR).join(id).join("data");
-        if tokio::fs::metadata(&dir).await.is_err() {
-            *size = 0;
-        } else {
-            *size = dir_size(&dir, None).await?;
-        }
-    }
-    Ok(())
-}
-
-async fn approximate_progress_loop(
-    ctx: &SetupContext,
-    rpc_ctx: &RpcContext,
-    mut starting_info: ProgressInfo,
-) {
-    loop {
-        if let Err(e) = approximate_progress(rpc_ctx, &mut starting_info).await {
-            tracing::error!("Failed to approximate restore progress: {}", e);
-            tracing::debug!("{:?}", e);
-        } else {
-            *ctx.setup_status.write().await = Some(Ok(starting_info.flatten()));
-        }
-        tokio::time::sleep(Duration::from_secs(1)).await;
-    }
-}
-
-#[derive(Debug, Default)]
-struct ProgressInfo {
-    package_installs: BTreeMap<PackageId, Arc<InstallProgress>>,
-    src_volume_size: BTreeMap<PackageId, u64>,
-    target_volume_size: BTreeMap<PackageId, u64>,
-}
-impl ProgressInfo {
-    fn flatten(&self) -> SetupStatus {
-        let mut total_bytes = 0;
-        let mut bytes_transferred = 0;
-
-        for progress in self.package_installs.values() {
-            total_bytes += ((progress.size.unwrap_or(0) as f64) * 2.2) as u64;
-            bytes_transferred += progress.downloaded.load(Ordering::SeqCst);
-            bytes_transferred += ((progress.validated.load(Ordering::SeqCst) as f64) * 0.2) as u64;
-            bytes_transferred += progress.unpacked.load(Ordering::SeqCst);
-        }
-
-        for size in self.src_volume_size.values() {
-            total_bytes += *size;
-        }
-
-        for size in self.target_volume_size.values() {
-            bytes_transferred += *size;
-        }
-
-        if bytes_transferred > total_bytes {
-            bytes_transferred = total_bytes;
-        }
-
-        SetupStatus {
-            total_bytes: Some(total_bytes),
-            bytes_transferred,
-            complete: false,
-        }
-    }
-}
-
 #[instrument(skip(ctx))]
 pub async fn recover_full_embassy(
     ctx: SetupContext,
@@ -179,7 +81,7 @@ pub async fn recover_full_embassy(
     )
     .await?;
 
-    let os_backup_path = backup_guard.as_ref().join("os-backup.cbor");
+    let os_backup_path = backup_guard.path().join("os-backup.cbor");
     let mut os_backup: OsBackup = IoFormat::Cbor.from_slice(
         &tokio::fs::read(&os_backup_path)
             .await
@@ -199,11 +101,9 @@ pub async fn recover_full_embassy(
 
     secret_store.close().await;
 
-    let cfg = RpcContextConfig::load(ctx.config_path.clone()).await?;
+    init(&ctx.config).await?;
 
-    init(&cfg).await?;
-
-    let rpc_ctx = RpcContext::init(ctx.config_path.clone(), disk_guid.clone()).await?;
+    let rpc_ctx = RpcContext::init(&ctx.config, disk_guid.clone()).await?;
 
     let ids: Vec<_> = backup_guard
         .metadata
@@ -211,37 +111,19 @@ pub async fn recover_full_embassy(
         .keys()
         .cloned()
         .collect();
-    let (backup_guard, tasks, progress_info) =
-        restore_packages(&rpc_ctx, backup_guard, ids).await?;
-    let task_consumer_rpc_ctx = rpc_ctx.clone();
-    tokio::select! {
-        _ = async move {
-            stream::iter(tasks.into_iter().map(|x| (x,  task_consumer_rpc_ctx.clone())))
-                .for_each_concurrent(5, |(res, ctx)| async move {
-                    match res.await {
-                        (Ok(_), _) => (),
-                        (Err(err), package_id) => {
-                            if let Err(err) = ctx.notification_manager.notify(
-                                ctx.db.clone(),
-                                Some(package_id.clone()),
-                                NotificationLevel::Error,
-                                "Restoration Failure".to_string(), format!("Error restoring package {}: {}", package_id,err), (), None).await{
-                                tracing::error!("Failed to notify: {}", err);
-                                tracing::debug!("{:?}", err);
-                                };
-                            tracing::error!("Error restoring package {}: {}", package_id, err);
-                            tracing::debug!("{:?}", err);
-                        },
-                    }
-                }).await;
-
-        } => {
-
-        },
-        _ = approximate_progress_loop(&ctx, &rpc_ctx, progress_info) => unreachable!(concat!(module_path!(), "::approximate_progress_loop should not terminate")),
-    }
+    let tasks = restore_packages(&rpc_ctx, backup_guard, ids).await?;
+    stream::iter(tasks)
+        .for_each_concurrent(5, |(id, res)| async move {
+            match async { res.await?.await }.await {
+                Ok(_) => (),
+                Err(err) => {
+                    tracing::error!("Error restoring package {}: {}", id, err);
+                    tracing::debug!("{:?}", err);
+                }
+            }
+        })
+        .await;
 
-    backup_guard.unmount().await?;
     rpc_ctx.shutdown().await?;
 
     Ok((
@@ -257,205 +139,25 @@ async fn restore_packages(
     ctx: &RpcContext,
     backup_guard: BackupMountGuard<TmpMountGuard>,
     ids: Vec<PackageId>,
-) -> Result<
-    (
-        BackupMountGuard<TmpMountGuard>,
-        Vec<BoxFuture<'static, (Result<(), Error>, PackageId)>>,
-        ProgressInfo,
-    ),
-    Error,
-> {
-    let guards = assure_restoring(ctx, ids, &backup_guard).await?;
-
-    let mut progress_info = ProgressInfo::default();
-
-    let mut tasks = Vec::with_capacity(guards.len());
-    for (manifest, guard) in guards {
-        let id = manifest.id.clone();
-        let (progress, task) = restore_package(ctx.clone(), manifest, guard).await?;
-        progress_info
-            .package_installs
-            .insert(id.clone(), progress.clone());
-        progress_info
-            .src_volume_size
-            .insert(id.clone(), dir_size(backup_dir(&id), None).await?);
-        progress_info.target_volume_size.insert(id.clone(), 0);
-        let package_id = id.clone();
-        tasks.push(
-            async move {
-                if let Err(e) = task.await {
-                    tracing::error!("Error restoring package {}: {}", id, e);
-                    tracing::debug!("{:?}", e);
-                    Err(e)
-                } else {
-                    Ok(())
-                }
-            }
-            .map(|x| (x, package_id))
-            .boxed(),
-        );
-    }
-
-    Ok((backup_guard, tasks, progress_info))
-}
-
-#[instrument(skip(ctx, backup_guard))]
-async fn assure_restoring(
-    ctx: &RpcContext,
-    ids: Vec<PackageId>,
-    backup_guard: &BackupMountGuard<TmpMountGuard>,
-) -> Result<Vec<(Manifest, PackageBackupMountGuard)>, Error> {
-    let mut guards = Vec::with_capacity(ids.len());
-
-    let mut insert_packages = BTreeMap::new();
-
+) -> Result<BTreeMap<PackageId, DownloadInstallFuture>, Error> {
+    let backup_guard = Arc::new(backup_guard);
+    let mut tasks = BTreeMap::new();
     for id in ids {
-        let peek = ctx.db.peek().await;
-
-        let model = peek.as_package_data().as_idx(&id);
-
-        if !model.is_none() {
-            return Err(Error::new(
-                eyre!("Can't restore over existing package: {}", id),
-                crate::ErrorKind::InvalidRequest,
-            ));
-        }
-        let guard = backup_guard.mount_package_backup(&id).await?;
-        let s9pk_path = Path::new(BACKUP_DIR).join(&id).join(format!("{}.s9pk", id));
-        let mut rdr = S9pkReader::open(&s9pk_path, false).await?;
-
-        let manifest = rdr.manifest().await?;
-        let version = manifest.version.clone();
-        let progress = Arc::new(InstallProgress::new(Some(
-            tokio::fs::metadata(&s9pk_path).await?.len(),
-        )));
-
-        let public_dir_path = ctx
-            .datadir
-            .join(PKG_PUBLIC_DIR)
-            .join(&id)
-            .join(version.as_str());
-        tokio::fs::create_dir_all(&public_dir_path).await?;
-
-        let license_path = public_dir_path.join("LICENSE.md");
-        let mut dst = File::create(&license_path).await?;
-        tokio::io::copy(&mut rdr.license().await?, &mut dst).await?;
-        dst.sync_all().await?;
-
-        let instructions_path = public_dir_path.join("INSTRUCTIONS.md");
-        let mut dst = File::create(&instructions_path).await?;
-        tokio::io::copy(&mut rdr.instructions().await?, &mut dst).await?;
-        dst.sync_all().await?;
-
-        let icon_path = Path::new("icon").with_extension(&manifest.assets.icon_type());
-        let icon_path = public_dir_path.join(&icon_path);
-        let mut dst = File::create(&icon_path).await?;
-        tokio::io::copy(&mut rdr.icon().await?, &mut dst).await?;
-        dst.sync_all().await?;
-        insert_packages.insert(
-            id.clone(),
-            PackageDataEntry::Restoring(PackageDataEntryRestoring {
-                install_progress: progress.clone(),
-                static_files: StaticFiles::local(&id, &version, manifest.assets.icon_type()),
-                manifest: manifest.clone(),
-            }),
-        );
-
-        guards.push((manifest, guard));
-    }
-    ctx.db
-        .mutate(|db| {
-            for (id, package) in insert_packages {
-                db.as_package_data_mut().insert(&id, &package)?;
-            }
-            Ok(())
-        })
-        .await?;
-    Ok(guards)
-}
-
-#[instrument(skip(ctx, guard))]
-async fn restore_package<'a>(
-    ctx: RpcContext,
-    manifest: Manifest,
-    guard: PackageBackupMountGuard,
-) -> Result<(Arc<InstallProgress>, BoxFuture<'static, Result<(), Error>>), Error> {
-    let id = manifest.id.clone();
-    let s9pk_path = Path::new(BACKUP_DIR)
-        .join(&manifest.id)
-        .join(format!("{}.s9pk", id));
-
-    let metadata_path = Path::new(BACKUP_DIR).join(&id).join("metadata.cbor");
-    let metadata: BackupMetadata = IoFormat::Cbor.from_slice(
-        &tokio::fs::read(&metadata_path)
-            .await
-            .with_ctx(|_| (ErrorKind::Filesystem, metadata_path.display().to_string()))?,
-    )?;
-
-    let mut secrets = ctx.secret_store.acquire().await?;
-    let mut secrets_tx = secrets.begin().await?;
-    for (iface, key) in metadata.network_keys {
-        let k = key.0.as_slice();
-        sqlx::query!(
-            "INSERT INTO network_keys (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO NOTHING",
-            id.to_string(),
-            iface.to_string(),
-            k,
-        )
-        .execute(secrets_tx.as_mut()).await?;
-    }
-    // DEPRECATED
-    for (iface, key) in metadata.tor_keys {
-        let k = key.0.as_slice();
-        sqlx::query!(
-            "INSERT INTO tor (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO NOTHING",
-            id.to_string(),
-            iface.to_string(),
-            k,
-        )
-        .execute(secrets_tx.as_mut()).await?;
-    }
-    secrets_tx.commit().await?;
-    drop(secrets);
-
-    let len = tokio::fs::metadata(&s9pk_path)
-        .await
-        .with_ctx(|_| (ErrorKind::Filesystem, s9pk_path.display().to_string()))?
-        .len();
-    let file = File::open(&s9pk_path)
-        .await
-        .with_ctx(|_| (ErrorKind::Filesystem, s9pk_path.display().to_string()))?;
-
-    let progress = InstallProgress::new(Some(len));
-    let marketplace_url = metadata.marketplace_url;
-
-    let progress = Arc::new(progress);
-
-    ctx.db
-        .mutate(|db| {
-            db.as_package_data_mut().insert(
-                &id,
-                &PackageDataEntry::Restoring(PackageDataEntryRestoring {
-                    install_progress: progress.clone(),
-                    static_files: StaticFiles::local(
-                        &id,
-                        &manifest.version,
-                        manifest.assets.icon_type(),
-                    ),
-                    manifest: manifest.clone(),
-                }),
+        let backup_dir = backup_guard.clone().package_backup(&id);
+        let task = ctx
+            .services
+            .install(
+                ctx.clone(),
+                S9pk::open(
+                    backup_dir.path().join(&id).with_extension("s9pk"),
+                    Some(&id),
+                )
+                .await?,
+                Some(backup_dir),
             )
-        })
-        .await?;
-    Ok((
-        progress.clone(),
-        async move {
-            download_install_s9pk(ctx, manifest, marketplace_url, progress, file, None).await?;
-
-            guard.unmount().await?;
+            .await?;
+        tasks.insert(id, task);
+    }
 
-            Ok(())
-        }
-        .boxed(),
-    ))
+    Ok(tasks)
 }
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index 3f3251535..4f3ee4827 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -1,19 +1,19 @@
 use std::path::{Path, PathBuf};
 
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::TryStreamExt;
-use rpc_toolkit::command;
+use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use sqlx::{Executor, Postgres};
 
 use super::{BackupTarget, BackupTargetId};
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::filesystem::ReadOnly;
-use crate::disk::mount::guard::TmpMountGuard;
+use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
 use crate::disk::util::{recovery_info, EmbassyOsRecoveryInfo};
 use crate::prelude::*;
-use crate::util::display_none;
 use crate::util::serde::KeyVal;
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -26,18 +26,46 @@ pub struct CifsBackupTarget {
     embassy_os: Option<EmbassyOsRecoveryInfo>,
 }
 
-#[command(subcommands(add, update, remove))]
-pub fn cifs() -> Result<(), Error> {
-    Ok(())
+pub fn cifs() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "add",
+            from_fn_async(add)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "update",
+            from_fn_async(update)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct AddParams {
+    pub hostname: String,
+    pub path: PathBuf,
+    pub username: String,
+    pub password: Option<String>,
 }
 
-#[command(display(display_none))]
 pub async fn add(
-    #[context] ctx: RpcContext,
-    #[arg] hostname: String,
-    #[arg] path: PathBuf,
-    #[arg] username: String,
-    #[arg] password: Option<String>,
+    ctx: RpcContext,
+    AddParams {
+        hostname,
+        path,
+        username,
+        password,
+    }: AddParams,
 ) -> Result<KeyVal<BackupTargetId, BackupTarget>, Error> {
     let cifs = Cifs {
         hostname,
@@ -46,7 +74,7 @@ pub async fn add(
         password,
     };
     let guard = TmpMountGuard::mount(&cifs, ReadOnly).await?;
-    let embassy_os = recovery_info(&guard).await?;
+    let embassy_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
     let path_string = Path::new("/").join(&cifs.path).display().to_string();
     let id: i32 = sqlx::query!(
@@ -70,14 +98,26 @@ pub async fn add(
     })
 }
 
-#[command(display(display_none))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct UpdateParams {
+    pub id: BackupTargetId,
+    pub hostname: String,
+    pub path: PathBuf,
+    pub username: String,
+    pub password: Option<String>,
+}
+
 pub async fn update(
-    #[context] ctx: RpcContext,
-    #[arg] id: BackupTargetId,
-    #[arg] hostname: String,
-    #[arg] path: PathBuf,
-    #[arg] username: String,
-    #[arg] password: Option<String>,
+    ctx: RpcContext,
+    UpdateParams {
+        id,
+        hostname,
+        path,
+        username,
+        password,
+    }: UpdateParams,
 ) -> Result<KeyVal<BackupTargetId, BackupTarget>, Error> {
     let id = if let BackupTargetId::Cifs { id } = id {
         id
@@ -94,7 +134,7 @@ pub async fn update(
         password,
     };
     let guard = TmpMountGuard::mount(&cifs, ReadOnly).await?;
-    let embassy_os = recovery_info(&guard).await?;
+    let embassy_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
     let path_string = Path::new("/").join(&cifs.path).display().to_string();
     if sqlx::query!(
@@ -127,8 +167,14 @@ pub async fn update(
     })
 }
 
-#[command(display(display_none))]
-pub async fn remove(#[context] ctx: RpcContext, #[arg] id: BackupTargetId) -> Result<(), Error> {
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct RemoveParams {
+    pub id: BackupTargetId,
+}
+
+pub async fn remove(ctx: RpcContext, RemoveParams { id }: RemoveParams) -> Result<(), Error> {
     let id = if let BackupTargetId::Cifs { id } = id {
         id
     } else {
@@ -189,7 +235,7 @@ where
             };
             let embassy_os = async {
                 let guard = TmpMountGuard::mount(&mount_info, ReadOnly).await?;
-                let embassy_os = recovery_info(&guard).await?;
+                let embassy_os = recovery_info(guard.path()).await?;
                 guard.unmount().await?;
                 Ok::<_, Error>(embassy_os)
             }
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index 93e56c2d3..473b2865d 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -1,13 +1,14 @@
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
-use async_trait::async_trait;
 use chrono::{DateTime, Utc};
-use clap::ArgMatches;
+use clap::builder::ValueParserFactory;
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
-use rpc_toolkit::command;
+use models::PackageId;
+use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 use sqlx::{Executor, Postgres};
@@ -15,17 +16,19 @@ use tokio::sync::Mutex;
 use tracing::instrument;
 
 use self::cifs::CifsBackupTarget;
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
 use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::filesystem::{FileSystem, MountType, ReadWrite};
-use crate::disk::mount::guard::TmpMountGuard;
+use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
 use crate::disk::util::PartitionInfo;
 use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::util::serde::{deserialize_from_str, display_serializable, serialize_display};
-use crate::util::{display_none, Version};
+use crate::util::clap::FromStrParser;
+use crate::util::serde::{
+    deserialize_from_str, display_serializable, serialize_display, HandlerExtSerde, WithIoFormat,
+};
+use crate::util::Version;
 
 pub mod cifs;
 
@@ -84,6 +87,12 @@ impl std::str::FromStr for BackupTargetId {
         }
     }
 }
+impl ValueParserFactory for BackupTargetId {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
 impl<'de> Deserialize<'de> for BackupTargetId {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -108,9 +117,8 @@ pub enum BackupTargetFS {
     Disk(BlockDev<PathBuf>),
     Cifs(Cifs),
 }
-#[async_trait]
 impl FileSystem for BackupTargetFS {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
+    async fn mount<P: AsRef<Path> + Send>(
         &self,
         mountpoint: P,
         mount_type: MountType,
@@ -130,15 +138,29 @@ impl FileSystem for BackupTargetFS {
     }
 }
 
-#[command(subcommands(cifs::cifs, list, info, mount, umount))]
-pub fn target() -> Result<(), Error> {
-    Ok(())
+// #[command(subcommands(cifs::cifs, list, info, mount, umount))]
+pub fn target() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("cifs", cifs::cifs())
+        .subcommand(
+            "list",
+            from_fn_async(list)
+                .with_display_serializable()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "info",
+            from_fn_async(info)
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|params, info| {
+                    Ok(display_backup_info(params.params, info))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
-#[command(display(display_serializable))]
-pub async fn list(
-    #[context] ctx: RpcContext,
-) -> Result<BTreeMap<BackupTargetId, BackupTarget>, Error> {
+// #[command(display(display_serializable))]
+pub async fn list(ctx: RpcContext) -> Result<BTreeMap<BackupTargetId, BackupTarget>, Error> {
     let mut sql_handle = ctx.secret_store.acquire().await?;
     let (disks_res, cifs) = tokio::try_join!(
         crate::disk::util::list(&ctx.os_partitions),
@@ -187,11 +209,11 @@ pub struct PackageBackupInfo {
     pub timestamp: DateTime<Utc>,
 }
 
-fn display_backup_info(info: BackupInfo, matches: &ArgMatches) {
+fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(info, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, info);
     }
 
     let mut table = Table::new();
@@ -223,12 +245,21 @@ fn display_backup_info(info: BackupInfo, matches: &ArgMatches) {
     table.print_tty(false).unwrap();
 }
 
-#[command(display(display_backup_info))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct InfoParams {
+    target_id: BackupTargetId,
+    password: String,
+}
+
 #[instrument(skip(ctx, password))]
 pub async fn info(
-    #[context] ctx: RpcContext,
-    #[arg(rename = "target-id")] target_id: BackupTargetId,
-    #[arg] password: String,
+    ctx: RpcContext,
+    InfoParams {
+        target_id,
+        password,
+    }: InfoParams,
 ) -> Result<BackupInfo, Error> {
     let guard = BackupMountGuard::mount(
         TmpMountGuard::mount(
@@ -254,17 +285,26 @@ lazy_static::lazy_static! {
         Mutex::new(BTreeMap::new());
 }
 
-#[command]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct MountParams {
+    target_id: BackupTargetId,
+    password: String,
+}
+
 #[instrument(skip_all)]
 pub async fn mount(
-    #[context] ctx: RpcContext,
-    #[arg(rename = "target-id")] target_id: BackupTargetId,
-    #[arg] password: String,
+    ctx: RpcContext,
+    MountParams {
+        target_id,
+        password,
+    }: MountParams,
 ) -> Result<String, Error> {
     let mut mounts = USER_MOUNTS.lock().await;
 
     if let Some(existing) = mounts.get(&target_id) {
-        return Ok(existing.as_ref().display().to_string());
+        return Ok(existing.path().display().to_string());
     }
 
     let guard = BackupMountGuard::mount(
@@ -280,19 +320,23 @@ pub async fn mount(
     )
     .await?;
 
-    let res = guard.as_ref().display().to_string();
+    let res = guard.path().display().to_string();
 
     mounts.insert(target_id, guard);
 
     Ok(res)
 }
-#[command(display(display_none))]
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct UmountParams {
+    target_id: Option<BackupTargetId>,
+}
+
 #[instrument(skip_all)]
-pub async fn umount(
-    #[context] _ctx: RpcContext,
-    #[arg(rename = "target-id")] target_id: Option<BackupTargetId>,
-) -> Result<(), Error> {
-    let mut mounts = USER_MOUNTS.lock().await;
+pub async fn umount(_: RpcContext, UmountParams { target_id }: UmountParams) -> Result<(), Error> {
+    let mut mounts = USER_MOUNTS.lock().await; // TODO: move to context
     if let Some(target_id) = target_id {
         if let Some(existing) = mounts.remove(&target_id) {
             existing.unmount().await?;
diff --git a/core/startos/src/bins/avahi_alias.rs b/core/startos/src/bins/avahi_alias.rs
deleted file mode 100644
index 3c4a4fe7e..000000000
--- a/core/startos/src/bins/avahi_alias.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use avahi_sys::{
-    self, avahi_client_errno, avahi_entry_group_add_service, avahi_entry_group_commit,
-    avahi_strerror, AvahiClient,
-};
-
-fn log_str_error(action: &str, e: i32) {
-    unsafe {
-        let e_str = avahi_strerror(e);
-        eprintln!(
-            "Could not {}: {:?}",
-            action,
-            std::ffi::CStr::from_ptr(e_str)
-        );
-    }
-}
-
-pub fn main() {
-    let aliases: Vec<_> = std::env::args().skip(1).collect();
-    unsafe {
-        let simple_poll = avahi_sys::avahi_simple_poll_new();
-        let poll = avahi_sys::avahi_simple_poll_get(simple_poll);
-        let mut box_err = Box::pin(0 as i32);
-        let err_c: *mut i32 = box_err.as_mut().get_mut();
-        let avahi_client = avahi_sys::avahi_client_new(
-            poll,
-            avahi_sys::AvahiClientFlags::AVAHI_CLIENT_NO_FAIL,
-            Some(client_callback),
-            std::ptr::null_mut(),
-            err_c,
-        );
-        if avahi_client == std::ptr::null_mut::<AvahiClient>() {
-            log_str_error("create Avahi client", *box_err);
-            panic!("Failed to create Avahi Client");
-        }
-        let group = avahi_sys::avahi_entry_group_new(
-            avahi_client,
-            Some(entry_group_callback),
-            std::ptr::null_mut(),
-        );
-        if group == std::ptr::null_mut() {
-            log_str_error("create Avahi entry group", avahi_client_errno(avahi_client));
-            panic!("Failed to create Avahi Entry Group");
-        }
-        let mut hostname_buf = vec![0];
-        let hostname_raw = avahi_sys::avahi_client_get_host_name_fqdn(avahi_client);
-        hostname_buf.extend_from_slice(std::ffi::CStr::from_ptr(hostname_raw).to_bytes_with_nul());
-        let buflen = hostname_buf.len();
-        debug_assert!(hostname_buf.ends_with(b".local\0"));
-        debug_assert!(!hostname_buf[..(buflen - 7)].contains(&b'.'));
-        // assume fixed length prefix on hostname due to local address
-        hostname_buf[0] = (buflen - 8) as u8; // set the prefix length to len - 8 (leading byte, .local, nul) for the main address
-        hostname_buf[buflen - 7] = 5; // set the prefix length to 5 for "local"
-        let mut res;
-        let http_tcp_cstr =
-            std::ffi::CString::new("_http._tcp").expect("Could not cast _http._tcp to c string");
-        res = avahi_entry_group_add_service(
-            group,
-            avahi_sys::AVAHI_IF_UNSPEC,
-            avahi_sys::AVAHI_PROTO_UNSPEC,
-            avahi_sys::AvahiPublishFlags_AVAHI_PUBLISH_USE_MULTICAST,
-            hostname_raw,
-            http_tcp_cstr.as_ptr(),
-            std::ptr::null(),
-            std::ptr::null(),
-            443,
-            // below is a secret final argument that the type signature of this function does not tell you that it
-            // needs. This is because the C lib function takes a variable number of final arguments indicating the
-            // desired TXT records to add to this service entry. The way it decides when to stop taking arguments
-            // from the stack and dereferencing them is when it finds a null pointer...because fuck you, that's why.
-            // The consequence of this is that forgetting this last argument will cause segfaults or other undefined
-            // behavior. Welcome back to the stone age motherfucker.
-            std::ptr::null::<libc::c_char>(),
-        );
-        if res < avahi_sys::AVAHI_OK {
-            log_str_error("add service to Avahi entry group", res);
-            panic!("Failed to load Avahi services");
-        }
-        eprintln!("Published {:?}", std::ffi::CStr::from_ptr(hostname_raw));
-        for alias in aliases {
-            let lan_address = alias + ".local";
-            let lan_address_ptr = std::ffi::CString::new(lan_address)
-                .expect("Could not cast lan address to c string");
-            res = avahi_sys::avahi_entry_group_add_record(
-                group,
-                avahi_sys::AVAHI_IF_UNSPEC,
-                avahi_sys::AVAHI_PROTO_UNSPEC,
-                avahi_sys::AvahiPublishFlags_AVAHI_PUBLISH_USE_MULTICAST
-                    | avahi_sys::AvahiPublishFlags_AVAHI_PUBLISH_ALLOW_MULTIPLE,
-                lan_address_ptr.as_ptr(),
-                avahi_sys::AVAHI_DNS_CLASS_IN as u16,
-                avahi_sys::AVAHI_DNS_TYPE_CNAME as u16,
-                avahi_sys::AVAHI_DEFAULT_TTL,
-                hostname_buf.as_ptr().cast(),
-                hostname_buf.len(),
-            );
-            if res < avahi_sys::AVAHI_OK {
-                log_str_error("add CNAME record to Avahi entry group", res);
-                panic!("Failed to load Avahi services");
-            }
-            eprintln!("Published {:?}", lan_address_ptr);
-        }
-        let commit_err = avahi_entry_group_commit(group);
-        if commit_err < avahi_sys::AVAHI_OK {
-            log_str_error("reset Avahi entry group", commit_err);
-            panic!("Failed to load Avahi services: reset");
-        }
-    }
-    std::thread::park()
-}
-
-unsafe extern "C" fn entry_group_callback(
-    _group: *mut avahi_sys::AvahiEntryGroup,
-    state: avahi_sys::AvahiEntryGroupState,
-    _userdata: *mut core::ffi::c_void,
-) {
-    match state {
-        avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_FAILURE => {
-            eprintln!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_FAILURE");
-        }
-        avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_COLLISION => {
-            eprintln!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_COLLISION");
-        }
-        avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_UNCOMMITED => {
-            eprintln!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_UNCOMMITED");
-        }
-        avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_ESTABLISHED => {
-            eprintln!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_ESTABLISHED");
-        }
-        avahi_sys::AvahiEntryGroupState_AVAHI_ENTRY_GROUP_REGISTERING => {
-            eprintln!("AvahiCallback: EntryGroupState = AVAHI_ENTRY_GROUP_REGISTERING");
-        }
-        other => {
-            eprintln!("AvahiCallback: EntryGroupState = {}", other);
-        }
-    }
-}
-
-unsafe extern "C" fn client_callback(
-    _group: *mut avahi_sys::AvahiClient,
-    state: avahi_sys::AvahiClientState,
-    _userdata: *mut core::ffi::c_void,
-) {
-    match state {
-        avahi_sys::AvahiClientState_AVAHI_CLIENT_FAILURE => {
-            eprintln!("AvahiCallback: ClientState = AVAHI_CLIENT_FAILURE");
-        }
-        avahi_sys::AvahiClientState_AVAHI_CLIENT_S_RUNNING => {
-            eprintln!("AvahiCallback: ClientState = AVAHI_CLIENT_S_RUNNING");
-        }
-        avahi_sys::AvahiClientState_AVAHI_CLIENT_CONNECTING => {
-            eprintln!("AvahiCallback: ClientState = AVAHI_CLIENT_CONNECTING");
-        }
-        avahi_sys::AvahiClientState_AVAHI_CLIENT_S_COLLISION => {
-            eprintln!("AvahiCallback: ClientState = AVAHI_CLIENT_S_COLLISION");
-        }
-        avahi_sys::AvahiClientState_AVAHI_CLIENT_S_REGISTERING => {
-            eprintln!("AvahiCallback: ClientState = AVAHI_CLIENT_S_REGISTERING");
-        }
-        other => {
-            eprintln!("AvahiCallback: ClientState = {}", other);
-        }
-    }
-}
diff --git a/core/startos/src/bins/container_cli.rs b/core/startos/src/bins/container_cli.rs
new file mode 100644
index 000000000..a33a99131
--- /dev/null
+++ b/core/startos/src/bins/container_cli.rs
@@ -0,0 +1,38 @@
+use std::ffi::OsString;
+
+use rpc_toolkit::CliApp;
+use serde_json::Value;
+
+use crate::service::cli::{ContainerCliContext, ContainerClientConfig};
+use crate::util::logger::EmbassyLogger;
+use crate::version::{Current, VersionT};
+
+lazy_static::lazy_static! {
+    static ref VERSION_STRING: String = Current::new().semver().to_string();
+}
+
+pub fn main(args: impl IntoIterator<Item = OsString>) {
+    EmbassyLogger::init();
+    if let Err(e) = CliApp::new(
+        |cfg: ContainerClientConfig| Ok(ContainerCliContext::init(cfg)),
+        crate::service::service_effect_handler::service_effect_handler(),
+    )
+    .run(args)
+    {
+        match e.data {
+            Some(Value::String(s)) => eprintln!("{}: {}", e.message, s),
+            Some(Value::Object(o)) => {
+                if let Some(Value::String(s)) = o.get("details") {
+                    eprintln!("{}: {}", e.message, s);
+                    if let Some(Value::String(s)) = o.get("debug") {
+                        tracing::debug!("{}", s)
+                    }
+                }
+            }
+            Some(a) => eprintln!("{}: {}", e.message, a),
+            None => eprintln!("{}", e.message),
+        }
+
+        std::process::exit(e.code);
+    }
+}
diff --git a/core/startos/src/bins/mod.rs b/core/startos/src/bins/mod.rs
index d5b932019..68f2802e0 100644
--- a/core/startos/src/bins/mod.rs
+++ b/core/startos/src/bins/mod.rs
@@ -1,45 +1,54 @@
+use std::collections::VecDeque;
+use std::ffi::OsString;
 use std::path::Path;
 
-#[cfg(feature = "avahi-alias")]
-pub mod avahi_alias;
+#[cfg(feature = "container-runtime")]
+pub mod container_cli;
 pub mod deprecated;
 #[cfg(feature = "cli")]
 pub mod start_cli;
 #[cfg(feature = "daemon")]
 pub mod start_init;
-#[cfg(feature = "sdk")]
-pub mod start_sdk;
 #[cfg(feature = "daemon")]
 pub mod startd;
 
-fn select_executable(name: &str) -> Option<fn()> {
+fn select_executable(name: &str) -> Option<fn(VecDeque<OsString>)> {
     match name {
-        #[cfg(feature = "avahi-alias")]
-        "avahi-alias" => Some(avahi_alias::main),
         #[cfg(feature = "cli")]
         "start-cli" => Some(start_cli::main),
-        #[cfg(feature = "sdk")]
-        "start-sdk" => Some(start_sdk::main),
+        #[cfg(feature = "container-runtime")]
+        "start-cli" => Some(container_cli::main),
         #[cfg(feature = "daemon")]
         "startd" => Some(startd::main),
-        "embassy-cli" => Some(|| deprecated::renamed("embassy-cli", "start-cli")),
-        "embassy-sdk" => Some(|| deprecated::renamed("embassy-sdk", "start-sdk")),
-        "embassyd" => Some(|| deprecated::renamed("embassyd", "startd")),
-        "embassy-init" => Some(|| deprecated::removed("embassy-init")),
+        "embassy-cli" => Some(|_| deprecated::renamed("embassy-cli", "start-cli")),
+        "embassy-sdk" => Some(|_| deprecated::renamed("embassy-sdk", "start-sdk")),
+        "embassyd" => Some(|_| deprecated::renamed("embassyd", "startd")),
+        "embassy-init" => Some(|_| deprecated::removed("embassy-init")),
         _ => None,
     }
 }
 
 pub fn startbox() {
-    let args = std::env::args().take(2).collect::<Vec<_>>();
-    let executable = args
-        .get(0)
-        .and_then(|s| Path::new(&*s).file_name())
-        .and_then(|s| s.to_str());
-    if let Some(x) = executable.and_then(|s| select_executable(&s)) {
-        x()
-    } else {
-        eprintln!("unknown executable: {}", executable.unwrap_or("N/A"));
-        std::process::exit(1);
+    let mut args = std::env::args_os().collect::<VecDeque<_>>();
+    for _ in 0..2 {
+        if let Some(s) = args.pop_front() {
+            if let Some(x) = Path::new(&*s)
+                .file_name()
+                .and_then(|s| s.to_str())
+                .and_then(|s| select_executable(&s))
+            {
+                args.push_front(s);
+                return x(args);
+            }
+        }
     }
+    let args = std::env::args().collect::<VecDeque<_>>();
+    eprintln!(
+        "unknown executable: {}",
+        args.get(1)
+            .or_else(|| args.get(0))
+            .map(|s| s.as_str())
+            .unwrap_or("N/A")
+    );
+    std::process::exit(1);
 }
diff --git a/core/startos/src/bins/start_cli.rs b/core/startos/src/bins/start_cli.rs
index 3ef64096e..374247f2e 100644
--- a/core/startos/src/bins/start_cli.rs
+++ b/core/startos/src/bins/start_cli.rs
@@ -1,62 +1,39 @@
-use clap::Arg;
-use rpc_toolkit::run_cli;
-use rpc_toolkit::yajrc::RpcError;
+use std::ffi::OsString;
+
+use rpc_toolkit::CliApp;
 use serde_json::Value;
 
+use crate::context::config::ClientConfig;
 use crate::context::CliContext;
 use crate::util::logger::EmbassyLogger;
 use crate::version::{Current, VersionT};
-use crate::Error;
 
 lazy_static::lazy_static! {
     static ref VERSION_STRING: String = Current::new().semver().to_string();
 }
 
-fn inner_main() -> Result<(), Error> {
-    run_cli!({
-        command: crate::main_api,
-        app: app => app
-            .name("StartOS CLI")
-            .version(&**VERSION_STRING)
-            .arg(
-                clap::Arg::with_name("config")
-                    .short('c')
-                    .long("config")
-                    .takes_value(true),
-            )
-            .arg(Arg::with_name("host").long("host").short('h').takes_value(true))
-            .arg(Arg::with_name("proxy").long("proxy").short('p').takes_value(true)),
-        context: matches => {
-            EmbassyLogger::init();
-            CliContext::init(matches)?
-        },
-        exit: |e: RpcError| {
-            match e.data {
-                Some(Value::String(s)) => eprintln!("{}: {}", e.message, s),
-                Some(Value::Object(o)) => if let Some(Value::String(s)) = o.get("details") {
+pub fn main(args: impl IntoIterator<Item = OsString>) {
+    EmbassyLogger::init();
+    if let Err(e) = CliApp::new(
+        |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
+        crate::main_api(),
+    )
+    .run(args)
+    {
+        match e.data {
+            Some(Value::String(s)) => eprintln!("{}: {}", e.message, s),
+            Some(Value::Object(o)) => {
+                if let Some(Value::String(s)) = o.get("details") {
                     eprintln!("{}: {}", e.message, s);
                     if let Some(Value::String(s)) = o.get("debug") {
                         tracing::debug!("{}", s)
                     }
                 }
-                Some(a) => eprintln!("{}: {}", e.message, a),
-                None => eprintln!("{}", e.message),
             }
-
-            std::process::exit(e.code);
+            Some(a) => eprintln!("{}: {}", e.message, a),
+            None => eprintln!("{}", e.message),
         }
-    });
-    Ok(())
-}
 
-pub fn main() {
-    match inner_main() {
-        Ok(_) => (),
-        Err(e) => {
-            eprintln!("{}", e.source);
-            tracing::debug!("{:?}", e.source);
-            drop(e.source);
-            std::process::exit(e.kind as i32)
-        }
+        std::process::exit(e.code);
     }
 }
diff --git a/core/startos/src/bins/start_deno.rs b/core/startos/src/bins/start_deno.rs
deleted file mode 100644
index 89c99ea9b..000000000
--- a/core/startos/src/bins/start_deno.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{command, run_cli, Context};
-use serde_json::Value;
-
-use crate::procedure::js_scripts::ExecuteArgs;
-use crate::s9pk::manifest::PackageId;
-use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
-use crate::version::{Current, VersionT};
-use crate::Error;
-
-lazy_static::lazy_static! {
-    static ref VERSION_STRING: String = Current::new().semver().to_string();
-}
-
-struct DenoContext;
-impl Context for DenoContext {}
-
-#[command(subcommands(execute, sandbox))]
-fn deno_api() -> Result<(), Error> {
-    Ok(())
-}
-
-#[command(cli_only, display(display_serializable))]
-async fn execute(
-    #[arg(stdin, parse(parse_stdin_deserializable))] arg: ExecuteArgs,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<Result<Value, (i32, String)>, Error> {
-    let ExecuteArgs {
-        procedure,
-        directory,
-        pkg_id,
-        pkg_version,
-        name,
-        volumes,
-        input,
-    } = arg;
-    PackageLogger::init(&pkg_id);
-    // procedure
-    //     .execute_impl(&directory, &pkg_id, &pkg_version, name, &volumes, input)
-    //     .await
-    todo!("@DRB Remove")
-}
-#[command(cli_only, display(display_serializable))]
-async fn sandbox(
-    #[arg(stdin, parse(parse_stdin_deserializable))] arg: ExecuteArgs,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<Result<Value, (i32, String)>, Error> {
-    let ExecuteArgs {
-        procedure,
-        directory,
-        pkg_id,
-        pkg_version,
-        name,
-        volumes,
-        input,
-    } = arg;
-    PackageLogger::init(&pkg_id);
-    // procedure
-    //     .sandboxed_impl(&directory, &pkg_id, &pkg_version, &volumes, input, name)
-    //     .await
-    todo!("@DRB Remove")
-}
-
-use tracing::Subscriber;
-use tracing_subscriber::util::SubscriberInitExt;
-
-#[derive(Clone)]
-struct PackageLogger {}
-
-impl PackageLogger {
-    fn base_subscriber(id: &PackageId) -> impl Subscriber {
-        use tracing_error::ErrorLayer;
-        use tracing_subscriber::prelude::*;
-        use tracing_subscriber::{fmt, EnvFilter};
-
-        let filter_layer = EnvFilter::default().add_directive(
-            format!("{}=warn", std::module_path!().split("::").next().unwrap())
-                .parse()
-                .unwrap(),
-        );
-        let fmt_layer = fmt::layer().with_writer(std::io::stderr).with_target(true);
-        let journald_layer = tracing_journald::layer()
-            .unwrap()
-            .with_syslog_identifier(format!("{id}.embassy"));
-
-        let sub = tracing_subscriber::registry()
-            .with(filter_layer)
-            .with(fmt_layer)
-            .with(journald_layer)
-            .with(ErrorLayer::default());
-
-        sub
-    }
-    pub fn init(id: &PackageId) -> Self {
-        Self::base_subscriber(id).init();
-        color_eyre::install().unwrap_or_else(|_| tracing::warn!("tracing too many times"));
-
-        Self {}
-    }
-}
-
-fn inner_main() -> Result<(), Error> {
-    run_cli!({
-        command: deno_api,
-        app: app => app
-            .name("StartOS Deno Executor")
-            .version(&**VERSION_STRING),
-        context: _m => DenoContext,
-        exit: |e: RpcError| {
-            match e.data {
-                Some(Value::String(s)) => eprintln!("{}: {}", e.message, s),
-                Some(Value::Object(o)) => if let Some(Value::String(s)) = o.get("details") {
-                    eprintln!("{}: {}", e.message, s);
-                    if let Some(Value::String(s)) = o.get("debug") {
-                        tracing::debug!("{}", s)
-                    }
-                }
-                Some(a) => eprintln!("{}: {}", e.message, a),
-                None => eprintln!("{}", e.message),
-            }
-
-            std::process::exit(e.code);
-        }
-    });
-    Ok(())
-}
-
-pub fn main() {
-    match inner_main() {
-        Ok(_) => (),
-        Err(e) => {
-            eprintln!("{}", e.source);
-            tracing::debug!("{:?}", e.source);
-            drop(e.source);
-            std::process::exit(e.kind as i32)
-        }
-    }
-}
diff --git a/core/startos/src/bins/start_init.rs b/core/startos/src/bins/start_init.rs
index 1cb070851..284748339 100644
--- a/core/startos/src/bins/start_init.rs
+++ b/core/startos/src/bins/start_init.rs
@@ -1,5 +1,5 @@
 use std::net::{Ipv6Addr, SocketAddr};
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -7,7 +7,7 @@ use helpers::NonDetachingJoinHandle;
 use tokio::process::Command;
 use tracing::instrument;
 
-use crate::context::rpc::RpcContextConfig;
+use crate::context::config::ServerConfig;
 use crate::context::{DiagnosticContext, InstallContext, SetupContext};
 use crate::disk::fsck::{RepairStrategy, RequiresReboot};
 use crate::disk::main::DEFAULT_PASSWORD;
@@ -21,7 +21,7 @@ use crate::util::Invoke;
 use crate::{Error, ErrorKind, ResultExt, PLATFORM};
 
 #[instrument(skip_all)]
-async fn setup_or_init(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error> {
+async fn setup_or_init(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
     let song = NonDetachingJoinHandle::from(tokio::spawn(async {
         loop {
             BEP.play().await.unwrap();
@@ -82,13 +82,12 @@ async fn setup_or_init(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Er
             .invoke(crate::ErrorKind::OpenSsh)
             .await?;
 
-        let ctx = InstallContext::init(cfg_path).await?;
+        let ctx = InstallContext::init().await?;
 
         let server = WebServer::install(
             SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
             ctx.clone(),
-        )
-        .await?;
+        )?;
 
         drop(song);
         tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this
@@ -109,26 +108,24 @@ async fn setup_or_init(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Er
         .await
         .is_err()
     {
-        let ctx = SetupContext::init(cfg_path).await?;
+        let ctx = SetupContext::init(config)?;
 
         let server = WebServer::setup(
             SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
             ctx.clone(),
-        )
-        .await?;
+        )?;
 
         drop(song);
         tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this
         CHIME.play().await?;
 
-        ctx.shutdown
-            .subscribe()
-            .recv()
-            .await
-            .expect("context dropped");
+        let mut shutdown = ctx.shutdown.subscribe();
+        shutdown.recv().await.expect("context dropped");
 
         server.shutdown().await;
 
+        drop(shutdown);
+
         tokio::task::yield_now().await;
         if let Err(e) = Command::new("killall")
             .arg("firefox-esr")
@@ -139,13 +136,12 @@ async fn setup_or_init(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Er
             tracing::debug!("{:?}", e);
         }
     } else {
-        let cfg = RpcContextConfig::load(cfg_path).await?;
         let guid_string = tokio::fs::read_to_string("/media/embassy/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
             .await?;
         let guid = guid_string.trim();
         let requires_reboot = crate::disk::main::import(
             guid,
-            cfg.datadir(),
+            config.datadir(),
             if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
                 RepairStrategy::Aggressive
             } else {
@@ -164,13 +160,13 @@ async fn setup_or_init(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Er
                 .with_ctx(|_| (crate::ErrorKind::Filesystem, REPAIR_DISK_PATH))?;
         }
         if requires_reboot.0 {
-            crate::disk::main::export(guid, cfg.datadir()).await?;
+            crate::disk::main::export(guid, config.datadir()).await?;
             Command::new("reboot")
                 .invoke(crate::ErrorKind::Unknown)
                 .await?;
         }
         tracing::info!("Loaded Disk");
-        crate::init::init(&cfg).await?;
+        crate::init::init(config).await?;
         drop(song);
     }
 
@@ -196,7 +192,7 @@ async fn run_script_if_exists<P: AsRef<Path>>(path: P) {
 }
 
 #[instrument(skip_all)]
-async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error> {
+async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
     if &*PLATFORM == "raspberrypi" && tokio::fs::metadata(STANDBY_MODE_PATH).await.is_ok() {
         tokio::fs::remove_file(STANDBY_MODE_PATH).await?;
         Command::new("sync").invoke(ErrorKind::Filesystem).await?;
@@ -208,7 +204,7 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
 
     run_script_if_exists("/media/embassy/config/preinit.sh").await;
 
-    let res = match setup_or_init(cfg_path.clone()).await {
+    let res = match setup_or_init(config).await {
         Err(e) => {
             async move {
                 tracing::error!("{}", e.source);
@@ -216,7 +212,7 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
                 crate::sound::BEETHOVEN.play().await?;
 
                 let ctx = DiagnosticContext::init(
-                    cfg_path,
+                    config,
                     if tokio::fs::metadata("/media/embassy/config/disk.guid")
                         .await
                         .is_ok()
@@ -231,14 +227,12 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
                         None
                     },
                     e,
-                )
-                .await?;
+                )?;
 
                 let server = WebServer::diagnostic(
                     SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
                     ctx.clone(),
-                )
-                .await?;
+                )?;
 
                 let shutdown = ctx.shutdown.subscribe().recv().await.unwrap();
 
@@ -256,23 +250,13 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
     res
 }
 
-pub fn main() {
-    let matches = clap::App::new("start-init")
-        .arg(
-            clap::Arg::with_name("config")
-                .short('c')
-                .long("config")
-                .takes_value(true),
-        )
-        .get_matches();
-
-    let cfg_path = matches.value_of("config").map(|p| Path::new(p).to_owned());
+pub fn main(config: &ServerConfig) {
     let res = {
         let rt = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
             .build()
             .expect("failed to initialize runtime");
-        rt.block_on(inner_main(cfg_path))
+        rt.block_on(inner_main(config))
     };
 
     match res {
diff --git a/core/startos/src/bins/start_sdk.rs b/core/startos/src/bins/start_sdk.rs
deleted file mode 100644
index 10219c485..000000000
--- a/core/startos/src/bins/start_sdk.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use rpc_toolkit::run_cli;
-use rpc_toolkit::yajrc::RpcError;
-use serde_json::Value;
-
-use crate::context::SdkContext;
-use crate::util::logger::EmbassyLogger;
-use crate::version::{Current, VersionT};
-use crate::Error;
-
-lazy_static::lazy_static! {
-    static ref VERSION_STRING: String = Current::new().semver().to_string();
-}
-
-fn inner_main() -> Result<(), Error> {
-    run_cli!({
-        command: crate::portable_api,
-        app: app => app
-            .name("StartOS SDK")
-            .version(&**VERSION_STRING)
-            .arg(
-                clap::Arg::with_name("config")
-                    .short('c')
-                    .long("config")
-                    .takes_value(true),
-            ),
-        context: matches => {
-            if let Err(_) = std::env::var("RUST_LOG") {
-                std::env::set_var("RUST_LOG", "embassy=warn,js_engine=warn");
-            }
-            EmbassyLogger::init();
-            SdkContext::init(matches)?
-        },
-        exit: |e: RpcError| {
-            match e.data {
-                Some(Value::String(s)) => eprintln!("{}: {}", e.message, s),
-                Some(Value::Object(o)) => if let Some(Value::String(s)) = o.get("details") {
-                    eprintln!("{}: {}", e.message, s);
-                    if let Some(Value::String(s)) = o.get("debug") {
-                        tracing::debug!("{}", s)
-                    }
-                }
-                Some(a) => eprintln!("{}: {}", e.message, a),
-                None => eprintln!("{}", e.message),
-            }
-            std::process::exit(e.code);
-        }
-    });
-    Ok(())
-}
-
-pub fn main() {
-    match inner_main() {
-        Ok(_) => (),
-        Err(e) => {
-            eprintln!("{}", e.source);
-            tracing::debug!("{:?}", e.source);
-            drop(e.source);
-            std::process::exit(e.kind as i32)
-        }
-    }
-}
diff --git a/core/startos/src/bins/startd.rs b/core/startos/src/bins/startd.rs
index a773dd99a..3e571d6b2 100644
--- a/core/startos/src/bins/startd.rs
+++ b/core/startos/src/bins/startd.rs
@@ -1,12 +1,15 @@
+use std::ffi::OsString;
 use std::net::{Ipv6Addr, SocketAddr};
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::sync::Arc;
 
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::{FutureExt, TryFutureExt};
 use tokio::signal::unix::signal;
 use tracing::instrument;
 
+use crate::context::config::ServerConfig;
 use crate::context::{DiagnosticContext, RpcContext};
 use crate::net::web_server::WebServer;
 use crate::shutdown::Shutdown;
@@ -15,10 +18,10 @@ use crate::util::logger::EmbassyLogger;
 use crate::{Error, ErrorKind, ResultExt};
 
 #[instrument(skip_all)]
-async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error> {
+async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
     let (rpc_ctx, server, shutdown) = async {
         let rpc_ctx = RpcContext::init(
-            cfg_path,
+            config,
             Arc::new(
                 tokio::fs::read_to_string("/media/embassy/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
                     .await?
@@ -31,8 +34,7 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
         let server = WebServer::main(
             SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
             rpc_ctx.clone(),
-        )
-        .await?;
+        )?;
 
         let mut shutdown_recv = rpc_ctx.shutdown.subscribe();
 
@@ -102,32 +104,23 @@ async fn inner_main(cfg_path: Option<PathBuf>) -> Result<Option<Shutdown>, Error
     Ok(shutdown)
 }
 
-pub fn main() {
+pub fn main(args: impl IntoIterator<Item = OsString>) {
     EmbassyLogger::init();
 
+    let config = ServerConfig::parse_from(args).load().unwrap();
+
     if !Path::new("/run/embassy/initialized").exists() {
-        super::start_init::main();
+        super::start_init::main(&config);
         std::fs::write("/run/embassy/initialized", "").unwrap();
     }
 
-    let matches = clap::App::new("startd")
-        .arg(
-            clap::Arg::with_name("config")
-                .short('c')
-                .long("config")
-                .takes_value(true),
-        )
-        .get_matches();
-
-    let cfg_path = matches.value_of("config").map(|p| Path::new(p).to_owned());
-
     let res = {
         let rt = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
             .build()
             .expect("failed to initialize runtime");
         rt.block_on(async {
-            match inner_main(cfg_path.clone()).await {
+            match inner_main(&config).await {
                 Ok(a) => Ok(a),
                 Err(e) => {
                     async {
@@ -135,7 +128,7 @@ pub fn main() {
                         tracing::debug!("{:?}", e.source);
                         crate::sound::BEETHOVEN.play().await?;
                         let ctx = DiagnosticContext::init(
-                            cfg_path,
+                            &config,
                             if tokio::fs::metadata("/media/embassy/config/disk.guid")
                                 .await
                                 .is_ok()
@@ -150,14 +143,12 @@ pub fn main() {
                                 None
                             },
                             e,
-                        )
-                        .await?;
+                        )?;
 
                         let server = WebServer::diagnostic(
                             SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
                             ctx.clone(),
-                        )
-                        .await?;
+                        )?;
 
                         let mut shutdown = ctx.shutdown.subscribe();
 
diff --git a/core/startos/src/config/action.rs b/core/startos/src/config/action.rs
index 27cd1683f..b926c940c 100644
--- a/core/startos/src/config/action.rs
+++ b/core/startos/src/config/action.rs
@@ -1,22 +1,12 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use color_eyre::eyre::eyre;
-use models::ImageId;
-use patch_db::HasModel;
+use models::PackageId;
 use serde::{Deserialize, Serialize};
-use tracing::instrument;
 
 use super::{Config, ConfigSpec};
-use crate::context::RpcContext;
-use crate::dependencies::Dependencies;
+#[allow(unused_imports)]
 use crate::prelude::*;
-use crate::procedure::docker::DockerContainers;
-use crate::procedure::{PackageProcedure, ProcedureName};
-use crate::s9pk::manifest::PackageId;
 use crate::status::health_check::HealthCheckId;
-use crate::util::Version;
-use crate::volume::Volumes;
-use crate::{Error, ResultExt};
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
@@ -25,90 +15,6 @@ pub struct ConfigRes {
     pub spec: ConfigSpec,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[model = "Model<Self>"]
-pub struct ConfigActions {
-    pub get: PackageProcedure,
-    pub set: PackageProcedure,
-}
-impl ConfigActions {
-    #[instrument(skip_all)]
-    pub fn validate(
-        &self,
-        _container: &Option<DockerContainers>,
-        eos_version: &Version,
-        volumes: &Volumes,
-        image_ids: &BTreeSet<ImageId>,
-    ) -> Result<(), Error> {
-        self.get
-            .validate(eos_version, volumes, image_ids, true)
-            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Config Get"))?;
-        self.set
-            .validate(eos_version, volumes, image_ids, true)
-            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Config Set"))?;
-        Ok(())
-    }
-    #[instrument(skip_all)]
-    pub async fn get(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-    ) -> Result<ConfigRes, Error> {
-        self.get
-            .execute(
-                ctx,
-                pkg_id,
-                pkg_version,
-                ProcedureName::GetConfig,
-                volumes,
-                None::<()>,
-                None,
-            )
-            .await
-            .and_then(|res| {
-                res.map_err(|e| Error::new(eyre!("{}", e.1), crate::ErrorKind::ConfigGen))
-            })
-    }
-
-    #[instrument(skip_all)]
-    pub async fn set(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        dependencies: &Dependencies,
-        volumes: &Volumes,
-        input: &Config,
-    ) -> Result<SetResult, Error> {
-        let res: SetResult = self
-            .set
-            .execute(
-                ctx,
-                pkg_id,
-                pkg_version,
-                ProcedureName::SetConfig,
-                volumes,
-                Some(input),
-                None,
-            )
-            .await
-            .and_then(|res| {
-                res.map_err(|e| {
-                    Error::new(eyre!("{}", e.1), crate::ErrorKind::ConfigRulesViolation)
-                })
-            })?;
-        Ok(SetResult {
-            depends_on: res
-                .depends_on
-                .into_iter()
-                .filter(|(pkg, _)| dependencies.0.contains_key(pkg))
-                .collect(),
-        })
-    }
-}
-
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct SetResult {
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index 06e7770b0..220e388c9 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -1,24 +1,22 @@
 use std::collections::BTreeMap;
-use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use indexmap::IndexSet;
 use itertools::Itertools;
-use models::{ErrorKind, OptionExt};
+use models::{ErrorKind, OptionExt, PackageId};
 use patch_db::value::InternedString;
 use patch_db::Value;
 use regex::Regex;
-use rpc_toolkit::command;
+use rpc_toolkit::{from_fn_async, Empty, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::util::display_none;
-use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
-use crate::Error;
+use crate::util::serde::{HandlerExtSerde, StdinDeserializable};
 
 pub mod action;
 pub mod spec;
@@ -132,96 +130,107 @@ pub enum MatchError {
     ListUniquenessViolation,
 }
 
-#[command(rename = "config-spec", cli_only, blocking, display(display_none))]
-pub fn verify_spec(#[arg] path: PathBuf) -> Result<(), Error> {
-    let mut file = std::fs::File::open(&path)?;
-    let format = match path.extension().and_then(|s| s.to_str()) {
-        Some("yaml") | Some("yml") => IoFormat::Yaml,
-        Some("json") => IoFormat::Json,
-        Some("toml") => IoFormat::Toml,
-        Some("cbor") => IoFormat::Cbor,
-        _ => {
-            return Err(Error::new(
-                eyre!("Unknown file format. Expected one of yaml, json, toml, cbor."),
-                crate::ErrorKind::Deserialization,
-            ));
-        }
-    };
-    let _: ConfigSpec = format.from_reader(&mut file)?;
-
-    Ok(())
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ConfigParams {
+    pub id: PackageId,
 }
 
-#[command(subcommands(get, set))]
-pub fn config(#[arg] id: PackageId) -> Result<PackageId, Error> {
-    Ok(id)
+// #[command(subcommands(get, set))]
+pub fn config() -> ParentHandler<ConfigParams> {
+    ParentHandler::new()
+        .subcommand(
+            "get",
+            from_fn_async(get)
+                .with_inherited(|ConfigParams { id }, _| id)
+                .with_display_serializable()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("set", set().with_inherited(|ConfigParams { id }, _| id))
 }
 
-#[command(display(display_serializable))]
 #[instrument(skip_all)]
-pub async fn get(
-    #[context] ctx: RpcContext,
-    #[parent_data] id: PackageId,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<ConfigRes, Error> {
-    let db = ctx.db.peek().await;
-    let manifest = db
-        .as_package_data()
-        .as_idx(&id)
-        .or_not_found(&id)?
-        .as_installed()
-        .or_not_found(&id)?
-        .as_manifest();
-    let action = manifest
-        .as_config()
-        .de()?
-        .ok_or_else(|| Error::new(eyre!("{} has no config", id), crate::ErrorKind::NotFound))?;
+pub async fn get(ctx: RpcContext, _: Empty, id: PackageId) -> Result<ConfigRes, Error> {
+    ctx.services
+        .get(&id)
+        .await
+        .as_ref()
+        .or_not_found(lazy_format!("Manager for {id}"))?
+        .get_config()
+        .await
+}
 
-    let volumes = manifest.as_volumes().de()?;
-    let version = manifest.as_version().de()?;
-    action.get(&ctx, &id, &version, &volumes).await
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+pub struct SetParams {
+    #[arg(long = "timeout")]
+    pub timeout: Option<crate::util::serde::Duration>,
+    #[command(flatten)]
+    pub config: StdinDeserializable<Option<Config>>,
 }
 
-#[command(
-    subcommands(self(set_impl(async, context(RpcContext))), set_dry),
-    display(display_none),
-    metadata(sync_db = true)
-)]
+// TODO Dr Why isn't this used?
+// #[command(
+//     subcommands(self(set_impl(async, context(RpcContext))), set_dry),
+//     display(display_none),
+//     metadata(sync_db = true)
+// )]
 #[instrument(skip_all)]
-pub fn set(
-    #[parent_data] id: PackageId,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-    #[arg(long = "timeout")] timeout: Option<crate::util::serde::Duration>,
-    #[arg(stdin, parse(parse_stdin_deserializable))] config: Option<Config>,
-) -> Result<(PackageId, Option<Config>, Option<Duration>), Error> {
-    Ok((id, config, timeout.map(|d| *d)))
+pub fn set() -> ParentHandler<SetParams, PackageId> {
+    ParentHandler::new()
+        .root_handler(
+            from_fn_async(set_impl)
+                .with_metadata("sync_db", Value::Bool(true))
+                .with_inherited(|set_params, id| (id, set_params))
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "dry",
+            from_fn_async(set_dry)
+                .with_inherited(|set_params, id| (id, set_params))
+                .with_display_serializable()
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
-#[command(rename = "dry", display(display_serializable))]
-#[instrument(skip_all)]
 pub async fn set_dry(
-    #[context] ctx: RpcContext,
-    #[parent_data] (id, config, timeout): (PackageId, Option<Config>, Option<Duration>),
+    ctx: RpcContext,
+    _: Empty,
+    (
+        id,
+        SetParams {
+            timeout,
+            config: StdinDeserializable(config),
+        },
+    ): (PackageId, SetParams),
 ) -> Result<BTreeMap<PackageId, String>, Error> {
     let breakages = BTreeMap::new();
     let overrides = Default::default();
 
     let configure_context = ConfigureContext {
         breakages,
-        timeout,
+        timeout: timeout.map(|t| *t),
         config,
         dry_run: true,
         overrides,
     };
-    let breakages = configure(&ctx, &id, configure_context).await?;
-
-    Ok(breakages)
+    ctx.services
+        .get(&id)
+        .await
+        .as_ref()
+        .ok_or_else(|| {
+            Error::new(
+                eyre!("There is no manager running for {id}"),
+                ErrorKind::Unknown,
+            )
+        })?
+        .configure(configure_context)
+        .await
 }
 
+#[derive(Default)]
 pub struct ConfigureContext {
     pub breakages: BTreeMap<PackageId, String>,
     pub timeout: Option<Duration>,
@@ -233,55 +242,36 @@ pub struct ConfigureContext {
 #[instrument(skip_all)]
 pub async fn set_impl(
     ctx: RpcContext,
-    (id, config, timeout): (PackageId, Option<Config>, Option<Duration>),
+    _: Empty,
+    (
+        id,
+        SetParams {
+            timeout,
+            config: StdinDeserializable(config),
+        },
+    ): (PackageId, SetParams),
 ) -> Result<(), Error> {
     let breakages = BTreeMap::new();
     let overrides = Default::default();
 
     let configure_context = ConfigureContext {
         breakages,
-        timeout,
+        timeout: timeout.map(|t| *t),
         config,
         dry_run: false,
         overrides,
     };
-    configure(&ctx, &id, configure_context).await?;
-    Ok(())
-}
-
-#[instrument(skip_all)]
-pub async fn configure(
-    ctx: &RpcContext,
-    id: &PackageId,
-    configure_context: ConfigureContext,
-) -> Result<BTreeMap<PackageId, String>, Error> {
-    let db = ctx.db.peek().await;
-    let package = db
-        .as_package_data()
-        .as_idx(id)
-        .or_not_found(&id)?
-        .as_installed()
-        .or_not_found(&id)?;
-    let version = package.as_manifest().as_version().de()?;
-    ctx.managers
-        .get(&(id.clone(), version.clone()))
+    ctx.services
+        .get(&id)
         .await
+        .as_ref()
         .ok_or_else(|| {
             Error::new(
-                eyre!("There is no manager running for {id:?} and {version:?}"),
+                eyre!("There is no manager running for {id}"),
                 ErrorKind::Unknown,
             )
         })?
         .configure(configure_context)
-        .await
-}
-
-macro_rules! not_found {
-    ($x:expr) => {
-        crate::Error::new(
-            color_eyre::eyre::eyre!("Could not find {} at {}:{}", $x, module_path!(), line!()),
-            crate::ErrorKind::Incoherent,
-        )
-    };
+        .await?;
+    Ok(())
 }
-pub(crate) use not_found;
diff --git a/core/startos/src/config/spec.rs b/core/startos/src/config/spec.rs
index a98ad888d..ec2667bfb 100644
--- a/core/startos/src/config/spec.rs
+++ b/core/startos/src/config/spec.rs
@@ -14,6 +14,7 @@ use imbl_value::InternedString;
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
 use jsonpath_lib::Compiled as CompiledJsonPath;
+use models::ProcedureName;
 use patch_db::value::{Number, Value};
 use rand::{CryptoRng, Rng};
 use regex::Regex;
@@ -23,6 +24,7 @@ use sqlx::PgPool;
 
 use super::util::{self, CharSet, NumRange, UniqueBy, STATIC_NULL};
 use super::{Config, MatchError, NoMatchWithPath, TimeoutError, TypeOf};
+use crate::config::action::ConfigRes;
 use crate::config::ConfigurationError;
 use crate::context::RpcContext;
 use crate::net::interface::InterfaceId;
@@ -1773,27 +1775,27 @@ impl ConfigPointer {
             Ok(self.select(&Value::Object(cfg.clone())))
         } else {
             let id = &self.package_id;
-            let db = ctx.db.peek().await;
-            let manifest = db.as_package_data().as_idx(id).map(|pde| pde.as_manifest());
-            let cfg_actions = manifest.and_then(|m| m.as_config().transpose_ref());
-            if let (Some(manifest), Some(cfg_actions)) = (manifest, cfg_actions) {
-                let cfg_res = cfg_actions
-                    .de()
+            let version = ctx
+                .db
+                .peek()
+                .await
+                .as_package_data()
+                .as_idx(id)
+                .and_then(|pde| pde.as_installed())
+                .map(|i| i.as_manifest().as_version().de())
+                .transpose()
+                .map_err(ConfigurationError::SystemError)?;
+            if let Some(version) = version {
+                let cfg_res = ctx
+                    .services
+                    .get(&id)
+                    .await
+                    .as_ref()
+                    .or_not_found(lazy_format!("Manager for {id}@{version}"))
                     .map_err(|e| ConfigurationError::SystemError(e))?
-                    .get(
-                        ctx,
-                        &self.package_id,
-                        &manifest
-                            .as_version()
-                            .de()
-                            .map_err(|e| ConfigurationError::SystemError(e))?,
-                        &manifest
-                            .as_volumes()
-                            .de()
-                            .map_err(|e| ConfigurationError::SystemError(e))?,
-                    )
+                    .get_config()
                     .await
-                    .map_err(|e| ConfigurationError::SystemError(e))?;
+                    .map_err(ConfigurationError::SystemError)?;
                 if let Some(cfg) = cfg_res.config {
                     Ok(self.select(&Value::Object(cfg)))
                 } else {
diff --git a/core/startos/src/context/cli.rs b/core/startos/src/context/cli.rs
index 020b73459..cc2fe232b 100644
--- a/core/startos/src/context/cli.rs
+++ b/core/startos/src/context/cli.rs
@@ -1,43 +1,37 @@
 use std::fs::File;
 use std::io::BufReader;
-use std::net::Ipv4Addr;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-use clap::ArgMatches;
-use color_eyre::eyre::eyre;
 use cookie_store::{CookieStore, RawCookie};
 use josekit::jwk::Jwk;
+use once_cell::sync::OnceCell;
 use reqwest::Proxy;
 use reqwest_cookie_store::CookieStoreMutex;
 use rpc_toolkit::reqwest::{Client, Url};
-use rpc_toolkit::url::Host;
-use rpc_toolkit::Context;
-use serde::Deserialize;
+use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{call_remote_http, CallRemote, Context};
+use tokio::net::TcpStream;
+use tokio::runtime::Runtime;
+use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
 use tracing::instrument;
 
 use super::setup::CURRENT_SECRET;
+use crate::context::config::{local_config_path, ClientConfig};
+use crate::core::rpc_continuations::RequestGuid;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
-use crate::util::config::{load_config_from_paths, local_config_path};
-use crate::ResultExt;
-
-#[derive(Debug, Default, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct CliContextConfig {
-    pub host: Option<Url>,
-    #[serde(deserialize_with = "crate::util::serde::deserialize_from_str_opt")]
-    #[serde(default)]
-    pub proxy: Option<Url>,
-    pub cookie_path: Option<PathBuf>,
-}
+use crate::prelude::*;
 
 #[derive(Debug)]
 pub struct CliContextSeed {
+    pub runtime: OnceCell<Runtime>,
     pub base_url: Url,
     pub rpc_url: Url,
     pub client: Client,
     pub cookie_store: Arc<CookieStoreMutex>,
     pub cookie_path: PathBuf,
+    pub developer_key_path: PathBuf,
+    pub developer_key: OnceCell<ed25519_dalek::SigningKey>,
 }
 impl Drop for CliContextSeed {
     fn drop(&mut self) {
@@ -60,42 +54,22 @@ impl Drop for CliContextSeed {
     }
 }
 
-const DEFAULT_HOST: Host<&'static str> = Host::Ipv4(Ipv4Addr::new(127, 0, 0, 1));
-const DEFAULT_PORT: u16 = 5959;
-
 #[derive(Debug, Clone)]
 pub struct CliContext(Arc<CliContextSeed>);
 impl CliContext {
     /// BLOCKING
     #[instrument(skip_all)]
-    pub fn init(matches: &ArgMatches) -> Result<Self, crate::Error> {
-        let local_config_path = local_config_path();
-        let base: CliContextConfig = load_config_from_paths(
-            matches
-                .values_of("config")
-                .into_iter()
-                .flatten()
-                .map(|p| Path::new(p))
-                .chain(local_config_path.as_deref().into_iter())
-                .chain(std::iter::once(Path::new(crate::util::config::CONFIG_PATH))),
-        )?;
-        let mut url = if let Some(host) = matches.value_of("host") {
-            host.parse()?
-        } else if let Some(host) = base.host {
+    pub fn init(config: ClientConfig) -> Result<Self, Error> {
+        let mut url = if let Some(host) = config.host {
             host
         } else {
             "http://localhost".parse()?
         };
-        let proxy = if let Some(proxy) = matches.value_of("proxy") {
-            Some(proxy.parse()?)
-        } else {
-            base.proxy
-        };
 
-        let cookie_path = base.cookie_path.unwrap_or_else(|| {
-            local_config_path
+        let cookie_path = config.cookie_path.unwrap_or_else(|| {
+            local_config_path()
                 .as_deref()
-                .unwrap_or_else(|| Path::new(crate::util::config::CONFIG_PATH))
+                .unwrap_or_else(|| Path::new(super::config::CONFIG_PATH))
                 .parent()
                 .unwrap_or(Path::new("/"))
                 .join(".cookies.json")
@@ -120,6 +94,7 @@ impl CliContext {
         }));
 
         Ok(CliContext(Arc::new(CliContextSeed {
+            runtime: OnceCell::new(),
             base_url: url.clone(),
             rpc_url: {
                 url.path_segments_mut()
@@ -131,7 +106,7 @@ impl CliContext {
             },
             client: {
                 let mut builder = Client::builder().cookie_provider(cookie_store.clone());
-                if let Some(proxy) = proxy {
+                if let Some(proxy) = config.proxy {
                     builder =
                         builder.proxy(Proxy::all(proxy).with_kind(crate::ErrorKind::ParseUrl)?)
                 }
@@ -139,8 +114,90 @@ impl CliContext {
             },
             cookie_store,
             cookie_path,
+            developer_key_path: config.developer_key_path.unwrap_or_else(|| {
+                local_config_path()
+                    .as_deref()
+                    .unwrap_or_else(|| Path::new(super::config::CONFIG_PATH))
+                    .parent()
+                    .unwrap_or(Path::new("/"))
+                    .join("developer.key.pem")
+            }),
+            developer_key: OnceCell::new(),
         })))
     }
+
+    /// BLOCKING
+    #[instrument(skip_all)]
+    pub fn developer_key(&self) -> Result<&ed25519_dalek::SigningKey, Error> {
+        self.developer_key.get_or_try_init(|| {
+            if !self.developer_key_path.exists() {
+                return Err(Error::new(eyre!("Developer Key does not exist! Please run `start-cli init` before running this command."), crate::ErrorKind::Uninitialized));
+            }
+            let pair = <ed25519::KeypairBytes as ed25519::pkcs8::DecodePrivateKey>::from_pkcs8_pem(
+                &std::fs::read_to_string(&self.developer_key_path)?,
+            )
+            .with_kind(crate::ErrorKind::Pem)?;
+            let secret = ed25519_dalek::SecretKey::try_from(&pair.secret_key[..]).map_err(|_| {
+                Error::new(
+                    eyre!("pkcs8 key is of incorrect length"),
+                    ErrorKind::OpenSsl,
+                )
+            })?;
+            Ok(secret.into())
+        })
+    }
+
+    pub async fn ws_continuation(
+        &self,
+        guid: RequestGuid,
+    ) -> Result<WebSocketStream<MaybeTlsStream<TcpStream>>, Error> {
+        let mut url = self.base_url.clone();
+        let ws_scheme = match url.scheme() {
+            "https" => "wss",
+            "http" => "ws",
+            _ => {
+                return Err(Error::new(
+                    eyre!("Cannot parse scheme from base URL"),
+                    crate::ErrorKind::ParseUrl,
+                )
+                .into())
+            }
+        };
+        url.set_scheme(ws_scheme)
+            .map_err(|_| Error::new(eyre!("Cannot set URL scheme"), crate::ErrorKind::ParseUrl))?;
+        url.path_segments_mut()
+            .map_err(|_| eyre!("Url cannot be base"))
+            .with_kind(crate::ErrorKind::ParseUrl)?
+            .push("ws")
+            .push("rpc")
+            .push(guid.as_ref());
+        let (stream, _) =
+                // base_url is "http://127.0.0.1/", with a trailing slash, so we don't put a leading slash in this path:
+                tokio_tungstenite::connect_async(url).await.with_kind(ErrorKind::Network)?;
+        Ok(stream)
+    }
+
+    pub async fn rest_continuation(
+        &self,
+        guid: RequestGuid,
+        body: reqwest::Body,
+        headers: reqwest::header::HeaderMap,
+    ) -> Result<reqwest::Response, Error> {
+        let mut url = self.base_url.clone();
+        url.path_segments_mut()
+            .map_err(|_| eyre!("Url cannot be base"))
+            .with_kind(crate::ErrorKind::ParseUrl)?
+            .push("rest")
+            .push("rpc")
+            .push(guid.as_ref());
+        self.client
+            .post(url)
+            .headers(headers)
+            .body(body)
+            .send()
+            .await
+            .with_kind(ErrorKind::Network)
+    }
 }
 impl AsRef<Jwk> for CliContext {
     fn as_ref(&self) -> &Jwk {
@@ -154,32 +211,33 @@ impl std::ops::Deref for CliContext {
     }
 }
 impl Context for CliContext {
-    fn protocol(&self) -> &str {
-        self.0.base_url.scheme()
-    }
-    fn host(&self) -> Host<&str> {
-        self.0.base_url.host().unwrap_or(DEFAULT_HOST)
+    fn runtime(&self) -> tokio::runtime::Handle {
+        self.runtime
+            .get_or_init(|| {
+                tokio::runtime::Builder::new_multi_thread()
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            })
+            .handle()
+            .clone()
     }
-    fn port(&self) -> u16 {
-        self.0.base_url.port().unwrap_or(DEFAULT_PORT)
-    }
-    fn path(&self) -> &str {
-        self.0.rpc_url.path()
-    }
-    fn url(&self) -> Url {
-        self.0.rpc_url.clone()
-    }
-    fn client(&self) -> &Client {
-        &self.0.client
+}
+#[async_trait::async_trait]
+impl CallRemote for CliContext {
+    async fn call_remote(&self, method: &str, params: Value) -> Result<Value, RpcError> {
+        call_remote_http(&self.client, self.rpc_url.clone(), method, params).await
     }
 }
-/// When we had an empty proxy the system wasn't working like it used to, which allowed empty proxy
+
 #[test]
-fn test_cli_proxy_empty() {
-    serde_yaml::from_str::<CliContextConfig>(
-        "
-        bind_rpc:
-    ",
-    )
-    .unwrap();
+fn test() {
+    let ctx = CliContext::init(ClientConfig::default()).unwrap();
+    ctx.runtime().block_on(async {
+        reqwest::Client::new()
+            .get("http://example.com")
+            .send()
+            .await
+            .unwrap();
+    });
 }
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
new file mode 100644
index 000000000..fc9cfb790
--- /dev/null
+++ b/core/startos/src/context/config.rs
@@ -0,0 +1,175 @@
+use std::fs::File;
+use std::net::SocketAddr;
+use std::path::{Path, PathBuf};
+
+use clap::Parser;
+use patch_db::json_ptr::JsonPointer;
+use reqwest::Url;
+use serde::de::DeserializeOwned;
+use serde::{Deserialize, Serialize};
+use sqlx::postgres::PgConnectOptions;
+use sqlx::PgPool;
+
+use crate::account::AccountInfo;
+use crate::db::model::Database;
+use crate::disk::OsPartitionInfo;
+use crate::init::init_postgres;
+use crate::prelude::*;
+use crate::util::serde::IoFormat;
+
+pub const DEVICE_CONFIG_PATH: &str = "/media/embassy/config/config.yaml"; // "/media/startos/config/config.yaml";
+pub const CONFIG_PATH: &str = "/etc/startos/config.yaml";
+pub const CONFIG_PATH_LOCAL: &str = ".startos/config.yaml";
+
+pub fn local_config_path() -> Option<PathBuf> {
+    if let Ok(home) = std::env::var("HOME") {
+        Some(Path::new(&home).join(CONFIG_PATH_LOCAL))
+    } else {
+        None
+    }
+}
+
+pub trait ContextConfig: DeserializeOwned + Default {
+    fn next(&mut self) -> Option<PathBuf>;
+    fn merge_with(&mut self, other: Self);
+    fn from_path(path: impl AsRef<Path>) -> Result<Self, Error> {
+        let format: IoFormat = path
+            .as_ref()
+            .extension()
+            .and_then(|s| s.to_str())
+            .map(|f| f.parse())
+            .transpose()?
+            .unwrap_or_default();
+        format.from_reader(File::open(path)?)
+    }
+    fn load_path_rec(&mut self, path: Option<impl AsRef<Path>>) -> Result<(), Error> {
+        if let Some(path) = path.filter(|p| p.as_ref().exists()) {
+            let mut other = Self::from_path(path)?;
+            let path = other.next();
+            self.merge_with(other);
+            self.load_path_rec(path)?;
+        }
+        Ok(())
+    }
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ClientConfig {
+    #[arg(short = 'c', long = "config")]
+    pub config: Option<PathBuf>,
+    #[arg(short = 'h', long = "host")]
+    pub host: Option<Url>,
+    #[arg(short = 'p', long = "proxy")]
+    pub proxy: Option<Url>,
+    #[arg(long = "cookie-path")]
+    pub cookie_path: Option<PathBuf>,
+    #[arg(long = "developer-key-path")]
+    pub developer_key_path: Option<PathBuf>,
+}
+impl ContextConfig for ClientConfig {
+    fn next(&mut self) -> Option<PathBuf> {
+        self.config.take()
+    }
+    fn merge_with(&mut self, other: Self) {
+        self.host = self.host.take().or(other.host);
+        self.proxy = self.proxy.take().or(other.proxy);
+        self.cookie_path = self.cookie_path.take().or(other.cookie_path);
+    }
+}
+impl ClientConfig {
+    pub fn load(mut self) -> Result<Self, Error> {
+        let path = self.next();
+        self.load_path_rec(path)?;
+        self.load_path_rec(local_config_path())?;
+        self.load_path_rec(Some(CONFIG_PATH))?;
+        Ok(self)
+    }
+}
+
+#[derive(Debug, Clone, Default, Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ServerConfig {
+    #[arg(short = 'c', long = "config")]
+    pub config: Option<PathBuf>,
+    #[arg(long = "wifi-interface")]
+    pub wifi_interface: Option<String>,
+    #[arg(long = "ethernet-interface")]
+    pub ethernet_interface: Option<String>,
+    #[arg(skip)]
+    pub os_partitions: Option<OsPartitionInfo>,
+    #[arg(long = "bind-rpc")]
+    pub bind_rpc: Option<SocketAddr>,
+    #[arg(long = "tor-control")]
+    pub tor_control: Option<SocketAddr>,
+    #[arg(long = "tor-socks")]
+    pub tor_socks: Option<SocketAddr>,
+    #[arg(long = "dns-bind")]
+    pub dns_bind: Option<Vec<SocketAddr>>,
+    #[arg(long = "revision-cache-size")]
+    pub revision_cache_size: Option<usize>,
+    #[arg(short = 'd', long = "datadir")]
+    pub datadir: Option<PathBuf>,
+    #[arg(long = "disable-encryption")]
+    pub disable_encryption: Option<bool>,
+}
+impl ContextConfig for ServerConfig {
+    fn next(&mut self) -> Option<PathBuf> {
+        self.config.take()
+    }
+    fn merge_with(&mut self, other: Self) {
+        self.wifi_interface = self.wifi_interface.take().or(other.wifi_interface);
+        self.ethernet_interface = self.ethernet_interface.take().or(other.ethernet_interface);
+        self.os_partitions = self.os_partitions.take().or(other.os_partitions);
+        self.bind_rpc = self.bind_rpc.take().or(other.bind_rpc);
+        self.tor_control = self.tor_control.take().or(other.tor_control);
+        self.tor_socks = self.tor_socks.take().or(other.tor_socks);
+        self.dns_bind = self.dns_bind.take().or(other.dns_bind);
+        self.revision_cache_size = self
+            .revision_cache_size
+            .take()
+            .or(other.revision_cache_size);
+        self.datadir = self.datadir.take().or(other.datadir);
+        self.disable_encryption = self.disable_encryption.take().or(other.disable_encryption);
+    }
+}
+
+impl ServerConfig {
+    pub fn load(mut self) -> Result<Self, Error> {
+        let path = self.next();
+        self.load_path_rec(path)?;
+        self.load_path_rec(Some(DEVICE_CONFIG_PATH))?;
+        self.load_path_rec(Some(CONFIG_PATH))?;
+        Ok(self)
+    }
+    pub fn datadir(&self) -> &Path {
+        self.datadir
+            .as_deref()
+            .unwrap_or_else(|| Path::new("/embassy-data"))
+    }
+    pub async fn db(&self, account: &AccountInfo) -> Result<PatchDb, Error> {
+        let db_path = self.datadir().join("main").join("embassy.db");
+        let db = PatchDb::open(&db_path)
+            .await
+            .with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?;
+        if !db.exists(&<JsonPointer>::default()).await {
+            db.put(&<JsonPointer>::default(), &Database::init(account))
+                .await?;
+        }
+        Ok(db)
+    }
+    #[instrument(skip_all)]
+    pub async fn secret_store(&self) -> Result<PgPool, Error> {
+        init_postgres(self.datadir()).await?;
+        let secret_store =
+            PgPool::connect_with(PgConnectOptions::new().database("secrets").username("root"))
+                .await?;
+        sqlx::migrate!()
+            .run(&secret_store)
+            .await
+            .with_kind(crate::ErrorKind::Database)?;
+        Ok(secret_store)
+    }
+}
diff --git a/core/startos/src/context/diagnostic.rs b/core/startos/src/context/diagnostic.rs
index 151948d7c..117e56061 100644
--- a/core/startos/src/context/diagnostic.rs
+++ b/core/startos/src/context/diagnostic.rs
@@ -1,47 +1,16 @@
 use std::ops::Deref;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;
 
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::Context;
-use serde::Deserialize;
 use tokio::sync::broadcast::Sender;
 use tracing::instrument;
 
+use crate::context::config::ServerConfig;
 use crate::shutdown::Shutdown;
-use crate::util::config::load_config_from_paths;
 use crate::Error;
 
-#[derive(Debug, Default, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct DiagnosticContextConfig {
-    pub datadir: Option<PathBuf>,
-}
-impl DiagnosticContextConfig {
-    #[instrument(skip_all)]
-    pub async fn load<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
-        tokio::task::spawn_blocking(move || {
-            load_config_from_paths(
-                path.as_ref()
-                    .into_iter()
-                    .map(|p| p.as_ref())
-                    .chain(std::iter::once(Path::new(
-                        crate::util::config::DEVICE_CONFIG_PATH,
-                    )))
-                    .chain(std::iter::once(Path::new(crate::util::config::CONFIG_PATH))),
-            )
-        })
-        .await
-        .unwrap()
-    }
-
-    pub fn datadir(&self) -> &Path {
-        self.datadir
-            .as_deref()
-            .unwrap_or_else(|| Path::new("/embassy-data"))
-    }
-}
-
 pub struct DiagnosticContextSeed {
     pub datadir: PathBuf,
     pub shutdown: Sender<Option<Shutdown>>,
@@ -53,20 +22,18 @@ pub struct DiagnosticContextSeed {
 pub struct DiagnosticContext(Arc<DiagnosticContextSeed>);
 impl DiagnosticContext {
     #[instrument(skip_all)]
-    pub async fn init<P: AsRef<Path> + Send + 'static>(
-        path: Option<P>,
+    pub fn init(
+        config: &ServerConfig,
         disk_guid: Option<Arc<String>>,
         error: Error,
     ) -> Result<Self, Error> {
         tracing::error!("Error: {}: Starting diagnostic UI", error);
         tracing::debug!("{:?}", error);
 
-        let cfg = DiagnosticContextConfig::load(path).await?;
-
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
 
         Ok(Self(Arc::new(DiagnosticContextSeed {
-            datadir: cfg.datadir().to_owned(),
+            datadir: config.datadir().to_owned(),
             shutdown,
             disk_guid,
             error: Arc::new(error.into()),
diff --git a/core/startos/src/context/install.rs b/core/startos/src/context/install.rs
index 87484b7e5..d4717d2b0 100644
--- a/core/startos/src/context/install.rs
+++ b/core/startos/src/context/install.rs
@@ -1,35 +1,13 @@
 use std::ops::Deref;
-use std::path::Path;
 use std::sync::Arc;
 
 use rpc_toolkit::Context;
-use serde::Deserialize;
 use tokio::sync::broadcast::Sender;
 use tracing::instrument;
 
 use crate::net::utils::find_eth_iface;
-use crate::util::config::load_config_from_paths;
 use crate::Error;
 
-#[derive(Debug, Default, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct InstallContextConfig {}
-impl InstallContextConfig {
-    #[instrument(skip_all)]
-    pub async fn load<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
-        tokio::task::spawn_blocking(move || {
-            load_config_from_paths(
-                path.as_ref()
-                    .into_iter()
-                    .map(|p| p.as_ref())
-                    .chain(std::iter::once(Path::new(crate::util::config::CONFIG_PATH))),
-            )
-        })
-        .await
-        .unwrap()
-    }
-}
-
 pub struct InstallContextSeed {
     pub ethernet_interface: String,
     pub shutdown: Sender<()>,
@@ -39,8 +17,7 @@ pub struct InstallContextSeed {
 pub struct InstallContext(Arc<InstallContextSeed>);
 impl InstallContext {
     #[instrument(skip_all)]
-    pub async fn init<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
-        let _cfg = InstallContextConfig::load(path.as_ref().map(|p| p.as_ref().to_owned())).await?;
+    pub async fn init() -> Result<Self, Error> {
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
         Ok(Self(Arc::new(InstallContextSeed {
             ethernet_interface: find_eth_iface().await?,
diff --git a/core/startos/src/context/mod.rs b/core/startos/src/context/mod.rs
index c4e8e7757..77f54f26c 100644
--- a/core/startos/src/context/mod.rs
+++ b/core/startos/src/context/mod.rs
@@ -1,44 +1,12 @@
 pub mod cli;
+pub mod config;
 pub mod diagnostic;
 pub mod install;
 pub mod rpc;
-pub mod sdk;
 pub mod setup;
 
 pub use cli::CliContext;
 pub use diagnostic::DiagnosticContext;
 pub use install::InstallContext;
 pub use rpc::RpcContext;
-pub use sdk::SdkContext;
 pub use setup::SetupContext;
-
-impl From<CliContext> for () {
-    fn from(_: CliContext) -> Self {
-        ()
-    }
-}
-impl From<DiagnosticContext> for () {
-    fn from(_: DiagnosticContext) -> Self {
-        ()
-    }
-}
-impl From<RpcContext> for () {
-    fn from(_: RpcContext) -> Self {
-        ()
-    }
-}
-impl From<SdkContext> for () {
-    fn from(_: SdkContext) -> Self {
-        ()
-    }
-}
-impl From<SetupContext> for () {
-    fn from(_: SetupContext) -> Self {
-        ()
-    }
-}
-impl From<InstallContext> for () {
-    fn from(_: InstallContext) -> Self {
-        ()
-    }
-}
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 5358a59ba..df2747089 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -1,19 +1,16 @@
 use std::collections::BTreeMap;
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 use std::ops::Deref;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
-use helpers::to_tmp_path;
+use imbl_value::InternedString;
 use josekit::jwk::Jwk;
-use patch_db::json_ptr::JsonPointer;
 use patch_db::PatchDb;
-use reqwest::{Client, Proxy, Url};
+use reqwest::{Client, Proxy};
 use rpc_toolkit::Context;
-use serde::Deserialize;
-use sqlx::postgres::PgConnectOptions;
 use sqlx::PgPool;
 use tokio::sync::{broadcast, oneshot, Mutex, RwLock};
 use tokio::time::Instant;
@@ -21,87 +18,26 @@ use tracing::instrument;
 
 use super::setup::CURRENT_SECRET;
 use crate::account::AccountInfo;
-use crate::core::rpc_continuations::{RequestGuid, RestHandler, RpcContinuation};
-use crate::db::model::{CurrentDependents, Database, PackageDataEntryMatchModelRef};
+use crate::context::config::ServerConfig;
+use crate::core::rpc_continuations::{RequestGuid, RestHandler, RpcContinuation, WebSocketHandler};
+use crate::db::model::CurrentDependents;
 use crate::db::prelude::PatchDbExt;
 use crate::dependencies::compute_dependency_config_errs;
 use crate::disk::OsPartitionInfo;
-use crate::init::{check_time_is_synchronized, init_postgres};
-use crate::install::cleanup::{cleanup_failed, uninstall};
-use crate::manager::ManagerMap;
+use crate::init::check_time_is_synchronized;
+use crate::lxc::{LxcContainer, LxcManager};
 use crate::middleware::auth::HashSessionToken;
 use crate::net::net_controller::NetController;
 use crate::net::ssl::{root_ca_start_time, SslManager};
+use crate::net::utils::find_eth_iface;
 use crate::net::wifi::WpaCli;
 use crate::notifications::NotificationManager;
+use crate::prelude::*;
+use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
 use crate::status::MainStatus;
 use crate::system::get_mem_info;
-use crate::util::config::load_config_from_paths;
 use crate::util::lshw::{lshw, LshwDevice};
-use crate::{Error, ErrorKind, ResultExt};
-
-#[derive(Debug, Default, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct RpcContextConfig {
-    pub wifi_interface: Option<String>,
-    pub ethernet_interface: String,
-    pub os_partitions: OsPartitionInfo,
-    pub migration_batch_rows: Option<usize>,
-    pub migration_prefetch_rows: Option<usize>,
-    pub bind_rpc: Option<SocketAddr>,
-    pub tor_control: Option<SocketAddr>,
-    pub tor_socks: Option<SocketAddr>,
-    pub dns_bind: Option<Vec<SocketAddr>>,
-    pub revision_cache_size: Option<usize>,
-    pub datadir: Option<PathBuf>,
-    pub log_server: Option<Url>,
-}
-impl RpcContextConfig {
-    pub async fn load<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
-        tokio::task::spawn_blocking(move || {
-            load_config_from_paths(
-                path.as_ref()
-                    .into_iter()
-                    .map(|p| p.as_ref())
-                    .chain(std::iter::once(Path::new(
-                        crate::util::config::DEVICE_CONFIG_PATH,
-                    )))
-                    .chain(std::iter::once(Path::new(crate::util::config::CONFIG_PATH))),
-            )
-        })
-        .await
-        .unwrap()
-    }
-    pub fn datadir(&self) -> &Path {
-        self.datadir
-            .as_deref()
-            .unwrap_or_else(|| Path::new("/embassy-data"))
-    }
-    pub async fn db(&self, account: &AccountInfo) -> Result<PatchDb, Error> {
-        let db_path = self.datadir().join("main").join("embassy.db");
-        let db = PatchDb::open(&db_path)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?;
-        if !db.exists(&<JsonPointer>::default()).await {
-            db.put(&<JsonPointer>::default(), &Database::init(account))
-                .await?;
-        }
-        Ok(db)
-    }
-    #[instrument(skip_all)]
-    pub async fn secret_store(&self) -> Result<PgPool, Error> {
-        init_postgres(self.datadir()).await?;
-        let secret_store =
-            PgPool::connect_with(PgConnectOptions::new().database("secrets").username("root"))
-                .await?;
-        sqlx::migrate!()
-            .run(&secret_store)
-            .await
-            .with_kind(crate::ErrorKind::Database)?;
-        Ok(secret_store)
-    }
-}
 
 pub struct RpcContextSeed {
     is_closed: AtomicBool,
@@ -114,11 +50,12 @@ pub struct RpcContextSeed {
     pub secret_store: PgPool,
     pub account: RwLock<AccountInfo>,
     pub net_controller: Arc<NetController>,
-    pub managers: ManagerMap,
+    pub services: ServiceMap,
     pub metrics_cache: RwLock<Option<crate::system::Metrics>>,
     pub shutdown: broadcast::Sender<Option<Shutdown>>,
     pub tor_socks: SocketAddr,
     pub notification_manager: NotificationManager,
+    pub lxc_manager: Arc<LxcManager>,
     pub open_authed_websockets: Mutex<BTreeMap<HashSessionToken, Vec<oneshot::Sender<()>>>>,
     pub rpc_stream_continuations: Mutex<BTreeMap<RequestGuid, RpcContinuation>>,
     pub wifi_manager: Option<Arc<RwLock<WpaCli>>>,
@@ -126,6 +63,11 @@ pub struct RpcContextSeed {
     pub client: Client,
     pub hardware: Hardware,
     pub start_time: Instant,
+    pub dev: Dev,
+}
+
+pub struct Dev {
+    pub lxc: Mutex<BTreeMap<InternedString, LxcContainer>>,
 }
 
 pub struct Hardware {
@@ -137,28 +79,26 @@ pub struct Hardware {
 pub struct RpcContext(Arc<RpcContextSeed>);
 impl RpcContext {
     #[instrument(skip_all)]
-    pub async fn init<P: AsRef<Path> + Send + Sync + 'static>(
-        cfg_path: Option<P>,
-        disk_guid: Arc<String>,
-    ) -> Result<Self, Error> {
-        let base = RpcContextConfig::load(cfg_path).await?;
+    pub async fn init(config: &ServerConfig, disk_guid: Arc<String>) -> Result<Self, Error> {
         tracing::info!("Loaded Config");
-        let tor_proxy = base.tor_socks.unwrap_or(SocketAddr::V4(SocketAddrV4::new(
+        let tor_proxy = config.tor_socks.unwrap_or(SocketAddr::V4(SocketAddrV4::new(
             Ipv4Addr::new(127, 0, 0, 1),
             9050,
         )));
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
-        let secret_store = base.secret_store().await?;
+        let secret_store = config.secret_store().await?;
         tracing::info!("Opened Pg DB");
         let account = AccountInfo::load(&secret_store).await?;
-        let db = base.db(&account).await?;
+        let db = config.db(&account).await?;
         tracing::info!("Opened PatchDB");
         let net_controller = Arc::new(
             NetController::init(
-                base.tor_control
+                config
+                    .tor_control
                     .unwrap_or(SocketAddr::from(([127, 0, 0, 1], 9051))),
                 tor_proxy,
-                base.dns_bind
+                config
+                    .dns_bind
                     .as_deref()
                     .unwrap_or(&[SocketAddr::from(([127, 0, 0, 1], 53))]),
                 SslManager::new(&account, root_ca_start_time().await?)?,
@@ -168,7 +108,7 @@ impl RpcContext {
             .await?,
         );
         tracing::info!("Initialized Net Controller");
-        let managers = ManagerMap::default();
+        let services = ServiceMap::default();
         let metrics_cache = RwLock::<Option<crate::system::Metrics>>::new(None);
         let notification_manager = NotificationManager::new(secret_store.clone());
         tracing::info!("Initialized Notification Manager");
@@ -190,24 +130,35 @@ impl RpcContext {
 
         let seed = Arc::new(RpcContextSeed {
             is_closed: AtomicBool::new(false),
-            datadir: base.datadir().to_path_buf(),
-            os_partitions: base.os_partitions,
-            wifi_interface: base.wifi_interface.clone(),
-            ethernet_interface: base.ethernet_interface,
+            datadir: config.datadir().to_path_buf(),
+            os_partitions: config.os_partitions.clone().ok_or_else(|| {
+                Error::new(
+                    eyre!("OS Partition Information Missing"),
+                    ErrorKind::Filesystem,
+                )
+            })?,
+            wifi_interface: config.wifi_interface.clone(),
+            ethernet_interface: if let Some(eth) = config.ethernet_interface.clone() {
+                eth
+            } else {
+                find_eth_iface().await?
+            },
             disk_guid,
             db,
             secret_store,
             account: RwLock::new(account),
             net_controller,
-            managers,
+            services,
             metrics_cache,
             shutdown,
             tor_socks: tor_proxy,
             notification_manager,
+            lxc_manager: Arc::new(LxcManager::new()),
             open_authed_websockets: Mutex::new(BTreeMap::new()),
             rpc_stream_continuations: Mutex::new(BTreeMap::new()),
-            wifi_manager: base
+            wifi_manager: config
                 .wifi_interface
+                .clone()
                 .map(|i| Arc::new(RwLock::new(WpaCli::init(i)))),
             current_secret: Arc::new(
                 Jwk::generate_ec_key(josekit::jwk::alg::ec::EcCurve::P256).map_err(|e| {
@@ -231,6 +182,9 @@ impl RpcContext {
                 .with_kind(crate::ErrorKind::ParseUrl)?,
             hardware: Hardware { devices, ram },
             start_time: Instant::now(),
+            dev: Dev {
+                lxc: Mutex::new(BTreeMap::new()),
+            },
         });
 
         let res = Self(seed.clone());
@@ -241,7 +195,7 @@ impl RpcContext {
 
     #[instrument(skip_all)]
     pub async fn shutdown(self) -> Result<(), Error> {
-        self.managers.empty().await?;
+        self.services.shutdown_all().await?;
         self.secret_store.close().await;
         self.is_closed.store(true, Ordering::SeqCst);
         tracing::info!("RPC Context is shutdown");
@@ -293,70 +247,11 @@ impl RpcContext {
             })
             .await?;
 
-        let peek = self.db.peek().await;
-
-        for (package_id, package) in peek.as_package_data().as_entries()?.into_iter() {
-            let action = match package.as_match() {
-                PackageDataEntryMatchModelRef::Installing(_)
-                | PackageDataEntryMatchModelRef::Restoring(_)
-                | PackageDataEntryMatchModelRef::Updating(_) => {
-                    cleanup_failed(self, &package_id).await
-                }
-                PackageDataEntryMatchModelRef::Removing(_) => {
-                    uninstall(
-                        self,
-                        self.secret_store.acquire().await?.as_mut(),
-                        &package_id,
-                    )
-                    .await
-                }
-                PackageDataEntryMatchModelRef::Installed(m) => {
-                    let version = m.as_manifest().as_version().clone().de()?;
-                    let volumes = m.as_manifest().as_volumes().de()?;
-                    for (volume_id, volume_info) in &*volumes {
-                        let tmp_path = to_tmp_path(volume_info.path_for(
-                            &self.datadir,
-                            &package_id,
-                            &version,
-                            volume_id,
-                        ))
-                        .with_kind(ErrorKind::Filesystem)?;
-                        if tokio::fs::metadata(&tmp_path).await.is_ok() {
-                            tokio::fs::remove_dir_all(&tmp_path).await?;
-                        }
-                    }
-                    Ok(())
-                }
-                _ => continue,
-            };
-            if let Err(e) = action {
-                tracing::error!("Failed to clean up package {}: {}", package_id, e);
-                tracing::debug!("{:?}", e);
-            }
-        }
-        let peek = self
-            .db
-            .mutate(|v| {
-                for (_, pde) in v.as_package_data_mut().as_entries_mut()? {
-                    let status = pde
-                        .expect_as_installed_mut()?
-                        .as_installed_mut()
-                        .as_status_mut()
-                        .as_main_mut();
-                    let running = status.clone().de()?.running();
-                    status.ser(&if running {
-                        MainStatus::Starting
-                    } else {
-                        MainStatus::Stopped
-                    })?;
-                }
-                Ok(v.clone())
-            })
-            .await?;
-        self.managers.init(self.clone(), peek.clone()).await?;
+        self.services.init(&self).await?;
         tracing::info!("Initialized Package Managers");
 
         let mut all_dependency_config_errs = BTreeMap::new();
+        let peek = self.db.peek().await;
         for (package_id, package) in peek.as_package_data().as_entries()?.into_iter() {
             let package = package.clone();
             if let Some(current_dependencies) = package
@@ -419,33 +314,30 @@ impl RpcContext {
             .insert(guid, handler);
     }
 
-    pub async fn get_continuation_handler(&self, guid: &RequestGuid) -> Option<RestHandler> {
+    pub async fn get_ws_continuation_handler(
+        &self,
+        guid: &RequestGuid,
+    ) -> Option<WebSocketHandler> {
         let mut continuations = self.rpc_stream_continuations.lock().await;
-        if let Some(cont) = continuations.remove(guid) {
-            cont.into_handler().await
-        } else {
-            None
-        }
-    }
-
-    pub async fn get_ws_continuation_handler(&self, guid: &RequestGuid) -> Option<RestHandler> {
-        let continuations = self.rpc_stream_continuations.lock().await;
-        if matches!(continuations.get(guid), Some(RpcContinuation::WebSocket(_))) {
-            drop(continuations);
-            self.get_continuation_handler(guid).await
-        } else {
-            None
+        if !matches!(continuations.get(guid), Some(RpcContinuation::WebSocket(_))) {
+            return None;
         }
+        let Some(RpcContinuation::WebSocket(x)) = continuations.remove(guid) else {
+            return None;
+        };
+        x.get().await
     }
 
     pub async fn get_rest_continuation_handler(&self, guid: &RequestGuid) -> Option<RestHandler> {
-        let continuations = self.rpc_stream_continuations.lock().await;
-        if matches!(continuations.get(guid), Some(RpcContinuation::Rest(_))) {
-            drop(continuations);
-            self.get_continuation_handler(guid).await
-        } else {
-            None
+        let mut continuations: tokio::sync::MutexGuard<'_, BTreeMap<RequestGuid, RpcContinuation>> =
+            self.rpc_stream_continuations.lock().await;
+        if !matches!(continuations.get(guid), Some(RpcContinuation::Rest(_))) {
+            return None;
         }
+        let Some(RpcContinuation::Rest(x)) = continuations.remove(guid) else {
+            return None;
+        };
+        x.get().await
     }
 }
 impl AsRef<Jwk> for RpcContext {
diff --git a/core/startos/src/context/sdk.rs b/core/startos/src/context/sdk.rs
index 7ba7a6bfa..fb5d99572 100644
--- a/core/startos/src/context/sdk.rs
+++ b/core/startos/src/context/sdk.rs
@@ -8,13 +8,6 @@ use serde::Deserialize;
 use tracing::instrument;
 
 use crate::prelude::*;
-use crate::util::config::{load_config_from_paths, local_config_path};
-
-#[derive(Debug, Default, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct SdkContextConfig {
-    pub developer_key_path: Option<PathBuf>,
-}
 
 #[derive(Debug)]
 pub struct SdkContextSeed {
@@ -26,7 +19,7 @@ pub struct SdkContext(Arc<SdkContextSeed>);
 impl SdkContext {
     /// BLOCKING
     #[instrument(skip_all)]
-    pub fn init(matches: &ArgMatches) -> Result<Self, crate::Error> {
+    pub fn init(config: ) -> Result<Self, crate::Error> {
         let local_config_path = local_config_path();
         let base: SdkContextConfig = load_config_from_paths(
             matches
@@ -48,24 +41,7 @@ impl SdkContext {
             }),
         })))
     }
-    /// BLOCKING
-    #[instrument(skip_all)]
-    pub fn developer_key(&self) -> Result<ed25519_dalek::SigningKey, Error> {
-        if !self.developer_key_path.exists() {
-            return Err(Error::new(eyre!("Developer Key does not exist! Please run `start-sdk init` before running this command."), crate::ErrorKind::Uninitialized));
-        }
-        let pair = <ed25519::KeypairBytes as ed25519::pkcs8::DecodePrivateKey>::from_pkcs8_pem(
-            &std::fs::read_to_string(&self.developer_key_path)?,
-        )
-        .with_kind(crate::ErrorKind::Pem)?;
-        let secret = ed25519_dalek::SecretKey::try_from(&pair.secret_key[..]).map_err(|_| {
-            Error::new(
-                eyre!("pkcs8 key is of incorrect length"),
-                ErrorKind::OpenSsl,
-            )
-        })?;
-        Ok(secret.into())
-    }
+    
 }
 impl std::ops::Deref for SdkContext {
     type Target = SdkContextSeed;
diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index 7ae161b01..aeeca2920 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -1,5 +1,5 @@
 use std::ops::Deref;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;
 
 use josekit::jwk::Jwk;
@@ -15,12 +15,12 @@ use tokio::sync::RwLock;
 use tracing::instrument;
 
 use crate::account::AccountInfo;
+use crate::context::config::ServerConfig;
 use crate::db::model::Database;
 use crate::disk::OsPartitionInfo;
 use crate::init::init_postgres;
+use crate::prelude::*;
 use crate::setup::SetupStatus;
-use crate::util::config::load_config_from_paths;
-use crate::{Error, ResultExt};
 
 lazy_static::lazy_static! {
     pub static ref CURRENT_SECRET: Jwk = Jwk::generate_ec_key(josekit::jwk::alg::ec::EcCurve::P256).unwrap_or_else(|e| {
@@ -38,45 +38,9 @@ pub struct SetupResult {
     pub root_ca: String,
 }
 
-#[derive(Debug, Default, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct SetupContextConfig {
-    pub os_partitions: OsPartitionInfo,
-    pub migration_batch_rows: Option<usize>,
-    pub migration_prefetch_rows: Option<usize>,
-    pub datadir: Option<PathBuf>,
-    #[serde(default)]
-    pub disable_encryption: bool,
-}
-impl SetupContextConfig {
-    #[instrument(skip_all)]
-    pub async fn load<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
-        tokio::task::spawn_blocking(move || {
-            load_config_from_paths(
-                path.as_ref()
-                    .into_iter()
-                    .map(|p| p.as_ref())
-                    .chain(std::iter::once(Path::new(
-                        crate::util::config::DEVICE_CONFIG_PATH,
-                    )))
-                    .chain(std::iter::once(Path::new(crate::util::config::CONFIG_PATH))),
-            )
-        })
-        .await
-        .unwrap()
-    }
-    pub fn datadir(&self) -> &Path {
-        self.datadir
-            .as_deref()
-            .unwrap_or_else(|| Path::new("/embassy-data"))
-    }
-}
-
 pub struct SetupContextSeed {
+    pub config: ServerConfig,
     pub os_partitions: OsPartitionInfo,
-    pub config_path: Option<PathBuf>,
-    pub migration_batch_rows: usize,
-    pub migration_prefetch_rows: usize,
     pub disable_encryption: bool,
     pub shutdown: Sender<()>,
     pub datadir: PathBuf,
@@ -96,16 +60,18 @@ impl AsRef<Jwk> for SetupContextSeed {
 pub struct SetupContext(Arc<SetupContextSeed>);
 impl SetupContext {
     #[instrument(skip_all)]
-    pub async fn init<P: AsRef<Path> + Send + 'static>(path: Option<P>) -> Result<Self, Error> {
-        let cfg = SetupContextConfig::load(path.as_ref().map(|p| p.as_ref().to_owned())).await?;
+    pub fn init(config: &ServerConfig) -> Result<Self, Error> {
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
-        let datadir = cfg.datadir().to_owned();
+        let datadir = config.datadir().to_owned();
         Ok(Self(Arc::new(SetupContextSeed {
-            os_partitions: cfg.os_partitions,
-            config_path: path.as_ref().map(|p| p.as_ref().to_owned()),
-            migration_batch_rows: cfg.migration_batch_rows.unwrap_or(25000),
-            migration_prefetch_rows: cfg.migration_prefetch_rows.unwrap_or(100_000),
-            disable_encryption: cfg.disable_encryption,
+            config: config.clone(),
+            os_partitions: config.os_partitions.clone().ok_or_else(|| {
+                Error::new(
+                    eyre!("missing required configuration: `os-partitions`"),
+                    ErrorKind::NotFound,
+                )
+            })?,
+            disable_encryption: config.disable_encryption.unwrap_or(false),
             shutdown,
             datadir,
             selected_v2_drive: RwLock::new(None),
diff --git a/core/startos/src/control.rs b/core/startos/src/control.rs
index 58e39ac14..893aeee2b 100644
--- a/core/startos/src/control.rs
+++ b/core/startos/src/control.rs
@@ -1,89 +1,52 @@
+use clap::Parser;
 use color_eyre::eyre::eyre;
+use models::PackageId;
 use rpc_toolkit::command;
+use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
 use crate::context::RpcContext;
 use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::status::MainStatus;
-use crate::util::display_none;
 use crate::Error;
 
-#[command(display(display_none), metadata(sync_db = true))]
-#[instrument(skip_all)]
-pub async fn start(#[context] ctx: RpcContext, #[arg] id: PackageId) -> Result<(), Error> {
-    let peek = ctx.db.peek().await;
-    let version = peek
-        .as_package_data()
-        .as_idx(&id)
-        .or_not_found(&id)?
-        .as_installed()
-        .or_not_found(&id)?
-        .as_manifest()
-        .as_version()
-        .de()?;
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ControlParams {
+    pub id: PackageId,
+}
 
-    ctx.managers
-        .get(&(id, version))
+#[instrument(skip_all)]
+pub async fn start(ctx: RpcContext, ControlParams { id }: ControlParams) -> Result<(), Error> {
+    ctx.services
+        .get(&id)
         .await
-        .ok_or_else(|| Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest))?
+        .as_ref()
+        .or_not_found(lazy_format!("Manager for {id}"))?
         .start()
         .await;
 
     Ok(())
 }
 
-#[command(display(display_none), metadata(sync_db = true))]
-pub async fn stop(#[context] ctx: RpcContext, #[arg] id: PackageId) -> Result<MainStatus, Error> {
-    let peek = ctx.db.peek().await;
-    let version = peek
-        .as_package_data()
-        .as_idx(&id)
-        .or_not_found(&id)?
-        .as_installed()
-        .or_not_found(&id)?
-        .as_manifest()
-        .as_version()
-        .de()?;
-
-    let last_statuts = ctx
-        .db
-        .mutate(|v| {
-            v.as_package_data_mut()
-                .as_idx_mut(&id)
-                .and_then(|x| x.as_installed_mut())
-                .ok_or_else(|| Error::new(eyre!("{} is not installed", id), ErrorKind::NotFound))?
-                .as_status_mut()
-                .as_main_mut()
-                .replace(&MainStatus::Stopping)
-        })
-        .await?;
-
-    ctx.managers
-        .get(&(id, version))
+pub async fn stop(ctx: RpcContext, ControlParams { id }: ControlParams) -> Result<(), Error> {
+    // TODO: why did this return last_status before?
+    ctx.services
+        .get(&id)
         .await
+        .as_ref()
         .ok_or_else(|| Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest))?
         .stop()
         .await;
 
-    Ok(last_statuts)
+    Ok(())
 }
 
-#[command(display(display_none), metadata(sync_db = true))]
-pub async fn restart(#[context] ctx: RpcContext, #[arg] id: PackageId) -> Result<(), Error> {
-    let peek = ctx.db.peek().await;
-    let version = peek
-        .as_package_data()
-        .as_idx(&id)
-        .or_not_found(&id)?
-        .expect_as_installed()?
-        .as_manifest()
-        .as_version()
-        .de()?;
-
-    ctx.managers
-        .get(&(id, version))
+pub async fn restart(ctx: RpcContext, ControlParams { id }: ControlParams) -> Result<(), Error> {
+    ctx.services
+        .get(&id)
         .await
+        .as_ref()
         .ok_or_else(|| Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest))?
         .restart()
         .await;
diff --git a/core/startos/src/core/rpc_continuations.rs b/core/startos/src/core/rpc_continuations.rs
index 45a1c1b05..9a82cb1fe 100644
--- a/core/startos/src/core/rpc_continuations.rs
+++ b/core/startos/src/core/rpc_continuations.rs
@@ -1,27 +1,21 @@
-use std::sync::Arc;
 use std::time::Duration;
 
+use axum::extract::ws::WebSocket;
+use axum::extract::Request;
+use axum::response::Response;
 use futures::future::BoxFuture;
-use futures::FutureExt;
 use helpers::TimedResource;
-use hyper::upgrade::Upgraded;
-use hyper::{Body, Error as HyperError, Request, Response};
-use rand::RngCore;
-use tokio::task::JoinError;
-use tokio_tungstenite::WebSocketStream;
+use imbl_value::InternedString;
 
-use crate::{Error, ResultExt};
+#[allow(unused_imports)]
+use crate::prelude::*;
+use crate::util::new_guid;
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
-pub struct RequestGuid<T: AsRef<str> = String>(Arc<T>);
+pub struct RequestGuid(InternedString);
 impl RequestGuid {
     pub fn new() -> Self {
-        let mut buf = [0; 40];
-        rand::thread_rng().fill_bytes(&mut buf);
-        RequestGuid(Arc::new(base32::encode(
-            base32::Alphabet::RFC4648 { padding: false },
-            &buf,
-        )))
+        Self(new_guid())
     }
 
     pub fn from(r: &str) -> Option<RequestGuid> {
@@ -33,9 +27,15 @@ impl RequestGuid {
                 return None;
             }
         }
-        Some(RequestGuid(Arc::new(r.to_owned())))
+        Some(RequestGuid(InternedString::intern(r)))
     }
 }
+impl AsRef<str> for RequestGuid {
+    fn as_ref(&self) -> &str {
+        self.0.as_ref()
+    }
+}
+
 #[test]
 fn parse_guid() {
     println!(
@@ -44,22 +44,16 @@ fn parse_guid() {
     )
 }
 
-impl<T: AsRef<str>> std::fmt::Display for RequestGuid<T> {
+impl std::fmt::Display for RequestGuid {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        (&*self.0).as_ref().fmt(f)
+        self.0.fmt(f)
     }
 }
 
-pub type RestHandler = Box<
-    dyn FnOnce(Request<Body>) -> BoxFuture<'static, Result<Response<Body>, crate::Error>> + Send,
->;
+pub type RestHandler =
+    Box<dyn FnOnce(Request) -> BoxFuture<'static, Result<Response, crate::Error>> + Send>;
 
-pub type WebSocketHandler = Box<
-    dyn FnOnce(
-            BoxFuture<'static, Result<Result<WebSocketStream<Upgraded>, HyperError>, JoinError>>,
-        ) -> BoxFuture<'static, Result<(), Error>>
-        + Send,
->;
+pub type WebSocketHandler = Box<dyn FnOnce(WebSocket) -> BoxFuture<'static, ()> + Send>;
 
 pub enum RpcContinuation {
     Rest(TimedResource<RestHandler>),
@@ -78,39 +72,4 @@ impl RpcContinuation {
             RpcContinuation::WebSocket(a) => a.is_timed_out(),
         }
     }
-    pub async fn into_handler(self) -> Option<RestHandler> {
-        match self {
-            RpcContinuation::Rest(handler) => handler.get().await,
-            RpcContinuation::WebSocket(handler) => {
-                if let Some(handler) = handler.get().await {
-                    Some(Box::new(
-                        |req: Request<Body>| -> BoxFuture<'static, Result<Response<Body>, Error>> {
-                            async move {
-                                let (parts, body) = req.into_parts();
-                                let req = Request::from_parts(parts, body);
-                                let (res, ws_fut) = hyper_ws_listener::create_ws(req)
-                                    .with_kind(crate::ErrorKind::Network)?;
-                                if let Some(ws_fut) = ws_fut {
-                                    tokio::task::spawn(async move {
-                                        match handler(ws_fut.boxed()).await {
-                                            Ok(()) => (),
-                                            Err(e) => {
-                                                tracing::error!("WebSocket Closed: {}", e);
-                                                tracing::debug!("{:?}", e);
-                                            }
-                                        }
-                                    });
-                                }
-
-                                Ok(res)
-                            }
-                            .boxed()
-                        },
-                    ))
-                } else {
-                    None
-                }
-            }
-        }
-    }
 }
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 03ad94338..77b2dfef2 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -1,61 +1,52 @@
 pub mod model;
-pub mod package;
 pub mod prelude;
 
-use std::future::Future;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use futures::{FutureExt, SinkExt, StreamExt};
+use axum::extract::ws::{self, WebSocket};
+use axum::extract::WebSocketUpgrade;
+use axum::response::Response;
+use clap::Parser;
+use futures::{FutureExt, StreamExt};
+use http::header::COOKIE;
+use http::HeaderMap;
 use patch_db::json_ptr::JsonPointer;
 use patch_db::{Dump, Revision};
-use rpc_toolkit::command;
-use rpc_toolkit::hyper::upgrade::Upgraded;
-use rpc_toolkit::hyper::{Body, Error as HyperError, Request, Response};
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{command, from_fn_async, CallRemote, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use tokio::sync::oneshot;
-use tokio::task::JoinError;
-use tokio_tungstenite::tungstenite::protocol::frame::coding::CloseCode;
-use tokio_tungstenite::tungstenite::protocol::CloseFrame;
-use tokio_tungstenite::tungstenite::Message;
-use tokio_tungstenite::WebSocketStream;
 use tracing::instrument;
 
 use crate::context::{CliContext, RpcContext};
 use crate::middleware::auth::{HasValidSession, HashSessionToken};
 use crate::prelude::*;
-use crate::util::display_none;
-use crate::util::serde::{display_serializable, IoFormat};
+use crate::util::serde::{apply_expr, HandlerExtSerde};
 
 #[instrument(skip_all)]
-async fn ws_handler<
-    WSFut: Future<Output = Result<Result<WebSocketStream<Upgraded>, HyperError>, JoinError>>,
->(
+async fn ws_handler(
     ctx: RpcContext,
     session: Option<(HasValidSession, HashSessionToken)>,
-    ws_fut: WSFut,
+    mut stream: WebSocket,
 ) -> Result<(), Error> {
     let (dump, sub) = ctx.db.dump_and_sub().await;
-    let mut stream = ws_fut
-        .await
-        .with_kind(ErrorKind::Network)?
-        .with_kind(ErrorKind::Unknown)?;
 
     if let Some((session, token)) = session {
         let kill = subscribe_to_session_kill(&ctx, token).await;
-        send_dump(session, &mut stream, dump).await?;
+        send_dump(session.clone(), &mut stream, dump).await?;
 
         deal_with_messages(session, kill, sub, stream).await?;
     } else {
         stream
-            .close(Some(CloseFrame {
-                code: CloseCode::Error,
+            .send(ws::Message::Close(Some(ws::CloseFrame {
+                code: ws::close_code::ERROR,
                 reason: "UNAUTHORIZED".into(),
-            }))
+            })))
             .await
             .with_kind(ErrorKind::Network)?;
+        drop(stream);
     }
 
     Ok(())
@@ -80,7 +71,7 @@ async fn deal_with_messages(
     _has_valid_authentication: HasValidSession,
     mut kill: oneshot::Receiver<()>,
     mut sub: patch_db::Subscriber,
-    mut stream: WebSocketStream<Upgraded>,
+    mut stream: WebSocket,
 ) -> Result<(), Error> {
     let mut timer = tokio::time::interval(tokio::time::Duration::from_secs(5));
 
@@ -89,18 +80,18 @@ async fn deal_with_messages(
             _ = (&mut kill).fuse() => {
                 tracing::info!("Closing WebSocket: Reason: Session Terminated");
                 stream
-                    .close(Some(CloseFrame {
-                        code: CloseCode::Error,
-                        reason: "UNAUTHORIZED".into(),
-                    }))
-                    .await
-                    .with_kind(ErrorKind::Network)?;
+                .send(ws::Message::Close(Some(ws::CloseFrame {
+                    code: ws::close_code::ERROR,
+                    reason: "UNAUTHORIZED".into(),
+                }))).await
+                .with_kind(ErrorKind::Network)?;
+                drop(stream);
                 return Ok(())
             }
             new_rev = sub.recv().fuse() => {
                 let rev = new_rev.expect("UNREACHABLE: patch-db is dropped");
                 stream
-                    .send(Message::Text(serde_json::to_string(&rev).with_kind(ErrorKind::Serialization)?))
+                    .send(ws::Message::Text(serde_json::to_string(&rev).with_kind(ErrorKind::Serialization)?))
                     .await
                     .with_kind(ErrorKind::Network)?;
             }
@@ -117,7 +108,7 @@ async fn deal_with_messages(
             // This is trying to give a health checks to the home to keep the ui alive.
             _ = timer.tick().fuse() => {
                 stream
-                    .send(Message::Ping(vec![]))
+                    .send(ws::Message::Ping(vec![]))
                     .await
                     .with_kind(crate::ErrorKind::Network)?;
             }
@@ -127,11 +118,11 @@ async fn deal_with_messages(
 
 async fn send_dump(
     _has_valid_authentication: HasValidSession,
-    stream: &mut WebSocketStream<Upgraded>,
+    stream: &mut WebSocket,
     dump: Dump,
 ) -> Result<(), Error> {
     stream
-        .send(Message::Text(
+        .send(ws::Message::Text(
             serde_json::to_string(&dump).with_kind(ErrorKind::Serialization)?,
         ))
         .await
@@ -139,11 +130,14 @@ async fn send_dump(
     Ok(())
 }
 
-pub async fn subscribe(ctx: RpcContext, req: Request<Body>) -> Result<Response<Body>, Error> {
-    let (parts, body) = req.into_parts();
+pub async fn subscribe(
+    ctx: RpcContext,
+    headers: HeaderMap,
+    ws: WebSocketUpgrade,
+) -> Result<Response, Error> {
     let session = match async {
-        let token = HashSessionToken::from_request_parts(&parts)?;
-        let session = HasValidSession::from_request_parts(&parts, &ctx).await?;
+        let token = HashSessionToken::from_header(headers.get(COOKIE))?;
+        let session = HasValidSession::from_header(headers.get(COOKIE), &ctx).await?;
         Ok::<_, Error>((session, token))
     }
     .await
@@ -157,26 +151,24 @@ pub async fn subscribe(ctx: RpcContext, req: Request<Body>) -> Result<Response<B
             None
         }
     };
-    let req = Request::from_parts(parts, body);
-    let (res, ws_fut) = hyper_ws_listener::create_ws(req).with_kind(ErrorKind::Network)?;
-    if let Some(ws_fut) = ws_fut {
-        tokio::task::spawn(async move {
-            match ws_handler(ctx, session, ws_fut).await {
-                Ok(()) => (),
-                Err(e) => {
-                    tracing::error!("WebSocket Closed: {}", e);
-                    tracing::debug!("{:?}", e);
-                }
+    Ok(ws.on_upgrade(|ws| async move {
+        match ws_handler(ctx, session, ws).await {
+            Ok(()) => (),
+            Err(e) => {
+                tracing::error!("WebSocket Closed: {}", e);
+                tracing::debug!("{:?}", e);
             }
-        });
-    }
-
-    Ok(res)
+        }
+    }))
 }
 
-#[command(subcommands(dump, put, apply))]
-pub fn db() -> Result<(), RpcError> {
-    Ok(())
+pub fn db() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("dump", from_fn_async(cli_dump).with_display_serializable())
+        .subcommand("dump", from_fn_async(dump).no_cli())
+        .subcommand("put", put())
+        .subcommand("apply", from_fn_async(cli_apply).no_display())
+        .subcommand("apply", from_fn_async(apply).no_cli())
 }
 
 #[derive(Deserialize, Serialize)]
@@ -187,96 +179,36 @@ pub enum RevisionsRes {
 }
 
 #[instrument(skip_all)]
-async fn cli_dump(
-    ctx: CliContext,
-    _format: Option<IoFormat>,
-    path: Option<PathBuf>,
-) -> Result<Dump, RpcError> {
+async fn cli_dump(ctx: CliContext, DumpParams { path }: DumpParams) -> Result<Dump, RpcError> {
     let dump = if let Some(path) = path {
         PatchDb::open(path).await?.dump().await
     } else {
-        rpc_toolkit::command_helpers::call_remote(
-            ctx,
-            "db.dump",
-            serde_json::json!({}),
-            std::marker::PhantomData::<Dump>,
-        )
-        .await?
-        .result?
+        from_value::<Dump>(ctx.call_remote("db.dump", imbl_value::json!({})).await?)?
     };
 
     Ok(dump)
 }
 
-#[command(
-    custom_cli(cli_dump(async, context(CliContext))),
-    display(display_serializable)
-)]
-pub async fn dump(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-    #[allow(unused_variables)]
-    #[arg]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct DumpParams {
     path: Option<PathBuf>,
-) -> Result<Dump, Error> {
-    Ok(ctx.db.dump().await)
 }
 
-fn apply_expr(input: jaq_core::Val, expr: &str) -> Result<jaq_core::Val, Error> {
-    let (expr, errs) = jaq_core::parse::parse(expr, jaq_core::parse::main());
-
-    let Some(expr) = expr else {
-        return Err(Error::new(
-            eyre!("Failed to parse expression: {:?}", errs),
-            crate::ErrorKind::InvalidRequest,
-        ));
-    };
-
-    let mut errs = Vec::new();
-
-    let mut defs = jaq_core::Definitions::core();
-    for def in jaq_std::std() {
-        defs.insert(def, &mut errs);
-    }
-
-    let filter = defs.finish(expr, Vec::new(), &mut errs);
-
-    if !errs.is_empty() {
-        return Err(Error::new(
-            eyre!("Failed to compile expression: {:?}", errs),
-            crate::ErrorKind::InvalidRequest,
-        ));
-    };
-
-    let inputs = jaq_core::RcIter::new(std::iter::empty());
-    let mut res_iter = filter.run(jaq_core::Ctx::new([], &inputs), input);
-
-    let Some(res) = res_iter
-        .next()
-        .transpose()
-        .map_err(|e| eyre!("{e}"))
-        .with_kind(crate::ErrorKind::Deserialization)?
-    else {
-        return Err(Error::new(
-            eyre!("expr returned no results"),
-            crate::ErrorKind::InvalidRequest,
-        ));
-    };
-
-    if res_iter.next().is_some() {
-        return Err(Error::new(
-            eyre!("expr returned too many results"),
-            crate::ErrorKind::InvalidRequest,
-        ));
-    }
-
-    Ok(res)
+// #[command(
+//     custom_cli(cli_dump(async, context(CliContext))),
+//     display(display_serializable)
+// )]
+pub async fn dump(ctx: RpcContext, _: DumpParams) -> Result<Dump, Error> {
+    Ok(ctx.db.dump().await)
 }
 
 #[instrument(skip_all)]
-async fn cli_apply(ctx: CliContext, expr: String, path: Option<PathBuf>) -> Result<(), RpcError> {
+async fn cli_apply(
+    ctx: CliContext,
+    ApplyParams { expr, path }: ApplyParams,
+) -> Result<(), RpcError> {
     if let Some(path) = path {
         PatchDb::open(path)
             .await?
@@ -301,30 +233,22 @@ async fn cli_apply(ctx: CliContext, expr: String, path: Option<PathBuf>) -> Resu
             })
             .await?;
     } else {
-        rpc_toolkit::command_helpers::call_remote(
-            ctx,
-            "db.apply",
-            serde_json::json!({ "expr": expr }),
-            std::marker::PhantomData::<()>,
-        )
-        .await?
-        .result?;
+        ctx.call_remote("db.apply", imbl_value::json!({ "expr": expr }))
+            .await?;
     }
 
     Ok(())
 }
 
-#[command(
-    custom_cli(cli_apply(async, context(CliContext))),
-    display(display_none)
-)]
-pub async fn apply(
-    #[context] ctx: RpcContext,
-    #[arg] expr: String,
-    #[allow(unused_variables)]
-    #[arg]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ApplyParams {
+    expr: String,
     path: Option<PathBuf>,
-) -> Result<(), Error> {
+}
+
+pub async fn apply(ctx: RpcContext, ApplyParams { expr, .. }: ApplyParams) -> Result<(), Error> {
     ctx.db
         .mutate(|db| {
             let res = apply_expr(
@@ -346,21 +270,25 @@ pub async fn apply(
         .await
 }
 
-#[command(subcommands(ui))]
-pub fn put() -> Result<(), RpcError> {
-    Ok(())
+pub fn put() -> ParentHandler {
+    ParentHandler::new().subcommand(
+        "ui",
+        from_fn_async(ui)
+            .with_display_serializable()
+            .with_remote_cli::<CliContext>(),
+    )
+}
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct UiParams {
+    pointer: JsonPointer,
+    value: Value,
 }
 
-#[command(display(display_serializable))]
+// #[command(display(display_serializable))]
 #[instrument(skip_all)]
-pub async fn ui(
-    #[context] ctx: RpcContext,
-    #[arg] pointer: JsonPointer,
-    #[arg] value: Value,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<(), Error> {
+pub async fn ui(ctx: RpcContext, UiParams { pointer, value, .. }: UiParams) -> Result<(), Error> {
     let ptr = "/ui"
         .parse::<JsonPointer>()
         .with_kind(ErrorKind::Database)?
diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs
index 344d5abb3..2f4d33ffa 100644
--- a/core/startos/src/db/model.rs
+++ b/core/startos/src/db/model.rs
@@ -1,6 +1,5 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::net::{Ipv4Addr, Ipv6Addr};
-use std::sync::Arc;
 
 use chrono::{DateTime, Utc};
 use emver::VersionRange;
@@ -8,8 +7,9 @@ use imbl_value::InternedString;
 use ipnet::{Ipv4Net, Ipv6Net};
 use isocountry::CountryCode;
 use itertools::Itertools;
-use models::{DataUrl, HealthCheckId, InterfaceId};
+use models::{DataUrl, HealthCheckId, InterfaceId, PackageId};
 use openssl::hash::MessageDigest;
+use patch_db::json_ptr::JsonPointer;
 use patch_db::{HasModel, Value};
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
@@ -17,12 +17,12 @@ use ssh_key::public::Ed25519PublicKey;
 
 use crate::account::AccountInfo;
 use crate::config::spec::PackagePointerSpec;
-use crate::install::progress::InstallProgress;
 use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
 use crate::prelude::*;
-use crate::s9pk::manifest::{Manifest, PackageId};
+use crate::progress::FullProgress;
+use crate::s9pk::manifest::Manifest;
 use crate::status::Status;
-use crate::util::cpupower::{Governor};
+use crate::util::cpupower::Governor;
 use crate::util::Version;
 use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
@@ -225,14 +225,14 @@ impl Map for AllPackageData {
 pub struct StaticFiles {
     license: String,
     instructions: String,
-    icon: String,
+    icon: DataUrl<'static>,
 }
 impl StaticFiles {
-    pub fn local(id: &PackageId, version: &Version, icon_type: &str) -> Self {
+    pub fn local(id: &PackageId, version: &Version, icon: DataUrl<'static>) -> Self {
         StaticFiles {
             license: format!("/public/package-data/{}/{}/LICENSE.md", id, version),
             instructions: format!("/public/package-data/{}/{}/INSTRUCTIONS.md", id, version),
-            icon: format!("/public/package-data/{}/{}/icon.{}", id, version, icon_type),
+            icon,
         }
     }
 }
@@ -243,7 +243,7 @@ impl StaticFiles {
 pub struct PackageDataEntryInstalling {
     pub static_files: StaticFiles,
     pub manifest: Manifest,
-    pub install_progress: Arc<InstallProgress>,
+    pub install_progress: FullProgress,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
@@ -253,7 +253,7 @@ pub struct PackageDataEntryUpdating {
     pub static_files: StaticFiles,
     pub manifest: Manifest,
     pub installed: InstalledPackageInfo,
-    pub install_progress: Arc<InstallProgress>,
+    pub install_progress: FullProgress,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
@@ -262,7 +262,7 @@ pub struct PackageDataEntryUpdating {
 pub struct PackageDataEntryRestoring {
     pub static_files: StaticFiles,
     pub manifest: Manifest,
-    pub install_progress: Arc<InstallProgress>,
+    pub install_progress: FullProgress,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
@@ -422,7 +422,7 @@ impl Model<PackageDataEntry> {
             PackageDataEntryMatchModelMut::Error(_) => None,
         }
     }
-    pub fn as_install_progress(&self) -> Option<&Model<Arc<InstallProgress>>> {
+    pub fn as_install_progress(&self) -> Option<&Model<FullProgress>> {
         match self.as_match() {
             PackageDataEntryMatchModelRef::Installing(a) => Some(a.as_install_progress()),
             PackageDataEntryMatchModelRef::Updating(a) => Some(a.as_install_progress()),
@@ -432,7 +432,7 @@ impl Model<PackageDataEntry> {
             PackageDataEntryMatchModelRef::Error(_) => None,
         }
     }
-    pub fn as_install_progress_mut(&mut self) -> Option<&mut Model<Arc<InstallProgress>>> {
+    pub fn as_install_progress_mut(&mut self) -> Option<&mut Model<FullProgress>> {
         match self.as_match_mut() {
             PackageDataEntryMatchModelMut::Installing(a) => Some(a.as_install_progress_mut()),
             PackageDataEntryMatchModelMut::Updating(a) => Some(a.as_install_progress_mut()),
@@ -459,6 +459,29 @@ pub struct InstalledPackageInfo {
     pub current_dependents: CurrentDependents,
     pub current_dependencies: CurrentDependencies,
     pub interface_addresses: InterfaceAddressMap,
+    pub store: Value,
+    pub store_exposed_ui: Vec<ExposedUI>,
+    pub store_exposed_dependents: Vec<JsonPointer>,
+}
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[model = "Model<Self>"]
+pub struct ExposedDependent {
+    path: String,
+    title: String,
+    description: Option<String>,
+    masked: Option<bool>,
+    copyable: Option<bool>,
+    qr: Option<bool>,
+}
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[model = "Model<Self>"]
+pub struct ExposedUI {
+    path: Vec<JsonPointer>,
+    title: String,
+    description: Option<String>,
+    masked: Option<bool>,
+    copyable: Option<bool>,
+    qr: Option<bool>,
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
@@ -478,7 +501,6 @@ impl Map for CurrentDependents {
     type Key = PackageId;
     type Value = CurrentDependencyInfo;
 }
-
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 pub struct CurrentDependencies(pub BTreeMap<PackageId, CurrentDependencyInfo>);
 impl CurrentDependencies {
@@ -514,7 +536,7 @@ pub struct CurrentDependencyInfo {
     pub health_checks: BTreeSet<HealthCheckId>,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize)]
 pub struct InterfaceAddressMap(pub BTreeMap<InterfaceId, InterfaceAddresses>);
 impl Map for InterfaceAddressMap {
     type Key = InterfaceId;
diff --git a/core/startos/src/db/package.rs b/core/startos/src/db/package.rs
deleted file mode 100644
index fe6f93809..000000000
--- a/core/startos/src/db/package.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use models::Version;
-
-use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-
-pub fn get_packages(db: Peeked) -> Result<Vec<(PackageId, Version)>, Error> {
-    Ok(db
-        .as_package_data()
-        .keys()?
-        .into_iter()
-        .flat_map(|package_id| {
-            let version = db
-                .as_package_data()
-                .as_idx(&package_id)?
-                .as_manifest()
-                .as_version()
-                .de()
-                .ok()?;
-            Some((package_id, version))
-        })
-        .collect())
-}
diff --git a/core/startos/src/db/prelude.rs b/core/startos/src/db/prelude.rs
index 922a47500..15e511d53 100644
--- a/core/startos/src/db/prelude.rs
+++ b/core/startos/src/db/prelude.rs
@@ -2,8 +2,9 @@ use std::collections::BTreeMap;
 use std::marker::PhantomData;
 use std::panic::UnwindSafe;
 
+pub use imbl_value::Value;
 use patch_db::value::InternedString;
-pub use patch_db::{HasModel, PatchDb, Value};
+pub use patch_db::{HasModel, PatchDb};
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index dfddecd93..d6b297e13 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -1,31 +1,26 @@
 use std::collections::BTreeMap;
 use std::time::Duration;
 
-use color_eyre::eyre::eyre;
+use clap::Parser;
 use emver::VersionRange;
-use models::OptionExt;
-use rand::SeedableRng;
-use rpc_toolkit::command;
+use models::{OptionExt, PackageId};
+use rpc_toolkit::{command, from_fn_async, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
-use crate::config::action::ConfigRes;
 use crate::config::spec::PackagePointerSpec;
-use crate::config::{not_found, Config, ConfigSpec, ConfigureContext};
-use crate::context::RpcContext;
+use crate::config::{Config, ConfigSpec, ConfigureContext};
+use crate::context::{CliContext, RpcContext};
 use crate::db::model::{CurrentDependencies, Database};
 use crate::prelude::*;
-use crate::procedure::{NoOutput, PackageProcedure, ProcedureName};
-use crate::s9pk::manifest::{Manifest, PackageId};
+use crate::s9pk::manifest::Manifest;
 use crate::status::DependencyConfigErrors;
-use crate::util::serde::display_serializable;
-use crate::util::{display_none, Version};
-use crate::volume::Volumes;
+use crate::util::serde::HandlerExtSerde;
+use crate::util::Version;
 use crate::Error;
 
-#[command(subcommands(configure))]
-pub fn dependency() -> Result<(), Error> {
-    Ok(())
+pub fn dependency() -> ParentHandler {
+    ParentHandler::new().subcommand("configure", configure())
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel)]
@@ -58,77 +53,41 @@ pub struct DepInfo {
     pub requirement: DependencyRequirement,
     pub description: Option<String>,
     #[serde(default)]
-    pub config: Option<DependencyConfig>,
+    pub config: Option<Value>, // TODO: remove
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct DependencyConfig {
-    check: PackageProcedure,
-    auto_configure: PackageProcedure,
+#[command(rename_all = "kebab-case")]
+pub struct ConfigureParams {
+    #[arg(name = "dependent-id")]
+    dependent_id: PackageId,
+    #[arg(name = "dependency-id")]
+    dependency_id: PackageId,
 }
-impl DependencyConfig {
-    pub async fn check(
-        &self,
-        ctx: &RpcContext,
-        dependent_id: &PackageId,
-        dependent_version: &Version,
-        dependent_volumes: &Volumes,
-        dependency_id: &PackageId,
-        dependency_config: &Config,
-    ) -> Result<Result<NoOutput, String>, Error> {
-        Ok(self
-            .check
-            .sandboxed(
-                ctx,
-                dependent_id,
-                dependent_version,
-                dependent_volumes,
-                Some(dependency_config),
-                None,
-                ProcedureName::Check(dependency_id.clone()),
-            )
-            .await?
-            .map_err(|(_, e)| e))
-    }
-    pub async fn auto_configure(
-        &self,
-        ctx: &RpcContext,
-        dependent_id: &PackageId,
-        dependent_version: &Version,
-        dependent_volumes: &Volumes,
-        old: &Config,
-    ) -> Result<Config, Error> {
-        self.auto_configure
-            .sandboxed(
-                ctx,
-                dependent_id,
-                dependent_version,
-                dependent_volumes,
-                Some(old),
-                None,
-                ProcedureName::AutoConfig(dependent_id.clone()),
-            )
-            .await?
-            .map_err(|e| Error::new(eyre!("{}", e.1), crate::ErrorKind::AutoConfigure))
-    }
-}
-
-#[command(
-    subcommands(self(configure_impl(async)), configure_dry),
-    display(display_none)
-)]
-pub async fn configure(
-    #[arg(rename = "dependent-id")] dependent_id: PackageId,
-    #[arg(rename = "dependency-id")] dependency_id: PackageId,
-) -> Result<(PackageId, PackageId), Error> {
-    Ok((dependent_id, dependency_id))
+pub fn configure() -> ParentHandler<ConfigureParams> {
+    ParentHandler::new()
+        .root_handler(
+            from_fn_async(configure_impl)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
+        .subcommand(
+            "dry",
+            from_fn_async(configure_dry)
+                .with_inherited(|params, _| params)
+                .with_display_serializable()
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
 pub async fn configure_impl(
     ctx: RpcContext,
-    (pkg_id, dep_id): (PackageId, PackageId),
+    _: Empty,
+    ConfigureParams {
+        dependent_id,
+        dependency_id,
+    }: ConfigureParams,
 ) -> Result<(), Error> {
     let breakages = BTreeMap::new();
     let overrides = Default::default();
@@ -136,7 +95,7 @@ pub async fn configure_impl(
         old_config: _,
         new_config,
         spec: _,
-    } = configure_logic(ctx.clone(), (pkg_id, dep_id.clone())).await?;
+    } = configure_logic(ctx.clone(), (dependent_id, dependency_id.clone())).await?;
 
     let configure_context = ConfigureContext {
         breakages,
@@ -145,7 +104,18 @@ pub async fn configure_impl(
         dry_run: false,
         overrides,
     };
-    crate::config::configure(&ctx, &dep_id, configure_context).await?;
+    ctx.services
+        .get(&dependency_id)
+        .await
+        .as_ref()
+        .ok_or_else(|| {
+            Error::new(
+                eyre!("There is no manager running for {dependency_id}"),
+                ErrorKind::Unknown,
+            )
+        })?
+        .configure(configure_context)
+        .await?;
     Ok(())
 }
 
@@ -157,90 +127,95 @@ pub struct ConfigDryRes {
     pub spec: ConfigSpec,
 }
 
-#[command(rename = "dry", display(display_serializable))]
+// #[command(rename = "dry", display(display_serializable))]
 #[instrument(skip_all)]
 pub async fn configure_dry(
-    #[context] ctx: RpcContext,
-    #[parent_data] (pkg_id, dependency_id): (PackageId, PackageId),
+    ctx: RpcContext,
+    _: Empty,
+    ConfigureParams {
+        dependent_id,
+        dependency_id,
+    }: ConfigureParams,
 ) -> Result<ConfigDryRes, Error> {
-    configure_logic(ctx, (pkg_id, dependency_id)).await
+    configure_logic(ctx, (dependent_id, dependency_id)).await
 }
 
 pub async fn configure_logic(
     ctx: RpcContext,
-    (pkg_id, dependency_id): (PackageId, PackageId),
+    (dependent_id, dependency_id): (PackageId, PackageId),
 ) -> Result<ConfigDryRes, Error> {
-    let db = ctx.db.peek().await;
-    let pkg = db
-        .as_package_data()
-        .as_idx(&pkg_id)
-        .or_not_found(&pkg_id)?
-        .as_installed()
-        .or_not_found(&pkg_id)?;
-    let pkg_version = pkg.as_manifest().as_version().de()?;
-    let pkg_volumes = pkg.as_manifest().as_volumes().de()?;
-    let dependency = db
-        .as_package_data()
-        .as_idx(&dependency_id)
-        .or_not_found(&dependency_id)?
-        .as_installed()
-        .or_not_found(&dependency_id)?;
-    let dependency_config_action = dependency
-        .as_manifest()
-        .as_config()
-        .de()?
-        .ok_or_else(|| not_found!("Manifest Config"))?;
-    let dependency_version = dependency.as_manifest().as_version().de()?;
-    let dependency_volumes = dependency.as_manifest().as_volumes().de()?;
-    let dependency = pkg
-        .as_manifest()
-        .as_dependencies()
-        .as_idx(&dependency_id)
-        .or_not_found(&dependency_id)?;
+    // let db = ctx.db.peek().await;
+    // let pkg = db
+    //     .as_package_data()
+    //     .as_idx(&pkg_id)
+    //     .or_not_found(&pkg_id)?
+    //     .as_installed()
+    //     .or_not_found(&pkg_id)?;
+    // let pkg_version = pkg.as_manifest().as_version().de()?;
+    // let pkg_volumes = pkg.as_manifest().as_volumes().de()?;
+    // let dependency = db
+    //     .as_package_data()
+    //     .as_idx(&dependency_id)
+    //     .or_not_found(&dependency_id)?
+    //     .as_installed()
+    //     .or_not_found(&dependency_id)?;
+    // let dependency_config_action = dependency
+    //     .as_manifest()
+    //     .as_config()
+    //     .de()?
+    //     .ok_or_else(|| not_found!("Manifest Config"))?;
+    // let dependency_version = dependency.as_manifest().as_version().de()?;
+    // let dependency_volumes = dependency.as_manifest().as_volumes().de()?;
+    // let dependency = pkg
+    //     .as_manifest()
+    //     .as_dependencies()
+    //     .as_idx(&dependency_id)
+    //     .or_not_found(&dependency_id)?;
 
-    let ConfigRes {
-        config: maybe_config,
-        spec,
-    } = dependency_config_action
-        .get(
-            &ctx,
-            &dependency_id,
-            &dependency_version,
-            &dependency_volumes,
-        )
-        .await?;
+    // let ConfigRes {
+    //     config: maybe_config,
+    //     spec,
+    // } = dependency_config_action
+    //     .get(
+    //         &ctx,
+    //         &dependency_id,
+    //         &dependency_version,
+    //         &dependency_volumes,
+    //     )
+    //     .await?;
 
-    let old_config = if let Some(config) = maybe_config {
-        config
-    } else {
-        spec.gen(
-            &mut rand::rngs::StdRng::from_entropy(),
-            &Some(Duration::new(10, 0)),
-        )?
-    };
+    // let old_config = if let Some(config) = maybe_config {
+    //     config
+    // } else {
+    //     spec.gen(
+    //         &mut rand::rngs::StdRng::from_entropy(),
+    //         &Some(Duration::new(10, 0)),
+    //     )?
+    // };
 
-    let new_config = dependency
-        .as_config()
-        .de()?
-        .ok_or_else(|| not_found!("Config"))?
-        .auto_configure
-        .sandboxed(
-            &ctx,
-            &pkg_id,
-            &pkg_version,
-            &pkg_volumes,
-            Some(&old_config),
-            None,
-            ProcedureName::AutoConfig(dependency_id.clone()),
-        )
-        .await?
-        .map_err(|e| Error::new(eyre!("{}", e.1), crate::ErrorKind::AutoConfigure))?;
+    // let new_config = dependency
+    //     .as_config()
+    //     .de()?
+    //     .ok_or_else(|| not_found!("Config"))?
+    //     .auto_configure
+    //     .sandboxed(
+    //         &ctx,
+    //         &pkg_id,
+    //         &pkg_version,
+    //         &pkg_volumes,
+    //         Some(&old_config),
+    //         None,
+    //         ProcedureName::AutoConfig(dependency_id.clone()),
+    //     )
+    //     .await?
+    //     .map_err(|e| Error::new(eyre!("{}", e.1), crate::ErrorKind::AutoConfigure))?;
 
-    Ok(ConfigDryRes {
-        old_config,
-        new_config,
-        spec,
-    })
+    // Ok(ConfigDryRes {
+    //     old_config,
+    //     new_config,
+    //     spec,
+    // })
+    todo!()
 }
 
 #[instrument(skip_all)]
@@ -324,36 +299,7 @@ pub async fn compute_dependency_config_errs(
             .or_not_found(dependency)?
             .config
         {
-            if let Err(error) = cfg
-                .check(
-                    ctx,
-                    &manifest.id,
-                    &manifest.version,
-                    &manifest.volumes,
-                    dependency,
-                    &if let Some(config) = dependency_config.get(dependency) {
-                        config.clone()
-                    } else if let Some(manifest) = db
-                        .as_package_data()
-                        .as_idx(dependency)
-                        .and_then(|pde| pde.as_installed())
-                        .map(|i| i.as_manifest().de())
-                        .transpose()?
-                    {
-                        if let Some(config) = &manifest.config {
-                            config
-                                .get(ctx, &manifest.id, &manifest.version, &manifest.volumes)
-                                .await?
-                                .config
-                                .unwrap_or_default()
-                        } else {
-                            Config::default()
-                        }
-                    } else {
-                        Config::default()
-                    },
-                )
-                .await?
+            let error = todo!();
             {
                 dependency_config_errs.insert(dependency.clone(), error);
             }
diff --git a/core/startos/src/developer/mod.rs b/core/startos/src/developer/mod.rs
index 8722a4a11..596957445 100644
--- a/core/startos/src/developer/mod.rs
+++ b/core/startos/src/developer/mod.rs
@@ -5,16 +5,13 @@ use std::path::Path;
 use ed25519::pkcs8::EncodePrivateKey;
 use ed25519::PublicKeyBytes;
 use ed25519_dalek::{SigningKey, VerifyingKey};
-use rpc_toolkit::command;
 use tracing::instrument;
 
-use crate::context::SdkContext;
-use crate::util::display_none;
+use crate::context::CliContext;
 use crate::{Error, ResultExt};
 
-#[command(cli_only, blocking, display(display_none))]
 #[instrument(skip_all)]
-pub fn init(#[context] ctx: SdkContext) -> Result<(), Error> {
+pub fn init(ctx: CliContext) -> Result<(), Error> {
     if !ctx.developer_key_path.exists() {
         let parent = ctx.developer_key_path.parent().unwrap_or(Path::new("/"));
         if !parent.exists() {
@@ -48,8 +45,3 @@ pub fn init(#[context] ctx: SdkContext) -> Result<(), Error> {
     }
     Ok(())
 }
-
-#[command(subcommands(crate::s9pk::verify, crate::config::verify_spec))]
-pub fn verify() -> Result<(), Error> {
-    Ok(())
-}
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index aad95a5e5..f9f715bfe 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -1,44 +1,70 @@
 use std::path::Path;
 use std::sync::Arc;
 
-use rpc_toolkit::command;
+use clap::Parser;
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{command, from_fn, from_fn_async, AnyContext, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 
-use crate::context::DiagnosticContext;
-use crate::disk::repair;
+use crate::context::{CliContext, DiagnosticContext};
 use crate::init::SYSTEM_REBUILD_PATH;
 use crate::logs::{fetch_logs, LogResponse, LogSource};
 use crate::shutdown::Shutdown;
-use crate::util::display_none;
 use crate::Error;
 
-#[command(subcommands(error, logs, exit, restart, forget_disk, disk, rebuild))]
-pub fn diagnostic() -> Result<(), Error> {
-    Ok(())
+pub fn diagnostic() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("error", from_fn(error).with_remote_cli::<CliContext>())
+        .subcommand("logs", from_fn_async(logs).no_cli())
+        .subcommand(
+            "exit",
+            from_fn(exit).no_display().with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "restart",
+            from_fn(restart)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("disk", disk())
+        .subcommand(
+            "rebuild",
+            from_fn_async(rebuild)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
-#[command]
-pub fn error(#[context] ctx: DiagnosticContext) -> Result<Arc<RpcError>, Error> {
+// #[command]
+pub fn error(ctx: DiagnosticContext) -> Result<Arc<RpcError>, Error> {
     Ok(ctx.error.clone())
 }
 
-#[command(rpc_only)]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct LogsParams {
+    limit: Option<usize>,
+    cursor: Option<String>,
+    before: bool,
+}
 pub async fn logs(
-    #[arg] limit: Option<usize>,
-    #[arg] cursor: Option<String>,
-    #[arg] before: bool,
+    _: AnyContext,
+    LogsParams {
+        limit,
+        cursor,
+        before,
+    }: LogsParams,
 ) -> Result<LogResponse, Error> {
     Ok(fetch_logs(LogSource::System, limit, cursor, before).await?)
 }
 
-#[command(display(display_none))]
-pub fn exit(#[context] ctx: DiagnosticContext) -> Result<(), Error> {
+pub fn exit(ctx: DiagnosticContext) -> Result<(), Error> {
     ctx.shutdown.send(None).expect("receiver dropped");
     Ok(())
 }
 
-#[command(display(display_none))]
-pub fn restart(#[context] ctx: DiagnosticContext) -> Result<(), Error> {
+pub fn restart(ctx: DiagnosticContext) -> Result<(), Error> {
     ctx.shutdown
         .send(Some(Shutdown {
             export_args: ctx
@@ -50,20 +76,21 @@ pub fn restart(#[context] ctx: DiagnosticContext) -> Result<(), Error> {
         .expect("receiver dropped");
     Ok(())
 }
-
-#[command(display(display_none))]
-pub async fn rebuild(#[context] ctx: DiagnosticContext) -> Result<(), Error> {
+pub async fn rebuild(ctx: DiagnosticContext) -> Result<(), Error> {
     tokio::fs::write(SYSTEM_REBUILD_PATH, b"").await?;
     restart(ctx)
 }
 
-#[command(subcommands(forget_disk, repair))]
-pub fn disk() -> Result<(), Error> {
-    Ok(())
+pub fn disk() -> ParentHandler {
+    ParentHandler::new().subcommand(
+        "forget",
+        from_fn_async(forget_disk)
+            .no_display()
+            .with_remote_cli::<CliContext>(),
+    )
 }
 
-#[command(rename = "forget", display(display_none))]
-pub async fn forget_disk() -> Result<(), Error> {
+pub async fn forget_disk(_: AnyContext) -> Result<(), Error> {
     let disk_guid = Path::new("/media/embassy/config/disk.guid");
     if tokio::fs::metadata(disk_guid).await.is_ok() {
         tokio::fs::remove_file(disk_guid).await?;
diff --git a/core/startos/src/disk/main.rs b/core/startos/src/disk/main.rs
index 74f6db73c..a337a4473 100644
--- a/core/startos/src/disk/main.rs
+++ b/core/startos/src/disk/main.rs
@@ -7,8 +7,8 @@ use tracing::instrument;
 
 use super::fsck::{RepairStrategy, RequiresReboot};
 use super::util::pvscan;
-use crate::disk::mount::filesystem::block_dev::mount;
-use crate::disk::mount::filesystem::ReadWrite;
+use crate::disk::mount::filesystem::block_dev::BlockDev;
+use crate::disk::mount::filesystem::{FileSystem, ReadWrite};
 use crate::disk::mount::util::unmount;
 use crate::util::Invoke;
 use crate::{Error, ErrorKind, ResultExt};
@@ -142,7 +142,9 @@ pub async fn create_fs<P: AsRef<Path>>(
         .arg(&blockdev_path)
         .invoke(crate::ErrorKind::DiskManagement)
         .await?;
-    mount(&blockdev_path, datadir.as_ref().join(name), ReadWrite).await?;
+    BlockDev::new(&blockdev_path)
+        .mount(datadir.as_ref().join(name), ReadWrite)
+        .await?;
     Ok(())
 }
 
@@ -318,7 +320,9 @@ pub async fn mount_fs<P: AsRef<Path>>(
         tokio::fs::rename(&tmp_luks_bak, &luks_bak).await?;
     }
 
-    mount(&blockdev_path, datadir.as_ref().join(name), ReadWrite).await?;
+    BlockDev::new(&blockdev_path)
+        .mount(datadir.as_ref().join(name), ReadWrite)
+        .await?;
 
     Ok(reboot)
 }
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index 485d2570e..7d31d06db 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -1,13 +1,11 @@
 use std::path::{Path, PathBuf};
 
-use clap::ArgMatches;
-use rpc_toolkit::command;
+use rpc_toolkit::{from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::disk::util::DiskInfo;
-use crate::util::display_none;
-use crate::util::serde::{display_serializable, IoFormat};
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::Error;
 
 pub mod fsck;
@@ -42,16 +40,30 @@ impl OsPartitionInfo {
     }
 }
 
-#[command(subcommands(list, repair))]
-pub fn disk() -> Result<(), Error> {
-    Ok(())
+pub fn disk() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "list",
+            from_fn_async(list)
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(display_disk_info(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "repair",
+            from_fn_async(repair)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
-fn display_disk_info(info: Vec<DiskInfo>, matches: &ArgMatches) {
+fn display_disk_info(params: WithIoFormat<Empty>, args: Vec<DiskInfo>) {
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(info, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, args);
     }
 
     let mut table = Table::new();
@@ -60,9 +72,9 @@ fn display_disk_info(info: Vec<DiskInfo>, matches: &ArgMatches) {
         "LABEL",
         "CAPACITY",
         "USED",
-        "EMBASSY OS VERSION"
+        "STARTOS VERSION"
     ]);
-    for disk in info {
+    for disk in args {
         let row = row![
             disk.logicalname.display(),
             "N/A",
@@ -101,17 +113,11 @@ fn display_disk_info(info: Vec<DiskInfo>, matches: &ArgMatches) {
     table.print_tty(false).unwrap();
 }
 
-#[command(display(display_disk_info))]
-pub async fn list(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg]
-    format: Option<IoFormat>,
-) -> Result<Vec<DiskInfo>, Error> {
+// #[command(display(display_disk_info))]
+pub async fn list(ctx: RpcContext, _: Empty) -> Result<Vec<DiskInfo>, Error> {
     crate::disk::util::list(&ctx.os_partitions).await
 }
 
-#[command(display(display_none))]
 pub async fn repair() -> Result<(), Error> {
     tokio::fs::write(REPAIR_DISK_PATH, b"").await?;
     Ok(())
diff --git a/core/startos/src/disk/mount/backup.rs b/core/startos/src/disk/mount/backup.rs
index a19056241..5dbd80db3 100644
--- a/core/startos/src/disk/mount/backup.rs
+++ b/core/startos/src/disk/mount/backup.rs
@@ -1,24 +1,24 @@
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 use color_eyre::eyre::eyre;
 use helpers::AtomicFile;
+use models::PackageId;
 use tokio::io::AsyncWriteExt;
 use tracing::instrument;
 
 use super::filesystem::ecryptfs::EcryptFS;
 use super::guard::{GenericMountGuard, TmpMountGuard};
-use super::util::{bind, unmount};
 use crate::auth::check_password;
 use crate::backup::target::BackupInfo;
 use crate::disk::mount::filesystem::ReadWrite;
+use crate::disk::mount::guard::SubPath;
 use crate::disk::util::EmbassyOsRecoveryInfo;
-use crate::middleware::encrypt::{decrypt_slice, encrypt_slice};
-use crate::s9pk::manifest::PackageId;
+use crate::util::crypto::{decrypt_slice, encrypt_slice};
 use crate::util::serde::IoFormat;
-use crate::util::FileLock;
-use crate::volume::BACKUP_DIR;
 use crate::{Error, ErrorKind, ResultExt};
 
+#[derive(Clone, Debug)]
 pub struct BackupMountGuard<G: GenericMountGuard> {
     backup_disk_mount_guard: Option<G>,
     encrypted_guard: Option<TmpMountGuard>,
@@ -29,7 +29,7 @@ pub struct BackupMountGuard<G: GenericMountGuard> {
 impl<G: GenericMountGuard> BackupMountGuard<G> {
     fn backup_disk_path(&self) -> &Path {
         if let Some(guard) = &self.backup_disk_mount_guard {
-            guard.as_ref()
+            guard.path()
         } else {
             unreachable!()
         }
@@ -37,7 +37,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
 
     #[instrument(skip_all)]
     pub async fn mount(backup_disk_mount_guard: G, password: &str) -> Result<Self, Error> {
-        let backup_disk_path = backup_disk_mount_guard.as_ref();
+        let backup_disk_path = backup_disk_mount_guard.path();
         let unencrypted_metadata_path =
             backup_disk_path.join("EmbassyBackups/unencrypted-metadata.cbor");
         let mut unencrypted_metadata: EmbassyOsRecoveryInfo =
@@ -108,7 +108,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
         let encrypted_guard =
             TmpMountGuard::mount(&EcryptFS::new(&crypt_path, &enc_key), ReadWrite).await?;
 
-        let metadata_path = encrypted_guard.as_ref().join("metadata.cbor");
+        let metadata_path = encrypted_guard.path().join("metadata.cbor");
         let metadata: BackupInfo = if tokio::fs::metadata(&metadata_path).await.is_ok() {
             IoFormat::Cbor.from_slice(&tokio::fs::read(&metadata_path).await.with_ctx(|_| {
                 (
@@ -146,22 +146,13 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
     }
 
     #[instrument(skip_all)]
-    pub async fn mount_package_backup(
-        &self,
-        id: &PackageId,
-    ) -> Result<PackageBackupMountGuard, Error> {
-        let lock = FileLock::new(Path::new(BACKUP_DIR).join(format!("{}.lock", id)), false).await?;
-        let mountpoint = Path::new(BACKUP_DIR).join(id);
-        bind(self.as_ref().join(id), &mountpoint, false).await?;
-        Ok(PackageBackupMountGuard {
-            mountpoint: Some(mountpoint),
-            lock: Some(lock),
-        })
+    pub fn package_backup(self: &Arc<Self>, id: &PackageId) -> SubPath<Arc<Self>> {
+        SubPath::new(self.clone(), id)
     }
 
     #[instrument(skip_all)]
     pub async fn save(&self) -> Result<(), Error> {
-        let metadata_path = self.as_ref().join("metadata.cbor");
+        let metadata_path = self.path().join("metadata.cbor");
         let backup_disk_path = self.backup_disk_path();
         let mut file = AtomicFile::new(&metadata_path, None::<PathBuf>)
             .await
@@ -180,17 +171,6 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
         Ok(())
     }
 
-    #[instrument(skip_all)]
-    pub async fn unmount(mut self) -> Result<(), Error> {
-        if let Some(guard) = self.encrypted_guard.take() {
-            guard.unmount().await?;
-        }
-        if let Some(guard) = self.backup_disk_mount_guard.take() {
-            guard.unmount().await?;
-        }
-        Ok(())
-    }
-
     #[instrument(skip_all)]
     pub async fn save_and_unmount(self) -> Result<(), Error> {
         self.save().await?;
@@ -198,14 +178,24 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
         Ok(())
     }
 }
-impl<G: GenericMountGuard> AsRef<Path> for BackupMountGuard<G> {
-    fn as_ref(&self) -> &Path {
+#[async_trait::async_trait]
+impl<G: GenericMountGuard> GenericMountGuard for BackupMountGuard<G> {
+    fn path(&self) -> &Path {
         if let Some(guard) = &self.encrypted_guard {
-            guard.as_ref()
+            guard.path()
         } else {
             unreachable!()
         }
     }
+    async fn unmount(mut self) -> Result<(), Error> {
+        if let Some(guard) = self.encrypted_guard.take() {
+            guard.unmount().await?;
+        }
+        if let Some(guard) = self.backup_disk_mount_guard.take() {
+            guard.unmount().await?;
+        }
+        Ok(())
+    }
 }
 impl<G: GenericMountGuard> Drop for BackupMountGuard<G> {
     fn drop(&mut self) {
@@ -221,42 +211,3 @@ impl<G: GenericMountGuard> Drop for BackupMountGuard<G> {
         });
     }
 }
-
-pub struct PackageBackupMountGuard {
-    mountpoint: Option<PathBuf>,
-    lock: Option<FileLock>,
-}
-impl PackageBackupMountGuard {
-    pub async fn unmount(mut self) -> Result<(), Error> {
-        if let Some(mountpoint) = self.mountpoint.take() {
-            unmount(&mountpoint).await?;
-        }
-        if let Some(lock) = self.lock.take() {
-            lock.unlock().await?;
-        }
-        Ok(())
-    }
-}
-impl AsRef<Path> for PackageBackupMountGuard {
-    fn as_ref(&self) -> &Path {
-        if let Some(mountpoint) = &self.mountpoint {
-            mountpoint
-        } else {
-            unreachable!()
-        }
-    }
-}
-impl Drop for PackageBackupMountGuard {
-    fn drop(&mut self) {
-        let mountpoint = self.mountpoint.take();
-        let lock = self.lock.take();
-        tokio::spawn(async move {
-            if let Some(mountpoint) = mountpoint {
-                unmount(&mountpoint).await.unwrap();
-            }
-            if let Some(lock) = lock {
-                lock.unlock().await.unwrap();
-            }
-        });
-    }
-}
diff --git a/core/startos/src/disk/mount/filesystem/bind.rs b/core/startos/src/disk/mount/filesystem/bind.rs
index 8799372e5..196e78a3d 100644
--- a/core/startos/src/disk/mount/filesystem/bind.rs
+++ b/core/startos/src/disk/mount/filesystem/bind.rs
@@ -1,14 +1,12 @@
 use std::os::unix::ffi::OsStrExt;
 use std::path::Path;
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use sha2::Sha256;
 
-use super::{FileSystem, MountType, ReadOnly};
-use crate::disk::mount::util::bind;
-use crate::{Error, ResultExt};
+use super::FileSystem;
+use crate::prelude::*;
 
 pub struct Bind<SrcDir: AsRef<Path>> {
     src_dir: SrcDir,
@@ -18,19 +16,16 @@ impl<SrcDir: AsRef<Path>> Bind<SrcDir> {
         Self { src_dir }
     }
 }
-#[async_trait]
 impl<SrcDir: AsRef<Path> + Send + Sync> FileSystem for Bind<SrcDir> {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
-        &self,
-        mountpoint: P,
-        mount_type: MountType,
-    ) -> Result<(), Error> {
-        bind(
-            self.src_dir.as_ref(),
-            mountpoint,
-            matches!(mount_type, ReadOnly),
-        )
-        .await
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        Ok(Some(&self.src_dir))
+    }
+    fn extra_args(&self) -> impl IntoIterator<Item = impl AsRef<std::ffi::OsStr>> {
+        ["--bind"]
+    }
+    async fn pre_mount(&self) -> Result<(), Error> {
+        tokio::fs::create_dir_all(self.src_dir.as_ref()).await?;
+        Ok(())
     }
     async fn source_hash(
         &self,
diff --git a/core/startos/src/disk/mount/filesystem/block_dev.rs b/core/startos/src/disk/mount/filesystem/block_dev.rs
index e21f0c42d..ada7b2c8e 100644
--- a/core/startos/src/disk/mount/filesystem/block_dev.rs
+++ b/core/startos/src/disk/mount/filesystem/block_dev.rs
@@ -1,30 +1,13 @@
 use std::os::unix::ffi::OsStrExt;
 use std::path::Path;
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 
-use super::{FileSystem, MountType, ReadOnly};
-use crate::util::Invoke;
-use crate::{Error, ResultExt};
-
-pub async fn mount(
-    logicalname: impl AsRef<Path>,
-    mountpoint: impl AsRef<Path>,
-    mount_type: MountType,
-) -> Result<(), Error> {
-    tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
-    let mut cmd = tokio::process::Command::new("mount");
-    cmd.arg(logicalname.as_ref()).arg(mountpoint.as_ref());
-    if mount_type == ReadOnly {
-        cmd.arg("-o").arg("ro");
-    }
-    cmd.invoke(crate::ErrorKind::Filesystem).await?;
-    Ok(())
-}
+use super::FileSystem;
+use crate::prelude::*;
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
@@ -36,14 +19,9 @@ impl<LogicalName: AsRef<Path>> BlockDev<LogicalName> {
         BlockDev { logicalname }
     }
 }
-#[async_trait]
 impl<LogicalName: AsRef<Path> + Send + Sync> FileSystem for BlockDev<LogicalName> {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
-        &self,
-        mountpoint: P,
-        mount_type: MountType,
-    ) -> Result<(), Error> {
-        mount(self.logicalname.as_ref(), mountpoint, mount_type).await
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        Ok(Some(&self.logicalname))
     }
     async fn source_hash(
         &self,
diff --git a/core/startos/src/disk/mount/filesystem/cifs.rs b/core/startos/src/disk/mount/filesystem/cifs.rs
index 91b477fcf..ada7aa80b 100644
--- a/core/startos/src/disk/mount/filesystem/cifs.rs
+++ b/core/startos/src/disk/mount/filesystem/cifs.rs
@@ -2,7 +2,6 @@ use std::net::IpAddr;
 use std::os::unix::ffi::OsStrExt;
 use std::path::{Path, PathBuf};
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use serde::{Deserialize, Serialize};
@@ -11,7 +10,7 @@ use tokio::process::Command;
 use tracing::instrument;
 
 use super::{FileSystem, MountType, ReadOnly};
-use crate::disk::mount::guard::TmpMountGuard;
+use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
 use crate::util::Invoke;
 use crate::Error;
 
@@ -78,9 +77,8 @@ impl Cifs {
         Ok(())
     }
 }
-#[async_trait]
 impl FileSystem for Cifs {
-    async fn mount<P: AsRef<std::path::Path> + Send + Sync>(
+    async fn mount<P: AsRef<std::path::Path> + Send>(
         &self,
         mountpoint: P,
         mount_type: MountType,
diff --git a/core/startos/src/disk/mount/filesystem/ecryptfs.rs b/core/startos/src/disk/mount/filesystem/ecryptfs.rs
index 78570f49b..bf2dfe6c6 100644
--- a/core/startos/src/disk/mount/filesystem/ecryptfs.rs
+++ b/core/startos/src/disk/mount/filesystem/ecryptfs.rs
@@ -1,33 +1,17 @@
+use std::fmt::Display;
 use std::os::unix::ffi::OsStrExt;
 use std::path::Path;
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
+use lazy_format::lazy_format;
 use sha2::Sha256;
+use tokio::process::Command;
 
-use super::{FileSystem, MountType};
+use super::FileSystem;
+use crate::disk::mount::filesystem::default_mount_command;
+use crate::prelude::*;
 use crate::util::Invoke;
-use crate::{Error, ResultExt};
-
-pub async fn mount_ecryptfs<P0: AsRef<Path>, P1: AsRef<Path>>(
-    src: P0,
-    dst: P1,
-    key: &str,
-) -> Result<(), Error> {
-    tokio::fs::create_dir_all(dst.as_ref()).await?;
-    tokio::process::Command::new("mount")
-        .arg("-t")
-        .arg("ecryptfs")
-        .arg(src.as_ref())
-        .arg(dst.as_ref())
-        .arg("-o")
-        // for more information `man ecryptfs` 
-        .arg(format!("key=passphrase:passphrase_passwd={},ecryptfs_cipher=aes,ecryptfs_key_bytes=32,ecryptfs_passthrough=n,ecryptfs_enable_filename_crypto=y,no_sig_cache", key))
-        .input(Some(&mut std::io::Cursor::new(b"\n")))
-        .invoke(crate::ErrorKind::Filesystem).await?;
-    Ok(())
-}
 
 pub struct EcryptFS<EncryptedDir: AsRef<Path>, Key: AsRef<str>> {
     encrypted_dir: EncryptedDir,
@@ -38,16 +22,45 @@ impl<EncryptedDir: AsRef<Path>, Key: AsRef<str>> EcryptFS<EncryptedDir, Key> {
         EcryptFS { encrypted_dir, key }
     }
 }
-#[async_trait]
 impl<EncryptedDir: AsRef<Path> + Send + Sync, Key: AsRef<str> + Send + Sync> FileSystem
     for EcryptFS<EncryptedDir, Key>
 {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
+    fn mount_type(&self) -> Option<impl AsRef<str>> {
+        Some("ecryptfs")
+    }
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        Ok(Some(&self.encrypted_dir))
+    }
+    fn mount_options(&self) -> impl IntoIterator<Item = impl Display> {
+        [
+            Box::new(lazy_format!(
+                "key=passphrase:passphrase_passwd={}",
+                self.key.as_ref()
+            )) as Box<dyn Display>,
+            Box::new("ecryptfs_cipher=aes"),
+            Box::new("ecryptfs_key_bytes=32"),
+            Box::new("ecryptfs_passthrough=n"),
+            Box::new("ecryptfs_enable_filename_crypto=y"),
+            Box::new("no_sig_cache"),
+        ]
+    }
+    async fn mount<P: AsRef<Path> + Send>(
         &self,
         mountpoint: P,
-        _mount_type: MountType, // ignored - inherited from parent fs
+        mount_type: super::MountType,
     ) -> Result<(), Error> {
-        mount_ecryptfs(self.encrypted_dir.as_ref(), mountpoint, self.key.as_ref()).await
+        self.pre_mount().await?;
+        tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
+        Command::new("mount")
+            .args(
+                default_mount_command(self, mountpoint, mount_type)
+                    .await?
+                    .get_args(),
+            )
+            .input(Some(&mut std::io::Cursor::new(b"\n")))
+            .invoke(crate::ErrorKind::Filesystem)
+            .await?;
+        Ok(())
     }
     async fn source_hash(
         &self,
diff --git a/core/startos/src/disk/mount/filesystem/efivarfs.rs b/core/startos/src/disk/mount/filesystem/efivarfs.rs
index ad9d79941..4961b4716 100644
--- a/core/startos/src/disk/mount/filesystem/efivarfs.rs
+++ b/core/startos/src/disk/mount/filesystem/efivarfs.rs
@@ -1,33 +1,19 @@
 use std::path::Path;
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use sha2::Sha256;
 
-use super::{FileSystem, MountType, ReadOnly};
-use crate::util::Invoke;
-use crate::Error;
+use super::FileSystem;
+use crate::prelude::*;
 
 pub struct EfiVarFs;
-#[async_trait]
 impl FileSystem for EfiVarFs {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
-        &self,
-        mountpoint: P,
-        mount_type: MountType,
-    ) -> Result<(), Error> {
-        tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
-        let mut cmd = tokio::process::Command::new("mount");
-        cmd.arg("-t")
-            .arg("efivarfs")
-            .arg("efivarfs")
-            .arg(mountpoint.as_ref());
-        if mount_type == ReadOnly {
-            cmd.arg("-o").arg("ro");
-        }
-        cmd.invoke(crate::ErrorKind::Filesystem).await?;
-        Ok(())
+    fn mount_type(&self) -> Option<impl AsRef<str>> {
+        Some("efivarfs")
+    }
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        Ok(Some("efivarfs"))
     }
     async fn source_hash(
         &self,
diff --git a/core/startos/src/disk/mount/filesystem/httpdirfs.rs b/core/startos/src/disk/mount/filesystem/httpdirfs.rs
index fda437ec3..8c7d3b058 100644
--- a/core/startos/src/disk/mount/filesystem/httpdirfs.rs
+++ b/core/startos/src/disk/mount/filesystem/httpdirfs.rs
@@ -1,6 +1,5 @@
 use std::path::Path;
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use reqwest::Url;
@@ -32,9 +31,8 @@ impl HttpDirFS {
         HttpDirFS { url }
     }
 }
-#[async_trait]
 impl FileSystem for HttpDirFS {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
+    async fn mount<P: AsRef<Path> + Send>(
         &self,
         mountpoint: P,
         _mount_type: MountType,
diff --git a/core/startos/src/disk/mount/filesystem/idmapped.rs b/core/startos/src/disk/mount/filesystem/idmapped.rs
new file mode 100644
index 000000000..0f4074a8e
--- /dev/null
+++ b/core/startos/src/disk/mount/filesystem/idmapped.rs
@@ -0,0 +1,88 @@
+use std::ffi::OsStr;
+use std::fmt::Display;
+use std::path::Path;
+
+use digest::generic_array::GenericArray;
+use digest::{Digest, OutputSizeUser};
+use serde::{Deserialize, Serialize};
+use sha2::Sha256;
+use tokio::process::Command;
+
+use super::{FileSystem, MountType};
+use crate::disk::mount::filesystem::default_mount_command;
+use crate::prelude::*;
+use crate::util::Invoke;
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct IdMapped<Fs: FileSystem> {
+    filesystem: Fs,
+    from_id: u32,
+    to_id: u32,
+    range: u32,
+}
+impl<Fs: FileSystem> IdMapped<Fs> {
+    pub fn new(filesystem: Fs, from_id: u32, to_id: u32, range: u32) -> Self {
+        Self {
+            filesystem,
+            from_id,
+            to_id,
+            range,
+        }
+    }
+}
+impl<Fs: FileSystem> FileSystem for IdMapped<Fs> {
+    fn mount_type(&self) -> Option<impl AsRef<str>> {
+        self.filesystem.mount_type()
+    }
+    fn extra_args(&self) -> impl IntoIterator<Item = impl AsRef<OsStr>> {
+        self.filesystem.extra_args()
+    }
+    fn mount_options(&self) -> impl IntoIterator<Item = impl Display> {
+        self.filesystem
+            .mount_options()
+            .into_iter()
+            .map(|a| Box::new(a) as Box<dyn Display>)
+            .chain(std::iter::once(Box::new(lazy_format!(
+                "X-mount.idmap=b:{}:{}:{}",
+                self.from_id,
+                self.to_id,
+                self.range,
+            )) as Box<dyn Display>))
+    }
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        self.filesystem.source().await
+    }
+    async fn pre_mount(&self) -> Result<(), Error> {
+        self.filesystem.pre_mount().await
+    }
+    async fn mount<P: AsRef<Path> + Send>(
+        &self,
+        mountpoint: P,
+        mount_type: MountType,
+    ) -> Result<(), Error> {
+        self.pre_mount().await?;
+        tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
+        Command::new("mount.next")
+            .args(
+                default_mount_command(self, mountpoint, mount_type)
+                    .await?
+                    .get_args(),
+            )
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+
+        Ok(())
+    }
+    async fn source_hash(
+        &self,
+    ) -> Result<GenericArray<u8, <Sha256 as OutputSizeUser>::OutputSize>, Error> {
+        let mut sha = Sha256::new();
+        sha.update("IdMapped");
+        sha.update(self.filesystem.source_hash().await?);
+        sha.update(u32::to_be_bytes(self.from_id));
+        sha.update(u32::to_be_bytes(self.to_id));
+        sha.update(u32::to_be_bytes(self.range));
+        Ok(sha.finalize())
+    }
+}
diff --git a/core/startos/src/disk/mount/filesystem/label.rs b/core/startos/src/disk/mount/filesystem/label.rs
index b1e4f7213..57312bf13 100644
--- a/core/startos/src/disk/mount/filesystem/label.rs
+++ b/core/startos/src/disk/mount/filesystem/label.rs
@@ -1,28 +1,11 @@
 use std::path::Path;
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use sha2::Sha256;
 
-use super::{FileSystem, MountType, ReadOnly};
-use crate::util::Invoke;
-use crate::Error;
-
-pub async fn mount_label(
-    label: &str,
-    mountpoint: impl AsRef<Path>,
-    mount_type: MountType,
-) -> Result<(), Error> {
-    tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
-    let mut cmd = tokio::process::Command::new("mount");
-    cmd.arg("-L").arg(label).arg(mountpoint.as_ref());
-    if mount_type == ReadOnly {
-        cmd.arg("-o").arg("ro");
-    }
-    cmd.invoke(crate::ErrorKind::Filesystem).await?;
-    Ok(())
-}
+use super::FileSystem;
+use crate::prelude::*;
 
 pub struct Label<S: AsRef<str>> {
     label: S,
@@ -32,14 +15,12 @@ impl<S: AsRef<str>> Label<S> {
         Label { label }
     }
 }
-#[async_trait]
 impl<S: AsRef<str> + Send + Sync> FileSystem for Label<S> {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
-        &self,
-        mountpoint: P,
-        mount_type: MountType,
-    ) -> Result<(), Error> {
-        mount_label(self.label.as_ref(), mountpoint, mount_type).await
+    fn extra_args(&self) -> impl IntoIterator<Item = impl AsRef<std::ffi::OsStr>> {
+        ["-L", self.label.as_ref()]
+    }
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        Ok(None::<&Path>)
     }
     async fn source_hash(
         &self,
diff --git a/core/startos/src/disk/mount/filesystem/loop_dev.rs b/core/startos/src/disk/mount/filesystem/loop_dev.rs
index 28a18597d..7cad174c6 100644
--- a/core/startos/src/disk/mount/filesystem/loop_dev.rs
+++ b/core/startos/src/disk/mount/filesystem/loop_dev.rs
@@ -1,38 +1,15 @@
+use std::fmt::Display;
 use std::os::unix::ffi::OsStrExt;
 use std::path::Path;
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
+use lazy_format::lazy_format;
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 
-use super::{FileSystem, MountType, ReadOnly};
-use crate::util::Invoke;
-use crate::{Error, ResultExt};
-
-pub async fn mount(
-    logicalname: impl AsRef<Path>,
-    offset: u64,
-    size: u64,
-    mountpoint: impl AsRef<Path>,
-    mount_type: MountType,
-) -> Result<(), Error> {
-    tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
-    let mut opts = format!("loop,offset={offset},sizelimit={size}");
-    if mount_type == ReadOnly {
-        opts += ",ro";
-    }
-
-    tokio::process::Command::new("mount")
-        .arg(logicalname.as_ref())
-        .arg(mountpoint.as_ref())
-        .arg("-o")
-        .arg(opts)
-        .invoke(crate::ErrorKind::Filesystem)
-        .await?;
-    Ok(())
-}
+use super::FileSystem;
+use crate::prelude::*;
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
@@ -50,21 +27,18 @@ impl<LogicalName: AsRef<Path>> LoopDev<LogicalName> {
         }
     }
 }
-#[async_trait]
 impl<LogicalName: AsRef<Path> + Send + Sync> FileSystem for LoopDev<LogicalName> {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
-        &self,
-        mountpoint: P,
-        mount_type: MountType,
-    ) -> Result<(), Error> {
-        mount(
-            self.logicalname.as_ref(),
-            self.offset,
-            self.size,
-            mountpoint,
-            mount_type,
-        )
-        .await
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        Ok(Some(
+            tokio::fs::canonicalize(self.logicalname.as_ref()).await?,
+        ))
+    }
+    fn mount_options(&self) -> impl IntoIterator<Item = impl Display> {
+        [
+            Box::new("loop") as Box<dyn Display>,
+            Box::new(lazy_format!("offset={}", self.offset)),
+            Box::new(lazy_format!("sizelimit={}", self.size)),
+        ]
     }
     async fn source_hash(
         &self,
diff --git a/core/startos/src/disk/mount/filesystem/mod.rs b/core/startos/src/disk/mount/filesystem/mod.rs
index 11a6671df..89fa0a415 100644
--- a/core/startos/src/disk/mount/filesystem/mod.rs
+++ b/core/startos/src/disk/mount/filesystem/mod.rs
@@ -1,11 +1,15 @@
+use std::ffi::OsStr;
+use std::fmt::{Display, Write};
 use std::path::Path;
 
-use async_trait::async_trait;
 use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
+use futures::Future;
 use sha2::Sha256;
+use tokio::process::Command;
 
-use crate::Error;
+use crate::prelude::*;
+use crate::util::Invoke;
 
 pub mod bind;
 pub mod block_dev;
@@ -13,8 +17,10 @@ pub mod cifs;
 pub mod ecryptfs;
 pub mod efivarfs;
 pub mod httpdirfs;
+pub mod idmapped;
 pub mod label;
 pub mod loop_dev;
+pub mod overlayfs;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum MountType {
@@ -24,14 +30,78 @@ pub enum MountType {
 
 pub use MountType::*;
 
-#[async_trait]
-pub trait FileSystem {
-    async fn mount<P: AsRef<Path> + Send + Sync>(
+pub(self) async fn default_mount_command(
+    fs: &(impl FileSystem + ?Sized),
+    mountpoint: impl AsRef<Path> + Send,
+    mount_type: MountType,
+) -> Result<std::process::Command, Error> {
+    let mut cmd = std::process::Command::new("mount");
+    if mount_type == ReadOnly {
+        cmd.arg("-r");
+    }
+    cmd.args(fs.extra_args());
+    if let Some(ty) = fs.mount_type() {
+        cmd.arg("-t").arg(ty.as_ref());
+    }
+    if let Some(options) = fs
+        .mount_options()
+        .into_iter()
+        .fold(None, |acc: Option<String>, x| match acc {
+            Some(mut s) => {
+                write!(s, ",{}", x).unwrap();
+                Some(s)
+            }
+            None => Some(x.to_string()),
+        })
+    {
+        cmd.arg("-o").arg(options);
+    }
+    if let Some(source) = fs.source().await? {
+        cmd.arg(source.as_ref());
+    }
+    cmd.arg(mountpoint.as_ref());
+    Ok(dbg!(cmd))
+}
+
+pub(self) async fn default_mount_impl(
+    fs: &(impl FileSystem + ?Sized),
+    mountpoint: impl AsRef<Path> + Send,
+    mount_type: MountType,
+) -> Result<(), Error> {
+    fs.pre_mount().await?;
+    tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
+    Command::from(default_mount_command(fs, mountpoint, mount_type).await?)
+        .invoke(ErrorKind::Filesystem)
+        .await?;
+
+    Ok(())
+}
+
+pub trait FileSystem: Send + Sync {
+    fn mount_type(&self) -> Option<impl AsRef<str>> {
+        None::<&str>
+    }
+    fn extra_args(&self) -> impl IntoIterator<Item = impl AsRef<OsStr>> {
+        [] as [&str; 0]
+    }
+    fn mount_options(&self) -> impl IntoIterator<Item = impl Display> {
+        [] as [&str; 0]
+    }
+    fn source(&self) -> impl Future<Output = Result<Option<impl AsRef<Path>>, Error>> + Send {
+        async { Ok(None::<&Path>) }
+    }
+    fn pre_mount(&self) -> impl Future<Output = Result<(), Error>> + Send {
+        async { Ok(()) }
+    }
+    fn mount<P: AsRef<Path> + Send>(
         &self,
         mountpoint: P,
         mount_type: MountType,
-    ) -> Result<(), Error>;
-    async fn source_hash(
+    ) -> impl Future<Output = Result<(), Error>> + Send {
+        default_mount_impl(self, mountpoint, mount_type)
+    }
+    fn source_hash(
         &self,
-    ) -> Result<GenericArray<u8, <Sha256 as OutputSizeUser>::OutputSize>, Error>;
+    ) -> impl Future<Output = Result<GenericArray<u8, <Sha256 as OutputSizeUser>::OutputSize>, Error>>
+           + Send;
 }
diff --git a/core/startos/src/disk/mount/filesystem/overlayfs.rs b/core/startos/src/disk/mount/filesystem/overlayfs.rs
new file mode 100644
index 000000000..ad5eec501
--- /dev/null
+++ b/core/startos/src/disk/mount/filesystem/overlayfs.rs
@@ -0,0 +1,153 @@
+use std::fmt::Display;
+use std::os::unix::ffi::OsStrExt;
+use std::path::Path;
+
+use digest::generic_array::GenericArray;
+use digest::{Digest, OutputSizeUser};
+use sha2::Sha256;
+
+use crate::disk::mount::filesystem::{FileSystem, ReadOnly, ReadWrite};
+use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
+use crate::prelude::*;
+use crate::util::io::TmpDir;
+
+struct OverlayFs<P0: AsRef<Path>, P1: AsRef<Path>> {
+    lower: P0,
+    upper: P1,
+}
+impl<P0: AsRef<Path>, P1: AsRef<Path>> OverlayFs<P0, P1> {
+    pub fn new(lower: P0, upper: P1) -> Self {
+        Self { lower, upper }
+    }
+}
+impl<P0: AsRef<Path> + Send + Sync, P1: AsRef<Path> + Send + Sync> FileSystem
+    for OverlayFs<P0, P1>
+{
+    fn mount_type(&self) -> Option<impl AsRef<str>> {
+        Some("overlay")
+    }
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        Ok(Some("overlay"))
+    }
+    fn mount_options(&self) -> impl IntoIterator<Item = impl Display> {
+        [
+            Box::new(lazy_format!("lowerdir={}", self.lower.as_ref().display()))
+                as Box<dyn Display>,
+            Box::new(lazy_format!(
+                "upperdir={}/upper",
+                self.upper.as_ref().display()
+            )),
+            Box::new(lazy_format!(
+                "workdir={}/work",
+                self.upper.as_ref().display()
+            )),
+        ]
+    }
+    async fn pre_mount(&self) -> Result<(), Error> {
+        tokio::fs::create_dir_all(self.upper.as_ref().join("upper")).await?;
+        tokio::fs::create_dir_all(self.upper.as_ref().join("work")).await?;
+        Ok(())
+    }
+    async fn source_hash(
+        &self,
+    ) -> Result<GenericArray<u8, <Sha256 as OutputSizeUser>::OutputSize>, Error> {
+        let mut sha = Sha256::new();
+        sha.update("OverlayFs");
+        sha.update(
+            tokio::fs::canonicalize(self.lower.as_ref())
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        self.lower.as_ref().display().to_string(),
+                    )
+                })?
+                .as_os_str()
+                .as_bytes(),
+        );
+        sha.update(
+            tokio::fs::canonicalize(self.upper.as_ref())
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        self.upper.as_ref().display().to_string(),
+                    )
+                })?
+                .as_os_str()
+                .as_bytes(),
+        );
+        Ok(sha.finalize())
+    }
+}
+
+#[derive(Debug)]
+pub struct OverlayGuard {
+    lower: Option<TmpMountGuard>,
+    upper: Option<TmpDir>,
+    inner_guard: MountGuard,
+}
+impl OverlayGuard {
+    pub async fn mount(
+        base: &impl FileSystem,
+        mountpoint: impl AsRef<Path>,
+    ) -> Result<Self, Error> {
+        let lower = TmpMountGuard::mount(base, ReadOnly).await?;
+        let upper = TmpDir::new().await?;
+        let inner_guard = MountGuard::mount(
+            &OverlayFs::new(lower.path(), upper.as_ref()),
+            mountpoint,
+            ReadWrite,
+        )
+        .await?;
+        Ok(Self {
+            lower: Some(lower),
+            upper: Some(upper),
+            inner_guard,
+        })
+    }
+    pub async fn unmount(mut self, delete_mountpoint: bool) -> Result<(), Error> {
+        self.inner_guard.take().unmount(delete_mountpoint).await?;
+        if let Some(lower) = self.lower.take() {
+            lower.unmount().await?;
+        }
+        if let Some(upper) = self.upper.take() {
+            upper.delete().await?;
+        }
+        Ok(())
+    }
+    pub fn take(&mut self) -> Self {
+        Self {
+            lower: self.lower.take(),
+            upper: self.upper.take(),
+            inner_guard: self.inner_guard.take(),
+        }
+    }
+}
+#[async_trait::async_trait]
+impl GenericMountGuard for OverlayGuard {
+    fn path(&self) -> &Path {
+        self.inner_guard.path()
+    }
+    async fn unmount(mut self) -> Result<(), Error> {
+        self.unmount(false).await
+    }
+}
+impl Drop for OverlayGuard {
+    fn drop(&mut self) {
+        let lower = self.lower.take();
+        let upper = self.upper.take();
+        let guard = self.inner_guard.take();
+        if lower.is_some() || upper.is_some() || guard.mounted {
+            tokio::spawn(async move {
+                guard.unmount(false).await.unwrap();
+                if let Some(lower) = lower {
+                    lower.unmount().await.unwrap();
+                }
+                if let Some(upper) = upper {
+                    upper.delete().await.unwrap();
+                }
+            });
+        }
+    }
+}
diff --git a/core/startos/src/disk/mount/guard.rs b/core/startos/src/disk/mount/guard.rs
index 617afeb08..af46904fd 100644
--- a/core/startos/src/disk/mount/guard.rs
+++ b/core/startos/src/disk/mount/guard.rs
@@ -9,20 +9,47 @@ use tracing::instrument;
 
 use super::filesystem::{FileSystem, MountType, ReadOnly, ReadWrite};
 use super::util::unmount;
-use crate::util::Invoke;
+use crate::util::{Invoke, Never};
 use crate::Error;
 
 pub const TMP_MOUNTPOINT: &'static str = "/media/embassy/tmp";
 
 #[async_trait::async_trait]
-pub trait GenericMountGuard: AsRef<Path> + std::fmt::Debug + Send + Sync + 'static {
+pub trait GenericMountGuard: std::fmt::Debug + Send + Sync + 'static {
+    fn path(&self) -> &Path;
     async fn unmount(mut self) -> Result<(), Error>;
 }
 
+#[async_trait::async_trait]
+impl GenericMountGuard for Never {
+    fn path(&self) -> &Path {
+        match *self {}
+    }
+    async fn unmount(mut self) -> Result<(), Error> {
+        match self {}
+    }
+}
+
+#[async_trait::async_trait]
+impl<T> GenericMountGuard for Arc<T>
+where
+    T: GenericMountGuard,
+{
+    fn path(&self) -> &Path {
+        (&**self).path()
+    }
+    async fn unmount(mut self) -> Result<(), Error> {
+        if let Ok(guard) = Arc::try_unwrap(self) {
+            guard.unmount().await?;
+        }
+        Ok(())
+    }
+}
+
 #[derive(Debug)]
 pub struct MountGuard {
     mountpoint: PathBuf,
-    mounted: bool,
+    pub(super) mounted: bool,
 }
 impl MountGuard {
     pub async fn mount(
@@ -37,6 +64,16 @@ impl MountGuard {
             mounted: true,
         })
     }
+    fn as_unmounted(&self) -> Self {
+        Self {
+            mountpoint: self.mountpoint.clone(),
+            mounted: false,
+        }
+    }
+    pub fn take(&mut self) -> Self {
+        let unmounted = self.as_unmounted();
+        std::mem::replace(self, unmounted)
+    }
     pub async fn unmount(mut self, delete_mountpoint: bool) -> Result<(), Error> {
         if self.mounted {
             unmount(&self.mountpoint).await?;
@@ -57,11 +94,6 @@ impl MountGuard {
         Ok(())
     }
 }
-impl AsRef<Path> for MountGuard {
-    fn as_ref(&self) -> &Path {
-        &self.mountpoint
-    }
-}
 impl Drop for MountGuard {
     fn drop(&mut self) {
         if self.mounted {
@@ -72,6 +104,9 @@ impl Drop for MountGuard {
 }
 #[async_trait::async_trait]
 impl GenericMountGuard for MountGuard {
+    fn path(&self) -> &Path {
+        &self.mountpoint
+    }
     async fn unmount(mut self) -> Result<(), Error> {
         MountGuard::unmount(self, false).await
     }
@@ -89,7 +124,7 @@ lazy_static! {
         Mutex::new(BTreeMap::new());
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct TmpMountGuard {
     guard: Arc<MountGuard>,
 }
@@ -122,21 +157,42 @@ impl TmpMountGuard {
             Ok(TmpMountGuard { guard })
         }
     }
-    pub async fn unmount(self) -> Result<(), Error> {
-        if let Ok(guard) = Arc::try_unwrap(self.guard) {
-            guard.unmount(true).await?;
-        }
-        Ok(())
+
+    pub fn take(&mut self) -> Self {
+        let unmounted = Self {
+            guard: Arc::new(self.guard.as_unmounted()),
+        };
+        std::mem::replace(self, unmounted)
+    }
+}
+#[async_trait::async_trait]
+impl GenericMountGuard for TmpMountGuard {
+    fn path(&self) -> &Path {
+        self.guard.path()
+    }
+    async fn unmount(mut self) -> Result<(), Error> {
+        self.guard.unmount().await
     }
 }
-impl AsRef<Path> for TmpMountGuard {
-    fn as_ref(&self) -> &Path {
-        (&*self.guard).as_ref()
+
+#[derive(Debug)]
+pub struct SubPath<G: GenericMountGuard> {
+    guard: G,
+    path: PathBuf,
+}
+impl<G: GenericMountGuard> SubPath<G> {
+    pub fn new(guard: G, path: impl AsRef<Path>) -> Self {
+        let path = path.as_ref();
+        let path = guard.path().join(path.strip_prefix("/").unwrap_or(path));
+        Self { guard, path }
     }
 }
 #[async_trait::async_trait]
-impl GenericMountGuard for TmpMountGuard {
+impl<G: GenericMountGuard> GenericMountGuard for SubPath<G> {
+    fn path(&self) -> &Path {
+        self.path.as_path()
+    }
     async fn unmount(mut self) -> Result<(), Error> {
-        TmpMountGuard::unmount(self).await
+        self.guard.unmount().await
     }
 }
diff --git a/core/startos/src/disk/mount/util.rs b/core/startos/src/disk/mount/util.rs
index 392e5d67a..e93ceb7dd 100644
--- a/core/startos/src/disk/mount/util.rs
+++ b/core/startos/src/disk/mount/util.rs
@@ -44,7 +44,7 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
 pub async fn unmount<P: AsRef<Path>>(mountpoint: P) -> Result<(), Error> {
     tracing::debug!("Unmounting {}.", mountpoint.as_ref().display());
     tokio::process::Command::new("umount")
-        .arg("-l")
+        .arg("-Rl")
         .arg(mountpoint.as_ref())
         .invoke(crate::ErrorKind::Filesystem)
         .await?;
diff --git a/core/startos/src/disk/util.rs b/core/startos/src/disk/util.rs
index 7051026cd..7d73ac974 100644
--- a/core/startos/src/disk/util.rs
+++ b/core/startos/src/disk/util.rs
@@ -17,6 +17,7 @@ use tracing::instrument;
 use super::mount::filesystem::block_dev::BlockDev;
 use super::mount::filesystem::ReadOnly;
 use super::mount::guard::TmpMountGuard;
+use crate::disk::mount::guard::GenericMountGuard;
 use crate::disk::OsPartitionInfo;
 use crate::util::serde::IoFormat;
 use crate::util::{Invoke, Version};
@@ -403,13 +404,13 @@ async fn part_info(part: PathBuf) -> PartitionInfo {
     match TmpMountGuard::mount(&BlockDev::new(&part), ReadOnly).await {
         Err(e) => tracing::warn!("Could not collect usage information: {}", e.source),
         Ok(mount_guard) => {
-            used = get_used(&mount_guard)
+            used = get_used(mount_guard.path())
                 .await
                 .map_err(|e| {
                     tracing::warn!("Could not get usage of {}: {}", part.display(), e.source)
                 })
                 .ok();
-            if let Some(recovery_info) = match recovery_info(&mount_guard).await {
+            if let Some(recovery_info) = match recovery_info(mount_guard.path()).await {
                 Ok(a) => a,
                 Err(e) => {
                     tracing::error!("Error fetching unencrypted backup metadata: {}", e);
diff --git a/core/startos/src/error.rs b/core/startos/src/error.rs
index 2b769b03a..9f0493f10 100644
--- a/core/startos/src/error.rs
+++ b/core/startos/src/error.rs
@@ -1,4 +1,3 @@
-use color_eyre::eyre::eyre;
 pub use models::{Error, ErrorKind, OptionExt, ResultExt};
 
 #[derive(Debug, Default)]
@@ -18,11 +17,15 @@ impl ErrorCollection {
         }
     }
 
-    pub fn into_result(self) -> Result<(), Error> {
-        if self.0.is_empty() {
-            Ok(())
+    pub fn into_result(mut self) -> Result<(), Error> {
+        if self.0.len() <= 1 {
+            if let Some(err) = self.0.pop() {
+                Err(err)
+            } else {
+                Ok(())
+            }
         } else {
-            Err(Error::new(eyre!("{}", self), ErrorKind::MultipleErrors))
+            Err(Error::new(self, ErrorKind::MultipleErrors))
         }
     }
 }
@@ -49,6 +52,7 @@ impl std::fmt::Display for ErrorCollection {
         Ok(())
     }
 }
+impl std::error::Error for ErrorCollection {}
 
 #[macro_export]
 macro_rules! ensure_code {
diff --git a/core/startos/src/firmware.rs b/core/startos/src/firmware.rs
index 7f9a4a273..ed4a6577a 100644
--- a/core/startos/src/firmware.rs
+++ b/core/startos/src/firmware.rs
@@ -2,8 +2,7 @@ use std::collections::BTreeSet;
 use std::path::Path;
 
 use async_compression::tokio::bufread::GzipDecoder;
-use clap::ArgMatches;
-use rpc_toolkit::command;
+use clap::Parser;
 use serde::{Deserialize, Serialize};
 use tokio::fs::File;
 use tokio::io::BufReader;
@@ -43,8 +42,8 @@ pub struct Firmware {
     shasum: String,
 }
 
-fn display_firmware_update_result(arg: RequiresReboot, _: &ArgMatches) {
-    if arg.0 {
+pub fn display_firmware_update_result(result: RequiresReboot) {
+    if result.0 {
         println!("Firmware successfully updated! Reboot to apply changes.");
     } else {
         println!("No firmware update available.");
@@ -55,7 +54,7 @@ fn display_firmware_update_result(arg: RequiresReboot, _: &ArgMatches) {
 /// that the firmware was the correct and updated for
 /// systems like the Pure System that a new firmware
 /// was released and the updates where pushed through the pure os.
-#[command(rename = "update-firmware", display(display_firmware_update_result))]
+// #[command(rename = "update-firmware", display(display_firmware_update_result))]
 pub async fn update_firmware() -> Result<RequiresReboot, Error> {
     let system_product_name = String::from_utf8(
         Command::new("dmidecode")
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 74c3767e3..dfc13e068 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -4,7 +4,6 @@ use std::path::Path;
 use std::time::{Duration, SystemTime};
 
 use color_eyre::eyre::eyre;
-
 use models::ResultExt;
 use rand::random;
 use sqlx::{Pool, Postgres};
@@ -12,17 +11,12 @@ use tokio::process::Command;
 use tracing::instrument;
 
 use crate::account::AccountInfo;
-use crate::context::rpc::RpcContextConfig;
+use crate::context::config::ServerConfig;
 use crate::db::model::ServerStatus;
 use crate::disk::mount::util::unmount;
-use crate::install::PKG_ARCHIVE_DIR;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::prelude::*;
-
-use crate::util::cpupower::{
-    get_available_governors, get_preferred_governor, set_governor,
-};
-use crate::util::docker::{create_bridge_network, CONTAINER_DATADIR, CONTAINER_TOOL};
+use crate::util::cpupower::{get_available_governors, get_preferred_governor, set_governor};
 use crate::util::Invoke;
 use crate::{Error, ARCH};
 
@@ -190,7 +184,7 @@ pub struct InitResult {
 }
 
 #[instrument(skip_all)]
-pub async fn init(cfg: &RpcContextConfig) -> Result<InitResult, Error> {
+pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
     tokio::fs::create_dir_all("/run/embassy")
         .await
         .with_ctx(|_| (crate::ErrorKind::Filesystem, "mkdir -p /run/embassy"))?;
@@ -292,77 +286,6 @@ pub async fn init(cfg: &RpcContextConfig) -> Result<InitResult, Error> {
         tokio::fs::remove_dir_all(&tmp_var).await?;
     }
     crate::disk::mount::util::bind(&tmp_var, "/var/tmp", false).await?;
-    let tmp_docker = cfg
-        .datadir()
-        .join(format!("package-data/tmp/{CONTAINER_TOOL}"));
-    let tmp_docker_exists = tokio::fs::metadata(&tmp_docker).await.is_ok();
-    if CONTAINER_TOOL == "docker" {
-        Command::new("systemctl")
-            .arg("stop")
-            .arg("docker")
-            .invoke(crate::ErrorKind::Docker)
-            .await?;
-    }
-    crate::disk::mount::util::bind(&tmp_docker, CONTAINER_DATADIR, false).await?;
-
-    if CONTAINER_TOOL == "docker" {
-        Command::new("systemctl")
-            .arg("reset-failed")
-            .arg("docker")
-            .invoke(crate::ErrorKind::Docker)
-            .await?;
-        Command::new("systemctl")
-            .arg("start")
-            .arg("docker")
-            .invoke(crate::ErrorKind::Docker)
-            .await?;
-    }
-    tracing::info!("Mounted Docker Data");
-
-    if should_rebuild || !tmp_docker_exists {
-        if CONTAINER_TOOL == "docker" {
-            tracing::info!("Creating Docker Network");
-            create_bridge_network("start9", "172.18.0.1/24", "br-start9").await?;
-            tracing::info!("Created Docker Network");
-        }
-
-        let datadir = cfg.datadir();
-        tracing::info!("Loading System Docker Images");
-        crate::install::rebuild_from("/usr/lib/startos/system-images", &datadir).await?;
-        tracing::info!("Loaded System Docker Images");
-
-        tracing::info!("Loading Package Docker Images");
-        crate::install::rebuild_from(datadir.join(PKG_ARCHIVE_DIR), &datadir).await?;
-        tracing::info!("Loaded Package Docker Images");
-    }
-
-    if CONTAINER_TOOL == "podman" {
-        crate::util::docker::remove_container("netdummy", true).await?;
-        Command::new("podman")
-            .arg("run")
-            .arg("-d")
-            .arg("--rm")
-            .arg("--init")
-            .arg("--network=start9")
-            .arg("--name=netdummy")
-            .arg("start9/x_system/utils:latest")
-            .arg("sleep")
-            .arg("infinity")
-            .invoke(crate::ErrorKind::Docker)
-            .await?;
-    }
-
-    tracing::info!("Enabling Docker QEMU Emulation");
-    Command::new(CONTAINER_TOOL)
-        .arg("run")
-        .arg("--privileged")
-        .arg("--rm")
-        .arg("start9/x_system/binfmt")
-        .arg("--install")
-        .arg("all")
-        .invoke(crate::ErrorKind::Docker)
-        .await?;
-    tracing::info!("Enabled Docker QEMU Emulation");
 
     let governor = if let Some(governor) = &server_info.governor {
         if get_available_governors().await?.contains(governor) {
diff --git a/core/startos/src/inspect.rs b/core/startos/src/inspect.rs
index cd27bbb2d..d88f90a06 100644
--- a/core/startos/src/inspect.rs
+++ b/core/startos/src/inspect.rs
@@ -1,20 +1,36 @@
 use std::path::PathBuf;
 
-use rpc_toolkit::command;
+use clap::Parser;
+use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 
+use crate::context::CliContext;
 use crate::s9pk::manifest::Manifest;
-use crate::s9pk::reader::S9pkReader;
-use crate::util::display_none;
-use crate::util::serde::{display_serializable, IoFormat};
+// use crate::s9pk::reader::S9pkReader;
+use crate::util::serde::HandlerExtSerde;
 use crate::Error;
 
-#[command(subcommands(hash, manifest, license, icon, instructions, docker_images))]
-pub fn inspect() -> Result<(), Error> {
-    Ok(())
+pub fn inspect() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("hash", from_fn_async(hash))
+        .subcommand(
+            "manifest",
+            from_fn_async(manifest).with_display_serializable(),
+        )
+        .subcommand("license", from_fn_async(license).no_display())
+        .subcommand("icon", from_fn_async(icon).no_display())
+        .subcommand("instructions", from_fn_async(instructions).no_display())
+        .subcommand("docker-images", from_fn_async(docker_images).no_display())
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct HashParams {
+    path: PathBuf,
 }
 
-#[command(cli_only)]
-pub async fn hash(#[arg] path: PathBuf) -> Result<String, Error> {
+pub async fn hash(_: CliContext, HashParams { path }: HashParams) -> Result<String, Error> {
     Ok(S9pkReader::open(path, true)
         .await?
         .hash_str()
@@ -22,21 +38,36 @@ pub async fn hash(#[arg] path: PathBuf) -> Result<String, Error> {
         .to_owned())
 }
 
-#[command(cli_only, display(display_serializable))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ManifestParams {
+    path: PathBuf,
+    #[arg(name = "no-verify", long = "no-verify")]
+    no_verify: bool,
+}
+
+// #[command(cli_only, display(display_serializable))]
 pub async fn manifest(
-    #[arg] path: PathBuf,
-    #[arg(rename = "no-verify", long = "no-verify")] no_verify: bool,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
+    _: CliContext,
+    ManifestParams { .. }: ManifestParams,
 ) -> Result<Manifest, Error> {
-    S9pkReader::open(path, !no_verify).await?.manifest().await
+    // S9pkReader::open(path, !no_verify).await?.manifest().await
+    todo!()
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct InspectParams {
+    path: PathBuf,
+    #[arg(name = "no-verify", long = "no-verify")]
+    no_verify: bool,
 }
 
-#[command(cli_only, display(display_none))]
 pub async fn license(
-    #[arg] path: PathBuf,
-    #[arg(rename = "no-verify", long = "no-verify")] no_verify: bool,
+    _: AnyContext,
+    InspectParams { path, no_verify }: InspectParams,
 ) -> Result<(), Error> {
     tokio::io::copy(
         &mut S9pkReader::open(path, !no_verify).await?.license().await?,
@@ -46,10 +77,9 @@ pub async fn license(
     Ok(())
 }
 
-#[command(cli_only, display(display_none))]
 pub async fn icon(
-    #[arg] path: PathBuf,
-    #[arg(rename = "no-verify", long = "no-verify")] no_verify: bool,
+    _: AnyContext,
+    InspectParams { path, no_verify }: InspectParams,
 ) -> Result<(), Error> {
     tokio::io::copy(
         &mut S9pkReader::open(path, !no_verify).await?.icon().await?,
@@ -58,11 +88,18 @@ pub async fn icon(
     .await?;
     Ok(())
 }
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct InstructionParams {
+    path: PathBuf,
+    #[arg(name = "no-verify", long = "no-verify")]
+    no_verify: bool,
+}
 
-#[command(cli_only, display(display_none))]
 pub async fn instructions(
-    #[arg] path: PathBuf,
-    #[arg(rename = "no-verify", long = "no-verify")] no_verify: bool,
+    _: CliContext,
+    InstructionParams { path, no_verify }: InstructionParams,
 ) -> Result<(), Error> {
     tokio::io::copy(
         &mut S9pkReader::open(path, !no_verify)
@@ -74,11 +111,9 @@ pub async fn instructions(
     .await?;
     Ok(())
 }
-
-#[command(cli_only, display(display_none), rename = "docker-images")]
 pub async fn docker_images(
-    #[arg] path: PathBuf,
-    #[arg(rename = "no-verify", long = "no-verify")] no_verify: bool,
+    _: AnyContext,
+    InspectParams { path, no_verify }: InspectParams,
 ) -> Result<(), Error> {
     tokio::io::copy(
         &mut S9pkReader::open(path, !no_verify)
diff --git a/core/startos/src/install/cleanup.rs b/core/startos/src/install/cleanup.rs
deleted file mode 100644
index d90ec502c..000000000
--- a/core/startos/src/install/cleanup.rs
+++ /dev/null
@@ -1,241 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use models::OptionExt;
-use sqlx::{Executor, Postgres};
-use tracing::instrument;
-
-use super::PKG_ARCHIVE_DIR;
-use crate::context::RpcContext;
-use crate::db::model::{
-    CurrentDependencies, Database, PackageDataEntry, PackageDataEntryInstalled,
-    PackageDataEntryMatchModelRef,
-};
-use crate::error::ErrorCollection;
-use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::util::{Apply, Version};
-use crate::volume::{asset_dir, script_dir};
-use crate::Error;
-
-#[instrument(skip_all)]
-pub async fn cleanup(ctx: &RpcContext, id: &PackageId, version: &Version) -> Result<(), Error> {
-    let mut errors = ErrorCollection::new();
-    ctx.managers.remove(&(id.clone(), version.clone())).await;
-    // docker images start9/$APP_ID/*:$VERSION -q | xargs docker rmi
-    let images = crate::util::docker::images_for(id, version).await?;
-    errors.extend(
-        futures::future::join_all(images.into_iter().map(|sha| async {
-            let sha = sha; // move into future
-            crate::util::docker::remove_image(&sha).await
-        }))
-        .await,
-    );
-    let pkg_archive_dir = ctx
-        .datadir
-        .join(PKG_ARCHIVE_DIR)
-        .join(id)
-        .join(version.as_str());
-    if tokio::fs::metadata(&pkg_archive_dir).await.is_ok() {
-        tokio::fs::remove_dir_all(&pkg_archive_dir)
-            .await
-            .apply(|res| errors.handle(res));
-    }
-    let assets_path = asset_dir(&ctx.datadir, id, version);
-    if tokio::fs::metadata(&assets_path).await.is_ok() {
-        tokio::fs::remove_dir_all(&assets_path)
-            .await
-            .apply(|res| errors.handle(res));
-    }
-    let scripts_path = script_dir(&ctx.datadir, id, version);
-    if tokio::fs::metadata(&scripts_path).await.is_ok() {
-        tokio::fs::remove_dir_all(&scripts_path)
-            .await
-            .apply(|res| errors.handle(res));
-    }
-
-    errors.into_result()
-}
-
-#[instrument(skip_all)]
-pub async fn cleanup_failed(ctx: &RpcContext, id: &PackageId) -> Result<(), Error> {
-    if let Some(version) = match ctx
-        .db
-        .peek()
-        .await
-        .as_package_data()
-        .as_idx(id)
-        .or_not_found(id)?
-        .as_match()
-    {
-        PackageDataEntryMatchModelRef::Installing(m) => Some(m.as_manifest().as_version().de()?),
-        PackageDataEntryMatchModelRef::Restoring(m) => Some(m.as_manifest().as_version().de()?),
-        PackageDataEntryMatchModelRef::Updating(m) => {
-            let manifest_version = m.as_manifest().as_version().de()?;
-            let installed = m.as_installed().as_manifest().as_version().de()?;
-            if manifest_version != installed {
-                Some(manifest_version)
-            } else {
-                None // do not remove existing data
-            }
-        }
-        _ => {
-            tracing::warn!("{}: Nothing to clean up!", id);
-            None
-        }
-    } {
-        cleanup(ctx, id, &version).await?;
-    }
-
-    ctx.db
-        .mutate(|v| {
-            match v
-                .clone()
-                .into_package_data()
-                .into_idx(id)
-                .or_not_found(id)?
-                .as_match()
-            {
-                PackageDataEntryMatchModelRef::Installing(_)
-                | PackageDataEntryMatchModelRef::Restoring(_) => {
-                    v.as_package_data_mut().remove(id)?;
-                }
-                PackageDataEntryMatchModelRef::Updating(pde) => {
-                    v.as_package_data_mut()
-                        .as_idx_mut(id)
-                        .or_not_found(id)?
-                        .ser(&PackageDataEntry::Installed(PackageDataEntryInstalled {
-                            manifest: pde.as_installed().as_manifest().de()?,
-                            static_files: pde.as_static_files().de()?,
-                            installed: pde.as_installed().de()?,
-                        }))?;
-                }
-                _ => (),
-            }
-            Ok(())
-        })
-        .await
-}
-
-#[instrument(skip_all)]
-pub fn remove_from_current_dependents_lists(
-    db: &mut Model<Database>,
-    id: &PackageId,
-    current_dependencies: &CurrentDependencies,
-) -> Result<(), Error> {
-    for dep in current_dependencies.0.keys().chain(std::iter::once(id)) {
-        if let Some(current_dependents) = db
-            .as_package_data_mut()
-            .as_idx_mut(dep)
-            .and_then(|d| d.as_installed_mut())
-            .map(|i| i.as_current_dependents_mut())
-        {
-            current_dependents.remove(id)?;
-        }
-    }
-    Ok(())
-}
-
-#[instrument(skip_all)]
-pub async fn uninstall<Ex>(ctx: &RpcContext, secrets: &mut Ex, id: &PackageId) -> Result<(), Error>
-where
-    for<'a> &'a mut Ex: Executor<'a, Database = Postgres>,
-{
-    let db = ctx.db.peek().await;
-    let entry = db
-        .as_package_data()
-        .as_idx(id)
-        .or_not_found(id)?
-        .expect_as_removing()?;
-
-    let dependents_paths: Vec<PathBuf> = entry
-        .as_removing()
-        .as_current_dependents()
-        .keys()?
-        .into_iter()
-        .filter(|x| x != id)
-        .flat_map(|x| db.as_package_data().as_idx(&x))
-        .flat_map(|x| x.as_installed())
-        .flat_map(|x| x.as_manifest().as_volumes().de())
-        .flat_map(|x| x.values().cloned().collect::<Vec<_>>())
-        .flat_map(|x| x.pointer_path(&ctx.datadir))
-        .collect();
-
-    let volume_dir = ctx
-        .datadir
-        .join(crate::volume::PKG_VOLUME_DIR)
-        .join(&*entry.as_manifest().as_id().de()?);
-    let version = entry.as_removing().as_manifest().as_version().de()?;
-    tracing::debug!(
-        "Cleaning up {:?} except for {:?}",
-        volume_dir,
-        dependents_paths
-    );
-    cleanup(ctx, id, &version).await?;
-    cleanup_folder(volume_dir, Arc::new(dependents_paths)).await;
-    remove_network_keys(secrets, id).await?;
-
-    ctx.db
-        .mutate(|d| {
-            d.as_package_data_mut().remove(id)?;
-            remove_from_current_dependents_lists(
-                d,
-                id,
-                &entry.as_removing().as_current_dependencies().de()?,
-            )
-        })
-        .await
-}
-
-#[instrument(skip_all)]
-pub async fn remove_network_keys<Ex>(secrets: &mut Ex, id: &PackageId) -> Result<(), Error>
-where
-    for<'a> &'a mut Ex: Executor<'a, Database = Postgres>,
-{
-    sqlx::query!("DELETE FROM network_keys WHERE package = $1", &*id)
-        .execute(&mut *secrets)
-        .await?;
-    sqlx::query!("DELETE FROM tor WHERE package = $1", &*id)
-        .execute(&mut *secrets)
-        .await?;
-    Ok(())
-}
-
-/// Needed to remove, without removing the folders that are mounted in the other docker containers
-pub fn cleanup_folder(
-    path: PathBuf,
-    dependents_volumes: Arc<Vec<PathBuf>>,
-) -> futures::future::BoxFuture<'static, ()> {
-    Box::pin(async move {
-        let meta_data = match tokio::fs::metadata(&path).await {
-            Ok(a) => a,
-            Err(_e) => {
-                return;
-            }
-        };
-        if !meta_data.is_dir() {
-            tracing::error!("is_not dir, remove {:?}", path);
-            let _ = tokio::fs::remove_file(&path).await;
-            return;
-        }
-        if !dependents_volumes
-            .iter()
-            .any(|v| v.starts_with(&path) || v == &path)
-        {
-            tracing::error!("No parents, remove {:?}", path);
-            let _ = tokio::fs::remove_dir_all(&path).await;
-            return;
-        }
-        let mut read_dir = match tokio::fs::read_dir(&path).await {
-            Ok(a) => a,
-            Err(_e) => {
-                return;
-            }
-        };
-        tracing::error!("Parents, recurse {:?}", path);
-        while let Some(entry) = read_dir.next_entry().await.ok().flatten() {
-            let entry_path = entry.path();
-            cleanup_folder(entry_path, dependents_volumes.clone()).await;
-        }
-    })
-}
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 01f405e7b..110443162 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -1,68 +1,46 @@
-use std::collections::BTreeMap;
 use std::io::SeekFrom;
-use std::marker::PhantomData;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::Ordering;
-use std::sync::Arc;
+use std::path::PathBuf;
 use std::time::Duration;
 
+use clap::builder::ValueParserFactory;
+use clap::{value_parser, CommandFactory, FromArgMatches, Parser};
 use color_eyre::eyre::eyre;
 use emver::VersionRange;
-use futures::future::BoxFuture;
-use futures::{FutureExt, StreamExt, TryStreamExt};
-use http::header::CONTENT_LENGTH;
-use http::{Request, Response, StatusCode};
-use hyper::Body;
-use models::{mime, DataUrl};
+use futures::{FutureExt, StreamExt};
+use patch_db::json_ptr::JsonPointer;
+use reqwest::header::{HeaderMap, CONTENT_LENGTH};
 use reqwest::Url;
-use rpc_toolkit::command;
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::CallRemote;
+use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
-use tokio::fs::{File, OpenOptions};
-use tokio::io::{AsyncRead, AsyncSeek, AsyncSeekExt, AsyncWriteExt};
-use tokio::process::Command;
+use tokio::io::{AsyncReadExt, AsyncSeekExt};
 use tokio::sync::oneshot;
-use tokio_stream::wrappers::ReadDirStream;
 use tracing::instrument;
 
-use self::cleanup::{cleanup_failed, remove_from_current_dependents_lists};
-use crate::config::ConfigureContext;
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::db::model::{
-    CurrentDependencies, CurrentDependencyInfo, CurrentDependents, InstalledPackageInfo,
-    PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryInstalling,
-    PackageDataEntryMatchModelRef, PackageDataEntryRemoving, PackageDataEntryRestoring,
-    PackageDataEntryUpdating, StaticDependencyInfo, StaticFiles,
+    PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryMatchModelRef,
+    PackageDataEntryRemoving,
 };
-use crate::dependencies::{
-    add_dependent_to_current_dependents_lists, compute_dependency_config_errs,
-    set_dependents_with_live_pointers_to_needs_config,
-};
-use crate::install::cleanup::cleanup;
-use crate::install::progress::{InstallProgress, InstallProgressTracker};
-use crate::notifications::NotificationLevel;
 use crate::prelude::*;
-use crate::registry::marketplace::with_query_params;
-use crate::s9pk::manifest::{Manifest, PackageId};
-use crate::s9pk::reader::S9pkReader;
-use crate::status::{MainStatus, Status};
-use crate::util::docker::CONTAINER_TOOL;
-use crate::util::io::response_to_reader;
-use crate::util::serde::{display_serializable, Port};
-use crate::util::{display_none, AsyncFileExt, Invoke, Version};
-use crate::volume::{asset_dir, script_dir};
-use crate::{Error, ErrorKind, ResultExt};
-
-pub mod cleanup;
-pub mod progress;
+use crate::progress::{FullProgress, PhasedProgressBar};
+use crate::s9pk::manifest::PackageId;
+use crate::s9pk::merkle_archive::source::http::HttpSource;
+use crate::s9pk::v1::reader::S9pkReader;
+use crate::s9pk::v2::compat::{self, MAGIC_AND_VERSION};
+use crate::s9pk::S9pk;
+use crate::upload::upload;
+use crate::util::clap::FromStrParser;
+use crate::util::Never;
 
 pub const PKG_ARCHIVE_DIR: &str = "package-data/archive";
 pub const PKG_PUBLIC_DIR: &str = "package-data/public";
 pub const PKG_WASM_DIR: &str = "package-data/wasm";
 
-#[command(display(display_serializable))]
-pub async fn list(#[context] ctx: RpcContext) -> Result<Value, Error> {
+// #[command(display(display_serializable))]
+pub async fn list(ctx: RpcContext) -> Result<Value, Error> {
     Ok(ctx.db.peek().await.as_package_data().as_entries()?
         .iter()
         .filter_map(|(id, pde)| {
@@ -116,6 +94,12 @@ impl std::str::FromStr for MinMax {
         }
     }
 }
+impl ValueParserFactory for MinMax {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
 impl std::fmt::Display for MinMax {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
@@ -125,21 +109,31 @@ impl std::fmt::Display for MinMax {
     }
 }
 
-#[command(
-    custom_cli(cli_install(async, context(CliContext))),
-    display(display_none),
-    metadata(sync_db = true)
-)]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct InstallParams {
+    id: PackageId,
+    #[arg(short = 'm', long = "marketplace-url")]
+    marketplace_url: Option<Url>,
+    #[arg(short = 'v', long = "version-spec")]
+    version_spec: Option<String>,
+    #[arg(long = "version-priority")]
+    version_priority: Option<MinMax>,
+}
+
+// #[command(
+//     custom_cli(cli_install(async, context(CliContext))),
+// )]
 #[instrument(skip_all)]
 pub async fn install(
-    #[context] ctx: RpcContext,
-    #[arg] id: String,
-    #[arg(short = 'm', long = "marketplace-url", rename = "marketplace-url")]
-    marketplace_url: Option<Url>,
-    #[arg(short = 'v', long = "version-spec", rename = "version-spec")] version_spec: Option<
-        String,
-    >,
-    #[arg(long = "version-priority", rename = "version-priority")] version_priority: Option<MinMax>,
+    ctx: RpcContext,
+    InstallParams {
+        id,
+        marketplace_url,
+        version_spec,
+        version_priority,
+    }: InstallParams,
 ) -> Result<(), Error> {
     let version_str = match &version_spec {
         None => "*",
@@ -149,453 +143,265 @@ pub async fn install(
     let marketplace_url =
         marketplace_url.unwrap_or_else(|| crate::DEFAULT_MARKETPLACE.parse().unwrap());
     let version_priority = version_priority.unwrap_or_default();
-    let man: Manifest = ctx
-        .client
-        .get(with_query_params(
-            ctx.clone(),
+    let s9pk = S9pk::deserialize(
+        &HttpSource::new(
+            ctx.client.clone(),
             format!(
-                "{}/package/v0/manifest/{}?spec={}&version-priority={}",
+                "{}/package/v0/{}.s9pk?spec={}&version-priority={}",
                 marketplace_url, id, version, version_priority,
             )
             .parse()?,
-        ))
-        .send()
-        .await
-        .with_kind(crate::ErrorKind::Registry)?
-        .error_for_status()
-        .with_kind(crate::ErrorKind::Registry)?
-        .json()
-        .await
-        .with_kind(crate::ErrorKind::Registry)?;
-    let s9pk = ctx
-        .client
-        .get(with_query_params(
-            ctx.clone(),
-            format!(
-                "{}/package/v0/{}.s9pk?spec=={}&version-priority={}",
-                marketplace_url, id, man.version, version_priority,
-            )
-            .parse()?,
-        ))
-        .send()
-        .await
-        .with_kind(crate::ErrorKind::Registry)?
-        .error_for_status()?;
-
-    if *man.id != *id || !man.version.satisfies(&version) {
-        return Err(Error::new(
-            eyre!("Fetched package does not match requested id and version"),
-            ErrorKind::Registry,
-        ));
-    }
-
-    let public_dir_path = ctx
-        .datadir
-        .join(PKG_PUBLIC_DIR)
-        .join(&man.id)
-        .join(man.version.as_str());
-    tokio::fs::create_dir_all(&public_dir_path).await?;
+        )
+        .await?,
+    )
+    .await?;
 
-    let icon_type = man.assets.icon_type();
-    let (license_res, instructions_res, icon_res) = tokio::join!(
-        async {
-            tokio::io::copy(
-                &mut response_to_reader(
-                    ctx.client
-                        .get(with_query_params(
-                            ctx.clone(),
-                            format!(
-                                "{}/package/v0/license/{}?spec=={}",
-                                marketplace_url, id, man.version,
-                            )
-                            .parse()?,
-                        ))
-                        .send()
-                        .await?
-                        .error_for_status()?,
-                ),
-                &mut File::create(public_dir_path.join("LICENSE.md")).await?,
-            )
-            .await?;
-            Ok::<_, color_eyre::eyre::Report>(())
-        },
-        async {
-            tokio::io::copy(
-                &mut response_to_reader(
-                    ctx.client
-                        .get(with_query_params(
-                            ctx.clone(),
-                            format!(
-                                "{}/package/v0/instructions/{}?spec=={}",
-                                marketplace_url, id, man.version,
-                            )
-                            .parse()?,
-                        ))
-                        .send()
-                        .await?
-                        .error_for_status()?,
-                ),
-                &mut File::create(public_dir_path.join("INSTRUCTIONS.md")).await?,
-            )
-            .await?;
-            Ok::<_, color_eyre::eyre::Report>(())
-        },
-        async {
-            tokio::io::copy(
-                &mut response_to_reader(
-                    ctx.client
-                        .get(with_query_params(
-                            ctx.clone(),
-                            format!(
-                                "{}/package/v0/icon/{}?spec=={}",
-                                marketplace_url, id, man.version,
-                            )
-                            .parse()?,
-                        ))
-                        .send()
-                        .await?
-                        .error_for_status()?,
-                ),
-                &mut File::create(public_dir_path.join(format!("icon.{}", icon_type))).await?,
-            )
-            .await?;
-            Ok::<_, color_eyre::eyre::Report>(())
-        },
+    ensure_code!(
+        &s9pk.as_manifest().id == &id,
+        ErrorKind::ValidateS9pk,
+        "manifest.id does not match expected"
     );
-    if let Err(e) = license_res {
-        tracing::warn!("Failed to pre-download license: {}", e);
-    }
-    if let Err(e) = instructions_res {
-        tracing::warn!("Failed to pre-download instructions: {}", e);
-    }
-    if let Err(e) = icon_res {
-        tracing::warn!("Failed to pre-download icon: {}", e);
-    }
 
-    let progress = Arc::new(InstallProgress::new(s9pk.content_length()));
-    let static_files = StaticFiles::local(&man.id, &man.version, icon_type);
-    ctx.db
-        .mutate(|db| {
-            let pde = match db
-                .as_package_data()
-                .as_idx(&man.id)
-                .map(|x| x.de())
-                .transpose()?
-            {
-                Some(PackageDataEntry::Installed(PackageDataEntryInstalled {
-                    installed,
-                    static_files,
-                    ..
-                })) => PackageDataEntry::Updating(PackageDataEntryUpdating {
-                    install_progress: progress.clone(),
-                    static_files,
-                    installed,
-                    manifest: man.clone(),
-                }),
-                None => PackageDataEntry::Installing(PackageDataEntryInstalling {
-                    install_progress: progress.clone(),
-                    static_files,
-                    manifest: man.clone(),
-                }),
-                _ => {
-                    return Err(Error::new(
-                        eyre!("Cannot install over a package in a transient state"),
-                        crate::ErrorKind::InvalidRequest,
-                    ))
-                }
-            };
-            db.as_package_data_mut().insert(&man.id, &pde)
-        })
+    let download = ctx
+        .services
+        .install(ctx.clone(), s9pk, None::<Never>)
         .await?;
-
-    let downloading = download_install_s9pk(
-        ctx.clone(),
-        man.clone(),
-        Some(marketplace_url),
-        Arc::new(InstallProgress::new(s9pk.content_length())),
-        response_to_reader(s9pk),
-        None,
-    );
-    tokio::spawn(async move {
-        if let Err(e) = downloading.await {
-            let err_str = format!("Install of {}@{} Failed: {}", man.id, man.version, e);
-            tracing::error!("{}", err_str);
-            tracing::debug!("{:?}", e);
-            if let Err(e) = ctx
-                .notification_manager
-                .notify(
-                    ctx.db.clone(),
-                    Some(man.id),
-                    NotificationLevel::Error,
-                    String::from("Install Failed"),
-                    err_str,
-                    (),
-                    None,
-                )
-                .await
-            {
-                tracing::error!("Failed to issue Notification: {}", e);
-                tracing::debug!("{:?}", e);
-            }
-        }
-        Ok::<_, String>(())
-    });
+    tokio::spawn(async move { download.await?.await });
 
     Ok(())
 }
-#[command(rpc_only, display(display_none))]
-#[instrument(skip_all)]
-pub async fn sideload(
-    #[context] ctx: RpcContext,
-    #[arg] manifest: Manifest,
-    #[arg] icon: Option<String>,
-) -> Result<RequestGuid, Error> {
-    let new_ctx = ctx.clone();
-    let guid = RequestGuid::new();
-    if let Some(icon) = icon {
-        use tokio::io::AsyncWriteExt;
 
-        let public_dir_path = ctx
-            .datadir
-            .join(PKG_PUBLIC_DIR)
-            .join(&manifest.id)
-            .join(manifest.version.as_str());
-        tokio::fs::create_dir_all(&public_dir_path).await?;
-
-        let invalid_data_url =
-            || Error::new(eyre!("Invalid Icon Data URL"), ErrorKind::InvalidRequest);
-        let data = icon
-            .strip_prefix(&format!(
-                "data:image/{};base64,",
-                manifest.assets.icon_type()
-            ))
-            .ok_or_else(&invalid_data_url)?;
-        let mut icon_file =
-            File::create(public_dir_path.join(format!("icon.{}", manifest.assets.icon_type())))
-                .await?;
-        icon_file
-            .write_all(&base64::decode(data).with_kind(ErrorKind::InvalidRequest)?)
-            .await?;
-        icon_file.sync_all().await?;
-    }
-
-    let handler = Box::new(|req: Request<Body>| {
-        async move {
-            let content_length = match req.headers().get(CONTENT_LENGTH).map(|a| a.to_str()) {
-                None => None,
-                Some(Err(_)) => {
-                    return Response::builder()
-                        .status(StatusCode::BAD_REQUEST)
-                        .body(Body::from("Invalid Content Length"))
-                        .with_kind(ErrorKind::Network)
-                }
-                Some(Ok(a)) => match a.parse::<u64>() {
-                    Err(_) => {
-                        return Response::builder()
-                            .status(StatusCode::BAD_REQUEST)
-                            .body(Body::from("Invalid Content Length"))
-                            .with_kind(ErrorKind::Network)
-                    }
-                    Ok(a) => Some(a),
-                },
-            };
-            let progress = Arc::new(InstallProgress::new(content_length));
-            let install_progress = progress.clone();
+#[derive(Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct SideloadResponse {
+    pub upload: RequestGuid,
+    pub progress: RequestGuid,
+}
 
-            new_ctx
-                .db
-                .mutate(|db| {
-                    let pde = match db
-                        .as_package_data()
-                        .as_idx(&manifest.id)
-                        .map(|x| x.de())
-                        .transpose()?
-                    {
-                        Some(PackageDataEntry::Installed(PackageDataEntryInstalled {
-                            installed,
-                            static_files,
-                            ..
-                        })) => PackageDataEntry::Updating(PackageDataEntryUpdating {
-                            install_progress,
-                            installed,
-                            manifest: manifest.clone(),
-                            static_files,
-                        }),
-                        None => PackageDataEntry::Installing(PackageDataEntryInstalling {
-                            install_progress,
-                            static_files: StaticFiles::local(
-                                &manifest.id,
-                                &manifest.version,
-                                &manifest.assets.icon_type(),
-                            ),
-                            manifest: manifest.clone(),
-                        }),
-                        _ => {
-                            return Err(Error::new(
-                                eyre!("Cannot install over a package in a transient state"),
-                                crate::ErrorKind::InvalidRequest,
-                            ))
+#[instrument(skip_all)]
+pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
+    let (upload, file) = upload(&ctx).await?;
+    let (id_send, id_recv) = oneshot::channel();
+    let (err_send, err_recv) = oneshot::channel();
+    let progress = RequestGuid::new();
+    let db = ctx.db.clone();
+    let mut sub = db.subscribe().await;
+    ctx.add_continuation(
+        progress.clone(),
+        RpcContinuation::ws(
+            Box::new(|mut ws| {
+                use axum::extract::ws::Message;
+                async move {
+                    if let Err(e) = async {
+                        let id = id_recv.await.map_err(|_| {
+                            Error::new(
+                                eyre!("Could not get id to watch progress"),
+                                ErrorKind::Cancelled,
+                            )
+                        })?;
+                        let progress_path =
+                            JsonPointer::parse(format!("/package-data/{id}/install-progress"))
+                                .with_kind(ErrorKind::Database)?;
+                        tokio::select! {
+                            res = async {
+                                while let Some(rev) = sub.recv().await {
+                                    if rev.patch.affects_path(&progress_path) {
+                                        ws.send(Message::Text(
+                                            serde_json::to_string(&if let Some(p) = db
+                                                .peek()
+                                                .await
+                                                .as_package_data()
+                                                .as_idx(&id)
+                                                .and_then(|e| e.as_install_progress())
+                                            {
+                                                Ok::<_, ()>(p.de()?)
+                                            } else {
+                                                let mut p = FullProgress::new();
+                                                p.overall.complete();
+                                                Ok(p)
+                                            })
+                                            .with_kind(ErrorKind::Serialization)?,
+                                        ))
+                                        .await
+                                        .with_kind(ErrorKind::Network)?;
+                                    }
+                                }
+                                Ok::<_, Error>(())
+                            } => res?,
+                            err = err_recv => {
+                                if let Ok(e) = err {
+                                ws.send(Message::Text(
+                                    serde_json::to_string(&Err::<(), _>(e))
+                                    .with_kind(ErrorKind::Serialization)?,
+                                ))
+                                .await
+                                .with_kind(ErrorKind::Network)?;
+                                }
+                            }
                         }
-                    };
-                    db.as_package_data_mut().insert(&manifest.id, &pde)
-                })
-                .await?;
 
-            let (send, recv) = oneshot::channel();
-
-            tokio::spawn(async move {
-                if let Err(e) = download_install_s9pk(
-                    new_ctx.clone(),
-                    manifest.clone(),
-                    None,
-                    progress,
-                    tokio_util::io::StreamReader::new(req.into_body().map_err(|e| {
-                        std::io::Error::new(
-                            match &e {
-                                e if e.is_connect() => std::io::ErrorKind::ConnectionRefused,
-                                e if e.is_timeout() => std::io::ErrorKind::TimedOut,
-                                _ => std::io::ErrorKind::Other,
-                            },
-                            e,
-                        )
-                    })),
-                    Some(send),
-                )
-                .await
-                {
-                    let err_str = format!(
-                        "Install of {}@{} Failed: {}",
-                        manifest.id, manifest.version, e
-                    );
-                    tracing::error!("{}", err_str);
-                    tracing::debug!("{:?}", e);
-                    if let Err(e) = new_ctx
-                        .notification_manager
-                        .notify(
-                            new_ctx.db.clone(),
-                            Some(manifest.id.clone()),
-                            NotificationLevel::Error,
-                            String::from("Install Failed"),
-                            err_str,
-                            (),
-                            None,
-                        )
-                        .await
+                        Ok::<_, Error>(())
+                    }
+                    .await
                     {
-                        tracing::error!("Failed to issue Notification: {}", e);
-                        tracing::debug!("{:?}", e);
+                        tracing::error!("Error tracking sideload progress: {e}");
+                        tracing::debug!("{e:?}");
                     }
                 }
-            });
-
-            if let Ok(_) = recv.await {
-                Response::builder()
-                    .status(StatusCode::OK)
-                    .body(Body::empty())
-                    .with_kind(ErrorKind::Network)
-            } else {
-                Response::builder()
-                    .status(StatusCode::INTERNAL_SERVER_ERROR)
-                    .body(Body::from("installation aborted before upload completed"))
-                    .with_kind(ErrorKind::Network)
-            }
-        }
-        .boxed()
-    });
-    ctx.add_continuation(
-        guid.clone(),
-        RpcContinuation::rest(handler, Duration::from_secs(30)),
+                .boxed()
+            }),
+            Duration::from_secs(30),
+        ),
     )
     .await;
-    Ok(guid)
+    tokio::spawn(async move {
+        if let Err(e) = async {
+            let s9pk = S9pk::deserialize(&file).await?;
+            let _ = id_send.send(s9pk.as_manifest().id.clone());
+            ctx.services
+                .install(ctx.clone(), s9pk, None::<Never>)
+                .await?
+                .await?
+                .await?;
+            file.delete().await
+        }
+        .await
+        {
+            let _ = err_send.send(RpcError::from(e.clone_output()));
+            tracing::error!("Error sideloading package: {e}");
+            tracing::debug!("{e:?}");
+        }
+    });
+    Ok(SideloadResponse { upload, progress })
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum CliInstallParams {
+    Marketplace(InstallParams),
+    Sideload(PathBuf),
+}
+impl CommandFactory for CliInstallParams {
+    fn command() -> clap::Command {
+        use clap::{Arg, Command};
+        Command::new("install")
+            .arg(
+                Arg::new("sideload")
+                    .long("sideload")
+                    .short('s')
+                    .required_unless_present("id")
+                    .value_parser(value_parser!(PathBuf)),
+            )
+            .args(InstallParams::command().get_arguments().cloned().map(|a| {
+                if a.get_id() == "id" {
+                    a.required(false).required_unless_present("sideload")
+                } else {
+                    a
+                }
+                .conflicts_with("sideload")
+            }))
+    }
+    fn command_for_update() -> clap::Command {
+        Self::command()
+    }
+}
+impl FromArgMatches for CliInstallParams {
+    fn from_arg_matches(matches: &clap::ArgMatches) -> Result<Self, clap::Error> {
+        if let Some(sideload) = matches.get_one::<PathBuf>("sideload") {
+            Ok(Self::Sideload(sideload.clone()))
+        } else {
+            Ok(Self::Marketplace(InstallParams::from_arg_matches(matches)?))
+        }
+    }
+    fn update_from_arg_matches(&mut self, matches: &clap::ArgMatches) -> Result<(), clap::Error> {
+        *self = Self::from_arg_matches(matches)?;
+        Ok(())
+    }
 }
 
 #[instrument(skip_all)]
-async fn cli_install(
-    ctx: CliContext,
-    target: String,
-    marketplace_url: Option<Url>,
-    version_spec: Option<String>,
-    version_priority: Option<MinMax>,
-) -> Result<(), RpcError> {
-    if target.ends_with(".s9pk") {
-        let path = PathBuf::from(target);
+pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<(), RpcError> {
+    match params {
+        CliInstallParams::Sideload(path) => {
+            let file = crate::s9pk::load(&ctx, path).await?;
+
+            // rpc call remote sideload
+            let SideloadResponse { upload, progress } = from_value::<SideloadResponse>(
+                ctx.call_remote("package.sideload", imbl_value::json!({}))
+                    .await?,
+            )?;
+
+            let upload = async {
+                let content_length = file.metadata().await?.len();
+                ctx.rest_continuation(
+                    upload,
+                    reqwest::Body::wrap_stream(tokio_util::io::ReaderStream::new(file)),
+                    {
+                        let mut map = HeaderMap::new();
+                        map.insert(CONTENT_LENGTH, content_length.into());
+                        map
+                    },
+                )
+                .await?
+                .error_for_status()
+                .with_kind(ErrorKind::Network)?;
+                Ok::<_, Error>(())
+            };
 
-        // inspect manifest no verify
-        let mut reader = S9pkReader::open(&path, false).await?;
-        let manifest = reader.manifest().await?;
-        let icon = reader.icon().await?.to_vec().await?;
-        let icon_str = format!(
-            "data:image/{};base64,{}",
-            manifest.assets.icon_type(),
-            base64::encode(&icon)
-        );
+            let progress = async {
+                use tokio_tungstenite::tungstenite::Message;
 
-        // rpc call remote sideload
-        tracing::debug!("calling package.sideload");
-        let guid = rpc_toolkit::command_helpers::call_remote(
-            ctx.clone(),
-            "package.sideload",
-            serde_json::json!({ "manifest": manifest, "icon": icon_str }),
-            PhantomData::<RequestGuid>,
-        )
-        .await?
-        .result?;
-        tracing::debug!("package.sideload succeeded {:?}", guid);
+                let mut bar = PhasedProgressBar::new("Sideloading");
 
-        // hit continuation api with guid that comes back
-        let file = tokio::fs::File::open(path).await?;
-        let content_length = file.metadata().await?.len();
-        let body = Body::wrap_stream(tokio_util::io::ReaderStream::new(file));
-        let res = ctx
-            .client
-            .post(format!("{}rest/rpc/{}", ctx.base_url, guid,))
-            .header(CONTENT_LENGTH, content_length)
-            .body(body)
-            .send()
-            .await?;
-        if res.status().as_u16() == 200 {
-            tracing::info!("Package Uploaded")
-        } else {
-            tracing::info!("Package Upload failed: {}", res.text().await?)
+                let mut ws = ctx.ws_continuation(progress).await?;
+
+                let mut progress = FullProgress::new();
+
+                loop {
+                    tokio::select! {
+                        msg = ws.next() => {
+                            if let Some(msg) = msg {
+                                if let Message::Text(t) = msg.with_kind(ErrorKind::Network)? {
+                                    progress =
+                                        serde_json::from_str::<Result<_, RpcError>>(&t)
+                                            .with_kind(ErrorKind::Deserialization)??;
+                                    bar.update(&progress);
+                                }
+                            } else {
+                                break;
+                            }
+                        }
+                        _ = tokio::time::sleep(Duration::from_millis(100)) => {
+                            bar.update(&progress);
+                        },
+                    }
+                }
+
+                Ok::<_, Error>(())
+            };
+
+            let (upload, progress) = tokio::join!(upload, progress);
+            progress?;
+            upload?;
+        }
+        CliInstallParams::Marketplace(params) => {
+            ctx.call_remote("package.install", to_value(&params)?)
+                .await?;
         }
-    } else {
-        let params = match (target.split_once("@"), version_spec) {
-            (Some((pkg, v)), None) => {
-                serde_json::json!({ "id": pkg, "marketplace-url": marketplace_url, "version-spec": v, "version-priority": version_priority })
-            }
-            (Some(_), Some(_)) => {
-                return Err(crate::Error::new(
-                    eyre!("Invalid package id {}", target),
-                    ErrorKind::InvalidRequest,
-                )
-                .into())
-            }
-            (None, Some(v)) => {
-                serde_json::json!({ "id": target, "marketplace-url": marketplace_url, "version-spec": v, "version-priority": version_priority })
-            }
-            (None, None) => {
-                serde_json::json!({ "id": target, "marketplace-url": marketplace_url, "version-priority": version_priority })
-            }
-        };
-        tracing::debug!("calling package.install");
-        rpc_toolkit::command_helpers::call_remote(
-            ctx,
-            "package.install",
-            params,
-            PhantomData::<()>,
-        )
-        .await?
-        .result?;
-        tracing::debug!("package.install succeeded");
     }
     Ok(())
 }
 
-#[command(display(display_none), metadata(sync_db = true))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct UninstallParams {
+    id: PackageId,
+}
+
 pub async fn uninstall(
-    #[context] ctx: RpcContext,
-    #[arg] id: PackageId,
+    ctx: RpcContext,
+    UninstallParams { id }: UninstallParams,
 ) -> Result<PackageId, Error> {
     ctx.db
         .mutate(|db| {
@@ -624,694 +430,7 @@ pub async fn uninstall(
 
     let return_id = id.clone();
 
-    tokio::spawn(async move {
-        if let Err(e) = async {
-            cleanup::uninstall(&ctx, ctx.secret_store.acquire().await?.as_mut(), &id).await
-        }
-        .await
-        {
-            let err_str = format!("Uninstall of {} Failed: {}", id, e);
-            tracing::error!("{}", err_str);
-            tracing::debug!("{:?}", e);
-            if let Err(e) = ctx
-                .notification_manager
-                .notify(
-                    ctx.db.clone(), // allocating separate handle here because the lifetime of the previous one is the expression
-                    Some(id),
-                    NotificationLevel::Error,
-                    String::from("Uninstall Failed"),
-                    err_str,
-                    (),
-                    None,
-                )
-                .await
-            {
-                tracing::error!("Failed to issue Notification: {}", e);
-                tracing::debug!("{:?}", e);
-            }
-        }
-    });
+    tokio::spawn(async move { ctx.services.uninstall(&ctx, &id).await });
 
     Ok(return_id)
 }
-
-#[instrument(skip_all)]
-pub async fn download_install_s9pk(
-    ctx: RpcContext,
-    temp_manifest: Manifest,
-    marketplace_url: Option<Url>,
-    progress: Arc<InstallProgress>,
-    mut s9pk: impl AsyncRead + Unpin,
-    download_complete: Option<oneshot::Sender<()>>,
-) -> Result<(), Error> {
-    let pkg_id = &temp_manifest.id;
-    let version = &temp_manifest.version;
-    let db = ctx.db.peek().await;
-
-    if let Result::<(), Error>::Err(e) = {
-        let ctx = ctx.clone();
-        async move {
-            // // Build set of existing manifests
-            let mut manifests = Vec::new();
-            for (_id, pkg) in db.as_package_data().as_entries()? {
-                let m = pkg.as_manifest().de()?;
-                manifests.push(m);
-            }
-            // Build map of current port -> ssl mappings
-            let port_map = ssl_port_status(&manifests);
-            tracing::info!("SSL Port Map: {:?}", &port_map);
-
-            // if any of the requested interface lan configs conflict with current state, fail the install
-            for (_id, iface) in &temp_manifest.interfaces.0 {
-                if let Some(cfg) = &iface.lan_config {
-                    for (p, lan) in cfg {
-                        if p.0 == 80 && lan.ssl || p.0 == 443 && !lan.ssl {
-                            return Err(Error::new(
-                                eyre!("SSL Conflict with StartOS"),
-                                ErrorKind::LanPortConflict,
-                            ));
-                        }
-                        match port_map.get(&p) {
-                            Some((ssl, pkg)) => {
-                                if *ssl != lan.ssl {
-                                    return Err(Error::new(
-                                        eyre!("SSL Conflict with package: {}", pkg),
-                                        ErrorKind::LanPortConflict,
-                                    ));
-                                }
-                            }
-                            None => {
-                                continue;
-                            }
-                        }
-                    }
-                }
-            }
-
-            let pkg_archive_dir = ctx
-                .datadir
-                .join(PKG_ARCHIVE_DIR)
-                .join(pkg_id)
-                .join(version.as_str());
-            tokio::fs::create_dir_all(&pkg_archive_dir).await?;
-            let pkg_archive =
-                pkg_archive_dir.join(AsRef::<Path>::as_ref(pkg_id).with_extension("s9pk"));
-
-            File::delete(&pkg_archive).await?;
-            let mut dst = OpenOptions::new()
-                .create(true)
-                .write(true)
-                .read(true)
-                .open(&pkg_archive)
-                .await?;
-
-            progress
-                .track_download_during(ctx.db.clone(), pkg_id, || async {
-                    let mut progress_writer =
-                        InstallProgressTracker::new(&mut dst, progress.clone());
-                    tokio::io::copy(&mut s9pk, &mut progress_writer).await?;
-                    progress.download_complete();
-                    if let Some(complete) = download_complete {
-                        complete.send(()).unwrap_or_default();
-                    }
-                    Ok(())
-                })
-                .await?;
-
-            dst.seek(SeekFrom::Start(0)).await?;
-
-            let progress_reader = InstallProgressTracker::new(dst, progress.clone());
-            let mut s9pk_reader = progress
-                .track_read_during(ctx.db.clone(), pkg_id, || {
-                    S9pkReader::from_reader(progress_reader, true)
-                })
-                .await?;
-
-            install_s9pk(
-                ctx.clone(),
-                pkg_id,
-                version,
-                marketplace_url,
-                &mut s9pk_reader,
-                progress,
-            )
-            .await?;
-
-            Ok(())
-        }
-    }
-    .await
-    {
-        if let Err(e) = cleanup_failed(&ctx, pkg_id).await {
-            tracing::error!("Failed to clean up {}@{}: {}", pkg_id, version, e);
-            tracing::debug!("{:?}", e);
-        }
-
-        Err(e)
-    } else {
-        Ok::<_, Error>(())
-    }
-}
-
-#[instrument(skip_all)]
-pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin + Send + Sync>(
-    ctx: RpcContext,
-    pkg_id: &PackageId,
-    version: &Version,
-    marketplace_url: Option<Url>,
-    rdr: &mut S9pkReader<InstallProgressTracker<R>>,
-    progress: Arc<InstallProgress>,
-) -> Result<(), Error> {
-    rdr.validate().await?;
-    rdr.validated();
-    let developer_key = rdr.developer_key().clone();
-    rdr.reset().await?;
-    let db = ctx.db.peek().await;
-
-    tracing::info!("Install {}@{}: Unpacking Manifest", pkg_id, version);
-    let manifest = progress
-        .track_read_during(ctx.db.clone(), pkg_id, || rdr.manifest())
-        .await?;
-    tracing::info!("Install {}@{}: Unpacked Manifest", pkg_id, version);
-
-    tracing::info!("Install {}@{}: Fetching Dependency Info", pkg_id, version);
-    let mut dependency_info = BTreeMap::new();
-    for (dep, info) in &manifest.dependencies.0 {
-        let manifest: Option<Manifest> = if let Some(local_man) = db
-            .as_package_data()
-            .as_idx(dep)
-            .map(|pde| pde.as_manifest().de())
-        {
-            Some(local_man?)
-        } else if let Some(marketplace_url) = &marketplace_url {
-            match ctx
-                .client
-                .get(with_query_params(
-                    ctx.clone(),
-                    format!(
-                        "{}/package/v0/manifest/{}?spec={}",
-                        marketplace_url, dep, info.version,
-                    )
-                    .parse()?,
-                ))
-                .send()
-                .await
-                .with_kind(crate::ErrorKind::Registry)?
-                .error_for_status()
-            {
-                Ok(a) => Ok(Some(
-                    a.json()
-                        .await
-                        .with_kind(crate::ErrorKind::Deserialization)?,
-                )),
-                Err(e)
-                    if e.status() == Some(StatusCode::BAD_REQUEST)
-                        || e.status() == Some(StatusCode::NOT_FOUND) =>
-                {
-                    Ok(None)
-                }
-                Err(e) => Err(e),
-            }
-            .with_kind(crate::ErrorKind::Registry)?
-        } else {
-            None
-        };
-
-        let icon_path = if let Some(manifest) = &manifest {
-            let dir = ctx
-                .datadir
-                .join(PKG_PUBLIC_DIR)
-                .join(&manifest.id)
-                .join(manifest.version.as_str());
-            let icon_path = dir.join(format!("icon.{}", manifest.assets.icon_type()));
-            if tokio::fs::metadata(&icon_path).await.is_err() {
-                if let Some(marketplace_url) = &marketplace_url {
-                    tokio::fs::create_dir_all(&dir).await?;
-                    let icon = ctx
-                        .client
-                        .get(with_query_params(
-                            ctx.clone(),
-                            format!(
-                                "{}/package/v0/icon/{}?spec={}",
-                                marketplace_url, dep, info.version,
-                            )
-                            .parse()?,
-                        ))
-                        .send()
-                        .await
-                        .with_kind(crate::ErrorKind::Registry)?;
-                    let mut dst = File::create(&icon_path).await?;
-                    tokio::io::copy(&mut response_to_reader(icon), &mut dst).await?;
-                    dst.sync_all().await?;
-                    Some(icon_path)
-                } else {
-                    None
-                }
-            } else {
-                Some(icon_path)
-            }
-        } else {
-            None
-        };
-
-        dependency_info.insert(
-            dep.clone(),
-            StaticDependencyInfo {
-                title: manifest
-                    .as_ref()
-                    .map(|x| x.title.clone())
-                    .unwrap_or_else(|| dep.to_string()),
-                icon: if let Some(icon_path) = &icon_path {
-                    DataUrl::from_path(icon_path).await?
-                } else {
-                    DataUrl::from_slice("image/png", include_bytes!("./package-icon.png"))
-                },
-            },
-        );
-    }
-    tracing::info!("Install {}@{}: Fetched Dependency Info", pkg_id, version);
-
-    let icon = progress
-        .track_read_during(ctx.db.clone(), pkg_id, || {
-            unpack_s9pk(&ctx.datadir, &manifest, rdr)
-        })
-        .await?;
-
-    progress.unpack_complete.store(true, Ordering::SeqCst);
-
-    progress
-        .track_read(
-            ctx.db.clone(),
-            pkg_id.clone(),
-            Arc::new(::std::sync::atomic::AtomicBool::new(true)),
-        )
-        .await?;
-
-    let peek = ctx.db.peek().await;
-    let prev = peek
-        .as_package_data()
-        .as_idx(pkg_id)
-        .or_not_found(pkg_id)?
-        .de()?;
-    let mut sql_tx = ctx.secret_store.begin().await?;
-
-    tracing::info!("Install {}@{}: Creating volumes", pkg_id, version);
-    manifest.volumes.install(&ctx, pkg_id, version).await?;
-    tracing::info!("Install {}@{}: Created volumes", pkg_id, version);
-
-    tracing::info!("Install {}@{}: Installing interfaces", pkg_id, version);
-    let interface_addresses = manifest.interfaces.install(sql_tx.as_mut(), pkg_id).await?;
-    tracing::info!(
-        "Install {}@{}: Installed interfaces {:?}",
-        pkg_id,
-        version,
-        interface_addresses
-    );
-
-    tracing::info!("Install {}@{}: Creating manager", pkg_id, version);
-    let manager = ctx.managers.add(ctx.clone(), manifest.clone()).await?;
-    tracing::info!("Install {}@{}: Created manager", pkg_id, version);
-
-    let static_files = StaticFiles::local(pkg_id, version, manifest.assets.icon_type());
-    let current_dependencies: CurrentDependencies = CurrentDependencies(
-        manifest
-            .dependencies
-            .0
-            .iter()
-            .filter_map(|(id, info)| {
-                if info.requirement.required() {
-                    Some((id.clone(), CurrentDependencyInfo::default()))
-                } else {
-                    None
-                }
-            })
-            .collect(),
-    );
-    let mut dependents_static_dependency_info = BTreeMap::new();
-    let current_dependents = {
-        let mut deps = BTreeMap::new();
-        for package in db.as_package_data().keys()? {
-            if db
-                .as_package_data()
-                .as_idx(&package)
-                .or_not_found(&package)?
-                .as_installed()
-                .and_then(|i| i.as_dependency_info().as_idx(&pkg_id))
-                .is_some()
-            {
-                dependents_static_dependency_info.insert(package.clone(), icon.clone());
-            }
-            if let Some(dep) = db
-                .as_package_data()
-                .as_idx(&package)
-                .or_not_found(&package)?
-                .as_installed()
-                .and_then(|i| i.as_current_dependencies().as_idx(pkg_id))
-            {
-                deps.insert(package, dep.de()?);
-            }
-        }
-
-        CurrentDependents(deps)
-    };
-
-    let installed = InstalledPackageInfo {
-        status: Status {
-            configured: manifest.config.is_none(),
-            main: MainStatus::Stopped,
-            dependency_config_errors: compute_dependency_config_errs(
-                &ctx,
-                &peek,
-                &manifest,
-                &current_dependencies,
-                &Default::default(),
-            )
-            .await?,
-        },
-        marketplace_url,
-        developer_key,
-        manifest: manifest.clone(),
-        last_backup: match prev {
-            PackageDataEntry::Updating(PackageDataEntryUpdating {
-                installed:
-                    InstalledPackageInfo {
-                        last_backup: Some(time),
-                        ..
-                    },
-                ..
-            }) => Some(time),
-            _ => None,
-        },
-        dependency_info,
-        current_dependents: current_dependents.clone(),
-        current_dependencies: current_dependencies.clone(),
-        interface_addresses,
-    };
-    let mut next = PackageDataEntryInstalled {
-        installed,
-        manifest: manifest.clone(),
-        static_files,
-    };
-
-    let mut auto_start = false;
-    let mut configured = false;
-
-    let mut to_cleanup = None;
-
-    if let PackageDataEntry::Updating(PackageDataEntryUpdating {
-        installed: prev, ..
-    }) = &prev
-    {
-        let prev_is_configured = prev.status.configured;
-        let prev_migration = prev
-            .manifest
-            .migrations
-            .to(
-                &ctx,
-                version,
-                pkg_id,
-                &prev.manifest.version,
-                &prev.manifest.volumes,
-            )
-            .map(futures::future::Either::Left);
-        let migration = manifest
-            .migrations
-            .from(
-                &manifest.containers,
-                &ctx,
-                &prev.manifest.version,
-                pkg_id,
-                version,
-                &manifest.volumes,
-            )
-            .map(futures::future::Either::Right);
-
-        let viable_migration = if prev.manifest.version > manifest.version {
-            prev_migration.or(migration)
-        } else {
-            migration.or(prev_migration)
-        };
-
-        if let Some(f) = viable_migration {
-            configured = f.await?.configured && prev_is_configured;
-        }
-        if configured || manifest.config.is_none() {
-            auto_start = prev.status.main.running();
-        }
-        if &prev.manifest.version != version {
-            to_cleanup = Some((prev.manifest.id.clone(), prev.manifest.version.clone()));
-        }
-    } else if let PackageDataEntry::Restoring(PackageDataEntryRestoring { .. }) = prev {
-        next.installed.marketplace_url = manifest
-            .backup
-            .restore(&ctx, pkg_id, version, &manifest.volumes)
-            .await?;
-    }
-
-    sql_tx.commit().await?;
-
-    let to_configure = ctx
-        .db
-        .mutate(|db| {
-            for (package, icon) in dependents_static_dependency_info {
-                db.as_package_data_mut()
-                    .as_idx_mut(&package)
-                    .or_not_found(&package)?
-                    .as_installed_mut()
-                    .or_not_found(&package)?
-                    .as_dependency_info_mut()
-                    .insert(
-                        &pkg_id,
-                        &StaticDependencyInfo {
-                            icon,
-                            title: manifest.title.clone(),
-                        },
-                    )?;
-            }
-            db.as_package_data_mut()
-                .insert(&pkg_id, &PackageDataEntry::Installed(next))?;
-            if let PackageDataEntry::Updating(PackageDataEntryUpdating {
-                installed: prev, ..
-            }) = &prev
-            {
-                remove_from_current_dependents_lists(db, pkg_id, &prev.current_dependencies)?;
-            }
-            add_dependent_to_current_dependents_lists(db, pkg_id, &current_dependencies)?;
-
-            set_dependents_with_live_pointers_to_needs_config(db, pkg_id)
-        })
-        .await?;
-
-    if let Some((id, version)) = to_cleanup {
-        cleanup(&ctx, &id, &version).await?;
-    }
-
-    if configured && manifest.config.is_some() {
-        let breakages = BTreeMap::new();
-        let overrides = Default::default();
-
-        let configure_context = ConfigureContext {
-            breakages,
-            timeout: None,
-            config: None,
-            dry_run: false,
-            overrides,
-        };
-        manager.configure(configure_context).await?;
-    }
-
-    for to_configure in to_configure.into_iter().filter(|(dep, _)| dep != pkg_id) {
-        if let Err(e) = async {
-            ctx.managers
-                .get(&to_configure)
-                .await
-                .or_not_found(format!("manager for {}", to_configure.0))?
-                .configure(ConfigureContext {
-                    breakages: BTreeMap::new(),
-                    timeout: None,
-                    config: None,
-                    overrides: BTreeMap::new(),
-                    dry_run: false,
-                })
-                .await
-        }
-        .await
-        {
-            tracing::error!("error configuring dependent: {e}");
-            tracing::debug!("{e:?}")
-        }
-    }
-
-    if auto_start {
-        manager.start().await;
-    }
-
-    tracing::info!("Install {}@{}: Complete", pkg_id, version);
-
-    Ok(())
-}
-
-#[instrument(skip_all)]
-pub async fn unpack_s9pk<R: AsyncRead + AsyncSeek + Unpin + Send + Sync>(
-    datadir: impl AsRef<Path>,
-    manifest: &Manifest,
-    rdr: &mut S9pkReader<R>,
-) -> Result<DataUrl<'static>, Error> {
-    let datadir = datadir.as_ref();
-    let pkg_id = &manifest.id;
-    let version = &manifest.version;
-
-    let public_dir_path = datadir
-        .join(PKG_PUBLIC_DIR)
-        .join(pkg_id)
-        .join(version.as_str());
-    tokio::fs::create_dir_all(&public_dir_path).await?;
-
-    tracing::info!("Install {}@{}: Unpacking LICENSE.md", pkg_id, version);
-    let license_path = public_dir_path.join("LICENSE.md");
-    let mut dst = File::create(&license_path).await?;
-    tokio::io::copy(&mut rdr.license().await?, &mut dst).await?;
-    dst.sync_all().await?;
-    tracing::info!("Install {}@{}: Unpacked LICENSE.md", pkg_id, version);
-
-    tracing::info!("Install {}@{}: Unpacking INSTRUCTIONS.md", pkg_id, version);
-    let instructions_path = public_dir_path.join("INSTRUCTIONS.md");
-    let mut dst = File::create(&instructions_path).await?;
-    tokio::io::copy(&mut rdr.instructions().await?, &mut dst).await?;
-    dst.sync_all().await?;
-    tracing::info!("Install {}@{}: Unpacked INSTRUCTIONS.md", pkg_id, version);
-
-    let icon_filename = Path::new("icon").with_extension(manifest.assets.icon_type());
-    let icon_path = public_dir_path.join(&icon_filename);
-    tracing::info!(
-        "Install {}@{}: Unpacking {}",
-        pkg_id,
-        version,
-        icon_path.display()
-    );
-    let icon_buf = rdr.icon().await?.to_vec().await?;
-    let mut dst = File::create(&icon_path).await?;
-    dst.write_all(&icon_buf).await?;
-    dst.sync_all().await?;
-    let icon = DataUrl::from_vec(
-        mime(manifest.assets.icon_type()).unwrap_or("image/png"),
-        icon_buf,
-    );
-    tracing::info!(
-        "Install {}@{}: Unpacked {}",
-        pkg_id,
-        version,
-        icon_filename.display()
-    );
-
-    tracing::info!("Install {}@{}: Unpacking Docker Images", pkg_id, version);
-    Command::new(CONTAINER_TOOL)
-        .arg("load")
-        .input(Some(&mut rdr.docker_images().await?))
-        .invoke(ErrorKind::Docker)
-        .await?;
-    tracing::info!("Install {}@{}: Unpacked Docker Images", pkg_id, version,);
-
-    tracing::info!("Install {}@{}: Unpacking Assets", pkg_id, version);
-    let asset_dir = asset_dir(datadir, pkg_id, version);
-    if tokio::fs::metadata(&asset_dir).await.is_ok() {
-        tokio::fs::remove_dir_all(&asset_dir).await?;
-    }
-    tokio::fs::create_dir_all(&asset_dir).await?;
-    let mut tar = tokio_tar::Archive::new(rdr.assets().await?);
-    tar.unpack(asset_dir).await?;
-
-    let script_dir = script_dir(datadir, pkg_id, version);
-    if tokio::fs::metadata(&script_dir).await.is_err() {
-        tokio::fs::create_dir_all(&script_dir).await?;
-    }
-    if let Some(mut hdl) = rdr.scripts().await? {
-        tokio::io::copy(
-            &mut hdl,
-            &mut File::create(script_dir.join("embassy.js")).await?,
-        )
-        .await?;
-    }
-    tracing::info!("Install {}@{}: Unpacked Assets", pkg_id, version);
-
-    Ok(icon)
-}
-
-#[instrument(skip_all)]
-pub fn rebuild_from<'a>(
-    source: impl AsRef<Path> + 'a + Send + Sync,
-    datadir: impl AsRef<Path> + 'a + Send + Sync,
-) -> BoxFuture<'a, Result<(), Error>> {
-    async move {
-        let source_dir = source.as_ref();
-        let datadir = datadir.as_ref();
-        if tokio::fs::metadata(&source_dir).await.is_ok() {
-            ReadDirStream::new(tokio::fs::read_dir(&source_dir).await?)
-                .map(|r| {
-                    r.with_ctx(|_| (crate::ErrorKind::Filesystem, format!("{:?}", &source_dir)))
-                })
-                .try_for_each(|entry| async move {
-                    let m = entry.metadata().await?;
-                    if m.is_file() {
-                        let path = entry.path();
-                        let ext = path.extension().and_then(|ext| ext.to_str());
-                        if ext == Some("tar") || ext == Some("s9pk") {
-                            if let Err(e) = async {
-                                match ext {
-                                    Some("tar") => {
-                                        Command::new(CONTAINER_TOOL)
-                                            .arg("load")
-                                            .input(Some(&mut File::open(&path).await?))
-                                            .invoke(ErrorKind::Docker)
-                                            .await?;
-                                        Ok::<_, Error>(())
-                                    }
-                                    Some("s9pk") => {
-                                        let mut s9pk = S9pkReader::open(&path, true).await?;
-                                        unpack_s9pk(datadir, &s9pk.manifest().await?, &mut s9pk)
-                                            .await?;
-                                        Ok(())
-                                    }
-                                    _ => unreachable!(),
-                                }
-                            }
-                            .await
-                            {
-                                tracing::error!("Error unpacking {path:?}: {e}");
-                                tracing::debug!("{e:?}");
-                            }
-                            Ok(())
-                        } else {
-                            Ok(())
-                        }
-                    } else if m.is_dir() {
-                        rebuild_from(entry.path(), datadir).await?;
-                        Ok(())
-                    } else {
-                        Ok(())
-                    }
-                })
-                .await
-        } else {
-            Ok(())
-        }
-    }
-    .boxed()
-}
-
-fn ssl_port_status(manifests: &Vec<Manifest>) -> BTreeMap<Port, (bool, PackageId)> {
-    let mut ret = BTreeMap::new();
-    for m in manifests {
-        for (_id, iface) in &m.interfaces.0 {
-            match &iface.lan_config {
-                None => {}
-                Some(cfg) => {
-                    for (p, lan) in cfg {
-                        ret.insert(p.clone(), (lan.ssl, m.id.clone()));
-                    }
-                }
-            }
-        }
-    }
-    ret
-}
diff --git a/core/startos/src/install/progress.rs b/core/startos/src/install/progress.rs
deleted file mode 100644
index 61e58e0e6..000000000
--- a/core/startos/src/install/progress.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use std::future::Future;
-use std::io::SeekFrom;
-use std::pin::Pin;
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
-use std::sync::Arc;
-use std::task::{Context, Poll};
-use std::time::Duration;
-
-use models::{OptionExt, PackageId};
-use serde::{Deserialize, Serialize};
-use tokio::io::{AsyncRead, AsyncSeek, AsyncWrite};
-
-use crate::db::model::Database;
-use crate::prelude::*;
-
-#[derive(Debug, Deserialize, Serialize, HasModel, Default)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct InstallProgress {
-    pub size: Option<u64>,
-    pub downloaded: AtomicU64,
-    pub download_complete: AtomicBool,
-    pub validated: AtomicU64,
-    pub validation_complete: AtomicBool,
-    pub unpacked: AtomicU64,
-    pub unpack_complete: AtomicBool,
-}
-impl InstallProgress {
-    pub fn new(size: Option<u64>) -> Self {
-        InstallProgress {
-            size,
-            downloaded: AtomicU64::new(0),
-            download_complete: AtomicBool::new(false),
-            validated: AtomicU64::new(0),
-            validation_complete: AtomicBool::new(false),
-            unpacked: AtomicU64::new(0),
-            unpack_complete: AtomicBool::new(false),
-        }
-    }
-    pub fn download_complete(&self) {
-        self.download_complete.store(true, Ordering::SeqCst)
-    }
-    pub async fn track_download(self: Arc<Self>, db: PatchDb, id: PackageId) -> Result<(), Error> {
-        let update = |d: &mut Model<Database>| {
-            d.as_package_data_mut()
-                .as_idx_mut(&id)
-                .or_not_found(&id)?
-                .as_install_progress_mut()
-                .or_not_found("install-progress")?
-                .ser(&self)
-        };
-        while !self.download_complete.load(Ordering::SeqCst) {
-            db.mutate(&update).await?;
-            tokio::time::sleep(Duration::from_millis(300)).await;
-        }
-        db.mutate(&update).await
-    }
-    pub async fn track_download_during<
-        F: FnOnce() -> Fut,
-        Fut: Future<Output = Result<T, Error>>,
-        T,
-    >(
-        self: &Arc<Self>,
-        db: PatchDb,
-        id: &PackageId,
-        f: F,
-    ) -> Result<T, Error> {
-        let tracker = tokio::spawn(self.clone().track_download(db.clone(), id.clone()));
-        let res = f().await;
-        self.download_complete.store(true, Ordering::SeqCst);
-        tracker.await.unwrap()?;
-        res
-    }
-    pub async fn track_read(
-        self: Arc<Self>,
-        db: PatchDb,
-        id: PackageId,
-        complete: Arc<AtomicBool>,
-    ) -> Result<(), Error> {
-        let update = |d: &mut Model<Database>| {
-            d.as_package_data_mut()
-                .as_idx_mut(&id)
-                .or_not_found(&id)?
-                .as_install_progress_mut()
-                .or_not_found("install-progress")?
-                .ser(&self)
-        };
-        while !complete.load(Ordering::SeqCst) {
-            db.mutate(&update).await?;
-            tokio::time::sleep(Duration::from_millis(300)).await;
-        }
-        db.mutate(&update).await
-    }
-    pub async fn track_read_during<
-        F: FnOnce() -> Fut,
-        Fut: Future<Output = Result<T, Error>>,
-        T,
-    >(
-        self: &Arc<Self>,
-        db: PatchDb,
-        id: &PackageId,
-        f: F,
-    ) -> Result<T, Error> {
-        let complete = Arc::new(AtomicBool::new(false));
-        let tracker = tokio::spawn(self.clone().track_read(
-            db.clone(),
-            id.clone(),
-            complete.clone(),
-        ));
-        let res = f().await;
-        complete.store(true, Ordering::SeqCst);
-        tracker.await.unwrap()?;
-        res
-    }
-}
-
-#[pin_project::pin_project]
-#[derive(Debug)]
-pub struct InstallProgressTracker<RW> {
-    #[pin]
-    inner: RW,
-    validating: bool,
-    progress: Arc<InstallProgress>,
-}
-impl<RW> InstallProgressTracker<RW> {
-    pub fn new(inner: RW, progress: Arc<InstallProgress>) -> Self {
-        InstallProgressTracker {
-            inner,
-            validating: true,
-            progress,
-        }
-    }
-    pub fn validated(&mut self) {
-        self.progress
-            .validation_complete
-            .store(true, Ordering::SeqCst);
-        self.validating = false;
-    }
-}
-impl<W: AsyncWrite> AsyncWrite for InstallProgressTracker<W> {
-    fn poll_write(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &[u8],
-    ) -> Poll<Result<usize, std::io::Error>> {
-        let this = self.project();
-        match this.inner.poll_write(cx, buf) {
-            Poll::Ready(Ok(n)) => {
-                this.progress
-                    .downloaded
-                    .fetch_add(n as u64, Ordering::SeqCst);
-                Poll::Ready(Ok(n))
-            }
-            a => a,
-        }
-    }
-    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), std::io::Error>> {
-        let this = self.project();
-        this.inner.poll_flush(cx)
-    }
-    fn poll_shutdown(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), std::io::Error>> {
-        let this = self.project();
-        this.inner.poll_shutdown(cx)
-    }
-    fn poll_write_vectored(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        bufs: &[std::io::IoSlice<'_>],
-    ) -> Poll<Result<usize, std::io::Error>> {
-        let this = self.project();
-        match this.inner.poll_write_vectored(cx, bufs) {
-            Poll::Ready(Ok(n)) => {
-                this.progress
-                    .downloaded
-                    .fetch_add(n as u64, Ordering::SeqCst);
-                Poll::Ready(Ok(n))
-            }
-            a => a,
-        }
-    }
-}
-impl<R: AsyncRead> AsyncRead for InstallProgressTracker<R> {
-    fn poll_read(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut tokio::io::ReadBuf<'_>,
-    ) -> Poll<std::io::Result<()>> {
-        let this = self.project();
-        let prev = buf.filled().len() as u64;
-        match this.inner.poll_read(cx, buf) {
-            Poll::Ready(Ok(())) => {
-                if *this.validating {
-                    &this.progress.validated
-                } else {
-                    &this.progress.unpacked
-                }
-                .fetch_add(buf.filled().len() as u64 - prev, Ordering::SeqCst);
-
-                Poll::Ready(Ok(()))
-            }
-            a => a,
-        }
-    }
-}
-impl<R: AsyncSeek> AsyncSeek for InstallProgressTracker<R> {
-    fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> std::io::Result<()> {
-        let this = self.project();
-        this.inner.start_seek(position)
-    }
-    fn poll_complete(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<u64>> {
-        let this = self.project();
-        match this.inner.poll_complete(cx) {
-            Poll::Ready(Ok(n)) => {
-                if *this.validating {
-                    &this.progress.validated
-                } else {
-                    &this.progress.unpacked
-                }
-                .store(n, Ordering::SeqCst);
-                Poll::Ready(Ok(n))
-            }
-            a => a,
-        }
-    }
-}
diff --git a/core/startos/src/install/update.rs b/core/startos/src/install/update.rs
index 694051213..a0374fc80 100644
--- a/core/startos/src/install/update.rs
+++ b/core/startos/src/install/update.rs
@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;
 
+use models::PackageId;
 use rpc_toolkit::command;
 use tracing::instrument;
 
@@ -7,7 +8,6 @@ use crate::config::not_found;
 use crate::context::RpcContext;
 use crate::db::model::CurrentDependents;
 use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
 use crate::util::serde::display_serializable;
 use crate::util::Version;
 use crate::Error;
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 5fde6513f..35b373e91 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -38,20 +38,20 @@ pub mod error;
 pub mod firmware;
 pub mod hostname;
 pub mod init;
-pub mod inspect;
+pub mod progress;
+// pub mod inspect;
 pub mod install;
 pub mod logs;
-pub mod manager;
+pub mod lxc;
 pub mod middleware;
-pub mod migration;
 pub mod net;
 pub mod notifications;
 pub mod os_install;
 pub mod prelude;
-pub mod procedure;
 pub mod properties;
 pub mod registry;
 pub mod s9pk;
+pub mod service;
 pub mod setup;
 pub mod shutdown;
 pub mod sound;
@@ -59,100 +59,217 @@ pub mod ssh;
 pub mod status;
 pub mod system;
 pub mod update;
+pub mod upload;
 pub mod util;
 pub mod version;
 pub mod volume;
 
 use std::time::SystemTime;
 
+use clap::Parser;
 pub use config::Config;
 pub use error::{Error, ErrorKind, ResultExt};
-use rpc_toolkit::command;
+use imbl_value::Value;
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{
+    command, from_fn, from_fn_async, from_fn_blocking, AnyContext, HandlerExt, ParentHandler,
+};
+use serde::{Deserialize, Serialize};
 
-#[command(metadata(authenticated = false))]
-pub fn echo(#[arg] message: String) -> Result<String, RpcError> {
-    Ok(message)
+use crate::context::CliContext;
+use crate::util::serde::HandlerExtSerde;
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct EchoParams {
+    message: String,
 }
 
-#[command(subcommands(
-    version::git_info,
-    echo,
-    inspect::inspect,
-    server,
-    package,
-    net::net,
-    auth::auth,
-    db::db,
-    ssh::ssh,
-    net::wifi::wifi,
-    disk::disk,
-    notifications::notification,
-    backup::backup,
-    registry::marketplace::marketplace,
-))]
-pub fn main_api() -> Result<(), RpcError> {
-    Ok(())
+pub fn echo(_: AnyContext, EchoParams { message }: EchoParams) -> Result<String, RpcError> {
+    Ok(message)
 }
 
-#[command(subcommands(
-    system::time,
-    system::experimental,
-    system::logs,
-    system::kernel_logs,
-    system::metrics,
-    shutdown::shutdown,
-    shutdown::restart,
-    shutdown::rebuild,
-    update::update_system,
-    firmware::update_firmware,
-))]
-pub fn server() -> Result<(), RpcError> {
-    Ok(())
+pub fn main_api() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("git-info", from_fn(version::git_info))
+        .subcommand(
+            "echo",
+            from_fn(echo)
+                .with_metadata("authenticated", Value::Bool(false))
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("init", from_fn_blocking(developer::init).no_display())
+        .subcommand("server", server())
+        .subcommand("package", package())
+        .subcommand("net", net::net())
+        .subcommand("auth", auth::auth())
+        .subcommand("db", db::db())
+        .subcommand("ssh", ssh::ssh())
+        .subcommand("wifi", net::wifi::wifi())
+        .subcommand("disk", disk::disk())
+        .subcommand("notification", notifications::notification())
+        .subcommand("backup", backup::backup())
+        .subcommand("marketplace", registry::marketplace::marketplace())
+        .subcommand("lxc", lxc::lxc())
+        .subcommand("s9pk", s9pk::rpc::s9pk())
 }
 
-#[command(subcommands(
-    action::action,
-    install::install,
-    install::sideload,
-    install::uninstall,
-    install::list,
-    config::config,
-    control::start,
-    control::stop,
-    control::restart,
-    logs::logs,
-    properties::properties,
-    dependencies::dependency,
-    backup::package_backup,
-))]
-pub fn package() -> Result<(), RpcError> {
-    Ok(())
+pub fn server() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "time",
+            from_fn_async(system::time)
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(system::display_time(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("experimental", system::experimental())
+        .subcommand("logs", system::logs())
+        .subcommand("kernel-logs", system::kernel_logs())
+        .subcommand(
+            "metrics",
+            from_fn_async(system::metrics)
+                .with_display_serializable()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "shutdown",
+            from_fn_async(shutdown::shutdown)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "restart",
+            from_fn_async(shutdown::restart)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "rebuild",
+            from_fn_async(shutdown::rebuild)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "update",
+            from_fn_async(update::update_system)
+                .with_metadata("sync_db", Value::Bool(true))
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(update::display_update_result(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "update-firmware",
+            from_fn_async(firmware::update_firmware)
+                .with_custom_display_fn::<AnyContext, _>(|_handle, result| {
+                    Ok(firmware::display_firmware_update_result(result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
-#[command(subcommands(
-    version::git_info,
-    s9pk::pack,
-    developer::verify,
-    developer::init,
-    inspect::inspect,
-    registry::admin::publish,
-))]
-pub fn portable_api() -> Result<(), RpcError> {
-    Ok(())
+pub fn package() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "action",
+            from_fn_async(action::action)
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(action::display_action_result(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "install",
+            from_fn_async(install::install)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand("sideload", from_fn_async(install::sideload).no_cli())
+        .subcommand("install", from_fn_async(install::cli_install).no_display())
+        .subcommand(
+            "uninstall",
+            from_fn_async(install::uninstall)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(install::list)
+                .with_display_serializable()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("config", config::config())
+        .subcommand(
+            "start",
+            from_fn_async(control::start)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "stop",
+            from_fn_async(control::stop)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "restart",
+            from_fn_async(control::restart)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("logs", logs::logs())
+        .subcommand(
+            "properties",
+            from_fn_async(properties::properties)
+                .with_custom_display_fn::<AnyContext, _>(|_handle, result| {
+                    Ok(properties::display_properties(result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("dependency", dependencies::dependency())
+        .subcommand("package-backup", backup::backup())
+        .subcommand("connect", from_fn_async(service::connect_rpc).no_cli())
+        .subcommand(
+            "connect",
+            from_fn_async(service::connect_rpc_cli).no_display(),
+        )
 }
 
-#[command(subcommands(version::git_info, echo, diagnostic::diagnostic))]
-pub fn diagnostic_api() -> Result<(), RpcError> {
-    Ok(())
+pub fn diagnostic_api() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "git-info",
+            from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
+        )
+        .subcommand("echo", from_fn(echo).with_remote_cli::<CliContext>())
+        .subcommand("diagnostic", diagnostic::diagnostic())
 }
 
-#[command(subcommands(version::git_info, echo, setup::setup))]
-pub fn setup_api() -> Result<(), RpcError> {
-    Ok(())
+pub fn setup_api() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "git-info",
+            from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
+        )
+        .subcommand("echo", from_fn(echo).with_remote_cli::<CliContext>())
+        .subcommand("setup", setup::setup())
 }
 
-#[command(subcommands(version::git_info, echo, os_install::install))]
-pub fn install_api() -> Result<(), RpcError> {
-    Ok(())
+pub fn install_api() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "git-info",
+            from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
+        )
+        .subcommand("echo", from_fn(echo).with_remote_cli::<CliContext>())
+        .subcommand("install", os_install::install())
 }
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 691ae09b9..0b7ef3c67 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -1,36 +1,28 @@
-use std::future::Future;
-use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
 use std::process::Stdio;
 use std::time::{Duration, UNIX_EPOCH};
 
+use axum::extract::ws::{self, WebSocket};
 use chrono::{DateTime, Utc};
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::stream::BoxStream;
 use futures::{FutureExt, SinkExt, Stream, StreamExt, TryStreamExt};
-use hyper::upgrade::Upgraded;
-use hyper::Error as HyperError;
-use rpc_toolkit::command;
+use models::PackageId;
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{command, from_fn_async, CallRemote, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio::process::{Child, Command};
-use tokio::task::JoinError;
 use tokio_stream::wrappers::LinesStream;
-use tokio_tungstenite::tungstenite::protocol::frame::coding::CloseCode;
-use tokio_tungstenite::tungstenite::protocol::CloseFrame;
 use tokio_tungstenite::tungstenite::Message;
-use tokio_tungstenite::WebSocketStream;
 use tracing::instrument;
 
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::error::ResultExt;
-use crate::procedure::docker::DockerProcedure;
-use crate::s9pk::manifest::PackageId;
-use crate::util::display_none;
+use crate::prelude::*;
 use crate::util::serde::Reversible;
-use crate::{Error, ErrorKind};
 
 #[pin_project::pin_project]
 pub struct LogStream {
@@ -65,21 +57,14 @@ impl Stream for LogStream {
 }
 
 #[instrument(skip_all)]
-async fn ws_handler<
-    WSFut: Future<Output = Result<Result<WebSocketStream<Upgraded>, HyperError>, JoinError>>,
->(
+async fn ws_handler(
     first_entry: Option<LogEntry>,
     mut logs: LogStream,
-    ws_fut: WSFut,
+    mut stream: WebSocket,
 ) -> Result<(), Error> {
-    let mut stream = ws_fut
-        .await
-        .with_kind(crate::ErrorKind::Network)?
-        .with_kind(crate::ErrorKind::Unknown)?;
-
     if let Some(first_entry) = first_entry {
         stream
-            .send(Message::Text(
+            .send(ws::Message::Text(
                 serde_json::to_string(&first_entry).with_kind(ErrorKind::Serialization)?,
             ))
             .await
@@ -94,7 +79,7 @@ async fn ws_handler<
         if let Some(entry) = entry {
             let (_, log_entry) = entry.log_entry()?;
             stream
-                .send(Message::Text(
+                .send(ws::Message::Text(
                     serde_json::to_string(&log_entry).with_kind(ErrorKind::Serialization)?,
                 ))
                 .await
@@ -104,12 +89,13 @@ async fn ws_handler<
 
     if !ws_closed {
         stream
-            .close(Some(CloseFrame {
-                code: CloseCode::Normal,
+            .send(ws::Message::Close(Some(ws::CloseFrame {
+                code: ws::close_code::NORMAL,
                 reason: "Log Stream Finished".into(),
-            }))
+            })))
             .await
             .with_kind(ErrorKind::Network)?;
+        drop(stream);
     }
 
     Ok(())
@@ -224,23 +210,52 @@ pub enum LogSource {
 
 pub const SYSTEM_UNIT: &str = "startd";
 
-#[command(
-    custom_cli(cli_logs(async, context(CliContext))),
-    subcommands(self(logs_nofollow(async)), logs_follow),
-    display(display_none)
-)]
-pub async fn logs(
-    #[arg] id: PackageId,
-    #[arg(short = 'l', long = "limit")] limit: Option<usize>,
-    #[arg(short = 'c', long = "cursor")] cursor: Option<String>,
-    #[arg(short = 'B', long = "before", default)] before: bool,
-    #[arg(short = 'f', long = "follow", default)] follow: bool,
-) -> Result<(PackageId, Option<usize>, Option<String>, bool, bool), Error> {
-    Ok((id, limit, cursor, before, follow))
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct LogsParam {
+    id: PackageId,
+    #[arg(short = 'l', long = "limit")]
+    limit: Option<usize>,
+    #[arg(short = 'c', long = "cursor")]
+    cursor: Option<String>,
+    #[arg(short = 'B', long = "before")]
+    #[serde(default)]
+    before: bool,
+    #[arg(short = 'f', long = "follow")]
+    #[serde(default)]
+    follow: bool,
+}
+
+pub fn logs() -> ParentHandler<LogsParam> {
+    ParentHandler::<LogsParam>::new()
+        .root_handler(
+            from_fn_async(cli_logs)
+                .no_display()
+                .with_inherited(|params, _| params),
+        )
+        .root_handler(
+            from_fn_async(logs_follow)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
+        .subcommand(
+            "follow",
+            from_fn_async(logs_follow)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
 }
 pub async fn cli_logs(
     ctx: CliContext,
-    (id, limit, cursor, before, follow): (PackageId, Option<usize>, Option<String>, bool, bool),
+    _: Empty,
+    LogsParam {
+        id,
+        limit,
+        cursor,
+        before,
+        follow,
+    }: LogsParam,
 ) -> Result<(), RpcError> {
     if follow {
         if cursor.is_some() {
@@ -262,14 +277,21 @@ pub async fn cli_logs(
 }
 pub async fn logs_nofollow(
     _ctx: (),
-    (id, limit, cursor, before, _): (PackageId, Option<usize>, Option<String>, bool, bool),
+    _: Empty,
+    LogsParam {
+        id,
+        limit,
+        cursor,
+        before,
+        ..
+    }: LogsParam,
 ) -> Result<LogResponse, Error> {
     fetch_logs(LogSource::Container(id), limit, cursor, before).await
 }
-#[command(rpc_only, rename = "follow", display(display_none))]
 pub async fn logs_follow(
-    #[context] ctx: RpcContext,
-    #[parent_data] (id, limit, _, _, _): (PackageId, Option<usize>, Option<String>, bool, bool),
+    ctx: RpcContext,
+    _: Empty,
+    LogsParam { id, limit, .. }: LogsParam,
 ) -> Result<LogFollowResponse, Error> {
     follow_logs(ctx, LogSource::Container(id), limit).await
 }
@@ -282,19 +304,18 @@ pub async fn cli_logs_generic_nofollow(
     cursor: Option<String>,
     before: bool,
 ) -> Result<(), RpcError> {
-    let res = rpc_toolkit::command_helpers::call_remote(
-        ctx.clone(),
-        method,
-        serde_json::json!({
-            "id": id,
-            "limit": limit,
-            "cursor": cursor,
-            "before": before,
-        }),
-        PhantomData::<LogResponse>,
-    )
-    .await?
-    .result?;
+    let res = from_value::<LogResponse>(
+        ctx.call_remote(
+            method,
+            imbl_value::json!({
+                "id": id,
+                "limit": limit,
+                "cursor": cursor,
+                "before": before,
+            }),
+        )
+        .await?,
+    )?;
 
     for entry in res.entries.iter() {
         println!("{}", entry);
@@ -309,36 +330,18 @@ pub async fn cli_logs_generic_follow(
     id: Option<PackageId>,
     limit: Option<usize>,
 ) -> Result<(), RpcError> {
-    let res = rpc_toolkit::command_helpers::call_remote(
-        ctx.clone(),
-        method,
-        serde_json::json!({
-            "id": id,
-            "limit": limit,
-        }),
-        PhantomData::<LogFollowResponse>,
-    )
-    .await?
-    .result?;
-
-    let mut base_url = ctx.base_url.clone();
-    let ws_scheme = match base_url.scheme() {
-        "https" => "wss",
-        "http" => "ws",
-        _ => {
-            return Err(Error::new(
-                eyre!("Cannot parse scheme from base URL"),
-                crate::ErrorKind::ParseUrl,
-            )
-            .into())
-        }
-    };
-    base_url
-        .set_scheme(ws_scheme)
-        .map_err(|_| Error::new(eyre!("Cannot set URL scheme"), crate::ErrorKind::ParseUrl))?;
-    let (mut stream, _) =
-                // base_url is "http://127.0.0.1/", with a trailing slash, so we don't put a leading slash in this path:
-                tokio_tungstenite::connect_async(format!("{}ws/rpc/{}", base_url, res.guid)).await?;
+    let res = from_value::<LogFollowResponse>(
+        ctx.call_remote(
+            method,
+            imbl_value::json!({
+                "id": id,
+                "limit": limit,
+            }),
+        )
+        .await?,
+    )?;
+
+    let mut stream = ctx.ws_continuation(res.guid).await?;
     while let Some(log) = stream.try_next().await? {
         if let Message::Text(log) = log {
             println!("{}", serde_json::from_str::<LogEntry>(&log)?);
@@ -376,15 +379,9 @@ pub async fn journalctl(
         }
         LogSource::Container(id) => {
             #[cfg(not(feature = "docker"))]
-            cmd.arg(format!(
-                "SYSLOG_IDENTIFIER={}",
-                DockerProcedure::container_name(&id, None)
-            ));
+            cmd.arg(format!("SYSLOG_IDENTIFIER={}.embassy", id));
             #[cfg(feature = "docker")]
-            cmd.arg(format!(
-                "CONTAINER_NAME={}",
-                DockerProcedure::container_name(&id, None)
-            ));
+            cmd.arg(format!("CONTAINER_NAME={}.embassy", id));
         }
     };
 
@@ -498,7 +495,16 @@ pub async fn follow_logs(
     ctx.add_continuation(
         guid.clone(),
         RpcContinuation::ws(
-            Box::new(move |ws_fut| ws_handler(first_entry, stream, ws_fut).boxed()),
+            Box::new(move |socket| {
+                ws_handler(first_entry, stream, socket)
+                    .map(|x| match x {
+                        Ok(_) => (),
+                        Err(e) => {
+                            tracing::error!("Error in log stream: {}", e);
+                        }
+                    })
+                    .boxed()
+            }),
             Duration::from_secs(30),
         ),
     )
diff --git a/core/startos/src/lxc/config.template b/core/startos/src/lxc/config.template
new file mode 100644
index 000000000..a85b700e4
--- /dev/null
+++ b/core/startos/src/lxc/config.template
@@ -0,0 +1,19 @@
+# Distribution configuration
+lxc.include = /usr/share/lxc/config/common.conf
+lxc.include = /usr/share/lxc/config/userns.conf
+lxc.arch = linux64
+
+# Container specific configuration
+lxc.apparmor.profile = generated
+lxc.apparmor.allow_nesting = 1
+lxc.idmap = u 0 100000 65536
+lxc.idmap = g 0 100000 65536
+lxc.rootfs.path = dir:/var/lib/lxc/{guid}/rootfs
+lxc.uts.name = {guid}
+
+# Network configuration
+lxc.net.0.type = veth
+lxc.net.0.link = lxcbr0
+lxc.net.0.flags = up
+
+lxc.rootfs.options = rshared
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
new file mode 100644
index 000000000..136a8423b
--- /dev/null
+++ b/core/startos/src/lxc/mod.rs
@@ -0,0 +1,536 @@
+use std::collections::BTreeSet;
+use std::ops::Deref;
+use std::path::Path;
+use std::sync::{Arc, Weak};
+use std::time::Duration;
+
+use clap::Parser;
+use futures::{AsyncWriteExt, FutureExt, StreamExt};
+use imbl_value::{InOMap, InternedString};
+use rpc_toolkit::yajrc::{RpcError, RpcResponse};
+use rpc_toolkit::{
+    from_fn_async, AnyContext, CallRemoteHandler, GenericRpcMethod, Handler, HandlerArgs,
+    HandlerExt, ParentHandler, RpcRequest,
+};
+use rustyline_async::{ReadlineEvent, SharedWriter};
+use serde::{Deserialize, Serialize};
+use tokio::fs::File;
+use tokio::io::{AsyncBufReadExt, BufReader};
+use tokio::process::Command;
+use tokio::sync::Mutex;
+use tokio::time::Instant;
+
+use crate::context::{CliContext, RpcContext};
+use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::disk::mount::filesystem::bind::Bind;
+use crate::disk::mount::filesystem::block_dev::BlockDev;
+use crate::disk::mount::filesystem::idmapped::IdMapped;
+use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
+use crate::disk::mount::filesystem::ReadWrite;
+use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
+use crate::disk::mount::util::unmount;
+use crate::prelude::*;
+use crate::util::rpc_client::UnixRpcClient;
+use crate::util::{new_guid, Invoke};
+
+const LXC_CONTAINER_DIR: &str = "/var/lib/lxc";
+const RPC_DIR: &str = "media/startos/rpc"; // must not be absolute path
+pub const CONTAINER_RPC_SERVER_SOCKET: &str = "service.sock"; // must not be absolute path
+pub const HOST_RPC_SERVER_SOCKET: &str = "host.sock"; // must not be absolute path
+
+pub struct LxcManager {
+    containers: Mutex<Vec<Weak<InternedString>>>,
+}
+impl LxcManager {
+    pub fn new() -> Self {
+        Self {
+            containers: Default::default(),
+        }
+    }
+
+    pub async fn create(self: &Arc<Self>, config: LxcConfig) -> Result<LxcContainer, Error> {
+        let container = LxcContainer::new(self, config).await?;
+        let mut guard = self.containers.lock().await;
+        *guard = std::mem::take(&mut *guard)
+            .into_iter()
+            .filter(|g| g.strong_count() > 0)
+            .chain(std::iter::once(Arc::downgrade(&container.guid)))
+            .collect();
+        Ok(container)
+    }
+
+    pub async fn gc(&self) -> Result<(), Error> {
+        let expected = BTreeSet::from_iter(
+            self.containers
+                .lock()
+                .await
+                .iter()
+                .filter_map(|g| g.upgrade())
+                .map(|g| (&*g).clone()),
+        );
+        for container in String::from_utf8(
+            Command::new("lxc-ls")
+                .arg("-1")
+                .invoke(ErrorKind::Lxc)
+                .await?,
+        )?
+        .lines()
+        .map(|s| s.trim())
+        {
+            if !expected.contains(container) {
+                let rootfs_path = Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs");
+                if tokio::fs::metadata(&rootfs_path).await.is_ok() {
+                    unmount(Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs")).await?;
+                    if tokio_stream::wrappers::ReadDirStream::new(
+                        tokio::fs::read_dir(&rootfs_path).await?,
+                    )
+                    .count()
+                    .await
+                        > 0
+                    {
+                        return Err(Error::new(
+                            eyre!("rootfs is not empty, refusing to delete"),
+                            ErrorKind::InvalidRequest,
+                        ));
+                    }
+                }
+                Command::new("lxc-destroy")
+                    .arg("--force")
+                    .arg("--name")
+                    .arg(container)
+                    .invoke(ErrorKind::Lxc)
+                    .await?;
+            }
+        }
+        Ok(())
+    }
+}
+
+pub struct LxcContainer {
+    manager: Weak<LxcManager>,
+    rootfs: OverlayGuard,
+    guid: Arc<InternedString>,
+    rpc_bind: TmpMountGuard,
+    config: LxcConfig,
+    exited: bool,
+}
+impl LxcContainer {
+    async fn new(manager: &Arc<LxcManager>, config: LxcConfig) -> Result<Self, Error> {
+        let guid = new_guid();
+        let container_dir = Path::new(LXC_CONTAINER_DIR).join(&*guid);
+        tokio::fs::create_dir_all(&container_dir).await?;
+        tokio::fs::write(
+            container_dir.join("config"),
+            format!(include_str!("./config.template"), guid = &*guid),
+        )
+        .await?;
+        // TODO: append config
+        let rootfs_dir = container_dir.join("rootfs");
+        tokio::fs::create_dir_all(&rootfs_dir).await?;
+        Command::new("chown")
+            .arg("100000:100000")
+            .arg(&rootfs_dir)
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        let rootfs = OverlayGuard::mount(
+            &IdMapped::new(
+                BlockDev::new("/usr/lib/startos/container-runtime/rootfs.squashfs"),
+                0,
+                100000,
+                65536,
+            ),
+            &rootfs_dir,
+        )
+        .await?;
+        tokio::fs::write(rootfs_dir.join("etc/hostname"), format!("{guid}\n")).await?;
+        Command::new("sed")
+            .arg("-i")
+            .arg(format!("s/LXC_NAME/{guid}/g"))
+            .arg(rootfs_dir.join("etc/hosts"))
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        Command::new("mount")
+            .arg("--make-rshared")
+            .arg(rootfs.path())
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        let rpc_dir = rootfs_dir.join(RPC_DIR);
+        tokio::fs::create_dir_all(&rpc_dir).await?;
+        let rpc_bind = TmpMountGuard::mount(&Bind::new(rpc_dir), ReadWrite).await?;
+        Command::new("chown")
+            .arg("-R")
+            .arg("100000:100000")
+            .arg(rpc_bind.path())
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        Command::new("lxc-start")
+            .arg("-d")
+            .arg("--name")
+            .arg(&*guid)
+            .invoke(ErrorKind::Lxc)
+            .await?;
+        Ok(Self {
+            manager: Arc::downgrade(manager),
+            rootfs,
+            guid: Arc::new(guid),
+            rpc_bind,
+            config,
+            exited: false,
+        })
+    }
+
+    pub fn rootfs_dir(&self) -> &Path {
+        self.rootfs.path()
+    }
+
+    pub fn rpc_dir(&self) -> &Path {
+        self.rpc_bind.path()
+    }
+
+    #[instrument(skip_all)]
+    pub async fn exit(mut self) -> Result<(), Error> {
+        self.rpc_bind.take().unmount().await?;
+        self.rootfs.take().unmount(true).await?;
+        let rootfs_path = self.rootfs_dir();
+        let err_path = rootfs_path.join("var/log/containerRuntime.err");
+        if tokio::fs::metadata(&err_path).await.is_ok() {
+            let mut lines = BufReader::new(File::open(&err_path).await?).lines();
+            while let Some(line) = lines.next_line().await? {
+                let container = &**self.guid;
+                tracing::error!(container, "{}", line);
+            }
+        }
+        if tokio::fs::metadata(&rootfs_path).await.is_ok() {
+            if tokio_stream::wrappers::ReadDirStream::new(tokio::fs::read_dir(&rootfs_path).await?)
+                .count()
+                .await
+                > 0
+            {
+                return Err(Error::new(
+                    eyre!("rootfs is not empty, refusing to delete"),
+                    ErrorKind::InvalidRequest,
+                ));
+            }
+        }
+        Command::new("lxc-destroy")
+            .arg("--force")
+            .arg("--name")
+            .arg(&**self.guid)
+            .invoke(ErrorKind::Lxc)
+            .await?;
+
+        self.exited = true;
+
+        Ok(())
+    }
+
+    pub async fn connect_rpc(&self, timeout: Option<Duration>) -> Result<UnixRpcClient, Error> {
+        let started = Instant::now();
+        let sock_path = self.rpc_dir().join(CONTAINER_RPC_SERVER_SOCKET);
+        while tokio::fs::metadata(&sock_path).await.is_err() {
+            if timeout.map_or(false, |t| started.elapsed() > t) {
+                return Err(Error::new(
+                    eyre!("timed out waiting for socket"),
+                    ErrorKind::Timeout,
+                ));
+            }
+            tokio::time::sleep(Duration::from_millis(100)).await;
+        }
+        Ok(UnixRpcClient::new(sock_path))
+    }
+}
+impl Drop for LxcContainer {
+    fn drop(&mut self) {
+        if !self.exited {
+            tracing::warn!(
+                "Container {} was ungracefully dropped. Cleaning up dangling containers...",
+                &**self.guid
+            );
+            let rootfs = self.rootfs.take();
+            let guid = std::mem::take(&mut self.guid);
+            if let Some(manager) = self.manager.upgrade() {
+                tokio::spawn(async move {
+                    if let Err(e) = async {
+                        let err_path = rootfs.path().join("var/log/containerRuntime.err");
+                        if tokio::fs::metadata(&err_path).await.is_ok() {
+                            let mut lines = BufReader::new(File::open(&err_path).await?).lines();
+                            while let Some(line) = lines.next_line().await? {
+                                let container = &**guid;
+                                tracing::error!(container, "{}", line);
+                            }
+                        }
+                        Ok::<_, Error>(())
+                    }
+                    .await
+                    {
+                        tracing::error!("Error reading logs from crashed container: {e}");
+                        tracing::debug!("{e:?}")
+                    }
+                    rootfs.unmount(true).await.unwrap();
+                    drop(guid);
+                    if let Err(e) = manager.gc().await {
+                        tracing::error!("Error cleaning up dangling LXC containers: {e}");
+                        tracing::debug!("{e:?}")
+                    } else {
+                        tracing::info!("Successfully cleaned up dangling LXC containers");
+                    }
+                });
+            }
+        }
+    }
+}
+
+#[derive(Default, Serialize)]
+pub struct LxcConfig {}
+
+pub fn lxc() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "create",
+            from_fn_async(create).with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list)
+                .with_custom_display_fn::<AnyContext, _>(|_, res| {
+                    use prettytable::*;
+                    let mut table = table!([bc => "GUID"]);
+                    for guid in res {
+                        table.add_row(row![&*guid]);
+                    }
+                    table.printstd();
+                    Ok(())
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("connect", from_fn_async(connect_rpc).no_cli())
+        .subcommand("connect", from_fn_async(connect_rpc_cli).no_display())
+}
+
+pub async fn create(ctx: RpcContext) -> Result<InternedString, Error> {
+    let container = ctx.lxc_manager.create(LxcConfig::default()).await?;
+    let guid = container.guid.deref().clone();
+    ctx.dev.lxc.lock().await.insert(guid.clone(), container);
+    Ok(guid)
+}
+
+pub async fn list(ctx: RpcContext) -> Result<Vec<InternedString>, Error> {
+    Ok(ctx.dev.lxc.lock().await.keys().cloned().collect())
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct RemoveParams {
+    pub guid: InternedString,
+}
+
+pub async fn remove(ctx: RpcContext, RemoveParams { guid }: RemoveParams) -> Result<(), Error> {
+    if let Some(container) = ctx.dev.lxc.lock().await.remove(&guid) {
+        container.exit().await?;
+    }
+    Ok(())
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct ConnectParams {
+    pub guid: InternedString,
+}
+
+pub async fn connect_rpc(
+    ctx: RpcContext,
+    ConnectParams { guid }: ConnectParams,
+) -> Result<RequestGuid, Error> {
+    connect(
+        &ctx,
+        ctx.dev.lxc.lock().await.get(&guid).ok_or_else(|| {
+            Error::new(eyre!("No container with guid: {guid}"), ErrorKind::NotFound)
+        })?,
+    )
+    .await
+}
+
+pub async fn connect(ctx: &RpcContext, container: &LxcContainer) -> Result<RequestGuid, Error> {
+    use axum::extract::ws::Message;
+
+    let rpc = container.connect_rpc(Some(Duration::from_secs(30))).await?;
+    let guid = RequestGuid::new();
+    ctx.add_continuation(
+        guid.clone(),
+        RpcContinuation::ws(
+            Box::new(|mut ws| {
+                async move {
+                    if let Err(e) = async {
+                        loop {
+                            match ws.next().await {
+                                None => break,
+                                Some(Ok(Message::Text(txt))) => {
+                                    let mut id = None;
+                                    let result = async {
+                                        let req: RpcRequest =
+                                            serde_json::from_str(&txt).map_err(|e| RpcError {
+                                                data: Some(serde_json::Value::String(
+                                                    e.to_string(),
+                                                )),
+                                                ..rpc_toolkit::yajrc::PARSE_ERROR
+                                            })?;
+                                        id = req.id;
+                                        rpc.request(req.method, req.params).await
+                                    }
+                                    .await;
+                                    ws.send(Message::Text(
+                                        serde_json::to_string(&RpcResponse::<GenericRpcMethod> {
+                                            id,
+                                            result,
+                                        })
+                                        .with_kind(ErrorKind::Serialization)?,
+                                    ))
+                                    .await
+                                    .with_kind(ErrorKind::Network)?;
+                                }
+                                Some(Ok(_)) => (),
+                                Some(Err(e)) => {
+                                    return Err(Error::new(e, ErrorKind::Network));
+                                }
+                            }
+                        }
+                        Ok::<_, Error>(())
+                    }
+                    .await
+                    {
+                        tracing::error!("{e}");
+                        tracing::debug!("{e:?}");
+                    }
+                }
+                .boxed()
+            }),
+            Duration::from_secs(30),
+        ),
+    )
+    .await;
+    Ok(guid)
+}
+
+pub async fn connect_cli(ctx: &CliContext, guid: RequestGuid) -> Result<(), Error> {
+    use futures::SinkExt;
+    use tokio_tungstenite::tungstenite::Message;
+
+    let mut ws = ctx.ws_continuation(guid).await?;
+    let (mut input, mut output) =
+        rustyline_async::Readline::new("> ".into()).with_kind(ErrorKind::Filesystem)?;
+
+    async fn handle_message(
+        msg: Option<Result<Message, tokio_tungstenite::tungstenite::Error>>,
+        output: &mut SharedWriter,
+    ) -> Result<bool, Error> {
+        match msg {
+            None => return Ok(true),
+            Some(Ok(Message::Text(txt))) => match serde_json::from_str::<RpcResponse>(&txt) {
+                Ok(RpcResponse { result: Ok(a), .. }) => {
+                    output
+                        .write_all(
+                            (serde_json::to_string(&a).with_kind(ErrorKind::Serialization)? + "\n")
+                                .as_bytes(),
+                        )
+                        .await?;
+                }
+                Ok(RpcResponse { result: Err(e), .. }) => {
+                    let e: Error = e.into();
+                    tracing::error!("{e}");
+                    tracing::debug!("{e:?}");
+                }
+                Err(e) => {
+                    tracing::error!("Error Parsing RPC response: {e}");
+                    tracing::debug!("{e:?}");
+                }
+            },
+            Some(Ok(_)) => (),
+            Some(Err(e)) => {
+                return Err(Error::new(e, ErrorKind::Network));
+            }
+        };
+        Ok(false)
+    }
+
+    loop {
+        tokio::select! {
+            line = input.readline() => {
+                let line = line.with_kind(ErrorKind::Filesystem)?;
+                if let ReadlineEvent::Line(line) = line {
+                    input.add_history_entry(line.clone());
+                    if serde_json::from_str::<RpcRequest>(&line).is_ok() {
+                        ws.send(Message::Text(line))
+                            .await
+                            .with_kind(ErrorKind::Network)?;
+                    } else {
+                        match shell_words::split(&line) {
+                            Ok(command) => {
+                                if let Some((method, rest)) = command.split_first() {
+                                    let mut params = InOMap::new();
+                                    for arg in rest {
+                                        if let Some((name, value)) = arg.split_once("=") {
+                                            params.insert(InternedString::intern(name), if value.is_empty() {
+                                                Value::Null
+                                            } else if let Ok(v) = serde_json::from_str(value) {
+                                                v
+                                            } else {
+                                                Value::String(Arc::new(value.into()))
+                                            });
+                                        } else {
+                                            tracing::error!("argument without a value: {arg}");
+                                            tracing::debug!("help: set the value of {arg} with `{arg}=...`");
+                                            continue;
+                                        }
+                                    }
+                                    ws.send(Message::Text(match serde_json::to_string(&RpcRequest {
+                                        id: None,
+                                        method: GenericRpcMethod::new(method.into()),
+                                        params: Value::Object(params),
+                                    }) {
+                                        Ok(a) => a,
+                                        Err(e) => {
+                                            tracing::error!("Error Serializing Request: {e}");
+                                            tracing::debug!("{e:?}");
+                                            continue;
+                                        }
+                                    })).await.with_kind(ErrorKind::Network)?;
+                                    if handle_message(ws.next().await, &mut output).await? {
+                                        break
+                                    }
+                                }
+                            }
+                            Err(e) => {
+                                tracing::error!("{e}");
+                                tracing::debug!("{e:?}");
+                            }
+                        }
+                    }
+                } else {
+                    ws.send(Message::Close(None)).await.with_kind(ErrorKind::Network)?;
+                }
+            }
+            msg = ws.next() => {
+                if handle_message(msg, &mut output).await? {
+                    break;
+                }
+            }
+        }
+    }
+
+    Ok(())
+}
+
+pub async fn connect_rpc_cli(
+    handle_args: HandlerArgs<CliContext, ConnectParams>,
+) -> Result<(), Error> {
+    let ctx = handle_args.context.clone();
+    let guid = CallRemoteHandler::<CliContext, _>::new(from_fn_async(connect_rpc))
+        .handle_async(handle_args)
+        .await?;
+
+    connect_cli(&ctx, guid).await
+}
diff --git a/core/startos/src/manager/health.rs b/core/startos/src/manager/health.rs
deleted file mode 100644
index 30f18051a..000000000
--- a/core/startos/src/manager/health.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use models::OptionExt;
-use tracing::instrument;
-
-use crate::context::RpcContext;
-use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::status::MainStatus;
-use crate::Error;
-
-/// So, this is used for a service to run a health check cycle, go out and run the health checks, and store those in the db
-#[instrument(skip_all)]
-pub async fn check(ctx: &RpcContext, id: &PackageId) -> Result<(), Error> {
-    let (manifest, started) = {
-        let peeked = ctx.db.peek().await;
-        let pde = peeked
-            .as_package_data()
-            .as_idx(id)
-            .or_not_found(id)?
-            .expect_as_installed()?;
-
-        let manifest = pde.as_installed().as_manifest().de()?;
-
-        let started = pde.as_installed().as_status().as_main().de()?.started();
-
-        (manifest, started)
-    };
-
-    let health_results = if let Some(started) = started {
-        tracing::debug!("Checking health of {}", id);
-        manifest
-            .health_checks
-            .check_all(ctx, started, id, &manifest.version, &manifest.volumes)
-            .await?
-    } else {
-        return Ok(());
-    };
-
-    ctx.db
-        .mutate(|v| {
-            let pde = v
-                .as_package_data_mut()
-                .as_idx_mut(id)
-                .or_not_found(id)?
-                .expect_as_installed_mut()?;
-            let status = pde.as_installed_mut().as_status_mut().as_main_mut();
-
-            if let MainStatus::Running { health: _, started } = status.de()? {
-                status.ser(&MainStatus::Running {
-                    health: health_results.clone(),
-                    started,
-                })?;
-            }
-            Ok(())
-        })
-        .await
-}
diff --git a/core/startos/src/manager/manager_container.rs b/core/startos/src/manager/manager_container.rs
deleted file mode 100644
index 00937fc5c..000000000
--- a/core/startos/src/manager/manager_container.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use models::OptionExt;
-use tokio::sync::watch;
-use tokio::sync::watch::Sender;
-use tracing::instrument;
-
-use super::start_stop::StartStop;
-use super::{manager_seed, run_main, ManagerPersistentContainer, RunMainResult};
-use crate::prelude::*;
-use crate::procedure::NoOutput;
-use crate::s9pk::manifest::Manifest;
-use crate::status::MainStatus;
-use crate::util::NonDetachingJoinHandle;
-use crate::Error;
-
-pub type ManageContainerOverride = Arc<watch::Sender<Option<Override>>>;
-
-pub type Override = MainStatus;
-
-pub struct OverrideGuard {
-    override_main_status: Option<ManageContainerOverride>,
-}
-impl OverrideGuard {
-    pub fn drop(self) {}
-}
-impl Drop for OverrideGuard {
-    fn drop(&mut self) {
-        if let Some(override_main_status) = self.override_main_status.take() {
-            override_main_status.send_modify(|x| {
-                *x = None;
-            });
-        }
-    }
-}
-
-/// This is the thing describing the state machine actor for a service
-/// state and current running/ desired states.
-pub struct ManageContainer {
-    pub(super) current_state: Arc<watch::Sender<StartStop>>,
-    pub(super) desired_state: Arc<watch::Sender<StartStop>>,
-    _service: NonDetachingJoinHandle<()>,
-    _save_state: NonDetachingJoinHandle<()>,
-    override_main_status: ManageContainerOverride,
-}
-
-impl ManageContainer {
-    pub async fn new(
-        seed: Arc<manager_seed::ManagerSeed>,
-        persistent_container: ManagerPersistentContainer,
-    ) -> Result<Self, Error> {
-        let current_state = Arc::new(watch::channel(StartStop::Stop).0);
-        let desired_state = Arc::new(
-            watch::channel::<StartStop>(
-                get_status(seed.ctx.db.peek().await, &seed.manifest).into(),
-            )
-            .0,
-        );
-        let override_main_status: ManageContainerOverride = Arc::new(watch::channel(None).0);
-        let service = tokio::spawn(create_service_manager(
-            desired_state.clone(),
-            seed.clone(),
-            current_state.clone(),
-            persistent_container,
-        ))
-        .into();
-        let save_state = tokio::spawn(save_state(
-            desired_state.clone(),
-            current_state.clone(),
-            override_main_status.clone(),
-            seed.clone(),
-        ))
-        .into();
-        Ok(ManageContainer {
-            current_state,
-            desired_state,
-            _service: service,
-            override_main_status,
-            _save_state: save_state,
-        })
-    }
-
-    /// Set override is used during something like a restart of a service. We want to show certain statuses be different
-    /// from the actual status of the service.
-    pub fn set_override(&self, override_status: Override) -> Result<OverrideGuard, Error> {
-        let status = Some(override_status);
-        if self.override_main_status.borrow().is_some() {
-            return Err(Error::new(
-                eyre!("Already have an override"),
-                ErrorKind::InvalidRequest,
-            ));
-        }
-        self.override_main_status
-            .send_modify(|x| *x = status.clone());
-        Ok(OverrideGuard {
-            override_main_status: Some(self.override_main_status.clone()),
-        })
-    }
-
-    /// Set the override, but don't have a guard to revert it. Used only on the mananger to do a shutdown.
-    pub(super) async fn lock_state_forever(
-        &self,
-        seed: &manager_seed::ManagerSeed,
-    ) -> Result<(), Error> {
-        let current_state = get_status(seed.ctx.db.peek().await, &seed.manifest);
-        self.override_main_status
-            .send_modify(|x| *x = Some(current_state));
-        Ok(())
-    }
-
-    /// We want to set the state of the service, like to start or stop
-    pub fn to_desired(&self, new_state: StartStop) {
-        self.desired_state.send_modify(|x| *x = new_state);
-    }
-
-    /// This is a tool to say wait for the service to be in a certain state.
-    pub async fn wait_for_desired(&self, new_state: StartStop) {
-        let mut current_state = self.current_state();
-        self.to_desired(new_state);
-        while *current_state.borrow() != new_state {
-            current_state.changed().await.unwrap_or_default();
-        }
-    }
-
-    /// Getter
-    pub fn current_state(&self) -> watch::Receiver<StartStop> {
-        self.current_state.subscribe()
-    }
-
-    /// Getter
-    pub fn desired_state(&self) -> watch::Receiver<StartStop> {
-        self.desired_state.subscribe()
-    }
-}
-
-async fn create_service_manager(
-    desired_state: Arc<Sender<StartStop>>,
-    seed: Arc<manager_seed::ManagerSeed>,
-    current_state: Arc<Sender<StartStop>>,
-    persistent_container: Arc<super::persistent_container::PersistentContainer>,
-) {
-    let mut desired_state_receiver = desired_state.subscribe();
-    let mut running_service: Option<NonDetachingJoinHandle<()>> = None;
-    let seed = seed.clone();
-    loop {
-        let current: StartStop = *current_state.borrow();
-        let desired: StartStop = *desired_state_receiver.borrow();
-        match (current, desired) {
-            (StartStop::Start, StartStop::Start) => (),
-            (StartStop::Start, StartStop::Stop) => {
-                if let Err(err) = seed.stop_container().await {
-                    tracing::error!("Could not stop container");
-                    tracing::debug!("{:?}", err)
-                }
-                running_service = None;
-
-                current_state.send_modify(|x| *x = StartStop::Stop);
-            }
-            (StartStop::Stop, StartStop::Start) => starting_service(
-                current_state.clone(),
-                desired_state.clone(),
-                seed.clone(),
-                persistent_container.clone(),
-                &mut running_service,
-            ),
-            (StartStop::Stop, StartStop::Stop) => (),
-        }
-
-        if desired_state_receiver.changed().await.is_err() {
-            tracing::error!("Desired state error");
-            break;
-        }
-    }
-}
-
-async fn save_state(
-    desired_state: Arc<Sender<StartStop>>,
-    current_state: Arc<Sender<StartStop>>,
-    override_main_status: ManageContainerOverride,
-    seed: Arc<manager_seed::ManagerSeed>,
-) {
-    let mut desired_state_receiver = desired_state.subscribe();
-    let mut current_state_receiver = current_state.subscribe();
-    let mut override_main_status_receiver = override_main_status.subscribe();
-    loop {
-        let current: StartStop = *current_state_receiver.borrow();
-        let desired: StartStop = *desired_state_receiver.borrow();
-        let override_status = override_main_status_receiver.borrow().clone();
-        let status = match (override_status.clone(), current, desired) {
-            (Some(status), _, _) => status,
-            (_, StartStop::Start, StartStop::Start) => MainStatus::Running {
-                started: chrono::Utc::now(),
-                health: Default::default(),
-            },
-            (_, StartStop::Start, StartStop::Stop) => MainStatus::Stopping,
-            (_, StartStop::Stop, StartStop::Start) => MainStatus::Starting,
-            (_, StartStop::Stop, StartStop::Stop) => MainStatus::Stopped,
-        };
-
-        let manifest = &seed.manifest;
-        if let Err(err) = seed
-            .ctx
-            .db
-            .mutate(|db| set_status(db, manifest, &status))
-            .await
-        {
-            tracing::error!("Did not set status for {}", seed.container_name);
-            tracing::debug!("{:?}", err);
-        }
-        tokio::select! {
-            _ = desired_state_receiver.changed() =>{},
-            _ = current_state_receiver.changed() => {},
-            _ = override_main_status_receiver.changed() => {}
-        }
-    }
-}
-
-fn starting_service(
-    current_state: Arc<Sender<StartStop>>,
-    desired_state: Arc<Sender<StartStop>>,
-    seed: Arc<manager_seed::ManagerSeed>,
-    persistent_container: ManagerPersistentContainer,
-    running_service: &mut Option<NonDetachingJoinHandle<()>>,
-) {
-    let set_stopped = { move || current_state.send_modify(|x| *x = StartStop::Stop) };
-    let running_main_loop = async move {
-        while desired_state.borrow().is_start() {
-            let result = persistent_container
-                .execute(models::ProcedureName::Main, Value::Null, None)
-                .await;
-
-            run_main(seed.clone()).await;
-            set_stopped();
-            run_main_log_result(result, seed.clone()).await;
-        }
-    };
-    *running_service = Some(tokio::spawn(running_main_loop).into());
-}
-
-async fn run_main_log_result(result: RunMainResult, seed: Arc<manager_seed::ManagerSeed>) {
-    match result {
-        Ok(Ok(NoOutput)) => (), // restart
-        Ok(Err(e)) => {
-            tracing::error!(
-                "The service {} has crashed with the following exit code: {}",
-                seed.manifest.id.clone(),
-                e.0
-            );
-
-            tokio::time::sleep(Duration::from_secs(15)).await;
-        }
-        Err(e) => {
-            tracing::error!("failed to start service: {}", e);
-            tracing::debug!("{:?}", e);
-        }
-    }
-}
-
-/// Used only in the mod where we are doing a backup
-#[instrument(skip(db, manifest))]
-pub(super) fn get_status(db: Peeked, manifest: &Manifest) -> MainStatus {
-    db.as_package_data()
-        .as_idx(&manifest.id)
-        .and_then(|x| x.as_installed())
-        .filter(|x| x.as_manifest().as_version().de().ok() == Some(manifest.version.clone()))
-        .and_then(|x| x.as_status().as_main().de().ok())
-        .unwrap_or(MainStatus::Stopped)
-}
-
-#[instrument(skip(db, manifest))]
-fn set_status(db: &mut Peeked, manifest: &Manifest, main_status: &MainStatus) -> Result<(), Error> {
-    let Some(installed) = db
-        .as_package_data_mut()
-        .as_idx_mut(&manifest.id)
-        .or_not_found(&manifest.id)?
-        .as_installed_mut()
-    else {
-        return Ok(());
-    };
-    installed.as_status_mut().as_main_mut().ser(main_status)
-}
diff --git a/core/startos/src/manager/manager_map.rs b/core/startos/src/manager/manager_map.rs
deleted file mode 100644
index 07f128ccd..000000000
--- a/core/startos/src/manager/manager_map.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::collections::BTreeMap;
-use std::sync::Arc;
-
-use color_eyre::eyre::eyre;
-use tokio::sync::RwLock;
-use tracing::instrument;
-
-use super::Manager;
-use crate::context::RpcContext;
-use crate::prelude::*;
-use crate::s9pk::manifest::{Manifest, PackageId};
-use crate::util::Version;
-use crate::Error;
-
-/// This is the structure to contain all the service managers
-#[derive(Default)]
-pub struct ManagerMap(RwLock<BTreeMap<(PackageId, Version), Arc<Manager>>>);
-impl ManagerMap {
-    #[instrument(skip_all)]
-    pub async fn init(&self, ctx: RpcContext, peeked: Peeked) -> Result<(), Error> {
-        let mut res = BTreeMap::new();
-        for package in peeked.as_package_data().keys()? {
-            let man: Manifest = if let Some(manifest) = peeked
-                .as_package_data()
-                .as_idx(&package)
-                .and_then(|x| x.as_installed())
-                .map(|x| x.as_manifest().de())
-            {
-                manifest?
-            } else {
-                continue;
-            };
-
-            res.insert(
-                (package, man.version.clone()),
-                Arc::new(Manager::new(ctx.clone(), man).await?),
-            );
-        }
-        *self.0.write().await = res;
-        Ok(())
-    }
-
-    /// Used during the install process
-    #[instrument(skip_all)]
-    pub async fn add(&self, ctx: RpcContext, manifest: Manifest) -> Result<Arc<Manager>, Error> {
-        let mut lock = self.0.write().await;
-        let id = (manifest.id.clone(), manifest.version.clone());
-        if let Some(man) = lock.remove(&id) {
-            man.exit().await;
-        }
-        let manager = Arc::new(Manager::new(ctx.clone(), manifest).await?);
-        lock.insert(id, manager.clone());
-        Ok(manager)
-    }
-
-    /// This is ran during the cleanup, so when we are uninstalling the service
-    #[instrument(skip_all)]
-    pub async fn remove(&self, id: &(PackageId, Version)) {
-        if let Some(man) = self.0.write().await.remove(id) {
-            man.exit().await;
-        }
-    }
-
-    /// Used during a shutdown
-    #[instrument(skip_all)]
-    pub async fn empty(&self) -> Result<(), Error> {
-        let res =
-            futures::future::join_all(std::mem::take(&mut *self.0.write().await).into_iter().map(
-                |((id, version), man)| async move {
-                    tracing::debug!("Manager for {}@{} shutting down", id, version);
-                    man.shutdown().await?;
-                    tracing::debug!("Manager for {}@{} is shutdown", id, version);
-                    if let Err(e) = Arc::try_unwrap(man) {
-                        tracing::trace!(
-                            "Manager for {}@{} still has {} other open references",
-                            id,
-                            version,
-                            Arc::strong_count(&e) - 1
-                        );
-                    }
-                    Ok::<_, Error>(())
-                },
-            ))
-            .await;
-        res.into_iter().fold(Ok(()), |res, x| match (res, x) {
-            (Ok(()), x) => x,
-            (Err(e), Ok(())) => Err(e),
-            (Err(e1), Err(e2)) => Err(Error::new(eyre!("{}, {}", e1.source, e2.source), e1.kind)),
-        })
-    }
-
-    #[instrument(skip_all)]
-    pub async fn get(&self, id: &(PackageId, Version)) -> Option<Arc<Manager>> {
-        self.0.read().await.get(id).cloned()
-    }
-}
diff --git a/core/startos/src/manager/manager_seed.rs b/core/startos/src/manager/manager_seed.rs
deleted file mode 100644
index f90e7739f..000000000
--- a/core/startos/src/manager/manager_seed.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use models::ErrorKind;
-
-use crate::context::RpcContext;
-use crate::procedure::docker::DockerProcedure;
-use crate::procedure::PackageProcedure;
-use crate::s9pk::manifest::Manifest;
-use crate::util::docker::stop_container;
-use crate::Error;
-
-/// This is helper structure for a service, the seed of the data that is needed for the manager_container
-pub struct ManagerSeed {
-    pub ctx: RpcContext,
-    pub manifest: Manifest,
-    pub container_name: String,
-}
-
-impl ManagerSeed {
-    pub async fn stop_container(&self) -> Result<(), Error> {
-        match stop_container(
-            &self.container_name,
-            match &self.manifest.main {
-                PackageProcedure::Docker(DockerProcedure {
-                    sigterm_timeout: Some(sigterm_timeout),
-                    ..
-                }) => Some(**sigterm_timeout),
-                _ => None,
-            },
-            None,
-        )
-        .await
-        {
-            Err(e) if e.kind == ErrorKind::NotFound => (), // Already stopped
-            a => a?,
-        }
-        Ok(())
-    }
-}
diff --git a/core/startos/src/manager/mod.rs b/core/startos/src/manager/mod.rs
deleted file mode 100644
index 817b76e54..000000000
--- a/core/startos/src/manager/mod.rs
+++ /dev/null
@@ -1,854 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::net::Ipv4Addr;
-use std::sync::Arc;
-use std::task::Poll;
-use std::time::Duration;
-
-use color_eyre::eyre::eyre;
-use container_init::ProcessGroupId;
-use futures::future::BoxFuture;
-use futures::{Future, FutureExt, TryFutureExt};
-use helpers::UnixRpcClient;
-use models::{ErrorKind, OptionExt, PackageId};
-use nix::sys::signal::Signal;
-use persistent_container::PersistentContainer;
-use rand::SeedableRng;
-use serde::de::DeserializeOwned;
-use sqlx::Connection;
-use start_stop::StartStop;
-use tokio::sync::watch::{self, Sender};
-use tokio::sync::{oneshot, Mutex};
-use tracing::instrument;
-use transition_state::TransitionState;
-
-use crate::backup::target::PackageBackupInfo;
-use crate::backup::PackageBackupReport;
-use crate::config::action::ConfigRes;
-use crate::config::spec::ValueSpecPointer;
-use crate::config::ConfigureContext;
-use crate::context::RpcContext;
-use crate::db::model::{CurrentDependencies, CurrentDependencyInfo};
-use crate::dependencies::{
-    add_dependent_to_current_dependents_lists, compute_dependency_config_errs,
-};
-use crate::disk::mount::backup::BackupMountGuard;
-use crate::disk::mount::guard::TmpMountGuard;
-use crate::install::cleanup::remove_from_current_dependents_lists;
-use crate::net::net_controller::NetService;
-use crate::net::vhost::AlpnInfo;
-use crate::prelude::*;
-use crate::procedure::docker::{DockerContainer, DockerProcedure, LongRunning};
-use crate::procedure::{NoOutput, ProcedureName};
-use crate::s9pk::manifest::Manifest;
-use crate::status::MainStatus;
-use crate::util::docker::get_container_ip;
-use crate::util::NonDetachingJoinHandle;
-use crate::volume::Volume;
-use crate::Error;
-
-pub mod health;
-mod manager_container;
-mod manager_map;
-pub mod manager_seed;
-mod persistent_container;
-mod start_stop;
-mod transition_state;
-
-pub use manager_map::ManagerMap;
-
-use self::manager_container::{get_status, ManageContainer};
-use self::manager_seed::ManagerSeed;
-
-pub const HEALTH_CHECK_COOLDOWN_SECONDS: u64 = 15;
-pub const HEALTH_CHECK_GRACE_PERIOD_SECONDS: u64 = 5;
-
-type ManagerPersistentContainer = Arc<PersistentContainer>;
-type BackupGuard = Arc<Mutex<BackupMountGuard<TmpMountGuard>>>;
-pub enum BackupReturn {
-    Error(Error),
-    AlreadyRunning(PackageBackupReport),
-    Ran {
-        report: PackageBackupReport,
-        res: Result<PackageBackupInfo, Error>,
-    },
-}
-
-pub struct Gid {
-    next_gid: (watch::Sender<u32>, watch::Receiver<u32>),
-    main_gid: (
-        watch::Sender<ProcessGroupId>,
-        watch::Receiver<ProcessGroupId>,
-    ),
-}
-
-impl Default for Gid {
-    fn default() -> Self {
-        Self {
-            next_gid: watch::channel(1),
-            main_gid: watch::channel(ProcessGroupId(1)),
-        }
-    }
-}
-impl Gid {
-    pub fn new_gid(&self) -> ProcessGroupId {
-        let mut previous = 0;
-        self.next_gid.0.send_modify(|x| {
-            previous = *x;
-            *x = previous + 1;
-        });
-        ProcessGroupId(previous)
-    }
-
-    pub fn new_main_gid(&self) -> ProcessGroupId {
-        let gid = self.new_gid();
-        self.main_gid.0.send(gid).unwrap_or_default();
-        gid
-    }
-}
-
-/// This is the controller of the services. Here is where we can control a service with a start, stop, restart, etc.
-#[derive(Clone)]
-pub struct Manager {
-    seed: Arc<ManagerSeed>,
-
-    manage_container: Arc<manager_container::ManageContainer>,
-    transition: Arc<watch::Sender<TransitionState>>,
-    persistent_container: ManagerPersistentContainer,
-
-    pub gid: Arc<Gid>,
-}
-impl Manager {
-    pub async fn new(ctx: RpcContext, manifest: Manifest) -> Result<Self, Error> {
-        let seed = Arc::new(ManagerSeed {
-            ctx,
-            container_name: DockerProcedure::container_name(&manifest.id, None),
-            manifest,
-        });
-
-        let persistent_container = Arc::new(PersistentContainer::init(&seed).await?);
-        let manage_container = Arc::new(
-            manager_container::ManageContainer::new(seed.clone(), persistent_container.clone())
-                .await?,
-        );
-        let (transition, _) = watch::channel(Default::default());
-        let transition = Arc::new(transition);
-        Ok(Self {
-            seed,
-            manage_container,
-            transition,
-            persistent_container,
-            gid: Default::default(),
-        })
-    }
-
-    /// awaiting this does not wait for the start to complete
-    pub async fn start(&self) {
-        if self._is_transition_restart() {
-            return;
-        }
-        self._transition_abort().await;
-        self.manage_container.to_desired(StartStop::Start);
-    }
-
-    /// awaiting this does not wait for the stop to complete
-    pub async fn stop(&self) {
-        self._transition_abort().await;
-        self.manage_container.to_desired(StartStop::Stop);
-    }
-    /// awaiting this does not wait for the restart to complete
-    pub async fn restart(&self) {
-        if self._is_transition_restart()
-            && *self.manage_container.desired_state().borrow() == StartStop::Stop
-        {
-            return;
-        }
-        if self.manage_container.desired_state().borrow().is_start() {
-            self._transition_replace(self._transition_restart()).await;
-        }
-    }
-    /// awaiting this does not wait for the restart to complete
-    pub async fn configure(
-        &self,
-        configure_context: ConfigureContext,
-    ) -> Result<BTreeMap<PackageId, String>, Error> {
-        if self._is_transition_restart() {
-            self._transition_abort().await;
-        } else if self._is_transition_backup() {
-            return Err(Error::new(
-                eyre!("Can't configure because service is backing up"),
-                ErrorKind::InvalidRequest,
-            ));
-        }
-        let context = self.seed.ctx.clone();
-        let id = self.seed.manifest.id.clone();
-
-        let breakages = configure(context, id, configure_context).await?;
-
-        self.restart().await;
-
-        Ok(breakages)
-    }
-
-    /// awaiting this does not wait for the backup to complete
-    pub async fn backup(&self, backup_guard: BackupGuard) -> BackupReturn {
-        if self._is_transition_backup() {
-            return BackupReturn::AlreadyRunning(PackageBackupReport {
-                error: Some("Can't do backup because service is already backing up".to_owned()),
-            });
-        }
-        let (transition_state, done) = self._transition_backup(backup_guard);
-        self._transition_replace(transition_state).await;
-        done.await
-    }
-    pub async fn exit(&self) {
-        self._transition_abort().await;
-        self.manage_container
-            .wait_for_desired(StartStop::Stop)
-            .await;
-    }
-
-    /// A special exit that is overridden the start state, should only be called in the shutdown, where we remove other containers
-    async fn shutdown(&self) -> Result<(), Error> {
-        self.manage_container.lock_state_forever(&self.seed).await?;
-
-        self.exit().await;
-        Ok(())
-    }
-
-    /// Used when we want to shutdown the service
-    pub async fn signal(&self, signal: Signal) -> Result<(), Error> {
-        let gid = self.gid.clone();
-        send_signal(self, gid, signal).await
-    }
-
-    /// Used as a getter, but also used in procedure
-    pub fn rpc_client(&self) -> Arc<UnixRpcClient> {
-        self.persistent_container.rpc_client()
-    }
-
-    async fn _transition_abort(&self) {
-        self.transition
-            .send_replace(Default::default())
-            .abort()
-            .await;
-    }
-    async fn _transition_replace(&self, transition_state: TransitionState) {
-        self.transition.send_replace(transition_state).abort().await;
-    }
-
-    pub(super) fn perform_restart(&self) -> impl Future<Output = Result<(), Error>> + 'static {
-        let manage_container = self.manage_container.clone();
-        async move {
-            let restart_override = manage_container.set_override(MainStatus::Restarting)?;
-            manage_container.wait_for_desired(StartStop::Stop).await;
-            manage_container.wait_for_desired(StartStop::Start).await;
-            restart_override.drop();
-            Ok(())
-        }
-    }
-    fn _transition_restart(&self) -> TransitionState {
-        let transition = self.transition.clone();
-        let restart = self.perform_restart();
-        TransitionState::Restarting(
-            tokio::spawn(async move {
-                if let Err(err) = restart.await {
-                    tracing::error!("Error restarting service: {}", err);
-                }
-                transition.send_replace(Default::default());
-            })
-            .into(),
-        )
-    }
-    fn perform_backup(
-        &self,
-        backup_guard: BackupGuard,
-    ) -> impl Future<Output = Result<Result<PackageBackupInfo, Error>, Error>> {
-        let manage_container = self.manage_container.clone();
-        let seed = self.seed.clone();
-        async move {
-            let peek = seed.ctx.db.peek().await;
-            let state_reverter = DesiredStateReverter::new(manage_container.clone());
-            let override_guard =
-                manage_container.set_override(get_status(peek, &seed.manifest).backing_up())?;
-            manage_container.wait_for_desired(StartStop::Stop).await;
-            let backup_guard = backup_guard.lock().await;
-            let guard = backup_guard.mount_package_backup(&seed.manifest.id).await?;
-
-            let return_value = seed.manifest.backup.create(seed.clone()).await;
-            guard.unmount().await?;
-            drop(backup_guard);
-
-            let manifest_id = seed.manifest.id.clone();
-            seed.ctx
-                .db
-                .mutate(|db| {
-                    if let Some(progress) = db
-                        .as_server_info_mut()
-                        .as_status_info_mut()
-                        .as_backup_progress_mut()
-                        .transpose_mut()
-                        .and_then(|p| p.as_idx_mut(&manifest_id))
-                    {
-                        progress.as_complete_mut().ser(&true)?;
-                    }
-                    Ok(())
-                })
-                .await?;
-
-            state_reverter.revert().await;
-
-            override_guard.drop();
-            Ok::<_, Error>(return_value)
-        }
-    }
-    fn _transition_backup(
-        &self,
-        backup_guard: BackupGuard,
-    ) -> (TransitionState, BoxFuture<BackupReturn>) {
-        let (send, done) = oneshot::channel();
-
-        let transition_state = self.transition.clone();
-        (
-            TransitionState::BackingUp(
-                tokio::spawn(
-                    self.perform_backup(backup_guard)
-                        .then(finish_up_backup_task(transition_state, send)),
-                )
-                .into(),
-            ),
-            done.map_err(|err| Error::new(eyre!("Oneshot error: {err:?}"), ErrorKind::Unknown))
-                .map(flatten_backup_error)
-                .boxed(),
-        )
-    }
-    fn _is_transition_restart(&self) -> bool {
-        let transition = self.transition.borrow();
-        matches!(*transition, TransitionState::Restarting(_))
-    }
-    fn _is_transition_backup(&self) -> bool {
-        let transition = self.transition.borrow();
-        matches!(*transition, TransitionState::BackingUp(_))
-    }
-
-    pub async fn execute<O>(
-        &self,
-        name: ProcedureName,
-        input: Value,
-        timeout: Option<Duration>,
-    ) -> Result<Result<O, (i32, String)>, Error>
-    where
-        O: DeserializeOwned,
-    {
-        self.persistent_container
-            .execute(name, input, timeout)
-            .await
-    }
-
-    pub async fn sanboxed<O>(
-        &self,
-        name: ProcedureName,
-        input: Value,
-        timeout: Option<Duration>,
-    ) -> Result<Result<O, (i32, String)>, Error>
-    where
-        O: DeserializeOwned,
-    {
-        self.persistent_container
-            .sanboxed(name, input, timeout)
-            .await
-    }
-
-    pub async fn send_signal(&self, gid: Arc<Gid>, signal: Signal) -> Result<(), Error> {
-        self.persistent_container.send_signal(gid, signal).await
-    }
-}
-
-#[instrument(skip_all)]
-async fn configure(
-    ctx: RpcContext,
-    id: PackageId,
-    mut configure_context: ConfigureContext,
-) -> Result<BTreeMap<PackageId, String>, Error> {
-    let db = ctx.db.peek().await;
-    let id = &id;
-    let ctx = &ctx;
-    let overrides = &mut configure_context.overrides;
-    // fetch data from db
-    let manifest = db
-        .as_package_data()
-        .as_idx(id)
-        .or_not_found(id)?
-        .as_manifest()
-        .de()?;
-
-    // get current config and current spec
-    let ConfigRes {
-        config: old_config,
-        spec,
-    } = manifest
-        .config
-        .as_ref()
-        .or_not_found("Manifest config")?
-        .get(ctx, id, &manifest.version, &manifest.volumes)
-        .await?;
-
-    // determine new config to use
-    let mut config = if let Some(config) = configure_context.config.or_else(|| old_config.clone()) {
-        config
-    } else {
-        spec.gen(
-            &mut rand::rngs::StdRng::from_entropy(),
-            &configure_context.timeout,
-        )?
-    };
-
-    spec.validate(&manifest)?;
-    spec.matches(&config)?; // check that new config matches spec
-
-    // TODO Commit or not?
-    spec.update(ctx, &manifest, overrides, &mut config).await?; // dereference pointers in the new config
-
-    let manifest = db
-        .as_package_data()
-        .as_idx(id)
-        .or_not_found(id)?
-        .as_installed()
-        .or_not_found(id)?
-        .as_manifest()
-        .de()?;
-
-    let dependencies = &manifest.dependencies;
-    let mut current_dependencies: CurrentDependencies = CurrentDependencies(
-        dependencies
-            .0
-            .iter()
-            .filter_map(|(id, info)| {
-                if info.requirement.required() {
-                    Some((id.clone(), CurrentDependencyInfo::default()))
-                } else {
-                    None
-                }
-            })
-            .collect(),
-    );
-    for ptr in spec.pointers(&config)? {
-        match ptr {
-            ValueSpecPointer::Package(pkg_ptr) => {
-                if let Some(info) = current_dependencies.0.get_mut(pkg_ptr.package_id()) {
-                    info.pointers.insert(pkg_ptr);
-                } else {
-                    let id = pkg_ptr.package_id().to_owned();
-                    let mut pointers = BTreeSet::new();
-                    pointers.insert(pkg_ptr);
-                    current_dependencies.0.insert(
-                        id,
-                        CurrentDependencyInfo {
-                            pointers,
-                            health_checks: BTreeSet::new(),
-                        },
-                    );
-                }
-            }
-            ValueSpecPointer::System(_) => (),
-        }
-    }
-
-    let action = manifest.config.as_ref().or_not_found(id)?;
-    let version = &manifest.version;
-    let volumes = &manifest.volumes;
-    if !configure_context.dry_run {
-        // run config action
-        let res = action
-            .set(ctx, id, version, dependencies, volumes, &config)
-            .await?;
-
-        // track dependencies with no pointers
-        for (package_id, health_checks) in res.depends_on.into_iter() {
-            if let Some(current_dependency) = current_dependencies.0.get_mut(&package_id) {
-                current_dependency.health_checks.extend(health_checks);
-            } else {
-                current_dependencies.0.insert(
-                    package_id,
-                    CurrentDependencyInfo {
-                        pointers: BTreeSet::new(),
-                        health_checks,
-                    },
-                );
-            }
-        }
-
-        // track dependency health checks
-        current_dependencies = current_dependencies.map(|x| {
-            x.into_iter()
-                .filter(|(dep_id, _)| {
-                    if dep_id != id && !manifest.dependencies.0.contains_key(dep_id) {
-                        tracing::warn!("Illegal dependency specified: {}", dep_id);
-                        false
-                    } else {
-                        true
-                    }
-                })
-                .collect()
-        });
-    }
-
-    let dependency_config_errs =
-        compute_dependency_config_errs(ctx, &db, &manifest, &current_dependencies, overrides)
-            .await?;
-
-    // cache current config for dependents
-    configure_context
-        .overrides
-        .insert(id.clone(), config.clone());
-
-    // handle dependents
-
-    let dependents = db
-        .as_package_data()
-        .as_idx(id)
-        .or_not_found(id)?
-        .as_installed()
-        .or_not_found(id)?
-        .as_current_dependents()
-        .de()?;
-    for (dependent, _dep_info) in dependents.0.iter().filter(|(dep_id, _)| dep_id != &id) {
-        // check if config passes dependent check
-        if let Some(cfg) = db
-            .as_package_data()
-            .as_idx(dependent)
-            .or_not_found(dependent)?
-            .as_installed()
-            .or_not_found(dependent)?
-            .as_manifest()
-            .as_dependencies()
-            .as_idx(id)
-            .or_not_found(id)?
-            .as_config()
-            .de()?
-        {
-            let manifest = db
-                .as_package_data()
-                .as_idx(dependent)
-                .or_not_found(dependent)?
-                .as_installed()
-                .or_not_found(dependent)?
-                .as_manifest()
-                .de()?;
-            if let Err(error) = cfg
-                .check(
-                    ctx,
-                    dependent,
-                    &manifest.version,
-                    &manifest.volumes,
-                    id,
-                    &config,
-                )
-                .await?
-            {
-                configure_context.breakages.insert(dependent.clone(), error);
-            }
-        }
-    }
-
-    if !configure_context.dry_run {
-        return ctx
-            .db
-            .mutate(move |db| {
-                remove_from_current_dependents_lists(db, id, &current_dependencies)?;
-                add_dependent_to_current_dependents_lists(db, id, &current_dependencies)?;
-                current_dependencies.0.remove(id);
-                for (dep, errs) in db
-                    .as_package_data_mut()
-                    .as_entries_mut()?
-                    .into_iter()
-                    .filter_map(|(id, pde)| {
-                        pde.as_installed_mut()
-                            .map(|i| (id, i.as_status_mut().as_dependency_config_errors_mut()))
-                    })
-                {
-                    errs.remove(id)?;
-                    if let Some(err) = configure_context.breakages.get(&dep) {
-                        errs.insert(id, err)?;
-                    }
-                }
-                let installed = db
-                    .as_package_data_mut()
-                    .as_idx_mut(id)
-                    .or_not_found(id)?
-                    .as_installed_mut()
-                    .or_not_found(id)?;
-                installed
-                    .as_current_dependencies_mut()
-                    .ser(&current_dependencies)?;
-                let status = installed.as_status_mut();
-                status.as_configured_mut().ser(&true)?;
-                status
-                    .as_dependency_config_errors_mut()
-                    .ser(&dependency_config_errs)?;
-                Ok(configure_context.breakages)
-            })
-            .await; // add new
-    }
-
-    Ok(configure_context.breakages)
-}
-
-struct DesiredStateReverter {
-    manage_container: Option<Arc<ManageContainer>>,
-    starting_state: StartStop,
-}
-impl DesiredStateReverter {
-    fn new(manage_container: Arc<ManageContainer>) -> Self {
-        let starting_state = *manage_container.desired_state().borrow();
-        let manage_container = Some(manage_container);
-        Self {
-            starting_state,
-            manage_container,
-        }
-    }
-    async fn revert(mut self) {
-        if let Some(mut current_state) = self._revert() {
-            while *current_state.borrow() != self.starting_state {
-                current_state.changed().await.unwrap();
-            }
-        }
-    }
-    fn _revert(&mut self) -> Option<watch::Receiver<StartStop>> {
-        if let Some(manage_container) = self.manage_container.take() {
-            manage_container.to_desired(self.starting_state);
-
-            return Some(manage_container.desired_state());
-        }
-        None
-    }
-}
-impl Drop for DesiredStateReverter {
-    fn drop(&mut self) {
-        self._revert();
-    }
-}
-
-type BackupDoneSender = oneshot::Sender<Result<PackageBackupInfo, Error>>;
-
-fn finish_up_backup_task(
-    transition: Arc<Sender<TransitionState>>,
-    send: BackupDoneSender,
-) -> impl FnOnce(Result<Result<PackageBackupInfo, Error>, Error>) -> BoxFuture<'static, ()> {
-    move |result| {
-        async move {
-            transition.send_replace(Default::default());
-            send.send(match result {
-                Ok(a) => a,
-                Err(e) => Err(e),
-            })
-            .unwrap_or_default();
-        }
-        .boxed()
-    }
-}
-
-fn response_to_report(response: &Result<PackageBackupInfo, Error>) -> PackageBackupReport {
-    PackageBackupReport {
-        error: response.as_ref().err().map(|e| e.to_string()),
-    }
-}
-fn flatten_backup_error(input: Result<Result<PackageBackupInfo, Error>, Error>) -> BackupReturn {
-    match input {
-        Ok(a) => BackupReturn::Ran {
-            report: response_to_report(&a),
-            res: a,
-        },
-        Err(err) => BackupReturn::Error(err),
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum Status {
-    Starting,
-    Running,
-    Stopped,
-    Paused,
-    Shutdown,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub enum OnStop {
-    Restart,
-    Sleep,
-    Exit,
-}
-
-type RunMainResult = Result<Result<NoOutput, (i32, String)>, Error>;
-
-#[instrument(skip_all)]
-async fn run_main(seed: Arc<ManagerSeed>) -> RunMainResult {
-    let runtime = NonDetachingJoinHandle::from(tokio::spawn(execute_main(seed.clone())));
-
-    let health = main_health_check_daemon(seed.clone());
-    let res = tokio::select! {
-        a = runtime => a.map_err(|_| Error::new(eyre!("Manager runtime panicked!"), crate::ErrorKind::Docker)).and_then(|a| a),
-        _ = health => Err(Error::new(eyre!("Health check daemon exited!"), crate::ErrorKind::Unknown))
-    };
-    res
-}
-
-/// We want to start up the manifest, but in this case we want to know that we have generated the certificates.
-/// Note for _generated_certificate: Needed to know that before we start the state we have generated the certificate
-async fn execute_main(seed: Arc<ManagerSeed>) -> Result<Result<NoOutput, (i32, String)>, Error> {
-    seed.manifest
-        .main
-        .execute::<(), NoOutput>(
-            &seed.ctx,
-            &seed.manifest.id,
-            &seed.manifest.version,
-            ProcedureName::Main,
-            &seed.manifest.volumes,
-            None,
-            None,
-        )
-        .await
-}
-
-async fn long_running_docker(
-    seed: &ManagerSeed,
-    container: &DockerContainer,
-) -> Result<(LongRunning, UnixRpcClient), Error> {
-    container
-        .long_running_execute(
-            &seed.ctx,
-            &seed.manifest.id,
-            &seed.manifest.version,
-            &seed.manifest.volumes,
-        )
-        .await
-}
-
-enum GetRunningIp {
-    Ip(Ipv4Addr),
-    Error(Error),
-    EarlyExit(Result<NoOutput, (i32, String)>),
-}
-
-async fn get_long_running_ip(seed: &ManagerSeed, runtime: &mut LongRunning) -> GetRunningIp {
-    loop {
-        match get_container_ip(&seed.container_name).await {
-            Ok(Some(ip_addr)) => return GetRunningIp::Ip(ip_addr),
-            Ok(None) => (),
-            Err(e) if e.kind == ErrorKind::NotFound => (),
-            Err(e) => return GetRunningIp::Error(e),
-        }
-        if let Poll::Ready(res) = futures::poll!(&mut runtime.running_output) {
-            match res {
-                Ok(_) => return GetRunningIp::EarlyExit(Ok(NoOutput)),
-                Err(_e) => {
-                    return GetRunningIp::Error(Error::new(
-                        eyre!("Manager runtime panicked!"),
-                        crate::ErrorKind::Docker,
-                    ))
-                }
-            }
-        }
-    }
-}
-
-#[instrument(skip(seed))]
-async fn add_network_for_main(
-    seed: &ManagerSeed,
-    ip: std::net::Ipv4Addr,
-) -> Result<NetService, Error> {
-    let mut svc = seed
-        .ctx
-        .net_controller
-        .create_service(seed.manifest.id.clone(), ip)
-        .await?;
-    // DEPRECATED
-    let mut secrets = seed.ctx.secret_store.acquire().await?;
-    let mut tx = secrets.begin().await?;
-    for (id, interface) in &seed.manifest.interfaces.0 {
-        for (external, internal) in interface.lan_config.iter().flatten() {
-            svc.add_lan(
-                tx.as_mut(),
-                id.clone(),
-                external.0,
-                internal.internal,
-                Err(AlpnInfo::Specified(vec![])),
-            )
-            .await?;
-        }
-        for (external, internal) in interface.tor_config.iter().flat_map(|t| &t.port_mapping) {
-            svc.add_tor(tx.as_mut(), id.clone(), external.0, internal.0)
-                .await?;
-        }
-    }
-    for volume in seed.manifest.volumes.values() {
-        if let Volume::Certificate { interface_id } = volume {
-            svc.export_cert(tx.as_mut(), interface_id, ip.into())
-                .await?;
-        }
-    }
-    tx.commit().await?;
-    Ok(svc)
-}
-
-#[instrument(skip(svc))]
-async fn remove_network_for_main(svc: NetService) -> Result<(), Error> {
-    svc.remove_all().await
-}
-
-async fn main_health_check_daemon(seed: Arc<ManagerSeed>) {
-    tokio::time::sleep(Duration::from_secs(HEALTH_CHECK_GRACE_PERIOD_SECONDS)).await;
-    loop {
-        if let Err(e) = health::check(&seed.ctx, &seed.manifest.id).await {
-            tracing::error!(
-                "Failed to run health check for {}: {}",
-                &seed.manifest.id,
-                e
-            );
-            tracing::debug!("{:?}", e);
-        }
-        tokio::time::sleep(Duration::from_secs(HEALTH_CHECK_COOLDOWN_SECONDS)).await;
-    }
-}
-
-type RuntimeOfCommand = NonDetachingJoinHandle<Result<Result<NoOutput, (i32, String)>, Error>>;
-
-#[instrument(skip(seed, runtime))]
-async fn get_running_ip(seed: &ManagerSeed, mut runtime: &mut RuntimeOfCommand) -> GetRunningIp {
-    loop {
-        match get_container_ip(&seed.container_name).await {
-            Ok(Some(ip_addr)) => return GetRunningIp::Ip(ip_addr),
-            Ok(None) => (),
-            Err(e) if e.kind == ErrorKind::NotFound => (),
-            Err(e) => return GetRunningIp::Error(e),
-        }
-        if let Poll::Ready(res) = futures::poll!(&mut runtime) {
-            match res {
-                Ok(Ok(response)) => return GetRunningIp::EarlyExit(response),
-                Err(e) => {
-                    return GetRunningIp::Error(Error::new(
-                        match e.try_into_panic() {
-                            Ok(e) => {
-                                eyre!(
-                                    "Manager runtime panicked: {}",
-                                    e.downcast_ref::<&'static str>().unwrap_or(&"UNKNOWN")
-                                )
-                            }
-                            _ => eyre!("Manager runtime cancelled!"),
-                        },
-                        crate::ErrorKind::Docker,
-                    ))
-                }
-                Ok(Err(e)) => {
-                    return GetRunningIp::Error(Error::new(
-                        eyre!("Manager runtime returned error: {}", e),
-                        crate::ErrorKind::Docker,
-                    ))
-                }
-            }
-        }
-    }
-}
-
-async fn send_signal(manager: &Manager, gid: Arc<Gid>, signal: Signal) -> Result<(), Error> {
-    manager.send_signal(gid, signal).await
-}
diff --git a/core/startos/src/manager/persistent_container.rs b/core/startos/src/manager/persistent_container.rs
deleted file mode 100644
index f71b98646..000000000
--- a/core/startos/src/manager/persistent_container.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use color_eyre::eyre::eyre;
-use helpers::UnixRpcClient;
-use models::ProcedureName;
-use nix::sys::signal::Signal;
-use serde::de::DeserializeOwned;
-use tokio::sync::watch::{self, Receiver};
-use tokio::sync::{oneshot, Mutex};
-use tracing::instrument;
-
-use super::manager_seed::ManagerSeed;
-use super::{
-    add_network_for_main, get_long_running_ip, long_running_docker, remove_network_for_main,
-    GetRunningIp,
-};
-use crate::prelude::*;
-use crate::procedure::docker::DockerContainer;
-use crate::util::NonDetachingJoinHandle;
-
-struct ProcedureId(u64);
-
-// @DRB Need to have a way of starting the the procudures and getting the information back
-// @DRB On top of this we need to also have  the procedures to have the effects and get the results back for them, maybe lock them to the running instance?
-/// Persistant container are the old containers that need to run all the time
-/// The goal is that all services will be persistent containers, waiting to run the main system.
-pub struct PersistentContainer {
-    _running_docker: NonDetachingJoinHandle<()>,
-    // TODO: Drb: Implement to spec https://github.com/Start9Labs/start-sdk/blob/master/lib/types.ts#L223
-    pub rpc_client: Receiver<Arc<UnixRpcClient>>,
-    manager_seed: Arc<ManagerSeed>,
-    procedures: Mutex<Vec<(ProcedureName, ProcedureId)>>,
-}
-
-impl PersistentContainer {
-    #[instrument(skip_all)]
-    pub async fn init(seed: &Arc<ManagerSeed>) -> Result<Self, Error> {
-        Ok(if let Some(containers) = &seed.manifest.containers {
-            let (running_docker, rpc_client) =
-                spawn_persistent_container(seed.clone(), containers.main.clone()).await?;
-            Self {
-                _running_docker: running_docker,
-                rpc_client,
-                manager_seed: seed.clone(),
-                procedures: Default::default(),
-            }
-        } else {
-            todo!("DRB No containers in manifest")
-        })
-    }
-
-    pub fn rpc_client(&self) -> Arc<UnixRpcClient> {
-        self.rpc_client.borrow().clone()
-    }
-
-    pub async fn execute<O>(
-        &self,
-        name: ProcedureName,
-        input: Value,
-        timeout: Option<Duration>,
-    ) -> Result<Result<O, (i32, String)>, Error>
-    where
-        O: DeserializeOwned,
-    {
-        match self._execute(name, input, timeout).await {
-            Ok(Ok(a)) => Ok(Ok(imbl_value::from_value(a).map_err(|e| {
-                Error::new(
-                    eyre!("Error deserializing output: {}", e),
-                    crate::ErrorKind::Deserialization,
-                )
-            })?)),
-            Ok(Err(e)) => Ok(Err(e)),
-            Err(e) => Err(e),
-        }
-    }
-
-    pub async fn sanboxed<O>(
-        &self,
-        name: ProcedureName,
-        input: Value,
-        timeout: Option<Duration>,
-    ) -> Result<Result<O, (i32, String)>, Error>
-    where
-        O: DeserializeOwned,
-    {
-        match self._sandboxed(name, input, timeout).await {
-            Ok(Ok(a)) => Ok(Ok(imbl_value::from_value(a).map_err(|e| {
-                Error::new(
-                    eyre!("Error deserializing output: {}", e),
-                    crate::ErrorKind::Deserialization,
-                )
-            })?)),
-            Ok(Err(e)) => Ok(Err(e)),
-            Err(e) => Err(e),
-        }
-    }
-    async fn _execute(
-        &self,
-        name: ProcedureName,
-        input: Value,
-        timeout: Option<Duration>,
-    ) -> Result<Result<Value, (i32, String)>, Error> {
-        todo!(
-            r#"""
-            DRB
-            Call into the persistant via rpc, start a procedure.
-            Procedure already has access to rpc to call back, maybe an id to track?
-            Should be able to cancel.
-            Note(Main): Only one should be running at a time
-            Note(Main): Has additional effect of setRunning 
-            Note: The input (Option<I>) is not generic because we don't want to clone this fn for each type of input
-            Note: The output is not generic because we don't want to clone this fn for each type of output
-        """#
-        )
-    }
-
-    async fn _sandboxed(
-        &self,
-        name: ProcedureName,
-        input: Value,
-        timeout: Option<Duration>,
-    ) -> Result<Result<Value, (i32, String)>, Error> {
-        todo!("DRB")
-    }
-
-    pub async fn send_signal(&self, gid: Arc<super::Gid>, signal: Signal) -> Result<(), Error> {
-        todo!("DRB")
-    }
-}
-
-pub async fn spawn_persistent_container(
-    seed: Arc<ManagerSeed>,
-    container: DockerContainer,
-) -> Result<(NonDetachingJoinHandle<()>, Receiver<Arc<UnixRpcClient>>), Error> {
-    let (send_inserter, inserter) = oneshot::channel();
-    Ok((
-        tokio::task::spawn(async move {
-            let mut inserter_send: Option<watch::Sender<Arc<UnixRpcClient>>> = None;
-            let mut send_inserter: Option<oneshot::Sender<Receiver<Arc<UnixRpcClient>>>> = Some(send_inserter);
-            loop {
-                if let Err(e) = async {
-                    let (mut runtime, inserter) =
-                        long_running_docker(&seed, &container).await?;
-
-
-                    let ip = match get_long_running_ip(&seed, &mut runtime).await {
-                        GetRunningIp::Ip(x) => x,
-                        GetRunningIp::Error(e) => return Err(e),
-                        GetRunningIp::EarlyExit(e) => {
-                            tracing::error!("Early Exit");
-                            tracing::debug!("{:?}", e);
-                            return Ok(());
-                        }
-                    };
-                    let svc = add_network_for_main(&seed, ip).await?;
-
-                    if let Some(inserter_send) = inserter_send.as_mut() {
-                        let _ = inserter_send.send(Arc::new(inserter));
-                    } else {
-                        let (s, r) = watch::channel(Arc::new(inserter));
-                        inserter_send = Some(s);
-                        if let Some(send_inserter) = send_inserter.take() {
-                            let _ = send_inserter.send(r);
-                        }
-                    }
-
-                    let res = tokio::select! {
-                        a = runtime.running_output => a.map_err(|_| Error::new(eyre!("Manager runtime panicked!"), crate::ErrorKind::Docker)).map(|_| ()),
-                    };
-
-                    remove_network_for_main(svc).await?;
-
-                    res
-                }.await {
-                    tracing::error!("Error in persistent container: {}", e);
-                    tracing::debug!("{:?}", e);
-                } else {
-                    break;
-                }
-                tokio::time::sleep(Duration::from_millis(200)).await;
-            }
-        })
-        .into(),
-        inserter.await.map_err(|_| Error::new(eyre!("Container handle dropped before inserter sent"), crate::ErrorKind::Unknown))?,
-    ))
-}
diff --git a/core/startos/src/manager/transition_state.rs b/core/startos/src/manager/transition_state.rs
deleted file mode 100644
index 122c0f703..000000000
--- a/core/startos/src/manager/transition_state.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use helpers::NonDetachingJoinHandle;
-
-/// Used only in the manager/mod and is used to keep track of the state of the manager during the
-/// transitional states
-pub(super) enum TransitionState {
-    BackingUp(NonDetachingJoinHandle<()>),
-    Restarting(NonDetachingJoinHandle<()>),
-    None,
-}
-
-impl TransitionState {
-    pub(super) fn take(&mut self) -> Self {
-        std::mem::take(self)
-    }
-    pub(super) fn into_join_handle(self) -> Option<NonDetachingJoinHandle<()>> {
-        Some(match self {
-            TransitionState::BackingUp(a) => a,
-            TransitionState::Restarting(a) => a,
-            TransitionState::None => return None,
-        })
-    }
-    pub(super) async fn abort(&mut self) {
-        if let Some(s) = self.take().into_join_handle() {
-            if s.wait_for_abort().await.is_ok() {
-                tracing::trace!("transition completed before abort");
-            }
-        }
-    }
-}
-
-impl Default for TransitionState {
-    fn default() -> Self {
-        TransitionState::None
-    }
-}
diff --git a/core/startos/src/middleware/auth.rs b/core/startos/src/middleware/auth.rs
index 611923ad6..9260d7fa2 100644
--- a/core/startos/src/middleware/auth.rs
+++ b/core/startos/src/middleware/auth.rs
@@ -2,32 +2,34 @@ use std::borrow::Borrow;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
+use axum::extract::Request;
+use axum::response::Response;
 use basic_cookies::Cookie;
 use color_eyre::eyre::eyre;
 use digest::Digest;
-use futures::future::BoxFuture;
-use futures::FutureExt;
-use http::StatusCode;
-use rpc_toolkit::command_helpers::prelude::RequestParts;
-use rpc_toolkit::hyper::header::COOKIE;
-use rpc_toolkit::hyper::http::Error as HttpError;
-use rpc_toolkit::hyper::{Body, Request, Response};
-use rpc_toolkit::rpc_server_helpers::{
-    noop4, to_response, DynMiddleware, DynMiddlewareStage2, DynMiddlewareStage3,
-};
-use rpc_toolkit::yajrc::RpcMethod;
-use rpc_toolkit::Metadata;
+use helpers::const_true;
+use http::header::COOKIE;
+use http::HeaderValue;
+use imbl_value::InternedString;
+use rpc_toolkit::yajrc::INTERNAL_ERROR;
+use rpc_toolkit::{Middleware, RpcRequest, RpcResponse};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 use tokio::sync::Mutex;
 
 use crate::context::RpcContext;
-use crate::{Error, ResultExt};
+use crate::prelude::*;
 
 pub const LOCAL_AUTH_COOKIE_PATH: &str = "/run/embassy/rpc.authcookie";
 
+#[derive(Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct LoginRes {
+    pub session: InternedString,
+}
+
 pub trait AsLogoutSessionId {
-    fn as_logout_session_id(self) -> String;
+    fn as_logout_session_id(self) -> InternedString;
 }
 
 /// Will need to know when we have logged out from a route
@@ -43,13 +45,14 @@ impl HasLoggedOutSessions {
         let mut sqlx_conn = ctx.secret_store.acquire().await?;
         for session in logged_out_sessions {
             let session = session.as_logout_session_id();
+            let session = &*session;
             sqlx::query!(
                 "UPDATE session SET logged_out = CURRENT_TIMESTAMP WHERE id = $1",
                 session
             )
             .execute(sqlx_conn.as_mut())
             .await?;
-            for socket in open_authed_websockets.remove(&session).unwrap_or_default() {
+            for socket in open_authed_websockets.remove(session).unwrap_or_default() {
                 let _ = socket.send(());
             }
         }
@@ -58,15 +61,21 @@ impl HasLoggedOutSessions {
 }
 
 /// Used when we need to know that we have logged in with a valid user
-#[derive(Clone, Copy)]
-pub struct HasValidSession(());
+#[derive(Clone)]
+pub struct HasValidSession(SessionType);
+
+#[derive(Clone)]
+enum SessionType {
+    Local,
+    Session(HashSessionToken),
+}
 
 impl HasValidSession {
-    pub async fn from_request_parts(
-        request_parts: &RequestParts,
+    pub async fn from_header(
+        header: Option<&HeaderValue>,
         ctx: &RpcContext,
     ) -> Result<Self, Error> {
-        if let Some(cookie_header) = request_parts.headers.get(COOKIE) {
+        if let Some(cookie_header) = header {
             let cookies = Cookie::parse(
                 cookie_header
                     .to_str()
@@ -79,7 +88,7 @@ impl HasValidSession {
                 }
             }
             if let Some(cookie) = cookies.iter().find(|c| c.get_name() == "session") {
-                if let Ok(s) = Self::from_session(&HashSessionToken::from_cookie(cookie), ctx).await
+                if let Ok(s) = Self::from_session(HashSessionToken::from_cookie(cookie), ctx).await
                 {
                     return Ok(s);
                 }
@@ -91,8 +100,11 @@ impl HasValidSession {
         ))
     }
 
-    pub async fn from_session(session: &HashSessionToken, ctx: &RpcContext) -> Result<Self, Error> {
-        let session_hash = session.hashed();
+    pub async fn from_session(
+        session_token: HashSessionToken,
+        ctx: &RpcContext,
+    ) -> Result<Self, Error> {
+        let session_hash = session_token.hashed();
         let session = sqlx::query!("UPDATE session SET last_active = CURRENT_TIMESTAMP WHERE id = $1 AND logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP", session_hash)
             .execute(ctx.secret_store.acquire().await?.as_mut())
             .await?;
@@ -102,13 +114,13 @@ impl HasValidSession {
                 crate::ErrorKind::Authorization,
             ));
         }
-        Ok(Self(()))
+        Ok(Self(SessionType::Session(session_token)))
     }
 
     pub async fn from_local(local: &Cookie<'_>) -> Result<Self, Error> {
         let token = tokio::fs::read_to_string(LOCAL_AUTH_COOKIE_PATH).await?;
         if local.get_value() == &*token {
-            Ok(Self(()))
+            Ok(Self(SessionType::Local))
         } else {
             Err(Error::new(
                 eyre!("UNAUTHORIZED"),
@@ -122,27 +134,31 @@ impl HasValidSession {
 /// Or when we are using internal valid authenticated service.
 #[derive(Debug, Clone)]
 pub struct HashSessionToken {
-    hashed: String,
-    token: String,
+    hashed: InternedString,
+    token: InternedString,
 }
 impl HashSessionToken {
     pub fn new() -> Self {
-        let token = base32::encode(
-            base32::Alphabet::RFC4648 { padding: false },
-            &rand::random::<[u8; 16]>(),
-        )
-        .to_lowercase();
-        let hashed = Self::hash(&token);
+        Self::from_token(InternedString::intern(
+            base32::encode(
+                base32::Alphabet::RFC4648 { padding: false },
+                &rand::random::<[u8; 16]>(),
+            )
+            .to_lowercase(),
+        ))
+    }
+
+    pub fn from_token(token: InternedString) -> Self {
+        let hashed = Self::hash(&*token);
         Self { hashed, token }
     }
+
     pub fn from_cookie(cookie: &Cookie) -> Self {
-        let token = cookie.get_value().to_owned();
-        let hashed = Self::hash(&token);
-        Self { hashed, token }
+        Self::from_token(InternedString::intern(cookie.get_value()))
     }
 
-    pub fn from_request_parts(request_parts: &RequestParts) -> Result<Self, Error> {
-        if let Some(cookie_header) = request_parts.headers.get(COOKIE) {
+    pub fn from_header(header: Option<&HeaderValue>) -> Result<Self, Error> {
+        if let Some(cookie_header) = header {
             let cookies = Cookie::parse(
                 cookie_header
                     .to_str()
@@ -159,33 +175,30 @@ impl HashSessionToken {
         ))
     }
 
-    pub fn header_value(&self) -> Result<http::HeaderValue, Error> {
-        http::HeaderValue::from_str(&format!(
-            "session={}; Path=/; SameSite=Lax; Expires=Fri, 31 Dec 9999 23:59:59 GMT;",
-            self.token
-        ))
-        .with_kind(crate::ErrorKind::Unknown)
+    pub fn to_login_res(&self) -> LoginRes {
+        LoginRes {
+            session: self.token.clone(),
+        }
     }
 
     pub fn hashed(&self) -> &str {
-        self.hashed.as_str()
+        &*self.hashed
     }
 
-    pub fn as_hash(self) -> String {
-        self.hashed
-    }
-    fn hash(token: &str) -> String {
+    fn hash(token: &str) -> InternedString {
         let mut hasher = Sha256::new();
         hasher.update(token.as_bytes());
-        base32::encode(
-            base32::Alphabet::RFC4648 { padding: false },
-            hasher.finalize().as_slice(),
+        InternedString::intern(
+            base32::encode(
+                base32::Alphabet::RFC4648 { padding: false },
+                hasher.finalize().as_slice(),
+            )
+            .to_lowercase(),
         )
-        .to_lowercase()
     }
 }
 impl AsLogoutSessionId for HashSessionToken {
-    fn as_logout_session_id(self) -> String {
+    fn as_logout_session_id(self) -> InternedString {
         self.hashed
     }
 }
@@ -205,80 +218,120 @@ impl Ord for HashSessionToken {
         self.hashed.cmp(&other.hashed)
     }
 }
-impl Borrow<String> for HashSessionToken {
-    fn borrow(&self) -> &String {
-        &self.hashed
+impl Borrow<str> for HashSessionToken {
+    fn borrow(&self) -> &str {
+        &*self.hashed
     }
 }
 
-pub fn auth<M: Metadata>(ctx: RpcContext) -> DynMiddleware<M> {
-    let rate_limiter = Arc::new(Mutex::new((0_usize, Instant::now())));
-    Box::new(
-        move |req: &mut Request<Body>,
-              metadata: M|
-              -> BoxFuture<Result<Result<DynMiddlewareStage2, Response<Body>>, HttpError>> {
-            let ctx = ctx.clone();
-            let rate_limiter = rate_limiter.clone();
-            async move {
-                let mut header_stub = Request::new(Body::empty());
-                *header_stub.headers_mut() = req.headers().clone();
-                let m2: DynMiddlewareStage2 = Box::new(move |req, rpc_req| {
-                    async move {
-                        if let Err(e) = HasValidSession::from_request_parts(req, &ctx).await {
-                            if metadata
-                                .get(rpc_req.method.as_str(), "authenticated")
-                                .unwrap_or(true)
-                            {
-                                let (res_parts, _) = Response::new(()).into_parts();
-                                return Ok(Err(to_response(
-                                    &req.headers,
-                                    res_parts,
-                                    Err(e.into()),
-                                    |_| StatusCode::OK,
-                                )?));
-                            } else if rpc_req.method.as_str() == "auth.login" {
-                                let guard = rate_limiter.lock().await;
-                                if guard.1.elapsed() < Duration::from_secs(20) {
-                                    if guard.0 >= 3 {
-                                        let (res_parts, _) = Response::new(()).into_parts();
-                                        return Ok(Err(to_response(
-                                            &req.headers,
-                                            res_parts,
-                                            Err(Error::new(
-                                                eyre!(
-                                                "Please limit login attempts to 3 per 20 seconds."
-                                            ),
-                                                crate::ErrorKind::RateLimited,
-                                            )
-                                            .into()),
-                                            |_| StatusCode::OK,
-                                        )?));
-                                    }
-                                }
-                            }
-                        }
-                        let m3: DynMiddlewareStage3 = Box::new(move |_, res| {
-                            async move {
-                                let mut guard = rate_limiter.lock().await;
-                                if guard.1.elapsed() < Duration::from_secs(20) {
-                                    if res.is_err() {
-                                        guard.0 += 1;
-                                    }
-                                } else {
-                                    guard.0 = 0;
-                                }
-                                guard.1 = Instant::now();
-                                Ok(Ok(noop4()))
-                            }
-                            .boxed()
-                        });
-                        Ok(Ok(m3))
-                    }
-                    .boxed()
+#[derive(Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Metadata {
+    #[serde(default = "const_true")]
+    authenticated: bool,
+    #[serde(default)]
+    login: bool,
+    #[serde(default)]
+    get_session: bool,
+}
+
+#[derive(Clone)]
+pub struct Auth {
+    rate_limiter: Arc<Mutex<(usize, Instant)>>,
+    cookie: Option<HeaderValue>,
+    is_login: bool,
+    set_cookie: Option<HeaderValue>,
+}
+impl Auth {
+    pub fn new() -> Self {
+        Self {
+            rate_limiter: Arc::new(Mutex::new((0, Instant::now()))),
+            cookie: None,
+            is_login: false,
+            set_cookie: None,
+        }
+    }
+}
+#[async_trait::async_trait]
+impl Middleware<RpcContext> for Auth {
+    type Metadata = Metadata;
+    async fn process_http_request(
+        &mut self,
+        _: &RpcContext,
+        request: &mut Request,
+    ) -> Result<(), Response> {
+        self.cookie = request.headers_mut().get(COOKIE).cloned();
+        Ok(())
+    }
+    async fn process_rpc_request(
+        &mut self,
+        context: &RpcContext,
+        metadata: Self::Metadata,
+        request: &mut RpcRequest,
+    ) -> Result<(), RpcResponse> {
+        if metadata.login {
+            self.is_login = true;
+            let guard = self.rate_limiter.lock().await;
+            if guard.1.elapsed() < Duration::from_secs(20) && guard.0 >= 3 {
+                return Err(RpcResponse {
+                    id: request.id.take(),
+                    result: Err(Error::new(
+                        eyre!("Please limit login attempts to 3 per 20 seconds."),
+                        crate::ErrorKind::RateLimited,
+                    )
+                    .into()),
                 });
-                Ok(Ok(m2))
             }
-            .boxed()
-        },
-    )
+        } else if metadata.authenticated {
+            match HasValidSession::from_header(self.cookie.as_ref(), &context).await {
+                Err(e) => {
+                    return Err(RpcResponse {
+                        id: request.id.take(),
+                        result: Err(e.into()),
+                    })
+                }
+                Ok(HasValidSession(SessionType::Session(s))) if metadata.get_session => {
+                    request.params["session"] = Value::String(Arc::new(s.hashed().into()));
+                    // TODO: will this panic?
+                }
+                _ => (),
+            }
+        }
+        Ok(())
+    }
+    async fn process_rpc_response(&mut self, _: &RpcContext, response: &mut RpcResponse) {
+        if self.is_login {
+            let mut guard = self.rate_limiter.lock().await;
+            if guard.1.elapsed() < Duration::from_secs(20) {
+                if response.result.is_err() {
+                    guard.0 += 1;
+                }
+            } else {
+                guard.0 = 0;
+            }
+            guard.1 = Instant::now();
+            if response.result.is_ok() {
+                let res = std::mem::replace(&mut response.result, Err(INTERNAL_ERROR));
+                response.result = async {
+                    let res = res?;
+                    let login_res = from_value::<LoginRes>(res.clone())?;
+                    self.set_cookie = Some(
+                        HeaderValue::from_str(&format!(
+                        "session={}; Path=/; SameSite=Lax; Expires=Fri, 31 Dec 9999 23:59:59 GMT;",
+                        login_res.session
+                    ))
+                        .with_kind(crate::ErrorKind::Network)?,
+                    );
+
+                    Ok(res)
+                }
+                .await;
+            }
+        }
+    }
+    async fn process_http_response(&mut self, _: &RpcContext, response: &mut Response) {
+        if let Some(set_cookie) = self.set_cookie.take() {
+            response.headers_mut().insert("set-cookie", set_cookie);
+        }
+    }
 }
diff --git a/core/startos/src/middleware/cors.rs b/core/startos/src/middleware/cors.rs
index 5f33bc08d..60a472cdd 100644
--- a/core/startos/src/middleware/cors.rs
+++ b/core/startos/src/middleware/cors.rs
@@ -1,61 +1,63 @@
-use futures::FutureExt;
-use http::HeaderValue;
-use hyper::header::HeaderMap;
-use rpc_toolkit::hyper::http::Error as HttpError;
-use rpc_toolkit::hyper::{Body, Method, Request, Response};
-use rpc_toolkit::rpc_server_helpers::{
-    DynMiddlewareStage2, DynMiddlewareStage3, DynMiddlewareStage4,
-};
-use rpc_toolkit::Metadata;
+use axum::extract::Request;
+use axum::response::Response;
+use http::{HeaderMap, HeaderValue};
+use rpc_toolkit::{Empty, Middleware};
 
-fn get_cors_headers(req: &Request<Body>) -> HeaderMap {
-    let mut res = HeaderMap::new();
-    if let Some(origin) = req.headers().get("Origin") {
-        res.insert("Access-Control-Allow-Origin", origin.clone());
-    }
-    if let Some(method) = req.headers().get("Access-Control-Request-Method") {
-        res.insert("Access-Control-Allow-Methods", method.clone());
+#[derive(Clone)]
+pub struct Cors {
+    headers: HeaderMap,
+}
+impl Cors {
+    pub fn new() -> Self {
+        let mut headers = HeaderMap::new();
+        headers.insert(
+            "Access-Control-Allow-Credentials",
+            HeaderValue::from_static("true"),
+        );
+        Self { headers }
     }
-    if let Some(headers) = req.headers().get("Access-Control-Request-Headers") {
-        res.insert("Access-Control-Allow-Headers", headers.clone());
+    fn get_cors_headers(&mut self, req: &Request) {
+        if let Some(origin) = req.headers().get("Origin") {
+            self.headers
+                .insert("Access-Control-Allow-Origin", origin.clone());
+        } else {
+            self.headers
+                .insert("Access-Control-Allow-Origin", HeaderValue::from_static("*"));
+        }
+        if let Some(method) = req.headers().get("Access-Control-Request-Method") {
+            self.headers
+                .insert("Access-Control-Allow-Methods", method.clone());
+        } else {
+            self.headers.insert(
+                "Access-Control-Allow-Methods",
+                HeaderValue::from_static("*"),
+            );
+        }
+        if let Some(headers) = req.headers().get("Access-Control-Request-Headers") {
+            self.headers
+                .insert("Access-Control-Allow-Headers", headers.clone());
+        } else {
+            self.headers.insert(
+                "Access-Control-Allow-Headers",
+                HeaderValue::from_static("*"),
+            );
+        }
     }
-    res.insert(
-        "Access-Control-Allow-Credentials",
-        HeaderValue::from_static("true"),
-    );
-    res
 }
-
-pub async fn cors<M: Metadata>(
-    req: &mut Request<Body>,
-    _metadata: M,
-) -> Result<Result<DynMiddlewareStage2, Response<Body>>, HttpError> {
-    let headers = get_cors_headers(req);
-    if req.method() == Method::OPTIONS {
-        Ok(Err({
-            let mut res = Response::new(Body::empty());
-            res.headers_mut().extend(headers.into_iter());
-            res
-        }))
-    } else {
-        Ok(Ok(Box::new(|_, _| {
-            async move {
-                let res: DynMiddlewareStage3 = Box::new(|_, _| {
-                    async move {
-                        let res: DynMiddlewareStage4 = Box::new(|res| {
-                            async move {
-                                res.headers_mut().extend(headers.into_iter());
-                                Ok::<_, HttpError>(())
-                            }
-                            .boxed()
-                        });
-                        Ok::<_, HttpError>(Ok(res))
-                    }
-                    .boxed()
-                });
-                Ok::<_, HttpError>(Ok(res))
-            }
-            .boxed()
-        })))
+#[async_trait::async_trait]
+impl<Context: Send + 'static> Middleware<Context> for Cors {
+    type Metadata = Empty;
+    async fn process_http_request(
+        &mut self,
+        _: &Context,
+        request: &mut Request,
+    ) -> Result<(), Response> {
+        self.get_cors_headers(request);
+        Ok(())
+    }
+    async fn process_http_response(&mut self, _: &Context, response: &mut Response) {
+        response
+            .headers_mut()
+            .extend(std::mem::take(&mut self.headers))
     }
 }
diff --git a/core/startos/src/middleware/db.rs b/core/startos/src/middleware/db.rs
index c3ceadda6..b90055f7c 100644
--- a/core/startos/src/middleware/db.rs
+++ b/core/startos/src/middleware/db.rs
@@ -1,50 +1,54 @@
-use futures::future::BoxFuture;
-use futures::FutureExt;
+use axum::response::Response;
+use http::header::InvalidHeaderValue;
 use http::HeaderValue;
-use rpc_toolkit::hyper::http::Error as HttpError;
-use rpc_toolkit::hyper::{Body, Request, Response};
-use rpc_toolkit::rpc_server_helpers::{
-    noop4, DynMiddleware, DynMiddlewareStage2, DynMiddlewareStage3,
-};
-use rpc_toolkit::yajrc::RpcMethod;
-use rpc_toolkit::Metadata;
+use rpc_toolkit::{Middleware, RpcRequest, RpcResponse};
+use serde::Deserialize;
 
 use crate::context::RpcContext;
 
-pub fn db<M: Metadata>(ctx: RpcContext) -> DynMiddleware<M> {
-    Box::new(
-        move |_: &mut Request<Body>,
-              metadata: M|
-              -> BoxFuture<Result<Result<DynMiddlewareStage2, Response<Body>>, HttpError>> {
-            let ctx = ctx.clone();
-            async move {
-                let m2: DynMiddlewareStage2 = Box::new(move |_req, rpc_req| {
-                    async move {
-                        let sync_db = metadata
-                            .get(rpc_req.method.as_str(), "sync_db")
-                            .unwrap_or(false);
+#[derive(Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Metadata {
+    #[serde(default)]
+    sync_db: bool,
+}
+
+#[derive(Clone)]
+pub struct SyncDb {
+    sync_db: bool,
+}
+impl SyncDb {
+    pub fn new() -> Self {
+        SyncDb { sync_db: false }
+    }
+}
 
-                        let m3: DynMiddlewareStage3 = Box::new(move |res, _| {
-                            async move {
-                                if sync_db {
-                                    res.headers.append(
-                                        "X-Patch-Sequence",
-                                        HeaderValue::from_str(
-                                            &ctx.db.sequence().await.to_string(),
-                                        )?,
-                                    );
-                                }
-                                Ok(Ok(noop4()))
-                            }
-                            .boxed()
-                        });
-                        Ok(Ok(m3))
-                    }
-                    .boxed()
-                });
-                Ok(Ok(m2))
+#[async_trait::async_trait]
+impl Middleware<RpcContext> for SyncDb {
+    type Metadata = Metadata;
+    async fn process_rpc_request(
+        &mut self,
+        _: &RpcContext,
+        metadata: Self::Metadata,
+        _: &mut RpcRequest,
+    ) -> Result<(), RpcResponse> {
+        self.sync_db = metadata.sync_db;
+        Ok(())
+    }
+    async fn process_http_response(&mut self, context: &RpcContext, response: &mut Response) {
+        if let Err(e) = async {
+            if self.sync_db {
+                response.headers_mut().append(
+                    "X-Patch-Sequence",
+                    HeaderValue::from_str(&context.db.sequence().await.to_string())?,
+                );
             }
-            .boxed()
-        },
-    )
+            Ok::<_, InvalidHeaderValue>(())
+        }
+        .await
+        {
+            tracing::error!("error writing X-Patch-Sequence header: {e}");
+            tracing::debug!("{e:?}");
+        }
+    }
 }
diff --git a/core/startos/src/middleware/diagnostic.rs b/core/startos/src/middleware/diagnostic.rs
index 959b8ea2d..f779d632f 100644
--- a/core/startos/src/middleware/diagnostic.rs
+++ b/core/startos/src/middleware/diagnostic.rs
@@ -1,39 +1,43 @@
-use futures::FutureExt;
-use rpc_toolkit::hyper::http::Error as HttpError;
-use rpc_toolkit::hyper::{Body, Request, Response};
-use rpc_toolkit::rpc_server_helpers::{noop4, DynMiddlewareStage2, DynMiddlewareStage3};
 use rpc_toolkit::yajrc::RpcMethod;
-use rpc_toolkit::Metadata;
+use rpc_toolkit::{Empty, Middleware, RpcRequest, RpcResponse};
 
-use crate::Error;
+use crate::context::DiagnosticContext;
+use crate::prelude::*;
 
-pub async fn diagnostic<M: Metadata>(
-    _req: &mut Request<Body>,
-    _metadata: M,
-) -> Result<Result<DynMiddlewareStage2, Response<Body>>, HttpError> {
-    Ok(Ok(Box::new(|_, rpc_req| {
-        let method = rpc_req.method.as_str().to_owned();
-        async move {
-            let res: DynMiddlewareStage3 = Box::new(|_, rpc_res| {
-                async move {
-                    if let Err(e) = rpc_res {
-                        if e.code == -32601 {
-                            *e = Error::new(
-                                color_eyre::eyre::eyre!(
-                                    "{} is not available on the Diagnostic API",
-                                    method
-                                ),
-                                crate::ErrorKind::DiagnosticMode,
-                            )
-                            .into();
-                        }
-                    }
-                    Ok(Ok(noop4()))
-                }
-                .boxed()
-            });
-            Ok::<_, HttpError>(Ok(res))
+#[derive(Clone)]
+pub struct DiagnosticMode {
+    method: Option<String>,
+}
+impl DiagnosticMode {
+    pub fn new() -> Self {
+        Self { method: None }
+    }
+}
+
+#[async_trait::async_trait]
+impl Middleware<DiagnosticContext> for DiagnosticMode {
+    type Metadata = Empty;
+    async fn process_rpc_request(
+        &mut self,
+        _: &DiagnosticContext,
+        _: Self::Metadata,
+        request: &mut RpcRequest,
+    ) -> Result<(), RpcResponse> {
+        self.method = Some(request.method.as_str().to_owned());
+        Ok(())
+    }
+    async fn process_rpc_response(&mut self, _: &DiagnosticContext, response: &mut RpcResponse) {
+        if let Err(e) = &mut response.result {
+            if e.code == -32601 {
+                *e = Error::new(
+                    eyre!(
+                        "{} is not available on the Diagnostic API",
+                        self.method.as_ref().map(|s| s.as_str()).unwrap_or_default()
+                    ),
+                    crate::ErrorKind::DiagnosticMode,
+                )
+                .into();
+            }
         }
-        .boxed()
-    })))
+    }
 }
diff --git a/core/startos/src/middleware/encrypt.rs b/core/startos/src/middleware/encrypt.rs
deleted file mode 100644
index 94167b7e2..000000000
--- a/core/startos/src/middleware/encrypt.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use aes::cipher::{CipherKey, NewCipher, Nonce, StreamCipher};
-use aes::Aes256Ctr;
-use hmac::Hmac;
-use josekit::jwk::Jwk;
-use serde::{Deserialize, Serialize};
-use sha2::Sha256;
-use tracing::instrument;
-
-pub fn pbkdf2(password: impl AsRef<[u8]>, salt: impl AsRef<[u8]>) -> CipherKey<Aes256Ctr> {
-    let mut aeskey = CipherKey::<Aes256Ctr>::default();
-    pbkdf2::pbkdf2::<Hmac<Sha256>>(
-        password.as_ref(),
-        salt.as_ref(),
-        1000,
-        aeskey.as_mut_slice(),
-    )
-    .unwrap();
-    aeskey
-}
-
-pub fn encrypt_slice(input: impl AsRef<[u8]>, password: impl AsRef<[u8]>) -> Vec<u8> {
-    let prefix: [u8; 32] = rand::random();
-    let aeskey = pbkdf2(password.as_ref(), &prefix[16..]);
-    let ctr = Nonce::<Aes256Ctr>::from_slice(&prefix[..16]);
-    let mut aes = Aes256Ctr::new(&aeskey, ctr);
-    let mut res = Vec::with_capacity(32 + input.as_ref().len());
-    res.extend_from_slice(&prefix[..]);
-    res.extend_from_slice(input.as_ref());
-    aes.apply_keystream(&mut res[32..]);
-    res
-}
-
-pub fn decrypt_slice(input: impl AsRef<[u8]>, password: impl AsRef<[u8]>) -> Vec<u8> {
-    if input.as_ref().len() < 32 {
-        return Vec::new();
-    }
-    let (prefix, rest) = input.as_ref().split_at(32);
-    let aeskey = pbkdf2(password.as_ref(), &prefix[16..]);
-    let ctr = Nonce::<Aes256Ctr>::from_slice(&prefix[..16]);
-    let mut aes = Aes256Ctr::new(&aeskey, ctr);
-    let mut res = rest.to_vec();
-    aes.apply_keystream(&mut res);
-    res
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct EncryptedWire {
-    encrypted: serde_json::Value,
-}
-impl EncryptedWire {
-    #[instrument(skip_all)]
-    pub fn decrypt(self, current_secret: impl AsRef<Jwk>) -> Option<String> {
-        let current_secret = current_secret.as_ref();
-
-        let decrypter = match josekit::jwe::alg::ecdh_es::EcdhEsJweAlgorithm::EcdhEs
-            .decrypter_from_jwk(current_secret)
-        {
-            Ok(a) => a,
-            Err(e) => {
-                tracing::warn!("Could not setup awk");
-                tracing::debug!("{:?}", e);
-                return None;
-            }
-        };
-        let encrypted = match serde_json::to_string(&self.encrypted) {
-            Ok(a) => a,
-            Err(e) => {
-                tracing::warn!("Could not deserialize");
-                tracing::debug!("{:?}", e);
-
-                return None;
-            }
-        };
-        let (decoded, _) = match josekit::jwe::deserialize_json(&encrypted, &decrypter) {
-            Ok(a) => a,
-            Err(e) => {
-                tracing::warn!("Could not decrypt");
-                tracing::debug!("{:?}", e);
-                return None;
-            }
-        };
-        match String::from_utf8(decoded) {
-            Ok(a) => Some(a),
-            Err(e) => {
-                tracing::warn!("Could not decrypt into utf8");
-                tracing::debug!("{:?}", e);
-                return None;
-            }
-        }
-    }
-}
-
-/// We created this test by first making the private key, then restoring from this private key for recreatability.
-/// After this the frontend then encoded an password, then we are testing that the output that we got (hand coded)
-/// will be the shape we want.
-#[test]
-fn test_gen_awk() {
-    let private_key: Jwk = serde_json::from_str(
-        r#"{
-            "kty": "EC",
-            "crv": "P-256",
-            "d": "3P-MxbUJtEhdGGpBCRFXkUneGgdyz_DGZWfIAGSCHOU",
-            "x": "yHTDYSfjU809fkSv9MmN4wuojf5c3cnD7ZDN13n-jz4",
-            "y": "8Mpkn744A5KDag0DmX2YivB63srjbugYZzWc3JOpQXI"
-          }"#,
-    )
-    .unwrap();
-    let encrypted: EncryptedWire =  serde_json::from_str(r#"{
-        "encrypted":     {        "protected": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiRUNESC1FUyIsImtpZCI6ImgtZnNXUVh2Tm95dmJEazM5dUNsQ0NUdWc5N3MyZnJockJnWUVBUWVtclUiLCJlcGsiOnsia3R5IjoiRUMiLCJjcnYiOiJQLTI1NiIsIngiOiJmRkF0LXNWYWU2aGNkdWZJeUlmVVdUd3ZvWExaTkdKRHZIWVhIckxwOXNNIiwieSI6IjFvVFN6b00teHlFZC1SLUlBaUFHdXgzS1dJZmNYZHRMQ0JHLUh6MVkzY2sifX0",        "iv": "NbwvfvWOdLpZfYRIZUrkcw",        "ciphertext": "Zc5Br5kYOlhPkIjQKOLMJw",        "tag": "EPoch52lDuCsbUUulzZGfg"    }
-      }"#).unwrap();
-    assert_eq!(
-        "testing12345",
-        &encrypted.decrypt(std::sync::Arc::new(private_key)).unwrap()
-    );
-}
diff --git a/core/startos/src/middleware/mod.rs b/core/startos/src/middleware/mod.rs
index 5af2b8121..3af0cb5a4 100644
--- a/core/startos/src/middleware/mod.rs
+++ b/core/startos/src/middleware/mod.rs
@@ -2,4 +2,3 @@ pub mod auth;
 pub mod cors;
 pub mod db;
 pub mod diagnostic;
-pub mod encrypt;
diff --git a/core/startos/src/migration.rs b/core/startos/src/migration.rs
deleted file mode 100644
index 13f14c7c3..000000000
--- a/core/startos/src/migration.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-use std::collections::BTreeSet;
-
-use color_eyre::eyre::eyre;
-use emver::VersionRange;
-use futures::{Future, FutureExt};
-use indexmap::IndexMap;
-use models::ImageId;
-use patch_db::HasModel;
-use serde::{Deserialize, Serialize};
-use tracing::instrument;
-
-use crate::context::RpcContext;
-use crate::prelude::*;
-use crate::procedure::docker::DockerContainers;
-use crate::procedure::{PackageProcedure, ProcedureName};
-use crate::s9pk::manifest::PackageId;
-use crate::util::Version;
-use crate::volume::Volumes;
-use crate::{Error, ResultExt};
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct Migrations {
-    pub from: IndexMap<VersionRange, PackageProcedure>,
-    pub to: IndexMap<VersionRange, PackageProcedure>,
-}
-impl Migrations {
-    #[instrument(skip_all)]
-    pub fn validate(
-        &self,
-        _container: &Option<DockerContainers>,
-        eos_version: &Version,
-        volumes: &Volumes,
-        image_ids: &BTreeSet<ImageId>,
-    ) -> Result<(), Error> {
-        for (version, migration) in &self.from {
-            migration
-                .validate(eos_version, volumes, image_ids, true)
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::ValidateS9pk,
-                        format!("Migration from {}", version),
-                    )
-                })?;
-        }
-        for (version, migration) in &self.to {
-            migration
-                .validate(eos_version, volumes, image_ids, true)
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::ValidateS9pk,
-                        format!("Migration to {}", version),
-                    )
-                })?;
-        }
-        Ok(())
-    }
-
-    #[instrument(skip_all)]
-    pub fn from<'a>(
-        &'a self,
-        _container: &'a Option<DockerContainers>,
-        ctx: &'a RpcContext,
-        version: &'a Version,
-        pkg_id: &'a PackageId,
-        pkg_version: &'a Version,
-        volumes: &'a Volumes,
-    ) -> Option<impl Future<Output = Result<MigrationRes, Error>> + 'a> {
-        if let Some((_, migration)) = self
-            .from
-            .iter()
-            .find(|(range, _)| version.satisfies(*range))
-        {
-            Some(async move {
-                migration
-                    .execute(
-                        ctx,
-                        pkg_id,
-                        pkg_version,
-                        ProcedureName::Migration, // Migrations cannot be executed concurrently
-                        volumes,
-                        Some(version),
-                        None,
-                    )
-                    .map(|r| {
-                        r.and_then(|r| {
-                            r.map_err(|e| {
-                                Error::new(eyre!("{}", e.1), crate::ErrorKind::MigrationFailed)
-                            })
-                        })
-                    })
-                    .await
-            })
-        } else {
-            None
-        }
-    }
-
-    #[instrument(skip_all)]
-    pub fn to<'a>(
-        &'a self,
-        ctx: &'a RpcContext,
-        version: &'a Version,
-        pkg_id: &'a PackageId,
-        pkg_version: &'a Version,
-        volumes: &'a Volumes,
-    ) -> Option<impl Future<Output = Result<MigrationRes, Error>> + 'a> {
-        if let Some((_, migration)) = self.to.iter().find(|(range, _)| version.satisfies(*range)) {
-            Some(async move {
-                migration
-                    .execute(
-                        ctx,
-                        pkg_id,
-                        pkg_version,
-                        ProcedureName::Migration,
-                        volumes,
-                        Some(version),
-                        None,
-                    )
-                    .map(|r| {
-                        r.and_then(|r| {
-                            r.map_err(|e| {
-                                Error::new(eyre!("{}", e.1), crate::ErrorKind::MigrationFailed)
-                            })
-                        })
-                    })
-                    .await
-            })
-        } else {
-            None
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct MigrationRes {
-    pub configured: bool,
-}
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index cbe7ff19d..1c9d65d24 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -1,15 +1,16 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::net::IpAddr;
 
+use clap::Parser;
 use futures::TryStreamExt;
-use rpc_toolkit::command;
+use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use tokio::sync::RwLock;
 
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::db::model::IpInfo;
 use crate::net::utils::{iface_is_physical, list_interfaces};
 use crate::prelude::*;
-use crate::util::display_none;
 use crate::Error;
 
 lazy_static::lazy_static! {
@@ -50,13 +51,26 @@ pub async fn init_ips() -> Result<BTreeMap<String, IpInfo>, Error> {
     Ok(res)
 }
 
-#[command(subcommands(update))]
-pub async fn dhcp() -> Result<(), Error> {
-    Ok(())
+// #[command(subcommands(update))]
+pub fn dhcp() -> ParentHandler {
+    ParentHandler::new().subcommand(
+        "update",
+        from_fn_async::<_, _, (), Error, (RpcContext, UpdateParams)>(update)
+            .no_display()
+            .with_remote_cli::<CliContext>(),
+    )
+}
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct UpdateParams {
+    interface: String,
 }
 
-#[command(display(display_none))]
-pub async fn update(#[context] ctx: RpcContext, #[arg] interface: String) -> Result<(), Error> {
+pub async fn update(
+    ctx: RpcContext,
+    UpdateParams { interface }: UpdateParams,
+) -> Result<(), Error> {
     if iface_is_physical(&interface).await {
         let ip_info = IpInfo::for_interface(&interface).await?;
         ctx.db
diff --git a/core/startos/src/net/interface.rs b/core/startos/src/net/interface.rs
index a055bb277..f1fa1e406 100644
--- a/core/startos/src/net/interface.rs
+++ b/core/startos/src/net/interface.rs
@@ -2,13 +2,13 @@ use std::collections::BTreeMap;
 
 use indexmap::IndexSet;
 pub use models::InterfaceId;
+use models::PackageId;
 use serde::{Deserialize, Deserializer, Serialize};
 use sqlx::{Executor, Postgres};
 use tracing::instrument;
 
 use crate::db::model::{InterfaceAddressMap, InterfaceAddresses};
 use crate::net::keys::Key;
-use crate::s9pk::manifest::PackageId;
 use crate::util::serde::Port;
 use crate::{Error, ResultExt};
 
diff --git a/core/startos/src/net/keys.rs b/core/startos/src/net/keys.rs
index 504bd276d..4816fd98a 100644
--- a/core/startos/src/net/keys.rs
+++ b/core/startos/src/net/keys.rs
@@ -1,21 +1,19 @@
-use std::collections::BTreeMap;
-
-use clap::ArgMatches;
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use models::{Id, InterfaceId, PackageId};
 use openssl::pkey::{PKey, Private};
 use openssl::sha::Sha256;
 use openssl::x509::X509;
 use p256::elliptic_curve::pkcs8::EncodePrivateKey;
-use rpc_toolkit::command;
+use serde::{Deserialize, Serialize};
 use sqlx::{Acquire, PgExecutor};
 use ssh_key::private::Ed25519PrivateKey;
 use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use zeroize::Zeroize;
 
-use crate::config::{configure, ConfigureContext};
+use crate::config::ConfigureContext;
 use crate::context::RpcContext;
-use crate::control::restart;
+use crate::control::{restart, ControlParams};
 use crate::disk::fsck::RequiresReboot;
 use crate::net::ssl::CertPair;
 use crate::prelude::*;
@@ -280,17 +278,23 @@ pub fn test_keygen() {
     key.openssl_key_nistp256();
 }
 
-fn display_requires_reboot(arg: RequiresReboot, _matches: &ArgMatches) {
-    if arg.0 {
+pub fn display_requires_reboot(_: RotateKeysParams, args: RequiresReboot) {
+    if args.0 {
         println!("Server must be restarted for changes to take effect");
     }
 }
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct RotateKeysParams {
+    package: Option<PackageId>,
+    interface: Option<InterfaceId>,
+}
 
-#[command(rename = "rotate-key", display(display_requires_reboot))]
+// #[command(display(display_requires_reboot))]
 pub async fn rotate_key(
-    #[context] ctx: RpcContext,
-    #[arg] package: Option<PackageId>,
-    #[arg] interface: Option<InterfaceId>,
+    ctx: RpcContext,
+    RotateKeysParams { package, interface }: RotateKeysParams,
 ) -> Result<RequiresReboot, Error> {
     let mut pgcon = ctx.secret_store.acquire().await?;
     let mut tx = pgcon.begin().await?;
@@ -337,37 +341,39 @@ pub async fn rotate_key(
                     lan.ser(&new_key.tor_address().to_string())?;
                 }
 
-                if installed
-                    .as_manifest()
-                    .as_config()
-                    .transpose_ref()
-                    .is_some()
-                {
-                    installed
-                        .as_status_mut()
-                        .as_configured_mut()
-                        .replace(&false)
-                } else {
-                    Ok(false)
-                }
+                // TODO
+                // if installed
+                //     .as_manifest()
+                //     .as_config()
+                //     .transpose_ref()
+                //     .is_some()
+                // {
+                //     installed
+                //         .as_status_mut()
+                //         .as_configured_mut()
+                //         .replace(&false)
+                // } else {
+                //     Ok(false)
+                // }
+                Ok(false)
             })
             .await?;
         tx.commit().await?;
         if needs_config {
-            configure(
-                &ctx,
-                &package,
-                ConfigureContext {
-                    breakages: BTreeMap::new(),
-                    timeout: None,
-                    config: None,
-                    overrides: BTreeMap::new(),
-                    dry_run: false,
-                },
-            )
-            .await?;
+            ctx.services
+                .get(&package)
+                .await
+                .as_ref()
+                .ok_or_else(|| {
+                    Error::new(
+                        eyre!("There is no manager running for {package}"),
+                        ErrorKind::Unknown,
+                    )
+                })?
+                .configure(ConfigureContext::default())
+                .await?;
         } else {
-            restart(ctx, package).await?;
+            restart(ctx, ControlParams { id: package }).await?;
         }
         Ok(RequiresReboot(false))
     } else {
diff --git a/core/startos/src/net/mdns.rs b/core/startos/src/net/mdns.rs
index 21054241d..ee2e0fa41 100644
--- a/core/startos/src/net/mdns.rs
+++ b/core/startos/src/net/mdns.rs
@@ -30,71 +30,3 @@ pub async fn resolve_mdns(hostname: &str) -> Result<Ipv4Addr, Error> {
     .trim()
     .parse()?)
 }
-
-pub struct MdnsController(Mutex<MdnsControllerInner>);
-impl MdnsController {
-    pub async fn init() -> Result<Self, Error> {
-        Ok(MdnsController(Mutex::new(
-            MdnsControllerInner::init().await?,
-        )))
-    }
-    pub async fn add(&self, alias: String) -> Result<Arc<()>, Error> {
-        self.0.lock().await.add(alias).await
-    }
-    pub async fn gc(&self, alias: String) -> Result<(), Error> {
-        self.0.lock().await.gc(alias).await
-    }
-}
-
-pub struct MdnsControllerInner {
-    alias_cmd: Option<Child>,
-    services: BTreeMap<String, Weak<()>>,
-}
-
-impl MdnsControllerInner {
-    #[instrument(skip_all)]
-    async fn init() -> Result<Self, Error> {
-        let mut res = MdnsControllerInner {
-            alias_cmd: None,
-            services: BTreeMap::new(),
-        };
-        res.sync().await?;
-        Ok(res)
-    }
-    #[instrument(skip_all)]
-    async fn sync(&mut self) -> Result<(), Error> {
-        if let Some(mut cmd) = self.alias_cmd.take() {
-            cmd.kill().await.with_kind(crate::ErrorKind::Network)?;
-        }
-        self.alias_cmd = Some(
-            Command::new("avahi-alias")
-                .kill_on_drop(true)
-                .args(
-                    self.services
-                        .iter()
-                        .filter(|(_, rc)| rc.strong_count() > 0)
-                        .map(|(s, _)| s),
-                )
-                .spawn()?,
-        );
-        Ok(())
-    }
-    async fn add(&mut self, alias: String) -> Result<Arc<()>, Error> {
-        let rc = if let Some(rc) = Weak::upgrade(&self.services.remove(&alias).unwrap_or_default())
-        {
-            rc
-        } else {
-            Arc::new(())
-        };
-        self.services.insert(alias, Arc::downgrade(&rc));
-        self.sync().await?;
-        Ok(rc)
-    }
-    async fn gc(&mut self, alias: String) -> Result<(), Error> {
-        if let Some(rc) = Weak::upgrade(&self.services.remove(&alias).unwrap_or_default()) {
-            self.services.insert(alias, Arc::downgrade(&rc));
-        }
-        self.sync().await?;
-        Ok(())
-    }
-}
diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs
index 50935fb18..25d7a9647 100644
--- a/core/startos/src/net/mod.rs
+++ b/core/startos/src/net/mod.rs
@@ -1,10 +1,6 @@
-use std::sync::Arc;
+use rpc_toolkit::{from_fn_async, AnyContext, HandlerExt, ParentHandler};
 
-use futures::future::BoxFuture;
-use hyper::{Body, Error as HyperError, Request, Response};
-use rpc_toolkit::command;
-
-use crate::Error;
+use crate::context::CliContext;
 
 pub mod dhcp;
 pub mod dns;
@@ -22,11 +18,17 @@ pub mod wifi;
 
 pub const PACKAGE_CERT_PATH: &str = "/var/lib/embassy/ssl";
 
-#[command(subcommands(tor::tor, dhcp::dhcp, ssl::ssl, keys::rotate_key))]
-pub fn net() -> Result<(), Error> {
-    Ok(())
+pub fn net() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("tor", tor::tor())
+        .subcommand("dhcp", dhcp::dhcp())
+        .subcommand("ssl", ssl::ssl())
+        .subcommand(
+            "rotate-key",
+            from_fn_async(keys::rotate_key)
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(keys::display_requires_reboot(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
 }
-
-pub type HttpHandler = Arc<
-    dyn Fn(Request<Body>) -> BoxFuture<'static, Result<Response<Body>, HyperError>> + Send + Sync,
->;
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index e2e77ed68..38aa079af 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -3,7 +3,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::{Arc, Weak};
 
 use color_eyre::eyre::eyre;
-use models::InterfaceId;
+use models::{InterfaceId, PackageId};
 use sqlx::PgExecutor;
 use tracing::instrument;
 
@@ -11,19 +11,16 @@ use crate::error::ErrorCollection;
 use crate::hostname::Hostname;
 use crate::net::dns::DnsController;
 use crate::net::keys::Key;
-use crate::net::mdns::MdnsController;
 use crate::net::ssl::{export_cert, export_key, SslManager};
 use crate::net::tor::TorController;
 use crate::net::vhost::{AlpnInfo, VHostController};
-use crate::s9pk::manifest::PackageId;
 use crate::volume::cert_dir;
 use crate::{Error, HOST_IP};
 
 pub struct NetController {
     pub(super) tor: TorController,
-    pub(super) mdns: MdnsController,
     pub(super) vhost: VHostController,
-    pub(super) dns: DnsController,
+    // pub(super) dns: DnsController,
     pub(super) ssl: Arc<SslManager>,
     pub(super) os_bindings: Vec<Arc<()>>,
 }
@@ -41,9 +38,8 @@ impl NetController {
         let ssl = Arc::new(ssl);
         let mut res = Self {
             tor: TorController::new(tor_control, tor_socks),
-            mdns: MdnsController::init().await?,
             vhost: VHostController::new(ssl.clone()),
-            dns: DnsController::init(dns_bind).await?,
+            // dns: DnsController::init(dns_bind).await?,
             ssl,
             os_bindings: Vec::new(),
         };
@@ -64,8 +60,8 @@ impl NetController {
                 alpn.clone(),
             )
             .await?;
-        self.os_bindings
-            .push(self.dns.add(None, HOST_IP.into()).await?);
+        // self.os_bindings
+        //     .push(self.dns.add(None, HOST_IP.into()).await?);
 
         // LAN IP
         self.os_bindings.push(
@@ -151,13 +147,13 @@ impl NetController {
         package: PackageId,
         ip: Ipv4Addr,
     ) -> Result<NetService, Error> {
-        let dns = self.dns.add(Some(package.clone()), ip).await?;
+        // let dns = self.dns.add(Some(package.clone()), ip).await?;
 
         Ok(NetService {
             shutdown: false,
             id: package,
             ip,
-            dns,
+            // dns,
             controller: Arc::downgrade(self),
             tor: BTreeMap::new(),
             lan: BTreeMap::new(),
@@ -199,13 +195,15 @@ impl NetController {
                 )
                 .await?,
         );
-        rcs.push(self.mdns.add(key.base_address()).await?);
+        // rcs.push(self.mdns.add(key.base_address()).await?);
+        // TODO
         Ok(rcs)
     }
 
     async fn remove_lan(&self, key: &Key, external: u16, rcs: Vec<Arc<()>>) -> Result<(), Error> {
         drop(rcs);
-        self.mdns.gc(key.base_address()).await?;
+        // self.mdns.gc(key.base_address()).await?;
+        // TODO
         self.vhost.gc(Some(key.local_address()), external).await
     }
 }
@@ -214,7 +212,7 @@ pub struct NetService {
     shutdown: bool,
     id: PackageId,
     ip: Ipv4Addr,
-    dns: Arc<()>,
+    // dns: Arc<()>,
     controller: Weak<NetController>,
     tor: BTreeMap<(InterfaceId, u16), (Key, Vec<Arc<()>>)>,
     lan: BTreeMap<(InterfaceId, u16), (Key, Vec<Arc<()>>)>,
@@ -334,8 +332,8 @@ impl NetService {
             for ((_, external), (key, rcs)) in std::mem::take(&mut self.tor) {
                 errors.handle(ctrl.remove_tor(&key, external, rcs).await);
             }
-            std::mem::take(&mut self.dns);
-            errors.handle(ctrl.dns.gc(Some(self.id.clone()), self.ip).await);
+            // std::mem::take(&mut self.dns);
+            // errors.handle(ctrl.dns.gc(Some(self.id.clone()), self.ip).await);
             errors.into_result()
         } else {
             tracing::warn!("NetService dropped after NetController is shutdown");
@@ -357,7 +355,7 @@ impl Drop for NetService {
                     shutdown: true,
                     id: Default::default(),
                     ip: Ipv4Addr::new(0, 0, 0, 0),
-                    dns: Default::default(),
+                    // dns: Default::default(),
                     controller: Default::default(),
                     tor: Default::default(),
                     lan: Default::default(),
diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index 1f9397add..a3a6a24c9 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -14,12 +14,12 @@ use openssl::nid::Nid;
 use openssl::pkey::{PKey, Private};
 use openssl::x509::{X509Builder, X509Extension, X509NameBuilder, X509};
 use openssl::*;
-use rpc_toolkit::command;
+use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
 use tokio::sync::{Mutex, RwLock};
 use tracing::instrument;
 
 use crate::account::AccountInfo;
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::hostname::Hostname;
 use crate::init::check_time_is_synchronized;
 use crate::net::dhcp::ips;
@@ -444,13 +444,11 @@ pub fn make_leaf_cert(
     Ok(cert)
 }
 
-#[command(subcommands(size))]
-pub async fn ssl() -> Result<(), Error> {
-    Ok(())
+pub fn ssl() -> ParentHandler {
+    ParentHandler::new().subcommand("size", from_fn_async(size).with_remote_cli::<CliContext>())
 }
 
-#[command]
-pub async fn size(#[context] ctx: RpcContext) -> Result<String, Error> {
+pub async fn size(ctx: RpcContext) -> Result<String, Error> {
     Ok(format!(
         "Cert Catch size: {}",
         ctx.net_controller.ssl.cert_cache.read().await.len()
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index 761566a2c..68f071c79 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -1,21 +1,25 @@
 use std::fs::Metadata;
 use std::future::Future;
 use std::path::{Path, PathBuf};
-use std::sync::Arc;
 use std::time::UNIX_EPOCH;
 
 use async_compression::tokio::bufread::GzipEncoder;
-use color_eyre::eyre::eyre;
+use axum::body::Body;
+use axum::extract::{self as x, Request};
+use axum::response::Response;
+use axum::routing::{any, get, post};
+use axum::Router;
 use digest::Digest;
-use futures::FutureExt;
+use futures::future::ready;
+use futures::{FutureExt, TryFutureExt};
 use http::header::ACCEPT_ENCODING;
 use http::request::Parts as RequestParts;
-use hyper::{Body, Method, Request, Response, StatusCode};
+use http::{HeaderMap, Method, StatusCode};
 use include_dir::{include_dir, Dir};
 use new_mime_guess::MimeGuess;
 use openssl::hash::MessageDigest;
 use openssl::x509::X509;
-use rpc_toolkit::rpc_handler;
+use rpc_toolkit::Server;
 use tokio::fs::File;
 use tokio::io::BufReader;
 use tokio_util::io::ReaderStream;
@@ -25,11 +29,10 @@ use crate::core::rpc_continuations::RequestGuid;
 use crate::db::subscribe;
 use crate::hostname::Hostname;
 use crate::install::PKG_PUBLIC_DIR;
-use crate::middleware::auth::{auth as auth_middleware, HasValidSession};
-use crate::middleware::cors::cors;
-use crate::middleware::db::db as db_middleware;
-use crate::middleware::diagnostic::diagnostic as diagnostic_middleware;
-use crate::net::HttpHandler;
+use crate::middleware::auth::{Auth, HasValidSession};
+use crate::middleware::cors::Cors;
+use crate::middleware::db::SyncDb;
+use crate::middleware::diagnostic::DiagnosticMode;
 use crate::{diagnostic_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt};
 
 static NOT_FOUND: &[u8] = b"Not Found";
@@ -40,10 +43,6 @@ static EMBEDDED_UIS: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/
 
 const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "user-agent"];
 
-fn status_fn(_: i32) -> StatusCode {
-    StatusCode::OK
-}
-
 #[derive(Clone)]
 pub enum UiMode {
     Setup,
@@ -63,180 +62,123 @@ impl UiMode {
     }
 }
 
-pub async fn setup_ui_file_router(ctx: SetupContext) -> Result<HttpHandler, Error> {
-    let handler: HttpHandler = Arc::new(move |req| {
-        let ctx = ctx.clone();
-
-        let ui_mode = UiMode::Setup;
-        async move {
-            let res = match req.uri().path() {
-                path if path.starts_with("/rpc/") => {
-                    let rpc_handler = rpc_handler!({
-                        command: setup_api,
-                        context: ctx,
-                        status: status_fn,
-                        middleware: [
-                            cors,
-                        ]
-                    });
-
-                    rpc_handler(req)
-                        .await
-                        .map_err(|err| Error::new(eyre!("{}", err), crate::ErrorKind::Network))
-                }
-                _ => alt_ui(req, ui_mode).await,
-            };
-
-            match res {
-                Ok(data) => Ok(data),
-                Err(err) => Ok(server_error(err)),
-            }
-        }
-        .boxed()
-    });
-
-    Ok(handler)
+pub fn setup_ui_file_router(ctx: SetupContext) -> Router {
+    Router::new()
+        .route_service(
+            "/rpc/*path",
+            post(Server::new(move || ready(Ok(ctx.clone())), setup_api()).middleware(Cors::new())),
+        )
+        .fallback(any(|request: Request| async move {
+            alt_ui(request, UiMode::Setup)
+                .await
+                .unwrap_or_else(server_error)
+        }))
 }
 
-pub async fn diag_ui_file_router(ctx: DiagnosticContext) -> Result<HttpHandler, Error> {
-    let handler: HttpHandler = Arc::new(move |req| {
-        let ctx = ctx.clone();
-        let ui_mode = UiMode::Diag;
-        async move {
-            let res = match req.uri().path() {
-                path if path.starts_with("/rpc/") => {
-                    let rpc_handler = rpc_handler!({
-                        command: diagnostic_api,
-                        context: ctx,
-                        status: status_fn,
-                        middleware: [
-                            cors,
-                            diagnostic_middleware,
-                        ]
-                    });
-
-                    rpc_handler(req)
-                        .await
-                        .map_err(|err| Error::new(eyre!("{}", err), crate::ErrorKind::Network))
-                }
-                _ => alt_ui(req, ui_mode).await,
-            };
-
-            match res {
-                Ok(data) => Ok(data),
-                Err(err) => Ok(server_error(err)),
-            }
-        }
-        .boxed()
-    });
-
-    Ok(handler)
+pub fn diag_ui_file_router(ctx: DiagnosticContext) -> Router {
+    Router::new()
+        .route(
+            "/rpc/*path",
+            post(
+                Server::new(move || ready(Ok(ctx.clone())), diagnostic_api())
+                    .middleware(Cors::new())
+                    .middleware(DiagnosticMode::new()),
+            ),
+        )
+        .fallback(any(|request: Request| async move {
+            alt_ui(request, UiMode::Diag)
+                .await
+                .unwrap_or_else(server_error)
+        }))
 }
 
-pub async fn install_ui_file_router(ctx: InstallContext) -> Result<HttpHandler, Error> {
-    let handler: HttpHandler = Arc::new(move |req| {
-        let ctx = ctx.clone();
-        let ui_mode = UiMode::Install;
-        async move {
-            let res = match req.uri().path() {
-                path if path.starts_with("/rpc/") => {
-                    let rpc_handler = rpc_handler!({
-                        command: install_api,
-                        context: ctx,
-                        status: status_fn,
-                        middleware: [
-                            cors,
-                        ]
-                    });
-
-                    rpc_handler(req)
-                        .await
-                        .map_err(|err| Error::new(eyre!("{}", err), crate::ErrorKind::Network))
-                }
-                _ => alt_ui(req, ui_mode).await,
-            };
-
-            match res {
-                Ok(data) => Ok(data),
-                Err(err) => Ok(server_error(err)),
-            }
-        }
-        .boxed()
-    });
-
-    Ok(handler)
+pub fn install_ui_file_router(ctx: InstallContext) -> Router {
+    Router::new()
+        .route("/rpc/*path", {
+            let ctx = ctx.clone();
+            post(Server::new(move || ready(Ok(ctx.clone())), install_api()).middleware(Cors::new()))
+        })
+        .fallback(any(|request: Request| async move {
+            alt_ui(request, UiMode::Install)
+                .await
+                .unwrap_or_else(server_error)
+        }))
 }
 
-pub async fn main_ui_server_router(ctx: RpcContext) -> Result<HttpHandler, Error> {
-    let handler: HttpHandler = Arc::new(move |req| {
-        let ctx = ctx.clone();
-
-        async move {
-            let res = match req.uri().path() {
-                path if path.starts_with("/rpc/") => {
-                    let auth_middleware = auth_middleware(ctx.clone());
-                    let db_middleware = db_middleware(ctx.clone());
-                    let rpc_handler = rpc_handler!({
-                        command: main_api,
-                        context: ctx,
-                        status: status_fn,
-                        middleware: [
-                            cors,
-                            auth_middleware,
-                            db_middleware,
-                        ]
-                    });
-
-                    rpc_handler(req)
+pub fn main_ui_server_router(ctx: RpcContext) -> Router {
+    Router::new()
+        .route("/rpc/*path", {
+            let ctx = ctx.clone();
+            post(
+                Server::new(move || ready(Ok(ctx.clone())), main_api())
+                    .middleware(Cors::new())
+                    .middleware(Auth::new())
+                    .middleware(SyncDb::new()),
+            )
+        })
+        .route(
+            "/ws/db",
+            any({
+                let ctx = ctx.clone();
+                move |headers: HeaderMap, ws: x::WebSocketUpgrade| async move {
+                    subscribe(ctx, headers, ws)
                         .await
-                        .map_err(|err| Error::new(eyre!("{}", err), crate::ErrorKind::Network))
+                        .unwrap_or_else(server_error)
                 }
-                "/ws/db" => subscribe(ctx, req).await,
-                path if path.starts_with("/ws/rpc/") => {
-                    match RequestGuid::from(path.strip_prefix("/ws/rpc/").unwrap()) {
+            }),
+        )
+        .route(
+            "/ws/rpc/*path",
+            get({
+                let ctx = ctx.clone();
+                move |headers: HeaderMap,
+                      x::Path(path): x::Path<String>,
+                      ws: axum::extract::ws::WebSocketUpgrade| async move {
+                    match RequestGuid::from(&path) {
                         None => {
                             tracing::debug!("No Guid Path");
-                            Ok::<_, Error>(bad_request())
+                            bad_request()
                         }
                         Some(guid) => match ctx.get_ws_continuation_handler(&guid).await {
-                            Some(cont) => match cont(req).await {
-                                Ok::<_, Error>(r) => Ok::<_, Error>(r),
-                                Err(err) => Ok::<_, Error>(server_error(err)),
-                            },
-                            _ => Ok::<_, Error>(not_found()),
+                            Some(cont) => ws.on_upgrade(cont),
+                            _ => not_found(),
                         },
                     }
                 }
-                path if path.starts_with("/rest/rpc/") => {
-                    match RequestGuid::from(path.strip_prefix("/rest/rpc/").unwrap()) {
+            }),
+        )
+        .route(
+            "/rest/rpc/*path",
+            any({
+                let ctx = ctx.clone();
+                move |request: x::Request| async move {
+                    let path = request
+                        .uri()
+                        .path()
+                        .clone()
+                        .strip_prefix("/rest/rpc/")
+                        .unwrap_or_default();
+                    match RequestGuid::from(&path) {
                         None => {
                             tracing::debug!("No Guid Path");
-                            Ok::<_, Error>(bad_request())
+                            bad_request()
                         }
                         Some(guid) => match ctx.get_rest_continuation_handler(&guid).await {
-                            None => Ok::<_, Error>(not_found()),
-                            Some(cont) => match cont(req).await {
-                                Ok::<_, Error>(r) => Ok::<_, Error>(r),
-                                Err(e) => Ok::<_, Error>(server_error(e)),
-                            },
+                            None => not_found(),
+                            Some(cont) => cont(request).await.unwrap_or_else(server_error),
                         },
                     }
                 }
-                _ => main_embassy_ui(req, ctx).await,
-            };
-
-            match res {
-                Ok(data) => Ok(data),
-                Err(err) => Ok(server_error(err)),
-            }
-        }
-        .boxed()
-    });
-
-    Ok(handler)
+            }),
+        )
+        .fallback(any(move |request: Request| async move {
+            main_embassy_ui(request, ctx)
+                .await
+                .unwrap_or_else(server_error)
+        }))
 }
 
-async fn alt_ui(req: Request<Body>, ui_mode: UiMode) -> Result<Response<Body>, Error> {
+async fn alt_ui(req: Request, ui_mode: UiMode) -> Result<Response, Error> {
     let (request_parts, _body) = req.into_parts();
     match &request_parts.method {
         &Method::GET => {
@@ -266,20 +208,21 @@ async fn alt_ui(req: Request<Body>, ui_mode: UiMode) -> Result<Response<Body>, E
 
 async fn if_authorized<
     F: FnOnce() -> Fut,
-    Fut: Future<Output = Result<Response<Body>, Error>> + Send + Sync,
+    Fut: Future<Output = Result<Response, Error>> + Send + Sync,
 >(
     ctx: &RpcContext,
     parts: &RequestParts,
     f: F,
-) -> Result<Response<Body>, Error> {
-    if let Err(e) = HasValidSession::from_request_parts(parts, ctx).await {
+) -> Result<Response, Error> {
+    if let Err(e) = HasValidSession::from_header(parts.headers.get(http::header::COOKIE), ctx).await
+    {
         un_authorized(e, parts.uri.path())
     } else {
         f().await
     }
 }
 
-async fn main_embassy_ui(req: Request<Body>, ctx: RpcContext) -> Result<Response<Body>, Error> {
+async fn main_embassy_ui(req: Request, ctx: RpcContext) -> Result<Response, Error> {
     let (request_parts, _body) = req.into_parts();
     match (
         &request_parts.method,
@@ -291,21 +234,7 @@ async fn main_embassy_ui(req: Request<Body>, ctx: RpcContext) -> Result<Response
             .split_once('/'),
     ) {
         (&Method::GET, Some(("public", path))) => {
-            if_authorized(&ctx, &request_parts, || async {
-                let sub_path = Path::new(path);
-                if let Ok(rest) = sub_path.strip_prefix("package-data") {
-                    FileData::from_path(
-                        &request_parts,
-                        &ctx.datadir.join(PKG_PUBLIC_DIR).join(rest),
-                    )
-                    .await?
-                    .into_response(&request_parts)
-                    .await
-                } else {
-                    Ok(not_found())
-                }
-            })
-            .await
+            todo!("pull directly from s9pk")
         }
         (&Method::GET, Some(("proxy", target))) => {
             if_authorized(&ctx, &request_parts, || async {
@@ -322,19 +251,27 @@ async fn main_embassy_ui(req: Request<Body>, ctx: RpcContext) -> Result<Response
                                     .iter()
                                     .any(|bad| h.as_str().eq_ignore_ascii_case(bad))
                             })
-                            .map(|(h, v)| (h.clone(), v.clone()))
+                            .flat_map(|(h, v)| {
+                                Some((
+                                    reqwest::header::HeaderName::from_lowercase(
+                                        h.as_str().as_bytes(),
+                                    )
+                                    .ok()?,
+                                    reqwest::header::HeaderValue::from_bytes(v.as_bytes()).ok()?,
+                                ))
+                            })
                             .collect(),
                     )
                     .send()
                     .await
                     .with_kind(crate::ErrorKind::Network)?;
-                let mut hres = Response::builder().status(res.status());
+                let mut hres = Response::builder().status(res.status().as_u16());
                 for (h, v) in res.headers().clone() {
                     if let Some(h) = h {
-                        hres = hres.header(h, v);
+                        hres = hres.header(h.to_string(), v.as_bytes());
                     }
                 }
-                hres.body(Body::wrap_stream(res.bytes_stream()))
+                hres.body(Body::from_stream(res.bytes_stream()))
                     .with_kind(crate::ErrorKind::Network)
             })
             .await
@@ -368,7 +305,7 @@ async fn main_embassy_ui(req: Request<Body>, ctx: RpcContext) -> Result<Response
     }
 }
 
-fn un_authorized(err: Error, path: &str) -> Result<Response<Body>, Error> {
+fn un_authorized(err: Error, path: &str) -> Result<Response, Error> {
     tracing::warn!("unauthorized for {} @{:?}", err, path);
     tracing::debug!("{:?}", err);
     Ok(Response::builder()
@@ -378,7 +315,7 @@ fn un_authorized(err: Error, path: &str) -> Result<Response<Body>, Error> {
 }
 
 /// HTTP status code 404
-fn not_found() -> Response<Body> {
+fn not_found() -> Response {
     Response::builder()
         .status(StatusCode::NOT_FOUND)
         .body(NOT_FOUND.into())
@@ -386,28 +323,28 @@ fn not_found() -> Response<Body> {
 }
 
 /// HTTP status code 405
-fn method_not_allowed() -> Response<Body> {
+fn method_not_allowed() -> Response {
     Response::builder()
         .status(StatusCode::METHOD_NOT_ALLOWED)
         .body(METHOD_NOT_ALLOWED.into())
         .unwrap()
 }
 
-fn server_error(err: Error) -> Response<Body> {
+fn server_error(err: Error) -> Response {
     Response::builder()
         .status(StatusCode::INTERNAL_SERVER_ERROR)
         .body(err.to_string().into())
         .unwrap()
 }
 
-fn bad_request() -> Response<Body> {
+fn bad_request() -> Response {
     Response::builder()
         .status(StatusCode::BAD_REQUEST)
         .body(Body::empty())
         .unwrap()
 }
 
-fn cert_send(cert: &X509, hostname: &Hostname) -> Result<Response<Body>, Error> {
+fn cert_send(cert: &X509, hostname: &Hostname) -> Result<Response, Error> {
     let pem = cert.to_pem()?;
     Response::builder()
         .status(StatusCode::OK)
@@ -499,12 +436,12 @@ impl FileData {
         let (len, data) = if encoding == Some("gzip") {
             (
                 None,
-                Body::wrap_stream(ReaderStream::new(GzipEncoder::new(BufReader::new(file)))),
+                Body::from_stream(ReaderStream::new(GzipEncoder::new(BufReader::new(file)))),
             )
         } else {
             (
                 Some(metadata.len()),
-                Body::wrap_stream(ReaderStream::new(file)),
+                Body::from_stream(ReaderStream::new(file)),
             )
         };
 
@@ -519,7 +456,7 @@ impl FileData {
         })
     }
 
-    async fn into_response(self, req: &RequestParts) -> Result<Response<Body>, Error> {
+    async fn into_response(self, req: &RequestParts) -> Result<Response, Error> {
         let mut builder = Response::builder();
         if let Some(mime) = self.mime {
             builder = builder.header(http::header::CONTENT_TYPE, &*mime);
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 1bf4c5f44..13096dab8 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -4,7 +4,7 @@ use std::sync::atomic::AtomicBool;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
-use clap::ArgMatches;
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::future::BoxFuture;
 use futures::{FutureExt, TryStreamExt};
@@ -12,8 +12,9 @@ use helpers::NonDetachingJoinHandle;
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use regex::Regex;
-use rpc_toolkit::command;
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use tokio::net::TcpStream;
 use tokio::process::Command;
 use tokio::sync::{mpsc, oneshot};
@@ -27,8 +28,8 @@ use crate::logs::{
     cli_logs_generic_follow, cli_logs_generic_nofollow, fetch_logs, follow_logs, journalctl,
     LogFollowResponse, LogResponse, LogSource,
 };
-use crate::util::serde::{display_serializable, IoFormat};
-use crate::util::{display_none, Invoke};
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
+use crate::util::Invoke;
 use crate::{Error, ErrorKind, ResultExt as _};
 
 pub const SYSTEMD_UNIT: &str = "tor@default";
@@ -53,16 +54,37 @@ lazy_static! {
     static ref PROGRESS_REGEX: Regex = Regex::new("PROGRESS=([0-9]+)").unwrap();
 }
 
-#[command(subcommands(list_services, logs, reset))]
-pub fn tor() -> Result<(), Error> {
-    Ok(())
+pub fn tor() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "list-services",
+            from_fn_async(list_services)
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(display_services(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("logs", logs())
+        .subcommand(
+            "reset",
+            from_fn_async(reset)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+}
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ResetParams {
+    #[arg(name = "wipe-state", short = 'w', long = "wipe-state")]
+    wipe_state: bool,
+    reason: String,
 }
 
-#[command(display(display_none))]
 pub async fn reset(
-    #[context] ctx: RpcContext,
-    #[arg(rename = "wipe-state", short = 'w', long = "wipe-state")] wipe_state: bool,
-    #[arg] reason: String,
+    ctx: RpcContext,
+    ResetParams { reason, wipe_state }: ResetParams,
 ) -> Result<(), Error> {
     ctx.net_controller
         .tor
@@ -70,11 +92,11 @@ pub async fn reset(
         .await
 }
 
-fn display_services(services: Vec<OnionAddressV3>, matches: &ArgMatches) {
+pub fn display_services(params: WithIoFormat<Empty>, services: Vec<OnionAddressV3>) {
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(services, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, services);
     }
 
     let mut table = Table::new();
@@ -85,32 +107,54 @@ fn display_services(services: Vec<OnionAddressV3>, matches: &ArgMatches) {
     table.print_tty(false).unwrap();
 }
 
-#[command(rename = "list-services", display(display_services))]
-pub async fn list_services(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<Vec<OnionAddressV3>, Error> {
+pub async fn list_services(ctx: RpcContext, _: Empty) -> Result<Vec<OnionAddressV3>, Error> {
     ctx.net_controller.tor.list_services().await
 }
 
-#[command(
-    custom_cli(cli_logs(async, context(CliContext))),
-    subcommands(self(logs_nofollow(async)), logs_follow),
-    display(display_none)
-)]
-pub async fn logs(
-    #[arg(short = 'l', long = "limit")] limit: Option<usize>,
-    #[arg(short = 'c', long = "cursor")] cursor: Option<String>,
-    #[arg(short = 'B', long = "before", default)] before: bool,
-    #[arg(short = 'f', long = "follow", default)] follow: bool,
-) -> Result<(Option<usize>, Option<String>, bool, bool), Error> {
-    Ok((limit, cursor, before, follow))
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct LogsParams {
+    #[arg(short = 'l', long = "limit")]
+    limit: Option<usize>,
+    #[arg(short = 'c', long = "cursor")]
+    cursor: Option<String>,
+    #[arg(short = 'B', long = "before")]
+    #[serde(default)]
+    before: bool,
+    #[arg(short = 'f', long = "follow")]
+    #[serde(default)]
+    follow: bool,
+}
+
+pub fn logs() -> ParentHandler<LogsParams> {
+    ParentHandler::new()
+        .root_handler(
+            from_fn_async(cli_logs)
+                .no_display()
+                .with_inherited(|params, _| params),
+        )
+        .root_handler(
+            from_fn_async(logs_nofollow)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
+        .subcommand(
+            "follow",
+            from_fn_async(logs_follow)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
 }
 pub async fn cli_logs(
     ctx: CliContext,
-    (limit, cursor, before, follow): (Option<usize>, Option<String>, bool, bool),
+    _: Empty,
+    LogsParams {
+        limit,
+        cursor,
+        before,
+        follow,
+    }: LogsParams,
 ) -> Result<(), RpcError> {
     if follow {
         if cursor.is_some() {
@@ -131,16 +175,22 @@ pub async fn cli_logs(
     }
 }
 pub async fn logs_nofollow(
-    _ctx: (),
-    (limit, cursor, before, _): (Option<usize>, Option<String>, bool, bool),
+    _: AnyContext,
+    _: Empty,
+    LogsParams {
+        limit,
+        cursor,
+        before,
+        ..
+    }: LogsParams,
 ) -> Result<LogResponse, Error> {
     fetch_logs(LogSource::Unit(SYSTEMD_UNIT), limit, cursor, before).await
 }
 
-#[command(rpc_only, rename = "follow", display(display_none))]
 pub async fn logs_follow(
-    #[context] ctx: RpcContext,
-    #[parent_data] (limit, _, _, _): (Option<usize>, Option<String>, bool, bool),
+    ctx: RpcContext,
+    _: Empty,
+    LogsParams { limit, .. }: LogsParams,
 ) -> Result<LogFollowResponse, Error> {
     follow_logs(ctx, LogSource::Unit(SYSTEMD_UNIT), limit).await
 }
@@ -216,7 +266,7 @@ impl TorController {
             .lines()
             .map(|l| l.trim())
             .filter(|l| !l.is_empty())
-            .map(|l| l.parse().with_kind(ErrorKind::Tor))
+            .map(|l| l.parse::<OnionAddressV3>().with_kind(ErrorKind::Tor))
             .collect()
     }
 }
diff --git a/core/startos/src/net/utils.rs b/core/startos/src/net/utils.rs
index e496bd1f7..6de319a5e 100644
--- a/core/startos/src/net/utils.rs
+++ b/core/startos/src/net/utils.rs
@@ -1,4 +1,3 @@
-use std::convert::Infallible;
 use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
 use std::path::Path;
 
@@ -120,16 +119,16 @@ impl<T> SingleAccept<T> {
         Self(Some(conn))
     }
 }
-impl<T> hyper::server::accept::Accept for SingleAccept<T> {
-    type Conn = T;
-    type Error = Infallible;
-    fn poll_accept(
-        self: std::pin::Pin<&mut Self>,
-        _cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Option<Result<Self::Conn, Self::Error>>> {
-        std::task::Poll::Ready(self.project().0.take().map(Ok))
-    }
-}
+// impl<T> axum_server::accept::Accept for SingleAccept<T> {
+//     type Conn = T;
+//     type Error = Infallible;
+//     fn poll_accept(
+//         self: std::pin::Pin<&mut Self>,
+//         _cx: &mut std::task::Context<'_>,
+//     ) -> std::task::Poll<Option<Result<Self::Conn, Self::Error>>> {
+//         std::task::Poll::Ready(self.project().0.take().map(Ok))
+//     }
+// }
 
 pub struct TcpListeners {
     listeners: Vec<TcpListener>,
@@ -147,20 +146,21 @@ impl TcpListeners {
             .0
     }
 }
-impl hyper::server::accept::Accept for TcpListeners {
-    type Conn = TcpStream;
-    type Error = std::io::Error;
+// impl hyper::server::accept::Accept for TcpListeners {
+//     type Conn = TcpStream;
+//     type Error = std::io::Error;
 
-    fn poll_accept(
-        self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Option<Result<Self::Conn, Self::Error>>> {
-        for listener in self.listeners.iter() {
-            let poll = listener.poll_accept(cx);
-            if poll.is_ready() {
-                return poll.map(|a| a.map(|a| a.0)).map(Some);
-            }
-        }
-        std::task::Poll::Pending
-    }
-}
+//     fn poll_accept(
+//         self: std::pin::Pin<&mut Self>,
+//         cx: &mut std::task::Context<'_>,
+//     ) -> std::task::Poll<Option<Result<Self::Conn, Self::Error>>> {
+//         for listener in self.listeners.iter() {
+//             let poll = listener.poll_accept(cx);
+//             if poll.is_ready() {
+//                 return poll.map(|a| a.map(|a| a.0)).map(Some);
+//             }
+//         }
+//         std::task::Poll::Pending
+//     }
+// }
+// TODO
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index bfbba0572..3d60544db 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -1,18 +1,16 @@
 use std::collections::BTreeMap;
-use std::convert::Infallible;
 use std::net::{IpAddr, Ipv6Addr, SocketAddr};
-use std::str::FromStr;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
 use color_eyre::eyre::eyre;
 use helpers::NonDetachingJoinHandle;
-use http::{Response, Uri};
-use hyper::service::{make_service_fn, service_fn};
-use hyper::Body;
 use models::ResultExt;
 use tokio::net::{TcpListener, TcpStream};
 use tokio::sync::{Mutex, RwLock};
+use tokio_rustls::rustls::pki_types::{
+    CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer, ServerName,
+};
 use tokio_rustls::rustls::server::Acceptor;
 use tokio_rustls::rustls::{RootCertStore, ServerConfig};
 use tokio_rustls::{LazyConfigAcceptor, TlsConnector};
@@ -20,7 +18,6 @@ use tracing::instrument;
 
 use crate::net::keys::Key;
 use crate::net::ssl::SslManager;
-use crate::net::utils::SingleAccept;
 use crate::prelude::*;
 use crate::util::io::{BackTrackingReader, TimeoutStream};
 
@@ -125,37 +122,38 @@ impl VHostServer {
                                     {
                                         Ok(a) => a,
                                         Err(_) => {
-                                            stream.rewind();
-                                            return hyper::server::Server::builder(
-                                                SingleAccept::new(stream),
-                                            )
-                                            .serve(make_service_fn(|_| async {
-                                                Ok::<_, Infallible>(service_fn(|req| async move {
-                                                    let host = req
-                                                        .headers()
-                                                        .get(http::header::HOST)
-                                                        .and_then(|host| host.to_str().ok());
-                                                    let uri = Uri::from_parts({
-                                                        let mut parts =
-                                                            req.uri().to_owned().into_parts();
-                                                        parts.authority = host
-                                                            .map(FromStr::from_str)
-                                                            .transpose()?;
-                                                        parts
-                                                    })?;
-                                                    Response::builder()
-                                                        .status(
-                                                            http::StatusCode::TEMPORARY_REDIRECT,
-                                                        )
-                                                        .header(
-                                                            http::header::LOCATION,
-                                                            uri.to_string(),
-                                                        )
-                                                        .body(Body::default())
-                                                }))
-                                            }))
-                                            .await
-                                            .with_kind(crate::ErrorKind::Network);
+                                            // stream.rewind();
+                                            // return hyper::server::Server::builder(
+                                            //     SingleAccept::new(stream),
+                                            // )
+                                            // .serve(make_service_fn(|_| async {
+                                            //     Ok::<_, Infallible>(service_fn(|req| async move {
+                                            //         let host = req
+                                            //             .headers()
+                                            //             .get(http::header::HOST)
+                                            //             .and_then(|host| host.to_str().ok());
+                                            //         let uri = Uri::from_parts({
+                                            //             let mut parts =
+                                            //                 req.uri().to_owned().into_parts();
+                                            //             parts.authority = host
+                                            //                 .map(FromStr::from_str)
+                                            //                 .transpose()?;
+                                            //             parts
+                                            //         })?;
+                                            //         Response::builder()
+                                            //             .status(
+                                            //                 http::StatusCode::TEMPORARY_REDIRECT,
+                                            //             )
+                                            //             .header(
+                                            //                 http::header::LOCATION,
+                                            //                 uri.to_string(),
+                                            //             )
+                                            //             .body(Body::default())
+                                            //     }))
+                                            // }))
+                                            // .await
+                                            // .with_kind(crate::ErrorKind::Network);
+                                            todo!()
                                         }
                                     };
                                     let target_name =
@@ -189,7 +187,6 @@ impl VHostServer {
                                         let key =
                                             ssl.with_certs(target.key, target.addr.ip()).await?;
                                         let cfg = ServerConfig::builder()
-                                            .with_safe_defaults()
                                             .with_no_client_auth();
                                         let mut cfg =
                                             if mid.client_hello().signature_schemes().contains(
@@ -199,44 +196,43 @@ impl VHostServer {
                                                     key.fullchain_ed25519()
                                                         .into_iter()
                                                         .map(|c| {
-                                                            Ok(tokio_rustls::rustls::Certificate(
+                                                            Ok(tokio_rustls::rustls::pki_types::CertificateDer::from(
                                                                 c.to_der()?,
                                                             ))
                                                         })
                                                         .collect::<Result<_, Error>>()?,
-                                                    tokio_rustls::rustls::PrivateKey(
+                                                    PrivateKeyDer::from(PrivatePkcs8KeyDer::from(
                                                         key.key()
                                                             .openssl_key_ed25519()
-                                                            .private_key_to_der()?,
-                                                    ),
+                                                            .private_key_to_pkcs8()?,
+                                                    )),
                                                 )
                                             } else {
                                                 cfg.with_single_cert(
                                                     key.fullchain_nistp256()
                                                         .into_iter()
                                                         .map(|c| {
-                                                            Ok(tokio_rustls::rustls::Certificate(
+                                                            Ok(tokio_rustls::rustls::pki_types::CertificateDer::from(
                                                                 c.to_der()?,
                                                             ))
                                                         })
                                                         .collect::<Result<_, Error>>()?,
-                                                    tokio_rustls::rustls::PrivateKey(
+                                                    PrivateKeyDer::from(PrivatePkcs8KeyDer::from(
                                                         key.key()
                                                             .openssl_key_nistp256()
-                                                            .private_key_to_der()?,
-                                                    ),
+                                                            .private_key_to_pkcs8()?,
+                                                    )),
                                                 )
                                             }
                                             .with_kind(crate::ErrorKind::OpenSsl)?;
                                         match target.connect_ssl {
                                             Ok(()) => {
                                                 let mut client_cfg =
-                                                    tokio_rustls::rustls::ClientConfig::builder()
-                                                        .with_safe_defaults()
+                                                tokio_rustls::rustls::ClientConfig::builder()
                                                         .with_root_certificates({
                                                             let mut store = RootCertStore::empty();
                                                             store.add(
-                                                        &tokio_rustls::rustls::Certificate(
+                                                        CertificateDer::from(
                                                             key.root_ca().to_der()?,
                                                         ),
                                                     ).with_kind(crate::ErrorKind::OpenSsl)?;
@@ -253,13 +249,9 @@ impl VHostServer {
                                                 let mut target_stream =
                                                     TlsConnector::from(Arc::new(client_cfg))
                                                         .connect_with(
-                                                            key.key()
-                                                                .internal_address()
-                                                                .as_str()
-                                                                .try_into()
-                                                                .with_kind(
-                                                                    crate::ErrorKind::OpenSsl,
-                                                                )?,
+                                                            ServerName::try_from(
+                                                                key.key().internal_address(),
+                                                            ).with_kind(crate::ErrorKind::OpenSsl)?,
                                                             tcp_stream,
                                                             |conn| {
                                                                 cfg.alpn_protocols.extend(
diff --git a/core/startos/src/net/web_server.rs b/core/startos/src/net/web_server.rs
index c2e25a413..a89aae92f 100644
--- a/core/startos/src/net/web_server.rs
+++ b/core/startos/src/net/web_server.rs
@@ -1,18 +1,15 @@
-use std::convert::Infallible;
 use std::net::SocketAddr;
+use std::time::Duration;
 
-use futures::future::ready;
-use futures::FutureExt;
+use axum::Router;
+use axum_server::Handle;
 use helpers::NonDetachingJoinHandle;
-use hyper::service::{make_service_fn, service_fn};
-use hyper::Server;
 use tokio::sync::oneshot;
 
 use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext};
 use crate::net::static_server::{
     diag_ui_file_router, install_ui_file_router, main_ui_server_router, setup_ui_file_router,
 };
-use crate::net::HttpHandler;
 use crate::Error;
 
 pub struct WebServer {
@@ -20,18 +17,18 @@ pub struct WebServer {
     thread: NonDetachingJoinHandle<()>,
 }
 impl WebServer {
-    pub fn new(bind: SocketAddr, router: HttpHandler) -> Self {
+    pub fn new(bind: SocketAddr, router: Router) -> Self {
         let (shutdown, shutdown_recv) = oneshot::channel();
         let thread = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            let server = Server::bind(&bind)
-                .http1_preserve_header_case(true)
-                .http1_title_case_headers(true)
-                .serve(make_service_fn(move |_| {
-                    let router = router.clone();
-                    ready(Ok::<_, Infallible>(service_fn(move |req| router(req))))
-                }))
-                .with_graceful_shutdown(shutdown_recv.map(|_| ()));
-            if let Err(e) = server.await {
+            let handle = Handle::new();
+            let mut server = axum_server::bind(bind).handle(handle.clone());
+            server.http_builder().http1().preserve_header_case(true);
+            server.http_builder().http1().title_case_headers(true);
+
+            if let (Err(e), _) = tokio::join!(server.serve(router.into_make_service()), async {
+                let _ = shutdown_recv.await;
+                handle.graceful_shutdown(Some(Duration::from_secs(0)));
+            }) {
                 tracing::error!("Spawning hyper server error: {}", e);
             }
         }));
@@ -43,19 +40,19 @@ impl WebServer {
         self.thread.await.unwrap()
     }
 
-    pub async fn main(bind: SocketAddr, ctx: RpcContext) -> Result<Self, Error> {
-        Ok(Self::new(bind, main_ui_server_router(ctx).await?))
+    pub fn main(bind: SocketAddr, ctx: RpcContext) -> Result<Self, Error> {
+        Ok(Self::new(bind, main_ui_server_router(ctx)))
     }
 
-    pub async fn setup(bind: SocketAddr, ctx: SetupContext) -> Result<Self, Error> {
-        Ok(Self::new(bind, setup_ui_file_router(ctx).await?))
+    pub fn setup(bind: SocketAddr, ctx: SetupContext) -> Result<Self, Error> {
+        Ok(Self::new(bind, setup_ui_file_router(ctx)))
     }
 
-    pub async fn diagnostic(bind: SocketAddr, ctx: DiagnosticContext) -> Result<Self, Error> {
-        Ok(Self::new(bind, diag_ui_file_router(ctx).await?))
+    pub fn diagnostic(bind: SocketAddr, ctx: DiagnosticContext) -> Result<Self, Error> {
+        Ok(Self::new(bind, diag_ui_file_router(ctx)))
     }
 
-    pub async fn install(bind: SocketAddr, ctx: InstallContext) -> Result<Self, Error> {
-        Ok(Self::new(bind, install_ui_file_router(ctx).await?))
+    pub fn install(bind: SocketAddr, ctx: InstallContext) -> Result<Self, Error> {
+        Ok(Self::new(bind, install_ui_file_router(ctx)))
     }
 }
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index 8429f9205..be1c49fdc 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -3,19 +3,21 @@ use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
 
-use clap::ArgMatches;
+use clap::builder::TypedValueParser;
+use clap::Parser;
 use isocountry::CountryCode;
 use lazy_static::lazy_static;
 use regex::Regex;
-use rpc_toolkit::command;
+use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use tokio::sync::RwLock;
 use tracing::instrument;
 
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
-use crate::util::serde::{display_serializable, IoFormat};
-use crate::util::{display_none, Invoke};
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
+use crate::util::Invoke;
 use crate::{Error, ErrorKind};
 
 type WifiManager = Arc<RwLock<WpaCli>>;
@@ -31,28 +33,69 @@ pub fn wifi_manager(ctx: &RpcContext) -> Result<&WifiManager, Error> {
     }
 }
 
-#[command(subcommands(add, connect, delete, get, country, available))]
-pub async fn wifi() -> Result<(), Error> {
-    Ok(())
+pub fn wifi() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "add",
+            from_fn_async(add)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "connect",
+            from_fn_async(connect)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "delete",
+            from_fn_async(delete)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "get",
+            from_fn_async(get)
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(display_wifi_info(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand("country", country())
+        .subcommand("available", available())
 }
 
-#[command(subcommands(get_available))]
-pub async fn available() -> Result<(), Error> {
-    Ok(())
+pub fn available() -> ParentHandler {
+    ParentHandler::new().subcommand(
+        "get",
+        from_fn_async(get_available)
+            .with_display_serializable()
+            .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                Ok(display_wifi_list(handle.params, result))
+            })
+            .with_remote_cli::<CliContext>(),
+    )
 }
 
-#[command(subcommands(set_country))]
-pub async fn country() -> Result<(), Error> {
-    Ok(())
+pub fn country() -> ParentHandler {
+    ParentHandler::new().subcommand(
+        "set",
+        from_fn_async(set_country)
+            .no_display()
+            .with_remote_cli::<CliContext>(),
+    )
 }
 
-#[command(display(display_none))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct AddParams {
+    ssid: String,
+    password: String,
+}
 #[instrument(skip_all)]
-pub async fn add(
-    #[context] ctx: RpcContext,
-    #[arg] ssid: String,
-    #[arg] password: String,
-) -> Result<(), Error> {
+pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Result<(), Error> {
     let wifi_manager = wifi_manager(&ctx)?;
     if !ssid.is_ascii() {
         return Err(Error::new(
@@ -95,10 +138,15 @@ pub async fn add(
     }
     Ok(())
 }
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct SsidParams {
+    ssid: String,
+}
 
-#[command(display(display_none))]
 #[instrument(skip_all)]
-pub async fn connect(#[context] ctx: RpcContext, #[arg] ssid: String) -> Result<(), Error> {
+pub async fn connect(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<(), Error> {
     let wifi_manager = wifi_manager(&ctx)?;
     if !ssid.is_ascii() {
         return Err(Error::new(
@@ -144,9 +192,8 @@ pub async fn connect(#[context] ctx: RpcContext, #[arg] ssid: String) -> Result<
     Ok(())
 }
 
-#[command(display(display_none))]
 #[instrument(skip_all)]
-pub async fn delete(#[context] ctx: RpcContext, #[arg] ssid: String) -> Result<(), Error> {
+pub async fn delete(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<(), Error> {
     let wifi_manager = wifi_manager(&ctx)?;
     if !ssid.is_ascii() {
         return Err(Error::new(
@@ -192,11 +239,11 @@ pub struct WifiListOut {
     security: Vec<String>,
 }
 pub type WifiList = HashMap<Ssid, WifiListInfo>;
-fn display_wifi_info(info: WiFiInfo, matches: &ArgMatches) {
+fn display_wifi_info(params: WithIoFormat<Empty>, info: WiFiInfo) {
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(info, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, info);
     }
 
     let mut table_global = Table::new();
@@ -256,11 +303,11 @@ fn display_wifi_info(info: WiFiInfo, matches: &ArgMatches) {
     table_global.print_tty(false).unwrap();
 }
 
-fn display_wifi_list(info: Vec<WifiListOut>, matches: &ArgMatches) {
+fn display_wifi_list(params: WithIoFormat<Empty>, info: Vec<WifiListOut>) {
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(info, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, info);
     }
 
     let mut table_global = Table::new();
@@ -280,14 +327,9 @@ fn display_wifi_list(info: Vec<WifiListOut>, matches: &ArgMatches) {
     table_global.print_tty(false).unwrap();
 }
 
-#[command(display(display_wifi_info))]
+// #[command(display(display_wifi_info))]
 #[instrument(skip_all)]
-pub async fn get(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<WiFiInfo, Error> {
+pub async fn get(ctx: RpcContext, _: Empty) -> Result<WiFiInfo, Error> {
     let wifi_manager = wifi_manager(&ctx)?;
     let wpa_supplicant = wifi_manager.read().await;
     let (list_networks, current_res, country_res, ethernet_res, signal_strengths) = tokio::join!(
@@ -334,14 +376,8 @@ pub async fn get(
     })
 }
 
-#[command(rename = "get", display(display_wifi_list))]
 #[instrument(skip_all)]
-pub async fn get_available(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<Vec<WifiListOut>, Error> {
+pub async fn get_available(ctx: RpcContext, _: Empty) -> Result<Vec<WifiListOut>, Error> {
     let wifi_manager = wifi_manager(&ctx)?;
     let wpa_supplicant = wifi_manager.read().await;
     let (wifi_list, network_list) = tokio::join!(
@@ -366,10 +402,16 @@ pub async fn get_available(
     Ok(wifi_list)
 }
 
-#[command(rename = "set", display(display_none))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct SetCountryParams {
+    #[arg(value_parser = CountryCodeParser)]
+    country: CountryCode,
+}
 pub async fn set_country(
-    #[context] ctx: RpcContext,
-    #[arg(parse(country_code_parse))] country: CountryCode,
+    ctx: RpcContext,
+    SetCountryParams { country }: SetCountryParams,
 ) -> Result<(), Error> {
     let wifi_manager = wifi_manager(&ctx)?;
     if !interface_connected(&ctx.ethernet_interface).await? {
@@ -769,13 +811,24 @@ pub async fn interface_connected(interface: &str) -> Result<bool, Error> {
     Ok(v.is_some())
 }
 
-pub fn country_code_parse(code: &str, _matches: &ArgMatches) -> Result<CountryCode, Error> {
-    CountryCode::for_alpha2(code).map_err(|_| {
-        Error::new(
-            color_eyre::eyre::eyre!("Invalid Country Code: {}", code),
-            ErrorKind::Wifi,
-        )
-    })
+#[derive(Clone)]
+struct CountryCodeParser;
+impl TypedValueParser for CountryCodeParser {
+    type Value = CountryCode;
+    fn parse_ref(
+        &self,
+        _: &clap::Command,
+        _: Option<&clap::Arg>,
+        value: &std::ffi::OsStr,
+    ) -> Result<Self::Value, clap::Error> {
+        let code = value.to_string_lossy();
+        CountryCode::for_alpha2(&code).map_err(|_| {
+            clap::Error::raw(
+                clap::error::ErrorKind::ValueValidation,
+                color_eyre::eyre::eyre!("Invalid Country Code: {}", code),
+            )
+        })
+    }
 }
 
 #[instrument(skip_all)]
diff --git a/core/startos/src/net/ws_server.rs b/core/startos/src/net/ws_server.rs
deleted file mode 100644
index 16519c6c8..000000000
--- a/core/startos/src/net/ws_server.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use crate::context::RpcContext;
-
-pub async fn ws_server_handle(rpc_ctx: RpcContext) {
-
-    let ws_ctx = rpc_ctx.clone();
-    let ws_server_handle = {
-        let builder = Server::bind(&ws_ctx.bind_ws);
-
-        let make_svc = ::rpc_toolkit::hyper::service::make_service_fn(move |_| {
-            let ctx = ws_ctx.clone();
-            async move {
-                Ok::<_, ::rpc_toolkit::hyper::Error>(::rpc_toolkit::hyper::service::service_fn(
-                    move |req| {
-                        let ctx = ctx.clone();
-                        async move {
-                            tracing::debug!("Request to {}", req.uri().path());
-                            match req.uri().path() {
-                                "/ws/db" => {
-                                    Ok(subscribe(ctx, req).await.unwrap_or_else(err_to_500))
-                                }
-                                path if path.starts_with("/ws/rpc/") => {
-                                     match RequestGuid::from(
-                                        path.strip_prefix("/ws/rpc/").unwrap(),
-                                    ) {
-                                        None => {
-                                            tracing::debug!("No Guid Path");
-                                            Response::builder()
-                                                .status(StatusCode::BAD_REQUEST)
-                                                .body(Body::empty())
-                                        }
-                                        Some(guid) => {
-                                            match ctx.get_ws_continuation_handler(&guid).await {
-                                                Some(cont) => match cont(req).await {
-                                                    Ok(r) => Ok(r),
-                                                    Err(e) => Response::builder()
-                                                        .status(
-                                                            StatusCode::INTERNAL_SERVER_ERROR,
-                                                        )
-                                                        .body(Body::from(format!("{}", e))),
-                                                },
-                                                _ => Response::builder()
-                                                    .status(StatusCode::NOT_FOUND)
-                                                    .body(Body::empty()),
-                                            }
-                                        }
-                                    }
-                                }
-                                path if path.starts_with("/rest/rpc/") => {
-                                    match RequestGuid::from(
-                                        path.strip_prefix("/rest/rpc/").unwrap(),
-                                    ) {
-                                        None => {
-                                            tracing::debug!("No Guid Path");
-                                            Response::builder()
-                                                .status(StatusCode::BAD_REQUEST)
-                                                .body(Body::empty())
-                                        }
-                                        Some(guid) => {
-                                            match ctx.get_rest_continuation_handler(&guid).await
-                                            {
-                                                None => Response::builder()
-                                                    .status(StatusCode::NOT_FOUND)
-                                                    .body(Body::empty()),
-                                                Some(cont) => match cont(req).await {
-                                                    Ok(r) => Ok(r),
-                                                    Err(e) => Response::builder()
-                                                        .status(
-                                                            StatusCode::INTERNAL_SERVER_ERROR,
-                                                        )
-                                                        .body(Body::from(format!("{}", e))),
-                                                },
-                                            }
-                                        }
-                                    }
-                                }
-                                _ => Response::builder()
-                                    .status(StatusCode::NOT_FOUND)
-                                    .body(Body::empty()),
-                            }
-                        }
-                    },
-                ))
-            }
-        });
-        builder.serve(make_svc)
-    }
-    .with_graceful_shutdown({
-        let mut shutdown = rpc_ctx.shutdown.subscribe();
-        async move {
-            shutdown.recv().await.expect("context dropped");
-        }
-    });
-
-}
\ No newline at end of file
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index 73351471c..aa0b0b963 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -2,32 +2,66 @@ use std::collections::HashMap;
 use std::fmt;
 use std::str::FromStr;
 
-use chrono::{DateTime, Utc};
+use chrono::{DateTime, TimeZone, Utc};
+use clap::builder::ValueParserFactory;
+use clap::Parser;
 use color_eyre::eyre::eyre;
-use rpc_toolkit::command;
+use models::PackageId;
+use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use sqlx::PgPool;
 use tokio::sync::Mutex;
 use tracing::instrument;
 
 use crate::backup::BackupReport;
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::util::display_none;
-use crate::util::serde::display_serializable;
+use crate::util::clap::FromStrParser;
+use crate::util::serde::HandlerExtSerde;
 use crate::{Error, ErrorKind, ResultExt};
 
-#[command(subcommands(list, delete, delete_before, create))]
-pub async fn notification() -> Result<(), Error> {
-    Ok(())
+// #[command(subcommands(list, delete, delete_before, create))]
+pub fn notification() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "list",
+            from_fn_async(list)
+                .with_display_serializable()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "delete",
+            from_fn_async(delete)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "delete-before",
+            from_fn_async(delete_before)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "create",
+            from_fn_async(create)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
-#[command(display(display_serializable))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ListParams {
+    before: Option<i32>,
+
+    limit: Option<u32>,
+}
+// #[command(display(display_serializable))]
 #[instrument(skip_all)]
 pub async fn list(
-    #[context] ctx: RpcContext,
-    #[arg] before: Option<i32>,
-    #[arg] limit: Option<u32>,
+    ctx: RpcContext,
+    ListParams { before, limit }: ListParams,
 ) -> Result<Vec<Notification>, Error> {
     let limit = limit.unwrap_or(40);
     match before {
@@ -42,7 +76,7 @@ pub async fn list(
                     Ok(Notification {
                         id: r.id as u32,
                         package_id: r.package_id.and_then(|p| p.parse().ok()),
-                        created_at: DateTime::from_utc(r.created_at, Utc),
+                        created_at: Utc.from_utc_datetime(&r.created_at),
                         code: r.code as u32,
                         level: match r.level.parse::<NotificationLevel>() {
                             Ok(a) => a,
@@ -87,7 +121,7 @@ pub async fn list(
                     Ok(Notification {
                         id: r.id as u32,
                         package_id: r.package_id.and_then(|p| p.parse().ok()),
-                        created_at: DateTime::from_utc(r.created_at, Utc),
+                        created_at: Utc.from_utc_datetime(&r.created_at),
                         code: r.code as u32,
                         level: match r.level.parse::<NotificationLevel>() {
                             Ok(a) => a,
@@ -115,29 +149,53 @@ pub async fn list(
     }
 }
 
-#[command(display(display_none))]
-pub async fn delete(#[context] ctx: RpcContext, #[arg] id: i32) -> Result<(), Error> {
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct DeleteParams {
+    id: i32,
+}
+
+pub async fn delete(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Result<(), Error> {
     sqlx::query!("DELETE FROM notifications WHERE id = $1", id)
         .execute(&ctx.secret_store)
         .await?;
     Ok(())
 }
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct DeleteBeforeParams {
+    before: i32,
+}
 
-#[command(rename = "delete-before", display(display_none))]
-pub async fn delete_before(#[context] ctx: RpcContext, #[arg] before: i32) -> Result<(), Error> {
+pub async fn delete_before(
+    ctx: RpcContext,
+    DeleteBeforeParams { before }: DeleteBeforeParams,
+) -> Result<(), Error> {
     sqlx::query!("DELETE FROM notifications WHERE id < $1", before)
         .execute(&ctx.secret_store)
         .await?;
     Ok(())
 }
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct CreateParams {
+    package: Option<PackageId>,
+    level: NotificationLevel,
+    title: String,
+    message: String,
+}
 
-#[command(display(display_none))]
 pub async fn create(
-    #[context] ctx: RpcContext,
-    #[arg] package: Option<PackageId>,
-    #[arg] level: NotificationLevel,
-    #[arg] title: String,
-    #[arg] message: String,
+    ctx: RpcContext,
+    CreateParams {
+        package,
+        level,
+        title,
+        message,
+    }: CreateParams,
 ) -> Result<(), Error> {
     ctx.notification_manager
         .notify(ctx.db.clone(), package, level, title, message, (), None)
@@ -162,6 +220,13 @@ impl fmt::Display for NotificationLevel {
         }
     }
 }
+impl ValueParserFactory for NotificationLevel {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
+
 pub struct InvalidNotificationLevel(String);
 impl From<InvalidNotificationLevel> for crate::Error {
     fn from(val: InvalidNotificationLevel) -> Self {
@@ -192,7 +257,7 @@ impl fmt::Display for InvalidNotificationLevel {
 #[serde(rename_all = "kebab-case")]
 pub struct Notification {
     id: u32,
-    package_id: Option<PackageId>, // TODO change for package id newtype
+    package_id: Option<PackageId>,
     created_at: DateTime<Utc>,
     code: u32,
     level: NotificationLevel,
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 9e21e9f23..6bb5c5470 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -1,22 +1,23 @@
 use std::path::{Path, PathBuf};
 
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use models::Error;
-use rpc_toolkit::command;
+use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 
-use crate::context::InstallContext;
+use crate::context::{CliContext, InstallContext};
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
 use crate::disk::mount::filesystem::efivarfs::EfiVarFs;
 use crate::disk::mount::filesystem::{MountType, ReadWrite};
-use crate::disk::mount::guard::{MountGuard, TmpMountGuard};
+use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::disk::util::{DiskInfo, PartitionTable};
 use crate::disk::OsPartitionInfo;
 use crate::net::utils::{find_eth_iface, find_wifi_iface};
 use crate::util::serde::IoFormat;
-use crate::util::{display_none, Invoke};
+use crate::util::Invoke;
 use crate::ARCH;
 
 mod gpt;
@@ -30,17 +31,32 @@ pub struct PostInstallConfig {
     wifi_interface: Option<String>,
 }
 
-#[command(subcommands(disk, execute, reboot))]
-pub fn install() -> Result<(), Error> {
-    Ok(())
+pub fn install() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("disk", disk())
+        .subcommand(
+            "execute",
+            from_fn_async(execute)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "reboot",
+            from_fn_async(reboot)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
-#[command(subcommands(list))]
-pub fn disk() -> Result<(), Error> {
-    Ok(())
+pub fn disk() -> ParentHandler {
+    ParentHandler::new().subcommand(
+        "list",
+        from_fn_async(list)
+            .no_display()
+            .with_remote_cli::<CliContext>(),
+    )
 }
 
-#[command(display(display_none))]
 pub async fn list() -> Result<Vec<DiskInfo>, Error> {
     let skip = match async {
         Ok::<_, Error>(
@@ -103,10 +119,21 @@ async fn partition(disk: &mut DiskInfo, overwrite: bool) -> Result<OsPartitionIn
     }
 }
 
-#[command(display(display_none))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ExecuteParams {
+    logicalname: PathBuf,
+    #[arg(short = 'o')]
+    overwrite: bool,
+}
+
 pub async fn execute(
-    #[arg] logicalname: PathBuf,
-    #[arg(short = 'o')] mut overwrite: bool,
+    _: AnyContext,
+    ExecuteParams {
+        logicalname,
+        mut overwrite,
+    }: ExecuteParams,
 ) -> Result<(), Error> {
     let mut disk = crate::disk::util::list(&Default::default())
         .await?
@@ -153,21 +180,21 @@ pub async fn execute(
         {
             if let Err(e) = async {
                 // cp -r ${guard}/config /tmp/config
-                if tokio::fs::metadata(guard.as_ref().join("config/upgrade"))
+                if tokio::fs::metadata(guard.path().join("config/upgrade"))
                     .await
                     .is_ok()
                 {
-                    tokio::fs::remove_file(guard.as_ref().join("config/upgrade")).await?;
+                    tokio::fs::remove_file(guard.path().join("config/upgrade")).await?;
                 }
-                if tokio::fs::metadata(guard.as_ref().join("config/disk.guid"))
+                if tokio::fs::metadata(guard.path().join("config/disk.guid"))
                     .await
                     .is_ok()
                 {
-                    tokio::fs::remove_file(guard.as_ref().join("config/disk.guid")).await?;
+                    tokio::fs::remove_file(guard.path().join("config/disk.guid")).await?;
                 }
                 Command::new("cp")
                     .arg("-r")
-                    .arg(guard.as_ref().join("config"))
+                    .arg(guard.path().join("config"))
                     .arg("/tmp/config.bak")
                     .invoke(crate::ErrorKind::Filesystem)
                     .await?;
@@ -201,14 +228,14 @@ pub async fn execute(
         Command::new("cp")
             .arg("-r")
             .arg("/tmp/config.bak")
-            .arg(rootfs.as_ref().join("config"))
+            .arg(rootfs.path().join("config"))
             .invoke(crate::ErrorKind::Filesystem)
             .await?;
     } else {
-        tokio::fs::create_dir(rootfs.as_ref().join("config")).await?;
+        tokio::fs::create_dir(rootfs.path().join("config")).await?;
     }
-    tokio::fs::create_dir(rootfs.as_ref().join("next")).await?;
-    let current = rootfs.as_ref().join("current");
+    tokio::fs::create_dir(rootfs.path().join("next")).await?;
+    let current = rootfs.path().join("current");
     tokio::fs::create_dir(&current).await?;
 
     tokio::fs::create_dir(current.join("boot")).await?;
@@ -235,7 +262,7 @@ pub async fn execute(
         .await?;
 
     tokio::fs::write(
-        rootfs.as_ref().join("config/config.yaml"),
+        rootfs.path().join("config/config.yaml"),
         IoFormat::Yaml.to_vec(&PostInstallConfig {
             os_partitions: part_info.clone(),
             ethernet_interface: eth_iface,
@@ -273,7 +300,7 @@ pub async fn execute(
         .await?;
 
     let embassy_fs = MountGuard::mount(
-        &Bind::new(rootfs.as_ref()),
+        &Bind::new(rootfs.path()),
         current.join("media/embassy/embassyfs"),
         MountType::ReadOnly,
     )
@@ -330,8 +357,7 @@ pub async fn execute(
     Ok(())
 }
 
-#[command(display(display_none))]
-pub async fn reboot(#[context] ctx: InstallContext) -> Result<(), Error> {
+pub async fn reboot(ctx: InstallContext) -> Result<(), Error> {
     Command::new("sync")
         .invoke(crate::ErrorKind::Filesystem)
         .await?;
diff --git a/core/startos/src/prelude.rs b/core/startos/src/prelude.rs
index 3f70b7a2b..dddc1ecda 100644
--- a/core/startos/src/prelude.rs
+++ b/core/startos/src/prelude.rs
@@ -1,4 +1,5 @@
 pub use color_eyre::eyre::eyre;
+pub use lazy_format::lazy_format;
 pub use models::OptionExt;
 pub use tracing::instrument;
 
diff --git a/core/startos/src/procedure/build.rs b/core/startos/src/procedure/build.rs
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core/startos/src/procedure/docker.rs b/core/startos/src/procedure/docker.rs
deleted file mode 100644
index 154e97479..000000000
--- a/core/startos/src/procedure/docker.rs
+++ /dev/null
@@ -1,533 +0,0 @@
-use std::borrow::Cow;
-use std::collections::{BTreeMap, BTreeSet, VecDeque};
-use std::ffi::{OsStr, OsString};
-use std::net::Ipv4Addr;
-use std::os::unix::prelude::FileTypeExt;
-use std::path::{Path, PathBuf};
-use std::time::Duration;
-
-use color_eyre::eyre::eyre;
-use futures::future::{BoxFuture, Either as EitherFuture};
-use futures::{FutureExt, TryStreamExt};
-use helpers::{NonDetachingJoinHandle, UnixRpcClient};
-use models::{Id, ImageId, SYSTEM_PACKAGE_ID};
-use nix::sys::signal;
-use nix::unistd::Pid;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use tokio::io::{AsyncBufRead, AsyncBufReadExt, BufReader};
-use tokio::time::timeout;
-use tracing::instrument;
-
-use super::ProcedureName;
-use crate::context::RpcContext;
-use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::util::docker::{remove_container, CONTAINER_TOOL};
-use crate::util::serde::{Duration as SerdeDuration, IoFormat};
-use crate::util::Version;
-use crate::volume::{VolumeId, Volumes};
-use crate::{Error, ResultExt, HOST_IP};
-
-pub const NET_TLD: &str = "embassy";
-
-lazy_static::lazy_static! {
-    pub static ref SYSTEM_IMAGES: BTreeSet<ImageId> = {
-        let mut set = BTreeSet::new();
-
-        set.insert("compat".parse().unwrap());
-        set.insert("utils".parse().unwrap());
-
-        set
-    };
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct DockerContainers {
-    pub main: DockerContainer,
-    // #[serde(default)]
-    // pub aux: BTreeMap<String, DockerContainer>,
-}
-
-/// This is like the docker procedures of the past designs,
-/// but this time all the entrypoints and args are not
-/// part of this struct by choice. Used for the times that we are creating our own entry points
-#[derive(Clone, Debug, Deserialize, Serialize, patch_db::HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct DockerContainer {
-    pub image: ImageId,
-    #[serde(default)]
-    pub mounts: BTreeMap<VolumeId, PathBuf>,
-    #[serde(default)]
-    pub shm_size_mb: Option<usize>, // TODO: use postfix sizing? like 1k vs 1m vs 1g
-    #[serde(default)]
-    pub sigterm_timeout: Option<SerdeDuration>,
-    #[serde(default)]
-    pub system: bool,
-    #[serde(default)]
-    pub gpu_acceleration: bool,
-}
-
-impl DockerContainer {
-    /// We created a new exec runner, where we are going to be passing the commands for it to run.
-    /// Idea is that we are going to send it command and get the inputs be filtered back from the manager.
-    /// Then we could in theory run commands without the cost of running the docker exec which is known to have
-    /// a dely of > 200ms which is not acceptable.
-    #[instrument(skip_all)]
-    pub async fn long_running_execute(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-    ) -> Result<(LongRunning, UnixRpcClient), Error> {
-        let container_name = DockerProcedure::container_name(pkg_id, None);
-
-        let socket_path =
-            Path::new("/tmp/embassy/containers").join(format!("{pkg_id}_{pkg_version}"));
-        if tokio::fs::metadata(&socket_path).await.is_ok() {
-            tokio::fs::remove_dir_all(&socket_path).await?;
-        }
-        tokio::fs::create_dir_all(&socket_path).await?;
-
-        let mut cmd = LongRunning::setup_long_running_docker_cmd(
-            self,
-            ctx,
-            &container_name,
-            volumes,
-            pkg_id,
-            pkg_version,
-            &socket_path,
-        )
-        .await?;
-
-        let mut handle = cmd.spawn().with_kind(crate::ErrorKind::Docker)?;
-
-        let client = UnixRpcClient::new(socket_path.join("rpc.sock"));
-
-        let running_output = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            if let Err(err) = handle
-                .wait()
-                .await
-                .map_err(|e| eyre!("Runtime error: {e:?}"))
-            {
-                tracing::error!("{}", err);
-                tracing::debug!("{:?}", err);
-            }
-        }));
-
-        {
-            let socket = socket_path.join("rpc.sock");
-            if let Err(_err) = timeout(Duration::from_secs(1), async move {
-                while tokio::fs::metadata(&socket).await.is_err() {
-                    tokio::time::sleep(Duration::from_millis(10)).await;
-                }
-            })
-            .await
-            {
-                tracing::error!("Timed out waiting for init to create socket");
-            }
-        }
-
-        Ok((LongRunning { running_output }, client))
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct DockerProcedure {
-    pub image: ImageId,
-    #[serde(default)]
-    pub system: bool,
-    pub entrypoint: String,
-    #[serde(default)]
-    pub args: Vec<String>,
-    #[serde(default)]
-    pub inject: bool,
-    #[serde(default)]
-    pub mounts: BTreeMap<VolumeId, PathBuf>,
-    #[serde(default)]
-    pub io_format: Option<IoFormat>,
-    #[serde(default)]
-    pub sigterm_timeout: Option<SerdeDuration>,
-    #[serde(default)]
-    pub shm_size_mb: Option<usize>, // TODO: use postfix sizing? like 1k vs 1m vs 1g
-    #[serde(default)]
-    pub gpu_acceleration: bool,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, Default)]
-#[serde(rename_all = "kebab-case")]
-pub struct DockerInject {
-    #[serde(default)]
-    pub system: bool,
-    pub entrypoint: String,
-    #[serde(default)]
-    pub args: Vec<String>,
-    #[serde(default)]
-    pub io_format: Option<IoFormat>,
-    #[serde(default)]
-    pub sigterm_timeout: Option<SerdeDuration>,
-}
-impl DockerProcedure {
-    pub fn main_docker_procedure(
-        container: &DockerContainer,
-        injectable: &DockerInject,
-    ) -> DockerProcedure {
-        DockerProcedure {
-            image: container.image.clone(),
-            system: injectable.system,
-            entrypoint: injectable.entrypoint.clone(),
-            args: injectable.args.clone(),
-            inject: false,
-            mounts: container.mounts.clone(),
-            io_format: injectable.io_format,
-            sigterm_timeout: injectable.sigterm_timeout,
-            shm_size_mb: container.shm_size_mb,
-            gpu_acceleration: container.gpu_acceleration,
-        }
-    }
-
-    pub fn validate(
-        &self,
-        _eos_version: &Version,
-        volumes: &Volumes,
-        image_ids: &BTreeSet<ImageId>,
-        expected_io: bool,
-    ) -> Result<(), color_eyre::eyre::Report> {
-        for volume in self.mounts.keys() {
-            if !volumes.contains_key(volume) && !matches!(&volume, &VolumeId::Backup) {
-                color_eyre::eyre::bail!("unknown volume: {}", volume);
-            }
-        }
-        if self.system {
-            if !SYSTEM_IMAGES.contains(&self.image) {
-                color_eyre::eyre::bail!("unknown system image: {}", self.image);
-            }
-        } else if !image_ids.contains(&self.image) {
-            color_eyre::eyre::bail!("image for {} not contained in package", self.image);
-        }
-        if expected_io && self.io_format.is_none() {
-            color_eyre::eyre::bail!("expected io-format");
-        }
-        Ok(())
-    }
-
-    pub fn container_name(pkg_id: &PackageId, name: Option<&str>) -> String {
-        if let Some(name) = name {
-            format!("{}_{}.{}", pkg_id, name, NET_TLD)
-        } else {
-            format!("{}.{}", pkg_id, NET_TLD)
-        }
-    }
-
-    pub fn uncontainer_name(name: &str) -> Option<(PackageId, Option<&str>)> {
-        let (pre_tld, _) = name.split_once('.')?;
-        if pre_tld.contains('_') {
-            let (pkg, name) = name.split_once('_')?;
-            Some((Id::try_from(pkg).ok()?.into(), Some(name)))
-        } else {
-            Some((Id::try_from(pre_tld).ok()?.into(), None))
-        }
-    }
-
-    async fn docker_args(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-    ) -> Result<Vec<Cow<'_, OsStr>>, Error> {
-        let mut res = self.new_docker_args();
-        for (volume_id, dst) in &self.mounts {
-            let volume = if let Some(v) = volumes.get(volume_id) {
-                v
-            } else {
-                continue;
-            };
-            let src = volume.path_for(&ctx.datadir, pkg_id, pkg_version, volume_id);
-            if let Err(_e) = tokio::fs::metadata(&src).await {
-                tokio::fs::create_dir_all(&src).await?;
-            }
-            res.push(OsStr::new("--mount").into());
-            res.push(
-                OsString::from(format!(
-                    "type=bind,src={},dst={}{}",
-                    src.display(),
-                    dst.display(),
-                    if volume.readonly() { ",readonly" } else { "" }
-                ))
-                .into(),
-            );
-        }
-        if let Some(shm_size_mb) = self.shm_size_mb {
-            res.push(OsStr::new("--shm-size").into());
-            res.push(OsString::from(format!("{}m", shm_size_mb)).into());
-        }
-        if self.gpu_acceleration {
-            fn get_devices<'a>(
-                path: &'a Path,
-                res: &'a mut Vec<PathBuf>,
-            ) -> BoxFuture<'a, Result<(), Error>> {
-                async move {
-                    let mut read_dir = tokio::fs::read_dir(path).await?;
-                    while let Some(entry) = read_dir.next_entry().await? {
-                        let fty = entry.metadata().await?.file_type();
-                        if fty.is_block_device() || fty.is_char_device() {
-                            res.push(entry.path());
-                        } else if fty.is_dir() {
-                            get_devices(&entry.path(), res).await?;
-                        }
-                    }
-                    Ok(())
-                }
-                .boxed()
-            }
-            let mut devices = Vec::new();
-            get_devices(Path::new("/dev/dri"), &mut devices).await?;
-            for device in devices {
-                res.push(OsStr::new("--device").into());
-                res.push(OsString::from(device).into());
-            }
-        }
-        res.push(OsStr::new("--interactive").into());
-        res.push(OsStr::new("--log-driver=journald").into());
-        res.push(OsStr::new("--entrypoint").into());
-        res.push(OsStr::new(&self.entrypoint).into());
-        if self.system {
-            res.push(OsString::from(self.image.for_package(&SYSTEM_PACKAGE_ID, None)).into());
-        } else {
-            res.push(OsString::from(self.image.for_package(pkg_id, Some(pkg_version))).into());
-        }
-
-        res.extend(self.args.iter().map(|s| OsStr::new(s).into()));
-
-        Ok(res)
-    }
-
-    fn new_docker_args(&self) -> Vec<Cow<OsStr>> {
-        Vec::with_capacity(
-            (2 * self.mounts.len()) // --mount <MOUNT_ARG>
-                + (2 * self.shm_size_mb.is_some() as usize) // --shm-size <SHM_SIZE>
-                + 5 // --interactive --log-driver=journald --entrypoint <ENTRYPOINT> <IMAGE>
-                + self.args.len(), // [ARG...]
-        )
-    }
-    fn docker_args_inject(&self, pkg_id: &PackageId) -> Vec<Cow<'_, OsStr>> {
-        let mut res = self.new_docker_args();
-        if let Some(shm_size_mb) = self.shm_size_mb {
-            res.push(OsStr::new("--shm-size").into());
-            res.push(OsString::from(format!("{}m", shm_size_mb)).into());
-        }
-        res.push(OsStr::new("--interactive").into());
-
-        res.push(OsString::from(Self::container_name(pkg_id, None)).into());
-        res.push(OsStr::new(&self.entrypoint).into());
-
-        res.extend(self.args.iter().map(|s| OsStr::new(s).into()));
-
-        res
-    }
-}
-
-struct RingVec<T> {
-    value: VecDeque<T>,
-    capacity: usize,
-}
-impl<T> RingVec<T> {
-    fn new(capacity: usize) -> Self {
-        RingVec {
-            value: VecDeque::with_capacity(capacity),
-            capacity,
-        }
-    }
-    fn push(&mut self, item: T) -> Option<T> {
-        let popped_item = if self.value.len() == self.capacity {
-            self.value.pop_front()
-        } else {
-            None
-        };
-        self.value.push_back(item);
-        popped_item
-    }
-}
-
-/// This is created when we wanted a long running docker executor that we could send commands to and get the responses back.
-/// We wanted a long running since we want to be able to have the equivelent to the docker execute without the heavy costs of 400 + ms time lag.
-/// Also the long running let's us have the ability to start/ end the services quicker.
-pub struct LongRunning {
-    pub running_output: NonDetachingJoinHandle<()>,
-}
-
-impl LongRunning {
-    async fn setup_long_running_docker_cmd(
-        docker: &DockerContainer,
-        ctx: &RpcContext,
-        container_name: &str,
-        volumes: &Volumes,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        socket_path: &Path,
-    ) -> Result<tokio::process::Command, Error> {
-        const INIT_EXEC: &str = "/start9/bin/container-init";
-        const BIND_LOCATION: &str = "/usr/lib/startos/container/";
-        tracing::trace!("setup_long_running_docker_cmd");
-
-        remove_container(container_name, true).await?;
-
-        let image_architecture = {
-            let mut cmd = tokio::process::Command::new(CONTAINER_TOOL);
-            cmd.arg("image")
-                .arg("inspect")
-                .arg("--format")
-                .arg("'{{.Architecture}}'");
-
-            if docker.system {
-                cmd.arg(docker.image.for_package(&SYSTEM_PACKAGE_ID, None));
-            } else {
-                cmd.arg(docker.image.for_package(pkg_id, Some(pkg_version)));
-            }
-            let arch = String::from_utf8(cmd.output().await?.stdout)?;
-            arch.replace('\'', "").trim().to_string()
-        };
-
-        let mut cmd = tokio::process::Command::new(CONTAINER_TOOL);
-        cmd.arg("run")
-            .arg("--network=start9")
-            .arg(format!("--add-host=embassy:{}", Ipv4Addr::from(HOST_IP)))
-            .arg("--mount")
-            .arg(format!(
-                "type=bind,src={BIND_LOCATION},dst=/start9/bin/,readonly"
-            ))
-            .arg("--mount")
-            .arg(format!(
-                "type=bind,src={input},dst=/start9/sockets/",
-                input = socket_path.display()
-            ))
-            .arg("--name")
-            .arg(container_name)
-            .arg(format!("--hostname={}", &container_name))
-            .arg("--entrypoint")
-            .arg(format!("{INIT_EXEC}.{image_architecture}"))
-            .arg("-i")
-            .arg("--rm")
-            .kill_on_drop(true);
-
-        for (volume_id, dst) in &docker.mounts {
-            let volume = if let Some(v) = volumes.get(volume_id) {
-                v
-            } else {
-                continue;
-            };
-            let src = volume.path_for(&ctx.datadir, pkg_id, pkg_version, volume_id);
-            if let Err(_e) = tokio::fs::metadata(&src).await {
-                tokio::fs::create_dir_all(&src).await?;
-            }
-            cmd.arg("--mount").arg(format!(
-                "type=bind,src={},dst={}{}",
-                src.display(),
-                dst.display(),
-                if volume.readonly() { ",readonly" } else { "" }
-            ));
-        }
-        if let Some(shm_size_mb) = docker.shm_size_mb {
-            cmd.arg("--shm-size").arg(format!("{}m", shm_size_mb));
-        }
-        cmd.arg("--log-driver=journald");
-        if docker.system {
-            cmd.arg(docker.image.for_package(&SYSTEM_PACKAGE_ID, None));
-        } else {
-            cmd.arg(docker.image.for_package(pkg_id, Some(pkg_version)));
-        }
-        cmd.stdout(std::process::Stdio::piped());
-        cmd.stderr(std::process::Stdio::inherit());
-        cmd.stdin(std::process::Stdio::piped());
-        Ok(cmd)
-    }
-}
-async fn buf_reader_to_lines(
-    reader: impl AsyncBufRead + Unpin,
-    limit: impl Into<Option<usize>>,
-) -> Result<Vec<String>, Error> {
-    let mut lines = reader.lines();
-    let mut answer = RingVec::new(limit.into().unwrap_or(1000));
-    while let Some(line) = lines.next_line().await? {
-        answer.push(line);
-    }
-    let output: Vec<String> = answer.value.into_iter().collect();
-    Ok(output)
-}
-
-enum MaxByLines {
-    Done(String),
-    Overflow(String),
-    Error(Error),
-}
-
-async fn max_by_lines(
-    reader: impl AsyncBufRead + Unpin,
-    max_items: impl Into<Option<usize>>,
-) -> MaxByLines {
-    let mut answer = String::new();
-
-    let mut lines = reader.lines();
-    let mut has_over_blown = false;
-    let max_items = max_items.into().unwrap_or(10_000_000);
-
-    while let Some(line) = {
-        match lines.next_line().await {
-            Ok(a) => a,
-            Err(e) => return MaxByLines::Error(e.into()),
-        }
-    } {
-        if has_over_blown {
-            continue;
-        }
-        if !answer.is_empty() {
-            answer.push('\n');
-        }
-        answer.push_str(&line);
-        if answer.len() >= max_items {
-            has_over_blown = true;
-            tracing::warn!("Reading the buffer exceeding limits of {}", max_items);
-        }
-    }
-    if has_over_blown {
-        return MaxByLines::Overflow(answer);
-    }
-    MaxByLines::Done(answer)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    /// Note, this size doesn't mean the vec will match. The vec will go to the next size, 0 -> 7 = 7 and so forth 7-15 = 15
-    /// Just how the vec with capacity works.
-    const CAPACITY_IN: usize = 7;
-    #[test]
-    fn default_capacity_is_set() {
-        let ring: RingVec<usize> = RingVec::new(CAPACITY_IN);
-        assert_eq!(CAPACITY_IN, ring.value.capacity());
-        assert_eq!(0, ring.value.len());
-    }
-    #[test]
-    fn capacity_can_not_be_exceeded() {
-        let mut ring = RingVec::new(CAPACITY_IN);
-        for i in 1..100usize {
-            ring.push(i);
-        }
-        assert_eq!(CAPACITY_IN, ring.value.capacity());
-        assert_eq!(CAPACITY_IN, ring.value.len());
-    }
-
-    #[test]
-    fn tests_buf_reader_to_lines() {
-        let mut reader = BufReader::new("hello\nworld\n".as_bytes());
-        let lines = futures::executor::block_on(buf_reader_to_lines(&mut reader, None)).unwrap();
-        assert_eq!(lines, vec!["hello", "world"]);
-    }
-}
diff --git a/core/startos/src/procedure/js_scripts.rs b/core/startos/src/procedure/js_scripts.rs
deleted file mode 100644
index 131ceef84..000000000
--- a/core/startos/src/procedure/js_scripts.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::time::Duration;
-
-use container_init::ProcessGroupId;
-use helpers::UnixRpcClient;
-use models::VolumeId;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use tokio::process::Command;
-use tracing::instrument;
-
-use super::ProcedureName;
-use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::util::serde::IoFormat;
-use crate::util::{Invoke, Version};
-use crate::volume::Volumes;
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "kebab-case")]
-
-enum ErrorValue {
-    Error(String),
-    ErrorCode((i32, String)),
-    Result(serde_json::Value),
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct ExecuteArgs {
-    pub procedure: JsProcedure,
-    pub directory: PathBuf,
-    pub pkg_id: PackageId,
-    pub pkg_version: Version,
-    pub name: ProcedureName,
-    pub volumes: Volumes,
-    pub input: Option<serde_json::Value>,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct JsProcedure {
-    #[serde(default)]
-    args: Vec<serde_json::Value>,
-}
-
-impl JsProcedure {
-    pub fn validate(&self, _volumes: &Volumes) -> Result<(), color_eyre::eyre::Report> {
-        Ok(())
-    }
-}
diff --git a/core/startos/src/procedure/mod.rs b/core/startos/src/procedure/mod.rs
deleted file mode 100644
index aa3d4092d..000000000
--- a/core/startos/src/procedure/mod.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use std::collections::BTreeSet;
-use std::time::Duration;
-
-use color_eyre::eyre::eyre;
-use models::ImageId;
-use patch_db::HasModel;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use tracing::instrument;
-
-use self::docker::DockerProcedure;
-use crate::context::RpcContext;
-use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
-use crate::util::Version;
-use crate::volume::Volumes;
-use crate::{Error, ErrorKind};
-
-pub mod docker;
-pub mod js_scripts;
-pub use models::ProcedureName;
-
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[serde(tag = "type")]
-#[model = "Model<Self>"]
-pub enum PackageProcedure {
-    Docker(DockerProcedure),
-    Script(js_scripts::JsProcedure),
-}
-
-impl PackageProcedure {
-    pub fn is_script(&self) -> bool {
-        match self {
-            Self::Script(_) => true,
-            _ => false,
-        }
-    }
-    #[instrument(skip_all)]
-    pub fn validate(
-        &self,
-        eos_version: &Version,
-        volumes: &Volumes,
-        image_ids: &BTreeSet<ImageId>,
-        expected_io: bool,
-    ) -> Result<(), color_eyre::eyre::Report> {
-        match self {
-            PackageProcedure::Docker(action) => {
-                action.validate(eos_version, volumes, image_ids, expected_io)
-            }
-            PackageProcedure::Script(action) => action.validate(volumes),
-        }
-    }
-
-    #[instrument(skip_all)]
-    pub async fn execute<I: Serialize, O: DeserializeOwned + 'static>(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        name: ProcedureName,
-        volumes: &Volumes,
-        input: Option<I>,
-        timeout: Option<Duration>,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        tracing::trace!("Procedure execute {} {} - {:?}", self, pkg_id, name);
-        let manager = ctx
-            .managers
-            .get(&(pkg_id.clone(), pkg_version.clone()))
-            .await
-            .ok_or_else(|| {
-                Error::new(
-                    eyre!("No manager found for {}", pkg_id),
-                    ErrorKind::NotFound,
-                )
-            })?;
-        manager
-            .execute(name, imbl_value::to_value(&input)?, timeout)
-            .await
-    }
-
-    #[instrument(skip_all)]
-    pub async fn sandboxed<I: Serialize, O: DeserializeOwned>(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-        input: Option<I>,
-        timeout: Option<Duration>,
-        name: ProcedureName,
-    ) -> Result<Result<O, (i32, String)>, Error> {
-        tracing::trace!("Procedure sandboxed {} {} - {:?}", self, pkg_id, name);
-        let manager = ctx
-            .managers
-            .get(&(pkg_id.clone(), pkg_version.clone()))
-            .await
-            .ok_or_else(|| {
-                Error::new(
-                    eyre!("No manager found for {}", pkg_id),
-                    ErrorKind::NotFound,
-                )
-            })?;
-        manager
-            .sanboxed(name, imbl_value::to_value(&input)?, timeout)
-            .await
-    }
-}
-
-impl std::fmt::Display for PackageProcedure {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            PackageProcedure::Docker(_) => write!(f, "Docker")?,
-            PackageProcedure::Script(_) => write!(f, "JS")?,
-        }
-        Ok(())
-    }
-}
-
-// TODO: make this not allocate
-#[derive(Debug)]
-pub struct NoOutput;
-impl<'de> Deserialize<'de> for NoOutput {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let _ = Value::deserialize(deserializer);
-        Ok(NoOutput)
-    }
-}
-
-#[test]
-fn test_deser_no_output() {
-    serde_json::from_str::<NoOutput>("").unwrap();
-    serde_json::from_str::<Result<NoOutput, NoOutput>>("{\"Ok\": null}")
-        .unwrap()
-        .unwrap();
-}
diff --git a/core/startos/src/progress.rs b/core/startos/src/progress.rs
new file mode 100644
index 000000000..38e66a419
--- /dev/null
+++ b/core/startos/src/progress.rs
@@ -0,0 +1,442 @@
+use std::panic::UnwindSafe;
+use std::sync::Arc;
+use std::time::Duration;
+
+use futures::Future;
+use imbl_value::{InOMap, InternedString};
+use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+use tokio::io::{AsyncSeek, AsyncWrite};
+use tokio::sync::{mpsc, watch};
+
+use crate::db::model::DatabaseModel;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref SPINNER: ProgressStyle = ProgressStyle::with_template("{spinner} {msg}...").unwrap();
+    static ref PERCENTAGE: ProgressStyle = ProgressStyle::with_template("{msg} {percent}% {wide_bar} [{bytes}/{total_bytes}] [{binary_bytes_per_sec} {eta}]").unwrap();
+    static ref BYTES: ProgressStyle = ProgressStyle::with_template("{spinner} {wide_msg} [{bytes}/?] [{binary_bytes_per_sec} {elapsed}]").unwrap();
+}
+
+#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
+#[serde(untagged)]
+pub enum Progress {
+    Complete(bool),
+    Progress { done: u64, total: Option<u64> },
+}
+impl Progress {
+    pub fn new() -> Self {
+        Progress::Complete(false)
+    }
+    pub fn update_bar(self, bar: &ProgressBar) {
+        match self {
+            Self::Complete(false) => {
+                bar.set_style(SPINNER.clone());
+                bar.tick();
+            }
+            Self::Complete(true) => {
+                bar.finish();
+            }
+            Self::Progress { done, total: None } => {
+                bar.set_style(BYTES.clone());
+                bar.set_position(done);
+                bar.tick();
+            }
+            Self::Progress {
+                done,
+                total: Some(total),
+            } => {
+                bar.set_style(PERCENTAGE.clone());
+                bar.set_position(done);
+                bar.set_length(total);
+                bar.tick();
+            }
+        }
+    }
+    pub fn set_done(&mut self, done: u64) {
+        *self = match *self {
+            Self::Complete(false) => Self::Progress { done, total: None },
+            Self::Progress { mut done, total } => {
+                if let Some(total) = total {
+                    if done > total {
+                        done = total;
+                    }
+                }
+                Self::Progress { done, total }
+            }
+            Self::Complete(true) => Self::Complete(true),
+        };
+    }
+    pub fn set_total(&mut self, total: u64) {
+        *self = match *self {
+            Self::Complete(false) => Self::Progress {
+                done: 0,
+                total: Some(total),
+            },
+            Self::Progress { done, .. } => Self::Progress {
+                done,
+                total: Some(total),
+            },
+            Self::Complete(true) => Self::Complete(true),
+        }
+    }
+    pub fn add_total(&mut self, total: u64) {
+        if let Self::Progress {
+            done,
+            total: Some(old),
+        } = *self
+        {
+            *self = Self::Progress {
+                done,
+                total: Some(old + total),
+            };
+        } else {
+            self.set_total(total)
+        }
+    }
+    pub fn complete(&mut self) {
+        *self = Self::Complete(true);
+    }
+}
+impl std::ops::Add<u64> for Progress {
+    type Output = Self;
+    fn add(self, rhs: u64) -> Self::Output {
+        match self {
+            Self::Complete(false) => Self::Progress {
+                done: rhs,
+                total: None,
+            },
+            Self::Progress { done, total } => {
+                let mut done = done + rhs;
+                if let Some(total) = total {
+                    if done > total {
+                        done = total;
+                    }
+                }
+                Self::Progress { done, total }
+            }
+            Self::Complete(true) => Self::Complete(true),
+        }
+    }
+}
+impl std::ops::AddAssign<u64> for Progress {
+    fn add_assign(&mut self, rhs: u64) {
+        *self = *self + rhs;
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct NamedProgress {
+    pub name: InternedString,
+    pub progress: Progress,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct FullProgress {
+    pub overall: Progress,
+    pub phases: Vec<NamedProgress>,
+}
+impl FullProgress {
+    pub fn new() -> Self {
+        Self {
+            overall: Progress::new(),
+            phases: Vec::new(),
+        }
+    }
+}
+
+pub struct FullProgressTracker {
+    overall: Arc<watch::Sender<Progress>>,
+    overall_recv: watch::Receiver<Progress>,
+    phases: InOMap<InternedString, watch::Receiver<Progress>>,
+    new_phase: (
+        mpsc::UnboundedSender<(InternedString, watch::Receiver<Progress>)>,
+        mpsc::UnboundedReceiver<(InternedString, watch::Receiver<Progress>)>,
+    ),
+}
+impl FullProgressTracker {
+    pub fn new() -> Self {
+        let (overall, overall_recv) = watch::channel(Progress::new());
+        Self {
+            overall: Arc::new(overall),
+            overall_recv,
+            phases: InOMap::new(),
+            new_phase: mpsc::unbounded_channel(),
+        }
+    }
+    fn fill_phases(&mut self) -> bool {
+        let mut changed = false;
+        while let Ok((name, phase)) = self.new_phase.1.try_recv() {
+            self.phases.insert(name, phase);
+            changed = true;
+        }
+        changed
+    }
+    pub fn snapshot(&mut self) -> FullProgress {
+        self.fill_phases();
+        FullProgress {
+            overall: *self.overall.borrow(),
+            phases: self
+                .phases
+                .iter()
+                .map(|(name, progress)| NamedProgress {
+                    name: name.clone(),
+                    progress: *progress.borrow(),
+                })
+                .collect(),
+        }
+    }
+    pub async fn changed(&mut self) {
+        if self.fill_phases() {
+            return;
+        }
+        let phases = self
+            .phases
+            .iter_mut()
+            .map(|(_, p)| Box::pin(p.changed()))
+            .collect_vec();
+        tokio::select! {
+            _ = self.overall_recv.changed() => (),
+            _ = futures::future::select_all(phases) => (),
+        }
+    }
+    pub fn handle(&self) -> FullProgressTrackerHandle {
+        FullProgressTrackerHandle {
+            overall: self.overall.clone(),
+            new_phase: self.new_phase.0.clone(),
+        }
+    }
+    pub fn sync_to_db<DerefFn>(
+        mut self,
+        db: PatchDb,
+        deref: DerefFn,
+        min_interval: Option<Duration>,
+    ) -> impl Future<Output = Result<(), Error>> + 'static
+    where
+        DerefFn: Fn(&mut DatabaseModel) -> Option<&mut Model<FullProgress>> + 'static,
+        for<'a> &'a DerefFn: UnwindSafe + Send,
+    {
+        async move {
+            loop {
+                let progress = self.snapshot();
+                if db
+                    .mutate(|v| {
+                        if let Some(p) = deref(v) {
+                            p.ser(&progress)?;
+                            Ok(false)
+                        } else {
+                            Ok(true)
+                        }
+                    })
+                    .await?
+                {
+                    break;
+                }
+                tokio::join!(self.changed(), async {
+                    if let Some(interval) = min_interval {
+                        tokio::time::sleep(interval).await
+                    } else {
+                        futures::future::ready(()).await
+                    }
+                });
+            }
+            Ok(())
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct FullProgressTrackerHandle {
+    overall: Arc<watch::Sender<Progress>>,
+    new_phase: mpsc::UnboundedSender<(InternedString, watch::Receiver<Progress>)>,
+}
+impl FullProgressTrackerHandle {
+    pub fn add_phase(
+        &self,
+        name: InternedString,
+        overall_contribution: Option<u64>,
+    ) -> PhaseProgressTrackerHandle {
+        if let Some(overall_contribution) = overall_contribution {
+            self.overall
+                .send_modify(|o| o.add_total(overall_contribution));
+        }
+        let (send, recv) = watch::channel(Progress::new());
+        let _ = self.new_phase.send((name, recv));
+        PhaseProgressTrackerHandle {
+            overall: self.overall.clone(),
+            overall_contribution,
+            contributed: 0,
+            progress: send,
+        }
+    }
+    pub fn complete(&self) {
+        self.overall.send_modify(|o| o.complete());
+    }
+}
+
+pub struct PhaseProgressTrackerHandle {
+    overall: Arc<watch::Sender<Progress>>,
+    overall_contribution: Option<u64>,
+    contributed: u64,
+    progress: watch::Sender<Progress>,
+}
+impl PhaseProgressTrackerHandle {
+    fn update_overall(&mut self) {
+        if let Some(overall_contribution) = self.overall_contribution {
+            let contribution = match *self.progress.borrow() {
+                Progress::Complete(true) => overall_contribution,
+                Progress::Progress {
+                    done,
+                    total: Some(total),
+                } => ((done as f64 / total as f64) * overall_contribution as f64) as u64,
+                _ => 0,
+            };
+            if contribution > self.contributed {
+                self.overall
+                    .send_modify(|o| *o += contribution - self.contributed);
+                self.contributed = contribution;
+            }
+        }
+    }
+    pub fn set_done(&mut self, done: u64) {
+        self.progress.send_modify(|p| p.set_done(done));
+        self.update_overall();
+    }
+    pub fn set_total(&mut self, total: u64) {
+        self.progress.send_modify(|p| p.set_total(total));
+        self.update_overall();
+    }
+    pub fn add_total(&mut self, total: u64) {
+        self.progress.send_modify(|p| p.add_total(total));
+        self.update_overall();
+    }
+    pub fn complete(&mut self) {
+        self.progress.send_modify(|p| p.complete());
+        self.update_overall();
+    }
+}
+impl std::ops::AddAssign<u64> for PhaseProgressTrackerHandle {
+    fn add_assign(&mut self, rhs: u64) {
+        self.progress.send_modify(|p| *p += rhs);
+        self.update_overall();
+    }
+}
+
+#[pin_project::pin_project]
+pub struct ProgressTrackerWriter<W> {
+    #[pin]
+    writer: W,
+    progress: PhaseProgressTrackerHandle,
+}
+impl<W> ProgressTrackerWriter<W> {
+    pub fn new(writer: W, progress: PhaseProgressTrackerHandle) -> Self {
+        Self { writer, progress }
+    }
+    pub fn into_inner(self) -> (W, PhaseProgressTrackerHandle) {
+        (self.writer, self.progress)
+    }
+}
+impl<W: AsyncWrite> AsyncWrite for ProgressTrackerWriter<W> {
+    fn poll_write(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> std::task::Poll<Result<usize, std::io::Error>> {
+        let this = self.project();
+        match this.writer.poll_write(cx, buf) {
+            std::task::Poll::Ready(Ok(n)) => {
+                *this.progress += n as u64;
+                std::task::Poll::Ready(Ok(n))
+            }
+            a => a,
+        }
+    }
+    fn poll_flush(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        self.project().writer.poll_flush(cx)
+    }
+    fn poll_shutdown(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        self.project().writer.poll_shutdown(cx)
+    }
+    fn is_write_vectored(&self) -> bool {
+        self.writer.is_write_vectored()
+    }
+    fn poll_write_vectored(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        bufs: &[std::io::IoSlice<'_>],
+    ) -> std::task::Poll<Result<usize, std::io::Error>> {
+        self.project().writer.poll_write_vectored(cx, bufs)
+    }
+}
+impl<W: AsyncSeek> AsyncSeek for ProgressTrackerWriter<W> {
+    fn start_seek(
+        self: std::pin::Pin<&mut Self>,
+        position: std::io::SeekFrom,
+    ) -> std::io::Result<()> {
+        self.project().writer.start_seek(position)
+    }
+    fn poll_complete(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<std::io::Result<u64>> {
+        let this = self.project();
+        match this.writer.poll_complete(cx) {
+            std::task::Poll::Ready(Ok(n)) => {
+                this.progress.set_done(n);
+                std::task::Poll::Ready(Ok(n))
+            }
+            a => a,
+        }
+    }
+}
+
+pub struct PhasedProgressBar {
+    multi: MultiProgress,
+    overall: ProgressBar,
+    phases: InOMap<InternedString, ProgressBar>,
+}
+impl PhasedProgressBar {
+    pub fn new(name: &str) -> Self {
+        let multi = MultiProgress::new();
+        Self {
+            overall: multi.add(
+                ProgressBar::new(0)
+                    .with_style(SPINNER.clone())
+                    .with_message(name.to_owned()),
+            ),
+            multi,
+            phases: InOMap::new(),
+        }
+    }
+    pub fn update(&mut self, progress: &FullProgress) {
+        for phase in progress.phases.iter() {
+            if !self.phases.contains_key(&phase.name) {
+                self.phases.insert(
+                    phase.name.clone(),
+                    self.multi
+                        .add(ProgressBar::new(0).with_style(SPINNER.clone()))
+                        .with_message((&*phase.name).to_owned()),
+                );
+            }
+        }
+        progress.overall.update_bar(&self.overall);
+        for (name, bar) in self.phases.iter() {
+            if let Some(progress) = progress.phases.iter().find_map(|p| {
+                if &p.name == name {
+                    Some(p.progress)
+                } else {
+                    None
+                }
+            }) {
+                progress.update_bar(bar);
+            }
+        }
+    }
+}
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 851033b71..9c503c3f6 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -1,50 +1,26 @@
-use clap::ArgMatches;
-use color_eyre::eyre::eyre;
+use clap::Parser;
+use models::PackageId;
 use rpc_toolkit::command;
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use tracing::instrument;
 
 use crate::context::RpcContext;
-use crate::prelude::*;
-use crate::procedure::ProcedureName;
-use crate::s9pk::manifest::PackageId;
-use crate::{Error, ErrorKind};
+use crate::Error;
 
-pub fn display_properties(response: Value, _: &ArgMatches) {
+pub fn display_properties(response: Value) {
     println!("{}", response);
 }
 
-#[command(display(display_properties))]
-pub async fn properties(#[context] ctx: RpcContext, #[arg] id: PackageId) -> Result<Value, Error> {
-    Ok(fetch_properties(ctx, id).await?)
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct PropertiesParam {
+    id: PackageId,
 }
-
-#[instrument(skip_all)]
-pub async fn fetch_properties(ctx: RpcContext, id: PackageId) -> Result<Value, Error> {
-    let peek = ctx.db.peek().await;
-
-    let manifest = peek
-        .as_package_data()
-        .as_idx(&id)
-        .ok_or_else(|| Error::new(eyre!("{} is not installed", id), ErrorKind::NotFound))?
-        .expect_as_installed()?
-        .as_manifest()
-        .de()?;
-    if let Some(props) = manifest.properties {
-        props
-            .execute::<(), Value>(
-                &ctx,
-                &manifest.id,
-                &manifest.version,
-                ProcedureName::Properties,
-                &manifest.volumes,
-                None,
-                None,
-            )
-            .await?
-            .map_err(|(_, e)| Error::new(eyre!("{}", e), ErrorKind::Docker))
-            .and_then(|a| Ok(a))
-    } else {
-        Ok(Value::Null)
-    }
+// #[command(display(display_properties))]
+pub async fn properties(
+    ctx: RpcContext,
+    PropertiesParam { id }: PropertiesParam,
+) -> Result<Value, Error> {
+    Ok(todo!())
 }
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 44b83d161..9f0033e96 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -1,15 +1,17 @@
 use std::path::PathBuf;
 use std::time::Duration;
 
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use console::style;
 use futures::StreamExt;
 use indicatif::{ProgressBar, ProgressStyle};
 use reqwest::{header, Body, Client, Url};
 use rpc_toolkit::command;
+use serde::{Deserialize, Serialize};
 
-use crate::s9pk::reader::S9pkReader;
-use crate::util::display_none;
+use crate::context::CliContext;
+use crate::s9pk::S9pk;
 use crate::{Error, ErrorKind};
 
 async fn registry_user_pass(location: &str) -> Result<(Url, String, String), Error> {
@@ -88,13 +90,29 @@ async fn do_upload(
     Ok(())
 }
 
-#[command(cli_only, display(display_none))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct PublishParams {
+    location: String,
+    path: PathBuf,
+    #[arg(name = "no-verify", long = "no-verify")]
+    no_verify: bool,
+    #[arg(name = "no-upload", long = "no-upload")]
+    no_upload: bool,
+    #[arg(name = "no-index", long = "no-index")]
+    no_index: bool,
+}
+
 pub async fn publish(
-    #[arg] location: String,
-    #[arg] path: PathBuf,
-    #[arg(rename = "no-verify", long = "no-verify")] no_verify: bool,
-    #[arg(rename = "no-upload", long = "no-upload")] no_upload: bool,
-    #[arg(rename = "no-index", long = "no-index")] no_index: bool,
+    _: CliContext,
+    PublishParams {
+        location,
+        no_index,
+        no_upload,
+        no_verify,
+        path,
+    }: PublishParams,
 ) -> Result<(), Error> {
     // Prepare for progress bars.
     let bytes_bar_style =
@@ -115,8 +133,8 @@ pub async fn publish(
             .with_prefix("[1/3]")
             .with_message("Querying s9pk");
         pb.enable_steady_tick(Duration::from_millis(200));
-        let mut s9pk = S9pkReader::open(&path, false).await?;
-        let m = s9pk.manifest().await?.clone();
+        let mut s9pk = S9pk::open(&path, None).await?;
+        let m = s9pk.as_manifest().clone();
         pb.set_style(plain_line_style.clone());
         pb.abandon();
         m
@@ -126,9 +144,10 @@ pub async fn publish(
             .with_prefix("[1/3]")
             .with_message("Verifying s9pk");
         pb.enable_steady_tick(Duration::from_millis(200));
-        let mut s9pk = S9pkReader::open(&path, true).await?;
-        s9pk.validate().await?;
-        let m = s9pk.manifest().await?.clone();
+        let mut s9pk = S9pk::open(&path, None).await?;
+        // s9pk.validate().await?;
+        todo!();
+        let m = s9pk.as_manifest().clone();
         pb.set_style(plain_line_style.clone());
         pb.abandon();
         m
diff --git a/core/startos/src/registry/marketplace.rs b/core/startos/src/registry/marketplace.rs
index 979733198..c4148f01f 100644
--- a/core/startos/src/registry/marketplace.rs
+++ b/core/startos/src/registry/marketplace.rs
@@ -1,16 +1,17 @@
 use base64::Engine;
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use reqwest::{StatusCode, Url};
-use rpc_toolkit::command;
+use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::version::VersionT;
 use crate::{Error, ResultExt};
 
-#[command(subcommands(get))]
-pub fn marketplace() -> Result<(), Error> {
-    Ok(())
+pub fn marketplace() -> ParentHandler {
+    ParentHandler::new().subcommand("get", from_fn_async(get).with_remote_cli::<CliContext>())
 }
 
 pub fn with_query_params(ctx: RpcContext, mut url: Url) -> Url {
@@ -35,8 +36,14 @@ pub fn with_query_params(ctx: RpcContext, mut url: Url) -> Url {
     url
 }
 
-#[command]
-pub async fn get(#[context] ctx: RpcContext, #[arg] url: Url) -> Result<Value, Error> {
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct GetParams {
+    url: Url,
+}
+
+pub async fn get(ctx: RpcContext, GetParams { url }: GetParams) -> Result<Value, Error> {
     let mut response = ctx
         .client
         .get(with_query_params(ctx.clone(), url))
diff --git a/core/startos/src/s9pk/merkle_archive/directory_contents.rs b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
index f662300b6..c5373a31b 100644
--- a/core/startos/src/s9pk/merkle_archive/directory_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
@@ -1,23 +1,48 @@
-use std::collections::BTreeMap;
-use std::path::Path;
+use std::ffi::OsStr;
+use std::fmt::Debug;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 use futures::future::BoxFuture;
 use futures::FutureExt;
+use imbl::OrdMap;
 use imbl_value::InternedString;
+use itertools::Itertools;
 use tokio::io::AsyncRead;
 
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::hash::{Hash, HashWriter};
 use crate::s9pk::merkle_archive::sink::{Sink, TrackingWriter};
-use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource, Section};
+use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
 use crate::s9pk::merkle_archive::write_queue::WriteQueue;
 use crate::s9pk::merkle_archive::{varint, Entry, EntryContents};
 
-#[derive(Debug)]
-pub struct DirectoryContents<S>(BTreeMap<InternedString, Entry<S>>);
+#[derive(Clone)]
+pub struct DirectoryContents<S> {
+    contents: OrdMap<InternedString, Entry<S>>,
+    /// used to optimize files to have earliest needed information up front
+    sort_by: Option<Arc<dyn Fn(&str, &str) -> std::cmp::Ordering + Send + Sync>>,
+}
+impl<S: Debug> Debug for DirectoryContents<S> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DirectoryContents")
+            .field("contents", &self.contents)
+            .finish_non_exhaustive()
+    }
+}
 impl<S> DirectoryContents<S> {
     pub fn new() -> Self {
-        Self(BTreeMap::new())
+        Self {
+            contents: OrdMap::new(),
+            sort_by: None,
+        }
+    }
+
+    pub fn sort_by(
+        &mut self,
+        sort_by: impl Fn(&str, &str) -> std::cmp::Ordering + Send + Sync + 'static,
+    ) {
+        self.sort_by = Some(Arc::new(sort_by))
     }
 
     #[instrument(skip_all)]
@@ -39,6 +64,57 @@ impl<S> DirectoryContents<S> {
         res
     }
 
+    pub fn file_paths(&self, prefix: impl AsRef<Path>) -> Vec<PathBuf> {
+        let prefix = prefix.as_ref();
+        let mut res = Vec::new();
+        for (name, entry) in &self.contents {
+            let path = prefix.join(name);
+            if let EntryContents::Directory(d) = entry.as_contents() {
+                res.push(path.join(""));
+                res.append(&mut d.file_paths(path));
+            } else {
+                res.push(path);
+            }
+        }
+        res
+    }
+
+    pub const fn header_size() -> u64 {
+        8 // position: u64 BE
+        + 8 // size: u64 BE
+    }
+
+    #[instrument(skip_all)]
+    pub async fn serialize_header<W: Sink>(&self, position: u64, w: &mut W) -> Result<u64, Error> {
+        use tokio::io::AsyncWriteExt;
+
+        let size = self.toc_size();
+
+        w.write_all(&position.to_be_bytes()).await?;
+        w.write_all(&size.to_be_bytes()).await?;
+
+        Ok(position)
+    }
+
+    pub fn toc_size(&self) -> u64 {
+        self.iter().fold(
+            varint::serialized_varint_size(self.len() as u64),
+            |acc, (name, entry)| {
+                acc + varint::serialized_varstring_size(&**name) + entry.header_size()
+            },
+        )
+    }
+}
+impl<S: Clone> DirectoryContents<S> {
+    pub fn with_stem(&self, stem: &str) -> impl Iterator<Item = (InternedString, Entry<S>)> {
+        let prefix = InternedString::intern(stem);
+        let (_, center, right) = self.split_lookup(&*stem);
+        center.map(|e| (prefix.clone(), e)).into_iter().chain(
+            right.into_iter().take_while(move |(k, _)| {
+                Path::new(&**k).file_stem() == Some(OsStr::new(&*prefix))
+            }),
+        )
+    }
     pub fn insert_path(&mut self, path: impl AsRef<Path>, entry: Entry<S>) -> Result<(), Error> {
         let path = path.as_ref();
         let (parent, Some(file)) = (path.parent(), path.file_name().and_then(|f| f.to_str()))
@@ -73,32 +149,6 @@ impl<S> DirectoryContents<S> {
         dir.insert(file.into(), entry);
         Ok(())
     }
-
-    pub const fn header_size() -> u64 {
-        8 // position: u64 BE
-        + 8 // size: u64 BE
-    }
-
-    #[instrument(skip_all)]
-    pub async fn serialize_header<W: Sink>(&self, position: u64, w: &mut W) -> Result<u64, Error> {
-        use tokio::io::AsyncWriteExt;
-
-        let size = self.toc_size();
-
-        w.write_all(&position.to_be_bytes()).await?;
-        w.write_all(&size.to_be_bytes()).await?;
-
-        Ok(position)
-    }
-
-    pub fn toc_size(&self) -> u64 {
-        self.0.iter().fold(
-            varint::serialized_varint_size(self.0.len() as u64),
-            |acc, (name, entry)| {
-                acc + varint::serialized_varstring_size(&**name) + entry.header_size()
-            },
-        )
-    }
 }
 impl<S: ArchiveSource> DirectoryContents<Section<S>> {
     #[instrument(skip_all)]
@@ -121,7 +171,7 @@ impl<S: ArchiveSource> DirectoryContents<Section<S>> {
             let mut toc_reader = source.fetch(position, size).await?;
 
             let len = varint::deserialize_varint(&mut toc_reader).await?;
-            let mut entries = BTreeMap::new();
+            let mut entries = OrdMap::new();
             for _ in 0..len {
                 entries.insert(
                     varint::deserialize_varstring(&mut toc_reader).await?.into(),
@@ -129,7 +179,10 @@ impl<S: ArchiveSource> DirectoryContents<Section<S>> {
                 );
             }
 
-            let res = Self(entries);
+            let res = Self {
+                contents: entries,
+                sort_by: None,
+            };
 
             if res.sighash().await? == sighash {
                 Ok(res)
@@ -144,11 +197,33 @@ impl<S: ArchiveSource> DirectoryContents<Section<S>> {
     }
 }
 impl<S: FileSource> DirectoryContents<S> {
+    pub fn filter(&mut self, filter: impl Fn(&Path) -> bool) -> Result<(), Error> {
+        for k in self.keys().cloned().collect::<Vec<_>>() {
+            let path = Path::new(&*k);
+            if let Some(v) = self.get_mut(&k) {
+                if !filter(path) {
+                    if v.hash.is_none() {
+                        return Err(Error::new(
+                            eyre!("cannot filter out unhashed file, run `update_hashes` first"),
+                            ErrorKind::InvalidRequest,
+                        ));
+                    }
+                    v.contents = EntryContents::Missing;
+                } else {
+                    let filter: Box<dyn Fn(&Path) -> bool> = Box::new(|p| filter(&path.join(p)));
+                    v.filter(filter)?;
+                }
+            }
+        }
+        Ok(())
+    }
     #[instrument(skip_all)]
     pub fn update_hashes<'a>(&'a mut self, only_missing: bool) -> BoxFuture<'a, Result<(), Error>> {
         async move {
-            for (_, entry) in &mut self.0 {
-                entry.update_hash(only_missing).await?;
+            for key in self.keys().cloned().collect::<Vec<_>>() {
+                if let Some(entry) = self.get_mut(&key) {
+                    entry.update_hash(only_missing).await?;
+                }
             }
             Ok(())
         }
@@ -159,13 +234,16 @@ impl<S: FileSource> DirectoryContents<S> {
     pub fn sighash<'a>(&'a self) -> BoxFuture<'a, Result<Hash, Error>> {
         async move {
             let mut hasher = TrackingWriter::new(0, HashWriter::new());
-            let mut sig_contents = BTreeMap::new();
-            for (name, entry) in &self.0 {
+            let mut sig_contents = OrdMap::new();
+            for (name, entry) in &**self {
                 sig_contents.insert(name.clone(), entry.to_missing().await?);
             }
-            Self(sig_contents)
-                .serialize_toc(&mut WriteQueue::new(0), &mut hasher)
-                .await?;
+            Self {
+                contents: sig_contents,
+                sort_by: None,
+            }
+            .serialize_toc(&mut WriteQueue::new(0), &mut hasher)
+            .await?;
             Ok(hasher.into_inner().finalize())
         }
         .boxed()
@@ -177,23 +255,42 @@ impl<S: FileSource> DirectoryContents<S> {
         queue: &mut WriteQueue<'a, S>,
         w: &mut W,
     ) -> Result<(), Error> {
-        varint::serialize_varint(self.0.len() as u64, w).await?;
-        for (name, entry) in self.0.iter() {
+        varint::serialize_varint(self.len() as u64, w).await?;
+        for (name, entry) in self.iter().sorted_by(|a, b| match (a, b, &self.sort_by) {
+            ((_, a), (_, b), _) if a.as_contents().is_dir() && !b.as_contents().is_dir() => {
+                std::cmp::Ordering::Less
+            }
+            ((_, a), (_, b), _) if !a.as_contents().is_dir() && b.as_contents().is_dir() => {
+                std::cmp::Ordering::Greater
+            }
+            ((a, _), (b, _), Some(sort_by)) => sort_by(&***a, &***b),
+            _ => std::cmp::Ordering::Equal,
+        }) {
             varint::serialize_varstring(&**name, w).await?;
             entry.serialize_header(queue.add(entry).await?, w).await?;
         }
 
         Ok(())
     }
+    pub fn into_dyn(self) -> DirectoryContents<DynFileSource> {
+        DirectoryContents {
+            contents: self
+                .contents
+                .into_iter()
+                .map(|(k, v)| (k, v.into_dyn()))
+                .collect(),
+            sort_by: self.sort_by,
+        }
+    }
 }
 impl<S> std::ops::Deref for DirectoryContents<S> {
-    type Target = BTreeMap<InternedString, Entry<S>>;
+    type Target = OrdMap<InternedString, Entry<S>>;
     fn deref(&self) -> &Self::Target {
-        &self.0
+        &self.contents
     }
 }
 impl<S> std::ops::DerefMut for DirectoryContents<S> {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
+        &mut self.contents
     }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/file_contents.rs b/core/startos/src/s9pk/merkle_archive/file_contents.rs
index c02c0e879..7529fd2d0 100644
--- a/core/startos/src/s9pk/merkle_archive/file_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/file_contents.rs
@@ -3,9 +3,9 @@ use tokio::io::AsyncRead;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::hash::{Hash, HashWriter};
 use crate::s9pk::merkle_archive::sink::{Sink, TrackingWriter};
-use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource, Section};
+use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct FileContents<S>(S);
 impl<S> FileContents<S> {
     pub fn new(source: S) -> Self {
@@ -73,6 +73,9 @@ impl<S: FileSource> FileContents<S> {
         }
         Ok(())
     }
+    pub fn into_dyn(self) -> FileContents<DynFileSource> {
+        FileContents(DynFileSource::new(self.0))
+    }
 }
 impl<S> std::ops::Deref for FileContents<S> {
     type Target = S;
diff --git a/core/startos/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
index f83cd2464..abddb3c1e 100644
--- a/core/startos/src/s9pk/merkle_archive/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/mod.rs
@@ -1,3 +1,7 @@
+use std::path::Path;
+use std::sync::Arc;
+
+use ed25519::signature::Keypair;
 use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
 use tokio::io::AsyncRead;
 
@@ -6,7 +10,7 @@ use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
 use crate::s9pk::merkle_archive::file_contents::FileContents;
 use crate::s9pk::merkle_archive::hash::Hash;
 use crate::s9pk::merkle_archive::sink::Sink;
-use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource, Section};
+use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
 use crate::s9pk::merkle_archive::write_queue::WriteQueue;
 
 pub mod directory_contents;
@@ -19,13 +23,13 @@ mod test;
 pub mod varint;
 pub mod write_queue;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 enum Signer {
     Signed(VerifyingKey, Signature),
     Signer(SigningKey),
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct MerkleArchive<S> {
     signer: Signer,
     contents: DirectoryContents<S>,
@@ -37,14 +41,33 @@ impl<S> MerkleArchive<S> {
             contents,
         }
     }
+    pub fn signer(&self) -> VerifyingKey {
+        match &self.signer {
+            Signer::Signed(k, _) => *k,
+            Signer::Signer(k) => k.verifying_key(),
+        }
+    }
     pub const fn header_size() -> u64 {
         32 // pubkey
                  + 64 // signature
+                 + 32 // sighash
                  + DirectoryContents::<Section<S>>::header_size()
     }
     pub fn contents(&self) -> &DirectoryContents<S> {
         &self.contents
     }
+    pub fn contents_mut(&mut self) -> &mut DirectoryContents<S> {
+        &mut self.contents
+    }
+    pub fn set_signer(&mut self, key: SigningKey) {
+        self.signer = Signer::Signer(key);
+    }
+    pub fn sort_by(
+        &mut self,
+        sort_by: impl Fn(&str, &str) -> std::cmp::Ordering + Send + Sync + 'static,
+    ) {
+        self.contents.sort_by(sort_by)
+    }
 }
 impl<S: ArchiveSource> MerkleArchive<Section<S>> {
     #[instrument(skip_all)]
@@ -80,6 +103,9 @@ impl<S: FileSource> MerkleArchive<S> {
     pub async fn update_hashes(&mut self, only_missing: bool) -> Result<(), Error> {
         self.contents.update_hashes(only_missing).await
     }
+    pub fn filter(&mut self, filter: impl Fn(&Path) -> bool) -> Result<(), Error> {
+        self.contents.filter(filter)
+    }
     #[instrument(skip_all)]
     pub async fn serialize<W: Sink>(&self, w: &mut W, verify: bool) -> Result<(), Error> {
         use tokio::io::AsyncWriteExt;
@@ -103,9 +129,15 @@ impl<S: FileSource> MerkleArchive<S> {
         queue.serialize(w, verify).await?;
         Ok(())
     }
+    pub fn into_dyn(self) -> MerkleArchive<DynFileSource> {
+        MerkleArchive {
+            signer: self.signer,
+            contents: self.contents.into_dyn(),
+        }
+    }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Entry<S> {
     hash: Option<Hash>,
     contents: EntryContents<S>,
@@ -117,12 +149,27 @@ impl<S> Entry<S> {
             contents,
         }
     }
+    pub fn file(source: S) -> Self {
+        Self::new(EntryContents::File(FileContents::new(source)))
+    }
     pub fn hash(&self) -> Option<Hash> {
         self.hash
     }
     pub fn as_contents(&self) -> &EntryContents<S> {
         &self.contents
     }
+    pub fn as_file(&self) -> Option<&FileContents<S>> {
+        match self.as_contents() {
+            EntryContents::File(f) => Some(f),
+            _ => None,
+        }
+    }
+    pub fn as_directory(&self) -> Option<&DirectoryContents<S>> {
+        match self.as_contents() {
+            EntryContents::Directory(d) => Some(d),
+            _ => None,
+        }
+    }
     pub fn as_contents_mut(&mut self) -> &mut EntryContents<S> {
         self.hash = None;
         &mut self.contents
@@ -130,11 +177,24 @@ impl<S> Entry<S> {
     pub fn into_contents(self) -> EntryContents<S> {
         self.contents
     }
+    pub fn into_file(self) -> Option<FileContents<S>> {
+        match self.into_contents() {
+            EntryContents::File(f) => Some(f),
+            _ => None,
+        }
+    }
+    pub fn into_directory(self) -> Option<DirectoryContents<S>> {
+        match self.into_contents() {
+            EntryContents::Directory(d) => Some(d),
+            _ => None,
+        }
+    }
     pub fn header_size(&self) -> u64 {
         32 // hash
         + self.contents.header_size()
     }
 }
+impl<S: Clone> Entry<S> {}
 impl<S: ArchiveSource> Entry<Section<S>> {
     #[instrument(skip_all)]
     pub async fn deserialize(
@@ -156,6 +216,24 @@ impl<S: ArchiveSource> Entry<Section<S>> {
     }
 }
 impl<S: FileSource> Entry<S> {
+    pub fn filter(&mut self, filter: impl Fn(&Path) -> bool) -> Result<(), Error> {
+        if let EntryContents::Directory(d) = &mut self.contents {
+            d.filter(filter)?;
+        }
+        Ok(())
+    }
+    pub async fn read_file_to_vec(&self) -> Result<Vec<u8>, Error> {
+        match self.as_contents() {
+            EntryContents::File(f) => Ok(f.to_vec(self.hash).await?),
+            EntryContents::Directory(_) => Err(Error::new(
+                eyre!("expected file, found directory"),
+                ErrorKind::ParseS9pk,
+            )),
+            EntryContents::Missing => {
+                Err(Error::new(eyre!("entry is missing"), ErrorKind::ParseS9pk))
+            }
+        }
+    }
     pub async fn to_missing(&self) -> Result<Self, Error> {
         let hash = if let Some(hash) = self.hash {
             hash
@@ -190,9 +268,15 @@ impl<S: FileSource> Entry<S> {
         w.write_all(hash.as_bytes()).await?;
         self.contents.serialize_header(position, w).await
     }
+    pub fn into_dyn(self) -> Entry<DynFileSource> {
+        Entry {
+            hash: self.hash,
+            contents: self.contents.into_dyn(),
+        }
+    }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum EntryContents<S> {
     Missing,
     File(FileContents<S>),
@@ -214,6 +298,9 @@ impl<S> EntryContents<S> {
             Self::Directory(_) => DirectoryContents::<S>::header_size(),
         }
     }
+    pub fn is_dir(&self) -> bool {
+        matches!(self, &EntryContents::Directory(_))
+    }
 }
 impl<S: ArchiveSource> EntryContents<Section<S>> {
     #[instrument(skip_all)]
@@ -265,4 +352,11 @@ impl<S: FileSource> EntryContents<S> {
             Self::Directory(d) => Some(d.serialize_header(position, w).await?),
         })
     }
+    pub fn into_dyn(self) -> EntryContents<DynFileSource> {
+        match self {
+            Self::Missing => EntryContents::Missing,
+            Self::File(f) => EntryContents::File(f.into_dyn()),
+            Self::Directory(d) => EntryContents::Directory(d.into_dyn()),
+        }
+    }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/source/http.rs b/core/startos/src/s9pk/merkle_archive/source/http.rs
index f38fd7028..1cb9ba961 100644
--- a/core/startos/src/s9pk/merkle_archive/source/http.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/http.rs
@@ -1,12 +1,9 @@
-use std::sync::Arc;
-
 use bytes::Bytes;
 use futures::stream::BoxStream;
 use futures::{StreamExt, TryStreamExt};
-use http::header::{ACCEPT_RANGES, RANGE};
+use reqwest::header::{ACCEPT_RANGES, CONTENT_LENGTH, RANGE};
 use reqwest::{Client, Url};
 use tokio::io::AsyncRead;
-use tokio::sync::Mutex;
 use tokio_util::io::StreamReader;
 
 use crate::prelude::*;
@@ -16,6 +13,7 @@ use crate::s9pk::merkle_archive::source::ArchiveSource;
 pub struct HttpSource {
     url: Url,
     client: Client,
+    size: Option<u64>,
     range_support: Result<
         (),
         (), // Arc<Mutex<Option<RangelessReader>>>
@@ -23,24 +21,31 @@ pub struct HttpSource {
 }
 impl HttpSource {
     pub async fn new(client: Client, url: Url) -> Result<Self, Error> {
-        let range_support = client
+        let head = client
             .head(url.clone())
             .send()
             .await
             .with_kind(ErrorKind::Network)?
             .error_for_status()
-            .with_kind(ErrorKind::Network)?
+            .with_kind(ErrorKind::Network)?;
+        let range_support = head
             .headers()
             .get(ACCEPT_RANGES)
             .and_then(|s| s.to_str().ok())
             == Some("bytes");
+        let size = head
+            .headers()
+            .get(CONTENT_LENGTH)
+            .and_then(|s| s.to_str().ok())
+            .and_then(|s| s.parse().ok());
         Ok(Self {
             url,
             client,
+            size,
             range_support: if range_support {
                 Ok(())
             } else {
-                todo!() // Err(Arc::new(Mutex::new(None)))
+                Err(()) // Err(Arc::new(Mutex::new(None)))
             },
         })
     }
@@ -48,6 +53,9 @@ impl HttpSource {
 #[async_trait::async_trait]
 impl ArchiveSource for HttpSource {
     type Reader = HttpReader;
+    async fn size(&self) -> Option<u64> {
+        self.size
+    }
     async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
         match self.range_support {
             Ok(_) => Ok(HttpReader::Range(StreamReader::new(if size > 0 {
diff --git a/core/startos/src/s9pk/merkle_archive/source/mod.rs b/core/startos/src/s9pk/merkle_archive/source/mod.rs
index 3a7d60a40..97c94b480 100644
--- a/core/startos/src/s9pk/merkle_archive/source/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/mod.rs
@@ -12,15 +12,15 @@ pub mod http;
 pub mod multi_cursor_file;
 
 #[async_trait::async_trait]
-pub trait FileSource: Send + Sync + Sized + 'static {
+pub trait FileSource: Clone + Send + Sync + Sized + 'static {
     type Reader: AsyncRead + Unpin + Send;
     async fn size(&self) -> Result<u64, Error>;
     async fn reader(&self) -> Result<Self::Reader, Error>;
-    async fn copy<W: AsyncWrite + Unpin + Send>(&self, w: &mut W) -> Result<(), Error> {
+    async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(&self, w: &mut W) -> Result<(), Error> {
         tokio::io::copy(&mut self.reader().await?, w).await?;
         Ok(())
     }
-    async fn copy_verify<W: AsyncWrite + Unpin + Send>(
+    async fn copy_verify<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         w: &mut W,
         verify: Option<Hash>,
@@ -37,6 +37,75 @@ pub trait FileSource: Send + Sync + Sized + 'static {
     }
 }
 
+#[derive(Clone)]
+pub struct DynFileSource(Arc<dyn DynableFileSource>);
+impl DynFileSource {
+    pub fn new<T: FileSource>(source: T) -> Self {
+        Self(Arc::new(source))
+    }
+}
+#[async_trait::async_trait]
+impl FileSource for DynFileSource {
+    type Reader = Box<dyn AsyncRead + Unpin + Send>;
+    async fn size(&self) -> Result<u64, Error> {
+        self.0.size().await
+    }
+    async fn reader(&self) -> Result<Self::Reader, Error> {
+        self.0.reader().await
+    }
+    async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        mut w: &mut W,
+    ) -> Result<(), Error> {
+        self.0.copy(&mut w).await
+    }
+    async fn copy_verify<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        mut w: &mut W,
+        verify: Option<Hash>,
+    ) -> Result<(), Error> {
+        self.0.copy_verify(&mut w, verify).await
+    }
+    async fn to_vec(&self, verify: Option<Hash>) -> Result<Vec<u8>, Error> {
+        self.0.to_vec(verify).await
+    }
+}
+
+#[async_trait::async_trait]
+trait DynableFileSource: Send + Sync + 'static {
+    async fn size(&self) -> Result<u64, Error>;
+    async fn reader(&self) -> Result<Box<dyn AsyncRead + Unpin + Send>, Error>;
+    async fn copy(&self, w: &mut (dyn AsyncWrite + Unpin + Send)) -> Result<(), Error>;
+    async fn copy_verify(
+        &self,
+        w: &mut (dyn AsyncWrite + Unpin + Send),
+        verify: Option<Hash>,
+    ) -> Result<(), Error>;
+    async fn to_vec(&self, verify: Option<Hash>) -> Result<Vec<u8>, Error>;
+}
+#[async_trait::async_trait]
+impl<T: FileSource> DynableFileSource for T {
+    async fn size(&self) -> Result<u64, Error> {
+        FileSource::size(self).await
+    }
+    async fn reader(&self) -> Result<Box<dyn AsyncRead + Unpin + Send>, Error> {
+        Ok(Box::new(FileSource::reader(self).await?))
+    }
+    async fn copy(&self, w: &mut (dyn AsyncWrite + Unpin + Send)) -> Result<(), Error> {
+        FileSource::copy(self, w).await
+    }
+    async fn copy_verify(
+        &self,
+        w: &mut (dyn AsyncWrite + Unpin + Send),
+        verify: Option<Hash>,
+    ) -> Result<(), Error> {
+        FileSource::copy_verify(self, w, verify).await
+    }
+    async fn to_vec(&self, verify: Option<Hash>) -> Result<Vec<u8>, Error> {
+        FileSource::to_vec(self, verify).await
+    }
+}
+
 #[async_trait::async_trait]
 impl FileSource for PathBuf {
     type Reader = File;
@@ -57,7 +126,7 @@ impl FileSource for Arc<[u8]> {
     async fn reader(&self) -> Result<Self::Reader, Error> {
         Ok(std::io::Cursor::new(self.clone()))
     }
-    async fn copy<W: AsyncWrite + Unpin + Send>(&self, w: &mut W) -> Result<(), Error> {
+    async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(&self, w: &mut W) -> Result<(), Error> {
         use tokio::io::AsyncWriteExt;
 
         w.write_all(&*self).await?;
@@ -68,8 +137,11 @@ impl FileSource for Arc<[u8]> {
 #[async_trait::async_trait]
 pub trait ArchiveSource: Clone + Send + Sync + Sized + 'static {
     type Reader: AsyncRead + Unpin + Send;
+    async fn size(&self) -> Option<u64> {
+        None
+    }
     async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error>;
-    async fn copy_to<W: AsyncWrite + Unpin + Send>(
+    async fn copy_to<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         position: u64,
         size: u64,
@@ -99,7 +171,7 @@ impl ArchiveSource for Arc<[u8]> {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Section<S> {
     source: S,
     position: u64,
@@ -114,7 +186,7 @@ impl<S: ArchiveSource> FileSource for Section<S> {
     async fn reader(&self) -> Result<Self::Reader, Error> {
         self.source.fetch(self.position, self.size).await
     }
-    async fn copy<W: AsyncWrite + Unpin + Send>(&self, w: &mut W) -> Result<(), Error> {
+    async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(&self, w: &mut W) -> Result<(), Error> {
         self.source.copy_to(self.position, self.size, w).await
     }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
index cda3e5103..afb808471 100644
--- a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
@@ -1,16 +1,20 @@
-use std::io::SeekFrom;
-use std::os::fd::{AsRawFd, RawFd};
+use std::os::fd::{AsRawFd, FromRawFd, RawFd};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
+use std::{borrow::Borrow, io::SeekFrom};
 
 use tokio::fs::File;
-use tokio::io::AsyncRead;
+use tokio::io::{AsyncRead, AsyncReadExt};
 use tokio::sync::{Mutex, OwnedMutexGuard};
 
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::{ArchiveSource, Section};
 
+fn path_from_fd(fd: RawFd) -> PathBuf {
+    Path::new("/proc/self/fd").join(fd.to_string())
+}
+
 #[derive(Clone)]
 pub struct MultiCursorFile {
     fd: RawFd,
@@ -18,7 +22,14 @@ pub struct MultiCursorFile {
 }
 impl MultiCursorFile {
     fn path(&self) -> PathBuf {
-        Path::new("/proc/self/fd").join(self.fd.to_string())
+        path_from_fd(self.fd)
+    }
+    pub async fn open(fd: &impl AsRawFd) -> Result<Self, Error> {
+        let fd = fd.as_raw_fd();
+        Ok(Self {
+            fd,
+            file: Arc::new(Mutex::new(File::open(path_from_fd(fd)).await?)),
+        })
     }
 }
 impl From<File> for MultiCursorFile {
@@ -47,8 +58,8 @@ impl AsyncRead for FileSectionReader {
             return std::task::Poll::Ready(Ok(()));
         }
         let before = buf.filled().len() as u64;
-        let res = std::pin::Pin::new(&mut **this.file.get_mut())
-            .poll_read(cx, &mut buf.take(*this.remaining as usize));
+        let res = std::pin::Pin::new(&mut (&mut **this.file.get_mut()).take(*this.remaining))
+            .poll_read(cx, buf);
         *this.remaining = this
             .remaining
             .saturating_sub(buf.filled().len() as u64 - before);
@@ -59,13 +70,36 @@ impl AsyncRead for FileSectionReader {
 #[async_trait::async_trait]
 impl ArchiveSource for MultiCursorFile {
     type Reader = FileSectionReader;
+    async fn size(&self) -> Option<u64> {
+        tokio::fs::metadata(self.path()).await.ok().map(|m| m.len())
+    }
     async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
         use tokio::io::AsyncSeekExt;
 
         let mut file = if let Ok(file) = self.file.clone().try_lock_owned() {
             file
         } else {
-            Arc::new(Mutex::new(File::open(self.path()).await?))
+            #[cfg(target_os = "linux")]
+            let file = File::open(self.path()).await?;
+            #[cfg(target_os = "macos")] // here be dragons
+            let file = unsafe {
+                let mut buf = [0u8; libc::PATH_MAX as usize];
+                if libc::fcntl(
+                    self.fd,
+                    libc::F_GETPATH,
+                    buf.as_mut_ptr().cast::<libc::c_char>(),
+                ) == -1
+                {
+                    return Err(std::io::Error::last_os_error().into());
+                }
+                File::open(
+                    &*std::ffi::CStr::from_bytes_until_nul(&buf)
+                        .with_kind(ErrorKind::Utf8)?
+                        .to_string_lossy(),
+                )
+                .await?
+            };
+            Arc::new(Mutex::new(file))
                 .try_lock_owned()
                 .expect("freshly created")
         };
@@ -77,8 +111,8 @@ impl ArchiveSource for MultiCursorFile {
     }
 }
 
-impl From<Section<MultiCursorFile>> for LoopDev<PathBuf> {
-    fn from(value: Section<MultiCursorFile>) -> Self {
+impl From<&Section<MultiCursorFile>> for LoopDev<PathBuf> {
+    fn from(value: &Section<MultiCursorFile>) -> Self {
         LoopDev::new(value.source.path(), value.position, value.size)
     }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/write_queue.rs b/core/startos/src/s9pk/merkle_archive/write_queue.rs
index 973ffcf30..9496d5e83 100644
--- a/core/startos/src/s9pk/merkle_archive/write_queue.rs
+++ b/core/startos/src/s9pk/merkle_archive/write_queue.rs
@@ -4,7 +4,6 @@ use crate::prelude::*;
 use crate::s9pk::merkle_archive::sink::Sink;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::merkle_archive::{Entry, EntryContents};
-use crate::util::MaybeOwned;
 
 pub struct WriteQueue<'a, S> {
     next_available_position: u64,
diff --git a/core/startos/src/s9pk/mod.rs b/core/startos/src/s9pk/mod.rs
index 6720f2999..83924293a 100644
--- a/core/startos/src/s9pk/mod.rs
+++ b/core/startos/src/s9pk/mod.rs
@@ -1,5 +1,39 @@
 pub mod merkle_archive;
+pub mod rpc;
 pub mod v1;
 pub mod v2;
 
-pub use v1::*;
+use std::io::SeekFrom;
+use std::path::Path;
+
+use tokio::fs::File;
+use tokio::io::{AsyncReadExt, AsyncSeekExt};
+pub use v2::{manifest, S9pk};
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::s9pk::v1::reader::S9pkReader;
+use crate::s9pk::v2::compat::MAGIC_AND_VERSION;
+
+pub async fn load(ctx: &CliContext, path: impl AsRef<Path>) -> Result<File, Error> {
+    // TODO: return s9pk
+    const MAGIC_LEN: usize = MAGIC_AND_VERSION.len();
+    let mut magic = [0_u8; MAGIC_LEN];
+    let mut file = tokio::fs::File::open(&path).await?;
+    file.read_exact(&mut magic).await?;
+    file.seek(SeekFrom::Start(0)).await?;
+    if magic == v2::compat::MAGIC_AND_VERSION {
+        tracing::info!("Converting package to v2 s9pk");
+        let new_path = path.as_ref().with_extension("compat.s9pk");
+        S9pk::from_v1(
+            S9pkReader::from_reader(file, true).await?,
+            &new_path,
+            ctx.developer_key()?.clone(),
+        )
+        .await?;
+        tokio::fs::rename(&new_path, &path).await?;
+        file = tokio::fs::File::open(&path).await?;
+        tracing::info!("Converted s9pk successfully");
+    }
+    Ok(file)
+}
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
new file mode 100644
index 000000000..e11faa2ff
--- /dev/null
+++ b/core/startos/src/s9pk/rpc.rs
@@ -0,0 +1,227 @@
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use clap::Parser;
+use itertools::Itertools;
+use models::ImageId;
+use rpc_toolkit::{from_fn_async, Empty, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use tokio::fs::File;
+use tokio::process::Command;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::s9pk::manifest::Manifest;
+use crate::s9pk::merkle_archive::source::DynFileSource;
+use crate::s9pk::merkle_archive::Entry;
+use crate::s9pk::v2::compat::CONTAINER_TOOL;
+use crate::s9pk::S9pk;
+use crate::util::io::TmpDir;
+use crate::util::serde::{apply_expr, HandlerExtSerde};
+use crate::util::Invoke;
+
+pub const SKIP_ENV: &[&str] = &["TERM", "container", "HOME", "HOSTNAME"];
+
+pub fn s9pk() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("edit", edit())
+        .subcommand("inspect", inspect())
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+struct S9pkPath {
+    s9pk: PathBuf,
+}
+
+fn edit() -> ParentHandler<S9pkPath> {
+    let only_parent = |a, _| a;
+    ParentHandler::<S9pkPath>::new()
+        .subcommand(
+            "add-image",
+            from_fn_async(add_image)
+                .with_inherited(only_parent)
+                .no_display(),
+        )
+        .subcommand(
+            "manifest",
+            from_fn_async(edit_manifest)
+                .with_inherited(only_parent)
+                .with_display_serializable(),
+        )
+}
+
+fn inspect() -> ParentHandler<S9pkPath> {
+    let only_parent = |a, _| a;
+    ParentHandler::<S9pkPath>::new()
+        .subcommand(
+            "file-tree",
+            from_fn_async(file_tree)
+                .with_inherited(only_parent)
+                .with_display_serializable(),
+        )
+        .subcommand(
+            "manifest",
+            from_fn_async(inspect_manifest)
+                .with_inherited(only_parent)
+                .with_display_serializable(),
+        )
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+struct AddImageParams {
+    id: ImageId,
+    image: String,
+}
+async fn add_image(
+    ctx: CliContext,
+    AddImageParams { id, image }: AddImageParams,
+    S9pkPath { s9pk: s9pk_path }: S9pkPath,
+) -> Result<(), Error> {
+    let tmpdir = TmpDir::new().await?;
+    let sqfs_path = tmpdir.join("image.squashfs");
+    let arch = String::from_utf8(
+        Command::new(CONTAINER_TOOL)
+            .arg("run")
+            .arg("--rm")
+            .arg("--entrypoint")
+            .arg("uname")
+            .arg(&image)
+            .arg("-m")
+            .invoke(ErrorKind::Docker)
+            .await?,
+    )?;
+    let env = String::from_utf8(
+        Command::new(CONTAINER_TOOL)
+            .arg("run")
+            .arg("--rm")
+            .arg("--entrypoint")
+            .arg("env")
+            .arg(&image)
+            .invoke(ErrorKind::Docker)
+            .await?,
+    )?
+    .lines()
+    .filter(|l| {
+        l.trim()
+            .split_once("=")
+            .map_or(false, |(v, _)| !SKIP_ENV.contains(&v))
+    })
+    .join("\n")
+        + "\n";
+    let workdir = Path::new(
+        String::from_utf8(
+            Command::new(CONTAINER_TOOL)
+                .arg("run")
+                .arg("--rm")
+                .arg("--entrypoint")
+                .arg("pwd")
+                .arg(&image)
+                .invoke(ErrorKind::Docker)
+                .await?,
+        )?
+        .trim(),
+    )
+    .to_owned();
+    let container_id = String::from_utf8(
+        Command::new(CONTAINER_TOOL)
+            .arg("create")
+            .arg(&image)
+            .invoke(ErrorKind::Docker)
+            .await?,
+    )?;
+    Command::new("bash")
+        .arg("-c")
+        .arg(format!(
+            "{CONTAINER_TOOL} export {container_id} | mksquashfs - {sqfs} -tar -force-uid 100000 -force-gid 100000", // TODO: real uid mapping
+            container_id = container_id.trim(),
+            sqfs = sqfs_path.display()
+        ))
+        .invoke(ErrorKind::Docker)
+        .await?;
+    Command::new(CONTAINER_TOOL)
+        .arg("rm")
+        .arg(container_id.trim())
+        .invoke(ErrorKind::Docker)
+        .await?;
+    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?)
+        .await?
+        .into_dyn();
+    let archive = s9pk.as_archive_mut();
+    archive.set_signer(ctx.developer_key()?.clone());
+    archive.contents_mut().insert_path(
+        Path::new("images")
+            .join(arch.trim())
+            .join(&id)
+            .with_extension("squashfs"),
+        Entry::file(DynFileSource::new(sqfs_path)),
+    )?;
+    archive.contents_mut().insert_path(
+        Path::new("images")
+            .join(arch.trim())
+            .join(&id)
+            .with_extension("env"),
+        Entry::file(DynFileSource::new(Arc::from(Vec::from(env)))),
+    )?;
+    archive.contents_mut().insert_path(
+        Path::new("images")
+            .join(arch.trim())
+            .join(&id)
+            .with_extension("json"),
+        Entry::file(DynFileSource::new(Arc::from(
+            serde_json::to_vec(&serde_json::json!({
+                "workdir": workdir
+            }))
+            .with_kind(ErrorKind::Serialization)?,
+        ))),
+    )?;
+    let tmp_path = s9pk_path.with_extension("s9pk.tmp");
+    let mut tmp_file = File::create(&tmp_path).await?;
+    s9pk.serialize(&mut tmp_file, true).await?;
+    tmp_file.sync_all().await?;
+    tokio::fs::rename(&tmp_path, &s9pk_path).await?;
+
+    Ok(())
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+struct EditManifestParams {
+    expression: String,
+}
+async fn edit_manifest(
+    ctx: CliContext,
+    EditManifestParams { expression }: EditManifestParams,
+    S9pkPath { s9pk: s9pk_path }: S9pkPath,
+) -> Result<Manifest, Error> {
+    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?).await?;
+    let old = serde_json::to_value(s9pk.as_manifest()).with_kind(ErrorKind::Serialization)?;
+    *s9pk.as_manifest_mut() = serde_json::from_value(apply_expr(old.into(), &expression)?.into())
+        .with_kind(ErrorKind::Serialization)?;
+    let manifest = s9pk.as_manifest().clone();
+    let tmp_path = s9pk_path.with_extension("s9pk.tmp");
+    let mut tmp_file = File::create(&tmp_path).await?;
+    s9pk.as_archive_mut()
+        .set_signer(ctx.developer_key()?.clone());
+    s9pk.serialize(&mut tmp_file, true).await?;
+    tmp_file.sync_all().await?;
+    tokio::fs::rename(&tmp_path, &s9pk_path).await?;
+
+    Ok(manifest)
+}
+
+async fn file_tree(
+    ctx: CliContext,
+    _: Empty,
+    S9pkPath { s9pk }: S9pkPath,
+) -> Result<Vec<PathBuf>, Error> {
+    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
+    Ok(s9pk.as_archive().contents().file_paths(""))
+}
+
+async fn inspect_manifest(
+    ctx: CliContext,
+    _: Empty,
+    S9pkPath { s9pk }: S9pkPath,
+) -> Result<Manifest, Error> {
+    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
+    Ok(s9pk.as_manifest().clone())
+}
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index 3eee540ed..b2fa85a5e 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -1,27 +1,17 @@
-use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
-use color_eyre::eyre::eyre;
+use imbl_value::InOMap;
 pub use models::PackageId;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
 use super::git_hash::GitHash;
-use crate::action::Actions;
-use crate::backup::BackupActions;
-use crate::config::action::ConfigActions;
 use crate::dependencies::Dependencies;
-use crate::migration::Migrations;
-use crate::net::interface::Interfaces;
 use crate::prelude::*;
-use crate::procedure::docker::DockerContainers;
-use crate::procedure::PackageProcedure;
-use crate::status::health_check::HealthChecks;
-use crate::util::serde::Regex;
+use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
 use crate::util::Version;
 use crate::version::{Current, VersionT};
 use crate::volume::Volumes;
-use crate::Error;
 
 fn current_version() -> Version {
     Current::new().semver().into()
@@ -36,13 +26,11 @@ pub struct Manifest {
     pub id: PackageId,
     #[serde(default)]
     pub git_hash: Option<GitHash>,
+    #[serde(default)]
+    pub assets: Assets,
     pub title: String,
     pub version: Version,
     pub description: Description,
-    #[serde(default)]
-    pub assets: Assets,
-    #[serde(default)]
-    pub build: Option<Vec<String>>,
     pub release_notes: String,
     pub license: String, // type of license
     pub wrapper_repo: Url,
@@ -52,24 +40,10 @@ pub struct Manifest {
     pub donation_url: Option<Url>,
     #[serde(default)]
     pub alerts: Alerts,
-    pub main: PackageProcedure,
-    pub health_checks: HealthChecks,
-    pub config: Option<ConfigActions>,
-    pub properties: Option<PackageProcedure>,
     pub volumes: Volumes,
-    // #[serde(default)]
-    pub interfaces: Interfaces,
-    // #[serde(default)]
-    pub backup: BackupActions,
-    #[serde(default)]
-    pub migrations: Migrations,
-    #[serde(default)]
-    pub actions: Actions,
-    // #[serde(default)]
-    // pub permissions: Permissions,
     #[serde(default)]
     pub dependencies: Dependencies,
-    pub containers: Option<DockerContainers>,
+    pub config: Option<InOMap<String, Value>>,
 
     #[serde(default)]
     pub replaces: Vec<String>,
@@ -78,43 +52,6 @@ pub struct Manifest {
     pub hardware_requirements: HardwareRequirements,
 }
 
-impl Manifest {
-    pub fn package_procedures(&self) -> impl Iterator<Item = &PackageProcedure> {
-        use std::iter::once;
-        let main = once(&self.main);
-        let cfg_get = self.config.as_ref().map(|a| &a.get).into_iter();
-        let cfg_set = self.config.as_ref().map(|a| &a.set).into_iter();
-        let props = self.properties.iter();
-        let backups = vec![&self.backup.create, &self.backup.restore].into_iter();
-        let migrations = self
-            .migrations
-            .to
-            .values()
-            .chain(self.migrations.from.values());
-        let actions = self.actions.0.values().map(|a| &a.implementation);
-        main.chain(cfg_get)
-            .chain(cfg_set)
-            .chain(props)
-            .chain(backups)
-            .chain(migrations)
-            .chain(actions)
-    }
-
-    pub fn with_git_hash(mut self, git_hash: GitHash) -> Self {
-        self.git_hash = Some(git_hash);
-        self
-    }
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct HardwareRequirements {
-    #[serde(default)]
-    device: BTreeMap<String, Regex>,
-    ram: Option<u64>,
-    pub arch: Option<Vec<String>>,
-}
-
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct Assets {
@@ -176,36 +113,3 @@ impl Assets {
             .unwrap_or(Path::new("scripts"))
     }
 }
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct Description {
-    pub short: String,
-    pub long: String,
-}
-impl Description {
-    pub fn validate(&self) -> Result<(), Error> {
-        if self.short.chars().skip(160).next().is_some() {
-            return Err(Error::new(
-                eyre!("Short description must be 160 characters or less."),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if self.long.chars().skip(5000).next().is_some() {
-            return Err(Error::new(
-                eyre!("Long description must be 5000 characters or less."),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        Ok(())
-    }
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct Alerts {
-    pub install: Option<String>,
-    pub uninstall: Option<String>,
-    pub restore: Option<String>,
-    pub start: Option<String>,
-    pub stop: Option<String>,
-}
diff --git a/core/startos/src/s9pk/v1/mod.rs b/core/startos/src/s9pk/v1/mod.rs
index e1bf4caba..ca49ca597 100644
--- a/core/startos/src/s9pk/v1/mod.rs
+++ b/core/startos/src/s9pk/v1/mod.rs
@@ -1,25 +1,7 @@
-use std::ffi::OsStr;
 use std::path::PathBuf;
 
-use color_eyre::eyre::eyre;
-use futures::TryStreamExt;
-use imbl::OrdMap;
-use rpc_toolkit::command;
-use serde_json::Value;
-use tokio::io::AsyncRead;
-use tracing::instrument;
-
-use crate::context::SdkContext;
-use crate::s9pk::builder::S9pkPacker;
-use crate::s9pk::docker::DockerMultiArch;
-use crate::s9pk::git_hash::GitHash;
-use crate::s9pk::manifest::Manifest;
-use crate::s9pk::reader::S9pkReader;
-use crate::util::display_none;
-use crate::util::io::BufferedWriteReader;
-use crate::util::serde::IoFormat;
-use crate::volume::Volume;
-use crate::{Error, ErrorKind, ResultExt};
+use clap::Parser;
+use serde::{Deserialize, Serialize};
 
 pub mod builder;
 pub mod docker;
@@ -30,217 +12,9 @@ pub mod reader;
 
 pub const SIG_CONTEXT: &[u8] = b"s9pk";
 
-#[command(cli_only, display(display_none))]
-#[instrument(skip_all)]
-pub async fn pack(#[context] ctx: SdkContext, #[arg] path: Option<PathBuf>) -> Result<(), Error> {
-    use tokio::fs::File;
-
-    let path = if let Some(path) = path {
-        path
-    } else {
-        std::env::current_dir()?
-    };
-    let manifest_value: Value = if path.join("manifest.toml").exists() {
-        IoFormat::Toml
-            .from_async_reader(File::open(path.join("manifest.toml")).await?)
-            .await?
-    } else if path.join("manifest.yaml").exists() {
-        IoFormat::Yaml
-            .from_async_reader(File::open(path.join("manifest.yaml")).await?)
-            .await?
-    } else if path.join("manifest.json").exists() {
-        IoFormat::Json
-            .from_async_reader(File::open(path.join("manifest.json")).await?)
-            .await?
-    } else {
-        return Err(Error::new(
-            eyre!("manifest not found"),
-            crate::ErrorKind::Pack,
-        ));
-    };
-
-    let manifest: Manifest = serde_json::from_value::<Manifest>(manifest_value.clone())
-        .with_kind(crate::ErrorKind::Deserialization)?
-        .with_git_hash(GitHash::from_path(&path).await?);
-    let extra_keys =
-        enumerate_extra_keys(&serde_json::to_value(&manifest).unwrap(), &manifest_value);
-    for k in extra_keys {
-        tracing::warn!("Unrecognized Manifest Key: {}", k);
-    }
-
-    let outfile_path = path.join(format!("{}.s9pk", manifest.id));
-    let mut outfile = File::create(outfile_path).await?;
-    S9pkPacker::builder()
-        .manifest(&manifest)
-        .writer(&mut outfile)
-        .license(
-            File::open(path.join(manifest.assets.license_path()))
-                .await
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::Filesystem,
-                        manifest.assets.license_path().display().to_string(),
-                    )
-                })?,
-        )
-        .icon(
-            File::open(path.join(manifest.assets.icon_path()))
-                .await
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::Filesystem,
-                        manifest.assets.icon_path().display().to_string(),
-                    )
-                })?,
-        )
-        .instructions(
-            File::open(path.join(manifest.assets.instructions_path()))
-                .await
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::Filesystem,
-                        manifest.assets.instructions_path().display().to_string(),
-                    )
-                })?,
-        )
-        .docker_images({
-            let docker_images_path = path.join(manifest.assets.docker_images_path());
-            let res: Box<dyn AsyncRead + Unpin + Send + Sync> = if tokio::fs::metadata(&docker_images_path).await?.is_dir() {
-                let tars: Vec<_> = tokio_stream::wrappers::ReadDirStream::new(tokio::fs::read_dir(&docker_images_path).await?).try_collect().await?;
-                let mut arch_info = DockerMultiArch::default();
-                for tar in &tars {
-                    if tar.path().extension() == Some(OsStr::new("tar")) {
-                        arch_info.available.insert(tar.path().file_stem().unwrap_or_default().to_str().unwrap_or_default().to_owned());
-                    }
-                }
-                if arch_info.available.contains("aarch64") {
-                    arch_info.default = "aarch64".to_owned();
-                } else {
-                    arch_info.default = arch_info.available.iter().next().cloned().unwrap_or_default();
-                }
-                let arch_info_cbor = IoFormat::Cbor.to_vec(&arch_info)?;
-                Box::new(BufferedWriteReader::new(|w| async move {
-                    let mut docker_images = tokio_tar::Builder::new(w);
-                    let mut multiarch_header = tokio_tar::Header::new_gnu();
-                    multiarch_header.set_path("multiarch.cbor")?;
-                    multiarch_header.set_size(arch_info_cbor.len() as u64);
-                    multiarch_header.set_cksum();
-                    docker_images.append(&multiarch_header, std::io::Cursor::new(arch_info_cbor)).await?;
-                    for tar in tars
-                    {
-                        docker_images
-                            .append_path_with_name(
-                                tar.path(),
-                                tar.file_name(),
-                            )
-                            .await?;
-                    }
-                    Ok::<_, std::io::Error>(())
-                }, 1024 * 1024))
-            } else {
-                Box::new(File::open(docker_images_path)
-                    .await
-                    .with_ctx(|_| {
-                        (
-                            crate::ErrorKind::Filesystem,
-                            manifest.assets.docker_images_path().display().to_string(),
-                        )
-                    })?)
-            };
-            res
-        })
-        .assets({
-            let asset_volumes = manifest
-            .volumes
-            .iter()
-            .filter(|(_, v)| matches!(v, &&Volume::Assets {})).map(|(id, _)| id.clone()).collect::<Vec<_>>();
-            let assets_path = manifest.assets.assets_path().to_owned();
-            let path = path.clone();
-
-            BufferedWriteReader::new(|w| async move {
-                let mut assets = tokio_tar::Builder::new(w);
-                for asset_volume in asset_volumes
-                {
-                    assets
-                        .append_dir_all(
-                            &asset_volume,
-                            path.join(&assets_path).join(&asset_volume),
-                        )
-                        .await?;
-                }
-                Ok::<_, std::io::Error>(())
-            }, 1024 * 1024)
-        })
-        .scripts({
-            let script_path = path.join(manifest.assets.scripts_path()).join("embassy.js");
-            let needs_script = manifest.package_procedures().any(|a| a.is_script());
-            let has_script = script_path.exists();
-            match (needs_script, has_script) {
-                (true, true) => Some(File::open(script_path).await?),
-                (true, false) => {
-                    return Err(Error::new(eyre!("Script is declared in manifest, but no such script exists at ./scripts/embassy.js"), ErrorKind::Pack).into())
-                }
-                (false, true) => {
-                    tracing::warn!("Manifest does not declare any actions that use scripts, but a script exists at ./scripts/embassy.js");
-                    None
-                }
-                (false, false) => None
-            }
-        })
-        .build()
-        .pack(&ctx.developer_key()?)
-        .await?;
-    outfile.sync_all().await?;
-
-    Ok(())
-}
-
-#[command(rename = "s9pk", cli_only, display(display_none))]
-pub async fn verify(#[arg] path: PathBuf) -> Result<(), Error> {
-    let mut s9pk = S9pkReader::open(path, true).await?;
-    s9pk.validate().await?;
-
-    Ok(())
-}
-
-fn enumerate_extra_keys(reference: &Value, candidate: &Value) -> Vec<String> {
-    match (reference, candidate) {
-        (Value::Object(m_r), Value::Object(m_c)) => {
-            let om_r: OrdMap<String, Value> = m_r.clone().into_iter().collect();
-            let om_c: OrdMap<String, Value> = m_c.clone().into_iter().collect();
-            let common = om_r.clone().intersection(om_c.clone());
-            let top_extra = common.clone().symmetric_difference(om_c.clone());
-            let mut all_extra = top_extra
-                .keys()
-                .map(|s| format!(".{}", s))
-                .collect::<Vec<String>>();
-            for (k, v) in common {
-                all_extra.extend(
-                    enumerate_extra_keys(&v, om_c.get(&k).unwrap())
-                        .into_iter()
-                        .map(|s| format!(".{}{}", k, s)),
-                )
-            }
-            all_extra
-        }
-        (_, Value::Object(m1)) => m1.clone().keys().map(|s| format!(".{}", s)).collect(),
-        _ => Vec::new(),
-    }
-}
-
-#[test]
-fn test_enumerate_extra_keys() {
-    use serde_json::json;
-    let extras = enumerate_extra_keys(
-        &json!({
-            "test": 1,
-            "test2": null,
-        }),
-        &json!({
-            "test": 1,
-            "test2": { "test3": null },
-            "test4": null
-        }),
-    );
-    println!("{:?}", extras)
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct VerifyParams {
+    pub path: PathBuf,
 }
diff --git a/core/startos/src/s9pk/v1/reader.rs b/core/startos/src/s9pk/v1/reader.rs
index e901b1a14..82f62e1df 100644
--- a/core/startos/src/s9pk/v1/reader.rs
+++ b/core/startos/src/s9pk/v1/reader.rs
@@ -1,4 +1,3 @@
-use std::collections::BTreeSet;
 use std::io::SeekFrom;
 use std::ops::Range;
 use std::path::Path;
@@ -10,22 +9,17 @@ use color_eyre::eyre::eyre;
 use digest::Output;
 use ed25519_dalek::VerifyingKey;
 use futures::TryStreamExt;
-use models::ImageId;
+use models::{ImageId, PackageId};
 use sha2::{Digest, Sha512};
 use tokio::fs::File;
-use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt, ReadBuf};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt, BufReader, ReadBuf};
 use tracing::instrument;
 
 use super::header::{FileSection, Header, TableOfContents};
-use super::manifest::{Manifest, PackageId};
 use super::SIG_CONTEXT;
-use crate::install::progress::InstallProgressTracker;
-use crate::s9pk::docker::DockerReader;
+use crate::prelude::*;
+use crate::s9pk::v1::docker::DockerReader;
 use crate::util::Version;
-use crate::{Error, ResultExt};
-
-const MAX_REPLACES: usize = 10;
-const MAX_TITLE_LEN: usize = 30;
 
 #[pin_project::pin_project]
 #[derive(Debug)]
@@ -144,7 +138,7 @@ impl FromStr for ImageTag {
     }
 }
 
-pub struct S9pkReader<R: AsyncRead + AsyncSeek + Unpin + Send + Sync = File> {
+pub struct S9pkReader<R: AsyncRead + AsyncSeek + Unpin + Send + Sync = BufReader<File>> {
     hash: Option<Output<Sha512>>,
     hash_string: Option<String>,
     developer_key: VerifyingKey,
@@ -159,103 +153,10 @@ impl S9pkReader {
             .await
             .with_ctx(|_| (crate::error::ErrorKind::Filesystem, p.display().to_string()))?;
 
-        Self::from_reader(rdr, check_sig).await
-    }
-}
-impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<InstallProgressTracker<R>> {
-    pub fn validated(&mut self) {
-        self.rdr.validated()
+        Self::from_reader(BufReader::new(rdr), check_sig).await
     }
 }
 impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<R> {
-    #[instrument(skip_all)]
-    pub async fn validate(&mut self) -> Result<(), Error> {
-        if self.toc.icon.length > 102_400 {
-            // 100 KiB
-            return Err(Error::new(
-                eyre!("icon must be less than 100KiB"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        let image_tags = self.image_tags().await?;
-        let man = self.manifest().await?;
-        let containers = &man.containers;
-        let validated_image_ids = image_tags
-            .into_iter()
-            .map(|i| i.validate(&man.id, &man.version).map(|_| i.image_id))
-            .collect::<Result<BTreeSet<ImageId>, _>>()?;
-        man.description.validate()?;
-        man.actions.0.iter().try_for_each(|(_, action)| {
-            action.validate(
-                containers,
-                &man.eos_version,
-                &man.volumes,
-                &validated_image_ids,
-            )
-        })?;
-        man.backup.validate(
-            containers,
-            &man.eos_version,
-            &man.volumes,
-            &validated_image_ids,
-        )?;
-        if let Some(cfg) = &man.config {
-            cfg.validate(
-                containers,
-                &man.eos_version,
-                &man.volumes,
-                &validated_image_ids,
-            )?;
-        }
-        man.health_checks
-            .validate(&man.eos_version, &man.volumes, &validated_image_ids)?;
-        man.interfaces.validate()?;
-        man.main
-            .validate(&man.eos_version, &man.volumes, &validated_image_ids, false)
-            .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Main"))?;
-        man.migrations.validate(
-            containers,
-            &man.eos_version,
-            &man.volumes,
-            &validated_image_ids,
-        )?;
-
-        if man.replaces.len() >= MAX_REPLACES {
-            return Err(Error::new(
-                eyre!("Cannot have more than {MAX_REPLACES} replaces"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if let Some(too_big) = man.replaces.iter().find(|x| x.len() >= MAX_REPLACES) {
-            return Err(Error::new(
-                eyre!("We have found a replaces of ({too_big}) that exceeds the max length of {MAX_TITLE_LEN} "),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if man.title.len() >= MAX_TITLE_LEN {
-            return Err(Error::new(
-                eyre!("Cannot have more than a length of {MAX_TITLE_LEN} for title"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-
-        if man.containers.is_some()
-            && matches!(man.main, crate::procedure::PackageProcedure::Docker(_))
-        {
-            return Err(Error::new(
-                eyre!("Cannot have a main docker and a main in containers"),
-                crate::ErrorKind::ValidateS9pk,
-            ));
-        }
-        if let Some(props) = &man.properties {
-            props
-                .validate(&man.eos_version, &man.volumes, &validated_image_ids, true)
-                .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Properties"))?;
-        }
-        man.volumes.validate(&man.interfaces)?;
-
-        Ok(())
-    }
     #[instrument(skip_all)]
     pub async fn image_tags(&mut self) -> Result<Vec<ImageTag>, Error> {
         let mut tar = tokio_tar::Archive::new(self.docker_images().await?);
@@ -361,7 +262,7 @@ impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<R> {
         self.read_handle(self.toc.manifest).await
     }
 
-    pub async fn manifest(&mut self) -> Result<Manifest, Error> {
+    pub async fn manifest(&mut self) -> Result<Value, Error> {
         let slice = self.manifest_raw().await?.to_vec().await?;
         serde_cbor::de::from_reader(slice.as_slice())
             .with_ctx(|_| (crate::ErrorKind::ParseS9pk, "Deserializing Manifest (CBOR)"))
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
new file mode 100644
index 000000000..e2ef8bdbb
--- /dev/null
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -0,0 +1,358 @@
+use std::io::Cursor;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use itertools::Itertools;
+use tokio::fs::File;
+use tokio::io::{AsyncRead, AsyncSeek, AsyncWriteExt};
+use tokio::process::Command;
+
+use crate::prelude::*;
+use crate::s9pk::manifest::Manifest;
+use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::s9pk::merkle_archive::source::{FileSource, Section};
+use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
+use crate::s9pk::rpc::SKIP_ENV;
+use crate::s9pk::v1::manifest::Manifest as ManifestV1;
+use crate::s9pk::v1::reader::S9pkReader;
+use crate::s9pk::v2::S9pk;
+use crate::util::io::TmpDir;
+use crate::util::Invoke;
+use crate::volume::Volume;
+use crate::ARCH;
+
+pub const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x01];
+
+#[cfg(not(feature = "docker"))]
+pub const CONTAINER_TOOL: &str = "podman";
+
+#[cfg(feature = "docker")]
+pub const CONTAINER_TOOL: &str = "docker";
+
+type DynRead = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
+fn into_dyn_read<R: AsyncRead + Unpin + Send + Sync + 'static>(r: R) -> DynRead {
+    Box::new(r)
+}
+
+#[derive(Clone)]
+enum CompatSource {
+    Buffered(Arc<[u8]>),
+    File(PathBuf),
+}
+#[async_trait::async_trait]
+impl FileSource for CompatSource {
+    type Reader = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
+    async fn size(&self) -> Result<u64, Error> {
+        match self {
+            Self::Buffered(a) => Ok(a.len() as u64),
+            Self::File(f) => Ok(tokio::fs::metadata(f).await?.len()),
+        }
+    }
+    async fn reader(&self) -> Result<Self::Reader, Error> {
+        match self {
+            Self::Buffered(a) => Ok(into_dyn_read(Cursor::new(a.clone()))),
+            Self::File(f) => Ok(into_dyn_read(File::open(f).await?)),
+        }
+    }
+}
+
+impl S9pk<Section<MultiCursorFile>> {
+    #[instrument(skip_all)]
+    pub async fn from_v1<R: AsyncRead + AsyncSeek + Unpin + Send + Sync>(
+        mut reader: S9pkReader<R>,
+        destination: impl AsRef<Path>,
+        signer: ed25519_dalek::SigningKey,
+    ) -> Result<Self, Error> {
+        let scratch_dir = TmpDir::new().await?;
+
+        let mut archive = DirectoryContents::<CompatSource>::new();
+
+        // manifest.json
+        let manifest_raw = reader.manifest().await?;
+        let manifest = from_value::<ManifestV1>(manifest_raw.clone())?;
+        let mut new_manifest = Manifest::from(manifest.clone());
+
+        // LICENSE.md
+        let license: Arc<[u8]> = reader.license().await?.to_vec().await?.into();
+        archive.insert_path(
+            "LICENSE.md",
+            Entry::file(CompatSource::Buffered(license.into())),
+        )?;
+
+        // instructions.md
+        let instructions: Arc<[u8]> = reader.instructions().await?.to_vec().await?.into();
+        archive.insert_path(
+            "instructions.md",
+            Entry::file(CompatSource::Buffered(instructions.into())),
+        )?;
+
+        // icon.md
+        let icon: Arc<[u8]> = reader.icon().await?.to_vec().await?.into();
+        archive.insert_path(
+            format!("icon.{}", manifest.assets.icon_type()),
+            Entry::file(CompatSource::Buffered(icon.into())),
+        )?;
+
+        // images
+        let images_dir = scratch_dir.join("images");
+        tokio::fs::create_dir_all(&images_dir).await?;
+        Command::new(CONTAINER_TOOL)
+            .arg("load")
+            .input(Some(&mut reader.docker_images().await?))
+            .invoke(ErrorKind::Docker)
+            .await?;
+        #[derive(serde::Deserialize)]
+        #[serde(rename_all = "PascalCase")]
+        struct DockerImagesOut {
+            repository: Option<String>,
+            tag: Option<String>,
+            #[serde(default)]
+            names: Vec<String>,
+        }
+        for image in {
+            #[cfg(feature = "docker")]
+            let images = std::str::from_utf8(
+                &Command::new(CONTAINER_TOOL)
+                    .arg("images")
+                    .arg("--format=json")
+                    .invoke(ErrorKind::Docker)
+                    .await?,
+            )?
+            .lines()
+            .map(|l| serde_json::from_str::<DockerImagesOut>(l))
+            .collect::<Result<Vec<_>, _>>()
+            .with_kind(ErrorKind::Deserialization)?
+            .into_iter();
+            #[cfg(not(feature = "docker"))]
+            let images = serde_json::from_slice::<Vec<DockerImagesOut>>(
+                &Command::new(CONTAINER_TOOL)
+                    .arg("images")
+                    .arg("--format=json")
+                    .invoke(ErrorKind::Docker)
+                    .await?,
+            )
+            .with_kind(ErrorKind::Deserialization)?
+            .into_iter();
+            images
+        }
+        .flat_map(|i| {
+            if let (Some(repository), Some(tag)) = (i.repository, i.tag) {
+                vec![format!("{repository}:{tag}")]
+            } else {
+                i.names
+                    .into_iter()
+                    .filter_map(|i| i.strip_prefix("docker.io/").map(|s| s.to_owned()))
+                    .collect()
+            }
+        })
+        .filter_map(|i| {
+            i.strip_suffix(&format!(":{}", manifest.version))
+                .map(|s| s.to_owned())
+        })
+        .filter_map(|i| {
+            i.strip_prefix(&format!("start9/{}/", manifest.id))
+                .map(|s| s.to_owned())
+        }) {
+            new_manifest.images.push(image.parse()?);
+            let sqfs_path = images_dir.join(&image).with_extension("squashfs");
+            let image_name = format!("start9/{}/{}:{}", manifest.id, image, manifest.version);
+            let id = String::from_utf8(
+                Command::new(CONTAINER_TOOL)
+                    .arg("create")
+                    .arg(&image_name)
+                    .invoke(ErrorKind::Docker)
+                    .await?,
+            )?;
+            let env = String::from_utf8(
+                Command::new(CONTAINER_TOOL)
+                    .arg("run")
+                    .arg("--rm")
+                    .arg("--entrypoint")
+                    .arg("env")
+                    .arg(&image_name)
+                    .invoke(ErrorKind::Docker)
+                    .await?,
+            )?
+            .lines()
+            .filter(|l| {
+                l.trim()
+                    .split_once("=")
+                    .map_or(false, |(v, _)| !SKIP_ENV.contains(&v))
+            })
+            .join("\n")
+                + "\n";
+            let workdir = Path::new(
+                String::from_utf8(
+                    Command::new(CONTAINER_TOOL)
+                        .arg("run")
+                        .arg("--rm")
+                        .arg("--entrypoint")
+                        .arg("pwd")
+                        .arg(&image_name)
+                        .invoke(ErrorKind::Docker)
+                        .await?,
+                )?
+                .trim(),
+            )
+            .to_owned();
+            Command::new("bash")
+                .arg("-c")
+                .arg(format!(
+                    "{CONTAINER_TOOL} export {id} | mksquashfs - {sqfs} -tar",
+                    id = id.trim(),
+                    sqfs = sqfs_path.display()
+                ))
+                .invoke(ErrorKind::Docker)
+                .await?;
+            Command::new(CONTAINER_TOOL)
+                .arg("rm")
+                .arg(id.trim())
+                .invoke(ErrorKind::Docker)
+                .await?;
+            archive.insert_path(
+                Path::new("images")
+                    .join(&*ARCH)
+                    .join(&image)
+                    .with_extension("squashfs"),
+                Entry::file(CompatSource::File(sqfs_path)),
+            )?;
+            archive.insert_path(
+                Path::new("images")
+                    .join(&*ARCH)
+                    .join(&image)
+                    .with_extension("env"),
+                Entry::file(CompatSource::Buffered(Vec::from(env).into())),
+            )?;
+            archive.insert_path(
+                Path::new("images")
+                    .join(&*ARCH)
+                    .join(&image)
+                    .with_extension("json"),
+                Entry::file(CompatSource::Buffered(
+                    serde_json::to_vec(&serde_json::json!({
+                        "workdir": workdir
+                    }))
+                    .with_kind(ErrorKind::Serialization)?
+                    .into(),
+                )),
+            )?;
+        }
+        Command::new(CONTAINER_TOOL)
+            .arg("image")
+            .arg("prune")
+            .arg("-af")
+            .invoke(ErrorKind::Docker)
+            .await?;
+
+        // assets
+        let asset_dir = scratch_dir.join("assets");
+        tokio::fs::create_dir_all(&asset_dir).await?;
+        tokio_tar::Archive::new(reader.assets().await?)
+            .unpack(&asset_dir)
+            .await?;
+        for (asset_id, _) in manifest
+            .volumes
+            .iter()
+            .filter(|(_, v)| matches!(v, Volume::Assets { .. }))
+        {
+            let assets_path = asset_dir.join(&asset_id);
+            let sqfs_path = assets_path.with_extension("squashfs");
+            Command::new("mksquashfs")
+                .arg(&assets_path)
+                .arg(&sqfs_path)
+                .invoke(ErrorKind::Filesystem)
+                .await?;
+            archive.insert_path(
+                Path::new("assets").join(&asset_id),
+                Entry::file(CompatSource::File(sqfs_path)),
+            )?;
+        }
+
+        // javascript
+        let js_dir = scratch_dir.join("javascript");
+        let sqfs_path = js_dir.with_extension("squashfs");
+        tokio::fs::create_dir_all(&js_dir).await?;
+        if let Some(mut scripts) = reader.scripts().await? {
+            let mut js_file = File::create(js_dir.join("embassy.js")).await?;
+            tokio::io::copy(&mut scripts, &mut js_file).await?;
+            js_file.sync_all().await?;
+        }
+        {
+            let mut js_file = File::create(js_dir.join("embassyManifest.json")).await?;
+            js_file
+                .write_all(&serde_json::to_vec(&manifest_raw).with_kind(ErrorKind::Serialization)?)
+                .await?;
+            js_file.sync_all().await?;
+        }
+        Command::new("mksquashfs")
+            .arg(&js_dir)
+            .arg(&sqfs_path)
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        archive.insert_path(
+            Path::new("javascript.squashfs"),
+            Entry::file(CompatSource::File(sqfs_path)),
+        )?;
+
+        archive.insert_path(
+            "manifest.json",
+            Entry::file(CompatSource::Buffered(
+                serde_json::to_vec::<Manifest>(&new_manifest)
+                    .with_kind(ErrorKind::Serialization)?
+                    .into(),
+            )),
+        )?;
+
+        let mut s9pk = S9pk::new(MerkleArchive::new(archive, signer), None).await?;
+        let mut dest_file = File::create(destination.as_ref()).await?;
+        s9pk.serialize(&mut dest_file, false).await?;
+        dest_file.sync_all().await?;
+
+        scratch_dir.delete().await?;
+
+        Ok(S9pk::deserialize(&MultiCursorFile::from(
+            File::open(destination.as_ref()).await?,
+        ))
+        .await?)
+    }
+}
+
+impl From<ManifestV1> for Manifest {
+    fn from(value: ManifestV1) -> Self {
+        let default_url = value.upstream_repo.clone();
+        Self {
+            id: value.id,
+            title: value.title,
+            version: value.version,
+            release_notes: value.release_notes,
+            license: value.license,
+            replaces: value.replaces,
+            wrapper_repo: value.wrapper_repo,
+            upstream_repo: value.upstream_repo,
+            support_site: value.support_site.unwrap_or_else(|| default_url.clone()),
+            marketing_site: value.marketing_site.unwrap_or_else(|| default_url.clone()),
+            donation_url: value.donation_url,
+            description: value.description,
+            images: Vec::new(),
+            assets: value
+                .volumes
+                .iter()
+                .filter(|(_, v)| matches!(v, &&Volume::Assets { .. }))
+                .map(|(id, _)| id.clone())
+                .collect(),
+            volumes: value
+                .volumes
+                .iter()
+                .filter(|(_, v)| matches!(v, &&Volume::Data { .. }))
+                .map(|(id, _)| id.clone())
+                .collect(),
+            alerts: value.alerts,
+            dependencies: value.dependencies,
+            hardware_requirements: value.hardware_requirements,
+            git_hash: value.git_hash,
+            os_version: value.eos_version,
+            has_config: value.config.is_some(),
+        }
+    }
+}
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
new file mode 100644
index 000000000..d9affae9c
--- /dev/null
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -0,0 +1,95 @@
+use std::collections::BTreeMap;
+
+use color_eyre::eyre::eyre;
+use helpers::const_true;
+pub use models::PackageId;
+use models::{ImageId, VolumeId};
+use serde::{Deserialize, Serialize};
+use url::Url;
+
+use crate::dependencies::Dependencies;
+use crate::prelude::*;
+use crate::s9pk::v1::git_hash::GitHash;
+use crate::util::serde::Regex;
+use crate::util::Version;
+use crate::version::{Current, VersionT};
+
+fn current_version() -> Version {
+    Current::new().semver().into()
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+pub struct Manifest {
+    pub id: PackageId,
+    pub title: String,
+    pub version: Version,
+    pub release_notes: String,
+    pub license: String, // type of license
+    #[serde(default)]
+    pub replaces: Vec<String>,
+    pub wrapper_repo: Url,
+    pub upstream_repo: Url,
+    pub support_site: Url,
+    pub marketing_site: Url,
+    pub donation_url: Option<Url>,
+    pub description: Description,
+    pub images: Vec<ImageId>,
+    pub assets: Vec<VolumeId>, // TODO: AssetsId
+    pub volumes: Vec<VolumeId>,
+    #[serde(default)]
+    pub alerts: Alerts,
+    #[serde(default)]
+    pub dependencies: Dependencies,
+    #[serde(default)]
+    pub hardware_requirements: HardwareRequirements,
+    #[serde(default)]
+    pub git_hash: Option<GitHash>,
+    #[serde(default = "current_version")]
+    pub os_version: Version,
+    #[serde(default = "const_true")]
+    pub has_config: bool,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct HardwareRequirements {
+    #[serde(default)]
+    device: BTreeMap<String, Regex>,
+    ram: Option<u64>,
+    pub arch: Option<Vec<String>>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Description {
+    pub short: String,
+    pub long: String,
+}
+impl Description {
+    pub fn validate(&self) -> Result<(), Error> {
+        if self.short.chars().skip(160).next().is_some() {
+            return Err(Error::new(
+                eyre!("Short description must be 160 characters or less."),
+                crate::ErrorKind::ValidateS9pk,
+            ));
+        }
+        if self.long.chars().skip(5000).next().is_some() {
+            return Err(Error::new(
+                eyre!("Long description must be 5000 characters or less."),
+                crate::ErrorKind::ValidateS9pk,
+            ));
+        }
+        Ok(())
+    }
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Alerts {
+    pub install: Option<String>,
+    pub uninstall: Option<String>,
+    pub restore: Option<String>,
+    pub start: Option<String>,
+    pub stop: Option<String>,
+}
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index be42d0612..af1cd1c17 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -1,23 +1,178 @@
+use std::ffi::OsStr;
+use std::path::Path;
+use std::sync::Arc;
+
+use imbl_value::InternedString;
+use models::{mime, DataUrl, PackageId};
+use tokio::fs::File;
+
 use crate::prelude::*;
+use crate::s9pk::manifest::Manifest;
+use crate::s9pk::merkle_archive::file_contents::FileContents;
 use crate::s9pk::merkle_archive::sink::Sink;
-use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource, Section};
-use crate::s9pk::merkle_archive::MerkleArchive;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
+use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
+use crate::ARCH;
 
 const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x02];
 
-pub struct S9pk<S>(MerkleArchive<S>);
+pub mod compat;
+pub mod manifest;
+
+/**
+    /
+    ├── manifest.json
+    ├── icon.<ext>
+    ├── LICENSE.md
+    ├── instructions.md
+    ├── javascript.squashfs
+    ├── assets
+    │   └── <id>.squashfs (xN)
+    └── images
+        └── <arch>
+            ├── <id>.env (xN)
+            └── <id>.squashfs (xN)
+*/
+
+fn priority(s: &str) -> Option<usize> {
+    match s {
+        "manifest.json" => Some(0),
+        a if Path::new(a).file_stem() == Some(OsStr::new("icon")) => Some(1),
+        "LICENSE.md" => Some(2),
+        "instructions.md" => Some(3),
+        "javascript.squashfs" => Some(4),
+        "assets" => Some(5),
+        "images" => Some(6),
+        _ => None,
+    }
+}
+
+fn filter(p: &Path) -> bool {
+    match p.iter().count() {
+        1 if p.file_name() == Some(OsStr::new("manifest.json")) => true,
+        1 if p.file_stem() == Some(OsStr::new("icon")) => true,
+        1 if p.file_name() == Some(OsStr::new("LICENSE.md")) => true,
+        1 if p.file_name() == Some(OsStr::new("instructions.md")) => true,
+        1 if p.file_name() == Some(OsStr::new("javascript.squashfs")) => true,
+        1 if p.file_name() == Some(OsStr::new("assets")) => true,
+        1 if p.file_name() == Some(OsStr::new("images")) => true,
+        2 if p.parent() == Some(Path::new("assets")) => {
+            p.extension().map_or(false, |ext| ext == "squashfs")
+        }
+        2 if p.parent() == Some(Path::new("images")) => p.file_name() == Some(OsStr::new(&*ARCH)),
+        3 if p.parent() == Some(&*Path::new("images").join(&*ARCH)) => p
+            .extension()
+            .map_or(false, |ext| ext == "squashfs" || ext == "env"),
+        _ => false,
+    }
+}
+
+#[derive(Clone)]
+pub struct S9pk<S = Section<MultiCursorFile>> {
+    manifest: Manifest,
+    manifest_dirty: bool,
+    archive: MerkleArchive<S>,
+    size: Option<u64>,
+}
+impl<S> S9pk<S> {
+    pub fn as_manifest(&self) -> &Manifest {
+        &self.manifest
+    }
+    pub fn as_manifest_mut(&mut self) -> &mut Manifest {
+        self.manifest_dirty = true;
+        &mut self.manifest
+    }
+    pub fn as_archive(&self) -> &MerkleArchive<S> {
+        &self.archive
+    }
+    pub fn as_archive_mut(&mut self) -> &mut MerkleArchive<S> {
+        &mut self.archive
+    }
+    pub fn size(&self) -> Option<u64> {
+        self.size
+    }
+}
+
 impl<S: FileSource> S9pk<S> {
+    pub async fn new(archive: MerkleArchive<S>, size: Option<u64>) -> Result<Self, Error> {
+        let manifest = extract_manifest(&archive).await?;
+        Ok(Self {
+            manifest,
+            manifest_dirty: false,
+            archive,
+            size,
+        })
+    }
+
+    pub async fn icon(&self) -> Result<(InternedString, FileContents<S>), Error> {
+        let mut best_icon = None;
+        for (path, icon) in self
+            .archive
+            .contents()
+            .with_stem("icon")
+            .filter(|(p, _)| {
+                Path::new(&*p)
+                    .extension()
+                    .and_then(|e| e.to_str())
+                    .and_then(mime)
+                    .map_or(false, |e| e.starts_with("image/"))
+            })
+            .filter_map(|(k, v)| v.into_file().map(|f| (k, f)))
+        {
+            let size = icon.size().await?;
+            best_icon = match best_icon {
+                Some((s, a)) if s >= size => Some((s, a)),
+                _ => Some((size, (path, icon))),
+            };
+        }
+        best_icon
+            .map(|(_, a)| a)
+            .ok_or_else(|| Error::new(eyre!("no icon found in archive"), ErrorKind::ParseS9pk))
+    }
+
+    pub async fn icon_data_url(&self) -> Result<DataUrl<'static>, Error> {
+        let (name, contents) = self.icon().await?;
+        let mime = Path::new(&*name)
+            .extension()
+            .and_then(|e| e.to_str())
+            .and_then(mime)
+            .unwrap_or("image/png");
+        DataUrl::from_reader(mime, contents.reader().await?, Some(contents.size().await?)).await
+    }
+
     pub async fn serialize<W: Sink>(&mut self, w: &mut W, verify: bool) -> Result<(), Error> {
         use tokio::io::AsyncWriteExt;
 
         w.write_all(MAGIC_AND_VERSION).await?;
-        self.0.serialize(w, verify).await?;
+        if !self.manifest_dirty {
+            self.archive.serialize(w, verify).await?;
+        } else {
+            let mut dyn_s9pk = self.clone().into_dyn();
+            dyn_s9pk.as_archive_mut().contents_mut().insert_path(
+                "manifest.json",
+                Entry::file(DynFileSource::new(Arc::<[u8]>::from(
+                    serde_json::to_vec(&self.manifest).with_kind(ErrorKind::Serialization)?,
+                ))),
+            )?;
+            dyn_s9pk.archive.serialize(w, verify).await?;
+        }
 
         Ok(())
     }
+
+    pub fn into_dyn(self) -> S9pk<DynFileSource> {
+        S9pk {
+            manifest: self.manifest,
+            manifest_dirty: self.manifest_dirty,
+            archive: self.archive.into_dyn(),
+            size: self.size,
+        }
+    }
 }
 
 impl<S: ArchiveSource> S9pk<Section<S>> {
+    #[instrument(skip_all)]
     pub async fn deserialize(source: &S) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
 
@@ -36,6 +191,46 @@ impl<S: ArchiveSource> S9pk<Section<S>> {
             "Invalid Magic or Unexpected Version"
         );
 
-        Ok(Self(MerkleArchive::deserialize(source, &mut header).await?))
+        let mut archive = MerkleArchive::deserialize(source, &mut header).await?;
+
+        archive.filter(filter)?;
+
+        archive.sort_by(|a, b| match (priority(a), priority(b)) {
+            (Some(a), Some(b)) => a.cmp(&b),
+            (Some(_), None) => std::cmp::Ordering::Less,
+            (None, Some(_)) => std::cmp::Ordering::Greater,
+            (None, None) => std::cmp::Ordering::Equal,
+        });
+
+        Self::new(archive, source.size().await).await
+    }
+}
+impl S9pk {
+    pub async fn from_file(file: File) -> Result<Self, Error> {
+        Self::deserialize(&MultiCursorFile::from(file)).await
+    }
+    pub async fn open(path: impl AsRef<Path>, id: Option<&PackageId>) -> Result<Self, Error> {
+        let res = Self::from_file(tokio::fs::File::open(path).await?).await?;
+        if let Some(id) = id {
+            ensure_code!(
+                &res.as_manifest().id == id,
+                ErrorKind::ValidateS9pk,
+                "manifest.id does not match expected"
+            );
+        }
+        Ok(res)
     }
 }
+
+async fn extract_manifest<S: FileSource>(archive: &MerkleArchive<S>) -> Result<Manifest, Error> {
+    let manifest = serde_json::from_slice(
+        &archive
+            .contents()
+            .get_path("manifest.json")
+            .or_not_found("manifest.json")?
+            .read_file_to_vec()
+            .await?,
+    )
+    .with_kind(ErrorKind::Deserialization)?;
+    Ok(manifest)
+}
diff --git a/core/startos/src/service/cli.rs b/core/startos/src/service/cli.rs
new file mode 100644
index 000000000..d3bdccd72
--- /dev/null
+++ b/core/startos/src/service/cli.rs
@@ -0,0 +1,66 @@
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use clap::Parser;
+use imbl_value::Value;
+use once_cell::sync::OnceCell;
+use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{call_remote_socket, yajrc, CallRemote, Context};
+use tokio::runtime::Runtime;
+
+use crate::lxc::HOST_RPC_SERVER_SOCKET;
+
+#[derive(Debug, Default, Parser)]
+pub struct ContainerClientConfig {
+    #[arg(long = "socket")]
+    pub socket: Option<PathBuf>,
+}
+
+pub struct ContainerCliSeed {
+    socket: PathBuf,
+    runtime: OnceCell<Runtime>,
+}
+
+#[derive(Clone)]
+pub struct ContainerCliContext(Arc<ContainerCliSeed>);
+impl ContainerCliContext {
+    pub fn init(cfg: ContainerClientConfig) -> Self {
+        Self(Arc::new(ContainerCliSeed {
+            socket: cfg
+                .socket
+                .unwrap_or_else(|| Path::new("/").join(HOST_RPC_SERVER_SOCKET)),
+            runtime: OnceCell::new(),
+        }))
+    }
+}
+impl Context for ContainerCliContext {
+    fn runtime(&self) -> tokio::runtime::Handle {
+        self.0
+            .runtime
+            .get_or_init(|| {
+                tokio::runtime::Builder::new_current_thread()
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            })
+            .handle()
+            .clone()
+    }
+}
+
+#[async_trait::async_trait]
+impl CallRemote for ContainerCliContext {
+    async fn call_remote(&self, method: &str, params: Value) -> Result<Value, RpcError> {
+        call_remote_socket(
+            tokio::net::UnixStream::connect(&self.0.socket)
+                .await
+                .map_err(|e| RpcError {
+                    data: Some(e.to_string().into()),
+                    ..yajrc::INTERNAL_ERROR
+                })?,
+            method,
+            params,
+        )
+        .await
+    }
+}
diff --git a/core/startos/src/service/config.rs b/core/startos/src/service/config.rs
new file mode 100644
index 000000000..c64e2be65
--- /dev/null
+++ b/core/startos/src/service/config.rs
@@ -0,0 +1,22 @@
+use std::collections::BTreeMap;
+
+use models::PackageId;
+
+use crate::config::ConfigureContext;
+use crate::prelude::*;
+use crate::service::Service;
+
+impl Service {
+    pub async fn configure(
+        &self,
+        ConfigureContext {
+            breakages,
+            timeout,
+            config,
+            overrides,
+            dry_run,
+        }: ConfigureContext,
+    ) -> Result<BTreeMap<PackageId, String>, Error> {
+        todo!()
+    }
+}
diff --git a/core/startos/src/service/control.rs b/core/startos/src/service/control.rs
new file mode 100644
index 000000000..17c432755
--- /dev/null
+++ b/core/startos/src/service/control.rs
@@ -0,0 +1,45 @@
+use crate::prelude::*;
+use crate::service::start_stop::StartStop;
+use crate::service::transition::TransitionKind;
+use crate::service::{Service, ServiceActor};
+use crate::util::actor::{BackgroundJobs, Handler};
+
+struct Start;
+#[async_trait::async_trait]
+impl Handler<Start> for ServiceActor {
+    type Response = ();
+    async fn handle(&mut self, _: Start, _: &mut BackgroundJobs) -> Self::Response {
+        self.0.desired_state.send_replace(StartStop::Start);
+        self.0.synchronized.notified().await
+    }
+}
+impl Service {
+    pub async fn start(&self) -> Result<(), Error> {
+        self.actor.send(Start).await
+    }
+}
+
+struct Stop;
+#[async_trait::async_trait]
+impl Handler<Stop> for ServiceActor {
+    type Response = ();
+    async fn handle(&mut self, _: Stop, _: &mut BackgroundJobs) -> Self::Response {
+        self.0.desired_state.send_replace(StartStop::Stop);
+        if self.0.transition_state.borrow().as_ref().map(|t| t.kind())
+            == Some(TransitionKind::Restarting)
+        {
+            if let Some(restart) = self.0.transition_state.send_replace(None) {
+                restart.abort().await;
+            } else {
+                #[cfg(feature = "unstable")]
+                unreachable!()
+            }
+        }
+        self.0.synchronized.notified().await
+    }
+}
+impl Service {
+    pub async fn stop(&self) -> Result<(), Error> {
+        self.actor.send(Stop).await
+    }
+}
diff --git a/core/startos/src/service/fake.cert.key b/core/startos/src/service/fake.cert.key
new file mode 100644
index 000000000..a4eb56cb7
--- /dev/null
+++ b/core/startos/src/service/fake.cert.key
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINn5jiv9VFgEwdUJsDksSTAjPKwkl2DCmCmumu4D1GnNoAoGCCqGSM49
+AwEHoUQDQgAE5KuqP+Wdn8pzmNMxK2hya6mKj1H0j5b47y97tIXqf5ajTi8koRPl
+yao3YcqdtBtN37aw4rVlXVwEJIozZgyiyA==
+-----END EC PRIVATE KEY-----
\ No newline at end of file
diff --git a/core/startos/src/service/fake.cert.pem b/core/startos/src/service/fake.cert.pem
new file mode 100644
index 000000000..fdacaff16
--- /dev/null
+++ b/core/startos/src/service/fake.cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB9DCCAZmgAwIBAgIUIWsFiA8JqIqeUo+Psn91oCQIcdwwCgYIKoZIzj0EAwIw
+TzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNPMRowGAYDVQQKDBFTdGFydDkgTGFi
+cywgSW5jLjEXMBUGA1UEAwwOZmFrZW5hbWUubG9jYWwwHhcNMjQwMjE0MTk1MTUz
+WhcNMjUwMjEzMTk1MTUzWjBPMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ08xGjAY
+BgNVBAoMEVN0YXJ0OSBMYWJzLCBJbmMuMRcwFQYDVQQDDA5mYWtlbmFtZS5sb2Nh
+bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOSrqj/lnZ/Kc5jTMStocmupio9R
+9I+W+O8ve7SF6n+Wo04vJKET5cmqN2HKnbQbTd+2sOK1ZV1cBCSKM2YMosijUzBR
+MB0GA1UdDgQWBBR+qd4W//H34Eg90yAPjYz3nZK79DAfBgNVHSMEGDAWgBR+qd4W
+//H34Eg90yAPjYz3nZK79DAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0kA
+MEYCIQDNSN9YWkGbntG+nC+NzEyqE9FcvYZ8TaF3sOnthqSVKwIhAM2N+WJG/p4C
+cPl4HSPPgDaOIhVZzxSje2ycb7wvFtpH
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
new file mode 100644
index 000000000..fd8412c02
--- /dev/null
+++ b/core/startos/src/service/mod.rs
@@ -0,0 +1,542 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use chrono::{DateTime, Utc};
+use clap::Parser;
+use futures::future::BoxFuture;
+use imbl::OrdMap;
+use models::{ActionId, HealthCheckId, PackageId, ProcedureName};
+use persistent_container::PersistentContainer;
+use rpc_toolkit::{from_fn_async, CallRemoteHandler, Handler, HandlerArgs};
+use serde::{Deserialize, Serialize};
+use start_stop::StartStop;
+use tokio::sync::{watch, Notify};
+
+use crate::action::ActionResult;
+use crate::config::action::ConfigRes;
+use crate::context::{CliContext, RpcContext};
+use crate::core::rpc_continuations::RequestGuid;
+use crate::db::model::{
+    CurrentDependencies, CurrentDependents, InstalledPackageInfo, PackageDataEntry,
+    PackageDataEntryInstalled, PackageDataEntryMatchModel, StaticFiles,
+};
+use crate::disk::mount::guard::GenericMountGuard;
+use crate::install::PKG_ARCHIVE_DIR;
+use crate::prelude::*;
+use crate::progress::{self, NamedProgress, Progress};
+use crate::s9pk::S9pk;
+use crate::service::service_map::InstallProgressHandles;
+use crate::service::transition::{TempDesiredState, TransitionKind, TransitionState};
+use crate::status::health_check::HealthCheckResult;
+use crate::status::{DependencyConfigErrors, MainStatus, Status};
+use crate::util::actor::{Actor, BackgroundJobs, SimpleActor};
+use crate::volume::data_dir;
+
+pub mod cli;
+mod config;
+mod control;
+pub mod persistent_container;
+mod rpc;
+pub mod service_effect_handler;
+pub mod service_map;
+mod start_stop;
+mod transition;
+mod util;
+
+pub use service_map::ServiceMap;
+
+pub const HEALTH_CHECK_COOLDOWN_SECONDS: u64 = 15;
+pub const HEALTH_CHECK_GRACE_PERIOD_SECONDS: u64 = 5;
+pub const SYNC_RETRY_COOLDOWN_SECONDS: u64 = 10;
+
+pub type Task<'a> = BoxFuture<'a, Result<(), Error>>;
+
+/// TODO
+pub enum BackupReturn {
+    TODO,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub enum LoadDisposition {
+    Retry,
+    Undo,
+}
+
+pub struct Service {
+    actor: SimpleActor<ServiceActor>,
+    seed: Arc<ServiceActorSeed>,
+}
+impl Service {
+    #[instrument(skip_all)]
+    async fn new(ctx: RpcContext, s9pk: S9pk, start: StartStop) -> Result<Self, Error> {
+        let id = s9pk.as_manifest().id.clone();
+        let desired_state = watch::channel(start).0;
+        let temp_desired_state = TempDesiredState(Arc::new(watch::channel(None).0));
+        let persistent_container = PersistentContainer::new(
+            &ctx,
+            s9pk,
+            // desired_state.subscribe(),
+            // temp_desired_state.subscribe(),
+        )
+        .await?;
+        let seed = Arc::new(ServiceActorSeed {
+            id,
+            running_status: persistent_container.running_status.subscribe(),
+            persistent_container,
+            ctx,
+            desired_state,
+            temp_desired_state,
+            transition_state: Arc::new(watch::channel(None).0),
+            synchronized: Arc::new(Notify::new()),
+        });
+        seed.persistent_container
+            .init(Arc::downgrade(&seed))
+            .await?;
+        Ok(Self {
+            actor: SimpleActor::new(ServiceActor(seed.clone())),
+            seed,
+        })
+    }
+
+    #[instrument(skip_all)]
+    pub async fn load(
+        ctx: &RpcContext,
+        id: &PackageId,
+        disposition: LoadDisposition,
+    ) -> Result<Option<Self>, Error> {
+        let handle_installed = {
+            let ctx = ctx.clone();
+            move |s9pk: S9pk, i: Model<InstalledPackageInfo>| async move {
+                for volume_id in &s9pk.as_manifest().volumes {
+                    let tmp_path =
+                        data_dir(&ctx.datadir, &s9pk.as_manifest().id.clone(), volume_id);
+                    if tokio::fs::metadata(&tmp_path).await.is_err() {
+                        tokio::fs::create_dir_all(&tmp_path).await?;
+                    }
+                }
+                let start_stop = if i.as_status().as_main().de()?.running() {
+                    StartStop::Start
+                } else {
+                    StartStop::Stop
+                };
+                Self::new(ctx, s9pk, start_stop).await.map(Some)
+            }
+        };
+        let s9pk_dir = ctx.datadir.join(PKG_ARCHIVE_DIR).join("installed"); // TODO: make this based on hash
+        let s9pk_path = s9pk_dir.join(id).with_extension("s9pk");
+        match ctx
+            .db
+            .peek()
+            .await
+            .into_package_data()
+            .into_idx(id)
+            .map(|pde| pde.into_match())
+        {
+            Some(PackageDataEntryMatchModel::Installing(_)) => {
+                if disposition == LoadDisposition::Retry {
+                    if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id)).await.map_err(|e| {
+                        tracing::error!("Error opening s9pk for install: {e}");
+                        tracing::debug!("{e:?}")
+                    }) {
+                        if let Ok(service) = Self::install(ctx.clone(), s9pk, None, None)
+                            .await
+                            .map_err(|e| {
+                                tracing::error!("Error installing service: {e}");
+                                tracing::debug!("{e:?}")
+                            })
+                        {
+                            return Ok(Some(service));
+                        }
+                    }
+                }
+                // TODO: delete s9pk?
+                ctx.db
+                    .mutate(|v| v.as_package_data_mut().remove(id))
+                    .await?;
+                Ok(None)
+            }
+            Some(PackageDataEntryMatchModel::Updating(e)) => {
+                if disposition == LoadDisposition::Retry
+                    && e.as_install_progress().de()?.phases.iter().any(
+                        |NamedProgress { name, progress }| {
+                            name.eq_ignore_ascii_case("download")
+                                && progress == &Progress::Complete(true)
+                        },
+                    )
+                {
+                    if let Ok(s9pk) = S9pk::open(&s9pk_path, Some(id)).await.map_err(|e| {
+                        tracing::error!("Error opening s9pk for update: {e}");
+                        tracing::debug!("{e:?}")
+                    }) {
+                        if let Ok(service) = Self::install(
+                            ctx.clone(),
+                            s9pk,
+                            Some(e.as_installed().as_manifest().as_version().de()?),
+                            None,
+                        )
+                        .await
+                        .map_err(|e| {
+                            tracing::error!("Error installing service: {e}");
+                            tracing::debug!("{e:?}")
+                        }) {
+                            return Ok(Some(service));
+                        }
+                    }
+                }
+                let s9pk = S9pk::open(s9pk_path, Some(id)).await?;
+                ctx.db
+                    .mutate({
+                        let manifest = s9pk.as_manifest().clone();
+                        |db| {
+                            db.as_package_data_mut()
+                                .as_idx_mut(&manifest.id)
+                                .or_not_found(&manifest.id)?
+                                .ser(&PackageDataEntry::Installed(PackageDataEntryInstalled {
+                                    static_files: e.as_static_files().de()?,
+                                    manifest,
+                                    installed: e.as_installed().de()?,
+                                }))
+                        }
+                    })
+                    .await?;
+                handle_installed(s9pk, e.as_installed().clone()).await
+            }
+            Some(PackageDataEntryMatchModel::Removing(_))
+            | Some(PackageDataEntryMatchModel::Restoring(_)) => {
+                if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id)).await.map_err(|e| {
+                    tracing::error!("Error opening s9pk for removal: {e}");
+                    tracing::debug!("{e:?}")
+                }) {
+                    if let Ok(service) = Self::new(ctx.clone(), s9pk, StartStop::Stop)
+                        .await
+                        .map_err(|e| {
+                            tracing::error!("Error loading service for removal: {e}");
+                            tracing::debug!("{e:?}")
+                        })
+                    {
+                        if service
+                            .uninstall(None)
+                            .await
+                            .map_err(|e| {
+                                tracing::error!("Error uninstalling service: {e}");
+                                tracing::debug!("{e:?}")
+                            })
+                            .is_ok()
+                        {
+                            return Ok(None);
+                        }
+                    }
+                }
+
+                ctx.db
+                    .mutate(|v| v.as_package_data_mut().remove(id))
+                    .await?;
+
+                Ok(None)
+            }
+            Some(PackageDataEntryMatchModel::Installed(i)) => {
+                handle_installed(
+                    S9pk::open(s9pk_path, Some(id)).await?,
+                    i.as_installed().clone(),
+                )
+                .await
+            }
+            Some(PackageDataEntryMatchModel::Error(e)) => Err(Error::new(
+                eyre!("Failed to parse PackageDataEntry, found {e:?}"),
+                ErrorKind::Deserialization,
+            )),
+            None => Ok(None),
+        }
+    }
+
+    #[instrument(skip_all)]
+    pub async fn install(
+        ctx: RpcContext,
+        s9pk: S9pk,
+        src_version: Option<models::Version>,
+        progress: Option<InstallProgressHandles>,
+    ) -> Result<Self, Error> {
+        let manifest = s9pk.as_manifest().clone();
+        let developer_key = s9pk.as_archive().signer();
+        let icon = s9pk.icon_data_url().await?;
+        let static_files = StaticFiles::local(&manifest.id, &manifest.version, icon);
+        let service = Self::new(ctx.clone(), s9pk, StartStop::Stop).await?;
+        service
+            .seed
+            .persistent_container
+            .execute(ProcedureName::Init, to_value(&src_version)?, None) // TODO timeout
+            .await
+            .with_kind(ErrorKind::MigrationFailed)?; // TODO: handle cancellation
+        if let Some(mut progress) = progress {
+            progress.finalization_progress.complete();
+            progress.progress_handle.complete();
+            tokio::task::yield_now().await;
+        }
+        ctx.db
+            .mutate(|d| {
+                d.as_package_data_mut()
+                    .as_idx_mut(&manifest.id)
+                    .or_not_found(&manifest.id)?
+                    .ser(&PackageDataEntry::Installed(PackageDataEntryInstalled {
+                        installed: InstalledPackageInfo {
+                            current_dependencies: Default::default(), // TODO
+                            current_dependents: Default::default(),   // TODO
+                            dependency_info: Default::default(),      // TODO
+                            developer_key,
+                            status: Status {
+                                configured: false,                            // TODO
+                                main: MainStatus::Stopped,                    // TODO
+                                dependency_config_errors: Default::default(), // TODO
+                            },
+                            interface_addresses: Default::default(), // TODO
+                            marketplace_url: None,                   // TODO
+                            manifest: manifest.clone(),
+                            last_backup: None,                            // TODO
+                            store: Value::Null,                           // TODO
+                            store_exposed_dependents: Default::default(), // TODO
+                            store_exposed_ui: Default::default(),         // TODO
+                        },
+                        manifest,
+                        static_files,
+                    }))
+            })
+            .await?;
+        Ok(service)
+    }
+
+    pub async fn restore(
+        ctx: RpcContext,
+        s9pk: S9pk,
+        guard: impl GenericMountGuard,
+        progress: Option<InstallProgressHandles>,
+    ) -> Result<Self, Error> {
+        // TODO
+        Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
+    }
+
+    pub async fn get_config(&self) -> Result<ConfigRes, Error> {
+        let container = &self.seed.persistent_container;
+        container
+            .execute::<ConfigRes>(
+                ProcedureName::GetConfig,
+                Value::Null,
+                Some(Duration::from_secs(30)), // TODO timeout
+            )
+            .await
+            .with_kind(ErrorKind::ConfigGen)
+    }
+
+    // TODO DO the Action Get
+
+    pub async fn action(&self, id: ActionId, input: Value) -> Result<ActionResult, Error> {
+        let container = &self.seed.persistent_container;
+        container
+            .execute::<ActionResult>(
+                ProcedureName::RunAction(id),
+                input,
+                Some(Duration::from_secs(30)),
+            )
+            .await
+            .with_kind(ErrorKind::Action)
+    }
+
+    pub async fn shutdown(self) -> Result<(), Error> {
+        self.actor
+            .shutdown(crate::util::actor::PendingMessageStrategy::FinishAll { timeout: None }) // TODO timeout
+            .await;
+        if let Some((hdl, shutdown)) = self.seed.persistent_container.rpc_server.send_replace(None)
+        {
+            shutdown.shutdown();
+            hdl.await.with_kind(ErrorKind::Cancelled)?;
+        }
+        Arc::try_unwrap(self.seed)
+            .map_err(|_| {
+                Error::new(
+                    eyre!("ServiceActorSeed held somewhere after actor shutdown"),
+                    ErrorKind::Unknown,
+                )
+            })?
+            .persistent_container
+            .exit()
+            .await?;
+        Ok(())
+    }
+
+    pub async fn uninstall(self, target_version: Option<models::Version>) -> Result<(), Error> {
+        self.seed
+            .persistent_container
+            .execute(ProcedureName::Uninit, to_value(&target_version)?, None) // TODO timeout
+            .await?;
+        self.shutdown().await
+    }
+    pub async fn backup(&self, guard: impl GenericMountGuard) -> Result<BackupReturn, Error> {
+        // TODO
+        Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
+    }
+}
+
+#[derive(Clone)]
+struct RunningStatus {
+    health: OrdMap<HealthCheckId, HealthCheckResult>,
+    started: DateTime<Utc>,
+}
+
+pub(self) struct ServiceActorSeed {
+    ctx: RpcContext,
+    id: PackageId,
+    persistent_container: PersistentContainer,
+    desired_state: watch::Sender<StartStop>,
+    temp_desired_state: TempDesiredState,
+    transition_state: Arc<watch::Sender<Option<TransitionState>>>,
+    running_status: watch::Receiver<Option<RunningStatus>>,
+    synchronized: Arc<Notify>,
+}
+
+struct ServiceActor(Arc<ServiceActorSeed>);
+impl Actor for ServiceActor {
+    fn init(&mut self, jobs: &mut BackgroundJobs) {
+        let seed = self.0.clone();
+        jobs.add_job(async move {
+            let id = seed.id.clone();
+            let mut current = seed.persistent_container.current_state.subscribe();
+            let mut desired = seed.desired_state.subscribe();
+            let mut temp_desired = seed.temp_desired_state.subscribe();
+            let mut transition = seed.transition_state.subscribe();
+            let mut running = seed.running_status.clone();
+            loop {
+                let (desired_state, current_state, transition_kind, running_status) = (
+                    temp_desired.borrow().unwrap_or(*desired.borrow()),
+                    *current.borrow(),
+                    transition.borrow().as_ref().map(|t| t.kind()),
+                    running.borrow().clone(),
+                );
+
+                if let Err(e) = async {
+                    seed.ctx
+                        .db
+                        .mutate(|d| {
+                            if let Some(i) = d
+                                .as_package_data_mut()
+                                .as_idx_mut(&id)
+                                .and_then(|p| p.as_installed_mut())
+                            {
+                                i.as_status_mut().as_main_mut().ser(&match (
+                                    transition_kind,
+                                    desired_state,
+                                    current_state,
+                                    running_status,
+                                ) {
+                                    (Some(TransitionKind::Restarting), _, _, _) => {
+                                        MainStatus::Restarting
+                                    }
+                                    (Some(TransitionKind::BackingUp), _, _, Some(status)) => {
+                                        MainStatus::BackingUp {
+                                            started: Some(status.started),
+                                            health: status.health.clone(),
+                                        }
+                                    }
+                                    (Some(TransitionKind::BackingUp), _, _, None) => {
+                                        MainStatus::BackingUp {
+                                            started: None,
+                                            health: OrdMap::new(),
+                                        }
+                                    }
+                                    (None, StartStop::Stop, StartStop::Stop, _) => {
+                                        MainStatus::Stopped
+                                    }
+                                    (None, StartStop::Stop, StartStop::Start, _) => {
+                                        MainStatus::Stopping {
+                                            timeout: todo!("sigterm timeout"),
+                                        }
+                                    }
+                                    (None, StartStop::Start, StartStop::Stop, _) => {
+                                        MainStatus::Starting
+                                    }
+                                    (None, StartStop::Start, StartStop::Start, None) => {
+                                        MainStatus::Starting
+                                    }
+                                    (None, StartStop::Start, StartStop::Start, Some(status)) => {
+                                        MainStatus::Running {
+                                            started: status.started,
+                                            health: status.health.clone(),
+                                        }
+                                    }
+                                })?;
+                            }
+                            Ok(())
+                        })
+                        .await?;
+                    match (desired_state, current_state) {
+                        (StartStop::Start, StartStop::Stop) => {
+                            seed.persistent_container.start().await
+                        }
+                        (StartStop::Stop, StartStop::Start) => {
+                            seed.persistent_container
+                                .stop(todo!("s9pk sigterm timeout"))
+                                .await
+                        }
+                        _ => Ok(()),
+                    }
+                }
+                .await
+                {
+                    tracing::error!("error synchronizing state of service: {e}");
+                    tracing::debug!("{e:?}");
+
+                    seed.synchronized.notify_waiters();
+
+                    tracing::error!("Retrying in {}s...", SYNC_RETRY_COOLDOWN_SECONDS);
+                    tokio::time::sleep(Duration::from_secs(SYNC_RETRY_COOLDOWN_SECONDS)).await;
+                    continue;
+                }
+
+                seed.synchronized.notify_waiters();
+
+                tokio::select! {
+                    _ = current.changed() => (),
+                    _ = desired.changed() => (),
+                    _ = temp_desired.changed() => (),
+                    _ = transition.changed() => (),
+                    _ = running.changed() => (),
+                }
+            }
+        })
+    }
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct ConnectParams {
+    pub id: PackageId,
+}
+
+pub async fn connect_rpc(
+    ctx: RpcContext,
+    ConnectParams { id }: ConnectParams,
+) -> Result<RequestGuid, Error> {
+    let id_ref = &id;
+    crate::lxc::connect(
+        &ctx,
+        ctx.services
+            .get(&id)
+            .await
+            .as_ref()
+            .or_not_found(lazy_format!("service for {id_ref}"))?
+            .seed
+            .persistent_container
+            .lxc_container
+            .get()
+            .or_not_found(lazy_format!("container for {id_ref}"))?,
+    )
+    .await
+}
+
+pub async fn connect_rpc_cli(
+    handle_args: HandlerArgs<CliContext, ConnectParams>,
+) -> Result<(), Error> {
+    let ctx = handle_args.context.clone();
+    let guid = CallRemoteHandler::<CliContext, _>::new(from_fn_async(connect_rpc))
+        .handle_async(handle_args)
+        .await?;
+
+    crate::lxc::connect_cli(&ctx, guid).await
+}
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
new file mode 100644
index 000000000..6716ed472
--- /dev/null
+++ b/core/startos/src/service/persistent_container.rs
@@ -0,0 +1,365 @@
+use std::collections::BTreeMap;
+use std::path::Path;
+use std::sync::{Arc, Weak};
+use std::time::Duration;
+
+use futures::future::ready;
+use futures::Future;
+use helpers::NonDetachingJoinHandle;
+use imbl_value::InternedString;
+use models::{ProcedureName, VolumeId};
+use rpc_toolkit::{Empty, Server, ShutdownHandle};
+use serde::de::DeserializeOwned;
+use tokio::fs::File;
+use tokio::process::Command;
+use tokio::sync::{oneshot, watch, Mutex, OnceCell};
+use tracing::instrument;
+
+use super::service_effect_handler::{service_effect_handler, EffectContext};
+use super::ServiceActorSeed;
+use crate::context::RpcContext;
+use crate::disk::mount::filesystem::bind::Bind;
+use crate::disk::mount::filesystem::idmapped::IdMapped;
+use crate::disk::mount::filesystem::loop_dev::LoopDev;
+use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
+use crate::disk::mount::filesystem::{MountType, ReadOnly};
+use crate::disk::mount::guard::{GenericMountGuard, MountGuard};
+use crate::lxc::{LxcConfig, LxcContainer, HOST_RPC_SERVER_SOCKET};
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::FileSource;
+use crate::s9pk::S9pk;
+use crate::service::start_stop::StartStop;
+use crate::service::{rpc, RunningStatus};
+use crate::util::rpc_client::UnixRpcClient;
+use crate::util::Invoke;
+use crate::volume::{asset_dir, data_dir};
+use crate::ARCH;
+
+const RPC_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
+
+struct ProcedureId(u64);
+
+// @DRB On top of this we need to also have  the procedures to have the effects and get the results back for them, maybe lock them to the running instance?
+/// This contains the LXC container running the javascript init system
+/// that can be used via a JSON RPC Client connected to a unix domain
+/// socket served by the container
+pub struct PersistentContainer {
+    pub(super) s9pk: S9pk,
+    pub(super) lxc_container: OnceCell<LxcContainer>,
+    rpc_client: UnixRpcClient,
+    pub(super) rpc_server: watch::Sender<Option<(NonDetachingJoinHandle<()>, ShutdownHandle)>>,
+    // procedures: Mutex<Vec<(ProcedureName, ProcedureId)>>,
+    js_mount: MountGuard,
+    volumes: BTreeMap<VolumeId, MountGuard>,
+    assets: BTreeMap<VolumeId, MountGuard>,
+    pub(super) overlays: Arc<Mutex<BTreeMap<InternedString, OverlayGuard>>>,
+    pub(super) current_state: watch::Sender<StartStop>,
+    // pub(super) desired_state: watch::Receiver<StartStop>,
+    // pub(super) temp_desired_state: watch::Receiver<Option<StartStop>>,
+    pub(super) running_status: watch::Sender<Option<RunningStatus>>,
+}
+
+impl PersistentContainer {
+    #[instrument(skip_all)]
+    pub async fn new(
+        ctx: &RpcContext,
+        s9pk: S9pk,
+        // desired_state: watch::Receiver<StartStop>,
+        // temp_desired_state: watch::Receiver<Option<StartStop>>,
+    ) -> Result<Self, Error> {
+        let lxc_container = ctx.lxc_manager.create(LxcConfig::default()).await?;
+        let rpc_client = lxc_container.connect_rpc(Some(RPC_CONNECT_TIMEOUT)).await?;
+        let js_mount = MountGuard::mount(
+            &LoopDev::from(
+                &**s9pk
+                    .as_archive()
+                    .contents()
+                    .get_path("javascript.squashfs")
+                    .and_then(|f| f.as_file())
+                    .or_not_found("javascript")?,
+            ),
+            lxc_container.rootfs_dir().join("usr/lib/startos/package"),
+            ReadOnly,
+        )
+        .await?;
+        let mut volumes = BTreeMap::new();
+        for volume in &s9pk.as_manifest().volumes {
+            let mount = MountGuard::mount(
+                &IdMapped::new(
+                    Bind::new(data_dir(&ctx.datadir, &s9pk.as_manifest().id, volume)),
+                    0,
+                    100000,
+                    65536,
+                ),
+                lxc_container
+                    .rootfs_dir()
+                    .join("media/startos/volumes")
+                    .join(volume),
+                MountType::ReadWrite,
+            )
+            .await?;
+            volumes.insert(volume.clone(), mount);
+        }
+        let mut assets = BTreeMap::new();
+        for asset in &s9pk.as_manifest().assets {
+            assets.insert(
+                asset.clone(),
+                MountGuard::mount(
+                    &Bind::new(
+                        asset_dir(
+                            &ctx.datadir,
+                            &s9pk.as_manifest().id,
+                            &s9pk.as_manifest().version,
+                        )
+                        .join(asset),
+                    ),
+                    lxc_container
+                        .rootfs_dir()
+                        .join("media/startos/assets")
+                        .join(asset),
+                    MountType::ReadWrite,
+                )
+                .await?,
+            );
+        }
+        let image_path = lxc_container.rootfs_dir().join("media/startos/images");
+        tokio::fs::create_dir_all(&image_path).await?;
+        for image in &s9pk.as_manifest().images {
+            let env_filename = Path::new(image.as_ref()).with_extension("env");
+            if let Some(env) = s9pk
+                .as_archive()
+                .contents()
+                .get_path(Path::new("images").join(&*ARCH).join(&env_filename))
+                .and_then(|e| e.as_file())
+            {
+                env.copy(&mut File::create(image_path.join(&env_filename)).await?)
+                    .await?;
+            }
+            let json_filename = Path::new(image.as_ref()).with_extension("json");
+            if let Some(json) = s9pk
+                .as_archive()
+                .contents()
+                .get_path(Path::new("images").join(&*ARCH).join(&json_filename))
+                .and_then(|e| e.as_file())
+            {
+                json.copy(&mut File::create(image_path.join(&json_filename)).await?)
+                    .await?;
+            }
+        }
+        Ok(Self {
+            s9pk,
+            lxc_container: OnceCell::new_with(Some(lxc_container)),
+            rpc_client,
+            rpc_server: watch::channel(None).0,
+            // procedures: Default::default(),
+            js_mount,
+            volumes,
+            assets,
+            overlays: Arc::new(Mutex::new(BTreeMap::new())),
+            current_state: watch::channel(StartStop::Stop).0,
+            // desired_state,
+            // temp_desired_state,
+            running_status: watch::channel(None).0,
+        })
+    }
+
+    #[instrument(skip_all)]
+    pub async fn init(&self, seed: Weak<ServiceActorSeed>) -> Result<(), Error> {
+        let socket_server_context = EffectContext::new(seed);
+        let server = Server::new(
+            move || ready(Ok(socket_server_context.clone())),
+            service_effect_handler(),
+        );
+        let path = self
+            .lxc_container
+            .get()
+            .ok_or_else(|| {
+                Error::new(
+                    eyre!("PersistentContainer has been destroyed"),
+                    ErrorKind::Incoherent,
+                )
+            })?
+            .rpc_dir()
+            .join(HOST_RPC_SERVER_SOCKET);
+        let (send, recv) = oneshot::channel();
+        let handle = NonDetachingJoinHandle::from(tokio::spawn(async move {
+            let (shutdown, fut) = match async {
+                let res = server.run_unix(&path, |err| {
+                    tracing::error!("error on unix socket {}: {err}", path.display())
+                })?;
+                Command::new("chown")
+                    .arg("100000:100000")
+                    .arg(&path)
+                    .invoke(ErrorKind::Filesystem)
+                    .await?;
+                Ok::<_, Error>(res)
+            }
+            .await
+            {
+                Ok((shutdown, fut)) => (Ok(shutdown), Some(fut)),
+                Err(e) => (Err(e), None),
+            };
+            if send.send(shutdown).is_err() {
+                panic!("failed to send shutdown handle");
+            }
+            if let Some(fut) = fut {
+                fut.await;
+            }
+        }));
+        let shutdown = recv.await.map_err(|_| {
+            Error::new(
+                eyre!("unix socket server thread panicked"),
+                ErrorKind::Unknown,
+            )
+        })??;
+        if self
+            .rpc_server
+            .send_replace(Some((handle, shutdown)))
+            .is_some()
+        {
+            return Err(Error::new(
+                eyre!("PersistentContainer already initialized"),
+                ErrorKind::InvalidRequest,
+            ));
+        }
+
+        self.rpc_client.request(rpc::Init, Empty {}).await?;
+
+        Ok(())
+    }
+
+    #[instrument(skip_all)]
+    fn destroy(&mut self) -> impl Future<Output = Result<(), Error>> + 'static {
+        let rpc_client = self.rpc_client.clone();
+        let rpc_server = self.rpc_server.send_replace(None);
+        let js_mount = self.js_mount.take();
+        let volumes = std::mem::take(&mut self.volumes);
+        let assets = std::mem::take(&mut self.assets);
+        let overlays = self.overlays.clone();
+        let lxc_container = self.lxc_container.take();
+        async move {
+            let mut errs = ErrorCollection::new();
+            errs.handle(dbg!(rpc_client.request(rpc::Exit, Empty {}).await));
+            if let Some((hdl, shutdown)) = rpc_server {
+                shutdown.shutdown();
+                errs.handle(hdl.await.with_kind(ErrorKind::Cancelled));
+            }
+            for (_, volume) in volumes {
+                errs.handle(volume.unmount(true).await);
+            }
+            for (_, assets) in assets {
+                errs.handle(assets.unmount(true).await);
+            }
+            for (_, overlay) in std::mem::take(&mut *overlays.lock().await) {
+                errs.handle(overlay.unmount(true).await);
+            }
+            errs.handle(js_mount.unmount(true).await);
+            if let Some(lxc_container) = lxc_container {
+                errs.handle(lxc_container.exit().await);
+            }
+            errs.into_result()
+        }
+    }
+
+    #[instrument(skip_all)]
+    pub async fn exit(mut self) -> Result<(), Error> {
+        self.destroy().await?;
+
+        Ok(())
+    }
+
+    #[instrument(skip_all)]
+    pub async fn start(&self) -> Result<(), Error> {
+        self.execute(
+            ProcedureName::StartMain,
+            Value::Null,
+            Some(Duration::from_secs(5)), // TODO
+        )
+        .await?;
+        Ok(())
+    }
+
+    #[instrument(skip_all)]
+    pub async fn stop(&self, timeout: Option<Duration>) -> Result<(), Error> {
+        self.execute(ProcedureName::StopMain, Value::Null, timeout)
+            .await?;
+        Ok(())
+    }
+
+    #[instrument(skip_all)]
+    pub async fn execute<O>(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<O, Error>
+    where
+        O: DeserializeOwned,
+    {
+        self._execute(name, input, timeout)
+            .await
+            .and_then(from_value)
+    }
+
+    #[instrument(skip_all)]
+    pub async fn sanboxed<O>(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<O, Error>
+    where
+        O: DeserializeOwned,
+    {
+        self._sandboxed(name, input, timeout)
+            .await
+            .and_then(from_value)
+    }
+
+    #[instrument(skip_all)]
+    async fn _execute(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<Value, Error> {
+        let fut = self
+            .rpc_client
+            .request(rpc::Execute, rpc::ExecuteParams::new(name, input, timeout));
+
+        Ok(if let Some(timeout) = timeout {
+            tokio::time::timeout(timeout, fut)
+                .await
+                .with_kind(ErrorKind::Timeout)??
+        } else {
+            fut.await?
+        })
+    }
+
+    #[instrument(skip_all)]
+    async fn _sandboxed(
+        &self,
+        name: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Result<Value, Error> {
+        let fut = self
+            .rpc_client
+            .request(rpc::Sandbox, rpc::ExecuteParams::new(name, input, timeout));
+
+        Ok(if let Some(timeout) = timeout {
+            tokio::time::timeout(timeout, fut)
+                .await
+                .with_kind(ErrorKind::Timeout)??
+        } else {
+            fut.await?
+        })
+    }
+}
+
+impl Drop for PersistentContainer {
+    fn drop(&mut self) {
+        let destroy = self.destroy();
+        tokio::spawn(async move { destroy.await.unwrap() });
+    }
+}
diff --git a/core/startos/src/service/rpc.rs b/core/startos/src/service/rpc.rs
new file mode 100644
index 000000000..05e6dcfab
--- /dev/null
+++ b/core/startos/src/service/rpc.rs
@@ -0,0 +1,96 @@
+use std::time::Duration;
+
+use imbl_value::Value;
+use models::ProcedureName;
+use rpc_toolkit::yajrc::{RpcError, RpcMethod};
+use rpc_toolkit::Empty;
+
+use crate::prelude::*;
+
+#[derive(Clone)]
+pub struct Init;
+impl RpcMethod for Init {
+    type Params = Empty;
+    type Response = ();
+    fn as_str<'a>(&'a self) -> &'a str {
+        "init"
+    }
+}
+impl serde::Serialize for Init {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
+
+#[derive(Clone)]
+pub struct Exit;
+impl RpcMethod for Exit {
+    type Params = Empty;
+    type Response = ();
+    fn as_str<'a>(&'a self) -> &'a str {
+        "exit"
+    }
+}
+impl serde::Serialize for Exit {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
+
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
+pub struct ExecuteParams {
+    procedure: String,
+    input: Value,
+    timeout: Option<u128>,
+}
+impl ExecuteParams {
+    pub fn new(procedure: ProcedureName, input: Value, timeout: Option<Duration>) -> Self {
+        Self {
+            procedure: procedure.js_function_name(),
+            input,
+            timeout: timeout.map(|d| d.as_millis()),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct Execute;
+impl RpcMethod for Execute {
+    type Params = ExecuteParams;
+    type Response = Value;
+    fn as_str<'a>(&'a self) -> &'a str {
+        "execute"
+    }
+}
+impl serde::Serialize for Execute {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
+
+#[derive(Clone)]
+pub struct Sandbox;
+impl RpcMethod for Sandbox {
+    type Params = ExecuteParams;
+    type Response = Value;
+    fn as_str<'a>(&'a self) -> &'a str {
+        "sandbox"
+    }
+}
+impl serde::Serialize for Sandbox {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
new file mode 100644
index 000000000..c015195e5
--- /dev/null
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -0,0 +1,684 @@
+use std::ffi::OsString;
+use std::os::unix::process::CommandExt;
+use std::path::{Path, PathBuf};
+use std::str::FromStr;
+use std::sync::{Arc, Weak};
+
+use clap::builder::{TypedValueParser, ValueParserFactory};
+use clap::Parser;
+use imbl_value::json;
+use models::{ActionId, HealthCheckId, ImageId, PackageId};
+use patch_db::json_ptr::JsonPointer;
+use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
+use tokio::process::Command;
+
+use crate::disk::mount::filesystem::idmapped::IdMapped;
+use crate::disk::mount::filesystem::loop_dev::LoopDev;
+use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
+use crate::prelude::*;
+use crate::s9pk::rpc::SKIP_ENV;
+use crate::service::cli::ContainerCliContext;
+use crate::service::start_stop::StartStop;
+use crate::service::ServiceActorSeed;
+use crate::status::health_check::HealthCheckResult;
+use crate::status::MainStatus;
+use crate::util::clap::FromStrParser;
+use crate::util::new_guid;
+use crate::{db::model::ExposedUI, util::Invoke};
+use crate::{echo, ARCH};
+
+#[derive(Clone)]
+pub(super) struct EffectContext(Weak<ServiceActorSeed>);
+impl EffectContext {
+    pub fn new(seed: Weak<ServiceActorSeed>) -> Self {
+        Self(seed)
+    }
+}
+impl Context for EffectContext {}
+impl EffectContext {
+    fn deref(&self) -> Result<Arc<ServiceActorSeed>, Error> {
+        if let Some(seed) = Weak::upgrade(&self.0) {
+            Ok(seed)
+        } else {
+            Err(Error::new(
+                eyre!("Service has already been destroyed"),
+                ErrorKind::InvalidRequest,
+            ))
+        }
+    }
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+struct RpcData {
+    id: i64,
+    method: String,
+    params: Value,
+}
+pub fn service_effect_handler() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand("gitInfo", from_fn(crate::version::git_info))
+        .subcommand(
+            "echo",
+            from_fn(echo).with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand("chroot", from_fn(chroot).no_display())
+        .subcommand("exists", from_fn_async(exists).no_cli())
+        .subcommand("executeAction", from_fn_async(execute_action).no_cli())
+        .subcommand("getConfigured", from_fn_async(get_configured).no_cli())
+        .subcommand(
+            "stopped",
+            from_fn_async(stopped)
+                .no_display()
+                .with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "running",
+            from_fn_async(running)
+                .no_display()
+                .with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "restart",
+            from_fn_async(restart)
+                .no_display()
+                .with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "shutdown",
+            from_fn_async(shutdown)
+                .no_display()
+                .with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "setConfigured",
+            from_fn_async(set_configured)
+                .no_display()
+                .with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "setMainStatus",
+            from_fn_async(set_main_status).with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand("setHealth", from_fn_async(set_health).no_cli())
+        .subcommand("getStore", from_fn_async(get_store).no_cli())
+        .subcommand("setStore", from_fn_async(set_store).no_cli())
+        .subcommand(
+            "exposeForDependents",
+            from_fn_async(expose_for_dependents).no_cli(),
+        )
+        .subcommand("exposeUi", from_fn_async(expose_ui).no_cli())
+        .subcommand(
+            "createOverlayedImage",
+            from_fn_async(create_overlayed_image)
+                .with_custom_display_fn::<AnyContext, _>(|_, path| {
+                    Ok(println!("{}", path.display()))
+                })
+                .with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "getSslCertificate",
+            from_fn_async(get_ssl_certificate).no_cli(),
+        )
+        .subcommand("getSslKey", from_fn_async(get_ssl_key).no_cli())
+    // TODO @DrBonez when we get the new api for 4.0
+    // .subcommand("setDependencies",from_fn(set_dependencies))
+    // .subcommand("embassyGetInterface",from_fn(embassy_get_interface))
+    // .subcommand("mount",from_fn(mount))
+    // .subcommand("removeAction",from_fn(remove_action))
+    // .subcommand("removeAddress",from_fn(remove_address))
+    // .subcommand("exportAction",from_fn(export_action))
+    // .subcommand("bind",from_fn(bind))
+    // .subcommand("clearNetworkInterfaces",from_fn(clear_network_interfaces))
+    // .subcommand("exportNetworkInterface",from_fn(export_network_interface))
+    // .subcommand("clearBindings",from_fn(clear_bindings))
+    // .subcommand("getHostnames",from_fn(get_hostnames))
+    // .subcommand("getInterface",from_fn(get_interface))
+    // .subcommand("listInterface",from_fn(list_interface))
+    // .subcommand("getIPHostname",from_fn(get_ip_hostname))
+    // .subcommand("getContainerIp",from_fn(get_container_ip))
+    // .subcommand("getLocalHostname",from_fn(get_local_hostname))
+    // .subcommand("getPrimaryUrl",from_fn(get_primary_url))
+    // .subcommand("getServicePortForward",from_fn(get_service_port_forward))
+    // .subcommand("getServiceTorHostname",from_fn(get_service_tor_hostname))
+    // .subcommand("getSystemSmtp",from_fn(get_system_smtp))
+    // .subcommand("reverseProxy",from_fn(reverse_pro)xy)
+    // TODO Callbacks
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[serde(rename_all = "camelCase")]
+struct ChrootParams {
+    #[arg(short = 'e', long = "env")]
+    env: Option<PathBuf>,
+    #[arg(short = 'w', long = "workdir")]
+    workdir: Option<PathBuf>,
+    #[arg(short = 'u', long = "user")]
+    user: Option<String>,
+    path: PathBuf,
+    command: OsString,
+    args: Vec<OsString>,
+}
+fn chroot(
+    _: AnyContext,
+    ChrootParams {
+        env,
+        workdir,
+        user,
+        path,
+        command,
+        args,
+    }: ChrootParams,
+) -> Result<(), Error> {
+    let mut cmd = std::process::Command::new(command);
+    if let Some(env) = env {
+        for (k, v) in std::fs::read_to_string(env)?
+            .lines()
+            .map(|l| l.trim())
+            .filter_map(|l| l.split_once("="))
+            .filter(|(k, _)| !SKIP_ENV.contains(&k))
+        {
+            cmd.env(k, v);
+        }
+    }
+    std::os::unix::fs::chroot(path)?;
+    if let Some(uid) = user.as_deref().and_then(|u| u.parse::<u32>().ok()) {
+        cmd.uid(uid);
+    } else if let Some(user) = user {
+        let (uid, gid) = std::fs::read_to_string("/etc/passwd")?
+            .lines()
+            .find_map(|l| {
+                let mut split = l.trim().split(":");
+                if user != split.next()? {
+                    return None;
+                }
+                split.next(); // throw away x
+                Some((split.next()?.parse().ok()?, split.next()?.parse().ok()?))
+                // uid gid
+            })
+            .or_not_found(lazy_format!("{user} in /etc/passwd"))?;
+        cmd.uid(uid);
+        cmd.gid(gid);
+    };
+    if let Some(workdir) = workdir {
+        cmd.current_dir(workdir);
+    }
+    cmd.args(args);
+    Err(cmd.exec().into())
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct GetSslCertificateParams {
+    package_id: Option<String>,
+    algorithm: Option<String>, //"ecdsa" | "ed25519"
+}
+
+async fn get_ssl_certificate(
+    context: EffectContext,
+    GetSslCertificateParams {
+        package_id,
+        algorithm,
+    }: GetSslCertificateParams,
+) -> Result<Value, Error> {
+    let fake = include_str!("./fake.cert.pem");
+    Ok(json!([fake, fake, fake]))
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct GetSslKeyParams {
+    package_id: Option<String>,
+    algorithm: Option<String>, //"ecdsa" | "ed25519"
+}
+
+async fn get_ssl_key(
+    context: EffectContext,
+    GetSslKeyParams {
+        package_id,
+        algorithm,
+    }: GetSslKeyParams,
+) -> Result<Value, Error> {
+    let fake = include_str!("./fake.cert.key");
+    Ok(json!(fake))
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct GetStoreParams {
+    package_id: Option<PackageId>,
+    path: JsonPointer,
+}
+
+async fn get_store(
+    context: EffectContext,
+    GetStoreParams { package_id, path }: GetStoreParams,
+) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let peeked = context.ctx.db.peek().await;
+    let package_id = package_id.unwrap_or(context.id.clone());
+    let value = peeked
+        .as_package_data()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?
+        .as_installed()
+        .or_not_found(&package_id)?
+        .as_store()
+        .de()?;
+
+    Ok(path
+        .get(&value)
+        .ok_or_else(|| Error::new(eyre!("Did not find value at path"), ErrorKind::NotFound))?
+        .clone())
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct SetStoreParams {
+    value: Value,
+    path: JsonPointer,
+}
+
+async fn set_store(
+    context: EffectContext,
+    SetStoreParams { value, path }: SetStoreParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            let model = db
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_installed_mut()
+                .or_not_found(&package_id)?
+                .as_store_mut();
+            let mut model_value = model.de()?;
+            path.set(&mut model_value, value, true)
+                .with_kind(ErrorKind::ParseDbField)?;
+            model.ser(&model_value)
+        })
+        .await?;
+    Ok(())
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct ExposeForDependentsParams {
+    paths: Vec<JsonPointer>,
+}
+
+async fn expose_for_dependents(
+    context: EffectContext,
+    ExposeForDependentsParams { paths }: ExposeForDependentsParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_installed_mut()
+                .or_not_found(&package_id)?
+                .as_store_exposed_dependents_mut()
+                .ser(&paths)
+        })
+        .await?;
+    Ok(())
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct ExposeUiParams {
+    paths: Vec<ExposedUI>,
+}
+
+async fn expose_ui(
+    context: EffectContext,
+    ExposeUiParams { paths }: ExposeUiParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_installed_mut()
+                .or_not_found(&package_id)?
+                .as_store_exposed_ui_mut()
+                .ser(&paths)
+        })
+        .await?;
+    Ok(())
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+struct ParamsPackageId {
+    package: PackageId,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "camelCase")]
+struct ParamsMaybePackageId {
+    package_id: Option<PackageId>,
+}
+
+async fn exists(context: EffectContext, params: ParamsPackageId) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let peeked = context.ctx.db.peek().await;
+    let package = peeked.as_package_data().as_idx(&params.package).is_some();
+    Ok(json!(package))
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct ExecuteAction {
+    service_id: Option<PackageId>,
+    action_id: ActionId,
+    input: Value,
+}
+async fn execute_action(
+    context: EffectContext,
+    ExecuteAction {
+        action_id,
+        input,
+        service_id,
+    }: ExecuteAction,
+) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let package_id = service_id.clone().unwrap_or_else(|| context.id.clone());
+    let service = context.ctx.services.get(&package_id).await;
+    let service = service.as_ref().ok_or_else(|| {
+        Error::new(
+            eyre!("Could not find package {package_id}"),
+            ErrorKind::Unknown,
+        )
+    })?;
+
+    Ok(json!(service.action(action_id, input).await?))
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct FromService {}
+async fn get_configured(context: EffectContext, _: Empty) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let peeked = context.ctx.db.peek().await;
+    let package_id = &context.id;
+    let package = peeked
+        .as_package_data()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?
+        .as_installed()
+        .or_not_found(&package_id)?
+        .as_status()
+        .as_configured()
+        .de()?;
+    Ok(json!(package))
+}
+
+async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let peeked = context.ctx.db.peek().await;
+    let package_id = params.package_id.unwrap_or_else(|| context.id.clone());
+    let package = peeked
+        .as_package_data()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?
+        .as_installed()
+        .or_not_found(&package_id)?
+        .as_status()
+        .as_main()
+        .de()?;
+    Ok(json!(matches!(package, MainStatus::Stopped)))
+}
+async fn running(context: EffectContext, params: ParamsMaybePackageId) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let peeked = context.ctx.db.peek().await;
+    let package_id = params.package_id.unwrap_or_else(|| context.id.clone());
+    let package = peeked
+        .as_package_data()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?
+        .as_installed()
+        .or_not_found(&package_id)?
+        .as_status()
+        .as_main()
+        .de()?;
+    Ok(json!(matches!(package, MainStatus::Running { .. })))
+}
+
+async fn restart(context: EffectContext, _: Empty) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let service = context.ctx.services.get(&context.id).await;
+    let service = service.as_ref().ok_or_else(|| {
+        Error::new(
+            eyre!("Could not find package {}", context.id),
+            ErrorKind::Unknown,
+        )
+    })?;
+    service.restart().await?;
+    Ok(json!(()))
+}
+
+async fn shutdown(context: EffectContext, _: Empty) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let service = context.ctx.services.get(&context.id).await;
+    let service = service.as_ref().ok_or_else(|| {
+        Error::new(
+            eyre!("Could not find package {}", context.id),
+            ErrorKind::Unknown,
+        )
+    })?;
+    service.stop().await?;
+    Ok(json!(()))
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "camelCase")]
+struct SetConfigured {
+    configured: bool,
+}
+async fn set_configured(context: EffectContext, params: SetConfigured) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let package_id = &context.id;
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_package_data_mut()
+                .as_idx_mut(package_id)
+                .or_not_found(package_id)?
+                .as_installed_mut()
+                .or_not_found(package_id)?
+                .as_status_mut()
+                .as_configured_mut()
+                .ser(&params.configured)
+        })
+        .await?;
+    Ok(json!(()))
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+enum Status {
+    Running,
+    Stopped,
+}
+impl FromStr for Status {
+    type Err = color_eyre::eyre::Report;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "running" => Ok(Self::Running),
+            "stopped" => Ok(Self::Stopped),
+            _ => Err(eyre!("unknown status {s}")),
+        }
+    }
+}
+impl ValueParserFactory for Status {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "camelCase")]
+struct SetMainStatus {
+    status: Status,
+}
+async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Result<Value, Error> {
+    let context = context.deref()?;
+    context
+        .persistent_container
+        .current_state
+        .send_replace(match params.status {
+            Status::Running => StartStop::Start,
+            Status::Stopped => StartStop::Stop,
+        });
+    Ok(Value::Null)
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct SetHealth {
+    name: HealthCheckId,
+    health_result: Option<HealthCheckResult>,
+}
+
+async fn set_health(context: EffectContext, params: SetHealth) -> Result<Value, Error> {
+    let context = context.deref()?;
+    // TODO DrBonez + BLU-J Need to change the type from
+    // ```rs
+    // #[serde(tag = "result")]
+    // pub enum HealthCheckResult {
+    //     Success,
+    //     Disabled,
+    //     Starting,
+    //     Loading { message: String },
+    //     Failure { error: String },
+    // }
+    // ```
+    // to
+    // ```ts
+    // setHealth(o: {
+    //     name: string
+    //     status: HealthStatus
+    //     message?: string
+    //   }): Promise<void>
+    // ```
+
+    let package_id = &context.id;
+    context
+        .ctx
+        .db
+        .mutate(move |db| {
+            let mut main = db
+                .as_package_data()
+                .as_idx(package_id)
+                .or_not_found(package_id)?
+                .as_installed()
+                .or_not_found(package_id)?
+                .as_status()
+                .as_main()
+                .de()?;
+            match &mut main {
+                &mut MainStatus::Running { ref mut health, .. }
+                | &mut MainStatus::BackingUp { ref mut health, .. } => {
+                    health.remove(&params.name);
+                    if let SetHealth {
+                        name,
+                        health_result: Some(health_result),
+                    } = params
+                    {
+                        health.insert(name, health_result);
+                    }
+                }
+                _ => return Ok(()),
+            };
+            db.as_package_data_mut()
+                .as_idx_mut(package_id)
+                .or_not_found(package_id)?
+                .as_installed_mut()
+                .or_not_found(package_id)?
+                .as_status_mut()
+                .as_main_mut()
+                .ser(&main)
+        })
+        .await?;
+    Ok(json!(()))
+}
+
+#[derive(serde::Deserialize, serde::Serialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "camelCase")]
+pub struct CreateOverlayedImageParams {
+    image_id: ImageId,
+}
+
+#[instrument(skip_all)]
+pub async fn create_overlayed_image(
+    ctx: EffectContext,
+    CreateOverlayedImageParams { image_id }: CreateOverlayedImageParams,
+) -> Result<PathBuf, Error> {
+    let ctx = ctx.deref()?;
+    let path = Path::new("images")
+        .join(&*ARCH)
+        .join(&image_id)
+        .with_extension("squashfs");
+    if let Some(image) = ctx
+        .persistent_container
+        .s9pk
+        .as_archive()
+        .contents()
+        .get_path(dbg!(&path))
+        .and_then(|e| e.as_file())
+    {
+        let guid = new_guid();
+        let rootfs_dir = ctx
+            .persistent_container
+            .lxc_container
+            .get()
+            .ok_or_else(|| {
+                Error::new(
+                    eyre!("PersistentContainer has been destroyed"),
+                    ErrorKind::Incoherent,
+                )
+            })?
+            .rootfs_dir();
+        let mountpoint = rootfs_dir.join("media/startos/overlays").join(&*guid);
+        tokio::fs::create_dir_all(&mountpoint).await?;
+        Command::new("chown")
+            .arg("100000:100000")
+            .arg(&mountpoint)
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        let container_mountpoint = Path::new("/").join(
+            mountpoint
+                .strip_prefix(rootfs_dir)
+                .with_kind(ErrorKind::Incoherent)?,
+        );
+        tracing::info!("Mounting overlay {guid} for {image_id}");
+        let guard = OverlayGuard::mount(
+            &IdMapped::new(LoopDev::from(&**image), 0, 100000, 65536),
+            mountpoint,
+        )
+        .await?;
+        tracing::info!("Mounted overlay {guid} for {image_id}");
+        ctx.persistent_container
+            .overlays
+            .lock()
+            .await
+            .insert(guid.clone(), guard);
+        Ok(container_mountpoint)
+    } else {
+        Err(Error::new(
+            eyre!("image {image_id} not found in s9pk"),
+            ErrorKind::NotFound,
+        ))
+    }
+}
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
new file mode 100644
index 000000000..1fddbb8d1
--- /dev/null
+++ b/core/startos/src/service/service_map.rs
@@ -0,0 +1,384 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use color_eyre::eyre::eyre;
+use futures::future::BoxFuture;
+use futures::{Future, FutureExt};
+use helpers::NonDetachingJoinHandle;
+use imbl::OrdMap;
+use imbl_value::InternedString;
+use tokio::sync::{Mutex, OwnedRwLockReadGuard, OwnedRwLockWriteGuard, RwLock};
+use tracing::instrument;
+
+use crate::context::RpcContext;
+use crate::db::model::{
+    InstalledPackageInfo, PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryInstalling,
+    PackageDataEntryRestoring, PackageDataEntryUpdating, StaticFiles,
+};
+use crate::disk::mount::guard::GenericMountGuard;
+use crate::install::PKG_ARCHIVE_DIR;
+use crate::notifications::NotificationLevel;
+use crate::prelude::*;
+use crate::progress::{
+    FullProgressTracker, FullProgressTrackerHandle, PhaseProgressTrackerHandle,
+    ProgressTrackerWriter,
+};
+use crate::s9pk::manifest::PackageId;
+use crate::s9pk::merkle_archive::source::FileSource;
+use crate::s9pk::S9pk;
+use crate::service::{LoadDisposition, Service};
+
+pub type DownloadInstallFuture = BoxFuture<'static, Result<InstallFuture, Error>>;
+pub type InstallFuture = BoxFuture<'static, Result<(), Error>>;
+
+pub(super) struct InstallProgressHandles {
+    pub(super) finalization_progress: PhaseProgressTrackerHandle,
+    pub(super) progress_handle: FullProgressTrackerHandle,
+}
+
+/// This is the structure to contain all the services
+#[derive(Default)]
+pub struct ServiceMap(Mutex<OrdMap<PackageId, Arc<RwLock<Option<Service>>>>>);
+impl ServiceMap {
+    async fn entry(&self, id: &PackageId) -> Arc<RwLock<Option<Service>>> {
+        self.0
+            .lock()
+            .await
+            .entry(id.clone())
+            .or_insert_with(|| Arc::new(RwLock::new(None)))
+            .clone()
+    }
+
+    #[instrument(skip_all)]
+    pub async fn get(&self, id: &PackageId) -> OwnedRwLockReadGuard<Option<Service>> {
+        self.entry(id).await.read_owned().await
+    }
+
+    #[instrument(skip_all)]
+    pub async fn get_mut(&self, id: &PackageId) -> OwnedRwLockWriteGuard<Option<Service>> {
+        self.entry(id).await.write_owned().await
+    }
+
+    #[instrument(skip_all)]
+    pub async fn init(&self, ctx: &RpcContext) -> Result<(), Error> {
+        for id in ctx.db.peek().await.as_package_data().keys()? {
+            if let Err(e) = self.load(ctx, &id, LoadDisposition::Retry).await {
+                tracing::error!("Error loading installed package as service: {e}");
+                tracing::debug!("{e:?}");
+            }
+        }
+        Ok(())
+    }
+
+    #[instrument(skip_all)]
+    pub async fn load(
+        &self,
+        ctx: &RpcContext,
+        id: &PackageId,
+        disposition: LoadDisposition,
+    ) -> Result<(), Error> {
+        let mut shutdown_err = Ok(());
+        let mut service = self.get_mut(id).await;
+        if let Some(service) = service.take() {
+            shutdown_err = service.shutdown().await;
+        }
+        // TODO: retry on error?
+        *service = Service::load(ctx, id, disposition).await?;
+        shutdown_err?;
+        Ok(())
+    }
+
+    #[instrument(skip_all)]
+    pub async fn install<S: FileSource>(
+        &self,
+        ctx: RpcContext,
+        mut s9pk: S9pk<S>,
+        recovery_source: Option<impl GenericMountGuard>,
+    ) -> Result<DownloadInstallFuture, Error> {
+        let manifest = Arc::new(s9pk.as_manifest().clone());
+        let id = manifest.id.clone();
+        let icon = s9pk.icon_data_url().await?;
+        let mut service = self.get_mut(&id).await;
+
+        let op_name = if recovery_source.is_none() {
+            if service.is_none() {
+                "Install"
+            } else {
+                "Update"
+            }
+        } else {
+            "Restore"
+        };
+
+        let size = s9pk.size();
+        let mut progress = FullProgressTracker::new();
+        let download_progress_contribution = size.unwrap_or(60);
+        let progress_handle = progress.handle();
+        let mut download_progress = progress_handle.add_phase(
+            InternedString::intern("Download"),
+            Some(download_progress_contribution),
+        );
+        if let Some(size) = size {
+            download_progress.set_total(size);
+        }
+        let mut finalization_progress = progress_handle.add_phase(
+            InternedString::intern(op_name),
+            Some(download_progress_contribution / 2),
+        );
+        let restoring = recovery_source.is_some();
+
+        let mut reload_guard = ServiceReloadGuard::new(ctx.clone(), id.clone(), op_name);
+
+        reload_guard
+            .handle(ctx.db.mutate({
+                let manifest = manifest.clone();
+                let id = id.clone();
+                let install_progress = progress.snapshot();
+                move |db| {
+                    let pde = match db
+                        .as_package_data()
+                        .as_idx(&id)
+                        .map(|x| x.de())
+                        .transpose()?
+                    {
+                        Some(PackageDataEntry::Installed(PackageDataEntryInstalled {
+                            installed,
+                            static_files,
+                            ..
+                        })) => PackageDataEntry::Updating(PackageDataEntryUpdating {
+                            install_progress,
+                            installed,
+                            manifest: (*manifest).clone(),
+                            static_files,
+                        }),
+                        None if restoring => {
+                            PackageDataEntry::Restoring(PackageDataEntryRestoring {
+                                install_progress,
+                                static_files: StaticFiles::local(
+                                    &manifest.id,
+                                    &manifest.version,
+                                    icon,
+                                ),
+                                manifest: (*manifest).clone(),
+                            })
+                        }
+                        None => PackageDataEntry::Installing(PackageDataEntryInstalling {
+                            install_progress,
+                            static_files: StaticFiles::local(&manifest.id, &manifest.version, icon),
+                            manifest: (*manifest).clone(),
+                        }),
+                        _ => {
+                            return Err(Error::new(
+                                eyre!("Cannot install over a package in a transient state"),
+                                crate::ErrorKind::InvalidRequest,
+                            ))
+                        }
+                    };
+                    db.as_package_data_mut().insert(&manifest.id, &pde)
+                }
+            }))
+            .await?;
+
+        Ok(async move {
+            let (installed_path, sync_progress_task) = reload_guard
+                .handle(async {
+                    let download_path = ctx
+                        .datadir
+                        .join(PKG_ARCHIVE_DIR)
+                        .join("downloading")
+                        .join(&id)
+                        .with_extension("s9pk");
+
+                    let deref_id = id.clone();
+                    let sync_progress_task =
+                        NonDetachingJoinHandle::from(tokio::spawn(progress.sync_to_db(
+                            ctx.db.clone(),
+                            move |v| {
+                                v.as_package_data_mut()
+                                    .as_idx_mut(&deref_id)
+                                    .and_then(|e| e.as_install_progress_mut())
+                            },
+                            Some(Duration::from_millis(100)),
+                        )));
+
+                    let mut progress_writer = ProgressTrackerWriter::new(
+                        crate::util::io::create_file(&download_path).await?,
+                        download_progress,
+                    );
+                    s9pk.serialize(&mut progress_writer, true).await?;
+                    let (file, mut download_progress) = progress_writer.into_inner();
+                    file.sync_all().await?;
+                    download_progress.complete();
+
+                    let installed_path = ctx
+                        .datadir
+                        .join(PKG_ARCHIVE_DIR)
+                        .join("installed")
+                        .join(&id)
+                        .with_extension("s9pk");
+
+                    crate::util::io::rename(&download_path, &installed_path).await?;
+
+                    Ok::<_, Error>((installed_path, sync_progress_task))
+                })
+                .await?;
+            Ok(reload_guard
+                .handle_last(async move {
+                    let s9pk = S9pk::open(&installed_path, Some(&id)).await?;
+                    let prev = if let Some(service) = service.take() {
+                        ensure_code!(
+                            recovery_source.is_none(),
+                            ErrorKind::InvalidRequest,
+                            "cannot restore over existing package"
+                        );
+                        let version = service
+                            .seed
+                            .persistent_container
+                            .s9pk
+                            .as_manifest()
+                            .version
+                            .clone();
+                        service
+                            .uninstall(Some(s9pk.as_manifest().version.clone()))
+                            .await?;
+                        finalization_progress.complete();
+                        progress_handle.complete();
+                        Some(version)
+                    } else {
+                        None
+                    };
+                    if let Some(recovery_source) = recovery_source {
+                        *service = Some(
+                            Service::restore(
+                                ctx,
+                                s9pk,
+                                recovery_source,
+                                Some(InstallProgressHandles {
+                                    finalization_progress,
+                                    progress_handle,
+                                }),
+                            )
+                            .await?,
+                        );
+                    } else {
+                        *service = Some(
+                            Service::install(
+                                ctx,
+                                s9pk,
+                                prev,
+                                Some(InstallProgressHandles {
+                                    finalization_progress,
+                                    progress_handle,
+                                }),
+                            )
+                            .await?,
+                        );
+                    }
+                    sync_progress_task.await.map_err(|_| {
+                        Error::new(eyre!("progress sync task panicked"), ErrorKind::Unknown)
+                    })??;
+                    Ok(())
+                })
+                .boxed())
+        }
+        .boxed())
+    }
+
+    /// This is ran during the cleanup, so when we are uninstalling the service
+    #[instrument(skip_all)]
+    pub async fn uninstall(&self, ctx: &RpcContext, id: &PackageId) -> Result<(), Error> {
+        if let Some(service) = self.get_mut(id).await.take() {
+            ServiceReloadGuard::new(ctx.clone(), id.clone(), "Uninstall")
+                .handle_last(service.uninstall(None))
+                .await?;
+        }
+        Ok(())
+    }
+
+    pub async fn shutdown_all(&self) -> Result<(), Error> {
+        let lock = self.0.lock().await;
+        let mut futs = Vec::with_capacity(lock.len());
+        for service in lock.values().cloned() {
+            futs.push(async move {
+                if let Some(service) = service.write_owned().await.take() {
+                    service.shutdown().await?
+                }
+                Ok::<_, Error>(())
+            });
+        }
+        drop(lock);
+        let mut errors = ErrorCollection::new();
+        for res in futures::future::join_all(futs).await {
+            errors.handle(res);
+        }
+        errors.into_result()
+    }
+}
+
+pub struct ServiceReloadGuard(Option<ServiceReloadInfo>);
+impl Drop for ServiceReloadGuard {
+    fn drop(&mut self) {
+        if let Some(info) = self.0.take() {
+            tokio::spawn(info.reload(None));
+        }
+    }
+}
+impl ServiceReloadGuard {
+    pub fn new(ctx: RpcContext, id: PackageId, operation: &'static str) -> Self {
+        Self(Some(ServiceReloadInfo { ctx, id, operation }))
+    }
+
+    pub async fn handle<T>(
+        &mut self,
+        operation: impl Future<Output = Result<T, Error>>,
+    ) -> Result<T, Error> {
+        let mut errors = ErrorCollection::new();
+        match operation.await {
+            Ok(a) => Ok(a),
+            Err(e) => {
+                if let Some(info) = self.0.take() {
+                    errors.handle(info.reload(Some(e.clone_output())).await);
+                }
+                errors.handle::<(), _>(Err(e));
+                errors.into_result().map(|_| unreachable!()) // TODO: there's gotta be a more elegant way?
+            }
+        }
+    }
+    pub async fn handle_last<T>(
+        mut self,
+        operation: impl Future<Output = Result<T, Error>>,
+    ) -> Result<T, Error> {
+        let res = self.handle(operation).await;
+        self.0.take();
+        res
+    }
+}
+
+struct ServiceReloadInfo {
+    ctx: RpcContext,
+    id: PackageId,
+    operation: &'static str,
+}
+impl ServiceReloadInfo {
+    async fn reload(self, error: Option<Error>) -> Result<(), Error> {
+        self.ctx
+            .services
+            .load(&self.ctx, &self.id, LoadDisposition::Undo)
+            .await?;
+        if let Some(error) = error {
+            self.ctx
+                .notification_manager
+                .notify(
+                    self.ctx.db.clone(),
+                    Some(self.id.clone()),
+                    NotificationLevel::Error,
+                    format!("{} Failed", self.operation),
+                    error.to_string(),
+                    (),
+                    None,
+                )
+                .await?;
+        }
+        Ok(())
+    }
+}
diff --git a/core/startos/src/manager/start_stop.rs b/core/startos/src/service/start_stop.rs
similarity index 93%
rename from core/startos/src/manager/start_stop.rs
rename to core/startos/src/service/start_stop.rs
index 3842abe57..bc24574ac 100644
--- a/core/startos/src/manager/start_stop.rs
+++ b/core/startos/src/service/start_stop.rs
@@ -16,7 +16,7 @@ impl From<MainStatus> for StartStop {
         match value {
             MainStatus::Stopped => StartStop::Stop,
             MainStatus::Restarting => StartStop::Start,
-            MainStatus::Stopping => StartStop::Stop,
+            MainStatus::Stopping { .. } => StartStop::Stop,
             MainStatus::Starting => StartStop::Start,
             MainStatus::Running {
                 started: _,
diff --git a/core/startos/src/service/transition/backup.rs b/core/startos/src/service/transition/backup.rs
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/core/startos/src/service/transition/backup.rs
@@ -0,0 +1 @@
+
diff --git a/core/startos/src/service/transition/mod.rs b/core/startos/src/service/transition/mod.rs
new file mode 100644
index 000000000..29c1be38d
--- /dev/null
+++ b/core/startos/src/service/transition/mod.rs
@@ -0,0 +1,74 @@
+use std::ops::Deref;
+use std::sync::Arc;
+
+use futures::{Future, FutureExt};
+use tokio::sync::watch;
+
+use crate::service::start_stop::StartStop;
+use crate::util::actor::BackgroundJobs;
+use crate::util::future::{CancellationHandle, RemoteCancellable};
+
+pub mod backup;
+pub mod restart;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum TransitionKind {
+    BackingUp,
+    Restarting,
+}
+
+/// Used only in the manager/mod and is used to keep track of the state of the manager during the
+/// transitional states
+pub struct TransitionState {
+    cancel_handle: CancellationHandle,
+    kind: TransitionKind,
+}
+
+impl TransitionState {
+    pub fn kind(&self) -> TransitionKind {
+        self.kind
+    }
+    pub async fn abort(mut self) {
+        self.cancel_handle.cancel_and_wait().await
+    }
+    fn new(
+        task: impl Future<Output = ()> + Send + 'static,
+        kind: TransitionKind,
+        jobs: &mut BackgroundJobs,
+    ) -> Self {
+        let task = RemoteCancellable::new(task);
+        let cancel_handle = task.cancellation_handle();
+        jobs.add_job(task.map(|_| ()));
+        Self {
+            cancel_handle,
+            kind,
+        }
+    }
+}
+impl Drop for TransitionState {
+    fn drop(&mut self) {
+        self.cancel_handle.cancel();
+    }
+}
+
+#[derive(Clone)]
+pub struct TempDesiredState(pub(super) Arc<watch::Sender<Option<StartStop>>>);
+impl TempDesiredState {
+    pub fn stop(&self) {
+        self.0.send_replace(Some(StartStop::Stop));
+    }
+    pub fn start(&self) {
+        self.0.send_replace(Some(StartStop::Start));
+    }
+}
+impl Drop for TempDesiredState {
+    fn drop(&mut self) {
+        self.0.send_replace(None);
+    }
+}
+impl Deref for TempDesiredState {
+    type Target = watch::Sender<Option<StartStop>>;
+    fn deref(&self) -> &Self::Target {
+        &*self.0
+    }
+}
diff --git a/core/startos/src/service/transition/restart.rs b/core/startos/src/service/transition/restart.rs
new file mode 100644
index 000000000..71a889305
--- /dev/null
+++ b/core/startos/src/service/transition/restart.rs
@@ -0,0 +1,39 @@
+use futures::FutureExt;
+
+use crate::prelude::*;
+use crate::service::start_stop::StartStop;
+use crate::service::transition::{TransitionKind, TransitionState};
+use crate::service::{Service, ServiceActor};
+use crate::util::actor::{BackgroundJobs, Handler};
+use crate::util::future::RemoteCancellable;
+
+struct Restart;
+#[async_trait::async_trait]
+impl Handler<Restart> for ServiceActor {
+    type Response = ();
+    async fn handle(&mut self, _: Restart, jobs: &mut BackgroundJobs) -> Self::Response {
+        let temp = self.0.temp_desired_state.clone();
+        let mut current = self.0.persistent_container.current_state.subscribe();
+        let transition = RemoteCancellable::new(async move {
+            temp.stop();
+            current.wait_for(|s| *s == StartStop::Stop).await;
+            temp.start();
+            current.wait_for(|s| *s == StartStop::Start).await;
+        });
+        let cancel_handle = transition.cancellation_handle();
+        jobs.add_job(transition.map(|_| ()));
+        let notified = self.0.synchronized.notified();
+        if let Some(t) = self.0.transition_state.send_replace(Some(TransitionState {
+            kind: TransitionKind::Restarting,
+            cancel_handle,
+        })) {
+            t.abort().await;
+        }
+        notified.await
+    }
+}
+impl Service {
+    pub async fn restart(&self) -> Result<(), Error> {
+        self.actor.send(Restart).await
+    }
+}
diff --git a/core/startos/src/service/util.rs b/core/startos/src/service/util.rs
new file mode 100644
index 000000000..3c53c2366
--- /dev/null
+++ b/core/startos/src/service/util.rs
@@ -0,0 +1,14 @@
+use futures::Future;
+use tokio::sync::Notify;
+
+use crate::prelude::*;
+
+pub async fn cancellable<T>(
+    cancel_transition: &Notify,
+    transition: impl Future<Output = T>,
+) -> Result<T, Error> {
+    tokio::select! {
+        a = transition => Ok(a),
+        _ = cancel_transition.notified() => Err(Error::new(eyre!("transition was cancelled"), ErrorKind::Cancelled)),
+    }
+}
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 64c324095..0f47874e9 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -5,8 +5,8 @@ use std::time::Duration;
 use color_eyre::eyre::eyre;
 use josekit::jwk::Jwk;
 use openssl::x509::X509;
-use rpc_toolkit::command;
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use sqlx::Connection;
 use tokio::fs::File;
@@ -18,36 +18,55 @@ use tracing::instrument;
 use crate::account::AccountInfo;
 use crate::backup::restore::recover_full_embassy;
 use crate::backup::target::BackupTargetFS;
-use crate::context::rpc::RpcContextConfig;
 use crate::context::setup::SetupResult;
 use crate::context::SetupContext;
 use crate::disk::fsck::RepairStrategy;
 use crate::disk::main::DEFAULT_PASSWORD;
 use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::filesystem::ReadWrite;
-use crate::disk::mount::guard::TmpMountGuard;
+use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
 use crate::disk::util::{pvscan, recovery_info, DiskInfo, EmbassyOsRecoveryInfo};
 use crate::disk::REPAIR_DISK_PATH;
 use crate::hostname::Hostname;
 use crate::init::{init, InitResult};
-use crate::middleware::encrypt::EncryptedWire;
 use crate::net::ssl::root_ca_start_time;
 use crate::prelude::*;
+use crate::util::crypto::EncryptedWire;
 use crate::util::io::{dir_copy, dir_size, Counter};
 use crate::{Error, ErrorKind, ResultExt};
 
-#[command(subcommands(status, disk, attach, execute, cifs, complete, get_pubkey, exit))]
-pub fn setup() -> Result<(), Error> {
-    Ok(())
+pub fn setup() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "status",
+            from_fn_async(status)
+                .with_metadata("authenticated", Value::Bool(false))
+                .no_cli(),
+        )
+        .subcommand("disk", disk())
+        .subcommand("attach", from_fn_async(attach).no_cli())
+        .subcommand("execute", from_fn_async(execute).no_cli())
+        .subcommand("cifs", cifs())
+        .subcommand("complete", from_fn_async(complete).no_cli())
+        .subcommand(
+            "get-pubkey",
+            from_fn_async(get_pubkey)
+                .with_metadata("authenticated", Value::Bool(false))
+                .no_cli(),
+        )
+        .subcommand("exit", from_fn_async(exit).no_cli())
 }
 
-#[command(subcommands(list_disks))]
-pub fn disk() -> Result<(), Error> {
-    Ok(())
+pub fn disk() -> ParentHandler {
+    ParentHandler::new().subcommand(
+        "list",
+        from_fn_async(list_disks)
+            .with_metadata("authenticated", Value::Bool(false))
+            .no_cli(),
+    )
 }
 
-#[command(rename = "list", rpc_only, metadata(authenticated = false))]
-pub async fn list_disks(#[context] ctx: SetupContext) -> Result<Vec<DiskInfo>, Error> {
+pub async fn list_disks(ctx: SetupContext) -> Result<Vec<DiskInfo>, Error> {
     crate::disk::util::list(&ctx.os_partitions).await
 }
 
@@ -55,8 +74,7 @@ async fn setup_init(
     ctx: &SetupContext,
     password: Option<String>,
 ) -> Result<(Hostname, OnionAddressV3, X509), Error> {
-    let InitResult { secret_store, db } =
-        init(&RpcContextConfig::load(ctx.config_path.clone()).await?).await?;
+    let InitResult { secret_store, db } = init(&ctx.config).await?;
     let mut secrets_handle = secret_store.acquire().await?;
     let mut secrets_tx = secrets_handle.begin().await?;
 
@@ -82,11 +100,17 @@ async fn setup_init(
     ))
 }
 
-#[command(rpc_only)]
+#[derive(Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct AttachParams {
+    #[serde(rename = "embassy-password")]
+    password: Option<EncryptedWire>,
+    guid: Arc<String>,
+}
+
 pub async fn attach(
-    #[context] ctx: SetupContext,
-    #[arg] guid: Arc<String>,
-    #[arg(rename = "embassy-password")] password: Option<EncryptedWire>,
+    ctx: SetupContext,
+    AttachParams { password, guid }: AttachParams,
 ) -> Result<(), Error> {
     let mut status = ctx.setup_status.write().await;
     if status.is_some() {
@@ -169,8 +193,7 @@ pub struct SetupStatus {
     pub complete: bool,
 }
 
-#[command(rpc_only, metadata(authenticated = false))]
-pub async fn status(#[context] ctx: SetupContext) -> Result<Option<SetupStatus>, RpcError> {
+pub async fn status(ctx: SetupContext) -> Result<Option<SetupStatus>, RpcError> {
     ctx.setup_status.read().await.clone().transpose()
 }
 
@@ -178,25 +201,34 @@ pub async fn status(#[context] ctx: SetupContext) -> Result<Option<SetupStatus>,
 /// This way the frontend can send a secret, like the password for the setup/ recovory
 /// without knowing the password over clearnet. We use the public key shared across the network
 /// since it is fine to share the public, and encrypt against the public.
-#[command(rename = "get-pubkey", rpc_only, metadata(authenticated = false))]
-pub async fn get_pubkey(#[context] ctx: SetupContext) -> Result<Jwk, RpcError> {
+pub async fn get_pubkey(ctx: SetupContext) -> Result<Jwk, RpcError> {
     let secret = ctx.as_ref().clone();
     let pub_key = secret.to_public_key()?;
     Ok(pub_key)
 }
 
-#[command(subcommands(verify_cifs))]
-pub fn cifs() -> Result<(), Error> {
-    Ok(())
+pub fn cifs() -> ParentHandler {
+    ParentHandler::new().subcommand("verify", from_fn_async(verify_cifs).no_cli())
+}
+
+#[derive(Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct VerifyCifsParams {
+    hostname: String,
+    path: PathBuf,
+    username: String,
+    password: Option<EncryptedWire>,
 }
 
-#[command(rename = "verify", rpc_only)]
+// #[command(rename = "verify", rpc_only)]
 pub async fn verify_cifs(
-    #[context] ctx: SetupContext,
-    #[arg] hostname: String,
-    #[arg] path: PathBuf,
-    #[arg] username: String,
-    #[arg] password: Option<EncryptedWire>,
+    ctx: SetupContext,
+    VerifyCifsParams {
+        hostname,
+        path,
+        username,
+        password,
+    }: VerifyCifsParams,
 ) -> Result<EmbassyOsRecoveryInfo, Error> {
     let password: Option<String> = password.map(|x| x.decrypt(&*ctx)).flatten();
     let guard = TmpMountGuard::mount(
@@ -209,12 +241,12 @@ pub async fn verify_cifs(
         ReadWrite,
     )
     .await?;
-    let embassy_os = recovery_info(&guard).await?;
+    let embassy_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
     embassy_os.ok_or_else(|| Error::new(eyre!("No Backup Found"), crate::ErrorKind::NotFound))
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename_all = "kebab-case")]
 pub enum RecoverySource {
@@ -222,13 +254,24 @@ pub enum RecoverySource {
     Backup { target: BackupTargetFS },
 }
 
-#[command(rpc_only)]
+#[derive(Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct ExecuteParams {
+    embassy_logicalname: PathBuf,
+    embassy_password: EncryptedWire,
+    recovery_source: Option<RecoverySource>,
+    recovery_password: Option<EncryptedWire>,
+}
+
+// #[command(rpc_only)]
 pub async fn execute(
-    #[context] ctx: SetupContext,
-    #[arg(rename = "embassy-logicalname")] embassy_logicalname: PathBuf,
-    #[arg(rename = "embassy-password")] embassy_password: EncryptedWire,
-    #[arg(rename = "recovery-source")] recovery_source: Option<RecoverySource>,
-    #[arg(rename = "recovery-password")] recovery_password: Option<EncryptedWire>,
+    ctx: SetupContext,
+    ExecuteParams {
+        embassy_logicalname,
+        embassy_password,
+        recovery_source,
+        recovery_password,
+    }: ExecuteParams,
 ) -> Result<(), Error> {
     let embassy_password = match embassy_password.decrypt(&*ctx) {
         Some(a) => a,
@@ -312,8 +355,8 @@ pub async fn execute(
 }
 
 #[instrument(skip_all)]
-#[command(rpc_only)]
-pub async fn complete(#[context] ctx: SetupContext) -> Result<SetupResult, Error> {
+// #[command(rpc_only)]
+pub async fn complete(ctx: SetupContext) -> Result<SetupResult, Error> {
     let (guid, setup_result) = if let Some((guid, setup_result)) = &*ctx.setup_result.read().await {
         (guid.clone(), setup_result.clone())
     } else {
@@ -329,8 +372,8 @@ pub async fn complete(#[context] ctx: SetupContext) -> Result<SetupResult, Error
 }
 
 #[instrument(skip_all)]
-#[command(rpc_only)]
-pub async fn exit(#[context] ctx: SetupContext) -> Result<(), Error> {
+// #[command(rpc_only)]
+pub async fn exit(ctx: SetupContext) -> Result<(), Error> {
     ctx.shutdown.send(()).expect("failed to shutdown");
     Ok(())
 }
@@ -383,8 +426,7 @@ async fn fresh_setup(
     let sqlite_pool = ctx.secret_store().await?;
     account.save(&sqlite_pool).await?;
     sqlite_pool.close().await;
-    let InitResult { secret_store, .. } =
-        init(&RpcContextConfig::load(ctx.config_path.clone()).await?).await?;
+    let InitResult { secret_store, .. } = init(&ctx.config).await?;
     secret_store.close().await;
     Ok((
         account.hostname.clone(),
diff --git a/core/startos/src/shutdown.rs b/core/startos/src/shutdown.rs
index e5ff969b6..bd99bbbd1 100644
--- a/core/startos/src/shutdown.rs
+++ b/core/startos/src/shutdown.rs
@@ -1,15 +1,12 @@
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use rpc_toolkit::command;
-
 use crate::context::RpcContext;
 use crate::disk::main::export;
 use crate::init::{STANDBY_MODE_PATH, SYSTEM_REBUILD_PATH};
 use crate::prelude::*;
 use crate::sound::SHUTDOWN;
-use crate::util::docker::CONTAINER_TOOL;
-use crate::util::{display_none, Invoke};
+use crate::util::Invoke;
 use crate::PLATFORM;
 
 #[derive(Debug, Clone)]
@@ -44,28 +41,6 @@ impl Shutdown {
                 tracing::error!("Error Stopping Journald: {}", e);
                 tracing::debug!("{:?}", e);
             }
-            if CONTAINER_TOOL == "docker" {
-                if let Err(e) = Command::new("systemctl")
-                    .arg("stop")
-                    .arg("docker")
-                    .invoke(crate::ErrorKind::Docker)
-                    .await
-                {
-                    tracing::error!("Error Stopping Docker: {}", e);
-                    tracing::debug!("{:?}", e);
-                }
-            } else if CONTAINER_TOOL == "podman" {
-                if let Err(e) = Command::new("podman")
-                    .arg("rm")
-                    .arg("-f")
-                    .arg("netdummy")
-                    .invoke(crate::ErrorKind::Docker)
-                    .await
-                {
-                    tracing::error!("Error Stopping Podman: {}", e);
-                    tracing::debug!("{:?}", e);
-                }
-            }
             if let Some((guid, datadir)) = &self.export_args {
                 if let Err(e) = export(guid, datadir).await {
                     tracing::error!("Error Exporting Volume Group: {}", e);
@@ -100,8 +75,7 @@ impl Shutdown {
     }
 }
 
-#[command(display(display_none))]
-pub async fn shutdown(#[context] ctx: RpcContext) -> Result<(), Error> {
+pub async fn shutdown(ctx: RpcContext) -> Result<(), Error> {
     ctx.db
         .mutate(|db| {
             db.as_server_info_mut()
@@ -120,8 +94,7 @@ pub async fn shutdown(#[context] ctx: RpcContext) -> Result<(), Error> {
     Ok(())
 }
 
-#[command(display(display_none))]
-pub async fn restart(#[context] ctx: RpcContext) -> Result<(), Error> {
+pub async fn restart(ctx: RpcContext) -> Result<(), Error> {
     ctx.db
         .mutate(|db| {
             db.as_server_info_mut()
@@ -140,8 +113,7 @@ pub async fn restart(#[context] ctx: RpcContext) -> Result<(), Error> {
     Ok(())
 }
 
-#[command(display(display_none))]
-pub async fn rebuild(#[context] ctx: RpcContext) -> Result<(), Error> {
+pub async fn rebuild(ctx: RpcContext) -> Result<(), Error> {
     tokio::fs::write(SYSTEM_REBUILD_PATH, b"").await?;
     restart(ctx).await
 }
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index 697e05727..d762b63a0 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -1,25 +1,33 @@
 use std::path::Path;
 
 use chrono::Utc;
-use clap::ArgMatches;
+use clap::builder::ValueParserFactory;
+use clap::Parser;
 use color_eyre::eyre::eyre;
-use rpc_toolkit::command;
+use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use sqlx::{Pool, Postgres};
 use tracing::instrument;
 
-use crate::context::RpcContext;
-use crate::util::display_none;
-use crate::util::serde::{display_serializable, IoFormat};
+use crate::context::{CliContext, RpcContext};
+use crate::util::clap::FromStrParser;
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::{Error, ErrorKind};
 
 static SSH_AUTHORIZED_KEYS_FILE: &str = "/home/start9/.ssh/authorized_keys";
 
-#[derive(Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct PubKey(
     #[serde(serialize_with = "crate::util::serde::serialize_display")]
     #[serde(deserialize_with = "crate::util::serde::deserialize_from_str")]
     openssh_keys::PublicKey,
 );
+impl ValueParserFactory for PubKey {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
 
 #[derive(serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "kebab-case")]
@@ -50,14 +58,41 @@ impl std::str::FromStr for PubKey {
     }
 }
 
-#[command(subcommands(add, delete, list,))]
-pub fn ssh() -> Result<(), Error> {
-    Ok(())
+// #[command(subcommands(add, delete, list,))]
+pub fn ssh() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "add",
+            from_fn_async(add)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "delete",
+            from_fn_async(delete)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list)
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(display_all_ssh_keys(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct AddParams {
+    key: PubKey,
 }
 
-#[command(display(display_none))]
 #[instrument(skip_all)]
-pub async fn add(#[context] ctx: RpcContext, #[arg] key: PubKey) -> Result<SshKeyResponse, Error> {
+pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKeyResponse, Error> {
     let pool = &ctx.secret_store;
     // check fingerprint for duplicates
     let fp = key.0.fingerprint_md5();
@@ -90,9 +125,19 @@ pub async fn add(#[context] ctx: RpcContext, #[arg] key: PubKey) -> Result<SshKe
         Some(_) => Err(Error::new(eyre!("Duplicate ssh key"), ErrorKind::Duplicate)),
     }
 }
-#[command(display(display_none))]
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct DeleteParams {
+    fingerprint: String,
+}
+
 #[instrument(skip_all)]
-pub async fn delete(#[context] ctx: RpcContext, #[arg] fingerprint: String) -> Result<(), Error> {
+pub async fn delete(
+    ctx: RpcContext,
+    DeleteParams { fingerprint }: DeleteParams,
+) -> Result<(), Error> {
     let pool = &ctx.secret_store;
     // check if fingerprint is in DB
     // if in DB, remove it from DB
@@ -114,11 +159,11 @@ pub async fn delete(#[context] ctx: RpcContext, #[arg] fingerprint: String) -> R
     }
 }
 
-fn display_all_ssh_keys(all: Vec<SshKeyResponse>, matches: &ArgMatches) {
+fn display_all_ssh_keys(params: WithIoFormat<Empty>, result: Vec<SshKeyResponse>) {
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(all, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, params);
     }
 
     let mut table = Table::new();
@@ -128,7 +173,7 @@ fn display_all_ssh_keys(all: Vec<SshKeyResponse>, matches: &ArgMatches) {
         "FINGERPRINT",
         "HOSTNAME",
     ]);
-    for key in all {
+    for key in result {
         let row = row![
             &format!("{}", key.created_at),
             &key.alg,
@@ -140,14 +185,8 @@ fn display_all_ssh_keys(all: Vec<SshKeyResponse>, matches: &ArgMatches) {
     table.print_tty(false).unwrap();
 }
 
-#[command(display(display_all_ssh_keys))]
 #[instrument(skip_all)]
-pub async fn list(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<Vec<SshKeyResponse>, Error> {
+pub async fn list(ctx: RpcContext, _: Empty) -> Result<Vec<SshKeyResponse>, Error> {
     let pool = &ctx.secret_store;
     // list keys in DB and return them
     let entries = sqlx::query!("SELECT fingerprint, openssh_pubkey, created_at FROM ssh_keys")
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index 1b3e8f6b5..8189454c7 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -1,107 +1,5 @@
-use std::collections::{BTreeMap, BTreeSet};
-
-use chrono::{DateTime, Utc};
 pub use models::HealthCheckId;
-use models::ImageId;
 use serde::{Deserialize, Serialize};
-use tracing::instrument;
-
-use crate::context::RpcContext;
-use crate::procedure::{NoOutput, PackageProcedure, ProcedureName};
-use crate::s9pk::manifest::PackageId;
-use crate::util::serde::Duration;
-use crate::util::Version;
-use crate::volume::Volumes;
-use crate::{Error, ResultExt};
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct HealthChecks(pub BTreeMap<HealthCheckId, HealthCheck>);
-impl HealthChecks {
-    #[instrument(skip_all)]
-    pub fn validate(
-        &self,
-        eos_version: &Version,
-        volumes: &Volumes,
-        image_ids: &BTreeSet<ImageId>,
-    ) -> Result<(), Error> {
-        for check in self.0.values() {
-            check
-                .implementation
-                .validate(eos_version, volumes, image_ids, false)
-                .with_ctx(|_| {
-                    (
-                        crate::ErrorKind::ValidateS9pk,
-                        format!("Health Check {}", check.name),
-                    )
-                })?;
-        }
-        Ok(())
-    }
-    pub async fn check_all(
-        &self,
-        ctx: &RpcContext,
-        started: DateTime<Utc>,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-    ) -> Result<BTreeMap<HealthCheckId, HealthCheckResult>, Error> {
-        let res = futures::future::try_join_all(self.0.iter().map(|(id, check)| async move {
-            Ok::<_, Error>((
-                id.clone(),
-                check
-                    .check(ctx, id, started, pkg_id, pkg_version, volumes)
-                    .await?,
-            ))
-        }))
-        .await?;
-        Ok(res.into_iter().collect())
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct HealthCheck {
-    pub name: String,
-    pub success_message: Option<String>,
-    #[serde(flatten)]
-    implementation: PackageProcedure,
-    pub timeout: Option<Duration>,
-}
-impl HealthCheck {
-    #[instrument(skip_all)]
-    pub async fn check(
-        &self,
-        ctx: &RpcContext,
-        id: &HealthCheckId,
-        started: DateTime<Utc>,
-        pkg_id: &PackageId,
-        pkg_version: &Version,
-        volumes: &Volumes,
-    ) -> Result<HealthCheckResult, Error> {
-        let res = self
-            .implementation
-            .execute(
-                ctx,
-                pkg_id,
-                pkg_version,
-                ProcedureName::Health(id.clone()),
-                volumes,
-                Some(Utc::now().signed_duration_since(started).num_milliseconds()),
-                Some(
-                    self.timeout
-                        .map_or(std::time::Duration::from_secs(30), |d| *d),
-                ),
-            )
-            .await?;
-        Ok(match res {
-            Ok(NoOutput) => HealthCheckResult::Success,
-            Err((59, _)) => HealthCheckResult::Disabled,
-            Err((60, _)) => HealthCheckResult::Starting,
-            Err((61, message)) => HealthCheckResult::Loading { message },
-            Err((_, error)) => HealthCheckResult::Failure { error },
-        })
-    }
-}
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 2a5a9391f..ffc1a98bb 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 
 use chrono::{DateTime, Utc};
+use imbl::OrdMap;
 use models::PackageId;
 use serde::{Deserialize, Serialize};
 
@@ -34,15 +35,17 @@ impl Map for DependencyConfigErrors {
 pub enum MainStatus {
     Stopped,
     Restarting,
-    Stopping,
+    Stopping {
+        timeout: crate::util::serde::Duration,
+    },
     Starting,
     Running {
         started: DateTime<Utc>,
-        health: BTreeMap<HealthCheckId, HealthCheckResult>,
+        health: OrdMap<HealthCheckId, HealthCheckResult>,
     },
     BackingUp {
         started: Option<DateTime<Utc>>,
-        health: BTreeMap<HealthCheckId, HealthCheckResult>,
+        health: OrdMap<HealthCheckId, HealthCheckResult>,
     },
 }
 impl MainStatus {
@@ -54,29 +57,29 @@ impl MainStatus {
                 started: Some(_), ..
             } => true,
             MainStatus::Stopped
-            | MainStatus::Stopping
+            | MainStatus::Stopping { .. }
             | MainStatus::Restarting
             | MainStatus::BackingUp { started: None, .. } => false,
         }
     }
-    pub fn stop(&mut self) {
-        match self {
-            MainStatus::Starting { .. } | MainStatus::Running { .. } => {
-                *self = MainStatus::Stopping;
-            }
-            MainStatus::BackingUp { started, .. } => {
-                *started = None;
-            }
-            MainStatus::Stopped | MainStatus::Stopping | MainStatus::Restarting => (),
-        }
-    }
+    // pub fn stop(&mut self) {
+    //     match self {
+    //         MainStatus::Starting { .. } | MainStatus::Running { .. } => {
+    //             *self = MainStatus::Stopping;
+    //         }
+    //         MainStatus::BackingUp { started, .. } => {
+    //             *started = None;
+    //         }
+    //         MainStatus::Stopped | MainStatus::Stopping | MainStatus::Restarting => (),
+    //     }
+    // }
     pub fn started(&self) -> Option<DateTime<Utc>> {
         match self {
             MainStatus::Running { started, .. } => Some(*started),
             MainStatus::BackingUp { started, .. } => *started,
             MainStatus::Stopped => None,
             MainStatus::Restarting => None,
-            MainStatus::Stopping => None,
+            MainStatus::Stopping { .. } => None,
             MainStatus::Starting { .. } => None,
         }
     }
@@ -84,7 +87,7 @@ impl MainStatus {
         let (started, health) = match self {
             MainStatus::Starting { .. } => (Some(Utc::now()), Default::default()),
             MainStatus::Running { started, health } => (Some(started.clone()), health.clone()),
-            MainStatus::Stopped | MainStatus::Stopping | MainStatus::Restarting => {
+            MainStatus::Stopped | MainStatus::Stopping { .. } | MainStatus::Restarting => {
                 (None, Default::default())
             }
             MainStatus::BackingUp { .. } => return self.clone(),
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index b5cd42844..5a5509da7 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -2,11 +2,11 @@ use std::collections::BTreeSet;
 use std::fmt;
 
 use chrono::Utc;
-use clap::ArgMatches;
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::FutureExt;
-use rpc_toolkit::command;
 use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use tokio::process::Command;
 use tokio::sync::broadcast::Receiver;
@@ -22,13 +22,27 @@ use crate::logs::{
 use crate::prelude::*;
 use crate::shutdown::Shutdown;
 use crate::util::cpupower::{get_available_governors, set_governor, Governor};
-use crate::util::serde::{display_serializable, IoFormat};
-use crate::util::{display_none, Invoke};
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
+use crate::util::Invoke;
 use crate::{Error, ErrorKind, ResultExt};
 
-#[command(subcommands(zram, governor))]
-pub async fn experimental() -> Result<(), Error> {
-    Ok(())
+pub fn experimental() -> ParentHandler {
+    ParentHandler::new()
+        .subcommand(
+            "zram",
+            from_fn_async(zram)
+                .no_display()
+                .with_remote_cli::<CliContext>(),
+        )
+        .subcommand(
+            "governor",
+            from_fn_async(governor)
+                .with_display_serializable()
+                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                    Ok(display_governor_info(handle.params, result))
+                })
+                .with_remote_cli::<CliContext>(),
+        )
 }
 
 pub async fn enable_zram() -> Result<(), Error> {
@@ -59,8 +73,14 @@ pub async fn enable_zram() -> Result<(), Error> {
     Ok(())
 }
 
-#[command(display(display_none))]
-pub async fn zram(#[context] ctx: RpcContext, #[arg] enable: bool) -> Result<(), Error> {
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct ZramParams {
+    enable: bool,
+}
+
+pub async fn zram(ctx: RpcContext, ZramParams { enable }: ZramParams) -> Result<(), Error> {
     let db = ctx.db.peek().await;
 
     let zram = db.as_server_info().as_zram().de()?;
@@ -93,17 +113,17 @@ pub struct GovernorInfo {
     available: BTreeSet<Governor>,
 }
 
-fn display_governor_info(arg: GovernorInfo, matches: &ArgMatches) {
+fn display_governor_info(params: WithIoFormat<GovernorParams>, result: GovernorInfo) {
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(arg, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, params);
     }
 
     let mut table = Table::new();
     table.add_row(row![bc -> "GOVERNORS"]);
-    for entry in arg.available {
-        if Some(&entry) == arg.current.as_ref() {
+    for entry in result.available {
+        if Some(&entry) == result.current.as_ref() {
             table.add_row(row![g -> format!("* {entry} (current)")]);
         } else {
             table.add_row(row![entry]);
@@ -112,13 +132,16 @@ fn display_governor_info(arg: GovernorInfo, matches: &ArgMatches) {
     table.print_tty(false).unwrap();
 }
 
-#[command(display(display_governor_info))]
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct GovernorParams {
+    set: Option<Governor>,
+}
+
 pub async fn governor(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-    #[arg] set: Option<Governor>,
+    ctx: RpcContext,
+    GovernorParams { set, .. }: GovernorParams,
 ) -> Result<GovernorInfo, Error> {
     let available = get_available_governors().await?;
     if let Some(set) = set {
@@ -143,13 +166,13 @@ pub struct TimeInfo {
     uptime: u64,
 }
 
-fn display_time(arg: TimeInfo, matches: &ArgMatches) {
+pub fn display_time(params: WithIoFormat<Empty>, arg: TimeInfo) {
     use std::fmt::Write;
 
     use prettytable::*;
 
-    if matches.is_present("format") {
-        return display_serializable(arg, matches);
+    if let Some(format) = params.format {
+        return display_serializable(format, arg);
     }
 
     let days = arg.uptime / (24 * 60 * 60);
@@ -185,35 +208,57 @@ fn display_time(arg: TimeInfo, matches: &ArgMatches) {
     table.print_tty(false).unwrap();
 }
 
-#[command(display(display_time))]
-pub async fn time(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<TimeInfo, Error> {
+pub async fn time(ctx: RpcContext, _: Empty) -> Result<TimeInfo, Error> {
     Ok(TimeInfo {
         now: Utc::now().to_rfc3339(),
         uptime: ctx.start_time.elapsed().as_secs(),
     })
 }
-
-#[command(
-    custom_cli(cli_logs(async, context(CliContext))),
-    subcommands(self(logs_nofollow(async)), logs_follow),
-    display(display_none)
-)]
-pub async fn logs(
-    #[arg(short = 'l', long = "limit")] limit: Option<usize>,
-    #[arg(short = 'c', long = "cursor")] cursor: Option<String>,
-    #[arg(short = 'B', long = "before", default)] before: bool,
-    #[arg(short = 'f', long = "follow", default)] follow: bool,
-) -> Result<(Option<usize>, Option<String>, bool, bool), Error> {
-    Ok((limit, cursor, before, follow))
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct LogsParams {
+    #[arg(short = 'l', long = "limit")]
+    limit: Option<usize>,
+    #[arg(short = 'c', long = "cursor")]
+    cursor: Option<String>,
+    #[arg(short = 'B', long = "before")]
+    #[serde(default)]
+    before: bool,
+    #[arg(short = 'f', long = "follow")]
+    #[serde(default)]
+    follow: bool,
+}
+
+pub fn logs() -> ParentHandler<LogsParams> {
+    ParentHandler::new()
+        .root_handler(
+            from_fn_async(cli_logs)
+                .no_display()
+                .with_inherited(|params, _| params),
+        )
+        .root_handler(
+            from_fn_async(logs_nofollow)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
+        .subcommand(
+            "follow",
+            from_fn_async(logs_follow)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
 }
+
 pub async fn cli_logs(
     ctx: CliContext,
-    (limit, cursor, before, follow): (Option<usize>, Option<String>, bool, bool),
+    _: Empty,
+    LogsParams {
+        limit,
+        cursor,
+        before,
+        follow,
+    }: LogsParams,
 ) -> Result<(), RpcError> {
     if follow {
         if cursor.is_some() {
@@ -234,37 +279,68 @@ pub async fn cli_logs(
     }
 }
 pub async fn logs_nofollow(
-    _ctx: (),
-    (limit, cursor, before, _): (Option<usize>, Option<String>, bool, bool),
+    _ctx: AnyContext,
+    _: Empty,
+    LogsParams {
+        limit,
+        cursor,
+        before,
+        ..
+    }: LogsParams,
 ) -> Result<LogResponse, Error> {
     fetch_logs(LogSource::System, limit, cursor, before).await
 }
 
-#[command(rpc_only, rename = "follow", display(display_none))]
 pub async fn logs_follow(
-    #[context] ctx: RpcContext,
-    #[parent_data] (limit, _, _, _): (Option<usize>, Option<String>, bool, bool),
+    ctx: RpcContext,
+    _: Empty,
+    LogsParams { limit, .. }: LogsParams,
 ) -> Result<LogFollowResponse, Error> {
     follow_logs(ctx, LogSource::System, limit).await
 }
-
-#[command(
-    rename = "kernel-logs",
-    custom_cli(cli_kernel_logs(async, context(CliContext))),
-    subcommands(self(kernel_logs_nofollow(async)), kernel_logs_follow),
-    display(display_none)
-)]
-pub async fn kernel_logs(
-    #[arg(short = 'l', long = "limit")] limit: Option<usize>,
-    #[arg(short = 'c', long = "cursor")] cursor: Option<String>,
-    #[arg(short = 'B', long = "before", default)] before: bool,
-    #[arg(short = 'f', long = "follow", default)] follow: bool,
-) -> Result<(Option<usize>, Option<String>, bool, bool), Error> {
-    Ok((limit, cursor, before, follow))
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct KernelLogsParams {
+    #[arg(short = 'l', long = "limit")]
+    limit: Option<usize>,
+    #[arg(short = 'c', long = "cursor")]
+    cursor: Option<String>,
+    #[arg(short = 'B', long = "before")]
+    #[serde(default)]
+    before: bool,
+    #[arg(short = 'f', long = "follow")]
+    #[serde(default)]
+    follow: bool,
+}
+pub fn kernel_logs() -> ParentHandler<KernelLogsParams> {
+    ParentHandler::new()
+        .root_handler(
+            from_fn_async(cli_kernel_logs)
+                .no_display()
+                .with_inherited(|params, _| params),
+        )
+        .root_handler(
+            from_fn_async(kernel_logs_nofollow)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
+        .subcommand(
+            "follow",
+            from_fn_async(kernel_logs_follow)
+                .with_inherited(|params, _| params)
+                .no_cli(),
+        )
 }
 pub async fn cli_kernel_logs(
     ctx: CliContext,
-    (limit, cursor, before, follow): (Option<usize>, Option<String>, bool, bool),
+    _: Empty,
+    KernelLogsParams {
+        limit,
+        cursor,
+        before,
+        follow,
+    }: KernelLogsParams,
 ) -> Result<(), RpcError> {
     if follow {
         if cursor.is_some() {
@@ -285,16 +361,22 @@ pub async fn cli_kernel_logs(
     }
 }
 pub async fn kernel_logs_nofollow(
-    _ctx: (),
-    (limit, cursor, before, _): (Option<usize>, Option<String>, bool, bool),
+    _ctx: AnyContext,
+    _: Empty,
+    KernelLogsParams {
+        limit,
+        cursor,
+        before,
+        ..
+    }: KernelLogsParams,
 ) -> Result<LogResponse, Error> {
     fetch_logs(LogSource::Kernel, limit, cursor, before).await
 }
 
-#[command(rpc_only, rename = "follow", display(display_none))]
 pub async fn kernel_logs_follow(
-    #[context] ctx: RpcContext,
-    #[parent_data] (limit, _, _, _): (Option<usize>, Option<String>, bool, bool),
+    ctx: RpcContext,
+    _: Empty,
+    KernelLogsParams { limit, .. }: KernelLogsParams,
 ) -> Result<LogFollowResponse, Error> {
     follow_logs(ctx, LogSource::Kernel, limit).await
 }
@@ -453,13 +535,8 @@ pub struct Metrics {
     disk: MetricsDisk,
 }
 
-#[command(display(display_serializable))]
-pub async fn metrics(
-    #[context] ctx: RpcContext,
-    #[allow(unused_variables)]
-    #[arg(long = "format")]
-    format: Option<IoFormat>,
-) -> Result<Metrics, Error> {
+// #[command(display(display_serializable))]
+pub async fn metrics(ctx: RpcContext, _: Empty) -> Result<Metrics, Error> {
     match ctx.metrics_cache.read().await.clone() {
         None => Err(Error {
             source: color_eyre::eyre::eyre!("No Metrics Found"),
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index 4ce57a8d1..a1d9a8363 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -1,13 +1,14 @@
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
 
-use clap::ArgMatches;
+use clap::Parser;
 use color_eyre::eyre::{eyre, Result};
 use emver::Version;
 use helpers::{Rsync, RsyncOptions};
 use lazy_static::lazy_static;
 use reqwest::Url;
 use rpc_toolkit::command;
+use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use tokio_stream::StreamExt;
 use tracing::instrument;
@@ -33,17 +34,19 @@ lazy_static! {
     static ref UPDATED: AtomicBool = AtomicBool::new(false);
 }
 
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct UpdateSystemParams {
+    marketplace_url: Url,
+}
+
 /// An user/ daemon would call this to update the system to the latest version and do the updates available,
 /// and this will return something if there is an update, and in that case there will need to be a restart.
-#[command(
-    rename = "update",
-    display(display_update_result),
-    metadata(sync_db = true)
-)]
 #[instrument(skip_all)]
 pub async fn update_system(
-    #[context] ctx: RpcContext,
-    #[arg(rename = "marketplace-url")] marketplace_url: Url,
+    ctx: RpcContext,
+    UpdateSystemParams { marketplace_url }: UpdateSystemParams,
 ) -> Result<UpdateResult, Error> {
     if UPDATED.load(Ordering::SeqCst) {
         return Ok(UpdateResult::NoUpdates);
@@ -63,7 +66,7 @@ pub enum UpdateResult {
     Updating,
 }
 
-fn display_update_result(status: UpdateResult, _: &ArgMatches) {
+pub fn display_update_result(params: UpdateSystemParams, status: UpdateResult) {
     match status {
         UpdateResult::Updating => {
             println!("Updating...");
diff --git a/core/startos/src/upload.rs b/core/startos/src/upload.rs
new file mode 100644
index 000000000..91651df51
--- /dev/null
+++ b/core/startos/src/upload.rs
@@ -0,0 +1,272 @@
+use std::path::PathBuf;
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::Poll;
+use std::time::Duration;
+
+use axum::body::Body;
+use axum::response::Response;
+use clap::Parser;
+use futures::{FutureExt, StreamExt};
+use http::header::CONTENT_LENGTH;
+use http::StatusCode;
+use tokio::fs::File;
+use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
+use tokio::sync::{watch, OwnedMutexGuard};
+
+use crate::context::RpcContext;
+use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::{FileSectionReader, MultiCursorFile};
+use crate::s9pk::merkle_archive::source::ArchiveSource;
+use crate::util::io::TmpDir;
+
+pub async fn upload(ctx: &RpcContext) -> Result<(RequestGuid, UploadingFile), Error> {
+    let guid = RequestGuid::new();
+    let (mut handle, file) = UploadingFile::new().await?;
+    ctx.add_continuation(
+        guid.clone(),
+        RpcContinuation::rest(
+            Box::new(|request| {
+                async move {
+                    let headers = request.headers();
+                    let content_length = match headers.get(CONTENT_LENGTH).map(|a| a.to_str()) {
+                        None => {
+                            return Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from("Content-Length is required"))
+                                .with_kind(ErrorKind::Network)
+                        }
+                        Some(Err(_)) => {
+                            return Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from("Invalid Content-Length"))
+                                .with_kind(ErrorKind::Network)
+                        }
+                        Some(Ok(a)) => match a.parse::<u64>() {
+                            Err(_) => {
+                                return Response::builder()
+                                    .status(StatusCode::BAD_REQUEST)
+                                    .body(Body::from("Invalid Content-Length"))
+                                    .with_kind(ErrorKind::Network)
+                            }
+                            Ok(a) => a,
+                        },
+                    };
+
+                    handle
+                        .progress
+                        .send_modify(|p| p.expected_size = Some(content_length));
+
+                    let mut body = request.into_body().into_data_stream();
+                    while let Some(next) = body.next().await {
+                        if let Err(e) = async {
+                            handle
+                                .write_all(&next.map_err(|e| {
+                                    std::io::Error::new(std::io::ErrorKind::Other, e)
+                                })?)
+                                .await?;
+                            Ok(())
+                        }
+                        .await
+                        {
+                            handle.progress.send_if_modified(|p| p.handle_error(&e));
+                            break;
+                        }
+                    }
+
+                    Response::builder()
+                        .status(StatusCode::NO_CONTENT)
+                        .body(Body::empty())
+                        .with_kind(ErrorKind::Network)
+                }
+                .boxed()
+            }),
+            Duration::from_secs(30),
+        ),
+    )
+    .await;
+    Ok((guid, file))
+}
+
+#[derive(Default)]
+struct Progress {
+    expected_size: Option<u64>,
+    written: u64,
+    error: Option<Error>,
+}
+impl Progress {
+    fn handle_error(&mut self, e: &std::io::Error) -> bool {
+        if self.error.is_none() {
+            self.error = Some(Error::new(eyre!("{e}"), ErrorKind::Network));
+            true
+        } else {
+            false
+        }
+    }
+    fn handle_write(&mut self, res: &std::io::Result<usize>) -> bool {
+        match res {
+            Ok(a) => {
+                self.written += *a as u64;
+                true
+            }
+            Err(e) => self.handle_error(e),
+        }
+    }
+    async fn expected_size(watch: &mut watch::Receiver<Self>) -> Option<u64> {
+        watch
+            .wait_for(|progress| progress.error.is_some() || progress.expected_size.is_some())
+            .await
+            .ok()
+            .and_then(|a| a.expected_size)
+    }
+    async fn ready_for(watch: &mut watch::Receiver<Self>, size: u64) -> Result<(), Error> {
+        if let Some(e) = watch
+            .wait_for(|progress| progress.error.is_some() || progress.written >= size)
+            .await
+            .map_err(|_| {
+                Error::new(
+                    eyre!("failed to determine upload progress"),
+                    ErrorKind::Network,
+                )
+            })?
+            .error
+            .as_ref()
+            .map(|e| e.clone_output())
+        {
+            Err(e)
+        } else {
+            Ok(())
+        }
+    }
+    fn complete(&mut self) -> bool {
+        match self {
+            Self {
+                expected_size: Some(size),
+                written,
+                ..
+            } if *written == *size => false,
+            Self {
+                expected_size: Some(size),
+                written,
+                error,
+            } if *written > *size && error.is_none() => {
+                *error = Some(Error::new(
+                    eyre!("Too many bytes received"),
+                    ErrorKind::Network,
+                ));
+                true
+            }
+            Self { error, .. } if error.is_none() => {
+                *error = Some(Error::new(
+                    eyre!("Connection closed or timed out before full file received"),
+                    ErrorKind::Network,
+                ));
+                true
+            }
+            _ => false,
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct UploadingFile {
+    tmp_dir: Arc<TmpDir>,
+    file: MultiCursorFile,
+    progress: watch::Receiver<Progress>,
+}
+impl UploadingFile {
+    pub async fn new() -> Result<(UploadHandle, Self), Error> {
+        let progress = watch::channel(Progress::default());
+        let tmp_dir = Arc::new(TmpDir::new().await?);
+        let file = File::create(tmp_dir.join("upload.tmp")).await?;
+        let uploading = Self {
+            tmp_dir,
+            file: MultiCursorFile::open(&file).await?,
+            progress: progress.1,
+        };
+        Ok((
+            UploadHandle {
+                file,
+                progress: progress.0,
+            },
+            uploading,
+        ))
+    }
+    pub async fn delete(self) -> Result<(), Error> {
+        if let Ok(tmp_dir) = Arc::try_unwrap(self.tmp_dir) {
+            tmp_dir.delete().await?;
+        }
+        Ok(())
+    }
+}
+#[async_trait::async_trait]
+impl ArchiveSource for UploadingFile {
+    type Reader = <MultiCursorFile as ArchiveSource>::Reader;
+    async fn size(&self) -> Option<u64> {
+        Progress::expected_size(&mut self.progress.clone()).await
+    }
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+        Progress::ready_for(&mut self.progress.clone(), position + size).await?;
+        self.file.fetch(position, size).await
+    }
+}
+
+#[pin_project::pin_project(PinnedDrop)]
+pub struct UploadHandle {
+    #[pin]
+    file: File,
+    progress: watch::Sender<Progress>,
+}
+#[pin_project::pinned_drop]
+impl PinnedDrop for UploadHandle {
+    fn drop(self: Pin<&mut Self>) {
+        let this = self.project();
+        this.progress.send_if_modified(|p| p.complete());
+    }
+}
+impl AsyncWrite for UploadHandle {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> Poll<Result<usize, std::io::Error>> {
+        let this = self.project();
+        match this.file.poll_write(cx, buf) {
+            Poll::Ready(res) => {
+                this.progress
+                    .send_if_modified(|progress| progress.handle_write(&res));
+                Poll::Ready(res)
+            }
+            Poll::Pending => Poll::Pending,
+        }
+    }
+    fn poll_flush(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        let this = self.project();
+        match this.file.poll_flush(cx) {
+            Poll::Ready(Err(e)) => {
+                this.progress
+                    .send_if_modified(|progress| progress.handle_error(&e));
+                Poll::Ready(Err(e))
+            }
+            a => a,
+        }
+    }
+    fn poll_shutdown(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        let this = self.project();
+        match this.file.poll_shutdown(cx) {
+            Poll::Ready(Err(e)) => {
+                this.progress
+                    .send_if_modified(|progress| progress.handle_error(&e));
+                Poll::Ready(Err(e))
+            }
+            a => a,
+        }
+    }
+}
diff --git a/core/startos/src/util/actor.rs b/core/startos/src/util/actor.rs
new file mode 100644
index 000000000..89ee948e5
--- /dev/null
+++ b/core/startos/src/util/actor.rs
@@ -0,0 +1,192 @@
+use std::any::Any;
+use std::future::ready;
+use std::time::Duration;
+
+use futures::future::BoxFuture;
+use futures::{Future, FutureExt, TryFutureExt};
+use helpers::NonDetachingJoinHandle;
+use tokio::sync::oneshot::error::TryRecvError;
+use tokio::sync::{mpsc, oneshot};
+
+use crate::prelude::*;
+use crate::util::Never;
+
+pub trait Actor: Send + 'static {
+    #[allow(unused_variables)]
+    fn init(&mut self, jobs: &mut BackgroundJobs) {}
+}
+
+#[async_trait::async_trait]
+pub trait Handler<M>: Actor {
+    type Response: Any + Send;
+    async fn handle(&mut self, msg: M, jobs: &mut BackgroundJobs) -> Self::Response;
+}
+
+#[async_trait::async_trait]
+trait Message<A>: Send {
+    async fn handle_with(
+        self: Box<Self>,
+        actor: &mut A,
+        jobs: &mut BackgroundJobs,
+    ) -> Box<dyn Any + Send>;
+}
+#[async_trait::async_trait]
+impl<M: Send, A: Actor> Message<A> for M
+where
+    A: Handler<M>,
+{
+    async fn handle_with(
+        self: Box<Self>,
+        actor: &mut A,
+        jobs: &mut BackgroundJobs,
+    ) -> Box<dyn Any + Send> {
+        Box::new(actor.handle(*self, jobs).await)
+    }
+}
+
+type Request<A> = (Box<dyn Message<A>>, oneshot::Sender<Box<dyn Any + Send>>);
+
+#[derive(Default)]
+pub struct BackgroundJobs {
+    jobs: Vec<BoxFuture<'static, ()>>,
+}
+impl BackgroundJobs {
+    pub fn add_job(&mut self, fut: impl Future<Output = ()> + Send + 'static) {
+        self.jobs.push(fut.boxed());
+    }
+}
+impl Future for BackgroundJobs {
+    type Output = Never;
+    fn poll(
+        mut self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Self::Output> {
+        let complete = self
+            .jobs
+            .iter_mut()
+            .enumerate()
+            .filter_map(|(i, f)| match f.poll_unpin(cx) {
+                std::task::Poll::Pending => None,
+                std::task::Poll::Ready(_) => Some(i),
+            })
+            .collect::<Vec<_>>();
+        for idx in complete.into_iter().rev() {
+            #[allow(clippy::let_underscore_future)]
+            let _ = self.jobs.swap_remove(idx);
+        }
+        std::task::Poll::Pending
+    }
+}
+
+pub struct SimpleActor<A: Actor> {
+    shutdown: oneshot::Sender<()>,
+    runtime: NonDetachingJoinHandle<()>,
+    messenger: mpsc::UnboundedSender<Request<A>>,
+}
+impl<A: Actor> SimpleActor<A> {
+    pub fn new(mut actor: A) -> Self {
+        let (shutdown_send, mut shutdown_recv) = oneshot::channel();
+        let (messenger_send, mut messenger_recv) = mpsc::unbounded_channel::<Request<A>>();
+        let runtime = NonDetachingJoinHandle::from(tokio::spawn(async move {
+            let mut bg = BackgroundJobs::default();
+            actor.init(&mut bg);
+            loop {
+                tokio::select! {
+                    _ = &mut bg => (),
+                    msg = messenger_recv.recv() => match msg {
+                        Some((msg, reply)) if shutdown_recv.try_recv() == Err(TryRecvError::Empty) => {
+                            let mut new_bg = BackgroundJobs::default();
+                            tokio::select! {
+                                res = msg.handle_with(&mut actor, &mut new_bg) => { reply.send(res); },
+                                _ = &mut bg => (),
+                            }
+                            bg.jobs.append(&mut new_bg.jobs);
+                        }
+                        _ => break,
+                    },
+                }
+            }
+        }));
+        Self {
+            shutdown: shutdown_send,
+            runtime,
+            messenger: messenger_send,
+        }
+    }
+
+    /// Message is guaranteed to be queued immediately
+    pub fn queue<M: Send + 'static>(
+        &self,
+        message: M,
+    ) -> impl Future<Output = Result<A::Response, Error>>
+    where
+        A: Handler<M>,
+    {
+        if self.runtime.is_finished() {
+            return futures::future::Either::Left(ready(Err(Error::new(
+                eyre!("actor runtime has exited"),
+                ErrorKind::Unknown,
+            ))));
+        }
+        let (reply_send, reply_recv) = oneshot::channel();
+        self.messenger.send((Box::new(message), reply_send));
+        futures::future::Either::Right(
+            reply_recv
+                .map_err(|_| Error::new(eyre!("actor runtime has exited"), ErrorKind::Unknown))
+                .and_then(|a| {
+                    ready(
+                        a.downcast()
+                            .map_err(|_| {
+                                Error::new(
+                                    eyre!("received incorrect type in response"),
+                                    ErrorKind::Incoherent,
+                                )
+                            })
+                            .map(|a| *a),
+                    )
+                }),
+        )
+    }
+
+    pub async fn send<M: Send + 'static>(&self, message: M) -> Result<A::Response, Error>
+    where
+        A: Handler<M>,
+    {
+        self.queue(message).await
+    }
+
+    pub async fn shutdown(self, strategy: PendingMessageStrategy) {
+        drop(self.messenger);
+        let timeout = match strategy {
+            PendingMessageStrategy::CancelAll => {
+                self.shutdown.send(());
+                Some(Duration::from_secs(0))
+            }
+            PendingMessageStrategy::FinishCurrentCancelPending { timeout } => {
+                self.shutdown.send(());
+                timeout
+            }
+            PendingMessageStrategy::FinishAll { timeout } => timeout,
+        };
+        let aborter = if let Some(timeout) = timeout {
+            let hdl = self.runtime.abort_handle();
+            async move {
+                tokio::time::sleep(timeout).await;
+                hdl.abort();
+            }
+            .boxed()
+        } else {
+            futures::future::pending().boxed()
+        };
+        tokio::select! {
+            _ = aborter => (),
+            _ = self.runtime => (),
+        }
+    }
+}
+
+pub enum PendingMessageStrategy {
+    CancelAll,
+    FinishCurrentCancelPending { timeout: Option<Duration> },
+    FinishAll { timeout: Option<Duration> },
+}
diff --git a/core/startos/src/util/clap.rs b/core/startos/src/util/clap.rs
new file mode 100644
index 000000000..7c3b5a0bc
--- /dev/null
+++ b/core/startos/src/util/clap.rs
@@ -0,0 +1,36 @@
+use std::marker::PhantomData;
+use std::str::FromStr;
+
+use clap::builder::TypedValueParser;
+
+use crate::prelude::*;
+
+pub struct FromStrParser<T>(PhantomData<T>);
+impl<T> FromStrParser<T> {
+    pub fn new() -> Self {
+        Self(PhantomData)
+    }
+}
+impl<T> Clone for FromStrParser<T> {
+    fn clone(&self) -> Self {
+        Self(PhantomData)
+    }
+}
+impl<T> TypedValueParser for FromStrParser<T>
+where
+    T: FromStr + Clone + Send + Sync + 'static,
+    T::Err: std::fmt::Display,
+{
+    type Value = T;
+    fn parse_ref(
+        &self,
+        _: &clap::Command,
+        _: Option<&clap::Arg>,
+        value: &std::ffi::OsStr,
+    ) -> Result<Self::Value, clap::Error> {
+        value
+            .to_string_lossy()
+            .parse()
+            .map_err(|e| clap::Error::raw(clap::error::ErrorKind::ValueValidation, e))
+    }
+}
diff --git a/core/startos/src/util/config.rs b/core/startos/src/util/config.rs
deleted file mode 100644
index f719f563f..000000000
--- a/core/startos/src/util/config.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use std::fs::File;
-use std::path::{Path, PathBuf};
-
-use patch_db::Value;
-use serde::Deserialize;
-
-use crate::prelude::*;
-use crate::util::serde::IoFormat;
-use crate::{Config, Error};
-
-pub const DEVICE_CONFIG_PATH: &str = "/media/embassy/config/config.yaml";
-pub const CONFIG_PATH: &str = "/etc/embassy/config.yaml";
-pub const CONFIG_PATH_LOCAL: &str = ".embassy/config.yaml";
-
-pub fn local_config_path() -> Option<PathBuf> {
-    if let Ok(home) = std::env::var("HOME") {
-        Some(Path::new(&home).join(CONFIG_PATH_LOCAL))
-    } else {
-        None
-    }
-}
-
-/// BLOCKING
-pub fn load_config_from_paths<'a, T: for<'de> Deserialize<'de>>(
-    paths: impl IntoIterator<Item = impl AsRef<Path>>,
-) -> Result<T, Error> {
-    let mut config = Default::default();
-    for path in paths {
-        if path.as_ref().exists() {
-            let format: IoFormat = path
-                .as_ref()
-                .extension()
-                .and_then(|s| s.to_str())
-                .map(|f| f.parse())
-                .transpose()?
-                .unwrap_or_default();
-            let new = format.from_reader(File::open(path)?)?;
-            config = merge_configs(config, new);
-        }
-    }
-    from_value(Value::Object(config))
-}
-
-pub fn merge_configs(mut first: Config, second: Config) -> Config {
-    for (k, v) in second.into_iter() {
-        let new = match first.remove(&k) {
-            None => v,
-            Some(old) => match (old, v) {
-                (Value::Object(first), Value::Object(second)) => {
-                    Value::Object(merge_configs(first, second))
-                }
-                (first, _) => first,
-            },
-        };
-        first.insert(k, new);
-    }
-    first
-}
diff --git a/core/startos/src/util/crypto.rs b/core/startos/src/util/crypto.rs
index 5c1aed01e..aaafe6536 100644
--- a/core/startos/src/util/crypto.rs
+++ b/core/startos/src/util/crypto.rs
@@ -7,3 +7,119 @@ pub fn ed25519_expand_key(key: &SecretKey) -> [u8; EXPANDED_SECRET_KEY_LENGTH] {
     )
     .to_bytes()
 }
+
+use aes::cipher::{CipherKey, NewCipher, Nonce, StreamCipher};
+use aes::Aes256Ctr;
+use hmac::Hmac;
+use josekit::jwk::Jwk;
+use serde::{Deserialize, Serialize};
+use sha2::Sha256;
+use tracing::instrument;
+
+pub fn pbkdf2(password: impl AsRef<[u8]>, salt: impl AsRef<[u8]>) -> CipherKey<Aes256Ctr> {
+    let mut aeskey = CipherKey::<Aes256Ctr>::default();
+    pbkdf2::pbkdf2::<Hmac<Sha256>>(
+        password.as_ref(),
+        salt.as_ref(),
+        1000,
+        aeskey.as_mut_slice(),
+    )
+    .unwrap();
+    aeskey
+}
+
+pub fn encrypt_slice(input: impl AsRef<[u8]>, password: impl AsRef<[u8]>) -> Vec<u8> {
+    let prefix: [u8; 32] = rand::random();
+    let aeskey = pbkdf2(password.as_ref(), &prefix[16..]);
+    let ctr = Nonce::<Aes256Ctr>::from_slice(&prefix[..16]);
+    let mut aes = Aes256Ctr::new(&aeskey, ctr);
+    let mut res = Vec::with_capacity(32 + input.as_ref().len());
+    res.extend_from_slice(&prefix[..]);
+    res.extend_from_slice(input.as_ref());
+    aes.apply_keystream(&mut res[32..]);
+    res
+}
+
+pub fn decrypt_slice(input: impl AsRef<[u8]>, password: impl AsRef<[u8]>) -> Vec<u8> {
+    if input.as_ref().len() < 32 {
+        return Vec::new();
+    }
+    let (prefix, rest) = input.as_ref().split_at(32);
+    let aeskey = pbkdf2(password.as_ref(), &prefix[16..]);
+    let ctr = Nonce::<Aes256Ctr>::from_slice(&prefix[..16]);
+    let mut aes = Aes256Ctr::new(&aeskey, ctr);
+    let mut res = rest.to_vec();
+    aes.apply_keystream(&mut res);
+    res
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct EncryptedWire {
+    encrypted: serde_json::Value,
+}
+impl EncryptedWire {
+    #[instrument(skip_all)]
+    pub fn decrypt(self, current_secret: impl AsRef<Jwk>) -> Option<String> {
+        let current_secret = current_secret.as_ref();
+
+        let decrypter = match josekit::jwe::alg::ecdh_es::EcdhEsJweAlgorithm::EcdhEs
+            .decrypter_from_jwk(current_secret)
+        {
+            Ok(a) => a,
+            Err(e) => {
+                tracing::warn!("Could not setup awk");
+                tracing::debug!("{:?}", e);
+                return None;
+            }
+        };
+        let encrypted = match serde_json::to_string(&self.encrypted) {
+            Ok(a) => a,
+            Err(e) => {
+                tracing::warn!("Could not deserialize");
+                tracing::debug!("{:?}", e);
+
+                return None;
+            }
+        };
+        let (decoded, _) = match josekit::jwe::deserialize_json(&encrypted, &decrypter) {
+            Ok(a) => a,
+            Err(e) => {
+                tracing::warn!("Could not decrypt");
+                tracing::debug!("{:?}", e);
+                return None;
+            }
+        };
+        match String::from_utf8(decoded) {
+            Ok(a) => Some(a),
+            Err(e) => {
+                tracing::warn!("Could not decrypt into utf8");
+                tracing::debug!("{:?}", e);
+                return None;
+            }
+        }
+    }
+}
+
+/// We created this test by first making the private key, then restoring from this private key for recreatability.
+/// After this the frontend then encoded an password, then we are testing that the output that we got (hand coded)
+/// will be the shape we want.
+#[test]
+fn test_gen_awk() {
+    let private_key: Jwk = serde_json::from_str(
+        r#"{
+            "kty": "EC",
+            "crv": "P-256",
+            "d": "3P-MxbUJtEhdGGpBCRFXkUneGgdyz_DGZWfIAGSCHOU",
+            "x": "yHTDYSfjU809fkSv9MmN4wuojf5c3cnD7ZDN13n-jz4",
+            "y": "8Mpkn744A5KDag0DmX2YivB63srjbugYZzWc3JOpQXI"
+          }"#,
+    )
+    .unwrap();
+    let encrypted: EncryptedWire =  serde_json::from_str(r#"{
+        "encrypted":     {        "protected": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiRUNESC1FUyIsImtpZCI6ImgtZnNXUVh2Tm95dmJEazM5dUNsQ0NUdWc5N3MyZnJockJnWUVBUWVtclUiLCJlcGsiOnsia3R5IjoiRUMiLCJjcnYiOiJQLTI1NiIsIngiOiJmRkF0LXNWYWU2aGNkdWZJeUlmVVdUd3ZvWExaTkdKRHZIWVhIckxwOXNNIiwieSI6IjFvVFN6b00teHlFZC1SLUlBaUFHdXgzS1dJZmNYZHRMQ0JHLUh6MVkzY2sifX0",        "iv": "NbwvfvWOdLpZfYRIZUrkcw",        "ciphertext": "Zc5Br5kYOlhPkIjQKOLMJw",        "tag": "EPoch52lDuCsbUUulzZGfg"    }
+      }"#).unwrap();
+    assert_eq!(
+        "testing12345",
+        &encrypted.decrypt(std::sync::Arc::new(private_key)).unwrap()
+    );
+}
diff --git a/core/startos/src/util/docker.rs b/core/startos/src/util/docker.rs
deleted file mode 100644
index fb6bc15f4..000000000
--- a/core/startos/src/util/docker.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use std::net::Ipv4Addr;
-use std::time::Duration;
-
-use models::{Error, ErrorKind, PackageId, ResultExt, Version};
-use nix::sys::signal::Signal;
-use tokio::process::Command;
-
-use crate::util::Invoke;
-
-#[cfg(feature = "docker")]
-pub const CONTAINER_TOOL: &str = "docker";
-#[cfg(not(feature = "docker"))]
-pub const CONTAINER_TOOL: &str = "podman";
-
-#[cfg(feature = "docker")]
-pub const CONTAINER_DATADIR: &str = "/var/lib/docker";
-#[cfg(not(feature = "docker"))]
-pub const CONTAINER_DATADIR: &str = "/var/lib/containers";
-
-pub struct DockerImageSha(String);
-
-// docker images start9/${package}/*:${version} -q --no-trunc
-pub async fn images_for(
-    package: &PackageId,
-    version: &Version,
-) -> Result<Vec<DockerImageSha>, Error> {
-    Ok(String::from_utf8(
-        Command::new(CONTAINER_TOOL)
-            .arg("images")
-            .arg(format!("start9/{package}/*:{version}"))
-            .arg("--no-trunc")
-            .arg("-q")
-            .invoke(ErrorKind::Docker)
-            .await?,
-    )?
-    .lines()
-    .map(|l| DockerImageSha(l.trim().to_owned()))
-    .collect())
-}
-
-// docker rmi -f ${sha}
-pub async fn remove_image(sha: &DockerImageSha) -> Result<(), Error> {
-    match Command::new(CONTAINER_TOOL)
-        .arg("rmi")
-        .arg("-f")
-        .arg(&sha.0)
-        .invoke(ErrorKind::Docker)
-        .await
-        .map(|_| ())
-    {
-        Err(e)
-            if e.source
-                .to_string()
-                .to_ascii_lowercase()
-                .contains("no such image") =>
-        {
-            Ok(())
-        }
-        a => a,
-    }?;
-    Ok(())
-}
-
-// docker image prune -f
-pub async fn prune_images() -> Result<(), Error> {
-    Command::new(CONTAINER_TOOL)
-        .arg("image")
-        .arg("prune")
-        .arg("-f")
-        .invoke(ErrorKind::Docker)
-        .await?;
-    Ok(())
-}
-
-// docker container inspect ${name} --format '{{.NetworkSettings.Networks.start9.IPAddress}}'
-pub async fn get_container_ip(name: &str) -> Result<Option<Ipv4Addr>, Error> {
-    match Command::new(CONTAINER_TOOL)
-        .arg("container")
-        .arg("inspect")
-        .arg(name)
-        .arg("--format")
-        .arg("{{.NetworkSettings.Networks.start9.IPAddress}}")
-        .invoke(ErrorKind::Docker)
-        .await
-    {
-        Err(e)
-            if e.source
-                .to_string()
-                .to_ascii_lowercase()
-                .contains("no such container") =>
-        {
-            Ok(None)
-        }
-        Err(e) => Err(e),
-        Ok(a) => {
-            let out = std::str::from_utf8(&a)?.trim();
-            if out.is_empty() {
-                Ok(None)
-            } else {
-                Ok(Some({
-                    out.parse()
-                        .with_ctx(|_| (ErrorKind::ParseNetAddress, out.to_string()))?
-                }))
-            }
-        }
-    }
-}
-
-// docker stop -t ${timeout} -s ${signal} ${name}
-pub async fn stop_container(
-    name: &str,
-    timeout: Option<Duration>,
-    signal: Option<Signal>,
-) -> Result<(), Error> {
-    let mut cmd = Command::new(CONTAINER_TOOL);
-    cmd.arg("stop");
-    if let Some(dur) = timeout {
-        cmd.arg("-t").arg(dur.as_secs().to_string());
-    }
-    if let Some(sig) = signal {
-        cmd.arg("-s").arg(sig.to_string());
-    }
-    cmd.arg(name);
-    match cmd.invoke(ErrorKind::Docker).await {
-        Ok(_) => Ok(()),
-        Err(mut e)
-            if e.source
-                .to_string()
-                .to_ascii_lowercase()
-                .contains("no such container") =>
-        {
-            e.kind = ErrorKind::NotFound;
-            Err(e)
-        }
-        Err(e) => Err(e),
-    }
-}
-
-// docker kill -s ${signal} ${name}
-pub async fn kill_container(name: &str, signal: Option<Signal>) -> Result<(), Error> {
-    let mut cmd = Command::new(CONTAINER_TOOL);
-    cmd.arg("kill");
-    if let Some(sig) = signal {
-        cmd.arg("-s").arg(sig.to_string());
-    }
-    cmd.arg(name);
-    match cmd.invoke(ErrorKind::Docker).await {
-        Ok(_) => Ok(()),
-        Err(mut e)
-            if e.source
-                .to_string()
-                .to_ascii_lowercase()
-                .contains("no such container") =>
-        {
-            e.kind = ErrorKind::NotFound;
-            Err(e)
-        }
-        Err(e) => Err(e),
-    }
-}
-
-// docker pause ${name}
-pub async fn pause_container(name: &str) -> Result<(), Error> {
-    let mut cmd = Command::new(CONTAINER_TOOL);
-    cmd.arg("pause");
-    cmd.arg(name);
-    match cmd.invoke(ErrorKind::Docker).await {
-        Ok(_) => Ok(()),
-        Err(mut e)
-            if e.source
-                .to_string()
-                .to_ascii_lowercase()
-                .contains("no such container") =>
-        {
-            e.kind = ErrorKind::NotFound;
-            Err(e)
-        }
-        Err(e) => Err(e),
-    }
-}
-
-// docker unpause ${name}
-pub async fn unpause_container(name: &str) -> Result<(), Error> {
-    let mut cmd = Command::new(CONTAINER_TOOL);
-    cmd.arg("unpause");
-    cmd.arg(name);
-    match cmd.invoke(ErrorKind::Docker).await {
-        Ok(_) => Ok(()),
-        Err(mut e)
-            if e.source
-                .to_string()
-                .to_ascii_lowercase()
-                .contains("no such container") =>
-        {
-            e.kind = ErrorKind::NotFound;
-            Err(e)
-        }
-        Err(e) => Err(e),
-    }
-}
-
-// docker rm -f ${name}
-pub async fn remove_container(name: &str, force: bool) -> Result<(), Error> {
-    let mut cmd = Command::new(CONTAINER_TOOL);
-    cmd.arg("rm");
-    if force {
-        cmd.arg("-f");
-    }
-    cmd.arg(name);
-    match cmd.invoke(ErrorKind::Docker).await {
-        Ok(_) => Ok(()),
-        Err(e)
-            if e.source
-                .to_string()
-                .to_ascii_lowercase()
-                .contains("no such container") =>
-        {
-            Ok(())
-        }
-        Err(e) => Err(e),
-    }
-}
-
-// docker network create -d bridge --subnet ${subnet} --opt com.podman.network.bridge.name=${bridge_name}
-pub async fn create_bridge_network(
-    name: &str,
-    subnet: &str,
-    bridge_name: &str,
-) -> Result<(), Error> {
-    let mut cmd = Command::new(CONTAINER_TOOL);
-    cmd.arg("network").arg("create");
-    cmd.arg("-d").arg("bridge");
-    cmd.arg("--subnet").arg(subnet);
-    cmd.arg("--opt")
-        .arg(format!("com.docker.network.bridge.name={bridge_name}"));
-    cmd.arg(name);
-    cmd.invoke(ErrorKind::Docker).await?;
-    Ok(())
-}
diff --git a/core/startos/src/util/future.rs b/core/startos/src/util/future.rs
new file mode 100644
index 000000000..9f18ed613
--- /dev/null
+++ b/core/startos/src/util/future.rs
@@ -0,0 +1,119 @@
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+use futures::future::abortable;
+use futures::stream::{AbortHandle, Abortable};
+use futures::{Future, FutureExt};
+use tokio::sync::watch;
+
+#[pin_project::pin_project(PinnedDrop)]
+pub struct DropSignaling<F> {
+    #[pin]
+    fut: F,
+    on_drop: watch::Sender<bool>,
+}
+impl<F> DropSignaling<F> {
+    pub fn new(fut: F) -> Self {
+        Self {
+            fut,
+            on_drop: watch::channel(false).0,
+        }
+    }
+    pub fn subscribe(&self) -> DropHandle {
+        DropHandle(self.on_drop.subscribe())
+    }
+}
+impl<F> Future for DropSignaling<F>
+where
+    F: Future,
+{
+    type Output = F::Output;
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        this.fut.poll(cx)
+    }
+}
+#[pin_project::pinned_drop]
+impl<F> PinnedDrop for DropSignaling<F> {
+    fn drop(self: Pin<&mut Self>) {
+        let _ = self.on_drop.send(true);
+    }
+}
+
+#[derive(Clone)]
+pub struct DropHandle(watch::Receiver<bool>);
+impl DropHandle {
+    pub async fn wait(&mut self) {
+        self.0.wait_for(|a| *a).await;
+    }
+}
+
+#[pin_project::pin_project]
+pub struct RemoteCancellable<F> {
+    #[pin]
+    fut: Abortable<DropSignaling<F>>,
+    on_drop: DropHandle,
+    handle: AbortHandle,
+}
+impl<F: Future> RemoteCancellable<F> {
+    pub fn new(fut: F) -> Self {
+        let sig_fut = DropSignaling::new(fut);
+        let on_drop = sig_fut.subscribe();
+        let (fut, handle) = abortable(sig_fut);
+        Self {
+            fut,
+            on_drop,
+            handle,
+        }
+    }
+}
+impl<F> RemoteCancellable<F> {
+    pub fn cancellation_handle(&self) -> CancellationHandle {
+        CancellationHandle {
+            on_drop: self.on_drop.clone(),
+            handle: self.handle.clone(),
+        }
+    }
+}
+impl<F> Future for RemoteCancellable<F>
+where
+    F: Future,
+{
+    type Output = Option<F::Output>;
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        this.fut.poll(cx).map(|a| a.ok())
+    }
+}
+
+#[derive(Clone)]
+pub struct CancellationHandle {
+    on_drop: DropHandle,
+    handle: AbortHandle,
+}
+impl CancellationHandle {
+    pub fn cancel(&mut self) {
+        self.handle.abort();
+    }
+
+    pub async fn cancel_and_wait(&mut self) {
+        self.handle.abort();
+        self.on_drop.wait().await
+    }
+}
+
+#[tokio::test]
+async fn test_cancellable() {
+    use std::sync::Arc;
+
+    let arc = Arc::new(());
+    let weak = Arc::downgrade(&arc);
+    let cancellable = RemoteCancellable::new(async move {
+        futures::future::pending::<()>().await;
+        drop(arc)
+    });
+    let mut handle = cancellable.cancellation_handle();
+    tokio::spawn(cancellable);
+    handle.cancel_and_wait().await;
+    assert!(weak.strong_count() == 0);
+}
diff --git a/core/startos/src/util/http_reader.rs b/core/startos/src/util/http_reader.rs
index 87e8c114e..02a9f57ae 100644
--- a/core/startos/src/util/http_reader.rs
+++ b/core/startos/src/util/http_reader.rs
@@ -6,11 +6,11 @@ use std::io::Error as StdIOError;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
+use bytes::Bytes;
 use color_eyre::eyre::eyre;
 use futures::Stream;
-use http::header::{ACCEPT_RANGES, CONTENT_LENGTH, RANGE};
-use hyper::body::Bytes;
 use pin_project::pin_project;
+use reqwest::header::{ACCEPT_RANGES, CONTENT_LENGTH, RANGE};
 use reqwest::{Client, Url};
 use tokio::io::{AsyncRead, AsyncSeek};
 
@@ -359,22 +359,3 @@ async fn main_test() {
 
     assert_eq!(buf.len(), test_reader.total_bytes)
 }
-
-#[tokio::test]
-#[ignore]
-async fn s9pk_test() {
-    use tokio::io::BufReader;
-
-    let http_url = Url::parse("http://qhc6ac47cytstejcepk2ia3ipadzjhlkc5qsktsbl4e7u2krfmfuaqqd.onion/content/files/2022/09/ghost.s9pk").unwrap();
-
-    println!("Getting this resource: {}", http_url);
-    let test_reader =
-        BufReader::with_capacity(1024 * 1024, HttpReader::new(http_url).await.unwrap());
-
-    let mut s9pk = crate::s9pk::reader::S9pkReader::from_reader(test_reader, false)
-        .await
-        .unwrap();
-
-    let manifest = s9pk.manifest().await.unwrap();
-    assert_eq!(&manifest.id.to_string(), "ghost");
-}
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index 282a2db8e..f5a951142 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -1,7 +1,7 @@
 use std::future::Future;
 use std::io::Cursor;
 use std::os::unix::prelude::MetadataExt;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::sync::atomic::AtomicU64;
 use std::task::Poll;
 use std::time::Duration;
@@ -10,13 +10,14 @@ use futures::future::{BoxFuture, Fuse};
 use futures::{AsyncSeek, FutureExt, TryStreamExt};
 use helpers::NonDetachingJoinHandle;
 use nix::unistd::{Gid, Uid};
+use tokio::fs::File;
 use tokio::io::{
     duplex, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, DuplexStream, ReadBuf, WriteHalf,
 };
 use tokio::net::TcpStream;
 use tokio::time::{Instant, Sleep};
 
-use crate::ResultExt;
+use crate::prelude::*;
 
 pub trait AsyncReadSeek: AsyncRead + AsyncSeek {}
 impl<T: AsyncRead + AsyncSeek> AsyncReadSeek for T {}
@@ -669,3 +670,77 @@ impl<S: AsyncRead + AsyncWrite> AsyncWrite for TimeoutStream<S> {
         res
     }
 }
+
+pub struct TmpFile {}
+
+#[derive(Debug)]
+pub struct TmpDir {
+    path: PathBuf,
+}
+impl TmpDir {
+    pub async fn new() -> Result<Self, Error> {
+        let path = Path::new("/var/tmp/startos").join(base32::encode(
+            base32::Alphabet::RFC4648 { padding: false },
+            &rand::random::<[u8; 8]>(),
+        ));
+        if tokio::fs::metadata(&path).await.is_ok() {
+            return Err(Error::new(
+                eyre!("{path:?} already exists"),
+                ErrorKind::Filesystem,
+            ));
+        }
+        tokio::fs::create_dir_all(&path).await?;
+        Ok(Self { path })
+    }
+
+    pub async fn delete(self) -> Result<(), Error> {
+        tokio::fs::remove_dir_all(&self.path).await?;
+        Ok(())
+    }
+}
+impl std::ops::Deref for TmpDir {
+    type Target = Path;
+    fn deref(&self) -> &Self::Target {
+        &self.path
+    }
+}
+impl AsRef<Path> for TmpDir {
+    fn as_ref(&self) -> &Path {
+        &*self
+    }
+}
+impl Drop for TmpDir {
+    fn drop(&mut self) {
+        if self.path.exists() {
+            let path = std::mem::take(&mut self.path);
+            tokio::spawn(async move {
+                tokio::fs::remove_dir_all(&path).await.unwrap();
+            });
+        }
+    }
+}
+
+pub async fn create_file(path: impl AsRef<Path>) -> Result<File, Error> {
+    let path = path.as_ref();
+    if let Some(parent) = path.parent() {
+        tokio::fs::create_dir_all(parent)
+            .await
+            .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("mkdir -p {parent:?}")))?;
+    }
+    File::create(path)
+        .await
+        .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("create {path:?}")))
+}
+
+pub async fn rename(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> Result<(), Error> {
+    let src = src.as_ref();
+    let dst = dst.as_ref();
+    if let Some(parent) = dst.parent() {
+        tokio::fs::create_dir_all(parent)
+            .await
+            .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("mkdir -p {parent:?}")))?;
+    }
+    tokio::fs::rename(src, dst)
+        .await
+        .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("mv {src:?} -> {dst:?}")))
+}
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 34c05934b..772a64a32 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -9,11 +9,11 @@ use std::task::{Context, Poll};
 use std::time::Duration;
 
 use async_trait::async_trait;
-use clap::ArgMatches;
 use color_eyre::eyre::{self, eyre};
 use fd_lock_rs::FdLock;
 use helpers::canonicalize;
 pub use helpers::NonDetachingJoinHandle;
+use imbl_value::InternedString;
 use lazy_static::lazy_static;
 pub use models::Version;
 use pin_project::pin_project;
@@ -24,14 +24,16 @@ use tracing::instrument;
 
 use crate::shutdown::Shutdown;
 use crate::{Error, ErrorKind, ResultExt as _};
-pub mod config;
+pub mod actor;
+pub mod clap;
 pub mod cpupower;
 pub mod crypto;
-pub mod docker;
+pub mod future;
 pub mod http_reader;
 pub mod io;
 pub mod logger;
 pub mod lshw;
+pub mod rpc_client;
 pub mod serde;
 
 #[derive(Clone, Copy, Debug, ::serde::Deserialize, ::serde::Serialize)]
@@ -48,8 +50,12 @@ impl std::fmt::Display for Never {
     }
 }
 impl std::error::Error for Never {}
+impl<T: ?Sized> AsRef<T> for Never {
+    fn as_ref(&self) -> &T {
+        match *self {}
+    }
+}
 
-#[async_trait::async_trait]
 pub trait Invoke<'a> {
     type Extended<'ext>
     where
@@ -60,7 +66,10 @@ pub trait Invoke<'a> {
         &'ext mut self,
         input: Option<&'ext mut Input>,
     ) -> Self::Extended<'ext>;
-    async fn invoke(&mut self, error_kind: crate::ErrorKind) -> Result<Vec<u8>, Error>;
+    fn invoke(
+        &mut self,
+        error_kind: crate::ErrorKind,
+    ) -> impl Future<Output = Result<Vec<u8>, Error>> + Send;
 }
 
 pub struct ExtendedCommand<'a> {
@@ -80,7 +89,6 @@ impl<'a> std::ops::DerefMut for ExtendedCommand<'a> {
     }
 }
 
-#[async_trait::async_trait]
 impl<'a> Invoke<'a> for tokio::process::Command {
     type Extended<'ext> = ExtendedCommand<'ext>
     where
@@ -118,7 +126,6 @@ impl<'a> Invoke<'a> for tokio::process::Command {
     }
 }
 
-#[async_trait::async_trait]
 impl<'a> Invoke<'a> for ExtendedCommand<'a> {
     type Extended<'ext> = &'ext mut ExtendedCommand<'ext>
     where
@@ -146,7 +153,7 @@ impl<'a> Invoke<'a> for ExtendedCommand<'a> {
         }
         self.cmd.stdout(Stdio::piped());
         self.cmd.stderr(Stdio::piped());
-        let mut child = self.cmd.spawn()?;
+        let mut child = self.cmd.spawn().with_kind(error_kind)?;
         if let (Some(mut stdin), Some(input)) = (child.stdin.take(), self.input.take()) {
             use tokio::io::AsyncWriteExt;
             tokio::io::copy(input, &mut stdin).await?;
@@ -275,8 +282,6 @@ impl<W: std::fmt::Write> std::io::Write for FmtWriter<W> {
     }
 }
 
-pub fn display_none<T>(_: T, _: &ArgMatches) {}
-
 pub struct Container<T>(RwLock<Option<T>>);
 impl<T> Container<T> {
     pub fn new(value: Option<T>) -> Self {
@@ -490,3 +495,13 @@ impl<'a, T> From<&'a T> for MaybeOwned<'a, T> {
         MaybeOwned::Borrowed(value)
     }
 }
+
+pub fn new_guid() -> InternedString {
+    use rand::RngCore;
+    let mut buf = [0; 40];
+    rand::thread_rng().fill_bytes(&mut buf);
+    InternedString::intern(base32::encode(
+        base32::Alphabet::RFC4648 { padding: false },
+        &buf,
+    ))
+}
diff --git a/core/helpers/src/rpc_client.rs b/core/startos/src/util/rpc_client.rs
similarity index 69%
rename from core/helpers/src/rpc_client.rs
rename to core/startos/src/util/rpc_client.rs
index bdb505b40..36fe0031a 100644
--- a/core/helpers/src/rpc_client.rs
+++ b/core/startos/src/util/rpc_client.rs
@@ -5,17 +5,18 @@ use std::sync::{Arc, Weak};
 
 use futures::future::BoxFuture;
 use futures::{FutureExt, TryFutureExt};
+use helpers::NonDetachingJoinHandle;
 use lazy_async_pool::Pool;
 use models::{Error, ErrorKind, ResultExt};
+use rpc_toolkit::yajrc::{self, Id, RpcError, RpcMethod, RpcRequest, RpcResponse};
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tokio::io::{AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, BufReader};
 use tokio::net::UnixStream;
 use tokio::runtime::Handle;
-use tokio::sync::{oneshot, Mutex};
-use yajrc::{Id, RpcError, RpcMethod, RpcRequest, RpcResponse};
+use tokio::sync::{oneshot, Mutex, OnceCell};
 
-use crate::NonDetachingJoinHandle;
+use crate::util::io::TmpDir;
 
 type DynWrite = Box<dyn AsyncWrite + Unpin + Send + Sync + 'static>;
 type ResponseMap = BTreeMap<Id, oneshot::Sender<Result<Value, RpcError>>>;
@@ -24,7 +25,7 @@ const MAX_TRIES: u64 = 3;
 
 pub struct RpcClient {
     id: Arc<AtomicUsize>,
-    _handler: NonDetachingJoinHandle<()>,
+    handler: NonDetachingJoinHandle<()>,
     writer: DynWrite,
     responses: Weak<Mutex<ResponseMap>>,
 }
@@ -42,11 +43,11 @@ impl RpcClient {
         let weak_responses = Arc::downgrade(&responses);
         RpcClient {
             id,
-            _handler: tokio::spawn(async move {
+            handler: tokio::spawn(async move {
                 let mut lines = BufReader::new(reader).lines();
                 while let Some(line) = lines.next_line().await.transpose() {
                     match line.map_err(Error::from).and_then(|l| {
-                        serde_json::from_str::<RpcResponse>(&l)
+                        serde_json::from_str::<RpcResponse>(dbg!(&l))
                             .with_kind(ErrorKind::Deserialization)
                     }) {
                         Ok(l) => {
@@ -54,7 +55,7 @@ impl RpcClient {
                                 if let Some(res) = responses.lock().await.remove(&id) {
                                     if let Err(e) = res.send(l.result) {
                                         tracing::warn!(
-                                            "RpcClient Response for Unknown ID: {:?}",
+                                            "RpcClient Response after request aborted: {:?}",
                                             e
                                         );
                                     }
@@ -74,6 +75,14 @@ impl RpcClient {
                         }
                     }
                 }
+                for (_, res) in std::mem::take(&mut *responses.lock().await) {
+                    if let Err(e) = res.send(Err(RpcError {
+                        data: Some("client disconnected before response received".into()),
+                        ..yajrc::INTERNAL_ERROR
+                    })) {
+                        tracing::warn!("RpcClient Response after request aborted: {:?}", e);
+                    }
+                }
             })
             .into(),
             writer,
@@ -105,10 +114,10 @@ impl RpcClient {
             let (send, recv) = oneshot::channel();
             w.lock().await.insert(id.clone(), send);
             self.writer
-                .write_all((serde_json::to_string(&request)? + "\n").as_bytes())
+                .write_all((dbg!(serde_json::to_string(&request))? + "\n").as_bytes())
                 .await
                 .map_err(|e| {
-                    let mut err = yajrc::INTERNAL_ERROR.clone();
+                    let mut err = rpc_toolkit::yajrc::INTERNAL_ERROR.clone();
                     err.data = Some(json!(e.to_string()));
                     err
                 })?;
@@ -123,14 +132,15 @@ impl RpcClient {
         }
         tracing::debug!(
             "Client has finished {:?}",
-            futures::poll!(&mut self._handler)
+            futures::poll!(&mut self.handler)
         );
-        let mut err = yajrc::INTERNAL_ERROR.clone();
+        let mut err = rpc_toolkit::yajrc::INTERNAL_ERROR.clone();
         err.data = Some(json!("RpcClient thread has terminated"));
         Err(err)
     }
 }
 
+#[derive(Clone)]
 pub struct UnixRpcClient {
     pool: Pool<
         RpcClient,
@@ -141,18 +151,35 @@ pub struct UnixRpcClient {
 }
 impl UnixRpcClient {
     pub fn new(path: PathBuf) -> Self {
+        let tmpdir = Arc::new(OnceCell::new());
         let rt = Handle::current();
         let id = Arc::new(AtomicUsize::new(0));
         Self {
             pool: Pool::new(
                 0,
                 Box::new(move || {
-                    let path = path.clone();
+                    let mut path = path.clone();
                     let id = id.clone();
-                    rt.spawn(async move {
+                    let tmpdir = tmpdir.clone();
+                    NonDetachingJoinHandle::from(rt.spawn(async move {
+                        if path.as_os_str().len() >= 108
+                        // libc::sockaddr_un.sun_path.len()
+                        {
+                            let new_path = tmpdir
+                                .get_or_try_init(|| TmpDir::new())
+                                .await
+                                .map_err(|e| {
+                                    std::io::Error::new(std::io::ErrorKind::Other, e.source)
+                                })?
+                                .join("link.sock");
+                            if tokio::fs::metadata(&new_path).await.is_err() {
+                                tokio::fs::symlink(&path, &new_path).await?;
+                            }
+                            path = new_path;
+                        }
                         let (r, w) = UnixStream::connect(&path).await?.into_split();
                         Ok(RpcClient::new(w, r, id))
-                    })
+                    }))
                     .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
                     .and_then(|x| async move { x })
                     .boxed()
@@ -173,15 +200,23 @@ impl UnixRpcClient {
     {
         let mut tries = 0;
         let res = loop {
-            tries += 1;
             let mut client = self.pool.clone().get().await?;
+            if client.handler.is_finished() {
+                client.destroy();
+                continue;
+            }
             let res = client.request(method.clone(), params.clone()).await;
             match &res {
-                Err(e) if e.code == yajrc::INTERNAL_ERROR.code => {
+                Err(e) if e.code == rpc_toolkit::yajrc::INTERNAL_ERROR.code => {
+                    let mut e = Error::from(e.clone());
+                    e.kind = ErrorKind::Filesystem;
+                    tracing::error!("{e}");
+                    tracing::debug!("{e:?}");
                     client.destroy();
                 }
                 _ => break res,
             }
+            tries += 1;
             if tries > MAX_TRIES {
                 tracing::warn!("Max Tries exceeded");
                 break res;
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 4a6f7551b..d17d1ac9a 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -1,15 +1,21 @@
+use std::any::TypeId;
+use std::collections::VecDeque;
 use std::marker::PhantomData;
 use std::ops::Deref;
-use std::process::exit;
 use std::str::FromStr;
 
-use clap::ArgMatches;
+use clap::builder::ValueParserFactory;
+use clap::{ArgMatches, CommandFactory, FromArgMatches};
 use color_eyre::eyre::eyre;
+use imbl::OrdMap;
+use rpc_toolkit::{AnyContext, Handler, HandlerArgs, HandlerArgsFor, HandlerTypes, PrintCliResult};
+use serde::de::DeserializeOwned;
 use serde::ser::{SerializeMap, SerializeSeq};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
 
 use super::IntoDoubleEndedIterator;
+use crate::util::clap::FromStrParser;
 use crate::{Error, ResultExt};
 
 pub fn deserialize_from_str<
@@ -266,7 +272,7 @@ impl<'de> serde::de::Deserialize<'de> for ValuePrimative {
     }
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
 #[serde(rename_all = "kebab-case")]
 pub enum IoFormat {
     Json,
@@ -425,36 +431,207 @@ impl IoFormat {
     }
 }
 
-pub fn display_serializable<T: Serialize>(t: T, matches: &ArgMatches) {
-    let format = match matches.value_of("format").map(|f| f.parse()) {
-        Some(Ok(f)) => f,
-        Some(Err(_)) => {
-            eprintln!("unrecognized formatter");
-            exit(1)
-        }
-        None => IoFormat::default(),
-    };
+pub fn display_serializable<T: Serialize>(format: IoFormat, result: T) {
     format
-        .to_writer(std::io::stdout(), &t)
-        .expect("Error serializing result to stdout")
-}
-
-pub fn parse_stdin_deserializable<T: for<'de> Deserialize<'de>>(
-    stdin: &mut std::io::Stdin,
-    matches: &ArgMatches,
-) -> Result<T, Error> {
-    let format = match matches.value_of("format").map(|f| f.parse()) {
-        Some(Ok(f)) => f,
-        Some(Err(_)) => {
-            eprintln!("unrecognized formatter");
-            exit(1)
+        .to_writer(std::io::stdout(), &result)
+        .expect("Error serializing result to stdout");
+    if format == IoFormat::JsonPretty {
+        println!()
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct WithIoFormat<T> {
+    pub format: Option<IoFormat>,
+    #[serde(flatten)]
+    pub rest: T,
+}
+impl<T: FromArgMatches> FromArgMatches for WithIoFormat<T> {
+    fn from_arg_matches(matches: &ArgMatches) -> Result<Self, clap::Error> {
+        Ok(Self {
+            rest: T::from_arg_matches(matches)?,
+            format: matches.get_one("format").copied(),
+        })
+    }
+    fn update_from_arg_matches(&mut self, matches: &ArgMatches) -> Result<(), clap::Error> {
+        self.rest.update_from_arg_matches(matches)?;
+        self.format = matches.get_one("format").copied();
+        Ok(())
+    }
+}
+impl<T: CommandFactory> CommandFactory for WithIoFormat<T> {
+    fn command() -> clap::Command {
+        let cmd = T::command();
+        if !cmd.get_arguments().any(|a| a.get_id() == "format") {
+            cmd.arg(
+                clap::Arg::new("format")
+                    .long("format")
+                    .value_parser(|s: &str| s.parse::<IoFormat>().map_err(|e| eyre!("{e}"))),
+            )
+        } else {
+            cmd
         }
-        None => IoFormat::default(),
-    };
-    format.from_reader(stdin)
+    }
+    fn command_for_update() -> clap::Command {
+        let cmd = T::command_for_update();
+        if !cmd.get_arguments().any(|a| a.get_id() == "format") {
+            cmd.arg(
+                clap::Arg::new("format")
+                    .long("format")
+                    .value_parser(|s: &str| s.parse::<IoFormat>().map_err(|e| eyre!("{e}"))),
+            )
+        } else {
+            cmd
+        }
+    }
+}
+
+pub trait HandlerExtSerde: Handler {
+    fn with_display_serializable(self) -> DisplaySerializable<Self>;
+}
+impl<T: Handler> HandlerExtSerde for T {
+    fn with_display_serializable(self) -> DisplaySerializable<Self> {
+        DisplaySerializable(self)
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct DisplaySerializable<T>(pub T);
+impl<T: HandlerTypes> HandlerTypes for DisplaySerializable<T> {
+    type Params = WithIoFormat<T::Params>;
+    type InheritedParams = T::InheritedParams;
+    type Ok = T::Ok;
+    type Err = T::Err;
+}
+#[async_trait::async_trait]
+impl<T: Handler> Handler for DisplaySerializable<T> {
+    type Context = T::Context;
+    fn handle_sync(
+        &self,
+        HandlerArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params,
+            raw_params,
+        }: HandlerArgsFor<Self::Context, Self>,
+    ) -> Result<Self::Ok, Self::Err> {
+        self.0.handle_sync(HandlerArgs {
+            context,
+            parent_method,
+            method,
+            params: params.rest,
+            inherited_params,
+            raw_params,
+        })
+    }
+    async fn handle_async(
+        &self,
+        HandlerArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params,
+            raw_params,
+        }: HandlerArgsFor<Self::Context, Self>,
+    ) -> Result<Self::Ok, Self::Err> {
+        self.0
+            .handle_async(HandlerArgs {
+                context,
+                parent_method,
+                method,
+                params: params.rest,
+                inherited_params,
+                raw_params,
+            })
+            .await
+    }
+    fn contexts(&self) -> Option<imbl::OrdSet<std::any::TypeId>> {
+        self.0.contexts()
+    }
+    fn metadata(
+        &self,
+        method: VecDeque<&'static str>,
+        ctx_ty: TypeId,
+    ) -> OrdMap<&'static str, imbl_value::Value> {
+        self.0.metadata(method, ctx_ty)
+    }
+    fn method_from_dots(&self, method: &str, ctx_ty: TypeId) -> Option<VecDeque<&'static str>> {
+        self.0.method_from_dots(method, ctx_ty)
+    }
+}
+impl<T: HandlerTypes> PrintCliResult for DisplaySerializable<T>
+where
+    T::Ok: Serialize,
+{
+    type Context = AnyContext;
+    fn print(
+        &self,
+        HandlerArgs { params, .. }: HandlerArgsFor<Self::Context, Self>,
+        result: Self::Ok,
+    ) -> Result<(), Self::Err> {
+        display_serializable(params.format.unwrap_or_default(), result);
+        Ok(())
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct StdinDeserializable<T>(pub T);
+impl<T> FromArgMatches for StdinDeserializable<T>
+where
+    T: DeserializeOwned,
+{
+    fn from_arg_matches(matches: &ArgMatches) -> Result<Self, clap::Error> {
+        let format = matches
+            .get_one::<IoFormat>("format")
+            .copied()
+            .unwrap_or_default();
+        Ok(Self(format.from_reader(&mut std::io::stdin()).map_err(
+            |e| clap::Error::raw(clap::error::ErrorKind::ValueValidation, e),
+        )?))
+    }
+    fn update_from_arg_matches(&mut self, matches: &ArgMatches) -> Result<(), clap::Error> {
+        let format = matches
+            .get_one::<IoFormat>("format")
+            .copied()
+            .unwrap_or_default();
+        self.0 = format
+            .from_reader(&mut std::io::stdin())
+            .map_err(|e| clap::Error::raw(clap::error::ErrorKind::ValueValidation, e))?;
+        Ok(())
+    }
+}
+impl<T> clap::Args for StdinDeserializable<T>
+where
+    T: DeserializeOwned,
+{
+    fn augment_args(cmd: clap::Command) -> clap::Command {
+        if !cmd.get_arguments().any(|a| a.get_id() == "format") {
+            cmd.arg(
+                clap::Arg::new("format")
+                    .long("format")
+                    .value_parser(|s: &str| s.parse::<IoFormat>().map_err(|e| eyre!("{e}"))),
+            )
+        } else {
+            cmd
+        }
+    }
+    fn augment_args_for_update(cmd: clap::Command) -> clap::Command {
+        if !cmd.get_arguments().any(|a| a.get_id() == "format") {
+            cmd.arg(
+                clap::Arg::new("format")
+                    .long("format")
+                    .value_parser(|s: &str| s.parse::<IoFormat>().map_err(|e| eyre!("{e}"))),
+            )
+        } else {
+            cmd
+        }
+    }
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Duration(std::time::Duration);
 impl Deref for Duration {
     type Target = std::time::Duration;
@@ -518,6 +695,12 @@ impl std::str::FromStr for Duration {
         }))
     }
 }
+impl ValueParserFactory for Duration {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
 impl std::fmt::Display for Duration {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let nanos = self.as_nanos();
@@ -843,3 +1026,67 @@ impl Serialize for Regex {
         serialize_display(&self.0, serializer)
     }
 }
+
+// TODO: make this not allocate
+#[derive(Debug)]
+pub struct NoOutput;
+impl<'de> Deserialize<'de> for NoOutput {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let _ = Value::deserialize(deserializer);
+        Ok(NoOutput)
+    }
+}
+
+pub fn apply_expr(input: jaq_core::Val, expr: &str) -> Result<jaq_core::Val, Error> {
+    let (expr, errs) = jaq_core::parse::parse(expr, jaq_core::parse::main());
+
+    let Some(expr) = expr else {
+        return Err(Error::new(
+            eyre!("Failed to parse expression: {:?}", errs),
+            crate::ErrorKind::InvalidRequest,
+        ));
+    };
+
+    let mut errs = Vec::new();
+
+    let mut defs = jaq_core::Definitions::core();
+    for def in jaq_std::std() {
+        defs.insert(def, &mut errs);
+    }
+
+    let filter = defs.finish(expr, Vec::new(), &mut errs);
+
+    if !errs.is_empty() {
+        return Err(Error::new(
+            eyre!("Failed to compile expression: {:?}", errs),
+            crate::ErrorKind::InvalidRequest,
+        ));
+    };
+
+    let inputs = jaq_core::RcIter::new(std::iter::empty());
+    let mut res_iter = filter.run(jaq_core::Ctx::new([], &inputs), input);
+
+    let Some(res) = res_iter
+        .next()
+        .transpose()
+        .map_err(|e| eyre!("{e}"))
+        .with_kind(crate::ErrorKind::Deserialization)?
+    else {
+        return Err(Error::new(
+            eyre!("expr returned no results"),
+            crate::ErrorKind::InvalidRequest,
+        ));
+    };
+
+    if res_iter.next().is_some() {
+        return Err(Error::new(
+            eyre!("expr returned too many results"),
+            crate::ErrorKind::InvalidRequest,
+        ));
+    }
+
+    Ok(res)
+}
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 4c6f157a5..3e4f7c4a2 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 
 use async_trait::async_trait;
 use color_eyre::eyre::eyre;
-use rpc_toolkit::command;
+use imbl_value::InternedString;
 use sqlx::PgPool;
 
 use crate::prelude::*;
@@ -189,9 +189,8 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> {
 pub const COMMIT_HASH: &str =
     include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../GIT_HASH.txt"));
 
-#[command(rename = "git-info", local, metadata(authenticated = false))]
-pub fn git_info() -> Result<&'static str, Error> {
-    Ok(COMMIT_HASH)
+pub fn git_info() -> Result<InternedString, Error> {
+    Ok(InternedString::intern(COMMIT_HASH))
 }
 
 #[cfg(test)]
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index 1633b7d18..47d1ffc34 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -3,6 +3,7 @@ use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 
 pub use helpers::script_dir;
+use models::PackageId;
 pub use models::VolumeId;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
@@ -11,7 +12,6 @@ use crate::context::RpcContext;
 use crate::net::interface::{InterfaceId, Interfaces};
 use crate::net::PACKAGE_CERT_PATH;
 use crate::prelude::*;
-use crate::s9pk::manifest::PackageId;
 use crate::util::Version;
 use crate::{Error, ResultExt};
 
diff --git a/core/startos/startd.service b/core/startos/startd.service
index 894298e54..56cf92e22 100644
--- a/core/startos/startd.service
+++ b/core/startos/startd.service
@@ -1,8 +1,5 @@
 [Unit]
 Description=StartOS Daemon
-After=network-online.target
-Requires=network-online.target
-Wants=avahi-daemon.service
 
 [Service]
 Type=simple
diff --git a/debian/postinst b/debian/postinst
index 6a65a749d..731298af9 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -121,3 +121,9 @@ rm -f /etc/motd
 ln -sf /usr/lib/startos/motd /etc/update-motd.d/00-embassy
 chmod -x /etc/update-motd.d/*
 chmod +x /etc/update-motd.d/00-embassy
+
+# LXC
+echo "root:100000:65536" >>/etc/subuid
+echo "root:100000:65536" >>/etc/subgid
+echo "lxc.idmap = u 0 100000 65536" >>/etc/lxc/default.conf
+echo "lxc.idmap = g 0 100000 65536" >>/etc/lxc/default.conf
diff --git a/devmode.sh b/devmode.sh
new file mode 100755
index 000000000..19b0651de
--- /dev/null
+++ b/devmode.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export ENVIRONMENT=dev
+export GIT_BRANCH_AS_HASH=1
diff --git a/image-recipe/README.md b/image-recipe/README.md
index cbaf8944a..9eba04727 100644
--- a/image-recipe/README.md
+++ b/image-recipe/README.md
@@ -8,13 +8,9 @@ official StartOS images, you can use the `run-local-build.sh` helper script:
 
 ```bash
 # Prerequisites
-sudo apt-get install -y debspawn
+sudo apt-get install -y debspawn binfmt-support
 sudo mkdir -p /etc/debspawn/ && echo "AllowUnsafePermissions=true" | sudo tee /etc/debspawn/global.toml
 
-# Get dpkg
-mkdir -p overlays/startos/root
-wget -O overlays/startos/root/startos_0.3.x-1_amd64.deb <dpkg_url>
-
 # Build image
 ./run-local-build.sh
 ```
diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 836fc49ed..28aa574ae 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -18,10 +18,6 @@ echo "Saving results in: $RESULTS_DIR"
 
 IMAGE_BASENAME=startos-${VERSION_FULL}_${IB_TARGET_PLATFORM}
 
-mkdir -p $prep_results_dir
-
-cd $prep_results_dir
-
 QEMU_ARCH=${IB_TARGET_ARCH}
 BOOTLOADERS=grub-efi,syslinux
 if [ "$QEMU_ARCH" = 'amd64' ]; then
@@ -30,6 +26,19 @@ elif [ "$QEMU_ARCH" = 'arm64' ]; then
 	QEMU_ARCH=aarch64
 	BOOTLOADERS=grub-efi
 fi
+
+# TODO: remove when util-linux is released at v2.39
+cd $base_dir
+git clone --depth=1 --branch=v2.39.3 https://github.com/util-linux/util-linux.git
+cd util-linux
+./autogen.sh
+CC=$QEMU_ARCH-linux-gnu-gcc ./configure --host=$QEMU_ARCH-linux-gnu --disable-all-programs --enable-mount --enable-libmount --enable-libblkid --enable-libuuid --enable-static-programs
+CC=$QEMU_ARCH-linux-gnu-gcc make -j mount.static
+
+mkdir -p $prep_results_dir
+
+cd $prep_results_dir
+
 NON_FREE=
 if [[ "${IB_TARGET_PLATFORM}" =~ -nonfree$ ]] || [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 	NON_FREE=1
@@ -64,6 +73,7 @@ elif [ "${IB_TARGET_PLATFORM}" = "rockchip64" ]; then
 	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --linux-flavours rockchip64"
 fi
 
+
 cat > /etc/wgetrc << EOF
 retry_connrefused = on
 tries = 100
@@ -91,6 +101,9 @@ lb config \
 mkdir -p config/includes.chroot/deb
 cp $base_dir/deb/${IMAGE_BASENAME}.deb config/includes.chroot/deb/
 
+mkdir -p config/includes.chroot/usr/local/bin
+cp $base_dir/util-linux/mount.static config/includes.chroot/usr/local/bin/mount.next
+
 if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 	cp -r $base_dir/raspberrypi/squashfs/* config/includes.chroot/
 fi
@@ -139,13 +152,11 @@ if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 	echo "deb https://archive.raspberrypi.org/debian/ bullseye main" > config/archives/raspi.list
 fi
 
-if [ "${IB_SUITE}" = "bullseye" ]; then
-	cat > config/archives/backports.pref <<- EOF
-	Package: *
-	Pin: release a=bullseye-backports
-	Pin-Priority: 500
-	EOF
-fi
+cat > config/archives/backports.pref <<- EOF
+Package: *
+Pin: release a=stable-backports
+Pin-Priority: 500
+EOF
 
 if [ "${IB_TARGET_PLATFORM}" = "rockchip64" ]; then
 	curl -fsSL https://apt.armbian.com/armbian.key | gpg --dearmor -o config/archives/armbian.key
@@ -204,6 +215,10 @@ if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 		update-initramfs -c -k \$v
 	done
 	ln -sf /usr/bin/pi-beep /usr/local/bin/beep
+	wget https://archive.raspberrypi.org/debian/pool/main/w/wireless-regdb/wireless-regdb_2018.05.09-0~rpt1_all.deb
+	echo 1b7b1076257726609535b71d146a5721622d19a0843061ee7568188e836dd10f wireless-regdb_2018.05.09-0~rpt1_all.deb | sha256sum -c
+	apt-get install ./wireless-regdb_2018.05.09-0~rpt1_all.deb
+	rm wireless-regdb_2018.05.09-0~rpt1_all.deb
 fi
 
 useradd --shell /bin/bash -G embassy -m start9
diff --git a/image-recipe/prepare.sh b/image-recipe/prepare.sh
index 1c6779608..8962d8448 100755
--- a/image-recipe/prepare.sh
+++ b/image-recipe/prepare.sh
@@ -22,3 +22,16 @@ apt-get install -yq \
 	e2fsprogs \
 	squashfs-tools \
 	rsync
+# TODO: remove when util-linux is released at v2.39.3
+apt-get install -yq \
+	git \
+	build-essential \
+	crossbuild-essential-arm64 \
+	crossbuild-essential-amd64 \
+	automake \
+	autoconf \
+	gettext \
+	libtool \
+	pkg-config \
+	autopoint \
+	bison
\ No newline at end of file
diff --git a/patch-db b/patch-db
index 6af2221ad..7096f15e9 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 6af2221add56f0a557b37a268ef9fb2299a05255
+Subproject commit 7096f15e9b218f59b8ded1fd1133c70b82de74c5
diff --git a/sdk/.gitignore b/sdk/.gitignore
new file mode 100644
index 000000000..a7ca92b2d
--- /dev/null
+++ b/sdk/.gitignore
@@ -0,0 +1,5 @@
+.vscode
+dist/
+node_modules/
+lib/coverage
+lib/test/output.ts
\ No newline at end of file
diff --git a/sdk/LICENSE b/sdk/LICENSE
new file mode 100644
index 000000000..793257b96
--- /dev/null
+++ b/sdk/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Start9 Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/sdk/Makefile b/sdk/Makefile
new file mode 100644
index 000000000..8370650b8
--- /dev/null
+++ b/sdk/Makefile
@@ -0,0 +1,44 @@
+TS_FILES := $(shell find ./**/*.ts )
+version = $(shell git tag --sort=committerdate | tail -1)
+test: $(TS_FILES) lib/test/output.ts
+	npm test
+
+clean:
+	rm -rf dist/* | true
+	
+lib/test/output.ts: lib/test/makeOutput.ts scripts/oldSpecToBuilder.ts
+	npm run buildOutput
+
+buildOutput: lib/test/output.ts fmt
+	echo 'done'
+
+
+bundle: $(TS_FILES) package.json .FORCE node_modules test fmt
+	npx tsc
+	npx tsc --project tsconfig-cjs.json
+	cp package.json dist/package.json
+	cp README.md dist/README.md
+	cp LICENSE dist/LICENSE
+	touch dist
+
+full-bundle:
+	make clean
+	make bundle
+
+check:
+	npm run check
+
+fmt: node_modules
+	npx prettier --write "**/*.ts"
+
+node_modules: package.json
+	npm install
+
+publish: clean bundle	 package.json README.md LICENSE
+	cd dist && npm publish --access=public
+link: bundle	
+	cp package.json dist/package.json
+	cp README.md dist/README.md
+	cp LICENSE dist/LICENSE
+	cd dist && npm link
+.FORCE: 
diff --git a/sdk/README.md b/sdk/README.md
new file mode 100644
index 000000000..d51b25b58
--- /dev/null
+++ b/sdk/README.md
@@ -0,0 +1,18 @@
+# Start SDK
+
+## Config Conversion
+
+- Copy the old config json (from the getConfig.ts)
+- Install the start-sdk with `npm i`
+- paste the config into makeOutput.ts::oldSpecToBuilder (second param)
+- Make the third param
+
+```ts
+  {
+    StartSdk: "start-sdk/lib",
+  }
+```
+
+- run the script `npm run buildOutput` to make the output.ts
+- Copy this whole file into startos/procedures/config/spec.ts
+- Fix all the TODO
diff --git a/sdk/jest.config.js b/sdk/jest.config.js
new file mode 100644
index 000000000..c6aed8f3d
--- /dev/null
+++ b/sdk/jest.config.js
@@ -0,0 +1,8 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: "ts-jest",
+  automock: false,
+  testEnvironment: "node",
+  rootDir: "./lib/",
+  modulePathIgnorePatterns: ["./dist/"],
+};
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
new file mode 100644
index 000000000..85f157aa9
--- /dev/null
+++ b/sdk/lib/StartSdk.ts
@@ -0,0 +1,534 @@
+import { ManifestVersion, SDKManifest } from "./manifest/ManifestTypes"
+import { RequiredDefault, Value } from "./config/builder/value"
+import { Config, ExtractConfigType, LazyBuild } from "./config/builder/config"
+import {
+  DefaultString,
+  ListValueSpecText,
+  Pattern,
+  RandomString,
+  UniqueBy,
+  ValueSpecDatetime,
+  ValueSpecText,
+} from "./config/configTypes"
+import { Variants } from "./config/builder/variants"
+import { CreatedAction, createAction } from "./actions/createAction"
+import {
+  ActionMetadata,
+  Effects,
+  ActionResult,
+  BackupOptions,
+  DeepPartial,
+  MaybePromise,
+} from "./types"
+import * as patterns from "./util/patterns"
+import { Utils } from "./util/utils"
+import { DependencyConfig, Update } from "./dependencyConfig/DependencyConfig"
+import { BackupSet, Backups } from "./backup/Backups"
+import { smtpConfig } from "./config/configConstants"
+import { Daemons } from "./mainFn/Daemons"
+import { healthCheck } from "./health/HealthCheck"
+import { checkPortListening } from "./health/checkFns/checkPortListening"
+import { checkWebUrl, runHealthScript } from "./health/checkFns"
+import { List } from "./config/builder/list"
+import { Migration } from "./inits/migrations/Migration"
+import { Install, InstallFn } from "./inits/setupInstall"
+import { setupActions } from "./actions/setupActions"
+import { setupDependencyConfig } from "./dependencyConfig/setupDependencyConfig"
+import { SetupBackupsParams, setupBackups } from "./backup/setupBackups"
+import { setupInit } from "./inits/setupInit"
+import {
+  EnsureUniqueId,
+  Migrations,
+  setupMigrations,
+} from "./inits/migrations/setupMigrations"
+import { Uninstall, UninstallFn, setupUninstall } from "./inits/setupUninstall"
+import { setupMain } from "./mainFn"
+import { defaultTrigger } from "./trigger/defaultTrigger"
+import { changeOnFirstSuccess, cooldownTrigger } from "./trigger"
+import setupConfig, { Read, Save } from "./config/setupConfig"
+import { setupDependencyMounts } from "./dependency/setupDependencyMounts"
+import {
+  InterfacesReceipt,
+  SetInterfaces,
+  setupInterfaces,
+} from "./interfaces/setupInterfaces"
+import { successFailure } from "./trigger/successFailure"
+import { SetupExports } from "./inits/setupExports"
+
+// prettier-ignore
+type AnyNeverCond<T extends any[], Then, Else> = 
+    T extends [] ? Else :
+    T extends [never, ...Array<any>] ? Then :
+    T extends [any, ...infer U] ? AnyNeverCond<U,Then, Else> :
+    never
+
+export class StartSdk<Manifest extends SDKManifest, Store> {
+  private constructor(readonly manifest: Manifest) {}
+  static of() {
+    return new StartSdk<never, never>(null as never)
+  }
+  withManifest<Manifest extends SDKManifest = never>(manifest: Manifest) {
+    return new StartSdk<Manifest, Store>(manifest)
+  }
+  withStore<Store extends Record<string, any>>() {
+    return new StartSdk<Manifest, Store>(this.manifest)
+  }
+
+  build(isReady: AnyNeverCond<[Manifest, Store], "Build not ready", true>) {
+    return {
+      configConstants: { smtpConfig },
+      createAction: <
+        ConfigType extends
+          | Record<string, any>
+          | Config<any, any>
+          | Config<any, never>,
+        Type extends Record<string, any> = ExtractConfigType<ConfigType>,
+      >(
+        metaData: Omit<ActionMetadata, "input"> & {
+          input: Config<Type, Store> | Config<Type, never>
+        },
+        fn: (options: {
+          effects: Effects
+          utils: Utils<Manifest, Store>
+          input: Type
+        }) => Promise<ActionResult>,
+      ) => {
+        const { input, ...rest } = metaData
+        return createAction<Manifest, Store, ConfigType, Type>(rest, fn, input)
+      },
+      createDynamicAction: <
+        ConfigType extends
+          | Record<string, any>
+          | Config<any, any>
+          | Config<any, never>,
+        Type extends Record<string, any> = ExtractConfigType<ConfigType>,
+      >(
+        metaData: (options: {
+          effects: Effects
+          utils: Utils<Manifest, Store>
+        }) => MaybePromise<Omit<ActionMetadata, "input">>,
+        fn: (options: {
+          effects: Effects
+          utils: Utils<Manifest, Store>
+          input: Type
+        }) => Promise<ActionResult>,
+        input: Config<Type, Store> | Config<Type, never>,
+      ) => {
+        return createAction<Manifest, Store, ConfigType, Type>(
+          metaData,
+          fn,
+          input,
+        )
+      },
+
+      HealthCheck: {
+        of: healthCheck,
+      },
+      healthCheck: {
+        checkPortListening,
+        checkWebUrl,
+        runHealthScript,
+      },
+      patterns,
+      setupActions: (...createdActions: CreatedAction<any, any, any>[]) =>
+        setupActions<Manifest, Store>(...createdActions),
+      setupBackups: (...args: SetupBackupsParams<Manifest>) =>
+        setupBackups<Manifest>(...args),
+      setupConfig: <
+        ConfigType extends Config<any, Store> | Config<any, never>,
+        Type extends Record<string, any> = ExtractConfigType<ConfigType>,
+      >(
+        spec: ConfigType,
+        write: Save<Store, Type, Manifest>,
+        read: Read<Manifest, Store, Type>,
+      ) => setupConfig<Store, ConfigType, Manifest, Type>(spec, write, read),
+      setupConfigRead: <
+        ConfigSpec extends
+          | Config<Record<string, any>, any>
+          | Config<Record<string, never>, never>,
+      >(
+        _configSpec: ConfigSpec,
+        fn: Read<Manifest, Store, ConfigSpec>,
+      ) => fn,
+      setupConfigSave: <
+        ConfigSpec extends
+          | Config<Record<string, any>, any>
+          | Config<Record<string, never>, never>,
+      >(
+        _configSpec: ConfigSpec,
+        fn: Save<Store, ConfigSpec, Manifest>,
+      ) => fn,
+      setupDependencyConfig: <Input extends Record<string, any>>(
+        config: Config<Input, Store> | Config<Input, never>,
+        autoConfigs: {
+          [K in keyof Manifest["dependencies"]]: DependencyConfig<
+            Manifest,
+            Store,
+            Input,
+            any
+          >
+        },
+      ) => setupDependencyConfig<Store, Input, Manifest>(config, autoConfigs),
+      setupExports: (fn: SetupExports<Store>) => fn,
+      setupDependencyMounts,
+      setupInit: (
+        migrations: Migrations<Manifest, Store>,
+        install: Install<Manifest, Store>,
+        uninstall: Uninstall<Manifest, Store>,
+        setInterfaces: SetInterfaces<Manifest, Store, any, any>,
+        setupExports: SetupExports<Store>,
+      ) =>
+        setupInit<Manifest, Store>(
+          migrations,
+          install,
+          uninstall,
+          setInterfaces,
+          setupExports,
+        ),
+      setupInstall: (fn: InstallFn<Manifest, Store>) => Install.of(fn),
+      setupInterfaces: <
+        ConfigInput extends Record<string, any>,
+        Output extends InterfacesReceipt,
+      >(
+        config: Config<ConfigInput, Store>,
+        fn: SetInterfaces<Manifest, Store, ConfigInput, Output>,
+      ) => setupInterfaces(config, fn),
+      setupMain: (
+        fn: (o: {
+          effects: Effects
+          started(onTerm: () => PromiseLike<void>): PromiseLike<void>
+          utils: Utils<Manifest, Store, {}>
+        }) => Promise<Daemons<Manifest, any>>,
+      ) => setupMain<Manifest, Store>(fn),
+      setupMigrations: <
+        Migrations extends Array<Migration<Manifest, Store, any>>,
+      >(
+        ...migrations: EnsureUniqueId<Migrations>
+      ) =>
+        setupMigrations<Manifest, Store, Migrations>(
+          this.manifest,
+          ...migrations,
+        ),
+      setupUninstall: (fn: UninstallFn<Manifest, Store>) =>
+        setupUninstall<Manifest, Store>(fn),
+      trigger: {
+        defaultTrigger,
+        cooldownTrigger,
+        changeOnFirstSuccess,
+        successFailure,
+      },
+
+      Backups: {
+        volumes: (...volumeNames: Array<keyof Manifest["volumes"] & string>) =>
+          Backups.volumes<Manifest>(...volumeNames),
+        addSets: (
+          ...options: BackupSet<keyof Manifest["volumes"] & string>[]
+        ) => Backups.addSets<Manifest>(...options),
+        withOptions: (options?: Partial<BackupOptions>) =>
+          Backups.with_options<Manifest>(options),
+      },
+      Config: {
+        of: <
+          Spec extends Record<string, Value<any, Store> | Value<any, never>>,
+        >(
+          spec: Spec,
+        ) => Config.of<Spec, Store>(spec),
+      },
+      Daemons: { of: Daemons.of },
+      DependencyConfig: {
+        of<
+          LocalConfig extends Record<string, any>,
+          RemoteConfig extends Record<string, any>,
+        >({
+          localConfig,
+          remoteConfig,
+          dependencyConfig,
+          update,
+        }: {
+          localConfig: Config<LocalConfig, Store> | Config<LocalConfig, never>
+          remoteConfig: Config<RemoteConfig, any> | Config<RemoteConfig, never>
+          dependencyConfig: (options: {
+            effects: Effects
+            localConfig: LocalConfig
+            utils: Utils<Manifest, Store>
+          }) => Promise<void | DeepPartial<RemoteConfig>>
+          update?: Update<void | DeepPartial<RemoteConfig>, RemoteConfig>
+        }) {
+          return new DependencyConfig<
+            Manifest,
+            Store,
+            LocalConfig,
+            RemoteConfig
+          >(dependencyConfig, update)
+        },
+      },
+      List: {
+        text: List.text,
+        number: List.number,
+        obj: <Type extends Record<string, any>>(
+          a: {
+            name: string
+            description?: string | null
+            warning?: string | null
+            /** Default [] */
+            default?: []
+            minLength?: number | null
+            maxLength?: number | null
+          },
+          aSpec: {
+            spec: Config<Type, Store>
+            displayAs?: null | string
+            uniqueBy?: null | UniqueBy
+          },
+        ) => List.obj<Type, Store>(a, aSpec),
+        dynamicText: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              /** Default = [] */
+              default?: string[]
+              minLength?: number | null
+              maxLength?: number | null
+              disabled?: false | string
+              generate?: null | RandomString
+              spec: {
+                /** Default = false */
+                masked?: boolean
+                placeholder?: string | null
+                minLength?: number | null
+                maxLength?: number | null
+                patterns: Pattern[]
+                /** Default = "text" */
+                inputmode?: ListValueSpecText["inputmode"]
+              }
+            }
+          >,
+        ) => List.dynamicText<Store>(getA),
+        dynamicNumber: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              /** Default = [] */
+              default?: string[]
+              minLength?: number | null
+              maxLength?: number | null
+              disabled?: false | string
+              spec: {
+                integer: boolean
+                min?: number | null
+                max?: number | null
+                step?: number | null
+                units?: string | null
+                placeholder?: string | null
+              }
+            }
+          >,
+        ) => List.dynamicNumber<Store>(getA),
+      },
+      Migration: {
+        of: <Version extends ManifestVersion>(options: {
+          version: Version
+          up: (opts: {
+            effects: Effects
+            utils: Utils<Manifest, Store>
+          }) => Promise<void>
+          down: (opts: {
+            effects: Effects
+            utils: Utils<Manifest, Store>
+          }) => Promise<void>
+        }) => Migration.of<Manifest, Store, Version>(options),
+      },
+      Value: {
+        toggle: Value.toggle,
+        text: Value.text,
+        textarea: Value.textarea,
+        number: Value.number,
+        color: Value.color,
+        datetime: Value.datetime,
+        select: Value.select,
+        multiselect: Value.multiselect,
+        object: Value.object,
+        union: Value.union,
+        list: Value.list,
+        dynamicToggle: (
+          a: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              default: boolean
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicToggle<Store>(a),
+        dynamicText: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              required: RequiredDefault<DefaultString>
+
+              /** Default = false */
+              masked?: boolean
+              placeholder?: string | null
+              minLength?: number | null
+              maxLength?: number | null
+              patterns?: Pattern[]
+              /** Default = 'text' */
+              inputmode?: ValueSpecText["inputmode"]
+              generate?: null | RandomString
+            }
+          >,
+        ) => Value.dynamicText<Store>(getA),
+        dynamicTextarea: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              required: boolean
+              minLength?: number | null
+              maxLength?: number | null
+              placeholder?: string | null
+              disabled?: false | string
+              generate?: null | RandomString
+            }
+          >,
+        ) => Value.dynamicTextarea<Store>(getA),
+        dynamicNumber: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              required: RequiredDefault<number>
+              min?: number | null
+              max?: number | null
+              /** Default = '1' */
+              step?: number | null
+              integer: boolean
+              units?: string | null
+              placeholder?: string | null
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicNumber<Store>(getA),
+        dynamicColor: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              required: RequiredDefault<string>
+
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicColor<Store>(getA),
+        dynamicDatetime: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              required: RequiredDefault<string>
+              /** Default = 'datetime-local' */
+              inputmode?: ValueSpecDatetime["inputmode"]
+              min?: string | null
+              max?: string | null
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicDatetime<Store>(getA),
+        dynamicSelect: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              required: RequiredDefault<string>
+              values: Record<string, string>
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicSelect<Store>(getA),
+        dynamicMultiselect: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              default: string[]
+              values: Record<string, string>
+              minLength?: number | null
+              maxLength?: number | null
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicMultiselect<Store>(getA),
+        filteredUnion: <
+          Required extends RequiredDefault<string>,
+          Type extends Record<string, any>,
+        >(
+          getDisabledFn: LazyBuild<Store, string[]>,
+          a: {
+            name: string
+            description?: string | null
+            warning?: string | null
+            required: Required
+          },
+          aVariants: Variants<Type, Store> | Variants<Type, never>,
+        ) =>
+          Value.filteredUnion<Required, Type, Store>(
+            getDisabledFn,
+            a,
+            aVariants,
+          ),
+
+        dynamicUnion: <
+          Required extends RequiredDefault<string>,
+          Type extends Record<string, any>,
+        >(
+          getA: LazyBuild<
+            Store,
+            {
+              disabled: string[] | false | string
+              name: string
+              description?: string | null
+              warning?: string | null
+              required: Required
+            }
+          >,
+          aVariants: Variants<Type, Store> | Variants<Type, never>,
+        ) => Value.dynamicUnion<Required, Type, Store>(getA, aVariants),
+      },
+      Variants: {
+        of: <
+          VariantValues extends {
+            [K in string]: {
+              name: string
+              spec: Config<any, Store>
+            }
+          },
+        >(
+          a: VariantValues,
+        ) => Variants.of<VariantValues, Store>(a),
+      },
+    }
+  }
+}
diff --git a/sdk/lib/actions/createAction.ts b/sdk/lib/actions/createAction.ts
new file mode 100644
index 000000000..d14b7ce0d
--- /dev/null
+++ b/sdk/lib/actions/createAction.ts
@@ -0,0 +1,101 @@
+import { Config, ExtractConfigType } from "../config/builder/config"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { ActionMetadata, ActionResult, Effects, ExportedAction } from "../types"
+import { createUtils } from "../util"
+import { Utils } from "../util/utils"
+
+export type MaybeFn<Manifest extends SDKManifest, Store, Value> =
+  | Value
+  | ((options: {
+      effects: Effects
+      utils: Utils<Manifest, Store>
+    }) => Promise<Value> | Value)
+export class CreatedAction<
+  Manifest extends SDKManifest,
+  Store,
+  ConfigType extends
+    | Record<string, any>
+    | Config<any, Store>
+    | Config<any, never>,
+  Type extends Record<string, any> = ExtractConfigType<ConfigType>,
+> {
+  private constructor(
+    public readonly myMetaData: MaybeFn<
+      Manifest,
+      Store,
+      Omit<ActionMetadata, "input">
+    >,
+    readonly fn: (options: {
+      effects: Effects
+      utils: Utils<Manifest, Store>
+      input: Type
+    }) => Promise<ActionResult>,
+    readonly input: Config<Type, Store>,
+    public validator = input.validator,
+  ) {}
+
+  static of<
+    Manifest extends SDKManifest,
+    Store,
+    ConfigType extends
+      | Record<string, any>
+      | Config<any, any>
+      | Config<any, never>,
+    Type extends Record<string, any> = ExtractConfigType<ConfigType>,
+  >(
+    metaData: MaybeFn<Manifest, Store, Omit<ActionMetadata, "input">>,
+    fn: (options: {
+      effects: Effects
+      utils: Utils<Manifest, Store>
+      input: Type
+    }) => Promise<ActionResult>,
+    inputConfig: Config<Type, Store> | Config<Type, never>,
+  ) {
+    return new CreatedAction<Manifest, Store, ConfigType, Type>(
+      metaData,
+      fn,
+      inputConfig as Config<Type, Store>,
+    )
+  }
+
+  exportedAction: ExportedAction = ({ effects, input }) => {
+    return this.fn({
+      effects,
+      utils: createUtils(effects),
+      input: this.validator.unsafeCast(input),
+    })
+  }
+
+  run = async ({ effects, input }: { effects: Effects; input?: Type }) => {
+    return this.fn({
+      effects,
+      utils: createUtils(effects),
+      input: this.validator.unsafeCast(input),
+    })
+  }
+
+  async metaData(options: { effects: Effects; utils: Utils<Manifest, Store> }) {
+    if (this.myMetaData instanceof Function)
+      return await this.myMetaData(options)
+    return this.myMetaData
+  }
+
+  async ActionMetadata(options: {
+    effects: Effects
+    utils: Utils<Manifest, Store>
+  }): Promise<ActionMetadata> {
+    return {
+      ...(await this.metaData(options)),
+      input: await this.input.build(options),
+    }
+  }
+
+  async getConfig({ effects }: { effects: Effects }) {
+    return this.input.build({
+      effects,
+      utils: createUtils(effects) as any,
+    })
+  }
+}
+
+export const createAction = CreatedAction.of
diff --git a/sdk/lib/actions/index.ts b/sdk/lib/actions/index.ts
new file mode 100644
index 000000000..603684b67
--- /dev/null
+++ b/sdk/lib/actions/index.ts
@@ -0,0 +1,3 @@
+import "./createAction"
+
+import "./setupActions"
diff --git a/sdk/lib/actions/setupActions.ts b/sdk/lib/actions/setupActions.ts
new file mode 100644
index 000000000..84a0e4345
--- /dev/null
+++ b/sdk/lib/actions/setupActions.ts
@@ -0,0 +1,42 @@
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Effects, ExpectedExports } from "../types"
+import { createUtils } from "../util"
+import { once } from "../util/once"
+import { Utils } from "../util/utils"
+import { CreatedAction } from "./createAction"
+
+export function setupActions<Manifest extends SDKManifest, Store>(
+  ...createdActions: CreatedAction<Manifest, Store, any>[]
+) {
+  const myActions = async (options: {
+    effects: Effects
+    utils: Utils<Manifest, Store>
+  }) => {
+    const actions: Record<string, CreatedAction<Manifest, Store, any>> = {}
+    for (const action of createdActions) {
+      const actionMetadata = await action.metaData(options)
+      actions[actionMetadata.id] = action
+    }
+    return actions
+  }
+  const answer: {
+    actions: ExpectedExports.actions
+    actionsMetadata: ExpectedExports.actionsMetadata
+  } = {
+    actions(options: { effects: Effects }) {
+      const utils = createUtils<Manifest, Store>(options.effects)
+
+      return myActions({
+        ...options,
+        utils,
+      })
+    },
+    async actionsMetadata({ effects }: { effects: Effects }) {
+      const utils = createUtils<Manifest, Store>(effects)
+      return Promise.all(
+        createdActions.map((x) => x.ActionMetadata({ effects, utils })),
+      )
+    },
+  }
+  return answer
+}
diff --git a/sdk/lib/backup/Backups.ts b/sdk/lib/backup/Backups.ts
new file mode 100644
index 000000000..659da0ec7
--- /dev/null
+++ b/sdk/lib/backup/Backups.ts
@@ -0,0 +1,181 @@
+import { SDKManifest } from "../manifest/ManifestTypes"
+import * as T from "../types"
+
+export type BACKUP = "BACKUP"
+export const DEFAULT_OPTIONS: T.BackupOptions = {
+  delete: true,
+  force: true,
+  ignoreExisting: false,
+  exclude: [],
+}
+export type BackupSet<Volumes extends string> = {
+  srcPath: string
+  srcVolume: Volumes | BACKUP
+  dstPath: string
+  dstVolume: Volumes | BACKUP
+  options?: Partial<T.BackupOptions>
+}
+/**
+ * This utility simplifies the volume backup process.
+ * ```ts
+ * export const { createBackup, restoreBackup } = Backups.volumes("main").build();
+ * ```
+ *
+ * Changing the options of the rsync, (ie exludes) use either
+ * ```ts
+ *  Backups.volumes("main").set_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
+ * // or
+ *  Backups.with_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
+ * ```
+ *
+ * Using the more fine control, using the addSets for more control
+ * ```ts
+ * Backups.addSets({
+ * srcVolume: 'main', srcPath:'smallData/', dstPath: 'main/smallData/', dstVolume: : Backups.BACKUP
+ * }, {
+ * srcVolume: 'main', srcPath:'bigData/', dstPath: 'main/bigData/', dstVolume: : Backups.BACKUP, options: {exclude:['bigData/excludeThis']}}
+ * ).build()q
+ * ```
+ */
+export class Backups<M extends SDKManifest> {
+  static BACKUP: BACKUP = "BACKUP"
+
+  private constructor(
+    private options = DEFAULT_OPTIONS,
+    private backupSet = [] as BackupSet<M["volumes"][0]>[],
+  ) {}
+  static volumes<M extends SDKManifest = never>(
+    ...volumeNames: Array<M["volumes"][0]>
+  ): Backups<M> {
+    return new Backups<M>().addSets(
+      ...volumeNames.map((srcVolume) => ({
+        srcVolume,
+        srcPath: "./",
+        dstPath: `./${srcVolume}/`,
+        dstVolume: Backups.BACKUP,
+      })),
+    )
+  }
+  static addSets<M extends SDKManifest = never>(
+    ...options: BackupSet<M["volumes"][0]>[]
+  ) {
+    return new Backups().addSets(...options)
+  }
+  static with_options<M extends SDKManifest = never>(
+    options?: Partial<T.BackupOptions>,
+  ) {
+    return new Backups({ ...DEFAULT_OPTIONS, ...options })
+  }
+
+  static withOptions = Backups.with_options
+  setOptions(options?: Partial<T.BackupOptions>) {
+    this.options = {
+      ...this.options,
+      ...options,
+    }
+    return this
+  }
+  volumes(...volumeNames: Array<M["volumes"][0]>) {
+    return this.addSets(
+      ...volumeNames.map((srcVolume) => ({
+        srcVolume,
+        srcPath: "./",
+        dstPath: `./${srcVolume}/`,
+        dstVolume: Backups.BACKUP,
+      })),
+    )
+  }
+  addSets(...options: BackupSet<M["volumes"][0]>[]) {
+    options.forEach((x) =>
+      this.backupSet.push({ ...x, options: { ...this.options, ...x.options } }),
+    )
+    return this
+  }
+  build() {
+    const createBackup: T.ExpectedExports.createBackup = async ({
+      effects,
+    }) => {
+      // const previousItems = (
+      //   await effects
+      //     .readDir({
+      //       volumeId: Backups.BACKUP,
+      //       path: ".",
+      //     })
+      //     .catch(() => [])
+      // ).map((x) => `${x}`)
+      // const backupPaths = this.backupSet
+      //   .filter((x) => x.dstVolume === Backups.BACKUP)
+      //   .map((x) => x.dstPath)
+      //   .map((x) => x.replace(/\.\/([^]*)\//, "$1"))
+      // const filteredItems = previousItems.filter(
+      //   (x) => backupPaths.indexOf(x) === -1,
+      // )
+      // for (const itemToRemove of filteredItems) {
+      //   effects.console.error(`Trying to remove ${itemToRemove}`)
+      //   await effects
+      //     .removeDir({
+      //       volumeId: Backups.BACKUP,
+      //       path: itemToRemove,
+      //     })
+      //     .catch(() =>
+      //       effects.removeFile({
+      //         volumeId: Backups.BACKUP,
+      //         path: itemToRemove,
+      //       }),
+      //     )
+      //     .catch(() => {
+      //       console.warn(`Failed to remove ${itemToRemove} from backup volume`)
+      //     })
+      // }
+      for (const item of this.backupSet) {
+        // if (notEmptyPath(item.dstPath)) {
+        //   await effects.createDir({
+        //     volumeId: item.dstVolume,
+        //     path: item.dstPath,
+        //   })
+        // }
+        // await effects
+        //   .runRsync({
+        //     ...item,
+        //     options: {
+        //       ...this.options,
+        //       ...item.options,
+        //     },
+        //   })
+        //   .wait()
+      }
+      return
+    }
+    const restoreBackup: T.ExpectedExports.restoreBackup = async ({
+      effects,
+    }) => {
+      for (const item of this.backupSet) {
+        // if (notEmptyPath(item.srcPath)) {
+        //   await new Promise((resolve, reject) => fs.mkdir(items.src)).createDir(
+        //     {
+        //       volumeId: item.srcVolume,
+        //       path: item.srcPath,
+        //     },
+        //   )
+        // }
+        // await effects
+        //   .runRsync({
+        //     options: {
+        //       ...this.options,
+        //       ...item.options,
+        //     },
+        //     srcVolume: item.dstVolume,
+        //     dstVolume: item.srcVolume,
+        //     srcPath: item.dstPath,
+        //     dstPath: item.srcPath,
+        //   })
+        //   .wait()
+      }
+      return
+    }
+    return { createBackup, restoreBackup }
+  }
+}
+function notEmptyPath(file: string) {
+  return ["", ".", "./"].indexOf(file) === -1
+}
diff --git a/sdk/lib/backup/index.ts b/sdk/lib/backup/index.ts
new file mode 100644
index 000000000..fe9cd8569
--- /dev/null
+++ b/sdk/lib/backup/index.ts
@@ -0,0 +1,3 @@
+import "./Backups"
+
+import "./setupBackups"
diff --git a/sdk/lib/backup/setupBackups.ts b/sdk/lib/backup/setupBackups.ts
new file mode 100644
index 000000000..d171a4aa7
--- /dev/null
+++ b/sdk/lib/backup/setupBackups.ts
@@ -0,0 +1,43 @@
+import { Backups } from "./Backups"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { ExpectedExports } from "../types"
+import { _ } from "../util"
+
+export type SetupBackupsParams<M extends SDKManifest> = Array<
+  M["volumes"][0] | Backups<M>
+>
+
+export function setupBackups<M extends SDKManifest>(
+  ...args: _<SetupBackupsParams<M>>
+) {
+  const backups = Array<Backups<M>>()
+  const volumes = new Set<M["volumes"][0]>()
+  for (const arg of args) {
+    if (arg instanceof Backups) {
+      backups.push(arg)
+    } else {
+      volumes.add(arg)
+    }
+  }
+  backups.push(Backups.volumes(...volumes))
+  const answer: {
+    createBackup: ExpectedExports.createBackup
+    restoreBackup: ExpectedExports.restoreBackup
+  } = {
+    get createBackup() {
+      return (async (options) => {
+        for (const backup of backups) {
+          await backup.build().createBackup(options)
+        }
+      }) as ExpectedExports.createBackup
+    },
+    get restoreBackup() {
+      return (async (options) => {
+        for (const backup of backups) {
+          await backup.build().restoreBackup(options)
+        }
+      }) as ExpectedExports.restoreBackup
+    },
+  }
+  return answer
+}
diff --git a/sdk/lib/config/builder/config.ts b/sdk/lib/config/builder/config.ts
new file mode 100644
index 000000000..81009abaa
--- /dev/null
+++ b/sdk/lib/config/builder/config.ts
@@ -0,0 +1,139 @@
+import { ValueSpec } from "../configTypes"
+import { Utils } from "../../util/utils"
+import { Value } from "./value"
+import { _ } from "../../util"
+import { Effects } from "../../types"
+import { Parser, object } from "ts-matches"
+
+export type LazyBuildOptions<Store> = {
+  effects: Effects
+  utils: Utils<any, Store>
+}
+export type LazyBuild<Store, ExpectedOut> = (
+  options: LazyBuildOptions<Store>,
+) => Promise<ExpectedOut> | ExpectedOut
+
+// prettier-ignore
+export type ExtractConfigType<A extends Record<string, any> | Config<Record<string, any>, any> | Config<Record<string, any>, never>> = 
+  A extends Config<infer B, any> | Config<infer B, never> ? B :
+  A
+
+export type ConfigSpecOf<A extends Record<string, any>, Store = never> = {
+  [K in keyof A]: Value<A[K], Store>
+}
+
+export type MaybeLazyValues<A> = LazyBuild<any, A> | A
+/**
+ * Configs are the specs that are used by the os configuration form for this service.
+ * Here is an example of a simple configuration
+  ```ts
+    const smallConfig = Config.of({
+      test: Value.boolean({
+        name: "Test",
+        description: "This is the description for the test",
+        warning: null,
+        default: false,
+      }),
+    });
+  ```
+
+  The idea of a config is that now the form is going to ask for
+  Test: [ ] and the value is going to be checked as a boolean.
+  There are more complex values like selects, lists, and objects. See {@link Value}
+
+  Also, there is the ability to get a validator/parser from this config spec.
+  ```ts
+  const matchSmallConfig = smallConfig.validator();
+  type SmallConfig = typeof matchSmallConfig._TYPE;
+  ```
+
+  Here is an example of a more complex configuration which came from a configuration for a service
+  that works with bitcoin, like c-lightning.
+  ```ts
+
+    export const hostname = Value.string({
+  name: "Hostname",
+  default: null,
+  description: "Domain or IP address of bitcoin peer",
+  warning: null,
+  required: true,
+  masked: false,
+  placeholder: null,
+  pattern:
+    "(^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$)|((^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$)|(^[a-z2-7]{16}\\.onion$)|(^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$))",
+  patternDescription:
+    "Must be either a domain name, or an IPv4 or IPv6 address. Do not include protocol scheme (eg 'http://') or port.",
+});
+export const port = Value.number({
+  name: "Port",
+  default: null,
+  description: "Port that peer is listening on for inbound p2p connections",
+  warning: null,
+  required: false,
+  range: "[0,65535]",
+  integral: true,
+  units: null,
+  placeholder: null,
+});
+export const addNodesSpec = Config.of({ hostname: hostname, port: port });
+
+  ```
+ */
+export class Config<Type extends Record<string, any>, Store = never> {
+  private constructor(
+    private readonly spec: {
+      [K in keyof Type]: Value<Type[K], Store> | Value<Type[K], never>
+    },
+    public validator: Parser<unknown, Type>,
+  ) {}
+  async build(options: LazyBuildOptions<Store>) {
+    const answer = {} as {
+      [K in keyof Type]: ValueSpec
+    }
+    for (const k in this.spec) {
+      answer[k] = await this.spec[k].build(options as any)
+    }
+    return answer
+  }
+
+  static of<
+    Spec extends Record<string, Value<any, Store> | Value<any, never>>,
+    Store = never,
+  >(spec: Spec) {
+    const validatorObj = {} as {
+      [K in keyof Spec]: Parser<unknown, any>
+    }
+    for (const key in spec) {
+      validatorObj[key] = spec[key].validator
+    }
+    const validator = object(validatorObj)
+    return new Config<
+      {
+        [K in keyof Spec]: Spec[K] extends
+          | Value<infer T, Store>
+          | Value<infer T, never>
+          ? T
+          : never
+      },
+      Store
+    >(spec, validator as any)
+  }
+
+  /**
+   * Use this during the times that the input needs a more specific type.
+   * Used in types that the value/ variant/ list/ config is constructed somewhere else.
+  ```ts
+  const a = Config.text({
+    name: "a",
+    required: false,
+  })
+
+  return Config.of<Store>()({
+    myValue: a.withStore(),
+  })
+  ```
+   */
+  withStore<NewStore extends Store extends never ? any : Store>() {
+    return this as any as Config<Type, NewStore>
+  }
+}
diff --git a/sdk/lib/config/builder/index.ts b/sdk/lib/config/builder/index.ts
new file mode 100644
index 000000000..a0d794b16
--- /dev/null
+++ b/sdk/lib/config/builder/index.ts
@@ -0,0 +1,4 @@
+import "./config"
+import "./list"
+import "./value"
+import "./variants"
diff --git a/sdk/lib/config/builder/list.ts b/sdk/lib/config/builder/list.ts
new file mode 100644
index 000000000..23de0c495
--- /dev/null
+++ b/sdk/lib/config/builder/list.ts
@@ -0,0 +1,279 @@
+import { Config, LazyBuild } from "./config"
+import {
+  ListValueSpecText,
+  Pattern,
+  RandomString,
+  UniqueBy,
+  ValueSpecList,
+  ValueSpecListOf,
+  ValueSpecText,
+} from "../configTypes"
+import { Parser, arrayOf, number, string } from "ts-matches"
+/**
+ * Used as a subtype of Value.list
+```ts
+export const authorizationList = List.string({
+  "name": "Authorization",
+  "range": "[0,*)",
+  "default": [],
+  "description": "Username and hashed password for JSON-RPC connections. RPC clients connect using the usual http basic authentication.",
+  "warning": null
+}, {"masked":false,"placeholder":null,"pattern":"^[a-zA-Z0-9_-]+:([0-9a-fA-F]{2})+\\$([0-9a-fA-F]{2})+$","patternDescription":"Each item must be of the form \"<USERNAME>:<SALT>$<HASH>\"."});
+export const auth = Value.list(authorizationList);
+```
+*/
+export class List<Type, Store> {
+  private constructor(
+    public build: LazyBuild<Store, ValueSpecList>,
+    public validator: Parser<unknown, Type>,
+  ) {}
+  static text(
+    a: {
+      name: string
+      description?: string | null
+      warning?: string | null
+      /** Default = [] */
+      default?: string[]
+      minLength?: number | null
+      maxLength?: number | null
+    },
+    aSpec: {
+      /** Default = false */
+      masked?: boolean
+      placeholder?: string | null
+      minLength?: number | null
+      maxLength?: number | null
+      patterns: Pattern[]
+      /** Default = "text" */
+      inputmode?: ListValueSpecText["inputmode"]
+      generate?: null | RandomString
+    },
+  ) {
+    return new List<string[], never>(() => {
+      const spec = {
+        type: "text" as const,
+        placeholder: null,
+        minLength: null,
+        maxLength: null,
+        masked: false,
+        inputmode: "text" as const,
+        generate: null,
+        ...aSpec,
+      }
+      const built: ValueSpecListOf<"text"> = {
+        description: null,
+        warning: null,
+        default: [],
+        type: "list" as const,
+        minLength: null,
+        maxLength: null,
+        disabled: false,
+        ...a,
+        spec,
+      }
+      return built
+    }, arrayOf(string))
+  }
+  static dynamicText<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        /** Default = [] */
+        default?: string[]
+        minLength?: number | null
+        maxLength?: number | null
+        disabled?: false | string
+        generate?: null | RandomString
+        spec: {
+          /** Default = false */
+          masked?: boolean
+          placeholder?: string | null
+          minLength?: number | null
+          maxLength?: number | null
+          patterns: Pattern[]
+          /** Default = "text" */
+          inputmode?: ListValueSpecText["inputmode"]
+        }
+      }
+    >,
+  ) {
+    return new List<string[], Store>(async (options) => {
+      const { spec: aSpec, ...a } = await getA(options)
+      const spec = {
+        type: "text" as const,
+        placeholder: null,
+        minLength: null,
+        maxLength: null,
+        masked: false,
+        inputmode: "text" as const,
+        generate: null,
+        ...aSpec,
+      }
+      const built: ValueSpecListOf<"text"> = {
+        description: null,
+        warning: null,
+        default: [],
+        type: "list" as const,
+        minLength: null,
+        maxLength: null,
+        disabled: false,
+        ...a,
+        spec,
+      }
+      return built
+    }, arrayOf(string))
+  }
+  static number(
+    a: {
+      name: string
+      description?: string | null
+      warning?: string | null
+      /** Default = [] */
+      default?: string[]
+      minLength?: number | null
+      maxLength?: number | null
+    },
+    aSpec: {
+      integer: boolean
+      min?: number | null
+      max?: number | null
+      step?: number | null
+      units?: string | null
+      placeholder?: string | null
+    },
+  ) {
+    return new List<number[], never>(() => {
+      const spec = {
+        type: "number" as const,
+        placeholder: null,
+        min: null,
+        max: null,
+        step: null,
+        units: null,
+        ...aSpec,
+      }
+      const built: ValueSpecListOf<"number"> = {
+        description: null,
+        warning: null,
+        minLength: null,
+        maxLength: null,
+        default: [],
+        type: "list" as const,
+        disabled: false,
+        ...a,
+        spec,
+      }
+      return built
+    }, arrayOf(number))
+  }
+  static dynamicNumber<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        /** Default = [] */
+        default?: string[]
+        minLength?: number | null
+        maxLength?: number | null
+        disabled?: false | string
+        spec: {
+          integer: boolean
+          min?: number | null
+          max?: number | null
+          step?: number | null
+          units?: string | null
+          placeholder?: string | null
+        }
+      }
+    >,
+  ) {
+    return new List<number[], Store>(async (options) => {
+      const { spec: aSpec, ...a } = await getA(options)
+      const spec = {
+        type: "number" as const,
+        placeholder: null,
+        min: null,
+        max: null,
+        step: null,
+        units: null,
+        ...aSpec,
+      }
+      return {
+        description: null,
+        warning: null,
+        minLength: null,
+        maxLength: null,
+        default: [],
+        type: "list" as const,
+        disabled: false,
+        ...a,
+        spec,
+      }
+    }, arrayOf(number))
+  }
+  static obj<Type extends Record<string, any>, Store>(
+    a: {
+      name: string
+      description?: string | null
+      warning?: string | null
+      /** Default [] */
+      default?: []
+      minLength?: number | null
+      maxLength?: number | null
+    },
+    aSpec: {
+      spec: Config<Type, Store>
+      displayAs?: null | string
+      uniqueBy?: null | UniqueBy
+    },
+  ) {
+    return new List<Type[], Store>(async (options) => {
+      const { spec: previousSpecSpec, ...restSpec } = aSpec
+      const specSpec = await previousSpecSpec.build(options)
+      const spec = {
+        type: "object" as const,
+        displayAs: null,
+        uniqueBy: null,
+        ...restSpec,
+        spec: specSpec,
+      }
+      const value = {
+        spec,
+        default: [],
+        ...a,
+      }
+      return {
+        description: null,
+        warning: null,
+        minLength: null,
+        maxLength: null,
+        type: "list" as const,
+        disabled: false,
+        ...value,
+      }
+    }, arrayOf(aSpec.spec.validator))
+  }
+
+  /**
+   * Use this during the times that the input needs a more specific type.
+   * Used in types that the value/ variant/ list/ config is constructed somewhere else.
+  ```ts
+  const a = Config.text({
+    name: "a",
+    required: false,
+  })
+
+  return Config.of<Store>()({
+    myValue: a.withStore(),
+  })
+  ```
+   */
+  withStore<NewStore extends Store extends never ? any : Store>() {
+    return this as any as List<Type, NewStore>
+  }
+}
diff --git a/sdk/lib/config/builder/value.ts b/sdk/lib/config/builder/value.ts
new file mode 100644
index 000000000..01673a6df
--- /dev/null
+++ b/sdk/lib/config/builder/value.ts
@@ -0,0 +1,783 @@
+import { Config, LazyBuild, LazyBuildOptions } from "./config"
+import { List } from "./list"
+import { Variants } from "./variants"
+import {
+  FilePath,
+  Pattern,
+  RandomString,
+  ValueSpec,
+  ValueSpecDatetime,
+  ValueSpecText,
+  ValueSpecTextarea,
+} from "../configTypes"
+import { DefaultString } from "../configTypes"
+import { _ } from "../../util"
+import {
+  Parser,
+  anyOf,
+  arrayOf,
+  boolean,
+  literal,
+  literals,
+  number,
+  object,
+  string,
+  unknown,
+} from "ts-matches"
+import { once } from "../../util/once"
+
+export type RequiredDefault<A> =
+  | false
+  | {
+      default: A | null
+    }
+
+function requiredLikeToAbove<Input extends RequiredDefault<A>, A>(
+  requiredLike: Input,
+) {
+  // prettier-ignore
+  return {
+    required: (typeof requiredLike === 'object' ? true : requiredLike) as (
+      Input extends { default: unknown} ? true:
+      Input extends true ? true :
+      false
+    ),
+    default:(typeof requiredLike === 'object' ? requiredLike.default : null) as (
+      Input extends { default: infer Default } ? Default :
+      null
+    )
+  };
+}
+type AsRequired<Type, MaybeRequiredType> = MaybeRequiredType extends
+  | { default: unknown }
+  | never
+  ? Type
+  : Type | null | undefined
+
+type InputAsRequired<A, Type> = A extends
+  | { required: { default: any } | never }
+  | never
+  ? Type
+  : Type | null | undefined
+const testForAsRequiredParser = once(
+  () => object({ required: object({ default: unknown }) }).test,
+)
+function asRequiredParser<
+  Type,
+  Input,
+  Return extends
+    | Parser<unknown, Type>
+    | Parser<unknown, Type | null | undefined>,
+>(parser: Parser<unknown, Type>, input: Input): Return {
+  if (testForAsRequiredParser()(input)) return parser as any
+  return parser.optional() as any
+}
+
+/**
+ * A value is going to be part of the form in the FE of the OS.
+ * Something like a boolean, a string, a number, etc.
+ * in the fe it will ask for the name of value, and use the rest of the value to determine how to render it.
+ * While writing with a value, you will start with `Value.` then let the IDE suggest the rest.
+ * for things like string, the options are going to be in {}.
+ * Keep an eye out for another config builder types as params.
+ * Note, usually this is going to be used in a `Config` {@link Config} builder.
+ ```ts
+const username = Value.string({
+  name: "Username",
+  default: "bitcoin",
+  description: "The username for connecting to Bitcoin over RPC.",
+  warning: null,
+  required: true,
+  masked: true,
+  placeholder: null,
+  pattern: "^[a-zA-Z0-9_]+$",
+  patternDescription: "Must be alphanumeric (can contain underscore).",
+});
+ ```
+ */
+export class Value<Type, Store> {
+  protected constructor(
+    public build: LazyBuild<Store, ValueSpec>,
+    public validator: Parser<unknown, Type>,
+  ) {}
+  static toggle(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    default: boolean
+    /**  Immutable means it can only be configed at the first config then never again 
+    Default is false */
+    immutable?: boolean
+  }) {
+    return new Value<boolean, never>(
+      async () => ({
+        description: null,
+        warning: null,
+        type: "toggle" as const,
+        disabled: false,
+        immutable: a.immutable ?? false,
+        ...a,
+      }),
+      boolean,
+    )
+  }
+  static dynamicToggle<Store = never>(
+    a: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        default: boolean
+        disabled?: false | string
+      }
+    >,
+  ) {
+    return new Value<boolean, Store>(
+      async (options) => ({
+        description: null,
+        warning: null,
+        type: "toggle" as const,
+        disabled: false,
+        immutable: false,
+        ...(await a(options)),
+      }),
+      boolean,
+    )
+  }
+  static text<Required extends RequiredDefault<DefaultString>>(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    required: Required
+
+    /** Default = false */
+    masked?: boolean
+    placeholder?: string | null
+    minLength?: number | null
+    maxLength?: number | null
+    patterns?: Pattern[]
+    /** Default = 'text' */
+    inputmode?: ValueSpecText["inputmode"]
+    /**  Immutable means it can only be configured at the first config then never again
+     * Default is false
+     */
+    immutable?: boolean
+    generate?: null | RandomString
+  }) {
+    return new Value<AsRequired<string, Required>, never>(
+      async () => ({
+        type: "text" as const,
+        description: null,
+        warning: null,
+        masked: false,
+        placeholder: null,
+        minLength: null,
+        maxLength: null,
+        patterns: [],
+        inputmode: "text",
+        disabled: false,
+        immutable: a.immutable ?? false,
+        generate: a.generate ?? null,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }),
+      asRequiredParser(string, a),
+    )
+  }
+  static dynamicText<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        required: RequiredDefault<DefaultString>
+
+        /** Default = false */
+        masked?: boolean
+        placeholder?: string | null
+        minLength?: number | null
+        maxLength?: number | null
+        patterns?: Pattern[]
+        /** Default = 'text' */
+        inputmode?: ValueSpecText["inputmode"]
+        disabled?: string | false
+        /**  Immutable means it can only be configured at the first config then never again
+         * Default is false
+         */
+        generate?: null | RandomString
+      }
+    >,
+  ) {
+    return new Value<string | null | undefined, Store>(async (options) => {
+      const a = await getA(options)
+      return {
+        type: "text" as const,
+        description: null,
+        warning: null,
+        masked: false,
+        placeholder: null,
+        minLength: null,
+        maxLength: null,
+        patterns: [],
+        inputmode: "text",
+        disabled: false,
+        immutable: false,
+        generate: a.generate ?? null,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }
+    }, string.optional())
+  }
+  static textarea(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    required: boolean
+    minLength?: number | null
+    maxLength?: number | null
+    placeholder?: string | null
+    /**  Immutable means it can only be configed at the first config then never again 
+    Default is false */
+    immutable?: boolean
+  }) {
+    return new Value<string, never>(async () => {
+      const built: ValueSpecTextarea = {
+        description: null,
+        warning: null,
+        minLength: null,
+        maxLength: null,
+        placeholder: null,
+        type: "textarea" as const,
+        disabled: false,
+        immutable: a.immutable ?? false,
+        ...a,
+      }
+      return built
+    }, string)
+  }
+  static dynamicTextarea<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        required: boolean
+        minLength?: number | null
+        maxLength?: number | null
+        placeholder?: string | null
+        disabled?: false | string
+      }
+    >,
+  ) {
+    return new Value<string, Store>(async (options) => {
+      const a = await getA(options)
+      return {
+        description: null,
+        warning: null,
+        minLength: null,
+        maxLength: null,
+        placeholder: null,
+        type: "textarea" as const,
+        disabled: false,
+        immutable: false,
+        ...a,
+      }
+    }, string)
+  }
+  static number<Required extends RequiredDefault<number>>(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    required: Required
+    min?: number | null
+    max?: number | null
+    /** Default = '1' */
+    step?: number | null
+    integer: boolean
+    units?: string | null
+    placeholder?: string | null
+    /**  Immutable means it can only be configed at the first config then never again 
+    Default is false */
+    immutable?: boolean
+  }) {
+    return new Value<AsRequired<number, Required>, never>(
+      () => ({
+        type: "number" as const,
+        description: null,
+        warning: null,
+        min: null,
+        max: null,
+        step: null,
+        units: null,
+        placeholder: null,
+        disabled: false,
+        immutable: a.immutable ?? false,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }),
+      asRequiredParser(number, a),
+    )
+  }
+  static dynamicNumber<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        required: RequiredDefault<number>
+        min?: number | null
+        max?: number | null
+        /** Default = '1' */
+        step?: number | null
+        integer: boolean
+        units?: string | null
+        placeholder?: string | null
+        disabled?: false | string
+      }
+    >,
+  ) {
+    return new Value<number | null | undefined, Store>(async (options) => {
+      const a = await getA(options)
+      return {
+        type: "number" as const,
+        description: null,
+        warning: null,
+        min: null,
+        max: null,
+        step: null,
+        units: null,
+        placeholder: null,
+        disabled: false,
+        immutable: false,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }
+    }, number.optional())
+  }
+  static color<Required extends RequiredDefault<string>>(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    required: Required
+    /**  Immutable means it can only be configed at the first config then never again 
+    Default is false */
+    immutable?: boolean
+  }) {
+    return new Value<AsRequired<string, Required>, never>(
+      () => ({
+        type: "color" as const,
+        description: null,
+        warning: null,
+        disabled: false,
+        immutable: a.immutable ?? false,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }),
+
+      asRequiredParser(string, a),
+    )
+  }
+
+  static dynamicColor<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        required: RequiredDefault<string>
+        disabled?: false | string
+      }
+    >,
+  ) {
+    return new Value<string | null | undefined, Store>(async (options) => {
+      const a = await getA(options)
+      return {
+        type: "color" as const,
+        description: null,
+        warning: null,
+        disabled: false,
+        immutable: false,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }
+    }, string.optional())
+  }
+  static datetime<Required extends RequiredDefault<string>>(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    required: Required
+    /** Default = 'datetime-local' */
+    inputmode?: ValueSpecDatetime["inputmode"]
+    min?: string | null
+    max?: string | null
+    /**  Immutable means it can only be configed at the first config then never again 
+    Default is false */
+    immutable?: boolean
+  }) {
+    return new Value<AsRequired<string, Required>, never>(
+      () => ({
+        type: "datetime" as const,
+        description: null,
+        warning: null,
+        inputmode: "datetime-local",
+        min: null,
+        max: null,
+        step: null,
+        disabled: false,
+        immutable: a.immutable ?? false,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }),
+      asRequiredParser(string, a),
+    )
+  }
+  static dynamicDatetime<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        required: RequiredDefault<string>
+        /** Default = 'datetime-local' */
+        inputmode?: ValueSpecDatetime["inputmode"]
+        min?: string | null
+        max?: string | null
+        disabled?: false | string
+      }
+    >,
+  ) {
+    return new Value<string | null | undefined, Store>(async (options) => {
+      const a = await getA(options)
+      return {
+        type: "datetime" as const,
+        description: null,
+        warning: null,
+        inputmode: "datetime-local",
+        min: null,
+        max: null,
+        disabled: false,
+        immutable: false,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }
+    }, string.optional())
+  }
+  static select<
+    Required extends RequiredDefault<string>,
+    B extends Record<string, string>,
+  >(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    required: Required
+    values: B
+    /**
+     * Disabled:  false means that there is nothing disabled, good to modify
+     *           string means that this is the message displayed and the whole thing is disabled
+     *           string[] means that the options are disabled
+     */
+    disabled?: false | string | (string & keyof B)[]
+    /**  Immutable means it can only be configed at the first config then never again 
+    Default is false */
+    immutable?: boolean
+  }) {
+    return new Value<AsRequired<keyof B, Required>, never>(
+      () => ({
+        description: null,
+        warning: null,
+        type: "select" as const,
+        disabled: false,
+        immutable: a.immutable ?? false,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }),
+      asRequiredParser(
+        anyOf(
+          ...Object.keys(a.values).map((x: keyof B & string) => literal(x)),
+        ),
+        a,
+      ) as any,
+    )
+  }
+  static dynamicSelect<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        required: RequiredDefault<string>
+        values: Record<string, string>
+        /**
+         * Disabled:  false means that there is nothing disabled, good to modify
+         *           string means that this is the message displayed and the whole thing is disabled
+         *           string[] means that the options are disabled
+         */
+        disabled?: false | string | string[]
+      }
+    >,
+  ) {
+    return new Value<string | null | undefined, Store>(async (options) => {
+      const a = await getA(options)
+      return {
+        description: null,
+        warning: null,
+        type: "select" as const,
+        disabled: false,
+        immutable: false,
+        ...a,
+        ...requiredLikeToAbove(a.required),
+      }
+    }, string.optional())
+  }
+  static multiselect<Values extends Record<string, string>>(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    default: string[]
+    values: Values
+    minLength?: number | null
+    maxLength?: number | null
+    /**  Immutable means it can only be configed at the first config then never again 
+    Default is false */
+    immutable?: boolean
+    /**
+     * Disabled:  false means that there is nothing disabled, good to modify
+     *           string means that this is the message displayed and the whole thing is disabled
+     *           string[] means that the options are disabled
+     */
+    disabled?: false | string | (string & keyof Values)[]
+  }) {
+    return new Value<(keyof Values)[], never>(
+      () => ({
+        type: "multiselect" as const,
+        minLength: null,
+        maxLength: null,
+        warning: null,
+        description: null,
+        disabled: false,
+        immutable: a.immutable ?? false,
+        ...a,
+      }),
+      arrayOf(
+        literals(...(Object.keys(a.values) as any as [keyof Values & string])),
+      ),
+    )
+  }
+  static dynamicMultiselect<Store = never>(
+    getA: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        default: string[]
+        values: Record<string, string>
+        minLength?: number | null
+        maxLength?: number | null
+        /**
+         * Disabled:  false means that there is nothing disabled, good to modify
+         *           string means that this is the message displayed and the whole thing is disabled
+         *           string[] means that the options are disabled
+         */
+        disabled?: false | string | string[]
+      }
+    >,
+  ) {
+    return new Value<string[], Store>(async (options) => {
+      const a = await getA(options)
+      return {
+        type: "multiselect" as const,
+        minLength: null,
+        maxLength: null,
+        warning: null,
+        description: null,
+        disabled: false,
+        immutable: false,
+        ...a,
+      }
+    }, arrayOf(string))
+  }
+  static object<Type extends Record<string, any>, Store>(
+    a: {
+      name: string
+      description?: string | null
+      warning?: string | null
+    },
+    spec: Config<Type, Store>,
+  ) {
+    return new Value<Type, Store>(async (options) => {
+      const built = await spec.build(options as any)
+      return {
+        type: "object" as const,
+        description: null,
+        warning: null,
+        ...a,
+        spec: built,
+      }
+    }, spec.validator)
+  }
+  static file<Required extends RequiredDefault<string>, Store>(a: {
+    name: string
+    description?: string | null
+    warning?: string | null
+    extensions: string[]
+    required: Required
+  }) {
+    const buildValue = {
+      type: "file" as const,
+      description: null,
+      warning: null,
+      ...a,
+    }
+    return new Value<AsRequired<FilePath, Required>, Store>(
+      () => ({
+        ...buildValue,
+
+        ...requiredLikeToAbove(a.required),
+      }),
+      asRequiredParser(object({ filePath: string }), a),
+    )
+  }
+  static dynamicFile<Required extends boolean, Store>(
+    a: LazyBuild<
+      Store,
+      {
+        name: string
+        description?: string | null
+        warning?: string | null
+        extensions: string[]
+        required: Required
+      }
+    >,
+  ) {
+    return new Value<string | null | undefined, Store>(
+      async (options) => ({
+        type: "file" as const,
+        description: null,
+        warning: null,
+        ...(await a(options)),
+      }),
+      string.optional(),
+    )
+  }
+  static union<Required extends RequiredDefault<string>, Type, Store>(
+    a: {
+      name: string
+      description?: string | null
+      warning?: string | null
+      required: Required
+      /**  Immutable means it can only be configed at the first config then never again 
+      Default is false */
+      immutable?: boolean
+      /**
+       * Disabled:  false means that there is nothing disabled, good to modify
+       *           string means that this is the message displayed and the whole thing is disabled
+       *           string[] means that the options are disabled
+       */
+      disabled?: false | string | string[]
+    },
+    aVariants: Variants<Type, Store>,
+  ) {
+    return new Value<AsRequired<Type, Required>, Store>(
+      async (options) => ({
+        type: "union" as const,
+        description: null,
+        warning: null,
+        disabled: false,
+        ...a,
+        variants: await aVariants.build(options as any),
+        ...requiredLikeToAbove(a.required),
+        immutable: a.immutable ?? false,
+      }),
+      asRequiredParser(aVariants.validator, a),
+    )
+  }
+  static filteredUnion<
+    Required extends RequiredDefault<string>,
+    Type extends Record<string, any>,
+    Store = never,
+  >(
+    getDisabledFn: LazyBuild<Store, string[] | false | string>,
+    a: {
+      name: string
+      description?: string | null
+      warning?: string | null
+      required: Required
+    },
+    aVariants: Variants<Type, Store> | Variants<Type, never>,
+  ) {
+    return new Value<AsRequired<Type, Required>, Store>(
+      async (options) => ({
+        type: "union" as const,
+        description: null,
+        warning: null,
+        ...a,
+        variants: await aVariants.build(options as any),
+        ...requiredLikeToAbove(a.required),
+        disabled: (await getDisabledFn(options)) || false,
+        immutable: false,
+      }),
+      asRequiredParser(aVariants.validator, a),
+    )
+  }
+  static dynamicUnion<
+    Required extends RequiredDefault<string>,
+    Type extends Record<string, any>,
+    Store = never,
+  >(
+    getA: LazyBuild<
+      Store,
+      {
+        disabled: string[] | false | string
+        name: string
+        description?: string | null
+        warning?: string | null
+        required: Required
+      }
+    >,
+    aVariants: Variants<Type, Store> | Variants<Type, never>,
+  ) {
+    return new Value<Type | null | undefined, Store>(async (options) => {
+      const newValues = await getA(options)
+      return {
+        type: "union" as const,
+        description: null,
+        warning: null,
+        ...newValues,
+        variants: await aVariants.build(options as any),
+        ...requiredLikeToAbove(newValues.required),
+        immutable: false,
+      }
+    }, aVariants.validator.optional())
+  }
+
+  static list<Type, Store>(a: List<Type, Store>) {
+    return new Value<Type, Store>((options) => a.build(options), a.validator)
+  }
+
+  /**
+   * Use this during the times that the input needs a more specific type.
+   * Used in types that the value/ variant/ list/ config is constructed somewhere else.
+  ```ts
+  const a = Config.text({
+    name: "a",
+    required: false,
+  })
+
+  return Config.of<Store>()({
+    myValue: a.withStore(),
+  })
+  ```
+   */
+  withStore<NewStore extends Store extends never ? any : Store>() {
+    return this as any as Value<Type, NewStore>
+  }
+}
diff --git a/sdk/lib/config/builder/variants.ts b/sdk/lib/config/builder/variants.ts
new file mode 100644
index 000000000..1e7a2a384
--- /dev/null
+++ b/sdk/lib/config/builder/variants.ts
@@ -0,0 +1,120 @@
+import { InputSpec, ValueSpecUnion } from "../configTypes"
+import { LazyBuild, Config } from "./config"
+import { Parser, anyOf, literals, object } from "ts-matches"
+
+/**
+ * Used in the the Value.select { @link './value.ts' }
+ * to indicate the type of select variants that are available. The key for the record passed in will be the
+ * key to the tag.id in the Value.select
+```ts
+ 
+export const disabled = Config.of({});
+export const size = Value.number({
+  name: "Max Chain Size",
+  default: 550,
+  description: "Limit of blockchain size on disk.",
+  warning: "Increasing this value will require re-syncing your node.",
+  required: true,
+  range: "[550,1000000)",
+  integral: true,
+  units: "MiB",
+  placeholder: null,
+});
+export const automatic = Config.of({ size: size });
+export const size1 = Value.number({
+  name: "Failsafe Chain Size",
+  default: 65536,
+  description: "Prune blockchain if size expands beyond this.",
+  warning: null,
+  required: true,
+  range: "[550,1000000)",
+  integral: true,
+  units: "MiB",
+  placeholder: null,
+});
+export const manual = Config.of({ size: size1 });
+export const pruningSettingsVariants = Variants.of({
+  disabled: { name: "Disabled", spec: disabled },
+  automatic: { name: "Automatic", spec: automatic },
+  manual: { name: "Manual", spec: manual },
+});
+export const pruning = Value.union(
+  {
+    name: "Pruning Settings",
+    description:
+      '- Disabled: Disable pruning\n- Automatic: Limit blockchain size on disk to a certain number of megabytes\n- Manual: Prune blockchain with the "pruneblockchain" RPC\n',
+    warning: null,
+    required: true,
+    default: "disabled",
+  },
+  pruningSettingsVariants
+);
+```
+ */
+export class Variants<Type, Store> {
+  static text: any
+  private constructor(
+    public build: LazyBuild<Store, ValueSpecUnion["variants"]>,
+    public validator: Parser<unknown, Type>,
+  ) {}
+  static of<
+    VariantValues extends {
+      [K in string]: {
+        name: string
+        spec: Config<any, Store> | Config<any, never>
+      }
+    },
+    Store = never,
+  >(a: VariantValues) {
+    const validator = anyOf(
+      ...Object.entries(a).map(([name, { spec }]) =>
+        object({
+          unionSelectKey: literals(name),
+          unionValueKey: spec.validator,
+        }),
+      ),
+    ) as Parser<unknown, any>
+
+    return new Variants<
+      {
+        [K in keyof VariantValues]: {
+          unionSelectKey: K
+          // prettier-ignore
+          unionValueKey: 
+            VariantValues[K]["spec"] extends (Config<infer B, Store> | Config<infer B, never>) ? B :
+            never
+        }
+      }[keyof VariantValues],
+      Store
+    >(async (options) => {
+      const variants = {} as {
+        [K in keyof VariantValues]: { name: string; spec: InputSpec }
+      }
+      for (const key in a) {
+        const value = a[key]
+        variants[key] = {
+          name: value.name,
+          spec: await value.spec.build(options as any),
+        }
+      }
+      return variants
+    }, validator)
+  }
+  /**
+   * Use this during the times that the input needs a more specific type.
+   * Used in types that the value/ variant/ list/ config is constructed somewhere else.
+  ```ts
+  const a = Config.text({
+    name: "a",
+    required: false,
+  })
+
+  return Config.of<Store>()({
+    myValue: a.withStore(),
+  })
+  ```
+   */
+  withStore<NewStore extends Store extends never ? any : Store>() {
+    return this as any as Variants<Type, NewStore>
+  }
+}
diff --git a/sdk/lib/config/configConstants.ts b/sdk/lib/config/configConstants.ts
new file mode 100644
index 000000000..13cfe32b9
--- /dev/null
+++ b/sdk/lib/config/configConstants.ts
@@ -0,0 +1,80 @@
+import { SmtpValue } from "../types"
+import { email } from "../util/patterns"
+import { Config, ConfigSpecOf } from "./builder/config"
+import { Value } from "./builder/value"
+import { Variants } from "./builder/variants"
+
+/**
+ * Base SMTP settings, to be used by StartOS for system wide SMTP
+ */
+export const customSmtp = Config.of<ConfigSpecOf<SmtpValue>, never>({
+  server: Value.text({
+    name: "SMTP Server",
+    required: {
+      default: null,
+    },
+  }),
+  port: Value.number({
+    name: "Port",
+    required: { default: 587 },
+    min: 1,
+    max: 65535,
+    integer: true,
+  }),
+  from: Value.text({
+    name: "From Address",
+    required: {
+      default: null,
+    },
+    placeholder: "<name>test@example.com",
+    inputmode: "email",
+    patterns: [email],
+  }),
+  login: Value.text({
+    name: "Login",
+    required: {
+      default: null,
+    },
+  }),
+  password: Value.text({
+    name: "Password",
+    required: false,
+    masked: true,
+  }),
+})
+
+/**
+ * For service config. Gives users 3 options for SMTP: (1) disabled, (2) use system SMTP settings, (3) use custom SMTP settings
+ */
+export const smtpConfig = Value.filteredUnion(
+  async ({ effects, utils }) => {
+    const smtp = await utils.getSystemSmtp().once()
+    return smtp ? [] : ["system"]
+  },
+  {
+    name: "SMTP",
+    description: "Optionally provide an SMTP server for sending emails",
+    required: { default: "disabled" },
+  },
+  Variants.of({
+    disabled: { name: "Disabled", spec: Config.of({}) },
+    system: {
+      name: "System Credentials",
+      spec: Config.of({
+        customFrom: Value.text({
+          name: "Custom From Address",
+          description:
+            "A custom from address for this service. If not provided, the system from address will be used.",
+          required: false,
+          placeholder: "<name>test@example.com",
+          inputmode: "email",
+          patterns: [email],
+        }),
+      }),
+    },
+    custom: {
+      name: "Custom Credentials",
+      spec: customSmtp,
+    },
+  }),
+)
diff --git a/sdk/lib/config/configDependencies.ts b/sdk/lib/config/configDependencies.ts
new file mode 100644
index 000000000..6b31abc81
--- /dev/null
+++ b/sdk/lib/config/configDependencies.ts
@@ -0,0 +1,25 @@
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Dependency } from "../types"
+
+export type ConfigDependencies<T extends SDKManifest> = {
+  exists(id: keyof T["dependencies"]): Dependency
+  running(id: keyof T["dependencies"]): Dependency
+}
+
+export const configDependenciesSet = <
+  T extends SDKManifest,
+>(): ConfigDependencies<T> => ({
+  exists(id: keyof T["dependencies"]) {
+    return {
+      id,
+      kind: "exists",
+    } as Dependency
+  },
+
+  running(id: keyof T["dependencies"]) {
+    return {
+      id,
+      kind: "running",
+    } as Dependency
+  },
+})
diff --git a/sdk/lib/config/configTypes.ts b/sdk/lib/config/configTypes.ts
new file mode 100644
index 000000000..14e0e1d1d
--- /dev/null
+++ b/sdk/lib/config/configTypes.ts
@@ -0,0 +1,249 @@
+export type InputSpec = Record<string, ValueSpec>
+export type ValueType =
+  | "text"
+  | "textarea"
+  | "number"
+  | "color"
+  | "datetime"
+  | "toggle"
+  | "select"
+  | "multiselect"
+  | "list"
+  | "object"
+  | "file"
+  | "union"
+export type ValueSpec = ValueSpecOf<ValueType>
+/** core spec types. These types provide the metadata for performing validations */
+// prettier-ignore
+export type ValueSpecOf<T extends ValueType> = T extends "text"
+  ? ValueSpecText
+  : T extends "textarea"
+    ? ValueSpecTextarea
+    : T extends "number"
+      ? ValueSpecNumber
+      : T extends "color"
+        ? ValueSpecColor
+        : T extends "datetime"
+          ? ValueSpecDatetime
+          : T extends "toggle"
+            ? ValueSpecToggle
+            : T extends "select"
+              ? ValueSpecSelect
+              : T extends "multiselect"
+                ? ValueSpecMultiselect
+                : T extends "list"
+                  ? ValueSpecList
+                  : T extends "object"
+                    ? ValueSpecObject
+                    : T extends "file"
+                      ? ValueSpecFile
+                      : T extends "union"
+                        ? ValueSpecUnion
+                        : never
+
+export interface ValueSpecText extends ListValueSpecText, WithStandalone {
+  required: boolean
+  default: DefaultString | null
+  disabled: false | string
+  generate: null | RandomString
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+export interface ValueSpecTextarea extends WithStandalone {
+  type: "textarea"
+  placeholder: string | null
+  minLength: number | null
+  maxLength: number | null
+  required: boolean
+  disabled: false | string
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+
+export type FilePath = {
+  filePath: string
+}
+export interface ValueSpecNumber extends ListValueSpecNumber, WithStandalone {
+  required: boolean
+  default: number | null
+  disabled: false | string
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+export interface ValueSpecColor extends WithStandalone {
+  type: "color"
+  required: boolean
+  default: string | null
+  disabled: false | string
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+export interface ValueSpecDatetime extends WithStandalone {
+  type: "datetime"
+  required: boolean
+  inputmode: "date" | "time" | "datetime-local"
+  min: string | null
+  max: string | null
+  default: string | null
+  disabled: false | string
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+export interface ValueSpecSelect extends SelectBase, WithStandalone {
+  type: "select"
+  required: boolean
+  default: string | null
+  /**
+   * Disabled:  false means that there is nothing disabled, good to modify
+   *           string means that this is the message displayed and the whole thing is disabled
+   *           string[] means that the options are disabled
+   */
+  disabled: false | string | string[]
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+export interface ValueSpecMultiselect extends SelectBase, WithStandalone {
+  type: "multiselect"
+  minLength: number | null
+  maxLength: number | null
+  /**
+   * Disabled:  false means that there is nothing disabled, good to modify
+   *           string means that this is the message displayed and the whole thing is disabled
+   *           string[] means that the options are disabled
+   */
+  disabled: false | string | string[]
+  default: string[]
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+export interface ValueSpecToggle extends WithStandalone {
+  type: "toggle"
+  default: boolean | null
+  disabled: false | string
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+export interface ValueSpecUnion extends WithStandalone {
+  type: "union"
+  variants: Record<
+    string,
+    {
+      name: string
+      spec: InputSpec
+    }
+  >
+  /**
+   * Disabled:  false means that there is nothing disabled, good to modify
+   *           string means that this is the message displayed and the whole thing is disabled
+   *           string[] means that the options are disabled
+   */
+  disabled: false | string | string[]
+  required: boolean
+  default: string | null
+  /** Immutable means it can only be configed at the first config then never again */
+  immutable: boolean
+}
+export interface ValueSpecFile extends WithStandalone {
+  type: "file"
+  extensions: string[]
+  required: boolean
+}
+export interface ValueSpecObject extends WithStandalone {
+  type: "object"
+  spec: InputSpec
+}
+export interface WithStandalone {
+  name: string
+  description: string | null
+  warning: string | null
+}
+export interface SelectBase {
+  values: Record<string, string>
+}
+export type ListValueSpecType = "text" | "number" | "object"
+/** represents a spec for the values of a list */
+export type ListValueSpecOf<T extends ListValueSpecType> = T extends "text"
+  ? ListValueSpecText
+  : T extends "number"
+    ? ListValueSpecNumber
+    : T extends "object"
+      ? ListValueSpecObject
+      : never
+/** represents a spec for a list */
+export type ValueSpecList = ValueSpecListOf<ListValueSpecType>
+export interface ValueSpecListOf<T extends ListValueSpecType>
+  extends WithStandalone {
+  type: "list"
+  spec: ListValueSpecOf<T>
+  minLength: number | null
+  maxLength: number | null
+  disabled: false | string
+  default:
+    | string[]
+    | number[]
+    | DefaultString[]
+    | Record<string, unknown>[]
+    | readonly string[]
+    | readonly number[]
+    | readonly DefaultString[]
+    | readonly Record<string, unknown>[]
+}
+export interface Pattern {
+  regex: string
+  description: string
+}
+export interface ListValueSpecText {
+  type: "text"
+  patterns: Pattern[]
+  minLength: number | null
+  maxLength: number | null
+  masked: boolean
+
+  generate: null | RandomString
+  inputmode: "text" | "email" | "tel" | "url"
+  placeholder: string | null
+}
+export interface ListValueSpecNumber {
+  type: "number"
+  min: number | null
+  max: number | null
+  integer: boolean
+  step: number | null
+  units: string | null
+  placeholder: string | null
+}
+export interface ListValueSpecObject {
+  type: "object"
+  /** this is a mapped type of the config object at this level, replacing the object's values with specs on those values */
+  spec: InputSpec
+  /** indicates whether duplicates can be permitted in the list */
+  uniqueBy: UniqueBy
+  /** this should be a handlebars template which can make use of the entire config which corresponds to 'spec' */
+  displayAs: string | null
+}
+export type UniqueBy =
+  | null
+  | string
+  | {
+      any: readonly UniqueBy[] | UniqueBy[]
+    }
+  | {
+      all: readonly UniqueBy[] | UniqueBy[]
+    }
+export type DefaultString = string | RandomString
+export type RandomString = {
+  charset: string
+  len: number
+}
+// sometimes the type checker needs just a little bit of help
+export function isValueSpecListOf<S extends ListValueSpecType>(
+  t: ValueSpec,
+  s: S,
+): t is ValueSpecListOf<S> & { spec: ListValueSpecOf<S> } {
+  return "spec" in t && t.spec.type === s
+}
+export const unionSelectKey = "unionSelectKey" as const
+export type UnionSelectKey = typeof unionSelectKey
+
+export const unionValueKey = "unionValueKey" as const
+export type UnionValueKey = typeof unionValueKey
diff --git a/sdk/lib/config/index.ts b/sdk/lib/config/index.ts
new file mode 100644
index 000000000..510dc1ca0
--- /dev/null
+++ b/sdk/lib/config/index.ts
@@ -0,0 +1,5 @@
+import "./builder"
+
+import "./setupConfig"
+import "./configDependencies"
+import "./configConstants"
diff --git a/sdk/lib/config/setupConfig.ts b/sdk/lib/config/setupConfig.ts
new file mode 100644
index 000000000..ee693dda2
--- /dev/null
+++ b/sdk/lib/config/setupConfig.ts
@@ -0,0 +1,98 @@
+import { Effects, ExpectedExports } from "../types"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import * as D from "./configDependencies"
+import { Config, ExtractConfigType } from "./builder/config"
+import { Utils, createUtils } from "../util/utils"
+import nullIfEmpty from "../util/nullIfEmpty"
+import { InterfaceReceipt } from "../interfaces/interfaceReceipt"
+import { InterfacesReceipt as InterfacesReceipt } from "../interfaces/setupInterfaces"
+
+declare const dependencyProof: unique symbol
+export type DependenciesReceipt = void & {
+  [dependencyProof]: never
+}
+
+export type Save<
+  Store,
+  A extends
+    | Record<string, any>
+    | Config<Record<string, any>, any>
+    | Config<Record<string, never>, never>,
+  Manifest extends SDKManifest,
+> = (options: {
+  effects: Effects
+  input: ExtractConfigType<A> & Record<string, any>
+  utils: Utils<Manifest, Store>
+  dependencies: D.ConfigDependencies<Manifest>
+}) => Promise<{
+  dependenciesReceipt: DependenciesReceipt
+  interfacesReceipt: InterfacesReceipt
+  restart: boolean
+}>
+export type Read<
+  Manifest extends SDKManifest,
+  Store,
+  A extends
+    | Record<string, any>
+    | Config<Record<string, any>, any>
+    | Config<Record<string, any>, never>,
+> = (options: {
+  effects: Effects
+  utils: Utils<Manifest, Store>
+}) => Promise<void | (ExtractConfigType<A> & Record<string, any>)>
+/**
+ * We want to setup a config export with a get and set, this
+ * is going to be the default helper to setup config, because it will help
+ * enforce that we have a spec, write, and reading.
+ * @param options
+ * @returns
+ */
+export function setupConfig<
+  Store,
+  ConfigType extends
+    | Record<string, any>
+    | Config<any, any>
+    | Config<any, never>,
+  Manifest extends SDKManifest,
+  Type extends Record<string, any> = ExtractConfigType<ConfigType>,
+>(
+  spec: Config<Type, Store> | Config<Type, never>,
+  write: Save<Store, Type, Manifest>,
+  read: Read<Manifest, Store, Type>,
+) {
+  const validator = spec.validator
+  return {
+    setConfig: (async ({ effects, input }) => {
+      if (!validator.test(input)) {
+        await console.error(String(validator.errorMessage(input)))
+        return { error: "Set config type error for config" }
+      }
+      await effects.clearBindings()
+      await effects.clearNetworkInterfaces()
+      const { restart } = await write({
+        input: JSON.parse(JSON.stringify(input)),
+        effects,
+        utils: createUtils(effects),
+        dependencies: D.configDependenciesSet<Manifest>(),
+      })
+      if (restart) {
+        await effects.restart()
+      }
+    }) as ExpectedExports.setConfig,
+    getConfig: (async ({ effects }) => {
+      const myUtils = createUtils<Manifest, Store>(effects)
+      const configValue = nullIfEmpty(
+        (await read({ effects, utils: myUtils })) || null,
+      )
+      return {
+        spec: await spec.build({
+          effects,
+          utils: myUtils as any,
+        }),
+        config: configValue,
+      }
+    }) as ExpectedExports.getConfig,
+  }
+}
+
+export default setupConfig
diff --git a/sdk/lib/dependency/mountDependencies.ts b/sdk/lib/dependency/mountDependencies.ts
new file mode 100644
index 000000000..31f9cdadc
--- /dev/null
+++ b/sdk/lib/dependency/mountDependencies.ts
@@ -0,0 +1,43 @@
+import { Effects } from "../types"
+import { _ } from "../util"
+import {
+  Path,
+  ManifestId,
+  VolumeName,
+  NamedPath,
+  matchPath,
+} from "./setupDependencyMounts"
+
+export type MountDependenciesOut<A> = _<
+  // prettier-ignore
+  A extends Path ? string : A extends Record<string, unknown> ? {
+    [P in keyof A]: MountDependenciesOut<A[P]>;
+  } : never
+>
+export async function mountDependencies<
+  In extends
+    | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
+    | Record<VolumeName, Record<NamedPath, Path>>
+    | Record<NamedPath, Path>
+    | Path,
+>(effects: Effects, value: In): Promise<MountDependenciesOut<In>> {
+  if (matchPath.test(value)) {
+    const mountPath = `${value.manifestId}/${value.volume}/${value.name}`
+
+    return (await effects.mount({
+      location: mountPath,
+      target: {
+        packageId: value.manifestId,
+        path: value.path,
+        readonly: value.readonly,
+        volumeId: value.volume,
+      },
+    })) as MountDependenciesOut<In>
+  }
+  return Object.fromEntries(
+    Object.entries(value).map(([key, value]) => [
+      key,
+      mountDependencies(effects, value),
+    ]),
+  ) as Record<string, unknown> as MountDependenciesOut<In>
+}
diff --git a/sdk/lib/dependency/setupDependencyMounts.ts b/sdk/lib/dependency/setupDependencyMounts.ts
new file mode 100644
index 000000000..15e2ca1a3
--- /dev/null
+++ b/sdk/lib/dependency/setupDependencyMounts.ts
@@ -0,0 +1,72 @@
+import { boolean, object, string } from "ts-matches"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { deepMerge } from "../util/deepMerge"
+
+export type VolumeName = string
+export type NamedPath = string
+export type ManifestId = string
+
+export const matchPath = object({
+  name: string,
+  volume: string,
+  path: string,
+  manifestId: string,
+  readonly: boolean,
+})
+export type Path = typeof matchPath._TYPE
+export type BuildPath<
+  ManifestId extends string,
+  VolumeId extends string,
+  PathName extends string,
+  Value extends Path,
+> = {
+  [PId in ManifestId]: {
+    [V in VolumeId]: {
+      [N in PathName]: Value
+    }
+  }
+}
+class SetupDependencyMounts<Building> {
+  private constructor(readonly building: Building) {}
+
+  static of() {
+    return new SetupDependencyMounts({})
+  }
+
+  addPath<
+    Name extends string,
+    Volume extends M["volumes"][0] & string,
+    Path extends string,
+    ManifestId extends M["id"],
+    M extends SDKManifest,
+  >(addPath: {
+    name: Name
+    volume: Volume
+    path: Path
+    manifest: M
+    readonly: boolean
+  }) {
+    const { manifest, ...restPath } = addPath
+    const newPath = {
+      ...restPath,
+      manifestId: manifest.id as ManifestId,
+    } as const
+    type NewBuilding = Building &
+      BuildPath<ManifestId, Volume, Name, typeof newPath>
+    const building = deepMerge(this.building, {
+      [newPath.manifestId]: {
+        [newPath.volume]: {
+          [newPath.name]: newPath,
+        },
+      },
+    }) as NewBuilding
+    return new SetupDependencyMounts(building)
+  }
+  build() {
+    return this.building
+  }
+}
+
+export function setupDependencyMounts() {
+  return SetupDependencyMounts.of()
+}
diff --git a/sdk/lib/dependencyConfig/DependencyConfig.ts b/sdk/lib/dependencyConfig/DependencyConfig.ts
new file mode 100644
index 000000000..10dcb4bd8
--- /dev/null
+++ b/sdk/lib/dependencyConfig/DependencyConfig.ts
@@ -0,0 +1,47 @@
+import {
+  DependencyConfig as DependencyConfigType,
+  DeepPartial,
+  Effects,
+} from "../types"
+import { Utils, createUtils } from "../util/utils"
+import { deepEqual } from "../util/deepEqual"
+import { deepMerge } from "../util/deepMerge"
+import { SDKManifest } from "../manifest/ManifestTypes"
+
+export type Update<QueryResults, RemoteConfig> = (options: {
+  remoteConfig: RemoteConfig
+  queryResults: QueryResults
+}) => Promise<RemoteConfig>
+
+export class DependencyConfig<
+  Manifest extends SDKManifest,
+  Store,
+  Input extends Record<string, any>,
+  RemoteConfig extends Record<string, any>,
+> {
+  static defaultUpdate = async (options: {
+    queryResults: unknown
+    remoteConfig: unknown
+  }): Promise<unknown> => {
+    return deepMerge({}, options.remoteConfig, options.queryResults || {})
+  }
+  constructor(
+    readonly dependencyConfig: (options: {
+      effects: Effects
+      localConfig: Input
+      utils: Utils<Manifest, Store>
+    }) => Promise<void | DeepPartial<RemoteConfig>>,
+    readonly update: Update<
+      void | DeepPartial<RemoteConfig>,
+      RemoteConfig
+    > = DependencyConfig.defaultUpdate as any,
+  ) {}
+
+  async query(options: { effects: Effects; localConfig: unknown }) {
+    return this.dependencyConfig({
+      localConfig: options.localConfig as Input,
+      effects: options.effects,
+      utils: createUtils<Manifest, Store>(options.effects),
+    })
+  }
+}
diff --git a/sdk/lib/dependencyConfig/index.ts b/sdk/lib/dependencyConfig/index.ts
new file mode 100644
index 000000000..3fe78b4f3
--- /dev/null
+++ b/sdk/lib/dependencyConfig/index.ts
@@ -0,0 +1,9 @@
+// prettier-ignore
+export type ReadonlyDeep<A> = 
+    A extends Function ? A :
+    A extends {} ? { readonly [K in keyof A]: ReadonlyDeep<A[K]> } : A;
+export type MaybePromise<A> = Promise<A> | A
+export type Message = string
+
+import "./DependencyConfig"
+import "./setupDependencyConfig"
diff --git a/sdk/lib/dependencyConfig/setupDependencyConfig.ts b/sdk/lib/dependencyConfig/setupDependencyConfig.ts
new file mode 100644
index 000000000..3b6776945
--- /dev/null
+++ b/sdk/lib/dependencyConfig/setupDependencyConfig.ts
@@ -0,0 +1,22 @@
+import { Config } from "../config/builder/config"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { ExpectedExports } from "../types"
+import { DependencyConfig } from "./DependencyConfig"
+
+export function setupDependencyConfig<
+  Store,
+  Input extends Record<string, any>,
+  Manifest extends SDKManifest,
+>(
+  _config: Config<Input, Store> | Config<Input, never>,
+  autoConfigs: {
+    [key in keyof Manifest["dependencies"] & string]: DependencyConfig<
+      Manifest,
+      Store,
+      Input,
+      any
+    >
+  },
+): ExpectedExports.dependencyConfig {
+  return autoConfigs
+}
diff --git a/sdk/lib/emverLite/mod.ts b/sdk/lib/emverLite/mod.ts
new file mode 100644
index 000000000..f672613aa
--- /dev/null
+++ b/sdk/lib/emverLite/mod.ts
@@ -0,0 +1,307 @@
+import * as matches from "ts-matches"
+
+const starSub = /((\d+\.)*\d+)\.\*/
+// prettier-ignore
+export type ValidEmVer = `${number}${`.${number}` | ""}${`.${number}` | ""}${`-${string}` | ""}`;
+// prettier-ignore
+export type ValidEmVerRange = `${'>=' | '<='| '<' | '>' | ''}${'^' | '~' | ''}${number | '*'}${`.${number | '*'}` | ""}${`.${number | '*'}` | ""}${`-${string}` | ""}`;
+
+function incrementLastNumber(list: number[]) {
+  const newList = [...list]
+  newList[newList.length - 1]++
+  return newList
+}
+/**
+ * Will take in a range, like `>1.2` or `<1.2.3.4` or `=1.2` or `1.*`
+ * and return a checker, that has the check function for checking that a version is in the valid
+ * @param range
+ * @returns
+ */
+export function rangeOf(range: string | Checker): Checker {
+  return Checker.parse(range)
+}
+
+/**
+ * Used to create a checker that will `and` all the ranges passed in
+ * @param ranges
+ * @returns
+ */
+export function rangeAnd(...ranges: (string | Checker)[]): Checker {
+  if (ranges.length === 0) {
+    throw new Error("No ranges given")
+  }
+  const [firstCheck, ...rest] = ranges
+  return Checker.parse(firstCheck).and(...rest)
+}
+
+/**
+ * Used to create a checker that will `or` all the ranges passed in
+ * @param ranges
+ * @returns
+ */
+export function rangeOr(...ranges: (string | Checker)[]): Checker {
+  if (ranges.length === 0) {
+    throw new Error("No ranges given")
+  }
+  const [firstCheck, ...rest] = ranges
+  return Checker.parse(firstCheck).or(...rest)
+}
+
+/**
+ * This will negate the checker, so given a checker that checks for >= 1.0.0, it will check for < 1.0.0
+ * @param range
+ * @returns
+ */
+export function notRange(range: string | Checker): Checker {
+  return rangeOf(range).not()
+}
+
+/**
+ * EmVer is a set of versioning of any pattern like 1 or 1.2 or 1.2.3 or 1.2.3.4 or ..
+ */
+export class EmVer {
+  /**
+   * Convert the range, should be 1.2.* or * into a emver
+   * Or an already made emver
+   * IsUnsafe
+   */
+  static from(range: string | EmVer): EmVer {
+    if (range instanceof EmVer) {
+      return range
+    }
+    return EmVer.parse(range)
+  }
+  /**
+   * Convert the range, should be 1.2.* or * into a emver
+   * IsUnsafe
+   */
+  static parse(rangeExtra: string): EmVer {
+    const [range, extra] = rangeExtra.split("-")
+    const values = range.split(".").map((x) => parseInt(x))
+    for (const value of values) {
+      if (isNaN(value)) {
+        throw new Error(`Couldn't parse range: ${range}`)
+      }
+    }
+    return new EmVer(values, extra)
+  }
+  private constructor(
+    public readonly values: number[],
+    readonly extra: string | null,
+  ) {}
+
+  /**
+   * Used when we need a new emver that has the last number incremented, used in the 1.* like things
+   */
+  public withLastIncremented() {
+    return new EmVer(incrementLastNumber(this.values), null)
+  }
+
+  public greaterThan(other: EmVer): boolean {
+    for (const i in this.values) {
+      if (other.values[i] == null) {
+        return true
+      }
+      if (this.values[i] > other.values[i]) {
+        return true
+      }
+
+      if (this.values[i] < other.values[i]) {
+        return false
+      }
+    }
+    return false
+  }
+
+  public equals(other: EmVer): boolean {
+    if (other.values.length !== this.values.length) {
+      return false
+    }
+    for (const i in this.values) {
+      if (this.values[i] !== other.values[i]) {
+        return false
+      }
+    }
+    return true
+  }
+  public greaterThanOrEqual(other: EmVer): boolean {
+    return this.greaterThan(other) || this.equals(other)
+  }
+  public lessThanOrEqual(other: EmVer): boolean {
+    return !this.greaterThan(other)
+  }
+  public lessThan(other: EmVer): boolean {
+    return !this.greaterThanOrEqual(other)
+  }
+  /**
+   * Return a enum string that describes (used for switching/iffs)
+   * to know comparison
+   * @param other
+   * @returns
+   */
+  public compare(other: EmVer) {
+    if (this.equals(other)) {
+      return "equal" as const
+    } else if (this.greaterThan(other)) {
+      return "greater" as const
+    } else {
+      return "less" as const
+    }
+  }
+  /**
+   * Used when sorting emver's in a list using the sort method
+   * @param other
+   * @returns
+   */
+  public compareForSort(other: EmVer) {
+    return matches
+      .matches(this.compare(other))
+      .when("equal", () => 0 as const)
+      .when("greater", () => 1 as const)
+      .when("less", () => -1 as const)
+      .unwrap()
+  }
+
+  toString() {
+    return `${this.values.join(".")}${this.extra ? `-${this.extra}` : ""}`
+  }
+}
+
+/**
+ * A checker is a function that takes a version and returns true if the version matches the checker.
+ * Used when we are doing range checking, like saying ">=1.0.0".check("1.2.3") will be true
+ */
+export class Checker {
+  /**
+   * Will take in a range, like `>1.2` or `<1.2.3.4` or `=1.2` or `1.*`
+   * and return a checker, that has the check function for checking that a version is in the valid
+   * @param range
+   * @returns
+   */
+  static parse(range: string | Checker): Checker {
+    if (range instanceof Checker) {
+      return range
+    }
+    range = range.trim()
+    if (range.indexOf("||") !== -1) {
+      return rangeOr(...range.split("||").map((x) => Checker.parse(x)))
+    }
+    if (range.indexOf("&&") !== -1) {
+      return rangeAnd(...range.split("&&").map((x) => Checker.parse(x)))
+    }
+    if (range === "*") {
+      return new Checker((version) => {
+        EmVer.from(version)
+        return true
+      })
+    }
+    if (range.startsWith("!")) {
+      return Checker.parse(range.substring(1)).not()
+    }
+    const starSubMatches = starSub.exec(range)
+    if (starSubMatches != null) {
+      const emVarLower = EmVer.parse(starSubMatches[1])
+      const emVarUpper = emVarLower.withLastIncremented()
+
+      return new Checker((version) => {
+        const v = EmVer.from(version)
+        return (
+          (v.greaterThan(emVarLower) || v.equals(emVarLower)) &&
+          !v.greaterThan(emVarUpper) &&
+          !v.equals(emVarUpper)
+        )
+      })
+    }
+
+    switch (range.substring(0, 2)) {
+      case ">=": {
+        const emVar = EmVer.parse(range.substring(2))
+        return new Checker((version) => {
+          const v = EmVer.from(version)
+          return v.greaterThanOrEqual(emVar)
+        })
+      }
+      case "<=": {
+        const emVar = EmVer.parse(range.substring(2))
+        return new Checker((version) => {
+          const v = EmVer.from(version)
+          return v.lessThanOrEqual(emVar)
+        })
+      }
+    }
+
+    switch (range.substring(0, 1)) {
+      case ">": {
+        const emVar = EmVer.parse(range.substring(1))
+        return new Checker((version) => {
+          const v = EmVer.from(version)
+          return v.greaterThan(emVar)
+        })
+      }
+      case "<": {
+        const emVar = EmVer.parse(range.substring(1))
+        return new Checker((version) => {
+          const v = EmVer.from(version)
+          return v.lessThan(emVar)
+        })
+      }
+      case "=": {
+        const emVar = EmVer.parse(range.substring(1))
+        return new Checker((version) => {
+          const v = EmVer.from(version)
+          return v.equals(emVar)
+        })
+      }
+    }
+    throw new Error("Couldn't parse range: " + range)
+  }
+  constructor(
+    /**
+     * Check is the function that will be given a emver or unparsed emver and should give if it follows
+     * a pattern
+     */
+    public readonly check: (value: ValidEmVer | EmVer) => boolean,
+  ) {}
+
+  /**
+   * Used when we want the `and` condition with another checker
+   */
+  public and(...others: (Checker | string)[]): Checker {
+    return new Checker((value) => {
+      if (!this.check(value)) {
+        return false
+      }
+      for (const other of others) {
+        if (!Checker.parse(other).check(value)) {
+          return false
+        }
+      }
+      return true
+    })
+  }
+
+  /**
+   * Used when we want the `or` condition with another checker
+   */
+  public or(...others: (Checker | string)[]): Checker {
+    return new Checker((value) => {
+      if (this.check(value)) {
+        return true
+      }
+      for (const other of others) {
+        if (Checker.parse(other).check(value)) {
+          return true
+        }
+      }
+      return false
+    })
+  }
+
+  /**
+   * A useful example is making sure we don't match an exact version, like !=1.2.3
+   * @returns
+   */
+  public not(): Checker {
+    return new Checker((value) => !this.check(value))
+  }
+}
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
new file mode 100644
index 000000000..8f0bcf81e
--- /dev/null
+++ b/sdk/lib/health/HealthCheck.ts
@@ -0,0 +1,65 @@
+import { InterfaceReceipt } from "../interfaces/interfaceReceipt"
+import { Daemon, Effects } from "../types"
+import { CheckResult } from "./checkFns/CheckResult"
+import { HealthReceipt } from "./HealthReceipt"
+import { Trigger } from "../trigger"
+import { TriggerInput } from "../trigger/TriggerInput"
+import { defaultTrigger } from "../trigger/defaultTrigger"
+import { once } from "../util/once"
+
+export function healthCheck(o: {
+  effects: Effects
+  name: string
+  trigger?: Trigger
+  fn(): Promise<CheckResult> | CheckResult
+  onFirstSuccess?: () => unknown | Promise<unknown>
+}) {
+  new Promise(async () => {
+    let currentValue: TriggerInput = {
+      hadSuccess: false,
+    }
+    const getCurrentValue = () => currentValue
+    const trigger = (o.trigger ?? defaultTrigger)(getCurrentValue)
+    const triggerFirstSuccess = once(() =>
+      Promise.resolve(
+        "onFirstSuccess" in o && o.onFirstSuccess
+          ? o.onFirstSuccess()
+          : undefined,
+      ),
+    )
+    for (
+      let res = await trigger.next();
+      !res.done;
+      res = await trigger.next()
+    ) {
+      try {
+        const { status, message } = await o.fn()
+        await o.effects.setHealth({
+          name: o.name,
+          status,
+          message,
+        })
+        currentValue.hadSuccess = true
+        currentValue.lastResult = "passing"
+        await triggerFirstSuccess().catch((err) => {
+          console.error(err)
+        })
+      } catch (e) {
+        await o.effects.setHealth({
+          name: o.name,
+          status: "failing",
+          message: asMessage(e),
+        })
+        currentValue.lastResult = "failing"
+      }
+    }
+  })
+  return {} as HealthReceipt
+}
+function asMessage(e: unknown) {
+  if (typeof e === "object" && e != null && "message" in e)
+    return String(e.message)
+  const value = String(e)
+  if (value.length == null) return undefined
+  return value
+}
diff --git a/sdk/lib/health/HealthReceipt.ts b/sdk/lib/health/HealthReceipt.ts
new file mode 100644
index 000000000..a0995ba0a
--- /dev/null
+++ b/sdk/lib/health/HealthReceipt.ts
@@ -0,0 +1,4 @@
+declare const HealthProof: unique symbol
+export type HealthReceipt = {
+  [HealthProof]: never
+}
diff --git a/sdk/lib/health/checkFns/CheckResult.ts b/sdk/lib/health/checkFns/CheckResult.ts
new file mode 100644
index 000000000..1b2f54f39
--- /dev/null
+++ b/sdk/lib/health/checkFns/CheckResult.ts
@@ -0,0 +1,6 @@
+import { HealthStatus } from "../../types"
+
+export type CheckResult = {
+  status: HealthStatus
+  message?: string
+}
diff --git a/sdk/lib/health/checkFns/checkPortListening.ts b/sdk/lib/health/checkFns/checkPortListening.ts
new file mode 100644
index 000000000..07144071b
--- /dev/null
+++ b/sdk/lib/health/checkFns/checkPortListening.ts
@@ -0,0 +1,67 @@
+import { Effects } from "../../types"
+import { createUtils } from "../../util"
+import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
+import { CheckResult } from "./CheckResult"
+export function containsAddress(x: string, port: number) {
+  const readPorts = x
+    .split("\n")
+    .filter(Boolean)
+    .splice(1)
+    .map((x) => x.split(" ").filter(Boolean)[1]?.split(":")?.[1])
+    .filter(Boolean)
+    .map((x) => Number.parseInt(x, 16))
+    .filter(Number.isFinite)
+  return readPorts.indexOf(port) >= 0
+}
+
+/**
+ * This is used to check if a port is listening on the system.
+ * Used during the health check fn or the check main fn.
+ */
+export async function checkPortListening(
+  effects: Effects,
+  port: number,
+  options: {
+    errorMessage: string
+    successMessage: string
+    timeoutMessage?: string
+    timeout?: number
+  },
+): Promise<CheckResult> {
+  const utils = createUtils(effects)
+  return Promise.race<CheckResult>([
+    Promise.resolve().then(async () => {
+      const hasAddress =
+        containsAddress(
+          await utils.childProcess
+            .exec(`cat /proc/net/tcp`, {})
+            .then(stringFromStdErrOut),
+          port,
+        ) ||
+        containsAddress(
+          await utils.childProcess
+            .exec("cat /proc/net/udp", {})
+            .then(stringFromStdErrOut),
+          port,
+        )
+      if (hasAddress) {
+        return { status: "passing", message: options.successMessage }
+      }
+      return {
+        status: "failing",
+        message: options.errorMessage,
+      }
+    }),
+    new Promise((resolve) => {
+      setTimeout(
+        () =>
+          resolve({
+            status: "failing",
+            message:
+              options.timeoutMessage || `Timeout trying to check port ${port}`,
+          }),
+        options.timeout ?? 1_000,
+      )
+    }),
+  ])
+}
diff --git a/sdk/lib/health/checkFns/checkWebUrl.ts b/sdk/lib/health/checkFns/checkWebUrl.ts
new file mode 100644
index 000000000..81da2b425
--- /dev/null
+++ b/sdk/lib/health/checkFns/checkWebUrl.ts
@@ -0,0 +1,32 @@
+import { Effects } from "../../types"
+import { CheckResult } from "./CheckResult"
+import { timeoutPromise } from "./index"
+import "isomorphic-fetch"
+
+/**
+ * This is a helper function to check if a web url is reachable.
+ * @param url
+ * @param createSuccess
+ * @returns
+ */
+export const checkWebUrl = async (
+  effects: Effects,
+  url: string,
+  {
+    timeout = 1000,
+    successMessage = `Reached ${url}`,
+    errorMessage = `Error while fetching URL: ${url}`,
+  } = {},
+): Promise<CheckResult> => {
+  return Promise.race([fetch(url), timeoutPromise(timeout)])
+    .then((x) => ({
+      status: "passing" as const,
+      message: successMessage,
+    }))
+    .catch((e) => {
+      console.warn(`Error while fetching URL: ${url}`)
+      console.error(JSON.stringify(e))
+      console.error(e.toString())
+      return { status: "failing" as const, message: errorMessage }
+    })
+}
diff --git a/sdk/lib/health/checkFns/index.ts b/sdk/lib/health/checkFns/index.ts
new file mode 100644
index 000000000..d33d5ad0d
--- /dev/null
+++ b/sdk/lib/health/checkFns/index.ts
@@ -0,0 +1,11 @@
+import { runHealthScript } from "./runHealthScript"
+export { checkPortListening } from "./checkPortListening"
+export { CheckResult } from "./CheckResult"
+export { checkWebUrl } from "./checkWebUrl"
+
+export function timeoutPromise(ms: number, { message = "Timed out" } = {}) {
+  return new Promise<never>((resolve, reject) =>
+    setTimeout(() => reject(new Error(message)), ms),
+  )
+}
+export { runHealthScript }
diff --git a/sdk/lib/health/checkFns/runHealthScript.ts b/sdk/lib/health/checkFns/runHealthScript.ts
new file mode 100644
index 000000000..4bc4556e9
--- /dev/null
+++ b/sdk/lib/health/checkFns/runHealthScript.ts
@@ -0,0 +1,38 @@
+import { CommandType, Effects } from "../../types"
+import { createUtils } from "../../util"
+import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
+import { CheckResult } from "./CheckResult"
+import { timeoutPromise } from "./index"
+
+/**
+ * Running a health script, is used when we want to have a simple
+ * script in bash or something like that. It should return something that is useful
+ * in {result: string} else it is considered an error
+ * @param param0
+ * @returns
+ */
+export const runHealthScript = async (
+  effects: Effects,
+  runCommand: string,
+  {
+    timeout = 30000,
+    errorMessage = `Error while running command: ${runCommand}`,
+    message = (res: string) =>
+      `Have ran script ${runCommand} and the result: ${res}`,
+  } = {},
+): Promise<CheckResult> => {
+  const utils = createUtils(effects)
+  const res = await Promise.race([
+    utils.childProcess.exec(runCommand, { timeout }).then(stringFromStdErrOut),
+    timeoutPromise(timeout),
+  ]).catch((e) => {
+    console.warn(errorMessage)
+    console.warn(JSON.stringify(e))
+    console.warn(e.toString())
+    throw { status: "failing", message: errorMessage } as CheckResult
+  })
+  return {
+    status: "passing",
+    message: message(res),
+  } as CheckResult
+}
diff --git a/sdk/lib/health/index.ts b/sdk/lib/health/index.ts
new file mode 100644
index 000000000..b6e1d26f5
--- /dev/null
+++ b/sdk/lib/health/index.ts
@@ -0,0 +1,3 @@
+import "./checkFns"
+
+import "./HealthReceipt"
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
new file mode 100644
index 000000000..746bc12e9
--- /dev/null
+++ b/sdk/lib/index.ts
@@ -0,0 +1,23 @@
+export { Daemons } from "./mainFn/Daemons"
+export { EmVer } from "./emverLite/mod"
+export { Overlay } from "./util/Overlay"
+export { Utils } from "./util/utils"
+export * as actions from "./actions"
+export * as backup from "./backup"
+export * as config from "./config"
+export * as configBuilder from "./config/builder"
+export * as configTypes from "./config/configTypes"
+export * as dependencyConfig from "./dependencyConfig"
+export * as health from "./health"
+export * as healthFns from "./health/checkFns"
+export * as inits from "./inits"
+export * as mainFn from "./mainFn"
+export * as manifest from "./manifest"
+export * as toml from "@iarna/toml"
+export * as types from "./types"
+export * as util from "./util"
+export * as yaml from "yaml"
+
+export * as matches from "ts-matches"
+export * as YAML from "yaml"
+export * as TOML from "@iarna/toml"
diff --git a/sdk/lib/inits/index.ts b/sdk/lib/inits/index.ts
new file mode 100644
index 000000000..0a326a61e
--- /dev/null
+++ b/sdk/lib/inits/index.ts
@@ -0,0 +1,3 @@
+import "./setupInit"
+import "./setupUninstall"
+import "./setupInstall"
diff --git a/sdk/lib/inits/migrations/Migration.ts b/sdk/lib/inits/migrations/Migration.ts
new file mode 100644
index 000000000..06e8e6e39
--- /dev/null
+++ b/sdk/lib/inits/migrations/Migration.ts
@@ -0,0 +1,48 @@
+import { ManifestVersion, SDKManifest } from "../../manifest/ManifestTypes"
+import { Effects } from "../../types"
+import { Utils } from "../../util/utils"
+
+export class Migration<
+  Manifest extends SDKManifest,
+  Store,
+  Version extends ManifestVersion,
+> {
+  constructor(
+    readonly options: {
+      version: Version
+      up: (opts: {
+        effects: Effects
+        utils: Utils<Manifest, Store>
+      }) => Promise<void>
+      down: (opts: {
+        effects: Effects
+        utils: Utils<Manifest, Store>
+      }) => Promise<void>
+    },
+  ) {}
+  static of<
+    Manifest extends SDKManifest,
+    Store,
+    Version extends ManifestVersion,
+  >(options: {
+    version: Version
+    up: (opts: {
+      effects: Effects
+      utils: Utils<Manifest, Store>
+    }) => Promise<void>
+    down: (opts: {
+      effects: Effects
+      utils: Utils<Manifest, Store>
+    }) => Promise<void>
+  }) {
+    return new Migration<Manifest, Store, Version>(options)
+  }
+
+  async up(opts: { effects: Effects; utils: Utils<Manifest, Store> }) {
+    this.up(opts)
+  }
+
+  async down(opts: { effects: Effects; utils: Utils<Manifest, Store> }) {
+    this.down(opts)
+  }
+}
diff --git a/sdk/lib/inits/migrations/setupMigrations.ts b/sdk/lib/inits/migrations/setupMigrations.ts
new file mode 100644
index 000000000..dabe3122c
--- /dev/null
+++ b/sdk/lib/inits/migrations/setupMigrations.ts
@@ -0,0 +1,76 @@
+import { EmVer } from "../../emverLite/mod"
+import { SDKManifest } from "../../manifest/ManifestTypes"
+import { ExpectedExports } from "../../types"
+import { createUtils } from "../../util"
+import { once } from "../../util/once"
+import { Migration } from "./Migration"
+
+export class Migrations<Manifest extends SDKManifest, Store> {
+  private constructor(
+    readonly manifest: SDKManifest,
+    readonly migrations: Array<Migration<Manifest, Store, any>>,
+  ) {}
+  private sortedMigrations = once(() => {
+    const migrationsAsVersions = (
+      this.migrations as Array<Migration<Manifest, Store, any>>
+    ).map((x) => [EmVer.parse(x.options.version), x] as const)
+    migrationsAsVersions.sort((a, b) => a[0].compareForSort(b[0]))
+    return migrationsAsVersions
+  })
+  private currentVersion = once(() => EmVer.parse(this.manifest.version))
+  static of<
+    Manifest extends SDKManifest,
+    Store,
+    Migrations extends Array<Migration<Manifest, Store, any>>,
+  >(manifest: SDKManifest, ...migrations: EnsureUniqueId<Migrations>) {
+    return new Migrations(
+      manifest,
+      migrations as Array<Migration<Manifest, Store, any>>,
+    )
+  }
+  async init({
+    effects,
+    previousVersion,
+  }: Parameters<ExpectedExports.init>[0]) {
+    const utils = createUtils<Manifest, Store>(effects)
+    if (!!previousVersion) {
+      const previousVersionEmVer = EmVer.parse(previousVersion)
+      for (const [_, migration] of this.sortedMigrations()
+        .filter((x) => x[0].greaterThan(previousVersionEmVer))
+        .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
+        await migration.up({ effects, utils })
+      }
+    }
+  }
+  async uninit({
+    effects,
+    nextVersion,
+  }: Parameters<ExpectedExports.uninit>[0]) {
+    const utils = createUtils<Manifest, Store>(effects)
+    if (!!nextVersion) {
+      const nextVersionEmVer = EmVer.parse(nextVersion)
+      const reversed = [...this.sortedMigrations()].reverse()
+      for (const [_, migration] of reversed
+        .filter((x) => x[0].greaterThan(nextVersionEmVer))
+        .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
+        await migration.down({ effects, utils })
+      }
+    }
+  }
+}
+
+export function setupMigrations<
+  Manifest extends SDKManifest,
+  Store,
+  Migrations extends Array<Migration<Manifest, Store, any>>,
+>(manifest: SDKManifest, ...migrations: EnsureUniqueId<Migrations>) {
+  return Migrations.of<Manifest, Store, Migrations>(manifest, ...migrations)
+}
+
+// prettier-ignore
+export type EnsureUniqueId<A, B = A, ids = never> =
+  B extends [] ? A : 
+  B extends [Migration<any, any, infer id>, ...infer Rest] ? (
+    id extends ids ? "One of the ids are not unique"[] :
+    EnsureUniqueId<A, Rest, id | ids>
+  ) : "There exists a migration that is not a Migration"[]
diff --git a/sdk/lib/inits/setupExports.ts b/sdk/lib/inits/setupExports.ts
new file mode 100644
index 000000000..bad6dd9ad
--- /dev/null
+++ b/sdk/lib/inits/setupExports.ts
@@ -0,0 +1,18 @@
+import { Effects, ExposeServicePaths, ExposeUiPaths } from "../types"
+import { Utils } from "../util/utils"
+
+export type SetupExports<Store> = (opts: {
+  effects: Effects
+  utils: Utils<any, Store>
+}) =>
+  | {
+      ui: ExposeUiPaths<Store>
+      services: ExposeServicePaths<Store>
+    }
+  | Promise<{
+      ui: ExposeUiPaths<Store>
+      services: ExposeServicePaths<Store>
+    }>
+
+export const setupExports = <Store>(fn: (opts: SetupExports<Store>) => void) =>
+  fn
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
new file mode 100644
index 000000000..7d4586ef1
--- /dev/null
+++ b/sdk/lib/inits/setupInit.ts
@@ -0,0 +1,42 @@
+import { SetInterfaces } from "../interfaces/setupInterfaces"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { ExpectedExports } from "../types"
+import { createUtils } from "../util"
+import { Migrations } from "./migrations/setupMigrations"
+import { SetupExports } from "./setupExports"
+import { Install } from "./setupInstall"
+import { Uninstall } from "./setupUninstall"
+
+export function setupInit<Manifest extends SDKManifest, Store>(
+  migrations: Migrations<Manifest, Store>,
+  install: Install<Manifest, Store>,
+  uninstall: Uninstall<Manifest, Store>,
+  setInterfaces: SetInterfaces<Manifest, Store, any, any>,
+  setupExports: SetupExports<Store>,
+): {
+  init: ExpectedExports.init
+  uninit: ExpectedExports.uninit
+} {
+  return {
+    init: async (opts) => {
+      const utils = createUtils<Manifest, Store>(opts.effects)
+      await migrations.init(opts)
+      await install.init(opts)
+      await setInterfaces({
+        ...opts,
+        input: null,
+        utils,
+      })
+      const { services, ui } = await setupExports({
+        ...opts,
+        utils,
+      })
+      await opts.effects.exposeForDependents(services)
+      await opts.effects.exposeUi(ui)
+    },
+    uninit: async (opts) => {
+      await migrations.uninit(opts)
+      await uninstall.uninit(opts)
+    },
+  }
+}
diff --git a/sdk/lib/inits/setupInstall.ts b/sdk/lib/inits/setupInstall.ts
new file mode 100644
index 000000000..e49c0b545
--- /dev/null
+++ b/sdk/lib/inits/setupInstall.ts
@@ -0,0 +1,33 @@
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Effects, ExpectedExports } from "../types"
+import { Utils, createUtils } from "../util/utils"
+
+export type InstallFn<Manifest extends SDKManifest, Store> = (opts: {
+  effects: Effects
+  utils: Utils<Manifest, Store>
+}) => Promise<void>
+export class Install<Manifest extends SDKManifest, Store> {
+  private constructor(readonly fn: InstallFn<Manifest, Store>) {}
+  static of<Manifest extends SDKManifest, Store>(
+    fn: InstallFn<Manifest, Store>,
+  ) {
+    return new Install(fn)
+  }
+
+  async init({
+    effects,
+    previousVersion,
+  }: Parameters<ExpectedExports.init>[0]) {
+    if (!previousVersion)
+      await this.fn({
+        effects,
+        utils: createUtils(effects),
+      })
+  }
+}
+
+export function setupInstall<Manifest extends SDKManifest, Store>(
+  fn: InstallFn<Manifest, Store>,
+) {
+  return Install.of(fn)
+}
diff --git a/sdk/lib/inits/setupUninstall.ts b/sdk/lib/inits/setupUninstall.ts
new file mode 100644
index 000000000..b411d2fc7
--- /dev/null
+++ b/sdk/lib/inits/setupUninstall.ts
@@ -0,0 +1,33 @@
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Effects, ExpectedExports } from "../types"
+import { Utils, createUtils } from "../util/utils"
+
+export type UninstallFn<Manifest extends SDKManifest, Store> = (opts: {
+  effects: Effects
+  utils: Utils<Manifest, Store>
+}) => Promise<void>
+export class Uninstall<Manifest extends SDKManifest, Store> {
+  private constructor(readonly fn: UninstallFn<Manifest, Store>) {}
+  static of<Manifest extends SDKManifest, Store>(
+    fn: UninstallFn<Manifest, Store>,
+  ) {
+    return new Uninstall(fn)
+  }
+
+  async uninit({
+    effects,
+    nextVersion,
+  }: Parameters<ExpectedExports.uninit>[0]) {
+    if (!nextVersion)
+      await this.fn({
+        effects,
+        utils: createUtils(effects),
+      })
+  }
+}
+
+export function setupUninstall<Manifest extends SDKManifest, Store>(
+  fn: UninstallFn<Manifest, Store>,
+) {
+  return Uninstall.of(fn)
+}
diff --git a/sdk/lib/interfaces/AddressReceipt.ts b/sdk/lib/interfaces/AddressReceipt.ts
new file mode 100644
index 000000000..d57d85685
--- /dev/null
+++ b/sdk/lib/interfaces/AddressReceipt.ts
@@ -0,0 +1,4 @@
+declare const AddressProof: unique symbol
+export type AddressReceipt = {
+  [AddressProof]: never
+}
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
new file mode 100644
index 000000000..190769daa
--- /dev/null
+++ b/sdk/lib/interfaces/Host.ts
@@ -0,0 +1,205 @@
+import { object, string } from "ts-matches"
+import { Effects } from "../types"
+import { Origin } from "./Origin"
+
+const knownProtocols = {
+  http: {
+    secure: false,
+    ssl: false,
+    defaultPort: 80,
+    withSsl: "https",
+  },
+  https: {
+    secure: true,
+    ssl: true,
+    defaultPort: 443,
+  },
+  ws: {
+    secure: false,
+    ssl: false,
+    defaultPort: 80,
+    withSsl: "wss",
+  },
+  wss: {
+    secure: true,
+    ssl: true,
+    defaultPort: 443,
+  },
+  ssh: {
+    secure: true,
+    ssl: false,
+    defaultPort: 22,
+  },
+  bitcoin: {
+    secure: true,
+    ssl: false,
+    defaultPort: 8333,
+  },
+  grpc: {
+    secure: true,
+    ssl: true,
+    defaultPort: 50051,
+  },
+  dns: {
+    secure: true,
+    ssl: false,
+    defaultPort: 53,
+  },
+} as const
+
+type Scheme = string | null
+
+type AddSslOptions = {
+  preferredExternalPort: number
+  scheme: Scheme
+  addXForwardedHeaders?: boolean /** default: false */
+}
+type Security = { secure: false; ssl: false } | { secure: true; ssl: boolean }
+export type PortOptions = {
+  scheme: Scheme
+  preferredExternalPort: number
+  addSsl: AddSslOptions | null
+} & Security
+type KnownProtocols = typeof knownProtocols
+type ProtocolsWithSslVariants = {
+  [K in keyof KnownProtocols]: KnownProtocols[K] extends {
+    withSsl: string
+  }
+    ? K
+    : never
+}[keyof KnownProtocols]
+type NotProtocolsWithSslVariants = Exclude<
+  keyof KnownProtocols,
+  ProtocolsWithSslVariants
+>
+
+type PortOptionsByKnownProtocol =
+  | ({
+      protocol: ProtocolsWithSslVariants
+      preferredExternalPort?: number
+      scheme?: Scheme
+    } & ({ noAddSsl: true } | { addSsl?: Partial<AddSslOptions> }))
+  | {
+      protocol: NotProtocolsWithSslVariants
+      preferredExternalPort?: number
+      scheme?: Scheme
+      addSsl?: AddSslOptions | null
+    }
+type PortOptionsByProtocol = PortOptionsByKnownProtocol | PortOptions
+
+const hasStringProtocol = object({
+  protocol: string,
+}).test
+
+export class Host {
+  constructor(
+    readonly options: {
+      effects: Effects
+      kind: "static" | "single" | "multi"
+      id: string
+    },
+  ) {}
+
+  async bindPort(
+    internalPort: number,
+    options: PortOptionsByProtocol,
+  ): Promise<Origin<this>> {
+    if (hasStringProtocol(options)) {
+      return await this.bindPortForKnown(options, internalPort)
+    } else {
+      return await this.bindPortForUnknown(internalPort, options)
+    }
+  }
+
+  private async bindPortForUnknown(
+    internalPort: number,
+    options:
+      | ({
+          scheme: Scheme
+          preferredExternalPort: number
+          addSsl: AddSslOptions | null
+        } & { secure: false; ssl: false })
+      | ({
+          scheme: Scheme
+          preferredExternalPort: number
+          addSsl: AddSslOptions | null
+        } & { secure: true; ssl: boolean }),
+  ) {
+    await this.options.effects.bind({
+      kind: this.options.kind,
+      id: this.options.id,
+      internalPort: internalPort,
+      ...options,
+    })
+
+    return new Origin(this, options)
+  }
+
+  private async bindPortForKnown(
+    options: PortOptionsByKnownProtocol,
+    internalPort: number,
+  ) {
+    const scheme =
+      options.scheme === undefined ? options.protocol : options.scheme
+    const protoInfo = knownProtocols[options.protocol]
+    const preferredExternalPort =
+      options.preferredExternalPort ||
+      knownProtocols[options.protocol].defaultPort
+    const addSsl = this.getAddSsl(options, protoInfo)
+
+    const security: Security = !protoInfo.secure
+      ? {
+          secure: protoInfo.secure,
+          ssl: protoInfo.ssl,
+        }
+      : { secure: false, ssl: false }
+
+    const newOptions = {
+      scheme,
+      preferredExternalPort,
+      addSsl,
+      ...security,
+    }
+
+    await this.options.effects.bind({
+      kind: this.options.kind,
+      id: this.options.id,
+      internalPort,
+      ...newOptions,
+    })
+
+    return new Origin(this, newOptions)
+  }
+
+  private getAddSsl(
+    options: PortOptionsByKnownProtocol,
+    protoInfo: KnownProtocols[keyof KnownProtocols],
+  ): AddSslOptions | null {
+    if ("noAddSsl" in options && options.noAddSsl) return null
+    if ("withSsl" in protoInfo && protoInfo.withSsl)
+      return {
+        preferredExternalPort: knownProtocols[protoInfo.withSsl].defaultPort,
+        scheme: protoInfo.withSsl,
+        ...("addSsl" in options ? options.addSsl : null),
+      }
+    return null
+  }
+}
+
+export class StaticHost extends Host {
+  constructor(options: { effects: Effects; id: string }) {
+    super({ ...options, kind: "static" })
+  }
+}
+
+export class SingleHost extends Host {
+  constructor(options: { effects: Effects; id: string }) {
+    super({ ...options, kind: "single" })
+  }
+}
+
+export class MultiHost extends Host {
+  constructor(options: { effects: Effects; id: string }) {
+    super({ ...options, kind: "multi" })
+  }
+}
diff --git a/sdk/lib/interfaces/NetworkInterfaceBuilder.ts b/sdk/lib/interfaces/NetworkInterfaceBuilder.ts
new file mode 100644
index 000000000..8f47dea93
--- /dev/null
+++ b/sdk/lib/interfaces/NetworkInterfaceBuilder.ts
@@ -0,0 +1,73 @@
+import { Address, Effects } from "../types"
+import { NetworkInterfaceType } from "../util/utils"
+import { AddressReceipt } from "./AddressReceipt"
+import { Host } from "./Host"
+import { Origin } from "./Origin"
+
+/**
+ * A helper class for creating a Network Interface
+ *
+ * Network Interfaces are collections of web addresses that expose the same API or other resource,
+ * display to the user with under a common name and description.
+ *
+ * All URIs on an interface inherit the same ui: bool, basic auth credentials, path, and search (query) params
+ *
+ * @param options
+ * @returns
+ */
+export class NetworkInterfaceBuilder {
+  constructor(
+    readonly options: {
+      effects: Effects
+      name: string
+      id: string
+      description: string
+      hasPrimary: boolean
+      disabled: boolean
+      type: NetworkInterfaceType
+      username: null | string
+      path: string
+      search: Record<string, string>
+    },
+  ) {}
+
+  /**
+   * A function to register a group of origins (<PROTOCOL> :// <HOSTNAME> : <PORT>) with StartOS
+   *
+   * The returned addressReceipt serves as proof that the addresses were registered
+   *
+   * @param addresses
+   * @returns
+   */
+  async export<Origins extends Origin<Host>[]>(
+    origins: Origins,
+  ): Promise<Address[] & AddressReceipt> {
+    const {
+      name,
+      description,
+      hasPrimary,
+      disabled,
+      id,
+      type,
+      username,
+      path,
+      search,
+    } = this.options
+
+    const addresses = Array.from(origins).map((o) =>
+      o.build({ username, path, search, scheme: null }),
+    )
+
+    await this.options.effects.exportNetworkInterface({
+      interfaceId: id,
+      name,
+      description,
+      hasPrimary,
+      disabled,
+      addresses,
+      type,
+    })
+
+    return addresses as Address[] & AddressReceipt
+  }
+}
diff --git a/sdk/lib/interfaces/Origin.ts b/sdk/lib/interfaces/Origin.ts
new file mode 100644
index 000000000..1bab62811
--- /dev/null
+++ b/sdk/lib/interfaces/Origin.ts
@@ -0,0 +1,33 @@
+import { Address } from "../types"
+import { Host, PortOptions } from "./Host"
+
+export class Origin<T extends Host> {
+  constructor(
+    readonly host: T,
+    readonly options: PortOptions,
+  ) {}
+
+  build({ username, path, search }: BuildOptions): Address {
+    const qpEntries = Object.entries(search)
+      .map(
+        ([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`,
+      )
+      .join("&")
+
+    const qp = qpEntries.length ? `?${qpEntries}` : ""
+
+    return {
+      hostId: this.host.options.id,
+      options: this.options,
+      suffix: `${path}${qp}`,
+      username,
+    }
+  }
+}
+
+type BuildOptions = {
+  scheme: string | null
+  username: string | null
+  path: string
+  search: Record<string, string>
+}
diff --git a/sdk/lib/interfaces/interfaceReceipt.ts b/sdk/lib/interfaces/interfaceReceipt.ts
new file mode 100644
index 000000000..24873e67e
--- /dev/null
+++ b/sdk/lib/interfaces/interfaceReceipt.ts
@@ -0,0 +1,4 @@
+declare const InterfaceProof: unique symbol
+export type InterfaceReceipt = {
+  [InterfaceProof]: never
+}
diff --git a/sdk/lib/interfaces/setupInterfaces.ts b/sdk/lib/interfaces/setupInterfaces.ts
new file mode 100644
index 000000000..c99164e93
--- /dev/null
+++ b/sdk/lib/interfaces/setupInterfaces.ts
@@ -0,0 +1,28 @@
+import { Config } from "../config/builder/config"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Address, Effects } from "../types"
+import { Utils } from "../util/utils"
+import { AddressReceipt } from "./AddressReceipt"
+
+export type InterfacesReceipt = Array<Address[] & AddressReceipt>
+export type SetInterfaces<
+  Manifest extends SDKManifest,
+  Store,
+  ConfigInput extends Record<string, any>,
+  Output extends InterfacesReceipt,
+> = (opts: {
+  effects: Effects
+  input: null | ConfigInput
+  utils: Utils<Manifest, Store>
+}) => Promise<Output>
+export type SetupInterfaces = <
+  Manifest extends SDKManifest,
+  Store,
+  ConfigInput extends Record<string, any>,
+  Output extends InterfacesReceipt,
+>(
+  config: Config<ConfigInput, Store>,
+  fn: SetInterfaces<Manifest, Store, ConfigInput, Output>,
+) => SetInterfaces<Manifest, Store, ConfigInput, Output>
+export const NO_INTERFACE_CHANGES = [] as InterfacesReceipt
+export const setupInterfaces: SetupInterfaces = (_config, fn) => fn
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
new file mode 100644
index 000000000..45ff723d0
--- /dev/null
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -0,0 +1,155 @@
+import { HealthReceipt } from "../health/HealthReceipt"
+import { CheckResult } from "../health/checkFns"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Trigger } from "../trigger"
+import { TriggerInput } from "../trigger/TriggerInput"
+import { defaultTrigger } from "../trigger/defaultTrigger"
+import { DaemonReturned, Effects, ValidIfNoStupidEscape } from "../types"
+import { createUtils } from "../util"
+import { Signals } from "../util/utils"
+type Daemon<
+  Manifest extends SDKManifest,
+  Ids extends string,
+  Command extends string,
+  Id extends string,
+> = {
+  id: "" extends Id ? never : Id
+  command: ValidIfNoStupidEscape<Command> | [string, ...string[]]
+  imageId: Manifest["images"][number]
+  env?: Record<string, string>
+  ready: {
+    display: string | null
+    fn: () => Promise<CheckResult> | CheckResult
+    trigger?: Trigger
+  }
+  requires: Exclude<Ids, Id>[]
+}
+
+type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
+/**
+ * A class for defining and controlling the service daemons
+```ts
+Daemons.of({
+  effects,
+  started,
+  interfaceReceipt, // Provide the interfaceReceipt to prove it was completed
+  healthReceipts, // Provide the healthReceipts or [] to prove they were at least considered
+}).addDaemon('webui', {
+  command: 'hello-world', // The command to start the daemon
+  ready: {
+    display: 'Web Interface',
+    // The function to run to determine the health status of the daemon
+    fn: () =>
+      checkPortListening(effects, 80, {
+        successMessage: 'The web interface is ready',
+        errorMessage: 'The web interface is not ready',
+      }),
+  },
+  requires: [],
+})
+```
+ */
+export class Daemons<Manifest extends SDKManifest, Ids extends string> {
+  private constructor(
+    readonly effects: Effects,
+    readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>,
+    readonly daemons?: Daemon<Manifest, Ids, "command", Ids>[],
+  ) {}
+  /**
+   * Returns an empty new Daemons class with the provided config.
+   *
+   * Call .addDaemon() on the returned class to add a daemon.
+   *
+   * Daemons run in the order they are defined, with latter daemons being capable of
+   * depending on prior daemons
+   * @param config
+   * @returns
+   */
+  static of<Manifest extends SDKManifest>(config: {
+    effects: Effects
+    started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
+    healthReceipts: HealthReceipt[]
+  }) {
+    return new Daemons<Manifest, never>(config.effects, config.started)
+  }
+  /**
+   * Returns the complete list of daemons, including the one defined here
+   * @param id
+   * @param newDaemon
+   * @returns
+   */
+  addDaemon<Id extends string, Command extends string>(
+    // prettier-ignore
+    id: 
+      "" extends Id ? never :
+      ErrorDuplicateId<Id> extends Id ? never :
+      Id extends Ids ? ErrorDuplicateId<Id> :
+      Id,
+    newDaemon: Omit<Daemon<Manifest, Ids, Command, Id>, "id">,
+  ) {
+    const daemons = ((this?.daemons ?? []) as any[]).concat({
+      ...newDaemon,
+      id,
+    })
+    return new Daemons<Manifest, Ids | Id>(this.effects, this.started, daemons)
+  }
+
+  async build() {
+    const daemonsStarted = {} as Record<Ids, Promise<DaemonReturned>>
+    const { effects } = this
+    const daemons = this.daemons ?? []
+    for (const daemon of daemons) {
+      const requiredPromise = Promise.all(
+        daemon.requires?.map((id) => daemonsStarted[id]) ?? [],
+      )
+      daemonsStarted[daemon.id] = requiredPromise.then(async () => {
+        const { command, imageId } = daemon
+        const utils = createUtils<Manifest>(effects)
+
+        const child = utils.runDaemon(imageId, command, { env: daemon.env })
+        let currentInput: TriggerInput = {}
+        const getCurrentInput = () => currentInput
+        const trigger = (daemon.ready.trigger ?? defaultTrigger)(
+          getCurrentInput,
+        )
+        return new Promise(async (resolve) => {
+          for (
+            let res = await trigger.next();
+            !res.done;
+            res = await trigger.next()
+          ) {
+            const response = await Promise.resolve(daemon.ready.fn()).catch(
+              (err) =>
+                ({
+                  status: "failing",
+                  message: "message" in err ? err.message : String(err),
+                }) as CheckResult,
+            )
+            currentInput.lastResult = response.status || null
+            if (!currentInput.hadSuccess && response.status === "passing") {
+              currentInput.hadSuccess = true
+              resolve(child)
+            }
+          }
+          resolve(child)
+        })
+      })
+    }
+    return {
+      async term(options?: { signal?: Signals; timeout?: number }) {
+        await Promise.all(
+          Object.values<Promise<DaemonReturned>>(daemonsStarted).map((x) =>
+            x.then((x) => x.term(options)),
+          ),
+        )
+      },
+      async wait() {
+        await Promise.all(
+          Object.values<Promise<DaemonReturned>>(daemonsStarted).map((x) =>
+            x.then((x) => x.wait()),
+          ),
+        )
+      },
+    }
+  }
+}
diff --git a/sdk/lib/mainFn/index.ts b/sdk/lib/mainFn/index.ts
new file mode 100644
index 000000000..7a6e11c6c
--- /dev/null
+++ b/sdk/lib/mainFn/index.ts
@@ -0,0 +1,35 @@
+import { Effects, ExpectedExports } from "../types"
+import { createMainUtils } from "../util"
+import { Utils, createUtils } from "../util/utils"
+import { Daemons } from "./Daemons"
+import "../interfaces/NetworkInterfaceBuilder"
+import "../interfaces/Origin"
+
+import "./Daemons"
+import { SDKManifest } from "../manifest/ManifestTypes"
+
+/**
+ * Used to ensure that the main function is running with the valid proofs.
+ * We first do the folowing order of things
+ * 1. We get the interfaces
+ * 2. We setup all the commands to setup the system
+ * 3. We create the health checks
+ * 4. We setup the daemons init system
+ * @param fn
+ * @returns
+ */
+export const setupMain = <Manifest extends SDKManifest, Store>(
+  fn: (o: {
+    effects: Effects
+    started(onTerm: () => PromiseLike<void>): PromiseLike<void>
+    utils: Utils<Manifest, Store, {}>
+  }) => Promise<Daemons<Manifest, any>>,
+): ExpectedExports.main => {
+  return async (options) => {
+    const result = await fn({
+      ...options,
+      utils: createMainUtils<Manifest, Store>(options.effects),
+    })
+    return result
+  }
+}
diff --git a/sdk/lib/manifest/ManifestTypes.ts b/sdk/lib/manifest/ManifestTypes.ts
new file mode 100644
index 000000000..4b25ff1d0
--- /dev/null
+++ b/sdk/lib/manifest/ManifestTypes.ts
@@ -0,0 +1,105 @@
+import { ValidEmVer } from "../emverLite/mod"
+import { ActionMetadata } from "../types"
+
+export interface Container {
+  /** This should be pointing to a docker container name */
+  image: string
+  /** These should match the manifest data volumes */
+  mounts: Record<string, string>
+  /** Default is 64mb */
+  shmSizeMb?: `${number}${"mb" | "gb" | "b" | "kb"}`
+  /** if more than 30s to shutdown */
+  sigtermTimeout?: `${number}${"s" | "m" | "h"}`
+}
+
+export type ManifestVersion = ValidEmVer
+
+export type SDKManifest = {
+  /**  The package identifier used by the OS. This must be unique amongst all other known packages */
+  readonly id: string
+  /** A human readable service title */
+  readonly title: string
+  /** Service version - accepts up to four digits, where the last confirms to revisions necessary for StartOs
+   * - see documentation: https://github.com/Start9Labs/emver-rs. This value will change with each release of
+   * the service
+   */
+  readonly version: ManifestVersion
+  /** Release notes for the update - can be a string, paragraph or URL */
+  readonly releaseNotes: string
+  /** The type of license for the project. Include the LICENSE in the root of the project directory. A license is required for a Start9 package.*/
+  readonly license: string // name of license
+  /** A list of normie (hosted, SaaS, custodial, etc) services this services intends to replace */
+  readonly replaces: Readonly<string[]>
+  /** The Start9 wrapper repository URL for the package. This repo contains the manifest file (this),
+   * any scripts necessary for configuration, backups, actions, or health checks (more below). This key
+   * must exist. But could be embedded into the source repository
+   */
+  readonly wrapperRepo: string
+  /** The original project repository URL. There is no upstream repo in this example */
+  readonly upstreamRepo: string
+  /**  URL to the support site / channel for the project. This key can be omitted if none exists, or it can link to the original project repository issues */
+  readonly supportSite: string
+  /** URL to the marketing site for the project. If there is no marketing site, it can link to the original project repository */
+  readonly marketingSite: string
+  /** URL where users can donate to the upstream project */
+  readonly donationUrl: string | null
+  /**Human readable descriptions for the service. These are used throughout the StartOS user interface, primarily in the marketplace. */
+  readonly description: {
+    /**This is the first description visible to the user in the marketplace */
+    readonly short: string
+    /** This description will display with additional details in the service's individual marketplace page */
+    readonly long: string
+  }
+
+  /** Defines the os images needed to run the container processes */
+  readonly images: string[]
+  /** This denotes readonly asset directories that should be available to mount to the container.
+   * Assuming that there will be three files with names along the lines:
+   * icon.* : the icon that will be this packages icon on the ui
+   * LICENSE : What the license is for this service
+   * Instructions : to be seen in the ui section of the package
+   * */
+  readonly assets: string[]
+  /** This denotes any data volumes that should be available to mount to the container */
+  readonly volumes: string[]
+
+  readonly alerts: {
+    readonly install: string | null
+    readonly update: string | null
+    readonly uninstall: string | null
+    readonly restore: string | null
+    readonly start: string | null
+    readonly stop: string | null
+  }
+  readonly dependencies: Readonly<Record<string, ManifestDependency>>
+}
+
+export interface ManifestDependency {
+  /** The range of versions that would satisfy the dependency
+   *
+   * ie: >=3.4.5 <4.0.0
+   */
+  version: string
+  /**
+   * A human readable explanation on what the dependency is used for
+   */
+  description: string | null
+  requirement:
+    | {
+        type: "opt-in"
+        /**
+         * The human readable explanation on how to opt-in to the dependency
+         */
+        how: string
+      }
+    | {
+        type: "opt-out"
+        /**
+         * The human readable explanation on how to opt-out to the dependency
+         */
+        how: string
+      }
+    | {
+        type: "required"
+      }
+}
diff --git a/sdk/lib/manifest/index.ts b/sdk/lib/manifest/index.ts
new file mode 100644
index 000000000..806ef5e61
--- /dev/null
+++ b/sdk/lib/manifest/index.ts
@@ -0,0 +1,2 @@
+import "./setupManifest"
+import "./ManifestTypes"
diff --git a/sdk/lib/manifest/setupManifest.ts b/sdk/lib/manifest/setupManifest.ts
new file mode 100644
index 000000000..41c74baa0
--- /dev/null
+++ b/sdk/lib/manifest/setupManifest.ts
@@ -0,0 +1,20 @@
+import { SDKManifest, ManifestVersion } from "./ManifestTypes"
+
+export function setupManifest<
+  Id extends string,
+  Version extends ManifestVersion,
+  Dependencies extends Record<string, unknown>,
+  VolumesTypes extends string,
+  AssetTypes extends string,
+  ImagesTypes extends string,
+  Manifest extends SDKManifest & {
+    dependencies: Dependencies
+    id: Id
+    version: Version
+    assets: AssetTypes[]
+    images: ImagesTypes[]
+    volumes: VolumesTypes[]
+  },
+>(manifest: Manifest): Manifest {
+  return manifest
+}
diff --git a/sdk/lib/store/getStore.ts b/sdk/lib/store/getStore.ts
new file mode 100644
index 000000000..4ea3a9419
--- /dev/null
+++ b/sdk/lib/store/getStore.ts
@@ -0,0 +1,61 @@
+import { Effects, EnsureStorePath } from "../types"
+
+export class GetStore<Store, Path extends string> {
+  constructor(
+    readonly effects: Effects,
+    readonly path: Path & EnsureStorePath<Store, Path>,
+    readonly options: {
+      /** Defaults to what ever the package currently in */
+      packageId?: string | undefined
+    } = {},
+  ) {}
+
+  /**
+   * Returns the value of Store at the provided path. Restart the service if the value changes
+   */
+  const() {
+    return this.effects.store.get<Store, Path>({
+      ...this.options,
+      path: this.path as any,
+      callback: this.effects.restart,
+    })
+  }
+  /**
+   * Returns the value of Store at the provided path. Does nothing if the value changes
+   */
+  once() {
+    return this.effects.store.get<Store, Path>({
+      ...this.options,
+      path: this.path as any,
+      callback: () => {},
+    })
+  }
+
+  /**
+   * Watches the value of Store at the provided path. Takes a custom callback function to run whenever the value changes
+   */
+  async *watch() {
+    while (true) {
+      let callback: () => void
+      const waitForNext = new Promise<void>((resolve) => {
+        callback = resolve
+      })
+      yield await this.effects.store.get<Store, Path>({
+        ...this.options,
+        path: this.path as any,
+        callback: () => callback(),
+      })
+      await waitForNext
+    }
+  }
+}
+export function getStore<Store, Path extends string>(
+  effects: Effects,
+  path: Path & EnsureStorePath<Store, Path>,
+  options: {
+    /** Defaults to what ever the package currently in */
+    packageId?: string | undefined
+  } = {},
+) {
+  return new GetStore<Store, Path>(effects, path as any, options)
+}
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
new file mode 100644
index 000000000..fe9d123ea
--- /dev/null
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -0,0 +1,818 @@
+import { testOutput } from "./output.test"
+import { Config } from "../config/builder/config"
+import { List } from "../config/builder/list"
+import { Value } from "../config/builder/value"
+import { Variants } from "../config/builder/variants"
+import { ValueSpec } from "../config/configTypes"
+
+describe("builder tests", () => {
+  test("text", async () => {
+    const bitcoinPropertiesBuilt: {
+      "peer-tor-address": ValueSpec
+    } = await Config.of({
+      "peer-tor-address": Value.text({
+        name: "Peer tor address",
+        description: "The Tor address of the peer interface",
+        required: { default: null },
+      }),
+    }).build({} as any)
+    expect(bitcoinPropertiesBuilt).toMatchObject({
+      "peer-tor-address": {
+        type: "text",
+        description: "The Tor address of the peer interface",
+        warning: null,
+        masked: false,
+        placeholder: null,
+        minLength: null,
+        maxLength: null,
+        patterns: [],
+        disabled: false,
+        inputmode: "text",
+        name: "Peer tor address",
+        required: true,
+        default: null,
+      },
+    })
+  })
+})
+
+describe("values", () => {
+  test("toggle", async () => {
+    const value = Value.toggle({
+      name: "Testing",
+      description: null,
+      warning: null,
+      default: false,
+    })
+    const validator = value.validator
+    validator.unsafeCast(false)
+    testOutput<typeof validator._TYPE, boolean>()(null)
+  })
+  test("text", async () => {
+    const value = Value.text({
+      name: "Testing",
+      required: { default: null },
+    })
+    const validator = value.validator
+    const rawIs = await value.build({} as any)
+    validator.unsafeCast("test text")
+    expect(() => validator.unsafeCast(null)).toThrowError()
+    testOutput<typeof validator._TYPE, string>()(null)
+  })
+  test("text with default", async () => {
+    const value = Value.text({
+      name: "Testing",
+      required: { default: "this is a default value" },
+    })
+    const validator = value.validator
+    const rawIs = await value.build({} as any)
+    validator.unsafeCast("test text")
+    expect(() => validator.unsafeCast(null)).toThrowError()
+    testOutput<typeof validator._TYPE, string>()(null)
+  })
+  test("optional text", async () => {
+    const value = Value.text({
+      name: "Testing",
+      required: false,
+    })
+    const validator = value.validator
+    const rawIs = await value.build({} as any)
+    validator.unsafeCast("test text")
+    validator.unsafeCast(null)
+    testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+  })
+  test("color", async () => {
+    const value = Value.color({
+      name: "Testing",
+      required: false,
+      description: null,
+      warning: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast("#000000")
+    testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+  })
+  test("datetime", async () => {
+    const value = Value.datetime({
+      name: "Testing",
+      required: { default: null },
+      description: null,
+      warning: null,
+      inputmode: "date",
+      min: null,
+      max: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast("2021-01-01")
+    testOutput<typeof validator._TYPE, string>()(null)
+  })
+  test("optional datetime", async () => {
+    const value = Value.datetime({
+      name: "Testing",
+      required: false,
+      description: null,
+      warning: null,
+      inputmode: "date",
+      min: null,
+      max: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast("2021-01-01")
+    testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+  })
+  test("textarea", async () => {
+    const value = Value.textarea({
+      name: "Testing",
+      required: false,
+      description: null,
+      warning: null,
+      minLength: null,
+      maxLength: null,
+      placeholder: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast("test text")
+    testOutput<typeof validator._TYPE, string>()(null)
+  })
+  test("number", async () => {
+    const value = Value.number({
+      name: "Testing",
+      required: { default: null },
+      integer: false,
+      description: null,
+      warning: null,
+      min: null,
+      max: null,
+      step: null,
+      units: null,
+      placeholder: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast(2)
+    testOutput<typeof validator._TYPE, number>()(null)
+  })
+  test("optional number", async () => {
+    const value = Value.number({
+      name: "Testing",
+      required: false,
+      integer: false,
+      description: null,
+      warning: null,
+      min: null,
+      max: null,
+      step: null,
+      units: null,
+      placeholder: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast(2)
+    testOutput<typeof validator._TYPE, number | null | undefined>()(null)
+  })
+  test("select", async () => {
+    const value = Value.select({
+      name: "Testing",
+      required: { default: null },
+      values: {
+        a: "A",
+        b: "B",
+      },
+      description: null,
+      warning: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast("a")
+    validator.unsafeCast("b")
+    expect(() => validator.unsafeCast("c")).toThrowError()
+    testOutput<typeof validator._TYPE, "a" | "b">()(null)
+  })
+  test("nullable select", async () => {
+    const value = Value.select({
+      name: "Testing",
+      required: false,
+      values: {
+        a: "A",
+        b: "B",
+      },
+      description: null,
+      warning: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast("a")
+    validator.unsafeCast("b")
+    validator.unsafeCast(null)
+    testOutput<typeof validator._TYPE, "a" | "b" | null | undefined>()(null)
+  })
+  test("multiselect", async () => {
+    const value = Value.multiselect({
+      name: "Testing",
+      values: {
+        a: "A",
+        b: "B",
+      },
+      default: [],
+      description: null,
+      warning: null,
+      minLength: null,
+      maxLength: null,
+    })
+    const validator = value.validator
+    validator.unsafeCast([])
+    validator.unsafeCast(["a", "b"])
+
+    expect(() => validator.unsafeCast(["e"])).toThrowError()
+    expect(() => validator.unsafeCast([4])).toThrowError()
+    testOutput<typeof validator._TYPE, Array<"a" | "b">>()(null)
+  })
+  test("object", async () => {
+    const value = Value.object(
+      {
+        name: "Testing",
+        description: null,
+        warning: null,
+      },
+      Config.of({
+        a: Value.toggle({
+          name: "test",
+          description: null,
+          warning: null,
+          default: false,
+        }),
+      }),
+    )
+    const validator = value.validator
+    validator.unsafeCast({ a: true })
+    testOutput<typeof validator._TYPE, { a: boolean }>()(null)
+  })
+  test("union", async () => {
+    const value = Value.union(
+      {
+        name: "Testing",
+        required: { default: null },
+        description: null,
+        warning: null,
+      },
+      Variants.of({
+        a: {
+          name: "a",
+          spec: Config.of({
+            b: Value.toggle({
+              name: "b",
+              description: null,
+              warning: null,
+              default: false,
+            }),
+          }),
+        },
+      }),
+    )
+    const validator = value.validator
+    validator.unsafeCast({ unionSelectKey: "a", unionValueKey: { b: false } })
+    type Test = typeof validator._TYPE
+    testOutput<Test, { unionSelectKey: "a"; unionValueKey: { b: boolean } }>()(
+      null,
+    )
+  })
+  test("list", async () => {
+    const value = Value.list(
+      List.number(
+        {
+          name: "test",
+        },
+        {
+          integer: false,
+        },
+      ),
+    )
+    const validator = value.validator
+    validator.unsafeCast([1, 2, 3])
+    testOutput<typeof validator._TYPE, number[]>()(null)
+  })
+
+  describe("dynamic", () => {
+    const fakeOptions = {
+      config: "config",
+      effects: "effects",
+      utils: "utils",
+    } as any
+    test("toggle", async () => {
+      const value = Value.dynamicToggle(async () => ({
+        name: "Testing",
+        description: null,
+        warning: null,
+        default: false,
+      }))
+      const validator = value.validator
+      validator.unsafeCast(false)
+      expect(() => validator.unsafeCast(null)).toThrowError()
+      testOutput<typeof validator._TYPE, boolean>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        description: null,
+        warning: null,
+        default: false,
+      })
+    })
+    test("text", async () => {
+      const value = Value.dynamicText(async () => ({
+        name: "Testing",
+        required: { default: null },
+      }))
+      const validator = value.validator
+      const rawIs = await value.build({} as any)
+      validator.unsafeCast("test text")
+      validator.unsafeCast(null)
+      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        required: true,
+        default: null,
+      })
+    })
+    test("text with default", async () => {
+      const value = Value.dynamicText(async () => ({
+        name: "Testing",
+        required: { default: "this is a default value" },
+      }))
+      const validator = value.validator
+      validator.unsafeCast("test text")
+      validator.unsafeCast(null)
+      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        required: true,
+        default: "this is a default value",
+      })
+    })
+    test("optional text", async () => {
+      const value = Value.dynamicText(async () => ({
+        name: "Testing",
+        required: false,
+      }))
+      const validator = value.validator
+      const rawIs = await value.build({} as any)
+      validator.unsafeCast("test text")
+      validator.unsafeCast(null)
+      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        required: false,
+        default: null,
+      })
+    })
+    test("color", async () => {
+      const value = Value.dynamicColor(async () => ({
+        name: "Testing",
+        required: false,
+        description: null,
+        warning: null,
+      }))
+      const validator = value.validator
+      validator.unsafeCast("#000000")
+      validator.unsafeCast(null)
+      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        required: false,
+        default: null,
+        description: null,
+        warning: null,
+      })
+    })
+    test("datetime", async () => {
+      const value = Value.dynamicDatetime<{ test: "a" }>(async ({ utils }) => {
+        ;async () => {
+          ;(await utils.store.getOwn("/test").once()) satisfies "a"
+        }
+
+        return {
+          name: "Testing",
+          required: { default: null },
+          inputmode: "date",
+        }
+      })
+      const validator = value.validator
+      validator.unsafeCast("2021-01-01")
+      validator.unsafeCast(null)
+      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        required: true,
+        default: null,
+        description: null,
+        warning: null,
+        inputmode: "date",
+      })
+    })
+    test("textarea", async () => {
+      const value = Value.dynamicTextarea(async () => ({
+        name: "Testing",
+        required: false,
+        description: null,
+        warning: null,
+        minLength: null,
+        maxLength: null,
+        placeholder: null,
+      }))
+      const validator = value.validator
+      validator.unsafeCast("test text")
+      expect(() => validator.unsafeCast(null)).toThrowError()
+      testOutput<typeof validator._TYPE, string>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        required: false,
+      })
+    })
+    test("number", async () => {
+      const value = Value.dynamicNumber(() => ({
+        name: "Testing",
+        required: { default: null },
+        integer: false,
+        description: null,
+        warning: null,
+        min: null,
+        max: null,
+        step: null,
+        units: null,
+        placeholder: null,
+      }))
+      const validator = value.validator
+      validator.unsafeCast(2)
+      validator.unsafeCast(null)
+      expect(() => validator.unsafeCast("null")).toThrowError()
+      testOutput<typeof validator._TYPE, number | null | undefined>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        required: true,
+      })
+    })
+    test("select", async () => {
+      const value = Value.dynamicSelect(() => ({
+        name: "Testing",
+        required: { default: null },
+        values: {
+          a: "A",
+          b: "B",
+        },
+        description: null,
+        warning: null,
+      }))
+      const validator = value.validator
+      validator.unsafeCast("a")
+      validator.unsafeCast("b")
+      validator.unsafeCast("c")
+      validator.unsafeCast(null)
+      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        required: true,
+      })
+    })
+    test("multiselect", async () => {
+      const value = Value.dynamicMultiselect(() => ({
+        name: "Testing",
+        values: {
+          a: "A",
+          b: "B",
+        },
+        default: [],
+        description: null,
+        warning: null,
+        minLength: null,
+        maxLength: null,
+      }))
+      const validator = value.validator
+      validator.unsafeCast([])
+      validator.unsafeCast(["a", "b"])
+      validator.unsafeCast(["c"])
+
+      expect(() => validator.unsafeCast([4])).toThrowError()
+      expect(() => validator.unsafeCast(null)).toThrowError()
+      testOutput<typeof validator._TYPE, Array<string>>()(null)
+      expect(await value.build(fakeOptions)).toMatchObject({
+        name: "Testing",
+        default: [],
+      })
+    })
+  })
+  describe("filtering", () => {
+    test("union", async () => {
+      const value = Value.filteredUnion(
+        () => ["a", "c"],
+        {
+          name: "Testing",
+          required: { default: null },
+          description: null,
+          warning: null,
+        },
+        Variants.of({
+          a: {
+            name: "a",
+            spec: Config.of({
+              b: Value.toggle({
+                name: "b",
+                description: null,
+                warning: null,
+                default: false,
+              }),
+            }),
+          },
+          b: {
+            name: "b",
+            spec: Config.of({
+              b: Value.toggle({
+                name: "b",
+                description: null,
+                warning: null,
+                default: false,
+              }),
+            }),
+          },
+        }),
+      )
+      const validator = value.validator
+      validator.unsafeCast({ unionSelectKey: "a", unionValueKey: { b: false } })
+      type Test = typeof validator._TYPE
+      testOutput<
+        Test,
+        | { unionSelectKey: "a"; unionValueKey: { b: boolean } }
+        | { unionSelectKey: "b"; unionValueKey: { b: boolean } }
+      >()(null)
+
+      const built = await value.build({} as any)
+      expect(built).toMatchObject({
+        name: "Testing",
+        variants: {
+          b: {},
+        },
+      })
+      expect(built).toMatchObject({
+        name: "Testing",
+        variants: {
+          a: {},
+          b: {},
+        },
+      })
+      expect(built).toMatchObject({
+        name: "Testing",
+        variants: {
+          a: {},
+          b: {},
+        },
+        disabled: ["a", "c"],
+      })
+    })
+  })
+  test("dynamic union", async () => {
+    const value = Value.dynamicUnion(
+      () => ({
+        disabled: ["a", "c"],
+        name: "Testing",
+        required: { default: null },
+        description: null,
+        warning: null,
+      }),
+      Variants.of({
+        a: {
+          name: "a",
+          spec: Config.of({
+            b: Value.toggle({
+              name: "b",
+              description: null,
+              warning: null,
+              default: false,
+            }),
+          }),
+        },
+        b: {
+          name: "b",
+          spec: Config.of({
+            b: Value.toggle({
+              name: "b",
+              description: null,
+              warning: null,
+              default: false,
+            }),
+          }),
+        },
+      }),
+    )
+    const validator = value.validator
+    validator.unsafeCast({ unionSelectKey: "a", unionValueKey: { b: false } })
+    type Test = typeof validator._TYPE
+    testOutput<
+      Test,
+      | { unionSelectKey: "a"; unionValueKey: { b: boolean } }
+      | { unionSelectKey: "b"; unionValueKey: { b: boolean } }
+      | null
+      | undefined
+    >()(null)
+
+    const built = await value.build({} as any)
+    expect(built).toMatchObject({
+      name: "Testing",
+      variants: {
+        b: {},
+      },
+    })
+    expect(built).toMatchObject({
+      name: "Testing",
+      variants: {
+        a: {},
+        b: {},
+      },
+    })
+    expect(built).toMatchObject({
+      name: "Testing",
+      variants: {
+        a: {},
+        b: {},
+      },
+      disabled: ["a", "c"],
+    })
+  })
+})
+
+describe("Builder List", () => {
+  test("obj", async () => {
+    const value = Value.list(
+      List.obj(
+        {
+          name: "test",
+        },
+        {
+          spec: Config.of({
+            test: Value.toggle({
+              name: "test",
+              description: null,
+              warning: null,
+              default: false,
+            }),
+          }),
+        },
+      ),
+    )
+    const validator = value.validator
+    validator.unsafeCast([{ test: true }])
+    testOutput<typeof validator._TYPE, { test: boolean }[]>()(null)
+  })
+  test("text", async () => {
+    const value = Value.list(
+      List.text(
+        {
+          name: "test",
+        },
+        {
+          patterns: [],
+        },
+      ),
+    )
+    const validator = value.validator
+    validator.unsafeCast(["test", "text"])
+    testOutput<typeof validator._TYPE, string[]>()(null)
+  })
+  describe("dynamic", () => {
+    test("text", async () => {
+      const value = Value.list(
+        List.dynamicText(() => ({
+          name: "test",
+          spec: { patterns: [] },
+        })),
+      )
+      const validator = value.validator
+      validator.unsafeCast(["test", "text"])
+      expect(() => validator.unsafeCast([3, 4])).toThrowError()
+      expect(() => validator.unsafeCast(null)).toThrowError()
+      testOutput<typeof validator._TYPE, string[]>()(null)
+      expect(await value.build({} as any)).toMatchObject({
+        name: "test",
+        spec: { patterns: [] },
+      })
+    })
+  })
+  test("number", async () => {
+    const value = Value.list(
+      List.dynamicNumber(() => ({
+        name: "test",
+        spec: { integer: true },
+      })),
+    )
+    const validator = value.validator
+    expect(() => validator.unsafeCast(["test", "text"])).toThrowError()
+    validator.unsafeCast([4, 2])
+    expect(() => validator.unsafeCast(null)).toThrowError()
+    validator.unsafeCast([])
+    testOutput<typeof validator._TYPE, number[]>()(null)
+    expect(await value.build({} as any)).toMatchObject({
+      name: "test",
+      spec: { integer: true },
+    })
+  })
+})
+
+describe("Nested nullable values", () => {
+  test("Testing text", async () => {
+    const value = Config.of({
+      a: Value.text({
+        name: "Temp Name",
+        description:
+          "If no name is provided, the name from config will be used",
+        required: false,
+      }),
+    })
+    const validator = value.validator
+    validator.unsafeCast({ a: null })
+    validator.unsafeCast({ a: "test" })
+    expect(() => validator.unsafeCast({ a: 4 })).toThrowError()
+    testOutput<typeof validator._TYPE, { a: string | null | undefined }>()(null)
+  })
+  test("Testing number", async () => {
+    const value = Config.of({
+      a: Value.number({
+        name: "Temp Name",
+        description:
+          "If no name is provided, the name from config will be used",
+        required: false,
+        warning: null,
+        placeholder: null,
+        integer: false,
+        min: null,
+        max: null,
+        step: null,
+        units: null,
+      }),
+    })
+    const validator = value.validator
+    validator.unsafeCast({ a: null })
+    validator.unsafeCast({ a: 5 })
+    expect(() => validator.unsafeCast({ a: "4" })).toThrowError()
+    testOutput<typeof validator._TYPE, { a: number | null | undefined }>()(null)
+  })
+  test("Testing color", async () => {
+    const value = Config.of({
+      a: Value.color({
+        name: "Temp Name",
+        description:
+          "If no name is provided, the name from config will be used",
+        required: false,
+        warning: null,
+      }),
+    })
+    const validator = value.validator
+    validator.unsafeCast({ a: null })
+    validator.unsafeCast({ a: "5" })
+    expect(() => validator.unsafeCast({ a: 4 })).toThrowError()
+    testOutput<typeof validator._TYPE, { a: string | null | undefined }>()(null)
+  })
+  test("Testing select", async () => {
+    const value = Config.of({
+      a: Value.select({
+        name: "Temp Name",
+        description:
+          "If no name is provided, the name from config will be used",
+        required: false,
+        warning: null,
+        values: {
+          a: "A",
+        },
+      }),
+    })
+    const higher = await Value.select({
+      name: "Temp Name",
+      description: "If no name is provided, the name from config will be used",
+      required: false,
+      warning: null,
+      values: {
+        a: "A",
+      },
+    }).build({} as any)
+
+    const validator = value.validator
+    validator.unsafeCast({ a: null })
+    validator.unsafeCast({ a: "a" })
+    expect(() => validator.unsafeCast({ a: "4" })).toThrowError()
+    testOutput<typeof validator._TYPE, { a: "a" | null | undefined }>()(null)
+  })
+  test("Testing multiselect", async () => {
+    const value = Config.of({
+      a: Value.multiselect({
+        name: "Temp Name",
+        description:
+          "If no name is provided, the name from config will be used",
+
+        warning: null,
+        default: [],
+        values: {
+          a: "A",
+        },
+        minLength: null,
+        maxLength: null,
+      }),
+    })
+    const validator = value.validator
+    validator.unsafeCast({ a: [] })
+    validator.unsafeCast({ a: ["a"] })
+    expect(() => validator.unsafeCast({ a: ["4"] })).toThrowError()
+    expect(() => validator.unsafeCast({ a: "4" })).toThrowError()
+    testOutput<typeof validator._TYPE, { a: "a"[] }>()(null)
+  })
+})
diff --git a/sdk/lib/test/configTypes.test.ts b/sdk/lib/test/configTypes.test.ts
new file mode 100644
index 000000000..7e3ff5ca6
--- /dev/null
+++ b/sdk/lib/test/configTypes.test.ts
@@ -0,0 +1,32 @@
+import {
+  ListValueSpecOf,
+  ValueSpec,
+  isValueSpecListOf,
+} from "../config/configTypes"
+import { Config } from "../config/builder/config"
+import { List } from "../config/builder/list"
+import { Value } from "../config/builder/value"
+
+describe("Config Types", () => {
+  test("isValueSpecListOf", async () => {
+    const options = [List.obj, List.text, List.number]
+    for (const option of options) {
+      const test = (option as any)(
+        {} as any,
+        { spec: Config.of({}) } as any,
+      ) as any
+      const someList = await Value.list(test).build({} as any)
+      if (isValueSpecListOf(someList, "text")) {
+        someList.spec satisfies ListValueSpecOf<"text">
+      } else if (isValueSpecListOf(someList, "number")) {
+        someList.spec satisfies ListValueSpecOf<"number">
+      } else if (isValueSpecListOf(someList, "object")) {
+        someList.spec satisfies ListValueSpecOf<"object">
+      } else {
+        throw new Error(
+          "Failed to figure out the type: " + JSON.stringify(someList),
+        )
+      }
+    }
+  })
+})
diff --git a/sdk/lib/test/emverList.test.ts b/sdk/lib/test/emverList.test.ts
new file mode 100644
index 000000000..43919aa83
--- /dev/null
+++ b/sdk/lib/test/emverList.test.ts
@@ -0,0 +1,262 @@
+import { EmVer, notRange, rangeAnd, rangeOf, rangeOr } from "../emverLite/mod"
+describe("EmVer", () => {
+  {
+    {
+      const checker = rangeOf("*")
+      test("rangeOf('*')", () => {
+        checker.check("1")
+        checker.check("1.2")
+        checker.check("1.2.3")
+        checker.check("1.2.3.4")
+        // @ts-expect-error
+        checker.check("1.2.3.4.5")
+        // @ts-expect-error
+        checker.check("1.2.3.4.5.6")
+        expect(checker.check("1")).toEqual(true)
+        expect(checker.check("1.2")).toEqual(true)
+        expect(checker.check("1.2.3.4")).toEqual(true)
+      })
+      test("rangeOf('*') invalid", () => {
+        // @ts-expect-error
+        expect(() => checker.check("a")).toThrow()
+        // @ts-expect-error
+        expect(() => checker.check("")).toThrow()
+        expect(() => checker.check("1..3")).toThrow()
+      })
+    }
+
+    {
+      const checker = rangeOf(">1.2.3.4")
+      test(`rangeOf(">1.2.3.4") valid`, () => {
+        expect(checker.check("2-beta123")).toEqual(true)
+        expect(checker.check("2")).toEqual(true)
+        expect(checker.check("1.2.3.5")).toEqual(true)
+        // @ts-expect-error
+        expect(checker.check("1.2.3.4.1")).toEqual(true)
+      })
+
+      test(`rangeOf(">1.2.3.4") invalid`, () => {
+        expect(checker.check("1.2.3.4")).toEqual(false)
+        expect(checker.check("1.2.3")).toEqual(false)
+        expect(checker.check("1")).toEqual(false)
+      })
+    }
+    {
+      const checker = rangeOf("=1.2.3")
+      test(`rangeOf("=1.2.3") valid`, () => {
+        expect(checker.check("1.2.3")).toEqual(true)
+      })
+
+      test(`rangeOf("=1.2.3") invalid`, () => {
+        expect(checker.check("2")).toEqual(false)
+        expect(checker.check("1.2.3.1")).toEqual(false)
+        expect(checker.check("1.2")).toEqual(false)
+      })
+    }
+    {
+      const checker = rangeOf(">=1.2.3.4")
+      test(`rangeOf(">=1.2.3.4") valid`, () => {
+        expect(checker.check("2")).toEqual(true)
+        expect(checker.check("1.2.3.5")).toEqual(true)
+        // @ts-expect-error
+        expect(checker.check("1.2.3.4.1")).toEqual(true)
+        expect(checker.check("1.2.3.4")).toEqual(true)
+      })
+
+      test(`rangeOf(">=1.2.3.4") invalid`, () => {
+        expect(checker.check("1.2.3")).toEqual(false)
+        expect(checker.check("1")).toEqual(false)
+      })
+    }
+    {
+      const checker = rangeOf("<1.2.3.4")
+      test(`rangeOf("<1.2.3.4") invalid`, () => {
+        expect(checker.check("2")).toEqual(false)
+        expect(checker.check("1.2.3.5")).toEqual(false)
+        // @ts-expect-error
+        expect(checker.check("1.2.3.4.1")).toEqual(false)
+        expect(checker.check("1.2.3.4")).toEqual(false)
+      })
+
+      test(`rangeOf("<1.2.3.4") valid`, () => {
+        expect(checker.check("1.2.3")).toEqual(true)
+        expect(checker.check("1")).toEqual(true)
+      })
+    }
+    {
+      const checker = rangeOf("<=1.2.3.4")
+      test(`rangeOf("<=1.2.3.4") invalid`, () => {
+        expect(checker.check("2")).toEqual(false)
+        expect(checker.check("1.2.3.5")).toEqual(false)
+        // @ts-expect-error
+        expect(checker.check("1.2.3.4.1")).toEqual(false)
+      })
+
+      test(`rangeOf("<=1.2.3.4") valid`, () => {
+        expect(checker.check("1.2.3")).toEqual(true)
+        expect(checker.check("1")).toEqual(true)
+        expect(checker.check("1.2.3.4")).toEqual(true)
+      })
+    }
+
+    {
+      const checkA = rangeOf(">1")
+      const checkB = rangeOf("<=2")
+
+      const checker = rangeAnd(checkA, checkB)
+      test(`simple and(checkers) valid`, () => {
+        expect(checker.check("2")).toEqual(true)
+
+        expect(checker.check("1.1")).toEqual(true)
+      })
+      test(`simple and(checkers) invalid`, () => {
+        expect(checker.check("2.1")).toEqual(false)
+        expect(checker.check("1")).toEqual(false)
+        expect(checker.check("0")).toEqual(false)
+      })
+    }
+    {
+      const checkA = rangeOf("<1")
+      const checkB = rangeOf("=2")
+
+      const checker = rangeOr(checkA, checkB)
+      test(`simple or(checkers) valid`, () => {
+        expect(checker.check("2")).toEqual(true)
+        expect(checker.check("0.1")).toEqual(true)
+      })
+      test(`simple or(checkers) invalid`, () => {
+        expect(checker.check("2.1")).toEqual(false)
+        expect(checker.check("1")).toEqual(false)
+        expect(checker.check("1.1")).toEqual(false)
+      })
+    }
+
+    {
+      const checker = rangeOf("1.2.*")
+      test(`rangeOf(1.2.*) valid`, () => {
+        expect(checker.check("1.2")).toEqual(true)
+        expect(checker.check("1.2.1")).toEqual(true)
+      })
+      test(`rangeOf(1.2.*) invalid`, () => {
+        expect(checker.check("1.3")).toEqual(false)
+        expect(checker.check("1.3.1")).toEqual(false)
+
+        expect(checker.check("1.1.1")).toEqual(false)
+        expect(checker.check("1.1")).toEqual(false)
+        expect(checker.check("1")).toEqual(false)
+
+        expect(checker.check("2")).toEqual(false)
+      })
+    }
+
+    {
+      const checker = notRange(rangeOf("1.2.*"))
+      test(`notRange(rangeOf(1.2.*)) valid`, () => {
+        expect(checker.check("1.3")).toEqual(true)
+        expect(checker.check("1.3.1")).toEqual(true)
+
+        expect(checker.check("1.1.1")).toEqual(true)
+        expect(checker.check("1.1")).toEqual(true)
+        expect(checker.check("1")).toEqual(true)
+
+        expect(checker.check("2")).toEqual(true)
+      })
+      test(`notRange(rangeOf(1.2.*)) invalid `, () => {
+        expect(checker.check("1.2")).toEqual(false)
+        expect(checker.check("1.2.1")).toEqual(false)
+      })
+    }
+    {
+      const checker = rangeOf("!1.2.*")
+      test(`!(rangeOf(1.2.*)) valid`, () => {
+        expect(checker.check("1.3")).toEqual(true)
+        expect(checker.check("1.3.1")).toEqual(true)
+
+        expect(checker.check("1.1.1")).toEqual(true)
+        expect(checker.check("1.1")).toEqual(true)
+        expect(checker.check("1")).toEqual(true)
+
+        expect(checker.check("2")).toEqual(true)
+      })
+      test(`!(rangeOf(1.2.*)) invalid `, () => {
+        expect(checker.check("1.2")).toEqual(false)
+        expect(checker.check("1.2.1")).toEqual(false)
+      })
+    }
+    {
+      test(`no and ranges`, () => {
+        expect(() => rangeAnd()).toThrow()
+      })
+      test(`no or ranges`, () => {
+        expect(() => rangeOr()).toThrow()
+      })
+    }
+    {
+      const checker = rangeOf("!>1.2.3.4")
+      test(`rangeOf("!>1.2.3.4") invalid`, () => {
+        expect(checker.check("2")).toEqual(false)
+        expect(checker.check("1.2.3.5")).toEqual(false)
+        // @ts-expect-error
+        expect(checker.check("1.2.3.4.1")).toEqual(false)
+      })
+
+      test(`rangeOf("!>1.2.3.4") valid`, () => {
+        expect(checker.check("1.2.3.4")).toEqual(true)
+        expect(checker.check("1.2.3")).toEqual(true)
+        expect(checker.check("1")).toEqual(true)
+      })
+    }
+
+    {
+      test(">1 && =1.2", () => {
+        const checker = rangeOf(">1 && =1.2")
+
+        expect(checker.check("1.2")).toEqual(true)
+        expect(checker.check("1.2.1")).toEqual(false)
+      })
+      test("=1 || =2", () => {
+        const checker = rangeOf("=1 || =2")
+
+        expect(checker.check("1")).toEqual(true)
+        expect(checker.check("2")).toEqual(true)
+        expect(checker.check("3")).toEqual(false)
+      })
+
+      test(">1 && =1.2 || =2", () => {
+        const checker = rangeOf(">1 && =1.2 || =2")
+
+        expect(checker.check("1.2")).toEqual(true)
+        expect(checker.check("1")).toEqual(false)
+        expect(checker.check("2")).toEqual(true)
+        expect(checker.check("3")).toEqual(false)
+      })
+
+      test("&& before || order of operationns:  <1.5 && >1 || >1.5 && <3", () => {
+        const checker = rangeOf("<1.5 && >1 || >1.5 && <3")
+        expect(checker.check("1.1")).toEqual(true)
+        expect(checker.check("2")).toEqual(true)
+
+        expect(checker.check("1.5")).toEqual(false)
+        expect(checker.check("1")).toEqual(false)
+        expect(checker.check("3")).toEqual(false)
+      })
+
+      test("Compare function on the emver", () => {
+        const a = EmVer.from("1.2.3")
+        const b = EmVer.from("1.2.4")
+
+        expect(a.compare(b)).toEqual("less")
+        expect(b.compare(a)).toEqual("greater")
+        expect(a.compare(a)).toEqual("equal")
+      })
+      test("Compare for sort function on the emver", () => {
+        const a = EmVer.from("1.2.3")
+        const b = EmVer.from("1.2.4")
+
+        expect(a.compareForSort(b)).toEqual(-1)
+        expect(b.compareForSort(a)).toEqual(1)
+        expect(a.compareForSort(a)).toEqual(0)
+      })
+    }
+  }
+})
diff --git a/sdk/lib/test/health.readyCheck.test.ts b/sdk/lib/test/health.readyCheck.test.ts
new file mode 100644
index 000000000..49efcc759
--- /dev/null
+++ b/sdk/lib/test/health.readyCheck.test.ts
@@ -0,0 +1,17 @@
+import { containsAddress } from "../health/checkFns/checkPortListening"
+
+describe("Health ready check", () => {
+  it("Should be able to parse an example information", () => {
+    let input = `
+  
+  sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode                                                     
+   0: 00000000:1F90 00000000:0000 0A 00000000:00000000 00:00000000 00000000     0        0 21634478 1 0000000000000000 100 0 0 10 0                  
+   1: 00000000:0050 00000000:0000 0A 00000000:00000000 00:00000000 00000000     0        0 21634477 1 0000000000000000 100 0 0 10 0                  
+   2: 0B00007F:9671 00000000:0000 0A 00000000:00000000 00:00000000 00000000     0        0 21635458 1 0000000000000000 100 0 0 10 0                  
+   3: 00000000:0D73 00000000:0000 0A 00000000:00000000 00:00000000 00000000     0        0 21634479 1 0000000000000000 100 0 0 10 0   
+  `
+
+    expect(containsAddress(input, 80)).toBe(true)
+    expect(containsAddress(input, 1234)).toBe(false)
+  })
+})
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
new file mode 100644
index 000000000..01ce6f3f2
--- /dev/null
+++ b/sdk/lib/test/host.test.ts
@@ -0,0 +1,27 @@
+import { NetworkInterfaceBuilder } from "../interfaces/NetworkInterfaceBuilder"
+import { Effects } from "../types"
+import { createUtils } from "../util"
+
+describe("host", () => {
+  test("Testing that the types work", () => {
+    async function test(effects: Effects) {
+      const utils = createUtils<never, never>(effects)
+      const foo = utils.host.multi("foo")
+      const fooOrigin = await foo.bindPort(80, { protocol: "http" as const })
+      const fooInterface = new NetworkInterfaceBuilder({
+        effects,
+        name: "Foo",
+        id: "foo",
+        description: "A Foo",
+        hasPrimary: false,
+        disabled: false,
+        type: "ui",
+        username: "bar",
+        path: "/baz",
+        search: { qux: "yes" },
+      })
+
+      await fooInterface.export([fooOrigin])
+    }
+  })
+})
diff --git a/sdk/lib/test/makeOutput.ts b/sdk/lib/test/makeOutput.ts
new file mode 100644
index 000000000..cef17a7e8
--- /dev/null
+++ b/sdk/lib/test/makeOutput.ts
@@ -0,0 +1,428 @@
+import { oldSpecToBuilder } from "../../scripts/oldSpecToBuilder"
+
+oldSpecToBuilder(
+  // Make the location
+  "./lib/test/output.ts",
+  // Put the config here
+  {
+    mediasources: {
+      type: "list",
+      subtype: "enum",
+      name: "Media Sources",
+      description: "List of Media Sources to use with Jellyfin",
+      range: "[1,*)",
+      default: ["nextcloud"],
+      spec: {
+        values: ["nextcloud", "filebrowser"],
+        "value-names": {
+          nextcloud: "NextCloud",
+          filebrowser: "File Browser",
+        },
+      },
+    },
+    testListUnion: {
+      type: "list",
+      subtype: "union",
+      name: "Lightning Nodes",
+      description: "List of Lightning Network node instances to manage",
+      range: "[1,*)",
+      default: ["lnd"],
+      spec: {
+        type: "string",
+        "display-as": "{{name}}",
+        "unique-by": "name",
+        name: "Node Implementation",
+        tag: {
+          id: "type",
+          name: "Type",
+          description:
+            "- LND: Lightning Network Daemon from Lightning Labs\n- CLN: Core Lightning from Blockstream\n",
+          "variant-names": {
+            lnd: "Lightning Network Daemon (LND)",
+            "c-lightning": "Core Lightning (CLN)",
+          },
+        },
+        default: "lnd",
+        variants: {
+          lnd: {
+            name: {
+              type: "string",
+              name: "Node Name",
+              description: "Name of this node in the list",
+              default: "LND Wrapper",
+              nullable: false,
+            },
+          },
+        },
+      },
+    },
+    rpc: {
+      type: "object",
+      name: "RPC Settings",
+      description: "RPC configuration options.",
+      spec: {
+        enable: {
+          type: "boolean",
+          name: "Enable",
+          description: "Allow remote RPC requests.",
+          default: true,
+        },
+        username: {
+          type: "string",
+          nullable: false,
+          name: "Username",
+          description: "The username for connecting to Bitcoin over RPC.",
+          default: "bitcoin",
+          masked: true,
+          pattern: "^[a-zA-Z0-9_]+$",
+          "pattern-description":
+            "Must be alphanumeric (can contain underscore).",
+        },
+        password: {
+          type: "string",
+          nullable: false,
+          name: "RPC Password",
+          description: "The password for connecting to Bitcoin over RPC.",
+          default: {
+            charset: "a-z,2-7",
+            len: 20,
+          },
+          pattern: '^[^\\n"]*$',
+          "pattern-description":
+            "Must not contain newline or quote characters.",
+          copyable: true,
+          masked: true,
+        },
+        bio: {
+          type: "string",
+          nullable: false,
+          name: "Username",
+          description: "The username for connecting to Bitcoin over RPC.",
+          default: "bitcoin",
+          masked: true,
+          pattern: "^[a-zA-Z0-9_]+$",
+          "pattern-description":
+            "Must be alphanumeric (can contain underscore).",
+          textarea: true,
+        },
+        advanced: {
+          type: "object",
+          name: "Advanced",
+          description: "Advanced RPC Settings",
+          spec: {
+            auth: {
+              name: "Authorization",
+              description:
+                "Username and hashed password for JSON-RPC connections. RPC clients connect using the usual http basic authentication.",
+              type: "list",
+              subtype: "string",
+              default: [],
+              spec: {
+                pattern:
+                  "^[a-zA-Z0-9_-]+:([0-9a-fA-F]{2})+\\$([0-9a-fA-F]{2})+$",
+                "pattern-description":
+                  'Each item must be of the form "<USERNAME>:<SALT>$<HASH>".',
+                masked: false,
+              },
+              range: "[0,*)",
+            },
+            serialversion: {
+              name: "Serialization Version",
+              description:
+                "Return raw transaction or block hex with Segwit or non-SegWit serialization.",
+              type: "enum",
+              values: ["non-segwit", "segwit"],
+              "value-names": {},
+              default: "segwit",
+            },
+            servertimeout: {
+              name: "Rpc Server Timeout",
+              description:
+                "Number of seconds after which an uncompleted RPC call will time out.",
+              type: "number",
+              nullable: false,
+              range: "[5,300]",
+              integral: true,
+              units: "seconds",
+              default: 30,
+            },
+            threads: {
+              name: "Threads",
+              description:
+                "Set the number of threads for handling RPC calls. You may wish to increase this if you are making lots of calls via an integration.",
+              type: "number",
+              nullable: false,
+              default: 16,
+              range: "[1,64]",
+              integral: true,
+            },
+            workqueue: {
+              name: "Work Queue",
+              description:
+                "Set the depth of the work queue to service RPC calls. Determines how long the backlog of RPC requests can get before it just rejects new ones.",
+              type: "number",
+              nullable: false,
+              default: 128,
+              range: "[8,256]",
+              integral: true,
+              units: "requests",
+            },
+          },
+        },
+      },
+    },
+    "zmq-enabled": {
+      type: "boolean",
+      name: "ZeroMQ Enabled",
+      description: "Enable the ZeroMQ interface",
+      default: true,
+    },
+    txindex: {
+      type: "boolean",
+      name: "Transaction Index",
+      description: "Enable the Transaction Index (txindex)",
+      default: true,
+    },
+    wallet: {
+      type: "object",
+      name: "Wallet",
+      description: "Wallet Settings",
+      spec: {
+        enable: {
+          name: "Enable Wallet",
+          description: "Load the wallet and enable wallet RPC calls.",
+          type: "boolean",
+          default: true,
+        },
+        avoidpartialspends: {
+          name: "Avoid Partial Spends",
+          description:
+            "Group outputs by address, selecting all or none, instead of selecting on a per-output basis. This improves privacy at the expense of higher transaction fees.",
+          type: "boolean",
+          default: true,
+        },
+        discardfee: {
+          name: "Discard Change Tolerance",
+          description:
+            "The fee rate (in BTC/kB) that indicates your tolerance for discarding change by adding it to the fee.",
+          type: "number",
+          nullable: false,
+          default: 0.0001,
+          range: "[0,.01]",
+          integral: false,
+          units: "BTC/kB",
+        },
+      },
+    },
+    advanced: {
+      type: "object",
+      name: "Advanced",
+      description: "Advanced Settings",
+      spec: {
+        mempool: {
+          type: "object",
+          name: "Mempool",
+          description: "Mempool Settings",
+          spec: {
+            mempoolfullrbf: {
+              name: "Enable Full RBF",
+              description:
+                "Policy for your node to use for relaying and mining unconfirmed transactions.  For details, see https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-24.0.md#notice-of-new-option-for-transaction-replacement-policies",
+              type: "boolean",
+              default: false,
+            },
+            persistmempool: {
+              type: "boolean",
+              name: "Persist Mempool",
+              description: "Save the mempool on shutdown and load on restart.",
+              default: true,
+            },
+            maxmempool: {
+              type: "number",
+              nullable: false,
+              name: "Max Mempool Size",
+              description:
+                "Keep the transaction memory pool below <n> megabytes.",
+              range: "[1,*)",
+              integral: true,
+              units: "MiB",
+              default: 300,
+            },
+            mempoolexpiry: {
+              type: "number",
+              nullable: false,
+              name: "Mempool Expiration",
+              description:
+                "Do not keep transactions in the mempool longer than <n> hours.",
+              range: "[1,*)",
+              integral: true,
+              units: "Hr",
+              default: 336,
+            },
+          },
+        },
+        peers: {
+          type: "object",
+          name: "Peers",
+          description: "Peer Connection Settings",
+          spec: {
+            listen: {
+              type: "boolean",
+              name: "Make Public",
+              description:
+                "Allow other nodes to find your server on the network.",
+              default: true,
+            },
+            onlyconnect: {
+              type: "boolean",
+              name: "Disable Peer Discovery",
+              description: "Only connect to specified peers.",
+              default: false,
+            },
+            onlyonion: {
+              type: "boolean",
+              name: "Disable Clearnet",
+              description: "Only connect to peers over Tor.",
+              default: false,
+            },
+            addnode: {
+              name: "Add Nodes",
+              description: "Add addresses of nodes to connect to.",
+              type: "list",
+              subtype: "object",
+              range: "[0,*)",
+              default: [],
+              spec: {
+                "unique-by": null,
+                spec: {
+                  hostname: {
+                    type: "string",
+                    nullable: true,
+                    name: "Hostname",
+                    description: "Domain or IP address of bitcoin peer",
+                    pattern:
+                      "(^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$)|((^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$)|(^[a-z2-7]{16}\\.onion$)|(^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$))",
+                    "pattern-description":
+                      "Must be either a domain name, or an IPv4 or IPv6 address. Do not include protocol scheme (eg 'http://') or port.",
+                    masked: false,
+                  },
+                  port: {
+                    type: "number",
+                    nullable: true,
+                    name: "Port",
+                    description:
+                      "Port that peer is listening on for inbound p2p connections",
+                    range: "[0,65535]",
+                    integral: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+        dbcache: {
+          type: "number",
+          nullable: true,
+          name: "Database Cache",
+          description:
+            "How much RAM to allocate for caching the TXO set. Higher values improve syncing performance, but increase your chance of using up all your system's memory or corrupting your database in the event of an ungraceful shutdown. Set this high but comfortably below your system's total RAM during IBD, then turn down to 450 (or leave blank) once the sync completes.",
+          warning:
+            "WARNING: Increasing this value results in a higher chance of ungraceful shutdowns, which can leave your node unusable if it happens during the initial block download. Use this setting with caution. Be sure to set this back to the default (450 or leave blank) once your node is synced. DO NOT press the STOP button if your dbcache is large. Instead, set this number back to the default, hit save, and wait for bitcoind to restart on its own.",
+          range: "(0,*)",
+          integral: true,
+          units: "MiB",
+        },
+        pruning: {
+          type: "union",
+          name: "Pruning Settings",
+          description:
+            "Blockchain Pruning Options\nReduce the blockchain size on disk\n",
+          warning:
+            "If you set pruning to Manual and your disk is smaller than the total size of the blockchain, you MUST have something running that prunes these blocks or you may overfill your disk!\nDisabling pruning will convert your node into a full archival node. This requires a resync of the entire blockchain, a process that may take several days. Make sure you have enough free disk space or you may fill up your disk.\n",
+          tag: {
+            id: "mode",
+            name: "Pruning Mode",
+            description:
+              '- Disabled: Disable pruning\n- Automatic: Limit blockchain size on disk to a certain number of megabytes\n- Manual: Prune blockchain with the "pruneblockchain" RPC\n',
+            "variant-names": {
+              disabled: "Disabled",
+              automatic: "Automatic",
+              manual: "Manual",
+            },
+          },
+          variants: {
+            disabled: {},
+            automatic: {
+              size: {
+                type: "number",
+                nullable: false,
+                name: "Max Chain Size",
+                description: "Limit of blockchain size on disk.",
+                warning:
+                  "Increasing this value will require re-syncing your node.",
+                default: 550,
+                range: "[550,1000000)",
+                integral: true,
+                units: "MiB",
+              },
+            },
+            manual: {
+              size: {
+                type: "number",
+                nullable: false,
+                name: "Failsafe Chain Size",
+                description: "Prune blockchain if size expands beyond this.",
+                default: 65536,
+                range: "[550,1000000)",
+                integral: true,
+                units: "MiB",
+              },
+            },
+          },
+          default: "disabled",
+        },
+        blockfilters: {
+          type: "object",
+          name: "Block Filters",
+          description: "Settings for storing and serving compact block filters",
+          spec: {
+            blockfilterindex: {
+              type: "boolean",
+              name: "Compute Compact Block Filters (BIP158)",
+              description:
+                "Generate Compact Block Filters during initial sync (IBD) to enable 'getblockfilter' RPC. This is useful if dependent services need block filters to efficiently scan for addresses/transactions etc.",
+              default: true,
+            },
+            peerblockfilters: {
+              type: "boolean",
+              name: "Serve Compact Block Filters to Peers (BIP157)",
+              description:
+                "Serve Compact Block Filters as a peer service to other nodes on the network. This is useful if you wish to connect an SPV client to your node to make it efficient to scan transactions without having to download all block data.  'Compute Compact Block Filters (BIP158)' is required.",
+              default: false,
+            },
+          },
+        },
+        bloomfilters: {
+          type: "object",
+          name: "Bloom Filters (BIP37)",
+          description: "Setting for serving Bloom Filters",
+          spec: {
+            peerbloomfilters: {
+              type: "boolean",
+              name: "Serve Bloom Filters to Peers",
+              description:
+                "Peers have the option of setting filters on each connection they make after the version handshake has completed. Bloom filters are for clients implementing SPV (Simplified Payment Verification) that want to check that block headers  connect together correctly, without needing to verify the full blockchain.  The client must trust that the transactions in the chain are in fact valid.  It is highly recommended AGAINST using for anything except Bisq integration.",
+              warning:
+                "This is ONLY for use with Bisq integration, please use Block Filters for all other applications.",
+              default: false,
+            },
+          },
+        },
+      },
+    },
+  },
+  {
+    // convert this to `start-sdk/lib` for conversions
+    StartSdk: "./output.sdk",
+  },
+)
diff --git a/sdk/lib/test/mountDependencies.test.ts b/sdk/lib/test/mountDependencies.test.ts
new file mode 100644
index 000000000..84e76aa54
--- /dev/null
+++ b/sdk/lib/test/mountDependencies.test.ts
@@ -0,0 +1,125 @@
+import { setupManifest } from "../manifest/setupManifest"
+import { mountDependencies } from "../dependency/mountDependencies"
+import {
+  BuildPath,
+  setupDependencyMounts,
+} from "../dependency/setupDependencyMounts"
+
+describe("mountDependencies", () => {
+  const clnManifest = setupManifest({
+    id: "cln",
+    title: "",
+    version: "1",
+    releaseNotes: "",
+    license: "",
+    replaces: [],
+    wrapperRepo: "",
+    upstreamRepo: "",
+    supportSite: "",
+    marketingSite: "",
+    donationUrl: null,
+    description: {
+      short: "",
+      long: "",
+    },
+    assets: [],
+    images: [],
+    volumes: ["main"],
+    alerts: {
+      install: null,
+      update: null,
+      uninstall: null,
+      restore: null,
+      start: null,
+      stop: null,
+    },
+    dependencies: {},
+  })
+  const clnManifestVolumes = clnManifest.volumes
+  const lndManifest = setupManifest({
+    id: "lnd",
+    title: "",
+    version: "1",
+    releaseNotes: "",
+    license: "",
+    replaces: [],
+    wrapperRepo: "",
+    upstreamRepo: "",
+    supportSite: "",
+    marketingSite: "",
+    donationUrl: null,
+    description: {
+      short: "",
+      long: "",
+    },
+    assets: [],
+    images: [],
+    volumes: ["main2"],
+    alerts: {
+      install: null,
+      update: null,
+      uninstall: null,
+      restore: null,
+      start: null,
+      stop: null,
+    },
+    dependencies: {},
+  })
+  clnManifest.id
+
+  test("Types work", () => {
+    const dependencyMounts = setupDependencyMounts()
+      .addPath({
+        name: "root",
+        volume: "main",
+        path: "/",
+        manifest: clnManifest,
+        readonly: true,
+      })
+      .addPath({
+        name: "root",
+        manifest: lndManifest,
+        volume: "main2",
+        path: "/",
+        readonly: true,
+      })
+      .addPath({
+        name: "root",
+        manifest: lndManifest,
+        // @ts-expect-error Expect that main will throw because it is not in the thing
+        volume: "main",
+        path: "/",
+        readonly: true,
+      })
+      .build()
+    ;() => {
+      const test = mountDependencies(
+        null as any,
+        dependencyMounts,
+      ) satisfies Promise<{
+        cln: {
+          main: {
+            root: string
+          }
+        }
+        lnd: {
+          main2: {
+            root: string
+          }
+        }
+      }>
+      const test2 = mountDependencies(
+        null as any,
+        dependencyMounts.cln,
+      ) satisfies Promise<{
+        main: { root: string }
+      }>
+      const test3 = mountDependencies(
+        null as any,
+        dependencyMounts.cln.main,
+      ) satisfies Promise<{
+        root: string
+      }>
+    }
+  })
+})
diff --git a/sdk/lib/test/output.sdk.ts b/sdk/lib/test/output.sdk.ts
new file mode 100644
index 000000000..e69ef2a68
--- /dev/null
+++ b/sdk/lib/test/output.sdk.ts
@@ -0,0 +1,45 @@
+import { StartSdk } from "../StartSdk"
+import { setupManifest } from "../manifest/setupManifest"
+
+export type Manifest = any
+export const sdk = StartSdk.of()
+  .withManifest(
+    setupManifest({
+      id: "testOutput",
+      title: "",
+      version: "1.0",
+      releaseNotes: "",
+      license: "",
+      replaces: [],
+      wrapperRepo: "",
+      upstreamRepo: "",
+      supportSite: "",
+      marketingSite: "",
+      donationUrl: null,
+      description: {
+        short: "",
+        long: "",
+      },
+      containers: {},
+      images: [],
+      volumes: [],
+      assets: [],
+      alerts: {
+        install: null,
+        update: null,
+        uninstall: null,
+        restore: null,
+        start: null,
+        stop: null,
+      },
+      dependencies: {
+        remoteTest: {
+          description: "",
+          requirement: { how: "", type: "opt-in" },
+          version: "1.0",
+        },
+      },
+    }),
+  )
+  .withStore<{ storeRoot: { storeLeaf: "value" } }>()
+  .build(true)
diff --git a/sdk/lib/test/output.test.ts b/sdk/lib/test/output.test.ts
new file mode 100644
index 000000000..2b3afb5de
--- /dev/null
+++ b/sdk/lib/test/output.test.ts
@@ -0,0 +1,152 @@
+import {
+  UnionSelectKey,
+  unionSelectKey,
+  UnionValueKey,
+  unionValueKey,
+} from "../config/configTypes"
+import { ConfigSpec, matchConfigSpec } from "./output"
+import * as _I from "../index"
+import { camelCase } from "../../scripts/oldSpecToBuilder"
+import { deepMerge } from "../util/deepMerge"
+
+export type IfEquals<T, U, Y = unknown, N = never> =
+  (<G>() => G extends T ? 1 : 2) extends <G>() => G extends U ? 1 : 2 ? Y : N
+export function testOutput<A, B>(): (c: IfEquals<A, B>) => null {
+  return () => null
+}
+
+/// Testing the types of the input spec
+testOutput<ConfigSpec["rpc"]["enable"], boolean>()(null)
+testOutput<ConfigSpec["rpc"]["username"], string>()(null)
+testOutput<ConfigSpec["rpc"]["username"], string>()(null)
+
+testOutput<ConfigSpec["rpc"]["advanced"]["auth"], string[]>()(null)
+testOutput<
+  ConfigSpec["rpc"]["advanced"]["serialversion"],
+  "segwit" | "non-segwit"
+>()(null)
+testOutput<ConfigSpec["rpc"]["advanced"]["servertimeout"], number>()(null)
+testOutput<
+  ConfigSpec["advanced"]["peers"]["addnode"][0]["hostname"],
+  string | null | undefined
+>()(null)
+testOutput<
+  ConfigSpec["testListUnion"][0]["union"][UnionValueKey]["name"],
+  string
+>()(null)
+testOutput<ConfigSpec["testListUnion"][0]["union"][UnionSelectKey], "lnd">()(
+  null,
+)
+testOutput<ConfigSpec["mediasources"], Array<"filebrowser" | "nextcloud">>()(
+  null,
+)
+
+// @ts-expect-error Because enable should be a boolean
+testOutput<ConfigSpec["rpc"]["enable"], string>()(null)
+// prettier-ignore
+// @ts-expect-error Expect that the string is the one above
+testOutput<ConfigSpec["testListUnion"][0][UnionSelectKey][UnionSelectKey], "unionSelectKey">()(null);
+
+/// Here we test the output of the matchConfigSpec function
+describe("Inputs", () => {
+  const validInput: ConfigSpec = {
+    mediasources: ["filebrowser"],
+    testListUnion: [
+      {
+        union: { [unionSelectKey]: "lnd", [unionValueKey]: { name: "string" } },
+      },
+    ],
+    rpc: {
+      enable: true,
+      bio: "This is a bio",
+      username: "test",
+      password: "test",
+      advanced: {
+        auth: ["test"],
+        serialversion: "segwit",
+        servertimeout: 6,
+        threads: 3,
+        workqueue: 9,
+      },
+    },
+    "zmq-enabled": false,
+    txindex: false,
+    wallet: { enable: false, avoidpartialspends: false, discardfee: 0.0001 },
+    advanced: {
+      mempool: {
+        maxmempool: 1,
+        persistmempool: true,
+        mempoolexpiry: 23,
+        mempoolfullrbf: true,
+      },
+      peers: {
+        listen: true,
+        onlyconnect: true,
+        onlyonion: true,
+        addnode: [
+          {
+            hostname: "test",
+            port: 1,
+          },
+        ],
+      },
+      dbcache: 5,
+      pruning: {
+        unionSelectKey: "disabled",
+        unionValueKey: {},
+      },
+      blockfilters: {
+        blockfilterindex: false,
+        peerblockfilters: false,
+      },
+      bloomfilters: { peerbloomfilters: false },
+    },
+  }
+
+  test("test valid input", () => {
+    const output = matchConfigSpec.unsafeCast(validInput)
+    expect(output).toEqual(validInput)
+  })
+  test("test no longer care about the conversion of min/max and validating", () => {
+    matchConfigSpec.unsafeCast(
+      deepMerge({}, validInput, { rpc: { advanced: { threads: 0 } } }),
+    )
+  })
+  test("test errors should throw for number in string", () => {
+    expect(() =>
+      matchConfigSpec.unsafeCast(
+        deepMerge({}, validInput, { rpc: { enable: 2 } }),
+      ),
+    ).toThrowError()
+  })
+  test("Test that we set serialversion to something not segwit or non-segwit", () => {
+    expect(() =>
+      matchConfigSpec.unsafeCast(
+        deepMerge({}, validInput, {
+          rpc: { advanced: { serialversion: "testing" } },
+        }),
+      ),
+    ).toThrowError()
+  })
+})
+
+describe("camelCase", () => {
+  test("'EquipmentClass name'", () => {
+    expect(camelCase("EquipmentClass name")).toEqual("equipmentClassName")
+  })
+  test("'Equipment className'", () => {
+    expect(camelCase("Equipment className")).toEqual("equipmentClassName")
+  })
+  test("'equipment class name'", () => {
+    expect(camelCase("equipment class name")).toEqual("equipmentClassName")
+  })
+  test("'Equipment Class Name'", () => {
+    expect(camelCase("Equipment Class Name")).toEqual("equipmentClassName")
+  })
+  test("'hyphen-name-format'", () => {
+    expect(camelCase("hyphen-name-format")).toEqual("hyphenNameFormat")
+  })
+  test("'underscore_name_format'", () => {
+    expect(camelCase("underscore_name_format")).toEqual("underscoreNameFormat")
+  })
+})
diff --git a/sdk/lib/test/setupDependencyConfig.test.ts b/sdk/lib/test/setupDependencyConfig.test.ts
new file mode 100644
index 000000000..4fac5d063
--- /dev/null
+++ b/sdk/lib/test/setupDependencyConfig.test.ts
@@ -0,0 +1,27 @@
+import { sdk } from "./output.sdk"
+
+describe("setupDependencyConfig", () => {
+  test("test", () => {
+    const testConfig = sdk.Config.of({
+      test: sdk.Value.text({
+        name: "testValue",
+        required: false,
+      }),
+    })
+
+    const testConfig2 = sdk.Config.of({
+      test2: sdk.Value.text({
+        name: "testValue2",
+        required: false,
+      }),
+    })
+    const remoteTest = sdk.DependencyConfig.of({
+      localConfig: testConfig,
+      remoteConfig: testConfig2,
+      dependencyConfig: async ({}) => {},
+    })
+    sdk.setupDependencyConfig(testConfig, {
+      remoteTest,
+    })
+  })
+})
diff --git a/sdk/lib/test/store.test.ts b/sdk/lib/test/store.test.ts
new file mode 100644
index 000000000..2ed8c4dfd
--- /dev/null
+++ b/sdk/lib/test/store.test.ts
@@ -0,0 +1,115 @@
+import { Effects } from "../types"
+import { createMainUtils } from "../util"
+import { createUtils } from "../util/utils"
+
+type Store = {
+  config: {
+    someValue: "a" | "b"
+  }
+}
+type Manifest = any
+const todo = <A>(): A => {
+  throw new Error("not implemented")
+}
+const noop = () => {}
+describe("Store", () => {
+  test("types", async () => {
+    ;async () => {
+      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn("/config", {
+        someValue: "a",
+      })
+      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn(
+        "/config/someValue",
+        "b",
+      )
+      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn("", {
+        config: { someValue: "b" },
+      })
+      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn(
+        "/config/someValue",
+
+        // @ts-expect-error Type is wrong for the setting value
+        5,
+      )
+      createUtils(todo<Effects>()).store.setOwn(
+        // @ts-expect-error Path is wrong
+        "/config/someVae3lue",
+        "someValue",
+      )
+
+      todo<Effects>().store.set<Store, "/config/someValue">({
+        path: "/config/someValue",
+        value: "b",
+      })
+      todo<Effects>().store.set<Store, "/config/some2Value">({
+        //@ts-expect-error Path is wrong
+        path: "/config/someValue",
+        //@ts-expect-error Path is wrong
+        value: "someValueIn",
+      })
+      todo<Effects>().store.set<Store, "/config/someValue">({
+        //@ts-expect-error Path is wrong
+        path: "/config/some2Value",
+        value: "a",
+      })
+      ;(await createMainUtils<Manifest, Store>(todo<Effects>())
+        .store.getOwn("/config/someValue")
+        .const()) satisfies string
+      ;(await createMainUtils<Manifest, Store>(todo<Effects>())
+        .store.getOwn("/config")
+        .const()) satisfies Store["config"]
+      await createMainUtils(todo<Effects>())
+        // @ts-expect-error Path is wrong
+        .store.getOwn("/config/somdsfeValue")
+        .const()
+      ///  ----------------- ERRORS -----------------
+
+      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn("", {
+        // @ts-expect-error Type is wrong for the setting value
+        config: { someValue: "notInAOrB" },
+      })
+      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn(
+        "/config/someValue",
+        // @ts-expect-error Type is wrong for the setting value
+        "notInAOrB",
+      )
+      ;(await createUtils<Manifest, Store>(todo<Effects>())
+        .store.getOwn("/config/someValue")
+        // @ts-expect-error Const should normally not be callable
+        .const()) satisfies string
+      ;(await createUtils<Manifest, Store>(todo<Effects>())
+        .store.getOwn("/config")
+        // @ts-expect-error Const should normally not be callable
+        .const()) satisfies Store["config"]
+      await createUtils<Manifest, Store>(todo<Effects>())
+        // @ts-expect-error Path is wrong
+        .store.getOwn("/config/somdsfeValue")
+        // @ts-expect-error Const should normally not be callable
+        .const()
+
+      ///
+      ;(await createUtils<Manifest, Store>(todo<Effects>())
+        .store.getOwn("/config/someValue")
+        // @ts-expect-error satisfies type is wrong
+        .const()) satisfies number
+      ;(await createMainUtils(todo<Effects>())
+        // @ts-expect-error Path is wrong
+        .store.getOwn("/config/")
+        .const()) satisfies Store["config"]
+      ;(await todo<Effects>().store.get<Store, "/config/someValue">({
+        path: "/config/someValue",
+        callback: noop,
+      })) satisfies string
+      await todo<Effects>().store.get<Store, "/config/someValue">({
+        // @ts-expect-error Path is wrong as in it doesn't match above
+        path: "/config/someV2alue",
+        callback: noop,
+      })
+      await todo<Effects>().store.get<Store, "/config/someV2alue">({
+        // @ts-expect-error Path is wrong as in it doesn't exists in wrapper type
+        path: "/config/someV2alue",
+        callback: noop,
+      })
+    }
+  })
+})
diff --git a/sdk/lib/test/util.deepMerge.test.ts b/sdk/lib/test/util.deepMerge.test.ts
new file mode 100644
index 000000000..25a4a7d22
--- /dev/null
+++ b/sdk/lib/test/util.deepMerge.test.ts
@@ -0,0 +1,26 @@
+import { deepEqual } from "../util/deepEqual"
+import { deepMerge } from "../util/deepMerge"
+
+describe("deepMerge", () => {
+  test("deepMerge({}, {a: 1}, {b: 2}) should return {a: 1, b: 2}", () => {
+    expect(deepMerge({}, { a: 1 }, { b: 2 })).toEqual({ a: 1, b: 2 })
+  })
+  test("deepMerge(null, [1,2,3]) should equal [1,2,3]", () => {
+    expect(deepMerge(null, [1, 2, 3])).toEqual([1, 2, 3])
+  })
+  test("deepMerge({a: {b: 1, c:2}}, {a: {b: 3}}) should equal {a: {b: 3, c: 2}}", () => {
+    expect(deepMerge({ a: { b: 1, c: 2 } }, { a: { b: 3 } })).toEqual({
+      a: { b: 3, c: 2 },
+    })
+  })
+  test("deepMerge({a: {b: 1, c:2}}, {a: {b: 3}}) should equal {a: {b: 3, c: 2}} with deep equal", () => {
+    expect(
+      deepEqual(deepMerge({ a: { b: 1, c: 2 } }, { a: { b: 3 } }), {
+        a: { b: 3, c: 2 },
+      }),
+    ).toBeTruthy()
+  })
+  test("deepMerge([1,2,3], [2,3,4]) should equal [2,3,4]", () => {
+    expect(deepMerge([1, 2, 3], [2, 3, 4])).toEqual([2, 3, 4])
+  })
+})
diff --git a/sdk/lib/test/util.getNetworkInterface.test.ts b/sdk/lib/test/util.getNetworkInterface.test.ts
new file mode 100644
index 000000000..bfddb4e8e
--- /dev/null
+++ b/sdk/lib/test/util.getNetworkInterface.test.ts
@@ -0,0 +1,20 @@
+import { getHostname } from "../util/getNetworkInterface"
+
+describe("getHostname ", () => {
+  const inputToExpected = [
+    ["http://localhost:3000", "localhost"],
+    ["http://localhost", "localhost"],
+    ["localhost", "localhost"],
+    ["http://127.0.0.1/", "127.0.0.1"],
+    ["http://127.0.0.1/testing/1234?314345", "127.0.0.1"],
+    ["127.0.0.1/", "127.0.0.1"],
+    ["http://mail.google.com/", "mail.google.com"],
+    ["mail.google.com/", "mail.google.com"],
+  ]
+
+  for (const [input, expectValue] of inputToExpected) {
+    test(`should return ${expectValue} for ${input}`, () => {
+      expect(getHostname(input)).toEqual(expectValue)
+    })
+  }
+})
diff --git a/sdk/lib/test/utils.splitCommand.test.ts b/sdk/lib/test/utils.splitCommand.test.ts
new file mode 100644
index 000000000..71f214c07
--- /dev/null
+++ b/sdk/lib/test/utils.splitCommand.test.ts
@@ -0,0 +1,42 @@
+import { getHostname } from "../util/getNetworkInterface"
+import { splitCommand } from "../util/splitCommand"
+
+describe("splitCommand ", () => {
+  const inputToExpected = [
+    ["cat", ["cat"]],
+    [["cat"], ["cat"]],
+    [
+      ["cat", "hello all my homies"],
+      ["cat", "hello all my homies"],
+    ],
+    ["cat hello world", ["cat", "hello", "world"]],
+    ["cat hello 'big world'", ["cat", "hello", "big world"]],
+    [`cat hello "big world"`, ["cat", "hello", "big world"]],
+    [
+      `cat hello "big world's are the greatest"`,
+      ["cat", "hello", "big world's are the greatest"],
+    ],
+    // Too many spaces
+    ["cat      ", ["cat"]],
+    [["cat   "], ["cat   "]],
+    [
+      ["cat   ", "hello all my homies    "],
+      ["cat   ", "hello all my homies    "],
+    ],
+    ["cat        hello   world ", ["cat", "hello", "world"]],
+    [
+      "        cat      hello     'big  world'       ",
+      ["cat", "hello", "big  world"],
+    ],
+    [
+      `     cat     hello    "big   world"       `,
+      ["cat", "hello", "big   world"],
+    ],
+  ]
+
+  for (const [input, expectValue] of inputToExpected) {
+    test(`should return ${expectValue} for ${input}`, () => {
+      expect(splitCommand(input as any)).toEqual(expectValue)
+    })
+  }
+})
diff --git a/sdk/lib/trigger/TriggerInput.ts b/sdk/lib/trigger/TriggerInput.ts
new file mode 100644
index 000000000..9a52d8ca5
--- /dev/null
+++ b/sdk/lib/trigger/TriggerInput.ts
@@ -0,0 +1,6 @@
+import { HealthStatus } from "../types"
+
+export type TriggerInput = {
+  lastResult?: HealthStatus
+  hadSuccess?: boolean
+}
diff --git a/sdk/lib/trigger/changeOnFirstSuccess.ts b/sdk/lib/trigger/changeOnFirstSuccess.ts
new file mode 100644
index 000000000..28129e3e5
--- /dev/null
+++ b/sdk/lib/trigger/changeOnFirstSuccess.ts
@@ -0,0 +1,30 @@
+import { Trigger } from "./index"
+
+export function changeOnFirstSuccess(o: {
+  beforeFirstSuccess: Trigger
+  afterFirstSuccess: Trigger
+}): Trigger {
+  return async function* (getInput) {
+    const beforeFirstSuccess = o.beforeFirstSuccess(getInput)
+    yield
+    let currentValue = getInput()
+    beforeFirstSuccess.next()
+    for (
+      let res = await beforeFirstSuccess.next();
+      currentValue?.lastResult !== "passing" && !res.done;
+      res = await beforeFirstSuccess.next()
+    ) {
+      yield
+      currentValue = getInput()
+    }
+    const afterFirstSuccess = o.afterFirstSuccess(getInput)
+    for (
+      let res = await afterFirstSuccess.next();
+      !res.done;
+      res = await afterFirstSuccess.next()
+    ) {
+      yield
+      currentValue = getInput()
+    }
+  }
+}
diff --git a/sdk/lib/trigger/cooldownTrigger.ts b/sdk/lib/trigger/cooldownTrigger.ts
new file mode 100644
index 000000000..991e81054
--- /dev/null
+++ b/sdk/lib/trigger/cooldownTrigger.ts
@@ -0,0 +1,8 @@
+export function cooldownTrigger(timeMs: number) {
+  return async function* () {
+    while (true) {
+      await new Promise((resolve) => setTimeout(resolve, timeMs))
+      yield
+    }
+  }
+}
diff --git a/sdk/lib/trigger/defaultTrigger.ts b/sdk/lib/trigger/defaultTrigger.ts
new file mode 100644
index 000000000..bd52dc7cc
--- /dev/null
+++ b/sdk/lib/trigger/defaultTrigger.ts
@@ -0,0 +1,8 @@
+import { cooldownTrigger } from "./cooldownTrigger"
+import { changeOnFirstSuccess } from "./changeOnFirstSuccess"
+import { successFailure } from "./successFailure"
+
+export const defaultTrigger = successFailure({
+  duringSuccess: cooldownTrigger(0),
+  duringError: cooldownTrigger(30000),
+})
diff --git a/sdk/lib/trigger/index.ts b/sdk/lib/trigger/index.ts
new file mode 100644
index 000000000..6da034262
--- /dev/null
+++ b/sdk/lib/trigger/index.ts
@@ -0,0 +1,7 @@
+import { TriggerInput } from "./TriggerInput"
+export { changeOnFirstSuccess } from "./changeOnFirstSuccess"
+export { cooldownTrigger } from "./cooldownTrigger"
+
+export type Trigger = (
+  getInput: () => TriggerInput,
+) => AsyncIterator<unknown, unknown, never>
diff --git a/sdk/lib/trigger/successFailure.ts b/sdk/lib/trigger/successFailure.ts
new file mode 100644
index 000000000..1886402c4
--- /dev/null
+++ b/sdk/lib/trigger/successFailure.ts
@@ -0,0 +1,32 @@
+import { Trigger } from "."
+
+export function successFailure(o: {
+  duringSuccess: Trigger
+  duringError: Trigger
+}): Trigger {
+  return async function* (getInput) {
+    while (true) {
+      const beforeSuccess = o.duringSuccess(getInput)
+      yield
+      let currentValue = getInput()
+      beforeSuccess.next()
+      for (
+        let res = await beforeSuccess.next();
+        currentValue?.lastResult !== "passing" && !res.done;
+        res = await beforeSuccess.next()
+      ) {
+        yield
+        currentValue = getInput()
+      }
+      const duringError = o.duringError(getInput)
+      for (
+        let res = await duringError.next();
+        currentValue?.lastResult === "passing" && !res.done;
+        res = await duringError.next()
+      ) {
+        yield
+        currentValue = getInput()
+      }
+    }
+  }
+}
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
new file mode 100644
index 000000000..657c09c3d
--- /dev/null
+++ b/sdk/lib/types.ts
@@ -0,0 +1,526 @@
+export * as configTypes from "./config/configTypes"
+import { InputSpec } from "./config/configTypes"
+import { DependenciesReceipt } from "./config/setupConfig"
+import { PortOptions } from "./interfaces/Host"
+import { Daemons } from "./mainFn/Daemons"
+import { Overlay } from "./util/Overlay"
+import { UrlString } from "./util/getNetworkInterface"
+import { NetworkInterfaceType, Signals } from "./util/utils"
+
+export type ExportedAction = (options: {
+  effects: Effects
+  input?: Record<string, unknown>
+}) => Promise<ActionResult>
+export type MaybePromise<A> = A | Promise<A>
+export namespace ExpectedExports {
+  version: 1
+  /** Set configuration is called after we have modified and saved the configuration in the start9 ui. Use this to make a file for the docker to read from for configuration.  */
+  export type setConfig = (options: {
+    effects: Effects
+    input: Record<string, unknown>
+  }) => Promise<void>
+  /** Get configuration returns a shape that describes the format that the start9 ui will generate, and later send to the set config  */
+  export type getConfig = (options: { effects: Effects }) => Promise<ConfigRes>
+  // /** These are how we make sure the our dependency configurations are valid and if not how to fix them. */
+  // export type dependencies = Dependencies;
+  /** For backing up service data though the startOS UI */
+  export type createBackup = (options: { effects: Effects }) => Promise<unknown>
+  /** For restoring service data that was previously backed up using the startOS UI create backup flow. Backup restores are also triggered via the startOS UI, or doing a system restore flow during setup. */
+  export type restoreBackup = (options: {
+    effects: Effects
+  }) => Promise<unknown>
+
+  // /** Health checks are used to determine if the service is working properly after starting
+  //  * A good use case is if we are using a web server, seeing if we can get to the web server.
+  //  */
+  // export type health = {
+  //   /** Should be the health check id */
+  //   [id: string]: (options: { effects: Effects; input: TimeMs }) => Promise<unknown>;
+  // };
+
+  /**
+   * Actions are used so we can effect the service, like deleting a directory.
+   * One old use case is to add a action where we add a file, that will then be run during the
+   * service starting, and that file would indicate that it would rescan all the data.
+   */
+  export type actions = (options: { effects: Effects }) => MaybePromise<{
+    [id: string]: {
+      run: ExportedAction
+      getConfig: (options: { effects: Effects }) => Promise<InputSpec>
+    }
+  }>
+
+  export type actionsMetadata = (options: {
+    effects: Effects
+  }) => Promise<Array<ActionMetadata>>
+
+  /**
+   * This is the entrypoint for the main container. Used to start up something like the service that the
+   * package represents, like running a bitcoind in a bitcoind-wrapper.
+   */
+  export type main = (options: {
+    effects: Effects
+    started(onTerm: () => PromiseLike<void>): PromiseLike<void>
+  }) => Promise<Daemons<any, any>>
+
+  /**
+   * After a shutdown, if we wanted to do any operations to clean up things, like
+   * set the action as unavailable or something.
+   */
+  export type afterShutdown = (options: {
+    effects: Effects
+  }) => Promise<unknown>
+
+  /**
+   * Every time a package completes an install, this function is called before the main.
+   * Can be used to do migration like things.
+   */
+  export type init = (options: {
+    effects: Effects
+    previousVersion: null | string
+  }) => Promise<unknown>
+  /** This will be ran during any time a package is uninstalled, for example during a update
+   * this will be called.
+   */
+  export type uninit = (options: {
+    effects: Effects
+    nextVersion: null | string
+  }) => Promise<unknown>
+
+  /** Auto configure is used to make sure that other dependencies have the values t
+   * that this service could use.
+   */
+  export type dependencyConfig = Record<PackageId, DependencyConfig>
+}
+export type TimeMs = number
+export type VersionString = string
+
+/**
+ * AutoConfigure is used as the value to the key of package id,
+ * this is used to make sure that other dependencies have the values that this service could use.
+ */
+export type DependencyConfig = {
+  /** During autoconfigure, we have access to effects and local data. We are going to figure out all the data that we need and send it to update. For the sdk it is the desired delta */
+  query(options: { effects: Effects; localConfig: unknown }): Promise<unknown>
+  /** This is the second part. Given the query results off the previous function, we will determine what to change the remote config to. In our sdk normall we are going to use the previous as a deep merge. */
+  update(options: {
+    queryResults: unknown
+    remoteConfig: unknown
+  }): Promise<unknown>
+}
+
+export type ValidIfNoStupidEscape<A> = A extends
+  | `${string}'"'"'${string}`
+  | `${string}\\"${string}`
+  ? never
+  : "" extends A & ""
+    ? never
+    : A
+
+export type ConfigRes = {
+  /** This should be the previous config, that way during set config we start with the previous */
+  config?: null | Record<string, unknown>
+  /** Shape that is describing the form in the ui */
+  spec: InputSpec
+}
+
+declare const DaemonProof: unique symbol
+export type DaemonReceipt = {
+  [DaemonProof]: never
+}
+export type Daemon = {
+  wait(): Promise<string>
+  term(): Promise<void>
+  [DaemonProof]: never
+}
+
+export type HealthStatus = "passing" | "warning" | "failing" | "disabled"
+
+export type SmtpValue = {
+  server: string
+  port: number
+  from: string
+  login: string
+  password: string | null | undefined
+}
+
+export type CommandType<A extends string> =
+  | ValidIfNoStupidEscape<A>
+  | [string, ...string[]]
+
+export type DaemonReturned = {
+  wait(): Promise<null>
+  term(options?: { signal?: Signals; timeout?: number }): Promise<void>
+}
+
+export type ActionMetadata = {
+  name: string
+  description: string
+  id: string
+  input: InputSpec
+  allowedStatuses: "only-running" | "only-stopped" | "any" | "disabled"
+  /**
+   * So the ordering of the actions is by alphabetical order of the group, then followed by the alphabetical of the actions
+   */
+  group?: string
+}
+export declare const hostName: unique symbol
+export type HostName = string & { [hostName]: never }
+/** ${scheme}://${username}@${host}:${externalPort}${suffix} */
+export type Address = {
+  username: string | null
+  hostId: string
+  options: PortOptions
+  suffix: string
+}
+
+export type InterfaceId = string
+
+export type NetworkInterface = {
+  interfaceId: InterfaceId
+  /** The title of this field to be displayed */
+  name: string
+  /** Human readable description, used as tooltip usually */
+  description: string
+  /** Whether or not one address must be the primary address */
+  hasPrimary: boolean
+  /** Disabled interfaces do not serve, but they retain their metadata and addresses */
+  disabled: boolean
+  /** All URIs */
+  addresses: Address[]
+
+  /** The netowrk interface could be serveral types, something like ui, p2p, or network */
+  type: NetworkInterfaceType
+}
+// prettier-ignore
+export type ExposeAllServicePaths<Store, PreviousPath extends string = ""> = 
+  Store extends Record<string, unknown> ? {[K in keyof Store & string]: ExposeAllServicePaths<Store[K], `${PreviousPath}/${K & string}`>}[keyof Store & string] :
+  PreviousPath
+// prettier-ignore
+export type ExposeAllUiPaths<Store, PreviousPath extends string = ""> = 
+  Store extends Record<string, unknown> ? {[K in keyof Store & string]: ExposeAllUiPaths<Store[K], `${PreviousPath}/${K & string}`>}[keyof Store & string] :
+  Store extends string ? PreviousPath : 
+  never
+export type ExposeServicePaths<Store> = Array<{
+  /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
+  path: ExposeAllServicePaths<Store>
+}>
+
+export type ExposeUiPaths<Store> = Array<{
+  /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
+  path: ExposeAllUiPaths<Store>
+  /** A human readable title for the value */
+  title: string
+  /** A human readable description or explanation of the value */
+  description?: string
+  /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
+  masked?: boolean
+  /** (string/number only) Whether or not to include a button for copying the value to clipboard */
+  copyable?: boolean
+  /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
+  qr?: boolean
+}>
+/** Used to reach out from the pure js runtime */
+export type Effects = {
+  executeAction<Input>(opts: {
+    serviceId?: string
+    input: Input
+  }): Promise<unknown>
+
+  /** A low level api used by makeOverlay */
+  createOverlayedImage(options: { imageId: string }): Promise<string>
+
+  /** Removes all network bindings */
+  clearBindings(): Promise<void>
+  /** Creates a host connected to the specified port with the provided options */
+  bind(
+    options: {
+      kind: "static" | "single" | "multi"
+      id: string
+      internalPort: number
+    } & PortOptions,
+  ): Promise<void>
+  /** Retrieves the current hostname(s) associated with a host id */
+  getHostnames(options: {
+    kind: "static" | "single"
+    hostId: string
+    packageId?: string
+    callback: () => void
+  }): Promise<[HostName]>
+  getHostnames(options: {
+    kind?: "multi"
+    packageId?: string
+    hostId: string
+    callback: () => void
+  }): Promise<[HostName, ...HostName[]]>
+
+  // /**
+  //  * Run rsync between two volumes. This is used to backup data between volumes.
+  //  * This is a long running process, and a structure that we can either wait for, or get the progress of.
+  //  */
+  // runRsync(options: {
+  //   srcVolume: string
+  //   dstVolume: string
+  //   srcPath: string
+  //   dstPath: string
+  //   // rsync options: https://linux.die.net/man/1/rsync
+  //   options: BackupOptions
+  // }): {
+  //   id: () => Promise<string>
+  //   wait: () => Promise<null>
+  //   progress: () => Promise<number>
+  // }
+
+  store: {
+    /** Get a value in a json like data, can be observed and subscribed */
+    get<Store = never, Path extends string = never>(options: {
+      /** If there is no packageId it is assumed the current package */
+      packageId?: string
+      /** The path defaults to root level, using the [JsonPath](https://jsonpath.com/) */
+      path: Path & EnsureStorePath<Store, Path>
+      callback: (config: unknown, previousConfig: unknown) => void
+    }): Promise<ExtractStore<Store, Path>>
+    /** Used to store values that can be accessed and subscribed to */
+    set<Store = never, Path extends string = never>(options: {
+      /** Sets the value for the wrapper at the path, it will override, using the [JsonPath](https://jsonpath.com/)  */
+      path: Path & EnsureStorePath<Store, Path>
+      value: ExtractStore<Store, Path>
+    }): Promise<void>
+  }
+
+  getSystemSmtp(input: {
+    callback: (config: unknown, previousConfig: unknown) => void
+  }): Promise<SmtpValue>
+
+  getLocalHostname(): Promise<string>
+  getIPHostname(): Promise<string[]>
+  /** Get the address for another service for tor interfaces */
+  getServiceTorHostname(
+    interfaceId: InterfaceId,
+    packageId?: string,
+  ): Promise<string>
+  /** Get the IP address of the container */
+  getContainerIp(): Promise<string>
+  /**
+   * Get the port address for another service
+   */
+  getServicePortForward(
+    internalPort: number,
+    packageId?: string,
+  ): Promise<number>
+
+  /** Removes all network interfaces */
+  clearNetworkInterfaces(): Promise<void>
+  /** When we want to create a link in the front end interfaces, and example is
+   * exposing a url to view a web service
+   */
+  exportNetworkInterface(options: NetworkInterface): Promise<string>
+
+  exposeForDependents<Store = never>(
+    options: ExposeServicePaths<Store>,
+  ): Promise<void>
+
+  exposeUi<Store = never>(options: ExposeUiPaths<Store>): Promise<void>
+  /**
+   * There are times that we want to see the addresses that where exported
+   * @param options.addressId If we want to filter the address id
+   *
+   * Note: any auth should be filtered out already
+   */
+  getInterface(options: {
+    packageId?: PackageId
+    interfaceId: InterfaceId
+    callback: () => void
+  }): Promise<NetworkInterface>
+
+  /**
+   * The user sets the primary url for a interface
+   * @param options
+   */
+  getPrimaryUrl(options: {
+    packageId?: PackageId
+    interfaceId: InterfaceId
+    callback: () => void
+  }): Promise<UrlString | null>
+
+  /**
+   * There are times that we want to see the addresses that where exported
+   * @param options.addressId If we want to filter the address id
+   *
+   * Note: any auth should be filtered out already
+   */
+  listInterface(options: {
+    packageId?: PackageId
+    callback: () => void
+  }): Promise<NetworkInterface[]>
+
+  /**
+   *Remove an address that was exported. Used problably during main or during setConfig.
+   * @param options
+   */
+  removeAddress(options: { id: string }): Promise<void>
+
+  /**
+   *
+   * @param options
+   */
+  exportAction(options: ActionMetadata): Promise<void>
+  /**
+   * Remove an action that was exported. Used problably during main or during setConfig.
+   */
+  removeAction(options: { id: string }): Promise<void>
+
+  getConfigured(): Promise<boolean>
+  /**
+   * This called after a valid set config as well as during init.
+   * @param configured
+   */
+  setConfigured(configured: boolean): Promise<void>
+
+  /**
+   *
+   * @returns  PEM encoded fullchain (ecdsa)
+   */
+  getSslCertificate: (
+    packageId?: string,
+    algorithm?: "ecdsa" | "ed25519",
+  ) => Promise<[string, string, string]>
+  /**
+   * @returns PEM encoded ssl key (ecdsa)
+   */
+  getSslKey: (
+    packageId?: string,
+    algorithm?: "ecdsa" | "ed25519",
+  ) => Promise<string>
+
+  setHealth(o: {
+    name: string
+    status: HealthStatus
+    message?: string
+  }): Promise<void>
+
+  /** Set the dependencies of what the service needs, usually ran during the set config as a best practice */
+  setDependencies(dependencies: Dependencies): Promise<DependenciesReceipt>
+  /** Exists could be useful during the runtime to know if some service exists, option dep */
+  exists(packageId: PackageId): Promise<boolean>
+  /** Exists could be useful during the runtime to know if some service is running, option dep */
+  running(packageId: PackageId): Promise<boolean>
+
+  /** Instead of creating proxies with nginx, we have a utility to create and maintain a proxy in the lifetime of this running. */
+  reverseProxy(options: {
+    bind: {
+      /** Optional, default is 0.0.0.0 */
+      ip?: string
+      port: number
+      ssl: boolean
+    }
+    dst: {
+      /** Optional: default is 127.0.0.1 */
+      ip?: string // optional, default 127.0.0.1
+      port: number
+      ssl: boolean
+    }
+    http?: {
+      // optional, will do TCP layer proxy only if not present
+      headers?: (headers: Record<string, string>) => Record<string, string>
+    }
+  }): Promise<{ stop(): Promise<void> }>
+  restart(): void
+  shutdown(): void
+
+  mount(options: {
+    location: string
+    target: {
+      packageId: string
+      volumeId: string
+      path: string
+      readonly: boolean
+    }
+  }): Promise<string>
+
+  stopped(packageId?: string): Promise<boolean>
+}
+
+// prettier-ignore
+export type ExtractStore<Store, Path extends string> = 
+  Path extends `/${infer A }/${infer Rest }` ? (A extends keyof Store ? ExtractStore<Store[A], `/${Rest}`> : never) :
+  Path extends `/${infer A }` ? (A extends keyof Store ? Store[A] : never) :
+  Path extends '' ? Store :
+  never
+
+// prettier-ignore
+type _EnsureStorePath<Store, Path extends string, Origin extends string> = 
+  Path extends`/${infer A }/${infer Rest}` ? (Store extends {[K in A & string]: infer NextStore} ? _EnsureStorePath<NextStore, `/${Rest}`, Origin> : never) :
+  Path extends `/${infer A }`  ? (Store extends {[K in A]: infer B} ? Origin : never) :
+  Path extends '' ? Origin :
+  never
+// prettier-ignore
+export type EnsureStorePath<Store, Path extends string> = _EnsureStorePath<Store, Path, Path>
+
+/** rsync options: https://linux.die.net/man/1/rsync
+ */
+export type BackupOptions = {
+  delete: boolean
+  force: boolean
+  ignoreExisting: boolean
+  exclude: string[]
+}
+/**
+ * This is the metadata that is returned from the metadata call.
+ */
+export type Metadata = {
+  fileType: string
+  isDir: boolean
+  isFile: boolean
+  isSymlink: boolean
+  len: number
+  modified?: Date
+  accessed?: Date
+  created?: Date
+  readonly: boolean
+  uid: number
+  gid: number
+  mode: number
+}
+
+export type MigrationRes = {
+  configured: boolean
+}
+
+export type ActionResult = {
+  message: string
+  value: null | {
+    value: string
+    copyable: boolean
+    qr: boolean
+  }
+}
+export type SetResult = {
+  /** These are the unix process signals */
+  signal: Signals
+  "depends-on": DependsOn
+}
+
+export type PackageId = string
+export type Message = string
+export type DependencyKind = "running" | "exists"
+
+export type DependsOn = {
+  [packageId: string]: string[]
+}
+
+export type KnownError =
+  | { error: string }
+  | {
+      "error-code": [number, string] | readonly [number, string]
+    }
+
+export type Dependency = {
+  id: PackageId
+  kind: DependencyKind
+}
+export type Dependencies = Array<Dependency>
+
+export type DeepPartial<T> = T extends {}
+  ? { [P in keyof T]?: DeepPartial<T[P]> }
+  : T
diff --git a/sdk/lib/util/GetSystemSmtp.ts b/sdk/lib/util/GetSystemSmtp.ts
new file mode 100644
index 000000000..1853afd78
--- /dev/null
+++ b/sdk/lib/util/GetSystemSmtp.ts
@@ -0,0 +1,37 @@
+import { Effects } from "../types"
+
+export class GetSystemSmtp {
+  constructor(readonly effects: Effects) {}
+
+  /**
+   * Returns the system SMTP credentials. Restarts the service if the credentials change
+   */
+  const() {
+    return this.effects.getSystemSmtp({
+      callback: this.effects.restart,
+    })
+  }
+  /**
+   * Returns the system SMTP credentials. Does nothing if the credentials change
+   */
+  once() {
+    return this.effects.getSystemSmtp({
+      callback: () => {},
+    })
+  }
+  /**
+   * Watches the system SMTP credentials. Takes a custom callback function to run whenever the credentials change
+   */
+  async *watch() {
+    while (true) {
+      let callback: () => void
+      const waitForNext = new Promise<void>((resolve) => {
+        callback = resolve
+      })
+      yield await this.effects.getSystemSmtp({
+        callback: () => callback(),
+      })
+      await waitForNext
+    }
+  }
+}
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
new file mode 100644
index 000000000..5f928289d
--- /dev/null
+++ b/sdk/lib/util/Overlay.ts
@@ -0,0 +1,154 @@
+import * as fs from "fs/promises"
+import * as T from "../types"
+import * as cp from "child_process"
+import { promisify } from "util"
+import { Buffer } from "node:buffer"
+export const execFile = promisify(cp.execFile)
+const WORKDIR = (imageId: string) => `/media/startos/images/${imageId}/`
+export class Overlay {
+  private constructor(
+    readonly effects: T.Effects,
+    readonly imageId: string,
+    readonly rootfs: string,
+  ) {}
+  static async of(effects: T.Effects, imageId: string) {
+    const rootfs = await effects.createOverlayedImage({ imageId })
+
+    for (const dirPart of ["dev", "sys", "proc", "run"] as const) {
+      await fs.mkdir(`${rootfs}/${dirPart}`, { recursive: true })
+      await execFile("mount", [
+        "--rbind",
+        `/${dirPart}`,
+        `${rootfs}/${dirPart}`,
+      ])
+    }
+
+    return new Overlay(effects, imageId, rootfs)
+  }
+
+  async mount(options: MountOptions, path: string): Promise<Overlay> {
+    path = path.startsWith("/")
+      ? `${this.rootfs}${path}`
+      : `${this.rootfs}/${path}`
+    if (options.type === "volume") {
+      await execFile("mount", [
+        "--bind",
+        `/media/startos/volumes/${options.id}`,
+        path,
+      ])
+    } else if (options.type === "assets") {
+      await execFile("mount", [
+        "--bind",
+        `/media/startos/assets/${options.id}`,
+        path,
+      ])
+    } else if (options.type === "pointer") {
+      await this.effects.mount({ location: path, target: options })
+    } else {
+      throw new Error(`unknown type ${(options as any).type}`)
+    }
+    return this
+  }
+
+  async destroy() {
+    await execFile("umount", ["-R", this.rootfs])
+    await fs.rm(this.rootfs, { recursive: true, force: true })
+  }
+
+  async exec(
+    command: string[],
+    options?: CommandOptions,
+  ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
+    const imageMeta = await fs
+      .readFile(`/media/startos/images/${this.imageId}.json`, {
+        encoding: "utf8",
+      })
+      .catch(() => "{}")
+      .then(JSON.parse)
+    let extra: string[] = []
+    if (options?.user) {
+      extra.push(`--user=${options.user}`)
+      delete options.user
+    }
+    let workdir = imageMeta.workdir || "/"
+    if (options?.cwd) {
+      workdir = options.cwd
+      delete options.cwd
+    }
+    return await execFile(
+      "start-cli",
+      [
+        "chroot",
+        `--env=/media/startos/images/${this.imageId}.env`,
+        `--workdir=${workdir}`,
+        ...extra,
+        this.rootfs,
+        ...command,
+      ],
+      options,
+    )
+  }
+
+  async spawn(
+    command: string[],
+    options?: CommandOptions,
+  ): Promise<cp.ChildProcessWithoutNullStreams> {
+    const imageMeta = await fs
+      .readFile(`/media/startos/images/${this.imageId}.json`, {
+        encoding: "utf8",
+      })
+      .catch(() => "{}")
+      .then(JSON.parse)
+    let extra: string[] = []
+    if (options?.user) {
+      extra.push(`--user=${options.user}`)
+      delete options.user
+    }
+    let workdir = imageMeta.workdir || "/"
+    if (options?.cwd) {
+      workdir = options.cwd
+      delete options.cwd
+    }
+    return cp.spawn(
+      "start-cli",
+      [
+        "chroot",
+        `--env=/media/startos/images/${this.imageId}.env`,
+        `--workdir=${workdir}`,
+        ...extra,
+        this.rootfs,
+        ...command,
+      ],
+      options,
+    )
+  }
+}
+
+export type CommandOptions = {
+  env?: { [variable: string]: string }
+  cwd?: string
+  user?: string
+}
+
+export type MountOptions =
+  | MountOptionsVolume
+  | MountOptionsAssets
+  | MountOptionsPointer
+
+export type MountOptionsVolume = {
+  type: "volume"
+  id: string
+}
+
+export type MountOptionsAssets = {
+  type: "assets"
+  id: string
+}
+
+export type MountOptionsPointer = {
+  type: "pointer"
+  packageId: string
+  volumeId: string
+  path: string
+  readonly: boolean
+}
diff --git a/sdk/lib/util/deepEqual.ts b/sdk/lib/util/deepEqual.ts
new file mode 100644
index 000000000..8e6ba4b65
--- /dev/null
+++ b/sdk/lib/util/deepEqual.ts
@@ -0,0 +1,19 @@
+import { object } from "ts-matches"
+
+export function deepEqual(...args: unknown[]) {
+  if (!object.test(args[args.length - 1])) return args[args.length - 1]
+  const objects = args.filter(object.test)
+  if (objects.length === 0) {
+    for (const x of args) if (x !== args[0]) return false
+    return true
+  }
+  if (objects.length !== args.length) return false
+  const allKeys = new Set(objects.flatMap((x) => Object.keys(x)))
+  for (const key of allKeys) {
+    for (const x of objects) {
+      if (!(key in x)) return false
+      if (!deepEqual((objects[0] as any)[key], (x as any)[key])) return false
+    }
+  }
+  return true
+}
diff --git a/sdk/lib/util/deepMerge.ts b/sdk/lib/util/deepMerge.ts
new file mode 100644
index 000000000..ae68c242f
--- /dev/null
+++ b/sdk/lib/util/deepMerge.ts
@@ -0,0 +1,17 @@
+import { object } from "ts-matches"
+
+export function deepMerge(...args: unknown[]): unknown {
+  const lastItem = (args as any)[args.length - 1]
+  if (!object.test(lastItem)) return lastItem
+  const objects = args.filter(object.test).filter((x) => !Array.isArray(x))
+  if (objects.length === 0) return lastItem as any
+  if (objects.length === 1) objects.unshift({})
+  const allKeys = new Set(objects.flatMap((x) => Object.keys(x)))
+  for (const key of allKeys) {
+    const filteredValues = objects.flatMap((x) =>
+      key in x ? [(x as any)[key]] : [],
+    )
+    ;(objects as any)[0][key] = deepMerge(...filteredValues)
+  }
+  return objects[0] as any
+}
diff --git a/sdk/lib/util/fileHelper.ts b/sdk/lib/util/fileHelper.ts
new file mode 100644
index 000000000..56706f95a
--- /dev/null
+++ b/sdk/lib/util/fileHelper.ts
@@ -0,0 +1,147 @@
+import * as matches from "ts-matches"
+import * as YAML from "yaml"
+import * as TOML from "@iarna/toml"
+import * as T from "../types"
+import * as fs from "fs"
+
+const previousPath = /(.+?)\/([^/]*)$/
+
+/**
+ * Used in the get config and the set config exported functions.
+ * The idea is that we are going to be reading/ writing to a file, or multiple files. And then we use this tool
+ * to keep the same path on the read and write, and have methods for helping with structured data.
+ * And if we are not using a structured data, we can use the raw method which forces the construction of a BiMap
+ * ```ts
+        import {InputSpec} from './InputSpec.ts'
+        import {matches, T} from '../deps.ts';
+        const { object, string, number, boolean, arrayOf, array, anyOf, allOf } = matches
+        const someValidator = object({
+        data: string
+        })
+        const jsonFile = FileHelper.json({
+        path: 'data.json',
+        validator: someValidator,
+        volume: 'main'
+        })
+        const  tomlFile = FileHelper.toml({
+        path: 'data.toml',
+        validator: someValidator,
+        volume: 'main'
+        })
+        const rawFile = FileHelper.raw({
+        path: 'data.amazingSettings',
+        volume: 'main'
+        fromData(dataIn: Data): string {
+            return `myDatais ///- ${dataIn.data}`
+        },
+        toData(rawData: string): Data {
+        const [,data] = /myDatais \/\/\/- (.*)/.match(rawData)
+        return {data}
+        }
+        })
+
+        export const setConfig : T.ExpectedExports.setConfig= async (effects, config) => {
+        await  jsonFile.write({ data: 'here lies data'}, effects)
+        }
+
+        export const getConfig: T.ExpectedExports.getConfig = async (effects, config) => ({
+        spec: InputSpec,
+        config: nullIfEmpty({
+            ...jsonFile.get(effects)
+        })
+    ```
+ */
+export class FileHelper<A> {
+  protected constructor(
+    readonly path: string,
+    readonly writeData: (dataIn: A) => string,
+    readonly readData: (stringValue: string) => A,
+  ) {}
+  async write(data: A, effects: T.Effects) {
+    if (previousPath.exec(this.path)) {
+      await new Promise((resolve, reject) =>
+        fs.mkdir(this.path, (err: any) => (!err ? resolve(null) : reject(err))),
+      )
+    }
+
+    await new Promise((resolve, reject) =>
+      fs.writeFile(this.path, this.writeData(data), (err: any) =>
+        !err ? resolve(null) : reject(err),
+      ),
+    )
+  }
+  async read(effects: T.Effects) {
+    if (!fs.existsSync(this.path)) {
+      return null
+    }
+    return this.readData(
+      await new Promise((resolve, reject) =>
+        fs.readFile(this.path, (err: any, data: any) =>
+          !err ? resolve(data.toString("utf-8")) : reject(err),
+        ),
+      ),
+    )
+  }
+  /**
+   * Create a File Helper for an arbitrary file type.
+   *
+   * Provide custom functions for translating data to the file format and visa versa.
+   */
+  static raw<A>(
+    path: string,
+    toFile: (dataIn: A) => string,
+    fromFile: (rawData: string) => A,
+  ) {
+    return new FileHelper<A>(path, toFile, fromFile)
+  }
+  /**
+   * Create a File Helper for a .json file
+   */
+  static json<A>(path: string, shape: matches.Validator<unknown, A>) {
+    return new FileHelper<A>(
+      path,
+      (inData) => {
+        return JSON.stringify(inData, null, 2)
+      },
+      (inString) => {
+        return shape.unsafeCast(JSON.parse(inString))
+      },
+    )
+  }
+  /**
+   * Create a File Helper for a .toml file
+   */
+  static toml<A extends Record<string, unknown>>(
+    path: string,
+    shape: matches.Validator<unknown, A>,
+  ) {
+    return new FileHelper<A>(
+      path,
+      (inData) => {
+        return TOML.stringify(inData as any)
+      },
+      (inString) => {
+        return shape.unsafeCast(TOML.parse(inString))
+      },
+    )
+  }
+  /**
+   * Create a File Helper for a .yaml file
+   */
+  static yaml<A extends Record<string, unknown>>(
+    path: string,
+    shape: matches.Validator<unknown, A>,
+  ) {
+    return new FileHelper<A>(
+      path,
+      (inData) => {
+        return JSON.stringify(inData, null, 2)
+      },
+      (inString) => {
+        return shape.unsafeCast(YAML.parse(inString))
+      },
+    )
+  }
+}
+
+export default FileHelper
diff --git a/sdk/lib/util/getDefaultString.ts b/sdk/lib/util/getDefaultString.ts
new file mode 100644
index 000000000..fa35b4e66
--- /dev/null
+++ b/sdk/lib/util/getDefaultString.ts
@@ -0,0 +1,10 @@
+import { DefaultString } from "../config/configTypes"
+import { getRandomString } from "./getRandomString"
+
+export function getDefaultString(defaultSpec: DefaultString): string {
+  if (typeof defaultSpec === "string") {
+    return defaultSpec
+  } else {
+    return getRandomString(defaultSpec)
+  }
+}
diff --git a/sdk/lib/util/getNetworkInterface.ts b/sdk/lib/util/getNetworkInterface.ts
new file mode 100644
index 000000000..91c401429
--- /dev/null
+++ b/sdk/lib/util/getNetworkInterface.ts
@@ -0,0 +1,313 @@
+import { Address, Effects, HostName, NetworkInterface } from "../types"
+import * as regexes from "./regexes"
+import { NetworkInterfaceType } from "./utils"
+
+export type UrlString = string
+export type HostId = string
+
+const getHostnameRegex = /^(\w+:\/\/)?([^\/\:]+)(:\d{1,3})?(\/)?/
+export const getHostname = (url: string): HostName | null => {
+  const founds = url.match(getHostnameRegex)?.[2]
+  if (!founds) return null
+  const parts = founds.split("@")
+  const last = parts[parts.length - 1] as HostName | null
+  return last
+}
+
+export type Filled = {
+  hostnames: HostName[]
+  onionHostnames: HostName[]
+  localHostnames: HostName[]
+  ipHostnames: HostName[]
+  ipv4Hostnames: HostName[]
+  ipv6Hostnames: HostName[]
+  nonIpHostnames: HostName[]
+  allHostnames: HostName[]
+
+  urls: UrlString[]
+  onionUrls: UrlString[]
+  localUrls: UrlString[]
+  ipUrls: UrlString[]
+  ipv4Urls: UrlString[]
+  ipv6Urls: UrlString[]
+  nonIpUrls: UrlString[]
+  allUrls: UrlString[]
+}
+export type FilledAddress = Address & Filled
+export type NetworkInterfaceFilled = {
+  interfaceId: string
+  /** The title of this field to be displayed */
+  name: string
+  /** Human readable description, used as tooltip usually */
+  description: string
+  /** Whether or not the interface has a primary URL */
+  hasPrimary: boolean
+  /** Whether or not the interface disabled */
+  disabled: boolean
+  /** All URIs */
+  addresses: FilledAddress[]
+
+  /** Indicates if we are a ui/ p2p/ api/ other for the kind of interface that this is representing */
+  type: NetworkInterfaceType
+
+  primaryHostname: HostName | null
+  primaryUrl: UrlString | null
+} & Filled
+const either =
+  <A>(...args: ((a: A) => boolean)[]) =>
+  (a: A) =>
+    args.some((x) => x(a))
+const negate =
+  <A>(fn: (a: A) => boolean) =>
+  (a: A) =>
+    !fn(a)
+const unique = <A>(values: A[]) => Array.from(new Set(values))
+const addressHostToUrl = (
+  { options, username, suffix }: Address,
+  host: HostName,
+): UrlString => {
+  const scheme = host.endsWith(".onion")
+    ? options.scheme
+    : options.addSsl
+      ? options.addSsl.scheme
+      : options.scheme // TODO: encode whether hostname transport is "secure"?
+  return `${scheme ? `${scheme}//` : ""}${
+    username ? `${username}@` : ""
+  }${host}${suffix}`
+}
+export const filledAddress = (
+  mapHostnames: {
+    [hostId: string]: HostName[]
+  },
+  address: Address,
+): FilledAddress => {
+  const toUrl = addressHostToUrl.bind(null, address)
+  const hostnames = mapHostnames[address.hostId] ?? []
+  return {
+    ...address,
+    hostnames,
+    get onionHostnames() {
+      return hostnames.filter(regexes.torHostname.test)
+    },
+    get localHostnames() {
+      return hostnames.filter(regexes.localHostname.test)
+    },
+    get ipHostnames() {
+      return hostnames.filter(either(regexes.ipv4.test, regexes.ipv6.test))
+    },
+    get ipv4Hostnames() {
+      return hostnames.filter(regexes.ipv4.test)
+    },
+    get ipv6Hostnames() {
+      return hostnames.filter(regexes.ipv6.test)
+    },
+    get nonIpHostnames() {
+      return hostnames.filter(
+        negate(either(regexes.ipv4.test, regexes.ipv6.test)),
+      )
+    },
+    allHostnames: hostnames,
+    get urls() {
+      return hostnames.map(toUrl)
+    },
+    get onionUrls() {
+      return hostnames.filter(regexes.torHostname.test).map(toUrl)
+    },
+    get localUrls() {
+      return hostnames.filter(regexes.localHostname.test).map(toUrl)
+    },
+    get ipUrls() {
+      return hostnames
+        .filter(either(regexes.ipv4.test, regexes.ipv6.test))
+        .map(toUrl)
+    },
+    get ipv4Urls() {
+      return hostnames.filter(regexes.ipv4.test).map(toUrl)
+    },
+    get ipv6Urls() {
+      return hostnames.filter(regexes.ipv6.test).map(toUrl)
+    },
+    get nonIpUrls() {
+      return hostnames
+        .filter(negate(either(regexes.ipv4.test, regexes.ipv6.test)))
+        .map(toUrl)
+    },
+    get allUrls() {
+      return hostnames.map(toUrl)
+    },
+  }
+}
+
+export const networkInterfaceFilled = (
+  interfaceValue: NetworkInterface,
+  primaryUrl: UrlString | null,
+  addresses: FilledAddress[],
+): NetworkInterfaceFilled => {
+  return {
+    ...interfaceValue,
+    addresses,
+    get hostnames() {
+      return unique(addresses.flatMap((x) => x.hostnames))
+    },
+    get onionHostnames() {
+      return unique(addresses.flatMap((x) => x.onionHostnames))
+    },
+    get localHostnames() {
+      return unique(addresses.flatMap((x) => x.localHostnames))
+    },
+    get ipHostnames() {
+      return unique(addresses.flatMap((x) => x.ipHostnames))
+    },
+    get ipv4Hostnames() {
+      return unique(addresses.flatMap((x) => x.ipv4Hostnames))
+    },
+    get ipv6Hostnames() {
+      return unique(addresses.flatMap((x) => x.ipv6Hostnames))
+    },
+    get nonIpHostnames() {
+      return unique(addresses.flatMap((x) => x.nonIpHostnames))
+    },
+    get allHostnames() {
+      return unique(addresses.flatMap((x) => x.allHostnames))
+    },
+    get primaryHostname() {
+      if (primaryUrl == null) return null
+      return getHostname(primaryUrl)
+    },
+    get urls() {
+      return unique(addresses.flatMap((x) => x.urls))
+    },
+    get onionUrls() {
+      return unique(addresses.flatMap((x) => x.onionUrls))
+    },
+    get localUrls() {
+      return unique(addresses.flatMap((x) => x.localUrls))
+    },
+    get ipUrls() {
+      return unique(addresses.flatMap((x) => x.ipUrls))
+    },
+    get ipv4Urls() {
+      return unique(addresses.flatMap((x) => x.ipv4Urls))
+    },
+    get ipv6Urls() {
+      return unique(addresses.flatMap((x) => x.ipv6Urls))
+    },
+    get nonIpUrls() {
+      return unique(addresses.flatMap((x) => x.nonIpUrls))
+    },
+    get allUrls() {
+      return unique(addresses.flatMap((x) => x.allUrls))
+    },
+    primaryUrl,
+  }
+}
+const makeInterfaceFilled = async ({
+  effects,
+  interfaceId,
+  packageId,
+  callback,
+}: {
+  effects: Effects
+  interfaceId: string
+  packageId: string | undefined
+  callback: () => void
+}) => {
+  const interfaceValue = await effects.getInterface({
+    interfaceId,
+    packageId,
+    callback,
+  })
+  const hostIdsRecord = Promise.all(
+    unique(interfaceValue.addresses.map((x) => x.hostId)).map(
+      async (hostId) =>
+        [
+          hostId,
+          await effects.getHostnames({
+            packageId,
+            hostId,
+            callback,
+          }),
+        ] as const,
+    ),
+  )
+  const primaryUrl = effects.getPrimaryUrl({
+    interfaceId,
+    packageId,
+    callback,
+  })
+
+  const fillAddress = filledAddress.bind(
+    null,
+    Object.fromEntries(await hostIdsRecord),
+  )
+  const interfaceFilled: NetworkInterfaceFilled = networkInterfaceFilled(
+    interfaceValue,
+    await primaryUrl,
+    interfaceValue.addresses.map(fillAddress),
+  )
+  return interfaceFilled
+}
+
+export class GetNetworkInterface {
+  constructor(
+    readonly effects: Effects,
+    readonly opts: { interfaceId: string; packageId?: string },
+  ) {}
+
+  /**
+   * Returns the value of Store at the provided path. Restart the service if the value changes
+   */
+  async const() {
+    const { interfaceId, packageId } = this.opts
+    const callback = this.effects.restart
+    const interfaceFilled: NetworkInterfaceFilled = await makeInterfaceFilled({
+      effects: this.effects,
+      interfaceId,
+      packageId,
+      callback,
+    })
+
+    return interfaceFilled
+  }
+  /**
+   * Returns the value of NetworkInterfacesFilled at the provided path. Does nothing if the value changes
+   */
+  async once() {
+    const { interfaceId, packageId } = this.opts
+    const callback = () => {}
+    const interfaceFilled: NetworkInterfaceFilled = await makeInterfaceFilled({
+      effects: this.effects,
+      interfaceId,
+      packageId,
+      callback,
+    })
+
+    return interfaceFilled
+  }
+
+  /**
+   * Watches the value of NetworkInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
+   */
+  async *watch() {
+    const { interfaceId, packageId } = this.opts
+    while (true) {
+      let callback: () => void = () => {}
+      const waitForNext = new Promise<void>((resolve) => {
+        callback = resolve
+      })
+      yield await makeInterfaceFilled({
+        effects: this.effects,
+        interfaceId,
+        packageId,
+        callback,
+      })
+      await waitForNext
+    }
+  }
+}
+export function getNetworkInterface(
+  effects: Effects,
+  opts: { interfaceId: string; packageId?: string },
+) {
+  return new GetNetworkInterface(effects, opts)
+}
diff --git a/sdk/lib/util/getNetworkInterfaces.ts b/sdk/lib/util/getNetworkInterfaces.ts
new file mode 100644
index 000000000..625b761f5
--- /dev/null
+++ b/sdk/lib/util/getNetworkInterfaces.ts
@@ -0,0 +1,120 @@
+import { Effects, HostName } from "../types"
+import {
+  HostId,
+  NetworkInterfaceFilled,
+  filledAddress,
+  networkInterfaceFilled,
+} from "./getNetworkInterface"
+
+const makeManyInterfaceFilled = async ({
+  effects,
+  packageId,
+  callback,
+}: {
+  effects: Effects
+  packageId: string | undefined
+  callback: () => void
+}) => {
+  const interfaceValues = await effects.listInterface({
+    packageId,
+    callback,
+  })
+  const hostIdsRecord = Object.fromEntries(
+    await Promise.all(
+      Array.from(
+        new Set(
+          interfaceValues.flatMap((x) => x.addresses).map((x) => x.hostId),
+        ),
+      ).map(
+        async (hostId) =>
+          [
+            hostId,
+            await effects.getHostnames({
+              packageId,
+              hostId,
+              callback,
+            }),
+          ] as const,
+      ),
+    ),
+  )
+  const fillAddress = filledAddress.bind(null, hostIdsRecord)
+
+  const interfacesFilled: NetworkInterfaceFilled[] = await Promise.all(
+    interfaceValues.map(async (interfaceValue) =>
+      networkInterfaceFilled(
+        interfaceValue,
+        await effects.getPrimaryUrl({
+          interfaceId: interfaceValue.interfaceId,
+          packageId,
+          callback,
+        }),
+        interfaceValue.addresses.map(fillAddress),
+      ),
+    ),
+  )
+  return interfacesFilled
+}
+
+export class GetNetworkInterfaces {
+  constructor(
+    readonly effects: Effects,
+    readonly opts: { packageId?: string },
+  ) {}
+
+  /**
+   * Returns the value of Store at the provided path. Restart the service if the value changes
+   */
+  async const() {
+    const { packageId } = this.opts
+    const callback = this.effects.restart
+    const interfaceFilled: NetworkInterfaceFilled[] =
+      await makeManyInterfaceFilled({
+        effects: this.effects,
+        packageId,
+        callback,
+      })
+
+    return interfaceFilled
+  }
+  /**
+   * Returns the value of NetworkInterfacesFilled at the provided path. Does nothing if the value changes
+   */
+  async once() {
+    const { packageId } = this.opts
+    const callback = () => {}
+    const interfaceFilled: NetworkInterfaceFilled[] =
+      await makeManyInterfaceFilled({
+        effects: this.effects,
+        packageId,
+        callback,
+      })
+
+    return interfaceFilled
+  }
+
+  /**
+   * Watches the value of NetworkInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
+   */
+  async *watch() {
+    const { packageId } = this.opts
+    while (true) {
+      let callback: () => void = () => {}
+      const waitForNext = new Promise<void>((resolve) => {
+        callback = resolve
+      })
+      yield await makeManyInterfaceFilled({
+        effects: this.effects,
+        packageId,
+        callback,
+      })
+      await waitForNext
+    }
+  }
+}
+export function getNetworkInterfaces(
+  effects: Effects,
+  opts: { packageId?: string },
+) {
+  return new GetNetworkInterfaces(effects, opts)
+}
diff --git a/sdk/lib/util/getRandomCharInSet.ts b/sdk/lib/util/getRandomCharInSet.ts
new file mode 100644
index 000000000..b26eef648
--- /dev/null
+++ b/sdk/lib/util/getRandomCharInSet.ts
@@ -0,0 +1,98 @@
+// a,g,h,A-Z,,,,-
+
+import * as crypto from "crypto"
+export function getRandomCharInSet(charset: string): string {
+  const set = stringToCharSet(charset)
+  let charIdx = crypto.randomInt(0, set.len)
+  for (let range of set.ranges) {
+    if (range.len > charIdx) {
+      return String.fromCharCode(range.start.charCodeAt(0) + charIdx)
+    }
+    charIdx -= range.len
+  }
+  throw new Error("unreachable")
+}
+function stringToCharSet(charset: string): CharSet {
+  let set: CharSet = { ranges: [], len: 0 }
+  let start: string | null = null
+  let end: string | null = null
+  let in_range = false
+  for (let char of charset) {
+    switch (char) {
+      case ",":
+        if (start !== null && end !== null) {
+          if (start!.charCodeAt(0) > end!.charCodeAt(0)) {
+            throw new Error("start > end of charset")
+          }
+          const len = end.charCodeAt(0) - start.charCodeAt(0) + 1
+          set.ranges.push({
+            start,
+            end,
+            len,
+          })
+          set.len += len
+          start = null
+          end = null
+          in_range = false
+        } else if (start !== null && !in_range) {
+          set.len += 1
+          set.ranges.push({ start, end: start, len: 1 })
+          start = null
+        } else if (start !== null && in_range) {
+          end = ","
+        } else if (start === null && end === null && !in_range) {
+          start = ","
+        } else {
+          throw new Error('unexpected ","')
+        }
+        break
+      case "-":
+        if (start === null) {
+          start = "-"
+        } else if (!in_range) {
+          in_range = true
+        } else if (in_range && end === null) {
+          end = "-"
+        } else {
+          throw new Error('unexpected "-"')
+        }
+        break
+      default:
+        if (start === null) {
+          start = char
+        } else if (in_range && end === null) {
+          end = char
+        } else {
+          throw new Error(`unexpected "${char}"`)
+        }
+    }
+  }
+  if (start !== null && end !== null) {
+    if (start!.charCodeAt(0) > end!.charCodeAt(0)) {
+      throw new Error("start > end of charset")
+    }
+    const len = end.charCodeAt(0) - start.charCodeAt(0) + 1
+    set.ranges.push({
+      start,
+      end,
+      len,
+    })
+    set.len += len
+  } else if (start !== null) {
+    set.len += 1
+    set.ranges.push({
+      start,
+      end: start,
+      len: 1,
+    })
+  }
+  return set
+}
+type CharSet = {
+  ranges: {
+    start: string
+    end: string
+    len: number
+  }[]
+  len: number
+}
diff --git a/sdk/lib/util/getRandomString.ts b/sdk/lib/util/getRandomString.ts
new file mode 100644
index 000000000..ea0989bcd
--- /dev/null
+++ b/sdk/lib/util/getRandomString.ts
@@ -0,0 +1,11 @@
+import { RandomString } from "../config/configTypes"
+import { getRandomCharInSet } from "./getRandomCharInSet"
+
+export function getRandomString(generator: RandomString): string {
+  let s = ""
+  for (let i = 0; i < generator.len; i++) {
+    s = s + getRandomCharInSet(generator.charset)
+  }
+
+  return s
+}
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
new file mode 100644
index 000000000..81bd88da6
--- /dev/null
+++ b/sdk/lib/util/index.ts
@@ -0,0 +1,36 @@
+import * as T from "../types"
+
+import "./nullIfEmpty"
+import "./fileHelper"
+import "../store/getStore"
+import "./deepEqual"
+import "./deepMerge"
+import "./Overlay"
+import "./once"
+import * as utils from "./utils"
+import { SDKManifest } from "../manifest/ManifestTypes"
+
+// prettier-ignore
+export type FlattenIntersection<T> = 
+T extends ArrayLike<any> ? T :
+T extends object ? {} & {[P in keyof T]: T[P]} :
+ T;
+
+export type _<T> = FlattenIntersection<T>
+
+export const isKnownError = (e: unknown): e is T.KnownError =>
+  e instanceof Object && ("error" in e || "error-code" in e)
+
+declare const affine: unique symbol
+
+export const createUtils = utils.createUtils
+export const createMainUtils = <Manifest extends SDKManifest, Store>(
+  effects: T.Effects,
+) => createUtils<Manifest, Store, {}>(effects)
+
+type NeverPossible = { [affine]: string }
+export type NoAny<A> = NeverPossible extends A
+  ? keyof NeverPossible extends keyof A
+    ? never
+    : A
+  : A
diff --git a/sdk/lib/util/nullIfEmpty.ts b/sdk/lib/util/nullIfEmpty.ts
new file mode 100644
index 000000000..337b9098f
--- /dev/null
+++ b/sdk/lib/util/nullIfEmpty.ts
@@ -0,0 +1,12 @@
+/**
+ * A useful tool when doing a getConfig.
+ * Look into the config {@link FileHelper} for an example of the use.
+ * @param s
+ * @returns
+ */
+export default function nullIfEmpty<A extends Record<string, any>>(
+  s: null | A,
+) {
+  if (s === null) return null
+  return Object.keys(s).length === 0 ? null : s
+}
diff --git a/sdk/lib/util/once.ts b/sdk/lib/util/once.ts
new file mode 100644
index 000000000..5f689b0e1
--- /dev/null
+++ b/sdk/lib/util/once.ts
@@ -0,0 +1,9 @@
+export function once<B>(fn: () => B): () => B {
+  let result: [B] | [] = []
+  return () => {
+    if (!result.length) {
+      result = [fn()]
+    }
+    return result[0]
+  }
+}
diff --git a/sdk/lib/util/patterns.ts b/sdk/lib/util/patterns.ts
new file mode 100644
index 000000000..ac281b081
--- /dev/null
+++ b/sdk/lib/util/patterns.ts
@@ -0,0 +1,59 @@
+import { Pattern } from "../config/configTypes"
+import * as regexes from "./regexes"
+
+export const ipv6: Pattern = {
+  regex: regexes.ipv6.toString(),
+  description: "Must be a valid IPv6 address",
+}
+
+export const ipv4: Pattern = {
+  regex: regexes.ipv4.toString(),
+  description: "Must be a valid IPv4 address",
+}
+
+export const hostname: Pattern = {
+  regex: regexes.hostname.toString(),
+  description: "Must be a valid hostname",
+}
+
+export const localHostname: Pattern = {
+  regex: regexes.localHostname.toString(),
+  description: 'Must be a valid ".local" hostname',
+}
+
+export const torHostname: Pattern = {
+  regex: regexes.torHostname.toString(),
+  description: 'Must be a valid Tor (".onion") hostname',
+}
+
+export const url: Pattern = {
+  regex: regexes.url.toString(),
+  description: "Must be a valid URL",
+}
+
+export const localUrl: Pattern = {
+  regex: regexes.localUrl.toString(),
+  description: 'Must be a valid ".local" URL',
+}
+
+export const torUrl: Pattern = {
+  regex: regexes.torUrl.toString(),
+  description: 'Must be a valid Tor (".onion") URL',
+}
+
+export const ascii: Pattern = {
+  regex: regexes.ascii.toString(),
+  description:
+    "May only contain ASCII characters. See https://www.w3schools.com/charsets/ref_html_ascii.asp",
+}
+
+export const email: Pattern = {
+  regex: regexes.email.toString(),
+  description: "Must be a valid email address",
+}
+
+export const base64: Pattern = {
+  regex: regexes.base64.toString(),
+  description:
+    "May only contain base64 characters. See https://base64.guru/learn/base64-characters",
+}
diff --git a/sdk/lib/util/regexes.ts b/sdk/lib/util/regexes.ts
new file mode 100644
index 000000000..f26196381
--- /dev/null
+++ b/sdk/lib/util/regexes.ts
@@ -0,0 +1,34 @@
+// https://ihateregex.io/expr/ipv6/
+export const ipv6 =
+  /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/
+
+// https://ihateregex.io/expr/ipv4/
+export const ipv4 =
+  /(\b25[0-5]|\b2[0-4][0-9]|\b[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}/
+
+export const hostname =
+  /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/
+
+export const localHostname = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.local/
+
+export const torHostname = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.onion/
+
+// https://ihateregex.io/expr/url/
+export const url =
+  /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/
+
+export const localUrl =
+  /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.local\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/
+
+export const torUrl =
+  /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.onion\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/
+
+// https://ihateregex.io/expr/ascii/
+export const ascii = /^[ -~]*$/
+
+//https://ihateregex.io/expr/email/
+export const email = /[^@ \t\r\n]+@[^@ \t\r\n]+\.[^@ \t\r\n]+/
+
+//https://rgxdb.com/r/1NUN74O6
+export const base64 =
+  /^(?:[a-zA-Z0-9+\/]{4})*(?:|(?:[a-zA-Z0-9+\/]{3}=)|(?:[a-zA-Z0-9+\/]{2}==)|(?:[a-zA-Z0-9+\/]{1}===))$/
diff --git a/sdk/lib/util/splitCommand.ts b/sdk/lib/util/splitCommand.ts
new file mode 100644
index 000000000..bf55a74c3
--- /dev/null
+++ b/sdk/lib/util/splitCommand.ts
@@ -0,0 +1,17 @@
+import { arrayOf, string } from "ts-matches"
+import { ValidIfNoStupidEscape } from "../types"
+
+export const splitCommand = <A>(
+  command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+): string[] => {
+  if (arrayOf(string).test(command)) return command
+  return String(command)
+    .split('"')
+    .flatMap((x, i) =>
+      i % 2 !== 0
+        ? [x]
+        : x.split("'").flatMap((x, i) => (i % 2 !== 0 ? [x] : x.split(" "))),
+    )
+    .map((x) => x.trim())
+    .filter(Boolean)
+}
diff --git a/sdk/lib/util/stringFromStdErrOut.ts b/sdk/lib/util/stringFromStdErrOut.ts
new file mode 100644
index 000000000..452aaa029
--- /dev/null
+++ b/sdk/lib/util/stringFromStdErrOut.ts
@@ -0,0 +1,6 @@
+export async function stringFromStdErrOut(x: {
+  stdout: string
+  stderr: string
+}) {
+  return x?.stderr ? Promise.reject(x.stderr) : x.stdout
+}
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
new file mode 100644
index 000000000..532ff12a2
--- /dev/null
+++ b/sdk/lib/util/utils.ts
@@ -0,0 +1,293 @@
+import nullIfEmpty from "./nullIfEmpty"
+import {
+  CheckResult,
+  checkPortListening,
+  checkWebUrl,
+} from "../health/checkFns"
+import {
+  DaemonReturned,
+  Effects,
+  EnsureStorePath,
+  ExtractStore,
+  InterfaceId,
+  PackageId,
+  ValidIfNoStupidEscape,
+} from "../types"
+import { GetSystemSmtp } from "./GetSystemSmtp"
+import { DefaultString } from "../config/configTypes"
+import { getDefaultString } from "./getDefaultString"
+import { GetStore, getStore } from "../store/getStore"
+import {
+  MountDependenciesOut,
+  mountDependencies,
+} from "../dependency/mountDependencies"
+import {
+  ManifestId,
+  VolumeName,
+  NamedPath,
+  Path,
+} from "../dependency/setupDependencyMounts"
+import { Host, MultiHost, SingleHost, StaticHost } from "../interfaces/Host"
+import { NetworkInterfaceBuilder } from "../interfaces/NetworkInterfaceBuilder"
+import { GetNetworkInterface, getNetworkInterface } from "./getNetworkInterface"
+import {
+  GetNetworkInterfaces,
+  getNetworkInterfaces,
+} from "./getNetworkInterfaces"
+import * as CP from "node:child_process"
+import { promisify } from "node:util"
+import { splitCommand } from "./splitCommand"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { MountOptions, Overlay, CommandOptions } from "./Overlay"
+export type Signals = NodeJS.Signals
+
+export const SIGTERM: Signals = "SIGTERM"
+export const SIGKILL: Signals = "SIGTERM"
+export const NO_TIMEOUT = -1
+
+const childProcess = {
+  exec: promisify(CP.exec),
+  execFile: promisify(CP.execFile),
+}
+
+export type NetworkInterfaceType = "ui" | "p2p" | "api" | "other"
+
+export type Utils<
+  Manifest extends SDKManifest,
+  Store,
+  WrapperOverWrite = { const: never },
+> = {
+  checkPortListening(
+    port: number,
+    options: {
+      errorMessage: string
+      successMessage: string
+      timeoutMessage?: string
+      timeout?: number
+    },
+  ): Promise<CheckResult>
+  checkWebUrl(
+    url: string,
+    options?: {
+      timeout?: number
+      successMessage?: string
+      errorMessage?: string
+    },
+  ): Promise<CheckResult>
+  childProcess: typeof childProcess
+  createInterface: (options: {
+    name: string
+    id: string
+    description: string
+    hasPrimary: boolean
+    disabled: boolean
+    type: NetworkInterfaceType
+    username: null | string
+    path: string
+    search: Record<string, string>
+  }) => NetworkInterfaceBuilder
+  getSystemSmtp: () => GetSystemSmtp & WrapperOverWrite
+  host: {
+    static: (id: string) => StaticHost
+    single: (id: string) => SingleHost
+    multi: (id: string) => MultiHost
+  }
+  mountDependencies: <
+    In extends
+      | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
+      | Record<VolumeName, Record<NamedPath, Path>>
+      | Record<NamedPath, Path>
+      | Path,
+  >(
+    value: In,
+  ) => Promise<MountDependenciesOut<In>>
+  networkInterface: {
+    getOwn: (interfaceId: InterfaceId) => GetNetworkInterface & WrapperOverWrite
+    get: (opts: {
+      interfaceId: InterfaceId
+      packageId: PackageId
+    }) => GetNetworkInterface & WrapperOverWrite
+    getAllOwn: () => GetNetworkInterfaces & WrapperOverWrite
+    getAll: (opts: {
+      packageId: PackageId
+    }) => GetNetworkInterfaces & WrapperOverWrite
+  }
+  nullIfEmpty: typeof nullIfEmpty
+  runCommand: <A extends string>(
+    imageId: Manifest["images"][number],
+    command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+    options: CommandOptions & {
+      mounts?: { path: string; options: MountOptions }[]
+    },
+  ) => Promise<{ stdout: string | Buffer; stderr: string | Buffer }>
+  runDaemon: <A extends string>(
+    imageId: Manifest["images"][number],
+    command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+    options: CommandOptions & {
+      mounts?: { path: string; options: MountOptions }[]
+      overlay?: Overlay
+    },
+  ) => Promise<DaemonReturned>
+  store: {
+    get: <Path extends string>(
+      packageId: string,
+      path: EnsureStorePath<Store, Path>,
+    ) => GetStore<Store, Path> & WrapperOverWrite
+    getOwn: <Path extends string>(
+      path: EnsureStorePath<Store, Path>,
+    ) => GetStore<Store, Path> & WrapperOverWrite
+    setOwn: <Path extends string | never>(
+      path: EnsureStorePath<Store, Path>,
+      value: ExtractStore<Store, Path>,
+    ) => Promise<void>
+  }
+}
+export const createUtils = <
+  Manifest extends SDKManifest,
+  Store = never,
+  WrapperOverWrite = { const: never },
+>(
+  effects: Effects,
+): Utils<Manifest, Store, WrapperOverWrite> => {
+  return {
+    createInterface: (options: {
+      name: string
+      id: string
+      description: string
+      hasPrimary: boolean
+      disabled: boolean
+      type: NetworkInterfaceType
+      username: null | string
+      path: string
+      search: Record<string, string>
+    }) => new NetworkInterfaceBuilder({ ...options, effects }),
+    childProcess,
+    getSystemSmtp: () =>
+      new GetSystemSmtp(effects) as GetSystemSmtp & WrapperOverWrite,
+
+    host: {
+      static: (id: string) => new StaticHost({ id, effects }),
+      single: (id: string) => new SingleHost({ id, effects }),
+      multi: (id: string) => new MultiHost({ id, effects }),
+    },
+    nullIfEmpty,
+
+    networkInterface: {
+      getOwn: (interfaceId: InterfaceId) =>
+        getNetworkInterface(effects, { interfaceId }) as GetNetworkInterface &
+          WrapperOverWrite,
+      get: (opts: { interfaceId: InterfaceId; packageId: PackageId }) =>
+        getNetworkInterface(effects, opts) as GetNetworkInterface &
+          WrapperOverWrite,
+      getAllOwn: () =>
+        getNetworkInterfaces(effects, {}) as GetNetworkInterfaces &
+          WrapperOverWrite,
+      getAll: (opts: { packageId: PackageId }) =>
+        getNetworkInterfaces(effects, opts) as GetNetworkInterfaces &
+          WrapperOverWrite,
+    },
+    store: {
+      get: <Path extends string = never>(
+        packageId: string,
+        path: EnsureStorePath<Store, Path>,
+      ) =>
+        getStore<Store, Path>(effects, path as any, {
+          packageId,
+        }) as any,
+      getOwn: <Path extends string>(path: EnsureStorePath<Store, Path>) =>
+        getStore<Store, Path>(effects, path as any) as any,
+      setOwn: <Path extends string | never>(
+        path: EnsureStorePath<Store, Path>,
+        value: ExtractStore<Store, Path>,
+      ) => effects.store.set<Store, Path>({ value, path: path as any }),
+    },
+
+    runCommand: async <A extends string>(
+      imageId: Manifest["images"][number],
+      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+      options: CommandOptions & {
+        mounts?: { path: string; options: MountOptions }[]
+      },
+    ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
+      const commands = splitCommand(command)
+      const overlay = await Overlay.of(effects, imageId)
+      try {
+        for (let mount of options.mounts || []) {
+          await overlay.mount(mount.options, mount.path)
+        }
+        return await overlay.exec(commands)
+      } finally {
+        await overlay.destroy()
+      }
+    },
+    runDaemon: async <A extends string>(
+      imageId: Manifest["images"][number],
+      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+      options: CommandOptions & {
+        mounts?: { path: string; options: MountOptions }[]
+        overlay?: Overlay
+      },
+    ): Promise<DaemonReturned> => {
+      const commands = splitCommand(command)
+      const overlay = options.overlay || (await Overlay.of(effects, imageId))
+      for (let mount of options.mounts || []) {
+        await overlay.mount(mount.options, mount.path)
+      }
+      const childProcess = await overlay.spawn(commands, {
+        env: options.env,
+      })
+      const answer = new Promise<null>((resolve, reject) => {
+        childProcess.stdout.on("data", (data: any) => {
+          console.log(data.toString())
+        })
+        childProcess.stderr.on("data", (data: any) => {
+          console.error(data.toString())
+        })
+
+        childProcess.on("close", (code: any) => {
+          if (code === 0) {
+            return resolve(null)
+          }
+          return reject(new Error(`${commands[0]} exited with code ${code}`))
+        })
+      })
+
+      return {
+        wait() {
+          return answer
+        },
+        async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
+          try {
+            childProcess.kill(signal)
+
+            if (timeout <= NO_TIMEOUT) {
+              const didTimeout = await Promise.race([
+                new Promise((resolve) => setTimeout(resolve, timeout)).then(
+                  () => true,
+                ),
+                answer.then(() => false),
+              ])
+              if (didTimeout) childProcess.kill(SIGKILL)
+            }
+            await answer
+          } finally {
+            await overlay.destroy()
+          }
+        },
+      }
+    },
+    checkPortListening: checkPortListening.bind(null, effects),
+    checkWebUrl: checkWebUrl.bind(null, effects),
+
+    mountDependencies: <
+      In extends
+        | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
+        | Record<VolumeName, Record<NamedPath, Path>>
+        | Record<NamedPath, Path>
+        | Path,
+    >(
+      value: In,
+    ) => mountDependencies(effects, value),
+  }
+}
+function noop(): void {}
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
new file mode 100644
index 000000000..8c6d32fc8
--- /dev/null
+++ b/sdk/package-lock.json
@@ -0,0 +1,4320 @@
+{
+  "name": "@start9labs/start-sdk",
+  "version": "0.4.0-rev0.lib0.rc8.beta7",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@start9labs/start-sdk",
+      "version": "0.4.0-rev0.lib0.rc8.beta7",
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "isomorphic-fetch": "^3.0.0",
+        "ts-matches": "^5.4.1",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "jest": "^29.4.3",
+        "prettier": "^3.2.5",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
+      "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.21.3",
+        "@babel/helper-compilation-targets": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.21.2",
+        "@babel/helpers": "^7.21.0",
+        "@babel/parser": "^7.21.3",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.3",
+        "@babel/types": "^7.21.3",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.2",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
+      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.21.3",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
+      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.20.2",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.2",
+        "@babel/types": "^7.21.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
+      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
+      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
+      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
+      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
+      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
+      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.21.3",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.21.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.21.3",
+        "@babel/types": "^7.21.3",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
+      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@iarna/toml": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
+      "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
+      "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/reporters": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.5.0",
+        "jest-config": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-resolve-dependencies": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "jest-watcher": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
+      "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-mock": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.5.0",
+        "jest-snapshot": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
+      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^29.4.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
+      "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
+      "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "jest-mock": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
+      "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
+      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
+      "dev": true,
+      "dependencies": {
+        "@sinclair/typebox": "^0.25.16"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
+      "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
+      "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
+      "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^29.5.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
+      "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.5.0",
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.4.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.25.24",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
+      "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==",
+      "dev": true
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
+      "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz",
+      "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^2.0.0"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
+      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
+      "dev": true
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
+      "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
+      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
+      "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+      "dev": true
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.0.tgz",
+      "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "18.15.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz",
+      "integrity": "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==",
+      "dev": true
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz",
+      "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==",
+      "dev": true
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+      "dev": true
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
+      "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^29.5.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.5.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.5.0",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.21.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
+      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001449",
+        "electron-to-chromium": "^1.4.284",
+        "node-releases": "^2.0.8",
+        "update-browserslist-db": "^1.0.10"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001470",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001470.tgz",
+      "integrity": "sha512-065uNwY6QtHCBOExzbV6m236DDhYCCtPmQUCoQtwkVqzud8v5QPidoMr6CoMkC2nfp6nksjttqWQRRh75LqUmA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "dev": true
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.341",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.341.tgz",
+      "integrity": "sha512-R4A8VfUBQY9WmAhuqY5tjHRf5fH2AAf6vqitBOE0y6u2PgHgqHSrhZmu78dIX3fVZtjqlwJNX1i2zwC3VpHtQQ==",
+      "dev": true
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/expect-utils": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-tsconfig": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
+      "dev": true,
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isomorphic-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+      "dependencies": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      }
+    },
+    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
+      "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.5.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0",
+        "p-limit": "^3.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
+      "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.5.0",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.5.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
+      "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "prompts": "^2.0.1",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
+      "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "babel-jest": "^29.5.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.5.0",
+        "jest-environment-node": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
+      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
+      "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
+      "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
+      "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
+      "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
+      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
+      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.5.0",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
+      "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
+      "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
+      "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
+      "dev": true,
+      "dependencies": {
+        "jest-regex-util": "^29.4.3",
+        "jest-snapshot": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
+      "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/environment": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.4.3",
+        "jest-environment-node": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-leak-detector": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-resolve": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-watcher": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
+      "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/globals": "^29.5.0",
+        "@jest/source-map": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
+      "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/babel__traverse": "^7.0.6",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.5.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.5.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/jest-util": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
+      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
+      "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
+      "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.5.0",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
+      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.5.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
+      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+      "dev": true
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
+      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.4.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz",
+      "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ]
+    },
+    "node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "dev": true
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/ts-jest": {
+      "version": "29.0.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.0.5.tgz",
+      "integrity": "sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==",
+      "dev": true,
+      "dependencies": {
+        "bs-logger": "0.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^29.0.0",
+        "json5": "^2.2.3",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "^21.0.1"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/types": "^29.0.0",
+        "babel-jest": "^29.0.0",
+        "jest": "^29.0.0",
+        "typescript": ">=4.3"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@jest/types": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-jest/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/ts-matches": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.4.1.tgz",
+      "integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
+    },
+    "node_modules/ts-node": {
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tsx": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.1.tgz",
+      "integrity": "sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "~0.19.10",
+        "get-tsconfig": "^4.7.2"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/esbuild": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
+      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.19.12",
+        "@esbuild/android-arm": "0.19.12",
+        "@esbuild/android-arm64": "0.19.12",
+        "@esbuild/android-x64": "0.19.12",
+        "@esbuild/darwin-arm64": "0.19.12",
+        "@esbuild/darwin-x64": "0.19.12",
+        "@esbuild/freebsd-arm64": "0.19.12",
+        "@esbuild/freebsd-x64": "0.19.12",
+        "@esbuild/linux-arm": "0.19.12",
+        "@esbuild/linux-arm64": "0.19.12",
+        "@esbuild/linux-ia32": "0.19.12",
+        "@esbuild/linux-loong64": "0.19.12",
+        "@esbuild/linux-mips64el": "0.19.12",
+        "@esbuild/linux-ppc64": "0.19.12",
+        "@esbuild/linux-riscv64": "0.19.12",
+        "@esbuild/linux-s390x": "0.19.12",
+        "@esbuild/linux-x64": "0.19.12",
+        "@esbuild/netbsd-x64": "0.19.12",
+        "@esbuild/openbsd-x64": "0.19.12",
+        "@esbuild/sunos-x64": "0.19.12",
+        "@esbuild/win32-arm64": "0.19.12",
+        "@esbuild/win32-ia32": "0.19.12",
+        "@esbuild/win32-x64": "0.19.12"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist-lint": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-fetch": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz",
+      "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/sdk/package.json b/sdk/package.json
new file mode 100644
index 000000000..110b4bc8f
--- /dev/null
+++ b/sdk/package.json
@@ -0,0 +1,59 @@
+{
+  "name": "@start9labs/start-sdk",
+  "version": "0.4.0-rev0.lib0.rc8.beta7",
+  "description": "Software development kit to facilitate packaging services for StartOS",
+  "main": "./cjs/lib/index.js",
+  "types": "./cjs/lib/index.d.ts",
+  "module": "./mjs/lib/index.js",
+  "sideEffects": true,
+  "exports": {
+    ".": {
+      "import": "./mjs/lib/index.js",
+      "require": "./cjs/lib/index.js",
+      "types": "./cjs/lib/index.d.ts"
+    }
+  },
+  "typesVersion": {
+    ">=3.1": {
+      "*": [
+        "cjs/lib/*"
+      ]
+    }
+  },
+  "scripts": {
+    "test": "jest -c ./jest.config.js --coverage",
+    "buildOutput": "ts-node --project ./tsconfig-cjs.json  ./lib/test/makeOutput.ts && npx prettier --write '**/*.ts'",
+    "check": "tsc --noEmit"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Start9Labs/start-sdk.git"
+  },
+  "author": "Start9 Labs",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/Start9Labs/start-sdk/issues"
+  },
+  "homepage": "https://github.com/Start9Labs/start-sdk#readme",
+  "dependencies": {
+    "@iarna/toml": "^2.2.5",
+    "isomorphic-fetch": "^3.0.0",
+    "ts-matches": "^5.4.1",
+    "yaml": "^2.2.2"
+  },
+  "prettier": {
+    "trailingComma": "all",
+    "tabWidth": 2,
+    "semi": false,
+    "singleQuote": false
+  },
+  "devDependencies": {
+    "@types/jest": "^29.4.0",
+    "jest": "^29.4.3",
+    "prettier": "^3.2.5",
+    "ts-jest": "^29.0.5",
+    "ts-node": "^10.9.1",
+    "tsx": "^4.7.1",
+    "typescript": "^5.0.4"
+  }
+}
diff --git a/sdk/scripts/oldSpecToBuilder.ts b/sdk/scripts/oldSpecToBuilder.ts
new file mode 100644
index 000000000..ce8ea4e5f
--- /dev/null
+++ b/sdk/scripts/oldSpecToBuilder.ts
@@ -0,0 +1,413 @@
+import * as fs from "fs"
+
+// https://stackoverflow.com/questions/2970525/converting-any-string-into-camel-case
+export function camelCase(value: string) {
+  return value
+    .replace(/([\(\)\[\]])/g, "")
+    .replace(/^([A-Z])|[\s-_](\w)/g, function (match, p1, p2, offset) {
+      if (p2) return p2.toUpperCase()
+      return p1.toLowerCase()
+    })
+}
+
+export async function oldSpecToBuilder(
+  file: string,
+  inputData: Promise<any> | any,
+  options?: Parameters<typeof makeFileContentFromOld>[1],
+) {
+  await fs.writeFile(
+    file,
+    await makeFileContentFromOld(inputData, options),
+    (err) => console.error(err),
+  )
+}
+
+function isString(x: unknown): x is string {
+  return typeof x === "string"
+}
+
+export default async function makeFileContentFromOld(
+  inputData: Promise<any> | any,
+  { StartSdk = "start-sdk", nested = true } = {},
+) {
+  const outputLines: string[] = []
+  outputLines.push(`
+import { sdk } from "${StartSdk}"
+const {Config, List, Value, Variants} = sdk
+`)
+  const data = await inputData
+
+  const namedConsts = new Set(["Config", "Value", "List"])
+  const configName = newConst("configSpec", convertInputSpec(data))
+  const configMatcherName = newConst(
+    "matchConfigSpec",
+    `${configName}.validator`,
+  )
+  outputLines.push(
+    `export type ConfigSpec = typeof ${configMatcherName}._TYPE;`,
+  )
+
+  return outputLines.join("\n")
+
+  function newConst(key: string, data: string, type?: string) {
+    const variableName = getNextConstName(camelCase(key))
+    outputLines.push(
+      `export const ${variableName}${!type ? "" : `: ${type}`} = ${data};`,
+    )
+    return variableName
+  }
+  function maybeNewConst(key: string, data: string) {
+    if (nested) return data
+    return newConst(key, data)
+  }
+  function convertInputSpecInner(data: any) {
+    let answer = "{"
+    for (const [key, value] of Object.entries(data)) {
+      const variableName = maybeNewConst(key, convertValueSpec(value))
+
+      answer += `${JSON.stringify(key)}: ${variableName},`
+    }
+    return `${answer}}`
+  }
+
+  function convertInputSpec(data: any) {
+    return `Config.of(${convertInputSpecInner(data)})`
+  }
+  function convertValueSpec(value: any): string {
+    switch (value.type) {
+      case "string": {
+        if (value.textarea) {
+          return `${rangeToTodoComment(
+            value?.range,
+          )}Value.textarea(${JSON.stringify(
+            {
+              name: value.name || null,
+              description: value.description || null,
+              warning: value.warning || null,
+              required: !(value.nullable || false),
+              placeholder: value.placeholder || null,
+              maxLength: null,
+              minLength: null,
+            },
+            null,
+            2,
+          )})`
+        }
+        return `${rangeToTodoComment(value?.range)}Value.text(${JSON.stringify(
+          {
+            name: value.name || null,
+            // prettier-ignore
+            required: (
+              value.default != null  ? {default: value.default} :
+              value.nullable === false ? {default: null} :
+              !value.nullable
+            ),
+            description: value.description || null,
+            warning: value.warning || null,
+            masked: value.masked || false,
+            placeholder: value.placeholder || null,
+            inputmode: "text",
+            patterns: value.pattern
+              ? [
+                  {
+                    regex: value.pattern,
+                    description: value["pattern-description"],
+                  },
+                ]
+              : [],
+            minLength: null,
+            maxLength: null,
+          },
+          null,
+          2,
+        )})`
+      }
+      case "number": {
+        return `${rangeToTodoComment(
+          value?.range,
+        )}Value.number(${JSON.stringify(
+          {
+            name: value.name || null,
+            description: value.description || null,
+            warning: value.warning || null,
+            // prettier-ignore
+            required: (
+              value.default != null  ? {default: value.default} :
+              value.nullable === false ? {default: null} :
+              !value.nullable
+            ),
+            min: null,
+            max: null,
+            step: null,
+            integer: value.integral || false,
+            units: value.units || null,
+            placeholder: value.placeholder || null,
+          },
+          null,
+          2,
+        )})`
+      }
+      case "boolean": {
+        return `Value.toggle(${JSON.stringify(
+          {
+            name: value.name || null,
+            default: value.default || false,
+            description: value.description || null,
+            warning: value.warning || null,
+          },
+          null,
+          2,
+        )})`
+      }
+      case "enum": {
+        const allValueNames = new Set([
+          ...(value?.["values"] || []),
+          ...Object.keys(value?.["value-names"] || {}),
+        ])
+        const values = Object.fromEntries(
+          Array.from(allValueNames)
+            .filter(isString)
+            .map((key) => [key, value?.spec?.["value-names"]?.[key] || key]),
+        )
+        return `Value.select(${JSON.stringify(
+          {
+            name: value.name || null,
+            description: value.description || null,
+            warning: value.warning || null,
+
+            // prettier-ignore
+            required:(
+              value.default != null  ? {default: value.default} :
+              value.nullable === false ? {default: null} :
+              !value.nullable
+            ),
+            values,
+          },
+          null,
+          2,
+        )} as const)`
+      }
+      case "object": {
+        const specName = maybeNewConst(
+          value.name + "_spec",
+          convertInputSpec(value.spec),
+        )
+        return `Value.object({
+        name: ${JSON.stringify(value.name || null)},
+        description: ${JSON.stringify(value.description || null)},
+        warning: ${JSON.stringify(value.warning || null)},
+      }, ${specName})`
+      }
+      case "union": {
+        const variants = maybeNewConst(
+          value.name + "_variants",
+          convertVariants(value.variants, value.tag["variant-names"] || {}),
+        )
+
+        return `Value.union({
+        name: ${JSON.stringify(value.name || null)},
+        description: ${JSON.stringify(value.tag.description || null)},
+        warning: ${JSON.stringify(value.tag.warning || null)},
+        
+        // prettier-ignore
+        required: ${JSON.stringify(
+          // prettier-ignore
+          value.default != null  ? {default: value.default} :
+          value.nullable === false ? {default: null} :
+          !value.nullable,
+        )},
+      }, ${variants})`
+      }
+      case "list": {
+        if (value.subtype === "enum") {
+          const allValueNames = new Set([
+            ...(value?.spec?.["values"] || []),
+            ...Object.keys(value?.spec?.["value-names"] || {}),
+          ])
+          const values = Object.fromEntries(
+            Array.from(allValueNames)
+              .filter(isString)
+              .map((key: string) => [
+                key,
+                value?.spec?.["value-names"]?.[key] ?? key,
+              ]),
+          )
+          return `Value.multiselect(${JSON.stringify(
+            {
+              name: value.name || null,
+              minLength: null,
+              maxLength: null,
+              default: value.default ?? null,
+              description: value.description || null,
+              warning: value.warning || null,
+              values,
+            },
+            null,
+            2,
+          )})`
+        }
+        const list = maybeNewConst(value.name + "_list", convertList(value))
+        return `Value.list(${list})`
+      }
+      case "pointer": {
+        return `/* TODO deal with point removed point "${value.name}" */null as any`
+      }
+    }
+    throw Error(`Unknown type "${value.type}"`)
+  }
+
+  function convertList(value: any) {
+    switch (value.subtype) {
+      case "string": {
+        return `${rangeToTodoComment(value?.range)}List.text(${JSON.stringify(
+          {
+            name: value.name || null,
+            minLength: null,
+            maxLength: null,
+            default: value.default || null,
+            description: value.description || null,
+            warning: value.warning || null,
+          },
+          null,
+          2,
+        )}, ${JSON.stringify({
+          masked: value?.spec?.masked || false,
+          placeholder: value?.spec?.placeholder || null,
+          patterns: value?.spec?.pattern
+            ? [
+                {
+                  regex: value.spec.pattern,
+                  description: value?.spec?.["pattern-description"],
+                },
+              ]
+            : [],
+          minLength: null,
+          maxLength: null,
+        })})`
+      }
+      case "number": {
+        return `${rangeToTodoComment(value?.range)}List.number(${JSON.stringify(
+          {
+            name: value.name || null,
+            minLength: null,
+            maxLength: null,
+            default: value.default || null,
+            description: value.description || null,
+            warning: value.warning || null,
+          },
+          null,
+          2,
+        )}, ${JSON.stringify({
+          integer: value?.spec?.integral || false,
+          min: null,
+          max: null,
+          units: value?.spec?.units || null,
+          placeholder: value?.spec?.placeholder || null,
+        })})`
+      }
+      case "enum": {
+        return "/* error!! list.enum */"
+      }
+      case "object": {
+        const specName = maybeNewConst(
+          value.name + "_spec",
+          convertInputSpec(value.spec.spec),
+        )
+        return `${rangeToTodoComment(value?.range)}List.obj({
+          name: ${JSON.stringify(value.name || null)},
+          minLength: ${JSON.stringify(null)},
+          maxLength: ${JSON.stringify(null)},
+          default: ${JSON.stringify(value.default || null)},
+          description: ${JSON.stringify(value.description || null)},
+          warning: ${JSON.stringify(value.warning || null)},
+        }, {
+          spec: ${specName},
+          displayAs: ${JSON.stringify(value?.spec?.["display-as"] || null)},
+          uniqueBy: ${JSON.stringify(value?.spec?.["unique-by"] || null)},
+        })`
+      }
+      case "union": {
+        const variants = maybeNewConst(
+          value.name + "_variants",
+          convertVariants(
+            value.spec.variants,
+            value.spec["variant-names"] || {},
+          ),
+        )
+        const unionValueName = maybeNewConst(
+          value.name + "_union",
+          `${rangeToTodoComment(value?.range)}
+          Value.union({
+            name: ${JSON.stringify(value?.spec?.tag?.name || null)},
+            description: ${JSON.stringify(
+              value?.spec?.tag?.description || null,
+            )},
+            warning: ${JSON.stringify(value?.spec?.tag?.warning || null)},
+            required: ${JSON.stringify(
+              // prettier-ignore
+              'default' in value?.spec ? {default: value?.spec?.default} :
+              !!value?.spec?.tag?.nullable || false ? {default: null} :
+              false,
+            )},
+          }, ${variants})
+        `,
+        )
+        const listConfig = maybeNewConst(
+          value.name + "_list_config",
+          `
+          Config.of({
+            "union": ${unionValueName}
+          })
+        `,
+        )
+        return `${rangeToTodoComment(value?.range)}List.obj({
+          name:${JSON.stringify(value.name || null)},
+          minLength:${JSON.stringify(null)},
+          maxLength:${JSON.stringify(null)},
+          default: [],
+          description: ${JSON.stringify(value.description || null)},
+          warning: ${JSON.stringify(value.warning || null)},
+        }, {
+          spec: ${listConfig},
+          displayAs: ${JSON.stringify(value?.spec?.["display-as"] || null)},
+          uniqueBy: ${JSON.stringify(value?.spec?.["unique-by"] || null)},
+        })`
+      }
+    }
+    throw new Error(`Unknown subtype "${value.subtype}"`)
+  }
+
+  function convertVariants(
+    variants: Record<string, unknown>,
+    variantNames: Record<string, string>,
+  ): string {
+    let answer = "Variants.of({"
+    for (const [key, value] of Object.entries(variants)) {
+      const variantSpec = maybeNewConst(key, convertInputSpec(value))
+      answer += `"${key}": {name: "${
+        variantNames[key] || key
+      }", spec: ${variantSpec}},`
+    }
+    return `${answer}})`
+  }
+
+  function getNextConstName(name: string, i = 0): string {
+    const newName = !i ? name : name + i
+    if (namedConsts.has(newName)) {
+      return getNextConstName(name, i + 1)
+    }
+    namedConsts.add(newName)
+    return newName
+  }
+}
+
+function rangeToTodoComment(range: string | undefined) {
+  if (!range) return ""
+  return `/* TODO: Convert range for this value (${range})*/`
+}
+
+// oldSpecToBuilder(
+//   "./config.ts",
+//   // Put config here
+//   {},
+// )
diff --git a/sdk/tsconfig-base.json b/sdk/tsconfig-base.json
new file mode 100644
index 000000000..cc14a817c
--- /dev/null
+++ b/sdk/tsconfig-base.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "esnext",
+    "strict": true,
+    "outDir": "dist",
+    "preserveConstEnums": true,
+    "sourceMap": true,
+    "target": "es2017",
+    "pretty": true,
+    "declaration": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "types": ["node", "jest"],
+    "moduleResolution": "node",
+    "skipLibCheck": true
+  },
+  "include": ["lib/**/*"],
+  "exclude": ["lib/**/*.spec.ts", "lib/**/*.gen.ts", "list", "node_modules"]
+}
diff --git a/sdk/tsconfig-cjs.json b/sdk/tsconfig-cjs.json
new file mode 100644
index 000000000..8413cf248
--- /dev/null
+++ b/sdk/tsconfig-cjs.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig-base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist/cjs",
+    "target": "es2018"
+  }
+}
diff --git a/sdk/tsconfig.json b/sdk/tsconfig.json
new file mode 100644
index 000000000..8ae7d62a8
--- /dev/null
+++ b/sdk/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig-base.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "outDir": "dist/mjs",
+    "target": "esnext"
+  }
+}
diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock
index c1e0959fb..0f82176f4 100644
--- a/system-images/compat/Cargo.lock
+++ b/system-images/compat/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -32,25 +32,26 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
@@ -77,6 +78,12 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -101,26 +108,74 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "anyhow"
-version = "1.0.68"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 dependencies = [
  "backtrace",
 ]
 
 [[package]]
 name = "arrayref"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "ascii-canvas"
@@ -133,9 +188,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -144,9 +199,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2"
+checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c"
 dependencies = [
  "brotli",
  "flate2",
@@ -175,18 +230,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -198,6 +253,16 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "atomic-write-file"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436"
+dependencies = [
+ "nix 0.27.1",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -215,11 +280,88 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "axum"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "base64 0.21.7",
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.1.0",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sha1",
+ "sync_wrapper",
+ "tokio",
+ "tokio-tungstenite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-server"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ad46c3ec4e12f4a4b6835e173ba21c25e484c9d02b49770bf006ce5367c036"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.1.0",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower",
+ "tower-service",
+]
+
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
@@ -250,9 +392,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.4"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -262,9 +404,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "basic-cookies"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38"
+checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7"
 dependencies = [
  "lalrpop",
  "lalrpop-util",
@@ -313,9 +455,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 dependencies = [
  "serde",
 ]
@@ -340,13 +482,26 @@ dependencies = [
 
 [[package]]
 name = "blake2b_simd"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127"
+checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
  "arrayvec",
- "constant_time_eq 0.1.5",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "blake3"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
 ]
 
 [[package]]
@@ -361,9 +516,9 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
  "generic-array",
 ]
@@ -376,9 +531,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "brotli"
-version = "3.3.4"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -387,43 +542,31 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "2.3.4"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
+checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
 ]
 
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata 0.1.10",
- "serde",
-]
-
 [[package]]
 name = "bumpalo"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.3.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
@@ -442,9 +585,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -452,23 +595,23 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
 name = "chumsky"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d"
+checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
 dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
 name = "ciborium"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -477,18 +620,18 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
- "half",
+ "half 2.3.1",
 ]
 
 [[package]]
@@ -533,13 +676,47 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
  "atty",
  "bitflags 1.3.2",
- "clap_lex",
- "indexmap 1.9.2",
+ "clap_lex 0.2.4",
+ "indexmap 1.9.3",
  "strsim 0.10.0",
  "termcolor",
  "textwrap 0.16.0",
 ]
 
+[[package]]
+name = "clap"
+version = "4.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex 0.6.0",
+ "strsim 0.10.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "clap_lex"
 version = "0.2.4"
@@ -550,14 +727,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "codespan-reporting"
-version = "0.11.1"
+name = "clap_lex"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "color-eyre"
@@ -576,9 +749,9 @@ dependencies = [
 
 [[package]]
 name = "color-spantrace"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
 dependencies = [
  "once_cell",
  "owo-colors",
@@ -586,6 +759,12 @@ dependencies = [
  "tracing-error",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "compat"
 version = "0.1.0"
@@ -597,7 +776,7 @@ dependencies = [
  "emver",
  "failure",
  "imbl-value",
- "indexmap 1.9.2",
+ "indexmap 1.9.3",
  "itertools 0.10.5",
  "lazy_static",
  "linear-map",
@@ -607,7 +786,7 @@ dependencies = [
  "pest_derive",
  "rand 0.8.5",
  "regex",
- "rust-argon2 1.0.0",
+ "rust-argon2 1.0.1",
  "serde",
  "serde_json",
  "serde_yaml 0.8.26",
@@ -616,86 +795,58 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.1.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "const-oid"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const_format"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-xid",
 ]
 
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
 [[package]]
 name = "constant_time_eq"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
-[[package]]
-name = "container-init"
-version = "0.1.0"
-dependencies = [
- "async-stream",
- "color-eyre",
- "futures",
- "helpers",
- "imbl",
- "nix 0.27.1",
- "procfs",
- "serde",
- "serde_json",
- "tokio",
- "tokio-stream",
- "tracing",
- "tracing-error",
- "tracing-futures",
- "tracing-subscriber",
- "yajrc 0.1.0 (git+https://github.com/dr-bonez/yajrc.git?branch=develop)",
-]
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -745,15 +896,16 @@ dependencies = [
 
 [[package]]
 name = "cookie_store"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e4b6aa369f41f5faa04bb80c9b1f4216ea81646ed6124d76ba5c49a7aafd9cd"
+checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa"
 dependencies = [
  "cookie 0.16.2",
  "idna 0.2.3",
  "log",
  "publicsuffix",
  "serde",
+ "serde_derive",
  "serde_json",
  "time",
  "url",
@@ -778,9 +930,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -788,33 +940,33 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
+checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
 dependencies = [
  "crc-catalog",
 ]
 
 [[package]]
 name = "crc-catalog"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
@@ -827,21 +979,43 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "crossterm"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "cfg-if",
+ "bitflags 2.4.2",
+ "crossterm_winapi",
+ "futures-core",
+ "libc",
+ "mio",
+ "parking_lot",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+dependencies = [
+ "winapi",
 ]
 
 [[package]]
@@ -852,9 +1026,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.3"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -874,9 +1048,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-mac"
-version = "0.11.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
 dependencies = [
  "generic-array",
  "subtle",
@@ -884,22 +1058,21 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.1.6"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
 dependencies = [
- "bstr",
  "csv-core",
- "itoa 0.4.8",
+ "itoa",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "csv-core"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
 dependencies = [
  "memchr",
 ]
@@ -951,57 +1124,13 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.86"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1025,7 +1154,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1036,17 +1165,17 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.4.0"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.3",
  "lock_api",
  "once_cell",
  "parking_lot_core",
@@ -1054,9 +1183,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.3.3"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
+checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
 name = "der"
@@ -1069,6 +1198,16 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -1079,7 +1218,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1103,7 +1242,7 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
  "subtle",
@@ -1138,9 +1277,9 @@ checksum = "69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82"
 
 [[package]]
 name = "dotenvy"
-version = "0.15.6"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
 name = "drain"
@@ -1153,21 +1292,21 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.12"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272"
+checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
 
 [[package]]
 name = "ecdsa"
-version = "0.16.8"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
  "der",
  "digest 0.10.7",
  "elliptic-curve",
  "rfc6979",
- "signature 2.0.0",
+ "signature 2.2.0",
  "spki",
 ]
 
@@ -1188,7 +1327,7 @@ checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
  "serde",
- "signature 2.0.0",
+ "signature 2.2.0",
 ]
 
 [[package]]
@@ -1207,33 +1346,34 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
+checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
  "curve25519-dalek 4.1.1",
  "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
+ "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "either"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "elliptic-curve"
-version = "0.13.6"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct",
  "crypto-bigint",
@@ -1262,9 +1402,9 @@ dependencies = [
 
 [[package]]
 name = "ena"
-version = "0.14.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3"
+checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1"
 dependencies = [
  "log",
 ]
@@ -1283,9 +1423,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if",
 ]
@@ -1299,20 +1439,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1323,23 +1450,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1361,9 +1477,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "eyre"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799"
 dependencies = [
  "indenter",
  "once_cell",
@@ -1387,18 +1503,15 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
  "synstructure",
 ]
 
 [[package]]
 name = "fastrand"
-version = "1.8.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fd-lock-rs"
@@ -1421,22 +1534,28 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.1"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d"
+checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
 
 [[package]]
 name = "filetime"
-version = "0.2.19"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
- "windows-sys 0.42.0",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "finl_unicode"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -1445,9 +1564,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1487,9 +1606,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -1511,9 +1630,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1526,9 +1645,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1536,15 +1655,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1564,38 +1683,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1633,9 +1752,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1644,9 +1763,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.27.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "gpt"
@@ -1654,7 +1773,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8283e7331b8c93b9756e0cfdbcfb90312852f953c6faf9bf741e684cc3b6ad69"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "crc",
  "log",
  "uuid",
@@ -1673,17 +1792,36 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
- "indexmap 1.9.2",
+ "http 0.2.11",
+ "indexmap 2.1.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 1.0.0",
+ "indexmap 2.1.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1696,14 +1834,21 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
+[[package]]
+name = "half"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.6",
-]
 
 [[package]]
 name = "hashbrown"
@@ -1711,22 +1856,26 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.7",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.1"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+dependencies = [
+ "ahash 0.8.7",
+ "allocator-api2",
+]
 
 [[package]]
 name = "hashlink"
-version = "0.8.1"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -1747,12 +1896,12 @@ dependencies = [
  "lazy_async_pool",
  "models",
  "pin-project",
+ "rpc-toolkit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_json",
  "tokio",
  "tokio-stream",
  "tracing",
- "yajrc 0.1.0 (git+https://github.com/dr-bonez/yajrc.git?branch=develop)",
 ]
 
 [[package]]
@@ -1766,18 +1915,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
 
 [[package]]
 name = "hex"
@@ -1793,9 +1933,9 @@ checksum = "85ef6b41c333e6dd2a4aaa59125a19b633cd17e7aaf372b2260809777bcdef4a"
 
 [[package]]
 name = "hkdf"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac 0.12.1",
 ]
@@ -1821,32 +1961,66 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.5"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "http"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.5",
+ "itoa",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http",
+ "http 0.2.11",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.0.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
  "pin-project-lite",
 ]
 
@@ -1858,40 +2032,53 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.24",
+ "http 0.2.11",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
- "itoa 1.0.5",
+ "itoa",
  "pin-project-lite",
- "socket2 0.4.7",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.2",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -1899,51 +2086,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper",
+ "hyper 0.14.28",
  "native-tls",
  "tokio",
  "tokio-native-tls",
 ]
 
 [[package]]
-name = "hyper-ws-listener"
-version = "0.3.0"
+name = "hyper-util"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbfe4981e45b0a7403a55d4af12f8d30e173e722409658c3857243990e72180"
+checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67"
 dependencies = [
- "anyhow",
- "base64 0.21.4",
- "env_logger",
- "futures",
- "hyper",
- "log",
- "sha-1",
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "hyper 1.1.0",
+ "pin-project-lite",
+ "socket2",
  "tokio",
- "tokio-tungstenite",
+ "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "winapi",
+ "windows-core",
 ]
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
 ]
 
 [[package]]
@@ -1983,11 +2170,21 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "imbl"
-version = "2.0.2"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b4555023847ca2cd6fd11f20b553886e6981c7e8aee9b3e7e960b4b17fb440"
+checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085"
 dependencies = [
  "bitmaps",
  "imbl-sized-chunks",
@@ -1999,9 +2196,9 @@ dependencies = [
 
 [[package]]
 name = "imbl-sized-chunks"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076"
+checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63"
 dependencies = [
  "bitmaps",
 ]
@@ -2009,7 +2206,7 @@ dependencies = [
 [[package]]
 name = "imbl-value"
 version = "0.1.0"
-source = "git+https://github.com/Start9Labs/imbl-value.git#929395141c3a882ac366c12ac9402d0ebaa2201b"
+source = "git+https://github.com/Start9Labs/imbl-value.git#48dc39a762a3b4f9300d3b9f850cbd394e777ae0"
 dependencies = [
  "imbl",
  "serde",
@@ -2045,9 +2242,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
 name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown 0.12.3",
@@ -2056,12 +2253,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.3",
  "serde",
 ]
 
@@ -2098,20 +2295,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "io-lifetimes"
-version = "1.0.4"
+name = "integer-encoding"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+checksum = "924df4f0e24e2e7f9cdd90babb0b96f93b20f3ecfa949ea9e6613756b8c8e1bf"
 dependencies = [
- "libc",
- "windows-sys 0.42.0",
+ "async-trait",
+ "tokio",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 dependencies = [
  "serde",
 ]
@@ -2128,14 +2325,13 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.4"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
+checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
 dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
+ "hermit-abi 0.3.4",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2177,24 +2373,18 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jaq-core"
@@ -2202,10 +2392,10 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb52eeac20f256459e909bd4a03bb8c4fab6a1fdbb8ed52d00f644152df48ece"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.7",
  "dyn-clone",
  "hifijson",
- "indexmap 1.9.2",
+ "indexmap 1.9.3",
  "itertools 0.10.5",
  "jaq-parse",
  "log",
@@ -2236,12 +2426,12 @@ dependencies = [
 
 [[package]]
 name = "josekit"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5754487a088f527b1407df470db8e654e4064dccbbe1fe850e0773721e9962b7"
+checksum = "cd20997283339a19226445db97d632c8dc7adb6b8172537fe0e9e540fb141df2"
 dependencies = [
  "anyhow",
- "base64 0.21.4",
+ "base64 0.21.7",
  "flate2",
  "once_cell",
  "openssl",
@@ -2254,9 +2444,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.60"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2294,30 +2484,30 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
 
 [[package]]
 name = "lalrpop"
-version = "0.19.8"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823"
+checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
 dependencies = [
  "ascii-canvas",
- "atty",
  "bit-set",
  "diff",
  "ena",
+ "is-terminal",
  "itertools 0.10.5",
  "lalrpop-util",
  "petgraph",
  "pico-args",
  "regex",
- "regex-syntax 0.6.28",
+ "regex-syntax 0.7.5",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -2326,9 +2516,9 @@ dependencies = [
 
 [[package]]
 name = "lalrpop-util"
-version = "0.19.8"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4"
+checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
 dependencies = [
  "regex",
 ]
@@ -2343,6 +2533,12 @@ dependencies = [
  "futures",
 ]
 
+[[package]]
+name = "lazy_format"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e479e99b287d578ed5f6cd4c92cdf48db219088adb9c5b14f7c155b71dfba792"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -2354,21 +2550,32 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libm"
-version = "0.2.6"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall 0.4.1",
+]
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2385,15 +2592,6 @@ dependencies = [
  "serde_test",
 ]
 
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -2402,15 +2600,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2433,9 +2631,15 @@ dependencies = [
 
 [[package]]
 name = "matches"
-version = "0.1.9"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "mbrman"
@@ -2452,18 +2656,19 @@ dependencies = [
 
 [[package]]
 name = "md-5"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
+ "cfg-if",
  "digest 0.10.7",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memoffset"
@@ -2485,9 +2690,9 @@ dependencies = [
 
 [[package]]
 name = "mime"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minimal-lexical"
@@ -2497,20 +2702,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
  "libc",
+ "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
@@ -2519,19 +2725,20 @@ dependencies = [
 name = "models"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "color-eyre",
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek 2.1.0",
  "emver",
  "ipnet",
  "lazy_static",
  "mbrman",
+ "num_enum",
  "openssl",
  "patch-db",
  "rand 0.8.5",
  "regex",
  "reqwest",
- "rpc-toolkit",
+ "rpc-toolkit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_json",
  "sqlx",
@@ -2622,7 +2829,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "cfg-if",
  "libc",
 ]
@@ -2663,9 +2870,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2674,9 +2881,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
 dependencies = [
  "byteorder",
  "lazy_static",
@@ -2733,9 +2940,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
  "libm",
@@ -2743,33 +2950,33 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2780,18 +2987,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.30.2"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
@@ -2805,7 +3012,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c75a0ec2d1b302412fb503224289325fcc0e44600176864804c7211b055cfd58"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "byteorder",
  "md-5",
  "sha2 0.10.8",
@@ -2814,11 +3021,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.57"
+version = "0.10.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
+checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2829,13 +3036,13 @@ dependencies = [
 
 [[package]]
 name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2846,18 +3053,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.1.5+3.1.3"
+version = "300.2.1+3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491"
+checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.93"
+version = "0.9.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
+checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
 dependencies = [
  "cc",
  "libc",
@@ -2868,9 +3075,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.4.1"
+version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
 [[package]]
 name = "overload"
@@ -2908,6 +3115,20 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
+[[package]]
+name = "p521"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2"
+dependencies = [
+ "base16ct",
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "rand_core 0.6.4",
+ "sha2 0.10.8",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -2920,22 +3141,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.6"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.4.1",
  "smallvec",
- "windows-sys 0.42.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "patch-db"
@@ -2965,7 +3186,7 @@ version = "0.1.0"
 dependencies = [
  "patch-db-macro-internals",
  "proc-macro2",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2975,7 +3196,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2999,25 +3220,26 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.5.3"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a"
+checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06"
 dependencies = [
+ "memchr",
  "thiserror",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.5.3"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6"
+checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3025,22 +3247,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.5.3"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c"
+checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.5.3"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51"
+checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d"
 dependencies = [
  "once_cell",
  "pest",
@@ -3049,12 +3271,12 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.6.2"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 1.9.2",
+ "indexmap 2.1.0",
 ]
 
 [[package]]
@@ -3068,28 +3290,28 @@ dependencies = [
 
 [[package]]
 name = "pico-args"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3127,21 +3349,27 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
 
 [[package]]
 name = "platforms"
-version = "3.1.2"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8"
+checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
 
 [[package]]
 name = "portable-atomic"
-version = "1.4.3"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
@@ -3171,63 +3399,46 @@ dependencies = [
 
 [[package]]
 name = "primeorder"
-version = "0.13.2"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
 dependencies = [
  "elliptic-curve",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.2.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "once_cell",
- "thiserror",
- "toml 0.5.10",
+ "toml_edit 0.21.0",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "procfs"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f"
-dependencies = [
- "bitflags 1.3.2",
- "byteorder",
- "chrono",
- "flate2",
- "hex",
- "lazy_static",
- "rustix",
-]
-
 [[package]]
 name = "proptest"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e"
+checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3241,7 +3452,7 @@ checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3268,9 +3479,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -3340,7 +3551,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
 ]
 
 [[package]]
@@ -3385,26 +3596,35 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "getrandom 0.2.8",
- "redox_syscall 0.2.16",
+ "getrandom 0.2.12",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
+ "regex-automata 0.4.5",
  "regex-syntax 0.8.2",
 ]
 
@@ -3414,14 +3634,14 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "regex-syntax 0.6.28",
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3430,9 +3650,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
@@ -3446,32 +3666,23 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "bytes",
  "cookie 0.16.2",
- "cookie_store 0.16.1",
+ "cookie_store 0.16.2",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.24",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
  "hyper-tls",
  "ipnet",
  "js-sys",
@@ -3522,50 +3733,78 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.16.20"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
+ "getrandom 0.2.12",
  "libc",
- "once_cell",
- "spin 0.5.2",
+ "spin 0.9.8",
  "untrusted",
- "web-sys",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "rpassword"
-version = "7.2.0"
+version = "7.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
+checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f"
 dependencies = [
  "libc",
  "rtoolbox",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "rpc-toolkit"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5353673ffd8265292281141560d2b851e4da49e83e2f5e255fd473736d45ee10"
+checksum = "c48252a30abb9426a3239fa8dfd2c8dd2647bb24db0b6145db2df04ae53fe647"
 dependencies = [
  "clap 3.2.25",
  "futures",
- "hyper",
+ "hyper 0.14.28",
  "lazy_static",
  "openssl",
  "reqwest",
- "rpc-toolkit-macro",
+ "rpc-toolkit-macro 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_cbor 0.11.2",
  "serde_json",
  "thiserror",
  "tokio",
  "url",
- "yajrc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yajrc",
+]
+
+[[package]]
+name = "rpc-toolkit"
+version = "0.2.3"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#9e989e23adb440bc72faa585b28e5aa2667a0a0d"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "clap 4.4.18",
+ "futures",
+ "http 1.0.0",
+ "http-body-util",
+ "imbl-value",
+ "itertools 0.12.0",
+ "lazy_format",
+ "lazy_static",
+ "openssl",
+ "pin-project",
+ "reqwest",
+ "rpc-toolkit-macro 0.2.2 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "url",
+ "yajrc",
 ]
 
 [[package]]
@@ -3575,8 +3814,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8e4b9cb00baf2d61bcd35e98d67dcb760382a3b4540df7e63b38d053c8a7b8b"
 dependencies = [
  "proc-macro2",
- "rpc-toolkit-macro-internals",
- "syn 1.0.107",
+ "rpc-toolkit-macro-internals 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rpc-toolkit-macro"
+version = "0.2.2"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#9e989e23adb440bc72faa585b28e5aa2667a0a0d"
+dependencies = [
+ "proc-macro2",
+ "rpc-toolkit-macro-internals 0.2.2 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3587,27 +3836,36 @@ checksum = "d3e2ce21b936feaecdab9c9a8e75b9dca64374ccc11951a58045ad6559b75f42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rpc-toolkit-macro-internals"
+version = "0.2.2"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#9e989e23adb440bc72faa585b28e5aa2667a0a0d"
+dependencies = [
+ "itertools 0.12.0",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "rsa"
-version = "0.9.2"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
 dependencies = [
- "byteorder",
  "const-oid",
  "digest 0.10.7",
  "num-bigint-dig",
  "num-integer",
- "num-iter",
  "num-traits",
  "pkcs1",
  "pkcs8",
  "rand_core 0.6.4",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
  "spki",
  "subtle",
  "zeroize",
@@ -3615,42 +3873,42 @@ dependencies = [
 
 [[package]]
 name = "rtoolbox"
-version = "0.0.1"
+version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
+checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "rust-argon2"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50162d19404029c1ceca6f6980fe40d45c8b369f6f44446fa14bb39573b5bb9"
+checksum = "a5885493fdf0be6cdff808d1533ce878d21cfa49c7086fa00c66355cd9141bfc"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
  "blake2b_simd",
- "constant_time_eq 0.1.5",
+ "constant_time_eq",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "rust-argon2"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e71971821b3ae0e769e4a4328dbcb517607b434db7697e9aba17203ec14e46a"
+checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "blake2b_simd",
- "constant_time_eq 0.3.0",
+ "constant_time_eq",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc_version"
@@ -3663,99 +3921,138 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.6"
+version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.42.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.7"
+version = "0.21.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
 dependencies = [
- "log",
  "ring",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
  "sct",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.1",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.2"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "base64 0.21.4",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.6"
+version = "0.102.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
+checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b"
 dependencies = [
  "ring",
+ "rustls-pki-types",
  "untrusted",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "rusty-fork"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
+[[package]]
+name = "rustyline-async"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca4447465ceb8c01c253cc81660b242547c58e4a59c85b13294a6e70de8b9e"
 dependencies = [
- "fnv",
- "quick-error",
- "tempfile",
- "wait-timeout",
+ "crossterm",
+ "futures-channel",
+ "futures-util",
+ "pin-project",
+ "thingbuf",
+ "thiserror",
+ "unicode-segmentation",
+ "unicode-width",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
  "ring",
  "untrusted",
@@ -3777,9 +4074,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.7.0"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -3790,9 +4087,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.6.1"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3800,18 +4097,18 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
@@ -3829,7 +4126,7 @@ dependencies = [
 name = "serde_cbor"
 version = "0.11.1"
 dependencies = [
- "half",
+ "half 1.8.2",
  "serde",
 ]
 
@@ -3839,47 +4136,57 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
- "half",
+ "half 1.8.2",
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.91"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
- "indexmap 1.9.2",
- "itoa 1.0.5",
+ "indexmap 2.1.0",
+ "itoa",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c"
+dependencies = [
+ "itoa",
+ "serde",
+]
+
 [[package]]
 name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_test"
-version = "1.0.152"
+version = "1.0.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3611210d2d67e3513204742004d6ac6f589e521861dabb0f649b070eea8bed9e"
+checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab"
 dependencies = [
  "serde",
 ]
@@ -3891,22 +4198,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.5",
+ "itoa",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_with"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.7",
  "chrono",
  "hex",
- "indexmap 1.9.2",
- "indexmap 2.0.2",
+ "indexmap 1.9.3",
+ "indexmap 2.1.0",
  "serde",
  "serde_json",
  "serde_with_macros",
@@ -3915,14 +4222,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3931,7 +4238,7 @@ version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
- "indexmap 1.9.2",
+ "indexmap 1.9.3",
  "ryu",
  "serde",
  "yaml-rust",
@@ -3939,33 +4246,22 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.25"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
+checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38"
 dependencies = [
- "indexmap 2.0.2",
- "itoa 1.0.5",
+ "indexmap 2.1.0",
+ "itoa",
  "ryu",
  "serde",
  "unsafe-libyaml",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.7",
-]
-
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4010,18 +4306,45 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+dependencies = [
+ "libc",
+ "mio",
+ "signal-hook",
+]
+
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
 dependencies = [
  "libc",
 ]
@@ -4034,9 +4357,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
 [[package]]
 name = "signature"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
  "rand_core 0.6.4",
@@ -4055,40 +4378,30 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "slab"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "socket2"
-version = "0.4.7"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
-dependencies = [
- "libc",
- "winapi",
-]
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "socket2"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
@@ -4111,9 +4424,9 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
  "der",
@@ -4121,20 +4434,20 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e"
+checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
 dependencies = [
- "itertools 0.10.5",
+ "itertools 0.12.0",
  "nom",
  "unicode_categories",
 ]
 
 [[package]]
 name = "sqlx"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33"
+checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -4145,11 +4458,11 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
+checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.7",
  "atoi",
  "byteorder",
  "bytes",
@@ -4166,13 +4479,13 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "log",
  "memchr",
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls",
+ "rustls 0.21.10",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -4189,23 +4502,24 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec"
+checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5"
 dependencies = [
  "proc-macro2",
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc"
+checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841"
 dependencies = [
+ "atomic-write-file",
  "dotenvy",
  "either",
  "heck",
@@ -4220,7 +4534,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 1.0.107",
+ "syn 1.0.109",
  "tempfile",
  "tokio",
  "url",
@@ -4228,13 +4542,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
+checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4"
 dependencies = [
  "atoi",
- "base64 0.21.4",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.4.2",
  "byteorder",
  "bytes",
  "chrono",
@@ -4250,7 +4564,7 @@ dependencies = [
  "hex",
  "hkdf",
  "hmac 0.12.1",
- "itoa 1.0.5",
+ "itoa",
  "log",
  "md-5",
  "memchr",
@@ -4271,13 +4585,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
+checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24"
 dependencies = [
  "atoi",
- "base64 0.21.4",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.4.2",
  "byteorder",
  "chrono",
  "crc",
@@ -4291,7 +4605,7 @@ dependencies = [
  "hkdf",
  "hmac 0.12.1",
  "home",
- "itoa 1.0.5",
+ "itoa",
  "log",
  "md-5",
  "memchr",
@@ -4311,9 +4625,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f"
+checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490"
 dependencies = [
  "atoi",
  "chrono",
@@ -4330,6 +4644,7 @@ dependencies = [
  "sqlx-core",
  "tracing",
  "url",
+ "urlencoding",
 ]
 
 [[package]]
@@ -4353,9 +4668,9 @@ dependencies = [
  "convert_case 0.6.0",
  "proc-macro2",
  "quote",
- "regex-syntax 0.6.28",
+ "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.37",
+ "syn 2.0.48",
  "unicode-width",
 ]
 
@@ -4382,18 +4697,19 @@ dependencies = [
 
 [[package]]
 name = "ssh-key"
-version = "0.6.2"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2180b3bc4955efd5661a97658d3cf4c8107e0d132f619195afe9486c13cca313"
+checksum = "01f8f4ea73476c0aa5d5e6a75ce1e8634e2c3f82005ef3bbed21547ac57f2bf7"
 dependencies = [
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek 2.1.0",
  "p256",
  "p384",
+ "p521",
  "rand_core 0.6.4",
  "rsa",
  "sec1",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
  "ssh-cipher",
  "ssh-encoding",
  "subtle",
@@ -4408,17 +4724,19 @@ dependencies = [
  "async-compression",
  "async-stream",
  "async-trait",
+ "axum",
+ "axum-server",
  "base32",
- "base64 0.21.4",
+ "base64 0.21.7",
  "base64ct",
  "basic-cookies",
+ "blake3",
  "bytes",
  "chrono",
  "ciborium",
- "clap 3.2.25",
+ "clap 4.4.18",
  "color-eyre",
  "console",
- "container-init",
  "cookie 0.18.0",
  "cookie_store 0.20.0",
  "current_platform",
@@ -4426,7 +4744,7 @@ dependencies = [
  "divrem",
  "ed25519 2.2.3",
  "ed25519-dalek 1.0.1",
- "ed25519-dalek 2.0.0",
+ "ed25519-dalek 2.1.0",
  "emver",
  "fd-lock-rs",
  "futures",
@@ -4434,22 +4752,23 @@ dependencies = [
  "helpers",
  "hex",
  "hmac 0.12.1",
- "http",
- "hyper",
- "hyper-ws-listener",
+ "http 1.0.0",
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "indicatif",
+ "integer-encoding",
  "ipnet",
  "iprange",
  "isocountry",
- "itertools 0.11.0",
+ "itertools 0.12.0",
  "jaq-core",
  "jaq-std",
  "josekit",
  "jsonpath_lib",
+ "lazy_async_pool",
+ "lazy_format",
  "lazy_static",
  "libc",
  "log",
@@ -4460,6 +4779,7 @@ dependencies = [
  "nom",
  "num",
  "num_enum",
+ "once_cell",
  "openssh-keys",
  "openssl",
  "p256",
@@ -4475,15 +4795,16 @@ dependencies = [
  "reqwest",
  "reqwest_cookie_store",
  "rpassword",
- "rpc-toolkit",
- "rust-argon2 2.0.0",
- "scopeguard",
+ "rpc-toolkit 0.2.3 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
+ "rust-argon2 2.1.0",
+ "rustyline-async",
  "semver",
  "serde",
  "serde_json",
  "serde_with",
- "serde_yaml 0.9.25",
+ "serde_yaml 0.9.30",
  "sha2 0.10.8",
+ "shell-words",
  "simple-logging",
  "sqlx",
  "sscanf",
@@ -4498,7 +4819,7 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite",
  "tokio-util",
- "toml 0.8.2",
+ "toml 0.8.8",
  "torut",
  "tracing",
  "tracing-error",
@@ -4528,9 +4849,9 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.8.4"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
 dependencies = [
  "new_debug_unreachable",
  "once_cell",
@@ -4541,10 +4862,11 @@ dependencies = [
 
 [[package]]
 name = "stringprep"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
+checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
 dependencies = [
+ "finl_unicode",
  "unicode-bidi",
  "unicode-normalization",
 ]
@@ -4563,15 +4885,15 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4580,15 +4902,21 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "synstructure"
 version = "0.12.6"
@@ -4597,7 +4925,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
  "unicode-xid",
 ]
 
@@ -4636,21 +4964,20 @@ checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
 dependencies = [
  "filetime",
  "libc",
- "xattr 1.0.1",
+ "xattr 1.3.1",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
 dependencies = [
  "cfg-if",
  "fastrand",
- "libc",
- "redox_syscall 0.2.16",
- "remove_dir_all",
- "winapi",
+ "redox_syscall 0.4.1",
+ "rustix",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4688,24 +5015,34 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
+[[package]]
+name = "thingbuf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4706f1bfb859af03f099ada2de3cea3e515843c2d3e93b7893f16d94a37f9415"
+dependencies = [
+ "parking_lot",
+ "pin-project",
+]
+
 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4721,20 +5058,23 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.4"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
+ "cfg-if",
  "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.17"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
+checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
 dependencies = [
- "itoa 1.0.5",
+ "deranged",
+ "itoa",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -4742,15 +5082,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.6"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
 dependencies = [
  "time-core",
 ]
@@ -4775,15 +5115,15 @@ dependencies = [
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4793,20 +5133,20 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.4",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4821,11 +5161,12 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls",
+ "rustls 0.22.2",
+ "rustls-pki-types",
  "tokio",
 ]
 
@@ -4869,9 +5210,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
+checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
 dependencies = [
  "futures-util",
  "log",
@@ -4883,9 +5224,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
  "bytes",
  "futures-core",
@@ -4895,15 +5236,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.7.8"
@@ -4918,21 +5250,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.2"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.21.0",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
@@ -4943,7 +5275,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -4952,11 +5284,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
- "indexmap 2.0.2",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -4983,6 +5315,28 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -4991,9 +5345,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.39"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -5009,7 +5363,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5055,20 +5409,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -5093,9 +5447,9 @@ dependencies = [
 
 [[package]]
 name = "trust-dns-proto"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559ac980345f7f5020883dd3bcacf176355225e01916f8c2efecad7534f682c6"
+checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
 dependencies = [
  "async-trait",
  "cfg-if",
@@ -5118,9 +5472,9 @@ dependencies = [
 
 [[package]]
 name = "trust-dns-server"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4307166910ddf09378e651e9d4730c44900e9e0e1f157a6b955e48b539cd1d6"
+checksum = "c540f73c2b2ec2f6c54eabd0900e7aafb747a820224b742f556e8faabb461bc7"
 dependencies = [
  "async-trait",
  "bytes",
@@ -5140,20 +5494,20 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "tungstenite"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
 dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http",
+ "http 1.0.0",
  "httparse",
  "log",
  "native-tls",
@@ -5166,35 +5520,35 @@ dependencies = [
 
 [[package]]
 name = "typed-builder"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c6a006a6d3d6a6f143fda41cf4d1ad35110080687628c9f2117bd3cc7924f3"
+checksum = "444d8748011b93cb168770e8092458cb0f8854f931ff82fdf6ddfbd72a9c933e"
 dependencies = [
  "typed-builder-macro",
 ]
 
 [[package]]
 name = "typed-builder-macro"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fa054ee5e2346187d631d2f1d1fd3b33676772d6d03a2d84e1c5213b31674ee"
+checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "unarray"
@@ -5204,24 +5558,24 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
 dependencies = [
  "version_check",
 ]
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -5234,15 +5588,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -5258,24 +5612,24 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
 
 [[package]]
 name = "untrusted"
-version = "0.7.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 0.4.0",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
@@ -5292,13 +5646,19 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "uuid"
-version = "1.4.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
 ]
 
 [[package]]
@@ -5336,11 +5696,10 @@ dependencies = [
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
@@ -5358,9 +5717,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5368,24 +5727,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.33"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
+checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5395,9 +5754,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5405,22 +5764,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
 name = "wasm-streams"
@@ -5437,9 +5796,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.60"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5447,18 +5806,15 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.24.0"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
-dependencies = [
- "rustls-webpki",
-]
+checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
 
 [[package]]
 name = "whoami"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3"
+checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
 
 [[package]]
 name = "winapi"
@@ -5478,9 +5834,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -5492,27 +5848,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.42.1",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -5525,18 +5866,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.42.1"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -5555,10 +5890,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+name = "windows-targets"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
@@ -5567,10 +5911,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.1"
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5579,10 +5923,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.42.1"
+name = "windows_aarch64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5591,10 +5935,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.42.1"
+name = "windows_i686_gnu"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5603,10 +5947,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.1"
+name = "windows_i686_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5615,10 +5959,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+name = "windows_x86_64_gnu"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5627,10 +5971,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.1"
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5638,11 +5982,17 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "winnow"
-version = "0.5.17"
+version = "0.5.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16"
 dependencies = [
  "memchr",
 ]
@@ -5677,29 +6027,20 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.0.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
+ "linux-raw-sys",
+ "rustix",
 ]
 
 [[package]]
 name = "yajrc"
-version = "0.1.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40687b4c165cb760e35730055c8840f36897e7c98099b2d3d66ba8cb624c79a"
-dependencies = [
- "anyhow",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "yajrc"
-version = "0.1.0"
-source = "git+https://github.com/dr-bonez/yajrc.git?branch=develop#72a22f7ac2197d7a5cdce4be601cf20e5280eec5"
+checksum = "ce7af47ad983c2f8357333ef87d859e66deb7eef4bf6f9e1ae7b5e99044a48bf"
 dependencies = [
  "anyhow",
  "serde",
@@ -5722,29 +6063,48 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f355ab62ebe30b758c1f4ab096a306722c4b7dbfb9d8c07d18c70d71a945588"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.7",
  "hashbrown 0.13.2",
  "lazy_static",
  "serde",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.3.3"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
- "synstructure",
+ "syn 2.0.48",
 ]

From eae75c13bb6d47286990810e9daee03ab61d8a23 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Sat, 17 Feb 2024 13:07:41 -0700
Subject: [PATCH 018/341] update network interfaces types

---
 sdk/lib/interfaces/Host.ts |  4 ++-
 sdk/lib/types.ts           | 73 ++++++++++++++++++++++++++++++++++----
 web/package-lock.json      | 26 +++++++++++++-
 web/package.json           |  5 +--
 4 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index 190769daa..94f4777f7 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -87,6 +87,8 @@ type PortOptionsByKnownProtocol =
     }
 type PortOptionsByProtocol = PortOptionsByKnownProtocol | PortOptions
 
+export type HostKind = "static" | "single" | "multi"
+
 const hasStringProtocol = object({
   protocol: string,
 }).test
@@ -95,7 +97,7 @@ export class Host {
   constructor(
     readonly options: {
       effects: Effects
-      kind: "static" | "single" | "multi"
+      kind: HostKind
       id: string
     },
   ) {}
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 657c09c3d..72b2aa31c 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -1,9 +1,8 @@
 export * as configTypes from "./config/configTypes"
 import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
-import { PortOptions } from "./interfaces/Host"
+import { HostKind, PortOptions } from "./interfaces/Host"
 import { Daemons } from "./mainFn/Daemons"
-import { Overlay } from "./util/Overlay"
 import { UrlString } from "./util/getNetworkInterface"
 import { NetworkInterfaceType, Signals } from "./util/utils"
 
@@ -165,7 +164,7 @@ export type ActionMetadata = {
   group?: string
 }
 export declare const hostName: unique symbol
-export type HostName = string & { [hostName]: never }
+export type Hostname = string & { [hostName]: never }
 /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
 export type Address = {
   username: string | null
@@ -174,6 +173,68 @@ export type Address = {
   suffix: string
 }
 
+export type ListenKind = "onion" | "ip"
+
+export type ListenInfoBase = {
+  kind: ListenKind
+}
+
+export type ListenInfoOnion = ListenInfoBase & {
+  kind: "onion"
+}
+
+export type ListenInfoIp = ListenInfoBase & {
+  kind: "ip"
+  interfaceId: string
+}
+
+export type ListenInfo = ListenInfoOnion | ListenInfoIp
+
+export type HostBase = {
+  id: string
+  kind: HostKind
+}
+
+export type SingleHost = HostBase & {
+  kind: "single" | "static"
+} & (
+    | {
+        listen: null
+        hostname: null
+      }
+    | {
+        listen: ListenInfoOnion
+        hostname: string
+      }
+    | {
+        listen: ListenInfoIp
+        hostname:
+          | string
+          | { domain: string; subdomain: string | null; port: number }
+      }
+  )
+
+export type MultiHost = HostBase & {
+  kind: "multi"
+} & {
+  hostnames:
+    | {
+        listen: null
+        hostname: null
+      }
+    | {
+        listen: ListenInfoOnion
+        hostname: string
+      }
+    | {
+        listen: ListenInfoIp
+        hostname: (
+          | string
+          | { domain: string; subdomain: string | null; port: number }
+        )[]
+      }
+}
+
 export type InterfaceId = string
 
 export type NetworkInterface = {
@@ -189,7 +250,7 @@ export type NetworkInterface = {
   /** All URIs */
   addresses: Address[]
 
-  /** The netowrk interface could be serveral types, something like ui, p2p, or network */
+  /** The network interface could be several types, something like ui, p2p, or network */
   type: NetworkInterfaceType
 }
 // prettier-ignore
@@ -246,13 +307,13 @@ export type Effects = {
     hostId: string
     packageId?: string
     callback: () => void
-  }): Promise<[HostName]>
+  }): Promise<[Hostname]>
   getHostnames(options: {
     kind?: "multi"
     packageId?: string
     hostId: string
     callback: () => void
-  }): Promise<[HostName, ...HostName[]]>
+  }): Promise<[Hostname, ...Hostname[]]>
 
   // /**
   //  * Run rsync between two volumes. This is used to backup data between volumes.
diff --git a/web/package-lock.json b/web/package-lock.json
index 160cb31bb..bcd2967f1 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -25,6 +25,7 @@
         "@ng-web-apis/resize-observer": "^2.0.0",
         "@start9labs/argon2": "^0.2.2",
         "@start9labs/emver": "^0.1.5",
+        "@start9labs/start-sdk": "file:../sdk/dist",
         "@taiga-ui/addon-charts": "3.20.0",
         "@taiga-ui/cdk": "3.20.0",
         "@taiga-ui/core": "3.20.0",
@@ -47,7 +48,7 @@
         "mustache": "^4.2.0",
         "ng-qrcode": "^7.0.0",
         "node-jose": "^2.2.0",
-        "patch-db-client": "file: ../../../patch-db/client",
+        "patch-db-client": "file:../patch-db/client",
         "pbkdf2": "^3.1.2",
         "rxjs": "^7.8.1",
         "swiper": "^8.2.4",
@@ -1970,6 +1971,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "../sdk/dist": {
+      "version": "0.4.0-rev0.lib0.rc8.beta7",
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "isomorphic-fetch": "^3.0.0",
+        "ts-matches": "^5.4.1",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "jest": "^29.4.3",
+        "prettier": "^3.2.5",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
+      }
+    },
     "node_modules/@adobe/css-tools": {
       "version": "4.0.1",
       "dev": true,
@@ -5291,6 +5311,10 @@
       "version": "0.1.5",
       "license": "MIT"
     },
+    "node_modules/@start9labs/start-sdk": {
+      "resolved": "../sdk/dist",
+      "link": true
+    },
     "node_modules/@stencil/core": {
       "version": "2.18.0",
       "license": "MIT",
diff --git a/web/package.json b/web/package.json
index 7784543fe..e4ae2220f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -12,7 +12,7 @@
     "check:install-wiz": "tsc --project projects/install-wizard/tsconfig.json --noEmit --skipLibCheck",
     "check:setup": "tsc --project projects/setup-wizard/tsconfig.json --noEmit --skipLibCheck",
     "check:ui": "tsc --project projects/ui/tsconfig.json --noEmit --skipLibCheck",
-    "build:deps": "rm -rf .angular/cache && cd ../patch-db/client && npm ci && npm run build",
+    "build:deps": "rm -rf .angular/cache && (cd ../patch-db/client && npm ci && npm run build) && (cd ../sdk && make bundle)",
     "build:dui": "ng run diagnostic-ui:build",
     "build:install-wiz": "ng run install-wizard:build",
     "build:setup": "ng run setup-wizard:build",
@@ -50,6 +50,7 @@
     "@ng-web-apis/resize-observer": "^2.0.0",
     "@start9labs/argon2": "^0.2.2",
     "@start9labs/emver": "^0.1.5",
+    "@start9labs/start-sdk": "file:../sdk/dist",
     "@taiga-ui/addon-charts": "3.20.0",
     "@taiga-ui/cdk": "3.20.0",
     "@taiga-ui/core": "3.20.0",
@@ -72,7 +73,7 @@
     "mustache": "^4.2.0",
     "ng-qrcode": "^7.0.0",
     "node-jose": "^2.2.0",
-    "patch-db-client": "file: ../../../patch-db/client",
+    "patch-db-client": "file:../patch-db/client",
     "pbkdf2": "^3.1.2",
     "rxjs": "^7.8.1",
     "swiper": "^8.2.4",

From d7bc7a2d38f92ade4d56ccdac6b15b0f985f8c04 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Mon, 19 Feb 2024 12:40:52 -0700
Subject: [PATCH 019/341] make service interfaces and hosts one to one

---
 .../src/Adapters/HostSystemStartOs.ts         |  16 +-
 .../src/service/service_effect_handler.rs     |   4 +-
 sdk/lib/config/setupConfig.ts                 |   2 +-
 sdk/lib/interfaces/Host.ts                    |   4 +-
 sdk/lib/interfaces/Origin.ts                  |   8 +-
 ...eBuilder.ts => ServiceInterfaceBuilder.ts} |  28 ++-
 sdk/lib/interfaces/setupInterfaces.ts         |   4 +-
 sdk/lib/mainFn/index.ts                       |   2 +-
 sdk/lib/test/host.test.ts                     |   4 +-
 sdk/lib/test/util.getNetworkInterface.test.ts |   2 +-
 sdk/lib/test/utils.splitCommand.test.ts       |   2 +-
 sdk/lib/types.ts                              | 126 +++++------
 ...orkInterface.ts => getServiceInterface.ts} | 204 ++++++------------
 ...kInterfaces.ts => getServiceInterfaces.ts} |  69 +++---
 sdk/lib/util/utils.ts                         |  52 +++--
 15 files changed, 219 insertions(+), 308 deletions(-)
 rename sdk/lib/interfaces/{NetworkInterfaceBuilder.ts => ServiceInterfaceBuilder.ts} (68%)
 rename sdk/lib/util/{getNetworkInterface.ts => getServiceInterface.ts} (50%)
 rename sdk/lib/util/{getNetworkInterfaces.ts => getServiceInterfaces.ts} (55%)

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index b9dc7725a..e4177044e 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -106,11 +106,11 @@ export class HostSystemStartOs implements Effects {
       T.Effects["clearBindings"]
     >
   }
-  clearNetworkInterfaces(
-    ...[]: Parameters<T.Effects["clearNetworkInterfaces"]>
+  clearServiceInterfaces(
+    ...[]: Parameters<T.Effects["clearServiceInterfaces"]>
   ) {
-    return this.rpcRound("clearNetworkInterfaces", null) as ReturnType<
-      T.Effects["clearNetworkInterfaces"]
+    return this.rpcRound("clearServiceInterfaces", null) as ReturnType<
+      T.Effects["clearServiceInterfaces"]
     >
   }
   createOverlayedImage(options: { imageId: string }): Promise<string> {
@@ -131,11 +131,11 @@ export class HostSystemStartOs implements Effects {
       T.Effects["exportAction"]
     >
   }
-  exportNetworkInterface(
-    ...[options]: Parameters<T.Effects["exportNetworkInterface"]>
+  exportServiceInterface(
+    ...[options]: Parameters<T.Effects["exportServiceInterface"]>
   ) {
-    return this.rpcRound("exportNetworkInterface", options) as ReturnType<
-      T.Effects["exportNetworkInterface"]
+    return this.rpcRound("exportServiceInterface", options) as ReturnType<
+      T.Effects["exportServiceInterface"]
     >
   }
   exposeForDependents(...[options]: any) {
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index c015195e5..d5a4561f7 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -128,8 +128,8 @@ pub fn service_effect_handler() -> ParentHandler {
     // .subcommand("removeAddress",from_fn(remove_address))
     // .subcommand("exportAction",from_fn(export_action))
     // .subcommand("bind",from_fn(bind))
-    // .subcommand("clearNetworkInterfaces",from_fn(clear_network_interfaces))
-    // .subcommand("exportNetworkInterface",from_fn(export_network_interface))
+    // .subcommand("clearServiceInterfaces",from_fn(clear_network_interfaces))
+    // .subcommand("exportServiceInterface",from_fn(export_network_interface))
     // .subcommand("clearBindings",from_fn(clear_bindings))
     // .subcommand("getHostnames",from_fn(get_hostnames))
     // .subcommand("getInterface",from_fn(get_interface))
diff --git a/sdk/lib/config/setupConfig.ts b/sdk/lib/config/setupConfig.ts
index ee693dda2..95f9fd1ac 100644
--- a/sdk/lib/config/setupConfig.ts
+++ b/sdk/lib/config/setupConfig.ts
@@ -68,7 +68,7 @@ export function setupConfig<
         return { error: "Set config type error for config" }
       }
       await effects.clearBindings()
-      await effects.clearNetworkInterfaces()
+      await effects.clearServiceInterfaces()
       const { restart } = await write({
         input: JSON.parse(JSON.stringify(input)),
         effects,
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index 94f4777f7..e767bd18b 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -55,7 +55,7 @@ type AddSslOptions = {
   addXForwardedHeaders?: boolean /** default: false */
 }
 type Security = { secure: false; ssl: false } | { secure: true; ssl: boolean }
-export type PortOptions = {
+export type BindOptions = {
   scheme: Scheme
   preferredExternalPort: number
   addSsl: AddSslOptions | null
@@ -85,7 +85,7 @@ type PortOptionsByKnownProtocol =
       scheme?: Scheme
       addSsl?: AddSslOptions | null
     }
-type PortOptionsByProtocol = PortOptionsByKnownProtocol | PortOptions
+type PortOptionsByProtocol = PortOptionsByKnownProtocol | BindOptions
 
 export type HostKind = "static" | "single" | "multi"
 
diff --git a/sdk/lib/interfaces/Origin.ts b/sdk/lib/interfaces/Origin.ts
index 1bab62811..053e76ae8 100644
--- a/sdk/lib/interfaces/Origin.ts
+++ b/sdk/lib/interfaces/Origin.ts
@@ -1,13 +1,13 @@
-import { Address } from "../types"
-import { Host, PortOptions } from "./Host"
+import { AddressInfo } from "../types"
+import { Host, BindOptions } from "./Host"
 
 export class Origin<T extends Host> {
   constructor(
     readonly host: T,
-    readonly options: PortOptions,
+    readonly options: BindOptions,
   ) {}
 
-  build({ username, path, search }: BuildOptions): Address {
+  build({ username, path, search }: BuildOptions): AddressInfo {
     const qpEntries = Object.entries(search)
       .map(
         ([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`,
diff --git a/sdk/lib/interfaces/NetworkInterfaceBuilder.ts b/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
similarity index 68%
rename from sdk/lib/interfaces/NetworkInterfaceBuilder.ts
rename to sdk/lib/interfaces/ServiceInterfaceBuilder.ts
index 8f47dea93..241cf52dc 100644
--- a/sdk/lib/interfaces/NetworkInterfaceBuilder.ts
+++ b/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
@@ -1,5 +1,5 @@
-import { Address, Effects } from "../types"
-import { NetworkInterfaceType } from "../util/utils"
+import { AddressInfo, Effects } from "../types"
+import { ServiceInterfaceType } from "../util/utils"
 import { AddressReceipt } from "./AddressReceipt"
 import { Host } from "./Host"
 import { Origin } from "./Origin"
@@ -15,7 +15,7 @@ import { Origin } from "./Origin"
  * @param options
  * @returns
  */
-export class NetworkInterfaceBuilder {
+export class ServiceInterfaceBuilder {
   constructor(
     readonly options: {
       effects: Effects
@@ -24,7 +24,7 @@ export class NetworkInterfaceBuilder {
       description: string
       hasPrimary: boolean
       disabled: boolean
-      type: NetworkInterfaceType
+      type: ServiceInterfaceType
       username: null | string
       path: string
       search: Record<string, string>
@@ -36,12 +36,12 @@ export class NetworkInterfaceBuilder {
    *
    * The returned addressReceipt serves as proof that the addresses were registered
    *
-   * @param addresses
+   * @param addressInfo
    * @returns
    */
-  async export<Origins extends Origin<Host>[]>(
-    origins: Origins,
-  ): Promise<Address[] & AddressReceipt> {
+  async export<OriginForHost extends Origin<Host>>(
+    origin: OriginForHost,
+  ): Promise<AddressInfo & AddressReceipt> {
     const {
       name,
       description,
@@ -54,20 +54,18 @@ export class NetworkInterfaceBuilder {
       search,
     } = this.options
 
-    const addresses = Array.from(origins).map((o) =>
-      o.build({ username, path, search, scheme: null }),
-    )
+    const addressInfo = origin.build({ username, path, search, scheme: null })
 
-    await this.options.effects.exportNetworkInterface({
-      interfaceId: id,
+    await this.options.effects.exportServiceInterface({
+      id,
       name,
       description,
       hasPrimary,
       disabled,
-      addresses,
+      addressInfo,
       type,
     })
 
-    return addresses as Address[] & AddressReceipt
+    return addressInfo as AddressInfo & AddressReceipt
   }
 }
diff --git a/sdk/lib/interfaces/setupInterfaces.ts b/sdk/lib/interfaces/setupInterfaces.ts
index c99164e93..1514cabf3 100644
--- a/sdk/lib/interfaces/setupInterfaces.ts
+++ b/sdk/lib/interfaces/setupInterfaces.ts
@@ -1,10 +1,10 @@
 import { Config } from "../config/builder/config"
 import { SDKManifest } from "../manifest/ManifestTypes"
-import { Address, Effects } from "../types"
+import { AddressInfo, Effects } from "../types"
 import { Utils } from "../util/utils"
 import { AddressReceipt } from "./AddressReceipt"
 
-export type InterfacesReceipt = Array<Address[] & AddressReceipt>
+export type InterfacesReceipt = Array<AddressInfo[] & AddressReceipt>
 export type SetInterfaces<
   Manifest extends SDKManifest,
   Store,
diff --git a/sdk/lib/mainFn/index.ts b/sdk/lib/mainFn/index.ts
index 7a6e11c6c..58f0228b2 100644
--- a/sdk/lib/mainFn/index.ts
+++ b/sdk/lib/mainFn/index.ts
@@ -2,7 +2,7 @@ import { Effects, ExpectedExports } from "../types"
 import { createMainUtils } from "../util"
 import { Utils, createUtils } from "../util/utils"
 import { Daemons } from "./Daemons"
-import "../interfaces/NetworkInterfaceBuilder"
+import "../interfaces/ServiceInterfaceBuilder"
 import "../interfaces/Origin"
 
 import "./Daemons"
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
index 01ce6f3f2..880a8f1a1 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/lib/test/host.test.ts
@@ -1,4 +1,4 @@
-import { NetworkInterfaceBuilder } from "../interfaces/NetworkInterfaceBuilder"
+import { ServiceInterfaceBuilder } from "../interfaces/ServiceInterfaceBuilder"
 import { Effects } from "../types"
 import { createUtils } from "../util"
 
@@ -8,7 +8,7 @@ describe("host", () => {
       const utils = createUtils<never, never>(effects)
       const foo = utils.host.multi("foo")
       const fooOrigin = await foo.bindPort(80, { protocol: "http" as const })
-      const fooInterface = new NetworkInterfaceBuilder({
+      const fooInterface = new ServiceInterfaceBuilder({
         effects,
         name: "Foo",
         id: "foo",
diff --git a/sdk/lib/test/util.getNetworkInterface.test.ts b/sdk/lib/test/util.getNetworkInterface.test.ts
index bfddb4e8e..df7ac73c6 100644
--- a/sdk/lib/test/util.getNetworkInterface.test.ts
+++ b/sdk/lib/test/util.getNetworkInterface.test.ts
@@ -1,4 +1,4 @@
-import { getHostname } from "../util/getNetworkInterface"
+import { getHostname } from "../util/getServiceInterface"
 
 describe("getHostname ", () => {
   const inputToExpected = [
diff --git a/sdk/lib/test/utils.splitCommand.test.ts b/sdk/lib/test/utils.splitCommand.test.ts
index 71f214c07..aafddb177 100644
--- a/sdk/lib/test/utils.splitCommand.test.ts
+++ b/sdk/lib/test/utils.splitCommand.test.ts
@@ -1,4 +1,4 @@
-import { getHostname } from "../util/getNetworkInterface"
+import { getHostname } from "../util/getServiceInterface"
 import { splitCommand } from "../util/splitCommand"
 
 describe("splitCommand ", () => {
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 72b2aa31c..de03e34b2 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -1,10 +1,10 @@
 export * as configTypes from "./config/configTypes"
 import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
-import { HostKind, PortOptions } from "./interfaces/Host"
+import { HostKind, BindOptions } from "./interfaces/Host"
 import { Daemons } from "./mainFn/Daemons"
-import { UrlString } from "./util/getNetworkInterface"
-import { NetworkInterfaceType, Signals } from "./util/utils"
+import { UrlString } from "./util/getServiceInterface"
+import { ServiceInterfaceType, Signals } from "./util/utils"
 
 export type ExportedAction = (options: {
   effects: Effects
@@ -165,80 +165,57 @@ export type ActionMetadata = {
 }
 export declare const hostName: unique symbol
 export type Hostname = string & { [hostName]: never }
+
 /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
-export type Address = {
+export type AddressInfo = {
   username: string | null
   hostId: string
-  options: PortOptions
+  options: BindOptions
   suffix: string
 }
 
-export type ListenKind = "onion" | "ip"
-
-export type ListenInfoBase = {
-  kind: ListenKind
+export type HostnameInfoIp = {
+  kind: "ip"
+  networkInterfaceId: string
+  hostname:
+    | {
+        kind: "ipv4" | "ipv6" | "local"
+        value: string
+        port: number | null
+        sslPort: number | null
+      }
+    | {
+        kind: "domain"
+        domain: string
+        subdomain: string | null
+        port: number | null
+        sslPort: number | null
+      }
 }
 
-export type ListenInfoOnion = ListenInfoBase & {
+export type HostnameInfoOnion = {
   kind: "onion"
+  hostname: { value: string; port: number | null; sslPort: number | null }
 }
 
-export type ListenInfoIp = ListenInfoBase & {
-  kind: "ip"
-  interfaceId: string
-}
+export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion
 
-export type ListenInfo = ListenInfoOnion | ListenInfoIp
-
-export type HostBase = {
-  id: string
-  kind: HostKind
-}
-
-export type SingleHost = HostBase & {
+export type SingleHost = {
   kind: "single" | "static"
-} & (
-    | {
-        listen: null
-        hostname: null
-      }
-    | {
-        listen: ListenInfoOnion
-        hostname: string
-      }
-    | {
-        listen: ListenInfoIp
-        hostname:
-          | string
-          | { domain: string; subdomain: string | null; port: number }
-      }
-  )
+  hostname: HostnameInfo | null
+}
 
-export type MultiHost = HostBase & {
+export type MultiHost = {
   kind: "multi"
-} & {
-  hostnames:
-    | {
-        listen: null
-        hostname: null
-      }
-    | {
-        listen: ListenInfoOnion
-        hostname: string
-      }
-    | {
-        listen: ListenInfoIp
-        hostname: (
-          | string
-          | { domain: string; subdomain: string | null; port: number }
-        )[]
-      }
+  hostnames: HostnameInfo[]
 }
 
-export type InterfaceId = string
+export type HostInfo = SingleHost | MultiHost
+
+export type ServiceInterfaceId = string
 
-export type NetworkInterface = {
-  interfaceId: InterfaceId
+export type ServiceInterface = {
+  id: ServiceInterfaceId
   /** The title of this field to be displayed */
   name: string
   /** Human readable description, used as tooltip usually */
@@ -247,11 +224,10 @@ export type NetworkInterface = {
   hasPrimary: boolean
   /** Disabled interfaces do not serve, but they retain their metadata and addresses */
   disabled: boolean
-  /** All URIs */
-  addresses: Address[]
-
+  /** URI Information */
+  addressInfo: AddressInfo
   /** The network interface could be several types, something like ui, p2p, or network */
-  type: NetworkInterfaceType
+  type: ServiceInterfaceType
 }
 // prettier-ignore
 export type ExposeAllServicePaths<Store, PreviousPath extends string = ""> = 
@@ -299,7 +275,7 @@ export type Effects = {
       kind: "static" | "single" | "multi"
       id: string
       internalPort: number
-    } & PortOptions,
+    } & BindOptions,
   ): Promise<void>
   /** Retrieves the current hostname(s) associated with a host id */
   getHostnames(options: {
@@ -307,13 +283,13 @@ export type Effects = {
     hostId: string
     packageId?: string
     callback: () => void
-  }): Promise<[Hostname]>
+  }): Promise<[] | [Hostname]>
   getHostnames(options: {
     kind?: "multi"
     packageId?: string
     hostId: string
     callback: () => void
-  }): Promise<[Hostname, ...Hostname[]]>
+  }): Promise<Hostname[]>
 
   // /**
   //  * Run rsync between two volumes. This is used to backup data between volumes.
@@ -357,7 +333,7 @@ export type Effects = {
   getIPHostname(): Promise<string[]>
   /** Get the address for another service for tor interfaces */
   getServiceTorHostname(
-    interfaceId: InterfaceId,
+    serviceInterfaceId: ServiceInterfaceId,
     packageId?: string,
   ): Promise<string>
   /** Get the IP address of the container */
@@ -371,11 +347,11 @@ export type Effects = {
   ): Promise<number>
 
   /** Removes all network interfaces */
-  clearNetworkInterfaces(): Promise<void>
+  clearServiceInterfaces(): Promise<void>
   /** When we want to create a link in the front end interfaces, and example is
    * exposing a url to view a web service
    */
-  exportNetworkInterface(options: NetworkInterface): Promise<string>
+  exportServiceInterface(options: ServiceInterface): Promise<string>
 
   exposeForDependents<Store = never>(
     options: ExposeServicePaths<Store>,
@@ -388,11 +364,11 @@ export type Effects = {
    *
    * Note: any auth should be filtered out already
    */
-  getInterface(options: {
+  getServiceInterface(options: {
     packageId?: PackageId
-    interfaceId: InterfaceId
+    serviceInterfaceId: ServiceInterfaceId
     callback: () => void
-  }): Promise<NetworkInterface>
+  }): Promise<ServiceInterface>
 
   /**
    * The user sets the primary url for a interface
@@ -400,7 +376,7 @@ export type Effects = {
    */
   getPrimaryUrl(options: {
     packageId?: PackageId
-    interfaceId: InterfaceId
+    serviceInterfaceId: ServiceInterfaceId
     callback: () => void
   }): Promise<UrlString | null>
 
@@ -410,10 +386,10 @@ export type Effects = {
    *
    * Note: any auth should be filtered out already
    */
-  listInterface(options: {
+  listServiceInterfaces(options: {
     packageId?: PackageId
     callback: () => void
-  }): Promise<NetworkInterface[]>
+  }): Promise<ServiceInterface[]>
 
   /**
    *Remove an address that was exported. Used problably during main or during setConfig.
diff --git a/sdk/lib/util/getNetworkInterface.ts b/sdk/lib/util/getServiceInterface.ts
similarity index 50%
rename from sdk/lib/util/getNetworkInterface.ts
rename to sdk/lib/util/getServiceInterface.ts
index 91c401429..69083c66f 100644
--- a/sdk/lib/util/getNetworkInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -1,28 +1,28 @@
-import { Address, Effects, HostName, NetworkInterface } from "../types"
+import { AddressInfo, Effects, Hostname, ServiceInterface } from "../types"
 import * as regexes from "./regexes"
-import { NetworkInterfaceType } from "./utils"
+import { ServiceInterfaceType } from "./utils"
 
 export type UrlString = string
 export type HostId = string
 
 const getHostnameRegex = /^(\w+:\/\/)?([^\/\:]+)(:\d{1,3})?(\/)?/
-export const getHostname = (url: string): HostName | null => {
+export const getHostname = (url: string): Hostname | null => {
   const founds = url.match(getHostnameRegex)?.[2]
   if (!founds) return null
   const parts = founds.split("@")
-  const last = parts[parts.length - 1] as HostName | null
+  const last = parts[parts.length - 1] as Hostname | null
   return last
 }
 
 export type Filled = {
-  hostnames: HostName[]
-  onionHostnames: HostName[]
-  localHostnames: HostName[]
-  ipHostnames: HostName[]
-  ipv4Hostnames: HostName[]
-  ipv6Hostnames: HostName[]
-  nonIpHostnames: HostName[]
-  allHostnames: HostName[]
+  hostnames: Hostname[]
+  onionHostnames: Hostname[]
+  localHostnames: Hostname[]
+  ipHostnames: Hostname[]
+  ipv4Hostnames: Hostname[]
+  ipv6Hostnames: Hostname[]
+  nonIpHostnames: Hostname[]
+  allHostnames: Hostname[]
 
   urls: UrlString[]
   onionUrls: UrlString[]
@@ -33,9 +33,9 @@ export type Filled = {
   nonIpUrls: UrlString[]
   allUrls: UrlString[]
 }
-export type FilledAddress = Address & Filled
-export type NetworkInterfaceFilled = {
-  interfaceId: string
+export type FilledAddressInfo = AddressInfo & Filled
+export type ServiceInterfaceFilled = {
+  id: string
   /** The title of this field to be displayed */
   name: string
   /** Human readable description, used as tooltip usually */
@@ -44,15 +44,15 @@ export type NetworkInterfaceFilled = {
   hasPrimary: boolean
   /** Whether or not the interface disabled */
   disabled: boolean
-  /** All URIs */
-  addresses: FilledAddress[]
-
-  /** Indicates if we are a ui/ p2p/ api/ other for the kind of interface that this is representing */
-  type: NetworkInterfaceType
-
-  primaryHostname: HostName | null
+  /** URI information */
+  addressInfo: FilledAddressInfo
+  /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
+  type: ServiceInterfaceType
+  /** The primary hostname for the service, as chosen by the user */
+  primaryHostname: Hostname | null
+  /** The primary URL for the service, as chosen by the user */
   primaryUrl: UrlString | null
-} & Filled
+}
 const either =
   <A>(...args: ((a: A) => boolean)[]) =>
   (a: A) =>
@@ -63,8 +63,8 @@ const negate =
     !fn(a)
 const unique = <A>(values: A[]) => Array.from(new Set(values))
 const addressHostToUrl = (
-  { options, username, suffix }: Address,
-  host: HostName,
+  { options, username, suffix }: AddressInfo,
+  host: Hostname,
 ): UrlString => {
   const scheme = host.endsWith(".onion")
     ? options.scheme
@@ -76,15 +76,12 @@ const addressHostToUrl = (
   }${host}${suffix}`
 }
 export const filledAddress = (
-  mapHostnames: {
-    [hostId: string]: HostName[]
-  },
-  address: Address,
-): FilledAddress => {
-  const toUrl = addressHostToUrl.bind(null, address)
-  const hostnames = mapHostnames[address.hostId] ?? []
+  hostnames: Hostname[],
+  addressInfo: AddressInfo,
+): FilledAddressInfo => {
+  const toUrl = addressHostToUrl.bind(null, addressInfo)
   return {
-    ...address,
+    ...addressInfo,
     hostnames,
     get onionHostnames() {
       return hostnames.filter(regexes.torHostname.test)
@@ -138,131 +135,60 @@ export const filledAddress = (
   }
 }
 
-export const networkInterfaceFilled = (
-  interfaceValue: NetworkInterface,
-  primaryUrl: UrlString | null,
-  addresses: FilledAddress[],
-): NetworkInterfaceFilled => {
-  return {
-    ...interfaceValue,
-    addresses,
-    get hostnames() {
-      return unique(addresses.flatMap((x) => x.hostnames))
-    },
-    get onionHostnames() {
-      return unique(addresses.flatMap((x) => x.onionHostnames))
-    },
-    get localHostnames() {
-      return unique(addresses.flatMap((x) => x.localHostnames))
-    },
-    get ipHostnames() {
-      return unique(addresses.flatMap((x) => x.ipHostnames))
-    },
-    get ipv4Hostnames() {
-      return unique(addresses.flatMap((x) => x.ipv4Hostnames))
-    },
-    get ipv6Hostnames() {
-      return unique(addresses.flatMap((x) => x.ipv6Hostnames))
-    },
-    get nonIpHostnames() {
-      return unique(addresses.flatMap((x) => x.nonIpHostnames))
-    },
-    get allHostnames() {
-      return unique(addresses.flatMap((x) => x.allHostnames))
-    },
-    get primaryHostname() {
-      if (primaryUrl == null) return null
-      return getHostname(primaryUrl)
-    },
-    get urls() {
-      return unique(addresses.flatMap((x) => x.urls))
-    },
-    get onionUrls() {
-      return unique(addresses.flatMap((x) => x.onionUrls))
-    },
-    get localUrls() {
-      return unique(addresses.flatMap((x) => x.localUrls))
-    },
-    get ipUrls() {
-      return unique(addresses.flatMap((x) => x.ipUrls))
-    },
-    get ipv4Urls() {
-      return unique(addresses.flatMap((x) => x.ipv4Urls))
-    },
-    get ipv6Urls() {
-      return unique(addresses.flatMap((x) => x.ipv6Urls))
-    },
-    get nonIpUrls() {
-      return unique(addresses.flatMap((x) => x.nonIpUrls))
-    },
-    get allUrls() {
-      return unique(addresses.flatMap((x) => x.allUrls))
-    },
-    primaryUrl,
-  }
-}
 const makeInterfaceFilled = async ({
   effects,
-  interfaceId,
+  id,
   packageId,
   callback,
 }: {
   effects: Effects
-  interfaceId: string
+  id: string
   packageId: string | undefined
   callback: () => void
 }) => {
-  const interfaceValue = await effects.getInterface({
-    interfaceId,
+  const serviceInterfaceValue = await effects.getServiceInterface({
+    serviceInterfaceId: id,
+    packageId,
+    callback,
+  })
+  const hostIdRecord = await effects.getHostnames({
     packageId,
+    hostId: serviceInterfaceValue.addressInfo.hostId,
     callback,
   })
-  const hostIdsRecord = Promise.all(
-    unique(interfaceValue.addresses.map((x) => x.hostId)).map(
-      async (hostId) =>
-        [
-          hostId,
-          await effects.getHostnames({
-            packageId,
-            hostId,
-            callback,
-          }),
-        ] as const,
-    ),
-  )
-  const primaryUrl = effects.getPrimaryUrl({
-    interfaceId,
+  const primaryUrl = await effects.getPrimaryUrl({
+    serviceInterfaceId: id,
     packageId,
     callback,
   })
 
-  const fillAddress = filledAddress.bind(
-    null,
-    Object.fromEntries(await hostIdsRecord),
-  )
-  const interfaceFilled: NetworkInterfaceFilled = networkInterfaceFilled(
-    interfaceValue,
-    await primaryUrl,
-    interfaceValue.addresses.map(fillAddress),
-  )
+  const interfaceFilled: ServiceInterfaceFilled = {
+    ...serviceInterfaceValue,
+    primaryUrl: primaryUrl,
+    addressInfo: filledAddress(hostIdRecord, serviceInterfaceValue.addressInfo),
+    get primaryHostname() {
+      if (primaryUrl == null) return null
+      return getHostname(primaryUrl)
+    },
+  }
   return interfaceFilled
 }
 
-export class GetNetworkInterface {
+export class GetServiceInterface {
   constructor(
     readonly effects: Effects,
-    readonly opts: { interfaceId: string; packageId?: string },
+    readonly opts: { id: string; packageId?: string },
   ) {}
 
   /**
    * Returns the value of Store at the provided path. Restart the service if the value changes
    */
   async const() {
-    const { interfaceId, packageId } = this.opts
+    const { id, packageId } = this.opts
     const callback = this.effects.restart
-    const interfaceFilled: NetworkInterfaceFilled = await makeInterfaceFilled({
+    const interfaceFilled: ServiceInterfaceFilled = await makeInterfaceFilled({
       effects: this.effects,
-      interfaceId,
+      id,
       packageId,
       callback,
     })
@@ -270,14 +196,14 @@ export class GetNetworkInterface {
     return interfaceFilled
   }
   /**
-   * Returns the value of NetworkInterfacesFilled at the provided path. Does nothing if the value changes
+   * Returns the value of ServiceInterfacesFilled at the provided path. Does nothing if the value changes
    */
   async once() {
-    const { interfaceId, packageId } = this.opts
+    const { id, packageId } = this.opts
     const callback = () => {}
-    const interfaceFilled: NetworkInterfaceFilled = await makeInterfaceFilled({
+    const interfaceFilled: ServiceInterfaceFilled = await makeInterfaceFilled({
       effects: this.effects,
-      interfaceId,
+      id,
       packageId,
       callback,
     })
@@ -286,10 +212,10 @@ export class GetNetworkInterface {
   }
 
   /**
-   * Watches the value of NetworkInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
+   * Watches the value of ServiceInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
    */
   async *watch() {
-    const { interfaceId, packageId } = this.opts
+    const { id, packageId } = this.opts
     while (true) {
       let callback: () => void = () => {}
       const waitForNext = new Promise<void>((resolve) => {
@@ -297,7 +223,7 @@ export class GetNetworkInterface {
       })
       yield await makeInterfaceFilled({
         effects: this.effects,
-        interfaceId,
+        id,
         packageId,
         callback,
       })
@@ -305,9 +231,9 @@ export class GetNetworkInterface {
     }
   }
 }
-export function getNetworkInterface(
+export function getServiceInterface(
   effects: Effects,
-  opts: { interfaceId: string; packageId?: string },
+  opts: { id: string; packageId?: string },
 ) {
-  return new GetNetworkInterface(effects, opts)
+  return new GetServiceInterface(effects, opts)
 }
diff --git a/sdk/lib/util/getNetworkInterfaces.ts b/sdk/lib/util/getServiceInterfaces.ts
similarity index 55%
rename from sdk/lib/util/getNetworkInterfaces.ts
rename to sdk/lib/util/getServiceInterfaces.ts
index 625b761f5..9c45fd002 100644
--- a/sdk/lib/util/getNetworkInterfaces.ts
+++ b/sdk/lib/util/getServiceInterfaces.ts
@@ -1,10 +1,9 @@
-import { Effects, HostName } from "../types"
+import { Effects } from "../types"
 import {
-  HostId,
-  NetworkInterfaceFilled,
+  ServiceInterfaceFilled,
   filledAddress,
-  networkInterfaceFilled,
-} from "./getNetworkInterface"
+  getHostname,
+} from "./getServiceInterface"
 
 const makeManyInterfaceFilled = async ({
   effects,
@@ -15,7 +14,7 @@ const makeManyInterfaceFilled = async ({
   packageId: string | undefined
   callback: () => void
 }) => {
-  const interfaceValues = await effects.listInterface({
+  const serviceInterfaceValues = await effects.listServiceInterfaces({
     packageId,
     callback,
   })
@@ -23,7 +22,9 @@ const makeManyInterfaceFilled = async ({
     await Promise.all(
       Array.from(
         new Set(
-          interfaceValues.flatMap((x) => x.addresses).map((x) => x.hostId),
+          serviceInterfaceValues
+            .flatMap((x) => x.addressInfo)
+            .map((x) => x.hostId),
         ),
       ).map(
         async (hostId) =>
@@ -38,25 +39,37 @@ const makeManyInterfaceFilled = async ({
       ),
     ),
   )
-  const fillAddress = filledAddress.bind(null, hostIdsRecord)
 
-  const interfacesFilled: NetworkInterfaceFilled[] = await Promise.all(
-    interfaceValues.map(async (interfaceValue) =>
-      networkInterfaceFilled(
-        interfaceValue,
-        await effects.getPrimaryUrl({
-          interfaceId: interfaceValue.interfaceId,
-          packageId,
-          callback,
-        }),
-        interfaceValue.addresses.map(fillAddress),
-      ),
-    ),
+  const serviceInterfacesFilled: ServiceInterfaceFilled[] = await Promise.all(
+    serviceInterfaceValues.map(async (serviceInterfaceValue) => {
+      const hostIdRecord = await effects.getHostnames({
+        packageId,
+        hostId: serviceInterfaceValue.addressInfo.hostId,
+        callback,
+      })
+      const primaryUrl = await effects.getPrimaryUrl({
+        serviceInterfaceId: serviceInterfaceValue.id,
+        packageId,
+        callback,
+      })
+      return {
+        ...serviceInterfaceValue,
+        primaryUrl: primaryUrl,
+        addressInfo: filledAddress(
+          hostIdRecord,
+          serviceInterfaceValue.addressInfo,
+        ),
+        get primaryHostname() {
+          if (primaryUrl == null) return null
+          return getHostname(primaryUrl)
+        },
+      }
+    }),
   )
-  return interfacesFilled
+  return serviceInterfacesFilled
 }
 
-export class GetNetworkInterfaces {
+export class GetServiceInterfaces {
   constructor(
     readonly effects: Effects,
     readonly opts: { packageId?: string },
@@ -68,7 +81,7 @@ export class GetNetworkInterfaces {
   async const() {
     const { packageId } = this.opts
     const callback = this.effects.restart
-    const interfaceFilled: NetworkInterfaceFilled[] =
+    const interfaceFilled: ServiceInterfaceFilled[] =
       await makeManyInterfaceFilled({
         effects: this.effects,
         packageId,
@@ -78,12 +91,12 @@ export class GetNetworkInterfaces {
     return interfaceFilled
   }
   /**
-   * Returns the value of NetworkInterfacesFilled at the provided path. Does nothing if the value changes
+   * Returns the value of ServiceInterfacesFilled at the provided path. Does nothing if the value changes
    */
   async once() {
     const { packageId } = this.opts
     const callback = () => {}
-    const interfaceFilled: NetworkInterfaceFilled[] =
+    const interfaceFilled: ServiceInterfaceFilled[] =
       await makeManyInterfaceFilled({
         effects: this.effects,
         packageId,
@@ -94,7 +107,7 @@ export class GetNetworkInterfaces {
   }
 
   /**
-   * Watches the value of NetworkInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
+   * Watches the value of ServiceInterfacesFilled at the provided path. Takes a custom callback function to run whenever the value changes
    */
   async *watch() {
     const { packageId } = this.opts
@@ -112,9 +125,9 @@ export class GetNetworkInterfaces {
     }
   }
 }
-export function getNetworkInterfaces(
+export function getServiceInterfaces(
   effects: Effects,
   opts: { packageId?: string },
 ) {
-  return new GetNetworkInterfaces(effects, opts)
+  return new GetServiceInterfaces(effects, opts)
 }
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index 532ff12a2..8f28191e4 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -9,13 +9,11 @@ import {
   Effects,
   EnsureStorePath,
   ExtractStore,
-  InterfaceId,
+  ServiceInterfaceId,
   PackageId,
   ValidIfNoStupidEscape,
 } from "../types"
 import { GetSystemSmtp } from "./GetSystemSmtp"
-import { DefaultString } from "../config/configTypes"
-import { getDefaultString } from "./getDefaultString"
 import { GetStore, getStore } from "../store/getStore"
 import {
   MountDependenciesOut,
@@ -27,13 +25,13 @@ import {
   NamedPath,
   Path,
 } from "../dependency/setupDependencyMounts"
-import { Host, MultiHost, SingleHost, StaticHost } from "../interfaces/Host"
-import { NetworkInterfaceBuilder } from "../interfaces/NetworkInterfaceBuilder"
-import { GetNetworkInterface, getNetworkInterface } from "./getNetworkInterface"
+import { MultiHost, SingleHost, StaticHost } from "../interfaces/Host"
+import { ServiceInterfaceBuilder } from "../interfaces/ServiceInterfaceBuilder"
+import { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
 import {
-  GetNetworkInterfaces,
-  getNetworkInterfaces,
-} from "./getNetworkInterfaces"
+  GetServiceInterfaces,
+  getServiceInterfaces,
+} from "./getServiceInterfaces"
 import * as CP from "node:child_process"
 import { promisify } from "node:util"
 import { splitCommand } from "./splitCommand"
@@ -50,7 +48,7 @@ const childProcess = {
   execFile: promisify(CP.execFile),
 }
 
-export type NetworkInterfaceType = "ui" | "p2p" | "api" | "other"
+export type ServiceInterfaceType = "ui" | "p2p" | "api"
 
 export type Utils<
   Manifest extends SDKManifest,
@@ -81,11 +79,11 @@ export type Utils<
     description: string
     hasPrimary: boolean
     disabled: boolean
-    type: NetworkInterfaceType
+    type: ServiceInterfaceType
     username: null | string
     path: string
     search: Record<string, string>
-  }) => NetworkInterfaceBuilder
+  }) => ServiceInterfaceBuilder
   getSystemSmtp: () => GetSystemSmtp & WrapperOverWrite
   host: {
     static: (id: string) => StaticHost
@@ -101,16 +99,16 @@ export type Utils<
   >(
     value: In,
   ) => Promise<MountDependenciesOut<In>>
-  networkInterface: {
-    getOwn: (interfaceId: InterfaceId) => GetNetworkInterface & WrapperOverWrite
+  serviceInterface: {
+    getOwn: (id: ServiceInterfaceId) => GetServiceInterface & WrapperOverWrite
     get: (opts: {
-      interfaceId: InterfaceId
+      id: ServiceInterfaceId
       packageId: PackageId
-    }) => GetNetworkInterface & WrapperOverWrite
-    getAllOwn: () => GetNetworkInterfaces & WrapperOverWrite
+    }) => GetServiceInterface & WrapperOverWrite
+    getAllOwn: () => GetServiceInterfaces & WrapperOverWrite
     getAll: (opts: {
       packageId: PackageId
-    }) => GetNetworkInterfaces & WrapperOverWrite
+    }) => GetServiceInterfaces & WrapperOverWrite
   }
   nullIfEmpty: typeof nullIfEmpty
   runCommand: <A extends string>(
@@ -156,11 +154,11 @@ export const createUtils = <
       description: string
       hasPrimary: boolean
       disabled: boolean
-      type: NetworkInterfaceType
+      type: ServiceInterfaceType
       username: null | string
       path: string
       search: Record<string, string>
-    }) => new NetworkInterfaceBuilder({ ...options, effects }),
+    }) => new ServiceInterfaceBuilder({ ...options, effects }),
     childProcess,
     getSystemSmtp: () =>
       new GetSystemSmtp(effects) as GetSystemSmtp & WrapperOverWrite,
@@ -172,18 +170,18 @@ export const createUtils = <
     },
     nullIfEmpty,
 
-    networkInterface: {
-      getOwn: (interfaceId: InterfaceId) =>
-        getNetworkInterface(effects, { interfaceId }) as GetNetworkInterface &
+    serviceInterface: {
+      getOwn: (id: ServiceInterfaceId) =>
+        getServiceInterface(effects, { id }) as GetServiceInterface &
           WrapperOverWrite,
-      get: (opts: { interfaceId: InterfaceId; packageId: PackageId }) =>
-        getNetworkInterface(effects, opts) as GetNetworkInterface &
+      get: (opts: { id: ServiceInterfaceId; packageId: PackageId }) =>
+        getServiceInterface(effects, opts) as GetServiceInterface &
           WrapperOverWrite,
       getAllOwn: () =>
-        getNetworkInterfaces(effects, {}) as GetNetworkInterfaces &
+        getServiceInterfaces(effects, {}) as GetServiceInterfaces &
           WrapperOverWrite,
       getAll: (opts: { packageId: PackageId }) =>
-        getNetworkInterfaces(effects, opts) as GetNetworkInterfaces &
+        getServiceInterfaces(effects, opts) as GetServiceInterfaces &
           WrapperOverWrite,
     },
     store: {

From 089199e7c213c3ead2a656e45b7ef706071063ff Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 22 Feb 2024 14:00:49 -0700
Subject: [PATCH 020/341] Feature/lxc container runtime (#2562)

* wip(fix): Dependencies

* wip: context

* wip(fix) Sorta auth

* wip: warnings

* wip(fix): registry/admin

* wip(fix) marketplace

* wip(fix) Some more converted and fixed with the linter and config

* wip: Working on the static server

* wip(fix)static server

* wip: Remove some asynnc

* wip: Something about the request and regular rpc

* wip: gut install

Co-authored-by: J H <Blu-J@users.noreply.github.com>

* wip: Convert the static server into the new system

* wip delete file

* test

* wip(fix) vhost does not need the with safe defaults

* wip: Adding in the wifi

* wip: Fix the developer and the verify

* wip: new install flow

Co-authored-by: J H <Blu-J@users.noreply.github.com>

* fix middleware

* wip

* wip: Fix the auth

* wip

* continue service refactor

* feature: Service get_config

* feat: Action

* wip: Fighting the great fight against the borrow checker

* wip: Remove an error in a file that I just need to deel with later

* chore: Add in some more lifetime stuff to the services

* wip: Install fix on lifetime

* cleanup

* wip: Deal with the borrow later

* more cleanup

* resolve borrowchecker errors

* wip(feat): add in the handler for the socket, for now

* wip(feat): Update the service_effect_handler::action

* chore: Add in the changes to make sure the from_service goes to context

* chore: Change the

* refactor service map

* fix references to service map

* fill out restore

* wip: Before I work on the store stuff

* fix backup module

* handle some warnings

* feat: add in the ui components on the rust side

* feature: Update the procedures

* chore: Update the js side of the main and a few of the others

* chore: Update the rpc listener to match the persistant container

* wip: Working on updating some things to have a better name

* wip(feat): Try and get the rpc to return the correct shape?

* lxc wip

* wip(feat): Try and get the rpc to return the correct shape?

* build for container runtime wip

* remove container-init

* fix build

* fix error

* chore: Update to work I suppose

* lxc wip

* remove docker module and feature

* download alpine squashfs automatically

* overlays effect

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* chore: Add the overlay effect

* feat: Add the mounter in the main

* chore: Convert to use the mounts, still need to work with the sandbox

* install fixes

* fix ssl

* fixes from testing

* implement tmpfile for upload

* wip

* misc fixes

* cleanup

* cleanup

* better progress reporting

* progress for sideload

* return real guid

* add devmode script

* fix lxc rootfs path

* fix percentage bar

* fix progress bar styling

* fix build for unstable

* tweaks

* label progress

* tweaks

* update progress more often

* make symlink in rpc_client

* make socket dir

* fix parent path

* add start-cli to container

* add echo and gitInfo commands

* wip: Add the init + errors

* chore: Add in the exit effect for the system

* chore: Change the type to null for failure to parse

* move sigterm timeout to stopping status

* update order

* chore: Update the return type

* remove dbg

* change the map error

* chore: Update the thing to capture id

* chore add some life changes

* chore: Update the loging

* chore: Update the package to run module

* us From for RpcError

* chore: Update to use import instead

* chore: update

* chore: Use require for the backup

* fix a default

* update the type that is wrong

* chore: Update the type of the manifest

* chore: Update to make null

* only symlink if not exists

* get rid of double result

* better debug info for ErrorCollection

* chore: Update effects

* chore: fix

* mount assets and volumes

* add exec instead of spawn

* fix mounting in image

* fix overlay mounts

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* misc fixes

* feat: Fix two

* fix: systemForEmbassy main

* chore: Fix small part of main loop

* chore: Modify the bundle

* merge

* fixMain loop"

* move tsc to makefile

* chore: Update the return types of the health check

* fix client

* chore: Convert the todo to use tsmatches

* add in the fixes for the seen and create the hack to allow demo

* chore: Update to include the systemForStartOs

* chore UPdate to the latest types from the expected outout

* fixes

* fix typo

* Don't emit if failure on tsc

* wip

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* add s9pk api

* add inspection

* add inspect manifest

* newline after display serializable

* fix squashfs in image name

* edit manifest

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* wait for response on repl

* ignore sig for now

* ignore sig for now

* re-enable sig verification

* fix

* wip

* env and chroot

* add profiling logs

* set uid & gid in squashfs to 100000

* set uid of sqfs to 100000

* fix mksquashfs args

* add env to compat

* fix

* re-add docker feature flag

* fix docker output format being stupid

* here be dragons

* chore: Add in the cross compiling for something

* fix npm link

* extract logs from container on exit

* chore: Update for testing

* add log capture to drop trait

* chore: add in the modifications that I make

* chore: Update small things for no updates

* chore: Update the types of something

* chore: Make main not complain

* idmapped mounts

* idmapped volumes

* re-enable kiosk

* chore: Add in some logging for the new system

* bring in start-sdk

* remove avahi

* chore: Update the deps

* switch to musl

* chore: Update the version of prettier

* chore: Organize'

* chore: Update some of the headers back to the standard of fetch

* fix musl build

* fix idmapped mounts

* fix cross build

* use cross compiler for correct arch

* feat: Add in the faked ssl stuff for the effects

* @dr_bonez Did a solution here

* chore: Something that DrBonez

* chore: up

* wip: We have a working server!!!

* wip

* uninstall

* wip

* tes

* misc fixes

* fix cli

* replace interface with host

* chore: Fix the types in some ts files

* chore: quick update for the system for embassy to update the types

* replace br-start9 with lxcbr0

* split patchdb into public/private

* chore: Add changes for config set

* Feat: Adding some debugging for the errors

* wip: Working on getting the set config to work

* chore: Update and fix the small issue with the deserialization

* lightning, masked, schemeOverride, invert host-iface relationship

* feat: Add in the changes for just the sdk

* feat: Add in the changes for the new effects I suppose for now

---------

Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com>
Co-authored-by: J H <Blu-J@users.noreply.github.com>
Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: Matt Hill <mattnine@protonmail.com>
---
 .../src/Adapters/HostSystemStartOs.ts         |   77 +-
 container-runtime/src/Adapters/RpcListener.ts |   53 +-
 .../DockerProcedureContainer.ts               |    7 +-
 .../Systems/SystemForEmbassy/index.ts         |   60 +-
 .../src/Adapters/Systems/SystemForStartOs.ts  |    5 +-
 container-runtime/src/Interfaces/System.ts    |    3 +-
 .../src/Models/CallbackHolder.ts              |    4 +-
 core/Cargo.lock                               |  495 ++--
 core/build-prod.sh                            |    2 +-
 core/models/src/id/{interface.rs => host.rs}  |   22 +-
 core/models/src/id/mod.rs                     |    4 +-
 core/startos/src/auth.rs                      |    3 +-
 core/startos/src/backup/backup_bulk.rs        |   13 +-
 core/startos/src/backup/mod.rs                |    7 +-
 core/startos/src/config/mod.rs                |   79 +-
 core/startos/src/config/spec.rs               | 2015 -----------------
 core/startos/src/context/rpc.rs               |   30 +-
 core/startos/src/db/mod.rs                    |   12 +-
 core/startos/src/db/model.rs                  |  127 +-
 core/startos/src/db/prelude.rs                |    3 +-
 core/startos/src/dependencies.rs              |   78 +-
 core/startos/src/init.rs                      |    4 +-
 core/startos/src/install/mod.rs               |   67 +-
 core/startos/src/net/dhcp.rs                  |    3 +-
 core/startos/src/net/dns.rs                   |    4 +-
 core/startos/src/net/host/mod.rs              |   29 +
 core/startos/src/net/host/multi.rs            |   13 +
 core/startos/src/net/interface.rs             |  122 -
 core/startos/src/net/keys.rs                  |   76 +-
 core/startos/src/net/mod.rs                   |    2 +-
 core/startos/src/net/net_controller.rs        |   42 +-
 core/startos/src/net/ssl.rs                   |    2 +-
 core/startos/src/net/wifi.rs                  |    3 +-
 core/startos/src/notifications.rs             |   12 +-
 core/startos/src/service/config.rs            |   19 +-
 core/startos/src/service/mod.rs               |   25 +-
 .../src/service/persistent_container.rs       |    4 +-
 .../src/service/service_effect_handler.rs     |   69 +-
 core/startos/src/service/service_map.rs       |   10 +-
 core/startos/src/setup.rs                     |    8 +-
 core/startos/src/shutdown.rs                  |    6 +-
 core/startos/src/system.rs                    |   23 +-
 core/startos/src/update/mod.rs                |   18 +-
 core/startos/src/util/actor.rs                |   10 +-
 core/startos/src/version/mod.rs               |   17 +-
 core/startos/src/version/v0_3_4.rs            |   43 +-
 core/startos/src/version/v0_3_4_4.rs          |    2 +-
 core/startos/src/version/v0_3_5.rs            |    9 +-
 core/startos/src/volume.rs                    |   37 +-
 patch-db                                      |    2 +-
 sdk/lib/interfaces/Host.ts                    |   19 +-
 sdk/lib/interfaces/Origin.ts                  |   72 +-
 sdk/lib/interfaces/ServiceInterfaceBuilder.ts |   48 +-
 sdk/lib/test/host.test.ts                     |    4 +-
 sdk/lib/types.ts                              |   42 +-
 sdk/lib/util/getServiceInterface.ts           |  117 +-
 sdk/lib/util/getServiceInterfaces.ts          |   26 +-
 sdk/lib/util/utils.ts                         |    6 +-
 58 files changed, 1057 insertions(+), 3057 deletions(-)
 rename core/models/src/id/{interface.rs => host.rs} (74%)
 delete mode 100644 core/startos/src/config/spec.rs
 create mode 100644 core/startos/src/net/host/mod.rs
 create mode 100644 core/startos/src/net/host/multi.rs
 delete mode 100644 core/startos/src/net/interface.rs

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index e4177044e..007f783c0 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -38,7 +38,10 @@ export class HostSystemStartOs implements Effects {
 
   constructor(readonly callbackHolder: CallbackHolder) {}
   id = 0
-  rpcRound(method: string, params: unknown) {
+  rpcRound<K extends keyof Effects | "getStore" | "setStore">(
+    method: K,
+    params: unknown,
+  ) {
     const id = this.id++
     const client = net.createConnection({ path: SOCKET_PATH }, () => {
       client.write(
@@ -74,7 +77,7 @@ export class HostSystemStartOs implements Effects {
                   console.error("Debug: " + res.error.data.debug)
                 }
               }
-              reject(new Error(message))
+              reject(new Error(`${message}@${method}`))
             } else if (testRpcResult(res)) {
               resolve(res.result)
             } else {
@@ -91,13 +94,7 @@ export class HostSystemStartOs implements Effects {
       })
     })
   }
-  started =
-    // @ts-ignore
-    this.method !== MAIN
-      ? null
-      : () => {
-          return this.rpcRound("started", null)
-        }
+
   bind(...[options]: Parameters<T.Effects["bind"]>) {
     return this.rpcRound("bind", options) as ReturnType<T.Effects["bind"]>
   }
@@ -131,9 +128,9 @@ export class HostSystemStartOs implements Effects {
       T.Effects["exportAction"]
     >
   }
-  exportServiceInterface(
-    ...[options]: Parameters<T.Effects["exportServiceInterface"]>
-  ) {
+  exportServiceInterface: Effects["exportServiceInterface"] = (
+    ...[options]: Parameters<Effects["exportServiceInterface"]>
+  ) => {
     return this.rpcRound("exportServiceInterface", options) as ReturnType<
       T.Effects["exportServiceInterface"]
     >
@@ -158,31 +155,24 @@ export class HostSystemStartOs implements Effects {
       T.Effects["getContainerIp"]
     >
   }
-  getHostnames: any = (...[allOptions]: any[]) => {
+  getHostInfo: Effects["getHostInfo"] = (...[allOptions]: any[]) => {
     const options = {
       ...allOptions,
       callback: this.callbackHolder.addCallback(allOptions.callback),
     }
-    return this.rpcRound("getHostnames", options) as ReturnType<
-      T.Effects["getHostnames"]
-    >
+    return this.rpcRound("getHostInfo", options) as ReturnType<
+      T.Effects["getHostInfo"]
+    > as any
   }
-  getInterface(...[options]: Parameters<T.Effects["getInterface"]>) {
-    return this.rpcRound("getInterface", {
+  getServiceInterface(
+    ...[options]: Parameters<T.Effects["getServiceInterface"]>
+  ) {
+    return this.rpcRound("getServiceInterface", {
       ...options,
       callback: this.callbackHolder.addCallback(options.callback),
-    }) as ReturnType<T.Effects["getInterface"]>
-  }
-  getIPHostname(...[]: Parameters<T.Effects["getIPHostname"]>) {
-    return this.rpcRound("getIPHostname", null) as ReturnType<
-      T.Effects["getIPHostname"]
-    >
-  }
-  getLocalHostname(...[]: Parameters<T.Effects["getLocalHostname"]>) {
-    return this.rpcRound("getLocalHostname", null) as ReturnType<
-      T.Effects["getLocalHostname"]
-    >
+    }) as ReturnType<T.Effects["getServiceInterface"]>
   }
+
   getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
     return this.rpcRound("getPrimaryUrl", {
       ...options,
@@ -196,14 +186,6 @@ export class HostSystemStartOs implements Effects {
       T.Effects["getServicePortForward"]
     >
   }
-  getServiceTorHostname(
-    ...[interfaceId, packageId]: Parameters<T.Effects["getServiceTorHostname"]>
-  ) {
-    return this.rpcRound("getServiceTorHostname", {
-      interfaceId,
-      packageId,
-    }) as ReturnType<T.Effects["getServiceTorHostname"]>
-  }
   getSslCertificate(
     ...[packageId, algorithm]: Parameters<T.Effects["getSslCertificate"]>
   ) {
@@ -223,11 +205,13 @@ export class HostSystemStartOs implements Effects {
       callback: this.callbackHolder.addCallback(options.callback),
     }) as ReturnType<T.Effects["getSystemSmtp"]>
   }
-  listInterface(...[options]: Parameters<T.Effects["listInterface"]>) {
-    return this.rpcRound("listInterface", {
+  listServiceInterfaces(
+    ...[options]: Parameters<T.Effects["listServiceInterfaces"]>
+  ) {
+    return this.rpcRound("listServiceInterfaces", {
       ...options,
       callback: this.callbackHolder.addCallback(options.callback),
-    }) as ReturnType<T.Effects["listInterface"]>
+    }) as ReturnType<T.Effects["listServiceInterfaces"]>
   }
   mount(...[options]: Parameters<T.Effects["mount"]>) {
     return this.rpcRound("mount", options) as ReturnType<T.Effects["mount"]>
@@ -304,17 +288,4 @@ export class HostSystemStartOs implements Effects {
         T.Effects["store"]["set"]
       >,
   }
-
-  /**
-   * So, this is created
-   * @param options
-   * @returns
-   */
-  embassyGetInterface(options: {
-    target: "tor-key" | "tor-address" | "lan-address"
-    packageId: string
-    interface: string
-  }) {
-    return this.rpcRound("embassyGetInterface", options) as Promise<string>
-  }
 }
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index c9cbe9fef..815a5538e 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -11,6 +11,7 @@ import {
   matches,
   any,
   shape,
+  anyOf,
 } from "ts-matches"
 
 import { types as T } from "@start9labs/start-sdk"
@@ -24,16 +25,28 @@ import { HostSystem } from "../Interfaces/HostSystem"
 import { jsonPath } from "../Models/JsonPath"
 import { System } from "../Interfaces/System"
 type MaybePromise<T> = T | Promise<T>
-type SocketResponse = { jsonrpc: "2.0"; id: IdType } & (
-  | { result: unknown }
-  | {
-      error: {
-        code: number
-        message: string
-        data: { details: string; debug?: string }
-      }
-    }
+export const matchRpcResult = anyOf(
+  object({ result: any }),
+  object({
+    error: object(
+      {
+        code: number,
+        message: string,
+        data: object(
+          {
+            details: string,
+            debug: any,
+          },
+          ["details", "debug"],
+        ),
+      },
+      ["data"],
+    ),
+  }),
 )
+export type RpcResult = typeof matchRpcResult._TYPE
+type SocketResponse = { jsonrpc: "2.0"; id: IdType } & RpcResult
+
 const SOCKET_PARENT = "/media/startos/rpc"
 const SOCKET_PATH = "/media/startos/rpc/service.sock"
 const jsonrpc = "2.0" as const
@@ -186,23 +199,11 @@ export class RpcListener {
             input: params.input,
             timeout: params.timeout,
           })
-          .then((result) =>
-            "ok" in result
-              ? {
-                  jsonrpc,
-                  id,
-                  result: result.ok === undefined ? null : result.ok,
-                }
-              : {
-                  jsonrpc,
-                  id,
-                  error: {
-                    code: result.err.code,
-                    message: "Package Root Error",
-                    data: { details: result.err.message },
-                  },
-                },
-          )
+          .then((result) => ({
+            jsonrpc,
+            id,
+            ...result,
+          }))
           .catch((error) => ({
             jsonrpc,
             id,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 9cbda69dd..3129ce45d 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -33,8 +33,11 @@ export class DockerProcedureContainer {
           await overlay.mount({ type: "assets", id: mount }, mounts[mount])
         } else if (volumeMount.type === "certificate") {
           volumeMount
-          const certChain = await effects.getSslCertificate()
-          const key = await effects.getSslKey()
+          const certChain = await effects.getSslCertificate(
+            null,
+            volumeMount["interface-id"],
+          )
+          const key = await effects.getSslKey(null, volumeMount["interface-id"])
           await fs.writeFile(
             `${path}/${volumeMount["interface-id"]}.cert.pem`,
             certChain.join("\n"),
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index ca1a69d2e..d96f826d7 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -28,6 +28,9 @@ import {
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
 import { HostSystem } from "../../../Interfaces/HostSystem"
+import { RpcResult, matchRpcResult } from "../../RpcListener"
+import { ServiceInterface } from "../../../../../sdk/dist/cjs/lib/types"
+import { createUtils } from "../../../../../sdk/dist/cjs/lib/util"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -68,7 +71,7 @@ export class SystemForEmbassy implements System {
       input: unknown
       timeout?: number | undefined
     },
-  ): Promise<ExecuteResult> {
+  ): Promise<RpcResult> {
     return this._execute(effects, options)
       .then((x) =>
         matches(x)
@@ -76,16 +79,14 @@ export class SystemForEmbassy implements System {
             object({
               result: any,
             }),
-            (x) => ({
-              ok: x.result,
-            }),
+            (x) => x,
           )
           .when(
             object({
               error: string,
             }),
             (x) => ({
-              err: {
+              error: {
                 code: 0,
                 message: x.error,
               },
@@ -96,20 +97,34 @@ export class SystemForEmbassy implements System {
               "error-code": tuple(number, string),
             }),
             ({ "error-code": [code, message] }) => ({
-              err: {
+              error: {
                 code,
                 message,
               },
             }),
           )
-          .defaultTo({ ok: x }),
+          .defaultTo({ result: x }),
       )
-      .catch((error) => ({
-        err: {
-          code: 0,
-          message: "" + error,
-        },
-      }))
+      .catch((error: unknown) => {
+        if (error instanceof Error)
+          return {
+            error: {
+              code: 0,
+              message: error.name,
+              data: {
+                details: error.message,
+                debug: `${error?.cause ?? "[noCause]"}:${error?.stack ?? "[noStack]"}`,
+              },
+            },
+          }
+        if (matchRpcResult.test(error)) return error
+        return {
+          error: {
+            code: 0,
+            message: String(error),
+          },
+        }
+      })
   }
   async exit(effects: HostSystemStartOs): Promise<void> {
     if (this.currentRunning) await this.currentRunning.clean()
@@ -157,6 +172,7 @@ export class SystemForEmbassy implements System {
             return this.dependenciesAutoconfig(effects, procedures[2], input)
         }
     }
+    throw new Error(`Could not find the path for ${options.procedure}`)
   }
   private async init(
     effects: HostSystemStartOs,
@@ -864,6 +880,7 @@ async function updateConfig(
 ) {
   if (!dictionary([string, unknown]).test(spec)) return
   if (!dictionary([string, unknown]).test(mutConfigValue)) return
+  const utils = createUtils(effects)
   for (const key in spec) {
     const specValue = spec[key]
 
@@ -890,11 +907,18 @@ async function updateConfig(
       mutConfigValue[key] = configValue
     }
     if (matchPointerPackage.test(specValue)) {
-      mutConfigValue[key] = await effects.embassyGetInterface({
-        target: specValue.target,
-        packageId: specValue["package-id"],
-        interface: specValue["interface"],
-      })
+      const filled = await utils.serviceInterface
+        .get({
+          packageId: specValue["package-id"],
+          id: specValue.interface,
+        })
+        .once()
+      if (specValue.target === "tor-key")
+        throw new Error("This service uses an unsupported target TorKey")
+      mutConfigValue[key] =
+        specValue.target === "lan-address"
+          ? filled.addressInfo.localHostnames[0]
+          : filled.addressInfo.onionHostnames[0]
     }
   }
 }
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 9d2dcd4b8..95afb5fb4 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -3,6 +3,7 @@ import { unNestPath } from "../../Models/JsonPath"
 import { string } from "ts-matches"
 import { HostSystemStartOs } from "../HostSystemStartOs"
 import { Effects } from "../../Models/Effects"
+import { RpcResult } from "../RpcListener"
 const LOCATION = "/usr/lib/startos/package/startos"
 export class SystemForStartOs implements System {
   private onTerm: (() => Promise<void>) | undefined
@@ -30,8 +31,8 @@ export class SystemForStartOs implements System {
       input: unknown
       timeout?: number | undefined
     },
-  ): Promise<ExecuteResult> {
-    return { ok: await this._execute(effects, options) }
+  ): Promise<RpcResult> {
+    return { result: await this._execute(effects, options) }
   }
   async _execute(
     effects: Effects,
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
index 7dcde3c52..86b2aa492 100644
--- a/container-runtime/src/Interfaces/System.ts
+++ b/container-runtime/src/Interfaces/System.ts
@@ -1,6 +1,7 @@
 import { types as T } from "@start9labs/start-sdk"
 import { JsonPath } from "../Models/JsonPath"
 import { HostSystemStartOs } from "../Adapters/HostSystemStartOs"
+import { RpcResult } from "../Adapters/RpcListener"
 export type ExecuteResult =
   | { ok: unknown }
   | { err: { code: number; message: string } }
@@ -17,7 +18,7 @@ export interface System {
       input: unknown
       timeout?: number
     },
-  ): Promise<ExecuteResult>
+  ): Promise<RpcResult>
   // sandbox(
   //   effects: Effects,
   //   options: {
diff --git a/container-runtime/src/Models/CallbackHolder.ts b/container-runtime/src/Models/CallbackHolder.ts
index 3aa4392ce..b562e8dd0 100644
--- a/container-runtime/src/Models/CallbackHolder.ts
+++ b/container-runtime/src/Models/CallbackHolder.ts
@@ -7,7 +7,9 @@ export class CallbackHolder {
     return this.root + (this.inc++).toString(36)
   }
   addCallback(callback: Function) {
-    return this.callbacks.set(this.newId(), callback)
+    const id = this.newId()
+    this.callbacks.set(id, callback)
+    return id
   }
   callCallback(index: string, args: any[]): Promise<unknown> {
     const callback = this.callbacks.get(index)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index ec677308d..95b7f3ca9 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -32,9 +32,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom 0.2.12",
  "once_cell",
@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
 dependencies = [
  "cfg-if",
  "getrandom 0.2.12",
@@ -115,9 +115,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
@@ -218,7 +218,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -229,7 +229,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -487,9 +487,9 @@ dependencies = [
 
 [[package]]
 name = "bitmaps"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403"
+checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
 
 [[package]]
 name = "bitvec"
@@ -575,9 +575,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f"
 
 [[package]]
 name = "byteorder"
@@ -608,9 +608,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.33"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -686,16 +686,16 @@ dependencies = [
  "bitflags 1.3.2",
  "clap_lex 0.2.4",
  "indexmap 1.9.3",
- "strsim",
+ "strsim 0.10.0",
  "termcolor",
  "textwrap",
 ]
 
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -703,26 +703,26 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.6.0",
- "strsim",
+ "clap_lex 0.7.0",
+ "strsim 0.11.0",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -736,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "color-eyre"
@@ -879,17 +879,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "cookie"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
 [[package]]
 name = "cookie"
 version = "0.17.0"
@@ -911,23 +900,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "cookie_store"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa"
-dependencies = [
- "cookie 0.16.2",
- "idna 0.2.3",
- "log",
- "publicsuffix",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "url",
-]
-
 [[package]]
 name = "cookie_store"
 version = "0.20.0"
@@ -987,9 +959,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -1133,9 +1105,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1156,14 +1128,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.3"
+version = "0.20.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1171,27 +1143,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.3"
+version = "0.20.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
- "syn 2.0.48",
+ "strsim 0.10.0",
+ "syn 2.0.49",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.3"
+version = "0.20.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1359,11 +1331,11 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
@@ -1375,9 +1347,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 dependencies = [
  "serde",
 ]
@@ -1452,7 +1424,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1490,9 +1462,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "eyre"
-version = "0.6.11"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
 dependencies = [
  "indenter",
  "once_cell",
@@ -1525,9 +1497,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
+checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
 
 [[package]]
 name = "filetime"
@@ -1686,7 +1658,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -1793,7 +1765,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.11",
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -1812,7 +1784,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 1.0.0",
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -1847,7 +1819,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
 ]
 
 [[package]]
@@ -1856,7 +1828,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
  "allocator-api2",
 ]
 
@@ -1919,9 +1891,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
+checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
 
 [[package]]
 name = "hex"
@@ -2116,12 +2088,11 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67"
+checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
  "bytes",
- "futures-channel",
  "futures-util",
  "http 1.0.0",
  "http-body 1.0.0",
@@ -2129,14 +2100,13 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.59"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2161,17 +2131,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.3.0"
@@ -2275,9 +2234,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -2286,9 +2245,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
  "console",
  "instant",
@@ -2347,12 +2306,12 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi 0.3.4",
- "rustix",
+ "hermit-abi 0.3.6",
+ "libc",
  "windows-sys 0.52.0",
 ]
 
@@ -2395,9 +2354,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
@@ -2414,7 +2373,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb52eeac20f256459e909bd4a03bb8c4fab6a1fdbb8ed52d00f644152df48ece"
 dependencies = [
- "ahash 0.7.7",
+ "ahash 0.7.8",
  "dyn-clone",
  "hifijson",
  "indexmap 1.9.3",
@@ -2466,9 +2425,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2572,9 +2531,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libm"
@@ -2635,12 +2594,6 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "matchit"
 version = "0.7.3"
@@ -2708,9 +2661,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -2733,7 +2686,7 @@ version = "0.1.0"
 dependencies = [
  "base64 0.21.7",
  "color-eyre",
- "ed25519-dalek 2.1.0",
+ "ed25519-dalek 2.1.1",
  "emver",
  "ipnet",
  "lazy_static",
@@ -2890,28 +2843,33 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2932,9 +2890,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
  "libm",
@@ -2946,7 +2904,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.4",
+ "hermit-abi 0.3.6",
  "libc",
 ]
 
@@ -2968,7 +2926,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -3034,7 +2992,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -3045,9 +3003,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.2.1+3.2.0"
+version = "300.2.3+3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3"
+checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
 dependencies = [
  "cc",
 ]
@@ -3223,7 +3181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
 ]
 
 [[package]]
@@ -3258,7 +3216,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -3296,9 +3254,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "platforms"
@@ -3359,7 +3317,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.21.0",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
@@ -3422,7 +3380,7 @@ dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -3647,14 +3605,14 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.23"
+version = "0.11.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
 dependencies = [
  "base64 0.21.7",
  "bytes",
- "cookie 0.16.2",
- "cookie_store 0.16.2",
+ "cookie 0.17.0",
+ "cookie_store",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -3671,9 +3629,11 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -3695,7 +3655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba529055ea150e42e4eb9c11dcd380a41025ad4d594b0cb4904ef28b037e1061"
 dependencies = [
  "bytes",
- "cookie_store 0.20.0",
+ "cookie_store",
  "reqwest",
  "url",
 ]
@@ -3712,16 +3672,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if",
  "getrandom 0.2.12",
  "libc",
  "spin 0.9.8",
  "untrusted",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3760,17 +3721,17 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#8d714d09a327249f16f77a8f5a160a2b7cfbf380"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#c89e0abdb15dd3bed9adb5339cf0b61a96f32b50"
 dependencies = [
  "async-stream",
  "async-trait",
  "axum 0.7.4",
- "clap 4.4.18",
+ "clap 4.5.1",
  "futures",
  "http 1.0.0",
  "http-body-util",
  "imbl-value",
- "itertools 0.12.0",
+ "itertools 0.12.1",
  "lazy_format",
  "lazy_static",
  "openssl",
@@ -3800,7 +3761,7 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit-macro"
 version = "0.2.2"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#8d714d09a327249f16f77a8f5a160a2b7cfbf380"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#c89e0abdb15dd3bed9adb5339cf0b61a96f32b50"
 dependencies = [
  "proc-macro2",
  "rpc-toolkit-macro-internals 0.2.2 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
@@ -3821,9 +3782,9 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit-macro-internals"
 version = "0.2.2"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#8d714d09a327249f16f77a8f5a160a2b7cfbf380"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#c89e0abdb15dd3bed9adb5339cf0b61a96f32b50"
 dependencies = [
- "itertools 0.12.0",
+ "itertools 0.12.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3888,9 +3849,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.30"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -3919,7 +3880,7 @@ dependencies = [
  "log",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.1",
+ "rustls-webpki 0.102.2",
  "subtle",
  "zeroize",
 ]
@@ -3935,9 +3896,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a"
+checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7"
 
 [[package]]
 name = "rustls-webpki"
@@ -3951,9 +3912,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.1"
+version = "0.102.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b"
+checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3980,9 +3941,9 @@ dependencies = [
 
 [[package]]
 name = "rustyline-async"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca4447465ceb8c01c253cc81660b242547c58e4a59c85b13294a6e70de8b9e"
+checksum = "8b6eb06391513b2184f0a5405c11a4a0a5302e8be442f4c5c35267187c2b37d5"
 dependencies = [
  "crossterm",
  "futures-channel",
@@ -4115,16 +4076,16 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.112"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "itoa",
  "ryu",
  "serde",
@@ -4163,16 +4124,17 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.5.1"
+version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c"
+checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270"
 dependencies = [
  "base64 0.21.7",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "serde",
+ "serde_derive",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -4180,23 +4142,23 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.5.1"
+version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298"
+checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.30"
+version = "0.9.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38"
+checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "itoa",
  "ryu",
  "serde",
@@ -4384,7 +4346,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
 dependencies = [
- "itertools 0.12.0",
+ "itertools 0.12.1",
  "nom",
  "unicode_categories",
 ]
@@ -4408,7 +4370,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
  "atoi",
  "byteorder",
  "bytes",
@@ -4425,7 +4387,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "log",
  "memchr",
  "once_cell",
@@ -4615,8 +4577,8 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex-syntax 0.6.29",
- "strsim",
- "syn 2.0.48",
+ "strsim 0.10.0",
+ "syn 2.0.49",
  "unicode-width",
 ]
 
@@ -4647,7 +4609,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01f8f4ea73476c0aa5d5e6a75ce1e8634e2c3f82005ef3bbed21547ac57f2bf7"
 dependencies = [
- "ed25519-dalek 2.1.0",
+ "ed25519-dalek 2.1.1",
  "p256",
  "p384",
  "p521",
@@ -4680,18 +4642,18 @@ dependencies = [
  "bytes",
  "chrono",
  "ciborium",
- "clap 4.4.18",
+ "clap 4.5.1",
  "color-eyre",
  "console",
  "console-subscriber",
  "cookie 0.18.0",
- "cookie_store 0.20.0",
+ "cookie_store",
  "current_platform",
  "digest 0.10.7",
  "divrem",
  "ed25519 2.2.3",
  "ed25519-dalek 1.0.1",
- "ed25519-dalek 2.1.0",
+ "ed25519-dalek 2.1.1",
  "emver",
  "fd-lock-rs",
  "futures",
@@ -4703,13 +4665,13 @@ dependencies = [
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "indicatif",
  "integer-encoding",
  "ipnet",
  "iprange",
  "isocountry",
- "itertools 0.12.0",
+ "itertools 0.12.1",
  "jaq-core",
  "jaq-std",
  "josekit",
@@ -4766,7 +4728,7 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite",
  "tokio-util",
- "toml 0.8.8",
+ "toml 0.8.10",
  "torut",
  "tracing",
  "tracing-error",
@@ -4824,6 +4786,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+
 [[package]]
 name = "subtle"
 version = "2.5.0"
@@ -4843,9 +4811,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4898,13 +4866,12 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.9.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
+checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall 0.4.1",
  "rustix",
  "windows-sys 0.52.0",
 ]
@@ -4931,9 +4898,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 
 [[package]]
 name = "thingbuf"
@@ -4947,22 +4914,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -4988,12 +4955,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.31"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
 dependencies = [
  "deranged",
  "itoa",
+ "num-conv",
  "powerfmt",
  "serde",
  "time-core",
@@ -5008,10 +4976,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -5041,9 +5010,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5077,7 +5046,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -5181,14 +5150,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.21.0",
+ "toml_edit 0.22.6",
 ]
 
 [[package]]
@@ -5206,24 +5175,35 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
+dependencies = [
+ "indexmap 2.2.3",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.1",
 ]
 
 [[package]]
@@ -5325,7 +5305,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -5400,9 +5380,9 @@ dependencies = [
 
 [[package]]
 name = "treediff"
-version = "4.0.2"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303"
+checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5"
 dependencies = [
  "serde_json",
 ]
@@ -5497,7 +5477,7 @@ checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -5544,9 +5524,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
@@ -5667,9 +5647,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5677,24 +5657,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
+checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5704,9 +5684,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5714,28 +5694,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.90"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
 [[package]]
 name = "wasm-streams"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
+checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -5746,9 +5726,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
+checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5756,9 +5736,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.25.3"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "whoami"
@@ -5940,9 +5920,18 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "winnow"
-version = "0.5.35"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d"
+checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401"
 dependencies = [
  "memchr",
 ]
@@ -6004,7 +5993,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f355ab62ebe30b758c1f4ab096a306722c4b7dbfb9d8c07d18c70d71a945588"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
  "hashbrown 0.13.2",
  "lazy_static",
  "serde",
@@ -6027,7 +6016,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
 
 [[package]]
@@ -6047,5 +6036,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.49",
 ]
diff --git a/core/build-prod.sh b/core/build-prod.sh
index 0588384dc..8b6184942 100755
--- a/core/build-prod.sh
+++ b/core/build-prod.sh
@@ -22,7 +22,7 @@ if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
 	RUSTFLAGS="--cfg tokio_unstable"
 fi
 
-alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
 
 set +e
 fail=
diff --git a/core/models/src/id/interface.rs b/core/models/src/id/host.rs
similarity index 74%
rename from core/models/src/id/interface.rs
rename to core/models/src/id/host.rs
index b9b32dd4a..91abd56e7 100644
--- a/core/models/src/id/interface.rs
+++ b/core/models/src/id/host.rs
@@ -6,48 +6,48 @@ use serde::{Deserialize, Deserializer, Serialize};
 use crate::{Id, InvalidId};
 
 #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
-pub struct InterfaceId(Id);
-impl FromStr for InterfaceId {
+pub struct HostId(Id);
+impl FromStr for HostId {
     type Err = InvalidId;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(Self(Id::try_from(s.to_owned())?))
     }
 }
-impl From<Id> for InterfaceId {
+impl From<Id> for HostId {
     fn from(id: Id) -> Self {
         Self(id)
     }
 }
-impl std::fmt::Display for InterfaceId {
+impl std::fmt::Display for HostId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", &self.0)
     }
 }
-impl std::ops::Deref for InterfaceId {
+impl std::ops::Deref for HostId {
     type Target = str;
     fn deref(&self) -> &Self::Target {
         &*self.0
     }
 }
-impl AsRef<str> for InterfaceId {
+impl AsRef<str> for HostId {
     fn as_ref(&self) -> &str {
         self.0.as_ref()
     }
 }
-impl<'de> Deserialize<'de> for InterfaceId {
+impl<'de> Deserialize<'de> for HostId {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
-        Ok(InterfaceId(Deserialize::deserialize(deserializer)?))
+        Ok(HostId(Deserialize::deserialize(deserializer)?))
     }
 }
-impl AsRef<Path> for InterfaceId {
+impl AsRef<Path> for HostId {
     fn as_ref(&self) -> &Path {
         self.0.as_ref().as_ref()
     }
 }
-impl<'q> sqlx::Encode<'q, sqlx::Postgres> for InterfaceId {
+impl<'q> sqlx::Encode<'q, sqlx::Postgres> for HostId {
     fn encode_by_ref(
         &self,
         buf: &mut <sqlx::Postgres as sqlx::database::HasArguments<'q>>::ArgumentBuffer,
@@ -55,7 +55,7 @@ impl<'q> sqlx::Encode<'q, sqlx::Postgres> for InterfaceId {
         <&str as sqlx::Encode<'q, sqlx::Postgres>>::encode_by_ref(&&**self, buf)
     }
 }
-impl sqlx::Type<sqlx::Postgres> for InterfaceId {
+impl sqlx::Type<sqlx::Postgres> for HostId {
     fn type_info() -> sqlx::postgres::PgTypeInfo {
         <&str as sqlx::Type<sqlx::Postgres>>::type_info()
     }
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index ac32ceb22..068955336 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -7,8 +7,8 @@ use yasi::InternedString;
 mod action;
 mod address;
 mod health_check;
+mod host;
 mod image;
-mod interface;
 mod invalid_id;
 mod package;
 mod volume;
@@ -16,8 +16,8 @@ mod volume;
 pub use action::ActionId;
 pub use address::AddressId;
 pub use health_check::HealthCheckId;
+pub use host::HostId;
 pub use image::ImageId;
-pub use interface::InterfaceId;
 pub use invalid_id::InvalidId;
 pub use package::{PackageId, SYSTEM_PACKAGE_ID};
 pub use volume::VolumeId;
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index cdf2a4591..891f390bc 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -437,7 +437,8 @@ pub async fn reset_password_impl(
     let account_password = &account.password;
     ctx.db
         .mutate(|d| {
-            d.as_server_info_mut()
+            d.as_public_mut()
+                .as_server_info_mut()
                 .as_password_hash_mut()
                 .ser(account_password)
         })
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 5c68753c7..4660ab4bc 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -141,7 +141,8 @@ pub async fn backup_all(
         }
         ctx.db
             .mutate(|v| {
-                v.as_server_info_mut()
+                v.as_public_mut()
+                    .as_server_info_mut()
                     .as_status_info_mut()
                     .as_backup_progress_mut()
                     .ser(&None)
@@ -159,6 +160,7 @@ async fn assure_backing_up(
 ) -> Result<(), Error> {
     db.mutate(|v| {
         let backing_up = v
+            .as_public_mut()
             .as_server_info_mut()
             .as_status_info_mut()
             .as_backup_progress_mut();
@@ -221,7 +223,7 @@ async fn perform_backup(
         )
     })?;
 
-    let ui = ctx.db.peek().await.into_ui().de()?;
+    let ui = ctx.db.peek().await.into_public().into_ui().de()?;
 
     let mut os_backup_file =
         AtomicFile::new(backup_guard.path().join("os-backup.cbor"), None::<PathBuf>)
@@ -261,7 +263,12 @@ async fn perform_backup(
     backup_guard.save_and_unmount().await?;
 
     ctx.db
-        .mutate(|v| v.as_server_info_mut().as_last_backup_mut().ser(&timestamp))
+        .mutate(|v| {
+            v.as_public_mut()
+                .as_server_info_mut()
+                .as_last_backup_mut()
+                .ser(&timestamp)
+        })
         .await?;
 
     Ok(backup_report)
diff --git a/core/startos/src/backup/mod.rs b/core/startos/src/backup/mod.rs
index d1fd57898..de2dfbf7d 100644
--- a/core/startos/src/backup/mod.rs
+++ b/core/startos/src/backup/mod.rs
@@ -1,13 +1,12 @@
 use std::collections::BTreeMap;
 
 use chrono::{DateTime, Utc};
-use models::PackageId;
+use models::{HostId, PackageId};
 use reqwest::Url;
 use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 
 use crate::context::CliContext;
-use crate::net::interface::InterfaceId;
 #[allow(unused_imports)]
 use crate::prelude::*;
 use crate::util::serde::{Base32, Base64};
@@ -50,8 +49,8 @@ pub fn backup() -> ParentHandler {
 struct BackupMetadata {
     pub timestamp: DateTime<Utc>,
     #[serde(default)]
-    pub network_keys: BTreeMap<InterfaceId, Base64<[u8; 32]>>,
+    pub network_keys: BTreeMap<HostId, Base64<[u8; 32]>>,
     #[serde(default)]
-    pub tor_keys: BTreeMap<InterfaceId, Base32<[u8; 64]>>, // DEPRECATED
+    pub tor_keys: BTreeMap<HostId, Base32<[u8; 64]>>, // DEPRECATED
     pub marketplace_url: Option<Url>,
 }
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index 220e388c9..522e5c1a7 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -1,10 +1,9 @@
-use std::collections::BTreeMap;
 use std::sync::Arc;
 use std::time::Duration;
 
 use clap::Parser;
 use color_eyre::eyre::eyre;
-use indexmap::IndexSet;
+use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
 use models::{ErrorKind, OptionExt, PackageId};
 use patch_db::value::InternedString;
@@ -18,15 +17,15 @@ use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
 use crate::util::serde::{HandlerExtSerde, StdinDeserializable};
 
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct ConfigSpec(pub IndexMap<InternedString, Value>);
+
 pub mod action;
-pub mod spec;
 pub mod util;
 
-pub use spec::{ConfigSpec, Defaultable};
 use util::NumRange;
 
 use self::action::ConfigRes;
-use self::spec::ValueSpecPointer;
 
 pub type Config = patch_db::value::InOMap<InternedString, Value>;
 pub trait TypeOf {
@@ -53,8 +52,6 @@ pub enum ConfigurationError {
     NoMatch(#[from] NoMatchWithPath),
     #[error("System Error: {0}")]
     SystemError(Error),
-    #[error("Permission Denied: {0}")]
-    PermissionDenied(ValueSpecPointer),
 }
 impl From<ConfigurationError> for Error {
     fn from(err: ConfigurationError) -> Self {
@@ -122,8 +119,6 @@ pub enum MatchError {
     PropertyMatchesUnionTag(InternedString, String),
     #[error("Name of Property {0:?} Conflicts With Map Tag Name")]
     PropertyNameMatchesMapTag(String),
-    #[error("Pointer Is Invalid: {0}")]
-    InvalidPointer(spec::ValueSpecPointer),
     #[error("Object Key Is Invalid: {0}")]
     InvalidKey(String),
     #[error("Value In List Is Not Unique")]
@@ -178,65 +173,19 @@ pub struct SetParams {
 // )]
 #[instrument(skip_all)]
 pub fn set() -> ParentHandler<SetParams, PackageId> {
-    ParentHandler::new()
-        .root_handler(
-            from_fn_async(set_impl)
-                .with_metadata("sync_db", Value::Bool(true))
-                .with_inherited(|set_params, id| (id, set_params))
-                .no_display()
-                .with_remote_cli::<CliContext>(),
-        )
-        .subcommand(
-            "dry",
-            from_fn_async(set_dry)
-                .with_inherited(|set_params, id| (id, set_params))
-                .with_display_serializable()
-                .with_remote_cli::<CliContext>(),
-        )
-}
-
-pub async fn set_dry(
-    ctx: RpcContext,
-    _: Empty,
-    (
-        id,
-        SetParams {
-            timeout,
-            config: StdinDeserializable(config),
-        },
-    ): (PackageId, SetParams),
-) -> Result<BTreeMap<PackageId, String>, Error> {
-    let breakages = BTreeMap::new();
-    let overrides = Default::default();
-
-    let configure_context = ConfigureContext {
-        breakages,
-        timeout: timeout.map(|t| *t),
-        config,
-        dry_run: true,
-        overrides,
-    };
-    ctx.services
-        .get(&id)
-        .await
-        .as_ref()
-        .ok_or_else(|| {
-            Error::new(
-                eyre!("There is no manager running for {id}"),
-                ErrorKind::Unknown,
-            )
-        })?
-        .configure(configure_context)
-        .await
+    ParentHandler::new().root_handler(
+        from_fn_async(set_impl)
+            .with_metadata("sync_db", Value::Bool(true))
+            .with_inherited(|set_params, id| (id, set_params))
+            .no_display()
+            .with_remote_cli::<CliContext>(),
+    )
 }
 
 #[derive(Default)]
 pub struct ConfigureContext {
-    pub breakages: BTreeMap<PackageId, String>,
     pub timeout: Option<Duration>,
     pub config: Option<Config>,
-    pub overrides: BTreeMap<PackageId, Config>,
-    pub dry_run: bool,
 }
 
 #[instrument(skip_all)]
@@ -251,15 +200,9 @@ pub async fn set_impl(
         },
     ): (PackageId, SetParams),
 ) -> Result<(), Error> {
-    let breakages = BTreeMap::new();
-    let overrides = Default::default();
-
     let configure_context = ConfigureContext {
-        breakages,
         timeout: timeout.map(|t| *t),
         config,
-        dry_run: false,
-        overrides,
     };
     ctx.services
         .get(&id)
diff --git a/core/startos/src/config/spec.rs b/core/startos/src/config/spec.rs
deleted file mode 100644
index ec2667bfb..000000000
--- a/core/startos/src/config/spec.rs
+++ /dev/null
@@ -1,2015 +0,0 @@
-use std::borrow::Cow;
-use std::collections::{BTreeMap, BTreeSet};
-use std::fmt;
-use std::fmt::Debug;
-use std::hash::{Hash, Hasher};
-use std::iter::FromIterator;
-use std::ops::RangeBounds;
-use std::sync::Arc;
-use std::time::Duration;
-
-use async_trait::async_trait;
-use imbl::Vector;
-use imbl_value::InternedString;
-use indexmap::{IndexMap, IndexSet};
-use itertools::Itertools;
-use jsonpath_lib::Compiled as CompiledJsonPath;
-use models::ProcedureName;
-use patch_db::value::{Number, Value};
-use rand::{CryptoRng, Rng};
-use regex::Regex;
-use serde::de::{MapAccess, Visitor};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use sqlx::PgPool;
-
-use super::util::{self, CharSet, NumRange, UniqueBy, STATIC_NULL};
-use super::{Config, MatchError, NoMatchWithPath, TimeoutError, TypeOf};
-use crate::config::action::ConfigRes;
-use crate::config::ConfigurationError;
-use crate::context::RpcContext;
-use crate::net::interface::InterfaceId;
-use crate::net::keys::Key;
-use crate::prelude::*;
-use crate::s9pk::manifest::{Manifest, PackageId};
-
-// Config Value Specifications
-#[async_trait]
-pub trait ValueSpec {
-    // This function defines whether the value supplied in the argument is
-    // consistent with the spec in &self
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath>;
-    // This function checks whether the value spec is consistent with itself,
-    // since not all inVariant can be checked by the type
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath>;
-    // update is to fill in values for environment pointers recursively
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError>;
-    // returns all pointers that are live in the provided config
-    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath>;
-    // requires returns whether the app id is the target of a pointer within it
-    fn requires(&self, id: &PackageId, value: &Value) -> bool;
-    // defines if 2 values of this type are equal for the purpose of uniqueness
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool;
-}
-
-// Config Value Default Generation
-//
-// This behavior is defined by two independent traits as well as a third that
-// represents a conjunction of those two traits:
-//
-// DefaultableWith - defines an associated type describing the information it
-// needs to be able to generate a default value, as well as a function for
-// extracting relevant pieces of that information and using it to actually
-// generate the default value
-//
-// HasDefaultSpec - only purpose is to summon the default spec for the type
-//
-// Defaultable - this is a redundant trait that may replace 'DefaultableWith'
-// and 'HasDefaultSpec'.
-pub trait DefaultableWith {
-    type DefaultSpec: Sync;
-    type Error: std::error::Error;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error>;
-}
-pub trait HasDefaultSpec: DefaultableWith {
-    fn default_spec(&self) -> &Self::DefaultSpec;
-}
-
-pub trait Defaultable {
-    type Error;
-
-    fn gen<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error>;
-}
-impl<T, E> Defaultable for T
-where
-    T: HasDefaultSpec + DefaultableWith<Error = E> + Sync,
-    E: std::error::Error,
-{
-    type Error = E;
-
-    fn gen<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        self.gen_with(self.default_spec(), rng, timeout)
-    }
-}
-
-// WithDefault - trivial wrapper that pairs a 'DefaultableWith' type with a
-// default spec
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct WithDefault<T: DefaultableWith> {
-    #[serde(flatten)]
-    pub inner: T,
-    pub default: T::DefaultSpec,
-}
-impl<T> DefaultableWith for WithDefault<T>
-where
-    T: DefaultableWith + Sync + Send,
-    T::DefaultSpec: Send,
-{
-    type DefaultSpec = T::DefaultSpec;
-    type Error = T::Error;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        self.inner.gen_with(spec, rng, timeout)
-    }
-}
-impl<T> HasDefaultSpec for WithDefault<T>
-where
-    T: DefaultableWith + Sync + Send,
-    T::DefaultSpec: Send,
-{
-    fn default_spec(&self) -> &Self::DefaultSpec {
-        &self.default
-    }
-}
-#[async_trait]
-impl<T> ValueSpec for WithDefault<T>
-where
-    T: ValueSpec + DefaultableWith + Send + Sync,
-    Self: Send + Sync,
-{
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        self.inner.matches(value)
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        self.inner.validate(manifest)
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        self.inner
-            .update(ctx, manifest, config_overrides, value)
-            .await
-    }
-    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        self.inner.pointers(value)
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        self.inner.requires(id, value)
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        self.inner.eq(lhs, rhs)
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct WithNullable<T> {
-    #[serde(flatten)]
-    pub inner: T,
-    pub nullable: bool,
-}
-#[async_trait]
-impl<T> ValueSpec for WithNullable<T>
-where
-    T: ValueSpec + Send + Sync,
-    Self: Send + Sync,
-{
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match (self.nullable, value) {
-            (true, &Value::Null) => Ok(()),
-            _ => self.inner.matches(value),
-        }
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        self.inner.validate(manifest)
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        self.inner
-            .update(ctx, manifest, config_overrides, value)
-            .await
-    }
-    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        self.inner.pointers(value)
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        self.inner.requires(id, value)
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        self.inner.eq(lhs, rhs)
-    }
-}
-
-impl<T> DefaultableWith for WithNullable<T>
-where
-    T: DefaultableWith + Sync + Send,
-{
-    type DefaultSpec = T::DefaultSpec;
-    type Error = T::Error;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        self.inner.gen_with(spec, rng, timeout)
-    }
-}
-
-impl<T> Defaultable for WithNullable<T>
-where
-    T: Defaultable + Sync + Send,
-{
-    type Error = T::Error;
-
-    fn gen<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        self.inner.gen(rng, timeout)
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct WithDescription<T> {
-    #[serde(flatten)]
-    pub inner: T,
-    pub description: Option<String>,
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub warning: Option<String>,
-}
-#[async_trait]
-impl<T> ValueSpec for WithDescription<T>
-where
-    T: ValueSpec + Sync + Send,
-    Self: Sync + Send,
-{
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        self.inner.matches(value)
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        self.inner.validate(manifest)
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        self.inner
-            .update(ctx, manifest, config_overrides, value)
-            .await
-    }
-    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        self.inner.pointers(value)
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        self.inner.requires(id, value)
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        self.inner.eq(lhs, rhs)
-    }
-}
-
-impl<T> DefaultableWith for WithDescription<T>
-where
-    T: DefaultableWith + Sync + Send,
-{
-    type DefaultSpec = T::DefaultSpec;
-    type Error = T::Error;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        self.inner.gen_with(spec, rng, timeout)
-    }
-}
-
-impl<T> Defaultable for WithDescription<T>
-where
-    T: Defaultable + Sync + Send,
-{
-    type Error = T::Error;
-
-    fn gen<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        self.inner.gen(rng, timeout)
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-#[serde(tag = "type")]
-pub enum ValueSpecAny {
-    Boolean(WithDescription<WithDefault<ValueSpecBoolean>>),
-    Enum(WithDescription<WithDefault<ValueSpecEnum>>),
-    List(ValueSpecList),
-    Number(WithDescription<WithDefault<WithNullable<ValueSpecNumber>>>),
-    Object(WithDescription<ValueSpecObject>),
-    String(WithDescription<WithDefault<WithNullable<ValueSpecString>>>),
-    Union(WithDescription<WithDefault<ValueSpecUnion>>),
-    Pointer(WithDescription<ValueSpecPointer>),
-}
-impl ValueSpecAny {
-    pub fn name(&self) -> &'_ str {
-        match self {
-            ValueSpecAny::Boolean(b) => b.name.as_str(),
-            ValueSpecAny::Enum(e) => e.name.as_str(),
-            ValueSpecAny::List(l) => match l {
-                ValueSpecList::Enum(e) => e.name.as_str(),
-                ValueSpecList::Number(n) => n.name.as_str(),
-                ValueSpecList::Object(o) => o.name.as_str(),
-                ValueSpecList::String(s) => s.name.as_str(),
-                ValueSpecList::Union(u) => u.name.as_str(),
-            },
-            ValueSpecAny::Number(n) => n.name.as_str(),
-            ValueSpecAny::Object(o) => o.name.as_str(),
-            ValueSpecAny::Pointer(p) => p.name.as_str(),
-            ValueSpecAny::String(s) => s.name.as_str(),
-            ValueSpecAny::Union(u) => u.name.as_str(),
-        }
-    }
-}
-#[async_trait]
-impl ValueSpec for ValueSpecAny {
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match self {
-            ValueSpecAny::Boolean(a) => a.matches(value),
-            ValueSpecAny::Enum(a) => a.matches(value),
-            ValueSpecAny::List(a) => a.matches(value),
-            ValueSpecAny::Number(a) => a.matches(value),
-            ValueSpecAny::Object(a) => a.matches(value),
-            ValueSpecAny::String(a) => a.matches(value),
-            ValueSpecAny::Union(a) => a.matches(value),
-            ValueSpecAny::Pointer(a) => a.matches(value),
-        }
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        match self {
-            ValueSpecAny::Boolean(a) => a.validate(manifest),
-            ValueSpecAny::Enum(a) => a.validate(manifest),
-            ValueSpecAny::List(a) => a.validate(manifest),
-            ValueSpecAny::Number(a) => a.validate(manifest),
-            ValueSpecAny::Object(a) => a.validate(manifest),
-            ValueSpecAny::String(a) => a.validate(manifest),
-            ValueSpecAny::Union(a) => a.validate(manifest),
-            ValueSpecAny::Pointer(a) => a.validate(manifest),
-        }
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        match self {
-            ValueSpecAny::Boolean(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Enum(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::List(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Number(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Object(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::String(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Union(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecAny::Pointer(a) => a.update(ctx, manifest, config_overrides, value).await,
-        }
-    }
-    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        match self {
-            ValueSpecAny::Boolean(a) => a.pointers(value),
-            ValueSpecAny::Enum(a) => a.pointers(value),
-            ValueSpecAny::List(a) => a.pointers(value),
-            ValueSpecAny::Number(a) => a.pointers(value),
-            ValueSpecAny::Object(a) => a.pointers(value),
-            ValueSpecAny::String(a) => a.pointers(value),
-            ValueSpecAny::Union(a) => a.pointers(value),
-            ValueSpecAny::Pointer(a) => a.pointers(value),
-        }
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        match self {
-            ValueSpecAny::Boolean(a) => a.requires(id, value),
-            ValueSpecAny::Enum(a) => a.requires(id, value),
-            ValueSpecAny::List(a) => a.requires(id, value),
-            ValueSpecAny::Number(a) => a.requires(id, value),
-            ValueSpecAny::Object(a) => a.requires(id, value),
-            ValueSpecAny::String(a) => a.requires(id, value),
-            ValueSpecAny::Union(a) => a.requires(id, value),
-            ValueSpecAny::Pointer(a) => a.requires(id, value),
-        }
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match self {
-            ValueSpecAny::Boolean(a) => a.eq(lhs, rhs),
-            ValueSpecAny::Enum(a) => a.eq(lhs, rhs),
-            ValueSpecAny::List(a) => a.eq(lhs, rhs),
-            ValueSpecAny::Number(a) => a.eq(lhs, rhs),
-            ValueSpecAny::Object(a) => a.eq(lhs, rhs),
-            ValueSpecAny::String(a) => a.eq(lhs, rhs),
-            ValueSpecAny::Union(a) => a.eq(lhs, rhs),
-            ValueSpecAny::Pointer(a) => a.eq(lhs, rhs),
-        }
-    }
-}
-impl Defaultable for ValueSpecAny {
-    type Error = ConfigurationError;
-
-    fn gen<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        match self {
-            ValueSpecAny::Boolean(a) => a.gen(rng, timeout).map_err(crate::util::Never::absurd),
-            ValueSpecAny::Enum(a) => a.gen(rng, timeout).map_err(crate::util::Never::absurd),
-            ValueSpecAny::List(a) => a.gen(rng, timeout),
-            ValueSpecAny::Number(a) => a.gen(rng, timeout).map_err(crate::util::Never::absurd),
-            ValueSpecAny::Object(a) => a.gen(rng, timeout),
-            ValueSpecAny::String(a) => a.gen(rng, timeout).map_err(ConfigurationError::from),
-            ValueSpecAny::Union(a) => a.gen(rng, timeout),
-            ValueSpecAny::Pointer(a) => a.gen(rng, timeout),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ValueSpecBoolean {}
-#[async_trait]
-impl ValueSpec for ValueSpecBoolean {
-    fn matches(&self, val: &Value) -> Result<(), NoMatchWithPath> {
-        match val {
-            Value::Bool(_) => Ok(()),
-            Value::Null => Err(NoMatchWithPath::new(MatchError::NotNullable)),
-            a => Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "boolean",
-                a.type_of(),
-            ))),
-        }
-    }
-    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        Ok(())
-    }
-    async fn update(
-        &self,
-        _ctx: &RpcContext,
-        _manifest: &Manifest,
-        _config_overrides: &BTreeMap<PackageId, Config>,
-        _value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        Ok(())
-    }
-    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        Ok(BTreeSet::new())
-    }
-    fn requires(&self, _id: &PackageId, _value: &Value) -> bool {
-        false
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match (lhs, rhs) {
-            (Value::Bool(lhs), Value::Bool(rhs)) => lhs == rhs,
-            _ => false,
-        }
-    }
-}
-impl DefaultableWith for ValueSpecBoolean {
-    type DefaultSpec = bool;
-    type Error = crate::util::Never;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        _rng: &mut R,
-        _timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        Ok(Value::Bool(*spec))
-    }
-}
-
-#[derive(Clone, Debug, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct ValueSpecEnum {
-    pub values: IndexSet<String>,
-    pub value_names: BTreeMap<String, String>,
-}
-impl<'de> serde::de::Deserialize<'de> for ValueSpecEnum {
-    fn deserialize<D: serde::de::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        #[derive(Deserialize)]
-        #[serde(rename_all = "kebab-case")]
-        pub struct _ValueSpecEnum {
-            pub values: IndexSet<String>,
-            #[serde(default)]
-            pub value_names: BTreeMap<String, String>,
-        }
-
-        let mut r#enum = _ValueSpecEnum::deserialize(deserializer)?;
-        for name in &r#enum.values {
-            if !r#enum.value_names.contains_key(name) {
-                r#enum.value_names.insert(name.clone(), name.clone());
-            }
-        }
-        Ok(ValueSpecEnum {
-            values: r#enum.values,
-            value_names: r#enum.value_names,
-        })
-    }
-}
-#[async_trait]
-impl ValueSpec for ValueSpecEnum {
-    fn matches(&self, val: &Value) -> Result<(), NoMatchWithPath> {
-        match val {
-            Value::String(b) => {
-                if self.values.contains(&**b) {
-                    Ok(())
-                } else {
-                    Err(NoMatchWithPath::new(MatchError::Enum(
-                        b.clone(),
-                        self.values.clone(),
-                    )))
-                }
-            }
-            Value::Null => Err(NoMatchWithPath::new(MatchError::NotNullable)),
-            a => Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "string",
-                a.type_of(),
-            ))),
-        }
-    }
-    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        Ok(())
-    }
-    async fn update(
-        &self,
-        _ctx: &RpcContext,
-        _manifest: &Manifest,
-        _config_overrides: &BTreeMap<PackageId, Config>,
-        _value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        Ok(())
-    }
-    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        Ok(BTreeSet::new())
-    }
-    fn requires(&self, _id: &PackageId, _value: &Value) -> bool {
-        false
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match (lhs, rhs) {
-            (Value::String(lhs), Value::String(rhs)) => lhs == rhs,
-            _ => false,
-        }
-    }
-}
-impl DefaultableWith for ValueSpecEnum {
-    type DefaultSpec = Arc<String>;
-    type Error = crate::util::Never;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        _rng: &mut R,
-        _timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        Ok(Value::String(spec.clone()))
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ListSpec<T> {
-    pub spec: T,
-    pub range: NumRange<usize>,
-}
-#[async_trait]
-impl<T> ValueSpec for ListSpec<T>
-where
-    T: ValueSpec + Sync + Send,
-    Self: Sync + Send,
-{
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match value {
-            Value::Array(l) => {
-                if !self.range.contains(&l.len()) {
-                    Err(NoMatchWithPath {
-                        path: Vec::new(),
-                        error: MatchError::LengthMismatch(self.range.clone(), l.len()),
-                    })
-                } else {
-                    l.iter()
-                        .enumerate()
-                        .map(|(i, v)| {
-                            self.spec
-                                .matches(v)
-                                .map_err(|e| e.prepend(InternedString::from_display(&i)))?;
-                            if l.iter()
-                                .enumerate()
-                                .any(|(i2, v2)| i != i2 && self.spec.eq(v, v2))
-                            {
-                                Err(NoMatchWithPath::new(MatchError::ListUniquenessViolation)
-                                    .prepend(InternedString::from_display(&i)))
-                            } else {
-                                Ok(())
-                            }
-                        })
-                        .collect()
-                }
-            }
-            Value::Null => Err(NoMatchWithPath::new(MatchError::NotNullable)),
-            a => Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "list",
-                a.type_of(),
-            ))),
-        }
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        self.spec.validate(manifest)
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        if let Value::Array(ref mut ls) = value {
-            for (i, val) in ls.iter_mut().enumerate() {
-                match self.spec.update(ctx, manifest, config_overrides, val).await {
-                    Err(ConfigurationError::NoMatch(e)) => Err(ConfigurationError::NoMatch(
-                        e.prepend(InternedString::from_display(&i)),
-                    )),
-                    a => a,
-                }?;
-            }
-            Ok(())
-        } else {
-            Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
-                MatchError::InvalidType("list", value.type_of()),
-            )))
-        }
-    }
-    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        Ok(BTreeSet::new())
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        if let Value::Array(ref ls) = value {
-            ls.into_iter().any(|v| self.spec.requires(id, v))
-        } else {
-            false
-        }
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match (lhs, rhs) {
-            (Value::Array(lhs), Value::Array(rhs)) => {
-                lhs.iter().zip_longest(rhs.iter()).all(|zip| match zip {
-                    itertools::EitherOrBoth::Both(lhs, rhs) => lhs == rhs,
-                    _ => false,
-                })
-            }
-            _ => false,
-        }
-    }
-}
-
-impl<T> DefaultableWith for ListSpec<T>
-where
-    T: DefaultableWith + Sync + Send,
-{
-    type DefaultSpec = Vec<T::DefaultSpec>;
-    type Error = T::Error;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        let mut res = Vector::new();
-        for spec_member in spec.iter() {
-            res.push_back(self.spec.gen_with(spec_member, rng, timeout)?);
-        }
-        Ok(Value::Array(res))
-    }
-}
-
-unsafe impl Sync for ValueSpecObject {} // TODO: remove
-unsafe impl Send for ValueSpecObject {} // TODO: remove
-unsafe impl Sync for ValueSpecUnion {} // TODO: remove
-unsafe impl Send for ValueSpecUnion {} // TODO: remove
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-#[serde(tag = "subtype")]
-pub enum ValueSpecList {
-    Enum(WithDescription<WithDefault<ListSpec<ValueSpecEnum>>>),
-    Number(WithDescription<WithDefault<ListSpec<ValueSpecNumber>>>),
-    Object(WithDescription<WithDefault<ListSpec<ValueSpecObject>>>),
-    String(WithDescription<WithDefault<ListSpec<ValueSpecString>>>),
-    Union(WithDescription<WithDefault<ListSpec<WithDefault<ValueSpecUnion>>>>),
-}
-#[async_trait]
-impl ValueSpec for ValueSpecList {
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match self {
-            ValueSpecList::Enum(a) => a.matches(value),
-            ValueSpecList::Number(a) => a.matches(value),
-            ValueSpecList::Object(a) => a.matches(value),
-            ValueSpecList::String(a) => a.matches(value),
-            ValueSpecList::Union(a) => a.matches(value),
-        }
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        match self {
-            ValueSpecList::Enum(a) => a.validate(manifest),
-            ValueSpecList::Number(a) => a.validate(manifest),
-            ValueSpecList::Object(a) => a.validate(manifest),
-            ValueSpecList::String(a) => a.validate(manifest),
-            ValueSpecList::Union(a) => a.validate(manifest),
-        }
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        match self {
-            ValueSpecList::Enum(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecList::Number(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecList::Object(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecList::String(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecList::Union(a) => a.update(ctx, manifest, config_overrides, value).await,
-        }
-    }
-    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        match self {
-            ValueSpecList::Enum(a) => a.pointers(value),
-            ValueSpecList::Number(a) => a.pointers(value),
-            ValueSpecList::Object(a) => a.pointers(value),
-            ValueSpecList::String(a) => a.pointers(value),
-            ValueSpecList::Union(a) => a.pointers(value),
-        }
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        match self {
-            ValueSpecList::Enum(a) => a.requires(id, value),
-            ValueSpecList::Number(a) => a.requires(id, value),
-            ValueSpecList::Object(a) => a.requires(id, value),
-            ValueSpecList::String(a) => a.requires(id, value),
-            ValueSpecList::Union(a) => a.requires(id, value),
-        }
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match self {
-            ValueSpecList::Enum(a) => a.eq(lhs, rhs),
-            ValueSpecList::Number(a) => a.eq(lhs, rhs),
-            ValueSpecList::Object(a) => a.eq(lhs, rhs),
-            ValueSpecList::String(a) => a.eq(lhs, rhs),
-            ValueSpecList::Union(a) => a.eq(lhs, rhs),
-        }
-    }
-}
-
-impl Defaultable for ValueSpecList {
-    type Error = ConfigurationError;
-
-    fn gen<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        match self {
-            ValueSpecList::Enum(a) => a.gen(rng, timeout).map_err(crate::util::Never::absurd),
-            ValueSpecList::Number(a) => a.gen(rng, timeout).map_err(crate::util::Never::absurd),
-            ValueSpecList::Object(a) => {
-                let mut ret = match a.gen(rng, timeout).unwrap() {
-                    Value::Array(l) => l,
-                    a => {
-                        return Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
-                            MatchError::InvalidType("list", a.type_of()),
-                        )))
-                    }
-                };
-                while !(
-                    a.inner.inner.range.start_bound(),
-                    std::ops::Bound::Unbounded,
-                )
-                    .contains(&ret.len())
-                {
-                    ret.push_back(
-                        a.inner
-                            .inner
-                            .spec
-                            .gen(rng, timeout)
-                            .map_err(ConfigurationError::from)?,
-                    );
-                }
-                Ok(Value::Array(ret))
-            }
-            ValueSpecList::String(a) => a.gen(rng, timeout).map_err(ConfigurationError::from),
-            ValueSpecList::Union(a) => a.gen(rng, timeout).map_err(ConfigurationError::from),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ValueSpecNumber {
-    range: Option<NumRange<f64>>,
-    #[serde(default)]
-    integral: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    units: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[serde(default)]
-    pub placeholder: Option<Number>,
-}
-#[async_trait]
-impl ValueSpec for ValueSpecNumber {
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match value {
-            Value::Number(n) => {
-                let n = n.as_f64().unwrap();
-                if self.integral && n.floor() != n {
-                    return Err(NoMatchWithPath::new(MatchError::NonIntegral(n)));
-                }
-                if let Some(range) = &self.range {
-                    if !range.contains(&n) {
-                        return Err(NoMatchWithPath::new(MatchError::OutOfRange(
-                            range.clone(),
-                            n,
-                        )));
-                    }
-                }
-                Ok(())
-            }
-            Value::Null => Err(NoMatchWithPath::new(MatchError::NotNullable)),
-            a => Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "object",
-                a.type_of(),
-            ))),
-        }
-    }
-    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        Ok(())
-    }
-    async fn update(
-        &self,
-        _ctx: &RpcContext,
-        _manifest: &Manifest,
-        _config_overrides: &BTreeMap<PackageId, Config>,
-        _value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        Ok(())
-    }
-    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        Ok(BTreeSet::new())
-    }
-    fn requires(&self, _id: &PackageId, _value: &Value) -> bool {
-        false
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match (lhs, rhs) {
-            (Value::Number(lhs), Value::Number(rhs)) => lhs == rhs,
-            _ => false,
-        }
-    }
-}
-impl DefaultableWith for ValueSpecNumber {
-    type DefaultSpec = Option<Number>;
-    type Error = crate::util::Never;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        _rng: &mut R,
-        _timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        Ok(spec
-            .clone()
-            .map(|s| Value::Number(s))
-            .unwrap_or(Value::Null))
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct ValueSpecObject {
-    pub spec: ConfigSpec,
-    pub display_as: Option<String>,
-    #[serde(default)]
-    pub unique_by: UniqueBy,
-}
-#[async_trait]
-impl ValueSpec for ValueSpecObject {
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match value {
-            Value::Object(o) => self.spec.matches(o),
-            Value::Null => Err(NoMatchWithPath::new(MatchError::NotNullable)),
-            a => Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "object",
-                a.type_of(),
-            ))),
-        }
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        self.spec.validate(manifest)
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        if let Value::Object(o) = value {
-            self.spec.update(ctx, manifest, config_overrides, o).await
-        } else {
-            Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
-                MatchError::InvalidType("object", value.type_of()),
-            )))
-        }
-    }
-    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        if let Value::Object(o) = value {
-            self.spec.pointers(o)
-        } else {
-            Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "object",
-                value.type_of(),
-            )))
-        }
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        if let Value::Object(o) = value {
-            self.spec.requires(id, o)
-        } else {
-            false
-        }
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match (lhs, rhs) {
-            (Value::Object(lhs), Value::Object(rhs)) => self.unique_by.eq(lhs, rhs),
-            _ => false,
-        }
-    }
-}
-impl DefaultableWith for ValueSpecObject {
-    type DefaultSpec = Config;
-    type Error = crate::util::Never;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        _rng: &mut R,
-        _timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        Ok(Value::Object(spec.clone()))
-    }
-}
-impl Defaultable for ValueSpecObject {
-    type Error = ConfigurationError;
-
-    fn gen<R: Rng + CryptoRng + Sync + Send>(
-        &self,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        self.spec.gen(rng, timeout).map(Value::Object)
-    }
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-pub struct ConfigSpec(pub IndexMap<InternedString, ValueSpecAny>);
-impl ConfigSpec {
-    pub fn matches(&self, value: &Config) -> Result<(), NoMatchWithPath> {
-        for (key, val) in self.0.iter() {
-            if let Some(v) = value.get(&**key) {
-                val.matches(v).map_err(|e| e.prepend(key.clone()))?;
-            } else {
-                val.matches(&Value::Null)
-                    .map_err(|e| e.prepend(key.clone()))?;
-            }
-        }
-        Ok(())
-    }
-
-    pub fn gen<R: Rng + CryptoRng + Sync + Send>(
-        &self,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Config, ConfigurationError> {
-        let mut res = Config::new();
-        for (key, val) in self.0.iter() {
-            res.insert(key.clone(), val.gen(rng, timeout)?);
-        }
-        Ok(res)
-    }
-
-    pub fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        for (name, val) in &self.0 {
-            val.validate(manifest)
-                .map_err(|e| e.prepend(name.clone()))?;
-        }
-        Ok(())
-    }
-
-    pub async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        cfg: &mut Config,
-    ) -> Result<(), ConfigurationError> {
-        for (k, vs) in self.0.iter() {
-            match cfg.get_mut(k) {
-                None => {
-                    let mut v = Value::Null;
-                    vs.update(ctx, manifest, config_overrides, &mut v).await?;
-                    cfg.insert(k.clone(), v);
-                }
-                Some(v) => match vs.update(ctx, manifest, config_overrides, v).await {
-                    Err(ConfigurationError::NoMatch(e)) => {
-                        Err(ConfigurationError::NoMatch(e.prepend(k.clone())))
-                    }
-                    a => a,
-                }?,
-            };
-        }
-        Ok(())
-    }
-
-    pub fn pointers(&self, cfg: &Config) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        cfg.iter()
-            .filter_map(|(k, v)| self.0.get(k).map(|vs| (k, vs.pointers(v))))
-            .fold(Ok(BTreeSet::<ValueSpecPointer>::new()), |acc, v| {
-                match (acc, v) {
-                    // propagate existing errors
-                    (Err(e), _) => Err(e),
-                    // create new error case
-                    (Ok(_), (k, Err(e))) => Err(e.prepend(k.clone())),
-                    // combine sets
-                    (Ok(s0), (_, Ok(s1))) => Ok(BTreeSet::from_iter(s0.union(&s1).cloned())),
-                }
-            })
-    }
-
-    pub fn requires(&self, id: &PackageId, cfg: &Config) -> bool {
-        self.0
-            .iter()
-            .any(|(k, v)| v.requires(id, cfg.get(k).unwrap_or(&STATIC_NULL)))
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct Pattern {
-    #[serde(with = "util::serde_regex")]
-    pub pattern: Regex,
-    pub pattern_description: String,
-}
-
-#[derive(Clone, Debug, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct ValueSpecString {
-    #[serde(flatten)]
-    pub pattern: Option<Pattern>,
-    pub textarea: bool,
-    pub copyable: bool,
-    pub masked: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub placeholder: Option<String>,
-}
-impl<'de> Deserialize<'de> for ValueSpecString {
-    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<ValueSpecString, D::Error> {
-        struct ValueSpecStringVisitor;
-        impl<'de> Visitor<'de> for ValueSpecStringVisitor {
-            type Value = ValueSpecString;
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                formatter.write_str("struct ValueSpecString")
-            }
-            fn visit_map<V: MapAccess<'de>>(self, mut map: V) -> Result<ValueSpecString, V::Error> {
-                let mut pattern = None;
-                let mut pattern_description = None;
-                let mut textarea = false;
-                let mut copyable = false;
-                let mut masked = false;
-                let mut placeholder = None;
-                while let Some::<String>(key) = map.next_key()? {
-                    if &key == "pattern" {
-                        if pattern.is_some() {
-                            return Err(serde::de::Error::duplicate_field("pattern"));
-                        } else {
-                            pattern = Some(
-                                Regex::new(&map.next_value::<String>()?)
-                                    .map_err(serde::de::Error::custom)?,
-                            );
-                        }
-                    } else if &key == "pattern-description" {
-                        if pattern_description.is_some() {
-                            return Err(serde::de::Error::duplicate_field("pattern-description"));
-                        } else {
-                            pattern_description = Some(map.next_value()?);
-                        }
-                    } else if &key == "textarea" {
-                        textarea = map.next_value()?;
-                    } else if &key == "copyable" {
-                        copyable = map.next_value()?;
-                    } else if &key == "masked" {
-                        masked = map.next_value()?;
-                    } else if &key == "placeholder" {
-                        if placeholder.is_some() {
-                            return Err(serde::de::Error::duplicate_field("placeholder"));
-                        } else {
-                            placeholder = Some(map.next_value()?);
-                        }
-                    }
-                }
-                let regex = match (pattern, pattern_description) {
-                    (None, None) => None,
-                    (Some(p), Some(d)) => Some(Pattern {
-                        pattern: p,
-                        pattern_description: d,
-                    }),
-                    (Some(_), None) => {
-                        return Err(serde::de::Error::missing_field("pattern-description"));
-                    }
-                    (None, Some(_)) => {
-                        return Err(serde::de::Error::missing_field("pattern"));
-                    }
-                };
-                Ok(ValueSpecString {
-                    pattern: regex,
-                    textarea,
-                    copyable,
-                    masked,
-                    placeholder,
-                })
-            }
-        }
-        const FIELDS: &[&str] = &[
-            "pattern",
-            "pattern-description",
-            "textarea",
-            "copyable",
-            "masked",
-            "placeholder",
-        ];
-        deserializer.deserialize_struct("ValueSpecString", FIELDS, ValueSpecStringVisitor)
-    }
-}
-#[async_trait]
-impl ValueSpec for ValueSpecString {
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match value {
-            Value::String(s) => {
-                if let Some(pattern) = &self.pattern {
-                    if pattern.pattern.is_match(s) {
-                        Ok(())
-                    } else {
-                        Err(NoMatchWithPath::new(MatchError::Pattern(
-                            s.clone(),
-                            pattern.pattern.clone(),
-                        )))
-                    }
-                } else {
-                    Ok(())
-                }
-            }
-            Value::Null => Err(NoMatchWithPath::new(MatchError::NotNullable)),
-            a => Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "string",
-                a.type_of(),
-            ))),
-        }
-    }
-    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        Ok(())
-    }
-    async fn update(
-        &self,
-        _ctx: &RpcContext,
-        _manifest: &Manifest,
-        _config_overrides: &BTreeMap<PackageId, Config>,
-        _value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        Ok(())
-    }
-    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        Ok(BTreeSet::new())
-    }
-    fn requires(&self, _id: &PackageId, _value: &Value) -> bool {
-        false
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match (lhs, rhs) {
-            (Value::String(lhs), Value::String(rhs)) => lhs == rhs,
-            _ => false,
-        }
-    }
-}
-impl DefaultableWith for ValueSpecString {
-    type DefaultSpec = Option<DefaultString>;
-    type Error = TimeoutError;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, TimeoutError> {
-        if let Some(spec) = spec {
-            let now = timeout.as_ref().map(|_| std::time::Instant::now());
-            loop {
-                let candidate = spec.gen(rng);
-                match (spec, &self.pattern) {
-                    (DefaultString::Entropy(_), Some(pattern))
-                        if !pattern.pattern.is_match(&candidate) => {}
-                    _ => {
-                        return Ok(Value::String(candidate));
-                    }
-                }
-                if let (Some(now), Some(timeout)) = (now, timeout) {
-                    if &now.elapsed() > timeout {
-                        return Err(TimeoutError);
-                    }
-                } else {
-                    return Ok(Value::String(candidate));
-                }
-            }
-        } else {
-            Ok(Value::Null)
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum DefaultString {
-    Literal(String),
-    Entropy(Entropy),
-}
-impl DefaultString {
-    pub fn gen<R: Rng + CryptoRng + Sync + Send>(&self, rng: &mut R) -> Arc<String> {
-        Arc::new(match self {
-            DefaultString::Literal(s) => s.clone(),
-            DefaultString::Entropy(e) => e.gen(rng),
-        })
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Entropy {
-    pub charset: Option<CharSet>,
-    pub len: usize,
-}
-impl Entropy {
-    pub fn gen<R: Rng + CryptoRng + Sync + Send>(&self, rng: &mut R) -> String {
-        let len = self.len;
-        let set = self
-            .charset
-            .as_ref()
-            .map(|cs| Cow::Borrowed(cs))
-            .unwrap_or_else(|| Cow::Owned(Default::default()));
-        std::iter::repeat_with(|| set.gen(rng)).take(len).collect()
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct UnionTag {
-    pub id: InternedString,
-    pub name: String,
-    pub description: Option<String>,
-    pub variant_names: BTreeMap<String, String>,
-}
-
-#[derive(Clone, Debug, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct ValueSpecUnion {
-    pub tag: UnionTag,
-    pub variants: BTreeMap<String, ConfigSpec>,
-    pub display_as: Option<String>,
-    pub unique_by: UniqueBy,
-}
-
-impl<'de> serde::de::Deserialize<'de> for ValueSpecUnion {
-    fn deserialize<D: serde::de::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        #[derive(Deserialize)]
-        #[serde(rename_all = "kebab-case")]
-        #[serde(untagged)]
-        pub enum _UnionTag {
-            Old(InternedString),
-            New(UnionTag),
-        }
-        #[derive(Deserialize)]
-        #[serde(rename_all = "kebab-case")]
-        pub struct _ValueSpecUnion {
-            pub variants: BTreeMap<String, ConfigSpec>,
-            pub tag: _UnionTag,
-            pub display_as: Option<String>,
-            #[serde(default)]
-            pub unique_by: UniqueBy,
-        }
-
-        let u = _ValueSpecUnion::deserialize(deserializer)?;
-        Ok(ValueSpecUnion {
-            tag: match u.tag {
-                _UnionTag::Old(id) => UnionTag {
-                    id: id.clone(),
-                    name: id.to_string(),
-                    description: None,
-                    variant_names: u
-                        .variants
-                        .keys()
-                        .map(|k| (k.to_owned(), k.to_owned()))
-                        .collect(),
-                },
-                _UnionTag::New(UnionTag {
-                    id,
-                    name,
-                    description,
-                    mut variant_names,
-                }) => UnionTag {
-                    id,
-                    name,
-                    description,
-                    variant_names: {
-                        let mut iter = u.variants.keys();
-                        while variant_names.len() < u.variants.len() {
-                            if let Some(variant) = iter.next() {
-                                variant_names.insert(variant.to_owned(), variant.to_owned());
-                            } else {
-                                break;
-                            }
-                        }
-                        variant_names
-                    },
-                },
-            },
-            variants: u.variants,
-            display_as: u.display_as,
-            unique_by: u.unique_by,
-        })
-    }
-}
-
-#[async_trait]
-impl ValueSpec for ValueSpecUnion {
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match value {
-            Value::Object(o) => {
-                if let Some(Value::String(ref tag)) = o.get(&*self.tag.id) {
-                    if let Some(obj_spec) = self.variants.get(&**tag) {
-                        let mut without_tag = o.clone();
-                        without_tag.remove(&*self.tag.id);
-                        obj_spec.matches(&without_tag)
-                    } else {
-                        Err(NoMatchWithPath::new(MatchError::Union(
-                            tag.clone(),
-                            self.variants.keys().cloned().collect(),
-                        )))
-                    }
-                } else {
-                    Err(NoMatchWithPath::new(MatchError::MissingTag(
-                        self.tag.id.clone(),
-                    )))
-                }
-            }
-            Value::Null => Err(NoMatchWithPath::new(MatchError::NotNullable)),
-            a => Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "object",
-                a.type_of(),
-            ))),
-        }
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        for (name, variant) in &self.variants {
-            if variant.0.get(&*self.tag.id).is_some() {
-                return Err(NoMatchWithPath::new(MatchError::PropertyMatchesUnionTag(
-                    self.tag.id.clone(),
-                    name.clone(),
-                )));
-            }
-            variant.validate(manifest)?;
-        }
-        Ok(())
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        if let Value::Object(o) = value {
-            match o.get(&*self.tag.id) {
-                None => Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
-                    MatchError::MissingTag(self.tag.id.clone()),
-                ))),
-                Some(Value::String(tag)) => match self.variants.get(&**tag) {
-                    None => Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
-                        MatchError::Union(tag.clone(), self.variants.keys().cloned().collect()),
-                    ))),
-                    Some(spec) => spec.update(ctx, manifest, config_overrides, o).await,
-                },
-                Some(other) => Err(ConfigurationError::NoMatch(
-                    NoMatchWithPath::new(MatchError::InvalidType("string", other.type_of()))
-                        .prepend(self.tag.id.clone()),
-                )),
-            }
-        } else {
-            Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
-                MatchError::InvalidType("object", value.type_of()),
-            )))
-        }
-    }
-    fn pointers(&self, value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        if let Value::Object(o) = value {
-            match o.get(&*self.tag.id) {
-                None => Err(NoMatchWithPath::new(MatchError::MissingTag(
-                    self.tag.id.clone(),
-                ))),
-                Some(Value::String(tag)) => match self.variants.get(&**tag) {
-                    None => Err(NoMatchWithPath::new(MatchError::Union(
-                        tag.clone(),
-                        self.variants.keys().cloned().collect(),
-                    ))),
-                    Some(spec) => spec.pointers(o),
-                },
-                Some(other) => Err(NoMatchWithPath::new(MatchError::InvalidType(
-                    "string",
-                    other.type_of(),
-                ))
-                .prepend(self.tag.id.clone())),
-            }
-        } else {
-            Err(NoMatchWithPath::new(MatchError::InvalidType(
-                "object",
-                value.type_of(),
-            )))
-        }
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        if let Value::Object(o) = value {
-            match o.get(&*self.tag.id) {
-                Some(Value::String(tag)) => match self.variants.get(&**tag) {
-                    None => false,
-                    Some(spec) => spec.requires(id, o),
-                },
-                _ => false,
-            }
-        } else {
-            false
-        }
-    }
-    fn eq(&self, lhs: &Value, rhs: &Value) -> bool {
-        match (lhs, rhs) {
-            (Value::Object(lhs), Value::Object(rhs)) => self.unique_by.eq(lhs, rhs),
-            _ => false,
-        }
-    }
-}
-impl DefaultableWith for ValueSpecUnion {
-    type DefaultSpec = Arc<String>;
-    type Error = ConfigurationError;
-
-    fn gen_with<R: Rng + CryptoRng + Sync + Send>(
-        &self,
-        spec: &Self::DefaultSpec,
-        rng: &mut R,
-        timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        let variant = if let Some(v) = self.variants.get(&**spec) {
-            v
-        } else {
-            return Err(ConfigurationError::NoMatch(NoMatchWithPath::new(
-                MatchError::Union(spec.clone(), self.variants.keys().cloned().collect()),
-            )));
-        };
-        let cfg_res = variant.gen(rng, timeout)?;
-
-        let mut tagged_cfg = Config::new();
-        tagged_cfg.insert(self.tag.id.clone(), Value::String(spec.clone()));
-        tagged_cfg.extend(cfg_res.into_iter());
-
-        Ok(Value::Object(tagged_cfg))
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(tag = "subtype")]
-#[serde(rename_all = "kebab-case")]
-pub enum ValueSpecPointer {
-    Package(PackagePointerSpec),
-    System(SystemPointerSpec),
-}
-impl fmt::Display for ValueSpecPointer {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            ValueSpecPointer::Package(p) => write!(f, "{}", p),
-            ValueSpecPointer::System(p) => write!(f, "{}", p),
-        }
-    }
-}
-impl Defaultable for ValueSpecPointer {
-    type Error = ConfigurationError;
-    fn gen<R: Rng + CryptoRng + Sync + Send>(
-        &self,
-        _rng: &mut R,
-        _timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        Ok(Value::Null)
-    }
-}
-#[async_trait]
-impl ValueSpec for ValueSpecPointer {
-    fn matches(&self, value: &Value) -> Result<(), NoMatchWithPath> {
-        match self {
-            ValueSpecPointer::Package(a) => a.matches(value),
-            ValueSpecPointer::System(a) => a.matches(value),
-        }
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        match self {
-            ValueSpecPointer::Package(a) => a.validate(manifest),
-            ValueSpecPointer::System(a) => a.validate(manifest),
-        }
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        match self {
-            ValueSpecPointer::Package(a) => a.update(ctx, manifest, config_overrides, value).await,
-            ValueSpecPointer::System(a) => a.update(ctx, manifest, config_overrides, value).await,
-        }
-    }
-    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        let mut pointers = BTreeSet::new();
-        pointers.insert(self.clone());
-        Ok(pointers)
-    }
-    fn requires(&self, id: &PackageId, value: &Value) -> bool {
-        match self {
-            ValueSpecPointer::Package(a) => a.requires(id, value),
-            ValueSpecPointer::System(a) => a.requires(id, value),
-        }
-    }
-    fn eq(&self, _lhs: &Value, _rhs: &Value) -> bool {
-        false
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(tag = "target")]
-#[serde(rename_all = "kebab-case")]
-pub enum PackagePointerSpec {
-    TorKey(TorKeyPointer),
-    TorAddress(TorAddressPointer),
-    LanAddress(LanAddressPointer),
-    Config(ConfigPointer),
-}
-impl PackagePointerSpec {
-    pub fn package_id(&self) -> &PackageId {
-        match self {
-            PackagePointerSpec::TorKey(TorKeyPointer { package_id, .. }) => package_id,
-            PackagePointerSpec::TorAddress(TorAddressPointer { package_id, .. }) => package_id,
-            PackagePointerSpec::LanAddress(LanAddressPointer { package_id, .. }) => package_id,
-            PackagePointerSpec::Config(ConfigPointer { package_id, .. }) => package_id,
-        }
-    }
-    async fn deref(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-    ) -> Result<Value, ConfigurationError> {
-        match &self {
-            PackagePointerSpec::TorKey(key) => key.deref(&manifest.id, &ctx.secret_store).await,
-            PackagePointerSpec::TorAddress(tor) => tor.deref(ctx).await,
-            PackagePointerSpec::LanAddress(lan) => lan.deref(ctx).await,
-            PackagePointerSpec::Config(cfg) => cfg.deref(ctx, config_overrides).await,
-        }
-    }
-}
-impl fmt::Display for PackagePointerSpec {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            PackagePointerSpec::TorKey(key) => write!(f, "{}", key),
-            PackagePointerSpec::TorAddress(tor) => write!(f, "{}", tor),
-            PackagePointerSpec::LanAddress(lan) => write!(f, "{}", lan),
-            PackagePointerSpec::Config(cfg) => write!(f, "{}", cfg),
-        }
-    }
-}
-impl Defaultable for PackagePointerSpec {
-    type Error = ConfigurationError;
-    fn gen<R: Rng + CryptoRng + Sync + Send>(
-        &self,
-        _rng: &mut R,
-        _timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        Ok(Value::Null)
-    }
-}
-#[async_trait]
-impl ValueSpec for PackagePointerSpec {
-    fn matches(&self, _value: &Value) -> Result<(), NoMatchWithPath> {
-        Ok(())
-    }
-    fn validate(&self, manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        if &manifest.id != self.package_id()
-            && !manifest.dependencies.0.contains_key(self.package_id())
-        {
-            return Err(NoMatchWithPath::new(MatchError::InvalidPointer(
-                ValueSpecPointer::Package(self.clone()),
-            )));
-        }
-        match self {
-            _ => Ok(()),
-        }
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        manifest: &Manifest,
-        config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        *value = self.deref(ctx, manifest, config_overrides).await?;
-        Ok(())
-    }
-    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        let mut pointers = BTreeSet::new();
-        pointers.insert(ValueSpecPointer::Package(self.clone()));
-        Ok(pointers)
-    }
-    fn requires(&self, id: &PackageId, _value: &Value) -> bool {
-        self.package_id() == id
-    }
-    fn eq(&self, _lhs: &Value, _rhs: &Value) -> bool {
-        false
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct TorAddressPointer {
-    pub package_id: PackageId,
-    interface: InterfaceId,
-}
-impl TorAddressPointer {
-    async fn deref(&self, ctx: &RpcContext) -> Result<Value, ConfigurationError> {
-        let addr = ctx
-            .db
-            .peek()
-            .await
-            .as_package_data()
-            .as_idx(&self.package_id)
-            .and_then(|pde| pde.as_installed())
-            .and_then(|i| i.as_interface_addresses().as_idx(&self.interface))
-            .and_then(|a| a.as_tor_address().de().transpose())
-            .transpose()
-            .map_err(|e| ConfigurationError::SystemError(e))?;
-        Ok(addr.map(Arc::new).map(Value::String).unwrap_or(Value::Null))
-    }
-}
-impl fmt::Display for TorAddressPointer {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            TorAddressPointer {
-                package_id,
-                interface,
-            } => write!(f, "{}: tor-address: {}", package_id, interface),
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct LanAddressPointer {
-    pub package_id: PackageId,
-    interface: InterfaceId,
-}
-impl fmt::Display for LanAddressPointer {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let LanAddressPointer {
-            package_id,
-            interface,
-        } = self;
-        write!(f, "{}: lan-address: {}", package_id, interface)
-    }
-}
-impl LanAddressPointer {
-    async fn deref(&self, ctx: &RpcContext) -> Result<Value, ConfigurationError> {
-        let addr = ctx
-            .db
-            .peek()
-            .await
-            .as_package_data()
-            .as_idx(&self.package_id)
-            .and_then(|pde| pde.as_installed())
-            .and_then(|i| i.as_interface_addresses().as_idx(&self.interface))
-            .and_then(|a| a.as_lan_address().de().transpose())
-            .transpose()
-            .map_err(|e| ConfigurationError::SystemError(e))?;
-        Ok(addr
-            .to_owned()
-            .map(Arc::new)
-            .map(Value::String)
-            .unwrap_or(Value::Null))
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct ConfigPointer {
-    package_id: PackageId,
-    selector: Arc<ConfigSelector>,
-    multi: bool,
-}
-impl ConfigPointer {
-    pub fn select(&self, val: &Value) -> Value {
-        self.selector.select(self.multi, val)
-    }
-    async fn deref(
-        &self,
-        ctx: &RpcContext,
-        config_overrides: &BTreeMap<PackageId, Config>,
-    ) -> Result<Value, ConfigurationError> {
-        if let Some(cfg) = config_overrides.get(&self.package_id) {
-            Ok(self.select(&Value::Object(cfg.clone())))
-        } else {
-            let id = &self.package_id;
-            let version = ctx
-                .db
-                .peek()
-                .await
-                .as_package_data()
-                .as_idx(id)
-                .and_then(|pde| pde.as_installed())
-                .map(|i| i.as_manifest().as_version().de())
-                .transpose()
-                .map_err(ConfigurationError::SystemError)?;
-            if let Some(version) = version {
-                let cfg_res = ctx
-                    .services
-                    .get(&id)
-                    .await
-                    .as_ref()
-                    .or_not_found(lazy_format!("Manager for {id}@{version}"))
-                    .map_err(|e| ConfigurationError::SystemError(e))?
-                    .get_config()
-                    .await
-                    .map_err(ConfigurationError::SystemError)?;
-                if let Some(cfg) = cfg_res.config {
-                    Ok(self.select(&Value::Object(cfg)))
-                } else {
-                    Ok(Value::Null)
-                }
-            } else {
-                Ok(Value::Null)
-            }
-        }
-    }
-}
-impl fmt::Display for ConfigPointer {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let ConfigPointer {
-            package_id,
-            selector,
-            ..
-        } = self;
-        write!(f, "{}: config: {}", package_id, selector)
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct ConfigSelector {
-    src: String,
-    compiled: CompiledJsonPath,
-}
-impl ConfigSelector {
-    fn select(&self, multi: bool, val: &Value) -> Value {
-        let selected = self.compiled.select(&val).ok().unwrap_or_else(Vector::new);
-        if multi {
-            Value::Array(selected.into_iter().cloned().collect())
-        } else {
-            selected.get(0).map(|v| (*v).clone()).unwrap_or(Value::Null)
-        }
-    }
-}
-impl fmt::Display for ConfigSelector {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.src)
-    }
-}
-impl Serialize for ConfigSelector {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str(&self.src)
-    }
-}
-impl<'de> Deserialize<'de> for ConfigSelector {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let src: String = Deserialize::deserialize(deserializer)?;
-        let compiled = CompiledJsonPath::compile(&src).map_err(serde::de::Error::custom)?;
-        Ok(Self { src, compiled })
-    }
-}
-impl PartialEq for ConfigSelector {
-    fn eq(&self, other: &ConfigSelector) -> bool {
-        self.src == other.src
-    }
-}
-impl Eq for ConfigSelector {}
-impl PartialOrd for ConfigSelector {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.src.partial_cmp(&other.src)
-    }
-}
-impl Ord for ConfigSelector {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.src.cmp(&other.src)
-    }
-}
-impl Hash for ConfigSelector {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.src.hash(state)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct TorKeyPointer {
-    package_id: PackageId,
-    interface: InterfaceId,
-}
-impl TorKeyPointer {
-    async fn deref(
-        &self,
-        source_package: &PackageId,
-        secrets: &PgPool,
-    ) -> Result<Value, ConfigurationError> {
-        if &self.package_id != source_package {
-            return Err(ConfigurationError::PermissionDenied(
-                ValueSpecPointer::Package(PackagePointerSpec::TorKey(self.clone())),
-            ));
-        }
-        let key = Key::for_interface(
-            secrets
-                .acquire()
-                .await
-                .map_err(|e| ConfigurationError::SystemError(e.into()))?
-                .as_mut(),
-            Some((self.package_id.clone(), self.interface.clone())),
-        )
-        .await
-        .map_err(ConfigurationError::SystemError)?;
-        Ok(Value::String(Arc::new(base32::encode(
-            base32::Alphabet::RFC4648 { padding: false },
-            &key.tor_key().as_bytes(),
-        ))))
-    }
-}
-impl fmt::Display for TorKeyPointer {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}: tor-key: {}", self.package_id, self.interface)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-#[serde(tag = "target")]
-pub enum SystemPointerSpec {}
-impl fmt::Display for SystemPointerSpec {
-    fn fmt(&self, _f: &mut fmt::Formatter) -> fmt::Result {
-        // write!(f, "SYSTEM: {}", match *self {})
-        Ok(())
-    }
-}
-impl SystemPointerSpec {
-    async fn deref(&self, _ctx: &RpcContext) -> Result<Value, ConfigurationError> {
-        #[allow(unreachable_code)]
-        Ok(match *self {})
-    }
-}
-impl Defaultable for SystemPointerSpec {
-    type Error = ConfigurationError;
-    fn gen<R: Rng + CryptoRng + Sync + Send>(
-        &self,
-        _rng: &mut R,
-        _timeout: &Option<Duration>,
-    ) -> Result<Value, Self::Error> {
-        Ok(Value::Null)
-    }
-}
-#[async_trait]
-impl ValueSpec for SystemPointerSpec {
-    fn matches(&self, _value: &Value) -> Result<(), NoMatchWithPath> {
-        Ok(())
-    }
-    fn validate(&self, _manifest: &Manifest) -> Result<(), NoMatchWithPath> {
-        Ok(())
-    }
-    async fn update(
-        &self,
-        ctx: &RpcContext,
-        _manifest: &Manifest,
-        _config_overrides: &BTreeMap<PackageId, Config>,
-        value: &mut Value,
-    ) -> Result<(), ConfigurationError> {
-        *value = self.deref(ctx).await?;
-        Ok(())
-    }
-    fn pointers(&self, _value: &Value) -> Result<BTreeSet<ValueSpecPointer>, NoMatchWithPath> {
-        let mut pointers = BTreeSet::new();
-        pointers.insert(ValueSpecPointer::System(self.clone()));
-        #[allow(unreachable_code)]
-        Ok(pointers)
-    }
-    fn requires(&self, _id: &PackageId, _value: &Value) -> bool {
-        false
-    }
-    fn eq(&self, _lhs: &Value, _rhs: &Value) -> bool {
-        false
-    }
-}
-
-#[test]
-fn invalid_regex_produces_error() {
-    assert!(
-        serde_yaml::from_reader::<_, ConfigSpec>(std::io::Cursor::new(include_bytes!(
-            "../../test/config-spec/lnd-invalid-regex.yaml"
-        )))
-        .is_err()
-    )
-}
-
-#[test]
-fn missing_pattern_description_produces_error() {
-    assert!(
-        serde_yaml::from_reader::<_, ConfigSpec>(std::io::Cursor::new(include_bytes!(
-            "../../test/config-spec/lnd-missing-pattern-description.yaml"
-        )))
-        .is_err()
-    )
-}
-
-#[test]
-fn missing_pattern_produces_error() {
-    assert!(
-        serde_yaml::from_reader::<_, ConfigSpec>(std::io::Cursor::new(include_bytes!(
-            "../../test/config-spec/lnd-missing-pattern.yaml"
-        )))
-        .is_err()
-    )
-}
-
-#[test]
-fn regex_control() {
-    let spec = serde_yaml::from_reader::<_, ConfigSpec>(std::io::Cursor::new(include_bytes!(
-        "../../test/config-spec/lnd-correct.yaml"
-    )))
-    .unwrap();
-    println!("{}", serde_json::to_string_pretty(&spec).unwrap());
-}
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index df2747089..905132071 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -116,15 +116,27 @@ impl RpcContext {
         let devices = lshw().await?;
         let ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024;
 
-        if !db.peek().await.as_server_info().as_ntp_synced().de()? {
+        if !db
+            .peek()
+            .await
+            .as_public()
+            .as_server_info()
+            .as_ntp_synced()
+            .de()?
+        {
             let db = db.clone();
             tokio::spawn(async move {
                 while !check_time_is_synchronized().await.unwrap() {
                     tokio::time::sleep(Duration::from_secs(30)).await;
                 }
-                db.mutate(|v| v.as_server_info_mut().as_ntp_synced_mut().ser(&true))
-                    .await
-                    .unwrap()
+                db.mutate(|v| {
+                    v.as_public_mut()
+                        .as_server_info_mut()
+                        .as_ntp_synced_mut()
+                        .ser(&true)
+                })
+                .await
+                .unwrap()
             });
         }
 
@@ -208,12 +220,15 @@ impl RpcContext {
         self.db
             .mutate(|f| {
                 let mut current_dependents = f
+                    .as_public_mut()
                     .as_package_data()
                     .keys()?
                     .into_iter()
                     .map(|k| (k.clone(), BTreeMap::new()))
                     .collect::<BTreeMap<_, _>>();
-                for (package_id, package) in f.as_package_data_mut().as_entries_mut()? {
+                for (package_id, package) in
+                    f.as_public_mut().as_package_data_mut().as_entries_mut()?
+                {
                     for (k, v) in package
                         .as_installed_mut()
                         .into_iter()
@@ -228,6 +243,7 @@ impl RpcContext {
                 }
                 for (package_id, current_dependents) in current_dependents {
                     if let Some(deps) = f
+                        .as_public_mut()
                         .as_package_data_mut()
                         .as_idx_mut(&package_id)
                         .and_then(|pde| pde.expect_as_installed_mut().ok())
@@ -235,6 +251,7 @@ impl RpcContext {
                     {
                         deps.ser(&CurrentDependents(current_dependents))?;
                     } else if let Some(deps) = f
+                        .as_public_mut()
                         .as_package_data_mut()
                         .as_idx_mut(&package_id)
                         .and_then(|pde| pde.expect_as_removing_mut().ok())
@@ -252,7 +269,7 @@ impl RpcContext {
 
         let mut all_dependency_config_errs = BTreeMap::new();
         let peek = self.db.peek().await;
-        for (package_id, package) in peek.as_package_data().as_entries()?.into_iter() {
+        for (package_id, package) in peek.as_public().as_package_data().as_entries()?.into_iter() {
             let package = package.clone();
             if let Some(current_dependencies) = package
                 .as_installed()
@@ -276,6 +293,7 @@ impl RpcContext {
             .mutate(|v| {
                 for (package_id, errs) in all_dependency_config_errs {
                     if let Some(config_errors) = v
+                        .as_public_mut()
                         .as_package_data_mut()
                         .as_idx_mut(&package_id)
                         .and_then(|pde| pde.as_installed_mut())
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 77b2dfef2..bf09c0ff2 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -11,7 +11,7 @@ use clap::Parser;
 use futures::{FutureExt, StreamExt};
 use http::header::COOKIE;
 use http::HeaderMap;
-use patch_db::json_ptr::JsonPointer;
+use patch_db::json_ptr::{JsonPointer, ROOT};
 use patch_db::{Dump, Revision};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{command, from_fn_async, CallRemote, HandlerExt, ParentHandler};
@@ -25,13 +25,17 @@ use crate::middleware::auth::{HasValidSession, HashSessionToken};
 use crate::prelude::*;
 use crate::util::serde::{apply_expr, HandlerExtSerde};
 
+lazy_static::lazy_static! {
+    static ref PUBLIC: JsonPointer = "/public".parse().unwrap();
+}
+
 #[instrument(skip_all)]
 async fn ws_handler(
     ctx: RpcContext,
     session: Option<(HasValidSession, HashSessionToken)>,
     mut stream: WebSocket,
 ) -> Result<(), Error> {
-    let (dump, sub) = ctx.db.dump_and_sub().await;
+    let (dump, sub) = ctx.db.dump_and_sub(PUBLIC.clone()).await;
 
     if let Some((session, token)) = session {
         let kill = subscribe_to_session_kill(&ctx, token).await;
@@ -181,7 +185,7 @@ pub enum RevisionsRes {
 #[instrument(skip_all)]
 async fn cli_dump(ctx: CliContext, DumpParams { path }: DumpParams) -> Result<Dump, RpcError> {
     let dump = if let Some(path) = path {
-        PatchDb::open(path).await?.dump().await
+        PatchDb::open(path).await?.dump(&ROOT).await
     } else {
         from_value::<Dump>(ctx.call_remote("db.dump", imbl_value::json!({})).await?)?
     };
@@ -201,7 +205,7 @@ pub struct DumpParams {
 //     display(display_serializable)
 // )]
 pub async fn dump(ctx: RpcContext, _: DumpParams) -> Result<Dump, Error> {
-    Ok(ctx.db.dump().await)
+    Ok(ctx.db.dump(&*PUBLIC).await)
 }
 
 #[instrument(skip_all)]
diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs
index 2f4d33ffa..571573a54 100644
--- a/core/startos/src/db/model.rs
+++ b/core/startos/src/db/model.rs
@@ -7,7 +7,7 @@ use imbl_value::InternedString;
 use ipnet::{Ipv4Net, Ipv6Net};
 use isocountry::CountryCode;
 use itertools::Itertools;
-use models::{DataUrl, HealthCheckId, InterfaceId, PackageId};
+use models::{DataUrl, HealthCheckId, HostId, PackageId};
 use openssl::hash::MessageDigest;
 use patch_db::json_ptr::JsonPointer;
 use patch_db::{HasModel, Value};
@@ -16,7 +16,6 @@ use serde::{Deserialize, Serialize};
 use ssh_key::public::Ed25519PublicKey;
 
 use crate::account::AccountInfo;
-use crate::config::spec::PackagePointerSpec;
 use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
 use crate::prelude::*;
 use crate::progress::FullProgress;
@@ -30,72 +29,85 @@ use crate::{ARCH, PLATFORM};
 #[derive(Debug, Deserialize, Serialize, HasModel)]
 #[serde(rename_all = "kebab-case")]
 #[model = "Model<Self>"]
-// #[macro_debug]
 pub struct Database {
-    pub server_info: ServerInfo,
-    pub package_data: AllPackageData,
-    pub ui: Value,
+    pub public: Public,
+    pub private: (), // TODO
 }
 impl Database {
     pub fn init(account: &AccountInfo) -> Self {
         let lan_address = account.hostname.lan_address().parse().unwrap();
         Database {
-            server_info: ServerInfo {
-                arch: get_arch(),
-                platform: get_platform(),
-                id: account.server_id.clone(),
-                version: Current::new().semver().into(),
-                hostname: account.hostname.no_dot_host_name(),
-                last_backup: None,
-                last_wifi_region: None,
-                eos_version_compat: Current::new().compat().clone(),
-                lan_address,
-                tor_address: format!("https://{}", account.key.tor_address())
-                    .parse()
-                    .unwrap(),
-                ip_info: BTreeMap::new(),
-                status_info: ServerStatus {
-                    backup_progress: None,
-                    updated: false,
-                    update_progress: None,
-                    shutting_down: false,
-                    restarting: false,
-                },
-                wifi: WifiInfo {
-                    ssids: Vec::new(),
-                    connected: None,
-                    selected: None,
-                },
-                unread_notification_count: 0,
-                connection_addresses: ConnectionAddresses {
-                    tor: Vec::new(),
-                    clearnet: Vec::new(),
-                },
-                password_hash: account.password.clone(),
-                pubkey: ssh_key::PublicKey::from(Ed25519PublicKey::from(&account.key.ssh_key()))
+            public: Public {
+                server_info: ServerInfo {
+                    arch: get_arch(),
+                    platform: get_platform(),
+                    id: account.server_id.clone(),
+                    version: Current::new().semver().into(),
+                    hostname: account.hostname.no_dot_host_name(),
+                    last_backup: None,
+                    last_wifi_region: None,
+                    eos_version_compat: Current::new().compat().clone(),
+                    lan_address,
+                    tor_address: format!("https://{}", account.key.tor_address())
+                        .parse()
+                        .unwrap(),
+                    ip_info: BTreeMap::new(),
+                    status_info: ServerStatus {
+                        backup_progress: None,
+                        updated: false,
+                        update_progress: None,
+                        shutting_down: false,
+                        restarting: false,
+                    },
+                    wifi: WifiInfo {
+                        ssids: Vec::new(),
+                        connected: None,
+                        selected: None,
+                    },
+                    unread_notification_count: 0,
+                    connection_addresses: ConnectionAddresses {
+                        tor: Vec::new(),
+                        clearnet: Vec::new(),
+                    },
+                    password_hash: account.password.clone(),
+                    pubkey: ssh_key::PublicKey::from(Ed25519PublicKey::from(
+                        &account.key.ssh_key(),
+                    ))
                     .to_openssh()
                     .unwrap(),
-                ca_fingerprint: account
-                    .root_ca_cert
-                    .digest(MessageDigest::sha256())
-                    .unwrap()
-                    .iter()
-                    .map(|x| format!("{x:X}"))
-                    .join(":"),
-                ntp_synced: false,
-                zram: true,
-                governor: None,
+                    ca_fingerprint: account
+                        .root_ca_cert
+                        .digest(MessageDigest::sha256())
+                        .unwrap()
+                        .iter()
+                        .map(|x| format!("{x:X}"))
+                        .join(":"),
+                    ntp_synced: false,
+                    zram: true,
+                    governor: None,
+                },
+                package_data: AllPackageData::default(),
+                ui: serde_json::from_str(include_str!(concat!(
+                    env!("CARGO_MANIFEST_DIR"),
+                    "/../../web/patchdb-ui-seed.json"
+                )))
+                .unwrap(),
             },
-            package_data: AllPackageData::default(),
-            ui: serde_json::from_str(include_str!(concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/../../web/patchdb-ui-seed.json"
-            )))
-            .unwrap(),
+            private: (), // TODO
         }
     }
 }
 
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+// #[macro_debug]
+pub struct Public {
+    pub server_info: ServerInfo,
+    pub package_data: AllPackageData,
+    pub ui: Value,
+}
+
 pub type DatabaseModel = Model<Database>;
 
 fn get_arch() -> InternedString {
@@ -532,14 +544,13 @@ pub struct StaticDependencyInfo {
 #[model = "Model<Self>"]
 pub struct CurrentDependencyInfo {
     #[serde(default)]
-    pub pointers: BTreeSet<PackagePointerSpec>,
     pub health_checks: BTreeSet<HealthCheckId>,
 }
 
 #[derive(Debug, Default, Deserialize, Serialize)]
-pub struct InterfaceAddressMap(pub BTreeMap<InterfaceId, InterfaceAddresses>);
+pub struct InterfaceAddressMap(pub BTreeMap<HostId, InterfaceAddresses>);
 impl Map for InterfaceAddressMap {
-    type Key = InterfaceId;
+    type Key = HostId;
     type Value = InterfaceAddresses;
 }
 
diff --git a/core/startos/src/db/prelude.rs b/core/startos/src/db/prelude.rs
index 15e511d53..14f5e21eb 100644
--- a/core/startos/src/db/prelude.rs
+++ b/core/startos/src/db/prelude.rs
@@ -3,6 +3,7 @@ use std::marker::PhantomData;
 use std::panic::UnwindSafe;
 
 pub use imbl_value::Value;
+use patch_db::json_ptr::ROOT;
 use patch_db::value::InternedString;
 pub use patch_db::{HasModel, PatchDb};
 use serde::de::DeserializeOwned;
@@ -42,7 +43,7 @@ pub trait PatchDbExt {
 #[async_trait::async_trait]
 impl PatchDbExt for PatchDb {
     async fn peek(&self) -> DatabaseModel {
-        DatabaseModel::from(self.dump().await.value)
+        DatabaseModel::from(self.dump(&ROOT).await.value)
     }
     async fn mutate<U: UnwindSafe + Send>(
         &self,
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index d6b297e13..6ebe7afed 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -8,7 +8,6 @@ use rpc_toolkit::{command, from_fn_async, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
-use crate::config::spec::PackagePointerSpec;
 use crate::config::{Config, ConfigSpec, ConfigureContext};
 use crate::context::{CliContext, RpcContext};
 use crate::db::model::{CurrentDependencies, Database};
@@ -66,19 +65,11 @@ pub struct ConfigureParams {
     dependency_id: PackageId,
 }
 pub fn configure() -> ParentHandler<ConfigureParams> {
-    ParentHandler::new()
-        .root_handler(
-            from_fn_async(configure_impl)
-                .with_inherited(|params, _| params)
-                .no_cli(),
-        )
-        .subcommand(
-            "dry",
-            from_fn_async(configure_dry)
-                .with_inherited(|params, _| params)
-                .with_display_serializable()
-                .with_remote_cli::<CliContext>(),
-        )
+    ParentHandler::new().root_handler(
+        from_fn_async(configure_impl)
+            .with_inherited(|params, _| params)
+            .no_cli(),
+    )
 }
 
 pub async fn configure_impl(
@@ -89,8 +80,6 @@ pub async fn configure_impl(
         dependency_id,
     }: ConfigureParams,
 ) -> Result<(), Error> {
-    let breakages = BTreeMap::new();
-    let overrides = Default::default();
     let ConfigDryRes {
         old_config: _,
         new_config,
@@ -98,11 +87,8 @@ pub async fn configure_impl(
     } = configure_logic(ctx.clone(), (dependent_id, dependency_id.clone())).await?;
 
     let configure_context = ConfigureContext {
-        breakages,
         timeout: Some(Duration::from_secs(3).into()),
         config: Some(new_config),
-        dry_run: false,
-        overrides,
     };
     ctx.services
         .get(&dependency_id)
@@ -127,19 +113,6 @@ pub struct ConfigDryRes {
     pub spec: ConfigSpec,
 }
 
-// #[command(rename = "dry", display(display_serializable))]
-#[instrument(skip_all)]
-pub async fn configure_dry(
-    ctx: RpcContext,
-    _: Empty,
-    ConfigureParams {
-        dependent_id,
-        dependency_id,
-    }: ConfigureParams,
-) -> Result<ConfigDryRes, Error> {
-    configure_logic(ctx, (dependent_id, dependency_id)).await
-}
-
 pub async fn configure_logic(
     ctx: RpcContext,
     (dependent_id, dependency_id): (PackageId, PackageId),
@@ -226,6 +199,7 @@ pub fn add_dependent_to_current_dependents_lists(
 ) -> Result<(), Error> {
     for (dependency, dep_info) in &current_dependencies.0 {
         if let Some(dependency_dependents) = db
+            .as_public_mut()
             .as_package_data_mut()
             .as_idx_mut(dependency)
             .and_then(|pde| pde.as_installed_mut())
@@ -237,46 +211,6 @@ pub fn add_dependent_to_current_dependents_lists(
     Ok(())
 }
 
-pub fn set_dependents_with_live_pointers_to_needs_config(
-    db: &mut Peeked,
-    id: &PackageId,
-) -> Result<Vec<(PackageId, Version)>, Error> {
-    let mut res = Vec::new();
-    for (dep, info) in db
-        .as_package_data()
-        .as_idx(id)
-        .or_not_found(id)?
-        .as_installed()
-        .or_not_found(id)?
-        .as_current_dependents()
-        .de()?
-        .0
-    {
-        if info.pointers.iter().any(|ptr| match ptr {
-            // dependency id matches the package being uninstalled
-            PackagePointerSpec::TorAddress(ptr) => &ptr.package_id == id && &dep != id,
-            PackagePointerSpec::LanAddress(ptr) => &ptr.package_id == id && &dep != id,
-            // we never need to retarget these
-            PackagePointerSpec::TorKey(_) => false,
-            PackagePointerSpec::Config(_) => false,
-        }) {
-            let installed = db
-                .as_package_data_mut()
-                .as_idx_mut(&dep)
-                .or_not_found(&dep)?
-                .as_installed_mut()
-                .or_not_found(&dep)?;
-            let version = installed.as_manifest().as_version().de()?;
-            let configured = installed.as_status_mut().as_configured_mut();
-            if configured.de()? {
-                configured.ser(&false)?;
-                res.push((dep, version));
-            }
-        }
-    }
-    Ok(res)
-}
-
 #[instrument(skip_all)]
 pub async fn compute_dependency_config_errs(
     ctx: &RpcContext,
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index dfc13e068..fab80ab09 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -218,7 +218,7 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
     let db = cfg.db(&account).await?;
     tracing::info!("Opened PatchDB");
     let peek = db.peek().await;
-    let mut server_info = peek.as_server_info().de()?;
+    let mut server_info = peek.as_public().as_server_info().de()?;
 
     // write to ca cert store
     tokio::fs::write(
@@ -343,7 +343,7 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
     };
 
     db.mutate(|v| {
-        v.as_server_info_mut().ser(&server_info)?;
+        v.as_public_mut().as_server_info_mut().ser(&server_info)?;
         Ok(())
     })
     .await?;
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 110443162..ac00a750b 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -41,7 +41,7 @@ pub const PKG_WASM_DIR: &str = "package-data/wasm";
 
 // #[command(display(display_serializable))]
 pub async fn list(ctx: RpcContext) -> Result<Value, Error> {
-    Ok(ctx.db.peek().await.as_package_data().as_entries()?
+    Ok(ctx.db.peek().await.as_public().as_package_data().as_entries()?
         .iter()
         .filter_map(|(id, pde)| {
             let status = match pde.as_match() {
@@ -185,7 +185,13 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
     let (err_send, err_recv) = oneshot::channel();
     let progress = RequestGuid::new();
     let db = ctx.db.clone();
-    let mut sub = db.subscribe().await;
+    let mut sub = db
+        .subscribe(
+            "/package-data/{id}/install-progress"
+                .parse::<JsonPointer>()
+                .with_kind(ErrorKind::Database)?,
+        )
+        .await;
     ctx.add_continuation(
         progress.clone(),
         RpcContinuation::ws(
@@ -199,17 +205,15 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                                 ErrorKind::Cancelled,
                             )
                         })?;
-                        let progress_path =
-                            JsonPointer::parse(format!("/package-data/{id}/install-progress"))
-                                .with_kind(ErrorKind::Database)?;
                         tokio::select! {
                             res = async {
                                 while let Some(rev) = sub.recv().await {
-                                    if rev.patch.affects_path(&progress_path) {
+                                    if !rev.patch.0.is_empty() { // TODO: don't send empty patches?
                                         ws.send(Message::Text(
                                             serde_json::to_string(&if let Some(p) = db
                                                 .peek()
                                                 .await
+                                                .as_public()
                                                 .as_package_data()
                                                 .as_idx(&id)
                                                 .and_then(|e| e.as_install_progress())
@@ -230,16 +234,18 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                             } => res?,
                             err = err_recv => {
                                 if let Ok(e) = err {
-                                ws.send(Message::Text(
-                                    serde_json::to_string(&Err::<(), _>(e))
-                                    .with_kind(ErrorKind::Serialization)?,
-                                ))
-                                .await
-                                .with_kind(ErrorKind::Network)?;
+                                    ws.send(Message::Text(
+                                        serde_json::to_string(&Err::<(), _>(e))
+                                        .with_kind(ErrorKind::Serialization)?,
+                                    ))
+                                    .await
+                                    .with_kind(ErrorKind::Network)?;
                                 }
                             }
                         }
 
+                        ws.close().await.with_kind(ErrorKind::Network)?;
+
                         Ok::<_, Error>(())
                     }
                     .await
@@ -250,7 +256,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                 }
                 .boxed()
             }),
-            Duration::from_secs(30),
+            Duration::from_secs(600),
         ),
     )
     .await;
@@ -405,26 +411,31 @@ pub async fn uninstall(
 ) -> Result<PackageId, Error> {
     ctx.db
         .mutate(|db| {
-            let (manifest, static_files, installed) =
-                match db.as_package_data().as_idx(&id).or_not_found(&id)?.de()? {
-                    PackageDataEntry::Installed(PackageDataEntryInstalled {
-                        manifest,
-                        static_files,
-                        installed,
-                    }) => (manifest, static_files, installed),
-                    _ => {
-                        return Err(Error::new(
-                            eyre!("Package is not installed."),
-                            crate::ErrorKind::NotFound,
-                        ));
-                    }
-                };
+            let (manifest, static_files, installed) = match db
+                .as_public()
+                .as_package_data()
+                .as_idx(&id)
+                .or_not_found(&id)?
+                .de()?
+            {
+                PackageDataEntry::Installed(PackageDataEntryInstalled {
+                    manifest,
+                    static_files,
+                    installed,
+                }) => (manifest, static_files, installed),
+                _ => {
+                    return Err(Error::new(
+                        eyre!("Package is not installed."),
+                        crate::ErrorKind::NotFound,
+                    ));
+                }
+            };
             let pde = PackageDataEntry::Removing(PackageDataEntryRemoving {
                 manifest,
                 static_files,
                 removing: installed,
             });
-            db.as_package_data_mut().insert(&id, &pde)
+            db.as_public_mut().as_package_data_mut().insert(&id, &pde)
         })
         .await?;
 
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index 1c9d65d24..a8dbcabb0 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -75,7 +75,8 @@ pub async fn update(
         let ip_info = IpInfo::for_interface(&interface).await?;
         ctx.db
             .mutate(|db| {
-                db.as_server_info_mut()
+                db.as_public_mut()
+                    .as_server_info_mut()
                     .as_ip_info_mut()
                     .insert(&interface, &ip_info)
             })
diff --git a/core/startos/src/net/dns.rs b/core/startos/src/net/dns.rs
index 7b2784a50..9eb5d3750 100644
--- a/core/startos/src/net/dns.rs
+++ b/core/startos/src/net/dns.rs
@@ -163,13 +163,13 @@ impl DnsController {
 
         Command::new("resolvectl")
             .arg("dns")
-            .arg("br-start9")
+            .arg("lxcbr0")
             .arg("127.0.0.1")
             .invoke(ErrorKind::Network)
             .await?;
         Command::new("resolvectl")
             .arg("domain")
-            .arg("br-start9")
+            .arg("lxcbr0")
             .arg("embassy")
             .invoke(ErrorKind::Network)
             .await?;
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
new file mode 100644
index 000000000..b2b991698
--- /dev/null
+++ b/core/startos/src/net/host/mod.rs
@@ -0,0 +1,29 @@
+use imbl_value::InternedString;
+use serde::{Deserialize, Serialize};
+
+use crate::net::host::multi::MultiHost;
+
+pub mod multi;
+
+pub enum Host {
+    Multi(MultiHost),
+    // Single(SingleHost),
+    // Static(StaticHost),
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct BindOptions {
+    scheme: InternedString,
+    preferred_external_port: u16,
+    add_ssl: Option<AddSslOptions>,
+    secure: bool,
+    ssl: bool,
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct AddSslOptions {
+    scheme: InternedString,
+    preferred_external_port: u16,
+    #[serde(default)]
+    add_x_forwarded_headers: bool,
+}
diff --git a/core/startos/src/net/host/multi.rs b/core/startos/src/net/host/multi.rs
new file mode 100644
index 000000000..511619201
--- /dev/null
+++ b/core/startos/src/net/host/multi.rs
@@ -0,0 +1,13 @@
+use std::collections::BTreeMap;
+
+use imbl_value::InternedString;
+use serde::{Deserialize, Serialize};
+
+use crate::net::host::BindOptions;
+use crate::net::keys::Key;
+
+pub struct MultiHost {
+    id: InternedString,
+    key: Key,
+    binds: BTreeMap<u16, BindOptions>,
+}
diff --git a/core/startos/src/net/interface.rs b/core/startos/src/net/interface.rs
deleted file mode 100644
index f1fa1e406..000000000
--- a/core/startos/src/net/interface.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use std::collections::BTreeMap;
-
-use indexmap::IndexSet;
-pub use models::InterfaceId;
-use models::PackageId;
-use serde::{Deserialize, Deserializer, Serialize};
-use sqlx::{Executor, Postgres};
-use tracing::instrument;
-
-use crate::db::model::{InterfaceAddressMap, InterfaceAddresses};
-use crate::net::keys::Key;
-use crate::util::serde::Port;
-use crate::{Error, ResultExt};
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct Interfaces(pub BTreeMap<InterfaceId, Interface>); // TODO
-impl Interfaces {
-    #[instrument(skip_all)]
-    pub fn validate(&self) -> Result<(), Error> {
-        for (_, interface) in &self.0 {
-            interface.validate().with_ctx(|_| {
-                (
-                    crate::ErrorKind::ValidateS9pk,
-                    format!("Interface {}", interface.name),
-                )
-            })?;
-        }
-        Ok(())
-    }
-    #[instrument(skip_all)]
-    pub async fn install<Ex>(
-        &self,
-        secrets: &mut Ex,
-        package_id: &PackageId,
-    ) -> Result<InterfaceAddressMap, Error>
-    where
-        for<'a> &'a mut Ex: Executor<'a, Database = Postgres>,
-    {
-        let mut interface_addresses = InterfaceAddressMap(BTreeMap::new());
-        for (id, iface) in &self.0 {
-            let mut addrs = InterfaceAddresses {
-                tor_address: None,
-                lan_address: None,
-            };
-            if iface.tor_config.is_some() || iface.lan_config.is_some() {
-                let key =
-                    Key::for_interface(secrets, Some((package_id.clone(), id.clone()))).await?;
-                if iface.tor_config.is_some() {
-                    addrs.tor_address = Some(key.tor_address().to_string());
-                }
-                if iface.lan_config.is_some() {
-                    addrs.lan_address = Some(key.local_address());
-                }
-            }
-            interface_addresses.0.insert(id.clone(), addrs);
-        }
-        Ok(interface_addresses)
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct Interface {
-    pub name: String,
-    pub description: String,
-    pub tor_config: Option<TorConfig>,
-    pub lan_config: Option<BTreeMap<Port, LanPortConfig>>,
-    pub ui: bool,
-    pub protocols: IndexSet<String>,
-}
-impl Interface {
-    #[instrument(skip_all)]
-    pub fn validate(&self) -> Result<(), color_eyre::eyre::Report> {
-        if self.tor_config.is_some() && !self.protocols.contains("tcp") {
-            color_eyre::eyre::bail!("must support tcp to set up a tor hidden service");
-        }
-        if self.lan_config.is_some() && !self.protocols.contains("http") {
-            color_eyre::eyre::bail!("must support http to set up a lan service");
-        }
-        if self.ui && !(self.protocols.contains("http") || self.protocols.contains("https")) {
-            color_eyre::eyre::bail!("must support http or https to serve a ui");
-        }
-        Ok(())
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct TorConfig {
-    pub port_mapping: BTreeMap<Port, Port>,
-}
-
-#[derive(Clone, Debug, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct LanPortConfig {
-    pub ssl: bool,
-    pub internal: u16,
-}
-impl<'de> Deserialize<'de> for LanPortConfig {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(rename_all = "kebab-case")]
-        struct PermissiveLanPortConfig {
-            ssl: bool,
-            internal: Option<u16>,
-            mapping: Option<u16>,
-        }
-
-        let config = PermissiveLanPortConfig::deserialize(deserializer)?;
-        Ok(LanPortConfig {
-            ssl: config.ssl,
-            internal: config
-                .internal
-                .or(config.mapping)
-                .ok_or_else(|| serde::de::Error::missing_field("internal"))?,
-        })
-    }
-}
diff --git a/core/startos/src/net/keys.rs b/core/startos/src/net/keys.rs
index 4816fd98a..1079d4a98 100644
--- a/core/startos/src/net/keys.rs
+++ b/core/startos/src/net/keys.rs
@@ -1,6 +1,6 @@
 use clap::Parser;
 use color_eyre::eyre::eyre;
-use models::{Id, InterfaceId, PackageId};
+use models::{HostId, Id, PackageId};
 use openssl::pkey::{PKey, Private};
 use openssl::sha::Sha256;
 use openssl::x509::X509;
@@ -22,13 +22,13 @@ use crate::util::crypto::ed25519_expand_key;
 // TODO: delete once we may change tor addresses
 async fn compat(
     secrets: impl PgExecutor<'_>,
-    interface: &Option<(PackageId, InterfaceId)>,
+    host: &Option<(PackageId, HostId)>,
 ) -> Result<Option<[u8; 64]>, Error> {
-    if let Some((package, interface)) = interface {
+    if let Some((package, host)) = host {
         if let Some(r) = sqlx::query!(
             "SELECT key FROM tor WHERE package = $1 AND interface = $2",
             package,
-            interface
+            host
         )
         .fetch_optional(secrets)
         .await?
@@ -60,19 +60,19 @@ async fn compat(
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Key {
-    interface: Option<(PackageId, InterfaceId)>,
+    host: Option<(PackageId, HostId)>,
     base: [u8; 32],
     tor_key: [u8; 64], // Does NOT necessarily match base
 }
 impl Key {
-    pub fn interface(&self) -> Option<(PackageId, InterfaceId)> {
-        self.interface.clone()
+    pub fn host(&self) -> Option<(PackageId, HostId)> {
+        self.host.clone()
     }
     pub fn as_bytes(&self) -> [u8; 32] {
         self.base
     }
     pub fn internal_address(&self) -> String {
-        self.interface
+        self.host
             .as_ref()
             .map(|(pkg_id, _)| format!("{}.embassy", pkg_id))
             .unwrap_or_else(|| "embassy".to_owned())
@@ -111,21 +111,21 @@ impl Key {
         Ed25519PrivateKey::from_bytes(&self.base)
     }
     pub(crate) fn from_pair(
-        interface: Option<(PackageId, InterfaceId)>,
+        host: Option<(PackageId, HostId)>,
         bytes: [u8; 32],
         tor_key: [u8; 64],
     ) -> Self {
         Self {
-            interface,
+            host,
             tor_key,
             base: bytes,
         }
     }
-    pub fn from_bytes(interface: Option<(PackageId, InterfaceId)>, bytes: [u8; 32]) -> Self {
-        Self::from_pair(interface, bytes, ed25519_expand_key(&bytes))
+    pub fn from_bytes(host: Option<(PackageId, HostId)>, bytes: [u8; 32]) -> Self {
+        Self::from_pair(host, bytes, ed25519_expand_key(&bytes))
     }
-    pub fn new(interface: Option<(PackageId, InterfaceId)>) -> Self {
-        Self::from_bytes(interface, rand::random())
+    pub fn new(host: Option<(PackageId, HostId)>) -> Self {
+        Self::from_bytes(host, rand::random())
     }
     pub(super) fn with_certs(self, certs: CertPair, int: X509, root: X509) -> KeyInfo {
         KeyInfo {
@@ -163,10 +163,7 @@ impl Key {
         .await?
         .into_iter()
         .map(|row| {
-            let interface = Some((
-                package.clone(),
-                InterfaceId::from(Id::try_from(row.interface)?),
-            ));
+            let host = Some((package.clone(), HostId::from(Id::try_from(row.interface)?)));
             let bytes = row.key.try_into().map_err(|e: Vec<u8>| {
                 Error::new(
                     eyre!("Invalid length for network key {} expected 32", e.len()),
@@ -175,7 +172,7 @@ impl Key {
             })?;
             Ok(match row.tor_key {
                 Some(tor_key) => Key::from_pair(
-                    interface,
+                    host,
                     bytes,
                     tor_key.try_into().map_err(|e: Vec<u8>| {
                         Error::new(
@@ -184,20 +181,20 @@ impl Key {
                         )
                     })?,
                 ),
-                None => Key::from_bytes(interface, bytes),
+                None => Key::from_bytes(host, bytes),
             })
         })
         .collect()
     }
-    pub async fn for_interface<Ex>(
+    pub async fn for_host<Ex>(
         secrets: &mut Ex,
-        interface: Option<(PackageId, InterfaceId)>,
+        host: Option<(PackageId, HostId)>,
     ) -> Result<Self, Error>
     where
         for<'a> &'a mut Ex: PgExecutor<'a>,
     {
         let tentative = rand::random::<[u8; 32]>();
-        let actual = if let Some((pkg, iface)) = &interface {
+        let actual = if let Some((pkg, iface)) = &host {
             let k = tentative.as_slice();
             let actual = sqlx::query!(
                 "INSERT INTO network_keys (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO UPDATE SET package = EXCLUDED.package RETURNING key",
@@ -229,8 +226,8 @@ impl Key {
             })?);
             bytes
         };
-        let mut res = Self::from_bytes(interface, actual);
-        if let Some(tor_key) = compat(secrets, &res.interface).await? {
+        let mut res = Self::from_bytes(host, actual);
+        if let Some(tor_key) = compat(secrets, &res.host).await? {
             res.tor_key = tor_key;
         }
         Ok(res)
@@ -288,43 +285,43 @@ pub fn display_requires_reboot(_: RotateKeysParams, args: RequiresReboot) {
 #[command(rename_all = "kebab-case")]
 pub struct RotateKeysParams {
     package: Option<PackageId>,
-    interface: Option<InterfaceId>,
+    host: Option<HostId>,
 }
 
 // #[command(display(display_requires_reboot))]
 pub async fn rotate_key(
     ctx: RpcContext,
-    RotateKeysParams { package, interface }: RotateKeysParams,
+    RotateKeysParams { package, host }: RotateKeysParams,
 ) -> Result<RequiresReboot, Error> {
     let mut pgcon = ctx.secret_store.acquire().await?;
     let mut tx = pgcon.begin().await?;
     if let Some(package) = package {
-        let Some(interface) = interface else {
+        let Some(host) = host else {
             return Err(Error::new(
-                eyre!("Must specify interface"),
+                eyre!("Must specify host"),
                 ErrorKind::InvalidRequest,
             ));
         };
         sqlx::query!(
             "DELETE FROM tor WHERE package = $1 AND interface = $2",
             &package,
-            &interface,
+            &host,
         )
         .execute(&mut *tx)
         .await?;
         sqlx::query!(
             "DELETE FROM network_keys WHERE package = $1 AND interface = $2",
             &package,
-            &interface,
+            &host,
         )
         .execute(&mut *tx)
         .await?;
-        let new_key =
-            Key::for_interface(&mut *tx, Some((package.clone(), interface.clone()))).await?;
+        let new_key = Key::for_host(&mut *tx, Some((package.clone(), host.clone()))).await?;
         let needs_config = ctx
             .db
             .mutate(|v| {
                 let installed = v
+                    .as_public_mut()
                     .as_package_data_mut()
                     .as_idx_mut(&package)
                     .or_not_found(&package)?
@@ -332,8 +329,8 @@ pub async fn rotate_key(
                     .or_not_found("installed")?;
                 let addrs = installed
                     .as_interface_addresses_mut()
-                    .as_idx_mut(&interface)
-                    .or_not_found(&interface)?;
+                    .as_idx_mut(&host)
+                    .or_not_found(&host)?;
                 if let Some(lan) = addrs.as_lan_address_mut().transpose_mut() {
                     lan.ser(&new_key.local_address())?;
                 }
@@ -380,10 +377,15 @@ pub async fn rotate_key(
         sqlx::query!("UPDATE account SET tor_key = NULL, network_key = gen_random_bytes(32)")
             .execute(&mut *tx)
             .await?;
-        let new_key = Key::for_interface(&mut *tx, None).await?;
+        let new_key = Key::for_host(&mut *tx, None).await?;
         let url = format!("https://{}", new_key.tor_address()).parse()?;
         ctx.db
-            .mutate(|v| v.as_server_info_mut().as_tor_address_mut().ser(&url))
+            .mutate(|v| {
+                v.as_public_mut()
+                    .as_server_info_mut()
+                    .as_tor_address_mut()
+                    .ser(&url)
+            })
             .await?;
         tx.commit().await?;
         Ok(RequiresReboot(true))
diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs
index 25d7a9647..a0a2ed166 100644
--- a/core/startos/src/net/mod.rs
+++ b/core/startos/src/net/mod.rs
@@ -4,7 +4,7 @@ use crate::context::CliContext;
 
 pub mod dhcp;
 pub mod dns;
-pub mod interface;
+pub mod host;
 pub mod keys;
 pub mod mdns;
 pub mod net_controller;
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index 38aa079af..9b9145531 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -3,7 +3,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::{Arc, Weak};
 
 use color_eyre::eyre::eyre;
-use models::{InterfaceId, PackageId};
+use models::{HostId, PackageId};
 use sqlx::PgExecutor;
 use tracing::instrument;
 
@@ -20,7 +20,7 @@ use crate::{Error, HOST_IP};
 pub struct NetController {
     pub(super) tor: TorController,
     pub(super) vhost: VHostController,
-    // pub(super) dns: DnsController,
+    pub(super) dns: DnsController,
     pub(super) ssl: Arc<SslManager>,
     pub(super) os_bindings: Vec<Arc<()>>,
 }
@@ -39,7 +39,7 @@ impl NetController {
         let mut res = Self {
             tor: TorController::new(tor_control, tor_socks),
             vhost: VHostController::new(ssl.clone()),
-            // dns: DnsController::init(dns_bind).await?,
+            dns: DnsController::init(dns_bind).await?,
             ssl,
             os_bindings: Vec::new(),
         };
@@ -60,8 +60,8 @@ impl NetController {
                 alpn.clone(),
             )
             .await?;
-        // self.os_bindings
-        //     .push(self.dns.add(None, HOST_IP.into()).await?);
+        self.os_bindings
+            .push(self.dns.add(None, HOST_IP.into()).await?);
 
         // LAN IP
         self.os_bindings.push(
@@ -147,13 +147,13 @@ impl NetController {
         package: PackageId,
         ip: Ipv4Addr,
     ) -> Result<NetService, Error> {
-        // let dns = self.dns.add(Some(package.clone()), ip).await?;
+        let dns = self.dns.add(Some(package.clone()), ip).await?;
 
         Ok(NetService {
             shutdown: false,
             id: package,
             ip,
-            // dns,
+            dns,
             controller: Arc::downgrade(self),
             tor: BTreeMap::new(),
             lan: BTreeMap::new(),
@@ -212,10 +212,10 @@ pub struct NetService {
     shutdown: bool,
     id: PackageId,
     ip: Ipv4Addr,
-    // dns: Arc<()>,
+    dns: Arc<()>,
     controller: Weak<NetController>,
-    tor: BTreeMap<(InterfaceId, u16), (Key, Vec<Arc<()>>)>,
-    lan: BTreeMap<(InterfaceId, u16), (Key, Vec<Arc<()>>)>,
+    tor: BTreeMap<(HostId, u16), (Key, Vec<Arc<()>>)>,
+    lan: BTreeMap<(HostId, u16), (Key, Vec<Arc<()>>)>,
 }
 impl NetService {
     fn net_controller(&self) -> Result<Arc<NetController>, Error> {
@@ -229,14 +229,14 @@ impl NetService {
     pub async fn add_tor<Ex>(
         &mut self,
         secrets: &mut Ex,
-        id: InterfaceId,
+        id: HostId,
         external: u16,
         internal: u16,
     ) -> Result<(), Error>
     where
         for<'a> &'a mut Ex: PgExecutor<'a>,
     {
-        let key = Key::for_interface(secrets, Some((self.id.clone(), id.clone()))).await?;
+        let key = Key::for_host(secrets, Some((self.id.clone(), id.clone()))).await?;
         let ctrl = self.net_controller()?;
         let tor_idx = (id, external);
         let mut tor = self
@@ -251,7 +251,7 @@ impl NetService {
         self.tor.insert(tor_idx, tor);
         Ok(())
     }
-    pub async fn remove_tor(&mut self, id: InterfaceId, external: u16) -> Result<(), Error> {
+    pub async fn remove_tor(&mut self, id: HostId, external: u16) -> Result<(), Error> {
         let ctrl = self.net_controller()?;
         if let Some((key, rcs)) = self.tor.remove(&(id, external)) {
             ctrl.remove_tor(&key, external, rcs).await?;
@@ -261,7 +261,7 @@ impl NetService {
     pub async fn add_lan<Ex>(
         &mut self,
         secrets: &mut Ex,
-        id: InterfaceId,
+        id: HostId,
         external: u16,
         internal: u16,
         connect_ssl: Result<(), AlpnInfo>,
@@ -269,7 +269,7 @@ impl NetService {
     where
         for<'a> &'a mut Ex: PgExecutor<'a>,
     {
-        let key = Key::for_interface(secrets, Some((self.id.clone(), id.clone()))).await?;
+        let key = Key::for_host(secrets, Some((self.id.clone(), id.clone()))).await?;
         let ctrl = self.net_controller()?;
         let lan_idx = (id, external);
         let mut lan = self
@@ -289,7 +289,7 @@ impl NetService {
         self.lan.insert(lan_idx, lan);
         Ok(())
     }
-    pub async fn remove_lan(&mut self, id: InterfaceId, external: u16) -> Result<(), Error> {
+    pub async fn remove_lan(&mut self, id: HostId, external: u16) -> Result<(), Error> {
         let ctrl = self.net_controller()?;
         if let Some((key, rcs)) = self.lan.remove(&(id, external)) {
             ctrl.remove_lan(&key, external, rcs).await?;
@@ -299,13 +299,13 @@ impl NetService {
     pub async fn export_cert<Ex>(
         &self,
         secrets: &mut Ex,
-        id: &InterfaceId,
+        id: &HostId,
         ip: IpAddr,
     ) -> Result<(), Error>
     where
         for<'a> &'a mut Ex: PgExecutor<'a>,
     {
-        let key = Key::for_interface(secrets, Some((self.id.clone(), id.clone()))).await?;
+        let key = Key::for_host(secrets, Some((self.id.clone(), id.clone()))).await?;
         let ctrl = self.net_controller()?;
         let cert = ctrl.ssl.with_certs(key, ip).await?;
         let cert_dir = cert_dir(&self.id, id);
@@ -332,8 +332,8 @@ impl NetService {
             for ((_, external), (key, rcs)) in std::mem::take(&mut self.tor) {
                 errors.handle(ctrl.remove_tor(&key, external, rcs).await);
             }
-            // std::mem::take(&mut self.dns);
-            // errors.handle(ctrl.dns.gc(Some(self.id.clone()), self.ip).await);
+            std::mem::take(&mut self.dns);
+            errors.handle(ctrl.dns.gc(Some(self.id.clone()), self.ip).await);
             errors.into_result()
         } else {
             tracing::warn!("NetService dropped after NetController is shutdown");
@@ -355,7 +355,7 @@ impl Drop for NetService {
                     shutdown: true,
                     id: Default::default(),
                     ip: Ipv4Addr::new(0, 0, 0, 0),
-                    // dns: Default::default(),
+                    dns: Default::default(),
                     controller: Default::default(),
                     tor: Default::default(),
                     lan: Default::default(),
diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index a3a6a24c9..f9502c86b 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -336,7 +336,7 @@ pub struct SANInfo {
 impl SANInfo {
     pub fn new(key: &Key, hostname: &Hostname, ips: BTreeSet<IpAddr>) -> Self {
         let mut dns = BTreeSet::new();
-        if let Some((id, _)) = key.interface() {
+        if let Some((id, _)) = key.host() {
             dns.insert(MaybeWildcard::WithWildcard(format!("{id}.embassy")));
             dns.insert(MaybeWildcard::WithWildcard(key.local_address().to_string()));
         } else {
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index be1c49fdc..5a86ad720 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -682,7 +682,8 @@ impl WpaCli {
     pub async fn save_config(&mut self, db: PatchDb) -> Result<(), Error> {
         let new_country = self.get_country_low().await?;
         db.mutate(|d| {
-            d.as_server_info_mut()
+            d.as_public_mut()
+                .as_server_info_mut()
                 .as_last_wifi_region_mut()
                 .ser(&new_country)
         })
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index aa0b0b963..f16eab176 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -102,7 +102,8 @@ pub async fn list(
 
             ctx.db
                 .mutate(|d| {
-                    d.as_server_info_mut()
+                    d.as_public_mut()
+                        .as_server_info_mut()
                         .as_unread_notification_count_mut()
                         .ser(&0)
                 })
@@ -308,7 +309,11 @@ impl NotificationManager {
         {
             return Ok(());
         }
-        let mut count = peek.as_server_info().as_unread_notification_count().de()?;
+        let mut count = peek
+            .as_public()
+            .as_server_info()
+            .as_unread_notification_count()
+            .de()?;
         let sql_package_id = package_id.as_ref().map(|p| &**p);
         let sql_code = T::CODE;
         let sql_level = format!("{}", level);
@@ -325,7 +330,8 @@ impl NotificationManager {
     ).execute(&self.sqlite).await?;
         count += 1;
         db.mutate(|db| {
-            db.as_server_info_mut()
+            db.as_public_mut()
+                .as_server_info_mut()
                 .as_unread_notification_count_mut()
                 .ser(&count)
         })
diff --git a/core/startos/src/service/config.rs b/core/startos/src/service/config.rs
index c64e2be65..06dc8bd55 100644
--- a/core/startos/src/service/config.rs
+++ b/core/startos/src/service/config.rs
@@ -1,6 +1,6 @@
 use std::collections::BTreeMap;
 
-use models::PackageId;
+use models::{ActionId, PackageId, ProcedureName};
 
 use crate::config::ConfigureContext;
 use crate::prelude::*;
@@ -9,14 +9,13 @@ use crate::service::Service;
 impl Service {
     pub async fn configure(
         &self,
-        ConfigureContext {
-            breakages,
-            timeout,
-            config,
-            overrides,
-            dry_run,
-        }: ConfigureContext,
-    ) -> Result<BTreeMap<PackageId, String>, Error> {
-        todo!()
+        ConfigureContext { timeout, config }: ConfigureContext,
+    ) -> Result<(), Error> {
+        let container = &self.seed.persistent_container;
+        container
+            .execute::<Value>(ProcedureName::SetConfig, to_value(&config)?, timeout)
+            .await
+            .with_kind(ErrorKind::Action)?;
+        Ok(())
     }
 }
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index fd8412c02..b572caa89 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -7,7 +7,7 @@ use futures::future::BoxFuture;
 use imbl::OrdMap;
 use models::{ActionId, HealthCheckId, PackageId, ProcedureName};
 use persistent_container::PersistentContainer;
-use rpc_toolkit::{from_fn_async, CallRemoteHandler, Handler, HandlerArgs};
+use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, Handler, HandlerArgs};
 use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
 use tokio::sync::{watch, Notify};
@@ -128,6 +128,7 @@ impl Service {
             .db
             .peek()
             .await
+            .into_public()
             .into_package_data()
             .into_idx(id)
             .map(|pde| pde.into_match())
@@ -151,7 +152,7 @@ impl Service {
                 }
                 // TODO: delete s9pk?
                 ctx.db
-                    .mutate(|v| v.as_package_data_mut().remove(id))
+                    .mutate(|v| v.as_public_mut().as_package_data_mut().remove(id))
                     .await?;
                 Ok(None)
             }
@@ -188,7 +189,8 @@ impl Service {
                     .mutate({
                         let manifest = s9pk.as_manifest().clone();
                         |db| {
-                            db.as_package_data_mut()
+                            db.as_public_mut()
+                                .as_package_data_mut()
                                 .as_idx_mut(&manifest.id)
                                 .or_not_found(&manifest.id)?
                                 .ser(&PackageDataEntry::Installed(PackageDataEntryInstalled {
@@ -229,7 +231,7 @@ impl Service {
                 }
 
                 ctx.db
-                    .mutate(|v| v.as_package_data_mut().remove(id))
+                    .mutate(|v| v.as_public_mut().as_package_data_mut().remove(id))
                     .await?;
 
                 Ok(None)
@@ -274,7 +276,8 @@ impl Service {
         }
         ctx.db
             .mutate(|d| {
-                d.as_package_data_mut()
+                d.as_public_mut()
+                    .as_package_data_mut()
                     .as_idx_mut(&manifest.id)
                     .or_not_found(&manifest.id)?
                     .ser(&PackageDataEntry::Installed(PackageDataEntryInstalled {
@@ -346,6 +349,11 @@ impl Service {
             .await;
         if let Some((hdl, shutdown)) = self.seed.persistent_container.rpc_server.send_replace(None)
         {
+            self.seed
+                .persistent_container
+                .rpc_client
+                .request(rpc::Exit, Empty {})
+                .await?;
             shutdown.shutdown();
             hdl.await.with_kind(ErrorKind::Cancelled)?;
         }
@@ -367,6 +375,12 @@ impl Service {
             .persistent_container
             .execute(ProcedureName::Uninit, to_value(&target_version)?, None) // TODO timeout
             .await?;
+        let id = self.seed.persistent_container.s9pk.as_manifest().id.clone();
+        self.seed
+            .ctx
+            .db
+            .mutate(|d| d.as_public_mut().as_package_data_mut().remove(&id))
+            .await?;
         self.shutdown().await
     }
     pub async fn backup(&self, guard: impl GenericMountGuard) -> Result<BackupReturn, Error> {
@@ -416,6 +430,7 @@ impl Actor for ServiceActor {
                         .db
                         .mutate(|d| {
                             if let Some(i) = d
+                                .as_public_mut()
                                 .as_package_data_mut()
                                 .as_idx_mut(&id)
                                 .and_then(|p| p.as_installed_mut())
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 6716ed472..eee353a07 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -46,7 +46,7 @@ struct ProcedureId(u64);
 pub struct PersistentContainer {
     pub(super) s9pk: S9pk,
     pub(super) lxc_container: OnceCell<LxcContainer>,
-    rpc_client: UnixRpcClient,
+    pub(super) rpc_client: UnixRpcClient,
     pub(super) rpc_server: watch::Sender<Option<(NonDetachingJoinHandle<()>, ShutdownHandle)>>,
     // procedures: Mutex<Vec<(ProcedureName, ProcedureId)>>,
     js_mount: MountGuard,
@@ -239,8 +239,8 @@ impl PersistentContainer {
         let lxc_container = self.lxc_container.take();
         async move {
             let mut errs = ErrorCollection::new();
-            errs.handle(dbg!(rpc_client.request(rpc::Exit, Empty {}).await));
             if let Some((hdl, shutdown)) = rpc_server {
+                errs.handle(rpc_client.request(rpc::Exit, Empty {}).await);
                 shutdown.shutdown();
                 errs.handle(hdl.await.with_kind(ErrorKind::Cancelled));
             }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index d5a4561f7..8fae3908a 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -12,6 +12,7 @@ use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use tokio::process::Command;
 
+use crate::db::model::ExposedUI;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
@@ -23,8 +24,7 @@ use crate::service::ServiceActorSeed;
 use crate::status::health_check::HealthCheckResult;
 use crate::status::MainStatus;
 use crate::util::clap::FromStrParser;
-use crate::util::new_guid;
-use crate::{db::model::ExposedUI, util::Invoke};
+use crate::util::{new_guid, Invoke};
 use crate::{echo, ARCH};
 
 #[derive(Clone)]
@@ -120,6 +120,10 @@ pub fn service_effect_handler() -> ParentHandler {
             from_fn_async(get_ssl_certificate).no_cli(),
         )
         .subcommand("getSslKey", from_fn_async(get_ssl_key).no_cli())
+        .subcommand(
+            "getServiceInterface",
+            from_fn_async(get_service_interface).no_cli(),
+        )
     // TODO @DrBonez when we get the new api for 4.0
     // .subcommand("setDependencies",from_fn(set_dependencies))
     // .subcommand("embassyGetInterface",from_fn(embassy_get_interface))
@@ -144,6 +148,43 @@ pub fn service_effect_handler() -> ParentHandler {
     // .subcommand("reverseProxy",from_fn(reverse_pro)xy)
     // TODO Callbacks
 }
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[serde(rename_all = "camelCase")]
+struct GetServiceInterfaceParams {
+    package_id: Option<PackageId>,
+    service_interface_id: String,
+    callback: String,
+}
+async fn get_service_interface(
+    _: AnyContext,
+    GetServiceInterfaceParams {
+        callback,
+        package_id,
+        service_interface_id,
+    }: GetServiceInterfaceParams,
+) -> Result<Value, Error> {
+    // TODO @Dr_Bonez
+    Ok(json!({
+        "id": service_interface_id,
+        "name": service_interface_id,
+        "description": "This is a fake",
+        "hasPrimary": false,
+        "disabled": false,
+        "addressInfo": json!({
+            "username": Value::Null,
+            "hostId": "HostId?",
+            "options": json!({
+                "scheme": Value::Null,
+                "preferredExternalPort": 80,
+                "addSsl":Value::Null,
+                "secure": false,
+                "ssl": false
+            }),
+            "suffix": "http"
+        }),
+        "type": "ui"
+    }))
+}
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
 #[serde(rename_all = "camelCase")]
@@ -255,6 +296,7 @@ async fn get_store(
     let peeked = context.ctx.db.peek().await;
     let package_id = package_id.unwrap_or(context.id.clone());
     let value = peeked
+        .as_public()
         .as_package_data()
         .as_idx(&package_id)
         .or_not_found(&package_id)?
@@ -286,6 +328,7 @@ async fn set_store(
         .db
         .mutate(|db| {
             let model = db
+                .as_public_mut()
                 .as_package_data_mut()
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
@@ -317,7 +360,8 @@ async fn expose_for_dependents(
         .ctx
         .db
         .mutate(|db| {
-            db.as_package_data_mut()
+            db.as_public_mut()
+                .as_package_data_mut()
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
                 .as_installed_mut()
@@ -344,7 +388,8 @@ async fn expose_ui(
         .ctx
         .db
         .mutate(|db| {
-            db.as_package_data_mut()
+            db.as_public_mut()
+                .as_package_data_mut()
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
                 .as_installed_mut()
@@ -369,7 +414,11 @@ struct ParamsMaybePackageId {
 async fn exists(context: EffectContext, params: ParamsPackageId) -> Result<Value, Error> {
     let context = context.deref()?;
     let peeked = context.ctx.db.peek().await;
-    let package = peeked.as_package_data().as_idx(&params.package).is_some();
+    let package = peeked
+        .as_public()
+        .as_package_data()
+        .as_idx(&params.package)
+        .is_some();
     Ok(json!(package))
 }
 
@@ -408,6 +457,7 @@ async fn get_configured(context: EffectContext, _: Empty) -> Result<Value, Error
     let peeked = context.ctx.db.peek().await;
     let package_id = &context.id;
     let package = peeked
+        .as_public()
         .as_package_data()
         .as_idx(&package_id)
         .or_not_found(&package_id)?
@@ -424,6 +474,7 @@ async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result
     let peeked = context.ctx.db.peek().await;
     let package_id = params.package_id.unwrap_or_else(|| context.id.clone());
     let package = peeked
+        .as_public()
         .as_package_data()
         .as_idx(&package_id)
         .or_not_found(&package_id)?
@@ -439,6 +490,7 @@ async fn running(context: EffectContext, params: ParamsMaybePackageId) -> Result
     let peeked = context.ctx.db.peek().await;
     let package_id = params.package_id.unwrap_or_else(|| context.id.clone());
     let package = peeked
+        .as_public()
         .as_package_data()
         .as_idx(&package_id)
         .or_not_found(&package_id)?
@@ -489,7 +541,8 @@ async fn set_configured(context: EffectContext, params: SetConfigured) -> Result
         .ctx
         .db
         .mutate(|db| {
-            db.as_package_data_mut()
+            db.as_public_mut()
+                .as_package_data_mut()
                 .as_idx_mut(package_id)
                 .or_not_found(package_id)?
                 .as_installed_mut()
@@ -578,6 +631,7 @@ async fn set_health(context: EffectContext, params: SetHealth) -> Result<Value,
         .db
         .mutate(move |db| {
             let mut main = db
+                .as_public()
                 .as_package_data()
                 .as_idx(package_id)
                 .or_not_found(package_id)?
@@ -600,7 +654,8 @@ async fn set_health(context: EffectContext, params: SetHealth) -> Result<Value,
                 }
                 _ => return Ok(()),
             };
-            db.as_package_data_mut()
+            db.as_public_mut()
+                .as_package_data_mut()
                 .as_idx_mut(package_id)
                 .or_not_found(package_id)?
                 .as_installed_mut()
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 1fddbb8d1..7ac555aff 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -61,7 +61,7 @@ impl ServiceMap {
 
     #[instrument(skip_all)]
     pub async fn init(&self, ctx: &RpcContext) -> Result<(), Error> {
-        for id in ctx.db.peek().await.as_package_data().keys()? {
+        for id in ctx.db.peek().await.as_public().as_package_data().keys()? {
             if let Err(e) = self.load(ctx, &id, LoadDisposition::Retry).await {
                 tracing::error!("Error loading installed package as service: {e}");
                 tracing::debug!("{e:?}");
@@ -136,6 +136,7 @@ impl ServiceMap {
                 let install_progress = progress.snapshot();
                 move |db| {
                     let pde = match db
+                        .as_public()
                         .as_package_data()
                         .as_idx(&id)
                         .map(|x| x.de())
@@ -174,7 +175,9 @@ impl ServiceMap {
                             ))
                         }
                     };
-                    db.as_package_data_mut().insert(&manifest.id, &pde)
+                    db.as_public_mut()
+                        .as_package_data_mut()
+                        .insert(&manifest.id, &pde)
                 }
             }))
             .await?;
@@ -194,7 +197,8 @@ impl ServiceMap {
                         NonDetachingJoinHandle::from(tokio::spawn(progress.sync_to_db(
                             ctx.db.clone(),
                             move |v| {
-                                v.as_package_data_mut()
+                                v.as_public_mut()
+                                    .as_package_data_mut()
                                     .as_idx_mut(&deref_id)
                                     .and_then(|e| e.as_install_progress_mut())
                             },
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 0f47874e9..9c8d54db3 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -84,7 +84,8 @@ async fn setup_init(
         account.set_password(&password)?;
         account.save(secrets_tx.as_mut()).await?;
         db.mutate(|m| {
-            m.as_server_info_mut()
+            m.as_public_mut()
+                .as_server_info_mut()
                 .as_password_hash_mut()
                 .ser(&account.password)
         })
@@ -310,11 +311,6 @@ pub async fn execute(
     tokio::task::spawn({
         async move {
             let ctx = ctx.clone();
-            let recovery_source = recovery_source;
-
-            let embassy_password = embassy_password;
-            let recovery_source = recovery_source;
-            let recovery_password = recovery_password;
             match execute_inner(
                 ctx.clone(),
                 embassy_logicalname,
diff --git a/core/startos/src/shutdown.rs b/core/startos/src/shutdown.rs
index bd99bbbd1..f6a984897 100644
--- a/core/startos/src/shutdown.rs
+++ b/core/startos/src/shutdown.rs
@@ -78,7 +78,8 @@ impl Shutdown {
 pub async fn shutdown(ctx: RpcContext) -> Result<(), Error> {
     ctx.db
         .mutate(|db| {
-            db.as_server_info_mut()
+            db.as_public_mut()
+                .as_server_info_mut()
                 .as_status_info_mut()
                 .as_shutting_down_mut()
                 .ser(&true)
@@ -97,7 +98,8 @@ pub async fn shutdown(ctx: RpcContext) -> Result<(), Error> {
 pub async fn restart(ctx: RpcContext) -> Result<(), Error> {
     ctx.db
         .mutate(|db| {
-            db.as_server_info_mut()
+            db.as_public_mut()
+                .as_server_info_mut()
                 .as_status_info_mut()
                 .as_restarting_mut()
                 .ser(&true)
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index 5a5509da7..2525491f6 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -83,7 +83,7 @@ pub struct ZramParams {
 pub async fn zram(ctx: RpcContext, ZramParams { enable }: ZramParams) -> Result<(), Error> {
     let db = ctx.db.peek().await;
 
-    let zram = db.as_server_info().as_zram().de()?;
+    let zram = db.as_public().as_server_info().as_zram().de()?;
     if enable == zram {
         return Ok(());
     }
@@ -100,7 +100,10 @@ pub async fn zram(ctx: RpcContext, ZramParams { enable }: ZramParams) -> Result<
     }
     ctx.db
         .mutate(|v| {
-            v.as_server_info_mut().as_zram_mut().ser(&enable)?;
+            v.as_public_mut()
+                .as_server_info_mut()
+                .as_zram_mut()
+                .ser(&enable)?;
             Ok(())
         })
         .await?;
@@ -153,10 +156,22 @@ pub async fn governor(
         }
         set_governor(&set).await?;
         ctx.db
-            .mutate(|d| d.as_server_info_mut().as_governor_mut().ser(&Some(set)))
+            .mutate(|d| {
+                d.as_public_mut()
+                    .as_server_info_mut()
+                    .as_governor_mut()
+                    .ser(&Some(set))
+            })
             .await?;
     }
-    let current = ctx.db.peek().await.as_server_info().as_governor().de()?;
+    let current = ctx
+        .db
+        .peek()
+        .await
+        .as_public()
+        .as_server_info()
+        .as_governor()
+        .de()?;
     Ok(GovernorInfo { current, available })
 }
 
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index a1d9a8363..31693aba0 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -93,7 +93,7 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
         .await
         .with_kind(ErrorKind::Network)?
         .version;
-    let current_version = peeked.as_server_info().as_version().de()?;
+    let current_version = peeked.as_public().as_server_info().as_version().de()?;
     if latest_version < *current_version {
         return Ok(None);
     }
@@ -105,7 +105,7 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
     let status = ctx
         .db
         .mutate(|db| {
-            let mut status = peeked.as_server_info().as_status_info().de()?;
+            let mut status = peeked.as_public().as_server_info().as_status_info().de()?;
             if status.update_progress.is_some() {
                 return Err(Error::new(
                     eyre!("Server is already updating!"),
@@ -117,7 +117,10 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
                 size: None,
                 downloaded: 0,
             });
-            db.as_server_info_mut().as_status_info_mut().ser(&status)?;
+            db.as_public_mut()
+                .as_server_info_mut()
+                .as_status_info_mut()
+                .ser(&status)?;
             Ok(status)
         })
         .await?;
@@ -130,7 +133,8 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
         let res = do_update(ctx.clone(), eos_url).await;
         ctx.db
             .mutate(|db| {
-                db.as_server_info_mut()
+                db.as_public_mut()
+                    .as_server_info_mut()
                     .as_status_info_mut()
                     .as_update_progress_mut()
                     .ser(&None)
@@ -140,7 +144,8 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
             Ok(()) => {
                 ctx.db
                     .mutate(|db| {
-                        db.as_server_info_mut()
+                        db.as_public_mut()
+                            .as_server_info_mut()
                             .as_status_info_mut()
                             .as_updated_mut()
                             .ser(&true)
@@ -199,7 +204,8 @@ async fn do_update(ctx: RpcContext, eos_url: EosUrl) -> Result<(), Error> {
     while let Some(progress) = rsync.progress.next().await {
         ctx.db
             .mutate(|db| {
-                db.as_server_info_mut()
+                db.as_public_mut()
+                    .as_server_info_mut()
                     .as_status_info_mut()
                     .as_update_progress_mut()
                     .ser(&Some(UpdateProgress {
diff --git a/core/startos/src/util/actor.rs b/core/startos/src/util/actor.rs
index 89ee948e5..8e08a1d53 100644
--- a/core/startos/src/util/actor.rs
+++ b/core/startos/src/util/actor.rs
@@ -97,7 +97,7 @@ impl<A: Actor> SimpleActor<A> {
                         Some((msg, reply)) if shutdown_recv.try_recv() == Err(TryRecvError::Empty) => {
                             let mut new_bg = BackgroundJobs::default();
                             tokio::select! {
-                                res = msg.handle_with(&mut actor, &mut new_bg) => { reply.send(res); },
+                                res = msg.handle_with(&mut actor, &mut new_bg) => { let _ = reply.send(res); },
                                 _ = &mut bg => (),
                             }
                             bg.jobs.append(&mut new_bg.jobs);
@@ -129,7 +129,9 @@ impl<A: Actor> SimpleActor<A> {
             ))));
         }
         let (reply_send, reply_recv) = oneshot::channel();
-        self.messenger.send((Box::new(message), reply_send));
+        self.messenger
+            .send((Box::new(message), reply_send))
+            .unwrap();
         futures::future::Either::Right(
             reply_recv
                 .map_err(|_| Error::new(eyre!("actor runtime has exited"), ErrorKind::Unknown))
@@ -159,11 +161,11 @@ impl<A: Actor> SimpleActor<A> {
         drop(self.messenger);
         let timeout = match strategy {
             PendingMessageStrategy::CancelAll => {
-                self.shutdown.send(());
+                self.shutdown.send(()).unwrap();
                 Some(Duration::from_secs(0))
             }
             PendingMessageStrategy::FinishCurrentCancelPending { timeout } => {
-                self.shutdown.send(());
+                self.shutdown.send(()).unwrap();
                 timeout
             }
             PendingMessageStrategy::FinishAll { timeout } => timeout,
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 3e4f7c4a2..a2ef069ac 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -70,8 +70,12 @@ where
         let semver = self.semver().into();
         let compat = self.compat().clone();
         db.mutate(|d| {
-            d.as_server_info_mut().as_version_mut().ser(&semver)?;
-            d.as_server_info_mut()
+            d.as_public_mut()
+                .as_server_info_mut()
+                .as_version_mut()
+                .ser(&semver)?;
+            d.as_public_mut()
+                .as_server_info_mut()
                 .as_eos_version_compat_mut()
                 .ser(&compat)?;
             Ok(())
@@ -166,7 +170,14 @@ where
 }
 
 pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> {
-    let version = Version::from_util_version(db.peek().await.as_server_info().as_version().de()?);
+    let version = Version::from_util_version(
+        db.peek()
+            .await
+            .as_public()
+            .as_server_info()
+            .as_version()
+            .de()?,
+    );
 
     match version {
         Version::V0_3_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
diff --git a/core/startos/src/version/v0_3_4.rs b/core/startos/src/version/v0_3_4.rs
index e33dcb931..52a0d6960 100644
--- a/core/startos/src/version/v0_3_4.rs
+++ b/core/startos/src/version/v0_3_4.rs
@@ -56,20 +56,23 @@ impl VersionT for Version {
         let mut account = AccountInfo::load(secrets).await?;
         let account = db
             .mutate(|d| {
-                d.as_server_info_mut().as_pubkey_mut().ser(
+                d.as_public_mut().as_server_info_mut().as_pubkey_mut().ser(
                     &ssh_key::PublicKey::from(Ed25519PublicKey::from(&account.key.ssh_key()))
                         .to_openssh()?,
                 )?;
-                d.as_server_info_mut().as_ca_fingerprint_mut().ser(
-                    &account
-                        .root_ca_cert
-                        .digest(MessageDigest::sha256())
-                        .unwrap()
-                        .iter()
-                        .map(|x| format!("{x:X}"))
-                        .join(":"),
-                )?;
-                let server_info = d.as_server_info();
+                d.as_public_mut()
+                    .as_server_info_mut()
+                    .as_ca_fingerprint_mut()
+                    .ser(
+                        &account
+                            .root_ca_cert
+                            .digest(MessageDigest::sha256())
+                            .unwrap()
+                            .iter()
+                            .map(|x| format!("{x:X}"))
+                            .join(":"),
+                    )?;
+                let server_info = d.as_public_mut().as_server_info();
                 account.hostname = server_info.as_hostname().de().map(Hostname)?;
                 account.server_id = server_info.as_id().de()?;
 
@@ -81,15 +84,16 @@ impl VersionT for Version {
 
         let parsed_url = Some(COMMUNITY_URL.parse().unwrap());
         db.mutate(|d| {
-            let mut ui = d.as_ui().de()?;
+            let mut ui = d.as_public().as_ui().de()?;
             use imbl_value::json;
             ui["marketplace"]["known-hosts"][COMMUNITY_URL] = json!({});
             ui["marketplace"]["known-hosts"][MAIN_REGISTRY] = json!({});
-            for package_id in d.as_package_data().keys()? {
+            for package_id in d.as_public().as_package_data().keys()? {
                 if !COMMUNITY_SERVICES.contains(&&*package_id.to_string()) {
                     continue;
                 }
-                d.as_package_data_mut()
+                d.as_public_mut()
+                    .as_package_data_mut()
                     .as_idx_mut(&package_id)
                     .or_not_found(&package_id)?
                     .as_installed_mut()
@@ -100,19 +104,20 @@ impl VersionT for Version {
             ui["theme"] = json!("Dark".to_string());
             ui["widgets"] = json!([]);
 
-            d.as_ui_mut().ser(&ui)
+            d.as_public_mut().as_ui_mut().ser(&ui)
         })
         .await
     }
     async fn down(&self, db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
         db.mutate(|d| {
-            let mut ui = d.as_ui().de()?;
+            let mut ui = d.as_public().as_ui().de()?;
             let parsed_url = Some(MAIN_REGISTRY.parse().unwrap());
-            for package_id in d.as_package_data().keys()? {
+            for package_id in d.as_public().as_package_data().keys()? {
                 if !COMMUNITY_SERVICES.contains(&&*package_id.to_string()) {
                     continue;
                 }
-                d.as_package_data_mut()
+                d.as_public_mut()
+                    .as_package_data_mut()
                     .as_idx_mut(&package_id)
                     .or_not_found(&package_id)?
                     .as_installed_mut()
@@ -128,7 +133,7 @@ impl VersionT for Version {
 
             ui["marketplace"]["known-hosts"][COMMUNITY_URL].take();
             ui["marketplace"]["known-hosts"][MAIN_REGISTRY].take();
-            d.as_ui_mut().ser(&ui)
+            d.as_public_mut().as_ui_mut().ser(&ui)
         })
         .await
     }
diff --git a/core/startos/src/version/v0_3_4_4.rs b/core/startos/src/version/v0_3_4_4.rs
index b6345ca4c..686c00826 100644
--- a/core/startos/src/version/v0_3_4_4.rs
+++ b/core/startos/src/version/v0_3_4_4.rs
@@ -26,7 +26,7 @@ impl VersionT for Version {
     }
     async fn up(&self, db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
         db.mutate(|v| {
-            let tor_address_lens = v.as_server_info_mut().as_tor_address_mut();
+            let tor_address_lens = v.as_public_mut().as_server_info_mut().as_tor_address_mut();
             let mut tor_addr = tor_address_lens.de()?;
             tor_addr
                 .set_scheme("https")
diff --git a/core/startos/src/version/v0_3_5.rs b/core/startos/src/version/v0_3_5.rs
index ba28cd468..485ec5f81 100644
--- a/core/startos/src/version/v0_3_5.rs
+++ b/core/startos/src/version/v0_3_5.rs
@@ -30,7 +30,7 @@ impl VersionT for Version {
     async fn up(&self, db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
         let peek = db.peek().await;
         let mut url_replacements = BTreeMap::new();
-        for (_, pde) in peek.as_package_data().as_entries()? {
+        for (_, pde) in peek.as_public().as_package_data().as_entries()? {
             for (dependency, info) in pde
                 .as_installed()
                 .map(|i| i.as_dependency_info().as_entries())
@@ -63,7 +63,7 @@ impl VersionT for Version {
         }
         let prev_zram = db
             .mutate(|v| {
-                for (_, pde) in v.as_package_data_mut().as_entries_mut()? {
+                for (_, pde) in v.as_public_mut().as_package_data_mut().as_entries_mut()? {
                     for (dependency, info) in pde
                         .as_installed_mut()
                         .map(|i| i.as_dependency_info_mut().as_entries_mut())
@@ -95,7 +95,10 @@ impl VersionT for Version {
                         }
                     }
                 }
-                v.as_server_info_mut().as_zram_mut().replace(&true)
+                v.as_public_mut()
+                    .as_server_info_mut()
+                    .as_zram_mut()
+                    .replace(&true)
             })
             .await?;
         if !prev_zram {
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index 47d1ffc34..f8c46c71e 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -3,17 +3,15 @@ use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 
 pub use helpers::script_dir;
-use models::PackageId;
 pub use models::VolumeId;
+use models::{HostId, PackageId};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
 use crate::context::RpcContext;
-use crate::net::interface::{InterfaceId, Interfaces};
 use crate::net::PACKAGE_CERT_PATH;
 use crate::prelude::*;
 use crate::util::Version;
-use crate::{Error, ResultExt};
 
 pub const PKG_VOLUME_DIR: &str = "package-data/volumes";
 pub const BACKUP_DIR: &str = "/media/embassy/backups";
@@ -21,21 +19,6 @@ pub const BACKUP_DIR: &str = "/media/embassy/backups";
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Volumes(BTreeMap<VolumeId, Volume>);
 impl Volumes {
-    #[instrument(skip_all)]
-    pub fn validate(&self, interfaces: &Interfaces) -> Result<(), Error> {
-        for (id, volume) in &self.0 {
-            volume
-                .validate(interfaces)
-                .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, format!("Volume {}", id)))?;
-            if let Volume::Backup { .. } = volume {
-                return Err(Error::new(
-                    eyre!("Invalid volume type \"backup\""),
-                    ErrorKind::ParseS9pk,
-                )); // Volume::Backup is for internal use and shouldn't be declared in manifest
-            }
-        }
-        Ok(())
-    }
     #[instrument(skip_all)]
     pub async fn install(
         &self,
@@ -112,8 +95,8 @@ pub fn backup_dir(pkg_id: &PackageId) -> PathBuf {
     Path::new(BACKUP_DIR).join(pkg_id).join("data")
 }
 
-pub fn cert_dir(pkg_id: &PackageId, interface_id: &InterfaceId) -> PathBuf {
-    Path::new(PACKAGE_CERT_PATH).join(pkg_id).join(interface_id)
+pub fn cert_dir(pkg_id: &PackageId, host_id: &HostId) -> PathBuf {
+    Path::new(PACKAGE_CERT_PATH).join(pkg_id).join(host_id)
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -135,23 +118,11 @@ pub enum Volume {
         readonly: bool,
     },
     #[serde(rename_all = "kebab-case")]
-    Certificate { interface_id: InterfaceId },
+    Certificate { interface_id: HostId },
     #[serde(rename_all = "kebab-case")]
     Backup { readonly: bool },
 }
 impl Volume {
-    #[instrument(skip_all)]
-    pub fn validate(&self, interfaces: &Interfaces) -> Result<(), color_eyre::eyre::Report> {
-        match self {
-            Volume::Certificate { interface_id } => {
-                if !interfaces.0.contains_key(interface_id) {
-                    color_eyre::eyre::bail!("unknown interface: {}", interface_id);
-                }
-            }
-            _ => (),
-        }
-        Ok(())
-    }
     pub async fn install(
         &self,
         path: &PathBuf,
diff --git a/patch-db b/patch-db
index 7096f15e9..899c63afb 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 7096f15e9b218f59b8ded1fd1133c70b82de74c5
+Subproject commit 899c63afb5367c66bca6cafb98164d8cbd78f7e3
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index e767bd18b..80368fe51 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -35,6 +35,11 @@ const knownProtocols = {
     ssl: false,
     defaultPort: 8333,
   },
+  lightning: {
+    secure: true,
+    ssl: true,
+    defaultPort: 9735,
+  },
   grpc: {
     secure: true,
     ssl: true,
@@ -47,11 +52,11 @@ const knownProtocols = {
   },
 } as const
 
-type Scheme = string | null
+export type Scheme = string | null
 
 type AddSslOptions = {
-  preferredExternalPort: number
   scheme: Scheme
+  preferredExternalPort: number
   addXForwardedHeaders?: boolean /** default: false */
 }
 type Security = { secure: false; ssl: false } | { secure: true; ssl: boolean }
@@ -73,7 +78,7 @@ type NotProtocolsWithSslVariants = Exclude<
   ProtocolsWithSslVariants
 >
 
-type PortOptionsByKnownProtocol =
+type BindOptionsByKnownProtocol =
   | ({
       protocol: ProtocolsWithSslVariants
       preferredExternalPort?: number
@@ -85,7 +90,7 @@ type PortOptionsByKnownProtocol =
       scheme?: Scheme
       addSsl?: AddSslOptions | null
     }
-type PortOptionsByProtocol = PortOptionsByKnownProtocol | BindOptions
+type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions
 
 export type HostKind = "static" | "single" | "multi"
 
@@ -104,7 +109,7 @@ export class Host {
 
   async bindPort(
     internalPort: number,
-    options: PortOptionsByProtocol,
+    options: BindOptionsByProtocol,
   ): Promise<Origin<this>> {
     if (hasStringProtocol(options)) {
       return await this.bindPortForKnown(options, internalPort)
@@ -138,7 +143,7 @@ export class Host {
   }
 
   private async bindPortForKnown(
-    options: PortOptionsByKnownProtocol,
+    options: BindOptionsByKnownProtocol,
     internalPort: number,
   ) {
     const scheme =
@@ -174,7 +179,7 @@ export class Host {
   }
 
   private getAddSsl(
-    options: PortOptionsByKnownProtocol,
+    options: BindOptionsByKnownProtocol,
     protoInfo: KnownProtocols[keyof KnownProtocols],
   ): AddSslOptions | null {
     if ("noAddSsl" in options && options.noAddSsl) return null
diff --git a/sdk/lib/interfaces/Origin.ts b/sdk/lib/interfaces/Origin.ts
index 053e76ae8..aaadbea50 100644
--- a/sdk/lib/interfaces/Origin.ts
+++ b/sdk/lib/interfaces/Origin.ts
@@ -1,5 +1,7 @@
 import { AddressInfo } from "../types"
-import { Host, BindOptions } from "./Host"
+import { AddressReceipt } from "./AddressReceipt"
+import { Host, BindOptions, Scheme } from "./Host"
+import { ServiceInterfaceBuilder } from "./ServiceInterfaceBuilder"
 
 export class Origin<T extends Host> {
   constructor(
@@ -7,7 +9,7 @@ export class Origin<T extends Host> {
     readonly options: BindOptions,
   ) {}
 
-  build({ username, path, search }: BuildOptions): AddressInfo {
+  build({ username, path, search, schemeOverride }: BuildOptions): AddressInfo {
     const qpEntries = Object.entries(search)
       .map(
         ([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`,
@@ -18,15 +20,77 @@ export class Origin<T extends Host> {
 
     return {
       hostId: this.host.options.id,
-      options: this.options,
+      bindOptions: {
+        ...this.options,
+        scheme: schemeOverride ? schemeOverride.noSsl : this.options.scheme,
+        addSsl: this.options.addSsl
+          ? {
+              ...this.options.addSsl,
+              scheme: schemeOverride
+                ? schemeOverride.ssl
+                : this.options.addSsl.scheme,
+            }
+          : null,
+      },
       suffix: `${path}${qp}`,
       username,
     }
   }
+
+  /**
+   * A function to register a group of origins (<PROTOCOL> :// <HOSTNAME> : <PORT>) with StartOS
+   *
+   * The returned addressReceipt serves as proof that the addresses were registered
+   *
+   * @param addressInfo
+   * @returns
+   */
+  async export(
+    serviceInterfaces: ServiceInterfaceBuilder[],
+  ): Promise<AddressInfo[] & AddressReceipt> {
+    const addressesInfo = []
+    for (let serviceInterface of serviceInterfaces) {
+      const {
+        name,
+        description,
+        hasPrimary,
+        disabled,
+        id,
+        type,
+        username,
+        path,
+        search,
+        schemeOverride,
+        masked,
+      } = serviceInterface.options
+
+      const addressInfo = this.build({
+        username,
+        path,
+        search,
+        schemeOverride,
+      })
+
+      await serviceInterface.options.effects.exportServiceInterface({
+        id,
+        name,
+        description,
+        hasPrimary,
+        disabled,
+        addressInfo,
+        type,
+        masked,
+      })
+
+      addressesInfo.push(addressInfo)
+    }
+
+    return addressesInfo as AddressInfo[] & AddressReceipt
+  }
 }
 
 type BuildOptions = {
-  scheme: string | null
+  schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
   username: string | null
   path: string
   search: Record<string, string>
diff --git a/sdk/lib/interfaces/ServiceInterfaceBuilder.ts b/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
index 241cf52dc..c7b99b2d5 100644
--- a/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
+++ b/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
@@ -1,8 +1,6 @@
-import { AddressInfo, Effects } from "../types"
+import { Effects } from "../types"
 import { ServiceInterfaceType } from "../util/utils"
-import { AddressReceipt } from "./AddressReceipt"
-import { Host } from "./Host"
-import { Origin } from "./Origin"
+import { Scheme } from "./Host"
 
 /**
  * A helper class for creating a Network Interface
@@ -25,47 +23,11 @@ export class ServiceInterfaceBuilder {
       hasPrimary: boolean
       disabled: boolean
       type: ServiceInterfaceType
-      username: null | string
+      username: string | null
       path: string
       search: Record<string, string>
+      schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
+      masked: boolean
     },
   ) {}
-
-  /**
-   * A function to register a group of origins (<PROTOCOL> :// <HOSTNAME> : <PORT>) with StartOS
-   *
-   * The returned addressReceipt serves as proof that the addresses were registered
-   *
-   * @param addressInfo
-   * @returns
-   */
-  async export<OriginForHost extends Origin<Host>>(
-    origin: OriginForHost,
-  ): Promise<AddressInfo & AddressReceipt> {
-    const {
-      name,
-      description,
-      hasPrimary,
-      disabled,
-      id,
-      type,
-      username,
-      path,
-      search,
-    } = this.options
-
-    const addressInfo = origin.build({ username, path, search, scheme: null })
-
-    await this.options.effects.exportServiceInterface({
-      id,
-      name,
-      description,
-      hasPrimary,
-      disabled,
-      addressInfo,
-      type,
-    })
-
-    return addressInfo as AddressInfo & AddressReceipt
-  }
 }
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
index 880a8f1a1..d891bd52c 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/lib/test/host.test.ts
@@ -19,9 +19,11 @@ describe("host", () => {
         username: "bar",
         path: "/baz",
         search: { qux: "yes" },
+        schemeOverride: null,
+        masked: false,
       })
 
-      await fooInterface.export([fooOrigin])
+      await fooOrigin.export([fooInterface])
     }
   })
 })
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index de03e34b2..e0bc4a259 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -1,7 +1,7 @@
 export * as configTypes from "./config/configTypes"
 import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
-import { HostKind, BindOptions } from "./interfaces/Host"
+import { BindOptions } from "./interfaces/Host"
 import { Daemons } from "./mainFn/Daemons"
 import { UrlString } from "./util/getServiceInterface"
 import { ServiceInterfaceType, Signals } from "./util/utils"
@@ -10,7 +10,7 @@ export type ExportedAction = (options: {
   effects: Effects
   input?: Record<string, unknown>
 }) => Promise<ActionResult>
-export type MaybePromise<A> = A | Promise<A>
+export type MaybePromise<A> = Promise<A> | A
 export namespace ExpectedExports {
   version: 1
   /** Set configuration is called after we have modified and saved the configuration in the start9 ui. Use this to make a file for the docker to read from for configuration.  */
@@ -164,19 +164,21 @@ export type ActionMetadata = {
   group?: string
 }
 export declare const hostName: unique symbol
+// asdflkjadsf.onion | 1.2.3.4
 export type Hostname = string & { [hostName]: never }
 
 /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
 export type AddressInfo = {
   username: string | null
   hostId: string
-  options: BindOptions
+  bindOptions: BindOptions
   suffix: string
 }
 
 export type HostnameInfoIp = {
   kind: "ip"
   networkInterfaceId: string
+  public: boolean
   hostname:
     | {
         kind: "ipv4" | "ipv6" | "local"
@@ -201,11 +203,13 @@ export type HostnameInfoOnion = {
 export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion
 
 export type SingleHost = {
+  id: string
   kind: "single" | "static"
   hostname: HostnameInfo | null
 }
 
 export type MultiHost = {
+  id: string
   kind: "multi"
   hostnames: HostnameInfo[]
 }
@@ -224,11 +228,18 @@ export type ServiceInterface = {
   hasPrimary: boolean
   /** Disabled interfaces do not serve, but they retain their metadata and addresses */
   disabled: boolean
+  /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
+  masked: boolean
   /** URI Information */
   addressInfo: AddressInfo
   /** The network interface could be several types, something like ui, p2p, or network */
   type: ServiceInterfaceType
 }
+
+export type ServiceInterfaceWithHostInfo = ServiceInterface & {
+  hostInfo: HostInfo
+}
+
 // prettier-ignore
 export type ExposeAllServicePaths<Store, PreviousPath extends string = ""> = 
   Store extends Record<string, unknown> ? {[K in keyof Store & string]: ExposeAllServicePaths<Store[K], `${PreviousPath}/${K & string}`>}[keyof Store & string] :
@@ -278,18 +289,18 @@ export type Effects = {
     } & BindOptions,
   ): Promise<void>
   /** Retrieves the current hostname(s) associated with a host id */
-  getHostnames(options: {
+  getHostInfo(options: {
     kind: "static" | "single"
-    hostId: string
+    serviceInterfaceId: string
     packageId?: string
     callback: () => void
-  }): Promise<[] | [Hostname]>
-  getHostnames(options: {
+  }): Promise<SingleHost>
+  getHostInfo(options: {
     kind?: "multi"
+    serviceInterfaceId: string
     packageId?: string
-    hostId: string
     callback: () => void
-  }): Promise<Hostname[]>
+  }): Promise<MultiHost>
 
   // /**
   //  * Run rsync between two volumes. This is used to backup data between volumes.
@@ -329,13 +340,6 @@ export type Effects = {
     callback: (config: unknown, previousConfig: unknown) => void
   }): Promise<SmtpValue>
 
-  getLocalHostname(): Promise<string>
-  getIPHostname(): Promise<string[]>
-  /** Get the address for another service for tor interfaces */
-  getServiceTorHostname(
-    serviceInterfaceId: ServiceInterfaceId,
-    packageId?: string,
-  ): Promise<string>
   /** Get the IP address of the container */
   getContainerIp(): Promise<string>
   /**
@@ -419,14 +423,16 @@ export type Effects = {
    * @returns  PEM encoded fullchain (ecdsa)
    */
   getSslCertificate: (
-    packageId?: string,
+    packageId: string | null,
+    hostId: string,
     algorithm?: "ecdsa" | "ed25519",
   ) => Promise<[string, string, string]>
   /**
    * @returns PEM encoded ssl key (ecdsa)
    */
   getSslKey: (
-    packageId?: string,
+    packageId: string | null,
+    hostId: string,
     algorithm?: "ecdsa" | "ed25519",
   ) => Promise<string>
 
diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index 69083c66f..6f03e75e5 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -1,4 +1,11 @@
-import { AddressInfo, Effects, Hostname, ServiceInterface } from "../types"
+import {
+  AddressInfo,
+  Effects,
+  HostInfo,
+  Hostname,
+  HostnameInfo,
+  ServiceInterface,
+} from "../types"
 import * as regexes from "./regexes"
 import { ServiceInterfaceType } from "./utils"
 
@@ -22,7 +29,6 @@ export type Filled = {
   ipv4Hostnames: Hostname[]
   ipv6Hostnames: Hostname[]
   nonIpHostnames: Hostname[]
-  allHostnames: Hostname[]
 
   urls: UrlString[]
   onionUrls: UrlString[]
@@ -31,7 +37,6 @@ export type Filled = {
   ipv4Urls: UrlString[]
   ipv6Urls: UrlString[]
   nonIpUrls: UrlString[]
-  allUrls: UrlString[]
 }
 export type FilledAddressInfo = AddressInfo & Filled
 export type ServiceInterfaceFilled = {
@@ -44,6 +49,10 @@ export type ServiceInterfaceFilled = {
   hasPrimary: boolean
   /** Whether or not the interface disabled */
   disabled: boolean
+  /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
+  masked: boolean
+  /** Information about the host for this binding */
+  hostInfo: HostInfo
   /** URI information */
   addressInfo: FilledAddressInfo
   /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
@@ -62,75 +71,110 @@ const negate =
   (a: A) =>
     !fn(a)
 const unique = <A>(values: A[]) => Array.from(new Set(values))
+function stringifyHostname(info: HostnameInfo): Hostname {
+  let base: string
+  if ("kind" in info.hostname && info.hostname.kind === "domain") {
+    base = info.hostname.subdomain
+      ? `${info.hostname.subdomain}.${info.hostname.domain}`
+      : info.hostname.domain
+  } else {
+    base = info.hostname.value
+  }
+  if (info.hostname.port && info.hostname.sslPort) {
+    return `${base}:${info.hostname.port}` as Hostname
+  } else if (info.hostname.sslPort) {
+    return `${base}:${info.hostname.sslPort}` as Hostname
+  } else if (info.hostname.port) {
+    return `${base}:${info.hostname.port}` as Hostname
+  }
+  return base as Hostname
+}
 const addressHostToUrl = (
-  { options, username, suffix }: AddressInfo,
+  { bindOptions, username, suffix }: AddressInfo,
   host: Hostname,
 ): UrlString => {
   const scheme = host.endsWith(".onion")
-    ? options.scheme
-    : options.addSsl
-      ? options.addSsl.scheme
-      : options.scheme // TODO: encode whether hostname transport is "secure"?
+    ? bindOptions.scheme
+    : bindOptions.addSsl
+      ? bindOptions.addSsl.scheme
+      : bindOptions.scheme // TODO: encode whether hostname transport is "secure"?
   return `${scheme ? `${scheme}//` : ""}${
     username ? `${username}@` : ""
   }${host}${suffix}`
 }
 export const filledAddress = (
-  hostnames: Hostname[],
+  hostInfo: HostInfo,
   addressInfo: AddressInfo,
 ): FilledAddressInfo => {
   const toUrl = addressHostToUrl.bind(null, addressInfo)
+  const hostnameInfo =
+    hostInfo.kind == "multi"
+      ? hostInfo.hostnames
+      : hostInfo.hostname
+        ? [hostInfo.hostname]
+        : []
   return {
     ...addressInfo,
-    hostnames,
+    hostnames: hostnameInfo.flatMap((h) => stringifyHostname(h)),
     get onionHostnames() {
-      return hostnames.filter(regexes.torHostname.test)
+      return hostnameInfo
+        .filter((h) => h.kind === "onion")
+        .map((h) => stringifyHostname(h))
     },
     get localHostnames() {
-      return hostnames.filter(regexes.localHostname.test)
+      return hostnameInfo
+        .filter((h) => h.kind === "ip" && h.hostname.kind === "local")
+        .map((h) => stringifyHostname(h))
     },
     get ipHostnames() {
-      return hostnames.filter(either(regexes.ipv4.test, regexes.ipv6.test))
+      return hostnameInfo
+        .filter(
+          (h) =>
+            h.kind === "ip" &&
+            (h.hostname.kind === "ipv4" || h.hostname.kind === "ipv6"),
+        )
+        .map((h) => stringifyHostname(h))
     },
     get ipv4Hostnames() {
-      return hostnames.filter(regexes.ipv4.test)
+      return hostnameInfo
+        .filter((h) => h.kind === "ip" && h.hostname.kind === "ipv4")
+        .map((h) => stringifyHostname(h))
     },
     get ipv6Hostnames() {
-      return hostnames.filter(regexes.ipv6.test)
+      return hostnameInfo
+        .filter((h) => h.kind === "ip" && h.hostname.kind === "ipv6")
+        .map((h) => stringifyHostname(h))
     },
     get nonIpHostnames() {
-      return hostnames.filter(
-        negate(either(regexes.ipv4.test, regexes.ipv6.test)),
-      )
+      return hostnameInfo
+        .filter(
+          (h) =>
+            h.kind === "ip" &&
+            h.hostname.kind !== "ipv4" &&
+            h.hostname.kind !== "ipv6",
+        )
+        .map((h) => stringifyHostname(h))
     },
-    allHostnames: hostnames,
     get urls() {
-      return hostnames.map(toUrl)
+      return this.hostnames.map(toUrl)
     },
     get onionUrls() {
-      return hostnames.filter(regexes.torHostname.test).map(toUrl)
+      return this.onionHostnames.map(toUrl)
     },
     get localUrls() {
-      return hostnames.filter(regexes.localHostname.test).map(toUrl)
+      return this.localHostnames.map(toUrl)
     },
     get ipUrls() {
-      return hostnames
-        .filter(either(regexes.ipv4.test, regexes.ipv6.test))
-        .map(toUrl)
+      return this.ipHostnames.map(toUrl)
     },
     get ipv4Urls() {
-      return hostnames.filter(regexes.ipv4.test).map(toUrl)
+      return this.ipv4Hostnames.map(toUrl)
     },
     get ipv6Urls() {
-      return hostnames.filter(regexes.ipv6.test).map(toUrl)
+      return this.ipv6Hostnames.map(toUrl)
     },
     get nonIpUrls() {
-      return hostnames
-        .filter(negate(either(regexes.ipv4.test, regexes.ipv6.test)))
-        .map(toUrl)
-    },
-    get allUrls() {
-      return hostnames.map(toUrl)
+      return this.nonIpHostnames.map(toUrl)
     },
   }
 }
@@ -151,9 +195,9 @@ const makeInterfaceFilled = async ({
     packageId,
     callback,
   })
-  const hostIdRecord = await effects.getHostnames({
+  const hostInfo = await effects.getHostInfo({
     packageId,
-    hostId: serviceInterfaceValue.addressInfo.hostId,
+    serviceInterfaceId: serviceInterfaceValue.id,
     callback,
   })
   const primaryUrl = await effects.getPrimaryUrl({
@@ -165,7 +209,8 @@ const makeInterfaceFilled = async ({
   const interfaceFilled: ServiceInterfaceFilled = {
     ...serviceInterfaceValue,
     primaryUrl: primaryUrl,
-    addressInfo: filledAddress(hostIdRecord, serviceInterfaceValue.addressInfo),
+    hostInfo,
+    addressInfo: filledAddress(hostInfo, serviceInterfaceValue.addressInfo),
     get primaryHostname() {
       if (primaryUrl == null) return null
       return getHostname(primaryUrl)
diff --git a/sdk/lib/util/getServiceInterfaces.ts b/sdk/lib/util/getServiceInterfaces.ts
index 9c45fd002..176918bb3 100644
--- a/sdk/lib/util/getServiceInterfaces.ts
+++ b/sdk/lib/util/getServiceInterfaces.ts
@@ -20,19 +20,13 @@ const makeManyInterfaceFilled = async ({
   })
   const hostIdsRecord = Object.fromEntries(
     await Promise.all(
-      Array.from(
-        new Set(
-          serviceInterfaceValues
-            .flatMap((x) => x.addressInfo)
-            .map((x) => x.hostId),
-        ),
-      ).map(
-        async (hostId) =>
+      Array.from(new Set(serviceInterfaceValues.map((x) => x.id))).map(
+        async (id) =>
           [
-            hostId,
-            await effects.getHostnames({
+            id,
+            await effects.getHostInfo({
               packageId,
-              hostId,
+              serviceInterfaceId: id,
               callback,
             }),
           ] as const,
@@ -42,9 +36,9 @@ const makeManyInterfaceFilled = async ({
 
   const serviceInterfacesFilled: ServiceInterfaceFilled[] = await Promise.all(
     serviceInterfaceValues.map(async (serviceInterfaceValue) => {
-      const hostIdRecord = await effects.getHostnames({
+      const hostInfo = await effects.getHostInfo({
         packageId,
-        hostId: serviceInterfaceValue.addressInfo.hostId,
+        serviceInterfaceId: serviceInterfaceValue.id,
         callback,
       })
       const primaryUrl = await effects.getPrimaryUrl({
@@ -55,10 +49,8 @@ const makeManyInterfaceFilled = async ({
       return {
         ...serviceInterfaceValue,
         primaryUrl: primaryUrl,
-        addressInfo: filledAddress(
-          hostIdRecord,
-          serviceInterfaceValue.addressInfo,
-        ),
+        hostInfo,
+        addressInfo: filledAddress(hostInfo, serviceInterfaceValue.addressInfo),
         get primaryHostname() {
           if (primaryUrl == null) return null
           return getHostname(primaryUrl)
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index 8f28191e4..af6ae89cb 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -25,7 +25,7 @@ import {
   NamedPath,
   Path,
 } from "../dependency/setupDependencyMounts"
-import { MultiHost, SingleHost, StaticHost } from "../interfaces/Host"
+import { MultiHost, Scheme, SingleHost, StaticHost } from "../interfaces/Host"
 import { ServiceInterfaceBuilder } from "../interfaces/ServiceInterfaceBuilder"
 import { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
 import {
@@ -83,6 +83,8 @@ export type Utils<
     username: null | string
     path: string
     search: Record<string, string>
+    schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
+    masked: boolean
   }) => ServiceInterfaceBuilder
   getSystemSmtp: () => GetSystemSmtp & WrapperOverWrite
   host: {
@@ -158,6 +160,8 @@ export const createUtils = <
       username: null | string
       path: string
       search: Record<string, string>
+      schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
+      masked: boolean
     }) => new ServiceInterfaceBuilder({ ...options, effects }),
     childProcess,
     getSystemSmtp: () =>

From 39964bf0773da0fce4b1bc351642bde9247ca027 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 22 Feb 2024 15:37:11 -0700
Subject: [PATCH 021/341] Feature/lxc container runtime (#2563)

* wip: context

* wip(fix) Sorta auth

* wip: warnings

* wip(fix): registry/admin

* wip(fix) marketplace

* wip(fix) Some more converted and fixed with the linter and config

* wip: Working on the static server

* wip(fix)static server

* wip: Remove some asynnc

* wip: Something about the request and regular rpc

* wip: gut install

Co-authored-by: J H <Blu-J@users.noreply.github.com>

* wip: Convert the static server into the new system

* wip delete file

* test

* wip(fix) vhost does not need the with safe defaults

* wip: Adding in the wifi

* wip: Fix the developer and the verify

* wip: new install flow

Co-authored-by: J H <Blu-J@users.noreply.github.com>

* fix middleware

* wip

* wip: Fix the auth

* wip

* continue service refactor

* feature: Service get_config

* feat: Action

* wip: Fighting the great fight against the borrow checker

* wip: Remove an error in a file that I just need to deel with later

* chore: Add in some more lifetime stuff to the services

* wip: Install fix on lifetime

* cleanup

* wip: Deal with the borrow later

* more cleanup

* resolve borrowchecker errors

* wip(feat): add in the handler for the socket, for now

* wip(feat): Update the service_effect_handler::action

* chore: Add in the changes to make sure the from_service goes to context

* chore: Change the

* refactor service map

* fix references to service map

* fill out restore

* wip: Before I work on the store stuff

* fix backup module

* handle some warnings

* feat: add in the ui components on the rust side

* feature: Update the procedures

* chore: Update the js side of the main and a few of the others

* chore: Update the rpc listener to match the persistant container

* wip: Working on updating some things to have a better name

* wip(feat): Try and get the rpc to return the correct shape?

* lxc wip

* wip(feat): Try and get the rpc to return the correct shape?

* build for container runtime wip

* remove container-init

* fix build

* fix error

* chore: Update to work I suppose

* lxc wip

* remove docker module and feature

* download alpine squashfs automatically

* overlays effect

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* chore: Add the overlay effect

* feat: Add the mounter in the main

* chore: Convert to use the mounts, still need to work with the sandbox

* install fixes

* fix ssl

* fixes from testing

* implement tmpfile for upload

* wip

* misc fixes

* cleanup

* cleanup

* better progress reporting

* progress for sideload

* return real guid

* add devmode script

* fix lxc rootfs path

* fix percentage bar

* fix progress bar styling

* fix build for unstable

* tweaks

* label progress

* tweaks

* update progress more often

* make symlink in rpc_client

* make socket dir

* fix parent path

* add start-cli to container

* add echo and gitInfo commands

* wip: Add the init + errors

* chore: Add in the exit effect for the system

* chore: Change the type to null for failure to parse

* move sigterm timeout to stopping status

* update order

* chore: Update the return type

* remove dbg

* change the map error

* chore: Update the thing to capture id

* chore add some life changes

* chore: Update the loging

* chore: Update the package to run module

* us From for RpcError

* chore: Update to use import instead

* chore: update

* chore: Use require for the backup

* fix a default

* update the type that is wrong

* chore: Update the type of the manifest

* chore: Update to make null

* only symlink if not exists

* get rid of double result

* better debug info for ErrorCollection

* chore: Update effects

* chore: fix

* mount assets and volumes

* add exec instead of spawn

* fix mounting in image

* fix overlay mounts

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* misc fixes

* feat: Fix two

* fix: systemForEmbassy main

* chore: Fix small part of main loop

* chore: Modify the bundle

* merge

* fixMain loop"

* move tsc to makefile

* chore: Update the return types of the health check

* fix client

* chore: Convert the todo to use tsmatches

* add in the fixes for the seen and create the hack to allow demo

* chore: Update to include the systemForStartOs

* chore UPdate to the latest types from the expected outout

* fixes

* fix typo

* Don't emit if failure on tsc

* wip

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* add s9pk api

* add inspection

* add inspect manifest

* newline after display serializable

* fix squashfs in image name

* edit manifest

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* wait for response on repl

* ignore sig for now

* ignore sig for now

* re-enable sig verification

* fix

* wip

* env and chroot

* add profiling logs

* set uid & gid in squashfs to 100000

* set uid of sqfs to 100000

* fix mksquashfs args

* add env to compat

* fix

* re-add docker feature flag

* fix docker output format being stupid

* here be dragons

* chore: Add in the cross compiling for something

* fix npm link

* extract logs from container on exit

* chore: Update for testing

* add log capture to drop trait

* chore: add in the modifications that I make

* chore: Update small things for no updates

* chore: Update the types of something

* chore: Make main not complain

* idmapped mounts

* idmapped volumes

* re-enable kiosk

* chore: Add in some logging for the new system

* bring in start-sdk

* remove avahi

* chore: Update the deps

* switch to musl

* chore: Update the version of prettier

* chore: Organize'

* chore: Update some of the headers back to the standard of fetch

* fix musl build

* fix idmapped mounts

* fix cross build

* use cross compiler for correct arch

* feat: Add in the faked ssl stuff for the effects

* @dr_bonez Did a solution here

* chore: Something that DrBonez

* chore: up

* wip: We have a working server!!!

* wip

* uninstall

* wip

* tes

* misc fixes

* fix cli

* replace interface with host

* chore: Fix the types in some ts files

* chore: quick update for the system for embassy to update the types

* replace br-start9 with lxcbr0

* split patchdb into public/private

* chore: Add changes for config set

* Feat: Adding some debugging for the errors

* wip: Working on getting the set config to work

* chore: Update and fix the small issue with the deserialization

* lightning, masked, schemeOverride, invert host-iface relationship

* feat: Add in the changes for just the sdk

* feat: Add in the changes for the new effects I suppose for now

* Some small changes ????

---------

Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com>
Co-authored-by: J H <Blu-J@users.noreply.github.com>
Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: Matt Hill <mattnine@protonmail.com>
---
 .../src/Adapters/Systems/SystemForEmbassy/index.ts | 14 +++++++++-----
 core/startos/src/service/service_effect_handler.rs |  5 +++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index d96f826d7..f984bb489 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -907,18 +907,22 @@ async function updateConfig(
       mutConfigValue[key] = configValue
     }
     if (matchPointerPackage.test(specValue)) {
+      if (specValue.target === "tor-key")
+        throw new Error("This service uses an unsupported target TorKey")
       const filled = await utils.serviceInterface
         .get({
           packageId: specValue["package-id"],
           id: specValue.interface,
         })
         .once()
-      if (specValue.target === "tor-key")
-        throw new Error("This service uses an unsupported target TorKey")
+        .catch(() => null)
+
       mutConfigValue[key] =
-        specValue.target === "lan-address"
-          ? filled.addressInfo.localHostnames[0]
-          : filled.addressInfo.onionHostnames[0]
+        filled === null
+          ? ""
+          : specValue.target === "lan-address"
+            ? filled.addressInfo.localHostnames[0]
+            : filled.addressInfo.onionHostnames[0]
     }
   }
 }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 8fae3908a..4a8e647d7 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -168,8 +168,9 @@ async fn get_service_interface(
         "id": service_interface_id,
         "name": service_interface_id,
         "description": "This is a fake",
-        "hasPrimary": false,
+        "hasPrimary": true,
         "disabled": false,
+        "masked": false,
         "addressInfo": json!({
             "username": Value::Null,
             "hostId": "HostId?",
@@ -182,7 +183,7 @@ async fn get_service_interface(
             }),
             "suffix": "http"
         }),
-        "type": "ui"
+        "type": "api"
     }))
 }
 

From 3bd7596873ec069e17acbe394d53470a2f94365d Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 22 Feb 2024 16:39:16 -0700
Subject: [PATCH 022/341] chore: Fix some issues in the installation of a
 package and other rpc things

---
 container-runtime/src/Adapters/RpcListener.ts             | 8 ++++++++
 .../src/Adapters/Systems/SystemForEmbassy/index.ts        | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 815a5538e..202e942b5 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -204,6 +204,14 @@ export class RpcListener {
             id,
             ...result,
           }))
+          .then((x) => {
+            if (
+              ("result" in x && x.result === undefined) ||
+              !("error" in x || "result" in x)
+            )
+              (x as any).result = null
+            return x
+          })
           .catch((error) => ({
             jsonrpc,
             id,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index f984bb489..339df6460 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -30,7 +30,6 @@ import { JsonPath, unNestPath } from "../../../Models/JsonPath"
 import { HostSystem } from "../../../Interfaces/HostSystem"
 import { RpcResult, matchRpcResult } from "../../RpcListener"
 import { ServiceInterface } from "../../../../../sdk/dist/cjs/lib/types"
-import { createUtils } from "../../../../../sdk/dist/cjs/lib/util"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -880,7 +879,7 @@ async function updateConfig(
 ) {
   if (!dictionary([string, unknown]).test(spec)) return
   if (!dictionary([string, unknown]).test(mutConfigValue)) return
-  const utils = createUtils(effects)
+  const utils = util.createUtils(effects)
   for (const key in spec) {
     const specValue = spec[key]
 

From 87d6684ca71595ab132d5a604b80022c8082ead5 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Fri, 23 Feb 2024 10:38:50 -0700
Subject: [PATCH 023/341] Frontend changes for 036 (#2554)

* new interfaces and remove tor http warnings

* move sigtermTimeout to stopping main status

* lightning, masked, schemeOverride, invert host-iface relationship

* update for new sdk

* update for latest SDK changes

* Update app-interfaces.page.ts

* Update config.service.ts
---
 sdk/lib/util/getServiceInterface.ts           |   2 -
 web/package-lock.json                         |   1 +
 .../shared/src/types/workspace-config.ts      |   2 +-
 .../ui/src/app/app/menu/menu.component.html   |   6 -
 .../ui/src/app/app/menu/menu.component.ts     |   5 -
 .../components/status/status.component.html   |   9 +-
 .../app-interfaces-item.component.html        |  70 +-
 .../app-interfaces/app-interfaces.page.html   |  32 +-
 .../app-interfaces/app-interfaces.page.ts     | 156 +++--
 .../app-list-pkg/app-list-pkg.component.html  |  10 +-
 .../app-list-pkg/app-list-pkg.component.ts    |  25 +-
 .../app-show-status.component.html            |  10 +-
 .../app-show-status.component.ts              |  19 +-
 .../ui/src/app/pages/login/login.page.html    |  24 -
 .../ui/src/app/pages/login/login.page.ts      |   7 -
 .../server-show/server-show.page.html         |  21 -
 .../server-show/server-show.page.ts           |   8 -
 .../app/pipes/launchable/launchable.pipe.ts   |   9 +-
 web/projects/ui/src/app/pipes/ui/ui.pipe.ts   |   8 +-
 .../ui/src/app/services/api/api.fixures.ts    | 655 ++++++++++++++----
 .../services/api/embassy-mock-api.service.ts  |  18 +-
 .../ui/src/app/services/api/mock-patch.ts     | 418 ++++++++---
 .../ui/src/app/services/config.service.ts     | 125 ++--
 .../src/app/services/patch-db/data-model.ts   |  17 +-
 .../src/app/services/ui-launcher.service.ts   |  10 +-
 25 files changed, 1096 insertions(+), 571 deletions(-)

diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index 6f03e75e5..dd2712849 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -4,9 +4,7 @@ import {
   HostInfo,
   Hostname,
   HostnameInfo,
-  ServiceInterface,
 } from "../types"
-import * as regexes from "./regexes"
 import { ServiceInterfaceType } from "./utils"
 
 export type UrlString = string
diff --git a/web/package-lock.json b/web/package-lock.json
index bcd2967f1..f1aab5e5b 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1972,6 +1972,7 @@
       }
     },
     "../sdk/dist": {
+      "name": "@start9labs/start-sdk",
       "version": "0.4.0-rev0.lib0.rc8.beta7",
       "license": "MIT",
       "dependencies": {
diff --git a/web/projects/shared/src/types/workspace-config.ts b/web/projects/shared/src/types/workspace-config.ts
index 101af40fd..57d5e2a4c 100644
--- a/web/projects/shared/src/types/workspace-config.ts
+++ b/web/projects/shared/src/types/workspace-config.ts
@@ -13,7 +13,7 @@ export type WorkspaceConfig = {
       community: 'https://community-registry.start9.com/'
     }
     mocks: {
-      maskAs: 'tor' | 'local' | 'localhost'
+      maskAs: 'tor' | 'local' | 'ip' | 'localhost'
       // enables local development in secure mode
       maskAsHttps: boolean
       skipStartupAlerts: boolean
diff --git a/web/projects/ui/src/app/app/menu/menu.component.html b/web/projects/ui/src/app/app/menu/menu.component.html
index a54033b67..6db19dea6 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.html
+++ b/web/projects/ui/src/app/app/menu/menu.component.html
@@ -22,12 +22,6 @@
       <ion-label class="label montserrat" routerLinkActive="label_selected">
         {{ page.title }}
       </ion-label>
-      <ion-icon
-        *ngIf="page.url === '/system' && (warning$ | async)"
-        color="warning"
-        size="small"
-        name="warning"
-      ></ion-icon>
       <ion-icon
         *ngIf="page.url === '/system' && (showEOSUpdate$ | async)"
         color="success"
diff --git a/web/projects/ui/src/app/app/menu/menu.component.ts b/web/projects/ui/src/app/app/menu/menu.component.ts
index 8bc7795ff..68de30c7d 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.ts
+++ b/web/projects/ui/src/app/app/menu/menu.component.ts
@@ -114,11 +114,6 @@ export class MenuComponent {
 
   readonly theme$ = inject(THEME)
 
-  readonly warning$ = merge(
-    of(this.config.isTorHttp()),
-    this.patch.watch$('server-info', 'ntp-synced').pipe(map(synced => !synced)),
-  )
-
   constructor(
     private readonly patch: PatchDB<DataModel>,
     private readonly eosService: EOSService,
diff --git a/web/projects/ui/src/app/components/status/status.component.html b/web/projects/ui/src/app/components/status/status.component.html
index fd265fd96..e1829f4ca 100644
--- a/web/projects/ui/src/app/components/status/status.component.html
+++ b/web/projects/ui/src/app/components/status/status.component.html
@@ -8,13 +8,8 @@
 >
   {{ (connected$ | async) ? rendering.display : 'Unknown' }}
 
-  <span
-    *ngIf="
-      rendering.display === PR[PS.Stopping].display &&
-      (sigtermTimeout | durationToSeconds) > 30
-    "
-  >
-    this may take a while
+  <span *ngIf="sigtermTimeout && (sigtermTimeout | durationToSeconds) > 30">
+    . This may take a while
   </span>
 
   <span *ngIf="installProgress">
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces-item.component.html b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces-item.component.html
index 932c1fd0a..420cbcf1b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces-item.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces-item.component.html
@@ -1,72 +1,44 @@
-<ion-item *ngIf="interface">
+<ion-item *ngIf="iFace">
   <ion-icon
     slot="start"
     size="large"
-    [name]="interface.def.ui ? 'desktop-outline' : 'terminal-outline'"
+    [name]="
+      iFace.type === 'ui'
+        ? 'desktop-outline'
+        : iFace.type === 'api'
+        ? 'terminal-outline'
+        : 'people-outline'
+    "
   ></ion-icon>
   <ion-label>
-    <h1>{{ interface.def.name }}</h1>
-    <h2>{{ interface.def.description }}</h2>
+    <h1>{{ iFace.name }}</h1>
+    <h2>{{ iFace.description }}</h2>
   </ion-label>
 </ion-item>
-<div *ngIf="interface" style="padding-left: 64px">
-  <!-- has tor -->
-  <ion-item *ngIf="interface.addresses['tor-address'] as tor">
+<div *ngIf="iFace" style="padding-left: 64px">
+  <ion-item *ngFor="let address of iFace.addresses">
     <ion-label>
-      <h2>Tor Address</h2>
-      <p>{{ tor }}</p>
+      <h2>{{ address.name }}</h2>
+      <p>{{ address.url }}</p>
     </ion-label>
     <ion-buttons slot="end">
-      <ion-button *ngIf="interface.def.ui" fill="clear" (click)="launch(tor)">
+      <ion-button
+        *ngIf="iFace.type === 'ui'"
+        fill="clear"
+        (click)="launch(address.url)"
+      >
         <ion-icon size="small" slot="icon-only" name="open-outline"></ion-icon>
       </ion-button>
-      <ion-button fill="clear" (click)="showQR(tor)">
+      <ion-button fill="clear" (click)="showQR(address.url)">
         <ion-icon
           size="small"
           slot="icon-only"
           name="qr-code-outline"
         ></ion-icon>
       </ion-button>
-      <ion-button fill="clear" (click)="copy(tor)">
+      <ion-button fill="clear" (click)="copy(address.url)">
         <ion-icon size="small" slot="icon-only" name="copy-outline"></ion-icon>
       </ion-button>
     </ion-buttons>
   </ion-item>
-  <!-- no tor -->
-  <ion-item *ngIf="!interface.addresses['tor-address']">
-    <ion-label>
-      <h2>Tor Address</h2>
-      <p>Service does not use a Tor Address</p>
-    </ion-label>
-  </ion-item>
-
-  <!-- lan -->
-  <ion-item *ngIf="interface.addresses['lan-address'] as lan">
-    <ion-label>
-      <h2>LAN Address</h2>
-      <p>{{ lan }}</p>
-    </ion-label>
-    <ion-buttons slot="end">
-      <ion-button *ngIf="interface.def.ui" fill="clear" (click)="launch(lan)">
-        <ion-icon size="small" slot="icon-only" name="open-outline"></ion-icon>
-      </ion-button>
-      <ion-button fill="clear" (click)="showQR(lan)">
-        <ion-icon
-          size="small"
-          slot="icon-only"
-          name="qr-code-outline"
-        ></ion-icon>
-      </ion-button>
-      <ion-button fill="clear" (click)="copy(lan)">
-        <ion-icon size="small" slot="icon-only" name="copy-outline"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-item>
-  <!-- no lan -->
-  <ion-item *ngIf="!interface.addresses['lan-address']">
-    <ion-label>
-      <h2>LAN Address</h2>
-      <p>N/A</p>
-    </ion-label>
-  </ion-item>
 </div>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
index 16c6a5bd6..ea83aedb1 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
@@ -8,19 +8,29 @@
 </ion-header>
 
 <ion-content class="ion-padding-top with-widgets">
-  <ion-item-group>
-    <!-- iff ui -->
-    <ng-container *ngIf="ui">
-      <ion-item-divider>User Interface</ion-item-divider>
-      <app-interfaces-item [interface]="ui"></app-interfaces-item>
+  <ion-item-group *ngIf="serviceInterfaces$ | async as serviceInterfaces">
+    <ng-container *ngIf="serviceInterfaces.ui.length">
+      <ion-item-divider>User Interfaces (UI)</ion-item-divider>
+      <app-interfaces-item
+        *ngFor="let ui of serviceInterfaces.ui"
+        [iFace]="ui"
+      ></app-interfaces-item>
     </ng-container>
 
-    <!-- other interface -->
-    <ng-container *ngIf="other.length">
-      <ion-item-divider>Machine Interfaces</ion-item-divider>
-      <div *ngFor="let interface of other" style="margin-bottom: 30px">
-        <app-interfaces-item [interface]="interface"></app-interfaces-item>
-      </div>
+    <ng-container *ngIf="serviceInterfaces.api.length">
+      <ion-item-divider>Application Program Interfaces (API)</ion-item-divider>
+      <app-interfaces-item
+        *ngFor="let api of serviceInterfaces.api"
+        [iFace]="api"
+      ></app-interfaces-item>
+    </ng-container>
+
+    <ng-container *ngIf="serviceInterfaces.p2p.length">
+      <ion-item-divider>Peer-To-Peer Interfaces (P2P)</ion-item-divider>
+      <app-interfaces-item
+        *ngFor="let p2p of serviceInterfaces.p2p"
+        [iFace]="p2p"
+      ></app-interfaces-item>
     </ng-container>
   </ion-item-group>
 </ion-content>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 825d6536d..3678474e6 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -3,19 +3,21 @@ import { WINDOW } from '@ng-web-apis/common'
 import { ActivatedRoute } from '@angular/router'
 import { ModalController, ToastController } from '@ionic/angular'
 import { copyToClipboard, getPkgId } from '@start9labs/shared'
-import { getUiInterfaceKey } from 'src/app/services/config.service'
-import {
-  DataModel,
-  InstalledPackageDataEntry,
-  InterfaceDef,
-} from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import { QRComponent } from 'src/app/components/qr/qr.component'
-import { getPackage } from '../../../util/get-package-data'
+import { map } from 'rxjs'
+import {
+  ServiceInterface,
+  ServiceInterfaceWithHostInfo,
+} from '@start9labs/start-sdk/mjs/lib/types'
 
-interface LocalInterface {
-  def: InterfaceDef
-  addresses: InstalledPackageDataEntry['interface-addresses'][string]
+type MappedInterface = ServiceInterface & {
+  addresses: MappedAddress[]
+}
+type MappedAddress = {
+  name: string
+  url: string
 }
 
 @Component({
@@ -24,60 +26,33 @@ interface LocalInterface {
   styleUrls: ['./app-interfaces.page.scss'],
 })
 export class AppInterfacesPage {
-  ui?: LocalInterface
-  other: LocalInterface[] = []
   readonly pkgId = getPkgId(this.route)
 
+  readonly serviceInterfaces$ = this.patch
+    .watch$('package-data', this.pkgId, 'installed', 'service-interfaces')
+    .pipe(
+      map(interfaces => {
+        const sorted = Object.values(interfaces)
+          .sort(iface =>
+            iface.name.toLowerCase() > iface.name.toLowerCase() ? -1 : 1,
+          )
+          .map(iface => ({
+            ...iface,
+            addresses: getAddresses(iface),
+          }))
+
+        return {
+          ui: sorted.filter(val => val.type === 'ui'),
+          api: sorted.filter(val => val.type === 'api'),
+          p2p: sorted.filter(val => val.type === 'p2p'),
+        }
+      }),
+    )
+
   constructor(
     private readonly route: ActivatedRoute,
     private readonly patch: PatchDB<DataModel>,
   ) {}
-
-  async ngOnInit() {
-    const pkg = await getPackage(this.patch, this.pkgId)
-    if (!pkg) return
-
-    const interfaces = pkg.manifest.interfaces
-    const uiKey = getUiInterfaceKey(interfaces)
-
-    if (!pkg.installed) return
-
-    const addressesMap = pkg.installed['interface-addresses']
-
-    if (uiKey) {
-      const uiAddresses = addressesMap[uiKey]
-      this.ui = {
-        def: interfaces[uiKey],
-        addresses: {
-          'lan-address': uiAddresses['lan-address']
-            ? 'https://' + uiAddresses['lan-address']
-            : '',
-          // leave http for services
-          'tor-address': uiAddresses['tor-address']
-            ? 'http://' + uiAddresses['tor-address']
-            : '',
-        },
-      }
-    }
-
-    this.other = Object.keys(interfaces)
-      .filter(key => key !== uiKey)
-      .map(key => {
-        const addresses = addressesMap[key]
-        return {
-          def: interfaces[key],
-          addresses: {
-            'lan-address': addresses['lan-address']
-              ? 'https://' + addresses['lan-address']
-              : '',
-            'tor-address': addresses['tor-address']
-              ? // leave http for services
-                'http://' + addresses['tor-address']
-              : '',
-          },
-        }
-      })
-  }
 }
 
 @Component({
@@ -86,8 +61,7 @@ export class AppInterfacesPage {
   styleUrls: ['./app-interfaces.page.scss'],
 })
 export class AppInterfacesItemComponent {
-  @Input()
-  interface!: LocalInterface
+  @Input() iFace!: MappedInterface
 
   constructor(
     private readonly toastCtrl: ToastController,
@@ -126,3 +100,65 @@ export class AppInterfacesItemComponent {
     await toast.present()
   }
 }
+
+function getAddresses(
+  serviceInterface: ServiceInterfaceWithHostInfo,
+): MappedAddress[] {
+  const host = serviceInterface.hostInfo
+  const addressInfo = serviceInterface.addressInfo
+  const username = addressInfo.username ? addressInfo.username + '@' : ''
+  const suffix = addressInfo.suffix || ''
+
+  const hostnames =
+    host.kind === 'multi'
+      ? host.hostnames
+      : host.hostname
+      ? [host.hostname]
+      : []
+
+  return hostnames
+    .map(h => {
+      const addresses: MappedAddress[] = []
+
+      let name = ''
+      let hostname = ''
+
+      if (h.kind === 'onion') {
+        name = 'Tor'
+        hostname = h.hostname.value
+      } else {
+        name = h.hostname.kind
+        hostname =
+          h.hostname.kind === 'domain'
+            ? `${h.hostname.subdomain}.${h.hostname.domain}`
+            : h.hostname.value
+      }
+
+      if (h.hostname.sslPort) {
+        const port = h.hostname.sslPort === 443 ? '' : `:${h.hostname.sslPort}`
+        const scheme = addressInfo.bindOptions.addSsl?.scheme
+          ? `${addressInfo.bindOptions.addSsl.scheme}://`
+          : ''
+
+        addresses.push({
+          name,
+          url: `${scheme}${username}${hostname}${port}${suffix}`,
+        })
+      }
+
+      if (h.hostname.port) {
+        const port = h.hostname.port === 80 ? '' : `:${h.hostname.port}`
+        const scheme = addressInfo.bindOptions.scheme
+          ? `${addressInfo.bindOptions.scheme}://`
+          : ''
+
+        addresses.push({
+          name,
+          url: `${scheme}${username}${hostname}${port}${suffix}`,
+        })
+      }
+
+      return addresses
+    })
+    .flat()
+}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
index 037f7cc07..71988ba5b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
@@ -17,16 +17,18 @@ <h2 ticker>{{ manifest.title }}</h2>
       [installProgress]="pkg.entry['install-progress']"
       weight="bold"
       size="small"
-      [sigtermTimeout]="manifest.main['sigterm-timeout']"
+      [sigtermTimeout]="sigtermTimeout"
     ></status>
   </ion-label>
   <ion-button
-    *ngIf="manifest.interfaces | hasUi"
+    *ngIf="
+      pkg.entry.installed && (pkg.entry.installed['service-interfaces'] | hasUi)
+    "
     slot="end"
     fill="clear"
     color="primary"
-    (click)="launchUi($event)"
-    [disabled]="!(pkg.entry.state | isLaunchable: status:manifest.interfaces)"
+    (click)="launchUi($event, pkg.entry.installed['service-interfaces'])"
+    [disabled]="!(pkg.entry.state | isLaunchable: pkgMainStatus.status)"
   >
     <ion-icon slot="icon-only" name="open-outline"></ion-icon>
   </ion-button>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index 3302e182e..76559a8b1 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -1,5 +1,9 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { PackageMainStatus } from 'src/app/services/patch-db/data-model'
+import {
+  InstalledPackageDataEntry,
+  MainStatus,
+  PackageMainStatus,
+} from 'src/app/services/patch-db/data-model'
 import { PkgInfo } from 'src/app/util/get-package-info'
 import { UiLauncherService } from 'src/app/services/ui-launcher.service'
 
@@ -14,15 +18,26 @@ export class AppListPkgComponent {
 
   constructor(private readonly launcherService: UiLauncherService) {}
 
-  get status(): PackageMainStatus {
+  get pkgMainStatus(): MainStatus {
     return (
-      this.pkg.entry.installed?.status.main.status || PackageMainStatus.Stopped
+      this.pkg.entry.installed?.status.main || {
+        status: PackageMainStatus.Stopped,
+      }
     )
   }
 
-  launchUi(e: Event): void {
+  get sigtermTimeout(): string | null {
+    return this.pkgMainStatus.status === PackageMainStatus.Stopping
+      ? this.pkgMainStatus.timeout
+      : null
+  }
+
+  launchUi(
+    e: Event,
+    interfaces: InstalledPackageDataEntry['service-interfaces'],
+  ): void {
     e.stopPropagation()
     e.preventDefault()
-    this.launcherService.launch(this.pkg.entry)
+    this.launcherService.launch(interfaces)
   }
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index 6a8676ebc..e2379713b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -6,7 +6,7 @@
       weight="600"
       [installProgress]="pkg['install-progress']"
       [rendering]="PR[status.primary]"
-      [sigtermTimeout]="pkg.manifest.main['sigterm-timeout']"
+      [sigtermTimeout]="sigtermTimeout"
     ></status>
   </ion-label>
 </ion-item>
@@ -56,13 +56,11 @@
         </ion-button>
 
         <ion-button
-          *ngIf="pkgStatus && (interfaces | hasUi)"
+          *ngIf="pkgStatus && interfaces && (interfaces | hasUi)"
           class="action-button"
           color="primary"
-          [disabled]="
-            !(pkg.state | isLaunchable: pkgStatus.main.status:interfaces)
-          "
-          (click)="launchUi()"
+          [disabled]="!(pkg.state | isLaunchable: pkgStatus.main.status)"
+          (click)="launchUi(interfaces)"
         >
           <ion-icon slot="start" name="open-outline"></ion-icon>
           Launch UI
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index f67a2b2fa..dd8832c55 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -6,8 +6,9 @@ import {
   PrimaryStatus,
 } from 'src/app/services/pkg-status-rendering.service'
 import {
-  InterfaceDef,
+  InstalledPackageDataEntry,
   PackageDataEntry,
+  PackageMainStatus,
   PackageState,
   Status,
 } from 'src/app/services/patch-db/data-model'
@@ -45,8 +46,10 @@ export class AppShowStatusComponent {
     private readonly connectionService: ConnectionService,
   ) {}
 
-  get interfaces(): Record<string, InterfaceDef> {
-    return this.pkg.manifest.interfaces || {}
+  get interfaces():
+    | InstalledPackageDataEntry['service-interfaces']
+    | undefined {
+    return this.pkg.installed?.['service-interfaces']
   }
 
   get pkgStatus(): Status | null {
@@ -73,8 +76,14 @@ export class AppShowStatusComponent {
     return this.status.primary === PrimaryStatus.Stopped
   }
 
-  launchUi(): void {
-    this.launcherService.launch(this.pkg)
+  get sigtermTimeout(): string | null {
+    return this.pkgStatus?.main.status === PackageMainStatus.Stopping
+      ? this.pkgStatus.main.timeout
+      : null
+  }
+
+  launchUi(interfaces: InstalledPackageDataEntry['service-interfaces']): void {
+    this.launcherService.launch(interfaces)
   }
 
   async presentModalConfig(): Promise<void> {
diff --git a/web/projects/ui/src/app/pages/login/login.page.html b/web/projects/ui/src/app/pages/login/login.page.html
index 99f6abbe8..7e27a16c3 100644
--- a/web/projects/ui/src/app/pages/login/login.page.html
+++ b/web/projects/ui/src/app/pages/login/login.page.html
@@ -6,30 +6,6 @@
 
   <!-- not Local HTTP -->
   <ng-template #notLanHttp>
-    <div *ngIf="config.isTorHttp()" class="banner">
-      <ion-item color="warning">
-        <ion-icon slot="start" name="warning-outline"></ion-icon>
-        <ion-label>
-          <h2 style="font-weight: bold">Http detected</h2>
-          <p style="font-weight: 600">
-            Tor is faster over https. Your Root CA must be trusted.
-            <a
-              href="https://docs.start9.com/0.3.5.x/user-manual/trust-ca"
-              target="_blank"
-              noreferrer
-              style="color: black"
-            >
-              View instructions
-            </a>
-          </p>
-        </ion-label>
-        <ion-button slot="end" color="light" (click)="launchHttps()">
-          Open Https
-          <ion-icon slot="end" name="open-outline"></ion-icon>
-        </ion-button>
-      </ion-item>
-    </div>
-
     <ion-grid class="grid">
       <ion-row class="row">
         <ion-col>
diff --git a/web/projects/ui/src/app/pages/login/login.page.ts b/web/projects/ui/src/app/pages/login/login.page.ts
index 15f7d588e..db0d1c2c4 100644
--- a/web/projects/ui/src/app/pages/login/login.page.ts
+++ b/web/projects/ui/src/app/pages/login/login.page.ts
@@ -5,7 +5,6 @@ import { AuthService } from 'src/app/services/auth.service'
 import { Router } from '@angular/router'
 import { ConfigService } from 'src/app/services/config.service'
 import { DOCUMENT } from '@angular/common'
-import { WINDOW } from '@ng-web-apis/common'
 
 @Component({
   selector: 'login',
@@ -24,14 +23,8 @@ export class LoginPage {
     private readonly api: ApiService,
     public readonly config: ConfigService,
     @Inject(DOCUMENT) public readonly document: Document,
-    @Inject(WINDOW) private readonly windowRef: Window,
   ) {}
 
-  launchHttps() {
-    const host = this.config.getHost()
-    this.windowRef.open(`https://${host}`, '_self')
-  }
-
   async submit() {
     this.error = ''
 
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
index 760a013e6..f16066874 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -40,27 +40,6 @@ <h2 style="font-weight: bold">Clock sync failure</h2>
       </ion-button>
     </ion-item>
 
-    <ion-item *ngIf="isTorHttp" color="warning" class="ion-margin-bottom">
-      <ion-icon slot="start" name="warning-outline"></ion-icon>
-      <ion-label>
-        <h2 style="font-weight: bold">Http detected</h2>
-        <p style="font-weight: 600">
-          Tor is faster over https.
-          <a
-            [routerLink]="['/system', 'root-ca']"
-            style="color: var(--ion-color-light)"
-          >
-            Download and trust your server's Root CA
-          </a>
-          , then switch to https.
-        </p>
-      </ion-label>
-      <ion-button slot="end" color="light" (click)="launchHttps()">
-        Open Https
-        <ion-icon slot="end" name="open-outline"></ion-icon>
-      </ion-button>
-    </ion-item>
-
     <div *ngFor="let cat of settings | keyvalue : asIsOrder">
       <ion-item-divider>
         <ion-text color="dark" (click)="addClick(cat.key)">
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 2b64fcf1c..38087b354 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -41,8 +41,6 @@ export class ServerShowPage {
   readonly showUpdate$ = this.eosService.showUpdate$
   readonly showDiskRepair$ = this.ClientStorageService.showDiskRepair$
 
-  readonly isTorHttp = this.config.isTorHttp()
-
   constructor(
     private readonly alertCtrl: AlertController,
     private readonly modalCtrl: ModalController,
@@ -56,7 +54,6 @@ export class ServerShowPage {
     private readonly ClientStorageService: ClientStorageService,
     private readonly authService: AuthService,
     private readonly toastCtrl: ToastController,
-    private readonly config: ConfigService,
     @Inject(WINDOW) private readonly windowRef: Window,
   ) {}
 
@@ -305,11 +302,6 @@ export class ServerShowPage {
     await alert.present()
   }
 
-  async launchHttps() {
-    const { 'tor-address': torAddress } = await getServerInfo(this.patch)
-    this.windowRef.open(torAddress, '_self')
-  }
-
   addClick(title: string) {
     switch (title) {
       case 'Manage':
diff --git a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
index be1d5218d..668328820 100644
--- a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
+++ b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
@@ -1,6 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core'
 import {
-  InterfaceDef,
   PackageMainStatus,
   PackageState,
 } from 'src/app/services/patch-db/data-model'
@@ -12,11 +11,7 @@ import { ConfigService } from '../../services/config.service'
 export class LaunchablePipe implements PipeTransform {
   constructor(private configService: ConfigService) {}
 
-  transform(
-    state: PackageState,
-    status: PackageMainStatus,
-    interfaces: Record<string, InterfaceDef>,
-  ): boolean {
-    return this.configService.isLaunchable(state, status, interfaces)
+  transform(state: PackageState, status: PackageMainStatus): boolean {
+    return this.configService.isLaunchable(state, status)
   }
 }
diff --git a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
index 9d46bfd86..03ec11df0 100644
--- a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
+++ b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
@@ -1,12 +1,14 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { InterfaceDef } from '../../services/patch-db/data-model'
+import { InstalledPackageDataEntry } from '../../services/patch-db/data-model'
 import { hasUi } from '../../services/config.service'
 
 @Pipe({
   name: 'hasUi',
 })
 export class UiPipe implements PipeTransform {
-  transform(interfaces: Record<string, InterfaceDef>): boolean {
-    return hasUi(interfaces)
+  transform(
+    interfaces: InstalledPackageDataEntry['service-interfaces'],
+  ): boolean {
+    return interfaces ? hasUi(interfaces) : false
   }
 }
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 17460609a..ea83a4f0a 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -78,18 +78,6 @@ export module Mock {
       start: 'Starting Bitcoin is good for your health.',
       stop: null,
     },
-    main: {
-      type: 'docker',
-      image: '',
-      system: true,
-      entrypoint: '',
-      args: [],
-      mounts: {},
-      'io-format': DockerIoFormat.Yaml,
-      inject: false,
-      'shm-size': '',
-      'sigterm-timeout': '1ms',
-    },
     'health-checks': {},
     config: {
       get: null,
@@ -97,40 +85,6 @@ export module Mock {
     },
     volumes: {},
     'min-os-version': '0.2.12',
-    interfaces: {
-      ui: {
-        name: 'Node Visualizer',
-        description:
-          'Web application for viewing information about your node and the Bitcoin network.',
-        ui: true,
-        'tor-config': {
-          'port-mapping': {},
-        },
-        'lan-config': {},
-        protocols: [],
-      },
-      rpc: {
-        name: 'RPC',
-        description: 'Used by wallets to interact with your Bitcoin Core node.',
-        ui: false,
-        'tor-config': {
-          'port-mapping': {},
-        },
-        'lan-config': {},
-        protocols: [],
-      },
-      p2p: {
-        name: 'P2P',
-        description:
-          'Used by other Bitcoin nodes to communicate and interact with your node.',
-        ui: false,
-        'tor-config': {
-          'port-mapping': {},
-        },
-        'lan-config': {},
-        protocols: [],
-      },
-    },
     backup: {
       create: {
         type: 'docker',
@@ -382,18 +336,6 @@ export module Mock {
       start: 'Starting LND is good for your health.',
       stop: null,
     },
-    main: {
-      type: 'docker',
-      image: '',
-      system: true,
-      entrypoint: '',
-      args: [],
-      mounts: {},
-      'io-format': DockerIoFormat.Yaml,
-      inject: false,
-      'shm-size': '',
-      'sigterm-timeout': '10000µs',
-    },
     'health-checks': {},
     config: {
       get: null,
@@ -401,38 +343,6 @@ export module Mock {
     },
     volumes: {},
     'min-os-version': '0.2.12',
-    interfaces: {
-      rpc: {
-        name: 'RPC interface',
-        description: 'Good for connecting to your node at a distance.',
-        ui: true,
-        'tor-config': {
-          'port-mapping': {},
-        },
-        'lan-config': {
-          '44': {
-            ssl: true,
-            mapping: 33,
-          },
-        },
-        protocols: [],
-      },
-      grpc: {
-        name: 'GRPC',
-        description: 'Certain wallet use grpc.',
-        ui: false,
-        'tor-config': {
-          'port-mapping': {},
-        },
-        'lan-config': {
-          '66': {
-            ssl: true,
-            mapping: 55,
-          },
-        },
-        protocols: [],
-      },
-    },
     backup: {
       create: {
         type: 'docker',
@@ -535,39 +445,10 @@ export module Mock {
       start: null,
       stop: null,
     },
-    main: {
-      type: 'docker',
-      image: '',
-      system: true,
-      entrypoint: '',
-      args: [''],
-      mounts: {},
-      'io-format': DockerIoFormat.Yaml,
-      inject: false,
-      'shm-size': '',
-      'sigterm-timeout': '1m',
-    },
     'health-checks': {},
     config: { get: {} as any, set: {} as any },
     volumes: {},
     'min-os-version': '0.2.12',
-    interfaces: {
-      rpc: {
-        name: 'RPC interface',
-        description: 'Good for connecting to your node at a distance.',
-        ui: false,
-        'tor-config': {
-          'port-mapping': {},
-        },
-        'lan-config': {
-          44: {
-            ssl: true,
-            mapping: 33,
-          },
-        },
-        protocols: [],
-      },
-    },
     backup: {
       create: {
         type: 'docker',
@@ -1887,18 +1768,219 @@ export module Mock {
         },
         'dependency-config-errors': {},
       },
-      'interface-addresses': {
+      'service-interfaces': {
         ui: {
-          'tor-address': 'bitcoind-ui-address.onion',
-          'lan-address': 'bitcoind-ui-address.local',
+          id: 'ui',
+          hasPrimary: false,
+          disabled: false,
+          masked: false,
+          name: 'Web UI',
+          description:
+            'A launchable web app for you to interact with your Bitcoin node',
+          type: 'ui',
+          addressInfo: {
+            username: null,
+            hostId: 'abcdefg',
+            bindOptions: {
+              scheme: 'http',
+              preferredExternalPort: 80,
+              addSsl: {
+                preferredExternalPort: 443,
+                scheme: 'https',
+              },
+              secure: false,
+              ssl: false,
+            },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'abcdefg',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-ui-address.onion',
+                  port: 80,
+                  sslPort: 443,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+            ],
+          },
         },
         rpc: {
-          'tor-address': 'bitcoind-rpc-address.onion',
-          'lan-address': 'bitcoind-rpc-address.local',
+          id: 'rpc',
+          hasPrimary: false,
+          disabled: false,
+          masked: false,
+          name: 'RPC',
+          description:
+            'Used by dependent services and client wallets for connecting to your node',
+          type: 'api',
+          addressInfo: {
+            username: null,
+            hostId: 'bcdefgh',
+            bindOptions: {
+              scheme: 'http',
+              preferredExternalPort: 80,
+              addSsl: {
+                preferredExternalPort: 443,
+                scheme: 'https',
+              },
+              secure: false,
+              ssl: false,
+            },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'bcdefgh',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-rpc-address.onion',
+                  port: 80,
+                  sslPort: 443,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: null,
+                  sslPort: 2345,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: null,
+                  sslPort: 2345,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: null,
+                  sslPort: 2345,
+                },
+              },
+            ],
+          },
         },
         p2p: {
-          'tor-address': 'bitcoind-p2p-address.onion',
-          'lan-address': 'bitcoind-p2p-address.local',
+          id: 'p2p',
+          hasPrimary: true,
+          disabled: false,
+          masked: false,
+          name: 'P2P',
+          description:
+            'Used for connecting to other nodes on the Bitcoin network',
+          type: 'p2p',
+          addressInfo: {
+            username: null,
+            hostId: 'cdefghi',
+            bindOptions: {
+              scheme: 'bitcoin',
+              preferredExternalPort: 8333,
+              addSsl: null,
+              secure: true,
+              ssl: false,
+            },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'cdefghi',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-p2p-address.onion',
+                  port: 8333,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: 3456,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: 3456,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: 3456,
+                  sslPort: null,
+                },
+              },
+            ],
+          },
         },
       },
       'system-pointers': [],
@@ -1934,10 +2016,110 @@ export module Mock {
         'dependency-config-errors': {},
       },
       manifest: MockManifestBitcoinProxy,
-      'interface-addresses': {
-        rpc: {
-          'tor-address': 'bitcoinproxy-rpc-address.onion',
-          'lan-address': 'bitcoinproxy-rpc-address.local',
+      'service-interfaces': {
+        ui: {
+          id: 'ui',
+          hasPrimary: false,
+          disabled: false,
+          masked: false,
+          name: 'Web UI',
+          description: 'A launchable web app for Bitcoin Proxy',
+          type: 'ui',
+          addressInfo: {
+            username: null,
+            hostId: 'hijklmnop',
+            bindOptions: {
+              scheme: 'http',
+              preferredExternalPort: 80,
+              addSsl: {
+                preferredExternalPort: 443,
+                scheme: 'https',
+              },
+              secure: true,
+              ssl: true,
+            },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'hijklmnop',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'proxy-ui-address.onion',
+                  port: 80,
+                  sslPort: 443,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: null,
+                  sslPort: 4567,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: null,
+                  sslPort: 4567,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: null,
+                  sslPort: 4567,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'wlan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: null,
+                  sslPort: 4567,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'wlan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.7',
+                  port: null,
+                  sslPort: 4567,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'wlan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: null,
+                  sslPort: 4567,
+                },
+              },
+            ],
+          },
         },
       },
       'system-pointers': [],
@@ -1985,14 +2167,213 @@ export module Mock {
         },
       },
       manifest: MockManifestLnd,
-      'interface-addresses': {
-        rpc: {
-          'tor-address': 'lnd-rpc-address.onion',
-          'lan-address': 'lnd-rpc-address.local',
-        },
+      'service-interfaces': {
         grpc: {
-          'tor-address': 'lnd-grpc-address.onion',
-          'lan-address': 'lnd-grpc-address.local',
+          id: 'grpc',
+          hasPrimary: false,
+          disabled: false,
+          masked: false,
+          name: 'GRPC',
+          description:
+            'Used by dependent services and client wallets for connecting to your node',
+          type: 'api',
+          addressInfo: {
+            username: null,
+            hostId: 'qrstuv',
+            bindOptions: {
+              scheme: 'grpc',
+              preferredExternalPort: 10009,
+              addSsl: null,
+              secure: true,
+              ssl: true,
+            },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'qrstuv',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-grpc-address.onion',
+                  port: 10009,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: 5678,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: 5678,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: 5678,
+                  sslPort: null,
+                },
+              },
+            ],
+          },
+        },
+        lndconnect: {
+          id: 'lndconnect',
+          hasPrimary: false,
+          disabled: false,
+          masked: true,
+          name: 'LND Connect',
+          description:
+            'Used by client wallets adhering to LND Connect protocol to connect to your node',
+          type: 'api',
+          addressInfo: {
+            username: null,
+            hostId: 'qrstuv',
+            bindOptions: {
+              scheme: 'lndconnect',
+              preferredExternalPort: 10009,
+              addSsl: null,
+              secure: true,
+              ssl: true,
+            },
+            suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
+          },
+          hostInfo: {
+            id: 'qrstuv',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-grpc-address.onion',
+                  port: 10009,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: 5678,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: 5678,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: 5678,
+                  sslPort: null,
+                },
+              },
+            ],
+          },
+        },
+        p2p: {
+          id: 'p2p',
+          hasPrimary: true,
+          disabled: false,
+          masked: false,
+          name: 'P2P',
+          description:
+            'Used for connecting to other nodes on the Bitcoin network',
+          type: 'p2p',
+          addressInfo: {
+            username: null,
+            hostId: 'rstuvw',
+            bindOptions: {
+              scheme: null,
+              preferredExternalPort: 9735,
+              addSsl: null,
+              secure: true,
+              ssl: true,
+            },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'rstuvw',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-p2p-address.onion',
+                  port: 9735,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: 6789,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: 6789,
+                  sslPort: null,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: 6789,
+                  sslPort: null,
+                },
+              },
+            ],
+          },
         },
       },
       'system-pointers': [],
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index c98a4bd87..a2e5324a1 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -919,8 +919,10 @@ export class MockApiService extends ApiService {
       const patch2 = [
         {
           op: PatchOp.REPLACE,
-          path: path + '/status',
-          value: PackageMainStatus.Stopped,
+          path: path,
+          value: {
+            status: PackageMainStatus.Stopped,
+          },
         },
       ]
       this.mockRevision(patch2)
@@ -929,13 +931,11 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: path + '/status',
-        value: PackageMainStatus.Stopping,
-      },
-      {
-        op: PatchOp.REPLACE,
-        path: path + '/health',
-        value: {},
+        path: path,
+        value: {
+          status: PackageMainStatus.Stopping,
+          timeout: '35s',
+        },
       },
     ]
 
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 1dc7abd66..35942e92f 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -116,18 +116,6 @@ export const mockPatchData: DataModel = {
           start: 'Starting Bitcoin is good for your health.',
           stop: null,
         },
-        main: {
-          type: 'docker',
-          image: '',
-          system: true,
-          entrypoint: '',
-          args: [],
-          mounts: {},
-          'io-format': DockerIoFormat.Yaml,
-          inject: false,
-          'shm-size': '',
-          'sigterm-timeout': '.49m',
-        },
         'health-checks': {
           'chain-state': {
             name: 'Chain State',
@@ -152,41 +140,6 @@ export const mockPatchData: DataModel = {
         } as any,
         volumes: {},
         'min-os-version': '0.2.12',
-        interfaces: {
-          ui: {
-            name: 'Node Visualizer',
-            description:
-              'Web application for viewing information about your node and the Bitcoin network.',
-            ui: true,
-            'tor-config': {
-              'port-mapping': {},
-            },
-            'lan-config': {},
-            protocols: [],
-          },
-          rpc: {
-            name: 'RPC',
-            description:
-              'Used by wallets to interact with your Bitcoin Core node.',
-            ui: false,
-            'tor-config': {
-              'port-mapping': {},
-            },
-            'lan-config': {},
-            protocols: [],
-          },
-          p2p: {
-            name: 'P2P',
-            description:
-              'Used by other Bitcoin nodes to communicate and interact with your node.',
-            ui: false,
-            'tor-config': {
-              'port-mapping': {},
-            },
-            'lan-config': {},
-            protocols: [],
-          },
-        },
         backup: {
           create: {
             type: 'docker',
@@ -441,18 +394,110 @@ export const mockPatchData: DataModel = {
           },
           'dependency-config-errors': {},
         },
-        'interface-addresses': {
+        'service-interfaces': {
           ui: {
-            'tor-address': 'bitcoind-ui-address.onion',
-            'lan-address': 'bitcoind-ui-address.local',
-          },
-          rpc: {
-            'tor-address': 'bitcoind-rpc-address.onion',
-            'lan-address': 'bitcoind-rpc-address.local',
-          },
-          p2p: {
-            'tor-address': 'bitcoind-p2p-address.onion',
-            'lan-address': 'bitcoind-p2p-address.local',
+            id: 'ui',
+            hasPrimary: false,
+            disabled: false,
+            masked: false,
+            name: 'Web UI',
+            description: 'A launchable web app for Bitcoin Proxy',
+            type: 'ui',
+            addressInfo: {
+              username: null,
+              hostId: 'hijklmnop',
+              bindOptions: {
+                scheme: 'http',
+                preferredExternalPort: 80,
+                addSsl: {
+                  preferredExternalPort: 443,
+                  scheme: 'https',
+                },
+                secure: true,
+                ssl: true,
+              },
+              suffix: '',
+            },
+            hostInfo: {
+              id: 'hijklmnop',
+              kind: 'multi',
+              hostnames: [
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'proxy-ui-address.onion',
+                    port: 80,
+                    sslPort: 443,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'local',
+                    value: 'adjective-noun.local',
+                    port: null,
+                    sslPort: 4567,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv4',
+                    value: '192.168.1.5',
+                    port: null,
+                    sslPort: 4567,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv6',
+                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                    port: null,
+                    sslPort: 4567,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'wlan0',
+                  public: false,
+                  hostname: {
+                    kind: 'local',
+                    value: 'adjective-noun.local',
+                    port: null,
+                    sslPort: 4567,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'wlan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv4',
+                    value: '192.168.1.7',
+                    port: null,
+                    sslPort: 4567,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'wlan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv6',
+                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                    port: null,
+                    sslPort: 4567,
+                  },
+                },
+              ],
+            },
           },
         },
         'system-pointers': [],
@@ -506,18 +551,6 @@ export const mockPatchData: DataModel = {
           start: 'Starting LND is good for your health.',
           stop: null,
         },
-        main: {
-          type: 'docker',
-          image: '',
-          system: true,
-          entrypoint: '',
-          args: [],
-          mounts: {},
-          'io-format': DockerIoFormat.Yaml,
-          inject: false,
-          'shm-size': '',
-          'sigterm-timeout': '0.5s',
-        },
         'health-checks': {},
         config: {
           get: null,
@@ -525,38 +558,6 @@ export const mockPatchData: DataModel = {
         },
         volumes: {},
         'min-os-version': '0.2.12',
-        interfaces: {
-          rpc: {
-            name: 'RPC interface',
-            description: 'Good for connecting to your node at a distance.',
-            ui: true,
-            'tor-config': {
-              'port-mapping': {},
-            },
-            'lan-config': {
-              '44': {
-                ssl: true,
-                mapping: 33,
-              },
-            },
-            protocols: [],
-          },
-          grpc: {
-            name: 'GRPC',
-            description: 'Certain wallet use grpc.',
-            ui: false,
-            'tor-config': {
-              'port-mapping': {},
-            },
-            'lan-config': {
-              '66': {
-                ssl: true,
-                mapping: 55,
-              },
-            },
-            protocols: [],
-          },
-        },
         backup: {
           create: {
             type: 'docker',
@@ -642,14 +643,213 @@ export const mockPatchData: DataModel = {
             'btc-rpc-proxy': 'This is a config unsatisfied error',
           },
         },
-        'interface-addresses': {
-          rpc: {
-            'tor-address': 'lnd-rpc-address.onion',
-            'lan-address': 'lnd-rpc-address.local',
-          },
+        'service-interfaces': {
           grpc: {
-            'tor-address': 'lnd-grpc-address.onion',
-            'lan-address': 'lnd-grpc-address.local',
+            id: 'grpc',
+            hasPrimary: false,
+            disabled: false,
+            masked: false,
+            name: 'GRPC',
+            description:
+              'Used by dependent services and client wallets for connecting to your node',
+            type: 'api',
+            addressInfo: {
+              username: null,
+              hostId: 'qrstuv',
+              bindOptions: {
+                scheme: 'grpc',
+                preferredExternalPort: 10009,
+                addSsl: null,
+                secure: true,
+                ssl: true,
+              },
+              suffix: '',
+            },
+            hostInfo: {
+              id: 'qrstuv',
+              kind: 'multi',
+              hostnames: [
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'lnd-grpc-address.onion',
+                    port: 10009,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'local',
+                    value: 'adjective-noun.local',
+                    port: 5678,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv4',
+                    value: '192.168.1.5',
+                    port: 5678,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv6',
+                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                    port: 5678,
+                    sslPort: null,
+                  },
+                },
+              ],
+            },
+          },
+          lndconnect: {
+            id: 'lndconnect',
+            hasPrimary: false,
+            disabled: false,
+            masked: true,
+            name: 'LND Connect',
+            description:
+              'Used by client wallets adhering to LND Connect protocol to connect to your node',
+            type: 'api',
+            addressInfo: {
+              username: null,
+              hostId: 'qrstuv',
+              bindOptions: {
+                scheme: 'lndconnect',
+                preferredExternalPort: 10009,
+                addSsl: null,
+                secure: true,
+                ssl: true,
+              },
+              suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
+            },
+            hostInfo: {
+              id: 'qrstuv',
+              kind: 'multi',
+              hostnames: [
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'lnd-grpc-address.onion',
+                    port: 10009,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'local',
+                    value: 'adjective-noun.local',
+                    port: 5678,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv4',
+                    value: '192.168.1.5',
+                    port: 5678,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv6',
+                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                    port: 5678,
+                    sslPort: null,
+                  },
+                },
+              ],
+            },
+          },
+          p2p: {
+            id: 'p2p',
+            hasPrimary: true,
+            disabled: false,
+            masked: false,
+            name: 'P2P',
+            description:
+              'Used for connecting to other nodes on the Bitcoin network',
+            type: 'p2p',
+            addressInfo: {
+              username: null,
+              hostId: 'rstuvw',
+              bindOptions: {
+                scheme: null,
+                preferredExternalPort: 9735,
+                addSsl: null,
+                secure: true,
+                ssl: true,
+              },
+              suffix: '',
+            },
+            hostInfo: {
+              id: 'rstuvw',
+              kind: 'multi',
+              hostnames: [
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'lnd-p2p-address.onion',
+                    port: 9735,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'local',
+                    value: 'adjective-noun.local',
+                    port: 6789,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv4',
+                    value: '192.168.1.5',
+                    port: 6789,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv6',
+                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                    port: 6789,
+                    sslPort: null,
+                  },
+                },
+              ],
+            },
           },
         },
         'system-pointers': [],
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index f8fef3d60..50f228e95 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -2,8 +2,11 @@ import { DOCUMENT } from '@angular/common'
 import { Inject, Injectable } from '@angular/core'
 import { WorkspaceConfig } from '@start9labs/shared'
 import {
-  InterfaceDef,
-  PackageDataEntry,
+  HostnameInfoIp,
+  HostnameInfoOnion,
+} from '@start9labs/start-sdk/mjs/lib/types'
+import {
+  InstalledPackageDataEntry,
   PackageMainStatus,
   PackageState,
 } from 'src/app/services/patch-db/data-model'
@@ -45,10 +48,6 @@ export class ConfigService {
       : this.hostname.endsWith('.local')
   }
 
-  isTorHttp(): boolean {
-    return this.isTor() && !this.isHttps()
-  }
-
   isLanHttp(): boolean {
     return !this.isTor() && !this.isLocalhost() && !this.isHttps()
   }
@@ -57,24 +56,60 @@ export class ConfigService {
     return window.isSecureContext || this.isTor()
   }
 
-  isLaunchable(
-    state: PackageState,
-    status: PackageMainStatus,
-    interfaces: Record<string, InterfaceDef>,
-  ): boolean {
+  isLaunchable(state: PackageState, status: PackageMainStatus): boolean {
     return (
-      state === PackageState.Installed &&
-      status === PackageMainStatus.Running &&
-      hasUi(interfaces)
+      state === PackageState.Installed && status === PackageMainStatus.Running
     )
   }
 
-  launchableURL(pkg: PackageDataEntry): string {
-    if (!this.isTor() && hasLocalUi(pkg.manifest.interfaces)) {
-      return `https://${lanUiAddress(pkg)}`
+  /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
+  launchableAddress(
+    interfaces: InstalledPackageDataEntry['service-interfaces'],
+  ): string {
+    const ui = Object.values(interfaces).find(i => i.type === 'ui')
+
+    if (!ui) return ''
+
+    const host = ui.hostInfo
+    const addressInfo = ui.addressInfo
+    const scheme = this.isHttps() ? 'https' : 'http'
+    const username = addressInfo.username ? addressInfo.username + '@' : ''
+    const suffix = addressInfo.suffix || ''
+    const url = new URL(`${scheme}://${username}placeholder${suffix}`)
+
+    if (host.kind === 'multi') {
+      const onionHostname = host.hostnames.find(
+        h => h.kind === 'onion',
+      ) as HostnameInfoOnion
+
+      if (this.isTor() && onionHostname) {
+        url.hostname = onionHostname.hostname.value
+      } else {
+        const ipHostname = host.hostnames.find(
+          h => h.kind === 'ip',
+        ) as HostnameInfoIp
+
+        if (!ipHostname) return ''
+
+        url.hostname = this.hostname
+        url.port = String(
+          ipHostname.hostname.sslPort || ipHostname.hostname.port,
+        )
+      }
     } else {
-      return `http://${torUiAddress(pkg)}`
+      const hostname = host.hostname
+
+      if (!hostname) return ''
+
+      if (this.isTor() && hostname.kind === 'onion') {
+        url.hostname = hostname.hostname.value
+      } else {
+        url.hostname = this.hostname
+        url.port = String(hostname.hostname.sslPort || hostname.hostname.port)
+      }
     }
+
+    return url.href
   }
 
   getHost(): string {
@@ -92,54 +127,8 @@ export class ConfigService {
   }
 }
 
-export function hasTorUi(interfaces: Record<string, InterfaceDef>): boolean {
-  const int = getUiInterfaceValue(interfaces)
-  return !!int?.['tor-config']
-}
-
-export function hasLocalUi(interfaces: Record<string, InterfaceDef>): boolean {
-  const int = getUiInterfaceValue(interfaces)
-  return !!int?.['lan-config']
-}
-
-export function torUiAddress({
-  manifest,
-  installed,
-}: PackageDataEntry): string {
-  const key = getUiInterfaceKey(manifest.interfaces)
-  return installed ? installed['interface-addresses'][key]['tor-address'] : ''
-}
-
-export function lanUiAddress({
-  manifest,
-  installed,
-}: PackageDataEntry): string {
-  const key = getUiInterfaceKey(manifest.interfaces)
-  return installed ? installed['interface-addresses'][key]['lan-address'] : ''
-}
-
-export function hasUi(interfaces: Record<string, InterfaceDef>): boolean {
-  return hasTorUi(interfaces) || hasLocalUi(interfaces)
-}
-
-export function removeProtocol(str: string): string {
-  if (str.startsWith('http://')) return str.slice(7)
-  if (str.startsWith('https://')) return str.slice(8)
-  return str
-}
-
-export function removePort(str: string): string {
-  return str.split(':')[0]
-}
-
-export function getUiInterfaceKey(
-  interfaces: Record<string, InterfaceDef>,
-): string {
-  return Object.keys(interfaces).find(key => interfaces[key].ui) || ''
-}
-
-export function getUiInterfaceValue(
-  interfaces: Record<string, InterfaceDef>,
-): InterfaceDef | null {
-  return Object.values(interfaces).find(i => i.ui) || null
+export function hasUi(
+  interfaces: InstalledPackageDataEntry['service-interfaces'],
+): boolean {
+  return Object.values(interfaces).some(iface => iface.type === 'ui')
 }
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index e4ea729d9..e00350528 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -2,6 +2,7 @@ import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { Url } from '@start9labs/shared'
 import { MarketplaceManifest } from '@start9labs/marketplace'
 import { BasicInfo } from 'src/app/pages/developer-routes/developer-menu/form-info'
+import { ServiceInterfaceWithHostInfo } from '@start9labs/start-sdk/mjs/lib/types'
 
 export interface DataModel {
   'server-info': ServerInfo
@@ -139,9 +140,7 @@ export interface InstalledPackageDataEntry {
       icon: Url
     }
   }
-  'interface-addresses': {
-    [id: string]: { 'tor-address': string; 'lan-address': string }
-  }
+  'service-interfaces': Record<string, ServiceInterfaceWithHostInfo>
   'marketplace-url': string | null
   'developer-key': string
 }
@@ -160,7 +159,6 @@ export interface Manifest extends MarketplaceManifest<DependencyConfig | null> {
     assets: string // path to assets folder
     scripts: string // path to scripts folder
   }
-  main: ActionImpl
   'health-checks': Record<
     string,
     ActionImpl & { name: string; 'success-message': string | null }
@@ -168,7 +166,6 @@ export interface Manifest extends MarketplaceManifest<DependencyConfig | null> {
   config: ConfigActions | null
   volumes: Record<string, Volume>
   'min-os-version': string
-  interfaces: Record<string, InterfaceDef>
   backup: BackupActions
   migrations: Migrations | null
   actions: Record<string, Action>
@@ -241,15 +238,6 @@ export enum VolumeType {
   Backup = 'backup',
 }
 
-export interface InterfaceDef {
-  name: string
-  description: string
-  'tor-config': TorConfig | null
-  'lan-config': LanConfig | null
-  ui: boolean
-  protocols: string[]
-}
-
 export interface TorConfig {
   'port-mapping': { [port: number]: number }
 }
@@ -297,6 +285,7 @@ export interface MainStatusStopped {
 
 export interface MainStatusStopping {
   status: PackageMainStatus.Stopping
+  timeout: string
 }
 
 export interface MainStatusStarting {
diff --git a/web/projects/ui/src/app/services/ui-launcher.service.ts b/web/projects/ui/src/app/services/ui-launcher.service.ts
index 55559bcd3..70666e264 100644
--- a/web/projects/ui/src/app/services/ui-launcher.service.ts
+++ b/web/projects/ui/src/app/services/ui-launcher.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@angular/core'
 import { WINDOW } from '@ng-web-apis/common'
-import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { InstalledPackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { ConfigService } from './config.service'
 
 @Injectable({
@@ -12,7 +12,11 @@ export class UiLauncherService {
     private readonly config: ConfigService,
   ) {}
 
-  launch(pkg: PackageDataEntry): void {
-    this.windowRef.open(this.config.launchableURL(pkg), '_blank', 'noreferrer')
+  launch(interfaces: InstalledPackageDataEntry['service-interfaces']): void {
+    this.windowRef.open(
+      this.config.launchableAddress(interfaces),
+      '_blank',
+      'noreferrer',
+    )
   }
 }

From 4e3075aabad02fb2b6f878fd01269937c3dbd0d8 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Fri, 23 Feb 2024 15:32:01 -0700
Subject: [PATCH 024/341] chore: Add in the ability to remove the bad sections?

---
 .../Systems/SystemForEmbassy/index.ts         | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 339df6460..4814da9b2 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -826,9 +826,11 @@ export class SystemForEmbassy implements System {
 }
 async function removePointers(value: T.ConfigRes): Promise<T.ConfigRes> {
   const startingSpec = structuredClone(value.spec)
+  const config =
+    value.config && cleanConfigFromPointers(value.config, startingSpec)
   const spec = cleanSpecOfPointers(startingSpec)
 
-  return { ...value, spec }
+  return { config, spec }
 }
 
 const matchPointer = object({
@@ -871,6 +873,44 @@ function cleanSpecOfPointers<T>(mutSpec: T): T {
 
   return mutSpec
 }
+function isKeyOf<O extends object>(
+  key: string,
+  ofObject: O,
+): key is keyof O & string {
+  return key in ofObject
+}
+
+// prettier-ignore
+type CleanConfigFromPointers<C, S> = 
+  [C, S] extends [object, object] ? {
+    [K in (keyof C & keyof S ) & string]: (
+      S[K] extends {type: "pointer"} ? never :
+      S[K] extends {spec: object & infer B} ? CleanConfigFromPointers<C[K], B> :
+      C[K]
+    )
+  } :
+  null
+
+function cleanConfigFromPointers<C, S>(
+  config: C,
+  spec: S,
+): CleanConfigFromPointers<C, S> {
+  const newConfig = {} as CleanConfigFromPointers<C, S>
+
+  if (!(object.test(config) && object.test(spec)) || newConfig == null)
+    return null as CleanConfigFromPointers<C, S>
+
+  for (const key of Object.keys(spec)) {
+    if (!isKeyOf(key, spec)) continue
+    if (!isKeyOf(key, config)) continue
+    const partSpec = spec[key]
+    if (matchPointer.test(partSpec)) continue
+    ;(newConfig as any)[key] = matchSpec.test(partSpec)
+      ? cleanConfigFromPointers(config[key], partSpec.spec)
+      : config[key]
+  }
+  return newConfig as CleanConfigFromPointers<C, S>
+}
 
 async function updateConfig(
   effects: HostSystemStartOs,

From d87748fda1eb74806b824a4f83c0f5cd991afcaa Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 26 Feb 2024 16:59:37 -0700
Subject: [PATCH 025/341] add npm workspace file

---
 package-lock.json | 4444 +++++++++++++++++++++++++++++++++++++++++++++
 package.json      |    4 +
 2 files changed, 4448 insertions(+)
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..aa2b3c81e
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,4444 @@
+{
+	"name": "start-os",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "start-os",
+			"workspaces": [
+				"sdk"
+			]
+		},
+		"node_modules/@ampproject/remapping": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+			"integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.0",
+				"@jridgewell/trace-mapping": "^0.3.9"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/code-frame": {
+			"version": "7.23.5",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+			"integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.23.4",
+				"chalk": "^2.4.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/code-frame/node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/code-frame/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/code-frame/node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/@babel/code-frame/node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+			"dev": true
+		},
+		"node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/@babel/code-frame/node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/code-frame/node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/compat-data": {
+			"version": "7.23.5",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
+			"integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/core": {
+			"version": "7.23.9",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
+			"integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+			"dev": true,
+			"dependencies": {
+				"@ampproject/remapping": "^2.2.0",
+				"@babel/code-frame": "^7.23.5",
+				"@babel/generator": "^7.23.6",
+				"@babel/helper-compilation-targets": "^7.23.6",
+				"@babel/helper-module-transforms": "^7.23.3",
+				"@babel/helpers": "^7.23.9",
+				"@babel/parser": "^7.23.9",
+				"@babel/template": "^7.23.9",
+				"@babel/traverse": "^7.23.9",
+				"@babel/types": "^7.23.9",
+				"convert-source-map": "^2.0.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.2.3",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
+			}
+		},
+		"node_modules/@babel/generator": {
+			"version": "7.23.6",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+			"integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.23.6",
+				"@jridgewell/gen-mapping": "^0.3.2",
+				"@jridgewell/trace-mapping": "^0.3.17",
+				"jsesc": "^2.5.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.23.6",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+			"integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/compat-data": "^7.23.5",
+				"@babel/helper-validator-option": "^7.23.5",
+				"browserslist": "^4.22.2",
+				"lru-cache": "^5.1.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-environment-visitor": {
+			"version": "7.22.20",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+			"integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-function-name": {
+			"version": "7.23.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+			"integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.22.15",
+				"@babel/types": "^7.23.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-hoist-variables": {
+			"version": "7.22.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+			"integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.22.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.22.15",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+			"integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.22.15"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+			"integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-module-imports": "^7.22.15",
+				"@babel/helper-simple-access": "^7.22.5",
+				"@babel/helper-split-export-declaration": "^7.22.6",
+				"@babel/helper-validator-identifier": "^7.22.20"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-plugin-utils": {
+			"version": "7.22.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+			"integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-simple-access": {
+			"version": "7.22.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+			"integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.22.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-split-export-declaration": {
+			"version": "7.22.6",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+			"integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.22.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-string-parser": {
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+			"integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.22.20",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+			"integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.23.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+			"integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helpers": {
+			"version": "7.23.9",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz",
+			"integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.23.9",
+				"@babel/traverse": "^7.23.9",
+				"@babel/types": "^7.23.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight": {
+			"version": "7.23.4",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+			"integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.22.20",
+				"chalk": "^2.4.2",
+				"js-tokens": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+			"dev": true
+		},
+		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.23.9",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
+			"integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+			"dev": true,
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-bigint": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-jsx": {
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
+			"integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.22.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-typescript": {
+			"version": "7.23.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
+			"integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.22.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/template": {
+			"version": "7.23.9",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz",
+			"integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.23.5",
+				"@babel/parser": "^7.23.9",
+				"@babel/types": "^7.23.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.23.9",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz",
+			"integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.23.5",
+				"@babel/generator": "^7.23.6",
+				"@babel/helper-environment-visitor": "^7.22.20",
+				"@babel/helper-function-name": "^7.23.0",
+				"@babel/helper-hoist-variables": "^7.22.5",
+				"@babel/helper-split-export-declaration": "^7.22.6",
+				"@babel/parser": "^7.23.9",
+				"@babel/types": "^7.23.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.23.9",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz",
+			"integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-string-parser": "^7.23.4",
+				"@babel/helper-validator-identifier": "^7.22.20",
+				"to-fast-properties": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+			"dev": true
+		},
+		"node_modules/@cspotcode/source-map-support": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+			"integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/trace-mapping": "0.3.9"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.9",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+			"integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/resolve-uri": "^3.0.3",
+				"@jridgewell/sourcemap-codec": "^1.4.10"
+			}
+		},
+		"node_modules/@esbuild/aix-ppc64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+			"integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"aix"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-arm": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+			"integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-arm64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+			"integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-x64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+			"integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/darwin-arm64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+			"integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/darwin-x64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+			"integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/freebsd-arm64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+			"integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/freebsd-x64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+			"integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-arm": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+			"integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-arm64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+			"integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-ia32": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+			"integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-loong64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+			"integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+			"cpu": [
+				"loong64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-mips64el": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+			"integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+			"cpu": [
+				"mips64el"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-ppc64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+			"integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-riscv64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+			"integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-s390x": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+			"integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+			"cpu": [
+				"s390x"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-x64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+			"integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/netbsd-x64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+			"integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/openbsd-x64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+			"integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/sunos-x64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+			"integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"sunos"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-arm64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+			"integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-ia32": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+			"integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-x64": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+			"integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@iarna/toml": {
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+			"integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+		},
+		"node_modules/@istanbuljs/load-nyc-config": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
+				"js-yaml": "^3.13.1",
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/schema": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/console": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+			"integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/core": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+			"integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/reporters": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.9",
+				"jest-changed-files": "^29.7.0",
+				"jest-config": "^29.7.0",
+				"jest-haste-map": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-resolve-dependencies": "^29.7.0",
+				"jest-runner": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"jest-watcher": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/environment": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+			"integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-mock": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/expect": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+			"integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+			"dev": true,
+			"dependencies": {
+				"expect": "^29.7.0",
+				"jest-snapshot": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/expect-utils": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+			"integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+			"dev": true,
+			"dependencies": {
+				"jest-get-type": "^29.6.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+			"integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@sinonjs/fake-timers": "^10.0.2",
+				"@types/node": "*",
+				"jest-message-util": "^29.7.0",
+				"jest-mock": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/globals": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+			"integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/expect": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"jest-mock": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/reporters": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+			"integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+			"dev": true,
+			"dependencies": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^6.0.0",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.1.3",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"slash": "^3.0.0",
+				"string-length": "^4.0.1",
+				"strip-ansi": "^6.0.0",
+				"v8-to-istanbul": "^9.0.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/schemas": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+			"dev": true,
+			"dependencies": {
+				"@sinclair/typebox": "^0.27.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/source-map": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+			"integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.9"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/test-result": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+			"integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+			"integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/test-result": "^29.7.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/transform": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+			"integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@jest/types": "^29.6.3",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"babel-plugin-istanbul": "^6.1.1",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.4",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^4.0.2"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/types": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.8",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jridgewell/gen-mapping": {
+			"version": "0.3.4",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz",
+			"integrity": "sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/set-array": "^1.0.1",
+				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/trace-mapping": "^0.3.9"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/resolve-uri": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/set-array": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.4.15",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+			"dev": true
+		},
+		"node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.23",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz",
+			"integrity": "sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/resolve-uri": "^3.1.0",
+				"@jridgewell/sourcemap-codec": "^1.4.14"
+			}
+		},
+		"node_modules/@sinclair/typebox": {
+			"version": "0.27.8",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+			"dev": true
+		},
+		"node_modules/@sinonjs/commons": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+			"dev": true,
+			"dependencies": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"node_modules/@sinonjs/fake-timers": {
+			"version": "10.3.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+			"dev": true,
+			"dependencies": {
+				"@sinonjs/commons": "^3.0.0"
+			}
+		},
+		"node_modules/@start9labs/start-sdk": {
+			"resolved": "sdk",
+			"link": true
+		},
+		"node_modules/@tsconfig/node10": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+			"integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node12": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+			"integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node14": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+			"integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+			"dev": true
+		},
+		"node_modules/@tsconfig/node16": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+			"integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+			"dev": true
+		},
+		"node_modules/@types/babel__core": {
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+			"integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/parser": "^7.20.7",
+				"@babel/types": "^7.20.7",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
+			}
+		},
+		"node_modules/@types/babel__generator": {
+			"version": "7.6.8",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+			"integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__template": {
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+			"integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+			"dev": true,
+			"dependencies": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__traverse": {
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+			"integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.20.7"
+			}
+		},
+		"node_modules/@types/graceful-fs": {
+			"version": "4.1.9",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+			"integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/istanbul-lib-coverage": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+			"integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+			"dev": true
+		},
+		"node_modules/@types/istanbul-lib-report": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+			"integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"node_modules/@types/istanbul-reports": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+			"integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"node_modules/@types/jest": {
+			"version": "29.5.12",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
+			"integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+			"dev": true,
+			"dependencies": {
+				"expect": "^29.0.0",
+				"pretty-format": "^29.0.0"
+			}
+		},
+		"node_modules/@types/node": {
+			"version": "20.11.20",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.20.tgz",
+			"integrity": "sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==",
+			"dev": true,
+			"dependencies": {
+				"undici-types": "~5.26.4"
+			}
+		},
+		"node_modules/@types/stack-utils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+			"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+			"dev": true
+		},
+		"node_modules/@types/yargs": {
+			"version": "17.0.32",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+			"integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+			"dev": true,
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/@types/yargs-parser": {
+			"version": "21.0.3",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+			"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+			"dev": true
+		},
+		"node_modules/acorn": {
+			"version": "8.11.3",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+			"integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-walk": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+			"integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.21.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/anymatch": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+			"dev": true,
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/arg": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+			"dev": true
+		},
+		"node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/babel-jest": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+			"integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^29.7.0",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.1.1",
+				"babel-preset-jest": "^29.6.3",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/babel-plugin-istanbul": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^5.0.4",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.12.3",
+				"@babel/parser": "^7.14.7",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-jest-hoist": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+			"integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.1.14",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/babel-preset-current-node-syntax": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.8.3",
+				"@babel/plugin-syntax-import-meta": "^7.8.3",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-top-level-await": "^7.8.3"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/babel-preset-jest": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+			"integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+			"dev": true,
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^29.6.3",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/browserslist": {
+			"version": "4.23.0",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+			"integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001587",
+				"electron-to-chromium": "^1.4.668",
+				"node-releases": "^2.0.14",
+				"update-browserslist-db": "^1.0.13"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+			}
+		},
+		"node_modules/bs-logger": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+			"dev": true,
+			"dependencies": {
+				"fast-json-stable-stringify": "2.x"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bser": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+			"dev": true,
+			"dependencies": {
+				"node-int64": "^0.4.0"
+			}
+		},
+		"node_modules/buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001589",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz",
+			"integrity": "sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			]
+		},
+		"node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ci-info": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cjs-module-lexer": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+			"integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
+			"dev": true
+		},
+		"node_modules/cliui": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+			"dev": true,
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.1",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+			"dev": true,
+			"engines": {
+				"iojs": ">= 1.0.0",
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/collect-v8-coverage": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+			"dev": true
+		},
+		"node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+			"dev": true
+		},
+		"node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+			"dev": true
+		},
+		"node_modules/create-jest": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+			"integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.9",
+				"jest-config": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"prompts": "^2.0.1"
+			},
+			"bin": {
+				"create-jest": "bin/create-jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/create-require": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+			"dev": true
+		},
+		"node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/dedent": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
+			"integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
+			"dev": true,
+			"peerDependencies": {
+				"babel-plugin-macros": "^3.1.0"
+			},
+			"peerDependenciesMeta": {
+				"babel-plugin-macros": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/deepmerge": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/detect-newline": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/diff": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.3.1"
+			}
+		},
+		"node_modules/diff-sequences": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+			"integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+			"dev": true,
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/electron-to-chromium": {
+			"version": "1.4.682",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.682.tgz",
+			"integrity": "sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA==",
+			"dev": true
+		},
+		"node_modules/emittery": {
+			"version": "0.13.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
+			}
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dev": true,
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"node_modules/esbuild": {
+			"version": "0.19.12",
+			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
+			"integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+			"dev": true,
+			"hasInstallScript": true,
+			"bin": {
+				"esbuild": "bin/esbuild"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"optionalDependencies": {
+				"@esbuild/aix-ppc64": "0.19.12",
+				"@esbuild/android-arm": "0.19.12",
+				"@esbuild/android-arm64": "0.19.12",
+				"@esbuild/android-x64": "0.19.12",
+				"@esbuild/darwin-arm64": "0.19.12",
+				"@esbuild/darwin-x64": "0.19.12",
+				"@esbuild/freebsd-arm64": "0.19.12",
+				"@esbuild/freebsd-x64": "0.19.12",
+				"@esbuild/linux-arm": "0.19.12",
+				"@esbuild/linux-arm64": "0.19.12",
+				"@esbuild/linux-ia32": "0.19.12",
+				"@esbuild/linux-loong64": "0.19.12",
+				"@esbuild/linux-mips64el": "0.19.12",
+				"@esbuild/linux-ppc64": "0.19.12",
+				"@esbuild/linux-riscv64": "0.19.12",
+				"@esbuild/linux-s390x": "0.19.12",
+				"@esbuild/linux-x64": "0.19.12",
+				"@esbuild/netbsd-x64": "0.19.12",
+				"@esbuild/openbsd-x64": "0.19.12",
+				"@esbuild/sunos-x64": "0.19.12",
+				"@esbuild/win32-arm64": "0.19.12",
+				"@esbuild/win32-ia32": "0.19.12",
+				"@esbuild/win32-x64": "0.19.12"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+			"integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dev": true,
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/expect": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+			"integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/expect-utils": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"node_modules/fb-watchman": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+			"integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+			"dev": true,
+			"dependencies": {
+				"bser": "2.1.1"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+			"dev": true
+		},
+		"node_modules/fsevents": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+			"dev": true,
+			"hasInstallScript": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true,
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/get-tsconfig": {
+			"version": "4.7.2",
+			"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+			"integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
+			"dev": true,
+			"dependencies": {
+				"resolve-pkg-maps": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+			}
+		},
+		"node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/graceful-fs": {
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+			"dev": true
+		},
+		"node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/hasown": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
+			"integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+			"dev": true
+		},
+		"node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
+		"node_modules/import-local": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+			"dev": true,
+			"dependencies": {
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			},
+			"bin": {
+				"import-local-fixture": "fixtures/cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.19"
+			}
+		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+			"dev": true
+		},
+		"node_modules/is-core-module": {
+			"version": "2.13.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+			"integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+			"dev": true,
+			"dependencies": {
+				"hasown": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-generator-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+			"dev": true
+		},
+		"node_modules/isomorphic-fetch": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+			"integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+			"dependencies": {
+				"node-fetch": "^2.6.1",
+				"whatwg-fetch": "^3.4.1"
+			}
+		},
+		"node_modules/istanbul-lib-coverage": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+			"integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-instrument": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz",
+			"integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.23.9",
+				"@babel/parser": "^7.23.9",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-lib-instrument/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-lib-instrument/node_modules/semver": {
+			"version": "7.6.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-lib-instrument/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/istanbul-lib-report": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+			"dev": true,
+			"dependencies": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^4.0.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-reports": {
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+			"integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+			"dev": true,
+			"dependencies": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+			"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/core": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"import-local": "^3.0.2",
+				"jest-cli": "^29.7.0"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-changed-files": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+			"integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+			"dev": true,
+			"dependencies": {
+				"execa": "^5.0.0",
+				"jest-util": "^29.7.0",
+				"p-limit": "^3.1.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-circus": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+			"integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/expect": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^1.0.0",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^29.7.0",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"p-limit": "^3.1.0",
+				"pretty-format": "^29.7.0",
+				"pure-rand": "^6.0.0",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-cli": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+			"integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/core": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"create-jest": "^29.7.0",
+				"exit": "^0.1.2",
+				"import-local": "^3.0.2",
+				"jest-config": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"yargs": "^17.3.1"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-config": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+			"integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@jest/test-sequencer": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"babel-jest": "^29.7.0",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"jest-circus": "^29.7.0",
+				"jest-environment-node": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-runner": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"parse-json": "^5.2.0",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@types/node": "*",
+				"ts-node": ">=9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/node": {
+					"optional": true
+				},
+				"ts-node": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-diff": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+			"integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^29.6.3",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-docblock": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+			"integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+			"dev": true,
+			"dependencies": {
+				"detect-newline": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-each": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+			"integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-environment-node": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+			"integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-mock": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-get-type": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+			"dev": true,
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-haste-map": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+			"integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/graceful-fs": "^4.1.3",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-regex-util": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.2"
+			}
+		},
+		"node_modules/jest-leak-detector": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+			"integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+			"dev": true,
+			"dependencies": {
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-matcher-utils": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+			"integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-message-util": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+			"integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^29.6.3",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-mock": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+			"integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-pnp-resolver": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			},
+			"peerDependencies": {
+				"jest-resolve": "*"
+			},
+			"peerDependenciesMeta": {
+				"jest-resolve": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-regex-util": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+			"integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+			"dev": true,
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-resolve": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+			"integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"resolve": "^1.20.0",
+				"resolve.exports": "^2.0.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-resolve-dependencies": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+			"integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+			"dev": true,
+			"dependencies": {
+				"jest-regex-util": "^29.6.3",
+				"jest-snapshot": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-runner": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+			"integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/environment": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.13.1",
+				"graceful-fs": "^4.2.9",
+				"jest-docblock": "^29.7.0",
+				"jest-environment-node": "^29.7.0",
+				"jest-haste-map": "^29.7.0",
+				"jest-leak-detector": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-resolve": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-watcher": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"p-limit": "^3.1.0",
+				"source-map-support": "0.5.13"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-runtime": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+			"integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/globals": "^29.7.0",
+				"@jest/source-map": "^29.6.3",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-mock": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-bom": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-snapshot": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+			"integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@babel/generator": "^7.7.2",
+				"@babel/plugin-syntax-jsx": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/types": "^7.3.3",
+				"@jest/expect-utils": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^29.7.0",
+				"graceful-fs": "^4.2.9",
+				"jest-diff": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^29.7.0",
+				"semver": "^7.5.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/semver": {
+			"version": "7.6.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/jest-util": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.9",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-validate": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+			"integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^29.6.3",
+				"leven": "^3.1.0",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-validate/node_modules/camelcase": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/jest-watcher": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+			"integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+			"dev": true,
+			"dependencies": {
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"emittery": "^0.13.1",
+				"jest-util": "^29.7.0",
+				"string-length": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-worker": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+			"integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"jest-util": "^29.7.0",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"node_modules/js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true,
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true
+		},
+		"node_modules/json5": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+			"dev": true,
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/kleur": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/lines-and-columns": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+			"dev": true
+		},
+		"node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+			"dev": true
+		},
+		"node_modules/lru-cache": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^3.0.2"
+			}
+		},
+		"node_modules/make-dir": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+			"dev": true,
+			"dependencies": {
+				"semver": "^7.5.3"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/make-dir/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/make-dir/node_modules/semver": {
+			"version": "7.6.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/make-dir/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/make-error": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+			"dev": true
+		},
+		"node_modules/makeerror": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+			"dev": true,
+			"dependencies": {
+				"tmpl": "1.0.5"
+			}
+		},
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+			"dev": true
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+			"dev": true,
+			"dependencies": {
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+			"dev": true
+		},
+		"node_modules/node-fetch": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+			"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+			"dependencies": {
+				"whatwg-url": "^5.0.0"
+			},
+			"engines": {
+				"node": "4.x || >=6.0.0"
+			},
+			"peerDependencies": {
+				"encoding": "^0.1.0"
+			},
+			"peerDependenciesMeta": {
+				"encoding": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/node-int64": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+			"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+			"dev": true
+		},
+		"node_modules/node-releases": {
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+			"dev": true
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+			"dev": true,
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dev": true,
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/p-locate/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"node_modules/picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
+		"node_modules/picomatch": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/pirates": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+			"integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/prettier": {
+			"version": "3.2.5",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+			"integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+			"dev": true,
+			"bin": {
+				"prettier": "bin/prettier.cjs"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
+		},
+		"node_modules/pretty-format": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^18.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/prompts": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+			"dev": true,
+			"dependencies": {
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.5"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/pure-rand": {
+			"version": "6.0.4",
+			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz",
+			"integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/dubzzz"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/fast-check"
+				}
+			]
+		},
+		"node_modules/react-is": {
+			"version": "18.2.0",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+			"dev": true
+		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/resolve": {
+			"version": "1.22.8",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.13.0",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/resolve-cwd": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+			"dev": true,
+			"dependencies": {
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-pkg-maps": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+			"integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+			}
+		},
+		"node_modules/resolve.exports": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+			"integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/signal-exit": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+			"dev": true
+		},
+		"node_modules/sisteransi": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+			"dev": true
+		},
+		"node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-support": {
+			"version": "0.5.13",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+			"dev": true,
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+			"dev": true
+		},
+		"node_modules/stack-utils": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+			"dev": true,
+			"dependencies": {
+				"escape-string-regexp": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/string-length": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+			"dev": true,
+			"dependencies": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-bom": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/test-exclude": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+			"dev": true,
+			"dependencies": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^7.1.4",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/tmpl": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+			"dev": true
+		},
+		"node_modules/to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/tr46": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+		},
+		"node_modules/ts-jest": {
+			"version": "29.1.2",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz",
+			"integrity": "sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==",
+			"dev": true,
+			"dependencies": {
+				"bs-logger": "0.x",
+				"fast-json-stable-stringify": "2.x",
+				"jest-util": "^29.0.0",
+				"json5": "^2.2.3",
+				"lodash.memoize": "4.x",
+				"make-error": "1.x",
+				"semver": "^7.5.3",
+				"yargs-parser": "^21.0.1"
+			},
+			"bin": {
+				"ts-jest": "cli.js"
+			},
+			"engines": {
+				"node": "^16.10.0 || ^18.0.0 || >=20.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7.0.0-beta.0 <8",
+				"@jest/types": "^29.0.0",
+				"babel-jest": "^29.0.0",
+				"jest": "^29.0.0",
+				"typescript": ">=4.3 <6"
+			},
+			"peerDependenciesMeta": {
+				"@babel/core": {
+					"optional": true
+				},
+				"@jest/types": {
+					"optional": true
+				},
+				"babel-jest": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ts-jest/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ts-jest/node_modules/semver": {
+			"version": "7.6.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ts-jest/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/ts-matches": {
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.4.1.tgz",
+			"integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
+		},
+		"node_modules/ts-node": {
+			"version": "10.9.2",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+			"integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+			"dev": true,
+			"dependencies": {
+				"@cspotcode/source-map-support": "^0.8.0",
+				"@tsconfig/node10": "^1.0.7",
+				"@tsconfig/node12": "^1.0.7",
+				"@tsconfig/node14": "^1.0.0",
+				"@tsconfig/node16": "^1.0.2",
+				"acorn": "^8.4.1",
+				"acorn-walk": "^8.1.1",
+				"arg": "^4.1.0",
+				"create-require": "^1.1.0",
+				"diff": "^4.0.1",
+				"make-error": "^1.1.1",
+				"v8-compile-cache-lib": "^3.0.1",
+				"yn": "3.1.1"
+			},
+			"bin": {
+				"ts-node": "dist/bin.js",
+				"ts-node-cwd": "dist/bin-cwd.js",
+				"ts-node-esm": "dist/bin-esm.js",
+				"ts-node-script": "dist/bin-script.js",
+				"ts-node-transpile-only": "dist/bin-transpile.js",
+				"ts-script": "dist/bin-script-deprecated.js"
+			},
+			"peerDependencies": {
+				"@swc/core": ">=1.2.50",
+				"@swc/wasm": ">=1.2.50",
+				"@types/node": "*",
+				"typescript": ">=2.7"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"@swc/wasm": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/tsx": {
+			"version": "4.7.1",
+			"resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.1.tgz",
+			"integrity": "sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==",
+			"dev": true,
+			"dependencies": {
+				"esbuild": "~0.19.10",
+				"get-tsconfig": "^4.7.2"
+			},
+			"bin": {
+				"tsx": "dist/cli.mjs"
+			},
+			"engines": {
+				"node": ">=18.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.3"
+			}
+		},
+		"node_modules/type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "5.3.3",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+			"integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+			"dev": true,
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=14.17"
+			}
+		},
+		"node_modules/undici-types": {
+			"version": "5.26.5",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+			"dev": true
+		},
+		"node_modules/update-browserslist-db": {
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
+				"escalade": "^3.1.1",
+				"picocolors": "^1.0.0"
+			},
+			"bin": {
+				"update-browserslist-db": "cli.js"
+			},
+			"peerDependencies": {
+				"browserslist": ">= 4.21.0"
+			}
+		},
+		"node_modules/v8-compile-cache-lib": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+			"integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+			"dev": true
+		},
+		"node_modules/v8-to-istanbul": {
+			"version": "9.2.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
+			"integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.12",
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.12.0"
+			}
+		},
+		"node_modules/walker": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+			"dev": true,
+			"dependencies": {
+				"makeerror": "1.0.12"
+			}
+		},
+		"node_modules/webidl-conversions": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+		},
+		"node_modules/whatwg-fetch": {
+			"version": "3.6.20",
+			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+			"integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
+		},
+		"node_modules/whatwg-url": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+			"dependencies": {
+				"tr46": "~0.0.3",
+				"webidl-conversions": "^3.0.0"
+			}
+		},
+		"node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+			"dev": true
+		},
+		"node_modules/write-file-atomic": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+			"dev": true,
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^3.0.7"
+			},
+			"engines": {
+				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+			}
+		},
+		"node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yallist": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+			"dev": true
+		},
+		"node_modules/yaml": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.0.tgz",
+			"integrity": "sha512-j9iR8g+/t0lArF4V6NE/QCfT+CO7iLqrXAHZbJdo+LfjqP1vR8Fg5bSiaq6Q2lOD1AUEVrEVIgABvBFYojJVYQ==",
+			"bin": {
+				"yaml": "bin.mjs"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/yargs": {
+			"version": "17.7.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+			"dev": true,
+			"dependencies": {
+				"cliui": "^8.0.1",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.3",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^21.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/yargs-parser": {
+			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/yn": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"sdk": {
+			"name": "@start9labs/start-sdk",
+			"version": "0.4.0-rev0.lib0.rc8.beta7",
+			"license": "MIT",
+			"dependencies": {
+				"@iarna/toml": "^2.2.5",
+				"isomorphic-fetch": "^3.0.0",
+				"ts-matches": "^5.4.1",
+				"yaml": "^2.2.2"
+			},
+			"devDependencies": {
+				"@types/jest": "^29.4.0",
+				"jest": "^29.4.3",
+				"prettier": "^3.2.5",
+				"ts-jest": "^29.0.5",
+				"ts-node": "^10.9.1",
+				"tsx": "^4.7.1",
+				"typescript": "^5.0.4"
+			}
+		}
+	}
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..ce3109a9e
--- /dev/null
+++ b/package.json
@@ -0,0 +1,4 @@
+{
+	"name": "start-os",
+	"workspaces": ["sdk"]
+}

From ddeed65994d1d2e55bc4fa877ad7d44e8b61c135 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 26 Feb 2024 17:29:20 -0700
Subject: [PATCH 026/341] remove workspace package json

---
 package-lock.json | 4444 ---------------------------------------------
 package.json      |    4 -
 2 files changed, 4448 deletions(-)
 delete mode 100644 package-lock.json
 delete mode 100644 package.json

diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index aa2b3c81e..000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,4444 +0,0 @@
-{
-	"name": "start-os",
-	"lockfileVersion": 3,
-	"requires": true,
-	"packages": {
-		"": {
-			"name": "start-os",
-			"workspaces": [
-				"sdk"
-			]
-		},
-		"node_modules/@ampproject/remapping": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-			"integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/code-frame": {
-			"version": "7.23.5",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-			"integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/highlight": "^7.23.4",
-				"chalk": "^2.4.2"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "1.1.3"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-			"dev": true
-		},
-		"node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/compat-data": {
-			"version": "7.23.5",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-			"integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/core": {
-			"version": "7.23.9",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-			"integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
-			"dev": true,
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.23.5",
-				"@babel/generator": "^7.23.6",
-				"@babel/helper-compilation-targets": "^7.23.6",
-				"@babel/helper-module-transforms": "^7.23.3",
-				"@babel/helpers": "^7.23.9",
-				"@babel/parser": "^7.23.9",
-				"@babel/template": "^7.23.9",
-				"@babel/traverse": "^7.23.9",
-				"@babel/types": "^7.23.9",
-				"convert-source-map": "^2.0.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.3",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@babel/generator": {
-			"version": "7.23.6",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-			"integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.23.6",
-				"@jridgewell/gen-mapping": "^0.3.2",
-				"@jridgewell/trace-mapping": "^0.3.17",
-				"jsesc": "^2.5.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.23.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-			"integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/compat-data": "^7.23.5",
-				"@babel/helper-validator-option": "^7.23.5",
-				"browserslist": "^4.22.2",
-				"lru-cache": "^5.1.1",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-environment-visitor": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-			"integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-function-name": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-			"integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/template": "^7.22.15",
-				"@babel/types": "^7.23.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-hoist-variables": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-			"integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-imports": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-			"integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.22.15"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.23.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-			"integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.20",
-				"@babel/helper-module-imports": "^7.22.15",
-				"@babel/helper-simple-access": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/helper-validator-identifier": "^7.22.20"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-			"integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-simple-access": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-			"integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-split-export-declaration": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-			"integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-string-parser": {
-			"version": "7.23.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-			"integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-			"integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-option": {
-			"version": "7.23.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-			"integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helpers": {
-			"version": "7.23.9",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz",
-			"integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/template": "^7.23.9",
-				"@babel/traverse": "^7.23.9",
-				"@babel/types": "^7.23.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/highlight": {
-			"version": "7.23.4",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-			"integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.22.20",
-				"chalk": "^2.4.2",
-				"js-tokens": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "1.1.3"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-			"dev": true
-		},
-		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/parser": {
-			"version": "7.23.9",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
-			"integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
-			"dev": true,
-			"bin": {
-				"parser": "bin/babel-parser.js"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-bigint": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-import-meta": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.23.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-			"integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-typescript": {
-			"version": "7.23.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
-			"integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/template": {
-			"version": "7.23.9",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz",
-			"integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.23.5",
-				"@babel/parser": "^7.23.9",
-				"@babel/types": "^7.23.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse": {
-			"version": "7.23.9",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz",
-			"integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.23.5",
-				"@babel/generator": "^7.23.6",
-				"@babel/helper-environment-visitor": "^7.22.20",
-				"@babel/helper-function-name": "^7.23.0",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.23.9",
-				"@babel/types": "^7.23.9",
-				"debug": "^4.3.1",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/types": {
-			"version": "7.23.9",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz",
-			"integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-string-parser": "^7.23.4",
-				"@babel/helper-validator-identifier": "^7.22.20",
-				"to-fast-properties": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@bcoe/v8-coverage": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-			"dev": true
-		},
-		"node_modules/@cspotcode/source-map-support": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-			"integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/trace-mapping": "0.3.9"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.9",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-			"integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
-			}
-		},
-		"node_modules/@esbuild/aix-ppc64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-			"integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"aix"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/android-arm": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-			"integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/android-arm64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-			"integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/android-x64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-			"integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/darwin-arm64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-			"integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/darwin-x64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-			"integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/freebsd-arm64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-			"integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/freebsd-x64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-			"integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-arm": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-			"integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-arm64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-			"integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-ia32": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-			"integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-loong64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-			"integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
-			"cpu": [
-				"loong64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-mips64el": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-			"integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
-			"cpu": [
-				"mips64el"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-ppc64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-			"integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-riscv64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-			"integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-s390x": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-			"integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
-			"cpu": [
-				"s390x"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-x64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-			"integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/netbsd-x64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-			"integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"netbsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/openbsd-x64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-			"integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"openbsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/sunos-x64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-			"integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"sunos"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-arm64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-			"integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-ia32": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-			"integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-x64": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-			"integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@iarna/toml": {
-			"version": "2.2.5",
-			"resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-			"integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
-		},
-		"node_modules/@istanbuljs/load-nyc-config": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-			"dev": true,
-			"dependencies": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"get-package-type": "^0.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/schema": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/console": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-			"integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/core": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
-			"integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/reporters": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"jest-changed-files": "^29.7.0",
-				"jest-config": "^29.7.0",
-				"jest-haste-map": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-resolve-dependencies": "^29.7.0",
-				"jest-runner": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"jest-watcher": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.7.0",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@jest/environment": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
-			"integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"jest-mock": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/expect": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
-			"integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
-			"dev": true,
-			"dependencies": {
-				"expect": "^29.7.0",
-				"jest-snapshot": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/expect-utils": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-			"integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-			"dev": true,
-			"dependencies": {
-				"jest-get-type": "^29.6.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/fake-timers": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
-			"integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@sinonjs/fake-timers": "^10.0.2",
-				"@types/node": "*",
-				"jest-message-util": "^29.7.0",
-				"jest-mock": "^29.7.0",
-				"jest-util": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/globals": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-			"integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/expect": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"jest-mock": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/reporters": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-			"integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
-			"dev": true,
-			"dependencies": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^6.0.0",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.1.3",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-worker": "^29.7.0",
-				"slash": "^3.0.0",
-				"string-length": "^4.0.1",
-				"strip-ansi": "^6.0.0",
-				"v8-to-istanbul": "^9.0.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@jest/schemas": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-			"dev": true,
-			"dependencies": {
-				"@sinclair/typebox": "^0.27.8"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/source-map": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
-			"integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.9"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/test-result": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
-			"integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
-			"integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/test-result": "^29.7.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/transform": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
-			"integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@jest/types": "^29.6.3",
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"babel-plugin-istanbul": "^6.1.1",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"pirates": "^4.0.4",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^4.0.2"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/types": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/schemas": "^29.6.3",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.8",
-				"chalk": "^4.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz",
-			"integrity": "sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/set-array": "^1.0.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-			"dev": true
-		},
-		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.23",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz",
-			"integrity": "sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.1.0",
-				"@jridgewell/sourcemap-codec": "^1.4.14"
-			}
-		},
-		"node_modules/@sinclair/typebox": {
-			"version": "0.27.8",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-			"dev": true
-		},
-		"node_modules/@sinonjs/commons": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
-			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
-			"dev": true,
-			"dependencies": {
-				"type-detect": "4.0.8"
-			}
-		},
-		"node_modules/@sinonjs/fake-timers": {
-			"version": "10.3.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
-			"dev": true,
-			"dependencies": {
-				"@sinonjs/commons": "^3.0.0"
-			}
-		},
-		"node_modules/@start9labs/start-sdk": {
-			"resolved": "sdk",
-			"link": true
-		},
-		"node_modules/@tsconfig/node10": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-			"integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-			"dev": true
-		},
-		"node_modules/@tsconfig/node12": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-			"integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-			"dev": true
-		},
-		"node_modules/@tsconfig/node14": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-			"integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-			"dev": true
-		},
-		"node_modules/@tsconfig/node16": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-			"integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-			"dev": true
-		},
-		"node_modules/@types/babel__core": {
-			"version": "7.20.5",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-			"integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/parser": "^7.20.7",
-				"@babel/types": "^7.20.7",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
-			}
-		},
-		"node_modules/@types/babel__generator": {
-			"version": "7.6.8",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-			"integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"node_modules/@types/babel__template": {
-			"version": "7.4.4",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-			"integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-			"dev": true,
-			"dependencies": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"node_modules/@types/babel__traverse": {
-			"version": "7.20.5",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
-			"integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.20.7"
-			}
-		},
-		"node_modules/@types/graceful-fs": {
-			"version": "4.1.9",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-			"integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/node": "*"
-			}
-		},
-		"node_modules/@types/istanbul-lib-coverage": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-			"integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-			"dev": true
-		},
-		"node_modules/@types/istanbul-lib-report": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
-			"integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-			"dev": true,
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"node_modules/@types/istanbul-reports": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
-			"integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-			"dev": true,
-			"dependencies": {
-				"@types/istanbul-lib-report": "*"
-			}
-		},
-		"node_modules/@types/jest": {
-			"version": "29.5.12",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
-			"integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
-			"dev": true,
-			"dependencies": {
-				"expect": "^29.0.0",
-				"pretty-format": "^29.0.0"
-			}
-		},
-		"node_modules/@types/node": {
-			"version": "20.11.20",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.20.tgz",
-			"integrity": "sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==",
-			"dev": true,
-			"dependencies": {
-				"undici-types": "~5.26.4"
-			}
-		},
-		"node_modules/@types/stack-utils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-			"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-			"dev": true
-		},
-		"node_modules/@types/yargs": {
-			"version": "17.0.32",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-			"integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
-			"dev": true,
-			"dependencies": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"node_modules/@types/yargs-parser": {
-			"version": "21.0.3",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-			"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-			"dev": true
-		},
-		"node_modules/acorn": {
-			"version": "8.11.3",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-			"integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
-			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/acorn-walk": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
-			"integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/ansi-escapes": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-			"dev": true,
-			"dependencies": {
-				"type-fest": "^0.21.3"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/anymatch": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-			"dev": true,
-			"dependencies": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/arg": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-			"dev": true
-		},
-		"node_modules/argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"dev": true,
-			"dependencies": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
-		"node_modules/babel-jest": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-			"integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/transform": "^29.7.0",
-				"@types/babel__core": "^7.1.14",
-				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^29.6.3",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.8.0"
-			}
-		},
-		"node_modules/babel-plugin-istanbul": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^5.0.4",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.12.3",
-				"@babel/parser": "^7.14.7",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-jest-hoist": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
-			"integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.1.14",
-				"@types/babel__traverse": "^7.0.6"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/babel-preset-current-node-syntax": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-bigint": "^7.8.3",
-				"@babel/plugin-syntax-class-properties": "^7.8.3",
-				"@babel/plugin-syntax-import-meta": "^7.8.3",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-top-level-await": "^7.8.3"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/babel-preset-jest": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
-			"integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
-			"dev": true,
-			"dependencies": {
-				"babel-plugin-jest-hoist": "^29.6.3",
-				"babel-preset-current-node-syntax": "^1.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true
-		},
-		"node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"dev": true,
-			"dependencies": {
-				"fill-range": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/browserslist": {
-			"version": "4.23.0",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-			"integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"dependencies": {
-				"caniuse-lite": "^1.0.30001587",
-				"electron-to-chromium": "^1.4.668",
-				"node-releases": "^2.0.14",
-				"update-browserslist-db": "^1.0.13"
-			},
-			"bin": {
-				"browserslist": "cli.js"
-			},
-			"engines": {
-				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-			}
-		},
-		"node_modules/bs-logger": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-			"dev": true,
-			"dependencies": {
-				"fast-json-stable-stringify": "2.x"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/bser": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-			"dev": true,
-			"dependencies": {
-				"node-int64": "^0.4.0"
-			}
-		},
-		"node_modules/buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"dev": true
-		},
-		"node_modules/callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/caniuse-lite": {
-			"version": "1.0.30001589",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz",
-			"integrity": "sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			]
-		},
-		"node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/ci-info": {
-			"version": "3.9.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/cjs-module-lexer": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
-			"integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
-			"dev": true
-		},
-		"node_modules/cliui": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dev": true,
-			"dependencies": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-			"dev": true,
-			"engines": {
-				"iojs": ">= 1.0.0",
-				"node": ">= 0.12.0"
-			}
-		},
-		"node_modules/collect-v8-coverage": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-			"dev": true
-		},
-		"node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"node_modules/concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-			"dev": true
-		},
-		"node_modules/convert-source-map": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-			"dev": true
-		},
-		"node_modules/create-jest": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-			"integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"jest-config": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"prompts": "^2.0.1"
-			},
-			"bin": {
-				"create-jest": "bin/create-jest.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/create-require": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-			"dev": true
-		},
-		"node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-			"dev": true,
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-			"dev": true,
-			"dependencies": {
-				"ms": "2.1.2"
-			},
-			"engines": {
-				"node": ">=6.0"
-			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/dedent": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
-			"integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
-			"dev": true,
-			"peerDependencies": {
-				"babel-plugin-macros": "^3.1.0"
-			},
-			"peerDependenciesMeta": {
-				"babel-plugin-macros": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/deepmerge": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/diff": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.3.1"
-			}
-		},
-		"node_modules/diff-sequences": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-			"integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-			"dev": true,
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/electron-to-chromium": {
-			"version": "1.4.682",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.682.tgz",
-			"integrity": "sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA==",
-			"dev": true
-		},
-		"node_modules/emittery": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
-			}
-		},
-		"node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"node_modules/error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
-			"dependencies": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"node_modules/esbuild": {
-			"version": "0.19.12",
-			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
-			"integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
-			"dev": true,
-			"hasInstallScript": true,
-			"bin": {
-				"esbuild": "bin/esbuild"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"optionalDependencies": {
-				"@esbuild/aix-ppc64": "0.19.12",
-				"@esbuild/android-arm": "0.19.12",
-				"@esbuild/android-arm64": "0.19.12",
-				"@esbuild/android-x64": "0.19.12",
-				"@esbuild/darwin-arm64": "0.19.12",
-				"@esbuild/darwin-x64": "0.19.12",
-				"@esbuild/freebsd-arm64": "0.19.12",
-				"@esbuild/freebsd-x64": "0.19.12",
-				"@esbuild/linux-arm": "0.19.12",
-				"@esbuild/linux-arm64": "0.19.12",
-				"@esbuild/linux-ia32": "0.19.12",
-				"@esbuild/linux-loong64": "0.19.12",
-				"@esbuild/linux-mips64el": "0.19.12",
-				"@esbuild/linux-ppc64": "0.19.12",
-				"@esbuild/linux-riscv64": "0.19.12",
-				"@esbuild/linux-s390x": "0.19.12",
-				"@esbuild/linux-x64": "0.19.12",
-				"@esbuild/netbsd-x64": "0.19.12",
-				"@esbuild/openbsd-x64": "0.19.12",
-				"@esbuild/sunos-x64": "0.19.12",
-				"@esbuild/win32-arm64": "0.19.12",
-				"@esbuild/win32-ia32": "0.19.12",
-				"@esbuild/win32-x64": "0.19.12"
-			}
-		},
-		"node_modules/escalade": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-			"integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/escape-string-regexp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true,
-			"bin": {
-				"esparse": "bin/esparse.js",
-				"esvalidate": "bin/esvalidate.js"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/execa": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
-			"dependencies": {
-				"cross-spawn": "^7.0.3",
-				"get-stream": "^6.0.0",
-				"human-signals": "^2.1.0",
-				"is-stream": "^2.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.1",
-				"onetime": "^5.1.2",
-				"signal-exit": "^3.0.3",
-				"strip-final-newline": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/execa?sponsor=1"
-			}
-		},
-		"node_modules/exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/expect": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-			"integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/expect-utils": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
-		},
-		"node_modules/fb-watchman": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-			"integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-			"dev": true,
-			"dependencies": {
-				"bser": "2.1.1"
-			}
-		},
-		"node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"dev": true,
-			"dependencies": {
-				"to-regex-range": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-			"dev": true
-		},
-		"node_modules/fsevents": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-			"dev": true,
-			"hasInstallScript": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-			}
-		},
-		"node_modules/function-bind": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-			"dev": true,
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-			"dev": true,
-			"engines": {
-				"node": "6.* || 8.* || >= 10.*"
-			}
-		},
-		"node_modules/get-package-type": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
-		"node_modules/get-stream": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/get-tsconfig": {
-			"version": "4.7.2",
-			"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
-			"integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
-			"dev": true,
-			"dependencies": {
-				"resolve-pkg-maps": "^1.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-			}
-		},
-		"node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"dev": true,
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/graceful-fs": {
-			"version": "4.2.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-			"dev": true
-		},
-		"node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/hasown": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
-			"integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
-			"dev": true,
-			"dependencies": {
-				"function-bind": "^1.1.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-			"dev": true
-		},
-		"node_modules/human-signals": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10.17.0"
-			}
-		},
-		"node_modules/import-local": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-			"dev": true,
-			"dependencies": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			},
-			"bin": {
-				"import-local-fixture": "fixtures/cli.js"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.8.19"
-			}
-		},
-		"node_modules/inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-			"dev": true,
-			"dependencies": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"node_modules/inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true
-		},
-		"node_modules/is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-			"dev": true
-		},
-		"node_modules/is-core-module": {
-			"version": "2.13.1",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-			"integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
-			"dev": true,
-			"dependencies": {
-				"hasown": "^2.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.12.0"
-			}
-		},
-		"node_modules/is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-			"dev": true
-		},
-		"node_modules/isomorphic-fetch": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
-			"integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
-			"dependencies": {
-				"node-fetch": "^2.6.1",
-				"whatwg-fetch": "^3.4.1"
-			}
-		},
-		"node_modules/istanbul-lib-coverage": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-			"integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/istanbul-lib-instrument": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz",
-			"integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.23.9",
-				"@babel/parser": "^7.23.9",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^7.5.4"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-instrument/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-instrument/node_modules/semver": {
-			"version": "7.6.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-			"dev": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-instrument/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
-		},
-		"node_modules/istanbul-lib-report": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-			"dev": true,
-			"dependencies": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^4.0.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-source-maps": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-			"dev": true,
-			"dependencies": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-reports": {
-			"version": "3.1.7",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-			"integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-			"dev": true,
-			"dependencies": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-			"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/core": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"import-local": "^3.0.2",
-				"jest-cli": "^29.7.0"
-			},
-			"bin": {
-				"jest": "bin/jest.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-changed-files": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-			"integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-			"dev": true,
-			"dependencies": {
-				"execa": "^5.0.0",
-				"jest-util": "^29.7.0",
-				"p-limit": "^3.1.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-circus": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-			"integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/expect": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"dedent": "^1.0.0",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^29.7.0",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"p-limit": "^3.1.0",
-				"pretty-format": "^29.7.0",
-				"pure-rand": "^6.0.0",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-cli": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-			"integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
-			"dev": true,
-			"dependencies": {
-				"@jest/core": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"create-jest": "^29.7.0",
-				"exit": "^0.1.2",
-				"import-local": "^3.0.2",
-				"jest-config": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"yargs": "^17.3.1"
-			},
-			"bin": {
-				"jest": "bin/jest.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-config": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-			"integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@jest/test-sequencer": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"babel-jest": "^29.7.0",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-circus": "^29.7.0",
-				"jest-environment-node": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-runner": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"parse-json": "^5.2.0",
-				"pretty-format": "^29.7.0",
-				"slash": "^3.0.0",
-				"strip-json-comments": "^3.1.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@types/node": "*",
-				"ts-node": ">=9.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/node": {
-					"optional": true
-				},
-				"ts-node": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-diff": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-			"integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-			"dev": true,
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^29.6.3",
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-docblock": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-			"integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-			"dev": true,
-			"dependencies": {
-				"detect-newline": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-each": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-			"integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-environment-node": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-			"integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"jest-mock": "^29.7.0",
-				"jest-util": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-get-type": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-			"dev": true,
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-haste-map": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-			"integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/graceful-fs": "^4.1.3",
-				"@types/node": "*",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-regex-util": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"jest-worker": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.2"
-			}
-		},
-		"node_modules/jest-leak-detector": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-			"integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-			"dev": true,
-			"dependencies": {
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-matcher-utils": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-			"integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-			"dev": true,
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-message-util": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-			"integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^29.6.3",
-				"@types/stack-utils": "^2.0.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.7.0",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-mock": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-			"integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"jest-util": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-pnp-resolver": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			},
-			"peerDependencies": {
-				"jest-resolve": "*"
-			},
-			"peerDependenciesMeta": {
-				"jest-resolve": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-regex-util": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-			"integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-			"dev": true,
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-resolve": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-			"integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-			"dev": true,
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-pnp-resolver": "^1.2.2",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"resolve": "^1.20.0",
-				"resolve.exports": "^2.0.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-resolve-dependencies": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-			"integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-			"dev": true,
-			"dependencies": {
-				"jest-regex-util": "^29.6.3",
-				"jest-snapshot": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-runner": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-			"integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/environment": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"emittery": "^0.13.1",
-				"graceful-fs": "^4.2.9",
-				"jest-docblock": "^29.7.0",
-				"jest-environment-node": "^29.7.0",
-				"jest-haste-map": "^29.7.0",
-				"jest-leak-detector": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-resolve": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-watcher": "^29.7.0",
-				"jest-worker": "^29.7.0",
-				"p-limit": "^3.1.0",
-				"source-map-support": "0.5.13"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-runtime": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-			"integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/globals": "^29.7.0",
-				"@jest/source-map": "^29.6.3",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"cjs-module-lexer": "^1.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-mock": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-snapshot": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-			"integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@babel/generator": "^7.7.2",
-				"@babel/plugin-syntax-jsx": "^7.7.2",
-				"@babel/plugin-syntax-typescript": "^7.7.2",
-				"@babel/types": "^7.3.3",
-				"@jest/expect-utils": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"babel-preset-current-node-syntax": "^1.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^29.7.0",
-				"graceful-fs": "^4.2.9",
-				"jest-diff": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^29.7.0",
-				"semver": "^7.5.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/semver": {
-			"version": "7.6.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-			"dev": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
-		},
-		"node_modules/jest-util": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.9",
-				"picomatch": "^2.2.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-validate": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-			"integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
-			"dev": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^29.6.3",
-				"leven": "^3.1.0",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-validate/node_modules/camelcase": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/jest-watcher": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-			"integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-			"dev": true,
-			"dependencies": {
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"emittery": "^0.13.1",
-				"jest-util": "^29.7.0",
-				"string-length": "^4.0.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-worker": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-			"integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-			"dev": true,
-			"dependencies": {
-				"@types/node": "*",
-				"jest-util": "^29.7.0",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-worker/node_modules/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
-		},
-		"node_modules/js-yaml": {
-			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-			"dev": true,
-			"dependencies": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true,
-			"bin": {
-				"jsesc": "bin/jsesc"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"dev": true
-		},
-		"node_modules/json5": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-			"dev": true,
-			"bin": {
-				"json5": "lib/cli.js"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/lines-and-columns": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-			"dev": true
-		},
-		"node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-			"dev": true
-		},
-		"node_modules/lru-cache": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-			"dev": true,
-			"dependencies": {
-				"yallist": "^3.0.2"
-			}
-		},
-		"node_modules/make-dir": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-			"dev": true,
-			"dependencies": {
-				"semver": "^7.5.3"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/make-dir/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/make-dir/node_modules/semver": {
-			"version": "7.6.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-			"dev": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/make-dir/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
-		},
-		"node_modules/make-error": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-			"dev": true
-		},
-		"node_modules/makeerror": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-			"dev": true,
-			"dependencies": {
-				"tmpl": "1.0.5"
-			}
-		},
-		"node_modules/merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"dev": true
-		},
-		"node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-			"dev": true,
-			"dependencies": {
-				"braces": "^3.0.2",
-				"picomatch": "^2.3.1"
-			},
-			"engines": {
-				"node": ">=8.6"
-			}
-		},
-		"node_modules/mimic-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
-		},
-		"node_modules/natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true
-		},
-		"node_modules/node-fetch": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-			"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/node-int64": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-			"dev": true
-		},
-		"node_modules/node-releases": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-			"dev": true
-		},
-		"node_modules/normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/npm-run-path": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
-			"dependencies": {
-				"path-key": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-			"dev": true,
-			"dependencies": {
-				"wrappy": "1"
-			}
-		},
-		"node_modules/onetime": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
-			"dependencies": {
-				"mimic-fn": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-limit": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-			"dev": true,
-			"dependencies": {
-				"yocto-queue": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/p-locate/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-			"dev": true
-		},
-		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-			"dev": true
-		},
-		"node_modules/picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=8.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/pirates": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-			"integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"dependencies": {
-				"find-up": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/prettier": {
-			"version": "3.2.5",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-			"integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
-			"dev": true,
-			"bin": {
-				"prettier": "bin/prettier.cjs"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/prettier/prettier?sponsor=1"
-			}
-		},
-		"node_modules/pretty-format": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-			"dev": true,
-			"dependencies": {
-				"@jest/schemas": "^29.6.3",
-				"ansi-styles": "^5.0.0",
-				"react-is": "^18.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/pretty-format/node_modules/ansi-styles": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/prompts": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-			"dev": true,
-			"dependencies": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.5"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/pure-rand": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz",
-			"integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://github.com/sponsors/dubzzz"
-				},
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/fast-check"
-				}
-			]
-		},
-		"node_modules/react-is": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-			"dev": true
-		},
-		"node_modules/require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/resolve": {
-			"version": "1.22.8",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-			"dev": true,
-			"dependencies": {
-				"is-core-module": "^2.13.0",
-				"path-parse": "^1.0.7",
-				"supports-preserve-symlinks-flag": "^1.0.0"
-			},
-			"bin": {
-				"resolve": "bin/resolve"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/resolve-cwd": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
-			"dependencies": {
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-pkg-maps": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-			"integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-			"dev": true,
-			"funding": {
-				"url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
-			}
-		},
-		"node_modules/resolve.exports": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-			"integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/signal-exit": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-			"dev": true
-		},
-		"node_modules/sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-			"dev": true
-		},
-		"node_modules/slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-support": {
-			"version": "0.5.13",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-			"dev": true,
-			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"node_modules/sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-			"dev": true
-		},
-		"node_modules/stack-utils": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-			"dev": true,
-			"dependencies": {
-				"escape-string-regexp": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/string-length": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-			"dev": true,
-			"dependencies": {
-				"char-regex": "^1.0.2",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-preserve-symlinks-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/test-exclude": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-			"dev": true,
-			"dependencies": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^7.1.4",
-				"minimatch": "^3.0.4"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/tmpl": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-			"dev": true
-		},
-		"node_modules/to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
-		"node_modules/tr46": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-		},
-		"node_modules/ts-jest": {
-			"version": "29.1.2",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz",
-			"integrity": "sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==",
-			"dev": true,
-			"dependencies": {
-				"bs-logger": "0.x",
-				"fast-json-stable-stringify": "2.x",
-				"jest-util": "^29.0.0",
-				"json5": "^2.2.3",
-				"lodash.memoize": "4.x",
-				"make-error": "1.x",
-				"semver": "^7.5.3",
-				"yargs-parser": "^21.0.1"
-			},
-			"bin": {
-				"ts-jest": "cli.js"
-			},
-			"engines": {
-				"node": "^16.10.0 || ^18.0.0 || >=20.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": ">=7.0.0-beta.0 <8",
-				"@jest/types": "^29.0.0",
-				"babel-jest": "^29.0.0",
-				"jest": "^29.0.0",
-				"typescript": ">=4.3 <6"
-			},
-			"peerDependenciesMeta": {
-				"@babel/core": {
-					"optional": true
-				},
-				"@jest/types": {
-					"optional": true
-				},
-				"babel-jest": {
-					"optional": true
-				},
-				"esbuild": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/ts-jest/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/ts-jest/node_modules/semver": {
-			"version": "7.6.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-			"integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-			"dev": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/ts-jest/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true
-		},
-		"node_modules/ts-matches": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.4.1.tgz",
-			"integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
-		},
-		"node_modules/ts-node": {
-			"version": "10.9.2",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
-			"integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
-			"dev": true,
-			"dependencies": {
-				"@cspotcode/source-map-support": "^0.8.0",
-				"@tsconfig/node10": "^1.0.7",
-				"@tsconfig/node12": "^1.0.7",
-				"@tsconfig/node14": "^1.0.0",
-				"@tsconfig/node16": "^1.0.2",
-				"acorn": "^8.4.1",
-				"acorn-walk": "^8.1.1",
-				"arg": "^4.1.0",
-				"create-require": "^1.1.0",
-				"diff": "^4.0.1",
-				"make-error": "^1.1.1",
-				"v8-compile-cache-lib": "^3.0.1",
-				"yn": "3.1.1"
-			},
-			"bin": {
-				"ts-node": "dist/bin.js",
-				"ts-node-cwd": "dist/bin-cwd.js",
-				"ts-node-esm": "dist/bin-esm.js",
-				"ts-node-script": "dist/bin-script.js",
-				"ts-node-transpile-only": "dist/bin-transpile.js",
-				"ts-script": "dist/bin-script-deprecated.js"
-			},
-			"peerDependencies": {
-				"@swc/core": ">=1.2.50",
-				"@swc/wasm": ">=1.2.50",
-				"@types/node": "*",
-				"typescript": ">=2.7"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"@swc/wasm": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/tsx": {
-			"version": "4.7.1",
-			"resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.1.tgz",
-			"integrity": "sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==",
-			"dev": true,
-			"dependencies": {
-				"esbuild": "~0.19.10",
-				"get-tsconfig": "^4.7.2"
-			},
-			"bin": {
-				"tsx": "dist/cli.mjs"
-			},
-			"engines": {
-				"node": ">=18.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "~2.3.3"
-			}
-		},
-		"node_modules/type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/type-fest": {
-			"version": "0.21.3",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/typescript": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-			"integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
-			"dev": true,
-			"bin": {
-				"tsc": "bin/tsc",
-				"tsserver": "bin/tsserver"
-			},
-			"engines": {
-				"node": ">=14.17"
-			}
-		},
-		"node_modules/undici-types": {
-			"version": "5.26.5",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-			"dev": true
-		},
-		"node_modules/update-browserslist-db": {
-			"version": "1.0.13",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"dependencies": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
-			},
-			"bin": {
-				"update-browserslist-db": "cli.js"
-			},
-			"peerDependencies": {
-				"browserslist": ">= 4.21.0"
-			}
-		},
-		"node_modules/v8-compile-cache-lib": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-			"integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-			"dev": true
-		},
-		"node_modules/v8-to-istanbul": {
-			"version": "9.2.0",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
-			"integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.12",
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10.12.0"
-			}
-		},
-		"node_modules/walker": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-			"dev": true,
-			"dependencies": {
-				"makeerror": "1.0.12"
-			}
-		},
-		"node_modules/webidl-conversions": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-		},
-		"node_modules/whatwg-fetch": {
-			"version": "3.6.20",
-			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
-			"integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
-		},
-		"node_modules/whatwg-url": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-			"dependencies": {
-				"tr46": "~0.0.3",
-				"webidl-conversions": "^3.0.0"
-			}
-		},
-		"node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-			"dev": true
-		},
-		"node_modules/write-file-atomic": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-			"dev": true,
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^3.0.7"
-			},
-			"engines": {
-				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-			}
-		},
-		"node_modules/y18n": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yallist": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-			"dev": true
-		},
-		"node_modules/yaml": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.0.tgz",
-			"integrity": "sha512-j9iR8g+/t0lArF4V6NE/QCfT+CO7iLqrXAHZbJdo+LfjqP1vR8Fg5bSiaq6Q2lOD1AUEVrEVIgABvBFYojJVYQ==",
-			"bin": {
-				"yaml": "bin.mjs"
-			},
-			"engines": {
-				"node": ">= 14"
-			}
-		},
-		"node_modules/yargs": {
-			"version": "17.7.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-			"dev": true,
-			"dependencies": {
-				"cliui": "^8.0.1",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.3",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^21.1.1"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/yargs-parser": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"dev": true,
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/yn": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"sdk": {
-			"name": "@start9labs/start-sdk",
-			"version": "0.4.0-rev0.lib0.rc8.beta7",
-			"license": "MIT",
-			"dependencies": {
-				"@iarna/toml": "^2.2.5",
-				"isomorphic-fetch": "^3.0.0",
-				"ts-matches": "^5.4.1",
-				"yaml": "^2.2.2"
-			},
-			"devDependencies": {
-				"@types/jest": "^29.4.0",
-				"jest": "^29.4.3",
-				"prettier": "^3.2.5",
-				"ts-jest": "^29.0.5",
-				"ts-node": "^10.9.1",
-				"tsx": "^4.7.1",
-				"typescript": "^5.0.4"
-			}
-		}
-	}
-}
diff --git a/package.json b/package.json
deleted file mode 100644
index ce3109a9e..000000000
--- a/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"name": "start-os",
-	"workspaces": ["sdk"]
-}

From 6b990e1ceebb09c8d618778eb72e940785f0c558 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 27 Feb 2024 12:33:31 -0700
Subject: [PATCH 027/341] chore: Up the version

---
 sdk/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/package.json b/sdk/package.json
index 110b4bc8f..d2cab0a39 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.4.0-rev0.lib0.rc8.beta7",
+  "version": "0.4.0-rev0.lib0.rc8.beta8",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./cjs/lib/index.js",
   "types": "./cjs/lib/index.d.ts",
@@ -56,4 +56,4 @@
     "tsx": "^4.7.1",
     "typescript": "^5.0.4"
   }
-}
+}
\ No newline at end of file

From 2f6d7ac12835d0bda6d1a8c18530b928728088d3 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 27 Feb 2024 13:11:04 -0700
Subject: [PATCH 028/341] chore: Update to have the startsdk

---
 sdk/lib/index.ts      | 1 +
 sdk/package-lock.json | 4 ++--
 sdk/package.json      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index 746bc12e9..1430c3be7 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -2,6 +2,7 @@ export { Daemons } from "./mainFn/Daemons"
 export { EmVer } from "./emverLite/mod"
 export { Overlay } from "./util/Overlay"
 export { Utils } from "./util/utils"
+export { StartSdk } from "./StartSdk"
 export * as actions from "./actions"
 export * as backup from "./backup"
 export * as config from "./config"
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index 8c6d32fc8..d9d124e1e 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.4.0-rev0.lib0.rc8.beta7",
+  "version": "0.4.0-rev0.lib0.rc8.beta9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-rev0.lib0.rc8.beta7",
+      "version": "0.4.0-rev0.lib0.rc8.beta9",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/sdk/package.json b/sdk/package.json
index d2cab0a39..c0acf932a 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.4.0-rev0.lib0.rc8.beta8",
+  "version": "0.4.0-rev0.lib0.rc8.beta9",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./cjs/lib/index.js",
   "types": "./cjs/lib/index.d.ts",

From f50ddb436f0dab950d8ea62497c9e46af1579318 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 27 Feb 2024 13:12:51 -0700
Subject: [PATCH 029/341] chore: somethinng

---
 sdk/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/package.json b/sdk/package.json
index c0acf932a..14165ca30 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.4.0-rev0.lib0.rc8.beta9",
+  "version": "0.4.0-rev0.lib0.rc8.beta10",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./cjs/lib/index.js",
   "types": "./cjs/lib/index.d.ts",

From 171e0ed31286d99ae54a65c40b21376917358aa9 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 27 Feb 2024 13:20:55 -0700
Subject: [PATCH 030/341] chore: Something

---
 sdk/package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index d9d124e1e..c00bd6701 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.4.0-rev0.lib0.rc8.beta9",
+  "version": "0.4.0-rev0.lib0.rc8.beta10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-rev0.lib0.rc8.beta9",
+      "version": "0.4.0-rev0.lib0.rc8.beta10",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",

From 5366b4c873719c5b49f6026b3ce66f07c0f60333 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 27 Feb 2024 13:25:58 -0700
Subject: [PATCH 031/341] chore: Add another export

---
 sdk/lib/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index 1430c3be7..aff2ef7ed 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -3,6 +3,7 @@ export { EmVer } from "./emverLite/mod"
 export { Overlay } from "./util/Overlay"
 export { Utils } from "./util/utils"
 export { StartSdk } from "./StartSdk"
+export { setupManifest } from "./manifest/setupManifest"
 export * as actions from "./actions"
 export * as backup from "./backup"
 export * as config from "./config"

From 11c93231aa6478912701aaa65b7c4761ef78bd11 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 4 Mar 2024 13:37:48 -0700
Subject: [PATCH 032/341] fix: Let the service be able to be started

---
 core/startos/src/service/mod.rs               | 35 +++++++++++++++----
 .../src/service/service_effect_handler.rs     | 18 +++++-----
 core/startos/src/service/transition/mod.rs    |  2 +-
 3 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index b572caa89..b5a9c4bb2 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -389,7 +389,7 @@ impl Service {
     }
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 struct RunningStatus {
     health: OrdMap<HealthCheckId, HealthCheckResult>,
     started: DateTime<Utc>,
@@ -406,7 +406,32 @@ pub(self) struct ServiceActorSeed {
     synchronized: Arc<Notify>,
 }
 
+impl ServiceActorSeed {
+    pub fn started(&self) {
+        self.persistent_container
+            .current_state
+            .send_replace(StartStop::Start);
+        self.persistent_container
+            .running_status
+            .send_modify(|running_status| {
+                *running_status =
+                    Some(
+                        std::mem::take(running_status).unwrap_or_else(|| RunningStatus {
+                            health: Default::default(),
+                            started: Utc::now(),
+                        }),
+                    );
+            })
+    }
+    pub fn stopped(&self) {
+        self.persistent_container
+            .current_state
+            .send_replace(StartStop::Stop);
+        self.persistent_container.running_status.send_replace(None);
+    }
+}
 struct ServiceActor(Arc<ServiceActorSeed>);
+
 impl Actor for ServiceActor {
     fn init(&mut self, jobs: &mut BackgroundJobs) {
         let seed = self.0.clone();
@@ -418,7 +443,7 @@ impl Actor for ServiceActor {
             let mut transition = seed.transition_state.subscribe();
             let mut running = seed.running_status.clone();
             loop {
-                let (desired_state, current_state, transition_kind, running_status) = (
+                let (desired_state, current_state, transition_kind, running_status) = dbg!(
                     temp_desired.borrow().unwrap_or(*desired.borrow()),
                     *current.borrow(),
                     transition.borrow().as_ref().map(|t| t.kind()),
@@ -464,10 +489,8 @@ impl Actor for ServiceActor {
                                             timeout: todo!("sigterm timeout"),
                                         }
                                     }
-                                    (None, StartStop::Start, StartStop::Stop, _) => {
-                                        MainStatus::Starting
-                                    }
-                                    (None, StartStop::Start, StartStop::Start, None) => {
+                                    (None, StartStop::Start, StartStop::Stop, _)
+                                    | (None, StartStop::Start, StartStop::Start, None) => {
                                         MainStatus::Starting
                                     }
                                     (None, StartStop::Start, StartStop::Start, Some(status)) => {
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 4a8e647d7..c4a9584d3 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1,9 +1,10 @@
-use std::ffi::OsString;
 use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
+use std::{ffi::OsString, time::Instant};
 
+use chrono::Utc;
 use clap::builder::{TypedValueParser, ValueParserFactory};
 use clap::Parser;
 use imbl_value::json;
@@ -12,7 +13,6 @@ use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use tokio::process::Command;
 
-use crate::db::model::ExposedUI;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
@@ -25,6 +25,7 @@ use crate::status::health_check::HealthCheckResult;
 use crate::status::MainStatus;
 use crate::util::clap::FromStrParser;
 use crate::util::{new_guid, Invoke};
+use crate::{db::model::ExposedUI, service::RunningStatus};
 use crate::{echo, ARCH};
 
 #[derive(Clone)]
@@ -487,6 +488,7 @@ async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result
     Ok(json!(matches!(package, MainStatus::Stopped)))
 }
 async fn running(context: EffectContext, params: ParamsMaybePackageId) -> Result<Value, Error> {
+    dbg!("Starting the running {params:?}");
     let context = context.deref()?;
     let peeked = context.ctx.db.peek().await;
     let package_id = params.package_id.unwrap_or_else(|| context.id.clone());
@@ -586,14 +588,12 @@ struct SetMainStatus {
     status: Status,
 }
 async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Result<Value, Error> {
+    dbg!(format!("Status for main will be is {params:?}"));
     let context = context.deref()?;
-    context
-        .persistent_container
-        .current_state
-        .send_replace(match params.status {
-            Status::Running => StartStop::Start,
-            Status::Stopped => StartStop::Stop,
-        });
+    match params.status {
+        Status::Running => context.started(),
+        Status::Stopped => context.stopped(),
+    }
     Ok(Value::Null)
 }
 
diff --git a/core/startos/src/service/transition/mod.rs b/core/startos/src/service/transition/mod.rs
index 29c1be38d..b472434d4 100644
--- a/core/startos/src/service/transition/mod.rs
+++ b/core/startos/src/service/transition/mod.rs
@@ -51,7 +51,7 @@ impl Drop for TransitionState {
     }
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct TempDesiredState(pub(super) Arc<watch::Sender<Option<StartStop>>>);
 impl TempDesiredState {
     pub fn stop(&self) {

From 88028412bdfed6daf3fd3002a859a0f5002e6de5 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 4 Mar 2024 14:18:20 -0700
Subject: [PATCH 033/341] chore: Add some documentation for the service actor
 seed

---
 core/startos/src/service/mod.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index b5a9c4bb2..5dba4cdb4 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -398,11 +398,17 @@ struct RunningStatus {
 pub(self) struct ServiceActorSeed {
     ctx: RpcContext,
     id: PackageId,
+    // Needed to interact with the container for the service
     persistent_container: PersistentContainer,
+    // Setting this value causes the service actor to try to bring the service to the specified state. This is done in the background job created in ServiceActor::init
     desired_state: watch::Sender<StartStop>,
+    // Override the current desired state for the service during a transition (this is protected by a guard that sets this value to null on drop)
     temp_desired_state: TempDesiredState,
+    // This represents a currently running task that affects the service's shown state, such as BackingUp or Restarting.
     transition_state: Arc<watch::Sender<Option<TransitionState>>>,
+    // This contains the start time and health check information for when the service is running. Note: Will be overwritting to the db,
     running_status: watch::Receiver<Option<RunningStatus>>,
+    // This is notified every time the background job created in ServiceActor::init responds to a change
     synchronized: Arc<Notify>,
 }
 

From 093a5d4ddf8f7a6ea970564b5b38e1306789a6cc Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 6 Mar 2024 09:38:55 -0700
Subject: [PATCH 034/341] chore: Simplify the state into one

---
 .../Systems/SystemForEmbassy/index.ts         |   4 +-
 .../src/Adapters/Systems/SystemForStartOs.ts  |   3 +-
 container-runtime/src/Models/Duration.ts      |   6 +
 core/startos/src/service/control.rs           |  21 +--
 core/startos/src/service/mod.rs               | 158 +++++++-----------
 .../src/service/persistent_container.rs       |  68 +++++---
 core/startos/src/service/transition/mod.rs    |  36 ++--
 .../startos/src/service/transition/restart.rs |  31 +++-
 8 files changed, 174 insertions(+), 153 deletions(-)
 create mode 100644 container-runtime/src/Models/Duration.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 4814da9b2..8495a669b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -2,6 +2,7 @@ import { types as T, util, EmVer } from "@start9labs/start-sdk"
 import * as fs from "fs/promises"
 
 import { PolyfillEffects } from "./polyfillEffects"
+import { Duration, duration } from "../../../Models/Duration"
 import { ExecuteResult, System } from "../../../Interfaces/System"
 import { matchManifest, Manifest, Procedure } from "./matchManifest"
 import { create } from "domain"
@@ -202,7 +203,7 @@ export class SystemForEmbassy implements System {
   private async mainStop(
     effects: HostSystemStartOs,
     options?: { timeout?: number },
-  ): Promise<void> {
+  ): Promise<Duration> {
     const { currentRunning } = this
     delete this.currentRunning
     if (currentRunning) {
@@ -210,6 +211,7 @@ export class SystemForEmbassy implements System {
         timeout: options?.timeout || this.manifest.main["sigterm-timeout"],
       })
     }
+    return duration(this.manifest.main["sigterm-timeout"], "s")
   }
   private async createBackup(effects: HostSystemStartOs): Promise<void> {
     const backup = this.manifest.backup.create
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 95afb5fb4..7549bf0f2 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -4,6 +4,7 @@ import { string } from "ts-matches"
 import { HostSystemStartOs } from "../HostSystemStartOs"
 import { Effects } from "../../Models/Effects"
 import { RpcResult } from "../RpcListener"
+import { duration } from "../../Models/Duration"
 const LOCATION = "/usr/lib/startos/package/startos"
 export class SystemForStartOs implements System {
   private onTerm: (() => Promise<void>) | undefined
@@ -82,7 +83,7 @@ export class SystemForStartOs implements System {
         await effects.setMainStatus({ status: "stopped" })
         if (this.onTerm) await this.onTerm()
         delete this.onTerm
-        return
+        return duration(30, "s")
       }
       case "/config/set": {
         const path = `${LOCATION}/procedures/config`
diff --git a/container-runtime/src/Models/Duration.ts b/container-runtime/src/Models/Duration.ts
new file mode 100644
index 000000000..8c701a703
--- /dev/null
+++ b/container-runtime/src/Models/Duration.ts
@@ -0,0 +1,6 @@
+export type TimeUnit = "d" | "h" | "s" | "ms"
+export type Duration = `${number}${TimeUnit}`
+
+export function duration(timeValue: number, timeUnit: TimeUnit = "s") {
+  return `${timeValue}${timeUnit}` as Duration
+}
diff --git a/core/startos/src/service/control.rs b/core/startos/src/service/control.rs
index 17c432755..88d66d97c 100644
--- a/core/startos/src/service/control.rs
+++ b/core/startos/src/service/control.rs
@@ -9,7 +9,9 @@ struct Start;
 impl Handler<Start> for ServiceActor {
     type Response = ();
     async fn handle(&mut self, _: Start, _: &mut BackgroundJobs) -> Self::Response {
-        self.0.desired_state.send_replace(StartStop::Start);
+        self.0.persistent_container.state.send_modify(|x| {
+            x.desired_state = StartStop::Start;
+        });
         self.0.synchronized.notified().await
     }
 }
@@ -24,16 +26,15 @@ struct Stop;
 impl Handler<Stop> for ServiceActor {
     type Response = ();
     async fn handle(&mut self, _: Stop, _: &mut BackgroundJobs) -> Self::Response {
-        self.0.desired_state.send_replace(StartStop::Stop);
-        if self.0.transition_state.borrow().as_ref().map(|t| t.kind())
-            == Some(TransitionKind::Restarting)
-        {
-            if let Some(restart) = self.0.transition_state.send_replace(None) {
-                restart.abort().await;
-            } else {
-                #[cfg(feature = "unstable")]
-                unreachable!()
+        let mut transition_state = None;
+        self.0.persistent_container.state.send_modify(|x| {
+            x.desired_state = StartStop::Stop;
+            if x.transition_state.as_ref().map(|x| x.kind()) == Some(TransitionKind::Restarting) {
+                transition_state = std::mem::take(&mut x.transition_state);
             }
+        });
+        if let Some(restart) = transition_state {
+            restart.abort().await;
         }
         self.0.synchronized.notified().await
     }
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 5dba4cdb4..3335be1ca 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -1,5 +1,5 @@
-use std::sync::Arc;
 use std::time::Duration;
+use std::{ops::Deref, sync::Arc};
 
 use chrono::{DateTime, Utc};
 use clap::Parser;
@@ -70,23 +70,17 @@ impl Service {
     #[instrument(skip_all)]
     async fn new(ctx: RpcContext, s9pk: S9pk, start: StartStop) -> Result<Self, Error> {
         let id = s9pk.as_manifest().id.clone();
-        let desired_state = watch::channel(start).0;
-        let temp_desired_state = TempDesiredState(Arc::new(watch::channel(None).0));
         let persistent_container = PersistentContainer::new(
-            &ctx,
-            s9pk,
+            &ctx, s9pk,
+            start,
             // desired_state.subscribe(),
             // temp_desired_state.subscribe(),
         )
         .await?;
         let seed = Arc::new(ServiceActorSeed {
             id,
-            running_status: persistent_container.running_status.subscribe(),
             persistent_container,
             ctx,
-            desired_state,
-            temp_desired_state,
-            transition_state: Arc::new(watch::channel(None).0),
             synchronized: Arc::new(Notify::new()),
         });
         seed.persistent_container
@@ -383,7 +377,7 @@ impl Service {
             .await?;
         self.shutdown().await
     }
-    pub async fn backup(&self, guard: impl GenericMountGuard) -> Result<BackupReturn, Error> {
+    pub async fn backup(&self, _guard: impl GenericMountGuard) -> Result<BackupReturn, Error> {
         // TODO
         Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
     }
@@ -395,45 +389,36 @@ struct RunningStatus {
     started: DateTime<Utc>,
 }
 
-pub(self) struct ServiceActorSeed {
+struct ServiceActorSeed {
     ctx: RpcContext,
     id: PackageId,
-    // Needed to interact with the container for the service
+    /// Needed to interact with the container for the service
     persistent_container: PersistentContainer,
-    // Setting this value causes the service actor to try to bring the service to the specified state. This is done in the background job created in ServiceActor::init
-    desired_state: watch::Sender<StartStop>,
-    // Override the current desired state for the service during a transition (this is protected by a guard that sets this value to null on drop)
-    temp_desired_state: TempDesiredState,
-    // This represents a currently running task that affects the service's shown state, such as BackingUp or Restarting.
-    transition_state: Arc<watch::Sender<Option<TransitionState>>>,
-    // This contains the start time and health check information for when the service is running. Note: Will be overwritting to the db,
-    running_status: watch::Receiver<Option<RunningStatus>>,
-    // This is notified every time the background job created in ServiceActor::init responds to a change
+    /// This is notified every time the background job created in ServiceActor::init responds to a change
     synchronized: Arc<Notify>,
 }
 
 impl ServiceActorSeed {
+    /// Used to indicate that we have finished the task of starting the service
     pub fn started(&self) {
-        self.persistent_container
-            .current_state
-            .send_replace(StartStop::Start);
-        self.persistent_container
-            .running_status
-            .send_modify(|running_status| {
-                *running_status =
-                    Some(
-                        std::mem::take(running_status).unwrap_or_else(|| RunningStatus {
+        self.persistent_container.state.send_modify(|state| {
+            state.running_status =
+                Some(
+                    state
+                        .running_status
+                        .take()
+                        .unwrap_or_else(|| RunningStatus {
                             health: Default::default(),
                             started: Utc::now(),
                         }),
-                    );
-            })
+                );
+        });
     }
+    /// Used to indicate that we have finished the task of stopping the service
     pub fn stopped(&self) {
-        self.persistent_container
-            .current_state
-            .send_replace(StartStop::Stop);
-        self.persistent_container.running_status.send_replace(None);
+        self.persistent_container.state.send_modify(|state| {
+            state.running_status = None;
+        });
     }
 }
 struct ServiceActor(Arc<ServiceActorSeed>);
@@ -443,20 +428,41 @@ impl Actor for ServiceActor {
         let seed = self.0.clone();
         jobs.add_job(async move {
             let id = seed.id.clone();
-            let mut current = seed.persistent_container.current_state.subscribe();
-            let mut desired = seed.desired_state.subscribe();
-            let mut temp_desired = seed.temp_desired_state.subscribe();
-            let mut transition = seed.transition_state.subscribe();
-            let mut running = seed.running_status.clone();
+            let mut current = seed.persistent_container.state.subscribe();
+
             loop {
-                let (desired_state, current_state, transition_kind, running_status) = dbg!(
-                    temp_desired.borrow().unwrap_or(*desired.borrow()),
-                    *current.borrow(),
-                    transition.borrow().as_ref().map(|t| t.kind()),
-                    running.borrow().clone(),
-                );
+                let kinds = dbg!(current.borrow().kinds());
 
                 if let Err(e) = async {
+                    let main_status = match (
+                        kinds.transition_state,
+                        kinds.desired_state,
+                        kinds.running_status,
+                    ) {
+                        (Some(TransitionKind::Restarting), _, _) => MainStatus::Restarting,
+                        (Some(TransitionKind::BackingUp), _, Some(status)) => {
+                            MainStatus::BackingUp {
+                                started: Some(status.started),
+                                health: status.health.clone(),
+                            }
+                        }
+                        (Some(TransitionKind::BackingUp), _, None) => MainStatus::BackingUp {
+                            started: None,
+                            health: OrdMap::new(),
+                        },
+                        (None, StartStop::Stop, None) => MainStatus::Stopped,
+                        (None, StartStop::Stop, Some(_)) => MainStatus::Stopping {
+                            timeout: seed.persistent_container.stop().await?.into(),
+                        },
+                        (None, StartStop::Start, Some(status)) => MainStatus::Running {
+                            started: status.started,
+                            health: status.health.clone(),
+                        },
+                        (None, StartStop::Start, None) => {
+                            seed.persistent_container.start().await?;
+                            MainStatus::Starting
+                        }
+                    };
                     seed.ctx
                         .db
                         .mutate(|d| {
@@ -466,61 +472,13 @@ impl Actor for ServiceActor {
                                 .as_idx_mut(&id)
                                 .and_then(|p| p.as_installed_mut())
                             {
-                                i.as_status_mut().as_main_mut().ser(&match (
-                                    transition_kind,
-                                    desired_state,
-                                    current_state,
-                                    running_status,
-                                ) {
-                                    (Some(TransitionKind::Restarting), _, _, _) => {
-                                        MainStatus::Restarting
-                                    }
-                                    (Some(TransitionKind::BackingUp), _, _, Some(status)) => {
-                                        MainStatus::BackingUp {
-                                            started: Some(status.started),
-                                            health: status.health.clone(),
-                                        }
-                                    }
-                                    (Some(TransitionKind::BackingUp), _, _, None) => {
-                                        MainStatus::BackingUp {
-                                            started: None,
-                                            health: OrdMap::new(),
-                                        }
-                                    }
-                                    (None, StartStop::Stop, StartStop::Stop, _) => {
-                                        MainStatus::Stopped
-                                    }
-                                    (None, StartStop::Stop, StartStop::Start, _) => {
-                                        MainStatus::Stopping {
-                                            timeout: todo!("sigterm timeout"),
-                                        }
-                                    }
-                                    (None, StartStop::Start, StartStop::Stop, _)
-                                    | (None, StartStop::Start, StartStop::Start, None) => {
-                                        MainStatus::Starting
-                                    }
-                                    (None, StartStop::Start, StartStop::Start, Some(status)) => {
-                                        MainStatus::Running {
-                                            started: status.started,
-                                            health: status.health.clone(),
-                                        }
-                                    }
-                                })?;
+                                i.as_status_mut().as_main_mut().ser(&main_status)?;
                             }
                             Ok(())
                         })
                         .await?;
-                    match (desired_state, current_state) {
-                        (StartStop::Start, StartStop::Stop) => {
-                            seed.persistent_container.start().await
-                        }
-                        (StartStop::Stop, StartStop::Start) => {
-                            seed.persistent_container
-                                .stop(todo!("s9pk sigterm timeout"))
-                                .await
-                        }
-                        _ => Ok(()),
-                    }
+
+                    Ok::<_, Error>(())
                 }
                 .await
                 {
@@ -538,10 +496,6 @@ impl Actor for ServiceActor {
 
                 tokio::select! {
                     _ = current.changed() => (),
-                    _ = desired.changed() => (),
-                    _ = temp_desired.changed() => (),
-                    _ = transition.changed() => (),
-                    _ = running.changed() => (),
                 }
             }
         })
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index eee353a07..28067cdd8 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -15,8 +15,11 @@ use tokio::process::Command;
 use tokio::sync::{oneshot, watch, Mutex, OnceCell};
 use tracing::instrument;
 
-use super::service_effect_handler::{service_effect_handler, EffectContext};
-use super::ServiceActorSeed;
+use super::{
+    service_effect_handler::{service_effect_handler, EffectContext},
+    transition::{TempDesiredState, TransitionKind},
+};
+use super::{transition::TransitionState, ServiceActorSeed};
 use crate::context::RpcContext;
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
@@ -39,6 +42,43 @@ const RPC_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
 
 struct ProcedureId(u64);
 
+#[derive(Debug)]
+pub struct ServiceState {
+    // This contains the start time and health check information for when the service is running. Note: Will be overwritting to the db,
+    pub(super) running_status: Option<RunningStatus>,
+    /// Setting this value causes the service actor to try to bring the service to the specified state. This is done in the background job created in ServiceActor::init
+    pub(super) desired_state: StartStop,
+    /// Override the current desired state for the service during a transition (this is protected by a guard that sets this value to null on drop)
+    pub(super) temp_desired_state: Option<StartStop>,
+    /// This represents a currently running task that affects the service's shown state, such as BackingUp or Restarting.
+    pub(super) transition_state: Option<TransitionState>,
+}
+
+#[derive(Debug)]
+pub struct ServiceStateKinds {
+    pub transition_state: Option<TransitionKind>,
+    pub running_status: Option<RunningStatus>,
+    pub desired_state: StartStop,
+}
+
+impl ServiceState {
+    pub fn new(desired_state: StartStop) -> Self {
+        Self {
+            running_status: Default::default(),
+            temp_desired_state: Default::default(),
+            transition_state: Default::default(),
+            desired_state,
+        }
+    }
+    pub fn kinds(&self) -> ServiceStateKinds {
+        ServiceStateKinds {
+            transition_state: self.transition_state.as_ref().map(|x| x.kind()),
+            desired_state: self.temp_desired_state.unwrap_or(self.desired_state),
+            running_status: self.running_status.clone(),
+        }
+    }
+}
+
 // @DRB On top of this we need to also have  the procedures to have the effects and get the results back for them, maybe lock them to the running instance?
 /// This contains the LXC container running the javascript init system
 /// that can be used via a JSON RPC Client connected to a unix domain
@@ -53,20 +93,12 @@ pub struct PersistentContainer {
     volumes: BTreeMap<VolumeId, MountGuard>,
     assets: BTreeMap<VolumeId, MountGuard>,
     pub(super) overlays: Arc<Mutex<BTreeMap<InternedString, OverlayGuard>>>,
-    pub(super) current_state: watch::Sender<StartStop>,
-    // pub(super) desired_state: watch::Receiver<StartStop>,
-    // pub(super) temp_desired_state: watch::Receiver<Option<StartStop>>,
-    pub(super) running_status: watch::Sender<Option<RunningStatus>>,
+    pub(super) state: Arc<watch::Sender<ServiceState>>,
 }
 
 impl PersistentContainer {
     #[instrument(skip_all)]
-    pub async fn new(
-        ctx: &RpcContext,
-        s9pk: S9pk,
-        // desired_state: watch::Receiver<StartStop>,
-        // temp_desired_state: watch::Receiver<Option<StartStop>>,
-    ) -> Result<Self, Error> {
+    pub async fn new(ctx: &RpcContext, s9pk: S9pk, start: StartStop) -> Result<Self, Error> {
         let lxc_container = ctx.lxc_manager.create(LxcConfig::default()).await?;
         let rpc_client = lxc_container.connect_rpc(Some(RPC_CONNECT_TIMEOUT)).await?;
         let js_mount = MountGuard::mount(
@@ -156,10 +188,7 @@ impl PersistentContainer {
             volumes,
             assets,
             overlays: Arc::new(Mutex::new(BTreeMap::new())),
-            current_state: watch::channel(StartStop::Stop).0,
-            // desired_state,
-            // temp_desired_state,
-            running_status: watch::channel(None).0,
+            state: Arc::new(watch::channel(ServiceState::new(start)).0),
         })
     }
 
@@ -280,10 +309,11 @@ impl PersistentContainer {
     }
 
     #[instrument(skip_all)]
-    pub async fn stop(&self, timeout: Option<Duration>) -> Result<(), Error> {
-        self.execute(ProcedureName::StopMain, Value::Null, timeout)
+    pub async fn stop(&self) -> Result<Duration, Error> {
+        let timeout: Option<crate::util::serde::Duration> = self
+            .execute(ProcedureName::StopMain, Value::Null, None)
             .await?;
-        Ok(())
+        Ok(timeout.map(|a| *a).unwrap_or(Duration::from_secs(30)))
     }
 
     #[instrument(skip_all)]
diff --git a/core/startos/src/service/transition/mod.rs b/core/startos/src/service/transition/mod.rs
index b472434d4..cd7979cae 100644
--- a/core/startos/src/service/transition/mod.rs
+++ b/core/startos/src/service/transition/mod.rs
@@ -1,5 +1,5 @@
-use std::ops::Deref;
 use std::sync::Arc;
+use std::{fmt::Display, ops::Deref};
 
 use futures::{Future, FutureExt};
 use tokio::sync::watch;
@@ -8,6 +8,8 @@ use crate::service::start_stop::StartStop;
 use crate::util::actor::BackgroundJobs;
 use crate::util::future::{CancellationHandle, RemoteCancellable};
 
+use super::persistent_container::ServiceState;
+
 pub mod backup;
 pub mod restart;
 
@@ -23,6 +25,13 @@ pub struct TransitionState {
     cancel_handle: CancellationHandle,
     kind: TransitionKind,
 }
+impl ::std::fmt::Debug for TransitionState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("TransitionState")
+            .field("kind", &self.kind)
+            .finish_non_exhaustive()
+    }
+}
 
 impl TransitionState {
     pub fn kind(&self) -> TransitionKind {
@@ -52,23 +61,28 @@ impl Drop for TransitionState {
 }
 
 #[derive(Debug, Clone)]
-pub struct TempDesiredState(pub(super) Arc<watch::Sender<Option<StartStop>>>);
+pub struct TempDesiredState(pub(super) Arc<watch::Sender<ServiceState>>);
 impl TempDesiredState {
+    pub fn new(state: &Arc<watch::Sender<ServiceState>>) -> Self {
+        Self(state.clone())
+    }
     pub fn stop(&self) {
-        self.0.send_replace(Some(StartStop::Stop));
+        self.0
+            .send_modify(|s| s.temp_desired_state = Some(StartStop::Stop));
     }
     pub fn start(&self) {
-        self.0.send_replace(Some(StartStop::Start));
+        self.0
+            .send_modify(|s| s.temp_desired_state = Some(StartStop::Start));
     }
 }
 impl Drop for TempDesiredState {
     fn drop(&mut self) {
-        self.0.send_replace(None);
-    }
-}
-impl Deref for TempDesiredState {
-    type Target = watch::Sender<Option<StartStop>>;
-    fn deref(&self) -> &Self::Target {
-        &*self.0
+        self.0.send_modify(|s| s.temp_desired_state = None);
     }
 }
+// impl Deref for TempDesiredState {
+//     type Target = watch::Sender<Option<StartStop>>;
+//     fn deref(&self) -> &Self::Target {
+//         &*self.0
+//     }
+// }
diff --git a/core/startos/src/service/transition/restart.rs b/core/startos/src/service/transition/restart.rs
index 71a889305..9c82d0282 100644
--- a/core/startos/src/service/transition/restart.rs
+++ b/core/startos/src/service/transition/restart.rs
@@ -1,32 +1,45 @@
+use std::sync::Arc;
+
 use futures::FutureExt;
 
 use crate::prelude::*;
-use crate::service::start_stop::StartStop;
 use crate::service::transition::{TransitionKind, TransitionState};
 use crate::service::{Service, ServiceActor};
 use crate::util::actor::{BackgroundJobs, Handler};
 use crate::util::future::RemoteCancellable;
 
+use super::TempDesiredState;
+
 struct Restart;
 #[async_trait::async_trait]
 impl Handler<Restart> for ServiceActor {
     type Response = ();
     async fn handle(&mut self, _: Restart, jobs: &mut BackgroundJobs) -> Self::Response {
-        let temp = self.0.temp_desired_state.clone();
-        let mut current = self.0.persistent_container.current_state.subscribe();
+        // So Need a handle to just a single field in the state
+        let temp = TempDesiredState::new(&self.0.persistent_container.state);
+        let mut current = self.0.persistent_container.state.subscribe();
         let transition = RemoteCancellable::new(async move {
             temp.stop();
-            current.wait_for(|s| *s == StartStop::Stop).await;
+            current.wait_for(|s| s.running_status.is_none()).await;
             temp.start();
-            current.wait_for(|s| *s == StartStop::Start).await;
+            current.wait_for(|s| s.running_status.is_some()).await;
+            drop(temp);
         });
         let cancel_handle = transition.cancellation_handle();
         jobs.add_job(transition.map(|_| ()));
         let notified = self.0.synchronized.notified();
-        if let Some(t) = self.0.transition_state.send_replace(Some(TransitionState {
-            kind: TransitionKind::Restarting,
-            cancel_handle,
-        })) {
+
+        let mut old = None;
+        self.0.persistent_container.state.send_modify(|s| {
+            old = std::mem::replace(
+                &mut s.transition_state,
+                Some(TransitionState {
+                    kind: TransitionKind::Restarting,
+                    cancel_handle,
+                }),
+            )
+        });
+        if let Some(t) = old {
             t.abort().await;
         }
         notified.await

From 8410929e86fde6287813c70f49bfc3eb7c33360d Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 6 Mar 2024 10:55:21 -0700
Subject: [PATCH 035/341] feat: Add the stop/start loop for the service

---
 .../Systems/SystemForEmbassy/MainLoop.ts      |  3 +-
 .../src/service/service_effect_handler.rs     | 39 ++++++++++++++++---
 sdk/lib/types.ts                              |  8 +++-
 sdk/lib/util/Overlay.ts                       | 10 +++--
 sdk/lib/util/utils.ts                         |  5 ++-
 5 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 484e02c24..daf3ade70 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -86,10 +86,11 @@ export class MainLoop {
 
   public async clean(options?: { timeout?: number }) {
     const { mainEvent, healthLoops, propertiesEvent } = this
+    const main = await mainEvent
     delete this.mainEvent
     delete this.healthLoops
     delete this.propertiesEvent
-    if (mainEvent) await (await mainEvent).daemon.term()
+    if (mainEvent) await main?.daemon.term()
     clearInterval(propertiesEvent)
     if (healthLoops) healthLoops.forEach((x) => clearInterval(x.interval))
   }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index c4a9584d3..55bc07916 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -7,7 +7,7 @@ use std::{ffi::OsString, time::Instant};
 use chrono::Utc;
 use clap::builder::{TypedValueParser, ValueParserFactory};
 use clap::Parser;
-use imbl_value::json;
+use imbl_value::{json, InternedString};
 use models::{ActionId, HealthCheckId, ImageId, PackageId};
 use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
@@ -111,11 +111,15 @@ pub fn service_effect_handler() -> ParentHandler {
         .subcommand(
             "createOverlayedImage",
             from_fn_async(create_overlayed_image)
-                .with_custom_display_fn::<AnyContext, _>(|_, path| {
+                .with_custom_display_fn::<AnyContext, _>(|_, (path, _)| {
                     Ok(println!("{}", path.display()))
                 })
                 .with_remote_cli::<ContainerCliContext>(),
         )
+        .subcommand(
+            "destroyOverlayedImage",
+            from_fn_async(destroy_overlayed_image).no_cli(),
+        )
         .subcommand(
             "getSslCertificate",
             from_fn_async(get_ssl_certificate).no_cli(),
@@ -668,7 +672,32 @@ async fn set_health(context: EffectContext, params: SetHealth) -> Result<Value,
         .await?;
     Ok(json!(()))
 }
+#[derive(serde::Deserialize, serde::Serialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "camelCase")]
+pub struct DestroyOverlayedImageParams {
+    image_id: ImageId,
+    guid: InternedString,
+}
 
+#[instrument(skip_all)]
+pub async fn destroy_overlayed_image(
+    ctx: EffectContext,
+    DestroyOverlayedImageParams { image_id, guid }: DestroyOverlayedImageParams,
+) -> Result<(), Error> {
+    let ctx = ctx.deref()?;
+    if ctx
+        .persistent_container
+        .overlays
+        .lock()
+        .await
+        .remove(&guid)
+        .is_none()
+    {
+        tracing::warn!("Could not find a guard to remove on the destroy overlayed image; assumming that it already is removed and will be skipping");
+    }
+    Ok(())
+}
 #[derive(serde::Deserialize, serde::Serialize, Parser)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "camelCase")]
@@ -680,10 +709,10 @@ pub struct CreateOverlayedImageParams {
 pub async fn create_overlayed_image(
     ctx: EffectContext,
     CreateOverlayedImageParams { image_id }: CreateOverlayedImageParams,
-) -> Result<PathBuf, Error> {
+) -> Result<(PathBuf, InternedString), Error> {
     let ctx = ctx.deref()?;
     let path = Path::new("images")
-        .join(&*ARCH)
+        .join(*ARCH)
         .join(&image_id)
         .with_extension("squashfs");
     if let Some(image) = ctx
@@ -730,7 +759,7 @@ pub async fn create_overlayed_image(
             .lock()
             .await
             .insert(guid.clone(), guard);
-        Ok(container_mountpoint)
+        Ok((container_mountpoint, guid))
     } else {
         Err(Error::new(
             eyre!("image {image_id} not found in s9pk"),
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index e0bc4a259..cb1946818 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -276,7 +276,13 @@ export type Effects = {
   }): Promise<unknown>
 
   /** A low level api used by makeOverlay */
-  createOverlayedImage(options: { imageId: string }): Promise<string>
+  createOverlayedImage(options: { imageId: string }): Promise<[string, string]>
+
+  /** A low level api used by destroyOverlay + makeOverlay:destroy */
+  destroyOverlayedImage(options: {
+    imageId: string
+    guid: string
+  }): Promise<void>
 
   /** Removes all network bindings */
   clearBindings(): Promise<void>
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 5f928289d..36dbaead5 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -10,9 +10,10 @@ export class Overlay {
     readonly effects: T.Effects,
     readonly imageId: string,
     readonly rootfs: string,
+    readonly guid: string,
   ) {}
   static async of(effects: T.Effects, imageId: string) {
-    const rootfs = await effects.createOverlayedImage({ imageId })
+    const [rootfs, guid] = await effects.createOverlayedImage({ imageId })
 
     for (const dirPart of ["dev", "sys", "proc", "run"] as const) {
       await fs.mkdir(`${rootfs}/${dirPart}`, { recursive: true })
@@ -23,7 +24,7 @@ export class Overlay {
       ])
     }
 
-    return new Overlay(effects, imageId, rootfs)
+    return new Overlay(effects, imageId, rootfs, guid)
   }
 
   async mount(options: MountOptions, path: string): Promise<Overlay> {
@@ -51,8 +52,9 @@ export class Overlay {
   }
 
   async destroy() {
-    await execFile("umount", ["-R", this.rootfs])
-    await fs.rm(this.rootfs, { recursive: true, force: true })
+    const imageId = this.imageId
+    const guid = this.guid
+    await this.effects.destroyOverlayedImage({ imageId, guid })
   }
 
   async exec(
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index af6ae89cb..cb5afae3d 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -246,7 +246,7 @@ export const createUtils = <
           console.error(data.toString())
         })
 
-        childProcess.on("close", (code: any) => {
+        childProcess.on("exit", (code: any) => {
           if (code === 0) {
             return resolve(null)
           }
@@ -262,7 +262,7 @@ export const createUtils = <
           try {
             childProcess.kill(signal)
 
-            if (timeout <= NO_TIMEOUT) {
+            if (timeout > NO_TIMEOUT) {
               const didTimeout = await Promise.race([
                 new Promise((resolve) => setTimeout(resolve, timeout)).then(
                   () => true,
@@ -270,6 +270,7 @@ export const createUtils = <
                 answer.then(() => false),
               ])
               if (didTimeout) childProcess.kill(SIGKILL)
+              return
             }
             await answer
           } finally {

From f3ccad192c7b73c60f155e9796cbde97e8202d07 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 6 Mar 2024 15:43:07 -0700
Subject: [PATCH 036/341] chore: Add the process tree destroyer

---
 .../src/Adapters/HostSystemStartOs.ts         | 12 +++++-
 sdk/lib/mainFn/Daemons.ts                     |  2 +
 sdk/lib/util/utils.ts                         | 41 ++++++++++++++++---
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index 007f783c0..ec4fac796 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -110,11 +110,21 @@ export class HostSystemStartOs implements Effects {
       T.Effects["clearServiceInterfaces"]
     >
   }
-  createOverlayedImage(options: { imageId: string }): Promise<string> {
+  createOverlayedImage(options: {
+    imageId: string
+  }): Promise<[string, string]> {
     return this.rpcRound("createOverlayedImage", options) as ReturnType<
       T.Effects["createOverlayedImage"]
     >
   }
+  destroyOverlayedImage(options: {
+    imageId: string
+    guid: string
+  }): Promise<void> {
+    return this.rpcRound("destroyOverlayedImage", options) as ReturnType<
+      T.Effects["destroyOverlayedImage"]
+    >
+  }
   executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
     return this.rpcRound("executeAction", options) as ReturnType<
       T.Effects["executeAction"]
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 45ff723d0..e9986ad3f 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -137,6 +137,7 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
     }
     return {
       async term(options?: { signal?: Signals; timeout?: number }) {
+        console.error("Bluj Daemons term")
         await Promise.all(
           Object.values<Promise<DaemonReturned>>(daemonsStarted).map((x) =>
             x.then((x) => x.term(options)),
@@ -144,6 +145,7 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
         )
       },
       async wait() {
+        console.error("Bluj Daemons wait")
         await Promise.all(
           Object.values<Promise<DaemonReturned>>(daemonsStarted).map((x) =>
             x.then((x) => x.wait()),
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index cb5afae3d..e8eb7f6e0 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -254,11 +254,21 @@ export const createUtils = <
         })
       })
 
+      const pid = childProcess.pid
       return {
-        wait() {
-          return answer
+        async wait() {
+          const pids = pid ? await psTree(pid, overlay) : []
+          try {
+            return await answer
+          } finally {
+            for (const process of pids) {
+              overlay.exec(["kill", `-9`, String(process)])
+            }
+          }
         },
         async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
+          const pids = pid ? await psTree(pid, overlay) : []
+          console.error("Bluj killing pid ", pids)
           try {
             childProcess.kill(signal)
 
@@ -269,13 +279,26 @@ export const createUtils = <
                 ),
                 answer.then(() => false),
               ])
-              if (didTimeout) childProcess.kill(SIGKILL)
-              return
+              if (didTimeout) {
+                childProcess.kill(SIGKILL)
+              }
+            } else {
+              await answer
             }
-            await answer
           } finally {
             await overlay.destroy()
           }
+
+          console.error("Bluj actually killing pid ", pids)
+          try {
+            for (const process of pids) {
+              await overlay.exec(["kill", `-${signal}`, String(process)])
+            }
+          } finally {
+            for (const process of pids) {
+              overlay.exec(["kill", `-9`, String(process)])
+            }
+          }
         },
       }
     },
@@ -294,3 +317,11 @@ export const createUtils = <
   }
 }
 function noop(): void {}
+
+async function psTree(pid: number, overlay: Overlay): Promise<number[]> {
+  const { stdout } = await overlay.exec(["pstree", `-p`, String(pid)])
+  const regex: RegExp = /\((\d+)\)/g
+  return [...stdout.toString().matchAll(regex)].map(([_all, pid]) =>
+    parseInt(pid),
+  )
+}

From 14be2fa344e676955538f5e11630d9a8077fdc77 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 6 Mar 2024 16:22:29 -0700
Subject: [PATCH 037/341] chore: Add in the ability to kill the tree of
 processes

---
 sdk/lib/util/utils.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index e8eb7f6e0..2f9388884 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -47,6 +47,7 @@ const childProcess = {
   exec: promisify(CP.exec),
   execFile: promisify(CP.execFile),
 }
+const cp = childProcess
 
 export type ServiceInterfaceType = "ui" | "p2p" | "api"
 
@@ -262,7 +263,7 @@ export const createUtils = <
             return await answer
           } finally {
             for (const process of pids) {
-              overlay.exec(["kill", `-9`, String(process)])
+              cp.execFile("kill", [`-9`, String(process)]).catch((_) => {})
             }
           }
         },
@@ -292,11 +293,11 @@ export const createUtils = <
           console.error("Bluj actually killing pid ", pids)
           try {
             for (const process of pids) {
-              await overlay.exec(["kill", `-${signal}`, String(process)])
+              await cp.execFile("kill", [`-${signal}`, String(process)])
             }
           } finally {
             for (const process of pids) {
-              overlay.exec(["kill", `-9`, String(process)])
+              cp.execFile("kill", [`-9`, String(process)]).catch((_) => {})
             }
           }
         },
@@ -319,7 +320,7 @@ export const createUtils = <
 function noop(): void {}
 
 async function psTree(pid: number, overlay: Overlay): Promise<number[]> {
-  const { stdout } = await overlay.exec(["pstree", `-p`, String(pid)])
+  const { stdout } = await childProcess.exec(`pstree -p ${pid}`)
   const regex: RegExp = /\((\d+)\)/g
   return [...stdout.toString().matchAll(regex)].map(([_all, pid]) =>
     parseInt(pid),

From efbbaa57411c4a108f156cac5d0df6c46c6b8807 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 7 Mar 2024 11:38:59 -0700
Subject: [PATCH 038/341] feat: Get the health checks for the js

---
 .../src/Adapters/HostSystemStartOs.ts         |   1 +
 .../Systems/SystemForEmbassy/MainLoop.ts      | 138 +++++++++++++-----
 .../src/service/service_effect_handler.rs     |  58 ++++----
 core/startos/src/status/health_check.rs       |  10 ++
 sdk/lib/health/HealthCheck.ts                 |   4 +-
 sdk/lib/health/checkFns/checkPortListening.ts |   4 +-
 sdk/lib/health/checkFns/checkWebUrl.ts        |  13 +-
 sdk/lib/health/checkFns/runHealthScript.ts    |   2 +-
 sdk/lib/mainFn/Daemons.ts                     |   2 +-
 sdk/lib/types.ts                              |   7 +-
 10 files changed, 159 insertions(+), 80 deletions(-)

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index ec4fac796..e863b6714 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -268,6 +268,7 @@ export class HostSystemStartOs implements Effects {
     >
   }
   setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
+    console.error("BLUJ sethealth", options)
     return this.rpcRound("setHealth", options) as ReturnType<
       T.Effects["setHealth"]
     >
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index daf3ade70..8142a17df 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -106,46 +106,106 @@ export class MainLoop {
     const { manifest } = this.system
     const effects = this.effects
     const start = Date.now()
-    return Object.values(manifest["health-checks"]).map((value) => {
-      const name = value.name
-      const interval = setInterval(async () => {
-        const actionProcedure = value
-        const timeChanged = Date.now() - start
-        if (actionProcedure.type === "docker") {
-          const container = await DockerProcedureContainer.of(
-            effects,
-            actionProcedure,
-            manifest.volumes,
-          )
-          const executed = await container.exec([
-            actionProcedure.entrypoint,
-            ...actionProcedure.args,
-            JSON.stringify(timeChanged),
-          ])
-          const stderr = executed.stderr.toString()
-          if (stderr)
-            console.error(`Error running health check ${value.name}: ${stderr}`)
-          return executed.stdout.toString()
-        } else {
-          const moduleCode = await this.system.moduleCode
-          const method = moduleCode.health?.[value.name]
-          if (!method)
-            return console.error(
-              `Expecting that thejs health check ${value.name} exists`,
+    return Object.entries(manifest["health-checks"]).map(
+      ([healthId, value]) => {
+        const interval = setInterval(async () => {
+          const actionProcedure = value
+          const timeChanged = Date.now() - start
+          if (actionProcedure.type === "docker") {
+            const container = await DockerProcedureContainer.of(
+              effects,
+              actionProcedure,
+              manifest.volumes,
             )
-          return (await method(
-            new PolyfillEffects(effects, this.system.manifest),
-            timeChanged,
-          ).then((x) => {
-            if ("result" in x) return x.result
-            if ("error" in x)
-              return console.error("Error getting config: " + x.error)
-            return console.error("Error getting config: " + x["error-code"][1])
-          })) as any
-        }
-      }, EMBASSY_HEALTH_INTERVAL)
+            const executed = await container.exec([
+              actionProcedure.entrypoint,
+              ...actionProcedure.args,
+              JSON.stringify(timeChanged),
+            ])
+            const stderr = executed.stderr.toString()
+            if (stderr)
+              console.error(
+                `Error running health check ${value.name}: ${stderr}`,
+              )
+            return executed.stdout.toString()
+          } else {
+            actionProcedure
+            const moduleCode = await this.system.moduleCode
+            const method = moduleCode.health?.[healthId]
+            if (!method) {
+              await effects.setHealth({
+                name: healthId,
+                status: "failure",
+                message: `Expecting that thejs health check ${healthId} exists`,
+              })
+              return
+            }
 
-      return { name, interval }
-    })
+            const result = await method(
+              new PolyfillEffects(effects, this.system.manifest),
+              timeChanged,
+            )
+
+            if ("result" in result) {
+              await effects.setHealth({
+                name: healthId,
+                status: "passing",
+              })
+              return
+            }
+            if ("error" in result) {
+              await effects.setHealth({
+                name: healthId,
+                status: "failure",
+                message: result.error,
+              })
+              return
+            }
+            if (!("error-code" in result)) {
+              await effects.setHealth({
+                name: healthId,
+                status: "failure",
+                message: `Unknown error type ${JSON.stringify(result)}`,
+              })
+              return
+            }
+            const [code, message] = result["error-code"]
+            if (code === 59) {
+              await effects.setHealth({
+                name: healthId,
+                status: "disabled",
+                message,
+              })
+              return
+            }
+            if (code === 60) {
+              await effects.setHealth({
+                name: healthId,
+                status: "starting",
+                message,
+              })
+              return
+            }
+            if (code === 61) {
+              await effects.setHealth({
+                name: healthId,
+                status: "warning",
+                message,
+              })
+              return
+            }
+
+            await effects.setHealth({
+              name: healthId,
+              status: "failure",
+              message: `${result["error-code"][0]}: ${result["error-code"][1]}`,
+            })
+            return
+          }
+        }, EMBASSY_HEALTH_INTERVAL)
+
+        return { name: healthId, interval }
+      },
+    )
   }
 }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 55bc07916..369c8f319 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -13,7 +13,6 @@ use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use tokio::process::Command;
 
-use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::prelude::*;
@@ -26,6 +25,7 @@ use crate::status::MainStatus;
 use crate::util::clap::FromStrParser;
 use crate::util::{new_guid, Invoke};
 use crate::{db::model::ExposedUI, service::RunningStatus};
+use crate::{disk::mount::filesystem::idmapped::IdMapped, status::health_check::HealthCheckString};
 use crate::{echo, ARCH};
 
 #[derive(Clone)]
@@ -605,30 +605,22 @@ async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Resul
 #[serde(rename_all = "camelCase")]
 struct SetHealth {
     name: HealthCheckId,
-    health_result: Option<HealthCheckResult>,
+    status: HealthCheckString,
+    message: Option<String>,
 }
 
-async fn set_health(context: EffectContext, params: SetHealth) -> Result<Value, Error> {
+async fn set_health(
+    context: EffectContext,
+    SetHealth {
+        name,
+        status,
+        message,
+    }: SetHealth,
+) -> Result<Value, Error> {
+    dbg!(&name);
+    dbg!(&status);
+    dbg!(&message);
     let context = context.deref()?;
-    // TODO DrBonez + BLU-J Need to change the type from
-    // ```rs
-    // #[serde(tag = "result")]
-    // pub enum HealthCheckResult {
-    //     Success,
-    //     Disabled,
-    //     Starting,
-    //     Loading { message: String },
-    //     Failure { error: String },
-    // }
-    // ```
-    // to
-    // ```ts
-    // setHealth(o: {
-    //     name: string
-    //     status: HealthStatus
-    //     message?: string
-    //   }): Promise<void>
-    // ```
 
     let package_id = &context.id;
     context
@@ -648,14 +640,22 @@ async fn set_health(context: EffectContext, params: SetHealth) -> Result<Value,
             match &mut main {
                 &mut MainStatus::Running { ref mut health, .. }
                 | &mut MainStatus::BackingUp { ref mut health, .. } => {
-                    health.remove(&params.name);
-                    if let SetHealth {
+                    health.remove(&name);
+
+                    health.insert(
                         name,
-                        health_result: Some(health_result),
-                    } = params
-                    {
-                        health.insert(name, health_result);
-                    }
+                        match status {
+                            HealthCheckString::Disabled => HealthCheckResult::Disabled,
+                            HealthCheckString::Passing => HealthCheckResult::Success,
+                            HealthCheckString::Starting => HealthCheckResult::Starting,
+                            HealthCheckString::Warning => HealthCheckResult::Loading {
+                                message: message.unwrap_or_default(),
+                            },
+                            HealthCheckString::Failure => HealthCheckResult::Failure {
+                                error: message.unwrap_or_default(),
+                            },
+                        },
+                    );
                 }
                 _ => return Ok(()),
             };
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index 8189454c7..fef879e33 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -22,3 +22,13 @@ impl std::fmt::Display for HealthCheckResult {
         }
     }
 }
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub enum HealthCheckString {
+    Passing,
+    Disabled,
+    Starting,
+    Warning,
+    Failure,
+}
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index 8f0bcf81e..1cbc5ebf2 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -47,10 +47,10 @@ export function healthCheck(o: {
       } catch (e) {
         await o.effects.setHealth({
           name: o.name,
-          status: "failing",
+          status: "failure",
           message: asMessage(e),
         })
-        currentValue.lastResult = "failing"
+        currentValue.lastResult = "failure"
       }
     }
   })
diff --git a/sdk/lib/health/checkFns/checkPortListening.ts b/sdk/lib/health/checkFns/checkPortListening.ts
index 07144071b..a82b75fd4 100644
--- a/sdk/lib/health/checkFns/checkPortListening.ts
+++ b/sdk/lib/health/checkFns/checkPortListening.ts
@@ -48,7 +48,7 @@ export async function checkPortListening(
         return { status: "passing", message: options.successMessage }
       }
       return {
-        status: "failing",
+        status: "failure",
         message: options.errorMessage,
       }
     }),
@@ -56,7 +56,7 @@ export async function checkPortListening(
       setTimeout(
         () =>
           resolve({
-            status: "failing",
+            status: "failure",
             message:
               options.timeoutMessage || `Timeout trying to check port ${port}`,
           }),
diff --git a/sdk/lib/health/checkFns/checkWebUrl.ts b/sdk/lib/health/checkFns/checkWebUrl.ts
index 81da2b425..d18509ee3 100644
--- a/sdk/lib/health/checkFns/checkWebUrl.ts
+++ b/sdk/lib/health/checkFns/checkWebUrl.ts
@@ -19,14 +19,17 @@ export const checkWebUrl = async (
   } = {},
 ): Promise<CheckResult> => {
   return Promise.race([fetch(url), timeoutPromise(timeout)])
-    .then((x) => ({
-      status: "passing" as const,
-      message: successMessage,
-    }))
+    .then(
+      (x) =>
+        ({
+          status: "passing",
+          message: successMessage,
+        }) as const,
+    )
     .catch((e) => {
       console.warn(`Error while fetching URL: ${url}`)
       console.error(JSON.stringify(e))
       console.error(e.toString())
-      return { status: "failing" as const, message: errorMessage }
+      return { status: "failure" as const, message: errorMessage }
     })
 }
diff --git a/sdk/lib/health/checkFns/runHealthScript.ts b/sdk/lib/health/checkFns/runHealthScript.ts
index 4bc4556e9..659c787f8 100644
--- a/sdk/lib/health/checkFns/runHealthScript.ts
+++ b/sdk/lib/health/checkFns/runHealthScript.ts
@@ -29,7 +29,7 @@ export const runHealthScript = async (
     console.warn(errorMessage)
     console.warn(JSON.stringify(e))
     console.warn(e.toString())
-    throw { status: "failing", message: errorMessage } as CheckResult
+    throw { status: "failure", message: errorMessage } as CheckResult
   })
   return {
     status: "passing",
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index e9986ad3f..c240427bc 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -121,7 +121,7 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
             const response = await Promise.resolve(daemon.ready.fn()).catch(
               (err) =>
                 ({
-                  status: "failing",
+                  status: "failure",
                   message: "message" in err ? err.message : String(err),
                 }) as CheckResult,
             )
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index cb1946818..a53b3d273 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -133,7 +133,12 @@ export type Daemon = {
   [DaemonProof]: never
 }
 
-export type HealthStatus = "passing" | "warning" | "failing" | "disabled"
+export type HealthStatus =
+  | `passing`
+  | `disabled`
+  | `starting`
+  | `warning`
+  | `failure`
 
 export type SmtpValue = {
   server: string

From 328beaba3549e4aa7c87b3d1a00fe014c56ba401 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 7 Mar 2024 13:36:38 -0700
Subject: [PATCH 039/341] chore: Add in the possibility to get the status code
 from the executed health check

---
 .../DockerProcedureContainer.ts               |  9 ++++
 .../Systems/SystemForEmbassy/MainLoop.ts      | 52 ++++++++++++++++---
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 3129ce45d..3506575bc 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -73,6 +73,15 @@ export class DockerProcedureContainer {
     }
   }
 
+  async execSpawn(commands: string[]) {
+    try {
+      const spawned = await this.overlay.spawn(commands)
+      return spawned
+    } finally {
+      await this.overlay.destroy()
+    }
+  }
+
   async spawn(commands: string[]): Promise<cp.ChildProcessWithoutNullStreams> {
     return await this.overlay.spawn(commands)
   }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 8142a17df..c5e6644af 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -3,6 +3,7 @@ import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { SystemForEmbassy } from "."
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { util, Daemons, types as T } from "@start9labs/start-sdk"
+import { exec } from "child_process"
 
 const EMBASSY_HEALTH_INTERVAL = 15 * 1000
 const EMBASSY_PROPERTIES_LOOP = 30 * 1000
@@ -117,17 +118,54 @@ export class MainLoop {
               actionProcedure,
               manifest.volumes,
             )
-            const executed = await container.exec([
+            const executed = await container.execSpawn([
               actionProcedure.entrypoint,
               ...actionProcedure.args,
               JSON.stringify(timeChanged),
             ])
-            const stderr = executed.stderr.toString()
-            if (stderr)
-              console.error(
-                `Error running health check ${value.name}: ${stderr}`,
-              )
-            return executed.stdout.toString()
+            if (executed.exitCode === 59) {
+              await effects.setHealth({
+                name: healthId,
+                status: "disabled",
+                message:
+                  executed.stderr.toString() || executed.stdout.toString(),
+              })
+              return
+            }
+            if (executed.exitCode === 60) {
+              await effects.setHealth({
+                name: healthId,
+                status: "starting",
+                message:
+                  executed.stderr.toString() || executed.stdout.toString(),
+              })
+              return
+            }
+            if (executed.exitCode === 61) {
+              await effects.setHealth({
+                name: healthId,
+                status: "warning",
+                message:
+                  executed.stderr.toString() || executed.stdout.toString(),
+              })
+              return
+            }
+            const errorMessage = executed.stderr.toString()
+            const message = executed.stdout.toString()
+            if (!!errorMessage) {
+              await effects.setHealth({
+                name: healthId,
+                status: "failure",
+                message: errorMessage,
+              })
+              return
+            }
+            await effects.setHealth({
+              name: healthId,
+              status: "passing",
+              message,
+            })
+            return
           } else {
             actionProcedure
             const moduleCode = await this.system.moduleCode

From a17ec4221b1a546b0df2f547cdf95afa3a11c70c Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 7 Mar 2024 13:45:38 -0700
Subject: [PATCH 040/341] chore: Remove some of the bad logging

---
 container-runtime/src/Adapters/HostSystemStartOs.ts | 1 -
 core/startos/src/service/service_effect_handler.rs  | 3 ---
 sdk/lib/mainFn/Daemons.ts                           | 2 --
 sdk/lib/util/utils.ts                               | 2 --
 4 files changed, 8 deletions(-)

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index e863b6714..ec4fac796 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -268,7 +268,6 @@ export class HostSystemStartOs implements Effects {
     >
   }
   setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
-    console.error("BLUJ sethealth", options)
     return this.rpcRound("setHealth", options) as ReturnType<
       T.Effects["setHealth"]
     >
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 369c8f319..3978b64c7 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -617,9 +617,6 @@ async fn set_health(
         message,
     }: SetHealth,
 ) -> Result<Value, Error> {
-    dbg!(&name);
-    dbg!(&status);
-    dbg!(&message);
     let context = context.deref()?;
 
     let package_id = &context.id;
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index c240427bc..368c15c89 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -137,7 +137,6 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
     }
     return {
       async term(options?: { signal?: Signals; timeout?: number }) {
-        console.error("Bluj Daemons term")
         await Promise.all(
           Object.values<Promise<DaemonReturned>>(daemonsStarted).map((x) =>
             x.then((x) => x.term(options)),
@@ -145,7 +144,6 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
         )
       },
       async wait() {
-        console.error("Bluj Daemons wait")
         await Promise.all(
           Object.values<Promise<DaemonReturned>>(daemonsStarted).map((x) =>
             x.then((x) => x.wait()),
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index 2f9388884..f0592385e 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -269,7 +269,6 @@ export const createUtils = <
         },
         async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
           const pids = pid ? await psTree(pid, overlay) : []
-          console.error("Bluj killing pid ", pids)
           try {
             childProcess.kill(signal)
 
@@ -290,7 +289,6 @@ export const createUtils = <
             await overlay.destroy()
           }
 
-          console.error("Bluj actually killing pid ", pids)
           try {
             for (const process of pids) {
               await cp.execFile("kill", [`-${signal}`, String(process)])

From e0c9f8a5aad233755cd2341015adb8e9cd4a3ae1 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 7 Mar 2024 14:40:22 -0700
Subject: [PATCH 041/341] Feature/remove postgres (#2570)

* wip: move postgres data to patchdb

* wip

* wip

* wip

* complete notifications and clean up warnings

* fill in user agent

* move os tor bindings to single call
---
 core/Cargo.lock                               |  98 ++---
 core/models/Cargo.toml                        |   2 +-
 core/models/src/errors.rs                     |   5 +
 core/models/src/id/host.rs                    |  11 +
 core/models/src/id/mod.rs                     |   5 +
 core/models/src/id/package.rs                 |  11 +
 core/models/src/procedure_name.rs             |   2 +-
 core/startos/Cargo.toml                       |  16 +-
 core/startos/src/account.rs                   | 125 +++---
 core/startos/src/auth.rs                      | 134 +++---
 core/startos/src/backup/backup_bulk.rs        | 288 ++++++------
 core/startos/src/backup/os.rs                 | 123 ++++--
 core/startos/src/backup/restore.rs            |  15 +-
 core/startos/src/backup/target/cifs.rs        | 178 ++++----
 core/startos/src/backup/target/mod.rs         |  32 +-
 core/startos/src/context/config.rs            |  10 +-
 core/startos/src/context/rpc.rs               |  22 +-
 core/startos/src/context/setup.rs             |   9 +-
 core/startos/src/control.rs                   |   6 +-
 core/startos/src/db/model.rs                  | 104 ++++-
 core/startos/src/db/prelude.rs                | 237 +++++++---
 core/startos/src/dependencies.rs              |  10 +-
 core/startos/src/firmware.rs                  |   1 -
 core/startos/src/init.rs                      |  23 +-
 core/startos/src/install/mod.rs               |   4 -
 core/startos/src/logs.rs                      |   2 +-
 core/startos/src/lxc/mod.rs                   |  17 +
 core/startos/src/middleware/auth.rs           |  84 ++--
 core/startos/src/net/dns.rs                   |   5 +-
 core/startos/src/net/forward.rs               | 177 ++++++++
 core/startos/src/net/host/address.rs          |   9 +
 core/startos/src/net/host/binding.rs          |  71 +++
 core/startos/src/net/host/mod.rs              |  93 +++-
 core/startos/src/net/host/multi.rs            |  13 -
 core/startos/src/net/keys.rs                  | 401 +----------------
 core/startos/src/net/mdns.rs                  |   8 +-
 core/startos/src/net/mod.rs                   |  14 +-
 core/startos/src/net/net_controller.rs        | 411 ++++++++++--------
 core/startos/src/net/ssl.rs                   | 284 ++++++------
 core/startos/src/net/static_server.rs         |   6 +-
 core/startos/src/net/tor.rs                   | 162 ++++---
 core/startos/src/net/vhost.rs                 |  73 ++--
 core/startos/src/notifications.rs             | 340 ++++++---------
 core/startos/src/registry/admin.rs            |   4 +-
 core/startos/src/s9pk/merkle_archive/mod.rs   |   2 -
 .../source/multi_cursor_file.rs               |   4 +-
 core/startos/src/service/config.rs            |   4 +-
 core/startos/src/service/mod.rs               |  15 +-
 .../src/service/persistent_container.rs       |  17 +-
 core/startos/src/service/rpc.rs               |   2 +-
 .../src/service/service_effect_handler.rs     |  12 +-
 core/startos/src/service/service_map.rs       |  26 +-
 core/startos/src/service/transition/mod.rs    |   4 +-
 core/startos/src/setup.rs                     |  42 +-
 core/startos/src/ssh.rs                       | 167 ++++---
 core/startos/src/status/mod.rs                |   6 +
 core/startos/src/update/mod.rs                |  51 +--
 core/startos/src/upload.rs                    |   8 +-
 core/startos/src/util/future.rs               |   4 +-
 core/startos/src/util/serde.rs                | 150 +++++++
 core/startos/src/version/mod.rs               | 208 ++++-----
 core/startos/src/version/v0_3_4.rs            | 140 ------
 core/startos/src/version/v0_3_4_1.rs          |  31 --
 core/startos/src/version/v0_3_4_2.rs          |  31 --
 core/startos/src/version/v0_3_4_3.rs          |  31 --
 core/startos/src/version/v0_3_4_4.rs          |  43 --
 core/startos/src/version/v0_3_5.rs            | 103 +----
 core/startos/src/version/v0_3_5_1.rs          |   9 +-
 core/startos/src/version/v0_3_6.rs            |  29 ++
 core/startos/src/volume.rs                    |  10 +
 70 files changed, 2420 insertions(+), 2374 deletions(-)
 create mode 100644 core/startos/src/net/forward.rs
 create mode 100644 core/startos/src/net/host/address.rs
 create mode 100644 core/startos/src/net/host/binding.rs
 delete mode 100644 core/startos/src/net/host/multi.rs
 delete mode 100644 core/startos/src/version/v0_3_4.rs
 delete mode 100644 core/startos/src/version/v0_3_4_1.rs
 delete mode 100644 core/startos/src/version/v0_3_4_2.rs
 delete mode 100644 core/startos/src/version/v0_3_4_3.rs
 delete mode 100644 core/startos/src/version/v0_3_4_4.rs
 create mode 100644 core/startos/src/version/v0_3_6.rs

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 95b7f3ca9..5435fe2b0 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -304,7 +304,7 @@ checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
 dependencies = [
  "async-trait",
  "axum-core 0.4.3",
- "base64 0.21.7",
+ "base64",
  "bytes",
  "futures-util",
  "http 1.0.0",
@@ -417,12 +417,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -533,7 +527,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding",
  "generic-array",
 ]
 
@@ -546,12 +539,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "brotli"
 version = "3.4.0"
@@ -1044,16 +1031,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "csv"
 version = "1.3.0"
@@ -1847,7 +1824,7 @@ version = "7.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "byteorder",
  "flate2",
  "nom",
@@ -1913,17 +1890,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
- "hmac 0.12.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac",
- "digest 0.9.0",
+ "hmac",
 ]
 
 [[package]]
@@ -2125,6 +2092,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "id-pool"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d0df4d8a768821ee4aa2e0353f67125c4586f0e13adbf95b8ebbf8d8fdb344"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -2412,7 +2388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd20997283339a19226445db97d632c8dc7adb6b8172537fe0e9e540fb141df2"
 dependencies = [
  "anyhow",
- "base64 0.21.7",
+ "base64",
  "flate2",
  "once_cell",
  "openssl",
@@ -2684,7 +2660,7 @@ dependencies = [
 name = "models"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "color-eyre",
  "ed25519-dalek 2.1.1",
  "emver",
@@ -2962,7 +2938,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c75a0ec2d1b302412fb503224289325fcc0e44600176864804c7211b055cfd58"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "byteorder",
  "md-5",
  "sha2 0.10.8",
@@ -3156,7 +3132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
- "hmac 0.12.1",
+ "hmac",
 ]
 
 [[package]]
@@ -3609,7 +3585,7 @@ version = "0.11.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "bytes",
  "cookie 0.17.0",
  "cookie_store",
@@ -3666,7 +3642,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
- "hmac 0.12.1",
+ "hmac",
  "subtle",
 ]
 
@@ -3827,7 +3803,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "blake2b_simd",
  "constant_time_eq",
 ]
@@ -3891,7 +3867,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.7",
+ "base64",
 ]
 
 [[package]]
@@ -4128,7 +4104,7 @@ version = "3.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270"
 dependencies = [
- "base64 0.21.7",
+ "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
@@ -4202,14 +4178,12 @@ dependencies = [
 
 [[package]]
 name = "sha3"
-version = "0.9.1"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
+ "digest 0.10.7",
  "keccak",
- "opaque-debug",
 ]
 
 [[package]]
@@ -4455,7 +4429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4"
 dependencies = [
  "atoi",
- "base64 0.21.7",
+ "base64",
  "bitflags 2.4.2",
  "byteorder",
  "bytes",
@@ -4471,7 +4445,7 @@ dependencies = [
  "generic-array",
  "hex",
  "hkdf",
- "hmac 0.12.1",
+ "hmac",
  "itoa",
  "log",
  "md-5",
@@ -4498,7 +4472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24"
 dependencies = [
  "atoi",
- "base64 0.21.7",
+ "base64",
  "bitflags 2.4.2",
  "byteorder",
  "chrono",
@@ -4511,7 +4485,7 @@ dependencies = [
  "futures-util",
  "hex",
  "hkdf",
- "hmac 0.12.1",
+ "hmac",
  "home",
  "itoa",
  "log",
@@ -4635,7 +4609,7 @@ dependencies = [
  "axum 0.7.4",
  "axum-server",
  "base32",
- "base64 0.21.7",
+ "base64",
  "base64ct",
  "basic-cookies",
  "blake3",
@@ -4660,8 +4634,9 @@ dependencies = [
  "gpt",
  "helpers",
  "hex",
- "hmac 0.12.1",
+ "hmac",
  "http 1.0.0",
+ "id-pool",
  "imbl",
  "imbl-value",
  "include_dir",
@@ -5215,7 +5190,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum 0.6.20",
- "base64 0.21.7",
+ "base64",
  "bytes",
  "h2 0.3.24",
  "http 0.2.11",
@@ -5236,19 +5211,18 @@ dependencies = [
 [[package]]
 name = "torut"
 version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99febc413f26cf855b3a309c5872edff5c31e0ffe9c2fce5681868761df36f69"
+source = "git+https://github.com/Start9Labs/torut.git?branch=update/dependencies#2b6fa9528d22e0b276132bccf7f2e9308f84b2c7"
 dependencies = [
  "base32",
- "base64 0.13.1",
+ "base64",
  "derive_more",
  "ed25519-dalek 1.0.1",
  "hex",
- "hmac 0.11.0",
+ "hmac",
  "rand 0.7.3",
  "serde",
  "serde_derive",
- "sha2 0.9.9",
+ "sha2 0.10.8",
  "sha3",
  "tokio",
 ]
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index c6fc76f55..250ba22a7 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -34,6 +34,6 @@ sqlx = { version = "0.7.2", features = [
 ssh-key = "0.6.2"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
-torut = "0.2.1"
+torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies" }
 tracing = "0.1.39"
 yasi = "0.1.5"
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index 15bc90b9f..2362b6dba 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -207,6 +207,11 @@ impl Error {
         }
     }
 }
+impl From<std::convert::Infallible> for Error {
+    fn from(value: std::convert::Infallible) -> Self {
+        match value {}
+    }
+}
 impl From<InvalidId> for Error {
     fn from(err: InvalidId) -> Self {
         Error::new(err, ErrorKind::InvalidPackageId)
diff --git a/core/models/src/id/host.rs b/core/models/src/id/host.rs
index 91abd56e7..6bca7d0ff 100644
--- a/core/models/src/id/host.rs
+++ b/core/models/src/id/host.rs
@@ -2,6 +2,7 @@ use std::path::Path;
 use std::str::FromStr;
 
 use serde::{Deserialize, Deserializer, Serialize};
+use yasi::InternedString;
 
 use crate::{Id, InvalidId};
 
@@ -18,6 +19,16 @@ impl From<Id> for HostId {
         Self(id)
     }
 }
+impl From<HostId> for Id {
+    fn from(value: HostId) -> Self {
+        value.0
+    }
+}
+impl From<HostId> for InternedString {
+    fn from(value: HostId) -> Self {
+        value.0.into()
+    }
+}
 impl std::fmt::Display for HostId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", &self.0)
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index 068955336..efbe1f818 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -59,6 +59,11 @@ impl TryFrom<&str> for Id {
         }
     }
 }
+impl From<Id> for InternedString {
+    fn from(value: Id) -> Self {
+        value.0
+    }
+}
 impl std::ops::Deref for Id {
     type Target = str;
     fn deref(&self) -> &Self::Target {
diff --git a/core/models/src/id/package.rs b/core/models/src/id/package.rs
index 14c29d88b..060f541c3 100644
--- a/core/models/src/id/package.rs
+++ b/core/models/src/id/package.rs
@@ -3,6 +3,7 @@ use std::path::Path;
 use std::str::FromStr;
 
 use serde::{Deserialize, Serialize, Serializer};
+use yasi::InternedString;
 
 use crate::{Id, InvalidId, SYSTEM_ID};
 
@@ -22,6 +23,16 @@ impl From<Id> for PackageId {
         PackageId(id)
     }
 }
+impl From<PackageId> for Id {
+    fn from(value: PackageId) -> Self {
+        value.0
+    }
+}
+impl From<PackageId> for InternedString {
+    fn from(value: PackageId) -> Self {
+        value.0.into()
+    }
+}
 impl std::ops::Deref for PackageId {
     type Target = str;
     fn deref(&self) -> &Self::Target {
diff --git a/core/models/src/procedure_name.rs b/core/models/src/procedure_name.rs
index 841f8df7d..bf69b06b8 100644
--- a/core/models/src/procedure_name.rs
+++ b/core/models/src/procedure_name.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{ActionId, HealthCheckId, PackageId};
+use crate::ActionId;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ProcedureName {
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 3fce87089..fd36c3de6 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -87,14 +87,10 @@ helpers = { path = "../helpers" }
 hex = "0.4.3"
 hmac = "0.12.1"
 http = "1.0.0"
-# http-body-util = "0.1.0"
-# hyper = { version = "1.1.0", features = ["full"] }
-# hyper-util = { version = "0.1.2", features = [
-#   "server",
-#   "server-auto",
-#   "tokio",
-# ] }
-# hyper-ws-listener = "0.3.0"
+id-pool = { version = "0.2.2", default-features = false, features = [
+  "serde",
+  "u16",
+] }
 imbl = "2.0.2"
 imbl-value = { git = "https://github.com/Start9Labs/imbl-value.git" }
 include_dir = "0.7.3"
@@ -169,7 +165,9 @@ tokio-stream = { version = "0.1.14", features = ["io-util", "sync", "net"] }
 tokio-tar = { git = "https://github.com/dr-bonez/tokio-tar.git" }
 tokio-tungstenite = { version = "0.21.0", features = ["native-tls"] }
 tokio-util = { version = "0.7.9", features = ["io"] }
-torut = "0.2.1"
+torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies", features = [
+  "serialize",
+] }
 tracing = "0.1.39"
 tracing-error = "0.2.0"
 tracing-futures = "0.2.5"
diff --git a/core/startos/src/account.rs b/core/startos/src/account.rs
index cb08a0d53..e074d301d 100644
--- a/core/startos/src/account.rs
+++ b/core/startos/src/account.rs
@@ -1,15 +1,14 @@
 use std::time::SystemTime;
 
-use ed25519_dalek::SecretKey;
 use openssl::pkey::{PKey, Private};
 use openssl::x509::X509;
-use sqlx::PgExecutor;
+use torut::onion::TorSecretKeyV3;
 
+use crate::db::model::DatabaseModel;
 use crate::hostname::{generate_hostname, generate_id, Hostname};
-use crate::net::keys::Key;
 use crate::net::ssl::{generate_key, make_root_cert};
 use crate::prelude::*;
-use crate::util::crypto::ed25519_expand_key;
+use crate::util::serde::Pem;
 
 fn hash_password(password: &str) -> Result<String, Error> {
     argon2::hash_encoded(
@@ -25,103 +24,83 @@ pub struct AccountInfo {
     pub server_id: String,
     pub hostname: Hostname,
     pub password: String,
-    pub key: Key,
+    pub tor_key: TorSecretKeyV3,
     pub root_ca_key: PKey<Private>,
     pub root_ca_cert: X509,
+    pub ssh_key: ssh_key::PrivateKey,
 }
 impl AccountInfo {
     pub fn new(password: &str, start_time: SystemTime) -> Result<Self, Error> {
         let server_id = generate_id();
         let hostname = generate_hostname();
+        let tor_key = TorSecretKeyV3::generate();
         let root_ca_key = generate_key()?;
         let root_ca_cert = make_root_cert(&root_ca_key, &hostname, start_time)?;
+        let ssh_key = ssh_key::PrivateKey::from(ssh_key::private::Ed25519Keypair::random(
+            &mut rand::thread_rng(),
+        ));
         Ok(Self {
             server_id,
             hostname,
             password: hash_password(password)?,
-            key: Key::new(None),
+            tor_key,
             root_ca_key,
             root_ca_cert,
+            ssh_key,
         })
     }
 
-    pub async fn load(secrets: impl PgExecutor<'_>) -> Result<Self, Error> {
-        let r = sqlx::query!("SELECT * FROM account WHERE id = 0")
-            .fetch_one(secrets)
-            .await?;
-
-        let server_id = r.server_id.unwrap_or_else(generate_id);
-        let hostname = r.hostname.map(Hostname).unwrap_or_else(generate_hostname);
-        let password = r.password;
-        let network_key = SecretKey::try_from(r.network_key).map_err(|e| {
-            Error::new(
-                eyre!("expected vec of len 32, got len {}", e.len()),
-                ErrorKind::ParseDbField,
-            )
-        })?;
-        let tor_key = if let Some(k) = &r.tor_key {
-            <[u8; 64]>::try_from(&k[..]).map_err(|_| {
-                Error::new(
-                    eyre!("expected vec of len 64, got len {}", k.len()),
-                    ErrorKind::ParseDbField,
-                )
-            })?
-        } else {
-            ed25519_expand_key(&network_key)
-        };
-        let key = Key::from_pair(None, network_key, tor_key);
-        let root_ca_key = PKey::private_key_from_pem(r.root_ca_key_pem.as_bytes())?;
-        let root_ca_cert = X509::from_pem(r.root_ca_cert_pem.as_bytes())?;
+    pub fn load(db: &DatabaseModel) -> Result<Self, Error> {
+        let server_id = db.as_public().as_server_info().as_id().de()?;
+        let hostname = Hostname(db.as_public().as_server_info().as_hostname().de()?);
+        let password = db.as_private().as_password().de()?;
+        let key_store = db.as_private().as_key_store();
+        let tor_addr = db.as_public().as_server_info().as_onion_address().de()?;
+        let tor_key = key_store.as_onion().get_key(&tor_addr)?;
+        let cert_store = key_store.as_local_certs();
+        let root_ca_key = cert_store.as_root_key().de()?.0;
+        let root_ca_cert = cert_store.as_root_cert().de()?.0;
+        let ssh_key = db.as_private().as_ssh_privkey().de()?.0;
 
         Ok(Self {
             server_id,
             hostname,
             password,
-            key,
+            tor_key,
             root_ca_key,
             root_ca_cert,
+            ssh_key,
         })
     }
 
-    pub async fn save(&self, secrets: impl PgExecutor<'_>) -> Result<(), Error> {
-        let server_id = self.server_id.as_str();
-        let hostname = self.hostname.0.as_str();
-        let password = self.password.as_str();
-        let network_key = self.key.as_bytes();
-        let network_key = network_key.as_slice();
-        let root_ca_key = String::from_utf8(self.root_ca_key.private_key_to_pem_pkcs8()?)?;
-        let root_ca_cert = String::from_utf8(self.root_ca_cert.to_pem()?)?;
-
-        sqlx::query!(
-            r#"
-            INSERT INTO account (
-                id,
-                server_id,
-                hostname,
-                password,
-                network_key,
-                root_ca_key_pem,
-                root_ca_cert_pem
-            ) VALUES (
-                0, $1, $2, $3, $4, $5, $6
-            ) ON CONFLICT (id) DO UPDATE SET
-                server_id = EXCLUDED.server_id,
-                hostname = EXCLUDED.hostname,
-                password = EXCLUDED.password,
-                network_key = EXCLUDED.network_key,
-                root_ca_key_pem = EXCLUDED.root_ca_key_pem,
-                root_ca_cert_pem = EXCLUDED.root_ca_cert_pem
-            "#,
-            server_id,
-            hostname,
-            password,
-            network_key,
-            root_ca_key,
-            root_ca_cert,
-        )
-        .execute(secrets)
-        .await?;
-
+    pub fn save(&self, db: &mut DatabaseModel) -> Result<(), Error> {
+        let server_info = db.as_public_mut().as_server_info_mut();
+        server_info.as_id_mut().ser(&self.server_id)?;
+        server_info.as_hostname_mut().ser(&self.hostname.0)?;
+        server_info
+            .as_lan_address_mut()
+            .ser(&self.hostname.lan_address().parse()?)?;
+        server_info
+            .as_pubkey_mut()
+            .ser(&self.ssh_key.public_key().to_openssh()?)?;
+        let onion_address = self.tor_key.public().get_onion_address();
+        server_info.as_onion_address_mut().ser(&onion_address)?;
+        server_info
+            .as_tor_address_mut()
+            .ser(&format!("https://{onion_address}").parse()?)?;
+        db.as_private_mut().as_password_mut().ser(&self.password)?;
+        db.as_private_mut()
+            .as_ssh_privkey_mut()
+            .ser(Pem::new_ref(&self.ssh_key))?;
+        let key_store = db.as_private_mut().as_key_store_mut();
+        key_store.as_onion_mut().insert_key(&self.tor_key)?;
+        let cert_store = key_store.as_local_certs_mut();
+        cert_store
+            .as_root_key_mut()
+            .ser(Pem::new_ref(&self.root_ca_key))?;
+        cert_store
+            .as_root_cert_mut()
+            .ser(Pem::new_ref(&self.root_ca_cert))?;
         Ok(())
     }
 
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 891f390bc..21cfbd101 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -1,17 +1,17 @@
 use std::collections::BTreeMap;
 
 use chrono::{DateTime, Utc};
-use clap::{ArgMatches, Parser};
+use clap::Parser;
 use color_eyre::eyre::eyre;
 use imbl_value::{json, InternedString};
 use josekit::jwk::Jwk;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{command, from_fn_async, AnyContext, CallRemote, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use sqlx::{Executor, Postgres};
 use tracing::instrument;
 
 use crate::context::{CliContext, RpcContext};
+use crate::db::model::DatabaseModel;
 use crate::middleware::auth::{
     AsLogoutSessionId, HasLoggedOutSessions, HashSessionToken, LoginRes,
 };
@@ -19,6 +19,25 @@ use crate::prelude::*;
 use crate::util::crypto::EncryptedWire;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::{ensure_code, Error, ResultExt};
+
+#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+pub struct Sessions(pub BTreeMap<InternedString, Session>);
+impl Sessions {
+    pub fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+}
+impl Map for Sessions {
+    type Key = InternedString;
+    type Value = Session;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone())
+    }
+}
+
 #[derive(Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum PasswordType {
@@ -95,16 +114,6 @@ pub fn auth() -> ParentHandler {
         )
 }
 
-pub fn cli_metadata() -> Value {
-    imbl_value::json!({
-        "platforms": ["cli"],
-    })
-}
-
-pub fn parse_metadata(_: &str, _: &ArgMatches) -> Result<Value, Error> {
-    Ok(cli_metadata())
-}
-
 #[test]
 fn gen_pwd() {
     println!(
@@ -163,14 +172,8 @@ pub fn check_password(hash: &str, password: &str) -> Result<(), Error> {
     Ok(())
 }
 
-pub async fn check_password_against_db<Ex>(secrets: &mut Ex, password: &str) -> Result<(), Error>
-where
-    for<'a> &'a mut Ex: Executor<'a, Database = Postgres>,
-{
-    let pw_hash = sqlx::query!("SELECT password FROM account")
-        .fetch_one(secrets)
-        .await?
-        .password;
+pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<(), Error> {
+    let pw_hash = db.as_private().as_password().de()?;
     check_password(&pw_hash, password)?;
     Ok(())
 }
@@ -180,7 +183,8 @@ where
 #[command(rename_all = "kebab-case")]
 pub struct LoginParams {
     password: Option<PasswordType>,
-    #[arg(skip = cli_metadata())]
+    #[serde(default)]
+    user_agent: Option<String>,
     #[serde(default)]
     metadata: Value,
 }
@@ -188,26 +192,31 @@ pub struct LoginParams {
 #[instrument(skip_all)]
 pub async fn login_impl(
     ctx: RpcContext,
-    LoginParams { password, metadata }: LoginParams,
-) -> Result<LoginRes, Error> {
-    let password = password.unwrap_or_default().decrypt(&ctx)?;
-    let mut handle = ctx.secret_store.acquire().await?;
-    check_password_against_db(handle.as_mut(), &password).await?;
-
-    let hash_token = HashSessionToken::new();
-    let user_agent = "".to_string(); // todo!() as String;
-    let metadata = serde_json::to_string(&metadata).with_kind(crate::ErrorKind::Database)?;
-    let hash_token_hashed = hash_token.hashed();
-    sqlx::query!(
-        "INSERT INTO session (id, user_agent, metadata) VALUES ($1, $2, $3)",
-        hash_token_hashed,
+    LoginParams {
+        password,
         user_agent,
         metadata,
-    )
-    .execute(handle.as_mut())
-    .await?;
+    }: LoginParams,
+) -> Result<LoginRes, Error> {
+    let password = password.unwrap_or_default().decrypt(&ctx)?;
 
-    Ok(hash_token.to_login_res())
+    ctx.db
+        .mutate(|db| {
+            check_password_against_db(db, &password)?;
+            let hash_token = HashSessionToken::new();
+            db.as_private_mut().as_sessions_mut().insert(
+                hash_token.hashed(),
+                &Session {
+                    logged_in: Utc::now(),
+                    last_active: Utc::now(),
+                    user_agent,
+                    metadata,
+                },
+            )?;
+
+            Ok(hash_token.to_login_res())
+        })
+        .await
 }
 
 #[derive(Deserialize, Serialize, Parser)]
@@ -226,20 +235,20 @@ pub async fn logout(
     ))
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct Session {
-    logged_in: DateTime<Utc>,
-    last_active: DateTime<Utc>,
-    user_agent: Option<String>,
-    metadata: Value,
+    pub logged_in: DateTime<Utc>,
+    pub last_active: DateTime<Utc>,
+    pub user_agent: Option<String>,
+    pub metadata: Value,
 }
 
 #[derive(Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct SessionList {
-    current: String,
-    sessions: BTreeMap<String, Session>,
+    current: InternedString,
+    sessions: Sessions,
 }
 
 pub fn session() -> ParentHandler {
@@ -277,7 +286,7 @@ fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) {
         "USER AGENT",
         "METADATA",
     ]);
-    for (id, session) in arg.sessions {
+    for (id, session) in arg.sessions.0 {
         let mut row = row![
             &id,
             &format!("{}", session.logged_in),
@@ -310,33 +319,11 @@ pub async fn list(
     ListParams { session, .. }: ListParams,
 ) -> Result<SessionList, Error> {
     Ok(SessionList {
-        current: HashSessionToken::from_token(session).hashed().to_owned(),
-        sessions: sqlx::query!(
-            "SELECT * FROM session WHERE logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP"
-        )
-        .fetch_all(ctx.secret_store.acquire().await?.as_mut())
-        .await?
-        .into_iter()
-        .map(|row| {
-            Ok((
-                row.id,
-                Session {
-                    logged_in: DateTime::from_utc(row.logged_in, Utc),
-                    last_active: DateTime::from_utc(row.last_active, Utc),
-                    user_agent: row.user_agent,
-                    metadata: serde_json::from_str(&row.metadata)
-                        .with_kind(crate::ErrorKind::Database)?,
-                },
-            ))
-        })
-        .collect::<Result<_, Error>>()?,
+        current: HashSessionToken::from_token(session).hashed().clone(),
+        sessions: ctx.db.peek().await.into_private().into_sessions().de()?,
     })
 }
 
-fn parse_comma_separated(arg: &str, _: &ArgMatches) -> Result<Vec<String>, RpcError> {
-    Ok(arg.split(",").map(|s| s.trim().to_owned()).collect())
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 struct KillSessionId(InternedString);
 
@@ -433,14 +420,17 @@ pub async fn reset_password_impl(
         ));
     }
     account.set_password(&new_password)?;
-    account.save(&ctx.secret_store).await?;
     let account_password = &account.password;
+    let account = account.clone();
     ctx.db
         .mutate(|d| {
             d.as_public_mut()
                 .as_server_info_mut()
                 .as_password_hash_mut()
-                .ser(account_password)
+                .ser(account_password)?;
+            account.save(d)?;
+
+            Ok(())
         })
         .await
 }
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 4660ab4bc..4f633d7ae 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -1,5 +1,4 @@
 use std::collections::BTreeMap;
-use std::panic::UnwindSafe;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
@@ -19,11 +18,11 @@ use crate::auth::check_password_against_db;
 use crate::backup::os::OsBackup;
 use crate::backup::{BackupReport, ServerBackupReport};
 use crate::context::RpcContext;
-use crate::db::model::BackupProgress;
+use crate::db::model::{BackupProgress, DatabaseModel};
 use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
-use crate::notifications::NotificationLevel;
+use crate::notifications::{notify, NotificationLevel};
 use crate::prelude::*;
 use crate::util::io::dir_copy;
 use crate::util::serde::IoFormat;
@@ -41,6 +40,111 @@ pub struct BackupParams {
     password: crate::auth::PasswordType,
 }
 
+struct BackupStatusGuard(Option<PatchDb>);
+impl BackupStatusGuard {
+    fn new(db: PatchDb) -> Self {
+        Self(Some(db))
+    }
+    async fn handle_result(
+        mut self,
+        result: Result<BTreeMap<PackageId, PackageBackupReport>, Error>,
+    ) -> Result<(), Error> {
+        if let Some(db) = self.0.as_ref() {
+            db.mutate(|v| {
+                v.as_public_mut()
+                    .as_server_info_mut()
+                    .as_status_info_mut()
+                    .as_backup_progress_mut()
+                    .ser(&None)
+            })
+            .await?;
+        }
+        if let Some(db) = self.0.take() {
+            match result {
+                Ok(report) if report.iter().all(|(_, rep)| rep.error.is_none()) => {
+                    db.mutate(|db| {
+                        notify(
+                            db,
+                            None,
+                            NotificationLevel::Success,
+                            "Backup Complete".to_owned(),
+                            "Your backup has completed".to_owned(),
+                            BackupReport {
+                                server: ServerBackupReport {
+                                    attempted: true,
+                                    error: None,
+                                },
+                                packages: report,
+                            },
+                        )
+                    })
+                    .await
+                }
+                Ok(report) => {
+                    db.mutate(|db| {
+                        notify(
+                            db,
+                            None,
+                            NotificationLevel::Warning,
+                            "Backup Complete".to_owned(),
+                            "Your backup has completed, but some package(s) failed to backup"
+                                .to_owned(),
+                            BackupReport {
+                                server: ServerBackupReport {
+                                    attempted: true,
+                                    error: None,
+                                },
+                                packages: report,
+                            },
+                        )
+                    })
+                    .await
+                }
+                Err(e) => {
+                    tracing::error!("Backup Failed: {}", e);
+                    tracing::debug!("{:?}", e);
+                    let err_string = e.to_string();
+                    db.mutate(|db| {
+                        notify(
+                            db,
+                            None,
+                            NotificationLevel::Error,
+                            "Backup Failed".to_owned(),
+                            "Your backup failed to complete.".to_owned(),
+                            BackupReport {
+                                server: ServerBackupReport {
+                                    attempted: true,
+                                    error: Some(err_string),
+                                },
+                                packages: BTreeMap::new(),
+                            },
+                        )
+                    })
+                    .await
+                }
+            }?;
+        }
+        Ok(())
+    }
+}
+impl Drop for BackupStatusGuard {
+    fn drop(&mut self) {
+        if let Some(db) = self.0.take() {
+            tokio::spawn(async move {
+                db.mutate(|v| {
+                    v.as_public_mut()
+                        .as_server_info_mut()
+                        .as_status_info_mut()
+                        .as_backup_progress_mut()
+                        .ser(&None)
+                })
+                .await
+                .unwrap()
+            });
+        }
+    }
+}
+
 #[instrument(skip(ctx, old_password, password))]
 pub async fn backup_all(
     ctx: RpcContext,
@@ -57,139 +161,81 @@ pub async fn backup_all(
         .clone()
         .decrypt(&ctx)?;
     let password = password.decrypt(&ctx)?;
-    check_password_against_db(ctx.secret_store.acquire().await?.as_mut(), &password).await?;
-    let fs = target_id
-        .load(ctx.secret_store.acquire().await?.as_mut())
-        .await?;
+
+    let ((fs, package_ids), status_guard) = (
+        ctx.db
+            .mutate(|db| {
+                check_password_against_db(db, &password)?;
+                let fs = target_id.load(db)?;
+                let package_ids = if let Some(ids) = package_ids {
+                    ids.into_iter().collect()
+                } else {
+                    db.as_public()
+                        .as_package_data()
+                        .as_entries()?
+                        .into_iter()
+                        .filter(|(_, m)| m.expect_as_installed().is_ok())
+                        .map(|(id, _)| id)
+                        .collect()
+                };
+                assure_backing_up(db, &package_ids)?;
+                Ok((fs, package_ids))
+            })
+            .await?,
+        BackupStatusGuard::new(ctx.db.clone()),
+    );
+
     let mut backup_guard = BackupMountGuard::mount(
         TmpMountGuard::mount(&fs, ReadWrite).await?,
         &old_password_decrypted,
     )
     .await?;
-    let package_ids = if let Some(ids) = package_ids {
-        ids.into_iter().collect()
-    } else {
-        todo!("all installed packages");
-    };
     if old_password.is_some() {
         backup_guard.change_password(&password)?;
     }
-    assure_backing_up(&ctx.db, &package_ids).await?;
     tokio::task::spawn(async move {
-        let backup_res = perform_backup(&ctx, backup_guard, &package_ids).await;
-        match backup_res {
-            Ok(report) if report.iter().all(|(_, rep)| rep.error.is_none()) => ctx
-                .notification_manager
-                .notify(
-                    ctx.db.clone(),
-                    None,
-                    NotificationLevel::Success,
-                    "Backup Complete".to_owned(),
-                    "Your backup has completed".to_owned(),
-                    BackupReport {
-                        server: ServerBackupReport {
-                            attempted: true,
-                            error: None,
-                        },
-                        packages: report,
-                    },
-                    None,
-                )
-                .await
-                .expect("failed to send notification"),
-            Ok(report) => ctx
-                .notification_manager
-                .notify(
-                    ctx.db.clone(),
-                    None,
-                    NotificationLevel::Warning,
-                    "Backup Complete".to_owned(),
-                    "Your backup has completed, but some package(s) failed to backup".to_owned(),
-                    BackupReport {
-                        server: ServerBackupReport {
-                            attempted: true,
-                            error: None,
-                        },
-                        packages: report,
-                    },
-                    None,
-                )
-                .await
-                .expect("failed to send notification"),
-            Err(e) => {
-                tracing::error!("Backup Failed: {}", e);
-                tracing::debug!("{:?}", e);
-                ctx.notification_manager
-                    .notify(
-                        ctx.db.clone(),
-                        None,
-                        NotificationLevel::Error,
-                        "Backup Failed".to_owned(),
-                        "Your backup failed to complete.".to_owned(),
-                        BackupReport {
-                            server: ServerBackupReport {
-                                attempted: true,
-                                error: Some(e.to_string()),
-                            },
-                            packages: BTreeMap::new(),
-                        },
-                        None,
-                    )
-                    .await
-                    .expect("failed to send notification");
-            }
-        }
-        ctx.db
-            .mutate(|v| {
-                v.as_public_mut()
-                    .as_server_info_mut()
-                    .as_status_info_mut()
-                    .as_backup_progress_mut()
-                    .ser(&None)
-            })
-            .await?;
-        Ok::<(), Error>(())
+        status_guard
+            .handle_result(perform_backup(&ctx, backup_guard, &package_ids).await)
+            .await
+            .unwrap();
     });
     Ok(())
 }
 
 #[instrument(skip(db, packages))]
-async fn assure_backing_up(
-    db: &PatchDb,
-    packages: impl IntoIterator<Item = &PackageId> + UnwindSafe + Send,
+fn assure_backing_up<'a>(
+    db: &mut DatabaseModel,
+    packages: impl IntoIterator<Item = &'a PackageId>,
 ) -> Result<(), Error> {
-    db.mutate(|v| {
-        let backing_up = v
-            .as_public_mut()
-            .as_server_info_mut()
-            .as_status_info_mut()
-            .as_backup_progress_mut();
-        if backing_up
-            .clone()
-            .de()?
-            .iter()
-            .flat_map(|x| x.values())
-            .fold(false, |acc, x| {
-                if !x.complete {
-                    return true;
-                }
-                acc
-            })
-        {
-            return Err(Error::new(
-                eyre!("Server is already backing up!"),
-                ErrorKind::InvalidRequest,
-            ));
-        }
-        backing_up.ser(&Some(
-            packages
-                .into_iter()
-                .map(|x| (x.clone(), BackupProgress { complete: false }))
-                .collect(),
-        ))?;
-        Ok(())
-    })
-    .await
+    let backing_up = db
+        .as_public_mut()
+        .as_server_info_mut()
+        .as_status_info_mut()
+        .as_backup_progress_mut();
+    if backing_up
+        .clone()
+        .de()?
+        .iter()
+        .flat_map(|x| x.values())
+        .fold(false, |acc, x| {
+            if !x.complete {
+                return true;
+            }
+            acc
+        })
+    {
+        return Err(Error::new(
+            eyre!("Server is already backing up!"),
+            ErrorKind::InvalidRequest,
+        ));
+    }
+    backing_up.ser(&Some(
+        packages
+            .into_iter()
+            .map(|x| (x.clone(), BackupProgress { complete: false }))
+            .collect(),
+    ))?;
+    Ok(())
 }
 
 #[instrument(skip(ctx, backup_guard))]
diff --git a/core/startos/src/backup/os.rs b/core/startos/src/backup/os.rs
index 5ab8bd12e..6848473a7 100644
--- a/core/startos/src/backup/os.rs
+++ b/core/startos/src/backup/os.rs
@@ -1,13 +1,15 @@
-use openssl::pkey::PKey;
+use openssl::pkey::{PKey, Private};
 use openssl::x509::X509;
 use patch_db::Value;
 use serde::{Deserialize, Serialize};
+use ssh_key::private::Ed25519Keypair;
+use torut::onion::TorSecretKeyV3;
 
 use crate::account::AccountInfo;
 use crate::hostname::{generate_hostname, generate_id, Hostname};
-use crate::net::keys::Key;
 use crate::prelude::*;
-use crate::util::serde::Base64;
+use crate::util::crypto::ed25519_expand_key;
+use crate::util::serde::{Base32, Base64, Pem};
 
 pub struct OsBackup {
     pub account: AccountInfo,
@@ -19,19 +21,23 @@ impl<'de> Deserialize<'de> for OsBackup {
         D: serde::Deserializer<'de>,
     {
         let tagged = OsBackupSerDe::deserialize(deserializer)?;
-        match tagged.version {
+        Ok(match tagged.version {
             0 => patch_db::value::from_value::<OsBackupV0>(tagged.rest)
                 .map_err(serde::de::Error::custom)?
                 .project()
-                .map_err(serde::de::Error::custom),
+                .map_err(serde::de::Error::custom)?,
             1 => patch_db::value::from_value::<OsBackupV1>(tagged.rest)
                 .map_err(serde::de::Error::custom)?
-                .project()
-                .map_err(serde::de::Error::custom),
-            v => Err(serde::de::Error::custom(&format!(
-                "Unknown backup version {v}"
-            ))),
-        }
+                .project(),
+            2 => patch_db::value::from_value::<OsBackupV2>(tagged.rest)
+                .map_err(serde::de::Error::custom)?
+                .project(),
+            v => {
+                return Err(serde::de::Error::custom(&format!(
+                    "Unknown backup version {v}"
+                )))
+            }
+        })
     }
 }
 impl Serialize for OsBackup {
@@ -40,11 +46,9 @@ impl Serialize for OsBackup {
         S: serde::Serializer,
     {
         OsBackupSerDe {
-            version: 1,
-            rest: patch_db::value::to_value(
-                &OsBackupV1::unproject(self).map_err(serde::ser::Error::custom)?,
-            )
-            .map_err(serde::ser::Error::custom)?,
+            version: 2,
+            rest: patch_db::value::to_value(&OsBackupV2::unproject(self))
+                .map_err(serde::ser::Error::custom)?,
         }
         .serialize(serializer)
     }
@@ -62,10 +66,10 @@ struct OsBackupSerDe {
 #[derive(Deserialize)]
 #[serde(rename = "kebab-case")]
 struct OsBackupV0 {
-    // tor_key: Base32<[u8; 64]>,
-    root_ca_key: String,  // PEM Encoded OpenSSL Key
-    root_ca_cert: String, // PEM Encoded OpenSSL X509 Certificate
-    ui: Value,            // JSON Value
+    tor_key: Base32<[u8; 64]>, // Base32 Encoded Ed25519 Expanded Secret Key
+    root_ca_key: Pem<PKey<Private>>, // PEM Encoded OpenSSL Key
+    root_ca_cert: Pem<X509>,   // PEM Encoded OpenSSL X509 Certificate
+    ui: Value,                 // JSON Value
 }
 impl OsBackupV0 {
     fn project(self) -> Result<OsBackup, Error> {
@@ -74,9 +78,13 @@ impl OsBackupV0 {
                 server_id: generate_id(),
                 hostname: generate_hostname(),
                 password: Default::default(),
-                key: Key::new(None),
-                root_ca_key: PKey::private_key_from_pem(self.root_ca_key.as_bytes())?,
-                root_ca_cert: X509::from_pem(self.root_ca_cert.as_bytes())?,
+                root_ca_key: self.root_ca_key.0,
+                root_ca_cert: self.root_ca_cert.0,
+                ssh_key: ssh_key::PrivateKey::random(
+                    &mut rand::thread_rng(),
+                    ssh_key::Algorithm::Ed25519,
+                )?,
+                tor_key: TorSecretKeyV3::from(self.tor_key.0),
             },
             ui: self.ui,
         })
@@ -87,36 +95,67 @@ impl OsBackupV0 {
 #[derive(Deserialize, Serialize)]
 #[serde(rename = "kebab-case")]
 struct OsBackupV1 {
-    server_id: String,         // uuidv4
-    hostname: String,          // embassy-<adjective>-<noun>
-    net_key: Base64<[u8; 32]>, // Ed25519 Secret Key
-    root_ca_key: String,       // PEM Encoded OpenSSL Key
-    root_ca_cert: String,      // PEM Encoded OpenSSL X509 Certificate
-    ui: Value,                 // JSON Value
-                               // TODO add more
+    server_id: String,               // uuidv4
+    hostname: String,                // embassy-<adjective>-<noun>
+    net_key: Base64<[u8; 32]>,       // Ed25519 Secret Key
+    root_ca_key: Pem<PKey<Private>>, // PEM Encoded OpenSSL Key
+    root_ca_cert: Pem<X509>,         // PEM Encoded OpenSSL X509 Certificate
+    ui: Value,                       // JSON Value
 }
 impl OsBackupV1 {
-    fn project(self) -> Result<OsBackup, Error> {
-        Ok(OsBackup {
+    fn project(self) -> OsBackup {
+        OsBackup {
             account: AccountInfo {
                 server_id: self.server_id,
                 hostname: Hostname(self.hostname),
                 password: Default::default(),
-                key: Key::from_bytes(None, self.net_key.0),
-                root_ca_key: PKey::private_key_from_pem(self.root_ca_key.as_bytes())?,
-                root_ca_cert: X509::from_pem(self.root_ca_cert.as_bytes())?,
+                root_ca_key: self.root_ca_key.0,
+                root_ca_cert: self.root_ca_cert.0,
+                ssh_key: ssh_key::PrivateKey::from(Ed25519Keypair::from_seed(&self.net_key.0)),
+                tor_key: TorSecretKeyV3::from(ed25519_expand_key(&self.net_key.0)),
             },
             ui: self.ui,
-        })
+        }
+    }
+}
+
+/// V2
+#[derive(Deserialize, Serialize)]
+#[serde(rename = "kebab-case")]
+
+struct OsBackupV2 {
+    server_id: String,                 // uuidv4
+    hostname: String,                  // <adjective>-<noun>
+    root_ca_key: Pem<PKey<Private>>,   // PEM Encoded OpenSSL Key
+    root_ca_cert: Pem<X509>,           // PEM Encoded OpenSSL X509 Certificate
+    ssh_key: Pem<ssh_key::PrivateKey>, // PEM Encoded OpenSSH Key
+    tor_key: TorSecretKeyV3,           // Base64 Encoded Ed25519 Expanded Secret Key
+    ui: Value,                         // JSON Value
+}
+impl OsBackupV2 {
+    fn project(self) -> OsBackup {
+        OsBackup {
+            account: AccountInfo {
+                server_id: self.server_id,
+                hostname: Hostname(self.hostname),
+                password: Default::default(),
+                root_ca_key: self.root_ca_key.0,
+                root_ca_cert: self.root_ca_cert.0,
+                ssh_key: self.ssh_key.0,
+                tor_key: self.tor_key,
+            },
+            ui: self.ui,
+        }
     }
-    fn unproject(backup: &OsBackup) -> Result<Self, Error> {
-        Ok(Self {
+    fn unproject(backup: &OsBackup) -> Self {
+        Self {
             server_id: backup.account.server_id.clone(),
             hostname: backup.account.hostname.0.clone(),
-            net_key: Base64(backup.account.key.as_bytes()),
-            root_ca_key: String::from_utf8(backup.account.root_ca_key.private_key_to_pem_pkcs8()?)?,
-            root_ca_cert: String::from_utf8(backup.account.root_ca_cert.to_pem()?)?,
+            root_ca_key: Pem(backup.account.root_ca_key.clone()),
+            root_ca_cert: Pem(backup.account.root_ca_cert.clone()),
+            ssh_key: Pem(backup.account.ssh_key.clone()),
+            tor_key: backup.account.tor_key.clone(),
             ui: backup.ui.clone(),
-        })
+        }
     }
 }
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 404c12c6b..bae7eb58a 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -5,6 +5,7 @@ use clap::Parser;
 use futures::{stream, StreamExt};
 use models::PackageId;
 use openssl::x509::X509;
+use patch_db::json_ptr::ROOT;
 use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
 use tracing::instrument;
@@ -12,6 +13,7 @@ use tracing::instrument;
 use super::target::BackupTargetId;
 use crate::backup::os::OsBackup;
 use crate::context::{RpcContext, SetupContext};
+use crate::db::model::Database;
 use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
@@ -42,9 +44,7 @@ pub async fn restore_packages_rpc(
         password,
     }: RestorePackageParams,
 ) -> Result<(), Error> {
-    let fs = target_id
-        .load(ctx.secret_store.acquire().await?.as_mut())
-        .await?;
+    let fs = target_id.load(&ctx.db.peek().await)?;
     let backup_guard =
         BackupMountGuard::mount(TmpMountGuard::mount(&fs, ReadWrite).await?, &password).await?;
 
@@ -95,11 +95,8 @@ pub async fn recover_full_embassy(
     )
     .with_kind(ErrorKind::PasswordHashGeneration)?;
 
-    let secret_store = ctx.secret_store().await?;
-
-    os_backup.account.save(&secret_store).await?;
-
-    secret_store.close().await;
+    let db = ctx.db().await?;
+    db.put(&ROOT, &Database::init(&os_backup.account)?).await?;
 
     init(&ctx.config).await?;
 
@@ -129,7 +126,7 @@ pub async fn recover_full_embassy(
     Ok((
         disk_guid,
         os_backup.account.hostname,
-        os_backup.account.key.tor_address(),
+        os_backup.account.tor_key.public().get_onion_address(),
         os_backup.account.root_ca_cert,
     ))
 }
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index 4f3ee4827..db332e28f 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -1,14 +1,15 @@
+use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
 use clap::Parser;
 use color_eyre::eyre::eyre;
-use futures::TryStreamExt;
+use imbl_value::InternedString;
 use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use sqlx::{Executor, Postgres};
 
 use super::{BackupTarget, BackupTargetId};
 use crate::context::{CliContext, RpcContext};
+use crate::db::model::DatabaseModel;
 use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::filesystem::ReadOnly;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
@@ -16,6 +17,24 @@ use crate::disk::util::{recovery_info, EmbassyOsRecoveryInfo};
 use crate::prelude::*;
 use crate::util::serde::KeyVal;
 
+#[derive(Debug, Default, Deserialize, Serialize)]
+pub struct CifsTargets(pub BTreeMap<u32, Cifs>);
+impl CifsTargets {
+    pub fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+}
+impl Map for CifsTargets {
+    type Key = u32;
+    type Value = Cifs;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Self::key_string(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(InternedString::from_display(key))
+    }
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct CifsBackupTarget {
@@ -69,23 +88,27 @@ pub async fn add(
 ) -> Result<KeyVal<BackupTargetId, BackupTarget>, Error> {
     let cifs = Cifs {
         hostname,
-        path,
+        path: Path::new("/").join(path),
         username,
         password,
     };
     let guard = TmpMountGuard::mount(&cifs, ReadOnly).await?;
     let embassy_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
-    let path_string = Path::new("/").join(&cifs.path).display().to_string();
-    let id: i32 = sqlx::query!(
-        "INSERT INTO cifs_shares (hostname, path, username, password) VALUES ($1, $2, $3, $4) RETURNING id",
-        cifs.hostname,
-        path_string,
-        cifs.username,
-        cifs.password,
-    )
-    .fetch_one(&ctx.secret_store)
-    .await?.id;
+    let id = ctx
+        .db
+        .mutate(|db| {
+            let id = db
+                .as_private()
+                .as_cifs()
+                .keys()?
+                .into_iter()
+                .max()
+                .map_or(0, |a| a + 1);
+            db.as_private_mut().as_cifs_mut().insert(&id, &cifs)?;
+            Ok(id)
+        })
+        .await?;
     Ok(KeyVal {
         key: BackupTargetId::Cifs { id },
         value: BackupTarget::Cifs(CifsBackupTarget {
@@ -129,32 +152,27 @@ pub async fn update(
     };
     let cifs = Cifs {
         hostname,
-        path,
+        path: Path::new("/").join(path),
         username,
         password,
     };
     let guard = TmpMountGuard::mount(&cifs, ReadOnly).await?;
     let embassy_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
-    let path_string = Path::new("/").join(&cifs.path).display().to_string();
-    if sqlx::query!(
-        "UPDATE cifs_shares SET hostname = $1, path = $2, username = $3, password = $4 WHERE id = $5",
-        cifs.hostname,
-        path_string,
-        cifs.username,
-        cifs.password,
-        id,
-    )
-    .execute(&ctx.secret_store)
-    .await?
-    .rows_affected()
-        == 0
-    {
-        return Err(Error::new(
-            eyre!("Backup Target ID {} Not Found", BackupTargetId::Cifs { id }),
-            ErrorKind::NotFound,
-        ));
-    };
+    ctx.db
+        .mutate(|db| {
+            db.as_private_mut()
+                .as_cifs_mut()
+                .as_idx_mut(&id)
+                .ok_or_else(|| {
+                    Error::new(
+                        eyre!("Backup Target ID {} Not Found", BackupTargetId::Cifs { id }),
+                        ErrorKind::NotFound,
+                    )
+                })?
+                .ser(&cifs)
+        })
+        .await?;
     Ok(KeyVal {
         key: BackupTargetId::Cifs { id },
         value: BackupTarget::Cifs(CifsBackupTarget {
@@ -183,74 +201,46 @@ pub async fn remove(ctx: RpcContext, RemoveParams { id }: RemoveParams) -> Resul
             ErrorKind::NotFound,
         ));
     };
-    if sqlx::query!("DELETE FROM cifs_shares WHERE id = $1", id)
-        .execute(&ctx.secret_store)
-        .await?
-        .rows_affected()
-        == 0
-    {
-        return Err(Error::new(
-            eyre!("Backup Target ID {} Not Found", BackupTargetId::Cifs { id }),
-            ErrorKind::NotFound,
-        ));
-    };
+    ctx.db
+        .mutate(|db| db.as_private_mut().as_cifs_mut().remove(&id))
+        .await?;
     Ok(())
 }
 
-pub async fn load<Ex>(secrets: &mut Ex, id: i32) -> Result<Cifs, Error>
-where
-    for<'a> &'a mut Ex: Executor<'a, Database = Postgres>,
-{
-    let record = sqlx::query!(
-        "SELECT hostname, path, username, password FROM cifs_shares WHERE id = $1",
-        id
-    )
-    .fetch_one(secrets)
-    .await?;
-
-    Ok(Cifs {
-        hostname: record.hostname,
-        path: PathBuf::from(record.path),
-        username: record.username,
-        password: record.password,
-    })
+pub fn load(db: &DatabaseModel, id: u32) -> Result<Cifs, Error> {
+    db.as_private()
+        .as_cifs()
+        .as_idx(&id)
+        .ok_or_else(|| {
+            Error::new(
+                eyre!("Backup Target ID {} Not Found", id),
+                ErrorKind::NotFound,
+            )
+        })?
+        .de()
 }
 
-pub async fn list<Ex>(secrets: &mut Ex) -> Result<Vec<(i32, CifsBackupTarget)>, Error>
-where
-    for<'a> &'a mut Ex: Executor<'a, Database = Postgres>,
-{
-    let mut records =
-        sqlx::query!("SELECT id, hostname, path, username, password FROM cifs_shares")
-            .fetch_many(secrets);
-
+pub async fn list(db: &DatabaseModel) -> Result<Vec<(u32, CifsBackupTarget)>, Error> {
     let mut cifs = Vec::new();
-    while let Some(query_result) = records.try_next().await? {
-        if let Some(record) = query_result.right() {
-            let mount_info = Cifs {
-                hostname: record.hostname,
-                path: PathBuf::from(record.path),
-                username: record.username,
-                password: record.password,
-            };
-            let embassy_os = async {
-                let guard = TmpMountGuard::mount(&mount_info, ReadOnly).await?;
-                let embassy_os = recovery_info(guard.path()).await?;
-                guard.unmount().await?;
-                Ok::<_, Error>(embassy_os)
-            }
-            .await;
-            cifs.push((
-                record.id,
-                CifsBackupTarget {
-                    hostname: mount_info.hostname,
-                    path: mount_info.path,
-                    username: mount_info.username,
-                    mountable: embassy_os.is_ok(),
-                    embassy_os: embassy_os.ok().and_then(|a| a),
-                },
-            ));
+    for (id, model) in db.as_private().as_cifs().as_entries()? {
+        let mount_info = model.de()?;
+        let embassy_os = async {
+            let guard = TmpMountGuard::mount(&mount_info, ReadOnly).await?;
+            let embassy_os = recovery_info(guard.path()).await?;
+            guard.unmount().await?;
+            Ok::<_, Error>(embassy_os)
         }
+        .await;
+        cifs.push((
+            id,
+            CifsBackupTarget {
+                hostname: mount_info.hostname,
+                path: mount_info.path,
+                username: mount_info.username,
+                mountable: embassy_os.is_ok(),
+                embassy_os: embassy_os.ok().and_then(|a| a),
+            },
+        ));
     }
 
     Ok(cifs)
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index 473b2865d..72dd45832 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -11,12 +11,12 @@ use models::PackageId;
 use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
-use sqlx::{Executor, Postgres};
 use tokio::sync::Mutex;
 use tracing::instrument;
 
 use self::cifs::CifsBackupTarget;
 use crate::context::{CliContext, RpcContext};
+use crate::db::model::DatabaseModel;
 use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
 use crate::disk::mount::filesystem::cifs::Cifs;
@@ -49,18 +49,15 @@ pub enum BackupTarget {
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
 pub enum BackupTargetId {
     Disk { logicalname: PathBuf },
-    Cifs { id: i32 },
+    Cifs { id: u32 },
 }
 impl BackupTargetId {
-    pub async fn load<Ex>(self, secrets: &mut Ex) -> Result<BackupTargetFS, Error>
-    where
-        for<'a> &'a mut Ex: Executor<'a, Database = Postgres>,
-    {
+    pub fn load(self, db: &DatabaseModel) -> Result<BackupTargetFS, Error> {
         Ok(match self {
             BackupTargetId::Disk { logicalname } => {
                 BackupTargetFS::Disk(BlockDev::new(logicalname))
             }
-            BackupTargetId::Cifs { id } => BackupTargetFS::Cifs(cifs::load(secrets, id).await?),
+            BackupTargetId::Cifs { id } => BackupTargetFS::Cifs(cifs::load(db, id)?),
         })
     }
 }
@@ -161,10 +158,10 @@ pub fn target() -> ParentHandler {
 
 // #[command(display(display_serializable))]
 pub async fn list(ctx: RpcContext) -> Result<BTreeMap<BackupTargetId, BackupTarget>, Error> {
-    let mut sql_handle = ctx.secret_store.acquire().await?;
+    let peek = ctx.db.peek().await;
     let (disks_res, cifs) = tokio::try_join!(
         crate::disk::util::list(&ctx.os_partitions),
-        cifs::list(sql_handle.as_mut()),
+        cifs::list(&peek),
     )?;
     Ok(disks_res
         .into_iter()
@@ -262,13 +259,7 @@ pub async fn info(
     }: InfoParams,
 ) -> Result<BackupInfo, Error> {
     let guard = BackupMountGuard::mount(
-        TmpMountGuard::mount(
-            &target_id
-                .load(ctx.secret_store.acquire().await?.as_mut())
-                .await?,
-            ReadWrite,
-        )
-        .await?,
+        TmpMountGuard::mount(&target_id.load(&ctx.db.peek().await)?, ReadWrite).await?,
         &password,
     )
     .await?;
@@ -308,14 +299,7 @@ pub async fn mount(
     }
 
     let guard = BackupMountGuard::mount(
-        TmpMountGuard::mount(
-            &target_id
-                .clone()
-                .load(ctx.secret_store.acquire().await?.as_mut())
-                .await?,
-            ReadWrite,
-        )
-        .await?,
+        TmpMountGuard::mount(&target_id.clone().load(&ctx.db.peek().await)?, ReadWrite).await?,
         &password,
     )
     .await?;
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
index fc9cfb790..55065e816 100644
--- a/core/startos/src/context/config.rs
+++ b/core/startos/src/context/config.rs
@@ -3,15 +3,12 @@ use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
 
 use clap::Parser;
-use patch_db::json_ptr::JsonPointer;
 use reqwest::Url;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use sqlx::postgres::PgConnectOptions;
 use sqlx::PgPool;
 
-use crate::account::AccountInfo;
-use crate::db::model::Database;
 use crate::disk::OsPartitionInfo;
 use crate::init::init_postgres;
 use crate::prelude::*;
@@ -149,15 +146,12 @@ impl ServerConfig {
             .as_deref()
             .unwrap_or_else(|| Path::new("/embassy-data"))
     }
-    pub async fn db(&self, account: &AccountInfo) -> Result<PatchDb, Error> {
+    pub async fn db(&self) -> Result<PatchDb, Error> {
         let db_path = self.datadir().join("main").join("embassy.db");
         let db = PatchDb::open(&db_path)
             .await
             .with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?;
-        if !db.exists(&<JsonPointer>::default()).await {
-            db.put(&<JsonPointer>::default(), &Database::init(account))
-                .await?;
-        }
+
         Ok(db)
     }
     #[instrument(skip_all)]
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 905132071..0f11bf63f 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -11,7 +11,6 @@ use josekit::jwk::Jwk;
 use patch_db::PatchDb;
 use reqwest::{Client, Proxy};
 use rpc_toolkit::Context;
-use sqlx::PgPool;
 use tokio::sync::{broadcast, oneshot, Mutex, RwLock};
 use tokio::time::Instant;
 use tracing::instrument;
@@ -28,14 +27,11 @@ use crate::init::check_time_is_synchronized;
 use crate::lxc::{LxcContainer, LxcManager};
 use crate::middleware::auth::HashSessionToken;
 use crate::net::net_controller::NetController;
-use crate::net::ssl::{root_ca_start_time, SslManager};
 use crate::net::utils::find_eth_iface;
 use crate::net::wifi::WpaCli;
-use crate::notifications::NotificationManager;
 use crate::prelude::*;
 use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
-use crate::status::MainStatus;
 use crate::system::get_mem_info;
 use crate::util::lshw::{lshw, LshwDevice};
 
@@ -47,14 +43,12 @@ pub struct RpcContextSeed {
     pub datadir: PathBuf,
     pub disk_guid: Arc<String>,
     pub db: PatchDb,
-    pub secret_store: PgPool,
     pub account: RwLock<AccountInfo>,
     pub net_controller: Arc<NetController>,
     pub services: ServiceMap,
     pub metrics_cache: RwLock<Option<crate::system::Metrics>>,
     pub shutdown: broadcast::Sender<Option<Shutdown>>,
     pub tor_socks: SocketAddr,
-    pub notification_manager: NotificationManager,
     pub lxc_manager: Arc<LxcManager>,
     pub open_authed_websockets: Mutex<BTreeMap<HashSessionToken, Vec<oneshot::Sender<()>>>>,
     pub rpc_stream_continuations: Mutex<BTreeMap<RequestGuid, RpcContinuation>>,
@@ -86,13 +80,14 @@ impl RpcContext {
             9050,
         )));
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
-        let secret_store = config.secret_store().await?;
-        tracing::info!("Opened Pg DB");
-        let account = AccountInfo::load(&secret_store).await?;
-        let db = config.db(&account).await?;
+
+        let db = config.db().await?;
+        let peek = db.peek().await;
+        let account = AccountInfo::load(&peek)?;
         tracing::info!("Opened PatchDB");
         let net_controller = Arc::new(
             NetController::init(
+                db.clone(),
                 config
                     .tor_control
                     .unwrap_or(SocketAddr::from(([127, 0, 0, 1], 9051))),
@@ -101,16 +96,14 @@ impl RpcContext {
                     .dns_bind
                     .as_deref()
                     .unwrap_or(&[SocketAddr::from(([127, 0, 0, 1], 53))]),
-                SslManager::new(&account, root_ca_start_time().await?)?,
                 &account.hostname,
-                &account.key,
+                account.tor_key.clone(),
             )
             .await?,
         );
         tracing::info!("Initialized Net Controller");
         let services = ServiceMap::default();
         let metrics_cache = RwLock::<Option<crate::system::Metrics>>::new(None);
-        let notification_manager = NotificationManager::new(secret_store.clone());
         tracing::info!("Initialized Notification Manager");
         let tor_proxy_url = format!("socks5h://{tor_proxy}");
         let devices = lshw().await?;
@@ -157,14 +150,12 @@ impl RpcContext {
             },
             disk_guid,
             db,
-            secret_store,
             account: RwLock::new(account),
             net_controller,
             services,
             metrics_cache,
             shutdown,
             tor_socks: tor_proxy,
-            notification_manager,
             lxc_manager: Arc::new(LxcManager::new()),
             open_authed_websockets: Mutex::new(BTreeMap::new()),
             rpc_stream_continuations: Mutex::new(BTreeMap::new()),
@@ -208,7 +199,6 @@ impl RpcContext {
     #[instrument(skip_all)]
     pub async fn shutdown(self) -> Result<(), Error> {
         self.services.shutdown_all().await?;
-        self.secret_store.close().await;
         self.is_closed.store(true, Ordering::SeqCst);
         tracing::info!("RPC Context is shutdown");
         // TODO: shutdown http servers
diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index aeeca2920..933aa155c 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -3,7 +3,6 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use josekit::jwk::Jwk;
-use patch_db::json_ptr::JsonPointer;
 use patch_db::PatchDb;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::Context;
@@ -14,9 +13,7 @@ use tokio::sync::broadcast::Sender;
 use tokio::sync::RwLock;
 use tracing::instrument;
 
-use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
-use crate::db::model::Database;
 use crate::disk::OsPartitionInfo;
 use crate::init::init_postgres;
 use crate::prelude::*;
@@ -81,15 +78,11 @@ impl SetupContext {
         })))
     }
     #[instrument(skip_all)]
-    pub async fn db(&self, account: &AccountInfo) -> Result<PatchDb, Error> {
+    pub async fn db(&self) -> Result<PatchDb, Error> {
         let db_path = self.datadir.join("main").join("embassy.db");
         let db = PatchDb::open(&db_path)
             .await
             .with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?;
-        if !db.exists(&<JsonPointer>::default()).await {
-            db.put(&<JsonPointer>::default(), &Database::init(account))
-                .await?;
-        }
         Ok(db)
     }
     #[instrument(skip_all)]
diff --git a/core/startos/src/control.rs b/core/startos/src/control.rs
index 893aeee2b..26b227cd2 100644
--- a/core/startos/src/control.rs
+++ b/core/startos/src/control.rs
@@ -24,7 +24,7 @@ pub async fn start(ctx: RpcContext, ControlParams { id }: ControlParams) -> Resu
         .as_ref()
         .or_not_found(lazy_format!("Manager for {id}"))?
         .start()
-        .await;
+        .await?;
 
     Ok(())
 }
@@ -37,7 +37,7 @@ pub async fn stop(ctx: RpcContext, ControlParams { id }: ControlParams) -> Resul
         .as_ref()
         .ok_or_else(|| Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest))?
         .stop()
-        .await;
+        .await?;
 
     Ok(())
 }
@@ -49,7 +49,7 @@ pub async fn restart(ctx: RpcContext, ControlParams { id }: ControlParams) -> Re
         .as_ref()
         .ok_or_else(|| Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest))?
         .restart()
-        .await;
+        .await?;
 
     Ok(())
 }
diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs
index 571573a54..19cfa37a1 100644
--- a/core/startos/src/db/model.rs
+++ b/core/startos/src/db/model.rs
@@ -13,30 +13,46 @@ use patch_db::json_ptr::JsonPointer;
 use patch_db::{HasModel, Value};
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
-use ssh_key::public::Ed25519PublicKey;
+use torut::onion::OnionAddressV3;
 
 use crate::account::AccountInfo;
+use crate::auth::Sessions;
+use crate::backup::target::cifs::CifsTargets;
+use crate::net::forward::AvailablePorts;
+use crate::net::host::HostInfo;
+use crate::net::keys::KeyStore;
 use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
+use crate::notifications::Notifications;
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::s9pk::manifest::Manifest;
+use crate::ssh::SshKeys;
 use crate::status::Status;
 use crate::util::cpupower::Governor;
+use crate::util::serde::Pem;
 use crate::util::Version;
 use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
 
+fn get_arch() -> InternedString {
+    (*ARCH).into()
+}
+
+fn get_platform() -> InternedString {
+    (&*PLATFORM).into()
+}
+
 #[derive(Debug, Deserialize, Serialize, HasModel)]
 #[serde(rename_all = "kebab-case")]
 #[model = "Model<Self>"]
 pub struct Database {
     pub public: Public,
-    pub private: (), // TODO
+    pub private: Private,
 }
 impl Database {
-    pub fn init(account: &AccountInfo) -> Self {
+    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
         let lan_address = account.hostname.lan_address().parse().unwrap();
-        Database {
+        Ok(Database {
             public: Public {
                 server_info: ServerInfo {
                     arch: get_arch(),
@@ -48,9 +64,13 @@ impl Database {
                     last_wifi_region: None,
                     eos_version_compat: Current::new().compat().clone(),
                     lan_address,
-                    tor_address: format!("https://{}", account.key.tor_address())
-                        .parse()
-                        .unwrap(),
+                    onion_address: account.tor_key.public().get_onion_address(),
+                    tor_address: format!(
+                        "https://{}",
+                        account.tor_key.public().get_onion_address()
+                    )
+                    .parse()
+                    .unwrap(),
                     ip_info: BTreeMap::new(),
                     status_info: ServerStatus {
                         backup_progress: None,
@@ -70,11 +90,9 @@ impl Database {
                         clearnet: Vec::new(),
                     },
                     password_hash: account.password.clone(),
-                    pubkey: ssh_key::PublicKey::from(Ed25519PublicKey::from(
-                        &account.key.ssh_key(),
-                    ))
-                    .to_openssh()
-                    .unwrap(),
+                    pubkey: ssh_key::PublicKey::from(&account.ssh_key)
+                        .to_openssh()
+                        .unwrap(),
                     ca_fingerprint: account
                         .root_ca_cert
                         .digest(MessageDigest::sha256())
@@ -93,11 +111,22 @@ impl Database {
                 )))
                 .unwrap(),
             },
-            private: (), // TODO
-        }
+            private: Private {
+                key_store: KeyStore::new(account)?,
+                password: account.password.clone(),
+                ssh_privkey: Pem(account.ssh_key.clone()),
+                ssh_pubkeys: SshKeys::new(),
+                available_ports: AvailablePorts::new(),
+                sessions: Sessions::new(),
+                notifications: Notifications::new(),
+                cifs: CifsTargets::new(),
+            }, // TODO
+        })
     }
 }
 
+pub type DatabaseModel = Model<Database>;
+
 #[derive(Debug, Deserialize, Serialize, HasModel)]
 #[serde(rename_all = "kebab-case")]
 #[model = "Model<Self>"]
@@ -108,14 +137,18 @@ pub struct Public {
     pub ui: Value,
 }
 
-pub type DatabaseModel = Model<Database>;
-
-fn get_arch() -> InternedString {
-    (*ARCH).into()
-}
-
-fn get_platform() -> InternedString {
-    (&*PLATFORM).into()
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct Private {
+    pub key_store: KeyStore,
+    pub password: String, // argon2 hash
+    pub ssh_privkey: Pem<ssh_key::PrivateKey>,
+    pub ssh_pubkeys: SshKeys,
+    pub available_ports: AvailablePorts,
+    pub sessions: Sessions,
+    pub notifications: Notifications,
+    pub cifs: CifsTargets,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
@@ -134,6 +167,8 @@ pub struct ServerInfo {
     pub last_wifi_region: Option<CountryCode>,
     pub eos_version_compat: VersionRange,
     pub lan_address: Url,
+    pub onion_address: OnionAddressV3,
+    /// for backwards compatibility
     pub tor_address: Url,
     pub ip_info: BTreeMap<String, IpInfo>,
     #[serde(default)]
@@ -229,6 +264,12 @@ pub struct AllPackageData(pub BTreeMap<PackageId, PackageDataEntry>);
 impl Map for AllPackageData {
     type Key = PackageId;
     type Value = PackageDataEntry;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
@@ -471,6 +512,7 @@ pub struct InstalledPackageInfo {
     pub current_dependents: CurrentDependents,
     pub current_dependencies: CurrentDependencies,
     pub interface_addresses: InterfaceAddressMap,
+    pub hosts: HostInfo,
     pub store: Value,
     pub store_exposed_ui: Vec<ExposedUI>,
     pub store_exposed_dependents: Vec<JsonPointer>,
@@ -512,6 +554,12 @@ impl CurrentDependents {
 impl Map for CurrentDependents {
     type Key = PackageId;
     type Value = CurrentDependencyInfo;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
 }
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 pub struct CurrentDependencies(pub BTreeMap<PackageId, CurrentDependencyInfo>);
@@ -529,6 +577,12 @@ impl CurrentDependencies {
 impl Map for CurrentDependencies {
     type Key = PackageId;
     type Value = CurrentDependencyInfo;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
@@ -552,6 +606,12 @@ pub struct InterfaceAddressMap(pub BTreeMap<HostId, InterfaceAddresses>);
 impl Map for InterfaceAddressMap {
     type Key = HostId;
     type Value = InterfaceAddresses;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
diff --git a/core/startos/src/db/prelude.rs b/core/startos/src/db/prelude.rs
index 14f5e21eb..911b2d389 100644
--- a/core/startos/src/db/prelude.rs
+++ b/core/startos/src/db/prelude.rs
@@ -1,13 +1,15 @@
 use std::collections::BTreeMap;
 use std::marker::PhantomData;
 use std::panic::UnwindSafe;
+use std::str::FromStr;
 
+use chrono::{DateTime, Utc};
 pub use imbl_value::Value;
 use patch_db::json_ptr::ROOT;
 use patch_db::value::InternedString;
 pub use patch_db::{HasModel, PatchDb};
 use serde::de::DeserializeOwned;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 use crate::db::model::DatabaseModel;
 use crate::prelude::*;
@@ -92,12 +94,37 @@ impl<T: Serialize> Model<T> {
     }
 }
 
+impl<T> Serialize for Model<T> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.value.serialize(serializer)
+    }
+}
+
+impl<'de, T: Serialize + Deserialize<'de>> Deserialize<'de> for Model<T> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        use serde::de::Error;
+        Self::new(&T::deserialize(deserializer)?).map_err(D::Error::custom)
+    }
+}
+
 impl<T: Serialize + DeserializeOwned> Model<T> {
     pub fn replace(&mut self, value: &T) -> Result<T, Error> {
         let orig = self.de()?;
         self.ser(value)?;
         Ok(orig)
     }
+    pub fn mutate<U>(&mut self, f: impl FnOnce(&mut T) -> Result<U, Error>) -> Result<U, Error> {
+        let mut orig = self.de()?;
+        let res = f(&mut orig)?;
+        self.ser(&orig)?;
+        Ok(res)
+    }
 }
 impl<T> Clone for Model<T> {
     fn clone(&self) -> Self {
@@ -181,20 +208,38 @@ impl<T> Model<Option<T>> {
 pub trait Map: DeserializeOwned + Serialize {
     type Key;
     type Value;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error>;
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(InternedString::intern(Self::key_str(key)?.as_ref()))
+    }
 }
 
 impl<A, B> Map for BTreeMap<A, B>
+where
+    A: serde::Serialize + serde::de::DeserializeOwned + Ord + AsRef<str>,
+    B: serde::Serialize + serde::de::DeserializeOwned,
+{
+    type Key = A;
+    type Value = B;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key.as_ref())
+    }
+}
+
+impl<A, B> Map for BTreeMap<JsonKey<A>, B>
 where
     A: serde::Serialize + serde::de::DeserializeOwned + Ord,
     B: serde::Serialize + serde::de::DeserializeOwned,
 {
     type Key = A;
     type Value = B;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        serde_json::to_string(key).with_kind(ErrorKind::Serialization)
+    }
 }
 
 impl<T: Map> Model<T>
 where
-    T::Key: AsRef<str>,
     T::Value: Serialize,
 {
     pub fn insert(&mut self, key: &T::Key, value: &T::Value) -> Result<(), Error> {
@@ -202,7 +247,7 @@ where
         let v = patch_db::value::to_value(value)?;
         match &mut self.value {
             Value::Object(o) => {
-                o.insert(InternedString::intern(key.as_ref()), v);
+                o.insert(T::key_string(key)?, v);
                 Ok(())
             }
             v => Err(patch_db::value::Error {
@@ -212,13 +257,40 @@ where
             .into()),
         }
     }
+    pub fn upsert<F, D>(&mut self, key: &T::Key, value: F) -> Result<&mut Model<T::Value>, Error>
+    where
+        F: FnOnce() -> D,
+        D: AsRef<T::Value>,
+    {
+        use serde::ser::Error;
+        match &mut self.value {
+            Value::Object(o) => {
+                use patch_db::ModelExt;
+                let s = T::key_str(key)?;
+                let exists = o.contains_key(s.as_ref());
+                let res = self.transmute_mut(|v| {
+                    use patch_db::value::index::Index;
+                    s.as_ref().index_or_insert(v)
+                });
+                if !exists {
+                    res.ser(value().as_ref())?;
+                }
+                Ok(res)
+            }
+            v => Err(patch_db::value::Error {
+                source: patch_db::value::ErrorSource::custom(format!("expected object found {v}")),
+                kind: patch_db::value::ErrorKind::Serialization,
+            }
+            .into()),
+        }
+    }
     pub fn insert_model(&mut self, key: &T::Key, value: Model<T::Value>) -> Result<(), Error> {
         use patch_db::ModelExt;
         use serde::ser::Error;
         let v = value.into_value();
         match &mut self.value {
             Value::Object(o) => {
-                o.insert(InternedString::intern(key.as_ref()), v);
+                o.insert(T::key_string(key)?, v);
                 Ok(())
             }
             v => Err(patch_db::value::Error {
@@ -232,25 +304,16 @@ where
 
 impl<T: Map> Model<T>
 where
-    T::Key: DeserializeOwned + Ord + Clone,
+    T::Key: FromStr + Ord + Clone,
+    Error: From<<T::Key as FromStr>::Err>,
 {
     pub fn keys(&self) -> Result<Vec<T::Key>, Error> {
         use serde::de::Error;
-        use serde::Deserialize;
         match &self.value {
             Value::Object(o) => o
                 .keys()
                 .cloned()
-                .map(|k| {
-                    T::Key::deserialize(patch_db::value::de::InternedStringDeserializer::from(k))
-                        .map_err(|e| {
-                            patch_db::value::Error {
-                                kind: patch_db::value::ErrorKind::Deserialization,
-                                source: e,
-                            }
-                            .into()
-                        })
-                })
+                .map(|k| Ok(T::Key::from_str(&*k)?))
                 .collect(),
             v => Err(patch_db::value::Error {
                 source: patch_db::value::ErrorSource::custom(format!("expected object found {v}")),
@@ -263,19 +326,10 @@ where
     pub fn into_entries(self) -> Result<Vec<(T::Key, Model<T::Value>)>, Error> {
         use patch_db::ModelExt;
         use serde::de::Error;
-        use serde::Deserialize;
         match self.value {
             Value::Object(o) => o
                 .into_iter()
-                .map(|(k, v)| {
-                    Ok((
-                        T::Key::deserialize(patch_db::value::de::InternedStringDeserializer::from(
-                            k,
-                        ))
-                        .with_kind(ErrorKind::Deserialization)?,
-                        Model::from_value(v),
-                    ))
-                })
+                .map(|(k, v)| Ok((T::Key::from_str(&*k)?, Model::from_value(v))))
                 .collect(),
             v => Err(patch_db::value::Error {
                 source: patch_db::value::ErrorSource::custom(format!("expected object found {v}")),
@@ -287,19 +341,10 @@ where
     pub fn as_entries(&self) -> Result<Vec<(T::Key, &Model<T::Value>)>, Error> {
         use patch_db::ModelExt;
         use serde::de::Error;
-        use serde::Deserialize;
         match &self.value {
             Value::Object(o) => o
                 .iter()
-                .map(|(k, v)| {
-                    Ok((
-                        T::Key::deserialize(patch_db::value::de::InternedStringDeserializer::from(
-                            k.clone(),
-                        ))
-                        .with_kind(ErrorKind::Deserialization)?,
-                        Model::value_as(v),
-                    ))
-                })
+                .map(|(k, v)| Ok((T::Key::from_str(&**k)?, Model::value_as(v))))
                 .collect(),
             v => Err(patch_db::value::Error {
                 source: patch_db::value::ErrorSource::custom(format!("expected object found {v}")),
@@ -311,19 +356,10 @@ where
     pub fn as_entries_mut(&mut self) -> Result<Vec<(T::Key, &mut Model<T::Value>)>, Error> {
         use patch_db::ModelExt;
         use serde::de::Error;
-        use serde::Deserialize;
         match &mut self.value {
             Value::Object(o) => o
                 .iter_mut()
-                .map(|(k, v)| {
-                    Ok((
-                        T::Key::deserialize(patch_db::value::de::InternedStringDeserializer::from(
-                            k.clone(),
-                        ))
-                        .with_kind(ErrorKind::Deserialization)?,
-                        Model::value_as_mut(v),
-                    ))
-                })
+                .map(|(k, v)| Ok((T::Key::from_str(&**k)?, Model::value_as_mut(v))))
                 .collect(),
             v => Err(patch_db::value::Error {
                 source: patch_db::value::ErrorSource::custom(format!("expected object found {v}")),
@@ -333,36 +369,36 @@ where
         }
     }
 }
-impl<T: Map> Model<T>
-where
-    T::Key: AsRef<str>,
-{
+impl<T: Map> Model<T> {
     pub fn into_idx(self, key: &T::Key) -> Option<Model<T::Value>> {
         use patch_db::ModelExt;
+        let s = T::key_str(key).ok()?;
         match &self.value {
-            Value::Object(o) if o.contains_key(key.as_ref()) => Some(self.transmute(|v| {
+            Value::Object(o) if o.contains_key(s.as_ref()) => Some(self.transmute(|v| {
                 use patch_db::value::index::Index;
-                key.as_ref().index_into_owned(v).unwrap()
+                s.as_ref().index_into_owned(v).unwrap()
             })),
             _ => None,
         }
     }
     pub fn as_idx<'a>(&'a self, key: &T::Key) -> Option<&'a Model<T::Value>> {
         use patch_db::ModelExt;
+        let s = T::key_str(key).ok()?;
         match &self.value {
-            Value::Object(o) if o.contains_key(key.as_ref()) => Some(self.transmute_ref(|v| {
+            Value::Object(o) if o.contains_key(s.as_ref()) => Some(self.transmute_ref(|v| {
                 use patch_db::value::index::Index;
-                key.as_ref().index_into(v).unwrap()
+                s.as_ref().index_into(v).unwrap()
             })),
             _ => None,
         }
     }
     pub fn as_idx_mut<'a>(&'a mut self, key: &T::Key) -> Option<&'a mut Model<T::Value>> {
         use patch_db::ModelExt;
+        let s = T::key_str(key).ok()?;
         match &mut self.value {
-            Value::Object(o) if o.contains_key(key.as_ref()) => Some(self.transmute_mut(|v| {
+            Value::Object(o) if o.contains_key(s.as_ref()) => Some(self.transmute_mut(|v| {
                 use patch_db::value::index::Index;
-                key.as_ref().index_or_insert(v)
+                s.as_ref().index_or_insert(v)
             })),
             _ => None,
         }
@@ -371,7 +407,7 @@ where
         use serde::ser::Error;
         match &mut self.value {
             Value::Object(o) => {
-                let v = o.remove(key.as_ref());
+                let v = o.remove(T::key_str(key)?.as_ref());
                 Ok(v.map(patch_db::ModelExt::from_value))
             }
             v => Err(patch_db::value::Error {
@@ -382,3 +418,90 @@ where
         }
     }
 }
+
+#[repr(transparent)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct JsonKey<T>(pub T);
+impl<T> From<T> for JsonKey<T> {
+    fn from(value: T) -> Self {
+        Self::new(value)
+    }
+}
+impl<T> JsonKey<T> {
+    pub fn new(value: T) -> Self {
+        Self(value)
+    }
+    pub fn unwrap(self) -> T {
+        self.0
+    }
+    pub fn new_ref(value: &T) -> &Self {
+        unsafe { std::mem::transmute(value) }
+    }
+    pub fn new_mut(value: &mut T) -> &mut Self {
+        unsafe { std::mem::transmute(value) }
+    }
+}
+impl<T> std::ops::Deref for JsonKey<T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl<T> std::ops::DerefMut for JsonKey<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+impl<T: Serialize> Serialize for JsonKey<T> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::Error;
+        serde_json::to_string(&self.0)
+            .map_err(S::Error::custom)?
+            .serialize(serializer)
+    }
+}
+// { "foo": "bar" } -> "{ \"foo\": \"bar\" }"
+impl<'de, T: Serialize + DeserializeOwned> Deserialize<'de> for JsonKey<T> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        use serde::de::Error;
+        let string = String::deserialize(deserializer)?;
+        Ok(Self(
+            serde_json::from_str(&string).map_err(D::Error::custom)?,
+        ))
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct WithTimeData<T> {
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub value: T,
+}
+impl<T> WithTimeData<T> {
+    pub fn new(value: T) -> Self {
+        let now = Utc::now();
+        Self {
+            created_at: now,
+            updated_at: now,
+            value,
+        }
+    }
+}
+impl<T> std::ops::Deref for WithTimeData<T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        &self.value
+    }
+}
+impl<T> std::ops::DerefMut for WithTimeData<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.updated_at = Utc::now();
+        &mut self.value
+    }
+}
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 6ebe7afed..4e96a3db3 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -9,13 +9,11 @@ use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
 use crate::config::{Config, ConfigSpec, ConfigureContext};
-use crate::context::{CliContext, RpcContext};
+use crate::context::RpcContext;
 use crate::db::model::{CurrentDependencies, Database};
 use crate::prelude::*;
 use crate::s9pk::manifest::Manifest;
 use crate::status::DependencyConfigErrors;
-use crate::util::serde::HandlerExtSerde;
-use crate::util::Version;
 use crate::Error;
 
 pub fn dependency() -> ParentHandler {
@@ -28,6 +26,12 @@ pub struct Dependencies(pub BTreeMap<PackageId, DepInfo>);
 impl Map for Dependencies {
     type Key = PackageId;
     type Value = DepInfo;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<imbl_value::InternedString, Error> {
+        Ok(key.clone().into())
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
diff --git a/core/startos/src/firmware.rs b/core/startos/src/firmware.rs
index ed4a6577a..86f576cce 100644
--- a/core/startos/src/firmware.rs
+++ b/core/startos/src/firmware.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeSet;
 use std::path::Path;
 
 use async_compression::tokio::bufread::GzipDecoder;
-use clap::Parser;
 use serde::{Deserialize, Serialize};
 use tokio::fs::File;
 use tokio::io::BufReader;
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index fab80ab09..68a57fca9 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -6,7 +6,6 @@ use std::time::{Duration, SystemTime};
 use color_eyre::eyre::eyre;
 use models::ResultExt;
 use rand::random;
-use sqlx::{Pool, Postgres};
 use tokio::process::Command;
 use tracing::instrument;
 
@@ -179,7 +178,6 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
 }
 
 pub struct InitResult {
-    pub secret_store: Pool<Postgres>,
     pub db: patch_db::PatchDb,
 }
 
@@ -208,16 +206,19 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
             .await?;
     }
 
-    let secret_store = cfg.secret_store().await?;
-    tracing::info!("Opened Postgres");
+    let db = cfg.db().await?;
+    let peek = db.peek().await;
+    tracing::info!("Opened PatchDB");
 
-    crate::ssh::sync_keys_from_db(&secret_store, "/home/start9/.ssh/authorized_keys").await?;
+    crate::ssh::sync_keys(
+        &peek.as_private().as_ssh_pubkeys().de()?,
+        "/home/start9/.ssh/authorized_keys",
+    )
+    .await?;
     tracing::info!("Synced SSH Keys");
 
-    let account = AccountInfo::load(&secret_store).await?;
-    let db = cfg.db(&account).await?;
-    tracing::info!("Opened PatchDB");
-    let peek = db.peek().await;
+    let account = AccountInfo::load(&peek)?;
+
     let mut server_info = peek.as_public().as_server_info().de()?;
 
     // write to ca cert store
@@ -348,7 +349,7 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
     })
     .await?;
 
-    crate::version::init(&db, &secret_store).await?;
+    crate::version::init(&db).await?;
 
     db.mutate(|d| {
         let model = d.de()?;
@@ -366,5 +367,5 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
 
     tracing::info!("System initialized.");
 
-    Ok(InitResult { secret_store, db })
+    Ok(InitResult { db })
 }
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index ac00a750b..6ea4a7129 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -1,4 +1,3 @@
-use std::io::SeekFrom;
 use std::path::PathBuf;
 use std::time::Duration;
 
@@ -14,7 +13,6 @@ use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::CallRemote;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
-use tokio::io::{AsyncReadExt, AsyncSeekExt};
 use tokio::sync::oneshot;
 use tracing::instrument;
 
@@ -28,8 +26,6 @@ use crate::prelude::*;
 use crate::progress::{FullProgress, PhasedProgressBar};
 use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
-use crate::s9pk::v1::reader::S9pkReader;
-use crate::s9pk::v2::compat::{self, MAGIC_AND_VERSION};
 use crate::s9pk::S9pk;
 use crate::upload::upload;
 use crate::util::clap::FromStrParser;
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 0b7ef3c67..0431274ac 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -7,7 +7,7 @@ use chrono::{DateTime, Utc};
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::stream::BoxStream;
-use futures::{FutureExt, SinkExt, Stream, StreamExt, TryStreamExt};
+use futures::{FutureExt, Stream, StreamExt, TryStreamExt};
 use models::PackageId;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{command, from_fn_async, CallRemote, Empty, HandlerExt, ParentHandler};
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 136a8423b..374952f98 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -1,4 +1,5 @@
 use std::collections::BTreeSet;
+use std::net::Ipv4Addr;
 use std::ops::Deref;
 use std::path::Path;
 use std::sync::{Arc, Weak};
@@ -109,6 +110,7 @@ impl LxcManager {
 pub struct LxcContainer {
     manager: Weak<LxcManager>,
     rootfs: OverlayGuard,
+    ip: Ipv4Addr,
     guid: Arc<InternedString>,
     rpc_bind: TmpMountGuard,
     config: LxcConfig,
@@ -169,9 +171,20 @@ impl LxcContainer {
             .arg(&*guid)
             .invoke(ErrorKind::Lxc)
             .await?;
+        let ip = String::from_utf8(
+            Command::new("lxc-info")
+                .arg("--name")
+                .arg(&*guid)
+                .arg("-iH")
+                .invoke(ErrorKind::Docker)
+                .await?,
+        )?
+        .trim()
+        .parse()?;
         Ok(Self {
             manager: Arc::downgrade(manager),
             rootfs,
+            ip,
             guid: Arc::new(guid),
             rpc_bind,
             config,
@@ -183,6 +196,10 @@ impl LxcContainer {
         self.rootfs.path()
     }
 
+    pub fn ip(&self) -> Ipv4Addr {
+        self.ip
+    }
+
     pub fn rpc_dir(&self) -> &Path {
         self.rpc_bind.path()
     }
diff --git a/core/startos/src/middleware/auth.rs b/core/startos/src/middleware/auth.rs
index 9260d7fa2..2eddcd3ad 100644
--- a/core/startos/src/middleware/auth.rs
+++ b/core/startos/src/middleware/auth.rs
@@ -1,14 +1,17 @@
 use std::borrow::Borrow;
+use std::collections::BTreeSet;
+use std::ops::Deref;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use axum::extract::Request;
 use axum::response::Response;
 use basic_cookies::Cookie;
+use chrono::Utc;
 use color_eyre::eyre::eyre;
 use digest::Digest;
 use helpers::const_true;
-use http::header::COOKIE;
+use http::header::{COOKIE, USER_AGENT};
 use http::HeaderValue;
 use imbl_value::InternedString;
 use rpc_toolkit::yajrc::INTERNAL_ERROR;
@@ -38,24 +41,36 @@ pub struct HasLoggedOutSessions(());
 
 impl HasLoggedOutSessions {
     pub async fn new(
-        logged_out_sessions: impl IntoIterator<Item = impl AsLogoutSessionId>,
+        sessions: impl IntoIterator<Item = impl AsLogoutSessionId>,
         ctx: &RpcContext,
     ) -> Result<Self, Error> {
-        let mut open_authed_websockets = ctx.open_authed_websockets.lock().await;
-        let mut sqlx_conn = ctx.secret_store.acquire().await?;
-        for session in logged_out_sessions {
-            let session = session.as_logout_session_id();
-            let session = &*session;
-            sqlx::query!(
-                "UPDATE session SET logged_out = CURRENT_TIMESTAMP WHERE id = $1",
-                session
-            )
-            .execute(sqlx_conn.as_mut())
+        let to_log_out: BTreeSet<_> = sessions
+            .into_iter()
+            .map(|s| s.as_logout_session_id())
+            .collect();
+        ctx.open_authed_websockets
+            .lock()
+            .await
+            .retain(|session, sockets| {
+                if to_log_out.contains(session.hashed()) {
+                    for socket in std::mem::take(sockets) {
+                        let _ = socket.send(());
+                    }
+                    false
+                } else {
+                    true
+                }
+            });
+        ctx.db
+            .mutate(|db| {
+                let sessions = db.as_private_mut().as_sessions_mut();
+                for sid in &to_log_out {
+                    sessions.remove(sid)?;
+                }
+
+                Ok(())
+            })
             .await?;
-            for socket in open_authed_websockets.remove(session).unwrap_or_default() {
-                let _ = socket.send(());
-            }
-        }
         Ok(HasLoggedOutSessions(()))
     }
 }
@@ -105,15 +120,20 @@ impl HasValidSession {
         ctx: &RpcContext,
     ) -> Result<Self, Error> {
         let session_hash = session_token.hashed();
-        let session = sqlx::query!("UPDATE session SET last_active = CURRENT_TIMESTAMP WHERE id = $1 AND logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP", session_hash)
-            .execute(ctx.secret_store.acquire().await?.as_mut())
+        ctx.db
+            .mutate(|db| {
+                db.as_private_mut()
+                    .as_sessions_mut()
+                    .as_idx_mut(session_hash)
+                    .ok_or_else(|| {
+                        Error::new(eyre!("UNAUTHORIZED"), crate::ErrorKind::Authorization)
+                    })?
+                    .mutate(|s| {
+                        s.last_active = Utc::now();
+                        Ok(())
+                    })
+            })
             .await?;
-        if session.rows_affected() == 0 {
-            return Err(Error::new(
-                eyre!("UNAUTHORIZED"),
-                crate::ErrorKind::Authorization,
-            ));
-        }
         Ok(Self(SessionType::Session(session_token)))
     }
 
@@ -181,8 +201,8 @@ impl HashSessionToken {
         }
     }
 
-    pub fn hashed(&self) -> &str {
-        &*self.hashed
+    pub fn hashed(&self) -> &InternedString {
+        &self.hashed
     }
 
     fn hash(token: &str) -> InternedString {
@@ -241,6 +261,7 @@ pub struct Auth {
     cookie: Option<HeaderValue>,
     is_login: bool,
     set_cookie: Option<HeaderValue>,
+    user_agent: Option<HeaderValue>,
 }
 impl Auth {
     pub fn new() -> Self {
@@ -249,6 +270,7 @@ impl Auth {
             cookie: None,
             is_login: false,
             set_cookie: None,
+            user_agent: None,
         }
     }
 }
@@ -260,7 +282,8 @@ impl Middleware<RpcContext> for Auth {
         _: &RpcContext,
         request: &mut Request,
     ) -> Result<(), Response> {
-        self.cookie = request.headers_mut().get(COOKIE).cloned();
+        self.cookie = request.headers_mut().remove(COOKIE);
+        self.user_agent = request.headers_mut().remove(USER_AGENT);
         Ok(())
     }
     async fn process_rpc_request(
@@ -282,6 +305,10 @@ impl Middleware<RpcContext> for Auth {
                     .into()),
                 });
             }
+            if let Some(user_agent) = self.user_agent.as_ref().and_then(|h| h.to_str().ok()) {
+                request.params["user-agent"] = Value::String(Arc::new(user_agent.to_owned()))
+                // TODO: will this panic?
+            }
         } else if metadata.authenticated {
             match HasValidSession::from_header(self.cookie.as_ref(), &context).await {
                 Err(e) => {
@@ -291,7 +318,8 @@ impl Middleware<RpcContext> for Auth {
                     })
                 }
                 Ok(HasValidSession(SessionType::Session(s))) if metadata.get_session => {
-                    request.params["session"] = Value::String(Arc::new(s.hashed().into()));
+                    request.params["session"] =
+                        Value::String(Arc::new(s.hashed().deref().to_owned()));
                     // TODO: will this panic?
                 }
                 _ => (),
diff --git a/core/startos/src/net/dns.rs b/core/startos/src/net/dns.rs
index 9eb5d3750..ba69b6c16 100644
--- a/core/startos/src/net/dns.rs
+++ b/core/startos/src/net/dns.rs
@@ -18,6 +18,7 @@ use trust_dns_server::proto::rr::{Name, Record, RecordType};
 use trust_dns_server::server::{Request, RequestHandler, ResponseHandler, ResponseInfo};
 use trust_dns_server::ServerFuture;
 
+use crate::net::forward::START9_BRIDGE_IFACE;
 use crate::util::Invoke;
 use crate::{Error, ErrorKind, ResultExt};
 
@@ -163,13 +164,13 @@ impl DnsController {
 
         Command::new("resolvectl")
             .arg("dns")
-            .arg("lxcbr0")
+            .arg(START9_BRIDGE_IFACE)
             .arg("127.0.0.1")
             .invoke(ErrorKind::Network)
             .await?;
         Command::new("resolvectl")
             .arg("domain")
-            .arg("lxcbr0")
+            .arg(START9_BRIDGE_IFACE)
             .arg("embassy")
             .invoke(ErrorKind::Network)
             .await?;
diff --git a/core/startos/src/net/forward.rs b/core/startos/src/net/forward.rs
new file mode 100644
index 000000000..e954bc36a
--- /dev/null
+++ b/core/startos/src/net/forward.rs
@@ -0,0 +1,177 @@
+use std::collections::BTreeMap;
+use std::net::SocketAddr;
+use std::sync::{Arc, Weak};
+
+use id_pool::IdPool;
+use serde::{Deserialize, Serialize};
+use tokio::process::Command;
+use tokio::sync::Mutex;
+
+use crate::prelude::*;
+use crate::util::Invoke;
+
+pub const START9_BRIDGE_IFACE: &str = "lxcbr0";
+pub const FIRST_DYNAMIC_PRIVATE_PORT: u16 = 49152;
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct AvailablePorts(IdPool);
+impl AvailablePorts {
+    pub fn new() -> Self {
+        Self(IdPool::new_ranged(FIRST_DYNAMIC_PRIVATE_PORT..u16::MAX))
+    }
+    pub fn alloc(&mut self) -> Result<u16, Error> {
+        self.0.request_id().ok_or_else(|| {
+            Error::new(
+                eyre!("No more dynamic ports available!"),
+                ErrorKind::Network,
+            )
+        })
+    }
+    pub fn free(&mut self, ports: impl IntoIterator<Item = u16>) {
+        for port in ports {
+            self.0.return_id(port).unwrap_or_default();
+        }
+    }
+}
+
+pub struct LanPortForwardController {
+    forwards: Mutex<BTreeMap<u16, BTreeMap<SocketAddr, Weak<()>>>>,
+}
+impl LanPortForwardController {
+    pub fn new() -> Self {
+        Self {
+            forwards: Mutex::new(BTreeMap::new()),
+        }
+    }
+    pub async fn add(&self, port: u16, addr: SocketAddr) -> Result<Arc<()>, Error> {
+        let mut writable = self.forwards.lock().await;
+        let (prev, mut forward) = if let Some(forward) = writable.remove(&port) {
+            (
+                forward.keys().next().cloned(),
+                forward
+                    .into_iter()
+                    .filter(|(_, rc)| rc.strong_count() > 0)
+                    .collect(),
+            )
+        } else {
+            (None, BTreeMap::new())
+        };
+        let rc = Arc::new(());
+        forward.insert(addr, Arc::downgrade(&rc));
+        let next = forward.keys().next().cloned();
+        if !forward.is_empty() {
+            writable.insert(port, forward);
+        }
+
+        update_forward(port, prev, next).await?;
+        Ok(rc)
+    }
+    pub async fn gc(&self, external: u16) -> Result<(), Error> {
+        let mut writable = self.forwards.lock().await;
+        let (prev, forward) = if let Some(forward) = writable.remove(&external) {
+            (
+                forward.keys().next().cloned(),
+                forward
+                    .into_iter()
+                    .filter(|(_, rc)| rc.strong_count() > 0)
+                    .collect(),
+            )
+        } else {
+            (None, BTreeMap::new())
+        };
+        let next = forward.keys().next().cloned();
+        if !forward.is_empty() {
+            writable.insert(external, forward);
+        }
+
+        update_forward(external, prev, next).await
+    }
+}
+
+async fn update_forward(
+    external: u16,
+    prev: Option<SocketAddr>,
+    next: Option<SocketAddr>,
+) -> Result<(), Error> {
+    if prev != next {
+        if let Some(prev) = prev {
+            unforward(START9_BRIDGE_IFACE, external, prev).await?;
+        }
+        if let Some(next) = next {
+            forward(START9_BRIDGE_IFACE, external, next).await?;
+        }
+    }
+    Ok(())
+}
+
+// iptables -I FORWARD -o br-start9 -p tcp -d 172.18.0.2 --dport 8333 -j ACCEPT
+// iptables -t nat -I PREROUTING -p tcp --dport 32768 -j DNAT --to 172.18.0.2:8333
+async fn forward(iface: &str, external: u16, addr: SocketAddr) -> Result<(), Error> {
+    Command::new("iptables")
+        .arg("-I")
+        .arg("FORWARD")
+        .arg("-o")
+        .arg(iface)
+        .arg("-p")
+        .arg("tcp")
+        .arg("-d")
+        .arg(addr.ip().to_string())
+        .arg("--dport")
+        .arg(addr.port().to_string())
+        .arg("-j")
+        .arg("ACCEPT")
+        .invoke(crate::ErrorKind::Network)
+        .await?;
+    Command::new("iptables")
+        .arg("-t")
+        .arg("nat")
+        .arg("-I")
+        .arg("PREROUTING")
+        .arg("-p")
+        .arg("tcp")
+        .arg("--dport")
+        .arg(external.to_string())
+        .arg("-j")
+        .arg("DNAT")
+        .arg("--to")
+        .arg(addr.to_string())
+        .invoke(crate::ErrorKind::Network)
+        .await?;
+    Ok(())
+}
+
+// iptables -D FORWARD -o br-start9 -p tcp -d 172.18.0.2 --dport 8333 -j ACCEPT
+// iptables -t nat -D PREROUTING -p tcp --dport 32768 -j DNAT --to 172.18.0.2:8333
+async fn unforward(iface: &str, external: u16, addr: SocketAddr) -> Result<(), Error> {
+    Command::new("iptables")
+        .arg("-D")
+        .arg("FORWARD")
+        .arg("-o")
+        .arg(iface)
+        .arg("-p")
+        .arg("tcp")
+        .arg("-d")
+        .arg(addr.ip().to_string())
+        .arg("--dport")
+        .arg(addr.port().to_string())
+        .arg("-j")
+        .arg("ACCEPT")
+        .invoke(crate::ErrorKind::Network)
+        .await?;
+    Command::new("iptables")
+        .arg("-t")
+        .arg("nat")
+        .arg("-D")
+        .arg("PREROUTING")
+        .arg("-p")
+        .arg("tcp")
+        .arg("--dport")
+        .arg(external.to_string())
+        .arg("-j")
+        .arg("DNAT")
+        .arg("--to")
+        .arg(addr.to_string())
+        .invoke(crate::ErrorKind::Network)
+        .await?;
+    Ok(())
+}
diff --git a/core/startos/src/net/host/address.rs b/core/startos/src/net/host/address.rs
new file mode 100644
index 000000000..6f3ff6df2
--- /dev/null
+++ b/core/startos/src/net/host/address.rs
@@ -0,0 +1,9 @@
+use serde::{Deserialize, Serialize};
+use torut::onion::OnionAddressV3;
+
+#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
+#[serde(rename_all = "camelCase")]
+#[serde(tag = "kind")]
+pub enum HostAddress {
+    Onion { address: OnionAddressV3 },
+}
diff --git a/core/startos/src/net/host/binding.rs b/core/startos/src/net/host/binding.rs
new file mode 100644
index 000000000..0584b517b
--- /dev/null
+++ b/core/startos/src/net/host/binding.rs
@@ -0,0 +1,71 @@
+use imbl_value::InternedString;
+use serde::{Deserialize, Serialize};
+
+use crate::net::forward::AvailablePorts;
+use crate::net::vhost::AlpnInfo;
+use crate::prelude::*;
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BindInfo {
+    pub options: BindOptions,
+    pub assigned_lan_port: Option<u16>,
+}
+impl BindInfo {
+    pub fn new(available_ports: &mut AvailablePorts, options: BindOptions) -> Result<Self, Error> {
+        let mut assigned_lan_port = None;
+        if options.add_ssl.is_some() || options.secure {
+            assigned_lan_port = Some(available_ports.alloc()?);
+        }
+        Ok(Self {
+            options,
+            assigned_lan_port,
+        })
+    }
+    pub fn update(
+        self,
+        available_ports: &mut AvailablePorts,
+        options: BindOptions,
+    ) -> Result<Self, Error> {
+        let Self {
+            mut assigned_lan_port,
+            ..
+        } = self;
+        if options.add_ssl.is_some() || options.secure {
+            assigned_lan_port = if let Some(port) = assigned_lan_port.take() {
+                Some(port)
+            } else {
+                Some(available_ports.alloc()?)
+            };
+        } else {
+            if let Some(port) = assigned_lan_port.take() {
+                available_ports.free([port]);
+            }
+        }
+        Ok(Self {
+            options,
+            assigned_lan_port,
+        })
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BindOptions {
+    pub scheme: InternedString,
+    pub preferred_external_port: u16,
+    pub add_ssl: Option<AddSslOptions>,
+    pub secure: bool,
+    pub ssl: bool,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct AddSslOptions {
+    pub scheme: InternedString,
+    pub preferred_external_port: u16,
+    // #[serde(default)]
+    // pub add_x_forwarded_headers: bool, // TODO
+    #[serde(default)]
+    pub alpn: AlpnInfo,
+}
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
index b2b991698..18b86ba0e 100644
--- a/core/startos/src/net/host/mod.rs
+++ b/core/startos/src/net/host/mod.rs
@@ -1,29 +1,84 @@
+use std::collections::{BTreeMap, BTreeSet};
+
 use imbl_value::InternedString;
+use models::HostId;
 use serde::{Deserialize, Serialize};
 
-use crate::net::host::multi::MultiHost;
+use crate::net::forward::AvailablePorts;
+use crate::net::host::address::HostAddress;
+use crate::net::host::binding::{BindInfo, BindOptions};
+use crate::prelude::*;
+
+pub mod address;
+pub mod binding;
 
-pub mod multi;
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+pub struct Host {
+    pub kind: HostKind,
+    pub bindings: BTreeMap<u16, BindInfo>,
+    pub addresses: BTreeSet<HostAddress>,
+    pub primary: Option<HostAddress>,
+}
+impl AsRef<Host> for Host {
+    fn as_ref(&self) -> &Host {
+        self
+    }
+}
+impl Host {
+    pub fn new(kind: HostKind) -> Self {
+        Self {
+            kind,
+            bindings: BTreeMap::new(),
+            addresses: BTreeSet::new(),
+            primary: None,
+        }
+    }
+}
 
-pub enum Host {
-    Multi(MultiHost),
-    // Single(SingleHost),
-    // Static(StaticHost),
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub enum HostKind {
+    Multi,
+    // Single,
+    // Static,
 }
 
-#[derive(Deserialize, Serialize)]
-pub struct BindOptions {
-    scheme: InternedString,
-    preferred_external_port: u16,
-    add_ssl: Option<AddSslOptions>,
-    secure: bool,
-    ssl: bool,
+#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[model = "Model<Self>"]
+pub struct HostInfo(BTreeMap<HostId, Host>);
+
+impl Map for HostInfo {
+    type Key = HostId;
+    type Value = Host;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
 }
 
-#[derive(Deserialize, Serialize)]
-pub struct AddSslOptions {
-    scheme: InternedString,
-    preferred_external_port: u16,
-    #[serde(default)]
-    add_x_forwarded_headers: bool,
+impl Model<HostInfo> {
+    pub fn add_binding(
+        &mut self,
+        available_ports: &mut AvailablePorts,
+        kind: HostKind,
+        id: &HostId,
+        internal_port: u16,
+        options: BindOptions,
+    ) -> Result<(), Error> {
+        self.upsert(id, || Host::new(kind))?
+            .as_bindings_mut()
+            .mutate(|b| {
+                let info = if let Some(info) = b.remove(&internal_port) {
+                    info.update(available_ports, options)?
+                } else {
+                    BindInfo::new(available_ports, options)?
+                };
+                b.insert(internal_port, info);
+                Ok(())
+            }) // TODO: handle host kind change
+    }
 }
diff --git a/core/startos/src/net/host/multi.rs b/core/startos/src/net/host/multi.rs
deleted file mode 100644
index 511619201..000000000
--- a/core/startos/src/net/host/multi.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use std::collections::BTreeMap;
-
-use imbl_value::InternedString;
-use serde::{Deserialize, Serialize};
-
-use crate::net::host::BindOptions;
-use crate::net::keys::Key;
-
-pub struct MultiHost {
-    id: InternedString,
-    key: Key,
-    binds: BTreeMap<u16, BindOptions>,
-}
diff --git a/core/startos/src/net/keys.rs b/core/startos/src/net/keys.rs
index 1079d4a98..02ec17329 100644
--- a/core/startos/src/net/keys.rs
+++ b/core/startos/src/net/keys.rs
@@ -1,393 +1,24 @@
-use clap::Parser;
-use color_eyre::eyre::eyre;
-use models::{HostId, Id, PackageId};
-use openssl::pkey::{PKey, Private};
-use openssl::sha::Sha256;
-use openssl::x509::X509;
-use p256::elliptic_curve::pkcs8::EncodePrivateKey;
 use serde::{Deserialize, Serialize};
-use sqlx::{Acquire, PgExecutor};
-use ssh_key::private::Ed25519PrivateKey;
-use torut::onion::{OnionAddressV3, TorSecretKeyV3};
-use zeroize::Zeroize;
 
-use crate::config::ConfigureContext;
-use crate::context::RpcContext;
-use crate::control::{restart, ControlParams};
-use crate::disk::fsck::RequiresReboot;
-use crate::net::ssl::CertPair;
+use crate::account::AccountInfo;
+use crate::net::ssl::CertStore;
+use crate::net::tor::OnionStore;
 use crate::prelude::*;
-use crate::util::crypto::ed25519_expand_key;
 
-// TODO: delete once we may change tor addresses
-async fn compat(
-    secrets: impl PgExecutor<'_>,
-    host: &Option<(PackageId, HostId)>,
-) -> Result<Option<[u8; 64]>, Error> {
-    if let Some((package, host)) = host {
-        if let Some(r) = sqlx::query!(
-            "SELECT key FROM tor WHERE package = $1 AND interface = $2",
-            package,
-            host
-        )
-        .fetch_optional(secrets)
-        .await?
-        {
-            Ok(Some(<[u8; 64]>::try_from(r.key).map_err(|e| {
-                Error::new(
-                    eyre!("expected vec of len 64, got len {}", e.len()),
-                    ErrorKind::ParseDbField,
-                )
-            })?))
-        } else {
-            Ok(None)
-        }
-    } else if let Some(key) = sqlx::query!("SELECT tor_key FROM account WHERE id = 0")
-        .fetch_one(secrets)
-        .await?
-        .tor_key
-    {
-        Ok(Some(<[u8; 64]>::try_from(key).map_err(|e| {
-            Error::new(
-                eyre!("expected vec of len 64, got len {}", e.len()),
-                ErrorKind::ParseDbField,
-            )
-        })?))
-    } else {
-        Ok(None)
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Key {
-    host: Option<(PackageId, HostId)>,
-    base: [u8; 32],
-    tor_key: [u8; 64], // Does NOT necessarily match base
-}
-impl Key {
-    pub fn host(&self) -> Option<(PackageId, HostId)> {
-        self.host.clone()
-    }
-    pub fn as_bytes(&self) -> [u8; 32] {
-        self.base
-    }
-    pub fn internal_address(&self) -> String {
-        self.host
-            .as_ref()
-            .map(|(pkg_id, _)| format!("{}.embassy", pkg_id))
-            .unwrap_or_else(|| "embassy".to_owned())
-    }
-    pub fn tor_key(&self) -> TorSecretKeyV3 {
-        self.tor_key.into()
-    }
-    pub fn tor_address(&self) -> OnionAddressV3 {
-        self.tor_key().public().get_onion_address()
-    }
-    pub fn base_address(&self) -> String {
-        self.tor_key()
-            .public()
-            .get_onion_address()
-            .get_address_without_dot_onion()
-    }
-    pub fn local_address(&self) -> String {
-        self.base_address() + ".local"
-    }
-    pub fn openssl_key_ed25519(&self) -> PKey<Private> {
-        PKey::private_key_from_raw_bytes(&self.base, openssl::pkey::Id::ED25519).unwrap()
-    }
-    pub fn openssl_key_nistp256(&self) -> PKey<Private> {
-        let mut buf = self.base;
-        loop {
-            if let Ok(k) = p256::SecretKey::from_slice(&buf) {
-                return PKey::private_key_from_pkcs8(&*k.to_pkcs8_der().unwrap().as_bytes())
-                    .unwrap();
-            }
-            let mut sha = Sha256::new();
-            sha.update(&buf);
-            buf = sha.finish();
-        }
-    }
-    pub fn ssh_key(&self) -> Ed25519PrivateKey {
-        Ed25519PrivateKey::from_bytes(&self.base)
-    }
-    pub(crate) fn from_pair(
-        host: Option<(PackageId, HostId)>,
-        bytes: [u8; 32],
-        tor_key: [u8; 64],
-    ) -> Self {
-        Self {
-            host,
-            tor_key,
-            base: bytes,
-        }
-    }
-    pub fn from_bytes(host: Option<(PackageId, HostId)>, bytes: [u8; 32]) -> Self {
-        Self::from_pair(host, bytes, ed25519_expand_key(&bytes))
-    }
-    pub fn new(host: Option<(PackageId, HostId)>) -> Self {
-        Self::from_bytes(host, rand::random())
-    }
-    pub(super) fn with_certs(self, certs: CertPair, int: X509, root: X509) -> KeyInfo {
-        KeyInfo {
-            key: self,
-            certs,
-            int,
-            root,
-        }
-    }
-    pub async fn for_package(
-        secrets: impl PgExecutor<'_>,
-        package: &PackageId,
-    ) -> Result<Vec<Self>, Error> {
-        sqlx::query!(
-            r#"
-                SELECT
-                    network_keys.package,
-                    network_keys.interface,
-                    network_keys.key,
-                    tor.key AS "tor_key?"
-                FROM
-                    network_keys
-                LEFT JOIN
-                    tor
-                ON
-                    network_keys.package = tor.package
-                AND
-                    network_keys.interface = tor.interface
-                WHERE
-                    network_keys.package = $1
-            "#,
-            package
-        )
-        .fetch_all(secrets)
-        .await?
-        .into_iter()
-        .map(|row| {
-            let host = Some((package.clone(), HostId::from(Id::try_from(row.interface)?)));
-            let bytes = row.key.try_into().map_err(|e: Vec<u8>| {
-                Error::new(
-                    eyre!("Invalid length for network key {} expected 32", e.len()),
-                    crate::ErrorKind::Database,
-                )
-            })?;
-            Ok(match row.tor_key {
-                Some(tor_key) => Key::from_pair(
-                    host,
-                    bytes,
-                    tor_key.try_into().map_err(|e: Vec<u8>| {
-                        Error::new(
-                            eyre!("Invalid length for tor key {} expected 64", e.len()),
-                            crate::ErrorKind::Database,
-                        )
-                    })?,
-                ),
-                None => Key::from_bytes(host, bytes),
-            })
-        })
-        .collect()
-    }
-    pub async fn for_host<Ex>(
-        secrets: &mut Ex,
-        host: Option<(PackageId, HostId)>,
-    ) -> Result<Self, Error>
-    where
-        for<'a> &'a mut Ex: PgExecutor<'a>,
-    {
-        let tentative = rand::random::<[u8; 32]>();
-        let actual = if let Some((pkg, iface)) = &host {
-            let k = tentative.as_slice();
-            let actual = sqlx::query!(
-                "INSERT INTO network_keys (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO UPDATE SET package = EXCLUDED.package RETURNING key",
-                pkg,
-                iface,
-                k,
-            )
-            .fetch_one(&mut *secrets)
-            .await?.key;
-            let mut bytes = tentative;
-            bytes.clone_from_slice(actual.get(0..32).ok_or_else(|| {
-                Error::new(
-                    eyre!("Invalid key size returned from DB"),
-                    crate::ErrorKind::Database,
-                )
-            })?);
-            bytes
-        } else {
-            let actual = sqlx::query!("SELECT network_key FROM account WHERE id = 0")
-                .fetch_one(&mut *secrets)
-                .await?
-                .network_key;
-            let mut bytes = tentative;
-            bytes.clone_from_slice(actual.get(0..32).ok_or_else(|| {
-                Error::new(
-                    eyre!("Invalid key size returned from DB"),
-                    crate::ErrorKind::Database,
-                )
-            })?);
-            bytes
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[model = "Model<Self>"]
+pub struct KeyStore {
+    pub onion: OnionStore,
+    pub local_certs: CertStore,
+    // pub letsencrypt_certs: BTreeMap<BTreeSet<InternedString>, CertData>
+}
+impl KeyStore {
+    pub fn new(account: &AccountInfo) -> Result<Self, Error> {
+        let mut res = Self {
+            onion: OnionStore::new(),
+            local_certs: CertStore::new(account)?,
         };
-        let mut res = Self::from_bytes(host, actual);
-        if let Some(tor_key) = compat(secrets, &res.host).await? {
-            res.tor_key = tor_key;
-        }
+        res.onion.insert(account.tor_key.clone());
         Ok(res)
     }
 }
-impl Drop for Key {
-    fn drop(&mut self) {
-        self.base.zeroize();
-        self.tor_key.zeroize();
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct KeyInfo {
-    key: Key,
-    certs: CertPair,
-    int: X509,
-    root: X509,
-}
-impl KeyInfo {
-    pub fn key(&self) -> &Key {
-        &self.key
-    }
-    pub fn certs(&self) -> &CertPair {
-        &self.certs
-    }
-    pub fn int_ca(&self) -> &X509 {
-        &self.int
-    }
-    pub fn root_ca(&self) -> &X509 {
-        &self.root
-    }
-    pub fn fullchain_ed25519(&self) -> Vec<&X509> {
-        vec![&self.certs.ed25519, &self.int, &self.root]
-    }
-    pub fn fullchain_nistp256(&self) -> Vec<&X509> {
-        vec![&self.certs.nistp256, &self.int, &self.root]
-    }
-}
-
-#[test]
-pub fn test_keygen() {
-    let key = Key::new(None);
-    key.tor_key();
-    key.openssl_key_nistp256();
-}
-
-pub fn display_requires_reboot(_: RotateKeysParams, args: RequiresReboot) {
-    if args.0 {
-        println!("Server must be restarted for changes to take effect");
-    }
-}
-#[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
-#[command(rename_all = "kebab-case")]
-pub struct RotateKeysParams {
-    package: Option<PackageId>,
-    host: Option<HostId>,
-}
-
-// #[command(display(display_requires_reboot))]
-pub async fn rotate_key(
-    ctx: RpcContext,
-    RotateKeysParams { package, host }: RotateKeysParams,
-) -> Result<RequiresReboot, Error> {
-    let mut pgcon = ctx.secret_store.acquire().await?;
-    let mut tx = pgcon.begin().await?;
-    if let Some(package) = package {
-        let Some(host) = host else {
-            return Err(Error::new(
-                eyre!("Must specify host"),
-                ErrorKind::InvalidRequest,
-            ));
-        };
-        sqlx::query!(
-            "DELETE FROM tor WHERE package = $1 AND interface = $2",
-            &package,
-            &host,
-        )
-        .execute(&mut *tx)
-        .await?;
-        sqlx::query!(
-            "DELETE FROM network_keys WHERE package = $1 AND interface = $2",
-            &package,
-            &host,
-        )
-        .execute(&mut *tx)
-        .await?;
-        let new_key = Key::for_host(&mut *tx, Some((package.clone(), host.clone()))).await?;
-        let needs_config = ctx
-            .db
-            .mutate(|v| {
-                let installed = v
-                    .as_public_mut()
-                    .as_package_data_mut()
-                    .as_idx_mut(&package)
-                    .or_not_found(&package)?
-                    .as_installed_mut()
-                    .or_not_found("installed")?;
-                let addrs = installed
-                    .as_interface_addresses_mut()
-                    .as_idx_mut(&host)
-                    .or_not_found(&host)?;
-                if let Some(lan) = addrs.as_lan_address_mut().transpose_mut() {
-                    lan.ser(&new_key.local_address())?;
-                }
-                if let Some(lan) = addrs.as_tor_address_mut().transpose_mut() {
-                    lan.ser(&new_key.tor_address().to_string())?;
-                }
-
-                // TODO
-                // if installed
-                //     .as_manifest()
-                //     .as_config()
-                //     .transpose_ref()
-                //     .is_some()
-                // {
-                //     installed
-                //         .as_status_mut()
-                //         .as_configured_mut()
-                //         .replace(&false)
-                // } else {
-                //     Ok(false)
-                // }
-                Ok(false)
-            })
-            .await?;
-        tx.commit().await?;
-        if needs_config {
-            ctx.services
-                .get(&package)
-                .await
-                .as_ref()
-                .ok_or_else(|| {
-                    Error::new(
-                        eyre!("There is no manager running for {package}"),
-                        ErrorKind::Unknown,
-                    )
-                })?
-                .configure(ConfigureContext::default())
-                .await?;
-        } else {
-            restart(ctx, ControlParams { id: package }).await?;
-        }
-        Ok(RequiresReboot(false))
-    } else {
-        sqlx::query!("UPDATE account SET tor_key = NULL, network_key = gen_random_bytes(32)")
-            .execute(&mut *tx)
-            .await?;
-        let new_key = Key::for_host(&mut *tx, None).await?;
-        let url = format!("https://{}", new_key.tor_address()).parse()?;
-        ctx.db
-            .mutate(|v| {
-                v.as_public_mut()
-                    .as_server_info_mut()
-                    .as_tor_address_mut()
-                    .ser(&url)
-            })
-            .await?;
-        tx.commit().await?;
-        Ok(RequiresReboot(true))
-    }
-}
diff --git a/core/startos/src/net/mdns.rs b/core/startos/src/net/mdns.rs
index ee2e0fa41..af5d128a8 100644
--- a/core/startos/src/net/mdns.rs
+++ b/core/startos/src/net/mdns.rs
@@ -1,14 +1,10 @@
-use std::collections::BTreeMap;
 use std::net::Ipv4Addr;
-use std::sync::{Arc, Weak};
 
 use color_eyre::eyre::eyre;
-use tokio::process::{Child, Command};
-use tokio::sync::Mutex;
-use tracing::instrument;
+use tokio::process::Command;
 
+use crate::prelude::*;
 use crate::util::Invoke;
-use crate::{Error, ResultExt};
 
 pub async fn resolve_mdns(hostname: &str) -> Result<Ipv4Addr, Error> {
     Ok(String::from_utf8(
diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs
index a0a2ed166..f6e5ddee5 100644
--- a/core/startos/src/net/mod.rs
+++ b/core/startos/src/net/mod.rs
@@ -1,9 +1,8 @@
-use rpc_toolkit::{from_fn_async, AnyContext, HandlerExt, ParentHandler};
-
-use crate::context::CliContext;
+use rpc_toolkit::ParentHandler;
 
 pub mod dhcp;
 pub mod dns;
+pub mod forward;
 pub mod host;
 pub mod keys;
 pub mod mdns;
@@ -22,13 +21,4 @@ pub fn net() -> ParentHandler {
     ParentHandler::new()
         .subcommand("tor", tor::tor())
         .subcommand("dhcp", dhcp::dhcp())
-        .subcommand("ssl", ssl::ssl())
-        .subcommand(
-            "rotate-key",
-            from_fn_async(keys::rotate_key)
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
-                    Ok(keys::display_requires_reboot(handle.params, result))
-                })
-                .with_remote_cli::<CliContext>(),
-        )
 }
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index 9b9145531..d9d7a5d76 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -1,59 +1,72 @@
-use std::collections::BTreeMap;
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+use std::collections::{BTreeMap, BTreeSet};
+use std::net::{Ipv4Addr, SocketAddr};
 use std::sync::{Arc, Weak};
 
 use color_eyre::eyre::eyre;
-use models::{HostId, PackageId};
-use sqlx::PgExecutor;
+use imbl::OrdMap;
+use lazy_format::lazy_format;
+use models::{HostId, OptionExt, PackageId};
+use patch_db::PatchDb;
+use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
 
+use crate::db::prelude::PatchDbExt;
 use crate::error::ErrorCollection;
 use crate::hostname::Hostname;
 use crate::net::dns::DnsController;
-use crate::net::keys::Key;
-use crate::net::ssl::{export_cert, export_key, SslManager};
+use crate::net::forward::LanPortForwardController;
+use crate::net::host::address::HostAddress;
+use crate::net::host::binding::{AddSslOptions, BindOptions};
+use crate::net::host::{Host, HostKind};
 use crate::net::tor::TorController;
 use crate::net::vhost::{AlpnInfo, VHostController};
-use crate::volume::cert_dir;
+use crate::util::serde::MaybeUtf8String;
 use crate::{Error, HOST_IP};
 
 pub struct NetController {
+    db: PatchDb,
     pub(super) tor: TorController,
     pub(super) vhost: VHostController,
     pub(super) dns: DnsController,
-    pub(super) ssl: Arc<SslManager>,
+    pub(super) forward: LanPortForwardController,
     pub(super) os_bindings: Vec<Arc<()>>,
 }
 
 impl NetController {
     #[instrument(skip_all)]
     pub async fn init(
+        db: PatchDb,
         tor_control: SocketAddr,
         tor_socks: SocketAddr,
         dns_bind: &[SocketAddr],
-        ssl: SslManager,
         hostname: &Hostname,
-        os_key: &Key,
+        os_tor_key: TorSecretKeyV3,
     ) -> Result<Self, Error> {
-        let ssl = Arc::new(ssl);
         let mut res = Self {
+            db: db.clone(),
             tor: TorController::new(tor_control, tor_socks),
-            vhost: VHostController::new(ssl.clone()),
+            vhost: VHostController::new(db),
             dns: DnsController::init(dns_bind).await?,
-            ssl,
+            forward: LanPortForwardController::new(),
             os_bindings: Vec::new(),
         };
-        res.add_os_bindings(hostname, os_key).await?;
+        res.add_os_bindings(hostname, os_tor_key).await?;
         Ok(res)
     }
 
-    async fn add_os_bindings(&mut self, hostname: &Hostname, key: &Key) -> Result<(), Error> {
-        let alpn = Err(AlpnInfo::Specified(vec!["http/1.1".into(), "h2".into()]));
+    async fn add_os_bindings(
+        &mut self,
+        hostname: &Hostname,
+        tor_key: TorSecretKeyV3,
+    ) -> Result<(), Error> {
+        let alpn = Err(AlpnInfo::Specified(vec![
+            MaybeUtf8String("http/1.1".into()),
+            MaybeUtf8String("h2".into()),
+        ]));
 
         // Internal DNS
         self.vhost
             .add(
-                key.clone(),
                 Some("embassy".into()),
                 443,
                 ([127, 0, 0, 1], 80).into(),
@@ -66,13 +79,7 @@ impl NetController {
         // LAN IP
         self.os_bindings.push(
             self.vhost
-                .add(
-                    key.clone(),
-                    None,
-                    443,
-                    ([127, 0, 0, 1], 80).into(),
-                    alpn.clone(),
-                )
+                .add(None, 443, ([127, 0, 0, 1], 80).into(), alpn.clone())
                 .await?,
         );
 
@@ -80,7 +87,6 @@ impl NetController {
         self.os_bindings.push(
             self.vhost
                 .add(
-                    key.clone(),
                     Some("localhost".into()),
                     443,
                     ([127, 0, 0, 1], 80).into(),
@@ -91,7 +97,6 @@ impl NetController {
         self.os_bindings.push(
             self.vhost
                 .add(
-                    key.clone(),
                     Some(hostname.no_dot_host_name()),
                     443,
                     ([127, 0, 0, 1], 80).into(),
@@ -104,7 +109,6 @@ impl NetController {
         self.os_bindings.push(
             self.vhost
                 .add(
-                    key.clone(),
                     Some(hostname.local_domain_name()),
                     443,
                     ([127, 0, 0, 1], 80).into(),
@@ -113,28 +117,26 @@ impl NetController {
                 .await?,
         );
 
-        // Tor (http)
-        self.os_bindings.push(
-            self.tor
-                .add(key.tor_key(), 80, ([127, 0, 0, 1], 80).into())
-                .await?,
-        );
-
-        // Tor (https)
+        // Tor
         self.os_bindings.push(
             self.vhost
                 .add(
-                    key.clone(),
-                    Some(key.tor_address().to_string()),
+                    Some(tor_key.public().get_onion_address().to_string()),
                     443,
                     ([127, 0, 0, 1], 80).into(),
                     alpn.clone(),
                 )
                 .await?,
         );
-        self.os_bindings.push(
+        self.os_bindings.extend(
             self.tor
-                .add(key.tor_key(), 443, ([127, 0, 0, 1], 443).into())
+                .add(
+                    tor_key,
+                    vec![
+                        (80, ([127, 0, 0, 1], 80).into()),   // http
+                        (443, ([127, 0, 0, 1], 443).into()), // https
+                    ],
+                )
                 .await?,
         );
 
@@ -155,57 +157,15 @@ impl NetController {
             ip,
             dns,
             controller: Arc::downgrade(self),
-            tor: BTreeMap::new(),
-            lan: BTreeMap::new(),
+            binds: BTreeMap::new(),
         })
     }
+}
 
-    async fn add_tor(
-        &self,
-        key: &Key,
-        external: u16,
-        target: SocketAddr,
-    ) -> Result<Vec<Arc<()>>, Error> {
-        let mut rcs = Vec::with_capacity(1);
-        rcs.push(self.tor.add(key.tor_key(), external, target).await?);
-        Ok(rcs)
-    }
-
-    async fn remove_tor(&self, key: &Key, external: u16, rcs: Vec<Arc<()>>) -> Result<(), Error> {
-        drop(rcs);
-        self.tor.gc(Some(key.tor_key()), Some(external)).await
-    }
-
-    async fn add_lan(
-        &self,
-        key: Key,
-        external: u16,
-        target: SocketAddr,
-        connect_ssl: Result<(), AlpnInfo>,
-    ) -> Result<Vec<Arc<()>>, Error> {
-        let mut rcs = Vec::with_capacity(2);
-        rcs.push(
-            self.vhost
-                .add(
-                    key.clone(),
-                    Some(key.local_address()),
-                    external,
-                    target.into(),
-                    connect_ssl,
-                )
-                .await?,
-        );
-        // rcs.push(self.mdns.add(key.base_address()).await?);
-        // TODO
-        Ok(rcs)
-    }
-
-    async fn remove_lan(&self, key: &Key, external: u16, rcs: Vec<Arc<()>>) -> Result<(), Error> {
-        drop(rcs);
-        // self.mdns.gc(key.base_address()).await?;
-        // TODO
-        self.vhost.gc(Some(key.local_address()), external).await
-    }
+#[derive(Default)]
+struct HostBinds {
+    lan: BTreeMap<u16, (u16, Option<AddSslOptions>, Arc<()>)>,
+    tor: BTreeMap<OnionAddressV3, (OrdMap<u16, SocketAddr>, Vec<Arc<()>>)>,
 }
 
 pub struct NetService {
@@ -214,8 +174,7 @@ pub struct NetService {
     ip: Ipv4Addr,
     dns: Arc<()>,
     controller: Weak<NetController>,
-    tor: BTreeMap<(HostId, u16), (Key, Vec<Arc<()>>)>,
-    lan: BTreeMap<(HostId, u16), (Key, Vec<Arc<()>>)>,
+    binds: BTreeMap<HostId, HostBinds>,
 }
 impl NetService {
     fn net_controller(&self) -> Result<Arc<NetController>, Error> {
@@ -226,111 +185,196 @@ impl NetService {
             )
         })
     }
-    pub async fn add_tor<Ex>(
+
+    pub async fn bind(
         &mut self,
-        secrets: &mut Ex,
+        kind: HostKind,
         id: HostId,
-        external: u16,
-        internal: u16,
-    ) -> Result<(), Error>
-    where
-        for<'a> &'a mut Ex: PgExecutor<'a>,
-    {
-        let key = Key::for_host(secrets, Some((self.id.clone(), id.clone()))).await?;
-        let ctrl = self.net_controller()?;
-        let tor_idx = (id, external);
-        let mut tor = self
-            .tor
-            .remove(&tor_idx)
-            .unwrap_or_else(|| (key.clone(), Vec::new()));
-        tor.1.append(
-            &mut ctrl
-                .add_tor(&key, external, SocketAddr::new(self.ip.into(), internal))
-                .await?,
-        );
-        self.tor.insert(tor_idx, tor);
-        Ok(())
+        internal_port: u16,
+        options: BindOptions,
+    ) -> Result<(), Error> {
+        let id_ref = &id;
+        let pkg_id = &self.id;
+        let host = self
+            .net_controller()?
+            .db
+            .mutate(|d| {
+                let mut ports = d.as_private().as_available_ports().de()?;
+                let hosts = d
+                    .as_public_mut()
+                    .as_package_data_mut()
+                    .as_idx_mut(pkg_id)
+                    .or_not_found(pkg_id)?
+                    .as_installed_mut()
+                    .or_not_found(pkg_id)?
+                    .as_hosts_mut();
+                hosts.add_binding(&mut ports, kind, &id, internal_port, options)?;
+                let host = hosts
+                    .as_idx(&id)
+                    .or_not_found(lazy_format!("Host {id_ref} for {pkg_id}"))?
+                    .de()?;
+                d.as_private_mut().as_available_ports_mut().ser(&ports)?;
+                Ok(host)
+            })
+            .await?;
+        self.update(id, host).await
     }
-    pub async fn remove_tor(&mut self, id: HostId, external: u16) -> Result<(), Error> {
+
+    async fn update(&mut self, id: HostId, host: Host) -> Result<(), Error> {
         let ctrl = self.net_controller()?;
-        if let Some((key, rcs)) = self.tor.remove(&(id, external)) {
-            ctrl.remove_tor(&key, external, rcs).await?;
+        let binds = {
+            if !self.binds.contains_key(&id) {
+                self.binds.insert(id.clone(), Default::default());
+            }
+            self.binds.get_mut(&id).unwrap()
+        };
+        if true
+        // TODO: if should listen lan
+        {
+            for (port, bind) in &host.bindings {
+                let old_lan_bind = binds.lan.remove(port);
+                let old_lan_port = old_lan_bind.as_ref().map(|(external, _, _)| *external);
+                let lan_bind = old_lan_bind.filter(|(external, ssl, _)| {
+                    ssl == &bind.options.add_ssl
+                        && bind.assigned_lan_port.as_ref() == Some(external)
+                }); // only keep existing binding if relevant details match
+                if let Some(external) = bind.assigned_lan_port {
+                    let new_lan_bind = if let Some(b) = lan_bind {
+                        b
+                    } else {
+                        if let Some(ssl) = &bind.options.add_ssl {
+                            let rc = ctrl
+                                .vhost
+                                .add(
+                                    None,
+                                    external,
+                                    (self.ip, *port).into(),
+                                    if bind.options.ssl {
+                                        Ok(())
+                                    } else {
+                                        Err(ssl.alpn.clone())
+                                    },
+                                )
+                                .await?;
+                            (*port, Some(ssl.clone()), rc)
+                        } else {
+                            let rc = ctrl.forward.add(external, (self.ip, *port).into()).await?;
+                            (*port, None, rc)
+                        }
+                    };
+                    binds.lan.insert(*port, new_lan_bind);
+                }
+                if let Some(external) = old_lan_port {
+                    ctrl.vhost.gc(None, external).await?;
+                    ctrl.forward.gc(external).await?;
+                }
+            }
+            let mut removed = BTreeSet::new();
+            let mut removed_ssl = BTreeSet::new();
+            binds.lan.retain(|internal, (external, ssl, _)| {
+                if host.bindings.contains_key(internal) {
+                    true
+                } else {
+                    if ssl.is_some() {
+                        removed_ssl.insert(*external);
+                    } else {
+                        removed.insert(*external);
+                    }
+                    false
+                }
+            });
+            for external in removed {
+                ctrl.forward.gc(external).await?;
+            }
+            for external in removed_ssl {
+                ctrl.vhost.gc(None, external).await?;
+            }
         }
-        Ok(())
-    }
-    pub async fn add_lan<Ex>(
-        &mut self,
-        secrets: &mut Ex,
-        id: HostId,
-        external: u16,
-        internal: u16,
-        connect_ssl: Result<(), AlpnInfo>,
-    ) -> Result<(), Error>
-    where
-        for<'a> &'a mut Ex: PgExecutor<'a>,
-    {
-        let key = Key::for_host(secrets, Some((self.id.clone(), id.clone()))).await?;
-        let ctrl = self.net_controller()?;
-        let lan_idx = (id, external);
-        let mut lan = self
-            .lan
-            .remove(&lan_idx)
-            .unwrap_or_else(|| (key.clone(), Vec::new()));
-        lan.1.append(
-            &mut ctrl
-                .add_lan(
-                    key,
-                    external,
-                    SocketAddr::new(self.ip.into(), internal),
-                    connect_ssl,
-                )
-                .await?,
-        );
-        self.lan.insert(lan_idx, lan);
-        Ok(())
-    }
-    pub async fn remove_lan(&mut self, id: HostId, external: u16) -> Result<(), Error> {
-        let ctrl = self.net_controller()?;
-        if let Some((key, rcs)) = self.lan.remove(&(id, external)) {
-            ctrl.remove_lan(&key, external, rcs).await?;
+        let tor_binds: OrdMap<u16, SocketAddr> = host
+            .bindings
+            .iter()
+            .flat_map(|(internal, info)| {
+                let non_ssl = (
+                    info.options.preferred_external_port,
+                    SocketAddr::from((self.ip, *internal)),
+                );
+                if let (Some(ssl), Some(ssl_internal)) =
+                    (&info.options.add_ssl, info.assigned_lan_port)
+                {
+                    itertools::Either::Left(
+                        [
+                            (
+                                ssl.preferred_external_port,
+                                SocketAddr::from(([127, 0, 0, 1], ssl_internal)),
+                            ),
+                            non_ssl,
+                        ]
+                        .into_iter(),
+                    )
+                } else {
+                    itertools::Either::Right([non_ssl].into_iter())
+                }
+            })
+            .collect();
+        let mut keep_tor_addrs = BTreeSet::new();
+        for addr in match host.kind {
+            HostKind::Multi => {
+                // itertools::Either::Left(
+                host.addresses.iter()
+                // )
+            } // HostKind::Single | HostKind::Static => itertools::Either::Right(&host.primary),
+        } {
+            match addr {
+                HostAddress::Onion { address } => {
+                    keep_tor_addrs.insert(address);
+                    let old_tor_bind = binds.tor.remove(address);
+                    let tor_bind = old_tor_bind.filter(|(ports, _)| ports == &tor_binds);
+                    let new_tor_bind = if let Some(tor_bind) = tor_bind {
+                        tor_bind
+                    } else {
+                        let key = ctrl
+                            .db
+                            .peek()
+                            .await
+                            .into_private()
+                            .into_key_store()
+                            .into_onion()
+                            .get_key(address)?;
+                        let rcs = ctrl
+                            .tor
+                            .add(key, tor_binds.clone().into_iter().collect())
+                            .await?;
+                        (tor_binds.clone(), rcs)
+                    };
+                    binds.tor.insert(address.clone(), new_tor_bind);
+                }
+            }
+        }
+        for addr in binds.tor.keys() {
+            if !keep_tor_addrs.contains(addr) {
+                ctrl.tor.gc(Some(addr.clone()), None).await?;
+            }
         }
         Ok(())
     }
-    pub async fn export_cert<Ex>(
-        &self,
-        secrets: &mut Ex,
-        id: &HostId,
-        ip: IpAddr,
-    ) -> Result<(), Error>
-    where
-        for<'a> &'a mut Ex: PgExecutor<'a>,
-    {
-        let key = Key::for_host(secrets, Some((self.id.clone(), id.clone()))).await?;
-        let ctrl = self.net_controller()?;
-        let cert = ctrl.ssl.with_certs(key, ip).await?;
-        let cert_dir = cert_dir(&self.id, id);
-        tokio::fs::create_dir_all(&cert_dir).await?;
-        export_key(
-            &cert.key().openssl_key_nistp256(),
-            &cert_dir.join(format!("{id}.key.pem")),
-        )
-        .await?;
-        export_cert(
-            &cert.fullchain_nistp256(),
-            &cert_dir.join(format!("{id}.cert.pem")),
-        )
-        .await?; // TODO: can upgrade to ed25519?
-        Ok(())
-    }
+
     pub async fn remove_all(mut self) -> Result<(), Error> {
         self.shutdown = true;
         let mut errors = ErrorCollection::new();
         if let Some(ctrl) = Weak::upgrade(&self.controller) {
-            for ((_, external), (key, rcs)) in std::mem::take(&mut self.lan) {
-                errors.handle(ctrl.remove_lan(&key, external, rcs).await);
-            }
-            for ((_, external), (key, rcs)) in std::mem::take(&mut self.tor) {
-                errors.handle(ctrl.remove_tor(&key, external, rcs).await);
+            for (_, binds) in std::mem::take(&mut self.binds) {
+                for (_, (external, ssl, rc)) in binds.lan {
+                    drop(rc);
+                    if ssl.is_some() {
+                        errors.handle(ctrl.vhost.gc(None, external).await);
+                    } else {
+                        errors.handle(ctrl.forward.gc(external).await);
+                    }
+                }
+                for (addr, (_, rcs)) in binds.tor {
+                    drop(rcs);
+                    errors.handle(ctrl.tor.gc(Some(addr), None).await);
+                }
             }
             std::mem::take(&mut self.dns);
             errors.handle(ctrl.dns.gc(Some(self.id.clone()), self.ip).await);
@@ -357,8 +401,7 @@ impl Drop for NetService {
                     ip: Ipv4Addr::new(0, 0, 0, 0),
                     dns: Default::default(),
                     controller: Default::default(),
-                    tor: Default::default(),
-                    lan: Default::default(),
+                    binds: BTreeMap::new(),
                 },
             );
             tokio::spawn(async move { svc.remove_all().await.unwrap() });
diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index f9502c86b..44d7cf0da 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -5,6 +5,7 @@ use std::path::Path;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use futures::FutureExt;
+use imbl_value::InternedString;
 use libc::time_t;
 use openssl::asn1::{Asn1Integer, Asn1Time};
 use openssl::bn::{BigNum, MsbOption};
@@ -14,17 +15,137 @@ use openssl::nid::Nid;
 use openssl::pkey::{PKey, Private};
 use openssl::x509::{X509Builder, X509Extension, X509NameBuilder, X509};
 use openssl::*;
-use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
-use tokio::sync::{Mutex, RwLock};
+use patch_db::HasModel;
+use serde::{Deserialize, Serialize};
+use tokio::sync::Mutex;
 use tracing::instrument;
 
 use crate::account::AccountInfo;
-use crate::context::{CliContext, RpcContext};
 use crate::hostname::Hostname;
 use crate::init::check_time_is_synchronized;
-use crate::net::dhcp::ips;
-use crate::net::keys::{Key, KeyInfo};
-use crate::{Error, ErrorKind, ResultExt, SOURCE_DATE};
+use crate::prelude::*;
+use crate::util::serde::Pem;
+use crate::SOURCE_DATE;
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[model = "Model<Self>"]
+#[serde(rename_all = "kebab-case")]
+pub struct CertStore {
+    pub root_key: Pem<PKey<Private>>,
+    pub root_cert: Pem<X509>,
+    pub int_key: Pem<PKey<Private>>,
+    pub int_cert: Pem<X509>,
+    pub leaves: BTreeMap<JsonKey<BTreeSet<InternedString>>, CertData>,
+}
+impl CertStore {
+    pub fn new(account: &AccountInfo) -> Result<Self, Error> {
+        let int_key = generate_key()?;
+        let int_cert = make_int_cert((&account.root_ca_key, &account.root_ca_cert), &int_key)?;
+        Ok(Self {
+            root_key: Pem::new(account.root_ca_key.clone()),
+            root_cert: Pem::new(account.root_ca_cert.clone()),
+            int_key: Pem::new(int_key),
+            int_cert: Pem::new(int_cert),
+            leaves: BTreeMap::new(),
+        })
+    }
+}
+impl Model<CertStore> {
+    /// This function will grant any cert for any domain. It is up to the *caller* to enusure that the calling service has permission to sign a cert for the requested domain
+    pub fn cert_for(
+        &mut self,
+        hostnames: &BTreeSet<InternedString>,
+    ) -> Result<FullchainCertData, Error> {
+        let keys = if let Some(cert_data) = self
+            .as_leaves()
+            .as_idx(JsonKey::new_ref(hostnames))
+            .map(|m| m.de())
+            .transpose()?
+        {
+            if cert_data
+                .certs
+                .ed25519
+                .not_before()
+                .compare(Asn1Time::days_from_now(0)?.as_ref())?
+                == Ordering::Less
+                && cert_data
+                    .certs
+                    .ed25519
+                    .not_after()
+                    .compare(Asn1Time::days_from_now(30)?.as_ref())?
+                    == Ordering::Greater
+                && cert_data
+                    .certs
+                    .nistp256
+                    .not_before()
+                    .compare(Asn1Time::days_from_now(0)?.as_ref())?
+                    == Ordering::Less
+                && cert_data
+                    .certs
+                    .nistp256
+                    .not_after()
+                    .compare(Asn1Time::days_from_now(30)?.as_ref())?
+                    == Ordering::Greater
+            {
+                return Ok(FullchainCertData {
+                    root: self.as_root_cert().de()?.0,
+                    int: self.as_int_cert().de()?.0,
+                    leaf: cert_data,
+                });
+            }
+            cert_data.keys
+        } else {
+            PKeyPair {
+                ed25519: PKey::generate_ed25519()?,
+                nistp256: PKey::from_ec_key(EcKey::generate(&*EcGroup::from_curve_name(
+                    Nid::X9_62_PRIME256V1,
+                )?)?)?,
+            }
+        };
+        let int_key = self.as_int_key().de()?.0;
+        let int_cert = self.as_int_cert().de()?.0;
+        let cert_data = CertData {
+            certs: CertPair {
+                ed25519: make_leaf_cert(
+                    (&int_key, &int_cert),
+                    (&keys.ed25519, &SANInfo::new(hostnames)),
+                )?,
+                nistp256: make_leaf_cert(
+                    (&int_key, &int_cert),
+                    (&keys.nistp256, &SANInfo::new(hostnames)),
+                )?,
+            },
+            keys,
+        };
+        self.as_leaves_mut()
+            .insert(JsonKey::new_ref(hostnames), &cert_data)?;
+        Ok(FullchainCertData {
+            root: self.as_root_cert().de()?.0,
+            int: self.as_int_cert().de()?.0,
+            leaf: cert_data,
+        })
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct CertData {
+    pub keys: PKeyPair,
+    pub certs: CertPair,
+}
+
+pub struct FullchainCertData {
+    pub root: X509,
+    pub int: X509,
+    pub leaf: CertData,
+}
+impl FullchainCertData {
+    pub fn fullchain_ed25519(&self) -> Vec<&X509> {
+        vec![&self.root, &self.int, &self.leaf.certs.ed25519]
+    }
+    pub fn fullchain_nistp256(&self) -> Vec<&X509> {
+        vec![&self.root, &self.int, &self.leaf.certs.nistp256]
+    }
+}
 
 static CERTIFICATE_VERSION: i32 = 2; // X509 version 3 is actually encoded as '2' in the cert because fuck you.
 
@@ -35,63 +156,21 @@ fn unix_time(time: SystemTime) -> time_t {
         .unwrap_or_default()
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct PKeyPair {
+    #[serde(with = "crate::util::serde::pem")]
+    pub ed25519: PKey<Private>,
+    #[serde(with = "crate::util::serde::pem")]
+    pub nistp256: PKey<Private>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize)]
 pub struct CertPair {
+    #[serde(with = "crate::util::serde::pem")]
     pub ed25519: X509,
+    #[serde(with = "crate::util::serde::pem")]
     pub nistp256: X509,
 }
-impl CertPair {
-    fn updated(
-        pair: Option<&Self>,
-        hostname: &Hostname,
-        signer: (&PKey<Private>, &X509),
-        applicant: &Key,
-        ip: BTreeSet<IpAddr>,
-    ) -> Result<(Self, bool), Error> {
-        let mut updated = false;
-        let mut updated_cert = |cert: Option<&X509>, osk: PKey<Private>| -> Result<X509, Error> {
-            let mut ips = BTreeSet::new();
-            if let Some(cert) = cert {
-                ips.extend(
-                    cert.subject_alt_names()
-                        .iter()
-                        .flatten()
-                        .filter_map(|a| a.ipaddress())
-                        .filter_map(|a| match a.len() {
-                            4 => Some::<IpAddr>(<[u8; 4]>::try_from(a).unwrap().into()),
-                            16 => Some::<IpAddr>(<[u8; 16]>::try_from(a).unwrap().into()),
-                            _ => None,
-                        }),
-                );
-                if cert
-                    .not_before()
-                    .compare(Asn1Time::days_from_now(0)?.as_ref())?
-                    == Ordering::Less
-                    && cert
-                        .not_after()
-                        .compare(Asn1Time::days_from_now(30)?.as_ref())?
-                        == Ordering::Greater
-                    && ips.is_superset(&ip)
-                {
-                    return Ok(cert.clone());
-                }
-            }
-            ips.extend(ip.iter().copied());
-            updated = true;
-            make_leaf_cert(signer, (&osk, &SANInfo::new(&applicant, hostname, ips)))
-        };
-        Ok((
-            Self {
-                ed25519: updated_cert(pair.map(|c| &c.ed25519), applicant.openssl_key_ed25519())?,
-                nistp256: updated_cert(
-                    pair.map(|c| &c.nistp256),
-                    applicant.openssl_key_nistp256(),
-                )?,
-            },
-            updated,
-        ))
-    }
-}
 
 pub async fn root_ca_start_time() -> Result<SystemTime, Error> {
     Ok(if check_time_is_synchronized().await? {
@@ -101,51 +180,6 @@ pub async fn root_ca_start_time() -> Result<SystemTime, Error> {
     })
 }
 
-#[derive(Debug)]
-pub struct SslManager {
-    hostname: Hostname,
-    root_cert: X509,
-    int_key: PKey<Private>,
-    int_cert: X509,
-    cert_cache: RwLock<BTreeMap<Key, CertPair>>,
-}
-impl SslManager {
-    pub fn new(account: &AccountInfo, start_time: SystemTime) -> Result<Self, Error> {
-        let int_key = generate_key()?;
-        let int_cert = make_int_cert(
-            (&account.root_ca_key, &account.root_ca_cert),
-            &int_key,
-            start_time,
-        )?;
-        Ok(Self {
-            hostname: account.hostname.clone(),
-            root_cert: account.root_ca_cert.clone(),
-            int_key,
-            int_cert,
-            cert_cache: RwLock::new(BTreeMap::new()),
-        })
-    }
-    pub async fn with_certs(&self, key: Key, ip: IpAddr) -> Result<KeyInfo, Error> {
-        let mut ips = ips().await?;
-        ips.insert(ip);
-        let (pair, updated) = CertPair::updated(
-            self.cert_cache.read().await.get(&key),
-            &self.hostname,
-            (&self.int_key, &self.int_cert),
-            &key,
-            ips,
-        )?;
-        if updated {
-            self.cert_cache
-                .write()
-                .await
-                .insert(key.clone(), pair.clone());
-        }
-
-        Ok(key.with_certs(pair, self.int_cert.clone(), self.root_cert.clone()))
-    }
-}
-
 const EC_CURVE_NAME: nid::Nid = nid::Nid::X9_62_PRIME256V1;
 lazy_static::lazy_static! {
     static ref EC_GROUP: EcGroup = EcGroup::from_curve_name(EC_CURVE_NAME).unwrap();
@@ -245,18 +279,13 @@ pub fn make_root_cert(
 pub fn make_int_cert(
     signer: (&PKey<Private>, &X509),
     applicant: &PKey<Private>,
-    start_time: SystemTime,
 ) -> Result<X509, Error> {
     let mut builder = X509Builder::new()?;
     builder.set_version(CERTIFICATE_VERSION)?;
 
-    let unix_start_time = unix_time(start_time);
+    builder.set_not_before(signer.1.not_before())?;
 
-    let embargo = Asn1Time::from_unix(unix_start_time - 86400)?;
-    builder.set_not_before(&embargo)?;
-
-    let expiration = Asn1Time::from_unix(unix_start_time + (10 * 364 * 86400))?;
-    builder.set_not_after(&expiration)?;
+    builder.set_not_after(signer.1.not_after())?;
 
     builder.set_serial_number(&*rand_serial()?)?;
 
@@ -309,13 +338,13 @@ pub fn make_int_cert(
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum MaybeWildcard {
     WithWildcard(String),
-    WithoutWildcard(String),
+    WithoutWildcard(InternedString),
 }
 impl MaybeWildcard {
     pub fn as_str(&self) -> &str {
         match self {
             MaybeWildcard::WithWildcard(s) => s.as_str(),
-            MaybeWildcard::WithoutWildcard(s) => s.as_str(),
+            MaybeWildcard::WithoutWildcard(s) => &**s,
         }
     }
 }
@@ -334,18 +363,16 @@ pub struct SANInfo {
     pub ips: BTreeSet<IpAddr>,
 }
 impl SANInfo {
-    pub fn new(key: &Key, hostname: &Hostname, ips: BTreeSet<IpAddr>) -> Self {
+    pub fn new(hostnames: &BTreeSet<InternedString>) -> Self {
         let mut dns = BTreeSet::new();
-        if let Some((id, _)) = key.host() {
-            dns.insert(MaybeWildcard::WithWildcard(format!("{id}.embassy")));
-            dns.insert(MaybeWildcard::WithWildcard(key.local_address().to_string()));
-        } else {
-            dns.insert(MaybeWildcard::WithoutWildcard("embassy".to_owned()));
-            dns.insert(MaybeWildcard::WithWildcard(hostname.local_domain_name()));
-            dns.insert(MaybeWildcard::WithoutWildcard(hostname.no_dot_host_name()));
-            dns.insert(MaybeWildcard::WithoutWildcard("localhost".to_owned()));
+        let mut ips = BTreeSet::new();
+        for hostname in hostnames {
+            if let Ok(ip) = hostname.parse::<IpAddr>() {
+                ips.insert(ip);
+            } else {
+                dns.insert(MaybeWildcard::WithoutWildcard(hostname.clone())); // TODO: wildcards?
+            }
         }
-        dns.insert(MaybeWildcard::WithWildcard(key.tor_address().to_string()));
         Self { dns, ips }
     }
 }
@@ -443,14 +470,3 @@ pub fn make_leaf_cert(
     let cert = builder.build();
     Ok(cert)
 }
-
-pub fn ssl() -> ParentHandler {
-    ParentHandler::new().subcommand("size", from_fn_async(size).with_remote_cli::<CliContext>())
-}
-
-pub async fn size(ctx: RpcContext) -> Result<String, Error> {
-    Ok(format!(
-        "Cert Catch size: {}",
-        ctx.net_controller.ssl.cert_cache.read().await.len()
-    ))
-}
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index 68f071c79..fec881795 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -11,7 +11,6 @@ use axum::routing::{any, get, post};
 use axum::Router;
 use digest::Digest;
 use futures::future::ready;
-use futures::{FutureExt, TryFutureExt};
 use http::header::ACCEPT_ENCODING;
 use http::request::Parts as RequestParts;
 use http::{HeaderMap, Method, StatusCode};
@@ -28,7 +27,6 @@ use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext
 use crate::core::rpc_continuations::RequestGuid;
 use crate::db::subscribe;
 use crate::hostname::Hostname;
-use crate::install::PKG_PUBLIC_DIR;
 use crate::middleware::auth::{Auth, HasValidSession};
 use crate::middleware::cors::Cors;
 use crate::middleware::db::SyncDb;
@@ -131,8 +129,7 @@ pub fn main_ui_server_router(ctx: RpcContext) -> Router {
             "/ws/rpc/*path",
             get({
                 let ctx = ctx.clone();
-                move |headers: HeaderMap,
-                      x::Path(path): x::Path<String>,
+                move |x::Path(path): x::Path<String>,
                       ws: axum::extract::ws::WebSocketUpgrade| async move {
                     match RequestGuid::from(&path) {
                         None => {
@@ -155,7 +152,6 @@ pub fn main_ui_server_router(ctx: RpcContext) -> Router {
                     let path = request
                         .uri()
                         .path()
-                        .clone()
                         .strip_prefix("/rest/rpc/")
                         .unwrap_or_default();
                     match RequestGuid::from(&path) {
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 13096dab8..171404ceb 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -28,13 +28,44 @@ use crate::logs::{
     cli_logs_generic_follow, cli_logs_generic_nofollow, fetch_logs, follow_logs, journalctl,
     LogFollowResponse, LogResponse, LogSource,
 };
+use crate::prelude::*;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::util::Invoke;
-use crate::{Error, ErrorKind, ResultExt as _};
 
 pub const SYSTEMD_UNIT: &str = "tor@default";
 const STARTING_HEALTH_TIMEOUT: u64 = 120; // 2min
 
+#[derive(Debug, Default, Deserialize, Serialize)]
+pub struct OnionStore(BTreeMap<OnionAddressV3, TorSecretKeyV3>);
+impl Map for OnionStore {
+    type Key = OnionAddressV3;
+    type Value = TorSecretKeyV3;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key.get_address_without_dot_onion())
+    }
+}
+impl OnionStore {
+    pub fn new() -> Self {
+        Self::default()
+    }
+    pub fn insert(&mut self, key: TorSecretKeyV3) {
+        self.0.insert(key.public().get_onion_address(), key);
+    }
+}
+impl Model<OnionStore> {
+    pub fn new_key(&mut self) -> Result<TorSecretKeyV3, Error> {
+        let key = TorSecretKeyV3::generate();
+        self.insert(&key.public().get_onion_address(), &key)?;
+        Ok(key)
+    }
+    pub fn insert_key(&mut self, key: &TorSecretKeyV3) -> Result<(), Error> {
+        self.insert(&key.public().get_onion_address(), &key)
+    }
+    pub fn get_key(&self, address: &OnionAddressV3) -> Result<TorSecretKeyV3, Error> {
+        self.as_idx(address).or_not_found(address)?.de()
+    }
+}
+
 enum ErrorLogSeverity {
     Fatal { wipe_state: bool },
     Unknown { wipe_state: bool },
@@ -208,33 +239,29 @@ impl TorController {
     pub async fn add(
         &self,
         key: TorSecretKeyV3,
-        external: u16,
-        target: SocketAddr,
-    ) -> Result<Arc<()>, Error> {
+        bindings: Vec<(u16, SocketAddr)>,
+    ) -> Result<Vec<Arc<()>>, Error> {
         let (reply, res) = oneshot::channel();
         self.0
             .send
             .send(TorCommand::AddOnion {
                 key,
-                external,
-                target,
+                bindings,
                 reply,
             })
-            .ok()
-            .ok_or_else(|| Error::new(eyre!("TorControl died"), ErrorKind::Tor))?;
+            .map_err(|_| Error::new(eyre!("TorControl died"), ErrorKind::Tor))?;
         res.await
-            .ok()
-            .ok_or_else(|| Error::new(eyre!("TorControl died"), ErrorKind::Tor))
+            .map_err(|_| Error::new(eyre!("TorControl died"), ErrorKind::Tor))
     }
 
     pub async fn gc(
         &self,
-        key: Option<TorSecretKeyV3>,
+        addr: Option<OnionAddressV3>,
         external: Option<u16>,
     ) -> Result<(), Error> {
         self.0
             .send
-            .send(TorCommand::GC { key, external })
+            .send(TorCommand::GC { addr, external })
             .ok()
             .ok_or_else(|| Error::new(eyre!("TorControl died"), ErrorKind::Tor))
     }
@@ -279,12 +306,11 @@ type AuthenticatedConnection = AuthenticatedConn<
 enum TorCommand {
     AddOnion {
         key: TorSecretKeyV3,
-        external: u16,
-        target: SocketAddr,
-        reply: oneshot::Sender<Arc<()>>,
+        bindings: Vec<(u16, SocketAddr)>,
+        reply: oneshot::Sender<Vec<Arc<()>>>,
     },
     GC {
-        key: Option<TorSecretKeyV3>,
+        addr: Option<OnionAddressV3>,
         external: Option<u16>,
     },
     GetInfo {
@@ -302,7 +328,13 @@ async fn torctl(
     tor_control: SocketAddr,
     tor_socks: SocketAddr,
     recv: &mut mpsc::UnboundedReceiver<TorCommand>,
-    services: &mut BTreeMap<[u8; 64], BTreeMap<u16, BTreeMap<SocketAddr, Weak<()>>>>,
+    services: &mut BTreeMap<
+        OnionAddressV3,
+        (
+            TorSecretKeyV3,
+            BTreeMap<u16, BTreeMap<SocketAddr, Weak<()>>>,
+        ),
+    >,
     wipe_state: &AtomicBool,
     health_timeout: &mut Duration,
 ) -> Result<(), Error> {
@@ -420,27 +452,32 @@ async fn torctl(
             match command {
                 TorCommand::AddOnion {
                     key,
-                    external,
-                    target,
+                    bindings,
                     reply,
                 } => {
-                    let mut service = if let Some(service) = services.remove(&key.as_bytes()) {
+                    let addr = key.public().get_onion_address();
+                    let mut service = if let Some((_key, service)) = services.remove(&addr) {
+                        debug_assert_eq!(key, _key);
                         service
                     } else {
                         BTreeMap::new()
                     };
-                    let mut binding = service.remove(&external).unwrap_or_default();
-                    let rc = if let Some(rc) =
-                        Weak::upgrade(&binding.remove(&target).unwrap_or_default())
-                    {
-                        rc
-                    } else {
-                        Arc::new(())
-                    };
-                    binding.insert(target, Arc::downgrade(&rc));
-                    service.insert(external, binding);
-                    services.insert(key.as_bytes(), service);
-                    reply.send(rc).unwrap_or_default();
+                    let mut rcs = Vec::with_capacity(bindings.len());
+                    for (external, target) in bindings {
+                        let mut binding = service.remove(&external).unwrap_or_default();
+                        let rc = if let Some(rc) =
+                            Weak::upgrade(&binding.remove(&target).unwrap_or_default())
+                        {
+                            rc
+                        } else {
+                            Arc::new(())
+                        };
+                        binding.insert(target, Arc::downgrade(&rc));
+                        service.insert(external, binding);
+                        rcs.push(rc);
+                    }
+                    services.insert(addr, (key, service));
+                    reply.send(rcs).unwrap_or_default();
                 }
                 TorCommand::GetInfo { reply, .. } => {
                     reply
@@ -480,8 +517,7 @@ async fn torctl(
         )
         .await?;
 
-    for (key, service) in std::mem::take(services) {
-        let key = TorSecretKeyV3::from(key);
+    for (addr, (key, service)) in std::mem::take(services) {
         let bindings = service
             .iter()
             .flat_map(|(ext, int)| {
@@ -491,7 +527,7 @@ async fn torctl(
             })
             .collect::<Vec<_>>();
         if !bindings.is_empty() {
-            services.insert(key.as_bytes(), service);
+            services.insert(addr, (key.clone(), service));
             connection
                 .add_onion_v3(&key, false, false, false, None, &mut bindings.iter())
                 .await?;
@@ -503,31 +539,33 @@ async fn torctl(
             match command {
                 TorCommand::AddOnion {
                     key,
-                    external,
-                    target,
+                    bindings,
                     reply,
                 } => {
                     let mut rm_res = Ok(());
-                    let onion_base = key
-                        .public()
-                        .get_onion_address()
-                        .get_address_without_dot_onion();
-                    let mut service = if let Some(service) = services.remove(&key.as_bytes()) {
+                    let addr = key.public().get_onion_address();
+                    let onion_base = addr.get_address_without_dot_onion();
+                    let mut service = if let Some((_key, service)) = services.remove(&addr) {
+                        debug_assert_eq!(_key, key);
                         rm_res = connection.del_onion(&onion_base).await;
                         service
                     } else {
                         BTreeMap::new()
                     };
-                    let mut binding = service.remove(&external).unwrap_or_default();
-                    let rc = if let Some(rc) =
-                        Weak::upgrade(&binding.remove(&target).unwrap_or_default())
-                    {
-                        rc
-                    } else {
-                        Arc::new(())
-                    };
-                    binding.insert(target, Arc::downgrade(&rc));
-                    service.insert(external, binding);
+                    let mut rcs = Vec::with_capacity(bindings.len());
+                    for (external, target) in bindings {
+                        let mut binding = service.remove(&external).unwrap_or_default();
+                        let rc = if let Some(rc) =
+                            Weak::upgrade(&binding.remove(&target).unwrap_or_default())
+                        {
+                            rc
+                        } else {
+                            Arc::new(())
+                        };
+                        binding.insert(target, Arc::downgrade(&rc));
+                        service.insert(external, binding);
+                        rcs.push(rc);
+                    }
                     let bindings = service
                         .iter()
                         .flat_map(|(ext, int)| {
@@ -536,25 +574,21 @@ async fn torctl(
                                 .map(|(addr, _)| (*ext, SocketAddr::from(*addr)))
                         })
                         .collect::<Vec<_>>();
-                    services.insert(key.as_bytes(), service);
-                    reply.send(rc).unwrap_or_default();
+                    services.insert(addr, (key.clone(), service));
+                    reply.send(rcs).unwrap_or_default();
                     rm_res?;
                     connection
                         .add_onion_v3(&key, false, false, false, None, &mut bindings.iter())
                         .await?;
                 }
-                TorCommand::GC { key, external } => {
-                    for key in if key.is_some() {
-                        itertools::Either::Left(key.into_iter().map(|k| k.as_bytes()))
+                TorCommand::GC { addr, external } => {
+                    for addr in if addr.is_some() {
+                        itertools::Either::Left(addr.into_iter())
                     } else {
                         itertools::Either::Right(services.keys().cloned().collect_vec().into_iter())
                     } {
-                        let key = TorSecretKeyV3::from(key);
-                        let onion_base = key
-                            .public()
-                            .get_onion_address()
-                            .get_address_without_dot_onion();
-                        if let Some(mut service) = services.remove(&key.as_bytes()) {
+                        if let Some((key, mut service)) = services.remove(&addr) {
+                            let onion_base: String = addr.get_address_without_dot_onion();
                             for external in if external.is_some() {
                                 itertools::Either::Left(external.into_iter())
                             } else {
@@ -583,7 +617,7 @@ async fn torctl(
                                     })
                                     .collect::<Vec<_>>();
                                 if !bindings.is_empty() {
-                                    services.insert(key.as_bytes(), service);
+                                    services.insert(addr, (key.clone(), service));
                                 }
                                 rm_res?;
                                 if !bindings.is_empty() {
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index 3d60544db..88cb759a0 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -5,7 +5,9 @@ use std::time::Duration;
 
 use color_eyre::eyre::eyre;
 use helpers::NonDetachingJoinHandle;
+use imbl_value::InternedString;
 use models::ResultExt;
+use serde::{Deserialize, Serialize};
 use tokio::net::{TcpListener, TcpStream};
 use tokio::sync::{Mutex, RwLock};
 use tokio_rustls::rustls::pki_types::{
@@ -16,38 +18,36 @@ use tokio_rustls::rustls::{RootCertStore, ServerConfig};
 use tokio_rustls::{LazyConfigAcceptor, TlsConnector};
 use tracing::instrument;
 
-use crate::net::keys::Key;
-use crate::net::ssl::SslManager;
 use crate::prelude::*;
 use crate::util::io::{BackTrackingReader, TimeoutStream};
+use crate::util::serde::MaybeUtf8String;
 
 // not allowed: <=1024, >=32768, 5355, 5432, 9050, 6010, 9051, 5353
 
 pub struct VHostController {
-    ssl: Arc<SslManager>,
+    db: PatchDb,
     servers: Mutex<BTreeMap<u16, VHostServer>>,
 }
 impl VHostController {
-    pub fn new(ssl: Arc<SslManager>) -> Self {
+    pub fn new(db: PatchDb) -> Self {
         Self {
-            ssl,
+            db,
             servers: Mutex::new(BTreeMap::new()),
         }
     }
     #[instrument(skip_all)]
     pub async fn add(
         &self,
-        key: Key,
         hostname: Option<String>,
         external: u16,
         target: SocketAddr,
-        connect_ssl: Result<(), AlpnInfo>,
+        connect_ssl: Result<(), AlpnInfo>, // Ok: yes, connect using ssl, pass through alpn; Err: connect tcp, use provided strategy for alpn
     ) -> Result<Arc<()>, Error> {
         let mut writable = self.servers.lock().await;
         let server = if let Some(server) = writable.remove(&external) {
             server
         } else {
-            VHostServer::new(external, self.ssl.clone()).await?
+            VHostServer::new(external, self.db.clone()).await?
         };
         let rc = server
             .add(
@@ -55,7 +55,6 @@ impl VHostController {
                 TargetInfo {
                     addr: target,
                     connect_ssl,
-                    key,
                 },
             )
             .await;
@@ -79,13 +78,18 @@ impl VHostController {
 struct TargetInfo {
     addr: SocketAddr,
     connect_ssl: Result<(), AlpnInfo>,
-    key: Key,
 }
 
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub enum AlpnInfo {
     Reflect,
-    Specified(Vec<Vec<u8>>),
+    Specified(Vec<MaybeUtf8String>),
+}
+impl Default for AlpnInfo {
+    fn default() -> Self {
+        Self::Reflect
+    }
 }
 
 struct VHostServer {
@@ -94,7 +98,7 @@ struct VHostServer {
 }
 impl VHostServer {
     #[instrument(skip_all)]
-    async fn new(port: u16, ssl: Arc<SslManager>) -> Result<Self, Error> {
+    async fn new(port: u16, db: PatchDb) -> Result<Self, Error> {
         // check if port allowed
         let listener = TcpListener::bind(SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), port))
             .await
@@ -105,13 +109,13 @@ impl VHostServer {
             _thread: tokio::spawn(async move {
                 loop {
                     match listener.accept().await {
-                        Ok((stream, _)) => {
+                        Ok((stream, sock_addr)) => {
                             let stream =
                                 Box::pin(TimeoutStream::new(stream, Duration::from_secs(300)));
                             let mut stream = BackTrackingReader::new(stream);
                             stream.start_buffering();
                             let mapping = mapping.clone();
-                            let ssl = ssl.clone();
+                            let db = db.clone();
                             tokio::spawn(async move {
                                 if let Err(e) = async {
                                     let mid = match LazyConfigAcceptor::new(
@@ -167,6 +171,7 @@ impl VHostServer {
                                             .find(|(_, rc)| rc.strong_count() > 0)
                                             .or_else(|| {
                                                 if target_name
+                                                    .as_ref()
                                                     .map(|s| s.parse::<IpAddr>().is_ok())
                                                     .unwrap_or(true)
                                                 {
@@ -184,8 +189,22 @@ impl VHostServer {
                                     if let Some(target) = target {
                                         let mut tcp_stream =
                                             TcpStream::connect(target.addr).await?;
-                                        let key =
-                                            ssl.with_certs(target.key, target.addr.ip()).await?;
+                                        let hostnames = target_name
+                                            .as_ref()
+                                            .into_iter()
+                                            .map(InternedString::intern)
+                                            .chain(std::iter::once(InternedString::from_display(
+                                                &sock_addr.ip(),
+                                            )))
+                                            .collect();
+                                        let key = db
+                                            .mutate(|v| {
+                                                v.as_private_mut()
+                                                    .as_key_store_mut()
+                                                    .as_local_certs_mut()
+                                                    .cert_for(&hostnames)
+                                            })
+                                            .await?;
                                         let cfg = ServerConfig::builder()
                                             .with_no_client_auth();
                                         let mut cfg =
@@ -202,8 +221,9 @@ impl VHostServer {
                                                         })
                                                         .collect::<Result<_, Error>>()?,
                                                     PrivateKeyDer::from(PrivatePkcs8KeyDer::from(
-                                                        key.key()
-                                                            .openssl_key_ed25519()
+                                                        key.leaf
+                                                            .keys
+                                                            .ed25519
                                                             .private_key_to_pkcs8()?,
                                                     )),
                                                 )
@@ -218,8 +238,9 @@ impl VHostServer {
                                                         })
                                                         .collect::<Result<_, Error>>()?,
                                                     PrivateKeyDer::from(PrivatePkcs8KeyDer::from(
-                                                        key.key()
-                                                            .openssl_key_nistp256()
+                                                        key.leaf
+                                                            .keys
+                                                            .nistp256
                                                             .private_key_to_pkcs8()?,
                                                     )),
                                                 )
@@ -233,7 +254,7 @@ impl VHostServer {
                                                             let mut store = RootCertStore::empty();
                                                             store.add(
                                                         CertificateDer::from(
-                                                            key.root_ca().to_der()?,
+                                                            key.root.to_der()?,
                                                         ),
                                                     ).with_kind(crate::ErrorKind::OpenSsl)?;
                                                             store
@@ -249,9 +270,9 @@ impl VHostServer {
                                                 let mut target_stream =
                                                     TlsConnector::from(Arc::new(client_cfg))
                                                         .connect_with(
-                                                            ServerName::try_from(
-                                                                key.key().internal_address(),
-                                                            ).with_kind(crate::ErrorKind::OpenSsl)?,
+                                                            ServerName::IpAddress(
+                                                                target.addr.ip().into(),
+                                                            ),
                                                             tcp_stream,
                                                             |conn| {
                                                                 cfg.alpn_protocols.extend(
@@ -302,7 +323,7 @@ impl VHostServer {
                                                 .await
                                             }
                                             Err(AlpnInfo::Specified(alpn)) => {
-                                                cfg.alpn_protocols = alpn;
+                                                cfg.alpn_protocols = alpn.into_iter().map(|a| a.0).collect();
                                                 let mut tls_stream =
                                                     match mid.into_stream(Arc::new(cfg)).await {
                                                         Ok(a) => a,
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index f16eab176..f696b27b7 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -1,24 +1,23 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 use std::fmt;
 use std::str::FromStr;
 
-use chrono::{DateTime, TimeZone, Utc};
+use chrono::{DateTime, Utc};
 use clap::builder::ValueParserFactory;
 use clap::Parser;
 use color_eyre::eyre::eyre;
+use imbl_value::InternedString;
 use models::PackageId;
 use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use sqlx::PgPool;
-use tokio::sync::Mutex;
 use tracing::instrument;
 
 use crate::backup::BackupReport;
 use crate::context::{CliContext, RpcContext};
+use crate::db::model::DatabaseModel;
 use crate::prelude::*;
 use crate::util::clap::FromStrParser;
 use crate::util::serde::HandlerExtSerde;
-use crate::{Error, ErrorKind, ResultExt};
 
 // #[command(subcommands(list, delete, delete_before, create))]
 pub fn notification() -> ParentHandler {
@@ -53,132 +52,102 @@ pub fn notification() -> ParentHandler {
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct ListParams {
-    before: Option<i32>,
-
-    limit: Option<u32>,
+    before: Option<u32>,
+    limit: Option<usize>,
 }
 // #[command(display(display_serializable))]
 #[instrument(skip_all)]
 pub async fn list(
     ctx: RpcContext,
     ListParams { before, limit }: ListParams,
-) -> Result<Vec<Notification>, Error> {
-    let limit = limit.unwrap_or(40);
-    match before {
-        None => {
-            let records = sqlx::query!(
-                "SELECT id, package_id, created_at, code, level, title, message, data FROM notifications ORDER BY id DESC LIMIT $1",
-                limit as i64
-            ).fetch_all(&ctx.secret_store).await?;
-            let notifs = records
-                .into_iter()
-                .map(|r| {
-                    Ok(Notification {
-                        id: r.id as u32,
-                        package_id: r.package_id.and_then(|p| p.parse().ok()),
-                        created_at: Utc.from_utc_datetime(&r.created_at),
-                        code: r.code as u32,
-                        level: match r.level.parse::<NotificationLevel>() {
-                            Ok(a) => a,
-                            Err(e) => return Err(e.into()),
-                        },
-                        title: r.title,
-                        message: r.message,
-                        data: match r.data {
-                            None => serde_json::Value::Null,
-                            Some(v) => match v.parse::<serde_json::Value>() {
-                                Ok(a) => a,
-                                Err(e) => {
-                                    return Err(Error::new(
-                                        eyre!("Invalid Notification Data: {}", e),
-                                        ErrorKind::ParseDbField,
-                                    ))
-                                }
-                            },
-                        },
-                    })
-                })
-                .collect::<Result<Vec<Notification>, Error>>()?;
-
-            ctx.db
-                .mutate(|d| {
-                    d.as_public_mut()
+) -> Result<Vec<NotificationWithId>, Error> {
+    ctx.db
+        .mutate(|db| {
+            let limit = limit.unwrap_or(40);
+            match before {
+                None => {
+                    let records = db
+                        .as_private()
+                        .as_notifications()
+                        .as_entries()?
+                        .into_iter()
+                        .take(limit);
+                    let notifs = records
+                        .into_iter()
+                        .map(|(id, notification)| {
+                            Ok(NotificationWithId {
+                                id,
+                                notification: notification.de()?,
+                            })
+                        })
+                        .collect::<Result<Vec<NotificationWithId>, Error>>()?;
+                    db.as_public_mut()
                         .as_server_info_mut()
                         .as_unread_notification_count_mut()
-                        .ser(&0)
-                })
-                .await?;
-            Ok(notifs)
-        }
-        Some(before) => {
-            let records = sqlx::query!(
-                "SELECT id, package_id, created_at, code, level, title, message, data FROM notifications WHERE id < $1 ORDER BY id DESC LIMIT $2",
-                before,
-                limit as i64
-            ).fetch_all(&ctx.secret_store).await?;
-            let res = records
-                .into_iter()
-                .map(|r| {
-                    Ok(Notification {
-                        id: r.id as u32,
-                        package_id: r.package_id.and_then(|p| p.parse().ok()),
-                        created_at: Utc.from_utc_datetime(&r.created_at),
-                        code: r.code as u32,
-                        level: match r.level.parse::<NotificationLevel>() {
-                            Ok(a) => a,
-                            Err(e) => return Err(e.into()),
-                        },
-                        title: r.title,
-                        message: r.message,
-                        data: match r.data {
-                            None => serde_json::Value::Null,
-                            Some(v) => match v.parse::<serde_json::Value>() {
-                                Ok(a) => a,
-                                Err(e) => {
-                                    return Err(Error::new(
-                                        eyre!("Invalid Notification Data: {}", e),
-                                        ErrorKind::ParseDbField,
-                                    ))
-                                }
-                            },
-                        },
-                    })
-                })
-                .collect::<Result<Vec<Notification>, Error>>()?;
-            Ok(res)
-        }
-    }
+                        .ser(&0)?;
+                    Ok(notifs)
+                }
+                Some(before) => {
+                    let records = db
+                        .as_private()
+                        .as_notifications()
+                        .as_entries()?
+                        .into_iter()
+                        .filter(|(id, _)| *id < before)
+                        .take(limit);
+                    records
+                        .into_iter()
+                        .map(|(id, notification)| {
+                            Ok(NotificationWithId {
+                                id,
+                                notification: notification.de()?,
+                            })
+                        })
+                        .collect()
+                }
+            }
+        })
+        .await
 }
 
 #[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteParams {
-    id: i32,
+    id: u32,
 }
 
 pub async fn delete(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Result<(), Error> {
-    sqlx::query!("DELETE FROM notifications WHERE id = $1", id)
-        .execute(&ctx.secret_store)
-        .await?;
-    Ok(())
+    ctx.db
+        .mutate(|db| {
+            db.as_private_mut().as_notifications_mut().remove(&id)?;
+            Ok(())
+        })
+        .await
 }
 #[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteBeforeParams {
-    before: i32,
+    before: u32,
 }
 
 pub async fn delete_before(
     ctx: RpcContext,
     DeleteBeforeParams { before }: DeleteBeforeParams,
 ) -> Result<(), Error> {
-    sqlx::query!("DELETE FROM notifications WHERE id < $1", before)
-        .execute(&ctx.secret_store)
-        .await?;
-    Ok(())
+    ctx.db
+        .mutate(|db| {
+            for id in db.as_private().as_notifications().keys()? {
+                if id < before {
+                    db.as_private_mut().as_notifications_mut().remove(&id)?;
+                }
+            }
+            Ok(())
+        })
+        .await
 }
+
 #[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
@@ -198,8 +167,8 @@ pub async fn create(
         message,
     }: CreateParams,
 ) -> Result<(), Error> {
-    ctx.notification_manager
-        .notify(ctx.db.clone(), package, level, title, message, (), None)
+    ctx.db
+        .mutate(|db| notify(db, package, level, title, message, ()))
         .await
 }
 
@@ -254,120 +223,95 @@ impl fmt::Display for InvalidNotificationLevel {
         write!(f, "Invalid Notification Level: {}", self.0)
     }
 }
-#[derive(Debug, serde::Serialize, serde::Deserialize)]
+
+#[derive(Debug, Default, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Notifications(pub BTreeMap<u32, Notification>);
+impl Notifications {
+    pub fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+}
+impl Map for Notifications {
+    type Key = u32;
+    type Value = Notification;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Self::key_string(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(InternedString::from_display(key))
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct Notification {
-    id: u32,
     package_id: Option<PackageId>,
     created_at: DateTime<Utc>,
     code: u32,
     level: NotificationLevel,
     title: String,
     message: String,
-    data: serde_json::Value,
+    data: Value,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct NotificationWithId {
+    id: u32,
+    #[serde(flatten)]
+    notification: Notification,
 }
 
 pub trait NotificationType:
     serde::Serialize + for<'de> serde::Deserialize<'de> + std::fmt::Debug
 {
-    const CODE: i32;
+    const CODE: u32;
 }
 
 impl NotificationType for () {
-    const CODE: i32 = 0;
+    const CODE: u32 = 0;
 }
 impl NotificationType for BackupReport {
-    const CODE: i32 = 1;
+    const CODE: u32 = 1;
 }
 
-pub struct NotificationManager {
-    sqlite: PgPool,
-    cache: Mutex<HashMap<(Option<PackageId>, NotificationLevel, String), i64>>,
-}
-impl NotificationManager {
-    pub fn new(sqlite: PgPool) -> Self {
-        NotificationManager {
-            sqlite,
-            cache: Mutex::new(HashMap::new()),
-        }
-    }
-    #[instrument(skip(db, subtype, self))]
-    pub async fn notify<T: NotificationType>(
-        &self,
-        db: PatchDb,
-        package_id: Option<PackageId>,
-        level: NotificationLevel,
-        title: String,
-        message: String,
-        subtype: T,
-        debounce_interval: Option<u32>,
-    ) -> Result<(), Error> {
-        let peek = db.peek().await;
-        if !self
-            .should_notify(&package_id, &level, &title, debounce_interval)
-            .await
-        {
-            return Ok(());
-        }
-        let mut count = peek
-            .as_public()
-            .as_server_info()
-            .as_unread_notification_count()
-            .de()?;
-        let sql_package_id = package_id.as_ref().map(|p| &**p);
-        let sql_code = T::CODE;
-        let sql_level = format!("{}", level);
-        let sql_data =
-            serde_json::to_string(&subtype).with_kind(crate::ErrorKind::Serialization)?;
-        sqlx::query!(
-        "INSERT INTO notifications (package_id, code, level, title, message, data) VALUES ($1, $2, $3, $4, $5, $6)",
-        sql_package_id,
-        sql_code as i32,
-        sql_level,
-        title,
-        message,
-        sql_data
-    ).execute(&self.sqlite).await?;
-        count += 1;
-        db.mutate(|db| {
-            db.as_public_mut()
-                .as_server_info_mut()
-                .as_unread_notification_count_mut()
-                .ser(&count)
-        })
-        .await
-    }
-    async fn should_notify(
-        &self,
-        package_id: &Option<PackageId>,
-        level: &NotificationLevel,
-        title: &String,
-        debounce_interval: Option<u32>,
-    ) -> bool {
-        let mut guard = self.cache.lock().await;
-        let k = (package_id.clone(), level.clone(), title.clone());
-        let v = (*guard).get(&k);
-        match v {
-            None => {
-                (*guard).insert(k, Utc::now().timestamp());
-                true
-            }
-            Some(last_issued) => match debounce_interval {
-                None => {
-                    (*guard).insert(k, Utc::now().timestamp());
-                    true
-                }
-                Some(interval) => {
-                    if last_issued + interval as i64 > Utc::now().timestamp() {
-                        false
-                    } else {
-                        (*guard).insert(k, Utc::now().timestamp());
-                        true
-                    }
-                }
-            },
-        }
-    }
+#[instrument(skip(subtype, db))]
+pub fn notify<T: NotificationType>(
+    db: &mut DatabaseModel,
+    package_id: Option<PackageId>,
+    level: NotificationLevel,
+    title: String,
+    message: String,
+    subtype: T,
+) -> Result<(), Error> {
+    let data = to_value(&subtype)?;
+    db.as_public_mut()
+        .as_server_info_mut()
+        .as_unread_notification_count_mut()
+        .mutate(|c| {
+            *c += 1;
+            Ok(())
+        })?;
+    let id = db
+        .as_private()
+        .as_notifications()
+        .keys()?
+        .into_iter()
+        .max()
+        .map_or(0, |id| id + 1);
+    db.as_private_mut().as_notifications_mut().insert(
+        &id,
+        &Notification {
+            package_id,
+            created_at: Utc::now(),
+            code: T::CODE,
+            level,
+            title,
+            message,
+            data,
+        },
+    )
 }
 
 #[test]
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 9f0033e96..95cfcec8f 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -133,7 +133,7 @@ pub async fn publish(
             .with_prefix("[1/3]")
             .with_message("Querying s9pk");
         pb.enable_steady_tick(Duration::from_millis(200));
-        let mut s9pk = S9pk::open(&path, None).await?;
+        let s9pk = S9pk::open(&path, None).await?;
         let m = s9pk.as_manifest().clone();
         pb.set_style(plain_line_style.clone());
         pb.abandon();
@@ -144,7 +144,7 @@ pub async fn publish(
             .with_prefix("[1/3]")
             .with_message("Verifying s9pk");
         pb.enable_steady_tick(Duration::from_millis(200));
-        let mut s9pk = S9pk::open(&path, None).await?;
+        let s9pk = S9pk::open(&path, None).await?;
         // s9pk.validate().await?;
         todo!();
         let m = s9pk.as_manifest().clone();
diff --git a/core/startos/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
index abddb3c1e..afd00032a 100644
--- a/core/startos/src/s9pk/merkle_archive/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/mod.rs
@@ -1,7 +1,5 @@
 use std::path::Path;
-use std::sync::Arc;
 
-use ed25519::signature::Keypair;
 use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
 use tokio::io::AsyncRead;
 
diff --git a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
index afb808471..7add68e6f 100644
--- a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
@@ -1,7 +1,7 @@
-use std::os::fd::{AsRawFd, FromRawFd, RawFd};
+use std::io::SeekFrom;
+use std::os::fd::{AsRawFd, RawFd};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use std::{borrow::Borrow, io::SeekFrom};
 
 use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncReadExt};
diff --git a/core/startos/src/service/config.rs b/core/startos/src/service/config.rs
index 06dc8bd55..e1294a465 100644
--- a/core/startos/src/service/config.rs
+++ b/core/startos/src/service/config.rs
@@ -1,6 +1,4 @@
-use std::collections::BTreeMap;
-
-use models::{ActionId, PackageId, ProcedureName};
+use models::ProcedureName;
 
 use crate::config::ConfigureContext;
 use crate::prelude::*;
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 3335be1ca..1efb116d5 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -1,5 +1,5 @@
+use std::sync::Arc;
 use std::time::Duration;
-use std::{ops::Deref, sync::Arc};
 
 use chrono::{DateTime, Utc};
 use clap::Parser;
@@ -10,25 +10,25 @@ use persistent_container::PersistentContainer;
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, Handler, HandlerArgs};
 use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
-use tokio::sync::{watch, Notify};
+use tokio::sync::Notify;
 
 use crate::action::ActionResult;
 use crate::config::action::ConfigRes;
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::RequestGuid;
 use crate::db::model::{
-    CurrentDependencies, CurrentDependents, InstalledPackageInfo, PackageDataEntry,
-    PackageDataEntryInstalled, PackageDataEntryMatchModel, StaticFiles,
+    InstalledPackageInfo, PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryMatchModel,
+    StaticFiles,
 };
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::install::PKG_ARCHIVE_DIR;
 use crate::prelude::*;
-use crate::progress::{self, NamedProgress, Progress};
+use crate::progress::{NamedProgress, Progress};
 use crate::s9pk::S9pk;
 use crate::service::service_map::InstallProgressHandles;
-use crate::service::transition::{TempDesiredState, TransitionKind, TransitionState};
+use crate::service::transition::TransitionKind;
 use crate::status::health_check::HealthCheckResult;
-use crate::status::{DependencyConfigErrors, MainStatus, Status};
+use crate::status::{MainStatus, Status};
 use crate::util::actor::{Actor, BackgroundJobs, SimpleActor};
 use crate::volume::data_dir;
 
@@ -289,6 +289,7 @@ impl Service {
                             marketplace_url: None,                   // TODO
                             manifest: manifest.clone(),
                             last_backup: None,                            // TODO
+                            hosts: Default::default(),                    // TODO
                             store: Value::Null,                           // TODO
                             store_exposed_dependents: Default::default(), // TODO
                             store_exposed_ui: Default::default(),         // TODO
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 28067cdd8..523b5f19a 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -15,19 +15,18 @@ use tokio::process::Command;
 use tokio::sync::{oneshot, watch, Mutex, OnceCell};
 use tracing::instrument;
 
-use super::{
-    service_effect_handler::{service_effect_handler, EffectContext},
-    transition::{TempDesiredState, TransitionKind},
-};
-use super::{transition::TransitionState, ServiceActorSeed};
+use super::service_effect_handler::{service_effect_handler, EffectContext};
+use super::transition::{TransitionKind, TransitionState};
+use super::ServiceActorSeed;
 use crate::context::RpcContext;
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::disk::mount::filesystem::{MountType, ReadOnly};
-use crate::disk::mount::guard::{GenericMountGuard, MountGuard};
+use crate::disk::mount::guard::MountGuard;
 use crate::lxc::{LxcConfig, LxcContainer, HOST_RPC_SERVER_SOCKET};
+use crate::net::net_controller::NetService;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
@@ -94,6 +93,7 @@ pub struct PersistentContainer {
     assets: BTreeMap<VolumeId, MountGuard>,
     pub(super) overlays: Arc<Mutex<BTreeMap<InternedString, OverlayGuard>>>,
     pub(super) state: Arc<watch::Sender<ServiceState>>,
+    pub(super) net_service: Mutex<NetService>,
 }
 
 impl PersistentContainer {
@@ -178,6 +178,10 @@ impl PersistentContainer {
                     .await?;
             }
         }
+        let net_service = ctx
+            .net_controller
+            .create_service(s9pk.as_manifest().id.clone(), lxc_container.ip())
+            .await?;
         Ok(Self {
             s9pk,
             lxc_container: OnceCell::new_with(Some(lxc_container)),
@@ -189,6 +193,7 @@ impl PersistentContainer {
             assets,
             overlays: Arc::new(Mutex::new(BTreeMap::new())),
             state: Arc::new(watch::channel(ServiceState::new(start)).0),
+            net_service: Mutex::new(net_service),
         })
     }
 
diff --git a/core/startos/src/service/rpc.rs b/core/startos/src/service/rpc.rs
index 05e6dcfab..6823a7189 100644
--- a/core/startos/src/service/rpc.rs
+++ b/core/startos/src/service/rpc.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use imbl_value::Value;
 use models::ProcedureName;
-use rpc_toolkit::yajrc::{RpcError, RpcMethod};
+use rpc_toolkit::yajrc::RpcMethod;
 use rpc_toolkit::Empty;
 
 use crate::prelude::*;
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 3978b64c7..ea2228e81 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1,11 +1,10 @@
+use std::ffi::OsString;
 use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
-use std::{ffi::OsString, time::Instant};
 
-use chrono::Utc;
-use clap::builder::{TypedValueParser, ValueParserFactory};
+use clap::builder::ValueParserFactory;
 use clap::Parser;
 use imbl_value::{json, InternedString};
 use models::{ActionId, HealthCheckId, ImageId, PackageId};
@@ -13,19 +12,18 @@ use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use tokio::process::Command;
 
+use crate::db::model::ExposedUI;
+use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::prelude::*;
 use crate::s9pk::rpc::SKIP_ENV;
 use crate::service::cli::ContainerCliContext;
-use crate::service::start_stop::StartStop;
 use crate::service::ServiceActorSeed;
-use crate::status::health_check::HealthCheckResult;
+use crate::status::health_check::{HealthCheckResult, HealthCheckString};
 use crate::status::MainStatus;
 use crate::util::clap::FromStrParser;
 use crate::util::{new_guid, Invoke};
-use crate::{db::model::ExposedUI, service::RunningStatus};
-use crate::{disk::mount::filesystem::idmapped::IdMapped, status::health_check::HealthCheckString};
 use crate::{echo, ARCH};
 
 #[derive(Clone)]
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 7ac555aff..f555be531 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -12,12 +12,12 @@ use tracing::instrument;
 
 use crate::context::RpcContext;
 use crate::db::model::{
-    InstalledPackageInfo, PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryInstalling,
+    PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryInstalling,
     PackageDataEntryRestoring, PackageDataEntryUpdating, StaticFiles,
 };
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::install::PKG_ARCHIVE_DIR;
-use crate::notifications::NotificationLevel;
+use crate::notifications::{notify, NotificationLevel};
 use crate::prelude::*;
 use crate::progress::{
     FullProgressTracker, FullProgressTrackerHandle, PhaseProgressTrackerHandle,
@@ -370,17 +370,19 @@ impl ServiceReloadInfo {
             .load(&self.ctx, &self.id, LoadDisposition::Undo)
             .await?;
         if let Some(error) = error {
+            let error_string = error.to_string();
             self.ctx
-                .notification_manager
-                .notify(
-                    self.ctx.db.clone(),
-                    Some(self.id.clone()),
-                    NotificationLevel::Error,
-                    format!("{} Failed", self.operation),
-                    error.to_string(),
-                    (),
-                    None,
-                )
+                .db
+                .mutate(|db| {
+                    notify(
+                        db,
+                        Some(self.id.clone()),
+                        NotificationLevel::Error,
+                        format!("{} Failed", self.operation),
+                        error_string,
+                        (),
+                    )
+                })
                 .await?;
         }
         Ok(())
diff --git a/core/startos/src/service/transition/mod.rs b/core/startos/src/service/transition/mod.rs
index cd7979cae..af62ccc1c 100644
--- a/core/startos/src/service/transition/mod.rs
+++ b/core/startos/src/service/transition/mod.rs
@@ -1,15 +1,13 @@
 use std::sync::Arc;
-use std::{fmt::Display, ops::Deref};
 
 use futures::{Future, FutureExt};
 use tokio::sync::watch;
 
+use super::persistent_container::ServiceState;
 use crate::service::start_stop::StartStop;
 use crate::util::actor::BackgroundJobs;
 use crate::util::future::{CancellationHandle, RemoteCancellable};
 
-use super::persistent_container::ServiceState;
-
 pub mod backup;
 pub mod restart;
 
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 9c8d54db3..8275f2d61 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -5,10 +5,10 @@ use std::time::Duration;
 use color_eyre::eyre::eyre;
 use josekit::jwk::Jwk;
 use openssl::x509::X509;
+use patch_db::json_ptr::ROOT;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use sqlx::Connection;
 use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
 use tokio::try_join;
@@ -20,6 +20,7 @@ use crate::backup::restore::recover_full_embassy;
 use crate::backup::target::BackupTargetFS;
 use crate::context::setup::SetupResult;
 use crate::context::SetupContext;
+use crate::db::model::Database;
 use crate::disk::fsck::RepairStrategy;
 use crate::disk::main::DEFAULT_PASSWORD;
 use crate::disk::mount::filesystem::cifs::Cifs;
@@ -74,29 +75,26 @@ async fn setup_init(
     ctx: &SetupContext,
     password: Option<String>,
 ) -> Result<(Hostname, OnionAddressV3, X509), Error> {
-    let InitResult { secret_store, db } = init(&ctx.config).await?;
-    let mut secrets_handle = secret_store.acquire().await?;
-    let mut secrets_tx = secrets_handle.begin().await?;
+    let InitResult { db } = init(&ctx.config).await?;
 
-    let mut account = AccountInfo::load(secrets_tx.as_mut()).await?;
-
-    if let Some(password) = password {
-        account.set_password(&password)?;
-        account.save(secrets_tx.as_mut()).await?;
-        db.mutate(|m| {
+    let account = db
+        .mutate(|m| {
+            let mut account = AccountInfo::load(m)?;
+            if let Some(password) = password {
+                account.set_password(&password)?;
+            }
+            account.save(m)?;
             m.as_public_mut()
                 .as_server_info_mut()
                 .as_password_hash_mut()
-                .ser(&account.password)
+                .ser(&account.password)?;
+            Ok(account)
         })
         .await?;
-    }
-
-    secrets_tx.commit().await?;
 
     Ok((
         account.hostname,
-        account.key.tor_address(),
+        account.tor_key.public().get_onion_address(),
         account.root_ca_cert,
     ))
 }
@@ -419,15 +417,13 @@ async fn fresh_setup(
     embassy_password: &str,
 ) -> Result<(Hostname, OnionAddressV3, X509), Error> {
     let account = AccountInfo::new(embassy_password, root_ca_start_time().await?)?;
-    let sqlite_pool = ctx.secret_store().await?;
-    account.save(&sqlite_pool).await?;
-    sqlite_pool.close().await;
-    let InitResult { secret_store, .. } = init(&ctx.config).await?;
-    secret_store.close().await;
+    let db = ctx.db().await?;
+    db.put(&ROOT, &Database::init(&account)?).await?;
+    init(&ctx.config).await?;
     Ok((
-        account.hostname.clone(),
-        account.key.tor_address(),
-        account.root_ca_cert.clone(),
+        account.hostname,
+        account.tor_key.public().get_onion_address(),
+        account.root_ca_cert,
     ))
 }
 
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index d762b63a0..8965c7edd 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -1,28 +1,46 @@
+use std::collections::BTreeMap;
 use std::path::Path;
 
-use chrono::Utc;
 use clap::builder::ValueParserFactory;
 use clap::Parser;
 use color_eyre::eyre::eyre;
+use imbl_value::InternedString;
 use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use sqlx::{Pool, Postgres};
 use tracing::instrument;
 
 use crate::context::{CliContext, RpcContext};
+use crate::prelude::*;
 use crate::util::clap::FromStrParser;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
-use crate::{Error, ErrorKind};
 
 static SSH_AUTHORIZED_KEYS_FILE: &str = "/home/start9/.ssh/authorized_keys";
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct PubKey(
+pub struct SshKeys(BTreeMap<InternedString, WithTimeData<SshPubKey>>);
+impl SshKeys {
+    pub fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+}
+impl Map for SshKeys {
+    type Key = InternedString;
+    type Value = WithTimeData<SshPubKey>;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone())
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct SshPubKey(
     #[serde(serialize_with = "crate::util::serde::serialize_display")]
     #[serde(deserialize_with = "crate::util::serde::deserialize_from_str")]
     openssh_keys::PublicKey,
 );
-impl ValueParserFactory for PubKey {
+impl ValueParserFactory for SshPubKey {
     type Parser = FromStrParser<Self>;
     fn value_parser() -> Self::Parser {
         FromStrParser::new()
@@ -33,7 +51,7 @@ impl ValueParserFactory for PubKey {
 #[serde(rename_all = "kebab-case")]
 pub struct SshKeyResponse {
     pub alg: String,
-    pub fingerprint: String,
+    pub fingerprint: InternedString,
     pub hostname: String,
     pub created_at: String,
 }
@@ -47,10 +65,10 @@ impl std::fmt::Display for SshKeyResponse {
     }
 }
 
-impl std::str::FromStr for PubKey {
+impl std::str::FromStr for SshPubKey {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse().map(|pk| PubKey(pk)).map_err(|e| Error {
+        s.parse().map(|pk| SshPubKey(pk)).map_err(|e| Error {
             source: e.into(),
             kind: crate::ErrorKind::ParseSshKey,
             revision: None,
@@ -88,49 +106,34 @@ pub fn ssh() -> ParentHandler {
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
-    key: PubKey,
+    key: SshPubKey,
 }
 
 #[instrument(skip_all)]
 pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKeyResponse, Error> {
-    let pool = &ctx.secret_store;
-    // check fingerprint for duplicates
-    let fp = key.0.fingerprint_md5();
-    match sqlx::query!("SELECT * FROM ssh_keys WHERE fingerprint = $1", fp)
-        .fetch_optional(pool)
-        .await?
-    {
-        None => {
-            // if no duplicates, insert into DB
-            let raw_key = format!("{}", key.0);
-            let created_at = Utc::now().to_rfc3339();
-            sqlx::query!(
-                "INSERT INTO ssh_keys (fingerprint, openssh_pubkey, created_at) VALUES ($1, $2, $3)",
-                fp,
-                raw_key,
-                created_at
-            )
-            .execute(pool)
-            .await?;
-            // insert into live key file, for now we actually do a wholesale replacement of the keys file, for maximum
-            // consistency
-            sync_keys_from_db(pool, Path::new(SSH_AUTHORIZED_KEYS_FILE)).await?;
+    let mut key = WithTimeData::new(key);
+    let fingerprint = InternedString::intern(key.0.fingerprint_md5());
+    ctx.db
+        .mutate(move |m| {
+            m.as_private_mut()
+                .as_ssh_pubkeys_mut()
+                .insert(&fingerprint, &key)?;
+
             Ok(SshKeyResponse {
                 alg: key.0.keytype().to_owned(),
-                fingerprint: fp,
-                hostname: key.0.comment.unwrap_or(String::new()).to_owned(),
-                created_at,
+                fingerprint,
+                hostname: key.0.comment.take().unwrap_or_default(),
+                created_at: key.created_at.to_rfc3339(),
             })
-        }
-        Some(_) => Err(Error::new(eyre!("Duplicate ssh key"), ErrorKind::Duplicate)),
-    }
+        })
+        .await
 }
 
 #[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteParams {
-    fingerprint: String,
+    fingerprint: InternedString,
 }
 
 #[instrument(skip_all)]
@@ -138,25 +141,22 @@ pub async fn delete(
     ctx: RpcContext,
     DeleteParams { fingerprint }: DeleteParams,
 ) -> Result<(), Error> {
-    let pool = &ctx.secret_store;
-    // check if fingerprint is in DB
-    // if in DB, remove it from DB
-    let n = sqlx::query!("DELETE FROM ssh_keys WHERE fingerprint = $1", fingerprint)
-        .execute(pool)
-        .await?
-        .rows_affected();
-    // if not in DB, Err404
-    if n == 0 {
-        Err(Error {
-            source: color_eyre::eyre::eyre!("SSH Key Not Found"),
-            kind: crate::error::ErrorKind::NotFound,
-            revision: None,
+    let keys = ctx
+        .db
+        .mutate(|m| {
+            let keys_ref = m.as_private_mut().as_ssh_pubkeys_mut();
+            if keys_ref.remove(&fingerprint)?.is_some() {
+                keys_ref.de()
+            } else {
+                Err(Error {
+                    source: color_eyre::eyre::eyre!("SSH Key Not Found"),
+                    kind: crate::error::ErrorKind::NotFound,
+                    revision: None,
+                })
+            }
         })
-    } else {
-        // AND overlay key file
-        sync_keys_from_db(pool, Path::new(SSH_AUTHORIZED_KEYS_FILE)).await?;
-        Ok(())
-    }
+        .await?;
+    sync_keys(&keys, SSH_AUTHORIZED_KEYS_FILE).await
 }
 
 fn display_all_ssh_keys(params: WithIoFormat<Empty>, result: Vec<SshKeyResponse>) {
@@ -186,43 +186,31 @@ fn display_all_ssh_keys(params: WithIoFormat<Empty>, result: Vec<SshKeyResponse>
 }
 
 #[instrument(skip_all)]
-pub async fn list(ctx: RpcContext, _: Empty) -> Result<Vec<SshKeyResponse>, Error> {
-    let pool = &ctx.secret_store;
-    // list keys in DB and return them
-    let entries = sqlx::query!("SELECT fingerprint, openssh_pubkey, created_at FROM ssh_keys")
-        .fetch_all(pool)
-        .await?;
-    Ok(entries
+pub async fn list(ctx: RpcContext) -> Result<Vec<SshKeyResponse>, Error> {
+    ctx.db
+        .peek()
+        .await
+        .into_private()
+        .into_ssh_pubkeys()
+        .into_entries()?
         .into_iter()
-        .map(|r| {
-            let k = PubKey(r.openssh_pubkey.parse().unwrap()).0;
-            let alg = k.keytype().to_owned();
-            let fingerprint = k.fingerprint_md5();
-            let hostname = k.comment.unwrap_or("".to_owned());
-            let created_at = r.created_at;
-            SshKeyResponse {
-                alg,
+        .map(|(fingerprint, key)| {
+            let mut key = key.de()?;
+            Ok(SshKeyResponse {
+                alg: key.0.keytype().to_owned(),
                 fingerprint,
-                hostname,
-                created_at,
-            }
+                hostname: key.0.comment.take().unwrap_or_default(),
+                created_at: key.created_at.to_rfc3339(),
+            })
         })
-        .collect())
+        .collect()
 }
 
 #[instrument(skip_all)]
-pub async fn sync_keys_from_db<P: AsRef<Path>>(
-    pool: &Pool<Postgres>,
-    dest: P,
-) -> Result<(), Error> {
+pub async fn sync_keys<P: AsRef<Path>>(keys: &SshKeys, dest: P) -> Result<(), Error> {
+    use tokio::io::AsyncWriteExt;
+
     let dest = dest.as_ref();
-    let keys = sqlx::query!("SELECT openssh_pubkey FROM ssh_keys")
-        .fetch_all(pool)
-        .await?;
-    let contents: String = keys
-        .into_iter()
-        .map(|k| format!("{}\n", k.openssh_pubkey))
-        .collect();
     let ssh_dir = dest.parent().ok_or_else(|| {
         Error::new(
             eyre!("SSH Key File cannot be \"/\""),
@@ -232,5 +220,10 @@ pub async fn sync_keys_from_db<P: AsRef<Path>>(
     if tokio::fs::metadata(ssh_dir).await.is_err() {
         tokio::fs::create_dir_all(ssh_dir).await?;
     }
-    std::fs::write(dest, contents).map_err(|e| e.into())
+    let mut f = tokio::fs::File::create(dest).await?;
+    for key in keys.0.values() {
+        f.write_all(key.0.to_key_format().as_bytes()).await?;
+        f.write_all(b"\n").await?;
+    }
+    Ok(())
 }
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index ffc1a98bb..721b47511 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -27,6 +27,12 @@ pub struct DependencyConfigErrors(pub BTreeMap<PackageId, String>);
 impl Map for DependencyConfigErrors {
     type Key = PackageId;
     type Value = String;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<imbl_value::InternedString, Error> {
+        Ok(key.clone().into())
+    }
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index 31693aba0..9f2b58135 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -18,7 +18,7 @@ use crate::db::model::UpdateProgress;
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::MountGuard;
-use crate::notifications::NotificationLevel;
+use crate::notifications::{notify, NotificationLevel};
 use crate::prelude::*;
 use crate::registry::marketplace::with_query_params;
 use crate::sound::{
@@ -66,7 +66,7 @@ pub enum UpdateResult {
     Updating,
 }
 
-pub fn display_update_result(params: UpdateSystemParams, status: UpdateResult) {
+pub fn display_update_result(_: UpdateSystemParams, status: UpdateResult) {
     match status {
         UpdateResult::Updating => {
             println!("Updating...");
@@ -131,24 +131,14 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
 
     tokio::spawn(async move {
         let res = do_update(ctx.clone(), eos_url).await;
-        ctx.db
-            .mutate(|db| {
-                db.as_public_mut()
-                    .as_server_info_mut()
-                    .as_status_info_mut()
-                    .as_update_progress_mut()
-                    .ser(&None)
-            })
-            .await?;
         match res {
             Ok(()) => {
                 ctx.db
                     .mutate(|db| {
-                        db.as_public_mut()
-                            .as_server_info_mut()
-                            .as_status_info_mut()
-                            .as_updated_mut()
-                            .ser(&true)
+                        let status_info =
+                            db.as_public_mut().as_server_info_mut().as_status_info_mut();
+                        status_info.as_update_progress_mut().ser(&None)?;
+                        status_info.as_updated_mut().ser(&true)
                     })
                     .await?;
                 CIRCLE_OF_5THS_SHORT
@@ -157,18 +147,25 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
                     .expect("could not play sound");
             }
             Err(e) => {
-                ctx.notification_manager
-                    .notify(
-                        ctx.db.clone(),
-                        None,
-                        NotificationLevel::Error,
-                        "StartOS Update Failed".to_owned(),
-                        format!("Update was not successful because of {}", e),
-                        (),
-                        None,
-                    )
+                let err_string = format!("Update was not successful because of {}", e);
+                ctx.db
+                    .mutate(|db| {
+                        db.as_public_mut()
+                            .as_server_info_mut()
+                            .as_status_info_mut()
+                            .as_update_progress_mut()
+                            .ser(&None)?;
+                        notify(
+                            db,
+                            None,
+                            NotificationLevel::Error,
+                            "StartOS Update Failed".to_owned(),
+                            err_string,
+                            (),
+                        )
+                    })
                     .await
-                    .expect("");
+                    .unwrap();
                 // TODO: refactor sound lib to make compound tempos easier to deal with
                 UPDATE_FAILED_1
                     .play()
diff --git a/core/startos/src/upload.rs b/core/startos/src/upload.rs
index 91651df51..5dd2c4dda 100644
--- a/core/startos/src/upload.rs
+++ b/core/startos/src/upload.rs
@@ -1,4 +1,3 @@
-use std::path::PathBuf;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::Poll;
@@ -6,18 +5,17 @@ use std::time::Duration;
 
 use axum::body::Body;
 use axum::response::Response;
-use clap::Parser;
 use futures::{FutureExt, StreamExt};
 use http::header::CONTENT_LENGTH;
 use http::StatusCode;
 use tokio::fs::File;
-use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
-use tokio::sync::{watch, OwnedMutexGuard};
+use tokio::io::{AsyncWrite, AsyncWriteExt};
+use tokio::sync::watch;
 
 use crate::context::RpcContext;
 use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::prelude::*;
-use crate::s9pk::merkle_archive::source::multi_cursor_file::{FileSectionReader, MultiCursorFile};
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::TmpDir;
 
diff --git a/core/startos/src/util/future.rs b/core/startos/src/util/future.rs
index 9f18ed613..f40e847bf 100644
--- a/core/startos/src/util/future.rs
+++ b/core/startos/src/util/future.rs
@@ -3,7 +3,7 @@ use std::task::{Context, Poll};
 
 use futures::future::abortable;
 use futures::stream::{AbortHandle, Abortable};
-use futures::{Future, FutureExt};
+use futures::Future;
 use tokio::sync::watch;
 
 #[pin_project::pin_project(PinnedDrop)]
@@ -44,7 +44,7 @@ impl<F> PinnedDrop for DropSignaling<F> {
 pub struct DropHandle(watch::Receiver<bool>);
 impl DropHandle {
     pub async fn wait(&mut self) {
-        self.0.wait_for(|a| *a).await;
+        let _ = self.0.wait_for(|a| *a).await;
     }
 }
 
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index d17d1ac9a..de25e0505 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -8,6 +8,8 @@ use clap::builder::ValueParserFactory;
 use clap::{ArgMatches, CommandFactory, FromArgMatches};
 use color_eyre::eyre::eyre;
 use imbl::OrdMap;
+use openssl::pkey::{PKey, Private};
+use openssl::x509::{X509Ref, X509};
 use rpc_toolkit::{AnyContext, Handler, HandlerArgs, HandlerArgsFor, HandlerTypes, PrintCliResult};
 use serde::de::DeserializeOwned;
 use serde::ser::{SerializeMap, SerializeSeq};
@@ -1090,3 +1092,151 @@ pub fn apply_expr(input: jaq_core::Val, expr: &str) -> Result<jaq_core::Val, Err
 
     Ok(res)
 }
+
+pub trait PemEncoding: Sized {
+    fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E>;
+    fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E>;
+}
+
+impl PemEncoding for X509 {
+    fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
+        X509::from_pem(pem.as_bytes()).map_err(E::custom)
+    }
+    fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
+        String::from_utf8((&**self).to_pem().map_err(E::custom)?).map_err(E::custom)
+    }
+}
+
+impl PemEncoding for PKey<Private> {
+    fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
+        PKey::<Private>::private_key_from_pem(pem.as_bytes()).map_err(E::custom)
+    }
+    fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
+        String::from_utf8((&**self).private_key_to_pem_pkcs8().map_err(E::custom)?)
+            .map_err(E::custom)
+    }
+}
+
+impl PemEncoding for ssh_key::PrivateKey {
+    fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
+        ssh_key::PrivateKey::from_openssh(pem.as_bytes()).map_err(E::custom)
+    }
+    fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
+        self.to_openssh(ssh_key::LineEnding::LF)
+            .map_err(E::custom)
+            .map(|s| (&*s).clone())
+    }
+}
+
+pub mod pem {
+    use serde::{Deserialize, Deserializer, Serializer};
+
+    use crate::util::serde::PemEncoding;
+
+    pub fn serialize<T: PemEncoding, S: Serializer>(
+        value: &T,
+        serializer: S,
+    ) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(&value.to_pem()?)
+    }
+
+    pub fn deserialize<'de, T: PemEncoding, D: Deserializer<'de>>(
+        deserializer: D,
+    ) -> Result<T, D::Error> {
+        let pem = String::deserialize(deserializer)?;
+        Ok(T::from_pem(&pem)?)
+    }
+}
+
+#[repr(transparent)]
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Pem<T: PemEncoding>(#[serde(with = "pem")] pub T);
+impl<T: PemEncoding> Pem<T> {
+    pub fn new(value: T) -> Self {
+        Pem(value)
+    }
+    pub fn new_ref(value: &T) -> &Self {
+        unsafe { std::mem::transmute(value) }
+    }
+    pub fn new_mut(value: &mut T) -> &mut Self {
+        unsafe { std::mem::transmute(value) }
+    }
+}
+
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct MaybeUtf8String(pub Vec<u8>);
+impl std::fmt::Debug for MaybeUtf8String {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if let Ok(s) = std::str::from_utf8(&self.0) {
+            s.fmt(f)
+        } else {
+            self.0.fmt(f)
+        }
+    }
+}
+impl<'de> Deserialize<'de> for MaybeUtf8String {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct Visitor;
+        impl<'de> serde::de::Visitor<'de> for Visitor {
+            type Value = Vec<u8>;
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                write!(formatter, "a string or byte array")
+            }
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                Ok(v.as_bytes().to_owned())
+            }
+            fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                Ok(v.into_bytes())
+            }
+            fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                Ok(v.to_owned())
+            }
+            fn visit_byte_buf<E>(self, v: Vec<u8>) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                Ok(v)
+            }
+            fn visit_unit<E>(self) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                Ok(Vec::new())
+            }
+            fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+            where
+                A: serde::de::SeqAccess<'de>,
+            {
+                std::iter::repeat_with(|| seq.next_element::<u8>().transpose())
+                    .take_while(|a| a.is_some())
+                    .flatten()
+                    .collect::<Result<Vec<u8>, _>>()
+            }
+        }
+        deserializer.deserialize_any(Visitor).map(Self)
+    }
+}
+impl Serialize for MaybeUtf8String {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        if let Ok(s) = std::str::from_utf8(&self.0) {
+            serializer.serialize_str(s)
+        } else {
+            serializer.serialize_bytes(&self.0)
+        }
+    }
+}
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index a2ef069ac..8fc6475f0 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -1,33 +1,25 @@
 use std::cmp::Ordering;
 
-use async_trait::async_trait;
 use color_eyre::eyre::eyre;
+use futures::Future;
 use imbl_value::InternedString;
-use sqlx::PgPool;
 
 use crate::prelude::*;
 use crate::Error;
 
-mod v0_3_4;
-mod v0_3_4_1;
-mod v0_3_4_2;
-mod v0_3_4_3;
-mod v0_3_4_4;
 mod v0_3_5;
 mod v0_3_5_1;
+mod v0_3_6;
 
-pub type Current = v0_3_5_1::Version;
+pub type Current = v0_3_6::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
 enum Version {
-    V0_3_4(Wrapper<v0_3_4::Version>),
-    V0_3_4_1(Wrapper<v0_3_4_1::Version>),
-    V0_3_4_2(Wrapper<v0_3_4_2::Version>),
-    V0_3_4_3(Wrapper<v0_3_4_3::Version>),
-    V0_3_4_4(Wrapper<v0_3_4_4::Version>),
+    LT0_3_5(LTWrapper<v0_3_5::Version>),
     V0_3_5(Wrapper<v0_3_5::Version>),
     V0_3_5_1(Wrapper<v0_3_5_1::Version>),
+    V0_3_6(Wrapper<v0_3_6::Version>),
     Other(emver::Version),
 }
 
@@ -43,19 +35,15 @@ impl Version {
     #[cfg(test)]
     fn as_sem_ver(&self) -> emver::Version {
         match self {
-            Version::V0_3_4(Wrapper(x)) => x.semver(),
-            Version::V0_3_4_1(Wrapper(x)) => x.semver(),
-            Version::V0_3_4_2(Wrapper(x)) => x.semver(),
-            Version::V0_3_4_3(Wrapper(x)) => x.semver(),
-            Version::V0_3_4_4(Wrapper(x)) => x.semver(),
+            Version::LT0_3_5(LTWrapper(_, x)) => x.clone(),
             Version::V0_3_5(Wrapper(x)) => x.semver(),
             Version::V0_3_5_1(Wrapper(x)) => x.semver(),
+            Version::V0_3_6(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
 }
 
-#[async_trait]
 pub trait VersionT
 where
     Self: Sized + Send + Sync,
@@ -64,86 +52,115 @@ where
     fn new() -> Self;
     fn semver(&self) -> emver::Version;
     fn compat(&self) -> &'static emver::VersionRange;
-    async fn up(&self, db: PatchDb, secrets: &PgPool) -> Result<(), Error>;
-    async fn down(&self, db: PatchDb, secrets: &PgPool) -> Result<(), Error>;
-    async fn commit(&self, db: PatchDb) -> Result<(), Error> {
-        let semver = self.semver().into();
-        let compat = self.compat().clone();
-        db.mutate(|d| {
-            d.as_public_mut()
-                .as_server_info_mut()
-                .as_version_mut()
-                .ser(&semver)?;
-            d.as_public_mut()
-                .as_server_info_mut()
-                .as_eos_version_compat_mut()
-                .ser(&compat)?;
+    fn up(&self, db: &PatchDb) -> impl Future<Output = Result<(), Error>> + Send;
+    fn down(&self, db: &PatchDb) -> impl Future<Output = Result<(), Error>> + Send;
+    fn commit(&self, db: &PatchDb) -> impl Future<Output = Result<(), Error>> + Send {
+        async {
+            let semver = self.semver().into();
+            let compat = self.compat().clone();
+            db.mutate(|d| {
+                d.as_public_mut()
+                    .as_server_info_mut()
+                    .as_version_mut()
+                    .ser(&semver)?;
+                d.as_public_mut()
+                    .as_server_info_mut()
+                    .as_eos_version_compat_mut()
+                    .ser(&compat)?;
+                Ok(())
+            })
+            .await?;
             Ok(())
-        })
-        .await?;
-        Ok(())
+        }
     }
-    async fn migrate_to<V: VersionT>(
+    fn migrate_to<V: VersionT>(
         &self,
         version: &V,
-        db: PatchDb,
-        secrets: &PgPool,
-    ) -> Result<(), Error> {
-        match self.semver().cmp(&version.semver()) {
-            Ordering::Greater => self.rollback_to_unchecked(version, db, secrets).await,
-            Ordering::Less => version.migrate_from_unchecked(self, db, secrets).await,
-            Ordering::Equal => Ok(()),
+        db: &PatchDb,
+    ) -> impl Future<Output = Result<(), Error>> + Send {
+        async {
+            match self.semver().cmp(&version.semver()) {
+                Ordering::Greater => self.rollback_to_unchecked(version, db).await,
+                Ordering::Less => version.migrate_from_unchecked(self, db).await,
+                Ordering::Equal => Ok(()),
+            }
         }
     }
-    async fn migrate_from_unchecked<V: VersionT>(
+    fn migrate_from_unchecked<V: VersionT>(
         &self,
         version: &V,
-        db: PatchDb,
-        secrets: &PgPool,
-    ) -> Result<(), Error> {
-        let previous = Self::Previous::new();
-        if version.semver() < previous.semver() {
-            previous
-                .migrate_from_unchecked(version, db.clone(), secrets)
-                .await?;
-        } else if version.semver() > previous.semver() {
-            return Err(Error::new(
-                eyre!(
-                    "NO PATH FROM {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
-                    version.semver()
-                ),
-                crate::ErrorKind::MigrationFailed,
-            ));
+        db: &PatchDb,
+    ) -> impl Future<Output = Result<(), Error>> + Send {
+        async {
+            let previous = Self::Previous::new();
+            if version.semver() < previous.semver() {
+                previous.migrate_from_unchecked(version, db).await?;
+            } else if version.semver() > previous.semver() {
+                return Err(Error::new(
+                    eyre!(
+                        "NO PATH FROM {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
+                        version.semver()
+                    ),
+                    crate::ErrorKind::MigrationFailed,
+                ));
+            }
+            tracing::info!("{} -> {}", previous.semver(), self.semver(),);
+            self.up(db).await?;
+            self.commit(db).await?;
+            Ok(())
         }
-        tracing::info!("{} -> {}", previous.semver(), self.semver(),);
-        self.up(db.clone(), secrets).await?;
-        self.commit(db).await?;
-        Ok(())
     }
-    async fn rollback_to_unchecked<V: VersionT>(
+    fn rollback_to_unchecked<V: VersionT>(
         &self,
         version: &V,
-        db: PatchDb,
-        secrets: &PgPool,
-    ) -> Result<(), Error> {
-        let previous = Self::Previous::new();
-        tracing::info!("{} -> {}", self.semver(), previous.semver(),);
-        self.down(db.clone(), secrets).await?;
-        previous.commit(db.clone()).await?;
-        if version.semver() < previous.semver() {
-            previous.rollback_to_unchecked(version, db, secrets).await?;
-        } else if version.semver() > previous.semver() {
-            return Err(Error::new(
-                eyre!(
-                    "NO PATH TO {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
-                    version.semver()
-                ),
-                crate::ErrorKind::MigrationFailed,
-            ));
+        db: &PatchDb,
+    ) -> impl Future<Output = Result<(), Error>> + Send {
+        async {
+            let previous = Self::Previous::new();
+            tracing::info!("{} -> {}", self.semver(), previous.semver(),);
+            self.down(db).await?;
+            previous.commit(db).await?;
+            if version.semver() < previous.semver() {
+                previous.rollback_to_unchecked(version, db).await?;
+            } else if version.semver() > previous.semver() {
+                return Err(Error::new(
+                    eyre!(
+                        "NO PATH TO {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
+                        version.semver()
+                    ),
+                    crate::ErrorKind::MigrationFailed,
+                ));
+            }
+            Ok(())
         }
-        Ok(())
     }
 }
+
+#[derive(Debug, Clone)]
+struct LTWrapper<T>(T, emver::Version);
+impl<T> serde::Serialize for LTWrapper<T>
+where
+    T: VersionT,
+{
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        self.0.semver().serialize(serializer)
+    }
+}
+impl<'de, T> serde::Deserialize<'de> for LTWrapper<T>
+where
+    T: VersionT,
+{
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let v = crate::util::Version::deserialize(deserializer)?;
+        let version = T::new();
+        if *v < version.semver() {
+            Ok(Self(version, v.into_version()))
+        } else {
+            Err(serde::de::Error::custom("Mismatched Version"))
+        }
+    }
+}
+
 #[derive(Debug, Clone)]
 struct Wrapper<T>(T);
 impl<T> serde::Serialize for Wrapper<T>
@@ -169,7 +186,7 @@ where
     }
 }
 
-pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> {
+pub async fn init(db: &PatchDb) -> Result<(), Error> {
     let version = Version::from_util_version(
         db.peek()
             .await
@@ -180,13 +197,15 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> {
     );
 
     match version {
-        Version::V0_3_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
-        Version::V0_3_4_1(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
-        Version::V0_3_4_2(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
-        Version::V0_3_4_3(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
-        Version::V0_3_4_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
-        Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
-        Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?,
+        Version::LT0_3_5(_) => {
+            return Err(Error::new(
+                eyre!("Cannot migrate from pre-0.3.5. Please update to v0.3.5 first."),
+                ErrorKind::MigrationFailed,
+            ));
+        }
+        Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), &db).await?,
+        Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), &db).await?,
+        Version::V0_3_6(v) => v.0.migrate_to(&Current::new(), &db).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -218,11 +237,6 @@ mod tests {
 
     fn versions() -> impl Strategy<Value = Version> {
         prop_oneof![
-            Just(Version::V0_3_4(Wrapper(v0_3_4::Version::new()))),
-            Just(Version::V0_3_4_1(Wrapper(v0_3_4_1::Version::new()))),
-            Just(Version::V0_3_4_2(Wrapper(v0_3_4_2::Version::new()))),
-            Just(Version::V0_3_4_3(Wrapper(v0_3_4_3::Version::new()))),
-            Just(Version::V0_3_4_4(Wrapper(v0_3_4_4::Version::new()))),
             Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))),
             Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))),
             em_version().prop_map(Version::Other),
diff --git a/core/startos/src/version/v0_3_4.rs b/core/startos/src/version/v0_3_4.rs
deleted file mode 100644
index 52a0d6960..000000000
--- a/core/startos/src/version/v0_3_4.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use async_trait::async_trait;
-use emver::VersionRange;
-use itertools::Itertools;
-use openssl::hash::MessageDigest;
-use serde_json::json;
-use ssh_key::public::Ed25519PublicKey;
-
-use super::*;
-use crate::account::AccountInfo;
-use crate::hostname::{sync_hostname, Hostname};
-use crate::prelude::*;
-
-const V0_3_4: emver::Version = emver::Version::new(0, 3, 4, 0);
-
-lazy_static::lazy_static! {
-    pub static ref V0_3_0_COMPAT: VersionRange = VersionRange::Conj(
-        Box::new(VersionRange::Anchor(
-            emver::GTE,
-            emver::Version::new(0, 3, 0, 0),
-        )),
-        Box::new(VersionRange::Anchor(emver::LTE, Current::new().semver())),
-    );
-}
-
-const COMMUNITY_URL: &str = "https://community-registry.start9.com/";
-const MAIN_REGISTRY: &str = "https://registry.start9.com/";
-const COMMUNITY_SERVICES: &[&str] = &[
-    "ipfs",
-    "agora",
-    "lightning-jet",
-    "balanceofsatoshis",
-    "mastodon",
-    "lndg",
-    "robosats",
-    "thunderhub",
-    "syncthing",
-    "sphinx-relay",
-];
-
-#[derive(Clone, Debug)]
-pub struct Version;
-
-#[async_trait]
-impl VersionT for Version {
-    type Previous = Self;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> emver::Version {
-        V0_3_4
-    }
-    fn compat(&self) -> &'static VersionRange {
-        &*V0_3_0_COMPAT
-    }
-    async fn up(&self, db: PatchDb, secrets: &PgPool) -> Result<(), Error> {
-        let mut account = AccountInfo::load(secrets).await?;
-        let account = db
-            .mutate(|d| {
-                d.as_public_mut().as_server_info_mut().as_pubkey_mut().ser(
-                    &ssh_key::PublicKey::from(Ed25519PublicKey::from(&account.key.ssh_key()))
-                        .to_openssh()?,
-                )?;
-                d.as_public_mut()
-                    .as_server_info_mut()
-                    .as_ca_fingerprint_mut()
-                    .ser(
-                        &account
-                            .root_ca_cert
-                            .digest(MessageDigest::sha256())
-                            .unwrap()
-                            .iter()
-                            .map(|x| format!("{x:X}"))
-                            .join(":"),
-                    )?;
-                let server_info = d.as_public_mut().as_server_info();
-                account.hostname = server_info.as_hostname().de().map(Hostname)?;
-                account.server_id = server_info.as_id().de()?;
-
-                Ok(account)
-            })
-            .await?;
-        account.save(secrets).await?;
-        sync_hostname(&account.hostname).await?;
-
-        let parsed_url = Some(COMMUNITY_URL.parse().unwrap());
-        db.mutate(|d| {
-            let mut ui = d.as_public().as_ui().de()?;
-            use imbl_value::json;
-            ui["marketplace"]["known-hosts"][COMMUNITY_URL] = json!({});
-            ui["marketplace"]["known-hosts"][MAIN_REGISTRY] = json!({});
-            for package_id in d.as_public().as_package_data().keys()? {
-                if !COMMUNITY_SERVICES.contains(&&*package_id.to_string()) {
-                    continue;
-                }
-                d.as_public_mut()
-                    .as_package_data_mut()
-                    .as_idx_mut(&package_id)
-                    .or_not_found(&package_id)?
-                    .as_installed_mut()
-                    .or_not_found(&package_id)?
-                    .as_marketplace_url_mut()
-                    .ser(&parsed_url)?;
-            }
-            ui["theme"] = json!("Dark".to_string());
-            ui["widgets"] = json!([]);
-
-            d.as_public_mut().as_ui_mut().ser(&ui)
-        })
-        .await
-    }
-    async fn down(&self, db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        db.mutate(|d| {
-            let mut ui = d.as_public().as_ui().de()?;
-            let parsed_url = Some(MAIN_REGISTRY.parse().unwrap());
-            for package_id in d.as_public().as_package_data().keys()? {
-                if !COMMUNITY_SERVICES.contains(&&*package_id.to_string()) {
-                    continue;
-                }
-                d.as_public_mut()
-                    .as_package_data_mut()
-                    .as_idx_mut(&package_id)
-                    .or_not_found(&package_id)?
-                    .as_installed_mut()
-                    .or_not_found(&package_id)?
-                    .as_marketplace_url_mut()
-                    .ser(&parsed_url)?;
-            }
-
-            if let imbl_value::Value::Object(ref mut obj) = ui {
-                obj.remove("theme");
-                obj.remove("widgets");
-            }
-
-            ui["marketplace"]["known-hosts"][COMMUNITY_URL].take();
-            ui["marketplace"]["known-hosts"][MAIN_REGISTRY].take();
-            d.as_public_mut().as_ui_mut().ser(&ui)
-        })
-        .await
-    }
-}
diff --git a/core/startos/src/version/v0_3_4_1.rs b/core/startos/src/version/v0_3_4_1.rs
deleted file mode 100644
index 915a47235..000000000
--- a/core/startos/src/version/v0_3_4_1.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use async_trait::async_trait;
-use emver::VersionRange;
-
-use super::v0_3_4::V0_3_0_COMPAT;
-use super::*;
-use crate::prelude::*;
-
-const V0_3_4_1: emver::Version = emver::Version::new(0, 3, 4, 1);
-
-#[derive(Clone, Debug)]
-pub struct Version;
-
-#[async_trait]
-impl VersionT for Version {
-    type Previous = v0_3_4::Version;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> emver::Version {
-        V0_3_4_1
-    }
-    fn compat(&self) -> &'static VersionRange {
-        &*V0_3_0_COMPAT
-    }
-    async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-    async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-}
diff --git a/core/startos/src/version/v0_3_4_2.rs b/core/startos/src/version/v0_3_4_2.rs
deleted file mode 100644
index 5931b2879..000000000
--- a/core/startos/src/version/v0_3_4_2.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use async_trait::async_trait;
-use emver::VersionRange;
-
-use super::v0_3_4::V0_3_0_COMPAT;
-use super::*;
-use crate::prelude::*;
-
-const V0_3_4_2: emver::Version = emver::Version::new(0, 3, 4, 2);
-
-#[derive(Clone, Debug)]
-pub struct Version;
-
-#[async_trait]
-impl VersionT for Version {
-    type Previous = v0_3_4_1::Version;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> emver::Version {
-        V0_3_4_2
-    }
-    fn compat(&self) -> &'static VersionRange {
-        &*V0_3_0_COMPAT
-    }
-    async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-    async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-}
diff --git a/core/startos/src/version/v0_3_4_3.rs b/core/startos/src/version/v0_3_4_3.rs
deleted file mode 100644
index d3199e913..000000000
--- a/core/startos/src/version/v0_3_4_3.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use async_trait::async_trait;
-use emver::VersionRange;
-
-use super::v0_3_4::V0_3_0_COMPAT;
-use super::*;
-use crate::prelude::*;
-
-const V0_3_4_3: emver::Version = emver::Version::new(0, 3, 4, 3);
-
-#[derive(Clone, Debug)]
-pub struct Version;
-
-#[async_trait]
-impl VersionT for Version {
-    type Previous = v0_3_4_2::Version;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> emver::Version {
-        V0_3_4_3
-    }
-    fn compat(&self) -> &'static VersionRange {
-        &V0_3_0_COMPAT
-    }
-    async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-    async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-}
diff --git a/core/startos/src/version/v0_3_4_4.rs b/core/startos/src/version/v0_3_4_4.rs
deleted file mode 100644
index 686c00826..000000000
--- a/core/startos/src/version/v0_3_4_4.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use async_trait::async_trait;
-use emver::VersionRange;
-use models::ResultExt;
-use sqlx::PgPool;
-
-use super::v0_3_4::V0_3_0_COMPAT;
-use super::{v0_3_4_3, VersionT};
-use crate::prelude::*;
-
-const V0_3_4_4: emver::Version = emver::Version::new(0, 3, 4, 4);
-
-#[derive(Clone, Debug)]
-pub struct Version;
-
-#[async_trait]
-impl VersionT for Version {
-    type Previous = v0_3_4_3::Version;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> emver::Version {
-        V0_3_4_4
-    }
-    fn compat(&self) -> &'static VersionRange {
-        &V0_3_0_COMPAT
-    }
-    async fn up(&self, db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        db.mutate(|v| {
-            let tor_address_lens = v.as_public_mut().as_server_info_mut().as_tor_address_mut();
-            let mut tor_addr = tor_address_lens.de()?;
-            tor_addr
-                .set_scheme("https")
-                .map_err(|_| eyre!("unable to update url scheme to https"))
-                .with_kind(crate::ErrorKind::ParseUrl)?;
-            tor_address_lens.ser(&tor_addr)
-        })
-        .await?;
-        Ok(())
-    }
-    async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        Ok(())
-    }
-}
diff --git a/core/startos/src/version/v0_3_5.rs b/core/startos/src/version/v0_3_5.rs
index 485ec5f81..e5634d2d9 100644
--- a/core/startos/src/version/v0_3_5.rs
+++ b/core/startos/src/version/v0_3_5.rs
@@ -1,23 +1,26 @@
-use std::collections::BTreeMap;
-use std::path::Path;
-
-use async_trait::async_trait;
 use emver::VersionRange;
-use models::DataUrl;
-use sqlx::PgPool;
 
-use super::v0_3_4::V0_3_0_COMPAT;
-use super::{v0_3_4_4, VersionT};
+use super::VersionT;
 use crate::prelude::*;
+use crate::version::Current;
+
+lazy_static::lazy_static! {
+    pub static ref V0_3_0_COMPAT: VersionRange = VersionRange::Conj(
+        Box::new(VersionRange::Anchor(
+            emver::GTE,
+            emver::Version::new(0, 3, 0, 0),
+        )),
+        Box::new(VersionRange::Anchor(emver::LTE, Current::new().semver())),
+    );
+}
 
 const V0_3_5: emver::Version = emver::Version::new(0, 3, 5, 0);
 
 #[derive(Clone, Debug)]
 pub struct Version;
 
-#[async_trait]
 impl VersionT for Version {
-    type Previous = v0_3_4_4::Version;
+    type Previous = Self;
     fn new() -> Self {
         Version
     }
@@ -27,86 +30,10 @@ impl VersionT for Version {
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
-        let peek = db.peek().await;
-        let mut url_replacements = BTreeMap::new();
-        for (_, pde) in peek.as_public().as_package_data().as_entries()? {
-            for (dependency, info) in pde
-                .as_installed()
-                .map(|i| i.as_dependency_info().as_entries())
-                .transpose()?
-                .into_iter()
-                .flatten()
-            {
-                if !url_replacements.contains_key(&dependency) {
-                    url_replacements.insert(
-                        dependency,
-                        DataUrl::from_path(
-                            <&Value>::from(info.as_icon())
-                                .as_str()
-                                .and_then(|i| i.strip_prefix("/public/package-data/"))
-                                .map(|path| {
-                                    Path::new("/embassy-data/package-data/public").join(path)
-                                })
-                                .unwrap_or_default(),
-                        )
-                        .await
-                        .unwrap_or_else(|_| {
-                            DataUrl::from_slice(
-                                "image/png",
-                                include_bytes!("../install/package-icon.png"),
-                            )
-                        }),
-                    );
-                }
-            }
-        }
-        let prev_zram = db
-            .mutate(|v| {
-                for (_, pde) in v.as_public_mut().as_package_data_mut().as_entries_mut()? {
-                    for (dependency, info) in pde
-                        .as_installed_mut()
-                        .map(|i| i.as_dependency_info_mut().as_entries_mut())
-                        .transpose()?
-                        .into_iter()
-                        .flatten()
-                    {
-                        if let Some(url) = url_replacements.get(&dependency) {
-                            info.as_icon_mut().ser(url)?;
-                        } else {
-                            info.as_icon_mut().ser(&DataUrl::from_slice(
-                                "image/png",
-                                include_bytes!("../install/package-icon.png"),
-                            ))?;
-                        }
-                        let manifest = <&mut Value>::from(&mut *info)
-                            .as_object_mut()
-                            .and_then(|o| o.remove("manifest"));
-                        if let Some(title) = manifest
-                            .as_ref()
-                            .and_then(|m| m.as_object())
-                            .and_then(|m| m.get("title"))
-                            .and_then(|t| t.as_str())
-                            .map(|s| s.to_owned())
-                        {
-                            info.as_title_mut().ser(&title)?;
-                        } else {
-                            info.as_title_mut().ser(&dependency.to_string())?;
-                        }
-                    }
-                }
-                v.as_public_mut()
-                    .as_server_info_mut()
-                    .as_zram_mut()
-                    .replace(&true)
-            })
-            .await?;
-        if !prev_zram {
-            crate::system::enable_zram().await?;
-        }
+    async fn up(&self, _db: &PatchDb) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
+    async fn down(&self, _db: &PatchDb) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_5_1.rs b/core/startos/src/version/v0_3_5_1.rs
index c004dc8b6..27e77c8ff 100644
--- a/core/startos/src/version/v0_3_5_1.rs
+++ b/core/startos/src/version/v0_3_5_1.rs
@@ -1,8 +1,6 @@
-use async_trait::async_trait;
 use emver::VersionRange;
-use sqlx::PgPool;
 
-use super::v0_3_4::V0_3_0_COMPAT;
+use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5, VersionT};
 use crate::prelude::*;
 
@@ -11,7 +9,6 @@ const V0_3_5_1: emver::Version = emver::Version::new(0, 3, 5, 1);
 #[derive(Clone, Debug)]
 pub struct Version;
 
-#[async_trait]
 impl VersionT for Version {
     type Previous = v0_3_5::Version;
     fn new() -> Self {
@@ -23,10 +20,10 @@ impl VersionT for Version {
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
+    async fn up(&self, _db: &PatchDb) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> {
+    async fn down(&self, _db: &PatchDb) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6.rs b/core/startos/src/version/v0_3_6.rs
new file mode 100644
index 000000000..b75e28b27
--- /dev/null
+++ b/core/startos/src/version/v0_3_6.rs
@@ -0,0 +1,29 @@
+use emver::VersionRange;
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_5_1, VersionT};
+use crate::prelude::*;
+
+const V0_3_6: emver::Version = emver::Version::new(0, 3, 6, 0);
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_5_1::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> emver::Version {
+        V0_3_6
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: &PatchDb) -> Result<(), Error> {
+        Err(Error::new(eyre!("unimplemented"), ErrorKind::Unknown))
+    }
+    async fn down(&self, _db: &PatchDb) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index f8c46c71e..2f8969a73 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -3,6 +3,7 @@ use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 
 pub use helpers::script_dir;
+use imbl_value::InternedString;
 pub use models::VolumeId;
 use models::{HostId, PackageId};
 use serde::{Deserialize, Serialize};
@@ -71,6 +72,15 @@ impl DerefMut for Volumes {
 impl Map for Volumes {
     type Key = VolumeId;
     type Value = Volume;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        match key {
+            VolumeId::Custom(id) => Ok(id.clone().into()),
+            _ => Self::key_str(key).map(|s| InternedString::intern(s.as_ref())),
+        }
+    }
 }
 
 pub fn data_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, volume_id: &VolumeId) -> PathBuf {

From 31ea0fe3fe35906638df73758d151da0818ee917 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 7 Mar 2024 14:57:41 -0700
Subject: [PATCH 042/341] fix async cycle

---
 core/startos/src/version/mod.rs | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 8fc6475f0..8ff42522f 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -1,7 +1,8 @@
 use std::cmp::Ordering;
 
 use color_eyre::eyre::eyre;
-use futures::Future;
+use futures::future::BoxFuture;
+use futures::{Future, FutureExt};
 use imbl_value::InternedString;
 
 use crate::prelude::*;
@@ -86,11 +87,11 @@ where
             }
         }
     }
-    fn migrate_from_unchecked<V: VersionT>(
-        &self,
-        version: &V,
-        db: &PatchDb,
-    ) -> impl Future<Output = Result<(), Error>> + Send {
+    fn migrate_from_unchecked<'a, V: VersionT>(
+        &'a self,
+        version: &'a V,
+        db: &'a PatchDb,
+    ) -> BoxFuture<'a, Result<(), Error>> {
         async {
             let previous = Self::Previous::new();
             if version.semver() < previous.semver() {
@@ -109,12 +110,13 @@ where
             self.commit(db).await?;
             Ok(())
         }
+        .boxed()
     }
-    fn rollback_to_unchecked<V: VersionT>(
-        &self,
-        version: &V,
-        db: &PatchDb,
-    ) -> impl Future<Output = Result<(), Error>> + Send {
+    fn rollback_to_unchecked<'a, V: VersionT>(
+        &'a self,
+        version: &'a V,
+        db: &'a PatchDb,
+    ) -> BoxFuture<'a, Result<(), Error>> {
         async {
             let previous = Self::Previous::new();
             tracing::info!("{} -> {}", self.semver(), previous.semver(),);
@@ -133,6 +135,7 @@ where
             }
             Ok(())
         }
+        .boxed()
     }
 }
 

From 2e7c3bf7890bddcbefb10bab58fa6436781aba14 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 7 Mar 2024 15:41:27 -0700
Subject: [PATCH 043/341] use dockerhub compat

---
 Makefile                        | 2 +-
 system-images/compat/Dockerfile | 9 +--------
 system-images/compat/Makefile   | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index f28bc8d5c..cb3d976e1 100644
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,7 @@ build/lib/depends build/lib/conflicts: build/dpkg-deps/*
 $(FIRMWARE_ROMS): build/lib/firmware.json download-firmware.sh $(PLATFORM_FILE)
 	./download-firmware.sh $(PLATFORM)
 
-system-images/compat/docker-images/$(ARCH).tar: $(COMPAT_SRC) core/Cargo.lock
+system-images/compat/docker-images/$(ARCH).tar: $(COMPAT_SRC)
 	cd system-images/compat && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
 
 system-images/utils/docker-images/$(ARCH).tar: $(UTILS_SRC)
diff --git a/system-images/compat/Dockerfile b/system-images/compat/Dockerfile
index d48ac3402..c01248b04 100644
--- a/system-images/compat/Dockerfile
+++ b/system-images/compat/Dockerfile
@@ -1,8 +1 @@
-FROM alpine:latest
-
-ARG ARCH
-
-RUN apk update && apk add duplicity curl
-ADD ./target/$ARCH-unknown-linux-musl/release/compat /usr/local/bin/compat
-
-ENTRYPOINT ["compat"]
+FROM start9/compat
\ No newline at end of file
diff --git a/system-images/compat/Makefile b/system-images/compat/Makefile
index 86d881193..b6cd1bfec 100644
--- a/system-images/compat/Makefile
+++ b/system-images/compat/Makefile
@@ -11,10 +11,10 @@ clean:
 docker-images:
 	mkdir docker-images
 
-docker-images/aarch64.tar: Dockerfile target/aarch64-unknown-linux-musl/release/compat docker-images
+docker-images/aarch64.tar: Dockerfile docker-images
 	docker buildx build --build-arg ARCH=aarch64 --tag start9/x_system/compat --platform=linux/arm64 -o type=docker,dest=docker-images/aarch64.tar .
 
-docker-images/x86_64.tar: Dockerfile target/x86_64-unknown-linux-musl/release/compat docker-images
+docker-images/x86_64.tar: Dockerfile docker-images
 	docker buildx build --build-arg ARCH=x86_64 --tag start9/x_system/compat --platform=linux/amd64 -o type=docker,dest=docker-images/x86_64.tar .
 
 target/aarch64-unknown-linux-musl/release/compat: $(COMPAT_SRC) ../../core/Cargo.lock

From 8665342edfd72758e7bf963cd645181bd921cf46 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 7 Mar 2024 16:43:13 -0700
Subject: [PATCH 044/341] fix deadlock

---
 core/startos/src/backup/restore.rs            |  1 +
 core/startos/src/db/prelude.rs                | 13 ++++++-------
 core/startos/src/disk/mount/filesystem/mod.rs |  2 +-
 core/startos/src/setup.rs                     |  1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index bae7eb58a..73d3c8f69 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -97,6 +97,7 @@ pub async fn recover_full_embassy(
 
     let db = ctx.db().await?;
     db.put(&ROOT, &Database::init(&os_backup.account)?).await?;
+    drop(db);
 
     init(&ctx.config).await?;
 
diff --git a/core/startos/src/db/prelude.rs b/core/startos/src/db/prelude.rs
index 911b2d389..0e90e2c88 100644
--- a/core/startos/src/db/prelude.rs
+++ b/core/startos/src/db/prelude.rs
@@ -1,4 +1,5 @@
 use std::collections::BTreeMap;
+use std::future::Future;
 use std::marker::PhantomData;
 use std::panic::UnwindSafe;
 use std::str::FromStr;
@@ -30,19 +31,17 @@ where
     patch_db::value::from_value(value).with_kind(ErrorKind::Deserialization)
 }
 
-#[async_trait::async_trait]
 pub trait PatchDbExt {
-    async fn peek(&self) -> DatabaseModel;
-    async fn mutate<U: UnwindSafe + Send>(
+    fn peek(&self) -> impl Future<Output = DatabaseModel> + Send;
+    fn mutate<U: UnwindSafe + Send>(
         &self,
         f: impl FnOnce(&mut DatabaseModel) -> Result<U, Error> + UnwindSafe + Send,
-    ) -> Result<U, Error>;
-    async fn map_mutate(
+    ) -> impl Future<Output = Result<U, Error>> + Send;
+    fn map_mutate(
         &self,
         f: impl FnOnce(DatabaseModel) -> Result<DatabaseModel, Error> + UnwindSafe + Send,
-    ) -> Result<DatabaseModel, Error>;
+    ) -> impl Future<Output = Result<DatabaseModel, Error>> + Send;
 }
-#[async_trait::async_trait]
 impl PatchDbExt for PatchDb {
     async fn peek(&self) -> DatabaseModel {
         DatabaseModel::from(self.dump(&ROOT).await.value)
diff --git a/core/startos/src/disk/mount/filesystem/mod.rs b/core/startos/src/disk/mount/filesystem/mod.rs
index 89fa0a415..53157937c 100644
--- a/core/startos/src/disk/mount/filesystem/mod.rs
+++ b/core/startos/src/disk/mount/filesystem/mod.rs
@@ -60,7 +60,7 @@ pub(self) async fn default_mount_command(
         cmd.arg(source.as_ref());
     }
     cmd.arg(mountpoint.as_ref());
-    Ok(dbg!(cmd))
+    Ok(cmd)
 }
 
 pub(self) async fn default_mount_impl(
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 8275f2d61..ed3a4661d 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -419,6 +419,7 @@ async fn fresh_setup(
     let account = AccountInfo::new(embassy_password, root_ca_start_time().await?)?;
     let db = ctx.db().await?;
     db.put(&ROOT, &Database::init(&account)?).await?;
+    drop(db);
     init(&ctx.config).await?;
     Ok((
         account.hostname,

From d986bd2a6c2ffc4f76eb4a9ab06310864e9da2e7 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 7 Mar 2024 17:19:01 -0700
Subject: [PATCH 045/341] sync ssh keys on add

---
 core/startos/src/init.rs |  3 ++-
 core/startos/src/ssh.rs  | 24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 68a57fca9..62bbdc58b 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -15,6 +15,7 @@ use crate::db::model::ServerStatus;
 use crate::disk::mount::util::unmount;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::prelude::*;
+use crate::ssh::SSH_AUTHORIZED_KEYS_FILE;
 use crate::util::cpupower::{get_available_governors, get_preferred_governor, set_governor};
 use crate::util::Invoke;
 use crate::{Error, ARCH};
@@ -212,7 +213,7 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
 
     crate::ssh::sync_keys(
         &peek.as_private().as_ssh_pubkeys().de()?,
-        "/home/start9/.ssh/authorized_keys",
+        SSH_AUTHORIZED_KEYS_FILE,
     )
     .await?;
     tracing::info!("Synced SSH Keys");
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index 8965c7edd..711d2ede9 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -14,7 +14,7 @@ use crate::prelude::*;
 use crate::util::clap::FromStrParser;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 
-static SSH_AUTHORIZED_KEYS_FILE: &str = "/home/start9/.ssh/authorized_keys";
+pub const SSH_AUTHORIZED_KEYS_FILE: &str = "/home/start9/.ssh/authorized_keys";
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct SshKeys(BTreeMap<InternedString, WithTimeData<SshPubKey>>);
@@ -113,20 +113,26 @@ pub struct AddParams {
 pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKeyResponse, Error> {
     let mut key = WithTimeData::new(key);
     let fingerprint = InternedString::intern(key.0.fingerprint_md5());
-    ctx.db
+    let (keys, res) = ctx
+        .db
         .mutate(move |m| {
             m.as_private_mut()
                 .as_ssh_pubkeys_mut()
                 .insert(&fingerprint, &key)?;
 
-            Ok(SshKeyResponse {
-                alg: key.0.keytype().to_owned(),
-                fingerprint,
-                hostname: key.0.comment.take().unwrap_or_default(),
-                created_at: key.created_at.to_rfc3339(),
-            })
+            Ok((
+                m.as_private().as_ssh_pubkeys().de()?,
+                SshKeyResponse {
+                    alg: key.0.keytype().to_owned(),
+                    fingerprint,
+                    hostname: key.0.comment.take().unwrap_or_default(),
+                    created_at: key.created_at.to_rfc3339(),
+                },
+            ))
         })
-        .await
+        .await?;
+    sync_keys(&keys, SSH_AUTHORIZED_KEYS_FILE).await?;
+    Ok(res)
 }
 
 #[derive(Deserialize, Serialize, Parser)]

From 4a285225db281036bc629118bf6034d51a2a706b Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Fri, 8 Mar 2024 14:46:44 -0700
Subject: [PATCH 046/341] chore: Update the version of the cargo

---
 core/Cargo.lock | 492 ++++++++++++++++++++++++++----------------------
 1 file changed, 262 insertions(+), 230 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 5435fe2b0..aec941882 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom 0.2.12",
@@ -101,9 +101,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "arrayref"
@@ -218,7 +218,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -229,7 +229,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -243,11 +243,11 @@ dependencies = [
 
 [[package]]
 name = "atomic-write-file"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436"
+checksum = "a8204db279bf648d64fe845bd8840f78b39c8132ed4d6a4194c3b10d4b4cfb0b"
 dependencies = [
- "nix 0.27.1",
+ "nix 0.28.0",
  "rand 0.8.5",
 ]
 
@@ -279,7 +279,7 @@ dependencies = [
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
- "http 0.2.11",
+ "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.28",
  "itoa",
@@ -307,10 +307,10 @@ dependencies = [
  "base64",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -342,7 +342,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 0.2.11",
+ "http 0.2.12",
  "http-body 0.4.6",
  "mime",
  "rustversion",
@@ -359,7 +359,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "mime",
@@ -379,10 +379,10 @@ checksum = "c1ad46c3ec4e12f4a4b6835e173ba21c25e484c9d02b49770bf006ce5367c036"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -562,9 +562,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.15.0"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "byteorder"
@@ -580,12 +580,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cfg-if"
@@ -593,11 +590,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "chrono"
-version = "0.4.34"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
+checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -605,7 +608,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -641,7 +644,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
- "half 2.3.1",
+ "half 2.4.0",
 ]
 
 [[package]]
@@ -680,9 +683,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.1"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
+checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -690,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.1"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -709,7 +712,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -955,9 +958,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1105,14 +1108,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.6"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955"
+checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1120,27 +1123,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.6"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855"
+checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.6"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be"
+checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1183,12 +1186,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -1254,9 +1251,9 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ecdsa"
@@ -1401,7 +1398,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1635,7 +1632,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1741,8 +1738,8 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.11",
- "indexmap 2.2.3",
+ "http 0.2.12",
+ "indexmap 2.2.5",
  "slab",
  "tokio",
  "tokio-util",
@@ -1760,8 +1757,8 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 1.0.0",
- "indexmap 2.2.3",
+ "http 1.1.0",
+ "indexmap 2.2.5",
  "slab",
  "tokio",
  "tokio-util",
@@ -1770,15 +1767,15 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
 
 [[package]]
 name = "half"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
+checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -1796,7 +1793,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
 ]
 
 [[package]]
@@ -1805,7 +1802,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
@@ -1868,9 +1865,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.6"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -1913,9 +1910,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1924,9 +1921,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -1940,7 +1937,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http 0.2.11",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
@@ -1951,7 +1948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
- "http 1.0.0",
+ "http 1.1.0",
 ]
 
 [[package]]
@@ -1962,7 +1959,7 @@ checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "pin-project-lite",
 ]
@@ -1996,7 +1993,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.3.24",
- "http 0.2.11",
+ "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
  "httpdate",
@@ -2011,20 +2008,21 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
+checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "h2 0.4.2",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "smallvec",
  "tokio",
 ]
 
@@ -2061,9 +2059,9 @@ checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2210,9 +2208,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.3"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -2286,7 +2284,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi 0.3.6",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -2401,9 +2399,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2450,34 +2448,33 @@ dependencies = [
 
 [[package]]
 name = "lalrpop"
-version = "0.20.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
+checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
 dependencies = [
  "ascii-canvas",
  "bit-set",
- "diff",
  "ena",
- "is-terminal",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "lalrpop-util",
  "petgraph",
  "pico-args",
  "regex",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
  "string_cache",
  "term",
  "tiny-keccak",
  "unicode-xid",
+ "walkdir",
 ]
 
 [[package]]
 name = "lalrpop-util"
-version = "0.20.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
+checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex",
+ "regex-automata 0.4.6",
 ]
 
 [[package]]
@@ -2557,9 +2554,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "matchers"
@@ -2646,9 +2643,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
@@ -2755,6 +2752,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2880,7 +2889,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.6",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -2902,7 +2911,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2928,9 +2937,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssh-keys"
@@ -2947,9 +2956,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.63"
+version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
  "bitflags 2.4.2",
  "cfg-if",
@@ -2968,7 +2977,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2988,9 +2997,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.99"
+version = "0.9.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
+checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
 dependencies = [
  "cc",
  "libc",
@@ -3157,7 +3166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
 ]
 
 [[package]]
@@ -3177,22 +3186,22 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -3356,7 +3365,7 @@ dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -3537,7 +3546,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.5",
+ "regex-automata 0.4.6",
  "regex-syntax 0.8.2",
 ]
 
@@ -3552,9 +3561,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3567,12 +3576,6 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
-[[package]]
-name = "regex-syntax"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -3581,9 +3584,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.24"
+version = "0.11.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946"
 dependencies = [
  "base64",
  "bytes",
@@ -3593,7 +3596,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.3.24",
- "http 0.2.11",
+ "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.28",
  "hyper-tls",
@@ -3702,9 +3705,9 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum 0.7.4",
- "clap 4.5.1",
+ "clap 4.5.2",
  "futures",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body-util",
  "imbl-value",
  "itertools 0.12.1",
@@ -3872,9 +3875,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7"
+checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8"
 
 [[package]]
 name = "rustls-webpki"
@@ -3933,9 +3936,18 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
 
 [[package]]
 name = "schannel"
@@ -4001,18 +4013,18 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
@@ -4030,7 +4042,7 @@ dependencies = [
 name = "serde_cbor"
 version = "0.11.1"
 dependencies = [
- "half 1.8.2",
+ "half 1.8.3",
  "serde",
 ]
 
@@ -4040,28 +4052,28 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
- "half 1.8.2",
+ "half 1.8.3",
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "itoa",
  "ryu",
  "serde",
@@ -4108,7 +4120,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4125,16 +4137,16 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.31"
+version = "0.9.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e"
+checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "itoa",
  "ryu",
  "serde",
@@ -4281,12 +4293,12 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4344,7 +4356,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
  "atoi",
  "byteorder",
  "bytes",
@@ -4361,7 +4373,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "log",
  "memchr",
  "once_cell",
@@ -4552,7 +4564,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.49",
+ "syn 2.0.52",
  "unicode-width",
 ]
 
@@ -4616,7 +4628,7 @@ dependencies = [
  "bytes",
  "chrono",
  "ciborium",
- "clap 4.5.1",
+ "clap 4.5.2",
  "color-eyre",
  "console",
  "console-subscriber",
@@ -4635,12 +4647,12 @@ dependencies = [
  "helpers",
  "hex",
  "hmac",
- "http 1.0.0",
+ "http 1.1.0",
  "id-pool",
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "indicatif",
  "integer-encoding",
  "ipnet",
@@ -4786,9 +4798,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.49"
+version = "2.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4803,20 +4815,20 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
 name = "system-configuration"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4841,9 +4853,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -4904,7 +4916,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4920,9 +4932,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5021,7 +5033,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5150,7 +5162,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5163,7 +5175,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -5174,11 +5186,11 @@ version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.1",
+ "winnow 0.6.5",
 ]
 
 [[package]]
@@ -5193,7 +5205,7 @@ dependencies = [
  "base64",
  "bytes",
  "h2 0.3.24",
- "http 0.2.11",
+ "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.28",
  "hyper-timeout",
@@ -5211,7 +5223,7 @@ dependencies = [
 [[package]]
 name = "torut"
 version = "0.2.1"
-source = "git+https://github.com/Start9Labs/torut.git?branch=update/dependencies#2b6fa9528d22e0b276132bccf7f2e9308f84b2c7"
+source = "git+https://github.com/Start9Labs/torut.git?branch=update/dependencies#cc7a1425a01214465e106975e6690794d8551bdb"
 dependencies = [
  "base32",
  "base64",
@@ -5279,7 +5291,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5423,7 +5435,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 1.0.0",
+ "http 1.1.0",
  "httparse",
  "log",
  "native-tls",
@@ -5451,7 +5463,7 @@ checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5489,9 +5501,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
@@ -5598,6 +5610,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -5619,11 +5641,17 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5631,24 +5659,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5658,9 +5686,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5668,22 +5696,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-streams"
@@ -5700,9 +5728,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5716,9 +5744,13 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "whoami"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
+checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e"
+dependencies = [
+ "redox_syscall 0.4.1",
+ "wasite",
+]
 
 [[package]]
 name = "winapi"
@@ -5757,7 +5789,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5775,7 +5807,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5795,17 +5827,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
 [[package]]
@@ -5816,9 +5848,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5828,9 +5860,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5840,9 +5872,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5852,9 +5884,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5864,9 +5896,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5876,9 +5908,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5888,9 +5920,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "winnow"
@@ -5903,9 +5935,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.1"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
 dependencies = [
  "memchr",
 ]
@@ -5967,7 +5999,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f355ab62ebe30b758c1f4ab096a306722c4b7dbfb9d8c07d18c70d71a945588"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
  "hashbrown 0.13.2",
  "lazy_static",
  "serde",
@@ -5990,7 +6022,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -6010,5 +6042,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.49",
+ "syn 2.0.52",
 ]

From 99bb55af73a01d57dd15b91c152bb37f692daa57 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 11 Mar 2024 15:37:04 -0600
Subject: [PATCH 047/341] Update some of the types

---
 .../Systems/SystemForEmbassy/index.ts         | 73 +++++++++++++++++--
 core/startos/src/db/model.rs                  | 12 +--
 core/startos/src/properties.rs                | 50 ++++++++++++-
 .../app-interfaces/app-interfaces.page.ts     |  8 +-
 4 files changed, 122 insertions(+), 21 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 8495a669b..fd8f81204 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -1,14 +1,11 @@
-import { types as T, util, EmVer } from "@start9labs/start-sdk"
+import { types as T, util, EmVer, Utils } from "@start9labs/start-sdk"
 import * as fs from "fs/promises"
 
 import { PolyfillEffects } from "./polyfillEffects"
 import { Duration, duration } from "../../../Models/Duration"
-import { ExecuteResult, System } from "../../../Interfaces/System"
+import { System } from "../../../Interfaces/System"
 import { matchManifest, Manifest, Procedure } from "./matchManifest"
-import { create } from "domain"
 import * as childProcess from "node:child_process"
-import { Volume } from "../../../Models/Volume"
-import { DockerProcedure } from "../../../Models/DockerProcedure"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { promisify } from "node:util"
 import * as U from "./oldEmbassyTypes"
@@ -28,9 +25,7 @@ import {
 } from "ts-matches"
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
-import { HostSystem } from "../../../Interfaces/HostSystem"
 import { RpcResult, matchRpcResult } from "../../RpcListener"
-import { ServiceInterface } from "../../../../../sdk/dist/cjs/lib/types"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -42,6 +37,60 @@ const MANIFEST_LOCATION = "/usr/lib/startos/package/embassyManifest.json"
 const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
 const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig"
 
+const matchPackagePropertyObject = object({
+  value: any,
+  type: literal("object"),
+  description: string,
+})
+
+const matchPackagePropertyString = object(
+  {
+    type: literal("string"),
+    description: string,
+    value: string,
+    copyable: boolean,
+    qr: boolean,
+    masked: boolean,
+  },
+  ["copyable", "description", "qr", "masked"],
+)
+
+const matchProperties = object({
+  version: literal(2),
+  data: any,
+})
+
+type ExportUi = {
+  value: string
+  title: string
+  description?: string | undefined
+  masked?: boolean | undefined
+  copyable?: boolean | undefined
+  qr?: boolean | undefined
+}
+
+function propertiesToExportUi(properties: unknown): ExportUi[] {
+  if (!object.test(properties)) return []
+  const paths: ExportUi[] = []
+  for (const key in properties) {
+    const value: unknown = (properties as any)[key]
+    if (matchPackagePropertyObject.test(value)) {
+      paths.push(...propertiesToExportUi(value))
+      continue
+    }
+    if (!matchPackagePropertyString.test(value)) continue
+    paths.push({
+      value: value.value,
+      title: key,
+      description: value.description,
+      masked: value.masked,
+      copyable: value.copyable,
+      qr: value.qr,
+    })
+  }
+  return paths
+}
+
 export class SystemForEmbassy implements System {
   currentRunning: MainLoop | undefined
   static async of(manifestLocation: string = MANIFEST_LOCATION) {
@@ -399,7 +448,7 @@ export class SystemForEmbassy implements System {
         setConfigValue,
         this.manifest.volumes,
       )
-      return JSON.parse(
+      const properties = JSON.parse(
         (
           await container.exec([
             setConfigValue.entrypoint,
@@ -407,6 +456,14 @@ export class SystemForEmbassy implements System {
           ])
         ).stdout.toString(),
       )
+      const exposeUis = propertiesToExportUi(properties)
+      await effects.store.set<any, any>({
+        path: "/properties",
+        value: exposeUis.map((x) => x.value),
+      })
+      await effects.exposeUi(
+        exposeUis.map((x, i) => ({ ...x, path: `/properties/${i}` }) as any),
+      )
     } else if (setConfigValue.type === "script") {
       const moduleCode = this.moduleCode
       const method = moduleCode.properties
diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs
index 19cfa37a1..92707060a 100644
--- a/core/startos/src/db/model.rs
+++ b/core/startos/src/db/model.rs
@@ -530,12 +530,12 @@ pub struct ExposedDependent {
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
 #[model = "Model<Self>"]
 pub struct ExposedUI {
-    path: Vec<JsonPointer>,
-    title: String,
-    description: Option<String>,
-    masked: Option<bool>,
-    copyable: Option<bool>,
-    qr: Option<bool>,
+    pub path: JsonPointer,
+    pub title: String,
+    pub description: Option<String>,
+    pub masked: Option<bool>,
+    pub copyable: Option<bool>,
+    pub qr: Option<bool>,
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 9c503c3f6..9d3a67054 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -1,16 +1,41 @@
 use clap::Parser;
+use imbl_value::{json, Value};
 use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
 
-use crate::context::RpcContext;
+use crate::prelude::*;
 use crate::Error;
+use crate::{context::RpcContext, db::model::ExposedUI};
 
 pub fn display_properties(response: Value) {
     println!("{}", response);
 }
 
+trait IntoProperties {
+    fn into_properties(self, store: &Value) -> Value;
+}
+impl IntoProperties for Vec<ExposedUI> {
+    fn into_properties(self, store: &Value) -> Value {
+        let mut data = json!({});
+        for ui in self {
+            let value = ui.path.get(store);
+            data[ui.title] = json!({
+                "type": "string",
+                "description": ui.description,
+                "value": value.map(|x| x.to_string()).unwrap_or_default(),
+                "copyable": ui.copyable,
+                "qr": ui.qr,
+                "masked": ui.masked,
+            });
+        }
+        json!({
+            "version": 2,
+            "data": data
+        })
+    }
+}
+
 #[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
@@ -22,5 +47,24 @@ pub async fn properties(
     ctx: RpcContext,
     PropertiesParam { id }: PropertiesParam,
 ) -> Result<Value, Error> {
-    Ok(todo!())
+    let peeked = ctx.db.peek().await;
+    let data = peeked
+        .as_public()
+        .as_package_data()
+        .as_idx(&id)
+        .or_not_found(&id)?
+        .as_installed()
+        .or_not_found(&id)?
+        .as_store()
+        .de()?;
+    Ok(peeked
+        .as_public()
+        .as_package_data()
+        .as_idx(&id)
+        .or_not_found(&id)?
+        .as_installed()
+        .or_not_found(&id)?
+        .as_store_exposed_ui()
+        .de()?
+        .into_properties(&data))
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 3678474e6..84645fb9d 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -7,10 +7,10 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import { QRComponent } from 'src/app/components/qr/qr.component'
 import { map } from 'rxjs'
-import {
-  ServiceInterface,
-  ServiceInterfaceWithHostInfo,
-} from '@start9labs/start-sdk/mjs/lib/types'
+import { types as T } from '@start9labs/start-sdk'
+
+type ServiceInterface = T.ServiceInterface
+type ServiceInterfaceWithHostInfo = T.ServiceInterfaceWithHostInfo
 
 type MappedInterface = ServiceInterface & {
   addresses: MappedAddress[]

From dc3dc4a1f037f90293bf53f66fe8a44d23e3370a Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 11 Mar 2024 15:47:22 -0600
Subject: [PATCH 048/341] chore: Update some of the system for the embassy
 properties to be filled with the correct properties. git push

---
 .../Systems/SystemForEmbassy/index.ts         | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index fd8f81204..a87facc56 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -227,13 +227,9 @@ export class SystemForEmbassy implements System {
     effects: HostSystemStartOs,
     previousVersion: Optional<string>,
   ): Promise<void> {
-    console.log("here1")
     if (previousVersion) await this.migration(effects, previousVersion)
-    console.log("here2")
     await this.properties(effects)
-    console.log("here3")
     await effects.setMainStatus({ status: "stopped" })
-    console.log("here4")
   }
   private async uninit(
     effects: HostSystemStartOs,
@@ -456,7 +452,8 @@ export class SystemForEmbassy implements System {
           ])
         ).stdout.toString(),
       )
-      const exposeUis = propertiesToExportUi(properties)
+      if (!matchProperties.test(properties)) return
+      const exposeUis = propertiesToExportUi(properties.data)
       await effects.store.set<any, any>({
         path: "/properties",
         value: exposeUis.map((x) => x.value),
@@ -469,11 +466,22 @@ export class SystemForEmbassy implements System {
       const method = moduleCode.properties
       if (!method)
         throw new Error("Expecting that the method properties exists")
-      await method(new PolyfillEffects(effects, this.manifest)).then((x) => {
+      const properties = await method(
+        new PolyfillEffects(effects, this.manifest),
+      ).then((x) => {
         if ("result" in x) return x.result
         if ("error" in x) throw new Error("Error getting config: " + x.error)
         throw new Error("Error getting config: " + x["error-code"][1])
       })
+      if (!matchProperties.test(properties)) return
+      const exposeUis = propertiesToExportUi(properties.data)
+      await effects.store.set<any, any>({
+        path: "/properties",
+        value: exposeUis.map((x) => x.value),
+      })
+      await effects.exposeUi(
+        exposeUis.map((x, i) => ({ ...x, path: `/properties/${i}` }) as any),
+      )
     }
   }
   private async health(

From 1308b5bcf33c1d0778d06d7eb32c1138199f4ead Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 11 Mar 2024 16:10:59 -0600
Subject: [PATCH 049/341] wait up to 30s for ip address

---
 Makefile                                      |  1 +
 core/startos/src/lxc/mod.rs                   | 38 ++++++++++++-------
 .../src/service/persistent_container.rs       |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index cb3d976e1..bc1edc6fe 100644
--- a/Makefile
+++ b/Makefile
@@ -148,6 +148,7 @@ update-overlay: $(ALL_TARGETS)
 	$(call ssh,"sudo systemctl start startd")
 
 wormhole: core/target/$(ARCH)-unknown-linux-musl/release/startbox
+	@echo "Paste the following command into the shell of your start-os server:"
 	@wormhole send core/target/$(ARCH)-unknown-linux-musl/release/startbox 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade \"cd /usr/bin && rm startbox && wormhole receive --accept-file %s && chmod +x startbox\"\n", $$3 }'
 
 update: $(ALL_TARGETS)
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 374952f98..f77837238 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -38,6 +38,7 @@ const LXC_CONTAINER_DIR: &str = "/var/lib/lxc";
 const RPC_DIR: &str = "media/startos/rpc"; // must not be absolute path
 pub const CONTAINER_RPC_SERVER_SOCKET: &str = "service.sock"; // must not be absolute path
 pub const HOST_RPC_SERVER_SOCKET: &str = "host.sock"; // must not be absolute path
+const CONTAINER_DHCP_TIMEOUT: Duration = Duration::from_secs(30);
 
 pub struct LxcManager {
     containers: Mutex<Vec<Weak<InternedString>>>,
@@ -110,7 +111,6 @@ impl LxcManager {
 pub struct LxcContainer {
     manager: Weak<LxcManager>,
     rootfs: OverlayGuard,
-    ip: Ipv4Addr,
     guid: Arc<InternedString>,
     rpc_bind: TmpMountGuard,
     config: LxcConfig,
@@ -171,20 +171,9 @@ impl LxcContainer {
             .arg(&*guid)
             .invoke(ErrorKind::Lxc)
             .await?;
-        let ip = String::from_utf8(
-            Command::new("lxc-info")
-                .arg("--name")
-                .arg(&*guid)
-                .arg("-iH")
-                .invoke(ErrorKind::Docker)
-                .await?,
-        )?
-        .trim()
-        .parse()?;
         Ok(Self {
             manager: Arc::downgrade(manager),
             rootfs,
-            ip,
             guid: Arc::new(guid),
             rpc_bind,
             config,
@@ -196,8 +185,29 @@ impl LxcContainer {
         self.rootfs.path()
     }
 
-    pub fn ip(&self) -> Ipv4Addr {
-        self.ip
+    pub async fn ip(&self) -> Result<Ipv4Addr, Error> {
+        let start = Instant::now();
+        loop {
+            let output = String::from_utf8(
+                Command::new("lxc-info")
+                    .arg("--name")
+                    .arg(&*self.guid)
+                    .arg("-iH")
+                    .invoke(ErrorKind::Docker)
+                    .await?,
+            )?;
+            let out_str = output.trim();
+            if !out_str.is_empty() {
+                return Ok(out_str.parse()?);
+            }
+            if start.elapsed() > CONTAINER_DHCP_TIMEOUT {
+                return Err(Error::new(
+                    eyre!("Timed out waiting for container to acquire DHCP lease"),
+                    ErrorKind::Timeout,
+                ));
+            }
+            tokio::time::sleep(Duration::from_millis(100)).await;
+        }
     }
 
     pub fn rpc_dir(&self) -> &Path {
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 523b5f19a..a3756b37a 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -180,7 +180,7 @@ impl PersistentContainer {
         }
         let net_service = ctx
             .net_controller
-            .create_service(s9pk.as_manifest().id.clone(), lxc_container.ip())
+            .create_service(s9pk.as_manifest().id.clone(), lxc_container.ip().await?)
             .await?;
         Ok(Self {
             s9pk,

From 4d402b26003e87f38c94988c8d597056cc30de88 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 11 Mar 2024 16:34:37 -0600
Subject: [PATCH 050/341] chore: Fix the issue that I made that made it
 impossible to start a service because that would do a set during a time when
 there was not even a installed state

---
 container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index a87facc56..75ff16da6 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -228,7 +228,6 @@ export class SystemForEmbassy implements System {
     previousVersion: Optional<string>,
   ): Promise<void> {
     if (previousVersion) await this.migration(effects, previousVersion)
-    await this.properties(effects)
     await effects.setMainStatus({ status: "stopped" })
   }
   private async uninit(

From c99d9d95c57391b537ac20edb0360ca50c6223f3 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 11 Mar 2024 17:06:00 -0600
Subject: [PATCH 051/341] chore: Add in the properties to somewhere useful.

---
 .../Adapters/Systems/SystemForEmbassy/index.ts | 18 ++++++++++++------
 .../src/service/service_effect_handler.rs      |  3 +++
 sdk/lib/inits/setupInit.ts                     |  2 +-
 sdk/lib/types.ts                               |  4 +++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 75ff16da6..79c797293 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -457,9 +457,12 @@ export class SystemForEmbassy implements System {
         path: "/properties",
         value: exposeUis.map((x) => x.value),
       })
-      await effects.exposeUi(
-        exposeUis.map((x, i) => ({ ...x, path: `/properties/${i}` }) as any),
-      )
+      await effects.exposeUi({
+        paths: exposeUis.map((x, i) => ({
+          ...x,
+          path: `/properties/${i}`,
+        })) as any[],
+      })
     } else if (setConfigValue.type === "script") {
       const moduleCode = this.moduleCode
       const method = moduleCode.properties
@@ -478,9 +481,12 @@ export class SystemForEmbassy implements System {
         path: "/properties",
         value: exposeUis.map((x) => x.value),
       })
-      await effects.exposeUi(
-        exposeUis.map((x, i) => ({ ...x, path: `/properties/${i}` }) as any),
-      )
+      await effects.exposeUi({
+        paths: exposeUis.map((x, i) => ({
+          ...x,
+          path: `/properties/${i}`,
+        })) as any[],
+      })
     }
   }
   private async health(
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index ea2228e81..48e27134b 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -340,6 +340,9 @@ async fn set_store(
                 .or_not_found(&package_id)?
                 .as_store_mut();
             let mut model_value = model.de()?;
+            if model_value.is_null() {
+                model_value = json!({});
+            }
             path.set(&mut model_value, value, true)
                 .with_kind(ErrorKind::ParseDbField)?;
             model.ser(&model_value)
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index 7d4586ef1..9139de23b 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -32,7 +32,7 @@ export function setupInit<Manifest extends SDKManifest, Store>(
         utils,
       })
       await opts.effects.exposeForDependents(services)
-      await opts.effects.exposeUi(ui)
+      await opts.effects.exposeUi({ paths: ui })
     },
     uninit: async (opts) => {
       await migrations.uninit(opts)
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index a53b3d273..335372d6c 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -372,7 +372,9 @@ export type Effects = {
     options: ExposeServicePaths<Store>,
   ): Promise<void>
 
-  exposeUi<Store = never>(options: ExposeUiPaths<Store>): Promise<void>
+  exposeUi<Store = never>(options: {
+    paths: ExposeUiPaths<Store>
+  }): Promise<void>
   /**
    * There are times that we want to see the addresses that where exported
    * @param options.addressId If we want to filter the address id

From 750f35bc363f4c14e1b186a2df4810bcf9b4217e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 11 Mar 2024 17:15:18 -0600
Subject: [PATCH 052/341] add `--include-private` to db dump rpc

---
 core/startos/src/db/mod.rs | 34 ++++++++++++++++++++++++++--------
 patch-db                   |  2 +-
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index bf09c0ff2..bfb8435e2 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -182,8 +182,18 @@ pub enum RevisionsRes {
     Dump(Dump),
 }
 
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct CliDumpParams {
+    path: Option<PathBuf>,
+}
+
 #[instrument(skip_all)]
-async fn cli_dump(ctx: CliContext, DumpParams { path }: DumpParams) -> Result<Dump, RpcError> {
+async fn cli_dump(
+    ctx: CliContext,
+    CliDumpParams { path }: CliDumpParams,
+) -> Result<Dump, RpcError> {
     let dump = if let Some(path) = path {
         PatchDb::open(path).await?.dump(&ROOT).await
     } else {
@@ -197,15 +207,23 @@ async fn cli_dump(ctx: CliContext, DumpParams { path }: DumpParams) -> Result<Du
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct DumpParams {
-    path: Option<PathBuf>,
+    #[arg(long = "include-private", short = 'p')]
+    #[serde(default)]
+    include_private: bool,
 }
 
-// #[command(
-//     custom_cli(cli_dump(async, context(CliContext))),
-//     display(display_serializable)
-// )]
-pub async fn dump(ctx: RpcContext, _: DumpParams) -> Result<Dump, Error> {
-    Ok(ctx.db.dump(&*PUBLIC).await)
+pub async fn dump(
+    ctx: RpcContext,
+    DumpParams { include_private }: DumpParams,
+) -> Result<Dump, Error> {
+    Ok(ctx
+        .db
+        .dump(&if include_private {
+            ROOT
+        } else {
+            PUBLIC.borrowed()
+        })
+        .await)
 }
 
 #[instrument(skip_all)]
diff --git a/patch-db b/patch-db
index 899c63afb..3dc11afd4 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 899c63afb5367c66bca6cafb98164d8cbd78f7e3
+Subproject commit 3dc11afd46d93094ac52ae1fef311a91c4561e8c

From ba325b1581e82c1f7d91ce59ac6827b11b8146a6 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 12 Mar 2024 11:58:13 -0600
Subject: [PATCH 053/341] feat: Move the store to private.

---
 core/startos/src/db/mod.rs                    | 29 ++++++++++++-------
 core/startos/src/db/model.rs                  |  4 ++-
 core/startos/src/properties.rs                | 11 +++----
 core/startos/src/service/mod.rs               |  1 -
 .../src/service/service_effect_handler.rs     | 17 ++++-------
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index bfb8435e2..5ef140dcb 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -186,18 +186,30 @@ pub enum RevisionsRes {
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct CliDumpParams {
+    #[arg(long = "include-private", short = 'p')]
+    #[serde(default)]
+    include_private: bool,
     path: Option<PathBuf>,
 }
 
 #[instrument(skip_all)]
 async fn cli_dump(
     ctx: CliContext,
-    CliDumpParams { path }: CliDumpParams,
+    CliDumpParams {
+        path,
+        include_private,
+    }: CliDumpParams,
 ) -> Result<Dump, RpcError> {
     let dump = if let Some(path) = path {
         PatchDb::open(path).await?.dump(&ROOT).await
     } else {
-        from_value::<Dump>(ctx.call_remote("db.dump", imbl_value::json!({})).await?)?
+        from_value::<Dump>(
+            ctx.call_remote(
+                "db.dump",
+                imbl_value::json!({ "include-private":include_private }),
+            )
+            .await?,
+        )?
     };
 
     Ok(dump)
@@ -216,14 +228,11 @@ pub async fn dump(
     ctx: RpcContext,
     DumpParams { include_private }: DumpParams,
 ) -> Result<Dump, Error> {
-    Ok(ctx
-        .db
-        .dump(&if include_private {
-            ROOT
-        } else {
-            PUBLIC.borrowed()
-        })
-        .await)
+    Ok(if include_private {
+        ctx.db.dump(&ROOT).await
+    } else {
+        ctx.db.dump(&PUBLIC).await
+    })
 }
 
 #[instrument(skip_all)]
diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs
index 92707060a..f166ed3e0 100644
--- a/core/startos/src/db/model.rs
+++ b/core/startos/src/db/model.rs
@@ -120,6 +120,7 @@ impl Database {
                 sessions: Sessions::new(),
                 notifications: Notifications::new(),
                 cifs: CifsTargets::new(),
+                package_stores: BTreeMap::new(),
             }, // TODO
         })
     }
@@ -149,6 +150,8 @@ pub struct Private {
     pub sessions: Sessions,
     pub notifications: Notifications,
     pub cifs: CifsTargets,
+    #[serde(default)]
+    pub package_stores: BTreeMap<PackageId, Value>,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
@@ -513,7 +516,6 @@ pub struct InstalledPackageInfo {
     pub current_dependencies: CurrentDependencies,
     pub interface_addresses: InterfaceAddressMap,
     pub hosts: HostInfo,
-    pub store: Value,
     pub store_exposed_ui: Vec<ExposedUI>,
     pub store_exposed_dependents: Vec<JsonPointer>,
 }
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 9d3a67054..1a8315cc3 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -49,14 +49,11 @@ pub async fn properties(
 ) -> Result<Value, Error> {
     let peeked = ctx.db.peek().await;
     let data = peeked
-        .as_public()
-        .as_package_data()
+        .as_private()
+        .as_package_stores()
         .as_idx(&id)
-        .or_not_found(&id)?
-        .as_installed()
-        .or_not_found(&id)?
-        .as_store()
-        .de()?;
+        .map(|x| x.de())
+        .unwrap_or_else(|| Ok(json!({})))?;
     Ok(peeked
         .as_public()
         .as_package_data()
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 1efb116d5..83f03fc4b 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -290,7 +290,6 @@ impl Service {
                             manifest: manifest.clone(),
                             last_backup: None,                            // TODO
                             hosts: Default::default(),                    // TODO
-                            store: Value::Null,                           // TODO
                             store_exposed_dependents: Default::default(), // TODO
                             store_exposed_ui: Default::default(),         // TODO
                         },
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 48e27134b..08de40b8f 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -300,13 +300,10 @@ async fn get_store(
     let peeked = context.ctx.db.peek().await;
     let package_id = package_id.unwrap_or(context.id.clone());
     let value = peeked
-        .as_public()
-        .as_package_data()
+        .as_private()
+        .as_package_stores()
         .as_idx(&package_id)
         .or_not_found(&package_id)?
-        .as_installed()
-        .or_not_found(&package_id)?
-        .as_store()
         .de()?;
 
     Ok(path
@@ -332,13 +329,9 @@ async fn set_store(
         .db
         .mutate(|db| {
             let model = db
-                .as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package_id)
-                .or_not_found(&package_id)?
-                .as_installed_mut()
-                .or_not_found(&package_id)?
-                .as_store_mut();
+                .as_private_mut()
+                .as_package_stores_mut()
+                .upsert(&package_id, || Box::new(json!({})))?;
             let mut model_value = model.de()?;
             if model_value.is_null() {
                 model_value = json!({});

From b6fe0be1b24bfc01008fa32ae1656533dbfccace Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 13 Mar 2024 16:23:24 -0600
Subject: [PATCH 054/341] chore: Add in some more files for the testing of the
 sdk and the rust interface

---
 Makefile                                      |   6 +-
 core/Cargo.lock                               |  31 +++
 core/models/Cargo.toml                        |   1 +
 core/models/src/id/action.rs                  |   2 +-
 core/models/src/id/health_check.rs            |   2 +-
 core/models/src/id/image.rs                   |   2 +-
 core/models/src/id/mod.rs                     |  14 +-
 core/models/src/id/package.rs                 |   5 +-
 core/startos/Cargo.toml                       |   1 +
 core/startos/Effects.ts                       |   3 +
 core/startos/bindings/AddSslOptions.ts        |   3 +
 core/startos/bindings/Algorithm.ts            |   3 +
 core/startos/bindings/BindKind.ts             |   3 +
 core/startos/bindings/BindParams.ts           |   5 +
 core/startos/bindings/Callback.ts             |   3 +
 core/startos/bindings/ChrootParams.ts         |   3 +
 .../bindings/CreateOverlayedImageParams.ts    |   4 +
 .../bindings/DestroyOverlayedImageParams.ts   |   4 +
 core/startos/bindings/ExecuteAction.ts        |   5 +
 .../bindings/ExposeForDependentsParams.ts     |   3 +
 core/startos/bindings/ExposeUiParams.ts       |   4 +
 core/startos/bindings/GetHostInfoParams.ts    |   5 +
 .../startos/bindings/GetHostInfoParamsKind.ts |   3 +
 .../bindings/GetServiceInterfaceParams.ts     |   5 +
 .../bindings/GetSslCertificateParams.ts       |   4 +
 core/startos/bindings/GetSslKeyParams.ts      |   4 +
 core/startos/bindings/GetStoreParams.ts       |   4 +
 core/startos/bindings/ParamsMaybePackageId.ts |   4 +
 core/startos/bindings/ParamsPackageId.ts      |   4 +
 core/startos/bindings/SetConfigured.ts        |   3 +
 core/startos/bindings/SetHealth.ts            |   5 +
 core/startos/bindings/SetMainStatus.ts        |   4 +
 core/startos/bindings/SetStoreParams.ts       |   3 +
 core/startos/bindings/Status.ts               |   3 +
 core/startos/src/db/model.rs                  |   3 +-
 .../src/service/service_effect_handler.rs     | 192 ++++++++++++++----
 core/startos/src/status/health_check.rs       |   2 +-
 sdk/lib/health/HealthCheck.ts                 |   2 +-
 sdk/lib/health/checkFns/CheckResult.ts        |   2 +-
 sdk/lib/interfaces/Host.ts                    |   9 +-
 sdk/lib/test/host.test.ts                     |   5 +-
 sdk/lib/test/startosTypeValidation.test.ts    |  75 +++++++
 sdk/lib/types.ts                              |  93 +++++----
 sdk/lib/util/getServiceInterface.ts           |   7 +-
 sdk/lib/util/getServiceInterfaces.ts          |   8 +-
 sdk/lib/util/utils.ts                         |  11 +-
 46 files changed, 451 insertions(+), 116 deletions(-)
 create mode 100644 core/startos/Effects.ts
 create mode 100644 core/startos/bindings/AddSslOptions.ts
 create mode 100644 core/startos/bindings/Algorithm.ts
 create mode 100644 core/startos/bindings/BindKind.ts
 create mode 100644 core/startos/bindings/BindParams.ts
 create mode 100644 core/startos/bindings/Callback.ts
 create mode 100644 core/startos/bindings/ChrootParams.ts
 create mode 100644 core/startos/bindings/CreateOverlayedImageParams.ts
 create mode 100644 core/startos/bindings/DestroyOverlayedImageParams.ts
 create mode 100644 core/startos/bindings/ExecuteAction.ts
 create mode 100644 core/startos/bindings/ExposeForDependentsParams.ts
 create mode 100644 core/startos/bindings/ExposeUiParams.ts
 create mode 100644 core/startos/bindings/GetHostInfoParams.ts
 create mode 100644 core/startos/bindings/GetHostInfoParamsKind.ts
 create mode 100644 core/startos/bindings/GetServiceInterfaceParams.ts
 create mode 100644 core/startos/bindings/GetSslCertificateParams.ts
 create mode 100644 core/startos/bindings/GetSslKeyParams.ts
 create mode 100644 core/startos/bindings/GetStoreParams.ts
 create mode 100644 core/startos/bindings/ParamsMaybePackageId.ts
 create mode 100644 core/startos/bindings/ParamsPackageId.ts
 create mode 100644 core/startos/bindings/SetConfigured.ts
 create mode 100644 core/startos/bindings/SetHealth.ts
 create mode 100644 core/startos/bindings/SetMainStatus.ts
 create mode 100644 core/startos/bindings/SetStoreParams.ts
 create mode 100644 core/startos/bindings/Status.ts
 create mode 100644 sdk/lib/test/startosTypeValidation.test.ts

diff --git a/Makefile b/Makefile
index bc1edc6fe..286f79da5 100644
--- a/Makefile
+++ b/Makefile
@@ -173,7 +173,11 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 	npm --prefix container-runtime ci
 	touch container-runtime/node_modules
 
-sdk/dist: $(shell git ls-files sdk)
+core/startos/bindings: $(CORE_SRC) $(ENVIRONMENT_FILE) $(PLATFORM_FILE)
+	(cd core/ && cargo test)
+	touch core/startos/bindings
+
+sdk/dist: $(shell git ls-files sdk) core/startos/bindings
 	(cd sdk && make bundle)
 
 container-runtime/dist: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
diff --git a/core/Cargo.lock b/core/Cargo.lock
index aec941882..2d800eda1 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+
 [[package]]
 name = "addr2line"
 version = "0.21.0"
@@ -2679,6 +2685,7 @@ dependencies = [
  "tokio",
  "torut",
  "tracing",
+ "ts-rs",
  "yasi",
 ]
 
@@ -4723,6 +4730,7 @@ dependencies = [
  "tracing-journald",
  "tracing-subscriber",
  "trust-dns-server",
+ "ts-rs",
  "typed-builder",
  "url",
  "urlencoding",
@@ -5426,6 +5434,29 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "ts-rs"
+version = "7.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc2cae1fc5d05d47aa24b64f9a4f7cba24cdc9187a2084dd97ac57bef5eccae6"
+dependencies = [
+ "thiserror",
+ "ts-rs-macros",
+]
+
+[[package]]
+name = "ts-rs-macros"
+version = "7.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f7f9b821696963053a89a7bd8b292dc34420aea8294d7b225274d488f3ec92"
+dependencies = [
+ "Inflector",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+ "termcolor",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.21.0"
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index 250ba22a7..9f6a53443 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -32,6 +32,7 @@ sqlx = { version = "0.7.2", features = [
   "postgres",
 ] }
 ssh-key = "0.6.2"
+ts-rs = "7"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies" }
diff --git a/core/models/src/id/action.rs b/core/models/src/id/action.rs
index 9b814a98a..992c995f7 100644
--- a/core/models/src/id/action.rs
+++ b/core/models/src/id/action.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{Id, InvalidId};
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, ts_rs::TS)]
 pub struct ActionId(Id);
 impl FromStr for ActionId {
     type Err = InvalidId;
diff --git a/core/models/src/id/health_check.rs b/core/models/src/id/health_check.rs
index dc643c912..72c2947e7 100644
--- a/core/models/src/id/health_check.rs
+++ b/core/models/src/id/health_check.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Deserializer, Serialize};
 
 use crate::Id;
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, ts_rs::TS)]
 pub struct HealthCheckId(Id);
 impl std::fmt::Display for HealthCheckId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
diff --git a/core/models/src/id/image.rs b/core/models/src/id/image.rs
index 8a4f87175..5fd91a5a1 100644
--- a/core/models/src/id/image.rs
+++ b/core/models/src/id/image.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Deserializer, Serialize};
 
 use crate::{Id, InvalidId, PackageId, Version};
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, ts_rs::TS)]
 pub struct ImageId(Id);
 impl AsRef<Path> for ImageId {
     fn as_ref(&self) -> &Path {
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index efbe1f818..ef38ece9d 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -27,12 +27,12 @@ lazy_static::lazy_static! {
     pub static ref SYSTEM_ID: Id = Id(InternedString::intern("x_system"));
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub struct Id(InternedString);
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default, ts_rs::TS)]
+pub struct Id(#[ts(type = "string")] InternedString);
 impl TryFrom<InternedString> for Id {
     type Error = InvalidId;
     fn try_from(value: InternedString) -> Result<Self, Self::Error> {
-        if ID_REGEX.is_match(&*value) {
+        if ID_REGEX.is_match(&value) {
             Ok(Id(value))
         } else {
             Err(InvalidId)
@@ -52,7 +52,7 @@ impl TryFrom<String> for Id {
 impl TryFrom<&str> for Id {
     type Error = InvalidId;
     fn try_from(value: &str) -> Result<Self, Self::Error> {
-        if ID_REGEX.is_match(&value) {
+        if ID_REGEX.is_match(value) {
             Ok(Id(InternedString::intern(value)))
         } else {
             Err(InvalidId)
@@ -67,7 +67,7 @@ impl From<Id> for InternedString {
 impl std::ops::Deref for Id {
     type Target = str;
     fn deref(&self) -> &Self::Target {
-        &*self.0
+        &self.0
     }
 }
 impl std::fmt::Display for Id {
@@ -77,7 +77,7 @@ impl std::fmt::Display for Id {
 }
 impl AsRef<str> for Id {
     fn as_ref(&self) -> &str {
-        &*self.0
+        &self.0
     }
 }
 impl Borrow<str> for Id {
@@ -99,7 +99,7 @@ impl Serialize for Id {
     where
         Ser: Serializer,
     {
-        serializer.serialize_str(&*self)
+        serializer.serialize_str(self)
     }
 }
 impl<'q> sqlx::Encode<'q, sqlx::Postgres> for Id {
diff --git a/core/models/src/id/package.rs b/core/models/src/id/package.rs
index 060f541c3..8f71285c6 100644
--- a/core/models/src/id/package.rs
+++ b/core/models/src/id/package.rs
@@ -3,6 +3,7 @@ use std::path::Path;
 use std::str::FromStr;
 
 use serde::{Deserialize, Serialize, Serializer};
+use ts_rs::TS;
 use yasi::InternedString;
 
 use crate::{Id, InvalidId, SYSTEM_ID};
@@ -10,7 +11,7 @@ use crate::{Id, InvalidId, SYSTEM_ID};
 lazy_static::lazy_static! {
     pub static ref SYSTEM_PACKAGE_ID: PackageId = PackageId(SYSTEM_ID.clone());
 }
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, TS)]
 pub struct PackageId(Id);
 impl FromStr for PackageId {
     type Err = InvalidId;
@@ -36,7 +37,7 @@ impl From<PackageId> for InternedString {
 impl std::ops::Deref for PackageId {
     type Target = str;
     fn deref(&self) -> &Self::Target {
-        &*self.0
+        &self.0
     }
 }
 impl AsRef<PackageId> for PackageId {
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index fd36c3de6..5d48179f9 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -174,6 +174,7 @@ tracing-futures = "0.2.5"
 tracing-journald = "0.3.0"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 trust-dns-server = "0.23.1"
+ts-rs = "7.1.1"
 typed-builder = "0.18.0"
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
diff --git a/core/startos/Effects.ts b/core/startos/Effects.ts
new file mode 100644
index 000000000..9be56724e
--- /dev/null
+++ b/core/startos/Effects.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface SetStoreParams { value: any, path: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/AddSslOptions.ts b/core/startos/bindings/AddSslOptions.ts
new file mode 100644
index 000000000..304bcb515
--- /dev/null
+++ b/core/startos/bindings/AddSslOptions.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface AddSslOptions { scheme: string | null, preferredExternalPort: number, addXForwardedHeaders: boolean | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/Algorithm.ts b/core/startos/bindings/Algorithm.ts
new file mode 100644
index 000000000..d12447f04
--- /dev/null
+++ b/core/startos/bindings/Algorithm.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Algorithm = "ecdsa" | "ed25519";
\ No newline at end of file
diff --git a/core/startos/bindings/BindKind.ts b/core/startos/bindings/BindKind.ts
new file mode 100644
index 000000000..e026fb081
--- /dev/null
+++ b/core/startos/bindings/BindKind.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BindKind = "static" | "single" | "multi";
\ No newline at end of file
diff --git a/core/startos/bindings/BindParams.ts b/core/startos/bindings/BindParams.ts
new file mode 100644
index 000000000..8d8eef6b4
--- /dev/null
+++ b/core/startos/bindings/BindParams.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddSslOptions } from "./AddSslOptions";
+import type { BindKind } from "./BindKind";
+
+export interface BindParams { kind: BindKind, id: string, internalPort: number, scheme: string, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: boolean, ssl: boolean, }
\ No newline at end of file
diff --git a/core/startos/bindings/Callback.ts b/core/startos/bindings/Callback.ts
new file mode 100644
index 000000000..9c4cacab0
--- /dev/null
+++ b/core/startos/bindings/Callback.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Callback = () => void;
\ No newline at end of file
diff --git a/core/startos/bindings/ChrootParams.ts b/core/startos/bindings/ChrootParams.ts
new file mode 100644
index 000000000..afbfb83b8
--- /dev/null
+++ b/core/startos/bindings/ChrootParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface ChrootParams { env: string | null, workdir: string | null, user: string | null, path: string, command: string, args: string[], }
\ No newline at end of file
diff --git a/core/startos/bindings/CreateOverlayedImageParams.ts b/core/startos/bindings/CreateOverlayedImageParams.ts
new file mode 100644
index 000000000..98a72b497
--- /dev/null
+++ b/core/startos/bindings/CreateOverlayedImageParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ImageId } from "./ImageId";
+
+export interface CreateOverlayedImageParams { imageId: ImageId, }
\ No newline at end of file
diff --git a/core/startos/bindings/DestroyOverlayedImageParams.ts b/core/startos/bindings/DestroyOverlayedImageParams.ts
new file mode 100644
index 000000000..aef910544
--- /dev/null
+++ b/core/startos/bindings/DestroyOverlayedImageParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ImageId } from "./ImageId";
+
+export interface DestroyOverlayedImageParams { imageId: ImageId, guid: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/ExecuteAction.ts b/core/startos/bindings/ExecuteAction.ts
new file mode 100644
index 000000000..a92852147
--- /dev/null
+++ b/core/startos/bindings/ExecuteAction.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId";
+import type { PackageId } from "./PackageId";
+
+export interface ExecuteAction { serviceId: PackageId | null, actionId: ActionId, input: any, }
\ No newline at end of file
diff --git a/core/startos/bindings/ExposeForDependentsParams.ts b/core/startos/bindings/ExposeForDependentsParams.ts
new file mode 100644
index 000000000..4a1d627b6
--- /dev/null
+++ b/core/startos/bindings/ExposeForDependentsParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface ExposeForDependentsParams { paths: string[], }
\ No newline at end of file
diff --git a/core/startos/bindings/ExposeUiParams.ts b/core/startos/bindings/ExposeUiParams.ts
new file mode 100644
index 000000000..dcf649285
--- /dev/null
+++ b/core/startos/bindings/ExposeUiParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ExposedUI } from "./ExposedUI";
+
+export interface ExposeUiParams { paths: Array<ExposedUI>, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetHostInfoParams.ts b/core/startos/bindings/GetHostInfoParams.ts
new file mode 100644
index 000000000..4041bff45
--- /dev/null
+++ b/core/startos/bindings/GetHostInfoParams.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Callback } from "./Callback";
+import type { GetHostInfoParamsKind } from "./GetHostInfoParamsKind";
+
+export interface GetHostInfoParams { kind: GetHostInfoParamsKind | null, serviceInterfaceId: string, packageId: string | null, callback: Callback, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetHostInfoParamsKind.ts b/core/startos/bindings/GetHostInfoParamsKind.ts
new file mode 100644
index 000000000..6d401f685
--- /dev/null
+++ b/core/startos/bindings/GetHostInfoParamsKind.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GetHostInfoParamsKind = "multi";
\ No newline at end of file
diff --git a/core/startos/bindings/GetServiceInterfaceParams.ts b/core/startos/bindings/GetServiceInterfaceParams.ts
new file mode 100644
index 000000000..e0e4d2477
--- /dev/null
+++ b/core/startos/bindings/GetServiceInterfaceParams.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Callback } from "./Callback";
+import type { PackageId } from "./PackageId";
+
+export interface GetServiceInterfaceParams { packageId: PackageId | null, serviceInterfaceId: string, callback: Callback, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetSslCertificateParams.ts b/core/startos/bindings/GetSslCertificateParams.ts
new file mode 100644
index 000000000..5be8333a5
--- /dev/null
+++ b/core/startos/bindings/GetSslCertificateParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Algorithm } from "./Algorithm";
+
+export interface GetSslCertificateParams { packageId: string | null, hostId: string, algorithm: Algorithm | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetSslKeyParams.ts b/core/startos/bindings/GetSslKeyParams.ts
new file mode 100644
index 000000000..ca7e0e404
--- /dev/null
+++ b/core/startos/bindings/GetSslKeyParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Algorithm } from "./Algorithm";
+
+export interface GetSslKeyParams { packageId: string | null, hostId: string, algorithm: Algorithm | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetStoreParams.ts b/core/startos/bindings/GetStoreParams.ts
new file mode 100644
index 000000000..f2087832a
--- /dev/null
+++ b/core/startos/bindings/GetStoreParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export interface GetStoreParams { packageId: PackageId | null, path: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/ParamsMaybePackageId.ts b/core/startos/bindings/ParamsMaybePackageId.ts
new file mode 100644
index 000000000..9a2e46c0b
--- /dev/null
+++ b/core/startos/bindings/ParamsMaybePackageId.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export interface ParamsMaybePackageId { packageId: PackageId | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/ParamsPackageId.ts b/core/startos/bindings/ParamsPackageId.ts
new file mode 100644
index 000000000..784f268f5
--- /dev/null
+++ b/core/startos/bindings/ParamsPackageId.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export interface ParamsPackageId { packageId: PackageId, }
\ No newline at end of file
diff --git a/core/startos/bindings/SetConfigured.ts b/core/startos/bindings/SetConfigured.ts
new file mode 100644
index 000000000..05e1c7f83
--- /dev/null
+++ b/core/startos/bindings/SetConfigured.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface SetConfigured { configured: boolean, }
\ No newline at end of file
diff --git a/core/startos/bindings/SetHealth.ts b/core/startos/bindings/SetHealth.ts
new file mode 100644
index 000000000..d4c202067
--- /dev/null
+++ b/core/startos/bindings/SetHealth.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HealthCheckId } from "./HealthCheckId";
+import type { HealthCheckString } from "./HealthCheckString";
+
+export interface SetHealth { name: HealthCheckId, status: HealthCheckString, message: string | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/SetMainStatus.ts b/core/startos/bindings/SetMainStatus.ts
new file mode 100644
index 000000000..86e7d9b2f
--- /dev/null
+++ b/core/startos/bindings/SetMainStatus.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Status } from "./Status";
+
+export interface SetMainStatus { status: Status, }
\ No newline at end of file
diff --git a/core/startos/bindings/SetStoreParams.ts b/core/startos/bindings/SetStoreParams.ts
new file mode 100644
index 000000000..9be56724e
--- /dev/null
+++ b/core/startos/bindings/SetStoreParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface SetStoreParams { value: any, path: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/Status.ts b/core/startos/bindings/Status.ts
new file mode 100644
index 000000000..fdfaea244
--- /dev/null
+++ b/core/startos/bindings/Status.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Status = "running" | "stopped";
\ No newline at end of file
diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs
index f166ed3e0..d3dd9db74 100644
--- a/core/startos/src/db/model.rs
+++ b/core/startos/src/db/model.rs
@@ -529,9 +529,10 @@ pub struct ExposedDependent {
     copyable: Option<bool>,
     qr: Option<bool>,
 }
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, ts_rs::TS)]
 #[model = "Model<Self>"]
 pub struct ExposedUI {
+    #[ts(type = "string")]
     pub path: JsonPointer,
     pub title: String,
     pub description: Option<String>,
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 08de40b8f..4524eb0ee 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -11,6 +11,7 @@ use models::{ActionId, HealthCheckId, ImageId, PackageId};
 use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use tokio::process::Command;
+use ts_rs::TS;
 
 use crate::db::model::ExposedUI;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
@@ -127,36 +128,103 @@ pub fn service_effect_handler() -> ParentHandler {
             "getServiceInterface",
             from_fn_async(get_service_interface).no_cli(),
         )
+        .subcommand("clearBindings", from_fn_async(clear_bindings).no_cli())
+        .subcommand("bind", from_fn_async(bind).no_cli())
+        .subcommand("getHostInfo", from_fn_async(get_host_info).no_cli())
     // TODO @DrBonez when we get the new api for 4.0
-    // .subcommand("setDependencies",from_fn(set_dependencies))
-    // .subcommand("embassyGetInterface",from_fn(embassy_get_interface))
-    // .subcommand("mount",from_fn(mount))
-    // .subcommand("removeAction",from_fn(remove_action))
-    // .subcommand("removeAddress",from_fn(remove_address))
-    // .subcommand("exportAction",from_fn(export_action))
-    // .subcommand("bind",from_fn(bind))
-    // .subcommand("clearServiceInterfaces",from_fn(clear_network_interfaces))
-    // .subcommand("exportServiceInterface",from_fn(export_network_interface))
-    // .subcommand("clearBindings",from_fn(clear_bindings))
-    // .subcommand("getHostnames",from_fn(get_hostnames))
-    // .subcommand("getInterface",from_fn(get_interface))
-    // .subcommand("listInterface",from_fn(list_interface))
-    // .subcommand("getIPHostname",from_fn(get_ip_hostname))
-    // .subcommand("getContainerIp",from_fn(get_container_ip))
-    // .subcommand("getLocalHostname",from_fn(get_local_hostname))
-    // .subcommand("getPrimaryUrl",from_fn(get_primary_url))
-    // .subcommand("getServicePortForward",from_fn(get_service_port_forward))
-    // .subcommand("getServiceTorHostname",from_fn(get_service_tor_hostname))
-    // .subcommand("getSystemSmtp",from_fn(get_system_smtp))
-    // .subcommand("reverseProxy",from_fn(reverse_pro)xy)
+    // .subcommand("setDependencies",from_fn_async(set_dependencies).no_cli())
+    // .subcommand("embassyGetInterface",from_fn_async(embassy_get_interface).no_cli())
+    // .subcommand("mount",from_fn_async(mount).no_cli())
+    // .subcommand("removeAction",from_fn_async(remove_action).no_cli())
+    // .subcommand("removeAddress",from_fn_async(remove_address).no_cli())
+    // .subcommand("exportAction",from_fn_async(export_action).no_cli())
+    // .subcommand("clearServiceInterfaces",from_fn_async(clear_network_interfaces).no_cli())
+    // .subcommand("exportServiceInterface",from_fn_async(export_network_interface).no_cli())
+    // .subcommand("getHostnames",from_fn_async(get_hostnames).no_cli())
+    // .subcommand("getInterface",from_fn_async(get_interface).no_cli())
+    // .subcommand("listInterface",from_fn_async(list_interface).no_cli())
+    // .subcommand("getIPHostname",from_fn_async(get_ip_hostname).no_cli())
+    // .subcommand("getContainerIp",from_fn_async(get_container_ip).no_cli())
+    // .subcommand("getLocalHostname",from_fn_async(get_local_hostname).no_cli())
+    // .subcommand("getPrimaryUrl",from_fn_async(get_primary_url).no_cli())
+    // .subcommand("getServicePortForward",from_fn_async(get_service_port_forward).no_cli())
+    // .subcommand("getServiceTorHostname",from_fn_async(get_service_tor_hostname).no_cli())
+    // .subcommand("getSystemSmtp",from_fn_async(get_system_smtp).no_cli())
+    // .subcommand("reverseProxy",from_fn_async(reverse_proxy).no_cli())
     // TODO Callbacks
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+struct Callback(#[ts(type = "() => void")] i64);
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+enum GetHostInfoParamsKind {
+    Multi,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+struct GetHostInfoParams {
+    kind: Option<GetHostInfoParamsKind>,
+    service_interface_id: String,
+    package_id: Option<String>,
+    callback: Callback,
+}
+async fn get_host_info(
+    _: AnyContext,
+    GetHostInfoParams { .. }: GetHostInfoParams,
+) -> Result<Value, Error> {
+    todo!()
+}
+
+async fn clear_bindings(context: EffectContext, _: Empty) -> Result<Value, Error> {
+    todo!()
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+
+enum BindKind {
+    Static,
+    Single,
+    Multi,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+
+struct AddSslOptions {
+    scheme: Option<String>,
+    preferred_external_port: u32,
+    add_x_forwarded_headers: Option<bool>,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
+struct BindParams {
+    kind: BindKind,
+    id: String,
+    internal_port: u32,
+    scheme: String,
+    preferred_external_port: u32,
+    add_ssl: Option<AddSslOptions>,
+    secure: bool,
+    ssl: bool,
+}
+async fn bind(_: AnyContext, BindParams { .. }: BindParams) -> Result<Value, Error> {
+    todo!()
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct GetServiceInterfaceParams {
     package_id: Option<PackageId>,
     service_interface_id: String,
-    callback: String,
+    callback: Callback,
 }
 async fn get_service_interface(
     _: AnyContext,
@@ -190,8 +258,9 @@ async fn get_service_interface(
     }))
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct ChrootParams {
     #[arg(short = 'e', long = "env")]
     env: Option<PathBuf>,
@@ -200,7 +269,9 @@ struct ChrootParams {
     #[arg(short = 'u', long = "user")]
     user: Option<String>,
     path: PathBuf,
+    #[ts(type = "string")]
     command: OsString,
+    #[ts(type = "string[]")]
     args: Vec<OsString>,
 }
 fn chroot(
@@ -250,11 +321,22 @@ fn chroot(
     cmd.args(args);
     Err(cmd.exec().into())
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
+enum Algorithm {
+    Ecdsa,
+    Ed25519,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct GetSslCertificateParams {
     package_id: Option<String>,
-    algorithm: Option<String>, //"ecdsa" | "ed25519"
+    host_id: String,
+    algorithm: Option<Algorithm>, //"ecdsa" | "ed25519"
 }
 
 async fn get_ssl_certificate(
@@ -262,33 +344,39 @@ async fn get_ssl_certificate(
     GetSslCertificateParams {
         package_id,
         algorithm,
+        host_id,
     }: GetSslCertificateParams,
 ) -> Result<Value, Error> {
     let fake = include_str!("./fake.cert.pem");
     Ok(json!([fake, fake, fake]))
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct GetSslKeyParams {
     package_id: Option<String>,
-    algorithm: Option<String>, //"ecdsa" | "ed25519"
+    host_id: String,
+    algorithm: Option<Algorithm>,
 }
 
 async fn get_ssl_key(
     context: EffectContext,
     GetSslKeyParams {
         package_id,
+        host_id,
         algorithm,
     }: GetSslKeyParams,
 ) -> Result<Value, Error> {
     let fake = include_str!("./fake.cert.key");
     Ok(json!(fake))
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct GetStoreParams {
     package_id: Option<PackageId>,
+    #[ts(type = "string")]
     path: JsonPointer,
 }
 
@@ -311,10 +399,13 @@ async fn get_store(
         .ok_or_else(|| Error::new(eyre!("Did not find value at path"), ErrorKind::NotFound))?
         .clone())
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct SetStoreParams {
+    #[ts(type = "any")]
     value: Value,
+    #[ts(type = "string")]
     path: JsonPointer,
 }
 
@@ -344,9 +435,11 @@ async fn set_store(
     Ok(())
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct ExposeForDependentsParams {
+    #[ts(type = "string[]")]
     paths: Vec<JsonPointer>,
 }
 
@@ -372,8 +465,9 @@ async fn expose_for_dependents(
         .await?;
     Ok(())
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct ExposeUiParams {
     paths: Vec<ExposedUI>,
 }
@@ -400,13 +494,16 @@ async fn expose_ui(
         .await?;
     Ok(())
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
 struct ParamsPackageId {
-    package: PackageId,
+    package_id: PackageId,
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "camelCase")]
+#[ts(export)]
 struct ParamsMaybePackageId {
     package_id: Option<PackageId>,
 }
@@ -417,16 +514,18 @@ async fn exists(context: EffectContext, params: ParamsPackageId) -> Result<Value
     let package = peeked
         .as_public()
         .as_package_data()
-        .as_idx(&params.package)
+        .as_idx(&params.package_id)
         .is_some();
     Ok(json!(package))
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct ExecuteAction {
     service_id: Option<PackageId>,
     action_id: ActionId,
+    #[ts(type = "any")]
     input: Value,
 }
 async fn execute_action(
@@ -529,9 +628,10 @@ async fn shutdown(context: EffectContext, _: Empty) -> Result<Value, Error> {
     Ok(json!(()))
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "camelCase")]
+#[ts(export)]
 struct SetConfigured {
     configured: bool,
 }
@@ -556,8 +656,9 @@ async fn set_configured(context: EffectContext, params: SetConfigured) -> Result
     Ok(json!(()))
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 enum Status {
     Running,
     Stopped,
@@ -579,9 +680,10 @@ impl ValueParserFactory for Status {
     }
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "camelCase")]
+#[ts(export)]
 struct SetMainStatus {
     status: Status,
 }
@@ -595,8 +697,9 @@ async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Resul
     Ok(Value::Null)
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 struct SetHealth {
     name: HealthCheckId,
     status: HealthCheckString,
@@ -663,11 +766,13 @@ async fn set_health(
         .await?;
     Ok(json!(()))
 }
-#[derive(serde::Deserialize, serde::Serialize, Parser)]
+#[derive(serde::Deserialize, serde::Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "camelCase")]
+#[ts(export)]
 pub struct DestroyOverlayedImageParams {
     image_id: ImageId,
+    #[ts(type = "string")]
     guid: InternedString,
 }
 
@@ -689,9 +794,10 @@ pub async fn destroy_overlayed_image(
     }
     Ok(())
 }
-#[derive(serde::Deserialize, serde::Serialize, Parser)]
+#[derive(serde::Deserialize, serde::Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "camelCase")]
+#[ts(export)]
 pub struct CreateOverlayedImageParams {
     image_id: ImageId,
 }
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index fef879e33..fd3a89683 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -23,7 +23,7 @@ impl std::fmt::Display for HealthCheckResult {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, ts_rs::TS)]
 #[serde(rename_all = "camelCase")]
 pub enum HealthCheckString {
     Passing,
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index 1cbc5ebf2..652aed94e 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -60,6 +60,6 @@ function asMessage(e: unknown) {
   if (typeof e === "object" && e != null && "message" in e)
     return String(e.message)
   const value = String(e)
-  if (value.length == null) return undefined
+  if (value.length == null) return null
   return value
 }
diff --git a/sdk/lib/health/checkFns/CheckResult.ts b/sdk/lib/health/checkFns/CheckResult.ts
index 1b2f54f39..8b46ee5c4 100644
--- a/sdk/lib/health/checkFns/CheckResult.ts
+++ b/sdk/lib/health/checkFns/CheckResult.ts
@@ -2,5 +2,5 @@ import { HealthStatus } from "../../types"
 
 export type CheckResult = {
   status: HealthStatus
-  message?: string
+  message: string | null
 }
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index 80368fe51..4c3f43634 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -57,7 +57,7 @@ export type Scheme = string | null
 type AddSslOptions = {
   scheme: Scheme
   preferredExternalPort: number
-  addXForwardedHeaders?: boolean /** default: false */
+  addXForwardedHeaders: boolean | null /** default: false */
 }
 type Security = { secure: false; ssl: false } | { secure: true; ssl: boolean }
 export type BindOptions = {
@@ -82,13 +82,13 @@ type BindOptionsByKnownProtocol =
   | ({
       protocol: ProtocolsWithSslVariants
       preferredExternalPort?: number
-      scheme?: Scheme
+      scheme: Scheme | null
     } & ({ noAddSsl: true } | { addSsl?: Partial<AddSslOptions> }))
   | {
       protocol: NotProtocolsWithSslVariants
       preferredExternalPort?: number
-      scheme?: Scheme
-      addSsl?: AddSslOptions | null
+      scheme: Scheme | null
+      addSsl: AddSslOptions | null
     }
 type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions
 
@@ -185,6 +185,7 @@ export class Host {
     if ("noAddSsl" in options && options.noAddSsl) return null
     if ("withSsl" in protoInfo && protoInfo.withSsl)
       return {
+        addXForwardedHeaders: null,
         preferredExternalPort: knownProtocols[protoInfo.withSsl].defaultPort,
         scheme: protoInfo.withSsl,
         ...("addSsl" in options ? options.addSsl : null),
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
index d891bd52c..89776cf66 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/lib/test/host.test.ts
@@ -7,7 +7,10 @@ describe("host", () => {
     async function test(effects: Effects) {
       const utils = createUtils<never, never>(effects)
       const foo = utils.host.multi("foo")
-      const fooOrigin = await foo.bindPort(80, { protocol: "http" as const })
+      const fooOrigin = await foo.bindPort(80, {
+        protocol: "http" as const,
+        scheme: null,
+      })
       const fooInterface = new ServiceInterfaceBuilder({
         effects,
         name: "Foo",
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
new file mode 100644
index 000000000..b07d6dd0c
--- /dev/null
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -0,0 +1,75 @@
+import { Effects } from "../types"
+import { ExecuteAction } from "../../../core/startos/bindings/ExecuteAction"
+import { CreateOverlayedImageParams } from "../../../core/startos/bindings/CreateOverlayedImageParams"
+import { DestroyOverlayedImageParams } from "../../../core/startos/bindings/DestroyOverlayedImageParams"
+import { BindParams } from "../../../core/startos/bindings/BindParams"
+import { GetHostInfoParams } from "../../../core/startos/bindings/GetHostInfoParams"
+import { ParamsPackageId } from "../../../core/startos/bindings/ParamsPackageId"
+import { ParamsMaybePackageId } from "../../../core/startos/bindings/ParamsMaybePackageId"
+import { SetConfigured } from "../../../core/startos/bindings/SetConfigured"
+import { SetHealth } from "../../../core/startos/bindings/SetHealth"
+import { ExposeForDependentsParams } from "../../../core/startos/bindings/ExposeForDependentsParams"
+import { ExposeUiParams } from "../../../core/startos/bindings/ExposeUiParams"
+import { GetSslCertificateParams } from "../../../core/startos/bindings/GetSslCertificateParams"
+import { GetSslKeyParams } from "../../../core/startos/bindings/GetSslKeyParams"
+import { GetServiceInterfaceParams } from "../../../core/startos/bindings/GetServiceInterfaceParams"
+
+function typeEquality<ExpectedType>(_a: ExpectedType) {}
+describe("startosTypeValidation ", () => {
+  test(`checking the params match`, () => {
+    const testInput: any = {}
+    typeEquality<{
+      [K in keyof Effects &
+        (
+          | "gitInfo"
+          | "echo"
+          | "chroot"
+          | "exists"
+          | "executeAction"
+          | "getConfigured"
+          | "stopped"
+          | "running"
+          | "restart"
+          | "shutdown"
+          | "setConfigured"
+          | "setMainStatus"
+          | "setHealth"
+          | "getStore"
+          | "setStore"
+          | "exposeForDependents"
+          | "exposeUi"
+          | "createOverlayedImage"
+          | "destroyOverlayedImage"
+          | "getSslCertificate"
+          | "getSslKey"
+          | "getServiceInterface"
+          | "clearBindings"
+          | "bind"
+          | "getHostInfo"
+        )]: Effects[K] extends Function ? Parameters<Effects[K]>[0] : never
+    }>({
+      executeAction: {} as ExecuteAction,
+      createOverlayedImage: {} as CreateOverlayedImageParams,
+      destroyOverlayedImage: {} as DestroyOverlayedImageParams,
+      clearBindings: undefined,
+      bind: {} as BindParams,
+      getHostInfo: {} as GetHostInfoParams,
+      exists: {} as ParamsPackageId,
+      getConfigured: undefined,
+      stopped: {} as ParamsMaybePackageId,
+      running: {} as ParamsMaybePackageId,
+      restart: undefined,
+      shutdown: undefined,
+      setConfigured: {} as SetConfigured,
+      setHealth: {} as SetHealth,
+      exposeForDependents: {} as ExposeForDependentsParams,
+      exposeUi: {} as ExposeUiParams,
+      getSslCertificate: {} as GetSslCertificateParams,
+      getSslKey: {} as GetSslKeyParams,
+      getServiceInterface: {} as GetServiceInterfaceParams,
+    })
+    typeEquality<Parameters<Effects["executeAction"]>[0]>(
+      testInput as ExecuteAction,
+    )
+  })
+})
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 335372d6c..d863fe3d1 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -1,7 +1,8 @@
 export * as configTypes from "./config/configTypes"
+import { AddSslOptions } from "../../core/startos/bindings/AddSslOptions"
 import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
-import { BindOptions } from "./interfaces/Host"
+import { BindOptions, Scheme } from "./interfaces/Host"
 import { Daemons } from "./mainFn/Daemons"
 import { UrlString } from "./util/getServiceInterface"
 import { ServiceInterfaceType, Signals } from "./util/utils"
@@ -247,6 +248,7 @@ export type ServiceInterfaceWithHostInfo = ServiceInterface & {
 
 // prettier-ignore
 export type ExposeAllServicePaths<Store, PreviousPath extends string = ""> = 
+  Store extends never ? string :
   Store extends Record<string, unknown> ? {[K in keyof Store & string]: ExposeAllServicePaths<Store[K], `${PreviousPath}/${K & string}`>}[keyof Store & string] :
   PreviousPath
 // prettier-ignore
@@ -254,10 +256,10 @@ export type ExposeAllUiPaths<Store, PreviousPath extends string = ""> =
   Store extends Record<string, unknown> ? {[K in keyof Store & string]: ExposeAllUiPaths<Store[K], `${PreviousPath}/${K & string}`>}[keyof Store & string] :
   Store extends string ? PreviousPath : 
   never
-export type ExposeServicePaths<Store> = Array<{
+export type ExposeServicePaths<Store = never> = {
   /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
-  path: ExposeAllServicePaths<Store>
-}>
+  paths: Store extends never ? string[] : ExposeAllServicePaths<Store>[]
+}
 
 export type ExposeUiPaths<Store> = Array<{
   /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
@@ -292,24 +294,28 @@ export type Effects = {
   /** Removes all network bindings */
   clearBindings(): Promise<void>
   /** Creates a host connected to the specified port with the provided options */
-  bind(
-    options: {
-      kind: "static" | "single" | "multi"
-      id: string
-      internalPort: number
-    } & BindOptions,
-  ): Promise<void>
+  bind(options: {
+    kind: "static" | "single" | "multi"
+    id: string
+    internalPort: number
+
+    scheme: Scheme
+    preferredExternalPort: number
+    addSsl: AddSslOptions | null
+    secure: boolean
+    ssl: boolean
+  }): Promise<void>
   /** Retrieves the current hostname(s) associated with a host id */
+  // getHostInfo(options: {
+  //   kind: "static" | "single"
+  //   serviceInterfaceId: string
+  //   packageId: string | null
+  //   callback: () => void
+  // }): Promise<SingleHost>
   getHostInfo(options: {
-    kind: "static" | "single"
+    kind: "multi" | null
     serviceInterfaceId: string
-    packageId?: string
-    callback: () => void
-  }): Promise<SingleHost>
-  getHostInfo(options: {
-    kind?: "multi"
-    serviceInterfaceId: string
-    packageId?: string
+    packageId: string | null
     callback: () => void
   }): Promise<MultiHost>
 
@@ -368,12 +374,17 @@ export type Effects = {
    */
   exportServiceInterface(options: ServiceInterface): Promise<string>
 
-  exposeForDependents<Store = never>(
-    options: ExposeServicePaths<Store>,
-  ): Promise<void>
+  exposeForDependents(options: { paths: string[] }): Promise<void>
 
   exposeUi<Store = never>(options: {
-    paths: ExposeUiPaths<Store>
+    paths: {
+      path: string
+      title: string
+      description?: string | undefined
+      masked?: boolean | undefined
+      copyable?: boolean | undefined
+      qr?: boolean | undefined
+    }[]
   }): Promise<void>
   /**
    * There are times that we want to see the addresses that where exported
@@ -382,7 +393,7 @@ export type Effects = {
    * Note: any auth should be filtered out already
    */
   getServiceInterface(options: {
-    packageId?: PackageId
+    packageId: PackageId | null
     serviceInterfaceId: ServiceInterfaceId
     callback: () => void
   }): Promise<ServiceInterface>
@@ -392,7 +403,7 @@ export type Effects = {
    * @param options
    */
   getPrimaryUrl(options: {
-    packageId?: PackageId
+    packageId: PackageId | null
     serviceInterfaceId: ServiceInterfaceId
     callback: () => void
   }): Promise<UrlString | null>
@@ -404,7 +415,7 @@ export type Effects = {
    * Note: any auth should be filtered out already
    */
   listServiceInterfaces(options: {
-    packageId?: PackageId
+    packageId: PackageId | null
     callback: () => void
   }): Promise<ServiceInterface[]>
 
@@ -429,38 +440,38 @@ export type Effects = {
    * This called after a valid set config as well as during init.
    * @param configured
    */
-  setConfigured(configured: boolean): Promise<void>
+  setConfigured(options: { configured: boolean }): Promise<void>
 
   /**
    *
    * @returns  PEM encoded fullchain (ecdsa)
    */
-  getSslCertificate: (
-    packageId: string | null,
-    hostId: string,
-    algorithm?: "ecdsa" | "ed25519",
-  ) => Promise<[string, string, string]>
+  getSslCertificate: (options: {
+    packageId: string | null
+    hostId: string
+    algorithm: "ecdsa" | "ed25519" | null
+  }) => Promise<[string, string, string]>
   /**
    * @returns PEM encoded ssl key (ecdsa)
    */
-  getSslKey: (
-    packageId: string | null,
-    hostId: string,
-    algorithm?: "ecdsa" | "ed25519",
-  ) => Promise<string>
+  getSslKey: (options: {
+    packageId: string | null
+    hostId: string
+    algorithm: "ecdsa" | "ed25519" | null
+  }) => Promise<string>
 
   setHealth(o: {
     name: string
     status: HealthStatus
-    message?: string
+    message: string | null
   }): Promise<void>
 
   /** Set the dependencies of what the service needs, usually ran during the set config as a best practice */
   setDependencies(dependencies: Dependencies): Promise<DependenciesReceipt>
   /** Exists could be useful during the runtime to know if some service exists, option dep */
-  exists(packageId: PackageId): Promise<boolean>
+  exists(options: { packageId: PackageId }): Promise<boolean>
   /** Exists could be useful during the runtime to know if some service is running, option dep */
-  running(packageId: PackageId): Promise<boolean>
+  running(options: { packageId: PackageId }): Promise<boolean>
 
   /** Instead of creating proxies with nginx, we have a utility to create and maintain a proxy in the lifetime of this running. */
   reverseProxy(options: {
@@ -494,7 +505,7 @@ export type Effects = {
     }
   }): Promise<string>
 
-  stopped(packageId?: string): Promise<boolean>
+  stopped(options: { packageId: string | null }): Promise<boolean>
 }
 
 // prettier-ignore
diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index dd2712849..d5ad048e3 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -185,7 +185,7 @@ const makeInterfaceFilled = async ({
 }: {
   effects: Effects
   id: string
-  packageId: string | undefined
+  packageId: string | null
   callback: () => void
 }) => {
   const serviceInterfaceValue = await effects.getServiceInterface({
@@ -195,6 +195,7 @@ const makeInterfaceFilled = async ({
   })
   const hostInfo = await effects.getHostInfo({
     packageId,
+    kind: null,
     serviceInterfaceId: serviceInterfaceValue.id,
     callback,
   })
@@ -220,7 +221,7 @@ const makeInterfaceFilled = async ({
 export class GetServiceInterface {
   constructor(
     readonly effects: Effects,
-    readonly opts: { id: string; packageId?: string },
+    readonly opts: { id: string; packageId: string | null },
   ) {}
 
   /**
@@ -276,7 +277,7 @@ export class GetServiceInterface {
 }
 export function getServiceInterface(
   effects: Effects,
-  opts: { id: string; packageId?: string },
+  opts: { id: string; packageId: string | null },
 ) {
   return new GetServiceInterface(effects, opts)
 }
diff --git a/sdk/lib/util/getServiceInterfaces.ts b/sdk/lib/util/getServiceInterfaces.ts
index 176918bb3..a7106568b 100644
--- a/sdk/lib/util/getServiceInterfaces.ts
+++ b/sdk/lib/util/getServiceInterfaces.ts
@@ -11,7 +11,7 @@ const makeManyInterfaceFilled = async ({
   callback,
 }: {
   effects: Effects
-  packageId: string | undefined
+  packageId: string | null
   callback: () => void
 }) => {
   const serviceInterfaceValues = await effects.listServiceInterfaces({
@@ -25,6 +25,7 @@ const makeManyInterfaceFilled = async ({
           [
             id,
             await effects.getHostInfo({
+              kind: null,
               packageId,
               serviceInterfaceId: id,
               callback,
@@ -37,6 +38,7 @@ const makeManyInterfaceFilled = async ({
   const serviceInterfacesFilled: ServiceInterfaceFilled[] = await Promise.all(
     serviceInterfaceValues.map(async (serviceInterfaceValue) => {
       const hostInfo = await effects.getHostInfo({
+        kind: null,
         packageId,
         serviceInterfaceId: serviceInterfaceValue.id,
         callback,
@@ -64,7 +66,7 @@ const makeManyInterfaceFilled = async ({
 export class GetServiceInterfaces {
   constructor(
     readonly effects: Effects,
-    readonly opts: { packageId?: string },
+    readonly opts: { packageId: string | null },
   ) {}
 
   /**
@@ -119,7 +121,7 @@ export class GetServiceInterfaces {
 }
 export function getServiceInterfaces(
   effects: Effects,
-  opts: { packageId?: string },
+  opts: { packageId: string | null },
 ) {
   return new GetServiceInterfaces(effects, opts)
 }
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index f0592385e..cc18c7714 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -177,14 +177,17 @@ export const createUtils = <
 
     serviceInterface: {
       getOwn: (id: ServiceInterfaceId) =>
-        getServiceInterface(effects, { id }) as GetServiceInterface &
-          WrapperOverWrite,
+        getServiceInterface(effects, {
+          id,
+          packageId: null,
+        }) as GetServiceInterface & WrapperOverWrite,
       get: (opts: { id: ServiceInterfaceId; packageId: PackageId }) =>
         getServiceInterface(effects, opts) as GetServiceInterface &
           WrapperOverWrite,
       getAllOwn: () =>
-        getServiceInterfaces(effects, {}) as GetServiceInterfaces &
-          WrapperOverWrite,
+        getServiceInterfaces(effects, {
+          packageId: null,
+        }) as GetServiceInterfaces & WrapperOverWrite,
       getAll: (opts: { packageId: PackageId }) =>
         getServiceInterfaces(effects, opts) as GetServiceInterfaces &
           WrapperOverWrite,

From a089d544a5da55d7fe95869fcb7ba4213d2cd58a Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 13 Mar 2024 17:44:13 -0600
Subject: [PATCH 055/341] chore: Add some of the fixes to make the build work
 !!!

---
 .../bindings/CreateOverlayedImageParams.ts    |  3 +--
 .../bindings/DestroyOverlayedImageParams.ts   |  3 +--
 core/startos/bindings/ExecuteAction.ts        |  4 +---
 core/startos/bindings/ExposedUI.ts            |  3 +++
 .../bindings/GetServiceInterfaceParams.ts     |  3 +--
 core/startos/bindings/GetStoreParams.ts       |  3 +--
 core/startos/bindings/HealthCheckString.ts    |  3 +++
 core/startos/bindings/ParamsMaybePackageId.ts |  3 +--
 core/startos/bindings/ParamsPackageId.ts      |  3 +--
 core/startos/bindings/SetHealth.ts            |  3 +--
 core/startos/src/db/model.rs                  |  1 +
 .../src/service/service_effect_handler.rs     | 15 ++++++++++---
 core/startos/src/status/health_check.rs       |  1 +
 sdk/lib/inits/setupInit.ts                    |  9 +++++++-
 sdk/lib/test/startosTypeValidation.test.ts    |  2 +-
 sdk/lib/types.ts                              | 22 +++++++++----------
 16 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 core/startos/bindings/ExposedUI.ts
 create mode 100644 core/startos/bindings/HealthCheckString.ts

diff --git a/core/startos/bindings/CreateOverlayedImageParams.ts b/core/startos/bindings/CreateOverlayedImageParams.ts
index 98a72b497..34924cb1a 100644
--- a/core/startos/bindings/CreateOverlayedImageParams.ts
+++ b/core/startos/bindings/CreateOverlayedImageParams.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ImageId } from "./ImageId";
 
-export interface CreateOverlayedImageParams { imageId: ImageId, }
\ No newline at end of file
+export interface CreateOverlayedImageParams { imageId: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/DestroyOverlayedImageParams.ts b/core/startos/bindings/DestroyOverlayedImageParams.ts
index aef910544..15dd2bf53 100644
--- a/core/startos/bindings/DestroyOverlayedImageParams.ts
+++ b/core/startos/bindings/DestroyOverlayedImageParams.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ImageId } from "./ImageId";
 
-export interface DestroyOverlayedImageParams { imageId: ImageId, guid: string, }
\ No newline at end of file
+export interface DestroyOverlayedImageParams { imageId: string , guid: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/ExecuteAction.ts b/core/startos/bindings/ExecuteAction.ts
index a92852147..d31ae9279 100644
--- a/core/startos/bindings/ExecuteAction.ts
+++ b/core/startos/bindings/ExecuteAction.ts
@@ -1,5 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ActionId } from "./ActionId";
-import type { PackageId } from "./PackageId";
 
-export interface ExecuteAction { serviceId: PackageId | null, actionId: ActionId, input: any, }
\ No newline at end of file
+export interface ExecuteAction { serviceId: string | null, actionId: string, input: any, }
\ No newline at end of file
diff --git a/core/startos/bindings/ExposedUI.ts b/core/startos/bindings/ExposedUI.ts
new file mode 100644
index 000000000..1354bb576
--- /dev/null
+++ b/core/startos/bindings/ExposedUI.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface ExposedUI { path: string, title: string, description: string | null, masked: boolean | null, copyable: boolean | null, qr: boolean | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetServiceInterfaceParams.ts b/core/startos/bindings/GetServiceInterfaceParams.ts
index e0e4d2477..fb0f96791 100644
--- a/core/startos/bindings/GetServiceInterfaceParams.ts
+++ b/core/startos/bindings/GetServiceInterfaceParams.ts
@@ -1,5 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
-import type { PackageId } from "./PackageId";
 
-export interface GetServiceInterfaceParams { packageId: PackageId | null, serviceInterfaceId: string, callback: Callback, }
\ No newline at end of file
+export interface GetServiceInterfaceParams { packageId: string | null, serviceInterfaceId: string, callback: Callback, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetStoreParams.ts b/core/startos/bindings/GetStoreParams.ts
index f2087832a..65703be7a 100644
--- a/core/startos/bindings/GetStoreParams.ts
+++ b/core/startos/bindings/GetStoreParams.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
 
-export interface GetStoreParams { packageId: PackageId | null, path: string, }
\ No newline at end of file
+export interface GetStoreParams { packageId: string | null, path: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/HealthCheckString.ts b/core/startos/bindings/HealthCheckString.ts
new file mode 100644
index 000000000..efe9f42bd
--- /dev/null
+++ b/core/startos/bindings/HealthCheckString.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HealthCheckString = "passing" | "disabled" | "starting" | "warning" | "failure";
\ No newline at end of file
diff --git a/core/startos/bindings/ParamsMaybePackageId.ts b/core/startos/bindings/ParamsMaybePackageId.ts
index 9a2e46c0b..80bdd9a55 100644
--- a/core/startos/bindings/ParamsMaybePackageId.ts
+++ b/core/startos/bindings/ParamsMaybePackageId.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
 
-export interface ParamsMaybePackageId { packageId: PackageId | null, }
\ No newline at end of file
+export interface ParamsMaybePackageId { packageId: string | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/ParamsPackageId.ts b/core/startos/bindings/ParamsPackageId.ts
index 784f268f5..7631cfb11 100644
--- a/core/startos/bindings/ParamsPackageId.ts
+++ b/core/startos/bindings/ParamsPackageId.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
 
-export interface ParamsPackageId { packageId: PackageId, }
\ No newline at end of file
+export interface ParamsPackageId { packageId: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/SetHealth.ts b/core/startos/bindings/SetHealth.ts
index d4c202067..3635ec9c5 100644
--- a/core/startos/bindings/SetHealth.ts
+++ b/core/startos/bindings/SetHealth.ts
@@ -1,5 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HealthCheckId } from "./HealthCheckId";
 import type { HealthCheckString } from "./HealthCheckString";
 
-export interface SetHealth { name: HealthCheckId, status: HealthCheckString, message: string | null, }
\ No newline at end of file
+export interface SetHealth { name: string, status: HealthCheckString, message: string | null, }
\ No newline at end of file
diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs
index d3dd9db74..b79d9d417 100644
--- a/core/startos/src/db/model.rs
+++ b/core/startos/src/db/model.rs
@@ -531,6 +531,7 @@ pub struct ExposedDependent {
 }
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, ts_rs::TS)]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct ExposedUI {
     #[ts(type = "string")]
     pub path: JsonPointer,
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 4524eb0ee..4ed160eb7 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -222,6 +222,7 @@ async fn bind(_: AnyContext, BindParams { .. }: BindParams) -> Result<Value, Err
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct GetServiceInterfaceParams {
+    #[ts(type = "string | null")]
     package_id: Option<PackageId>,
     service_interface_id: String,
     callback: Callback,
@@ -375,6 +376,7 @@ async fn get_ssl_key(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct GetStoreParams {
+    #[ts(type = "string | null")]
     package_id: Option<PackageId>,
     #[ts(type = "string")]
     path: JsonPointer,
@@ -494,10 +496,11 @@ async fn expose_ui(
         .await?;
     Ok(())
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 struct ParamsPackageId {
+    #[ts(type = "string")]
     package_id: PackageId,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
@@ -505,6 +508,7 @@ struct ParamsPackageId {
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 struct ParamsMaybePackageId {
+    #[ts(type = "string | null")]
     package_id: Option<PackageId>,
 }
 
@@ -523,7 +527,9 @@ async fn exists(context: EffectContext, params: ParamsPackageId) -> Result<Value
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct ExecuteAction {
+    #[ts(type = "string | null")]
     service_id: Option<PackageId>,
+    #[ts(type = "string")]
     action_id: ActionId,
     #[ts(type = "any")]
     input: Value,
@@ -584,11 +590,11 @@ async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result
         .de()?;
     Ok(json!(matches!(package, MainStatus::Stopped)))
 }
-async fn running(context: EffectContext, params: ParamsMaybePackageId) -> Result<Value, Error> {
+async fn running(context: EffectContext, params: ParamsPackageId) -> Result<Value, Error> {
     dbg!("Starting the running {params:?}");
     let context = context.deref()?;
     let peeked = context.ctx.db.peek().await;
-    let package_id = params.package_id.unwrap_or_else(|| context.id.clone());
+    let package_id = params.package_id;
     let package = peeked
         .as_public()
         .as_package_data()
@@ -701,6 +707,7 @@ async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Resul
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct SetHealth {
+    #[ts(type = "string")]
     name: HealthCheckId,
     status: HealthCheckString,
     message: Option<String>,
@@ -771,6 +778,7 @@ async fn set_health(
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 pub struct DestroyOverlayedImageParams {
+    #[ts(type = "string ")]
     image_id: ImageId,
     #[ts(type = "string")]
     guid: InternedString,
@@ -799,6 +807,7 @@ pub async fn destroy_overlayed_image(
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 pub struct CreateOverlayedImageParams {
+    #[ts(type = "string")]
     image_id: ImageId,
 }
 
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index fd3a89683..39434115c 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -25,6 +25,7 @@ impl std::fmt::Display for HealthCheckResult {
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, ts_rs::TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub enum HealthCheckString {
     Passing,
     Disabled,
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index 9139de23b..4c52ddad2 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -32,7 +32,14 @@ export function setupInit<Manifest extends SDKManifest, Store>(
         utils,
       })
       await opts.effects.exposeForDependents(services)
-      await opts.effects.exposeUi({ paths: ui })
+      await opts.effects.exposeUi({
+        paths: ui.map((x) => ({
+          description: null,
+          copyable: null,
+          qr: null,
+          ...x,
+        })),
+      })
     },
     uninit: async (opts) => {
       await migrations.uninit(opts)
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index b07d6dd0c..e3824a970 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -57,7 +57,7 @@ describe("startosTypeValidation ", () => {
       exists: {} as ParamsPackageId,
       getConfigured: undefined,
       stopped: {} as ParamsMaybePackageId,
-      running: {} as ParamsMaybePackageId,
+      running: {} as ParamsPackageId,
       restart: undefined,
       shutdown: undefined,
       setConfigured: {} as SetConfigured,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index d863fe3d1..0ab0b73db 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -269,7 +269,7 @@ export type ExposeUiPaths<Store> = Array<{
   /** A human readable description or explanation of the value */
   description?: string
   /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
-  masked?: boolean
+  masked: boolean
   /** (string/number only) Whether or not to include a button for copying the value to clipboard */
   copyable?: boolean
   /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
@@ -278,7 +278,7 @@ export type ExposeUiPaths<Store> = Array<{
 /** Used to reach out from the pure js runtime */
 export type Effects = {
   executeAction<Input>(opts: {
-    serviceId?: string
+    serviceId: string | null
     input: Input
   }): Promise<unknown>
 
@@ -362,10 +362,10 @@ export type Effects = {
   /**
    * Get the port address for another service
    */
-  getServicePortForward(
-    internalPort: number,
-    packageId?: string,
-  ): Promise<number>
+  getServicePortForward(options: {
+    internalPort: number
+    packageId: string | null
+  }): Promise<number>
 
   /** Removes all network interfaces */
   clearServiceInterfaces(): Promise<void>
@@ -379,11 +379,11 @@ export type Effects = {
   exposeUi<Store = never>(options: {
     paths: {
       path: string
-      title: string
-      description?: string | undefined
-      masked?: boolean | undefined
-      copyable?: boolean | undefined
-      qr?: boolean | undefined
+      title: string | null
+      description: string | null
+      masked: boolean | null
+      copyable: boolean | null
+      qr: boolean | null
     }[]
   }): Promise<void>
   /**

From e87182264a56eb7f29731a8c96ec655a02a32ee2 Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Thu, 14 Mar 2024 15:14:12 -0600
Subject: [PATCH 056/341] chore: Fix the build for the start9labs/sdk was a new
 directory structure

---
 .../app-interfaces/app-interfaces.page.ts            |  2 +-
 web/projects/ui/src/app/services/api/api.fixures.ts  |  3 +++
 web/projects/ui/src/app/services/api/mock-patch.ts   |  1 +
 web/projects/ui/src/app/services/config.service.ts   | 12 ++++++------
 .../ui/src/app/services/patch-db/data-model.ts       |  3 ++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 84645fb9d..7e4302a3f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -117,7 +117,7 @@ function getAddresses(
       : []
 
   return hostnames
-    .map(h => {
+    .map((h: any) => {
       const addresses: MappedAddress[] = []
 
       let name = ''
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index ea83a4f0a..7cf449664 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1785,6 +1785,7 @@ export module Mock {
               scheme: 'http',
               preferredExternalPort: 80,
               addSsl: {
+                addXForwardedHeaders: null,
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
@@ -1857,6 +1858,7 @@ export module Mock {
               scheme: 'http',
               preferredExternalPort: 80,
               addSsl: {
+                addXForwardedHeaders: null,
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
@@ -2032,6 +2034,7 @@ export module Mock {
               scheme: 'http',
               preferredExternalPort: 80,
               addSsl: {
+                addXForwardedHeaders: null,
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 35942e92f..a34a91652 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -410,6 +410,7 @@ export const mockPatchData: DataModel = {
                 scheme: 'http',
                 preferredExternalPort: 80,
                 addSsl: {
+                  addXForwardedHeaders: null,
                   preferredExternalPort: 443,
                   scheme: 'https',
                 },
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index 50f228e95..d6ad17019 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -1,16 +1,16 @@
 import { DOCUMENT } from '@angular/common'
 import { Inject, Injectable } from '@angular/core'
 import { WorkspaceConfig } from '@start9labs/shared'
-import {
-  HostnameInfoIp,
-  HostnameInfoOnion,
-} from '@start9labs/start-sdk/mjs/lib/types'
+import { types } from '@start9labs/start-sdk'
 import {
   InstalledPackageDataEntry,
   PackageMainStatus,
   PackageState,
 } from 'src/app/services/patch-db/data-model'
 
+type HostnameInfoIp = types.HostnameInfoIp
+type HostnameInfoOnion = types.HostnameInfoOnion
+
 const {
   gitHash,
   useMocks,
@@ -79,14 +79,14 @@ export class ConfigService {
 
     if (host.kind === 'multi') {
       const onionHostname = host.hostnames.find(
-        h => h.kind === 'onion',
+        (h: any) => h.kind === 'onion',
       ) as HostnameInfoOnion
 
       if (this.isTor() && onionHostname) {
         url.hostname = onionHostname.hostname.value
       } else {
         const ipHostname = host.hostnames.find(
-          h => h.kind === 'ip',
+          (h: any) => h.kind === 'ip',
         ) as HostnameInfoIp
 
         if (!ipHostname) return ''
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index e00350528..ccea8e076 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -2,7 +2,8 @@ import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { Url } from '@start9labs/shared'
 import { MarketplaceManifest } from '@start9labs/marketplace'
 import { BasicInfo } from 'src/app/pages/developer-routes/developer-menu/form-info'
-import { ServiceInterfaceWithHostInfo } from '@start9labs/start-sdk/mjs/lib/types'
+import { types } from '@start9labs/start-sdk'
+type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo
 
 export interface DataModel {
   'server-info': ServerInfo

From 45d50b12fdaedfb1547d6128ee166546b39d0e8a Mon Sep 17 00:00:00 2001
From: J H <2364004+Blu-J@users.noreply.github.com>
Date: Thu, 14 Mar 2024 15:18:33 -0600
Subject: [PATCH 057/341] chore: Update the types for the sdk

---
 sdk/package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sdk/package.json b/sdk/package.json
index 14165ca30..539d8f90a 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -2,15 +2,15 @@
   "name": "@start9labs/start-sdk",
   "version": "0.4.0-rev0.lib0.rc8.beta10",
   "description": "Software development kit to facilitate packaging services for StartOS",
-  "main": "./cjs/lib/index.js",
-  "types": "./cjs/lib/index.d.ts",
-  "module": "./mjs/lib/index.js",
+  "main": "./cjs/sdk/lib/index.js",
+  "types": "./cjs/sdk/lib/index.d.ts",
+  "module": "./mjs/sdk/lib/index.js",
   "sideEffects": true,
   "exports": {
     ".": {
-      "import": "./mjs/lib/index.js",
-      "require": "./cjs/lib/index.js",
-      "types": "./cjs/lib/index.d.ts"
+      "import": "./mjs/sdk/lib/index.js",
+      "require": "./cjs/sdk/lib/index.js",
+      "types": "./cjs/sdk/lib/index.d.ts"
     }
   },
   "typesVersion": {
@@ -56,4 +56,4 @@
     "tsx": "^4.7.1",
     "typescript": "^5.0.4"
   }
-}
\ No newline at end of file
+}

From a310c160a57e16f30c272682bbe2ac62b925c0b8 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 14 Mar 2024 15:29:01 -0600
Subject: [PATCH 058/341] chore: Update the types hopefully

---
 Makefile                                          |  3 ++-
 .../src/Adapters/HostSystemStartOs.ts             | 15 ++++++---------
 .../SystemForEmbassy/DockerProcedureContainer.ts  | 15 ++++++++++-----
 .../Adapters/Systems/SystemForEmbassy/MainLoop.ts |  1 +
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 286f79da5..95bbd2565 100644
--- a/Makefile
+++ b/Makefile
@@ -209,7 +209,8 @@ $(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE)
 	cd core && ARCH=$(ARCH) ./build-prod.sh
 	touch $(BINS)
 
-web/node_modules: web/package.json
+web/node_modules: web/package.json 
+	(cd sdk && make bundle)
 	npm --prefix web ci
 
 web/dist/raw/ui: $(WEB_UI_SRC) $(WEB_SHARED_SRC)
diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index ec4fac796..ecd490ea7 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -196,16 +196,13 @@ export class HostSystemStartOs implements Effects {
       T.Effects["getServicePortForward"]
     >
   }
-  getSslCertificate(
-    ...[packageId, algorithm]: Parameters<T.Effects["getSslCertificate"]>
-  ) {
-    return this.rpcRound("getSslCertificate", {
-      packageId,
-      algorithm,
-    }) as ReturnType<T.Effects["getSslCertificate"]>
+  getSslCertificate(options: Parameters<T.Effects["getSslCertificate"]>[0]) {
+    return this.rpcRound("getSslCertificate", options) as ReturnType<
+      T.Effects["getSslCertificate"]
+    >
   }
-  getSslKey(...[packageId, algorithm]: Parameters<T.Effects["getSslKey"]>) {
-    return this.rpcRound("getSslKey", { packageId, algorithm }) as ReturnType<
+  getSslKey(options: Parameters<T.Effects["getSslKey"]>[0]) {
+    return this.rpcRound("getSslKey", options) as ReturnType<
       T.Effects["getSslKey"]
     >
   }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 3506575bc..7852a1ec7 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -33,11 +33,16 @@ export class DockerProcedureContainer {
           await overlay.mount({ type: "assets", id: mount }, mounts[mount])
         } else if (volumeMount.type === "certificate") {
           volumeMount
-          const certChain = await effects.getSslCertificate(
-            null,
-            volumeMount["interface-id"],
-          )
-          const key = await effects.getSslKey(null, volumeMount["interface-id"])
+          const certChain = await effects.getSslCertificate({
+            packageId: null,
+            hostId: volumeMount["interface-id"],
+            algorithm: null,
+          })
+          const key = await effects.getSslKey({
+            packageId: null,
+            hostId: volumeMount["interface-id"],
+            algorithm: null,
+          })
           await fs.writeFile(
             `${path}/${volumeMount["interface-id"]}.cert.pem`,
             certChain.join("\n"),
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index c5e6644af..9a64fd33d 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -186,6 +186,7 @@ export class MainLoop {
 
             if ("result" in result) {
               await effects.setHealth({
+                message: null,
                 name: healthId,
                 status: "passing",
               })

From e604c914d1f7a634b5279a2cc6072679445304c6 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Fri, 15 Mar 2024 11:25:52 -0600
Subject: [PATCH 059/341] chore: UPdate to the make, getting rid of a circular
 dep

---
 Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 95bbd2565..bd3c14cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client
 GZIP_BIN := $(shell which pigz || which gzip)
 TAR_BIN := $(shell which gtar || which tar)
 COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar
-ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE)
+ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) sdk/lib/test 
 
 ifeq ($(REMOTE),)
 	mkdir = mkdir -p $1
@@ -87,7 +87,7 @@ clean:
 format:
 	cd core && cargo +nightly fmt
 
-test: $(CORE_SRC) $(ENVIRONMENT_FILE)
+test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
 	cd core && cargo build && cargo test
 
 cli:
@@ -109,7 +109,7 @@ results/$(BASENAME).$(IMAGE_TYPE) results/$(BASENAME).squashfs: $(IMAGE_RECIPE_S
 	./image-recipe/run-local-build.sh "results/$(BASENAME).deb"
 
 # For creating os images. DO NOT USE
-install: $(ALL_TARGETS)
+install: $(ALL_TARGETS) 
 	$(call mkdir,$(DESTDIR)/usr/bin)
 	$(call cp,core/target/$(ARCH)-unknown-linux-musl/release/startbox,$(DESTDIR)/usr/bin/startbox)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/startd)
@@ -177,7 +177,10 @@ core/startos/bindings: $(CORE_SRC) $(ENVIRONMENT_FILE) $(PLATFORM_FILE)
 	(cd core/ && cargo test)
 	touch core/startos/bindings
 
-sdk/dist: $(shell git ls-files sdk) core/startos/bindings
+sdk/lib/test: $(shell git ls-files sdk) core/startos/bindings
+	(cd sdk && make test)
+
+sdk/dist: $(shell git ls-files sdk)
 	(cd sdk && make bundle)
 
 container-runtime/dist: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
@@ -209,7 +212,7 @@ $(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE)
 	cd core && ARCH=$(ARCH) ./build-prod.sh
 	touch $(BINS)
 
-web/node_modules: web/package.json 
+web/node_modules: web/package.json sdk/dist
 	(cd sdk && make bundle)
 	npm --prefix web ci
 

From 1a396cfc7b860086749c68decef12ef805ad07f7 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:02:47 -0600
Subject: [PATCH 060/341] reorganize package data and write dependencies rpc
 (#2571)

* wip

* finish dependencies

* minor fixes
---
 Makefile                                      |   2 +-
 .../src/Adapters/HostSystemStartOs.ts         |   5 +-
 core/models/src/id/health_check.rs            |   9 +-
 core/models/src/id/mod.rs                     |   7 +
 core/startos/bindings/DependencyKind.ts       |   3 +
 .../startos/bindings/DependencyRequirement.ts |   6 +
 .../bindings/DestroyOverlayedImageParams.ts   |   2 +-
 .../startos/bindings/SetDependenciesParams.ts |   4 +
 core/startos/src/backup/backup_bulk.rs        |   5 +-
 core/startos/src/context/rpc.rs               |  50 +-
 core/startos/src/db/model.rs                  | 627 ------------------
 core/startos/src/db/model/mod.rs              |  48 ++
 core/startos/src/db/model/package.rs          | 424 ++++++++++++
 core/startos/src/db/model/private.rs          |  30 +
 core/startos/src/db/model/public.rs           | 210 ++++++
 core/startos/src/db/prelude.rs                |   6 +
 core/startos/src/dependencies.rs              |  44 +-
 core/startos/src/init.rs                      |   2 +-
 core/startos/src/install/mod.rs               |  60 +-
 core/startos/src/net/dhcp.rs                  |   2 +-
 core/startos/src/net/net_controller.rs        |   2 -
 core/startos/src/properties.rs                |   5 +-
 core/startos/src/service/mod.rs               | 113 ++--
 .../src/service/service_effect_handler.rs     | 155 ++++-
 core/startos/src/service/service_map.rs       |  98 +--
 core/startos/src/update/mod.rs                |   2 +-
 patch-db                                      |   2 +-
 sdk/lib/config/configDependencies.ts          |   5 +-
 sdk/lib/test/startosTypeValidation.test.ts    |   3 +
 sdk/lib/types.ts                              |  11 +-
 30 files changed, 1045 insertions(+), 897 deletions(-)
 create mode 100644 core/startos/bindings/DependencyKind.ts
 create mode 100644 core/startos/bindings/DependencyRequirement.ts
 create mode 100644 core/startos/bindings/SetDependenciesParams.ts
 delete mode 100644 core/startos/src/db/model.rs
 create mode 100644 core/startos/src/db/model/mod.rs
 create mode 100644 core/startos/src/db/model/package.rs
 create mode 100644 core/startos/src/db/model/private.rs
 create mode 100644 core/startos/src/db/model/public.rs

diff --git a/Makefile b/Makefile
index bd3c14cc2..48a28c388 100644
--- a/Makefile
+++ b/Makefile
@@ -173,7 +173,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 	npm --prefix container-runtime ci
 	touch container-runtime/node_modules
 
-core/startos/bindings: $(CORE_SRC) $(ENVIRONMENT_FILE) $(PLATFORM_FILE)
+core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE) $(PLATFORM_FILE)
 	(cd core/ && cargo test)
 	touch core/startos/bindings
 
diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index ecd490ea7..f173e4e62 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -117,10 +117,7 @@ export class HostSystemStartOs implements Effects {
       T.Effects["createOverlayedImage"]
     >
   }
-  destroyOverlayedImage(options: {
-    imageId: string
-    guid: string
-  }): Promise<void> {
+  destroyOverlayedImage(options: { guid: string }): Promise<void> {
     return this.rpcRound("destroyOverlayedImage", options) as ReturnType<
       T.Effects["destroyOverlayedImage"]
     >
diff --git a/core/models/src/id/health_check.rs b/core/models/src/id/health_check.rs
index 72c2947e7..c416ab1e6 100644
--- a/core/models/src/id/health_check.rs
+++ b/core/models/src/id/health_check.rs
@@ -1,8 +1,9 @@
 use std::path::Path;
+use std::str::FromStr;
 
 use serde::{Deserialize, Deserializer, Serialize};
 
-use crate::Id;
+use crate::{Id, InvalidId};
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, ts_rs::TS)]
 pub struct HealthCheckId(Id);
@@ -11,6 +12,12 @@ impl std::fmt::Display for HealthCheckId {
         write!(f, "{}", &self.0)
     }
 }
+impl FromStr for HealthCheckId {
+    type Err = InvalidId;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Id::from_str(s).map(HealthCheckId)
+    }
+}
 impl AsRef<str> for HealthCheckId {
     fn as_ref(&self) -> &str {
         self.0.as_ref()
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index ef38ece9d..29825f628 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -1,4 +1,5 @@
 use std::borrow::Borrow;
+use std::str::FromStr;
 
 use regex::Regex;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -59,6 +60,12 @@ impl TryFrom<&str> for Id {
         }
     }
 }
+impl FromStr for Id {
+    type Err = InvalidId;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::try_from(s)
+    }
+}
 impl From<Id> for InternedString {
     fn from(value: Id) -> Self {
         value.0
diff --git a/core/startos/bindings/DependencyKind.ts b/core/startos/bindings/DependencyKind.ts
new file mode 100644
index 000000000..018562971
--- /dev/null
+++ b/core/startos/bindings/DependencyKind.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type DependencyKind = "exists" | "running";
\ No newline at end of file
diff --git a/core/startos/bindings/DependencyRequirement.ts b/core/startos/bindings/DependencyRequirement.ts
new file mode 100644
index 000000000..9ece754c1
--- /dev/null
+++ b/core/startos/bindings/DependencyRequirement.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DependencyKind } from "./DependencyKind";
+import type { HealthCheckId } from "./HealthCheckId";
+import type { PackageId } from "./PackageId";
+
+export interface DependencyRequirement { id: PackageId, kind: DependencyKind, healthChecks: Array<HealthCheckId>, }
\ No newline at end of file
diff --git a/core/startos/bindings/DestroyOverlayedImageParams.ts b/core/startos/bindings/DestroyOverlayedImageParams.ts
index 15dd2bf53..b875e45bd 100644
--- a/core/startos/bindings/DestroyOverlayedImageParams.ts
+++ b/core/startos/bindings/DestroyOverlayedImageParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface DestroyOverlayedImageParams { imageId: string , guid: string, }
\ No newline at end of file
+export interface DestroyOverlayedImageParams { guid: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/SetDependenciesParams.ts b/core/startos/bindings/SetDependenciesParams.ts
new file mode 100644
index 000000000..7741cddde
--- /dev/null
+++ b/core/startos/bindings/SetDependenciesParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DependencyRequirement } from "./DependencyRequirement";
+
+export interface SetDependenciesParams { dependencies: Array<DependencyRequirement>, }
\ No newline at end of file
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 4f633d7ae..8c609f672 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -18,7 +18,8 @@ use crate::auth::check_password_against_db;
 use crate::backup::os::OsBackup;
 use crate::backup::{BackupReport, ServerBackupReport};
 use crate::context::RpcContext;
-use crate::db::model::{BackupProgress, DatabaseModel};
+use crate::db::model::public::BackupProgress;
+use crate::db::model::DatabaseModel;
 use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
@@ -174,7 +175,7 @@ pub async fn backup_all(
                         .as_package_data()
                         .as_entries()?
                         .into_iter()
-                        .filter(|(_, m)| m.expect_as_installed().is_ok())
+                        .filter(|(_, m)| m.as_state_info().expect_installed().is_ok())
                         .map(|(id, _)| id)
                         .collect()
                 };
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 0f11bf63f..f987ffbf4 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -19,7 +19,7 @@ use super::setup::CURRENT_SECRET;
 use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
 use crate::core::rpc_continuations::{RequestGuid, RestHandler, RpcContinuation, WebSocketHandler};
-use crate::db::model::CurrentDependents;
+use crate::db::model::package::CurrentDependents;
 use crate::db::prelude::PatchDbExt;
 use crate::dependencies::compute_dependency_config_errs;
 use crate::disk::OsPartitionInfo;
@@ -219,12 +219,7 @@ impl RpcContext {
                 for (package_id, package) in
                     f.as_public_mut().as_package_data_mut().as_entries_mut()?
                 {
-                    for (k, v) in package
-                        .as_installed_mut()
-                        .into_iter()
-                        .flat_map(|i| i.clone().into_current_dependencies().into_entries())
-                        .flatten()
-                    {
+                    for (k, v) in package.clone().into_current_dependencies().into_entries()? {
                         let mut entry: BTreeMap<_, _> =
                             current_dependents.remove(&k).unwrap_or_default();
                         entry.insert(package_id.clone(), v.de()?);
@@ -236,16 +231,7 @@ impl RpcContext {
                         .as_public_mut()
                         .as_package_data_mut()
                         .as_idx_mut(&package_id)
-                        .and_then(|pde| pde.expect_as_installed_mut().ok())
-                        .map(|i| i.as_installed_mut().as_current_dependents_mut())
-                    {
-                        deps.ser(&CurrentDependents(current_dependents))?;
-                    } else if let Some(deps) = f
-                        .as_public_mut()
-                        .as_package_data_mut()
-                        .as_idx_mut(&package_id)
-                        .and_then(|pde| pde.expect_as_removing_mut().ok())
-                        .map(|i| i.as_removing_mut().as_current_dependents_mut())
+                        .map(|i| i.as_current_dependents_mut())
                     {
                         deps.ser(&CurrentDependents(current_dependents))?;
                     }
@@ -261,23 +247,18 @@ impl RpcContext {
         let peek = self.db.peek().await;
         for (package_id, package) in peek.as_public().as_package_data().as_entries()?.into_iter() {
             let package = package.clone();
-            if let Some(current_dependencies) = package
-                .as_installed()
-                .and_then(|x| x.as_current_dependencies().de().ok())
-            {
-                let manifest = package.as_manifest().de()?;
-                all_dependency_config_errs.insert(
-                    package_id.clone(),
-                    compute_dependency_config_errs(
-                        self,
-                        &peek,
-                        &manifest,
-                        &current_dependencies,
-                        &Default::default(),
-                    )
-                    .await?,
-                );
-            }
+            let current_dependencies = package.as_current_dependencies().de()?;
+            all_dependency_config_errs.insert(
+                package_id.clone(),
+                compute_dependency_config_errs(
+                    self,
+                    &peek,
+                    &package_id,
+                    &current_dependencies,
+                    &Default::default(),
+                )
+                .await?,
+            );
         }
         self.db
             .mutate(|v| {
@@ -286,7 +267,6 @@ impl RpcContext {
                         .as_public_mut()
                         .as_package_data_mut()
                         .as_idx_mut(&package_id)
-                        .and_then(|pde| pde.as_installed_mut())
                         .map(|i| i.as_status_mut().as_dependency_config_errors_mut())
                     {
                         config_errors.ser(&errs)?;
diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs
deleted file mode 100644
index b79d9d417..000000000
--- a/core/startos/src/db/model.rs
+++ /dev/null
@@ -1,627 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::net::{Ipv4Addr, Ipv6Addr};
-
-use chrono::{DateTime, Utc};
-use emver::VersionRange;
-use imbl_value::InternedString;
-use ipnet::{Ipv4Net, Ipv6Net};
-use isocountry::CountryCode;
-use itertools::Itertools;
-use models::{DataUrl, HealthCheckId, HostId, PackageId};
-use openssl::hash::MessageDigest;
-use patch_db::json_ptr::JsonPointer;
-use patch_db::{HasModel, Value};
-use reqwest::Url;
-use serde::{Deserialize, Serialize};
-use torut::onion::OnionAddressV3;
-
-use crate::account::AccountInfo;
-use crate::auth::Sessions;
-use crate::backup::target::cifs::CifsTargets;
-use crate::net::forward::AvailablePorts;
-use crate::net::host::HostInfo;
-use crate::net::keys::KeyStore;
-use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
-use crate::notifications::Notifications;
-use crate::prelude::*;
-use crate::progress::FullProgress;
-use crate::s9pk::manifest::Manifest;
-use crate::ssh::SshKeys;
-use crate::status::Status;
-use crate::util::cpupower::Governor;
-use crate::util::serde::Pem;
-use crate::util::Version;
-use crate::version::{Current, VersionT};
-use crate::{ARCH, PLATFORM};
-
-fn get_arch() -> InternedString {
-    (*ARCH).into()
-}
-
-fn get_platform() -> InternedString {
-    (&*PLATFORM).into()
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct Database {
-    pub public: Public,
-    pub private: Private,
-}
-impl Database {
-    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
-        let lan_address = account.hostname.lan_address().parse().unwrap();
-        Ok(Database {
-            public: Public {
-                server_info: ServerInfo {
-                    arch: get_arch(),
-                    platform: get_platform(),
-                    id: account.server_id.clone(),
-                    version: Current::new().semver().into(),
-                    hostname: account.hostname.no_dot_host_name(),
-                    last_backup: None,
-                    last_wifi_region: None,
-                    eos_version_compat: Current::new().compat().clone(),
-                    lan_address,
-                    onion_address: account.tor_key.public().get_onion_address(),
-                    tor_address: format!(
-                        "https://{}",
-                        account.tor_key.public().get_onion_address()
-                    )
-                    .parse()
-                    .unwrap(),
-                    ip_info: BTreeMap::new(),
-                    status_info: ServerStatus {
-                        backup_progress: None,
-                        updated: false,
-                        update_progress: None,
-                        shutting_down: false,
-                        restarting: false,
-                    },
-                    wifi: WifiInfo {
-                        ssids: Vec::new(),
-                        connected: None,
-                        selected: None,
-                    },
-                    unread_notification_count: 0,
-                    connection_addresses: ConnectionAddresses {
-                        tor: Vec::new(),
-                        clearnet: Vec::new(),
-                    },
-                    password_hash: account.password.clone(),
-                    pubkey: ssh_key::PublicKey::from(&account.ssh_key)
-                        .to_openssh()
-                        .unwrap(),
-                    ca_fingerprint: account
-                        .root_ca_cert
-                        .digest(MessageDigest::sha256())
-                        .unwrap()
-                        .iter()
-                        .map(|x| format!("{x:X}"))
-                        .join(":"),
-                    ntp_synced: false,
-                    zram: true,
-                    governor: None,
-                },
-                package_data: AllPackageData::default(),
-                ui: serde_json::from_str(include_str!(concat!(
-                    env!("CARGO_MANIFEST_DIR"),
-                    "/../../web/patchdb-ui-seed.json"
-                )))
-                .unwrap(),
-            },
-            private: Private {
-                key_store: KeyStore::new(account)?,
-                password: account.password.clone(),
-                ssh_privkey: Pem(account.ssh_key.clone()),
-                ssh_pubkeys: SshKeys::new(),
-                available_ports: AvailablePorts::new(),
-                sessions: Sessions::new(),
-                notifications: Notifications::new(),
-                cifs: CifsTargets::new(),
-                package_stores: BTreeMap::new(),
-            }, // TODO
-        })
-    }
-}
-
-pub type DatabaseModel = Model<Database>;
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-// #[macro_debug]
-pub struct Public {
-    pub server_info: ServerInfo,
-    pub package_data: AllPackageData,
-    pub ui: Value,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct Private {
-    pub key_store: KeyStore,
-    pub password: String, // argon2 hash
-    pub ssh_privkey: Pem<ssh_key::PrivateKey>,
-    pub ssh_pubkeys: SshKeys,
-    pub available_ports: AvailablePorts,
-    pub sessions: Sessions,
-    pub notifications: Notifications,
-    pub cifs: CifsTargets,
-    #[serde(default)]
-    pub package_stores: BTreeMap<PackageId, Value>,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct ServerInfo {
-    #[serde(default = "get_arch")]
-    pub arch: InternedString,
-    #[serde(default = "get_platform")]
-    pub platform: InternedString,
-    pub id: String,
-    pub hostname: String,
-    pub version: Version,
-    pub last_backup: Option<DateTime<Utc>>,
-    /// Used in the wifi to determine the region to set the system to
-    pub last_wifi_region: Option<CountryCode>,
-    pub eos_version_compat: VersionRange,
-    pub lan_address: Url,
-    pub onion_address: OnionAddressV3,
-    /// for backwards compatibility
-    pub tor_address: Url,
-    pub ip_info: BTreeMap<String, IpInfo>,
-    #[serde(default)]
-    pub status_info: ServerStatus,
-    pub wifi: WifiInfo,
-    pub unread_notification_count: u64,
-    pub connection_addresses: ConnectionAddresses,
-    pub password_hash: String,
-    pub pubkey: String,
-    pub ca_fingerprint: String,
-    #[serde(default)]
-    pub ntp_synced: bool,
-    #[serde(default)]
-    pub zram: bool,
-    pub governor: Option<Governor>,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct IpInfo {
-    pub ipv4_range: Option<Ipv4Net>,
-    pub ipv4: Option<Ipv4Addr>,
-    pub ipv6_range: Option<Ipv6Net>,
-    pub ipv6: Option<Ipv6Addr>,
-}
-impl IpInfo {
-    pub async fn for_interface(iface: &str) -> Result<Self, Error> {
-        let (ipv4, ipv4_range) = get_iface_ipv4_addr(iface).await?.unzip();
-        let (ipv6, ipv6_range) = get_iface_ipv6_addr(iface).await?.unzip();
-        Ok(Self {
-            ipv4_range,
-            ipv4,
-            ipv6_range,
-            ipv6,
-        })
-    }
-}
-
-#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
-#[model = "Model<Self>"]
-pub struct BackupProgress {
-    pub complete: bool,
-}
-
-#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct ServerStatus {
-    pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
-    pub updated: bool,
-    pub update_progress: Option<UpdateProgress>,
-    #[serde(default)]
-    pub shutting_down: bool,
-    #[serde(default)]
-    pub restarting: bool,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct UpdateProgress {
-    pub size: Option<u64>,
-    pub downloaded: u64,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct WifiInfo {
-    pub ssids: Vec<String>,
-    pub selected: Option<String>,
-    pub connected: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct ServerSpecs {
-    pub cpu: String,
-    pub disk: String,
-    pub memory: String,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct ConnectionAddresses {
-    pub tor: Vec<String>,
-    pub clearnet: Vec<String>,
-}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-pub struct AllPackageData(pub BTreeMap<PackageId, PackageDataEntry>);
-impl Map for AllPackageData {
-    type Key = PackageId;
-    type Value = PackageDataEntry;
-    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
-        Ok(key)
-    }
-    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
-        Ok(key.clone().into())
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct StaticFiles {
-    license: String,
-    instructions: String,
-    icon: DataUrl<'static>,
-}
-impl StaticFiles {
-    pub fn local(id: &PackageId, version: &Version, icon: DataUrl<'static>) -> Self {
-        StaticFiles {
-            license: format!("/public/package-data/{}/{}/LICENSE.md", id, version),
-            instructions: format!("/public/package-data/{}/{}/INSTRUCTIONS.md", id, version),
-            icon,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct PackageDataEntryInstalling {
-    pub static_files: StaticFiles,
-    pub manifest: Manifest,
-    pub install_progress: FullProgress,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct PackageDataEntryUpdating {
-    pub static_files: StaticFiles,
-    pub manifest: Manifest,
-    pub installed: InstalledPackageInfo,
-    pub install_progress: FullProgress,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct PackageDataEntryRestoring {
-    pub static_files: StaticFiles,
-    pub manifest: Manifest,
-    pub install_progress: FullProgress,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct PackageDataEntryRemoving {
-    pub static_files: StaticFiles,
-    pub manifest: Manifest,
-    pub removing: InstalledPackageInfo,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct PackageDataEntryInstalled {
-    pub static_files: StaticFiles,
-    pub manifest: Manifest,
-    pub installed: InstalledPackageInfo,
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(tag = "state")]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-// #[macro_debug]
-pub enum PackageDataEntry {
-    Installing(PackageDataEntryInstalling),
-    Updating(PackageDataEntryUpdating),
-    Restoring(PackageDataEntryRestoring),
-    Removing(PackageDataEntryRemoving),
-    Installed(PackageDataEntryInstalled),
-}
-impl Model<PackageDataEntry> {
-    pub fn expect_into_installed(self) -> Result<Model<PackageDataEntryInstalled>, Error> {
-        if let PackageDataEntryMatchModel::Installed(a) = self.into_match() {
-            Ok(a)
-        } else {
-            Err(Error::new(
-                eyre!("package is not in installed state"),
-                ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-    pub fn expect_as_installed(&self) -> Result<&Model<PackageDataEntryInstalled>, Error> {
-        if let PackageDataEntryMatchModelRef::Installed(a) = self.as_match() {
-            Ok(a)
-        } else {
-            Err(Error::new(
-                eyre!("package is not in installed state"),
-                ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-    pub fn expect_as_installed_mut(
-        &mut self,
-    ) -> Result<&mut Model<PackageDataEntryInstalled>, Error> {
-        if let PackageDataEntryMatchModelMut::Installed(a) = self.as_match_mut() {
-            Ok(a)
-        } else {
-            Err(Error::new(
-                eyre!("package is not in installed state"),
-                ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-    pub fn expect_into_removing(self) -> Result<Model<PackageDataEntryRemoving>, Error> {
-        if let PackageDataEntryMatchModel::Removing(a) = self.into_match() {
-            Ok(a)
-        } else {
-            Err(Error::new(
-                eyre!("package is not in removing state"),
-                ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-    pub fn expect_as_removing(&self) -> Result<&Model<PackageDataEntryRemoving>, Error> {
-        if let PackageDataEntryMatchModelRef::Removing(a) = self.as_match() {
-            Ok(a)
-        } else {
-            Err(Error::new(
-                eyre!("package is not in removing state"),
-                ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-    pub fn expect_as_removing_mut(
-        &mut self,
-    ) -> Result<&mut Model<PackageDataEntryRemoving>, Error> {
-        if let PackageDataEntryMatchModelMut::Removing(a) = self.as_match_mut() {
-            Ok(a)
-        } else {
-            Err(Error::new(
-                eyre!("package is not in removing state"),
-                ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-    pub fn expect_as_installing_mut(
-        &mut self,
-    ) -> Result<&mut Model<PackageDataEntryInstalling>, Error> {
-        if let PackageDataEntryMatchModelMut::Installing(a) = self.as_match_mut() {
-            Ok(a)
-        } else {
-            Err(Error::new(
-                eyre!("package is not in installing state"),
-                ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-    pub fn into_manifest(self) -> Model<Manifest> {
-        match self.into_match() {
-            PackageDataEntryMatchModel::Installing(a) => a.into_manifest(),
-            PackageDataEntryMatchModel::Updating(a) => a.into_installed().into_manifest(),
-            PackageDataEntryMatchModel::Restoring(a) => a.into_manifest(),
-            PackageDataEntryMatchModel::Removing(a) => a.into_manifest(),
-            PackageDataEntryMatchModel::Installed(a) => a.into_manifest(),
-            PackageDataEntryMatchModel::Error(_) => Model::from(Value::Null),
-        }
-    }
-    pub fn as_manifest(&self) -> &Model<Manifest> {
-        match self.as_match() {
-            PackageDataEntryMatchModelRef::Installing(a) => a.as_manifest(),
-            PackageDataEntryMatchModelRef::Updating(a) => a.as_installed().as_manifest(),
-            PackageDataEntryMatchModelRef::Restoring(a) => a.as_manifest(),
-            PackageDataEntryMatchModelRef::Removing(a) => a.as_manifest(),
-            PackageDataEntryMatchModelRef::Installed(a) => a.as_manifest(),
-            PackageDataEntryMatchModelRef::Error(_) => (&Value::Null).into(),
-        }
-    }
-    pub fn into_installed(self) -> Option<Model<InstalledPackageInfo>> {
-        match self.into_match() {
-            PackageDataEntryMatchModel::Installing(_) => None,
-            PackageDataEntryMatchModel::Updating(a) => Some(a.into_installed()),
-            PackageDataEntryMatchModel::Restoring(_) => None,
-            PackageDataEntryMatchModel::Removing(_) => None,
-            PackageDataEntryMatchModel::Installed(a) => Some(a.into_installed()),
-            PackageDataEntryMatchModel::Error(_) => None,
-        }
-    }
-    pub fn as_installed(&self) -> Option<&Model<InstalledPackageInfo>> {
-        match self.as_match() {
-            PackageDataEntryMatchModelRef::Installing(_) => None,
-            PackageDataEntryMatchModelRef::Updating(a) => Some(a.as_installed()),
-            PackageDataEntryMatchModelRef::Restoring(_) => None,
-            PackageDataEntryMatchModelRef::Removing(_) => None,
-            PackageDataEntryMatchModelRef::Installed(a) => Some(a.as_installed()),
-            PackageDataEntryMatchModelRef::Error(_) => None,
-        }
-    }
-    pub fn as_installed_mut(&mut self) -> Option<&mut Model<InstalledPackageInfo>> {
-        match self.as_match_mut() {
-            PackageDataEntryMatchModelMut::Installing(_) => None,
-            PackageDataEntryMatchModelMut::Updating(a) => Some(a.as_installed_mut()),
-            PackageDataEntryMatchModelMut::Restoring(_) => None,
-            PackageDataEntryMatchModelMut::Removing(_) => None,
-            PackageDataEntryMatchModelMut::Installed(a) => Some(a.as_installed_mut()),
-            PackageDataEntryMatchModelMut::Error(_) => None,
-        }
-    }
-    pub fn as_install_progress(&self) -> Option<&Model<FullProgress>> {
-        match self.as_match() {
-            PackageDataEntryMatchModelRef::Installing(a) => Some(a.as_install_progress()),
-            PackageDataEntryMatchModelRef::Updating(a) => Some(a.as_install_progress()),
-            PackageDataEntryMatchModelRef::Restoring(a) => Some(a.as_install_progress()),
-            PackageDataEntryMatchModelRef::Removing(_) => None,
-            PackageDataEntryMatchModelRef::Installed(_) => None,
-            PackageDataEntryMatchModelRef::Error(_) => None,
-        }
-    }
-    pub fn as_install_progress_mut(&mut self) -> Option<&mut Model<FullProgress>> {
-        match self.as_match_mut() {
-            PackageDataEntryMatchModelMut::Installing(a) => Some(a.as_install_progress_mut()),
-            PackageDataEntryMatchModelMut::Updating(a) => Some(a.as_install_progress_mut()),
-            PackageDataEntryMatchModelMut::Restoring(a) => Some(a.as_install_progress_mut()),
-            PackageDataEntryMatchModelMut::Removing(_) => None,
-            PackageDataEntryMatchModelMut::Installed(_) => None,
-            PackageDataEntryMatchModelMut::Error(_) => None,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct InstalledPackageInfo {
-    pub status: Status,
-    pub marketplace_url: Option<Url>,
-    #[serde(default)]
-    #[serde(with = "crate::util::serde::ed25519_pubkey")]
-    pub developer_key: ed25519_dalek::VerifyingKey,
-    pub manifest: Manifest,
-    pub last_backup: Option<DateTime<Utc>>,
-    pub dependency_info: BTreeMap<PackageId, StaticDependencyInfo>,
-    pub current_dependents: CurrentDependents,
-    pub current_dependencies: CurrentDependencies,
-    pub interface_addresses: InterfaceAddressMap,
-    pub hosts: HostInfo,
-    pub store_exposed_ui: Vec<ExposedUI>,
-    pub store_exposed_dependents: Vec<JsonPointer>,
-}
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[model = "Model<Self>"]
-pub struct ExposedDependent {
-    path: String,
-    title: String,
-    description: Option<String>,
-    masked: Option<bool>,
-    copyable: Option<bool>,
-    qr: Option<bool>,
-}
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel, ts_rs::TS)]
-#[model = "Model<Self>"]
-#[ts(export)]
-pub struct ExposedUI {
-    #[ts(type = "string")]
-    pub path: JsonPointer,
-    pub title: String,
-    pub description: Option<String>,
-    pub masked: Option<bool>,
-    pub copyable: Option<bool>,
-    pub qr: Option<bool>,
-}
-
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
-pub struct CurrentDependents(pub BTreeMap<PackageId, CurrentDependencyInfo>);
-impl CurrentDependents {
-    pub fn map(
-        mut self,
-        transform: impl Fn(
-            BTreeMap<PackageId, CurrentDependencyInfo>,
-        ) -> BTreeMap<PackageId, CurrentDependencyInfo>,
-    ) -> Self {
-        self.0 = transform(self.0);
-        self
-    }
-}
-impl Map for CurrentDependents {
-    type Key = PackageId;
-    type Value = CurrentDependencyInfo;
-    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
-        Ok(key)
-    }
-    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
-        Ok(key.clone().into())
-    }
-}
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
-pub struct CurrentDependencies(pub BTreeMap<PackageId, CurrentDependencyInfo>);
-impl CurrentDependencies {
-    pub fn map(
-        mut self,
-        transform: impl Fn(
-            BTreeMap<PackageId, CurrentDependencyInfo>,
-        ) -> BTreeMap<PackageId, CurrentDependencyInfo>,
-    ) -> Self {
-        self.0 = transform(self.0);
-        self
-    }
-}
-impl Map for CurrentDependencies {
-    type Key = PackageId;
-    type Value = CurrentDependencyInfo;
-    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
-        Ok(key)
-    }
-    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
-        Ok(key.clone().into())
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct StaticDependencyInfo {
-    pub title: String,
-    pub icon: DataUrl<'static>,
-}
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct CurrentDependencyInfo {
-    #[serde(default)]
-    pub health_checks: BTreeSet<HealthCheckId>,
-}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-pub struct InterfaceAddressMap(pub BTreeMap<HostId, InterfaceAddresses>);
-impl Map for InterfaceAddressMap {
-    type Key = HostId;
-    type Value = InterfaceAddresses;
-    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
-        Ok(key)
-    }
-    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
-        Ok(key.clone().into())
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct InterfaceAddresses {
-    pub tor_address: Option<String>,
-    pub lan_address: Option<String>,
-}
diff --git a/core/startos/src/db/model/mod.rs b/core/startos/src/db/model/mod.rs
new file mode 100644
index 000000000..24497ed4e
--- /dev/null
+++ b/core/startos/src/db/model/mod.rs
@@ -0,0 +1,48 @@
+use std::collections::BTreeMap;
+
+use patch_db::HasModel;
+use serde::{Deserialize, Serialize};
+
+use crate::account::AccountInfo;
+use crate::auth::Sessions;
+use crate::backup::target::cifs::CifsTargets;
+use crate::db::model::private::Private;
+use crate::db::model::public::Public;
+use crate::net::forward::AvailablePorts;
+use crate::net::keys::KeyStore;
+use crate::notifications::Notifications;
+use crate::prelude::*;
+use crate::ssh::SshKeys;
+use crate::util::serde::Pem;
+
+pub mod package;
+pub mod private;
+pub mod public;
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct Database {
+    pub public: Public,
+    pub private: Private,
+}
+impl Database {
+    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
+        Ok(Self {
+            public: Public::init(account)?,
+            private: Private {
+                key_store: KeyStore::new(account)?,
+                password: account.password.clone(),
+                ssh_privkey: Pem(account.ssh_key.clone()),
+                ssh_pubkeys: SshKeys::new(),
+                available_ports: AvailablePorts::new(),
+                sessions: Sessions::new(),
+                notifications: Notifications::new(),
+                cifs: CifsTargets::new(),
+                package_stores: BTreeMap::new(),
+            }, // TODO
+        })
+    }
+}
+
+pub type DatabaseModel = Model<Database>;
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
new file mode 100644
index 000000000..cb4e3a255
--- /dev/null
+++ b/core/startos/src/db/model/package.rs
@@ -0,0 +1,424 @@
+use std::collections::{BTreeMap, BTreeSet};
+
+use chrono::{DateTime, Utc};
+use imbl_value::InternedString;
+use models::{DataUrl, HealthCheckId, HostId, PackageId};
+use patch_db::json_ptr::JsonPointer;
+use patch_db::HasModel;
+use reqwest::Url;
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::net::host::HostInfo;
+use crate::prelude::*;
+use crate::progress::FullProgress;
+use crate::s9pk::manifest::Manifest;
+use crate::status::Status;
+
+#[derive(Debug, Default, Deserialize, Serialize)]
+pub struct AllPackageData(pub BTreeMap<PackageId, PackageDataEntry>);
+impl Map for AllPackageData {
+    type Key = PackageId;
+    type Value = PackageDataEntry;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub enum ManifestPreference {
+    Old,
+    New,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[serde(tag = "state")]
+#[model = "Model<Self>"]
+pub enum PackageState {
+    Installing(InstallingState),
+    Restoring(InstallingState),
+    Updating(UpdatingState),
+    Installed(InstalledState),
+    Removing(InstalledState),
+}
+impl PackageState {
+    pub fn expect_installed(&self) -> Result<&InstalledState, Error> {
+        match self {
+            Self::Installed(a) => Ok(a),
+            a => Err(Error::new(
+                eyre!(
+                    "Package {} is not in installed state",
+                    self.as_manifest(ManifestPreference::Old).id
+                ),
+                ErrorKind::InvalidRequest,
+            )),
+        }
+    }
+    pub fn into_installing_info(self) -> Option<InstallingInfo> {
+        match self {
+            Self::Installing(InstallingState { installing_info })
+            | Self::Restoring(InstallingState { installing_info }) => Some(installing_info),
+            Self::Updating(UpdatingState {
+                installing_info, ..
+            }) => Some(installing_info),
+            Self::Installed(_) | Self::Removing(_) => None,
+        }
+    }
+    pub fn as_installing_info(&self) -> Option<&InstallingInfo> {
+        match self {
+            Self::Installing(InstallingState { installing_info })
+            | Self::Restoring(InstallingState { installing_info }) => Some(installing_info),
+            Self::Updating(UpdatingState {
+                installing_info, ..
+            }) => Some(installing_info),
+            Self::Installed(_) | Self::Removing(_) => None,
+        }
+    }
+    pub fn as_installing_info_mut(&mut self) -> Option<&mut InstallingInfo> {
+        match self {
+            Self::Installing(InstallingState { installing_info })
+            | Self::Restoring(InstallingState { installing_info }) => Some(installing_info),
+            Self::Updating(UpdatingState {
+                installing_info, ..
+            }) => Some(installing_info),
+            Self::Installed(_) | Self::Removing(_) => None,
+        }
+    }
+    pub fn into_manifest(self, preference: ManifestPreference) -> Manifest {
+        match self {
+            Self::Installing(InstallingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+            })
+            | Self::Restoring(InstallingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+            }) => new_manifest,
+            Self::Updating(UpdatingState { manifest, .. })
+                if preference == ManifestPreference::Old =>
+            {
+                manifest
+            }
+            Self::Updating(UpdatingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+                ..
+            }) => new_manifest,
+            Self::Installed(InstalledState { manifest })
+            | Self::Removing(InstalledState { manifest }) => manifest,
+        }
+    }
+    pub fn as_manifest(&self, preference: ManifestPreference) -> &Manifest {
+        match self {
+            Self::Installing(InstallingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+            })
+            | Self::Restoring(InstallingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+            }) => new_manifest,
+            Self::Updating(UpdatingState { manifest, .. })
+                if preference == ManifestPreference::Old =>
+            {
+                manifest
+            }
+            Self::Updating(UpdatingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+                ..
+            }) => new_manifest,
+            Self::Installed(InstalledState { manifest })
+            | Self::Removing(InstalledState { manifest }) => manifest,
+        }
+    }
+    pub fn as_manifest_mut(&mut self, preference: ManifestPreference) -> &mut Manifest {
+        match self {
+            Self::Installing(InstallingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+            })
+            | Self::Restoring(InstallingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+            }) => new_manifest,
+            Self::Updating(UpdatingState { manifest, .. })
+                if preference == ManifestPreference::Old =>
+            {
+                manifest
+            }
+            Self::Updating(UpdatingState {
+                installing_info: InstallingInfo { new_manifest, .. },
+                ..
+            }) => new_manifest,
+            Self::Installed(InstalledState { manifest })
+            | Self::Removing(InstalledState { manifest }) => manifest,
+        }
+    }
+}
+impl Model<PackageState> {
+    pub fn expect_installed(&self) -> Result<&Model<InstalledState>, Error> {
+        match self.as_match() {
+            PackageStateMatchModelRef::Installed(a) => Ok(a),
+            a => Err(Error::new(
+                eyre!(
+                    "Package {} is not in installed state",
+                    self.as_manifest(ManifestPreference::Old).as_id().de()?
+                ),
+                ErrorKind::InvalidRequest,
+            )),
+        }
+    }
+    pub fn into_installing_info(self) -> Option<Model<InstallingInfo>> {
+        match self.into_match() {
+            PackageStateMatchModel::Installing(s) | PackageStateMatchModel::Restoring(s) => {
+                Some(s.into_installing_info())
+            }
+            PackageStateMatchModel::Updating(s) => Some(s.into_installing_info()),
+            PackageStateMatchModel::Installed(_) | PackageStateMatchModel::Removing(_) => None,
+            PackageStateMatchModel::Error(_) => None,
+        }
+    }
+    pub fn as_installing_info(&self) -> Option<&Model<InstallingInfo>> {
+        match self.as_match() {
+            PackageStateMatchModelRef::Installing(s) | PackageStateMatchModelRef::Restoring(s) => {
+                Some(s.as_installing_info())
+            }
+            PackageStateMatchModelRef::Updating(s) => Some(s.as_installing_info()),
+            PackageStateMatchModelRef::Installed(_) | PackageStateMatchModelRef::Removing(_) => {
+                None
+            }
+            PackageStateMatchModelRef::Error(_) => None,
+        }
+    }
+    pub fn as_installing_info_mut(&mut self) -> Option<&mut Model<InstallingInfo>> {
+        match self.as_match_mut() {
+            PackageStateMatchModelMut::Installing(s) | PackageStateMatchModelMut::Restoring(s) => {
+                Some(s.as_installing_info_mut())
+            }
+            PackageStateMatchModelMut::Updating(s) => Some(s.as_installing_info_mut()),
+            PackageStateMatchModelMut::Installed(_) | PackageStateMatchModelMut::Removing(_) => {
+                None
+            }
+            PackageStateMatchModelMut::Error(_) => None,
+        }
+    }
+    pub fn into_manifest(self, preference: ManifestPreference) -> Model<Manifest> {
+        match self.into_match() {
+            PackageStateMatchModel::Installing(s) | PackageStateMatchModel::Restoring(s) => {
+                s.into_installing_info().into_new_manifest()
+            }
+            PackageStateMatchModel::Updating(s) if preference == ManifestPreference::Old => {
+                s.into_manifest()
+            }
+            PackageStateMatchModel::Updating(s) => s.into_installing_info().into_new_manifest(),
+            PackageStateMatchModel::Installed(s) | PackageStateMatchModel::Removing(s) => {
+                s.into_manifest()
+            }
+            PackageStateMatchModel::Error(_) => Value::Null.into(),
+        }
+    }
+    pub fn as_manifest(&self, preference: ManifestPreference) -> &Model<Manifest> {
+        match self.as_match() {
+            PackageStateMatchModelRef::Installing(s) | PackageStateMatchModelRef::Restoring(s) => {
+                s.as_installing_info().as_new_manifest()
+            }
+            PackageStateMatchModelRef::Updating(s) if preference == ManifestPreference::Old => {
+                s.as_manifest()
+            }
+            PackageStateMatchModelRef::Updating(s) => s.as_installing_info().as_new_manifest(),
+            PackageStateMatchModelRef::Installed(s) | PackageStateMatchModelRef::Removing(s) => {
+                s.as_manifest()
+            }
+            PackageStateMatchModelRef::Error(_) => (&Value::Null).into(),
+        }
+    }
+    pub fn as_manifest_mut(
+        &mut self,
+        preference: ManifestPreference,
+    ) -> Result<&mut Model<Manifest>, Error> {
+        Ok(match self.as_match_mut() {
+            PackageStateMatchModelMut::Installing(s) | PackageStateMatchModelMut::Restoring(s) => {
+                s.as_installing_info_mut().as_new_manifest_mut()
+            }
+            PackageStateMatchModelMut::Updating(s) if preference == ManifestPreference::Old => {
+                s.as_manifest_mut()
+            }
+            PackageStateMatchModelMut::Updating(s) => {
+                s.as_installing_info_mut().as_new_manifest_mut()
+            }
+            PackageStateMatchModelMut::Installed(s) | PackageStateMatchModelMut::Removing(s) => {
+                s.as_manifest_mut()
+            }
+            PackageStateMatchModelMut::Error(s) => {
+                return Err(Error::new(
+                    eyre!("could not determine package state to get manifest"),
+                    ErrorKind::Database,
+                ))
+            }
+        })
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct InstallingState {
+    pub installing_info: InstallingInfo,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct UpdatingState {
+    pub manifest: Manifest,
+    pub installing_info: InstallingInfo,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct InstalledState {
+    pub manifest: Manifest,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct InstallingInfo {
+    pub new_manifest: Manifest,
+    pub progress: FullProgress,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct PackageDataEntry {
+    pub state_info: PackageState,
+    pub status: Status,
+    pub marketplace_url: Option<Url>,
+    #[serde(default)]
+    #[serde(with = "crate::util::serde::ed25519_pubkey")]
+    pub developer_key: ed25519_dalek::VerifyingKey,
+    pub icon: DataUrl<'static>,
+    pub last_backup: Option<DateTime<Utc>>,
+    pub dependency_info: BTreeMap<PackageId, StaticDependencyInfo>,
+    pub current_dependents: CurrentDependents,
+    pub current_dependencies: CurrentDependencies,
+    pub interface_addresses: InterfaceAddressMap,
+    pub hosts: HostInfo,
+    pub store_exposed_ui: Vec<ExposedUI>,
+    pub store_exposed_dependents: Vec<JsonPointer>,
+}
+impl AsRef<PackageDataEntry> for PackageDataEntry {
+    fn as_ref(&self) -> &PackageDataEntry {
+        self
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[model = "Model<Self>"]
+pub struct ExposedDependent {
+    path: String,
+    title: String,
+    description: Option<String>,
+    masked: Option<bool>,
+    copyable: Option<bool>,
+    qr: Option<bool>,
+}
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct ExposedUI {
+    #[ts(type = "string")]
+    pub path: JsonPointer,
+    pub title: String,
+    pub description: Option<String>,
+    pub masked: Option<bool>,
+    pub copyable: Option<bool>,
+    pub qr: Option<bool>,
+}
+
+#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+pub struct CurrentDependents(pub BTreeMap<PackageId, CurrentDependencyInfo>);
+impl CurrentDependents {
+    pub fn map(
+        mut self,
+        transform: impl Fn(
+            BTreeMap<PackageId, CurrentDependencyInfo>,
+        ) -> BTreeMap<PackageId, CurrentDependencyInfo>,
+    ) -> Self {
+        self.0 = transform(self.0);
+        self
+    }
+}
+impl Map for CurrentDependents {
+    type Key = PackageId;
+    type Value = CurrentDependencyInfo;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
+}
+#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+pub struct CurrentDependencies(pub BTreeMap<PackageId, CurrentDependencyInfo>);
+impl CurrentDependencies {
+    pub fn map(
+        mut self,
+        transform: impl Fn(
+            BTreeMap<PackageId, CurrentDependencyInfo>,
+        ) -> BTreeMap<PackageId, CurrentDependencyInfo>,
+    ) -> Self {
+        self.0 = transform(self.0);
+        self
+    }
+}
+impl Map for CurrentDependencies {
+    type Key = PackageId;
+    type Value = CurrentDependencyInfo;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct StaticDependencyInfo {
+    pub title: String,
+    pub icon: DataUrl<'static>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+#[serde(tag = "kind")]
+pub enum CurrentDependencyInfo {
+    Exists,
+    #[serde(rename_all = "kebab-case")]
+    Running {
+        #[serde(default)]
+        health_checks: BTreeSet<HealthCheckId>,
+    },
+}
+
+#[derive(Debug, Default, Deserialize, Serialize)]
+pub struct InterfaceAddressMap(pub BTreeMap<HostId, InterfaceAddresses>);
+impl Map for InterfaceAddressMap {
+    type Key = HostId;
+    type Value = InterfaceAddresses;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(key)
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(key.clone().into())
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct InterfaceAddresses {
+    pub tor_address: Option<String>,
+    pub lan_address: Option<String>,
+}
diff --git a/core/startos/src/db/model/private.rs b/core/startos/src/db/model/private.rs
new file mode 100644
index 000000000..b9bc51e63
--- /dev/null
+++ b/core/startos/src/db/model/private.rs
@@ -0,0 +1,30 @@
+use std::collections::BTreeMap;
+
+use models::PackageId;
+use patch_db::{HasModel, Value};
+use serde::{Deserialize, Serialize};
+
+use crate::auth::Sessions;
+use crate::backup::target::cifs::CifsTargets;
+use crate::net::forward::AvailablePorts;
+use crate::net::keys::KeyStore;
+use crate::notifications::Notifications;
+use crate::prelude::*;
+use crate::ssh::SshKeys;
+use crate::util::serde::Pem;
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct Private {
+    pub key_store: KeyStore,
+    pub password: String, // argon2 hash
+    pub ssh_privkey: Pem<ssh_key::PrivateKey>,
+    pub ssh_pubkeys: SshKeys,
+    pub available_ports: AvailablePorts,
+    pub sessions: Sessions,
+    pub notifications: Notifications,
+    pub cifs: CifsTargets,
+    #[serde(default)]
+    pub package_stores: BTreeMap<PackageId, Value>,
+}
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
new file mode 100644
index 000000000..a9cf8d7e2
--- /dev/null
+++ b/core/startos/src/db/model/public.rs
@@ -0,0 +1,210 @@
+use std::collections::BTreeMap;
+use std::net::{Ipv4Addr, Ipv6Addr};
+
+use chrono::{DateTime, Utc};
+use emver::VersionRange;
+use imbl_value::InternedString;
+use ipnet::{Ipv4Net, Ipv6Net};
+use isocountry::CountryCode;
+use itertools::Itertools;
+use models::PackageId;
+use openssl::hash::MessageDigest;
+use patch_db::{HasModel, Value};
+use reqwest::Url;
+use serde::{Deserialize, Serialize};
+use torut::onion::OnionAddressV3;
+
+use crate::account::AccountInfo;
+use crate::db::model::package::AllPackageData;
+use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
+use crate::prelude::*;
+use crate::util::cpupower::Governor;
+use crate::util::Version;
+use crate::version::{Current, VersionT};
+use crate::{ARCH, PLATFORM};
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+// #[macro_debug]
+pub struct Public {
+    pub server_info: ServerInfo,
+    pub package_data: AllPackageData,
+    pub ui: Value,
+}
+impl Public {
+    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
+        let lan_address = account.hostname.lan_address().parse().unwrap();
+        Ok(Self {
+            server_info: ServerInfo {
+                arch: get_arch(),
+                platform: get_platform(),
+                id: account.server_id.clone(),
+                version: Current::new().semver().into(),
+                hostname: account.hostname.no_dot_host_name(),
+                last_backup: None,
+                last_wifi_region: None,
+                eos_version_compat: Current::new().compat().clone(),
+                lan_address,
+                onion_address: account.tor_key.public().get_onion_address(),
+                tor_address: format!("https://{}", account.tor_key.public().get_onion_address())
+                    .parse()
+                    .unwrap(),
+                ip_info: BTreeMap::new(),
+                status_info: ServerStatus {
+                    backup_progress: None,
+                    updated: false,
+                    update_progress: None,
+                    shutting_down: false,
+                    restarting: false,
+                },
+                wifi: WifiInfo {
+                    ssids: Vec::new(),
+                    connected: None,
+                    selected: None,
+                },
+                unread_notification_count: 0,
+                connection_addresses: ConnectionAddresses {
+                    tor: Vec::new(),
+                    clearnet: Vec::new(),
+                },
+                password_hash: account.password.clone(),
+                pubkey: ssh_key::PublicKey::from(&account.ssh_key)
+                    .to_openssh()
+                    .unwrap(),
+                ca_fingerprint: account
+                    .root_ca_cert
+                    .digest(MessageDigest::sha256())
+                    .unwrap()
+                    .iter()
+                    .map(|x| format!("{x:X}"))
+                    .join(":"),
+                ntp_synced: false,
+                zram: true,
+                governor: None,
+            },
+            package_data: AllPackageData::default(),
+            ui: serde_json::from_str(include_str!(concat!(
+                env!("CARGO_MANIFEST_DIR"),
+                "/../../web/patchdb-ui-seed.json"
+            )))
+            .with_kind(ErrorKind::Deserialization)?,
+        })
+    }
+}
+
+fn get_arch() -> InternedString {
+    (*ARCH).into()
+}
+
+fn get_platform() -> InternedString {
+    (&*PLATFORM).into()
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct ServerInfo {
+    #[serde(default = "get_arch")]
+    pub arch: InternedString,
+    #[serde(default = "get_platform")]
+    pub platform: InternedString,
+    pub id: String,
+    pub hostname: String,
+    pub version: Version,
+    pub last_backup: Option<DateTime<Utc>>,
+    /// Used in the wifi to determine the region to set the system to
+    pub last_wifi_region: Option<CountryCode>,
+    pub eos_version_compat: VersionRange,
+    pub lan_address: Url,
+    pub onion_address: OnionAddressV3,
+    /// for backwards compatibility
+    pub tor_address: Url,
+    pub ip_info: BTreeMap<String, IpInfo>,
+    #[serde(default)]
+    pub status_info: ServerStatus,
+    pub wifi: WifiInfo,
+    pub unread_notification_count: u64,
+    pub connection_addresses: ConnectionAddresses,
+    pub password_hash: String,
+    pub pubkey: String,
+    pub ca_fingerprint: String,
+    #[serde(default)]
+    pub ntp_synced: bool,
+    #[serde(default)]
+    pub zram: bool,
+    pub governor: Option<Governor>,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct IpInfo {
+    pub ipv4_range: Option<Ipv4Net>,
+    pub ipv4: Option<Ipv4Addr>,
+    pub ipv6_range: Option<Ipv6Net>,
+    pub ipv6: Option<Ipv6Addr>,
+}
+impl IpInfo {
+    pub async fn for_interface(iface: &str) -> Result<Self, Error> {
+        let (ipv4, ipv4_range) = get_iface_ipv4_addr(iface).await?.unzip();
+        let (ipv6, ipv6_range) = get_iface_ipv6_addr(iface).await?.unzip();
+        Ok(Self {
+            ipv4_range,
+            ipv4,
+            ipv6_range,
+            ipv6,
+        })
+    }
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[model = "Model<Self>"]
+pub struct BackupProgress {
+    pub complete: bool,
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct ServerStatus {
+    pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
+    pub updated: bool,
+    pub update_progress: Option<UpdateProgress>,
+    #[serde(default)]
+    pub shutting_down: bool,
+    #[serde(default)]
+    pub restarting: bool,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct UpdateProgress {
+    pub size: Option<u64>,
+    pub downloaded: u64,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+pub struct WifiInfo {
+    pub ssids: Vec<String>,
+    pub selected: Option<String>,
+    pub connected: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct ServerSpecs {
+    pub cpu: String,
+    pub disk: String,
+    pub memory: String,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct ConnectionAddresses {
+    pub tor: Vec<String>,
+    pub clearnet: Vec<String>,
+}
diff --git a/core/startos/src/db/prelude.rs b/core/startos/src/db/prelude.rs
index 0e90e2c88..43dd59002 100644
--- a/core/startos/src/db/prelude.rs
+++ b/core/startos/src/db/prelude.rs
@@ -124,6 +124,12 @@ impl<T: Serialize + DeserializeOwned> Model<T> {
         self.ser(&orig)?;
         Ok(res)
     }
+    pub fn map_mutate(&mut self, f: impl FnOnce(T) -> Result<T, Error>) -> Result<T, Error> {
+        let mut orig = self.de()?;
+        let res = f(orig)?;
+        self.ser(&res)?;
+        Ok(res)
+    }
 }
 impl<T> Clone for Model<T> {
     fn clone(&self) -> Self {
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 4e96a3db3..a22411244 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -10,7 +10,8 @@ use tracing::instrument;
 
 use crate::config::{Config, ConfigSpec, ConfigureContext};
 use crate::context::RpcContext;
-use crate::db::model::{CurrentDependencies, Database};
+use crate::db::model::package::CurrentDependencies;
+use crate::db::model::Database;
 use crate::prelude::*;
 use crate::s9pk::manifest::Manifest;
 use crate::status::DependencyConfigErrors;
@@ -195,52 +196,19 @@ pub async fn configure_logic(
     todo!()
 }
 
-#[instrument(skip_all)]
-pub fn add_dependent_to_current_dependents_lists(
-    db: &mut Model<Database>,
-    dependent_id: &PackageId,
-    current_dependencies: &CurrentDependencies,
-) -> Result<(), Error> {
-    for (dependency, dep_info) in &current_dependencies.0 {
-        if let Some(dependency_dependents) = db
-            .as_public_mut()
-            .as_package_data_mut()
-            .as_idx_mut(dependency)
-            .and_then(|pde| pde.as_installed_mut())
-            .map(|i| i.as_current_dependents_mut())
-        {
-            dependency_dependents.insert(dependent_id, dep_info)?;
-        }
-    }
-    Ok(())
-}
-
 #[instrument(skip_all)]
 pub async fn compute_dependency_config_errs(
     ctx: &RpcContext,
     db: &Peeked,
-    manifest: &Manifest,
+    id: &PackageId,
     current_dependencies: &CurrentDependencies,
     dependency_config: &BTreeMap<PackageId, Config>,
 ) -> Result<DependencyConfigErrors, Error> {
     let mut dependency_config_errs = BTreeMap::new();
-    for (dependency, _dep_info) in current_dependencies
-        .0
-        .iter()
-        .filter(|(dep_id, _)| dep_id != &&manifest.id)
-    {
+    for (dependency, _dep_info) in current_dependencies.0.iter() {
         // check if config passes dependency check
-        if let Some(cfg) = &manifest
-            .dependencies
-            .0
-            .get(dependency)
-            .or_not_found(dependency)?
-            .config
-        {
-            let error = todo!();
-            {
-                dependency_config_errs.insert(dependency.clone(), error);
-            }
+        if let Some(error) = todo!() {
+            dependency_config_errs.insert(dependency.clone(), error);
         }
     }
     Ok(DependencyConfigErrors(dependency_config_errs))
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 62bbdc58b..d1d5a9943 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -11,7 +11,7 @@ use tracing::instrument;
 
 use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
-use crate::db::model::ServerStatus;
+use crate::db::model::public::ServerStatus;
 use crate::disk::mount::util::unmount;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::prelude::*;
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 6ea4a7129..f4c415915 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -18,10 +18,7 @@ use tracing::instrument;
 
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
-use crate::db::model::{
-    PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryMatchModelRef,
-    PackageDataEntryRemoving,
-};
+use crate::db::model::package::{ManifestPreference, PackageState, PackageStateMatchModelRef};
 use crate::prelude::*;
 use crate::progress::{FullProgress, PhasedProgressBar};
 use crate::s9pk::manifest::PackageId;
@@ -40,27 +37,27 @@ pub async fn list(ctx: RpcContext) -> Result<Value, Error> {
     Ok(ctx.db.peek().await.as_public().as_package_data().as_entries()?
         .iter()
         .filter_map(|(id, pde)| {
-            let status = match pde.as_match() {
-                PackageDataEntryMatchModelRef::Installed(_) => {
+            let status = match pde.as_state_info().as_match() {
+                PackageStateMatchModelRef::Installed(_) => {
                     "installed"
                 }
-                PackageDataEntryMatchModelRef::Installing(_) => {
+                PackageStateMatchModelRef::Installing(_) => {
                     "installing"
                 }
-                PackageDataEntryMatchModelRef::Updating(_) => {
+                PackageStateMatchModelRef::Updating(_) => {
                     "updating"
                 }
-                PackageDataEntryMatchModelRef::Restoring(_) => {
+                PackageStateMatchModelRef::Restoring(_) => {
                     "restoring"
                 }
-                PackageDataEntryMatchModelRef::Removing(_) => {
+                PackageStateMatchModelRef::Removing(_) => {
                     "removing"
                 }
-                PackageDataEntryMatchModelRef::Error(_) => {
+                PackageStateMatchModelRef::Error(_) => {
                     "error"
                 }
             };
-            serde_json::to_value(json!({ "status":status, "id": id.clone(), "version": pde.as_manifest().as_version().de().ok()?}))
+            serde_json::to_value(json!({ "status": status, "id": id.clone(), "version": pde.as_state_info().as_manifest(ManifestPreference::Old).as_version().de().ok()?}))
             .ok()
         })
         .collect())
@@ -212,7 +209,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                                                 .as_public()
                                                 .as_package_data()
                                                 .as_idx(&id)
-                                                .and_then(|e| e.as_install_progress())
+                                                .and_then(|e| e.as_state_info().as_installing_info()).map(|i| i.as_progress())
                                             {
                                                 Ok::<_, ()>(p.de()?)
                                             } else {
@@ -407,31 +404,18 @@ pub async fn uninstall(
 ) -> Result<PackageId, Error> {
     ctx.db
         .mutate(|db| {
-            let (manifest, static_files, installed) = match db
-                .as_public()
-                .as_package_data()
-                .as_idx(&id)
-                .or_not_found(&id)?
-                .de()?
-            {
-                PackageDataEntry::Installed(PackageDataEntryInstalled {
-                    manifest,
-                    static_files,
-                    installed,
-                }) => (manifest, static_files, installed),
-                _ => {
-                    return Err(Error::new(
-                        eyre!("Package is not installed."),
-                        crate::ErrorKind::NotFound,
-                    ));
-                }
-            };
-            let pde = PackageDataEntry::Removing(PackageDataEntryRemoving {
-                manifest,
-                static_files,
-                removing: installed,
-            });
-            db.as_public_mut().as_package_data_mut().insert(&id, &pde)
+            let entry = db
+                .as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&id)
+                .or_not_found(&id)?;
+            entry.as_state_info_mut().map_mutate(|s| match s {
+                PackageState::Installed(s) => Ok(PackageState::Removing(s)),
+                _ => Err(Error::new(
+                    eyre!("Package {id} is not installed."),
+                    crate::ErrorKind::NotFound,
+                )),
+            })
         })
         .await?;
 
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index a8dbcabb0..d66448406 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use tokio::sync::RwLock;
 
 use crate::context::{CliContext, RpcContext};
-use crate::db::model::IpInfo;
+use crate::db::model::public::IpInfo;
 use crate::net::utils::{iface_is_physical, list_interfaces};
 use crate::prelude::*;
 use crate::Error;
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index d9d7a5d76..5fa2a30ec 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -205,8 +205,6 @@ impl NetService {
                     .as_package_data_mut()
                     .as_idx_mut(pkg_id)
                     .or_not_found(pkg_id)?
-                    .as_installed_mut()
-                    .or_not_found(pkg_id)?
                     .as_hosts_mut();
                 hosts.add_binding(&mut ports, kind, &id, internal_port, options)?;
                 let host = hosts
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 1a8315cc3..4f59d4303 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -4,9 +4,10 @@ use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 
+use crate::context::RpcContext;
+use crate::db::model::package::ExposedUI;
 use crate::prelude::*;
 use crate::Error;
-use crate::{context::RpcContext, db::model::ExposedUI};
 
 pub fn display_properties(response: Value) {
     println!("{}", response);
@@ -59,8 +60,6 @@ pub async fn properties(
         .as_package_data()
         .as_idx(&id)
         .or_not_found(&id)?
-        .as_installed()
-        .or_not_found(&id)?
         .as_store_exposed_ui()
         .de()?
         .into_properties(&data))
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 83f03fc4b..fb521ca34 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -16,9 +16,8 @@ use crate::action::ActionResult;
 use crate::config::action::ConfigRes;
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::RequestGuid;
-use crate::db::model::{
-    InstalledPackageInfo, PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryMatchModel,
-    StaticFiles,
+use crate::db::model::package::{
+    InstalledState, PackageDataEntry, PackageState, PackageStateMatchModelRef, UpdatingState,
 };
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::install::PKG_ARCHIVE_DIR;
@@ -28,7 +27,7 @@ use crate::s9pk::S9pk;
 use crate::service::service_map::InstallProgressHandles;
 use crate::service::transition::TransitionKind;
 use crate::status::health_check::HealthCheckResult;
-use crate::status::{MainStatus, Status};
+use crate::status::MainStatus;
 use crate::util::actor::{Actor, BackgroundJobs, SimpleActor};
 use crate::volume::data_dir;
 
@@ -100,7 +99,7 @@ impl Service {
     ) -> Result<Option<Self>, Error> {
         let handle_installed = {
             let ctx = ctx.clone();
-            move |s9pk: S9pk, i: Model<InstalledPackageInfo>| async move {
+            move |s9pk: S9pk, i: Model<PackageDataEntry>| async move {
                 for volume_id in &s9pk.as_manifest().volumes {
                     let tmp_path =
                         data_dir(&ctx.datadir, &s9pk.as_manifest().id.clone(), volume_id);
@@ -118,16 +117,18 @@ impl Service {
         };
         let s9pk_dir = ctx.datadir.join(PKG_ARCHIVE_DIR).join("installed"); // TODO: make this based on hash
         let s9pk_path = s9pk_dir.join(id).with_extension("s9pk");
-        match ctx
+        let Some(entry) = ctx
             .db
             .peek()
             .await
             .into_public()
             .into_package_data()
             .into_idx(id)
-            .map(|pde| pde.into_match())
-        {
-            Some(PackageDataEntryMatchModel::Installing(_)) => {
+        else {
+            return Ok(None);
+        };
+        match entry.as_state_info().as_match() {
+            PackageStateMatchModelRef::Installing(_) => {
                 if disposition == LoadDisposition::Retry {
                     if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id)).await.map_err(|e| {
                         tracing::error!("Error opening s9pk for install: {e}");
@@ -150,14 +151,17 @@ impl Service {
                     .await?;
                 Ok(None)
             }
-            Some(PackageDataEntryMatchModel::Updating(e)) => {
+            PackageStateMatchModelRef::Updating(s) => {
                 if disposition == LoadDisposition::Retry
-                    && e.as_install_progress().de()?.phases.iter().any(
-                        |NamedProgress { name, progress }| {
+                    && s.as_installing_info()
+                        .as_progress()
+                        .de()?
+                        .phases
+                        .iter()
+                        .any(|NamedProgress { name, progress }| {
                             name.eq_ignore_ascii_case("download")
                                 && progress == &Progress::Complete(true)
-                        },
-                    )
+                        })
                 {
                     if let Ok(s9pk) = S9pk::open(&s9pk_path, Some(id)).await.map_err(|e| {
                         tracing::error!("Error opening s9pk for update: {e}");
@@ -166,7 +170,7 @@ impl Service {
                         if let Ok(service) = Self::install(
                             ctx.clone(),
                             s9pk,
-                            Some(e.as_installed().as_manifest().as_version().de()?),
+                            Some(s.as_manifest().as_version().de()?),
                             None,
                         )
                         .await
@@ -181,24 +185,28 @@ impl Service {
                 let s9pk = S9pk::open(s9pk_path, Some(id)).await?;
                 ctx.db
                     .mutate({
-                        let manifest = s9pk.as_manifest().clone();
                         |db| {
                             db.as_public_mut()
                                 .as_package_data_mut()
-                                .as_idx_mut(&manifest.id)
-                                .or_not_found(&manifest.id)?
-                                .ser(&PackageDataEntry::Installed(PackageDataEntryInstalled {
-                                    static_files: e.as_static_files().de()?,
-                                    manifest,
-                                    installed: e.as_installed().de()?,
-                                }))
+                                .as_idx_mut(&id)
+                                .or_not_found(&id)?
+                                .as_state_info_mut()
+                                .map_mutate(|s| {
+                                    if let PackageState::Updating(UpdatingState {
+                                        manifest, ..
+                                    }) = s
+                                    {
+                                        Ok(PackageState::Installed(InstalledState { manifest }))
+                                    } else {
+                                        Err(Error::new(eyre!("Race condition detected - package state changed during load"), ErrorKind::Database))
+                                    }
+                                })
                         }
                     })
                     .await?;
-                handle_installed(s9pk, e.as_installed().clone()).await
+                handle_installed(s9pk, entry).await
             }
-            Some(PackageDataEntryMatchModel::Removing(_))
-            | Some(PackageDataEntryMatchModel::Restoring(_)) => {
+            PackageStateMatchModelRef::Removing(_) | PackageStateMatchModelRef::Restoring(_) => {
                 if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id)).await.map_err(|e| {
                     tracing::error!("Error opening s9pk for removal: {e}");
                     tracing::debug!("{e:?}")
@@ -230,18 +238,13 @@ impl Service {
 
                 Ok(None)
             }
-            Some(PackageDataEntryMatchModel::Installed(i)) => {
-                handle_installed(
-                    S9pk::open(s9pk_path, Some(id)).await?,
-                    i.as_installed().clone(),
-                )
-                .await
+            PackageStateMatchModelRef::Installed(_) => {
+                handle_installed(S9pk::open(s9pk_path, Some(id)).await?, entry).await
             }
-            Some(PackageDataEntryMatchModel::Error(e)) => Err(Error::new(
+            PackageStateMatchModelRef::Error(e) => Err(Error::new(
                 eyre!("Failed to parse PackageDataEntry, found {e:?}"),
                 ErrorKind::Deserialization,
             )),
-            None => Ok(None),
         }
     }
 
@@ -255,7 +258,6 @@ impl Service {
         let manifest = s9pk.as_manifest().clone();
         let developer_key = s9pk.as_archive().signer();
         let icon = s9pk.icon_data_url().await?;
-        let static_files = StaticFiles::local(&manifest.id, &manifest.version, icon);
         let service = Self::new(ctx.clone(), s9pk, StartStop::Stop).await?;
         service
             .seed
@@ -270,32 +272,19 @@ impl Service {
         }
         ctx.db
             .mutate(|d| {
-                d.as_public_mut()
+                let entry = d
+                    .as_public_mut()
                     .as_package_data_mut()
                     .as_idx_mut(&manifest.id)
-                    .or_not_found(&manifest.id)?
-                    .ser(&PackageDataEntry::Installed(PackageDataEntryInstalled {
-                        installed: InstalledPackageInfo {
-                            current_dependencies: Default::default(), // TODO
-                            current_dependents: Default::default(),   // TODO
-                            dependency_info: Default::default(),      // TODO
-                            developer_key,
-                            status: Status {
-                                configured: false,                            // TODO
-                                main: MainStatus::Stopped,                    // TODO
-                                dependency_config_errors: Default::default(), // TODO
-                            },
-                            interface_addresses: Default::default(), // TODO
-                            marketplace_url: None,                   // TODO
-                            manifest: manifest.clone(),
-                            last_backup: None,                            // TODO
-                            hosts: Default::default(),                    // TODO
-                            store_exposed_dependents: Default::default(), // TODO
-                            store_exposed_ui: Default::default(),         // TODO
-                        },
-                        manifest,
-                        static_files,
-                    }))
+                    .or_not_found(&manifest.id)?;
+                entry
+                    .as_state_info_mut()
+                    .ser(&PackageState::Installed(InstalledState { manifest }))?;
+                entry.as_developer_key_mut().ser(&developer_key)?;
+                entry.as_icon_mut().ser(&icon)?;
+                // TODO: marketplace url
+                // TODO: dependency info
+                Ok(())
             })
             .await?;
         Ok(service)
@@ -466,11 +455,7 @@ impl Actor for ServiceActor {
                     seed.ctx
                         .db
                         .mutate(|d| {
-                            if let Some(i) = d
-                                .as_public_mut()
-                                .as_package_data_mut()
-                                .as_idx_mut(&id)
-                                .and_then(|p| p.as_installed_mut())
+                            if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id)
                             {
                                 i.as_status_mut().as_main_mut().ser(&main_status)?;
                             }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 4ed160eb7..fa5df79de 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeSet;
 use std::ffi::OsString;
 use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
@@ -7,13 +8,14 @@ use std::sync::{Arc, Weak};
 use clap::builder::ValueParserFactory;
 use clap::Parser;
 use imbl_value::{json, InternedString};
-use models::{ActionId, HealthCheckId, ImageId, PackageId};
+use models::{ActionId, HealthCheckId, ImageId, InvalidId, PackageId};
 use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use ts_rs::TS;
 
-use crate::db::model::ExposedUI;
+use crate::db::model::package::{CurrentDependencies, CurrentDependencyInfo, ExposedUI};
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
@@ -131,8 +133,13 @@ pub fn service_effect_handler() -> ParentHandler {
         .subcommand("clearBindings", from_fn_async(clear_bindings).no_cli())
         .subcommand("bind", from_fn_async(bind).no_cli())
         .subcommand("getHostInfo", from_fn_async(get_host_info).no_cli())
+        .subcommand(
+            "setDependencies",
+            from_fn_async(set_dependencies)
+                .no_display()
+                .with_remote_cli::<ContainerCliContext>(),
+        )
     // TODO @DrBonez when we get the new api for 4.0
-    // .subcommand("setDependencies",from_fn_async(set_dependencies).no_cli())
     // .subcommand("embassyGetInterface",from_fn_async(embassy_get_interface).no_cli())
     // .subcommand("mount",from_fn_async(mount).no_cli())
     // .subcommand("removeAction",from_fn_async(remove_action).no_cli())
@@ -459,8 +466,6 @@ async fn expose_for_dependents(
                 .as_package_data_mut()
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
-                .as_installed_mut()
-                .or_not_found(&package_id)?
                 .as_store_exposed_dependents_mut()
                 .ser(&paths)
         })
@@ -488,8 +493,6 @@ async fn expose_ui(
                 .as_package_data_mut()
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
-                .as_installed_mut()
-                .or_not_found(&package_id)?
                 .as_store_exposed_ui_mut()
                 .ser(&paths)
         })
@@ -566,8 +569,6 @@ async fn get_configured(context: EffectContext, _: Empty) -> Result<Value, Error
         .as_package_data()
         .as_idx(&package_id)
         .or_not_found(&package_id)?
-        .as_installed()
-        .or_not_found(&package_id)?
         .as_status()
         .as_configured()
         .de()?;
@@ -583,8 +584,6 @@ async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result
         .as_package_data()
         .as_idx(&package_id)
         .or_not_found(&package_id)?
-        .as_installed()
-        .or_not_found(&package_id)?
         .as_status()
         .as_main()
         .de()?;
@@ -600,8 +599,6 @@ async fn running(context: EffectContext, params: ParamsPackageId) -> Result<Valu
         .as_package_data()
         .as_idx(&package_id)
         .or_not_found(&package_id)?
-        .as_installed()
-        .or_not_found(&package_id)?
         .as_status()
         .as_main()
         .de()?;
@@ -652,8 +649,6 @@ async fn set_configured(context: EffectContext, params: SetConfigured) -> Result
                 .as_package_data_mut()
                 .as_idx_mut(package_id)
                 .or_not_found(package_id)?
-                .as_installed_mut()
-                .or_not_found(package_id)?
                 .as_status_mut()
                 .as_configured_mut()
                 .ser(&params.configured)
@@ -733,8 +728,6 @@ async fn set_health(
                 .as_package_data()
                 .as_idx(package_id)
                 .or_not_found(package_id)?
-                .as_installed()
-                .or_not_found(package_id)?
                 .as_status()
                 .as_main()
                 .de()?;
@@ -764,8 +757,6 @@ async fn set_health(
                 .as_package_data_mut()
                 .as_idx_mut(package_id)
                 .or_not_found(package_id)?
-                .as_installed_mut()
-                .or_not_found(package_id)?
                 .as_status_mut()
                 .as_main_mut()
                 .ser(&main)
@@ -778,8 +769,6 @@ async fn set_health(
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 pub struct DestroyOverlayedImageParams {
-    #[ts(type = "string ")]
-    image_id: ImageId,
     #[ts(type = "string")]
     guid: InternedString,
 }
@@ -787,7 +776,7 @@ pub struct DestroyOverlayedImageParams {
 #[instrument(skip_all)]
 pub async fn destroy_overlayed_image(
     ctx: EffectContext,
-    DestroyOverlayedImageParams { image_id, guid }: DestroyOverlayedImageParams,
+    DestroyOverlayedImageParams { guid }: DestroyOverlayedImageParams,
 ) -> Result<(), Error> {
     let ctx = ctx.deref()?;
     if ctx
@@ -873,3 +862,125 @@ pub async fn create_overlayed_image(
         ))
     }
 }
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+enum DependencyKind {
+    Exists,
+    Running,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+struct DependencyRequirement {
+    id: PackageId,
+    kind: DependencyKind,
+    #[serde(default)]
+    health_checks: BTreeSet<HealthCheckId>,
+}
+// filebrowser:exists,bitcoind:running:foo+bar+baz
+impl FromStr for DependencyRequirement {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.split_once(":") {
+            Some((id, "e")) | Some((id, "exists")) => Ok(Self {
+                id: id.parse()?,
+                kind: DependencyKind::Exists,
+                health_checks: BTreeSet::new(),
+            }),
+            Some((id, rest)) => {
+                let health_checks = match rest.split_once(":") {
+                    Some(("r", rest)) | Some(("running", rest)) => rest
+                        .split("+")
+                        .map(|id| id.parse().map_err(Error::from))
+                        .collect(),
+                    Some((kind, _)) => Err(Error::new(
+                        eyre!("unknown dependency kind {kind}"),
+                        ErrorKind::InvalidRequest,
+                    )),
+                    None => match rest {
+                        "r" | "running" => Ok(BTreeSet::new()),
+                        kind => Err(Error::new(
+                            eyre!("unknown dependency kind {kind}"),
+                            ErrorKind::InvalidRequest,
+                        )),
+                    },
+                }?;
+                Ok(Self {
+                    id: id.parse()?,
+                    kind: DependencyKind::Running,
+                    health_checks,
+                })
+            }
+            None => Ok(Self {
+                id: s.parse()?,
+                kind: DependencyKind::Running,
+                health_checks: BTreeSet::new(),
+            }),
+        }
+    }
+}
+impl ValueParserFactory for DependencyRequirement {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
+
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetDependenciesParams {
+    dependencies: Vec<DependencyRequirement>,
+}
+
+pub async fn set_dependencies(
+    ctx: EffectContext,
+    SetDependenciesParams { dependencies }: SetDependenciesParams,
+) -> Result<(), Error> {
+    let ctx = ctx.deref()?;
+    let id = &ctx.id;
+    ctx.ctx
+        .db
+        .mutate(|db| {
+            let dependencies = CurrentDependencies(
+                dependencies
+                    .into_iter()
+                    .map(
+                        |DependencyRequirement {
+                             id,
+                             kind,
+                             health_checks,
+                         }| {
+                            (
+                                id,
+                                match kind {
+                                    DependencyKind::Exists => CurrentDependencyInfo::Exists,
+                                    DependencyKind::Running => {
+                                        CurrentDependencyInfo::Running { health_checks }
+                                    }
+                                },
+                            )
+                        },
+                    )
+                    .collect(),
+            );
+            for (dep, entry) in db.as_public_mut().as_package_data_mut().as_entries_mut()? {
+                if let Some(info) = dependencies.0.get(&dep) {
+                    entry.as_current_dependents_mut().insert(id, info)?;
+                } else {
+                    entry.as_current_dependents_mut().remove(id)?;
+                }
+            }
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(id)
+                .or_not_found(id)?
+                .as_current_dependencies_mut()
+                .ser(&dependencies)
+        })
+        .await
+}
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index f555be531..23e1bb540 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -11,9 +11,8 @@ use tokio::sync::{Mutex, OwnedRwLockReadGuard, OwnedRwLockWriteGuard, RwLock};
 use tracing::instrument;
 
 use crate::context::RpcContext;
-use crate::db::model::{
-    PackageDataEntry, PackageDataEntryInstalled, PackageDataEntryInstalling,
-    PackageDataEntryRestoring, PackageDataEntryUpdating, StaticFiles,
+use crate::db::model::package::{
+    InstallingInfo, InstallingState, PackageDataEntry, PackageState, UpdatingState,
 };
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::install::PKG_ARCHIVE_DIR;
@@ -27,6 +26,7 @@ use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
 use crate::service::{LoadDisposition, Service};
+use crate::status::{MainStatus, Status};
 
 pub type DownloadInstallFuture = BoxFuture<'static, Result<InstallFuture, Error>>;
 pub type InstallFuture = BoxFuture<'static, Result<(), Error>>;
@@ -95,9 +95,10 @@ impl ServiceMap {
         mut s9pk: S9pk<S>,
         recovery_source: Option<impl GenericMountGuard>,
     ) -> Result<DownloadInstallFuture, Error> {
-        let manifest = Arc::new(s9pk.as_manifest().clone());
+        let manifest = s9pk.as_manifest().clone();
         let id = manifest.id.clone();
         let icon = s9pk.icon_data_url().await?;
+        let developer_key = s9pk.as_archive().signer();
         let mut service = self.get_mut(&id).await;
 
         let op_name = if recovery_source.is_none() {
@@ -135,49 +136,51 @@ impl ServiceMap {
                 let id = id.clone();
                 let install_progress = progress.snapshot();
                 move |db| {
-                    let pde = match db
-                        .as_public()
-                        .as_package_data()
-                        .as_idx(&id)
-                        .map(|x| x.de())
-                        .transpose()?
-                    {
-                        Some(PackageDataEntry::Installed(PackageDataEntryInstalled {
-                            installed,
-                            static_files,
-                            ..
-                        })) => PackageDataEntry::Updating(PackageDataEntryUpdating {
-                            install_progress,
-                            installed,
-                            manifest: (*manifest).clone(),
-                            static_files,
-                        }),
-                        None if restoring => {
-                            PackageDataEntry::Restoring(PackageDataEntryRestoring {
-                                install_progress,
-                                static_files: StaticFiles::local(
-                                    &manifest.id,
-                                    &manifest.version,
-                                    icon,
-                                ),
-                                manifest: (*manifest).clone(),
-                            })
-                        }
-                        None => PackageDataEntry::Installing(PackageDataEntryInstalling {
-                            install_progress,
-                            static_files: StaticFiles::local(&manifest.id, &manifest.version, icon),
-                            manifest: (*manifest).clone(),
-                        }),
-                        _ => {
-                            return Err(Error::new(
-                                eyre!("Cannot install over a package in a transient state"),
-                                crate::ErrorKind::InvalidRequest,
-                            ))
-                        }
+                    if let Some(pde) = db.as_public_mut().as_package_data_mut().as_idx_mut(&id) {
+                        let prev = pde.as_state_info().expect_installed()?.de()?;
+                        pde.as_state_info_mut()
+                            .ser(&PackageState::Updating(UpdatingState {
+                                manifest: prev.manifest,
+                                installing_info: InstallingInfo {
+                                    new_manifest: manifest,
+                                    progress: install_progress,
+                                },
+                            }))?;
+                    } else {
+                        let installing = InstallingState {
+                            installing_info: InstallingInfo {
+                                new_manifest: manifest,
+                                progress: install_progress,
+                            },
+                        };
+                        db.as_public_mut().as_package_data_mut().insert(
+                            &id,
+                            &PackageDataEntry {
+                                state_info: if restoring {
+                                    PackageState::Restoring(installing)
+                                } else {
+                                    PackageState::Installing(installing)
+                                },
+                                status: Status {
+                                    configured: false,
+                                    main: MainStatus::Stopped,
+                                    dependency_config_errors: Default::default(),
+                                },
+                                marketplace_url: None,
+                                developer_key,
+                                icon,
+                                last_backup: None,
+                                dependency_info: Default::default(),
+                                current_dependents: Default::default(), // TODO: initialize
+                                current_dependencies: Default::default(),
+                                interface_addresses: Default::default(),
+                                hosts: Default::default(),
+                                store_exposed_ui: Default::default(),
+                                store_exposed_dependents: Default::default(),
+                            },
+                        )?;
                     };
-                    db.as_public_mut()
-                        .as_package_data_mut()
-                        .insert(&manifest.id, &pde)
+                    Ok(())
                 }
             }))
             .await?;
@@ -200,7 +203,8 @@ impl ServiceMap {
                                 v.as_public_mut()
                                     .as_package_data_mut()
                                     .as_idx_mut(&deref_id)
-                                    .and_then(|e| e.as_install_progress_mut())
+                                    .and_then(|e| e.as_state_info_mut().as_installing_info_mut())
+                                    .map(|i| i.as_progress_mut())
                             },
                             Some(Duration::from_millis(100)),
                         )));
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index 9f2b58135..c327bbb61 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -14,7 +14,7 @@ use tokio_stream::StreamExt;
 use tracing::instrument;
 
 use crate::context::RpcContext;
-use crate::db::model::UpdateProgress;
+use crate::db::model::public::UpdateProgress;
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::MountGuard;
diff --git a/patch-db b/patch-db
index 3dc11afd4..e4a3f7b57 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 3dc11afd46d93094ac52ae1fef311a91c4561e8c
+Subproject commit e4a3f7b577df56c611b21d5ad03eb459e80fb919
diff --git a/sdk/lib/config/configDependencies.ts b/sdk/lib/config/configDependencies.ts
index 6b31abc81..be0475b0f 100644
--- a/sdk/lib/config/configDependencies.ts
+++ b/sdk/lib/config/configDependencies.ts
@@ -3,7 +3,7 @@ import { Dependency } from "../types"
 
 export type ConfigDependencies<T extends SDKManifest> = {
   exists(id: keyof T["dependencies"]): Dependency
-  running(id: keyof T["dependencies"]): Dependency
+  running(id: keyof T["dependencies"], healthChecks: string[]): Dependency
 }
 
 export const configDependenciesSet = <
@@ -16,10 +16,11 @@ export const configDependenciesSet = <
     } as Dependency
   },
 
-  running(id: keyof T["dependencies"]) {
+  running(id: keyof T["dependencies"], healthChecks: string[]) {
     return {
       id,
       kind: "running",
+      healthChecks,
     } as Dependency
   },
 })
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index e3824a970..ae6931bdc 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -13,6 +13,7 @@ import { ExposeUiParams } from "../../../core/startos/bindings/ExposeUiParams"
 import { GetSslCertificateParams } from "../../../core/startos/bindings/GetSslCertificateParams"
 import { GetSslKeyParams } from "../../../core/startos/bindings/GetSslKeyParams"
 import { GetServiceInterfaceParams } from "../../../core/startos/bindings/GetServiceInterfaceParams"
+import { SetDependenciesParams } from "../../../core/startos/bindings/SetDependenciesParams"
 
 function typeEquality<ExpectedType>(_a: ExpectedType) {}
 describe("startosTypeValidation ", () => {
@@ -46,6 +47,7 @@ describe("startosTypeValidation ", () => {
           | "clearBindings"
           | "bind"
           | "getHostInfo"
+          | "setDependencies"
         )]: Effects[K] extends Function ? Parameters<Effects[K]>[0] : never
     }>({
       executeAction: {} as ExecuteAction,
@@ -67,6 +69,7 @@ describe("startosTypeValidation ", () => {
       getSslCertificate: {} as GetSslCertificateParams,
       getSslKey: {} as GetSslKeyParams,
       getServiceInterface: {} as GetServiceInterfaceParams,
+      setDependencies: {} as SetDependenciesParams,
     })
     typeEquality<Parameters<Effects["executeAction"]>[0]>(
       testInput as ExecuteAction,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 0ab0b73db..3935555e9 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -286,10 +286,7 @@ export type Effects = {
   createOverlayedImage(options: { imageId: string }): Promise<[string, string]>
 
   /** A low level api used by destroyOverlay + makeOverlay:destroy */
-  destroyOverlayedImage(options: {
-    imageId: string
-    guid: string
-  }): Promise<void>
+  destroyOverlayedImage(options: { guid: string }): Promise<void>
 
   /** Removes all network bindings */
   clearBindings(): Promise<void>
@@ -467,7 +464,9 @@ export type Effects = {
   }): Promise<void>
 
   /** Set the dependencies of what the service needs, usually ran during the set config as a best practice */
-  setDependencies(dependencies: Dependencies): Promise<DependenciesReceipt>
+  setDependencies(options: {
+    dependencies: Dependencies
+  }): Promise<DependenciesReceipt>
   /** Exists could be useful during the runtime to know if some service exists, option dep */
   exists(options: { packageId: PackageId }): Promise<boolean>
   /** Exists could be useful during the runtime to know if some service is running, option dep */
@@ -585,7 +584,7 @@ export type KnownError =
 export type Dependency = {
   id: PackageId
   kind: DependencyKind
-}
+} & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] })
 export type Dependencies = Array<Dependency>
 
 export type DeepPartial<T> = T extends {}

From 18a20407f6c20614f585871ac89bb83ad3c5cc9a Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Fri, 15 Mar 2024 13:31:44 -0600
Subject: [PATCH 061/341] chore: Fix the build

---
 core/startos/bindings/DependencyRequirement.ts     | 4 +---
 core/startos/src/service/service_effect_handler.rs | 4 +++-
 patch-db                                           | 2 +-
 sdk/lib/util/Overlay.ts                            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/startos/bindings/DependencyRequirement.ts b/core/startos/bindings/DependencyRequirement.ts
index 9ece754c1..0179c0e84 100644
--- a/core/startos/bindings/DependencyRequirement.ts
+++ b/core/startos/bindings/DependencyRequirement.ts
@@ -1,6 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DependencyKind } from "./DependencyKind";
-import type { HealthCheckId } from "./HealthCheckId";
-import type { PackageId } from "./PackageId";
 
-export interface DependencyRequirement { id: PackageId, kind: DependencyKind, healthChecks: Array<HealthCheckId>, }
\ No newline at end of file
+export interface DependencyRequirement { id: string, kind: DependencyKind, healthChecks: string[], }
\ No newline at end of file
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index fa5df79de..1dc8eb158 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -875,16 +875,18 @@ enum DependencyKind {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct DependencyRequirement {
+    #[ts(type = "string")]
     id: PackageId,
     kind: DependencyKind,
     #[serde(default)]
+    #[ts(type = "string[]")]
     health_checks: BTreeSet<HealthCheckId>,
 }
 // filebrowser:exists,bitcoind:running:foo+bar+baz
 impl FromStr for DependencyRequirement {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.split_once(":") {
+        match s.split_once(':') {
             Some((id, "e")) | Some((id, "exists")) => Ok(Self {
                 id: id.parse()?,
                 kind: DependencyKind::Exists,
diff --git a/patch-db b/patch-db
index e4a3f7b57..3dc11afd4 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit e4a3f7b577df56c611b21d5ad03eb459e80fb919
+Subproject commit 3dc11afd46d93094ac52ae1fef311a91c4561e8c
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 36dbaead5..53d631f51 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -54,7 +54,7 @@ export class Overlay {
   async destroy() {
     const imageId = this.imageId
     const guid = this.guid
-    await this.effects.destroyOverlayedImage({ imageId, guid })
+    await this.effects.destroyOverlayedImage({ guid })
   }
 
   async exec(

From 97158730077c7068f42fcb36cb8d5956ec2f00f2 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Fri, 15 Mar 2024 14:29:08 -0600
Subject: [PATCH 062/341] chore: Add in the rest of the effects for now

---
 .../src/service/service_effect_handler.rs     | 227 ++++++++++++++++--
 sdk/lib/types.ts                              |  17 +-
 2 files changed, 215 insertions(+), 29 deletions(-)

diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 1dc8eb158..4dd086e2c 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -7,6 +7,7 @@ use std::sync::{Arc, Weak};
 
 use clap::builder::ValueParserFactory;
 use clap::Parser;
+use imbl::OrdMap;
 use imbl_value::{json, InternedString};
 use models::{ActionId, HealthCheckId, ImageId, InvalidId, PackageId};
 use patch_db::json_ptr::JsonPointer;
@@ -139,28 +140,207 @@ pub fn service_effect_handler() -> ParentHandler {
                 .no_display()
                 .with_remote_cli::<ContainerCliContext>(),
         )
-    // TODO @DrBonez when we get the new api for 4.0
-    // .subcommand("embassyGetInterface",from_fn_async(embassy_get_interface).no_cli())
-    // .subcommand("mount",from_fn_async(mount).no_cli())
-    // .subcommand("removeAction",from_fn_async(remove_action).no_cli())
-    // .subcommand("removeAddress",from_fn_async(remove_address).no_cli())
-    // .subcommand("exportAction",from_fn_async(export_action).no_cli())
-    // .subcommand("clearServiceInterfaces",from_fn_async(clear_network_interfaces).no_cli())
-    // .subcommand("exportServiceInterface",from_fn_async(export_network_interface).no_cli())
-    // .subcommand("getHostnames",from_fn_async(get_hostnames).no_cli())
-    // .subcommand("getInterface",from_fn_async(get_interface).no_cli())
-    // .subcommand("listInterface",from_fn_async(list_interface).no_cli())
-    // .subcommand("getIPHostname",from_fn_async(get_ip_hostname).no_cli())
-    // .subcommand("getContainerIp",from_fn_async(get_container_ip).no_cli())
-    // .subcommand("getLocalHostname",from_fn_async(get_local_hostname).no_cli())
-    // .subcommand("getPrimaryUrl",from_fn_async(get_primary_url).no_cli())
-    // .subcommand("getServicePortForward",from_fn_async(get_service_port_forward).no_cli())
-    // .subcommand("getServiceTorHostname",from_fn_async(get_service_tor_hostname).no_cli())
-    // .subcommand("getSystemSmtp",from_fn_async(get_system_smtp).no_cli())
-    // .subcommand("reverseProxy",from_fn_async(reverse_proxy).no_cli())
+        .subcommand("getSystemSmtp", from_fn_async(get_system_smtp).no_cli())
+        .subcommand("getContainerIp", from_fn_async(get_container_ip).no_cli())
+        .subcommand(
+            "getServicePortForward",
+            from_fn_async(get_service_port_forward).no_cli(),
+        )
+        .subcommand(
+            "clearServiceInterfaces",
+            from_fn_async(clear_network_interfaces).no_cli(),
+        )
+        .subcommand(
+            "exportServiceInterface",
+            from_fn_async(export_service_interface).no_cli(),
+        )
+        .subcommand("getPrimaryUrl", from_fn_async(get_primary_url).no_cli())
+        .subcommand(
+            "listServiceInterfaces",
+            from_fn_async(list_service_interfaces).no_cli(),
+        )
+        .subcommand("removeAddress", from_fn_async(remove_address).no_cli())
+        .subcommand("exportAction", from_fn_async(export_action).no_cli())
+        .subcommand("removeAction", from_fn_async(remove_action).no_cli())
+        .subcommand("reverseProxy", from_fn_async(reverse_proxy).no_cli())
+        .subcommand("mount", from_fn_async(mount).no_cli())
     // TODO Callbacks
 }
 
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct GetSystemSmtpParams {
+    callback: Callback,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct GetServicePortForwardParams {
+    #[ts(type = "string | null")]
+    package_id: Option<PackageId>,
+    internal_port: u32,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ExportServiceInterfaceParams {
+    #[ts(type = "string | null")]
+    package_id: Option<PackageId>,
+    service_interface_id: String,
+    callback: Callback,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct GetPrimaryUrlParams {
+    #[ts(type = "string | null")]
+    package_id: Option<PackageId>,
+    service_interface_id: String,
+    callback: Callback,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ListServiceInterfacesParams {
+    #[ts(type = "string | null")]
+    package_id: Option<PackageId>,
+    callback: Callback,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct RemoveAddressParams {
+    id: String,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "kebab-case")]
+enum AllowedStatuses {
+    OnlyRunning,
+    OnlyStopped,
+    Any,
+    Disabled,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ExportActionParams {
+    name: String,
+    description: String,
+    id: String,
+    #[ts(type = "{[key: string]: any}")]
+    input: Value,
+    allowed_statuses: AllowedStatuses,
+    group: Option<String>,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct RemoveActionParams {
+    id: String,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ReverseProxyBind {
+    ip: Option<String>,
+    port: u32,
+    ssl: bool,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ReverseProxyDestination {
+    ip: Option<String>,
+    port: u32,
+    ssl: bool,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ReverseProxyHttp {
+    #[ts(type = "null | {[key: string]: string}")]
+    headers: Option<OrdMap<String, String>>,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ReverseProxyParams {
+    bind: ReverseProxyBind,
+    dst: ReverseProxyDestination,
+    http: ReverseProxyHttp,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct MountTarget {
+    #[ts(type = "string")]
+    packageId: PackageId,
+    volumeId: String,
+    path: String,
+    readonly: bool,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct MountParams {
+    location: String,
+    target: MountTarget,
+}
+async fn get_system_smtp(
+    context: EffectContext,
+    data: GetSystemSmtpParams,
+) -> Result<Value, Error> {
+    todo!()
+}
+async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Value, Error> {
+    todo!()
+}
+async fn get_service_port_forward(
+    context: EffectContext,
+    data: GetServicePortForwardParams,
+) -> Result<Value, Error> {
+    todo!()
+}
+async fn clear_network_interfaces(context: EffectContext, _: Empty) -> Result<Value, Error> {
+    todo!()
+}
+async fn export_service_interface(
+    context: EffectContext,
+    data: ExportServiceInterfaceParams,
+) -> Result<Value, Error> {
+    todo!()
+}
+async fn get_primary_url(
+    context: EffectContext,
+    data: GetPrimaryUrlParams,
+) -> Result<Value, Error> {
+    todo!()
+}
+async fn list_service_interfaces(
+    context: EffectContext,
+    data: ListServiceInterfacesParams,
+) -> Result<Value, Error> {
+    todo!()
+}
+async fn remove_address(context: EffectContext, data: RemoveAddressParams) -> Result<Value, Error> {
+    todo!()
+}
+async fn export_action(context: EffectContext, data: ExportActionParams) -> Result<Value, Error> {
+    todo!()
+}
+async fn remove_action(context: EffectContext, data: RemoveActionParams) -> Result<Value, Error> {
+    todo!()
+}
+async fn reverse_proxy(context: EffectContext, data: ReverseProxyParams) -> Result<Value, Error> {
+    todo!()
+}
+async fn mount(context: EffectContext, data: MountParams) -> Result<Value, Error> {
+    todo!()
+}
+
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 struct Callback(#[ts(type = "() => void")] i64);
@@ -177,7 +357,8 @@ enum GetHostInfoParamsKind {
 struct GetHostInfoParams {
     kind: Option<GetHostInfoParamsKind>,
     service_interface_id: String,
-    package_id: Option<String>,
+    #[ts(type = "string | null")]
+    package_id: Option<PackageId>,
     callback: Callback,
 }
 async fn get_host_info(
@@ -895,7 +1076,7 @@ impl FromStr for DependencyRequirement {
             Some((id, rest)) => {
                 let health_checks = match rest.split_once(":") {
                     Some(("r", rest)) | Some(("running", rest)) => rest
-                        .split("+")
+                        .split('+')
                         .map(|id| id.parse().map_err(Error::from))
                         .collect(),
                     Some((kind, _)) => Err(Error::new(
@@ -935,11 +1116,11 @@ impl ValueParserFactory for DependencyRequirement {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "camelCase")]
 #[ts(export)]
-pub struct SetDependenciesParams {
+struct SetDependenciesParams {
     dependencies: Vec<DependencyRequirement>,
 }
 
-pub async fn set_dependencies(
+async fn set_dependencies(
     ctx: EffectContext,
     SetDependenciesParams { dependencies }: SetDependenciesParams,
 ) -> Result<(), Error> {
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 3935555e9..eb7ea27bf 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -167,7 +167,7 @@ export type ActionMetadata = {
   /**
    * So the ordering of the actions is by alphabetical order of the group, then followed by the alphabetical of the actions
    */
-  group?: string
+  group: string | null
 }
 export declare const hostName: unique symbol
 // asdflkjadsf.onion | 1.2.3.4
@@ -275,6 +275,9 @@ export type ExposeUiPaths<Store> = Array<{
   /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
   qr?: boolean
 }>
+
+type tset = keyof Effects
+
 /** Used to reach out from the pure js runtime */
 export type Effects = {
   executeAction<Input>(opts: {
@@ -476,20 +479,22 @@ export type Effects = {
   reverseProxy(options: {
     bind: {
       /** Optional, default is 0.0.0.0 */
-      ip?: string
+      ip: string | null
       port: number
       ssl: boolean
     }
     dst: {
       /** Optional: default is 127.0.0.1 */
-      ip?: string // optional, default 127.0.0.1
+      ip: string | null // optional, default 127.0.0.1
       port: number
       ssl: boolean
     }
-    http?: {
+    http: {
       // optional, will do TCP layer proxy only if not present
-      headers?: (headers: Record<string, string>) => Record<string, string>
-    }
+      headers:
+        | ((headers: Record<string, string>) => Record<string, string>)
+        | null
+    } | null
   }): Promise<{ stop(): Promise<void> }>
   restart(): void
   shutdown(): void

From 28fd2f03140a2a8df3cb057709a6ee38692a56a8 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Sat, 16 Mar 2024 13:09:17 -0600
Subject: [PATCH 063/341] More 036 Frontend changes (#2572)

* update patchDB for futuristic revisions

* interfaces display updates

* remove zram and move tor to settings
---
 .../app/app/preloader/preloader.component.ts  |   3 +-
 .../app-interfaces/app-interfaces.page.html   |   6 +-
 .../app-interfaces/app-interfaces.page.ts     |  87 ++++----
 .../experimental-features.module.ts           |  24 ---
 .../experimental-features.page.html           |  36 ----
 .../experimental-features.page.scss           |   0
 .../experimental-features.page.ts             | 151 -------------
 .../server-routes/server-routing.module.ts    |   7 -
 .../server-show/server-show.page.ts           |  81 ++++++-
 .../ui/src/app/services/api/api.fixures.ts    | 118 +++++------
 .../ui/src/app/services/api/api.types.ts      |   5 -
 .../app/services/api/embassy-api.service.ts   |   2 -
 .../services/api/embassy-live-api.service.ts  |   4 -
 .../services/api/embassy-mock-api.service.ts  |  14 --
 .../ui/src/app/services/api/mock-patch.ts     | 198 ++++++++++++++----
 .../src/app/services/patch-db/data-model.ts   |   1 -
 16 files changed, 335 insertions(+), 402 deletions(-)
 delete mode 100644 web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.module.ts
 delete mode 100644 web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html
 delete mode 100644 web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts

diff --git a/web/projects/ui/src/app/app/preloader/preloader.component.ts b/web/projects/ui/src/app/app/preloader/preloader.component.ts
index 9823ac981..0b387ac45 100644
--- a/web/projects/ui/src/app/app/preloader/preloader.component.ts
+++ b/web/projects/ui/src/app/app/preloader/preloader.component.ts
@@ -40,8 +40,6 @@ const ICONS = [
   'file-tray-stacked-outline',
   'finger-print-outline',
   'flash-outline',
-  'flask-outline',
-  'flash-off-outline',
   'folder-open-outline',
   'globe-outline',
   'grid-outline',
@@ -70,6 +68,7 @@ const ICONS = [
   'receipt-outline',
   'refresh',
   'reload',
+  'reload-circle-outline',
   'remove',
   'remove-circle-outline',
   'remove-outline',
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
index ea83aedb1..79b1a1fde 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
@@ -10,7 +10,7 @@
 <ion-content class="ion-padding-top with-widgets">
   <ion-item-group *ngIf="serviceInterfaces$ | async as serviceInterfaces">
     <ng-container *ngIf="serviceInterfaces.ui.length">
-      <ion-item-divider>User Interfaces (UI)</ion-item-divider>
+      <ion-item-divider>User Interfaces</ion-item-divider>
       <app-interfaces-item
         *ngFor="let ui of serviceInterfaces.ui"
         [iFace]="ui"
@@ -18,7 +18,7 @@
     </ng-container>
 
     <ng-container *ngIf="serviceInterfaces.api.length">
-      <ion-item-divider>Application Program Interfaces (API)</ion-item-divider>
+      <ion-item-divider>Application Program Interfaces</ion-item-divider>
       <app-interfaces-item
         *ngFor="let api of serviceInterfaces.api"
         [iFace]="api"
@@ -26,7 +26,7 @@
     </ng-container>
 
     <ng-container *ngIf="serviceInterfaces.p2p.length">
-      <ion-item-divider>Peer-To-Peer Interfaces (P2P)</ion-item-divider>
+      <ion-item-divider>Peer-To-Peer Interfaces</ion-item-divider>
       <app-interfaces-item
         *ngFor="let p2p of serviceInterfaces.p2p"
         [iFace]="p2p"
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 7e4302a3f..5200ebb78 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -116,49 +116,54 @@ function getAddresses(
       ? [host.hostname]
       : []
 
-  return hostnames
-    .map((h: any) => {
-      const addresses: MappedAddress[] = []
+  const addresses: MappedAddress[] = []
 
-      let name = ''
-      let hostname = ''
+  hostnames.forEach(h => {
+    let name = ''
+    let hostname = ''
 
-      if (h.kind === 'onion') {
-        name = 'Tor'
-        hostname = h.hostname.value
-      } else {
-        name = h.hostname.kind
-        hostname =
-          h.hostname.kind === 'domain'
-            ? `${h.hostname.subdomain}.${h.hostname.domain}`
-            : h.hostname.value
-      }
-
-      if (h.hostname.sslPort) {
-        const port = h.hostname.sslPort === 443 ? '' : `:${h.hostname.sslPort}`
-        const scheme = addressInfo.bindOptions.addSsl?.scheme
-          ? `${addressInfo.bindOptions.addSsl.scheme}://`
-          : ''
-
-        addresses.push({
-          name,
-          url: `${scheme}${username}${hostname}${port}${suffix}`,
-        })
-      }
+    if (h.kind === 'onion') {
+      name = 'Tor'
+      hostname = h.hostname.value
+    } else {
+      const hostnameKind = h.hostname.kind
 
-      if (h.hostname.port) {
-        const port = h.hostname.port === 80 ? '' : `:${h.hostname.port}`
-        const scheme = addressInfo.bindOptions.scheme
-          ? `${addressInfo.bindOptions.scheme}://`
-          : ''
-
-        addresses.push({
-          name,
-          url: `${scheme}${username}${hostname}${port}${suffix}`,
-        })
+      if (hostnameKind === 'domain') {
+        name = 'Domain'
+        hostname = `${h.hostname.subdomain}.${h.hostname.domain}`
+      } else {
+        name =
+          hostnameKind === 'local'
+            ? 'Local'
+            : `${h.networkInterfaceId} (${hostnameKind})`
+        hostname = h.hostname.value
       }
-
-      return addresses
-    })
-    .flat()
+    }
+
+    if (h.hostname.sslPort) {
+      const port = h.hostname.sslPort === 443 ? '' : `:${h.hostname.sslPort}`
+      const scheme = addressInfo.bindOptions.addSsl?.scheme
+        ? `${addressInfo.bindOptions.addSsl.scheme}://`
+        : ''
+
+      addresses.push({
+        name: name === 'Tor' ? 'Tor (HTTPS)' : name,
+        url: `${scheme}${username}${hostname}${port}${suffix}`,
+      })
+    }
+
+    if (h.hostname.port) {
+      const port = h.hostname.port === 80 ? '' : `:${h.hostname.port}`
+      const scheme = addressInfo.bindOptions.scheme
+        ? `${addressInfo.bindOptions.scheme}://`
+        : ''
+
+      addresses.push({
+        name: name === 'Tor' ? 'Tor (HTTP)' : name,
+        url: `${scheme}${username}${hostname}${port}${suffix}`,
+      })
+    }
+  })
+
+  return addresses
 }
diff --git a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.module.ts b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.module.ts
deleted file mode 100644
index 86e374b17..000000000
--- a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { Routes, RouterModule } from '@angular/router'
-import { IonicModule } from '@ionic/angular'
-import { ExperimentalFeaturesPage } from './experimental-features.page'
-import { EmverPipesModule } from '@start9labs/shared'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ExperimentalFeaturesPage,
-  },
-]
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    EmverPipesModule,
-  ],
-  declarations: [ExperimentalFeaturesPage],
-})
-export class ExperimentalFeaturesPageModule {}
diff --git a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html
deleted file mode 100644
index 0ca8c7d8e..000000000
--- a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button defaultHref="system"></ion-back-button>
-    </ion-buttons>
-    <ion-title>Experimental Features</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="with-widgets">
-  <ion-item-group *ngIf="server$ | async as server">
-    <ion-item button (click)="presentAlertResetTor()">
-      <ion-icon slot="start" name="reload"></ion-icon>
-      <ion-label>
-        <h2>Reset Tor</h2>
-        <p>
-          Resetting the Tor daemon on your server may resolve Tor connectivity
-          issues.
-        </p>
-      </ion-label>
-    </ion-item>
-    <ion-item button (click)="presentAlertZram(server.zram)">
-      <ion-icon
-        slot="start"
-        [name]="server.zram ? 'flash-off-outline' : 'flash-outline'"
-      ></ion-icon>
-      <ion-label>
-        <h2>{{ server.zram ? 'Disable' : 'Enable' }} zram</h2>
-        <p>
-          Zram creates compressed swap in memory, resulting in faster I/O for
-          low RAM devices
-        </p>
-      </ion-label>
-    </ion-item>
-  </ion-item-group>
-</ion-content>
diff --git a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.scss b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts
deleted file mode 100644
index bf445250a..000000000
--- a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core'
-import {
-  AlertController,
-  LoadingController,
-  ToastController,
-} from '@ionic/angular'
-import { PatchDB } from 'patch-db-client'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ConfigService } from 'src/app/services/config.service'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-import { ErrorToastService } from '@start9labs/shared'
-
-@Component({
-  selector: 'experimental-features',
-  templateUrl: './experimental-features.page.html',
-  styleUrls: ['./experimental-features.page.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ExperimentalFeaturesPage {
-  readonly server$ = this.patch.watch$('server-info')
-
-  constructor(
-    private readonly toastCtrl: ToastController,
-    private readonly patch: PatchDB<DataModel>,
-    private readonly config: ConfigService,
-    private readonly alertCtrl: AlertController,
-    private readonly loadingCtrl: LoadingController,
-    private readonly api: ApiService,
-    private readonly errToast: ErrorToastService,
-  ) {}
-
-  async presentAlertResetTor() {
-    const isTor = this.config.isTor()
-    const shared =
-      'Optionally wipe state to forcibly acquire new guard nodes. It is recommended to try without wiping state first.'
-    const alert = await this.alertCtrl.create({
-      header: isTor ? 'Warning' : 'Confirm',
-      message: isTor
-        ? `You are currently connected over Tor. If you reset the Tor daemon, you will loose connectivity until it comes back online.<br/><br/>${shared}`
-        : `Reset Tor?<br/><br/>${shared}`,
-      inputs: [
-        {
-          label: 'Wipe state',
-          type: 'checkbox',
-          value: 'wipe',
-        },
-      ],
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Reset',
-          handler: (value: string[]) => {
-            this.resetTor(value.some(v => v === 'wipe'))
-          },
-          cssClass: 'enter-click',
-        },
-      ],
-      cssClass: isTor ? 'alert-warning-message' : '',
-    })
-    await alert.present()
-  }
-
-  async presentAlertZram(enabled: boolean) {
-    const alert = await this.alertCtrl.create({
-      header: 'Confirm',
-      message: enabled
-        ? 'Are you sure you want to disable zram? It provides significant performance benefits on low RAM devices.'
-        : 'Enable zram? It will only make a difference on lower RAM devices.',
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: enabled ? 'Disable' : 'Enable',
-          handler: () => {
-            this.toggleZram(enabled)
-          },
-          cssClass: 'enter-click',
-        },
-      ],
-    })
-    await alert.present()
-  }
-
-  private async resetTor(wipeState: boolean) {
-    const loader = await this.loadingCtrl.create({
-      message: 'Resetting Tor...',
-    })
-    await loader.present()
-
-    try {
-      await this.api.resetTor({
-        'wipe-state': wipeState,
-        reason: 'User triggered',
-      })
-      const toast = await this.toastCtrl.create({
-        header: 'Tor reset in progress',
-        position: 'bottom',
-        duration: 4000,
-        buttons: [
-          {
-            side: 'start',
-            icon: 'close',
-            handler: () => {
-              return true
-            },
-          },
-        ],
-      })
-      await toast.present()
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
-
-  private async toggleZram(enabled: boolean) {
-    const loader = await this.loadingCtrl.create({
-      message: enabled ? 'Disabling zram...' : 'Enabling zram...',
-    })
-    await loader.present()
-
-    try {
-      await this.api.toggleZram({ enable: !enabled })
-      const toast = await this.toastCtrl.create({
-        header: `Zram ${enabled ? 'disabled' : 'enabled'}`,
-        position: 'bottom',
-        duration: 4000,
-        buttons: [
-          {
-            side: 'start',
-            icon: 'close',
-            handler: () => {
-              return true
-            },
-          },
-        ],
-      })
-      await toast.present()
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
-}
diff --git a/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts b/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
index 5c728e668..e7eb43aad 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
@@ -80,13 +80,6 @@ const routes: Routes = [
     loadChildren: () =>
       import('./wifi/wifi.module').then(m => m.WifiPageModule),
   },
-  {
-    path: 'experimental-features',
-    loadChildren: () =>
-      import('./experimental-features/experimental-features.module').then(
-        m => m.ExperimentalFeaturesPageModule,
-      ),
-  },
 ]
 
 @NgModule({
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 38087b354..ff9cfc775 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -54,6 +54,7 @@ export class ServerShowPage {
     private readonly ClientStorageService: ClientStorageService,
     private readonly authService: AuthService,
     private readonly toastCtrl: ToastController,
+    private readonly config: ConfigService,
     @Inject(WINDOW) private readonly windowRef: Window,
   ) {}
 
@@ -178,6 +179,73 @@ export class ServerShowPage {
     }
   }
 
+  async presentAlertResetTor() {
+    const isTor = this.config.isTor()
+    const shared =
+      'Optionally wipe state to forcibly acquire new guard nodes. It is recommended to try without wiping state first.'
+    const alert = await this.alertCtrl.create({
+      header: isTor ? 'Warning' : 'Confirm',
+      message: isTor
+        ? `You are currently connected over Tor. If you reset the Tor daemon, you will loose connectivity until it comes back online.<br/><br/>${shared}`
+        : `Reset Tor?<br/><br/>${shared}`,
+      inputs: [
+        {
+          label: 'Wipe state',
+          type: 'checkbox',
+          value: 'wipe',
+        },
+      ],
+      buttons: [
+        {
+          text: 'Cancel',
+          role: 'cancel',
+        },
+        {
+          text: 'Reset',
+          handler: (value: string[]) => {
+            this.resetTor(value.some(v => v === 'wipe'))
+          },
+          cssClass: 'enter-click',
+        },
+      ],
+      cssClass: isTor ? 'alert-warning-message' : '',
+    })
+    await alert.present()
+  }
+
+  private async resetTor(wipeState: boolean) {
+    const loader = await this.loadingCtrl.create({
+      message: 'Resetting Tor...',
+    })
+    await loader.present()
+
+    try {
+      await this.embassyApi.resetTor({
+        'wipe-state': wipeState,
+        reason: 'User triggered',
+      })
+      const toast = await this.toastCtrl.create({
+        header: 'Tor reset in progress',
+        position: 'bottom',
+        duration: 4000,
+        buttons: [
+          {
+            side: 'start',
+            icon: 'close',
+            handler: () => {
+              return true
+            },
+          },
+        ],
+      })
+      await toast.present()
+    } catch (e: any) {
+      this.errToast.present(e)
+    } finally {
+      loader.dismiss()
+    }
+  }
+
   async updateEos(): Promise<void> {
     const modal = await this.modalCtrl.create({
       component: OSUpdatePage,
@@ -512,14 +580,11 @@ export class ServerShowPage {
         disabled$: of(false),
       },
       {
-        title: 'Experimental Features',
-        description: 'Try out new and potentially unstable new features',
-        icon: 'flask-outline',
-        action: () =>
-          this.navCtrl.navigateForward(['experimental-features'], {
-            relativeTo: this.route,
-          }),
-        detail: true,
+        title: 'Reset Tor',
+        description: 'May help resolve Tor connectivity issues.',
+        icon: 'reload-circle-outline',
+        action: () => this.presentAlertResetTor(),
+        detail: false,
         disabled$: of(false),
       },
     ],
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 7cf449664..f6986dddd 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1785,7 +1785,7 @@ export module Mock {
               scheme: 'http',
               preferredExternalPort: 80,
               addSsl: {
-                addXForwardedHeaders: null,
+                addXForwardedHeaders: false,
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
@@ -1798,14 +1798,6 @@ export module Mock {
             id: 'abcdefg',
             kind: 'multi',
             hostnames: [
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-ui-address.onion',
-                  port: 80,
-                  sslPort: 443,
-                },
-              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -1817,6 +1809,14 @@ export module Mock {
                   sslPort: 1234,
                 },
               },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-ui-address.onion',
+                  port: 80,
+                  sslPort: 443,
+                },
+              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -1858,7 +1858,7 @@ export module Mock {
               scheme: 'http',
               preferredExternalPort: 80,
               addSsl: {
-                addXForwardedHeaders: null,
+                addXForwardedHeaders: false,
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
@@ -1871,14 +1871,6 @@ export module Mock {
             id: 'bcdefgh',
             kind: 'multi',
             hostnames: [
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-rpc-address.onion',
-                  port: 80,
-                  sslPort: 443,
-                },
-              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -1890,6 +1882,14 @@ export module Mock {
                   sslPort: 2345,
                 },
               },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-rpc-address.onion',
+                  port: 80,
+                  sslPort: 443,
+                },
+              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -1940,14 +1940,6 @@ export module Mock {
             id: 'cdefghi',
             kind: 'multi',
             hostnames: [
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-p2p-address.onion',
-                  port: 8333,
-                  sslPort: null,
-                },
-              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -1959,6 +1951,14 @@ export module Mock {
                   sslPort: null,
                 },
               },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-p2p-address.onion',
+                  port: 8333,
+                  sslPort: null,
+                },
+              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -2034,7 +2034,7 @@ export module Mock {
               scheme: 'http',
               preferredExternalPort: 80,
               addSsl: {
-                addXForwardedHeaders: null,
+                addXForwardedHeaders: false,
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
@@ -2047,14 +2047,6 @@ export module Mock {
             id: 'hijklmnop',
             kind: 'multi',
             hostnames: [
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'proxy-ui-address.onion',
-                  port: 80,
-                  sslPort: 443,
-                },
-              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -2066,6 +2058,14 @@ export module Mock {
                   sslPort: 4567,
                 },
               },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'proxy-ui-address.onion',
+                  port: 80,
+                  sslPort: 443,
+                },
+              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -2196,14 +2196,6 @@ export module Mock {
             id: 'qrstuv',
             kind: 'multi',
             hostnames: [
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-grpc-address.onion',
-                  port: 10009,
-                  sslPort: null,
-                },
-              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -2215,6 +2207,14 @@ export module Mock {
                   sslPort: null,
                 },
               },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-grpc-address.onion',
+                  port: 10009,
+                  sslPort: null,
+                },
+              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -2265,14 +2265,6 @@ export module Mock {
             id: 'qrstuv',
             kind: 'multi',
             hostnames: [
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-grpc-address.onion',
-                  port: 10009,
-                  sslPort: null,
-                },
-              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -2284,6 +2276,14 @@ export module Mock {
                   sslPort: null,
                 },
               },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-grpc-address.onion',
+                  port: 10009,
+                  sslPort: null,
+                },
+              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -2334,14 +2334,6 @@ export module Mock {
             id: 'rstuvw',
             kind: 'multi',
             hostnames: [
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-p2p-address.onion',
-                  port: 9735,
-                  sslPort: null,
-                },
-              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
@@ -2353,6 +2345,14 @@ export module Mock {
                   sslPort: null,
                 },
               },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-p2p-address.onion',
+                  port: 9735,
+                  sslPort: null,
+                },
+              },
               {
                 kind: 'ip',
                 networkInterfaceId: 'elan0',
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 9d804caf9..c46cee61d 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -77,11 +77,6 @@ export module RR {
   } // net.tor.reset
   export type ResetTorRes = null
 
-  export type ToggleZramReq = {
-    enable: boolean
-  } // server.experimental.zram
-  export type ToggleZramRes = null
-
   // sessions
 
   export type GetSessionsReq = {} // sessions.list
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 17ce2d9d6..3f1d9881d 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -97,8 +97,6 @@ export abstract class ApiService {
 
   abstract resetTor(params: RR.ResetTorReq): Promise<RR.ResetTorRes>
 
-  abstract toggleZram(params: RR.ToggleZramReq): Promise<RR.ToggleZramRes>
-
   // marketplace URLs
 
   abstract marketplaceProxy<T>(
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 18d47e2ce..73765b44d 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -189,10 +189,6 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'net.tor.reset', params })
   }
 
-  async toggleZram(params: RR.ToggleZramReq): Promise<RR.ToggleZramRes> {
-    return this.rpcRequest({ method: 'server.experimental.zram', params })
-  }
-
   // marketplace URLs
 
   async marketplaceProxy<T>(
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index a2e5324a1..73cc71ef8 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -370,20 +370,6 @@ export class MockApiService extends ApiService {
     return null
   }
 
-  async toggleZram(params: RR.ToggleZramReq): Promise<RR.ToggleZramRes> {
-    await pauseFor(2000)
-    const patch = [
-      {
-        op: PatchOp.REPLACE,
-        path: '/server-info/zram',
-        value: params.enable,
-      },
-    ]
-    this.mockRevision(patch)
-
-    return null
-  }
-
   // marketplace URLs
 
   async marketplaceProxy(
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index a34a91652..8b163dd2e 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -73,7 +73,6 @@ export const mockPatchData: DataModel = {
     pubkey: 'npub1sg6plzptd64u62a878hep2kev88swjh3tw00gjsfl8f237lmu63q0uf63m',
     'ca-fingerprint': 'SHA-256: 63 2B 11 99 44 40 17 DF 37 FC C3 DF 0F 3D 15',
     'ntp-synced': false,
-    zram: false,
     platform: 'x86_64-nonfree',
   },
   'package-data': {
@@ -401,36 +400,101 @@ export const mockPatchData: DataModel = {
             disabled: false,
             masked: false,
             name: 'Web UI',
-            description: 'A launchable web app for Bitcoin Proxy',
+            description:
+              'A launchable web app for you to interact with your Bitcoin node',
             type: 'ui',
             addressInfo: {
               username: null,
-              hostId: 'hijklmnop',
+              hostId: 'abcdefg',
               bindOptions: {
                 scheme: 'http',
                 preferredExternalPort: 80,
                 addSsl: {
-                  addXForwardedHeaders: null,
+                  addXForwardedHeaders: false,
                   preferredExternalPort: 443,
                   scheme: 'https',
                 },
-                secure: true,
-                ssl: true,
+                secure: false,
+                ssl: false,
               },
               suffix: '',
             },
             hostInfo: {
-              id: 'hijklmnop',
+              id: 'abcdefg',
               kind: 'multi',
               hostnames: [
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'local',
+                    value: 'adjective-noun.local',
+                    port: null,
+                    sslPort: 1234,
+                  },
+                },
                 {
                   kind: 'onion',
                   hostname: {
-                    value: 'proxy-ui-address.onion',
+                    value: 'bitcoin-ui-address.onion',
                     port: 80,
                     sslPort: 443,
                   },
                 },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv4',
+                    value: '192.168.1.5',
+                    port: null,
+                    sslPort: 1234,
+                  },
+                },
+                {
+                  kind: 'ip',
+                  networkInterfaceId: 'elan0',
+                  public: false,
+                  hostname: {
+                    kind: 'ipv6',
+                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                    port: null,
+                    sslPort: 1234,
+                  },
+                },
+              ],
+            },
+          },
+          rpc: {
+            id: 'rpc',
+            hasPrimary: false,
+            disabled: false,
+            masked: false,
+            name: 'RPC',
+            description:
+              'Used by dependent services and client wallets for connecting to your node',
+            type: 'api',
+            addressInfo: {
+              username: null,
+              hostId: 'bcdefgh',
+              bindOptions: {
+                scheme: 'http',
+                preferredExternalPort: 80,
+                addSsl: {
+                  preferredExternalPort: 443,
+                  scheme: 'https',
+                },
+                secure: false,
+                ssl: false,
+              },
+              suffix: '',
+            },
+            hostInfo: {
+              id: 'bcdefgh',
+              kind: 'multi',
+              hostnames: [
                 {
                   kind: 'ip',
                   networkInterfaceId: 'elan0',
@@ -439,7 +503,15 @@ export const mockPatchData: DataModel = {
                     kind: 'local',
                     value: 'adjective-noun.local',
                     port: null,
-                    sslPort: 4567,
+                    sslPort: 2345,
+                  },
+                },
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'bitcoin-rpc-address.onion',
+                    port: 80,
+                    sslPort: 443,
                   },
                 },
                 {
@@ -450,7 +522,7 @@ export const mockPatchData: DataModel = {
                     kind: 'ipv4',
                     value: '192.168.1.5',
                     port: null,
-                    sslPort: 4567,
+                    sslPort: 2345,
                   },
                 },
                 {
@@ -461,40 +533,76 @@ export const mockPatchData: DataModel = {
                     kind: 'ipv6',
                     value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
                     port: null,
-                    sslPort: 4567,
+                    sslPort: 2345,
                   },
                 },
+              ],
+            },
+          },
+          p2p: {
+            id: 'p2p',
+            hasPrimary: true,
+            disabled: false,
+            masked: false,
+            name: 'P2P',
+            description:
+              'Used for connecting to other nodes on the Bitcoin network',
+            type: 'p2p',
+            addressInfo: {
+              username: null,
+              hostId: 'cdefghi',
+              bindOptions: {
+                scheme: 'bitcoin',
+                preferredExternalPort: 8333,
+                addSsl: null,
+                secure: true,
+                ssl: false,
+              },
+              suffix: '',
+            },
+            hostInfo: {
+              id: 'cdefghi',
+              kind: 'multi',
+              hostnames: [
                 {
                   kind: 'ip',
-                  networkInterfaceId: 'wlan0',
+                  networkInterfaceId: 'elan0',
                   public: false,
                   hostname: {
                     kind: 'local',
                     value: 'adjective-noun.local',
-                    port: null,
-                    sslPort: 4567,
+                    port: 3456,
+                    sslPort: null,
+                  },
+                },
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'bitcoin-p2p-address.onion',
+                    port: 8333,
+                    sslPort: null,
                   },
                 },
                 {
                   kind: 'ip',
-                  networkInterfaceId: 'wlan0',
+                  networkInterfaceId: 'elan0',
                   public: false,
                   hostname: {
                     kind: 'ipv4',
-                    value: '192.168.1.7',
-                    port: null,
-                    sslPort: 4567,
+                    value: '192.168.1.5',
+                    port: 3456,
+                    sslPort: null,
                   },
                 },
                 {
                   kind: 'ip',
-                  networkInterfaceId: 'wlan0',
+                  networkInterfaceId: 'elan0',
                   public: false,
                   hostname: {
                     kind: 'ipv6',
                     value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                    port: null,
-                    sslPort: 4567,
+                    port: 3456,
+                    sslPort: null,
                   },
                 },
               ],
@@ -670,14 +778,6 @@ export const mockPatchData: DataModel = {
               id: 'qrstuv',
               kind: 'multi',
               hostnames: [
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'lnd-grpc-address.onion',
-                    port: 10009,
-                    sslPort: null,
-                  },
-                },
                 {
                   kind: 'ip',
                   networkInterfaceId: 'elan0',
@@ -689,6 +789,14 @@ export const mockPatchData: DataModel = {
                     sslPort: null,
                   },
                 },
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'lnd-grpc-address.onion',
+                    port: 10009,
+                    sslPort: null,
+                  },
+                },
                 {
                   kind: 'ip',
                   networkInterfaceId: 'elan0',
@@ -739,14 +847,6 @@ export const mockPatchData: DataModel = {
               id: 'qrstuv',
               kind: 'multi',
               hostnames: [
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'lnd-grpc-address.onion',
-                    port: 10009,
-                    sslPort: null,
-                  },
-                },
                 {
                   kind: 'ip',
                   networkInterfaceId: 'elan0',
@@ -758,6 +858,14 @@ export const mockPatchData: DataModel = {
                     sslPort: null,
                   },
                 },
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'lnd-grpc-address.onion',
+                    port: 10009,
+                    sslPort: null,
+                  },
+                },
                 {
                   kind: 'ip',
                   networkInterfaceId: 'elan0',
@@ -808,14 +916,6 @@ export const mockPatchData: DataModel = {
               id: 'rstuvw',
               kind: 'multi',
               hostnames: [
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'lnd-p2p-address.onion',
-                    port: 9735,
-                    sslPort: null,
-                  },
-                },
                 {
                   kind: 'ip',
                   networkInterfaceId: 'elan0',
@@ -827,6 +927,14 @@ export const mockPatchData: DataModel = {
                     sslPort: null,
                   },
                 },
+                {
+                  kind: 'onion',
+                  hostname: {
+                    value: 'lnd-p2p-address.onion',
+                    port: 9735,
+                    sslPort: null,
+                  },
+                },
                 {
                   kind: 'ip',
                   networkInterfaceId: 'elan0',
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index ccea8e076..931b3b949 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -79,7 +79,6 @@ export interface ServerInfo {
   pubkey: string
   'ca-fingerprint': string
   'ntp-synced': boolean
-  zram: boolean
   platform: string
 }
 

From 973284607dedb988fe1dd5a86beb0a5d5541af79 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 18 Mar 2024 10:53:38 -0600
Subject: [PATCH 064/341] chore: Update the sdk to match the rust and vica
 verse

---
 core/startos/bindings/AddressInfo.ts          |  4 ++
 core/startos/bindings/AllowedStatuses.ts      |  3 +
 core/startos/bindings/BindOptions.ts          |  5 ++
 core/startos/bindings/BindOptionsSecure.ts    |  3 +
 core/startos/bindings/BindParams.ts           |  3 +-
 core/startos/bindings/ExportActionParams.ts   |  4 ++
 .../bindings/ExportServiceInterfaceParams.ts  |  5 ++
 core/startos/bindings/GetPrimaryUrlParams.ts  |  4 ++
 .../bindings/GetServicePortForwardParams.ts   |  3 +
 core/startos/bindings/GetSystemSmtpParams.ts  |  4 ++
 .../bindings/ListServiceInterfacesParams.ts   |  4 ++
 core/startos/bindings/MountParams.ts          |  4 ++
 core/startos/bindings/MountTarget.ts          |  3 +
 core/startos/bindings/RemoveActionParams.ts   |  3 +
 core/startos/bindings/RemoveAddressParams.ts  |  3 +
 core/startos/bindings/ReverseProxyBind.ts     |  3 +
 .../bindings/ReverseProxyDestination.ts       |  3 +
 core/startos/bindings/ReverseProxyHttp.ts     |  3 +
 core/startos/bindings/ReverseProxyParams.ts   |  6 ++
 core/startos/bindings/ServiceInterfaceType.ts |  3 +
 .../src/service/service_effect_handler.rs     | 52 ++++++++++++++---
 sdk/lib/interfaces/Host.ts                    | 40 ++++++-------
 sdk/lib/test/host.test.ts                     |  2 +
 sdk/lib/test/startosTypeValidation.test.ts    | 56 +++++++++----------
 sdk/lib/types.ts                              |  7 +--
 .../ui/src/app/services/api/api.fixures.ts    | 21 +++----
 .../ui/src/app/services/api/mock-patch.ts     | 12 ++--
 27 files changed, 173 insertions(+), 90 deletions(-)
 create mode 100644 core/startos/bindings/AddressInfo.ts
 create mode 100644 core/startos/bindings/AllowedStatuses.ts
 create mode 100644 core/startos/bindings/BindOptions.ts
 create mode 100644 core/startos/bindings/BindOptionsSecure.ts
 create mode 100644 core/startos/bindings/ExportActionParams.ts
 create mode 100644 core/startos/bindings/ExportServiceInterfaceParams.ts
 create mode 100644 core/startos/bindings/GetPrimaryUrlParams.ts
 create mode 100644 core/startos/bindings/GetServicePortForwardParams.ts
 create mode 100644 core/startos/bindings/GetSystemSmtpParams.ts
 create mode 100644 core/startos/bindings/ListServiceInterfacesParams.ts
 create mode 100644 core/startos/bindings/MountParams.ts
 create mode 100644 core/startos/bindings/MountTarget.ts
 create mode 100644 core/startos/bindings/RemoveActionParams.ts
 create mode 100644 core/startos/bindings/RemoveAddressParams.ts
 create mode 100644 core/startos/bindings/ReverseProxyBind.ts
 create mode 100644 core/startos/bindings/ReverseProxyDestination.ts
 create mode 100644 core/startos/bindings/ReverseProxyHttp.ts
 create mode 100644 core/startos/bindings/ReverseProxyParams.ts
 create mode 100644 core/startos/bindings/ServiceInterfaceType.ts

diff --git a/core/startos/bindings/AddressInfo.ts b/core/startos/bindings/AddressInfo.ts
new file mode 100644
index 000000000..9d4c8ee6e
--- /dev/null
+++ b/core/startos/bindings/AddressInfo.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BindOptions } from "./BindOptions";
+
+export interface AddressInfo { username: string | null, hostId: string, bindOptions: BindOptions, suffix: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/AllowedStatuses.ts b/core/startos/bindings/AllowedStatuses.ts
new file mode 100644
index 000000000..87d122f70
--- /dev/null
+++ b/core/startos/bindings/AllowedStatuses.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AllowedStatuses = "only-running" | "only-stopped" | "any" | "disabled";
\ No newline at end of file
diff --git a/core/startos/bindings/BindOptions.ts b/core/startos/bindings/BindOptions.ts
new file mode 100644
index 000000000..029be6a16
--- /dev/null
+++ b/core/startos/bindings/BindOptions.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddSslOptions } from "./AddSslOptions";
+import type { BindOptionsSecure } from "./BindOptionsSecure";
+
+export interface BindOptions { scheme: string | null, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: BindOptionsSecure | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/BindOptionsSecure.ts b/core/startos/bindings/BindOptionsSecure.ts
new file mode 100644
index 000000000..00bfd7dd2
--- /dev/null
+++ b/core/startos/bindings/BindOptionsSecure.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface BindOptionsSecure { ssl: boolean, }
\ No newline at end of file
diff --git a/core/startos/bindings/BindParams.ts b/core/startos/bindings/BindParams.ts
index 8d8eef6b4..f48f848b8 100644
--- a/core/startos/bindings/BindParams.ts
+++ b/core/startos/bindings/BindParams.ts
@@ -1,5 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AddSslOptions } from "./AddSslOptions";
 import type { BindKind } from "./BindKind";
+import type { BindOptionsSecure } from "./BindOptionsSecure";
 
-export interface BindParams { kind: BindKind, id: string, internalPort: number, scheme: string, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: boolean, ssl: boolean, }
\ No newline at end of file
+export interface BindParams { kind: BindKind, id: string, internalPort: number, scheme: string, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: BindOptionsSecure | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/ExportActionParams.ts b/core/startos/bindings/ExportActionParams.ts
new file mode 100644
index 000000000..413a63183
--- /dev/null
+++ b/core/startos/bindings/ExportActionParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AllowedStatuses } from "./AllowedStatuses";
+
+export interface ExportActionParams { name: string, description: string, id: string, input: {[key: string]: any}, allowedStatuses: AllowedStatuses, group: string | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/ExportServiceInterfaceParams.ts b/core/startos/bindings/ExportServiceInterfaceParams.ts
new file mode 100644
index 000000000..d30cce9db
--- /dev/null
+++ b/core/startos/bindings/ExportServiceInterfaceParams.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddressInfo } from "./AddressInfo";
+import type { ServiceInterfaceType } from "./ServiceInterfaceType";
+
+export interface ExportServiceInterfaceParams { id: string, name: string, description: string, hasPrimary: boolean, disabled: boolean, masked: boolean, addressInfo: AddressInfo, type: ServiceInterfaceType, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetPrimaryUrlParams.ts b/core/startos/bindings/GetPrimaryUrlParams.ts
new file mode 100644
index 000000000..40fe7f154
--- /dev/null
+++ b/core/startos/bindings/GetPrimaryUrlParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Callback } from "./Callback";
+
+export interface GetPrimaryUrlParams { packageId: string | null, serviceInterfaceId: string, callback: Callback, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetServicePortForwardParams.ts b/core/startos/bindings/GetServicePortForwardParams.ts
new file mode 100644
index 000000000..270fcb709
--- /dev/null
+++ b/core/startos/bindings/GetServicePortForwardParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface GetServicePortForwardParams { packageId: string | null, internalPort: number, }
\ No newline at end of file
diff --git a/core/startos/bindings/GetSystemSmtpParams.ts b/core/startos/bindings/GetSystemSmtpParams.ts
new file mode 100644
index 000000000..617fd7fa0
--- /dev/null
+++ b/core/startos/bindings/GetSystemSmtpParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Callback } from "./Callback";
+
+export interface GetSystemSmtpParams { callback: Callback, }
\ No newline at end of file
diff --git a/core/startos/bindings/ListServiceInterfacesParams.ts b/core/startos/bindings/ListServiceInterfacesParams.ts
new file mode 100644
index 000000000..33db3f129
--- /dev/null
+++ b/core/startos/bindings/ListServiceInterfacesParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Callback } from "./Callback";
+
+export interface ListServiceInterfacesParams { packageId: string | null, callback: Callback, }
\ No newline at end of file
diff --git a/core/startos/bindings/MountParams.ts b/core/startos/bindings/MountParams.ts
new file mode 100644
index 000000000..26e8373c7
--- /dev/null
+++ b/core/startos/bindings/MountParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { MountTarget } from "./MountTarget";
+
+export interface MountParams { location: string, target: MountTarget, }
\ No newline at end of file
diff --git a/core/startos/bindings/MountTarget.ts b/core/startos/bindings/MountTarget.ts
new file mode 100644
index 000000000..41c026deb
--- /dev/null
+++ b/core/startos/bindings/MountTarget.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface MountTarget { packageId: string, volumeId: string, path: string, readonly: boolean, }
\ No newline at end of file
diff --git a/core/startos/bindings/RemoveActionParams.ts b/core/startos/bindings/RemoveActionParams.ts
new file mode 100644
index 000000000..3e0c3c48d
--- /dev/null
+++ b/core/startos/bindings/RemoveActionParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface RemoveActionParams { id: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/RemoveAddressParams.ts b/core/startos/bindings/RemoveAddressParams.ts
new file mode 100644
index 000000000..1bc483f89
--- /dev/null
+++ b/core/startos/bindings/RemoveAddressParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface RemoveAddressParams { id: string, }
\ No newline at end of file
diff --git a/core/startos/bindings/ReverseProxyBind.ts b/core/startos/bindings/ReverseProxyBind.ts
new file mode 100644
index 000000000..3f9e0dc25
--- /dev/null
+++ b/core/startos/bindings/ReverseProxyBind.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface ReverseProxyBind { ip: string | null, port: number, ssl: boolean, }
\ No newline at end of file
diff --git a/core/startos/bindings/ReverseProxyDestination.ts b/core/startos/bindings/ReverseProxyDestination.ts
new file mode 100644
index 000000000..a6003e189
--- /dev/null
+++ b/core/startos/bindings/ReverseProxyDestination.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface ReverseProxyDestination { ip: string | null, port: number, ssl: boolean, }
\ No newline at end of file
diff --git a/core/startos/bindings/ReverseProxyHttp.ts b/core/startos/bindings/ReverseProxyHttp.ts
new file mode 100644
index 000000000..5c1d0aa1b
--- /dev/null
+++ b/core/startos/bindings/ReverseProxyHttp.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface ReverseProxyHttp { headers: null | {[key: string]: string}, }
\ No newline at end of file
diff --git a/core/startos/bindings/ReverseProxyParams.ts b/core/startos/bindings/ReverseProxyParams.ts
new file mode 100644
index 000000000..bde3034e9
--- /dev/null
+++ b/core/startos/bindings/ReverseProxyParams.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ReverseProxyBind } from "./ReverseProxyBind";
+import type { ReverseProxyDestination } from "./ReverseProxyDestination";
+import type { ReverseProxyHttp } from "./ReverseProxyHttp";
+
+export interface ReverseProxyParams { bind: ReverseProxyBind, dst: ReverseProxyDestination, http: ReverseProxyHttp, }
\ No newline at end of file
diff --git a/core/startos/bindings/ServiceInterfaceType.ts b/core/startos/bindings/ServiceInterfaceType.ts
new file mode 100644
index 000000000..74372d4ad
--- /dev/null
+++ b/core/startos/bindings/ServiceInterfaceType.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ServiceInterfaceType = "ui" | "p2p" | "api";
\ No newline at end of file
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 4dd086e2c..6e9610c8a 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -184,11 +184,48 @@ struct GetServicePortForwardParams {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
+struct BindOptionsSecure {
+    ssl: bool,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct BindOptions {
+    scheme: Option<String>,
+    preferred_external_port: u32,
+    add_ssl: Option<AddSslOptions>,
+    secure: Option<BindOptionsSecure>,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct AddressInfo {
+    username: Option<String>,
+    host_id: String,
+    bind_options: BindOptions,
+    suffix: String,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+enum ServiceInterfaceType {
+    Ui,
+    P2p,
+    Api,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
 struct ExportServiceInterfaceParams {
-    #[ts(type = "string | null")]
-    package_id: Option<PackageId>,
-    service_interface_id: String,
-    callback: Callback,
+    id: String,
+    name: String,
+    description: String,
+    has_primary: bool,
+    disabled: bool,
+    masked: bool,
+    address_info: AddressInfo,
+    r#type: ServiceInterfaceType,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
@@ -277,8 +314,8 @@ struct ReverseProxyParams {
 #[serde(rename_all = "camelCase")]
 struct MountTarget {
     #[ts(type = "string")]
-    packageId: PackageId,
-    volumeId: String,
+    package_id: PackageId,
+    volume_id: String,
     path: String,
     readonly: bool,
 }
@@ -399,8 +436,7 @@ struct BindParams {
     scheme: String,
     preferred_external_port: u32,
     add_ssl: Option<AddSslOptions>,
-    secure: bool,
-    ssl: bool,
+    secure: Option<BindOptionsSecure>,
 }
 async fn bind(_: AnyContext, BindParams { .. }: BindParams) -> Result<Value, Error> {
     todo!()
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index 4c3f43634..cb6fa9f9a 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -59,12 +59,13 @@ type AddSslOptions = {
   preferredExternalPort: number
   addXForwardedHeaders: boolean | null /** default: false */
 }
-type Security = { secure: false; ssl: false } | { secure: true; ssl: boolean }
+type Security = { ssl: boolean }
 export type BindOptions = {
   scheme: Scheme
   preferredExternalPort: number
   addSsl: AddSslOptions | null
-} & Security
+  secure: Security | null
+}
 type KnownProtocols = typeof knownProtocols
 type ProtocolsWithSslVariants = {
   [K in keyof KnownProtocols]: KnownProtocols[K] extends {
@@ -79,14 +80,15 @@ type NotProtocolsWithSslVariants = Exclude<
 >
 
 type BindOptionsByKnownProtocol =
-  | ({
+  | {
       protocol: ProtocolsWithSslVariants
-      preferredExternalPort?: number
+      preferredExternalPort: number | null
       scheme: Scheme | null
-    } & ({ noAddSsl: true } | { addSsl?: Partial<AddSslOptions> }))
+      addSsl: Partial<AddSslOptions> | null
+    }
   | {
       protocol: NotProtocolsWithSslVariants
-      preferredExternalPort?: number
+      preferredExternalPort: number | null
       scheme: Scheme | null
       addSsl: AddSslOptions | null
     }
@@ -120,17 +122,12 @@ export class Host {
 
   private async bindPortForUnknown(
     internalPort: number,
-    options:
-      | ({
-          scheme: Scheme
-          preferredExternalPort: number
-          addSsl: AddSslOptions | null
-        } & { secure: false; ssl: false })
-      | ({
-          scheme: Scheme
-          preferredExternalPort: number
-          addSsl: AddSslOptions | null
-        } & { secure: true; ssl: boolean }),
+    options: {
+      scheme: Scheme
+      preferredExternalPort: number
+      addSsl: AddSslOptions | null
+      secure: { ssl: boolean } | null
+    },
   ) {
     await this.options.effects.bind({
       kind: this.options.kind,
@@ -154,18 +151,13 @@ export class Host {
       knownProtocols[options.protocol].defaultPort
     const addSsl = this.getAddSsl(options, protoInfo)
 
-    const security: Security = !protoInfo.secure
-      ? {
-          secure: protoInfo.secure,
-          ssl: protoInfo.ssl,
-        }
-      : { secure: false, ssl: false }
+    const secure: Security | null = !protoInfo.secure ? null : { ssl: false }
 
     const newOptions = {
       scheme,
       preferredExternalPort,
       addSsl,
-      ...security,
+      secure,
     }
 
     await this.options.effects.bind({
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
index 89776cf66..461d4a82a 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/lib/test/host.test.ts
@@ -10,6 +10,8 @@ describe("host", () => {
       const fooOrigin = await foo.bindPort(80, {
         protocol: "http" as const,
         scheme: null,
+        addSsl: null,
+        preferredExternalPort: null,
       })
       const fooInterface = new ServiceInterfaceBuilder({
         effects,
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index ae6931bdc..5f1be60bb 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -14,41 +14,24 @@ import { GetSslCertificateParams } from "../../../core/startos/bindings/GetSslCe
 import { GetSslKeyParams } from "../../../core/startos/bindings/GetSslKeyParams"
 import { GetServiceInterfaceParams } from "../../../core/startos/bindings/GetServiceInterfaceParams"
 import { SetDependenciesParams } from "../../../core/startos/bindings/SetDependenciesParams"
-
+import { GetSystemSmtpParams } from "../../../core/startos/bindings/GetSystemSmtpParams"
+import { GetServicePortForwardParams } from "../../../core/startos/bindings/GetServicePortForwardParams"
+import { ExportServiceInterfaceParams } from "../../../core/startos/bindings/ExportServiceInterfaceParams"
+import { GetPrimaryUrlParams } from "../../../core/startos/bindings/GetPrimaryUrlParams"
+import { ListServiceInterfacesParams } from "../../../core/startos/bindings/ListServiceInterfacesParams"
+import { RemoveAddressParams } from "../../../core/startos/bindings/RemoveAddressParams"
+import { ExportActionParams } from "../../../core/startos/bindings/ExportActionParams"
+import { RemoveActionParams } from "../../../core/startos/bindings/RemoveActionParams"
+import { ReverseProxyParams } from "../../../core/startos/bindings/ReverseProxyParams"
+import { MountParams } from "../../../core/startos/bindings/MountParams"
 function typeEquality<ExpectedType>(_a: ExpectedType) {}
 describe("startosTypeValidation ", () => {
   test(`checking the params match`, () => {
     const testInput: any = {}
     typeEquality<{
-      [K in keyof Effects &
-        (
-          | "gitInfo"
-          | "echo"
-          | "chroot"
-          | "exists"
-          | "executeAction"
-          | "getConfigured"
-          | "stopped"
-          | "running"
-          | "restart"
-          | "shutdown"
-          | "setConfigured"
-          | "setMainStatus"
-          | "setHealth"
-          | "getStore"
-          | "setStore"
-          | "exposeForDependents"
-          | "exposeUi"
-          | "createOverlayedImage"
-          | "destroyOverlayedImage"
-          | "getSslCertificate"
-          | "getSslKey"
-          | "getServiceInterface"
-          | "clearBindings"
-          | "bind"
-          | "getHostInfo"
-          | "setDependencies"
-        )]: Effects[K] extends Function ? Parameters<Effects[K]>[0] : never
+      [K in keyof Effects]: Effects[K] extends (args: infer A) => any
+        ? A
+        : never
     }>({
       executeAction: {} as ExecuteAction,
       createOverlayedImage: {} as CreateOverlayedImageParams,
@@ -70,6 +53,19 @@ describe("startosTypeValidation ", () => {
       getSslKey: {} as GetSslKeyParams,
       getServiceInterface: {} as GetServiceInterfaceParams,
       setDependencies: {} as SetDependenciesParams,
+      store: {} as never,
+      getSystemSmtp: {} as GetSystemSmtpParams,
+      getContainerIp: undefined,
+      getServicePortForward: {} as GetServicePortForwardParams,
+      clearServiceInterfaces: undefined,
+      exportServiceInterface: {} as ExportServiceInterfaceParams,
+      getPrimaryUrl: {} as GetPrimaryUrlParams,
+      listServiceInterfaces: {} as ListServiceInterfacesParams,
+      removeAddress: {} as RemoveAddressParams,
+      exportAction: {} as ExportActionParams,
+      removeAction: {} as RemoveActionParams,
+      reverseProxy: {} as ReverseProxyParams,
+      mount: {} as MountParams,
     })
     typeEquality<Parameters<Effects["executeAction"]>[0]>(
       testInput as ExecuteAction,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index eb7ea27bf..a578e711a 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -302,8 +302,7 @@ export type Effects = {
     scheme: Scheme
     preferredExternalPort: number
     addSsl: AddSslOptions | null
-    secure: boolean
-    ssl: boolean
+    secure: { ssl: boolean } | null
   }): Promise<void>
   /** Retrieves the current hostname(s) associated with a host id */
   // getHostInfo(options: {
@@ -491,9 +490,7 @@ export type Effects = {
     }
     http: {
       // optional, will do TCP layer proxy only if not present
-      headers:
-        | ((headers: Record<string, string>) => Record<string, string>)
-        | null
+      headers: Record<string, string> | null
     } | null
   }): Promise<{ stop(): Promise<void> }>
   restart(): void
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 7cf449664..ea9fcc1c1 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1789,8 +1789,7 @@ export module Mock {
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
-              secure: false,
-              ssl: false,
+              secure: null,
             },
             suffix: '',
           },
@@ -1862,8 +1861,7 @@ export module Mock {
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
-              secure: false,
-              ssl: false,
+              secure: null,
             },
             suffix: '',
           },
@@ -1931,8 +1929,7 @@ export module Mock {
               scheme: 'bitcoin',
               preferredExternalPort: 8333,
               addSsl: null,
-              secure: true,
-              ssl: false,
+              secure: { ssl: false },
             },
             suffix: '',
           },
@@ -2038,8 +2035,7 @@ export module Mock {
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
-              secure: true,
-              ssl: true,
+              secure: { ssl: true },
             },
             suffix: '',
           },
@@ -2187,8 +2183,7 @@ export module Mock {
               scheme: 'grpc',
               preferredExternalPort: 10009,
               addSsl: null,
-              secure: true,
-              ssl: true,
+              secure: { ssl: true },
             },
             suffix: '',
           },
@@ -2256,8 +2251,7 @@ export module Mock {
               scheme: 'lndconnect',
               preferredExternalPort: 10009,
               addSsl: null,
-              secure: true,
-              ssl: true,
+              secure: { ssl: true },
             },
             suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
           },
@@ -2325,8 +2319,7 @@ export module Mock {
               scheme: null,
               preferredExternalPort: 9735,
               addSsl: null,
-              secure: true,
-              ssl: true,
+              secure: { ssl: true },
             },
             suffix: '',
           },
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index a34a91652..c861dbb62 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -414,8 +414,7 @@ export const mockPatchData: DataModel = {
                   preferredExternalPort: 443,
                   scheme: 'https',
                 },
-                secure: true,
-                ssl: true,
+                secure: { ssl: true },
               },
               suffix: '',
             },
@@ -661,8 +660,7 @@ export const mockPatchData: DataModel = {
                 scheme: 'grpc',
                 preferredExternalPort: 10009,
                 addSsl: null,
-                secure: true,
-                ssl: true,
+                secure: { ssl: true },
               },
               suffix: '',
             },
@@ -730,8 +728,7 @@ export const mockPatchData: DataModel = {
                 scheme: 'lndconnect',
                 preferredExternalPort: 10009,
                 addSsl: null,
-                secure: true,
-                ssl: true,
+                secure: { ssl: true },
               },
               suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
             },
@@ -799,8 +796,7 @@ export const mockPatchData: DataModel = {
                 scheme: null,
                 preferredExternalPort: 9735,
                 addSsl: null,
-                secure: true,
-                ssl: true,
+                secure: { ssl: true },
               },
               suffix: '',
             },

From a02b531e47d3fdc5597106c94b8aba26bb8b07b4 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Mon, 18 Mar 2024 12:37:50 -0600
Subject: [PATCH 065/341] update sdk

---
 core/startos/bindings/ExposeUiParams.ts       | 19 +++++-
 .../src/service/service_effect_handler.rs     | 14 ++++-
 sdk/lib/StartSdk.ts                           | 11 +++-
 sdk/lib/backup/Backups.ts                     |  2 +-
 sdk/lib/backup/setupBackups.ts                |  2 +-
 sdk/lib/index.ts                              |  1 +
 sdk/lib/inits/setupExports.ts                 |  4 +-
 sdk/lib/inits/setupInit.ts                    | 34 +++++++---
 sdk/lib/interfaces/Host.ts                    | 12 ++--
 sdk/lib/test/host.test.ts                     |  3 -
 sdk/lib/types.ts                              | 63 +++++++++++--------
 sdk/lib/util/utils.ts                         | 19 ------
 12 files changed, 113 insertions(+), 71 deletions(-)

diff --git a/core/startos/bindings/ExposeUiParams.ts b/core/startos/bindings/ExposeUiParams.ts
index dcf649285..124fac851 100644
--- a/core/startos/bindings/ExposeUiParams.ts
+++ b/core/startos/bindings/ExposeUiParams.ts
@@ -1,4 +1,21 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ExposedUI } from "./ExposedUI";
 
-export interface ExposeUiParams { paths: Array<ExposedUI>, }
\ No newline at end of file
+export type ExposeUiParams =
+  | {
+      type: "object";
+      value: { [k: string]: ExposeUiParams };
+    }
+  | {
+      type: "string";
+      /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
+      path: string;
+      /** A human readable description or explanation of the value */
+      description: string | null;
+      /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
+      masked: boolean;
+      /** (string/number only) Whether or not to include a button for copying the value to clipboard */
+      copyable: boolean | null;
+      /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
+      qr: boolean | null;
+    };
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 6e9610c8a..ebcbcaf08 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -691,9 +691,19 @@ async fn expose_for_dependents(
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[serde(tag = "type")]
 #[ts(export)]
-struct ExposeUiParams {
-    paths: Vec<ExposedUI>,
+enum ExposeUiParams {
+    Object {
+        value: Record<String, ExposeUiParams>,
+    },
+    r#String {
+        path: String,
+        description: Option<String>,
+        masked: bool,
+        copyable: Option<bool>,
+        qr: Option<bool>,
+    },
 }
 
 async fn expose_ui(
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 85f157aa9..764f419a6 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -54,6 +54,7 @@ import {
 } from "./interfaces/setupInterfaces"
 import { successFailure } from "./trigger/successFailure"
 import { SetupExports } from "./inits/setupExports"
+import { HealthReceipt } from "./health/HealthReceipt"
 
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
@@ -234,7 +235,15 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           spec: Spec,
         ) => Config.of<Spec, Store>(spec),
       },
-      Daemons: { of: Daemons.of },
+      Daemons: {
+        of(config: {
+          effects: Effects
+          started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
+          healthReceipts: HealthReceipt[]
+        }) {
+          return Daemons.of<Manifest>(config)
+        },
+      },
       DependencyConfig: {
         of<
           LocalConfig extends Record<string, any>,
diff --git a/sdk/lib/backup/Backups.ts b/sdk/lib/backup/Backups.ts
index 659da0ec7..20099c86d 100644
--- a/sdk/lib/backup/Backups.ts
+++ b/sdk/lib/backup/Backups.ts
@@ -42,7 +42,7 @@ export class Backups<M extends SDKManifest> {
 
   private constructor(
     private options = DEFAULT_OPTIONS,
-    private backupSet = [] as BackupSet<M["volumes"][0]>[],
+    private backupSet = [] as BackupSet<M["volumes"][number]>[],
   ) {}
   static volumes<M extends SDKManifest = never>(
     ...volumeNames: Array<M["volumes"][0]>
diff --git a/sdk/lib/backup/setupBackups.ts b/sdk/lib/backup/setupBackups.ts
index d171a4aa7..af2d08410 100644
--- a/sdk/lib/backup/setupBackups.ts
+++ b/sdk/lib/backup/setupBackups.ts
@@ -4,7 +4,7 @@ import { ExpectedExports } from "../types"
 import { _ } from "../util"
 
 export type SetupBackupsParams<M extends SDKManifest> = Array<
-  M["volumes"][0] | Backups<M>
+  M["volumes"][number] | Backups<M>
 >
 
 export function setupBackups<M extends SDKManifest>(
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index aff2ef7ed..49d385207 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -4,6 +4,7 @@ export { Overlay } from "./util/Overlay"
 export { Utils } from "./util/utils"
 export { StartSdk } from "./StartSdk"
 export { setupManifest } from "./manifest/setupManifest"
+export { FileHelper } from "./util/fileHelper"
 export * as actions from "./actions"
 export * as backup from "./backup"
 export * as config from "./config"
diff --git a/sdk/lib/inits/setupExports.ts b/sdk/lib/inits/setupExports.ts
index bad6dd9ad..ec5e5eb1f 100644
--- a/sdk/lib/inits/setupExports.ts
+++ b/sdk/lib/inits/setupExports.ts
@@ -6,11 +6,11 @@ export type SetupExports<Store> = (opts: {
   utils: Utils<any, Store>
 }) =>
   | {
-      ui: ExposeUiPaths<Store>
+      ui: { [k: string]: ExposeUiPaths<Store> }
       services: ExposeServicePaths<Store>
     }
   | Promise<{
-      ui: ExposeUiPaths<Store>
+      ui: { [k: string]: ExposeUiPaths<Store> }
       services: ExposeServicePaths<Store>
     }>
 
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index 4c52ddad2..f5581fb8d 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -1,6 +1,6 @@
 import { SetInterfaces } from "../interfaces/setupInterfaces"
 import { SDKManifest } from "../manifest/ManifestTypes"
-import { ExpectedExports } from "../types"
+import { ExpectedExports, ExposeUiPaths, ExposeUiPathsAll } from "../types"
 import { createUtils } from "../util"
 import { Migrations } from "./migrations/setupMigrations"
 import { SetupExports } from "./setupExports"
@@ -32,14 +32,12 @@ export function setupInit<Manifest extends SDKManifest, Store>(
         utils,
       })
       await opts.effects.exposeForDependents(services)
-      await opts.effects.exposeUi({
-        paths: ui.map((x) => ({
-          description: null,
-          copyable: null,
-          qr: null,
-          ...x,
-        })),
-      })
+      await opts.effects.exposeUi(
+        forExpose({
+          type: "object",
+          value: ui,
+        }),
+      )
     },
     uninit: async (opts) => {
       await migrations.uninit(opts)
@@ -47,3 +45,21 @@ export function setupInit<Manifest extends SDKManifest, Store>(
     },
   }
 }
+
+function forExpose<Store>(ui: ExposeUiPaths<Store>): ExposeUiPathsAll {
+  if (ui.type === ("object" as const)) {
+    return {
+      type: "object" as const,
+      value: Object.fromEntries(
+        Object.entries(ui.value).map(([key, value]) => [key, forExpose(value)]),
+      ),
+    }
+  }
+  return {
+    description: null,
+
+    copyable: null,
+    qr: null,
+    ...ui,
+  }
+}
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index cb6fa9f9a..250f42075 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -82,15 +82,15 @@ type NotProtocolsWithSslVariants = Exclude<
 type BindOptionsByKnownProtocol =
   | {
       protocol: ProtocolsWithSslVariants
-      preferredExternalPort: number | null
-      scheme: Scheme | null
-      addSsl: Partial<AddSslOptions> | null
+      preferredExternalPort?: number
+      scheme?: Scheme
+      addSsl?: Partial<AddSslOptions>
     }
   | {
       protocol: NotProtocolsWithSslVariants
-      preferredExternalPort: number | null
-      scheme: Scheme | null
-      addSsl: AddSslOptions | null
+      preferredExternalPort?: number
+      scheme?: Scheme
+      addSsl?: AddSslOptions
     }
 type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions
 
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
index 461d4a82a..eec63bb8a 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/lib/test/host.test.ts
@@ -9,9 +9,6 @@ describe("host", () => {
       const foo = utils.host.multi("foo")
       const fooOrigin = await foo.bindPort(80, {
         protocol: "http" as const,
-        scheme: null,
-        addSsl: null,
-        preferredExternalPort: null,
       })
       const fooInterface = new ServiceInterfaceBuilder({
         effects,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index a578e711a..e3b9045e6 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -261,22 +261,42 @@ export type ExposeServicePaths<Store = never> = {
   paths: Store extends never ? string[] : ExposeAllServicePaths<Store>[]
 }
 
-export type ExposeUiPaths<Store> = Array<{
-  /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
-  path: ExposeAllUiPaths<Store>
-  /** A human readable title for the value */
-  title: string
-  /** A human readable description or explanation of the value */
-  description?: string
-  /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
-  masked: boolean
-  /** (string/number only) Whether or not to include a button for copying the value to clipboard */
-  copyable?: boolean
-  /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
-  qr?: boolean
-}>
-
-type tset = keyof Effects
+export type ExposeUiPaths<Store> =
+  | {
+      type: "object"
+      value: { [k: string]: ExposeUiPaths<Store> }
+    }
+  | {
+      type: "string"
+      /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
+      path: ExposeAllUiPaths<Store>
+      /** A human readable description or explanation of the value */
+      description?: string
+      /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
+      masked: boolean
+      /** (string/number only) Whether or not to include a button for copying the value to clipboard */
+      copyable?: boolean
+      /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
+      qr?: boolean
+    }
+export type ExposeUiPathsAll =
+  | {
+      type: "object"
+      value: { [k: string]: ExposeUiPathsAll }
+    }
+  | {
+      type: "string"
+      /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
+      path: string
+      /** A human readable description or explanation of the value */
+      description: string | null
+      /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
+      masked: boolean
+      /** (string/number only) Whether or not to include a button for copying the value to clipboard */
+      copyable: boolean | null
+      /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
+      qr: boolean | null
+    }
 
 /** Used to reach out from the pure js runtime */
 export type Effects = {
@@ -375,16 +395,7 @@ export type Effects = {
 
   exposeForDependents(options: { paths: string[] }): Promise<void>
 
-  exposeUi<Store = never>(options: {
-    paths: {
-      path: string
-      title: string | null
-      description: string | null
-      masked: boolean | null
-      copyable: boolean | null
-      qr: boolean | null
-    }[]
-  }): Promise<void>
+  exposeUi(options: ExposeUiPathsAll): Promise<void>
   /**
    * There are times that we want to see the addresses that where exported
    * @param options.addressId If we want to filter the address id
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index cc18c7714..9d424888e 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -56,23 +56,6 @@ export type Utils<
   Store,
   WrapperOverWrite = { const: never },
 > = {
-  checkPortListening(
-    port: number,
-    options: {
-      errorMessage: string
-      successMessage: string
-      timeoutMessage?: string
-      timeout?: number
-    },
-  ): Promise<CheckResult>
-  checkWebUrl(
-    url: string,
-    options?: {
-      timeout?: number
-      successMessage?: string
-      errorMessage?: string
-    },
-  ): Promise<CheckResult>
   childProcess: typeof childProcess
   createInterface: (options: {
     name: string
@@ -304,8 +287,6 @@ export const createUtils = <
         },
       }
     },
-    checkPortListening: checkPortListening.bind(null, effects),
-    checkWebUrl: checkWebUrl.bind(null, effects),
 
     mountDependencies: <
       In extends

From 8e2dc8b3eeb0333c26e30e5b4cec58c77edda763 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 18 Mar 2024 12:47:31 -0600
Subject: [PATCH 066/341] chore: Fix the effects

---
 core/startos/bindings/ExposeUiParams.ts       | 20 +--------
 .../src/service/service_effect_handler.rs     | 41 +++++++++----------
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/core/startos/bindings/ExposeUiParams.ts b/core/startos/bindings/ExposeUiParams.ts
index 124fac851..3c2230060 100644
--- a/core/startos/bindings/ExposeUiParams.ts
+++ b/core/startos/bindings/ExposeUiParams.ts
@@ -1,21 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ExposedUI } from "./ExposedUI";
 
-export type ExposeUiParams =
-  | {
-      type: "object";
-      value: { [k: string]: ExposeUiParams };
-    }
-  | {
-      type: "string";
-      /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
-      path: string;
-      /** A human readable description or explanation of the value */
-      description: string | null;
-      /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
-      masked: boolean;
-      /** (string/number only) Whether or not to include a button for copying the value to clipboard */
-      copyable: boolean | null;
-      /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
-      qr: boolean | null;
-    };
+export type ExposeUiParams = { "type": "object", value: {[key: string]: ExposeUiParams}, } | { "type": "string", path: string, description: string | null, masked: boolean, copyable: boolean | null, qr: boolean | null, };
\ No newline at end of file
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index ebcbcaf08..e67177998 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -695,9 +695,10 @@ async fn expose_for_dependents(
 #[ts(export)]
 enum ExposeUiParams {
     Object {
-        value: Record<String, ExposeUiParams>,
+        #[ts(type = "{[key: string]: ExposeUiParams}")]
+        value: OrdMap<String, ExposeUiParams>,
     },
-    r#String {
+    String {
         path: String,
         description: Option<String>,
         masked: bool,
@@ -706,25 +707,23 @@ enum ExposeUiParams {
     },
 }
 
-async fn expose_ui(
-    context: EffectContext,
-    ExposeUiParams { paths }: ExposeUiParams,
-) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = context.id.clone();
-    context
-        .ctx
-        .db
-        .mutate(|db| {
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package_id)
-                .or_not_found(&package_id)?
-                .as_store_exposed_ui_mut()
-                .ser(&paths)
-        })
-        .await?;
-    Ok(())
+async fn expose_ui(context: EffectContext, params: ExposeUiParams) -> Result<(), Error> {
+    todo!()
+    // let context = context.deref()?;
+    // let package_id = context.id.clone();
+    // context
+    //     .ctx
+    //     .db
+    //     .mutate(|db| {
+    //         db.as_public_mut()
+    //             .as_package_data_mut()
+    //             .as_idx_mut(&package_id)
+    //             .or_not_found(&package_id)?
+    //             .as_store_exposed_ui_mut()
+    //             .ser(&paths)
+    //     })
+    //     .await?;
+    // Ok(())
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[ts(export)]

From 5f40fd6038b72d69ee061937fd93e3c9fea57ef9 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 18 Mar 2024 14:31:01 -0600
Subject: [PATCH 067/341] chore: Remove the utils

---
 sdk/lib/StartSdk.ts                           | 159 ++++++++-
 sdk/lib/actions/createAction.ts               |  24 +-
 sdk/lib/actions/setupActions.ts               |  17 +-
 sdk/lib/config/builder/config.ts              |   2 -
 sdk/lib/config/configConstants.ts             |   5 +-
 sdk/lib/config/setupConfig.ts                 |  10 +-
 sdk/lib/dependencyConfig/DependencyConfig.ts  |   3 -
 sdk/lib/health/HealthCheck.ts                 |  81 ++---
 sdk/lib/health/checkFns/checkPortListening.ts |  16 +-
 sdk/lib/health/checkFns/runHealthScript.ts    |  12 +-
 sdk/lib/index.ts                              |   1 -
 sdk/lib/inits/migrations/Migration.ts         |  25 +-
 sdk/lib/inits/migrations/setupMigrations.ts   |   7 +-
 sdk/lib/inits/setupExports.ts                 |   6 +-
 sdk/lib/inits/setupInit.ts                    |   8 +-
 sdk/lib/inits/setupInstall.ts                 |   3 -
 sdk/lib/inits/setupUninstall.ts               |   3 -
 sdk/lib/interfaces/ServiceInterfaceBuilder.ts |   2 +-
 sdk/lib/interfaces/setupInterfaces.ts         |   7 +-
 sdk/lib/mainFn/Daemons.ts                     | 106 +++++-
 sdk/lib/mainFn/index.ts                       |  13 +-
 sdk/lib/test/configBuilder.test.ts            |  66 +++-
 sdk/lib/test/host.test.ts                     |   5 +-
 sdk/lib/test/store.test.ts                    |  64 ++--
 sdk/lib/types.ts                              |   4 +-
 sdk/lib/util/getServiceInterface.ts           |   2 +-
 sdk/lib/util/index.ts                         |   6 -
 sdk/lib/util/utils.ts                         | 310 ------------------
 28 files changed, 424 insertions(+), 543 deletions(-)
 delete mode 100644 sdk/lib/util/utils.ts

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 764f419a6..a56926a80 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -19,9 +19,14 @@ import {
   BackupOptions,
   DeepPartial,
   MaybePromise,
+  ServiceInterfaceId,
+  PackageId,
+  EnsureStorePath,
+  ExtractStore,
+  DaemonReturned,
+  ValidIfNoStupidEscape,
 } from "./types"
 import * as patterns from "./util/patterns"
-import { Utils } from "./util/utils"
 import { DependencyConfig, Update } from "./dependencyConfig/DependencyConfig"
 import { BackupSet, Backups } from "./backup/Backups"
 import { smtpConfig } from "./config/configConstants"
@@ -46,7 +51,13 @@ import { setupMain } from "./mainFn"
 import { defaultTrigger } from "./trigger/defaultTrigger"
 import { changeOnFirstSuccess, cooldownTrigger } from "./trigger"
 import setupConfig, { Read, Save } from "./config/setupConfig"
-import { setupDependencyMounts } from "./dependency/setupDependencyMounts"
+import {
+  ManifestId,
+  NamedPath,
+  Path,
+  VolumeName,
+  setupDependencyMounts,
+} from "./dependency/setupDependencyMounts"
 import {
   InterfacesReceipt,
   SetInterfaces,
@@ -55,6 +66,19 @@ import {
 import { successFailure } from "./trigger/successFailure"
 import { SetupExports } from "./inits/setupExports"
 import { HealthReceipt } from "./health/HealthReceipt"
+import { MultiHost, Scheme, SingleHost, StaticHost } from "./interfaces/Host"
+import { ServiceInterfaceBuilder } from "./interfaces/ServiceInterfaceBuilder"
+import { GetSystemSmtp } from "./util/GetSystemSmtp"
+import nullIfEmpty from "./util/nullIfEmpty"
+import {
+  GetServiceInterface,
+  getServiceInterface,
+} from "./util/getServiceInterface"
+import { getServiceInterfaces } from "./util/getServiceInterfaces"
+import { getStore } from "./store/getStore"
+import { mountDependencies } from "./dependency/mountDependencies"
+import { CommandOptions, MountOptions, Overlay } from "./util/Overlay"
+import { splitCommand } from "./util/splitCommand"
 
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
@@ -63,6 +87,17 @@ type AnyNeverCond<T extends any[], Then, Else> =
     T extends [any, ...infer U] ? AnyNeverCond<U,Then, Else> :
     never
 
+export type ServiceInterfaceType = "ui" | "p2p" | "api"
+export type MainEffects = Effects & { _type: "main" }
+export type Signals = NodeJS.Signals
+export const SIGTERM: Signals = "SIGTERM"
+export const SIGKILL: Signals = "SIGTERM"
+export const NO_TIMEOUT = -1
+
+function removeConstType<E>() {
+  return <T>(t: T) => t as T & (E extends MainEffects ? {} : { const: never })
+}
+
 export class StartSdk<Manifest extends SDKManifest, Store> {
   private constructor(readonly manifest: Manifest) {}
   static of() {
@@ -77,7 +112,78 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
 
   build(isReady: AnyNeverCond<[Manifest, Store], "Build not ready", true>) {
     return {
+      serviceInterface: {
+        getOwn: <E extends Effects>(effects: E, id: ServiceInterfaceId) =>
+          removeConstType<E>()(
+            getServiceInterface(effects, {
+              id,
+              packageId: null,
+            }),
+          ),
+        get: <E extends Effects>(
+          effects: E,
+          opts: { id: ServiceInterfaceId; packageId: PackageId },
+        ) => removeConstType<E>()(getServiceInterface(effects, opts)),
+        getAllOwn: <E extends Effects>(effects: E) =>
+          removeConstType<E>()(
+            getServiceInterfaces(effects, {
+              packageId: null,
+            }),
+          ),
+        getAll: <E extends Effects>(
+          effects: E,
+          opts: { packageId: PackageId },
+        ) => removeConstType<E>()(getServiceInterfaces(effects, opts)),
+      },
+
+      store: {
+        get: <E extends Effects, Path extends string = never>(
+          effects: E,
+          packageId: string,
+          path: EnsureStorePath<Store, Path>,
+        ) =>
+          removeConstType<E>()(
+            getStore<Store, Path>(effects, path as any, {
+              packageId,
+            }),
+          ),
+        getOwn: <E extends Effects, Path extends string>(
+          effects: E,
+          path: EnsureStorePath<Store, Path>,
+        ) => removeConstType<E>()(getStore<Store, Path>(effects, path as any)),
+        setOwn: <E extends Effects, Path extends string | never>(
+          effects: E,
+          path: EnsureStorePath<Store, Path>,
+          value: ExtractStore<Store, Path>,
+        ) => effects.store.set<Store, Path>({ value, path: path as any }),
+      },
+
+      host: {
+        static: (effects: Effects, id: string) =>
+          new StaticHost({ id, effects }),
+        single: (effects: Effects, id: string) =>
+          new SingleHost({ id, effects }),
+        multi: (effects: Effects, id: string) => new MultiHost({ id, effects }),
+      },
+      nullIfEmpty,
+
       configConstants: { smtpConfig },
+      createInterface: (
+        effects: Effects,
+        options: {
+          name: string
+          id: string
+          description: string
+          hasPrimary: boolean
+          disabled: boolean
+          type: ServiceInterfaceType
+          username: null | string
+          path: string
+          search: Record<string, string>
+          schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
+          masked: boolean
+        },
+      ) => new ServiceInterfaceBuilder({ ...options, effects }),
       createAction: <
         ConfigType extends
           | Record<string, any>
@@ -90,13 +196,44 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         },
         fn: (options: {
           effects: Effects
-          utils: Utils<Manifest, Store>
           input: Type
         }) => Promise<ActionResult>,
       ) => {
         const { input, ...rest } = metaData
         return createAction<Manifest, Store, ConfigType, Type>(rest, fn, input)
       },
+      getSystemSmtp: <E extends Effects>(effects: E) =>
+        removeConstType<E>()(new GetSystemSmtp(effects)),
+      runCommand: async <A extends string>(
+        effects: Effects,
+        imageId: Manifest["images"][number],
+        command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+        options: CommandOptions & {
+          mounts?: { path: string; options: MountOptions }[]
+        },
+      ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
+        const commands = splitCommand(command)
+        const overlay = await Overlay.of(effects, imageId)
+        try {
+          for (let mount of options.mounts || []) {
+            await overlay.mount(mount.options, mount.path)
+          }
+          return await overlay.exec(commands)
+        } finally {
+          await overlay.destroy()
+        }
+      },
+
+      mountDependencies: <
+        In extends
+          | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
+          | Record<VolumeName, Record<NamedPath, Path>>
+          | Record<NamedPath, Path>
+          | Path,
+      >(
+        effects: Effects,
+        value: In,
+      ) => mountDependencies(effects, value),
       createDynamicAction: <
         ConfigType extends
           | Record<string, any>
@@ -106,11 +243,9 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       >(
         metaData: (options: {
           effects: Effects
-          utils: Utils<Manifest, Store>
         }) => MaybePromise<Omit<ActionMetadata, "input">>,
         fn: (options: {
           effects: Effects
-          utils: Utils<Manifest, Store>
           input: Type
         }) => Promise<ActionResult>,
         input: Config<Type, Store> | Config<Type, never>,
@@ -196,9 +331,8 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       ) => setupInterfaces(config, fn),
       setupMain: (
         fn: (o: {
-          effects: Effects
+          effects: MainEffects
           started(onTerm: () => PromiseLike<void>): PromiseLike<void>
-          utils: Utils<Manifest, Store, {}>
         }) => Promise<Daemons<Manifest, any>>,
       ) => setupMain<Manifest, Store>(fn),
       setupMigrations: <
@@ -259,7 +393,6 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           dependencyConfig: (options: {
             effects: Effects
             localConfig: LocalConfig
-            utils: Utils<Manifest, Store>
           }) => Promise<void | DeepPartial<RemoteConfig>>
           update?: Update<void | DeepPartial<RemoteConfig>, RemoteConfig>
         }) {
@@ -343,14 +476,8 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       Migration: {
         of: <Version extends ManifestVersion>(options: {
           version: Version
-          up: (opts: {
-            effects: Effects
-            utils: Utils<Manifest, Store>
-          }) => Promise<void>
-          down: (opts: {
-            effects: Effects
-            utils: Utils<Manifest, Store>
-          }) => Promise<void>
+          up: (opts: { effects: Effects }) => Promise<void>
+          down: (opts: { effects: Effects }) => Promise<void>
         }) => Migration.of<Manifest, Store, Version>(options),
       },
       Value: {
diff --git a/sdk/lib/actions/createAction.ts b/sdk/lib/actions/createAction.ts
index d14b7ce0d..dc52a658a 100644
--- a/sdk/lib/actions/createAction.ts
+++ b/sdk/lib/actions/createAction.ts
@@ -1,15 +1,10 @@
 import { Config, ExtractConfigType } from "../config/builder/config"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { ActionMetadata, ActionResult, Effects, ExportedAction } from "../types"
-import { createUtils } from "../util"
-import { Utils } from "../util/utils"
 
 export type MaybeFn<Manifest extends SDKManifest, Store, Value> =
   | Value
-  | ((options: {
-      effects: Effects
-      utils: Utils<Manifest, Store>
-    }) => Promise<Value> | Value)
+  | ((options: { effects: Effects }) => Promise<Value> | Value)
 export class CreatedAction<
   Manifest extends SDKManifest,
   Store,
@@ -27,7 +22,6 @@ export class CreatedAction<
     >,
     readonly fn: (options: {
       effects: Effects
-      utils: Utils<Manifest, Store>
       input: Type
     }) => Promise<ActionResult>,
     readonly input: Config<Type, Store>,
@@ -44,11 +38,7 @@ export class CreatedAction<
     Type extends Record<string, any> = ExtractConfigType<ConfigType>,
   >(
     metaData: MaybeFn<Manifest, Store, Omit<ActionMetadata, "input">>,
-    fn: (options: {
-      effects: Effects
-      utils: Utils<Manifest, Store>
-      input: Type
-    }) => Promise<ActionResult>,
+    fn: (options: { effects: Effects; input: Type }) => Promise<ActionResult>,
     inputConfig: Config<Type, Store> | Config<Type, never>,
   ) {
     return new CreatedAction<Manifest, Store, ConfigType, Type>(
@@ -61,7 +51,6 @@ export class CreatedAction<
   exportedAction: ExportedAction = ({ effects, input }) => {
     return this.fn({
       effects,
-      utils: createUtils(effects),
       input: this.validator.unsafeCast(input),
     })
   }
@@ -69,21 +58,17 @@ export class CreatedAction<
   run = async ({ effects, input }: { effects: Effects; input?: Type }) => {
     return this.fn({
       effects,
-      utils: createUtils(effects),
       input: this.validator.unsafeCast(input),
     })
   }
 
-  async metaData(options: { effects: Effects; utils: Utils<Manifest, Store> }) {
+  async metaData(options: { effects: Effects }) {
     if (this.myMetaData instanceof Function)
       return await this.myMetaData(options)
     return this.myMetaData
   }
 
-  async ActionMetadata(options: {
-    effects: Effects
-    utils: Utils<Manifest, Store>
-  }): Promise<ActionMetadata> {
+  async ActionMetadata(options: { effects: Effects }): Promise<ActionMetadata> {
     return {
       ...(await this.metaData(options)),
       input: await this.input.build(options),
@@ -93,7 +78,6 @@ export class CreatedAction<
   async getConfig({ effects }: { effects: Effects }) {
     return this.input.build({
       effects,
-      utils: createUtils(effects) as any,
     })
   }
 }
diff --git a/sdk/lib/actions/setupActions.ts b/sdk/lib/actions/setupActions.ts
index 84a0e4345..035f8dafa 100644
--- a/sdk/lib/actions/setupActions.ts
+++ b/sdk/lib/actions/setupActions.ts
@@ -1,17 +1,12 @@
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { Effects, ExpectedExports } from "../types"
-import { createUtils } from "../util"
 import { once } from "../util/once"
-import { Utils } from "../util/utils"
 import { CreatedAction } from "./createAction"
 
 export function setupActions<Manifest extends SDKManifest, Store>(
   ...createdActions: CreatedAction<Manifest, Store, any>[]
 ) {
-  const myActions = async (options: {
-    effects: Effects
-    utils: Utils<Manifest, Store>
-  }) => {
+  const myActions = async (options: { effects: Effects }) => {
     const actions: Record<string, CreatedAction<Manifest, Store, any>> = {}
     for (const action of createdActions) {
       const actionMetadata = await action.metaData(options)
@@ -24,17 +19,11 @@ export function setupActions<Manifest extends SDKManifest, Store>(
     actionsMetadata: ExpectedExports.actionsMetadata
   } = {
     actions(options: { effects: Effects }) {
-      const utils = createUtils<Manifest, Store>(options.effects)
-
-      return myActions({
-        ...options,
-        utils,
-      })
+      return myActions(options)
     },
     async actionsMetadata({ effects }: { effects: Effects }) {
-      const utils = createUtils<Manifest, Store>(effects)
       return Promise.all(
-        createdActions.map((x) => x.ActionMetadata({ effects, utils })),
+        createdActions.map((x) => x.ActionMetadata({ effects })),
       )
     },
   }
diff --git a/sdk/lib/config/builder/config.ts b/sdk/lib/config/builder/config.ts
index 81009abaa..c30f37890 100644
--- a/sdk/lib/config/builder/config.ts
+++ b/sdk/lib/config/builder/config.ts
@@ -1,5 +1,4 @@
 import { ValueSpec } from "../configTypes"
-import { Utils } from "../../util/utils"
 import { Value } from "./value"
 import { _ } from "../../util"
 import { Effects } from "../../types"
@@ -7,7 +6,6 @@ import { Parser, object } from "ts-matches"
 
 export type LazyBuildOptions<Store> = {
   effects: Effects
-  utils: Utils<any, Store>
 }
 export type LazyBuild<Store, ExpectedOut> = (
   options: LazyBuildOptions<Store>,
diff --git a/sdk/lib/config/configConstants.ts b/sdk/lib/config/configConstants.ts
index 13cfe32b9..aa0e024c9 100644
--- a/sdk/lib/config/configConstants.ts
+++ b/sdk/lib/config/configConstants.ts
@@ -1,4 +1,5 @@
 import { SmtpValue } from "../types"
+import { GetSystemSmtp } from "../util/GetSystemSmtp"
 import { email } from "../util/patterns"
 import { Config, ConfigSpecOf } from "./builder/config"
 import { Value } from "./builder/value"
@@ -47,8 +48,8 @@ export const customSmtp = Config.of<ConfigSpecOf<SmtpValue>, never>({
  * For service config. Gives users 3 options for SMTP: (1) disabled, (2) use system SMTP settings, (3) use custom SMTP settings
  */
 export const smtpConfig = Value.filteredUnion(
-  async ({ effects, utils }) => {
-    const smtp = await utils.getSystemSmtp().once()
+  async ({ effects }) => {
+    const smtp = await new GetSystemSmtp(effects).once()
     return smtp ? [] : ["system"]
   },
   {
diff --git a/sdk/lib/config/setupConfig.ts b/sdk/lib/config/setupConfig.ts
index 95f9fd1ac..8519eb358 100644
--- a/sdk/lib/config/setupConfig.ts
+++ b/sdk/lib/config/setupConfig.ts
@@ -2,7 +2,6 @@ import { Effects, ExpectedExports } from "../types"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import * as D from "./configDependencies"
 import { Config, ExtractConfigType } from "./builder/config"
-import { Utils, createUtils } from "../util/utils"
 import nullIfEmpty from "../util/nullIfEmpty"
 import { InterfaceReceipt } from "../interfaces/interfaceReceipt"
 import { InterfacesReceipt as InterfacesReceipt } from "../interfaces/setupInterfaces"
@@ -22,7 +21,6 @@ export type Save<
 > = (options: {
   effects: Effects
   input: ExtractConfigType<A> & Record<string, any>
-  utils: Utils<Manifest, Store>
   dependencies: D.ConfigDependencies<Manifest>
 }) => Promise<{
   dependenciesReceipt: DependenciesReceipt
@@ -38,7 +36,6 @@ export type Read<
     | Config<Record<string, any>, never>,
 > = (options: {
   effects: Effects
-  utils: Utils<Manifest, Store>
 }) => Promise<void | (ExtractConfigType<A> & Record<string, any>)>
 /**
  * We want to setup a config export with a get and set, this
@@ -72,7 +69,6 @@ export function setupConfig<
       const { restart } = await write({
         input: JSON.parse(JSON.stringify(input)),
         effects,
-        utils: createUtils(effects),
         dependencies: D.configDependenciesSet<Manifest>(),
       })
       if (restart) {
@@ -80,14 +76,10 @@ export function setupConfig<
       }
     }) as ExpectedExports.setConfig,
     getConfig: (async ({ effects }) => {
-      const myUtils = createUtils<Manifest, Store>(effects)
-      const configValue = nullIfEmpty(
-        (await read({ effects, utils: myUtils })) || null,
-      )
+      const configValue = nullIfEmpty((await read({ effects })) || null)
       return {
         spec: await spec.build({
           effects,
-          utils: myUtils as any,
         }),
         config: configValue,
       }
diff --git a/sdk/lib/dependencyConfig/DependencyConfig.ts b/sdk/lib/dependencyConfig/DependencyConfig.ts
index 10dcb4bd8..d7ce435ad 100644
--- a/sdk/lib/dependencyConfig/DependencyConfig.ts
+++ b/sdk/lib/dependencyConfig/DependencyConfig.ts
@@ -3,7 +3,6 @@ import {
   DeepPartial,
   Effects,
 } from "../types"
-import { Utils, createUtils } from "../util/utils"
 import { deepEqual } from "../util/deepEqual"
 import { deepMerge } from "../util/deepMerge"
 import { SDKManifest } from "../manifest/ManifestTypes"
@@ -29,7 +28,6 @@ export class DependencyConfig<
     readonly dependencyConfig: (options: {
       effects: Effects
       localConfig: Input
-      utils: Utils<Manifest, Store>
     }) => Promise<void | DeepPartial<RemoteConfig>>,
     readonly update: Update<
       void | DeepPartial<RemoteConfig>,
@@ -41,7 +39,6 @@ export class DependencyConfig<
     return this.dependencyConfig({
       localConfig: options.localConfig as Input,
       effects: options.effects,
-      utils: createUtils<Manifest, Store>(options.effects),
     })
   }
 }
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index 652aed94e..488ecdcf5 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -6,52 +6,59 @@ import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
 import { once } from "../util/once"
+import { Overlay } from "../util/Overlay"
 
 export function healthCheck(o: {
   effects: Effects
   name: string
+  imageId: string
   trigger?: Trigger
-  fn(): Promise<CheckResult> | CheckResult
+  fn(overlay: Overlay): Promise<CheckResult> | CheckResult
   onFirstSuccess?: () => unknown | Promise<unknown>
 }) {
   new Promise(async () => {
-    let currentValue: TriggerInput = {
-      hadSuccess: false,
-    }
-    const getCurrentValue = () => currentValue
-    const trigger = (o.trigger ?? defaultTrigger)(getCurrentValue)
-    const triggerFirstSuccess = once(() =>
-      Promise.resolve(
-        "onFirstSuccess" in o && o.onFirstSuccess
-          ? o.onFirstSuccess()
-          : undefined,
-      ),
-    )
-    for (
-      let res = await trigger.next();
-      !res.done;
-      res = await trigger.next()
-    ) {
-      try {
-        const { status, message } = await o.fn()
-        await o.effects.setHealth({
-          name: o.name,
-          status,
-          message,
-        })
-        currentValue.hadSuccess = true
-        currentValue.lastResult = "passing"
-        await triggerFirstSuccess().catch((err) => {
-          console.error(err)
-        })
-      } catch (e) {
-        await o.effects.setHealth({
-          name: o.name,
-          status: "failure",
-          message: asMessage(e),
-        })
-        currentValue.lastResult = "failure"
+    const overlay = await Overlay.of(o.effects, o.imageId)
+    try {
+      let currentValue: TriggerInput = {
+        hadSuccess: false,
+      }
+      const getCurrentValue = () => currentValue
+      const trigger = (o.trigger ?? defaultTrigger)(getCurrentValue)
+      const triggerFirstSuccess = once(() =>
+        Promise.resolve(
+          "onFirstSuccess" in o && o.onFirstSuccess
+            ? o.onFirstSuccess()
+            : undefined,
+        ),
+      )
+      for (
+        let res = await trigger.next();
+        !res.done;
+        res = await trigger.next()
+      ) {
+        try {
+          const { status, message } = await o.fn(overlay)
+          await o.effects.setHealth({
+            name: o.name,
+            status,
+            message,
+          })
+          currentValue.hadSuccess = true
+          currentValue.lastResult = "passing"
+          await triggerFirstSuccess().catch((err) => {
+            console.error(err)
+          })
+        } catch (e) {
+          await o.effects.setHealth({
+            name: o.name,
+            status: "failure",
+            message: asMessage(e),
+          })
+          currentValue.lastResult = "failure"
+        }
       }
+    } finally {
+      await overlay.destroy()
     }
   })
   return {} as HealthReceipt
diff --git a/sdk/lib/health/checkFns/checkPortListening.ts b/sdk/lib/health/checkFns/checkPortListening.ts
index a82b75fd4..89dcf89b3 100644
--- a/sdk/lib/health/checkFns/checkPortListening.ts
+++ b/sdk/lib/health/checkFns/checkPortListening.ts
@@ -1,7 +1,12 @@
 import { Effects } from "../../types"
-import { createUtils } from "../../util"
 import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
 import { CheckResult } from "./CheckResult"
+
+import { promisify } from "node:util"
+import * as CP from "node:child_process"
+
+const cpExec = promisify(CP.exec)
+const cpExecFile = promisify(CP.execFile)
 export function containsAddress(x: string, port: number) {
   const readPorts = x
     .split("\n")
@@ -28,20 +33,15 @@ export async function checkPortListening(
     timeout?: number
   },
 ): Promise<CheckResult> {
-  const utils = createUtils(effects)
   return Promise.race<CheckResult>([
     Promise.resolve().then(async () => {
       const hasAddress =
         containsAddress(
-          await utils.childProcess
-            .exec(`cat /proc/net/tcp`, {})
-            .then(stringFromStdErrOut),
+          await cpExec(`cat /proc/net/tcp`, {}).then(stringFromStdErrOut),
           port,
         ) ||
         containsAddress(
-          await utils.childProcess
-            .exec("cat /proc/net/udp", {})
-            .then(stringFromStdErrOut),
+          await cpExec("cat /proc/net/udp", {}).then(stringFromStdErrOut),
           port,
         )
       if (hasAddress) {
diff --git a/sdk/lib/health/checkFns/runHealthScript.ts b/sdk/lib/health/checkFns/runHealthScript.ts
index 659c787f8..5d69f5e17 100644
--- a/sdk/lib/health/checkFns/runHealthScript.ts
+++ b/sdk/lib/health/checkFns/runHealthScript.ts
@@ -1,5 +1,5 @@
-import { CommandType, Effects } from "../../types"
-import { createUtils } from "../../util"
+import { Effects } from "../../types"
+import { Overlay } from "../../util/Overlay"
 import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
 import { CheckResult } from "./CheckResult"
 import { timeoutPromise } from "./index"
@@ -13,7 +13,8 @@ import { timeoutPromise } from "./index"
  */
 export const runHealthScript = async (
   effects: Effects,
-  runCommand: string,
+  runCommand: string[],
+  overlay: Overlay,
   {
     timeout = 30000,
     errorMessage = `Error while running command: ${runCommand}`,
@@ -21,9 +22,8 @@ export const runHealthScript = async (
       `Have ran script ${runCommand} and the result: ${res}`,
   } = {},
 ): Promise<CheckResult> => {
-  const utils = createUtils(effects)
   const res = await Promise.race([
-    utils.childProcess.exec(runCommand, { timeout }).then(stringFromStdErrOut),
+    overlay.exec(runCommand),
     timeoutPromise(timeout),
   ]).catch((e) => {
     console.warn(errorMessage)
@@ -33,6 +33,6 @@ export const runHealthScript = async (
   })
   return {
     status: "passing",
-    message: message(res),
+    message: message(res.stdout.toString()),
   } as CheckResult
 }
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index 49d385207..2b22e2c83 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -1,7 +1,6 @@
 export { Daemons } from "./mainFn/Daemons"
 export { EmVer } from "./emverLite/mod"
 export { Overlay } from "./util/Overlay"
-export { Utils } from "./util/utils"
 export { StartSdk } from "./StartSdk"
 export { setupManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
diff --git a/sdk/lib/inits/migrations/Migration.ts b/sdk/lib/inits/migrations/Migration.ts
index 06e8e6e39..119271aea 100644
--- a/sdk/lib/inits/migrations/Migration.ts
+++ b/sdk/lib/inits/migrations/Migration.ts
@@ -1,6 +1,5 @@
 import { ManifestVersion, SDKManifest } from "../../manifest/ManifestTypes"
 import { Effects } from "../../types"
-import { Utils } from "../../util/utils"
 
 export class Migration<
   Manifest extends SDKManifest,
@@ -10,14 +9,8 @@ export class Migration<
   constructor(
     readonly options: {
       version: Version
-      up: (opts: {
-        effects: Effects
-        utils: Utils<Manifest, Store>
-      }) => Promise<void>
-      down: (opts: {
-        effects: Effects
-        utils: Utils<Manifest, Store>
-      }) => Promise<void>
+      up: (opts: { effects: Effects }) => Promise<void>
+      down: (opts: { effects: Effects }) => Promise<void>
     },
   ) {}
   static of<
@@ -26,23 +19,17 @@ export class Migration<
     Version extends ManifestVersion,
   >(options: {
     version: Version
-    up: (opts: {
-      effects: Effects
-      utils: Utils<Manifest, Store>
-    }) => Promise<void>
-    down: (opts: {
-      effects: Effects
-      utils: Utils<Manifest, Store>
-    }) => Promise<void>
+    up: (opts: { effects: Effects }) => Promise<void>
+    down: (opts: { effects: Effects }) => Promise<void>
   }) {
     return new Migration<Manifest, Store, Version>(options)
   }
 
-  async up(opts: { effects: Effects; utils: Utils<Manifest, Store> }) {
+  async up(opts: { effects: Effects }) {
     this.up(opts)
   }
 
-  async down(opts: { effects: Effects; utils: Utils<Manifest, Store> }) {
+  async down(opts: { effects: Effects }) {
     this.down(opts)
   }
 }
diff --git a/sdk/lib/inits/migrations/setupMigrations.ts b/sdk/lib/inits/migrations/setupMigrations.ts
index dabe3122c..288b2b9d7 100644
--- a/sdk/lib/inits/migrations/setupMigrations.ts
+++ b/sdk/lib/inits/migrations/setupMigrations.ts
@@ -1,7 +1,6 @@
 import { EmVer } from "../../emverLite/mod"
 import { SDKManifest } from "../../manifest/ManifestTypes"
 import { ExpectedExports } from "../../types"
-import { createUtils } from "../../util"
 import { once } from "../../util/once"
 import { Migration } from "./Migration"
 
@@ -32,13 +31,12 @@ export class Migrations<Manifest extends SDKManifest, Store> {
     effects,
     previousVersion,
   }: Parameters<ExpectedExports.init>[0]) {
-    const utils = createUtils<Manifest, Store>(effects)
     if (!!previousVersion) {
       const previousVersionEmVer = EmVer.parse(previousVersion)
       for (const [_, migration] of this.sortedMigrations()
         .filter((x) => x[0].greaterThan(previousVersionEmVer))
         .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
-        await migration.up({ effects, utils })
+        await migration.up({ effects })
       }
     }
   }
@@ -46,14 +44,13 @@ export class Migrations<Manifest extends SDKManifest, Store> {
     effects,
     nextVersion,
   }: Parameters<ExpectedExports.uninit>[0]) {
-    const utils = createUtils<Manifest, Store>(effects)
     if (!!nextVersion) {
       const nextVersionEmVer = EmVer.parse(nextVersion)
       const reversed = [...this.sortedMigrations()].reverse()
       for (const [_, migration] of reversed
         .filter((x) => x[0].greaterThan(nextVersionEmVer))
         .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
-        await migration.down({ effects, utils })
+        await migration.down({ effects })
       }
     }
   }
diff --git a/sdk/lib/inits/setupExports.ts b/sdk/lib/inits/setupExports.ts
index ec5e5eb1f..5f7c2b23f 100644
--- a/sdk/lib/inits/setupExports.ts
+++ b/sdk/lib/inits/setupExports.ts
@@ -1,10 +1,6 @@
 import { Effects, ExposeServicePaths, ExposeUiPaths } from "../types"
-import { Utils } from "../util/utils"
 
-export type SetupExports<Store> = (opts: {
-  effects: Effects
-  utils: Utils<any, Store>
-}) =>
+export type SetupExports<Store> = (opts: { effects: Effects }) =>
   | {
       ui: { [k: string]: ExposeUiPaths<Store> }
       services: ExposeServicePaths<Store>
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index f5581fb8d..2df688f18 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -1,7 +1,6 @@
 import { SetInterfaces } from "../interfaces/setupInterfaces"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { ExpectedExports, ExposeUiPaths, ExposeUiPathsAll } from "../types"
-import { createUtils } from "../util"
 import { Migrations } from "./migrations/setupMigrations"
 import { SetupExports } from "./setupExports"
 import { Install } from "./setupInstall"
@@ -19,18 +18,13 @@ export function setupInit<Manifest extends SDKManifest, Store>(
 } {
   return {
     init: async (opts) => {
-      const utils = createUtils<Manifest, Store>(opts.effects)
       await migrations.init(opts)
       await install.init(opts)
       await setInterfaces({
         ...opts,
         input: null,
-        utils,
-      })
-      const { services, ui } = await setupExports({
-        ...opts,
-        utils,
       })
+      const { services, ui } = await setupExports(opts)
       await opts.effects.exposeForDependents(services)
       await opts.effects.exposeUi(
         forExpose({
diff --git a/sdk/lib/inits/setupInstall.ts b/sdk/lib/inits/setupInstall.ts
index e49c0b545..3990be0ca 100644
--- a/sdk/lib/inits/setupInstall.ts
+++ b/sdk/lib/inits/setupInstall.ts
@@ -1,10 +1,8 @@
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { Effects, ExpectedExports } from "../types"
-import { Utils, createUtils } from "../util/utils"
 
 export type InstallFn<Manifest extends SDKManifest, Store> = (opts: {
   effects: Effects
-  utils: Utils<Manifest, Store>
 }) => Promise<void>
 export class Install<Manifest extends SDKManifest, Store> {
   private constructor(readonly fn: InstallFn<Manifest, Store>) {}
@@ -21,7 +19,6 @@ export class Install<Manifest extends SDKManifest, Store> {
     if (!previousVersion)
       await this.fn({
         effects,
-        utils: createUtils(effects),
       })
   }
 }
diff --git a/sdk/lib/inits/setupUninstall.ts b/sdk/lib/inits/setupUninstall.ts
index b411d2fc7..812848c8f 100644
--- a/sdk/lib/inits/setupUninstall.ts
+++ b/sdk/lib/inits/setupUninstall.ts
@@ -1,10 +1,8 @@
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { Effects, ExpectedExports } from "../types"
-import { Utils, createUtils } from "../util/utils"
 
 export type UninstallFn<Manifest extends SDKManifest, Store> = (opts: {
   effects: Effects
-  utils: Utils<Manifest, Store>
 }) => Promise<void>
 export class Uninstall<Manifest extends SDKManifest, Store> {
   private constructor(readonly fn: UninstallFn<Manifest, Store>) {}
@@ -21,7 +19,6 @@ export class Uninstall<Manifest extends SDKManifest, Store> {
     if (!nextVersion)
       await this.fn({
         effects,
-        utils: createUtils(effects),
       })
   }
 }
diff --git a/sdk/lib/interfaces/ServiceInterfaceBuilder.ts b/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
index c7b99b2d5..14eaee1d3 100644
--- a/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
+++ b/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
@@ -1,5 +1,5 @@
+import { ServiceInterfaceType } from "../StartSdk"
 import { Effects } from "../types"
-import { ServiceInterfaceType } from "../util/utils"
 import { Scheme } from "./Host"
 
 /**
diff --git a/sdk/lib/interfaces/setupInterfaces.ts b/sdk/lib/interfaces/setupInterfaces.ts
index 1514cabf3..5ad8d8a7d 100644
--- a/sdk/lib/interfaces/setupInterfaces.ts
+++ b/sdk/lib/interfaces/setupInterfaces.ts
@@ -1,7 +1,6 @@
 import { Config } from "../config/builder/config"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { AddressInfo, Effects } from "../types"
-import { Utils } from "../util/utils"
 import { AddressReceipt } from "./AddressReceipt"
 
 export type InterfacesReceipt = Array<AddressInfo[] & AddressReceipt>
@@ -10,11 +9,7 @@ export type SetInterfaces<
   Store,
   ConfigInput extends Record<string, any>,
   Output extends InterfacesReceipt,
-> = (opts: {
-  effects: Effects
-  input: null | ConfigInput
-  utils: Utils<Manifest, Store>
-}) => Promise<Output>
+> = (opts: { effects: Effects; input: null | ConfigInput }) => Promise<Output>
 export type SetupInterfaces = <
   Manifest extends SDKManifest,
   Store,
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 368c15c89..e537969fa 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -1,3 +1,4 @@
+import { NO_TIMEOUT, SIGKILL, SIGTERM, Signals } from "../StartSdk"
 import { HealthReceipt } from "../health/HealthReceipt"
 import { CheckResult } from "../health/checkFns"
 import { SDKManifest } from "../manifest/ManifestTypes"
@@ -5,8 +6,21 @@ import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
 import { DaemonReturned, Effects, ValidIfNoStupidEscape } from "../types"
-import { createUtils } from "../util"
-import { Signals } from "../util/utils"
+import { CommandOptions, MountOptions, Overlay } from "../util/Overlay"
+import { splitCommand } from "../util/splitCommand"
+
+import { promisify } from "node:util"
+import * as CP from "node:child_process"
+
+const cpExec = promisify(CP.exec)
+const cpExecFile = promisify(CP.execFile)
+async function psTree(pid: number, overlay: Overlay): Promise<number[]> {
+  const { stdout } = await cpExec(`pstree -p ${pid}`)
+  const regex: RegExp = /\((\d+)\)/g
+  return [...stdout.toString().matchAll(regex)].map(([_all, pid]) =>
+    parseInt(pid),
+  )
+}
 type Daemon<
   Manifest extends SDKManifest,
   Ids extends string,
@@ -26,6 +40,89 @@ type Daemon<
 }
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
+
+const runDaemon =
+  <Manifest extends SDKManifest>() =>
+  async <A extends string>(
+    effects: Effects,
+    imageId: Manifest["images"][number],
+    command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+    options: CommandOptions & {
+      mounts?: { path: string; options: MountOptions }[]
+      overlay?: Overlay
+    },
+  ): Promise<DaemonReturned> => {
+    const commands = splitCommand(command)
+    const overlay = options.overlay || (await Overlay.of(effects, imageId))
+    for (let mount of options.mounts || []) {
+      await overlay.mount(mount.options, mount.path)
+    }
+    const childProcess = await overlay.spawn(commands, {
+      env: options.env,
+    })
+    const answer = new Promise<null>((resolve, reject) => {
+      childProcess.stdout.on("data", (data: any) => {
+        console.log(data.toString())
+      })
+      childProcess.stderr.on("data", (data: any) => {
+        console.error(data.toString())
+      })
+
+      childProcess.on("exit", (code: any) => {
+        if (code === 0) {
+          return resolve(null)
+        }
+        return reject(new Error(`${commands[0]} exited with code ${code}`))
+      })
+    })
+
+    const pid = childProcess.pid
+    return {
+      async wait() {
+        const pids = pid ? await psTree(pid, overlay) : []
+        try {
+          return await answer
+        } finally {
+          for (const process of pids) {
+            cpExecFile("kill", [`-9`, String(process)]).catch((_) => {})
+          }
+        }
+      },
+      async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
+        const pids = pid ? await psTree(pid, overlay) : []
+        try {
+          childProcess.kill(signal)
+
+          if (timeout > NO_TIMEOUT) {
+            const didTimeout = await Promise.race([
+              new Promise((resolve) => setTimeout(resolve, timeout)).then(
+                () => true,
+              ),
+              answer.then(() => false),
+            ])
+            if (didTimeout) {
+              childProcess.kill(SIGKILL)
+            }
+          } else {
+            await answer
+          }
+        } finally {
+          await overlay.destroy()
+        }
+
+        try {
+          for (const process of pids) {
+            await cpExecFile("kill", [`-${signal}`, String(process)])
+          }
+        } finally {
+          for (const process of pids) {
+            cpExecFile("kill", [`-9`, String(process)]).catch((_) => {})
+          }
+        }
+      },
+    }
+  }
+
 /**
  * A class for defining and controlling the service daemons
 ```ts
@@ -104,9 +201,10 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
       )
       daemonsStarted[daemon.id] = requiredPromise.then(async () => {
         const { command, imageId } = daemon
-        const utils = createUtils<Manifest>(effects)
 
-        const child = utils.runDaemon(imageId, command, { env: daemon.env })
+        const child = runDaemon<Manifest>()(effects, imageId, command, {
+          env: daemon.env,
+        })
         let currentInput: TriggerInput = {}
         const getCurrentInput = () => currentInput
         const trigger = (daemon.ready.trigger ?? defaultTrigger)(
diff --git a/sdk/lib/mainFn/index.ts b/sdk/lib/mainFn/index.ts
index 58f0228b2..3da57d32f 100644
--- a/sdk/lib/mainFn/index.ts
+++ b/sdk/lib/mainFn/index.ts
@@ -1,12 +1,11 @@
-import { Effects, ExpectedExports } from "../types"
-import { createMainUtils } from "../util"
-import { Utils, createUtils } from "../util/utils"
+import { ExpectedExports } from "../types"
 import { Daemons } from "./Daemons"
 import "../interfaces/ServiceInterfaceBuilder"
 import "../interfaces/Origin"
 
 import "./Daemons"
 import { SDKManifest } from "../manifest/ManifestTypes"
+import { MainEffects } from "../StartSdk"
 
 /**
  * Used to ensure that the main function is running with the valid proofs.
@@ -20,16 +19,12 @@ import { SDKManifest } from "../manifest/ManifestTypes"
  */
 export const setupMain = <Manifest extends SDKManifest, Store>(
   fn: (o: {
-    effects: Effects
+    effects: MainEffects
     started(onTerm: () => PromiseLike<void>): PromiseLike<void>
-    utils: Utils<Manifest, Store, {}>
   }) => Promise<Daemons<Manifest, any>>,
 ): ExpectedExports.main => {
   return async (options) => {
-    const result = await fn({
-      ...options,
-      utils: createMainUtils<Manifest, Store>(options.effects),
-    })
+    const result = await fn(options)
     return result
   }
 }
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
index fe9d123ea..ef85ee366 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -4,6 +4,8 @@ import { List } from "../config/builder/list"
 import { Value } from "../config/builder/value"
 import { Variants } from "../config/builder/variants"
 import { ValueSpec } from "../config/configTypes"
+import { setupManifest } from "../manifest/setupManifest"
+import { StartSdk } from "../StartSdk"
 
 describe("builder tests", () => {
   test("text", async () => {
@@ -379,17 +381,61 @@ describe("values", () => {
       })
     })
     test("datetime", async () => {
-      const value = Value.dynamicDatetime<{ test: "a" }>(async ({ utils }) => {
-        ;async () => {
-          ;(await utils.store.getOwn("/test").once()) satisfies "a"
-        }
+      const sdk = StartSdk.of()
+        .withManifest(
+          setupManifest({
+            id: "testOutput",
+            title: "",
+            version: "1.0",
+            releaseNotes: "",
+            license: "",
+            replaces: [],
+            wrapperRepo: "",
+            upstreamRepo: "",
+            supportSite: "",
+            marketingSite: "",
+            donationUrl: null,
+            description: {
+              short: "",
+              long: "",
+            },
+            containers: {},
+            images: [],
+            volumes: [],
+            assets: [],
+            alerts: {
+              install: null,
+              update: null,
+              uninstall: null,
+              restore: null,
+              start: null,
+              stop: null,
+            },
+            dependencies: {
+              remoteTest: {
+                description: "",
+                requirement: { how: "", type: "opt-in" },
+                version: "1.0",
+              },
+            },
+          }),
+        )
+        .withStore<{ test: "a" }>()
+        .build(true)
 
-        return {
-          name: "Testing",
-          required: { default: null },
-          inputmode: "date",
-        }
-      })
+      const value = Value.dynamicDatetime<{ test: "a" }>(
+        async ({ effects }) => {
+          ;async () => {
+            ;(await sdk.store.getOwn(effects, "/test").once()) satisfies "a"
+          }
+
+          return {
+            name: "Testing",
+            required: { default: null },
+            inputmode: "date",
+          }
+        },
+      )
       const validator = value.validator
       validator.unsafeCast("2021-01-01")
       validator.unsafeCast(null)
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
index eec63bb8a..82372f61b 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/lib/test/host.test.ts
@@ -1,12 +1,11 @@
 import { ServiceInterfaceBuilder } from "../interfaces/ServiceInterfaceBuilder"
 import { Effects } from "../types"
-import { createUtils } from "../util"
+import { sdk } from "./output.sdk"
 
 describe("host", () => {
   test("Testing that the types work", () => {
     async function test(effects: Effects) {
-      const utils = createUtils<never, never>(effects)
-      const foo = utils.host.multi("foo")
+      const foo = sdk.host.multi(effects, "foo")
       const fooOrigin = await foo.bindPort(80, {
         protocol: "http" as const,
       })
diff --git a/sdk/lib/test/store.test.ts b/sdk/lib/test/store.test.ts
index 2ed8c4dfd..c41f3c85a 100644
--- a/sdk/lib/test/store.test.ts
+++ b/sdk/lib/test/store.test.ts
@@ -1,6 +1,5 @@
+import { MainEffects, StartSdk } from "../StartSdk"
 import { Effects } from "../types"
-import { createMainUtils } from "../util"
-import { createUtils } from "../util/utils"
 
 type Store = {
   config: {
@@ -12,26 +11,31 @@ const todo = <A>(): A => {
   throw new Error("not implemented")
 }
 const noop = () => {}
+
+const sdk = StartSdk.of()
+  .withManifest({} as Manifest)
+  .withStore<Store>()
+  .build(true)
+
 describe("Store", () => {
   test("types", async () => {
     ;async () => {
-      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn("/config", {
+      sdk.store.setOwn(todo<Effects>(), "/config", {
         someValue: "a",
       })
-      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn(
-        "/config/someValue",
-        "b",
-      )
-      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn("", {
+      sdk.store.setOwn(todo<Effects>(), "/config/someValue", "b")
+      sdk.store.setOwn(todo<Effects>(), "", {
         config: { someValue: "b" },
       })
-      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn(
+      sdk.store.setOwn(
+        todo<Effects>(),
         "/config/someValue",
 
         // @ts-expect-error Type is wrong for the setting value
         5,
       )
-      createUtils(todo<Effects>()).store.setOwn(
+      sdk.store.setOwn(
+        todo<Effects>(),
         // @ts-expect-error Path is wrong
         "/config/someVae3lue",
         "someValue",
@@ -52,49 +56,47 @@ describe("Store", () => {
         path: "/config/some2Value",
         value: "a",
       })
-      ;(await createMainUtils<Manifest, Store>(todo<Effects>())
-        .store.getOwn("/config/someValue")
+      ;(await sdk.store
+        .getOwn(todo<MainEffects>(), "/config/someValue")
         .const()) satisfies string
-      ;(await createMainUtils<Manifest, Store>(todo<Effects>())
-        .store.getOwn("/config")
+      ;(await sdk.store
+        .getOwn(todo<MainEffects>(), "/config")
         .const()) satisfies Store["config"]
-      await createMainUtils(todo<Effects>())
-        // @ts-expect-error Path is wrong
-        .store.getOwn("/config/somdsfeValue")
+      await sdk.store // @ts-expect-error Path is wrong
+        .getOwn(todo<MainEffects>(), "/config/somdsfeValue")
         .const()
       ///  ----------------- ERRORS -----------------
 
-      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn("", {
+      sdk.store.setOwn(todo<MainEffects>(), "", {
         // @ts-expect-error Type is wrong for the setting value
         config: { someValue: "notInAOrB" },
       })
-      createUtils<Manifest, Store>(todo<Effects>()).store.setOwn(
+      sdk.store.setOwn(
+        todo<MainEffects>(),
         "/config/someValue",
         // @ts-expect-error Type is wrong for the setting value
         "notInAOrB",
       )
-      ;(await createUtils<Manifest, Store>(todo<Effects>())
-        .store.getOwn("/config/someValue")
+      ;(await sdk.store
+        .getOwn(todo<Effects>(), "/config/someValue")
         // @ts-expect-error Const should normally not be callable
         .const()) satisfies string
-      ;(await createUtils<Manifest, Store>(todo<Effects>())
-        .store.getOwn("/config")
+      ;(await sdk.store
+        .getOwn(todo<Effects>(), "/config")
         // @ts-expect-error Const should normally not be callable
         .const()) satisfies Store["config"]
-      await createUtils<Manifest, Store>(todo<Effects>())
-        // @ts-expect-error Path is wrong
-        .store.getOwn("/config/somdsfeValue")
+      await sdk.store // @ts-expect-error Path is wrong
+        .getOwn("/config/somdsfeValue")
         // @ts-expect-error Const should normally not be callable
         .const()
 
       ///
-      ;(await createUtils<Manifest, Store>(todo<Effects>())
-        .store.getOwn("/config/someValue")
+      ;(await sdk.store
+        .getOwn(todo<MainEffects>(), "/config/someValue")
         // @ts-expect-error satisfies type is wrong
         .const()) satisfies number
-      ;(await createMainUtils(todo<Effects>())
-        // @ts-expect-error Path is wrong
-        .store.getOwn("/config/")
+      ;(await sdk.store // @ts-expect-error Path is wrong
+        .getOwn(todo<MainEffects>(), "/config/")
         .const()) satisfies Store["config"]
       ;(await todo<Effects>().store.get<Store, "/config/someValue">({
         path: "/config/someValue",
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index e3b9045e6..7fb59f194 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -1,11 +1,11 @@
 export * as configTypes from "./config/configTypes"
 import { AddSslOptions } from "../../core/startos/bindings/AddSslOptions"
+import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
 import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
 import { BindOptions, Scheme } from "./interfaces/Host"
 import { Daemons } from "./mainFn/Daemons"
 import { UrlString } from "./util/getServiceInterface"
-import { ServiceInterfaceType, Signals } from "./util/utils"
 
 export type ExportedAction = (options: {
   effects: Effects
@@ -59,7 +59,7 @@ export namespace ExpectedExports {
    * package represents, like running a bitcoind in a bitcoind-wrapper.
    */
   export type main = (options: {
-    effects: Effects
+    effects: MainEffects
     started(onTerm: () => PromiseLike<void>): PromiseLike<void>
   }) => Promise<Daemons<any, any>>
 
diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index d5ad048e3..3b7af1c41 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -1,3 +1,4 @@
+import { ServiceInterfaceType } from "../StartSdk"
 import {
   AddressInfo,
   Effects,
@@ -5,7 +6,6 @@ import {
   Hostname,
   HostnameInfo,
 } from "../types"
-import { ServiceInterfaceType } from "./utils"
 
 export type UrlString = string
 export type HostId = string
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index 81bd88da6..b3cab7183 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -7,7 +7,6 @@ import "./deepEqual"
 import "./deepMerge"
 import "./Overlay"
 import "./once"
-import * as utils from "./utils"
 import { SDKManifest } from "../manifest/ManifestTypes"
 
 // prettier-ignore
@@ -23,11 +22,6 @@ export const isKnownError = (e: unknown): e is T.KnownError =>
 
 declare const affine: unique symbol
 
-export const createUtils = utils.createUtils
-export const createMainUtils = <Manifest extends SDKManifest, Store>(
-  effects: T.Effects,
-) => createUtils<Manifest, Store, {}>(effects)
-
 type NeverPossible = { [affine]: string }
 export type NoAny<A> = NeverPossible extends A
   ? keyof NeverPossible extends keyof A
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
deleted file mode 100644
index 9d424888e..000000000
--- a/sdk/lib/util/utils.ts
+++ /dev/null
@@ -1,310 +0,0 @@
-import nullIfEmpty from "./nullIfEmpty"
-import {
-  CheckResult,
-  checkPortListening,
-  checkWebUrl,
-} from "../health/checkFns"
-import {
-  DaemonReturned,
-  Effects,
-  EnsureStorePath,
-  ExtractStore,
-  ServiceInterfaceId,
-  PackageId,
-  ValidIfNoStupidEscape,
-} from "../types"
-import { GetSystemSmtp } from "./GetSystemSmtp"
-import { GetStore, getStore } from "../store/getStore"
-import {
-  MountDependenciesOut,
-  mountDependencies,
-} from "../dependency/mountDependencies"
-import {
-  ManifestId,
-  VolumeName,
-  NamedPath,
-  Path,
-} from "../dependency/setupDependencyMounts"
-import { MultiHost, Scheme, SingleHost, StaticHost } from "../interfaces/Host"
-import { ServiceInterfaceBuilder } from "../interfaces/ServiceInterfaceBuilder"
-import { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
-import {
-  GetServiceInterfaces,
-  getServiceInterfaces,
-} from "./getServiceInterfaces"
-import * as CP from "node:child_process"
-import { promisify } from "node:util"
-import { splitCommand } from "./splitCommand"
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { MountOptions, Overlay, CommandOptions } from "./Overlay"
-export type Signals = NodeJS.Signals
-
-export const SIGTERM: Signals = "SIGTERM"
-export const SIGKILL: Signals = "SIGTERM"
-export const NO_TIMEOUT = -1
-
-const childProcess = {
-  exec: promisify(CP.exec),
-  execFile: promisify(CP.execFile),
-}
-const cp = childProcess
-
-export type ServiceInterfaceType = "ui" | "p2p" | "api"
-
-export type Utils<
-  Manifest extends SDKManifest,
-  Store,
-  WrapperOverWrite = { const: never },
-> = {
-  childProcess: typeof childProcess
-  createInterface: (options: {
-    name: string
-    id: string
-    description: string
-    hasPrimary: boolean
-    disabled: boolean
-    type: ServiceInterfaceType
-    username: null | string
-    path: string
-    search: Record<string, string>
-    schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
-    masked: boolean
-  }) => ServiceInterfaceBuilder
-  getSystemSmtp: () => GetSystemSmtp & WrapperOverWrite
-  host: {
-    static: (id: string) => StaticHost
-    single: (id: string) => SingleHost
-    multi: (id: string) => MultiHost
-  }
-  mountDependencies: <
-    In extends
-      | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
-      | Record<VolumeName, Record<NamedPath, Path>>
-      | Record<NamedPath, Path>
-      | Path,
-  >(
-    value: In,
-  ) => Promise<MountDependenciesOut<In>>
-  serviceInterface: {
-    getOwn: (id: ServiceInterfaceId) => GetServiceInterface & WrapperOverWrite
-    get: (opts: {
-      id: ServiceInterfaceId
-      packageId: PackageId
-    }) => GetServiceInterface & WrapperOverWrite
-    getAllOwn: () => GetServiceInterfaces & WrapperOverWrite
-    getAll: (opts: {
-      packageId: PackageId
-    }) => GetServiceInterfaces & WrapperOverWrite
-  }
-  nullIfEmpty: typeof nullIfEmpty
-  runCommand: <A extends string>(
-    imageId: Manifest["images"][number],
-    command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-    options: CommandOptions & {
-      mounts?: { path: string; options: MountOptions }[]
-    },
-  ) => Promise<{ stdout: string | Buffer; stderr: string | Buffer }>
-  runDaemon: <A extends string>(
-    imageId: Manifest["images"][number],
-    command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-    options: CommandOptions & {
-      mounts?: { path: string; options: MountOptions }[]
-      overlay?: Overlay
-    },
-  ) => Promise<DaemonReturned>
-  store: {
-    get: <Path extends string>(
-      packageId: string,
-      path: EnsureStorePath<Store, Path>,
-    ) => GetStore<Store, Path> & WrapperOverWrite
-    getOwn: <Path extends string>(
-      path: EnsureStorePath<Store, Path>,
-    ) => GetStore<Store, Path> & WrapperOverWrite
-    setOwn: <Path extends string | never>(
-      path: EnsureStorePath<Store, Path>,
-      value: ExtractStore<Store, Path>,
-    ) => Promise<void>
-  }
-}
-export const createUtils = <
-  Manifest extends SDKManifest,
-  Store = never,
-  WrapperOverWrite = { const: never },
->(
-  effects: Effects,
-): Utils<Manifest, Store, WrapperOverWrite> => {
-  return {
-    createInterface: (options: {
-      name: string
-      id: string
-      description: string
-      hasPrimary: boolean
-      disabled: boolean
-      type: ServiceInterfaceType
-      username: null | string
-      path: string
-      search: Record<string, string>
-      schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
-      masked: boolean
-    }) => new ServiceInterfaceBuilder({ ...options, effects }),
-    childProcess,
-    getSystemSmtp: () =>
-      new GetSystemSmtp(effects) as GetSystemSmtp & WrapperOverWrite,
-
-    host: {
-      static: (id: string) => new StaticHost({ id, effects }),
-      single: (id: string) => new SingleHost({ id, effects }),
-      multi: (id: string) => new MultiHost({ id, effects }),
-    },
-    nullIfEmpty,
-
-    serviceInterface: {
-      getOwn: (id: ServiceInterfaceId) =>
-        getServiceInterface(effects, {
-          id,
-          packageId: null,
-        }) as GetServiceInterface & WrapperOverWrite,
-      get: (opts: { id: ServiceInterfaceId; packageId: PackageId }) =>
-        getServiceInterface(effects, opts) as GetServiceInterface &
-          WrapperOverWrite,
-      getAllOwn: () =>
-        getServiceInterfaces(effects, {
-          packageId: null,
-        }) as GetServiceInterfaces & WrapperOverWrite,
-      getAll: (opts: { packageId: PackageId }) =>
-        getServiceInterfaces(effects, opts) as GetServiceInterfaces &
-          WrapperOverWrite,
-    },
-    store: {
-      get: <Path extends string = never>(
-        packageId: string,
-        path: EnsureStorePath<Store, Path>,
-      ) =>
-        getStore<Store, Path>(effects, path as any, {
-          packageId,
-        }) as any,
-      getOwn: <Path extends string>(path: EnsureStorePath<Store, Path>) =>
-        getStore<Store, Path>(effects, path as any) as any,
-      setOwn: <Path extends string | never>(
-        path: EnsureStorePath<Store, Path>,
-        value: ExtractStore<Store, Path>,
-      ) => effects.store.set<Store, Path>({ value, path: path as any }),
-    },
-
-    runCommand: async <A extends string>(
-      imageId: Manifest["images"][number],
-      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-      options: CommandOptions & {
-        mounts?: { path: string; options: MountOptions }[]
-      },
-    ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
-      const commands = splitCommand(command)
-      const overlay = await Overlay.of(effects, imageId)
-      try {
-        for (let mount of options.mounts || []) {
-          await overlay.mount(mount.options, mount.path)
-        }
-        return await overlay.exec(commands)
-      } finally {
-        await overlay.destroy()
-      }
-    },
-    runDaemon: async <A extends string>(
-      imageId: Manifest["images"][number],
-      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-      options: CommandOptions & {
-        mounts?: { path: string; options: MountOptions }[]
-        overlay?: Overlay
-      },
-    ): Promise<DaemonReturned> => {
-      const commands = splitCommand(command)
-      const overlay = options.overlay || (await Overlay.of(effects, imageId))
-      for (let mount of options.mounts || []) {
-        await overlay.mount(mount.options, mount.path)
-      }
-      const childProcess = await overlay.spawn(commands, {
-        env: options.env,
-      })
-      const answer = new Promise<null>((resolve, reject) => {
-        childProcess.stdout.on("data", (data: any) => {
-          console.log(data.toString())
-        })
-        childProcess.stderr.on("data", (data: any) => {
-          console.error(data.toString())
-        })
-
-        childProcess.on("exit", (code: any) => {
-          if (code === 0) {
-            return resolve(null)
-          }
-          return reject(new Error(`${commands[0]} exited with code ${code}`))
-        })
-      })
-
-      const pid = childProcess.pid
-      return {
-        async wait() {
-          const pids = pid ? await psTree(pid, overlay) : []
-          try {
-            return await answer
-          } finally {
-            for (const process of pids) {
-              cp.execFile("kill", [`-9`, String(process)]).catch((_) => {})
-            }
-          }
-        },
-        async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
-          const pids = pid ? await psTree(pid, overlay) : []
-          try {
-            childProcess.kill(signal)
-
-            if (timeout > NO_TIMEOUT) {
-              const didTimeout = await Promise.race([
-                new Promise((resolve) => setTimeout(resolve, timeout)).then(
-                  () => true,
-                ),
-                answer.then(() => false),
-              ])
-              if (didTimeout) {
-                childProcess.kill(SIGKILL)
-              }
-            } else {
-              await answer
-            }
-          } finally {
-            await overlay.destroy()
-          }
-
-          try {
-            for (const process of pids) {
-              await cp.execFile("kill", [`-${signal}`, String(process)])
-            }
-          } finally {
-            for (const process of pids) {
-              cp.execFile("kill", [`-9`, String(process)]).catch((_) => {})
-            }
-          }
-        },
-      }
-    },
-
-    mountDependencies: <
-      In extends
-        | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
-        | Record<VolumeName, Record<NamedPath, Path>>
-        | Record<NamedPath, Path>
-        | Path,
-    >(
-      value: In,
-    ) => mountDependencies(effects, value),
-  }
-}
-function noop(): void {}
-
-async function psTree(pid: number, overlay: Overlay): Promise<number[]> {
-  const { stdout } = await childProcess.exec(`pstree -p ${pid}`)
-  const regex: RegExp = /\((\d+)\)/g
-  return [...stdout.toString().matchAll(regex)].map(([_all, pid]) =>
-    parseInt(pid),
-  )
-}

From 3c6c0b253de875e121a6959a5ce722538d5c62af Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 18 Mar 2024 15:14:36 -0600
Subject: [PATCH 068/341] move mounts to daemons constructor

---
 sdk/lib/StartSdk.ts                         |   2 -
 sdk/lib/dependency/mountDependencies.ts     |  43 -------
 sdk/lib/dependency/setupDependencyMounts.ts |  72 -----------
 sdk/lib/mainFn/Daemons.ts                   |   7 +-
 sdk/lib/mainFn/Mounts.ts                    | 126 ++++++++++++++++++++
 sdk/lib/test/mountDependencies.test.ts      | 125 -------------------
 sdk/lib/types.ts                            |   2 +-
 sdk/lib/util/Overlay.ts                     |  19 ++-
 sdk/lib/util/utils.ts                       |  29 -----
 9 files changed, 149 insertions(+), 276 deletions(-)
 delete mode 100644 sdk/lib/dependency/mountDependencies.ts
 delete mode 100644 sdk/lib/dependency/setupDependencyMounts.ts
 create mode 100644 sdk/lib/mainFn/Mounts.ts
 delete mode 100644 sdk/lib/test/mountDependencies.test.ts

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 85f157aa9..938de5fbb 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -46,7 +46,6 @@ import { setupMain } from "./mainFn"
 import { defaultTrigger } from "./trigger/defaultTrigger"
 import { changeOnFirstSuccess, cooldownTrigger } from "./trigger"
 import setupConfig, { Read, Save } from "./config/setupConfig"
-import { setupDependencyMounts } from "./dependency/setupDependencyMounts"
 import {
   InterfacesReceipt,
   SetInterfaces,
@@ -170,7 +169,6 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         },
       ) => setupDependencyConfig<Store, Input, Manifest>(config, autoConfigs),
       setupExports: (fn: SetupExports<Store>) => fn,
-      setupDependencyMounts,
       setupInit: (
         migrations: Migrations<Manifest, Store>,
         install: Install<Manifest, Store>,
diff --git a/sdk/lib/dependency/mountDependencies.ts b/sdk/lib/dependency/mountDependencies.ts
deleted file mode 100644
index 31f9cdadc..000000000
--- a/sdk/lib/dependency/mountDependencies.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Effects } from "../types"
-import { _ } from "../util"
-import {
-  Path,
-  ManifestId,
-  VolumeName,
-  NamedPath,
-  matchPath,
-} from "./setupDependencyMounts"
-
-export type MountDependenciesOut<A> = _<
-  // prettier-ignore
-  A extends Path ? string : A extends Record<string, unknown> ? {
-    [P in keyof A]: MountDependenciesOut<A[P]>;
-  } : never
->
-export async function mountDependencies<
-  In extends
-    | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
-    | Record<VolumeName, Record<NamedPath, Path>>
-    | Record<NamedPath, Path>
-    | Path,
->(effects: Effects, value: In): Promise<MountDependenciesOut<In>> {
-  if (matchPath.test(value)) {
-    const mountPath = `${value.manifestId}/${value.volume}/${value.name}`
-
-    return (await effects.mount({
-      location: mountPath,
-      target: {
-        packageId: value.manifestId,
-        path: value.path,
-        readonly: value.readonly,
-        volumeId: value.volume,
-      },
-    })) as MountDependenciesOut<In>
-  }
-  return Object.fromEntries(
-    Object.entries(value).map(([key, value]) => [
-      key,
-      mountDependencies(effects, value),
-    ]),
-  ) as Record<string, unknown> as MountDependenciesOut<In>
-}
diff --git a/sdk/lib/dependency/setupDependencyMounts.ts b/sdk/lib/dependency/setupDependencyMounts.ts
deleted file mode 100644
index 15e2ca1a3..000000000
--- a/sdk/lib/dependency/setupDependencyMounts.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { boolean, object, string } from "ts-matches"
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { deepMerge } from "../util/deepMerge"
-
-export type VolumeName = string
-export type NamedPath = string
-export type ManifestId = string
-
-export const matchPath = object({
-  name: string,
-  volume: string,
-  path: string,
-  manifestId: string,
-  readonly: boolean,
-})
-export type Path = typeof matchPath._TYPE
-export type BuildPath<
-  ManifestId extends string,
-  VolumeId extends string,
-  PathName extends string,
-  Value extends Path,
-> = {
-  [PId in ManifestId]: {
-    [V in VolumeId]: {
-      [N in PathName]: Value
-    }
-  }
-}
-class SetupDependencyMounts<Building> {
-  private constructor(readonly building: Building) {}
-
-  static of() {
-    return new SetupDependencyMounts({})
-  }
-
-  addPath<
-    Name extends string,
-    Volume extends M["volumes"][0] & string,
-    Path extends string,
-    ManifestId extends M["id"],
-    M extends SDKManifest,
-  >(addPath: {
-    name: Name
-    volume: Volume
-    path: Path
-    manifest: M
-    readonly: boolean
-  }) {
-    const { manifest, ...restPath } = addPath
-    const newPath = {
-      ...restPath,
-      manifestId: manifest.id as ManifestId,
-    } as const
-    type NewBuilding = Building &
-      BuildPath<ManifestId, Volume, Name, typeof newPath>
-    const building = deepMerge(this.building, {
-      [newPath.manifestId]: {
-        [newPath.volume]: {
-          [newPath.name]: newPath,
-        },
-      },
-    }) as NewBuilding
-    return new SetupDependencyMounts(building)
-  }
-  build() {
-    return this.building
-  }
-}
-
-export function setupDependencyMounts() {
-  return SetupDependencyMounts.of()
-}
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 368c15c89..442ef7c46 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -7,6 +7,7 @@ import { defaultTrigger } from "../trigger/defaultTrigger"
 import { DaemonReturned, Effects, ValidIfNoStupidEscape } from "../types"
 import { createUtils } from "../util"
 import { Signals } from "../util/utils"
+import { Mounts } from "./Mounts"
 type Daemon<
   Manifest extends SDKManifest,
   Ids extends string,
@@ -16,6 +17,7 @@ type Daemon<
   id: "" extends Id ? never : Id
   command: ValidIfNoStupidEscape<Command> | [string, ...string[]]
   imageId: Manifest["images"][number]
+  mounts: Mounts<Manifest>
   env?: Record<string, string>
   ready: {
     display: string | null
@@ -106,7 +108,10 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
         const { command, imageId } = daemon
         const utils = createUtils<Manifest>(effects)
 
-        const child = utils.runDaemon(imageId, command, { env: daemon.env })
+        const child = utils.runDaemon(imageId, command, {
+          env: daemon.env,
+          mounts: daemon.mounts.build(),
+        })
         let currentInput: TriggerInput = {}
         const getCurrentInput = () => currentInput
         const trigger = (daemon.ready.trigger ?? defaultTrigger)(
diff --git a/sdk/lib/mainFn/Mounts.ts b/sdk/lib/mainFn/Mounts.ts
new file mode 100644
index 000000000..eeedc79c6
--- /dev/null
+++ b/sdk/lib/mainFn/Mounts.ts
@@ -0,0 +1,126 @@
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Effects } from "../types"
+import { MountOptions } from "../util/Overlay"
+
+type MountArray = { path: string; options: MountOptions }[]
+
+export class Mounts<Manifest extends SDKManifest> {
+  private constructor(
+    readonly volumes: {
+      id: Manifest["volumes"][number]
+      subpath: string | null
+      mountpoint: string
+      readonly: boolean
+    }[],
+    readonly assets: {
+      id: Manifest["assets"][number]
+      subpath: string | null
+      mountpoint: string
+    }[],
+    readonly dependencies: {
+      dependencyId: string
+      volumeId: string
+      subpath: string | null
+      mountpoint: string
+      readonly: boolean
+    }[],
+  ) {}
+
+  static of<Manifest extends SDKManifest>() {
+    return new Mounts<Manifest>([], [], [])
+  }
+
+  addVolume(
+    id: Manifest["volumes"][number],
+    subpath: string | null,
+    mountpoint: string,
+    readonly: boolean,
+  ) {
+    this.volumes.push({
+      id,
+      subpath,
+      mountpoint,
+      readonly,
+    })
+    return this
+  }
+
+  addAssets(
+    id: Manifest["assets"][number],
+    subpath: string | null,
+    mountpoint: string,
+  ) {
+    this.assets.push({
+      id,
+      subpath,
+      mountpoint,
+    })
+    return this
+  }
+
+  addDependency<DependencyManifest extends SDKManifest>(
+    dependencyId: keyof Manifest["dependencies"] & string,
+    volumeId: DependencyManifest["volumes"][number],
+    subpath: string | null,
+    mountpoint: string,
+    readonly: boolean,
+  ) {
+    this.dependencies.push({
+      dependencyId,
+      volumeId,
+      subpath,
+      mountpoint,
+      readonly,
+    })
+    return this
+  }
+
+  build(): MountArray {
+    const mountpoints = new Set()
+    for (let mountpoint of this.volumes
+      .map((v) => v.mountpoint)
+      .concat(this.assets.map((a) => a.mountpoint))
+      .concat(this.dependencies.map((d) => d.mountpoint))) {
+      if (mountpoints.has(mountpoint)) {
+        throw new Error(
+          `cannot mount more than once to mountpoint ${mountpoint}`,
+        )
+      }
+      mountpoints.add(mountpoint)
+    }
+    return ([] as MountArray)
+      .concat(
+        this.volumes.map((v) => ({
+          path: v.mountpoint,
+          options: {
+            type: "volume",
+            id: v.id,
+            subpath: v.subpath,
+            readonly: v.readonly,
+          },
+        })),
+      )
+      .concat(
+        this.assets.map((a) => ({
+          path: a.mountpoint,
+          options: {
+            type: "assets",
+            id: a.id,
+            subpath: a.subpath,
+          },
+        })),
+      )
+      .concat(
+        this.dependencies.map((d) => ({
+          path: d.mountpoint,
+          options: {
+            type: "pointer",
+            packageId: d.dependencyId,
+            volumeId: d.volumeId,
+            subpath: d.subpath,
+            readonly: d.readonly,
+          },
+        })),
+      )
+  }
+}
diff --git a/sdk/lib/test/mountDependencies.test.ts b/sdk/lib/test/mountDependencies.test.ts
deleted file mode 100644
index 84e76aa54..000000000
--- a/sdk/lib/test/mountDependencies.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { setupManifest } from "../manifest/setupManifest"
-import { mountDependencies } from "../dependency/mountDependencies"
-import {
-  BuildPath,
-  setupDependencyMounts,
-} from "../dependency/setupDependencyMounts"
-
-describe("mountDependencies", () => {
-  const clnManifest = setupManifest({
-    id: "cln",
-    title: "",
-    version: "1",
-    releaseNotes: "",
-    license: "",
-    replaces: [],
-    wrapperRepo: "",
-    upstreamRepo: "",
-    supportSite: "",
-    marketingSite: "",
-    donationUrl: null,
-    description: {
-      short: "",
-      long: "",
-    },
-    assets: [],
-    images: [],
-    volumes: ["main"],
-    alerts: {
-      install: null,
-      update: null,
-      uninstall: null,
-      restore: null,
-      start: null,
-      stop: null,
-    },
-    dependencies: {},
-  })
-  const clnManifestVolumes = clnManifest.volumes
-  const lndManifest = setupManifest({
-    id: "lnd",
-    title: "",
-    version: "1",
-    releaseNotes: "",
-    license: "",
-    replaces: [],
-    wrapperRepo: "",
-    upstreamRepo: "",
-    supportSite: "",
-    marketingSite: "",
-    donationUrl: null,
-    description: {
-      short: "",
-      long: "",
-    },
-    assets: [],
-    images: [],
-    volumes: ["main2"],
-    alerts: {
-      install: null,
-      update: null,
-      uninstall: null,
-      restore: null,
-      start: null,
-      stop: null,
-    },
-    dependencies: {},
-  })
-  clnManifest.id
-
-  test("Types work", () => {
-    const dependencyMounts = setupDependencyMounts()
-      .addPath({
-        name: "root",
-        volume: "main",
-        path: "/",
-        manifest: clnManifest,
-        readonly: true,
-      })
-      .addPath({
-        name: "root",
-        manifest: lndManifest,
-        volume: "main2",
-        path: "/",
-        readonly: true,
-      })
-      .addPath({
-        name: "root",
-        manifest: lndManifest,
-        // @ts-expect-error Expect that main will throw because it is not in the thing
-        volume: "main",
-        path: "/",
-        readonly: true,
-      })
-      .build()
-    ;() => {
-      const test = mountDependencies(
-        null as any,
-        dependencyMounts,
-      ) satisfies Promise<{
-        cln: {
-          main: {
-            root: string
-          }
-        }
-        lnd: {
-          main2: {
-            root: string
-          }
-        }
-      }>
-      const test2 = mountDependencies(
-        null as any,
-        dependencyMounts.cln,
-      ) satisfies Promise<{
-        main: { root: string }
-      }>
-      const test3 = mountDependencies(
-        null as any,
-        dependencyMounts.cln.main,
-      ) satisfies Promise<{
-        root: string
-      }>
-    }
-  })
-})
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index d863fe3d1..d9215cb1b 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -500,7 +500,7 @@ export type Effects = {
     target: {
       packageId: string
       volumeId: string
-      path: string
+      subpath: string | null
       readonly: boolean
     }
   }): Promise<string>
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 36dbaead5..7f243d7d1 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -32,15 +32,25 @@ export class Overlay {
       ? `${this.rootfs}${path}`
       : `${this.rootfs}/${path}`
     if (options.type === "volume") {
+      const subpath = options.subpath
+        ? options.subpath.startsWith("/")
+          ? options.subpath
+          : `/${options.subpath}`
+        : "/"
       await execFile("mount", [
         "--bind",
-        `/media/startos/volumes/${options.id}`,
+        `/media/startos/volumes/${options.id}${subpath}`,
         path,
       ])
     } else if (options.type === "assets") {
+      const subpath = options.subpath
+        ? options.subpath.startsWith("/")
+          ? options.subpath
+          : `/${options.subpath}`
+        : "/"
       await execFile("mount", [
         "--bind",
-        `/media/startos/assets/${options.id}`,
+        `/media/startos/assets/${options.id}${subpath}`,
         path,
       ])
     } else if (options.type === "pointer") {
@@ -140,17 +150,20 @@ export type MountOptions =
 export type MountOptionsVolume = {
   type: "volume"
   id: string
+  subpath: string | null
+  readonly: boolean
 }
 
 export type MountOptionsAssets = {
   type: "assets"
   id: string
+  subpath: string | null
 }
 
 export type MountOptionsPointer = {
   type: "pointer"
   packageId: string
   volumeId: string
-  path: string
+  subpath: string | null
   readonly: boolean
 }
diff --git a/sdk/lib/util/utils.ts b/sdk/lib/util/utils.ts
index cc18c7714..d56f22305 100644
--- a/sdk/lib/util/utils.ts
+++ b/sdk/lib/util/utils.ts
@@ -15,16 +15,6 @@ import {
 } from "../types"
 import { GetSystemSmtp } from "./GetSystemSmtp"
 import { GetStore, getStore } from "../store/getStore"
-import {
-  MountDependenciesOut,
-  mountDependencies,
-} from "../dependency/mountDependencies"
-import {
-  ManifestId,
-  VolumeName,
-  NamedPath,
-  Path,
-} from "../dependency/setupDependencyMounts"
 import { MultiHost, Scheme, SingleHost, StaticHost } from "../interfaces/Host"
 import { ServiceInterfaceBuilder } from "../interfaces/ServiceInterfaceBuilder"
 import { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
@@ -93,15 +83,6 @@ export type Utils<
     single: (id: string) => SingleHost
     multi: (id: string) => MultiHost
   }
-  mountDependencies: <
-    In extends
-      | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
-      | Record<VolumeName, Record<NamedPath, Path>>
-      | Record<NamedPath, Path>
-      | Path,
-  >(
-    value: In,
-  ) => Promise<MountDependenciesOut<In>>
   serviceInterface: {
     getOwn: (id: ServiceInterfaceId) => GetServiceInterface & WrapperOverWrite
     get: (opts: {
@@ -306,16 +287,6 @@ export const createUtils = <
     },
     checkPortListening: checkPortListening.bind(null, effects),
     checkWebUrl: checkWebUrl.bind(null, effects),
-
-    mountDependencies: <
-      In extends
-        | Record<ManifestId, Record<VolumeName, Record<NamedPath, Path>>>
-        | Record<VolumeName, Record<NamedPath, Path>>
-        | Record<NamedPath, Path>
-        | Path,
-    >(
-      value: In,
-    ) => mountDependencies(effects, value),
   }
 }
 function noop(): void {}

From 3a3df9699606eefce5baf4f776a7f784dddf7fcf Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 18 Mar 2024 15:20:17 -0600
Subject: [PATCH 069/341] fix: Test

---
 core/startos/bindings/MountTarget.ts               | 2 +-
 core/startos/src/service/service_effect_handler.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/startos/bindings/MountTarget.ts b/core/startos/bindings/MountTarget.ts
index 41c026deb..6cbee7aa6 100644
--- a/core/startos/bindings/MountTarget.ts
+++ b/core/startos/bindings/MountTarget.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface MountTarget { packageId: string, volumeId: string, path: string, readonly: boolean, }
\ No newline at end of file
+export interface MountTarget { packageId: string, volumeId: string, subpath: string | null, readonly: boolean, }
\ No newline at end of file
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index e67177998..f84876afa 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -316,7 +316,7 @@ struct MountTarget {
     #[ts(type = "string")]
     package_id: PackageId,
     volume_id: String,
-    path: String,
+    subpath: Option<String>,
     readonly: bool,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]

From 962e3d8e560c3251e2162a9c23cb42ad0549c62f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 18 Mar 2024 15:24:20 -0600
Subject: [PATCH 070/341] more specific rust type

---
 core/startos/src/service/service_effect_handler.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index f84876afa..df332f970 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -9,7 +9,7 @@ use clap::builder::ValueParserFactory;
 use clap::Parser;
 use imbl::OrdMap;
 use imbl_value::{json, InternedString};
-use models::{ActionId, HealthCheckId, ImageId, InvalidId, PackageId};
+use models::{ActionId, HealthCheckId, ImageId, PackageId, VolumeId};
 use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -315,8 +315,9 @@ struct ReverseProxyParams {
 struct MountTarget {
     #[ts(type = "string")]
     package_id: PackageId,
-    volume_id: String,
-    subpath: Option<String>,
+    #[ts(type = "string")]
+    volume_id: VolumeId,
+    subpath: Option<PathBuf>,
     readonly: bool,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]

From a0ce7f38e744991877d6727664556c328aa857a8 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 18 Mar 2024 15:28:33 -0600
Subject: [PATCH 071/341] chore: Add in the thing to do the volumes correctly

---
 sdk/lib/StartSdk.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 1847ed508..b3b417802 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -335,10 +335,11 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       },
 
       Backups: {
-        volumes: (...volumeNames: Array<keyof Manifest["volumes"] & string>) =>
-          Backups.volumes<Manifest>(...volumeNames),
+        volumes: (
+          ...volumeNames: Array<Manifest["volumes"][number] & string>
+        ) => Backups.volumes<Manifest>(...volumeNames),
         addSets: (
-          ...options: BackupSet<keyof Manifest["volumes"] & string>[]
+          ...options: BackupSet<Manifest["volumes"][number] & string>[]
         ) => Backups.addSets<Manifest>(...options),
         withOptions: (options?: Partial<BackupOptions>) =>
           Backups.with_options<Manifest>(options),

From c8be701f0e6cb4c7d309f16320d6ff91dd2b1f9a Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 18 Mar 2024 16:23:09 -0600
Subject: [PATCH 072/341] chore: Add in the mounts

---
 sdk/lib/StartSdk.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index b3b417802..424470608 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -71,6 +71,7 @@ import { getServiceInterfaces } from "./util/getServiceInterfaces"
 import { getStore } from "./store/getStore"
 import { CommandOptions, MountOptions, Overlay } from "./util/Overlay"
 import { splitCommand } from "./util/splitCommand"
+import { Mounts } from "./mainFn/Mounts"
 
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
@@ -239,6 +240,11 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         )
       },
 
+      Mounts: {
+        of() {
+          return Mounts.of<Manifest>()
+        },
+      },
       HealthCheck: {
         of: healthCheck,
       },

From cc38dab76fc893fe5a97f53fd0c50f7ee2706e43 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Tue, 19 Mar 2024 08:38:04 -0600
Subject: [PATCH 073/341] Rework PackageDataEntry for new strategy (#2573)

* rework PackageDataEntry for new strategy

* fix type error

* fix issues with manifest fetching

* mock installs working
---
 web/package-lock.json                         |    2 +-
 .../ui/src/app/app/menu/menu.component.ts     |   22 +-
 .../components/status/status.component.html   |    9 +-
 .../status/status.component.module.ts         |    4 +-
 .../app/components/status/status.component.ts |    4 +-
 .../modals/app-config/app-config.page.html    |   19 +-
 .../app/modals/app-config/app-config.page.ts  |   17 +-
 .../backup-select/backup-select.page.ts       |    9 +-
 .../app-actions/app-actions.page.html         |   54 +-
 .../app-actions/app-actions.page.ts           |   12 +-
 .../app-interfaces/app-interfaces.page.ts     |    2 +-
 .../app-list-pkg/app-list-pkg.component.html  |   16 +-
 .../app-list-pkg/app-list-pkg.component.ts    |    9 +-
 .../apps-routes/app-list/app-list.page.html   |    2 +-
 .../apps-routes/app-list/app-list.page.ts     |    3 +-
 .../apps-routes/app-list/package-info.pipe.ts |    2 +-
 .../app-properties/app-properties.page.ts     |    2 +-
 .../apps-routes/app-show/app-show.module.ts   |    6 +-
 .../apps-routes/app-show/app-show.page.html   |   17 +-
 .../apps-routes/app-show/app-show.page.ts     |   73 +-
 .../app-show-additional.component.html        |    2 +-
 .../app-show-additional.component.ts          |   12 +-
 .../app-show-header.component.html            |   13 +-
 .../app-show-health-checks.component.html     |   12 +-
 .../app-show-health-checks.component.ts       |    7 +-
 .../app-show-progress.component.html          |   38 +-
 .../app-show-progress.component.ts            |   29 +-
 .../app-show-status.component.html            |    8 +-
 .../app-show-status.component.ts              |   41 +-
 .../app-show/pipes/progress-data.pipe.ts      |   13 -
 .../app-show/pipes/to-buttons.pipe.ts         |   42 +-
 .../app-show/pipes/to-health-checks.pipe.ts   |    8 +-
 .../marketplace-show-controls.component.html  |    2 +-
 .../marketplace-show-controls.component.ts    |    8 +-
 .../marketplace-status.component.html         |   19 +-
 .../marketplace-status.component.ts           |   19 +-
 .../marketplace-status.module.ts              |    5 +-
 .../notifications/notifications.module.ts     |    2 +
 .../notifications/notifications.page.html     |    4 +-
 .../backing-up/backing-up.component.html      |    9 +-
 .../backing-up/backing-up.component.ts        |   11 +-
 .../server-backup/server-backup.module.ts     |    2 +
 .../src/app/pages/updates/updates.module.ts   |    4 +-
 .../src/app/pages/updates/updates.page.html   |    8 +-
 .../ui/src/app/pages/updates/updates.page.ts  |   36 +-
 .../built-in/health/health.component.ts       |    3 +-
 .../install-progress.module.ts                |   10 +-
 .../install-progress/install-progress.pipe.ts |   34 +-
 web/projects/ui/src/app/pipes/ui/ui.module.ts |    6 +-
 web/projects/ui/src/app/pipes/ui/ui.pipe.ts   |   16 +-
 .../ui/src/app/services/api/api.fixures.ts    | 1162 ++++++++-------
 .../services/api/embassy-mock-api.service.ts  |  201 ++-
 .../ui/src/app/services/api/mock-patch.ts     | 1293 ++++++-----------
 .../ui/src/app/services/config.service.ts     |    6 +-
 .../ui/src/app/services/dep-error.service.ts  |   42 +-
 .../src/app/services/patch-db/data-model.ts   |   69 +-
 .../services/pkg-status-rendering.service.ts  |   10 +-
 .../src/app/services/ui-launcher.service.ts   |    4 +-
 .../ui/src/app/types/progress-data.ts         |    7 -
 web/projects/ui/src/app/util/dry-update.ts    |    8 +-
 .../ui/src/app/util/get-package-data.ts       |   43 +
 .../ui/src/app/util/get-package-info.ts       |    4 -
 web/projects/ui/src/app/util/has-deps.ts      |    5 +-
 .../src/app/util/package-loading-progress.ts  |   50 -
 64 files changed, 1651 insertions(+), 1960 deletions(-)
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-show/pipes/progress-data.pipe.ts
 delete mode 100644 web/projects/ui/src/app/types/progress-data.ts
 delete mode 100644 web/projects/ui/src/app/util/package-loading-progress.ts

diff --git a/web/package-lock.json b/web/package-lock.json
index f1aab5e5b..a4cc53e5c 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1973,7 +1973,7 @@
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-rev0.lib0.rc8.beta7",
+      "version": "0.4.0-rev0.lib0.rc8.beta10",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/web/projects/ui/src/app/app/menu/menu.component.ts b/web/projects/ui/src/app/app/menu/menu.component.ts
index 68de30c7d..540dee7b9 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.ts
+++ b/web/projects/ui/src/app/app/menu/menu.component.ts
@@ -20,11 +20,18 @@ import {
 } from 'rxjs'
 import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
-import { DataModel } from 'src/app/services/patch-db/data-model'
+import { DataModel, PackageState } from 'src/app/services/patch-db/data-model'
 import { SplitPaneTracker } from 'src/app/services/split-pane.service'
 import { Emver, THEME } from '@start9labs/shared'
 import { ConnectionService } from 'src/app/services/connection.service'
 import { ConfigService } from 'src/app/services/config.service'
+import {
+  getManifest,
+  isInstalled,
+  isInstalling,
+  isRestoring,
+  isUpdating,
+} from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'app-menu',
@@ -79,8 +86,14 @@ export class MenuComponent {
         filter(([prev, curr]) =>
           Object.values(prev).some(
             p =>
-              p['install-progress'] &&
-              !curr[p.manifest.id]?.['install-progress'],
+              [
+                PackageState.Installing,
+                PackageState.Updating,
+                PackageState.Restoring,
+              ].includes(p['state-info'].state) &&
+              [PackageState.Installed, PackageState.Removing].includes(
+                curr[getManifest(p).id]['state-info'].state,
+              ),
           ),
         ),
         map(([_, curr]) => curr),
@@ -97,9 +110,10 @@ export class MenuComponent {
       Object.entries(marketplace).reduce((list, [_, store]) => {
         store?.packages.forEach(({ manifest: { id, version } }) => {
           if (
+            local[id] &&
             this.emver.compare(
               version,
-              local[id]?.installed?.manifest.version || '',
+              getManifest(local[id]).version || '',
             ) === 1
           )
             list.add(id)
diff --git a/web/projects/ui/src/app/components/status/status.component.html b/web/projects/ui/src/app/components/status/status.component.html
index e1829f4ca..db9e8f8f7 100644
--- a/web/projects/ui/src/app/components/status/status.component.html
+++ b/web/projects/ui/src/app/components/status/status.component.html
@@ -12,12 +12,9 @@
     . This may take a while
   </span>
 
-  <span *ngIf="installProgress">
-    <ion-text
-      *ngIf="installProgress | installProgressDisplay as progress"
-      color="primary"
-    >
-      {{ progress }}
+  <span *ngIf="installingInfo">
+    <ion-text color="primary">
+      {{ installingInfo.progress.overall | installingProgressString }}
     </ion-text>
   </span>
 
diff --git a/web/projects/ui/src/app/components/status/status.component.module.ts b/web/projects/ui/src/app/components/status/status.component.module.ts
index ea093b8e9..04fa4690c 100644
--- a/web/projects/ui/src/app/components/status/status.component.module.ts
+++ b/web/projects/ui/src/app/components/status/status.component.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'
 import { IonicModule } from '@ionic/angular'
 import { UnitConversionPipesModule } from '@start9labs/shared'
 import { StatusComponent } from './status.component'
-import { InstallProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
+import { InstallingProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
 
 @NgModule({
   declarations: [StatusComponent],
@@ -11,7 +11,7 @@ import { InstallProgressPipeModule } from 'src/app/pipes/install-progress/instal
     CommonModule,
     IonicModule,
     UnitConversionPipesModule,
-    InstallProgressPipeModule,
+    InstallingProgressPipeModule,
   ],
   exports: [StatusComponent],
 })
diff --git a/web/projects/ui/src/app/components/status/status.component.ts b/web/projects/ui/src/app/components/status/status.component.ts
index 14ece402c..03894406e 100644
--- a/web/projects/ui/src/app/components/status/status.component.ts
+++ b/web/projects/ui/src/app/components/status/status.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core'
 import { ConnectionService } from 'src/app/services/connection.service'
-import { InstallProgress } from 'src/app/services/patch-db/data-model'
+import { InstallingInfo } from 'src/app/services/patch-db/data-model'
 import {
   PrimaryRendering,
   PrimaryStatus,
@@ -20,7 +20,7 @@ export class StatusComponent {
   @Input() size?: string
   @Input() style?: string = 'regular'
   @Input() weight?: string = 'normal'
-  @Input() installProgress?: InstallProgress
+  @Input() installingInfo?: InstallingInfo
   @Input() sigtermTimeout?: string | null = null
 
   readonly connected$ = this.connectionService.connected$
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.page.html b/web/projects/ui/src/app/modals/app-config/app-config.page.html
index 49eec5f5f..b781e8cad 100644
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.html
+++ b/web/projects/ui/src/app/modals/app-config/app-config.page.html
@@ -9,7 +9,7 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content class="ion-padding">
+<ion-content class="ion-padding" *ngIf="pkg['state-info'].manifest as manifest">
   <!-- loading -->
   <text-spinner
     *ngIf="loading; else notLoading"
@@ -25,14 +25,14 @@
     </ion-item>
 
     <ng-template #noError>
-      <ng-container *ngIf="configForm && !pkg.installed?.status?.configured">
+      <ng-container *ngIf="configForm && !pkg.status.configured">
         <ng-container *ngIf="!original; else hasOriginal">
           <h2
             *ngIf="!configForm.dirty"
             class="ion-padding-bottom header-details"
           >
             <ion-text color="success">
-              {{ pkg.manifest.title }} has been automatically configured with
+              {{ manifest.title }} has been automatically configured with
               recommended defaults. Make whatever changes you want, then click
               "Save".
             </ion-text>
@@ -59,19 +59,19 @@ <h2 *ngIf="hasNewOptions" class="ion-padding-bottom header-details">
           <h2 style="display: flex; align-items: center">
             <img
               style="width: 18px; margin: 4px"
-              [src]="pkg['static-files'].icon"
-              [alt]="pkg.manifest.title"
+              [src]="pkg.icon"
+              [alt]="manifest.title"
             />
             <ion-text
               style="margin: 5px; font-family: 'Montserrat'; font-size: 18px"
             >
-              {{ pkg.manifest.title }}
+              {{ manifest.title }}
             </ion-text>
           </h2>
           <p>
             <ion-text color="dark">
-              The following modifications have been made to {{
-              pkg.manifest.title }} to satisfy {{ dependentInfo.title }}:
+              The following modifications have been made to {{ manifest.title }}
+              to satisfy {{ dependentInfo.title }}:
               <ul>
                 <li *ngFor="let d of diff" [innerHtml]="d"></li>
               </ul>
@@ -85,8 +85,7 @@ <h2 style="display: flex; align-items: center">
       <ion-item *ngIf="!hasOptions">
         <ion-label>
           <p>
-            No config options for {{ pkg.manifest.title }} {{
-            pkg.manifest.version }}.
+            No config options for {{ manifest.title }} {{ manifest.version }}.
           </p>
         </ion-label>
       </ion-item>
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.page.ts b/web/projects/ui/src/app/modals/app-config/app-config.page.ts
index 35388b36c..c8f2186f0 100644
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.ts
+++ b/web/projects/ui/src/app/modals/app-config/app-config.page.ts
@@ -16,6 +16,7 @@ import { DependentInfo } from 'src/app/types/dependent-info'
 import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import {
   DataModel,
+  InstalledState,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
@@ -26,7 +27,12 @@ import {
 } from 'src/app/services/form.service'
 import { compare, Operation, getValueByPointer } from 'fast-json-patch'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { getAllPackages, getPackage } from 'src/app/util/get-package-data'
+import {
+  getAllPackages,
+  getManifest,
+  getPackage,
+  isInstalled,
+} from 'src/app/util/get-package-data'
 import { Breakages } from 'src/app/services/api/api.types'
 
 @Component({
@@ -39,7 +45,7 @@ export class AppConfigPage {
 
   @Input() dependentInfo?: DependentInfo
 
-  pkg!: PackageDataEntry
+  pkg!: PackageDataEntry<InstalledState>
   loadingText = ''
 
   configSpec?: ConfigSpec
@@ -68,10 +74,11 @@ export class AppConfigPage {
   async ngOnInit() {
     try {
       const pkg = await getPackage(this.patch, this.pkgId)
-      if (!pkg) return
+      if (!pkg || !isInstalled(pkg)) return
+
       this.pkg = pkg
 
-      if (!this.pkg.manifest.config) return
+      if (!this.pkg['state-info'].manifest.config) return
 
       let newConfig: object | undefined
       let patch: Operation[] | undefined
@@ -210,7 +217,7 @@ export class AppConfigPage {
       'As a result of this change, the following services will no longer work properly and may crash:<ul>'
     const localPkgs = await getAllPackages(this.patch)
     const bullets = Object.keys(breakages).map(id => {
-      const title = localPkgs[id].manifest.title
+      const title = getManifest(localPkgs[id]).title
       return `<li><b>${title}</b></li>`
     })
     message = `${message}${bullets}</ul>`
diff --git a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
index 032c0c840..b1b6cf5e6 100644
--- a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
+++ b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
@@ -4,6 +4,7 @@ import { map, take } from 'rxjs/operators'
 import { DataModel, PackageState } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import { firstValueFrom } from 'rxjs'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'backup-select',
@@ -32,13 +33,13 @@ export class BackupSelectPage {
         map(pkgs => {
           return Object.values(pkgs)
             .map(pkg => {
-              const { id, title } = pkg.manifest
+              const { id, title } = getManifest(pkg)
               return {
                 id,
                 title,
-                icon: pkg['static-files'].icon,
-                disabled: pkg.state !== PackageState.Installed,
-                checked: pkg.state === PackageState.Installed,
+                icon: pkg.icon,
+                disabled: pkg['state-info'].state !== PackageState.Installed,
+                checked: false,
               }
             })
             .sort((a, b) =>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
index adcfcb829..c611f4a71 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
@@ -8,30 +8,34 @@
 </ion-header>
 
 <ion-content class="ion-padding-top with-widgets">
-  <ion-item-group *ngIf="pkg$ | async as pkg">
-    <!-- ** standard actions ** -->
-    <ion-item-divider>Standard Actions</ion-item-divider>
-    <app-actions-item
-      [action]="{
-        name: 'Uninstall',
-        description: 'This will uninstall the service from StartOS and delete all data permanently.',
-        icon: 'trash-outline'
-      }"
-      (click)="tryUninstall(pkg)"
-    ></app-actions-item>
+  <ng-container *ngIf="pkg$ | async as pkg">
+    <ion-item-group
+      *ngIf="pkg['state-info'].state === 'installed' && pkg['state-info'].manifest as manifest"
+    >
+      <!-- ** standard actions ** -->
+      <ion-item-divider>Standard Actions</ion-item-divider>
+      <app-actions-item
+        [action]="{
+          name: 'Uninstall',
+          description: 'This will uninstall the service from StartOS and delete all data permanently.',
+          icon: 'trash-outline'
+        }"
+        (click)="tryUninstall(pkg)"
+      ></app-actions-item>
 
-    <!-- ** specific actions ** -->
-    <ion-item-divider *ngIf="!(pkg.manifest.actions | empty)">
-      Actions for {{ pkg.manifest.title }}
-    </ion-item-divider>
-    <app-actions-item
-      *ngFor="let action of pkg.manifest.actions | keyvalue: asIsOrder"
-      [action]="{
-        name: action.value.name,
-        description: action.value.description,
-        icon: 'play-circle-outline'
-      }"
-      (click)="handleAction(pkg, action)"
-    ></app-actions-item>
-  </ion-item-group>
+      <!-- ** specific actions ** -->
+      <ion-item-divider *ngIf="!(manifest.actions | empty)">
+        Actions for {{ manifest.title }}
+      </ion-item-divider>
+      <app-actions-item
+        *ngFor="let action of manifest.actions | keyvalue: asIsOrder"
+        [action]="{
+          name: action.value.name,
+          description: action.value.description,
+          icon: 'play-circle-outline'
+        }"
+        (click)="handleAction(pkg.status, action)"
+      ></app-actions-item>
+    </ion-item-group>
+  </ng-container>
 </ion-content>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index bd25a1a42..0ea2f6bbe 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -11,13 +11,17 @@ import { PatchDB } from 'patch-db-client'
 import {
   Action,
   DataModel,
+  InstalledState,
   PackageDataEntry,
   PackageMainStatus,
+  StateInfo,
+  Status,
 } from 'src/app/services/patch-db/data-model'
 import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
 import { isEmptyObject, ErrorToastService, getPkgId } from '@start9labs/shared'
 import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'app-actions',
@@ -40,11 +44,7 @@ export class AppActionsPage {
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
-  async handleAction(
-    pkg: PackageDataEntry,
-    action: { key: string; value: Action },
-  ) {
-    const status = pkg.installed?.status
+  async handleAction(status: Status, action: { key: string; value: Action }) {
     if (
       status &&
       (action.value['allowed-statuses'] as PackageMainStatus[]).includes(
@@ -120,7 +120,7 @@ export class AppActionsPage {
   }
 
   async tryUninstall(pkg: PackageDataEntry): Promise<void> {
-    const { title, alerts } = pkg.manifest
+    const { title, alerts } = getManifest(pkg)
 
     let message =
       alerts.uninstall ||
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 5200ebb78..5540866fd 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -29,7 +29,7 @@ export class AppInterfacesPage {
   readonly pkgId = getPkgId(this.route)
 
   readonly serviceInterfaces$ = this.patch
-    .watch$('package-data', this.pkgId, 'installed', 'service-interfaces')
+    .watch$('package-data', this.pkgId, 'service-interfaces')
     .pipe(
       map(interfaces => {
         const sorted = Object.values(interfaces)
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
index 71988ba5b..3849b4327 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
@@ -1,34 +1,34 @@
 <ion-item
   button
-  *ngIf="pkg.entry.manifest as manifest"
+  *ngIf="pkg.entry | toManifest as manifest"
   detail="false"
   class="service-card"
   [routerLink]="['/services', manifest.id]"
 >
   <app-list-icon slot="start" [pkg]="pkg"></app-list-icon>
   <ion-thumbnail slot="start">
-    <img alt="" [src]="pkg.entry['static-files'].icon" />
+    <img alt="" [src]="pkg.entry.icon" />
   </ion-thumbnail>
   <ion-label>
     <h2 ticker>{{ manifest.title }}</h2>
     <p>{{ manifest.version | displayEmver }}</p>
     <status
       [rendering]="pkg.primaryRendering"
-      [installProgress]="pkg.entry['install-progress']"
+      [installingInfo]="$any(pkg.entry['state-info'])['installing-info']"
       weight="bold"
       size="small"
       [sigtermTimeout]="sigtermTimeout"
     ></status>
   </ion-label>
   <ion-button
-    *ngIf="
-      pkg.entry.installed && (pkg.entry.installed['service-interfaces'] | hasUi)
-    "
+    *ngIf="pkg.entry['service-interfaces'] | hasUi"
     slot="end"
     fill="clear"
     color="primary"
-    (click)="launchUi($event, pkg.entry.installed['service-interfaces'])"
-    [disabled]="!(pkg.entry.state | isLaunchable: pkgMainStatus.status)"
+    (click)="launchUi($event, pkg.entry['service-interfaces'])"
+    [disabled]="
+      !(pkg.entry['state-info'].state | isLaunchable: pkgMainStatus.status)
+    "
   >
     <ion-icon slot="icon-only" name="open-outline"></ion-icon>
   </ion-button>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index 76559a8b1..95f8785f5 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import {
-  InstalledPackageDataEntry,
   MainStatus,
+  PackageDataEntry,
   PackageMainStatus,
 } from 'src/app/services/patch-db/data-model'
 import { PkgInfo } from 'src/app/util/get-package-info'
@@ -20,7 +20,7 @@ export class AppListPkgComponent {
 
   get pkgMainStatus(): MainStatus {
     return (
-      this.pkg.entry.installed?.status.main || {
+      this.pkg.entry.status.main || {
         status: PackageMainStatus.Stopped,
       }
     )
@@ -32,10 +32,7 @@ export class AppListPkgComponent {
       : null
   }
 
-  launchUi(
-    e: Event,
-    interfaces: InstalledPackageDataEntry['service-interfaces'],
-  ): void {
+  launchUi(e: Event, interfaces: PackageDataEntry['service-interfaces']): void {
     e.stopPropagation()
     e.preventDefault()
     this.launcherService.launch(interfaces)
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html
index 3bc38f762..cc19bdff5 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html
@@ -27,7 +27,7 @@ <h1>Welcome to StartOS</h1>
             sizeMd="6"
           >
             <app-list-pkg
-              *ngIf="pkg.manifest.id | packageInfo | async as info"
+              *ngIf="(pkg | toManifest).id | packageInfo | async as info"
               [pkg]="info"
             ></app-list-pkg>
           </ion-col>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts
index f7d7685ff..e88067ede 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts
@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { PatchDB } from 'patch-db-client'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { filter, map, pairwise, startWith } from 'rxjs/operators'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'app-list',
@@ -20,7 +21,7 @@ export class AppListPage {
     }),
     map(([_, pkgs]) =>
       pkgs.sort((a, b) =>
-        b.manifest.title.toLowerCase() > a.manifest.title.toLowerCase()
+        getManifest(b).title.toLowerCase() > getManifest(a).title.toLowerCase()
           ? -1
           : 1,
       ),
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts
index c0d00c2c9..17eda2827 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { Observable, combineLatest, firstValueFrom } from 'rxjs'
+import { Observable, combineLatest } from 'rxjs'
 import { filter, map } from 'rxjs/operators'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { getPackageInfo, PkgInfo } from '../../../util/get-package-info'
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
index 8a49bad52..15af441a7 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
@@ -41,7 +41,7 @@ export class AppPropertiesPage {
   unmasked: { [key: string]: boolean } = {}
 
   stopped$ = this.patch
-    .watch$('package-data', this.pkgId, 'installed', 'status', 'main', 'status')
+    .watch$('package-data', this.pkgId, 'status', 'main', 'status')
     .pipe(map(status => status === PackageMainStatus.Stopped))
 
   @ViewChild(IonBackButtonDelegate, { static: false })
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
index c69910c78..d76ae58d8 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
@@ -18,7 +18,7 @@ import { AppShowAdditionalComponent } from './components/app-show-additional/app
 import { HealthColorPipe } from './pipes/health-color.pipe'
 import { ToHealthChecksPipe } from './pipes/to-health-checks.pipe'
 import { ToButtonsPipe } from './pipes/to-buttons.pipe'
-import { ProgressDataPipe } from './pipes/progress-data.pipe'
+import { InstallingProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
 
 const routes: Routes = [
   {
@@ -31,7 +31,6 @@ const routes: Routes = [
   declarations: [
     AppShowPage,
     HealthColorPipe,
-    ProgressDataPipe,
     ToHealthChecksPipe,
     ToButtonsPipe,
     AppShowHeaderComponent,
@@ -44,7 +43,7 @@ const routes: Routes = [
   ],
   imports: [
     CommonModule,
-    StatusComponentModule,
+    InstallingProgressPipeModule,
     IonicModule,
     RouterModule.forChild(routes),
     AppConfigPageModule,
@@ -52,6 +51,7 @@ const routes: Routes = [
     LaunchablePipeModule,
     UiPipeModule,
     ResponsiveColModule,
+    StatusComponentModule,
   ],
 })
 export class AppShowPageModule {}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index d2b7eaead..37ae25304 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -7,9 +7,8 @@
     <!-- ** installing, updating, restoring ** -->
     <ng-container *ngIf="showProgress(pkg); else installed">
       <app-show-progress
-        *ngIf="pkg | progressData as progressData"
-        [pkg]="pkg"
-        [progressData]="progressData"
+        *ngIf="pkg['state-info']['installing-info'] as installingInfo"
+        [phases]="installingInfo.progress.phases"
       ></app-show-progress>
     </ng-container>
 
@@ -19,11 +18,13 @@
         <!-- ** status ** -->
         <app-show-status [pkg]="pkg" [status]="status"></app-show-status>
         <!-- ** installed && !backing-up ** -->
-        <ng-container *ngIf="isInstalled(pkg) && !isBackingUp(status)">
+        <ng-container
+          *ngIf="isInstalled(pkg) && status.primary !== 'backing-up'"
+        >
           <!-- ** health checks ** -->
           <app-show-health-checks
-            *ngIf="isRunning(status)"
-            [pkg]="pkg"
+            *ngIf="status.primary === 'running'"
+            [manifest]="pkg['state-info'].manifest"
           ></app-show-health-checks>
           <!-- ** dependencies ** -->
           <app-show-dependencies
@@ -33,7 +34,9 @@
           <!-- ** menu ** -->
           <app-show-menu [buttons]="pkg | toButtons"></app-show-menu>
           <!-- ** additional ** -->
-          <app-show-additional [pkg]="pkg"></app-show-additional>
+          <app-show-additional
+            [manifest]="pkg['state-info'].manifest"
+          ></app-show-additional>
         </ng-container>
       </ion-item-group>
     </ng-template>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index ab250e1a7..01a3067cd 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -3,16 +3,12 @@ import { NavController } from '@ionic/angular'
 import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
-  InstalledPackageDataEntry,
+  InstallingState,
   Manifest,
   PackageDataEntry,
-  PackageState,
+  UpdatingState,
 } from 'src/app/services/patch-db/data-model'
-import {
-  PackageStatus,
-  PrimaryStatus,
-  renderPkgStatus,
-} from 'src/app/services/pkg-status-rendering.service'
+import { renderPkgStatus } from 'src/app/services/pkg-status-rendering.service'
 import { map, tap } from 'rxjs/operators'
 import { ActivatedRoute, NavigationExtras } from '@angular/router'
 import { getPkgId } from '@start9labs/shared'
@@ -24,6 +20,13 @@ import {
   PkgDependencyErrors,
 } from 'src/app/services/dep-error.service'
 import { combineLatest } from 'rxjs'
+import {
+  getManifest,
+  isInstalled,
+  isInstalling,
+  isRestoring,
+  isUpdating,
+} from 'src/app/util/get-package-data'
 
 export interface DependencyInfo {
   id: string
@@ -35,12 +38,6 @@ export interface DependencyInfo {
   action: () => any
 }
 
-const STATES = [
-  PackageState.Installing,
-  PackageState.Updating,
-  PackageState.Restoring,
-]
-
 @Component({
   selector: 'app-show',
   templateUrl: './app-show.page.html',
@@ -66,6 +63,8 @@ export class AppShowPage {
     }),
   )
 
+  isInstalled = isInstalled
+
   constructor(
     private readonly route: ActivatedRoute,
     private readonly navCtrl: NavController,
@@ -74,55 +73,44 @@ export class AppShowPage {
     private readonly depErrorService: DepErrorService,
   ) {}
 
-  isInstalled({ state }: PackageDataEntry): boolean {
-    return state === PackageState.Installed
-  }
-
-  isRunning({ primary }: PackageStatus): boolean {
-    return primary === PrimaryStatus.Running
-  }
-
-  isBackingUp({ primary }: PackageStatus): boolean {
-    return primary === PrimaryStatus.BackingUp
-  }
-
-  showProgress({ state }: PackageDataEntry): boolean {
-    return STATES.includes(state)
+  showProgress(
+    pkg: PackageDataEntry,
+  ): pkg is PackageDataEntry<InstallingState | UpdatingState> {
+    return isInstalling(pkg) || isUpdating(pkg) || isRestoring(pkg)
   }
 
   private getDepInfo(
     pkg: PackageDataEntry,
     depErrors: PkgDependencyErrors,
   ): DependencyInfo[] {
-    const pkgInstalled = pkg.installed
-
-    if (!pkgInstalled) return []
+    const manifest = getManifest(pkg)
 
-    return Object.keys(pkgInstalled['current-dependencies'])
-      .filter(id => !!pkgInstalled.manifest.dependencies[id])
-      .map(id => this.getDepValues(pkgInstalled, id, depErrors))
+    return Object.keys(pkg['current-dependencies'])
+      .filter(id => !!manifest.dependencies[id])
+      .map(id => this.getDepValues(pkg, manifest, id, depErrors))
   }
 
   private getDepValues(
-    pkgInstalled: InstalledPackageDataEntry,
+    pkg: PackageDataEntry,
+    manifest: Manifest,
     depId: string,
     depErrors: PkgDependencyErrors,
   ): DependencyInfo {
     const { errorText, fixText, fixAction } = this.getDepErrors(
-      pkgInstalled,
+      manifest,
       depId,
       depErrors,
     )
 
-    const depInfo = pkgInstalled['dependency-info'][depId]
+    const depInfo = pkg['dependency-info'][depId]
 
     return {
       id: depId,
-      version: pkgInstalled.manifest.dependencies[depId].version, // do we want this version range?
+      version: manifest.dependencies[depId].version, // do we want this version range?
       title: depInfo?.title || depId,
       icon: depInfo?.icon || '',
       errorText: errorText
-        ? `${errorText}. ${pkgInstalled.manifest.title} will not work as expected.`
+        ? `${errorText}. ${manifest.title} will not work as expected.`
         : '',
       actionText: fixText || 'View',
       action:
@@ -131,11 +119,10 @@ export class AppShowPage {
   }
 
   private getDepErrors(
-    pkgInstalled: InstalledPackageDataEntry,
+    manifest: Manifest,
     depId: string,
     depErrors: PkgDependencyErrors,
   ) {
-    const pkgManifest = pkgInstalled.manifest
     const depError = depErrors[depId]
 
     let errorText: string | null = null
@@ -146,15 +133,15 @@ export class AppShowPage {
       if (depError.type === DependencyErrorType.NotInstalled) {
         errorText = 'Not installed'
         fixText = 'Install'
-        fixAction = () => this.fixDep(pkgManifest, 'install', depId)
+        fixAction = () => this.fixDep(manifest, 'install', depId)
       } else if (depError.type === DependencyErrorType.IncorrectVersion) {
         errorText = 'Incorrect version'
         fixText = 'Update'
-        fixAction = () => this.fixDep(pkgManifest, 'update', depId)
+        fixAction = () => this.fixDep(manifest, 'update', depId)
       } else if (depError.type === DependencyErrorType.ConfigUnsatisfied) {
         errorText = 'Config not satisfied'
         fixText = 'Auto config'
-        fixAction = () => this.fixDep(pkgManifest, 'configure', depId)
+        fixAction = () => this.fixDep(manifest, 'configure', depId)
       } else if (depError.type === DependencyErrorType.NotRunning) {
         errorText = 'Not running'
         fixText = 'Start'
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
index 81fe8fb84..240eccff2 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
@@ -1,5 +1,5 @@
 <ion-item-divider>Additional Info</ion-item-divider>
-<ion-grid *ngIf="pkg.manifest as manifest">
+<ion-grid>
   <ion-row>
     <ion-col responsiveCol sizeXs="12" sizeMd="6">
       <ion-item-group>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
index 501898428..3487093b5 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
@@ -3,7 +3,7 @@ import { ModalController, ToastController } from '@ionic/angular'
 import { copyToClipboard, MarkdownComponent } from '@start9labs/shared'
 import { from } from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { Manifest } from 'src/app/services/patch-db/data-model'
 
 @Component({
   selector: 'app-show-additional',
@@ -12,7 +12,7 @@ import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 })
 export class AppShowAdditionalComponent {
   @Input()
-  pkg!: PackageDataEntry
+  manifest!: Manifest
 
   constructor(
     private readonly modalCtrl: ModalController,
@@ -35,10 +35,16 @@ export class AppShowAdditionalComponent {
   }
 
   async presentModalLicense() {
+    const { id, version } = this.manifest
+
     const modal = await this.modalCtrl.create({
       componentProps: {
         title: 'License',
-        content: from(this.api.getStatic(this.pkg['static-files']['license'])),
+        content: from(
+          this.api.getStatic(
+            `/public/package-data/${id}/${version}/LICENSE.md`,
+          ),
+        ),
       },
       component: MarkdownComponent,
     })
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
index 17dcd1be1..06f517222 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
@@ -4,15 +4,12 @@
       <ion-back-button defaultHref="services"></ion-back-button>
     </ion-buttons>
     <div class="header">
-      <img class="logo" [src]="pkg['static-files'].icon" alt="" />
-      <ion-label>
-        <h1
-          class="montserrat"
-          [class.less-large]="pkg.manifest.title.length > 20"
-        >
-          {{ pkg.manifest.title }}
+      <img class="logo" [src]="pkg.icon" alt="" />
+      <ion-label *ngIf="pkg | toManifest as manifest">
+        <h1 class="montserrat" [class.less-large]="manifest.title.length > 20">
+          {{ manifest.title }}
         </h1>
-        <h2>{{ pkg.manifest.version | displayEmver }}</h2>
+        <h2>{{ manifest.version | displayEmver }}</h2>
       </ion-label>
     </div>
   </ion-toolbar>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
index fe854f8fc..9ea8d29ac 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
@@ -1,5 +1,5 @@
 <ng-container
-  *ngIf="pkg | toHealthChecks | async | keyvalue: asIsOrder as checks"
+  *ngIf="manifest | toHealthChecks | async | keyvalue: asIsOrder as checks"
 >
   <ng-container *ngIf="checks.length">
     <ion-item-divider>Health Checks</ion-item-divider>
@@ -34,7 +34,7 @@
           ></ion-icon>
           <ion-label>
             <h2 class="bold">
-              {{ pkg.manifest['health-checks'][health.key].name }}
+              {{ manifest['health-checks'][health.key].name }}
             </h2>
             <ion-text [color]="result | healthColor">
               <p>
@@ -49,13 +49,11 @@ <h2 class="bold">
                 <span
                   *ngIf="
                     result === HealthResult.Success &&
-                    pkg.manifest['health-checks'][health.key]['success-message']
+                    manifest['health-checks'][health.key]['success-message']
                   "
                 >
                   :
-                  {{
-                    pkg.manifest['health-checks'][health.key]['success-message']
-                  }}
+                  {{ manifest['health-checks'][health.key]['success-message'] }}
                 </span>
               </p>
             </ion-text>
@@ -70,7 +68,7 @@ <h2 class="bold">
           ></ion-spinner>
           <ion-label>
             <h2 class="bold">
-              {{ pkg.manifest['health-checks'][health.key].name }}
+              {{ manifest['health-checks'][health.key].name }}
             </h2>
             <p class="primary">Awaiting result...</p>
           </ion-label>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
index 5db1ab1ca..a6cbc4ab7 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
@@ -1,9 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { ConnectionService } from 'src/app/services/connection.service'
-import {
-  HealthResult,
-  PackageDataEntry,
-} from 'src/app/services/patch-db/data-model'
+import { HealthResult, Manifest } from 'src/app/services/patch-db/data-model'
 
 @Component({
   selector: 'app-show-health-checks',
@@ -13,7 +10,7 @@ import {
 })
 export class AppShowHealthChecksComponent {
   @Input()
-  pkg!: PackageDataEntry
+  manifest!: Manifest
 
   HealthResult = HealthResult
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
index 3134cee5e..e259f2792 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
@@ -1,20 +1,18 @@
-<p>Downloading: {{ progressData.downloadProgress }}%</p>
-<ion-progress-bar
-  [color]="getColor('download-complete')"
-  [value]="progressData.downloadProgress / 100"
-  [buffer]="!progressData.downloadProgress ? 0 : 1"
-></ion-progress-bar>
-
-<p>Validating: {{ progressData.validateProgress }}%</p>
-<ion-progress-bar
-  [color]="getColor('validation-complete')"
-  [value]="progressData.validateProgress / 100"
-  [buffer]="validationBuffer"
-></ion-progress-bar>
-
-<p>Unpacking: {{ progressData.unpackProgress }}%</p>
-<ion-progress-bar
-  [color]="getColor('unpack-complete')"
-  [value]="progressData.unpackProgress / 100"
-  [buffer]="unpackingBuffer"
-></ion-progress-bar>
+<ng-container *ngFor="let phase of phases">
+  <p>
+    {{ phase.name }}
+    <span *ngIf="phase.progress | installingProgress as progress">
+      : {{ progress * 100 }}%
+    </span>
+  </p>
+  <ion-progress-bar
+    [type]="
+      phase.progress === true ||
+      (phase.progress !== false && phase.progress.total)
+        ? 'determinate'
+        : 'indeterminate'
+    "
+    [color]="phase.progress === true ? 'success' : 'secondary'"
+    [value]="phase.progress | installingProgress"
+  ></ion-progress-bar>
+</ng-container>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
index 8ee7b750a..ab5c8e416 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
@@ -1,9 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import {
-  InstallProgress,
-  PackageDataEntry,
-} from 'src/app/services/patch-db/data-model'
-import { ProgressData } from 'src/app/types/progress-data'
+import { FullProgress } from 'src/app/services/patch-db/data-model'
 
 @Component({
   selector: 'app-show-progress',
@@ -13,26 +9,5 @@ import { ProgressData } from 'src/app/types/progress-data'
 })
 export class AppShowProgressComponent {
   @Input()
-  pkg!: PackageDataEntry
-
-  @Input()
-  progressData!: ProgressData
-
-  get unpackingBuffer(): number {
-    return this.progressData.validateProgress === 100 &&
-      !this.progressData.unpackProgress
-      ? 0
-      : 1
-  }
-
-  get validationBuffer(): number {
-    return this.progressData.downloadProgress === 100 &&
-      !this.progressData.validateProgress
-      ? 0
-      : 1
-  }
-
-  getColor(action: keyof InstallProgress): string {
-    return this.pkg['install-progress']?.[action] ? 'success' : 'secondary'
-  }
+  phases!: FullProgress['phases']
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index e2379713b..4521f8e5e 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -4,14 +4,14 @@
     <status
       size="x-large"
       weight="600"
-      [installProgress]="pkg['install-progress']"
+      [installingInfo]="$any(pkg['state-info'])['installing-info']"
       [rendering]="PR[status.primary]"
       [sigtermTimeout]="sigtermTimeout"
     ></status>
   </ion-label>
 </ion-item>
 
-<ng-container *ngIf="isInstalled && (connected$ | async)">
+<ng-container *ngIf="isInstalled(pkg) && (connected$ | async)">
   <ion-grid>
     <ion-row style="padding-left: 12px">
       <ion-col>
@@ -59,7 +59,9 @@
           *ngIf="pkgStatus && interfaces && (interfaces | hasUi)"
           class="action-button"
           color="primary"
-          [disabled]="!(pkg.state | isLaunchable: pkgStatus.main.status)"
+          [disabled]="
+            !(pkg['state-info'].state | isLaunchable: pkgStatus.main.status)
+          "
           (click)="launchUi(interfaces)"
         >
           <ion-icon slot="start" name="open-outline"></ion-icon>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index dd8832c55..9bca7f2ac 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -6,7 +6,7 @@ import {
   PrimaryStatus,
 } from 'src/app/services/pkg-status-rendering.service'
 import {
-  InstalledPackageDataEntry,
+  Manifest,
   PackageDataEntry,
   PackageMainStatus,
   PackageState,
@@ -18,6 +18,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ModalService } from 'src/app/services/modal.service'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 import { ConnectionService } from 'src/app/services/connection.service'
+import { isInstalled, getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'app-show-status',
@@ -34,6 +35,8 @@ export class AppShowStatusComponent {
 
   PR = PrimaryRendering
 
+  isInstalled = isInstalled
+
   readonly connected$ = this.connectionService.connected$
 
   constructor(
@@ -46,18 +49,16 @@ export class AppShowStatusComponent {
     private readonly connectionService: ConnectionService,
   ) {}
 
-  get interfaces():
-    | InstalledPackageDataEntry['service-interfaces']
-    | undefined {
-    return this.pkg.installed?.['service-interfaces']
+  get interfaces(): PackageDataEntry['service-interfaces'] {
+    return this.pkg['service-interfaces']
   }
 
-  get pkgStatus(): Status | null {
-    return this.pkg.installed?.status || null
+  get pkgStatus(): Status {
+    return this.pkg.status
   }
 
-  get isInstalled(): boolean {
-    return this.pkg.state === PackageState.Installed
+  get manifest(): Manifest {
+    return getManifest(this.pkg)
   }
 
   get isRunning(): boolean {
@@ -82,25 +83,25 @@ export class AppShowStatusComponent {
       : null
   }
 
-  launchUi(interfaces: InstalledPackageDataEntry['service-interfaces']): void {
+  launchUi(interfaces: PackageDataEntry['service-interfaces']): void {
     this.launcherService.launch(interfaces)
   }
 
   async presentModalConfig(): Promise<void> {
     return this.modalService.presentModalConfig({
-      pkgId: this.id,
+      pkgId: this.manifest.id,
     })
   }
 
   async tryStart(): Promise<void> {
     if (this.status.dependency === 'warning') {
-      const depErrMsg = `${this.pkg.manifest.title} has unmet dependencies. It will not work as expected.`
+      const depErrMsg = `${this.manifest.title} has unmet dependencies. It will not work as expected.`
       const proceed = await this.presentAlertStart(depErrMsg)
 
       if (!proceed) return
     }
 
-    const alertMsg = this.pkg.manifest.alerts.start
+    const alertMsg = this.manifest.alerts.start
 
     if (alertMsg) {
       const proceed = await this.presentAlertStart(alertMsg)
@@ -112,7 +113,7 @@ export class AppShowStatusComponent {
   }
 
   async tryStop(): Promise<void> {
-    const { title, alerts } = this.pkg.manifest
+    const { title, alerts } = this.manifest
 
     let message = alerts.stop || ''
     if (hasCurrentDeps(this.pkg)) {
@@ -150,7 +151,7 @@ export class AppShowStatusComponent {
     if (hasCurrentDeps(this.pkg)) {
       const alert = await this.alertCtrl.create({
         header: 'Warning',
-        message: `Services that depend on ${this.pkg.manifest.title} may temporarily experiences issues`,
+        message: `Services that depend on ${this.manifest.title} may temporarily experiences issues`,
         buttons: [
           {
             text: 'Cancel',
@@ -173,10 +174,6 @@ export class AppShowStatusComponent {
     }
   }
 
-  private get id(): string {
-    return this.pkg.manifest.id
-  }
-
   private async start(): Promise<void> {
     const loader = await this.loadingCtrl.create({
       message: `Starting...`,
@@ -184,7 +181,7 @@ export class AppShowStatusComponent {
     await loader.present()
 
     try {
-      await this.embassyApi.startPackage({ id: this.id })
+      await this.embassyApi.startPackage({ id: this.manifest.id })
     } catch (e: any) {
       this.errToast.present(e)
     } finally {
@@ -199,7 +196,7 @@ export class AppShowStatusComponent {
     await loader.present()
 
     try {
-      await this.embassyApi.stopPackage({ id: this.id })
+      await this.embassyApi.stopPackage({ id: this.manifest.id })
     } catch (e: any) {
       this.errToast.present(e)
     } finally {
@@ -214,7 +211,7 @@ export class AppShowStatusComponent {
     await loader.present()
 
     try {
-      await this.embassyApi.restartPackage({ id: this.id })
+      await this.embassyApi.restartPackage({ id: this.manifest.id })
     } catch (e: any) {
       this.errToast.present(e)
     } finally {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/progress-data.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/progress-data.pipe.ts
deleted file mode 100644
index 1e5397648..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/progress-data.pipe.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core'
-import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
-import { ProgressData } from 'src/app/types/progress-data'
-import { packageLoadingProgress } from 'src/app/util/package-loading-progress'
-
-@Pipe({
-  name: 'progressData',
-})
-export class ProgressDataPipe implements PipeTransform {
-  transform(pkg: PackageDataEntry): ProgressData | null {
-    return packageLoadingProgress(pkg['install-progress'])
-  }
-}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index eeb00b435..a25914367 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -4,12 +4,15 @@ import { ModalController, NavController } from '@ionic/angular'
 import { MarkdownComponent } from '@start9labs/shared'
 import {
   DataModel,
+  InstalledState,
+  Manifest,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
 import { ModalService } from 'src/app/services/modal.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { from, map, Observable } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
+import { getManifest } from 'src/app/util/get-package-data'
 
 export interface Button {
   title: string
@@ -33,26 +36,26 @@ export class ToButtonsPipe implements PipeTransform {
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
-  transform(pkg: PackageDataEntry): Button[] {
-    const pkgTitle = pkg.manifest.title
+  transform(pkg: PackageDataEntry<InstalledState>): Button[] {
+    const manifest = pkg['state-info'].manifest
 
     return [
       // instructions
       {
-        action: () => this.presentModalInstructions(pkg),
+        action: () => this.presentModalInstructions(manifest),
         title: 'Instructions',
-        description: `Understand how to use ${pkgTitle}`,
+        description: `Understand how to use ${manifest.title}`,
         icon: 'list-outline',
         highlighted$: this.patch
-          .watch$('ui', 'ack-instructions', pkg.manifest.id)
+          .watch$('ui', 'ack-instructions', manifest.id)
           .pipe(map(seen => !seen)),
       },
       // config
       {
         action: async () =>
-          this.modalService.presentModalConfig({ pkgId: pkg.manifest.id }),
+          this.modalService.presentModalConfig({ pkgId: manifest.id }),
         title: 'Config',
-        description: `Customize ${pkgTitle}`,
+        description: `Customize ${manifest.title}`,
         icon: 'options-outline',
       },
       // properties
@@ -71,7 +74,7 @@ export class ToButtonsPipe implements PipeTransform {
         action: () =>
           this.navCtrl.navigateForward(['actions'], { relativeTo: this.route }),
         title: 'Actions',
-        description: `Uninstall and other commands specific to ${pkgTitle}`,
+        description: `Uninstall and other commands specific to ${manifest.title}`,
         icon: 'flash-outline',
       },
       // interfaces
@@ -97,16 +100,18 @@ export class ToButtonsPipe implements PipeTransform {
     ]
   }
 
-  private async presentModalInstructions(pkg: PackageDataEntry) {
+  private async presentModalInstructions(manifest: Manifest) {
     this.apiService
-      .setDbValue<boolean>(['ack-instructions', pkg.manifest.id], true)
+      .setDbValue<boolean>(['ack-instructions', manifest.id], true)
       .catch(e => console.error('Failed to mark instructions as seen', e))
 
     const modal = await this.modalCtrl.create({
       componentProps: {
         title: 'Instructions',
         content: from(
-          this.apiService.getStatic(pkg['static-files']['instructions']),
+          this.apiService.getStatic(
+            `/public/package-data/${manifest.id}/${manifest.version}/INSTRUCTIONS.md`,
+          ),
         ),
       },
       component: MarkdownComponent,
@@ -115,17 +120,22 @@ export class ToButtonsPipe implements PipeTransform {
     await modal.present()
   }
 
-  private viewInMarketplaceButton(pkg: PackageDataEntry): Button {
-    const url = pkg.installed?.['marketplace-url']
+  private viewInMarketplaceButton(
+    pkg: PackageDataEntry<InstalledState>,
+  ): Button {
+    const url = pkg['marketplace-url']
     const queryParams = url ? { url } : {}
 
     let button: Button = {
       title: 'Marketplace Listing',
       icon: 'storefront-outline',
       action: () =>
-        this.navCtrl.navigateForward([`marketplace/${pkg.manifest.id}`], {
-          queryParams,
-        }),
+        this.navCtrl.navigateForward(
+          [`marketplace/${pkg['state-info'].manifest.id}`],
+          {
+            queryParams,
+          },
+        ),
       disabled: false,
       description: 'View service in the marketplace',
     }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
index 8ba9bd4f3..066411eb0 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core'
 import {
   DataModel,
   HealthCheckResult,
-  PackageDataEntry,
+  Manifest,
   PackageMainStatus,
 } from 'src/app/services/patch-db/data-model'
 import { isEmptyObject } from '@start9labs/shared'
@@ -17,15 +17,15 @@ export class ToHealthChecksPipe implements PipeTransform {
   constructor(private readonly patch: PatchDB<DataModel>) {}
 
   transform(
-    pkg: PackageDataEntry,
+    manifest: Manifest,
   ): Observable<Record<string, HealthCheckResult | null>> | null {
-    const healthChecks = Object.keys(pkg.manifest['health-checks']).reduce(
+    const healthChecks = Object.keys(manifest['health-checks']).reduce(
       (obj, key) => ({ ...obj, [key]: null }),
       {},
     )
 
     const healthChecks$ = this.patch
-      .watch$('package-data', pkg.manifest.id, 'installed', 'status', 'main')
+      .watch$('package-data', manifest.id, 'status', 'main')
       .pipe(
         map(main => {
           // Question: is this ok or do we have to use Object.keys
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
index b150d2d4f..8d347ffa2 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
@@ -8,7 +8,7 @@
     View Installed
   </ion-button>
   <ng-container *ngIf="localPkg; else install">
-    <ng-container *ngIf="localPkg.state === PackageState.Installed">
+    <ng-container *ngIf="localPkg['state-info'].state === 'installed'">
       <ion-button
         *ngIf="(localVersion | compareEmver: pkg.manifest.version) === -1"
         expand="block"
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index c2edfc15d..e11cad01a 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -24,7 +24,7 @@ import { ClientStorageService } from 'src/app/services/client-storage.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 import { PatchDB } from 'patch-db-client'
-import { getAllPackages } from 'src/app/util/get-package-data'
+import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
 import { firstValueFrom } from 'rxjs'
 import { dryUpdate } from 'src/app/util/dry-update'
 
@@ -46,8 +46,6 @@ export class MarketplaceShowControlsComponent {
 
   readonly showDevTools$ = this.ClientStorageService.showDevTools$
 
-  readonly PackageState = PackageState
-
   constructor(
     private readonly alertCtrl: AlertController,
     private readonly ClientStorageService: ClientStorageService,
@@ -60,7 +58,7 @@ export class MarketplaceShowControlsComponent {
   ) {}
 
   get localVersion(): string {
-    return this.localPkg?.manifest.version || ''
+    return this.localPkg ? getManifest(this.localPkg).version : ''
   }
 
   async tryInstall() {
@@ -72,7 +70,7 @@ export class MarketplaceShowControlsComponent {
     if (!this.localPkg) {
       this.alertInstall(url)
     } else {
-      const originalUrl = this.localPkg.installed?.['marketplace-url']
+      const originalUrl = this.localPkg['marketplace-url']
 
       if (!sameUrl(url, originalUrl)) {
         const proceed = await this.presentAlertDifferentMarketplace(
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
index b39e47de6..c76c5138a 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
@@ -1,5 +1,5 @@
-<ng-container *ngIf="localPkg" [ngSwitch]="localPkg.state">
-  <div *ngSwitchCase="PackageState.Installed">
+<ng-container *ngIf="localPkg">
+  <div *ngIf="isInstalled(localPkg)">
     <ion-text
       *ngIf="(version | compareEmver: localVersion) !== 1"
       color="primary"
@@ -13,15 +13,24 @@
       Update Available
     </ion-text>
   </div>
-  <div *ngSwitchCase="PackageState.Removing">
+
+  <div *ngIf="isRemoving(localPkg)">
     <ion-text color="danger">
       Removing
       <span class="loading-dots"></span>
     </ion-text>
   </div>
-  <div *ngSwitchDefault>
+
+  <div
+    *ngIf="
+      isInstalling(localPkg) || isUpdating(localPkg) || isRestoring(localPkg)
+    "
+  >
     <ion-text
-      *ngIf="localPkg['install-progress'] | installProgressDisplay as progress"
+      *ngIf="
+        localPkg['state-info']['installing-info']!.progress.overall
+          | installingProgressString as progress
+      "
       color="primary"
     >
       Installing
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
index 05e36471b..9db50dc29 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
@@ -1,8 +1,13 @@
 import { Component, Input } from '@angular/core'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import {
-  PackageDataEntry,
-  PackageState,
-} from 'src/app/services/patch-db/data-model'
+  isInstalled,
+  isInstalling,
+  isUpdating,
+  isRemoving,
+  isRestoring,
+  getManifest,
+} from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'marketplace-status',
@@ -14,9 +19,13 @@ export class MarketplaceStatusComponent {
 
   @Input() localPkg?: PackageDataEntry
 
-  PackageState = PackageState
+  isInstalled = isInstalled
+  isInstalling = isInstalling
+  isUpdating = isUpdating
+  isRemoving = isRemoving
+  isRestoring = isRestoring
 
   get localVersion(): string {
-    return this.localPkg?.manifest.version || ''
+    return this.localPkg ? getManifest(this.localPkg).version : ''
   }
 }
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
index 8a7151f40..c31f4fd16 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
@@ -2,8 +2,7 @@ import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
 import { IonicModule } from '@ionic/angular'
 import { EmverPipesModule } from '@start9labs/shared'
-
-import { InstallProgressPipeModule } from '../../../pipes/install-progress/install-progress.module'
+import { InstallingProgressPipeModule } from '../../../pipes/install-progress/install-progress.module'
 import { MarketplaceStatusComponent } from './marketplace-status.component'
 
 @NgModule({
@@ -11,7 +10,7 @@ import { MarketplaceStatusComponent } from './marketplace-status.component'
     CommonModule,
     IonicModule,
     EmverPipesModule,
-    InstallProgressPipeModule,
+    InstallingProgressPipeModule,
   ],
   declarations: [MarketplaceStatusComponent],
   exports: [MarketplaceStatusComponent],
diff --git a/web/projects/ui/src/app/pages/notifications/notifications.module.ts b/web/projects/ui/src/app/pages/notifications/notifications.module.ts
index 5ff2b4572..4ec29702c 100644
--- a/web/projects/ui/src/app/pages/notifications/notifications.module.ts
+++ b/web/projects/ui/src/app/pages/notifications/notifications.module.ts
@@ -6,6 +6,7 @@ import { NotificationsPage } from './notifications.page'
 import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
 import { SharedPipesModule } from '@start9labs/shared'
 import { BackupReportPageModule } from 'src/app/modals/backup-report/backup-report.module'
+import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
 
 const routes: Routes = [
   {
@@ -22,6 +23,7 @@ const routes: Routes = [
     BadgeMenuComponentModule,
     SharedPipesModule,
     BackupReportPageModule,
+    UiPipeModule,
   ],
   declarations: [NotificationsPage],
 })
diff --git a/web/projects/ui/src/app/pages/notifications/notifications.page.html b/web/projects/ui/src/app/pages/notifications/notifications.page.html
index f9e697107..c53c140ff 100644
--- a/web/projects/ui/src/app/pages/notifications/notifications.page.html
+++ b/web/projects/ui/src/app/pages/notifications/notifications.page.html
@@ -87,8 +87,8 @@ <h4 style="color: #767676; margin-top: 0px; font-weight: 600">
             <h2>
               <b>
                 <span *ngIf="not['package-id'] as pkgId">
-                  <!-- @TODO remove $any when Angular gets smart enough -->
-                  {{ $any(packageData[pkgId])?.manifest.title || pkgId }} -
+                  {{ packageData[pkgId] ? (packageData[pkgId] |
+                  toManifest).title : pkgId }} -
                 </span>
                 <ion-text [color]="getColor(not)">{{ not.title }}</ion-text>
               </b>
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
index 1bbd5aa86..7dcf4d793 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
@@ -15,9 +15,9 @@
           <ng-container *ngFor="let pkg of pkgs | keyvalue">
             <ion-item *ngIf="backupProgress[pkg.key] as pkgProgress">
               <ion-avatar slot="start">
-                <img [src]="pkg.value['static-files'].icon" />
+                <img [src]="pkg.value.icon" />
               </ion-avatar>
-              <ion-label>{{ pkg.value.manifest.title }}</ion-label>
+              <ion-label>{{ (pkg.value | toManifest).title }}</ion-label>
               <!-- complete -->
               <ion-note
                 *ngIf="pkgProgress.complete; else incomplete"
@@ -35,10 +35,7 @@
                 >
                   <!-- active -->
                   <ion-note
-                    *ngIf="
-                      pkgStatus === PackageMainStatus.BackingUp;
-                      else queued
-                    "
+                    *ngIf="pkgStatus === 'backing-up'; else queued"
                     class="inline"
                     slot="end"
                   >
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
index 85ffbb2e1..125e9f28e 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
@@ -25,8 +25,6 @@ export class BackingUpComponent {
     'backup-progress',
   )
 
-  PackageMainStatus = PackageMainStatus
-
   constructor(private readonly patch: PatchDB<DataModel>) {}
 }
 
@@ -35,14 +33,7 @@ export class BackingUpComponent {
 })
 export class PkgMainStatusPipe implements PipeTransform {
   transform(pkgId: string): Observable<PackageMainStatus> {
-    return this.patch.watch$(
-      'package-data',
-      pkgId,
-      'installed',
-      'status',
-      'main',
-      'status',
-    )
+    return this.patch.watch$('package-data', pkgId, 'status', 'main', 'status')
   }
 
   constructor(private readonly patch: PatchDB<DataModel>) {}
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
index 6a1782985..d5b32cd6e 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
@@ -8,6 +8,7 @@ import { BackupDrivesComponentModule } from 'src/app/components/backup-drives/ba
 import { SharedPipesModule } from '@start9labs/shared'
 import { BackupSelectPageModule } from 'src/app/modals/backup-select/backup-select.module'
 import { PkgMainStatusPipe } from './backing-up/backing-up.component'
+import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
 
 const routes: Routes = [
   {
@@ -24,6 +25,7 @@ const routes: Routes = [
     SharedPipesModule,
     BackupDrivesComponentModule,
     BackupSelectPageModule,
+    UiPipeModule,
   ],
   declarations: [ServerBackupPage, BackingUpComponent, PkgMainStatusPipe],
 })
diff --git a/web/projects/ui/src/app/pages/updates/updates.module.ts b/web/projects/ui/src/app/pages/updates/updates.module.ts
index e07e798b4..62a6d2076 100644
--- a/web/projects/ui/src/app/pages/updates/updates.module.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.module.ts
@@ -12,7 +12,7 @@ import {
 } from '@start9labs/shared'
 import { SkeletonListComponentModule } from 'src/app/components/skeleton-list/skeleton-list.component.module'
 import { RoundProgressModule } from 'angular-svg-round-progressbar'
-import { InstallProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
+import { InstallingProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
 import { StoreIconComponentModule } from 'src/app/components/store-icon/store-icon.component.module'
 import { MimeTypePipeModule } from '@start9labs/marketplace'
 
@@ -34,7 +34,7 @@ const routes: Routes = [
     SkeletonListComponentModule,
     MarkdownPipeModule,
     RoundProgressModule,
-    InstallProgressPipeModule,
+    InstallingProgressPipeModule,
     StoreIconComponentModule,
     EmverPipesModule,
     MimeTypePipeModule,
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.html b/web/projects/ui/src/app/pages/updates/updates.page.html
index be48693f9..4ee0d53f4 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.html
+++ b/web/projects/ui/src/app/pages/updates/updates.page.html
@@ -39,8 +39,8 @@
                     <h1 style="line-height: 1.3">{{ pkg.manifest.title }}</h1>
                     <h2 class="inline">
                       <span>
-                        {{ local.installed?.manifest?.version || '' |
-                        displayEmver }}
+                        {{ local['state-info'].manifest.version | displayEmver
+                        }}
                       </span>
                       &nbsp;
                       <ion-icon name="arrow-forward"></ion-icon>
@@ -57,8 +57,8 @@ <h2 class="inline">
                   </ion-label>
                   <div slot="end" style="margin-left: 4px">
                     <round-progress
-                      *ngIf="local.state === 'updating' else notUpdating"
-                      [current]="local['install-progress'] | installProgress"
+                      *ngIf="local['state-info'].state === 'updating' else notUpdating"
+                      [current]="(local['state-info']['installing-info'].progress.overall | installingProgress) || 0"
                       [max]="100"
                       [radius]="13"
                       [stroke]="3"
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.ts b/web/projects/ui/src/app/pages/updates/updates.page.ts
index 522b51218..e09dc300d 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.page.ts
@@ -2,7 +2,9 @@ import { Component, Inject } from '@angular/core'
 import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
+  InstalledState,
   PackageDataEntry,
+  UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import {
@@ -14,16 +16,20 @@ import {
 } from '@start9labs/marketplace'
 import { Emver, isEmptyObject } from '@start9labs/shared'
 import { Pipe, PipeTransform } from '@angular/core'
-import { combineLatest, Observable } from 'rxjs'
+import { combineLatest, map, Observable } from 'rxjs'
 import { AlertController, NavController } from '@ionic/angular'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { getAllPackages } from 'src/app/util/get-package-data'
+import {
+  getAllPackages,
+  isInstalled,
+  isUpdating,
+} from 'src/app/util/get-package-data'
 import { dryUpdate } from 'src/app/util/dry-update'
 
 interface UpdatesData {
   hosts: StoreIdentity[]
   marketplace: Marketplace
-  localPkgs: Record<string, PackageDataEntry>
+  localPkgs: Record<string, PackageDataEntry<InstalledState | UpdatingState>>
   errors: string[]
 }
 
@@ -36,7 +42,14 @@ export class UpdatesPage {
   readonly data$: Observable<UpdatesData> = combineLatest({
     hosts: this.marketplaceService.getKnownHosts$(true),
     marketplace: this.marketplaceService.getMarketplace$(),
-    localPkgs: this.patch.watch$('package-data'),
+    localPkgs: this.patch.watch$('package-data').pipe(
+      map(pkgs =>
+        Object.values(pkgs).reduce((acc, curr) => {
+          if (isInstalled(curr) || isUpdating(curr)) return { ...acc, curr }
+          return acc
+        }, {} as Record<string, PackageDataEntry<InstalledState | UpdatingState>>),
+      ),
+    ),
     errors: this.marketplaceService.getRequestErrors$(),
   })
 
@@ -154,14 +167,17 @@ export class FilterUpdatesPipe implements PipeTransform {
 
   transform(
     pkgs: MarketplacePkg[],
-    local: Record<string, PackageDataEntry | undefined>,
+    local: Record<string, PackageDataEntry<InstalledState | UpdatingState>>,
   ): MarketplacePkg[] {
-    return pkgs.filter(
-      ({ manifest }) =>
+    return pkgs.filter(({ manifest }) => {
+      const localPkg = local[manifest.id]
+      return (
+        localPkg &&
         this.emver.compare(
           manifest.version,
-          local[manifest.id]?.installed?.manifest.version || '',
-        ) === 1,
-    )
+          localPkg['state-info'].manifest.version,
+        ) === 1
+      )
+    })
   }
 }
diff --git a/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts b/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
index e4f456c01..5a0f74767 100644
--- a/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
+++ b/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
@@ -9,6 +9,7 @@ import { PrimaryStatus } from 'src/app/services/pkg-status-rendering.service'
 import { getPackageInfo, PkgInfo } from '../../../../util/get-package-info'
 import { combineLatest } from 'rxjs'
 import { DepErrorService } from 'src/app/services/dep-error.service'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'widget-health',
@@ -31,7 +32,7 @@ export class HealthComponent {
   ]).pipe(
     map(([data, depErrors]) => {
       const pkgs = Object.values<PackageDataEntry>(data).map(pkg =>
-        getPackageInfo(pkg, depErrors[pkg.manifest.id]),
+        getPackageInfo(pkg, depErrors[getManifest(pkg).id]),
       )
       const result = this.labels.reduce<Record<string, number>>(
         (acc, label) => ({
diff --git a/web/projects/ui/src/app/pipes/install-progress/install-progress.module.ts b/web/projects/ui/src/app/pipes/install-progress/install-progress.module.ts
index 37bbd0744..a0997f29c 100644
--- a/web/projects/ui/src/app/pipes/install-progress/install-progress.module.ts
+++ b/web/projects/ui/src/app/pipes/install-progress/install-progress.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core'
 import {
-  InstallProgressDisplayPipe,
-  InstallProgressPipe,
+  InstallingProgressDisplayPipe,
+  InstallingProgressPipe,
 } from './install-progress.pipe'
 
 @NgModule({
-  declarations: [InstallProgressPipe, InstallProgressDisplayPipe],
-  exports: [InstallProgressPipe, InstallProgressDisplayPipe],
+  declarations: [InstallingProgressPipe, InstallingProgressDisplayPipe],
+  exports: [InstallingProgressPipe, InstallingProgressDisplayPipe],
 })
-export class InstallProgressPipeModule {}
+export class InstallingProgressPipeModule {}
diff --git a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
index 459dc722b..e6f87a127 100644
--- a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
+++ b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
@@ -1,24 +1,32 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { InstallProgress } from 'src/app/services/patch-db/data-model'
-import { packageLoadingProgress } from 'src/app/util/package-loading-progress'
+import { Progress } from 'src/app/services/patch-db/data-model'
 
 @Pipe({
-  name: 'installProgress',
+  name: 'installingProgressString',
 })
-export class InstallProgressPipe implements PipeTransform {
-  transform(installProgress?: InstallProgress): number {
-    return packageLoadingProgress(installProgress)?.totalProgress || 0
+export class InstallingProgressDisplayPipe implements PipeTransform {
+  transform(progress: Progress): string {
+    if (progress === true) return 'finalizing'
+    if (progress === false || !progress.total) return 'unknown %'
+    const percentage = Math.round((100 * progress.done) / progress.total)
+
+    return percentage < 99 ? String(percentage) + '%' : 'finalizing'
   }
 }
 
 @Pipe({
-  name: 'installProgressDisplay',
+  name: 'installingProgress',
 })
-export class InstallProgressDisplayPipe implements PipeTransform {
-  transform(installProgress?: InstallProgress): string {
-    const totalProgress =
-      packageLoadingProgress(installProgress)?.totalProgress || 0
-
-    return totalProgress < 99 ? totalProgress + '%' : 'finalizing'
+export class InstallingProgressPipe implements PipeTransform {
+  transform(progress: Progress): number | null {
+    if (progress === true) return 1
+    if (progress === false || !progress.total) return null
+    return Number((progress.done / progress.total).toFixed(2))
   }
 }
+
+function getProgress(progress: Progress): number | null {
+  if (progress === true) return 1
+  if (progress === false || !progress.total) return null
+  return Number((progress.done / progress.total).toFixed(2))
+}
diff --git a/web/projects/ui/src/app/pipes/ui/ui.module.ts b/web/projects/ui/src/app/pipes/ui/ui.module.ts
index 9637306de..a031c2059 100644
--- a/web/projects/ui/src/app/pipes/ui/ui.module.ts
+++ b/web/projects/ui/src/app/pipes/ui/ui.module.ts
@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core'
-import { UiPipe } from './ui.pipe'
+import { ToManifestPipe, UiPipe } from './ui.pipe'
 
 @NgModule({
-  declarations: [UiPipe],
-  exports: [UiPipe],
+  declarations: [UiPipe, ToManifestPipe],
+  exports: [UiPipe, ToManifestPipe],
 })
 export class UiPipeModule {}
diff --git a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
index 03ec11df0..2a81e4afd 100644
--- a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
+++ b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
@@ -1,14 +1,22 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { InstalledPackageDataEntry } from '../../services/patch-db/data-model'
+import { Manifest, PackageDataEntry } from '../../services/patch-db/data-model'
 import { hasUi } from '../../services/config.service'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Pipe({
   name: 'hasUi',
 })
 export class UiPipe implements PipeTransform {
-  transform(
-    interfaces: InstalledPackageDataEntry['service-interfaces'],
-  ): boolean {
+  transform(interfaces: PackageDataEntry['service-interfaces']): boolean {
     return interfaces ? hasUi(interfaces) : false
   }
 }
+
+@Pipe({
+  name: 'toManifest',
+})
+export class ToManifestPipe implements PipeTransform {
+  transform(pkg: PackageDataEntry): Manifest {
+    return getManifest(pkg)
+  }
+}
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 9caa257a4..46738041a 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1,5 +1,6 @@
 import {
   DockerIoFormat,
+  InstalledState,
   Manifest,
   PackageDataEntry,
   PackageMainStatus,
@@ -1748,661 +1749,648 @@ export module Mock {
 
   export const MockDependencyConfig = MockConfig
 
-  export const bitcoind: PackageDataEntry = {
-    state: PackageState.Installed,
-    'static-files': {
-      license: '/public/package-data/bitcoind/0.20.0/LICENSE.md',
-      icon: '/assets/img/service-icons/bitcoind.svg',
-      instructions: '/public/package-data/bitcoind/0.20.0/INSTRUCTIONS.md',
-    },
-    manifest: MockManifestBitcoind,
-    installed: {
+  export const bitcoind: PackageDataEntry<InstalledState> = {
+    'state-info': {
+      state: PackageState.Installed,
       manifest: MockManifestBitcoind,
-      'last-backup': null,
-      status: {
-        configured: true,
-        main: {
-          status: PackageMainStatus.Running,
-          started: new Date().toISOString(),
-          health: {},
-        },
-        'dependency-config-errors': {},
-      },
-      'service-interfaces': {
-        ui: {
-          id: 'ui',
-          hasPrimary: false,
-          disabled: false,
-          masked: false,
-          name: 'Web UI',
-          description:
-            'A launchable web app for you to interact with your Bitcoin node',
-          type: 'ui',
-          addressInfo: {
-            username: null,
-            hostId: 'abcdefg',
-            bindOptions: {
-              scheme: 'http',
-              preferredExternalPort: 80,
-              addSsl: {
-                addXForwardedHeaders: false,
-                preferredExternalPort: 443,
-                scheme: 'https',
-              },
-              secure: null,
+    },
+    icon: '/assets/img/service-icons/bitcoind.svg',
+    'last-backup': null,
+    status: {
+      configured: true,
+      main: {
+        status: PackageMainStatus.Running,
+        started: new Date().toISOString(),
+        health: {},
+      },
+      'dependency-config-errors': {},
+    },
+    'service-interfaces': {
+      ui: {
+        id: 'ui',
+        hasPrimary: false,
+        disabled: false,
+        masked: false,
+        name: 'Web UI',
+        description:
+          'A launchable web app for you to interact with your Bitcoin node',
+        type: 'ui',
+        addressInfo: {
+          username: null,
+          hostId: 'abcdefg',
+          bindOptions: {
+            scheme: 'http',
+            preferredExternalPort: 80,
+            addSsl: {
+              addXForwardedHeaders: false,
+              preferredExternalPort: 443,
+              scheme: 'https',
             },
-            suffix: '',
+            secure: false,
+            ssl: false,
           },
-          hostInfo: {
-            id: 'abcdefg',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: null,
-                  sslPort: 1234,
-                },
+          suffix: '',
+        },
+        hostInfo: {
+          id: 'abcdefg',
+          kind: 'multi',
+          hostnames: [
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: null,
+                sslPort: 1234,
               },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-ui-address.onion',
-                  port: 80,
-                  sslPort: 443,
-                },
+            },
+            {
+              kind: 'onion',
+              hostname: {
+                value: 'bitcoin-ui-address.onion',
+                port: 80,
+                sslPort: 443,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: null,
-                  sslPort: 1234,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.1.5',
+                port: null,
+                sslPort: 1234,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: null,
-                  sslPort: 1234,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                port: null,
+                sslPort: 1234,
               },
-            ],
-          },
+            },
+          ],
         },
-        rpc: {
-          id: 'rpc',
-          hasPrimary: false,
-          disabled: false,
-          masked: false,
-          name: 'RPC',
-          description:
-            'Used by dependent services and client wallets for connecting to your node',
-          type: 'api',
-          addressInfo: {
-            username: null,
-            hostId: 'bcdefgh',
-            bindOptions: {
-              scheme: 'http',
-              preferredExternalPort: 80,
-              addSsl: {
-                addXForwardedHeaders: false,
-                preferredExternalPort: 443,
-                scheme: 'https',
-              },
-              secure: null,
+      },
+      rpc: {
+        id: 'rpc',
+        hasPrimary: false,
+        disabled: false,
+        masked: false,
+        name: 'RPC',
+        description:
+          'Used by dependent services and client wallets for connecting to your node',
+        type: 'api',
+        addressInfo: {
+          username: null,
+          hostId: 'bcdefgh',
+          bindOptions: {
+            scheme: 'http',
+            preferredExternalPort: 80,
+            addSsl: {
+              addXForwardedHeaders: false,
+              preferredExternalPort: 443,
+              scheme: 'https',
             },
-            suffix: '',
+            secure: false,
+            ssl: false,
           },
-          hostInfo: {
-            id: 'bcdefgh',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: null,
-                  sslPort: 2345,
-                },
+          suffix: '',
+        },
+        hostInfo: {
+          id: 'bcdefgh',
+          kind: 'multi',
+          hostnames: [
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: null,
+                sslPort: 2345,
               },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-rpc-address.onion',
-                  port: 80,
-                  sslPort: 443,
-                },
+            },
+            {
+              kind: 'onion',
+              hostname: {
+                value: 'bitcoin-rpc-address.onion',
+                port: 80,
+                sslPort: 443,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: null,
-                  sslPort: 2345,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.1.5',
+                port: null,
+                sslPort: 2345,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: null,
-                  sslPort: 2345,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                port: null,
+                sslPort: 2345,
               },
-            ],
-          },
-        },
-        p2p: {
-          id: 'p2p',
-          hasPrimary: true,
-          disabled: false,
-          masked: false,
-          name: 'P2P',
-          description:
-            'Used for connecting to other nodes on the Bitcoin network',
-          type: 'p2p',
-          addressInfo: {
-            username: null,
-            hostId: 'cdefghi',
-            bindOptions: {
-              scheme: 'bitcoin',
-              preferredExternalPort: 8333,
-              addSsl: null,
-              secure: { ssl: false },
             },
-            suffix: '',
+          ],
+        },
+      },
+      p2p: {
+        id: 'p2p',
+        hasPrimary: true,
+        disabled: false,
+        masked: false,
+        name: 'P2P',
+        description:
+          'Used for connecting to other nodes on the Bitcoin network',
+        type: 'p2p',
+        addressInfo: {
+          username: null,
+          hostId: 'cdefghi',
+          bindOptions: {
+            scheme: 'bitcoin',
+            preferredExternalPort: 8333,
+            addSsl: null,
+            secure: true,
+            ssl: false,
           },
-          hostInfo: {
-            id: 'cdefghi',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: 3456,
-                  sslPort: null,
-                },
+          suffix: '',
+        },
+        hostInfo: {
+          id: 'cdefghi',
+          kind: 'multi',
+          hostnames: [
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: 3456,
+                sslPort: null,
               },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-p2p-address.onion',
-                  port: 8333,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'onion',
+              hostname: {
+                value: 'bitcoin-p2p-address.onion',
+                port: 8333,
+                sslPort: null,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: 3456,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.1.5',
+                port: 3456,
+                sslPort: null,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: 3456,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                port: 3456,
+                sslPort: null,
               },
-            ],
-          },
+            },
+          ],
         },
       },
-      'system-pointers': [],
-      'current-dependents': {
-        lnd: {
-          pointers: [],
-          'health-checks': [],
-        },
+    },
+    'current-dependents': {
+      lnd: {
+        pointers: [],
+        'health-checks': [],
       },
-      'current-dependencies': {},
-      'dependency-info': {},
-      'marketplace-url': 'https://registry.start9.com/',
-      'developer-key': 'developer-key',
     },
-    'install-progress': undefined,
+    'current-dependencies': {},
+    'dependency-info': {},
+    'marketplace-url': 'https://registry.start9.com/',
+    'developer-key': 'developer-key',
   }
 
-  export const bitcoinProxy: PackageDataEntry = {
-    state: PackageState.Installed,
-    'static-files': {
-      license: '/public/package-data/btc-rpc-proxy/0.20.0/LICENSE.md',
-      icon: '/assets/img/service-icons/btc-rpc-proxy.png',
-      instructions: '/public/package-data/btc-rpc-proxy/0.20.0/INSTRUCTIONS.md',
-    },
-    manifest: MockManifestBitcoinProxy,
-    installed: {
-      'last-backup': null,
-      status: {
-        configured: false,
-        main: {
-          status: PackageMainStatus.Stopped,
-        },
-        'dependency-config-errors': {},
-      },
+  export const bitcoinProxy: PackageDataEntry<InstalledState> = {
+    'state-info': {
+      state: PackageState.Installed,
       manifest: MockManifestBitcoinProxy,
-      'service-interfaces': {
-        ui: {
-          id: 'ui',
-          hasPrimary: false,
-          disabled: false,
-          masked: false,
-          name: 'Web UI',
-          description: 'A launchable web app for Bitcoin Proxy',
-          type: 'ui',
-          addressInfo: {
-            username: null,
-            hostId: 'hijklmnop',
-            bindOptions: {
-              scheme: 'http',
-              preferredExternalPort: 80,
-              addSsl: {
-                addXForwardedHeaders: false,
-                preferredExternalPort: 443,
-                scheme: 'https',
-              },
-              secure: { ssl: true },
+    },
+    icon: '/assets/img/service-icons/btc-rpc-proxy.png',
+    'last-backup': null,
+    status: {
+      configured: false,
+      main: {
+        status: PackageMainStatus.Stopped,
+      },
+      'dependency-config-errors': {},
+    },
+    'service-interfaces': {
+      ui: {
+        id: 'ui',
+        hasPrimary: false,
+        disabled: false,
+        masked: false,
+        name: 'Web UI',
+        description: 'A launchable web app for Bitcoin Proxy',
+        type: 'ui',
+        addressInfo: {
+          username: null,
+          hostId: 'hijklmnop',
+          bindOptions: {
+            scheme: 'http',
+            preferredExternalPort: 80,
+            addSsl: {
+              addXForwardedHeaders: false,
+              preferredExternalPort: 443,
+              scheme: 'https',
             },
-            suffix: '',
+            secure: true,
+            ssl: true,
           },
-          hostInfo: {
-            id: 'hijklmnop',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: null,
-                  sslPort: 4567,
-                },
+          suffix: '',
+        },
+        hostInfo: {
+          id: 'hijklmnop',
+          kind: 'multi',
+          hostnames: [
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: null,
+                sslPort: 4567,
               },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'proxy-ui-address.onion',
-                  port: 80,
-                  sslPort: 443,
-                },
+            },
+            {
+              kind: 'onion',
+              hostname: {
+                value: 'proxy-ui-address.onion',
+                port: 80,
+                sslPort: 443,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: null,
-                  sslPort: 4567,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.1.5',
+                port: null,
+                sslPort: 4567,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: null,
-                  sslPort: 4567,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                port: null,
+                sslPort: 4567,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'wlan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: null,
-                  sslPort: 4567,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'wlan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: null,
+                sslPort: 4567,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'wlan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.7',
-                  port: null,
-                  sslPort: 4567,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'wlan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.1.7',
+                port: null,
+                sslPort: 4567,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'wlan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: null,
-                  sslPort: 4567,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'wlan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                port: null,
+                sslPort: 4567,
               },
-            ],
-          },
+            },
+          ],
         },
       },
-      'system-pointers': [],
-      'current-dependents': {
-        lnd: {
-          pointers: [],
-          'health-checks': [],
-        },
+    },
+    'current-dependents': {
+      lnd: {
+        pointers: [],
+        'health-checks': [],
       },
-      'current-dependencies': {
-        bitcoind: {
-          pointers: [],
-          'health-checks': [],
-        },
+    },
+    'current-dependencies': {
+      bitcoind: {
+        pointers: [],
+        'health-checks': [],
       },
-      'dependency-info': {
-        bitcoind: {
-          title: Mock.MockManifestBitcoind.title,
-          icon: 'assets/img/service-icons/bitcoind.svg',
-        },
+    },
+    'dependency-info': {
+      bitcoind: {
+        title: Mock.MockManifestBitcoind.title,
+        icon: 'assets/img/service-icons/bitcoind.svg',
       },
-      'marketplace-url': 'https://registry.start9.com/',
-      'developer-key': 'developer-key',
     },
-    'install-progress': undefined,
+    'marketplace-url': 'https://registry.start9.com/',
+    'developer-key': 'developer-key',
   }
 
-  export const lnd: PackageDataEntry = {
-    state: PackageState.Installed,
-    'static-files': {
-      license: '/public/package-data/lnd/0.11.0/LICENSE.md',
-      icon: '/assets/img/service-icons/lnd.png',
-      instructions: '/public/package-data/lnd/0.11.0/INSTRUCTIONS.md',
+  export const lnd: PackageDataEntry<InstalledState> = {
+    'state-info': {
+      state: PackageState.Installed,
+      manifest: MockManifestLnd,
     },
-    manifest: MockManifestLnd,
-    installed: {
-      'last-backup': null,
-      status: {
-        configured: true,
-        main: {
-          status: PackageMainStatus.Stopped,
-        },
-        'dependency-config-errors': {
-          'btc-rpc-proxy': 'Username not found',
-        },
+    icon: '/assets/img/service-icons/lnd.png',
+    'last-backup': null,
+    status: {
+      configured: true,
+      main: {
+        status: PackageMainStatus.Stopped,
       },
-      manifest: MockManifestLnd,
-      'service-interfaces': {
-        grpc: {
-          id: 'grpc',
-          hasPrimary: false,
-          disabled: false,
-          masked: false,
-          name: 'GRPC',
-          description:
-            'Used by dependent services and client wallets for connecting to your node',
-          type: 'api',
-          addressInfo: {
-            username: null,
-            hostId: 'qrstuv',
-            bindOptions: {
-              scheme: 'grpc',
-              preferredExternalPort: 10009,
-              addSsl: null,
-              secure: { ssl: true },
-            },
-            suffix: '',
+      'dependency-config-errors': {
+        'btc-rpc-proxy': 'Username not found',
+      },
+    },
+    'service-interfaces': {
+      grpc: {
+        id: 'grpc',
+        hasPrimary: false,
+        disabled: false,
+        masked: false,
+        name: 'GRPC',
+        description:
+          'Used by dependent services and client wallets for connecting to your node',
+        type: 'api',
+        addressInfo: {
+          username: null,
+          hostId: 'qrstuv',
+          bindOptions: {
+            scheme: 'grpc',
+            preferredExternalPort: 10009,
+            addSsl: null,
+            secure: true,
+            ssl: true,
           },
-          hostInfo: {
-            id: 'qrstuv',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: 5678,
-                  sslPort: null,
-                },
+          suffix: '',
+        },
+        hostInfo: {
+          id: 'qrstuv',
+          kind: 'multi',
+          hostnames: [
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: 5678,
+                sslPort: null,
               },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-grpc-address.onion',
-                  port: 10009,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'onion',
+              hostname: {
+                value: 'lnd-grpc-address.onion',
+                port: 10009,
+                sslPort: null,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: 5678,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.1.5',
+                port: 5678,
+                sslPort: null,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: 5678,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                port: 5678,
+                sslPort: null,
               },
-            ],
-          },
-        },
-        lndconnect: {
-          id: 'lndconnect',
-          hasPrimary: false,
-          disabled: false,
-          masked: true,
-          name: 'LND Connect',
-          description:
-            'Used by client wallets adhering to LND Connect protocol to connect to your node',
-          type: 'api',
-          addressInfo: {
-            username: null,
-            hostId: 'qrstuv',
-            bindOptions: {
-              scheme: 'lndconnect',
-              preferredExternalPort: 10009,
-              addSsl: null,
-              secure: { ssl: true },
             },
-            suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
+          ],
+        },
+      },
+      lndconnect: {
+        id: 'lndconnect',
+        hasPrimary: false,
+        disabled: false,
+        masked: true,
+        name: 'LND Connect',
+        description:
+          'Used by client wallets adhering to LND Connect protocol to connect to your node',
+        type: 'api',
+        addressInfo: {
+          username: null,
+          hostId: 'qrstuv',
+          bindOptions: {
+            scheme: 'lndconnect',
+            preferredExternalPort: 10009,
+            addSsl: null,
+            secure: true,
+            ssl: true,
           },
-          hostInfo: {
-            id: 'qrstuv',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: 5678,
-                  sslPort: null,
-                },
+          suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
+        },
+        hostInfo: {
+          id: 'qrstuv',
+          kind: 'multi',
+          hostnames: [
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: 5678,
+                sslPort: null,
               },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-grpc-address.onion',
-                  port: 10009,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'onion',
+              hostname: {
+                value: 'lnd-grpc-address.onion',
+                port: 10009,
+                sslPort: null,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: 5678,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.1.5',
+                port: 5678,
+                sslPort: null,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: 5678,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                port: 5678,
+                sslPort: null,
               },
-            ],
-          },
-        },
-        p2p: {
-          id: 'p2p',
-          hasPrimary: true,
-          disabled: false,
-          masked: false,
-          name: 'P2P',
-          description:
-            'Used for connecting to other nodes on the Bitcoin network',
-          type: 'p2p',
-          addressInfo: {
-            username: null,
-            hostId: 'rstuvw',
-            bindOptions: {
-              scheme: null,
-              preferredExternalPort: 9735,
-              addSsl: null,
-              secure: { ssl: true },
             },
-            suffix: '',
+          ],
+        },
+      },
+      p2p: {
+        id: 'p2p',
+        hasPrimary: true,
+        disabled: false,
+        masked: false,
+        name: 'P2P',
+        description:
+          'Used for connecting to other nodes on the Bitcoin network',
+        type: 'p2p',
+        addressInfo: {
+          username: null,
+          hostId: 'rstuvw',
+          bindOptions: {
+            scheme: null,
+            preferredExternalPort: 9735,
+            addSsl: null,
+            secure: true,
+            ssl: true,
           },
-          hostInfo: {
-            id: 'rstuvw',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: 6789,
-                  sslPort: null,
-                },
+          suffix: '',
+        },
+        hostInfo: {
+          id: 'rstuvw',
+          kind: 'multi',
+          hostnames: [
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: 6789,
+                sslPort: null,
               },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-p2p-address.onion',
-                  port: 9735,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'onion',
+              hostname: {
+                value: 'lnd-p2p-address.onion',
+                port: 9735,
+                sslPort: null,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: 6789,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.1.5',
+                port: 6789,
+                sslPort: null,
               },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: 6789,
-                  sslPort: null,
-                },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'elan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                port: 6789,
+                sslPort: null,
               },
-            ],
-          },
+            },
+          ],
         },
       },
-      'system-pointers': [],
-      'current-dependents': {},
-      'current-dependencies': {
-        bitcoind: {
-          pointers: [],
-          'health-checks': [],
-        },
-        'btc-rpc-proxy': {
-          pointers: [],
-          'health-checks': [],
-        },
+    },
+    'current-dependents': {},
+    'current-dependencies': {
+      bitcoind: {
+        pointers: [],
+        'health-checks': [],
       },
-      'dependency-info': {
-        bitcoind: {
-          title: Mock.MockManifestBitcoind.title,
-          icon: 'assets/img/service-icons/bitcoind.svg',
-        },
-        'btc-rpc-proxy': {
-          title: Mock.MockManifestBitcoinProxy.title,
-          icon: 'assets/img/service-icons/btc-rpc-proxy.png',
-        },
+      'btc-rpc-proxy': {
+        pointers: [],
+        'health-checks': [],
       },
-      'marketplace-url': 'https://registry.start9.com/',
-      'developer-key': 'developer-key',
     },
-    'install-progress': undefined,
+    'dependency-info': {
+      bitcoind: {
+        title: Mock.MockManifestBitcoind.title,
+        icon: 'assets/img/service-icons/bitcoind.svg',
+      },
+      'btc-rpc-proxy': {
+        title: Mock.MockManifestBitcoinProxy.title,
+        icon: 'assets/img/service-icons/btc-rpc-proxy.png',
+      },
+    },
+    'marketplace-url': 'https://registry.start9.com/',
+    'developer-key': 'developer-key',
   }
 
-  export const LocalPkgs: { [key: string]: PackageDataEntry } = {
-    bitcoind: bitcoind,
-    'btc-rpc-proxy': bitcoinProxy,
-    lnd: lnd,
-  }
+  export const LocalPkgs: { [key: string]: PackageDataEntry<InstalledState> } =
+    {
+      bitcoind: bitcoind,
+      'btc-rpc-proxy': bitcoinProxy,
+      lnd: lnd,
+    }
 }
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 73cc71ef8..87c243628 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -10,11 +10,14 @@ import {
 } from 'patch-db-client'
 import {
   DataModel,
-  InstallProgress,
+  FullProgress,
+  InstallingState,
   PackageDataEntry,
   PackageMainStatus,
   PackageState,
   ServerStatus,
+  StateInfo,
+  UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { CifsBackupTarget, RR } from './api.types'
 import { parsePropertiesPermissive } from 'src/app/util/properties.util'
@@ -39,14 +42,34 @@ import { AuthService } from '../auth.service'
 import { ConnectionService } from '../connection.service'
 import { StoreInfo } from '@start9labs/marketplace'
 
-const PROGRESS: InstallProgress = {
-  size: 120,
-  downloaded: 0,
-  'download-complete': false,
-  validated: 0,
-  'validation-complete': false,
-  unpacked: 0,
-  'unpack-complete': false,
+const PROGRESS: FullProgress = {
+  overall: {
+    done: 0,
+    total: 120,
+  },
+  phases: [
+    {
+      name: 'Downloading',
+      progress: {
+        done: 0,
+        total: 40,
+      },
+    },
+    {
+      name: 'Validating',
+      progress: {
+        done: 0,
+        total: 40,
+      },
+    },
+    {
+      name: 'Installing',
+      progress: {
+        done: 0,
+        total: 40,
+      },
+    },
+  ],
 }
 
 @Injectable()
@@ -656,15 +679,30 @@ export class MockApiService extends ApiService {
       this.updateProgress(params.id)
     }, 1000)
 
-    const patch: Operation<PackageDataEntry>[] = [
+    const manifest = Mock.LocalPkgs[params.id]['state-info'].manifest
+
+    const patch: Operation<
+      PackageDataEntry<InstallingState | UpdatingState>
+    >[] = [
       {
         op: PatchOp.ADD,
         path: `/package-data/${params.id}`,
         value: {
           ...Mock.LocalPkgs[params.id],
-          // state: PackageState.Installing,
-          state: PackageState.Updating,
-          'install-progress': { ...PROGRESS },
+          'state-info': {
+            // if installing
+            state: PackageState.Installing,
+
+            // if updating
+            // state: PackageState.Updating,
+            // manifest,
+
+            // both
+            'installing-info': {
+              'new-manifest': manifest,
+              progress: PROGRESS,
+            },
+          },
         },
       },
     ]
@@ -720,9 +758,13 @@ export class MockApiService extends ApiService {
         path: `/package-data/${id}`,
         value: {
           ...Mock.LocalPkgs[id],
-          state: PackageState.Restoring,
-          'install-progress': { ...PROGRESS },
-          installed: undefined,
+          'state-info': {
+            state: PackageState.Restoring,
+            'installing-info': {
+              'new-manifest': Mock.LocalPkgs[id]['state-info'].manifest!,
+              progress: PROGRESS,
+            },
+          },
         },
       }
     })
@@ -948,7 +990,7 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: `/package-data/${params.id}/state`,
+        path: `/package-data/${params.id}/state-info/state`,
         value: PackageState.Removing,
       },
     ]
@@ -977,55 +1019,100 @@ export class MockApiService extends ApiService {
   }
 
   private async updateProgress(id: string): Promise<void> {
-    const progress = { ...PROGRESS }
-    const phases = [
-      { progress: 'downloaded', completion: 'download-complete' },
-      { progress: 'validated', completion: 'validation-complete' },
-      { progress: 'unpacked', completion: 'unpack-complete' },
-    ] as const
-
-    for (let phase of phases) {
-      let i = progress[phase.progress]
-      const size = progress?.size || 0
-      while (i < size) {
-        await pauseFor(250)
-        i = Math.min(i + 5, size)
-        progress[phase.progress] = i
-
-        if (i === progress.size) {
-          progress[phase.completion] = true
-        }
+    const progress = JSON.parse(JSON.stringify(PROGRESS))
+
+    for (let [i, phase] of progress.phases.entries()) {
+      if (typeof phase.progress !== 'object' || !phase.progress.total) {
+        await pauseFor(2000)
 
-        const patch = [
+        const patches: Operation<any>[] = [
           {
             op: PatchOp.REPLACE,
-            path: `/package-data/${id}/install-progress`,
-            value: { ...progress },
+            path: `/package-data/${id}/state-info/installing-info/progress/phases/${i}/progress`,
+            value: true,
           },
         ]
-        this.mockRevision(patch)
+
+        // overall
+        if (typeof progress.overall === 'object' && progress.overall.total) {
+          const step = progress.overall.total / progress.phases.length
+
+          progress.overall.done += step
+
+          patches.push({
+            op: PatchOp.REPLACE,
+            path: `/package-data/${id}/state-info/installing-info/progress/overall/done`,
+            value: progress.overall.done,
+          })
+        }
+
+        this.mockRevision(patches)
+      } else {
+        const step = phase.progress.total / 4
+
+        while (phase.progress.done < phase.progress.total) {
+          await pauseFor(500)
+
+          phase.progress.done += step
+
+          const patches: Operation<any>[] = [
+            {
+              op: PatchOp.REPLACE,
+              path: `/package-data/${id}/state-info/installing-info/progress/phases/${i}/progress/done`,
+              value: phase.progress.done,
+            },
+          ]
+
+          // overall
+          if (typeof progress.overall === 'object' && progress.overall.total) {
+            const step = progress.overall.total / progress.phases.length / 4
+
+            progress.overall.done += step
+
+            patches.push({
+              op: PatchOp.REPLACE,
+              path: `/package-data/${id}/state-info/installing-info/progress/overall/done`,
+              value: progress.overall.done,
+            })
+          }
+
+          this.mockRevision(patches)
+
+          if (phase.progress.done === phase.progress.total) {
+            await pauseFor(250)
+            this.mockRevision([
+              {
+                op: PatchOp.REPLACE,
+                path: `/package-data/${id}/state-info/installing-info/progress/phases/${i}/progress`,
+                value: true,
+              },
+            ])
+          }
+        }
       }
     }
 
-    setTimeout(() => {
-      const patch2: Operation<any>[] = [
-        {
-          op: PatchOp.REPLACE,
-          path: `/package-data/${id}/state`,
-          value: PackageState.Installed,
-        },
-        {
-          op: PatchOp.ADD,
-          path: `/package-data/${id}/installed`,
-          value: { ...Mock.LocalPkgs[id].installed },
-        },
-        {
-          op: PatchOp.REMOVE,
-          path: `/package-data/${id}/install-progress`,
+    await pauseFor(1000)
+    this.mockRevision([
+      {
+        op: PatchOp.REPLACE,
+        path: `/package-data/${id}/state-info/installing-info/progress/overall`,
+        value: true,
+      },
+    ])
+
+    await pauseFor(1000)
+    const patch2: Operation<StateInfo>[] = [
+      {
+        op: PatchOp.REPLACE,
+        path: `/package-data/${id}/state-info`,
+        value: {
+          state: PackageState.Installed,
+          manifest: Mock.LocalPkgs[id]['state-info'].manifest,
         },
-      ]
-      this.mockRevision(patch2)
-    }, 1000)
+      },
+    ]
+    this.mockRevision(patch2)
   }
 
   private async updateOSProgress() {
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index d9fcba0ef..ec4b5aac7 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -77,910 +77,521 @@ export const mockPatchData: DataModel = {
   },
   'package-data': {
     bitcoind: {
-      state: PackageState.Installed,
-      'static-files': {
-        license: '/public/package-data/bitcoind/0.20.0/LICENSE.md',
-        icon: '/assets/img/service-icons/bitcoind.svg',
-        instructions: '/public/package-data/bitcoind/0.20.0/INSTRUCTIONS.md',
-      },
-      manifest: {
-        id: 'bitcoind',
-        title: 'Bitcoin Core',
-        version: '0.20.0',
-        'git-hash': 'abcdefgh',
-        description: {
-          short: 'A Bitcoin full node by Bitcoin Core.',
-          long: 'Bitcoin is a decentralized consensus protocol and settlement network.',
-        },
-        'release-notes': 'Taproot, Schnorr, and more.',
-        assets: {
-          icon: 'icon.png',
-          license: 'LICENSE.md',
-          instructions: 'INSTRUCTIONS.md',
-          docker_images: 'image.tar',
-          assets: './assets',
-          scripts: './scripts',
-        },
-        license: 'MIT',
-        'wrapper-repo': 'https://github.com/start9labs/bitcoind-wrapper',
-        'upstream-repo': 'https://github.com/bitcoin/bitcoin',
-        'support-site': 'https://bitcoin.org',
-        'marketing-site': 'https://bitcoin.org',
-        'donation-url': 'https://start9.com',
-        alerts: {
-          install: 'Bitcoin can take over a week to sync.',
-          uninstall:
-            'Chain state will be lost, as will any funds stored on your Bitcoin Core waller that have not been backed up.',
-          restore: null,
-          start: 'Starting Bitcoin is good for your health.',
-          stop: null,
+      'state-info': {
+        state: PackageState.Installed,
+        manifest: {
+          ...Mock.MockManifestBitcoind,
+          version: '0.20.0',
         },
-        'health-checks': {
-          'chain-state': {
-            name: 'Chain State',
-          },
-          'ephemeral-health-check': {
-            name: 'Ephemeral Health Check',
-          },
-          'p2p-interface': {
-            name: 'P2P Interface',
-            'success-message': 'the health check ran succesfully',
-          },
-          'rpc-interface': {
-            name: 'RPC Interface',
-          },
-          'unnecessary-health-check': {
-            name: 'Unneccessary Health Check',
-          },
-        } as any,
-        config: {
-          get: {},
-          set: {},
-        } as any,
-        volumes: {},
-        'min-os-version': '0.2.12',
-        backup: {
-          create: {
-            type: 'docker',
-            image: '',
-            system: true,
-            entrypoint: '',
-            args: [],
-            mounts: {},
-            'io-format': DockerIoFormat.Yaml,
-            inject: false,
-            'shm-size': '',
-            'sigterm-timeout': null,
-          },
-          restore: {
-            type: 'docker',
-            image: '',
-            system: true,
-            entrypoint: '',
-            args: [],
-            mounts: {},
-            'io-format': DockerIoFormat.Yaml,
-            inject: false,
-            'shm-size': '',
-            'sigterm-timeout': null,
+      },
+      icon: '/assets/img/service-icons/bitcoind.svg',
+      'last-backup': null,
+      status: {
+        configured: true,
+        main: {
+          status: PackageMainStatus.Running,
+          started: '2021-06-14T20:49:17.774Z',
+          health: {
+            'ephemeral-health-check': {
+              result: HealthResult.Starting,
+            },
+            'chain-state': {
+              result: HealthResult.Loading,
+              message: 'Bitcoin is syncing from genesis',
+            },
+            'p2p-interface': {
+              result: HealthResult.Success,
+            },
+            'rpc-interface': {
+              result: HealthResult.Failure,
+              error: 'RPC interface unreachable.',
+            },
+            'unnecessary-health-check': {
+              result: HealthResult.Disabled,
+            },
           },
         },
-        migrations: null,
-        actions: {
-          resync: {
-            name: 'Resync Blockchain',
-            description:
-              'Use this to resync the Bitcoin blockchain from genesis',
-            warning: 'This will take a couple of days.',
-            'allowed-statuses': [
-              PackageMainStatus.Running,
-              PackageMainStatus.Stopped,
-            ],
-            implementation: {
-              type: 'docker',
-              image: '',
-              system: true,
-              entrypoint: '',
-              args: [],
-              mounts: {},
-              'io-format': DockerIoFormat.Yaml,
-              inject: false,
-              'shm-size': '',
-              'sigterm-timeout': null,
-            },
-            'input-spec': {
-              reason: {
-                type: 'string',
-                name: 'Re-sync Reason',
-                description:
-                  'Your reason for re-syncing. Why are you doing this?',
-                nullable: false,
-                masked: false,
-                copyable: false,
-                pattern: '^[a-zA-Z]+$',
-                'pattern-description': 'Must contain only letters.',
-              },
-              name: {
-                type: 'string',
-                name: 'Your Name',
-                description: 'Tell the class your name.',
-                nullable: true,
-                masked: false,
-                copyable: false,
-                warning: 'You may loose all your money by providing your name.',
-              },
-              notifications: {
-                name: 'Notification Preferences',
-                type: 'list',
-                subtype: 'enum',
-                description: 'how you want to be notified',
-                range: '[1,3]',
-                default: ['email'],
-                spec: {
-                  'value-names': {
-                    email: 'Email',
-                    text: 'Text',
-                    call: 'Call',
-                    push: 'Push',
-                    webhook: 'Webhook',
-                  },
-                  values: ['email', 'text', 'call', 'push', 'webhook'],
-                },
-              },
-              'days-ago': {
-                type: 'number',
-                name: 'Days Ago',
-                description: 'Number of days to re-sync.',
-                nullable: false,
-                default: 100,
-                range: '[0, 9999]',
-                integral: true,
-              },
-              'top-speed': {
-                type: 'number',
-                name: 'Top Speed',
-                description: 'The fastest you can possibly run.',
-                nullable: false,
-                range: '[-1000, 1000]',
-                integral: false,
-                units: 'm/s',
-              },
-              testnet: {
-                name: 'Testnet',
-                type: 'boolean',
-                description:
-                  '<ul><li>determines whether your node is running on testnet or mainnet</li></ul><script src="fake"></script>',
-                warning: 'Chain will have to resync!',
-                default: false,
+        'dependency-config-errors': {},
+      },
+      'service-interfaces': {
+        ui: {
+          id: 'ui',
+          hasPrimary: false,
+          disabled: false,
+          masked: false,
+          name: 'Web UI',
+          description:
+            'A launchable web app for you to interact with your Bitcoin node',
+          type: 'ui',
+          addressInfo: {
+            username: null,
+            hostId: 'abcdefg',
+            bindOptions: {
+              scheme: 'http',
+              preferredExternalPort: 80,
+              addSsl: {
+                addXForwardedHeaders: false,
+                preferredExternalPort: 443,
+                scheme: 'https',
               },
-              randomEnum: {
-                name: 'Random Enum',
-                type: 'enum',
-                'value-names': {
-                  null: 'Null',
-                  good: 'Good',
-                  bad: 'Bad',
-                  ugly: 'Ugly',
+              secure: false,
+              ssl: false,
+            },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'abcdefg',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: null,
+                  sslPort: 1234,
                 },
-                default: 'null',
-                description: 'This is not even real.',
-                warning: 'Be careful changing this!',
-                values: ['null', 'good', 'bad', 'ugly'],
               },
-              'emergency-contact': {
-                name: 'Emergency Contact',
-                type: 'object',
-                description: 'The person to contact in case of emergency.',
-                spec: {
-                  name: {
-                    type: 'string',
-                    name: 'Name',
-                    nullable: false,
-                    masked: false,
-                    copyable: false,
-                    pattern: '^[a-zA-Z]+$',
-                    'pattern-description': 'Must contain only letters.',
-                  },
-                  email: {
-                    type: 'string',
-                    name: 'Email',
-                    nullable: false,
-                    masked: false,
-                    copyable: true,
-                  },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-ui-address.onion',
+                  port: 80,
+                  sslPort: 443,
                 },
               },
-              ips: {
-                name: 'Whitelist IPs',
-                type: 'list',
-                subtype: 'string',
-                description:
-                  'external ip addresses that are authorized to access your Bitcoin node',
-                warning:
-                  'Any IP you allow here will have RPC access to your Bitcoin node.',
-                range: '[1,10]',
-                default: ['192.168.1.1'],
-                spec: {
-                  pattern: '^[0-9]{1,3}([,.][0-9]{1,3})?$',
-                  'pattern-description': 'Must be a valid IP address',
-                  masked: false,
-                  copyable: false,
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: null,
+                  sslPort: 1234,
                 },
               },
-              bitcoinNode: {
-                type: 'union',
-                default: 'internal',
-                tag: {
-                  id: 'type',
-                  'variant-names': {
-                    internal: 'Internal',
-                    external: 'External',
-                  },
-                  name: 'Bitcoin Node Settings',
-                  description: 'The node settings',
-                  warning: 'Careful changing this',
-                },
-                variants: {
-                  internal: {
-                    'lan-address': {
-                      name: 'LAN Address',
-                      type: 'pointer',
-                      subtype: 'package',
-                      target: 'lan-address',
-                      'package-id': 'bitcoind',
-                      description: 'the lan address',
-                      interface: '',
-                    },
-                    'friendly-name': {
-                      name: 'Friendly Name',
-                      type: 'string',
-                      description: 'the lan address',
-                      nullable: true,
-                      masked: false,
-                      copyable: false,
-                    },
-                  },
-                  external: {
-                    'public-domain': {
-                      name: 'Public Domain',
-                      type: 'string',
-                      description: 'the public address of the node',
-                      nullable: false,
-                      default: 'bitcoinnode.com',
-                      pattern: '.*',
-                      'pattern-description': 'anything',
-                      masked: false,
-                      copyable: true,
-                    },
-                  },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: null,
+                  sslPort: 1234,
                 },
               },
-            },
+            ],
           },
         },
-        dependencies: {},
-      },
-      installed: {
-        manifest: {
-          ...Mock.MockManifestBitcoind,
-          version: '0.20.0',
-        },
-        'last-backup': null,
-        status: {
-          configured: true,
-          main: {
-            status: PackageMainStatus.Running,
-            started: '2021-06-14T20:49:17.774Z',
-            health: {
-              'ephemeral-health-check': {
-                result: HealthResult.Starting,
-              },
-              'chain-state': {
-                result: HealthResult.Loading,
-                message: 'Bitcoin is syncing from genesis',
-              },
-              'p2p-interface': {
-                result: HealthResult.Success,
-              },
-              'rpc-interface': {
-                result: HealthResult.Failure,
-                error: 'RPC interface unreachable.',
-              },
-              'unnecessary-health-check': {
-                result: HealthResult.Disabled,
+        rpc: {
+          id: 'rpc',
+          hasPrimary: false,
+          disabled: false,
+          masked: false,
+          name: 'RPC',
+          description:
+            'Used by dependent services and client wallets for connecting to your node',
+          type: 'api',
+          addressInfo: {
+            username: null,
+            hostId: 'bcdefgh',
+            bindOptions: {
+              scheme: 'http',
+              preferredExternalPort: 80,
+              addSsl: {
+                addXForwardedHeaders: false,
+                preferredExternalPort: 443,
+                scheme: 'https',
               },
+              secure: false,
+              ssl: false,
             },
+            suffix: '',
           },
-          'dependency-config-errors': {},
-        },
-        'service-interfaces': {
-          ui: {
-            id: 'ui',
-            hasPrimary: false,
-            disabled: false,
-            masked: false,
-            name: 'Web UI',
-            description:
-              'A launchable web app for you to interact with your Bitcoin node',
-            type: 'ui',
-            addressInfo: {
-              username: null,
-              hostId: 'abcdefg',
-              bindOptions: {
-                scheme: 'http',
-                preferredExternalPort: 80,
-                addSsl: {
-                  addXForwardedHeaders: false,
-                  preferredExternalPort: 443,
-                  scheme: 'https',
+          hostInfo: {
+            id: 'bcdefgh',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: null,
+                  sslPort: 2345,
                 },
-                secure: { ssl: false },
               },
-              suffix: '',
-            },
-            hostInfo: {
-              id: 'abcdefg',
-              kind: 'multi',
-              hostnames: [
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'local',
-                    value: 'adjective-noun.local',
-                    port: null,
-                    sslPort: 1234,
-                  },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-rpc-address.onion',
+                  port: 80,
+                  sslPort: 443,
                 },
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'bitcoin-ui-address.onion',
-                    port: 80,
-                    sslPort: 443,
-                  },
-                },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv4',
-                    value: '192.168.1.5',
-                    port: null,
-                    sslPort: 1234,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: null,
+                  sslPort: 2345,
                 },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv6',
-                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                    port: null,
-                    sslPort: 1234,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: null,
+                  sslPort: 2345,
                 },
-              ],
+              },
+            ],
+          },
+        },
+        p2p: {
+          id: 'p2p',
+          hasPrimary: true,
+          disabled: false,
+          masked: false,
+          name: 'P2P',
+          description:
+            'Used for connecting to other nodes on the Bitcoin network',
+          type: 'p2p',
+          addressInfo: {
+            username: null,
+            hostId: 'cdefghi',
+            bindOptions: {
+              scheme: 'bitcoin',
+              preferredExternalPort: 8333,
+              addSsl: null,
+              secure: true,
+              ssl: false,
             },
+            suffix: '',
           },
-          rpc: {
-            id: 'rpc',
-            hasPrimary: false,
-            disabled: false,
-            masked: false,
-            name: 'RPC',
-            description:
-              'Used by dependent services and client wallets for connecting to your node',
-            type: 'api',
-            addressInfo: {
-              username: null,
-              hostId: 'bcdefgh',
-              bindOptions: {
-                scheme: 'http',
-                preferredExternalPort: 80,
-                addSsl: {
-                  preferredExternalPort: 443,
-                  scheme: 'https',
-                  addXForwardedHeaders: null,
+          hostInfo: {
+            id: 'cdefghi',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: 3456,
+                  sslPort: null,
                 },
-                secure: null,
               },
-              suffix: '',
-            },
-            hostInfo: {
-              id: 'bcdefgh',
-              kind: 'multi',
-              hostnames: [
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'local',
-                    value: 'adjective-noun.local',
-                    port: null,
-                    sslPort: 2345,
-                  },
-                },
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'bitcoin-rpc-address.onion',
-                    port: 80,
-                    sslPort: 443,
-                  },
-                },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv4',
-                    value: '192.168.1.5',
-                    port: null,
-                    sslPort: 2345,
-                  },
-                },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv6',
-                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                    port: null,
-                    sslPort: 2345,
-                  },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-p2p-address.onion',
+                  port: 8333,
+                  sslPort: null,
                 },
-              ],
-            },
-          },
-          p2p: {
-            id: 'p2p',
-            hasPrimary: true,
-            disabled: false,
-            masked: false,
-            name: 'P2P',
-            description:
-              'Used for connecting to other nodes on the Bitcoin network',
-            type: 'p2p',
-            addressInfo: {
-              username: null,
-              hostId: 'cdefghi',
-              bindOptions: {
-                scheme: 'bitcoin',
-                preferredExternalPort: 8333,
-                addSsl: null,
-                secure: { ssl: false },
               },
-              suffix: '',
-            },
-            hostInfo: {
-              id: 'cdefghi',
-              kind: 'multi',
-              hostnames: [
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'local',
-                    value: 'adjective-noun.local',
-                    port: 3456,
-                    sslPort: null,
-                  },
-                },
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'bitcoin-p2p-address.onion',
-                    port: 8333,
-                    sslPort: null,
-                  },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: 3456,
+                  sslPort: null,
                 },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv4',
-                    value: '192.168.1.5',
-                    port: 3456,
-                    sslPort: null,
-                  },
-                },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv6',
-                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                    port: 3456,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: 3456,
+                  sslPort: null,
                 },
-              ],
-            },
+              },
+            ],
           },
         },
-        'system-pointers': [],
-        'current-dependents': {
-          lnd: {
-            pointers: [],
-            'health-checks': [],
-          },
+      },
+      'current-dependents': {
+        lnd: {
+          pointers: [],
+          'health-checks': [],
         },
-        'current-dependencies': {},
-        'dependency-info': {},
-        'marketplace-url': 'https://registry.start9.com/',
-        'developer-key': 'developer-key',
       },
+      'current-dependencies': {},
+      'dependency-info': {},
+      'marketplace-url': 'https://registry.start9.com/',
+      'developer-key': 'developer-key',
     },
     lnd: {
-      state: PackageState.Installed,
-      'static-files': {
-        license: '/public/package-data/lnd/0.11.1/LICENSE.md',
-        icon: '/assets/img/service-icons/lnd.png',
-        instructions: '/public/package-data/lnd/0.11.1/INSTRUCTIONS.md',
-      },
-      manifest: {
-        id: 'lnd',
-        title: 'Lightning Network Daemon',
-        version: '0.11.0',
-        description: {
-          short: 'A bolt spec compliant client.',
-          long: 'More info about LND. More info about LND. More info about LND.',
-        },
-        'release-notes': 'Dual funded channels!',
-        assets: {
-          icon: 'icon.png',
-          license: 'LICENSE.md',
-          instructions: 'INSTRUCTIONS.md',
-          docker_images: 'image.tar',
-          assets: './assets',
-          scripts: './scripts',
-        },
-        license: 'MIT',
-        'wrapper-repo': 'https://github.com/start9labs/lnd-wrapper',
-        'upstream-repo': 'https://github.com/lightningnetwork/lnd',
-        'support-site': 'https://lightning.engineering/',
-        'marketing-site': 'https://lightning.engineering/',
-        'donation-url': null,
-        alerts: {
-          install: null,
-          uninstall: null,
-          restore:
-            'If this is a duplicate instance of the same LND node, you may loose your funds.',
-          start: 'Starting LND is good for your health.',
-          stop: null,
-        },
-        'health-checks': {},
-        config: {
-          get: null,
-          set: null,
-        },
-        volumes: {},
-        'min-os-version': '0.2.12',
-        backup: {
-          create: {
-            type: 'docker',
-            image: '',
-            system: true,
-            entrypoint: '',
-            args: [],
-            mounts: {},
-            'io-format': DockerIoFormat.Yaml,
-            inject: false,
-            'shm-size': '',
-            'sigterm-timeout': null,
-          },
-          restore: {
-            type: 'docker',
-            image: '',
-            system: true,
-            entrypoint: '',
-            args: [],
-            mounts: {},
-            'io-format': DockerIoFormat.Yaml,
-            inject: false,
-            'shm-size': '',
-            'sigterm-timeout': null,
-          },
-        },
-        migrations: null,
-        actions: {
-          resync: {
-            name: 'Resync Network Graph',
-            description: 'Your node will resync its network graph.',
-            warning: 'This will take a couple hours.',
-            'allowed-statuses': [PackageMainStatus.Running],
-            implementation: {
-              type: 'docker',
-              image: '',
-              system: true,
-              entrypoint: '',
-              args: [],
-              mounts: {},
-              'io-format': DockerIoFormat.Yaml,
-              inject: false,
-              'shm-size': '',
-              'sigterm-timeout': null,
-            },
-            'input-spec': null,
-          },
-        },
-        dependencies: {
-          bitcoind: {
-            version: '=0.21.0',
-            description: 'LND needs bitcoin to live.',
-            requirement: {
-              type: 'opt-out',
-              how: 'You can use an external node from your server if you prefer.',
-            },
-            config: null,
-          },
-          'btc-rpc-proxy': {
-            version: '>=0.2.2',
-            description:
-              'As long as Bitcoin is pruned, LND needs Bitcoin Proxy to fetch block over the P2P network.',
-            requirement: {
-              type: 'opt-in',
-              how: `To use Proxy's user management system, go to LND config and select Bitcoin Proxy under Bitcoin config.`,
-            },
-            config: null,
-          },
-        },
-      },
-      installed: {
+      'state-info': {
+        state: PackageState.Installed,
         manifest: {
           ...Mock.MockManifestLnd,
           version: '0.11.0',
         },
-        'last-backup': null,
-        status: {
-          configured: true,
-          main: {
-            status: PackageMainStatus.Stopped,
-          },
-          'dependency-config-errors': {
-            'btc-rpc-proxy': 'This is a config unsatisfied error',
-          },
+      },
+      icon: '/assets/img/service-icons/lnd.png',
+      'last-backup': null,
+      status: {
+        configured: true,
+        main: {
+          status: PackageMainStatus.Stopped,
         },
-        'service-interfaces': {
-          grpc: {
-            id: 'grpc',
-            hasPrimary: false,
-            disabled: false,
-            masked: false,
-            name: 'GRPC',
-            description:
-              'Used by dependent services and client wallets for connecting to your node',
-            type: 'api',
-            addressInfo: {
-              username: null,
-              hostId: 'qrstuv',
-              bindOptions: {
-                scheme: 'grpc',
-                preferredExternalPort: 10009,
-                addSsl: null,
-                secure: { ssl: true },
-              },
-              suffix: '',
+        'dependency-config-errors': {
+          'btc-rpc-proxy': 'This is a config unsatisfied error',
+        },
+      },
+      'service-interfaces': {
+        grpc: {
+          id: 'grpc',
+          hasPrimary: false,
+          disabled: false,
+          masked: false,
+          name: 'GRPC',
+          description:
+            'Used by dependent services and client wallets for connecting to your node',
+          type: 'api',
+          addressInfo: {
+            username: null,
+            hostId: 'qrstuv',
+            bindOptions: {
+              scheme: 'grpc',
+              preferredExternalPort: 10009,
+              addSsl: null,
+              secure: true,
+              ssl: true,
             },
-            hostInfo: {
-              id: 'qrstuv',
-              kind: 'multi',
-              hostnames: [
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'local',
-                    value: 'adjective-noun.local',
-                    port: 5678,
-                    sslPort: null,
-                  },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'qrstuv',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: 5678,
+                  sslPort: null,
                 },
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'lnd-grpc-address.onion',
-                    port: 10009,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-grpc-address.onion',
+                  port: 10009,
+                  sslPort: null,
                 },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv4',
-                    value: '192.168.1.5',
-                    port: 5678,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: 5678,
+                  sslPort: null,
                 },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv6',
-                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                    port: 5678,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: 5678,
+                  sslPort: null,
                 },
-              ],
-            },
-          },
-          lndconnect: {
-            id: 'lndconnect',
-            hasPrimary: false,
-            disabled: false,
-            masked: true,
-            name: 'LND Connect',
-            description:
-              'Used by client wallets adhering to LND Connect protocol to connect to your node',
-            type: 'api',
-            addressInfo: {
-              username: null,
-              hostId: 'qrstuv',
-              bindOptions: {
-                scheme: 'lndconnect',
-                preferredExternalPort: 10009,
-                addSsl: null,
-                secure: { ssl: true },
               },
-              suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
+            ],
+          },
+        },
+        lndconnect: {
+          id: 'lndconnect',
+          hasPrimary: false,
+          disabled: false,
+          masked: true,
+          name: 'LND Connect',
+          description:
+            'Used by client wallets adhering to LND Connect protocol to connect to your node',
+          type: 'api',
+          addressInfo: {
+            username: null,
+            hostId: 'qrstuv',
+            bindOptions: {
+              scheme: 'lndconnect',
+              preferredExternalPort: 10009,
+              addSsl: null,
+              secure: true,
+              ssl: true,
             },
-            hostInfo: {
-              id: 'qrstuv',
-              kind: 'multi',
-              hostnames: [
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'local',
-                    value: 'adjective-noun.local',
-                    port: 5678,
-                    sslPort: null,
-                  },
+            suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
+          },
+          hostInfo: {
+            id: 'qrstuv',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: 5678,
+                  sslPort: null,
                 },
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'lnd-grpc-address.onion',
-                    port: 10009,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-grpc-address.onion',
+                  port: 10009,
+                  sslPort: null,
                 },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv4',
-                    value: '192.168.1.5',
-                    port: 5678,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: 5678,
+                  sslPort: null,
                 },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv6',
-                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                    port: 5678,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: 5678,
+                  sslPort: null,
                 },
-              ],
-            },
-          },
-          p2p: {
-            id: 'p2p',
-            hasPrimary: true,
-            disabled: false,
-            masked: false,
-            name: 'P2P',
-            description:
-              'Used for connecting to other nodes on the Bitcoin network',
-            type: 'p2p',
-            addressInfo: {
-              username: null,
-              hostId: 'rstuvw',
-              bindOptions: {
-                scheme: null,
-                preferredExternalPort: 9735,
-                addSsl: null,
-                secure: { ssl: true },
               },
-              suffix: '',
+            ],
+          },
+        },
+        p2p: {
+          id: 'p2p',
+          hasPrimary: true,
+          disabled: false,
+          masked: false,
+          name: 'P2P',
+          description:
+            'Used for connecting to other nodes on the Bitcoin network',
+          type: 'p2p',
+          addressInfo: {
+            username: null,
+            hostId: 'rstuvw',
+            bindOptions: {
+              scheme: null,
+              preferredExternalPort: 9735,
+              addSsl: null,
+              secure: true,
+              ssl: true,
             },
-            hostInfo: {
-              id: 'rstuvw',
-              kind: 'multi',
-              hostnames: [
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'local',
-                    value: 'adjective-noun.local',
-                    port: 6789,
-                    sslPort: null,
-                  },
+            suffix: '',
+          },
+          hostInfo: {
+            id: 'rstuvw',
+            kind: 'multi',
+            hostnames: [
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: 6789,
+                  sslPort: null,
                 },
-                {
-                  kind: 'onion',
-                  hostname: {
-                    value: 'lnd-p2p-address.onion',
-                    port: 9735,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'lnd-p2p-address.onion',
+                  port: 9735,
+                  sslPort: null,
                 },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv4',
-                    value: '192.168.1.5',
-                    port: 6789,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '192.168.1.5',
+                  port: 6789,
+                  sslPort: null,
                 },
-                {
-                  kind: 'ip',
-                  networkInterfaceId: 'elan0',
-                  public: false,
-                  hostname: {
-                    kind: 'ipv6',
-                    value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                    port: 6789,
-                    sslPort: null,
-                  },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'elan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
+                  port: 6789,
+                  sslPort: null,
                 },
-              ],
-            },
+              },
+            ],
           },
         },
-        'system-pointers': [],
-        'current-dependents': {},
-        'current-dependencies': {
-          bitcoind: {
-            pointers: [],
-            'health-checks': [],
-          },
-          'btc-rpc-proxy': {
-            pointers: [],
-            'health-checks': [],
-          },
+      },
+      'current-dependents': {},
+      'current-dependencies': {
+        bitcoind: {
+          pointers: [],
+          'health-checks': [],
         },
-        'dependency-info': {
-          bitcoind: {
-            title: 'Bitcoin Core',
-            icon: 'assets/img/service-icons/bitcoind.svg',
-          },
-          'btc-rpc-proxy': {
-            title: 'Bitcoin Proxy',
-            icon: 'assets/img/service-icons/btc-rpc-proxy.png',
-          },
+        'btc-rpc-proxy': {
+          pointers: [],
+          'health-checks': [],
+        },
+      },
+      'dependency-info': {
+        bitcoind: {
+          title: 'Bitcoin Core',
+          icon: 'assets/img/service-icons/bitcoind.svg',
+        },
+        'btc-rpc-proxy': {
+          title: 'Bitcoin Proxy',
+          icon: 'assets/img/service-icons/btc-rpc-proxy.png',
         },
-        'marketplace-url': 'https://registry.start9.com/',
-        'developer-key': 'developer-key',
       },
+      'marketplace-url': 'https://registry.start9.com/',
+      'developer-key': 'developer-key',
     },
   },
 }
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index d6ad17019..71719ae4a 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -3,7 +3,7 @@ import { Inject, Injectable } from '@angular/core'
 import { WorkspaceConfig } from '@start9labs/shared'
 import { types } from '@start9labs/start-sdk'
 import {
-  InstalledPackageDataEntry,
+  PackageDataEntry,
   PackageMainStatus,
   PackageState,
 } from 'src/app/services/patch-db/data-model'
@@ -64,7 +64,7 @@ export class ConfigService {
 
   /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
   launchableAddress(
-    interfaces: InstalledPackageDataEntry['service-interfaces'],
+    interfaces: PackageDataEntry['service-interfaces'],
   ): string {
     const ui = Object.values(interfaces).find(i => i.type === 'ui')
 
@@ -128,7 +128,7 @@ export class ConfigService {
 }
 
 export function hasUi(
-  interfaces: InstalledPackageDataEntry['service-interfaces'],
+  interfaces: PackageDataEntry['service-interfaces'],
 ): boolean {
   return Object.values(interfaces).some(iface => iface.type === 'ui')
 }
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index 4762f2df1..8d0d93ead 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -4,12 +4,14 @@ import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
-  HealthCheckResult,
   HealthResult,
-  InstalledPackageDataEntry,
+  InstalledState,
+  PackageDataEntry,
   PackageMainStatus,
+  PackageState,
 } from './patch-db/data-model'
 import * as deepEqual from 'fast-deep-equal'
+import { isInstalled } from '../util/get-package-data'
 
 export type AllDependencyErrors = Record<string, PkgDependencyErrors>
 export type PkgDependencyErrors = Record<string, DependencyError | null>
@@ -55,14 +57,14 @@ export class DepErrorService {
     pkgId: string,
     outerErrors: AllDependencyErrors,
   ): PkgDependencyErrors {
-    const pkgInstalled = pkgs[pkgId].installed
+    const pkg = pkgs[pkgId]
 
-    if (!pkgInstalled) return {}
+    if (!isInstalled(pkg)) return {}
 
     return currentDeps(pkgs, pkgId).reduce(
       (innerErrors, depId): PkgDependencyErrors => ({
         ...innerErrors,
-        [depId]: this.getDepError(pkgs, pkgInstalled, depId, outerErrors),
+        [depId]: this.getDepError(pkgs, pkg, depId, outerErrors),
       }),
       {} as PkgDependencyErrors,
     )
@@ -70,21 +72,21 @@ export class DepErrorService {
 
   private getDepError(
     pkgs: DataModel['package-data'],
-    pkgInstalled: InstalledPackageDataEntry,
+    pkg: PackageDataEntry<InstalledState>,
     depId: string,
     outerErrors: AllDependencyErrors,
   ): DependencyError | null {
-    const depInstalled = pkgs[depId]?.installed
+    const dep = pkgs[depId]
 
     // not installed
-    if (!depInstalled) {
+    if (!dep || dep['state-info'].state !== PackageState.Installed) {
       return {
         type: DependencyErrorType.NotInstalled,
       }
     }
 
-    const pkgManifest = pkgInstalled.manifest
-    const depManifest = depInstalled.manifest
+    const pkgManifest = pkg['state-info'].manifest
+    const depManifest = dep['state-info'].manifest
 
     // incorrect version
     if (
@@ -102,16 +104,14 @@ export class DepErrorService {
 
     // invalid config
     if (
-      Object.values(pkgInstalled.status['dependency-config-errors']).some(
-        err => !!err,
-      )
+      Object.values(pkg.status['dependency-config-errors']).some(err => !!err)
     ) {
       return {
         type: DependencyErrorType.ConfigUnsatisfied,
       }
     }
 
-    const depStatus = depInstalled.status.main.status
+    const depStatus = dep.status.main.status
 
     // not running
     if (
@@ -125,12 +125,8 @@ export class DepErrorService {
 
     // health check failure
     if (depStatus === PackageMainStatus.Running) {
-      for (let id of pkgInstalled['current-dependencies'][depId][
-        'health-checks'
-      ]) {
-        if (
-          depInstalled.status.main.health[id]?.result !== HealthResult.Success
-        ) {
+      for (let id of pkg['current-dependencies'][depId]['health-checks']) {
+        if (dep.status.main.health[id]?.result !== HealthResult.Success) {
           return {
             type: DependencyErrorType.HealthChecksFailed,
           }
@@ -154,9 +150,9 @@ export class DepErrorService {
 }
 
 function currentDeps(pkgs: DataModel['package-data'], id: string): string[] {
-  return Object.keys(
-    pkgs[id]?.installed?.['current-dependencies'] || {},
-  ).filter(depId => depId !== id)
+  return Object.keys(pkgs[id]?.['current-dependencies'] || {}).filter(
+    depId => depId !== id,
+  )
 }
 
 function dependencyDepth(
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index 931b3b949..363fc8b89 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -107,31 +107,11 @@ export enum ServerStatus {
   BackingUp = 'backing-up',
 }
 
-export interface PackageDataEntry {
-  state: PackageState
-  'static-files': {
-    license: Url
-    instructions: Url
-    icon: Url
-  }
-  manifest: Manifest
-  installed?: InstalledPackageDataEntry // exists when: installed, updating
-  'install-progress'?: InstallProgress // exists when: installing, updating
-}
-
-export enum PackageState {
-  Installing = 'installing',
-  Installed = 'installed',
-  Updating = 'updating',
-  Removing = 'removing',
-  Restoring = 'restoring',
-}
-
-export interface InstalledPackageDataEntry {
+export type PackageDataEntry<T extends StateInfo = StateInfo> = {
+  'state-info': T
+  icon: Url
   status: Status
-  manifest: Manifest
   'last-backup': string | null
-  'system-pointers': any[]
   'current-dependents': { [id: string]: CurrentDependencyInfo }
   'current-dependencies': { [id: string]: CurrentDependencyInfo }
   'dependency-info': {
@@ -145,6 +125,32 @@ export interface InstalledPackageDataEntry {
   'developer-key': string
 }
 
+export type StateInfo = InstalledState | InstallingState | UpdatingState
+
+export type InstalledState = {
+  state: PackageState.Installed | PackageState.Removing
+  manifest: Manifest
+}
+
+export type InstallingState = {
+  state: PackageState.Installing | PackageState.Restoring
+  'installing-info': InstallingInfo
+}
+
+export type UpdatingState = {
+  state: PackageState.Updating
+  'installing-info': InstallingInfo
+  manifest: Manifest
+}
+
+export enum PackageState {
+  Installing = 'installing',
+  Installed = 'installed',
+  Updating = 'updating',
+  Removing = 'removing',
+  Restoring = 'restoring',
+}
+
 export interface CurrentDependencyInfo {
   pointers: any[]
   'health-checks': string[] // array of health check IDs
@@ -354,12 +360,13 @@ export interface HealthCheckResultFailure {
   error: string
 }
 
-export interface InstallProgress {
-  readonly size: number | null
-  readonly downloaded: number
-  readonly 'download-complete': boolean
-  readonly validated: number
-  readonly 'validation-complete': boolean
-  readonly unpacked: number
-  readonly 'unpack-complete': boolean
+export type InstallingInfo = {
+  progress: FullProgress
+  'new-manifest': Manifest
+}
+
+export type FullProgress = {
+  overall: Progress
+  phases: { name: string; progress: Progress }[]
 }
+export type Progress = boolean | { done: number; total: number | null } // false means indeterminate. true means complete
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index 28c58a809..a041b5e7c 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -22,15 +22,15 @@ export function renderPkgStatus(
   let dependency: DependencyStatus | null = null
   let health: HealthStatus | null = null
 
-  if (pkg.state === PackageState.Installed && pkg.installed) {
-    primary = getPrimaryStatus(pkg.installed.status)
+  if (pkg['state-info'].state === PackageState.Installed) {
+    primary = getPrimaryStatus(pkg.status)
     dependency = getDependencyStatus(depErrors)
     health = getHealthStatus(
-      pkg.installed.status,
-      !isEmptyObject(pkg.manifest['health-checks']),
+      pkg.status,
+      !isEmptyObject(pkg['state-info'].manifest['health-checks']),
     )
   } else {
-    primary = pkg.state as string as PrimaryStatus
+    primary = pkg['state-info'].state as string as PrimaryStatus
   }
 
   return { primary, dependency, health }
diff --git a/web/projects/ui/src/app/services/ui-launcher.service.ts b/web/projects/ui/src/app/services/ui-launcher.service.ts
index 70666e264..82250048a 100644
--- a/web/projects/ui/src/app/services/ui-launcher.service.ts
+++ b/web/projects/ui/src/app/services/ui-launcher.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@angular/core'
 import { WINDOW } from '@ng-web-apis/common'
-import { InstalledPackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { ConfigService } from './config.service'
 
 @Injectable({
@@ -12,7 +12,7 @@ export class UiLauncherService {
     private readonly config: ConfigService,
   ) {}
 
-  launch(interfaces: InstalledPackageDataEntry['service-interfaces']): void {
+  launch(interfaces: PackageDataEntry['service-interfaces']): void {
     this.windowRef.open(
       this.config.launchableAddress(interfaces),
       '_blank',
diff --git a/web/projects/ui/src/app/types/progress-data.ts b/web/projects/ui/src/app/types/progress-data.ts
deleted file mode 100644
index a05e475a1..000000000
--- a/web/projects/ui/src/app/types/progress-data.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface ProgressData {
-  totalProgress: number
-  downloadProgress: number
-  validateProgress: number
-  unpackProgress: number
-  isComplete: boolean
-}
diff --git a/web/projects/ui/src/app/util/dry-update.ts b/web/projects/ui/src/app/util/dry-update.ts
index 9b7ba44a3..2a37c9160 100644
--- a/web/projects/ui/src/app/util/dry-update.ts
+++ b/web/projects/ui/src/app/util/dry-update.ts
@@ -1,5 +1,6 @@
 import { Emver } from '@start9labs/shared'
 import { DataModel } from '../services/patch-db/data-model'
+import { getManifest } from './get-package-data'
 
 export function dryUpdate(
   { id, version }: { id: string; version: string },
@@ -9,9 +10,10 @@ export function dryUpdate(
   return Object.values(pkgs)
     .filter(
       pkg =>
-        Object.keys(pkg.installed?.['current-dependencies'] || {}).some(
+        Object.keys(pkg['current-dependencies'] || {}).some(
           pkgId => pkgId === id,
-        ) && !emver.satisfies(version, pkg.manifest.dependencies[id].version),
+        ) &&
+        !emver.satisfies(version, getManifest(pkg).dependencies[id].version),
     )
-    .map(pkg => pkg.manifest.title)
+    .map(pkg => getManifest(pkg).title)
 }
diff --git a/web/projects/ui/src/app/util/get-package-data.ts b/web/projects/ui/src/app/util/get-package-data.ts
index 0645f3b3c..472a549d5 100644
--- a/web/projects/ui/src/app/util/get-package-data.ts
+++ b/web/projects/ui/src/app/util/get-package-data.ts
@@ -1,7 +1,12 @@
 import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
+  InstalledState,
+  InstallingState,
+  Manifest,
   PackageDataEntry,
+  PackageState,
+  UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { firstValueFrom } from 'rxjs'
 
@@ -17,3 +22,41 @@ export async function getAllPackages(
 ): Promise<DataModel['package-data']> {
   return firstValueFrom(patch.watch$('package-data'))
 }
+
+export function getManifest(pkg: PackageDataEntry): Manifest {
+  if (isInstalled(pkg) || isRemoving(pkg)) return pkg['state-info'].manifest
+
+  return (pkg['state-info'] as InstallingState)['installing-info'][
+    'new-manifest'
+  ]
+}
+
+export function isInstalled(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<InstalledState> {
+  return pkg['state-info'].state === PackageState.Installed
+}
+
+export function isRemoving(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<InstalledState> {
+  return pkg['state-info'].state === PackageState.Removing
+}
+
+export function isInstalling(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<InstallingState> {
+  return pkg['state-info'].state === PackageState.Installing
+}
+
+export function isRestoring(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<InstallingState> {
+  return pkg['state-info'].state === PackageState.Restoring
+}
+
+export function isUpdating(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<UpdatingState> {
+  return pkg['state-info'].state === PackageState.Updating
+}
diff --git a/web/projects/ui/src/app/util/get-package-info.ts b/web/projects/ui/src/app/util/get-package-info.ts
index 14901f201..936ed9954 100644
--- a/web/projects/ui/src/app/util/get-package-info.ts
+++ b/web/projects/ui/src/app/util/get-package-info.ts
@@ -7,9 +7,7 @@ import {
   renderPkgStatus,
   StatusRendering,
 } from '../services/pkg-status-rendering.service'
-import { ProgressData } from 'src/app/types/progress-data'
 import { Subscription } from 'rxjs'
-import { packageLoadingProgress } from './package-loading-progress'
 import { PkgDependencyErrors } from '../services/dep-error.service'
 
 export function getPackageInfo(
@@ -23,7 +21,6 @@ export function getPackageInfo(
     entry,
     primaryRendering,
     primaryStatus: statuses.primary,
-    installProgress: packageLoadingProgress(entry['install-progress']),
     error:
       statuses.health === HealthStatus.Failure ||
       statuses.dependency === DependencyStatus.Warning,
@@ -40,7 +37,6 @@ export interface PkgInfo {
   entry: PackageDataEntry
   primaryRendering: StatusRendering
   primaryStatus: PrimaryStatus
-  installProgress: ProgressData | null
   error: boolean
   warning: boolean
   transitioning: boolean
diff --git a/web/projects/ui/src/app/util/has-deps.ts b/web/projects/ui/src/app/util/has-deps.ts
index 94b3fa4cd..3699ef916 100644
--- a/web/projects/ui/src/app/util/has-deps.ts
+++ b/web/projects/ui/src/app/util/has-deps.ts
@@ -1,7 +1,8 @@
 import { PackageDataEntry } from '../services/patch-db/data-model'
+import { getManifest } from './get-package-data'
 
 export function hasCurrentDeps(pkg: PackageDataEntry): boolean {
-  return !!Object.keys(pkg.installed?.['current-dependents'] || {}).filter(
-    depId => depId !== pkg.manifest.id,
+  return !!Object.keys(pkg['current-dependents']).filter(
+    depId => depId !== getManifest(pkg).id,
   ).length
 }
diff --git a/web/projects/ui/src/app/util/package-loading-progress.ts b/web/projects/ui/src/app/util/package-loading-progress.ts
deleted file mode 100644
index 3c699dfd3..000000000
--- a/web/projects/ui/src/app/util/package-loading-progress.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { isEmptyObject } from '@start9labs/shared'
-import { ProgressData } from 'src/app/types/progress-data'
-import { InstallProgress } from '../services/patch-db/data-model'
-
-export function packageLoadingProgress(
-  loadData?: InstallProgress,
-): ProgressData | null {
-  if (!loadData || isEmptyObject(loadData)) {
-    return null
-  }
-
-  let {
-    downloaded,
-    validated,
-    unpacked,
-    size,
-    'download-complete': downloadComplete,
-    'validation-complete': validationComplete,
-    'unpack-complete': unpackComplete,
-  } = loadData
-
-  // only permit 100% when "complete" == true
-  size = size || 0
-  downloaded = downloadComplete ? size : Math.max(downloaded - 1, 0)
-  validated = validationComplete ? size : Math.max(validated - 1, 0)
-  unpacked = unpackComplete ? size : Math.max(unpacked - 1, 0)
-
-  const downloadWeight = 1
-  const validateWeight = 0.2
-  const unpackWeight = 0.7
-
-  const numerator = Math.floor(
-    downloadWeight * downloaded +
-      validateWeight * validated +
-      unpackWeight * unpacked,
-  )
-
-  const denominator = Math.floor(
-    size * (downloadWeight + validateWeight + unpackWeight),
-  )
-  const totalProgress = Math.floor((100 * numerator) / denominator)
-
-  return {
-    totalProgress,
-    downloadProgress: Math.floor((100 * downloaded) / size),
-    validateProgress: Math.floor((100 * validated) / size),
-    unpackProgress: Math.floor((100 * unpacked) / size),
-    isComplete: downloadComplete && validationComplete && unpackComplete,
-  }
-}

From 3ac71e2f7fcd80bcd7aa14abb49dc7895072c409 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 19 Mar 2024 11:55:38 -0600
Subject: [PATCH 074/341] include sdk.Mounts

---
 sdk/lib/StartSdk.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index b3b417802..d095fcd77 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -71,6 +71,7 @@ import { getServiceInterfaces } from "./util/getServiceInterfaces"
 import { getStore } from "./store/getStore"
 import { CommandOptions, MountOptions, Overlay } from "./util/Overlay"
 import { splitCommand } from "./util/splitCommand"
+import { Mounts } from "./mainFn/Mounts"
 
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
@@ -333,7 +334,11 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         changeOnFirstSuccess,
         successFailure,
       },
-
+      Mounts: {
+        of() {
+          return Mounts.of<Manifest>()
+        },
+      },
       Backups: {
         volumes: (
           ...volumeNames: Array<Manifest["volumes"][number] & string>

From 590f6d4c194eabc1e782d56391be180f22368d33 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 19 Mar 2024 11:58:38 -0600
Subject: [PATCH 075/341] chore: Update the types

---
 core/startos/bindings/ExposedUI.ts            |  2 +-
 core/startos/src/db/model/package.rs          | 44 +++++++++++----
 core/startos/src/properties.rs                | 54 +++++++++++++------
 .../src/service/service_effect_handler.rs     | 48 ++++-------------
 sdk/lib/inits/setupInit.ts                    | 20 ++++---
 sdk/lib/test/startosTypeValidation.test.ts    |  3 +-
 sdk/lib/types.ts                              |  4 +-
 7 files changed, 97 insertions(+), 78 deletions(-)

diff --git a/core/startos/bindings/ExposedUI.ts b/core/startos/bindings/ExposedUI.ts
index 1354bb576..bef4c8214 100644
--- a/core/startos/bindings/ExposedUI.ts
+++ b/core/startos/bindings/ExposedUI.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ExposedUI { path: string, title: string, description: string | null, masked: boolean | null, copyable: boolean | null, qr: boolean | null, }
\ No newline at end of file
+export type ExposedUI = { "type": "object", value: {[key: string]: ExposedUI}, description: string | null, } | { "type": "string", path: string, description: string | null, masked: boolean, copyable: boolean | null, qr: boolean | null, };
\ No newline at end of file
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index cb4e3a255..97e90b894 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -303,7 +303,7 @@ pub struct PackageDataEntry {
     pub current_dependencies: CurrentDependencies,
     pub interface_addresses: InterfaceAddressMap,
     pub hosts: HostInfo,
-    pub store_exposed_ui: Vec<ExposedUI>,
+    pub store_exposed_ui: StoreExposedUI,
     pub store_exposed_dependents: Vec<JsonPointer>,
 }
 impl AsRef<PackageDataEntry> for PackageDataEntry {
@@ -322,17 +322,39 @@ pub struct ExposedDependent {
     copyable: Option<bool>,
     qr: Option<bool>,
 }
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
-#[model = "Model<Self>"]
+#[derive(Default, Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct StoreExposedUI(pub BTreeMap<InternedString, ExposedUI>);
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[serde(tag = "type")]
 #[ts(export)]
-pub struct ExposedUI {
-    #[ts(type = "string")]
-    pub path: JsonPointer,
-    pub title: String,
-    pub description: Option<String>,
-    pub masked: Option<bool>,
-    pub copyable: Option<bool>,
-    pub qr: Option<bool>,
+pub enum ExposedUI {
+    Object {
+        #[ts(type = "{[key: string]: ExposedUI}")]
+        value: BTreeMap<String, ExposedUI>,
+        #[serde(default)]
+        #[ts(type = "string | null")]
+        description: String,
+    },
+    String {
+        #[ts(type = "string")]
+        path: JsonPointer,
+        description: Option<String>,
+        masked: bool,
+        copyable: Option<bool>,
+        qr: Option<bool>,
+    },
+}
+
+impl Default for ExposedUI {
+    fn default() -> Self {
+        ExposedUI::Object {
+            value: BTreeMap::new(),
+            description: "".to_string(),
+        }
+    }
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 4f59d4303..060518aff 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -1,13 +1,15 @@
+use std::collections::BTreeMap;
+
 use clap::Parser;
-use imbl_value::{json, Value};
+use imbl_value::{json, InOMap, InternedString, Value};
 use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 
-use crate::context::RpcContext;
 use crate::db::model::package::ExposedUI;
 use crate::prelude::*;
 use crate::Error;
+use crate::{context::RpcContext, db::model::package::StoreExposedUI};
 
 pub fn display_properties(response: Value) {
     println!("{}", response);
@@ -16,24 +18,42 @@ pub fn display_properties(response: Value) {
 trait IntoProperties {
     fn into_properties(self, store: &Value) -> Value;
 }
-impl IntoProperties for Vec<ExposedUI> {
+impl IntoProperties for ExposedUI {
     fn into_properties(self, store: &Value) -> Value {
-        let mut data = json!({});
-        for ui in self {
-            let value = ui.path.get(store);
-            data[ui.title] = json!({
+        match self {
+            ExposedUI::Object { value, description } => {
+                json!({
+                    "type": "object",
+                    "description": description,
+                    "value": value.into_iter().map(|(k, v)| (k, v.into_properties(store))).collect::<BTreeMap<String,_>>()
+                })
+            }
+            ExposedUI::String {
+                path,
+                description,
+                masked,
+                copyable,
+                qr,
+            } => json!({
                 "type": "string",
-                "description": ui.description,
-                "value": value.map(|x| x.to_string()).unwrap_or_default(),
-                "copyable": ui.copyable,
-                "qr": ui.qr,
-                "masked": ui.masked,
-            });
+                "description": description,
+                "value": path.get(store).cloned().unwrap_or_default(),
+                "copyable": copyable,
+                "qr": qr,
+                "masked": masked
+            }),
         }
-        json!({
-            "version": 2,
-            "data": data
-        })
+    }
+}
+
+impl IntoProperties for StoreExposedUI {
+    fn into_properties(self, store: &Value) -> Value {
+        Value::Object(
+            self.0
+                .into_iter()
+                .map(|(k, v)| (k, v.into_properties(store)))
+                .collect::<InOMap<InternedString, Value>>(),
+        )
     }
 }
 
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index df332f970..585da0d7d 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -16,7 +16,9 @@ use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use ts_rs::TS;
 
-use crate::db::model::package::{CurrentDependencies, CurrentDependencyInfo, ExposedUI};
+use crate::db::model::package::{
+    CurrentDependencies, CurrentDependencyInfo, ExposedUI, StoreExposedUI,
+};
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
@@ -674,6 +676,10 @@ async fn expose_for_dependents(
     context: EffectContext,
     ExposeForDependentsParams { paths }: ExposeForDependentsParams,
 ) -> Result<(), Error> {
+    Ok(())
+}
+
+async fn expose_ui(context: EffectContext, params: StoreExposedUI) -> Result<(), Error> {
     let context = context.deref()?;
     let package_id = context.id.clone();
     context
@@ -684,48 +690,12 @@ async fn expose_for_dependents(
                 .as_package_data_mut()
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
-                .as_store_exposed_dependents_mut()
-                .ser(&paths)
+                .as_store_exposed_ui_mut()
+                .ser(&params)
         })
         .await?;
     Ok(())
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[serde(tag = "type")]
-#[ts(export)]
-enum ExposeUiParams {
-    Object {
-        #[ts(type = "{[key: string]: ExposeUiParams}")]
-        value: OrdMap<String, ExposeUiParams>,
-    },
-    String {
-        path: String,
-        description: Option<String>,
-        masked: bool,
-        copyable: Option<bool>,
-        qr: Option<bool>,
-    },
-}
-
-async fn expose_ui(context: EffectContext, params: ExposeUiParams) -> Result<(), Error> {
-    todo!()
-    // let context = context.deref()?;
-    // let package_id = context.id.clone();
-    // context
-    //     .ctx
-    //     .db
-    //     .mutate(|db| {
-    //         db.as_public_mut()
-    //             .as_package_data_mut()
-    //             .as_idx_mut(&package_id)
-    //             .or_not_found(&package_id)?
-    //             .as_store_exposed_ui_mut()
-    //             .ser(&paths)
-    //     })
-    //     .await?;
-    // Ok(())
-}
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index 2df688f18..ed7ccaad8 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -26,12 +26,7 @@ export function setupInit<Manifest extends SDKManifest, Store>(
       })
       const { services, ui } = await setupExports(opts)
       await opts.effects.exposeForDependents(services)
-      await opts.effects.exposeUi(
-        forExpose({
-          type: "object",
-          value: ui,
-        }),
-      )
+      await opts.effects.exposeUi(forExpose(ui))
     },
     uninit: async (opts) => {
       await migrations.uninit(opts)
@@ -39,14 +34,23 @@ export function setupInit<Manifest extends SDKManifest, Store>(
     },
   }
 }
+function forExpose<Store>(ui: { [key: string]: ExposeUiPaths<Store> }) {
+  return Object.fromEntries(
+    Object.entries(ui).map(([key, value]) => [key, forExpose_(value)]),
+  )
+}
 
-function forExpose<Store>(ui: ExposeUiPaths<Store>): ExposeUiPathsAll {
+function forExpose_<Store>(ui: ExposeUiPaths<Store>): ExposeUiPathsAll {
   if (ui.type === ("object" as const)) {
     return {
       type: "object" as const,
       value: Object.fromEntries(
-        Object.entries(ui.value).map(([key, value]) => [key, forExpose(value)]),
+        Object.entries(ui.value).map(([key, value]) => [
+          key,
+          forExpose_(value),
+        ]),
       ),
+      description: ui.description ?? null,
     }
   }
   return {
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index 5f1be60bb..0bd78defa 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -24,6 +24,7 @@ import { ExportActionParams } from "../../../core/startos/bindings/ExportActionP
 import { RemoveActionParams } from "../../../core/startos/bindings/RemoveActionParams"
 import { ReverseProxyParams } from "../../../core/startos/bindings/ReverseProxyParams"
 import { MountParams } from "../../../core/startos/bindings/MountParams"
+import { ExposedUI } from "../../../core/startos/bindings/ExposedUI"
 function typeEquality<ExpectedType>(_a: ExpectedType) {}
 describe("startosTypeValidation ", () => {
   test(`checking the params match`, () => {
@@ -48,7 +49,7 @@ describe("startosTypeValidation ", () => {
       setConfigured: {} as SetConfigured,
       setHealth: {} as SetHealth,
       exposeForDependents: {} as ExposeForDependentsParams,
-      exposeUi: {} as ExposeUiParams,
+      exposeUi: {} as { [key: string]: ExposedUI },
       getSslCertificate: {} as GetSslCertificateParams,
       getSslKey: {} as GetSslKeyParams,
       getServiceInterface: {} as GetServiceInterfaceParams,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 35e345618..6d6b2d7d7 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -265,6 +265,7 @@ export type ExposeUiPaths<Store> =
   | {
       type: "object"
       value: { [k: string]: ExposeUiPaths<Store> }
+      description?: string
     }
   | {
       type: "string"
@@ -283,6 +284,7 @@ export type ExposeUiPathsAll =
   | {
       type: "object"
       value: { [k: string]: ExposeUiPathsAll }
+      description: string | null
     }
   | {
       type: "string"
@@ -395,7 +397,7 @@ export type Effects = {
 
   exposeForDependents(options: { paths: string[] }): Promise<void>
 
-  exposeUi(options: ExposeUiPathsAll): Promise<void>
+  exposeUi(options: { [key: string]: ExposeUiPathsAll }): Promise<void>
   /**
    * There are times that we want to see the addresses that where exported
    * @param options.addressId If we want to filter the address id

From 47b19e32118452d41c79184e0e7086e485026a40 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 19 Mar 2024 11:59:02 -0600
Subject: [PATCH 076/341] fix duplicate

---
 sdk/lib/StartSdk.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 455527e35..42a6b8409 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -239,12 +239,6 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           input,
         )
       },
-
-      Mounts: {
-        of() {
-          return Mounts.of<Manifest>()
-        },
-      },
       HealthCheck: {
         of: healthCheck,
       },

From 8d83f64aba937369323ede41c97d5b7fd182d41f Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 19 Mar 2024 13:27:51 -0600
Subject: [PATCH 077/341] chore: Update the types for the mocks in the services

---
 .../ui/src/app/services/api/api.fixures.ts    | 31 ++++++++++---------
 .../ui/src/app/services/api/mock-patch.ts     | 24 +++++++-------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 46738041a..22e6a3b32 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1786,8 +1786,7 @@ export module Mock {
               preferredExternalPort: 443,
               scheme: 'https',
             },
-            secure: false,
-            ssl: false,
+            secure: null,
           },
           suffix: '',
         },
@@ -1859,8 +1858,7 @@ export module Mock {
               preferredExternalPort: 443,
               scheme: 'https',
             },
-            secure: false,
-            ssl: false,
+            secure: null,
           },
           suffix: '',
         },
@@ -1928,8 +1926,9 @@ export module Mock {
             scheme: 'bitcoin',
             preferredExternalPort: 8333,
             addSsl: null,
-            secure: true,
-            ssl: false,
+            secure: {
+              ssl: false,
+            },
           },
           suffix: '',
         },
@@ -2028,8 +2027,9 @@ export module Mock {
               preferredExternalPort: 443,
               scheme: 'https',
             },
-            secure: true,
-            ssl: true,
+            secure: {
+              ssl: true,
+            },
           },
           suffix: '',
         },
@@ -2170,8 +2170,9 @@ export module Mock {
             scheme: 'grpc',
             preferredExternalPort: 10009,
             addSsl: null,
-            secure: true,
-            ssl: true,
+            secure: {
+              ssl: true,
+            },
           },
           suffix: '',
         },
@@ -2239,8 +2240,9 @@ export module Mock {
             scheme: 'lndconnect',
             preferredExternalPort: 10009,
             addSsl: null,
-            secure: true,
-            ssl: true,
+            secure: {
+              ssl: true,
+            },
           },
           suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
         },
@@ -2308,8 +2310,9 @@ export module Mock {
             scheme: null,
             preferredExternalPort: 9735,
             addSsl: null,
-            secure: true,
-            ssl: true,
+            secure: {
+              ssl: true,
+            },
           },
           suffix: '',
         },
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index ec4b5aac7..5fd3326a9 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -134,8 +134,7 @@ export const mockPatchData: DataModel = {
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
-              secure: false,
-              ssl: false,
+              secure: null,
             },
             suffix: '',
           },
@@ -207,8 +206,7 @@ export const mockPatchData: DataModel = {
                 preferredExternalPort: 443,
                 scheme: 'https',
               },
-              secure: false,
-              ssl: false,
+              secure: null,
             },
             suffix: '',
           },
@@ -276,8 +274,9 @@ export const mockPatchData: DataModel = {
               scheme: 'bitcoin',
               preferredExternalPort: 8333,
               addSsl: null,
-              secure: true,
-              ssl: false,
+              secure: {
+                ssl: false,
+              },
             },
             suffix: '',
           },
@@ -377,8 +376,9 @@ export const mockPatchData: DataModel = {
               scheme: 'grpc',
               preferredExternalPort: 10009,
               addSsl: null,
-              secure: true,
-              ssl: true,
+              secure: {
+                ssl: true,
+              },
             },
             suffix: '',
           },
@@ -446,8 +446,9 @@ export const mockPatchData: DataModel = {
               scheme: 'lndconnect',
               preferredExternalPort: 10009,
               addSsl: null,
-              secure: true,
-              ssl: true,
+              secure: {
+                ssl: true,
+              },
             },
             suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
           },
@@ -515,8 +516,7 @@ export const mockPatchData: DataModel = {
               scheme: null,
               preferredExternalPort: 9735,
               addSsl: null,
-              secure: true,
-              ssl: true,
+              secure: { ssl: true },
             },
             suffix: '',
           },

From 57f548c6c0d5f38a59cdca513b935b27d97961c1 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 19 Mar 2024 16:54:27 -0600
Subject: [PATCH 078/341] fix certificate chain

---
 core/startos/src/net/ssl.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index 44d7cf0da..49ab74cfc 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -140,10 +140,10 @@ pub struct FullchainCertData {
 }
 impl FullchainCertData {
     pub fn fullchain_ed25519(&self) -> Vec<&X509> {
-        vec![&self.root, &self.int, &self.leaf.certs.ed25519]
+        vec![&self.leaf.certs.ed25519, &self.int, &self.root]
     }
     pub fn fullchain_nistp256(&self) -> Vec<&X509> {
-        vec![&self.root, &self.int, &self.leaf.certs.nistp256]
+        vec![&self.leaf.certs.nistp256, &self.int, &self.root]
     }
 }
 

From 53d82618d9363bd5a95f0a5e386e64fc652afeb3 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 20 Mar 2024 10:48:03 -0600
Subject: [PATCH 079/341] chore: Update the types and get the container-runtime
 working

---
 .../DockerProcedureContainer.ts               |  12 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |   7 +-
 .../Systems/SystemForEmbassy/index.ts         | 142 +++++++++++-------
 .../SystemForEmbassy/polyfillEffects.ts       |  22 +--
 sdk/lib/StartSdk.ts                           |  31 ++--
 sdk/lib/index.ts                              |   3 +
 sdk/lib/mainFn/Daemons.ts                     |   2 +-
 sdk/lib/types.ts                              |   2 +
 sdk/lib/util/index.ts                         |   2 +
 sdk/lib/util/splitCommand.ts                  |   4 +-
 10 files changed, 139 insertions(+), 88 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 7852a1ec7..1a8b54e22 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -28,9 +28,15 @@ export class DockerProcedureContainer {
         await fs.mkdir(path, { recursive: true })
         const volumeMount = volumes[mount]
         if (volumeMount.type === "data") {
-          await overlay.mount({ type: "volume", id: mount }, mounts[mount])
+          await overlay.mount(
+            { type: "volume", id: mount, subpath: null, readonly: false },
+            mounts[mount],
+          )
         } else if (volumeMount.type === "assets") {
-          await overlay.mount({ type: "assets", id: mount }, mounts[mount])
+          await overlay.mount(
+            { type: "assets", id: mount, subpath: null },
+            mounts[mount],
+          )
         } else if (volumeMount.type === "certificate") {
           volumeMount
           const certChain = await effects.getSslCertificate({
@@ -56,7 +62,7 @@ export class DockerProcedureContainer {
             location: path,
             target: {
               packageId: volumeMount["package-id"],
-              path: volumeMount.path,
+              subpath: volumeMount.path,
               readonly: volumeMount.readonly,
               volumeId: volumeMount["volume-id"],
             },
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 9a64fd33d..e5e532246 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -2,8 +2,7 @@ import { PolyfillEffects } from "./polyfillEffects"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { SystemForEmbassy } from "."
 import { HostSystemStartOs } from "../../HostSystemStartOs"
-import { util, Daemons, types as T } from "@start9labs/start-sdk"
-import { exec } from "child_process"
+import { Daemons, T, daemons } from "@start9labs/start-sdk"
 
 const EMBASSY_HEALTH_INTERVAL = 15 * 1000
 const EMBASSY_PROPERTIES_LOOP = 30 * 1000
@@ -39,7 +38,6 @@ export class MainLoop {
 
   private async constructMainEvent() {
     const { system, effects } = this
-    const utils = util.createUtils(effects)
     const currentCommand: [string, ...string[]] = [
       system.manifest.main.entrypoint,
       ...system.manifest.main.args,
@@ -67,7 +65,8 @@ export class MainLoop {
       //   }),
       // }
     }
-    const daemon = await utils.runDaemon(
+    const daemon = await daemons.runDaemon()(
+      this.effects,
       this.system.manifest.main.image,
       currentCommand,
       {
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 79c797293..a774d7ba0 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -1,4 +1,4 @@
-import { types as T, util, EmVer, Utils } from "@start9labs/start-sdk"
+import { types as T, util, EmVer } from "@start9labs/start-sdk"
 import * as fs from "fs/promises"
 
 import { PolyfillEffects } from "./polyfillEffects"
@@ -22,6 +22,9 @@ import {
   any,
   tuple,
   number,
+  anyOf,
+  deferred,
+  Parser,
 } from "ts-matches"
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
@@ -37,58 +40,94 @@ const MANIFEST_LOCATION = "/usr/lib/startos/package/embassyManifest.json"
 const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
 const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig"
 
-const matchPackagePropertyObject = object({
-  value: any,
-  type: literal("object"),
-  description: string,
-})
-
-const matchPackagePropertyString = object(
-  {
-    type: literal("string"),
+export type PackagePropertiesV2 = {
+  [name: string]: PackagePropertyObject | PackagePropertyString
+}
+export type PackagePropertyString = {
+  type: "string"
+  description?: string
+  value: string
+  /** Let's the ui make this copyable button */
+  copyable?: boolean
+  /** Let the ui create a qr for this field */
+  qr?: boolean
+  /** Hiding the value unless toggled off for field */
+  masked?: boolean
+}
+export type PackagePropertyObject = {
+  value: PackagePropertiesV2
+  type: "object"
+  description: string
+}
+const [matchPackageProperties, setMatchPackageProperties] =
+  deferred<PackagePropertiesV2>()
+const matchPackagePropertyObject: Parser<unknown, PackagePropertyObject> =
+  object({
+    value: matchPackageProperties,
+    type: literal("object"),
     description: string,
-    value: string,
-    copyable: boolean,
-    qr: boolean,
-    masked: boolean,
-  },
-  ["copyable", "description", "qr", "masked"],
+  })
+
+const matchPackagePropertyString: Parser<unknown, PackagePropertyString> =
+  object(
+    {
+      type: literal("string"),
+      description: string,
+      value: string,
+      copyable: boolean,
+      qr: boolean,
+      masked: boolean,
+    },
+    ["copyable", "description", "qr", "masked"],
+  )
+setMatchPackageProperties(
+  dictionary([
+    string,
+    anyOf(matchPackagePropertyObject, matchPackagePropertyString),
+  ]),
 )
 
 const matchProperties = object({
   version: literal(2),
-  data: any,
+  data: matchPackageProperties,
 })
 
 type ExportUi = {
-  value: string
-  title: string
-  description?: string | undefined
-  masked?: boolean | undefined
-  copyable?: boolean | undefined
-  qr?: boolean | undefined
+  values: { [key: string]: any }
+  expose: { [key: string]: T.ExposeUiPathsAll }
 }
 
-function propertiesToExportUi(properties: unknown): ExportUi[] {
-  if (!object.test(properties)) return []
-  const paths: ExportUi[] = []
-  for (const key in properties) {
-    const value: unknown = (properties as any)[key]
-    if (matchPackagePropertyObject.test(value)) {
-      paths.push(...propertiesToExportUi(value))
+function propertiesToExportUi(
+  properties: PackagePropertiesV2,
+  previousPath = "",
+): ExportUi {
+  const exportUi: ExportUi = {
+    values: {},
+    expose: {},
+  }
+  for (const [key, value] of Object.entries(properties)) {
+    const path = `${previousPath}/${key}`
+    if (value.type === "object") {
+      const { values, expose } = propertiesToExportUi(value.value, path)
+      exportUi.values[key] = values
+      exportUi.expose[key] = {
+        type: "object",
+        value: expose,
+        description: value.description,
+      }
       continue
     }
-    if (!matchPackagePropertyString.test(value)) continue
-    paths.push({
-      value: value.value,
-      title: key,
-      description: value.description,
-      masked: value.masked,
-      copyable: value.copyable,
-      qr: value.qr,
-    })
+    exportUi.values[key] = value.value
+    exportUi.expose[key] = {
+      type: "string",
+      path,
+      description: value.description ?? null,
+      masked: value.masked ?? false,
+      copyable: value.copyable ?? null,
+      qr: value.qr ?? null,
+    }
   }
-  return paths
+  return exportUi
 }
 
 export class SystemForEmbassy implements System {
@@ -455,14 +494,9 @@ export class SystemForEmbassy implements System {
       const exposeUis = propertiesToExportUi(properties.data)
       await effects.store.set<any, any>({
         path: "/properties",
-        value: exposeUis.map((x) => x.value),
-      })
-      await effects.exposeUi({
-        paths: exposeUis.map((x, i) => ({
-          ...x,
-          path: `/properties/${i}`,
-        })) as any[],
+        value: exposeUis.values,
       })
+      await effects.exposeUi(exposeUis.expose)
     } else if (setConfigValue.type === "script") {
       const moduleCode = this.moduleCode
       const method = moduleCode.properties
@@ -479,14 +513,9 @@ export class SystemForEmbassy implements System {
       const exposeUis = propertiesToExportUi(properties.data)
       await effects.store.set<any, any>({
         path: "/properties",
-        value: exposeUis.map((x) => x.value),
-      })
-      await effects.exposeUi({
-        paths: exposeUis.map((x, i) => ({
-          ...x,
-          path: `/properties/${i}`,
-        })) as any[],
+        value: exposeUis.values,
       })
+      await effects.exposeUi(exposeUis.expose)
     }
   }
   private async health(
@@ -991,7 +1020,6 @@ async function updateConfig(
 ) {
   if (!dictionary([string, unknown]).test(spec)) return
   if (!dictionary([string, unknown]).test(mutConfigValue)) return
-  const utils = util.createUtils(effects)
   for (const key in spec) {
     const specValue = spec[key]
 
@@ -1020,8 +1048,8 @@ async function updateConfig(
     if (matchPointerPackage.test(specValue)) {
       if (specValue.target === "tor-key")
         throw new Error("This service uses an unsupported target TorKey")
-      const filled = await utils.serviceInterface
-        .get({
+      const filled = await util
+        .getServiceInterface(effects, {
           packageId: specValue["package-id"],
           id: specValue.interface,
         })
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 65a827103..4c176b2f7 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -3,23 +3,18 @@ import * as oet from "./oldEmbassyTypes"
 import { Volume } from "../../../Models/Volume"
 import * as child_process from "child_process"
 import { promisify } from "util"
-import { util, Utils } from "@start9labs/start-sdk"
-import { Manifest } from "./matchManifest"
+import { Daemons, startSdk, T } from "@start9labs/start-sdk"
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import "isomorphic-fetch"
-
-const { createUtils } = util
+import { Manifest } from "./matchManifest"
 
 const execFile = promisify(child_process.execFile)
 
 export class PolyfillEffects implements oet.Effects {
-  private utils: Utils<any, any>
   constructor(
     readonly effects: HostSystemStartOs,
     private manifest: Manifest,
-  ) {
-    this.utils = createUtils(effects as any)
-  }
+  ) {}
   async writeFile(input: {
     path: string
     volumeId: string
@@ -99,9 +94,14 @@ export class PolyfillEffects implements oet.Effects {
     args?: string[] | undefined
     timeoutMillis?: number | undefined
   }): Promise<oet.ResultType<string>> {
-    return this.utils
-      .runCommand(this.manifest.main.image, [command, ...(args || [])], {})
-      .then((x) => ({
+    return startSdk
+      .runCommand(
+        this.effects,
+        this.manifest.main.image,
+        [command, ...(args || [])],
+        {},
+      )
+      .then((x: any) => ({
         stderr: x.stderr.toString(),
         stdout: x.stdout.toString(),
       }))
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 42a6b8409..315dacecf 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -205,16 +205,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           mounts?: { path: string; options: MountOptions }[]
         },
       ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
-        const commands = splitCommand(command)
-        const overlay = await Overlay.of(effects, imageId)
-        try {
-          for (let mount of options.mounts || []) {
-            await overlay.mount(mount.options, mount.path)
-          }
-          return await overlay.exec(commands)
-        } finally {
-          await overlay.destroy()
-        }
+        return runCommand<Manifest>(effects, imageId, command, options)
       },
 
       createDynamicAction: <
@@ -654,3 +645,23 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
     }
   }
 }
+
+export async function runCommand<Manifest extends SDKManifest>(
+  effects: Effects,
+  imageId: Manifest["images"][number],
+  command: string | [string, ...string[]],
+  options: CommandOptions & {
+    mounts?: { path: string; options: MountOptions }[]
+  },
+): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
+  const commands = splitCommand(command)
+  const overlay = await Overlay.of(effects, imageId)
+  try {
+    for (let mount of options.mounts || []) {
+      await overlay.mount(mount.options, mount.path)
+    }
+    return await overlay.exec(commands)
+  } finally {
+    await overlay.destroy()
+  }
+}
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index 2b22e2c83..dbdc2ce7d 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -10,6 +10,7 @@ export * as config from "./config"
 export * as configBuilder from "./config/builder"
 export * as configTypes from "./config/configTypes"
 export * as dependencyConfig from "./dependencyConfig"
+export * as daemons from "./mainFn/Daemons"
 export * as health from "./health"
 export * as healthFns from "./health/checkFns"
 export * as inits from "./inits"
@@ -17,8 +18,10 @@ export * as mainFn from "./mainFn"
 export * as manifest from "./manifest"
 export * as toml from "@iarna/toml"
 export * as types from "./types"
+export * as T from "./types"
 export * as util from "./util"
 export * as yaml from "yaml"
+export * as startSdk from "./StartSdk"
 
 export * as matches from "ts-matches"
 export * as YAML from "yaml"
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 300b61b83..540ca3d37 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -43,7 +43,7 @@ type Daemon<
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
 
-const runDaemon =
+export const runDaemon =
   <Manifest extends SDKManifest>() =>
   async <A extends string>(
     effects: Effects,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 6d6b2d7d7..2da7a6fcc 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -7,6 +7,8 @@ import { BindOptions, Scheme } from "./interfaces/Host"
 import { Daemons } from "./mainFn/Daemons"
 import { UrlString } from "./util/getServiceInterface"
 
+export { SDKManifest } from "./manifest/ManifestTypes"
+
 export type ExportedAction = (options: {
   effects: Effects
   input?: Record<string, unknown>
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index b3cab7183..8cafa2cf6 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -9,6 +9,8 @@ import "./Overlay"
 import "./once"
 import { SDKManifest } from "../manifest/ManifestTypes"
 
+export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
+export { getServiceInterfaces } from "./getServiceInterfaces"
 // prettier-ignore
 export type FlattenIntersection<T> = 
 T extends ArrayLike<any> ? T :
diff --git a/sdk/lib/util/splitCommand.ts b/sdk/lib/util/splitCommand.ts
index bf55a74c3..69f00a5a7 100644
--- a/sdk/lib/util/splitCommand.ts
+++ b/sdk/lib/util/splitCommand.ts
@@ -1,8 +1,8 @@
 import { arrayOf, string } from "ts-matches"
 import { ValidIfNoStupidEscape } from "../types"
 
-export const splitCommand = <A>(
-  command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+export const splitCommand = (
+  command: string | [string, ...string[]],
 ): string[] => {
   if (arrayOf(string).test(command)) return command
   return String(command)

From ddd5e4c76d13740f9d0c1a7db35c7b444808992e Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Wed, 20 Mar 2024 13:43:34 -0600
Subject: [PATCH 080/341] blu-j paired changes

---
 core/startos/src/service/service_effect_handler.rs | 3 ++-
 sdk/lib/StartSdk.ts                                | 2 +-
 sdk/lib/dependencyConfig/setupDependencyConfig.ts  | 2 +-
 sdk/lib/index.ts                                   | 2 +-
 sdk/lib/inits/setupExports.ts                      | 4 ++--
 sdk/lib/inits/setupInit.ts                         | 2 +-
 sdk/lib/types.ts                                   | 2 +-
 sdk/lib/util/index.ts                              | 3 ++-
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 585da0d7d..e8082e99e 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -4,6 +4,7 @@ use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
+use std::net::Ipv4Addr;
 
 use clap::builder::ValueParserFactory;
 use clap::Parser;
@@ -335,7 +336,7 @@ async fn get_system_smtp(
 ) -> Result<Value, Error> {
     todo!()
 }
-async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Value, Error> {
+async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Ipv4Addr, Error> {
     todo!()
 }
 async fn get_service_port_forward(
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 315dacecf..660950b6c 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -275,7 +275,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
             Store,
             Input,
             any
-          >
+          > | null
         },
       ) => setupDependencyConfig<Store, Input, Manifest>(config, autoConfigs),
       setupExports: (fn: SetupExports<Store>) => fn,
diff --git a/sdk/lib/dependencyConfig/setupDependencyConfig.ts b/sdk/lib/dependencyConfig/setupDependencyConfig.ts
index 3b6776945..c67c46a44 100644
--- a/sdk/lib/dependencyConfig/setupDependencyConfig.ts
+++ b/sdk/lib/dependencyConfig/setupDependencyConfig.ts
@@ -15,7 +15,7 @@ export function setupDependencyConfig<
       Store,
       Input,
       any
-    >
+    > | null
   },
 ): ExpectedExports.dependencyConfig {
   return autoConfigs
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index dbdc2ce7d..35c58411f 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -19,10 +19,10 @@ export * as manifest from "./manifest"
 export * as toml from "@iarna/toml"
 export * as types from "./types"
 export * as T from "./types"
-export * as util from "./util"
 export * as yaml from "yaml"
 export * as startSdk from "./StartSdk"
 
+export * as utils from "./util"
 export * as matches from "ts-matches"
 export * as YAML from "yaml"
 export * as TOML from "@iarna/toml"
diff --git a/sdk/lib/inits/setupExports.ts b/sdk/lib/inits/setupExports.ts
index 5f7c2b23f..089f8a41d 100644
--- a/sdk/lib/inits/setupExports.ts
+++ b/sdk/lib/inits/setupExports.ts
@@ -3,11 +3,11 @@ import { Effects, ExposeServicePaths, ExposeUiPaths } from "../types"
 export type SetupExports<Store> = (opts: { effects: Effects }) =>
   | {
       ui: { [k: string]: ExposeUiPaths<Store> }
-      services: ExposeServicePaths<Store>
+      services: ExposeServicePaths<Store>["paths"]
     }
   | Promise<{
       ui: { [k: string]: ExposeUiPaths<Store> }
-      services: ExposeServicePaths<Store>
+      services: ExposeServicePaths<Store>["paths"]
     }>
 
 export const setupExports = <Store>(fn: (opts: SetupExports<Store>) => void) =>
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index ed7ccaad8..80e1a202e 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -25,7 +25,7 @@ export function setupInit<Manifest extends SDKManifest, Store>(
         input: null,
       })
       const { services, ui } = await setupExports(opts)
-      await opts.effects.exposeForDependents(services)
+      await opts.effects.exposeForDependents({ paths: services })
       await opts.effects.exposeUi(forExpose(ui))
     },
     uninit: async (opts) => {
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 2da7a6fcc..add74a624 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -92,7 +92,7 @@ export namespace ExpectedExports {
   /** Auto configure is used to make sure that other dependencies have the values t
    * that this service could use.
    */
-  export type dependencyConfig = Record<PackageId, DependencyConfig>
+  export type dependencyConfig = Record<PackageId, DependencyConfig | null>
 }
 export type TimeMs = number
 export type VersionString = string
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index 8cafa2cf6..aa69b9dc7 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -7,7 +7,6 @@ import "./deepEqual"
 import "./deepMerge"
 import "./Overlay"
 import "./once"
-import { SDKManifest } from "../manifest/ManifestTypes"
 
 export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
 export { getServiceInterfaces } from "./getServiceInterfaces"
@@ -30,3 +29,5 @@ export type NoAny<A> = NeverPossible extends A
     ? never
     : A
   : A
+
+export { getDefaultString } from "./getDefaultString"

From c74bdc97caf06d1bcabfc9fff5f3582b06452c06 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 20 Mar 2024 13:46:32 -0600
Subject: [PATCH 081/341] fix: util -> utils in the container-runtime

---
 .../src/Adapters/Systems/SystemForEmbassy/index.ts            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index a774d7ba0..ae9b3f462 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -1,4 +1,4 @@
-import { types as T, util, EmVer } from "@start9labs/start-sdk"
+import { types as T, utils, EmVer } from "@start9labs/start-sdk"
 import * as fs from "fs/promises"
 
 import { PolyfillEffects } from "./polyfillEffects"
@@ -1048,7 +1048,7 @@ async function updateConfig(
     if (matchPointerPackage.test(specValue)) {
       if (specValue.target === "tor-key")
         throw new Error("This service uses an unsupported target TorKey")
-      const filled = await util
+      const filled = await utils
         .getServiceInterface(effects, {
           packageId: specValue["package-id"],
           id: specValue.interface,

From 4a27128a1c116c311df367bef7aae866cfa011c2 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 20 Mar 2024 20:28:31 -0600
Subject: [PATCH 082/341] chore: Update the types for changes that Matt wanted
 with sdk + examples

---
 .../startos/bindings/DependencyRequirement.ts |  3 +-
 core/startos/src/db/model/package.rs          |  2 +-
 .../src/service/service_effect_handler.rs     | 81 ++++++++++--------
 sdk/lib/Dependency.ts                         | 18 ++++
 sdk/lib/StartSdk.ts                           | 84 +++++++++++++++++--
 sdk/lib/emverLite/mod.ts                      | 73 +++++++++-------
 sdk/lib/inits/setupInit.ts                    | 13 ++-
 sdk/lib/manifest/ManifestTypes.ts             | 28 ++-----
 sdk/lib/test/configBuilder.test.ts            |  3 +-
 sdk/lib/test/output.sdk.ts                    |  3 +-
 sdk/lib/test/setupDependencyConfig.test.ts    |  4 +-
 sdk/lib/types.ts                              |  3 +-
 12 files changed, 212 insertions(+), 103 deletions(-)
 create mode 100644 sdk/lib/Dependency.ts

diff --git a/core/startos/bindings/DependencyRequirement.ts b/core/startos/bindings/DependencyRequirement.ts
index 0179c0e84..52bc25cd9 100644
--- a/core/startos/bindings/DependencyRequirement.ts
+++ b/core/startos/bindings/DependencyRequirement.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { DependencyKind } from "./DependencyKind";
 
-export interface DependencyRequirement { id: string, kind: DependencyKind, healthChecks: string[], }
\ No newline at end of file
+export type DependencyRequirement = { "kind": "running", id: string, healthChecks: string[], versionSpec: string, url: string, } | { "kind": "exists", id: string, versionSpec: string, url: string, };
\ No newline at end of file
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 97e90b894..3c7f3b7c7 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -412,7 +412,7 @@ pub struct StaticDependencyInfo {
     pub icon: DataUrl<'static>,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "kebab-case")]
 #[serde(tag = "kind")]
 pub enum CurrentDependencyInfo {
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index e8082e99e..65217ecd5 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1,10 +1,10 @@
 use std::collections::BTreeSet;
 use std::ffi::OsString;
+use std::net::Ipv4Addr;
 use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
-use std::net::Ipv4Addr;
 
 use clap::builder::ValueParserFactory;
 use clap::Parser;
@@ -765,8 +765,8 @@ async fn get_configured(context: EffectContext, _: Empty) -> Result<Value, Error
     let package = peeked
         .as_public()
         .as_package_data()
-        .as_idx(&package_id)
-        .or_not_found(&package_id)?
+        .as_idx(package_id)
+        .or_not_found(package_id)?
         .as_status()
         .as_configured()
         .de()?;
@@ -1070,28 +1070,39 @@ enum DependencyKind {
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "camelCase", tag = "kind")]
 #[ts(export)]
-struct DependencyRequirement {
-    #[ts(type = "string")]
-    id: PackageId,
-    kind: DependencyKind,
-    #[serde(default)]
-    #[ts(type = "string[]")]
-    health_checks: BTreeSet<HealthCheckId>,
+enum DependencyRequirement {
+    Running {
+        #[ts(type = "string")]
+        id: PackageId,
+        #[ts(type = "string[]")]
+        #[serde(rename = "healthChecks")]
+        health_checks: BTreeSet<HealthCheckId>,
+        #[serde(rename = "versionSpec")]
+        version_spec: String,
+        url: String,
+    },
+    Exists {
+        #[ts(type = "string")]
+        id: PackageId,
+        #[serde(rename = "versionSpec")]
+        version_spec: String,
+        url: String,
+    },
 }
 // filebrowser:exists,bitcoind:running:foo+bar+baz
 impl FromStr for DependencyRequirement {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s.split_once(':') {
-            Some((id, "e")) | Some((id, "exists")) => Ok(Self {
+            Some((id, "e")) | Some((id, "exists")) => Ok(Self::Exists {
                 id: id.parse()?,
-                kind: DependencyKind::Exists,
-                health_checks: BTreeSet::new(),
+                url: "".to_string(),
+                version_spec: "*".to_string(),
             }),
             Some((id, rest)) => {
-                let health_checks = match rest.split_once(":") {
+                let health_checks = match rest.split_once(':') {
                     Some(("r", rest)) | Some(("running", rest)) => rest
                         .split('+')
                         .map(|id| id.parse().map_err(Error::from))
@@ -1108,16 +1119,18 @@ impl FromStr for DependencyRequirement {
                         )),
                     },
                 }?;
-                Ok(Self {
+                Ok(Self::Running {
                     id: id.parse()?,
-                    kind: DependencyKind::Running,
                     health_checks,
+                    url: "".to_string(),
+                    version_spec: "*".to_string(),
                 })
             }
-            None => Ok(Self {
+            None => Ok(Self::Running {
                 id: s.parse()?,
-                kind: DependencyKind::Running,
                 health_checks: BTreeSet::new(),
+                url: "".to_string(),
+                version_spec: "*".to_string(),
             }),
         }
     }
@@ -1149,23 +1162,19 @@ async fn set_dependencies(
             let dependencies = CurrentDependencies(
                 dependencies
                     .into_iter()
-                    .map(
-                        |DependencyRequirement {
-                             id,
-                             kind,
-                             health_checks,
-                         }| {
-                            (
-                                id,
-                                match kind {
-                                    DependencyKind::Exists => CurrentDependencyInfo::Exists,
-                                    DependencyKind::Running => {
-                                        CurrentDependencyInfo::Running { health_checks }
-                                    }
-                                },
-                            )
-                        },
-                    )
+                    .map(|dependency| match dependency {
+                        DependencyRequirement::Exists {
+                            id,
+                            url,
+                            version_spec,
+                        } => (id, CurrentDependencyInfo::Exists),
+                        DependencyRequirement::Running {
+                            id,
+                            health_checks,
+                            url,
+                            version_spec,
+                        } => (id, CurrentDependencyInfo::Running { health_checks }),
+                    })
                     .collect(),
             );
             for (dep, entry) in db.as_public_mut().as_package_data_mut().as_entries_mut()? {
diff --git a/sdk/lib/Dependency.ts b/sdk/lib/Dependency.ts
new file mode 100644
index 000000000..71cc05890
--- /dev/null
+++ b/sdk/lib/Dependency.ts
@@ -0,0 +1,18 @@
+import { Checker } from "./emverLite/mod"
+
+export class Dependency {
+  constructor(
+    readonly data:
+      | {
+          type: "running"
+          versionSpec: Checker
+          url: string
+          healthChecks: string[]
+        }
+      | {
+          type: "exists"
+          versionSpec: Checker
+          url: string
+        },
+  ) {}
+}
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 660950b6c..77c791f55 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -50,7 +50,11 @@ import { Uninstall, UninstallFn, setupUninstall } from "./inits/setupUninstall"
 import { setupMain } from "./mainFn"
 import { defaultTrigger } from "./trigger/defaultTrigger"
 import { changeOnFirstSuccess, cooldownTrigger } from "./trigger"
-import setupConfig, { Read, Save } from "./config/setupConfig"
+import setupConfig, {
+  DependenciesReceipt,
+  Read,
+  Save,
+} from "./config/setupConfig"
 import {
   InterfacesReceipt,
   SetInterfaces,
@@ -72,6 +76,9 @@ import { getStore } from "./store/getStore"
 import { CommandOptions, MountOptions, Overlay } from "./util/Overlay"
 import { splitCommand } from "./util/splitCommand"
 import { Mounts } from "./mainFn/Mounts"
+import { Dependency } from "./Dependency"
+import * as T from "./types"
+import { Checker, EmVer } from "./emverLite/mod"
 
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
@@ -104,6 +111,20 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
   }
 
   build(isReady: AnyNeverCond<[Manifest, Store], "Build not ready", true>) {
+    type DependencyType = {
+      [K in keyof {
+        [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false
+          ? K
+          : never
+      }]: Dependency
+    } & {
+      [K in keyof {
+        [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends true
+          ? K
+          : never
+      }]?: Dependency
+    }
+
     return {
       serviceInterface: {
         getOwn: <E extends Effects>(effects: E, id: ServiceInterfaceId) =>
@@ -233,6 +254,11 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       HealthCheck: {
         of: healthCheck,
       },
+      Dependency: {
+        of(data: Dependency["data"]) {
+          return new Dependency({ ...data })
+        },
+      },
       healthCheck: {
         checkPortListening,
         checkWebUrl,
@@ -278,12 +304,48 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           > | null
         },
       ) => setupDependencyConfig<Store, Input, Manifest>(config, autoConfigs),
+      setupDependencies: <Input extends Record<string, any>>(
+        fn: (options: {
+          effects: Effects
+          input: Input | null
+        }) => Promise<DependencyType>,
+      ) => {
+        return async (options: { effects: Effects; input: Input }) => {
+          const dependencyType = await fn(options)
+          return await options.effects.setDependencies({
+            dependencies: Object.entries(dependencyType).map(
+              ([
+                id,
+                {
+                  data: { versionSpec, ...x },
+                },
+              ]) => ({
+                id,
+                ...x,
+                ...(x.type === "running"
+                  ? {
+                      kind: "running",
+                      healthChecks: x.healthChecks,
+                    }
+                  : {
+                      kind: "exists",
+                    }),
+                versionSpec: versionSpec.range,
+              }),
+            ),
+          })
+        }
+      },
       setupExports: (fn: SetupExports<Store>) => fn,
       setupInit: (
         migrations: Migrations<Manifest, Store>,
         install: Install<Manifest, Store>,
         uninstall: Uninstall<Manifest, Store>,
         setInterfaces: SetInterfaces<Manifest, Store, any, any>,
+        setDependencies: (options: {
+          effects: Effects
+          input: any
+        }) => Promise<DependenciesReceipt>,
         setupExports: SetupExports<Store>,
       ) =>
         setupInit<Manifest, Store>(
@@ -292,6 +354,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           uninstall,
           setInterfaces,
           setupExports,
+          setDependencies,
         ),
       setupInstall: (fn: InstallFn<Manifest, Store>) => Install.of(fn),
       setupInterfaces: <
@@ -346,6 +409,9 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           spec: Spec,
         ) => Config.of<Spec, Store>(spec),
       },
+      Checker: {
+        parse: Checker.parse,
+      },
       Daemons: {
         of(config: {
           effects: Effects
@@ -360,13 +426,17 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           LocalConfig extends Record<string, any>,
           RemoteConfig extends Record<string, any>,
         >({
-          localConfig,
-          remoteConfig,
+          localConfigSpec,
+          remoteConfigSpec,
           dependencyConfig,
           update,
         }: {
-          localConfig: Config<LocalConfig, Store> | Config<LocalConfig, never>
-          remoteConfig: Config<RemoteConfig, any> | Config<RemoteConfig, never>
+          localConfigSpec:
+            | Config<LocalConfig, Store>
+            | Config<LocalConfig, never>
+          remoteConfigSpec:
+            | Config<RemoteConfig, any>
+            | Config<RemoteConfig, never>
           dependencyConfig: (options: {
             effects: Effects
             localConfig: LocalConfig
@@ -381,6 +451,10 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           >(dependencyConfig, update)
         },
       },
+      EmVer: {
+        from: EmVer.from,
+        parse: EmVer.parse,
+      },
       List: {
         text: List.text,
         number: List.number,
diff --git a/sdk/lib/emverLite/mod.ts b/sdk/lib/emverLite/mod.ts
index f672613aa..dd68360ac 100644
--- a/sdk/lib/emverLite/mod.ts
+++ b/sdk/lib/emverLite/mod.ts
@@ -163,7 +163,7 @@ export class EmVer {
   }
 
   toString() {
-    return `${this.values.join(".")}${this.extra ? `-${this.extra}` : ""}`
+    return `${this.values.join(".")}${this.extra ? `-${this.extra}` : ""}` as ValidEmVer
   }
 }
 
@@ -179,6 +179,7 @@ export class Checker {
    * @returns
    */
   static parse(range: string | Checker): Checker {
+    console.log(`Parser (${range})`)
     if (range instanceof Checker) {
       return range
     }
@@ -193,10 +194,12 @@ export class Checker {
       return new Checker((version) => {
         EmVer.from(version)
         return true
-      })
+      }, range)
     }
+    if (range.startsWith("!!")) return Checker.parse(range.substring(2))
     if (range.startsWith("!")) {
-      return Checker.parse(range.substring(1)).not()
+      const tempValue = Checker.parse(range.substring(1))
+      return new Checker((x) => !tempValue.check(x), range)
     }
     const starSubMatches = starSub.exec(range)
     if (starSubMatches != null) {
@@ -210,7 +213,7 @@ export class Checker {
           !v.greaterThan(emVarUpper) &&
           !v.equals(emVarUpper)
         )
-      })
+      }, range)
     }
 
     switch (range.substring(0, 2)) {
@@ -219,14 +222,14 @@ export class Checker {
         return new Checker((version) => {
           const v = EmVer.from(version)
           return v.greaterThanOrEqual(emVar)
-        })
+        }, range)
       }
       case "<=": {
         const emVar = EmVer.parse(range.substring(2))
         return new Checker((version) => {
           const v = EmVer.from(version)
           return v.lessThanOrEqual(emVar)
-        })
+        }, range)
       }
     }
 
@@ -236,21 +239,21 @@ export class Checker {
         return new Checker((version) => {
           const v = EmVer.from(version)
           return v.greaterThan(emVar)
-        })
+        }, range)
       }
       case "<": {
         const emVar = EmVer.parse(range.substring(1))
         return new Checker((version) => {
           const v = EmVer.from(version)
           return v.lessThan(emVar)
-        })
+        }, range)
       }
       case "=": {
         const emVar = EmVer.parse(range.substring(1))
         return new Checker((version) => {
           const v = EmVer.from(version)
           return v.equals(emVar)
-        })
+        }, `=${emVar.toString()}`)
       }
     }
     throw new Error("Couldn't parse range: " + range)
@@ -261,40 +264,53 @@ export class Checker {
      * a pattern
      */
     public readonly check: (value: ValidEmVer | EmVer) => boolean,
+    private readonly _range: string,
   ) {}
 
+  get range() {
+    return this._range as ValidEmVerRange
+  }
+
   /**
    * Used when we want the `and` condition with another checker
    */
   public and(...others: (Checker | string)[]): Checker {
-    return new Checker((value) => {
-      if (!this.check(value)) {
-        return false
-      }
-      for (const other of others) {
-        if (!Checker.parse(other).check(value)) {
+    const othersCheck = others.map(Checker.parse)
+    return new Checker(
+      (value) => {
+        if (!this.check(value)) {
           return false
         }
-      }
-      return true
-    })
+        for (const other of othersCheck) {
+          if (!other.check(value)) {
+            return false
+          }
+        }
+        return true
+      },
+      othersCheck.map((x) => x._range).join(" && "),
+    )
   }
 
   /**
    * Used when we want the `or` condition with another checker
    */
   public or(...others: (Checker | string)[]): Checker {
-    return new Checker((value) => {
-      if (this.check(value)) {
-        return true
-      }
-      for (const other of others) {
-        if (Checker.parse(other).check(value)) {
+    const othersCheck = others.map(Checker.parse)
+    return new Checker(
+      (value) => {
+        if (this.check(value)) {
           return true
         }
-      }
-      return false
-    })
+        for (const other of othersCheck) {
+          if (other.check(value)) {
+            return true
+          }
+        }
+        return false
+      },
+      othersCheck.map((x) => x._range).join(" || "),
+    )
   }
 
   /**
@@ -302,6 +318,7 @@ export class Checker {
    * @returns
    */
   public not(): Checker {
-    return new Checker((value) => !this.check(value))
+    let newRange = `!${this._range}`
+    return Checker.parse(newRange)
   }
 }
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index 80e1a202e..af085e17b 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -1,6 +1,12 @@
+import { DependenciesReceipt } from "../config/setupConfig"
 import { SetInterfaces } from "../interfaces/setupInterfaces"
 import { SDKManifest } from "../manifest/ManifestTypes"
-import { ExpectedExports, ExposeUiPaths, ExposeUiPathsAll } from "../types"
+import {
+  Effects,
+  ExpectedExports,
+  ExposeUiPaths,
+  ExposeUiPathsAll,
+} from "../types"
 import { Migrations } from "./migrations/setupMigrations"
 import { SetupExports } from "./setupExports"
 import { Install } from "./setupInstall"
@@ -12,6 +18,10 @@ export function setupInit<Manifest extends SDKManifest, Store>(
   uninstall: Uninstall<Manifest, Store>,
   setInterfaces: SetInterfaces<Manifest, Store, any, any>,
   setupExports: SetupExports<Store>,
+  setDependencies: (options: {
+    effects: Effects
+    input: any
+  }) => Promise<DependenciesReceipt>,
 ): {
   init: ExpectedExports.init
   uninit: ExpectedExports.uninit
@@ -27,6 +37,7 @@ export function setupInit<Manifest extends SDKManifest, Store>(
       const { services, ui } = await setupExports(opts)
       await opts.effects.exposeForDependents({ paths: services })
       await opts.effects.exposeUi(forExpose(ui))
+      await setDependencies({ effects: opts.effects, input: null })
     },
     uninit: async (opts) => {
       await migrations.uninit(opts)
diff --git a/sdk/lib/manifest/ManifestTypes.ts b/sdk/lib/manifest/ManifestTypes.ts
index 4b25ff1d0..ed8703bf2 100644
--- a/sdk/lib/manifest/ManifestTypes.ts
+++ b/sdk/lib/manifest/ManifestTypes.ts
@@ -75,31 +75,13 @@ export type SDKManifest = {
 }
 
 export interface ManifestDependency {
-  /** The range of versions that would satisfy the dependency
-   *
-   * ie: >=3.4.5 <4.0.0
-   */
-  version: string
   /**
    * A human readable explanation on what the dependency is used for
    */
   description: string | null
-  requirement:
-    | {
-        type: "opt-in"
-        /**
-         * The human readable explanation on how to opt-in to the dependency
-         */
-        how: string
-      }
-    | {
-        type: "opt-out"
-        /**
-         * The human readable explanation on how to opt-out to the dependency
-         */
-        how: string
-      }
-    | {
-        type: "required"
-      }
+  /**
+   * Determines if the dependency is optional or not. Times that optional that are good include such situations
+   * such as being able to toggle other services or to use a different service for the same purpose.
+   */
+  optional: boolean
 }
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
index ef85ee366..cd14d6a18 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -414,8 +414,7 @@ describe("values", () => {
             dependencies: {
               remoteTest: {
                 description: "",
-                requirement: { how: "", type: "opt-in" },
-                version: "1.0",
+                optional: true,
               },
             },
           }),
diff --git a/sdk/lib/test/output.sdk.ts b/sdk/lib/test/output.sdk.ts
index e69ef2a68..a0bab1f6e 100644
--- a/sdk/lib/test/output.sdk.ts
+++ b/sdk/lib/test/output.sdk.ts
@@ -35,8 +35,7 @@ export const sdk = StartSdk.of()
       dependencies: {
         remoteTest: {
           description: "",
-          requirement: { how: "", type: "opt-in" },
-          version: "1.0",
+          optional: false,
         },
       },
     }),
diff --git a/sdk/lib/test/setupDependencyConfig.test.ts b/sdk/lib/test/setupDependencyConfig.test.ts
index 4fac5d063..5fa4a0ddf 100644
--- a/sdk/lib/test/setupDependencyConfig.test.ts
+++ b/sdk/lib/test/setupDependencyConfig.test.ts
@@ -16,8 +16,8 @@ describe("setupDependencyConfig", () => {
       }),
     })
     const remoteTest = sdk.DependencyConfig.of({
-      localConfig: testConfig,
-      remoteConfig: testConfig2,
+      localConfigSpec: testConfig,
+      remoteConfigSpec: testConfig2,
       dependencyConfig: async ({}) => {},
     })
     sdk.setupDependencyConfig(testConfig, {
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index add74a624..c6ab16e64 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -600,7 +600,8 @@ export type KnownError =
 
 export type Dependency = {
   id: PackageId
-  kind: DependencyKind
+  versionSpec: string
+  url: string
 } & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] })
 export type Dependencies = Array<Dependency>
 

From 405b3be496eced77764ef97d79dac5fabe57ca50 Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Wed, 20 Mar 2024 21:26:18 -0600
Subject: [PATCH 083/341] complete get_container_ip effect handler

---
 core/startos/src/net/net_controller.rs         |  4 ++++
 .../src/service/service_effect_handler.rs      | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index 5fa2a30ec..c9338cdff 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -385,6 +385,10 @@ impl NetService {
             ))
         }
     }
+
+    pub fn get_ip(&self) -> Ipv4Addr {
+        self.ip.to_owned()
+    }
 }
 
 impl Drop for NetService {
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 65217ecd5..c103d5994 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1,3 +1,5 @@
+use std::any::Any;
+use std::borrow::Borrow;
 use std::collections::BTreeSet;
 use std::ffi::OsString;
 use std::net::Ipv4Addr;
@@ -23,7 +25,8 @@ use crate::db::model::package::{
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
-use crate::prelude::*;
+use crate::net::net;
+use crate::{net, prelude::*};
 use crate::s9pk::rpc::SKIP_ENV;
 use crate::service::cli::ContainerCliContext;
 use crate::service::ServiceActorSeed;
@@ -337,7 +340,18 @@ async fn get_system_smtp(
     todo!()
 }
 async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Ipv4Addr, Error> {
-    todo!()
+    match context.0.upgrade() {
+        Some(c) => {
+            let net_service = c.persistent_container.net_service.lock().await;
+            Ok(net_service.get_ip())
+        },
+        None => {
+            Err(Error::new(
+                eyre!("Upgrade on Weak<ServiceActorSeed> resulted in a None variant"),
+                crate::ErrorKind::NotFound
+            ))
+        }
+    }
 }
 async fn get_service_port_forward(
     context: EffectContext,

From ab836c6922cdd1f12e7c2e533bd44ffa0e6ab32b Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Wed, 20 Mar 2024 21:50:21 -0600
Subject: [PATCH 084/341] remove unneeded imports

---
 core/startos/src/service/service_effect_handler.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index c103d5994..81ea40eaa 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1,5 +1,3 @@
-use std::any::Any;
-use std::borrow::Borrow;
 use std::collections::BTreeSet;
 use std::ffi::OsString;
 use std::net::Ipv4Addr;
@@ -25,8 +23,7 @@ use crate::db::model::package::{
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
-use crate::net::net;
-use crate::{net, prelude::*};
+use crate::prelude::*;
 use crate::s9pk::rpc::SKIP_ENV;
 use crate::service::cli::ContainerCliContext;
 use crate::service::ServiceActorSeed;

From 66b0108c51e4f65fd2e3501995dad52f6af62cd8 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Thu, 21 Mar 2024 17:21:37 -0600
Subject: [PATCH 085/341] revamp manifest types

---
 sdk/lib/StartSdk.ts                           |  19 +-
 sdk/lib/actions/createAction.ts               |  19 +-
 sdk/lib/actions/setupActions.ts               |   4 +-
 sdk/lib/types.ts                              |   5 +-
 .../src/pages/list/item/item.component.html   |   2 +-
 .../src/pages/list/item/item.module.ts        |   9 +-
 .../dependencies/dependencies.component.html  |  10 +-
 .../dependencies/dependencies.component.ts    |   3 +-
 .../pages/show/package/package.component.html |   2 +-
 .../src/pages/show/package/package.module.ts  |   2 -
 .../marketplace/src/pipes/mime-type.pipe.ts   |  32 --
 web/projects/marketplace/src/public-api.ts    |   1 -
 web/projects/marketplace/src/types.ts         |  33 +-
 .../app/modals/app-config/app-config.page.ts  |   4 +-
 .../app-actions/app-actions.page.html         |  10 +-
 .../app-actions/app-actions.page.ts           |  23 +-
 .../apps-routes/app-show/app-show.module.ts   |   8 +-
 .../apps-routes/app-show/app-show.page.html   |   4 +-
 .../apps-routes/app-show/app-show.page.ts     |  20 +-
 .../app-show-additional.component.ts          |   2 +-
 .../app-show-health-checks.component.html     | 164 ++++---
 .../app-show-health-checks.component.ts       |  11 +-
 .../app-show-status.component.ts              |  16 +-
 .../app-show/pipes/to-buttons.pipe.ts         |   3 +-
 .../app-show/pipes/to-health-checks.pipe.ts   |  19 +-
 .../marketplace-show-controls.component.html  |  13 +-
 .../marketplace-show-controls.component.ts    |  12 +-
 .../marketplace-show.module.ts                |   2 +
 .../server-routes/sideload/sideload.page.ts   |   6 +-
 .../src/app/pages/updates/updates.module.ts   |   3 -
 .../src/app/pages/updates/updates.page.html   |   4 +-
 .../ui/src/app/pages/updates/updates.page.ts  |  14 +-
 web/projects/ui/src/app/pipes/ui/ui.pipe.ts   |   3 +-
 .../ui/src/app/services/api/api.fixures.ts    | 419 +-----------------
 .../ui/src/app/services/api/api.types.ts      |   3 +-
 .../services/api/embassy-mock-api.service.ts  |  10 +-
 .../ui/src/app/services/api/mock-patch.ts     |  22 +-
 .../ui/src/app/services/dep-error.service.ts  |  11 +-
 .../src/app/services/patch-db/data-model.ts   | 132 +-----
 .../services/pkg-status-rendering.service.ts  |  20 +-
 web/projects/ui/src/app/util/dry-update.ts    |   2 +-
 .../ui/src/app/util/get-package-data.ts       |   2 +-
 web/projects/ui/src/app/util/has-deps.ts      |  10 +-
 43 files changed, 279 insertions(+), 834 deletions(-)
 delete mode 100644 web/projects/marketplace/src/pipes/mime-type.pipe.ts

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 77c791f55..59a8715a6 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -23,7 +23,6 @@ import {
   PackageId,
   EnsureStorePath,
   ExtractStore,
-  DaemonReturned,
   ValidIfNoStupidEscape,
 } from "./types"
 import * as patterns from "./util/patterns"
@@ -205,7 +204,8 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           | Config<any, never>,
         Type extends Record<string, any> = ExtractConfigType<ConfigType>,
       >(
-        metaData: Omit<ActionMetadata, "input"> & {
+        id: string,
+        metadata: Omit<ActionMetadata, "input"> & {
           input: Config<Type, Store> | Config<Type, never>
         },
         fn: (options: {
@@ -213,8 +213,13 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           input: Type
         }) => Promise<ActionResult>,
       ) => {
-        const { input, ...rest } = metaData
-        return createAction<Manifest, Store, ConfigType, Type>(rest, fn, input)
+        const { input, ...rest } = metadata
+        return createAction<Manifest, Store, ConfigType, Type>(
+          id,
+          rest,
+          fn,
+          input,
+        )
       },
       getSystemSmtp: <E extends Effects>(effects: E) =>
         removeConstType<E>()(new GetSystemSmtp(effects)),
@@ -236,7 +241,8 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           | Config<any, never>,
         Type extends Record<string, any> = ExtractConfigType<ConfigType>,
       >(
-        metaData: (options: {
+        id: string,
+        metadata: (options: {
           effects: Effects
         }) => MaybePromise<Omit<ActionMetadata, "input">>,
         fn: (options: {
@@ -246,7 +252,8 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         input: Config<Type, Store> | Config<Type, never>,
       ) => {
         return createAction<Manifest, Store, ConfigType, Type>(
-          metaData,
+          id,
+          metadata,
           fn,
           input,
         )
diff --git a/sdk/lib/actions/createAction.ts b/sdk/lib/actions/createAction.ts
index dc52a658a..2fe4dfa74 100644
--- a/sdk/lib/actions/createAction.ts
+++ b/sdk/lib/actions/createAction.ts
@@ -15,7 +15,8 @@ export class CreatedAction<
   Type extends Record<string, any> = ExtractConfigType<ConfigType>,
 > {
   private constructor(
-    public readonly myMetaData: MaybeFn<
+    public readonly id: string,
+    public readonly myMetadata: MaybeFn<
       Manifest,
       Store,
       Omit<ActionMetadata, "input">
@@ -37,12 +38,14 @@ export class CreatedAction<
       | Config<any, never>,
     Type extends Record<string, any> = ExtractConfigType<ConfigType>,
   >(
-    metaData: MaybeFn<Manifest, Store, Omit<ActionMetadata, "input">>,
+    id: string,
+    metadata: MaybeFn<Manifest, Store, Omit<ActionMetadata, "input">>,
     fn: (options: { effects: Effects; input: Type }) => Promise<ActionResult>,
     inputConfig: Config<Type, Store> | Config<Type, never>,
   ) {
     return new CreatedAction<Manifest, Store, ConfigType, Type>(
-      metaData,
+      id,
+      metadata,
       fn,
       inputConfig as Config<Type, Store>,
     )
@@ -62,15 +65,15 @@ export class CreatedAction<
     })
   }
 
-  async metaData(options: { effects: Effects }) {
-    if (this.myMetaData instanceof Function)
-      return await this.myMetaData(options)
-    return this.myMetaData
+  async metadata(options: { effects: Effects }) {
+    if (this.myMetadata instanceof Function)
+      return await this.myMetadata(options)
+    return this.myMetadata
   }
 
   async ActionMetadata(options: { effects: Effects }): Promise<ActionMetadata> {
     return {
-      ...(await this.metaData(options)),
+      ...(await this.metadata(options)),
       input: await this.input.build(options),
     }
   }
diff --git a/sdk/lib/actions/setupActions.ts b/sdk/lib/actions/setupActions.ts
index 035f8dafa..9dd9937b4 100644
--- a/sdk/lib/actions/setupActions.ts
+++ b/sdk/lib/actions/setupActions.ts
@@ -1,6 +1,5 @@
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { Effects, ExpectedExports } from "../types"
-import { once } from "../util/once"
 import { CreatedAction } from "./createAction"
 
 export function setupActions<Manifest extends SDKManifest, Store>(
@@ -9,8 +8,7 @@ export function setupActions<Manifest extends SDKManifest, Store>(
   const myActions = async (options: { effects: Effects }) => {
     const actions: Record<string, CreatedAction<Manifest, Store, any>> = {}
     for (const action of createdActions) {
-      const actionMetadata = await action.metaData(options)
-      actions[actionMetadata.id] = action
+      actions[action.id] = action
     }
     return actions
   }
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index c6ab16e64..5796a9fcc 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -163,9 +163,10 @@ export type DaemonReturned = {
 export type ActionMetadata = {
   name: string
   description: string
-  id: string
+  warning: string | null
   input: InputSpec
-  allowedStatuses: "only-running" | "only-stopped" | "any" | "disabled"
+  disabled: boolean
+  allowedStatuses: "only-running" | "only-stopped" | "any"
   /**
    * So the ordering of the actions is by alphabetical order of the group, then followed by the alphabetical of the actions
    */
diff --git a/web/projects/marketplace/src/pages/list/item/item.component.html b/web/projects/marketplace/src/pages/list/item/item.component.html
index 0220a0a0c..9a88d0869 100644
--- a/web/projects/marketplace/src/pages/list/item/item.component.html
+++ b/web/projects/marketplace/src/pages/list/item/item.component.html
@@ -1,6 +1,6 @@
 <ion-item class="service-card" [routerLink]="['/marketplace', pkg.manifest.id]">
   <ion-thumbnail slot="start">
-    <img alt="" [src]="pkg | mimeType | trustUrl" />
+    <img alt="" [src]="pkg.icon | trustUrl" />
   </ion-thumbnail>
   <ion-label>
     <h2 class="montserrat">
diff --git a/web/projects/marketplace/src/pages/list/item/item.module.ts b/web/projects/marketplace/src/pages/list/item/item.module.ts
index dd157174e..3f943ac2d 100644
--- a/web/projects/marketplace/src/pages/list/item/item.module.ts
+++ b/web/projects/marketplace/src/pages/list/item/item.module.ts
@@ -4,17 +4,10 @@ import { IonicModule } from '@ionic/angular'
 import { RouterModule } from '@angular/router'
 import { SharedPipesModule } from '@start9labs/shared'
 import { ItemComponent } from './item.component'
-import { MimeTypePipeModule } from '../../../pipes/mime-type.pipe'
 
 @NgModule({
   declarations: [ItemComponent],
   exports: [ItemComponent],
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule,
-    SharedPipesModule,
-    MimeTypePipeModule,
-  ],
+  imports: [CommonModule, IonicModule, RouterModule, SharedPipesModule],
 })
 export class ItemModule {}
diff --git a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
index 87b902603..e5711b432 100644
--- a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
+++ b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
@@ -18,15 +18,11 @@
         <ion-label>
           <h2>
             {{ pkg['dependency-metadata'][dep.key].title }}
-            <ng-container [ngSwitch]="dep.value.requirement.type">
-              <span *ngSwitchCase="'required'">(required)</span>
-              <span *ngSwitchCase="'opt-out'">(required by default)</span>
+            <span *ngIf="dep.value.optional; else required">(optional)</span>
+            <ng-template #required>
               <span *ngSwitchCase="'opt-in'">(optional)</span>
-            </ng-container>
+            </ng-template>
           </h2>
-          <p>
-            <small>{{ dep.value.version | displayEmver }}</small>
-          </p>
           <p>{{ dep.value.description }}</p>
         </ion-label>
       </ion-item>
diff --git a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
index a6ecb103f..0626f4817 100644
--- a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
+++ b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
@@ -11,7 +11,6 @@ export class DependenciesComponent {
   pkg!: MarketplacePkg
 
   getImg(key: string): string {
-    // @TODO fix when registry api is updated to include mimetype in icon url
-    return 'data:image/png;base64,' + this.pkg['dependency-metadata'][key].icon
+    return this.pkg['dependency-metadata'][key].icon
   }
 }
diff --git a/web/projects/marketplace/src/pages/show/package/package.component.html b/web/projects/marketplace/src/pages/show/package/package.component.html
index ca853030e..1e0ad89eb 100644
--- a/web/projects/marketplace/src/pages/show/package/package.component.html
+++ b/web/projects/marketplace/src/pages/show/package/package.component.html
@@ -1,5 +1,5 @@
 <div class="header montserrat">
-  <img class="logo" alt="" [src]="pkg | mimeType | trustUrl" />
+  <img class="logo" alt="" [src]="pkg.icon | trustUrl" />
   <div class="text">
     <h1 ticker class="title">{{ pkg.manifest.title }}</h1>
     <p class="version">{{ pkg.manifest.version | displayEmver }}</p>
diff --git a/web/projects/marketplace/src/pages/show/package/package.module.ts b/web/projects/marketplace/src/pages/show/package/package.module.ts
index 665e146b5..502ee82bb 100644
--- a/web/projects/marketplace/src/pages/show/package/package.module.ts
+++ b/web/projects/marketplace/src/pages/show/package/package.module.ts
@@ -8,7 +8,6 @@ import {
 } from '@start9labs/shared'
 
 import { PackageComponent } from './package.component'
-import { MimeTypePipeModule } from '../../../pipes/mime-type.pipe'
 
 @NgModule({
   declarations: [PackageComponent],
@@ -19,7 +18,6 @@ import { MimeTypePipeModule } from '../../../pipes/mime-type.pipe'
     SharedPipesModule,
     EmverPipesModule,
     TickerModule,
-    MimeTypePipeModule,
   ],
 })
 export class PackageModule {}
diff --git a/web/projects/marketplace/src/pipes/mime-type.pipe.ts b/web/projects/marketplace/src/pipes/mime-type.pipe.ts
deleted file mode 100644
index a0dc14a00..000000000
--- a/web/projects/marketplace/src/pipes/mime-type.pipe.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { NgModule, Pipe, PipeTransform } from '@angular/core'
-import { MarketplacePkg } from '../types'
-
-@Pipe({
-  name: 'mimeType',
-})
-export class MimeTypePipe implements PipeTransform {
-  transform(pkg: MarketplacePkg): string {
-    if (pkg.manifest.assets.icon) {
-      switch (pkg.manifest.assets.icon.split('.').pop()) {
-        case 'png':
-          return `data:image/png;base64,${pkg.icon}`
-        case 'jpeg':
-        case 'jpg':
-          return `data:image/jpeg;base64,${pkg.icon}`
-        case 'gif':
-          return `data:image/gif;base64,${pkg.icon}`
-        case 'svg':
-          return `data:image/svg+xml;base64,${pkg.icon}`
-        default:
-          return `data:image/png;base64,${pkg.icon}`
-      }
-    }
-    return `data:image/png;base64,${pkg.icon}`
-  }
-}
-
-@NgModule({
-  declarations: [MimeTypePipe],
-  exports: [MimeTypePipe],
-})
-export class MimeTypePipeModule {}
diff --git a/web/projects/marketplace/src/public-api.ts b/web/projects/marketplace/src/public-api.ts
index fef451a3e..b9e8c4686 100644
--- a/web/projects/marketplace/src/public-api.ts
+++ b/web/projects/marketplace/src/public-api.ts
@@ -22,7 +22,6 @@ export * from './pages/show/package/package.component'
 export * from './pages/show/package/package.module'
 
 export * from './pipes/filter-packages.pipe'
-export * from './pipes/mime-type.pipe'
 
 export * from './services/marketplace.service'
 
diff --git a/web/projects/marketplace/src/types.ts b/web/projects/marketplace/src/types.ts
index 8187d3bc0..7007ee806 100644
--- a/web/projects/marketplace/src/types.ts
+++ b/web/projects/marketplace/src/types.ts
@@ -19,11 +19,13 @@ export interface StoreInfo {
   categories: string[]
 }
 
+export type StoreIdentityWithData = StoreData & StoreIdentity
+
 export interface MarketplacePkg {
   icon: Url
   license: Url
   instructions: Url
-  manifest: MarketplaceManifest
+  manifest: Manifest
   categories: string[]
   versions: string[]
   'dependency-metadata': {
@@ -35,10 +37,11 @@ export interface MarketplacePkg {
 export interface DependencyMetadata {
   title: string
   icon: Url
+  optional: boolean
   hidden: boolean
 }
 
-export interface MarketplaceManifest<T = unknown> {
+export interface Manifest {
   id: string
   title: string
   version: string
@@ -47,12 +50,9 @@ export interface MarketplaceManifest<T = unknown> {
     short: string
     long: string
   }
-  assets: {
-    icon: string // ie. icon.png
-  }
   replaces?: string[]
   'release-notes': string
-  license: string // type of license
+  license: string // name of license
   'wrapper-repo': Url
   'upstream-repo': Url
   'support-site': Url
@@ -65,23 +65,12 @@ export interface MarketplaceManifest<T = unknown> {
     start: string | null
     stop: string | null
   }
-  dependencies: Record<string, Dependency<T>>
+  dependencies: Record<string, Dependency>
+  'os-version': string
+  'has-config': boolean
 }
 
-export interface Dependency<T> {
-  version: string
-  requirement:
-    | {
-        type: 'opt-in'
-        how: string
-      }
-    | {
-        type: 'opt-out'
-        how: string
-      }
-    | {
-        type: 'required'
-      }
+export interface Dependency {
   description: string | null
-  config: T
+  optional: boolean
 }
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.page.ts b/web/projects/ui/src/app/modals/app-config/app-config.page.ts
index c8f2186f0..770ade4a2 100644
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.ts
+++ b/web/projects/ui/src/app/modals/app-config/app-config.page.ts
@@ -78,7 +78,7 @@ export class AppConfigPage {
 
       this.pkg = pkg
 
-      if (!this.pkg['state-info'].manifest.config) return
+      if (!this.pkg['state-info'].manifest['has-config']) return
 
       let newConfig: object | undefined
       let patch: Operation[] | undefined
@@ -152,7 +152,7 @@ export class AppConfigPage {
 
     this.saving = true
 
-    if (hasCurrentDeps(this.pkg)) {
+    if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patch))) {
       this.dryConfigure()
     } else {
       this.configure()
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
index c611f4a71..bb5374856 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
@@ -9,9 +9,7 @@
 
 <ion-content class="ion-padding-top with-widgets">
   <ng-container *ngIf="pkg$ | async as pkg">
-    <ion-item-group
-      *ngIf="pkg['state-info'].state === 'installed' && pkg['state-info'].manifest as manifest"
-    >
+    <ion-item-group *ngIf="pkg['state-info'].state === 'installed'">
       <!-- ** standard actions ** -->
       <ion-item-divider>Standard Actions</ion-item-divider>
       <app-actions-item
@@ -24,11 +22,11 @@
       ></app-actions-item>
 
       <!-- ** specific actions ** -->
-      <ion-item-divider *ngIf="!(manifest.actions | empty)">
-        Actions for {{ manifest.title }}
+      <ion-item-divider *ngIf="!(pkg.actions | empty)">
+        Actions for {{ pkg['state-info'].manifest.title }}
       </ion-item-divider>
       <app-actions-item
-        *ngFor="let action of manifest.actions | keyvalue: asIsOrder"
+        *ngFor="let action of pkg.actions | keyvalue: asIsOrder"
         [action]="{
           name: action.value.name,
           description: action.value.description,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index 0ea2f6bbe..41a7d51c0 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -9,19 +9,17 @@ import {
 } from '@ionic/angular'
 import { PatchDB } from 'patch-db-client'
 import {
-  Action,
   DataModel,
-  InstalledState,
   PackageDataEntry,
   PackageMainStatus,
-  StateInfo,
   Status,
 } from 'src/app/services/patch-db/data-model'
 import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
 import { isEmptyObject, ErrorToastService, getPkgId } from '@start9labs/shared'
 import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { getManifest } from 'src/app/util/get-package-data'
+import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
+import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
 
 @Component({
   selector: 'app-actions',
@@ -44,19 +42,22 @@ export class AppActionsPage {
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
-  async handleAction(status: Status, action: { key: string; value: Action }) {
+  async handleAction(
+    status: Status,
+    action: { key: string; value: ActionMetadata },
+  ) {
     if (
       status &&
-      (action.value['allowed-statuses'] as PackageMainStatus[]).includes(
-        status.main.status,
+      action.value.allowedStatuses.includes(
+        status.main.status, // @TODO
       )
     ) {
-      if (!isEmptyObject(action.value['input-spec'] || {})) {
+      if (!isEmptyObject(action.value.input || {})) {
         const modal = await this.modalCtrl.create({
           component: GenericFormPage,
           componentProps: {
             title: action.value.name,
-            spec: action.value['input-spec'],
+            spec: action.value.input,
             buttons: [
               {
                 text: 'Execute',
@@ -92,7 +93,7 @@ export class AppActionsPage {
         await alert.present()
       }
     } else {
-      const statuses = [...action.value['allowed-statuses']]
+      const statuses = [...action.value.allowedStatuses] // @TODO
       const last = statuses.pop()
       let statusesStr = statuses.join(', ')
       let error = ''
@@ -126,7 +127,7 @@ export class AppActionsPage {
       alerts.uninstall ||
       `Uninstalling ${title} will permanently delete its data`
 
-    if (hasCurrentDeps(pkg)) {
+    if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patch))) {
       message = `${message}. Services that depend on ${title} will no longer work properly and may crash`
     }
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
index d76ae58d8..0b2d82763 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
@@ -3,7 +3,12 @@ import { CommonModule } from '@angular/common'
 import { Routes, RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
 import { AppShowPage } from './app-show.page'
-import { EmverPipesModule, ResponsiveColModule } from '@start9labs/shared'
+import {
+  EmptyPipe,
+  EmverPipesModule,
+  ResponsiveColModule,
+  SharedPipesModule,
+} from '@start9labs/shared'
 import { StatusComponentModule } from 'src/app/components/status/status.component.module'
 import { AppConfigPageModule } from 'src/app/modals/app-config/app-config.module'
 import { LaunchablePipeModule } from 'src/app/pipes/launchable/launchable.module'
@@ -52,6 +57,7 @@ const routes: Routes = [
     UiPipeModule,
     ResponsiveColModule,
     StatusComponentModule,
+    SharedPipesModule,
   ],
 })
 export class AppShowPageModule {}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index 37ae25304..476ab940c 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -23,8 +23,8 @@
         >
           <!-- ** health checks ** -->
           <app-show-health-checks
-            *ngIf="status.primary === 'running'"
-            [manifest]="pkg['state-info'].manifest"
+            *ngIf="pkg.status.main.status === 'running'"
+            [healthChecks]="pkg.status.main.health"
           ></app-show-health-checks>
           <!-- ** dependencies ** -->
           <app-show-dependencies
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 01a3067cd..d30bb0aff 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -4,7 +4,6 @@ import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
   InstallingState,
-  Manifest,
   PackageDataEntry,
   UpdatingState,
 } from 'src/app/services/patch-db/data-model'
@@ -27,6 +26,7 @@ import {
   isRestoring,
   isUpdating,
 } from 'src/app/util/get-package-data'
+import { Manifest } from '@start9labs/marketplace'
 
 export interface DependencyInfo {
   id: string
@@ -97,6 +97,7 @@ export class AppShowPage {
     depErrors: PkgDependencyErrors,
   ): DependencyInfo {
     const { errorText, fixText, fixAction } = this.getDepErrors(
+      pkg,
       manifest,
       depId,
       depErrors,
@@ -106,7 +107,7 @@ export class AppShowPage {
 
     return {
       id: depId,
-      version: manifest.dependencies[depId].version, // do we want this version range?
+      version: pkg['current-dependencies'][depId].versionRange, // @TODO do we want this version range?
       title: depInfo?.title || depId,
       icon: depInfo?.icon || '',
       errorText: errorText
@@ -119,6 +120,7 @@ export class AppShowPage {
   }
 
   private getDepErrors(
+    pkg: PackageDataEntry,
     manifest: Manifest,
     depId: string,
     depErrors: PkgDependencyErrors,
@@ -133,15 +135,15 @@ export class AppShowPage {
       if (depError.type === DependencyErrorType.NotInstalled) {
         errorText = 'Not installed'
         fixText = 'Install'
-        fixAction = () => this.fixDep(manifest, 'install', depId)
+        fixAction = () => this.fixDep(pkg, manifest, 'install', depId)
       } else if (depError.type === DependencyErrorType.IncorrectVersion) {
         errorText = 'Incorrect version'
         fixText = 'Update'
-        fixAction = () => this.fixDep(manifest, 'update', depId)
+        fixAction = () => this.fixDep(pkg, manifest, 'update', depId)
       } else if (depError.type === DependencyErrorType.ConfigUnsatisfied) {
         errorText = 'Config not satisfied'
         fixText = 'Auto config'
-        fixAction = () => this.fixDep(manifest, 'configure', depId)
+        fixAction = () => this.fixDep(pkg, manifest, 'configure', depId)
       } else if (depError.type === DependencyErrorType.NotRunning) {
         errorText = 'Not running'
         fixText = 'Start'
@@ -160,6 +162,7 @@ export class AppShowPage {
   }
 
   private async fixDep(
+    pkg: PackageDataEntry,
     pkgManifest: Manifest,
     action: 'install' | 'update' | 'configure',
     id: string,
@@ -167,22 +170,21 @@ export class AppShowPage {
     switch (action) {
       case 'install':
       case 'update':
-        return this.installDep(pkgManifest, id)
+        return this.installDep(pkg, pkgManifest, id)
       case 'configure':
         return this.configureDep(pkgManifest, id)
     }
   }
 
   private async installDep(
+    pkg: PackageDataEntry,
     pkgManifest: Manifest,
     depId: string,
   ): Promise<void> {
-    const version = pkgManifest.dependencies[depId].version
-
     const dependentInfo: DependentInfo = {
       id: pkgManifest.id,
       title: pkgManifest.title,
-      version,
+      version: pkg['current-dependencies'][depId].versionRange,
     }
     const navigationExtras: NavigationExtras = {
       state: { dependentInfo },
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
index 3487093b5..26281bb80 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
@@ -3,7 +3,7 @@ import { ModalController, ToastController } from '@ionic/angular'
 import { copyToClipboard, MarkdownComponent } from '@start9labs/shared'
 import { from } from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { Manifest } from 'src/app/services/patch-db/data-model'
+import { Manifest } from '@start9labs/marketplace'
 
 @Component({
   selector: 'app-show-additional',
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
index 9ea8d29ac..3668adc7b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
@@ -1,91 +1,81 @@
-<ng-container
-  *ngIf="manifest | toHealthChecks | async | keyvalue: asIsOrder as checks"
->
-  <ng-container *ngIf="checks.length">
-    <ion-item-divider>Health Checks</ion-item-divider>
-    <!-- connected -->
-    <ng-container *ngIf="connected$ | async; else disconnected">
-      <ion-item *ngFor="let health of checks">
-        <!-- result -->
-        <ng-container *ngIf="health.value?.result as result; else noResult">
-          <ion-spinner
-            *ngIf="isLoading(result)"
-            class="icon-spinner"
-            color="primary"
-            slot="start"
-          ></ion-spinner>
-          <ion-icon
-            *ngIf="result === HealthResult.Success"
-            slot="start"
-            name="checkmark"
-            color="success"
-          ></ion-icon>
-          <ion-icon
-            *ngIf="result === HealthResult.Failure"
-            slot="start"
-            name="warning-outline"
-            color="warning"
-          ></ion-icon>
-          <ion-icon
-            *ngIf="result === HealthResult.Disabled"
-            slot="start"
-            name="remove"
-            color="dark"
-          ></ion-icon>
-          <ion-label>
-            <h2 class="bold">
-              {{ manifest['health-checks'][health.key].name }}
-            </h2>
-            <ion-text [color]="result | healthColor">
-              <p>
-                <span *ngIf="isReady(result)">{{ result | titlecase }}</span>
-                <span *ngIf="result === HealthResult.Starting">...</span>
-                <span *ngIf="result === HealthResult.Failure">
-                  {{ $any(health.value).error }}
-                </span>
-                <span *ngIf="result === HealthResult.Loading">
-                  {{ $any(health.value).message }}
-                </span>
-                <span
-                  *ngIf="
-                    result === HealthResult.Success &&
-                    manifest['health-checks'][health.key]['success-message']
-                  "
-                >
-                  :
-                  {{ manifest['health-checks'][health.key]['success-message'] }}
-                </span>
-              </p>
-            </ion-text>
-          </ion-label>
-        </ng-container>
-        <!-- no result -->
-        <ng-template #noResult>
-          <ion-spinner
-            class="icon-spinner"
-            color="dark"
-            slot="start"
-          ></ion-spinner>
-          <ion-label>
-            <h2 class="bold">
-              {{ manifest['health-checks'][health.key].name }}
-            </h2>
-            <p class="primary">Awaiting result...</p>
-          </ion-label>
-        </ng-template>
-      </ion-item>
-    </ng-container>
-    <!-- disconnected -->
-    <ng-template #disconnected>
-      <ion-item *ngFor="let health of checks">
-        <ion-avatar slot="start">
-          <ion-skeleton-text class="avatar"></ion-skeleton-text>
-        </ion-avatar>
+<ng-container *ngIf="!(healthChecks | empty)">
+  <ion-item-divider>Health Checks</ion-item-divider>
+  <!-- connected -->
+  <ng-container *ngIf="connected$ | async; else disconnected">
+    <ion-item *ngFor="let check of healthChecks | keyvalue">
+      <!-- result -->
+      <ng-container *ngIf="check.value.result as result; else noResult">
+        <ion-spinner
+          *ngIf="isLoading(result)"
+          class="icon-spinner"
+          color="primary"
+          slot="start"
+        ></ion-spinner>
+        <ion-icon
+          *ngIf="result === 'success'"
+          slot="start"
+          name="checkmark"
+          color="success"
+        ></ion-icon>
+        <ion-icon
+          *ngIf="result === 'failure'"
+          slot="start"
+          name="warning-outline"
+          color="warning"
+        ></ion-icon>
+        <ion-icon
+          *ngIf="result === 'disabled'"
+          slot="start"
+          name="remove"
+          color="dark"
+        ></ion-icon>
         <ion-label>
-          <ion-skeleton-text class="label"></ion-skeleton-text>
-          <ion-skeleton-text class="description"></ion-skeleton-text>
+          <h2 class="bold">
+            {{ check.value.name }}
+          </h2>
+          <ion-text [color]="result | healthColor">
+            <p>
+              <span *ngIf="isReady(result)">{{ result | titlecase }}</span>
+              <span *ngIf="result === 'starting'">...</span>
+              <span
+                *ngIf="
+                  check.value.result === 'failure' ||
+                  check.value.result === 'loading' ||
+                  check.value.result === 'success'
+                "
+              >
+                {{ check.value.message }}
+              </span>
+            </p>
+          </ion-text>
         </ion-label>
-      </ion-item>
-    </ng-template>
+      </ng-container>
+      <!-- no result -->
+      <ng-template #noResult>
+        <ion-spinner
+          class="icon-spinner"
+          color="dark"
+          slot="start"
+        ></ion-spinner>
+        <ion-label>
+          <h2 class="bold">
+            {{ check.value.name }}
+          </h2>
+          <p class="primary">Awaiting result...</p>
+        </ion-label>
+      </ng-template>
+    </ion-item>
   </ng-container>
+  <!-- disconnected -->
+  <ng-template #disconnected>
+    <ion-item *ngFor="let health; in: checks">
+      <ion-avatar slot="start">
+        <ion-skeleton-text class="avatar"></ion-skeleton-text>
+      </ion-avatar>
+      <ion-label>
+        <ion-skeleton-text class="label"></ion-skeleton-text>
+        <ion-skeleton-text class="description"></ion-skeleton-text>
+      </ion-label>
+    </ion-item>
+  </ng-template>
 </ng-container>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
index a6cbc4ab7..5ecdf9a0f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
@@ -1,6 +1,11 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { ConnectionService } from 'src/app/services/connection.service'
-import { HealthResult, Manifest } from 'src/app/services/patch-db/data-model'
+import {
+  HealthCheckResult,
+  HealthResult,
+  MainStatus,
+} from 'src/app/services/patch-db/data-model'
+import { Manifest } from '@start9labs/marketplace'
 
 @Component({
   selector: 'app-show-health-checks',
@@ -10,9 +15,7 @@ import { HealthResult, Manifest } from 'src/app/services/patch-db/data-model'
 })
 export class AppShowHealthChecksComponent {
   @Input()
-  manifest!: Manifest
-
-  HealthResult = HealthResult
+  healthChecks!: Record<string, HealthCheckResult>
 
   readonly connected$ = this.connectionService.connected$
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 9bca7f2ac..6f26d2eb6 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -6,10 +6,9 @@ import {
   PrimaryStatus,
 } from 'src/app/services/pkg-status-rendering.service'
 import {
-  Manifest,
+  DataModel,
   PackageDataEntry,
   PackageMainStatus,
-  PackageState,
   Status,
 } from 'src/app/services/patch-db/data-model'
 import { ErrorToastService } from '@start9labs/shared'
@@ -18,7 +17,13 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ModalService } from 'src/app/services/modal.service'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 import { ConnectionService } from 'src/app/services/connection.service'
-import { isInstalled, getManifest } from 'src/app/util/get-package-data'
+import {
+  isInstalled,
+  getManifest,
+  getAllPackages,
+} from 'src/app/util/get-package-data'
+import { Manifest } from '@start9labs/marketplace'
+import { PatchDB } from 'patch-db-client'
 
 @Component({
   selector: 'app-show-status',
@@ -47,6 +52,7 @@ export class AppShowStatusComponent {
     private readonly launcherService: UiLauncherService,
     private readonly modalService: ModalService,
     private readonly connectionService: ConnectionService,
+    private readonly patch: PatchDB<DataModel>,
   ) {}
 
   get interfaces(): PackageDataEntry['service-interfaces'] {
@@ -116,7 +122,7 @@ export class AppShowStatusComponent {
     const { title, alerts } = this.manifest
 
     let message = alerts.stop || ''
-    if (hasCurrentDeps(this.pkg)) {
+    if (hasCurrentDeps(this.manifest.id, await getAllPackages(this.patch))) {
       const depMessage = `Services that depend on ${title} will no longer work properly and may crash`
       message = message ? `${message}.\n\n${depMessage}` : depMessage
     }
@@ -148,7 +154,7 @@ export class AppShowStatusComponent {
   }
 
   async tryRestart(): Promise<void> {
-    if (hasCurrentDeps(this.pkg)) {
+    if (hasCurrentDeps(this.manifest.id, await getAllPackages(this.patch))) {
       const alert = await this.alertCtrl.create({
         header: 'Warning',
         message: `Services that depend on ${this.manifest.title} may temporarily experiences issues`,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index a25914367..2eda6f296 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -5,14 +5,13 @@ import { MarkdownComponent } from '@start9labs/shared'
 import {
   DataModel,
   InstalledState,
-  Manifest,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
 import { ModalService } from 'src/app/services/modal.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { from, map, Observable } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
-import { getManifest } from 'src/app/util/get-package-data'
+import { Manifest } from '@start9labs/marketplace'
 
 export interface Button {
   title: string
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
index 066411eb0..e099cb356 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
@@ -2,13 +2,13 @@ import { Pipe, PipeTransform } from '@angular/core'
 import {
   DataModel,
   HealthCheckResult,
-  Manifest,
   PackageMainStatus,
 } from 'src/app/services/patch-db/data-model'
 import { isEmptyObject } from '@start9labs/shared'
 import { map, startWith } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
 import { Observable } from 'rxjs'
+import { Manifest } from '@start9labs/marketplace'
 
 @Pipe({
   name: 'toHealthChecks',
@@ -18,26 +18,17 @@ export class ToHealthChecksPipe implements PipeTransform {
 
   transform(
     manifest: Manifest,
-  ): Observable<Record<string, HealthCheckResult | null>> | null {
-    const healthChecks = Object.keys(manifest['health-checks']).reduce(
-      (obj, key) => ({ ...obj, [key]: null }),
-      {},
-    )
-
-    const healthChecks$ = this.patch
+  ): Observable<Record<string, HealthCheckResult | null> | null> {
+    return this.patch
       .watch$('package-data', manifest.id, 'status', 'main')
       .pipe(
         map(main => {
-          // Question: is this ok or do we have to use Object.keys
-          // to maintain order and the keys initially present in pkg?
           return main.status === PackageMainStatus.Running &&
             !isEmptyObject(main.health)
             ? main.health
-            : healthChecks
+            : null
         }),
-        startWith(healthChecks),
+        startWith(null),
       )
-
-    return isEmptyObject(healthChecks) ? null : healthChecks$
   }
 }
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
index 8d347ffa2..a1edbb593 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
@@ -8,9 +8,14 @@
     View Installed
   </ion-button>
   <ng-container *ngIf="localPkg; else install">
-    <ng-container *ngIf="localPkg['state-info'].state === 'installed'">
+    <ng-container
+      *ngIf="
+        localPkg['state-info'].state === 'installed' &&
+        (localPkg | toManifest) as manifest
+      "
+    >
       <ion-button
-        *ngIf="(localVersion | compareEmver: pkg.manifest.version) === -1"
+        *ngIf="(manifest.version | compareEmver: pkg.manifest.version) === -1"
         expand="block"
         color="success"
         (click)="tryInstall()"
@@ -18,7 +23,7 @@
         Update
       </ion-button>
       <ion-button
-        *ngIf="(localVersion | compareEmver: pkg.manifest.version) === 1"
+        *ngIf="(manifest.version | compareEmver: pkg.manifest.version) === 1"
         expand="block"
         color="warning"
         (click)="tryInstall()"
@@ -27,7 +32,7 @@
       </ion-button>
       <ng-container *ngIf="showDevTools$ | async">
         <ion-button
-          *ngIf="(localVersion | compareEmver: pkg.manifest.version) === 0"
+          *ngIf="(manifest.version | compareEmver: pkg.manifest.version) === 0"
           expand="block"
           color="success"
           (click)="tryInstall()"
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index e11cad01a..af605a8a9 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -7,6 +7,7 @@ import {
 import { AlertController, LoadingController } from '@ionic/angular'
 import {
   AbstractMarketplaceService,
+  Manifest,
   MarketplacePkg,
 } from '@start9labs/marketplace'
 import {
@@ -18,7 +19,6 @@ import {
 import {
   DataModel,
   PackageDataEntry,
-  PackageState,
 } from 'src/app/services/patch-db/data-model'
 import { ClientStorageService } from 'src/app/services/client-storage.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
@@ -57,10 +57,6 @@ export class MarketplaceShowControlsComponent {
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
-  get localVersion(): string {
-    return this.localPkg ? getManifest(this.localPkg).version : ''
-  }
-
   async tryInstall() {
     const currentMarketplace = await firstValueFrom(
       this.marketplaceService.getSelectedHost$(),
@@ -80,10 +76,12 @@ export class MarketplaceShowControlsComponent {
         if (!proceed) return
       }
 
+      const localManifest = getManifest(this.localPkg)
+
       if (
-        this.emver.compare(this.localVersion, this.pkg.manifest.version) !==
+        this.emver.compare(localManifest.version, this.pkg.manifest.version) !==
           0 &&
-        hasCurrentDeps(this.localPkg)
+        hasCurrentDeps(localManifest.id, await getAllPackages(this.patch))
       ) {
         this.dryInstall(url)
       } else {
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
index 3cef27e61..058cbb158 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
@@ -19,6 +19,7 @@ import { MarketplaceShowPage } from './marketplace-show.page'
 import { MarketplaceShowHeaderComponent } from './marketplace-show-header/marketplace-show-header.component'
 import { MarketplaceShowDependentComponent } from './marketplace-show-dependent/marketplace-show-dependent.component'
 import { MarketplaceShowControlsComponent } from './marketplace-show-controls/marketplace-show-controls.component'
+import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
 
 const routes: Routes = [
   {
@@ -41,6 +42,7 @@ const routes: Routes = [
     AboutModule,
     DependenciesModule,
     AdditionalModule,
+    UiPipeModule,
   ],
   declarations: [
     MarketplaceShowPage,
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index baaf5a9ec..b834d084c 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core'
 import { isPlatform, LoadingController, NavController } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { Manifest } from 'src/app/services/patch-db/data-model'
 import { ConfigService } from 'src/app/services/config.service'
 import cbor from 'cbor'
 import { ErrorToastService } from '@start9labs/shared'
+import { Manifest } from '@start9labs/marketplace'
 
 interface Positions {
   [key: string]: [bigint, bigint] // [position, length]
@@ -133,9 +133,7 @@ export class SideloadPage {
   }
 
   async getIcon(positions: Positions, file: Blob) {
-    const contentType = `image/${this.toUpload.manifest?.assets.icon
-      .split('.')
-      .pop()}`
+    const contentType = '' // @TODO
     const data = file.slice(
       Number(positions['icon'][0]),
       Number(positions['icon'][0]) + Number(positions['icon'][1]),
diff --git a/web/projects/ui/src/app/pages/updates/updates.module.ts b/web/projects/ui/src/app/pages/updates/updates.module.ts
index 62a6d2076..7b6c6594c 100644
--- a/web/projects/ui/src/app/pages/updates/updates.module.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.module.ts
@@ -5,7 +5,6 @@ import { RouterModule, Routes } from '@angular/router'
 import { FilterUpdatesPipe, UpdatesPage } from './updates.page'
 import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
 import {
-  EmverDisplayPipe,
   EmverPipesModule,
   MarkdownPipeModule,
   SharedPipesModule,
@@ -14,7 +13,6 @@ import { SkeletonListComponentModule } from 'src/app/components/skeleton-list/sk
 import { RoundProgressModule } from 'angular-svg-round-progressbar'
 import { InstallingProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
 import { StoreIconComponentModule } from 'src/app/components/store-icon/store-icon.component.module'
-import { MimeTypePipeModule } from '@start9labs/marketplace'
 
 const routes: Routes = [
   {
@@ -37,7 +35,6 @@ const routes: Routes = [
     InstallingProgressPipeModule,
     StoreIconComponentModule,
     EmverPipesModule,
-    MimeTypePipeModule,
   ],
 })
 export class UpdatesPageModule {}
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.html b/web/projects/ui/src/app/pages/updates/updates.page.html
index 4ee0d53f4..c31294920 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.html
+++ b/web/projects/ui/src/app/pages/updates/updates.page.html
@@ -33,7 +33,7 @@
               <ion-accordion *ngIf="data.localPkgs[pkg.manifest.id] as local">
                 <ion-item lines="none" slot="header">
                   <ion-avatar slot="start" style="width: 50px; height: 50px">
-                    <img [src]="pkg | mimeType | trustUrl" />
+                    <img [src]="pkg.icon | trustUrl" />
                   </ion-avatar>
                   <ion-label>
                     <h1 style="line-height: 1.3">{{ pkg.manifest.title }}</h1>
@@ -72,7 +72,7 @@ <h2 class="inline">
                       ></ion-spinner>
                       <ng-template #updateBtn>
                         <ion-button
-                          (click)="tryUpdate(pkg.manifest, host.url, local, $event)"
+                          (click)="tryUpdate(pkg.manifest, host.url, $event)"
                           [color]="marketplaceService.updateErrors[pkg.manifest.id] ? 'danger' : 'tertiary'"
                           strong
                         >
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.ts b/web/projects/ui/src/app/pages/updates/updates.page.ts
index e09dc300d..20feabd0b 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.page.ts
@@ -10,7 +10,7 @@ import { MarketplaceService } from 'src/app/services/marketplace.service'
 import {
   AbstractMarketplaceService,
   Marketplace,
-  MarketplaceManifest,
+  Manifest,
   MarketplacePkg,
   StoreIdentity,
 } from '@start9labs/marketplace'
@@ -70,12 +70,7 @@ export class UpdatesPage {
     })
   }
 
-  async tryUpdate(
-    manifest: MarketplaceManifest,
-    url: string,
-    local: PackageDataEntry,
-    e: Event,
-  ): Promise<void> {
+  async tryUpdate(manifest: Manifest, url: string, e: Event): Promise<void> {
     e.stopPropagation()
 
     const { id, version } = manifest
@@ -83,14 +78,15 @@ export class UpdatesPage {
     delete this.marketplaceService.updateErrors[id]
     this.marketplaceService.updateQueue[id] = true
 
-    if (hasCurrentDeps(local)) {
+    // manifest.id OK because same as local id for update
+    if (hasCurrentDeps(manifest.id, await getAllPackages(this.patch))) {
       this.dryInstall(manifest, url)
     } else {
       this.install(id, version, url)
     }
   }
 
-  private async dryInstall(manifest: MarketplaceManifest, url: string) {
+  private async dryInstall(manifest: Manifest, url: string) {
     const { id, version, title } = manifest
 
     const breakages = dryUpdate(
diff --git a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
index 2a81e4afd..0c9bab5df 100644
--- a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
+++ b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
@@ -1,7 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { Manifest, PackageDataEntry } from '../../services/patch-db/data-model'
+import { PackageDataEntry } from '../../services/patch-db/data-model'
 import { hasUi } from '../../services/config.service'
 import { getManifest } from 'src/app/util/get-package-data'
+import { Manifest } from '@start9labs/marketplace'
 
 @Pipe({
   name: 'hasUi',
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 22e6a3b32..8f6a907bc 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1,16 +1,17 @@
 import {
-  DockerIoFormat,
   InstalledState,
-  Manifest,
   PackageDataEntry,
   PackageMainStatus,
   PackageState,
   ServerStatusInfo,
 } from 'src/app/services/patch-db/data-model'
 import { Metric, NotificationLevel, RR, ServerNotifications } from './api.types'
-
 import { BTC_ICON, LND_ICON, PROXY_ICON } from './api-icons'
-import { DependencyMetadata, MarketplacePkg } from '@start9labs/marketplace'
+import {
+  DependencyMetadata,
+  Manifest,
+  MarketplacePkg,
+} from '@start9labs/marketplace'
 import { Log } from '@start9labs/shared'
 
 export module Mock {
@@ -57,14 +58,6 @@ export module Mock {
     },
     replaces: ['banks', 'governments'],
     'release-notes': 'Taproot, Schnorr, and more.',
-    assets: {
-      icon: 'icon.png',
-      license: 'LICENSE.md',
-      instructions: 'INSTRUCTIONS.md',
-      docker_images: 'image.tar',
-      assets: './assets',
-      scripts: './scripts',
-    },
     license: 'MIT',
     'wrapper-repo': 'https://github.com/start9labs/bitcoind-wrapper',
     'upstream-repo': 'https://github.com/bitcoin/bitcoin',
@@ -79,231 +72,9 @@ export module Mock {
       start: 'Starting Bitcoin is good for your health.',
       stop: null,
     },
-    'health-checks': {},
-    config: {
-      get: null,
-      set: null,
-    },
-    volumes: {},
-    'min-os-version': '0.2.12',
-    backup: {
-      create: {
-        type: 'docker',
-        image: '',
-        system: true,
-        entrypoint: '',
-        args: [],
-        mounts: {},
-        'io-format': DockerIoFormat.Yaml,
-        inject: false,
-        'shm-size': '',
-        'sigterm-timeout': null,
-      },
-      restore: {
-        type: 'docker',
-        image: '',
-        system: true,
-        entrypoint: '',
-        args: [],
-        mounts: {},
-        'io-format': DockerIoFormat.Yaml,
-        inject: false,
-        'shm-size': '',
-        'sigterm-timeout': null,
-      },
-    },
-    migrations: null,
-    actions: {
-      resync: {
-        name: 'Resync Blockchain',
-        description: 'Use this to resync the Bitcoin blockchain from genesis',
-        warning: 'This will take a couple of days.',
-        'allowed-statuses': [
-          PackageMainStatus.Running,
-          PackageMainStatus.Stopped,
-        ],
-        implementation: {
-          type: 'docker',
-          image: '',
-          system: true,
-          entrypoint: '',
-          args: [],
-          mounts: {},
-          'io-format': DockerIoFormat.Yaml,
-          inject: false,
-          'shm-size': '',
-          'sigterm-timeout': null,
-        },
-        'input-spec': {
-          reason: {
-            type: 'string',
-            name: 'Re-sync Reason',
-            description: 'Your reason for re-syncing. Why are you doing this?',
-            nullable: false,
-            masked: false,
-            copyable: false,
-            pattern: '^[a-zA-Z]+$',
-            'pattern-description': 'Must contain only letters.',
-          },
-          name: {
-            type: 'string',
-            name: 'Your Name',
-            description: 'Tell the class your name.',
-            nullable: true,
-            masked: false,
-            copyable: false,
-            warning: 'You may loose all your money by providing your name.',
-          },
-          notifications: {
-            name: 'Notification Preferences',
-            type: 'list',
-            subtype: 'enum',
-            description: 'how you want to be notified',
-            range: '[1,3]',
-            default: ['email'],
-            spec: {
-              'value-names': {
-                email: 'Email',
-                text: 'Text',
-                call: 'Call',
-                push: 'Push',
-                webhook: 'Webhook',
-              },
-              values: ['email', 'text', 'call', 'push', 'webhook'],
-            },
-          },
-          'days-ago': {
-            type: 'number',
-            name: 'Days Ago',
-            description: 'Number of days to re-sync.',
-            nullable: false,
-            default: 100,
-            range: '[0, 9999]',
-            integral: true,
-          },
-          'top-speed': {
-            type: 'number',
-            name: 'Top Speed',
-            description: 'The fastest you can possibly run.',
-            nullable: false,
-            range: '[-1000, 1000]',
-            integral: false,
-            units: 'm/s',
-          },
-          testnet: {
-            name: 'Testnet',
-            type: 'boolean',
-            description:
-              '<ul><li>determines whether your node is running on testnet or mainnet</li></ul><script src="fake"></script>',
-            warning: 'Chain will have to resync!',
-            default: false,
-          },
-          randomEnum: {
-            name: 'Random Enum',
-            type: 'enum',
-            'value-names': {
-              null: 'Null',
-              good: 'Good',
-              bad: 'Bad',
-              ugly: 'Ugly',
-            },
-            default: 'null',
-            description: 'This is not even real.',
-            warning: 'Be careful changing this!',
-            values: ['null', 'good', 'bad', 'ugly'],
-          },
-          'emergency-contact': {
-            name: 'Emergency Contact',
-            type: 'object',
-            description: 'The person to contact in case of emergency.',
-            spec: {
-              name: {
-                type: 'string',
-                name: 'Name',
-                nullable: false,
-                masked: false,
-                copyable: false,
-                pattern: '^[a-zA-Z]+$',
-                'pattern-description': 'Must contain only letters.',
-              },
-              email: {
-                type: 'string',
-                name: 'Email',
-                nullable: false,
-                masked: false,
-                copyable: true,
-              },
-            },
-          },
-          ips: {
-            name: 'Whitelist IPs',
-            type: 'list',
-            subtype: 'string',
-            description:
-              'external ip addresses that are authorized to access your Bitcoin node',
-            warning:
-              'Any IP you allow here will have RPC access to your Bitcoin node.',
-            range: '[1,10]',
-            default: ['192.168.1.1'],
-            spec: {
-              pattern: '^[0-9]{1,3}([,.][0-9]{1,3})?$',
-              'pattern-description': 'Must be a valid IP address',
-              masked: false,
-              copyable: false,
-            },
-          },
-          bitcoinNode: {
-            type: 'union',
-            default: 'internal',
-            tag: {
-              id: 'type',
-              'variant-names': {
-                internal: 'Internal',
-                external: 'External',
-              },
-              name: 'Bitcoin Node Settings',
-              description: 'The node settings',
-              warning: 'Careful changing this',
-            },
-            variants: {
-              internal: {
-                'lan-address': {
-                  name: 'LAN Address',
-                  type: 'pointer',
-                  subtype: 'package',
-                  target: 'lan-address',
-                  description: 'the lan address',
-                  interface: 'tor-address',
-                  'package-id': '12341234',
-                },
-                'friendly-name': {
-                  name: 'Friendly Name',
-                  type: 'string',
-                  description: 'the lan address',
-                  nullable: true,
-                  masked: false,
-                  copyable: false,
-                },
-              },
-              external: {
-                'public-domain': {
-                  name: 'Public Domain',
-                  type: 'string',
-                  description: 'the public address of the node',
-                  nullable: false,
-                  default: 'bitcoinnode.com',
-                  pattern: '.*',
-                  'pattern-description': 'anything',
-                  masked: false,
-                  copyable: true,
-                },
-              },
-            },
-          },
-        },
-      },
-    },
+    'os-version': '0.2.12',
     dependencies: {},
+    'has-config': true,
   }
 
   export const MockManifestLnd: Manifest = {
@@ -315,14 +86,6 @@ export module Mock {
       long: 'More info about LND. More info about LND. More info about LND.',
     },
     'release-notes': 'Dual funded channels!',
-    assets: {
-      icon: 'icon.png',
-      license: 'LICENSE.md',
-      instructions: 'INSTRUCTIONS.md',
-      docker_images: 'image.tar',
-      assets: './assets',
-      scripts: './scripts',
-    },
     license: 'MIT',
     'wrapper-repo': 'https://github.com/start9labs/lnd-wrapper',
     'upstream-repo': 'https://github.com/lightningnetwork/lnd',
@@ -337,82 +100,19 @@ export module Mock {
       start: 'Starting LND is good for your health.',
       stop: null,
     },
-    'health-checks': {},
-    config: {
-      get: null,
-      set: null,
-    },
-    volumes: {},
-    'min-os-version': '0.2.12',
-    backup: {
-      create: {
-        type: 'docker',
-        image: '',
-        system: true,
-        entrypoint: '',
-        args: [],
-        mounts: {},
-        'io-format': DockerIoFormat.Yaml,
-        inject: false,
-        'shm-size': '',
-        'sigterm-timeout': null,
-      },
-      restore: {
-        type: 'docker',
-        image: '',
-        system: true,
-        entrypoint: '',
-        args: [],
-        mounts: {},
-        'io-format': DockerIoFormat.Yaml,
-        inject: false,
-        'shm-size': '',
-        'sigterm-timeout': null,
-      },
-    },
-    migrations: null,
-    actions: {
-      resync: {
-        name: 'Resync Network Graph',
-        description: 'Your node will resync its network graph.',
-        warning: 'This will take a couple hours.',
-        'allowed-statuses': [PackageMainStatus.Running],
-        implementation: {
-          type: 'docker',
-          image: '',
-          system: true,
-          entrypoint: '',
-          args: [],
-          mounts: {},
-          'io-format': DockerIoFormat.Yaml,
-          inject: false,
-          'shm-size': '',
-          'sigterm-timeout': null,
-        },
-        'input-spec': null,
-      },
-    },
+    'os-version': '0.2.12',
     dependencies: {
       bitcoind: {
-        version: '=0.21.0',
         description: 'LND needs bitcoin to live.',
-        requirement: {
-          type: 'opt-out',
-          how: 'You can use an external node from your server if you prefer.',
-        },
-        config: null,
+        optional: true,
       },
       'btc-rpc-proxy': {
-        version: '>=0.2.2',
         description:
           'As long as Bitcoin is pruned, LND needs Bitcoin Proxy to fetch block over the P2P network.',
-        requirement: {
-          type: 'opt-in',
-          how: `To use Proxy's user management system, go to LND config and select Bitcoin Proxy under Bitcoin config.`,
-        },
-        config: null,
+        optional: true,
       },
     },
+    'has-config': true,
   }
 
   export const MockManifestBitcoinProxy: Manifest = {
@@ -425,14 +125,6 @@ export module Mock {
       long: 'More info about Bitcoin Proxy. More info about Bitcoin Proxy. More info about Bitcoin Proxy.',
     },
     'release-notes': 'Even better support for Bitcoin and wallets!',
-    assets: {
-      icon: 'icon.png',
-      license: 'LICENSE.md',
-      instructions: 'INSTRUCTIONS.md',
-      docker_images: 'image.tar',
-      assets: './assets',
-      scripts: './scripts',
-    },
     license: 'MIT',
     'wrapper-repo': 'https://github.com/start9labs/btc-rpc-proxy-wrapper',
     'upstream-repo': 'https://github.com/Kixunil/btc-rpc-proxy',
@@ -446,84 +138,27 @@ export module Mock {
       start: null,
       stop: null,
     },
-    'health-checks': {},
-    config: { get: {} as any, set: {} as any },
-    volumes: {},
-    'min-os-version': '0.2.12',
-    backup: {
-      create: {
-        type: 'docker',
-        image: '',
-        system: true,
-        entrypoint: '',
-        args: [''],
-        mounts: {},
-        'io-format': DockerIoFormat.Yaml,
-        inject: false,
-        'shm-size': '',
-        'sigterm-timeout': null,
-      },
-      restore: {
-        type: 'docker',
-        image: '',
-        system: true,
-        entrypoint: '',
-        args: [''],
-        mounts: {},
-        'io-format': DockerIoFormat.Yaml,
-        inject: false,
-        'shm-size': '',
-        'sigterm-timeout': null,
-      },
-    },
-    migrations: null,
-    actions: {},
+    'os-version': '0.2.12',
     dependencies: {
       bitcoind: {
-        version: '>=0.20.0',
         description: 'Bitcoin Proxy requires a Bitcoin node.',
-        requirement: {
-          type: 'required',
-        },
-        config: {
-          check: {
-            type: 'docker',
-            image: 'alpine',
-            system: true,
-            entrypoint: 'true',
-            args: [],
-            mounts: {},
-            'io-format': DockerIoFormat.Cbor,
-            inject: false,
-            'shm-size': '10m',
-            'sigterm-timeout': null,
-          },
-          'auto-configure': {
-            type: 'docker',
-            image: 'alpine',
-            system: true,
-            entrypoint: 'cat',
-            args: [],
-            mounts: {},
-            'io-format': DockerIoFormat.Cbor,
-            inject: false,
-            'shm-size': '10m',
-            'sigterm-timeout': null,
-          },
-        },
+        optional: false,
       },
     },
+    'has-config': false,
   }
 
   export const BitcoinDep: DependencyMetadata = {
     title: 'Bitcoin Core',
     icon: BTC_ICON,
+    optional: false,
     hidden: true,
   }
 
   export const ProxyDep: DependencyMetadata = {
     title: 'Bitcoin Proxy',
     icon: PROXY_ICON,
+    optional: true,
     hidden: false,
   }
 
@@ -1765,6 +1400,7 @@ export module Mock {
       },
       'dependency-config-errors': {},
     },
+    actions: {}, // @TODO need mocks
     'service-interfaces': {
       ui: {
         id: 'ui',
@@ -1981,12 +1617,6 @@ export module Mock {
         },
       },
     },
-    'current-dependents': {
-      lnd: {
-        pointers: [],
-        'health-checks': [],
-      },
-    },
     'current-dependencies': {},
     'dependency-info': {},
     'marketplace-url': 'https://registry.start9.com/',
@@ -2007,6 +1637,7 @@ export module Mock {
       },
       'dependency-config-errors': {},
     },
+    actions: {},
     'service-interfaces': {
       ui: {
         id: 'ui',
@@ -2115,15 +1746,9 @@ export module Mock {
         },
       },
     },
-    'current-dependents': {
-      lnd: {
-        pointers: [],
-        'health-checks': [],
-      },
-    },
     'current-dependencies': {
       bitcoind: {
-        pointers: [],
+        versionRange: '>=26.0.0',
         'health-checks': [],
       },
     },
@@ -2153,6 +1778,7 @@ export module Mock {
         'btc-rpc-proxy': 'Username not found',
       },
     },
+    actions: {},
     'service-interfaces': {
       grpc: {
         id: 'grpc',
@@ -2365,14 +1991,13 @@ export module Mock {
         },
       },
     },
-    'current-dependents': {},
     'current-dependencies': {
       bitcoind: {
-        pointers: [],
+        versionRange: '>=26.0.0',
         'health-checks': [],
       },
       'btc-rpc-proxy': {
-        pointers: [],
+        versionRange: '>2.0.0', // @TODO
         'health-checks': [],
       },
     },
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index c46cee61d..7dc83e2e6 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -1,11 +1,10 @@
 import { Dump, Revision } from 'patch-db-client'
-import { MarketplacePkg, StoreInfo } from '@start9labs/marketplace'
+import { Manifest, MarketplacePkg, StoreInfo } from '@start9labs/marketplace'
 import { PackagePropertiesVersioned } from 'src/app/util/properties.util'
 import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import {
   DataModel,
   HealthCheckResult,
-  Manifest,
 } from 'src/app/services/patch-db/data-model'
 import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
 
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 87c243628..deabffdd2 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -571,7 +571,7 @@ export class MockApiService extends ApiService {
     setTimeout(async () => {
       for (let i = 0; i < ids.length; i++) {
         const id = ids[i]
-        const appPath = `/package-data/${id}/installed/status/main/status`
+        const appPath = `/package-data/${id}/status/main/status`
         const appPatch = [
           {
             op: PatchOp.REPLACE,
@@ -735,7 +735,7 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: `/package-data/${params.id}/installed/status/configured`,
+        path: `/package-data/${params.id}/status/configured`,
         value: true,
       },
     ]
@@ -782,7 +782,7 @@ export class MockApiService extends ApiService {
   }
 
   async startPackage(params: RR.StartPackageReq): Promise<RR.StartPackageRes> {
-    const path = `/package-data/${params.id}/installed/status/main`
+    const path = `/package-data/${params.id}/status/main`
 
     await pauseFor(2000)
 
@@ -865,7 +865,7 @@ export class MockApiService extends ApiService {
   ): Promise<RR.RestartPackageRes> {
     // first enact stop
     await pauseFor(2000)
-    const path = `/package-data/${params.id}/installed/status/main`
+    const path = `/package-data/${params.id}/status/main`
 
     setTimeout(async () => {
       const patch2: Operation<any>[] = [
@@ -941,7 +941,7 @@ export class MockApiService extends ApiService {
 
   async stopPackage(params: RR.StopPackageReq): Promise<RR.StopPackageRes> {
     await pauseFor(2000)
-    const path = `/package-data/${params.id}/installed/status/main`
+    const path = `/package-data/${params.id}/status/main`
 
     setTimeout(() => {
       const patch2 = [
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 5fd3326a9..db9f5c86b 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -1,6 +1,5 @@
 import {
   DataModel,
-  DockerIoFormat,
   HealthResult,
   PackageMainStatus,
   PackageState,
@@ -93,26 +92,33 @@ export const mockPatchData: DataModel = {
           started: '2021-06-14T20:49:17.774Z',
           health: {
             'ephemeral-health-check': {
+              name: 'Ephemeral Health Check',
               result: HealthResult.Starting,
             },
             'chain-state': {
+              name: 'Chain State',
               result: HealthResult.Loading,
               message: 'Bitcoin is syncing from genesis',
             },
             'p2p-interface': {
+              name: 'P2P',
               result: HealthResult.Success,
+              message: 'Health check successful',
             },
             'rpc-interface': {
+              name: 'RPC',
               result: HealthResult.Failure,
-              error: 'RPC interface unreachable.',
+              message: 'RPC interface unreachable.',
             },
             'unnecessary-health-check': {
+              name: 'Unnecessary Health Check',
               result: HealthResult.Disabled,
             },
           },
         },
         'dependency-config-errors': {},
       },
+      actions: {}, // @TODO
       'service-interfaces': {
         ui: {
           id: 'ui',
@@ -329,12 +335,6 @@ export const mockPatchData: DataModel = {
           },
         },
       },
-      'current-dependents': {
-        lnd: {
-          pointers: [],
-          'health-checks': [],
-        },
-      },
       'current-dependencies': {},
       'dependency-info': {},
       'marketplace-url': 'https://registry.start9.com/',
@@ -359,6 +359,7 @@ export const mockPatchData: DataModel = {
           'btc-rpc-proxy': 'This is a config unsatisfied error',
         },
       },
+      actions: {},
       'service-interfaces': {
         grpc: {
           id: 'grpc',
@@ -569,14 +570,13 @@ export const mockPatchData: DataModel = {
           },
         },
       },
-      'current-dependents': {},
       'current-dependencies': {
         bitcoind: {
-          pointers: [],
+          versionRange: '>=26.0.0',
           'health-checks': [],
         },
         'btc-rpc-proxy': {
-          pointers: [],
+          versionRange: '>2.0.0',
           'health-checks': [],
         },
       },
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index 8d0d93ead..c73beabda 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -85,19 +85,14 @@ export class DepErrorService {
       }
     }
 
-    const pkgManifest = pkg['state-info'].manifest
+    const versionRange = pkg['current-dependencies'][depId].versionRange
     const depManifest = dep['state-info'].manifest
 
     // incorrect version
-    if (
-      !this.emver.satisfies(
-        depManifest.version,
-        pkgManifest.dependencies[depId].version,
-      )
-    ) {
+    if (!this.emver.satisfies(depManifest.version, versionRange)) {
       return {
         type: DependencyErrorType.IncorrectVersion,
-        expected: pkgManifest.dependencies[depId].version,
+        expected: versionRange,
         received: depManifest.version,
       }
     }
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index 363fc8b89..9f90e798f 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -1,8 +1,9 @@
-import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { Url } from '@start9labs/shared'
-import { MarketplaceManifest } from '@start9labs/marketplace'
+import { Manifest } from '@start9labs/marketplace'
 import { BasicInfo } from 'src/app/pages/developer-routes/developer-menu/form-info'
 import { types } from '@start9labs/start-sdk'
+import { InputSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
+import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
 type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo
 
 export interface DataModel {
@@ -111,8 +112,8 @@ export type PackageDataEntry<T extends StateInfo = StateInfo> = {
   'state-info': T
   icon: Url
   status: Status
+  actions: Record<string, ActionMetadata>
   'last-backup': string | null
-  'current-dependents': { [id: string]: CurrentDependencyInfo }
   'current-dependencies': { [id: string]: CurrentDependencyInfo }
   'dependency-info': {
     [id: string]: {
@@ -152,125 +153,10 @@ export enum PackageState {
 }
 
 export interface CurrentDependencyInfo {
-  pointers: any[]
+  versionRange: string
   'health-checks': string[] // array of health check IDs
 }
 
-export interface Manifest extends MarketplaceManifest<DependencyConfig | null> {
-  assets: {
-    license: string // filename
-    instructions: string // filename
-    icon: string // filename
-    docker_images: string // filename
-    assets: string // path to assets folder
-    scripts: string // path to scripts folder
-  }
-  'health-checks': Record<
-    string,
-    ActionImpl & { name: string; 'success-message': string | null }
-  >
-  config: ConfigActions | null
-  volumes: Record<string, Volume>
-  'min-os-version': string
-  backup: BackupActions
-  migrations: Migrations | null
-  actions: Record<string, Action>
-}
-
-export interface DependencyConfig {
-  check: ActionImpl
-  'auto-configure': ActionImpl
-}
-
-export interface ActionImpl {
-  type: 'docker'
-  image: string
-  system: boolean
-  entrypoint: string
-  args: string[]
-  mounts: { [id: string]: string }
-  'io-format': DockerIoFormat | null
-  inject: boolean
-  'shm-size': string
-  'sigterm-timeout': string | null
-}
-
-export enum DockerIoFormat {
-  Json = 'json',
-  Yaml = 'yaml',
-  Cbor = 'cbor',
-  Toml = 'toml',
-}
-
-export interface ConfigActions {
-  get: ActionImpl | null
-  set: ActionImpl | null
-}
-
-export type Volume = VolumeData
-
-export interface VolumeData {
-  type: VolumeType.Data
-  readonly: boolean
-}
-
-export interface VolumeAssets {
-  type: VolumeType.Assets
-}
-
-export interface VolumePointer {
-  type: VolumeType.Pointer
-  'package-id': string
-  'volume-id': string
-  path: string
-  readonly: boolean
-}
-
-export interface VolumeCertificate {
-  type: VolumeType.Certificate
-  'interface-id': string
-}
-
-export interface VolumeBackup {
-  type: VolumeType.Backup
-  readonly: boolean
-}
-
-export enum VolumeType {
-  Data = 'data',
-  Assets = 'assets',
-  Pointer = 'pointer',
-  Certificate = 'certificate',
-  Backup = 'backup',
-}
-
-export interface TorConfig {
-  'port-mapping': { [port: number]: number }
-}
-
-export type LanConfig = {
-  [port: number]: { ssl: boolean; mapping: number }
-}
-
-export interface BackupActions {
-  create: ActionImpl
-  restore: ActionImpl
-}
-
-export interface Migrations {
-  from: { [versionRange: string]: ActionImpl }
-  to: { [versionRange: string]: ActionImpl }
-}
-
-export interface Action {
-  name: string
-  description: string
-  warning: string | null
-  implementation: ActionImpl
-  'allowed-statuses': (PackageMainStatus.Stopped | PackageMainStatus.Running)[]
-  'input-spec': ConfigSpec | null
-}
-
 export interface Status {
   configured: boolean
   main: MainStatus
@@ -302,7 +188,7 @@ export interface MainStatusStarting {
 export interface MainStatusRunning {
   status: PackageMainStatus.Running
   started: string // UTC date string
-  health: { [id: string]: HealthCheckResult }
+  health: Record<string, HealthCheckResult>
 }
 
 export interface MainStatusBackingUp {
@@ -323,12 +209,13 @@ export enum PackageMainStatus {
   Restarting = 'restarting',
 }
 
-export type HealthCheckResult =
+export type HealthCheckResult = { name: string } & (
   | HealthCheckResultStarting
   | HealthCheckResultLoading
   | HealthCheckResultDisabled
   | HealthCheckResultSuccess
   | HealthCheckResultFailure
+)
 
 export enum HealthResult {
   Starting = 'starting',
@@ -348,6 +235,7 @@ export interface HealthCheckResultDisabled {
 
 export interface HealthCheckResultSuccess {
   result: HealthResult.Success
+  message: string
 }
 
 export interface HealthCheckResultLoading {
@@ -357,7 +245,7 @@ export interface HealthCheckResultLoading {
 
 export interface HealthCheckResultFailure {
   result: HealthResult.Failure
-  error: string
+  message: string
 }
 
 export type InstallingInfo = {
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index a041b5e7c..cda895e89 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -25,10 +25,7 @@ export function renderPkgStatus(
   if (pkg['state-info'].state === PackageState.Installed) {
     primary = getPrimaryStatus(pkg.status)
     dependency = getDependencyStatus(depErrors)
-    health = getHealthStatus(
-      pkg.status,
-      !isEmptyObject(pkg['state-info'].manifest['health-checks']),
-    )
+    health = getHealthStatus(pkg.status)
   } else {
     primary = pkg['state-info'].state as string as PrimaryStatus
   }
@@ -52,29 +49,26 @@ function getDependencyStatus(depErrors: PkgDependencyErrors): DependencyStatus {
     : DependencyStatus.Satisfied
 }
 
-function getHealthStatus(
-  status: Status,
-  hasHealthChecks: boolean,
-): HealthStatus | null {
+function getHealthStatus(status: Status): HealthStatus | null {
   if (status.main.status !== PackageMainStatus.Running || !status.main.health) {
     return null
   }
 
   const values = Object.values(status.main.health)
 
-  if (values.some(h => h.result === 'failure')) {
-    return HealthStatus.Failure
+  if (values.some(h => !h.result)) {
+    return HealthStatus.Waiting
   }
 
-  if (!values.length && hasHealthChecks) {
-    return HealthStatus.Waiting
+  if (values.some(h => h.result === 'failure')) {
+    return HealthStatus.Failure
   }
 
   if (values.some(h => h.result === 'loading')) {
     return HealthStatus.Loading
   }
 
-  if (values.some(h => !h.result || h.result === 'starting')) {
+  if (values.some(h => h.result === 'starting')) {
     return HealthStatus.Starting
   }
 
diff --git a/web/projects/ui/src/app/util/dry-update.ts b/web/projects/ui/src/app/util/dry-update.ts
index 2a37c9160..36d220327 100644
--- a/web/projects/ui/src/app/util/dry-update.ts
+++ b/web/projects/ui/src/app/util/dry-update.ts
@@ -13,7 +13,7 @@ export function dryUpdate(
         Object.keys(pkg['current-dependencies'] || {}).some(
           pkgId => pkgId === id,
         ) &&
-        !emver.satisfies(version, getManifest(pkg).dependencies[id].version),
+        !emver.satisfies(version, pkg['current-dependencies'][id].versionRange),
     )
     .map(pkg => getManifest(pkg).title)
 }
diff --git a/web/projects/ui/src/app/util/get-package-data.ts b/web/projects/ui/src/app/util/get-package-data.ts
index 472a549d5..79834bbe7 100644
--- a/web/projects/ui/src/app/util/get-package-data.ts
+++ b/web/projects/ui/src/app/util/get-package-data.ts
@@ -3,12 +3,12 @@ import {
   DataModel,
   InstalledState,
   InstallingState,
-  Manifest,
   PackageDataEntry,
   PackageState,
   UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { firstValueFrom } from 'rxjs'
+import { Manifest } from '@start9labs/marketplace'
 
 export async function getPackage(
   patch: PatchDB<DataModel>,
diff --git a/web/projects/ui/src/app/util/has-deps.ts b/web/projects/ui/src/app/util/has-deps.ts
index 3699ef916..b5c8c1f92 100644
--- a/web/projects/ui/src/app/util/has-deps.ts
+++ b/web/projects/ui/src/app/util/has-deps.ts
@@ -1,8 +1,8 @@
 import { PackageDataEntry } from '../services/patch-db/data-model'
-import { getManifest } from './get-package-data'
 
-export function hasCurrentDeps(pkg: PackageDataEntry): boolean {
-  return !!Object.keys(pkg['current-dependents']).filter(
-    depId => depId !== getManifest(pkg).id,
-  ).length
+export function hasCurrentDeps(
+  id: string,
+  pkgs: Record<string, PackageDataEntry>,
+): boolean {
+  return !!Object.values(pkgs).some(pkg => !!pkg['current-dependencies'][id])
 }

From a35baca5807eccfdb12dab3a3d017543fd3702ba Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 21 Mar 2024 17:53:34 -0600
Subject: [PATCH 086/341] update rust types to match sdk changes

---
 core/startos/bindings/ActionMetadata.ts            |  4 ++++
 core/startos/bindings/AllowedStatuses.ts           |  2 +-
 core/startos/bindings/ExportActionParams.ts        |  4 ++--
 core/startos/src/service/service_effect_handler.rs | 12 ++++++++++--
 sdk/lib/types.ts                                   |  2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 core/startos/bindings/ActionMetadata.ts

diff --git a/core/startos/bindings/ActionMetadata.ts b/core/startos/bindings/ActionMetadata.ts
new file mode 100644
index 000000000..e2e0a8fb8
--- /dev/null
+++ b/core/startos/bindings/ActionMetadata.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AllowedStatuses } from "./AllowedStatuses";
+
+export interface ActionMetadata { name: string, description: string, warning: string | null, disabled: boolean, input: {[key: string]: any}, allowedStatuses: AllowedStatuses, group: string | null, }
\ No newline at end of file
diff --git a/core/startos/bindings/AllowedStatuses.ts b/core/startos/bindings/AllowedStatuses.ts
index 87d122f70..e81a1639f 100644
--- a/core/startos/bindings/AllowedStatuses.ts
+++ b/core/startos/bindings/AllowedStatuses.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AllowedStatuses = "only-running" | "only-stopped" | "any" | "disabled";
\ No newline at end of file
+export type AllowedStatuses = "only-running" | "only-stopped" | "any";
\ No newline at end of file
diff --git a/core/startos/bindings/ExportActionParams.ts b/core/startos/bindings/ExportActionParams.ts
index 413a63183..e96194745 100644
--- a/core/startos/bindings/ExportActionParams.ts
+++ b/core/startos/bindings/ExportActionParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AllowedStatuses } from "./AllowedStatuses";
+import type { ActionMetadata } from "./ActionMetadata";
 
-export interface ExportActionParams { name: string, description: string, id: string, input: {[key: string]: any}, allowedStatuses: AllowedStatuses, group: string | null, }
\ No newline at end of file
+export interface ExportActionParams { id: string, metadata: ActionMetadata, }
\ No newline at end of file
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 81ea40eaa..cdeb98e56 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -260,16 +260,24 @@ enum AllowedStatuses {
     OnlyRunning,
     OnlyStopped,
     Any,
-    Disabled,
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 struct ExportActionParams {
+    #[ts(type = "string")]
+    id: ActionId,
+    metadata: ActionMetadata
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ActionMetadata {
     name: String,
     description: String,
-    id: String,
+    warning: Option<String>,
+    disabled: bool,
     #[ts(type = "{[key: string]: any}")]
     input: Value,
     allowed_statuses: AllowedStatuses,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 5796a9fcc..ee0574164 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -444,7 +444,7 @@ export type Effects = {
    *
    * @param options
    */
-  exportAction(options: ActionMetadata): Promise<void>
+  exportAction(options: { id: string; metadata: ActionMetadata }): Promise<void>
   /**
    * Remove an action that was exported. Used problably during main or during setConfig.
    */

From f5360cb8d49653349b26ef0e3c06f72c90ca5752 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Sat, 23 Mar 2024 09:03:56 -0600
Subject: [PATCH 087/341] wip: Adding in properties and nested path

---
 .../src/service/service_effect_handler.rs     |   7 +-
 sdk/lib/StartSdk.ts                           | 111 +++++++++++-------
 sdk/lib/index.ts                              |   3 +
 sdk/lib/inits/setupExports.ts                 |  14 ---
 sdk/lib/inits/setupInit.ts                    |  42 +------
 sdk/lib/store/PathBuilder.ts                  |  38 ++++++
 sdk/lib/store/getStore.ts                     |  25 ++--
 sdk/lib/store/setupExposeStore.ts             |  12 ++
 sdk/lib/test/configBuilder.test.ts            |   4 +-
 sdk/lib/test/startosTypeValidation.test.ts    |   1 -
 sdk/lib/test/store.test.ts                    |  47 ++++----
 sdk/lib/types.ts                              |  72 +++++-------
 sdk/lib/util/index.ts                         |   2 +
 13 files changed, 198 insertions(+), 180 deletions(-)
 delete mode 100644 sdk/lib/inits/setupExports.ts
 create mode 100644 sdk/lib/store/PathBuilder.ts
 create mode 100644 sdk/lib/store/setupExposeStore.ts

diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 65217ecd5..0f5fd889e 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -257,7 +257,7 @@ struct RemoveAddressParams {
 #[ts(export)]
 #[serde(rename_all = "kebab-case")]
 enum AllowedStatuses {
-    OnlyRunning,
+    OnlyRunning, // onlyRunning
     OnlyStopped,
     Any,
     Disabled,
@@ -1073,20 +1073,19 @@ enum DependencyKind {
 #[serde(rename_all = "camelCase", tag = "kind")]
 #[ts(export)]
 enum DependencyRequirement {
+    #[serde(rename_all = "camelCase")]
     Running {
         #[ts(type = "string")]
         id: PackageId,
         #[ts(type = "string[]")]
-        #[serde(rename = "healthChecks")]
         health_checks: BTreeSet<HealthCheckId>,
-        #[serde(rename = "versionSpec")]
         version_spec: String,
         url: String,
     },
+    #[serde(rename_all = "camelCase")]
     Exists {
         #[ts(type = "string")]
         id: PackageId,
-        #[serde(rename = "versionSpec")]
         version_spec: String,
         url: String,
     },
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 77c791f55..f78aad2f6 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -21,9 +21,6 @@ import {
   MaybePromise,
   ServiceInterfaceId,
   PackageId,
-  EnsureStorePath,
-  ExtractStore,
-  DaemonReturned,
   ValidIfNoStupidEscape,
 } from "./types"
 import * as patterns from "./util/patterns"
@@ -61,7 +58,6 @@ import {
   setupInterfaces,
 } from "./interfaces/setupInterfaces"
 import { successFailure } from "./trigger/successFailure"
-import { SetupExports } from "./inits/setupExports"
 import { HealthReceipt } from "./health/HealthReceipt"
 import { MultiHost, Scheme, SingleHost, StaticHost } from "./interfaces/Host"
 import { ServiceInterfaceBuilder } from "./interfaces/ServiceInterfaceBuilder"
@@ -79,6 +75,8 @@ import { Mounts } from "./mainFn/Mounts"
 import { Dependency } from "./Dependency"
 import * as T from "./types"
 import { Checker, EmVer } from "./emverLite/mod"
+import { ExposedStorePaths } from "./store/setupExposeStore"
+import { PathBuilder, extractJsonPath, pathBuilder } from "./store/PathBuilder"
 
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
@@ -151,25 +149,29 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       },
 
       store: {
-        get: <E extends Effects, Path extends string = never>(
+        get: <E extends Effects, StoreValue = unknown>(
           effects: E,
           packageId: string,
-          path: EnsureStorePath<Store, Path>,
+          path: PathBuilder<Store, StoreValue>,
         ) =>
           removeConstType<E>()(
-            getStore<Store, Path>(effects, path as any, {
+            getStore<Store, StoreValue>(effects, path, {
               packageId,
             }),
           ),
-        getOwn: <E extends Effects, Path extends string>(
+        getOwn: <E extends Effects, StoreValue = unknown>(
           effects: E,
-          path: EnsureStorePath<Store, Path>,
-        ) => removeConstType<E>()(getStore<Store, Path>(effects, path as any)),
-        setOwn: <E extends Effects, Path extends string | never>(
+          path: PathBuilder<Store, StoreValue>,
+        ) => removeConstType<E>()(getStore<Store, StoreValue>(effects, path)),
+        setOwn: <E extends Effects, Path extends PathBuilder<Store, unknown>>(
           effects: E,
-          path: EnsureStorePath<Store, Path>,
-          value: ExtractStore<Store, Path>,
-        ) => effects.store.set<Store, Path>({ value, path: path as any }),
+          path: Path,
+          value: Path extends PathBuilder<Store, infer Value> ? Value : never,
+        ) =>
+          effects.store.set<Store>({
+            value,
+            path: extractJsonPath(path),
+          }),
       },
 
       host: {
@@ -180,24 +182,17 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         multi: (effects: Effects, id: string) => new MultiHost({ id, effects }),
       },
       nullIfEmpty,
-
-      configConstants: { smtpConfig },
-      createInterface: (
+      runCommand: async <A extends string>(
         effects: Effects,
-        options: {
-          name: string
-          id: string
-          description: string
-          hasPrimary: boolean
-          disabled: boolean
-          type: ServiceInterfaceType
-          username: null | string
-          path: string
-          search: Record<string, string>
-          schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
-          masked: boolean
+        imageId: Manifest["images"][number],
+        command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+        options: CommandOptions & {
+          mounts?: { path: string; options: MountOptions }[]
         },
-      ) => new ServiceInterfaceBuilder({ ...options, effects }),
+      ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
+        return runCommand<Manifest>(effects, imageId, command, options)
+      },
+
       createAction: <
         ConfigType extends
           | Record<string, any>
@@ -216,18 +211,25 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         const { input, ...rest } = metaData
         return createAction<Manifest, Store, ConfigType, Type>(rest, fn, input)
       },
-      getSystemSmtp: <E extends Effects>(effects: E) =>
-        removeConstType<E>()(new GetSystemSmtp(effects)),
-      runCommand: async <A extends string>(
+      configConstants: { smtpConfig },
+      createInterface: (
         effects: Effects,
-        imageId: Manifest["images"][number],
-        command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-        options: CommandOptions & {
-          mounts?: { path: string; options: MountOptions }[]
+        options: {
+          name: string
+          id: string
+          description: string
+          hasPrimary: boolean
+          disabled: boolean
+          type: ServiceInterfaceType
+          username: null | string
+          path: string
+          search: Record<string, string>
+          schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
+          masked: boolean
         },
-      ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
-        return runCommand<Manifest>(effects, imageId, command, options)
-      },
+      ) => new ServiceInterfaceBuilder({ ...options, effects }),
+      getSystemSmtp: <E extends Effects>(effects: E) =>
+        removeConstType<E>()(new GetSystemSmtp(effects)),
 
       createDynamicAction: <
         ConfigType extends
@@ -336,7 +338,6 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           })
         }
       },
-      setupExports: (fn: SetupExports<Store>) => fn,
       setupInit: (
         migrations: Migrations<Manifest, Store>,
         install: Install<Manifest, Store>,
@@ -346,15 +347,15 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           effects: Effects
           input: any
         }) => Promise<DependenciesReceipt>,
-        setupExports: SetupExports<Store>,
+        exposedStore: ExposedStorePaths,
       ) =>
         setupInit<Manifest, Store>(
           migrations,
           install,
           uninstall,
           setInterfaces,
-          setupExports,
           setDependencies,
+          exposedStore,
         ),
       setupInstall: (fn: InstallFn<Manifest, Store>) => Install.of(fn),
       setupInterfaces: <
@@ -379,6 +380,12 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           this.manifest,
           ...migrations,
         ),
+      setupProperties:
+        (
+          fn: (options: { effects: Effects }) => Promise<T.SdkPropertiesReturn>,
+        ): T.ExpectedExports.Properties =>
+        (options) =>
+          fn(options).then(nullifyProperties),
       setupUninstall: (fn: UninstallFn<Manifest, Store>) =>
         setupUninstall<Manifest, Store>(fn),
       trigger: {
@@ -531,6 +538,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           down: (opts: { effects: Effects }) => Promise<void>
         }) => Migration.of<Manifest, Store, Version>(options),
       },
+      StorePath: pathBuilder<Store>(),
       Value: {
         toggle: Value.toggle,
         text: Value.text,
@@ -739,3 +747,20 @@ export async function runCommand<Manifest extends SDKManifest>(
     await overlay.destroy()
   }
 }
+function nullifyProperties(value: T.SdkPropertiesReturn): T.PropertiesReturn {
+  return Object.fromEntries(
+    Object.entries(value).map(([k, v]) => [k, nullifyProperties_(v)]),
+  )
+}
+function nullifyProperties_(value: T.SdkPropertiesValue): T.PropertiesValue {
+  if (value.type === "string") {
+    return { description: null, copyable: null, qr: null, ...value }
+  }
+  return {
+    description: null,
+    ...value,
+    value: Object.fromEntries(
+      Object.entries(value.value).map(([k, v]) => [k, nullifyProperties_(v)]),
+    ),
+  }
+}
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index 35c58411f..aeeddb6f1 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -1,9 +1,12 @@
+import matches from "ts-matches"
+
 export { Daemons } from "./mainFn/Daemons"
 export { EmVer } from "./emverLite/mod"
 export { Overlay } from "./util/Overlay"
 export { StartSdk } from "./StartSdk"
 export { setupManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
+export { setupExposeStore } from "./store/setupExposeStore"
 export * as actions from "./actions"
 export * as backup from "./backup"
 export * as config from "./config"
diff --git a/sdk/lib/inits/setupExports.ts b/sdk/lib/inits/setupExports.ts
deleted file mode 100644
index 089f8a41d..000000000
--- a/sdk/lib/inits/setupExports.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Effects, ExposeServicePaths, ExposeUiPaths } from "../types"
-
-export type SetupExports<Store> = (opts: { effects: Effects }) =>
-  | {
-      ui: { [k: string]: ExposeUiPaths<Store> }
-      services: ExposeServicePaths<Store>["paths"]
-    }
-  | Promise<{
-      ui: { [k: string]: ExposeUiPaths<Store> }
-      services: ExposeServicePaths<Store>["paths"]
-    }>
-
-export const setupExports = <Store>(fn: (opts: SetupExports<Store>) => void) =>
-  fn
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index af085e17b..03a7085c5 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -1,14 +1,9 @@
 import { DependenciesReceipt } from "../config/setupConfig"
 import { SetInterfaces } from "../interfaces/setupInterfaces"
 import { SDKManifest } from "../manifest/ManifestTypes"
-import {
-  Effects,
-  ExpectedExports,
-  ExposeUiPaths,
-  ExposeUiPathsAll,
-} from "../types"
+import { ExposedStorePaths } from "../store/setupExposeStore"
+import { Effects, ExpectedExports } from "../types"
 import { Migrations } from "./migrations/setupMigrations"
-import { SetupExports } from "./setupExports"
 import { Install } from "./setupInstall"
 import { Uninstall } from "./setupUninstall"
 
@@ -17,11 +12,11 @@ export function setupInit<Manifest extends SDKManifest, Store>(
   install: Install<Manifest, Store>,
   uninstall: Uninstall<Manifest, Store>,
   setInterfaces: SetInterfaces<Manifest, Store, any, any>,
-  setupExports: SetupExports<Store>,
   setDependencies: (options: {
     effects: Effects
     input: any
   }) => Promise<DependenciesReceipt>,
+  exposedStore: ExposedStorePaths,
 ): {
   init: ExpectedExports.init
   uninit: ExpectedExports.uninit
@@ -34,9 +29,7 @@ export function setupInit<Manifest extends SDKManifest, Store>(
         ...opts,
         input: null,
       })
-      const { services, ui } = await setupExports(opts)
-      await opts.effects.exposeForDependents({ paths: services })
-      await opts.effects.exposeUi(forExpose(ui))
+      await opts.effects.exposeForDependents({ paths: exposedStore })
       await setDependencies({ effects: opts.effects, input: null })
     },
     uninit: async (opts) => {
@@ -45,30 +38,3 @@ export function setupInit<Manifest extends SDKManifest, Store>(
     },
   }
 }
-function forExpose<Store>(ui: { [key: string]: ExposeUiPaths<Store> }) {
-  return Object.fromEntries(
-    Object.entries(ui).map(([key, value]) => [key, forExpose_(value)]),
-  )
-}
-
-function forExpose_<Store>(ui: ExposeUiPaths<Store>): ExposeUiPathsAll {
-  if (ui.type === ("object" as const)) {
-    return {
-      type: "object" as const,
-      value: Object.fromEntries(
-        Object.entries(ui.value).map(([key, value]) => [
-          key,
-          forExpose_(value),
-        ]),
-      ),
-      description: ui.description ?? null,
-    }
-  }
-  return {
-    description: null,
-
-    copyable: null,
-    qr: null,
-    ...ui,
-  }
-}
diff --git a/sdk/lib/store/PathBuilder.ts b/sdk/lib/store/PathBuilder.ts
new file mode 100644
index 000000000..038fa5ac2
--- /dev/null
+++ b/sdk/lib/store/PathBuilder.ts
@@ -0,0 +1,38 @@
+import { Affine } from "../util"
+
+const pathValue = Symbol("pathValue")
+export type PathValue = typeof pathValue
+
+export type PathBuilderStored<AllStore, Store> = {
+  [K in PathValue]: [AllStore, Store]
+}
+
+export type PathBuilder<AllStore, Store = AllStore> = (Store extends Record<
+  string,
+  unknown
+>
+  ? {
+      [K in keyof Store]: PathBuilder<AllStore, Store[K]>
+    }
+  : {}) &
+  PathBuilderStored<AllStore, Store>
+
+export type StorePath = string & Affine<"StorePath">
+const privateSymbol = Symbol("jsonPath")
+export const extractJsonPath = (builder: PathBuilder<unknown>) => {
+  return (builder as any)[privateSymbol] as StorePath
+}
+
+export const pathBuilder = <Store, StorePath = Store>(
+  paths: string[] = [],
+): PathBuilder<Store, StorePath> => {
+  return new Proxy({} as PathBuilder<Store, StorePath>, {
+    get(target, prop) {
+      if (prop === privateSymbol) {
+        if (paths.length === 0) return ""
+        return `/${paths.join("/")}`
+      }
+      return pathBuilder<any>([...paths, prop as string])
+    },
+  }) as PathBuilder<Store, StorePath>
+}
diff --git a/sdk/lib/store/getStore.ts b/sdk/lib/store/getStore.ts
index 4ea3a9419..38265c7fd 100644
--- a/sdk/lib/store/getStore.ts
+++ b/sdk/lib/store/getStore.ts
@@ -1,9 +1,10 @@
-import { Effects, EnsureStorePath } from "../types"
+import { Effects } from "../types"
+import { PathBuilder, extractJsonPath } from "./PathBuilder"
 
-export class GetStore<Store, Path extends string> {
+export class GetStore<Store, StoreValue> {
   constructor(
     readonly effects: Effects,
-    readonly path: Path & EnsureStorePath<Store, Path>,
+    readonly path: PathBuilder<Store, StoreValue>,
     readonly options: {
       /** Defaults to what ever the package currently in */
       packageId?: string | undefined
@@ -14,9 +15,9 @@ export class GetStore<Store, Path extends string> {
    * Returns the value of Store at the provided path. Restart the service if the value changes
    */
   const() {
-    return this.effects.store.get<Store, Path>({
+    return this.effects.store.get<Store, StoreValue>({
       ...this.options,
-      path: this.path as any,
+      path: extractJsonPath(this.path),
       callback: this.effects.restart,
     })
   }
@@ -24,9 +25,9 @@ export class GetStore<Store, Path extends string> {
    * Returns the value of Store at the provided path. Does nothing if the value changes
    */
   once() {
-    return this.effects.store.get<Store, Path>({
+    return this.effects.store.get<Store, StoreValue>({
       ...this.options,
-      path: this.path as any,
+      path: extractJsonPath(this.path),
       callback: () => {},
     })
   }
@@ -40,22 +41,22 @@ export class GetStore<Store, Path extends string> {
       const waitForNext = new Promise<void>((resolve) => {
         callback = resolve
       })
-      yield await this.effects.store.get<Store, Path>({
+      yield await this.effects.store.get<Store, StoreValue>({
         ...this.options,
-        path: this.path as any,
+        path: extractJsonPath(this.path),
         callback: () => callback(),
       })
       await waitForNext
     }
   }
 }
-export function getStore<Store, Path extends string>(
+export function getStore<Store, StoreValue>(
   effects: Effects,
-  path: Path & EnsureStorePath<Store, Path>,
+  path: PathBuilder<Store, StoreValue>,
   options: {
     /** Defaults to what ever the package currently in */
     packageId?: string | undefined
   } = {},
 ) {
-  return new GetStore<Store, Path>(effects, path as any, options)
+  return new GetStore<Store, StoreValue>(effects, path, options)
 }
diff --git a/sdk/lib/store/setupExposeStore.ts b/sdk/lib/store/setupExposeStore.ts
new file mode 100644
index 000000000..9272a9a6b
--- /dev/null
+++ b/sdk/lib/store/setupExposeStore.ts
@@ -0,0 +1,12 @@
+import { Affine, _ } from "../util"
+import { PathBuilder, extractJsonPath, pathBuilder } from "./PathBuilder"
+
+export type ExposedStorePaths = string[] & Affine<"ExposedStorePaths">
+
+export const setupExposeStore = <Store extends Record<string, any>>(
+  fn: (pathBuilder: PathBuilder<Store>) => PathBuilder<Store, any>[],
+) => {
+  return fn(pathBuilder<Store>()).map(
+    (x) => extractJsonPath(x) as string,
+  ) as ExposedStorePaths
+}
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
index cd14d6a18..2df40b95c 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -425,7 +425,9 @@ describe("values", () => {
       const value = Value.dynamicDatetime<{ test: "a" }>(
         async ({ effects }) => {
           ;async () => {
-            ;(await sdk.store.getOwn(effects, "/test").once()) satisfies "a"
+            ;(await sdk.store
+              .getOwn(effects, sdk.StorePath.test)
+              .once()) satisfies "a"
           }
 
           return {
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index 0bd78defa..f2e86de74 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -49,7 +49,6 @@ describe("startosTypeValidation ", () => {
       setConfigured: {} as SetConfigured,
       setHealth: {} as SetHealth,
       exposeForDependents: {} as ExposeForDependentsParams,
-      exposeUi: {} as { [key: string]: ExposedUI },
       getSslCertificate: {} as GetSslCertificateParams,
       getSslKey: {} as GetSslKeyParams,
       getServiceInterface: {} as GetServiceInterfaceParams,
diff --git a/sdk/lib/test/store.test.ts b/sdk/lib/test/store.test.ts
index c41f3c85a..fa7bc4a4c 100644
--- a/sdk/lib/test/store.test.ts
+++ b/sdk/lib/test/store.test.ts
@@ -1,4 +1,5 @@
 import { MainEffects, StartSdk } from "../StartSdk"
+import { extractJsonPath } from "../store/PathBuilder"
 import { Effects } from "../types"
 
 type Store = {
@@ -17,19 +18,21 @@ const sdk = StartSdk.of()
   .withStore<Store>()
   .build(true)
 
+const storePath = sdk.StorePath
+
 describe("Store", () => {
   test("types", async () => {
     ;async () => {
-      sdk.store.setOwn(todo<Effects>(), "/config", {
+      sdk.store.setOwn(todo<Effects>(), storePath.config, {
         someValue: "a",
       })
-      sdk.store.setOwn(todo<Effects>(), "/config/someValue", "b")
-      sdk.store.setOwn(todo<Effects>(), "", {
+      sdk.store.setOwn(todo<Effects>(), storePath.config.someValue, "b")
+      sdk.store.setOwn(todo<Effects>(), storePath, {
         config: { someValue: "b" },
       })
       sdk.store.setOwn(
         todo<Effects>(),
-        "/config/someValue",
+        storePath.config.someValue,
 
         // @ts-expect-error Type is wrong for the setting value
         5,
@@ -41,48 +44,42 @@ describe("Store", () => {
         "someValue",
       )
 
-      todo<Effects>().store.set<Store, "/config/someValue">({
-        path: "/config/someValue",
+      todo<Effects>().store.set<Store>({
+        path: extractJsonPath(storePath.config.someValue),
         value: "b",
       })
       todo<Effects>().store.set<Store, "/config/some2Value">({
-        //@ts-expect-error Path is wrong
-        path: "/config/someValue",
+        path: extractJsonPath(storePath.config.someValue),
         //@ts-expect-error Path is wrong
         value: "someValueIn",
       })
-      todo<Effects>().store.set<Store, "/config/someValue">({
-        //@ts-expect-error Path is wrong
-        path: "/config/some2Value",
-        value: "a",
-      })
       ;(await sdk.store
-        .getOwn(todo<MainEffects>(), "/config/someValue")
+        .getOwn(todo<MainEffects>(), storePath.config.someValue)
         .const()) satisfies string
       ;(await sdk.store
-        .getOwn(todo<MainEffects>(), "/config")
+        .getOwn(todo<MainEffects>(), storePath.config)
         .const()) satisfies Store["config"]
       await sdk.store // @ts-expect-error Path is wrong
         .getOwn(todo<MainEffects>(), "/config/somdsfeValue")
         .const()
       ///  ----------------- ERRORS -----------------
 
-      sdk.store.setOwn(todo<MainEffects>(), "", {
+      sdk.store.setOwn(todo<MainEffects>(), storePath, {
         // @ts-expect-error Type is wrong for the setting value
         config: { someValue: "notInAOrB" },
       })
       sdk.store.setOwn(
         todo<MainEffects>(),
-        "/config/someValue",
+        sdk.StorePath.config.someValue,
         // @ts-expect-error Type is wrong for the setting value
         "notInAOrB",
       )
       ;(await sdk.store
-        .getOwn(todo<Effects>(), "/config/someValue")
+        .getOwn(todo<Effects>(), storePath.config.someValue)
         // @ts-expect-error Const should normally not be callable
         .const()) satisfies string
       ;(await sdk.store
-        .getOwn(todo<Effects>(), "/config")
+        .getOwn(todo<Effects>(), storePath.config)
         // @ts-expect-error Const should normally not be callable
         .const()) satisfies Store["config"]
       await sdk.store // @ts-expect-error Path is wrong
@@ -92,14 +89,14 @@ describe("Store", () => {
 
       ///
       ;(await sdk.store
-        .getOwn(todo<MainEffects>(), "/config/someValue")
+        .getOwn(todo<MainEffects>(), storePath.config.someValue)
         // @ts-expect-error satisfies type is wrong
         .const()) satisfies number
-      ;(await sdk.store // @ts-expect-error Path is wrong
-        .getOwn(todo<MainEffects>(), "/config/")
-        .const()) satisfies Store["config"]
-      ;(await todo<Effects>().store.get<Store, "/config/someValue">({
-        path: "/config/someValue",
+      await sdk.store // @ts-expect-error Path is wrong
+        .getOwn(todo<MainEffects>(), extractJsonPath(storePath.config))
+        .const()
+      ;(await todo<Effects>().store.get({
+        path: extractJsonPath(storePath.config.someValue),
         callback: noop,
       })) satisfies string
       await todo<Effects>().store.get<Store, "/config/someValue">({
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index c6ab16e64..f8dfd4874 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -5,6 +5,8 @@ import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
 import { BindOptions, Scheme } from "./interfaces/Host"
 import { Daemons } from "./mainFn/Daemons"
+import { PathBuilder, StorePath } from "./store/PathBuilder"
+import { ExposedStorePaths } from "./store/setupExposeStore"
 import { UrlString } from "./util/getServiceInterface"
 
 export { SDKManifest } from "./manifest/ManifestTypes"
@@ -93,6 +95,10 @@ export namespace ExpectedExports {
    * that this service could use.
    */
   export type dependencyConfig = Record<PackageId, DependencyConfig | null>
+
+  export type Properties = (options: {
+    effects: Effects
+  }) => Promise<PropertiesReturn>
 }
 export type TimeMs = number
 export type VersionString = string
@@ -248,31 +254,21 @@ export type ServiceInterfaceWithHostInfo = ServiceInterface & {
   hostInfo: HostInfo
 }
 
-// prettier-ignore
-export type ExposeAllServicePaths<Store, PreviousPath extends string = ""> = 
-  Store extends never ? string :
-  Store extends Record<string, unknown> ? {[K in keyof Store & string]: ExposeAllServicePaths<Store[K], `${PreviousPath}/${K & string}`>}[keyof Store & string] :
-  PreviousPath
-// prettier-ignore
-export type ExposeAllUiPaths<Store, PreviousPath extends string = ""> = 
-  Store extends Record<string, unknown> ? {[K in keyof Store & string]: ExposeAllUiPaths<Store[K], `${PreviousPath}/${K & string}`>}[keyof Store & string] :
-  Store extends string ? PreviousPath : 
-  never
 export type ExposeServicePaths<Store = never> = {
   /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
-  paths: Store extends never ? string[] : ExposeAllServicePaths<Store>[]
+  paths: ExposedStorePaths
 }
 
-export type ExposeUiPaths<Store> =
+export type SdkPropertiesValue =
   | {
       type: "object"
-      value: { [k: string]: ExposeUiPaths<Store> }
+      value: { [k: string]: SdkPropertiesValue }
       description?: string
     }
   | {
       type: "string"
-      /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
-      path: ExposeAllUiPaths<Store>
+      /** Value  */
+      value: string
       /** A human readable description or explanation of the value */
       description?: string
       /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
@@ -282,16 +278,21 @@ export type ExposeUiPaths<Store> =
       /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
       qr?: boolean
     }
-export type ExposeUiPathsAll =
+
+export type SdkPropertiesReturn = {
+  [key: string]: SdkPropertiesValue
+}
+
+export type PropertiesValue =
   | {
       type: "object"
-      value: { [k: string]: ExposeUiPathsAll }
+      value: { [k: string]: PropertiesValue }
       description: string | null
     }
   | {
       type: "string"
-      /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
-      path: string
+      /** Value  */
+      value: string
       /** A human readable description or explanation of the value */
       description: string | null
       /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
@@ -302,6 +303,10 @@ export type ExposeUiPathsAll =
       qr: boolean | null
     }
 
+export type PropertiesReturn = {
+  [key: string]: PropertiesValue
+}
+
 /** Used to reach out from the pure js runtime */
 export type Effects = {
   executeAction<Input>(opts: {
@@ -361,18 +366,18 @@ export type Effects = {
 
   store: {
     /** Get a value in a json like data, can be observed and subscribed */
-    get<Store = never, Path extends string = never>(options: {
+    get<Store = never, ExtractStore = unknown>(options: {
       /** If there is no packageId it is assumed the current package */
       packageId?: string
       /** The path defaults to root level, using the [JsonPath](https://jsonpath.com/) */
-      path: Path & EnsureStorePath<Store, Path>
+      path: StorePath
       callback: (config: unknown, previousConfig: unknown) => void
-    }): Promise<ExtractStore<Store, Path>>
+    }): Promise<ExtractStore>
     /** Used to store values that can be accessed and subscribed to */
-    set<Store = never, Path extends string = never>(options: {
+    set<Store = never, ExtractStore = unknown>(options: {
       /** Sets the value for the wrapper at the path, it will override, using the [JsonPath](https://jsonpath.com/)  */
-      path: Path & EnsureStorePath<Store, Path>
-      value: ExtractStore<Store, Path>
+      path: StorePath
+      value: ExtractStore
     }): Promise<void>
   }
 
@@ -399,7 +404,6 @@ export type Effects = {
 
   exposeForDependents(options: { paths: string[] }): Promise<void>
 
-  exposeUi(options: { [key: string]: ExposeUiPathsAll }): Promise<void>
   /**
    * There are times that we want to see the addresses that where exported
    * @param options.addressId If we want to filter the address id
@@ -524,22 +528,6 @@ export type Effects = {
   stopped(options: { packageId: string | null }): Promise<boolean>
 }
 
-// prettier-ignore
-export type ExtractStore<Store, Path extends string> = 
-  Path extends `/${infer A }/${infer Rest }` ? (A extends keyof Store ? ExtractStore<Store[A], `/${Rest}`> : never) :
-  Path extends `/${infer A }` ? (A extends keyof Store ? Store[A] : never) :
-  Path extends '' ? Store :
-  never
-
-// prettier-ignore
-type _EnsureStorePath<Store, Path extends string, Origin extends string> = 
-  Path extends`/${infer A }/${infer Rest}` ? (Store extends {[K in A & string]: infer NextStore} ? _EnsureStorePath<NextStore, `/${Rest}`, Origin> : never) :
-  Path extends `/${infer A }`  ? (Store extends {[K in A]: infer B} ? Origin : never) :
-  Path extends '' ? Origin :
-  never
-// prettier-ignore
-export type EnsureStorePath<Store, Path extends string> = _EnsureStorePath<Store, Path, Path>
-
 /** rsync options: https://linux.die.net/man/1/rsync
  */
 export type BackupOptions = {
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index aa69b9dc7..bd144f35a 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -23,6 +23,8 @@ export const isKnownError = (e: unknown): e is T.KnownError =>
 
 declare const affine: unique symbol
 
+export type Affine<A> = { [affine]: A }
+
 type NeverPossible = { [affine]: string }
 export type NoAny<A> = NeverPossible extends A
   ? keyof NeverPossible extends keyof A

From b14646ebd980c616efbb5e9c30623194a16b4d3a Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Sun, 24 Mar 2024 11:57:39 -0600
Subject: [PATCH 088/341] export tyeps from sdk

---
 sdk/lib/config/builder/index.ts | 10 ++++++----
 sdk/lib/config/builder/list.ts  |  1 -
 sdk/lib/config/index.ts         |  8 +++-----
 sdk/lib/config/setupConfig.ts   |  1 -
 sdk/lib/index.ts                |  7 ++-----
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/sdk/lib/config/builder/index.ts b/sdk/lib/config/builder/index.ts
index a0d794b16..6b6ddc730 100644
--- a/sdk/lib/config/builder/index.ts
+++ b/sdk/lib/config/builder/index.ts
@@ -1,4 +1,6 @@
-import "./config"
-import "./list"
-import "./value"
-import "./variants"
+import { Config } from "./config"
+import { List } from "./list"
+import { Value } from "./value"
+import { Variants } from "./variants"
+
+export { Config, List, Value, Variants }
diff --git a/sdk/lib/config/builder/list.ts b/sdk/lib/config/builder/list.ts
index 23de0c495..8a251069d 100644
--- a/sdk/lib/config/builder/list.ts
+++ b/sdk/lib/config/builder/list.ts
@@ -6,7 +6,6 @@ import {
   UniqueBy,
   ValueSpecList,
   ValueSpecListOf,
-  ValueSpecText,
 } from "../configTypes"
 import { Parser, arrayOf, number, string } from "ts-matches"
 /**
diff --git a/sdk/lib/config/index.ts b/sdk/lib/config/index.ts
index 510dc1ca0..35c3e274e 100644
--- a/sdk/lib/config/index.ts
+++ b/sdk/lib/config/index.ts
@@ -1,5 +1,3 @@
-import "./builder"
-
-import "./setupConfig"
-import "./configDependencies"
-import "./configConstants"
+export * as constants from "./configConstants"
+export * as types from "./configTypes"
+export * as builder from "./builder"
diff --git a/sdk/lib/config/setupConfig.ts b/sdk/lib/config/setupConfig.ts
index 8519eb358..a49e545a8 100644
--- a/sdk/lib/config/setupConfig.ts
+++ b/sdk/lib/config/setupConfig.ts
@@ -3,7 +3,6 @@ import { SDKManifest } from "../manifest/ManifestTypes"
 import * as D from "./configDependencies"
 import { Config, ExtractConfigType } from "./builder/config"
 import nullIfEmpty from "../util/nullIfEmpty"
-import { InterfaceReceipt } from "../interfaces/interfaceReceipt"
 import { InterfacesReceipt as InterfacesReceipt } from "../interfaces/setupInterfaces"
 
 declare const dependencyProof: unique symbol
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index aeeddb6f1..e89d45457 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -1,5 +1,3 @@
-import matches from "ts-matches"
-
 export { Daemons } from "./mainFn/Daemons"
 export { EmVer } from "./emverLite/mod"
 export { Overlay } from "./util/Overlay"
@@ -10,8 +8,8 @@ export { setupExposeStore } from "./store/setupExposeStore"
 export * as actions from "./actions"
 export * as backup from "./backup"
 export * as config from "./config"
-export * as configBuilder from "./config/builder"
-export * as configTypes from "./config/configTypes"
+export * as CB from "./config/builder"
+export * as CT from "./config/configTypes"
 export * as dependencyConfig from "./dependencyConfig"
 export * as daemons from "./mainFn/Daemons"
 export * as health from "./health"
@@ -24,7 +22,6 @@ export * as types from "./types"
 export * as T from "./types"
 export * as yaml from "yaml"
 export * as startSdk from "./StartSdk"
-
 export * as utils from "./util"
 export * as matches from "ts-matches"
 export * as YAML from "yaml"

From c782bab29657c051f47abf414cc29bef0bc68ae3 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Sun, 24 Mar 2024 12:05:59 -0600
Subject: [PATCH 089/341] switch all FE to camelCase (#2576)

* switch all fe to camelCase

* switch to camelCase on backend

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/src/action.rs                    |   4 +-
 core/startos/src/auth.rs                      |  18 +-
 core/startos/src/backup/backup_bulk.rs        |   2 +-
 core/startos/src/backup/restore.rs            |   2 +-
 core/startos/src/backup/target/cifs.rs        |   8 +-
 core/startos/src/backup/target/mod.rs         |  16 +-
 core/startos/src/config/action.rs             |   4 +-
 core/startos/src/config/mod.rs                |   4 +-
 core/startos/src/context/setup.rs             |   2 +-
 core/startos/src/control.rs                   |   2 +-
 core/startos/src/db/mod.rs                    |   8 +-
 core/startos/src/db/model/mod.rs              |   2 +-
 core/startos/src/db/model/package.rs          |  20 +-
 core/startos/src/db/model/private.rs          |   2 +-
 core/startos/src/db/model/public.rs           |  16 +-
 core/startos/src/dependencies.rs              |  10 +-
 core/startos/src/diagnostic.rs                |   2 +-
 core/startos/src/disk/mod.rs                  |   2 +-
 .../src/disk/mount/filesystem/block_dev.rs    |   2 +-
 .../startos/src/disk/mount/filesystem/cifs.rs |   2 +-
 .../src/disk/mount/filesystem/httpdirfs.rs    |   2 +-
 .../src/disk/mount/filesystem/idmapped.rs     |   2 +-
 .../src/disk/mount/filesystem/loop_dev.rs     |   2 +-
 core/startos/src/disk/util.rs                 |   8 +-
 core/startos/src/firmware.rs                  |   4 +-
 core/startos/src/inspect.rs                   |  14 +-
 core/startos/src/install/mod.rs               |  10 +-
 core/startos/src/lib.rs                       |   2 +-
 core/startos/src/logs.rs                      |   6 +-
 core/startos/src/middleware/auth.rs           |   4 +-
 core/startos/src/middleware/db.rs             |   2 +-
 core/startos/src/net/dhcp.rs                  |   2 +-
 core/startos/src/net/ssl.rs                   |   2 +-
 core/startos/src/net/tor.rs                   |   4 +-
 core/startos/src/net/wifi.rs                  |  12 +-
 core/startos/src/notifications.rs             |  16 +-
 core/startos/src/os_install/mod.rs            |   4 +-
 core/startos/src/properties.rs                |   6 +-
 core/startos/src/registry/admin.rs            |   2 +-
 core/startos/src/registry/marketplace.rs      |   2 +-
 core/startos/src/s9pk/v1/docker.rs            |   2 +-
 core/startos/src/s9pk/v1/manifest.rs          |   4 +-
 core/startos/src/s9pk/v1/mod.rs               |   2 +-
 core/startos/src/s9pk/v2/manifest.rs          |   4 +-
 .../src/service/service_effect_handler.rs     |  12 +-
 core/startos/src/setup.rs                     |  10 +-
 core/startos/src/ssh.rs                       |   6 +-
 core/startos/src/status/health_check.rs       |   2 +-
 core/startos/src/status/mod.rs                |   6 +-
 core/startos/src/system.rs                    |  18 +-
 core/startos/src/update/mod.rs                |   4 +-
 core/startos/src/util/lshw.rs                 |   2 +-
 core/startos/src/volume.rs                    |  12 +-
 .../src/app/pages/logs/logs.page.ts           |   2 +-
 .../src/app/services/api/mock-api.service.ts  |   4 +-
 .../src/app/services/api/mock-api.service.ts  |  18 +-
 .../src/pages/show/about/about.component.html |   7 +-
 .../show/additional/additional.component.html |  16 +-
 .../dependencies/dependencies.component.html  |   4 +-
 .../dependencies/dependencies.component.ts    |   2 +-
 .../pages/show/package/package.component.html |   4 +-
 .../src/pipes/filter-packages.pipe.ts         |   3 +-
 web/projects/marketplace/src/types.ts         |  22 +-
 .../app/modals/cifs-modal/cifs-modal.page.ts  |   2 +-
 .../src/app/modals/password/password.page.ts  |   4 +-
 .../src/app/pages/loading/loading.page.ts     |   5 +-
 .../src/app/pages/recover/recover.page.ts     |   6 +-
 .../src/app/pages/success/success.page.ts     |   6 +-
 .../src/app/services/api/api.service.ts       |  24 +-
 .../src/app/services/api/live-api.service.ts  |  11 +-
 .../src/app/services/api/mock-api.service.ts  |  32 +--
 .../src/app/services/state.service.ts         |  10 +-
 web/projects/shared/src/types/api.ts          |  10 +-
 web/projects/ui/src/app/app-routing.module.ts |   9 -
 web/projects/ui/src/app/app.component.ts      |   7 +-
 .../ui/src/app/app/footer/footer.component.ts |   2 +-
 .../ui/src/app/app/menu/menu.component.ts     |  26 +-
 .../backup-drives/backup.service.ts           |   2 +-
 .../badge-menu-button/badge-menu.component.ts |   4 +-
 .../connection-bar.component.ts               |   6 +-
 .../src/app/components/logs/logs.component.ts |   4 +-
 .../notifications-toast.service.ts            |   2 +-
 .../refresh-alert/refresh-alert.service.ts    |   2 +-
 .../update-toast/update-toast.service.ts      |   2 +-
 .../modals/app-config/app-config.page.html    |  14 +-
 .../app/modals/app-config/app-config.page.ts  |  20 +-
 .../app-recover-select.page.html              |   2 +-
 .../app-recover-select.page.ts                |   6 +-
 .../app-recover-select/to-options.pipe.ts     |   2 +-
 .../backup-select/backup-select.page.ts       |   4 +-
 .../marketplace-settings.page.ts              |   8 +-
 .../app/modals/os-update/os-update.page.ts    |   2 +-
 .../app-actions/app-actions.page.html         |   4 +-
 .../app-actions/app-actions.page.ts           |   4 +-
 .../app-interfaces/app-interfaces.page.ts     |   2 +-
 .../app-list-pkg/app-list-pkg.component.html  |   8 +-
 .../app-list-pkg/app-list-pkg.component.ts    |   2 +-
 .../apps-routes/app-list/app-list.page.ts     |   2 +-
 .../apps-routes/app-list/package-info.pipe.ts |   2 +-
 .../app-properties/app-properties.page.ts     |   2 +-
 .../apps-routes/app-show/app-show.page.html   |   4 +-
 .../apps-routes/app-show/app-show.page.ts     |  10 +-
 .../app-show-additional.component.html        |  28 +-
 .../app-show-status.component.html            |   4 +-
 .../app-show-status.component.ts              |   6 +-
 .../app-show/pipes/to-buttons.pipe.ts         |   8 +-
 .../app-show/pipes/to-health-checks.pipe.ts   |  20 +-
 .../dev-config/dev-config.module.ts           |  30 --
 .../dev-config/dev-config.page.html           |  28 --
 .../dev-config/dev-config.page.scss           |   0
 .../dev-config/dev-config.page.ts             |  82 ------
 .../dev-instructions.module.ts                |  30 --
 .../dev-instructions.page.html                |  28 --
 .../dev-instructions.page.scss                |   0
 .../dev-instructions/dev-instructions.page.ts |  69 -----
 .../dev-manifest/dev-manifest.module.ts       |  30 --
 .../dev-manifest/dev-manifest.page.html       |  17 --
 .../dev-manifest/dev-manifest.page.scss       |   0
 .../dev-manifest/dev-manifest.page.ts         |  32 ---
 .../developer-list/developer-list.module.ts   |  26 --
 .../developer-list/developer-list.page.html   |  37 ---
 .../developer-list/developer-list.page.scss   |   0
 .../developer-list/developer-list.page.ts     | 266 ------------------
 .../developer-menu/developer-menu.module.ts   |  34 ---
 .../developer-menu/developer-menu.page.html   |  51 ----
 .../developer-menu/developer-menu.page.scss   |   0
 .../developer-menu/developer-menu.page.ts     |  68 -----
 .../developer-menu/form-info.ts               | 171 -----------
 .../developer-routing.module.ts               |  49 ----
 .../marketplace-list/marketplace-list.page.ts |   2 +-
 .../marketplace-show-controls.component.html  |   2 +-
 .../marketplace-show-controls.component.ts    |   7 +-
 .../marketplace-show/marketplace-show.page.ts |   2 +-
 .../marketplace-status.component.html         |   2 +-
 .../notifications/notifications.page.html     |   8 +-
 .../pages/notifications/notifications.page.ts |   4 +-
 .../restore/restore.component.ts              |   4 +-
 .../backing-up/backing-up.component.ts        |  10 +-
 .../server-backup/server-backup.page.ts       |  15 +-
 .../server-metrics/server-metrics.page.html   |  16 +-
 .../server-show/server-show.page.html         |  16 +-
 .../server-show/server-show.page.ts           |  10 +-
 .../server-specs/server-specs.page.html       |  20 +-
 .../server-specs/server-specs.page.ts         |   2 +-
 .../server-routes/sessions/sessions.page.html |  10 +-
 .../server-routes/sessions/sessions.page.ts   |   3 +-
 .../server-routes/ssh-keys/ssh-keys.page.html |   2 +-
 .../pages/server-routes/wifi/wifi.page.html   |   2 +-
 .../src/app/pages/updates/updates.page.html   |  11 +-
 .../ui/src/app/pages/updates/updates.page.ts  |   4 +-
 .../built-in/health/health.component.ts       |   2 +-
 web/projects/ui/src/app/pipes/ui/ui.pipe.ts   |   2 +-
 .../ui/src/app/pkg-config/config-types.ts     |  12 -
 .../ui/src/app/services/api/api.fixures.ts    | 236 ++++++++--------
 .../ui/src/app/services/api/api.types.ts      |  82 +++---
 .../services/api/embassy-live-api.service.ts  |   4 +-
 .../services/api/embassy-mock-api.service.ts  | 108 +++----
 .../ui/src/app/services/api/mock-patch.ts     |  79 +++---
 .../ui/src/app/services/config.service.ts     |   6 +-
 .../ui/src/app/services/dep-error.service.ts  |  24 +-
 .../ui/src/app/services/eos.service.ts        |   6 +-
 .../ui/src/app/services/form.service.ts       |   1 -
 .../src/app/services/marketplace.service.ts   |  22 +-
 .../ui/src/app/services/patch-data.service.ts |   4 +-
 .../src/app/services/patch-db/data-model.ts   |  80 +++---
 .../services/pkg-status-rendering.service.ts  |   4 +-
 .../ui/src/app/services/time-service.ts       |   2 +-
 .../src/app/services/ui-launcher.service.ts   |   2 +-
 web/projects/ui/src/app/util/dry-update.ts    |   6 +-
 .../ui/src/app/util/get-package-data.ts       |  22 +-
 .../ui/src/app/util/get-server-info.ts        |   2 +-
 web/projects/ui/src/app/util/has-deps.ts      |   2 +-
 .../ui/src/app/util/properties.util.ts        |   2 -
 173 files changed, 749 insertions(+), 1901 deletions(-)
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.module.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.html
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.module.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.html
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.module.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.html
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.module.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.html
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.module.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.html
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-menu/form-info.ts
 delete mode 100644 web/projects/ui/src/app/pages/developer-routes/developer-routing.module.ts

diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index 13a943a60..ff3998c3c 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -26,7 +26,7 @@ pub struct ActionResultV0 {
 }
 
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum DockerStatus {
     Running,
     Stopped,
@@ -48,7 +48,7 @@ pub fn display_action_result(params: WithIoFormat<ActionParams>, result: ActionR
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ActionParams {
     #[arg(id = "id")]
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 21cfbd101..4d3c20bd1 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -127,7 +127,7 @@ fn gen_pwd() {
     )
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliLoginParams {
     password: Option<PasswordType>,
@@ -179,7 +179,7 @@ pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LoginParams {
     password: Option<PasswordType>,
@@ -220,7 +220,7 @@ pub async fn login_impl(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogoutParams {
     session: InternedString,
@@ -236,7 +236,7 @@ pub async fn logout(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Session {
     pub logged_in: DateTime<Utc>,
     pub last_active: DateTime<Utc>,
@@ -245,7 +245,7 @@ pub struct Session {
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SessionList {
     current: InternedString,
     sessions: Sessions,
@@ -305,7 +305,7 @@ fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ListParams {
     #[arg(skip)]
@@ -340,7 +340,7 @@ impl AsLogoutSessionId for KillSessionId {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct KillParams {
     ids: Vec<String>,
@@ -353,12 +353,10 @@ pub async fn kill(ctx: RpcContext, KillParams { ids }: KillParams) -> Result<(),
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ResetPasswordParams {
-    #[arg(name = "old-password")]
     old_password: Option<PasswordType>,
-    #[arg(name = "new-password")]
     new_password: Option<PasswordType>,
 }
 
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 8c609f672..b9f1b877e 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -30,7 +30,7 @@ use crate::util::serde::IoFormat;
 use crate::version::VersionT;
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct BackupParams {
     target_id: BackupTargetId,
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 73d3c8f69..6001c335a 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -25,7 +25,7 @@ use crate::service::service_map::DownloadInstallFuture;
 use crate::util::serde::IoFormat;
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct RestorePackageParams {
     pub ids: Vec<PackageId>,
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index db332e28f..d4b65b7fe 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -36,7 +36,7 @@ impl Map for CifsTargets {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct CifsBackupTarget {
     hostname: String,
     path: PathBuf,
@@ -68,7 +68,7 @@ pub fn cifs() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
     pub hostname: String,
@@ -122,7 +122,7 @@ pub async fn add(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateParams {
     pub id: BackupTargetId,
@@ -186,7 +186,7 @@ pub async fn update(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct RemoveParams {
     pub id: BackupTargetId,
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index 72dd45832..ac48d75a6 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -34,9 +34,9 @@ pub mod cifs;
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum BackupTarget {
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Disk {
         vendor: Option<String>,
         model: Option<String>,
@@ -109,7 +109,7 @@ impl Serialize for BackupTargetId {
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum BackupTargetFS {
     Disk(BlockDev<PathBuf>),
     Cifs(Cifs),
@@ -190,7 +190,7 @@ pub async fn list(ctx: RpcContext) -> Result<BTreeMap<BackupTargetId, BackupTarg
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct BackupInfo {
     pub version: Version,
     pub timestamp: Option<DateTime<Utc>>,
@@ -198,7 +198,7 @@ pub struct BackupInfo {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct PackageBackupInfo {
     pub title: String,
     pub version: Version,
@@ -243,7 +243,7 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InfoParams {
     target_id: BackupTargetId,
@@ -277,7 +277,7 @@ lazy_static::lazy_static! {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct MountParams {
     target_id: BackupTargetId,
@@ -312,7 +312,7 @@ pub async fn mount(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UmountParams {
     target_id: Option<BackupTargetId>,
diff --git a/core/startos/src/config/action.rs b/core/startos/src/config/action.rs
index b926c940c..ef26571a7 100644
--- a/core/startos/src/config/action.rs
+++ b/core/startos/src/config/action.rs
@@ -9,14 +9,14 @@ use crate::prelude::*;
 use crate::status::health_check::HealthCheckId;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ConfigRes {
     pub config: Option<Config>,
     pub spec: ConfigSpec,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SetResult {
     pub depends_on: BTreeMap<PackageId, BTreeSet<HealthCheckId>>,
 }
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index 522e5c1a7..bcd44193b 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -126,7 +126,7 @@ pub enum MatchError {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ConfigParams {
     pub id: PackageId,
@@ -157,7 +157,7 @@ pub async fn get(ctx: RpcContext, _: Empty, id: PackageId) -> Result<ConfigRes,
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SetParams {
     #[arg(long = "timeout")]
     pub timeout: Option<crate::util::serde::Duration>,
diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index 933aa155c..013dc060b 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -28,7 +28,7 @@ lazy_static::lazy_static! {
 }
 
 #[derive(Clone, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SetupResult {
     pub tor_address: String,
     pub lan_address: String,
diff --git a/core/startos/src/control.rs b/core/startos/src/control.rs
index 26b227cd2..e37c88ee4 100644
--- a/core/startos/src/control.rs
+++ b/core/startos/src/control.rs
@@ -10,7 +10,7 @@ use crate::prelude::*;
 use crate::Error;
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ControlParams {
     pub id: PackageId,
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 5ef140dcb..874733ca6 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -183,7 +183,7 @@ pub enum RevisionsRes {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliDumpParams {
     #[arg(long = "include-private", short = 'p')]
@@ -216,7 +216,7 @@ async fn cli_dump(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DumpParams {
     #[arg(long = "include-private", short = 'p')]
@@ -272,7 +272,7 @@ async fn cli_apply(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ApplyParams {
     expr: String,
@@ -310,7 +310,7 @@ pub fn put() -> ParentHandler {
     )
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UiParams {
     pointer: JsonPointer,
diff --git a/core/startos/src/db/model/mod.rs b/core/startos/src/db/model/mod.rs
index 24497ed4e..cae1bfe51 100644
--- a/core/startos/src/db/model/mod.rs
+++ b/core/startos/src/db/model/mod.rs
@@ -20,7 +20,7 @@ pub mod private;
 pub mod public;
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct Database {
     pub public: Public,
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 3c7f3b7c7..d9e702a0d 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -35,7 +35,7 @@ pub enum ManifestPreference {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[serde(tag = "state")]
 #[model = "Model<Self>"]
 pub enum PackageState {
@@ -257,14 +257,14 @@ impl Model<PackageState> {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct InstallingState {
     pub installing_info: InstallingInfo,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct UpdatingState {
     pub manifest: Manifest,
@@ -272,14 +272,14 @@ pub struct UpdatingState {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct InstalledState {
     pub manifest: Manifest,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct InstallingInfo {
     pub new_manifest: Manifest,
@@ -287,7 +287,7 @@ pub struct InstallingInfo {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct PackageDataEntry {
     pub state_info: PackageState,
@@ -405,7 +405,7 @@ impl Map for CurrentDependencies {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct StaticDependencyInfo {
     pub title: String,
@@ -413,11 +413,11 @@ pub struct StaticDependencyInfo {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[serde(tag = "kind")]
 pub enum CurrentDependencyInfo {
     Exists,
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Running {
         #[serde(default)]
         health_checks: BTreeSet<HealthCheckId>,
@@ -438,7 +438,7 @@ impl Map for InterfaceAddressMap {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct InterfaceAddresses {
     pub tor_address: Option<String>,
diff --git a/core/startos/src/db/model/private.rs b/core/startos/src/db/model/private.rs
index b9bc51e63..2b8c55dbd 100644
--- a/core/startos/src/db/model/private.rs
+++ b/core/startos/src/db/model/private.rs
@@ -14,7 +14,7 @@ use crate::ssh::SshKeys;
 use crate::util::serde::Pem;
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct Private {
     pub key_store: KeyStore,
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index a9cf8d7e2..d618f8d33 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -24,7 +24,7 @@ use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 // #[macro_debug]
 pub struct Public {
@@ -102,7 +102,7 @@ fn get_platform() -> InternedString {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct ServerInfo {
     #[serde(default = "get_arch")]
@@ -137,7 +137,7 @@ pub struct ServerInfo {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct IpInfo {
     pub ipv4_range: Option<Ipv4Net>,
@@ -165,7 +165,7 @@ pub struct BackupProgress {
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct ServerStatus {
     pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
@@ -178,7 +178,7 @@ pub struct ServerStatus {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct UpdateProgress {
     pub size: Option<u64>,
@@ -186,7 +186,7 @@ pub struct UpdateProgress {
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct WifiInfo {
     pub ssids: Vec<String>,
@@ -195,7 +195,7 @@ pub struct WifiInfo {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ServerSpecs {
     pub cpu: String,
     pub disk: String,
@@ -203,7 +203,7 @@ pub struct ServerSpecs {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ConnectionAddresses {
     pub tor: Vec<String>,
     pub clearnet: Vec<String>,
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index a22411244..168713f61 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -36,7 +36,7 @@ impl Map for Dependencies {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[serde(tag = "type")]
 pub enum DependencyRequirement {
     OptIn { how: String },
@@ -50,7 +50,7 @@ impl DependencyRequirement {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct DepInfo {
     pub version: VersionRange,
@@ -61,12 +61,10 @@ pub struct DepInfo {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ConfigureParams {
-    #[arg(name = "dependent-id")]
     dependent_id: PackageId,
-    #[arg(name = "dependency-id")]
     dependency_id: PackageId,
 }
 pub fn configure() -> ParentHandler<ConfigureParams> {
@@ -111,7 +109,7 @@ pub async fn configure_impl(
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ConfigDryRes {
     pub old_config: Config,
     pub new_config: Config,
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index f9f715bfe..b0820b293 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -41,7 +41,7 @@ pub fn error(ctx: DiagnosticContext) -> Result<Arc<RpcError>, Error> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogsParams {
     limit: Option<usize>,
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index 7d31d06db..be2d07bce 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -17,7 +17,7 @@ pub const BOOT_RW_PATH: &str = "/media/boot-rw";
 pub const REPAIR_DISK_PATH: &str = "/media/embassy/config/repair-disk";
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct OsPartitionInfo {
     pub efi: Option<PathBuf>,
     pub bios: Option<PathBuf>,
diff --git a/core/startos/src/disk/mount/filesystem/block_dev.rs b/core/startos/src/disk/mount/filesystem/block_dev.rs
index ada7b2c8e..96e9d79a7 100644
--- a/core/startos/src/disk/mount/filesystem/block_dev.rs
+++ b/core/startos/src/disk/mount/filesystem/block_dev.rs
@@ -10,7 +10,7 @@ use super::FileSystem;
 use crate::prelude::*;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct BlockDev<LogicalName: AsRef<Path>> {
     logicalname: LogicalName,
 }
diff --git a/core/startos/src/disk/mount/filesystem/cifs.rs b/core/startos/src/disk/mount/filesystem/cifs.rs
index ada7aa80b..e125b9a90 100644
--- a/core/startos/src/disk/mount/filesystem/cifs.rs
+++ b/core/startos/src/disk/mount/filesystem/cifs.rs
@@ -63,7 +63,7 @@ pub async fn mount_cifs(
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Cifs {
     pub hostname: String,
     pub path: PathBuf,
diff --git a/core/startos/src/disk/mount/filesystem/httpdirfs.rs b/core/startos/src/disk/mount/filesystem/httpdirfs.rs
index 8c7d3b058..df9416774 100644
--- a/core/startos/src/disk/mount/filesystem/httpdirfs.rs
+++ b/core/startos/src/disk/mount/filesystem/httpdirfs.rs
@@ -22,7 +22,7 @@ pub async fn mount_httpdirfs(url: &Url, mountpoint: impl AsRef<Path>) -> Result<
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct HttpDirFS {
     url: Url,
 }
diff --git a/core/startos/src/disk/mount/filesystem/idmapped.rs b/core/startos/src/disk/mount/filesystem/idmapped.rs
index 0f4074a8e..dc6a6e9ab 100644
--- a/core/startos/src/disk/mount/filesystem/idmapped.rs
+++ b/core/startos/src/disk/mount/filesystem/idmapped.rs
@@ -14,7 +14,7 @@ use crate::prelude::*;
 use crate::util::Invoke;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct IdMapped<Fs: FileSystem> {
     filesystem: Fs,
     from_id: u32,
diff --git a/core/startos/src/disk/mount/filesystem/loop_dev.rs b/core/startos/src/disk/mount/filesystem/loop_dev.rs
index 7cad174c6..1728ef2c7 100644
--- a/core/startos/src/disk/mount/filesystem/loop_dev.rs
+++ b/core/startos/src/disk/mount/filesystem/loop_dev.rs
@@ -12,7 +12,7 @@ use super::FileSystem;
 use crate::prelude::*;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct LoopDev<LogicalName: AsRef<Path>> {
     logicalname: LogicalName,
     offset: u64,
diff --git a/core/startos/src/disk/util.rs b/core/startos/src/disk/util.rs
index 7d73ac974..be0b16a6b 100644
--- a/core/startos/src/disk/util.rs
+++ b/core/startos/src/disk/util.rs
@@ -24,14 +24,14 @@ use crate::util::{Invoke, Version};
 use crate::{Error, ResultExt as _};
 
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum PartitionTable {
     Mbr,
     Gpt,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct DiskInfo {
     pub logicalname: PathBuf,
     pub partition_table: Option<PartitionTable>,
@@ -43,7 +43,7 @@ pub struct DiskInfo {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct PartitionInfo {
     pub logicalname: PathBuf,
     pub label: Option<String>,
@@ -54,7 +54,7 @@ pub struct PartitionInfo {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct EmbassyOsRecoveryInfo {
     pub version: Version,
     pub full: bool,
diff --git a/core/startos/src/firmware.rs b/core/startos/src/firmware.rs
index 86f576cce..20347bcff 100644
--- a/core/startos/src/firmware.rs
+++ b/core/startos/src/firmware.rs
@@ -14,7 +14,7 @@ use crate::PLATFORM;
 
 /// Part of the Firmware, look there for more about
 #[derive(Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct VersionMatcher {
     /// Strip this prefix on the version matcher
     semver_prefix: Option<String>,
@@ -28,7 +28,7 @@ pub struct VersionMatcher {
 /// wanted a structure that could help decide what to do
 /// for each of the firmware versions
 #[derive(Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Firmware {
     id: String,
     /// This is the platform(s) the firmware was built for
diff --git a/core/startos/src/inspect.rs b/core/startos/src/inspect.rs
index d88f90a06..3fe84d06f 100644
--- a/core/startos/src/inspect.rs
+++ b/core/startos/src/inspect.rs
@@ -24,7 +24,7 @@ pub fn inspect() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct HashParams {
     path: PathBuf,
@@ -39,11 +39,11 @@ pub async fn hash(_: CliContext, HashParams { path }: HashParams) -> Result<Stri
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ManifestParams {
     path: PathBuf,
-    #[arg(name = "no-verify", long = "no-verify")]
+    #[arg(long = "no-verify")]
     no_verify: bool,
 }
 
@@ -57,11 +57,11 @@ pub async fn manifest(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InspectParams {
     path: PathBuf,
-    #[arg(name = "no-verify", long = "no-verify")]
+    #[arg(long = "no-verify")]
     no_verify: bool,
 }
 
@@ -89,11 +89,11 @@ pub async fn icon(
     Ok(())
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InstructionParams {
     path: PathBuf,
-    #[arg(name = "no-verify", long = "no-verify")]
+    #[arg(long = "no-verify")]
     no_verify: bool,
 }
 
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index f4c415915..72a7fe9ee 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -64,7 +64,7 @@ pub async fn list(ctx: RpcContext) -> Result<Value, Error> {
 }
 
 #[derive(Debug, Clone, Copy, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum MinMax {
     Min,
     Max,
@@ -103,7 +103,7 @@ impl std::fmt::Display for MinMax {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InstallParams {
     id: PackageId,
@@ -165,7 +165,7 @@ pub async fn install(
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SideloadResponse {
     pub upload: RequestGuid,
     pub progress: RequestGuid,
@@ -275,7 +275,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum CliInstallParams {
     Marketplace(InstallParams),
     Sideload(PathBuf),
@@ -392,7 +392,7 @@ pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<()
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UninstallParams {
     id: PackageId,
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 35b373e91..d19f9c61a 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -80,7 +80,7 @@ use crate::context::CliContext;
 use crate::util::serde::HandlerExtSerde;
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct EchoParams {
     message: String,
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 0431274ac..1cd84c331 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -102,14 +102,14 @@ async fn ws_handler(
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct LogResponse {
     entries: Reversible<LogEntry>,
     start_cursor: Option<String>,
     end_cursor: Option<String>,
 }
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct LogFollowResponse {
     start_cursor: Option<String>,
     guid: RequestGuid,
@@ -211,7 +211,7 @@ pub enum LogSource {
 pub const SYSTEM_UNIT: &str = "startd";
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogsParam {
     id: PackageId,
diff --git a/core/startos/src/middleware/auth.rs b/core/startos/src/middleware/auth.rs
index 2eddcd3ad..30ae56744 100644
--- a/core/startos/src/middleware/auth.rs
+++ b/core/startos/src/middleware/auth.rs
@@ -26,7 +26,7 @@ use crate::prelude::*;
 pub const LOCAL_AUTH_COOKIE_PATH: &str = "/run/embassy/rpc.authcookie";
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct LoginRes {
     pub session: InternedString,
 }
@@ -245,7 +245,7 @@ impl Borrow<str> for HashSessionToken {
 }
 
 #[derive(Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Metadata {
     #[serde(default = "const_true")]
     authenticated: bool,
diff --git a/core/startos/src/middleware/db.rs b/core/startos/src/middleware/db.rs
index b90055f7c..b8cdaa231 100644
--- a/core/startos/src/middleware/db.rs
+++ b/core/startos/src/middleware/db.rs
@@ -7,7 +7,7 @@ use serde::Deserialize;
 use crate::context::RpcContext;
 
 #[derive(Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Metadata {
     #[serde(default)]
     sync_db: bool,
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index d66448406..f36df0e28 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -61,7 +61,7 @@ pub fn dhcp() -> ParentHandler {
     )
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateParams {
     interface: String,
diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index 49ab74cfc..0756114c5 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -29,7 +29,7 @@ use crate::SOURCE_DATE;
 
 #[derive(Debug, Deserialize, Serialize, HasModel)]
 #[model = "Model<Self>"]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct CertStore {
     pub root_key: Pem<PKey<Private>>,
     pub root_cert: Pem<X509>,
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 171404ceb..72b05e2aa 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -105,7 +105,7 @@ pub fn tor() -> ParentHandler {
         )
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ResetParams {
     #[arg(name = "wipe-state", short = 'w', long = "wipe-state")]
@@ -143,7 +143,7 @@ pub async fn list_services(ctx: RpcContext, _: Empty) -> Result<Vec<OnionAddress
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogsParams {
     #[arg(short = 'l', long = "limit")]
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index 5a86ad720..2202f5e57 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -88,7 +88,7 @@ pub fn country() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
     ssid: String,
@@ -139,7 +139,7 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
     Ok(())
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct SsidParams {
     ssid: String,
@@ -217,7 +217,7 @@ pub async fn delete(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<
     Ok(())
 }
 #[derive(serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct WiFiInfo {
     ssids: HashMap<Ssid, SignalStrength>,
     connected: Option<Ssid>,
@@ -226,13 +226,13 @@ pub struct WiFiInfo {
     available_wifi: Vec<WifiListOut>,
 }
 #[derive(serde::Serialize, serde::Deserialize, Clone)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct WifiListInfo {
     strength: SignalStrength,
     security: Vec<String>,
 }
 #[derive(serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct WifiListOut {
     ssid: Ssid,
     strength: SignalStrength,
@@ -403,7 +403,7 @@ pub async fn get_available(ctx: RpcContext, _: Empty) -> Result<Vec<WifiListOut>
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct SetCountryParams {
     #[arg(value_parser = CountryCodeParser)]
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index f696b27b7..e774d912e 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -49,7 +49,7 @@ pub fn notification() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ListParams {
     before: Option<u32>,
@@ -111,7 +111,7 @@ pub async fn list(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteParams {
     id: u32,
@@ -126,7 +126,7 @@ pub async fn delete(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Resul
         .await
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteBeforeParams {
     before: u32,
@@ -149,7 +149,7 @@ pub async fn delete_before(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CreateParams {
     package: Option<PackageId>,
@@ -173,7 +173,7 @@ pub async fn create(
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum NotificationLevel {
     Success,
     Info,
@@ -225,7 +225,7 @@ impl fmt::Display for InvalidNotificationLevel {
 }
 
 #[derive(Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Notifications(pub BTreeMap<u32, Notification>);
 impl Notifications {
     pub fn new() -> Self {
@@ -244,7 +244,7 @@ impl Map for Notifications {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Notification {
     package_id: Option<PackageId>,
     created_at: DateTime<Utc>,
@@ -256,7 +256,7 @@ pub struct Notification {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct NotificationWithId {
     id: u32,
     #[serde(flatten)]
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 6bb5c5470..55c333fba 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -24,7 +24,7 @@ mod gpt;
 mod mbr;
 
 #[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct PostInstallConfig {
     os_partitions: OsPartitionInfo,
     ethernet_interface: String,
@@ -120,7 +120,7 @@ async fn partition(disk: &mut DiskInfo, overwrite: bool) -> Result<OsPartitionIn
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ExecuteParams {
     logicalname: PathBuf,
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 060518aff..cfb0dd66b 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -6,10 +6,10 @@ use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 
-use crate::db::model::package::ExposedUI;
+use crate::context::RpcContext;
+use crate::db::model::package::{ExposedUI, StoreExposedUI};
 use crate::prelude::*;
 use crate::Error;
-use crate::{context::RpcContext, db::model::package::StoreExposedUI};
 
 pub fn display_properties(response: Value) {
     println!("{}", response);
@@ -58,7 +58,7 @@ impl IntoProperties for StoreExposedUI {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct PropertiesParam {
     id: PackageId,
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 95cfcec8f..83dc2ff10 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -91,7 +91,7 @@ async fn do_upload(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct PublishParams {
     location: String,
diff --git a/core/startos/src/registry/marketplace.rs b/core/startos/src/registry/marketplace.rs
index c4148f01f..1807b3397 100644
--- a/core/startos/src/registry/marketplace.rs
+++ b/core/startos/src/registry/marketplace.rs
@@ -37,7 +37,7 @@ pub fn with_query_params(ctx: RpcContext, mut url: Url) -> Url {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct GetParams {
     url: Url,
diff --git a/core/startos/src/s9pk/v1/docker.rs b/core/startos/src/s9pk/v1/docker.rs
index be93905fb..7f1507703 100644
--- a/core/startos/src/s9pk/v1/docker.rs
+++ b/core/startos/src/s9pk/v1/docker.rs
@@ -13,7 +13,7 @@ use crate::util::io::from_cbor_async_reader;
 use crate::{Error, ErrorKind, ARCH};
 
 #[derive(Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct DockerMultiArch {
     pub default: String,
     pub available: BTreeSet<String>,
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index b2fa85a5e..381a446fe 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -18,7 +18,7 @@ fn current_version() -> Version {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct Manifest {
     #[serde(default = "current_version")]
@@ -53,7 +53,7 @@ pub struct Manifest {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Assets {
     #[serde(default)]
     pub license: Option<PathBuf>,
diff --git a/core/startos/src/s9pk/v1/mod.rs b/core/startos/src/s9pk/v1/mod.rs
index ca49ca597..2f95f0813 100644
--- a/core/startos/src/s9pk/v1/mod.rs
+++ b/core/startos/src/s9pk/v1/mod.rs
@@ -13,7 +13,7 @@ pub mod reader;
 pub const SIG_CONTEXT: &[u8] = b"s9pk";
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct VerifyParams {
     pub path: PathBuf,
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index d9affae9c..119bbb466 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -53,7 +53,7 @@ pub struct Manifest {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct HardwareRequirements {
     #[serde(default)]
     device: BTreeMap<String, Regex>,
@@ -85,7 +85,7 @@ impl Description {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Alerts {
     pub install: Option<String>,
     pub uninstall: Option<String>,
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 3468f2d7c..c3a49ac64 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -268,7 +268,7 @@ enum AllowedStatuses {
 struct ExportActionParams {
     #[ts(type = "string")]
     id: ActionId,
-    metadata: ActionMetadata
+    metadata: ActionMetadata,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
@@ -349,13 +349,11 @@ async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Ipv4Addr,
         Some(c) => {
             let net_service = c.persistent_container.net_service.lock().await;
             Ok(net_service.get_ip())
-        },
-        None => {
-            Err(Error::new(
-                eyre!("Upgrade on Weak<ServiceActorSeed> resulted in a None variant"),
-                crate::ErrorKind::NotFound
-            ))
         }
+        None => Err(Error::new(
+            eyre!("Upgrade on Weak<ServiceActorSeed> resulted in a None variant"),
+            crate::ErrorKind::NotFound,
+        )),
     }
 }
 async fn get_service_port_forward(
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index ed3a4661d..2e5c7b3ad 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -100,7 +100,7 @@ async fn setup_init(
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct AttachParams {
     #[serde(rename = "embassy-password")]
     password: Option<EncryptedWire>,
@@ -185,7 +185,7 @@ pub async fn attach(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SetupStatus {
     pub bytes_transferred: u64,
     pub total_bytes: Option<u64>,
@@ -211,7 +211,7 @@ pub fn cifs() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct VerifyCifsParams {
     hostname: String,
     path: PathBuf,
@@ -247,14 +247,14 @@ pub async fn verify_cifs(
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum RecoverySource {
     Migrate { guid: String },
     Backup { target: BackupTargetFS },
 }
 
 #[derive(Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct ExecuteParams {
     embassy_logicalname: PathBuf,
     embassy_password: EncryptedWire,
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index 711d2ede9..aaf941e1f 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -48,7 +48,7 @@ impl ValueParserFactory for SshPubKey {
 }
 
 #[derive(serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct SshKeyResponse {
     pub alg: String,
     pub fingerprint: InternedString,
@@ -103,7 +103,7 @@ pub fn ssh() -> ParentHandler {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
     key: SshPubKey,
@@ -136,7 +136,7 @@ pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKey
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DeleteParams {
     fingerprint: InternedString,
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index 39434115c..7a6cb0430 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -2,7 +2,7 @@ pub use models::HealthCheckId;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[serde(tag = "result")]
 pub enum HealthCheckResult {
     Success,
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 721b47511..13b0568e2 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -11,7 +11,7 @@ use crate::status::health_check::HealthCheckResult;
 
 pub mod health_check;
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct Status {
     pub configured: bool,
@@ -21,7 +21,7 @@ pub struct Status {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, Default)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct DependencyConfigErrors(pub BTreeMap<PackageId, String>);
 impl Map for DependencyConfigErrors {
@@ -37,7 +37,7 @@ impl Map for DependencyConfigErrors {
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
 #[serde(tag = "status")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum MainStatus {
     Stopped,
     Restarting,
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index 2525491f6..faead0738 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -74,7 +74,7 @@ pub async fn enable_zram() -> Result<(), Error> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ZramParams {
     enable: bool,
@@ -136,7 +136,7 @@ fn display_governor_info(params: WithIoFormat<GovernorParams>, result: GovernorI
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct GovernorParams {
     set: Option<Governor>,
@@ -230,7 +230,7 @@ pub async fn time(ctx: RpcContext, _: Empty) -> Result<TimeInfo, Error> {
     })
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogsParams {
     #[arg(short = 'l', long = "limit")]
@@ -314,7 +314,7 @@ pub async fn logs_follow(
     follow_logs(ctx, LogSource::System, limit).await
 }
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct KernelLogsParams {
     #[arg(short = 'l', long = "limit")]
@@ -509,12 +509,12 @@ impl<'de> Deserialize<'de> for GigaBytes {
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct MetricsGeneral {
     pub temperature: Option<Celsius>,
 }
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct MetricsMemory {
     pub percentage_used: Percentage,
     pub total: MebiBytes,
@@ -525,7 +525,7 @@ pub struct MetricsMemory {
     pub zram_used: MebiBytes,
 }
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct MetricsCpu {
     percentage_used: Percentage,
     idle: Percentage,
@@ -534,7 +534,7 @@ pub struct MetricsCpu {
     wait: Percentage,
 }
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct MetricsDisk {
     percentage_used: Percentage,
     used: GigaBytes,
@@ -542,7 +542,7 @@ pub struct MetricsDisk {
     capacity: GigaBytes,
 }
 #[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub struct Metrics {
     general: MetricsGeneral,
     memory: MetricsMemory,
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index c327bbb61..26bf0357d 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -35,7 +35,7 @@ lazy_static! {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateSystemParams {
     marketplace_url: Url,
@@ -60,7 +60,7 @@ pub async fn update_system(
 
 /// What is the status of the updates?
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum UpdateResult {
     NoUpdates,
     Updating,
diff --git a/core/startos/src/util/lshw.rs b/core/startos/src/util/lshw.rs
index dd260f644..2a658a8c8 100644
--- a/core/startos/src/util/lshw.rs
+++ b/core/startos/src/util/lshw.rs
@@ -8,7 +8,7 @@ const KNOWN_CLASSES: &[&str] = &["processor", "display"];
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(tag = "class")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum LshwDevice {
     Processor(LshwProcessor),
     Display(LshwDisplay),
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index 2f8969a73..a631e68e6 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -111,25 +111,25 @@ pub fn cert_dir(pkg_id: &PackageId, host_id: &HostId) -> PathBuf {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 pub enum Volume {
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Data {
         #[serde(skip)]
         readonly: bool,
     },
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Assets {},
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Pointer {
         package_id: PackageId,
         volume_id: VolumeId,
         path: PathBuf,
         readonly: bool,
     },
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Certificate { interface_id: HostId },
-    #[serde(rename_all = "kebab-case")]
+    #[serde(rename_all = "camelCase")]
     Backup { readonly: bool },
 }
 impl Volume {
diff --git a/web/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts b/web/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts
index 317cd1ea3..44c314a96 100644
--- a/web/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts
+++ b/web/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts
@@ -49,7 +49,7 @@ export class LogsPage {
 
   private async getLogs() {
     try {
-      const { 'start-cursor': startCursor, entries } = await this.api.getLogs({
+      const { startCursor, entries } = await this.api.getLogs({
         cursor: this.startCursor,
         before: !!this.startCursor,
         limit: this.limit,
diff --git a/web/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts b/web/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts
index 5d8c13a4f..d991edd32 100644
--- a/web/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts
+++ b/web/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts
@@ -45,8 +45,8 @@ export class MockApiService implements ApiService {
     }
     return {
       entries,
-      'start-cursor': 'startCursor',
-      'end-cursor': 'endCursor',
+      startCursor: 'start-cursor',
+      endCursor: 'end-cursor',
     }
   }
 }
diff --git a/web/projects/install-wizard/src/app/services/api/mock-api.service.ts b/web/projects/install-wizard/src/app/services/api/mock-api.service.ts
index 9caf4f88e..5be394c67 100644
--- a/web/projects/install-wizard/src/app/services/api/mock-api.service.ts
+++ b/web/projects/install-wizard/src/app/services/api/mock-api.service.ts
@@ -17,12 +17,12 @@ export class MockApiService implements ApiService {
             label: null,
             capacity: 73264762332,
             used: null,
-            'embassy-os': {
+            startOs: {
               version: '0.2.17',
               full: true,
-              'password-hash':
+              passwordHash:
                 '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
             },
             guid: null,
           },
@@ -40,12 +40,12 @@ export class MockApiService implements ApiService {
             label: null,
             capacity: 73264762332,
             used: null,
-            'embassy-os': {
+            startOs: {
               version: '0.3.3',
               full: true,
-              'password-hash':
+              passwordHash:
                 '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
             },
             guid: null,
           },
@@ -63,12 +63,12 @@ export class MockApiService implements ApiService {
             label: null,
             capacity: 73264762332,
             used: null,
-            'embassy-os': {
+            startOs: {
               version: '0.3.2',
               full: true,
-              'password-hash':
+              passwordHash:
                 '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
             },
             guid: 'guid-guid-guid-guid',
           },
diff --git a/web/projects/marketplace/src/pages/show/about/about.component.html b/web/projects/marketplace/src/pages/show/about/about.component.html
index c1d76dd2c..1126f8b54 100644
--- a/web/projects/marketplace/src/pages/show/about/about.component.html
+++ b/web/projects/marketplace/src/pages/show/about/about.component.html
@@ -4,7 +4,7 @@
 </ion-item-divider>
 <ion-item lines="none" color="transparent">
   <ion-label>
-    <div [innerHTML]="pkg.manifest['release-notes'] | markdown"></div>
+    <div [innerHTML]="pkg.manifest.releaseNotes | markdown"></div>
   </ion-label>
 </ion-item>
 <ion-button routerLink="notes" fill="clear" strong>
@@ -18,10 +18,7 @@
     <h2>{{ pkg.manifest.description.long }}</h2>
   </ion-label>
 </ion-item>
-<div
-  *ngIf="pkg.manifest['marketing-site'] as url"
-  style="padding: 4px 0 10px 14px"
->
+<div *ngIf="pkg.manifest.marketingSite as url" style="padding: 4px 0 10px 14px">
   <ion-button [href]="url" target="_blank" rel="noreferrer" color="tertiary">
     View website
     <ion-icon slot="end" name="open-outline"></ion-icon>
diff --git a/web/projects/marketplace/src/pages/show/additional/additional.component.html b/web/projects/marketplace/src/pages/show/additional/additional.component.html
index 8937e8c74..d362991e3 100644
--- a/web/projects/marketplace/src/pages/show/additional/additional.component.html
+++ b/web/projects/marketplace/src/pages/show/additional/additional.component.html
@@ -15,7 +15,7 @@
     <ion-col responsiveCol sizeXs="12" sizeMd="6">
       <ion-item-group>
         <ion-item
-          *ngIf="manifest['git-hash'] as gitHash; else noHash"
+          *ngIf="manifest.gitHash as gitHash; else noHash"
           button
           detail="false"
           (click)="copy(gitHash)"
@@ -64,39 +64,39 @@ <h2>Instructions</h2>
     <ion-col responsiveCol sizeXs="12" sizeMd="6">
       <ion-item-group>
         <ion-item
-          [href]="manifest['upstream-repo']"
+          [href]="manifest.upstreamRepo"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Source Repository</h2>
-            <p>{{ manifest['upstream-repo'] }}</p>
+            <p>{{ manifest.upstreamRepo }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest['wrapper-repo']"
+          [href]="manifest.wrapperRepo"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Wrapper Repository</h2>
-            <p>{{ manifest['wrapper-repo'] }}</p>
+            <p>{{ manifest.wrapperRepo }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest['support-site']"
-          [disabled]="!manifest['support-site']"
+          [href]="manifest.supportSite"
+          [disabled]="!manifest.supportSite"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Support Site</h2>
-            <p>{{ manifest['support-site'] || 'Not provided' }}</p>
+            <p>{{ manifest.supportSite || 'Not provided' }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
diff --git a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
index e5711b432..4c1bfcc65 100644
--- a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
+++ b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
@@ -17,10 +17,10 @@
         </ion-thumbnail>
         <ion-label>
           <h2>
-            {{ pkg['dependency-metadata'][dep.key].title }}
+            {{ pkg.dependencyMetadata[dep.key].title }}
             <span *ngIf="dep.value.optional; else required">(optional)</span>
             <ng-template #required>
-              <span *ngSwitchCase="'opt-in'">(optional)</span>
+              <span>(Required)</span>
             </ng-template>
           </h2>
           <p>{{ dep.value.description }}</p>
diff --git a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
index 0626f4817..a1fed6cca 100644
--- a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
+++ b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
@@ -11,6 +11,6 @@ export class DependenciesComponent {
   pkg!: MarketplacePkg
 
   getImg(key: string): string {
-    return this.pkg['dependency-metadata'][key].icon
+    return this.pkg.dependencyMetadata[key].icon
   }
 }
diff --git a/web/projects/marketplace/src/pages/show/package/package.component.html b/web/projects/marketplace/src/pages/show/package/package.component.html
index 1e0ad89eb..94e7006b1 100644
--- a/web/projects/marketplace/src/pages/show/package/package.component.html
+++ b/web/projects/marketplace/src/pages/show/package/package.component.html
@@ -3,9 +3,7 @@
   <div class="text">
     <h1 ticker class="title">{{ pkg.manifest.title }}</h1>
     <p class="version">{{ pkg.manifest.version | displayEmver }}</p>
-    <p class="published">
-      Released: {{ pkg['published-at'] | date: 'medium' }}
-    </p>
+    <p class="published">Released: {{ pkg.publishedAt | date: 'medium' }}</p>
     <ng-content></ng-content>
   </div>
 </div>
diff --git a/web/projects/marketplace/src/pipes/filter-packages.pipe.ts b/web/projects/marketplace/src/pipes/filter-packages.pipe.ts
index 5b0bb52b1..48313376f 100644
--- a/web/projects/marketplace/src/pipes/filter-packages.pipe.ts
+++ b/web/projects/marketplace/src/pipes/filter-packages.pipe.ts
@@ -71,8 +71,7 @@ export class FilterPackagesPipe implements PipeTransform {
       .filter(p => category === 'all' || p.categories.includes(category))
       .sort((a, b) => {
         return (
-          new Date(b['published-at']).valueOf() -
-          new Date(a['published-at']).valueOf()
+          new Date(b.publishedAt).valueOf() - new Date(a.publishedAt).valueOf()
         )
       })
   }
diff --git a/web/projects/marketplace/src/types.ts b/web/projects/marketplace/src/types.ts
index 7007ee806..7f69c3747 100644
--- a/web/projects/marketplace/src/types.ts
+++ b/web/projects/marketplace/src/types.ts
@@ -28,10 +28,10 @@ export interface MarketplacePkg {
   manifest: Manifest
   categories: string[]
   versions: string[]
-  'dependency-metadata': {
+  dependencyMetadata: {
     [id: string]: DependencyMetadata
   }
-  'published-at': string
+  publishedAt: string
 }
 
 export interface DependencyMetadata {
@@ -45,19 +45,19 @@ export interface Manifest {
   id: string
   title: string
   version: string
-  'git-hash'?: string
+  gitHash?: string
   description: {
     short: string
     long: string
   }
   replaces?: string[]
-  'release-notes': string
+  releaseNotes: string
   license: string // name of license
-  'wrapper-repo': Url
-  'upstream-repo': Url
-  'support-site': Url
-  'marketing-site': Url
-  'donation-url': Url | null
+  wrapperRepo: Url
+  upstreamRepo: Url
+  supportSite: Url
+  marketingSite: Url
+  donationUrl: Url | null
   alerts: {
     install: string | null
     uninstall: string | null
@@ -66,8 +66,8 @@ export interface Manifest {
     stop: string | null
   }
   dependencies: Record<string, Dependency>
-  'os-version': string
-  'has-config': boolean
+  osVersion: string
+  hasConfig: boolean
 }
 
 export interface Dependency {
diff --git a/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts b/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts
index 7f293f5e0..0664be38f 100644
--- a/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts
+++ b/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts
@@ -61,7 +61,7 @@ export class CifsModal {
     const target: CifsBackupTarget = {
       ...this.cifs,
       mountable: true,
-      'embassy-os': diskInfo,
+      startOs: diskInfo,
     }
 
     const modal = await this.modalController.create({
diff --git a/web/projects/setup-wizard/src/app/modals/password/password.page.ts b/web/projects/setup-wizard/src/app/modals/password/password.page.ts
index 98de93e1a..8ea00ce0c 100644
--- a/web/projects/setup-wizard/src/app/modals/password/password.page.ts
+++ b/web/projects/setup-wizard/src/app/modals/password/password.page.ts
@@ -31,11 +31,11 @@ export class PasswordPage {
   }
 
   async verifyPw() {
-    if (!this.target || !this.target['embassy-os'])
+    if (!this.target || !this.target.startOs)
       this.pwError = 'No recovery target' // unreachable
 
     try {
-      const passwordHash = this.target!['embassy-os']?.['password-hash'] || ''
+      const passwordHash = this.target!.startOs?.passwordHash || ''
 
       argon2.verify(passwordHash, this.password)
       this.modalController.dismiss({ password: this.password }, 'success')
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts b/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
index 10ec47d31..ce1a1b3c0 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
@@ -38,10 +38,7 @@ export class LoadingPage {
 
       if (!progress) return
 
-      const {
-        'total-bytes': totalBytes,
-        'bytes-transferred': bytesTransferred,
-      } = progress
+      const { totalBytes, bytesTransferred } = progress
 
       this.progress$.next({
         totalBytes,
diff --git a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
index a8cd194ba..f9e5adbb1 100644
--- a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -35,7 +35,7 @@ export class RecoverPage {
   }
 
   driveClickable(mapped: MappedDisk) {
-    return mapped.drive['embassy-os']?.full
+    return mapped.drive.startOs?.full
   }
 
   async getDrives() {
@@ -53,10 +53,10 @@ export class RecoverPage {
               label: p.label,
               capacity: p.capacity,
               used: p.used,
-              'embassy-os': p['embassy-os'],
+              startOs: p.startOs,
             }
             this.mappedDrives.push({
-              hasValidBackup: !!p['embassy-os']?.full,
+              hasValidBackup: !!p.startOs?.full,
               drive,
             })
           })
diff --git a/web/projects/setup-wizard/src/app/pages/success/success.page.ts b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
index c1d175aaa..71566580a 100644
--- a/web/projects/setup-wizard/src/app/pages/success/success.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
@@ -76,9 +76,9 @@ export class SuccessPage {
     try {
       const ret = await this.api.complete()
       if (!this.isKiosk) {
-        this.torAddress = ret['tor-address'].replace(/^https:/, 'http:')
-        this.lanAddress = ret['lan-address'].replace(/^https:/, 'http:')
-        this.cert = ret['root-ca']
+        this.torAddress = ret.torAddress.replace(/^https:/, 'http:')
+        this.lanAddress = ret.lanAddress.replace(/^https:/, 'http:')
+        this.cert = ret.rootCa
 
         await this.api.exit()
       }
diff --git a/web/projects/setup-wizard/src/app/services/api/api.service.ts b/web/projects/setup-wizard/src/app/services/api/api.service.ts
index df9636093..375e64a78 100644
--- a/web/projects/setup-wizard/src/app/services/api/api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/api.service.ts
@@ -28,27 +28,27 @@ type Encrypted = {
 }
 
 export type StatusRes = {
-  'bytes-transferred': number
-  'total-bytes': number | null
+  bytesTransferred: number
+  totalBytes: number | null
   complete: boolean
 } | null
 
 export type AttachReq = {
   guid: string
-  'embassy-password': Encrypted
+  startOsPassword: Encrypted
 }
 
 export type ExecuteReq = {
-  'embassy-logicalname': string
-  'embassy-password': Encrypted
-  'recovery-source': RecoverySource | null
-  'recovery-password': Encrypted | null
+  startOsLogicalname: string
+  startOsPassword: Encrypted
+  recoverySource: RecoverySource | null
+  recoveryPassword: Encrypted | null
 }
 
 export type CompleteRes = {
-  'tor-address': string
-  'lan-address': string
-  'root-ca': string
+  torAddress: string
+  lanAddress: string
+  rootCa: string
 }
 
 export type DiskBackupTarget = {
@@ -58,7 +58,7 @@ export type DiskBackupTarget = {
   label: string | null
   capacity: number
   used: number | null
-  'embassy-os': StartOSDiskInfo | null
+  startOs: StartOSDiskInfo | null
 }
 
 export type CifsBackupTarget = {
@@ -66,7 +66,7 @@ export type CifsBackupTarget = {
   path: string
   username: string
   mountable: boolean
-  'embassy-os': StartOSDiskInfo | null
+  startOs: StartOSDiskInfo | null
 }
 
 export type DiskRecoverySource = {
diff --git a/web/projects/setup-wizard/src/app/services/api/live-api.service.ts b/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
index ab67db5d0..566cc84cf 100644
--- a/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
@@ -73,11 +73,10 @@ export class LiveApiService extends ApiService {
   }
 
   async execute(setupInfo: ExecuteReq) {
-    if (setupInfo['recovery-source']?.type === 'backup') {
-      if (isCifsSource(setupInfo['recovery-source'].target)) {
-        setupInfo['recovery-source'].target.path = setupInfo[
-          'recovery-source'
-        ].target.path.replace('/\\/g', '/')
+    if (setupInfo.recoverySource?.type === 'backup') {
+      if (isCifsSource(setupInfo.recoverySource.target)) {
+        setupInfo.recoverySource.target.path =
+          setupInfo.recoverySource.target.path.replace('/\\/g', '/')
       }
     }
 
@@ -95,7 +94,7 @@ export class LiveApiService extends ApiService {
 
     return {
       ...res,
-      'root-ca': encodeBase64(res['root-ca']),
+      rootCa: encodeBase64(res.rootCa),
     }
   }
 
diff --git a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
index 51acf4e7b..df32bd09e 100644
--- a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
@@ -30,8 +30,8 @@ export class MockApiService extends ApiService {
     const progress = tries > 4 ? (tries - 4) * 268435456 : 0
 
     return {
-      'bytes-transferred': restoreOrMigrate ? progress : 0,
-      'total-bytes': restoreOrMigrate ? total : null,
+      bytesTransferred: restoreOrMigrate ? progress : 0,
+      totalBytes: restoreOrMigrate ? total : null,
       complete: progress === total,
     }
   }
@@ -65,12 +65,12 @@ export class MockApiService extends ApiService {
             label: null,
             capacity: 1979120929996,
             used: null,
-            'embassy-os': {
+            startOs: {
               version: '0.2.17',
               full: true,
-              'password-hash':
+              passwordHash:
                 '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
             },
             guid: null,
           },
@@ -88,12 +88,12 @@ export class MockApiService extends ApiService {
             label: null,
             capacity: 73264762332,
             used: null,
-            'embassy-os': {
+            startOs: {
               version: '0.3.3',
               full: true,
-              'password-hash':
+              passwordHash:
                 '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
             },
             guid: null,
           },
@@ -111,12 +111,12 @@ export class MockApiService extends ApiService {
             label: null,
             capacity: 73264762332,
             used: null,
-            'embassy-os': {
+            startOs: {
               version: '0.3.2',
               full: true,
-              'password-hash':
+              passwordHash:
                 '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              'wrapped-key': null,
+              wrappedKey: null,
             },
             guid: 'guid-guid-guid-guid',
           },
@@ -132,9 +132,9 @@ export class MockApiService extends ApiService {
     return {
       version: '0.3.0',
       full: true,
-      'password-hash':
+      passwordHash:
         '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-      'wrapped-key': '',
+      wrappedKey: '',
     }
   }
 
@@ -149,9 +149,9 @@ export class MockApiService extends ApiService {
   async complete(): Promise<CompleteRes> {
     await pauseFor(1000)
     return {
-      'tor-address': 'https://asdafsadasdasasdasdfasdfasdf.onion',
-      'lan-address': 'https://adjective-noun.local',
-      'root-ca': encodeBase64(rootCA),
+      torAddress: 'https://asdafsadasdasasdasdfasdfasdf.onion',
+      lanAddress: 'https://adjective-noun.local',
+      rootCa: encodeBase64(rootCA),
     }
   }
 
diff --git a/web/projects/setup-wizard/src/app/services/state.service.ts b/web/projects/setup-wizard/src/app/services/state.service.ts
index e70478559..916b066ee 100644
--- a/web/projects/setup-wizard/src/app/services/state.service.ts
+++ b/web/projects/setup-wizard/src/app/services/state.service.ts
@@ -15,7 +15,7 @@ export class StateService {
   async importDrive(guid: string, password: string): Promise<void> {
     await this.api.attach({
       guid,
-      'embassy-password': await this.api.encrypt(password),
+      startOsPassword: await this.api.encrypt(password),
     })
   }
 
@@ -24,10 +24,10 @@ export class StateService {
     password: string,
   ): Promise<void> {
     await this.api.execute({
-      'embassy-logicalname': storageLogicalname,
-      'embassy-password': await this.api.encrypt(password),
-      'recovery-source': this.recoverySource || null,
-      'recovery-password': this.recoveryPassword
+      startOsLogicalname: storageLogicalname,
+      startOsPassword: await this.api.encrypt(password),
+      recoverySource: this.recoverySource || null,
+      recoveryPassword: this.recoveryPassword
         ? await this.api.encrypt(this.recoveryPassword)
         : null,
     })
diff --git a/web/projects/shared/src/types/api.ts b/web/projects/shared/src/types/api.ts
index 1473dc16a..26cd00218 100644
--- a/web/projects/shared/src/types/api.ts
+++ b/web/projects/shared/src/types/api.ts
@@ -6,8 +6,8 @@ export type ServerLogsReq = {
 
 export type LogsRes = {
   entries: Log[]
-  'start-cursor'?: string
-  'end-cursor'?: string
+  startCursor?: string
+  endCursor?: string
 }
 
 export interface Log {
@@ -31,13 +31,13 @@ export interface PartitionInfo {
   label: string | null
   capacity: number
   used: number | null
-  'embassy-os': StartOSDiskInfo | null
+  startOs: StartOSDiskInfo | null
   guid: string | null
 }
 
 export type StartOSDiskInfo = {
   version: string
   full: boolean
-  'password-hash': string | null
-  'wrapped-key': string | null
+  passwordHash: string | null
+  wrappedKey: string | null
 }
diff --git a/web/projects/ui/src/app/app-routing.module.ts b/web/projects/ui/src/app/app-routing.module.ts
index b1b79c05d..ddb66d3c5 100644
--- a/web/projects/ui/src/app/app-routing.module.ts
+++ b/web/projects/ui/src/app/app-routing.module.ts
@@ -63,15 +63,6 @@ const routes: Routes = [
         m => m.AppsRoutingModule,
       ),
   },
-  {
-    path: 'developer',
-    canActivate: [AuthGuard],
-    canActivateChild: [AuthGuard],
-    loadChildren: () =>
-      import('./pages/developer-routes/developer-routing.module').then(
-        m => m.DeveloperRoutingModule,
-      ),
-  },
 ]
 
 @NgModule({
diff --git a/web/projects/ui/src/app/app.component.ts b/web/projects/ui/src/app/app.component.ts
index 5675fbf5c..1210eba7a 100644
--- a/web/projects/ui/src/app/app.component.ts
+++ b/web/projects/ui/src/app/app.component.ts
@@ -29,13 +29,12 @@ export class AppComponent implements OnDestroy {
     this.authService.isVerified$,
     this.connection.connected$,
     this.patch
-      .watch$('server-info', 'status-info')
-      .pipe(startWith({ restarting: false, 'shutting-down': false })),
+      .watch$('serverInfo', 'statusInfo')
+      .pipe(startWith({ restarting: false, shuttingDown: false })),
   ]).pipe(
     map(
       ([verified, connected, status]) =>
-        verified &&
-        (!connected || status.restarting || status['shutting-down']),
+        verified && (!connected || status.restarting || status.shuttingDown),
     ),
   )
 
diff --git a/web/projects/ui/src/app/app/footer/footer.component.ts b/web/projects/ui/src/app/app/footer/footer.component.ts
index 9a16f5a47..adbb27fe3 100644
--- a/web/projects/ui/src/app/app/footer/footer.component.ts
+++ b/web/projects/ui/src/app/app/footer/footer.component.ts
@@ -13,7 +13,7 @@ import { DataModel } from '../../services/patch-db/data-model'
 })
 export class FooterComponent {
   readonly progress$ = this.patch
-    .watch$('server-info', 'status-info', 'update-progress')
+    .watch$('serverInfo', 'statusInfo', 'updateProgress')
     .pipe(map(a => a && { ...a }))
 
   readonly animation = {
diff --git a/web/projects/ui/src/app/app/menu/menu.component.ts b/web/projects/ui/src/app/app/menu/menu.component.ts
index 540dee7b9..d44781a41 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.ts
+++ b/web/projects/ui/src/app/app/menu/menu.component.ts
@@ -11,9 +11,7 @@ import {
   filter,
   first,
   map,
-  merge,
   Observable,
-  of,
   pairwise,
   startWith,
   switchMap,
@@ -24,14 +22,7 @@ import { DataModel, PackageState } from 'src/app/services/patch-db/data-model'
 import { SplitPaneTracker } from 'src/app/services/split-pane.service'
 import { Emver, THEME } from '@start9labs/shared'
 import { ConnectionService } from 'src/app/services/connection.service'
-import { ConfigService } from 'src/app/services/config.service'
-import {
-  getManifest,
-  isInstalled,
-  isInstalling,
-  isRestoring,
-  isUpdating,
-} from 'src/app/util/get-package-data'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'app-menu',
@@ -69,19 +60,19 @@ export class MenuComponent {
   ]
 
   readonly notificationCount$ = this.patch.watch$(
-    'server-info',
-    'unread-notification-count',
+    'serverInfo',
+    'unreadNotificationCount',
   )
 
-  readonly snekScore$ = this.patch.watch$('ui', 'gaming', 'snake', 'high-score')
+  readonly snekScore$ = this.patch.watch$('ui', 'gaming', 'snake', 'highScore')
 
   readonly showEOSUpdate$ = this.eosService.showUpdate$
 
   private readonly local$ = this.connectionService.connected$.pipe(
     filter(Boolean),
-    switchMap(() => this.patch.watch$('package-data').pipe(first())),
+    switchMap(() => this.patch.watch$('packageData').pipe(first())),
     switchMap(outer =>
-      this.patch.watch$('package-data').pipe(
+      this.patch.watch$('packageData').pipe(
         pairwise(),
         filter(([prev, curr]) =>
           Object.values(prev).some(
@@ -90,9 +81,9 @@ export class MenuComponent {
                 PackageState.Installing,
                 PackageState.Updating,
                 PackageState.Restoring,
-              ].includes(p['state-info'].state) &&
+              ].includes(p.stateInfo.state) &&
               [PackageState.Installed, PackageState.Removing].includes(
-                curr[getManifest(p).id]['state-info'].state,
+                curr[getManifest(p).id].stateInfo.state,
               ),
           ),
         ),
@@ -136,6 +127,5 @@ export class MenuComponent {
     private readonly splitPane: SplitPaneTracker,
     private readonly emver: Emver,
     private readonly connectionService: ConnectionService,
-    private readonly config: ConfigService,
   ) {}
 }
diff --git a/web/projects/ui/src/app/components/backup-drives/backup.service.ts b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
index 381110de4..6beec7e2d 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup.service.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
@@ -56,7 +56,7 @@ export class BackupService {
   }
 
   hasValidBackup(target: BackupTarget): boolean {
-    const backup = target['embassy-os']
+    const backup = target.startOs
     return !!backup && this.emver.compare(backup.version, '0.3.0') !== -1
   }
 }
diff --git a/web/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts b/web/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
index 3f91da5c4..5fe9b621e 100644
--- a/web/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
+++ b/web/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
@@ -21,8 +21,8 @@ const { enableWidgets } =
 })
 export class BadgeMenuComponent {
   readonly unreadCount$ = this.patch.watch$(
-    'server-info',
-    'unread-notification-count',
+    'serverInfo',
+    'unreadNotificationCount',
   )
   readonly sidebarOpen$ = this.splitPane.sidebarOpen$
   readonly widgetDrawer$ = this.clientStorageService.widgetDrawer$
diff --git a/web/projects/ui/src/app/components/connection-bar/connection-bar.component.ts b/web/projects/ui/src/app/components/connection-bar/connection-bar.component.ts
index 9c4b07b7f..da28f805f 100644
--- a/web/projects/ui/src/app/components/connection-bar/connection-bar.component.ts
+++ b/web/projects/ui/src/app/components/connection-bar/connection-bar.component.ts
@@ -22,8 +22,8 @@ export class ConnectionBarComponent {
     this.connectionService.networkConnected$,
     this.websocket$.pipe(startWith(false)),
     this.patch
-      .watch$('server-info', 'status-info')
-      .pipe(startWith({ restarting: false, 'shutting-down': false })),
+      .watch$('serverInfo', 'statusInfo')
+      .pipe(startWith({ restarting: false, shuttingDown: false })),
   ]).pipe(
     map(([network, websocket, status]) => {
       if (!network)
@@ -40,7 +40,7 @@ export class ConnectionBarComponent {
           icon: 'cloud-offline-outline',
           dots: true,
         }
-      if (status['shutting-down'])
+      if (status.shuttingDown)
         return {
           message: 'Shutting Down',
           color: 'dark',
diff --git a/web/projects/ui/src/app/components/logs/logs.component.ts b/web/projects/ui/src/app/components/logs/logs.component.ts
index 5f0688757..5d033fc83 100644
--- a/web/projects/ui/src/app/components/logs/logs.component.ts
+++ b/web/projects/ui/src/app/components/logs/logs.component.ts
@@ -78,7 +78,7 @@ export class LogsComponent {
   async ngOnInit() {
     from(this.followLogs({ limit: this.limit }))
       .pipe(
-        switchMap(({ 'start-cursor': startCursor, guid }) => {
+        switchMap(({ startCursor, guid }) => {
           this.startCursor = startCursor
           return this.connect$(guid)
         }),
@@ -206,7 +206,7 @@ export class LogsComponent {
   }
 
   private processRes(res: LogsRes) {
-    const { entries, 'start-cursor': startCursor } = res
+    const { entries, startCursor } = res
 
     if (!entries.length) return
 
diff --git a/web/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.service.ts b/web/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.service.ts
index 52d35ea3c..a2368438d 100644
--- a/web/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.service.ts
+++ b/web/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.service.ts
@@ -7,7 +7,7 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 @Injectable({ providedIn: 'root' })
 export class NotificationsToastService extends Observable<boolean> {
   private readonly stream$ = this.patch
-    .watch$('server-info', 'unread-notification-count')
+    .watch$('serverInfo', 'unreadNotificationCount')
     .pipe(
       pairwise(),
       map(([prev, cur]) => cur > prev),
diff --git a/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts b/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
index 43c7f82c4..50cbc5a56 100644
--- a/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
+++ b/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
@@ -8,7 +8,7 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 
 @Injectable({ providedIn: 'root' })
 export class RefreshAlertService extends Observable<boolean> {
-  private readonly stream$ = this.patch.watch$('server-info', 'version').pipe(
+  private readonly stream$ = this.patch.watch$('serverInfo', 'version').pipe(
     map(version => !!this.emver.compare(this.config.version, version)),
     endWith(false),
   )
diff --git a/web/projects/ui/src/app/components/toast-container/update-toast/update-toast.service.ts b/web/projects/ui/src/app/components/toast-container/update-toast/update-toast.service.ts
index 5eb650869..819ed3dc6 100644
--- a/web/projects/ui/src/app/components/toast-container/update-toast/update-toast.service.ts
+++ b/web/projects/ui/src/app/components/toast-container/update-toast/update-toast.service.ts
@@ -7,7 +7,7 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 @Injectable({ providedIn: 'root' })
 export class UpdateToastService extends Observable<boolean> {
   private readonly stream$ = this.patch
-    .watch$('server-info', 'status-info', 'updated')
+    .watch$('serverInfo', 'statusInfo', 'updated')
     .pipe(distinctUntilChanged(), filter(Boolean), endWith(false))
 
   constructor(private readonly patch: PatchDB<DataModel>) {
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.page.html b/web/projects/ui/src/app/modals/app-config/app-config.page.html
index b781e8cad..42eb6cf39 100644
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.html
+++ b/web/projects/ui/src/app/modals/app-config/app-config.page.html
@@ -9,7 +9,7 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content class="ion-padding" *ngIf="pkg['state-info'].manifest as manifest">
+<ion-content class="ion-padding" *ngIf="pkg.stateInfo.manifest as manifest">
   <!-- loading -->
   <text-spinner
     *ngIf="loading; else notLoading"
@@ -82,7 +82,7 @@ <h2 style="display: flex; align-items: center">
       </ion-item>
 
       <!-- no options -->
-      <ion-item *ngIf="!hasOptions">
+      <ion-item *ngIf="!hasConfig">
         <ion-label>
           <p>
             No config options for {{ manifest.title }} {{ manifest.version }}.
@@ -111,11 +111,7 @@ <h2 style="display: flex; align-items: center">
 <ion-footer>
   <ion-toolbar>
     <ng-container *ngIf="!loading && !loadingError">
-      <ion-buttons
-        *ngIf="configForm && hasOptions"
-        slot="start"
-        class="ion-padding-start"
-      >
+      <ion-buttons *ngIf="hasConfig" slot="start" class="ion-padding-start">
         <ion-button fill="clear" (click)="resetDefaults()">
           <ion-icon slot="start" name="refresh"></ion-icon>
           Reset Defaults
@@ -123,7 +119,7 @@ <h2 style="display: flex; align-items: center">
       </ion-buttons>
       <ion-buttons slot="end" class="ion-padding-end">
         <ion-button
-          *ngIf="configForm"
+          *ngIf="hasConfig"
           fill="solid"
           color="primary"
           [disabled]="saving"
@@ -134,7 +130,7 @@ <h2 style="display: flex; align-items: center">
           Save
         </ion-button>
         <ion-button
-          *ngIf="!configForm"
+          *ngIf="!hasConfig"
           fill="solid"
           color="dark"
           (click)="dismiss()"
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.page.ts b/web/projects/ui/src/app/modals/app-config/app-config.page.ts
index 770ade4a2..4bba83acb 100644
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.ts
+++ b/web/projects/ui/src/app/modals/app-config/app-config.page.ts
@@ -59,8 +59,6 @@ export class AppConfigPage {
   saving = false
   loadingError: string | IonicSafeString = ''
 
-  hasOptions = false
-
   constructor(
     private readonly embassyApi: ApiService,
     private readonly errToast: ErrorToastService,
@@ -71,6 +69,10 @@ export class AppConfigPage {
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
+  get hasConfig() {
+    return this.pkg.stateInfo.manifest.hasConfig
+  }
+
   async ngOnInit() {
     try {
       const pkg = await getPackage(this.patch, this.pkgId)
@@ -78,7 +80,7 @@ export class AppConfigPage {
 
       this.pkg = pkg
 
-      if (!this.pkg['state-info'].manifest['has-config']) return
+      if (!this.hasConfig) return
 
       let newConfig: object | undefined
       let patch: Operation[] | undefined
@@ -86,12 +88,12 @@ export class AppConfigPage {
       if (this.dependentInfo) {
         this.loadingText = `Setting properties to accommodate ${this.dependentInfo.title}`
         const {
-          'old-config': oc,
-          'new-config': nc,
+          oldConfig: oc,
+          newConfig: nc,
           spec: s,
         } = await this.embassyApi.dryConfigureDependency({
-          'dependency-id': this.pkgId,
-          'dependent-id': this.dependentInfo.id,
+          dependencyId: this.pkgId,
+          dependentId: this.dependentInfo.id,
         })
         this.original = oc
         newConfig = nc
@@ -111,10 +113,6 @@ export class AppConfigPage {
         newConfig || this.original,
       )
 
-      this.hasOptions = !!Object.values(this.configSpec).find(
-        valSpec => valSpec.type !== 'pointer',
-      )
-
       if (patch) {
         this.diff = this.getDiff(patch)
         this.markDirty(patch)
diff --git a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html
index 09a055650..9dfb72da9 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html
+++ b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html
@@ -1,5 +1,5 @@
 <ng-container
-  *ngIf="packageData$ | toOptions : backupInfo['package-backups'] | async as options"
+  *ngIf="packageData$ | toOptions : backupInfo.packageBackups | async as options"
 >
   <ion-header>
     <ion-toolbar>
diff --git a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
index 65f61e643..15bec3d4f 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
@@ -23,7 +23,7 @@ export class AppRecoverSelectPage {
   @Input() password!: string
   @Input() oldPassword?: string
 
-  readonly packageData$ = this.patch.watch$('package-data').pipe(take(1))
+  readonly packageData$ = this.patch.watch$('packageData').pipe(take(1))
 
   hasSelection = false
   error: string | IonicSafeString = ''
@@ -53,8 +53,8 @@ export class AppRecoverSelectPage {
     try {
       await this.embassyApi.restorePackages({
         ids,
-        'target-id': this.id,
-        'old-password': this.oldPassword || null,
+        targetId: this.id,
+        oldPassword: this.oldPassword || null,
         password: this.password,
       })
       this.modalCtrl.dismiss(undefined, 'success')
diff --git a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
index 2ac688a6b..6a81df4bc 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
@@ -34,7 +34,7 @@ export class ToOptionsPipe implements PipeTransform {
             id,
             installed: !!packageData[id],
             checked: false,
-            'newer-eos': this.compare(packageBackups[id]['os-version']),
+            'newer-eos': this.compare(packageBackups[id].osVersion),
           }))
           .sort((a, b) =>
             b.title.toLowerCase() > a.title.toLowerCase() ? -1 : 1,
diff --git a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
index b1b6cf5e6..861e4c29f 100644
--- a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
+++ b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
@@ -29,7 +29,7 @@ export class BackupSelectPage {
 
   async ngOnInit() {
     this.pkgs = await firstValueFrom(
-      this.patch.watch$('package-data').pipe(
+      this.patch.watch$('packageData').pipe(
         map(pkgs => {
           return Object.values(pkgs)
             .map(pkg => {
@@ -38,7 +38,7 @@ export class BackupSelectPage {
                 id,
                 title,
                 icon: pkg.icon,
-                disabled: pkg['state-info'].state !== PackageState.Installed,
+                disabled: pkg.stateInfo.state !== PackageState.Installed,
                 checked: false,
               }
             })
diff --git a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
index 9743e531c..f62331819 100644
--- a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
+++ b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
@@ -200,7 +200,7 @@ export class MarketplaceSettingsPage {
   ): Promise<void> {
     // Error on duplicates
     const hosts = await firstValueFrom(
-      this.patch.watch$('ui', 'marketplace', 'known-hosts'),
+      this.patch.watch$('ui', 'marketplace', 'knownHosts'),
     )
     const currentUrls = Object.keys(hosts).map(toUrl)
     if (currentUrls.includes(url)) throw new Error('marketplace already added')
@@ -217,7 +217,7 @@ export class MarketplaceSettingsPage {
     loader.message = 'Saving...'
 
     await this.api.setDbValue<{ name: string }>(
-      ['marketplace', 'known-hosts', url],
+      ['marketplace', 'knownHosts', url],
       { name },
     )
   }
@@ -229,7 +229,7 @@ export class MarketplaceSettingsPage {
     await loader.present()
 
     const hosts = await firstValueFrom(
-      this.patch.watch$('ui', 'marketplace', 'known-hosts'),
+      this.patch.watch$('ui', 'marketplace', 'knownHosts'),
     )
 
     const filtered: { [url: string]: UIStore } = Object.keys(hosts)
@@ -244,7 +244,7 @@ export class MarketplaceSettingsPage {
 
     try {
       await this.api.setDbValue<{ [url: string]: UIStore }>(
-        ['marketplace', 'known-hosts'],
+        ['marketplace', 'knownHosts'],
         filtered,
       )
     } catch (e: any) {
diff --git a/web/projects/ui/src/app/modals/os-update/os-update.page.ts b/web/projects/ui/src/app/modals/os-update/os-update.page.ts
index eb9de93db..9c49b72bf 100644
--- a/web/projects/ui/src/app/modals/os-update/os-update.page.ts
+++ b/web/projects/ui/src/app/modals/os-update/os-update.page.ts
@@ -22,7 +22,7 @@ export class OSUpdatePage {
   ) {}
 
   ngOnInit() {
-    const releaseNotes = this.eosService.eos?.['release-notes']!
+    const releaseNotes = this.eosService.eos?.releaseNotes!
 
     this.versions = Object.keys(releaseNotes)
       .sort()
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
index bb5374856..ec425f8bb 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
@@ -9,7 +9,7 @@
 
 <ion-content class="ion-padding-top with-widgets">
   <ng-container *ngIf="pkg$ | async as pkg">
-    <ion-item-group *ngIf="pkg['state-info'].state === 'installed'">
+    <ion-item-group *ngIf="pkg.stateInfo.state === 'installed'">
       <!-- ** standard actions ** -->
       <ion-item-divider>Standard Actions</ion-item-divider>
       <app-actions-item
@@ -23,7 +23,7 @@
 
       <!-- ** specific actions ** -->
       <ion-item-divider *ngIf="!(pkg.actions | empty)">
-        Actions for {{ pkg['state-info'].manifest.title }}
+        Actions for {{ pkg.stateInfo.manifest.title }}
       </ion-item-divider>
       <app-actions-item
         *ngFor="let action of pkg.actions | keyvalue: asIsOrder"
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index 41a7d51c0..c836b6206 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -29,7 +29,7 @@ import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
 })
 export class AppActionsPage {
   readonly pkgId = getPkgId(this.route)
-  readonly pkg$ = this.patch.watch$('package-data', this.pkgId)
+  readonly pkg$ = this.patch.watch$('packageData', this.pkgId)
 
   constructor(
     private readonly route: ActivatedRoute,
@@ -184,7 +184,7 @@ export class AppActionsPage {
     try {
       const res = await this.embassyApi.executePackageAction({
         id: this.pkgId,
-        'action-id': actionId,
+        actionId,
         input,
       })
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 5540866fd..c390e122c 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -29,7 +29,7 @@ export class AppInterfacesPage {
   readonly pkgId = getPkgId(this.route)
 
   readonly serviceInterfaces$ = this.patch
-    .watch$('package-data', this.pkgId, 'service-interfaces')
+    .watch$('packageData', this.pkgId, 'serviceInterfaces')
     .pipe(
       map(interfaces => {
         const sorted = Object.values(interfaces)
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
index 3849b4327..9173de39f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
@@ -14,20 +14,20 @@ <h2 ticker>{{ manifest.title }}</h2>
     <p>{{ manifest.version | displayEmver }}</p>
     <status
       [rendering]="pkg.primaryRendering"
-      [installingInfo]="$any(pkg.entry['state-info'])['installing-info']"
+      [installingInfo]="$any(pkg.entry.stateInfo).installingInfo"
       weight="bold"
       size="small"
       [sigtermTimeout]="sigtermTimeout"
     ></status>
   </ion-label>
   <ion-button
-    *ngIf="pkg.entry['service-interfaces'] | hasUi"
+    *ngIf="pkg.entry.serviceInterfaces | hasUi"
     slot="end"
     fill="clear"
     color="primary"
-    (click)="launchUi($event, pkg.entry['service-interfaces'])"
+    (click)="launchUi($event, pkg.entry.serviceInterfaces)"
     [disabled]="
-      !(pkg.entry['state-info'].state | isLaunchable: pkgMainStatus.status)
+      !(pkg.entry.stateInfo.state | isLaunchable: pkgMainStatus.status)
     "
   >
     <ion-icon slot="icon-only" name="open-outline"></ion-icon>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index 95f8785f5..04d05a1d8 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -32,7 +32,7 @@ export class AppListPkgComponent {
       : null
   }
 
-  launchUi(e: Event, interfaces: PackageDataEntry['service-interfaces']): void {
+  launchUi(e: Event, interfaces: PackageDataEntry['serviceInterfaces']): void {
     e.stopPropagation()
     e.preventDefault()
     this.launcherService.launch(interfaces)
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts
index e88067ede..8c36d22dc 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts
@@ -11,7 +11,7 @@ import { getManifest } from 'src/app/util/get-package-data'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AppListPage {
-  readonly pkgs$ = this.patch.watch$('package-data').pipe(
+  readonly pkgs$ = this.patch.watch$('packageData').pipe(
     map(pkgs => Object.values(pkgs)),
     startWith([]),
     pairwise(),
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts
index 17eda2827..3695c4536 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts
@@ -17,7 +17,7 @@ export class PackageInfoPipe implements PipeTransform {
 
   transform(pkgId: string): Observable<PkgInfo> {
     return combineLatest([
-      this.patch.watch$('package-data', pkgId).pipe(filter(Boolean)),
+      this.patch.watch$('packageData', pkgId).pipe(filter(Boolean)),
       this.depErrorService.getPkgDepErrors$(pkgId),
     ]).pipe(map(([pkg, depErrors]) => getPackageInfo(pkg, depErrors)))
   }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
index 15af441a7..e3b4508a7 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
@@ -41,7 +41,7 @@ export class AppPropertiesPage {
   unmasked: { [key: string]: boolean } = {}
 
   stopped$ = this.patch
-    .watch$('package-data', this.pkgId, 'status', 'main', 'status')
+    .watch$('packageData', this.pkgId, 'status', 'main', 'status')
     .pipe(map(status => status === PackageMainStatus.Stopped))
 
   @ViewChild(IonBackButtonDelegate, { static: false })
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index 476ab940c..238d1d208 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -7,7 +7,7 @@
     <!-- ** installing, updating, restoring ** -->
     <ng-container *ngIf="showProgress(pkg); else installed">
       <app-show-progress
-        *ngIf="pkg['state-info']['installing-info'] as installingInfo"
+        *ngIf="pkg.stateInfo.installingInfo as installingInfo"
         [phases]="installingInfo.progress.phases"
       ></app-show-progress>
     </ng-container>
@@ -35,7 +35,7 @@
           <app-show-menu [buttons]="pkg | toButtons"></app-show-menu>
           <!-- ** additional ** -->
           <app-show-additional
-            [manifest]="pkg['state-info'].manifest"
+            [manifest]="pkg.stateInfo.manifest"
           ></app-show-additional>
         </ng-container>
       </ion-item-group>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index d30bb0aff..840c647d2 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -47,7 +47,7 @@ export class AppShowPage {
   private readonly pkgId = getPkgId(this.route)
 
   readonly pkgPlus$ = combineLatest([
-    this.patch.watch$('package-data', this.pkgId),
+    this.patch.watch$('packageData', this.pkgId),
     this.depErrorService.getPkgDepErrors$(this.pkgId),
   ]).pipe(
     tap(([pkg, _]) => {
@@ -85,7 +85,7 @@ export class AppShowPage {
   ): DependencyInfo[] {
     const manifest = getManifest(pkg)
 
-    return Object.keys(pkg['current-dependencies'])
+    return Object.keys(pkg.currentDependencies)
       .filter(id => !!manifest.dependencies[id])
       .map(id => this.getDepValues(pkg, manifest, id, depErrors))
   }
@@ -103,11 +103,11 @@ export class AppShowPage {
       depErrors,
     )
 
-    const depInfo = pkg['dependency-info'][depId]
+    const depInfo = pkg.dependencyInfo[depId]
 
     return {
       id: depId,
-      version: pkg['current-dependencies'][depId].versionRange, // @TODO do we want this version range?
+      version: pkg.currentDependencies[depId].versionRange, // @TODO do we want this version range?
       title: depInfo?.title || depId,
       icon: depInfo?.icon || '',
       errorText: errorText
@@ -184,7 +184,7 @@ export class AppShowPage {
     const dependentInfo: DependentInfo = {
       id: pkgManifest.id,
       title: pkgManifest.title,
-      version: pkg['current-dependencies'][depId].versionRange,
+      version: pkg.currentDependencies[depId].versionRange,
     }
     const navigationExtras: NavigationExtras = {
       state: { dependentInfo },
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
index 240eccff2..73fc2158b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
@@ -10,7 +10,7 @@ <h2>Version</h2>
           </ion-label>
         </ion-item>
         <ion-item
-          *ngIf="manifest['git-hash'] as gitHash; else noHash"
+          *ngIf="manifest.gitHash as gitHash; else noHash"
           button
           detail="false"
           (click)="copy(gitHash)"
@@ -37,15 +37,15 @@ <h2>License</h2>
           <ion-icon slot="end" name="chevron-forward"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest['marketing-site']"
-          [disabled]="!manifest['marketing-site']"
+          [href]="manifest.marketingSite"
+          [disabled]="!manifest.marketingSite"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Marketing Site</h2>
-            <p>{{ manifest['marketing-site'] || 'Not provided' }}</p>
+            <p>{{ manifest.marketingSite || 'Not provided' }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
@@ -54,52 +54,52 @@ <h2>Marketing Site</h2>
     <ion-col responsiveCol sizeXs="12" sizeMd="6">
       <ion-item-group>
         <ion-item
-          [href]="manifest['upstream-repo']"
+          [href]="manifest.upstreamRepo"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Source Repository</h2>
-            <p>{{ manifest['upstream-repo'] }}</p>
+            <p>{{ manifest.upstreamRepo }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest['wrapper-repo']"
+          [href]="manifest.wrapperRepo"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Wrapper Repository</h2>
-            <p>{{ manifest['wrapper-repo'] }}</p>
+            <p>{{ manifest.wrapperRepo }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest['support-site']"
-          [disabled]="!manifest['support-site']"
+          [href]="manifest.supportSite"
+          [disabled]="!manifest.supportSite"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Support Site</h2>
-            <p>{{ manifest['support-site'] || 'Not provided' }}</p>
+            <p>{{ manifest.supportSite || 'Not provided' }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest['donation-url']"
-          [disabled]="!manifest['donation-url']"
+          [href]="manifest.donationUrl"
+          [disabled]="!manifest.donationUrl"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Donation Link</h2>
-            <p>{{ manifest['donation-url'] || 'Not provided' }}</p>
+            <p>{{ manifest.donationUrl || 'Not provided' }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index 4521f8e5e..f9db34c73 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -4,7 +4,7 @@
     <status
       size="x-large"
       weight="600"
-      [installingInfo]="$any(pkg['state-info'])['installing-info']"
+      [installingInfo]="$any(pkg.stateInfo).installingInfo"
       [rendering]="PR[status.primary]"
       [sigtermTimeout]="sigtermTimeout"
     ></status>
@@ -60,7 +60,7 @@
           class="action-button"
           color="primary"
           [disabled]="
-            !(pkg['state-info'].state | isLaunchable: pkgStatus.main.status)
+            !(pkg.stateInfo.state | isLaunchable: pkgStatus.main.status)
           "
           (click)="launchUi(interfaces)"
         >
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 6f26d2eb6..2a1c47af7 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -55,8 +55,8 @@ export class AppShowStatusComponent {
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
-  get interfaces(): PackageDataEntry['service-interfaces'] {
-    return this.pkg['service-interfaces']
+  get interfaces(): PackageDataEntry['serviceInterfaces'] {
+    return this.pkg.serviceInterfaces
   }
 
   get pkgStatus(): Status {
@@ -89,7 +89,7 @@ export class AppShowStatusComponent {
       : null
   }
 
-  launchUi(interfaces: PackageDataEntry['service-interfaces']): void {
+  launchUi(interfaces: PackageDataEntry['serviceInterfaces']): void {
     this.launcherService.launch(interfaces)
   }
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index 2eda6f296..f26addee9 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -36,7 +36,7 @@ export class ToButtonsPipe implements PipeTransform {
   ) {}
 
   transform(pkg: PackageDataEntry<InstalledState>): Button[] {
-    const manifest = pkg['state-info'].manifest
+    const manifest = pkg.stateInfo.manifest
 
     return [
       // instructions
@@ -46,7 +46,7 @@ export class ToButtonsPipe implements PipeTransform {
         description: `Understand how to use ${manifest.title}`,
         icon: 'list-outline',
         highlighted$: this.patch
-          .watch$('ui', 'ack-instructions', manifest.id)
+          .watch$('ui', 'ackInstructions', manifest.id)
           .pipe(map(seen => !seen)),
       },
       // config
@@ -122,7 +122,7 @@ export class ToButtonsPipe implements PipeTransform {
   private viewInMarketplaceButton(
     pkg: PackageDataEntry<InstalledState>,
   ): Button {
-    const url = pkg['marketplace-url']
+    const url = pkg.marketplaceUrl
     const queryParams = url ? { url } : {}
 
     let button: Button = {
@@ -130,7 +130,7 @@ export class ToButtonsPipe implements PipeTransform {
       icon: 'storefront-outline',
       action: () =>
         this.navCtrl.navigateForward(
-          [`marketplace/${pkg['state-info'].manifest.id}`],
+          [`marketplace/${pkg.stateInfo.manifest.id}`],
           {
             queryParams,
           },
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
index e099cb356..98265152b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
@@ -19,16 +19,14 @@ export class ToHealthChecksPipe implements PipeTransform {
   transform(
     manifest: Manifest,
   ): Observable<Record<string, HealthCheckResult | null> | null> {
-    return this.patch
-      .watch$('package-data', manifest.id, 'status', 'main')
-      .pipe(
-        map(main => {
-          return main.status === PackageMainStatus.Running &&
-            !isEmptyObject(main.health)
-            ? main.health
-            : null
-        }),
-        startWith(null),
-      )
+    return this.patch.watch$('packageData', manifest.id, 'status', 'main').pipe(
+      map(main => {
+        return main.status === PackageMainStatus.Running &&
+          !isEmptyObject(main.health)
+          ? main.health
+          : null
+      }),
+      startWith(null),
+    )
   }
 }
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.module.ts b/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.module.ts
deleted file mode 100644
index 649ab7dfc..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { RouterModule, Routes } from '@angular/router'
-import { DevConfigPage } from './dev-config.page'
-import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
-import { BackupReportPageModule } from 'src/app/modals/backup-report/backup-report.module'
-import { FormsModule } from '@angular/forms'
-import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: DevConfigPage,
-  },
-]
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    BadgeMenuComponentModule,
-    BackupReportPageModule,
-    FormsModule,
-    MonacoEditorModule,
-  ],
-  declarations: [DevConfigPage],
-})
-export class DevConfigPageModule {}
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.html b/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.html
deleted file mode 100644
index 334236d1e..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button
-        [defaultHref]="'/developer/projects/' + projectId"
-      ></ion-back-button>
-    </ion-buttons>
-    <ion-title>
-      Config
-      <ion-spinner
-        *ngIf="saving"
-        name="crescent"
-        style="transform: scale(0.55); position: absolute"
-      ></ion-spinner>
-    </ion-title>
-    <ion-buttons slot="end">
-      <ion-button (click)="preview()">Preview</ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ngx-monaco-editor
-    (keyup)="save()"
-    [options]="editorOptions"
-    [(ngModel)]="code"
-  ></ngx-monaco-editor>
-</ion-content>
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.scss b/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.ts b/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.ts
deleted file mode 100644
index 6dc4c7e13..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-config/dev-config.page.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Component } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { ModalController } from '@ionic/angular'
-import { debounce, ErrorToastService } from '@start9labs/shared'
-import * as yaml from 'js-yaml'
-import { filter, take } from 'rxjs/operators'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { PatchDB } from 'patch-db-client'
-import { getProjectId } from 'src/app/util/get-project-id'
-import { GenericFormPage } from '../../../modals/generic-form/generic-form.page'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-
-@Component({
-  selector: 'dev-config',
-  templateUrl: 'dev-config.page.html',
-  styleUrls: ['dev-config.page.scss'],
-})
-export class DevConfigPage {
-  readonly projectId = getProjectId(this.route)
-  editorOptions = { theme: 'vs-dark', language: 'yaml' }
-  code: string = ''
-  saving: boolean = false
-
-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly errToast: ErrorToastService,
-    private readonly modalCtrl: ModalController,
-    private readonly patch: PatchDB<DataModel>,
-    private readonly api: ApiService,
-  ) {}
-
-  ngOnInit() {
-    this.patch
-      .watch$('ui', 'dev', this.projectId, 'config')
-      .pipe(filter(Boolean), take(1))
-      .subscribe(config => {
-        this.code = config
-      })
-  }
-
-  async preview() {
-    let doc: any
-    try {
-      doc = yaml.load(this.code)
-    } catch (e: any) {
-      this.errToast.present(e)
-    }
-
-    const modal = await this.modalCtrl.create({
-      component: GenericFormPage,
-      componentProps: {
-        title: 'Config Sample',
-        spec: JSON.parse(JSON.stringify(doc, null, 2)),
-        buttons: [
-          {
-            text: 'OK',
-            handler: () => {
-              return
-            },
-            isSubmit: true,
-          },
-        ],
-      },
-    })
-    await modal.present()
-  }
-
-  @debounce(1000)
-  async save() {
-    this.saving = true
-    try {
-      await this.api.setDbValue<string>(
-        ['dev', this.projectId, 'config'],
-        this.code,
-      )
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      this.saving = false
-    }
-  }
-}
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.module.ts b/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.module.ts
deleted file mode 100644
index ce15130e5..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { RouterModule, Routes } from '@angular/router'
-import { DevInstructionsPage } from './dev-instructions.page'
-import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
-import { BackupReportPageModule } from 'src/app/modals/backup-report/backup-report.module'
-import { FormsModule } from '@angular/forms'
-import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: DevInstructionsPage,
-  },
-]
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    BadgeMenuComponentModule,
-    BackupReportPageModule,
-    FormsModule,
-    MonacoEditorModule,
-  ],
-  declarations: [DevInstructionsPage],
-})
-export class DevInstructionsPageModule {}
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.html b/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.html
deleted file mode 100644
index 8775ec175..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button
-        [defaultHref]="'/developer/projects/' + projectId"
-      ></ion-back-button>
-    </ion-buttons>
-    <ion-title>
-      Instructions
-      <ion-spinner
-        *ngIf="saving"
-        name="crescent"
-        style="transform: scale(0.55); position: absolute"
-      ></ion-spinner>
-    </ion-title>
-    <ion-buttons slot="end">
-      <ion-button (click)="preview()">Preview</ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ngx-monaco-editor
-    (keyup)="save()"
-    [options]="editorOptions"
-    [(ngModel)]="code"
-  ></ngx-monaco-editor>
-</ion-content>
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.scss b/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.ts b/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.ts
deleted file mode 100644
index bf3fa0b56..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-instructions/dev-instructions.page.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Component } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { ModalController } from '@ionic/angular'
-import { filter, take } from 'rxjs/operators'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import {
-  debounce,
-  ErrorToastService,
-  MarkdownComponent,
-} from '@start9labs/shared'
-import { PatchDB } from 'patch-db-client'
-import { getProjectId } from 'src/app/util/get-project-id'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-
-@Component({
-  selector: 'dev-instructions',
-  templateUrl: 'dev-instructions.page.html',
-  styleUrls: ['dev-instructions.page.scss'],
-})
-export class DevInstructionsPage {
-  readonly projectId = getProjectId(this.route)
-  editorOptions = { theme: 'vs-dark', language: 'markdown' }
-  code = ''
-  saving = false
-
-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly errToast: ErrorToastService,
-    private readonly modalCtrl: ModalController,
-    private readonly patch: PatchDB<DataModel>,
-    private readonly api: ApiService,
-  ) {}
-
-  ngOnInit() {
-    this.patch
-      .watch$('ui', 'dev', this.projectId, 'instructions')
-      .pipe(filter(Boolean), take(1))
-      .subscribe(config => {
-        this.code = config
-      })
-  }
-
-  async preview() {
-    const modal = await this.modalCtrl.create({
-      componentProps: {
-        title: 'Instructions Sample',
-        content: this.code,
-      },
-      component: MarkdownComponent,
-    })
-
-    await modal.present()
-  }
-
-  @debounce(1000)
-  async save() {
-    this.saving = true
-    try {
-      await this.api.setDbValue<string>(
-        ['dev', this.projectId, 'instructions'],
-        this.code,
-      )
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      this.saving = false
-    }
-  }
-}
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.module.ts b/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.module.ts
deleted file mode 100644
index 49d738fe8..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { RouterModule, Routes } from '@angular/router'
-import { DevManifestPage } from './dev-manifest.page'
-import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
-import { BackupReportPageModule } from 'src/app/modals/backup-report/backup-report.module'
-import { FormsModule } from '@angular/forms'
-import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: DevManifestPage,
-  },
-]
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    BadgeMenuComponentModule,
-    BackupReportPageModule,
-    FormsModule,
-    MonacoEditorModule,
-  ],
-  declarations: [DevManifestPage],
-})
-export class DevManifestPageModule {}
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.html b/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.html
deleted file mode 100644
index 595adb6c3..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button
-        [defaultHref]="'/developer/projects/' + projectId"
-      ></ion-back-button>
-    </ion-buttons>
-    <ion-title>Manifest</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ngx-monaco-editor
-    [options]="editorOptions"
-    [(ngModel)]="manifest"
-  ></ngx-monaco-editor>
-</ion-content>
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.scss b/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.ts b/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.ts
deleted file mode 100644
index f039abbd8..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/dev-manifest/dev-manifest.page.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Component } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import * as yaml from 'js-yaml'
-import { take } from 'rxjs/operators'
-import { PatchDB } from 'patch-db-client'
-import { getProjectId } from 'src/app/util/get-project-id'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-
-@Component({
-  selector: 'dev-manifest',
-  templateUrl: 'dev-manifest.page.html',
-  styleUrls: ['dev-manifest.page.scss'],
-})
-export class DevManifestPage {
-  readonly projectId = getProjectId(this.route)
-  editorOptions = { theme: 'vs-dark', language: 'yaml', readOnly: true }
-  manifest: string = ''
-
-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly patch: PatchDB<DataModel>,
-  ) {}
-
-  ngOnInit() {
-    this.patch
-      .watch$('ui', 'dev', this.projectId)
-      .pipe(take(1))
-      .subscribe(devData => {
-        this.manifest = yaml.dump(devData['basic-info'])
-      })
-  }
-}
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.module.ts b/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.module.ts
deleted file mode 100644
index ea0c78423..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { RouterModule, Routes } from '@angular/router'
-import { DeveloperListPage } from './developer-list.page'
-import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
-import { BackupReportPageModule } from 'src/app/modals/backup-report/backup-report.module'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: DeveloperListPage,
-  },
-]
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    BadgeMenuComponentModule,
-    BackupReportPageModule,
-  ],
-  declarations: [DeveloperListPage],
-})
-export class DeveloperListPageModule {}
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.html b/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.html
deleted file mode 100644
index e00330448..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button></ion-back-button>
-    </ion-buttons>
-    <ion-title>Developer Tools</ion-title>
-    <ion-buttons slot="end">
-      <badge-menu-button></badge-menu-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ion-item-divider>Projects</ion-item-divider>
-
-  <ion-item button detail="false" (click)="openCreateProjectModal()">
-    <ion-icon slot="start" name="add" color="dark"></ion-icon>
-    <ion-label>
-      <ion-text color="dark">Create project</ion-text>
-    </ion-label>
-  </ion-item>
-
-  <ion-item
-    button
-    *ngFor="let entry of devData | keyvalue"
-    [routerLink]="[entry.key]"
-  >
-    <p>{{ entry.value.name }}</p>
-    <ion-button
-      slot="end"
-      fill="clear"
-      (click)="presentAction(entry.key, $event)"
-    >
-      <ion-icon name="ellipsis-horizontal"></ion-icon>
-    </ion-button>
-  </ion-item>
-</ion-content>
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.scss b/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.ts b/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.ts
deleted file mode 100644
index 96aa6126a..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/developer-list/developer-list.page.ts
+++ /dev/null
@@ -1,266 +0,0 @@
-import { Component } from '@angular/core'
-import {
-  ActionSheetButton,
-  ActionSheetController,
-  AlertController,
-  LoadingController,
-  ModalController,
-} from '@ionic/angular'
-import {
-  GenericInputComponent,
-  GenericInputOptions,
-} from 'src/app/modals/generic-input/generic-input.component'
-import { PatchDB } from 'patch-db-client'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ConfigSpec } from 'src/app/pkg-config/config-types'
-import * as yaml from 'js-yaml'
-import { v4 } from 'uuid'
-import { DataModel, DevData } from 'src/app/services/patch-db/data-model'
-import { ErrorToastService } from '@start9labs/shared'
-import { TuiDestroyService } from '@taiga-ui/cdk'
-import { takeUntil } from 'rxjs/operators'
-
-@Component({
-  selector: 'developer-list',
-  templateUrl: 'developer-list.page.html',
-  styleUrls: ['developer-list.page.scss'],
-  providers: [TuiDestroyService],
-})
-export class DeveloperListPage {
-  devData: DevData = {}
-
-  constructor(
-    private readonly modalCtrl: ModalController,
-    private readonly api: ApiService,
-    private readonly loadingCtrl: LoadingController,
-    private readonly errToast: ErrorToastService,
-    private readonly alertCtrl: AlertController,
-    private readonly destroy$: TuiDestroyService,
-    private readonly patch: PatchDB<DataModel>,
-    private readonly actionCtrl: ActionSheetController,
-  ) {}
-
-  ngOnInit() {
-    this.patch
-      .watch$('ui', 'dev')
-      .pipe(takeUntil(this.destroy$))
-      .subscribe(dd => {
-        this.devData = dd
-      })
-  }
-
-  async openCreateProjectModal() {
-    const projNumber = Object.keys(this.devData).length + 1
-    const options: GenericInputOptions = {
-      title: 'Add new project',
-      message: 'Create a new dev project.',
-      label: 'New project',
-      useMask: false,
-      placeholder: `Project ${projNumber}`,
-      nullable: true,
-      initialValue: `Project ${projNumber}`,
-      buttonText: 'Save',
-      submitFn: (value: string) => this.createProject(value),
-    }
-
-    const modal = await this.modalCtrl.create({
-      componentProps: { options },
-      cssClass: 'alertlike-modal',
-      presentingElement: await this.modalCtrl.getTop(),
-      component: GenericInputComponent,
-    })
-
-    await modal.present()
-  }
-
-  async presentAction(id: string, event: Event) {
-    event.stopPropagation()
-    event.preventDefault()
-    const buttons: ActionSheetButton[] = [
-      {
-        text: 'Edit Name',
-        icon: 'pencil',
-        handler: () => {
-          this.openEditNameModal(id)
-        },
-      },
-      {
-        text: 'Delete',
-        icon: 'trash',
-        role: 'destructive',
-        handler: () => {
-          this.presentAlertDelete(id)
-        },
-      },
-    ]
-
-    const action = await this.actionCtrl.create({
-      header: this.devData[id].name,
-      subHeader: 'Manage project',
-      mode: 'ios',
-      buttons,
-    })
-
-    await action.present()
-  }
-
-  async openEditNameModal(id: string) {
-    const curName = this.devData[id].name
-    const options: GenericInputOptions = {
-      title: 'Edit Name',
-      message: 'Edit the name of your project.',
-      label: 'Name',
-      useMask: false,
-      placeholder: curName,
-      nullable: true,
-      initialValue: curName,
-      buttonText: 'Save',
-      submitFn: (value: string) => this.editName(id, value),
-    }
-
-    const modal = await this.modalCtrl.create({
-      componentProps: { options },
-      cssClass: 'alertlike-modal',
-      presentingElement: await this.modalCtrl.getTop(),
-      component: GenericInputComponent,
-    })
-
-    await modal.present()
-  }
-
-  async createProject(name: string) {
-    // fail silently if duplicate project name
-    if (
-      Object.values(this.devData)
-        .map(v => v.name)
-        .includes(name)
-    )
-      return
-
-    const loader = await this.loadingCtrl.create({
-      message: 'Creating Project...',
-    })
-    await loader.present()
-
-    try {
-      const id = v4()
-      const config = yaml
-        .dump(SAMPLE_CONFIG)
-        .replace(/warning:/g, '# Optional\n  warning:')
-
-      const def = { name, config, instructions: SAMPLE_INSTUCTIONS }
-      await this.api.setDbValue<{
-        name: string
-        config: string
-        instructions: string
-      }>(['dev', id], def)
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
-
-  async presentAlertDelete(id: string) {
-    const alert = await this.alertCtrl.create({
-      header: 'Caution',
-      message: `Are you sure you want to delete this project?`,
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Delete',
-          handler: () => {
-            this.delete(id)
-          },
-          cssClass: 'enter-click',
-        },
-      ],
-    })
-    await alert.present()
-  }
-
-  async editName(id: string, newName: string) {
-    const loader = await this.loadingCtrl.create({
-      message: 'Saving...',
-    })
-    await loader.present()
-
-    try {
-      await this.api.setDbValue<string>(['dev', id, 'name'], newName)
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
-
-  async delete(id: string) {
-    const loader = await this.loadingCtrl.create({
-      message: 'Removing Project...',
-    })
-    await loader.present()
-
-    try {
-      const devDataToSave: DevData = JSON.parse(JSON.stringify(this.devData))
-      delete devDataToSave[id]
-      await this.api.setDbValue<DevData>(['dev'], devDataToSave)
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
-}
-
-const SAMPLE_INSTUCTIONS = `# Create Instructions using Markdown! :)`
-
-const SAMPLE_CONFIG: ConfigSpec = {
-  'sample-string': {
-    type: 'string',
-    name: 'Example String Input',
-    nullable: false,
-    masked: false,
-    copyable: false,
-    // optional
-    description: 'Example description for required string input.',
-    placeholder: 'Enter string value',
-    pattern: '^[a-zA-Z0-9! _]+$',
-    'pattern-description': 'Must be alphanumeric (may contain underscore).',
-  },
-  'sample-number': {
-    type: 'number',
-    name: 'Example Number Input',
-    nullable: false,
-    range: '[5,1000000]',
-    integral: true,
-    // optional
-    warning: 'Example warning to display when changing this number value.',
-    units: 'ms',
-    description: 'Example description for optional number input.',
-    placeholder: 'Enter number value',
-  },
-  'sample-boolean': {
-    type: 'boolean',
-    name: 'Example Boolean Toggle',
-    // optional
-    description: 'Example description for boolean toggle',
-    default: true,
-  },
-  'sample-enum': {
-    type: 'enum',
-    name: 'Example Enum Select',
-    values: ['red', 'blue', 'green'],
-    'value-names': {
-      red: 'Red',
-      blue: 'Blue',
-      green: 'Green',
-    },
-    // optional
-    warning: 'Example warning to display when changing this enum value.',
-    description: 'Example description for enum select',
-    default: 'red',
-  },
-}
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.module.ts b/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.module.ts
deleted file mode 100644
index d33ecf47f..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.module.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { RouterModule, Routes } from '@angular/router'
-import { DeveloperMenuPage } from './developer-menu.page'
-import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
-import { BackupReportPageModule } from 'src/app/modals/backup-report/backup-report.module'
-import { GenericFormPageModule } from 'src/app/modals/generic-form/generic-form.module'
-import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'
-import { FormsModule } from '@angular/forms'
-import { SharedPipesModule } from '@start9labs/shared'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: DeveloperMenuPage,
-  },
-]
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    BadgeMenuComponentModule,
-    BackupReportPageModule,
-    GenericFormPageModule,
-    FormsModule,
-    MonacoEditorModule,
-    SharedPipesModule,
-  ],
-  declarations: [DeveloperMenuPage],
-})
-export class DeveloperMenuPageModule {}
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.html b/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.html
deleted file mode 100644
index ee10e7fc6..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button defaultHref="/developer"></ion-back-button>
-    </ion-buttons>
-    <ion-title>{{ (projectData$ | async)?.name || '' }}</ion-title>
-    <ion-buttons slot="end">
-      <ion-button routerLink="manifest">View Manifest</ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ion-item
-    *ngIf="projectData$ | async as projectData"
-    button
-    (click)="openBasicInfoModal(projectData)"
-  >
-    <ion-icon slot="start" name="information-circle-outline"></ion-icon>
-    <ion-label>
-      <h2>Basic Info</h2>
-      <p>Complete basic info for your package</p>
-    </ion-label>
-    <ion-icon
-      slot="end"
-      color="success"
-      name="checkmark"
-      *ngIf="!(projectData['basic-info'] | empty)"
-    ></ion-icon>
-    <ion-icon
-      slot="end"
-      color="warning"
-      name="remove-outline"
-      *ngIf="projectData['basic-info'] | empty"
-    ></ion-icon>
-  </ion-item>
-  <ion-item button detail routerLink="instructions" routerDirection="forward">
-    <ion-icon slot="start" name="list-outline"></ion-icon>
-    <ion-label>
-      <h2>Instructions Generator</h2>
-      <p>Create instructions and see how they will appear to the end user</p>
-    </ion-label>
-  </ion-item>
-  <ion-item button detail routerLink="config">
-    <ion-icon slot="start" name="construct-outline"></ion-icon>
-    <ion-label>
-      <h2>Config Generator</h2>
-      <p>Edit the config with YAML and see it in real time</p>
-    </ion-label>
-  </ion-item>
-</ion-content>
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.scss b/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.ts b/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.ts
deleted file mode 100644
index 3ae2b394c..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/developer-menu/developer-menu.page.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { LoadingController, ModalController } from '@ionic/angular'
-import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
-import { BasicInfo, getBasicInfoSpec } from './form-info'
-import { PatchDB } from 'patch-db-client'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ErrorToastService } from '@start9labs/shared'
-import { getProjectId } from 'src/app/util/get-project-id'
-import { DataModel, DevProjectData } from 'src/app/services/patch-db/data-model'
-
-@Component({
-  selector: 'developer-menu',
-  templateUrl: 'developer-menu.page.html',
-  styleUrls: ['developer-menu.page.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class DeveloperMenuPage {
-  readonly projectId = getProjectId(this.route)
-  readonly projectData$ = this.patch.watch$('ui', 'dev', this.projectId)
-
-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly modalCtrl: ModalController,
-    private readonly loadingCtrl: LoadingController,
-    private readonly api: ApiService,
-    private readonly errToast: ErrorToastService,
-    private readonly patch: PatchDB<DataModel>,
-  ) {}
-
-  async openBasicInfoModal(data: DevProjectData) {
-    const modal = await this.modalCtrl.create({
-      component: GenericFormPage,
-      componentProps: {
-        title: 'Basic Info',
-        spec: getBasicInfoSpec(data),
-        buttons: [
-          {
-            text: 'Save',
-            handler: (basicInfo: BasicInfo) => {
-              this.saveBasicInfo(basicInfo)
-            },
-            isSubmit: true,
-          },
-        ],
-      },
-    })
-    await modal.present()
-  }
-
-  async saveBasicInfo(basicInfo: BasicInfo) {
-    const loader = await this.loadingCtrl.create({
-      message: 'Saving...',
-    })
-    await loader.present()
-
-    try {
-      await this.api.setDbValue<BasicInfo>(
-        ['dev', this.projectId, 'basic-info'],
-        basicInfo,
-      )
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
-}
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-menu/form-info.ts b/web/projects/ui/src/app/pages/developer-routes/developer-menu/form-info.ts
deleted file mode 100644
index b8a848f12..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/developer-menu/form-info.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-import { ConfigSpec } from 'src/app/pkg-config/config-types'
-import { DevProjectData } from 'src/app/services/patch-db/data-model'
-
-export type BasicInfo = {
-  id: string
-  title: string
-  'service-version-number': string
-  'release-notes': string
-  license: string
-  'wrapper-repo': string
-  'upstream-repo'?: string
-  'support-site'?: string
-  'marketing-site'?: string
-  description: {
-    short: string
-    long: string
-  }
-}
-
-export function getBasicInfoSpec(devData: DevProjectData): ConfigSpec {
-  const basicInfo = devData['basic-info']
-  return {
-    id: {
-      type: 'string',
-      name: 'ID',
-      description: 'The package identifier used by the OS',
-      placeholder: 'e.g. bitcoind',
-      nullable: false,
-      masked: false,
-      copyable: false,
-      pattern: '^([a-z][a-z0-9]*)(-[a-z0-9]+)*$',
-      'pattern-description': 'Must be kebab case',
-      default: basicInfo?.id,
-    },
-    title: {
-      type: 'string',
-      name: 'Service Name',
-      description: 'A human readable service title',
-      placeholder: 'e.g. Bitcoin Core',
-      nullable: false,
-      masked: false,
-      copyable: false,
-      default: basicInfo ? basicInfo.title : devData.name,
-    },
-    'service-version-number': {
-      type: 'string',
-      name: 'Service Version',
-      description:
-        'Service version - accepts up to four digits, where the last confirms to revisions necessary for StartOS - see documentation: https://github.com/Start9Labs/emver-rs. This value will change with each release of the service',
-      placeholder: 'e.g. 0.1.2.3',
-      nullable: false,
-      masked: false,
-      copyable: false,
-      pattern: '^([0-9]+).([0-9]+).([0-9]+).([0-9]+)$',
-      'pattern-description': 'Must be valid Emver version',
-      default: basicInfo?.['service-version-number'],
-    },
-    description: {
-      type: 'object',
-      name: 'Marketplace Descriptions',
-      spec: {
-        short: {
-          type: 'string',
-          name: 'Short Description',
-          description:
-            'This is the first description visible to the user in the marketplace',
-          nullable: false,
-          masked: false,
-          copyable: false,
-          textarea: true,
-          default: basicInfo?.description?.short,
-          pattern: '^.{1,320}$',
-          'pattern-description': 'Must be shorter than 320 characters',
-        },
-        long: {
-          type: 'string',
-          name: 'Long Description',
-          description: `This description will display with additional details in the service's individual marketplace page`,
-          nullable: false,
-          masked: false,
-          copyable: false,
-          textarea: true,
-          default: basicInfo?.description?.long,
-          pattern: '^.{1,5000}$',
-          'pattern-description': 'Must be shorter than 5000 characters',
-        },
-      },
-    },
-    'release-notes': {
-      type: 'string',
-      name: 'Release Notes',
-      description:
-        'Markdown supported release notes for this version of this service.',
-      placeholder: 'e.g. Markdown _release notes_ for **Bitcoin Core**',
-      nullable: false,
-      masked: false,
-      copyable: false,
-      textarea: true,
-      default: basicInfo?.['release-notes'],
-    },
-    license: {
-      type: 'enum',
-      name: 'License',
-      values: [
-        'gnu-agpl-v3',
-        'gnu-gpl-v3',
-        'gnu-lgpl-v3',
-        'mozilla-public-license-2.0',
-        'apache-license-2.0',
-        'mit',
-        'boost-software-license-1.0',
-        'the-unlicense',
-        'custom',
-      ],
-      'value-names': {
-        'gnu-agpl-v3': 'GNU AGPLv3',
-        'gnu-gpl-v3': 'GNU GPLv3',
-        'gnu-lgpl-v3': 'GNU LGPLv3',
-        'mozilla-public-license-2.0': 'Mozilla Public License 2.0',
-        'apache-license-2.0': 'Apache License 2.0',
-        mit: 'mit',
-        'boost-software-license-1.0': 'Boost Software License 1.0',
-        'the-unlicense': 'The Unlicense',
-        custom: 'Custom',
-      },
-      description: 'Example description for enum select',
-      default: 'mit',
-    },
-    'wrapper-repo': {
-      type: 'string',
-      name: 'Wrapper Repo',
-      description:
-        'The Start9 wrapper repository URL for the package. This repo contains the manifest file (this), any scripts necessary for configuration, backups, actions, or health checks',
-      placeholder: 'e.g. www.github.com/example',
-      nullable: false,
-      masked: false,
-      copyable: false,
-      default: basicInfo?.['wrapper-repo'],
-    },
-    'upstream-repo': {
-      type: 'string',
-      name: 'Upstream Repo',
-      description: 'The original project repository URL',
-      placeholder: 'e.g. www.github.com/example',
-      nullable: true,
-      masked: false,
-      copyable: false,
-      default: basicInfo?.['upstream-repo'],
-    },
-    'support-site': {
-      type: 'string',
-      name: 'Support Site',
-      description: 'URL to the support site / channel for the project',
-      placeholder: 'e.g. start9.com/support',
-      nullable: true,
-      masked: false,
-      copyable: false,
-      default: basicInfo?.['support-site'],
-    },
-    'marketing-site': {
-      type: 'string',
-      name: 'Marketing Site',
-      description: 'URL to the marketing site / channel for the project',
-      placeholder: 'e.g. start9.com',
-      nullable: true,
-      masked: false,
-      copyable: false,
-      default: basicInfo?.['marketing-site'],
-    },
-  }
-}
diff --git a/web/projects/ui/src/app/pages/developer-routes/developer-routing.module.ts b/web/projects/ui/src/app/pages/developer-routes/developer-routing.module.ts
deleted file mode 100644
index 03720d87d..000000000
--- a/web/projects/ui/src/app/pages/developer-routes/developer-routing.module.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { NgModule } from '@angular/core'
-import { Routes, RouterModule } from '@angular/router'
-
-const routes: Routes = [
-  {
-    path: '',
-    redirectTo: 'projects',
-    pathMatch: 'full',
-  },
-  {
-    path: 'projects',
-    loadChildren: () =>
-      import('./developer-list/developer-list.module').then(
-        m => m.DeveloperListPageModule,
-      ),
-  },
-  {
-    path: 'projects/:projectId',
-    loadChildren: () =>
-      import('./developer-menu/developer-menu.module').then(
-        m => m.DeveloperMenuPageModule,
-      ),
-  },
-  {
-    path: 'projects/:projectId/config',
-    loadChildren: () =>
-      import('./dev-config/dev-config.module').then(m => m.DevConfigPageModule),
-  },
-  {
-    path: 'projects/:projectId/instructions',
-    loadChildren: () =>
-      import('./dev-instructions/dev-instructions.module').then(
-        m => m.DevInstructionsPageModule,
-      ),
-  },
-  {
-    path: 'projects/:projectId/manifest',
-    loadChildren: () =>
-      import('./dev-manifest/dev-manifest.module').then(
-        m => m.DevManifestPageModule,
-      ),
-  },
-]
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class DeveloperRoutingModule {}
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
index 089b66139..6792b917a 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
@@ -29,7 +29,7 @@ export class MarketplaceListPage {
     }),
   )
 
-  readonly localPkgs$ = this.patch.watch$('package-data')
+  readonly localPkgs$ = this.patch.watch$('packageData')
 
   readonly details$ = this.marketplaceService.getSelectedHost$().pipe(
     map(({ url, name }) => {
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
index a1edbb593..6995dde5e 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
@@ -10,7 +10,7 @@
   <ng-container *ngIf="localPkg; else install">
     <ng-container
       *ngIf="
-        localPkg['state-info'].state === 'installed' &&
+        localPkg.stateInfo.state === 'installed' &&
         (localPkg | toManifest) as manifest
       "
     >
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index af605a8a9..10717cc19 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -66,7 +66,7 @@ export class MarketplaceShowControlsComponent {
     if (!this.localPkg) {
       this.alertInstall(url)
     } else {
-      const originalUrl = this.localPkg['marketplace-url']
+      const originalUrl = this.localPkg.marketplaceUrl
 
       if (!sameUrl(url, originalUrl)) {
         const proceed = await this.presentAlertDifferentMarketplace(
@@ -98,12 +98,11 @@ export class MarketplaceShowControlsComponent {
       this.patch.watch$('ui', 'marketplace'),
     )
 
-    const name: string = marketplaces['known-hosts'][url]?.name || url
+    const name: string = marketplaces.knownHosts[url]?.name || url
 
     let originalName: string | undefined
     if (originalUrl) {
-      originalName =
-        marketplaces['known-hosts'][originalUrl]?.name || originalUrl
+      originalName = marketplaces.knownHosts[originalUrl]?.name || originalUrl
     }
 
     return new Promise(async resolve => {
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
index dcb6e48d1..876e71924 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
@@ -20,7 +20,7 @@ export class MarketplaceShowPage {
   readonly loadVersion$ = new BehaviorSubject<string>('*')
 
   readonly localPkg$ = this.patch
-    .watch$('package-data', this.pkgId)
+    .watch$('packageData', this.pkgId)
     .pipe(filter(Boolean), shareReplay({ bufferSize: 1, refCount: true }))
 
   readonly pkg$ = this.loadVersion$.pipe(
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
index c76c5138a..8958cdda2 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
@@ -28,7 +28,7 @@
   >
     <ion-text
       *ngIf="
-        localPkg['state-info']['installing-info']!.progress.overall
+        localPkg.stateInfo.installingInfo.progress.overall
           | installingProgressString as progress
       "
       color="primary"
diff --git a/web/projects/ui/src/app/pages/notifications/notifications.page.html b/web/projects/ui/src/app/pages/notifications/notifications.page.html
index c53c140ff..fb3ba0883 100644
--- a/web/projects/ui/src/app/pages/notifications/notifications.page.html
+++ b/web/projects/ui/src/app/pages/notifications/notifications.page.html
@@ -86,7 +86,7 @@ <h4 style="color: #767676; margin-top: 0px; font-weight: 600">
           <ion-label>
             <h2>
               <b>
-                <span *ngIf="not['package-id'] as pkgId">
+                <span *ngIf="not.packageId as pkgId">
                   {{ packageData[pkgId] ? (packageData[pkgId] |
                   toManifest).title : pkgId }} -
                 </span>
@@ -104,7 +104,7 @@ <h2 class="notification-message">{{ truncate(not.message) }}</h2>
                 View Full Message
               </a>
             </p>
-            <p>{{ not['created-at'] | date: 'medium' }}</p>
+            <p>{{ not.createdAt | date: 'medium' }}</p>
           </ion-label>
           <ion-button
             *ngIf="not.code === 1"
@@ -116,11 +116,11 @@ <h2 class="notification-message">{{ truncate(not.message) }}</h2>
             View Report
           </ion-button>
           <ion-button
-            *ngIf="not['package-id'] && packageData[not['package-id']]"
+            *ngIf="not.packageId && packageData[not.packageId]"
             slot="end"
             fill="clear"
             color="dark"
-            [routerLink]="['/services', not['package-id']]"
+            [routerLink]="['/services', not.packageId]"
           >
             View Service
           </ion-button>
diff --git a/web/projects/ui/src/app/pages/notifications/notifications.page.ts b/web/projects/ui/src/app/pages/notifications/notifications.page.ts
index 71bf50370..933c50e67 100644
--- a/web/projects/ui/src/app/pages/notifications/notifications.page.ts
+++ b/web/projects/ui/src/app/pages/notifications/notifications.page.ts
@@ -29,7 +29,7 @@ export class NotificationsPage {
   needInfinite = false
   fromToast = !!this.route.snapshot.queryParamMap.get('toast')
   readonly perPage = 40
-  readonly packageData$ = this.patch.watch$('package-data').pipe(first())
+  readonly packageData$ = this.patch.watch$('packageData').pipe(first())
 
   constructor(
     private readonly embassyApi: ApiService,
@@ -116,7 +116,7 @@ export class NotificationsPage {
       component: BackupReportPage,
       componentProps: {
         report: notification.data,
-        timestamp: notification['created-at'],
+        timestamp: notification.createdAt,
       },
     })
     await modal.present()
diff --git a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
index 24adff639..88e9cb4a8 100644
--- a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
+++ b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
@@ -43,7 +43,7 @@ export class RestorePage {
       useMask: true,
       buttonText: 'Next',
       submitFn: async (password: string) => {
-        const passwordHash = target.entry['embassy-os']?.['password-hash'] || ''
+        const passwordHash = target.entry.startOs?.passwordHash || ''
         argon2.verify(passwordHash, password)
         await this.restoreFromBackup(target, password)
       },
@@ -71,7 +71,7 @@ export class RestorePage {
 
     try {
       const backupInfo = await this.embassyApi.getBackupInfo({
-        'target-id': target.id,
+        targetId: target.id,
         password,
       })
       this.presentModalSelect(target.id, backupInfo, password, oldPassword)
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
index 125e9f28e..31d3bce1e 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
@@ -18,11 +18,11 @@ import { Observable } from 'rxjs'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class BackingUpComponent {
-  readonly pkgs$ = this.patch.watch$('package-data').pipe(take(1))
+  readonly pkgs$ = this.patch.watch$('packageData').pipe(take(1))
   readonly backupProgress$ = this.patch.watch$(
-    'server-info',
-    'status-info',
-    'backup-progress',
+    'serverInfo',
+    'statusInfo',
+    'backupProgress',
   )
 
   constructor(private readonly patch: PatchDB<DataModel>) {}
@@ -33,7 +33,7 @@ export class BackingUpComponent {
 })
 export class PkgMainStatusPipe implements PipeTransform {
   transform(pkgId: string): Observable<PackageMainStatus> {
-    return this.patch.watch$('package-data', pkgId, 'status', 'main', 'status')
+    return this.patch.watch$('packageData', pkgId, 'status', 'main', 'status')
   }
 
   constructor(private readonly patch: PatchDB<DataModel>) {}
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
index 2d4d3901e..0467df102 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
@@ -84,9 +84,7 @@ export class ServerBackupPage {
       buttonText: 'Create Backup',
       submitFn: async (password: string) => {
         // confirm password matches current master password
-        const { 'password-hash': passwordHash } = await getServerInfo(
-          this.patch,
-        )
+        const { passwordHash } = await getServerInfo(this.patch)
         argon2.verify(passwordHash, password)
 
         // first time backup
@@ -95,8 +93,7 @@ export class ServerBackupPage {
           // existing backup
         } else {
           try {
-            const passwordHash =
-              target.entry['embassy-os']?.['password-hash'] || ''
+            const passwordHash = target.entry.startOs?.passwordHash || ''
 
             argon2.verify(passwordHash, password)
           } catch {
@@ -133,7 +130,7 @@ export class ServerBackupPage {
       useMask: true,
       buttonText: 'Create Backup',
       submitFn: async (oldPassword: string) => {
-        const passwordHash = target.entry['embassy-os']?.['password-hash'] || ''
+        const passwordHash = target.entry.startOs?.passwordHash || ''
 
         argon2.verify(passwordHash, oldPassword)
         await this.createBackup(target, password, oldPassword)
@@ -161,9 +158,9 @@ export class ServerBackupPage {
 
     try {
       await this.embassyApi.createBackup({
-        'target-id': target.id,
-        'package-ids': this.serviceIds,
-        'old-password': oldPassword || null,
+        targetId: target.id,
+        packageIds: this.serviceIds,
+        oldPassword: oldPassword || null,
         password,
       })
     } finally {
diff --git a/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html b/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
index 0926334aa..70b977ecc 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
@@ -74,7 +74,7 @@ <h2>
       <ion-item-divider>Memory</ion-item-divider>
       <ion-item>
         <ion-label>Percentage Used</ion-label>
-        <ion-note slot="end">{{ memory['percentage-used'].value }} %</ion-note>
+        <ion-note slot="end">{{ memory.percentageUsed }} %</ion-note>
       </ion-item>
       <ion-item>
         <ion-label>Total</ion-label>
@@ -94,15 +94,15 @@ <h2>
       </ion-item>
       <ion-item>
         <ion-label>zram Used</ion-label>
-        <ion-note slot="end">{{ memory['zram-used'].value }} MiB</ion-note>
+        <ion-note slot="end">{{ memory.zramUsed.value }} MiB</ion-note>
       </ion-item>
       <ion-item>
         <ion-label>zram Total</ion-label>
-        <ion-note slot="end">{{ memory['zram-total'].value }} MiB</ion-note>
+        <ion-note slot="end">{{ memory.zramTotal }} MiB</ion-note>
       </ion-item>
       <ion-item>
         <ion-label>zram Available</ion-label>
-        <ion-note slot="end">{{ memory['zram-available'].value }} MiB</ion-note>
+        <ion-note slot="end">{{ memory.available.value }} MiB</ion-note>
       </ion-item>
     </ion-item-group>
 
@@ -110,18 +110,18 @@ <h2>
       <ion-item-divider>CPU</ion-item-divider>
       <ion-item>
         <ion-label>Percentage Used</ion-label>
-        <ion-note slot="end">{{ cpu['percentage-used'].value }} %</ion-note>
+        <ion-note slot="end">{{ cpu.percentageUsed.value }} %</ion-note>
       </ion-item>
       <ion-item>
         <ion-label>User Space</ion-label>
         <ion-note slot="end">
-          <ion-text>{{ cpu['user-space'].value }} %</ion-text>
+          <ion-text>{{ cpu.userSpace.value }} %</ion-text>
         </ion-note>
       </ion-item>
       <ion-item>
         <ion-label>Kernel Space</ion-label>
         <ion-note slot="end">
-          <ion-text>{{ cpu['kernel-space'].value }} %</ion-text>
+          <ion-text>{{ cpu.kernelSpace.value }} %</ion-text>
         </ion-note>
       </ion-item>
       <ion-item>
@@ -138,7 +138,7 @@ <h2>
       <ion-item-divider>Disk</ion-item-divider>
       <ion-item>
         <ion-label>Percentage Used</ion-label>
-        <ion-note slot="end">{{ disk['percentage-used'].value }} %</ion-note>
+        <ion-note slot="end">{{ disk.percentageUsed.value }} %</ion-note>
       </ion-item>
       <ion-item>
         <ion-label>Capacity</ion-label>
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
index f16066874..02cba9052 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -16,7 +16,7 @@
   <!-- loaded -->
   <ion-item-group *ngIf="server$ | async as server; else loading">
     <ion-item
-      *ngIf="!server['ntp-synced']"
+      *ngIf="!server.ntpSynced"
       color="warning"
       class="ion-margin-bottom"
     >
@@ -62,15 +62,15 @@ <h2>{{ button.title }}</h2>
 
           <!-- "Create Backup" button only -->
           <p *ngIf="button.title === 'Create Backup'">
-            <ng-container *ngIf="server['status-info'] as statusInfo">
+            <ng-container *ngIf="server.statusInfo as statusInfo">
               <ion-text
-                [color]="server['last-backup'] | backupColor"
-                *ngIf="!statusInfo['backup-progress'] && !statusInfo['update-progress']"
+                [color]="server.lastBackup | backupColor"
+                *ngIf="!statusInfo.backupProgress && !statusInfo.updateProgress"
               >
-                Last Backup: {{ server['last-backup'] ? (server['last-backup'] |
-                date: 'medium') : 'never' }}
+                Last Backup: {{ server.lastBackup ? (server.lastBackup | date:
+                'medium') : 'never' }}
               </ion-text>
-              <span *ngIf="!!statusInfo['backup-progress']" class="inline">
+              <span *ngIf="!!statusInfo.backupProgress" class="inline">
                 <ion-spinner
                   color="success"
                   style="height: 12px; width: 12px; margin-right: 6px"
@@ -82,7 +82,7 @@ <h2>{{ button.title }}</h2>
           <!-- "Software Update" button only -->
           <p *ngIf="button.title === 'Software Update'">
             <ion-text
-              *ngIf="server['status-info'].updated; else notUpdated"
+              *ngIf="server.statusInfo.updated; else notUpdated"
               class="inline"
               color="warning"
             >
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index ff9cfc775..b479f1750 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -37,7 +37,7 @@ export class ServerShowPage {
   manageClicks = 0
   powerClicks = 0
 
-  readonly server$ = this.patch.watch$('server-info')
+  readonly server$ = this.patch.watch$('serverInfo')
   readonly showUpdate$ = this.eosService.showUpdate$
   readonly showDiskRepair$ = this.ClientStorageService.showDiskRepair$
 
@@ -141,7 +141,7 @@ export class ServerShowPage {
     }
 
     // confirm current password is correct
-    const { 'password-hash': passwordHash } = await getServerInfo(this.patch)
+    const { passwordHash } = await getServerInfo(this.patch)
     try {
       argon2.verify(passwordHash, value.currPass)
     } catch (e) {
@@ -160,8 +160,8 @@ export class ServerShowPage {
 
     try {
       await this.embassyApi.resetPassword({
-        'old-password': value.currPass,
-        'new-password': value.newPass,
+        oldPassword: value.currPass,
+        newPassword: value.newPass,
       })
       const toast = await this.toastCtrl.create({
         header: 'Password changed!',
@@ -221,7 +221,7 @@ export class ServerShowPage {
 
     try {
       await this.embassyApi.resetTor({
-        'wipe-state': wipeState,
+        wipeState: wipeState,
         reason: 'User triggered',
       })
       const toast = await this.toastCtrl.create({
diff --git a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
index 87dd8ef24..f9df6eb37 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
@@ -30,17 +30,17 @@ <h2>Git Hash</h2>
     <ion-item>
       <ion-label class="break-all">
         <h2>Tor</h2>
-        <p>{{ server['tor-address'] }}</p>
+        <p>{{ server.torAddress }}</p>
       </ion-label>
       <div slot="end">
-        <ion-button fill="clear" (click)="showQR(server['tor-address'])">
+        <ion-button fill="clear" (click)="showQR(server.torAddress)">
           <ion-icon
             slot="icon-only"
             name="qr-code-outline"
             size="small"
           ></ion-icon>
         </ion-button>
-        <ion-button fill="clear" (click)="copy(server['tor-address'])">
+        <ion-button fill="clear" (click)="copy(server.torAddress)">
           <ion-icon
             slot="icon-only"
             name="copy-outline"
@@ -52,13 +52,13 @@ <h2>Tor</h2>
     <ion-item>
       <ion-label class="break-all">
         <h2>LAN</h2>
-        <p>{{ server['lan-address'] }}</p>
+        <p>{{ server.lanAddress }}</p>
       </ion-label>
-      <ion-button slot="end" fill="clear" (click)="copy(server['lan-address'])">
+      <ion-button slot="end" fill="clear" (click)="copy(server.lanAddress)">
         <ion-icon slot="icon-only" name="copy-outline"></ion-icon>
       </ion-button>
     </ion-item>
-    <ng-container *ngFor="let iface of server['ip-info'] | keyvalue">
+    <ng-container *ngFor="let iface of server.ipInfo| keyvalue">
       <ion-item *tuiLet="iface.value.ipv4 as ipv4">
         <ion-label>
           <h2>{{ iface.key }} (IPv4)</h2>
@@ -92,13 +92,9 @@ <h2>Pubkey</h2>
     <ion-item>
       <ion-label>
         <h2>CA fingerprint</h2>
-        <p>{{ server['ca-fingerprint'] }}</p>
+        <p>{{ server.caFingerprint }}</p>
       </ion-label>
-      <ion-button
-        slot="end"
-        fill="clear"
-        (click)="copy(server['ca-fingerprint'])"
-      >
+      <ion-button slot="end" fill="clear" (click)="copy(server.caFingerprint)">
         <ion-icon slot="icon-only" name="copy-outline"></ion-icon>
       </ion-button>
     </ion-item>
diff --git a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts
index c80003bb1..0055ff6c1 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts
@@ -13,7 +13,7 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ServerSpecsPage {
-  readonly server$ = this.patch.watch$('server-info')
+  readonly server$ = this.patch.watch$('serverInfo')
 
   constructor(
     private readonly toastCtrl: ToastController,
diff --git a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
index 4e291b5fc..3e349b49b 100644
--- a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
@@ -52,10 +52,8 @@
         ></ion-icon>
         <ion-label>
           <h1>{{ getPlatformName(currentSession.metadata.platforms) }}</h1>
-          <h2>
-            Last Active: {{ currentSession['last-active'] | date : 'medium' }}
-          </h2>
-          <p>{{ currentSession['user-agent'] }}</p>
+          <h2>Last Active: {{ currentSession.lastActive| date : 'medium' }}</h2>
+          <p>{{ currentSession.userAgent }}</p>
         </ion-label>
       </ion-item>
 
@@ -80,8 +78,8 @@ <h2>
           ></ion-icon>
           <ion-label>
             <h1>{{ getPlatformName(session.metadata.platforms) }}</h1>
-            <h2>Last Active: {{ session['last-active'] | date : 'medium' }}</h2>
-            <p>{{ session['user-agent'] }}</p>
+            <h2>Last Active: {{ session.lastActive | date : 'medium' }}</h2>
+            <p>{{ session.userAgent }}</p>
           </ion-label>
           <ion-button
             slot="end"
diff --git a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
index b06deab5a..d6a1a42e5 100644
--- a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
@@ -35,8 +35,7 @@ export class SessionsPage {
         })
         .sort((a, b) => {
           return (
-            new Date(b['last-active']).valueOf() -
-            new Date(a['last-active']).valueOf()
+            new Date(b.lastActive).valueOf() - new Date(a.lastActive).valueOf()
           )
         })
     } catch (e: any) {
diff --git a/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html b/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
index 4ac7d5439..61737639b 100644
--- a/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
@@ -66,7 +66,7 @@ <h2>
         <ion-icon slot="start" name="key-outline" size="large"></ion-icon>
         <ion-label>
           <h1>{{ ssh.hostname }}</h1>
-          <h2>{{ ssh['created-at'] | date: 'medium' }}</h2>
+          <h2>{{ ssh.createdAt| date: 'medium' }}</h2>
           <p>{{ ssh.alg }} {{ ssh.fingerprint }}</p>
         </ion-label>
         <ion-button
diff --git a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
index 9a83774cb..011704cc2 100644
--- a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -129,7 +129,7 @@ <h2>
       </ion-item>
 
       <ion-item-divider>Available Networks</ion-item-divider>
-      <ng-container *ngFor="let avWifi of wifi['available-wifi']">
+      <ng-container *ngFor="let avWifi of wifi.availableWifi">
         <ion-item
           button
           detail="false"
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.html b/web/projects/ui/src/app/pages/updates/updates.page.html
index c31294920..a31d889ff 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.html
+++ b/web/projects/ui/src/app/pages/updates/updates.page.html
@@ -39,8 +39,7 @@
                     <h1 style="line-height: 1.3">{{ pkg.manifest.title }}</h1>
                     <h2 class="inline">
                       <span>
-                        {{ local['state-info'].manifest.version | displayEmver
-                        }}
+                        {{ local.stateInfo.manifest.version | displayEmver }}
                       </span>
                       &nbsp;
                       <ion-icon name="arrow-forward"></ion-icon>
@@ -57,8 +56,8 @@ <h2 class="inline">
                   </ion-label>
                   <div slot="end" style="margin-left: 4px">
                     <round-progress
-                      *ngIf="local['state-info'].state === 'updating' else notUpdating"
-                      [current]="(local['state-info']['installing-info'].progress.overall | installingProgress) || 0"
+                      *ngIf="local.stateInfo.state === 'updating' else notUpdating"
+                      [current]="(local.stateInfo.installingInfo.progress.overall | installingProgress) || 0"
                       [max]="100"
                       [radius]="13"
                       [stroke]="3"
@@ -86,9 +85,7 @@ <h2 class="inline">
                 <div class="ion-padding" slot="content">
                   <div class="notes">
                     <h5>What's new</h5>
-                    <p
-                      [innerHTML]="pkg.manifest['release-notes'] | markdown"
-                    ></p>
+                    <p [innerHTML]="pkg.manifest.releaseNotes| markdown"></p>
                   </div>
                   <ion-button
                     fill="clear"
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.ts b/web/projects/ui/src/app/pages/updates/updates.page.ts
index 20feabd0b..ef0281920 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.page.ts
@@ -42,7 +42,7 @@ export class UpdatesPage {
   readonly data$: Observable<UpdatesData> = combineLatest({
     hosts: this.marketplaceService.getKnownHosts$(true),
     marketplace: this.marketplaceService.getMarketplace$(),
-    localPkgs: this.patch.watch$('package-data').pipe(
+    localPkgs: this.patch.watch$('packageData').pipe(
       map(pkgs =>
         Object.values(pkgs).reduce((acc, curr) => {
           if (isInstalled(curr) || isUpdating(curr)) return { ...acc, curr }
@@ -171,7 +171,7 @@ export class FilterUpdatesPipe implements PipeTransform {
         localPkg &&
         this.emver.compare(
           manifest.version,
-          localPkg['state-info'].manifest.version,
+          localPkg.stateInfo.manifest.version,
         ) === 1
       )
     })
diff --git a/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts b/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
index 5a0f74767..bc496b219 100644
--- a/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
+++ b/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
@@ -27,7 +27,7 @@ export class HealthComponent {
   ] as const
 
   readonly data$ = combineLatest([
-    inject(PatchDB<DataModel>).watch$('package-data'),
+    inject(PatchDB<DataModel>).watch$('packageData'),
     inject(DepErrorService).depErrors$,
   ]).pipe(
     map(([data, depErrors]) => {
diff --git a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
index 0c9bab5df..a6bbb52be 100644
--- a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
+++ b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
@@ -8,7 +8,7 @@ import { Manifest } from '@start9labs/marketplace'
   name: 'hasUi',
 })
 export class UiPipe implements PipeTransform {
-  transform(interfaces: PackageDataEntry['service-interfaces']): boolean {
+  transform(interfaces: PackageDataEntry['serviceInterfaces']): boolean {
     return interfaces ? hasUi(interfaces) : false
   }
 }
diff --git a/web/projects/ui/src/app/pkg-config/config-types.ts b/web/projects/ui/src/app/pkg-config/config-types.ts
index 08f0b9d26..f73dbc0a4 100644
--- a/web/projects/ui/src/app/pkg-config/config-types.ts
+++ b/web/projects/ui/src/app/pkg-config/config-types.ts
@@ -24,8 +24,6 @@ export type ValueSpecOf<T extends ValueType> = T extends 'string'
   ? ValueSpecList
   : T extends 'object'
   ? ValueSpecObject
-  : T extends 'pointer'
-  ? ValueSpecPointer
   : T extends 'union'
   ? ValueSpecUnion
   : never
@@ -60,16 +58,6 @@ export interface ValueSpecUnion {
   default: string
 }
 
-export interface ValueSpecPointer extends WithStandalone {
-  type: 'pointer'
-  subtype: 'package' | 'system'
-  'package-id': string
-  target: 'lan-address' | 'tor-address' | 'config' | 'tor-key'
-  interface: string // will only exist if target = tor-key || tor-address || lan-address
-  selector?: string // will only exist if target = config
-  multi?: boolean // will only exist if target = config
-}
-
 export interface ValueSpecObject extends WithStandalone {
   type: 'object'
   spec: ConfigSpec
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 8f6a907bc..7786e3566 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -16,16 +16,16 @@ import { Log } from '@start9labs/shared'
 
 export module Mock {
   export const ServerUpdated: ServerStatusInfo = {
-    'backup-progress': null,
-    'update-progress': null,
+    backupProgress: null,
+    updateProgress: null,
     updated: true,
     restarting: false,
-    'shutting-down': false,
+    shuttingDown: false,
   }
   export const MarketplaceEos: RR.GetMarketplaceEosRes = {
     version: '0.3.5.1',
     headline: 'Our biggest release ever.',
-    'release-notes': {
+    releaseNotes: {
       '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1',
       '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4',
       '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3',
@@ -51,19 +51,19 @@ export module Mock {
     id: 'bitcoind',
     title: 'Bitcoin Core',
     version: '0.21.0',
-    'git-hash': 'abcdefgh',
+    gitHash: 'abcdefgh',
     description: {
       short: 'A Bitcoin full node by Bitcoin Core.',
       long: 'Bitcoin is a decentralized consensus protocol and settlement network.',
     },
     replaces: ['banks', 'governments'],
-    'release-notes': 'Taproot, Schnorr, and more.',
+    releaseNotes: 'Taproot, Schnorr, and more.',
     license: 'MIT',
-    'wrapper-repo': 'https://github.com/start9labs/bitcoind-wrapper',
-    'upstream-repo': 'https://github.com/bitcoin/bitcoin',
-    'support-site': 'https://bitcoin.org',
-    'marketing-site': 'https://bitcoin.org',
-    'donation-url': 'https://start9.com',
+    wrapperRepo: 'https://github.com/start9labs/bitcoind-wrapper',
+    upstreamRepo: 'https://github.com/bitcoin/bitcoin',
+    supportSite: 'https://bitcoin.org',
+    marketingSite: 'https://bitcoin.org',
+    donationUrl: 'https://start9.com',
     alerts: {
       install: 'Bitcoin can take over a week to sync.',
       uninstall:
@@ -72,9 +72,9 @@ export module Mock {
       start: 'Starting Bitcoin is good for your health.',
       stop: null,
     },
-    'os-version': '0.2.12',
+    osVersion: '0.2.12',
     dependencies: {},
-    'has-config': true,
+    hasConfig: true,
   }
 
   export const MockManifestLnd: Manifest = {
@@ -85,13 +85,13 @@ export module Mock {
       short: 'A bolt spec compliant client.',
       long: 'More info about LND. More info about LND. More info about LND.',
     },
-    'release-notes': 'Dual funded channels!',
+    releaseNotes: 'Dual funded channels!',
     license: 'MIT',
-    'wrapper-repo': 'https://github.com/start9labs/lnd-wrapper',
-    'upstream-repo': 'https://github.com/lightningnetwork/lnd',
-    'support-site': 'https://lightning.engineering/',
-    'marketing-site': 'https://lightning.engineering/',
-    'donation-url': null,
+    wrapperRepo: 'https://github.com/start9labs/lnd-wrapper',
+    upstreamRepo: 'https://github.com/lightningnetwork/lnd',
+    supportSite: 'https://lightning.engineering/',
+    marketingSite: 'https://lightning.engineering/',
+    donationUrl: null,
     alerts: {
       install: null,
       uninstall: null,
@@ -100,7 +100,7 @@ export module Mock {
       start: 'Starting LND is good for your health.',
       stop: null,
     },
-    'os-version': '0.2.12',
+    osVersion: '0.2.12',
     dependencies: {
       bitcoind: {
         description: 'LND needs bitcoin to live.',
@@ -112,25 +112,25 @@ export module Mock {
         optional: true,
       },
     },
-    'has-config': true,
+    hasConfig: true,
   }
 
   export const MockManifestBitcoinProxy: Manifest = {
     id: 'btc-rpc-proxy',
     title: 'Bitcoin Proxy',
     version: '0.2.2',
-    'git-hash': 'lmnopqrx',
+    gitHash: 'lmnopqrx',
     description: {
       short: 'A super charger for your Bitcoin node.',
       long: 'More info about Bitcoin Proxy. More info about Bitcoin Proxy. More info about Bitcoin Proxy.',
     },
-    'release-notes': 'Even better support for Bitcoin and wallets!',
+    releaseNotes: 'Even better support for Bitcoin and wallets!',
     license: 'MIT',
-    'wrapper-repo': 'https://github.com/start9labs/btc-rpc-proxy-wrapper',
-    'upstream-repo': 'https://github.com/Kixunil/btc-rpc-proxy',
-    'support-site': '',
-    'marketing-site': '',
-    'donation-url': 'https://start9.com',
+    wrapperRepo: 'https://github.com/start9labs/btc-rpc-proxy-wrapper',
+    upstreamRepo: 'https://github.com/Kixunil/btc-rpc-proxy',
+    supportSite: '',
+    marketingSite: '',
+    donationUrl: 'https://start9.com',
     alerts: {
       install: 'Testing install alert',
       uninstall: null,
@@ -138,14 +138,14 @@ export module Mock {
       start: null,
       stop: null,
     },
-    'os-version': '0.2.12',
+    osVersion: '0.2.12',
     dependencies: {
       bitcoind: {
         description: 'Bitcoin Proxy requires a Bitcoin node.',
         optional: false,
       },
     },
-    'has-config': false,
+    hasConfig: false,
   }
 
   export const BitcoinDep: DependencyMetadata = {
@@ -178,8 +178,8 @@ export module Mock {
         },
         categories: ['bitcoin', 'cryptocurrency'],
         versions: ['0.19.0', '0.20.0', '0.21.0'],
-        'dependency-metadata': {},
-        'published-at': new Date().toISOString(),
+        dependencyMetadata: {},
+        publishedAt: new Date().toISOString(),
       },
       '0.20.0': {
         icon: BTC_ICON,
@@ -191,8 +191,8 @@ export module Mock {
         },
         categories: ['bitcoin', 'cryptocurrency'],
         versions: ['0.19.0', '0.20.0', '0.21.0'],
-        'dependency-metadata': {},
-        'published-at': new Date().toISOString(),
+        dependencyMetadata: {},
+        publishedAt: new Date().toISOString(),
       },
       '0.21.0': {
         icon: BTC_ICON,
@@ -201,13 +201,13 @@ export module Mock {
         manifest: {
           ...Mock.MockManifestBitcoind,
           version: '0.21.0',
-          'release-notes':
+          releaseNotes:
             'For a complete list of changes, please visit <a href="https://bitcoincore.org/en/releases/0.21.0/">https://bitcoincore.org/en/releases/0.21.0/</a><br /><ul><li>Taproot!</li><li>New RPCs</li><li>Experimental Descriptor Wallets</li></ul>',
         },
         categories: ['bitcoin', 'cryptocurrency'],
         versions: ['0.19.0', '0.20.0', '0.21.0'],
-        'dependency-metadata': {},
-        'published-at': new Date().toISOString(),
+        dependencyMetadata: {},
+        publishedAt: new Date().toISOString(),
       },
       latest: {
         icon: BTC_ICON,
@@ -215,13 +215,13 @@ export module Mock {
         instructions: 'instructionsUrl',
         manifest: {
           ...Mock.MockManifestBitcoind,
-          'release-notes':
+          releaseNotes:
             'For a complete list of changes, please visit <a href="https://bitcoincore.org/en/releases/0.21.0/" target="_blank">https://bitcoincore.org/en/releases/0.21.0/</a><br />Or in [markdown](https://bitcoincore.org/en/releases/0.21.0/)<ul><li>Taproot!</li><li>New RPCs</li><li>Experimental Descriptor Wallets</li></ul>',
         },
         categories: ['bitcoin', 'cryptocurrency'],
         versions: ['0.19.0', '0.20.0', '0.21.0'],
-        'dependency-metadata': {},
-        'published-at': new Date().toISOString(),
+        dependencyMetadata: {},
+        publishedAt: new Date().toISOString(),
       },
     },
     lnd: {
@@ -232,15 +232,15 @@ export module Mock {
         manifest: {
           ...Mock.MockManifestLnd,
           version: '0.11.0',
-          'release-notes': 'release notes for LND 0.11.0',
+          releaseNotes: 'release notes for LND 0.11.0',
         },
         categories: ['bitcoin', 'lightning', 'cryptocurrency'],
         versions: ['0.11.0', '0.11.1'],
-        'dependency-metadata': {
+        dependencyMetadata: {
           bitcoind: BitcoinDep,
           'btc-rpc-proxy': ProxyDep,
         },
-        'published-at': new Date().toISOString(),
+        publishedAt: new Date().toISOString(),
       },
       '0.11.1': {
         icon: LND_ICON,
@@ -249,15 +249,15 @@ export module Mock {
         manifest: {
           ...Mock.MockManifestLnd,
           version: '0.11.1',
-          'release-notes': 'release notes for LND 0.11.1',
+          releaseNotes: 'release notes for LND 0.11.1',
         },
         categories: ['bitcoin', 'lightning', 'cryptocurrency'],
         versions: ['0.11.0', '0.11.1'],
-        'dependency-metadata': {
+        dependencyMetadata: {
           bitcoind: BitcoinDep,
           'btc-rpc-proxy': ProxyDep,
         },
-        'published-at': new Date().toISOString(),
+        publishedAt: new Date().toISOString(),
       },
       latest: {
         icon: LND_ICON,
@@ -266,11 +266,11 @@ export module Mock {
         manifest: Mock.MockManifestLnd,
         categories: ['bitcoin', 'lightning', 'cryptocurrency'],
         versions: ['0.11.0', '0.11.1'],
-        'dependency-metadata': {
+        dependencyMetadata: {
           bitcoind: BitcoinDep,
           'btc-rpc-proxy': ProxyDep,
         },
-        'published-at': new Date(new Date().valueOf() + 10).toISOString(),
+        publishedAt: new Date(new Date().valueOf() + 10).toISOString(),
       },
     },
     'btc-rpc-proxy': {
@@ -281,10 +281,10 @@ export module Mock {
         manifest: Mock.MockManifestBitcoinProxy,
         categories: ['bitcoin'],
         versions: ['0.2.2'],
-        'dependency-metadata': {
+        dependencyMetadata: {
           bitcoind: BitcoinDep,
         },
-        'published-at': new Date().toISOString(),
+        publishedAt: new Date().toISOString(),
       },
     },
   }
@@ -295,8 +295,8 @@ export module Mock {
   export const Notifications: ServerNotifications = [
     {
       id: 1,
-      'package-id': null,
-      'created-at': '2019-12-26T14:20:30.872Z',
+      packageId: null,
+      createdAt: '2019-12-26T14:20:30.872Z',
       code: 1,
       level: NotificationLevel.Success,
       title: 'Backup Complete',
@@ -315,8 +315,8 @@ export module Mock {
     },
     {
       id: 2,
-      'package-id': null,
-      'created-at': '2019-12-26T14:20:30.872Z',
+      packageId: null,
+      createdAt: '2019-12-26T14:20:30.872Z',
       code: 2,
       level: NotificationLevel.Warning,
       title: 'SSH Key Added',
@@ -325,8 +325,8 @@ export module Mock {
     },
     {
       id: 3,
-      'package-id': null,
-      'created-at': '2019-12-26T14:20:30.872Z',
+      packageId: null,
+      createdAt: '2019-12-26T14:20:30.872Z',
       code: 3,
       level: NotificationLevel.Info,
       title: 'SSH Key Removed',
@@ -335,8 +335,8 @@ export module Mock {
     },
     {
       id: 4,
-      'package-id': 'bitcoind',
-      'created-at': '2019-12-26T14:20:30.872Z',
+      packageId: 'bitcoind',
+      createdAt: '2019-12-26T14:20:30.872Z',
       code: 4,
       level: NotificationLevel.Error,
       title: 'Service Crashed',
@@ -361,7 +361,7 @@ export module Mock {
         },
       },
       memory: {
-        'percentage-used': {
+        percentageUsed: {
           value: '30.7',
           unit: '%',
         },
@@ -377,29 +377,29 @@ export module Mock {
           value: '8784.97',
           unit: 'MiB',
         },
-        'zram-total': {
+        zramTotal: {
           value: '7992.00',
           unit: 'MiB',
         },
-        'zram-available': {
+        zramAvailable: {
           value: '7882.50',
           unit: 'MiB',
         },
-        'zram-used': {
+        zramUsed: {
           value: '109.50',
           unit: 'MiB',
         },
       },
       cpu: {
-        'percentage-used': {
+        percentageUsed: {
           value: '8.4',
           unit: '%',
         },
-        'user-space': {
+        userSpace: {
           value: '7.0',
           unit: '%',
         },
-        'kernel-space': {
+        kernelSpace: {
           value: '1.4',
           unit: '%',
         },
@@ -425,7 +425,7 @@ export module Mock {
           value: '992.59',
           unit: 'GB',
         },
-        'percentage-used': {
+        percentageUsed: {
           value: '46.4',
           unit: '%',
         },
@@ -487,15 +487,15 @@ export module Mock {
     current: 'b7b1a9cef4284f00af9e9dda6e676177',
     sessions: {
       '9513226517c54ddd8107d6d7b9d8aed7': {
-        'last-active': '2021-07-14T20:49:17.774Z',
-        'user-agent': 'AppleWebKit/{WebKit Rev} (KHTML, like Gecko)',
+        lastActive: '2021-07-14T20:49:17.774Z',
+        userAgent: 'AppleWebKit/{WebKit Rev} (KHTML, like Gecko)',
         metadata: {
           platforms: ['iphone', 'mobileweb', 'mobile', 'ios'],
         },
       },
       b7b1a9cef4284f00af9e9dda6e676177: {
-        'last-active': '2021-06-14T20:49:17.774Z',
-        'user-agent':
+        lastActive: '2021-06-14T20:49:17.774Z',
+        userAgent:
           'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0',
         metadata: {
           platforms: ['desktop'],
@@ -514,13 +514,13 @@ export module Mock {
 
   export const SshKeys: RR.GetSSHKeysRes = [
     {
-      'created-at': new Date().toISOString(),
+      createdAt: new Date().toISOString(),
       alg: 'ed25519',
       hostname: 'Matt Key',
       fingerprint: '28:d2:7e:78:61:b4:bf:g2:de:24:15:96:4e:d4:15:53',
     },
     {
-      'created-at': new Date().toISOString(),
+      createdAt: new Date().toISOString(),
       alg: 'ed25519',
       hostname: 'Aiden Key',
       fingerprint: '12:f8:7e:78:61:b4:bf:e2:de:24:15:96:4e:d4:72:53',
@@ -528,7 +528,7 @@ export module Mock {
   ]
 
   export const SshKey: RR.AddSSHKeyRes = {
-    'created-at': new Date().toISOString(),
+    createdAt: new Date().toISOString(),
     alg: 'ed25519',
     hostname: 'Lucy Key',
     fingerprint: '44:44:7e:78:61:b4:bf:g2:de:24:15:96:4e:d4:15:53',
@@ -542,7 +542,7 @@ export module Mock {
     },
     connected: 'Goosers',
     country: 'US',
-    'available-wifi': [
+    availableWifi: [
       {
         ssid: 'Goosers a billion',
         strength: 40,
@@ -568,13 +568,13 @@ export module Mock {
       path: '/Desktop/startos-backups',
       username: 'TestUser',
       mountable: false,
-      'embassy-os': {
+      startOs: {
         version: '0.3.0',
         full: true,
-        'password-hash':
+        passwordHash:
           // password is asdfasdf
           '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-        'wrapped-key': '',
+        wrappedKey: '',
       },
     },
     // 'ftcvewdnkemfksdm': {
@@ -585,7 +585,7 @@ export module Mock {
     //   used: 0,
     //   model: 'Evo SATA 2.5',
     //   vendor: 'Samsung',
-    //   'embassy-os': null,
+    //   startOs: null,
     // },
     csgashbdjkasnd: {
       type: 'cifs',
@@ -593,7 +593,7 @@ export module Mock {
       path: '/Desktop/startos-backups-2',
       username: 'TestUser',
       mountable: true,
-      'embassy-os': null,
+      startOs: null,
     },
     powjefhjbnwhdva: {
       type: 'disk',
@@ -603,13 +603,13 @@ export module Mock {
       used: 100000000000,
       model: null,
       vendor: 'SSK',
-      'embassy-os': {
+      startOs: {
         version: '0.3.0',
         full: true,
         // password is asdfasdf
-        'password-hash':
+        passwordHash:
           '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-        'wrapped-key': '',
+        wrappedKey: '',
       },
     },
   }
@@ -617,17 +617,17 @@ export module Mock {
   export const BackupInfo: RR.GetBackupInfoRes = {
     version: '0.3.0',
     timestamp: new Date().toISOString(),
-    'package-backups': {
+    packageBackups: {
       bitcoind: {
         title: 'Bitcoin Core',
         version: '0.21.0',
-        'os-version': '0.3.0',
+        osVersion: '0.3.0',
         timestamp: new Date().toISOString(),
       },
       'btc-rpc-proxy': {
         title: 'Bitcoin Proxy',
         version: '0.2.2',
-        'os-version': '0.3.0',
+        osVersion: '0.3.0',
         timestamp: new Date().toISOString(),
       },
     },
@@ -1062,17 +1062,7 @@ export module Mock {
         warning: 'Careful changing this',
       },
       variants: {
-        internal: {
-          'lan-address': {
-            name: 'LAN Address',
-            type: 'pointer',
-            subtype: 'package',
-            target: 'lan-address',
-            'package-id': 'bitcoind',
-            description: 'the lan address',
-            interface: 'asdf',
-          },
-        },
+        internal: {},
         external: {
           'emergency-contact': {
             name: 'Emergency Contact',
@@ -1385,12 +1375,12 @@ export module Mock {
   export const MockDependencyConfig = MockConfig
 
   export const bitcoind: PackageDataEntry<InstalledState> = {
-    'state-info': {
+    stateInfo: {
       state: PackageState.Installed,
       manifest: MockManifestBitcoind,
     },
     icon: '/assets/img/service-icons/bitcoind.svg',
-    'last-backup': null,
+    lastBackup: null,
     status: {
       configured: true,
       main: {
@@ -1398,10 +1388,10 @@ export module Mock {
         started: new Date().toISOString(),
         health: {},
       },
-      'dependency-config-errors': {},
+      dependencyConfigErrors: {},
     },
     actions: {}, // @TODO need mocks
-    'service-interfaces': {
+    serviceInterfaces: {
       ui: {
         id: 'ui',
         hasPrimary: false,
@@ -1617,28 +1607,28 @@ export module Mock {
         },
       },
     },
-    'current-dependencies': {},
-    'dependency-info': {},
-    'marketplace-url': 'https://registry.start9.com/',
-    'developer-key': 'developer-key',
+    currentDependencies: {},
+    dependencyInfo: {},
+    marketplaceUrl: 'https://registry.start9.com/',
+    developerKey: 'developer-key',
   }
 
   export const bitcoinProxy: PackageDataEntry<InstalledState> = {
-    'state-info': {
+    stateInfo: {
       state: PackageState.Installed,
       manifest: MockManifestBitcoinProxy,
     },
     icon: '/assets/img/service-icons/btc-rpc-proxy.png',
-    'last-backup': null,
+    lastBackup: null,
     status: {
       configured: false,
       main: {
         status: PackageMainStatus.Stopped,
       },
-      'dependency-config-errors': {},
+      dependencyConfigErrors: {},
     },
     actions: {},
-    'service-interfaces': {
+    serviceInterfaces: {
       ui: {
         id: 'ui',
         hasPrimary: false,
@@ -1746,40 +1736,40 @@ export module Mock {
         },
       },
     },
-    'current-dependencies': {
+    currentDependencies: {
       bitcoind: {
         versionRange: '>=26.0.0',
-        'health-checks': [],
+        healthChecks: [],
       },
     },
-    'dependency-info': {
+    dependencyInfo: {
       bitcoind: {
         title: Mock.MockManifestBitcoind.title,
         icon: 'assets/img/service-icons/bitcoind.svg',
       },
     },
-    'marketplace-url': 'https://registry.start9.com/',
-    'developer-key': 'developer-key',
+    marketplaceUrl: 'https://registry.start9.com/',
+    developerKey: 'developer-key',
   }
 
   export const lnd: PackageDataEntry<InstalledState> = {
-    'state-info': {
+    stateInfo: {
       state: PackageState.Installed,
       manifest: MockManifestLnd,
     },
     icon: '/assets/img/service-icons/lnd.png',
-    'last-backup': null,
+    lastBackup: null,
     status: {
       configured: true,
       main: {
         status: PackageMainStatus.Stopped,
       },
-      'dependency-config-errors': {
+      dependencyConfigErrors: {
         'btc-rpc-proxy': 'Username not found',
       },
     },
     actions: {},
-    'service-interfaces': {
+    serviceInterfaces: {
       grpc: {
         id: 'grpc',
         hasPrimary: false,
@@ -1991,17 +1981,17 @@ export module Mock {
         },
       },
     },
-    'current-dependencies': {
+    currentDependencies: {
       bitcoind: {
         versionRange: '>=26.0.0',
-        'health-checks': [],
+        healthChecks: [],
       },
       'btc-rpc-proxy': {
         versionRange: '>2.0.0', // @TODO
-        'health-checks': [],
+        healthChecks: [],
       },
     },
-    'dependency-info': {
+    dependencyInfo: {
       bitcoind: {
         title: Mock.MockManifestBitcoind.title,
         icon: 'assets/img/service-icons/bitcoind.svg',
@@ -2011,8 +2001,8 @@ export module Mock {
         icon: 'assets/img/service-icons/btc-rpc-proxy.png',
       },
     },
-    'marketplace-url': 'https://registry.start9.com/',
-    'developer-key': 'developer-key',
+    marketplaceUrl: 'https://registry.start9.com/',
+    developerKey: 'developer-key',
   }
 
   export const LocalPkgs: { [key: string]: PackageDataEntry<InstalledState> } =
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 7dc83e2e6..0bab23a5a 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -30,8 +30,8 @@ export module RR {
   export type LogoutRes = null
 
   export type ResetPasswordReq = {
-    'old-password': string
-    'new-password': string
+    oldPassword: string
+    newPassword: string
   } // auth.reset-password
   export type ResetPasswordRes = null
 
@@ -51,14 +51,14 @@ export module RR {
 
   export type FollowServerLogsReq = { limit?: number } // server.logs.follow & server.kernel-logs.follow
   export type FollowServerLogsRes = {
-    'start-cursor': string
+    startCursor: string
     guid: string
   }
 
   export type GetServerMetricsReq = {} // server.metrics
   export type GetServerMetricsRes = Metrics
 
-  export type UpdateServerReq = { 'marketplace-url': string } // server.update
+  export type UpdateServerReq = { marketplaceUrl: string } // server.update
   export type UpdateServerRes = 'updating' | 'no-updates'
 
   export type RestartServerReq = {} // server.restart
@@ -71,7 +71,7 @@ export module RR {
   export type SystemRebuildRes = null
 
   export type ResetTorReq = {
-    'wipe-state': boolean
+    wipeState: boolean
     reason: string
   } // net.tor.reset
   export type ResetTorRes = null
@@ -114,7 +114,7 @@ export module RR {
     connected: string | null
     country: string | null
     ethernet: boolean
-    'available-wifi': AvailableWifi[]
+    availableWifi: AvailableWifi[]
   }
 
   export type AddWifiReq = {
@@ -163,14 +163,14 @@ export module RR {
   export type RemoveBackupTargetReq = { id: string } // backup.target.cifs.remove
   export type RemoveBackupTargetRes = null
 
-  export type GetBackupInfoReq = { 'target-id': string; password: string } // backup.target.info
+  export type GetBackupInfoReq = { targetId: string; password: string } // backup.target.info
   export type GetBackupInfoRes = BackupInfo
 
   export type CreateBackupReq = {
     // backup.create
-    'target-id': string
-    'package-ids': string[]
-    'old-password': string | null
+    targetId: string
+    packageIds: string[]
+    oldPassword: string | null
     password: string
   }
   export type CreateBackupRes = null
@@ -192,9 +192,9 @@ export module RR {
 
   export type InstallPackageReq = {
     id: string
-    'version-spec'?: string
-    'version-priority'?: 'min' | 'max'
-    'marketplace-url': string
+    versionSpec?: string
+    versionPriority?: 'min' | 'max'
+    marketplaceUrl: string
   } // package.install
   export type InstallPackageRes = null
 
@@ -210,15 +210,15 @@ export module RR {
   export type RestorePackagesReq = {
     // package.backup.restore
     ids: string[]
-    'target-id': string
-    'old-password': string | null
+    targetId: string
+    oldPassword: string | null
     password: string
   }
   export type RestorePackagesRes = null
 
   export type ExecutePackageActionReq = {
     id: string
-    'action-id': string
+    actionId: string
     input?: object
   } // package.action
   export type ExecutePackageActionRes = ActionResponse
@@ -236,12 +236,12 @@ export module RR {
   export type UninstallPackageRes = null
 
   export type DryConfigureDependencyReq = {
-    'dependency-id': string
-    'dependent-id': string
+    dependencyId: string
+    dependentId: string
   } // package.dependency.configure.dry
   export type DryConfigureDependencyRes = {
-    'old-config': object
-    'new-config': object
+    oldConfig: object
+    newConfig: object
     spec: ConfigSpec
   }
 
@@ -253,10 +253,10 @@ export module RR {
 
   // marketplace
 
-  export type GetMarketplaceInfoReq = { 'server-id': string }
+  export type GetMarketplaceInfoReq = { serverId: string }
   export type GetMarketplaceInfoRes = StoreInfo
 
-  export type GetMarketplaceEosReq = { 'server-id': string }
+  export type GetMarketplaceEosReq = { serverId: string }
   export type GetMarketplaceEosRes = MarketplaceEOS
 
   export type GetMarketplacePackagesReq = {
@@ -265,7 +265,7 @@ export module RR {
     category?: string
     query?: string
     page?: number
-    'per-page'?: number
+    perPage?: number
   }
   export type GetMarketplacePackagesRes = MarketplacePkg[]
 
@@ -276,7 +276,7 @@ export module RR {
 export interface MarketplaceEOS {
   version: string
   headline: string
-  'release-notes': { [version: string]: string }
+  releaseNotes: { [version: string]: string }
 }
 
 export interface Breakages {
@@ -306,23 +306,23 @@ export interface Metrics {
   }
   memory: {
     total: MetricData
-    'percentage-used': MetricData
+    percentageUsed: MetricData
     used: MetricData
     available: MetricData
-    'zram-total': MetricData
-    'zram-used': MetricData
-    'zram-available': MetricData
+    zramTotal: MetricData
+    zramUsed: MetricData
+    zramAvailable: MetricData
   }
   cpu: {
-    'percentage-used': MetricData
+    percentageUsed: MetricData
     idle: MetricData
-    'user-space': MetricData
-    'kernel-space': MetricData
+    userSpace: MetricData
+    kernelSpace: MetricData
     wait: MetricData
   }
   disk: {
     capacity: MetricData
-    'percentage-used': MetricData
+    percentageUsed: MetricData
     used: MetricData
     available: MetricData
   }
@@ -336,8 +336,8 @@ export interface Metric {
 }
 
 export interface Session {
-  'last-active': string
-  'user-agent': string
+  lastActive: string
+  userAgent: string
   metadata: SessionMetadata
 }
 
@@ -372,7 +372,7 @@ export interface DiskBackupTarget {
   label: string | null
   capacity: number
   used: number | null
-  'embassy-os': StartOSDiskInfo | null
+  startOs: StartOSDiskInfo | null
 }
 
 export interface CifsBackupTarget {
@@ -381,7 +381,7 @@ export interface CifsBackupTarget {
   path: string
   username: string
   mountable: boolean
-  'embassy-os': StartOSDiskInfo | null
+  startOs: StartOSDiskInfo | null
 }
 
 export type RecoverySource = DiskRecoverySource | CifsRecoverySource
@@ -402,7 +402,7 @@ export interface CifsRecoverySource {
 export interface BackupInfo {
   version: string
   timestamp: string
-  'package-backups': {
+  packageBackups: {
     [id: string]: PackageBackupInfo
   }
 }
@@ -410,7 +410,7 @@ export interface BackupInfo {
 export interface PackageBackupInfo {
   title: string
   version: string
-  'os-version': string
+  osVersion: string
   timestamp: string
 }
 
@@ -419,7 +419,7 @@ export interface ServerSpecs {
 }
 
 export interface SSHKey {
-  'created-at': string
+  createdAt: string
   alg: string
   hostname: string
   fingerprint: string
@@ -429,8 +429,8 @@ export type ServerNotifications = ServerNotification<any>[]
 
 export interface ServerNotification<T extends number> {
   id: number
-  'package-id': string | null
-  'created-at': string
+  packageId: string | null
+  createdAt: string
   code: T
   level: NotificationLevel
   title: string
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 73765b44d..12b6f1d1a 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -158,7 +158,7 @@ export class LiveApiService extends ApiService {
 
   async updateServer(url?: string): Promise<RR.UpdateServerRes> {
     const params = {
-      'marketplace-url': url || this.config.marketplace.start9,
+      marketplaceUrl: url || this.config.marketplace.start9,
     }
     return this.rpcRequest({ method: 'server.update', params })
   }
@@ -205,7 +205,7 @@ export class LiveApiService extends ApiService {
 
   async getEos(): Promise<RR.GetMarketplaceEosRes> {
     const { id } = await getServerInfo(this.patch)
-    const qp: RR.GetMarketplaceEosReq = { 'server-id': id }
+    const qp: RR.GetMarketplaceEosReq = { serverId: id }
 
     return this.marketplaceProxy(
       '/eos/v0/latest',
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index deabffdd2..6b423b244 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -216,8 +216,8 @@ export class MockApiService extends ApiService {
 
     return {
       entries,
-      'start-cursor': 'startCursor',
-      'end-cursor': 'endCursor',
+      startCursor: 'start-cursor',
+      endCursor: 'end-cursor',
     }
   }
 
@@ -229,8 +229,8 @@ export class MockApiService extends ApiService {
 
     return {
       entries,
-      'start-cursor': 'startCursor',
-      'end-cursor': 'endCursor',
+      startCursor: 'start-cursor',
+      endCursor: 'end-cursor',
     }
   }
 
@@ -240,8 +240,8 @@ export class MockApiService extends ApiService {
 
     return {
       entries,
-      'start-cursor': 'startCursor',
-      'end-cursor': 'endCursor',
+      startCursor: 'startCursor',
+      endCursor: 'end-cursor',
     }
   }
 
@@ -250,7 +250,7 @@ export class MockApiService extends ApiService {
   ): Promise<RR.FollowServerLogsRes> {
     await pauseFor(2000)
     return {
-      'start-cursor': 'start-cursor',
+      startCursor: 'start-cursor',
       guid: '7251d5be-645f-4362-a51b-3a85be92b31e',
     }
   }
@@ -260,7 +260,7 @@ export class MockApiService extends ApiService {
   ): Promise<RR.FollowServerLogsRes> {
     await pauseFor(2000)
     return {
-      'start-cursor': 'start-cursor',
+      startCursor: 'start-cursor',
       guid: '7251d5be-645f-4362-a51b-3a85be92b31e',
     }
   }
@@ -270,7 +270,7 @@ export class MockApiService extends ApiService {
   ): Promise<RR.FollowServerLogsRes> {
     await pauseFor(2000)
     return {
-      'start-cursor': 'start-cursor',
+      startCursor: 'start-cursor',
       guid: '7251d5be-645f-4362-a51b-3a85be92b31e',
     }
   }
@@ -312,7 +312,7 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: '/server-info/status-info/update-progress',
+        path: '/serverInfo/statusInfo/updateProgress',
         value: initialProgress,
       },
     ]
@@ -329,7 +329,7 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: '/server-info/status-info/restarting',
+        path: '/serverInfo/statusInfo/restarting',
         value: true,
       },
     ]
@@ -339,7 +339,7 @@ export class MockApiService extends ApiService {
       const patch2 = [
         {
           op: PatchOp.REPLACE,
-          path: '/server-info/status-info/restarting',
+          path: '/serverInfo/statusInfo/restarting',
           value: false,
         },
       ]
@@ -357,7 +357,7 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: '/server-info/status-info/shutting-down',
+        path: '/serverInfo/statusInfo/shuttingDown',
         value: true,
       },
     ]
@@ -367,7 +367,7 @@ export class MockApiService extends ApiService {
       const patch2 = [
         {
           op: PatchOp.REPLACE,
-          path: '/server-info/status-info/shutting-down',
+          path: '/serverInfo/statusInfo/shuttingDown',
           value: false,
         },
       ]
@@ -439,7 +439,7 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: '/server-info/unread-notification-count',
+        path: '/serverInfo/unreadNotificationCount',
         value: 0,
       },
     ]
@@ -529,7 +529,7 @@ export class MockApiService extends ApiService {
         path: path.replace(/\\/g, '/'),
         username,
         mountable: true,
-        'embassy-os': null,
+        startOs: null,
       },
     }
   }
@@ -565,13 +565,13 @@ export class MockApiService extends ApiService {
 
   async createBackup(params: RR.CreateBackupReq): Promise<RR.CreateBackupRes> {
     await pauseFor(2000)
-    const path = '/server-info/status-info/backup-progress'
-    const ids = params['package-ids']
+    const path = '/serverInfo/statusInfo/backupProgress'
+    const ids = params.packageIds
 
     setTimeout(async () => {
       for (let i = 0; i < ids.length; i++) {
         const id = ids[i]
-        const appPath = `/package-data/${id}/status/main/status`
+        const appPath = `/packageData/${id}/status/main/status`
         const appPatch = [
           {
             op: PatchOp.REPLACE,
@@ -655,8 +655,8 @@ export class MockApiService extends ApiService {
     }
     return {
       entries,
-      'start-cursor': 'startCursor',
-      'end-cursor': 'endCursor',
+      startCursor: 'startCursor',
+      endCursor: 'end-cursor',
     }
   }
 
@@ -665,7 +665,7 @@ export class MockApiService extends ApiService {
   ): Promise<RR.FollowPackageLogsRes> {
     await pauseFor(2000)
     return {
-      'start-cursor': 'start-cursor',
+      startCursor: 'start-cursor',
       guid: '7251d5be-645f-4362-a51b-3a85be92b31e',
     }
   }
@@ -679,17 +679,17 @@ export class MockApiService extends ApiService {
       this.updateProgress(params.id)
     }, 1000)
 
-    const manifest = Mock.LocalPkgs[params.id]['state-info'].manifest
+    const manifest = Mock.LocalPkgs[params.id].stateInfo.manifest
 
     const patch: Operation<
       PackageDataEntry<InstallingState | UpdatingState>
     >[] = [
       {
         op: PatchOp.ADD,
-        path: `/package-data/${params.id}`,
+        path: `/packageData/${params.id}`,
         value: {
           ...Mock.LocalPkgs[params.id],
-          'state-info': {
+          stateInfo: {
             // if installing
             state: PackageState.Installing,
 
@@ -698,8 +698,8 @@ export class MockApiService extends ApiService {
             // manifest,
 
             // both
-            'installing-info': {
-              'new-manifest': manifest,
+            installingInfo: {
+              newManifest: manifest,
               progress: PROGRESS,
             },
           },
@@ -735,7 +735,7 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: `/package-data/${params.id}/status/configured`,
+        path: `/packageData/${params.id}/status/configured`,
         value: true,
       },
     ]
@@ -755,13 +755,13 @@ export class MockApiService extends ApiService {
 
       return {
         op: PatchOp.ADD,
-        path: `/package-data/${id}`,
+        path: `/packageData/${id}`,
         value: {
           ...Mock.LocalPkgs[id],
-          'state-info': {
+          stateInfo: {
             state: PackageState.Restoring,
-            'installing-info': {
-              'new-manifest': Mock.LocalPkgs[id]['state-info'].manifest!,
+            installingInfo: {
+              newManifest: Mock.LocalPkgs[id].stateInfo.manifest!,
               progress: PROGRESS,
             },
           },
@@ -782,7 +782,7 @@ export class MockApiService extends ApiService {
   }
 
   async startPackage(params: RR.StartPackageReq): Promise<RR.StartPackageRes> {
-    const path = `/package-data/${params.id}/status/main`
+    const path = `/packageData/${params.id}/status/main`
 
     await pauseFor(2000)
 
@@ -865,7 +865,7 @@ export class MockApiService extends ApiService {
   ): Promise<RR.RestartPackageRes> {
     // first enact stop
     await pauseFor(2000)
-    const path = `/package-data/${params.id}/status/main`
+    const path = `/packageData/${params.id}/status/main`
 
     setTimeout(async () => {
       const patch2: Operation<any>[] = [
@@ -941,7 +941,7 @@ export class MockApiService extends ApiService {
 
   async stopPackage(params: RR.StopPackageReq): Promise<RR.StopPackageRes> {
     await pauseFor(2000)
-    const path = `/package-data/${params.id}/status/main`
+    const path = `/packageData/${params.id}/status/main`
 
     setTimeout(() => {
       const patch2 = [
@@ -981,7 +981,7 @@ export class MockApiService extends ApiService {
       const patch2: RemoveOperation[] = [
         {
           op: PatchOp.REMOVE,
-          path: `/package-data/${params.id}`,
+          path: `/packageData/${params.id}`,
         },
       ]
       this.mockRevision(patch2)
@@ -990,7 +990,7 @@ export class MockApiService extends ApiService {
     const patch = [
       {
         op: PatchOp.REPLACE,
-        path: `/package-data/${params.id}/state-info/state`,
+        path: `/packageData/${params.id}/stateInfo/state`,
         value: PackageState.Removing,
       },
     ]
@@ -1005,8 +1005,8 @@ export class MockApiService extends ApiService {
   ): Promise<RR.DryConfigureDependencyRes> {
     await pauseFor(2000)
     return {
-      'old-config': Mock.MockConfig,
-      'new-config': Mock.MockDependencyConfig,
+      oldConfig: Mock.MockConfig,
+      newConfig: Mock.MockDependencyConfig,
       spec: Mock.ConfigSpec,
     }
   }
@@ -1028,7 +1028,7 @@ export class MockApiService extends ApiService {
         const patches: Operation<any>[] = [
           {
             op: PatchOp.REPLACE,
-            path: `/package-data/${id}/state-info/installing-info/progress/phases/${i}/progress`,
+            path: `/packageData/${id}/stateInfo/installingInfo/progress/phases/${i}/progress`,
             value: true,
           },
         ]
@@ -1041,7 +1041,7 @@ export class MockApiService extends ApiService {
 
           patches.push({
             op: PatchOp.REPLACE,
-            path: `/package-data/${id}/state-info/installing-info/progress/overall/done`,
+            path: `/packageData/${id}/stateInfo/installingInfo/progress/overall/done`,
             value: progress.overall.done,
           })
         }
@@ -1058,7 +1058,7 @@ export class MockApiService extends ApiService {
           const patches: Operation<any>[] = [
             {
               op: PatchOp.REPLACE,
-              path: `/package-data/${id}/state-info/installing-info/progress/phases/${i}/progress/done`,
+              path: `/packageData/${id}/stateInfo/installingInfo/progress/phases/${i}/progress/done`,
               value: phase.progress.done,
             },
           ]
@@ -1071,7 +1071,7 @@ export class MockApiService extends ApiService {
 
             patches.push({
               op: PatchOp.REPLACE,
-              path: `/package-data/${id}/state-info/installing-info/progress/overall/done`,
+              path: `/packageData/${id}/stateInfo/installingInfo/progress/overall/done`,
               value: progress.overall.done,
             })
           }
@@ -1083,7 +1083,7 @@ export class MockApiService extends ApiService {
             this.mockRevision([
               {
                 op: PatchOp.REPLACE,
-                path: `/package-data/${id}/state-info/installing-info/progress/phases/${i}/progress`,
+                path: `/packageData/${id}/stateInfo/installingInfo/progress/phases/${i}/progress`,
                 value: true,
               },
             ])
@@ -1096,7 +1096,7 @@ export class MockApiService extends ApiService {
     this.mockRevision([
       {
         op: PatchOp.REPLACE,
-        path: `/package-data/${id}/state-info/installing-info/progress/overall`,
+        path: `/packageData/${id}/stateInfo/installingInfo/progress/overall`,
         value: true,
       },
     ])
@@ -1105,10 +1105,10 @@ export class MockApiService extends ApiService {
     const patch2: Operation<StateInfo>[] = [
       {
         op: PatchOp.REPLACE,
-        path: `/package-data/${id}/state-info`,
+        path: `/packageData/${id}/stateInfo`,
         value: {
           state: PackageState.Installed,
-          manifest: Mock.LocalPkgs[id]['state-info'].manifest,
+          manifest: Mock.LocalPkgs[id].stateInfo.manifest,
         },
       },
     ]
@@ -1122,7 +1122,7 @@ export class MockApiService extends ApiService {
     const patch0 = [
       {
         op: PatchOp.REPLACE,
-        path: `/server-info/status-info/update-progress/size`,
+        path: `/serverInfo/statusInfo/updateProgress/size`,
         value: size,
       },
     ]
@@ -1134,7 +1134,7 @@ export class MockApiService extends ApiService {
       const patch = [
         {
           op: PatchOp.REPLACE,
-          path: `/server-info/status-info/update-progress/downloaded`,
+          path: `/serverInfo/statusInfo/updateProgress/downloaded`,
           value: downloaded,
         },
       ]
@@ -1144,7 +1144,7 @@ export class MockApiService extends ApiService {
     const patch2 = [
       {
         op: PatchOp.REPLACE,
-        path: `/server-info/status-info/update-progress/downloaded`,
+        path: `/serverInfo/statusInfo/updateProgress/downloaded`,
         value: size,
       },
     ]
@@ -1154,12 +1154,12 @@ export class MockApiService extends ApiService {
       const patch3: Operation<ServerStatus>[] = [
         {
           op: PatchOp.REPLACE,
-          path: '/server-info/status',
+          path: '/serverInfo/status',
           value: ServerStatus.Updated,
         },
         {
           op: PatchOp.REMOVE,
-          path: '/server-info/status-info/update-progress',
+          path: '/serverInfo/statusInfo/updateProgress',
         },
       ]
       this.mockRevision(patch3)
@@ -1168,7 +1168,7 @@ export class MockApiService extends ApiService {
       const patch4 = [
         {
           op: PatchOp.REPLACE,
-          path: '/server-info/status',
+          path: '/serverInfo/status',
           value: ServerStatus.Running,
         },
       ]
@@ -1178,7 +1178,7 @@ export class MockApiService extends ApiService {
       const patch6 = [
         {
           op: PatchOp.REPLACE,
-          path: '/server-info/status-info',
+          path: '/serverInfo/statusInfo',
           value: Mock.ServerUpdated,
         },
       ]
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index db9f5c86b..5bd69293c 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -10,7 +10,7 @@ import { BUILT_IN_WIDGETS } from '../../pages/widgets/built-in/widgets'
 export const mockPatchData: DataModel = {
   ui: {
     name: `Matt's Server`,
-    'ack-welcome': '1.0.0',
+    ackWelcome: '1.0.0',
     theme: 'Dark',
     widgets: BUILT_IN_WIDGETS.filter(
       ({ id }) =>
@@ -20,8 +20,8 @@ export const mockPatchData: DataModel = {
         id === 'metrics',
     ),
     marketplace: {
-      'selected-url': 'https://registry.start9.com/',
-      'known-hosts': {
+      selectedUrl: 'https://registry.start9.com/',
+      knownHosts: {
         'https://registry.start9.com/': {
           name: 'Start9 Registry',
         },
@@ -31,21 +31,20 @@ export const mockPatchData: DataModel = {
         },
       },
     },
-    dev: {},
     gaming: {
       snake: {
-        'high-score': 0,
+        highScore: 0,
       },
     },
-    'ack-instructions': {},
+    ackInstructions: {},
   },
-  'server-info': {
+  serverInfo: {
     id: 'abcdefgh',
     version: '0.3.5.1',
-    'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(),
-    'lan-address': 'https://adjective-noun.local',
-    'tor-address': 'https://myveryownspecialtoraddress.onion',
-    'ip-info': {
+    lastBackup: new Date(new Date().valueOf() - 604800001).toISOString(),
+    lanAddress: 'https://adjective-noun.local',
+    torAddress: 'https://myveryownspecialtoraddress.onion',
+    ipInfo: {
       eth0: {
         ipv4: '10.0.0.1',
         ipv6: null,
@@ -55,28 +54,28 @@ export const mockPatchData: DataModel = {
         ipv6: 'FE80:CD00:0000:0CDE:1257:0000:211E:729CD',
       },
     },
-    'last-wifi-region': null,
-    'unread-notification-count': 4,
+    lastWifiRegion: null,
+    unreadNotificationCount: 4,
     // password is asdfasdf
-    'password-hash':
+    passwordHash:
       '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-    'eos-version-compat': '>=0.3.0 <=0.3.0.1',
-    'status-info': {
-      'backup-progress': null,
+    eosVersionCompat: '>=0.3.0 <=0.3.0.1',
+    statusInfo: {
+      backupProgress: null,
       updated: false,
-      'update-progress': null,
+      updateProgress: null,
       restarting: false,
-      'shutting-down': false,
+      shuttingDown: false,
     },
     hostname: 'random-words',
     pubkey: 'npub1sg6plzptd64u62a878hep2kev88swjh3tw00gjsfl8f237lmu63q0uf63m',
-    'ca-fingerprint': 'SHA-256: 63 2B 11 99 44 40 17 DF 37 FC C3 DF 0F 3D 15',
-    'ntp-synced': false,
+    caFingerprint: 'SHA-256: 63 2B 11 99 44 40 17 DF 37 FC C3 DF 0F 3D 15',
+    ntpSynced: false,
     platform: 'x86_64-nonfree',
   },
-  'package-data': {
+  packageData: {
     bitcoind: {
-      'state-info': {
+      stateInfo: {
         state: PackageState.Installed,
         manifest: {
           ...Mock.MockManifestBitcoind,
@@ -84,7 +83,7 @@ export const mockPatchData: DataModel = {
         },
       },
       icon: '/assets/img/service-icons/bitcoind.svg',
-      'last-backup': null,
+      lastBackup: null,
       status: {
         configured: true,
         main: {
@@ -116,10 +115,10 @@ export const mockPatchData: DataModel = {
             },
           },
         },
-        'dependency-config-errors': {},
+        dependencyConfigErrors: {},
       },
       actions: {}, // @TODO
-      'service-interfaces': {
+      serviceInterfaces: {
         ui: {
           id: 'ui',
           hasPrimary: false,
@@ -335,13 +334,13 @@ export const mockPatchData: DataModel = {
           },
         },
       },
-      'current-dependencies': {},
-      'dependency-info': {},
-      'marketplace-url': 'https://registry.start9.com/',
-      'developer-key': 'developer-key',
+      currentDependencies: {},
+      dependencyInfo: {},
+      marketplaceUrl: 'https://registry.start9.com/',
+      developerKey: 'developer-key',
     },
     lnd: {
-      'state-info': {
+      stateInfo: {
         state: PackageState.Installed,
         manifest: {
           ...Mock.MockManifestLnd,
@@ -349,18 +348,18 @@ export const mockPatchData: DataModel = {
         },
       },
       icon: '/assets/img/service-icons/lnd.png',
-      'last-backup': null,
+      lastBackup: null,
       status: {
         configured: true,
         main: {
           status: PackageMainStatus.Stopped,
         },
-        'dependency-config-errors': {
+        dependencyConfigErrors: {
           'btc-rpc-proxy': 'This is a config unsatisfied error',
         },
       },
       actions: {},
-      'service-interfaces': {
+      serviceInterfaces: {
         grpc: {
           id: 'grpc',
           hasPrimary: false,
@@ -570,17 +569,17 @@ export const mockPatchData: DataModel = {
           },
         },
       },
-      'current-dependencies': {
+      currentDependencies: {
         bitcoind: {
           versionRange: '>=26.0.0',
-          'health-checks': [],
+          healthChecks: [],
         },
         'btc-rpc-proxy': {
           versionRange: '>2.0.0',
-          'health-checks': [],
+          healthChecks: [],
         },
       },
-      'dependency-info': {
+      dependencyInfo: {
         bitcoind: {
           title: 'Bitcoin Core',
           icon: 'assets/img/service-icons/bitcoind.svg',
@@ -590,8 +589,8 @@ export const mockPatchData: DataModel = {
           icon: 'assets/img/service-icons/btc-rpc-proxy.png',
         },
       },
-      'marketplace-url': 'https://registry.start9.com/',
-      'developer-key': 'developer-key',
+      marketplaceUrl: 'https://registry.start9.com/',
+      developerKey: 'developer-key',
     },
   },
 }
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index 71719ae4a..2bae31e63 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -63,9 +63,7 @@ export class ConfigService {
   }
 
   /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
-  launchableAddress(
-    interfaces: PackageDataEntry['service-interfaces'],
-  ): string {
+  launchableAddress(interfaces: PackageDataEntry['serviceInterfaces']): string {
     const ui = Object.values(interfaces).find(i => i.type === 'ui')
 
     if (!ui) return ''
@@ -128,7 +126,7 @@ export class ConfigService {
 }
 
 export function hasUi(
-  interfaces: PackageDataEntry['service-interfaces'],
+  interfaces: PackageDataEntry['serviceInterfaces'],
 ): boolean {
   return Object.values(interfaces).some(iface => iface.type === 'ui')
 }
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index c73beabda..50020f5fe 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -20,7 +20,7 @@ export type PkgDependencyErrors = Record<string, DependencyError | null>
   providedIn: 'root',
 })
 export class DepErrorService {
-  readonly depErrors$ = this.patch.watch$('package-data').pipe(
+  readonly depErrors$ = this.patch.watch$('packageData').pipe(
     map(pkgs =>
       Object.keys(pkgs)
         .map(id => ({
@@ -53,7 +53,7 @@ export class DepErrorService {
   }
 
   private getDepErrors(
-    pkgs: DataModel['package-data'],
+    pkgs: DataModel['packageData'],
     pkgId: string,
     outerErrors: AllDependencyErrors,
   ): PkgDependencyErrors {
@@ -71,7 +71,7 @@ export class DepErrorService {
   }
 
   private getDepError(
-    pkgs: DataModel['package-data'],
+    pkgs: DataModel['packageData'],
     pkg: PackageDataEntry<InstalledState>,
     depId: string,
     outerErrors: AllDependencyErrors,
@@ -79,14 +79,14 @@ export class DepErrorService {
     const dep = pkgs[depId]
 
     // not installed
-    if (!dep || dep['state-info'].state !== PackageState.Installed) {
+    if (!dep || dep.stateInfo.state !== PackageState.Installed) {
       return {
         type: DependencyErrorType.NotInstalled,
       }
     }
 
-    const versionRange = pkg['current-dependencies'][depId].versionRange
-    const depManifest = dep['state-info'].manifest
+    const versionRange = pkg.currentDependencies[depId].versionRange
+    const depManifest = dep.stateInfo.manifest
 
     // incorrect version
     if (!this.emver.satisfies(depManifest.version, versionRange)) {
@@ -98,9 +98,7 @@ export class DepErrorService {
     }
 
     // invalid config
-    if (
-      Object.values(pkg.status['dependency-config-errors']).some(err => !!err)
-    ) {
+    if (Object.values(pkg.status.dependencyConfigErrors).some(err => !!err)) {
       return {
         type: DependencyErrorType.ConfigUnsatisfied,
       }
@@ -120,7 +118,7 @@ export class DepErrorService {
 
     // health check failure
     if (depStatus === PackageMainStatus.Running) {
-      for (let id of pkg['current-dependencies'][depId]['health-checks']) {
+      for (let id of pkg.currentDependencies[depId].healthChecks) {
         if (dep.status.main.health[id]?.result !== HealthResult.Success) {
           return {
             type: DependencyErrorType.HealthChecksFailed,
@@ -144,14 +142,14 @@ export class DepErrorService {
   }
 }
 
-function currentDeps(pkgs: DataModel['package-data'], id: string): string[] {
-  return Object.keys(pkgs[id]?.['current-dependencies'] || {}).filter(
+function currentDeps(pkgs: DataModel['packageData'], id: string): string[] {
+  return Object.keys(pkgs[id]?.currentDependencies || {}).filter(
     depId => depId !== id,
   )
 }
 
 function dependencyDepth(
-  pkgs: DataModel['package-data'],
+  pkgs: DataModel['packageData'],
   id: string,
   depth = 0,
 ): number {
diff --git a/web/projects/ui/src/app/services/eos.service.ts b/web/projects/ui/src/app/services/eos.service.ts
index 396c84223..dcd1d0de0 100644
--- a/web/projects/ui/src/app/services/eos.service.ts
+++ b/web/projects/ui/src/app/services/eos.service.ts
@@ -15,13 +15,13 @@ export class EOSService {
   eos?: MarketplaceEOS
   updateAvailable$ = new BehaviorSubject<boolean>(false)
 
-  readonly updating$ = this.patch.watch$('server-info', 'status-info').pipe(
-    map(status => !!status['update-progress'] || status.updated),
+  readonly updating$ = this.patch.watch$('serverInfo', 'statusInfo').pipe(
+    map(status => !!status.updateProgress || status.updated),
     distinctUntilChanged(),
   )
 
   readonly backingUp$ = this.patch
-    .watch$('server-info', 'status-info', 'backup-progress')
+    .watch$('serverInfo', 'statusInfo', 'backupProgress')
     .pipe(
       map(obj => !!obj),
       distinctUntilChanged(),
diff --git a/web/projects/ui/src/app/services/form.service.ts b/web/projects/ui/src/app/services/form.service.ts
index 66d368b50..ee8f0f136 100644
--- a/web/projects/ui/src/app/services/form.service.ts
+++ b/web/projects/ui/src/app/services/form.service.ts
@@ -89,7 +89,6 @@ export class FormService {
       UntypedFormGroup | UntypedFormArray | UntypedFormControl
     > = {}
     Object.entries(config).map(([key, spec]) => {
-      if (spec.type === 'pointer') return
       group[key] = this.getFormEntry(spec, current ? current[key] : undefined)
     })
     return this.formBuilder.group(group, { validators })
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index 9592e7da1..ac9d4a8f4 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -39,7 +39,7 @@ import { ClientStorageService } from './client-storage.service'
 @Injectable()
 export class MarketplaceService implements AbstractMarketplaceService {
   private readonly knownHosts$: Observable<StoreIdentity[]> = this.patch
-    .watch$('ui', 'marketplace', 'known-hosts')
+    .watch$('ui', 'marketplace', 'knownHosts')
     .pipe(
       map(hosts => {
         const { start9, community } = this.config.marketplace
@@ -73,8 +73,8 @@ export class MarketplaceService implements AbstractMarketplaceService {
   private readonly selectedHost$: Observable<StoreIdentity> = this.patch
     .watch$('ui', 'marketplace')
     .pipe(
-      distinctUntilKeyChanged('selected-url'),
-      map(({ 'selected-url': url, 'known-hosts': hosts }) =>
+      distinctUntilKeyChanged('selectedUrl'),
+      map(({ selectedUrl: url, knownHosts: hosts }) =>
         toStoreIdentity(url, hosts[url]),
       ),
       shareReplay({ bufferSize: 1, refCount: true }),
@@ -171,9 +171,9 @@ export class MarketplaceService implements AbstractMarketplaceService {
   ): Observable<MarketplacePkg> {
     return this.patch.watch$('ui', 'marketplace').pipe(
       switchMap(uiMarketplace => {
-        const url = optionalUrl || uiMarketplace['selected-url']
+        const url = optionalUrl || uiMarketplace.selectedUrl
 
-        if (version !== '*' || !uiMarketplace['known-hosts'][url]) {
+        if (version !== '*' || !uiMarketplace.knownHosts[url]) {
           return this.fetchPackage$(id, version, url)
         }
 
@@ -206,18 +206,18 @@ export class MarketplaceService implements AbstractMarketplaceService {
   ): Promise<void> {
     const params: RR.InstallPackageReq = {
       id,
-      'version-spec': `=${version}`,
-      'marketplace-url': url,
+      versionSpec: `=${version}`,
+      marketplaceUrl: url,
     }
 
     await this.api.installPackage(params)
   }
 
   fetchInfo$(url: string): Observable<StoreInfo> {
-    return this.patch.watch$('server-info').pipe(
+    return this.patch.watch$('serverInfo').pipe(
       take(1),
       switchMap(serverInfo => {
-        const qp: RR.GetMarketplaceInfoReq = { 'server-id': serverInfo.id }
+        const qp: RR.GetMarketplaceInfoReq = { serverId: serverInfo.id }
         return this.api.marketplaceProxy<RR.GetMarketplaceInfoRes>(
           '/package/v0/info',
           qp,
@@ -276,7 +276,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
     const qp: RR.GetMarketplacePackagesReq = {
       ...params,
       page: 1,
-      'per-page': 100,
+      perPage: 100,
     }
     if (qp.ids) qp.ids = JSON.stringify(qp.ids)
 
@@ -306,7 +306,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
   ): Promise<void> {
     if (oldName !== newName) {
       this.api.setDbValue<string>(
-        ['marketplace', 'known-hosts', url, 'name'],
+        ['marketplace', 'knownHosts', url, 'name'],
         newName,
       )
     }
diff --git a/web/projects/ui/src/app/services/patch-data.service.ts b/web/projects/ui/src/app/services/patch-data.service.ts
index 23ee15925..5372a665c 100644
--- a/web/projects/ui/src/app/services/patch-data.service.ts
+++ b/web/projects/ui/src/app/services/patch-data.service.ts
@@ -25,7 +25,7 @@ export class PatchDataService extends Observable<DataModel> {
       // check for updates to eOS and services
       this.checkForUpdates()
       // show eos welcome message
-      this.showEosWelcome(ui['ack-welcome'])
+      this.showEosWelcome(ui.ackWelcome)
     }),
     share(),
   )
@@ -60,7 +60,7 @@ export class PatchDataService extends Observable<DataModel> {
     })
     modal.onWillDismiss().then(() => {
       this.embassyApi
-        .setDbValue<string>(['ack-welcome'], this.config.version)
+        .setDbValue<string>(['ackWelcome'], this.config.version)
         .catch()
     })
 
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index 9f90e798f..537e15329 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -1,28 +1,25 @@
 import { Url } from '@start9labs/shared'
 import { Manifest } from '@start9labs/marketplace'
-import { BasicInfo } from 'src/app/pages/developer-routes/developer-menu/form-info'
 import { types } from '@start9labs/start-sdk'
-import { InputSpec } from '@start9labs/start-sdk/cjs/sdk/lib/config/configTypes'
 import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
 type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo
 
 export interface DataModel {
-  'server-info': ServerInfo
-  'package-data': { [id: string]: PackageDataEntry }
+  serverInfo: ServerInfo
+  packageData: { [id: string]: PackageDataEntry }
   ui: UIData
 }
 
 export interface UIData {
   name: string | null
-  'ack-welcome': string // eOS emver
+  ackWelcome: string // eOS emver
   marketplace: UIMarketplaceData
-  dev: DevData
   gaming: {
     snake: {
-      'high-score': number
+      highScore: number
     }
   }
-  'ack-instructions': Record<string, boolean>
+  ackInstructions: Record<string, boolean>
   theme: string
   widgets: readonly Widget[]
 }
@@ -41,8 +38,8 @@ export interface Widget {
 }
 
 export interface UIMarketplaceData {
-  'selected-url': string
-  'known-hosts': {
+  selectedUrl: string
+  knownHosts: {
     'https://registry.start9.com/': UIStore
     'https://community-registry.start9.com/': UIStore
     [url: string]: UIStore
@@ -53,33 +50,22 @@ export interface UIStore {
   name?: string
 }
 
-export interface DevData {
-  [id: string]: DevProjectData
-}
-
-export interface DevProjectData {
-  name: string
-  instructions: string
-  config: string
-  'basic-info'?: BasicInfo
-}
-
 export interface ServerInfo {
   id: string
   version: string
-  'last-backup': string | null
-  'lan-address': Url
-  'tor-address': Url
-  'ip-info': IpInfo
-  'last-wifi-region': string | null
-  'unread-notification-count': number
-  'status-info': ServerStatusInfo
-  'eos-version-compat': string
-  'password-hash': string
+  lastBackup: string | null
+  lanAddress: Url
+  torAddress: Url
+  ipInfo: IpInfo
+  lastWifiRegion: string | null
+  unreadNotificationCount: number
+  statusInfo: ServerStatusInfo
+  eosVersionCompat: string
+  passwordHash: string
   hostname: string
   pubkey: string
-  'ca-fingerprint': string
-  'ntp-synced': boolean
+  caFingerprint: string
+  ntpSynced: boolean
   platform: string
 }
 
@@ -91,15 +77,15 @@ export interface IpInfo {
 }
 
 export interface ServerStatusInfo {
-  'backup-progress': null | {
+  backupProgress: null | {
     [packageId: string]: {
       complete: boolean
     }
   }
   updated: boolean
-  'update-progress': { size: number | null; downloaded: number } | null
+  updateProgress: { size: number | null; downloaded: number } | null
   restarting: boolean
-  'shutting-down': boolean
+  shuttingDown: boolean
 }
 
 export enum ServerStatus {
@@ -109,21 +95,21 @@ export enum ServerStatus {
 }
 
 export type PackageDataEntry<T extends StateInfo = StateInfo> = {
-  'state-info': T
+  stateInfo: T
   icon: Url
   status: Status
   actions: Record<string, ActionMetadata>
-  'last-backup': string | null
-  'current-dependencies': { [id: string]: CurrentDependencyInfo }
-  'dependency-info': {
+  lastBackup: string | null
+  currentDependencies: { [id: string]: CurrentDependencyInfo }
+  dependencyInfo: {
     [id: string]: {
       title: string
       icon: Url
     }
   }
-  'service-interfaces': Record<string, ServiceInterfaceWithHostInfo>
-  'marketplace-url': string | null
-  'developer-key': string
+  serviceInterfaces: Record<string, ServiceInterfaceWithHostInfo>
+  marketplaceUrl: string | null
+  developerKey: string
 }
 
 export type StateInfo = InstalledState | InstallingState | UpdatingState
@@ -135,12 +121,12 @@ export type InstalledState = {
 
 export type InstallingState = {
   state: PackageState.Installing | PackageState.Restoring
-  'installing-info': InstallingInfo
+  installingInfo: InstallingInfo
 }
 
 export type UpdatingState = {
   state: PackageState.Updating
-  'installing-info': InstallingInfo
+  installingInfo: InstallingInfo
   manifest: Manifest
 }
 
@@ -154,13 +140,13 @@ export enum PackageState {
 
 export interface CurrentDependencyInfo {
   versionRange: string
-  'health-checks': string[] // array of health check IDs
+  healthChecks: string[] // array of health check IDs
 }
 
 export interface Status {
   configured: boolean
   main: MainStatus
-  'dependency-config-errors': { [id: string]: string | null }
+  dependencyConfigErrors: { [id: string]: string | null }
 }
 
 export type MainStatus =
@@ -250,7 +236,7 @@ export interface HealthCheckResultFailure {
 
 export type InstallingInfo = {
   progress: FullProgress
-  'new-manifest': Manifest
+  newManifest: Manifest
 }
 
 export type FullProgress = {
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index cda895e89..7e1f52b49 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -22,12 +22,12 @@ export function renderPkgStatus(
   let dependency: DependencyStatus | null = null
   let health: HealthStatus | null = null
 
-  if (pkg['state-info'].state === PackageState.Installed) {
+  if (pkg.stateInfo.state === PackageState.Installed) {
     primary = getPrimaryStatus(pkg.status)
     dependency = getDependencyStatus(depErrors)
     health = getHealthStatus(pkg.status)
   } else {
-    primary = pkg['state-info'].state as string as PrimaryStatus
+    primary = pkg.stateInfo.state as string as PrimaryStatus
   }
 
   return { primary, dependency, health }
diff --git a/web/projects/ui/src/app/services/time-service.ts b/web/projects/ui/src/app/services/time-service.ts
index 641144dae..3b58da744 100644
--- a/web/projects/ui/src/app/services/time-service.ts
+++ b/web/projects/ui/src/app/services/time-service.ts
@@ -32,7 +32,7 @@ export class TimeService {
 
   readonly now$ = combineLatest([
     this.time$,
-    this.patch.watch$('server-info', 'ntp-synced'),
+    this.patch.watch$('serverInfo', 'ntpSynced'),
   ]).pipe(
     map(([time, synced]) => ({
       value: time.now,
diff --git a/web/projects/ui/src/app/services/ui-launcher.service.ts b/web/projects/ui/src/app/services/ui-launcher.service.ts
index 82250048a..badbc7a3e 100644
--- a/web/projects/ui/src/app/services/ui-launcher.service.ts
+++ b/web/projects/ui/src/app/services/ui-launcher.service.ts
@@ -12,7 +12,7 @@ export class UiLauncherService {
     private readonly config: ConfigService,
   ) {}
 
-  launch(interfaces: PackageDataEntry['service-interfaces']): void {
+  launch(interfaces: PackageDataEntry['serviceInterfaces']): void {
     this.windowRef.open(
       this.config.launchableAddress(interfaces),
       '_blank',
diff --git a/web/projects/ui/src/app/util/dry-update.ts b/web/projects/ui/src/app/util/dry-update.ts
index 36d220327..472a48389 100644
--- a/web/projects/ui/src/app/util/dry-update.ts
+++ b/web/projects/ui/src/app/util/dry-update.ts
@@ -4,16 +4,16 @@ import { getManifest } from './get-package-data'
 
 export function dryUpdate(
   { id, version }: { id: string; version: string },
-  pkgs: DataModel['package-data'],
+  pkgs: DataModel['packageData'],
   emver: Emver,
 ): string[] {
   return Object.values(pkgs)
     .filter(
       pkg =>
-        Object.keys(pkg['current-dependencies'] || {}).some(
+        Object.keys(pkg.currentDependencies || {}).some(
           pkgId => pkgId === id,
         ) &&
-        !emver.satisfies(version, pkg['current-dependencies'][id].versionRange),
+        !emver.satisfies(version, pkg.currentDependencies[id].versionRange),
     )
     .map(pkg => getManifest(pkg).title)
 }
diff --git a/web/projects/ui/src/app/util/get-package-data.ts b/web/projects/ui/src/app/util/get-package-data.ts
index 79834bbe7..244324501 100644
--- a/web/projects/ui/src/app/util/get-package-data.ts
+++ b/web/projects/ui/src/app/util/get-package-data.ts
@@ -14,49 +14,47 @@ export async function getPackage(
   patch: PatchDB<DataModel>,
   id: string,
 ): Promise<PackageDataEntry | undefined> {
-  return firstValueFrom(patch.watch$('package-data', id))
+  return firstValueFrom(patch.watch$('packageData', id))
 }
 
 export async function getAllPackages(
   patch: PatchDB<DataModel>,
-): Promise<DataModel['package-data']> {
-  return firstValueFrom(patch.watch$('package-data'))
+): Promise<DataModel['packageData']> {
+  return firstValueFrom(patch.watch$('packageData'))
 }
 
 export function getManifest(pkg: PackageDataEntry): Manifest {
-  if (isInstalled(pkg) || isRemoving(pkg)) return pkg['state-info'].manifest
+  if (isInstalled(pkg) || isRemoving(pkg)) return pkg.stateInfo.manifest
 
-  return (pkg['state-info'] as InstallingState)['installing-info'][
-    'new-manifest'
-  ]
+  return (pkg.stateInfo as InstallingState).installingInfo.newManifest
 }
 
 export function isInstalled(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstalledState> {
-  return pkg['state-info'].state === PackageState.Installed
+  return pkg.stateInfo.state === PackageState.Installed
 }
 
 export function isRemoving(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstalledState> {
-  return pkg['state-info'].state === PackageState.Removing
+  return pkg.stateInfo.state === PackageState.Removing
 }
 
 export function isInstalling(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstallingState> {
-  return pkg['state-info'].state === PackageState.Installing
+  return pkg.stateInfo.state === PackageState.Installing
 }
 
 export function isRestoring(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstallingState> {
-  return pkg['state-info'].state === PackageState.Restoring
+  return pkg.stateInfo.state === PackageState.Restoring
 }
 
 export function isUpdating(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<UpdatingState> {
-  return pkg['state-info'].state === PackageState.Updating
+  return pkg.stateInfo.state === PackageState.Updating
 }
diff --git a/web/projects/ui/src/app/util/get-server-info.ts b/web/projects/ui/src/app/util/get-server-info.ts
index 4500c4305..08eecd451 100644
--- a/web/projects/ui/src/app/util/get-server-info.ts
+++ b/web/projects/ui/src/app/util/get-server-info.ts
@@ -5,5 +5,5 @@ import { firstValueFrom } from 'rxjs'
 export async function getServerInfo(
   patch: PatchDB<DataModel>,
 ): Promise<ServerInfo> {
-  return firstValueFrom(patch.watch$('server-info'))
+  return firstValueFrom(patch.watch$('serverInfo'))
 }
diff --git a/web/projects/ui/src/app/util/has-deps.ts b/web/projects/ui/src/app/util/has-deps.ts
index b5c8c1f92..079990d1c 100644
--- a/web/projects/ui/src/app/util/has-deps.ts
+++ b/web/projects/ui/src/app/util/has-deps.ts
@@ -4,5 +4,5 @@ export function hasCurrentDeps(
   id: string,
   pkgs: Record<string, PackageDataEntry>,
 ): boolean {
-  return !!Object.values(pkgs).some(pkg => !!pkg['current-dependencies'][id])
+  return !!Object.values(pkgs).some(pkg => !!pkg.currentDependencies[id])
 }
diff --git a/web/projects/ui/src/app/util/properties.util.ts b/web/projects/ui/src/app/util/properties.util.ts
index 0d1d7e6f4..5afb4bd8b 100644
--- a/web/projects/ui/src/app/util/properties.util.ts
+++ b/web/projects/ui/src/app/util/properties.util.ts
@@ -12,8 +12,6 @@ import matches, {
   arrayOf,
 } from 'ts-matches'
 
-type ValidVersion = 1 | 2
-
 type PropertiesV1 = typeof matchPropertiesV1._TYPE
 type PackagePropertiesV1 = PropertiesV1[]
 type PackagePropertiesV2 = {

From fba1484e2e83b91630f8845cf201d48a6317e27d Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 25 Mar 2024 11:07:59 -0600
Subject: [PATCH 090/341] fix: Bringing in a building for the browser

---
 sdk/lib/index.browser.ts      | 14 ++++++++++++++
 sdk/lib/index.ts              |  1 +
 sdk/lib/util/index.browser.ts | 25 +++++++++++++++++++++++++
 sdk/package-lock.json         | 12 +++++++-----
 sdk/package.json              | 14 ++++----------
 web/package-lock.json         |  8 ++++----
 6 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 sdk/lib/index.browser.ts
 create mode 100644 sdk/lib/util/index.browser.ts

diff --git a/sdk/lib/index.browser.ts b/sdk/lib/index.browser.ts
new file mode 100644
index 000000000..ff422a7f2
--- /dev/null
+++ b/sdk/lib/index.browser.ts
@@ -0,0 +1,14 @@
+export { EmVer } from "./emverLite/mod"
+export { setupManifest } from "./manifest/setupManifest"
+export { setupExposeStore } from "./store/setupExposeStore"
+export * as config from "./config"
+export * as CB from "./config/builder"
+export * as CT from "./config/configTypes"
+export * as dependencyConfig from "./dependencyConfig"
+export * as manifest from "./manifest"
+export * as types from "./types"
+export * as T from "./types"
+export * as yaml from "yaml"
+export * as matches from "ts-matches"
+
+export * as util from "./util/index.browser"
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index e89d45457..2fef6a4fa 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -5,6 +5,7 @@ export { StartSdk } from "./StartSdk"
 export { setupManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
 export { setupExposeStore } from "./store/setupExposeStore"
+export { pathBuilder } from "./store/PathBuilder"
 export * as actions from "./actions"
 export * as backup from "./backup"
 export * as config from "./config"
diff --git a/sdk/lib/util/index.browser.ts b/sdk/lib/util/index.browser.ts
new file mode 100644
index 000000000..6ff7ed01c
--- /dev/null
+++ b/sdk/lib/util/index.browser.ts
@@ -0,0 +1,25 @@
+import * as T from "../types"
+
+export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
+export { getServiceInterfaces } from "./getServiceInterfaces"
+// prettier-ignore
+export type FlattenIntersection<T> = 
+T extends ArrayLike<any> ? T :
+T extends object ? {} & {[P in keyof T]: T[P]} :
+ T;
+
+export type _<T> = FlattenIntersection<T>
+
+export const isKnownError = (e: unknown): e is T.KnownError =>
+  e instanceof Object && ("error" in e || "error-code" in e)
+
+declare const affine: unique symbol
+
+export type Affine<A> = { [affine]: A }
+
+type NeverPossible = { [affine]: string }
+export type NoAny<A> = NeverPossible extends A
+  ? keyof NeverPossible extends keyof A
+    ? never
+    : A
+  : A
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index c00bd6701..f0d61ea4d 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -9,19 +9,19 @@
       "version": "0.4.0-rev0.lib0.rc8.beta10",
       "license": "MIT",
       "dependencies": {
-        "@iarna/toml": "^2.2.5",
         "isomorphic-fetch": "^3.0.0",
-        "ts-matches": "^5.4.1",
-        "yaml": "^2.2.2"
+        "ts-matches": "^5.4.1"
       },
       "devDependencies": {
+        "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
         "jest": "^29.4.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         "tsx": "^4.7.1",
-        "typescript": "^5.0.4"
+        "typescript": "^5.0.4",
+        "yaml": "^2.2.2"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -651,7 +651,8 @@
     "node_modules/@iarna/toml": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==",
+      "dev": true
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -4235,6 +4236,7 @@
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz",
       "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==",
+      "dev": true,
       "engines": {
         "node": ">= 14"
       }
diff --git a/sdk/package.json b/sdk/package.json
index 539d8f90a..6176f4d8e 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -5,14 +5,8 @@
   "main": "./cjs/sdk/lib/index.js",
   "types": "./cjs/sdk/lib/index.d.ts",
   "module": "./mjs/sdk/lib/index.js",
+  "browser": "./mjs/sdk/lib/index.browser.js",
   "sideEffects": true,
-  "exports": {
-    ".": {
-      "import": "./mjs/sdk/lib/index.js",
-      "require": "./cjs/sdk/lib/index.js",
-      "types": "./cjs/sdk/lib/index.d.ts"
-    }
-  },
   "typesVersion": {
     ">=3.1": {
       "*": [
@@ -36,10 +30,8 @@
   },
   "homepage": "https://github.com/Start9Labs/start-sdk#readme",
   "dependencies": {
-    "@iarna/toml": "^2.2.5",
     "isomorphic-fetch": "^3.0.0",
-    "ts-matches": "^5.4.1",
-    "yaml": "^2.2.2"
+    "ts-matches": "^5.4.1"
   },
   "prettier": {
     "trailingComma": "all",
@@ -48,6 +40,8 @@
     "singleQuote": false
   },
   "devDependencies": {
+    "@iarna/toml": "^2.2.5",
+    "yaml": "^2.2.2",
     "@types/jest": "^29.4.0",
     "jest": "^29.4.3",
     "prettier": "^3.2.5",
diff --git a/web/package-lock.json b/web/package-lock.json
index a4cc53e5c..90a6ad58d 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1976,19 +1976,19 @@
       "version": "0.4.0-rev0.lib0.rc8.beta10",
       "license": "MIT",
       "dependencies": {
-        "@iarna/toml": "^2.2.5",
         "isomorphic-fetch": "^3.0.0",
-        "ts-matches": "^5.4.1",
-        "yaml": "^2.2.2"
+        "ts-matches": "^5.4.1"
       },
       "devDependencies": {
+        "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
         "jest": "^29.4.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         "tsx": "^4.7.1",
-        "typescript": "^5.0.4"
+        "typescript": "^5.0.4",
+        "yaml": "^2.2.2"
       }
     },
     "node_modules/@adobe/css-tools": {

From 299d9998ad95fb0726e872fca3d374aacbb91e94 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 25 Mar 2024 12:01:13 -0600
Subject: [PATCH 091/341] chore: Making sure that the values that we are
 returning are valid now with the new types

---
 .../src/Adapters/HostSystemStartOs.ts         |   5 -
 .../Systems/SystemForEmbassy/MainLoop.ts      |  14 +-
 .../Systems/SystemForEmbassy/index.ts         | 397 +++---------------
 container-runtime/src/Models/JsonPath.ts      |   1 +
 4 files changed, 55 insertions(+), 362 deletions(-)

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index f173e4e62..5e52224fa 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -147,11 +147,6 @@ export class HostSystemStartOs implements Effects {
       T.Effects["exposeForDependents"]
     >
   }
-  exposeUi(...[options]: Parameters<T.Effects["exposeUi"]>) {
-    return this.rpcRound("exposeUi", options) as ReturnType<
-      T.Effects["exposeUi"]
-    >
-  }
   getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
     return this.rpcRound("getConfigured", null) as ReturnType<
       T.Effects["getConfigured"]
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index e5e532246..69e3e6615 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -25,15 +25,12 @@ export class MainLoop {
         wait: Promise<unknown>
       }>
     | undefined
-  private propertiesEvent: NodeJS.Timeout | undefined
   constructor(
     readonly system: SystemForEmbassy,
     readonly effects: HostSystemStartOs,
-    readonly runProperties: () => Promise<void>,
   ) {
     this.healthLoops = this.constructHealthLoops()
     this.mainEvent = this.constructMainEvent()
-    this.propertiesEvent = this.constructPropertiesEvent()
   }
 
   private async constructMainEvent() {
@@ -85,23 +82,14 @@ export class MainLoop {
   }
 
   public async clean(options?: { timeout?: number }) {
-    const { mainEvent, healthLoops, propertiesEvent } = this
+    const { mainEvent, healthLoops } = this
     const main = await mainEvent
     delete this.mainEvent
     delete this.healthLoops
-    delete this.propertiesEvent
     if (mainEvent) await main?.daemon.term()
-    clearInterval(propertiesEvent)
     if (healthLoops) healthLoops.forEach((x) => clearInterval(x.interval))
   }
 
-  private constructPropertiesEvent() {
-    const { runProperties } = this
-    return setInterval(() => {
-      runProperties()
-    }, EMBASSY_PROPERTIES_LOOP)
-  }
-
   private constructHealthLoops() {
     const { manifest } = this.system
     const effects = this.effects
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index ae9b3f462..fb99795cc 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -59,6 +59,33 @@ export type PackagePropertyObject = {
   type: "object"
   description: string
 }
+
+const asProperty_ = (
+  x: PackagePropertyString | PackagePropertyObject,
+): T.PropertiesValue => {
+  if (x.type === "object") {
+    return {
+      ...x,
+      value: Object.fromEntries(
+        Object.entries(x.value).map(([key, value]) => [
+          key,
+          asProperty_(value),
+        ]),
+      ),
+    }
+  }
+  return {
+    masked: false,
+    description: null,
+    qr: null,
+    copyable: null,
+    ...x,
+  }
+}
+const asProperty = (x: PackagePropertiesV2): T.PropertiesReturn =>
+  Object.fromEntries(
+    Object.entries(x).map(([key, value]) => [key, asProperty_(value)]),
+  )
 const [matchPackageProperties, setMatchPackageProperties] =
   deferred<PackagePropertiesV2>()
 const matchPackagePropertyObject: Parser<unknown, PackagePropertyObject> =
@@ -92,44 +119,6 @@ const matchProperties = object({
   data: matchPackageProperties,
 })
 
-type ExportUi = {
-  values: { [key: string]: any }
-  expose: { [key: string]: T.ExposeUiPathsAll }
-}
-
-function propertiesToExportUi(
-  properties: PackagePropertiesV2,
-  previousPath = "",
-): ExportUi {
-  const exportUi: ExportUi = {
-    values: {},
-    expose: {},
-  }
-  for (const [key, value] of Object.entries(properties)) {
-    const path = `${previousPath}/${key}`
-    if (value.type === "object") {
-      const { values, expose } = propertiesToExportUi(value.value, path)
-      exportUi.values[key] = values
-      exportUi.expose[key] = {
-        type: "object",
-        value: expose,
-        description: value.description,
-      }
-      continue
-    }
-    exportUi.values[key] = value.value
-    exportUi.expose[key] = {
-      type: "string",
-      path,
-      description: value.description ?? null,
-      masked: value.masked ?? false,
-      copyable: value.copyable ?? null,
-      qr: value.qr ?? null,
-    }
-  }
-  return exportUi
-}
-
 export class SystemForEmbassy implements System {
   currentRunning: MainLoop | undefined
   static async of(manifestLocation: string = MANIFEST_LOCATION) {
@@ -236,6 +225,8 @@ export class SystemForEmbassy implements System {
         return this.getConfig(effects)
       case "/config/set":
         return this.setConfig(effects, input)
+      case "/properties":
+        return this.properties(effects)
       case "/actions/metadata":
         return todo()
       case "/init":
@@ -279,9 +270,7 @@ export class SystemForEmbassy implements System {
   private async mainStart(effects: HostSystemStartOs): Promise<void> {
     if (!!this.currentRunning) return
 
-    this.currentRunning = new MainLoop(this, effects, () =>
-      this.properties(effects),
-    )
+    this.currentRunning = new MainLoop(this, effects)
   }
   private async mainStop(
     effects: HostSystemStartOs,
@@ -472,51 +461,44 @@ export class SystemForEmbassy implements System {
     }
     return { configured: true }
   }
-  private async properties(effects: HostSystemStartOs): Promise<undefined> {
+  private async properties(
+    effects: HostSystemStartOs,
+  ): Promise<ReturnType<T.ExpectedExports.Properties>> {
     // TODO BLU-J set the properties ever so often
     const setConfigValue = this.manifest.properties
-    if (!setConfigValue) return
+    if (!setConfigValue) throw new Error("There is no properties")
     if (setConfigValue.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
         setConfigValue,
         this.manifest.volumes,
       )
-      const properties = JSON.parse(
-        (
-          await container.exec([
-            setConfigValue.entrypoint,
-            ...setConfigValue.args,
-          ])
-        ).stdout.toString(),
+      const properties = matchProperties.unsafeCast(
+        JSON.parse(
+          (
+            await container.exec([
+              setConfigValue.entrypoint,
+              ...setConfigValue.args,
+            ])
+          ).stdout.toString(),
+        ),
       )
-      if (!matchProperties.test(properties)) return
-      const exposeUis = propertiesToExportUi(properties.data)
-      await effects.store.set<any, any>({
-        path: "/properties",
-        value: exposeUis.values,
-      })
-      await effects.exposeUi(exposeUis.expose)
+      return asProperty(properties.data)
     } else if (setConfigValue.type === "script") {
       const moduleCode = this.moduleCode
       const method = moduleCode.properties
       if (!method)
         throw new Error("Expecting that the method properties exists")
-      const properties = await method(
-        new PolyfillEffects(effects, this.manifest),
-      ).then((x) => {
-        if ("result" in x) return x.result
-        if ("error" in x) throw new Error("Error getting config: " + x.error)
-        throw new Error("Error getting config: " + x["error-code"][1])
-      })
-      if (!matchProperties.test(properties)) return
-      const exposeUis = propertiesToExportUi(properties.data)
-      await effects.store.set<any, any>({
-        path: "/properties",
-        value: exposeUis.values,
-      })
-      await effects.exposeUi(exposeUis.expose)
+      const properties = matchProperties.unsafeCast(
+        await method(new PolyfillEffects(effects, this.manifest)).then((x) => {
+          if ("result" in x) return x.result
+          if ("error" in x) throw new Error("Error getting config: " + x.error)
+          throw new Error("Error getting config: " + x["error-code"][1])
+        }),
+      )
+      return asProperty(properties.data)
     }
+    throw new Error(`Unknown type in the fetch properties: ${setConfigValue}`)
   }
   private async health(
     effects: HostSystemStartOs,
@@ -651,279 +633,6 @@ export class SystemForEmbassy implements System {
       throw new Error("Error getting config: " + x["error-code"][1])
     })) as any
   }
-  // private async sandbox(
-  //   effects: HostSystemStartOs,
-  //   options: {
-  //     procedure:
-  //       | "/createBackup"
-  //       | "/restoreBackup"
-  //       | "/getConfig"
-  //       | "/setConfig"
-  //       | "migration"
-  //       | "/properties"
-  //       | `/action/${string}`
-  //       | `/dependencies/${string}/check`
-  //       | `/dependencies/${string}/autoConfigure`
-  //     input: unknown
-  //     timeout?: number | undefined
-  //   },
-  // ): Promise<unknown> {
-  //   const input = options.input
-  //   switch (options.procedure) {
-  //     case "/createBackup":
-  //       return this.roCreateBackup(effects)
-  //     case "/restoreBackup":
-  //       return this.roRestoreBackup(effects)
-  //     case "/getConfig":
-  //       return this.roGetConfig(effects)
-  //     case "/setConfig":
-  //       return this.roSetConfig(effects, input)
-  //     case "migration":
-  //       return this.roMigration(effects, input)
-  //     case "/properties":
-  //       return this.roProperties(effects)
-  //     default:
-  //       const procedure = options.procedure.split("/")
-  //       switch (true) {
-  //         case options.procedure.startsWith("/action/"):
-  //           return this.roAction(effects, procedure[2], input)
-  //         case options.procedure.startsWith("/dependencies/") &&
-  //           procedure[3] === "check":
-  //           return this.roDependenciesCheck(effects, procedure[2], input)
-
-  //         case options.procedure.startsWith("/dependencies/") &&
-  //           procedure[3] === "autoConfigure":
-  //           return this.roDependenciesAutoconfig(effects, procedure[2], input)
-  //       }
-  //   }
-  // }
-
-  // private async roCreateBackup(effects: HostSystemStartOs): Promise<void> {
-  //   const backup = this.manifest.backup.create
-  //   if (backup.type === "docker") {
-  //     const container = await DockerProcedureContainer.readonlyOf(backup)
-  //     await container.exec([backup.entrypoint, ...backup.args])
-  //   } else {
-  //     const moduleCode = await this.moduleCode
-  //     await moduleCode.createBackup?.(new PolyfillEffects(effects))
-  //   }
-  // }
-  // private async roRestoreBackup(effects: HostSystemStartOs): Promise<void> {
-  //   const restoreBackup = this.manifest.backup.restore
-  //   if (restoreBackup.type === "docker") {
-  //     const container = await DockerProcedureContainer.readonlyOf(restoreBackup)
-  //     await container.exec([restoreBackup.entrypoint, ...restoreBackup.args])
-  //   } else {
-  //     const moduleCode = await this.moduleCode
-  //     await moduleCode.restoreBackup?.(new PolyfillEffects(effects))
-  //   }
-  // }
-  // private async roGetConfig(effects: HostSystemStartOs): Promise<T.ConfigRes> {
-  //   const config = this.manifest.config?.get
-  //   if (!config) return { spec: {} }
-  //   if (config.type === "docker") {
-  //     const container = await DockerProcedureContainer.readonlyOf(config)
-  //     return JSON.parse(
-  //       (await container.exec([config.entrypoint, ...config.args])).stdout,
-  //     )
-  //   } else {
-  //     const moduleCode = await this.moduleCode
-  //     const method = moduleCode.getConfig
-  //     if (!method) throw new Error("Expecting that the method getConfig exists")
-  //     return (await method(new PolyfillEffects(effects)).then((x) => {
-  //       if ("result" in x) return x.result
-  //       if ("error" in x) throw new Error("Error getting config: " + x.error)
-  //       throw new Error("Error getting config: " + x["error-code"][1])
-  //     })) as any
-  //   }
-  // }
-  // private async roSetConfig(
-  //   effects: HostSystemStartOs,
-  //   newConfig: unknown,
-  // ): Promise<T.SetResult> {
-  //   const setConfigValue = this.manifest.config?.set
-  //   if (!setConfigValue) return { signal: "SIGTERM", "depends-on": {} }
-  //   if (setConfigValue.type === "docker") {
-  //     const container = await DockerProcedureContainer.readonlyOf(
-  //       setConfigValue,
-  //     )
-  //     return JSON.parse(
-  //       (
-  //         await container.exec([
-  //           setConfigValue.entrypoint,
-  //           ...setConfigValue.args,
-  //           JSON.stringify(newConfig),
-  //         ])
-  //       ).stdout,
-  //     )
-  //   } else {
-  //     const moduleCode = await this.moduleCode
-  //     const method = moduleCode.setConfig
-  //     if (!method) throw new Error("Expecting that the method setConfig exists")
-  //     return await method(
-  //       new PolyfillEffects(effects),
-  //       newConfig as U.Config,
-  //     ).then((x) => {
-  //       if ("result" in x) return x.result
-  //       if ("error" in x) throw new Error("Error getting config: " + x.error)
-  //       throw new Error("Error getting config: " + x["error-code"][1])
-  //     })
-  //   }
-  // }
-  // private async roMigration(
-  //   effects: HostSystemStartOs,
-  //   fromVersion: unknown,
-  // ): Promise<T.MigrationRes> {
-  //   throw new Error("Migrations should never be ran in the sandbox mode")
-  // }
-  // private async roProperties(effects: HostSystemStartOs): Promise<unknown> {
-  //   const setConfigValue = this.manifest.properties
-  //   if (!setConfigValue) return {}
-  //   if (setConfigValue.type === "docker") {
-  //     const container = await DockerProcedureContainer.readonlyOf(
-  //       setConfigValue,
-  //     )
-  //     return JSON.parse(
-  //       (
-  //         await container.exec([
-  //           setConfigValue.entrypoint,
-  //           ...setConfigValue.args,
-  //         ])
-  //       ).stdout,
-  //     )
-  //   } else {
-  //     const moduleCode = await this.moduleCode
-  //     const method = moduleCode.properties
-  //     if (!method)
-  //       throw new Error("Expecting that the method properties exists")
-  //     return await method(new PolyfillEffects(effects)).then((x) => {
-  //       if ("result" in x) return x.result
-  //       if ("error" in x) throw new Error("Error getting config: " + x.error)
-  //       throw new Error("Error getting config: " + x["error-code"][1])
-  //     })
-  //   }
-  // }
-  // private async roHealth(
-  //   effects: HostSystemStartOs,
-  //   healthId: string,
-  //   timeSinceStarted: unknown,
-  // ): Promise<void> {
-  //   const healthProcedure = this.manifest["health-checks"][healthId]
-  //   if (!healthProcedure) return
-  //   if (healthProcedure.type === "docker") {
-  //     const container = await DockerProcedureContainer.readonlyOf(
-  //       healthProcedure,
-  //     )
-  //     return JSON.parse(
-  //       (
-  //         await container.exec([
-  //           healthProcedure.entrypoint,
-  //           ...healthProcedure.args,
-  //           JSON.stringify(timeSinceStarted),
-  //         ])
-  //       ).stdout,
-  //     )
-  //   } else {
-  //     const moduleCode = await this.moduleCode
-  //     const method = moduleCode.health?.[healthId]
-  //     if (!method) throw new Error("Expecting that the method health exists")
-  //     await method(new PolyfillEffects(effects), Number(timeSinceStarted)).then(
-  //       (x) => {
-  //         if ("result" in x) return x.result
-  //         if ("error" in x) throw new Error("Error getting config: " + x.error)
-  //         throw new Error("Error getting config: " + x["error-code"][1])
-  //       },
-  //     )
-  //   }
-  // }
-  // private async roAction(
-  //   effects: HostSystemStartOs,
-  //   actionId: string,
-  //   formData: unknown,
-  // ): Promise<T.ActionResult> {
-  //   const actionProcedure = this.manifest.actions?.[actionId]?.implementation
-  //   if (!actionProcedure) return { message: "Action not found", value: null }
-  //   if (actionProcedure.type === "docker") {
-  //     const container = await DockerProcedureContainer.readonlyOf(
-  //       actionProcedure,
-  //     )
-  //     return JSON.parse(
-  //       (
-  //         await container.exec([
-  //           actionProcedure.entrypoint,
-  //           ...actionProcedure.args,
-  //           JSON.stringify(formData),
-  //         ])
-  //       ).stdout,
-  //     )
-  //   } else {
-  //     const moduleCode = await this.moduleCode
-  //     const method = moduleCode.action?.[actionId]
-  //     if (!method) throw new Error("Expecting that the method action exists")
-  //     return (await method(new PolyfillEffects(effects), formData as any).then(
-  //       (x) => {
-  //         if ("result" in x) return x.result
-  //         if ("error" in x) throw new Error("Error getting config: " + x.error)
-  //         throw new Error("Error getting config: " + x["error-code"][1])
-  //       },
-  //     )) as any
-  //   }
-  // }
-  // private async roDependenciesCheck(
-  //   effects: HostSystemStartOs,
-  //   id: string,
-  //   oldConfig: unknown,
-  // ): Promise<object> {
-  //   const actionProcedure = this.manifest.dependencies?.[id]?.config?.check
-  //   if (!actionProcedure) return { message: "Action not found", value: null }
-  //   if (actionProcedure.type === "docker") {
-  //     const container = await DockerProcedureContainer.readonlyOf(
-  //       actionProcedure,
-  //     )
-  //     return JSON.parse(
-  //       (
-  //         await container.exec([
-  //           actionProcedure.entrypoint,
-  //           ...actionProcedure.args,
-  //           JSON.stringify(oldConfig),
-  //         ])
-  //       ).stdout,
-  //     )
-  //   } else {
-  //     const moduleCode = await this.moduleCode
-  //     const method = moduleCode.dependencies?.[id]?.check
-  //     if (!method)
-  //       throw new Error(
-  //         `Expecting that the method dependency check ${id} exists`,
-  //       )
-  //     return (await method(new PolyfillEffects(effects), oldConfig as any).then(
-  //       (x) => {
-  //         if ("result" in x) return x.result
-  //         if ("error" in x) throw new Error("Error getting config: " + x.error)
-  //         throw new Error("Error getting config: " + x["error-code"][1])
-  //       },
-  //     )) as any
-  //   }
-  // }
-  // private async roDependenciesAutoconfig(
-  //   effects: HostSystemStartOs,
-  //   id: string,
-  //   oldConfig: unknown,
-  // ): Promise<void> {
-  //   const moduleCode = await this.moduleCode
-  //   const method = moduleCode.dependencies?.[id]?.autoConfigure
-  //   if (!method)
-  //     throw new Error(
-  //       `Expecting that the method dependency autoConfigure ${id} exists`,
-  //     )
-  //   return (await method(new PolyfillEffects(effects), oldConfig as any).then(
-  //     (x) => {
-  //       if ("result" in x) return x.result
-  //       if ("error" in x) throw new Error("Error getting config: " + x.error)
-  //       throw new Error("Error getting config: " + x["error-code"][1])
-  //     },
-  //   )) as any
-  // }
 }
 async function removePointers(value: T.ConfigRes): Promise<T.ConfigRes> {
   const startingSpec = structuredClone(value.spec)
diff --git a/container-runtime/src/Models/JsonPath.ts b/container-runtime/src/Models/JsonPath.ts
index 627eb3be2..773331b19 100644
--- a/container-runtime/src/Models/JsonPath.ts
+++ b/container-runtime/src/Models/JsonPath.ts
@@ -35,6 +35,7 @@ export const jsonPath = some(
     "/backup/create",
     "/backup/restore",
     "/actions/metadata",
+    "/properties",
   ),
   string.refine(isNestedPath, "isNestedPath"),
 )

From e148f143ea5f9bab23fb9e3ea403810d2eab029b Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 25 Mar 2024 14:18:09 -0600
Subject: [PATCH 092/341] wip: Properties

---
 core/models/src/procedure_name.rs |  2 +
 core/startos/src/properties.rs    | 66 ++++---------------------------
 core/startos/src/service/mod.rs   | 11 ++++++
 3 files changed, 21 insertions(+), 58 deletions(-)

diff --git a/core/models/src/procedure_name.rs b/core/models/src/procedure_name.rs
index bf69b06b8..c42068be3 100644
--- a/core/models/src/procedure_name.rs
+++ b/core/models/src/procedure_name.rs
@@ -9,6 +9,7 @@ pub enum ProcedureName {
     GetConfig,
     SetConfig,
     CreateBackup,
+    Properties,
     RestoreBackup,
     ActionMetadata,
     RunAction(ActionId),
@@ -29,6 +30,7 @@ impl ProcedureName {
             ProcedureName::SetConfig => "/config/set".to_string(),
             ProcedureName::GetConfig => "/config/get".to_string(),
             ProcedureName::CreateBackup => "/backup/create".to_string(),
+            ProcedureName::Properties => "/properties".to_string(),
             ProcedureName::RestoreBackup => "/backup/restore".to_string(),
             ProcedureName::ActionMetadata => "/actions/metadata".to_string(),
             ProcedureName::RunAction(id) => format!("/actions/{}/run", id),
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index cfb0dd66b..5482bdb58 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::{borrow::Borrow, collections::BTreeMap};
 
 use clap::Parser;
 use imbl_value::{json, InOMap, InternedString, Value};
@@ -15,48 +15,6 @@ pub fn display_properties(response: Value) {
     println!("{}", response);
 }
 
-trait IntoProperties {
-    fn into_properties(self, store: &Value) -> Value;
-}
-impl IntoProperties for ExposedUI {
-    fn into_properties(self, store: &Value) -> Value {
-        match self {
-            ExposedUI::Object { value, description } => {
-                json!({
-                    "type": "object",
-                    "description": description,
-                    "value": value.into_iter().map(|(k, v)| (k, v.into_properties(store))).collect::<BTreeMap<String,_>>()
-                })
-            }
-            ExposedUI::String {
-                path,
-                description,
-                masked,
-                copyable,
-                qr,
-            } => json!({
-                "type": "string",
-                "description": description,
-                "value": path.get(store).cloned().unwrap_or_default(),
-                "copyable": copyable,
-                "qr": qr,
-                "masked": masked
-            }),
-        }
-    }
-}
-
-impl IntoProperties for StoreExposedUI {
-    fn into_properties(self, store: &Value) -> Value {
-        Value::Object(
-            self.0
-                .into_iter()
-                .map(|(k, v)| (k, v.into_properties(store)))
-                .collect::<InOMap<InternedString, Value>>(),
-        )
-    }
-}
-
 #[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -68,19 +26,11 @@ pub async fn properties(
     ctx: RpcContext,
     PropertiesParam { id }: PropertiesParam,
 ) -> Result<Value, Error> {
-    let peeked = ctx.db.peek().await;
-    let data = peeked
-        .as_private()
-        .as_package_stores()
-        .as_idx(&id)
-        .map(|x| x.de())
-        .unwrap_or_else(|| Ok(json!({})))?;
-    Ok(peeked
-        .as_public()
-        .as_package_data()
-        .as_idx(&id)
-        .or_not_found(&id)?
-        .as_store_exposed_ui()
-        .de()?
-        .into_properties(&data))
+    match &*ctx.services.get(&id).await {
+        Some(service) => service.properties().await,
+        None => Err(Error::new(
+            eyre!("Could not find a service with id {id}"),
+            ErrorKind::NotFound,
+        )),
+    }
 }
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index fb521ca34..2feb4ca34 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -325,6 +325,17 @@ impl Service {
             .await
             .with_kind(ErrorKind::Action)
     }
+    pub async fn properties(&self) -> Result<Value, Error> {
+        let container = &self.seed.persistent_container;
+        container
+            .execute::<Value>(
+                ProcedureName::Properties,
+                Value::Null,
+                Some(Duration::from_secs(30)),
+            )
+            .await
+            .with_kind(ErrorKind::Unknown)
+    }
 
     pub async fn shutdown(self) -> Result<(), Error> {
         self.actor

From 2b3fddfe8936cce04be0021bb68c8f2a8f930b78 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 25 Mar 2024 15:47:22 -0600
Subject: [PATCH 093/341] use correct serverconfig type

---
 core/startos/src/os_install/mod.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 55c333fba..49d61caad 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -7,6 +7,7 @@ use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler}
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 
+use crate::context::config::ServerConfig;
 use crate::context::{CliContext, InstallContext};
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
@@ -23,14 +24,6 @@ use crate::ARCH;
 mod gpt;
 mod mbr;
 
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PostInstallConfig {
-    os_partitions: OsPartitionInfo,
-    ethernet_interface: String,
-    wifi_interface: Option<String>,
-}
-
 pub fn install() -> ParentHandler {
     ParentHandler::new()
         .subcommand("disk", disk())
@@ -263,10 +256,11 @@ pub async fn execute(
 
     tokio::fs::write(
         rootfs.path().join("config/config.yaml"),
-        IoFormat::Yaml.to_vec(&PostInstallConfig {
-            os_partitions: part_info.clone(),
-            ethernet_interface: eth_iface,
+        IoFormat::Yaml.to_vec(&ServerConfig {
+            os_partitions: Some(part_info.clone()),
+            ethernet_interface: Some(eth_iface),
             wifi_interface: wifi_iface,
+            ..Default::default()
         })?,
     )
     .await?;

From 9cf720e040b9da46de038128bdb4a109261241ef Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 25 Mar 2024 18:21:58 -0600
Subject: [PATCH 094/341] rename embassy to startos

---
 core/startos/src/backup/restore.rs     |  4 +--
 core/startos/src/backup/target/cifs.rs | 20 ++++++------
 core/startos/src/disk/mod.rs           |  2 +-
 core/startos/src/disk/util.rs          |  8 ++---
 core/startos/src/net/static_server.rs  |  4 +--
 core/startos/src/os_install/mod.rs     |  4 +--
 core/startos/src/setup.rs              | 42 +++++++++++++-------------
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 6001c335a..0cdd24aba 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -71,7 +71,7 @@ pub async fn restore_packages_rpc(
 pub async fn recover_full_embassy(
     ctx: SetupContext,
     disk_guid: Arc<String>,
-    embassy_password: String,
+    start_os_password: String,
     recovery_source: TmpMountGuard,
     recovery_password: Option<String>,
 ) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
@@ -89,7 +89,7 @@ pub async fn recover_full_embassy(
     )?;
 
     os_backup.account.password = argon2::hash_encoded(
-        embassy_password.as_bytes(),
+        start_os_password.as_bytes(),
         &rand::random::<[u8; 16]>()[..],
         &argon2::Config::rfc9106_low_mem(),
     )
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index d4b65b7fe..a3bbb9759 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -42,7 +42,7 @@ pub struct CifsBackupTarget {
     path: PathBuf,
     username: String,
     mountable: bool,
-    embassy_os: Option<EmbassyOsRecoveryInfo>,
+    start_os: Option<EmbassyOsRecoveryInfo>,
 }
 
 pub fn cifs() -> ParentHandler {
@@ -93,7 +93,7 @@ pub async fn add(
         password,
     };
     let guard = TmpMountGuard::mount(&cifs, ReadOnly).await?;
-    let embassy_os = recovery_info(guard.path()).await?;
+    let start_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
     let id = ctx
         .db
@@ -116,7 +116,7 @@ pub async fn add(
             path: cifs.path,
             username: cifs.username,
             mountable: true,
-            embassy_os,
+            start_os,
         }),
     })
 }
@@ -157,7 +157,7 @@ pub async fn update(
         password,
     };
     let guard = TmpMountGuard::mount(&cifs, ReadOnly).await?;
-    let embassy_os = recovery_info(guard.path()).await?;
+    let start_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
     ctx.db
         .mutate(|db| {
@@ -180,7 +180,7 @@ pub async fn update(
             path: cifs.path,
             username: cifs.username,
             mountable: true,
-            embassy_os,
+            start_os,
         }),
     })
 }
@@ -224,11 +224,11 @@ pub async fn list(db: &DatabaseModel) -> Result<Vec<(u32, CifsBackupTarget)>, Er
     let mut cifs = Vec::new();
     for (id, model) in db.as_private().as_cifs().as_entries()? {
         let mount_info = model.de()?;
-        let embassy_os = async {
+        let start_os = async {
             let guard = TmpMountGuard::mount(&mount_info, ReadOnly).await?;
-            let embassy_os = recovery_info(guard.path()).await?;
+            let start_os = recovery_info(guard.path()).await?;
             guard.unmount().await?;
-            Ok::<_, Error>(embassy_os)
+            Ok::<_, Error>(start_os)
         }
         .await;
         cifs.push((
@@ -237,8 +237,8 @@ pub async fn list(db: &DatabaseModel) -> Result<Vec<(u32, CifsBackupTarget)>, Er
                 hostname: mount_info.hostname,
                 path: mount_info.path,
                 username: mount_info.username,
-                mountable: embassy_os.is_ok(),
-                embassy_os: embassy_os.ok().and_then(|a| a),
+                mountable: start_os.is_ok(),
+                start_os: start_os.ok().and_then(|a| a),
             },
         ));
     }
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index be2d07bce..f74c944a4 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -101,7 +101,7 @@ fn display_disk_info(params: WithIoFormat<Empty>, args: Vec<DiskInfo>) {
                 } else {
                     "N/A"
                 },
-                if let Some(eos) = part.embassy_os.as_ref() {
+                if let Some(eos) = part.start_os.as_ref() {
                     eos.version.as_str()
                 } else {
                     "N/A"
diff --git a/core/startos/src/disk/util.rs b/core/startos/src/disk/util.rs
index be0b16a6b..b0bc00a5d 100644
--- a/core/startos/src/disk/util.rs
+++ b/core/startos/src/disk/util.rs
@@ -49,7 +49,7 @@ pub struct PartitionInfo {
     pub label: Option<String>,
     pub capacity: u64,
     pub used: Option<u64>,
-    pub embassy_os: Option<EmbassyOsRecoveryInfo>,
+    pub start_os: Option<EmbassyOsRecoveryInfo>,
     pub guid: Option<String>,
 }
 
@@ -390,7 +390,7 @@ async fn disk_info(disk: PathBuf) -> DiskInfo {
 }
 
 async fn part_info(part: PathBuf) -> PartitionInfo {
-    let mut embassy_os = None;
+    let mut start_os = None;
     let label = get_label(&part)
         .await
         .map_err(|e| tracing::warn!("Could not get label of {}: {}", part.display(), e.source))
@@ -417,7 +417,7 @@ async fn part_info(part: PathBuf) -> PartitionInfo {
                     None
                 }
             } {
-                embassy_os = Some(recovery_info)
+                start_os = Some(recovery_info)
             }
             if let Err(e) = mount_guard.unmount().await {
                 tracing::error!("Error unmounting partition {}: {}", part.display(), e);
@@ -430,7 +430,7 @@ async fn part_info(part: PathBuf) -> PartitionInfo {
         label,
         capacity,
         used,
-        embassy_os,
+        start_os,
         guid: None,
     }
 }
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index fec881795..e8207e3bf 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -168,7 +168,7 @@ pub fn main_ui_server_router(ctx: RpcContext) -> Router {
             }),
         )
         .fallback(any(move |request: Request| async move {
-            main_embassy_ui(request, ctx)
+            main_start_os_ui(request, ctx)
                 .await
                 .unwrap_or_else(server_error)
         }))
@@ -218,7 +218,7 @@ async fn if_authorized<
     }
 }
 
-async fn main_embassy_ui(req: Request, ctx: RpcContext) -> Result<Response, Error> {
+async fn main_start_os_ui(req: Request, ctx: RpcContext) -> Result<Response, Error> {
     let (request_parts, _body) = req.into_parts();
     match (
         &request_parts.method,
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 49d61caad..6d55741f4 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -293,7 +293,7 @@ pub async fn execute(
         .invoke(crate::ErrorKind::OpenSsh)
         .await?;
 
-    let embassy_fs = MountGuard::mount(
+    let start_os_fs = MountGuard::mount(
         &Bind::new(rootfs.path()),
         current.join("media/embassy/embassyfs"),
         MountType::ReadOnly,
@@ -342,7 +342,7 @@ pub async fn execute(
     }
     sys.unmount(false).await?;
     proc.unmount(false).await?;
-    embassy_fs.unmount(false).await?;
+    start_os_fs.unmount(false).await?;
     if let Some(efi) = efi {
         efi.unmount(false).await?;
     }
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 2e5c7b3ad..ad76066e8 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -240,9 +240,9 @@ pub async fn verify_cifs(
         ReadWrite,
     )
     .await?;
-    let embassy_os = recovery_info(guard.path()).await?;
+    let start_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
-    embassy_os.ok_or_else(|| Error::new(eyre!("No Backup Found"), crate::ErrorKind::NotFound))
+    start_os.ok_or_else(|| Error::new(eyre!("No Backup Found"), crate::ErrorKind::NotFound))
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -256,8 +256,8 @@ pub enum RecoverySource {
 #[derive(Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ExecuteParams {
-    embassy_logicalname: PathBuf,
-    embassy_password: EncryptedWire,
+    start_os_logicalname: PathBuf,
+    start_os_password: EncryptedWire,
     recovery_source: Option<RecoverySource>,
     recovery_password: Option<EncryptedWire>,
 }
@@ -266,13 +266,13 @@ pub struct ExecuteParams {
 pub async fn execute(
     ctx: SetupContext,
     ExecuteParams {
-        embassy_logicalname,
-        embassy_password,
+        start_os_logicalname,
+        start_os_password,
         recovery_source,
         recovery_password,
     }: ExecuteParams,
 ) -> Result<(), Error> {
-    let embassy_password = match embassy_password.decrypt(&*ctx) {
+    let start_os_password = match start_os_password.decrypt(&*ctx) {
         Some(a) => a,
         None => {
             return Err(Error::new(
@@ -311,8 +311,8 @@ pub async fn execute(
             let ctx = ctx.clone();
             match execute_inner(
                 ctx.clone(),
-                embassy_logicalname,
-                embassy_password,
+                start_os_logicalname,
+                start_os_password,
                 recovery_source,
                 recovery_password,
             )
@@ -375,8 +375,8 @@ pub async fn exit(ctx: SetupContext) -> Result<(), Error> {
 #[instrument(skip_all)]
 pub async fn execute_inner(
     ctx: SetupContext,
-    embassy_logicalname: PathBuf,
-    embassy_password: String,
+    start_os_logicalname: PathBuf,
+    start_os_password: String,
     recovery_source: Option<RecoverySource>,
     recovery_password: Option<String>,
 ) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
@@ -387,7 +387,7 @@ pub async fn execute_inner(
     };
     let guid = Arc::new(
         crate::disk::main::create(
-            &[embassy_logicalname],
+            &[start_os_logicalname],
             &pvscan().await?,
             &ctx.datadir,
             encryption_password,
@@ -403,20 +403,20 @@ pub async fn execute_inner(
     .await?;
 
     if let Some(RecoverySource::Backup { target }) = recovery_source {
-        recover(ctx, guid, embassy_password, target, recovery_password).await
+        recover(ctx, guid, start_os_password, target, recovery_password).await
     } else if let Some(RecoverySource::Migrate { guid: old_guid }) = recovery_source {
-        migrate(ctx, guid, &old_guid, embassy_password).await
+        migrate(ctx, guid, &old_guid, start_os_password).await
     } else {
-        let (hostname, tor_addr, root_ca) = fresh_setup(&ctx, &embassy_password).await?;
+        let (hostname, tor_addr, root_ca) = fresh_setup(&ctx, &start_os_password).await?;
         Ok((guid, hostname, tor_addr, root_ca))
     }
 }
 
 async fn fresh_setup(
     ctx: &SetupContext,
-    embassy_password: &str,
+    start_os_password: &str,
 ) -> Result<(Hostname, OnionAddressV3, X509), Error> {
-    let account = AccountInfo::new(embassy_password, root_ca_start_time().await?)?;
+    let account = AccountInfo::new(start_os_password, root_ca_start_time().await?)?;
     let db = ctx.db().await?;
     db.put(&ROOT, &Database::init(&account)?).await?;
     drop(db);
@@ -432,7 +432,7 @@ async fn fresh_setup(
 async fn recover(
     ctx: SetupContext,
     guid: Arc<String>,
-    embassy_password: String,
+    start_os_password: String,
     recovery_source: BackupTargetFS,
     recovery_password: Option<String>,
 ) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
@@ -440,7 +440,7 @@ async fn recover(
     recover_full_embassy(
         ctx,
         guid.clone(),
-        embassy_password,
+        start_os_password,
         recovery_source,
         recovery_password,
     )
@@ -452,7 +452,7 @@ async fn migrate(
     ctx: SetupContext,
     guid: Arc<String>,
     old_guid: &str,
-    embassy_password: String,
+    start_os_password: String,
 ) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
     *ctx.setup_status.write().await = Some(Ok(SetupStatus {
         bytes_transferred: 0,
@@ -537,7 +537,7 @@ async fn migrate(
         } => res,
     }
 
-    let (hostname, tor_addr, root_ca) = setup_init(&ctx, Some(embassy_password)).await?;
+    let (hostname, tor_addr, root_ca) = setup_init(&ctx, Some(start_os_password)).await?;
 
     crate::disk::main::export(&old_guid, "/media/embassy/migrate").await?;
 

From 4589d4b3f576528949150ab9983994608fd63aec Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 26 Mar 2024 10:26:44 -0600
Subject: [PATCH 095/341] update ts-rs to 8.1

---
 core/Cargo.lock                               | 29 +++++++++++++++++--
 core/startos/Cargo.toml                       |  2 +-
 core/startos/bindings/ActionMetadata.ts       |  2 +-
 core/startos/bindings/AddSslOptions.ts        |  2 +-
 core/startos/bindings/AddressInfo.ts          |  2 +-
 core/startos/bindings/AllowedStatuses.ts      |  2 +-
 core/startos/bindings/BindOptions.ts          |  2 +-
 core/startos/bindings/BindOptionsSecure.ts    |  2 +-
 core/startos/bindings/BindParams.ts           |  2 +-
 core/startos/bindings/ChrootParams.ts         |  2 +-
 .../bindings/CreateOverlayedImageParams.ts    |  2 +-
 .../bindings/DestroyOverlayedImageParams.ts   |  2 +-
 core/startos/bindings/ExecuteAction.ts        |  2 +-
 core/startos/bindings/ExportActionParams.ts   |  2 +-
 .../bindings/ExportServiceInterfaceParams.ts  |  2 +-
 .../bindings/ExposeForDependentsParams.ts     |  2 +-
 core/startos/bindings/GetHostInfoParams.ts    |  2 +-
 core/startos/bindings/GetPrimaryUrlParams.ts  |  2 +-
 .../bindings/GetServiceInterfaceParams.ts     |  2 +-
 .../bindings/GetServicePortForwardParams.ts   |  2 +-
 .../bindings/GetSslCertificateParams.ts       |  2 +-
 core/startos/bindings/GetSslKeyParams.ts      |  2 +-
 core/startos/bindings/GetStoreParams.ts       |  2 +-
 core/startos/bindings/GetSystemSmtpParams.ts  |  2 +-
 .../bindings/ListServiceInterfacesParams.ts   |  2 +-
 core/startos/bindings/MountParams.ts          |  2 +-
 core/startos/bindings/MountTarget.ts          |  2 +-
 core/startos/bindings/ParamsMaybePackageId.ts |  2 +-
 core/startos/bindings/ParamsPackageId.ts      |  2 +-
 core/startos/bindings/RemoveActionParams.ts   |  2 +-
 core/startos/bindings/RemoveAddressParams.ts  |  2 +-
 core/startos/bindings/ReverseProxyBind.ts     |  2 +-
 .../bindings/ReverseProxyDestination.ts       |  2 +-
 core/startos/bindings/ReverseProxyHttp.ts     |  2 +-
 core/startos/bindings/ReverseProxyParams.ts   |  2 +-
 core/startos/bindings/SetConfigured.ts        |  2 +-
 .../startos/bindings/SetDependenciesParams.ts |  2 +-
 core/startos/bindings/SetHealth.ts            |  2 +-
 core/startos/bindings/SetMainStatus.ts        |  2 +-
 core/startos/bindings/SetStoreParams.ts       |  2 +-
 core/startos/src/db/model/package.rs          |  1 +
 .../src/service/service_effect_handler.rs     |  2 +-
 42 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 2d800eda1..24a641819 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -2685,7 +2685,7 @@ dependencies = [
  "tokio",
  "torut",
  "tracing",
- "ts-rs",
+ "ts-rs 7.1.1",
  "yasi",
 ]
 
@@ -4730,7 +4730,7 @@ dependencies = [
  "tracing-journald",
  "tracing-subscriber",
  "trust-dns-server",
- "ts-rs",
+ "ts-rs 8.1.0",
  "typed-builder",
  "url",
  "urlencoding",
@@ -5441,7 +5441,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2cae1fc5d05d47aa24b64f9a4f7cba24cdc9187a2084dd97ac57bef5eccae6"
 dependencies = [
  "thiserror",
- "ts-rs-macros",
+ "ts-rs-macros 7.1.1",
+]
+
+[[package]]
+name = "ts-rs"
+version = "8.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d3fa4606cdab1e9b668cc65ce2545941d01f52bc27536a195c66c55b91cb84"
+dependencies = [
+ "thiserror",
+ "ts-rs-macros 8.1.0",
 ]
 
 [[package]]
@@ -5457,6 +5467,19 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "ts-rs-macros"
+version = "8.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f86ae36cbb2d58b86677ad413054feeb0712e382e822131cf9a4a1e580c419b5"
+dependencies = [
+ "Inflector",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+ "termcolor",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.21.0"
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 5d48179f9..301602e2d 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -174,7 +174,7 @@ tracing-futures = "0.2.5"
 tracing-journald = "0.3.0"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 trust-dns-server = "0.23.1"
-ts-rs = "7.1.1"
+ts-rs = "8.1.0"
 typed-builder = "0.18.0"
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
diff --git a/core/startos/bindings/ActionMetadata.ts b/core/startos/bindings/ActionMetadata.ts
index e2e0a8fb8..91af02b7b 100644
--- a/core/startos/bindings/ActionMetadata.ts
+++ b/core/startos/bindings/ActionMetadata.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AllowedStatuses } from "./AllowedStatuses";
 
-export interface ActionMetadata { name: string, description: string, warning: string | null, disabled: boolean, input: {[key: string]: any}, allowedStatuses: AllowedStatuses, group: string | null, }
\ No newline at end of file
+export type ActionMetadata = { name: string, description: string, warning: string | null, disabled: boolean, input: {[key: string]: any}, allowedStatuses: AllowedStatuses, group: string | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/AddSslOptions.ts b/core/startos/bindings/AddSslOptions.ts
index 304bcb515..f0f74fe03 100644
--- a/core/startos/bindings/AddSslOptions.ts
+++ b/core/startos/bindings/AddSslOptions.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface AddSslOptions { scheme: string | null, preferredExternalPort: number, addXForwardedHeaders: boolean | null, }
\ No newline at end of file
+export type AddSslOptions = { scheme: string | null, preferredExternalPort: number, addXForwardedHeaders: boolean | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/AddressInfo.ts b/core/startos/bindings/AddressInfo.ts
index 9d4c8ee6e..b253ab823 100644
--- a/core/startos/bindings/AddressInfo.ts
+++ b/core/startos/bindings/AddressInfo.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BindOptions } from "./BindOptions";
 
-export interface AddressInfo { username: string | null, hostId: string, bindOptions: BindOptions, suffix: string, }
\ No newline at end of file
+export type AddressInfo = { username: string | null, hostId: string, bindOptions: BindOptions, suffix: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/AllowedStatuses.ts b/core/startos/bindings/AllowedStatuses.ts
index e81a1639f..a5c7f5d2d 100644
--- a/core/startos/bindings/AllowedStatuses.ts
+++ b/core/startos/bindings/AllowedStatuses.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AllowedStatuses = "only-running" | "only-stopped" | "any";
\ No newline at end of file
+export type AllowedStatuses = "onlyRunning" | "onlyStopped" | "any";
\ No newline at end of file
diff --git a/core/startos/bindings/BindOptions.ts b/core/startos/bindings/BindOptions.ts
index 029be6a16..997f2bd8b 100644
--- a/core/startos/bindings/BindOptions.ts
+++ b/core/startos/bindings/BindOptions.ts
@@ -2,4 +2,4 @@
 import type { AddSslOptions } from "./AddSslOptions";
 import type { BindOptionsSecure } from "./BindOptionsSecure";
 
-export interface BindOptions { scheme: string | null, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: BindOptionsSecure | null, }
\ No newline at end of file
+export type BindOptions = { scheme: string | null, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: BindOptionsSecure | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/BindOptionsSecure.ts b/core/startos/bindings/BindOptionsSecure.ts
index 00bfd7dd2..c7b1b69af 100644
--- a/core/startos/bindings/BindOptionsSecure.ts
+++ b/core/startos/bindings/BindOptionsSecure.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface BindOptionsSecure { ssl: boolean, }
\ No newline at end of file
+export type BindOptionsSecure = { ssl: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/BindParams.ts b/core/startos/bindings/BindParams.ts
index f48f848b8..319666538 100644
--- a/core/startos/bindings/BindParams.ts
+++ b/core/startos/bindings/BindParams.ts
@@ -3,4 +3,4 @@ import type { AddSslOptions } from "./AddSslOptions";
 import type { BindKind } from "./BindKind";
 import type { BindOptionsSecure } from "./BindOptionsSecure";
 
-export interface BindParams { kind: BindKind, id: string, internalPort: number, scheme: string, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: BindOptionsSecure | null, }
\ No newline at end of file
+export type BindParams = { kind: BindKind, id: string, internalPort: number, scheme: string, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: BindOptionsSecure | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/ChrootParams.ts b/core/startos/bindings/ChrootParams.ts
index afbfb83b8..d8d1b1b46 100644
--- a/core/startos/bindings/ChrootParams.ts
+++ b/core/startos/bindings/ChrootParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ChrootParams { env: string | null, workdir: string | null, user: string | null, path: string, command: string, args: string[], }
\ No newline at end of file
+export type ChrootParams = { env: string | null, workdir: string | null, user: string | null, path: string, command: string, args: string[], };
\ No newline at end of file
diff --git a/core/startos/bindings/CreateOverlayedImageParams.ts b/core/startos/bindings/CreateOverlayedImageParams.ts
index 34924cb1a..65e7487b6 100644
--- a/core/startos/bindings/CreateOverlayedImageParams.ts
+++ b/core/startos/bindings/CreateOverlayedImageParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface CreateOverlayedImageParams { imageId: string, }
\ No newline at end of file
+export type CreateOverlayedImageParams = { imageId: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/DestroyOverlayedImageParams.ts b/core/startos/bindings/DestroyOverlayedImageParams.ts
index b875e45bd..34d4085a1 100644
--- a/core/startos/bindings/DestroyOverlayedImageParams.ts
+++ b/core/startos/bindings/DestroyOverlayedImageParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface DestroyOverlayedImageParams { guid: string, }
\ No newline at end of file
+export type DestroyOverlayedImageParams = { guid: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExecuteAction.ts b/core/startos/bindings/ExecuteAction.ts
index d31ae9279..52636bdbc 100644
--- a/core/startos/bindings/ExecuteAction.ts
+++ b/core/startos/bindings/ExecuteAction.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ExecuteAction { serviceId: string | null, actionId: string, input: any, }
\ No newline at end of file
+export type ExecuteAction = { serviceId: string | null, actionId: string, input: any, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExportActionParams.ts b/core/startos/bindings/ExportActionParams.ts
index e96194745..d19fc6905 100644
--- a/core/startos/bindings/ExportActionParams.ts
+++ b/core/startos/bindings/ExportActionParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ActionMetadata } from "./ActionMetadata";
 
-export interface ExportActionParams { id: string, metadata: ActionMetadata, }
\ No newline at end of file
+export type ExportActionParams = { id: string, metadata: ActionMetadata, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExportServiceInterfaceParams.ts b/core/startos/bindings/ExportServiceInterfaceParams.ts
index d30cce9db..ad7885507 100644
--- a/core/startos/bindings/ExportServiceInterfaceParams.ts
+++ b/core/startos/bindings/ExportServiceInterfaceParams.ts
@@ -2,4 +2,4 @@
 import type { AddressInfo } from "./AddressInfo";
 import type { ServiceInterfaceType } from "./ServiceInterfaceType";
 
-export interface ExportServiceInterfaceParams { id: string, name: string, description: string, hasPrimary: boolean, disabled: boolean, masked: boolean, addressInfo: AddressInfo, type: ServiceInterfaceType, }
\ No newline at end of file
+export type ExportServiceInterfaceParams = { id: string, name: string, description: string, hasPrimary: boolean, disabled: boolean, masked: boolean, addressInfo: AddressInfo, type: ServiceInterfaceType, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExposeForDependentsParams.ts b/core/startos/bindings/ExposeForDependentsParams.ts
index 4a1d627b6..9626f4dcf 100644
--- a/core/startos/bindings/ExposeForDependentsParams.ts
+++ b/core/startos/bindings/ExposeForDependentsParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ExposeForDependentsParams { paths: string[], }
\ No newline at end of file
+export type ExposeForDependentsParams = { paths: string[], };
\ No newline at end of file
diff --git a/core/startos/bindings/GetHostInfoParams.ts b/core/startos/bindings/GetHostInfoParams.ts
index 4041bff45..69abeeb13 100644
--- a/core/startos/bindings/GetHostInfoParams.ts
+++ b/core/startos/bindings/GetHostInfoParams.ts
@@ -2,4 +2,4 @@
 import type { Callback } from "./Callback";
 import type { GetHostInfoParamsKind } from "./GetHostInfoParamsKind";
 
-export interface GetHostInfoParams { kind: GetHostInfoParamsKind | null, serviceInterfaceId: string, packageId: string | null, callback: Callback, }
\ No newline at end of file
+export type GetHostInfoParams = { kind: GetHostInfoParamsKind | null, serviceInterfaceId: string, packageId: string | null, callback: Callback, };
\ No newline at end of file
diff --git a/core/startos/bindings/GetPrimaryUrlParams.ts b/core/startos/bindings/GetPrimaryUrlParams.ts
index 40fe7f154..6296d4342 100644
--- a/core/startos/bindings/GetPrimaryUrlParams.ts
+++ b/core/startos/bindings/GetPrimaryUrlParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
 
-export interface GetPrimaryUrlParams { packageId: string | null, serviceInterfaceId: string, callback: Callback, }
\ No newline at end of file
+export type GetPrimaryUrlParams = { packageId: string | null, serviceInterfaceId: string, callback: Callback, };
\ No newline at end of file
diff --git a/core/startos/bindings/GetServiceInterfaceParams.ts b/core/startos/bindings/GetServiceInterfaceParams.ts
index fb0f96791..1eb2b6f28 100644
--- a/core/startos/bindings/GetServiceInterfaceParams.ts
+++ b/core/startos/bindings/GetServiceInterfaceParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
 
-export interface GetServiceInterfaceParams { packageId: string | null, serviceInterfaceId: string, callback: Callback, }
\ No newline at end of file
+export type GetServiceInterfaceParams = { packageId: string | null, serviceInterfaceId: string, callback: Callback, };
\ No newline at end of file
diff --git a/core/startos/bindings/GetServicePortForwardParams.ts b/core/startos/bindings/GetServicePortForwardParams.ts
index 270fcb709..dd4eaf211 100644
--- a/core/startos/bindings/GetServicePortForwardParams.ts
+++ b/core/startos/bindings/GetServicePortForwardParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface GetServicePortForwardParams { packageId: string | null, internalPort: number, }
\ No newline at end of file
+export type GetServicePortForwardParams = { packageId: string | null, internalPort: number, };
\ No newline at end of file
diff --git a/core/startos/bindings/GetSslCertificateParams.ts b/core/startos/bindings/GetSslCertificateParams.ts
index 5be8333a5..a4a2447cd 100644
--- a/core/startos/bindings/GetSslCertificateParams.ts
+++ b/core/startos/bindings/GetSslCertificateParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Algorithm } from "./Algorithm";
 
-export interface GetSslCertificateParams { packageId: string | null, hostId: string, algorithm: Algorithm | null, }
\ No newline at end of file
+export type GetSslCertificateParams = { packageId: string | null, hostId: string, algorithm: Algorithm | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/GetSslKeyParams.ts b/core/startos/bindings/GetSslKeyParams.ts
index ca7e0e404..eb36cd2f5 100644
--- a/core/startos/bindings/GetSslKeyParams.ts
+++ b/core/startos/bindings/GetSslKeyParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Algorithm } from "./Algorithm";
 
-export interface GetSslKeyParams { packageId: string | null, hostId: string, algorithm: Algorithm | null, }
\ No newline at end of file
+export type GetSslKeyParams = { packageId: string | null, hostId: string, algorithm: Algorithm | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/GetStoreParams.ts b/core/startos/bindings/GetStoreParams.ts
index 65703be7a..6b965e75f 100644
--- a/core/startos/bindings/GetStoreParams.ts
+++ b/core/startos/bindings/GetStoreParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface GetStoreParams { packageId: string | null, path: string, }
\ No newline at end of file
+export type GetStoreParams = { packageId: string | null, path: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/GetSystemSmtpParams.ts b/core/startos/bindings/GetSystemSmtpParams.ts
index 617fd7fa0..25d30529f 100644
--- a/core/startos/bindings/GetSystemSmtpParams.ts
+++ b/core/startos/bindings/GetSystemSmtpParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
 
-export interface GetSystemSmtpParams { callback: Callback, }
\ No newline at end of file
+export type GetSystemSmtpParams = { callback: Callback, };
\ No newline at end of file
diff --git a/core/startos/bindings/ListServiceInterfacesParams.ts b/core/startos/bindings/ListServiceInterfacesParams.ts
index 33db3f129..cd889b149 100644
--- a/core/startos/bindings/ListServiceInterfacesParams.ts
+++ b/core/startos/bindings/ListServiceInterfacesParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
 
-export interface ListServiceInterfacesParams { packageId: string | null, callback: Callback, }
\ No newline at end of file
+export type ListServiceInterfacesParams = { packageId: string | null, callback: Callback, };
\ No newline at end of file
diff --git a/core/startos/bindings/MountParams.ts b/core/startos/bindings/MountParams.ts
index 26e8373c7..4f8615a25 100644
--- a/core/startos/bindings/MountParams.ts
+++ b/core/startos/bindings/MountParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { MountTarget } from "./MountTarget";
 
-export interface MountParams { location: string, target: MountTarget, }
\ No newline at end of file
+export type MountParams = { location: string, target: MountTarget, };
\ No newline at end of file
diff --git a/core/startos/bindings/MountTarget.ts b/core/startos/bindings/MountTarget.ts
index 6cbee7aa6..6a28ec3ac 100644
--- a/core/startos/bindings/MountTarget.ts
+++ b/core/startos/bindings/MountTarget.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface MountTarget { packageId: string, volumeId: string, subpath: string | null, readonly: boolean, }
\ No newline at end of file
+export type MountTarget = { packageId: string, volumeId: string, subpath: string | null, readonly: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/ParamsMaybePackageId.ts b/core/startos/bindings/ParamsMaybePackageId.ts
index 80bdd9a55..867eb2a51 100644
--- a/core/startos/bindings/ParamsMaybePackageId.ts
+++ b/core/startos/bindings/ParamsMaybePackageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ParamsMaybePackageId { packageId: string | null, }
\ No newline at end of file
+export type ParamsMaybePackageId = { packageId: string | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/ParamsPackageId.ts b/core/startos/bindings/ParamsPackageId.ts
index 7631cfb11..aa3caec92 100644
--- a/core/startos/bindings/ParamsPackageId.ts
+++ b/core/startos/bindings/ParamsPackageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ParamsPackageId { packageId: string, }
\ No newline at end of file
+export type ParamsPackageId = { packageId: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/RemoveActionParams.ts b/core/startos/bindings/RemoveActionParams.ts
index 3e0c3c48d..ae2faccbe 100644
--- a/core/startos/bindings/RemoveActionParams.ts
+++ b/core/startos/bindings/RemoveActionParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface RemoveActionParams { id: string, }
\ No newline at end of file
+export type RemoveActionParams = { id: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/RemoveAddressParams.ts b/core/startos/bindings/RemoveAddressParams.ts
index 1bc483f89..2b9881ce1 100644
--- a/core/startos/bindings/RemoveAddressParams.ts
+++ b/core/startos/bindings/RemoveAddressParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface RemoveAddressParams { id: string, }
\ No newline at end of file
+export type RemoveAddressParams = { id: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/ReverseProxyBind.ts b/core/startos/bindings/ReverseProxyBind.ts
index 3f9e0dc25..6c2d5a586 100644
--- a/core/startos/bindings/ReverseProxyBind.ts
+++ b/core/startos/bindings/ReverseProxyBind.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ReverseProxyBind { ip: string | null, port: number, ssl: boolean, }
\ No newline at end of file
+export type ReverseProxyBind = { ip: string | null, port: number, ssl: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/ReverseProxyDestination.ts b/core/startos/bindings/ReverseProxyDestination.ts
index a6003e189..8786f1008 100644
--- a/core/startos/bindings/ReverseProxyDestination.ts
+++ b/core/startos/bindings/ReverseProxyDestination.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ReverseProxyDestination { ip: string | null, port: number, ssl: boolean, }
\ No newline at end of file
+export type ReverseProxyDestination = { ip: string | null, port: number, ssl: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/ReverseProxyHttp.ts b/core/startos/bindings/ReverseProxyHttp.ts
index 5c1d0aa1b..f7b652e6a 100644
--- a/core/startos/bindings/ReverseProxyHttp.ts
+++ b/core/startos/bindings/ReverseProxyHttp.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface ReverseProxyHttp { headers: null | {[key: string]: string}, }
\ No newline at end of file
+export type ReverseProxyHttp = { headers: null | {[key: string]: string}, };
\ No newline at end of file
diff --git a/core/startos/bindings/ReverseProxyParams.ts b/core/startos/bindings/ReverseProxyParams.ts
index bde3034e9..bc6d3016c 100644
--- a/core/startos/bindings/ReverseProxyParams.ts
+++ b/core/startos/bindings/ReverseProxyParams.ts
@@ -3,4 +3,4 @@ import type { ReverseProxyBind } from "./ReverseProxyBind";
 import type { ReverseProxyDestination } from "./ReverseProxyDestination";
 import type { ReverseProxyHttp } from "./ReverseProxyHttp";
 
-export interface ReverseProxyParams { bind: ReverseProxyBind, dst: ReverseProxyDestination, http: ReverseProxyHttp, }
\ No newline at end of file
+export type ReverseProxyParams = { bind: ReverseProxyBind, dst: ReverseProxyDestination, http: ReverseProxyHttp, };
\ No newline at end of file
diff --git a/core/startos/bindings/SetConfigured.ts b/core/startos/bindings/SetConfigured.ts
index 05e1c7f83..8f191b562 100644
--- a/core/startos/bindings/SetConfigured.ts
+++ b/core/startos/bindings/SetConfigured.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface SetConfigured { configured: boolean, }
\ No newline at end of file
+export type SetConfigured = { configured: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/SetDependenciesParams.ts b/core/startos/bindings/SetDependenciesParams.ts
index 7741cddde..b313b0718 100644
--- a/core/startos/bindings/SetDependenciesParams.ts
+++ b/core/startos/bindings/SetDependenciesParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DependencyRequirement } from "./DependencyRequirement";
 
-export interface SetDependenciesParams { dependencies: Array<DependencyRequirement>, }
\ No newline at end of file
+export type SetDependenciesParams = { dependencies: Array<DependencyRequirement>, };
\ No newline at end of file
diff --git a/core/startos/bindings/SetHealth.ts b/core/startos/bindings/SetHealth.ts
index 3635ec9c5..321b5c97b 100644
--- a/core/startos/bindings/SetHealth.ts
+++ b/core/startos/bindings/SetHealth.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { HealthCheckString } from "./HealthCheckString";
 
-export interface SetHealth { name: string, status: HealthCheckString, message: string | null, }
\ No newline at end of file
+export type SetHealth = { name: string, status: HealthCheckString, message: string | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/SetMainStatus.ts b/core/startos/bindings/SetMainStatus.ts
index 86e7d9b2f..0476ff4ce 100644
--- a/core/startos/bindings/SetMainStatus.ts
+++ b/core/startos/bindings/SetMainStatus.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Status } from "./Status";
 
-export interface SetMainStatus { status: Status, }
\ No newline at end of file
+export type SetMainStatus = { status: Status, };
\ No newline at end of file
diff --git a/core/startos/bindings/SetStoreParams.ts b/core/startos/bindings/SetStoreParams.ts
index 9be56724e..e3496a171 100644
--- a/core/startos/bindings/SetStoreParams.ts
+++ b/core/startos/bindings/SetStoreParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export interface SetStoreParams { value: any, path: string, }
\ No newline at end of file
+export type SetStoreParams = { value: any, path: string, };
\ No newline at end of file
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index d9e702a0d..7e2bf2769 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -420,6 +420,7 @@ pub enum CurrentDependencyInfo {
     #[serde(rename_all = "camelCase")]
     Running {
         #[serde(default)]
+        #[ts(type = "string[]")]
         health_checks: BTreeSet<HealthCheckId>,
     },
 }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index c3a49ac64..f791b6458 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -255,7 +255,7 @@ struct RemoveAddressParams {
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
 enum AllowedStatuses {
     OnlyRunning, // onlyRunning
     OnlyStopped,

From f8441ab42e6c76bdc9c2502e1029a98611554186 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Tue, 26 Mar 2024 10:37:22 -0600
Subject: [PATCH 096/341] chore: Add in the fix for the test integration to the
 actual sdk

---
 sdk/lib/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index ce3143ab6..fa77d2c02 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -172,7 +172,7 @@ export type ActionMetadata = {
   warning: string | null
   input: InputSpec
   disabled: boolean
-  allowedStatuses: "only-running" | "only-stopped" | "any"
+  allowedStatuses: "onlyRunning" | "onlyStopped" | "any"
   /**
    * So the ordering of the actions is by alphabetical order of the group, then followed by the alphabetical of the actions
    */

From e25c50a467fbca0e287f0d2aabc2c378a956994e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 26 Mar 2024 10:46:46 -0600
Subject: [PATCH 097/341] fix types to match

---
 sdk/lib/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index ce3143ab6..fa77d2c02 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -172,7 +172,7 @@ export type ActionMetadata = {
   warning: string | null
   input: InputSpec
   disabled: boolean
-  allowedStatuses: "only-running" | "only-stopped" | "any"
+  allowedStatuses: "onlyRunning" | "onlyStopped" | "any"
   /**
    * So the ordering of the actions is by alphabetical order of the group, then followed by the alphabetical of the actions
    */

From f9edff8bf469261c56ca640b703af8eaeb32c881 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 26 Mar 2024 16:21:57 -0600
Subject: [PATCH 098/341] handle todos

---
 core/startos/src/auth.rs                      |   1 -
 core/startos/src/backup/mod.rs                |   9 +
 core/startos/src/backup/restore.rs            |   1 -
 core/startos/src/config/mod.rs                |   1 -
 core/startos/src/context/rpc.rs               |  34 ----
 core/startos/src/db/model/package.rs          |  37 ++--
 core/startos/src/dependencies.rs              |   2 -
 core/startos/src/lib.rs                       |   2 +-
 core/startos/src/net/ssl.rs                   |   1 -
 core/startos/src/net/tor.rs                   |   2 +-
 core/startos/src/s9pk/rpc.rs                  |   2 +-
 core/startos/src/s9pk/v1/manifest.rs          |   5 +-
 core/startos/src/s9pk/v2/compat.rs            |   7 +-
 .../src/service/service_effect_handler.rs     |  44 +++--
 core/startos/src/service/service_map.rs       |   1 -
 core/startos/src/volume.rs                    | 183 ------------------
 .../src/app/services/patch-db/data-model.ts   |   4 +-
 17 files changed, 58 insertions(+), 278 deletions(-)

diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 4d3c20bd1..7adce72bc 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -93,7 +93,6 @@ pub fn auth() -> ParentHandler {
             from_fn_async(logout)
                 .with_metadata("get-session", Value::Bool(true))
                 .with_remote_cli::<CliContext>()
-                // TODO @dr-bonez
                 .no_display(),
         )
         .subcommand("session", session())
diff --git a/core/startos/src/backup/mod.rs b/core/startos/src/backup/mod.rs
index de2dfbf7d..c963118c4 100644
--- a/core/startos/src/backup/mod.rs
+++ b/core/startos/src/backup/mod.rs
@@ -45,6 +45,15 @@ pub fn backup() -> ParentHandler {
         .subcommand("target", target::target())
 }
 
+pub fn package_backup() -> ParentHandler {
+    ParentHandler::new().subcommand(
+        "restore",
+        from_fn_async(restore::restore_packages_rpc)
+            .no_display()
+            .with_remote_cli::<CliContext>(),
+    )
+}
+
 #[derive(Deserialize, Serialize)]
 struct BackupMetadata {
     pub timestamp: DateTime<Utc>,
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 0cdd24aba..70695b42e 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -33,7 +33,6 @@ pub struct RestorePackageParams {
     pub password: String,
 }
 
-// TODO dr Why doesn't anything use this
 // #[command(rename = "restore", display(display_none))]
 #[instrument(skip(ctx, password))]
 pub async fn restore_packages_rpc(
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index bcd44193b..18f67b05a 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -165,7 +165,6 @@ pub struct SetParams {
     pub config: StdinDeserializable<Option<Config>>,
 }
 
-// TODO Dr Why isn't this used?
 // #[command(
 //     subcommands(self(set_impl(async, context(RpcContext))), set_dry),
 //     display(display_none),
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index f987ffbf4..6450eb561 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -19,7 +19,6 @@ use super::setup::CURRENT_SECRET;
 use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
 use crate::core::rpc_continuations::{RequestGuid, RestHandler, RpcContinuation, WebSocketHandler};
-use crate::db::model::package::CurrentDependents;
 use crate::db::prelude::PatchDbExt;
 use crate::dependencies::compute_dependency_config_errs;
 use crate::disk::OsPartitionInfo;
@@ -207,39 +206,6 @@ impl RpcContext {
 
     #[instrument(skip(self))]
     pub async fn cleanup_and_initialize(&self) -> Result<(), Error> {
-        self.db
-            .mutate(|f| {
-                let mut current_dependents = f
-                    .as_public_mut()
-                    .as_package_data()
-                    .keys()?
-                    .into_iter()
-                    .map(|k| (k.clone(), BTreeMap::new()))
-                    .collect::<BTreeMap<_, _>>();
-                for (package_id, package) in
-                    f.as_public_mut().as_package_data_mut().as_entries_mut()?
-                {
-                    for (k, v) in package.clone().into_current_dependencies().into_entries()? {
-                        let mut entry: BTreeMap<_, _> =
-                            current_dependents.remove(&k).unwrap_or_default();
-                        entry.insert(package_id.clone(), v.de()?);
-                        current_dependents.insert(k, entry);
-                    }
-                }
-                for (package_id, current_dependents) in current_dependents {
-                    if let Some(deps) = f
-                        .as_public_mut()
-                        .as_package_data_mut()
-                        .as_idx_mut(&package_id)
-                        .map(|i| i.as_current_dependents_mut())
-                    {
-                        deps.ser(&CurrentDependents(current_dependents))?;
-                    }
-                }
-                Ok(())
-            })
-            .await?;
-
         self.services.init(&self).await?;
         tracing::info!("Initialized Package Managers");
 
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 7e2bf2769..05d6e73b7 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use chrono::{DateTime, Utc};
+use emver::VersionRange;
 use imbl_value::InternedString;
 use models::{DataUrl, HealthCheckId, HostId, PackageId};
 use patch_db::json_ptr::JsonPointer;
@@ -299,7 +300,6 @@ pub struct PackageDataEntry {
     pub icon: DataUrl<'static>,
     pub last_backup: Option<DateTime<Utc>>,
     pub dependency_info: BTreeMap<PackageId, StaticDependencyInfo>,
-    pub current_dependents: CurrentDependents,
     pub current_dependencies: CurrentDependencies,
     pub interface_addresses: InterfaceAddressMap,
     pub hosts: HostInfo,
@@ -357,29 +357,6 @@ impl Default for ExposedUI {
     }
 }
 
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
-pub struct CurrentDependents(pub BTreeMap<PackageId, CurrentDependencyInfo>);
-impl CurrentDependents {
-    pub fn map(
-        mut self,
-        transform: impl Fn(
-            BTreeMap<PackageId, CurrentDependencyInfo>,
-        ) -> BTreeMap<PackageId, CurrentDependencyInfo>,
-    ) -> Self {
-        self.0 = transform(self.0);
-        self
-    }
-}
-impl Map for CurrentDependents {
-    type Key = PackageId;
-    type Value = CurrentDependencyInfo;
-    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
-        Ok(key)
-    }
-    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
-        Ok(key.clone().into())
-    }
-}
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 pub struct CurrentDependencies(pub BTreeMap<PackageId, CurrentDependencyInfo>);
 impl CurrentDependencies {
@@ -416,9 +393,19 @@ pub struct StaticDependencyInfo {
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "kind")]
 pub enum CurrentDependencyInfo {
-    Exists,
+    #[serde(rename_all = "camelCase")]
+    Exists {
+        #[ts(type = "string")]
+        url: Url,
+        #[ts(type = "string")]
+        version_spec: VersionRange,
+    },
     #[serde(rename_all = "camelCase")]
     Running {
+        #[ts(type = "string")]
+        url: Url,
+        #[ts(type = "string")]
+        version_spec: VersionRange,
         #[serde(default)]
         #[ts(type = "string[]")]
         health_checks: BTreeSet<HealthCheckId>,
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 168713f61..ca40bf432 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -56,8 +56,6 @@ pub struct DepInfo {
     pub version: VersionRange,
     pub requirement: DependencyRequirement,
     pub description: Option<String>,
-    #[serde(default)]
-    pub config: Option<Value>, // TODO: remove
 }
 
 #[derive(Deserialize, Serialize, Parser)]
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index d19f9c61a..0b3336783 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -236,7 +236,7 @@ pub fn package() -> ParentHandler {
                 .with_remote_cli::<CliContext>(),
         )
         .subcommand("dependency", dependencies::dependency())
-        .subcommand("package-backup", backup::backup())
+        .subcommand("backup", backup::package_backup())
         .subcommand("connect", from_fn_async(service::connect_rpc).no_cli())
         .subcommand(
             "connect",
diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index 0756114c5..245881c55 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -183,7 +183,6 @@ pub async fn root_ca_start_time() -> Result<SystemTime, Error> {
 const EC_CURVE_NAME: nid::Nid = nid::Nid::X9_62_PRIME256V1;
 lazy_static::lazy_static! {
     static ref EC_GROUP: EcGroup = EcGroup::from_curve_name(EC_CURVE_NAME).unwrap();
-    static ref SSL_MUTEX: Mutex<()> = Mutex::new(()); // TODO: make thread safe
 }
 
 pub async fn export_key(key: &PKey<Private>, target: &Path) -> Result<(), Error> {
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 72b05e2aa..c87f506dc 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -768,7 +768,7 @@ async fn test() {
     let mut conn = torut::control::UnauthenticatedConn::new(
         TcpStream::connect(SocketAddr::from(([127, 0, 0, 1], 9051)))
             .await
-            .unwrap(), // TODO
+            .unwrap(),
     );
     let auth = conn
         .load_protocol_info()
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index e11faa2ff..3a98da02b 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -132,7 +132,7 @@ async fn add_image(
     Command::new("bash")
         .arg("-c")
         .arg(format!(
-            "{CONTAINER_TOOL} export {container_id} | mksquashfs - {sqfs} -tar -force-uid 100000 -force-gid 100000", // TODO: real uid mapping
+            "{CONTAINER_TOOL} export {container_id} | mksquashfs - {sqfs} -tar",
             container_id = container_id.trim(),
             sqfs = sqfs_path.display()
         ))
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index 381a446fe..813ad11a6 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -1,7 +1,9 @@
+use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
 use imbl_value::InOMap;
 pub use models::PackageId;
+use models::VolumeId;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -11,7 +13,6 @@ use crate::prelude::*;
 use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
 use crate::util::Version;
 use crate::version::{Current, VersionT};
-use crate::volume::Volumes;
 
 fn current_version() -> Version {
     Current::new().semver().into()
@@ -40,7 +41,7 @@ pub struct Manifest {
     pub donation_url: Option<Url>,
     #[serde(default)]
     pub alerts: Alerts,
-    pub volumes: Volumes,
+    pub volumes: BTreeMap<VolumeId, Value>,
     #[serde(default)]
     pub dependencies: Dependencies,
     pub config: Option<InOMap<String, Value>>,
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index e2ef8bdbb..423491e7a 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -19,7 +19,6 @@ use crate::s9pk::v1::reader::S9pkReader;
 use crate::s9pk::v2::S9pk;
 use crate::util::io::TmpDir;
 use crate::util::Invoke;
-use crate::volume::Volume;
 use crate::ARCH;
 
 pub const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x01];
@@ -254,7 +253,7 @@ impl S9pk<Section<MultiCursorFile>> {
         for (asset_id, _) in manifest
             .volumes
             .iter()
-            .filter(|(_, v)| matches!(v, Volume::Assets { .. }))
+            .filter(|(_, v)| v.get("type").and_then(|v| v.as_str()) == Some("assets"))
         {
             let assets_path = asset_dir.join(&asset_id);
             let sqfs_path = assets_path.with_extension("squashfs");
@@ -338,13 +337,13 @@ impl From<ManifestV1> for Manifest {
             assets: value
                 .volumes
                 .iter()
-                .filter(|(_, v)| matches!(v, &&Volume::Assets { .. }))
+                .filter(|(_, v)| v.get("type").and_then(|v| v.as_str()) == Some("assets"))
                 .map(|(id, _)| id.clone())
                 .collect(),
             volumes: value
                 .volumes
                 .iter()
-                .filter(|(_, v)| matches!(v, &&Volume::Data { .. }))
+                .filter(|(_, v)| v.get("type").and_then(|v| v.as_str()) == Some("data"))
                 .map(|(id, _)| id.clone())
                 .collect(),
             alerts: value.alerts,
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index f791b6458..b3eaf365c 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -8,6 +8,7 @@ use std::sync::{Arc, Weak};
 
 use clap::builder::ValueParserFactory;
 use clap::Parser;
+use emver::VersionRange;
 use imbl::OrdMap;
 use imbl_value::{json, InternedString};
 use models::{ActionId, HealthCheckId, ImageId, PackageId, VolumeId};
@@ -16,6 +17,7 @@ use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use ts_rs::TS;
+use url::Url;
 
 use crate::db::model::package::{
     CurrentDependencies, CurrentDependencyInfo, ExposedUI, StoreExposedUI,
@@ -1096,15 +1098,19 @@ enum DependencyRequirement {
         id: PackageId,
         #[ts(type = "string[]")]
         health_checks: BTreeSet<HealthCheckId>,
-        version_spec: String,
-        url: String,
+        #[ts(type = "string")]
+        version_spec: VersionRange,
+        #[ts(type = "string")]
+        url: Url,
     },
     #[serde(rename_all = "camelCase")]
     Exists {
         #[ts(type = "string")]
         id: PackageId,
-        version_spec: String,
-        url: String,
+        #[ts(type = "string")]
+        version_spec: VersionRange,
+        #[ts(type = "string")]
+        url: Url,
     },
 }
 // filebrowser:exists,bitcoind:running:foo+bar+baz
@@ -1114,8 +1120,8 @@ impl FromStr for DependencyRequirement {
         match s.split_once(':') {
             Some((id, "e")) | Some((id, "exists")) => Ok(Self::Exists {
                 id: id.parse()?,
-                url: "".to_string(),
-                version_spec: "*".to_string(),
+                url: "".parse()?,           // TODO
+                version_spec: "*".parse()?, // TODO
             }),
             Some((id, rest)) => {
                 let health_checks = match rest.split_once(':') {
@@ -1138,15 +1144,15 @@ impl FromStr for DependencyRequirement {
                 Ok(Self::Running {
                     id: id.parse()?,
                     health_checks,
-                    url: "".to_string(),
-                    version_spec: "*".to_string(),
+                    url: "".parse()?,           // TODO
+                    version_spec: "*".parse()?, // TODO
                 })
             }
             None => Ok(Self::Running {
                 id: s.parse()?,
                 health_checks: BTreeSet::new(),
-                url: "".to_string(),
-                version_spec: "*".to_string(),
+                url: "".parse()?,           // TODO
+                version_spec: "*".parse()?, // TODO
             }),
         }
     }
@@ -1183,23 +1189,23 @@ async fn set_dependencies(
                             id,
                             url,
                             version_spec,
-                        } => (id, CurrentDependencyInfo::Exists),
+                        } => (id, CurrentDependencyInfo::Exists { url, version_spec }),
                         DependencyRequirement::Running {
                             id,
                             health_checks,
                             url,
                             version_spec,
-                        } => (id, CurrentDependencyInfo::Running { health_checks }),
+                        } => (
+                            id,
+                            CurrentDependencyInfo::Running {
+                                url,
+                                version_spec,
+                                health_checks,
+                            },
+                        ),
                     })
                     .collect(),
             );
-            for (dep, entry) in db.as_public_mut().as_package_data_mut().as_entries_mut()? {
-                if let Some(info) = dependencies.0.get(&dep) {
-                    entry.as_current_dependents_mut().insert(id, info)?;
-                } else {
-                    entry.as_current_dependents_mut().remove(id)?;
-                }
-            }
             db.as_public_mut()
                 .as_package_data_mut()
                 .as_idx_mut(id)
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 23e1bb540..1a9d2342c 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -171,7 +171,6 @@ impl ServiceMap {
                                 icon,
                                 last_backup: None,
                                 dependency_info: Default::default(),
-                                current_dependents: Default::default(), // TODO: initialize
                                 current_dependencies: Default::default(),
                                 interface_addresses: Default::default(),
                                 hosts: Default::default(),
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index a631e68e6..593422a67 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -1,15 +1,9 @@
-use std::collections::BTreeMap;
-use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 
 pub use helpers::script_dir;
-use imbl_value::InternedString;
 pub use models::VolumeId;
 use models::{HostId, PackageId};
-use serde::{Deserialize, Serialize};
-use tracing::instrument;
 
-use crate::context::RpcContext;
 use crate::net::PACKAGE_CERT_PATH;
 use crate::prelude::*;
 use crate::util::Version;
@@ -17,72 +11,6 @@ use crate::util::Version;
 pub const PKG_VOLUME_DIR: &str = "package-data/volumes";
 pub const BACKUP_DIR: &str = "/media/embassy/backups";
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct Volumes(BTreeMap<VolumeId, Volume>);
-impl Volumes {
-    #[instrument(skip_all)]
-    pub async fn install(
-        &self,
-        ctx: &RpcContext,
-        pkg_id: &PackageId,
-        version: &Version,
-    ) -> Result<(), Error> {
-        for (volume_id, volume) in &self.0 {
-            volume
-                .install(&ctx.datadir, pkg_id, version, volume_id)
-                .await?; // TODO: concurrent?
-        }
-        Ok(())
-    }
-    pub fn get_path_for(
-        &self,
-        path: &PathBuf,
-        pkg_id: &PackageId,
-        version: &Version,
-        volume_id: &VolumeId,
-    ) -> Option<PathBuf> {
-        self.0
-            .get(volume_id)
-            .map(|volume| volume.path_for(path, pkg_id, version, volume_id))
-    }
-    pub fn to_readonly(&self) -> Self {
-        Volumes(
-            self.0
-                .iter()
-                .map(|(id, volume)| {
-                    let mut volume = volume.clone();
-                    volume.set_readonly();
-                    (id.clone(), volume)
-                })
-                .collect(),
-        )
-    }
-}
-impl Deref for Volumes {
-    type Target = BTreeMap<VolumeId, Volume>;
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl DerefMut for Volumes {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-impl Map for Volumes {
-    type Key = VolumeId;
-    type Value = Volume;
-    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
-        Ok(key)
-    }
-    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
-        match key {
-            VolumeId::Custom(id) => Ok(id.clone().into()),
-            _ => Self::key_str(key).map(|s| InternedString::intern(s.as_ref())),
-        }
-    }
-}
-
 pub fn data_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, volume_id: &VolumeId) -> PathBuf {
     datadir
         .as_ref()
@@ -108,114 +36,3 @@ pub fn backup_dir(pkg_id: &PackageId) -> PathBuf {
 pub fn cert_dir(pkg_id: &PackageId, host_id: &HostId) -> PathBuf {
     Path::new(PACKAGE_CERT_PATH).join(pkg_id).join(host_id)
 }
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(tag = "type")]
-#[serde(rename_all = "camelCase")]
-pub enum Volume {
-    #[serde(rename_all = "camelCase")]
-    Data {
-        #[serde(skip)]
-        readonly: bool,
-    },
-    #[serde(rename_all = "camelCase")]
-    Assets {},
-    #[serde(rename_all = "camelCase")]
-    Pointer {
-        package_id: PackageId,
-        volume_id: VolumeId,
-        path: PathBuf,
-        readonly: bool,
-    },
-    #[serde(rename_all = "camelCase")]
-    Certificate { interface_id: HostId },
-    #[serde(rename_all = "camelCase")]
-    Backup { readonly: bool },
-}
-impl Volume {
-    pub async fn install(
-        &self,
-        path: &PathBuf,
-        pkg_id: &PackageId,
-        version: &Version,
-        volume_id: &VolumeId,
-    ) -> Result<(), Error> {
-        match self {
-            Volume::Data { .. } => {
-                tokio::fs::create_dir_all(self.path_for(path, pkg_id, version, volume_id)).await?;
-            }
-            _ => (),
-        }
-        Ok(())
-    }
-    pub fn path_for(
-        &self,
-        data_dir_path: impl AsRef<Path>,
-        pkg_id: &PackageId,
-        version: &Version,
-        volume_id: &VolumeId,
-    ) -> PathBuf {
-        match self {
-            Volume::Data { .. } => data_dir(&data_dir_path, pkg_id, volume_id),
-            Volume::Assets {} => asset_dir(&data_dir_path, pkg_id, version).join(volume_id),
-            Volume::Pointer {
-                package_id,
-                volume_id,
-                path,
-                ..
-            } => data_dir(&data_dir_path, package_id, volume_id).join(if path.is_absolute() {
-                path.strip_prefix("/").unwrap()
-            } else {
-                path.as_ref()
-            }),
-            Volume::Certificate { interface_id } => cert_dir(pkg_id, &interface_id),
-            Volume::Backup { .. } => backup_dir(pkg_id),
-        }
-    }
-
-    pub fn pointer_path(&self, data_dir_path: impl AsRef<Path>) -> Option<PathBuf> {
-        if let Volume::Pointer {
-            path,
-            package_id,
-            volume_id,
-            ..
-        } = self
-        {
-            Some(
-                data_dir(data_dir_path.as_ref(), package_id, volume_id).join(
-                    if path.is_absolute() {
-                        path.strip_prefix("/").unwrap()
-                    } else {
-                        path.as_ref()
-                    },
-                ),
-            )
-        } else {
-            None
-        }
-    }
-
-    pub fn set_readonly(&mut self) {
-        match self {
-            Volume::Data { readonly } => {
-                *readonly = true;
-            }
-            Volume::Pointer { readonly, .. } => {
-                *readonly = true;
-            }
-            Volume::Backup { readonly } => {
-                *readonly = true;
-            }
-            _ => (),
-        }
-    }
-    pub fn readonly(&self) -> bool {
-        match self {
-            Volume::Data { readonly } => *readonly,
-            Volume::Assets {} => true,
-            Volume::Pointer { readonly, .. } => *readonly,
-            Volume::Certificate { .. } => true,
-            Volume::Backup { readonly } => *readonly,
-        }
-    }
-}
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index 537e15329..c1d46ece2 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -139,7 +139,9 @@ export enum PackageState {
 }
 
 export interface CurrentDependencyInfo {
-  versionRange: string
+  kind: 'exists' | 'running'
+  url: string
+  versionSpec: string
   healthChecks: string[] // array of health check IDs
 }
 

From 22d8d08355a2b2cecc03ee8fd33e6e03fa1b4ee0 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Wed, 27 Mar 2024 10:25:07 -0600
Subject: [PATCH 099/341] update patch types for current dependencies

---
 .../apps-routes/app-show/app-show.page.ts     | 10 +++----
 .../src/app/pages/updates/updates.page.html   | 19 +++++++-----
 .../ui/src/app/pages/updates/updates.page.ts  |  4 +--
 .../install-progress/install-progress.pipe.ts |  6 ----
 .../ui/src/app/services/api/api.fixures.ts    | 29 ++++++++-----------
 .../services/api/embassy-mock-api.service.ts  | 10 +++----
 .../ui/src/app/services/api/mock-patch.ts     | 19 +++++-------
 .../ui/src/app/services/dep-error.service.ts  |  6 ++--
 .../src/app/services/patch-db/data-model.ts   | 14 ++++-----
 web/projects/ui/src/app/util/dry-update.ts    |  3 +-
 10 files changed, 52 insertions(+), 68 deletions(-)

diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 840c647d2..0c32c0ba2 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -103,13 +103,13 @@ export class AppShowPage {
       depErrors,
     )
 
-    const depInfo = pkg.dependencyInfo[depId]
+    const { title, icon, versionSpec } = pkg.currentDependencies[depId]
 
     return {
       id: depId,
-      version: pkg.currentDependencies[depId].versionRange, // @TODO do we want this version range?
-      title: depInfo?.title || depId,
-      icon: depInfo?.icon || '',
+      version: versionSpec,
+      title,
+      icon,
       errorText: errorText
         ? `${errorText}. ${manifest.title} will not work as expected.`
         : '',
@@ -184,7 +184,7 @@ export class AppShowPage {
     const dependentInfo: DependentInfo = {
       id: pkgManifest.id,
       title: pkgManifest.title,
-      version: pkg.currentDependencies[depId].versionRange,
+      version: pkg.currentDependencies[depId].versionSpec,
     }
     const navigationExtras: NavigationExtras = {
       state: { dependentInfo },
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.html b/web/projects/ui/src/app/pages/updates/updates.page.html
index a31d889ff..ca71bb6b3 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.html
+++ b/web/projects/ui/src/app/pages/updates/updates.page.html
@@ -55,15 +55,18 @@ <h2 class="inline">
                     </p>
                   </ion-label>
                   <div slot="end" style="margin-left: 4px">
-                    <round-progress
+                    <ng-container
                       *ngIf="local.stateInfo.state === 'updating' else notUpdating"
-                      [current]="(local.stateInfo.installingInfo.progress.overall | installingProgress) || 0"
-                      [max]="100"
-                      [radius]="13"
-                      [stroke]="3"
-                      [rounded]="true"
-                      color="var(--ion-color-primary)"
-                    ></round-progress>
+                    >
+                      <round-progress
+                        [current]="(local.stateInfo.installingInfo.progress.overall | installingProgress) || 0"
+                        [max]="100"
+                        [radius]="13"
+                        [stroke]="3"
+                        [rounded]="true"
+                        color="var(--ion-color-primary)"
+                      ></round-progress>
+                    </ng-container>
                     <ng-template #notUpdating>
                       <ion-spinner
                         *ngIf="marketplaceService.updateQueue[pkg.manifest.id] else updateBtn"
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.ts b/web/projects/ui/src/app/pages/updates/updates.page.ts
index ef0281920..11d627cb5 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.page.ts
@@ -44,8 +44,8 @@ export class UpdatesPage {
     marketplace: this.marketplaceService.getMarketplace$(),
     localPkgs: this.patch.watch$('packageData').pipe(
       map(pkgs =>
-        Object.values(pkgs).reduce((acc, curr) => {
-          if (isInstalled(curr) || isUpdating(curr)) return { ...acc, curr }
+        Object.entries(pkgs).reduce((acc, [id, val]) => {
+          if (isInstalled(val) || isUpdating(val)) return { ...acc, [id]: val }
           return acc
         }, {} as Record<string, PackageDataEntry<InstalledState | UpdatingState>>),
       ),
diff --git a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
index e6f87a127..93e826bf7 100644
--- a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
+++ b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
@@ -24,9 +24,3 @@ export class InstallingProgressPipe implements PipeTransform {
     return Number((progress.done / progress.total).toFixed(2))
   }
 }
-
-function getProgress(progress: Progress): number | null {
-  if (progress === true) return 1
-  if (progress === false || !progress.total) return null
-  return Number((progress.done / progress.total).toFixed(2))
-}
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 7786e3566..77c0a684c 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1608,7 +1608,6 @@ export module Mock {
       },
     },
     currentDependencies: {},
-    dependencyInfo: {},
     marketplaceUrl: 'https://registry.start9.com/',
     developerKey: 'developer-key',
   }
@@ -1737,15 +1736,13 @@ export module Mock {
       },
     },
     currentDependencies: {
-      bitcoind: {
-        versionRange: '>=26.0.0',
-        healthChecks: [],
-      },
-    },
-    dependencyInfo: {
       bitcoind: {
         title: Mock.MockManifestBitcoind.title,
         icon: 'assets/img/service-icons/bitcoind.svg',
+        kind: 'running',
+        registryUrl: '',
+        versionSpec: '>=26.0.0',
+        healthChecks: [],
       },
     },
     marketplaceUrl: 'https://registry.start9.com/',
@@ -1982,23 +1979,21 @@ export module Mock {
       },
     },
     currentDependencies: {
-      bitcoind: {
-        versionRange: '>=26.0.0',
-        healthChecks: [],
-      },
-      'btc-rpc-proxy': {
-        versionRange: '>2.0.0', // @TODO
-        healthChecks: [],
-      },
-    },
-    dependencyInfo: {
       bitcoind: {
         title: Mock.MockManifestBitcoind.title,
         icon: 'assets/img/service-icons/bitcoind.svg',
+        kind: 'running',
+        registryUrl: 'https://registry.start9.com',
+        versionSpec: '>=26.0.0',
+        healthChecks: [],
       },
       'btc-rpc-proxy': {
         title: Mock.MockManifestBitcoinProxy.title,
         icon: 'assets/img/service-icons/btc-rpc-proxy.png',
+        kind: 'exists',
+        registryUrl: 'https://community-registry.start9.com',
+        versionSpec: '>2.0.0', // @TODO
+        healthChecks: [],
       },
     },
     marketplaceUrl: 'https://registry.start9.com/',
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 6b423b244..5f9b1b3bc 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -679,8 +679,6 @@ export class MockApiService extends ApiService {
       this.updateProgress(params.id)
     }, 1000)
 
-    const manifest = Mock.LocalPkgs[params.id].stateInfo.manifest
-
     const patch: Operation<
       PackageDataEntry<InstallingState | UpdatingState>
     >[] = [
@@ -691,15 +689,15 @@ export class MockApiService extends ApiService {
           ...Mock.LocalPkgs[params.id],
           stateInfo: {
             // if installing
-            state: PackageState.Installing,
+            // state: PackageState.Installing,
 
             // if updating
-            // state: PackageState.Updating,
-            // manifest,
+            state: PackageState.Updating,
+            manifest: mockPatchData.packageData[params.id].stateInfo.manifest!,
 
             // both
             installingInfo: {
-              newManifest: manifest,
+              newManifest: Mock.LocalPkgs[params.id].stateInfo.manifest,
               progress: PROGRESS,
             },
           },
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 5bd69293c..00b57d2cc 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -335,7 +335,6 @@ export const mockPatchData: DataModel = {
         },
       },
       currentDependencies: {},
-      dependencyInfo: {},
       marketplaceUrl: 'https://registry.start9.com/',
       developerKey: 'developer-key',
     },
@@ -570,23 +569,21 @@ export const mockPatchData: DataModel = {
         },
       },
       currentDependencies: {
-        bitcoind: {
-          versionRange: '>=26.0.0',
-          healthChecks: [],
-        },
-        'btc-rpc-proxy': {
-          versionRange: '>2.0.0',
-          healthChecks: [],
-        },
-      },
-      dependencyInfo: {
         bitcoind: {
           title: 'Bitcoin Core',
           icon: 'assets/img/service-icons/bitcoind.svg',
+          kind: 'running',
+          registryUrl: 'https://registry.start9.com',
+          versionSpec: '>=26.0.0',
+          healthChecks: [],
         },
         'btc-rpc-proxy': {
           title: 'Bitcoin Proxy',
           icon: 'assets/img/service-icons/btc-rpc-proxy.png',
+          kind: 'running',
+          registryUrl: 'https://community-registry.start9.com',
+          versionSpec: '>2.0.0',
+          healthChecks: [],
         },
       },
       marketplaceUrl: 'https://registry.start9.com/',
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index 50020f5fe..1991f7bec 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -85,14 +85,14 @@ export class DepErrorService {
       }
     }
 
-    const versionRange = pkg.currentDependencies[depId].versionRange
+    const versionSpec = pkg.currentDependencies[depId].versionSpec
     const depManifest = dep.stateInfo.manifest
 
     // incorrect version
-    if (!this.emver.satisfies(depManifest.version, versionRange)) {
+    if (!this.emver.satisfies(depManifest.version, versionSpec)) {
       return {
         type: DependencyErrorType.IncorrectVersion,
-        expected: versionRange,
+        expected: versionSpec,
         received: depManifest.version,
       }
     }
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index c1d46ece2..29761e300 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -100,13 +100,7 @@ export type PackageDataEntry<T extends StateInfo = StateInfo> = {
   status: Status
   actions: Record<string, ActionMetadata>
   lastBackup: string | null
-  currentDependencies: { [id: string]: CurrentDependencyInfo }
-  dependencyInfo: {
-    [id: string]: {
-      title: string
-      icon: Url
-    }
-  }
+  currentDependencies: Record<string, CurrentDependencyInfo>
   serviceInterfaces: Record<string, ServiceInterfaceWithHostInfo>
   marketplaceUrl: string | null
   developerKey: string
@@ -117,11 +111,13 @@ export type StateInfo = InstalledState | InstallingState | UpdatingState
 export type InstalledState = {
   state: PackageState.Installed | PackageState.Removing
   manifest: Manifest
+  installingInfo?: undefined
 }
 
 export type InstallingState = {
   state: PackageState.Installing | PackageState.Restoring
   installingInfo: InstallingInfo
+  manifest?: undefined
 }
 
 export type UpdatingState = {
@@ -139,8 +135,10 @@ export enum PackageState {
 }
 
 export interface CurrentDependencyInfo {
+  title: string
+  icon: string
   kind: 'exists' | 'running'
-  url: string
+  registryUrl: string
   versionSpec: string
   healthChecks: string[] // array of health check IDs
 }
diff --git a/web/projects/ui/src/app/util/dry-update.ts b/web/projects/ui/src/app/util/dry-update.ts
index 472a48389..2d4d1aa10 100644
--- a/web/projects/ui/src/app/util/dry-update.ts
+++ b/web/projects/ui/src/app/util/dry-update.ts
@@ -12,8 +12,7 @@ export function dryUpdate(
       pkg =>
         Object.keys(pkg.currentDependencies || {}).some(
           pkgId => pkgId === id,
-        ) &&
-        !emver.satisfies(version, pkg.currentDependencies[id].versionRange),
+        ) && !emver.satisfies(version, pkg.currentDependencies[id].versionSpec),
     )
     .map(pkg => getManifest(pkg).title)
 }

From bcc76dd60ac442523778c23f2622451860411629 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 27 Mar 2024 11:11:55 -0600
Subject: [PATCH 100/341] fix: The db dump on the private

---
 core/startos/src/db/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 874733ca6..99602ba5a 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -206,7 +206,7 @@ async fn cli_dump(
         from_value::<Dump>(
             ctx.call_remote(
                 "db.dump",
-                imbl_value::json!({ "include-private":include_private }),
+                imbl_value::json!({ "includePrivate":include_private }),
             )
             .await?,
         )?

From 5698b830ed2b42149106c83d57ef130143d90afb Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 27 Mar 2024 12:40:23 -0600
Subject: [PATCH 101/341] Fix: Fix the issue where the restart after a service
 install and update, would mak the system crash

---
 core/startos/Cargo.toml                 |  3 ++-
 core/startos/src/db/model/package.rs    |  6 ++----
 core/startos/src/service/mod.rs         |  4 ++--
 core/startos/src/service/service_map.rs |  4 ++--
 core/startos/src/util/serde.rs          | 12 ++++++++++++
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 301602e2d..8106c800b 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -70,11 +70,12 @@ current_platform = "0.2.0"
 digest = "0.10.7"
 divrem = "1.0.0"
 ed25519 = { version = "2.2.3", features = ["pkcs8", "pem", "alloc"] }
-ed25519-dalek = { version = "2.0.0", features = [
+ed25519-dalek = { version = "2.1.1", features = [
   "serde",
   "zeroize",
   "rand_core",
   "digest",
+  "pkcs8"
 ] }
 ed25519-dalek-v1 = { package = "ed25519-dalek", version = "1" }
 emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 05d6e73b7..fc3c2751c 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -10,11 +10,11 @@ use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::net::host::HostInfo;
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::s9pk::manifest::Manifest;
 use crate::status::Status;
+use crate::{net::host::HostInfo, util::serde::Pem};
 
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct AllPackageData(pub BTreeMap<PackageId, PackageDataEntry>);
@@ -294,9 +294,7 @@ pub struct PackageDataEntry {
     pub state_info: PackageState,
     pub status: Status,
     pub marketplace_url: Option<Url>,
-    #[serde(default)]
-    #[serde(with = "crate::util::serde::ed25519_pubkey")]
-    pub developer_key: ed25519_dalek::VerifyingKey,
+    pub developer_key: Pem<ed25519_dalek::VerifyingKey>,
     pub icon: DataUrl<'static>,
     pub last_backup: Option<DateTime<Utc>>,
     pub dependency_info: BTreeMap<PackageId, StaticDependencyInfo>,
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 2feb4ca34..a10857c5a 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -12,7 +12,6 @@ use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
 use tokio::sync::Notify;
 
-use crate::action::ActionResult;
 use crate::config::action::ConfigRes;
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::RequestGuid;
@@ -30,6 +29,7 @@ use crate::status::health_check::HealthCheckResult;
 use crate::status::MainStatus;
 use crate::util::actor::{Actor, BackgroundJobs, SimpleActor};
 use crate::volume::data_dir;
+use crate::{action::ActionResult, util::serde::Pem};
 
 pub mod cli;
 mod config;
@@ -280,7 +280,7 @@ impl Service {
                 entry
                     .as_state_info_mut()
                     .ser(&PackageState::Installed(InstalledState { manifest }))?;
-                entry.as_developer_key_mut().ser(&developer_key)?;
+                entry.as_developer_key_mut().ser(&Pem::new(developer_key))?;
                 entry.as_icon_mut().ser(&icon)?;
                 // TODO: marketplace url
                 // TODO: dependency info
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 1a9d2342c..e56b1d7dd 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -10,7 +10,6 @@ use imbl_value::InternedString;
 use tokio::sync::{Mutex, OwnedRwLockReadGuard, OwnedRwLockWriteGuard, RwLock};
 use tracing::instrument;
 
-use crate::context::RpcContext;
 use crate::db::model::package::{
     InstallingInfo, InstallingState, PackageDataEntry, PackageState, UpdatingState,
 };
@@ -27,6 +26,7 @@ use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
 use crate::service::{LoadDisposition, Service};
 use crate::status::{MainStatus, Status};
+use crate::{context::RpcContext, util::serde::Pem};
 
 pub type DownloadInstallFuture = BoxFuture<'static, Result<InstallFuture, Error>>;
 pub type InstallFuture = BoxFuture<'static, Result<(), Error>>;
@@ -167,7 +167,7 @@ impl ServiceMap {
                                     dependency_config_errors: Default::default(),
                                 },
                                 marketplace_url: None,
-                                developer_key,
+                                developer_key: Pem::new(developer_key),
                                 icon,
                                 last_backup: None,
                                 dependency_info: Default::default(),
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index de25e0505..cd414f66e 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -1128,6 +1128,18 @@ impl PemEncoding for ssh_key::PrivateKey {
     }
 }
 
+impl PemEncoding for ed25519_dalek::VerifyingKey {
+    fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
+        use ed25519_dalek::pkcs8::DecodePublicKey;
+        ed25519_dalek::VerifyingKey::from_public_key_pem(pem).map_err(E::custom)
+    }
+    fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
+        use ed25519_dalek::pkcs8::EncodePublicKey;
+        self.to_public_key_pem(pkcs8::LineEnding::LF)
+            .map_err(E::custom)
+    }
+}
+
 pub mod pem {
     use serde::{Deserialize, Deserializer, Serializer};
 

From f770d5072e7a73a0747b092a5f79fbd14f04fff7 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Wed, 27 Mar 2024 13:58:42 -0600
Subject: [PATCH 102/341] export patchdb types

---
 core/Cargo.lock                               | 450 ++++++++----------
 core/models/Cargo.toml                        |   2 +-
 core/models/src/data_url.rs                   |   4 +-
 core/models/src/id/action.rs                  |   4 +-
 core/models/src/id/health_check.rs            |   4 +-
 core/models/src/id/host.rs                    |   4 +-
 core/models/src/id/image.rs                   |   4 +-
 core/models/src/id/mod.rs                     |   4 +-
 core/models/src/id/package.rs                 |   1 +
 core/models/src/id/volume.rs                  |   4 +-
 core/startos/Cargo.toml                       |   2 +-
 core/startos/bindings/AddSslOptions.ts        |   3 +-
 core/startos/bindings/Alerts.ts               |   3 +
 core/startos/bindings/AllPackageData.ts       |   5 +
 core/startos/bindings/AlpnInfo.ts             |   4 +
 core/startos/bindings/BackupProgress.ts       |   3 +
 core/startos/bindings/BindInfo.ts             |   4 +
 core/startos/bindings/BindOptions.ts          |   3 +-
 core/startos/bindings/ConnectionAddresses.ts  |   3 +
 core/startos/bindings/CurrentDependencies.ts  |   5 +
 .../startos/bindings/CurrentDependencyInfo.ts |   4 +
 core/startos/bindings/DataUrl.ts              |   3 +
 core/startos/bindings/DepInfo.ts              |   3 +
 core/startos/bindings/Dependencies.ts         |   5 +
 .../bindings/DependencyConfigErrors.ts        |   4 +
 .../startos/bindings/DependencyRequirement.ts |   2 +-
 core/startos/bindings/Description.ts          |   3 +
 core/startos/bindings/Duration.ts             |   3 +
 core/startos/bindings/ExposeUiParams.ts       |   3 -
 core/startos/bindings/ExposedUI.ts            |   3 -
 core/startos/bindings/FullProgress.ts         |   5 +
 core/startos/bindings/Governor.ts             |   3 +
 core/startos/bindings/HardwareRequirements.ts |   3 +
 core/startos/bindings/HealthCheckId.ts        |   3 +
 core/startos/bindings/HealthCheckResult.ts    |   3 +
 core/startos/bindings/Host.ts                 |   6 +
 core/startos/bindings/HostAddress.ts          |   3 +
 core/startos/bindings/HostId.ts               |   3 +
 core/startos/bindings/HostInfo.ts             |   5 +
 core/startos/bindings/HostKind.ts             |   3 +
 core/startos/bindings/ImageId.ts              |   3 +
 core/startos/bindings/InstalledState.ts       |   4 +
 core/startos/bindings/InstallingInfo.ts       |   5 +
 core/startos/bindings/InstallingState.ts      |   4 +
 core/startos/bindings/IpInfo.ts               |   3 +
 core/startos/bindings/MainStatus.ts           |   6 +
 core/startos/bindings/Manifest.ts             |  10 +
 core/startos/bindings/MaybeUtf8String.ts      |   3 +
 core/startos/bindings/NamedProgress.ts        |   4 +
 core/startos/bindings/PackageDataEntry.ts     |   8 +
 core/startos/bindings/PackageId.ts            |   3 +
 core/startos/bindings/PackageState.ts         |   6 +
 core/startos/bindings/Progress.ts             |   3 +
 core/startos/bindings/Public.ts               |   5 +
 core/startos/bindings/ServerInfo.ts           |  16 +
 core/startos/bindings/ServerSpecs.ts          |   3 +
 core/startos/bindings/ServerStatus.ts         |   6 +
 core/startos/bindings/Status.ts               |   4 +-
 core/startos/bindings/UpdateProgress.ts       |   3 +
 core/startos/bindings/UpdatingState.ts        |   5 +
 core/startos/bindings/VolumeId.ts             |   3 +
 core/startos/bindings/WifiInfo.ts             |   3 +
 core/startos/src/db/model/mod.rs              |   1 +
 core/startos/src/db/model/package.rs          | 102 ++--
 core/startos/src/db/model/public.rs           |  41 +-
 core/startos/src/dependencies.rs              |  29 +-
 core/startos/src/net/host/address.rs          |   9 +-
 core/startos/src/net/host/binding.rs          |  12 +-
 core/startos/src/net/host/mod.rs              |  10 +-
 core/startos/src/net/vhost.rs                 |   4 +-
 core/startos/src/progress.rs                  |  10 +-
 core/startos/src/properties.rs                |   5 +-
 core/startos/src/s9pk/v1/manifest.rs          |  27 +-
 core/startos/src/s9pk/v2/compat.rs            |  17 +-
 core/startos/src/s9pk/v2/manifest.rs          |  22 +-
 .../src/service/service_effect_handler.rs     |  53 +--
 core/startos/src/service/service_map.rs       |   6 +-
 core/startos/src/status/health_check.rs       |   3 +-
 core/startos/src/status/mod.rs                |  17 +-
 core/startos/src/util/cpupower.rs             |   6 +-
 core/startos/src/util/serde.rs                |   7 +-
 81 files changed, 641 insertions(+), 436 deletions(-)
 create mode 100644 core/startos/bindings/Alerts.ts
 create mode 100644 core/startos/bindings/AllPackageData.ts
 create mode 100644 core/startos/bindings/AlpnInfo.ts
 create mode 100644 core/startos/bindings/BackupProgress.ts
 create mode 100644 core/startos/bindings/BindInfo.ts
 create mode 100644 core/startos/bindings/ConnectionAddresses.ts
 create mode 100644 core/startos/bindings/CurrentDependencies.ts
 create mode 100644 core/startos/bindings/CurrentDependencyInfo.ts
 create mode 100644 core/startos/bindings/DataUrl.ts
 create mode 100644 core/startos/bindings/DepInfo.ts
 create mode 100644 core/startos/bindings/Dependencies.ts
 create mode 100644 core/startos/bindings/DependencyConfigErrors.ts
 create mode 100644 core/startos/bindings/Description.ts
 create mode 100644 core/startos/bindings/Duration.ts
 delete mode 100644 core/startos/bindings/ExposeUiParams.ts
 delete mode 100644 core/startos/bindings/ExposedUI.ts
 create mode 100644 core/startos/bindings/FullProgress.ts
 create mode 100644 core/startos/bindings/Governor.ts
 create mode 100644 core/startos/bindings/HardwareRequirements.ts
 create mode 100644 core/startos/bindings/HealthCheckId.ts
 create mode 100644 core/startos/bindings/HealthCheckResult.ts
 create mode 100644 core/startos/bindings/Host.ts
 create mode 100644 core/startos/bindings/HostAddress.ts
 create mode 100644 core/startos/bindings/HostId.ts
 create mode 100644 core/startos/bindings/HostInfo.ts
 create mode 100644 core/startos/bindings/HostKind.ts
 create mode 100644 core/startos/bindings/ImageId.ts
 create mode 100644 core/startos/bindings/InstalledState.ts
 create mode 100644 core/startos/bindings/InstallingInfo.ts
 create mode 100644 core/startos/bindings/InstallingState.ts
 create mode 100644 core/startos/bindings/IpInfo.ts
 create mode 100644 core/startos/bindings/MainStatus.ts
 create mode 100644 core/startos/bindings/Manifest.ts
 create mode 100644 core/startos/bindings/MaybeUtf8String.ts
 create mode 100644 core/startos/bindings/NamedProgress.ts
 create mode 100644 core/startos/bindings/PackageDataEntry.ts
 create mode 100644 core/startos/bindings/PackageId.ts
 create mode 100644 core/startos/bindings/PackageState.ts
 create mode 100644 core/startos/bindings/Progress.ts
 create mode 100644 core/startos/bindings/Public.ts
 create mode 100644 core/startos/bindings/ServerInfo.ts
 create mode 100644 core/startos/bindings/ServerSpecs.ts
 create mode 100644 core/startos/bindings/ServerStatus.ts
 create mode 100644 core/startos/bindings/UpdateProgress.ts
 create mode 100644 core/startos/bindings/UpdatingState.ts
 create mode 100644 core/startos/bindings/VolumeId.ts
 create mode 100644 core/startos/bindings/WifiInfo.ts

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 24a641819..602c16ae3 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -155,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.80"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "arrayref"
@@ -224,18 +224,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -247,16 +247,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "atomic-write-file"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8204db279bf648d64fe845bd8840f78b39c8132ed4d6a4194c3b10d4b4cfb0b"
-dependencies = [
- "nix 0.28.0",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -270,9 +260,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "axum"
@@ -296,7 +286,7 @@ dependencies = [
  "pin-project-lite",
  "rustversion",
  "serde",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "tower",
  "tower-layer",
  "tower-service",
@@ -304,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
  "async-trait",
  "axum-core 0.4.3",
@@ -330,7 +320,7 @@ dependencies = [
  "serde_path_to_error",
  "serde_urlencoded",
  "sha1",
- "sync_wrapper",
+ "sync_wrapper 1.0.0",
  "tokio",
  "tokio-tungstenite",
  "tower",
@@ -371,7 +361,7 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -398,9 +388,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
@@ -478,9 +468,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 dependencies = [
  "serde",
 ]
@@ -516,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -547,9 +537,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
+checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -580,9 +570,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
@@ -596,17 +586,11 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
 [[package]]
 name = "chrono"
-version = "0.4.35"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -689,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.2"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -711,14 +695,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.0"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -738,9 +722,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "color-eyre"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
 dependencies = [
  "backtrace",
  "color-spantrace",
@@ -888,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "cookie"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
 dependencies = [
  "time",
  "version_check",
@@ -992,7 +976,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "crossterm_winapi",
  "futures-core",
  "libc",
@@ -1114,7 +1098,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1138,7 +1122,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1149,7 +1133,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1401,10 +1385,10 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1452,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
 
 [[package]]
 name = "fd-lock-rs"
@@ -1477,9 +1461,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
+checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f"
 
 [[package]]
 name = "filetime"
@@ -1638,7 +1622,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -1716,7 +1700,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8283e7331b8c93b9756e0cfdbcfb90312852f953c6faf9bf741e684cc3b6ad69"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "crc",
  "log",
  "uuid",
@@ -1735,9 +1719,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
 dependencies = [
  "bytes",
  "fnv",
@@ -1745,7 +1729,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -1754,9 +1738,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
+checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4"
 dependencies = [
  "bytes",
  "fnv",
@@ -1764,7 +1748,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 1.1.0",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -1843,6 +1827,12 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "helpers"
 version = "0.1.0"
@@ -1883,9 +1873,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hifijson"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85ef6b41c333e6dd2a4aaa59125a19b633cd17e7aaf372b2260809777bcdef4a"
+checksum = "18ae468bcb4dfecf0e4949ee28abbc99076b6a0077f51ddbc94dbfff8e6a870c"
 
 [[package]]
 name = "hkdf"
@@ -1959,12 +1949,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
+checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
 dependencies = [
  "bytes",
- "futures-util",
+ "futures-core",
  "http 1.1.0",
  "http-body 1.0.0",
  "pin-project-lite",
@@ -1998,7 +1988,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2 0.3.25",
  "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
@@ -2021,7 +2011,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.2",
+ "h2 0.4.3",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
@@ -2214,9 +2204,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.5"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -2343,9 +2333,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jaq-core"
@@ -2387,9 +2377,9 @@ dependencies = [
 
 [[package]]
 name = "josekit"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd20997283339a19226445db97d632c8dc7adb6b8172537fe0e9e540fb141df2"
+checksum = "0953340cf63354cec4a385f1fbcb3f409a5823778cae236078892f6030ed4565"
 dependencies = [
  "anyhow",
  "base64",
@@ -2466,7 +2456,7 @@ dependencies = [
  "petgraph",
  "pico-args",
  "regex",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -2526,7 +2516,7 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "libc",
  "redox_syscall 0.4.1",
 ]
@@ -2685,7 +2675,7 @@ dependencies = [
  "tokio",
  "torut",
  "tracing",
- "ts-rs 7.1.1",
+ "ts-rs",
  "yasi",
 ]
 
@@ -2709,9 +2699,9 @@ dependencies = [
 
 [[package]]
 name = "new_debug_unreachable"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "new_mime_guess"
@@ -2754,20 +2744,8 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.2",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "nix"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cfg-if",
- "cfg_aliases",
  "libc",
 ]
 
@@ -2918,7 +2896,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -2967,7 +2945,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2984,7 +2962,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -3135,7 +3113,7 @@ dependencies = [
 name = "patch-db-macro-internals"
 version = "0.1.0"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3173,7 +3151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
@@ -3208,7 +3186,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -3252,9 +3230,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "platforms"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
+checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
 
 [[package]]
 name = "portable-atomic"
@@ -3314,9 +3292,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -3329,13 +3307,13 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3372,7 +3350,7 @@ dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -3547,14 +3525,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata 0.4.6",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -3574,7 +3552,7 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -3585,15 +3563,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "reqwest"
-version = "0.11.25"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64",
  "bytes",
@@ -3602,7 +3580,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
+ "h2 0.3.25",
  "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.28",
@@ -3619,7 +3597,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -3711,8 +3689,8 @@ source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/trai
 dependencies = [
  "async-stream",
  "async-trait",
- "axum 0.7.4",
- "clap 4.5.2",
+ "axum 0.7.5",
+ "clap 4.5.4",
  "futures",
  "http 1.1.0",
  "http-body-util",
@@ -3835,11 +3813,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3859,9 +3837,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
+checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c"
 dependencies = [
  "log",
  "ring",
@@ -3882,9 +3860,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.3.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8"
+checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
 
 [[package]]
 name = "rustls-webpki"
@@ -4071,16 +4049,16 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
@@ -4088,9 +4066,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
 dependencies = [
  "itoa",
  "serde",
@@ -4119,15 +4097,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270"
+checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4137,23 +4115,23 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d"
+checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.32"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
@@ -4294,9 +4272,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
@@ -4346,9 +4324,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf"
+checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -4359,9 +4337,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
+checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6"
 dependencies = [
  "ahash 0.8.11",
  "atoi",
@@ -4370,7 +4348,6 @@ dependencies = [
  "chrono",
  "crc",
  "crossbeam-queue",
- "dotenvy",
  "either",
  "event-listener",
  "futures-channel",
@@ -4380,7 +4357,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "log",
  "memchr",
  "once_cell",
@@ -4403,9 +4380,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5"
+checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4416,14 +4393,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841"
+checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8"
 dependencies = [
- "atomic-write-file",
  "dotenvy",
  "either",
- "heck",
+ "heck 0.4.1",
  "hex",
  "once_cell",
  "proc-macro2",
@@ -4443,13 +4419,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4"
+checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418"
 dependencies = [
  "atoi",
  "base64",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "byteorder",
  "bytes",
  "chrono",
@@ -4486,13 +4462,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24"
+checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e"
 dependencies = [
  "atoi",
  "base64",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "byteorder",
  "chrono",
  "crc",
@@ -4514,7 +4490,6 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "sha1",
  "sha2 0.10.8",
  "smallvec",
  "sqlx-core",
@@ -4526,9 +4501,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490"
+checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa"
 dependencies = [
  "atoi",
  "chrono",
@@ -4571,7 +4546,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.52",
+ "syn 2.0.55",
  "unicode-width",
 ]
 
@@ -4598,9 +4573,9 @@ dependencies = [
 
 [[package]]
 name = "ssh-key"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01f8f4ea73476c0aa5d5e6a75ce1e8634e2c3f82005ef3bbed21547ac57f2bf7"
+checksum = "3b71299a724c8d84956caaf8fc3b3ea57c3587fe2d0b800cd0dc1f3599905d7e"
 dependencies = [
  "ed25519-dalek 2.1.1",
  "p256",
@@ -4625,7 +4600,7 @@ dependencies = [
  "async-compression",
  "async-stream",
  "async-trait",
- "axum 0.7.4",
+ "axum 0.7.5",
  "axum-server",
  "base32",
  "base64",
@@ -4635,11 +4610,11 @@ dependencies = [
  "bytes",
  "chrono",
  "ciborium",
- "clap 4.5.2",
+ "clap 4.5.4",
  "color-eyre",
  "console",
  "console-subscriber",
- "cookie 0.18.0",
+ "cookie 0.18.1",
  "cookie_store",
  "current_platform",
  "digest 0.10.7",
@@ -4659,7 +4634,7 @@ dependencies = [
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "indicatif",
  "integer-encoding",
  "ipnet",
@@ -4722,7 +4697,7 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite",
  "tokio-util",
- "toml 0.8.10",
+ "toml 0.8.12",
  "torut",
  "tracing",
  "tracing-error",
@@ -4730,7 +4705,7 @@ dependencies = [
  "tracing-journald",
  "tracing-subscriber",
  "trust-dns-server",
- "ts-rs 8.1.0",
+ "ts-rs",
  "typed-builder",
  "url",
  "urlencoding",
@@ -4806,9 +4781,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.52"
+version = "2.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4821,22 +4796,28 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c"
+
 [[package]]
 name = "system-configuration"
-version = "0.6.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 1.3.2",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4909,22 +4890,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.57"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.57"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5041,7 +5022,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5060,7 +5041,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls 0.22.2",
+ "rustls 0.22.3",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5079,9 +5060,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5145,14 +5126,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.6",
+ "toml_edit 0.22.9",
 ]
 
 [[package]]
@@ -5170,7 +5151,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5183,18 +5164,18 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.6"
+version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
+checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5212,7 +5193,7 @@ dependencies = [
  "axum 0.6.20",
  "base64",
  "bytes",
- "h2 0.3.24",
+ "h2 0.3.25",
  "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.28",
@@ -5299,7 +5280,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5434,49 +5415,24 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "ts-rs"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2cae1fc5d05d47aa24b64f9a4f7cba24cdc9187a2084dd97ac57bef5eccae6"
-dependencies = [
- "thiserror",
- "ts-rs-macros 7.1.1",
-]
-
 [[package]]
 name = "ts-rs"
 version = "8.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d3fa4606cdab1e9b668cc65ce2545941d01f52bc27536a195c66c55b91cb84"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-type-override#f37e51abbf3b4afc6dc2fdea72100ed0ee463a06"
 dependencies = [
  "thiserror",
- "ts-rs-macros 8.1.0",
-]
-
-[[package]]
-name = "ts-rs-macros"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f7f9b821696963053a89a7bd8b292dc34420aea8294d7b225274d488f3ec92"
-dependencies = [
- "Inflector",
- "proc-macro2",
- "quote",
- "syn 2.0.52",
- "termcolor",
+ "ts-rs-macros",
 ]
 
 [[package]]
 name = "ts-rs-macros"
 version = "8.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86ae36cbb2d58b86677ad413054feeb0712e382e822131cf9a4a1e580c419b5"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-type-override#f37e51abbf3b4afc6dc2fdea72100ed0ee463a06"
 dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
  "termcolor",
 ]
 
@@ -5517,7 +5473,7 @@ checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -5588,9 +5544,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "untrusted"
@@ -5630,9 +5586,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "getrandom 0.2.12",
 ]
@@ -5722,7 +5678,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
  "wasm-bindgen-shared",
 ]
 
@@ -5756,7 +5712,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5798,9 +5754,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "whoami"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e"
+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
 dependencies = [
  "redox_syscall 0.4.1",
  "wasite",
@@ -6076,7 +6032,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
 
 [[package]]
@@ -6096,5 +6052,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.55",
 ]
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index 9f6a53443..b6a506774 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -32,7 +32,7 @@ sqlx = { version = "0.7.2", features = [
   "postgres",
 ] }
 ssh-key = "0.6.2"
-ts-rs = "7"
+ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-type-override" } # "8"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies" }
diff --git a/core/models/src/data_url.rs b/core/models/src/data_url.rs
index e2141b15a..9757d7f6a 100644
--- a/core/models/src/data_url.rs
+++ b/core/models/src/data_url.rs
@@ -6,11 +6,13 @@ use color_eyre::eyre::eyre;
 use reqwest::header::CONTENT_TYPE;
 use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncRead, AsyncReadExt};
+use ts_rs::TS;
 use yasi::InternedString;
 
 use crate::{mime, Error, ErrorKind, ResultExt};
 
-#[derive(Clone)]
+#[derive(Clone, TS)]
+#[ts(type = "string")]
 pub struct DataUrl<'a> {
     mime: InternedString,
     data: Cow<'a, [u8]>,
diff --git a/core/models/src/id/action.rs b/core/models/src/id/action.rs
index 992c995f7..3f17048e2 100644
--- a/core/models/src/id/action.rs
+++ b/core/models/src/id/action.rs
@@ -2,10 +2,12 @@ use std::path::Path;
 use std::str::FromStr;
 
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use crate::{Id, InvalidId};
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, ts_rs::TS)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TS)]
+#[ts(type = "string")]
 pub struct ActionId(Id);
 impl FromStr for ActionId {
     type Err = InvalidId;
diff --git a/core/models/src/id/health_check.rs b/core/models/src/id/health_check.rs
index c416ab1e6..937f31aa3 100644
--- a/core/models/src/id/health_check.rs
+++ b/core/models/src/id/health_check.rs
@@ -2,10 +2,12 @@ use std::path::Path;
 use std::str::FromStr;
 
 use serde::{Deserialize, Deserializer, Serialize};
+use ts_rs::TS;
 
 use crate::{Id, InvalidId};
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, ts_rs::TS)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TS)]
+#[ts(type = "string")]
 pub struct HealthCheckId(Id);
 impl std::fmt::Display for HealthCheckId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
diff --git a/core/models/src/id/host.rs b/core/models/src/id/host.rs
index 6bca7d0ff..2a1595bd8 100644
--- a/core/models/src/id/host.rs
+++ b/core/models/src/id/host.rs
@@ -2,11 +2,13 @@ use std::path::Path;
 use std::str::FromStr;
 
 use serde::{Deserialize, Deserializer, Serialize};
+use ts_rs::TS;
 use yasi::InternedString;
 
 use crate::{Id, InvalidId};
 
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TS)]
+#[ts(type = "string")]
 pub struct HostId(Id);
 impl FromStr for HostId {
     type Err = InvalidId;
diff --git a/core/models/src/id/image.rs b/core/models/src/id/image.rs
index 5fd91a5a1..bbb0a601e 100644
--- a/core/models/src/id/image.rs
+++ b/core/models/src/id/image.rs
@@ -3,10 +3,12 @@ use std::path::Path;
 use std::str::FromStr;
 
 use serde::{Deserialize, Deserializer, Serialize};
+use ts_rs::TS;
 
 use crate::{Id, InvalidId, PackageId, Version};
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, ts_rs::TS)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TS)]
+#[ts(type = "string")]
 pub struct ImageId(Id);
 impl AsRef<Path> for ImageId {
     fn as_ref(&self) -> &Path {
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index 29825f628..239479ed7 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -28,8 +28,8 @@ lazy_static::lazy_static! {
     pub static ref SYSTEM_ID: Id = Id(InternedString::intern("x_system"));
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default, ts_rs::TS)]
-pub struct Id(#[ts(type = "string")] InternedString);
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
+pub struct Id(InternedString);
 impl TryFrom<InternedString> for Id {
     type Error = InvalidId;
     fn try_from(value: InternedString) -> Result<Self, Self::Error> {
diff --git a/core/models/src/id/package.rs b/core/models/src/id/package.rs
index 8f71285c6..d2665e59a 100644
--- a/core/models/src/id/package.rs
+++ b/core/models/src/id/package.rs
@@ -12,6 +12,7 @@ lazy_static::lazy_static! {
     pub static ref SYSTEM_PACKAGE_ID: PackageId = PackageId(SYSTEM_ID.clone());
 }
 #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, TS)]
+#[ts(type = "string")]
 pub struct PackageId(Id);
 impl FromStr for PackageId {
     type Err = InvalidId;
diff --git a/core/models/src/id/volume.rs b/core/models/src/id/volume.rs
index 16821a3cf..7425c79c6 100644
--- a/core/models/src/id/volume.rs
+++ b/core/models/src/id/volume.rs
@@ -2,10 +2,12 @@ use std::borrow::Borrow;
 use std::path::Path;
 
 use serde::{Deserialize, Deserializer, Serialize};
+use ts_rs::TS;
 
 use crate::Id;
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, TS)]
+#[ts(type = "string")]
 pub enum VolumeId {
     Backup,
     Custom(Id),
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 8106c800b..ec4e978bf 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -175,7 +175,7 @@ tracing-futures = "0.2.5"
 tracing-journald = "0.3.0"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 trust-dns-server = "0.23.1"
-ts-rs = "8.1.0"
+ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-type-override" } # "8.1.0"
 typed-builder = "0.18.0"
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
diff --git a/core/startos/bindings/AddSslOptions.ts b/core/startos/bindings/AddSslOptions.ts
index f0f74fe03..97035853d 100644
--- a/core/startos/bindings/AddSslOptions.ts
+++ b/core/startos/bindings/AddSslOptions.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AlpnInfo } from "./AlpnInfo";
 
-export type AddSslOptions = { scheme: string | null, preferredExternalPort: number, addXForwardedHeaders: boolean | null, };
\ No newline at end of file
+export type AddSslOptions = { scheme: string, preferredExternalPort: number, alpn: AlpnInfo, };
\ No newline at end of file
diff --git a/core/startos/bindings/Alerts.ts b/core/startos/bindings/Alerts.ts
new file mode 100644
index 000000000..4956bfa95
--- /dev/null
+++ b/core/startos/bindings/Alerts.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Alerts = { install: string | null, uninstall: string | null, restore: string | null, start: string | null, stop: string | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/AllPackageData.ts b/core/startos/bindings/AllPackageData.ts
new file mode 100644
index 000000000..74827426a
--- /dev/null
+++ b/core/startos/bindings/AllPackageData.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageDataEntry } from "./PackageDataEntry";
+import type { PackageId } from "./PackageId";
+
+export type AllPackageData = { [key: PackageId]: PackageDataEntry };
\ No newline at end of file
diff --git a/core/startos/bindings/AlpnInfo.ts b/core/startos/bindings/AlpnInfo.ts
new file mode 100644
index 000000000..2a760d235
--- /dev/null
+++ b/core/startos/bindings/AlpnInfo.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { MaybeUtf8String } from "./MaybeUtf8String";
+
+export type AlpnInfo = "reflect" | { "specified": Array<MaybeUtf8String> };
\ No newline at end of file
diff --git a/core/startos/bindings/BackupProgress.ts b/core/startos/bindings/BackupProgress.ts
new file mode 100644
index 000000000..4a480dc93
--- /dev/null
+++ b/core/startos/bindings/BackupProgress.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BackupProgress = { complete: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/BindInfo.ts b/core/startos/bindings/BindInfo.ts
new file mode 100644
index 000000000..d42ed2d25
--- /dev/null
+++ b/core/startos/bindings/BindInfo.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BindOptions } from "./BindOptions";
+
+export type BindInfo = { options: BindOptions, assignedLanPort: number | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/BindOptions.ts b/core/startos/bindings/BindOptions.ts
index 997f2bd8b..dc8b1e5b5 100644
--- a/core/startos/bindings/BindOptions.ts
+++ b/core/startos/bindings/BindOptions.ts
@@ -1,5 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AddSslOptions } from "./AddSslOptions";
-import type { BindOptionsSecure } from "./BindOptionsSecure";
 
-export type BindOptions = { scheme: string | null, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: BindOptionsSecure | null, };
\ No newline at end of file
+export type BindOptions = { scheme: string, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: boolean, ssl: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/ConnectionAddresses.ts b/core/startos/bindings/ConnectionAddresses.ts
new file mode 100644
index 000000000..503bfb418
--- /dev/null
+++ b/core/startos/bindings/ConnectionAddresses.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ConnectionAddresses = { tor: Array<string>, clearnet: Array<string>, };
\ No newline at end of file
diff --git a/core/startos/bindings/CurrentDependencies.ts b/core/startos/bindings/CurrentDependencies.ts
new file mode 100644
index 000000000..55fb68501
--- /dev/null
+++ b/core/startos/bindings/CurrentDependencies.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CurrentDependencyInfo } from "./CurrentDependencyInfo";
+import type { PackageId } from "./PackageId";
+
+export type CurrentDependencies = { [key: PackageId]: CurrentDependencyInfo };
\ No newline at end of file
diff --git a/core/startos/bindings/CurrentDependencyInfo.ts b/core/startos/bindings/CurrentDependencyInfo.ts
new file mode 100644
index 000000000..ad8d3cf36
--- /dev/null
+++ b/core/startos/bindings/CurrentDependencyInfo.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DataUrl } from "./DataUrl";
+
+export type CurrentDependencyInfo = { title: string, icon: DataUrl, registry: string, versionSpec: string, } & ({ "kind": "exists" } | { "kind": "running", healthChecks: string[], });
\ No newline at end of file
diff --git a/core/startos/bindings/DataUrl.ts b/core/startos/bindings/DataUrl.ts
new file mode 100644
index 000000000..835512711
--- /dev/null
+++ b/core/startos/bindings/DataUrl.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type DataUrl = string;
\ No newline at end of file
diff --git a/core/startos/bindings/DepInfo.ts b/core/startos/bindings/DepInfo.ts
new file mode 100644
index 000000000..8320d83eb
--- /dev/null
+++ b/core/startos/bindings/DepInfo.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type DepInfo = { description: string | null, optional: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/Dependencies.ts b/core/startos/bindings/Dependencies.ts
new file mode 100644
index 000000000..a84adec24
--- /dev/null
+++ b/core/startos/bindings/Dependencies.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DepInfo } from "./DepInfo";
+import type { PackageId } from "./PackageId";
+
+export type Dependencies = { [key: PackageId]: DepInfo };
\ No newline at end of file
diff --git a/core/startos/bindings/DependencyConfigErrors.ts b/core/startos/bindings/DependencyConfigErrors.ts
new file mode 100644
index 000000000..23281aa89
--- /dev/null
+++ b/core/startos/bindings/DependencyConfigErrors.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export type DependencyConfigErrors = { [key: PackageId]: string };
\ No newline at end of file
diff --git a/core/startos/bindings/DependencyRequirement.ts b/core/startos/bindings/DependencyRequirement.ts
index 52bc25cd9..f6ff4aa54 100644
--- a/core/startos/bindings/DependencyRequirement.ts
+++ b/core/startos/bindings/DependencyRequirement.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DependencyRequirement = { "kind": "running", id: string, healthChecks: string[], versionSpec: string, url: string, } | { "kind": "exists", id: string, versionSpec: string, url: string, };
\ No newline at end of file
+export type DependencyRequirement = { "kind": "running", id: string, healthChecks: string[], versionSpec: string, registry: string, } | { "kind": "exists", id: string, versionSpec: string, registry: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/Description.ts b/core/startos/bindings/Description.ts
new file mode 100644
index 000000000..da4b0d1bf
--- /dev/null
+++ b/core/startos/bindings/Description.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Description = { short: string, long: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/Duration.ts b/core/startos/bindings/Duration.ts
new file mode 100644
index 000000000..ac44b7c87
--- /dev/null
+++ b/core/startos/bindings/Duration.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Duration = string;
\ No newline at end of file
diff --git a/core/startos/bindings/ExposeUiParams.ts b/core/startos/bindings/ExposeUiParams.ts
deleted file mode 100644
index 3c2230060..000000000
--- a/core/startos/bindings/ExposeUiParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ExposeUiParams = { "type": "object", value: {[key: string]: ExposeUiParams}, } | { "type": "string", path: string, description: string | null, masked: boolean, copyable: boolean | null, qr: boolean | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExposedUI.ts b/core/startos/bindings/ExposedUI.ts
deleted file mode 100644
index bef4c8214..000000000
--- a/core/startos/bindings/ExposedUI.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ExposedUI = { "type": "object", value: {[key: string]: ExposedUI}, description: string | null, } | { "type": "string", path: string, description: string | null, masked: boolean, copyable: boolean | null, qr: boolean | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/FullProgress.ts b/core/startos/bindings/FullProgress.ts
new file mode 100644
index 000000000..0c6a96832
--- /dev/null
+++ b/core/startos/bindings/FullProgress.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { NamedProgress } from "./NamedProgress";
+import type { Progress } from "./Progress";
+
+export type FullProgress = { overall: Progress, phases: Array<NamedProgress>, };
\ No newline at end of file
diff --git a/core/startos/bindings/Governor.ts b/core/startos/bindings/Governor.ts
new file mode 100644
index 000000000..9e0bb14e2
--- /dev/null
+++ b/core/startos/bindings/Governor.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Governor = string;
\ No newline at end of file
diff --git a/core/startos/bindings/HardwareRequirements.ts b/core/startos/bindings/HardwareRequirements.ts
new file mode 100644
index 000000000..5a28d0cbc
--- /dev/null
+++ b/core/startos/bindings/HardwareRequirements.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HardwareRequirements = { device: { [key: string]: string }, ram: bigint | null, arch: Array<string> | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/HealthCheckId.ts b/core/startos/bindings/HealthCheckId.ts
new file mode 100644
index 000000000..d9b6b7ca8
--- /dev/null
+++ b/core/startos/bindings/HealthCheckId.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HealthCheckId = string;
\ No newline at end of file
diff --git a/core/startos/bindings/HealthCheckResult.ts b/core/startos/bindings/HealthCheckResult.ts
new file mode 100644
index 000000000..eaba169f1
--- /dev/null
+++ b/core/startos/bindings/HealthCheckResult.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HealthCheckResult = { "result": "success" } | { "result": "disabled" } | { "result": "starting" } | { "result": "loading", message: string, } | { "result": "failure", error: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/Host.ts b/core/startos/bindings/Host.ts
new file mode 100644
index 000000000..a08704ad2
--- /dev/null
+++ b/core/startos/bindings/Host.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BindInfo } from "./BindInfo";
+import type { HostAddress } from "./HostAddress";
+import type { HostKind } from "./HostKind";
+
+export type Host = { kind: HostKind, bindings: { [key: number]: BindInfo }, addresses: Array<HostAddress>, primary: HostAddress | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/HostAddress.ts b/core/startos/bindings/HostAddress.ts
new file mode 100644
index 000000000..f013cb540
--- /dev/null
+++ b/core/startos/bindings/HostAddress.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HostAddress = { "kind": "onion", address: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/HostId.ts b/core/startos/bindings/HostId.ts
new file mode 100644
index 000000000..1aef70f2a
--- /dev/null
+++ b/core/startos/bindings/HostId.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HostId = string;
\ No newline at end of file
diff --git a/core/startos/bindings/HostInfo.ts b/core/startos/bindings/HostInfo.ts
new file mode 100644
index 000000000..3d2a34f14
--- /dev/null
+++ b/core/startos/bindings/HostInfo.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Host } from "./Host";
+import type { HostId } from "./HostId";
+
+export type HostInfo = { [key: HostId]: Host };
\ No newline at end of file
diff --git a/core/startos/bindings/HostKind.ts b/core/startos/bindings/HostKind.ts
new file mode 100644
index 000000000..1ad1bd95e
--- /dev/null
+++ b/core/startos/bindings/HostKind.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HostKind = "multi";
\ No newline at end of file
diff --git a/core/startos/bindings/ImageId.ts b/core/startos/bindings/ImageId.ts
new file mode 100644
index 000000000..9adb82d7a
--- /dev/null
+++ b/core/startos/bindings/ImageId.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ImageId = string;
\ No newline at end of file
diff --git a/core/startos/bindings/InstalledState.ts b/core/startos/bindings/InstalledState.ts
new file mode 100644
index 000000000..3608a5ba0
--- /dev/null
+++ b/core/startos/bindings/InstalledState.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Manifest } from "./Manifest";
+
+export type InstalledState = { manifest: Manifest, };
\ No newline at end of file
diff --git a/core/startos/bindings/InstallingInfo.ts b/core/startos/bindings/InstallingInfo.ts
new file mode 100644
index 000000000..c3d13c984
--- /dev/null
+++ b/core/startos/bindings/InstallingInfo.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { FullProgress } from "./FullProgress";
+import type { Manifest } from "./Manifest";
+
+export type InstallingInfo = { newManifest: Manifest, progress: FullProgress, };
\ No newline at end of file
diff --git a/core/startos/bindings/InstallingState.ts b/core/startos/bindings/InstallingState.ts
new file mode 100644
index 000000000..b7cfea14c
--- /dev/null
+++ b/core/startos/bindings/InstallingState.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { InstallingInfo } from "./InstallingInfo";
+
+export type InstallingState = { installingInfo: InstallingInfo, };
\ No newline at end of file
diff --git a/core/startos/bindings/IpInfo.ts b/core/startos/bindings/IpInfo.ts
new file mode 100644
index 000000000..756d87219
--- /dev/null
+++ b/core/startos/bindings/IpInfo.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type IpInfo = { ipv4Range: string | null, ipv4: string | null, ipv6Range: string | null, ipv6: string | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/MainStatus.ts b/core/startos/bindings/MainStatus.ts
new file mode 100644
index 000000000..25482e113
--- /dev/null
+++ b/core/startos/bindings/MainStatus.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Duration } from "./Duration";
+import type { HealthCheckId } from "./HealthCheckId";
+import type { HealthCheckResult } from "./HealthCheckResult";
+
+export type MainStatus = { "status": "stopped" } | { "status": "restarting" } | { "status": "stopping", timeout: Duration, } | { "status": "starting" } | { "status": "running", started: string, health: { [key: HealthCheckId]: HealthCheckResult }, } | { "status": "backingUp", started: string | null, health: { [key: HealthCheckId]: HealthCheckResult }, };
\ No newline at end of file
diff --git a/core/startos/bindings/Manifest.ts b/core/startos/bindings/Manifest.ts
new file mode 100644
index 000000000..0eb91251b
--- /dev/null
+++ b/core/startos/bindings/Manifest.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Alerts } from "./Alerts";
+import type { Dependencies } from "./Dependencies";
+import type { Description } from "./Description";
+import type { HardwareRequirements } from "./HardwareRequirements";
+import type { ImageId } from "./ImageId";
+import type { PackageId } from "./PackageId";
+import type { VolumeId } from "./VolumeId";
+
+export type Manifest = { id: PackageId, title: string, version: string, releaseNotes: string, license: string, replaces: Array<string>, wrapperRepo: string, upstreamRepo: string, supportSite: string, marketingSite: string, donationUrl: string | null, description: Description, images: Array<ImageId>, assets: Array<VolumeId>, volumes: Array<VolumeId>, alerts: Alerts, dependencies: Dependencies, hardwareRequirements: HardwareRequirements, gitHash: string | null, osVersion: string, hasConfig: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/MaybeUtf8String.ts b/core/startos/bindings/MaybeUtf8String.ts
new file mode 100644
index 000000000..6674a135b
--- /dev/null
+++ b/core/startos/bindings/MaybeUtf8String.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type MaybeUtf8String = string | number[];
\ No newline at end of file
diff --git a/core/startos/bindings/NamedProgress.ts b/core/startos/bindings/NamedProgress.ts
new file mode 100644
index 000000000..1e4c45093
--- /dev/null
+++ b/core/startos/bindings/NamedProgress.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Progress } from "./Progress";
+
+export type NamedProgress = { name: string, progress: Progress, };
\ No newline at end of file
diff --git a/core/startos/bindings/PackageDataEntry.ts b/core/startos/bindings/PackageDataEntry.ts
new file mode 100644
index 000000000..100e38ba7
--- /dev/null
+++ b/core/startos/bindings/PackageDataEntry.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CurrentDependencies } from "./CurrentDependencies";
+import type { DataUrl } from "./DataUrl";
+import type { HostInfo } from "./HostInfo";
+import type { PackageState } from "./PackageState";
+import type { Status } from "./Status";
+
+export type PackageDataEntry = { stateInfo: PackageState, status: Status, marketplaceUrl: string | null, developerKey: string, icon: DataUrl, lastBackup: string | null, currentDependencies: CurrentDependencies, hosts: HostInfo, storeExposedDependents: string[], };
\ No newline at end of file
diff --git a/core/startos/bindings/PackageId.ts b/core/startos/bindings/PackageId.ts
new file mode 100644
index 000000000..fcf62f5e2
--- /dev/null
+++ b/core/startos/bindings/PackageId.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type PackageId = string;
\ No newline at end of file
diff --git a/core/startos/bindings/PackageState.ts b/core/startos/bindings/PackageState.ts
new file mode 100644
index 000000000..4aa0c1d97
--- /dev/null
+++ b/core/startos/bindings/PackageState.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { InstalledState } from "./InstalledState";
+import type { InstallingState } from "./InstallingState";
+import type { UpdatingState } from "./UpdatingState";
+
+export type PackageState = { "state": "installing" } & InstallingState | { "state": "restoring" } & InstallingState | { "state": "updating" } & UpdatingState | { "state": "installed" } & InstalledState | { "state": "removing" } & InstalledState;
\ No newline at end of file
diff --git a/core/startos/bindings/Progress.ts b/core/startos/bindings/Progress.ts
new file mode 100644
index 000000000..d522dee5a
--- /dev/null
+++ b/core/startos/bindings/Progress.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Progress = boolean | { done: bigint, total: bigint | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/Public.ts b/core/startos/bindings/Public.ts
new file mode 100644
index 000000000..c913d8493
--- /dev/null
+++ b/core/startos/bindings/Public.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AllPackageData } from "./AllPackageData";
+import type { ServerInfo } from "./ServerInfo";
+
+export type Public = { serverInfo: ServerInfo, packageData: AllPackageData, ui: any, };
\ No newline at end of file
diff --git a/core/startos/bindings/ServerInfo.ts b/core/startos/bindings/ServerInfo.ts
new file mode 100644
index 000000000..ee8e55157
--- /dev/null
+++ b/core/startos/bindings/ServerInfo.ts
@@ -0,0 +1,16 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ConnectionAddresses } from "./ConnectionAddresses";
+import type { Governor } from "./Governor";
+import type { IpInfo } from "./IpInfo";
+import type { ServerStatus } from "./ServerStatus";
+import type { WifiInfo } from "./WifiInfo";
+
+export type ServerInfo = { arch: string, platform: string, id: string, hostname: string, version: string, lastBackup: string | null, 
+/**
+ * Used in the wifi to determine the region to set the system to
+ */
+lastWifiRegion: string | null, eosVersionCompat: string, lanAddress: string, onionAddress: string, 
+/**
+ * for backwards compatibility
+ */
+torAddress: string, ipInfo: { [key: string]: IpInfo }, statusInfo: ServerStatus, wifi: WifiInfo, unreadNotificationCount: bigint, connectionAddresses: ConnectionAddresses, passwordHash: string, pubkey: string, caFingerprint: string, ntpSynced: boolean, zram: boolean, governor: Governor | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/ServerSpecs.ts b/core/startos/bindings/ServerSpecs.ts
new file mode 100644
index 000000000..ec464c8df
--- /dev/null
+++ b/core/startos/bindings/ServerSpecs.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ServerSpecs = { cpu: string, disk: string, memory: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/ServerStatus.ts b/core/startos/bindings/ServerStatus.ts
new file mode 100644
index 000000000..0d31f74ea
--- /dev/null
+++ b/core/startos/bindings/ServerStatus.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BackupProgress } from "./BackupProgress";
+import type { PackageId } from "./PackageId";
+import type { UpdateProgress } from "./UpdateProgress";
+
+export type ServerStatus = { backupProgress: { [key: PackageId]: BackupProgress } | null, updated: boolean, updateProgress: UpdateProgress | null, shuttingDown: boolean, restarting: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/Status.ts b/core/startos/bindings/Status.ts
index fdfaea244..73894287a 100644
--- a/core/startos/bindings/Status.ts
+++ b/core/startos/bindings/Status.ts
@@ -1,3 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DependencyConfigErrors } from "./DependencyConfigErrors";
+import type { MainStatus } from "./MainStatus";
 
-export type Status = "running" | "stopped";
\ No newline at end of file
+export type Status = { configured: boolean, main: MainStatus, dependencyConfigErrors: DependencyConfigErrors, };
\ No newline at end of file
diff --git a/core/startos/bindings/UpdateProgress.ts b/core/startos/bindings/UpdateProgress.ts
new file mode 100644
index 000000000..ad9750196
--- /dev/null
+++ b/core/startos/bindings/UpdateProgress.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UpdateProgress = { size: bigint | null, downloaded: bigint, };
\ No newline at end of file
diff --git a/core/startos/bindings/UpdatingState.ts b/core/startos/bindings/UpdatingState.ts
new file mode 100644
index 000000000..ce994ce33
--- /dev/null
+++ b/core/startos/bindings/UpdatingState.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { InstallingInfo } from "./InstallingInfo";
+import type { Manifest } from "./Manifest";
+
+export type UpdatingState = { manifest: Manifest, installingInfo: InstallingInfo, };
\ No newline at end of file
diff --git a/core/startos/bindings/VolumeId.ts b/core/startos/bindings/VolumeId.ts
new file mode 100644
index 000000000..b5e798c8b
--- /dev/null
+++ b/core/startos/bindings/VolumeId.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type VolumeId = string;
\ No newline at end of file
diff --git a/core/startos/bindings/WifiInfo.ts b/core/startos/bindings/WifiInfo.ts
new file mode 100644
index 000000000..e1debf26b
--- /dev/null
+++ b/core/startos/bindings/WifiInfo.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type WifiInfo = { ssids: Array<string>, selected: string | null, connected: string | null, };
\ No newline at end of file
diff --git a/core/startos/src/db/model/mod.rs b/core/startos/src/db/model/mod.rs
index cae1bfe51..9be0f8b68 100644
--- a/core/startos/src/db/model/mod.rs
+++ b/core/startos/src/db/model/mod.rs
@@ -2,6 +2,7 @@ use std::collections::BTreeMap;
 
 use patch_db::HasModel;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::auth::Sessions;
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index fc3c2751c..641b0b56d 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -10,13 +10,15 @@ use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+use crate::net::host::HostInfo;
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::s9pk::manifest::Manifest;
 use crate::status::Status;
-use crate::{net::host::HostInfo, util::serde::Pem};
+use crate::util::serde::Pem;
 
-#[derive(Debug, Default, Deserialize, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize, TS)]
+#[ts(export)]
 pub struct AllPackageData(pub BTreeMap<PackageId, PackageDataEntry>);
 impl Map for AllPackageData {
     type Key = PackageId;
@@ -35,10 +37,11 @@ pub enum ManifestPreference {
     New,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "state")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub enum PackageState {
     Installing(InstallingState),
     Restoring(InstallingState),
@@ -257,51 +260,57 @@ impl Model<PackageState> {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct InstallingState {
     pub installing_info: InstallingInfo,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct UpdatingState {
     pub manifest: Manifest,
     pub installing_info: InstallingInfo,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct InstalledState {
     pub manifest: Manifest,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct InstallingInfo {
     pub new_manifest: Manifest,
     pub progress: FullProgress,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct PackageDataEntry {
     pub state_info: PackageState,
     pub status: Status,
+    #[ts(type = "string | null")]
     pub marketplace_url: Option<Url>,
+    #[ts(type = "string")]
     pub developer_key: Pem<ed25519_dalek::VerifyingKey>,
     pub icon: DataUrl<'static>,
+    #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
-    pub dependency_info: BTreeMap<PackageId, StaticDependencyInfo>,
     pub current_dependencies: CurrentDependencies,
-    pub interface_addresses: InterfaceAddressMap,
     pub hosts: HostInfo,
-    pub store_exposed_ui: StoreExposedUI,
+    #[ts(type = "string[]")]
     pub store_exposed_dependents: Vec<JsonPointer>,
 }
 impl AsRef<PackageDataEntry> for PackageDataEntry {
@@ -310,52 +319,8 @@ impl AsRef<PackageDataEntry> for PackageDataEntry {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[model = "Model<Self>"]
-pub struct ExposedDependent {
-    path: String,
-    title: String,
-    description: Option<String>,
-    masked: Option<bool>,
-    copyable: Option<bool>,
-    qr: Option<bool>,
-}
-#[derive(Default, Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct StoreExposedUI(pub BTreeMap<InternedString, ExposedUI>);
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[serde(tag = "type")]
+#[derive(Debug, Clone, Default, Deserialize, Serialize, TS)]
 #[ts(export)]
-pub enum ExposedUI {
-    Object {
-        #[ts(type = "{[key: string]: ExposedUI}")]
-        value: BTreeMap<String, ExposedUI>,
-        #[serde(default)]
-        #[ts(type = "string | null")]
-        description: String,
-    },
-    String {
-        #[ts(type = "string")]
-        path: JsonPointer,
-        description: Option<String>,
-        masked: bool,
-        copyable: Option<bool>,
-        qr: Option<bool>,
-    },
-}
-
-impl Default for ExposedUI {
-    fn default() -> Self {
-        ExposedUI::Object {
-            value: BTreeMap::new(),
-            description: "".to_string(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
 pub struct CurrentDependencies(pub BTreeMap<PackageId, CurrentDependencyInfo>);
 impl CurrentDependencies {
     pub fn map(
@@ -379,31 +344,26 @@ impl Map for CurrentDependencies {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[model = "Model<Self>"]
-pub struct StaticDependencyInfo {
+pub struct CurrentDependencyInfo {
+    #[serde(flatten)]
+    pub kind: CurrentDependencyKind,
     pub title: String,
     pub icon: DataUrl<'static>,
+    #[ts(type = "string")]
+    pub registry: Url,
+    #[ts(type = "string")]
+    pub version_spec: VersionRange,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "kind")]
-pub enum CurrentDependencyInfo {
-    #[serde(rename_all = "camelCase")]
-    Exists {
-        #[ts(type = "string")]
-        url: Url,
-        #[ts(type = "string")]
-        version_spec: VersionRange,
-    },
+pub enum CurrentDependencyKind {
+    Exists,
     #[serde(rename_all = "camelCase")]
     Running {
-        #[ts(type = "string")]
-        url: Url,
-        #[ts(type = "string")]
-        version_spec: VersionRange,
         #[serde(default)]
         #[ts(type = "string[]")]
         health_checks: BTreeSet<HealthCheckId>,
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index d618f8d33..ea8a3ac3d 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -13,6 +13,7 @@ use patch_db::{HasModel, Value};
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
+use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::db::model::package::AllPackageData;
@@ -23,13 +24,14 @@ use crate::util::Version;
 use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
-// #[macro_debug]
+#[ts(export)]
 pub struct Public {
     pub server_info: ServerInfo,
     pub package_data: AllPackageData,
+    #[ts(type = "any")]
     pub ui: Value,
 }
 impl Public {
@@ -101,24 +103,34 @@ fn get_platform() -> InternedString {
     (&*PLATFORM).into()
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct ServerInfo {
     #[serde(default = "get_arch")]
+    #[ts(type = "string")]
     pub arch: InternedString,
     #[serde(default = "get_platform")]
+    #[ts(type = "string")]
     pub platform: InternedString,
     pub id: String,
     pub hostname: String,
+    #[ts(type = "string")]
     pub version: Version,
+    #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
     /// Used in the wifi to determine the region to set the system to
+    #[ts(type = "string | null")]
     pub last_wifi_region: Option<CountryCode>,
+    #[ts(type = "string")]
     pub eos_version_compat: VersionRange,
+    #[ts(type = "string")]
     pub lan_address: Url,
+    #[ts(type = "string")]
     pub onion_address: OnionAddressV3,
     /// for backwards compatibility
+    #[ts(type = "string")]
     pub tor_address: Url,
     pub ip_info: BTreeMap<String, IpInfo>,
     #[serde(default)]
@@ -136,12 +148,15 @@ pub struct ServerInfo {
     pub governor: Option<Governor>,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct IpInfo {
+    #[ts(type = "string | null")]
     pub ipv4_range: Option<Ipv4Net>,
     pub ipv4: Option<Ipv4Addr>,
+    #[ts(type = "string | null")]
     pub ipv6_range: Option<Ipv6Net>,
     pub ipv6: Option<Ipv6Addr>,
 }
@@ -158,15 +173,17 @@ impl IpInfo {
     }
 }
 
-#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct BackupProgress {
     pub complete: bool,
 }
 
-#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct ServerStatus {
     pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
     pub updated: bool,
@@ -177,33 +194,37 @@ pub struct ServerStatus {
     pub restarting: bool,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct UpdateProgress {
     pub size: Option<u64>,
     pub downloaded: u64,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct WifiInfo {
     pub ssids: Vec<String>,
     pub selected: Option<String>,
     pub connected: Option<String>,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct ServerSpecs {
     pub cpu: String,
     pub disk: String,
     pub memory: String,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct ConnectionAddresses {
     pub tor: Vec<String>,
     pub clearnet: Vec<String>,
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index ca40bf432..d973688e9 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -2,18 +2,16 @@ use std::collections::BTreeMap;
 use std::time::Duration;
 
 use clap::Parser;
-use emver::VersionRange;
-use models::{OptionExt, PackageId};
+use models::PackageId;
 use rpc_toolkit::{command, from_fn_async, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::config::{Config, ConfigSpec, ConfigureContext};
 use crate::context::RpcContext;
 use crate::db::model::package::CurrentDependencies;
-use crate::db::model::Database;
 use crate::prelude::*;
-use crate::s9pk::manifest::Manifest;
 use crate::status::DependencyConfigErrors;
 use crate::Error;
 
@@ -21,8 +19,9 @@ pub fn dependency() -> ParentHandler {
     ParentHandler::new().subcommand("configure", configure())
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct Dependencies(pub BTreeMap<PackageId, DepInfo>);
 impl Map for Dependencies {
     type Key = PackageId;
@@ -35,27 +34,13 @@ impl Map for Dependencies {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-#[serde(tag = "type")]
-pub enum DependencyRequirement {
-    OptIn { how: String },
-    OptOut { how: String },
-    Required,
-}
-impl DependencyRequirement {
-    pub fn required(&self) -> bool {
-        matches!(self, &DependencyRequirement::Required)
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct DepInfo {
-    pub version: VersionRange,
-    pub requirement: DependencyRequirement,
     pub description: Option<String>,
+    pub optional: bool,
 }
 
 #[derive(Deserialize, Serialize, Parser)]
diff --git a/core/startos/src/net/host/address.rs b/core/startos/src/net/host/address.rs
index 6f3ff6df2..cb3b485f6 100644
--- a/core/startos/src/net/host/address.rs
+++ b/core/startos/src/net/host/address.rs
@@ -1,9 +1,14 @@
 use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
+use ts_rs::TS;
 
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "kind")]
+#[ts(export)]
 pub enum HostAddress {
-    Onion { address: OnionAddressV3 },
+    Onion {
+        #[ts(type = "string")]
+        address: OnionAddressV3,
+    },
 }
diff --git a/core/startos/src/net/host/binding.rs b/core/startos/src/net/host/binding.rs
index 0584b517b..aa689b717 100644
--- a/core/startos/src/net/host/binding.rs
+++ b/core/startos/src/net/host/binding.rs
@@ -1,12 +1,14 @@
 use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use crate::net::forward::AvailablePorts;
 use crate::net::vhost::AlpnInfo;
 use crate::prelude::*;
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct BindInfo {
     pub options: BindOptions,
     pub assigned_lan_port: Option<u16>,
@@ -49,9 +51,11 @@ impl BindInfo {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct BindOptions {
+    #[ts(type = "string")]
     pub scheme: InternedString,
     pub preferred_external_port: u16,
     pub add_ssl: Option<AddSslOptions>,
@@ -59,9 +63,11 @@ pub struct BindOptions {
     pub ssl: bool,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct AddSslOptions {
+    #[ts(type = "string")]
     pub scheme: InternedString,
     pub preferred_external_port: u16,
     // #[serde(default)]
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
index 18b86ba0e..086840bd8 100644
--- a/core/startos/src/net/host/mod.rs
+++ b/core/startos/src/net/host/mod.rs
@@ -3,6 +3,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use imbl_value::InternedString;
 use models::HostId;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use crate::net::forward::AvailablePorts;
 use crate::net::host::address::HostAddress;
@@ -12,9 +13,10 @@ use crate::prelude::*;
 pub mod address;
 pub mod binding;
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct Host {
     pub kind: HostKind,
     pub bindings: BTreeMap<u16, BindInfo>,
@@ -37,16 +39,18 @@ impl Host {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub enum HostKind {
     Multi,
     // Single,
     // Static,
 }
 
-#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct HostInfo(BTreeMap<HostId, Host>);
 
 impl Map for HostInfo {
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index 88cb759a0..46838ed51 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -17,6 +17,7 @@ use tokio_rustls::rustls::server::Acceptor;
 use tokio_rustls::rustls::{RootCertStore, ServerConfig};
 use tokio_rustls::{LazyConfigAcceptor, TlsConnector};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::prelude::*;
 use crate::util::io::{BackTrackingReader, TimeoutStream};
@@ -80,8 +81,9 @@ struct TargetInfo {
     connect_ssl: Result<(), AlpnInfo>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub enum AlpnInfo {
     Reflect,
     Specified(Vec<MaybeUtf8String>),
diff --git a/core/startos/src/progress.rs b/core/startos/src/progress.rs
index 38e66a419..0acdca111 100644
--- a/core/startos/src/progress.rs
+++ b/core/startos/src/progress.rs
@@ -9,6 +9,7 @@ use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncSeek, AsyncWrite};
 use tokio::sync::{mpsc, watch};
+use ts_rs::TS;
 
 use crate::db::model::DatabaseModel;
 use crate::prelude::*;
@@ -19,7 +20,7 @@ lazy_static::lazy_static! {
     static ref BYTES: ProgressStyle = ProgressStyle::with_template("{spinner} {wide_msg} [{bytes}/?] [{binary_bytes_per_sec} {elapsed}]").unwrap();
 }
 
-#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, TS)]
 #[serde(untagged)]
 pub enum Progress {
     Complete(bool),
@@ -126,13 +127,16 @@ impl std::ops::AddAssign<u64> for Progress {
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[ts(export)]
 pub struct NamedProgress {
+    #[ts(type = "string")]
     pub name: InternedString,
     pub progress: Progress,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[ts(export)]
 pub struct FullProgress {
     pub overall: Progress,
     pub phases: Vec<NamedProgress>,
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 5482bdb58..5aa8a01d4 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -1,13 +1,10 @@
-use std::{borrow::Borrow, collections::BTreeMap};
-
 use clap::Parser;
-use imbl_value::{json, InOMap, InternedString, Value};
+use imbl_value::Value;
 use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 
 use crate::context::RpcContext;
-use crate::db::model::package::{ExposedUI, StoreExposedUI};
 use crate::prelude::*;
 use crate::Error;
 
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index 813ad11a6..ef346ad2b 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
+use emver::VersionRange;
 use imbl_value::InOMap;
 pub use models::PackageId;
 use models::VolumeId;
@@ -8,7 +9,6 @@ use serde::{Deserialize, Serialize};
 use url::Url;
 
 use super::git_hash::GitHash;
-use crate::dependencies::Dependencies;
 use crate::prelude::*;
 use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
 use crate::util::Version;
@@ -43,7 +43,7 @@ pub struct Manifest {
     pub alerts: Alerts,
     pub volumes: BTreeMap<VolumeId, Value>,
     #[serde(default)]
-    pub dependencies: Dependencies,
+    pub dependencies: BTreeMap<PackageId, DepInfo>,
     pub config: Option<InOMap<String, Value>>,
 
     #[serde(default)]
@@ -53,6 +53,29 @@ pub struct Manifest {
     pub hardware_requirements: HardwareRequirements,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+#[serde(tag = "type")]
+pub enum DependencyRequirement {
+    OptIn { how: String },
+    OptOut { how: String },
+    Required,
+}
+impl DependencyRequirement {
+    pub fn required(&self) -> bool {
+        matches!(self, &DependencyRequirement::Required)
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+pub struct DepInfo {
+    pub version: VersionRange,
+    pub requirement: DependencyRequirement,
+    pub description: Option<String>,
+}
+
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Assets {
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 423491e7a..5a98538dc 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -7,6 +7,7 @@ use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncSeek, AsyncWriteExt};
 use tokio::process::Command;
 
+use crate::dependencies::{DepInfo, Dependencies};
 use crate::prelude::*;
 use crate::s9pk::manifest::Manifest;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
@@ -347,7 +348,21 @@ impl From<ManifestV1> for Manifest {
                 .map(|(id, _)| id.clone())
                 .collect(),
             alerts: value.alerts,
-            dependencies: value.dependencies,
+            dependencies: Dependencies(
+                value
+                    .dependencies
+                    .into_iter()
+                    .map(|(id, value)| {
+                        (
+                            id,
+                            DepInfo {
+                                description: value.description,
+                                optional: !value.requirement.required(),
+                            },
+                        )
+                    })
+                    .collect(),
+            ),
             hardware_requirements: value.hardware_requirements,
             git_hash: value.git_hash,
             os_version: value.eos_version,
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index 119bbb466..ea4524400 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -5,6 +5,7 @@ use helpers::const_true;
 pub use models::PackageId;
 use models::{ImageId, VolumeId};
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 use url::Url;
 
 use crate::dependencies::Dependencies;
@@ -18,21 +19,28 @@ fn current_version() -> Version {
     Current::new().semver().into()
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct Manifest {
     pub id: PackageId,
     pub title: String,
+    #[ts(type = "string")]
     pub version: Version,
     pub release_notes: String,
     pub license: String, // type of license
     #[serde(default)]
     pub replaces: Vec<String>,
+    #[ts(type = "string")]
     pub wrapper_repo: Url,
+    #[ts(type = "string")]
     pub upstream_repo: Url,
+    #[ts(type = "string")]
     pub support_site: Url,
+    #[ts(type = "string")]
     pub marketing_site: Url,
+    #[ts(type = "string | null")]
     pub donation_url: Option<Url>,
     pub description: Description,
     pub images: Vec<ImageId>,
@@ -45,23 +53,28 @@ pub struct Manifest {
     #[serde(default)]
     pub hardware_requirements: HardwareRequirements,
     #[serde(default)]
+    #[ts(type = "string | null")]
     pub git_hash: Option<GitHash>,
     #[serde(default = "current_version")]
+    #[ts(type = "string")]
     pub os_version: Version,
     #[serde(default = "const_true")]
     pub has_config: bool,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct HardwareRequirements {
     #[serde(default)]
+    #[ts(type = "{ [key: string]: string }")]
     device: BTreeMap<String, Regex>,
     ram: Option<u64>,
     pub arch: Option<Vec<String>>,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
 pub struct Description {
     pub short: String,
     pub long: String,
@@ -84,8 +97,9 @@ impl Description {
     }
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct Alerts {
     pub install: Option<String>,
     pub uninstall: Option<String>,
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index b3eaf365c..ed82138b1 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -20,7 +20,7 @@ use ts_rs::TS;
 use url::Url;
 
 use crate::db::model::package::{
-    CurrentDependencies, CurrentDependencyInfo, ExposedUI, StoreExposedUI,
+    CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind,
 };
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
@@ -114,7 +114,6 @@ pub fn service_effect_handler() -> ParentHandler {
             "exposeForDependents",
             from_fn_async(expose_for_dependents).no_cli(),
         )
-        .subcommand("exposeUi", from_fn_async(expose_ui).no_cli())
         .subcommand(
             "createOverlayedImage",
             from_fn_async(create_overlayed_image)
@@ -699,23 +698,6 @@ async fn expose_for_dependents(
     Ok(())
 }
 
-async fn expose_ui(context: EffectContext, params: StoreExposedUI) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = context.id.clone();
-    context
-        .ctx
-        .db
-        .mutate(|db| {
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package_id)
-                .or_not_found(&package_id)?
-                .as_store_exposed_ui_mut()
-                .ser(&params)
-        })
-        .await?;
-    Ok(())
-}
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
@@ -1101,7 +1083,7 @@ enum DependencyRequirement {
         #[ts(type = "string")]
         version_spec: VersionRange,
         #[ts(type = "string")]
-        url: Url,
+        registry: Url,
     },
     #[serde(rename_all = "camelCase")]
     Exists {
@@ -1110,7 +1092,7 @@ enum DependencyRequirement {
         #[ts(type = "string")]
         version_spec: VersionRange,
         #[ts(type = "string")]
-        url: Url,
+        registry: Url,
     },
 }
 // filebrowser:exists,bitcoind:running:foo+bar+baz
@@ -1120,7 +1102,7 @@ impl FromStr for DependencyRequirement {
         match s.split_once(':') {
             Some((id, "e")) | Some((id, "exists")) => Ok(Self::Exists {
                 id: id.parse()?,
-                url: "".parse()?,           // TODO
+                registry: "".parse()?,      // TODO
                 version_spec: "*".parse()?, // TODO
             }),
             Some((id, rest)) => {
@@ -1144,14 +1126,14 @@ impl FromStr for DependencyRequirement {
                 Ok(Self::Running {
                     id: id.parse()?,
                     health_checks,
-                    url: "".parse()?,           // TODO
+                    registry: "".parse()?,      // TODO
                     version_spec: "*".parse()?, // TODO
                 })
             }
             None => Ok(Self::Running {
                 id: s.parse()?,
                 health_checks: BTreeSet::new(),
-                url: "".parse()?,           // TODO
+                registry: "".parse()?,      // TODO
                 version_spec: "*".parse()?, // TODO
             }),
         }
@@ -1187,20 +1169,31 @@ async fn set_dependencies(
                     .map(|dependency| match dependency {
                         DependencyRequirement::Exists {
                             id,
-                            url,
+                            registry,
                             version_spec,
-                        } => (id, CurrentDependencyInfo::Exists { url, version_spec }),
+                        } => (
+                            id,
+                            CurrentDependencyInfo {
+                                kind: CurrentDependencyKind::Exists,
+                                registry,
+                                version_spec,
+                                icon: todo!(),
+                                title: todo!(),
+                            },
+                        ),
                         DependencyRequirement::Running {
                             id,
                             health_checks,
-                            url,
+                            registry,
                             version_spec,
                         } => (
                             id,
-                            CurrentDependencyInfo::Running {
-                                url,
+                            CurrentDependencyInfo {
+                                kind: CurrentDependencyKind::Running { health_checks },
+                                registry,
                                 version_spec,
-                                health_checks,
+                                icon: todo!(),
+                                title: todo!(),
                             },
                         ),
                     })
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index e56b1d7dd..1eebfced6 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -10,6 +10,7 @@ use imbl_value::InternedString;
 use tokio::sync::{Mutex, OwnedRwLockReadGuard, OwnedRwLockWriteGuard, RwLock};
 use tracing::instrument;
 
+use crate::context::RpcContext;
 use crate::db::model::package::{
     InstallingInfo, InstallingState, PackageDataEntry, PackageState, UpdatingState,
 };
@@ -26,7 +27,7 @@ use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
 use crate::service::{LoadDisposition, Service};
 use crate::status::{MainStatus, Status};
-use crate::{context::RpcContext, util::serde::Pem};
+use crate::util::serde::Pem;
 
 pub type DownloadInstallFuture = BoxFuture<'static, Result<InstallFuture, Error>>;
 pub type InstallFuture = BoxFuture<'static, Result<(), Error>>;
@@ -170,11 +171,8 @@ impl ServiceMap {
                                 developer_key: Pem::new(developer_key),
                                 icon,
                                 last_backup: None,
-                                dependency_info: Default::default(),
                                 current_dependencies: Default::default(),
-                                interface_addresses: Default::default(),
                                 hosts: Default::default(),
-                                store_exposed_ui: Default::default(),
                                 store_exposed_dependents: Default::default(),
                             },
                         )?;
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index 7a6cb0430..c2af46490 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -1,7 +1,8 @@
 pub use models::HealthCheckId;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "result")]
 pub enum HealthCheckResult {
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 13b0568e2..2faa90e79 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -4,15 +4,17 @@ use chrono::{DateTime, Utc};
 use imbl::OrdMap;
 use models::PackageId;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use self::health_check::HealthCheckId;
 use crate::prelude::*;
 use crate::status::health_check::HealthCheckResult;
 
 pub mod health_check;
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct Status {
     pub configured: bool,
     pub main: MainStatus,
@@ -20,9 +22,9 @@ pub struct Status {
     pub dependency_config_errors: DependencyConfigErrors,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel, Default)]
-#[serde(rename_all = "camelCase")]
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, Default, TS)]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct DependencyConfigErrors(pub BTreeMap<PackageId, String>);
 impl Map for DependencyConfigErrors {
     type Key = PackageId;
@@ -35,22 +37,29 @@ impl Map for DependencyConfigErrors {
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(tag = "status")]
 #[serde(rename_all = "camelCase")]
 pub enum MainStatus {
     Stopped,
     Restarting,
+    #[serde(rename_all = "camelCase")]
     Stopping {
         timeout: crate::util::serde::Duration,
     },
     Starting,
+    #[serde(rename_all = "camelCase")]
     Running {
+        #[ts(type = "string")]
         started: DateTime<Utc>,
+        #[ts(as = "BTreeMap<HealthCheckId, HealthCheckResult>")]
         health: OrdMap<HealthCheckId, HealthCheckResult>,
     },
+    #[serde(rename_all = "camelCase")]
     BackingUp {
+        #[ts(type = "string | null")]
         started: Option<DateTime<Utc>>,
+        #[ts(as = "BTreeMap<HealthCheckId, HealthCheckResult>")]
         health: OrdMap<HealthCheckId, HealthCheckResult>,
     },
 }
diff --git a/core/startos/src/util/cpupower.rs b/core/startos/src/util/cpupower.rs
index cc4ac5ef4..db625f90e 100644
--- a/core/startos/src/util/cpupower.rs
+++ b/core/startos/src/util/cpupower.rs
@@ -3,6 +3,7 @@ use std::collections::BTreeSet;
 
 use imbl::OrdMap;
 use tokio::process::Command;
+use ts_rs::TS;
 
 use crate::prelude::*;
 use crate::util::Invoke;
@@ -13,7 +14,10 @@ pub const GOVERNOR_HEIRARCHY: &[Governor] = &[
     Governor(Cow::Borrowed("conservative")),
 ];
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
+#[derive(
+    Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, TS,
+)]
+#[ts(export, type = "string")]
 pub struct Governor(Cow<'static, str>);
 impl std::str::FromStr for Governor {
     type Err = std::convert::Infallible;
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index cd414f66e..2fa992abd 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -15,6 +15,7 @@ use serde::de::DeserializeOwned;
 use serde::ser::{SerializeMap, SerializeSeq};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
+use ts_rs::TS;
 
 use super::IntoDoubleEndedIterator;
 use crate::util::clap::FromStrParser;
@@ -633,7 +634,8 @@ where
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, TS)]
+#[ts(export, type = "string")]
 pub struct Duration(std::time::Duration);
 impl Deref for Duration {
     type Target = std::time::Duration;
@@ -1175,7 +1177,8 @@ impl<T: PemEncoding> Pem<T> {
     }
 }
 
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, TS)]
+#[ts(export, type = "string | number[]")]
 pub struct MaybeUtf8String(pub Vec<u8>);
 impl std::fmt::Debug for MaybeUtf8String {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

From 9cf62f03fafdf78b213cad094c5a36bc7277ccb3 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 27 Mar 2024 15:28:54 -0600
Subject: [PATCH 103/341] Add some extra export action

---
 .../Systems/SystemForEmbassy/index.ts         | 30 ++++++++
 core/startos/src/db/model/package.rs          | 25 ++++++-
 .../src/service/service_effect_handler.rs     | 71 ++++++++++++-------
 3 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index fb99795cc..ade166eff 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -29,6 +29,7 @@ import {
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
 import { RpcResult, matchRpcResult } from "../../RpcListener"
+import { InputSpec } from "@start9labs/start-sdk/cjs/sdk/lib/config/configTypes"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -259,6 +260,35 @@ export class SystemForEmbassy implements System {
   ): Promise<void> {
     if (previousVersion) await this.migration(effects, previousVersion)
     await effects.setMainStatus({ status: "stopped" })
+    await this.exportActions(effects)
+  }
+  async exportActions(effects: HostSystemStartOs) {
+    const manifest = this.manifest
+    if (!manifest.actions) return
+    for (const [actionId, action] of Object.entries(manifest.actions)) {
+      const hasRunning = !!action["allowed-statuses"].find(
+        (x) => x === "running",
+      )
+      const hasStopped = !!action["allowed-statuses"].find(
+        (x) => x === "stopped",
+      )
+      // prettier-ignore
+      const allowedStatuses = hasRunning && hasStopped ? "any":
+        hasRunning ? "onlyRunning" :
+         "onlyStopped"
+      await effects.exportAction({
+        id: actionId,
+        metadata: {
+          name: action.name,
+          description: action.description,
+          warning: action.warning || null,
+          input: action["input-spec"] as InputSpec,
+          disabled: false,
+          allowedStatuses,
+          group: null,
+        },
+      })
+    }
   }
   private async uninit(
     effects: HostSystemStartOs,
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 641b0b56d..0c82bf80c 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -3,7 +3,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use chrono::{DateTime, Utc};
 use emver::VersionRange;
 use imbl_value::InternedString;
-use models::{DataUrl, HealthCheckId, HostId, PackageId};
+use models::{ActionId, DataUrl, HealthCheckId, HostId, PackageId};
 use patch_db::json_ptr::JsonPointer;
 use patch_db::HasModel;
 use reqwest::Url;
@@ -293,6 +293,28 @@ pub struct InstallingInfo {
     pub new_manifest: Manifest,
     pub progress: FullProgress,
 }
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub enum AllowedStatuses {
+    OnlyRunning, // onlyRunning
+    OnlyStopped,
+    Any,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+pub struct ActionMetadata {
+    name: String,
+    description: String,
+    warning: Option<String>,
+    #[ts(type = "any")]
+    input: Value,
+    disabled: bool,
+    allowedStatuses: AllowedStatuses,
+    group: Option<String>,
+}
 
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
@@ -312,6 +334,7 @@ pub struct PackageDataEntry {
     pub hosts: HostInfo,
     #[ts(type = "string[]")]
     pub store_exposed_dependents: Vec<JsonPointer>,
+    pub exposed_actions: BTreeMap<ActionId, ActionMetadata>,
 }
 impl AsRef<PackageDataEntry> for PackageDataEntry {
     fn as_ref(&self) -> &PackageDataEntry {
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index ed82138b1..7bd1c0ab8 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -20,7 +20,7 @@ use ts_rs::TS;
 use url::Url;
 
 use crate::db::model::package::{
-    CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind,
+    ActionMetadata, CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind,
 };
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
@@ -254,14 +254,6 @@ struct ListServiceInterfacesParams {
 struct RemoveAddressParams {
     id: String,
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-enum AllowedStatuses {
-    OnlyRunning, // onlyRunning
-    OnlyStopped,
-    Any,
-}
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
@@ -274,21 +266,9 @@ struct ExportActionParams {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
-struct ActionMetadata {
-    name: String,
-    description: String,
-    warning: Option<String>,
-    disabled: bool,
-    #[ts(type = "{[key: string]: any}")]
-    input: Value,
-    allowed_statuses: AllowedStatuses,
-    group: Option<String>,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
 struct RemoveActionParams {
-    id: String,
+    #[ts(type = "string")]
+    id: ActionId,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
@@ -387,11 +367,48 @@ async fn list_service_interfaces(
 async fn remove_address(context: EffectContext, data: RemoveAddressParams) -> Result<Value, Error> {
     todo!()
 }
-async fn export_action(context: EffectContext, data: ExportActionParams) -> Result<Value, Error> {
-    todo!()
+async fn export_action(context: EffectContext, data: ExportActionParams) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            let model = db
+                .as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_exposed_actions_mut();
+            let mut value = model.de()?;
+            value
+                .insert(data.id, data.metadata)
+                .map(|_| ())
+                .unwrap_or_default();
+            model.ser(&value)
+        })
+        .await?;
+    Ok(())
 }
-async fn remove_action(context: EffectContext, data: RemoveActionParams) -> Result<Value, Error> {
-    todo!()
+async fn remove_action(context: EffectContext, data: RemoveActionParams) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            let model = db
+                .as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_exposed_actions_mut();
+            let mut value = model.de()?;
+            value.remove(&data.id).map(|_| ()).unwrap_or_default();
+            model.ser(&value)
+        })
+        .await?;
+    Ok(())
 }
 async fn reverse_proxy(context: EffectContext, data: ReverseProxyParams) -> Result<Value, Error> {
     todo!()

From f41f5ebebd18778fc3466711d77ced5af79a2306 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Wed, 27 Mar 2024 17:47:12 -0600
Subject: [PATCH 104/341] export patchdb ts types from rust

---
 Makefile                                      |   2 +-
 .../bindings/ServiceInterfaceId.ts}           |   2 +-
 core/models/src/id/mod.rs                     |   4 +-
 .../id/{address.rs => service_interface.rs}   |  24 +--
 .../bindings/{BindKind.ts => ActionId.ts}     |   2 +-
 core/startos/bindings/ActionMetadata.ts       |   2 +-
 core/startos/bindings/AddSslOptions.ts        |   2 +-
 core/startos/bindings/AddressInfo.ts          |   3 +-
 core/startos/bindings/BindOptions.ts          |   3 +-
 core/startos/bindings/BindParams.ts           |   7 +-
 .../startos/bindings/CurrentDependencyInfo.ts |   2 +-
 .../startos/bindings/DependencyRequirement.ts |   2 +-
 core/startos/bindings/ExportedHostInfo.ts     |   6 +
 core/startos/bindings/ExportedHostnameInfo.ts |   5 +
 core/startos/bindings/ExportedIpHostname.ts   |   3 +
 .../startos/bindings/ExportedOnionHostname.ts |   3 +
 core/startos/bindings/HealthCheckResult.ts    |   2 +-
 core/startos/bindings/PackageDataEntry.ts     |   6 +-
 core/startos/bindings/Progress.ts             |   2 +-
 .../{ConnectionAddresses.ts => Security.ts}   |   2 +-
 core/startos/bindings/ServerInfo.ts           |   3 +-
 core/startos/bindings/ServiceInterface.ts     |   6 +
 ...thCheckString.ts => ServiceInterfaceId.ts} |   2 +-
 .../bindings/ServiceInterfaceWithHostInfo.ts  |   7 +
 core/startos/bindings/SetHealth.ts            |   4 +-
 core/startos/bindings/UpdateProgress.ts       |   2 +-
 core/startos/src/db/model/package.rs          |  22 ++-
 core/startos/src/db/model/public.rs           |  16 +-
 core/startos/src/net/host/binding.rs          |  24 ++-
 core/startos/src/net/host/mod.rs              |   2 +-
 core/startos/src/net/mod.rs                   |   1 +
 core/startos/src/net/net_controller.rs        |   2 +-
 core/startos/src/net/service_interface.rs     | 115 +++++++++++
 core/startos/src/progress.rs                  |   7 +-
 .../src/service/service_effect_handler.rs     | 127 ++++--------
 core/startos/src/service/service_map.rs       |   2 +
 core/startos/src/status/health_check.rs       |  40 ++--
 sdk/lib/Dependency.ts                         |   4 +-
 sdk/lib/interfaces/Host.ts                    |  50 ++---
 sdk/lib/test/startosTypeValidation.test.ts    |   2 -
 sdk/lib/types.ts                              |  32 ++-
 web/projects/marketplace/src/types.ts         |  30 +--
 .../ui/src/app/app/menu/menu.component.ts     |  12 +-
 .../backup-select/backup-select.page.ts       |   4 +-
 .../app-actions/app-actions.page.ts           |   3 +-
 .../app-interfaces/app-interfaces.page.ts     |  13 +-
 .../app-list-pkg/app-list-pkg.component.ts    |  11 +-
 .../app-properties/app-properties.page.ts     |   7 +-
 .../apps-routes/app-show/app-show.page.ts     |   2 +-
 .../app-show-additional.component.ts          |   2 +-
 .../app-show-health-checks.component.ts       |  15 +-
 .../app-show-progress.component.ts            |   2 +-
 .../app-show-status.component.ts              |   7 +-
 .../app-show/pipes/health-color.pipe.ts       |  14 +-
 .../app-show/pipes/to-buttons.pipe.ts         |   2 +-
 .../app-show/pipes/to-health-checks.pipe.ts   |  12 +-
 .../marketplace-show-controls.component.ts    |   1 -
 .../backing-up/backing-up.component.html      |   2 +-
 .../backing-up/backing-up.component.ts        |   8 +-
 .../server-routes/sideload/sideload.page.ts   |   2 +-
 .../ui/src/app/pages/updates/updates.page.ts  |   2 +-
 .../install-progress/install-progress.pipe.ts |   2 +-
 .../app/pipes/launchable/launchable.pipe.ts   |  11 +-
 web/projects/ui/src/app/pipes/ui/ui.pipe.ts   |   2 +-
 .../ui/src/app/services/api/api.fixures.ts    |  68 +++++--
 .../ui/src/app/services/api/api.types.ts      |   9 +-
 .../services/api/embassy-mock-api.service.ts  |  40 ++--
 .../ui/src/app/services/api/mock-patch.ts     |  48 +++--
 .../ui/src/app/services/config.service.ts     |  44 ++---
 .../ui/src/app/services/dep-error.service.ts  |  18 +-
 .../src/app/services/marketplace.service.ts   |   8 +-
 .../src/app/services/patch-db/data-model.ts   | 184 +-----------------
 .../services/pkg-status-rendering.service.ts  |  15 +-
 .../ui/src/app/util/get-package-data.ts       |  13 +-
 .../ui/src/app/util/get-server-info.ts        |   3 +-
 75 files changed, 536 insertions(+), 634 deletions(-)
 rename core/{startos/bindings/BindOptionsSecure.ts => models/bindings/ServiceInterfaceId.ts} (68%)
 rename core/models/src/id/{address.rs => service_interface.rs} (67%)
 rename core/startos/bindings/{BindKind.ts => ActionId.ts} (67%)
 create mode 100644 core/startos/bindings/ExportedHostInfo.ts
 create mode 100644 core/startos/bindings/ExportedHostnameInfo.ts
 create mode 100644 core/startos/bindings/ExportedIpHostname.ts
 create mode 100644 core/startos/bindings/ExportedOnionHostname.ts
 rename core/startos/bindings/{ConnectionAddresses.ts => Security.ts} (56%)
 create mode 100644 core/startos/bindings/ServiceInterface.ts
 rename core/startos/bindings/{HealthCheckString.ts => ServiceInterfaceId.ts} (54%)
 create mode 100644 core/startos/bindings/ServiceInterfaceWithHostInfo.ts
 create mode 100644 core/startos/src/net/service_interface.rs

diff --git a/Makefile b/Makefile
index 48a28c388..f19b40b47 100644
--- a/Makefile
+++ b/Makefile
@@ -174,8 +174,8 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 	touch container-runtime/node_modules
 
 core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE) $(PLATFORM_FILE)
+	rm -rf core/startos/bindings
 	(cd core/ && cargo test)
-	touch core/startos/bindings
 
 sdk/lib/test: $(shell git ls-files sdk) core/startos/bindings
 	(cd sdk && make test)
diff --git a/core/startos/bindings/BindOptionsSecure.ts b/core/models/bindings/ServiceInterfaceId.ts
similarity index 68%
rename from core/startos/bindings/BindOptionsSecure.ts
rename to core/models/bindings/ServiceInterfaceId.ts
index c7b1b69af..87edd8694 100644
--- a/core/startos/bindings/BindOptionsSecure.ts
+++ b/core/models/bindings/ServiceInterfaceId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type BindOptionsSecure = { ssl: boolean, };
\ No newline at end of file
+export type ServiceInterfaceId = string;
\ No newline at end of file
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index 239479ed7..11644c71d 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -6,21 +6,21 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use yasi::InternedString;
 
 mod action;
-mod address;
 mod health_check;
 mod host;
 mod image;
 mod invalid_id;
 mod package;
+mod service_interface;
 mod volume;
 
 pub use action::ActionId;
-pub use address::AddressId;
 pub use health_check::HealthCheckId;
 pub use host::HostId;
 pub use image::ImageId;
 pub use invalid_id::InvalidId;
 pub use package::{PackageId, SYSTEM_PACKAGE_ID};
+pub use service_interface::ServiceInterfaceId;
 pub use volume::VolumeId;
 
 lazy_static::lazy_static! {
diff --git a/core/models/src/id/address.rs b/core/models/src/id/service_interface.rs
similarity index 67%
rename from core/models/src/id/address.rs
rename to core/models/src/id/service_interface.rs
index 1bd670525..25aec0aba 100644
--- a/core/models/src/id/address.rs
+++ b/core/models/src/id/service_interface.rs
@@ -1,46 +1,48 @@
 use std::path::Path;
 
 use serde::{Deserialize, Deserializer, Serialize};
+use ts_rs::TS;
 
 use crate::Id;
 
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
-pub struct AddressId(Id);
-impl From<Id> for AddressId {
+#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TS)]
+#[ts(export, type = "string")]
+pub struct ServiceInterfaceId(Id);
+impl From<Id> for ServiceInterfaceId {
     fn from(id: Id) -> Self {
         Self(id)
     }
 }
-impl std::fmt::Display for AddressId {
+impl std::fmt::Display for ServiceInterfaceId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", &self.0)
     }
 }
-impl std::ops::Deref for AddressId {
+impl std::ops::Deref for ServiceInterfaceId {
     type Target = str;
     fn deref(&self) -> &Self::Target {
         &*self.0
     }
 }
-impl AsRef<str> for AddressId {
+impl AsRef<str> for ServiceInterfaceId {
     fn as_ref(&self) -> &str {
         self.0.as_ref()
     }
 }
-impl<'de> Deserialize<'de> for AddressId {
+impl<'de> Deserialize<'de> for ServiceInterfaceId {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
-        Ok(AddressId(Deserialize::deserialize(deserializer)?))
+        Ok(ServiceInterfaceId(Deserialize::deserialize(deserializer)?))
     }
 }
-impl AsRef<Path> for AddressId {
+impl AsRef<Path> for ServiceInterfaceId {
     fn as_ref(&self) -> &Path {
         self.0.as_ref().as_ref()
     }
 }
-impl<'q> sqlx::Encode<'q, sqlx::Postgres> for AddressId {
+impl<'q> sqlx::Encode<'q, sqlx::Postgres> for ServiceInterfaceId {
     fn encode_by_ref(
         &self,
         buf: &mut <sqlx::Postgres as sqlx::database::HasArguments<'q>>::ArgumentBuffer,
@@ -48,7 +50,7 @@ impl<'q> sqlx::Encode<'q, sqlx::Postgres> for AddressId {
         <&str as sqlx::Encode<'q, sqlx::Postgres>>::encode_by_ref(&&**self, buf)
     }
 }
-impl sqlx::Type<sqlx::Postgres> for AddressId {
+impl sqlx::Type<sqlx::Postgres> for ServiceInterfaceId {
     fn type_info() -> sqlx::postgres::PgTypeInfo {
         <&str as sqlx::Type<sqlx::Postgres>>::type_info()
     }
diff --git a/core/startos/bindings/BindKind.ts b/core/startos/bindings/ActionId.ts
similarity index 67%
rename from core/startos/bindings/BindKind.ts
rename to core/startos/bindings/ActionId.ts
index e026fb081..7c05d2b3c 100644
--- a/core/startos/bindings/BindKind.ts
+++ b/core/startos/bindings/ActionId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type BindKind = "static" | "single" | "multi";
\ No newline at end of file
+export type ActionId = string;
\ No newline at end of file
diff --git a/core/startos/bindings/ActionMetadata.ts b/core/startos/bindings/ActionMetadata.ts
index 91af02b7b..e787190c8 100644
--- a/core/startos/bindings/ActionMetadata.ts
+++ b/core/startos/bindings/ActionMetadata.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AllowedStatuses } from "./AllowedStatuses";
 
-export type ActionMetadata = { name: string, description: string, warning: string | null, disabled: boolean, input: {[key: string]: any}, allowedStatuses: AllowedStatuses, group: string | null, };
\ No newline at end of file
+export type ActionMetadata = { name: string, description: string, warning: string | null, input: any, disabled: boolean, allowedStatuses: AllowedStatuses, group: string | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/AddSslOptions.ts b/core/startos/bindings/AddSslOptions.ts
index 97035853d..fcf2d63d4 100644
--- a/core/startos/bindings/AddSslOptions.ts
+++ b/core/startos/bindings/AddSslOptions.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AlpnInfo } from "./AlpnInfo";
 
-export type AddSslOptions = { scheme: string, preferredExternalPort: number, alpn: AlpnInfo, };
\ No newline at end of file
+export type AddSslOptions = { scheme: string | null, preferredExternalPort: number, alpn: AlpnInfo, };
\ No newline at end of file
diff --git a/core/startos/bindings/AddressInfo.ts b/core/startos/bindings/AddressInfo.ts
index b253ab823..6bc42c0e9 100644
--- a/core/startos/bindings/AddressInfo.ts
+++ b/core/startos/bindings/AddressInfo.ts
@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BindOptions } from "./BindOptions";
+import type { HostId } from "./HostId";
 
-export type AddressInfo = { username: string | null, hostId: string, bindOptions: BindOptions, suffix: string, };
\ No newline at end of file
+export type AddressInfo = { username: string | null, hostId: HostId, bindOptions: BindOptions, suffix: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/BindOptions.ts b/core/startos/bindings/BindOptions.ts
index dc8b1e5b5..9043c5f57 100644
--- a/core/startos/bindings/BindOptions.ts
+++ b/core/startos/bindings/BindOptions.ts
@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AddSslOptions } from "./AddSslOptions";
+import type { Security } from "./Security";
 
-export type BindOptions = { scheme: string, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: boolean, ssl: boolean, };
\ No newline at end of file
+export type BindOptions = { scheme: string | null, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: Security | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/BindParams.ts b/core/startos/bindings/BindParams.ts
index 319666538..07a8033bc 100644
--- a/core/startos/bindings/BindParams.ts
+++ b/core/startos/bindings/BindParams.ts
@@ -1,6 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AddSslOptions } from "./AddSslOptions";
-import type { BindKind } from "./BindKind";
-import type { BindOptionsSecure } from "./BindOptionsSecure";
+import type { HostId } from "./HostId";
+import type { HostKind } from "./HostKind";
+import type { Security } from "./Security";
 
-export type BindParams = { kind: BindKind, id: string, internalPort: number, scheme: string, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: BindOptionsSecure | null, };
\ No newline at end of file
+export type BindParams = { kind: HostKind, id: HostId, internalPort: number, scheme: string | null, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: Security | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/CurrentDependencyInfo.ts b/core/startos/bindings/CurrentDependencyInfo.ts
index ad8d3cf36..a253afa38 100644
--- a/core/startos/bindings/CurrentDependencyInfo.ts
+++ b/core/startos/bindings/CurrentDependencyInfo.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DataUrl } from "./DataUrl";
 
-export type CurrentDependencyInfo = { title: string, icon: DataUrl, registry: string, versionSpec: string, } & ({ "kind": "exists" } | { "kind": "running", healthChecks: string[], });
\ No newline at end of file
+export type CurrentDependencyInfo = { title: string, icon: DataUrl, registryUrl: string, versionSpec: string, } & ({ "kind": "exists" } | { "kind": "running", healthChecks: string[], });
\ No newline at end of file
diff --git a/core/startos/bindings/DependencyRequirement.ts b/core/startos/bindings/DependencyRequirement.ts
index f6ff4aa54..40b78b473 100644
--- a/core/startos/bindings/DependencyRequirement.ts
+++ b/core/startos/bindings/DependencyRequirement.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DependencyRequirement = { "kind": "running", id: string, healthChecks: string[], versionSpec: string, registry: string, } | { "kind": "exists", id: string, versionSpec: string, registry: string, };
\ No newline at end of file
+export type DependencyRequirement = { "kind": "running", id: string, healthChecks: string[], versionSpec: string, registryUrl: string, } | { "kind": "exists", id: string, versionSpec: string, registryUrl: string, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExportedHostInfo.ts b/core/startos/bindings/ExportedHostInfo.ts
new file mode 100644
index 000000000..c4d36bd61
--- /dev/null
+++ b/core/startos/bindings/ExportedHostInfo.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ExportedHostnameInfo } from "./ExportedHostnameInfo";
+import type { HostId } from "./HostId";
+import type { HostKind } from "./HostKind";
+
+export type ExportedHostInfo = { id: HostId, kind: HostKind, hostnames: Array<ExportedHostnameInfo>, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExportedHostnameInfo.ts b/core/startos/bindings/ExportedHostnameInfo.ts
new file mode 100644
index 000000000..086fd95b1
--- /dev/null
+++ b/core/startos/bindings/ExportedHostnameInfo.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ExportedIpHostname } from "./ExportedIpHostname";
+import type { ExportedOnionHostname } from "./ExportedOnionHostname";
+
+export type ExportedHostnameInfo = { "kind": "ip", networkInterfaceId: string, public: boolean, hostname: ExportedIpHostname, } | { "kind": "onion", hostname: ExportedOnionHostname, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExportedIpHostname.ts b/core/startos/bindings/ExportedIpHostname.ts
new file mode 100644
index 000000000..7d012fecc
--- /dev/null
+++ b/core/startos/bindings/ExportedIpHostname.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ExportedIpHostname = { "kind": "ipv4", value: string, port: number | null, sslPort: number | null, } | { "kind": "ipv6", value: string, port: number | null, sslPort: number | null, } | { "kind": "local", value: string, port: number | null, sslPort: number | null, } | { "kind": "domain", domain: string, subdomain: string | null, port: number | null, sslPort: number | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/ExportedOnionHostname.ts b/core/startos/bindings/ExportedOnionHostname.ts
new file mode 100644
index 000000000..82fee09e3
--- /dev/null
+++ b/core/startos/bindings/ExportedOnionHostname.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ExportedOnionHostname = { value: string, port: number | null, sslPort: number | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/HealthCheckResult.ts b/core/startos/bindings/HealthCheckResult.ts
index eaba169f1..a539fc805 100644
--- a/core/startos/bindings/HealthCheckResult.ts
+++ b/core/startos/bindings/HealthCheckResult.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HealthCheckResult = { "result": "success" } | { "result": "disabled" } | { "result": "starting" } | { "result": "loading", message: string, } | { "result": "failure", error: string, };
\ No newline at end of file
+export type HealthCheckResult = { name: string, } & ({ "result": "success", message: string, } | { "result": "disabled" } | { "result": "starting" } | { "result": "loading", message: string, } | { "result": "failure", message: string, });
\ No newline at end of file
diff --git a/core/startos/bindings/PackageDataEntry.ts b/core/startos/bindings/PackageDataEntry.ts
index 100e38ba7..7abb7503a 100644
--- a/core/startos/bindings/PackageDataEntry.ts
+++ b/core/startos/bindings/PackageDataEntry.ts
@@ -1,8 +1,12 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId";
+import type { ActionMetadata } from "./ActionMetadata";
 import type { CurrentDependencies } from "./CurrentDependencies";
 import type { DataUrl } from "./DataUrl";
 import type { HostInfo } from "./HostInfo";
 import type { PackageState } from "./PackageState";
+import type { ServiceInterfaceId } from "./ServiceInterfaceId";
+import type { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo";
 import type { Status } from "./Status";
 
-export type PackageDataEntry = { stateInfo: PackageState, status: Status, marketplaceUrl: string | null, developerKey: string, icon: DataUrl, lastBackup: string | null, currentDependencies: CurrentDependencies, hosts: HostInfo, storeExposedDependents: string[], };
\ No newline at end of file
+export type PackageDataEntry = { stateInfo: PackageState, status: Status, marketplaceUrl: string | null, developerKey: string, icon: DataUrl, lastBackup: string | null, currentDependencies: CurrentDependencies, actions: { [key: ActionId]: ActionMetadata }, serviceInterfaces: { [key: ServiceInterfaceId]: ServiceInterfaceWithHostInfo }, hosts: HostInfo, storeExposedDependents: string[], };
\ No newline at end of file
diff --git a/core/startos/bindings/Progress.ts b/core/startos/bindings/Progress.ts
index d522dee5a..acddd8582 100644
--- a/core/startos/bindings/Progress.ts
+++ b/core/startos/bindings/Progress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Progress = boolean | { done: bigint, total: bigint | null, };
\ No newline at end of file
+export type Progress = boolean | { done: number, total: number | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/ConnectionAddresses.ts b/core/startos/bindings/Security.ts
similarity index 56%
rename from core/startos/bindings/ConnectionAddresses.ts
rename to core/startos/bindings/Security.ts
index 503bfb418..390b6a91f 100644
--- a/core/startos/bindings/ConnectionAddresses.ts
+++ b/core/startos/bindings/Security.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ConnectionAddresses = { tor: Array<string>, clearnet: Array<string>, };
\ No newline at end of file
+export type Security = { ssl: boolean, };
\ No newline at end of file
diff --git a/core/startos/bindings/ServerInfo.ts b/core/startos/bindings/ServerInfo.ts
index ee8e55157..97cd77888 100644
--- a/core/startos/bindings/ServerInfo.ts
+++ b/core/startos/bindings/ServerInfo.ts
@@ -1,5 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ConnectionAddresses } from "./ConnectionAddresses";
 import type { Governor } from "./Governor";
 import type { IpInfo } from "./IpInfo";
 import type { ServerStatus } from "./ServerStatus";
@@ -13,4 +12,4 @@ lastWifiRegion: string | null, eosVersionCompat: string, lanAddress: string, oni
 /**
  * for backwards compatibility
  */
-torAddress: string, ipInfo: { [key: string]: IpInfo }, statusInfo: ServerStatus, wifi: WifiInfo, unreadNotificationCount: bigint, connectionAddresses: ConnectionAddresses, passwordHash: string, pubkey: string, caFingerprint: string, ntpSynced: boolean, zram: boolean, governor: Governor | null, };
\ No newline at end of file
+torAddress: string, ipInfo: { [key: string]: IpInfo }, statusInfo: ServerStatus, wifi: WifiInfo, unreadNotificationCount: number, passwordHash: string, pubkey: string, caFingerprint: string, ntpSynced: boolean, zram: boolean, governor: Governor | null, };
\ No newline at end of file
diff --git a/core/startos/bindings/ServiceInterface.ts b/core/startos/bindings/ServiceInterface.ts
new file mode 100644
index 000000000..2d484d749
--- /dev/null
+++ b/core/startos/bindings/ServiceInterface.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddressInfo } from "./AddressInfo";
+import type { ServiceInterfaceId } from "./ServiceInterfaceId";
+import type { ServiceInterfaceType } from "./ServiceInterfaceType";
+
+export type ServiceInterface = { id: ServiceInterfaceId, name: string, description: string, hasPrimary: boolean, disabled: boolean, masked: boolean, addressInfo: AddressInfo, type: ServiceInterfaceType, };
\ No newline at end of file
diff --git a/core/startos/bindings/HealthCheckString.ts b/core/startos/bindings/ServiceInterfaceId.ts
similarity index 54%
rename from core/startos/bindings/HealthCheckString.ts
rename to core/startos/bindings/ServiceInterfaceId.ts
index efe9f42bd..87edd8694 100644
--- a/core/startos/bindings/HealthCheckString.ts
+++ b/core/startos/bindings/ServiceInterfaceId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HealthCheckString = "passing" | "disabled" | "starting" | "warning" | "failure";
\ No newline at end of file
+export type ServiceInterfaceId = string;
\ No newline at end of file
diff --git a/core/startos/bindings/ServiceInterfaceWithHostInfo.ts b/core/startos/bindings/ServiceInterfaceWithHostInfo.ts
new file mode 100644
index 000000000..449c5b29d
--- /dev/null
+++ b/core/startos/bindings/ServiceInterfaceWithHostInfo.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddressInfo } from "./AddressInfo";
+import type { ExportedHostInfo } from "./ExportedHostInfo";
+import type { ServiceInterfaceId } from "./ServiceInterfaceId";
+import type { ServiceInterfaceType } from "./ServiceInterfaceType";
+
+export type ServiceInterfaceWithHostInfo = { hostInfo: ExportedHostInfo, id: ServiceInterfaceId, name: string, description: string, hasPrimary: boolean, disabled: boolean, masked: boolean, addressInfo: AddressInfo, type: ServiceInterfaceType, };
\ No newline at end of file
diff --git a/core/startos/bindings/SetHealth.ts b/core/startos/bindings/SetHealth.ts
index 321b5c97b..cc8193863 100644
--- a/core/startos/bindings/SetHealth.ts
+++ b/core/startos/bindings/SetHealth.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HealthCheckString } from "./HealthCheckString";
+import type { HealthCheckId } from "./HealthCheckId";
 
-export type SetHealth = { name: string, status: HealthCheckString, message: string | null, };
\ No newline at end of file
+export type SetHealth = { id: HealthCheckId, name: string, } & ({ "result": "success", message: string, } | { "result": "disabled" } | { "result": "starting" } | { "result": "loading", message: string, } | { "result": "failure", message: string, });
\ No newline at end of file
diff --git a/core/startos/bindings/UpdateProgress.ts b/core/startos/bindings/UpdateProgress.ts
index ad9750196..ef6473f37 100644
--- a/core/startos/bindings/UpdateProgress.ts
+++ b/core/startos/bindings/UpdateProgress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type UpdateProgress = { size: bigint | null, downloaded: bigint, };
\ No newline at end of file
+export type UpdateProgress = { size: number | null, downloaded: number, };
\ No newline at end of file
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 0c82bf80c..83a35d086 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -3,7 +3,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use chrono::{DateTime, Utc};
 use emver::VersionRange;
 use imbl_value::InternedString;
-use models::{ActionId, DataUrl, HealthCheckId, HostId, PackageId};
+use models::{ActionId, DataUrl, HealthCheckId, HostId, PackageId, ServiceInterfaceId};
 use patch_db::json_ptr::JsonPointer;
 use patch_db::HasModel;
 use reqwest::Url;
@@ -11,6 +11,7 @@ use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
 use crate::net::host::HostInfo;
+use crate::net::service_interface::ServiceInterfaceWithHostInfo;
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::s9pk::manifest::Manifest;
@@ -306,14 +307,14 @@ pub enum AllowedStatuses {
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct ActionMetadata {
-    name: String,
-    description: String,
-    warning: Option<String>,
+    pub name: String,
+    pub description: String,
+    pub warning: Option<String>,
     #[ts(type = "any")]
-    input: Value,
-    disabled: bool,
-    allowedStatuses: AllowedStatuses,
-    group: Option<String>,
+    pub input: Value,
+    pub disabled: bool,
+    pub allowed_statuses: AllowedStatuses,
+    pub group: Option<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
@@ -331,10 +332,11 @@ pub struct PackageDataEntry {
     #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
     pub current_dependencies: CurrentDependencies,
+    pub actions: BTreeMap<ActionId, ActionMetadata>,
+    pub service_interfaces: BTreeMap<ServiceInterfaceId, ServiceInterfaceWithHostInfo>,
     pub hosts: HostInfo,
     #[ts(type = "string[]")]
     pub store_exposed_dependents: Vec<JsonPointer>,
-    pub exposed_actions: BTreeMap<ActionId, ActionMetadata>,
 }
 impl AsRef<PackageDataEntry> for PackageDataEntry {
     fn as_ref(&self) -> &PackageDataEntry {
@@ -375,7 +377,7 @@ pub struct CurrentDependencyInfo {
     pub title: String,
     pub icon: DataUrl<'static>,
     #[ts(type = "string")]
-    pub registry: Url,
+    pub registry_url: Url,
     #[ts(type = "string")]
     pub version_spec: VersionRange,
 }
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index ea8a3ac3d..d1eec5443 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -66,10 +66,6 @@ impl Public {
                     selected: None,
                 },
                 unread_notification_count: 0,
-                connection_addresses: ConnectionAddresses {
-                    tor: Vec::new(),
-                    clearnet: Vec::new(),
-                },
                 password_hash: account.password.clone(),
                 pubkey: ssh_key::PublicKey::from(&account.ssh_key)
                     .to_openssh()
@@ -136,8 +132,8 @@ pub struct ServerInfo {
     #[serde(default)]
     pub status_info: ServerStatus,
     pub wifi: WifiInfo,
+    #[ts(type = "number")]
     pub unread_notification_count: u64,
-    pub connection_addresses: ConnectionAddresses,
     pub password_hash: String,
     pub pubkey: String,
     pub ca_fingerprint: String,
@@ -199,7 +195,9 @@ pub struct ServerStatus {
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct UpdateProgress {
+    #[ts(type = "number | null")]
     pub size: Option<u64>,
+    #[ts(type = "number")]
     pub downloaded: u64,
 }
 
@@ -221,11 +219,3 @@ pub struct ServerSpecs {
     pub disk: String,
     pub memory: String,
 }
-
-#[derive(Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-pub struct ConnectionAddresses {
-    pub tor: Vec<String>,
-    pub clearnet: Vec<String>,
-}
diff --git a/core/startos/src/net/host/binding.rs b/core/startos/src/net/host/binding.rs
index aa689b717..8301821f5 100644
--- a/core/startos/src/net/host/binding.rs
+++ b/core/startos/src/net/host/binding.rs
@@ -16,7 +16,7 @@ pub struct BindInfo {
 impl BindInfo {
     pub fn new(available_ports: &mut AvailablePorts, options: BindOptions) -> Result<Self, Error> {
         let mut assigned_lan_port = None;
-        if options.add_ssl.is_some() || options.secure {
+        if options.add_ssl.is_some() || options.secure.is_some() {
             assigned_lan_port = Some(available_ports.alloc()?);
         }
         Ok(Self {
@@ -33,7 +33,7 @@ impl BindInfo {
             mut assigned_lan_port,
             ..
         } = self;
-        if options.add_ssl.is_some() || options.secure {
+        if options.add_ssl.is_some() || options.secure.is_some() {
             assigned_lan_port = if let Some(port) = assigned_lan_port.take() {
                 Some(port)
             } else {
@@ -51,24 +51,30 @@ impl BindInfo {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, TS)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct Security {
+    pub ssl: bool,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct BindOptions {
-    #[ts(type = "string")]
-    pub scheme: InternedString,
+    #[ts(type = "string | null")]
+    pub scheme: Option<InternedString>,
     pub preferred_external_port: u16,
     pub add_ssl: Option<AddSslOptions>,
-    pub secure: bool,
-    pub ssl: bool,
+    pub secure: Option<Security>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddSslOptions {
-    #[ts(type = "string")]
-    pub scheme: InternedString,
+    #[ts(type = "string | null")]
+    pub scheme: Option<InternedString>,
     pub preferred_external_port: u16,
     // #[serde(default)]
     // pub add_x_forwarded_headers: bool, // TODO
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
index 086840bd8..2d50df15a 100644
--- a/core/startos/src/net/host/mod.rs
+++ b/core/startos/src/net/host/mod.rs
@@ -39,7 +39,7 @@ impl Host {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, TS)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub enum HostKind {
diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs
index f6e5ddee5..aaf019e66 100644
--- a/core/startos/src/net/mod.rs
+++ b/core/startos/src/net/mod.rs
@@ -7,6 +7,7 @@ pub mod host;
 pub mod keys;
 pub mod mdns;
 pub mod net_controller;
+pub mod service_interface;
 pub mod ssl;
 pub mod static_server;
 pub mod tor;
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index c9338cdff..a4c9ea507 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -247,7 +247,7 @@ impl NetService {
                                     None,
                                     external,
                                     (self.ip, *port).into(),
-                                    if bind.options.ssl {
+                                    if bind.options.secure.as_ref().map_or(false, |s| s.ssl) {
                                         Ok(())
                                     } else {
                                         Err(ssl.alpn.clone())
diff --git a/core/startos/src/net/service_interface.rs b/core/startos/src/net/service_interface.rs
new file mode 100644
index 000000000..9a4659cfd
--- /dev/null
+++ b/core/startos/src/net/service_interface.rs
@@ -0,0 +1,115 @@
+use std::net::{Ipv4Addr, Ipv6Addr};
+
+use models::{HostId, ServiceInterfaceId};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::net::host::binding::BindOptions;
+use crate::net::host::HostKind;
+use crate::prelude::*;
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ServiceInterfaceWithHostInfo {
+    #[serde(flatten)]
+    pub service_interface: ServiceInterface,
+    pub host_info: ExportedHostInfo,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ExportedHostInfo {
+    pub id: HostId,
+    pub kind: HostKind,
+    pub hostnames: Vec<ExportedHostnameInfo>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+#[serde(rename_all_fields = "camelCase")]
+#[serde(tag = "kind")]
+pub enum ExportedHostnameInfo {
+    Ip {
+        network_interface_id: String,
+        public: bool,
+        hostname: ExportedIpHostname,
+    },
+    Onion {
+        hostname: ExportedOnionHostname,
+    },
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ExportedOnionHostname {
+    pub value: String,
+    pub port: Option<u16>,
+    pub ssl_port: Option<u16>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+#[serde(rename_all_fields = "camelCase")]
+#[serde(tag = "kind")]
+pub enum ExportedIpHostname {
+    Ipv4 {
+        value: Ipv4Addr,
+        port: Option<u16>,
+        ssl_port: Option<u16>,
+    },
+    Ipv6 {
+        value: Ipv6Addr,
+        port: Option<u16>,
+        ssl_port: Option<u16>,
+    },
+    Local {
+        value: String,
+        port: Option<u16>,
+        ssl_port: Option<u16>,
+    },
+    Domain {
+        domain: String,
+        subdomain: Option<String>,
+        port: Option<u16>,
+        ssl_port: Option<u16>,
+    },
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ServiceInterface {
+    pub id: ServiceInterfaceId,
+    pub name: String,
+    pub description: String,
+    pub has_primary: bool,
+    pub disabled: bool,
+    pub masked: bool,
+    pub address_info: AddressInfo,
+    #[serde(rename = "type")]
+    pub interface_type: ServiceInterfaceType,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub enum ServiceInterfaceType {
+    Ui,
+    P2p,
+    Api,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct AddressInfo {
+    pub username: Option<String>,
+    pub host_id: HostId,
+    pub bind_options: BindOptions,
+    pub suffix: String,
+}
diff --git a/core/startos/src/progress.rs b/core/startos/src/progress.rs
index 0acdca111..eec637575 100644
--- a/core/startos/src/progress.rs
+++ b/core/startos/src/progress.rs
@@ -24,7 +24,12 @@ lazy_static::lazy_static! {
 #[serde(untagged)]
 pub enum Progress {
     Complete(bool),
-    Progress { done: u64, total: Option<u64> },
+    Progress {
+        #[ts(type = "number")]
+        done: u64,
+        #[ts(type = "number | null")]
+        total: Option<u64>,
+    },
 }
 impl Progress {
     pub fn new() -> Self {
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 7bd1c0ab8..4041cbb98 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -11,7 +11,7 @@ use clap::Parser;
 use emver::VersionRange;
 use imbl::OrdMap;
 use imbl_value::{json, InternedString};
-use models::{ActionId, HealthCheckId, ImageId, PackageId, VolumeId};
+use models::{ActionId, HealthCheckId, HostId, ImageId, PackageId, VolumeId};
 use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -25,11 +25,13 @@ use crate::db::model::package::{
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
+use crate::net::host::binding::BindOptions;
+use crate::net::host::HostKind;
 use crate::prelude::*;
 use crate::s9pk::rpc::SKIP_ENV;
 use crate::service::cli::ContainerCliContext;
 use crate::service::ServiceActorSeed;
-use crate::status::health_check::{HealthCheckResult, HealthCheckString};
+use crate::status::health_check::HealthCheckResult;
 use crate::status::MainStatus;
 use crate::util::clap::FromStrParser;
 use crate::util::{new_guid, Invoke};
@@ -185,21 +187,7 @@ struct GetServicePortForwardParams {
     package_id: Option<PackageId>,
     internal_port: u32,
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct BindOptionsSecure {
-    ssl: bool,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct BindOptions {
-    scheme: Option<String>,
-    preferred_external_port: u32,
-    add_ssl: Option<AddSslOptions>,
-    secure: Option<BindOptionsSecure>,
-}
+
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
@@ -379,7 +367,7 @@ async fn export_action(context: EffectContext, data: ExportActionParams) -> Resu
                 .as_package_data_mut()
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
-                .as_exposed_actions_mut();
+                .as_actions_mut();
             let mut value = model.de()?;
             value
                 .insert(data.id, data.metadata)
@@ -402,7 +390,7 @@ async fn remove_action(context: EffectContext, data: RemoveActionParams) -> Resu
                 .as_package_data_mut()
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
-                .as_exposed_actions_mut();
+                .as_actions_mut();
             let mut value = model.de()?;
             value.remove(&data.id).map(|_| ()).unwrap_or_default();
             model.ser(&value)
@@ -447,35 +435,16 @@ async fn get_host_info(
 async fn clear_bindings(context: EffectContext, _: Empty) -> Result<Value, Error> {
     todo!()
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
 
-enum BindKind {
-    Static,
-    Single,
-    Multi,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-
-struct AddSslOptions {
-    scheme: Option<String>,
-    preferred_external_port: u32,
-    add_x_forwarded_headers: Option<bool>,
-}
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct BindParams {
-    kind: BindKind,
-    id: String,
-    internal_port: u32,
-    scheme: String,
-    preferred_external_port: u32,
-    add_ssl: Option<AddSslOptions>,
-    secure: Option<BindOptionsSecure>,
+    kind: HostKind,
+    id: HostId,
+    internal_port: u16,
+    #[serde(flatten)]
+    options: BindOptions,
 }
 async fn bind(_: AnyContext, BindParams { .. }: BindParams) -> Result<Value, Error> {
     todo!()
@@ -918,19 +887,14 @@ async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Resul
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct SetHealth {
-    #[ts(type = "string")]
-    name: HealthCheckId,
-    status: HealthCheckString,
-    message: Option<String>,
+    id: HealthCheckId,
+    #[serde(flatten)]
+    result: HealthCheckResult,
 }
 
 async fn set_health(
     context: EffectContext,
-    SetHealth {
-        name,
-        status,
-        message,
-    }: SetHealth,
+    SetHealth { id, result }: SetHealth,
 ) -> Result<Value, Error> {
     let context = context.deref()?;
 
@@ -939,43 +903,22 @@ async fn set_health(
         .ctx
         .db
         .mutate(move |db| {
-            let mut main = db
-                .as_public()
-                .as_package_data()
-                .as_idx(package_id)
-                .or_not_found(package_id)?
-                .as_status()
-                .as_main()
-                .de()?;
-            match &mut main {
-                &mut MainStatus::Running { ref mut health, .. }
-                | &mut MainStatus::BackingUp { ref mut health, .. } => {
-                    health.remove(&name);
-
-                    health.insert(
-                        name,
-                        match status {
-                            HealthCheckString::Disabled => HealthCheckResult::Disabled,
-                            HealthCheckString::Passing => HealthCheckResult::Success,
-                            HealthCheckString::Starting => HealthCheckResult::Starting,
-                            HealthCheckString::Warning => HealthCheckResult::Loading {
-                                message: message.unwrap_or_default(),
-                            },
-                            HealthCheckString::Failure => HealthCheckResult::Failure {
-                                error: message.unwrap_or_default(),
-                            },
-                        },
-                    );
-                }
-                _ => return Ok(()),
-            };
             db.as_public_mut()
                 .as_package_data_mut()
                 .as_idx_mut(package_id)
                 .or_not_found(package_id)?
                 .as_status_mut()
                 .as_main_mut()
-                .ser(&main)
+                .mutate(|main| {
+                    match main {
+                        &mut MainStatus::Running { ref mut health, .. }
+                        | &mut MainStatus::BackingUp { ref mut health, .. } => {
+                            health.insert(id, result);
+                        }
+                        _ => (),
+                    }
+                    Ok(())
+                })
         })
         .await?;
     Ok(json!(()))
@@ -1100,7 +1043,7 @@ enum DependencyRequirement {
         #[ts(type = "string")]
         version_spec: VersionRange,
         #[ts(type = "string")]
-        registry: Url,
+        registry_url: Url,
     },
     #[serde(rename_all = "camelCase")]
     Exists {
@@ -1109,7 +1052,7 @@ enum DependencyRequirement {
         #[ts(type = "string")]
         version_spec: VersionRange,
         #[ts(type = "string")]
-        registry: Url,
+        registry_url: Url,
     },
 }
 // filebrowser:exists,bitcoind:running:foo+bar+baz
@@ -1119,7 +1062,7 @@ impl FromStr for DependencyRequirement {
         match s.split_once(':') {
             Some((id, "e")) | Some((id, "exists")) => Ok(Self::Exists {
                 id: id.parse()?,
-                registry: "".parse()?,      // TODO
+                registry_url: "".parse()?,  // TODO
                 version_spec: "*".parse()?, // TODO
             }),
             Some((id, rest)) => {
@@ -1143,14 +1086,14 @@ impl FromStr for DependencyRequirement {
                 Ok(Self::Running {
                     id: id.parse()?,
                     health_checks,
-                    registry: "".parse()?,      // TODO
+                    registry_url: "".parse()?,  // TODO
                     version_spec: "*".parse()?, // TODO
                 })
             }
             None => Ok(Self::Running {
                 id: s.parse()?,
                 health_checks: BTreeSet::new(),
-                registry: "".parse()?,      // TODO
+                registry_url: "".parse()?,  // TODO
                 version_spec: "*".parse()?, // TODO
             }),
         }
@@ -1186,13 +1129,13 @@ async fn set_dependencies(
                     .map(|dependency| match dependency {
                         DependencyRequirement::Exists {
                             id,
-                            registry,
+                            registry_url,
                             version_spec,
                         } => (
                             id,
                             CurrentDependencyInfo {
                                 kind: CurrentDependencyKind::Exists,
-                                registry,
+                                registry_url,
                                 version_spec,
                                 icon: todo!(),
                                 title: todo!(),
@@ -1201,13 +1144,13 @@ async fn set_dependencies(
                         DependencyRequirement::Running {
                             id,
                             health_checks,
-                            registry,
+                            registry_url,
                             version_spec,
                         } => (
                             id,
                             CurrentDependencyInfo {
                                 kind: CurrentDependencyKind::Running { health_checks },
-                                registry,
+                                registry_url,
                                 version_spec,
                                 icon: todo!(),
                                 title: todo!(),
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 1eebfced6..934497eb9 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -172,6 +172,8 @@ impl ServiceMap {
                                 icon,
                                 last_backup: None,
                                 current_dependencies: Default::default(),
+                                actions: Default::default(),
+                                service_interfaces: Default::default(),
                                 hosts: Default::default(),
                                 store_exposed_dependents: Default::default(),
                             },
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index c2af46490..8629976a0 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -2,35 +2,35 @@ pub use models::HealthCheckId;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct HealthCheckResult {
+    pub name: String,
+    #[serde(flatten)]
+    pub kind: HealthCheckResultKind,
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "result")]
-pub enum HealthCheckResult {
-    Success,
+pub enum HealthCheckResultKind {
+    Success { message: String },
     Disabled,
     Starting,
     Loading { message: String },
-    Failure { error: String },
+    Failure { message: String },
 }
 impl std::fmt::Display for HealthCheckResult {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            HealthCheckResult::Success => write!(f, "Succeeded"),
-            HealthCheckResult::Disabled => write!(f, "Disabled"),
-            HealthCheckResult::Starting => write!(f, "Starting"),
-            HealthCheckResult::Loading { message } => write!(f, "Loading ({})", message),
-            HealthCheckResult::Failure { error } => write!(f, "Failed ({})", error),
+        let name = &self.name;
+        match &self.kind {
+            HealthCheckResultKind::Success { message } => {
+                write!(f, "{name}: Succeeded ({message})")
+            }
+            HealthCheckResultKind::Disabled => write!(f, "{name}: Disabled"),
+            HealthCheckResultKind::Starting => write!(f, "{name}: Starting"),
+            HealthCheckResultKind::Loading { message } => write!(f, "{name}: Loading ({message})"),
+            HealthCheckResultKind::Failure { message } => write!(f, "{name}: Failed ({message})"),
         }
     }
 }
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, ts_rs::TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-pub enum HealthCheckString {
-    Passing,
-    Disabled,
-    Starting,
-    Warning,
-    Failure,
-}
diff --git a/sdk/lib/Dependency.ts b/sdk/lib/Dependency.ts
index 71cc05890..1e70629da 100644
--- a/sdk/lib/Dependency.ts
+++ b/sdk/lib/Dependency.ts
@@ -6,13 +6,13 @@ export class Dependency {
       | {
           type: "running"
           versionSpec: Checker
-          url: string
+          registryUrl: string
           healthChecks: string[]
         }
       | {
           type: "exists"
           versionSpec: Checker
-          url: string
+          registryUrl: string
         },
   ) {}
 }
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index 250f42075..de54f7dc0 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -1,71 +1,58 @@
 import { object, string } from "ts-matches"
 import { Effects } from "../types"
 import { Origin } from "./Origin"
+import { AddSslOptions } from "../../../core/startos/bindings/AddSslOptions"
+import { Security } from "../../../core/startos/bindings/Security"
+import { BindOptions } from "../../../core/startos/bindings/BindOptions"
+import { AlpnInfo } from "../../../core/startos/bindings/AlpnInfo"
+
+export { AddSslOptions, Security, BindOptions }
 
 const knownProtocols = {
   http: {
-    secure: false,
-    ssl: false,
+    secure: null,
     defaultPort: 80,
     withSsl: "https",
+    alpn: { specified: ["http/1.1"] } as AlpnInfo,
   },
   https: {
-    secure: true,
-    ssl: true,
+    secure: { ssl: true },
     defaultPort: 443,
   },
   ws: {
-    secure: false,
-    ssl: false,
+    secure: null,
     defaultPort: 80,
     withSsl: "wss",
+    alpn: { specified: ["http/1.1"] } as AlpnInfo,
   },
   wss: {
-    secure: true,
-    ssl: true,
+    secure: { ssl: true },
     defaultPort: 443,
   },
   ssh: {
-    secure: true,
-    ssl: false,
+    secure: { ssl: false },
     defaultPort: 22,
   },
   bitcoin: {
-    secure: true,
-    ssl: false,
+    secure: { ssl: false },
     defaultPort: 8333,
   },
   lightning: {
-    secure: true,
-    ssl: true,
+    secure: { ssl: true },
     defaultPort: 9735,
   },
   grpc: {
-    secure: true,
-    ssl: true,
+    secure: { ssl: true },
     defaultPort: 50051,
   },
   dns: {
-    secure: true,
-    ssl: false,
+    secure: { ssl: false },
     defaultPort: 53,
   },
 } as const
 
 export type Scheme = string | null
 
-type AddSslOptions = {
-  scheme: Scheme
-  preferredExternalPort: number
-  addXForwardedHeaders: boolean | null /** default: false */
-}
-type Security = { ssl: boolean }
-export type BindOptions = {
-  scheme: Scheme
-  preferredExternalPort: number
-  addSsl: AddSslOptions | null
-  secure: Security | null
-}
 type KnownProtocols = typeof knownProtocols
 type ProtocolsWithSslVariants = {
   [K in keyof KnownProtocols]: KnownProtocols[K] extends {
@@ -177,9 +164,10 @@ export class Host {
     if ("noAddSsl" in options && options.noAddSsl) return null
     if ("withSsl" in protoInfo && protoInfo.withSsl)
       return {
-        addXForwardedHeaders: null,
+        // addXForwardedHeaders: null,
         preferredExternalPort: knownProtocols[protoInfo.withSsl].defaultPort,
         scheme: protoInfo.withSsl,
+        alpn: protoInfo.alpn,
         ...("addSsl" in options ? options.addSsl : null),
       }
     return null
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index f2e86de74..5fa3f74b3 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -9,7 +9,6 @@ import { ParamsMaybePackageId } from "../../../core/startos/bindings/ParamsMaybe
 import { SetConfigured } from "../../../core/startos/bindings/SetConfigured"
 import { SetHealth } from "../../../core/startos/bindings/SetHealth"
 import { ExposeForDependentsParams } from "../../../core/startos/bindings/ExposeForDependentsParams"
-import { ExposeUiParams } from "../../../core/startos/bindings/ExposeUiParams"
 import { GetSslCertificateParams } from "../../../core/startos/bindings/GetSslCertificateParams"
 import { GetSslKeyParams } from "../../../core/startos/bindings/GetSslKeyParams"
 import { GetServiceInterfaceParams } from "../../../core/startos/bindings/GetServiceInterfaceParams"
@@ -24,7 +23,6 @@ import { ExportActionParams } from "../../../core/startos/bindings/ExportActionP
 import { RemoveActionParams } from "../../../core/startos/bindings/RemoveActionParams"
 import { ReverseProxyParams } from "../../../core/startos/bindings/ReverseProxyParams"
 import { MountParams } from "../../../core/startos/bindings/MountParams"
-import { ExposedUI } from "../../../core/startos/bindings/ExposedUI"
 function typeEquality<ExpectedType>(_a: ExpectedType) {}
 describe("startosTypeValidation ", () => {
   test(`checking the params match`, () => {
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index fa77d2c02..daa7ffe43 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -1,5 +1,6 @@
 export * as configTypes from "./config/configTypes"
-import { AddSslOptions } from "../../core/startos/bindings/AddSslOptions"
+import { HealthCheckId } from "../../core/startos/bindings/HealthCheckId"
+import { HealthCheckResult } from "../../core/startos/bindings/HealthCheckResult"
 import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
 import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
@@ -324,16 +325,13 @@ export type Effects = {
   /** Removes all network bindings */
   clearBindings(): Promise<void>
   /** Creates a host connected to the specified port with the provided options */
-  bind(options: {
-    kind: "static" | "single" | "multi"
-    id: string
-    internalPort: number
-
-    scheme: Scheme
-    preferredExternalPort: number
-    addSsl: AddSslOptions | null
-    secure: { ssl: boolean } | null
-  }): Promise<void>
+  bind(
+    options: {
+      kind: "static" | "single" | "multi"
+      id: string
+      internalPort: number
+    } & BindOptions,
+  ): Promise<void>
   /** Retrieves the current hostname(s) associated with a host id */
   // getHostInfo(options: {
   //   kind: "static" | "single"
@@ -479,11 +477,11 @@ export type Effects = {
     algorithm: "ecdsa" | "ed25519" | null
   }) => Promise<string>
 
-  setHealth(o: {
-    name: string
-    status: HealthStatus
-    message: string | null
-  }): Promise<void>
+  setHealth(
+    o: HealthCheckResult & {
+      id: HealthCheckId
+    },
+  ): Promise<void>
 
   /** Set the dependencies of what the service needs, usually ran during the set config as a best practice */
   setDependencies(options: {
@@ -590,7 +588,7 @@ export type KnownError =
 export type Dependency = {
   id: PackageId
   versionSpec: string
-  url: string
+  registryUrl: string
 } & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] })
 export type Dependencies = Array<Dependency>
 
diff --git a/web/projects/marketplace/src/types.ts b/web/projects/marketplace/src/types.ts
index 7f69c3747..bc7c70f80 100644
--- a/web/projects/marketplace/src/types.ts
+++ b/web/projects/marketplace/src/types.ts
@@ -1,4 +1,5 @@
 import { Url } from '@start9labs/shared'
+import { Manifest } from '../../../../core/startos/bindings/Manifest'
 
 export type StoreURL = string
 export type StoreName = string
@@ -41,35 +42,6 @@ export interface DependencyMetadata {
   hidden: boolean
 }
 
-export interface Manifest {
-  id: string
-  title: string
-  version: string
-  gitHash?: string
-  description: {
-    short: string
-    long: string
-  }
-  replaces?: string[]
-  releaseNotes: string
-  license: string // name of license
-  wrapperRepo: Url
-  upstreamRepo: Url
-  supportSite: Url
-  marketingSite: Url
-  donationUrl: Url | null
-  alerts: {
-    install: string | null
-    uninstall: string | null
-    restore: string | null
-    start: string | null
-    stop: string | null
-  }
-  dependencies: Record<string, Dependency>
-  osVersion: string
-  hasConfig: boolean
-}
-
 export interface Dependency {
   description: string | null
   optional: boolean
diff --git a/web/projects/ui/src/app/app/menu/menu.component.ts b/web/projects/ui/src/app/app/menu/menu.component.ts
index d44781a41..7a7eb5d29 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.ts
+++ b/web/projects/ui/src/app/app/menu/menu.component.ts
@@ -18,7 +18,7 @@ import {
 } from 'rxjs'
 import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
-import { DataModel, PackageState } from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { SplitPaneTracker } from 'src/app/services/split-pane.service'
 import { Emver, THEME } from '@start9labs/shared'
 import { ConnectionService } from 'src/app/services/connection.service'
@@ -77,12 +77,10 @@ export class MenuComponent {
         filter(([prev, curr]) =>
           Object.values(prev).some(
             p =>
-              [
-                PackageState.Installing,
-                PackageState.Updating,
-                PackageState.Restoring,
-              ].includes(p.stateInfo.state) &&
-              [PackageState.Installed, PackageState.Removing].includes(
+              ['installing', 'updating', 'restoring'].includes(
+                p.stateInfo.state,
+              ) &&
+              ['installed', 'removing'].includes(
                 curr[getManifest(p).id].stateInfo.state,
               ),
           ),
diff --git a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
index 861e4c29f..2b6934c39 100644
--- a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
+++ b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
 import { ModalController } from '@ionic/angular'
 import { map, take } from 'rxjs/operators'
-import { DataModel, PackageState } from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import { firstValueFrom } from 'rxjs'
 import { getManifest } from 'src/app/util/get-package-data'
@@ -38,7 +38,7 @@ export class BackupSelectPage {
                 id,
                 title,
                 icon: pkg.icon,
-                disabled: pkg.stateInfo.state !== PackageState.Installed,
+                disabled: pkg.stateInfo.state !== 'installed',
                 checked: false,
               }
             })
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index c836b6206..62038e78b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -11,8 +11,6 @@ import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
   PackageDataEntry,
-  PackageMainStatus,
-  Status,
 } from 'src/app/services/patch-db/data-model'
 import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
 import { isEmptyObject, ErrorToastService, getPkgId } from '@start9labs/shared'
@@ -20,6 +18,7 @@ import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
 import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
+import { Status } from '../../../../../../../../core/startos/bindings/Status'
 
 @Component({
   selector: 'app-actions',
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index c390e122c..5f7227464 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -8,9 +8,8 @@ import { PatchDB } from 'patch-db-client'
 import { QRComponent } from 'src/app/components/qr/qr.component'
 import { map } from 'rxjs'
 import { types as T } from '@start9labs/start-sdk'
-
-type ServiceInterface = T.ServiceInterface
-type ServiceInterfaceWithHostInfo = T.ServiceInterfaceWithHostInfo
+import { ServiceInterface } from '../../../../../../../../core/startos/bindings/ServiceInterface'
+import { ServiceInterfaceWithHostInfo } from '../../../../../../../../core/startos/bindings/ServiceInterfaceWithHostInfo'
 
 type MappedInterface = ServiceInterface & {
   addresses: MappedAddress[]
@@ -109,12 +108,10 @@ function getAddresses(
   const username = addressInfo.username ? addressInfo.username + '@' : ''
   const suffix = addressInfo.suffix || ''
 
-  const hostnames =
-    host.kind === 'multi'
-      ? host.hostnames
-      : host.hostname
+  const hostnames = host.kind === 'multi' ? host.hostnames : [] // TODO: non-multi
+  /* host.hostname
       ? [host.hostname]
-      : []
+      : [] */
 
   const addresses: MappedAddress[] = []
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index 04d05a1d8..b1c62618d 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -1,11 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import {
-  MainStatus,
-  PackageDataEntry,
-  PackageMainStatus,
-} from 'src/app/services/patch-db/data-model'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { PkgInfo } from 'src/app/util/get-package-info'
 import { UiLauncherService } from 'src/app/services/ui-launcher.service'
+import { MainStatus } from '../../../../../../../../../core/startos/bindings/MainStatus'
 
 @Component({
   selector: 'app-list-pkg',
@@ -21,13 +18,13 @@ export class AppListPkgComponent {
   get pkgMainStatus(): MainStatus {
     return (
       this.pkg.entry.status.main || {
-        status: PackageMainStatus.Stopped,
+        status: 'stopped',
       }
     )
   }
 
   get sigtermTimeout(): string | null {
-    return this.pkgMainStatus.status === PackageMainStatus.Stopping
+    return this.pkgMainStatus.status === 'stopping'
       ? this.pkgMainStatus.timeout
       : null
   }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
index e3b4508a7..d9b6bbc3e 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
@@ -11,10 +11,7 @@ import {
 import { PackageProperties } from 'src/app/util/properties.util'
 import { QRComponent } from 'src/app/components/qr/qr.component'
 import { PatchDB } from 'patch-db-client'
-import {
-  DataModel,
-  PackageMainStatus,
-} from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import {
   ErrorToastService,
   getPkgId,
@@ -42,7 +39,7 @@ export class AppPropertiesPage {
 
   stopped$ = this.patch
     .watch$('packageData', this.pkgId, 'status', 'main', 'status')
-    .pipe(map(status => status === PackageMainStatus.Stopped))
+    .pipe(map(status => status === 'stopped'))
 
   @ViewChild(IonBackButtonDelegate, { static: false })
   backButton?: IonBackButtonDelegate
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 0c32c0ba2..52404aea3 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -26,7 +26,7 @@ import {
   isRestoring,
   isUpdating,
 } from 'src/app/util/get-package-data'
-import { Manifest } from '@start9labs/marketplace'
+import { Manifest } from '../../../../../../../../core/startos/bindings/Manifest'
 
 export interface DependencyInfo {
   id: string
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
index 26281bb80..b639b216f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
@@ -3,7 +3,7 @@ import { ModalController, ToastController } from '@ionic/angular'
 import { copyToClipboard, MarkdownComponent } from '@start9labs/shared'
 import { from } from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { Manifest } from '@start9labs/marketplace'
+import { Manifest } from '../../../../../../../../../../core/startos/bindings/Manifest'
 
 @Component({
   selector: 'app-show-additional',
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
index 5ecdf9a0f..ccf46a6e8 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
@@ -1,11 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { ConnectionService } from 'src/app/services/connection.service'
-import {
-  HealthCheckResult,
-  HealthResult,
-  MainStatus,
-} from 'src/app/services/patch-db/data-model'
-import { Manifest } from '@start9labs/marketplace'
+import { HealthCheckResult } from '../../../../../../../../../../core/startos/bindings/HealthCheckResult'
 
 @Component({
   selector: 'app-show-health-checks',
@@ -21,12 +16,12 @@ export class AppShowHealthChecksComponent {
 
   constructor(private readonly connectionService: ConnectionService) {}
 
-  isLoading(result: HealthResult): boolean {
-    return result === HealthResult.Starting || result === HealthResult.Loading
+  isLoading(result: HealthCheckResult['result']): boolean {
+    return result === 'starting' || result === 'loading'
   }
 
-  isReady(result: HealthResult): boolean {
-    return result !== HealthResult.Failure && result !== HealthResult.Loading
+  isReady(result: HealthCheckResult['result']): boolean {
+    return result !== 'failure' && result !== 'loading'
   }
 
   asIsOrder() {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
index ab5c8e416..474b62f62 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { FullProgress } from 'src/app/services/patch-db/data-model'
+import { FullProgress } from '../../../../../../../../../../core/startos/bindings/FullProgress'
 
 @Component({
   selector: 'app-show-progress',
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 2a1c47af7..d67ce2941 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -8,8 +8,6 @@ import {
 import {
   DataModel,
   PackageDataEntry,
-  PackageMainStatus,
-  Status,
 } from 'src/app/services/patch-db/data-model'
 import { ErrorToastService } from '@start9labs/shared'
 import { AlertController, LoadingController } from '@ionic/angular'
@@ -22,8 +20,9 @@ import {
   getManifest,
   getAllPackages,
 } from 'src/app/util/get-package-data'
-import { Manifest } from '@start9labs/marketplace'
 import { PatchDB } from 'patch-db-client'
+import { Status } from '../../../../../../../../../../core/startos/bindings/Status'
+import { Manifest } from '../../../../../../../../../../core/startos/bindings/Manifest'
 
 @Component({
   selector: 'app-show-status',
@@ -84,7 +83,7 @@ export class AppShowStatusComponent {
   }
 
   get sigtermTimeout(): string | null {
-    return this.pkgStatus?.main.status === PackageMainStatus.Stopping
+    return this.pkgStatus?.main.status === 'stopping'
       ? this.pkgStatus.main.timeout
       : null
   }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
index a274aa8c0..a676c28f7 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
@@ -1,20 +1,20 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { HealthResult } from 'src/app/services/patch-db/data-model'
+import { HealthCheckResult } from '../../../../../../../../../core/startos/bindings/HealthCheckResult'
 
 @Pipe({
   name: 'healthColor',
 })
 export class HealthColorPipe implements PipeTransform {
-  transform(val: HealthResult): string {
+  transform(val: HealthCheckResult['result']): string {
     switch (val) {
-      case HealthResult.Success:
+      case 'success':
         return 'success'
-      case HealthResult.Failure:
+      case 'failure':
         return 'warning'
-      case HealthResult.Disabled:
+      case 'disabled':
         return 'dark'
-      case HealthResult.Starting:
-      case HealthResult.Loading:
+      case 'starting':
+      case 'loading':
         return 'primary'
     }
   }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index f26addee9..c51b4cac7 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -11,7 +11,7 @@ import { ModalService } from 'src/app/services/modal.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { from, map, Observable } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
-import { Manifest } from '@start9labs/marketplace'
+import { Manifest } from '../../../../../../../../../core/startos/bindings/Manifest'
 
 export interface Button {
   title: string
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
index 98265152b..63c31263a 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
@@ -1,14 +1,11 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import {
-  DataModel,
-  HealthCheckResult,
-  PackageMainStatus,
-} from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { isEmptyObject } from '@start9labs/shared'
 import { map, startWith } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
 import { Observable } from 'rxjs'
-import { Manifest } from '@start9labs/marketplace'
+import { HealthCheckResult } from '../../../../../../../../../core/startos/bindings/HealthCheckResult'
+import { Manifest } from '../../../../../../../../../core/startos/bindings/Manifest'
 
 @Pipe({
   name: 'toHealthChecks',
@@ -21,8 +18,7 @@ export class ToHealthChecksPipe implements PipeTransform {
   ): Observable<Record<string, HealthCheckResult | null> | null> {
     return this.patch.watch$('packageData', manifest.id, 'status', 'main').pipe(
       map(main => {
-        return main.status === PackageMainStatus.Running &&
-          !isEmptyObject(main.health)
+        return main.status === 'running' && !isEmptyObject(main.health)
           ? main.health
           : null
       }),
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index 10717cc19..a2e94aee0 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -7,7 +7,6 @@ import {
 import { AlertController, LoadingController } from '@ionic/angular'
 import {
   AbstractMarketplaceService,
-  Manifest,
   MarketplacePkg,
 } from '@start9labs/marketplace'
 import {
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
index 7dcf4d793..d70291de9 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
@@ -35,7 +35,7 @@
                 >
                   <!-- active -->
                   <ion-note
-                    *ngIf="pkgStatus === 'backing-up'; else queued"
+                    *ngIf="pkgStatus === 'backingUp'; else queued"
                     class="inline"
                     slot="end"
                   >
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
index 31d3bce1e..4a5d8951d 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
@@ -6,11 +6,9 @@ import {
 } from '@angular/core'
 import { PatchDB } from 'patch-db-client'
 import { take } from 'rxjs/operators'
-import {
-  DataModel,
-  PackageMainStatus,
-} from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { Observable } from 'rxjs'
+import { MainStatus } from '../../../../../../../../../core/startos/bindings/MainStatus'
 
 @Component({
   selector: 'backing-up',
@@ -32,7 +30,7 @@ export class BackingUpComponent {
   name: 'pkgMainStatus',
 })
 export class PkgMainStatusPipe implements PipeTransform {
-  transform(pkgId: string): Observable<PackageMainStatus> {
+  transform(pkgId: string): Observable<MainStatus['status']> {
     return this.patch.watch$('packageData', pkgId, 'status', 'main', 'status')
   }
 
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index b834d084c..242b94172 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -4,7 +4,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
 import cbor from 'cbor'
 import { ErrorToastService } from '@start9labs/shared'
-import { Manifest } from '@start9labs/marketplace'
+import { Manifest } from '../../../../../../../../core/startos/bindings/Manifest'
 
 interface Positions {
   [key: string]: [bigint, bigint] // [position, length]
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.ts b/web/projects/ui/src/app/pages/updates/updates.page.ts
index 11d627cb5..a77dcb34f 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.page.ts
@@ -10,7 +10,6 @@ import { MarketplaceService } from 'src/app/services/marketplace.service'
 import {
   AbstractMarketplaceService,
   Marketplace,
-  Manifest,
   MarketplacePkg,
   StoreIdentity,
 } from '@start9labs/marketplace'
@@ -25,6 +24,7 @@ import {
   isUpdating,
 } from 'src/app/util/get-package-data'
 import { dryUpdate } from 'src/app/util/dry-update'
+import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
 
 interface UpdatesData {
   hosts: StoreIdentity[]
diff --git a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
index 93e826bf7..7d6a646d0 100644
--- a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
+++ b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { Progress } from 'src/app/services/patch-db/data-model'
+import { Progress } from '../../../../../../../core/startos/bindings/Progress'
 
 @Pipe({
   name: 'installingProgressString',
diff --git a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
index 668328820..d99e69c87 100644
--- a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
+++ b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
@@ -1,9 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import {
-  PackageMainStatus,
-  PackageState,
-} from 'src/app/services/patch-db/data-model'
 import { ConfigService } from '../../services/config.service'
+import { PackageState } from '../../../../../../../core/startos/bindings/PackageState'
+import { MainStatus } from '../../../../../../../core/startos/bindings/MainStatus'
 
 @Pipe({
   name: 'isLaunchable',
@@ -11,7 +9,10 @@ import { ConfigService } from '../../services/config.service'
 export class LaunchablePipe implements PipeTransform {
   constructor(private configService: ConfigService) {}
 
-  transform(state: PackageState, status: PackageMainStatus): boolean {
+  transform(
+    state: PackageState['state'],
+    status: MainStatus['status'],
+  ): boolean {
     return this.configService.isLaunchable(state, status)
   }
 }
diff --git a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
index a6bbb52be..49ad380ad 100644
--- a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
+++ b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core'
 import { PackageDataEntry } from '../../services/patch-db/data-model'
 import { hasUi } from '../../services/config.service'
 import { getManifest } from 'src/app/util/get-package-data'
-import { Manifest } from '@start9labs/marketplace'
+import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
 
 @Pipe({
   name: 'hasUi',
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 77c0a684c..4ceaff1f9 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1,21 +1,16 @@
 import {
   InstalledState,
   PackageDataEntry,
-  PackageMainStatus,
-  PackageState,
-  ServerStatusInfo,
 } from 'src/app/services/patch-db/data-model'
 import { Metric, NotificationLevel, RR, ServerNotifications } from './api.types'
 import { BTC_ICON, LND_ICON, PROXY_ICON } from './api-icons'
-import {
-  DependencyMetadata,
-  Manifest,
-  MarketplacePkg,
-} from '@start9labs/marketplace'
+import { DependencyMetadata, MarketplacePkg } from '@start9labs/marketplace'
 import { Log } from '@start9labs/shared'
+import { ServerStatus } from '../../../../../../../core/startos/bindings/ServerStatus'
+import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
 
 export module Mock {
-  export const ServerUpdated: ServerStatusInfo = {
+  export const ServerUpdated: ServerStatus = {
     backupProgress: null,
     updateProgress: null,
     updated: true,
@@ -75,16 +70,26 @@ export module Mock {
     osVersion: '0.2.12',
     dependencies: {},
     hasConfig: true,
+    images: ['main'],
+    assets: [],
+    volumes: ['main'],
+    hardwareRequirements: {
+      device: {},
+      arch: null,
+      ram: null,
+    },
   }
 
   export const MockManifestLnd: Manifest = {
     id: 'lnd',
     title: 'Lightning Network Daemon',
     version: '0.11.1',
+    gitHash: 'abcdefgh',
     description: {
       short: 'A bolt spec compliant client.',
       long: 'More info about LND. More info about LND. More info about LND.',
     },
+    replaces: ['banks', 'governments'],
     releaseNotes: 'Dual funded channels!',
     license: 'MIT',
     wrapperRepo: 'https://github.com/start9labs/lnd-wrapper',
@@ -113,6 +118,14 @@ export module Mock {
       },
     },
     hasConfig: true,
+    images: ['main'],
+    assets: [],
+    volumes: ['main'],
+    hardwareRequirements: {
+      device: {},
+      arch: null,
+      ram: null,
+    },
   }
 
   export const MockManifestBitcoinProxy: Manifest = {
@@ -145,7 +158,16 @@ export module Mock {
         optional: false,
       },
     },
+    replaces: [],
     hasConfig: false,
+    images: ['main'],
+    assets: [],
+    volumes: ['main'],
+    hardwareRequirements: {
+      device: {},
+      arch: null,
+      ram: null,
+    },
   }
 
   export const BitcoinDep: DependencyMetadata = {
@@ -1376,7 +1398,7 @@ export module Mock {
 
   export const bitcoind: PackageDataEntry<InstalledState> = {
     stateInfo: {
-      state: PackageState.Installed,
+      state: 'installed',
       manifest: MockManifestBitcoind,
     },
     icon: '/assets/img/service-icons/bitcoind.svg',
@@ -1384,7 +1406,7 @@ export module Mock {
     status: {
       configured: true,
       main: {
-        status: PackageMainStatus.Running,
+        status: 'running',
         started: new Date().toISOString(),
         health: {},
       },
@@ -1408,9 +1430,10 @@ export module Mock {
             scheme: 'http',
             preferredExternalPort: 80,
             addSsl: {
-              addXForwardedHeaders: false,
+              // addXForwardedHeaders: false,
               preferredExternalPort: 443,
               scheme: 'https',
+              alpn: { specified: ['http/1.1', 'h2'] },
             },
             secure: null,
           },
@@ -1480,9 +1503,10 @@ export module Mock {
             scheme: 'http',
             preferredExternalPort: 80,
             addSsl: {
-              addXForwardedHeaders: false,
+              // addXForwardedHeaders: false,
               preferredExternalPort: 443,
               scheme: 'https',
+              alpn: { specified: ['http/1.1'] },
             },
             secure: null,
           },
@@ -1608,13 +1632,15 @@ export module Mock {
       },
     },
     currentDependencies: {},
+    hosts: {},
+    storeExposedDependents: [],
     marketplaceUrl: 'https://registry.start9.com/',
     developerKey: 'developer-key',
   }
 
   export const bitcoinProxy: PackageDataEntry<InstalledState> = {
     stateInfo: {
-      state: PackageState.Installed,
+      state: 'installed',
       manifest: MockManifestBitcoinProxy,
     },
     icon: '/assets/img/service-icons/btc-rpc-proxy.png',
@@ -1622,7 +1648,7 @@ export module Mock {
     status: {
       configured: false,
       main: {
-        status: PackageMainStatus.Stopped,
+        status: 'stopped',
       },
       dependencyConfigErrors: {},
     },
@@ -1643,9 +1669,10 @@ export module Mock {
             scheme: 'http',
             preferredExternalPort: 80,
             addSsl: {
-              addXForwardedHeaders: false,
+              // addXForwardedHeaders: false,
               preferredExternalPort: 443,
               scheme: 'https',
+              alpn: { specified: ['http/1.1', 'h2'] },
             },
             secure: {
               ssl: true,
@@ -1745,13 +1772,15 @@ export module Mock {
         healthChecks: [],
       },
     },
+    hosts: {},
+    storeExposedDependents: [],
     marketplaceUrl: 'https://registry.start9.com/',
     developerKey: 'developer-key',
   }
 
   export const lnd: PackageDataEntry<InstalledState> = {
     stateInfo: {
-      state: PackageState.Installed,
+      state: 'installed',
       manifest: MockManifestLnd,
     },
     icon: '/assets/img/service-icons/lnd.png',
@@ -1759,7 +1788,7 @@ export module Mock {
     status: {
       configured: true,
       main: {
-        status: PackageMainStatus.Stopped,
+        status: 'stopped',
       },
       dependencyConfigErrors: {
         'btc-rpc-proxy': 'Username not found',
@@ -1993,9 +2022,10 @@ export module Mock {
         kind: 'exists',
         registryUrl: 'https://community-registry.start9.com',
         versionSpec: '>2.0.0', // @TODO
-        healthChecks: [],
       },
     },
+    hosts: {},
+    storeExposedDependents: [],
     marketplaceUrl: 'https://registry.start9.com/',
     developerKey: 'developer-key',
   }
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 0bab23a5a..43edea08e 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -1,12 +1,11 @@
 import { Dump, Revision } from 'patch-db-client'
-import { Manifest, MarketplacePkg, StoreInfo } from '@start9labs/marketplace'
+import { MarketplacePkg, StoreInfo } from '@start9labs/marketplace'
 import { PackagePropertiesVersioned } from 'src/app/util/properties.util'
 import { ConfigSpec } from 'src/app/pkg-config/config-types'
-import {
-  DataModel,
-  HealthCheckResult,
-} from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
+import { HealthCheckResult } from '../../../../../../../core/startos/bindings/HealthCheckResult'
+import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
 
 export module RR {
   // DB
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 5f9b1b3bc..5cbc841ef 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -10,12 +10,8 @@ import {
 } from 'patch-db-client'
 import {
   DataModel,
-  FullProgress,
   InstallingState,
   PackageDataEntry,
-  PackageMainStatus,
-  PackageState,
-  ServerStatus,
   StateInfo,
   UpdatingState,
 } from 'src/app/services/patch-db/data-model'
@@ -41,6 +37,8 @@ import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 import { AuthService } from '../auth.service'
 import { ConnectionService } from '../connection.service'
 import { StoreInfo } from '@start9labs/marketplace'
+import { FullProgress } from '../../../../../../../core/startos/bindings/FullProgress'
+import { ServerStatus } from '../../../../../../../core/startos/bindings/ServerStatus'
 
 const PROGRESS: FullProgress = {
   overall: {
@@ -576,7 +574,7 @@ export class MockApiService extends ApiService {
           {
             op: PatchOp.REPLACE,
             path: appPath,
-            value: PackageMainStatus.BackingUp,
+            value: 'backingUp',
           },
         ]
         this.mockRevision(appPatch)
@@ -586,7 +584,7 @@ export class MockApiService extends ApiService {
         this.mockRevision([
           {
             ...appPatch[0],
-            value: PackageMainStatus.Stopped,
+            value: 'stopped',
           },
         ])
         this.mockRevision([
@@ -692,7 +690,7 @@ export class MockApiService extends ApiService {
             // state: PackageState.Installing,
 
             // if updating
-            state: PackageState.Updating,
+            state: 'updating',
             manifest: mockPatchData.packageData[params.id].stateInfo.manifest!,
 
             // both
@@ -757,7 +755,7 @@ export class MockApiService extends ApiService {
         value: {
           ...Mock.LocalPkgs[id],
           stateInfo: {
-            state: PackageState.Restoring,
+            state: 'restoring',
             installingInfo: {
               newManifest: Mock.LocalPkgs[id].stateInfo.manifest!,
               progress: PROGRESS,
@@ -789,7 +787,7 @@ export class MockApiService extends ApiService {
         {
           op: PatchOp.REPLACE,
           path: path + '/status',
-          value: PackageMainStatus.Running,
+          value: 'running',
         },
         {
           op: PatchOp.REPLACE,
@@ -849,7 +847,7 @@ export class MockApiService extends ApiService {
       {
         op: PatchOp.REPLACE,
         path: path + '/status',
-        value: PackageMainStatus.Starting,
+        value: 'starting',
       },
     ]
 
@@ -870,7 +868,7 @@ export class MockApiService extends ApiService {
         {
           op: PatchOp.REPLACE,
           path: path + '/status',
-          value: PackageMainStatus.Starting,
+          value: 'starting',
         },
         {
           op: PatchOp.ADD,
@@ -886,7 +884,7 @@ export class MockApiService extends ApiService {
         {
           op: PatchOp.REPLACE,
           path: path + '/status',
-          value: PackageMainStatus.Running,
+          value: 'running',
         },
         {
           op: PatchOp.REMOVE,
@@ -923,7 +921,7 @@ export class MockApiService extends ApiService {
       {
         op: PatchOp.REPLACE,
         path: path + '/status',
-        value: PackageMainStatus.Restarting,
+        value: 'restarting',
       },
       {
         op: PatchOp.REPLACE,
@@ -947,7 +945,7 @@ export class MockApiService extends ApiService {
           op: PatchOp.REPLACE,
           path: path,
           value: {
-            status: PackageMainStatus.Stopped,
+            status: 'stopped',
           },
         },
       ]
@@ -959,7 +957,7 @@ export class MockApiService extends ApiService {
         op: PatchOp.REPLACE,
         path: path,
         value: {
-          status: PackageMainStatus.Stopping,
+          status: 'stopping',
           timeout: '35s',
         },
       },
@@ -989,7 +987,7 @@ export class MockApiService extends ApiService {
       {
         op: PatchOp.REPLACE,
         path: `/packageData/${params.id}/stateInfo/state`,
-        value: PackageState.Removing,
+        value: 'removing',
       },
     ]
 
@@ -1105,7 +1103,7 @@ export class MockApiService extends ApiService {
         op: PatchOp.REPLACE,
         path: `/packageData/${id}/stateInfo`,
         value: {
-          state: PackageState.Installed,
+          state: 'installed',
           manifest: Mock.LocalPkgs[id].stateInfo.manifest,
         },
       },
@@ -1149,11 +1147,11 @@ export class MockApiService extends ApiService {
     this.mockRevision(patch2)
 
     setTimeout(async () => {
-      const patch3: Operation<ServerStatus>[] = [
+      const patch3: Operation<boolean>[] = [
         {
           op: PatchOp.REPLACE,
-          path: '/serverInfo/status',
-          value: ServerStatus.Updated,
+          path: '/serverInfo/statusInfo/updated',
+          value: true,
         },
         {
           op: PatchOp.REMOVE,
@@ -1167,7 +1165,7 @@ export class MockApiService extends ApiService {
         {
           op: PatchOp.REPLACE,
           path: '/serverInfo/status',
-          value: ServerStatus.Running,
+          value: 'running',
         },
       ]
       this.mockRevision(patch4)
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 00b57d2cc..3a8365b67 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -1,9 +1,4 @@
-import {
-  DataModel,
-  HealthResult,
-  PackageMainStatus,
-  PackageState,
-} from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { Mock } from './api.fixures'
 import { BUILT_IN_WIDGETS } from '../../pages/widgets/built-in/widgets'
 
@@ -39,6 +34,8 @@ export const mockPatchData: DataModel = {
     ackInstructions: {},
   },
   serverInfo: {
+    arch: 'x86_64',
+    onionAddress: 'myveryownspecialtoraddress',
     id: 'abcdefgh',
     version: '0.3.5.1',
     lastBackup: new Date(new Date().valueOf() - 604800001).toISOString(),
@@ -47,11 +44,15 @@ export const mockPatchData: DataModel = {
     ipInfo: {
       eth0: {
         ipv4: '10.0.0.1',
+        ipv4Range: '10.0.0.1/24',
         ipv6: null,
+        ipv6Range: null,
       },
       wlan0: {
         ipv4: '10.0.90.12',
+        ipv4Range: '10.0.90.12/24',
         ipv6: 'FE80:CD00:0000:0CDE:1257:0000:211E:729CD',
+        ipv6Range: 'FE80:CD00:0000:0CDE:1257:0000:211E:729CD/64',
       },
     },
     lastWifiRegion: null,
@@ -72,11 +73,18 @@ export const mockPatchData: DataModel = {
     caFingerprint: 'SHA-256: 63 2B 11 99 44 40 17 DF 37 FC C3 DF 0F 3D 15',
     ntpSynced: false,
     platform: 'x86_64-nonfree',
+    zram: true,
+    governor: 'performance',
+    wifi: {
+      ssids: [],
+      selected: null,
+      connected: null,
+    },
   },
   packageData: {
     bitcoind: {
       stateInfo: {
-        state: PackageState.Installed,
+        state: 'installed',
         manifest: {
           ...Mock.MockManifestBitcoind,
           version: '0.20.0',
@@ -87,31 +95,31 @@ export const mockPatchData: DataModel = {
       status: {
         configured: true,
         main: {
-          status: PackageMainStatus.Running,
+          status: 'running',
           started: '2021-06-14T20:49:17.774Z',
           health: {
             'ephemeral-health-check': {
               name: 'Ephemeral Health Check',
-              result: HealthResult.Starting,
+              result: 'starting',
             },
             'chain-state': {
               name: 'Chain State',
-              result: HealthResult.Loading,
+              result: 'loading',
               message: 'Bitcoin is syncing from genesis',
             },
             'p2p-interface': {
               name: 'P2P',
-              result: HealthResult.Success,
+              result: 'success',
               message: 'Health check successful',
             },
             'rpc-interface': {
               name: 'RPC',
-              result: HealthResult.Failure,
+              result: 'failure',
               message: 'RPC interface unreachable.',
             },
             'unnecessary-health-check': {
               name: 'Unnecessary Health Check',
-              result: HealthResult.Disabled,
+              result: 'disabled',
             },
           },
         },
@@ -135,9 +143,10 @@ export const mockPatchData: DataModel = {
               scheme: 'http',
               preferredExternalPort: 80,
               addSsl: {
-                addXForwardedHeaders: false,
+                // addXForwardedHeaders: false,
                 preferredExternalPort: 443,
                 scheme: 'https',
+                alpn: { specified: ['http/1.1', 'h2'] },
               },
               secure: null,
             },
@@ -207,9 +216,10 @@ export const mockPatchData: DataModel = {
               scheme: 'http',
               preferredExternalPort: 80,
               addSsl: {
-                addXForwardedHeaders: false,
+                // addXForwardedHeaders: false,
                 preferredExternalPort: 443,
                 scheme: 'https',
+                alpn: { specified: ['http/1.1'] },
               },
               secure: null,
             },
@@ -335,12 +345,14 @@ export const mockPatchData: DataModel = {
         },
       },
       currentDependencies: {},
+      hosts: {},
+      storeExposedDependents: [],
       marketplaceUrl: 'https://registry.start9.com/',
       developerKey: 'developer-key',
     },
     lnd: {
       stateInfo: {
-        state: PackageState.Installed,
+        state: 'installed',
         manifest: {
           ...Mock.MockManifestLnd,
           version: '0.11.0',
@@ -351,7 +363,7 @@ export const mockPatchData: DataModel = {
       status: {
         configured: true,
         main: {
-          status: PackageMainStatus.Stopped,
+          status: 'stopped',
         },
         dependencyConfigErrors: {
           'btc-rpc-proxy': 'This is a config unsatisfied error',
@@ -586,6 +598,8 @@ export const mockPatchData: DataModel = {
           healthChecks: [],
         },
       },
+      hosts: {},
+      storeExposedDependents: [],
       marketplaceUrl: 'https://registry.start9.com/',
       developerKey: 'developer-key',
     },
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index 2bae31e63..eb53dd385 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -2,14 +2,12 @@ import { DOCUMENT } from '@angular/common'
 import { Inject, Injectable } from '@angular/core'
 import { WorkspaceConfig } from '@start9labs/shared'
 import { types } from '@start9labs/start-sdk'
-import {
-  PackageDataEntry,
-  PackageMainStatus,
-  PackageState,
-} from 'src/app/services/patch-db/data-model'
-
-type HostnameInfoIp = types.HostnameInfoIp
-type HostnameInfoOnion = types.HostnameInfoOnion
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
+import { PackageState } from '../../../../../../core/startos/bindings/PackageState'
+import { MainStatus } from '../../../../../../core/startos/bindings/MainStatus'
+import { ExportedOnionHostname } from '../../../../../../core/startos/bindings/ExportedOnionHostname'
+import { ExportedIpHostname } from '../../../../../../core/startos/bindings/ExportedIpHostname'
+import { ExportedHostnameInfo } from '../../../../../../core/startos/bindings/ExportedHostnameInfo'
 
 const {
   gitHash,
@@ -56,10 +54,11 @@ export class ConfigService {
     return window.isSecureContext || this.isTor()
   }
 
-  isLaunchable(state: PackageState, status: PackageMainStatus): boolean {
-    return (
-      state === PackageState.Installed && status === PackageMainStatus.Running
-    )
+  isLaunchable(
+    state: PackageState['state'],
+    status: MainStatus['status'],
+  ): boolean {
+    return state === 'installed' && status === 'running'
   }
 
   /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
@@ -76,31 +75,28 @@ export class ConfigService {
     const url = new URL(`${scheme}://${username}placeholder${suffix}`)
 
     if (host.kind === 'multi') {
-      const onionHostname = host.hostnames.find(
-        (h: any) => h.kind === 'onion',
-      ) as HostnameInfoOnion
+      const onionHostname = host.hostnames.find(h => h.kind === 'onion')
+        ?.hostname as ExportedOnionHostname
 
       if (this.isTor() && onionHostname) {
-        url.hostname = onionHostname.hostname.value
+        url.hostname = onionHostname.value
       } else {
-        const ipHostname = host.hostnames.find(
-          (h: any) => h.kind === 'ip',
-        ) as HostnameInfoIp
+        const ipHostname = host.hostnames.find(h => h.kind === 'ip')
+          ?.hostname as ExportedIpHostname
 
         if (!ipHostname) return ''
 
         url.hostname = this.hostname
-        url.port = String(
-          ipHostname.hostname.sslPort || ipHostname.hostname.port,
-        )
+        url.port = String(ipHostname.sslPort || ipHostname.port)
       }
     } else {
-      const hostname = host.hostname
+      throw new Error('unimplemented')
+      const hostname = {} as ExportedHostnameInfo // host.hostname
 
       if (!hostname) return ''
 
       if (this.isTor() && hostname.kind === 'onion') {
-        url.hostname = hostname.hostname.value
+        url.hostname = (hostname.hostname as ExportedOnionHostname).value
       } else {
         url.hostname = this.hostname
         url.port = String(hostname.hostname.sslPort || hostname.hostname.port)
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index 1991f7bec..fe145055b 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -4,11 +4,8 @@ import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
-  HealthResult,
   InstalledState,
   PackageDataEntry,
-  PackageMainStatus,
-  PackageState,
 } from './patch-db/data-model'
 import * as deepEqual from 'fast-deep-equal'
 import { isInstalled } from '../util/get-package-data'
@@ -79,7 +76,7 @@ export class DepErrorService {
     const dep = pkgs[depId]
 
     // not installed
-    if (!dep || dep.stateInfo.state !== PackageState.Installed) {
+    if (!dep || dep.stateInfo.state !== 'installed') {
       return {
         type: DependencyErrorType.NotInstalled,
       }
@@ -107,19 +104,18 @@ export class DepErrorService {
     const depStatus = dep.status.main.status
 
     // not running
-    if (
-      depStatus !== PackageMainStatus.Running &&
-      depStatus !== PackageMainStatus.Starting
-    ) {
+    if (depStatus !== 'running' && depStatus !== 'starting') {
       return {
         type: DependencyErrorType.NotRunning,
       }
     }
 
+    const currentDep = pkg.currentDependencies[depId]
+
     // health check failure
-    if (depStatus === PackageMainStatus.Running) {
-      for (let id of pkg.currentDependencies[depId].healthChecks) {
-        if (dep.status.main.health[id]?.result !== HealthResult.Success) {
+    if (depStatus === 'running' && currentDep.kind === 'running') {
+      for (let id of currentDep.healthChecks) {
+        if (dep.status.main.health[id]?.result !== 'success') {
           return {
             type: DependencyErrorType.HealthChecksFailed,
           }
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index ac9d4a8f4..30055df56 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -19,7 +19,11 @@ import {
 } from 'rxjs'
 import { RR } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { DataModel, UIStore } from 'src/app/services/patch-db/data-model'
+import {
+  DataModel,
+  UIMarketplaceData,
+  UIStore,
+} from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import {
   catchError,
@@ -41,7 +45,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
   private readonly knownHosts$: Observable<StoreIdentity[]> = this.patch
     .watch$('ui', 'marketplace', 'knownHosts')
     .pipe(
-      map(hosts => {
+      map((hosts: UIMarketplaceData['knownHosts']) => {
         const { start9, community } = this.config.marketplace
         let arr = [
           toStoreIdentity(start9, hosts[start9]),
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index 29761e300..b2446892e 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -1,13 +1,15 @@
 import { Url } from '@start9labs/shared'
-import { Manifest } from '@start9labs/marketplace'
 import { types } from '@start9labs/start-sdk'
 import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
+import { Public } from '../../../../../../../core/startos/bindings/Public'
+import { PackageDataEntry as PDE } from '../../../../../../../core/startos/bindings/PackageDataEntry'
+import { FullProgress } from '../../../../../../../core/startos/bindings/FullProgress'
+import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
 type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo
 
-export interface DataModel {
-  serverInfo: ServerInfo
-  packageData: { [id: string]: PackageDataEntry }
+export type DataModel = Public & {
   ui: UIData
+  packageData: Record<string, PackageDataEntry>
 }
 
 export interface UIData {
@@ -50,197 +52,31 @@ export interface UIStore {
   name?: string
 }
 
-export interface ServerInfo {
-  id: string
-  version: string
-  lastBackup: string | null
-  lanAddress: Url
-  torAddress: Url
-  ipInfo: IpInfo
-  lastWifiRegion: string | null
-  unreadNotificationCount: number
-  statusInfo: ServerStatusInfo
-  eosVersionCompat: string
-  passwordHash: string
-  hostname: string
-  pubkey: string
-  caFingerprint: string
-  ntpSynced: boolean
-  platform: string
-}
-
-export interface IpInfo {
-  [iface: string]: {
-    ipv4: string | null
-    ipv6: string | null
-  }
-}
-
-export interface ServerStatusInfo {
-  backupProgress: null | {
-    [packageId: string]: {
-      complete: boolean
-    }
-  }
-  updated: boolean
-  updateProgress: { size: number | null; downloaded: number } | null
-  restarting: boolean
-  shuttingDown: boolean
-}
-
-export enum ServerStatus {
-  Running = 'running',
-  Updated = 'updated',
-  BackingUp = 'backing-up',
-}
-
-export type PackageDataEntry<T extends StateInfo = StateInfo> = {
+export type PackageDataEntry<T extends StateInfo = StateInfo> = PDE & {
   stateInfo: T
-  icon: Url
-  status: Status
-  actions: Record<string, ActionMetadata>
-  lastBackup: string | null
-  currentDependencies: Record<string, CurrentDependencyInfo>
-  serviceInterfaces: Record<string, ServiceInterfaceWithHostInfo>
-  marketplaceUrl: string | null
-  developerKey: string
 }
 
 export type StateInfo = InstalledState | InstallingState | UpdatingState
 
 export type InstalledState = {
-  state: PackageState.Installed | PackageState.Removing
+  state: 'installed' | 'removing'
   manifest: Manifest
   installingInfo?: undefined
 }
 
 export type InstallingState = {
-  state: PackageState.Installing | PackageState.Restoring
+  state: 'installing' | 'restoring'
   installingInfo: InstallingInfo
   manifest?: undefined
 }
 
 export type UpdatingState = {
-  state: PackageState.Updating
+  state: 'updating'
   installingInfo: InstallingInfo
   manifest: Manifest
 }
 
-export enum PackageState {
-  Installing = 'installing',
-  Installed = 'installed',
-  Updating = 'updating',
-  Removing = 'removing',
-  Restoring = 'restoring',
-}
-
-export interface CurrentDependencyInfo {
-  title: string
-  icon: string
-  kind: 'exists' | 'running'
-  registryUrl: string
-  versionSpec: string
-  healthChecks: string[] // array of health check IDs
-}
-
-export interface Status {
-  configured: boolean
-  main: MainStatus
-  dependencyConfigErrors: { [id: string]: string | null }
-}
-
-export type MainStatus =
-  | MainStatusStopped
-  | MainStatusStopping
-  | MainStatusStarting
-  | MainStatusRunning
-  | MainStatusBackingUp
-  | MainStatusRestarting
-
-export interface MainStatusStopped {
-  status: PackageMainStatus.Stopped
-}
-
-export interface MainStatusStopping {
-  status: PackageMainStatus.Stopping
-  timeout: string
-}
-
-export interface MainStatusStarting {
-  status: PackageMainStatus.Starting
-  restarting: boolean
-}
-
-export interface MainStatusRunning {
-  status: PackageMainStatus.Running
-  started: string // UTC date string
-  health: Record<string, HealthCheckResult>
-}
-
-export interface MainStatusBackingUp {
-  status: PackageMainStatus.BackingUp
-  started: string | null // UTC date string
-}
-
-export interface MainStatusRestarting {
-  status: PackageMainStatus.Restarting
-}
-
-export enum PackageMainStatus {
-  Starting = 'starting',
-  Running = 'running',
-  Stopping = 'stopping',
-  Stopped = 'stopped',
-  BackingUp = 'backing-up',
-  Restarting = 'restarting',
-}
-
-export type HealthCheckResult = { name: string } & (
-  | HealthCheckResultStarting
-  | HealthCheckResultLoading
-  | HealthCheckResultDisabled
-  | HealthCheckResultSuccess
-  | HealthCheckResultFailure
-)
-
-export enum HealthResult {
-  Starting = 'starting',
-  Loading = 'loading',
-  Disabled = 'disabled',
-  Success = 'success',
-  Failure = 'failure',
-}
-
-export interface HealthCheckResultStarting {
-  result: HealthResult.Starting
-}
-
-export interface HealthCheckResultDisabled {
-  result: HealthResult.Disabled
-}
-
-export interface HealthCheckResultSuccess {
-  result: HealthResult.Success
-  message: string
-}
-
-export interface HealthCheckResultLoading {
-  result: HealthResult.Loading
-  message: string
-}
-
-export interface HealthCheckResultFailure {
-  result: HealthResult.Failure
-  message: string
-}
-
 export type InstallingInfo = {
   progress: FullProgress
   newManifest: Manifest
 }
-
-export type FullProgress = {
-  overall: Progress
-  phases: { name: string; progress: Progress }[]
-}
-export type Progress = boolean | { done: number; total: number | null } // false means indeterminate. true means complete
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index 7e1f52b49..d95a5ccdc 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -1,12 +1,7 @@
 import { isEmptyObject } from '@start9labs/shared'
-import {
-  MainStatusStarting,
-  PackageDataEntry,
-  PackageMainStatus,
-  PackageState,
-  Status,
-} from 'src/app/services/patch-db/data-model'
+import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { PkgDependencyErrors } from './dep-error.service'
+import { Status } from '../../../../../../core/startos/bindings/Status'
 
 export interface PackageStatus {
   primary: PrimaryStatus
@@ -22,7 +17,7 @@ export function renderPkgStatus(
   let dependency: DependencyStatus | null = null
   let health: HealthStatus | null = null
 
-  if (pkg.stateInfo.state === PackageState.Installed) {
+  if (pkg.stateInfo.state === 'installed') {
     primary = getPrimaryStatus(pkg.status)
     dependency = getDependencyStatus(depErrors)
     health = getHealthStatus(pkg.status)
@@ -36,7 +31,7 @@ export function renderPkgStatus(
 function getPrimaryStatus(status: Status): PrimaryStatus {
   if (!status.configured) {
     return PrimaryStatus.NeedsConfig
-  } else if ((status.main as MainStatusStarting).restarting) {
+  } else if (status.main.status === 'restarting') {
     return PrimaryStatus.Restarting
   } else {
     return status.main.status as any as PrimaryStatus
@@ -50,7 +45,7 @@ function getDependencyStatus(depErrors: PkgDependencyErrors): DependencyStatus {
 }
 
 function getHealthStatus(status: Status): HealthStatus | null {
-  if (status.main.status !== PackageMainStatus.Running || !status.main.health) {
+  if (status.main.status !== 'running' || !status.main.health) {
     return null
   }
 
diff --git a/web/projects/ui/src/app/util/get-package-data.ts b/web/projects/ui/src/app/util/get-package-data.ts
index 244324501..08fbdd2df 100644
--- a/web/projects/ui/src/app/util/get-package-data.ts
+++ b/web/projects/ui/src/app/util/get-package-data.ts
@@ -4,11 +4,10 @@ import {
   InstalledState,
   InstallingState,
   PackageDataEntry,
-  PackageState,
   UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { firstValueFrom } from 'rxjs'
-import { Manifest } from '@start9labs/marketplace'
+import { Manifest } from '../../../../../../core/startos/bindings/Manifest'
 
 export async function getPackage(
   patch: PatchDB<DataModel>,
@@ -32,29 +31,29 @@ export function getManifest(pkg: PackageDataEntry): Manifest {
 export function isInstalled(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstalledState> {
-  return pkg.stateInfo.state === PackageState.Installed
+  return pkg.stateInfo.state === 'installed'
 }
 
 export function isRemoving(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstalledState> {
-  return pkg.stateInfo.state === PackageState.Removing
+  return pkg.stateInfo.state === 'removing'
 }
 
 export function isInstalling(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstallingState> {
-  return pkg.stateInfo.state === PackageState.Installing
+  return pkg.stateInfo.state === 'installing'
 }
 
 export function isRestoring(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstallingState> {
-  return pkg.stateInfo.state === PackageState.Restoring
+  return pkg.stateInfo.state === 'restoring'
 }
 
 export function isUpdating(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<UpdatingState> {
-  return pkg.stateInfo.state === PackageState.Updating
+  return pkg.stateInfo.state === 'updating'
 }
diff --git a/web/projects/ui/src/app/util/get-server-info.ts b/web/projects/ui/src/app/util/get-server-info.ts
index 08eecd451..ba4bf0dbf 100644
--- a/web/projects/ui/src/app/util/get-server-info.ts
+++ b/web/projects/ui/src/app/util/get-server-info.ts
@@ -1,6 +1,7 @@
 import { PatchDB } from 'patch-db-client'
-import { DataModel, ServerInfo } from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { firstValueFrom } from 'rxjs'
+import { ServerInfo } from '../../../../../../core/startos/bindings/ServerInfo'
 
 export async function getServerInfo(
   patch: PatchDB<DataModel>,

From 65ca038eee4b32600a4fc8f0b68ce6be6d1842b6 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 28 Mar 2024 10:40:47 -0600
Subject: [PATCH 105/341] chore: Update and fix the things

---
 sdk/lib/emverLite/mod.ts                      |  1 -
 sdk/lib/health/HealthCheck.ts                 | 12 +++++++-----
 sdk/lib/health/checkFns/checkPortListening.ts |  2 +-
 sdk/lib/health/checkFns/checkWebUrl.ts        |  2 +-
 sdk/lib/health/checkFns/runHealthScript.ts    |  2 +-
 sdk/lib/mainFn/Daemons.ts                     |  2 +-
 sdk/lib/trigger/changeOnFirstSuccess.ts       |  2 +-
 sdk/lib/trigger/successFailure.ts             |  4 ++--
 sdk/lib/types.ts                              |  8 +-------
 9 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/sdk/lib/emverLite/mod.ts b/sdk/lib/emverLite/mod.ts
index dd68360ac..f69d4f35d 100644
--- a/sdk/lib/emverLite/mod.ts
+++ b/sdk/lib/emverLite/mod.ts
@@ -179,7 +179,6 @@ export class Checker {
    * @returns
    */
   static parse(range: string | Checker): Checker {
-    console.log(`Parser (${range})`)
     if (range instanceof Checker) {
       return range
     }
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index 488ecdcf5..e1fbee97b 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -40,19 +40,21 @@ export function healthCheck(o: {
           const { status, message } = await o.fn(overlay)
           await o.effects.setHealth({
             name: o.name,
-            status,
-            message,
+            id: o.name,
+            result: status,
+            message: message || "",
           })
           currentValue.hadSuccess = true
-          currentValue.lastResult = "passing"
+          currentValue.lastResult = "success"
           await triggerFirstSuccess().catch((err) => {
             console.error(err)
           })
         } catch (e) {
           await o.effects.setHealth({
             name: o.name,
-            status: "failure",
-            message: asMessage(e),
+            id: o.name,
+            result: "failure",
+            message: asMessage(e) || "",
           })
           currentValue.lastResult = "failure"
         }
diff --git a/sdk/lib/health/checkFns/checkPortListening.ts b/sdk/lib/health/checkFns/checkPortListening.ts
index 89dcf89b3..4cc0738da 100644
--- a/sdk/lib/health/checkFns/checkPortListening.ts
+++ b/sdk/lib/health/checkFns/checkPortListening.ts
@@ -45,7 +45,7 @@ export async function checkPortListening(
           port,
         )
       if (hasAddress) {
-        return { status: "passing", message: options.successMessage }
+        return { status: "success", message: options.successMessage }
       }
       return {
         status: "failure",
diff --git a/sdk/lib/health/checkFns/checkWebUrl.ts b/sdk/lib/health/checkFns/checkWebUrl.ts
index d18509ee3..8f61ae2ef 100644
--- a/sdk/lib/health/checkFns/checkWebUrl.ts
+++ b/sdk/lib/health/checkFns/checkWebUrl.ts
@@ -22,7 +22,7 @@ export const checkWebUrl = async (
     .then(
       (x) =>
         ({
-          status: "passing",
+          status: "success",
           message: successMessage,
         }) as const,
     )
diff --git a/sdk/lib/health/checkFns/runHealthScript.ts b/sdk/lib/health/checkFns/runHealthScript.ts
index 5d69f5e17..f0f41ee91 100644
--- a/sdk/lib/health/checkFns/runHealthScript.ts
+++ b/sdk/lib/health/checkFns/runHealthScript.ts
@@ -32,7 +32,7 @@ export const runHealthScript = async (
     throw { status: "failure", message: errorMessage } as CheckResult
   })
   return {
-    status: "passing",
+    status: "success",
     message: message(res.stdout.toString()),
   } as CheckResult
 }
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 540ca3d37..640ab8c4b 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -227,7 +227,7 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
                 }) as CheckResult,
             )
             currentInput.lastResult = response.status || null
-            if (!currentInput.hadSuccess && response.status === "passing") {
+            if (!currentInput.hadSuccess && response.status === "success") {
               currentInput.hadSuccess = true
               resolve(child)
             }
diff --git a/sdk/lib/trigger/changeOnFirstSuccess.ts b/sdk/lib/trigger/changeOnFirstSuccess.ts
index 28129e3e5..4c45afe31 100644
--- a/sdk/lib/trigger/changeOnFirstSuccess.ts
+++ b/sdk/lib/trigger/changeOnFirstSuccess.ts
@@ -11,7 +11,7 @@ export function changeOnFirstSuccess(o: {
     beforeFirstSuccess.next()
     for (
       let res = await beforeFirstSuccess.next();
-      currentValue?.lastResult !== "passing" && !res.done;
+      currentValue?.lastResult !== "success" && !res.done;
       res = await beforeFirstSuccess.next()
     ) {
       yield
diff --git a/sdk/lib/trigger/successFailure.ts b/sdk/lib/trigger/successFailure.ts
index 1886402c4..1bab27289 100644
--- a/sdk/lib/trigger/successFailure.ts
+++ b/sdk/lib/trigger/successFailure.ts
@@ -12,7 +12,7 @@ export function successFailure(o: {
       beforeSuccess.next()
       for (
         let res = await beforeSuccess.next();
-        currentValue?.lastResult !== "passing" && !res.done;
+        currentValue?.lastResult !== "success" && !res.done;
         res = await beforeSuccess.next()
       ) {
         yield
@@ -21,7 +21,7 @@ export function successFailure(o: {
       const duringError = o.duringError(getInput)
       for (
         let res = await duringError.next();
-        currentValue?.lastResult === "passing" && !res.done;
+        currentValue?.lastResult === "success" && !res.done;
         res = await duringError.next()
       ) {
         yield
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index daa7ffe43..3ddf79a36 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -143,13 +143,7 @@ export type Daemon = {
   [DaemonProof]: never
 }
 
-export type HealthStatus =
-  | `passing`
-  | `disabled`
-  | `starting`
-  | `warning`
-  | `failure`
-
+export type HealthStatus = HealthCheckResult["result"]
 export type SmtpValue = {
   server: string
   port: number

From 8ce6535a7e524d1b606536935afcc20295825b1f Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 28 Mar 2024 10:51:51 -0600
Subject: [PATCH 106/341] chore: Update the types for container runtime

---
 .../Systems/SystemForEmbassy/MainLoop.ts      | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 69e3e6615..8e4b0e446 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -113,25 +113,24 @@ export class MainLoop {
             if (executed.exitCode === 59) {
               await effects.setHealth({
                 name: healthId,
-                status: "disabled",
-                message:
-                  executed.stderr.toString() || executed.stdout.toString(),
+                id: healthId,
+                result: "disabled",
               })
               return
             }
             if (executed.exitCode === 60) {
               await effects.setHealth({
                 name: healthId,
-                status: "starting",
-                message:
-                  executed.stderr.toString() || executed.stdout.toString(),
+                id: healthId,
+                result: "starting",
               })
               return
             }
             if (executed.exitCode === 61) {
               await effects.setHealth({
                 name: healthId,
-                status: "warning",
+                id: healthId,
+                result: "failure",
                 message:
                   executed.stderr.toString() || executed.stdout.toString(),
               })
@@ -142,14 +141,16 @@ export class MainLoop {
             if (!!errorMessage) {
               await effects.setHealth({
                 name: healthId,
-                status: "failure",
-                message: errorMessage,
+                id: healthId,
+                result: "failure",
+                message: errorMessage || "",
               })
               return
             }
             await effects.setHealth({
               name: healthId,
-              status: "passing",
+              id: healthId,
+              result: "success",
               message,
             })
             return
@@ -160,7 +161,8 @@ export class MainLoop {
             if (!method) {
               await effects.setHealth({
                 name: healthId,
-                status: "failure",
+                id: healthId,
+                result: "failure",
                 message: `Expecting that thejs health check ${healthId} exists`,
               })
               return
@@ -173,16 +175,18 @@ export class MainLoop {
 
             if ("result" in result) {
               await effects.setHealth({
-                message: null,
+                message: "",
                 name: healthId,
-                status: "passing",
+                id: healthId,
+                result: "success",
               })
               return
             }
             if ("error" in result) {
               await effects.setHealth({
                 name: healthId,
-                status: "failure",
+                id: healthId,
+                result: "failure",
                 message: result.error,
               })
               return
@@ -190,7 +194,8 @@ export class MainLoop {
             if (!("error-code" in result)) {
               await effects.setHealth({
                 name: healthId,
-                status: "failure",
+                id: healthId,
+                result: "failure",
                 message: `Unknown error type ${JSON.stringify(result)}`,
               })
               return
@@ -199,23 +204,24 @@ export class MainLoop {
             if (code === 59) {
               await effects.setHealth({
                 name: healthId,
-                status: "disabled",
-                message,
+                id: healthId,
+                result: "disabled",
               })
               return
             }
             if (code === 60) {
               await effects.setHealth({
                 name: healthId,
-                status: "starting",
-                message,
+                id: healthId,
+                result: "starting",
               })
               return
             }
             if (code === 61) {
               await effects.setHealth({
                 name: healthId,
-                status: "warning",
+                id: healthId,
+                result: "failure",
                 message,
               })
               return
@@ -223,7 +229,8 @@ export class MainLoop {
 
             await effects.setHealth({
               name: healthId,
-              status: "failure",
+              id: healthId,
+              result: "failure",
               message: `${result["error-code"][0]}: ${result["error-code"][1]}`,
             })
             return

From 86d61d698a46a3c6f8e52e632d31d463ebbfbe2c Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 28 Mar 2024 11:20:20 -0600
Subject: [PATCH 107/341] update types and format bindings

---
 Makefile                                      |  3 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      | 67 +++++++++++--------
 core/startos/bindings/ActionId.ts             |  2 +-
 core/startos/bindings/ActionMetadata.ts       | 10 ++-
 core/startos/bindings/AddSslOptions.ts        |  6 +-
 core/startos/bindings/AddressInfo.ts          |  7 +-
 core/startos/bindings/Alerts.ts               |  8 ++-
 core/startos/bindings/Algorithm.ts            |  2 +-
 core/startos/bindings/AllPackageData.ts       |  2 +-
 core/startos/bindings/AllowedStatuses.ts      |  2 +-
 core/startos/bindings/AlpnInfo.ts             |  2 +-
 core/startos/bindings/BackupProgress.ts       |  2 +-
 core/startos/bindings/BindInfo.ts             |  2 +-
 core/startos/bindings/BindOptions.ts          |  7 +-
 core/startos/bindings/BindParams.ts           | 10 ++-
 core/startos/bindings/Callback.ts             |  2 +-
 core/startos/bindings/ChrootParams.ts         |  9 ++-
 .../bindings/CreateOverlayedImageParams.ts    |  2 +-
 core/startos/bindings/CurrentDependencies.ts  |  2 +-
 .../startos/bindings/CurrentDependencyInfo.ts |  7 +-
 core/startos/bindings/DataUrl.ts              |  2 +-
 core/startos/bindings/DepInfo.ts              |  2 +-
 core/startos/bindings/Dependencies.ts         |  2 +-
 .../bindings/DependencyConfigErrors.ts        |  2 +-
 core/startos/bindings/DependencyKind.ts       |  2 +-
 .../startos/bindings/DependencyRequirement.ts | 10 ++-
 core/startos/bindings/Description.ts          |  2 +-
 .../bindings/DestroyOverlayedImageParams.ts   |  2 +-
 core/startos/bindings/Duration.ts             |  2 +-
 core/startos/bindings/ExecuteAction.ts        |  6 +-
 core/startos/bindings/ExportActionParams.ts   |  2 +-
 .../bindings/ExportServiceInterfaceParams.ts  | 11 ++-
 core/startos/bindings/ExportedHostInfo.ts     |  6 +-
 core/startos/bindings/ExportedHostnameInfo.ts |  9 ++-
 core/startos/bindings/ExportedIpHostname.ts   | 17 ++++-
 .../startos/bindings/ExportedOnionHostname.ts |  6 +-
 .../bindings/ExposeForDependentsParams.ts     |  2 +-
 core/startos/bindings/FullProgress.ts         |  2 +-
 core/startos/bindings/GetHostInfoParams.ts    |  7 +-
 .../startos/bindings/GetHostInfoParamsKind.ts |  2 +-
 core/startos/bindings/GetPrimaryUrlParams.ts  |  6 +-
 .../bindings/GetServiceInterfaceParams.ts     |  6 +-
 .../bindings/GetServicePortForwardParams.ts   |  5 +-
 .../bindings/GetSslCertificateParams.ts       |  6 +-
 core/startos/bindings/GetSslKeyParams.ts      |  6 +-
 core/startos/bindings/GetStoreParams.ts       |  2 +-
 core/startos/bindings/GetSystemSmtpParams.ts  |  2 +-
 core/startos/bindings/Governor.ts             |  2 +-
 core/startos/bindings/HardwareRequirements.ts |  6 +-
 core/startos/bindings/HealthCheckId.ts        |  2 +-
 core/startos/bindings/HealthCheckResult.ts    |  8 ++-
 core/startos/bindings/Host.ts                 |  7 +-
 core/startos/bindings/HostAddress.ts          |  2 +-
 core/startos/bindings/HostId.ts               |  2 +-
 core/startos/bindings/HostInfo.ts             |  2 +-
 core/startos/bindings/HostKind.ts             |  2 +-
 core/startos/bindings/ImageId.ts              |  2 +-
 core/startos/bindings/InstalledState.ts       |  2 +-
 core/startos/bindings/InstallingInfo.ts       |  2 +-
 core/startos/bindings/InstallingState.ts      |  2 +-
 core/startos/bindings/IpInfo.ts               |  7 +-
 .../bindings/ListServiceInterfacesParams.ts   |  5 +-
 core/startos/bindings/MainStatus.ts           | 16 ++++-
 core/startos/bindings/Manifest.ts             | 24 ++++++-
 core/startos/bindings/MaybeUtf8String.ts      |  2 +-
 core/startos/bindings/MountParams.ts          |  2 +-
 core/startos/bindings/MountTarget.ts          |  7 +-
 core/startos/bindings/NamedProgress.ts        |  2 +-
 core/startos/bindings/PackageDataEntry.ts     | 16 ++++-
 core/startos/bindings/PackageId.ts            |  2 +-
 core/startos/bindings/PackageState.ts         |  7 +-
 core/startos/bindings/ParamsMaybePackageId.ts |  2 +-
 core/startos/bindings/ParamsPackageId.ts      |  2 +-
 core/startos/bindings/Progress.ts             |  2 +-
 core/startos/bindings/Public.ts               |  6 +-
 core/startos/bindings/RemoveActionParams.ts   |  2 +-
 core/startos/bindings/RemoveAddressParams.ts  |  2 +-
 core/startos/bindings/ReverseProxyBind.ts     |  6 +-
 .../bindings/ReverseProxyDestination.ts       |  6 +-
 core/startos/bindings/ReverseProxyHttp.ts     |  2 +-
 core/startos/bindings/ReverseProxyParams.ts   |  6 +-
 core/startos/bindings/Security.ts             |  2 +-
 core/startos/bindings/ServerInfo.ts           | 38 ++++++++---
 core/startos/bindings/ServerSpecs.ts          |  2 +-
 core/startos/bindings/ServerStatus.ts         |  8 ++-
 core/startos/bindings/ServiceInterface.ts     | 11 ++-
 core/startos/bindings/ServiceInterfaceId.ts   |  2 +-
 core/startos/bindings/ServiceInterfaceType.ts |  2 +-
 .../bindings/ServiceInterfaceWithHostInfo.ts  | 12 +++-
 core/startos/bindings/SetConfigured.ts        |  2 +-
 .../startos/bindings/SetDependenciesParams.ts |  4 +-
 core/startos/bindings/SetHealth.ts            |  8 ++-
 core/startos/bindings/SetMainStatus.ts        |  2 +-
 core/startos/bindings/SetStoreParams.ts       |  2 +-
 core/startos/bindings/Status.ts               |  6 +-
 core/startos/bindings/UpdateProgress.ts       |  2 +-
 core/startos/bindings/UpdatingState.ts        |  5 +-
 core/startos/bindings/VolumeId.ts             |  2 +-
 core/startos/bindings/WifiInfo.ts             |  6 +-
 core/startos/src/status/health_check.rs       | 28 ++++++--
 .../ui/src/app/services/api/mock-patch.ts     |  2 +
 101 files changed, 457 insertions(+), 139 deletions(-)

diff --git a/Makefile b/Makefile
index f19b40b47..9a6dee60f 100644
--- a/Makefile
+++ b/Makefile
@@ -176,11 +176,12 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE) $(PLATFORM_FILE)
 	rm -rf core/startos/bindings
 	(cd core/ && cargo test)
+	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
 
 sdk/lib/test: $(shell git ls-files sdk) core/startos/bindings
 	(cd sdk && make test)
 
-sdk/dist: $(shell git ls-files sdk)
+sdk/dist: $(shell git ls-files sdk) core/startos/bindings
 	(cd sdk && make bundle)
 
 container-runtime/dist: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 69e3e6615..17fd13468 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -112,8 +112,9 @@ export class MainLoop {
             ])
             if (executed.exitCode === 59) {
               await effects.setHealth({
-                name: healthId,
-                status: "disabled",
+                id: healthId,
+                name: value.name,
+                result: "disabled",
                 message:
                   executed.stderr.toString() || executed.stdout.toString(),
               })
@@ -121,8 +122,9 @@ export class MainLoop {
             }
             if (executed.exitCode === 60) {
               await effects.setHealth({
-                name: healthId,
-                status: "starting",
+                id: healthId,
+                name: value.name,
+                result: "starting",
                 message:
                   executed.stderr.toString() || executed.stdout.toString(),
               })
@@ -130,8 +132,9 @@ export class MainLoop {
             }
             if (executed.exitCode === 61) {
               await effects.setHealth({
-                name: healthId,
-                status: "warning",
+                id: healthId,
+                name: value.name,
+                result: "loading",
                 message:
                   executed.stderr.toString() || executed.stdout.toString(),
               })
@@ -141,15 +144,17 @@ export class MainLoop {
             const message = executed.stdout.toString()
             if (!!errorMessage) {
               await effects.setHealth({
-                name: healthId,
-                status: "failure",
+                id: healthId,
+                name: value.name,
+                result: "failure",
                 message: errorMessage,
               })
               return
             }
             await effects.setHealth({
-              name: healthId,
-              status: "passing",
+              id: healthId,
+              name: value.name,
+              result: "success",
               message,
             })
             return
@@ -159,9 +164,10 @@ export class MainLoop {
             const method = moduleCode.health?.[healthId]
             if (!method) {
               await effects.setHealth({
-                name: healthId,
-                status: "failure",
-                message: `Expecting that thejs health check ${healthId} exists`,
+                id: healthId,
+                name: value.name,
+                result: "failure",
+                message: `Expecting that the js health check ${healthId} exists`,
               })
               return
             }
@@ -173,24 +179,27 @@ export class MainLoop {
 
             if ("result" in result) {
               await effects.setHealth({
+                id: healthId,
+                name: value.name,
+                result: "success",
                 message: null,
-                name: healthId,
-                status: "passing",
               })
               return
             }
             if ("error" in result) {
               await effects.setHealth({
-                name: healthId,
-                status: "failure",
+                id: healthId,
+                name: value.name,
+                result: "failure",
                 message: result.error,
               })
               return
             }
             if (!("error-code" in result)) {
               await effects.setHealth({
-                name: healthId,
-                status: "failure",
+                id: healthId,
+                name: value.name,
+                result: "failure",
                 message: `Unknown error type ${JSON.stringify(result)}`,
               })
               return
@@ -198,32 +207,36 @@ export class MainLoop {
             const [code, message] = result["error-code"]
             if (code === 59) {
               await effects.setHealth({
-                name: healthId,
-                status: "disabled",
+                id: healthId,
+                name: value.name,
+                result: "disabled",
                 message,
               })
               return
             }
             if (code === 60) {
               await effects.setHealth({
-                name: healthId,
-                status: "starting",
+                id: healthId,
+                name: value.name,
+                result: "starting",
                 message,
               })
               return
             }
             if (code === 61) {
               await effects.setHealth({
-                name: healthId,
-                status: "warning",
+                id: healthId,
+                name: value.name,
+                result: "loading",
                 message,
               })
               return
             }
 
             await effects.setHealth({
-              name: healthId,
-              status: "failure",
+              id: healthId,
+              name: value.name,
+              result: "failure",
               message: `${result["error-code"][0]}: ${result["error-code"][1]}`,
             })
             return
diff --git a/core/startos/bindings/ActionId.ts b/core/startos/bindings/ActionId.ts
index 7c05d2b3c..9bb1f9990 100644
--- a/core/startos/bindings/ActionId.ts
+++ b/core/startos/bindings/ActionId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ActionId = string;
\ No newline at end of file
+export type ActionId = string;
diff --git a/core/startos/bindings/ActionMetadata.ts b/core/startos/bindings/ActionMetadata.ts
index e787190c8..c9373a5b8 100644
--- a/core/startos/bindings/ActionMetadata.ts
+++ b/core/startos/bindings/ActionMetadata.ts
@@ -1,4 +1,12 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AllowedStatuses } from "./AllowedStatuses";
 
-export type ActionMetadata = { name: string, description: string, warning: string | null, input: any, disabled: boolean, allowedStatuses: AllowedStatuses, group: string | null, };
\ No newline at end of file
+export type ActionMetadata = {
+  name: string;
+  description: string;
+  warning: string | null;
+  input: any;
+  disabled: boolean;
+  allowedStatuses: AllowedStatuses;
+  group: string | null;
+};
diff --git a/core/startos/bindings/AddSslOptions.ts b/core/startos/bindings/AddSslOptions.ts
index fcf2d63d4..984a1a7c6 100644
--- a/core/startos/bindings/AddSslOptions.ts
+++ b/core/startos/bindings/AddSslOptions.ts
@@ -1,4 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AlpnInfo } from "./AlpnInfo";
 
-export type AddSslOptions = { scheme: string | null, preferredExternalPort: number, alpn: AlpnInfo, };
\ No newline at end of file
+export type AddSslOptions = {
+  scheme: string | null;
+  preferredExternalPort: number;
+  alpn: AlpnInfo;
+};
diff --git a/core/startos/bindings/AddressInfo.ts b/core/startos/bindings/AddressInfo.ts
index 6bc42c0e9..1355f72a2 100644
--- a/core/startos/bindings/AddressInfo.ts
+++ b/core/startos/bindings/AddressInfo.ts
@@ -2,4 +2,9 @@
 import type { BindOptions } from "./BindOptions";
 import type { HostId } from "./HostId";
 
-export type AddressInfo = { username: string | null, hostId: HostId, bindOptions: BindOptions, suffix: string, };
\ No newline at end of file
+export type AddressInfo = {
+  username: string | null;
+  hostId: HostId;
+  bindOptions: BindOptions;
+  suffix: string;
+};
diff --git a/core/startos/bindings/Alerts.ts b/core/startos/bindings/Alerts.ts
index 4956bfa95..c6a671e83 100644
--- a/core/startos/bindings/Alerts.ts
+++ b/core/startos/bindings/Alerts.ts
@@ -1,3 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Alerts = { install: string | null, uninstall: string | null, restore: string | null, start: string | null, stop: string | null, };
\ No newline at end of file
+export type Alerts = {
+  install: string | null;
+  uninstall: string | null;
+  restore: string | null;
+  start: string | null;
+  stop: string | null;
+};
diff --git a/core/startos/bindings/Algorithm.ts b/core/startos/bindings/Algorithm.ts
index d12447f04..877325fdf 100644
--- a/core/startos/bindings/Algorithm.ts
+++ b/core/startos/bindings/Algorithm.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Algorithm = "ecdsa" | "ed25519";
\ No newline at end of file
+export type Algorithm = "ecdsa" | "ed25519";
diff --git a/core/startos/bindings/AllPackageData.ts b/core/startos/bindings/AllPackageData.ts
index 74827426a..c7698d10d 100644
--- a/core/startos/bindings/AllPackageData.ts
+++ b/core/startos/bindings/AllPackageData.ts
@@ -2,4 +2,4 @@
 import type { PackageDataEntry } from "./PackageDataEntry";
 import type { PackageId } from "./PackageId";
 
-export type AllPackageData = { [key: PackageId]: PackageDataEntry };
\ No newline at end of file
+export type AllPackageData = { [key: PackageId]: PackageDataEntry };
diff --git a/core/startos/bindings/AllowedStatuses.ts b/core/startos/bindings/AllowedStatuses.ts
index a5c7f5d2d..a04ee2bac 100644
--- a/core/startos/bindings/AllowedStatuses.ts
+++ b/core/startos/bindings/AllowedStatuses.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AllowedStatuses = "onlyRunning" | "onlyStopped" | "any";
\ No newline at end of file
+export type AllowedStatuses = "onlyRunning" | "onlyStopped" | "any";
diff --git a/core/startos/bindings/AlpnInfo.ts b/core/startos/bindings/AlpnInfo.ts
index 2a760d235..eac072fc0 100644
--- a/core/startos/bindings/AlpnInfo.ts
+++ b/core/startos/bindings/AlpnInfo.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { MaybeUtf8String } from "./MaybeUtf8String";
 
-export type AlpnInfo = "reflect" | { "specified": Array<MaybeUtf8String> };
\ No newline at end of file
+export type AlpnInfo = "reflect" | { specified: Array<MaybeUtf8String> };
diff --git a/core/startos/bindings/BackupProgress.ts b/core/startos/bindings/BackupProgress.ts
index 4a480dc93..42812a7b7 100644
--- a/core/startos/bindings/BackupProgress.ts
+++ b/core/startos/bindings/BackupProgress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type BackupProgress = { complete: boolean, };
\ No newline at end of file
+export type BackupProgress = { complete: boolean };
diff --git a/core/startos/bindings/BindInfo.ts b/core/startos/bindings/BindInfo.ts
index d42ed2d25..8bda6d37e 100644
--- a/core/startos/bindings/BindInfo.ts
+++ b/core/startos/bindings/BindInfo.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BindOptions } from "./BindOptions";
 
-export type BindInfo = { options: BindOptions, assignedLanPort: number | null, };
\ No newline at end of file
+export type BindInfo = { options: BindOptions; assignedLanPort: number | null };
diff --git a/core/startos/bindings/BindOptions.ts b/core/startos/bindings/BindOptions.ts
index 9043c5f57..6b12139a7 100644
--- a/core/startos/bindings/BindOptions.ts
+++ b/core/startos/bindings/BindOptions.ts
@@ -2,4 +2,9 @@
 import type { AddSslOptions } from "./AddSslOptions";
 import type { Security } from "./Security";
 
-export type BindOptions = { scheme: string | null, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: Security | null, };
\ No newline at end of file
+export type BindOptions = {
+  scheme: string | null;
+  preferredExternalPort: number;
+  addSsl: AddSslOptions | null;
+  secure: Security | null;
+};
diff --git a/core/startos/bindings/BindParams.ts b/core/startos/bindings/BindParams.ts
index 07a8033bc..4aa78e522 100644
--- a/core/startos/bindings/BindParams.ts
+++ b/core/startos/bindings/BindParams.ts
@@ -4,4 +4,12 @@ import type { HostId } from "./HostId";
 import type { HostKind } from "./HostKind";
 import type { Security } from "./Security";
 
-export type BindParams = { kind: HostKind, id: HostId, internalPort: number, scheme: string | null, preferredExternalPort: number, addSsl: AddSslOptions | null, secure: Security | null, };
\ No newline at end of file
+export type BindParams = {
+  kind: HostKind;
+  id: HostId;
+  internalPort: number;
+  scheme: string | null;
+  preferredExternalPort: number;
+  addSsl: AddSslOptions | null;
+  secure: Security | null;
+};
diff --git a/core/startos/bindings/Callback.ts b/core/startos/bindings/Callback.ts
index 9c4cacab0..e6c5b004f 100644
--- a/core/startos/bindings/Callback.ts
+++ b/core/startos/bindings/Callback.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Callback = () => void;
\ No newline at end of file
+export type Callback = () => void;
diff --git a/core/startos/bindings/ChrootParams.ts b/core/startos/bindings/ChrootParams.ts
index d8d1b1b46..9ee6e8959 100644
--- a/core/startos/bindings/ChrootParams.ts
+++ b/core/startos/bindings/ChrootParams.ts
@@ -1,3 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ChrootParams = { env: string | null, workdir: string | null, user: string | null, path: string, command: string, args: string[], };
\ No newline at end of file
+export type ChrootParams = {
+  env: string | null;
+  workdir: string | null;
+  user: string | null;
+  path: string;
+  command: string;
+  args: string[];
+};
diff --git a/core/startos/bindings/CreateOverlayedImageParams.ts b/core/startos/bindings/CreateOverlayedImageParams.ts
index 65e7487b6..d17f2e8c1 100644
--- a/core/startos/bindings/CreateOverlayedImageParams.ts
+++ b/core/startos/bindings/CreateOverlayedImageParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type CreateOverlayedImageParams = { imageId: string, };
\ No newline at end of file
+export type CreateOverlayedImageParams = { imageId: string };
diff --git a/core/startos/bindings/CurrentDependencies.ts b/core/startos/bindings/CurrentDependencies.ts
index 55fb68501..75645e200 100644
--- a/core/startos/bindings/CurrentDependencies.ts
+++ b/core/startos/bindings/CurrentDependencies.ts
@@ -2,4 +2,4 @@
 import type { CurrentDependencyInfo } from "./CurrentDependencyInfo";
 import type { PackageId } from "./PackageId";
 
-export type CurrentDependencies = { [key: PackageId]: CurrentDependencyInfo };
\ No newline at end of file
+export type CurrentDependencies = { [key: PackageId]: CurrentDependencyInfo };
diff --git a/core/startos/bindings/CurrentDependencyInfo.ts b/core/startos/bindings/CurrentDependencyInfo.ts
index a253afa38..10112e312 100644
--- a/core/startos/bindings/CurrentDependencyInfo.ts
+++ b/core/startos/bindings/CurrentDependencyInfo.ts
@@ -1,4 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DataUrl } from "./DataUrl";
 
-export type CurrentDependencyInfo = { title: string, icon: DataUrl, registryUrl: string, versionSpec: string, } & ({ "kind": "exists" } | { "kind": "running", healthChecks: string[], });
\ No newline at end of file
+export type CurrentDependencyInfo = {
+  title: string;
+  icon: DataUrl;
+  registryUrl: string;
+  versionSpec: string;
+} & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] });
diff --git a/core/startos/bindings/DataUrl.ts b/core/startos/bindings/DataUrl.ts
index 835512711..65fa15059 100644
--- a/core/startos/bindings/DataUrl.ts
+++ b/core/startos/bindings/DataUrl.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DataUrl = string;
\ No newline at end of file
+export type DataUrl = string;
diff --git a/core/startos/bindings/DepInfo.ts b/core/startos/bindings/DepInfo.ts
index 8320d83eb..3c01e0939 100644
--- a/core/startos/bindings/DepInfo.ts
+++ b/core/startos/bindings/DepInfo.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DepInfo = { description: string | null, optional: boolean, };
\ No newline at end of file
+export type DepInfo = { description: string | null; optional: boolean };
diff --git a/core/startos/bindings/Dependencies.ts b/core/startos/bindings/Dependencies.ts
index a84adec24..974495b7b 100644
--- a/core/startos/bindings/Dependencies.ts
+++ b/core/startos/bindings/Dependencies.ts
@@ -2,4 +2,4 @@
 import type { DepInfo } from "./DepInfo";
 import type { PackageId } from "./PackageId";
 
-export type Dependencies = { [key: PackageId]: DepInfo };
\ No newline at end of file
+export type Dependencies = { [key: PackageId]: DepInfo };
diff --git a/core/startos/bindings/DependencyConfigErrors.ts b/core/startos/bindings/DependencyConfigErrors.ts
index 23281aa89..5f2246fa9 100644
--- a/core/startos/bindings/DependencyConfigErrors.ts
+++ b/core/startos/bindings/DependencyConfigErrors.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { PackageId } from "./PackageId";
 
-export type DependencyConfigErrors = { [key: PackageId]: string };
\ No newline at end of file
+export type DependencyConfigErrors = { [key: PackageId]: string };
diff --git a/core/startos/bindings/DependencyKind.ts b/core/startos/bindings/DependencyKind.ts
index 018562971..71fd49762 100644
--- a/core/startos/bindings/DependencyKind.ts
+++ b/core/startos/bindings/DependencyKind.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DependencyKind = "exists" | "running";
\ No newline at end of file
+export type DependencyKind = "exists" | "running";
diff --git a/core/startos/bindings/DependencyRequirement.ts b/core/startos/bindings/DependencyRequirement.ts
index 40b78b473..e6224ce48 100644
--- a/core/startos/bindings/DependencyRequirement.ts
+++ b/core/startos/bindings/DependencyRequirement.ts
@@ -1,3 +1,11 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DependencyRequirement = { "kind": "running", id: string, healthChecks: string[], versionSpec: string, registryUrl: string, } | { "kind": "exists", id: string, versionSpec: string, registryUrl: string, };
\ No newline at end of file
+export type DependencyRequirement =
+  | {
+      kind: "running";
+      id: string;
+      healthChecks: string[];
+      versionSpec: string;
+      registryUrl: string;
+    }
+  | { kind: "exists"; id: string; versionSpec: string; registryUrl: string };
diff --git a/core/startos/bindings/Description.ts b/core/startos/bindings/Description.ts
index da4b0d1bf..918bd09c5 100644
--- a/core/startos/bindings/Description.ts
+++ b/core/startos/bindings/Description.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Description = { short: string, long: string, };
\ No newline at end of file
+export type Description = { short: string; long: string };
diff --git a/core/startos/bindings/DestroyOverlayedImageParams.ts b/core/startos/bindings/DestroyOverlayedImageParams.ts
index 34d4085a1..47671604a 100644
--- a/core/startos/bindings/DestroyOverlayedImageParams.ts
+++ b/core/startos/bindings/DestroyOverlayedImageParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DestroyOverlayedImageParams = { guid: string, };
\ No newline at end of file
+export type DestroyOverlayedImageParams = { guid: string };
diff --git a/core/startos/bindings/Duration.ts b/core/startos/bindings/Duration.ts
index ac44b7c87..889c729b8 100644
--- a/core/startos/bindings/Duration.ts
+++ b/core/startos/bindings/Duration.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Duration = string;
\ No newline at end of file
+export type Duration = string;
diff --git a/core/startos/bindings/ExecuteAction.ts b/core/startos/bindings/ExecuteAction.ts
index 52636bdbc..aaa340747 100644
--- a/core/startos/bindings/ExecuteAction.ts
+++ b/core/startos/bindings/ExecuteAction.ts
@@ -1,3 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ExecuteAction = { serviceId: string | null, actionId: string, input: any, };
\ No newline at end of file
+export type ExecuteAction = {
+  serviceId: string | null;
+  actionId: string;
+  input: any;
+};
diff --git a/core/startos/bindings/ExportActionParams.ts b/core/startos/bindings/ExportActionParams.ts
index d19fc6905..4961c4a11 100644
--- a/core/startos/bindings/ExportActionParams.ts
+++ b/core/startos/bindings/ExportActionParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ActionMetadata } from "./ActionMetadata";
 
-export type ExportActionParams = { id: string, metadata: ActionMetadata, };
\ No newline at end of file
+export type ExportActionParams = { id: string; metadata: ActionMetadata };
diff --git a/core/startos/bindings/ExportServiceInterfaceParams.ts b/core/startos/bindings/ExportServiceInterfaceParams.ts
index ad7885507..93deb0ce5 100644
--- a/core/startos/bindings/ExportServiceInterfaceParams.ts
+++ b/core/startos/bindings/ExportServiceInterfaceParams.ts
@@ -2,4 +2,13 @@
 import type { AddressInfo } from "./AddressInfo";
 import type { ServiceInterfaceType } from "./ServiceInterfaceType";
 
-export type ExportServiceInterfaceParams = { id: string, name: string, description: string, hasPrimary: boolean, disabled: boolean, masked: boolean, addressInfo: AddressInfo, type: ServiceInterfaceType, };
\ No newline at end of file
+export type ExportServiceInterfaceParams = {
+  id: string;
+  name: string;
+  description: string;
+  hasPrimary: boolean;
+  disabled: boolean;
+  masked: boolean;
+  addressInfo: AddressInfo;
+  type: ServiceInterfaceType;
+};
diff --git a/core/startos/bindings/ExportedHostInfo.ts b/core/startos/bindings/ExportedHostInfo.ts
index c4d36bd61..d8339a074 100644
--- a/core/startos/bindings/ExportedHostInfo.ts
+++ b/core/startos/bindings/ExportedHostInfo.ts
@@ -3,4 +3,8 @@ import type { ExportedHostnameInfo } from "./ExportedHostnameInfo";
 import type { HostId } from "./HostId";
 import type { HostKind } from "./HostKind";
 
-export type ExportedHostInfo = { id: HostId, kind: HostKind, hostnames: Array<ExportedHostnameInfo>, };
\ No newline at end of file
+export type ExportedHostInfo = {
+  id: HostId;
+  kind: HostKind;
+  hostnames: Array<ExportedHostnameInfo>;
+};
diff --git a/core/startos/bindings/ExportedHostnameInfo.ts b/core/startos/bindings/ExportedHostnameInfo.ts
index 086fd95b1..23cbdd487 100644
--- a/core/startos/bindings/ExportedHostnameInfo.ts
+++ b/core/startos/bindings/ExportedHostnameInfo.ts
@@ -2,4 +2,11 @@
 import type { ExportedIpHostname } from "./ExportedIpHostname";
 import type { ExportedOnionHostname } from "./ExportedOnionHostname";
 
-export type ExportedHostnameInfo = { "kind": "ip", networkInterfaceId: string, public: boolean, hostname: ExportedIpHostname, } | { "kind": "onion", hostname: ExportedOnionHostname, };
\ No newline at end of file
+export type ExportedHostnameInfo =
+  | {
+      kind: "ip";
+      networkInterfaceId: string;
+      public: boolean;
+      hostname: ExportedIpHostname;
+    }
+  | { kind: "onion"; hostname: ExportedOnionHostname };
diff --git a/core/startos/bindings/ExportedIpHostname.ts b/core/startos/bindings/ExportedIpHostname.ts
index 7d012fecc..1e02ab2be 100644
--- a/core/startos/bindings/ExportedIpHostname.ts
+++ b/core/startos/bindings/ExportedIpHostname.ts
@@ -1,3 +1,18 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ExportedIpHostname = { "kind": "ipv4", value: string, port: number | null, sslPort: number | null, } | { "kind": "ipv6", value: string, port: number | null, sslPort: number | null, } | { "kind": "local", value: string, port: number | null, sslPort: number | null, } | { "kind": "domain", domain: string, subdomain: string | null, port: number | null, sslPort: number | null, };
\ No newline at end of file
+export type ExportedIpHostname =
+  | { kind: "ipv4"; value: string; port: number | null; sslPort: number | null }
+  | { kind: "ipv6"; value: string; port: number | null; sslPort: number | null }
+  | {
+      kind: "local";
+      value: string;
+      port: number | null;
+      sslPort: number | null;
+    }
+  | {
+      kind: "domain";
+      domain: string;
+      subdomain: string | null;
+      port: number | null;
+      sslPort: number | null;
+    };
diff --git a/core/startos/bindings/ExportedOnionHostname.ts b/core/startos/bindings/ExportedOnionHostname.ts
index 82fee09e3..af072289f 100644
--- a/core/startos/bindings/ExportedOnionHostname.ts
+++ b/core/startos/bindings/ExportedOnionHostname.ts
@@ -1,3 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ExportedOnionHostname = { value: string, port: number | null, sslPort: number | null, };
\ No newline at end of file
+export type ExportedOnionHostname = {
+  value: string;
+  port: number | null;
+  sslPort: number | null;
+};
diff --git a/core/startos/bindings/ExposeForDependentsParams.ts b/core/startos/bindings/ExposeForDependentsParams.ts
index 9626f4dcf..714771c1e 100644
--- a/core/startos/bindings/ExposeForDependentsParams.ts
+++ b/core/startos/bindings/ExposeForDependentsParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ExposeForDependentsParams = { paths: string[], };
\ No newline at end of file
+export type ExposeForDependentsParams = { paths: string[] };
diff --git a/core/startos/bindings/FullProgress.ts b/core/startos/bindings/FullProgress.ts
index 0c6a96832..56f6a1a15 100644
--- a/core/startos/bindings/FullProgress.ts
+++ b/core/startos/bindings/FullProgress.ts
@@ -2,4 +2,4 @@
 import type { NamedProgress } from "./NamedProgress";
 import type { Progress } from "./Progress";
 
-export type FullProgress = { overall: Progress, phases: Array<NamedProgress>, };
\ No newline at end of file
+export type FullProgress = { overall: Progress; phases: Array<NamedProgress> };
diff --git a/core/startos/bindings/GetHostInfoParams.ts b/core/startos/bindings/GetHostInfoParams.ts
index 69abeeb13..7c2b1b6b6 100644
--- a/core/startos/bindings/GetHostInfoParams.ts
+++ b/core/startos/bindings/GetHostInfoParams.ts
@@ -2,4 +2,9 @@
 import type { Callback } from "./Callback";
 import type { GetHostInfoParamsKind } from "./GetHostInfoParamsKind";
 
-export type GetHostInfoParams = { kind: GetHostInfoParamsKind | null, serviceInterfaceId: string, packageId: string | null, callback: Callback, };
\ No newline at end of file
+export type GetHostInfoParams = {
+  kind: GetHostInfoParamsKind | null;
+  serviceInterfaceId: string;
+  packageId: string | null;
+  callback: Callback;
+};
diff --git a/core/startos/bindings/GetHostInfoParamsKind.ts b/core/startos/bindings/GetHostInfoParamsKind.ts
index 6d401f685..6353044ce 100644
--- a/core/startos/bindings/GetHostInfoParamsKind.ts
+++ b/core/startos/bindings/GetHostInfoParamsKind.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type GetHostInfoParamsKind = "multi";
\ No newline at end of file
+export type GetHostInfoParamsKind = "multi";
diff --git a/core/startos/bindings/GetPrimaryUrlParams.ts b/core/startos/bindings/GetPrimaryUrlParams.ts
index 6296d4342..c5aaa0ebe 100644
--- a/core/startos/bindings/GetPrimaryUrlParams.ts
+++ b/core/startos/bindings/GetPrimaryUrlParams.ts
@@ -1,4 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
 
-export type GetPrimaryUrlParams = { packageId: string | null, serviceInterfaceId: string, callback: Callback, };
\ No newline at end of file
+export type GetPrimaryUrlParams = {
+  packageId: string | null;
+  serviceInterfaceId: string;
+  callback: Callback;
+};
diff --git a/core/startos/bindings/GetServiceInterfaceParams.ts b/core/startos/bindings/GetServiceInterfaceParams.ts
index 1eb2b6f28..03990c10b 100644
--- a/core/startos/bindings/GetServiceInterfaceParams.ts
+++ b/core/startos/bindings/GetServiceInterfaceParams.ts
@@ -1,4 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
 
-export type GetServiceInterfaceParams = { packageId: string | null, serviceInterfaceId: string, callback: Callback, };
\ No newline at end of file
+export type GetServiceInterfaceParams = {
+  packageId: string | null;
+  serviceInterfaceId: string;
+  callback: Callback;
+};
diff --git a/core/startos/bindings/GetServicePortForwardParams.ts b/core/startos/bindings/GetServicePortForwardParams.ts
index dd4eaf211..3de7e0219 100644
--- a/core/startos/bindings/GetServicePortForwardParams.ts
+++ b/core/startos/bindings/GetServicePortForwardParams.ts
@@ -1,3 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type GetServicePortForwardParams = { packageId: string | null, internalPort: number, };
\ No newline at end of file
+export type GetServicePortForwardParams = {
+  packageId: string | null;
+  internalPort: number;
+};
diff --git a/core/startos/bindings/GetSslCertificateParams.ts b/core/startos/bindings/GetSslCertificateParams.ts
index a4a2447cd..a1fd17bdd 100644
--- a/core/startos/bindings/GetSslCertificateParams.ts
+++ b/core/startos/bindings/GetSslCertificateParams.ts
@@ -1,4 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Algorithm } from "./Algorithm";
 
-export type GetSslCertificateParams = { packageId: string | null, hostId: string, algorithm: Algorithm | null, };
\ No newline at end of file
+export type GetSslCertificateParams = {
+  packageId: string | null;
+  hostId: string;
+  algorithm: Algorithm | null;
+};
diff --git a/core/startos/bindings/GetSslKeyParams.ts b/core/startos/bindings/GetSslKeyParams.ts
index eb36cd2f5..8c5170c9c 100644
--- a/core/startos/bindings/GetSslKeyParams.ts
+++ b/core/startos/bindings/GetSslKeyParams.ts
@@ -1,4 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Algorithm } from "./Algorithm";
 
-export type GetSslKeyParams = { packageId: string | null, hostId: string, algorithm: Algorithm | null, };
\ No newline at end of file
+export type GetSslKeyParams = {
+  packageId: string | null;
+  hostId: string;
+  algorithm: Algorithm | null;
+};
diff --git a/core/startos/bindings/GetStoreParams.ts b/core/startos/bindings/GetStoreParams.ts
index 6b965e75f..bfd97377b 100644
--- a/core/startos/bindings/GetStoreParams.ts
+++ b/core/startos/bindings/GetStoreParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type GetStoreParams = { packageId: string | null, path: string, };
\ No newline at end of file
+export type GetStoreParams = { packageId: string | null; path: string };
diff --git a/core/startos/bindings/GetSystemSmtpParams.ts b/core/startos/bindings/GetSystemSmtpParams.ts
index 25d30529f..b96b9f595 100644
--- a/core/startos/bindings/GetSystemSmtpParams.ts
+++ b/core/startos/bindings/GetSystemSmtpParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
 
-export type GetSystemSmtpParams = { callback: Callback, };
\ No newline at end of file
+export type GetSystemSmtpParams = { callback: Callback };
diff --git a/core/startos/bindings/Governor.ts b/core/startos/bindings/Governor.ts
index 9e0bb14e2..82c9e39f1 100644
--- a/core/startos/bindings/Governor.ts
+++ b/core/startos/bindings/Governor.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Governor = string;
\ No newline at end of file
+export type Governor = string;
diff --git a/core/startos/bindings/HardwareRequirements.ts b/core/startos/bindings/HardwareRequirements.ts
index 5a28d0cbc..079483289 100644
--- a/core/startos/bindings/HardwareRequirements.ts
+++ b/core/startos/bindings/HardwareRequirements.ts
@@ -1,3 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HardwareRequirements = { device: { [key: string]: string }, ram: bigint | null, arch: Array<string> | null, };
\ No newline at end of file
+export type HardwareRequirements = {
+  device: { [key: string]: string };
+  ram: bigint | null;
+  arch: Array<string> | null;
+};
diff --git a/core/startos/bindings/HealthCheckId.ts b/core/startos/bindings/HealthCheckId.ts
index d9b6b7ca8..eeefafbb1 100644
--- a/core/startos/bindings/HealthCheckId.ts
+++ b/core/startos/bindings/HealthCheckId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HealthCheckId = string;
\ No newline at end of file
+export type HealthCheckId = string;
diff --git a/core/startos/bindings/HealthCheckResult.ts b/core/startos/bindings/HealthCheckResult.ts
index a539fc805..ae4d3c3c2 100644
--- a/core/startos/bindings/HealthCheckResult.ts
+++ b/core/startos/bindings/HealthCheckResult.ts
@@ -1,3 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HealthCheckResult = { name: string, } & ({ "result": "success", message: string, } | { "result": "disabled" } | { "result": "starting" } | { "result": "loading", message: string, } | { "result": "failure", message: string, });
\ No newline at end of file
+export type HealthCheckResult = { name: string } & (
+  | { result: "success"; message: string | null }
+  | { result: "disabled"; message: string | null }
+  | { result: "starting"; message: string | null }
+  | { result: "loading"; message: string }
+  | { result: "failure"; message: string }
+);
diff --git a/core/startos/bindings/Host.ts b/core/startos/bindings/Host.ts
index a08704ad2..4188cb404 100644
--- a/core/startos/bindings/Host.ts
+++ b/core/startos/bindings/Host.ts
@@ -3,4 +3,9 @@ import type { BindInfo } from "./BindInfo";
 import type { HostAddress } from "./HostAddress";
 import type { HostKind } from "./HostKind";
 
-export type Host = { kind: HostKind, bindings: { [key: number]: BindInfo }, addresses: Array<HostAddress>, primary: HostAddress | null, };
\ No newline at end of file
+export type Host = {
+  kind: HostKind;
+  bindings: { [key: number]: BindInfo };
+  addresses: Array<HostAddress>;
+  primary: HostAddress | null;
+};
diff --git a/core/startos/bindings/HostAddress.ts b/core/startos/bindings/HostAddress.ts
index f013cb540..9cddf778b 100644
--- a/core/startos/bindings/HostAddress.ts
+++ b/core/startos/bindings/HostAddress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HostAddress = { "kind": "onion", address: string, };
\ No newline at end of file
+export type HostAddress = { kind: "onion"; address: string };
diff --git a/core/startos/bindings/HostId.ts b/core/startos/bindings/HostId.ts
index 1aef70f2a..23049a51d 100644
--- a/core/startos/bindings/HostId.ts
+++ b/core/startos/bindings/HostId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HostId = string;
\ No newline at end of file
+export type HostId = string;
diff --git a/core/startos/bindings/HostInfo.ts b/core/startos/bindings/HostInfo.ts
index 3d2a34f14..b69dbf6b4 100644
--- a/core/startos/bindings/HostInfo.ts
+++ b/core/startos/bindings/HostInfo.ts
@@ -2,4 +2,4 @@
 import type { Host } from "./Host";
 import type { HostId } from "./HostId";
 
-export type HostInfo = { [key: HostId]: Host };
\ No newline at end of file
+export type HostInfo = { [key: HostId]: Host };
diff --git a/core/startos/bindings/HostKind.ts b/core/startos/bindings/HostKind.ts
index 1ad1bd95e..09e61b91b 100644
--- a/core/startos/bindings/HostKind.ts
+++ b/core/startos/bindings/HostKind.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HostKind = "multi";
\ No newline at end of file
+export type HostKind = "multi";
diff --git a/core/startos/bindings/ImageId.ts b/core/startos/bindings/ImageId.ts
index 9adb82d7a..408331f72 100644
--- a/core/startos/bindings/ImageId.ts
+++ b/core/startos/bindings/ImageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ImageId = string;
\ No newline at end of file
+export type ImageId = string;
diff --git a/core/startos/bindings/InstalledState.ts b/core/startos/bindings/InstalledState.ts
index 3608a5ba0..053c3ae66 100644
--- a/core/startos/bindings/InstalledState.ts
+++ b/core/startos/bindings/InstalledState.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Manifest } from "./Manifest";
 
-export type InstalledState = { manifest: Manifest, };
\ No newline at end of file
+export type InstalledState = { manifest: Manifest };
diff --git a/core/startos/bindings/InstallingInfo.ts b/core/startos/bindings/InstallingInfo.ts
index c3d13c984..7627f4502 100644
--- a/core/startos/bindings/InstallingInfo.ts
+++ b/core/startos/bindings/InstallingInfo.ts
@@ -2,4 +2,4 @@
 import type { FullProgress } from "./FullProgress";
 import type { Manifest } from "./Manifest";
 
-export type InstallingInfo = { newManifest: Manifest, progress: FullProgress, };
\ No newline at end of file
+export type InstallingInfo = { newManifest: Manifest; progress: FullProgress };
diff --git a/core/startos/bindings/InstallingState.ts b/core/startos/bindings/InstallingState.ts
index b7cfea14c..3203cfd6b 100644
--- a/core/startos/bindings/InstallingState.ts
+++ b/core/startos/bindings/InstallingState.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { InstallingInfo } from "./InstallingInfo";
 
-export type InstallingState = { installingInfo: InstallingInfo, };
\ No newline at end of file
+export type InstallingState = { installingInfo: InstallingInfo };
diff --git a/core/startos/bindings/IpInfo.ts b/core/startos/bindings/IpInfo.ts
index 756d87219..1208fafb9 100644
--- a/core/startos/bindings/IpInfo.ts
+++ b/core/startos/bindings/IpInfo.ts
@@ -1,3 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type IpInfo = { ipv4Range: string | null, ipv4: string | null, ipv6Range: string | null, ipv6: string | null, };
\ No newline at end of file
+export type IpInfo = {
+  ipv4Range: string | null;
+  ipv4: string | null;
+  ipv6Range: string | null;
+  ipv6: string | null;
+};
diff --git a/core/startos/bindings/ListServiceInterfacesParams.ts b/core/startos/bindings/ListServiceInterfacesParams.ts
index cd889b149..03d1cdfc8 100644
--- a/core/startos/bindings/ListServiceInterfacesParams.ts
+++ b/core/startos/bindings/ListServiceInterfacesParams.ts
@@ -1,4 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback";
 
-export type ListServiceInterfacesParams = { packageId: string | null, callback: Callback, };
\ No newline at end of file
+export type ListServiceInterfacesParams = {
+  packageId: string | null;
+  callback: Callback;
+};
diff --git a/core/startos/bindings/MainStatus.ts b/core/startos/bindings/MainStatus.ts
index 25482e113..878213087 100644
--- a/core/startos/bindings/MainStatus.ts
+++ b/core/startos/bindings/MainStatus.ts
@@ -3,4 +3,18 @@ import type { Duration } from "./Duration";
 import type { HealthCheckId } from "./HealthCheckId";
 import type { HealthCheckResult } from "./HealthCheckResult";
 
-export type MainStatus = { "status": "stopped" } | { "status": "restarting" } | { "status": "stopping", timeout: Duration, } | { "status": "starting" } | { "status": "running", started: string, health: { [key: HealthCheckId]: HealthCheckResult }, } | { "status": "backingUp", started: string | null, health: { [key: HealthCheckId]: HealthCheckResult }, };
\ No newline at end of file
+export type MainStatus =
+  | { status: "stopped" }
+  | { status: "restarting" }
+  | { status: "stopping"; timeout: Duration }
+  | { status: "starting" }
+  | {
+      status: "running";
+      started: string;
+      health: { [key: HealthCheckId]: HealthCheckResult };
+    }
+  | {
+      status: "backingUp";
+      started: string | null;
+      health: { [key: HealthCheckId]: HealthCheckResult };
+    };
diff --git a/core/startos/bindings/Manifest.ts b/core/startos/bindings/Manifest.ts
index 0eb91251b..688486a7d 100644
--- a/core/startos/bindings/Manifest.ts
+++ b/core/startos/bindings/Manifest.ts
@@ -7,4 +7,26 @@ import type { ImageId } from "./ImageId";
 import type { PackageId } from "./PackageId";
 import type { VolumeId } from "./VolumeId";
 
-export type Manifest = { id: PackageId, title: string, version: string, releaseNotes: string, license: string, replaces: Array<string>, wrapperRepo: string, upstreamRepo: string, supportSite: string, marketingSite: string, donationUrl: string | null, description: Description, images: Array<ImageId>, assets: Array<VolumeId>, volumes: Array<VolumeId>, alerts: Alerts, dependencies: Dependencies, hardwareRequirements: HardwareRequirements, gitHash: string | null, osVersion: string, hasConfig: boolean, };
\ No newline at end of file
+export type Manifest = {
+  id: PackageId;
+  title: string;
+  version: string;
+  releaseNotes: string;
+  license: string;
+  replaces: Array<string>;
+  wrapperRepo: string;
+  upstreamRepo: string;
+  supportSite: string;
+  marketingSite: string;
+  donationUrl: string | null;
+  description: Description;
+  images: Array<ImageId>;
+  assets: Array<VolumeId>;
+  volumes: Array<VolumeId>;
+  alerts: Alerts;
+  dependencies: Dependencies;
+  hardwareRequirements: HardwareRequirements;
+  gitHash: string | null;
+  osVersion: string;
+  hasConfig: boolean;
+};
diff --git a/core/startos/bindings/MaybeUtf8String.ts b/core/startos/bindings/MaybeUtf8String.ts
index 6674a135b..a77f8ce4e 100644
--- a/core/startos/bindings/MaybeUtf8String.ts
+++ b/core/startos/bindings/MaybeUtf8String.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type MaybeUtf8String = string | number[];
\ No newline at end of file
+export type MaybeUtf8String = string | number[];
diff --git a/core/startos/bindings/MountParams.ts b/core/startos/bindings/MountParams.ts
index 4f8615a25..daa4ddf32 100644
--- a/core/startos/bindings/MountParams.ts
+++ b/core/startos/bindings/MountParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { MountTarget } from "./MountTarget";
 
-export type MountParams = { location: string, target: MountTarget, };
\ No newline at end of file
+export type MountParams = { location: string; target: MountTarget };
diff --git a/core/startos/bindings/MountTarget.ts b/core/startos/bindings/MountTarget.ts
index 6a28ec3ac..3009861fb 100644
--- a/core/startos/bindings/MountTarget.ts
+++ b/core/startos/bindings/MountTarget.ts
@@ -1,3 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type MountTarget = { packageId: string, volumeId: string, subpath: string | null, readonly: boolean, };
\ No newline at end of file
+export type MountTarget = {
+  packageId: string;
+  volumeId: string;
+  subpath: string | null;
+  readonly: boolean;
+};
diff --git a/core/startos/bindings/NamedProgress.ts b/core/startos/bindings/NamedProgress.ts
index 1e4c45093..42104c48b 100644
--- a/core/startos/bindings/NamedProgress.ts
+++ b/core/startos/bindings/NamedProgress.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Progress } from "./Progress";
 
-export type NamedProgress = { name: string, progress: Progress, };
\ No newline at end of file
+export type NamedProgress = { name: string; progress: Progress };
diff --git a/core/startos/bindings/PackageDataEntry.ts b/core/startos/bindings/PackageDataEntry.ts
index 7abb7503a..8b906bb90 100644
--- a/core/startos/bindings/PackageDataEntry.ts
+++ b/core/startos/bindings/PackageDataEntry.ts
@@ -9,4 +9,18 @@ import type { ServiceInterfaceId } from "./ServiceInterfaceId";
 import type { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo";
 import type { Status } from "./Status";
 
-export type PackageDataEntry = { stateInfo: PackageState, status: Status, marketplaceUrl: string | null, developerKey: string, icon: DataUrl, lastBackup: string | null, currentDependencies: CurrentDependencies, actions: { [key: ActionId]: ActionMetadata }, serviceInterfaces: { [key: ServiceInterfaceId]: ServiceInterfaceWithHostInfo }, hosts: HostInfo, storeExposedDependents: string[], };
\ No newline at end of file
+export type PackageDataEntry = {
+  stateInfo: PackageState;
+  status: Status;
+  marketplaceUrl: string | null;
+  developerKey: string;
+  icon: DataUrl;
+  lastBackup: string | null;
+  currentDependencies: CurrentDependencies;
+  actions: { [key: ActionId]: ActionMetadata };
+  serviceInterfaces: {
+    [key: ServiceInterfaceId]: ServiceInterfaceWithHostInfo;
+  };
+  hosts: HostInfo;
+  storeExposedDependents: string[];
+};
diff --git a/core/startos/bindings/PackageId.ts b/core/startos/bindings/PackageId.ts
index fcf62f5e2..349bf44d7 100644
--- a/core/startos/bindings/PackageId.ts
+++ b/core/startos/bindings/PackageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type PackageId = string;
\ No newline at end of file
+export type PackageId = string;
diff --git a/core/startos/bindings/PackageState.ts b/core/startos/bindings/PackageState.ts
index 4aa0c1d97..6c90bff09 100644
--- a/core/startos/bindings/PackageState.ts
+++ b/core/startos/bindings/PackageState.ts
@@ -3,4 +3,9 @@ import type { InstalledState } from "./InstalledState";
 import type { InstallingState } from "./InstallingState";
 import type { UpdatingState } from "./UpdatingState";
 
-export type PackageState = { "state": "installing" } & InstallingState | { "state": "restoring" } & InstallingState | { "state": "updating" } & UpdatingState | { "state": "installed" } & InstalledState | { "state": "removing" } & InstalledState;
\ No newline at end of file
+export type PackageState =
+  | ({ state: "installing" } & InstallingState)
+  | ({ state: "restoring" } & InstallingState)
+  | ({ state: "updating" } & UpdatingState)
+  | ({ state: "installed" } & InstalledState)
+  | ({ state: "removing" } & InstalledState);
diff --git a/core/startos/bindings/ParamsMaybePackageId.ts b/core/startos/bindings/ParamsMaybePackageId.ts
index 867eb2a51..e9f0f170c 100644
--- a/core/startos/bindings/ParamsMaybePackageId.ts
+++ b/core/startos/bindings/ParamsMaybePackageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ParamsMaybePackageId = { packageId: string | null, };
\ No newline at end of file
+export type ParamsMaybePackageId = { packageId: string | null };
diff --git a/core/startos/bindings/ParamsPackageId.ts b/core/startos/bindings/ParamsPackageId.ts
index aa3caec92..7bc919843 100644
--- a/core/startos/bindings/ParamsPackageId.ts
+++ b/core/startos/bindings/ParamsPackageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ParamsPackageId = { packageId: string, };
\ No newline at end of file
+export type ParamsPackageId = { packageId: string };
diff --git a/core/startos/bindings/Progress.ts b/core/startos/bindings/Progress.ts
index acddd8582..c8e5e4431 100644
--- a/core/startos/bindings/Progress.ts
+++ b/core/startos/bindings/Progress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Progress = boolean | { done: number, total: number | null, };
\ No newline at end of file
+export type Progress = boolean | { done: number; total: number | null };
diff --git a/core/startos/bindings/Public.ts b/core/startos/bindings/Public.ts
index c913d8493..442176303 100644
--- a/core/startos/bindings/Public.ts
+++ b/core/startos/bindings/Public.ts
@@ -2,4 +2,8 @@
 import type { AllPackageData } from "./AllPackageData";
 import type { ServerInfo } from "./ServerInfo";
 
-export type Public = { serverInfo: ServerInfo, packageData: AllPackageData, ui: any, };
\ No newline at end of file
+export type Public = {
+  serverInfo: ServerInfo;
+  packageData: AllPackageData;
+  ui: any;
+};
diff --git a/core/startos/bindings/RemoveActionParams.ts b/core/startos/bindings/RemoveActionParams.ts
index ae2faccbe..fcd567c3f 100644
--- a/core/startos/bindings/RemoveActionParams.ts
+++ b/core/startos/bindings/RemoveActionParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type RemoveActionParams = { id: string, };
\ No newline at end of file
+export type RemoveActionParams = { id: string };
diff --git a/core/startos/bindings/RemoveAddressParams.ts b/core/startos/bindings/RemoveAddressParams.ts
index 2b9881ce1..578631d39 100644
--- a/core/startos/bindings/RemoveAddressParams.ts
+++ b/core/startos/bindings/RemoveAddressParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type RemoveAddressParams = { id: string, };
\ No newline at end of file
+export type RemoveAddressParams = { id: string };
diff --git a/core/startos/bindings/ReverseProxyBind.ts b/core/startos/bindings/ReverseProxyBind.ts
index 6c2d5a586..c9d67b127 100644
--- a/core/startos/bindings/ReverseProxyBind.ts
+++ b/core/startos/bindings/ReverseProxyBind.ts
@@ -1,3 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ReverseProxyBind = { ip: string | null, port: number, ssl: boolean, };
\ No newline at end of file
+export type ReverseProxyBind = {
+  ip: string | null;
+  port: number;
+  ssl: boolean;
+};
diff --git a/core/startos/bindings/ReverseProxyDestination.ts b/core/startos/bindings/ReverseProxyDestination.ts
index 8786f1008..216d1310f 100644
--- a/core/startos/bindings/ReverseProxyDestination.ts
+++ b/core/startos/bindings/ReverseProxyDestination.ts
@@ -1,3 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ReverseProxyDestination = { ip: string | null, port: number, ssl: boolean, };
\ No newline at end of file
+export type ReverseProxyDestination = {
+  ip: string | null;
+  port: number;
+  ssl: boolean;
+};
diff --git a/core/startos/bindings/ReverseProxyHttp.ts b/core/startos/bindings/ReverseProxyHttp.ts
index f7b652e6a..07cf41862 100644
--- a/core/startos/bindings/ReverseProxyHttp.ts
+++ b/core/startos/bindings/ReverseProxyHttp.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ReverseProxyHttp = { headers: null | {[key: string]: string}, };
\ No newline at end of file
+export type ReverseProxyHttp = { headers: null | { [key: string]: string } };
diff --git a/core/startos/bindings/ReverseProxyParams.ts b/core/startos/bindings/ReverseProxyParams.ts
index bc6d3016c..6f684b780 100644
--- a/core/startos/bindings/ReverseProxyParams.ts
+++ b/core/startos/bindings/ReverseProxyParams.ts
@@ -3,4 +3,8 @@ import type { ReverseProxyBind } from "./ReverseProxyBind";
 import type { ReverseProxyDestination } from "./ReverseProxyDestination";
 import type { ReverseProxyHttp } from "./ReverseProxyHttp";
 
-export type ReverseProxyParams = { bind: ReverseProxyBind, dst: ReverseProxyDestination, http: ReverseProxyHttp, };
\ No newline at end of file
+export type ReverseProxyParams = {
+  bind: ReverseProxyBind;
+  dst: ReverseProxyDestination;
+  http: ReverseProxyHttp;
+};
diff --git a/core/startos/bindings/Security.ts b/core/startos/bindings/Security.ts
index 390b6a91f..e722707df 100644
--- a/core/startos/bindings/Security.ts
+++ b/core/startos/bindings/Security.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Security = { ssl: boolean, };
\ No newline at end of file
+export type Security = { ssl: boolean };
diff --git a/core/startos/bindings/ServerInfo.ts b/core/startos/bindings/ServerInfo.ts
index 97cd77888..e505c84e7 100644
--- a/core/startos/bindings/ServerInfo.ts
+++ b/core/startos/bindings/ServerInfo.ts
@@ -4,12 +4,32 @@ import type { IpInfo } from "./IpInfo";
 import type { ServerStatus } from "./ServerStatus";
 import type { WifiInfo } from "./WifiInfo";
 
-export type ServerInfo = { arch: string, platform: string, id: string, hostname: string, version: string, lastBackup: string | null, 
-/**
- * Used in the wifi to determine the region to set the system to
- */
-lastWifiRegion: string | null, eosVersionCompat: string, lanAddress: string, onionAddress: string, 
-/**
- * for backwards compatibility
- */
-torAddress: string, ipInfo: { [key: string]: IpInfo }, statusInfo: ServerStatus, wifi: WifiInfo, unreadNotificationCount: number, passwordHash: string, pubkey: string, caFingerprint: string, ntpSynced: boolean, zram: boolean, governor: Governor | null, };
\ No newline at end of file
+export type ServerInfo = {
+  arch: string;
+  platform: string;
+  id: string;
+  hostname: string;
+  version: string;
+  lastBackup: string | null;
+  /**
+   * Used in the wifi to determine the region to set the system to
+   */
+  lastWifiRegion: string | null;
+  eosVersionCompat: string;
+  lanAddress: string;
+  onionAddress: string;
+  /**
+   * for backwards compatibility
+   */
+  torAddress: string;
+  ipInfo: { [key: string]: IpInfo };
+  statusInfo: ServerStatus;
+  wifi: WifiInfo;
+  unreadNotificationCount: number;
+  passwordHash: string;
+  pubkey: string;
+  caFingerprint: string;
+  ntpSynced: boolean;
+  zram: boolean;
+  governor: Governor | null;
+};
diff --git a/core/startos/bindings/ServerSpecs.ts b/core/startos/bindings/ServerSpecs.ts
index ec464c8df..b2278873c 100644
--- a/core/startos/bindings/ServerSpecs.ts
+++ b/core/startos/bindings/ServerSpecs.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ServerSpecs = { cpu: string, disk: string, memory: string, };
\ No newline at end of file
+export type ServerSpecs = { cpu: string; disk: string; memory: string };
diff --git a/core/startos/bindings/ServerStatus.ts b/core/startos/bindings/ServerStatus.ts
index 0d31f74ea..e72d5d6de 100644
--- a/core/startos/bindings/ServerStatus.ts
+++ b/core/startos/bindings/ServerStatus.ts
@@ -3,4 +3,10 @@ import type { BackupProgress } from "./BackupProgress";
 import type { PackageId } from "./PackageId";
 import type { UpdateProgress } from "./UpdateProgress";
 
-export type ServerStatus = { backupProgress: { [key: PackageId]: BackupProgress } | null, updated: boolean, updateProgress: UpdateProgress | null, shuttingDown: boolean, restarting: boolean, };
\ No newline at end of file
+export type ServerStatus = {
+  backupProgress: { [key: PackageId]: BackupProgress } | null;
+  updated: boolean;
+  updateProgress: UpdateProgress | null;
+  shuttingDown: boolean;
+  restarting: boolean;
+};
diff --git a/core/startos/bindings/ServiceInterface.ts b/core/startos/bindings/ServiceInterface.ts
index 2d484d749..4167257bb 100644
--- a/core/startos/bindings/ServiceInterface.ts
+++ b/core/startos/bindings/ServiceInterface.ts
@@ -3,4 +3,13 @@ import type { AddressInfo } from "./AddressInfo";
 import type { ServiceInterfaceId } from "./ServiceInterfaceId";
 import type { ServiceInterfaceType } from "./ServiceInterfaceType";
 
-export type ServiceInterface = { id: ServiceInterfaceId, name: string, description: string, hasPrimary: boolean, disabled: boolean, masked: boolean, addressInfo: AddressInfo, type: ServiceInterfaceType, };
\ No newline at end of file
+export type ServiceInterface = {
+  id: ServiceInterfaceId;
+  name: string;
+  description: string;
+  hasPrimary: boolean;
+  disabled: boolean;
+  masked: boolean;
+  addressInfo: AddressInfo;
+  type: ServiceInterfaceType;
+};
diff --git a/core/startos/bindings/ServiceInterfaceId.ts b/core/startos/bindings/ServiceInterfaceId.ts
index 87edd8694..55315ab60 100644
--- a/core/startos/bindings/ServiceInterfaceId.ts
+++ b/core/startos/bindings/ServiceInterfaceId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ServiceInterfaceId = string;
\ No newline at end of file
+export type ServiceInterfaceId = string;
diff --git a/core/startos/bindings/ServiceInterfaceType.ts b/core/startos/bindings/ServiceInterfaceType.ts
index 74372d4ad..fadd11f9d 100644
--- a/core/startos/bindings/ServiceInterfaceType.ts
+++ b/core/startos/bindings/ServiceInterfaceType.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ServiceInterfaceType = "ui" | "p2p" | "api";
\ No newline at end of file
+export type ServiceInterfaceType = "ui" | "p2p" | "api";
diff --git a/core/startos/bindings/ServiceInterfaceWithHostInfo.ts b/core/startos/bindings/ServiceInterfaceWithHostInfo.ts
index 449c5b29d..bef83abe2 100644
--- a/core/startos/bindings/ServiceInterfaceWithHostInfo.ts
+++ b/core/startos/bindings/ServiceInterfaceWithHostInfo.ts
@@ -4,4 +4,14 @@ import type { ExportedHostInfo } from "./ExportedHostInfo";
 import type { ServiceInterfaceId } from "./ServiceInterfaceId";
 import type { ServiceInterfaceType } from "./ServiceInterfaceType";
 
-export type ServiceInterfaceWithHostInfo = { hostInfo: ExportedHostInfo, id: ServiceInterfaceId, name: string, description: string, hasPrimary: boolean, disabled: boolean, masked: boolean, addressInfo: AddressInfo, type: ServiceInterfaceType, };
\ No newline at end of file
+export type ServiceInterfaceWithHostInfo = {
+  hostInfo: ExportedHostInfo;
+  id: ServiceInterfaceId;
+  name: string;
+  description: string;
+  hasPrimary: boolean;
+  disabled: boolean;
+  masked: boolean;
+  addressInfo: AddressInfo;
+  type: ServiceInterfaceType;
+};
diff --git a/core/startos/bindings/SetConfigured.ts b/core/startos/bindings/SetConfigured.ts
index 8f191b562..ff9eaf11d 100644
--- a/core/startos/bindings/SetConfigured.ts
+++ b/core/startos/bindings/SetConfigured.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type SetConfigured = { configured: boolean, };
\ No newline at end of file
+export type SetConfigured = { configured: boolean };
diff --git a/core/startos/bindings/SetDependenciesParams.ts b/core/startos/bindings/SetDependenciesParams.ts
index b313b0718..d4d2d45cb 100644
--- a/core/startos/bindings/SetDependenciesParams.ts
+++ b/core/startos/bindings/SetDependenciesParams.ts
@@ -1,4 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DependencyRequirement } from "./DependencyRequirement";
 
-export type SetDependenciesParams = { dependencies: Array<DependencyRequirement>, };
\ No newline at end of file
+export type SetDependenciesParams = {
+  dependencies: Array<DependencyRequirement>;
+};
diff --git a/core/startos/bindings/SetHealth.ts b/core/startos/bindings/SetHealth.ts
index cc8193863..8a4a1bcff 100644
--- a/core/startos/bindings/SetHealth.ts
+++ b/core/startos/bindings/SetHealth.ts
@@ -1,4 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { HealthCheckId } from "./HealthCheckId";
 
-export type SetHealth = { id: HealthCheckId, name: string, } & ({ "result": "success", message: string, } | { "result": "disabled" } | { "result": "starting" } | { "result": "loading", message: string, } | { "result": "failure", message: string, });
\ No newline at end of file
+export type SetHealth = { id: HealthCheckId; name: string } & (
+  | { result: "success"; message: string | null }
+  | { result: "disabled"; message: string | null }
+  | { result: "starting"; message: string | null }
+  | { result: "loading"; message: string }
+  | { result: "failure"; message: string }
+);
diff --git a/core/startos/bindings/SetMainStatus.ts b/core/startos/bindings/SetMainStatus.ts
index 0476ff4ce..653342e5f 100644
--- a/core/startos/bindings/SetMainStatus.ts
+++ b/core/startos/bindings/SetMainStatus.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Status } from "./Status";
 
-export type SetMainStatus = { status: Status, };
\ No newline at end of file
+export type SetMainStatus = { status: Status };
diff --git a/core/startos/bindings/SetStoreParams.ts b/core/startos/bindings/SetStoreParams.ts
index e3496a171..8737295bd 100644
--- a/core/startos/bindings/SetStoreParams.ts
+++ b/core/startos/bindings/SetStoreParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type SetStoreParams = { value: any, path: string, };
\ No newline at end of file
+export type SetStoreParams = { value: any; path: string };
diff --git a/core/startos/bindings/Status.ts b/core/startos/bindings/Status.ts
index 73894287a..e23c5b4be 100644
--- a/core/startos/bindings/Status.ts
+++ b/core/startos/bindings/Status.ts
@@ -2,4 +2,8 @@
 import type { DependencyConfigErrors } from "./DependencyConfigErrors";
 import type { MainStatus } from "./MainStatus";
 
-export type Status = { configured: boolean, main: MainStatus, dependencyConfigErrors: DependencyConfigErrors, };
\ No newline at end of file
+export type Status = {
+  configured: boolean;
+  main: MainStatus;
+  dependencyConfigErrors: DependencyConfigErrors;
+};
diff --git a/core/startos/bindings/UpdateProgress.ts b/core/startos/bindings/UpdateProgress.ts
index ef6473f37..3d07c56b4 100644
--- a/core/startos/bindings/UpdateProgress.ts
+++ b/core/startos/bindings/UpdateProgress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type UpdateProgress = { size: number | null, downloaded: number, };
\ No newline at end of file
+export type UpdateProgress = { size: number | null; downloaded: number };
diff --git a/core/startos/bindings/UpdatingState.ts b/core/startos/bindings/UpdatingState.ts
index ce994ce33..37a83f0df 100644
--- a/core/startos/bindings/UpdatingState.ts
+++ b/core/startos/bindings/UpdatingState.ts
@@ -2,4 +2,7 @@
 import type { InstallingInfo } from "./InstallingInfo";
 import type { Manifest } from "./Manifest";
 
-export type UpdatingState = { manifest: Manifest, installingInfo: InstallingInfo, };
\ No newline at end of file
+export type UpdatingState = {
+  manifest: Manifest;
+  installingInfo: InstallingInfo;
+};
diff --git a/core/startos/bindings/VolumeId.ts b/core/startos/bindings/VolumeId.ts
index b5e798c8b..e5c63994e 100644
--- a/core/startos/bindings/VolumeId.ts
+++ b/core/startos/bindings/VolumeId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type VolumeId = string;
\ No newline at end of file
+export type VolumeId = string;
diff --git a/core/startos/bindings/WifiInfo.ts b/core/startos/bindings/WifiInfo.ts
index e1debf26b..c949b1e76 100644
--- a/core/startos/bindings/WifiInfo.ts
+++ b/core/startos/bindings/WifiInfo.ts
@@ -1,3 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type WifiInfo = { ssids: Array<string>, selected: string | null, connected: string | null, };
\ No newline at end of file
+export type WifiInfo = {
+  ssids: Array<string>;
+  selected: string | null;
+  connected: string | null;
+};
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index 8629976a0..cd5616527 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -14,9 +14,9 @@ pub struct HealthCheckResult {
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "result")]
 pub enum HealthCheckResultKind {
-    Success { message: String },
-    Disabled,
-    Starting,
+    Success { message: Option<String> },
+    Disabled { message: Option<String> },
+    Starting { message: Option<String> },
     Loading { message: String },
     Failure { message: String },
 }
@@ -25,10 +25,26 @@ impl std::fmt::Display for HealthCheckResult {
         let name = &self.name;
         match &self.kind {
             HealthCheckResultKind::Success { message } => {
-                write!(f, "{name}: Succeeded ({message})")
+                if let Some(message) = message {
+                    write!(f, "{name}: Succeeded ({message})")
+                } else {
+                    write!(f, "{name}: Succeeded")
+                }
+            }
+            HealthCheckResultKind::Disabled { message } => {
+                if let Some(message) = message {
+                    write!(f, "{name}: Disabled ({message})")
+                } else {
+                    write!(f, "{name}: Disabled")
+                }
+            }
+            HealthCheckResultKind::Starting { message } => {
+                if let Some(message) = message {
+                    write!(f, "{name}: Starting ({message})")
+                } else {
+                    write!(f, "{name}: Starting")
+                }
             }
-            HealthCheckResultKind::Disabled => write!(f, "{name}: Disabled"),
-            HealthCheckResultKind::Starting => write!(f, "{name}: Starting"),
             HealthCheckResultKind::Loading { message } => write!(f, "{name}: Loading ({message})"),
             HealthCheckResultKind::Failure { message } => write!(f, "{name}: Failed ({message})"),
         }
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 3a8365b67..5d876cf30 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -101,6 +101,7 @@ export const mockPatchData: DataModel = {
             'ephemeral-health-check': {
               name: 'Ephemeral Health Check',
               result: 'starting',
+              message: null,
             },
             'chain-state': {
               name: 'Chain State',
@@ -120,6 +121,7 @@ export const mockPatchData: DataModel = {
             'unnecessary-health-check': {
               name: 'Unnecessary Health Check',
               result: 'disabled',
+              message: null,
             },
           },
         },

From 6e76bcb77e8921e193db2be46a7d18f2900dec42 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Thu, 28 Mar 2024 11:59:42 -0600
Subject: [PATCH 108/341] fix updates rendering bug

---
 web/projects/ui/src/app/pages/updates/updates.page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/projects/ui/src/app/pages/updates/updates.page.html b/web/projects/ui/src/app/pages/updates/updates.page.html
index ca71bb6b3..2bb3860c6 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.html
+++ b/web/projects/ui/src/app/pages/updates/updates.page.html
@@ -60,7 +60,7 @@ <h2 class="inline">
                     >
                       <round-progress
                         [current]="(local.stateInfo.installingInfo.progress.overall | installingProgress) || 0"
-                        [max]="100"
+                        [max]="1"
                         [radius]="13"
                         [stroke]="3"
                         [rounded]="true"

From 9f3902b48db371a9d229d7c8dda4e86f375ab37d Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 28 Mar 2024 13:37:15 -0600
Subject: [PATCH 109/341] chore: Fix the last of the actions

---
 container-runtime/src/Models/JsonPath.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container-runtime/src/Models/JsonPath.ts b/container-runtime/src/Models/JsonPath.ts
index 773331b19..314019154 100644
--- a/container-runtime/src/Models/JsonPath.ts
+++ b/container-runtime/src/Models/JsonPath.ts
@@ -15,10 +15,10 @@ export function unNestPath<A extends string>(a: A): UnNestPaths<A> {
 function isNestedPath(path: string): path is NestedPaths {
   const paths = path.split("/")
   if (paths.length !== 4) return false
-  if (paths[1] === "action" && (paths[3] === "run" || paths[3] === "get"))
+  if (paths[1] === "actions" && (paths[3] === "run" || paths[3] === "get"))
     return true
   if (
-    paths[1] === "dependencyConfig" &&
+    paths[1] === "dependencies" &&
     (paths[3] === "query" || paths[3] === "update")
   )
     return true

From 92be4e774e861e7c6a82e93b448d7ac5c0c4e7fe Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 28 Mar 2024 14:48:45 -0600
Subject: [PATCH 110/341] build fixes

---
 Makefile                              |  4 +++-
 core/startos/src/net/static_server.rs | 14 +++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 9a6dee60f..85bc2e7bd 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,8 @@ format:
 
 test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
 	cd core && cargo build && cargo test
+	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
+	(cd sdk && make test)
 
 cli:
 	cd core && ./install-cli.sh
@@ -173,7 +175,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 	npm --prefix container-runtime ci
 	touch container-runtime/node_modules
 
-core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE) $(PLATFORM_FILE)
+core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*') $(ENVIRONMENT_FILE)
 	rm -rf core/startos/bindings
 	(cd core/ && cargo test)
 	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index e8207e3bf..f7fc2969f 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -33,11 +33,15 @@ use crate::middleware::db::SyncDb;
 use crate::middleware::diagnostic::DiagnosticMode;
 use crate::{diagnostic_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt};
 
-static NOT_FOUND: &[u8] = b"Not Found";
-static METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
-static NOT_AUTHORIZED: &[u8] = b"Not Authorized";
-
-static EMBEDDED_UIS: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/static");
+const NOT_FOUND: &[u8] = b"Not Found";
+const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
+const NOT_AUTHORIZED: &[u8] = b"Not Authorized";
+
+#[cfg(all(feature = "daemon", not(test)))]
+const EMBEDDED_UIS: Dir<'_> =
+    include_dir::include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/static");
+#[cfg(not(all(feature = "daemon", not(test))))]
+const EMBEDDED_UIS: Dir<'_> = Dir::new("", &[]);
 
 const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "user-agent"];
 

From 7c63d4012f415e96702de35010fbd22aefbe5595 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 28 Mar 2024 15:31:54 -0600
Subject: [PATCH 111/341] fix build

---
 Makefile                              | 6 +++---
 core/startos/Cargo.toml               | 3 ++-
 core/startos/src/net/static_server.rs | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 85bc2e7bd..83c1f31b8 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ STARTD_SRC := core/startos/startd.service $(BUILD_SRC)
 COMPAT_SRC := $(shell git ls-files system-images/compat/)
 UTILS_SRC := $(shell git ls-files system-images/utils/)
 BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
-CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
+CORE_SRC := $(shell git ls-files -- core ':!:core/startos/bindings/*) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
 WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules web/config.json patch-db/client/dist web/patchdb-ui-seed.json
 WEB_UI_SRC := $(shell git ls-files web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
@@ -88,7 +88,7 @@ format:
 	cd core && cargo +nightly fmt
 
 test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
-	cd core && cargo build && cargo test
+	(cd core && cargo build && cargo test)
 	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
 	(cd sdk && make test)
 
@@ -177,7 +177,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 
 core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*') $(ENVIRONMENT_FILE)
 	rm -rf core/startos/bindings
-	(cd core/ && cargo test)
+	(cd core/ && cargo test --features=test)
 	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
 
 sdk/lib/test: $(shell git ls-files sdk) core/startos/bindings
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index ec4e978bf..d1a333447 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -41,6 +41,7 @@ default = ["cli", "daemon"]
 dev = []
 unstable = ["console-subscriber", "tokio/tracing"]
 docker = []
+test = []
 
 [dependencies]
 aes = { version = "0.7.5", features = ["ctr"] }
@@ -75,7 +76,7 @@ ed25519-dalek = { version = "2.1.1", features = [
   "zeroize",
   "rand_core",
   "digest",
-  "pkcs8"
+  "pkcs8",
 ] }
 ed25519-dalek-v1 = { package = "ed25519-dalek", version = "1" }
 emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index f7fc2969f..fa71672b3 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -14,7 +14,7 @@ use futures::future::ready;
 use http::header::ACCEPT_ENCODING;
 use http::request::Parts as RequestParts;
 use http::{HeaderMap, Method, StatusCode};
-use include_dir::{include_dir, Dir};
+use include_dir::Dir;
 use new_mime_guess::MimeGuess;
 use openssl::hash::MessageDigest;
 use openssl::x509::X509;
@@ -37,10 +37,10 @@ const NOT_FOUND: &[u8] = b"Not Found";
 const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
 const NOT_AUTHORIZED: &[u8] = b"Not Authorized";
 
-#[cfg(all(feature = "daemon", not(test)))]
+#[cfg(all(feature = "daemon", not(feature = "test")))]
 const EMBEDDED_UIS: Dir<'_> =
     include_dir::include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/static");
-#[cfg(not(all(feature = "daemon", not(test))))]
+#[cfg(not(all(feature = "daemon", not(feature = "test"))))]
 const EMBEDDED_UIS: Dir<'_> = Dir::new("", &[]);
 
 const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "user-agent"];

From 665eef68b97f1984381137897464377f357f4353 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 28 Mar 2024 16:36:58 -0600
Subject: [PATCH 112/341] fix unterminated quote

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 83c1f31b8..413aa186e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ STARTD_SRC := core/startos/startd.service $(BUILD_SRC)
 COMPAT_SRC := $(shell git ls-files system-images/compat/)
 UTILS_SRC := $(shell git ls-files system-images/utils/)
 BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
-CORE_SRC := $(shell git ls-files -- core ':!:core/startos/bindings/*) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
+CORE_SRC := $(shell git ls-files -- core ':!:core/startos/bindings/*') $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
 WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules web/config.json patch-db/client/dist web/patchdb-ui-seed.json
 WEB_UI_SRC := $(shell git ls-files web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)

From e7426ea365a610301fb967f0645aa400b5ec379a Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 28 Mar 2024 17:11:43 -0600
Subject: [PATCH 113/341] touch bindings before make touch

---
 .github/workflows/startos-iso.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 47e0266cd..e7ce54427 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -169,6 +169,7 @@ jobs:
       - name: Prevent rebuild of compiled artifacts
         run: |
           mkdir -p web/dist/raw
+          touch core/startos/bindings
           PLATFORM=${{ matrix.platform }} make -t compiled-${{ env.ARCH }}.tar
 
       - name: Run iso build

From 46412acd13df3d5f76a92023cd8b31af8e9be9d3 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 28 Mar 2024 23:31:27 -0600
Subject: [PATCH 114/341] add container runtime to compiled tar

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 413aa186e..f6cc6b21b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ WEB_INSTALL_WIZARD_SRC := $(shell git ls-files web/projects/install-wizard)
 PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client)
 GZIP_BIN := $(shell which pigz || which gzip)
 TAR_BIN := $(shell which gtar || which tar)
-COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar
+COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar build/lib/container-runtime/rootfs.squashfs
 ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) sdk/lib/test 
 
 ifeq ($(REMOTE),)

From 94f1562ec5788e1b7193e19cbe4bb5dd3b233a65 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 09:16:15 -0600
Subject: [PATCH 115/341] choose base image by arch instead of platform

---
 Makefile                                 | 12 +++++++-----
 build/.gitignore                         |  3 +--
 container-runtime/.gitignore             |  2 +-
 container-runtime/download-base-image.sh | 11 ++++++-----
 container-runtime/update-image.sh        |  6 +++---
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index f6cc6b21b..9c6f89003 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo
 BINS := core/target/$(ARCH)-unknown-linux-musl/release/startbox core/target/$(ARCH)-unknown-linux-musl/release/containerbox
 WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/diagnostic-ui web/dist/raw/install-wizard
 FIRMWARE_ROMS := ./firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json)
-BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts build/lib/container-runtime/rootfs.squashfs $(FIRMWARE_ROMS)
+BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts container-runtime/rootfs.$(ARCH).squashfs $(FIRMWARE_ROMS)
 DEBIAN_SRC := $(shell git ls-files debian/)
 IMAGE_RECIPE_SRC := $(shell git ls-files image-recipe/)
 STARTD_SRC := core/startos/startd.service $(BUILD_SRC)
@@ -25,7 +25,7 @@ WEB_INSTALL_WIZARD_SRC := $(shell git ls-files web/projects/install-wizard)
 PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client)
 GZIP_BIN := $(shell which pigz || which gzip)
 TAR_BIN := $(shell which gtar || which tar)
-COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar build/lib/container-runtime/rootfs.squashfs
+COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar container-runtime/rootfs.$(ARCH).squashfs
 ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) sdk/lib/test 
 
 ifeq ($(REMOTE),)
@@ -76,7 +76,7 @@ clean:
 	rm -rf build/lib/firmware
 	rm -rf container-runtime/dist
 	rm -rf container-runtime/node_modules
-	rm -f build/lib/container-runtime/rootfs.squashfs
+	rm -f container-runtime/*.squashfs
 	rm -rf sdk/dist
 	rm -rf sdk/node_modules
 	rm -f ENVIRONMENT.txt
@@ -127,6 +127,8 @@ install: $(ALL_TARGETS)
 	$(call mkdir,$(DESTDIR)/usr/lib)
 	$(call rm,$(DESTDIR)/usr/lib/startos)
 	$(call cp,build/lib,$(DESTDIR)/usr/lib/startos)
+	$(call mkdir,$(DESTDIR)/usr/lib/startos/container-runtime)
+	$(call cp,container-runtime/rootfs.$(ARCH).squashfs,$(DESTDIR)/usr/lib/startos/container-runtime/rootfs.squashfs)
 
 	$(call cp,PLATFORM.txt,$(DESTDIR)/usr/lib/startos/PLATFORM.txt)
 	$(call cp,ENVIRONMENT.txt,$(DESTDIR)/usr/lib/startos/ENVIRONMENT.txt)
@@ -168,7 +170,7 @@ emulate-reflash: $(ALL_TARGETS)
 upload-ota: results/$(BASENAME).squashfs
 	TARGET=$(TARGET) KEY=$(KEY) ./upload-ota.sh
 
-container-runtime/alpine.squashfs: $(PLATFORM_FILE)
+container-runtime/alpine.$(ARCH).squashfs:
 	ARCH=$(ARCH) ./container-runtime/download-base-image.sh
 
 container-runtime/node_modules: container-runtime/package.json container-runtime/package-lock.json sdk/dist
@@ -193,7 +195,7 @@ container-runtime/dist/node_modules container-runtime/dist/package.json containe
 	./container-runtime/install-dist-deps.sh
 	touch container-runtime/dist/node_modules
 
-build/lib/container-runtime/rootfs.squashfs: container-runtime/alpine.squashfs container-runtime/containerRuntime.rc container-runtime/update-image.sh container-runtime/dist container-runtime/dist/node_modules core/target/$(ARCH)-unknown-linux-musl/release/containerbox $(PLATFORM_FILE) | sudo
+container-runtime/rootfs.$(ARCH).squashfs: container-runtime/alpine.$(ARCH).squashfs container-runtime/containerRuntime.rc container-runtime/update-image.sh container-runtime/dist container-runtime/dist/node_modules core/target/$(ARCH)-unknown-linux-musl/release/containerbox | sudo
 	ARCH=$(ARCH) ./container-runtime/update-image.sh
 
 build/lib/depends build/lib/conflicts: build/dpkg-deps/*
diff --git a/build/.gitignore b/build/.gitignore
index f24aa0255..497f4b913 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,3 +1,2 @@
 /lib/depends
-/lib/conflicts
-/lib/container-runtime/rootfs.squashfs
\ No newline at end of file
+/lib/conflicts
\ No newline at end of file
diff --git a/container-runtime/.gitignore b/container-runtime/.gitignore
index 1764c1d17..8aa4208b7 100644
--- a/container-runtime/.gitignore
+++ b/container-runtime/.gitignore
@@ -4,5 +4,5 @@ bundle.js
 startInit.js
 service/
 service.js
-alpine.squashfs
+*.squashfs
 /tmp
\ No newline at end of file
diff --git a/container-runtime/download-base-image.sh b/container-runtime/download-base-image.sh
index e708478e1..23a140ea5 100755
--- a/container-runtime/download-base-image.sh
+++ b/container-runtime/download-base-image.sh
@@ -9,10 +9,11 @@ VERSION=3.19
 ARCH=${ARCH:-$(uname -m)}
 FLAVOR=default
 
-if [ "$ARCH" = "x86_64" ]; then
-    ARCH=amd64
-elif [ "$ARCH" = "aarch64" ]; then
-    ARCH=arm64
+_ARCH=$ARCH
+if [ "$_ARCH" = "x86_64" ]; then
+    _ARCH=amd64
+elif [ "$_ARCH" = "aarch64" ]; then
+    _ARCH=arm64
 fi
 
-curl https://images.linuxcontainers.org/$(curl --silent https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs --output alpine.squashfs
\ No newline at end of file
+curl https://images.linuxcontainers.org/$(curl --silent https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$_ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs --output alpine.${ARCH}.squashfs
\ No newline at end of file
diff --git a/container-runtime/update-image.sh b/container-runtime/update-image.sh
index 64ca503cf..e0d5dc0c3 100755
--- a/container-runtime/update-image.sh
+++ b/container-runtime/update-image.sh
@@ -9,7 +9,7 @@ set -e
 if mountpoint tmp/combined; then sudo umount tmp/combined; fi
 if mountpoint tmp/lower; then sudo umount tmp/lower; fi
 mkdir -p tmp/lower tmp/upper tmp/work tmp/combined
-sudo mount alpine.squashfs tmp/lower
+sudo mount alpine.${ARCH}.squashfs tmp/lower
 sudo mount -t overlay -olowerdir=tmp/lower,upperdir=tmp/upper,workdir=tmp/work overlay tmp/combined
 
 QEMU=
@@ -33,9 +33,9 @@ fi
 
 sudo truncate -s 0 tmp/combined/etc/resolv.conf
 sudo chown -R 0:0 tmp/combined
-rm -f ../build/lib/container-runtime/rootfs.squashfs
+rm -f rootfs.${ARCH}.squashfs
 mkdir -p ../build/lib/container-runtime
-sudo mksquashfs tmp/combined ../build/lib/container-runtime/rootfs.squashfs
+sudo mksquashfs tmp/combined rootfs.${ARCH}.squashfs
 sudo umount tmp/combined
 sudo umount tmp/lower
 sudo rm -rf tmp
\ No newline at end of file

From 61f68d9e1b76d80ef11e45f706b70a737cee4377 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 09:49:05 -0600
Subject: [PATCH 116/341] install qemu

---
 .github/workflows/startos-iso.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index e7ce54427..1df490155 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -79,9 +79,12 @@ jobs:
         with:
           node-version: ${{ env.NODEJS_VERSION }}
 
-      - name: Set up QEMU
+      - name: Set up docker QEMU
         uses: docker/setup-qemu-action@v2
 
+      - name: Set up system QEMU
+        run: apt-get update && apt-get install -y qemu-user-static
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 

From 3bab7678b7b56e75a775e54e7445b28ab76a9858 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 10:05:24 -0600
Subject: [PATCH 117/341] install qemu as root

---
 .github/workflows/startos-iso.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 1df490155..75aa42578 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -83,7 +83,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Set up system QEMU
-        run: apt-get update && apt-get install -y qemu-user-static
+        run: sudo apt-get update && sudo apt-get install -y qemu-user-static
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

From 44e856e8dc13231ae91a16ae81ff5cf79cdbd5bc Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 12:18:40 -0600
Subject: [PATCH 118/341] fix make -t

---
 .github/workflows/startos-iso.yaml | 1 +
 Makefile                           | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 75aa42578..184c2b0c7 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -173,6 +173,7 @@ jobs:
         run: |
           mkdir -p web/dist/raw
           touch core/startos/bindings
+          mkdir -p container-runtime/dist
           PLATFORM=${{ matrix.platform }} make -t compiled-${{ env.ARCH }}.tar
 
       - name: Run iso build
diff --git a/Makefile b/Makefile
index 9c6f89003..11428a7ce 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,9 @@ endif
 
 all: $(ALL_TARGETS)
 
+touch:
+	touch $(ALL_TARGETS)
+
 metadata: $(VERSION_FILE) $(PLATFORM_FILE) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE)
 
 sudo:
@@ -188,14 +191,15 @@ sdk/lib/test: $(shell git ls-files sdk) core/startos/bindings
 sdk/dist: $(shell git ls-files sdk) core/startos/bindings
 	(cd sdk && make bundle)
 
-container-runtime/dist: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
+# TODO: make container-runtime its own makefile?
+container-runtime/dist/index.js: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
 	npm --prefix container-runtime run build
 
 container-runtime/dist/node_modules container-runtime/dist/package.json container-runtime/dist/package-lock.json: container-runtime/package.json container-runtime/package-lock.json sdk/dist container-runtime/install-dist-deps.sh
 	./container-runtime/install-dist-deps.sh
 	touch container-runtime/dist/node_modules
 
-container-runtime/rootfs.$(ARCH).squashfs: container-runtime/alpine.$(ARCH).squashfs container-runtime/containerRuntime.rc container-runtime/update-image.sh container-runtime/dist container-runtime/dist/node_modules core/target/$(ARCH)-unknown-linux-musl/release/containerbox | sudo
+container-runtime/rootfs.$(ARCH).squashfs: container-runtime/alpine.$(ARCH).squashfs container-runtime/containerRuntime.rc container-runtime/update-image.sh container-runtime/dist/index.js container-runtime/dist/node_modules core/target/$(ARCH)-unknown-linux-musl/release/containerbox | sudo
 	ARCH=$(ARCH) ./container-runtime/update-image.sh
 
 build/lib/depends build/lib/conflicts: build/dpkg-deps/*

From bec63a94718aded542d054bab577d0137b5e5497 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 13:06:51 -0600
Subject: [PATCH 119/341] remove extra sdk test line

---
 Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile b/Makefile
index 11428a7ce..b0dcf5830 100644
--- a/Makefile
+++ b/Makefile
@@ -185,9 +185,6 @@ core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*'
 	(cd core/ && cargo test --features=test)
 	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
 
-sdk/lib/test: $(shell git ls-files sdk) core/startos/bindings
-	(cd sdk && make test)
-
 sdk/dist: $(shell git ls-files sdk) core/startos/bindings
 	(cd sdk && make bundle)
 

From 1acdd67fd996751b6699b1809f3064f6eff9646a Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 13:41:41 -0600
Subject: [PATCH 120/341] chown volume mountpoints

---
 .../src/service/persistent_container.rs       | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index a3756b37a..038661ace 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -116,6 +116,16 @@ impl PersistentContainer {
         .await?;
         let mut volumes = BTreeMap::new();
         for volume in &s9pk.as_manifest().volumes {
+            let mountpoint = lxc_container
+                .rootfs_dir()
+                .join("media/startos/volumes")
+                .join(volume);
+            tokio::fs::create_dir_all(&mountpoint).await?;
+            Command::new("chown")
+                .arg("100000:100000")
+                .arg(&mountpoint)
+                .invoke(crate::ErrorKind::Filesystem)
+                .await?;
             let mount = MountGuard::mount(
                 &IdMapped::new(
                     Bind::new(data_dir(&ctx.datadir, &s9pk.as_manifest().id, volume)),
@@ -123,10 +133,7 @@ impl PersistentContainer {
                     100000,
                     65536,
                 ),
-                lxc_container
-                    .rootfs_dir()
-                    .join("media/startos/volumes")
-                    .join(volume),
+                mountpoint,
                 MountType::ReadWrite,
             )
             .await?;
@@ -134,6 +141,16 @@ impl PersistentContainer {
         }
         let mut assets = BTreeMap::new();
         for asset in &s9pk.as_manifest().assets {
+            let mountpoint = lxc_container
+                .rootfs_dir()
+                .join("media/startos/assets")
+                .join(asset);
+            tokio::fs::create_dir_all(&mountpoint).await?;
+            Command::new("chown")
+                .arg("100000:100000")
+                .arg(&mountpoint)
+                .invoke(crate::ErrorKind::Filesystem)
+                .await?;
             assets.insert(
                 asset.clone(),
                 MountGuard::mount(
@@ -145,10 +162,7 @@ impl PersistentContainer {
                         )
                         .join(asset),
                     ),
-                    lxc_container
-                        .rootfs_dir()
-                        .join("media/startos/assets")
-                        .join(asset),
+                    mountpoint,
                     MountType::ReadWrite,
                 )
                 .await?,

From 231859303df81500a70ef0d572a16ab52de362d8 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 13:49:05 -0600
Subject: [PATCH 121/341] fix cargo dep

---
 build-cargo-dep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-cargo-dep.sh b/build-cargo-dep.sh
index 5c8f9ceed..9e20f0caf 100755
--- a/build-cargo-dep.sh
+++ b/build-cargo-dep.sh
@@ -18,7 +18,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 mkdir -p cargo-deps
-alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)"/cargo-deps:/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
 
 rust-musl-builder cargo install "$1" --target-dir /home/rust/src --target=$ARCH-unknown-linux-musl
 sudo chown -R $USER cargo-deps

From b6992e32a54513433c87d142c2485dfceb58bb97 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 14:42:33 -0600
Subject: [PATCH 122/341] yes

---
 image-recipe/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 28aa574ae..7a8ac4c13 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -217,7 +217,7 @@ if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 	ln -sf /usr/bin/pi-beep /usr/local/bin/beep
 	wget https://archive.raspberrypi.org/debian/pool/main/w/wireless-regdb/wireless-regdb_2018.05.09-0~rpt1_all.deb
 	echo 1b7b1076257726609535b71d146a5721622d19a0843061ee7568188e836dd10f wireless-regdb_2018.05.09-0~rpt1_all.deb | sha256sum -c
-	apt-get install ./wireless-regdb_2018.05.09-0~rpt1_all.deb
+	apt-get install -y ./wireless-regdb_2018.05.09-0~rpt1_all.deb
 	rm wireless-regdb_2018.05.09-0~rpt1_all.deb
 fi
 

From 4d6dd44e107664e38034d99f0052b6f9ab9cd71f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 29 Mar 2024 15:35:33 -0600
Subject: [PATCH 123/341] allow downgrades

---
 image-recipe/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 7a8ac4c13..7aae39c7f 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -217,7 +217,7 @@ if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 	ln -sf /usr/bin/pi-beep /usr/local/bin/beep
 	wget https://archive.raspberrypi.org/debian/pool/main/w/wireless-regdb/wireless-regdb_2018.05.09-0~rpt1_all.deb
 	echo 1b7b1076257726609535b71d146a5721622d19a0843061ee7568188e836dd10f wireless-regdb_2018.05.09-0~rpt1_all.deb | sha256sum -c
-	apt-get install -y ./wireless-regdb_2018.05.09-0~rpt1_all.deb
+	apt-get install -y --allow-downgrades ./wireless-regdb_2018.05.09-0~rpt1_all.deb
 	rm wireless-regdb_2018.05.09-0~rpt1_all.deb
 fi
 

From 8dfc5052e9bea9303261631295c9400f0a2d9235 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Sat, 30 Mar 2024 10:37:31 -0600
Subject: [PATCH 124/341] ditch more FE enums for clarity and cleanliness

---
 .../app/components/status/status.component.ts |   2 -
 .../apps-routes/app-show/app-show.page.html   |   4 +-
 .../apps-routes/app-show/app-show.page.ts     |  13 +-
 .../app-show-status.component.ts              |  11 +-
 .../built-in/health/health.component.ts       |   8 +-
 .../ui/src/app/services/api/api.types.ts      |  23 +---
 .../ui/src/app/services/dep-error.service.ts  |  60 ++-------
 .../services/pkg-status-rendering.service.ts  | 120 +++++++-----------
 .../ui/src/app/util/get-package-info.ts       |  13 +-
 9 files changed, 82 insertions(+), 172 deletions(-)

diff --git a/web/projects/ui/src/app/components/status/status.component.ts b/web/projects/ui/src/app/components/status/status.component.ts
index 03894406e..c9fec4968 100644
--- a/web/projects/ui/src/app/components/status/status.component.ts
+++ b/web/projects/ui/src/app/components/status/status.component.ts
@@ -3,7 +3,6 @@ import { ConnectionService } from 'src/app/services/connection.service'
 import { InstallingInfo } from 'src/app/services/patch-db/data-model'
 import {
   PrimaryRendering,
-  PrimaryStatus,
   StatusRendering,
 } from 'src/app/services/pkg-status-rendering.service'
 
@@ -13,7 +12,6 @@ import {
   styleUrls: ['./status.component.scss'],
 })
 export class StatusComponent {
-  PS = PrimaryStatus
   PR = PrimaryRendering
 
   @Input() rendering!: StatusRendering
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index 238d1d208..5b3123131 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -17,9 +17,9 @@
       <ion-item-group *ngIf="pkgPlus.status as status">
         <!-- ** status ** -->
         <app-show-status [pkg]="pkg" [status]="status"></app-show-status>
-        <!-- ** installed && !backing-up ** -->
+        <!-- ** installed && !backingUp ** -->
         <ng-container
-          *ngIf="isInstalled(pkg) && status.primary !== 'backing-up'"
+          *ngIf="isInstalled(pkg) && status.primary !== 'backingUp'"
         >
           <!-- ** health checks ** -->
           <app-show-health-checks
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 52404aea3..3ee4e1b2d 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -15,7 +15,6 @@ import { ModalService } from 'src/app/services/modal.service'
 import { DependentInfo } from 'src/app/types/dependent-info'
 import {
   DepErrorService,
-  DependencyErrorType,
   PkgDependencyErrors,
 } from 'src/app/services/dep-error.service'
 import { combineLatest } from 'rxjs'
@@ -132,24 +131,24 @@ export class AppShowPage {
     let fixAction: (() => any) | null = null
 
     if (depError) {
-      if (depError.type === DependencyErrorType.NotInstalled) {
+      if (depError.type === 'notInstalled') {
         errorText = 'Not installed'
         fixText = 'Install'
         fixAction = () => this.fixDep(pkg, manifest, 'install', depId)
-      } else if (depError.type === DependencyErrorType.IncorrectVersion) {
+      } else if (depError.type === 'incorrectVersion') {
         errorText = 'Incorrect version'
         fixText = 'Update'
         fixAction = () => this.fixDep(pkg, manifest, 'update', depId)
-      } else if (depError.type === DependencyErrorType.ConfigUnsatisfied) {
+      } else if (depError.type === 'configUnsatisfied') {
         errorText = 'Config not satisfied'
         fixText = 'Auto config'
         fixAction = () => this.fixDep(pkg, manifest, 'configure', depId)
-      } else if (depError.type === DependencyErrorType.NotRunning) {
+      } else if (depError.type === 'notRunning') {
         errorText = 'Not running'
         fixText = 'Start'
-      } else if (depError.type === DependencyErrorType.HealthChecksFailed) {
+      } else if (depError.type === 'healthChecksFailed') {
         errorText = 'Required health check not passing'
-      } else if (depError.type === DependencyErrorType.Transitive) {
+      } else if (depError.type === 'transitive') {
         errorText = 'Dependency has a dependency issue'
       }
     }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index d67ce2941..23d9affd4 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -3,7 +3,6 @@ import { UiLauncherService } from 'src/app/services/ui-launcher.service'
 import {
   PackageStatus,
   PrimaryRendering,
-  PrimaryStatus,
 } from 'src/app/services/pkg-status-rendering.service'
 import {
   DataModel,
@@ -67,19 +66,15 @@ export class AppShowStatusComponent {
   }
 
   get isRunning(): boolean {
-    return this.status.primary === PrimaryStatus.Running
+    return this.status.primary === 'running'
   }
 
   get canStop(): boolean {
-    return [
-      PrimaryStatus.Running,
-      PrimaryStatus.Starting,
-      PrimaryStatus.Restarting,
-    ].includes(this.status.primary)
+    return ['running', 'starting', 'restarting'].includes(this.status.primary)
   }
 
   get isStopped(): boolean {
-    return this.status.primary === PrimaryStatus.Stopped
+    return this.status.primary === 'stopped'
   }
 
   get sigtermTimeout(): string | null {
diff --git a/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts b/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
index bc496b219..8586c3b35 100644
--- a/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
+++ b/web/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
@@ -5,7 +5,6 @@ import {
   DataModel,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
-import { PrimaryStatus } from 'src/app/services/pkg-status-rendering.service'
 import { getPackageInfo, PkgInfo } from '../../../../util/get-package-info'
 import { combineLatest } from 'rxjs'
 import { DepErrorService } from 'src/app/services/dep-error.service'
@@ -56,14 +55,11 @@ export class HealthComponent {
   private getCount(label: string, pkgs: PkgInfo[]): number {
     switch (label) {
       case 'Error':
-        return pkgs.filter(
-          a => a.primaryStatus !== PrimaryStatus.Stopped && a.error,
-        ).length
+        return pkgs.filter(a => a.primaryStatus !== 'stopped' && a.error).length
       case 'Needs Attention':
         return pkgs.filter(a => a.warning).length
       case 'Stopped':
-        return pkgs.filter(a => a.primaryStatus === PrimaryStatus.Stopped)
-          .length
+        return pkgs.filter(a => a.primaryStatus === 'stopped').length
       case 'Transitioning':
         return pkgs.filter(a => a.transitioning).length
       default:
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 43edea08e..38c80187d 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -495,40 +495,29 @@ export type DependencyError =
   | DependencyErrorHealthChecksFailed
   | DependencyErrorTransitive
 
-export enum DependencyErrorType {
-  NotInstalled = 'not-installed',
-  NotRunning = 'not-running',
-  IncorrectVersion = 'incorrect-version',
-  ConfigUnsatisfied = 'config-unsatisfied',
-  HealthChecksFailed = 'health-checks-failed',
-  InterfaceHealthChecksFailed = 'interface-health-checks-failed',
-  Transitive = 'transitive',
-}
-
 export interface DependencyErrorNotInstalled {
-  type: DependencyErrorType.NotInstalled
+  type: 'notInstalled'
 }
 
 export interface DependencyErrorNotRunning {
-  type: DependencyErrorType.NotRunning
+  type: 'notRunning'
 }
 
 export interface DependencyErrorIncorrectVersion {
-  type: DependencyErrorType.IncorrectVersion
+  type: 'incorrectVersion'
   expected: string // version range
   received: string // version
 }
 
 export interface DependencyErrorConfigUnsatisfied {
-  type: DependencyErrorType.ConfigUnsatisfied
-  error: string
+  type: 'configUnsatisfied'
 }
 
 export interface DependencyErrorHealthChecksFailed {
-  type: DependencyErrorType.HealthChecksFailed
+  type: 'healthChecksFailed'
   check: HealthCheckResult
 }
 
 export interface DependencyErrorTransitive {
-  type: DependencyErrorType.Transitive
+  type: 'transitive'
 }
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index fe145055b..987499a5d 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -9,6 +9,7 @@ import {
 } from './patch-db/data-model'
 import * as deepEqual from 'fast-deep-equal'
 import { isInstalled } from '../util/get-package-data'
+import { DependencyError } from './api/api.types'
 
 export type AllDependencyErrors = Record<string, PkgDependencyErrors>
 export type PkgDependencyErrors = Record<string, DependencyError | null>
@@ -78,7 +79,7 @@ export class DepErrorService {
     // not installed
     if (!dep || dep.stateInfo.state !== 'installed') {
       return {
-        type: DependencyErrorType.NotInstalled,
+        type: 'notInstalled',
       }
     }
 
@@ -88,7 +89,7 @@ export class DepErrorService {
     // incorrect version
     if (!this.emver.satisfies(depManifest.version, versionSpec)) {
       return {
-        type: DependencyErrorType.IncorrectVersion,
+        type: 'incorrectVersion',
         expected: versionSpec,
         received: depManifest.version,
       }
@@ -97,7 +98,7 @@ export class DepErrorService {
     // invalid config
     if (Object.values(pkg.status.dependencyConfigErrors).some(err => !!err)) {
       return {
-        type: DependencyErrorType.ConfigUnsatisfied,
+        type: 'configUnsatisfied',
       }
     }
 
@@ -106,7 +107,7 @@ export class DepErrorService {
     // not running
     if (depStatus !== 'running' && depStatus !== 'starting') {
       return {
-        type: DependencyErrorType.NotRunning,
+        type: 'notRunning',
       }
     }
 
@@ -115,9 +116,11 @@ export class DepErrorService {
     // health check failure
     if (depStatus === 'running' && currentDep.kind === 'running') {
       for (let id of currentDep.healthChecks) {
-        if (dep.status.main.health[id]?.result !== 'success') {
+        const check = dep.status.main.health[id]
+        if (check?.result !== 'success') {
           return {
-            type: DependencyErrorType.HealthChecksFailed,
+            type: 'healthChecksFailed',
+            check,
           }
         }
       }
@@ -130,7 +133,7 @@ export class DepErrorService {
 
     if (transitiveError) {
       return {
-        type: DependencyErrorType.Transitive,
+        type: 'transitive',
       }
     }
 
@@ -154,46 +157,3 @@ function dependencyDepth(
     depth,
   )
 }
-
-export type DependencyError =
-  | DependencyErrorNotInstalled
-  | DependencyErrorNotRunning
-  | DependencyErrorIncorrectVersion
-  | DependencyErrorConfigUnsatisfied
-  | DependencyErrorHealthChecksFailed
-  | DependencyErrorTransitive
-
-export enum DependencyErrorType {
-  NotInstalled = 'notInstalled',
-  NotRunning = 'notRunning',
-  IncorrectVersion = 'incorrectVersion',
-  ConfigUnsatisfied = 'configUnsatisfied',
-  HealthChecksFailed = 'healthChecksFailed',
-  Transitive = 'transitive',
-}
-
-export interface DependencyErrorNotInstalled {
-  type: DependencyErrorType.NotInstalled
-}
-
-export interface DependencyErrorNotRunning {
-  type: DependencyErrorType.NotRunning
-}
-
-export interface DependencyErrorIncorrectVersion {
-  type: DependencyErrorType.IncorrectVersion
-  expected: string // version range
-  received: string // version
-}
-
-export interface DependencyErrorConfigUnsatisfied {
-  type: DependencyErrorType.ConfigUnsatisfied
-}
-
-export interface DependencyErrorHealthChecksFailed {
-  type: DependencyErrorType.HealthChecksFailed
-}
-
-export interface DependencyErrorTransitive {
-  type: DependencyErrorType.Transitive
-}
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index d95a5ccdc..a3f19b18f 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -1,12 +1,12 @@
-import { isEmptyObject } from '@start9labs/shared'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { PkgDependencyErrors } from './dep-error.service'
 import { Status } from '../../../../../../core/startos/bindings/Status'
+import { T } from '@start9labs/start-sdk'
 
 export interface PackageStatus {
   primary: PrimaryStatus
   dependency: DependencyStatus | null
-  health: HealthStatus | null
+  health: T.HealthStatus | null
 }
 
 export function renderPkgStatus(
@@ -15,59 +15,51 @@ export function renderPkgStatus(
 ): PackageStatus {
   let primary: PrimaryStatus
   let dependency: DependencyStatus | null = null
-  let health: HealthStatus | null = null
+  let health: T.HealthStatus | null = null
 
   if (pkg.stateInfo.state === 'installed') {
-    primary = getPrimaryStatus(pkg.status)
+    primary = getInstalledPrimaryStatus(pkg.status)
     dependency = getDependencyStatus(depErrors)
     health = getHealthStatus(pkg.status)
   } else {
-    primary = pkg.stateInfo.state as string as PrimaryStatus
+    primary = pkg.stateInfo.state
   }
 
   return { primary, dependency, health }
 }
 
-function getPrimaryStatus(status: Status): PrimaryStatus {
+function getInstalledPrimaryStatus(status: Status): PrimaryStatus {
   if (!status.configured) {
-    return PrimaryStatus.NeedsConfig
-  } else if (status.main.status === 'restarting') {
-    return PrimaryStatus.Restarting
+    return 'needsConfig'
   } else {
     return status.main.status as any as PrimaryStatus
   }
 }
 
 function getDependencyStatus(depErrors: PkgDependencyErrors): DependencyStatus {
-  return Object.values(depErrors).some(err => !!err)
-    ? DependencyStatus.Warning
-    : DependencyStatus.Satisfied
+  return Object.values(depErrors).some(err => !!err) ? 'warning' : 'satisfied'
 }
 
-function getHealthStatus(status: Status): HealthStatus | null {
+function getHealthStatus(status: Status): T.HealthStatus | null {
   if (status.main.status !== 'running' || !status.main.health) {
     return null
   }
 
   const values = Object.values(status.main.health)
 
-  if (values.some(h => !h.result)) {
-    return HealthStatus.Waiting
-  }
-
   if (values.some(h => h.result === 'failure')) {
-    return HealthStatus.Failure
+    return 'failure'
   }
 
   if (values.some(h => h.result === 'loading')) {
-    return HealthStatus.Loading
+    return 'loading'
   }
 
   if (values.some(h => h.result === 'starting')) {
-    return HealthStatus.Starting
+    return 'starting'
   }
 
-  return HealthStatus.Healthy
+  return 'success'
 }
 
 export interface StatusRendering {
@@ -76,102 +68,88 @@ export interface StatusRendering {
   showDots?: boolean
 }
 
-export enum PrimaryStatus {
-  // state
-  Installing = 'installing',
-  Updating = 'updating',
-  Removing = 'removing',
-  Restoring = 'restoring',
-  // status
-  Starting = 'starting',
-  Running = 'running',
-  Stopping = 'stopping',
-  Restarting = 'restarting',
-  Stopped = 'stopped',
-  BackingUp = 'backing-up',
-  // config
-  NeedsConfig = 'needs-config',
-}
-
-export enum DependencyStatus {
-  Warning = 'warning',
-  Satisfied = 'satisfied',
-}
-
-export enum HealthStatus {
-  Failure = 'failure',
-  Waiting = 'waiting',
-  Starting = 'starting',
-  Loading = 'loading',
-  Healthy = 'healthy',
-}
-
-export const PrimaryRendering: Record<string, StatusRendering> = {
-  [PrimaryStatus.Installing]: {
+export type PrimaryStatus =
+  | 'installing'
+  | 'updating'
+  | 'removing'
+  | 'restoring'
+  | 'starting'
+  | 'running'
+  | 'stopping'
+  | 'restarting'
+  | 'stopped'
+  | 'backingUp'
+  | 'needsConfig'
+
+export type DependencyStatus = 'warning' | 'satisfied'
+
+export const PrimaryRendering: Record<PrimaryStatus, StatusRendering> = {
+  installing: {
     display: 'Installing',
     color: 'primary',
     showDots: true,
   },
-  [PrimaryStatus.Updating]: {
+  updating: {
     display: 'Updating',
     color: 'primary',
     showDots: true,
   },
-  [PrimaryStatus.Removing]: {
+  removing: {
     display: 'Removing',
     color: 'danger',
     showDots: true,
   },
-  [PrimaryStatus.Restoring]: {
+  restoring: {
     display: 'Restoring',
     color: 'primary',
     showDots: true,
   },
-  [PrimaryStatus.Stopping]: {
+  stopping: {
     display: 'Stopping',
     color: 'dark-shade',
     showDots: true,
   },
-  [PrimaryStatus.Restarting]: {
+  restarting: {
     display: 'Restarting',
     color: 'tertiary',
     showDots: true,
   },
-  [PrimaryStatus.Stopped]: {
+  stopped: {
     display: 'Stopped',
     color: 'dark-shade',
     showDots: false,
   },
-  [PrimaryStatus.BackingUp]: {
+  backingUp: {
     display: 'Backing Up',
     color: 'primary',
     showDots: true,
   },
-  [PrimaryStatus.Starting]: {
+  starting: {
     display: 'Starting',
     color: 'primary',
     showDots: true,
   },
-  [PrimaryStatus.Running]: {
+  running: {
     display: 'Running',
     color: 'success',
     showDots: false,
   },
-  [PrimaryStatus.NeedsConfig]: {
+  needsConfig: {
     display: 'Needs Config',
     color: 'warning',
     showDots: false,
   },
 }
 
-export const DependencyRendering: Record<string, StatusRendering> = {
-  [DependencyStatus.Warning]: { display: 'Issue', color: 'warning' },
-  [DependencyStatus.Satisfied]: { display: 'Satisfied', color: 'success' },
+export const DependencyRendering: Record<DependencyStatus, StatusRendering> = {
+  warning: { display: 'Issue', color: 'warning' },
+  satisfied: { display: 'Satisfied', color: 'success' },
 }
 
-export const HealthRendering: Record<string, StatusRendering> = {
-  [HealthStatus.Failure]: { display: 'Failure', color: 'danger' },
-  [HealthStatus.Starting]: { display: 'Starting', color: 'primary' },
-  [HealthStatus.Loading]: { display: 'Loading', color: 'primary' },
-  [HealthStatus.Healthy]: { display: 'Healthy', color: 'success' },
+export const HealthRendering: Record<T.HealthStatus, StatusRendering> = {
+  failure: { display: 'Failure', color: 'danger' },
+  starting: { display: 'Starting', color: 'primary' },
+  loading: { display: 'Loading', color: 'primary' },
+  success: { display: 'Healthy', color: 'success' },
+  disabled: { display: 'Disabled', color: 'dark' },
 }
diff --git a/web/projects/ui/src/app/util/get-package-info.ts b/web/projects/ui/src/app/util/get-package-info.ts
index 936ed9954..3e506ea61 100644
--- a/web/projects/ui/src/app/util/get-package-info.ts
+++ b/web/projects/ui/src/app/util/get-package-info.ts
@@ -1,7 +1,5 @@
 import { PackageDataEntry } from '../services/patch-db/data-model'
 import {
-  DependencyStatus,
-  HealthStatus,
   PrimaryRendering,
   PrimaryStatus,
   renderPkgStatus,
@@ -21,15 +19,12 @@ export function getPackageInfo(
     entry,
     primaryRendering,
     primaryStatus: statuses.primary,
-    error:
-      statuses.health === HealthStatus.Failure ||
-      statuses.dependency === DependencyStatus.Warning,
-    warning: statuses.primary === PrimaryStatus.NeedsConfig,
+    error: statuses.health === 'failure' || statuses.dependency === 'warning',
+    warning: statuses.primary === 'needsConfig',
     transitioning:
       primaryRendering.showDots ||
-      statuses.health === HealthStatus.Waiting ||
-      statuses.health === HealthStatus.Loading ||
-      statuses.health === HealthStatus.Starting,
+      statuses.health === 'loading' ||
+      statuses.health === 'starting',
   }
 }
 

From dd790dceb528ee98567111293b0e27833afdad61 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 1 Apr 2024 11:12:35 -0600
Subject: [PATCH 125/341] Chore/reorg backend ts (#2582)

* create index

* chore: Add the star exports for the bindings

---------

Co-authored-by: J H <dragondef@gmail.com>
---
 Makefile                       |    1 +
 core/Cargo.lock                | 1224 ++++++++++++++++----------------
 core/startos/bindings/index.ts |   97 +++
 sdk/lib/index.ts               |    1 +
 sdk/lib/types.ts               |    2 +-
 5 files changed, 722 insertions(+), 603 deletions(-)
 create mode 100644 core/startos/bindings/index.ts

diff --git a/Makefile b/Makefile
index b0dcf5830..1d9f2cdaf 100644
--- a/Makefile
+++ b/Makefile
@@ -183,6 +183,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*') $(ENVIRONMENT_FILE)
 	rm -rf core/startos/bindings
 	(cd core/ && cargo test --features=test)
+	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1.ts";/g' > core/startos/bindings/index.ts
 	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
 
 sdk/dist: $(shell git ls-files sdk) core/startos/bindings
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 602c16ae3..305910a0a 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -38,23 +38,23 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.8"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.11",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.12",
+ "getrandom 0.2.11",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -155,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "arrayref"
@@ -193,9 +193,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.6"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c"
+checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2"
 dependencies = [
  "brotli",
  "flate2",
@@ -224,18 +224,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.79"
+version = "0.1.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -260,9 +260,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
@@ -275,9 +275,9 @@ dependencies = [
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.28",
+ "http 0.2.11",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
  "itoa",
  "matchit",
  "memchr",
@@ -300,7 +300,7 @@ checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
  "async-trait",
  "axum-core 0.4.3",
- "base64",
+ "base64 0.21.5",
  "bytes",
  "futures-util",
  "http 1.1.0",
@@ -338,8 +338,8 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
+ "http 0.2.11",
+ "http-body 0.4.5",
  "mime",
  "rustversion",
  "tower-layer",
@@ -388,9 +388,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
@@ -415,9 +415,15 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
 
 [[package]]
 name = "base64"
-version = "0.21.7"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "base64ct"
@@ -427,9 +433,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "basic-cookies"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7"
+checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38"
 dependencies = [
  "lalrpop",
  "lalrpop-util",
@@ -468,18 +474,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "bitmaps"
-version = "3.2.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
+checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403"
 
 [[package]]
 name = "bitvec"
@@ -506,9 +512,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -537,9 +543,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "3.5.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -558,9 +564,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.15.4"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "byteorder"
@@ -570,15 +576,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cfg-if"
@@ -588,9 +597,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.37"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -598,7 +607,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.4",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -607,14 +616,14 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
 name = "ciborium"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -623,18 +632,18 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
 dependencies = [
  "ciborium-io",
- "half 2.4.0",
+ "half",
 ]
 
 [[package]]
@@ -702,7 +711,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -722,9 +731,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "color-eyre"
-version = "0.6.3"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
 dependencies = [
  "backtrace",
  "color-spantrace",
@@ -737,9 +746,9 @@ dependencies = [
 
 [[package]]
 name = "color-spantrace"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
 dependencies = [
  "once_cell",
  "owo-colors",
@@ -755,24 +764,24 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "concurrent-queue"
-version = "2.4.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "console"
-version = "0.15.8"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
 dependencies = [
  "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.52.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -814,9 +823,9 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.6"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
 [[package]]
 name = "const_format"
@@ -872,9 +881,9 @@ dependencies = [
 
 [[package]]
 name = "cookie"
-version = "0.18.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8"
 dependencies = [
  "time",
  "version_check",
@@ -899,9 +908,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -909,15 +918,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
  "libc",
 ]
@@ -939,36 +948,41 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
 dependencies = [
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.11"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
 dependencies = [
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+dependencies = [
+ "cfg-if",
+]
 
 [[package]]
 name = "crossterm"
@@ -976,7 +990,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.1",
  "crossterm_winapi",
  "futures-core",
  "libc",
@@ -1004,9 +1018,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.5"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+checksum = "28f85c3514d2a6e64160359b45a3918c3b4178bcbf4ae5d03ab2d02e521c479a"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -1075,9 +1089,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.2"
+version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
+checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1098,14 +1112,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.8"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1113,34 +1127,34 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.8"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.8"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.5.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 [[package]]
 name = "der"
@@ -1155,9 +1169,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
 dependencies = [
  "powerfmt",
  "serde",
@@ -1176,6 +1190,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -1241,21 +1261,21 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.17"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
 
 [[package]]
 name = "ecdsa"
-version = "0.16.9"
+version = "0.16.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
 dependencies = [
  "der",
  "digest 0.10.7",
  "elliptic-curve",
  "rfc6979",
- "signature 2.2.0",
+ "signature 2.0.0",
  "spki",
 ]
 
@@ -1276,7 +1296,7 @@ checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
  "serde",
- "signature 2.2.0",
+ "signature 2.0.0",
 ]
 
 [[package]]
@@ -1299,30 +1319,30 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.1",
  "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "signature 2.2.0",
+ "signature 2.0.0",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "elliptic-curve"
-version = "0.13.8"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
 dependencies = [
  "base16ct",
  "crypto-bigint",
@@ -1388,7 +1408,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1399,12 +1419,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1426,9 +1446,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "eyre"
-version = "0.6.12"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
 dependencies = [
  "indenter",
  "once_cell",
@@ -1436,9 +1456,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fd-lock-rs"
@@ -1461,20 +1481,20 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.7"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f"
+checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd"
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "redox_syscall 0.3.5",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1533,9 +1553,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
 dependencies = [
  "percent-encoding",
 ]
@@ -1557,9 +1577,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1572,9 +1592,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1582,15 +1602,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1610,38 +1630,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1679,9 +1699,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1690,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "gpt"
@@ -1700,7 +1720,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8283e7331b8c93b9756e0cfdbcfb90312852f953c6faf9bf741e684cc3b6ad69"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.1",
  "crc",
  "log",
  "uuid",
@@ -1719,17 +1739,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.25"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.12",
- "indexmap 2.2.6",
+ "http 0.2.11",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -1748,7 +1768,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 1.1.0",
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1757,19 +1777,9 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.8.3"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
-
-[[package]]
-name = "half"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
 [[package]]
 name = "hashbrown"
@@ -1783,16 +1793,16 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.6",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.6",
  "allocator-api2",
 ]
 
@@ -1802,16 +1812,16 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
 name = "hdrhistogram"
-version = "7.5.4"
+version = "7.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
+checksum = "a5b38e5c02b7c7be48c8dc5217c4f1634af2ea221caae2e024bffc7a7651c691"
 dependencies = [
- "base64",
+ "base64 0.13.1",
  "byteorder",
  "flate2",
  "nom",
@@ -1861,9 +1871,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -1873,15 +1883,15 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hifijson"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18ae468bcb4dfecf0e4949ee28abbc99076b6a0077f51ddbc94dbfff8e6a870c"
+checksum = "85ef6b41c333e6dd2a4aaa59125a19b633cd17e7aaf372b2260809777bcdef4a"
 
 [[package]]
 name = "hkdf"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
 dependencies = [
  "hmac",
 ]
@@ -1897,18 +1907,18 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.9"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.12"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
  "bytes",
  "fnv",
@@ -1928,12 +1938,12 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
- "http 0.2.12",
+ "http 0.2.11",
  "pin-project-lite",
 ]
 
@@ -1980,22 +1990,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.25",
- "http 0.2.12",
- "http-body 0.4.6",
+ "h2 0.3.21",
+ "http 0.2.11",
+ "http-body 0.4.5",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -2028,7 +2038,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.28",
+ "hyper 0.14.27",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2041,7 +2051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.28",
+ "hyper 0.14.27",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -2059,15 +2069,15 @@ dependencies = [
  "http-body 1.0.0",
  "hyper 1.2.0",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.5",
  "tokio",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2121,16 +2131,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "imbl"
 version = "2.0.3"
@@ -2147,9 +2147,9 @@ dependencies = [
 
 [[package]]
 name = "imbl-sized-chunks"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63"
+checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076"
 dependencies = [
  "bitmaps",
 ]
@@ -2157,7 +2157,7 @@ dependencies = [
 [[package]]
 name = "imbl-value"
 version = "0.1.0"
-source = "git+https://github.com/Start9Labs/imbl-value.git#48dc39a762a3b4f9300d3b9f850cbd394e777ae0"
+source = "git+https://github.com/Start9Labs/imbl-value.git#929395141c3a882ac366c12ac9402d0ebaa2201b"
 dependencies = [
  "imbl",
  "serde",
@@ -2204,20 +2204,20 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.2",
  "serde",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.8"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
 dependencies = [
  "console",
  "instant",
@@ -2276,13 +2276,13 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.12"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys 0.52.0",
+ "hermit-abi 0.3.3",
+ "rustix",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2333,9 +2333,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jaq-core"
@@ -2343,7 +2343,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb52eeac20f256459e909bd4a03bb8c4fab6a1fdbb8ed52d00f644152df48ece"
 dependencies = [
- "ahash 0.7.8",
+ "ahash 0.7.7",
  "dyn-clone",
  "hifijson",
  "indexmap 1.9.3",
@@ -2377,12 +2377,12 @@ dependencies = [
 
 [[package]]
 name = "josekit"
-version = "0.8.6"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0953340cf63354cec4a385f1fbcb3f409a5823778cae236078892f6030ed4565"
+checksum = "5754487a088f527b1407df470db8e654e4064dccbbe1fe850e0773721e9962b7"
 dependencies = [
  "anyhow",
- "base64",
+ "base64 0.21.5",
  "flate2",
  "once_cell",
  "openssl",
@@ -2395,9 +2395,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2435,42 +2435,42 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
 dependencies = [
  "cpufeatures",
 ]
 
 [[package]]
 name = "lalrpop"
-version = "0.20.2"
+version = "0.19.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
+checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b"
 dependencies = [
  "ascii-canvas",
  "bit-set",
+ "diff",
  "ena",
- "itertools 0.11.0",
+ "is-terminal",
+ "itertools 0.10.5",
  "lalrpop-util",
  "petgraph",
- "pico-args",
  "regex",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.6.29",
  "string_cache",
  "term",
  "tiny-keccak",
  "unicode-xid",
- "walkdir",
 ]
 
 [[package]]
 name = "lalrpop-util"
-version = "0.20.2"
+version = "0.19.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
+checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed"
 dependencies = [
- "regex-automata 0.4.6",
+ "regex",
 ]
 
 [[package]]
@@ -2500,9 +2500,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
 [[package]]
 name = "libm"
@@ -2516,16 +2516,16 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.1",
  "libc",
  "redox_syscall 0.4.1",
 ]
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.27.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
+checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2534,9 +2534,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
 
 [[package]]
 name = "lock_api"
@@ -2550,9 +2550,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "matchers"
@@ -2594,9 +2594,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
@@ -2630,18 +2630,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "log",
@@ -2653,7 +2653,7 @@ dependencies = [
 name = "models"
 version = "0.1.0"
 dependencies = [
- "base64",
+ "base64 0.21.5",
  "color-eyre",
  "ed25519-dalek 2.1.1",
  "emver",
@@ -2699,9 +2699,9 @@ dependencies = [
 
 [[package]]
 name = "new_debug_unreachable"
-version = "1.0.6"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
 [[package]]
 name = "new_mime_guess"
@@ -2744,7 +2744,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.1",
  "cfg-if",
  "libc",
 ]
@@ -2813,33 +2813,28 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
 dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
 [[package]]
 name = "num-integer"
-version = "0.1.46"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
+ "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.44"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2860,9 +2855,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
  "libm",
@@ -2874,29 +2869,29 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi 0.3.3",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2907,9 +2902,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -2922,9 +2917,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssh-keys"
@@ -2932,7 +2927,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c75a0ec2d1b302412fb503224289325fcc0e44600176864804c7211b055cfd58"
 dependencies = [
- "base64",
+ "base64 0.21.5",
  "byteorder",
  "md-5",
  "sha2 0.10.8",
@@ -2941,11 +2936,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2962,7 +2957,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2973,18 +2968,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.2.3+3.2.1"
+version = "300.1.6+3.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.101"
+version = "0.9.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
+checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9"
 dependencies = [
  "cc",
  "libc",
@@ -3035,20 +3030,6 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
-[[package]]
-name = "p521"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2"
-dependencies = [
- "base16ct",
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "rand_core 0.6.4",
- "sha2 0.10.8",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -3140,9 +3121,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "petgraph"
@@ -3151,7 +3132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
 ]
 
 [[package]]
@@ -3163,30 +3144,24 @@ dependencies = [
  "siphasher",
 ]
 
-[[package]]
-name = "pico-args"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
-
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3224,21 +3199,21 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "platforms"
-version = "3.4.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
+checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0"
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
 
 [[package]]
 name = "powerfmt"
@@ -3274,27 +3249,27 @@ dependencies = [
 
 [[package]]
 name = "primeorder"
-version = "0.13.6"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4"
 dependencies = [
  "elliptic-curve",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit 0.20.7",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -3307,13 +3282,13 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.5.0",
+ "bitflags 2.4.1",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.2",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3332,9 +3307,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
+checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -3342,22 +3317,22 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.12.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
+checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
 dependencies = [
  "anyhow",
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
+checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
 dependencies = [
  "prost",
 ]
@@ -3386,9 +3361,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -3458,7 +3433,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.11",
 ]
 
 [[package]]
@@ -3503,6 +3478,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -3518,21 +3502,21 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.11",
  "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3546,13 +3530,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3563,9 +3547,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
@@ -3573,17 +3557,17 @@ version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
- "base64",
+ "base64 0.21.5",
  "bytes",
  "cookie 0.17.0",
  "cookie_store",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.25",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.28",
+ "h2 0.3.21",
+ "http 0.2.11",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
  "hyper-tls",
  "ipnet",
  "js-sys",
@@ -3636,17 +3620,16 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
 dependencies = [
  "cc",
- "cfg-if",
- "getrandom 0.2.12",
+ "getrandom 0.2.11",
  "libc",
  "spin 0.9.8",
  "untrusted",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3668,7 +3651,7 @@ checksum = "c48252a30abb9426a3239fa8dfd2c8dd2647bb24db0b6145db2df04ae53fe647"
 dependencies = [
  "clap 3.2.25",
  "futures",
- "hyper 0.14.28",
+ "hyper 0.14.27",
  "lazy_static",
  "openssl",
  "reqwest",
@@ -3756,9 +3739,9 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.9.6"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -3769,7 +3752,7 @@ dependencies = [
  "pkcs8",
  "rand_core 0.6.4",
  "sha2 0.10.8",
- "signature 2.2.0",
+ "signature 2.0.0",
  "spki",
  "subtle",
  "zeroize",
@@ -3787,11 +3770,11 @@ dependencies = [
 
 [[package]]
 name = "rust-argon2"
-version = "2.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8"
+checksum = "1e71971821b3ae0e769e4a4328dbcb517607b434db7697e9aba17203ec14e46a"
 dependencies = [
- "base64",
+ "base64 0.21.5",
  "blake2b_simd",
  "constant_time_eq",
 ]
@@ -3813,22 +3796,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.32"
+version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.10"
+version = "0.21.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
 dependencies = [
  "ring",
  "rustls-webpki 0.101.7",
@@ -3855,7 +3838,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64",
+ "base64 0.21.5",
 ]
 
 [[package]]
@@ -3921,26 +3904,17 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3998,18 +3972,18 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
  "serde_derive",
 ]
@@ -4027,7 +4001,7 @@ dependencies = [
 name = "serde_cbor"
 version = "0.11.1"
 dependencies = [
- "half 1.8.3",
+ "half",
  "serde",
 ]
 
@@ -4037,28 +4011,28 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
- "half 1.8.3",
+ "half",
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "itoa",
  "ryu",
  "serde",
@@ -4066,9 +4040,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.16"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
+checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
 dependencies = [
  "itoa",
  "serde",
@@ -4076,9 +4050,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
 dependencies = [
  "serde",
 ]
@@ -4097,17 +4071,16 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.7.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
 dependencies = [
- "base64",
+ "base64 0.21.5",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "serde",
- "serde_derive",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -4115,23 +4088,23 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.7.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.34+deprecated"
+version = "0.9.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "itoa",
  "ryu",
  "serde",
@@ -4236,9 +4209,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
 [[package]]
 name = "signature"
-version = "2.2.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
 dependencies = [
  "digest 0.10.7",
  "rand_core 0.6.4",
@@ -4278,12 +4251,22 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4303,9 +4286,9 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
 dependencies = [
  "base64ct",
  "der",
@@ -4313,20 +4296,20 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.3"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
+checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85"
 dependencies = [
- "itertools 0.12.1",
+ "itertools 0.11.0",
  "nom",
  "unicode_categories",
 ]
 
 [[package]]
 name = "sqlx"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa"
+checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -4337,17 +4320,18 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6"
+checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.6",
  "atoi",
  "byteorder",
  "bytes",
  "chrono",
  "crc",
  "crossbeam-queue",
+ "dotenvy",
  "either",
  "event-listener",
  "futures-channel",
@@ -4357,13 +4341,13 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "log",
  "memchr",
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls 0.21.10",
+ "rustls 0.21.8",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -4380,9 +4364,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127"
+checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4393,9 +4377,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8"
+checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc"
 dependencies = [
  "dotenvy",
  "either",
@@ -4419,13 +4403,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418"
+checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
 dependencies = [
  "atoi",
- "base64",
- "bitflags 2.5.0",
+ "base64 0.21.5",
+ "bitflags 2.4.1",
  "byteorder",
  "bytes",
  "chrono",
@@ -4462,13 +4446,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e"
+checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
 dependencies = [
  "atoi",
- "base64",
- "bitflags 2.5.0",
+ "base64 0.21.5",
+ "bitflags 2.4.1",
  "byteorder",
  "chrono",
  "crc",
@@ -4490,6 +4474,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
+ "sha1",
  "sha2 0.10.8",
  "smallvec",
  "sqlx-core",
@@ -4501,9 +4486,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa"
+checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f"
 dependencies = [
  "atoi",
  "chrono",
@@ -4520,7 +4505,6 @@ dependencies = [
  "sqlx-core",
  "tracing",
  "url",
- "urlencoding",
 ]
 
 [[package]]
@@ -4546,7 +4530,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.55",
+ "syn 2.0.39",
  "unicode-width",
 ]
 
@@ -4573,19 +4557,18 @@ dependencies = [
 
 [[package]]
 name = "ssh-key"
-version = "0.6.5"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b71299a724c8d84956caaf8fc3b3ea57c3587fe2d0b800cd0dc1f3599905d7e"
+checksum = "2180b3bc4955efd5661a97658d3cf4c8107e0d132f619195afe9486c13cca313"
 dependencies = [
  "ed25519-dalek 2.1.1",
  "p256",
  "p384",
- "p521",
  "rand_core 0.6.4",
  "rsa",
  "sec1",
  "sha2 0.10.8",
- "signature 2.2.0",
+ "signature 2.0.0",
  "ssh-cipher",
  "ssh-encoding",
  "subtle",
@@ -4603,7 +4586,7 @@ dependencies = [
  "axum 0.7.5",
  "axum-server",
  "base32",
- "base64",
+ "base64 0.21.5",
  "base64ct",
  "basic-cookies",
  "blake3",
@@ -4614,7 +4597,7 @@ dependencies = [
  "color-eyre",
  "console",
  "console-subscriber",
- "cookie 0.18.1",
+ "cookie 0.18.0",
  "cookie_store",
  "current_platform",
  "digest 0.10.7",
@@ -4634,7 +4617,7 @@ dependencies = [
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "indicatif",
  "integer-encoding",
  "ipnet",
@@ -4697,7 +4680,7 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite",
  "tokio-util",
- "toml 0.8.12",
+ "toml 0.8.8",
  "torut",
  "tracing",
  "tracing-error",
@@ -4781,9 +4764,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.55"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4837,19 +4820,20 @@ checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
 dependencies = [
  "filetime",
  "libc",
- "xattr 1.3.1",
+ "xattr 1.0.1",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "redox_syscall 0.4.1",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -4874,9 +4858,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.16.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thingbuf"
@@ -4890,22 +4874,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -4921,9 +4905,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4931,13 +4915,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.34"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
  "deranged",
  "itoa",
- "num-conv",
  "powerfmt",
  "serde",
  "time-core",
@@ -4952,11 +4935,10 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.17"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
- "num-conv",
  "time-core",
 ]
 
@@ -4986,9 +4968,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4998,7 +4980,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.5.5",
  "tokio-macros",
  "tracing",
  "windows-sys 0.48.0",
@@ -5022,7 +5004,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -5060,9 +5042,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5126,14 +5108,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.9",
+ "toml_edit 0.21.0",
 ]
 
 [[package]]
@@ -5151,35 +5133,35 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.5.40",
+ "winnow",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.21.1"
+version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "toml_datetime",
- "winnow 0.5.40",
+ "winnow",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.9"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.5",
+ "winnow",
 ]
 
 [[package]]
@@ -5191,12 +5173,12 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum 0.6.20",
- "base64",
+ "base64 0.21.5",
  "bytes",
- "h2 0.3.25",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.28",
+ "h2 0.3.21",
+ "http 0.2.11",
+ "http-body 0.4.5",
+ "hyper 0.14.27",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -5215,7 +5197,7 @@ version = "0.2.1"
 source = "git+https://github.com/Start9Labs/torut.git?branch=update/dependencies#cc7a1425a01214465e106975e6690794d8551bdb"
 dependencies = [
  "base32",
- "base64",
+ "base64 0.21.5",
  "derive_more",
  "ed25519-dalek 1.0.1",
  "hex",
@@ -5280,7 +5262,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -5355,9 +5337,9 @@ dependencies = [
 
 [[package]]
 name = "treediff"
-version = "4.0.3"
+version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5"
+checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303"
 dependencies = [
  "serde_json",
 ]
@@ -5411,14 +5393,14 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "ts-rs"
 version = "8.1.0"
-source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-type-override#f37e51abbf3b4afc6dc2fdea72100ed0ee463a06"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-type-override#3f7ff0f0f418c7fa1f1cf6b48697ca9e74f68201"
 dependencies = [
  "thiserror",
  "ts-rs-macros",
@@ -5427,12 +5409,12 @@ dependencies = [
 [[package]]
 name = "ts-rs-macros"
 version = "8.1.0"
-source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-type-override#f37e51abbf3b4afc6dc2fdea72100ed0ee463a06"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-type-override#3f7ff0f0f418c7fa1f1cf6b48697ca9e74f68201"
 dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
  "termcolor",
 ]
 
@@ -5473,7 +5455,7 @@ checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -5499,9 +5481,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
@@ -5511,18 +5493,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
@@ -5544,9 +5526,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.11"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
 
 [[package]]
 name = "untrusted"
@@ -5556,12 +5538,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna 0.4.0",
  "percent-encoding",
  "serde",
 ]
@@ -5586,11 +5568,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.11",
 ]
 
 [[package]]
@@ -5620,16 +5602,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -5651,17 +5623,11 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "wasite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
-
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5669,24 +5635,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5696,9 +5662,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5706,22 +5672,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
 [[package]]
 name = "wasm-streams"
@@ -5738,9 +5704,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5748,19 +5714,18 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.25.4"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
+dependencies = [
+ "rustls-webpki 0.101.7",
+]
 
 [[package]]
 name = "whoami"
-version = "1.5.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
-dependencies = [
- "redox_syscall 0.4.1",
- "wasite",
-]
+checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
 
 [[package]]
 name = "winapi"
@@ -5795,11 +5760,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
@@ -5820,6 +5794,21 @@ dependencies = [
  "windows-targets 0.52.4",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -5850,6 +5839,12 @@ dependencies = [
  "windows_x86_64_msvc 0.52.4",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -5862,6 +5857,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -5874,6 +5875,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -5886,6 +5893,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -5898,6 +5911,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -5910,6 +5929,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -5922,6 +5947,12 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -5936,18 +5967,9 @@ checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
 dependencies = [
  "memchr",
 ]
@@ -5982,13 +6004,11 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.3.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
 dependencies = [
  "libc",
- "linux-raw-sys",
- "rustix",
 ]
 
 [[package]]
@@ -6009,7 +6029,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f355ab62ebe30b758c1f4ab096a306722c4b7dbfb9d8c07d18c70d71a945588"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.6",
  "hashbrown 0.13.2",
  "lazy_static",
  "serde",
@@ -6017,29 +6037,29 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 dependencies = [
  "zeroize_derive",
 ]
@@ -6052,5 +6072,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.55",
+ "syn 2.0.39",
 ]
diff --git a/core/startos/bindings/index.ts b/core/startos/bindings/index.ts
new file mode 100644
index 000000000..178e49c4f
--- /dev/null
+++ b/core/startos/bindings/index.ts
@@ -0,0 +1,97 @@
+export { ActionId } from "./ActionId.ts";
+export { ActionMetadata } from "./ActionMetadata.ts";
+export { AddressInfo } from "./AddressInfo.ts";
+export { AddSslOptions } from "./AddSslOptions.ts";
+export { Alerts } from "./Alerts.ts";
+export { Algorithm } from "./Algorithm.ts";
+export { AllowedStatuses } from "./AllowedStatuses.ts";
+export { AllPackageData } from "./AllPackageData.ts";
+export { AlpnInfo } from "./AlpnInfo.ts";
+export { BackupProgress } from "./BackupProgress.ts";
+export { BindInfo } from "./BindInfo.ts";
+export { BindOptions } from "./BindOptions.ts";
+export { BindParams } from "./BindParams.ts";
+export { Callback } from "./Callback.ts";
+export { ChrootParams } from "./ChrootParams.ts";
+export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams.ts";
+export { CurrentDependencies } from "./CurrentDependencies.ts";
+export { CurrentDependencyInfo } from "./CurrentDependencyInfo.ts";
+export { DataUrl } from "./DataUrl.ts";
+export { Dependencies } from "./Dependencies.ts";
+export { DependencyConfigErrors } from "./DependencyConfigErrors.ts";
+export { DependencyKind } from "./DependencyKind.ts";
+export { DependencyRequirement } from "./DependencyRequirement.ts";
+export { DepInfo } from "./DepInfo.ts";
+export { Description } from "./Description.ts";
+export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams.ts";
+export { Duration } from "./Duration.ts";
+export { ExecuteAction } from "./ExecuteAction.ts";
+export { ExportActionParams } from "./ExportActionParams.ts";
+export { ExportedHostInfo } from "./ExportedHostInfo.ts";
+export { ExportedHostnameInfo } from "./ExportedHostnameInfo.ts";
+export { ExportedIpHostname } from "./ExportedIpHostname.ts";
+export { ExportedOnionHostname } from "./ExportedOnionHostname.ts";
+export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams.ts";
+export { ExposeForDependentsParams } from "./ExposeForDependentsParams.ts";
+export { FullProgress } from "./FullProgress.ts";
+export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind.ts";
+export { GetHostInfoParams } from "./GetHostInfoParams.ts";
+export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams.ts";
+export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams.ts";
+export { GetServicePortForwardParams } from "./GetServicePortForwardParams.ts";
+export { GetSslCertificateParams } from "./GetSslCertificateParams.ts";
+export { GetSslKeyParams } from "./GetSslKeyParams.ts";
+export { GetStoreParams } from "./GetStoreParams.ts";
+export { GetSystemSmtpParams } from "./GetSystemSmtpParams.ts";
+export { Governor } from "./Governor.ts";
+export { HardwareRequirements } from "./HardwareRequirements.ts";
+export { HealthCheckId } from "./HealthCheckId.ts";
+export { HealthCheckResult } from "./HealthCheckResult.ts";
+export { HostAddress } from "./HostAddress.ts";
+export { HostId } from "./HostId.ts";
+export { HostInfo } from "./HostInfo.ts";
+export { HostKind } from "./HostKind.ts";
+export { Host } from "./Host.ts";
+export { ImageId } from "./ImageId.ts";
+export { InstalledState } from "./InstalledState.ts";
+export { InstallingInfo } from "./InstallingInfo.ts";
+export { InstallingState } from "./InstallingState.ts";
+export { IpInfo } from "./IpInfo.ts";
+export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams.ts";
+export { MainStatus } from "./MainStatus.ts";
+export { Manifest } from "./Manifest.ts";
+export { MaybeUtf8String } from "./MaybeUtf8String.ts";
+export { MountParams } from "./MountParams.ts";
+export { MountTarget } from "./MountTarget.ts";
+export { NamedProgress } from "./NamedProgress.ts";
+export { PackageDataEntry } from "./PackageDataEntry.ts";
+export { PackageId } from "./PackageId.ts";
+export { PackageState } from "./PackageState.ts";
+export { ParamsMaybePackageId } from "./ParamsMaybePackageId.ts";
+export { ParamsPackageId } from "./ParamsPackageId.ts";
+export { Progress } from "./Progress.ts";
+export { Public } from "./Public.ts";
+export { RemoveActionParams } from "./RemoveActionParams.ts";
+export { RemoveAddressParams } from "./RemoveAddressParams.ts";
+export { ReverseProxyBind } from "./ReverseProxyBind.ts";
+export { ReverseProxyDestination } from "./ReverseProxyDestination.ts";
+export { ReverseProxyHttp } from "./ReverseProxyHttp.ts";
+export { ReverseProxyParams } from "./ReverseProxyParams.ts";
+export { Security } from "./Security.ts";
+export { ServerInfo } from "./ServerInfo.ts";
+export { ServerSpecs } from "./ServerSpecs.ts";
+export { ServerStatus } from "./ServerStatus.ts";
+export { ServiceInterfaceId } from "./ServiceInterfaceId.ts";
+export { ServiceInterface } from "./ServiceInterface.ts";
+export { ServiceInterfaceType } from "./ServiceInterfaceType.ts";
+export { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo.ts";
+export { SetConfigured } from "./SetConfigured.ts";
+export { SetDependenciesParams } from "./SetDependenciesParams.ts";
+export { SetHealth } from "./SetHealth.ts";
+export { SetMainStatus } from "./SetMainStatus.ts";
+export { SetStoreParams } from "./SetStoreParams.ts";
+export { Status } from "./Status.ts";
+export { UpdateProgress } from "./UpdateProgress.ts";
+export { UpdatingState } from "./UpdatingState.ts";
+export { VolumeId } from "./VolumeId.ts";
+export { WifiInfo } from "./WifiInfo.ts";
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index 2fef6a4fa..ef3d2ccb0 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -6,6 +6,7 @@ export { setupManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
 export { setupExposeStore } from "./store/setupExposeStore"
 export { pathBuilder } from "./store/PathBuilder"
+
 export * as actions from "./actions"
 export * as backup from "./backup"
 export * as config from "./config"
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 3ddf79a36..c801d56cd 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -9,7 +9,7 @@ import { Daemons } from "./mainFn/Daemons"
 import { PathBuilder, StorePath } from "./store/PathBuilder"
 import { ExposedStorePaths } from "./store/setupExposeStore"
 import { UrlString } from "./util/getServiceInterface"
-
+export * from "../../core/startos/bindings"
 export { SDKManifest } from "./manifest/ManifestTypes"
 
 export type ExportedAction = (options: {

From f021ad9b0a4afdbdbabf3b96585eef8716587d6a Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 1 Apr 2024 13:14:22 -0600
Subject: [PATCH 126/341] export api types to ts (#2583)

---
 Makefile                                      |   2 +-
 core/Cargo.lock                               |   4 +-
 core/models/Cargo.toml                        |   2 +-
 core/startos/Cargo.toml                       |   2 +-
 core/startos/bindings/ActionParams.ts         |   9 +
 core/startos/bindings/AddImageParams.ts       |   4 +
 core/startos/bindings/AddParams.ts            |   4 +
 core/startos/bindings/ApplyParams.ts          |   3 +
 core/startos/bindings/AttachParams.ts         |   7 +
 core/startos/bindings/BackupParams.ts         |  11 +
 core/startos/bindings/BackupTargetFS.ts       |   7 +
 core/startos/bindings/BackupTargetId.ts       |   3 +
 core/startos/bindings/BlockDev.ts             |   3 +
 core/startos/bindings/Cifs.ts                 |   8 +
 core/startos/bindings/ConfigParams.ts         |   4 +
 core/startos/bindings/ConfigureParams.ts      |   7 +
 core/startos/bindings/ConnectParams.ts        |   4 +
 core/startos/bindings/ControlParams.ts        |   4 +
 core/startos/bindings/CreateParams.ts         |  10 +
 core/startos/bindings/DeleteBeforeParams.ts   |   3 +
 core/startos/bindings/DeleteParams.ts         |   3 +
 core/startos/bindings/DumpParams.ts           |   3 +
 core/startos/bindings/EchoParams.ts           |   3 +
 core/startos/bindings/EditManifestParams.ts   |   3 +
 core/startos/bindings/EncryptedWire.ts        |   3 +
 core/startos/bindings/ExecuteParams.ts        |  10 +
 core/startos/bindings/GetParams.ts            |   3 +
 core/startos/bindings/GovernorParams.ts       |   4 +
 core/startos/bindings/InfoParams.ts           |   4 +
 core/startos/bindings/InstallParams.ts        |  10 +
 core/startos/bindings/KernelLogsParams.ts     |   8 +
 core/startos/bindings/KillParams.ts           |   3 +
 core/startos/bindings/ListParams.ts           |   3 +
 core/startos/bindings/LoginParams.ts          |   8 +
 core/startos/bindings/LogoutParams.ts         |   3 +
 core/startos/bindings/LogsParams.ts           |   8 +
 core/startos/bindings/MinMax.ts               |   3 +
 core/startos/bindings/NotificationLevel.ts    |   3 +
 core/startos/bindings/PasswordType.ts         |   4 +
 core/startos/bindings/RecoverySource.ts       |   6 +
 core/startos/bindings/RemoveParams.ts         |   3 +
 core/startos/bindings/ResetParams.ts          |   3 +
 core/startos/bindings/ResetPasswordParams.ts  |   7 +
 core/startos/bindings/RestorePackageParams.ts |   9 +
 core/startos/bindings/Session.ts              |   3 +
 core/startos/bindings/SessionList.ts          |   4 +
 core/startos/bindings/Sessions.ts             |   5 +
 core/startos/bindings/SetCountryParams.ts     |   3 +
 core/startos/bindings/SetParams.ts            |   7 +
 core/startos/bindings/SshPubKey.ts            |   3 +
 core/startos/bindings/SsidParams.ts           |   3 +
 core/startos/bindings/UiParams.ts             |   3 +
 core/startos/bindings/UmountParams.ts         |   4 +
 core/startos/bindings/UninstallParams.ts      |   4 +
 core/startos/bindings/UpdateParams.ts         |   3 +
 core/startos/bindings/UpdateSystemParams.ts   |   3 +
 core/startos/bindings/VerifyCifsParams.ts     |   9 +
 core/startos/bindings/VerifyParams.ts         |   3 +
 core/startos/bindings/ZramParams.ts           |   3 +
 core/startos/bindings/index.ts                | 249 +++++++++++-------
 core/startos/src/action.rs                    |   7 +-
 core/startos/src/auth.rs                      |  36 ++-
 core/startos/src/backup/backup_bulk.rs        |   4 +-
 core/startos/src/backup/restore.rs            |   4 +-
 core/startos/src/backup/target/cifs.rs        |  10 +-
 core/startos/src/backup/target/mod.rs         |  15 +-
 core/startos/src/config/mod.rs                |   8 +-
 core/startos/src/control.rs                   |   4 +-
 core/startos/src/db/mod.rs                    |  13 +-
 core/startos/src/dependencies.rs              |   3 +-
 core/startos/src/diagnostic.rs                |   5 +-
 .../src/disk/mount/filesystem/block_dev.rs    |   4 +-
 .../startos/src/disk/mount/filesystem/cifs.rs |   3 +-
 core/startos/src/inspect.rs                   |  12 +-
 core/startos/src/install/mod.rs               |  10 +-
 core/startos/src/lib.rs                       |   4 +-
 core/startos/src/lxc/mod.rs                   |   9 +-
 core/startos/src/net/dhcp.rs                  |   4 +-
 core/startos/src/net/tor.rs                   |   8 +-
 core/startos/src/net/wifi.rs                  |  11 +-
 core/startos/src/notifications.rs             |  19 +-
 core/startos/src/os_install/mod.rs            |   4 +-
 core/startos/src/registry/admin.rs            |   1 +
 core/startos/src/registry/marketplace.rs      |   5 +-
 core/startos/src/s9pk/rpc.rs                  |   7 +-
 core/startos/src/s9pk/v1/mod.rs               |   4 +-
 core/startos/src/service/mod.rs               |   7 +-
 core/startos/src/service/rpc.rs               |   4 +-
 core/startos/src/setup.rs                     |  14 +-
 core/startos/src/ssh.rs                       |  11 +-
 core/startos/src/system.rs                    |  15 +-
 core/startos/src/update/mod.rs                |   5 +-
 core/startos/src/util/crypto.rs               |   9 +-
 core/startos/src/util/serde.rs                |   2 +-
 94 files changed, 629 insertions(+), 179 deletions(-)
 create mode 100644 core/startos/bindings/ActionParams.ts
 create mode 100644 core/startos/bindings/AddImageParams.ts
 create mode 100644 core/startos/bindings/AddParams.ts
 create mode 100644 core/startos/bindings/ApplyParams.ts
 create mode 100644 core/startos/bindings/AttachParams.ts
 create mode 100644 core/startos/bindings/BackupParams.ts
 create mode 100644 core/startos/bindings/BackupTargetFS.ts
 create mode 100644 core/startos/bindings/BackupTargetId.ts
 create mode 100644 core/startos/bindings/BlockDev.ts
 create mode 100644 core/startos/bindings/Cifs.ts
 create mode 100644 core/startos/bindings/ConfigParams.ts
 create mode 100644 core/startos/bindings/ConfigureParams.ts
 create mode 100644 core/startos/bindings/ConnectParams.ts
 create mode 100644 core/startos/bindings/ControlParams.ts
 create mode 100644 core/startos/bindings/CreateParams.ts
 create mode 100644 core/startos/bindings/DeleteBeforeParams.ts
 create mode 100644 core/startos/bindings/DeleteParams.ts
 create mode 100644 core/startos/bindings/DumpParams.ts
 create mode 100644 core/startos/bindings/EchoParams.ts
 create mode 100644 core/startos/bindings/EditManifestParams.ts
 create mode 100644 core/startos/bindings/EncryptedWire.ts
 create mode 100644 core/startos/bindings/ExecuteParams.ts
 create mode 100644 core/startos/bindings/GetParams.ts
 create mode 100644 core/startos/bindings/GovernorParams.ts
 create mode 100644 core/startos/bindings/InfoParams.ts
 create mode 100644 core/startos/bindings/InstallParams.ts
 create mode 100644 core/startos/bindings/KernelLogsParams.ts
 create mode 100644 core/startos/bindings/KillParams.ts
 create mode 100644 core/startos/bindings/ListParams.ts
 create mode 100644 core/startos/bindings/LoginParams.ts
 create mode 100644 core/startos/bindings/LogoutParams.ts
 create mode 100644 core/startos/bindings/LogsParams.ts
 create mode 100644 core/startos/bindings/MinMax.ts
 create mode 100644 core/startos/bindings/NotificationLevel.ts
 create mode 100644 core/startos/bindings/PasswordType.ts
 create mode 100644 core/startos/bindings/RecoverySource.ts
 create mode 100644 core/startos/bindings/RemoveParams.ts
 create mode 100644 core/startos/bindings/ResetParams.ts
 create mode 100644 core/startos/bindings/ResetPasswordParams.ts
 create mode 100644 core/startos/bindings/RestorePackageParams.ts
 create mode 100644 core/startos/bindings/Session.ts
 create mode 100644 core/startos/bindings/SessionList.ts
 create mode 100644 core/startos/bindings/Sessions.ts
 create mode 100644 core/startos/bindings/SetCountryParams.ts
 create mode 100644 core/startos/bindings/SetParams.ts
 create mode 100644 core/startos/bindings/SshPubKey.ts
 create mode 100644 core/startos/bindings/SsidParams.ts
 create mode 100644 core/startos/bindings/UiParams.ts
 create mode 100644 core/startos/bindings/UmountParams.ts
 create mode 100644 core/startos/bindings/UninstallParams.ts
 create mode 100644 core/startos/bindings/UpdateParams.ts
 create mode 100644 core/startos/bindings/UpdateSystemParams.ts
 create mode 100644 core/startos/bindings/VerifyCifsParams.ts
 create mode 100644 core/startos/bindings/VerifyParams.ts
 create mode 100644 core/startos/bindings/ZramParams.ts

diff --git a/Makefile b/Makefile
index 1d9f2cdaf..c988b11b8 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*') $(ENVIRONMENT_FILE)
 	rm -rf core/startos/bindings
 	(cd core/ && cargo test --features=test)
-	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1.ts";/g' > core/startos/bindings/index.ts
+	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1";/g' > core/startos/bindings/index.ts
 	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
 
 sdk/dist: $(shell git ls-files sdk) core/startos/bindings
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 305910a0a..5a5552829 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5400,7 +5400,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 [[package]]
 name = "ts-rs"
 version = "8.1.0"
-source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-type-override#3f7ff0f0f418c7fa1f1cf6b48697ca9e74f68201"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-as#d5f359d803158e06f47977a6f785878a82221d4f"
 dependencies = [
  "thiserror",
  "ts-rs-macros",
@@ -5409,7 +5409,7 @@ dependencies = [
 [[package]]
 name = "ts-rs-macros"
 version = "8.1.0"
-source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-type-override#3f7ff0f0f418c7fa1f1cf6b48697ca9e74f68201"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-as#d5f359d803158e06f47977a6f785878a82221d4f"
 dependencies = [
  "Inflector",
  "proc-macro2",
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index b6a506774..3611f45d5 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -32,7 +32,7 @@ sqlx = { version = "0.7.2", features = [
   "postgres",
 ] }
 ssh-key = "0.6.2"
-ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-type-override" } # "8"
+ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-as" } # "8"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies" }
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index d1a333447..12e2696ac 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -176,7 +176,7 @@ tracing-futures = "0.2.5"
 tracing-journald = "0.3.0"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 trust-dns-server = "0.23.1"
-ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-type-override" } # "8.1.0"
+ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-as" } # "8.1.0"
 typed-builder = "0.18.0"
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
diff --git a/core/startos/bindings/ActionParams.ts b/core/startos/bindings/ActionParams.ts
new file mode 100644
index 000000000..a57d7f72d
--- /dev/null
+++ b/core/startos/bindings/ActionParams.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId";
+import type { PackageId } from "./PackageId";
+
+export type ActionParams = {
+  id: PackageId;
+  actionId: ActionId;
+  input: { [key: string]: any } | null;
+};
diff --git a/core/startos/bindings/AddImageParams.ts b/core/startos/bindings/AddImageParams.ts
new file mode 100644
index 000000000..628c73354
--- /dev/null
+++ b/core/startos/bindings/AddImageParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ImageId } from "./ImageId";
+
+export type AddImageParams = { id: ImageId; image: string };
diff --git a/core/startos/bindings/AddParams.ts b/core/startos/bindings/AddParams.ts
new file mode 100644
index 000000000..03a4ea947
--- /dev/null
+++ b/core/startos/bindings/AddParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { SshPubKey } from "./SshPubKey";
+
+export type AddParams = { key: SshPubKey };
diff --git a/core/startos/bindings/ApplyParams.ts b/core/startos/bindings/ApplyParams.ts
new file mode 100644
index 000000000..5ace9cd38
--- /dev/null
+++ b/core/startos/bindings/ApplyParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ApplyParams = { expr: string; path: string | null };
diff --git a/core/startos/bindings/AttachParams.ts b/core/startos/bindings/AttachParams.ts
new file mode 100644
index 000000000..b3f7a23e7
--- /dev/null
+++ b/core/startos/bindings/AttachParams.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EncryptedWire } from "./EncryptedWire";
+
+export type AttachParams = {
+  startOsPassword: EncryptedWire | null;
+  guid: string;
+};
diff --git a/core/startos/bindings/BackupParams.ts b/core/startos/bindings/BackupParams.ts
new file mode 100644
index 000000000..d10e47425
--- /dev/null
+++ b/core/startos/bindings/BackupParams.ts
@@ -0,0 +1,11 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BackupTargetId } from "./BackupTargetId";
+import type { PackageId } from "./PackageId";
+import type { PasswordType } from "./PasswordType";
+
+export type BackupParams = {
+  targetId: BackupTargetId;
+  oldPassword: PasswordType | null;
+  packageIds: Array<PackageId> | null;
+  password: PasswordType;
+};
diff --git a/core/startos/bindings/BackupTargetFS.ts b/core/startos/bindings/BackupTargetFS.ts
new file mode 100644
index 000000000..99a56c3e4
--- /dev/null
+++ b/core/startos/bindings/BackupTargetFS.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BlockDev } from "./BlockDev";
+import type { Cifs } from "./Cifs";
+
+export type BackupTargetFS =
+  | ({ type: "disk" } & BlockDev)
+  | ({ type: "cifs" } & Cifs);
diff --git a/core/startos/bindings/BackupTargetId.ts b/core/startos/bindings/BackupTargetId.ts
new file mode 100644
index 000000000..e62366d97
--- /dev/null
+++ b/core/startos/bindings/BackupTargetId.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BackupTargetId = string;
diff --git a/core/startos/bindings/BlockDev.ts b/core/startos/bindings/BlockDev.ts
new file mode 100644
index 000000000..f98a545cb
--- /dev/null
+++ b/core/startos/bindings/BlockDev.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BlockDev = { logicalname: string };
diff --git a/core/startos/bindings/Cifs.ts b/core/startos/bindings/Cifs.ts
new file mode 100644
index 000000000..98c18afc7
--- /dev/null
+++ b/core/startos/bindings/Cifs.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Cifs = {
+  hostname: string;
+  path: string;
+  username: string;
+  password: string | null;
+};
diff --git a/core/startos/bindings/ConfigParams.ts b/core/startos/bindings/ConfigParams.ts
new file mode 100644
index 000000000..6c81b4691
--- /dev/null
+++ b/core/startos/bindings/ConfigParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export type ConfigParams = { id: PackageId };
diff --git a/core/startos/bindings/ConfigureParams.ts b/core/startos/bindings/ConfigureParams.ts
new file mode 100644
index 000000000..931e8b52e
--- /dev/null
+++ b/core/startos/bindings/ConfigureParams.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export type ConfigureParams = {
+  dependentId: PackageId;
+  dependencyId: PackageId;
+};
diff --git a/core/startos/bindings/ConnectParams.ts b/core/startos/bindings/ConnectParams.ts
new file mode 100644
index 000000000..df5f5c779
--- /dev/null
+++ b/core/startos/bindings/ConnectParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export type ConnectParams = { id: PackageId };
diff --git a/core/startos/bindings/ControlParams.ts b/core/startos/bindings/ControlParams.ts
new file mode 100644
index 000000000..32739363f
--- /dev/null
+++ b/core/startos/bindings/ControlParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export type ControlParams = { id: PackageId };
diff --git a/core/startos/bindings/CreateParams.ts b/core/startos/bindings/CreateParams.ts
new file mode 100644
index 000000000..4889f2ddf
--- /dev/null
+++ b/core/startos/bindings/CreateParams.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { NotificationLevel } from "./NotificationLevel";
+import type { PackageId } from "./PackageId";
+
+export type CreateParams = {
+  package: PackageId | null;
+  level: NotificationLevel;
+  title: string;
+  message: string;
+};
diff --git a/core/startos/bindings/DeleteBeforeParams.ts b/core/startos/bindings/DeleteBeforeParams.ts
new file mode 100644
index 000000000..55297106a
--- /dev/null
+++ b/core/startos/bindings/DeleteBeforeParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type DeleteBeforeParams = { before: number };
diff --git a/core/startos/bindings/DeleteParams.ts b/core/startos/bindings/DeleteParams.ts
new file mode 100644
index 000000000..34161c3b9
--- /dev/null
+++ b/core/startos/bindings/DeleteParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type DeleteParams = { fingerprint: string };
diff --git a/core/startos/bindings/DumpParams.ts b/core/startos/bindings/DumpParams.ts
new file mode 100644
index 000000000..88402caf4
--- /dev/null
+++ b/core/startos/bindings/DumpParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type DumpParams = {};
diff --git a/core/startos/bindings/EchoParams.ts b/core/startos/bindings/EchoParams.ts
new file mode 100644
index 000000000..16638a940
--- /dev/null
+++ b/core/startos/bindings/EchoParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EchoParams = { message: string };
diff --git a/core/startos/bindings/EditManifestParams.ts b/core/startos/bindings/EditManifestParams.ts
new file mode 100644
index 000000000..19fda62bf
--- /dev/null
+++ b/core/startos/bindings/EditManifestParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EditManifestParams = { expression: string };
diff --git a/core/startos/bindings/EncryptedWire.ts b/core/startos/bindings/EncryptedWire.ts
new file mode 100644
index 000000000..efffd7112
--- /dev/null
+++ b/core/startos/bindings/EncryptedWire.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EncryptedWire = { encrypted: any };
diff --git a/core/startos/bindings/ExecuteParams.ts b/core/startos/bindings/ExecuteParams.ts
new file mode 100644
index 000000000..eba6e1023
--- /dev/null
+++ b/core/startos/bindings/ExecuteParams.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EncryptedWire } from "./EncryptedWire";
+import type { RecoverySource } from "./RecoverySource";
+
+export type ExecuteParams = {
+  startOsLogicalname: string;
+  startOsPassword: EncryptedWire;
+  recoverySource: RecoverySource | null;
+  recoveryPassword: EncryptedWire | null;
+};
diff --git a/core/startos/bindings/GetParams.ts b/core/startos/bindings/GetParams.ts
new file mode 100644
index 000000000..cc045a267
--- /dev/null
+++ b/core/startos/bindings/GetParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GetParams = { url: string };
diff --git a/core/startos/bindings/GovernorParams.ts b/core/startos/bindings/GovernorParams.ts
new file mode 100644
index 000000000..2af25b061
--- /dev/null
+++ b/core/startos/bindings/GovernorParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Governor } from "./Governor";
+
+export type GovernorParams = { set: Governor | null };
diff --git a/core/startos/bindings/InfoParams.ts b/core/startos/bindings/InfoParams.ts
new file mode 100644
index 000000000..ae217103e
--- /dev/null
+++ b/core/startos/bindings/InfoParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BackupTargetId } from "./BackupTargetId";
+
+export type InfoParams = { targetId: BackupTargetId; password: string };
diff --git a/core/startos/bindings/InstallParams.ts b/core/startos/bindings/InstallParams.ts
new file mode 100644
index 000000000..394647cff
--- /dev/null
+++ b/core/startos/bindings/InstallParams.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { MinMax } from "./MinMax";
+import type { PackageId } from "./PackageId";
+
+export type InstallParams = {
+  id: PackageId;
+  marketplaceUrl: string | null;
+  versionSpec: string | null;
+  versionPriority: MinMax | null;
+};
diff --git a/core/startos/bindings/KernelLogsParams.ts b/core/startos/bindings/KernelLogsParams.ts
new file mode 100644
index 000000000..a820d7b74
--- /dev/null
+++ b/core/startos/bindings/KernelLogsParams.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type KernelLogsParams = {
+  limit: number | null;
+  cursor: string | null;
+  before: boolean;
+  follow: boolean;
+};
diff --git a/core/startos/bindings/KillParams.ts b/core/startos/bindings/KillParams.ts
new file mode 100644
index 000000000..75bf6a02e
--- /dev/null
+++ b/core/startos/bindings/KillParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type KillParams = { ids: Array<string> };
diff --git a/core/startos/bindings/ListParams.ts b/core/startos/bindings/ListParams.ts
new file mode 100644
index 000000000..759bf0667
--- /dev/null
+++ b/core/startos/bindings/ListParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ListParams = { before: number | null; limit: number | null };
diff --git a/core/startos/bindings/LoginParams.ts b/core/startos/bindings/LoginParams.ts
new file mode 100644
index 000000000..82765e23c
--- /dev/null
+++ b/core/startos/bindings/LoginParams.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PasswordType } from "./PasswordType";
+
+export type LoginParams = {
+  password: PasswordType | null;
+  userAgent: string | null;
+  metadata: any;
+};
diff --git a/core/startos/bindings/LogoutParams.ts b/core/startos/bindings/LogoutParams.ts
new file mode 100644
index 000000000..f11b9780e
--- /dev/null
+++ b/core/startos/bindings/LogoutParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type LogoutParams = { session: string };
diff --git a/core/startos/bindings/LogsParams.ts b/core/startos/bindings/LogsParams.ts
new file mode 100644
index 000000000..c6a74ec71
--- /dev/null
+++ b/core/startos/bindings/LogsParams.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type LogsParams = {
+  limit: number | null;
+  cursor: string | null;
+  before: boolean;
+  follow: boolean;
+};
diff --git a/core/startos/bindings/MinMax.ts b/core/startos/bindings/MinMax.ts
new file mode 100644
index 000000000..d5df4aa68
--- /dev/null
+++ b/core/startos/bindings/MinMax.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type MinMax = "min" | "max";
diff --git a/core/startos/bindings/NotificationLevel.ts b/core/startos/bindings/NotificationLevel.ts
new file mode 100644
index 000000000..8844083d4
--- /dev/null
+++ b/core/startos/bindings/NotificationLevel.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type NotificationLevel = "success" | "info" | "warning" | "error";
diff --git a/core/startos/bindings/PasswordType.ts b/core/startos/bindings/PasswordType.ts
new file mode 100644
index 000000000..0f36f60a2
--- /dev/null
+++ b/core/startos/bindings/PasswordType.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EncryptedWire } from "./EncryptedWire";
+
+export type PasswordType = EncryptedWire | string;
diff --git a/core/startos/bindings/RecoverySource.ts b/core/startos/bindings/RecoverySource.ts
new file mode 100644
index 000000000..7b4e9365a
--- /dev/null
+++ b/core/startos/bindings/RecoverySource.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BackupTargetFS } from "./BackupTargetFS";
+
+export type RecoverySource =
+  | { type: "migrate"; guid: string }
+  | { type: "backup"; target: BackupTargetFS };
diff --git a/core/startos/bindings/RemoveParams.ts b/core/startos/bindings/RemoveParams.ts
new file mode 100644
index 000000000..1424d6ffd
--- /dev/null
+++ b/core/startos/bindings/RemoveParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type RemoveParams = { guid: string };
diff --git a/core/startos/bindings/ResetParams.ts b/core/startos/bindings/ResetParams.ts
new file mode 100644
index 000000000..c8a585681
--- /dev/null
+++ b/core/startos/bindings/ResetParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ResetParams = { wipeState: boolean; reason: string };
diff --git a/core/startos/bindings/ResetPasswordParams.ts b/core/startos/bindings/ResetPasswordParams.ts
new file mode 100644
index 000000000..c7899206d
--- /dev/null
+++ b/core/startos/bindings/ResetPasswordParams.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PasswordType } from "./PasswordType";
+
+export type ResetPasswordParams = {
+  oldPassword: PasswordType | null;
+  newPassword: PasswordType | null;
+};
diff --git a/core/startos/bindings/RestorePackageParams.ts b/core/startos/bindings/RestorePackageParams.ts
new file mode 100644
index 000000000..95d34b5c1
--- /dev/null
+++ b/core/startos/bindings/RestorePackageParams.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BackupTargetId } from "./BackupTargetId";
+import type { PackageId } from "./PackageId";
+
+export type RestorePackageParams = {
+  ids: Array<PackageId>;
+  targetId: BackupTargetId;
+  password: string;
+};
diff --git a/core/startos/bindings/Session.ts b/core/startos/bindings/Session.ts
new file mode 100644
index 000000000..05a3ae65d
--- /dev/null
+++ b/core/startos/bindings/Session.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Session = { loggedIn: string; lastActive: string; metadata: any };
diff --git a/core/startos/bindings/SessionList.ts b/core/startos/bindings/SessionList.ts
new file mode 100644
index 000000000..ef1561188
--- /dev/null
+++ b/core/startos/bindings/SessionList.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Sessions } from "./Sessions";
+
+export type SessionList = { current: string; sessions: Sessions };
diff --git a/core/startos/bindings/Sessions.ts b/core/startos/bindings/Sessions.ts
new file mode 100644
index 000000000..a5ac67b65
--- /dev/null
+++ b/core/startos/bindings/Sessions.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Sessions = {
+  [key: string]: { loggedIn: string; lastActive: string; metadata: any };
+};
diff --git a/core/startos/bindings/SetCountryParams.ts b/core/startos/bindings/SetCountryParams.ts
new file mode 100644
index 000000000..a3bfb3b24
--- /dev/null
+++ b/core/startos/bindings/SetCountryParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetCountryParams = { country: string };
diff --git a/core/startos/bindings/SetParams.ts b/core/startos/bindings/SetParams.ts
new file mode 100644
index 000000000..1d7a835b6
--- /dev/null
+++ b/core/startos/bindings/SetParams.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Duration } from "./Duration";
+
+export type SetParams = {
+  timeout: Duration | null;
+  config: { [key: string]: any } | null;
+};
diff --git a/core/startos/bindings/SshPubKey.ts b/core/startos/bindings/SshPubKey.ts
new file mode 100644
index 000000000..edd45d0dc
--- /dev/null
+++ b/core/startos/bindings/SshPubKey.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SshPubKey = string;
diff --git a/core/startos/bindings/SsidParams.ts b/core/startos/bindings/SsidParams.ts
new file mode 100644
index 000000000..e5e0793ce
--- /dev/null
+++ b/core/startos/bindings/SsidParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SsidParams = { ssid: string };
diff --git a/core/startos/bindings/UiParams.ts b/core/startos/bindings/UiParams.ts
new file mode 100644
index 000000000..678723e08
--- /dev/null
+++ b/core/startos/bindings/UiParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UiParams = { pointer: string; value: any };
diff --git a/core/startos/bindings/UmountParams.ts b/core/startos/bindings/UmountParams.ts
new file mode 100644
index 000000000..e473af15f
--- /dev/null
+++ b/core/startos/bindings/UmountParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BackupTargetId } from "./BackupTargetId";
+
+export type UmountParams = { targetId: BackupTargetId | null };
diff --git a/core/startos/bindings/UninstallParams.ts b/core/startos/bindings/UninstallParams.ts
new file mode 100644
index 000000000..fd8c6fba7
--- /dev/null
+++ b/core/startos/bindings/UninstallParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId";
+
+export type UninstallParams = { id: PackageId };
diff --git a/core/startos/bindings/UpdateParams.ts b/core/startos/bindings/UpdateParams.ts
new file mode 100644
index 000000000..2c64f7dd8
--- /dev/null
+++ b/core/startos/bindings/UpdateParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UpdateParams = { interface: string };
diff --git a/core/startos/bindings/UpdateSystemParams.ts b/core/startos/bindings/UpdateSystemParams.ts
new file mode 100644
index 000000000..4e266ffdc
--- /dev/null
+++ b/core/startos/bindings/UpdateSystemParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UpdateSystemParams = { marketplaceUrl: string };
diff --git a/core/startos/bindings/VerifyCifsParams.ts b/core/startos/bindings/VerifyCifsParams.ts
new file mode 100644
index 000000000..6516243ad
--- /dev/null
+++ b/core/startos/bindings/VerifyCifsParams.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EncryptedWire } from "./EncryptedWire";
+
+export type VerifyCifsParams = {
+  hostname: string;
+  path: string;
+  username: string;
+  password: EncryptedWire | null;
+};
diff --git a/core/startos/bindings/VerifyParams.ts b/core/startos/bindings/VerifyParams.ts
new file mode 100644
index 000000000..49e963750
--- /dev/null
+++ b/core/startos/bindings/VerifyParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type VerifyParams = { path: string };
diff --git a/core/startos/bindings/ZramParams.ts b/core/startos/bindings/ZramParams.ts
new file mode 100644
index 000000000..b69c21349
--- /dev/null
+++ b/core/startos/bindings/ZramParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ZramParams = { enable: boolean };
diff --git a/core/startos/bindings/index.ts b/core/startos/bindings/index.ts
index 178e49c4f..d9c75c2d6 100644
--- a/core/startos/bindings/index.ts
+++ b/core/startos/bindings/index.ts
@@ -1,97 +1,152 @@
-export { ActionId } from "./ActionId.ts";
-export { ActionMetadata } from "./ActionMetadata.ts";
-export { AddressInfo } from "./AddressInfo.ts";
-export { AddSslOptions } from "./AddSslOptions.ts";
-export { Alerts } from "./Alerts.ts";
-export { Algorithm } from "./Algorithm.ts";
-export { AllowedStatuses } from "./AllowedStatuses.ts";
-export { AllPackageData } from "./AllPackageData.ts";
-export { AlpnInfo } from "./AlpnInfo.ts";
-export { BackupProgress } from "./BackupProgress.ts";
-export { BindInfo } from "./BindInfo.ts";
-export { BindOptions } from "./BindOptions.ts";
-export { BindParams } from "./BindParams.ts";
-export { Callback } from "./Callback.ts";
-export { ChrootParams } from "./ChrootParams.ts";
-export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams.ts";
-export { CurrentDependencies } from "./CurrentDependencies.ts";
-export { CurrentDependencyInfo } from "./CurrentDependencyInfo.ts";
-export { DataUrl } from "./DataUrl.ts";
-export { Dependencies } from "./Dependencies.ts";
-export { DependencyConfigErrors } from "./DependencyConfigErrors.ts";
-export { DependencyKind } from "./DependencyKind.ts";
-export { DependencyRequirement } from "./DependencyRequirement.ts";
-export { DepInfo } from "./DepInfo.ts";
-export { Description } from "./Description.ts";
-export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams.ts";
-export { Duration } from "./Duration.ts";
-export { ExecuteAction } from "./ExecuteAction.ts";
-export { ExportActionParams } from "./ExportActionParams.ts";
-export { ExportedHostInfo } from "./ExportedHostInfo.ts";
-export { ExportedHostnameInfo } from "./ExportedHostnameInfo.ts";
-export { ExportedIpHostname } from "./ExportedIpHostname.ts";
-export { ExportedOnionHostname } from "./ExportedOnionHostname.ts";
-export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams.ts";
-export { ExposeForDependentsParams } from "./ExposeForDependentsParams.ts";
-export { FullProgress } from "./FullProgress.ts";
-export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind.ts";
-export { GetHostInfoParams } from "./GetHostInfoParams.ts";
-export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams.ts";
-export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams.ts";
-export { GetServicePortForwardParams } from "./GetServicePortForwardParams.ts";
-export { GetSslCertificateParams } from "./GetSslCertificateParams.ts";
-export { GetSslKeyParams } from "./GetSslKeyParams.ts";
-export { GetStoreParams } from "./GetStoreParams.ts";
-export { GetSystemSmtpParams } from "./GetSystemSmtpParams.ts";
-export { Governor } from "./Governor.ts";
-export { HardwareRequirements } from "./HardwareRequirements.ts";
-export { HealthCheckId } from "./HealthCheckId.ts";
-export { HealthCheckResult } from "./HealthCheckResult.ts";
-export { HostAddress } from "./HostAddress.ts";
-export { HostId } from "./HostId.ts";
-export { HostInfo } from "./HostInfo.ts";
-export { HostKind } from "./HostKind.ts";
-export { Host } from "./Host.ts";
-export { ImageId } from "./ImageId.ts";
-export { InstalledState } from "./InstalledState.ts";
-export { InstallingInfo } from "./InstallingInfo.ts";
-export { InstallingState } from "./InstallingState.ts";
-export { IpInfo } from "./IpInfo.ts";
-export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams.ts";
-export { MainStatus } from "./MainStatus.ts";
-export { Manifest } from "./Manifest.ts";
-export { MaybeUtf8String } from "./MaybeUtf8String.ts";
-export { MountParams } from "./MountParams.ts";
-export { MountTarget } from "./MountTarget.ts";
-export { NamedProgress } from "./NamedProgress.ts";
-export { PackageDataEntry } from "./PackageDataEntry.ts";
-export { PackageId } from "./PackageId.ts";
-export { PackageState } from "./PackageState.ts";
-export { ParamsMaybePackageId } from "./ParamsMaybePackageId.ts";
-export { ParamsPackageId } from "./ParamsPackageId.ts";
-export { Progress } from "./Progress.ts";
-export { Public } from "./Public.ts";
-export { RemoveActionParams } from "./RemoveActionParams.ts";
-export { RemoveAddressParams } from "./RemoveAddressParams.ts";
-export { ReverseProxyBind } from "./ReverseProxyBind.ts";
-export { ReverseProxyDestination } from "./ReverseProxyDestination.ts";
-export { ReverseProxyHttp } from "./ReverseProxyHttp.ts";
-export { ReverseProxyParams } from "./ReverseProxyParams.ts";
-export { Security } from "./Security.ts";
-export { ServerInfo } from "./ServerInfo.ts";
-export { ServerSpecs } from "./ServerSpecs.ts";
-export { ServerStatus } from "./ServerStatus.ts";
-export { ServiceInterfaceId } from "./ServiceInterfaceId.ts";
-export { ServiceInterface } from "./ServiceInterface.ts";
-export { ServiceInterfaceType } from "./ServiceInterfaceType.ts";
-export { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo.ts";
-export { SetConfigured } from "./SetConfigured.ts";
-export { SetDependenciesParams } from "./SetDependenciesParams.ts";
-export { SetHealth } from "./SetHealth.ts";
-export { SetMainStatus } from "./SetMainStatus.ts";
-export { SetStoreParams } from "./SetStoreParams.ts";
-export { Status } from "./Status.ts";
-export { UpdateProgress } from "./UpdateProgress.ts";
-export { UpdatingState } from "./UpdatingState.ts";
-export { VolumeId } from "./VolumeId.ts";
-export { WifiInfo } from "./WifiInfo.ts";
+export { ActionId } from "./ActionId";
+export { ActionMetadata } from "./ActionMetadata";
+export { ActionParams } from "./ActionParams";
+export { AddImageParams } from "./AddImageParams";
+export { AddParams } from "./AddParams";
+export { AddressInfo } from "./AddressInfo";
+export { AddSslOptions } from "./AddSslOptions";
+export { Alerts } from "./Alerts";
+export { Algorithm } from "./Algorithm";
+export { AllowedStatuses } from "./AllowedStatuses";
+export { AllPackageData } from "./AllPackageData";
+export { AlpnInfo } from "./AlpnInfo";
+export { ApplyParams } from "./ApplyParams";
+export { AttachParams } from "./AttachParams";
+export { BackupParams } from "./BackupParams";
+export { BackupProgress } from "./BackupProgress";
+export { BackupTargetFS } from "./BackupTargetFS";
+export { BackupTargetId } from "./BackupTargetId";
+export { BindInfo } from "./BindInfo";
+export { BindOptions } from "./BindOptions";
+export { BindParams } from "./BindParams";
+export { BlockDev } from "./BlockDev";
+export { Callback } from "./Callback";
+export { ChrootParams } from "./ChrootParams";
+export { Cifs } from "./Cifs";
+export { ConfigParams } from "./ConfigParams";
+export { ConfigureParams } from "./ConfigureParams";
+export { ConnectParams } from "./ConnectParams";
+export { ControlParams } from "./ControlParams";
+export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams";
+export { CreateParams } from "./CreateParams";
+export { CurrentDependencies } from "./CurrentDependencies";
+export { CurrentDependencyInfo } from "./CurrentDependencyInfo";
+export { DataUrl } from "./DataUrl";
+export { DeleteBeforeParams } from "./DeleteBeforeParams";
+export { DeleteParams } from "./DeleteParams";
+export { Dependencies } from "./Dependencies";
+export { DependencyConfigErrors } from "./DependencyConfigErrors";
+export { DependencyKind } from "./DependencyKind";
+export { DependencyRequirement } from "./DependencyRequirement";
+export { DepInfo } from "./DepInfo";
+export { Description } from "./Description";
+export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams";
+export { DumpParams } from "./DumpParams";
+export { Duration } from "./Duration";
+export { EchoParams } from "./EchoParams";
+export { EditManifestParams } from "./EditManifestParams";
+export { EncryptedWire } from "./EncryptedWire";
+export { ExecuteAction } from "./ExecuteAction";
+export { ExecuteParams } from "./ExecuteParams";
+export { ExportActionParams } from "./ExportActionParams";
+export { ExportedHostInfo } from "./ExportedHostInfo";
+export { ExportedHostnameInfo } from "./ExportedHostnameInfo";
+export { ExportedIpHostname } from "./ExportedIpHostname";
+export { ExportedOnionHostname } from "./ExportedOnionHostname";
+export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams";
+export { ExposeForDependentsParams } from "./ExposeForDependentsParams";
+export { FullProgress } from "./FullProgress";
+export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind";
+export { GetHostInfoParams } from "./GetHostInfoParams";
+export { GetParams } from "./GetParams";
+export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams";
+export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams";
+export { GetServicePortForwardParams } from "./GetServicePortForwardParams";
+export { GetSslCertificateParams } from "./GetSslCertificateParams";
+export { GetSslKeyParams } from "./GetSslKeyParams";
+export { GetStoreParams } from "./GetStoreParams";
+export { GetSystemSmtpParams } from "./GetSystemSmtpParams";
+export { GovernorParams } from "./GovernorParams";
+export { Governor } from "./Governor";
+export { HardwareRequirements } from "./HardwareRequirements";
+export { HealthCheckId } from "./HealthCheckId";
+export { HealthCheckResult } from "./HealthCheckResult";
+export { HostAddress } from "./HostAddress";
+export { HostId } from "./HostId";
+export { HostInfo } from "./HostInfo";
+export { HostKind } from "./HostKind";
+export { Host } from "./Host";
+export { ImageId } from "./ImageId";
+export { InfoParams } from "./InfoParams";
+export { InstalledState } from "./InstalledState";
+export { InstallingInfo } from "./InstallingInfo";
+export { InstallingState } from "./InstallingState";
+export { InstallParams } from "./InstallParams";
+export { IpInfo } from "./IpInfo";
+export { KernelLogsParams } from "./KernelLogsParams";
+export { KillParams } from "./KillParams";
+export { ListParams } from "./ListParams";
+export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams";
+export { LoginParams } from "./LoginParams";
+export { LogoutParams } from "./LogoutParams";
+export { LogsParams } from "./LogsParams";
+export { MainStatus } from "./MainStatus";
+export { Manifest } from "./Manifest";
+export { MaybeUtf8String } from "./MaybeUtf8String";
+export { MinMax } from "./MinMax";
+export { MountParams } from "./MountParams";
+export { MountTarget } from "./MountTarget";
+export { NamedProgress } from "./NamedProgress";
+export { NotificationLevel } from "./NotificationLevel";
+export { PackageDataEntry } from "./PackageDataEntry";
+export { PackageId } from "./PackageId";
+export { PackageState } from "./PackageState";
+export { ParamsMaybePackageId } from "./ParamsMaybePackageId";
+export { ParamsPackageId } from "./ParamsPackageId";
+export { PasswordType } from "./PasswordType";
+export { Progress } from "./Progress";
+export { Public } from "./Public";
+export { RecoverySource } from "./RecoverySource";
+export { RemoveActionParams } from "./RemoveActionParams";
+export { RemoveAddressParams } from "./RemoveAddressParams";
+export { RemoveParams } from "./RemoveParams";
+export { ResetParams } from "./ResetParams";
+export { ResetPasswordParams } from "./ResetPasswordParams";
+export { RestorePackageParams } from "./RestorePackageParams";
+export { ReverseProxyBind } from "./ReverseProxyBind";
+export { ReverseProxyDestination } from "./ReverseProxyDestination";
+export { ReverseProxyHttp } from "./ReverseProxyHttp";
+export { ReverseProxyParams } from "./ReverseProxyParams";
+export { Security } from "./Security";
+export { ServerInfo } from "./ServerInfo";
+export { ServerSpecs } from "./ServerSpecs";
+export { ServerStatus } from "./ServerStatus";
+export { ServiceInterfaceId } from "./ServiceInterfaceId";
+export { ServiceInterface } from "./ServiceInterface";
+export { ServiceInterfaceType } from "./ServiceInterfaceType";
+export { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo";
+export { SessionList } from "./SessionList";
+export { Sessions } from "./Sessions";
+export { Session } from "./Session";
+export { SetConfigured } from "./SetConfigured";
+export { SetCountryParams } from "./SetCountryParams";
+export { SetDependenciesParams } from "./SetDependenciesParams";
+export { SetHealth } from "./SetHealth";
+export { SetMainStatus } from "./SetMainStatus";
+export { SetParams } from "./SetParams";
+export { SetStoreParams } from "./SetStoreParams";
+export { SshPubKey } from "./SshPubKey";
+export { SsidParams } from "./SsidParams";
+export { Status } from "./Status";
+export { UiParams } from "./UiParams";
+export { UmountParams } from "./UmountParams";
+export { UninstallParams } from "./UninstallParams";
+export { UpdateParams } from "./UpdateParams";
+export { UpdateProgress } from "./UpdateProgress";
+export { UpdateSystemParams } from "./UpdateSystemParams";
+export { UpdatingState } from "./UpdatingState";
+export { VerifyCifsParams } from "./VerifyCifsParams";
+export { VerifyParams } from "./VerifyParams";
+export { VolumeId } from "./VolumeId";
+export { WifiInfo } from "./WifiInfo";
+export { ZramParams } from "./ZramParams";
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index ff3998c3c..1a32856c2 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -4,6 +4,7 @@ use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::config::Config;
 use crate::context::RpcContext;
@@ -47,17 +48,17 @@ pub fn display_action_result(params: WithIoFormat<ActionParams>, result: ActionR
     }
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ActionParams {
     #[arg(id = "id")]
     #[serde(rename = "id")]
     pub package_id: PackageId,
-    #[arg(id = "action-id")]
-    #[serde(rename = "action-id")]
     pub action_id: ActionId,
     #[command(flatten)]
+    #[ts(type = "{ [key: string]: any } | null")]
     pub input: StdinDeserializable<Option<Config>>,
 }
 // impl C
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 7adce72bc..f8e2d25a0 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -9,6 +9,7 @@ use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{command, from_fn_async, AnyContext, CallRemote, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::db::model::DatabaseModel;
@@ -20,7 +21,8 @@ use crate::util::crypto::EncryptedWire;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::{ensure_code, Error, ResultExt};
 
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[derive(Debug, Clone, Default, Deserialize, Serialize, TS)]
+#[ts(as = "BTreeMap::<String, Session>")]
 pub struct Sessions(pub BTreeMap<InternedString, Session>);
 impl Sessions {
     pub fn new() -> Self {
@@ -38,8 +40,9 @@ impl Map for Sessions {
     }
 }
 
-#[derive(Clone, Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize, TS)]
 #[serde(untagged)]
+#[ts(export)]
 pub enum PasswordType {
     EncryptedWire(EncryptedWire),
     String(String),
@@ -177,14 +180,16 @@ pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<(
     Ok(())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct LoginParams {
     password: Option<PasswordType>,
     #[serde(default)]
     user_agent: Option<String>,
     #[serde(default)]
+    #[ts(type = "any")]
     metadata: Value,
 }
 
@@ -218,10 +223,12 @@ pub async fn login_impl(
         .await
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct LogoutParams {
+    #[ts(type = "string")]
     session: InternedString,
 }
 
@@ -234,18 +241,25 @@ pub async fn logout(
     ))
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct Session {
+    #[ts(type = "string")]
     pub logged_in: DateTime<Utc>,
+    #[ts(type = "string")]
     pub last_active: DateTime<Utc>,
+    #[ts(skip)]
     pub user_agent: Option<String>,
+    #[ts(type = "any")]
     pub metadata: Value,
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct SessionList {
+    #[ts(type = "string")]
     current: InternedString,
     sessions: Sessions,
 }
@@ -303,11 +317,13 @@ fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) {
     table.print_tty(false).unwrap();
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ListParams {
     #[arg(skip)]
+    #[ts(skip)]
     session: InternedString,
 }
 
@@ -338,9 +354,10 @@ impl AsLogoutSessionId for KillSessionId {
     }
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct KillParams {
     ids: Vec<String>,
 }
@@ -351,9 +368,10 @@ pub async fn kill(ctx: RpcContext, KillParams { ids }: KillParams) -> Result<(),
     Ok(())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ResetPasswordParams {
     old_password: Option<PasswordType>,
     new_password: Option<PasswordType>,
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index b9f1b877e..9a2784161 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -11,6 +11,7 @@ use models::PackageId;
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWriteExt;
 use tracing::instrument;
+use ts_rs::TS;
 
 use super::target::BackupTargetId;
 use super::PackageBackupReport;
@@ -29,9 +30,10 @@ use crate::util::io::dir_copy;
 use crate::util::serde::IoFormat;
 use crate::version::VersionT;
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct BackupParams {
     target_id: BackupTargetId,
     #[arg(long = "old-password")]
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 70695b42e..277d4390d 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -9,6 +9,7 @@ use patch_db::json_ptr::ROOT;
 use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
 use tracing::instrument;
+use ts_rs::TS;
 
 use super::target::BackupTargetId;
 use crate::backup::os::OsBackup;
@@ -24,9 +25,10 @@ use crate::s9pk::S9pk;
 use crate::service::service_map::DownloadInstallFuture;
 use crate::util::serde::IoFormat;
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct RestorePackageParams {
     pub ids: Vec<PackageId>,
     pub target_id: BackupTargetId,
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index a3bbb9759..b50004dc6 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -6,6 +6,7 @@ use color_eyre::eyre::eyre;
 use imbl_value::InternedString;
 use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use super::{BackupTarget, BackupTargetId};
 use crate::context::{CliContext, RpcContext};
@@ -67,9 +68,10 @@ pub fn cifs() -> ParentHandler {
         )
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct AddParams {
     pub hostname: String,
     pub path: PathBuf,
@@ -121,9 +123,10 @@ pub async fn add(
     })
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct UpdateParams {
     pub id: BackupTargetId,
     pub hostname: String,
@@ -185,9 +188,10 @@ pub async fn update(
     })
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct RemoveParams {
     pub id: BackupTargetId,
 }
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index ac48d75a6..7925cadff 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -13,6 +13,7 @@ use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 use tokio::sync::Mutex;
 use tracing::instrument;
+use ts_rs::TS;
 
 use self::cifs::CifsBackupTarget;
 use crate::context::{CliContext, RpcContext};
@@ -46,7 +47,8 @@ pub enum BackupTarget {
     Cifs(CifsBackupTarget),
 }
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, TS)]
+#[ts(type = "string")]
 pub enum BackupTargetId {
     Disk { logicalname: PathBuf },
     Cifs { id: u32 },
@@ -107,7 +109,7 @@ impl Serialize for BackupTargetId {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(tag = "type")]
 #[serde(rename_all = "camelCase")]
 pub enum BackupTargetFS {
@@ -242,9 +244,10 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
     table.print_tty(false).unwrap();
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct InfoParams {
     target_id: BackupTargetId,
     password: String,
@@ -276,9 +279,10 @@ lazy_static::lazy_static! {
         Mutex::new(BTreeMap::new());
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct MountParams {
     target_id: BackupTargetId,
     password: String,
@@ -311,9 +315,10 @@ pub async fn mount(
     Ok(res)
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct UmountParams {
     target_id: Option<BackupTargetId>,
 }
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index 18f67b05a..484d13b02 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -12,6 +12,7 @@ use regex::Regex;
 use rpc_toolkit::{from_fn_async, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
@@ -125,9 +126,10 @@ pub enum MatchError {
     ListUniquenessViolation,
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ConfigParams {
     pub id: PackageId,
 }
@@ -156,12 +158,14 @@ pub async fn get(ctx: RpcContext, _: Empty, id: PackageId) -> Result<ConfigRes,
         .await
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct SetParams {
     #[arg(long = "timeout")]
     pub timeout: Option<crate::util::serde::Duration>,
     #[command(flatten)]
+    #[ts(type = "{ [key: string]: any } | null")]
     pub config: StdinDeserializable<Option<Config>>,
 }
 
diff --git a/core/startos/src/control.rs b/core/startos/src/control.rs
index e37c88ee4..11036858a 100644
--- a/core/startos/src/control.rs
+++ b/core/startos/src/control.rs
@@ -4,14 +4,16 @@ use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::RpcContext;
 use crate::prelude::*;
 use crate::Error;
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ControlParams {
     pub id: PackageId,
 }
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 99602ba5a..8e28c0f3c 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -19,6 +19,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use tokio::sync::oneshot;
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::middleware::auth::{HasValidSession, HashSessionToken};
@@ -215,12 +216,14 @@ async fn cli_dump(
     Ok(dump)
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct DumpParams {
     #[arg(long = "include-private", short = 'p')]
     #[serde(default)]
+    #[ts(skip)]
     include_private: bool,
 }
 
@@ -271,9 +274,10 @@ async fn cli_apply(
     Ok(())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ApplyParams {
     expr: String,
     path: Option<PathBuf>,
@@ -309,11 +313,14 @@ pub fn put() -> ParentHandler {
             .with_remote_cli::<CliContext>(),
     )
 }
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct UiParams {
+    #[ts(type = "string")]
     pointer: JsonPointer,
+    #[ts(type = "any")]
     value: Value,
 }
 
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index d973688e9..936d1788b 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -43,9 +43,10 @@ pub struct DepInfo {
     pub optional: bool,
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ConfigureParams {
     dependent_id: PackageId,
     dependency_id: PackageId,
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index b0820b293..86c3a4dd5 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -5,6 +5,7 @@ use clap::Parser;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{command, from_fn, from_fn_async, AnyContext, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use crate::context::{CliContext, DiagnosticContext};
 use crate::init::SYSTEM_REBUILD_PATH;
@@ -40,10 +41,12 @@ pub fn error(ctx: DiagnosticContext) -> Result<Arc<RpcError>, Error> {
     Ok(ctx.error.clone())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct LogsParams {
+    #[ts(type = "number | null")]
     limit: Option<usize>,
     cursor: Option<String>,
     before: bool,
diff --git a/core/startos/src/disk/mount/filesystem/block_dev.rs b/core/startos/src/disk/mount/filesystem/block_dev.rs
index 96e9d79a7..7bbef2a77 100644
--- a/core/startos/src/disk/mount/filesystem/block_dev.rs
+++ b/core/startos/src/disk/mount/filesystem/block_dev.rs
@@ -5,12 +5,14 @@ use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
+use ts_rs::TS;
 
 use super::FileSystem;
 use crate::prelude::*;
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(concrete(LogicalName = std::path::PathBuf))]
 pub struct BlockDev<LogicalName: AsRef<Path>> {
     logicalname: LogicalName,
 }
diff --git a/core/startos/src/disk/mount/filesystem/cifs.rs b/core/startos/src/disk/mount/filesystem/cifs.rs
index e125b9a90..87509f150 100644
--- a/core/startos/src/disk/mount/filesystem/cifs.rs
+++ b/core/startos/src/disk/mount/filesystem/cifs.rs
@@ -8,6 +8,7 @@ use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 use tokio::process::Command;
 use tracing::instrument;
+use ts_rs::TS;
 
 use super::{FileSystem, MountType, ReadOnly};
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
@@ -62,7 +63,7 @@ pub async fn mount_cifs(
     Ok(())
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 pub struct Cifs {
     pub hostname: String,
diff --git a/core/startos/src/inspect.rs b/core/startos/src/inspect.rs
index 3fe84d06f..3e95faa6c 100644
--- a/core/startos/src/inspect.rs
+++ b/core/startos/src/inspect.rs
@@ -23,9 +23,10 @@ pub fn inspect() -> ParentHandler {
         .subcommand("docker-images", from_fn_async(docker_images).no_display())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct HashParams {
     path: PathBuf,
 }
@@ -38,9 +39,10 @@ pub async fn hash(_: CliContext, HashParams { path }: HashParams) -> Result<Stri
         .to_owned())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ManifestParams {
     path: PathBuf,
     #[arg(long = "no-verify")]
@@ -56,9 +58,10 @@ pub async fn manifest(
     todo!()
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct InspectParams {
     path: PathBuf,
     #[arg(long = "no-verify")]
@@ -88,9 +91,10 @@ pub async fn icon(
     .await?;
     Ok(())
 }
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct InstructionParams {
     path: PathBuf,
     #[arg(long = "no-verify")]
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 72a7fe9ee..40006798a 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tokio::sync::oneshot;
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
@@ -63,7 +64,7 @@ pub async fn list(ctx: RpcContext) -> Result<Value, Error> {
         .collect())
 }
 
-#[derive(Debug, Clone, Copy, serde::Deserialize, serde::Serialize)]
+#[derive(Debug, Clone, Copy, serde::Deserialize, serde::Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 pub enum MinMax {
     Min,
@@ -102,12 +103,14 @@ impl std::fmt::Display for MinMax {
     }
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct InstallParams {
     id: PackageId,
     #[arg(short = 'm', long = "marketplace-url")]
+    #[ts(type = "string | null")]
     marketplace_url: Option<Url>,
     #[arg(short = 'v', long = "version-spec")]
     version_spec: Option<String>,
@@ -391,9 +394,10 @@ pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<()
     Ok(())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct UninstallParams {
     id: PackageId,
 }
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 0b3336783..c048ae61c 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -75,13 +75,15 @@ use rpc_toolkit::{
     command, from_fn, from_fn_async, from_fn_blocking, AnyContext, HandlerExt, ParentHandler,
 };
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use crate::context::CliContext;
 use crate::util::serde::HandlerExtSerde;
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct EchoParams {
     message: String,
 }
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index f77837238..26d2d6a37 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -20,6 +20,7 @@ use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio::process::Command;
 use tokio::sync::Mutex;
 use tokio::time::Instant;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
@@ -351,8 +352,10 @@ pub async fn list(ctx: RpcContext) -> Result<Vec<InternedString>, Error> {
     Ok(ctx.dev.lxc.lock().await.keys().cloned().collect())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
 pub struct RemoveParams {
+    #[ts(type = "string")]
     pub guid: InternedString,
 }
 
@@ -363,8 +366,10 @@ pub async fn remove(ctx: RpcContext, RemoveParams { guid }: RemoveParams) -> Res
     Ok(())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
 pub struct ConnectParams {
+    #[ts(type = "string")]
     pub guid: InternedString,
 }
 
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index f36df0e28..ce5de96ba 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -6,6 +6,7 @@ use futures::TryStreamExt;
 use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::sync::RwLock;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::db::model::public::IpInfo;
@@ -60,9 +61,10 @@ pub fn dhcp() -> ParentHandler {
             .with_remote_cli::<CliContext>(),
     )
 }
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct UpdateParams {
     interface: String,
 }
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index c87f506dc..7b5e848f1 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -22,6 +22,7 @@ use tokio::time::Instant;
 use torut::control::{AsyncEvent, AuthenticatedConn, ConnError};
 use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::logs::{
@@ -104,9 +105,10 @@ pub fn tor() -> ParentHandler {
                 .with_remote_cli::<CliContext>(),
         )
 }
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ResetParams {
     #[arg(name = "wipe-state", short = 'w', long = "wipe-state")]
     wipe_state: bool,
@@ -142,11 +144,13 @@ pub async fn list_services(ctx: RpcContext, _: Empty) -> Result<Vec<OnionAddress
     ctx.net_controller.tor.list_services().await
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct LogsParams {
     #[arg(short = 'l', long = "limit")]
+    #[ts(type = "number | null")]
     limit: Option<usize>,
     #[arg(short = 'c', long = "cursor")]
     cursor: Option<String>,
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index 2202f5e57..38d9e3015 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -13,6 +13,7 @@ use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use tokio::sync::RwLock;
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
@@ -87,9 +88,10 @@ pub fn country() -> ParentHandler {
     )
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct AddParams {
     ssid: String,
     password: String,
@@ -138,9 +140,10 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
     }
     Ok(())
 }
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct SsidParams {
     ssid: String,
 }
@@ -402,11 +405,13 @@ pub async fn get_available(ctx: RpcContext, _: Empty) -> Result<Vec<WifiListOut>
     Ok(wifi_list)
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct SetCountryParams {
     #[arg(value_parser = CountryCodeParser)]
+    #[ts(type = "string")]
     country: CountryCode,
 }
 pub async fn set_country(
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index e774d912e..8daf42f59 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -11,6 +11,7 @@ use models::PackageId;
 use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::backup::BackupReport;
 use crate::context::{CliContext, RpcContext};
@@ -48,11 +49,14 @@ pub fn notification() -> ParentHandler {
         )
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ListParams {
+    #[ts(type = "number | null")]
     before: Option<u32>,
+    #[ts(type = "number | null")]
     limit: Option<usize>,
 }
 // #[command(display(display_serializable))]
@@ -110,10 +114,12 @@ pub async fn list(
         .await
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct DeleteParams {
+    #[ts(type = "number")]
     id: u32,
 }
 
@@ -125,10 +131,12 @@ pub async fn delete(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Resul
         })
         .await
 }
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct DeleteBeforeParams {
+    #[ts(type = "number")]
     before: u32,
 }
 
@@ -148,9 +156,10 @@ pub async fn delete_before(
         .await
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct CreateParams {
     package: Option<PackageId>,
     level: NotificationLevel,
@@ -172,7 +181,7 @@ pub async fn create(
         .await
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 pub enum NotificationLevel {
     Success,
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 6d55741f4..e35cab617 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -6,6 +6,7 @@ use models::Error;
 use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
+use ts_rs::TS;
 
 use crate::context::config::ServerConfig;
 use crate::context::{CliContext, InstallContext};
@@ -112,9 +113,10 @@ async fn partition(disk: &mut DiskInfo, overwrite: bool) -> Result<OsPartitionIn
     }
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ExecuteParams {
     logicalname: PathBuf,
     #[arg(short = 'o')]
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 83dc2ff10..968393e4e 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -9,6 +9,7 @@ use indicatif::{ProgressBar, ProgressStyle};
 use reqwest::{header, Body, Client, Url};
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use crate::context::CliContext;
 use crate::s9pk::S9pk;
diff --git a/core/startos/src/registry/marketplace.rs b/core/startos/src/registry/marketplace.rs
index 1807b3397..d60a6f3c6 100644
--- a/core/startos/src/registry/marketplace.rs
+++ b/core/startos/src/registry/marketplace.rs
@@ -5,6 +5,7 @@ use reqwest::{StatusCode, Url};
 use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::version::VersionT;
@@ -36,10 +37,12 @@ pub fn with_query_params(ctx: RpcContext, mut url: Url) -> Url {
     url
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct GetParams {
+    #[ts(type = "string")]
     url: Url,
 }
 
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index 3a98da02b..b3203bd47 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -8,6 +8,7 @@ use rpc_toolkit::{from_fn_async, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::fs::File;
 use tokio::process::Command;
+use ts_rs::TS;
 
 use crate::context::CliContext;
 use crate::prelude::*;
@@ -67,7 +68,8 @@ fn inspect() -> ParentHandler<S9pkPath> {
         )
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
 struct AddImageParams {
     id: ImageId,
     image: String,
@@ -183,7 +185,8 @@ async fn add_image(
     Ok(())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
 struct EditManifestParams {
     expression: String,
 }
diff --git a/core/startos/src/s9pk/v1/mod.rs b/core/startos/src/s9pk/v1/mod.rs
index 2f95f0813..9623d7f36 100644
--- a/core/startos/src/s9pk/v1/mod.rs
+++ b/core/startos/src/s9pk/v1/mod.rs
@@ -2,6 +2,7 @@ use std::path::PathBuf;
 
 use clap::Parser;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 pub mod builder;
 pub mod docker;
@@ -12,9 +13,10 @@ pub mod reader;
 
 pub const SIG_CONTEXT: &[u8] = b"s9pk";
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct VerifyParams {
     pub path: PathBuf,
 }
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index a10857c5a..dcac05ce3 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -11,7 +11,9 @@ use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, Handler, HandlerArgs}
 use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
 use tokio::sync::Notify;
+use ts_rs::TS;
 
+use crate::action::ActionResult;
 use crate::config::action::ConfigRes;
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::RequestGuid;
@@ -28,8 +30,8 @@ use crate::service::transition::TransitionKind;
 use crate::status::health_check::HealthCheckResult;
 use crate::status::MainStatus;
 use crate::util::actor::{Actor, BackgroundJobs, SimpleActor};
+use crate::util::serde::Pem;
 use crate::volume::data_dir;
-use crate::{action::ActionResult, util::serde::Pem};
 
 pub mod cli;
 mod config;
@@ -498,7 +500,8 @@ impl Actor for ServiceActor {
     }
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
 pub struct ConnectParams {
     pub id: PackageId,
 }
diff --git a/core/startos/src/service/rpc.rs b/core/startos/src/service/rpc.rs
index 6823a7189..65c8b98fe 100644
--- a/core/startos/src/service/rpc.rs
+++ b/core/startos/src/service/rpc.rs
@@ -4,6 +4,7 @@ use imbl_value::Value;
 use models::ProcedureName;
 use rpc_toolkit::yajrc::RpcMethod;
 use rpc_toolkit::Empty;
+use ts_rs::TS;
 
 use crate::prelude::*;
 
@@ -43,9 +44,10 @@ impl serde::Serialize for Exit {
     }
 }
 
-#[derive(Clone, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize, TS)]
 pub struct ExecuteParams {
     procedure: String,
+    #[ts(type = "any")]
     input: Value,
     timeout: Option<u128>,
 }
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index ad76066e8..18c33d423 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -14,6 +14,7 @@ use tokio::io::AsyncWriteExt;
 use tokio::try_join;
 use torut::onion::OnionAddressV3;
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::backup::restore::recover_full_embassy;
@@ -99,10 +100,11 @@ async fn setup_init(
     ))
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct AttachParams {
-    #[serde(rename = "embassy-password")]
+    #[serde(rename = "startOsPassword")]
     password: Option<EncryptedWire>,
     guid: Arc<String>,
 }
@@ -210,8 +212,9 @@ pub fn cifs() -> ParentHandler {
     ParentHandler::new().subcommand("verify", from_fn_async(verify_cifs).no_cli())
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct VerifyCifsParams {
     hostname: String,
     path: PathBuf,
@@ -245,7 +248,7 @@ pub async fn verify_cifs(
     start_os.ok_or_else(|| Error::new(eyre!("No Backup Found"), crate::ErrorKind::NotFound))
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(tag = "type")]
 #[serde(rename_all = "camelCase")]
 pub enum RecoverySource {
@@ -253,8 +256,9 @@ pub enum RecoverySource {
     Backup { target: BackupTargetFS },
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct ExecuteParams {
     start_os_logicalname: PathBuf,
     start_os_password: EncryptedWire,
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index aaf941e1f..b7c2fef3c 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -8,6 +8,7 @@ use imbl_value::InternedString;
 use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
@@ -34,7 +35,8 @@ impl Map for SshKeys {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(type = "string")]
 pub struct SshPubKey(
     #[serde(serialize_with = "crate::util::serde::serialize_display")]
     #[serde(deserialize_with = "crate::util::serde::deserialize_from_str")]
@@ -102,9 +104,10 @@ pub fn ssh() -> ParentHandler {
         )
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct AddParams {
     key: SshPubKey,
 }
@@ -135,10 +138,12 @@ pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKey
     Ok(res)
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct DeleteParams {
+    #[ts(type = "string")]
     fingerprint: InternedString,
 }
 
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index faead0738..a73163253 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -12,6 +12,7 @@ use tokio::process::Command;
 use tokio::sync::broadcast::Receiver;
 use tokio::sync::RwLock;
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::disk::util::{get_available, get_used};
@@ -73,9 +74,10 @@ pub async fn enable_zram() -> Result<(), Error> {
     Ok(())
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct ZramParams {
     enable: bool,
 }
@@ -135,9 +137,10 @@ fn display_governor_info(params: WithIoFormat<GovernorParams>, result: GovernorI
     table.print_tty(false).unwrap();
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct GovernorParams {
     set: Option<Governor>,
 }
@@ -229,11 +232,13 @@ pub async fn time(ctx: RpcContext, _: Empty) -> Result<TimeInfo, Error> {
         uptime: ctx.start_time.elapsed().as_secs(),
     })
 }
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct LogsParams {
     #[arg(short = 'l', long = "limit")]
+    #[ts(type = "number | null")]
     limit: Option<usize>,
     #[arg(short = 'c', long = "cursor")]
     cursor: Option<String>,
@@ -313,11 +318,13 @@ pub async fn logs_follow(
 ) -> Result<LogFollowResponse, Error> {
     follow_logs(ctx, LogSource::System, limit).await
 }
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct KernelLogsParams {
     #[arg(short = 'l', long = "limit")]
+    #[ts(type = "number | null")]
     limit: Option<usize>,
     #[arg(short = 'c', long = "cursor")]
     cursor: Option<String>,
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index 26bf0357d..beb756179 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -12,6 +12,7 @@ use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use tokio_stream::StreamExt;
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::context::RpcContext;
 use crate::db::model::public::UpdateProgress;
@@ -34,10 +35,12 @@ lazy_static! {
     static ref UPDATED: AtomicBool = AtomicBool::new(false);
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct UpdateSystemParams {
+    #[ts(type = "string")]
     marketplace_url: Url,
 }
 
diff --git a/core/startos/src/util/crypto.rs b/core/startos/src/util/crypto.rs
index aaafe6536..bb164b6ad 100644
--- a/core/startos/src/util/crypto.rs
+++ b/core/startos/src/util/crypto.rs
@@ -15,6 +15,9 @@ use josekit::jwk::Jwk;
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 use tracing::instrument;
+use ts_rs::TS;
+
+use crate::prelude::*;
 
 pub fn pbkdf2(password: impl AsRef<[u8]>, salt: impl AsRef<[u8]>) -> CipherKey<Aes256Ctr> {
     let mut aeskey = CipherKey::<Aes256Ctr>::default();
@@ -53,9 +56,11 @@ pub fn decrypt_slice(input: impl AsRef<[u8]>, password: impl AsRef<[u8]>) -> Vec
     res
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[ts(export)]
 pub struct EncryptedWire {
-    encrypted: serde_json::Value,
+    #[ts(type = "any")]
+    encrypted: Value,
 }
 impl EncryptedWire {
     #[instrument(skip_all)]
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 2fa992abd..5b1e660b5 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -580,7 +580,7 @@ where
     }
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, TS)]
 pub struct StdinDeserializable<T>(pub T);
 impl<T> FromArgMatches for StdinDeserializable<T>
 where

From 71b83245b47dfe7d7779ac31a0d1771929a2afa7 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:47:03 -0600
Subject: [PATCH 127/341] Chore/unexport api ts (#2585)

* don't export api params

* import from SDK instead of BE

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/bindings/ActionParams.ts         |  9 ----
 core/startos/bindings/AddImageParams.ts       |  4 --
 core/startos/bindings/AddParams.ts            |  4 --
 core/startos/bindings/ApplyParams.ts          |  3 --
 core/startos/bindings/AttachParams.ts         |  7 ---
 core/startos/bindings/BackupParams.ts         | 11 ----
 core/startos/bindings/BackupTargetFS.ts       |  7 ---
 core/startos/bindings/BackupTargetId.ts       |  3 --
 core/startos/bindings/BlockDev.ts             |  3 --
 core/startos/bindings/Cifs.ts                 |  8 ---
 core/startos/bindings/ConfigParams.ts         |  4 --
 core/startos/bindings/ConfigureParams.ts      |  7 ---
 core/startos/bindings/ConnectParams.ts        |  4 --
 core/startos/bindings/ControlParams.ts        |  4 --
 core/startos/bindings/CreateParams.ts         | 10 ----
 core/startos/bindings/DeleteBeforeParams.ts   |  3 --
 core/startos/bindings/DeleteParams.ts         |  3 --
 core/startos/bindings/DumpParams.ts           |  3 --
 core/startos/bindings/EchoParams.ts           |  3 --
 core/startos/bindings/EditManifestParams.ts   |  3 --
 core/startos/bindings/ExecuteParams.ts        | 10 ----
 core/startos/bindings/GetParams.ts            |  3 --
 core/startos/bindings/GovernorParams.ts       |  4 --
 core/startos/bindings/InfoParams.ts           |  4 --
 core/startos/bindings/InstallParams.ts        | 10 ----
 core/startos/bindings/KernelLogsParams.ts     |  8 ---
 core/startos/bindings/KillParams.ts           |  3 --
 core/startos/bindings/ListParams.ts           |  3 --
 core/startos/bindings/LoginParams.ts          |  8 ---
 core/startos/bindings/LogoutParams.ts         |  3 --
 core/startos/bindings/LogsParams.ts           |  8 ---
 core/startos/bindings/MinMax.ts               |  3 --
 core/startos/bindings/NotificationLevel.ts    |  3 --
 core/startos/bindings/RecoverySource.ts       |  6 ---
 core/startos/bindings/RemoveParams.ts         |  3 --
 core/startos/bindings/ResetParams.ts          |  3 --
 core/startos/bindings/ResetPasswordParams.ts  |  7 ---
 core/startos/bindings/RestorePackageParams.ts |  9 ----
 core/startos/bindings/SetCountryParams.ts     |  3 --
 core/startos/bindings/SetParams.ts            |  7 ---
 core/startos/bindings/SshPubKey.ts            |  3 --
 core/startos/bindings/SsidParams.ts           |  3 --
 core/startos/bindings/UiParams.ts             |  3 --
 core/startos/bindings/UmountParams.ts         |  4 --
 core/startos/bindings/UninstallParams.ts      |  4 --
 core/startos/bindings/UpdateParams.ts         |  3 --
 core/startos/bindings/UpdateSystemParams.ts   |  3 --
 core/startos/bindings/VerifyCifsParams.ts     |  9 ----
 core/startos/bindings/VerifyParams.ts         |  3 --
 core/startos/bindings/ZramParams.ts           |  3 --
 core/startos/bindings/index.ts                | 50 -------------------
 core/startos/src/action.rs                    |  1 -
 core/startos/src/auth.rs                      |  5 --
 core/startos/src/backup/backup_bulk.rs        |  1 -
 core/startos/src/backup/restore.rs            |  1 -
 core/startos/src/backup/target/cifs.rs        |  3 --
 core/startos/src/backup/target/mod.rs         |  3 --
 core/startos/src/config/mod.rs                |  2 -
 core/startos/src/control.rs                   |  1 -
 core/startos/src/db/mod.rs                    |  3 --
 core/startos/src/dependencies.rs              |  1 -
 core/startos/src/diagnostic.rs                |  1 -
 core/startos/src/inspect.rs                   |  4 --
 core/startos/src/install/mod.rs               |  2 -
 core/startos/src/lib.rs                       |  1 -
 core/startos/src/lxc/mod.rs                   |  2 -
 core/startos/src/net/dhcp.rs                  |  1 -
 core/startos/src/net/tor.rs                   |  2 -
 core/startos/src/net/wifi.rs                  |  3 --
 core/startos/src/notifications.rs             |  4 --
 core/startos/src/os_install/mod.rs            |  1 -
 core/startos/src/registry/marketplace.rs      |  1 -
 core/startos/src/s9pk/rpc.rs                  |  2 -
 core/startos/src/s9pk/v1/mod.rs               |  1 -
 core/startos/src/service/mod.rs               |  1 -
 core/startos/src/setup.rs                     |  3 --
 core/startos/src/ssh.rs                       |  2 -
 core/startos/src/system.rs                    |  4 --
 core/startos/src/update/mod.rs                |  1 -
 web/projects/marketplace/src/types.ts         |  4 +-
 .../app-actions/app-actions.page.ts           |  4 +-
 .../app-interfaces/app-interfaces.page.ts     |  8 ++-
 .../app-list-pkg/app-list-pkg.component.ts    |  4 +-
 .../apps-routes/app-show/app-show.page.ts     | 12 ++---
 .../app-show-additional.component.ts          |  4 +-
 .../app-show-health-checks.component.ts       |  8 +--
 .../app-show-progress.component.ts            |  4 +-
 .../app-show-status.component.ts              |  7 ++-
 .../app-show/pipes/health-color.pipe.ts       |  4 +-
 .../app-show/pipes/to-buttons.pipe.ts         |  4 +-
 .../app-show/pipes/to-health-checks.pipe.ts   |  7 ++-
 .../backing-up/backing-up.component.ts        |  4 +-
 .../server-routes/sideload/sideload.page.ts   |  4 +-
 .../ui/src/app/pages/updates/updates.page.ts  |  6 +--
 .../install-progress/install-progress.pipe.ts |  6 +--
 .../app/pipes/launchable/launchable.pipe.ts   |  7 ++-
 web/projects/ui/src/app/pipes/ui/ui.pipe.ts   |  4 +-
 .../ui/src/app/services/api/api.fixures.ts    | 11 ++--
 .../ui/src/app/services/api/api.types.ts      |  7 ++-
 .../services/api/embassy-mock-api.service.ts  |  5 +-
 .../ui/src/app/services/config.service.ts     | 33 ++++++------
 .../src/app/services/patch-db/data-model.ts   | 26 ++++------
 .../services/pkg-status-rendering.service.ts  |  5 +-
 .../ui/src/app/util/get-package-data.ts       |  4 +-
 .../ui/src/app/util/get-server-info.ts        |  4 +-
 105 files changed, 88 insertions(+), 464 deletions(-)
 delete mode 100644 core/startos/bindings/ActionParams.ts
 delete mode 100644 core/startos/bindings/AddImageParams.ts
 delete mode 100644 core/startos/bindings/AddParams.ts
 delete mode 100644 core/startos/bindings/ApplyParams.ts
 delete mode 100644 core/startos/bindings/AttachParams.ts
 delete mode 100644 core/startos/bindings/BackupParams.ts
 delete mode 100644 core/startos/bindings/BackupTargetFS.ts
 delete mode 100644 core/startos/bindings/BackupTargetId.ts
 delete mode 100644 core/startos/bindings/BlockDev.ts
 delete mode 100644 core/startos/bindings/Cifs.ts
 delete mode 100644 core/startos/bindings/ConfigParams.ts
 delete mode 100644 core/startos/bindings/ConfigureParams.ts
 delete mode 100644 core/startos/bindings/ConnectParams.ts
 delete mode 100644 core/startos/bindings/ControlParams.ts
 delete mode 100644 core/startos/bindings/CreateParams.ts
 delete mode 100644 core/startos/bindings/DeleteBeforeParams.ts
 delete mode 100644 core/startos/bindings/DeleteParams.ts
 delete mode 100644 core/startos/bindings/DumpParams.ts
 delete mode 100644 core/startos/bindings/EchoParams.ts
 delete mode 100644 core/startos/bindings/EditManifestParams.ts
 delete mode 100644 core/startos/bindings/ExecuteParams.ts
 delete mode 100644 core/startos/bindings/GetParams.ts
 delete mode 100644 core/startos/bindings/GovernorParams.ts
 delete mode 100644 core/startos/bindings/InfoParams.ts
 delete mode 100644 core/startos/bindings/InstallParams.ts
 delete mode 100644 core/startos/bindings/KernelLogsParams.ts
 delete mode 100644 core/startos/bindings/KillParams.ts
 delete mode 100644 core/startos/bindings/ListParams.ts
 delete mode 100644 core/startos/bindings/LoginParams.ts
 delete mode 100644 core/startos/bindings/LogoutParams.ts
 delete mode 100644 core/startos/bindings/LogsParams.ts
 delete mode 100644 core/startos/bindings/MinMax.ts
 delete mode 100644 core/startos/bindings/NotificationLevel.ts
 delete mode 100644 core/startos/bindings/RecoverySource.ts
 delete mode 100644 core/startos/bindings/RemoveParams.ts
 delete mode 100644 core/startos/bindings/ResetParams.ts
 delete mode 100644 core/startos/bindings/ResetPasswordParams.ts
 delete mode 100644 core/startos/bindings/RestorePackageParams.ts
 delete mode 100644 core/startos/bindings/SetCountryParams.ts
 delete mode 100644 core/startos/bindings/SetParams.ts
 delete mode 100644 core/startos/bindings/SshPubKey.ts
 delete mode 100644 core/startos/bindings/SsidParams.ts
 delete mode 100644 core/startos/bindings/UiParams.ts
 delete mode 100644 core/startos/bindings/UmountParams.ts
 delete mode 100644 core/startos/bindings/UninstallParams.ts
 delete mode 100644 core/startos/bindings/UpdateParams.ts
 delete mode 100644 core/startos/bindings/UpdateSystemParams.ts
 delete mode 100644 core/startos/bindings/VerifyCifsParams.ts
 delete mode 100644 core/startos/bindings/VerifyParams.ts
 delete mode 100644 core/startos/bindings/ZramParams.ts

diff --git a/core/startos/bindings/ActionParams.ts b/core/startos/bindings/ActionParams.ts
deleted file mode 100644
index a57d7f72d..000000000
--- a/core/startos/bindings/ActionParams.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ActionId } from "./ActionId";
-import type { PackageId } from "./PackageId";
-
-export type ActionParams = {
-  id: PackageId;
-  actionId: ActionId;
-  input: { [key: string]: any } | null;
-};
diff --git a/core/startos/bindings/AddImageParams.ts b/core/startos/bindings/AddImageParams.ts
deleted file mode 100644
index 628c73354..000000000
--- a/core/startos/bindings/AddImageParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ImageId } from "./ImageId";
-
-export type AddImageParams = { id: ImageId; image: string };
diff --git a/core/startos/bindings/AddParams.ts b/core/startos/bindings/AddParams.ts
deleted file mode 100644
index 03a4ea947..000000000
--- a/core/startos/bindings/AddParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { SshPubKey } from "./SshPubKey";
-
-export type AddParams = { key: SshPubKey };
diff --git a/core/startos/bindings/ApplyParams.ts b/core/startos/bindings/ApplyParams.ts
deleted file mode 100644
index 5ace9cd38..000000000
--- a/core/startos/bindings/ApplyParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ApplyParams = { expr: string; path: string | null };
diff --git a/core/startos/bindings/AttachParams.ts b/core/startos/bindings/AttachParams.ts
deleted file mode 100644
index b3f7a23e7..000000000
--- a/core/startos/bindings/AttachParams.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { EncryptedWire } from "./EncryptedWire";
-
-export type AttachParams = {
-  startOsPassword: EncryptedWire | null;
-  guid: string;
-};
diff --git a/core/startos/bindings/BackupParams.ts b/core/startos/bindings/BackupParams.ts
deleted file mode 100644
index d10e47425..000000000
--- a/core/startos/bindings/BackupParams.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BackupTargetId } from "./BackupTargetId";
-import type { PackageId } from "./PackageId";
-import type { PasswordType } from "./PasswordType";
-
-export type BackupParams = {
-  targetId: BackupTargetId;
-  oldPassword: PasswordType | null;
-  packageIds: Array<PackageId> | null;
-  password: PasswordType;
-};
diff --git a/core/startos/bindings/BackupTargetFS.ts b/core/startos/bindings/BackupTargetFS.ts
deleted file mode 100644
index 99a56c3e4..000000000
--- a/core/startos/bindings/BackupTargetFS.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BlockDev } from "./BlockDev";
-import type { Cifs } from "./Cifs";
-
-export type BackupTargetFS =
-  | ({ type: "disk" } & BlockDev)
-  | ({ type: "cifs" } & Cifs);
diff --git a/core/startos/bindings/BackupTargetId.ts b/core/startos/bindings/BackupTargetId.ts
deleted file mode 100644
index e62366d97..000000000
--- a/core/startos/bindings/BackupTargetId.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type BackupTargetId = string;
diff --git a/core/startos/bindings/BlockDev.ts b/core/startos/bindings/BlockDev.ts
deleted file mode 100644
index f98a545cb..000000000
--- a/core/startos/bindings/BlockDev.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type BlockDev = { logicalname: string };
diff --git a/core/startos/bindings/Cifs.ts b/core/startos/bindings/Cifs.ts
deleted file mode 100644
index 98c18afc7..000000000
--- a/core/startos/bindings/Cifs.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type Cifs = {
-  hostname: string;
-  path: string;
-  username: string;
-  password: string | null;
-};
diff --git a/core/startos/bindings/ConfigParams.ts b/core/startos/bindings/ConfigParams.ts
deleted file mode 100644
index 6c81b4691..000000000
--- a/core/startos/bindings/ConfigParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
-
-export type ConfigParams = { id: PackageId };
diff --git a/core/startos/bindings/ConfigureParams.ts b/core/startos/bindings/ConfigureParams.ts
deleted file mode 100644
index 931e8b52e..000000000
--- a/core/startos/bindings/ConfigureParams.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
-
-export type ConfigureParams = {
-  dependentId: PackageId;
-  dependencyId: PackageId;
-};
diff --git a/core/startos/bindings/ConnectParams.ts b/core/startos/bindings/ConnectParams.ts
deleted file mode 100644
index df5f5c779..000000000
--- a/core/startos/bindings/ConnectParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
-
-export type ConnectParams = { id: PackageId };
diff --git a/core/startos/bindings/ControlParams.ts b/core/startos/bindings/ControlParams.ts
deleted file mode 100644
index 32739363f..000000000
--- a/core/startos/bindings/ControlParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
-
-export type ControlParams = { id: PackageId };
diff --git a/core/startos/bindings/CreateParams.ts b/core/startos/bindings/CreateParams.ts
deleted file mode 100644
index 4889f2ddf..000000000
--- a/core/startos/bindings/CreateParams.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { NotificationLevel } from "./NotificationLevel";
-import type { PackageId } from "./PackageId";
-
-export type CreateParams = {
-  package: PackageId | null;
-  level: NotificationLevel;
-  title: string;
-  message: string;
-};
diff --git a/core/startos/bindings/DeleteBeforeParams.ts b/core/startos/bindings/DeleteBeforeParams.ts
deleted file mode 100644
index 55297106a..000000000
--- a/core/startos/bindings/DeleteBeforeParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type DeleteBeforeParams = { before: number };
diff --git a/core/startos/bindings/DeleteParams.ts b/core/startos/bindings/DeleteParams.ts
deleted file mode 100644
index 34161c3b9..000000000
--- a/core/startos/bindings/DeleteParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type DeleteParams = { fingerprint: string };
diff --git a/core/startos/bindings/DumpParams.ts b/core/startos/bindings/DumpParams.ts
deleted file mode 100644
index 88402caf4..000000000
--- a/core/startos/bindings/DumpParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type DumpParams = {};
diff --git a/core/startos/bindings/EchoParams.ts b/core/startos/bindings/EchoParams.ts
deleted file mode 100644
index 16638a940..000000000
--- a/core/startos/bindings/EchoParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type EchoParams = { message: string };
diff --git a/core/startos/bindings/EditManifestParams.ts b/core/startos/bindings/EditManifestParams.ts
deleted file mode 100644
index 19fda62bf..000000000
--- a/core/startos/bindings/EditManifestParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type EditManifestParams = { expression: string };
diff --git a/core/startos/bindings/ExecuteParams.ts b/core/startos/bindings/ExecuteParams.ts
deleted file mode 100644
index eba6e1023..000000000
--- a/core/startos/bindings/ExecuteParams.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { EncryptedWire } from "./EncryptedWire";
-import type { RecoverySource } from "./RecoverySource";
-
-export type ExecuteParams = {
-  startOsLogicalname: string;
-  startOsPassword: EncryptedWire;
-  recoverySource: RecoverySource | null;
-  recoveryPassword: EncryptedWire | null;
-};
diff --git a/core/startos/bindings/GetParams.ts b/core/startos/bindings/GetParams.ts
deleted file mode 100644
index cc045a267..000000000
--- a/core/startos/bindings/GetParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GetParams = { url: string };
diff --git a/core/startos/bindings/GovernorParams.ts b/core/startos/bindings/GovernorParams.ts
deleted file mode 100644
index 2af25b061..000000000
--- a/core/startos/bindings/GovernorParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Governor } from "./Governor";
-
-export type GovernorParams = { set: Governor | null };
diff --git a/core/startos/bindings/InfoParams.ts b/core/startos/bindings/InfoParams.ts
deleted file mode 100644
index ae217103e..000000000
--- a/core/startos/bindings/InfoParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BackupTargetId } from "./BackupTargetId";
-
-export type InfoParams = { targetId: BackupTargetId; password: string };
diff --git a/core/startos/bindings/InstallParams.ts b/core/startos/bindings/InstallParams.ts
deleted file mode 100644
index 394647cff..000000000
--- a/core/startos/bindings/InstallParams.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { MinMax } from "./MinMax";
-import type { PackageId } from "./PackageId";
-
-export type InstallParams = {
-  id: PackageId;
-  marketplaceUrl: string | null;
-  versionSpec: string | null;
-  versionPriority: MinMax | null;
-};
diff --git a/core/startos/bindings/KernelLogsParams.ts b/core/startos/bindings/KernelLogsParams.ts
deleted file mode 100644
index a820d7b74..000000000
--- a/core/startos/bindings/KernelLogsParams.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type KernelLogsParams = {
-  limit: number | null;
-  cursor: string | null;
-  before: boolean;
-  follow: boolean;
-};
diff --git a/core/startos/bindings/KillParams.ts b/core/startos/bindings/KillParams.ts
deleted file mode 100644
index 75bf6a02e..000000000
--- a/core/startos/bindings/KillParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type KillParams = { ids: Array<string> };
diff --git a/core/startos/bindings/ListParams.ts b/core/startos/bindings/ListParams.ts
deleted file mode 100644
index 759bf0667..000000000
--- a/core/startos/bindings/ListParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ListParams = { before: number | null; limit: number | null };
diff --git a/core/startos/bindings/LoginParams.ts b/core/startos/bindings/LoginParams.ts
deleted file mode 100644
index 82765e23c..000000000
--- a/core/startos/bindings/LoginParams.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PasswordType } from "./PasswordType";
-
-export type LoginParams = {
-  password: PasswordType | null;
-  userAgent: string | null;
-  metadata: any;
-};
diff --git a/core/startos/bindings/LogoutParams.ts b/core/startos/bindings/LogoutParams.ts
deleted file mode 100644
index f11b9780e..000000000
--- a/core/startos/bindings/LogoutParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type LogoutParams = { session: string };
diff --git a/core/startos/bindings/LogsParams.ts b/core/startos/bindings/LogsParams.ts
deleted file mode 100644
index c6a74ec71..000000000
--- a/core/startos/bindings/LogsParams.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type LogsParams = {
-  limit: number | null;
-  cursor: string | null;
-  before: boolean;
-  follow: boolean;
-};
diff --git a/core/startos/bindings/MinMax.ts b/core/startos/bindings/MinMax.ts
deleted file mode 100644
index d5df4aa68..000000000
--- a/core/startos/bindings/MinMax.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type MinMax = "min" | "max";
diff --git a/core/startos/bindings/NotificationLevel.ts b/core/startos/bindings/NotificationLevel.ts
deleted file mode 100644
index 8844083d4..000000000
--- a/core/startos/bindings/NotificationLevel.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type NotificationLevel = "success" | "info" | "warning" | "error";
diff --git a/core/startos/bindings/RecoverySource.ts b/core/startos/bindings/RecoverySource.ts
deleted file mode 100644
index 7b4e9365a..000000000
--- a/core/startos/bindings/RecoverySource.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BackupTargetFS } from "./BackupTargetFS";
-
-export type RecoverySource =
-  | { type: "migrate"; guid: string }
-  | { type: "backup"; target: BackupTargetFS };
diff --git a/core/startos/bindings/RemoveParams.ts b/core/startos/bindings/RemoveParams.ts
deleted file mode 100644
index 1424d6ffd..000000000
--- a/core/startos/bindings/RemoveParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type RemoveParams = { guid: string };
diff --git a/core/startos/bindings/ResetParams.ts b/core/startos/bindings/ResetParams.ts
deleted file mode 100644
index c8a585681..000000000
--- a/core/startos/bindings/ResetParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ResetParams = { wipeState: boolean; reason: string };
diff --git a/core/startos/bindings/ResetPasswordParams.ts b/core/startos/bindings/ResetPasswordParams.ts
deleted file mode 100644
index c7899206d..000000000
--- a/core/startos/bindings/ResetPasswordParams.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PasswordType } from "./PasswordType";
-
-export type ResetPasswordParams = {
-  oldPassword: PasswordType | null;
-  newPassword: PasswordType | null;
-};
diff --git a/core/startos/bindings/RestorePackageParams.ts b/core/startos/bindings/RestorePackageParams.ts
deleted file mode 100644
index 95d34b5c1..000000000
--- a/core/startos/bindings/RestorePackageParams.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BackupTargetId } from "./BackupTargetId";
-import type { PackageId } from "./PackageId";
-
-export type RestorePackageParams = {
-  ids: Array<PackageId>;
-  targetId: BackupTargetId;
-  password: string;
-};
diff --git a/core/startos/bindings/SetCountryParams.ts b/core/startos/bindings/SetCountryParams.ts
deleted file mode 100644
index a3bfb3b24..000000000
--- a/core/startos/bindings/SetCountryParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type SetCountryParams = { country: string };
diff --git a/core/startos/bindings/SetParams.ts b/core/startos/bindings/SetParams.ts
deleted file mode 100644
index 1d7a835b6..000000000
--- a/core/startos/bindings/SetParams.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Duration } from "./Duration";
-
-export type SetParams = {
-  timeout: Duration | null;
-  config: { [key: string]: any } | null;
-};
diff --git a/core/startos/bindings/SshPubKey.ts b/core/startos/bindings/SshPubKey.ts
deleted file mode 100644
index edd45d0dc..000000000
--- a/core/startos/bindings/SshPubKey.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type SshPubKey = string;
diff --git a/core/startos/bindings/SsidParams.ts b/core/startos/bindings/SsidParams.ts
deleted file mode 100644
index e5e0793ce..000000000
--- a/core/startos/bindings/SsidParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type SsidParams = { ssid: string };
diff --git a/core/startos/bindings/UiParams.ts b/core/startos/bindings/UiParams.ts
deleted file mode 100644
index 678723e08..000000000
--- a/core/startos/bindings/UiParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type UiParams = { pointer: string; value: any };
diff --git a/core/startos/bindings/UmountParams.ts b/core/startos/bindings/UmountParams.ts
deleted file mode 100644
index e473af15f..000000000
--- a/core/startos/bindings/UmountParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BackupTargetId } from "./BackupTargetId";
-
-export type UmountParams = { targetId: BackupTargetId | null };
diff --git a/core/startos/bindings/UninstallParams.ts b/core/startos/bindings/UninstallParams.ts
deleted file mode 100644
index fd8c6fba7..000000000
--- a/core/startos/bindings/UninstallParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
-
-export type UninstallParams = { id: PackageId };
diff --git a/core/startos/bindings/UpdateParams.ts b/core/startos/bindings/UpdateParams.ts
deleted file mode 100644
index 2c64f7dd8..000000000
--- a/core/startos/bindings/UpdateParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type UpdateParams = { interface: string };
diff --git a/core/startos/bindings/UpdateSystemParams.ts b/core/startos/bindings/UpdateSystemParams.ts
deleted file mode 100644
index 4e266ffdc..000000000
--- a/core/startos/bindings/UpdateSystemParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type UpdateSystemParams = { marketplaceUrl: string };
diff --git a/core/startos/bindings/VerifyCifsParams.ts b/core/startos/bindings/VerifyCifsParams.ts
deleted file mode 100644
index 6516243ad..000000000
--- a/core/startos/bindings/VerifyCifsParams.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { EncryptedWire } from "./EncryptedWire";
-
-export type VerifyCifsParams = {
-  hostname: string;
-  path: string;
-  username: string;
-  password: EncryptedWire | null;
-};
diff --git a/core/startos/bindings/VerifyParams.ts b/core/startos/bindings/VerifyParams.ts
deleted file mode 100644
index 49e963750..000000000
--- a/core/startos/bindings/VerifyParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type VerifyParams = { path: string };
diff --git a/core/startos/bindings/ZramParams.ts b/core/startos/bindings/ZramParams.ts
deleted file mode 100644
index b69c21349..000000000
--- a/core/startos/bindings/ZramParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ZramParams = { enable: boolean };
diff --git a/core/startos/bindings/index.ts b/core/startos/bindings/index.ts
index d9c75c2d6..4ce0ab643 100644
--- a/core/startos/bindings/index.ts
+++ b/core/startos/bindings/index.ts
@@ -1,8 +1,5 @@
 export { ActionId } from "./ActionId";
 export { ActionMetadata } from "./ActionMetadata";
-export { ActionParams } from "./ActionParams";
-export { AddImageParams } from "./AddImageParams";
-export { AddParams } from "./AddParams";
 export { AddressInfo } from "./AddressInfo";
 export { AddSslOptions } from "./AddSslOptions";
 export { Alerts } from "./Alerts";
@@ -10,30 +7,16 @@ export { Algorithm } from "./Algorithm";
 export { AllowedStatuses } from "./AllowedStatuses";
 export { AllPackageData } from "./AllPackageData";
 export { AlpnInfo } from "./AlpnInfo";
-export { ApplyParams } from "./ApplyParams";
-export { AttachParams } from "./AttachParams";
-export { BackupParams } from "./BackupParams";
 export { BackupProgress } from "./BackupProgress";
-export { BackupTargetFS } from "./BackupTargetFS";
-export { BackupTargetId } from "./BackupTargetId";
 export { BindInfo } from "./BindInfo";
 export { BindOptions } from "./BindOptions";
 export { BindParams } from "./BindParams";
-export { BlockDev } from "./BlockDev";
 export { Callback } from "./Callback";
 export { ChrootParams } from "./ChrootParams";
-export { Cifs } from "./Cifs";
-export { ConfigParams } from "./ConfigParams";
-export { ConfigureParams } from "./ConfigureParams";
-export { ConnectParams } from "./ConnectParams";
-export { ControlParams } from "./ControlParams";
 export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams";
-export { CreateParams } from "./CreateParams";
 export { CurrentDependencies } from "./CurrentDependencies";
 export { CurrentDependencyInfo } from "./CurrentDependencyInfo";
 export { DataUrl } from "./DataUrl";
-export { DeleteBeforeParams } from "./DeleteBeforeParams";
-export { DeleteParams } from "./DeleteParams";
 export { Dependencies } from "./Dependencies";
 export { DependencyConfigErrors } from "./DependencyConfigErrors";
 export { DependencyKind } from "./DependencyKind";
@@ -41,13 +24,9 @@ export { DependencyRequirement } from "./DependencyRequirement";
 export { DepInfo } from "./DepInfo";
 export { Description } from "./Description";
 export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams";
-export { DumpParams } from "./DumpParams";
 export { Duration } from "./Duration";
-export { EchoParams } from "./EchoParams";
-export { EditManifestParams } from "./EditManifestParams";
 export { EncryptedWire } from "./EncryptedWire";
 export { ExecuteAction } from "./ExecuteAction";
-export { ExecuteParams } from "./ExecuteParams";
 export { ExportActionParams } from "./ExportActionParams";
 export { ExportedHostInfo } from "./ExportedHostInfo";
 export { ExportedHostnameInfo } from "./ExportedHostnameInfo";
@@ -58,7 +37,6 @@ export { ExposeForDependentsParams } from "./ExposeForDependentsParams";
 export { FullProgress } from "./FullProgress";
 export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind";
 export { GetHostInfoParams } from "./GetHostInfoParams";
-export { GetParams } from "./GetParams";
 export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams";
 export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams";
 export { GetServicePortForwardParams } from "./GetServicePortForwardParams";
@@ -66,7 +44,6 @@ export { GetSslCertificateParams } from "./GetSslCertificateParams";
 export { GetSslKeyParams } from "./GetSslKeyParams";
 export { GetStoreParams } from "./GetStoreParams";
 export { GetSystemSmtpParams } from "./GetSystemSmtpParams";
-export { GovernorParams } from "./GovernorParams";
 export { Governor } from "./Governor";
 export { HardwareRequirements } from "./HardwareRequirements";
 export { HealthCheckId } from "./HealthCheckId";
@@ -77,27 +54,17 @@ export { HostInfo } from "./HostInfo";
 export { HostKind } from "./HostKind";
 export { Host } from "./Host";
 export { ImageId } from "./ImageId";
-export { InfoParams } from "./InfoParams";
 export { InstalledState } from "./InstalledState";
 export { InstallingInfo } from "./InstallingInfo";
 export { InstallingState } from "./InstallingState";
-export { InstallParams } from "./InstallParams";
 export { IpInfo } from "./IpInfo";
-export { KernelLogsParams } from "./KernelLogsParams";
-export { KillParams } from "./KillParams";
-export { ListParams } from "./ListParams";
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams";
-export { LoginParams } from "./LoginParams";
-export { LogoutParams } from "./LogoutParams";
-export { LogsParams } from "./LogsParams";
 export { MainStatus } from "./MainStatus";
 export { Manifest } from "./Manifest";
 export { MaybeUtf8String } from "./MaybeUtf8String";
-export { MinMax } from "./MinMax";
 export { MountParams } from "./MountParams";
 export { MountTarget } from "./MountTarget";
 export { NamedProgress } from "./NamedProgress";
-export { NotificationLevel } from "./NotificationLevel";
 export { PackageDataEntry } from "./PackageDataEntry";
 export { PackageId } from "./PackageId";
 export { PackageState } from "./PackageState";
@@ -106,13 +73,8 @@ export { ParamsPackageId } from "./ParamsPackageId";
 export { PasswordType } from "./PasswordType";
 export { Progress } from "./Progress";
 export { Public } from "./Public";
-export { RecoverySource } from "./RecoverySource";
 export { RemoveActionParams } from "./RemoveActionParams";
 export { RemoveAddressParams } from "./RemoveAddressParams";
-export { RemoveParams } from "./RemoveParams";
-export { ResetParams } from "./ResetParams";
-export { ResetPasswordParams } from "./ResetPasswordParams";
-export { RestorePackageParams } from "./RestorePackageParams";
 export { ReverseProxyBind } from "./ReverseProxyBind";
 export { ReverseProxyDestination } from "./ReverseProxyDestination";
 export { ReverseProxyHttp } from "./ReverseProxyHttp";
@@ -129,24 +91,12 @@ export { SessionList } from "./SessionList";
 export { Sessions } from "./Sessions";
 export { Session } from "./Session";
 export { SetConfigured } from "./SetConfigured";
-export { SetCountryParams } from "./SetCountryParams";
 export { SetDependenciesParams } from "./SetDependenciesParams";
 export { SetHealth } from "./SetHealth";
 export { SetMainStatus } from "./SetMainStatus";
-export { SetParams } from "./SetParams";
 export { SetStoreParams } from "./SetStoreParams";
-export { SshPubKey } from "./SshPubKey";
-export { SsidParams } from "./SsidParams";
 export { Status } from "./Status";
-export { UiParams } from "./UiParams";
-export { UmountParams } from "./UmountParams";
-export { UninstallParams } from "./UninstallParams";
-export { UpdateParams } from "./UpdateParams";
 export { UpdateProgress } from "./UpdateProgress";
-export { UpdateSystemParams } from "./UpdateSystemParams";
 export { UpdatingState } from "./UpdatingState";
-export { VerifyCifsParams } from "./VerifyCifsParams";
-export { VerifyParams } from "./VerifyParams";
 export { VolumeId } from "./VolumeId";
 export { WifiInfo } from "./WifiInfo";
-export { ZramParams } from "./ZramParams";
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index 1a32856c2..396e7ed50 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -51,7 +51,6 @@ pub fn display_action_result(params: WithIoFormat<ActionParams>, result: ActionR
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ActionParams {
     #[arg(id = "id")]
     #[serde(rename = "id")]
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index f8e2d25a0..915ac10bd 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -183,7 +183,6 @@ pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct LoginParams {
     password: Option<PasswordType>,
     #[serde(default)]
@@ -226,7 +225,6 @@ pub async fn login_impl(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct LogoutParams {
     #[ts(type = "string")]
     session: InternedString,
@@ -320,7 +318,6 @@ fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ListParams {
     #[arg(skip)]
     #[ts(skip)]
@@ -357,7 +354,6 @@ impl AsLogoutSessionId for KillSessionId {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct KillParams {
     ids: Vec<String>,
 }
@@ -371,7 +367,6 @@ pub async fn kill(ctx: RpcContext, KillParams { ids }: KillParams) -> Result<(),
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ResetPasswordParams {
     old_password: Option<PasswordType>,
     new_password: Option<PasswordType>,
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 9a2784161..928e4811a 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -33,7 +33,6 @@ use crate::version::VersionT;
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct BackupParams {
     target_id: BackupTargetId,
     #[arg(long = "old-password")]
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 277d4390d..4753a4290 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -28,7 +28,6 @@ use crate::util::serde::IoFormat;
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct RestorePackageParams {
     pub ids: Vec<PackageId>,
     pub target_id: BackupTargetId,
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index b50004dc6..ab2e91c0e 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -71,7 +71,6 @@ pub fn cifs() -> ParentHandler {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct AddParams {
     pub hostname: String,
     pub path: PathBuf,
@@ -126,7 +125,6 @@ pub async fn add(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct UpdateParams {
     pub id: BackupTargetId,
     pub hostname: String,
@@ -191,7 +189,6 @@ pub async fn update(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct RemoveParams {
     pub id: BackupTargetId,
 }
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index 7925cadff..c0f2ef10e 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -247,7 +247,6 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct InfoParams {
     target_id: BackupTargetId,
     password: String,
@@ -282,7 +281,6 @@ lazy_static::lazy_static! {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct MountParams {
     target_id: BackupTargetId,
     password: String,
@@ -318,7 +316,6 @@ pub async fn mount(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct UmountParams {
     target_id: Option<BackupTargetId>,
 }
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index 484d13b02..c600f590c 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -129,7 +129,6 @@ pub enum MatchError {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ConfigParams {
     pub id: PackageId,
 }
@@ -160,7 +159,6 @@ pub async fn get(ctx: RpcContext, _: Empty, id: PackageId) -> Result<ConfigRes,
 
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
-#[ts(export)]
 pub struct SetParams {
     #[arg(long = "timeout")]
     pub timeout: Option<crate::util::serde::Duration>,
diff --git a/core/startos/src/control.rs b/core/startos/src/control.rs
index 11036858a..3ef7d6030 100644
--- a/core/startos/src/control.rs
+++ b/core/startos/src/control.rs
@@ -13,7 +13,6 @@ use crate::Error;
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ControlParams {
     pub id: PackageId,
 }
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 8e28c0f3c..ab5d23efb 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -219,7 +219,6 @@ async fn cli_dump(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct DumpParams {
     #[arg(long = "include-private", short = 'p')]
     #[serde(default)]
@@ -277,7 +276,6 @@ async fn cli_apply(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ApplyParams {
     expr: String,
     path: Option<PathBuf>,
@@ -316,7 +314,6 @@ pub fn put() -> ParentHandler {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct UiParams {
     #[ts(type = "string")]
     pointer: JsonPointer,
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 936d1788b..69e4cad59 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -46,7 +46,6 @@ pub struct DepInfo {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ConfigureParams {
     dependent_id: PackageId,
     dependency_id: PackageId,
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index 86c3a4dd5..1cef6d7ef 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -44,7 +44,6 @@ pub fn error(ctx: DiagnosticContext) -> Result<Arc<RpcError>, Error> {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct LogsParams {
     #[ts(type = "number | null")]
     limit: Option<usize>,
diff --git a/core/startos/src/inspect.rs b/core/startos/src/inspect.rs
index 3e95faa6c..6d24fc32a 100644
--- a/core/startos/src/inspect.rs
+++ b/core/startos/src/inspect.rs
@@ -26,7 +26,6 @@ pub fn inspect() -> ParentHandler {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct HashParams {
     path: PathBuf,
 }
@@ -42,7 +41,6 @@ pub async fn hash(_: CliContext, HashParams { path }: HashParams) -> Result<Stri
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ManifestParams {
     path: PathBuf,
     #[arg(long = "no-verify")]
@@ -61,7 +59,6 @@ pub async fn manifest(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct InspectParams {
     path: PathBuf,
     #[arg(long = "no-verify")]
@@ -94,7 +91,6 @@ pub async fn icon(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct InstructionParams {
     path: PathBuf,
     #[arg(long = "no-verify")]
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 40006798a..f20f5a5b0 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -106,7 +106,6 @@ impl std::fmt::Display for MinMax {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct InstallParams {
     id: PackageId,
     #[arg(short = 'm', long = "marketplace-url")]
@@ -397,7 +396,6 @@ pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<()
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct UninstallParams {
     id: PackageId,
 }
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index c048ae61c..448db9ff2 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -83,7 +83,6 @@ use crate::util::serde::HandlerExtSerde;
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct EchoParams {
     message: String,
 }
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 26d2d6a37..0ebefdd96 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -353,7 +353,6 @@ pub async fn list(ctx: RpcContext) -> Result<Vec<InternedString>, Error> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
-#[ts(export)]
 pub struct RemoveParams {
     #[ts(type = "string")]
     pub guid: InternedString,
@@ -367,7 +366,6 @@ pub async fn remove(ctx: RpcContext, RemoveParams { guid }: RemoveParams) -> Res
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
-#[ts(export)]
 pub struct ConnectParams {
     #[ts(type = "string")]
     pub guid: InternedString,
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index ce5de96ba..b0d538e81 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -64,7 +64,6 @@ pub fn dhcp() -> ParentHandler {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct UpdateParams {
     interface: String,
 }
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 7b5e848f1..dfca0fc0b 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -108,7 +108,6 @@ pub fn tor() -> ParentHandler {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ResetParams {
     #[arg(name = "wipe-state", short = 'w', long = "wipe-state")]
     wipe_state: bool,
@@ -147,7 +146,6 @@ pub async fn list_services(ctx: RpcContext, _: Empty) -> Result<Vec<OnionAddress
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct LogsParams {
     #[arg(short = 'l', long = "limit")]
     #[ts(type = "number | null")]
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index 38d9e3015..9de177bfe 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -91,7 +91,6 @@ pub fn country() -> ParentHandler {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct AddParams {
     ssid: String,
     password: String,
@@ -143,7 +142,6 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct SsidParams {
     ssid: String,
 }
@@ -408,7 +406,6 @@ pub async fn get_available(ctx: RpcContext, _: Empty) -> Result<Vec<WifiListOut>
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct SetCountryParams {
     #[arg(value_parser = CountryCodeParser)]
     #[ts(type = "string")]
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index 8daf42f59..8a5732462 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -52,7 +52,6 @@ pub fn notification() -> ParentHandler {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ListParams {
     #[ts(type = "number | null")]
     before: Option<u32>,
@@ -117,7 +116,6 @@ pub async fn list(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct DeleteParams {
     #[ts(type = "number")]
     id: u32,
@@ -134,7 +132,6 @@ pub async fn delete(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Resul
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct DeleteBeforeParams {
     #[ts(type = "number")]
     before: u32,
@@ -159,7 +156,6 @@ pub async fn delete_before(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct CreateParams {
     package: Option<PackageId>,
     level: NotificationLevel,
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index e35cab617..0abd1d23e 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -116,7 +116,6 @@ async fn partition(disk: &mut DiskInfo, overwrite: bool) -> Result<OsPartitionIn
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ExecuteParams {
     logicalname: PathBuf,
     #[arg(short = 'o')]
diff --git a/core/startos/src/registry/marketplace.rs b/core/startos/src/registry/marketplace.rs
index d60a6f3c6..82ead81cb 100644
--- a/core/startos/src/registry/marketplace.rs
+++ b/core/startos/src/registry/marketplace.rs
@@ -40,7 +40,6 @@ pub fn with_query_params(ctx: RpcContext, mut url: Url) -> Url {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct GetParams {
     #[ts(type = "string")]
     url: Url,
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index b3203bd47..582a0a9d9 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -69,7 +69,6 @@ fn inspect() -> ParentHandler<S9pkPath> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
-#[ts(export)]
 struct AddImageParams {
     id: ImageId,
     image: String,
@@ -186,7 +185,6 @@ async fn add_image(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
-#[ts(export)]
 struct EditManifestParams {
     expression: String,
 }
diff --git a/core/startos/src/s9pk/v1/mod.rs b/core/startos/src/s9pk/v1/mod.rs
index 9623d7f36..173921a75 100644
--- a/core/startos/src/s9pk/v1/mod.rs
+++ b/core/startos/src/s9pk/v1/mod.rs
@@ -16,7 +16,6 @@ pub const SIG_CONTEXT: &[u8] = b"s9pk";
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct VerifyParams {
     pub path: PathBuf,
 }
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index dcac05ce3..95d507bfa 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -501,7 +501,6 @@ impl Actor for ServiceActor {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
-#[ts(export)]
 pub struct ConnectParams {
     pub id: PackageId,
 }
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 18c33d423..9120544e3 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -102,7 +102,6 @@ async fn setup_init(
 
 #[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[ts(export)]
 pub struct AttachParams {
     #[serde(rename = "startOsPassword")]
     password: Option<EncryptedWire>,
@@ -214,7 +213,6 @@ pub fn cifs() -> ParentHandler {
 
 #[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[ts(export)]
 pub struct VerifyCifsParams {
     hostname: String,
     path: PathBuf,
@@ -258,7 +256,6 @@ pub enum RecoverySource {
 
 #[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[ts(export)]
 pub struct ExecuteParams {
     start_os_logicalname: PathBuf,
     start_os_password: EncryptedWire,
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index b7c2fef3c..787d54056 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -107,7 +107,6 @@ pub fn ssh() -> ParentHandler {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct AddParams {
     key: SshPubKey,
 }
@@ -141,7 +140,6 @@ pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKey
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct DeleteParams {
     #[ts(type = "string")]
     fingerprint: InternedString,
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index a73163253..1a851fd2e 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -77,7 +77,6 @@ pub async fn enable_zram() -> Result<(), Error> {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct ZramParams {
     enable: bool,
 }
@@ -140,7 +139,6 @@ fn display_governor_info(params: WithIoFormat<GovernorParams>, result: GovernorI
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct GovernorParams {
     set: Option<Governor>,
 }
@@ -235,7 +233,6 @@ pub async fn time(ctx: RpcContext, _: Empty) -> Result<TimeInfo, Error> {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct LogsParams {
     #[arg(short = 'l', long = "limit")]
     #[ts(type = "number | null")]
@@ -321,7 +318,6 @@ pub async fn logs_follow(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct KernelLogsParams {
     #[arg(short = 'l', long = "limit")]
     #[ts(type = "number | null")]
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index beb756179..05303182d 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -38,7 +38,6 @@ lazy_static! {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-#[ts(export)]
 pub struct UpdateSystemParams {
     #[ts(type = "string")]
     marketplace_url: Url,
diff --git a/web/projects/marketplace/src/types.ts b/web/projects/marketplace/src/types.ts
index bc7c70f80..7b99c7b80 100644
--- a/web/projects/marketplace/src/types.ts
+++ b/web/projects/marketplace/src/types.ts
@@ -1,5 +1,5 @@
 import { Url } from '@start9labs/shared'
-import { Manifest } from '../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 export type StoreURL = string
 export type StoreName = string
@@ -26,7 +26,7 @@ export interface MarketplacePkg {
   icon: Url
   license: Url
   instructions: Url
-  manifest: Manifest
+  manifest: T.Manifest
   categories: string[]
   versions: string[]
   dependencyMetadata: {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index 62038e78b..082f8aa0d 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -18,7 +18,7 @@ import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
 import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
-import { Status } from '../../../../../../../../core/startos/bindings/Status'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'app-actions',
@@ -42,7 +42,7 @@ export class AppActionsPage {
   ) {}
 
   async handleAction(
-    status: Status,
+    status: T.Status,
     action: { key: string; value: ActionMetadata },
   ) {
     if (
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 5f7227464..8baa0bfde 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -7,11 +7,9 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import { QRComponent } from 'src/app/components/qr/qr.component'
 import { map } from 'rxjs'
-import { types as T } from '@start9labs/start-sdk'
-import { ServiceInterface } from '../../../../../../../../core/startos/bindings/ServiceInterface'
-import { ServiceInterfaceWithHostInfo } from '../../../../../../../../core/startos/bindings/ServiceInterfaceWithHostInfo'
+import { T } from '@start9labs/start-sdk'
 
-type MappedInterface = ServiceInterface & {
+type MappedInterface = T.ServiceInterface & {
   addresses: MappedAddress[]
 }
 type MappedAddress = {
@@ -101,7 +99,7 @@ export class AppInterfacesItemComponent {
 }
 
 function getAddresses(
-  serviceInterface: ServiceInterfaceWithHostInfo,
+  serviceInterface: T.ServiceInterfaceWithHostInfo,
 ): MappedAddress[] {
   const host = serviceInterface.hostInfo
   const addressInfo = serviceInterface.addressInfo
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index b1c62618d..35bf99f8f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { PkgInfo } from 'src/app/util/get-package-info'
 import { UiLauncherService } from 'src/app/services/ui-launcher.service'
-import { MainStatus } from '../../../../../../../../../core/startos/bindings/MainStatus'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'app-list-pkg',
@@ -15,7 +15,7 @@ export class AppListPkgComponent {
 
   constructor(private readonly launcherService: UiLauncherService) {}
 
-  get pkgMainStatus(): MainStatus {
+  get pkgMainStatus(): T.MainStatus {
     return (
       this.pkg.entry.status.main || {
         status: 'stopped',
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 3ee4e1b2d..010a7473c 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -25,7 +25,7 @@ import {
   isRestoring,
   isUpdating,
 } from 'src/app/util/get-package-data'
-import { Manifest } from '../../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 export interface DependencyInfo {
   id: string
@@ -91,7 +91,7 @@ export class AppShowPage {
 
   private getDepValues(
     pkg: PackageDataEntry,
-    manifest: Manifest,
+    manifest: T.Manifest,
     depId: string,
     depErrors: PkgDependencyErrors,
   ): DependencyInfo {
@@ -120,7 +120,7 @@ export class AppShowPage {
 
   private getDepErrors(
     pkg: PackageDataEntry,
-    manifest: Manifest,
+    manifest: T.Manifest,
     depId: string,
     depErrors: PkgDependencyErrors,
   ) {
@@ -162,7 +162,7 @@ export class AppShowPage {
 
   private async fixDep(
     pkg: PackageDataEntry,
-    pkgManifest: Manifest,
+    pkgManifest: T.Manifest,
     action: 'install' | 'update' | 'configure',
     id: string,
   ): Promise<void> {
@@ -177,7 +177,7 @@ export class AppShowPage {
 
   private async installDep(
     pkg: PackageDataEntry,
-    pkgManifest: Manifest,
+    pkgManifest: T.Manifest,
     depId: string,
   ): Promise<void> {
     const dependentInfo: DependentInfo = {
@@ -196,7 +196,7 @@ export class AppShowPage {
   }
 
   private async configureDep(
-    pkgManifest: Manifest,
+    pkgManifest: T.Manifest,
     dependencyId: string,
   ): Promise<void> {
     const dependentInfo: DependentInfo = {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
index b639b216f..278fa3d88 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
@@ -1,9 +1,9 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { ModalController, ToastController } from '@ionic/angular'
 import { copyToClipboard, MarkdownComponent } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
 import { from } from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { Manifest } from '../../../../../../../../../../core/startos/bindings/Manifest'
 
 @Component({
   selector: 'app-show-additional',
@@ -12,7 +12,7 @@ import { Manifest } from '../../../../../../../../../../core/startos/bindings/Ma
 })
 export class AppShowAdditionalComponent {
   @Input()
-  manifest!: Manifest
+  manifest!: T.Manifest
 
   constructor(
     private readonly modalCtrl: ModalController,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
index ccf46a6e8..f3db08063 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { T } from '@start9labs/start-sdk'
 import { ConnectionService } from 'src/app/services/connection.service'
-import { HealthCheckResult } from '../../../../../../../../../../core/startos/bindings/HealthCheckResult'
 
 @Component({
   selector: 'app-show-health-checks',
@@ -10,17 +10,17 @@ import { HealthCheckResult } from '../../../../../../../../../../core/startos/bi
 })
 export class AppShowHealthChecksComponent {
   @Input()
-  healthChecks!: Record<string, HealthCheckResult>
+  healthChecks!: Record<string, T.HealthCheckResult>
 
   readonly connected$ = this.connectionService.connected$
 
   constructor(private readonly connectionService: ConnectionService) {}
 
-  isLoading(result: HealthCheckResult['result']): boolean {
+  isLoading(result: T.HealthCheckResult['result']): boolean {
     return result === 'starting' || result === 'loading'
   }
 
-  isReady(result: HealthCheckResult['result']): boolean {
+  isReady(result: T.HealthCheckResult['result']): boolean {
     return result !== 'failure' && result !== 'loading'
   }
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
index 474b62f62..b6d259553 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { FullProgress } from '../../../../../../../../../../core/startos/bindings/FullProgress'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'app-show-progress',
@@ -9,5 +9,5 @@ import { FullProgress } from '../../../../../../../../../../core/startos/binding
 })
 export class AppShowProgressComponent {
   @Input()
-  phases!: FullProgress['phases']
+  phases!: T.FullProgress['phases']
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 23d9affd4..4bc1bc464 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -20,8 +20,7 @@ import {
   getAllPackages,
 } from 'src/app/util/get-package-data'
 import { PatchDB } from 'patch-db-client'
-import { Status } from '../../../../../../../../../../core/startos/bindings/Status'
-import { Manifest } from '../../../../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'app-show-status',
@@ -57,11 +56,11 @@ export class AppShowStatusComponent {
     return this.pkg.serviceInterfaces
   }
 
-  get pkgStatus(): Status {
+  get pkgStatus(): T.Status {
     return this.pkg.status
   }
 
-  get manifest(): Manifest {
+  get manifest(): T.Manifest {
     return getManifest(this.pkg)
   }
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
index a676c28f7..30d71d427 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
@@ -1,11 +1,11 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { HealthCheckResult } from '../../../../../../../../../core/startos/bindings/HealthCheckResult'
+import { T } from '@start9labs/start-sdk'
 
 @Pipe({
   name: 'healthColor',
 })
 export class HealthColorPipe implements PipeTransform {
-  transform(val: HealthCheckResult['result']): string {
+  transform(val: T.HealthCheckResult['result']): string {
     switch (val) {
       case 'success':
         return 'success'
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index c51b4cac7..f7ae9f973 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -11,7 +11,7 @@ import { ModalService } from 'src/app/services/modal.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { from, map, Observable } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
-import { Manifest } from '../../../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 export interface Button {
   title: string
@@ -99,7 +99,7 @@ export class ToButtonsPipe implements PipeTransform {
     ]
   }
 
-  private async presentModalInstructions(manifest: Manifest) {
+  private async presentModalInstructions(manifest: T.Manifest) {
     this.apiService
       .setDbValue<boolean>(['ack-instructions', manifest.id], true)
       .catch(e => console.error('Failed to mark instructions as seen', e))
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
index 63c31263a..f66773f2c 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
@@ -4,8 +4,7 @@ import { isEmptyObject } from '@start9labs/shared'
 import { map, startWith } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
 import { Observable } from 'rxjs'
-import { HealthCheckResult } from '../../../../../../../../../core/startos/bindings/HealthCheckResult'
-import { Manifest } from '../../../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 @Pipe({
   name: 'toHealthChecks',
@@ -14,8 +13,8 @@ export class ToHealthChecksPipe implements PipeTransform {
   constructor(private readonly patch: PatchDB<DataModel>) {}
 
   transform(
-    manifest: Manifest,
-  ): Observable<Record<string, HealthCheckResult | null> | null> {
+    manifest: T.Manifest,
+  ): Observable<Record<string, T.HealthCheckResult | null> | null> {
     return this.patch.watch$('packageData', manifest.id, 'status', 'main').pipe(
       map(main => {
         return main.status === 'running' && !isEmptyObject(main.health)
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
index 4a5d8951d..d88ab8838 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
@@ -8,7 +8,7 @@ import { PatchDB } from 'patch-db-client'
 import { take } from 'rxjs/operators'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { Observable } from 'rxjs'
-import { MainStatus } from '../../../../../../../../../core/startos/bindings/MainStatus'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'backing-up',
@@ -30,7 +30,7 @@ export class BackingUpComponent {
   name: 'pkgMainStatus',
 })
 export class PkgMainStatusPipe implements PipeTransform {
-  transform(pkgId: string): Observable<MainStatus['status']> {
+  transform(pkgId: string): Observable<T.MainStatus['status']> {
     return this.patch.watch$('packageData', pkgId, 'status', 'main', 'status')
   }
 
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index 242b94172..4026d5183 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -4,7 +4,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
 import cbor from 'cbor'
 import { ErrorToastService } from '@start9labs/shared'
-import { Manifest } from '../../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 interface Positions {
   [key: string]: [bigint, bigint] // [position, length]
@@ -21,7 +21,7 @@ const VERSION = new Uint8Array([1])
 export class SideloadPage {
   isMobile = isPlatform(window, 'ios') || isPlatform(window, 'android')
   toUpload: {
-    manifest: Manifest | null
+    manifest: T.Manifest | null
     icon: string | null
     file: File | null
   } = {
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.ts b/web/projects/ui/src/app/pages/updates/updates.page.ts
index a77dcb34f..d1ffc4829 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.page.ts
@@ -24,7 +24,7 @@ import {
   isUpdating,
 } from 'src/app/util/get-package-data'
 import { dryUpdate } from 'src/app/util/dry-update'
-import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 interface UpdatesData {
   hosts: StoreIdentity[]
@@ -70,7 +70,7 @@ export class UpdatesPage {
     })
   }
 
-  async tryUpdate(manifest: Manifest, url: string, e: Event): Promise<void> {
+  async tryUpdate(manifest: T.Manifest, url: string, e: Event): Promise<void> {
     e.stopPropagation()
 
     const { id, version } = manifest
@@ -86,7 +86,7 @@ export class UpdatesPage {
     }
   }
 
-  private async dryInstall(manifest: Manifest, url: string) {
+  private async dryInstall(manifest: T.Manifest, url: string) {
     const { id, version, title } = manifest
 
     const breakages = dryUpdate(
diff --git a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
index 7d6a646d0..8eb0a57ec 100644
--- a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
+++ b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
@@ -1,11 +1,11 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { Progress } from '../../../../../../../core/startos/bindings/Progress'
+import { T } from '@start9labs/start-sdk'
 
 @Pipe({
   name: 'installingProgressString',
 })
 export class InstallingProgressDisplayPipe implements PipeTransform {
-  transform(progress: Progress): string {
+  transform(progress: T.Progress): string {
     if (progress === true) return 'finalizing'
     if (progress === false || !progress.total) return 'unknown %'
     const percentage = Math.round((100 * progress.done) / progress.total)
@@ -18,7 +18,7 @@ export class InstallingProgressDisplayPipe implements PipeTransform {
   name: 'installingProgress',
 })
 export class InstallingProgressPipe implements PipeTransform {
-  transform(progress: Progress): number | null {
+  transform(progress: T.Progress): number | null {
     if (progress === true) return 1
     if (progress === false || !progress.total) return null
     return Number((progress.done / progress.total).toFixed(2))
diff --git a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
index d99e69c87..9077c5215 100644
--- a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
+++ b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
@@ -1,7 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core'
 import { ConfigService } from '../../services/config.service'
-import { PackageState } from '../../../../../../../core/startos/bindings/PackageState'
-import { MainStatus } from '../../../../../../../core/startos/bindings/MainStatus'
+import { T } from '@start9labs/start-sdk'
 
 @Pipe({
   name: 'isLaunchable',
@@ -10,8 +9,8 @@ export class LaunchablePipe implements PipeTransform {
   constructor(private configService: ConfigService) {}
 
   transform(
-    state: PackageState['state'],
-    status: MainStatus['status'],
+    state: T.PackageState['state'],
+    status: T.MainStatus['status'],
   ): boolean {
     return this.configService.isLaunchable(state, status)
   }
diff --git a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
index 49ad380ad..6994d1a30 100644
--- a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
+++ b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core'
 import { PackageDataEntry } from '../../services/patch-db/data-model'
 import { hasUi } from '../../services/config.service'
 import { getManifest } from 'src/app/util/get-package-data'
-import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 @Pipe({
   name: 'hasUi',
@@ -17,7 +17,7 @@ export class UiPipe implements PipeTransform {
   name: 'toManifest',
 })
 export class ToManifestPipe implements PipeTransform {
-  transform(pkg: PackageDataEntry): Manifest {
+  transform(pkg: PackageDataEntry): T.Manifest {
     return getManifest(pkg)
   }
 }
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 4ceaff1f9..7d2c4b0c7 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -6,11 +6,10 @@ import { Metric, NotificationLevel, RR, ServerNotifications } from './api.types'
 import { BTC_ICON, LND_ICON, PROXY_ICON } from './api-icons'
 import { DependencyMetadata, MarketplacePkg } from '@start9labs/marketplace'
 import { Log } from '@start9labs/shared'
-import { ServerStatus } from '../../../../../../../core/startos/bindings/ServerStatus'
-import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 export module Mock {
-  export const ServerUpdated: ServerStatus = {
+  export const ServerUpdated: T.ServerStatus = {
     backupProgress: null,
     updateProgress: null,
     updated: true,
@@ -42,7 +41,7 @@ export module Mock {
     '0.19.0': 'release notes for Bitcoin 0.19.0',
   }
 
-  export const MockManifestBitcoind: Manifest = {
+  export const MockManifestBitcoind: T.Manifest = {
     id: 'bitcoind',
     title: 'Bitcoin Core',
     version: '0.21.0',
@@ -80,7 +79,7 @@ export module Mock {
     },
   }
 
-  export const MockManifestLnd: Manifest = {
+  export const MockManifestLnd: T.Manifest = {
     id: 'lnd',
     title: 'Lightning Network Daemon',
     version: '0.11.1',
@@ -128,7 +127,7 @@ export module Mock {
     },
   }
 
-  export const MockManifestBitcoinProxy: Manifest = {
+  export const MockManifestBitcoinProxy: T.Manifest = {
     id: 'btc-rpc-proxy',
     title: 'Bitcoin Proxy',
     version: '0.2.2',
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 38c80187d..1d9ce3de3 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -4,8 +4,7 @@ import { PackagePropertiesVersioned } from 'src/app/util/properties.util'
 import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
-import { HealthCheckResult } from '../../../../../../../core/startos/bindings/HealthCheckResult'
-import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 export module RR {
   // DB
@@ -245,7 +244,7 @@ export module RR {
   }
 
   export type SideloadPackageReq = {
-    manifest: Manifest
+    manifest: T.Manifest
     icon: string // base64
   }
   export type SideloadPacakgeRes = string //guid
@@ -515,7 +514,7 @@ export interface DependencyErrorConfigUnsatisfied {
 
 export interface DependencyErrorHealthChecksFailed {
   type: 'healthChecksFailed'
-  check: HealthCheckResult
+  check: T.HealthCheckResult
 }
 
 export interface DependencyErrorTransitive {
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 5cbc841ef..31ab11201 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -37,10 +37,9 @@ import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 import { AuthService } from '../auth.service'
 import { ConnectionService } from '../connection.service'
 import { StoreInfo } from '@start9labs/marketplace'
-import { FullProgress } from '../../../../../../../core/startos/bindings/FullProgress'
-import { ServerStatus } from '../../../../../../../core/startos/bindings/ServerStatus'
+import { T } from '@start9labs/start-sdk'
 
-const PROGRESS: FullProgress = {
+const PROGRESS: T.FullProgress = {
   overall: {
     done: 0,
     total: 120,
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index eb53dd385..3eca4f48d 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -1,13 +1,8 @@
 import { DOCUMENT } from '@angular/common'
 import { Inject, Injectable } from '@angular/core'
 import { WorkspaceConfig } from '@start9labs/shared'
-import { types } from '@start9labs/start-sdk'
-import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
-import { PackageState } from '../../../../../../core/startos/bindings/PackageState'
-import { MainStatus } from '../../../../../../core/startos/bindings/MainStatus'
-import { ExportedOnionHostname } from '../../../../../../core/startos/bindings/ExportedOnionHostname'
-import { ExportedIpHostname } from '../../../../../../core/startos/bindings/ExportedIpHostname'
-import { ExportedHostnameInfo } from '../../../../../../core/startos/bindings/ExportedHostnameInfo'
+import { T } from '@start9labs/start-sdk'
+import { PackageDataEntry } from './patch-db/data-model'
 
 const {
   gitHash,
@@ -55,8 +50,8 @@ export class ConfigService {
   }
 
   isLaunchable(
-    state: PackageState['state'],
-    status: MainStatus['status'],
+    state: T.PackageState['state'],
+    status: T.MainStatus['status'],
   ): boolean {
     return state === 'installed' && status === 'running'
   }
@@ -76,13 +71,13 @@ export class ConfigService {
 
     if (host.kind === 'multi') {
       const onionHostname = host.hostnames.find(h => h.kind === 'onion')
-        ?.hostname as ExportedOnionHostname
+        ?.hostname as T.ExportedOnionHostname
 
       if (this.isTor() && onionHostname) {
         url.hostname = onionHostname.value
       } else {
         const ipHostname = host.hostnames.find(h => h.kind === 'ip')
-          ?.hostname as ExportedIpHostname
+          ?.hostname as T.ExportedIpHostname
 
         if (!ipHostname) return ''
 
@@ -91,16 +86,16 @@ export class ConfigService {
       }
     } else {
       throw new Error('unimplemented')
-      const hostname = {} as ExportedHostnameInfo // host.hostname
+      // const hostname = {} as T.ExportedHostnameInfo // host.hostname
 
-      if (!hostname) return ''
+      // if (!hostname) return ''
 
-      if (this.isTor() && hostname.kind === 'onion') {
-        url.hostname = (hostname.hostname as ExportedOnionHostname).value
-      } else {
-        url.hostname = this.hostname
-        url.port = String(hostname.hostname.sslPort || hostname.hostname.port)
-      }
+      // if (this.isTor() && hostname.kind === 'onion') {
+      //   url.hostname = (hostname.hostname as T.ExportedOnionHostname).value
+      // } else {
+      //   url.hostname = this.hostname
+      //   url.port = String(hostname.hostname.sslPort || hostname.hostname.port)
+      // }
     }
 
     return url.href
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index b2446892e..33daecda7 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -1,13 +1,6 @@
-import { Url } from '@start9labs/shared'
-import { types } from '@start9labs/start-sdk'
-import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
-import { Public } from '../../../../../../../core/startos/bindings/Public'
-import { PackageDataEntry as PDE } from '../../../../../../../core/startos/bindings/PackageDataEntry'
-import { FullProgress } from '../../../../../../../core/startos/bindings/FullProgress'
-import { Manifest } from '../../../../../../../core/startos/bindings/Manifest'
-type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo
+import { T } from '@start9labs/start-sdk'
 
-export type DataModel = Public & {
+export type DataModel = T.Public & {
   ui: UIData
   packageData: Record<string, PackageDataEntry>
 }
@@ -52,15 +45,16 @@ export interface UIStore {
   name?: string
 }
 
-export type PackageDataEntry<T extends StateInfo = StateInfo> = PDE & {
-  stateInfo: T
-}
+export type PackageDataEntry<T extends StateInfo = StateInfo> =
+  T.PackageDataEntry & {
+    stateInfo: T
+  }
 
 export type StateInfo = InstalledState | InstallingState | UpdatingState
 
 export type InstalledState = {
   state: 'installed' | 'removing'
-  manifest: Manifest
+  manifest: T.Manifest
   installingInfo?: undefined
 }
 
@@ -73,10 +67,10 @@ export type InstallingState = {
 export type UpdatingState = {
   state: 'updating'
   installingInfo: InstallingInfo
-  manifest: Manifest
+  manifest: T.Manifest
 }
 
 export type InstallingInfo = {
-  progress: FullProgress
-  newManifest: Manifest
+  progress: T.FullProgress
+  newManifest: T.Manifest
 }
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index a3f19b18f..d73a9afe1 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -1,6 +1,5 @@
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { PkgDependencyErrors } from './dep-error.service'
-import { Status } from '../../../../../../core/startos/bindings/Status'
 import { T } from '@start9labs/start-sdk'
 
 export interface PackageStatus {
@@ -28,7 +27,7 @@ export function renderPkgStatus(
   return { primary, dependency, health }
 }
 
-function getInstalledPrimaryStatus(status: Status): PrimaryStatus {
+function getInstalledPrimaryStatus(status: T.Status): PrimaryStatus {
   if (!status.configured) {
     return 'needsConfig'
   } else {
@@ -40,7 +39,7 @@ function getDependencyStatus(depErrors: PkgDependencyErrors): DependencyStatus {
   return Object.values(depErrors).some(err => !!err) ? 'warning' : 'satisfied'
 }
 
-function getHealthStatus(status: Status): T.HealthStatus | null {
+function getHealthStatus(status: T.Status): T.HealthStatus | null {
   if (status.main.status !== 'running' || !status.main.health) {
     return null
   }
diff --git a/web/projects/ui/src/app/util/get-package-data.ts b/web/projects/ui/src/app/util/get-package-data.ts
index 08fbdd2df..c4d0cc046 100644
--- a/web/projects/ui/src/app/util/get-package-data.ts
+++ b/web/projects/ui/src/app/util/get-package-data.ts
@@ -7,7 +7,7 @@ import {
   UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { firstValueFrom } from 'rxjs'
-import { Manifest } from '../../../../../../core/startos/bindings/Manifest'
+import { T } from '@start9labs/start-sdk'
 
 export async function getPackage(
   patch: PatchDB<DataModel>,
@@ -22,7 +22,7 @@ export async function getAllPackages(
   return firstValueFrom(patch.watch$('packageData'))
 }
 
-export function getManifest(pkg: PackageDataEntry): Manifest {
+export function getManifest(pkg: PackageDataEntry): T.Manifest {
   if (isInstalled(pkg) || isRemoving(pkg)) return pkg.stateInfo.manifest
 
   return (pkg.stateInfo as InstallingState).installingInfo.newManifest
diff --git a/web/projects/ui/src/app/util/get-server-info.ts b/web/projects/ui/src/app/util/get-server-info.ts
index ba4bf0dbf..b5d5e819e 100644
--- a/web/projects/ui/src/app/util/get-server-info.ts
+++ b/web/projects/ui/src/app/util/get-server-info.ts
@@ -1,10 +1,10 @@
 import { PatchDB } from 'patch-db-client'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { firstValueFrom } from 'rxjs'
-import { ServerInfo } from '../../../../../../core/startos/bindings/ServerInfo'
+import { T } from '@start9labs/start-sdk'
 
 export async function getServerInfo(
   patch: PatchDB<DataModel>,
-): Promise<ServerInfo> {
+): Promise<T.ServerInfo> {
   return firstValueFrom(patch.watch$('serverInfo'))
 }

From 3b9298ed2b1b2567ccb36a494a21f42d5bcf7946 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Wed, 3 Apr 2024 11:48:26 -0600
Subject: [PATCH 128/341] Feature/dependency autoconfig (#2588)

* dependency autoconfig

* FE portion

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/models/src/procedure_name.rs             |  6 +-
 .../startos/bindings/CurrentDependencyInfo.ts |  1 +
 .../bindings/DependencyConfigErrors.ts        |  4 -
 core/startos/bindings/Status.ts               |  7 +-
 core/startos/bindings/index.ts                |  1 -
 core/startos/src/context/rpc.rs               | 25 ++----
 core/startos/src/db/model/package.rs          |  1 +
 core/startos/src/dependencies.rs              | 27 +++---
 core/startos/src/service/action.rs            | 37 ++++++++
 core/startos/src/service/config.rs            | 51 +++++++++--
 core/startos/src/service/control.rs           |  2 -
 core/startos/src/service/dependencies.rs      | 61 +++++++++++++
 core/startos/src/service/mod.rs               | 43 +--------
 core/startos/src/service/properties.rs        | 21 +++++
 .../src/service/service_effect_handler.rs     | 89 +++++++++++--------
 core/startos/src/service/service_map.rs       |  1 -
 .../startos/src/service/transition/restart.rs |  4 +-
 core/startos/src/status/mod.rs                | 18 ----
 core/startos/src/util/actor.rs                |  7 +-
 sdk/lib/types.ts                              |  2 +-
 .../ui/src/app/services/api/api.fixures.ts    |  8 +-
 .../ui/src/app/services/api/mock-patch.ts     |  6 +-
 .../ui/src/app/services/dep-error.service.ts  | 10 +--
 23 files changed, 262 insertions(+), 170 deletions(-)
 delete mode 100644 core/startos/bindings/DependencyConfigErrors.ts
 create mode 100644 core/startos/src/service/action.rs
 create mode 100644 core/startos/src/service/dependencies.rs
 create mode 100644 core/startos/src/service/properties.rs

diff --git a/core/models/src/procedure_name.rs b/core/models/src/procedure_name.rs
index c42068be3..c8ae8c3a8 100644
--- a/core/models/src/procedure_name.rs
+++ b/core/models/src/procedure_name.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::ActionId;
+use crate::{ActionId, PackageId};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ProcedureName {
@@ -14,8 +14,8 @@ pub enum ProcedureName {
     ActionMetadata,
     RunAction(ActionId),
     GetAction(ActionId),
-    QueryDependency(ActionId),
-    UpdateDependency(ActionId),
+    QueryDependency(PackageId),
+    UpdateDependency(PackageId),
     Init,
     Uninit,
 }
diff --git a/core/startos/bindings/CurrentDependencyInfo.ts b/core/startos/bindings/CurrentDependencyInfo.ts
index 10112e312..8b2b0100d 100644
--- a/core/startos/bindings/CurrentDependencyInfo.ts
+++ b/core/startos/bindings/CurrentDependencyInfo.ts
@@ -6,4 +6,5 @@ export type CurrentDependencyInfo = {
   icon: DataUrl;
   registryUrl: string;
   versionSpec: string;
+  configSatisfied: boolean;
 } & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] });
diff --git a/core/startos/bindings/DependencyConfigErrors.ts b/core/startos/bindings/DependencyConfigErrors.ts
deleted file mode 100644
index 5f2246fa9..000000000
--- a/core/startos/bindings/DependencyConfigErrors.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageId } from "./PackageId";
-
-export type DependencyConfigErrors = { [key: PackageId]: string };
diff --git a/core/startos/bindings/Status.ts b/core/startos/bindings/Status.ts
index e23c5b4be..6b240347d 100644
--- a/core/startos/bindings/Status.ts
+++ b/core/startos/bindings/Status.ts
@@ -1,9 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { DependencyConfigErrors } from "./DependencyConfigErrors";
 import type { MainStatus } from "./MainStatus";
 
-export type Status = {
-  configured: boolean;
-  main: MainStatus;
-  dependencyConfigErrors: DependencyConfigErrors;
-};
+export type Status = { configured: boolean; main: MainStatus };
diff --git a/core/startos/bindings/index.ts b/core/startos/bindings/index.ts
index 4ce0ab643..fd422a2f5 100644
--- a/core/startos/bindings/index.ts
+++ b/core/startos/bindings/index.ts
@@ -18,7 +18,6 @@ export { CurrentDependencies } from "./CurrentDependencies";
 export { CurrentDependencyInfo } from "./CurrentDependencyInfo";
 export { DataUrl } from "./DataUrl";
 export { Dependencies } from "./Dependencies";
-export { DependencyConfigErrors } from "./DependencyConfigErrors";
 export { DependencyKind } from "./DependencyKind";
 export { DependencyRequirement } from "./DependencyRequirement";
 export { DepInfo } from "./DepInfo";
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 6450eb561..a51e23b08 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -209,33 +209,24 @@ impl RpcContext {
         self.services.init(&self).await?;
         tracing::info!("Initialized Package Managers");
 
-        let mut all_dependency_config_errs = BTreeMap::new();
+        let mut updated_current_dependents = BTreeMap::new();
         let peek = self.db.peek().await;
         for (package_id, package) in peek.as_public().as_package_data().as_entries()?.into_iter() {
             let package = package.clone();
-            let current_dependencies = package.as_current_dependencies().de()?;
-            all_dependency_config_errs.insert(
-                package_id.clone(),
-                compute_dependency_config_errs(
-                    self,
-                    &peek,
-                    &package_id,
-                    &current_dependencies,
-                    &Default::default(),
-                )
-                .await?,
-            );
+            let mut current_dependencies = package.as_current_dependencies().de()?;
+            compute_dependency_config_errs(self, &package_id, &mut current_dependencies).await?;
+            updated_current_dependents.insert(package_id.clone(), current_dependencies);
         }
         self.db
             .mutate(|v| {
-                for (package_id, errs) in all_dependency_config_errs {
-                    if let Some(config_errors) = v
+                for (package_id, deps) in updated_current_dependents {
+                    if let Some(model) = v
                         .as_public_mut()
                         .as_package_data_mut()
                         .as_idx_mut(&package_id)
-                        .map(|i| i.as_status_mut().as_dependency_config_errors_mut())
+                        .map(|i| i.as_current_dependencies_mut())
                     {
-                        config_errors.ser(&errs)?;
+                        model.ser(&deps)?;
                     }
                 }
                 Ok(())
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 83a35d086..29b7bb90f 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -380,6 +380,7 @@ pub struct CurrentDependencyInfo {
     pub registry_url: Url,
     #[ts(type = "string")]
     pub version_spec: VersionRange,
+    pub config_satisfied: bool,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 69e4cad59..61f5af2b4 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -12,7 +12,6 @@ use crate::config::{Config, ConfigSpec, ConfigureContext};
 use crate::context::RpcContext;
 use crate::db::model::package::CurrentDependencies;
 use crate::prelude::*;
-use crate::status::DependencyConfigErrors;
 use crate::Error;
 
 pub fn dependency() -> ParentHandler {
@@ -180,17 +179,23 @@ pub async fn configure_logic(
 #[instrument(skip_all)]
 pub async fn compute_dependency_config_errs(
     ctx: &RpcContext,
-    db: &Peeked,
     id: &PackageId,
-    current_dependencies: &CurrentDependencies,
-    dependency_config: &BTreeMap<PackageId, Config>,
-) -> Result<DependencyConfigErrors, Error> {
-    let mut dependency_config_errs = BTreeMap::new();
-    for (dependency, _dep_info) in current_dependencies.0.iter() {
+    current_dependencies: &mut CurrentDependencies,
+) -> Result<(), Error> {
+    let service_guard = ctx.services.get(id).await;
+    let service = service_guard.as_ref().or_not_found(id)?;
+    for (dep_id, dep_info) in current_dependencies.0.iter_mut() {
         // check if config passes dependency check
-        if let Some(error) = todo!() {
-            dependency_config_errs.insert(dependency.clone(), error);
-        }
+        let Some(dependency) = &*ctx.services.get(dep_id).await else {
+            continue;
+        };
+
+        let dep_config = dependency.get_config().await?.config;
+
+        dep_info.config_satisfied = service
+            .dependency_config(dep_id.clone(), dep_config)
+            .await?
+            .is_none();
     }
-    Ok(DependencyConfigErrors(dependency_config_errs))
+    Ok(())
 }
diff --git a/core/startos/src/service/action.rs b/core/startos/src/service/action.rs
new file mode 100644
index 000000000..a33869222
--- /dev/null
+++ b/core/startos/src/service/action.rs
@@ -0,0 +1,37 @@
+use std::time::Duration;
+
+use models::{ActionId, ProcedureName};
+
+use crate::action::ActionResult;
+use crate::prelude::*;
+use crate::service::{Service, ServiceActor};
+use crate::util::actor::{BackgroundJobs, Handler};
+
+struct Action {
+    id: ActionId,
+    input: Value,
+}
+impl Handler<Action> for ServiceActor {
+    type Response = Result<ActionResult, Error>;
+    async fn handle(
+        &mut self,
+        Action { id, input }: Action,
+        _: &mut BackgroundJobs,
+    ) -> Self::Response {
+        let container = &self.0.persistent_container;
+        container
+            .execute::<ActionResult>(
+                ProcedureName::RunAction(id),
+                input,
+                Some(Duration::from_secs(30)),
+            )
+            .await
+            .with_kind(ErrorKind::Action)
+    }
+}
+
+impl Service {
+    pub async fn action(&self, id: ActionId, input: Value) -> Result<ActionResult, Error> {
+        self.actor.send(Action { id, input }).await?
+    }
+}
diff --git a/core/startos/src/service/config.rs b/core/startos/src/service/config.rs
index e1294a465..df3e5b046 100644
--- a/core/startos/src/service/config.rs
+++ b/core/startos/src/service/config.rs
@@ -1,19 +1,52 @@
+use std::time::Duration;
+
 use models::ProcedureName;
 
+use crate::config::action::ConfigRes;
 use crate::config::ConfigureContext;
 use crate::prelude::*;
-use crate::service::Service;
+use crate::service::{Service, ServiceActor};
+use crate::util::actor::{BackgroundJobs, Handler};
+use crate::util::serde::NoOutput;
 
-impl Service {
-    pub async fn configure(
-        &self,
-        ConfigureContext { timeout, config }: ConfigureContext,
-    ) -> Result<(), Error> {
-        let container = &self.seed.persistent_container;
+struct Configure(ConfigureContext);
+impl Handler<Configure> for ServiceActor {
+    type Response = Result<(), Error>;
+    async fn handle(
+        &mut self,
+        Configure(ConfigureContext { timeout, config }): Configure,
+        _: &mut BackgroundJobs,
+    ) -> Self::Response {
+        let container = &self.0.persistent_container;
         container
-            .execute::<Value>(ProcedureName::SetConfig, to_value(&config)?, timeout)
+            .execute::<NoOutput>(ProcedureName::SetConfig, to_value(&config)?, timeout)
             .await
-            .with_kind(ErrorKind::Action)?;
+            .with_kind(ErrorKind::ConfigRulesViolation)?;
         Ok(())
     }
 }
+
+struct GetConfig;
+impl Handler<GetConfig> for ServiceActor {
+    type Response = Result<ConfigRes, Error>;
+    async fn handle(&mut self, _: GetConfig, _: &mut BackgroundJobs) -> Self::Response {
+        let container = &self.0.persistent_container;
+        container
+            .execute::<ConfigRes>(
+                ProcedureName::GetConfig,
+                Value::Null,
+                Some(Duration::from_secs(30)), // TODO timeout
+            )
+            .await
+            .with_kind(ErrorKind::ConfigGen)
+    }
+}
+
+impl Service {
+    pub async fn configure(&self, ctx: ConfigureContext) -> Result<(), Error> {
+        self.actor.send(Configure(ctx)).await?
+    }
+    pub async fn get_config(&self) -> Result<ConfigRes, Error> {
+        self.actor.send(GetConfig).await?
+    }
+}
diff --git a/core/startos/src/service/control.rs b/core/startos/src/service/control.rs
index 88d66d97c..5ef0bbff2 100644
--- a/core/startos/src/service/control.rs
+++ b/core/startos/src/service/control.rs
@@ -5,7 +5,6 @@ use crate::service::{Service, ServiceActor};
 use crate::util::actor::{BackgroundJobs, Handler};
 
 struct Start;
-#[async_trait::async_trait]
 impl Handler<Start> for ServiceActor {
     type Response = ();
     async fn handle(&mut self, _: Start, _: &mut BackgroundJobs) -> Self::Response {
@@ -22,7 +21,6 @@ impl Service {
 }
 
 struct Stop;
-#[async_trait::async_trait]
 impl Handler<Stop> for ServiceActor {
     type Response = ();
     async fn handle(&mut self, _: Stop, _: &mut BackgroundJobs) -> Self::Response {
diff --git a/core/startos/src/service/dependencies.rs b/core/startos/src/service/dependencies.rs
new file mode 100644
index 000000000..67cc5d53f
--- /dev/null
+++ b/core/startos/src/service/dependencies.rs
@@ -0,0 +1,61 @@
+use std::time::Duration;
+
+use imbl_value::json;
+use models::{PackageId, ProcedureName};
+
+use crate::prelude::*;
+use crate::service::{Service, ServiceActor};
+use crate::util::actor::{BackgroundJobs, Handler};
+use crate::Config;
+
+struct DependencyConfig {
+    dependency_id: PackageId,
+    remote_config: Option<Config>,
+}
+impl Handler<DependencyConfig> for ServiceActor {
+    type Response = Result<Option<Config>, Error>;
+    async fn handle(
+        &mut self,
+        DependencyConfig {
+            dependency_id,
+            remote_config,
+        }: DependencyConfig,
+        _: &mut BackgroundJobs,
+    ) -> Self::Response {
+        let container = &self.0.persistent_container;
+        container
+            .sanboxed::<Option<Config>>(
+                ProcedureName::UpdateDependency(dependency_id.clone()),
+                json!({
+                    "queryResults": container
+                        .execute::<Value>(
+                            ProcedureName::QueryDependency(dependency_id),
+                            Value::Null,
+                            Some(Duration::from_secs(30)),
+                        )
+                        .await
+                        .with_kind(ErrorKind::Dependency)?,
+                    "remoteConfig": remote_config,
+                }),
+                Some(Duration::from_secs(30)),
+            )
+            .await
+            .with_kind(ErrorKind::Dependency)
+            .map(|res| res.filter(|c| !c.is_empty()))
+    }
+}
+
+impl Service {
+    pub async fn dependency_config(
+        &self,
+        dependency_id: PackageId,
+        remote_config: Option<Config>,
+    ) -> Result<Option<Config>, Error> {
+        self.actor
+            .send(DependencyConfig {
+                dependency_id,
+                remote_config,
+            })
+            .await?
+    }
+}
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 95d507bfa..2b430dc73 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -5,7 +5,7 @@ use chrono::{DateTime, Utc};
 use clap::Parser;
 use futures::future::BoxFuture;
 use imbl::OrdMap;
-use models::{ActionId, HealthCheckId, PackageId, ProcedureName};
+use models::{HealthCheckId, PackageId, ProcedureName};
 use persistent_container::PersistentContainer;
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, Handler, HandlerArgs};
 use serde::{Deserialize, Serialize};
@@ -13,7 +13,6 @@ use start_stop::StartStop;
 use tokio::sync::Notify;
 use ts_rs::TS;
 
-use crate::action::ActionResult;
 use crate::config::action::ConfigRes;
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::RequestGuid;
@@ -33,10 +32,13 @@ use crate::util::actor::{Actor, BackgroundJobs, SimpleActor};
 use crate::util::serde::Pem;
 use crate::volume::data_dir;
 
+mod action;
 pub mod cli;
 mod config;
 mod control;
+mod dependencies;
 pub mod persistent_container;
+mod properties;
 mod rpc;
 pub mod service_effect_handler;
 pub mod service_map;
@@ -302,43 +304,6 @@ impl Service {
         Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
     }
 
-    pub async fn get_config(&self) -> Result<ConfigRes, Error> {
-        let container = &self.seed.persistent_container;
-        container
-            .execute::<ConfigRes>(
-                ProcedureName::GetConfig,
-                Value::Null,
-                Some(Duration::from_secs(30)), // TODO timeout
-            )
-            .await
-            .with_kind(ErrorKind::ConfigGen)
-    }
-
-    // TODO DO the Action Get
-
-    pub async fn action(&self, id: ActionId, input: Value) -> Result<ActionResult, Error> {
-        let container = &self.seed.persistent_container;
-        container
-            .execute::<ActionResult>(
-                ProcedureName::RunAction(id),
-                input,
-                Some(Duration::from_secs(30)),
-            )
-            .await
-            .with_kind(ErrorKind::Action)
-    }
-    pub async fn properties(&self) -> Result<Value, Error> {
-        let container = &self.seed.persistent_container;
-        container
-            .execute::<Value>(
-                ProcedureName::Properties,
-                Value::Null,
-                Some(Duration::from_secs(30)),
-            )
-            .await
-            .with_kind(ErrorKind::Unknown)
-    }
-
     pub async fn shutdown(self) -> Result<(), Error> {
         self.actor
             .shutdown(crate::util::actor::PendingMessageStrategy::FinishAll { timeout: None }) // TODO timeout
diff --git a/core/startos/src/service/properties.rs b/core/startos/src/service/properties.rs
new file mode 100644
index 000000000..3e795207a
--- /dev/null
+++ b/core/startos/src/service/properties.rs
@@ -0,0 +1,21 @@
+use std::time::Duration;
+
+use models::ProcedureName;
+
+use crate::prelude::*;
+use crate::service::Service;
+
+impl Service {
+    // TODO: leave here or switch to Actor Message?
+    pub async fn properties(&self) -> Result<Value, Error> {
+        let container = &self.seed.persistent_container;
+        container
+            .execute::<Value>(
+                ProcedureName::Properties,
+                Value::Null,
+                Some(Duration::from_secs(30)),
+            )
+            .await
+            .with_kind(ErrorKind::Unknown)
+    }
+}
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 4041cbb98..210c3d07c 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeSet;
+use std::collections::{BTreeMap, BTreeSet};
 use std::ffi::OsString;
 use std::net::Ipv4Addr;
 use std::os::unix::process::CommandExt;
@@ -1120,51 +1120,64 @@ async fn set_dependencies(
 ) -> Result<(), Error> {
     let ctx = ctx.deref()?;
     let id = &ctx.id;
+    let service_guard = ctx.ctx.services.get(id).await;
+    let service = service_guard.as_ref().or_not_found(id)?;
+    let mut deps = BTreeMap::new();
+    for dependency in dependencies {
+        let (dep_id, kind, registry_url, version_spec) = match dependency {
+            DependencyRequirement::Exists {
+                id,
+                registry_url,
+                version_spec,
+            } => (
+                id,
+                CurrentDependencyKind::Exists,
+                registry_url,
+                version_spec,
+            ),
+            DependencyRequirement::Running {
+                id,
+                health_checks,
+                registry_url,
+                version_spec,
+            } => (
+                id,
+                CurrentDependencyKind::Running { health_checks },
+                registry_url,
+                version_spec,
+            ),
+        };
+        let icon = todo!();
+        let title = todo!();
+        let config_satisfied = if let Some(dep_service) = &*ctx.ctx.services.get(&dep_id).await {
+            service
+                .dependency_config(dep_id, dep_service.get_config().await?.config)
+                .await?
+                .is_none()
+        } else {
+            true
+        };
+        deps.insert(
+            dep_id,
+            CurrentDependencyInfo {
+                kind: CurrentDependencyKind::Exists,
+                registry_url,
+                version_spec,
+                icon,
+                title,
+                config_satisfied,
+            },
+        );
+    }
     ctx.ctx
         .db
         .mutate(|db| {
-            let dependencies = CurrentDependencies(
-                dependencies
-                    .into_iter()
-                    .map(|dependency| match dependency {
-                        DependencyRequirement::Exists {
-                            id,
-                            registry_url,
-                            version_spec,
-                        } => (
-                            id,
-                            CurrentDependencyInfo {
-                                kind: CurrentDependencyKind::Exists,
-                                registry_url,
-                                version_spec,
-                                icon: todo!(),
-                                title: todo!(),
-                            },
-                        ),
-                        DependencyRequirement::Running {
-                            id,
-                            health_checks,
-                            registry_url,
-                            version_spec,
-                        } => (
-                            id,
-                            CurrentDependencyInfo {
-                                kind: CurrentDependencyKind::Running { health_checks },
-                                registry_url,
-                                version_spec,
-                                icon: todo!(),
-                                title: todo!(),
-                            },
-                        ),
-                    })
-                    .collect(),
-            );
             db.as_public_mut()
                 .as_package_data_mut()
                 .as_idx_mut(id)
                 .or_not_found(id)?
                 .as_current_dependencies_mut()
-                .ser(&dependencies)
+                .ser(&CurrentDependencies(deps))
         })
         .await
 }
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 934497eb9..68e1fc8a8 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -165,7 +165,6 @@ impl ServiceMap {
                                 status: Status {
                                     configured: false,
                                     main: MainStatus::Stopped,
-                                    dependency_config_errors: Default::default(),
                                 },
                                 marketplace_url: None,
                                 developer_key: Pem::new(developer_key),
diff --git a/core/startos/src/service/transition/restart.rs b/core/startos/src/service/transition/restart.rs
index 9c82d0282..7047bd18f 100644
--- a/core/startos/src/service/transition/restart.rs
+++ b/core/startos/src/service/transition/restart.rs
@@ -2,16 +2,14 @@ use std::sync::Arc;
 
 use futures::FutureExt;
 
+use super::TempDesiredState;
 use crate::prelude::*;
 use crate::service::transition::{TransitionKind, TransitionState};
 use crate::service::{Service, ServiceActor};
 use crate::util::actor::{BackgroundJobs, Handler};
 use crate::util::future::RemoteCancellable;
 
-use super::TempDesiredState;
-
 struct Restart;
-#[async_trait::async_trait]
 impl Handler<Restart> for ServiceActor {
     type Response = ();
     async fn handle(&mut self, _: Restart, jobs: &mut BackgroundJobs) -> Self::Response {
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 2faa90e79..645c082f4 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 
 use chrono::{DateTime, Utc};
 use imbl::OrdMap;
-use models::PackageId;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
@@ -18,23 +17,6 @@ pub mod health_check;
 pub struct Status {
     pub configured: bool,
     pub main: MainStatus,
-    #[serde(default)]
-    pub dependency_config_errors: DependencyConfigErrors,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel, Default, TS)]
-#[model = "Model<Self>"]
-#[ts(export)]
-pub struct DependencyConfigErrors(pub BTreeMap<PackageId, String>);
-impl Map for DependencyConfigErrors {
-    type Key = PackageId;
-    type Value = String;
-    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
-        Ok(key)
-    }
-    fn key_string(key: &Self::Key) -> Result<imbl_value::InternedString, Error> {
-        Ok(key.clone().into())
-    }
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TS)]
diff --git a/core/startos/src/util/actor.rs b/core/startos/src/util/actor.rs
index 8e08a1d53..caa83d8b1 100644
--- a/core/startos/src/util/actor.rs
+++ b/core/startos/src/util/actor.rs
@@ -16,10 +16,13 @@ pub trait Actor: Send + 'static {
     fn init(&mut self, jobs: &mut BackgroundJobs) {}
 }
 
-#[async_trait::async_trait]
 pub trait Handler<M>: Actor {
     type Response: Any + Send;
-    async fn handle(&mut self, msg: M, jobs: &mut BackgroundJobs) -> Self::Response;
+    fn handle(
+        &mut self,
+        msg: M,
+        jobs: &mut BackgroundJobs,
+    ) -> impl Future<Output = Self::Response> + Send;
 }
 
 #[async_trait::async_trait]
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index c801d56cd..b921a40af 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -110,7 +110,7 @@ export type VersionString = string
  */
 export type DependencyConfig = {
   /** During autoconfigure, we have access to effects and local data. We are going to figure out all the data that we need and send it to update. For the sdk it is the desired delta */
-  query(options: { effects: Effects; localConfig: unknown }): Promise<unknown>
+  query(options: { effects: Effects }): Promise<unknown>
   /** This is the second part. Given the query results off the previous function, we will determine what to change the remote config to. In our sdk normall we are going to use the previous as a deep merge. */
   update(options: {
     queryResults: unknown
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index f06980f20..7933109b3 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1410,7 +1410,6 @@ export module Mock {
         started: new Date().toISOString(),
         health: {},
       },
-      dependencyConfigErrors: {},
     },
     actions: {}, // @TODO need mocks
     serviceInterfaces: {
@@ -1650,7 +1649,6 @@ export module Mock {
       main: {
         status: 'stopped',
       },
-      dependencyConfigErrors: {},
     },
     actions: {},
     serviceInterfaces: {
@@ -1770,6 +1768,7 @@ export module Mock {
         registryUrl: '',
         versionSpec: '>=26.0.0',
         healthChecks: [],
+        configSatisfied: true,
       },
     },
     hosts: {},
@@ -1790,9 +1789,6 @@ export module Mock {
       main: {
         status: 'stopped',
       },
-      dependencyConfigErrors: {
-        'btc-rpc-proxy': 'Username not found',
-      },
     },
     actions: {},
     serviceInterfaces: {
@@ -2015,6 +2011,7 @@ export module Mock {
         registryUrl: 'https://registry.start9.com',
         versionSpec: '>=26.0.0',
         healthChecks: [],
+        configSatisfied: true,
       },
       'btc-rpc-proxy': {
         title: Mock.MockManifestBitcoinProxy.title,
@@ -2022,6 +2019,7 @@ export module Mock {
         kind: 'exists',
         registryUrl: 'https://community-registry.start9.com',
         versionSpec: '>2.0.0', // @TODO
+        configSatisfied: false,
       },
     },
     hosts: {},
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 00c200440..8a3f714d1 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -125,7 +125,6 @@ export const mockPatchData: DataModel = {
             },
           },
         },
-        dependencyConfigErrors: {},
       },
       actions: {}, // @TODO
       serviceInterfaces: {
@@ -367,9 +366,6 @@ export const mockPatchData: DataModel = {
         main: {
           status: 'stopped',
         },
-        dependencyConfigErrors: {
-          'btc-rpc-proxy': 'This is a config unsatisfied error',
-        },
       },
       actions: {},
       serviceInterfaces: {
@@ -590,6 +586,7 @@ export const mockPatchData: DataModel = {
           registryUrl: 'https://registry.start9.com',
           versionSpec: '>=26.0.0',
           healthChecks: [],
+          configSatisfied: true,
         },
         'btc-rpc-proxy': {
           title: 'Bitcoin Proxy',
@@ -598,6 +595,7 @@ export const mockPatchData: DataModel = {
           registryUrl: 'https://community-registry.start9.com',
           versionSpec: '>2.0.0',
           healthChecks: [],
+          configSatisfied: false,
         },
       },
       hosts: {},
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index 987499a5d..5abee0d6b 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -83,20 +83,20 @@ export class DepErrorService {
       }
     }
 
-    const versionSpec = pkg.currentDependencies[depId].versionSpec
+    const currentDep = pkg.currentDependencies[depId]
     const depManifest = dep.stateInfo.manifest
 
     // incorrect version
-    if (!this.emver.satisfies(depManifest.version, versionSpec)) {
+    if (!this.emver.satisfies(depManifest.version, currentDep.versionSpec)) {
       return {
         type: 'incorrectVersion',
-        expected: versionSpec,
+        expected: currentDep.versionSpec,
         received: depManifest.version,
       }
     }
 
     // invalid config
-    if (Object.values(pkg.status.dependencyConfigErrors).some(err => !!err)) {
+    if (!currentDep.configSatisfied) {
       return {
         type: 'configUnsatisfied',
       }
@@ -111,8 +111,6 @@ export class DepErrorService {
       }
     }
 
-    const currentDep = pkg.currentDependencies[depId]
-
     // health check failure
     if (depStatus === 'running' && currentDep.kind === 'running') {
       for (let id of currentDep.healthChecks) {

From 6bc8027644dd5a0bd99952a9e2bd21c854333d0b Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Thu, 4 Apr 2024 09:09:59 -0600
Subject: [PATCH 129/341] Feat/implement rest of poly effects (#2587)

* feat: Add the implementation of the rest of the polyfillEffects

* chore: Add in the rsync

* chore: Add in the changes needed to indicate that the service does not need config

* fix: Vaultwarden sets, starts, stops, uninstalls

* chore: Update the polyFilleffect and add two more

* Update MainLoop.ts

* chore: Add in the set config of the deps on the config set
---
 .../Systems/SystemForEmbassy/MainLoop.ts      |  14 +-
 .../Systems/SystemForEmbassy/index.ts         | 129 ++++++++++---
 .../SystemForEmbassy/oldEmbassyTypes.ts       |  10 --
 .../SystemForEmbassy/polyfillEffects.ts       | 169 +++++++++++++++---
 container-runtime/update-image.sh             |   2 +-
 core/startos/src/service/config.rs            |  19 +-
 core/startos/src/service/mod.rs               |   3 +
 sdk/lib/types.ts                              |   7 +-
 8 files changed, 272 insertions(+), 81 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 17fd13468..f2bcc5eba 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -48,19 +48,7 @@ export class MainLoop {
       this.system.manifest.volumes,
     )
     if (jsMain) {
-      const daemons = Daemons.of({
-        effects,
-        started: async (_) => {},
-        healthReceipts: [],
-      })
-      throw new Error("todo")
-      // return {
-      //   daemon,
-      //   wait: daemon.wait().finally(() => {
-      //     this.clean()
-      //     effects.setMainStatus({ status: "stopped" })
-      //   }),
-      // }
+      throw new Error("Unreachable")
     }
     const daemon = await daemons.runDaemon()(
       this.effects,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index ade166eff..a41047ace 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -25,6 +25,7 @@ import {
   anyOf,
   deferred,
   Parser,
+  array,
 } from "ts-matches"
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
@@ -41,6 +42,48 @@ const MANIFEST_LOCATION = "/usr/lib/startos/package/embassyManifest.json"
 const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
 const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig"
 
+const matchSetResult = object(
+  {
+    "depends-on": dictionary([string, array(string)]),
+    dependsOn: dictionary([string, array(string)]),
+    signal: literals(
+      "SIGTERM",
+      "SIGHUP",
+      "SIGINT",
+      "SIGQUIT",
+      "SIGILL",
+      "SIGTRAP",
+      "SIGABRT",
+      "SIGBUS",
+      "SIGFPE",
+      "SIGKILL",
+      "SIGUSR1",
+      "SIGSEGV",
+      "SIGUSR2",
+      "SIGPIPE",
+      "SIGALRM",
+      "SIGSTKFLT",
+      "SIGCHLD",
+      "SIGCONT",
+      "SIGSTOP",
+      "SIGTSTP",
+      "SIGTTIN",
+      "SIGTTOU",
+      "SIGURG",
+      "SIGXCPU",
+      "SIGXFSZ",
+      "SIGVTALRM",
+      "SIGPROF",
+      "SIGWINCH",
+      "SIGIO",
+      "SIGPWR",
+      "SIGSYS",
+      "SIGINFO",
+    ),
+  },
+  ["depends-on", "dependsOn"],
+)
+
 export type PackagePropertiesV2 = {
   [name: string]: PackagePropertyObject | PackagePropertyString
 }
@@ -120,6 +163,7 @@ const matchProperties = object({
   data: matchPackageProperties,
 })
 
+const DEFAULT_REGISTRY = "https://registry.start9.com"
 export class SystemForEmbassy implements System {
   currentRunning: MainLoop | undefined
   static async of(manifestLocation: string = MANIFEST_LOCATION) {
@@ -383,7 +427,7 @@ export class SystemForEmbassy implements System {
   private async setConfig(
     effects: HostSystemStartOs,
     newConfigWithoutPointers: unknown,
-  ): Promise<T.SetResult> {
+  ): Promise<void> {
     const newConfig = structuredClone(newConfigWithoutPointers)
     await updateConfig(
       effects,
@@ -391,45 +435,76 @@ export class SystemForEmbassy implements System {
       newConfig,
     )
     const setConfigValue = this.manifest.config?.set
-    if (!setConfigValue) return { signal: "SIGTERM", "depends-on": {} }
+    if (!setConfigValue) return
     if (setConfigValue.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
         setConfigValue,
         this.manifest.volumes,
       )
-      return JSON.parse(
-        (
-          await container.exec([
-            setConfigValue.entrypoint,
-            ...setConfigValue.args,
-            JSON.stringify(newConfig),
-          ])
-        ).stdout.toString(),
+      const answer = matchSetResult.unsafeCast(
+        JSON.parse(
+          (
+            await container.exec([
+              setConfigValue.entrypoint,
+              ...setConfigValue.args,
+              JSON.stringify(newConfig),
+            ])
+          ).stdout.toString(),
+        ),
       )
+      const dependsOn = answer["depends-on"] ?? answer.dependsOn ?? {}
+      await this.setConfigSetConfig(effects, dependsOn)
+      return
     } else if (setConfigValue.type === "script") {
       const moduleCode = await this.moduleCode
       const method = moduleCode.setConfig
       if (!method) throw new Error("Expecting that the method setConfig exists")
-      return await method(
-        new PolyfillEffects(effects, this.manifest),
-        newConfig as U.Config,
-      ).then((x): T.SetResult => {
-        if ("result" in x)
-          return {
-            "depends-on": x.result["depends-on"],
-            signal: x.result.signal === "SIGEMT" ? "SIGTERM" : x.result.signal,
-          }
-        if ("error" in x) throw new Error("Error getting config: " + x.error)
-        throw new Error("Error getting config: " + x["error-code"][1])
-      })
-    } else {
-      return {
-        "depends-on": {},
-        signal: "SIGTERM",
-      }
+
+      const answer = matchSetResult.unsafeCast(
+        await method(
+          new PolyfillEffects(effects, this.manifest),
+          newConfig as U.Config,
+        ).then((x): T.SetResult => {
+          if ("result" in x)
+            return {
+              dependsOn: x.result["depends-on"],
+              signal:
+                x.result.signal === "SIGEMT" ? "SIGTERM" : x.result.signal,
+            }
+          if ("error" in x) throw new Error("Error getting config: " + x.error)
+          throw new Error("Error getting config: " + x["error-code"][1])
+        }),
+      )
+      const dependsOn = answer["depends-on"] ?? answer.dependsOn ?? {}
+      await this.setConfigSetConfig(effects, dependsOn)
+      return
     }
   }
+  private async setConfigSetConfig(
+    effects: HostSystemStartOs,
+    dependsOn: { [x: string]: readonly string[] },
+  ) {
+    await effects.setDependencies({
+      dependencies: Object.entries(dependsOn).flatMap(([key, value]) => {
+        const dependency = this.manifest.dependencies?.[key]
+        if (!dependency) return []
+        const versionSpec = dependency.version
+        const registryUrl = DEFAULT_REGISTRY
+        const kind = "running"
+        return [
+          {
+            id: key,
+            versionSpec,
+            registryUrl,
+            kind,
+            healthChecks: [...value],
+          },
+        ]
+      }),
+    })
+  }
+
   private async migration(
     effects: HostSystemStartOs,
     fromVersion: string,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
index 072a1171c..35b95e095 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
@@ -100,16 +100,6 @@ export type Effects = {
   is_sandboxed(): boolean
 
   exists(input: { volumeId: string; path: string }): Promise<boolean>
-  bindLocal(options: {
-    internalPort: number
-    name: string
-    externalPort: number
-  }): Promise<string>
-  bindTor(options: {
-    internalPort: number
-    name: string
-    externalPort: number
-  }): Promise<string>
 
   fetch(
     url: string,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 4c176b2f7..ab6cb1c64 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -3,12 +3,11 @@ import * as oet from "./oldEmbassyTypes"
 import { Volume } from "../../../Models/Volume"
 import * as child_process from "child_process"
 import { promisify } from "util"
-import { Daemons, startSdk, T } from "@start9labs/start-sdk"
+import { daemons, startSdk, T } from "@start9labs/start-sdk"
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import "isomorphic-fetch"
 import { Manifest } from "./matchManifest"
-
-const execFile = promisify(child_process.execFile)
+import { DockerProcedureContainer } from "./DockerProcedureContainer"
 
 export class PolyfillEffects implements oet.Effects {
   constructor(
@@ -111,17 +110,100 @@ export class PolyfillEffects implements oet.Effects {
     wait(): Promise<oet.ResultType<string>>
     term(): Promise<void>
   } {
-    throw new Error("Method not implemented.")
+    const dockerProcedureContainer = DockerProcedureContainer.of(
+      this.effects,
+      this.manifest.main,
+      this.manifest.volumes,
+    )
+    const daemon = dockerProcedureContainer.then((dockerProcedureContainer) =>
+      daemons.runDaemon()(
+        this.effects,
+        this.manifest.main.image,
+        [input.command, ...(input.args || [])],
+        {
+          overlay: dockerProcedureContainer.overlay,
+        },
+      ),
+    )
+    return {
+      wait: () =>
+        daemon.then((daemon) =>
+          daemon.wait().then(() => {
+            return { result: "" }
+          }),
+        ),
+      term: () => daemon.then((daemon) => daemon.term()),
+    }
   }
-  chown(input: { volumeId: string; path: string; uid: string }): Promise<null> {
-    throw new Error("Method not implemented.")
+  async chown(input: {
+    volumeId: string
+    path: string
+    uid: string
+  }): Promise<null> {
+    await startSdk
+      .runCommand(
+        this.effects,
+        this.manifest.main.image,
+        ["chown", "--recursive", input.uid, `/drive/${input.path}`],
+        {
+          mounts: [
+            {
+              path: "/drive",
+              options: {
+                type: "volume",
+                id: input.volumeId,
+                subpath: null,
+                readonly: false,
+              },
+            },
+          ],
+        },
+      )
+      .then((x: any) => ({
+        stderr: x.stderr.toString(),
+        stdout: x.stdout.toString(),
+      }))
+      .then((x) => {
+        if (!!x.stderr) {
+          throw new Error(x.stderr)
+        }
+      })
+    return null
   }
-  chmod(input: {
+  async chmod(input: {
     volumeId: string
     path: string
     mode: string
   }): Promise<null> {
-    throw new Error("Method not implemented.")
+    await startSdk
+      .runCommand(
+        this.effects,
+        this.manifest.main.image,
+        ["chmod", "--recursive", input.mode, `/drive/${input.path}`],
+        {
+          mounts: [
+            {
+              path: "/drive",
+              options: {
+                type: "volume",
+                id: input.volumeId,
+                subpath: null,
+                readonly: false,
+              },
+            },
+          ],
+        },
+      )
+      .then((x: any) => ({
+        stderr: x.stderr.toString(),
+        stdout: x.stdout.toString(),
+      }))
+      .then((x) => {
+        if (!!x.stderr) {
+          throw new Error(x.stderr)
+        }
+      })
+    return null
   }
   sleep(timeMs: number): Promise<null> {
     return new Promise((resolve) => setTimeout(resolve, timeMs))
@@ -149,20 +231,6 @@ export class PolyfillEffects implements oet.Effects {
       .then(() => true)
       .catch(() => false)
   }
-  bindLocal(options: {
-    internalPort: number
-    name: string
-    externalPort: number
-  }): Promise<string> {
-    throw new Error("Method not implemented.")
-  }
-  bindTor(options: {
-    internalPort: number
-    name: string
-    externalPort: number
-  }): Promise<string> {
-    throw new Error("Method not implemented.")
-  }
   async fetch(
     url: string,
     options?:
@@ -199,7 +267,7 @@ export class PolyfillEffects implements oet.Effects {
       json: () => fetched.json(),
     }
   }
-  runRsync(options: {
+  runRsync(rsyncOptions: {
     srcVolume: string
     dstVolume: string
     srcPath: string
@@ -210,6 +278,59 @@ export class PolyfillEffects implements oet.Effects {
     wait: () => Promise<null>
     progress: () => Promise<number>
   } {
-    throw new Error("Method not implemented.")
+    const { srcVolume, dstVolume, srcPath, dstPath, options } = rsyncOptions
+    const command = "rsync"
+    const args: string[] = []
+    if (options.delete) {
+      args.push("--delete")
+    }
+    if (options.force) {
+      args.push("--force")
+    }
+    if (options.ignoreExisting) {
+      args.push("--ignore-existing")
+    }
+    for (const exclude of options.exclude) {
+      args.push(`--exclude=${exclude}`)
+    }
+    args.push("-actAXH")
+    args.push("--info=progress2")
+    args.push("--no-inc-recursive")
+    args.push(new Volume(srcVolume, srcPath).path)
+    args.push(new Volume(dstVolume, dstPath).path)
+    const spawned = child_process.spawn(command, args, { detached: true })
+    let percentage = 0.0
+    spawned.stdout.on("data", (data: unknown) => {
+      const lines = String(data).replace("\r", "\n").split("\n")
+      for (const line of lines) {
+        const parsed = /$([0-9.]+)%/.exec(line)?.[1]
+        if (!parsed) continue
+        percentage = Number.parseFloat(parsed)
+      }
+    })
+
+    spawned.stderr.on("data", (data: unknown) => {
+      console.error(String(data))
+    })
+
+    const id = async () => {
+      const pid = spawned.pid
+      if (pid === undefined) {
+        throw new Error("rsync process has no pid")
+      }
+      return String(pid)
+    }
+    const waitPromise = new Promise<null>((resolve, reject) => {
+      spawned.on("exit", (code) => {
+        if (code === 0) {
+          resolve(null)
+        } else {
+          reject(new Error(`rsync exited with code ${code}`))
+        }
+      })
+    })
+    const wait = () => waitPromise
+    const progress = () => Promise.resolve(percentage)
+    return { id, wait, progress }
   }
 }
diff --git a/container-runtime/update-image.sh b/container-runtime/update-image.sh
index e0d5dc0c3..bef525b3b 100755
--- a/container-runtime/update-image.sh
+++ b/container-runtime/update-image.sh
@@ -19,7 +19,7 @@ if [ "$ARCH" != "$(uname -m)" ]; then
 fi
 
 echo "nameserver 8.8.8.8" | sudo tee tmp/combined/etc/resolv.conf # TODO - delegate to host resolver?
-sudo chroot tmp/combined $QEMU /sbin/apk add nodejs
+sudo chroot tmp/combined $QEMU /sbin/apk add nodejs rsync
 sudo mkdir -p tmp/combined/usr/lib/startos/
 sudo rsync -a --copy-unsafe-links dist/ tmp/combined/usr/lib/startos/init/
 sudo cp containerRuntime.rc tmp/combined/etc/init.d/containerRuntime
diff --git a/core/startos/src/service/config.rs b/core/startos/src/service/config.rs
index df3e5b046..754e3e0ba 100644
--- a/core/startos/src/service/config.rs
+++ b/core/startos/src/service/config.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use models::ProcedureName;
 
 use crate::config::action::ConfigRes;
-use crate::config::ConfigureContext;
+use crate::config::{action::SetResult, ConfigureContext};
 use crate::prelude::*;
 use crate::service::{Service, ServiceActor};
 use crate::util::actor::{BackgroundJobs, Handler};
@@ -18,10 +18,25 @@ impl Handler<Configure> for ServiceActor {
         _: &mut BackgroundJobs,
     ) -> Self::Response {
         let container = &self.0.persistent_container;
+        let package_id = &self.0.id;
+
         container
             .execute::<NoOutput>(ProcedureName::SetConfig, to_value(&config)?, timeout)
             .await
             .with_kind(ErrorKind::ConfigRulesViolation)?;
+        self.0
+            .ctx
+            .db
+            .mutate(move |db| {
+                db.as_public_mut()
+                    .as_package_data_mut()
+                    .as_idx_mut(package_id)
+                    .or_not_found(package_id)?
+                    .as_status_mut()
+                    .as_configured_mut()
+                    .ser(&true)
+            })
+            .await?;
         Ok(())
     }
 }
@@ -38,7 +53,7 @@ impl Handler<GetConfig> for ServiceActor {
                 Some(Duration::from_secs(30)), // TODO timeout
             )
             .await
-            .with_kind(ErrorKind::ConfigGen)
+            .with_kind(ErrorKind::ConfigRulesViolation)
     }
 }
 
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 2b430dc73..c6e64be63 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -281,6 +281,9 @@ impl Service {
                     .as_package_data_mut()
                     .as_idx_mut(&manifest.id)
                     .or_not_found(&manifest.id)?;
+                if !manifest.has_config {
+                    entry.as_status_mut().as_configured_mut().ser(&true)?;
+                }
                 entry
                     .as_state_info_mut()
                     .ser(&PackageState::Installed(InstalledState { manifest }))?;
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index b921a40af..f266d2870 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -560,9 +560,8 @@ export type ActionResult = {
   }
 }
 export type SetResult = {
-  /** These are the unix process signals */
+  dependsOn: DependsOn
   signal: Signals
-  "depends-on": DependsOn
 }
 
 export type PackageId = string
@@ -570,13 +569,13 @@ export type Message = string
 export type DependencyKind = "running" | "exists"
 
 export type DependsOn = {
-  [packageId: string]: string[]
+  [packageId: string]: string[] | readonly string[]
 }
 
 export type KnownError =
   | { error: string }
   | {
-      "error-code": [number, string] | readonly [number, string]
+      errorCode: [number, string] | readonly [number, string]
     }
 
 export type Dependency = {

From 056cab23e05205cb53dcde40f71ed7fabd556063 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Thu, 4 Apr 2024 13:17:11 -0600
Subject: [PATCH 130/341] Fix: Configure was borken (#2589)

---
 container-runtime/src/Adapters/HostSystemStartOs.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index 5e52224fa..e7db00e07 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -250,9 +250,9 @@ export class HostSystemStartOs implements Effects {
     >
   }
   setDependencies(
-    ...[dependencies]: Parameters<T.Effects["setDependencies"]>
+    dependencies: Parameters<T.Effects["setDependencies"]>[0],
   ): ReturnType<T.Effects["setDependencies"]> {
-    return this.rpcRound("setDependencies", { dependencies }) as ReturnType<
+    return this.rpcRound("setDependencies", dependencies) as ReturnType<
       T.Effects["setDependencies"]
     >
   }

From 75ff541aec0c5fb516f2ade5495d1906d4858d93 Mon Sep 17 00:00:00 2001
From: Dominion5254 <125493428+Dominion5254@users.noreply.github.com>
Date: Fri, 5 Apr 2024 13:20:49 -0600
Subject: [PATCH 131/341] complete get_service_port_forward fn (#2579)

* complete get_service_port_forward fn

* refactor get_service_port_forward and get_container_ip

* remove unused function

* move host_id to GetServicePortForwardParams

* replace match with deref

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* refactor get_container_ip to use deref

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
---
 core/startos/src/net/net_controller.rs        | 17 +++++++++++++-
 .../src/service/service_effect_handler.rs     | 22 +++++++++----------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index a4c9ea507..97f38567d 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -7,6 +7,7 @@ use imbl::OrdMap;
 use lazy_format::lazy_format;
 use models::{HostId, OptionExt, PackageId};
 use patch_db::PatchDb;
+use tokio::sync::Mutex;
 use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
 
@@ -387,7 +388,21 @@ impl NetService {
     }
 
     pub fn get_ip(&self) -> Ipv4Addr {
-        self.ip.to_owned()
+        self.ip
+    }
+
+    pub fn get_ext_port(&self, host_id: HostId, internal_port: u16) -> Result<u16, Error> {
+        let host_id_binds = self.binds.get_key_value(&host_id);
+        match host_id_binds {
+            Some((id, binds)) => {
+                if let Some(ext_port_info) = binds.lan.get(&internal_port) {
+                    Ok(ext_port_info.0)
+                } else {
+                    Err(Error::new(eyre!("Internal Port {} not found in NetService binds", internal_port), crate::ErrorKind::NotFound))
+                }
+            },
+            None => Err(Error::new(eyre!("HostID {} not found in NetService binds", host_id), crate::ErrorKind::NotFound))
+        }
     }
 }
 
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 210c3d07c..b0b11b34b 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -186,6 +186,7 @@ struct GetServicePortForwardParams {
     #[ts(type = "string | null")]
     package_id: Option<PackageId>,
     internal_port: u32,
+    host_id: HostId,
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
@@ -314,22 +315,19 @@ async fn get_system_smtp(
     todo!()
 }
 async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Ipv4Addr, Error> {
-    match context.0.upgrade() {
-        Some(c) => {
-            let net_service = c.persistent_container.net_service.lock().await;
-            Ok(net_service.get_ip())
-        }
-        None => Err(Error::new(
-            eyre!("Upgrade on Weak<ServiceActorSeed> resulted in a None variant"),
-            crate::ErrorKind::NotFound,
-        )),
-    }
+    let context = context.deref()?;
+    let net_service = context.persistent_container.net_service.lock().await;
+    Ok(net_service.get_ip())
 }
 async fn get_service_port_forward(
     context: EffectContext,
     data: GetServicePortForwardParams,
-) -> Result<Value, Error> {
-    todo!()
+) -> Result<u16, Error> {
+    let internal_port = data.internal_port as u16;
+    
+    let context = context.deref()?;
+    let net_service = context.persistent_container.net_service.lock().await;
+    net_service.get_ext_port(data.host_id, internal_port)
 }
 async fn clear_network_interfaces(context: EffectContext, _: Empty) -> Result<Value, Error> {
     todo!()

From e41f8f1d0f7f79d1d5c84c083e4c830704a44caa Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 8 Apr 2024 11:53:35 -0600
Subject: [PATCH 132/341] allow concurrency in service actor (#2592)

---
 core/Cargo.lock                               |   4 +-
 core/startos/Cargo.toml                       |   2 +-
 core/startos/src/s9pk/v2/compat.rs            |   5 +-
 core/startos/src/s9pk/v2/manifest.rs          |   8 +-
 core/startos/src/service/action.rs            |  14 +-
 core/startos/src/service/config.rs            |  20 +-
 core/startos/src/service/control.rs           |  21 +-
 core/startos/src/service/dependencies.rs      |  10 +-
 core/startos/src/service/mod.rs               |  12 +-
 .../src/service/service_effect_handler.rs     |  37 +++-
 core/startos/src/service/transition/mod.rs    |   4 +-
 .../startos/src/service/transition/restart.rs |  16 +-
 core/startos/src/util/actor/background.rs     |  60 +++++
 core/startos/src/util/actor/concurrent.rs     | 208 ++++++++++++++++++
 core/startos/src/util/actor/mod.rs            | 148 +++++++++++++
 .../src/util/{actor.rs => actor/simple.rs}    |  95 +-------
 16 files changed, 535 insertions(+), 129 deletions(-)
 create mode 100644 core/startos/src/util/actor/background.rs
 create mode 100644 core/startos/src/util/actor/concurrent.rs
 create mode 100644 core/startos/src/util/actor/mod.rs
 rename core/startos/src/util/{actor.rs => actor/simple.rs} (60%)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 7eaac03bd..455272344 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -4968,9 +4968,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index d9d4a4e36..cded2ab41 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -160,7 +160,7 @@ ssh-key = { version = "0.6.2", features = ["ed25519"] }
 stderrlog = "0.5.4"
 tar = "0.4.40"
 thiserror = "1.0.49"
-tokio = { version = "1", features = ["full"] }
+tokio = { version = "1.37", features = ["full"] }
 tokio-rustls = "0.25.0"
 tokio-socks = "0.5.1"
 tokio-stream = { version = "0.1.14", features = ["io-util", "sync", "net"] }
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 5a98538dc..b4c2e1c14 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeSet;
 use std::io::Cursor;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -154,7 +155,7 @@ impl S9pk<Section<MultiCursorFile>> {
             i.strip_prefix(&format!("start9/{}/", manifest.id))
                 .map(|s| s.to_owned())
         }) {
-            new_manifest.images.push(image.parse()?);
+            new_manifest.images.insert(image.parse()?);
             let sqfs_path = images_dir.join(&image).with_extension("squashfs");
             let image_name = format!("start9/{}/{}:{}", manifest.id, image, manifest.version);
             let id = String::from_utf8(
@@ -334,7 +335,7 @@ impl From<ManifestV1> for Manifest {
             marketing_site: value.marketing_site.unwrap_or_else(|| default_url.clone()),
             donation_url: value.donation_url,
             description: value.description,
-            images: Vec::new(),
+            images: BTreeSet::new(),
             assets: value
                 .volumes
                 .iter()
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index ea4524400..ee2358b13 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 
 use color_eyre::eyre::eyre;
 use helpers::const_true;
@@ -43,9 +43,9 @@ pub struct Manifest {
     #[ts(type = "string | null")]
     pub donation_url: Option<Url>,
     pub description: Description,
-    pub images: Vec<ImageId>,
-    pub assets: Vec<VolumeId>, // TODO: AssetsId
-    pub volumes: Vec<VolumeId>,
+    pub images: BTreeSet<ImageId>,
+    pub assets: BTreeSet<VolumeId>, // TODO: AssetsId
+    pub volumes: BTreeSet<VolumeId>,
     #[serde(default)]
     pub alerts: Alerts,
     #[serde(default)]
diff --git a/core/startos/src/service/action.rs b/core/startos/src/service/action.rs
index a33869222..5f97685ae 100644
--- a/core/startos/src/service/action.rs
+++ b/core/startos/src/service/action.rs
@@ -4,19 +4,27 @@ use models::{ActionId, ProcedureName};
 
 use crate::action::ActionResult;
 use crate::prelude::*;
+use crate::service::config::GetConfig;
+use crate::service::dependencies::DependencyConfig;
 use crate::service::{Service, ServiceActor};
-use crate::util::actor::{BackgroundJobs, Handler};
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::{ConflictBuilder, Handler};
 
-struct Action {
+pub(super) struct Action {
     id: ActionId,
     input: Value,
 }
 impl Handler<Action> for ServiceActor {
     type Response = Result<ActionResult, Error>;
+    fn conflicts_with(_: &Action) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything()
+            .except::<GetConfig>()
+            .except::<DependencyConfig>()
+    }
     async fn handle(
         &mut self,
         Action { id, input }: Action,
-        _: &mut BackgroundJobs,
+        _: &BackgroundJobQueue,
     ) -> Self::Response {
         let container = &self.0.persistent_container;
         container
diff --git a/core/startos/src/service/config.rs b/core/startos/src/service/config.rs
index 754e3e0ba..0f166eedb 100644
--- a/core/startos/src/service/config.rs
+++ b/core/startos/src/service/config.rs
@@ -3,19 +3,24 @@ use std::time::Duration;
 use models::ProcedureName;
 
 use crate::config::action::ConfigRes;
-use crate::config::{action::SetResult, ConfigureContext};
+use crate::config::ConfigureContext;
 use crate::prelude::*;
+use crate::service::dependencies::DependencyConfig;
 use crate::service::{Service, ServiceActor};
-use crate::util::actor::{BackgroundJobs, Handler};
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::{ConflictBuilder, Handler};
 use crate::util::serde::NoOutput;
 
-struct Configure(ConfigureContext);
+pub(super) struct Configure(ConfigureContext);
 impl Handler<Configure> for ServiceActor {
     type Response = Result<(), Error>;
+    fn conflicts_with(_: &Configure) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything().except::<DependencyConfig>()
+    }
     async fn handle(
         &mut self,
         Configure(ConfigureContext { timeout, config }): Configure,
-        _: &mut BackgroundJobs,
+        _: &BackgroundJobQueue,
     ) -> Self::Response {
         let container = &self.0.persistent_container;
         let package_id = &self.0.id;
@@ -41,10 +46,13 @@ impl Handler<Configure> for ServiceActor {
     }
 }
 
-struct GetConfig;
+pub(super) struct GetConfig;
 impl Handler<GetConfig> for ServiceActor {
     type Response = Result<ConfigRes, Error>;
-    async fn handle(&mut self, _: GetConfig, _: &mut BackgroundJobs) -> Self::Response {
+    fn conflicts_with(_: &GetConfig) -> ConflictBuilder<Self> {
+        ConflictBuilder::nothing().except::<Configure>()
+    }
+    async fn handle(&mut self, _: GetConfig, _: &BackgroundJobQueue) -> Self::Response {
         let container = &self.0.persistent_container;
         container
             .execute::<ConfigRes>(
diff --git a/core/startos/src/service/control.rs b/core/startos/src/service/control.rs
index 5ef0bbff2..0443b80b1 100644
--- a/core/startos/src/service/control.rs
+++ b/core/startos/src/service/control.rs
@@ -1,13 +1,21 @@
 use crate::prelude::*;
+use crate::service::config::GetConfig;
+use crate::service::dependencies::DependencyConfig;
 use crate::service::start_stop::StartStop;
 use crate::service::transition::TransitionKind;
 use crate::service::{Service, ServiceActor};
-use crate::util::actor::{BackgroundJobs, Handler};
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::{ConflictBuilder, Handler};
 
-struct Start;
+pub(super) struct Start;
 impl Handler<Start> for ServiceActor {
     type Response = ();
-    async fn handle(&mut self, _: Start, _: &mut BackgroundJobs) -> Self::Response {
+    fn conflicts_with(_: &Start) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything()
+            .except::<GetConfig>()
+            .except::<DependencyConfig>()
+    }
+    async fn handle(&mut self, _: Start, _: &BackgroundJobQueue) -> Self::Response {
         self.0.persistent_container.state.send_modify(|x| {
             x.desired_state = StartStop::Start;
         });
@@ -23,7 +31,12 @@ impl Service {
 struct Stop;
 impl Handler<Stop> for ServiceActor {
     type Response = ();
-    async fn handle(&mut self, _: Stop, _: &mut BackgroundJobs) -> Self::Response {
+    fn conflicts_with(_: &Stop) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything()
+            .except::<GetConfig>()
+            .except::<DependencyConfig>()
+    }
+    async fn handle(&mut self, _: Stop, _: &BackgroundJobQueue) -> Self::Response {
         let mut transition_state = None;
         self.0.persistent_container.state.send_modify(|x| {
             x.desired_state = StartStop::Stop;
diff --git a/core/startos/src/service/dependencies.rs b/core/startos/src/service/dependencies.rs
index 67cc5d53f..e71b62917 100644
--- a/core/startos/src/service/dependencies.rs
+++ b/core/startos/src/service/dependencies.rs
@@ -5,22 +5,26 @@ use models::{PackageId, ProcedureName};
 
 use crate::prelude::*;
 use crate::service::{Service, ServiceActor};
-use crate::util::actor::{BackgroundJobs, Handler};
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::{ConflictBuilder, Handler};
 use crate::Config;
 
-struct DependencyConfig {
+pub(super) struct DependencyConfig {
     dependency_id: PackageId,
     remote_config: Option<Config>,
 }
 impl Handler<DependencyConfig> for ServiceActor {
     type Response = Result<Option<Config>, Error>;
+    fn conflicts_with(_: &DependencyConfig) -> ConflictBuilder<Self> {
+        ConflictBuilder::nothing()
+    }
     async fn handle(
         &mut self,
         DependencyConfig {
             dependency_id,
             remote_config,
         }: DependencyConfig,
-        _: &mut BackgroundJobs,
+        _: &BackgroundJobQueue,
     ) -> Self::Response {
         let container = &self.0.persistent_container;
         container
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index c6e64be63..38923d726 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -13,7 +13,6 @@ use start_stop::StartStop;
 use tokio::sync::Notify;
 use ts_rs::TS;
 
-use crate::config::action::ConfigRes;
 use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::RequestGuid;
 use crate::db::model::package::{
@@ -28,7 +27,9 @@ use crate::service::service_map::InstallProgressHandles;
 use crate::service::transition::TransitionKind;
 use crate::status::health_check::HealthCheckResult;
 use crate::status::MainStatus;
-use crate::util::actor::{Actor, BackgroundJobs, SimpleActor};
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::concurrent::ConcurrentActor;
+use crate::util::actor::Actor;
 use crate::util::serde::Pem;
 use crate::volume::data_dir;
 
@@ -66,7 +67,7 @@ pub enum LoadDisposition {
 }
 
 pub struct Service {
-    actor: SimpleActor<ServiceActor>,
+    actor: ConcurrentActor<ServiceActor>,
     seed: Arc<ServiceActorSeed>,
 }
 impl Service {
@@ -90,7 +91,7 @@ impl Service {
             .init(Arc::downgrade(&seed))
             .await?;
         Ok(Self {
-            actor: SimpleActor::new(ServiceActor(seed.clone())),
+            actor: ConcurrentActor::new(ServiceActor(seed.clone())),
             seed,
         })
     }
@@ -391,10 +392,11 @@ impl ServiceActorSeed {
         });
     }
 }
+#[derive(Clone)]
 struct ServiceActor(Arc<ServiceActorSeed>);
 
 impl Actor for ServiceActor {
-    fn init(&mut self, jobs: &mut BackgroundJobs) {
+    fn init(&mut self, jobs: &BackgroundJobQueue) {
         let seed = self.0.clone();
         jobs.add_job(async move {
             let id = seed.id.clone();
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index b0b11b34b..0effccd5e 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -11,7 +11,7 @@ use clap::Parser;
 use emver::VersionRange;
 use imbl::OrdMap;
 use imbl_value::{json, InternedString};
-use models::{ActionId, HealthCheckId, HostId, ImageId, PackageId, VolumeId};
+use models::{ActionId, DataUrl, HealthCheckId, HostId, ImageId, PackageId, VolumeId};
 use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -28,7 +28,9 @@ use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::net::host::binding::BindOptions;
 use crate::net::host::HostKind;
 use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::http::{HttpReader, HttpSource};
 use crate::s9pk::rpc::SKIP_ENV;
+use crate::s9pk::S9pk;
 use crate::service::cli::ContainerCliContext;
 use crate::service::ServiceActorSeed;
 use crate::status::health_check::HealthCheckResult;
@@ -1145,11 +1147,36 @@ async fn set_dependencies(
                 version_spec,
             ),
         };
-        let icon = todo!();
-        let title = todo!();
+        let (icon, title) = match async {
+            let remote_s9pk = S9pk::deserialize(
+                &HttpSource::new(
+                    ctx.ctx.client.clone(),
+                    registry_url
+                        .join(&format!("package/v2/{}.s9pk?spec={}", dep_id, version_spec))?,
+                )
+                .await?,
+            )
+            .await?;
+
+            let icon = remote_s9pk.icon_data_url().await?;
+
+            Ok::<_, Error>((icon, remote_s9pk.as_manifest().title.clone()))
+        }
+        .await
+        {
+            Ok(a) => a,
+            Err(e) => {
+                tracing::error!("Error fetching remote s9pk: {e}");
+                tracing::debug!("{e:?}");
+                (
+                    DataUrl::from_slice("image/png", include_bytes!("../install/package-icon.png")),
+                    dep_id.to_string(),
+                )
+            }
+        };
         let config_satisfied = if let Some(dep_service) = &*ctx.ctx.services.get(&dep_id).await {
             service
-                .dependency_config(dep_id, dep_service.get_config().await?.config)
+                .dependency_config(dep_id.clone(), dep_service.get_config().await?.config)
                 .await?
                 .is_none()
         } else {
@@ -1158,7 +1185,7 @@ async fn set_dependencies(
         deps.insert(
             dep_id,
             CurrentDependencyInfo {
-                kind: CurrentDependencyKind::Exists,
+                kind,
                 registry_url,
                 version_spec,
                 icon,
diff --git a/core/startos/src/service/transition/mod.rs b/core/startos/src/service/transition/mod.rs
index af62ccc1c..25d225492 100644
--- a/core/startos/src/service/transition/mod.rs
+++ b/core/startos/src/service/transition/mod.rs
@@ -5,7 +5,7 @@ use tokio::sync::watch;
 
 use super::persistent_container::ServiceState;
 use crate::service::start_stop::StartStop;
-use crate::util::actor::BackgroundJobs;
+use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::future::{CancellationHandle, RemoteCancellable};
 
 pub mod backup;
@@ -41,7 +41,7 @@ impl TransitionState {
     fn new(
         task: impl Future<Output = ()> + Send + 'static,
         kind: TransitionKind,
-        jobs: &mut BackgroundJobs,
+        jobs: &BackgroundJobQueue,
     ) -> Self {
         let task = RemoteCancellable::new(task);
         let cancel_handle = task.cancellation_handle();
diff --git a/core/startos/src/service/transition/restart.rs b/core/startos/src/service/transition/restart.rs
index 7047bd18f..dbf066e6f 100644
--- a/core/startos/src/service/transition/restart.rs
+++ b/core/startos/src/service/transition/restart.rs
@@ -1,18 +1,24 @@
-use std::sync::Arc;
-
 use futures::FutureExt;
 
 use super::TempDesiredState;
 use crate::prelude::*;
+use crate::service::config::GetConfig;
+use crate::service::dependencies::DependencyConfig;
 use crate::service::transition::{TransitionKind, TransitionState};
 use crate::service::{Service, ServiceActor};
-use crate::util::actor::{BackgroundJobs, Handler};
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::{ConflictBuilder, Handler};
 use crate::util::future::RemoteCancellable;
 
-struct Restart;
+pub(super) struct Restart;
 impl Handler<Restart> for ServiceActor {
     type Response = ();
-    async fn handle(&mut self, _: Restart, jobs: &mut BackgroundJobs) -> Self::Response {
+    fn conflicts_with(_: &Restart) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything()
+            .except::<GetConfig>()
+            .except::<DependencyConfig>()
+    }
+    async fn handle(&mut self, _: Restart, jobs: &BackgroundJobQueue) -> Self::Response {
         // So Need a handle to just a single field in the state
         let temp = TempDesiredState::new(&self.0.persistent_container.state);
         let mut current = self.0.persistent_container.state.subscribe();
diff --git a/core/startos/src/util/actor/background.rs b/core/startos/src/util/actor/background.rs
new file mode 100644
index 000000000..f37e10c14
--- /dev/null
+++ b/core/startos/src/util/actor/background.rs
@@ -0,0 +1,60 @@
+use futures::future::BoxFuture;
+use futures::{Future, FutureExt};
+use tokio::sync::mpsc;
+
+#[derive(Clone)]
+pub struct BackgroundJobQueue(mpsc::UnboundedSender<BoxFuture<'static, ()>>);
+impl BackgroundJobQueue {
+    pub fn new() -> (Self, BackgroundJobRunner) {
+        let (send, recv) = mpsc::unbounded_channel();
+        (
+            Self(send),
+            BackgroundJobRunner {
+                recv,
+                jobs: Vec::new(),
+            },
+        )
+    }
+    pub fn add_job(&self, fut: impl Future<Output = ()> + Send + 'static) {
+        let _ = self.0.send(fut.boxed());
+    }
+}
+
+pub struct BackgroundJobRunner {
+    recv: mpsc::UnboundedReceiver<BoxFuture<'static, ()>>,
+    jobs: Vec<BoxFuture<'static, ()>>,
+}
+impl BackgroundJobRunner {
+    pub fn is_empty(&self) -> bool {
+        self.recv.is_empty() && self.jobs.is_empty()
+    }
+}
+impl Future for BackgroundJobRunner {
+    type Output = ();
+    fn poll(
+        mut self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Self::Output> {
+        while let std::task::Poll::Ready(Some(job)) = self.recv.poll_recv(cx) {
+            self.jobs.push(job);
+        }
+        let complete = self
+            .jobs
+            .iter_mut()
+            .enumerate()
+            .filter_map(|(i, f)| match f.poll_unpin(cx) {
+                std::task::Poll::Pending => None,
+                std::task::Poll::Ready(_) => Some(i),
+            })
+            .collect::<Vec<_>>();
+        for idx in complete.into_iter().rev() {
+            #[allow(clippy::let_underscore_future)]
+            let _ = self.jobs.swap_remove(idx);
+        }
+        if self.jobs.is_empty() && self.recv.is_closed() {
+            std::task::Poll::Ready(())
+        } else {
+            std::task::Poll::Pending
+        }
+    }
+}
diff --git a/core/startos/src/util/actor/concurrent.rs b/core/startos/src/util/actor/concurrent.rs
new file mode 100644
index 000000000..d330102ca
--- /dev/null
+++ b/core/startos/src/util/actor/concurrent.rs
@@ -0,0 +1,208 @@
+use std::any::Any;
+use std::sync::Arc;
+use std::time::Duration;
+
+use futures::future::{ready, BoxFuture};
+use futures::{Future, FutureExt, TryFutureExt};
+use helpers::NonDetachingJoinHandle;
+use tokio::sync::{mpsc, oneshot};
+
+use crate::prelude::*;
+use crate::util::actor::background::{BackgroundJobQueue, BackgroundJobRunner};
+use crate::util::actor::{Actor, ConflictFn, Handler, PendingMessageStrategy, Request};
+
+#[pin_project::pin_project]
+struct ConcurrentRunner<A> {
+    actor: A,
+    shutdown: Option<oneshot::Receiver<()>>,
+    waiting: Vec<Request<A>>,
+    recv: mpsc::UnboundedReceiver<Request<A>>,
+    handlers: Vec<(
+        Arc<ConflictFn<A>>,
+        oneshot::Sender<Box<dyn Any + Send>>,
+        BoxFuture<'static, Box<dyn Any + Send>>,
+    )>,
+    queue: BackgroundJobQueue,
+    #[pin]
+    bg_runner: BackgroundJobRunner,
+}
+impl<A: Actor + Clone> Future for ConcurrentRunner<A> {
+    type Output = ();
+    fn poll(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Self::Output> {
+        let mut this = self.project();
+        *this.shutdown = this.shutdown.take().and_then(|mut s| {
+            if s.poll_unpin(cx).is_pending() {
+                Some(s)
+            } else {
+                None
+            }
+        });
+        if this.shutdown.is_some() {
+            while let std::task::Poll::Ready(Some((msg, reply))) = this.recv.poll_recv(cx) {
+                if this.handlers.iter().any(|(f, _, _)| f(&*msg)) {
+                    this.waiting.push((msg, reply));
+                } else {
+                    let mut actor = this.actor.clone();
+                    let queue = this.queue.clone();
+                    this.handlers.push((
+                        msg.conflicts_with(),
+                        reply,
+                        async move { msg.handle_with(&mut actor, &queue).await }.boxed(),
+                    ))
+                }
+            }
+        }
+        // handlers
+        while {
+            let mut cont = false;
+            let complete = this
+                .handlers
+                .iter_mut()
+                .enumerate()
+                .filter_map(|(i, (_, _, f))| match f.poll_unpin(cx) {
+                    std::task::Poll::Pending => None,
+                    std::task::Poll::Ready(res) => Some((i, res)),
+                })
+                .collect::<Vec<_>>();
+            for (idx, res) in complete.into_iter().rev() {
+                #[allow(clippy::let_underscore_future)]
+                let (f, reply, _) = this.handlers.swap_remove(idx);
+                let _ = reply.send(res);
+                // TODO: replace with Vec::extract_if once stable
+                if this.shutdown.is_some() {
+                    let mut i = 0;
+                    while i < this.waiting.len() {
+                        if f(&*this.waiting[i].0)
+                            && !this.handlers.iter().any(|(f, _, _)| f(&*this.waiting[i].0))
+                        {
+                            let (msg, reply) = this.waiting.remove(i);
+                            let mut actor = this.actor.clone();
+                            let queue = this.queue.clone();
+                            this.handlers.push((
+                                msg.conflicts_with(),
+                                reply,
+                                async move { msg.handle_with(&mut actor, &queue).await }.boxed(),
+                            ));
+                            cont = true;
+                        } else {
+                            i += 1;
+                        }
+                    }
+                }
+            }
+            cont
+        } {}
+        let _ = this.bg_runner.as_mut().poll(cx);
+        if this.waiting.is_empty() && this.handlers.is_empty() && this.bg_runner.is_empty() {
+            std::task::Poll::Ready(())
+        } else {
+            std::task::Poll::Pending
+        }
+    }
+}
+
+pub struct ConcurrentActor<A: Actor + Clone> {
+    shutdown: oneshot::Sender<()>,
+    runtime: NonDetachingJoinHandle<()>,
+    messenger: mpsc::UnboundedSender<Request<A>>,
+}
+impl<A: Actor + Clone> ConcurrentActor<A> {
+    pub fn new(mut actor: A) -> Self {
+        let (shutdown_send, shutdown_recv) = oneshot::channel();
+        let (messenger_send, messenger_recv) = mpsc::unbounded_channel::<Request<A>>();
+        let runtime = NonDetachingJoinHandle::from(tokio::spawn(async move {
+            let (queue, runner) = BackgroundJobQueue::new();
+            actor.init(&queue);
+            ConcurrentRunner {
+                actor,
+                shutdown: Some(shutdown_recv),
+                waiting: Vec::new(),
+                recv: messenger_recv,
+                handlers: Vec::new(),
+                queue,
+                bg_runner: runner,
+            }
+            .await
+        }));
+        Self {
+            shutdown: shutdown_send,
+            runtime,
+            messenger: messenger_send,
+        }
+    }
+
+    /// Message is guaranteed to be queued immediately
+    pub fn queue<M: Send + 'static>(
+        &self,
+        message: M,
+    ) -> impl Future<Output = Result<A::Response, Error>>
+    where
+        A: Handler<M>,
+    {
+        if self.runtime.is_finished() {
+            return futures::future::Either::Left(ready(Err(Error::new(
+                eyre!("actor runtime has exited"),
+                ErrorKind::Unknown,
+            ))));
+        }
+        let (reply_send, reply_recv) = oneshot::channel();
+        self.messenger
+            .send((Box::new(message), reply_send))
+            .unwrap();
+        futures::future::Either::Right(
+            reply_recv
+                .map_err(|_| Error::new(eyre!("actor runtime has exited"), ErrorKind::Unknown))
+                .and_then(|a| {
+                    ready(
+                        a.downcast()
+                            .map_err(|_| {
+                                Error::new(
+                                    eyre!("received incorrect type in response"),
+                                    ErrorKind::Incoherent,
+                                )
+                            })
+                            .map(|a| *a),
+                    )
+                }),
+        )
+    }
+
+    pub async fn send<M: Send + 'static>(&self, message: M) -> Result<A::Response, Error>
+    where
+        A: Handler<M>,
+    {
+        self.queue(message).await
+    }
+
+    pub async fn shutdown(self, strategy: PendingMessageStrategy) {
+        drop(self.messenger);
+        let timeout = match strategy {
+            PendingMessageStrategy::CancelAll => {
+                self.shutdown.send(()).unwrap();
+                Some(Duration::from_secs(0))
+            }
+            PendingMessageStrategy::FinishCurrentCancelPending { timeout } => {
+                self.shutdown.send(()).unwrap();
+                timeout
+            }
+            PendingMessageStrategy::FinishAll { timeout } => timeout,
+        };
+        let aborter = if let Some(timeout) = timeout {
+            let hdl = self.runtime.abort_handle();
+            async move {
+                tokio::time::sleep(timeout).await;
+                hdl.abort();
+            }
+            .boxed()
+        } else {
+            futures::future::pending().boxed()
+        };
+        tokio::select! {
+            _ = aborter => (),
+            _ = self.runtime => (),
+        }
+    }
+}
diff --git a/core/startos/src/util/actor/mod.rs b/core/startos/src/util/actor/mod.rs
new file mode 100644
index 000000000..5cef7c22e
--- /dev/null
+++ b/core/startos/src/util/actor/mod.rs
@@ -0,0 +1,148 @@
+use std::any::{Any, TypeId};
+use std::collections::BTreeMap;
+use std::sync::Arc;
+use std::time::Duration;
+
+use futures::future::BoxFuture;
+use futures::{Future, FutureExt};
+use tokio::sync::oneshot;
+
+#[allow(unused_imports)]
+use crate::prelude::*;
+use crate::util::actor::background::BackgroundJobQueue;
+
+pub mod background;
+pub mod concurrent;
+pub mod simple;
+
+pub trait Actor: Sized + Send + 'static {
+    #[allow(unused_variables)]
+    fn init(&mut self, jobs: &BackgroundJobQueue) {}
+}
+
+pub trait Handler<M: Any + Send>: Actor {
+    type Response: Any + Send;
+    /// DRAGONS: this must be correctly implemented bi-directionally in order to work as expected
+    fn conflicts_with(#[allow(unused_variables)] msg: &M) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything()
+    }
+    fn handle(
+        &mut self,
+        msg: M,
+        jobs: &BackgroundJobQueue,
+    ) -> impl Future<Output = Self::Response> + Send;
+}
+
+type ConflictFn<A> = dyn Fn(&dyn Message<A>) -> bool + Send + Sync;
+
+trait Message<A>: Send + Any {
+    fn conflicts_with(&self) -> Arc<ConflictFn<A>>;
+    fn handle_with<'a>(
+        self: Box<Self>,
+        actor: &'a mut A,
+        jobs: &'a BackgroundJobQueue,
+    ) -> BoxFuture<'a, Box<dyn Any + Send>>;
+}
+impl<M: Send + Any, A: Actor> Message<A> for M
+where
+    A: Handler<M>,
+{
+    fn conflicts_with(&self) -> Arc<ConflictFn<A>> {
+        A::conflicts_with(self).build()
+    }
+    fn handle_with<'a>(
+        self: Box<Self>,
+        actor: &'a mut A,
+        jobs: &'a BackgroundJobQueue,
+    ) -> BoxFuture<'a, Box<dyn Any + Send>> {
+        async move { Box::new(actor.handle(*self, jobs).await) as Box<dyn Any + Send> }.boxed()
+    }
+}
+impl<A: Actor> dyn Message<A> {
+    #[inline]
+    pub fn is<M: Message<A>>(&self) -> bool {
+        let t = TypeId::of::<M>();
+        let concrete = self.type_id();
+        t == concrete
+    }
+    #[inline]
+    pub unsafe fn downcast_ref_unchecked<M: Message<A>>(&self) -> &M {
+        debug_assert!(self.is::<M>());
+        unsafe { &*(self as *const dyn Message<A> as *const M) }
+    }
+    #[inline]
+    fn downcast_ref<M: Message<A>>(&self) -> Option<&M> {
+        if self.is::<M>() {
+            unsafe { Some(self.downcast_ref_unchecked()) }
+        } else {
+            None
+        }
+    }
+}
+
+type Request<A> = (Box<dyn Message<A>>, oneshot::Sender<Box<dyn Any + Send>>);
+
+pub enum PendingMessageStrategy {
+    CancelAll,
+    FinishCurrentCancelPending { timeout: Option<Duration> },
+    FinishAll { timeout: Option<Duration> },
+}
+
+pub struct ConflictBuilder<A> {
+    base: bool,
+    except: BTreeMap<TypeId, Option<Box<dyn Fn(&dyn Message<A>) -> bool + Send + Sync>>>,
+}
+impl<A: Actor> ConflictBuilder<A> {
+    pub const fn everything() -> Self {
+        Self {
+            base: true,
+            except: BTreeMap::new(),
+        }
+    }
+    pub const fn nothing() -> Self {
+        Self {
+            base: false,
+            except: BTreeMap::new(),
+        }
+    }
+    pub fn except<M: Any + Send>(mut self) -> Self
+    where
+        A: Handler<M>,
+    {
+        self.except.insert(TypeId::of::<M>(), None);
+        self
+    }
+    pub fn except_if<M: Any + Send, F: Fn(&M) -> bool + Send + Sync + 'static>(
+        mut self,
+        f: F,
+    ) -> Self
+    where
+        A: Handler<M>,
+    {
+        self.except.insert(
+            TypeId::of::<M>(),
+            Some(Box::new(move |m| {
+                if let Some(m) = m.downcast_ref() {
+                    f(m)
+                } else {
+                    false
+                }
+            })),
+        );
+        self
+    }
+    fn build(self) -> Arc<ConflictFn<A>> {
+        Arc::new(move |m| {
+            self.base
+                ^ if let Some(entry) = self.except.get(&m.type_id()) {
+                    if let Some(f) = entry {
+                        f(m)
+                    } else {
+                        true
+                    }
+                } else {
+                    false
+                }
+        })
+    }
+}
diff --git a/core/startos/src/util/actor.rs b/core/startos/src/util/actor/simple.rs
similarity index 60%
rename from core/startos/src/util/actor.rs
rename to core/startos/src/util/actor/simple.rs
index caa83d8b1..6f880a57a 100644
--- a/core/startos/src/util/actor.rs
+++ b/core/startos/src/util/actor/simple.rs
@@ -1,85 +1,14 @@
-use std::any::Any;
-use std::future::ready;
 use std::time::Duration;
 
-use futures::future::BoxFuture;
+use futures::future::ready;
 use futures::{Future, FutureExt, TryFutureExt};
 use helpers::NonDetachingJoinHandle;
 use tokio::sync::oneshot::error::TryRecvError;
 use tokio::sync::{mpsc, oneshot};
 
 use crate::prelude::*;
-use crate::util::Never;
-
-pub trait Actor: Send + 'static {
-    #[allow(unused_variables)]
-    fn init(&mut self, jobs: &mut BackgroundJobs) {}
-}
-
-pub trait Handler<M>: Actor {
-    type Response: Any + Send;
-    fn handle(
-        &mut self,
-        msg: M,
-        jobs: &mut BackgroundJobs,
-    ) -> impl Future<Output = Self::Response> + Send;
-}
-
-#[async_trait::async_trait]
-trait Message<A>: Send {
-    async fn handle_with(
-        self: Box<Self>,
-        actor: &mut A,
-        jobs: &mut BackgroundJobs,
-    ) -> Box<dyn Any + Send>;
-}
-#[async_trait::async_trait]
-impl<M: Send, A: Actor> Message<A> for M
-where
-    A: Handler<M>,
-{
-    async fn handle_with(
-        self: Box<Self>,
-        actor: &mut A,
-        jobs: &mut BackgroundJobs,
-    ) -> Box<dyn Any + Send> {
-        Box::new(actor.handle(*self, jobs).await)
-    }
-}
-
-type Request<A> = (Box<dyn Message<A>>, oneshot::Sender<Box<dyn Any + Send>>);
-
-#[derive(Default)]
-pub struct BackgroundJobs {
-    jobs: Vec<BoxFuture<'static, ()>>,
-}
-impl BackgroundJobs {
-    pub fn add_job(&mut self, fut: impl Future<Output = ()> + Send + 'static) {
-        self.jobs.push(fut.boxed());
-    }
-}
-impl Future for BackgroundJobs {
-    type Output = Never;
-    fn poll(
-        mut self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Self::Output> {
-        let complete = self
-            .jobs
-            .iter_mut()
-            .enumerate()
-            .filter_map(|(i, f)| match f.poll_unpin(cx) {
-                std::task::Poll::Pending => None,
-                std::task::Poll::Ready(_) => Some(i),
-            })
-            .collect::<Vec<_>>();
-        for idx in complete.into_iter().rev() {
-            #[allow(clippy::let_underscore_future)]
-            let _ = self.jobs.swap_remove(idx);
-        }
-        std::task::Poll::Pending
-    }
-}
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::{Actor, Handler, PendingMessageStrategy, Request};
 
 pub struct SimpleActor<A: Actor> {
     shutdown: oneshot::Sender<()>,
@@ -91,19 +20,17 @@ impl<A: Actor> SimpleActor<A> {
         let (shutdown_send, mut shutdown_recv) = oneshot::channel();
         let (messenger_send, mut messenger_recv) = mpsc::unbounded_channel::<Request<A>>();
         let runtime = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            let mut bg = BackgroundJobs::default();
-            actor.init(&mut bg);
+            let (queue, mut runner) = BackgroundJobQueue::new();
+            actor.init(&queue);
             loop {
                 tokio::select! {
-                    _ = &mut bg => (),
+                    _ = &mut runner => (),
                     msg = messenger_recv.recv() => match msg {
                         Some((msg, reply)) if shutdown_recv.try_recv() == Err(TryRecvError::Empty) => {
-                            let mut new_bg = BackgroundJobs::default();
                             tokio::select! {
-                                res = msg.handle_with(&mut actor, &mut new_bg) => { let _ = reply.send(res); },
-                                _ = &mut bg => (),
+                                res = msg.handle_with(&mut actor, &queue) => { let _ = reply.send(res); },
+                                _ = &mut runner => (),
                             }
-                            bg.jobs.append(&mut new_bg.jobs);
                         }
                         _ => break,
                     },
@@ -189,9 +116,3 @@ impl<A: Actor> SimpleActor<A> {
         }
     }
 }
-
-pub enum PendingMessageStrategy {
-    CancelAll,
-    FinishCurrentCancelPending { timeout: Option<Duration> },
-    FinishAll { timeout: Option<Duration> },
-}

From c13d8f36999d2be7ced9a0c65681ea0a105ee79c Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 8 Apr 2024 12:07:56 -0600
Subject: [PATCH 133/341] finish dependency autoconfig (#2596)

---
 core/startos/src/dependencies.rs | 91 +++++++-------------------------
 1 file changed, 19 insertions(+), 72 deletions(-)

diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 61f5af2b4..42a19abe3 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -3,6 +3,7 @@ use std::time::Duration;
 
 use clap::Parser;
 use models::PackageId;
+use patch_db::json_patch::merge;
 use rpc_toolkit::{command, from_fn_async, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
@@ -102,78 +103,24 @@ pub async fn configure_logic(
     ctx: RpcContext,
     (dependent_id, dependency_id): (PackageId, PackageId),
 ) -> Result<ConfigDryRes, Error> {
-    // let db = ctx.db.peek().await;
-    // let pkg = db
-    //     .as_package_data()
-    //     .as_idx(&pkg_id)
-    //     .or_not_found(&pkg_id)?
-    //     .as_installed()
-    //     .or_not_found(&pkg_id)?;
-    // let pkg_version = pkg.as_manifest().as_version().de()?;
-    // let pkg_volumes = pkg.as_manifest().as_volumes().de()?;
-    // let dependency = db
-    //     .as_package_data()
-    //     .as_idx(&dependency_id)
-    //     .or_not_found(&dependency_id)?
-    //     .as_installed()
-    //     .or_not_found(&dependency_id)?;
-    // let dependency_config_action = dependency
-    //     .as_manifest()
-    //     .as_config()
-    //     .de()?
-    //     .ok_or_else(|| not_found!("Manifest Config"))?;
-    // let dependency_version = dependency.as_manifest().as_version().de()?;
-    // let dependency_volumes = dependency.as_manifest().as_volumes().de()?;
-    // let dependency = pkg
-    //     .as_manifest()
-    //     .as_dependencies()
-    //     .as_idx(&dependency_id)
-    //     .or_not_found(&dependency_id)?;
-
-    // let ConfigRes {
-    //     config: maybe_config,
-    //     spec,
-    // } = dependency_config_action
-    //     .get(
-    //         &ctx,
-    //         &dependency_id,
-    //         &dependency_version,
-    //         &dependency_volumes,
-    //     )
-    //     .await?;
-
-    // let old_config = if let Some(config) = maybe_config {
-    //     config
-    // } else {
-    //     spec.gen(
-    //         &mut rand::rngs::StdRng::from_entropy(),
-    //         &Some(Duration::new(10, 0)),
-    //     )?
-    // };
-
-    // let new_config = dependency
-    //     .as_config()
-    //     .de()?
-    //     .ok_or_else(|| not_found!("Config"))?
-    //     .auto_configure
-    //     .sandboxed(
-    //         &ctx,
-    //         &pkg_id,
-    //         &pkg_version,
-    //         &pkg_volumes,
-    //         Some(&old_config),
-    //         None,
-    //         ProcedureName::AutoConfig(dependency_id.clone()),
-    //     )
-    //     .await?
-    //     .map_err(|e| Error::new(eyre!("{}", e.1), crate::ErrorKind::AutoConfigure))?;
-
-    // Ok(ConfigDryRes {
-    //     old_config,
-    //     new_config,
-    //     spec,
-    // })
-    todo!()
+    let dependency_guard = ctx.services.get(&dependency_id).await;
+    let dependency = dependency_guard.as_ref().or_not_found(&dependency_id)?;
+    let dependent_guard = ctx.services.get(&dependent_id).await;
+    let dependent = dependent_guard.as_ref().or_not_found(&dependent_id)?;
+    let config_res = dependency.get_config().await?;
+    let diff = Value::Object(
+        dependent
+            .dependency_config(dependency_id, config_res.config.clone())
+            .await?
+            .unwrap_or_default(),
+    );
+    let mut new_config = Value::Object(config_res.config.clone().unwrap_or_default());
+    merge(&mut new_config, &diff);
+    Ok(ConfigDryRes {
+        old_config: config_res.config.unwrap_or_default(),
+        new_config: new_config.as_object().cloned().unwrap_or_default(),
+        spec: config_res.spec,
+    })
 }
 
 #[instrument(skip_all)]

From 313e415ee955176032bc0e354984ff468463dbf1 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 8 Apr 2024 14:01:16 -0600
Subject: [PATCH 134/341] miscellaneous bugfixes

---
 core/startos/bindings/GetServicePortForwardParams.ts | 2 ++
 core/startos/src/db/mod.rs                           | 2 +-
 core/startos/src/s9pk/v1/manifest.rs                 | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/startos/bindings/GetServicePortForwardParams.ts b/core/startos/bindings/GetServicePortForwardParams.ts
index 3de7e0219..70d69c674 100644
--- a/core/startos/bindings/GetServicePortForwardParams.ts
+++ b/core/startos/bindings/GetServicePortForwardParams.ts
@@ -1,6 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HostId } from "./HostId";
 
 export type GetServicePortForwardParams = {
   packageId: string | null;
   internalPort: number;
+  hostId: HostId;
 };
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index ab5d23efb..95e42f46b 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -324,7 +324,7 @@ pub struct UiParams {
 // #[command(display(display_serializable))]
 #[instrument(skip_all)]
 pub async fn ui(ctx: RpcContext, UiParams { pointer, value, .. }: UiParams) -> Result<(), Error> {
-    let ptr = "/ui"
+    let ptr = "/public/ui"
         .parse::<JsonPointer>()
         .with_kind(ErrorKind::Database)?
         + &pointer;
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index ef346ad2b..264843766 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -19,7 +19,7 @@ fn current_version() -> Version {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 #[model = "Model<Self>"]
 pub struct Manifest {
     #[serde(default = "current_version")]
@@ -54,7 +54,7 @@ pub struct Manifest {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 #[serde(tag = "type")]
 pub enum DependencyRequirement {
     OptIn { how: String },
@@ -68,7 +68,7 @@ impl DependencyRequirement {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 #[model = "Model<Self>"]
 pub struct DepInfo {
     pub version: VersionRange,
@@ -77,7 +77,7 @@ pub struct DepInfo {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 pub struct Assets {
     #[serde(default)]
     pub license: Option<PathBuf>,

From f07992c09135267c79c7c0ae305fbe04a1cda0c9 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 9 Apr 2024 14:04:31 -0600
Subject: [PATCH 135/341] misc fixes

---
 core/startos/bindings/ServerInfo.ts           |  2 +-
 core/startos/bindings/WifiInfo.ts             |  1 +
 core/startos/src/backup/restore.rs            |  6 +++++-
 core/startos/src/db/model/mod.rs              |  5 ++---
 core/startos/src/db/model/public.rs           | 10 +++++----
 core/startos/src/net/vhost.rs                 | 21 +++++++++++++++----
 core/startos/src/properties.rs                |  7 +++++--
 core/startos/src/setup.rs                     |  6 +++++-
 .../ui/src/app/services/api/mock-patch.ts     |  1 +
 9 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/core/startos/bindings/ServerInfo.ts b/core/startos/bindings/ServerInfo.ts
index e505c84e7..130a5bafe 100644
--- a/core/startos/bindings/ServerInfo.ts
+++ b/core/startos/bindings/ServerInfo.ts
@@ -24,7 +24,7 @@ export type ServerInfo = {
   torAddress: string;
   ipInfo: { [key: string]: IpInfo };
   statusInfo: ServerStatus;
-  wifi: WifiInfo;
+  wifi: WifiInfo | null;
   unreadNotificationCount: number;
   passwordHash: string;
   pubkey: string;
diff --git a/core/startos/bindings/WifiInfo.ts b/core/startos/bindings/WifiInfo.ts
index c949b1e76..59b1b901d 100644
--- a/core/startos/bindings/WifiInfo.ts
+++ b/core/startos/bindings/WifiInfo.ts
@@ -1,6 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type WifiInfo = {
+  interface: string;
   ssids: Array<string>;
   selected: string | null;
   connected: string | null;
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 4753a4290..41aaeca7b 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -96,7 +96,11 @@ pub async fn recover_full_embassy(
     .with_kind(ErrorKind::PasswordHashGeneration)?;
 
     let db = ctx.db().await?;
-    db.put(&ROOT, &Database::init(&os_backup.account)?).await?;
+    db.put(
+        &ROOT,
+        &Database::init(&os_backup.account, ctx.config.wifi_interface.clone())?,
+    )
+    .await?;
     drop(db);
 
     init(&ctx.config).await?;
diff --git a/core/startos/src/db/model/mod.rs b/core/startos/src/db/model/mod.rs
index 9be0f8b68..8b959cdfd 100644
--- a/core/startos/src/db/model/mod.rs
+++ b/core/startos/src/db/model/mod.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 
 use patch_db::HasModel;
 use serde::{Deserialize, Serialize};
-use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::auth::Sessions;
@@ -28,9 +27,9 @@ pub struct Database {
     pub private: Private,
 }
 impl Database {
-    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
+    pub fn init(account: &AccountInfo, wifi_interface: Option<String>) -> Result<Self, Error> {
         Ok(Self {
-            public: Public::init(account)?,
+            public: Public::init(account, wifi_interface)?,
             private: Private {
                 key_store: KeyStore::new(account)?,
                 password: account.password.clone(),
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index d1eec5443..5b83eb74d 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -35,7 +35,7 @@ pub struct Public {
     pub ui: Value,
 }
 impl Public {
-    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
+    pub fn init(account: &AccountInfo, wifi_interface: Option<String>) -> Result<Self, Error> {
         let lan_address = account.hostname.lan_address().parse().unwrap();
         Ok(Self {
             server_info: ServerInfo {
@@ -60,11 +60,12 @@ impl Public {
                     shutting_down: false,
                     restarting: false,
                 },
-                wifi: WifiInfo {
+                wifi: wifi_interface.map(|interface| WifiInfo {
+                    interface,
                     ssids: Vec::new(),
                     connected: None,
                     selected: None,
-                },
+                }),
                 unread_notification_count: 0,
                 password_hash: account.password.clone(),
                 pubkey: ssh_key::PublicKey::from(&account.ssh_key)
@@ -131,7 +132,7 @@ pub struct ServerInfo {
     pub ip_info: BTreeMap<String, IpInfo>,
     #[serde(default)]
     pub status_info: ServerStatus,
-    pub wifi: WifiInfo,
+    pub wifi: Option<WifiInfo>,
     #[ts(type = "number")]
     pub unread_notification_count: u64,
     pub password_hash: String,
@@ -206,6 +207,7 @@ pub struct UpdateProgress {
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct WifiInfo {
+    pub interface: String,
     pub ssids: Vec<String>,
     pub selected: Option<String>,
     pub connected: Option<String>,
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index 46838ed51..47cf30ad5 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -111,7 +111,7 @@ impl VHostServer {
             _thread: tokio::spawn(async move {
                 loop {
                     match listener.accept().await {
-                        Ok((stream, sock_addr)) => {
+                        Ok((stream, _)) => {
                             let stream =
                                 Box::pin(TimeoutStream::new(stream, Duration::from_secs(300)));
                             let mut stream = BackTrackingReader::new(stream);
@@ -195,9 +195,22 @@ impl VHostServer {
                                             .as_ref()
                                             .into_iter()
                                             .map(InternedString::intern)
-                                            .chain(std::iter::once(InternedString::from_display(
-                                                &sock_addr.ip(),
-                                            )))
+                                            .chain(
+                                                db.peek()
+                                                    .await
+                                                    .into_public()
+                                                    .into_server_info()
+                                                    .into_ip_info()
+                                                    .into_entries()?
+                                                    .into_iter()
+                                                    .flat_map(|(_, ips)| [
+                                                        ips.as_ipv4().de().map(|ip| ip.map(IpAddr::V4)), 
+                                                        ips.as_ipv6().de().map(|ip| ip.map(IpAddr::V6))
+                                                    ])
+                                                    .filter_map(|a| a.transpose())
+                                                    .map(|a| a.map(|ip| InternedString::from_display(&ip)))
+                                                    .collect::<Result<Vec<_>, _>>()?,
+                                            )
                                             .collect();
                                         let key = db
                                             .mutate(|v| {
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 5aa8a01d4..f8753ab10 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use imbl_value::Value;
+use imbl_value::{json, Value};
 use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
@@ -24,7 +24,10 @@ pub async fn properties(
     PropertiesParam { id }: PropertiesParam,
 ) -> Result<Value, Error> {
     match &*ctx.services.get(&id).await {
-        Some(service) => service.properties().await,
+        Some(service) => Ok(json!({
+            "version": 2,
+            "data": service.properties().await?
+        })),
         None => Err(Error::new(
             eyre!("Could not find a service with id {id}"),
             ErrorKind::NotFound,
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 9120544e3..b8b761e69 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -419,7 +419,11 @@ async fn fresh_setup(
 ) -> Result<(Hostname, OnionAddressV3, X509), Error> {
     let account = AccountInfo::new(start_os_password, root_ca_start_time().await?)?;
     let db = ctx.db().await?;
-    db.put(&ROOT, &Database::init(&account)?).await?;
+    db.put(
+        &ROOT,
+        &Database::init(&account, ctx.config.wifi_interface.clone())?,
+    )
+    .await?;
     drop(db);
     init(&ctx.config).await?;
     Ok((
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 8a3f714d1..446bf2424 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -76,6 +76,7 @@ export const mockPatchData: DataModel = {
     zram: true,
     governor: 'performance',
     wifi: {
+      interface: 'wlan0',
       ssids: [],
       selected: null,
       connected: null,

From aee55008337528be4282d07b237166cea0b86c00 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 9 Apr 2024 15:10:26 -0600
Subject: [PATCH 136/341] miscellaneous bugfixes (#2597)

* miscellaneous bugfixes

* misc fixes
---
 .../bindings/GetServicePortForwardParams.ts   |  2 ++
 core/startos/bindings/ServerInfo.ts           |  2 +-
 core/startos/bindings/WifiInfo.ts             |  1 +
 core/startos/src/backup/restore.rs            |  6 +++++-
 core/startos/src/db/mod.rs                    |  2 +-
 core/startos/src/db/model/mod.rs              |  5 ++---
 core/startos/src/db/model/public.rs           | 10 +++++----
 core/startos/src/net/vhost.rs                 | 21 +++++++++++++++----
 core/startos/src/properties.rs                |  7 +++++--
 core/startos/src/s9pk/v1/manifest.rs          |  8 +++----
 core/startos/src/setup.rs                     |  6 +++++-
 .../ui/src/app/services/api/mock-patch.ts     |  1 +
 12 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/core/startos/bindings/GetServicePortForwardParams.ts b/core/startos/bindings/GetServicePortForwardParams.ts
index 3de7e0219..70d69c674 100644
--- a/core/startos/bindings/GetServicePortForwardParams.ts
+++ b/core/startos/bindings/GetServicePortForwardParams.ts
@@ -1,6 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HostId } from "./HostId";
 
 export type GetServicePortForwardParams = {
   packageId: string | null;
   internalPort: number;
+  hostId: HostId;
 };
diff --git a/core/startos/bindings/ServerInfo.ts b/core/startos/bindings/ServerInfo.ts
index e505c84e7..130a5bafe 100644
--- a/core/startos/bindings/ServerInfo.ts
+++ b/core/startos/bindings/ServerInfo.ts
@@ -24,7 +24,7 @@ export type ServerInfo = {
   torAddress: string;
   ipInfo: { [key: string]: IpInfo };
   statusInfo: ServerStatus;
-  wifi: WifiInfo;
+  wifi: WifiInfo | null;
   unreadNotificationCount: number;
   passwordHash: string;
   pubkey: string;
diff --git a/core/startos/bindings/WifiInfo.ts b/core/startos/bindings/WifiInfo.ts
index c949b1e76..59b1b901d 100644
--- a/core/startos/bindings/WifiInfo.ts
+++ b/core/startos/bindings/WifiInfo.ts
@@ -1,6 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type WifiInfo = {
+  interface: string;
   ssids: Array<string>;
   selected: string | null;
   connected: string | null;
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 4753a4290..41aaeca7b 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -96,7 +96,11 @@ pub async fn recover_full_embassy(
     .with_kind(ErrorKind::PasswordHashGeneration)?;
 
     let db = ctx.db().await?;
-    db.put(&ROOT, &Database::init(&os_backup.account)?).await?;
+    db.put(
+        &ROOT,
+        &Database::init(&os_backup.account, ctx.config.wifi_interface.clone())?,
+    )
+    .await?;
     drop(db);
 
     init(&ctx.config).await?;
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index ab5d23efb..95e42f46b 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -324,7 +324,7 @@ pub struct UiParams {
 // #[command(display(display_serializable))]
 #[instrument(skip_all)]
 pub async fn ui(ctx: RpcContext, UiParams { pointer, value, .. }: UiParams) -> Result<(), Error> {
-    let ptr = "/ui"
+    let ptr = "/public/ui"
         .parse::<JsonPointer>()
         .with_kind(ErrorKind::Database)?
         + &pointer;
diff --git a/core/startos/src/db/model/mod.rs b/core/startos/src/db/model/mod.rs
index 9be0f8b68..8b959cdfd 100644
--- a/core/startos/src/db/model/mod.rs
+++ b/core/startos/src/db/model/mod.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 
 use patch_db::HasModel;
 use serde::{Deserialize, Serialize};
-use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::auth::Sessions;
@@ -28,9 +27,9 @@ pub struct Database {
     pub private: Private,
 }
 impl Database {
-    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
+    pub fn init(account: &AccountInfo, wifi_interface: Option<String>) -> Result<Self, Error> {
         Ok(Self {
-            public: Public::init(account)?,
+            public: Public::init(account, wifi_interface)?,
             private: Private {
                 key_store: KeyStore::new(account)?,
                 password: account.password.clone(),
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index d1eec5443..5b83eb74d 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -35,7 +35,7 @@ pub struct Public {
     pub ui: Value,
 }
 impl Public {
-    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
+    pub fn init(account: &AccountInfo, wifi_interface: Option<String>) -> Result<Self, Error> {
         let lan_address = account.hostname.lan_address().parse().unwrap();
         Ok(Self {
             server_info: ServerInfo {
@@ -60,11 +60,12 @@ impl Public {
                     shutting_down: false,
                     restarting: false,
                 },
-                wifi: WifiInfo {
+                wifi: wifi_interface.map(|interface| WifiInfo {
+                    interface,
                     ssids: Vec::new(),
                     connected: None,
                     selected: None,
-                },
+                }),
                 unread_notification_count: 0,
                 password_hash: account.password.clone(),
                 pubkey: ssh_key::PublicKey::from(&account.ssh_key)
@@ -131,7 +132,7 @@ pub struct ServerInfo {
     pub ip_info: BTreeMap<String, IpInfo>,
     #[serde(default)]
     pub status_info: ServerStatus,
-    pub wifi: WifiInfo,
+    pub wifi: Option<WifiInfo>,
     #[ts(type = "number")]
     pub unread_notification_count: u64,
     pub password_hash: String,
@@ -206,6 +207,7 @@ pub struct UpdateProgress {
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct WifiInfo {
+    pub interface: String,
     pub ssids: Vec<String>,
     pub selected: Option<String>,
     pub connected: Option<String>,
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index 46838ed51..47cf30ad5 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -111,7 +111,7 @@ impl VHostServer {
             _thread: tokio::spawn(async move {
                 loop {
                     match listener.accept().await {
-                        Ok((stream, sock_addr)) => {
+                        Ok((stream, _)) => {
                             let stream =
                                 Box::pin(TimeoutStream::new(stream, Duration::from_secs(300)));
                             let mut stream = BackTrackingReader::new(stream);
@@ -195,9 +195,22 @@ impl VHostServer {
                                             .as_ref()
                                             .into_iter()
                                             .map(InternedString::intern)
-                                            .chain(std::iter::once(InternedString::from_display(
-                                                &sock_addr.ip(),
-                                            )))
+                                            .chain(
+                                                db.peek()
+                                                    .await
+                                                    .into_public()
+                                                    .into_server_info()
+                                                    .into_ip_info()
+                                                    .into_entries()?
+                                                    .into_iter()
+                                                    .flat_map(|(_, ips)| [
+                                                        ips.as_ipv4().de().map(|ip| ip.map(IpAddr::V4)), 
+                                                        ips.as_ipv6().de().map(|ip| ip.map(IpAddr::V6))
+                                                    ])
+                                                    .filter_map(|a| a.transpose())
+                                                    .map(|a| a.map(|ip| InternedString::from_display(&ip)))
+                                                    .collect::<Result<Vec<_>, _>>()?,
+                                            )
                                             .collect();
                                         let key = db
                                             .mutate(|v| {
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index 5aa8a01d4..f8753ab10 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use imbl_value::Value;
+use imbl_value::{json, Value};
 use models::PackageId;
 use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
@@ -24,7 +24,10 @@ pub async fn properties(
     PropertiesParam { id }: PropertiesParam,
 ) -> Result<Value, Error> {
     match &*ctx.services.get(&id).await {
-        Some(service) => service.properties().await,
+        Some(service) => Ok(json!({
+            "version": 2,
+            "data": service.properties().await?
+        })),
         None => Err(Error::new(
             eyre!("Could not find a service with id {id}"),
             ErrorKind::NotFound,
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index ef346ad2b..264843766 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -19,7 +19,7 @@ fn current_version() -> Version {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 #[model = "Model<Self>"]
 pub struct Manifest {
     #[serde(default = "current_version")]
@@ -54,7 +54,7 @@ pub struct Manifest {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 #[serde(tag = "type")]
 pub enum DependencyRequirement {
     OptIn { how: String },
@@ -68,7 +68,7 @@ impl DependencyRequirement {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 #[model = "Model<Self>"]
 pub struct DepInfo {
     pub version: VersionRange,
@@ -77,7 +77,7 @@ pub struct DepInfo {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 pub struct Assets {
     #[serde(default)]
     pub license: Option<PathBuf>,
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 9120544e3..b8b761e69 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -419,7 +419,11 @@ async fn fresh_setup(
 ) -> Result<(Hostname, OnionAddressV3, X509), Error> {
     let account = AccountInfo::new(start_os_password, root_ca_start_time().await?)?;
     let db = ctx.db().await?;
-    db.put(&ROOT, &Database::init(&account)?).await?;
+    db.put(
+        &ROOT,
+        &Database::init(&account, ctx.config.wifi_interface.clone())?,
+    )
+    .await?;
     drop(db);
     init(&ctx.config).await?;
     Ok((
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 8a3f714d1..446bf2424 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -76,6 +76,7 @@ export const mockPatchData: DataModel = {
     zram: true,
     governor: 'performance',
     wifi: {
+      interface: 'wlan0',
       ssids: [],
       selected: null,
       connected: null,

From e9166c4a7dd20c9a8ed27c6194b8e35a73eabe48 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 9 Apr 2024 15:24:05 -0600
Subject: [PATCH 137/341] fix wifi types

---
 core/startos/bindings/ServerInfo.ts           |  6 +-
 core/startos/bindings/WifiInfo.ts             |  4 +-
 core/startos/src/backup/restore.rs            |  6 +-
 core/startos/src/context/config.rs            |  3 -
 core/startos/src/context/rpc.rs               |  9 +--
 core/startos/src/db/model/mod.rs              |  4 +-
 core/startos/src/db/model/public.rs           | 26 +++----
 core/startos/src/init.rs                      | 15 ++--
 core/startos/src/net/wifi.rs                  | 71 +++++++++++++++----
 core/startos/src/os_install/mod.rs            |  4 +-
 core/startos/src/setup.rs                     |  6 +-
 .../ui/src/app/services/api/mock-patch.ts     |  3 +-
 12 files changed, 85 insertions(+), 72 deletions(-)

diff --git a/core/startos/bindings/ServerInfo.ts b/core/startos/bindings/ServerInfo.ts
index 130a5bafe..618d396fd 100644
--- a/core/startos/bindings/ServerInfo.ts
+++ b/core/startos/bindings/ServerInfo.ts
@@ -11,10 +11,6 @@ export type ServerInfo = {
   hostname: string;
   version: string;
   lastBackup: string | null;
-  /**
-   * Used in the wifi to determine the region to set the system to
-   */
-  lastWifiRegion: string | null;
   eosVersionCompat: string;
   lanAddress: string;
   onionAddress: string;
@@ -24,7 +20,7 @@ export type ServerInfo = {
   torAddress: string;
   ipInfo: { [key: string]: IpInfo };
   statusInfo: ServerStatus;
-  wifi: WifiInfo | null;
+  wifi: WifiInfo;
   unreadNotificationCount: number;
   passwordHash: string;
   pubkey: string;
diff --git a/core/startos/bindings/WifiInfo.ts b/core/startos/bindings/WifiInfo.ts
index 59b1b901d..812cc431f 100644
--- a/core/startos/bindings/WifiInfo.ts
+++ b/core/startos/bindings/WifiInfo.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type WifiInfo = {
-  interface: string;
+  interface: string | null;
   ssids: Array<string>;
   selected: string | null;
-  connected: string | null;
+  lastRegion: string | null;
 };
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 41aaeca7b..4753a4290 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -96,11 +96,7 @@ pub async fn recover_full_embassy(
     .with_kind(ErrorKind::PasswordHashGeneration)?;
 
     let db = ctx.db().await?;
-    db.put(
-        &ROOT,
-        &Database::init(&os_backup.account, ctx.config.wifi_interface.clone())?,
-    )
-    .await?;
+    db.put(&ROOT, &Database::init(&os_backup.account)?).await?;
     drop(db);
 
     init(&ctx.config).await?;
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
index 55065e816..0e6d9feff 100644
--- a/core/startos/src/context/config.rs
+++ b/core/startos/src/context/config.rs
@@ -91,8 +91,6 @@ impl ClientConfig {
 pub struct ServerConfig {
     #[arg(short = 'c', long = "config")]
     pub config: Option<PathBuf>,
-    #[arg(long = "wifi-interface")]
-    pub wifi_interface: Option<String>,
     #[arg(long = "ethernet-interface")]
     pub ethernet_interface: Option<String>,
     #[arg(skip)]
@@ -117,7 +115,6 @@ impl ContextConfig for ServerConfig {
         self.config.take()
     }
     fn merge_with(&mut self, other: Self) {
-        self.wifi_interface = self.wifi_interface.take().or(other.wifi_interface);
         self.ethernet_interface = self.ethernet_interface.take().or(other.ethernet_interface);
         self.os_partitions = self.os_partitions.take().or(other.os_partitions);
         self.bind_rpc = self.bind_rpc.take().or(other.bind_rpc);
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index a51e23b08..5adab5e58 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -26,7 +26,7 @@ use crate::init::check_time_is_synchronized;
 use crate::lxc::{LxcContainer, LxcManager};
 use crate::middleware::auth::HashSessionToken;
 use crate::net::net_controller::NetController;
-use crate::net::utils::find_eth_iface;
+use crate::net::utils::{find_eth_iface, find_wifi_iface};
 use crate::net::wifi::WpaCli;
 use crate::prelude::*;
 use crate::service::ServiceMap;
@@ -132,6 +132,8 @@ impl RpcContext {
             });
         }
 
+        let wifi_interface = find_wifi_iface().await?;
+
         let seed = Arc::new(RpcContextSeed {
             is_closed: AtomicBool::new(false),
             datadir: config.datadir().to_path_buf(),
@@ -141,7 +143,7 @@ impl RpcContext {
                     ErrorKind::Filesystem,
                 )
             })?,
-            wifi_interface: config.wifi_interface.clone(),
+            wifi_interface: wifi_interface.clone(),
             ethernet_interface: if let Some(eth) = config.ethernet_interface.clone() {
                 eth
             } else {
@@ -158,8 +160,7 @@ impl RpcContext {
             lxc_manager: Arc::new(LxcManager::new()),
             open_authed_websockets: Mutex::new(BTreeMap::new()),
             rpc_stream_continuations: Mutex::new(BTreeMap::new()),
-            wifi_manager: config
-                .wifi_interface
+            wifi_manager: wifi_interface
                 .clone()
                 .map(|i| Arc::new(RwLock::new(WpaCli::init(i)))),
             current_secret: Arc::new(
diff --git a/core/startos/src/db/model/mod.rs b/core/startos/src/db/model/mod.rs
index 8b959cdfd..cae1bfe51 100644
--- a/core/startos/src/db/model/mod.rs
+++ b/core/startos/src/db/model/mod.rs
@@ -27,9 +27,9 @@ pub struct Database {
     pub private: Private,
 }
 impl Database {
-    pub fn init(account: &AccountInfo, wifi_interface: Option<String>) -> Result<Self, Error> {
+    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
         Ok(Self {
-            public: Public::init(account, wifi_interface)?,
+            public: Public::init(account)?,
             private: Private {
                 key_store: KeyStore::new(account)?,
                 password: account.password.clone(),
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index 5b83eb74d..a51303cf4 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 use std::net::{Ipv4Addr, Ipv6Addr};
 
 use chrono::{DateTime, Utc};
@@ -35,7 +35,7 @@ pub struct Public {
     pub ui: Value,
 }
 impl Public {
-    pub fn init(account: &AccountInfo, wifi_interface: Option<String>) -> Result<Self, Error> {
+    pub fn init(account: &AccountInfo) -> Result<Self, Error> {
         let lan_address = account.hostname.lan_address().parse().unwrap();
         Ok(Self {
             server_info: ServerInfo {
@@ -45,7 +45,6 @@ impl Public {
                 version: Current::new().semver().into(),
                 hostname: account.hostname.no_dot_host_name(),
                 last_backup: None,
-                last_wifi_region: None,
                 eos_version_compat: Current::new().compat().clone(),
                 lan_address,
                 onion_address: account.tor_key.public().get_onion_address(),
@@ -60,12 +59,7 @@ impl Public {
                     shutting_down: false,
                     restarting: false,
                 },
-                wifi: wifi_interface.map(|interface| WifiInfo {
-                    interface,
-                    ssids: Vec::new(),
-                    connected: None,
-                    selected: None,
-                }),
+                wifi: WifiInfo::default(),
                 unread_notification_count: 0,
                 password_hash: account.password.clone(),
                 pubkey: ssh_key::PublicKey::from(&account.ssh_key)
@@ -117,9 +111,6 @@ pub struct ServerInfo {
     pub version: Version,
     #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
-    /// Used in the wifi to determine the region to set the system to
-    #[ts(type = "string | null")]
-    pub last_wifi_region: Option<CountryCode>,
     #[ts(type = "string")]
     pub eos_version_compat: VersionRange,
     #[ts(type = "string")]
@@ -132,7 +123,7 @@ pub struct ServerInfo {
     pub ip_info: BTreeMap<String, IpInfo>,
     #[serde(default)]
     pub status_info: ServerStatus,
-    pub wifi: Option<WifiInfo>,
+    pub wifi: WifiInfo,
     #[ts(type = "number")]
     pub unread_notification_count: u64,
     pub password_hash: String,
@@ -202,15 +193,16 @@ pub struct UpdateProgress {
     pub downloaded: u64,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct WifiInfo {
-    pub interface: String,
-    pub ssids: Vec<String>,
+    pub interface: Option<String>,
+    pub ssids: BTreeSet<String>,
     pub selected: Option<String>,
-    pub connected: Option<String>,
+    #[ts(type = "string | null")]
+    pub last_region: Option<CountryCode>,
 }
 
 #[derive(Debug, Deserialize, Serialize, TS)]
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index d1d5a9943..3f7d7f1bc 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -232,15 +232,12 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
         .invoke(crate::ErrorKind::OpenSsl)
         .await?;
 
-    if let Some(wifi_interface) = &cfg.wifi_interface {
-        crate::net::wifi::synchronize_wpa_supplicant_conf(
-            &cfg.datadir().join("main"),
-            wifi_interface,
-            &server_info.last_wifi_region,
-        )
-        .await?;
-        tracing::info!("Synchronized WiFi");
-    }
+    crate::net::wifi::synchronize_wpa_supplicant_conf(
+        &cfg.datadir().join("main"),
+        &mut server_info.wifi,
+    )
+    .await?;
+    tracing::info!("Synchronized WiFi");
 
     let should_rebuild = tokio::fs::metadata(SYSTEM_REBUILD_PATH).await.is_ok()
         || &*server_info.version < &emver::Version::new(0, 3, 2, 0)
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index 9de177bfe..93f610a42 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -16,6 +16,8 @@ use tracing::instrument;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
+use crate::db::model::public::WifiInfo;
+use crate::net::utils::find_wifi_iface;
 use crate::prelude::*;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::util::Invoke;
@@ -137,6 +139,18 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
             ErrorKind::Wifi,
         ));
     }
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_server_info_mut()
+                .as_wifi_mut()
+                .as_ssids_mut()
+                .mutate(|s| {
+                    s.insert(ssid);
+                    Ok(())
+                })
+        })
+        .await?;
     Ok(())
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
@@ -190,6 +204,17 @@ pub async fn connect(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result
             ErrorKind::Wifi,
         ));
     }
+
+    ctx.db
+        .mutate(|db| {
+            let wifi = db.as_public_mut().as_server_info_mut().as_wifi_mut();
+            wifi.as_ssids_mut().mutate(|s| {
+                s.insert(ssid.clone());
+                Ok(())
+            })?;
+            wifi.as_selected_mut().ser(&Some(ssid))
+        })
+        .await?;
     Ok(())
 }
 
@@ -215,11 +240,23 @@ pub async fn delete(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<
     }
 
     wpa_supplicant.remove_network(ctx.db.clone(), &ssid).await?;
+
+    ctx.db
+        .mutate(|db| {
+            let wifi = db.as_public_mut().as_server_info_mut().as_wifi_mut();
+            wifi.as_ssids_mut().mutate(|s| {
+                s.remove(&ssid.0);
+                Ok(())
+            })?;
+            wifi.as_selected_mut()
+                .map_mutate(|s| Ok(s.filter(|s| s == &ssid.0)))
+        })
+        .await?;
     Ok(())
 }
 #[derive(serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WiFiInfo {
+pub struct WifiListInfo {
     ssids: HashMap<Ssid, SignalStrength>,
     connected: Option<Ssid>,
     country: Option<CountryCode>,
@@ -228,7 +265,7 @@ pub struct WiFiInfo {
 }
 #[derive(serde::Serialize, serde::Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
-pub struct WifiListInfo {
+pub struct WifiListInfoLow {
     strength: SignalStrength,
     security: Vec<String>,
 }
@@ -239,8 +276,8 @@ pub struct WifiListOut {
     strength: SignalStrength,
     security: Vec<String>,
 }
-pub type WifiList = HashMap<Ssid, WifiListInfo>;
-fn display_wifi_info(params: WithIoFormat<Empty>, info: WiFiInfo) {
+pub type WifiList = HashMap<Ssid, WifiListInfoLow>;
+fn display_wifi_info(params: WithIoFormat<Empty>, info: WifiListInfo) {
     use prettytable::*;
 
     if let Some(format) = params.format {
@@ -330,7 +367,7 @@ fn display_wifi_list(params: WithIoFormat<Empty>, info: Vec<WifiListOut>) {
 
 // #[command(display(display_wifi_info))]
 #[instrument(skip_all)]
-pub async fn get(ctx: RpcContext, _: Empty) -> Result<WiFiInfo, Error> {
+pub async fn get(ctx: RpcContext, _: Empty) -> Result<WifiListInfo, Error> {
     let wifi_manager = wifi_manager(&ctx)?;
     let wpa_supplicant = wifi_manager.read().await;
     let (list_networks, current_res, country_res, ethernet_res, signal_strengths) = tokio::join!(
@@ -368,7 +405,7 @@ pub async fn get(ctx: RpcContext, _: Empty) -> Result<WiFiInfo, Error> {
         })
         .collect();
     let current = current_res?;
-    Ok(WiFiInfo {
+    Ok(WifiListInfo {
         ssids,
         connected: current,
         country: country_res?,
@@ -477,7 +514,7 @@ impl SignalStrength {
 }
 
 #[derive(Debug, Clone)]
-pub struct WifiInfo {
+pub struct WifiInfoLow {
     ssid: Ssid,
     device: Option<String>,
 }
@@ -604,7 +641,7 @@ impl WpaCli {
         Ok(())
     }
     #[instrument(skip_all)]
-    pub async fn list_networks_low(&self) -> Result<BTreeMap<NetworkId, WifiInfo>, Error> {
+    pub async fn list_networks_low(&self) -> Result<BTreeMap<NetworkId, WifiInfoLow>, Error> {
         let r = Command::new("nmcli")
             .arg("-t")
             .arg("c")
@@ -623,13 +660,13 @@ impl WpaCli {
                 if !connection_type.contains("wireless") {
                     return None;
                 }
-                let info = WifiInfo {
+                let info = WifiInfoLow {
                     ssid: name,
                     device: device.map(|x| x.to_owned()),
                 };
                 Some((uuid, info))
             })
-            .collect::<BTreeMap<NetworkId, WifiInfo>>())
+            .collect::<BTreeMap<NetworkId, WifiInfoLow>>())
     }
 
     #[instrument(skip_all)]
@@ -652,7 +689,7 @@ impl WpaCli {
                     values.next()?.split(' ').map(|x| x.to_owned()).collect();
                 Some((
                     ssid,
-                    WifiListInfo {
+                    WifiListInfoLow {
                         strength: signal,
                         security,
                     },
@@ -686,7 +723,8 @@ impl WpaCli {
         db.mutate(|d| {
             d.as_public_mut()
                 .as_server_info_mut()
-                .as_last_wifi_region_mut()
+                .as_wifi_mut()
+                .as_last_region_mut()
                 .ser(&new_country)
         })
         .await
@@ -837,9 +875,12 @@ impl TypedValueParser for CountryCodeParser {
 #[instrument(skip_all)]
 pub async fn synchronize_wpa_supplicant_conf<P: AsRef<Path>>(
     main_datadir: P,
-    wifi_iface: &str,
-    last_country_code: &Option<CountryCode>,
+    wifi: &mut WifiInfo,
 ) -> Result<(), Error> {
+    wifi.interface = find_wifi_iface().await?;
+    let Some(wifi_iface) = &wifi.interface else {
+        return Ok(());
+    };
     let persistent = main_datadir.as_ref().join("system-connections");
     tracing::debug!("persistent: {:?}", persistent);
     // let supplicant = Path::new("/etc/wpa_supplicant.conf");
@@ -863,7 +904,7 @@ pub async fn synchronize_wpa_supplicant_conf<P: AsRef<Path>>(
         .arg("up")
         .invoke(ErrorKind::Wifi)
         .await?;
-    if let Some(last_country_code) = last_country_code {
+    if let Some(last_country_code) = wifi.last_region {
         tracing::info!("Setting the region");
         let _ = Command::new("iw")
             .arg("reg")
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 0abd1d23e..4bbbe70a6 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -17,7 +17,7 @@ use crate::disk::mount::filesystem::{MountType, ReadWrite};
 use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::disk::util::{DiskInfo, PartitionTable};
 use crate::disk::OsPartitionInfo;
-use crate::net::utils::{find_eth_iface, find_wifi_iface};
+use crate::net::utils::find_eth_iface;
 use crate::util::serde::IoFormat;
 use crate::util::Invoke;
 use crate::ARCH;
@@ -140,7 +140,6 @@ pub async fn execute(
             )
         })?;
     let eth_iface = find_eth_iface().await?;
-    let wifi_iface = find_wifi_iface().await?;
 
     overwrite |= disk.guid.is_none() && disk.partitions.iter().all(|p| p.guid.is_none());
 
@@ -260,7 +259,6 @@ pub async fn execute(
         IoFormat::Yaml.to_vec(&ServerConfig {
             os_partitions: Some(part_info.clone()),
             ethernet_interface: Some(eth_iface),
-            wifi_interface: wifi_iface,
             ..Default::default()
         })?,
     )
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index b8b761e69..9120544e3 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -419,11 +419,7 @@ async fn fresh_setup(
 ) -> Result<(Hostname, OnionAddressV3, X509), Error> {
     let account = AccountInfo::new(start_os_password, root_ca_start_time().await?)?;
     let db = ctx.db().await?;
-    db.put(
-        &ROOT,
-        &Database::init(&account, ctx.config.wifi_interface.clone())?,
-    )
-    .await?;
+    db.put(&ROOT, &Database::init(&account)?).await?;
     drop(db);
     init(&ctx.config).await?;
     Ok((
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 446bf2424..ed0edacbe 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -55,7 +55,6 @@ export const mockPatchData: DataModel = {
         ipv6Range: 'FE80:CD00:0000:0CDE:1257:0000:211E:729CD/64',
       },
     },
-    lastWifiRegion: null,
     unreadNotificationCount: 4,
     // password is asdfasdf
     passwordHash:
@@ -79,7 +78,7 @@ export const mockPatchData: DataModel = {
       interface: 'wlan0',
       ssids: [],
       selected: null,
-      connected: null,
+      lastRegion: null,
     },
   },
   packageData: {

From 932b53d92d6118b37faad83190af0cad48a42ca5 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Tue, 9 Apr 2024 21:06:06 -0600
Subject: [PATCH 138/341] deprecate wifi

---
 web/package-lock.json                         |  4 +--
 .../ui/src/app/app/menu/menu.component.html   |  6 +++++
 .../ui/src/app/app/menu/menu.component.ts     |  2 ++
 .../server-show/server-show.page.html         |  4 +--
 .../server-show/server-show.page.ts           |  3 ++-
 .../pages/server-routes/wifi/wifi.page.html   | 27 ++++++++++---------
 .../app/pages/server-routes/wifi/wifi.page.ts | 12 ++++++++-
 7 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 90a6ad58d..68156eb21 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "startos-ui",
-  "version": "0.3.5.1",
+  "version": "0.3.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "startos-ui",
-      "version": "0.3.5.1",
+      "version": "0.3.5.2",
       "dependencies": {
         "@angular/animations": "^14.1.0",
         "@angular/common": "^14.1.0",
diff --git a/web/projects/ui/src/app/app/menu/menu.component.html b/web/projects/ui/src/app/app/menu/menu.component.html
index 6db19dea6..0814c81ad 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.html
+++ b/web/projects/ui/src/app/app/menu/menu.component.html
@@ -22,6 +22,12 @@
       <ion-label class="label montserrat" routerLinkActive="label_selected">
         {{ page.title }}
       </ion-label>
+      <ion-icon
+        *ngIf="page.url === '/system' && (wifiConnected$ | async)"
+        color="warning"
+        size="small"
+        name="warning"
+      ></ion-icon>
       <ion-icon
         *ngIf="page.url === '/system' && (showEOSUpdate$ | async)"
         color="success"
diff --git a/web/projects/ui/src/app/app/menu/menu.component.ts b/web/projects/ui/src/app/app/menu/menu.component.ts
index 7a7eb5d29..5c1fbe8bd 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.ts
+++ b/web/projects/ui/src/app/app/menu/menu.component.ts
@@ -64,6 +64,8 @@ export class MenuComponent {
     'unreadNotificationCount',
   )
 
+  readonly wifiConnected$ = this.patch.watch$('serverInfo', 'wifi', 'selected')
+
   readonly snekScore$ = this.patch.watch$('ui', 'gaming', 'snake', 'highScore')
 
   readonly showEOSUpdate$ = this.eosService.showUpdate$
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
index 02cba9052..01ecf897e 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -50,7 +50,8 @@ <h2 style="font-weight: bold">Clock sync failure</h2>
       <ion-item
         *ngFor="let button of cat.value"
         button
-        [style.display]="(button.title === 'Repair Disk' && !(showDiskRepair$ | async)) ? 'none' : 'block'"
+        [style.display]="((button.title === 'Repair Disk' && !(showDiskRepair$ | async))) || (button.title === 'WiFi' && !(wifiConnected$ | async)) ? 'none' : 'block'"
+        [color]="button.title === 'WiFi' ? 'warning' : ''"
         [detail]="button.detail"
         [disabled]="button.disabled$ | async"
         (click)="button.action()"
@@ -59,7 +60,6 @@ <h2 style="font-weight: bold">Clock sync failure</h2>
         <ion-label>
           <h2>{{ button.title }}</h2>
           <p *ngIf="button.description">{{ button.description }}</p>
-
           <!-- "Create Backup" button only -->
           <p *ngIf="button.title === 'Create Backup'">
             <ng-container *ngIf="server.statusInfo as statusInfo">
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index b479f1750..73763578e 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -40,6 +40,7 @@ export class ServerShowPage {
   readonly server$ = this.patch.watch$('serverInfo')
   readonly showUpdate$ = this.eosService.showUpdate$
   readonly showDiskRepair$ = this.ClientStorageService.showDiskRepair$
+  readonly wifiConnected$ = this.patch.watch$('serverInfo', 'wifi', 'selected')
 
   constructor(
     private readonly alertCtrl: AlertController,
@@ -553,7 +554,7 @@ export class ServerShowPage {
       },
       {
         title: 'WiFi',
-        description: 'Add or remove WiFi networks',
+        description: 'WiFi is deprecated. Click to learn more.',
         icon: 'wifi',
         action: () =>
           this.navCtrl.navigateForward(['wifi'], { relativeTo: this.route }),
diff --git a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
index 011704cc2..08387fcbc 100644
--- a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -16,21 +16,22 @@
 <ion-content class="ion-padding-top with-widgets">
   <ion-item-group>
     <!-- always -->
-    <ion-item>
+    <ion-item color="warning" class="ion-margin">
+      <ion-icon slot="start" name="warning-outline"></ion-icon>
       <ion-label>
-        <h2>
-          Adding WiFi credentials to your StartOS allows you to remove the
-          Ethernet cable and move the device anywhere you want. StartOS will
-          automatically connect to available networks.
-          <a
-            href="https://docs.start9.com/0.3.5.x/user-manual/wifi"
-            target="_blank"
-            rel="noreferrer"
-          >
-            View instructions
-          </a>
-        </h2>
+        <h2 style="font-weight: bold">WiFi is deprecated</h2>
+        <p style="font-weight: 600">
+          WiFi will be eliminated from StartOS in version v0.4.0, expected soon.
+          Before then, we highly recommend switching your server to a direct,
+          Ethernet connection, which is faster and more reliable. If using
+          Ethernet is not possible for you, we recommend using a WiFi extender
+          instead.
+        </p>
       </ion-label>
+      <ion-button slot="end" color="light" (click)="openDocs()">
+        Learn More
+        <ion-icon slot="end" name="open-outline"></ion-icon>
+      </ion-button>
     </ion-item>
 
     <ion-item-divider>Country</ion-item-divider>
diff --git a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
index bac270613..e6d5da252 100644
--- a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core'
+import { Component, Inject } from '@angular/core'
 import {
   ActionSheetController,
   AlertController,
@@ -14,6 +14,7 @@ import { RR } from 'src/app/services/api/api.types'
 import { pauseFor, ErrorToastService } from '@start9labs/shared'
 import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
 import { ConfigService } from 'src/app/services/config.service'
+import { WINDOW } from '@ng-web-apis/common'
 
 @Component({
   selector: 'wifi',
@@ -36,12 +37,21 @@ export class WifiPage {
     private readonly errToast: ErrorToastService,
     private readonly actionCtrl: ActionSheetController,
     private readonly config: ConfigService,
+    @Inject(WINDOW) private readonly windowRef: Window,
   ) {}
 
   async ngOnInit() {
     await this.getWifi()
   }
 
+  async openDocs() {
+    this.windowRef.open(
+      'https://docs.start9.com/user-manual/wifi.html',
+      '_blank',
+      'noreferrer',
+    )
+  }
+
   async getWifi(timeout: number = 0): Promise<void> {
     this.loading = true
     try {

From 711c82472c072609323b3d9653ffb695ebec956f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 15 Apr 2024 10:00:56 -0600
Subject: [PATCH 139/341] Feature/debian runtime (#2600)

* wip

* fix build

* run debian update in systemd-nspawn

* bugfix

* fix build

* free up space before image build
---
 .github/workflows/startos-iso.yaml            |  8 +++-
 Makefile                                      |  8 ++--
 container-runtime/Dockerfile                  |  4 --
 container-runtime/container-runtime.service   |  9 ++++
 container-runtime/containerRuntime.rc         | 10 ----
 container-runtime/deb-install.sh              | 19 ++++++++
 container-runtime/download-base-image.sh      |  6 +--
 .../Systems/SystemForEmbassy/MainLoop.ts      | 47 +++++++++++++++++++
 .../Systems/SystemForEmbassy/matchManifest.ts | 25 +++++++---
 container-runtime/update-image.sh             | 21 ++++-----
 .../src/service/service_effect_handler.rs     | 16 +++++--
 dpkg-build.sh                                 |  1 +
 patch-db                                      |  2 +-
 13 files changed, 131 insertions(+), 45 deletions(-)
 delete mode 100644 container-runtime/Dockerfile
 create mode 100644 container-runtime/container-runtime.service
 delete mode 100644 container-runtime/containerRuntime.rc
 create mode 100644 container-runtime/deb-install.sh

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 184c2b0c7..7d4a43685 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -82,8 +82,8 @@ jobs:
       - name: Set up docker QEMU
         uses: docker/setup-qemu-action@v2
 
-      - name: Set up system QEMU
-        run: sudo apt-get update && sudo apt-get install -y qemu-user-static
+      - name: Set up system dependencies
+        run: sudo apt-get update && sudo apt-get install -y qemu-user-static systemd-container
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -140,6 +140,10 @@ jobs:
           }')[matrix.platform]
         }}
     steps:
+      - name: Free space
+        run: rm -rf /opt/hostedtoolcache*
+        if: ${{ github.event.inputs.runner != 'fast' }}
+
       - uses: actions/checkout@v3
         with:
           submodules: recursive
diff --git a/Makefile b/Makefile
index c988b11b8..e1ba4ed53 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client
 GZIP_BIN := $(shell which pigz || which gzip)
 TAR_BIN := $(shell which gtar || which tar)
 COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar container-runtime/rootfs.$(ARCH).squashfs
-ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) sdk/lib/test 
+ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) 
 
 ifeq ($(REMOTE),)
 	mkdir = mkdir -p $1
@@ -103,7 +103,7 @@ deb: results/$(BASENAME).deb
 debian/control: build/lib/depends build/lib/conflicts
 	./debuild/control.sh
 
-results/$(BASENAME).deb: dpkg-build.sh $(DEBIAN_SRC) $(VERSION_FILE) $(PLATFORM_FILE) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE)
+results/$(BASENAME).deb: dpkg-build.sh $(DEBIAN_SRC) $(ALL_TARGETS)
 	PLATFORM=$(PLATFORM) ./dpkg-build.sh
 
 $(IMAGE_TYPE): results/$(BASENAME).$(IMAGE_TYPE)
@@ -173,7 +173,7 @@ emulate-reflash: $(ALL_TARGETS)
 upload-ota: results/$(BASENAME).squashfs
 	TARGET=$(TARGET) KEY=$(KEY) ./upload-ota.sh
 
-container-runtime/alpine.$(ARCH).squashfs:
+container-runtime/debian.$(ARCH).squashfs:
 	ARCH=$(ARCH) ./container-runtime/download-base-image.sh
 
 container-runtime/node_modules: container-runtime/package.json container-runtime/package-lock.json sdk/dist
@@ -197,7 +197,7 @@ container-runtime/dist/node_modules container-runtime/dist/package.json containe
 	./container-runtime/install-dist-deps.sh
 	touch container-runtime/dist/node_modules
 
-container-runtime/rootfs.$(ARCH).squashfs: container-runtime/alpine.$(ARCH).squashfs container-runtime/containerRuntime.rc container-runtime/update-image.sh container-runtime/dist/index.js container-runtime/dist/node_modules core/target/$(ARCH)-unknown-linux-musl/release/containerbox | sudo
+container-runtime/rootfs.$(ARCH).squashfs: container-runtime/debian.$(ARCH).squashfs container-runtime/container-runtime.service container-runtime/update-image.sh container-runtime/deb-install.sh container-runtime/dist/index.js container-runtime/dist/node_modules core/target/$(ARCH)-unknown-linux-musl/release/containerbox | sudo
 	ARCH=$(ARCH) ./container-runtime/update-image.sh
 
 build/lib/depends build/lib/conflicts: build/dpkg-deps/*
diff --git a/container-runtime/Dockerfile b/container-runtime/Dockerfile
deleted file mode 100644
index f936ee11b..000000000
--- a/container-runtime/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM node:18-alpine
-
-ADD ./startInit.js /usr/local/lib/startInit.js
-ADD ./entrypoint.sh /usr/local/bin/entrypoint.sh
\ No newline at end of file
diff --git a/container-runtime/container-runtime.service b/container-runtime/container-runtime.service
new file mode 100644
index 000000000..b9d5ec5ae
--- /dev/null
+++ b/container-runtime/container-runtime.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=StartOS Container Runtime
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/node --experimental-detect-module --unhandled-rejections=warn /usr/lib/startos/init/index.js
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/container-runtime/containerRuntime.rc b/container-runtime/containerRuntime.rc
deleted file mode 100644
index 203b99659..000000000
--- a/container-runtime/containerRuntime.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/sbin/openrc-run
-
-name=containerRuntime
-#cfgfile="/etc/containerRuntime/containerRuntime.conf"
-command="/usr/bin/node"
-command_args="--experimental-detect-module --unhandled-rejections=warn /usr/lib/startos/init/index.js"
-pidfile="/run/containerRuntime.pid"
-command_background="yes"
-output_log="/var/log/containerRuntime.log"
-error_log="/var/log/containerRuntime.err"
diff --git a/container-runtime/deb-install.sh b/container-runtime/deb-install.sh
new file mode 100644
index 000000000..9a64dbbdd
--- /dev/null
+++ b/container-runtime/deb-install.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p /run/systemd/resolve
+echo "nameserver 8.8.8.8" > /run/systemd/resolve/stub-resolv.conf
+
+apt-get update
+apt-get install -y curl rsync
+
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+source ~/.bashrc
+nvm install 20
+
+ln -s $(which node) /usr/bin/node
+
+systemctl enable container-runtime.service
+
+rm -rf /run/systemd
\ No newline at end of file
diff --git a/container-runtime/download-base-image.sh b/container-runtime/download-base-image.sh
index 23a140ea5..f7dc4c844 100755
--- a/container-runtime/download-base-image.sh
+++ b/container-runtime/download-base-image.sh
@@ -4,8 +4,8 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 set -e
 
-DISTRO=alpine
-VERSION=3.19
+DISTRO=debian
+VERSION=bookworm
 ARCH=${ARCH:-$(uname -m)}
 FLAVOR=default
 
@@ -16,4 +16,4 @@ elif [ "$_ARCH" = "aarch64" ]; then
     _ARCH=arm64
 fi
 
-curl https://images.linuxcontainers.org/$(curl --silent https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$_ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs --output alpine.${ARCH}.squashfs
\ No newline at end of file
+curl https://images.linuxcontainers.org/$(curl --silent https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$_ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs --output debian.${ARCH}.squashfs
\ No newline at end of file
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index f2bcc5eba..c28615fc9 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -40,6 +40,7 @@ export class MainLoop {
       ...system.manifest.main.args,
     ]
 
+    await this.setupInterfaces(effects)
     await effects.setMainStatus({ status: "running" })
     const jsMain = (this.system.moduleCode as any)?.jsMain
     const dockerProcedureContainer = await DockerProcedureContainer.of(
@@ -69,6 +70,52 @@ export class MainLoop {
     }
   }
 
+  private async setupInterfaces(effects: HostSystemStartOs) {
+    for (const interfaceId in this.system.manifest.interfaces) {
+      const iface = this.system.manifest.interfaces[interfaceId]
+      const internalPorts = new Set<number>()
+      for (const port of Object.values(
+        iface["tor-config"]?.["port-mapping"] || {},
+      )) {
+        internalPorts.add(parseInt(port))
+      }
+      for (const port of Object.values(iface["lan-config"] || {})) {
+        internalPorts.add(port.internal)
+      }
+      for (const internalPort of internalPorts) {
+        const torConf = Object.entries(
+          iface["tor-config"]?.["port-mapping"] || {},
+        )
+          .map(([external, internal]) => ({
+            internal: parseInt(internal),
+            external: parseInt(external),
+          }))
+          .find((conf) => conf.internal == internalPort)
+        const lanConf = Object.entries(iface["lan-config"] || {})
+          .map(([external, conf]) => ({
+            external: parseInt(external),
+            ...conf,
+          }))
+          .find((conf) => conf.internal == internalPort)
+        await effects.bind({
+          kind: "multi",
+          id: interfaceId,
+          internalPort,
+          preferredExternalPort: torConf?.external || internalPort,
+          scheme: "http",
+          secure: null,
+          addSsl: lanConf?.ssl
+            ? {
+                scheme: "https",
+                preferredExternalPort: lanConf.external,
+                alpn: { specified: ["http/1.1"] },
+              }
+            : null,
+        })
+      }
+    }
+  }
+
   public async clean(options?: { timeout?: number }) {
     const { mainEvent, healthLoops } = this
     const main = await mainEvent
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
index 9b70f884b..85cd1bac3 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
@@ -68,13 +68,24 @@ export const matchManifest = object(
     volumes: dictionary([string, matchVolume]),
     interfaces: dictionary([
       string,
-      object({
-        name: string,
-        "tor-config": object({}),
-        "lan-config": object({}),
-        ui: boolean,
-        protocols: array(string),
-      }),
+      object(
+        {
+          name: string,
+          "tor-config": object({
+            "port-mapping": dictionary([string, string]),
+          }),
+          "lan-config": dictionary([
+            string,
+            object({
+              ssl: boolean,
+              internal: number,
+            }),
+          ]),
+          ui: boolean,
+          protocols: array(string),
+        },
+        ["lan-config", "tor-config"],
+      ),
     ]),
     backup: object({
       create: matchProcedure,
diff --git a/container-runtime/update-image.sh b/container-runtime/update-image.sh
index bef525b3b..1c571408a 100755
--- a/container-runtime/update-image.sh
+++ b/container-runtime/update-image.sh
@@ -4,12 +4,11 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 set -e
 
-
-
-if mountpoint tmp/combined; then sudo umount tmp/combined; fi
+if mountpoint tmp/combined; then sudo umount -R tmp/combined; fi
 if mountpoint tmp/lower; then sudo umount tmp/lower; fi
+sudo rm -rf tmp
 mkdir -p tmp/lower tmp/upper tmp/work tmp/combined
-sudo mount alpine.${ARCH}.squashfs tmp/lower
+sudo mount debian.${ARCH}.squashfs tmp/lower
 sudo mount -t overlay -olowerdir=tmp/lower,upperdir=tmp/upper,workdir=tmp/work overlay tmp/combined
 
 QEMU=
@@ -18,21 +17,21 @@ if [ "$ARCH" != "$(uname -m)" ]; then
     sudo cp $(which qemu-$ARCH-static) tmp/combined${QEMU}
 fi
 
-echo "nameserver 8.8.8.8" | sudo tee tmp/combined/etc/resolv.conf # TODO - delegate to host resolver?
-sudo chroot tmp/combined $QEMU /sbin/apk add nodejs rsync
 sudo mkdir -p tmp/combined/usr/lib/startos/
 sudo rsync -a --copy-unsafe-links dist/ tmp/combined/usr/lib/startos/init/
-sudo cp containerRuntime.rc tmp/combined/etc/init.d/containerRuntime
+sudo chown -R 0:0 tmp/combined/usr/lib/startos/
+sudo cp container-runtime.service tmp/combined/lib/systemd/system/container-runtime.service
+sudo chown 0:0 tmp/combined/lib/systemd/system/container-runtime.service
 sudo cp ../core/target/$ARCH-unknown-linux-musl/release/containerbox tmp/combined/usr/bin/start-cli
-sudo chmod +x tmp/combined/etc/init.d/containerRuntime
-sudo chroot tmp/combined $QEMU /sbin/rc-update add containerRuntime default
+sudo chown 0:0 tmp/combined/usr/bin/start-cli
+echo container-runtime | sha256sum | head -c 32 | cat - <(echo) | sudo tee tmp/combined/etc/machine-id
+cat deb-install.sh | sudo systemd-nspawn --console=pipe -D tmp/combined $QEMU /bin/bash
+sudo truncate -s 0 tmp/combined/etc/machine-id
 
 if [ -n "$QEMU" ]; then
     sudo rm tmp/combined${QEMU}
 fi
 
-sudo truncate -s 0 tmp/combined/etc/resolv.conf
-sudo chown -R 0:0 tmp/combined
 rm -f rootfs.${ARCH}.squashfs
 mkdir -p ../build/lib/container-runtime
 sudo mksquashfs tmp/combined rootfs.${ARCH}.squashfs
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 0effccd5e..6d0f87c53 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -326,7 +326,7 @@ async fn get_service_port_forward(
     data: GetServicePortForwardParams,
 ) -> Result<u16, Error> {
     let internal_port = data.internal_port as u16;
-    
+
     let context = context.deref()?;
     let net_service = context.persistent_container.net_service.lock().await;
     net_service.get_ext_port(data.host_id, internal_port)
@@ -446,8 +446,18 @@ struct BindParams {
     #[serde(flatten)]
     options: BindOptions,
 }
-async fn bind(_: AnyContext, BindParams { .. }: BindParams) -> Result<Value, Error> {
-    todo!()
+async fn bind(
+    context: EffectContext,
+    BindParams {
+        kind,
+        id,
+        internal_port,
+        options,
+    }: BindParams,
+) -> Result<(), Error> {
+    let ctx = context.deref()?;
+    let mut svc = ctx.persistent_container.net_service.lock().await;
+    svc.bind(kind, id, internal_port, options).await
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
diff --git a/dpkg-build.sh b/dpkg-build.sh
index e8ffdb0ac..783c205b3 100755
--- a/dpkg-build.sh
+++ b/dpkg-build.sh
@@ -17,6 +17,7 @@ fi
 rm -rf dpkg-workdir/$BASENAME
 mkdir -p dpkg-workdir/$BASENAME
 
+make
 make install DESTDIR=dpkg-workdir/$BASENAME
 
 DEPENDS=$(cat dpkg-workdir/$BASENAME/usr/lib/startos/depends | tr $'\n' ',' | sed 's/,,\+/,/g' | sed 's/,$//')
diff --git a/patch-db b/patch-db
index 3dc11afd4..e4a3f7b57 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 3dc11afd46d93094ac52ae1fef311a91c4561e8c
+Subproject commit e4a3f7b577df56c611b21d5ad03eb459e80fb919

From 9eff920989dc53550e14cbc2aeddad19edfbd90c Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 17 Apr 2024 15:46:10 -0600
Subject: [PATCH 140/341] Feat/logging (#2602)

* wip: Working on something to help

* chore: Add in some of the logging now

* chore: fix the type to interned instead of id

* wip

* wip

* chore: fix the logging by moving levels

* Apply suggestions from code review

* mount at machine id for journal

* Persistant

* limit log size

* feat: Actually logging and mounting now

* fix: Get the logs from the previous versions of the boot

* Chore: Add the boot id

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 container-runtime/RPCSpec.md                  |  34 +++-
 container-runtime/deb-install.sh              |   6 +-
 container-runtime/package.json                |   2 +-
 core/startos/src/context/rpc.rs               |   4 +-
 core/startos/src/logs.rs                      | 163 ++++++++++++------
 core/startos/src/lxc/mod.rs                   | 123 ++++++++++---
 core/startos/src/s9pk/v2/mod.rs               |   2 +-
 core/startos/src/service/mod.rs               |  58 ++++---
 .../src/service/persistent_container.rs       |  28 +--
 core/startos/src/service/service_map.rs       |   6 +-
 10 files changed, 307 insertions(+), 119 deletions(-)

diff --git a/container-runtime/RPCSpec.md b/container-runtime/RPCSpec.md
index 679671614..fd1014add 100644
--- a/container-runtime/RPCSpec.md
+++ b/container-runtime/RPCSpec.md
@@ -3,38 +3,61 @@
 ## Methods
 
 ### init
+
 initialize runtime (mount `/proc`, `/sys`, `/dev`, and `/run` to each image in `/media/images`)
 
 called after os has mounted js and images to the container
+
 #### args
+
 `[]`
+
 #### response
+
 `null`
 
 ### exit
+
 shutdown runtime
+
 #### args
+
 `[]`
+
 #### response
+
 `null`
 
 ### start
+
 run main method if not already running
+
 #### args
+
 `[]`
+
 #### response
+
 `null`
 
 ### stop
+
 stop main method by sending SIGTERM to child processes, and SIGKILL after timeout
+
 #### args
+
 `{ timeout: millis }`
+
 #### response
+
 `null`
 
 ### execute
+
 run a specific package procedure
-#### args 
+
+#### args
+
 ```ts
 {
     procedure: JsonPath,
@@ -42,12 +65,17 @@ run a specific package procedure
     timeout: millis,
 }
 ```
+
 #### response
+
 `any`
 
 ### sandbox
+
 run a specific package procedure in sandbox mode
-#### args 
+
+#### args
+
 ```ts
 {
     procedure: JsonPath,
@@ -55,5 +83,7 @@ run a specific package procedure in sandbox mode
     timeout: millis,
 }
 ```
+
 #### response
+
 `any`
diff --git a/container-runtime/deb-install.sh b/container-runtime/deb-install.sh
index 9a64dbbdd..b439c6308 100644
--- a/container-runtime/deb-install.sh
+++ b/container-runtime/deb-install.sh
@@ -11,9 +11,13 @@ apt-get install -y curl rsync
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 source ~/.bashrc
 nvm install 20
-
 ln -s $(which node) /usr/bin/node
 
+sed -i '/\(^\|#\)Storage=/c\Storage=persistent' /etc/systemd/journald.conf
+sed -i '/\(^\|#\)Compress=/c\Compress=yes' /etc/systemd/journald.conf
+sed -i '/\(^\|#\)SystemMaxUse=/c\SystemMaxUse=1G' /etc/systemd/journald.conf
+sed -i '/\(^\|#\)ForwardToSyslog=/c\ForwardToSyslog=no' /etc/systemd/journald.conf
+
 systemctl enable container-runtime.service
 
 rm -rf /run/systemd
\ No newline at end of file
diff --git a/container-runtime/package.json b/container-runtime/package.json
index 2fa407408..13cf14ed5 100644
--- a/container-runtime/package.json
+++ b/container-runtime/package.json
@@ -5,7 +5,7 @@
   "module": "./index.js",
   "scripts": {
     "check": "tsc --noEmit",
-    "build": "prettier --write '**/*.ts' && rm -rf dist && tsc",
+    "build": "prettier . '!tmp/**' --write && rm -rf dist && tsc",
     "tsc": "rm -rf dist; tsc"
   },
   "author": "",
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 5adab5e58..f2c859273 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -16,7 +16,6 @@ use tokio::time::Instant;
 use tracing::instrument;
 
 use super::setup::CURRENT_SECRET;
-use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
 use crate::core::rpc_continuations::{RequestGuid, RestHandler, RpcContinuation, WebSocketHandler};
 use crate::db::prelude::PatchDbExt;
@@ -33,6 +32,7 @@ use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
 use crate::system::get_mem_info;
 use crate::util::lshw::{lshw, LshwDevice};
+use crate::{account::AccountInfo, lxc::ContainerId};
 
 pub struct RpcContextSeed {
     is_closed: AtomicBool,
@@ -60,7 +60,7 @@ pub struct RpcContextSeed {
 }
 
 pub struct Dev {
-    pub lxc: Mutex<BTreeMap<InternedString, LxcContainer>>,
+    pub lxc: Mutex<BTreeMap<ContainerId, LxcContainer>>,
 }
 
 pub struct Hardware {
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 1cd84c331..99bfac250 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -18,15 +18,21 @@ use tokio_stream::wrappers::LinesStream;
 use tokio_tungstenite::tungstenite::Message;
 use tracing::instrument;
 
-use crate::context::{CliContext, RpcContext};
-use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::error::ResultExt;
 use crate::prelude::*;
 use crate::util::serde::Reversible;
+use crate::{
+    context::{CliContext, RpcContext},
+    lxc::ContainerId,
+};
+use crate::{
+    core::rpc_continuations::{RequestGuid, RpcContinuation},
+    util::Invoke,
+};
 
 #[pin_project::pin_project]
 pub struct LogStream {
-    _child: Child,
+    _child: Option<Child>,
     #[pin]
     entries: BoxStream<'static, Result<JournalctlEntry, Error>>,
 }
@@ -116,9 +122,11 @@ pub struct LogFollowResponse {
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct LogEntry {
     timestamp: DateTime<Utc>,
     message: String,
+    boot_id: String,
 }
 impl std::fmt::Display for LogEntry {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -141,6 +149,8 @@ pub struct JournalctlEntry {
     pub message: String,
     #[serde(rename = "__CURSOR")]
     pub cursor: String,
+    #[serde(rename = "_BOOT_ID")]
+    pub boot_id: String,
 }
 impl JournalctlEntry {
     fn log_entry(self) -> Result<(String, LogEntry), Error> {
@@ -151,6 +161,7 @@ impl JournalctlEntry {
                     UNIX_EPOCH + Duration::from_micros(self.timestamp.parse::<u64>()?),
                 ),
                 message: self.message,
+                boot_id: self.boot_id,
             },
         ))
     }
@@ -200,12 +211,12 @@ fn deserialize_log_message<'de, D: serde::de::Deserializer<'de>>(
 ///     --user-unit=UNIT        Show logs from the specified user unit))
 /// System: Unit is startd, but we also filter on the comm
 /// Container: Filtering containers, like podman/docker is done by filtering on the CONTAINER_NAME
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum LogSource {
     Kernel,
     Unit(&'static str),
     System,
-    Container(PackageId),
+    Container(ContainerId),
 }
 
 pub const SYSTEM_UNIT: &str = "startd";
@@ -276,7 +287,7 @@ pub async fn cli_logs(
     }
 }
 pub async fn logs_nofollow(
-    _ctx: (),
+    ctx: RpcContext,
     _: Empty,
     LogsParam {
         id,
@@ -286,14 +297,38 @@ pub async fn logs_nofollow(
         ..
     }: LogsParam,
 ) -> Result<LogResponse, Error> {
-    fetch_logs(LogSource::Container(id), limit, cursor, before).await
+    let container_id = ctx
+        .services
+        .get(&id)
+        .await
+        .as_ref()
+        .map(|x| x.container_id())
+        .ok_or_else(|| {
+            Error::new(
+                eyre!("No service found with id: {}", id),
+                ErrorKind::NotFound,
+            )
+        })??;
+    fetch_logs(LogSource::Container(container_id), limit, cursor, before).await
 }
 pub async fn logs_follow(
     ctx: RpcContext,
     _: Empty,
     LogsParam { id, limit, .. }: LogsParam,
 ) -> Result<LogFollowResponse, Error> {
-    follow_logs(ctx, LogSource::Container(id), limit).await
+    let container_id = ctx
+        .services
+        .get(&id)
+        .await
+        .as_ref()
+        .map(|x| x.container_id())
+        .ok_or_else(|| {
+            Error::new(
+                eyre!("No service found with id: {}", id),
+                ErrorKind::NotFound,
+            )
+        })??;
+    follow_logs(ctx, LogSource::Container(container_id), limit).await
 }
 
 pub async fn cli_logs_generic_nofollow(
@@ -358,7 +393,74 @@ pub async fn journalctl(
     before: bool,
     follow: bool,
 ) -> Result<LogStream, Error> {
-    let mut cmd = Command::new("journalctl");
+    let mut cmd = gen_journalctl_command(&id, limit);
+
+    let cursor_formatted = format!("--after-cursor={}", cursor.unwrap_or(""));
+    if cursor.is_some() {
+        cmd.arg(&cursor_formatted);
+        if before {
+            cmd.arg("--reverse");
+        }
+    }
+
+    let deserialized_entries = String::from_utf8(cmd.invoke(ErrorKind::Journald).await?)?
+        .lines()
+        .map(serde_json::from_str::<JournalctlEntry>)
+        .collect::<Result<Vec<_>, _>>()
+        .with_kind(ErrorKind::Deserialization)?;
+
+    if follow {
+        let mut follow_cmd = gen_journalctl_command(&id, limit);
+        follow_cmd.arg("-f");
+        if let Some(last) = deserialized_entries.last() {
+            cmd.arg(format!("--after-cursor={}", last.cursor));
+        }
+        let mut child = cmd.stdout(Stdio::piped()).spawn()?;
+        let out =
+            BufReader::new(child.stdout.take().ok_or_else(|| {
+                Error::new(eyre!("No stdout available"), crate::ErrorKind::Journald)
+            })?);
+
+        let journalctl_entries = LinesStream::new(out.lines());
+
+        let follow_deserialized_entries = journalctl_entries
+            .map_err(|e| Error::new(e, crate::ErrorKind::Journald))
+            .and_then(|s| {
+                futures::future::ready(
+                    serde_json::from_str::<JournalctlEntry>(&s)
+                        .with_kind(crate::ErrorKind::Deserialization),
+                )
+            });
+
+        let entries = futures::stream::iter(deserialized_entries)
+            .map(Ok)
+            .chain(follow_deserialized_entries)
+            .boxed();
+        Ok(LogStream {
+            _child: Some(child),
+            entries,
+        })
+    } else {
+        let entries = futures::stream::iter(deserialized_entries).map(Ok).boxed();
+
+        Ok(LogStream {
+            _child: None,
+            entries,
+        })
+    }
+}
+
+fn gen_journalctl_command(id: &LogSource, limit: usize) -> Command {
+    let mut cmd = match id {
+        LogSource::Container(container_id) => {
+            let mut cmd = Command::new("lxc-attach");
+            cmd.arg(format!("{}", container_id))
+                .arg("--")
+                .arg("journalctl");
+            cmd
+        }
+        _ => Command::new("journalctl"),
+    };
     cmd.kill_on_drop(true);
 
     cmd.arg("--output=json");
@@ -377,48 +479,11 @@ pub async fn journalctl(
             cmd.arg(SYSTEM_UNIT);
             cmd.arg(format!("_COMM={}", SYSTEM_UNIT));
         }
-        LogSource::Container(id) => {
-            #[cfg(not(feature = "docker"))]
-            cmd.arg(format!("SYSLOG_IDENTIFIER={}.embassy", id));
-            #[cfg(feature = "docker")]
-            cmd.arg(format!("CONTAINER_NAME={}.embassy", id));
+        LogSource::Container(_container_id) => {
+            cmd.arg("-u").arg("container-runtime.service");
         }
     };
-
-    let cursor_formatted = format!("--after-cursor={}", cursor.unwrap_or(""));
-    if cursor.is_some() {
-        cmd.arg(&cursor_formatted);
-        if before {
-            cmd.arg("--reverse");
-        }
-    }
-    if follow {
-        cmd.arg("--follow");
-    }
-
-    let mut child = cmd.stdout(Stdio::piped()).spawn()?;
-    let out = BufReader::new(
-        child
-            .stdout
-            .take()
-            .ok_or_else(|| Error::new(eyre!("No stdout available"), crate::ErrorKind::Journald))?,
-    );
-
-    let journalctl_entries = LinesStream::new(out.lines());
-
-    let deserialized_entries = journalctl_entries
-        .map_err(|e| Error::new(e, crate::ErrorKind::Journald))
-        .and_then(|s| {
-            futures::future::ready(
-                serde_json::from_str::<JournalctlEntry>(&s)
-                    .with_kind(crate::ErrorKind::Deserialization),
-            )
-        });
-
-    Ok(LogStream {
-        _child: child,
-        entries: deserialized_entries.boxed(),
-    })
+    cmd
 }
 
 #[instrument(skip_all)]
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 0ebefdd96..5a6e05500 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -5,9 +5,11 @@ use std::path::Path;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
+use clap::builder::ValueParserFactory;
 use clap::Parser;
 use futures::{AsyncWriteExt, FutureExt, StreamExt};
 use imbl_value::{InOMap, InternedString};
+use models::InvalidId;
 use rpc_toolkit::yajrc::{RpcError, RpcResponse};
 use rpc_toolkit::{
     from_fn_async, AnyContext, CallRemoteHandler, GenericRpcMethod, Handler, HandlerArgs,
@@ -28,10 +30,11 @@ use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
-use crate::disk::mount::filesystem::ReadWrite;
-use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
+use crate::disk::mount::filesystem::{MountType, ReadWrite};
+use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::disk::mount::util::unmount;
 use crate::prelude::*;
+use crate::util::clap::FromStrParser;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::{new_guid, Invoke};
 
@@ -41,18 +44,57 @@ pub const CONTAINER_RPC_SERVER_SOCKET: &str = "service.sock"; // must not be abs
 pub const HOST_RPC_SERVER_SOCKET: &str = "host.sock"; // must not be absolute path
 const CONTAINER_DHCP_TIMEOUT: Duration = Duration::from_secs(30);
 
+#[derive(
+    Clone, Debug, Serialize, Deserialize, Default, PartialEq, Eq, PartialOrd, Ord, Hash, TS,
+)]
+#[ts(type = "string")]
+pub struct ContainerId(InternedString);
+impl std::ops::Deref for ContainerId {
+    type Target = str;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl std::fmt::Display for ContainerId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", &*self.0)
+    }
+}
+impl TryFrom<&str> for ContainerId {
+    type Error = InvalidId;
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        Ok(ContainerId(InternedString::intern(value)))
+    }
+}
+impl std::str::FromStr for ContainerId {
+    type Err = InvalidId;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::try_from(s)
+    }
+}
+impl ValueParserFactory for ContainerId {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
+
+#[derive(Default)]
 pub struct LxcManager {
-    containers: Mutex<Vec<Weak<InternedString>>>,
+    containers: Mutex<Vec<Weak<ContainerId>>>,
 }
+
 impl LxcManager {
     pub fn new() -> Self {
-        Self {
-            containers: Default::default(),
-        }
+        Self::default()
     }
 
-    pub async fn create(self: &Arc<Self>, config: LxcConfig) -> Result<LxcContainer, Error> {
-        let container = LxcContainer::new(self, config).await?;
+    pub async fn create(
+        self: &Arc<Self>,
+        log_mount: Option<&Path>,
+        config: LxcConfig,
+    ) -> Result<LxcContainer, Error> {
+        let container = LxcContainer::new(self, log_mount, config).await?;
         let mut guard = self.containers.lock().await;
         *guard = std::mem::take(&mut *guard)
             .into_iter()
@@ -69,7 +111,7 @@ impl LxcManager {
                 .await
                 .iter()
                 .filter_map(|g| g.upgrade())
-                .map(|g| (&*g).clone()),
+                .map(|g| (*g).clone()),
         );
         for container in String::from_utf8(
             Command::new("lxc-ls")
@@ -80,7 +122,7 @@ impl LxcManager {
         .lines()
         .map(|s| s.trim())
         {
-            if !expected.contains(container) {
+            if !expected.contains(&ContainerId::try_from(container)?) {
                 let rootfs_path = Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs");
                 if tokio::fs::metadata(&rootfs_path).await.is_ok() {
                     unmount(Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs")).await?;
@@ -112,14 +154,20 @@ impl LxcManager {
 pub struct LxcContainer {
     manager: Weak<LxcManager>,
     rootfs: OverlayGuard,
-    guid: Arc<InternedString>,
+    pub guid: Arc<ContainerId>,
     rpc_bind: TmpMountGuard,
+    log_mount: Option<MountGuard>,
     config: LxcConfig,
     exited: bool,
 }
 impl LxcContainer {
-    async fn new(manager: &Arc<LxcManager>, config: LxcConfig) -> Result<Self, Error> {
+    async fn new(
+        manager: &Arc<LxcManager>,
+        log_mount: Option<&Path>,
+        config: LxcConfig,
+    ) -> Result<Self, Error> {
         let guid = new_guid();
+        let machine_id = hex::encode(rand::random::<[u8; 16]>());
         let container_dir = Path::new(LXC_CONTAINER_DIR).join(&*guid);
         tokio::fs::create_dir_all(&container_dir).await?;
         tokio::fs::write(
@@ -145,6 +193,7 @@ impl LxcContainer {
             &rootfs_dir,
         )
         .await?;
+        tokio::fs::write(rootfs_dir.join("etc/machine-id"), format!("{machine_id}\n")).await?;
         tokio::fs::write(rootfs_dir.join("etc/hostname"), format!("{guid}\n")).await?;
         Command::new("sed")
             .arg("-i")
@@ -166,6 +215,20 @@ impl LxcContainer {
             .arg(rpc_bind.path())
             .invoke(ErrorKind::Filesystem)
             .await?;
+        let log_mount = if let Some(path) = log_mount {
+            let log_mount_point = rootfs_dir.join("var/log/journal").join(machine_id);
+            let log_mount =
+                MountGuard::mount(&Bind::new(path), &log_mount_point, MountType::ReadWrite).await?;
+            Command::new("chown")
+                // This was needed as 100999 because the group id of journald
+                .arg("100000:100999")
+                .arg(&log_mount_point)
+                .invoke(crate::ErrorKind::Filesystem)
+                .await?;
+            Some(log_mount)
+        } else {
+            None
+        };
         Command::new("lxc-start")
             .arg("-d")
             .arg("--name")
@@ -175,10 +238,11 @@ impl LxcContainer {
         Ok(Self {
             manager: Arc::downgrade(manager),
             rootfs,
-            guid: Arc::new(guid),
+            guid: Arc::new(ContainerId::try_from(&*guid)?),
             rpc_bind,
             config,
             exited: false,
+            log_mount,
         })
     }
 
@@ -188,11 +252,12 @@ impl LxcContainer {
 
     pub async fn ip(&self) -> Result<Ipv4Addr, Error> {
         let start = Instant::now();
+        let guid: &str = &self.guid;
         loop {
             let output = String::from_utf8(
                 Command::new("lxc-info")
                     .arg("--name")
-                    .arg(&*self.guid)
+                    .arg(guid)
                     .arg("-iH")
                     .invoke(ErrorKind::Docker)
                     .await?,
@@ -218,6 +283,9 @@ impl LxcContainer {
     #[instrument(skip_all)]
     pub async fn exit(mut self) -> Result<(), Error> {
         self.rpc_bind.take().unmount().await?;
+        if let Some(log_mount) = self.log_mount.take() {
+            log_mount.unmount(true).await?;
+        }
         self.rootfs.take().unmount(true).await?;
         let rootfs_path = self.rootfs_dir();
         let err_path = rootfs_path.join("var/log/containerRuntime.err");
@@ -228,17 +296,16 @@ impl LxcContainer {
                 tracing::error!(container, "{}", line);
             }
         }
-        if tokio::fs::metadata(&rootfs_path).await.is_ok() {
-            if tokio_stream::wrappers::ReadDirStream::new(tokio::fs::read_dir(&rootfs_path).await?)
+        if tokio::fs::metadata(&rootfs_path).await.is_ok()
+            && tokio_stream::wrappers::ReadDirStream::new(tokio::fs::read_dir(&rootfs_path).await?)
                 .count()
                 .await
                 > 0
-            {
-                return Err(Error::new(
-                    eyre!("rootfs is not empty, refusing to delete"),
-                    ErrorKind::InvalidRequest,
-                ));
-            }
+        {
+            return Err(Error::new(
+                eyre!("rootfs is not empty, refusing to delete"),
+                ErrorKind::InvalidRequest,
+            ));
         }
         Command::new("lxc-destroy")
             .arg("--force")
@@ -341,21 +408,21 @@ pub fn lxc() -> ParentHandler {
         .subcommand("connect", from_fn_async(connect_rpc_cli).no_display())
 }
 
-pub async fn create(ctx: RpcContext) -> Result<InternedString, Error> {
-    let container = ctx.lxc_manager.create(LxcConfig::default()).await?;
+pub async fn create(ctx: RpcContext) -> Result<ContainerId, Error> {
+    let container = ctx.lxc_manager.create(None, LxcConfig::default()).await?;
     let guid = container.guid.deref().clone();
     ctx.dev.lxc.lock().await.insert(guid.clone(), container);
     Ok(guid)
 }
 
-pub async fn list(ctx: RpcContext) -> Result<Vec<InternedString>, Error> {
+pub async fn list(ctx: RpcContext) -> Result<Vec<ContainerId>, Error> {
     Ok(ctx.dev.lxc.lock().await.keys().cloned().collect())
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
 pub struct RemoveParams {
     #[ts(type = "string")]
-    pub guid: InternedString,
+    pub guid: ContainerId,
 }
 
 pub async fn remove(ctx: RpcContext, RemoveParams { guid }: RemoveParams) -> Result<(), Error> {
@@ -368,7 +435,7 @@ pub async fn remove(ctx: RpcContext, RemoveParams { guid }: RemoveParams) -> Res
 #[derive(Deserialize, Serialize, Parser, TS)]
 pub struct ConnectParams {
     #[ts(type = "string")]
-    pub guid: InternedString,
+    pub guid: ContainerId,
 }
 
 pub async fn connect_rpc(
@@ -502,7 +569,7 @@ pub async fn connect_cli(ctx: &CliContext, guid: RequestGuid) -> Result<(), Erro
                                 if let Some((method, rest)) = command.split_first() {
                                     let mut params = InOMap::new();
                                     for arg in rest {
-                                        if let Some((name, value)) = arg.split_once("=") {
+                                        if let Some((name, value)) = arg.split_once('=') {
                                             params.insert(InternedString::intern(name), if value.is_empty() {
                                                 Value::Null
                                             } else if let Ok(v) = serde_json::from_str(value) {
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index af1cd1c17..df82baf7e 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -70,7 +70,7 @@ fn filter(p: &Path) -> bool {
 
 #[derive(Clone)]
 pub struct S9pk<S = Section<MultiCursorFile>> {
-    manifest: Manifest,
+    pub manifest: Manifest,
     manifest_dirty: bool,
     archive: MerkleArchive<S>,
     size: Option<u64>,
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 38923d726..e092a59e6 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -13,7 +13,6 @@ use start_stop::StartStop;
 use tokio::sync::Notify;
 use ts_rs::TS;
 
-use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::RequestGuid;
 use crate::db::model::package::{
     InstalledState, PackageDataEntry, PackageState, PackageStateMatchModelRef, UpdatingState,
@@ -32,6 +31,10 @@ use crate::util::actor::concurrent::ConcurrentActor;
 use crate::util::actor::Actor;
 use crate::util::serde::Pem;
 use crate::volume::data_dir;
+use crate::{
+    context::{CliContext, RpcContext},
+    lxc::ContainerId,
+};
 
 mod action;
 pub mod cli;
@@ -193,8 +196,8 @@ impl Service {
                         |db| {
                             db.as_public_mut()
                                 .as_package_data_mut()
-                                .as_idx_mut(&id)
-                                .or_not_found(&id)?
+                                .as_idx_mut(id)
+                                .or_not_found(id)?
                                 .as_state_info_mut()
                                 .map_mutate(|s| {
                                     if let PackageState::Updating(UpdatingState {
@@ -223,16 +226,12 @@ impl Service {
                             tracing::debug!("{e:?}")
                         })
                     {
-                        if service
-                            .uninstall(None)
-                            .await
-                            .map_err(|e| {
+                        match service.uninstall(None).await {
+                            Err(e) => {
                                 tracing::error!("Error uninstalling service: {e}");
                                 tracing::debug!("{e:?}")
-                            })
-                            .is_ok()
-                        {
-                            return Ok(None);
+                            }
+                            Ok(()) => return Ok(None),
                         }
                     }
                 }
@@ -299,10 +298,10 @@ impl Service {
     }
 
     pub async fn restore(
-        ctx: RpcContext,
-        s9pk: S9pk,
-        guard: impl GenericMountGuard,
-        progress: Option<InstallProgressHandles>,
+        _ctx: RpcContext,
+        _s9pk: S9pk,
+        _guard: impl GenericMountGuard,
+        _progress: Option<InstallProgressHandles>,
     ) -> Result<Self, Error> {
         // TODO
         Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
@@ -341,21 +340,36 @@ impl Service {
             .execute(ProcedureName::Uninit, to_value(&target_version)?, None) // TODO timeout
             .await?;
         let id = self.seed.persistent_container.s9pk.as_manifest().id.clone();
-        self.seed
-            .ctx
-            .db
-            .mutate(|d| d.as_public_mut().as_package_data_mut().remove(&id))
-            .await?;
-        self.shutdown().await
+        let ctx = self.seed.ctx.clone();
+        self.shutdown().await?;
+        if target_version.is_none() {
+            ctx.db
+                .mutate(|d| d.as_public_mut().as_package_data_mut().remove(&id))
+                .await?;
+        }
+        Ok(())
     }
     pub async fn backup(&self, _guard: impl GenericMountGuard) -> Result<BackupReturn, Error> {
         // TODO
         Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
     }
+
+    pub fn container_id(&self) -> Result<ContainerId, Error> {
+        let id = &self.seed.id;
+        let container_id = (*self
+            .seed
+            .persistent_container
+            .lxc_container
+            .get()
+            .or_not_found(format!("container for {id}"))?
+            .guid)
+            .clone();
+        Ok(container_id)
+    }
 }
 
 #[derive(Debug, Clone)]
-struct RunningStatus {
+pub struct RunningStatus {
     health: OrdMap<HealthCheckId, HealthCheckResult>,
     started: DateTime<Utc>,
 }
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 038661ace..d1303b0f9 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -10,7 +10,7 @@ use imbl_value::InternedString;
 use models::{ProcedureName, VolumeId};
 use rpc_toolkit::{Empty, Server, ShutdownHandle};
 use serde::de::DeserializeOwned;
-use tokio::fs::File;
+use tokio::fs::{create_dir_all, File};
 use tokio::process::Command;
 use tokio::sync::{oneshot, watch, Mutex, OnceCell};
 use tracing::instrument;
@@ -39,8 +39,6 @@ use crate::ARCH;
 
 const RPC_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
 
-struct ProcedureId(u64);
-
 #[derive(Debug)]
 pub struct ServiceState {
     // This contains the start time and health check information for when the service is running. Note: Will be overwritting to the db,
@@ -99,7 +97,17 @@ pub struct PersistentContainer {
 impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn new(ctx: &RpcContext, s9pk: S9pk, start: StartStop) -> Result<Self, Error> {
-        let lxc_container = ctx.lxc_manager.create(LxcConfig::default()).await?;
+        let lxc_container = ctx
+            .lxc_manager
+            .create(
+                Some(
+                    &ctx.datadir
+                        .join("package-data/logs")
+                        .join(&s9pk.as_manifest().id),
+                ),
+                LxcConfig::default(),
+            )
+            .await?;
         let rpc_client = lxc_container.connect_rpc(Some(RPC_CONNECT_TIMEOUT)).await?;
         let js_mount = MountGuard::mount(
             &LoopDev::from(
@@ -114,6 +122,7 @@ impl PersistentContainer {
             ReadOnly,
         )
         .await?;
+
         let mut volumes = BTreeMap::new();
         for volume in &s9pk.as_manifest().volumes {
             let mountpoint = lxc_container
@@ -175,7 +184,7 @@ impl PersistentContainer {
             if let Some(env) = s9pk
                 .as_archive()
                 .contents()
-                .get_path(Path::new("images").join(&*ARCH).join(&env_filename))
+                .get_path(Path::new("images").join(*ARCH).join(&env_filename))
                 .and_then(|e| e.as_file())
             {
                 env.copy(&mut File::create(image_path.join(&env_filename)).await?)
@@ -185,7 +194,7 @@ impl PersistentContainer {
             if let Some(json) = s9pk
                 .as_archive()
                 .contents()
-                .get_path(Path::new("images").join(&*ARCH).join(&json_filename))
+                .get_path(Path::new("images").join(*ARCH).join(&json_filename))
                 .and_then(|e| e.as_file())
             {
                 json.copy(&mut File::create(image_path.join(&json_filename)).await?)
@@ -231,7 +240,7 @@ impl PersistentContainer {
             .join(HOST_RPC_SERVER_SOCKET);
         let (send, recv) = oneshot::channel();
         let handle = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            let (shutdown, fut) = match async {
+            let chown_status = async {
                 let res = server.run_unix(&path, |err| {
                     tracing::error!("error on unix socket {}: {err}", path.display())
                 })?;
@@ -241,9 +250,8 @@ impl PersistentContainer {
                     .invoke(ErrorKind::Filesystem)
                     .await?;
                 Ok::<_, Error>(res)
-            }
-            .await
-            {
+            };
+            let (shutdown, fut) = match chown_status.await {
                 Ok((shutdown, fut)) => (Ok(shutdown), Some(fut)),
                 Err(e) => (Err(e), None),
             };
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 68e1fc8a8..4386b39b7 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -32,9 +32,9 @@ use crate::util::serde::Pem;
 pub type DownloadInstallFuture = BoxFuture<'static, Result<InstallFuture, Error>>;
 pub type InstallFuture = BoxFuture<'static, Result<(), Error>>;
 
-pub(super) struct InstallProgressHandles {
-    pub(super) finalization_progress: PhaseProgressTrackerHandle,
-    pub(super) progress_handle: FullProgressTrackerHandle,
+pub struct InstallProgressHandles {
+    pub finalization_progress: PhaseProgressTrackerHandle,
+    pub progress_handle: FullProgressTrackerHandle,
 }
 
 /// This is the structure to contain all the services

From 003d11094857c18f887f7923ee04cf0957cb9e03 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:40:10 -0600
Subject: [PATCH 141/341] build multi-arch s9pks (#2601)

* build multi-arch s9pks

* remove images incrementally

* wip

* prevent rebuild

* fix sdk makefile

* fix hanging on uninstall

* fix build

* fix build

* fix build

* fix build (for real this time)

* fix git hash computation
---
 .github/workflows/startos-iso.yaml            |   2 +
 Makefile                                      |  47 +-
 build/lib/scripts/chroot-and-upgrade          |   2 +
 check-git-hash.sh                             |   2 +-
 container-runtime/package-lock.json           | 615 +-----------------
 container-runtime/package.json                |   2 +-
 container-runtime/src/Adapters/RpcListener.ts |  12 +-
 .../Systems/SystemForEmbassy/index.ts         |   4 +-
 container-runtime/tsconfig.json               |   8 +-
 core/.gitignore                               |   1 +
 core/startos/bindings/ActionMetadata.ts       |  12 -
 core/startos/bindings/AddressInfo.ts          |  10 -
 core/startos/bindings/BindOptions.ts          |  10 -
 core/startos/bindings/BindParams.ts           |  15 -
 core/startos/bindings/Dependencies.ts         |   5 -
 .../bindings/DestroyOverlayedImageParams.ts   |   3 -
 .../bindings/ExportServiceInterfaceParams.ts  |  14 -
 core/startos/bindings/ExportedHostnameInfo.ts |  12 -
 .../bindings/ExposeForDependentsParams.ts     |   3 -
 core/startos/bindings/GetSystemSmtpParams.ts  |   4 -
 core/startos/bindings/Host.ts                 |  11 -
 core/startos/bindings/HostAddress.ts          |   3 -
 core/startos/bindings/HostInfo.ts             |   5 -
 core/startos/bindings/InstalledState.ts       |   4 -
 core/startos/bindings/MainStatus.ts           |  20 -
 core/startos/bindings/Manifest.ts             |  32 -
 core/startos/bindings/PackageDataEntry.ts     |  26 -
 core/startos/bindings/ParamsMaybePackageId.ts |   3 -
 core/startos/bindings/ParamsPackageId.ts      |   3 -
 core/startos/bindings/PasswordType.ts         |   4 -
 core/startos/bindings/Public.ts               |   9 -
 core/startos/bindings/RemoveActionParams.ts   |   3 -
 core/startos/bindings/RemoveAddressParams.ts  |   3 -
 core/startos/bindings/ReverseProxyBind.ts     |   7 -
 core/startos/bindings/ReverseProxyParams.ts   |  10 -
 core/startos/bindings/ServerInfo.ts           |  31 -
 core/startos/bindings/ServerStatus.ts         |  12 -
 core/startos/bindings/ServiceInterface.ts     |  15 -
 core/startos/bindings/ServiceInterfaceType.ts |   3 -
 .../bindings/ServiceInterfaceWithHostInfo.ts  |  17 -
 core/startos/bindings/SetConfigured.ts        |   3 -
 core/startos/bindings/SetMainStatus.ts        |   4 -
 core/startos/bindings/SetStoreParams.ts       |   3 -
 core/startos/bindings/Status.ts               |   4 -
 core/startos/bindings/UpdatingState.ts        |   8 -
 core/startos/bindings/index.ts                | 101 ---
 core/startos/src/backup/restore.rs            |   1 +
 core/startos/src/core/rpc_continuations.rs    |   2 +-
 core/startos/src/disk/main.rs                 |   6 +-
 core/startos/src/disk/mount/guard.rs          |   3 +-
 core/startos/src/inspect.rs                   | 127 ----
 core/startos/src/install/mod.rs               |  10 +-
 core/startos/src/lib.rs                       |   3 +-
 core/startos/src/logs.rs                      |  29 +-
 core/startos/src/lxc/mod.rs                   |   8 -
 core/startos/src/registry/admin.rs            |   4 +-
 core/startos/src/s9pk/rpc.rs                  | 222 ++++---
 core/startos/src/s9pk/v1/docker.rs            |  68 +-
 core/startos/src/s9pk/v1/reader.rs            |  16 +-
 core/startos/src/s9pk/v2/compat.rs            | 293 +++++----
 core/startos/src/s9pk/v2/mod.rs               |  18 +-
 core/startos/src/service/mod.rs               |  17 +-
 .../src/service/persistent_container.rs       |  70 +-
 .../src/service/service_effect_handler.rs     |   1 +
 core/startos/src/service/service_map.rs       |  18 +-
 core/startos/src/util/actor/concurrent.rs     |   2 +-
 core/startos/src/util/mod.rs                  |   2 +-
 debian/postinst                               |  30 +-
 sdk/Makefile                                  |  33 +-
 sdk/lib/interfaces/Host.ts                    |   8 +-
 .../lib/osBindings}/ActionId.ts               |   2 +-
 sdk/lib/osBindings/ActionMetadata.ts          |  12 +
 .../lib/osBindings}/AddSslOptions.ts          |  10 +-
 sdk/lib/osBindings/AddressInfo.ts             |  10 +
 .../bindings => sdk/lib/osBindings}/Alerts.ts |  12 +-
 .../lib/osBindings}/Algorithm.ts              |   2 +-
 .../lib/osBindings}/AllPackageData.ts         |   6 +-
 .../lib/osBindings}/AllowedStatuses.ts        |   2 +-
 .../lib/osBindings}/AlpnInfo.ts               |   4 +-
 .../lib/osBindings/BackupProgress.ts          |   2 +-
 .../lib/osBindings}/BindInfo.ts               |   4 +-
 sdk/lib/osBindings/BindOptions.ts             |  10 +
 sdk/lib/osBindings/BindParams.ts              |  15 +
 .../lib/osBindings}/Callback.ts               |   2 +-
 .../lib/osBindings}/ChrootParams.ts           |  14 +-
 .../osBindings/CreateOverlayedImageParams.ts  |   3 +
 .../lib/osBindings}/CurrentDependencies.ts    |   6 +-
 .../lib/osBindings}/CurrentDependencyInfo.ts  |  14 +-
 .../lib/osBindings}/DataUrl.ts                |   2 +-
 .../lib/osBindings}/DepInfo.ts                |   2 +-
 sdk/lib/osBindings/Dependencies.ts            |   5 +
 sdk/lib/osBindings/DependencyKind.ts          |   3 +
 .../lib/osBindings}/DependencyRequirement.ts  |  12 +-
 sdk/lib/osBindings/Description.ts             |   3 +
 .../osBindings/DestroyOverlayedImageParams.ts |   2 +-
 .../lib/osBindings}/Duration.ts               |   2 +-
 sdk/lib/osBindings/EncryptedWire.ts           |   3 +
 .../lib/osBindings}/ExecuteAction.ts          |   8 +-
 .../lib/osBindings}/ExportActionParams.ts     |   4 +-
 .../ExportServiceInterfaceParams.ts           |  14 +
 .../lib/osBindings}/ExportedHostInfo.ts       |  14 +-
 sdk/lib/osBindings/ExportedHostnameInfo.ts    |  12 +
 .../lib/osBindings}/ExportedIpHostname.ts     |  20 +-
 .../lib/osBindings}/ExportedOnionHostname.ts  |   8 +-
 .../osBindings/ExposeForDependentsParams.ts   |   3 +
 .../lib/osBindings}/FullProgress.ts           |   6 +-
 .../lib/osBindings}/GetHostInfoParams.ts      |  14 +-
 .../lib/osBindings}/GetHostInfoParamsKind.ts  |   2 +-
 .../lib/osBindings}/GetPrimaryUrlParams.ts    |  10 +-
 .../osBindings}/GetServiceInterfaceParams.ts  |  10 +-
 .../GetServicePortForwardParams.ts            |  10 +-
 .../osBindings}/GetSslCertificateParams.ts    |  10 +-
 .../lib/osBindings}/GetSslKeyParams.ts        |  10 +-
 .../lib/osBindings}/GetStoreParams.ts         |   2 +-
 sdk/lib/osBindings/GetSystemSmtpParams.ts     |   4 +
 .../lib/osBindings}/Governor.ts               |   2 +-
 .../lib/osBindings}/HardwareRequirements.ts   |   8 +-
 .../lib/osBindings}/HealthCheckId.ts          |   2 +-
 .../lib/osBindings}/HealthCheckResult.ts      |   2 +-
 sdk/lib/osBindings/Host.ts                    |  11 +
 sdk/lib/osBindings/HostAddress.ts             |   3 +
 .../bindings => sdk/lib/osBindings}/HostId.ts |   2 +-
 sdk/lib/osBindings/HostInfo.ts                |   5 +
 .../lib/osBindings}/HostKind.ts               |   2 +-
 .../lib/osBindings}/ImageId.ts                |   2 +-
 sdk/lib/osBindings/InstalledState.ts          |   4 +
 .../lib/osBindings}/InstallingInfo.ts         |   6 +-
 .../lib/osBindings}/InstallingState.ts        |   4 +-
 .../bindings => sdk/lib/osBindings}/IpInfo.ts |  10 +-
 .../ListServiceInterfacesParams.ts            |   8 +-
 sdk/lib/osBindings/MainStatus.ts              |  20 +
 sdk/lib/osBindings/Manifest.ts                |  32 +
 .../lib/osBindings/MaybeUtf8String.ts         |   2 +-
 .../lib/osBindings}/MountParams.ts            |   4 +-
 .../lib/osBindings}/MountTarget.ts            |  10 +-
 .../lib/osBindings}/NamedProgress.ts          |   4 +-
 sdk/lib/osBindings/PackageDataEntry.ts        |  24 +
 .../lib/osBindings}/PackageId.ts              |   2 +-
 .../lib/osBindings}/PackageState.ts           |   8 +-
 .../lib/osBindings/ParamsMaybePackageId.ts    |   2 +-
 .../lib/osBindings/ParamsPackageId.ts         |   2 +-
 sdk/lib/osBindings/PasswordType.ts            |   4 +
 .../lib/osBindings}/Progress.ts               |   2 +-
 sdk/lib/osBindings/Public.ts                  |   9 +
 sdk/lib/osBindings/RemoveActionParams.ts      |   3 +
 .../lib/osBindings/RemoveAddressParams.ts     |   2 +-
 sdk/lib/osBindings/ReverseProxyBind.ts        |   3 +
 .../osBindings}/ReverseProxyDestination.ts    |   8 +-
 .../lib/osBindings}/ReverseProxyHttp.ts       |   2 +-
 sdk/lib/osBindings/ReverseProxyParams.ts      |  10 +
 .../lib/osBindings}/Security.ts               |   2 +-
 sdk/lib/osBindings/ServerInfo.ts              |  31 +
 .../lib/osBindings}/ServerSpecs.ts            |   2 +-
 sdk/lib/osBindings/ServerStatus.ts            |  12 +
 sdk/lib/osBindings/ServiceInterface.ts        |  15 +
 .../lib/osBindings}/ServiceInterfaceId.ts     |   2 +-
 sdk/lib/osBindings/ServiceInterfaceType.ts    |   3 +
 .../ServiceInterfaceWithHostInfo.ts           |  17 +
 .../lib/osBindings}/Session.ts                |   2 +-
 .../lib/osBindings}/SessionList.ts            |   4 +-
 .../lib/osBindings}/Sessions.ts               |   4 +-
 sdk/lib/osBindings/SetConfigured.ts           |   3 +
 .../lib/osBindings}/SetDependenciesParams.ts  |   6 +-
 .../lib/osBindings}/SetHealth.ts              |   4 +-
 sdk/lib/osBindings/SetMainStatus.ts           |   4 +
 sdk/lib/osBindings/SetStoreParams.ts          |   3 +
 sdk/lib/osBindings/Status.ts                  |   4 +
 .../lib/osBindings}/UpdateProgress.ts         |   2 +-
 sdk/lib/osBindings/UpdatingState.ts           |   8 +
 .../lib/osBindings}/VolumeId.ts               |   2 +-
 .../lib/osBindings}/WifiInfo.ts               |  10 +-
 sdk/lib/osBindings/index.ts                   | 101 +++
 sdk/lib/test/startosTypeValidation.test.ts    |  48 +-
 sdk/lib/types.ts                              |   6 +-
 sdk/package.json                              |   8 +-
 .../app-actions/app-actions.page.ts           |   3 +-
 176 files changed, 1175 insertions(+), 1798 deletions(-)
 delete mode 100644 core/startos/bindings/ActionMetadata.ts
 delete mode 100644 core/startos/bindings/AddressInfo.ts
 delete mode 100644 core/startos/bindings/BindOptions.ts
 delete mode 100644 core/startos/bindings/BindParams.ts
 delete mode 100644 core/startos/bindings/Dependencies.ts
 delete mode 100644 core/startos/bindings/DestroyOverlayedImageParams.ts
 delete mode 100644 core/startos/bindings/ExportServiceInterfaceParams.ts
 delete mode 100644 core/startos/bindings/ExportedHostnameInfo.ts
 delete mode 100644 core/startos/bindings/ExposeForDependentsParams.ts
 delete mode 100644 core/startos/bindings/GetSystemSmtpParams.ts
 delete mode 100644 core/startos/bindings/Host.ts
 delete mode 100644 core/startos/bindings/HostAddress.ts
 delete mode 100644 core/startos/bindings/HostInfo.ts
 delete mode 100644 core/startos/bindings/InstalledState.ts
 delete mode 100644 core/startos/bindings/MainStatus.ts
 delete mode 100644 core/startos/bindings/Manifest.ts
 delete mode 100644 core/startos/bindings/PackageDataEntry.ts
 delete mode 100644 core/startos/bindings/ParamsMaybePackageId.ts
 delete mode 100644 core/startos/bindings/ParamsPackageId.ts
 delete mode 100644 core/startos/bindings/PasswordType.ts
 delete mode 100644 core/startos/bindings/Public.ts
 delete mode 100644 core/startos/bindings/RemoveActionParams.ts
 delete mode 100644 core/startos/bindings/RemoveAddressParams.ts
 delete mode 100644 core/startos/bindings/ReverseProxyBind.ts
 delete mode 100644 core/startos/bindings/ReverseProxyParams.ts
 delete mode 100644 core/startos/bindings/ServerInfo.ts
 delete mode 100644 core/startos/bindings/ServerStatus.ts
 delete mode 100644 core/startos/bindings/ServiceInterface.ts
 delete mode 100644 core/startos/bindings/ServiceInterfaceType.ts
 delete mode 100644 core/startos/bindings/ServiceInterfaceWithHostInfo.ts
 delete mode 100644 core/startos/bindings/SetConfigured.ts
 delete mode 100644 core/startos/bindings/SetMainStatus.ts
 delete mode 100644 core/startos/bindings/SetStoreParams.ts
 delete mode 100644 core/startos/bindings/Status.ts
 delete mode 100644 core/startos/bindings/UpdatingState.ts
 delete mode 100644 core/startos/bindings/index.ts
 delete mode 100644 core/startos/src/inspect.rs
 rename {core/startos/bindings => sdk/lib/osBindings}/ActionId.ts (78%)
 create mode 100644 sdk/lib/osBindings/ActionMetadata.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/AddSslOptions.ts (53%)
 create mode 100644 sdk/lib/osBindings/AddressInfo.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/Alerts.ts (50%)
 rename {core/startos/bindings => sdk/lib/osBindings}/Algorithm.ts (70%)
 rename {core/startos/bindings => sdk/lib/osBindings}/AllPackageData.ts (61%)
 rename {core/startos/bindings => sdk/lib/osBindings}/AllowedStatuses.ts (97%)
 rename {core/startos/bindings => sdk/lib/osBindings}/AlpnInfo.ts (71%)
 rename core/startos/bindings/DependencyKind.ts => sdk/lib/osBindings/BackupProgress.ts (68%)
 rename {core/startos/bindings => sdk/lib/osBindings}/BindInfo.ts (72%)
 create mode 100644 sdk/lib/osBindings/BindOptions.ts
 create mode 100644 sdk/lib/osBindings/BindParams.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/Callback.ts (75%)
 rename {core/startos/bindings => sdk/lib/osBindings}/ChrootParams.ts (52%)
 create mode 100644 sdk/lib/osBindings/CreateOverlayedImageParams.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/CurrentDependencies.ts (78%)
 rename {core/startos/bindings => sdk/lib/osBindings}/CurrentDependencyInfo.ts (57%)
 rename {core/startos/bindings => sdk/lib/osBindings}/DataUrl.ts (78%)
 rename {core/startos/bindings => sdk/lib/osBindings}/DepInfo.ts (95%)
 create mode 100644 sdk/lib/osBindings/Dependencies.ts
 create mode 100644 sdk/lib/osBindings/DependencyKind.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/DependencyRequirement.ts (61%)
 create mode 100644 sdk/lib/osBindings/Description.ts
 rename core/startos/bindings/Description.ts => sdk/lib/osBindings/DestroyOverlayedImageParams.ts (65%)
 rename {core/startos/bindings => sdk/lib/osBindings}/Duration.ts (78%)
 create mode 100644 sdk/lib/osBindings/EncryptedWire.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/ExecuteAction.ts (68%)
 rename {core/startos/bindings => sdk/lib/osBindings}/ExportActionParams.ts (72%)
 create mode 100644 sdk/lib/osBindings/ExportServiceInterfaceParams.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/ExportedHostInfo.ts (55%)
 create mode 100644 sdk/lib/osBindings/ExportedHostnameInfo.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/ExportedIpHostname.ts (57%)
 rename {core/startos/bindings => sdk/lib/osBindings}/ExportedOnionHostname.ts (68%)
 create mode 100644 sdk/lib/osBindings/ExposeForDependentsParams.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/FullProgress.ts (60%)
 rename {core/startos/bindings => sdk/lib/osBindings}/GetHostInfoParams.ts (54%)
 rename {core/startos/bindings => sdk/lib/osBindings}/GetHostInfoParamsKind.ts (70%)
 rename {core/startos/bindings => sdk/lib/osBindings}/GetPrimaryUrlParams.ts (53%)
 rename {core/startos/bindings => sdk/lib/osBindings}/GetServiceInterfaceParams.ts (54%)
 rename {core/startos/bindings => sdk/lib/osBindings}/GetServicePortForwardParams.ts (57%)
 rename {core/startos/bindings => sdk/lib/osBindings}/GetSslCertificateParams.ts (54%)
 rename {core/startos/bindings => sdk/lib/osBindings}/GetSslKeyParams.ts (52%)
 rename {core/startos/bindings => sdk/lib/osBindings}/GetStoreParams.ts (95%)
 create mode 100644 sdk/lib/osBindings/GetSystemSmtpParams.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/Governor.ts (78%)
 rename {core/startos/bindings => sdk/lib/osBindings}/HardwareRequirements.ts (61%)
 rename {core/startos/bindings => sdk/lib/osBindings}/HealthCheckId.ts (75%)
 rename {core/startos/bindings => sdk/lib/osBindings}/HealthCheckResult.ts (99%)
 create mode 100644 sdk/lib/osBindings/Host.ts
 create mode 100644 sdk/lib/osBindings/HostAddress.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/HostId.ts (79%)
 create mode 100644 sdk/lib/osBindings/HostInfo.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/HostKind.ts (77%)
 rename {core/startos/bindings => sdk/lib/osBindings}/ImageId.ts (78%)
 create mode 100644 sdk/lib/osBindings/InstalledState.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/InstallingInfo.ts (60%)
 rename {core/startos/bindings => sdk/lib/osBindings}/InstallingState.ts (75%)
 rename {core/startos/bindings => sdk/lib/osBindings}/IpInfo.ts (55%)
 rename {core/startos/bindings => sdk/lib/osBindings}/ListServiceInterfacesParams.ts (61%)
 create mode 100644 sdk/lib/osBindings/MainStatus.ts
 create mode 100644 sdk/lib/osBindings/Manifest.ts
 rename core/startos/bindings/EncryptedWire.ts => sdk/lib/osBindings/MaybeUtf8String.ts (69%)
 rename {core/startos/bindings => sdk/lib/osBindings}/MountParams.ts (75%)
 rename {core/startos/bindings => sdk/lib/osBindings}/MountTarget.ts (60%)
 rename {core/startos/bindings => sdk/lib/osBindings}/NamedProgress.ts (79%)
 create mode 100644 sdk/lib/osBindings/PackageDataEntry.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/PackageId.ts (77%)
 rename {core/startos/bindings => sdk/lib/osBindings}/PackageState.ts (60%)
 rename core/startos/bindings/CreateOverlayedImageParams.ts => sdk/lib/osBindings/ParamsMaybePackageId.ts (63%)
 rename core/startos/bindings/BackupProgress.ts => sdk/lib/osBindings/ParamsPackageId.ts (67%)
 create mode 100644 sdk/lib/osBindings/PasswordType.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/Progress.ts (95%)
 create mode 100644 sdk/lib/osBindings/Public.ts
 create mode 100644 sdk/lib/osBindings/RemoveActionParams.ts
 rename core/startos/bindings/MaybeUtf8String.ts => sdk/lib/osBindings/RemoveAddressParams.ts (69%)
 create mode 100644 sdk/lib/osBindings/ReverseProxyBind.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/ReverseProxyDestination.ts (72%)
 rename {core/startos/bindings => sdk/lib/osBindings}/ReverseProxyHttp.ts (92%)
 create mode 100644 sdk/lib/osBindings/ReverseProxyParams.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/Security.ts (72%)
 create mode 100644 sdk/lib/osBindings/ServerInfo.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/ServerSpecs.ts (95%)
 create mode 100644 sdk/lib/osBindings/ServerStatus.ts
 create mode 100644 sdk/lib/osBindings/ServiceInterface.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/ServiceInterfaceId.ts (72%)
 create mode 100644 sdk/lib/osBindings/ServiceInterfaceType.ts
 create mode 100644 sdk/lib/osBindings/ServiceInterfaceWithHostInfo.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/Session.ts (92%)
 rename {core/startos/bindings => sdk/lib/osBindings}/SessionList.ts (78%)
 rename {core/startos/bindings => sdk/lib/osBindings}/Sessions.ts (93%)
 create mode 100644 sdk/lib/osBindings/SetConfigured.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/SetDependenciesParams.ts (79%)
 rename {core/startos/bindings => sdk/lib/osBindings}/SetHealth.ts (87%)
 create mode 100644 sdk/lib/osBindings/SetMainStatus.ts
 create mode 100644 sdk/lib/osBindings/SetStoreParams.ts
 create mode 100644 sdk/lib/osBindings/Status.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/UpdateProgress.ts (94%)
 create mode 100644 sdk/lib/osBindings/UpdatingState.ts
 rename {core/startos/bindings => sdk/lib/osBindings}/VolumeId.ts (78%)
 rename {core/startos/bindings => sdk/lib/osBindings}/WifiInfo.ts (54%)
 create mode 100644 sdk/lib/osBindings/index.ts

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 7d4a43685..30b2bec0f 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -175,8 +175,10 @@ jobs:
 
       - name: Prevent rebuild of compiled artifacts
         run: |
+          mkdir -p web/node_modules
           mkdir -p web/dist/raw
           touch core/startos/bindings
+          touch sdk/lib/osBindings
           mkdir -p container-runtime/dist
           PLATFORM=${{ matrix.platform }} make -t compiled-${{ env.ARCH }}.tar
 
diff --git a/Makefile b/Makefile
index e1ba4ed53..02328a1d8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,15 +9,15 @@ IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo
 BINS := core/target/$(ARCH)-unknown-linux-musl/release/startbox core/target/$(ARCH)-unknown-linux-musl/release/containerbox
 WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/diagnostic-ui web/dist/raw/install-wizard
 FIRMWARE_ROMS := ./firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json)
-BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts container-runtime/rootfs.$(ARCH).squashfs $(FIRMWARE_ROMS)
+BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts $(FIRMWARE_ROMS)
 DEBIAN_SRC := $(shell git ls-files debian/)
 IMAGE_RECIPE_SRC := $(shell git ls-files image-recipe/)
 STARTD_SRC := core/startos/startd.service $(BUILD_SRC)
 COMPAT_SRC := $(shell git ls-files system-images/compat/)
 UTILS_SRC := $(shell git ls-files system-images/utils/)
 BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
-CORE_SRC := $(shell git ls-files -- core ':!:core/startos/bindings/*') $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
-WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules web/config.json patch-db/client/dist web/patchdb-ui-seed.json
+CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
+WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist web/patchdb-ui-seed.json
 WEB_UI_SRC := $(shell git ls-files web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
 WEB_DIAGNOSTIC_UI_SRC := $(shell git ls-files web/projects/diagnostic-ui)
@@ -49,7 +49,7 @@ endif
 
 .DELETE_ON_ERROR:
 
-.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole test
+.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole wormhole-deb test
 
 all: $(ALL_TARGETS)
 
@@ -65,6 +65,7 @@ clean:
 	rm -f system-images/**/*.tar
 	rm -rf system-images/compat/target
 	rm -rf core/target
+	rm -rf core/startos/bindings
 	rm -rf web/.angular
 	rm -f web/config.json
 	rm -rf web/node_modules
@@ -80,8 +81,8 @@ clean:
 	rm -rf container-runtime/dist
 	rm -rf container-runtime/node_modules
 	rm -f container-runtime/*.squashfs
-	rm -rf sdk/dist
-	rm -rf sdk/node_modules
+	rm -rf container-runtime/tmp
+	(cd sdk && make clean)
 	rm -f ENVIRONMENT.txt
 	rm -f PLATFORM.txt
 	rm -f GIT_HASH.txt
@@ -92,7 +93,6 @@ format:
 
 test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
 	(cd core && cargo build && cargo test)
-	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
 	(cd sdk && make test)
 
 cli:
@@ -158,6 +158,10 @@ wormhole: core/target/$(ARCH)-unknown-linux-musl/release/startbox
 	@echo "Paste the following command into the shell of your start-os server:"
 	@wormhole send core/target/$(ARCH)-unknown-linux-musl/release/startbox 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade \"cd /usr/bin && rm startbox && wormhole receive --accept-file %s && chmod +x startbox\"\n", $$3 }'
 
+wormhole-deb: results/$(BASENAME).deb
+	@echo "Paste the following command into the shell of your start-os server:"
+	@wormhole send results/$(BASENAME).deb 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade '"'"'cd $$(mktemp -d) && wormhole receive --accept-file %s && apt-get install -y --reinstall ./$(BASENAME).deb'"'"'\n", $$3 }'
+
 update: $(ALL_TARGETS)
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
 	$(call ssh,"sudo rsync -a --delete --force --info=progress2 /media/embassy/embassyfs/current/ /media/embassy/next/")
@@ -180,13 +184,19 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 	npm --prefix container-runtime ci
 	touch container-runtime/node_modules
 
-core/startos/bindings: $(shell git ls-files -- core ':!:core/startos/bindings/*') $(ENVIRONMENT_FILE)
-	rm -rf core/startos/bindings
-	(cd core/ && cargo test --features=test)
+sdk/lib/osBindings: core/startos/bindings
+	mkdir -p sdk/lib/osBindings
 	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1";/g' > core/startos/bindings/index.ts
-	npm --prefix sdk exec -- prettier -w ./core/startos/bindings/*.ts
+	npm --prefix sdk exec -- prettier --config ./sdk/package.json -w ./core/startos/bindings/*.ts
+	rsync -ac --delete core/startos/bindings/ sdk/lib/osBindings/
+	touch sdk/lib/osBindings
 
-sdk/dist: $(shell git ls-files sdk) core/startos/bindings
+core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE)
+	rm -rf core/startos/bindings
+	(cd core/ && cargo test --features=test '::export_bindings_')
+	touch core/startos/bindings
+
+sdk/dist: $(shell git ls-files sdk) sdk/lib/osBindings
 	(cd sdk && make bundle)
 
 # TODO: make container-runtime its own makefile?
@@ -219,21 +229,25 @@ $(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE)
 	cd core && ARCH=$(ARCH) ./build-prod.sh
 	touch $(BINS)
 
-web/node_modules: web/package.json sdk/dist
-	(cd sdk && make bundle)
+web/node_modules/.package-lock.json: web/package.json sdk/dist
 	npm --prefix web ci
+	touch web/node_modules/.package-lock.json
 
 web/dist/raw/ui: $(WEB_UI_SRC) $(WEB_SHARED_SRC)
 	npm --prefix web run build:ui
+	touch web/dist/raw/ui
 
 web/dist/raw/setup-wizard: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC)
 	npm --prefix web run build:setup
+	touch web/dist/raw/setup-wizard
 
 web/dist/raw/diagnostic-ui: $(WEB_DIAGNOSTIC_UI_SRC) $(WEB_SHARED_SRC)
 	npm --prefix web run build:dui
+	touch web/dist/raw/diagnostic-ui
 
 web/dist/raw/install-wizard: $(WEB_INSTALL_WIZARD_SRC) $(WEB_SHARED_SRC)
 	npm --prefix web run build:install-wiz
+	touch web/dist/raw/install-wizard
 
 web/dist/static: $(WEB_UIS) $(ENVIRONMENT_FILE)
 	./compress-uis.sh
@@ -247,10 +261,11 @@ web/patchdb-ui-seed.json: web/package.json
 
 patch-db/client/node_modules: patch-db/client/package.json
 	npm --prefix patch-db/client ci
+	touch patch-db/client/node_modules
 
 patch-db/client/dist: $(PATCH_DB_CLIENT_SRC) patch-db/client/node_modules
-	! test -d patch-db/client/dist || rm -rf patch-db/client/dist
-	npm --prefix web run build:deps
+	rm -rf patch-db/client/dist
+	npm --prefix patch-db/client run build
 
 # used by github actions
 compiled-$(ARCH).tar: $(COMPILED_TARGETS) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE)
diff --git a/build/lib/scripts/chroot-and-upgrade b/build/lib/scripts/chroot-and-upgrade
index f95e49924..a7fafb8bc 100755
--- a/build/lib/scripts/chroot-and-upgrade
+++ b/build/lib/scripts/chroot-and-upgrade
@@ -16,6 +16,7 @@ mkdir -p /media/embassy/next/sys
 mkdir -p /media/embassy/next/proc
 mkdir -p /media/embassy/next/boot
 mount --bind /run /media/embassy/next/run
+mount --bind /tmp /media/embassy/next/tmp
 mount --bind /dev /media/embassy/next/dev
 mount --bind /sys /media/embassy/next/sys
 mount --bind /proc /media/embassy/next/proc
@@ -30,6 +31,7 @@ else
 fi
 
 umount /media/embassy/next/run
+umount /media/embassy/next/tmp
 umount /media/embassy/next/dev
 umount /media/embassy/next/sys
 umount /media/embassy/next/proc
diff --git a/check-git-hash.sh b/check-git-hash.sh
index 874dcc8bf..2f59b9198 100755
--- a/check-git-hash.sh
+++ b/check-git-hash.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$GIT_BRANCH_AS_HASH" != 1 ]; then
-    GIT_HASH="$(git describe --always --abbrev=40 --dirty=-modified)"
+    GIT_HASH="$(git rev-parse HEAD)$(if ! git diff-index --quiet HEAD --; then echo '-modified'; fi)"
 else
     GIT_HASH="@$(git rev-parse --abbrev-ref HEAD)"
 fi
diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index 74551217e..dd8ba7855 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "start-init",
+  "name": "container-runtime",
   "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "start-init",
+      "name": "container-runtime",
       "version": "0.0.0",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
@@ -23,396 +23,28 @@
         "@swc/cli": "^0.1.62",
         "@swc/core": "^1.3.65",
         "@types/node": "^20.11.13",
-        "esbuild": "^0.20.0",
         "prettier": "^3.2.5",
         "typescript": ">5.2"
       }
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-rev0.lib0.rc8.beta7",
+      "version": "0.4.0-rev0.lib0.rc8.beta10",
       "license": "MIT",
       "dependencies": {
-        "@iarna/toml": "^2.2.5",
         "isomorphic-fetch": "^3.0.0",
-        "ts-matches": "^5.4.1",
-        "yaml": "^2.2.2"
+        "ts-matches": "^5.4.1"
       },
       "devDependencies": {
+        "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
         "jest": "^29.4.3",
+        "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         "tsx": "^4.7.1",
-        "typescript": "^5.0.4"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz",
-      "integrity": "sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.0.tgz",
-      "integrity": "sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz",
-      "integrity": "sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.0.tgz",
-      "integrity": "sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz",
-      "integrity": "sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz",
-      "integrity": "sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz",
-      "integrity": "sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz",
-      "integrity": "sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz",
-      "integrity": "sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz",
-      "integrity": "sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz",
-      "integrity": "sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz",
-      "integrity": "sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz",
-      "integrity": "sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz",
-      "integrity": "sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz",
-      "integrity": "sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz",
-      "integrity": "sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz",
-      "integrity": "sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz",
-      "integrity": "sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz",
-      "integrity": "sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz",
-      "integrity": "sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz",
-      "integrity": "sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz",
-      "integrity": "sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz",
-      "integrity": "sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
+        "typescript": "^5.0.4",
+        "yaml": "^2.2.2"
       }
     },
     "node_modules/@iarna/toml": {
@@ -1304,44 +936,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/esbuild": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.0.tgz",
-      "integrity": "sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.0",
-        "@esbuild/android-arm": "0.20.0",
-        "@esbuild/android-arm64": "0.20.0",
-        "@esbuild/android-x64": "0.20.0",
-        "@esbuild/darwin-arm64": "0.20.0",
-        "@esbuild/darwin-x64": "0.20.0",
-        "@esbuild/freebsd-arm64": "0.20.0",
-        "@esbuild/freebsd-x64": "0.20.0",
-        "@esbuild/linux-arm": "0.20.0",
-        "@esbuild/linux-arm64": "0.20.0",
-        "@esbuild/linux-ia32": "0.20.0",
-        "@esbuild/linux-loong64": "0.20.0",
-        "@esbuild/linux-mips64el": "0.20.0",
-        "@esbuild/linux-ppc64": "0.20.0",
-        "@esbuild/linux-riscv64": "0.20.0",
-        "@esbuild/linux-s390x": "0.20.0",
-        "@esbuild/linux-x64": "0.20.0",
-        "@esbuild/netbsd-x64": "0.20.0",
-        "@esbuild/openbsd-x64": "0.20.0",
-        "@esbuild/sunos-x64": "0.20.0",
-        "@esbuild/win32-arm64": "0.20.0",
-        "@esbuild/win32-ia32": "0.20.0",
-        "@esbuild/win32-x64": "0.20.0"
-      }
-    },
     "node_modules/esbuild-plugin-resolve": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/esbuild-plugin-resolve/-/esbuild-plugin-resolve-2.0.0.tgz",
@@ -2965,167 +2559,6 @@
     }
   },
   "dependencies": {
-    "@esbuild/aix-ppc64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz",
-      "integrity": "sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-arm": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.0.tgz",
-      "integrity": "sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz",
-      "integrity": "sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/android-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.0.tgz",
-      "integrity": "sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/darwin-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz",
-      "integrity": "sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/darwin-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz",
-      "integrity": "sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/freebsd-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz",
-      "integrity": "sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/freebsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz",
-      "integrity": "sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-arm": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz",
-      "integrity": "sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz",
-      "integrity": "sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-ia32": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz",
-      "integrity": "sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-loong64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz",
-      "integrity": "sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-mips64el": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz",
-      "integrity": "sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-ppc64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz",
-      "integrity": "sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-riscv64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz",
-      "integrity": "sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-s390x": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz",
-      "integrity": "sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/linux-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz",
-      "integrity": "sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/netbsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz",
-      "integrity": "sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/openbsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz",
-      "integrity": "sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/sunos-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz",
-      "integrity": "sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz",
-      "integrity": "sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-ia32": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz",
-      "integrity": "sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==",
-      "dev": true,
-      "optional": true
-    },
-    "@esbuild/win32-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz",
-      "integrity": "sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==",
-      "dev": true,
-      "optional": true
-    },
     "@iarna/toml": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
@@ -3186,6 +2619,7 @@
         "@types/jest": "^29.4.0",
         "isomorphic-fetch": "^3.0.0",
         "jest": "^29.4.3",
+        "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-matches": "^5.4.1",
         "ts-node": "^10.9.1",
@@ -3732,37 +3166,6 @@
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
     },
-    "esbuild": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.0.tgz",
-      "integrity": "sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==",
-      "dev": true,
-      "requires": {
-        "@esbuild/aix-ppc64": "0.20.0",
-        "@esbuild/android-arm": "0.20.0",
-        "@esbuild/android-arm64": "0.20.0",
-        "@esbuild/android-x64": "0.20.0",
-        "@esbuild/darwin-arm64": "0.20.0",
-        "@esbuild/darwin-x64": "0.20.0",
-        "@esbuild/freebsd-arm64": "0.20.0",
-        "@esbuild/freebsd-x64": "0.20.0",
-        "@esbuild/linux-arm": "0.20.0",
-        "@esbuild/linux-arm64": "0.20.0",
-        "@esbuild/linux-ia32": "0.20.0",
-        "@esbuild/linux-loong64": "0.20.0",
-        "@esbuild/linux-mips64el": "0.20.0",
-        "@esbuild/linux-ppc64": "0.20.0",
-        "@esbuild/linux-riscv64": "0.20.0",
-        "@esbuild/linux-s390x": "0.20.0",
-        "@esbuild/linux-x64": "0.20.0",
-        "@esbuild/netbsd-x64": "0.20.0",
-        "@esbuild/openbsd-x64": "0.20.0",
-        "@esbuild/sunos-x64": "0.20.0",
-        "@esbuild/win32-arm64": "0.20.0",
-        "@esbuild/win32-ia32": "0.20.0",
-        "@esbuild/win32-x64": "0.20.0"
-      }
-    },
     "esbuild-plugin-resolve": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/esbuild-plugin-resolve/-/esbuild-plugin-resolve-2.0.0.tgz",
diff --git a/container-runtime/package.json b/container-runtime/package.json
index 13cf14ed5..f5e34a618 100644
--- a/container-runtime/package.json
+++ b/container-runtime/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "start-init",
+  "name": "container-runtime",
   "version": "0.0.0",
   "description": "We want to be the sdk intermitent for the system",
   "module": "./index.js",
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 202e942b5..db5b786fc 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -101,7 +101,7 @@ const evalType = object({
   }),
 })
 
-const jsonParse = (x: Buffer) => JSON.parse(x.toString())
+const jsonParse = (x: string) => JSON.parse(x)
 function reduceMethod(
   methodArgs: object,
   effects: HostSystem,
@@ -160,21 +160,21 @@ export class RpcListener {
             details: error?.message ?? String(error),
             debug: error?.stack,
           },
-          code: 0,
+          code: 1,
         },
       })
       const writeDataToSocket = (x: SocketResponse) =>
-        new Promise((resolve) => s.write(JSON.stringify(x), resolve))
+        new Promise((resolve) => s.write(JSON.stringify(x) + "\n", resolve))
       s.on("data", (a) =>
         Promise.resolve(a)
+          .then((b) => b.toString())
           .then(logData("dataIn"))
           .then(jsonParse)
           .then(captureId)
           .then((x) => this.dealWithInput(x))
           .catch(mapError)
           .then(logData("response"))
-          .then(writeDataToSocket)
-          .finally(() => void s.end()),
+          .then(writeDataToSocket),
       )
     })
   }
@@ -244,7 +244,7 @@ export class RpcListener {
           })),
       )
       .when(exitType, async ({ id }) => {
-        if (this._system) this._system.exit(this.effects)
+        if (this._system) await this._system.exit(this.effects)
         delete this._system
         delete this._effects
 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index a41047ace..a76307368 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -30,7 +30,7 @@ import {
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
 import { RpcResult, matchRpcResult } from "../../RpcListener"
-import { InputSpec } from "@start9labs/start-sdk/cjs/sdk/lib/config/configTypes"
+import { CT } from "@start9labs/start-sdk"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -326,7 +326,7 @@ export class SystemForEmbassy implements System {
           name: action.name,
           description: action.description,
           warning: action.warning || null,
-          input: action["input-spec"] as InputSpec,
+          input: action["input-spec"] as CT.InputSpec,
           disabled: false,
           allowedStatuses,
           group: null,
diff --git a/container-runtime/tsconfig.json b/container-runtime/tsconfig.json
index fd93d5154..0b2fe6e32 100644
--- a/container-runtime/tsconfig.json
+++ b/container-runtime/tsconfig.json
@@ -1,11 +1,5 @@
 {
-  "include": [
-    "./**/*.mjs",
-    "./**/*.js",
-    "src/Adapters/RpcListener.ts",
-    "src/index.ts",
-    "effects.ts"
-  ],
+  "include": ["./**/*.ts"],
   "exclude": ["dist"],
   "inputs": ["./src/index.ts"],
   "compilerOptions": {
diff --git a/core/.gitignore b/core/.gitignore
index ad8368a86..9673044e6 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -8,3 +8,4 @@ secrets.db
 .env
 .editorconfig
 proptest-regressions/**/*
+/startos/bindings/*
\ No newline at end of file
diff --git a/core/startos/bindings/ActionMetadata.ts b/core/startos/bindings/ActionMetadata.ts
deleted file mode 100644
index c9373a5b8..000000000
--- a/core/startos/bindings/ActionMetadata.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AllowedStatuses } from "./AllowedStatuses";
-
-export type ActionMetadata = {
-  name: string;
-  description: string;
-  warning: string | null;
-  input: any;
-  disabled: boolean;
-  allowedStatuses: AllowedStatuses;
-  group: string | null;
-};
diff --git a/core/startos/bindings/AddressInfo.ts b/core/startos/bindings/AddressInfo.ts
deleted file mode 100644
index 1355f72a2..000000000
--- a/core/startos/bindings/AddressInfo.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BindOptions } from "./BindOptions";
-import type { HostId } from "./HostId";
-
-export type AddressInfo = {
-  username: string | null;
-  hostId: HostId;
-  bindOptions: BindOptions;
-  suffix: string;
-};
diff --git a/core/startos/bindings/BindOptions.ts b/core/startos/bindings/BindOptions.ts
deleted file mode 100644
index 6b12139a7..000000000
--- a/core/startos/bindings/BindOptions.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AddSslOptions } from "./AddSslOptions";
-import type { Security } from "./Security";
-
-export type BindOptions = {
-  scheme: string | null;
-  preferredExternalPort: number;
-  addSsl: AddSslOptions | null;
-  secure: Security | null;
-};
diff --git a/core/startos/bindings/BindParams.ts b/core/startos/bindings/BindParams.ts
deleted file mode 100644
index 4aa78e522..000000000
--- a/core/startos/bindings/BindParams.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AddSslOptions } from "./AddSslOptions";
-import type { HostId } from "./HostId";
-import type { HostKind } from "./HostKind";
-import type { Security } from "./Security";
-
-export type BindParams = {
-  kind: HostKind;
-  id: HostId;
-  internalPort: number;
-  scheme: string | null;
-  preferredExternalPort: number;
-  addSsl: AddSslOptions | null;
-  secure: Security | null;
-};
diff --git a/core/startos/bindings/Dependencies.ts b/core/startos/bindings/Dependencies.ts
deleted file mode 100644
index 974495b7b..000000000
--- a/core/startos/bindings/Dependencies.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { DepInfo } from "./DepInfo";
-import type { PackageId } from "./PackageId";
-
-export type Dependencies = { [key: PackageId]: DepInfo };
diff --git a/core/startos/bindings/DestroyOverlayedImageParams.ts b/core/startos/bindings/DestroyOverlayedImageParams.ts
deleted file mode 100644
index 47671604a..000000000
--- a/core/startos/bindings/DestroyOverlayedImageParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type DestroyOverlayedImageParams = { guid: string };
diff --git a/core/startos/bindings/ExportServiceInterfaceParams.ts b/core/startos/bindings/ExportServiceInterfaceParams.ts
deleted file mode 100644
index 93deb0ce5..000000000
--- a/core/startos/bindings/ExportServiceInterfaceParams.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AddressInfo } from "./AddressInfo";
-import type { ServiceInterfaceType } from "./ServiceInterfaceType";
-
-export type ExportServiceInterfaceParams = {
-  id: string;
-  name: string;
-  description: string;
-  hasPrimary: boolean;
-  disabled: boolean;
-  masked: boolean;
-  addressInfo: AddressInfo;
-  type: ServiceInterfaceType;
-};
diff --git a/core/startos/bindings/ExportedHostnameInfo.ts b/core/startos/bindings/ExportedHostnameInfo.ts
deleted file mode 100644
index 23cbdd487..000000000
--- a/core/startos/bindings/ExportedHostnameInfo.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ExportedIpHostname } from "./ExportedIpHostname";
-import type { ExportedOnionHostname } from "./ExportedOnionHostname";
-
-export type ExportedHostnameInfo =
-  | {
-      kind: "ip";
-      networkInterfaceId: string;
-      public: boolean;
-      hostname: ExportedIpHostname;
-    }
-  | { kind: "onion"; hostname: ExportedOnionHostname };
diff --git a/core/startos/bindings/ExposeForDependentsParams.ts b/core/startos/bindings/ExposeForDependentsParams.ts
deleted file mode 100644
index 714771c1e..000000000
--- a/core/startos/bindings/ExposeForDependentsParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ExposeForDependentsParams = { paths: string[] };
diff --git a/core/startos/bindings/GetSystemSmtpParams.ts b/core/startos/bindings/GetSystemSmtpParams.ts
deleted file mode 100644
index b96b9f595..000000000
--- a/core/startos/bindings/GetSystemSmtpParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback";
-
-export type GetSystemSmtpParams = { callback: Callback };
diff --git a/core/startos/bindings/Host.ts b/core/startos/bindings/Host.ts
deleted file mode 100644
index 4188cb404..000000000
--- a/core/startos/bindings/Host.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BindInfo } from "./BindInfo";
-import type { HostAddress } from "./HostAddress";
-import type { HostKind } from "./HostKind";
-
-export type Host = {
-  kind: HostKind;
-  bindings: { [key: number]: BindInfo };
-  addresses: Array<HostAddress>;
-  primary: HostAddress | null;
-};
diff --git a/core/startos/bindings/HostAddress.ts b/core/startos/bindings/HostAddress.ts
deleted file mode 100644
index 9cddf778b..000000000
--- a/core/startos/bindings/HostAddress.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type HostAddress = { kind: "onion"; address: string };
diff --git a/core/startos/bindings/HostInfo.ts b/core/startos/bindings/HostInfo.ts
deleted file mode 100644
index b69dbf6b4..000000000
--- a/core/startos/bindings/HostInfo.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Host } from "./Host";
-import type { HostId } from "./HostId";
-
-export type HostInfo = { [key: HostId]: Host };
diff --git a/core/startos/bindings/InstalledState.ts b/core/startos/bindings/InstalledState.ts
deleted file mode 100644
index 053c3ae66..000000000
--- a/core/startos/bindings/InstalledState.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Manifest } from "./Manifest";
-
-export type InstalledState = { manifest: Manifest };
diff --git a/core/startos/bindings/MainStatus.ts b/core/startos/bindings/MainStatus.ts
deleted file mode 100644
index 878213087..000000000
--- a/core/startos/bindings/MainStatus.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Duration } from "./Duration";
-import type { HealthCheckId } from "./HealthCheckId";
-import type { HealthCheckResult } from "./HealthCheckResult";
-
-export type MainStatus =
-  | { status: "stopped" }
-  | { status: "restarting" }
-  | { status: "stopping"; timeout: Duration }
-  | { status: "starting" }
-  | {
-      status: "running";
-      started: string;
-      health: { [key: HealthCheckId]: HealthCheckResult };
-    }
-  | {
-      status: "backingUp";
-      started: string | null;
-      health: { [key: HealthCheckId]: HealthCheckResult };
-    };
diff --git a/core/startos/bindings/Manifest.ts b/core/startos/bindings/Manifest.ts
deleted file mode 100644
index 688486a7d..000000000
--- a/core/startos/bindings/Manifest.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Alerts } from "./Alerts";
-import type { Dependencies } from "./Dependencies";
-import type { Description } from "./Description";
-import type { HardwareRequirements } from "./HardwareRequirements";
-import type { ImageId } from "./ImageId";
-import type { PackageId } from "./PackageId";
-import type { VolumeId } from "./VolumeId";
-
-export type Manifest = {
-  id: PackageId;
-  title: string;
-  version: string;
-  releaseNotes: string;
-  license: string;
-  replaces: Array<string>;
-  wrapperRepo: string;
-  upstreamRepo: string;
-  supportSite: string;
-  marketingSite: string;
-  donationUrl: string | null;
-  description: Description;
-  images: Array<ImageId>;
-  assets: Array<VolumeId>;
-  volumes: Array<VolumeId>;
-  alerts: Alerts;
-  dependencies: Dependencies;
-  hardwareRequirements: HardwareRequirements;
-  gitHash: string | null;
-  osVersion: string;
-  hasConfig: boolean;
-};
diff --git a/core/startos/bindings/PackageDataEntry.ts b/core/startos/bindings/PackageDataEntry.ts
deleted file mode 100644
index 8b906bb90..000000000
--- a/core/startos/bindings/PackageDataEntry.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ActionId } from "./ActionId";
-import type { ActionMetadata } from "./ActionMetadata";
-import type { CurrentDependencies } from "./CurrentDependencies";
-import type { DataUrl } from "./DataUrl";
-import type { HostInfo } from "./HostInfo";
-import type { PackageState } from "./PackageState";
-import type { ServiceInterfaceId } from "./ServiceInterfaceId";
-import type { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo";
-import type { Status } from "./Status";
-
-export type PackageDataEntry = {
-  stateInfo: PackageState;
-  status: Status;
-  marketplaceUrl: string | null;
-  developerKey: string;
-  icon: DataUrl;
-  lastBackup: string | null;
-  currentDependencies: CurrentDependencies;
-  actions: { [key: ActionId]: ActionMetadata };
-  serviceInterfaces: {
-    [key: ServiceInterfaceId]: ServiceInterfaceWithHostInfo;
-  };
-  hosts: HostInfo;
-  storeExposedDependents: string[];
-};
diff --git a/core/startos/bindings/ParamsMaybePackageId.ts b/core/startos/bindings/ParamsMaybePackageId.ts
deleted file mode 100644
index e9f0f170c..000000000
--- a/core/startos/bindings/ParamsMaybePackageId.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ParamsMaybePackageId = { packageId: string | null };
diff --git a/core/startos/bindings/ParamsPackageId.ts b/core/startos/bindings/ParamsPackageId.ts
deleted file mode 100644
index 7bc919843..000000000
--- a/core/startos/bindings/ParamsPackageId.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ParamsPackageId = { packageId: string };
diff --git a/core/startos/bindings/PasswordType.ts b/core/startos/bindings/PasswordType.ts
deleted file mode 100644
index 0f36f60a2..000000000
--- a/core/startos/bindings/PasswordType.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { EncryptedWire } from "./EncryptedWire";
-
-export type PasswordType = EncryptedWire | string;
diff --git a/core/startos/bindings/Public.ts b/core/startos/bindings/Public.ts
deleted file mode 100644
index 442176303..000000000
--- a/core/startos/bindings/Public.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AllPackageData } from "./AllPackageData";
-import type { ServerInfo } from "./ServerInfo";
-
-export type Public = {
-  serverInfo: ServerInfo;
-  packageData: AllPackageData;
-  ui: any;
-};
diff --git a/core/startos/bindings/RemoveActionParams.ts b/core/startos/bindings/RemoveActionParams.ts
deleted file mode 100644
index fcd567c3f..000000000
--- a/core/startos/bindings/RemoveActionParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type RemoveActionParams = { id: string };
diff --git a/core/startos/bindings/RemoveAddressParams.ts b/core/startos/bindings/RemoveAddressParams.ts
deleted file mode 100644
index 578631d39..000000000
--- a/core/startos/bindings/RemoveAddressParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type RemoveAddressParams = { id: string };
diff --git a/core/startos/bindings/ReverseProxyBind.ts b/core/startos/bindings/ReverseProxyBind.ts
deleted file mode 100644
index c9d67b127..000000000
--- a/core/startos/bindings/ReverseProxyBind.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ReverseProxyBind = {
-  ip: string | null;
-  port: number;
-  ssl: boolean;
-};
diff --git a/core/startos/bindings/ReverseProxyParams.ts b/core/startos/bindings/ReverseProxyParams.ts
deleted file mode 100644
index 6f684b780..000000000
--- a/core/startos/bindings/ReverseProxyParams.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ReverseProxyBind } from "./ReverseProxyBind";
-import type { ReverseProxyDestination } from "./ReverseProxyDestination";
-import type { ReverseProxyHttp } from "./ReverseProxyHttp";
-
-export type ReverseProxyParams = {
-  bind: ReverseProxyBind;
-  dst: ReverseProxyDestination;
-  http: ReverseProxyHttp;
-};
diff --git a/core/startos/bindings/ServerInfo.ts b/core/startos/bindings/ServerInfo.ts
deleted file mode 100644
index 618d396fd..000000000
--- a/core/startos/bindings/ServerInfo.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Governor } from "./Governor";
-import type { IpInfo } from "./IpInfo";
-import type { ServerStatus } from "./ServerStatus";
-import type { WifiInfo } from "./WifiInfo";
-
-export type ServerInfo = {
-  arch: string;
-  platform: string;
-  id: string;
-  hostname: string;
-  version: string;
-  lastBackup: string | null;
-  eosVersionCompat: string;
-  lanAddress: string;
-  onionAddress: string;
-  /**
-   * for backwards compatibility
-   */
-  torAddress: string;
-  ipInfo: { [key: string]: IpInfo };
-  statusInfo: ServerStatus;
-  wifi: WifiInfo;
-  unreadNotificationCount: number;
-  passwordHash: string;
-  pubkey: string;
-  caFingerprint: string;
-  ntpSynced: boolean;
-  zram: boolean;
-  governor: Governor | null;
-};
diff --git a/core/startos/bindings/ServerStatus.ts b/core/startos/bindings/ServerStatus.ts
deleted file mode 100644
index e72d5d6de..000000000
--- a/core/startos/bindings/ServerStatus.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BackupProgress } from "./BackupProgress";
-import type { PackageId } from "./PackageId";
-import type { UpdateProgress } from "./UpdateProgress";
-
-export type ServerStatus = {
-  backupProgress: { [key: PackageId]: BackupProgress } | null;
-  updated: boolean;
-  updateProgress: UpdateProgress | null;
-  shuttingDown: boolean;
-  restarting: boolean;
-};
diff --git a/core/startos/bindings/ServiceInterface.ts b/core/startos/bindings/ServiceInterface.ts
deleted file mode 100644
index 4167257bb..000000000
--- a/core/startos/bindings/ServiceInterface.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AddressInfo } from "./AddressInfo";
-import type { ServiceInterfaceId } from "./ServiceInterfaceId";
-import type { ServiceInterfaceType } from "./ServiceInterfaceType";
-
-export type ServiceInterface = {
-  id: ServiceInterfaceId;
-  name: string;
-  description: string;
-  hasPrimary: boolean;
-  disabled: boolean;
-  masked: boolean;
-  addressInfo: AddressInfo;
-  type: ServiceInterfaceType;
-};
diff --git a/core/startos/bindings/ServiceInterfaceType.ts b/core/startos/bindings/ServiceInterfaceType.ts
deleted file mode 100644
index fadd11f9d..000000000
--- a/core/startos/bindings/ServiceInterfaceType.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ServiceInterfaceType = "ui" | "p2p" | "api";
diff --git a/core/startos/bindings/ServiceInterfaceWithHostInfo.ts b/core/startos/bindings/ServiceInterfaceWithHostInfo.ts
deleted file mode 100644
index bef83abe2..000000000
--- a/core/startos/bindings/ServiceInterfaceWithHostInfo.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AddressInfo } from "./AddressInfo";
-import type { ExportedHostInfo } from "./ExportedHostInfo";
-import type { ServiceInterfaceId } from "./ServiceInterfaceId";
-import type { ServiceInterfaceType } from "./ServiceInterfaceType";
-
-export type ServiceInterfaceWithHostInfo = {
-  hostInfo: ExportedHostInfo;
-  id: ServiceInterfaceId;
-  name: string;
-  description: string;
-  hasPrimary: boolean;
-  disabled: boolean;
-  masked: boolean;
-  addressInfo: AddressInfo;
-  type: ServiceInterfaceType;
-};
diff --git a/core/startos/bindings/SetConfigured.ts b/core/startos/bindings/SetConfigured.ts
deleted file mode 100644
index ff9eaf11d..000000000
--- a/core/startos/bindings/SetConfigured.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type SetConfigured = { configured: boolean };
diff --git a/core/startos/bindings/SetMainStatus.ts b/core/startos/bindings/SetMainStatus.ts
deleted file mode 100644
index 653342e5f..000000000
--- a/core/startos/bindings/SetMainStatus.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Status } from "./Status";
-
-export type SetMainStatus = { status: Status };
diff --git a/core/startos/bindings/SetStoreParams.ts b/core/startos/bindings/SetStoreParams.ts
deleted file mode 100644
index 8737295bd..000000000
--- a/core/startos/bindings/SetStoreParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type SetStoreParams = { value: any; path: string };
diff --git a/core/startos/bindings/Status.ts b/core/startos/bindings/Status.ts
deleted file mode 100644
index 6b240347d..000000000
--- a/core/startos/bindings/Status.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { MainStatus } from "./MainStatus";
-
-export type Status = { configured: boolean; main: MainStatus };
diff --git a/core/startos/bindings/UpdatingState.ts b/core/startos/bindings/UpdatingState.ts
deleted file mode 100644
index 37a83f0df..000000000
--- a/core/startos/bindings/UpdatingState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { InstallingInfo } from "./InstallingInfo";
-import type { Manifest } from "./Manifest";
-
-export type UpdatingState = {
-  manifest: Manifest;
-  installingInfo: InstallingInfo;
-};
diff --git a/core/startos/bindings/index.ts b/core/startos/bindings/index.ts
deleted file mode 100644
index fd422a2f5..000000000
--- a/core/startos/bindings/index.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-export { ActionId } from "./ActionId";
-export { ActionMetadata } from "./ActionMetadata";
-export { AddressInfo } from "./AddressInfo";
-export { AddSslOptions } from "./AddSslOptions";
-export { Alerts } from "./Alerts";
-export { Algorithm } from "./Algorithm";
-export { AllowedStatuses } from "./AllowedStatuses";
-export { AllPackageData } from "./AllPackageData";
-export { AlpnInfo } from "./AlpnInfo";
-export { BackupProgress } from "./BackupProgress";
-export { BindInfo } from "./BindInfo";
-export { BindOptions } from "./BindOptions";
-export { BindParams } from "./BindParams";
-export { Callback } from "./Callback";
-export { ChrootParams } from "./ChrootParams";
-export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams";
-export { CurrentDependencies } from "./CurrentDependencies";
-export { CurrentDependencyInfo } from "./CurrentDependencyInfo";
-export { DataUrl } from "./DataUrl";
-export { Dependencies } from "./Dependencies";
-export { DependencyKind } from "./DependencyKind";
-export { DependencyRequirement } from "./DependencyRequirement";
-export { DepInfo } from "./DepInfo";
-export { Description } from "./Description";
-export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams";
-export { Duration } from "./Duration";
-export { EncryptedWire } from "./EncryptedWire";
-export { ExecuteAction } from "./ExecuteAction";
-export { ExportActionParams } from "./ExportActionParams";
-export { ExportedHostInfo } from "./ExportedHostInfo";
-export { ExportedHostnameInfo } from "./ExportedHostnameInfo";
-export { ExportedIpHostname } from "./ExportedIpHostname";
-export { ExportedOnionHostname } from "./ExportedOnionHostname";
-export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams";
-export { ExposeForDependentsParams } from "./ExposeForDependentsParams";
-export { FullProgress } from "./FullProgress";
-export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind";
-export { GetHostInfoParams } from "./GetHostInfoParams";
-export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams";
-export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams";
-export { GetServicePortForwardParams } from "./GetServicePortForwardParams";
-export { GetSslCertificateParams } from "./GetSslCertificateParams";
-export { GetSslKeyParams } from "./GetSslKeyParams";
-export { GetStoreParams } from "./GetStoreParams";
-export { GetSystemSmtpParams } from "./GetSystemSmtpParams";
-export { Governor } from "./Governor";
-export { HardwareRequirements } from "./HardwareRequirements";
-export { HealthCheckId } from "./HealthCheckId";
-export { HealthCheckResult } from "./HealthCheckResult";
-export { HostAddress } from "./HostAddress";
-export { HostId } from "./HostId";
-export { HostInfo } from "./HostInfo";
-export { HostKind } from "./HostKind";
-export { Host } from "./Host";
-export { ImageId } from "./ImageId";
-export { InstalledState } from "./InstalledState";
-export { InstallingInfo } from "./InstallingInfo";
-export { InstallingState } from "./InstallingState";
-export { IpInfo } from "./IpInfo";
-export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams";
-export { MainStatus } from "./MainStatus";
-export { Manifest } from "./Manifest";
-export { MaybeUtf8String } from "./MaybeUtf8String";
-export { MountParams } from "./MountParams";
-export { MountTarget } from "./MountTarget";
-export { NamedProgress } from "./NamedProgress";
-export { PackageDataEntry } from "./PackageDataEntry";
-export { PackageId } from "./PackageId";
-export { PackageState } from "./PackageState";
-export { ParamsMaybePackageId } from "./ParamsMaybePackageId";
-export { ParamsPackageId } from "./ParamsPackageId";
-export { PasswordType } from "./PasswordType";
-export { Progress } from "./Progress";
-export { Public } from "./Public";
-export { RemoveActionParams } from "./RemoveActionParams";
-export { RemoveAddressParams } from "./RemoveAddressParams";
-export { ReverseProxyBind } from "./ReverseProxyBind";
-export { ReverseProxyDestination } from "./ReverseProxyDestination";
-export { ReverseProxyHttp } from "./ReverseProxyHttp";
-export { ReverseProxyParams } from "./ReverseProxyParams";
-export { Security } from "./Security";
-export { ServerInfo } from "./ServerInfo";
-export { ServerSpecs } from "./ServerSpecs";
-export { ServerStatus } from "./ServerStatus";
-export { ServiceInterfaceId } from "./ServiceInterfaceId";
-export { ServiceInterface } from "./ServiceInterface";
-export { ServiceInterfaceType } from "./ServiceInterfaceType";
-export { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo";
-export { SessionList } from "./SessionList";
-export { Sessions } from "./Sessions";
-export { Session } from "./Session";
-export { SetConfigured } from "./SetConfigured";
-export { SetDependenciesParams } from "./SetDependenciesParams";
-export { SetHealth } from "./SetHealth";
-export { SetMainStatus } from "./SetMainStatus";
-export { SetStoreParams } from "./SetStoreParams";
-export { Status } from "./Status";
-export { UpdateProgress } from "./UpdateProgress";
-export { UpdatingState } from "./UpdatingState";
-export { VolumeId } from "./VolumeId";
-export { WifiInfo } from "./WifiInfo";
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 4753a4290..774b1f1cf 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -149,6 +149,7 @@ async fn restore_packages(
                 S9pk::open(
                     backup_dir.path().join(&id).with_extension("s9pk"),
                     Some(&id),
+                    true,
                 )
                 .await?,
                 Some(backup_dir),
diff --git a/core/startos/src/core/rpc_continuations.rs b/core/startos/src/core/rpc_continuations.rs
index 9a82cb1fe..0f25dd383 100644
--- a/core/startos/src/core/rpc_continuations.rs
+++ b/core/startos/src/core/rpc_continuations.rs
@@ -19,7 +19,7 @@ impl RequestGuid {
     }
 
     pub fn from(r: &str) -> Option<RequestGuid> {
-        if r.len() != 64 {
+        if r.len() != 32 {
             return None;
         }
         for c in r.chars() {
diff --git a/core/startos/src/disk/main.rs b/core/startos/src/disk/main.rs
index a337a4473..c7c634303 100644
--- a/core/startos/src/disk/main.rs
+++ b/core/startos/src/disk/main.rs
@@ -64,10 +64,10 @@ where
             .await?;
     }
     let mut guid = format!(
-        "EMBASSY_{}",
+        "STARTOS_{}",
         base32::encode(
             base32::Alphabet::RFC4648 { padding: false },
-            &rand::random::<[u8; 32]>(),
+            &rand::random::<[u8; 20]>(),
         )
     );
     if !encrypted {
@@ -219,7 +219,7 @@ pub async fn import<P: AsRef<Path>>(
     if scan
         .values()
         .filter_map(|a| a.as_ref())
-        .filter(|a| a.starts_with("EMBASSY_"))
+        .filter(|a| a.starts_with("STARTOS_") || a.starts_with("EMBASSY_"))
         .next()
         .is_none()
     {
diff --git a/core/startos/src/disk/mount/guard.rs b/core/startos/src/disk/mount/guard.rs
index af46904fd..dc73f5527 100644
--- a/core/startos/src/disk/mount/guard.rs
+++ b/core/startos/src/disk/mount/guard.rs
@@ -2,6 +2,7 @@ use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Weak};
 
+use bytes::Buf;
 use lazy_static::lazy_static;
 use models::ResultExt;
 use tokio::sync::Mutex;
@@ -115,7 +116,7 @@ impl GenericMountGuard for MountGuard {
 async fn tmp_mountpoint(source: &impl FileSystem) -> Result<PathBuf, Error> {
     Ok(Path::new(TMP_MOUNTPOINT).join(base32::encode(
         base32::Alphabet::RFC4648 { padding: false },
-        &source.source_hash().await?,
+        &source.source_hash().await?[0..20],
     )))
 }
 
diff --git a/core/startos/src/inspect.rs b/core/startos/src/inspect.rs
deleted file mode 100644
index 6d24fc32a..000000000
--- a/core/startos/src/inspect.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::path::PathBuf;
-
-use clap::Parser;
-use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler};
-use serde::{Deserialize, Serialize};
-
-use crate::context::CliContext;
-use crate::s9pk::manifest::Manifest;
-// use crate::s9pk::reader::S9pkReader;
-use crate::util::serde::HandlerExtSerde;
-use crate::Error;
-
-pub fn inspect() -> ParentHandler {
-    ParentHandler::new()
-        .subcommand("hash", from_fn_async(hash))
-        .subcommand(
-            "manifest",
-            from_fn_async(manifest).with_display_serializable(),
-        )
-        .subcommand("license", from_fn_async(license).no_display())
-        .subcommand("icon", from_fn_async(icon).no_display())
-        .subcommand("instructions", from_fn_async(instructions).no_display())
-        .subcommand("docker-images", from_fn_async(docker_images).no_display())
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct HashParams {
-    path: PathBuf,
-}
-
-pub async fn hash(_: CliContext, HashParams { path }: HashParams) -> Result<String, Error> {
-    Ok(S9pkReader::open(path, true)
-        .await?
-        .hash_str()
-        .unwrap()
-        .to_owned())
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct ManifestParams {
-    path: PathBuf,
-    #[arg(long = "no-verify")]
-    no_verify: bool,
-}
-
-// #[command(cli_only, display(display_serializable))]
-pub async fn manifest(
-    _: CliContext,
-    ManifestParams { .. }: ManifestParams,
-) -> Result<Manifest, Error> {
-    // S9pkReader::open(path, !no_verify).await?.manifest().await
-    todo!()
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct InspectParams {
-    path: PathBuf,
-    #[arg(long = "no-verify")]
-    no_verify: bool,
-}
-
-pub async fn license(
-    _: AnyContext,
-    InspectParams { path, no_verify }: InspectParams,
-) -> Result<(), Error> {
-    tokio::io::copy(
-        &mut S9pkReader::open(path, !no_verify).await?.license().await?,
-        &mut tokio::io::stdout(),
-    )
-    .await?;
-    Ok(())
-}
-
-pub async fn icon(
-    _: AnyContext,
-    InspectParams { path, no_verify }: InspectParams,
-) -> Result<(), Error> {
-    tokio::io::copy(
-        &mut S9pkReader::open(path, !no_verify).await?.icon().await?,
-        &mut tokio::io::stdout(),
-    )
-    .await?;
-    Ok(())
-}
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct InstructionParams {
-    path: PathBuf,
-    #[arg(long = "no-verify")]
-    no_verify: bool,
-}
-
-pub async fn instructions(
-    _: CliContext,
-    InstructionParams { path, no_verify }: InstructionParams,
-) -> Result<(), Error> {
-    tokio::io::copy(
-        &mut S9pkReader::open(path, !no_verify)
-            .await?
-            .instructions()
-            .await?,
-        &mut tokio::io::stdout(),
-    )
-    .await?;
-    Ok(())
-}
-pub async fn docker_images(
-    _: AnyContext,
-    InspectParams { path, no_verify }: InspectParams,
-) -> Result<(), Error> {
-    tokio::io::copy(
-        &mut S9pkReader::open(path, !no_verify)
-            .await?
-            .docker_images()
-            .await?,
-        &mut tokio::io::stdout(),
-    )
-    .await?;
-    Ok(())
-}
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index f20f5a5b0..ca8f1edbd 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -148,6 +148,7 @@ pub async fn install(
             .parse()?,
         )
         .await?,
+        true,
     )
     .await?;
 
@@ -257,7 +258,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
     .await;
     tokio::spawn(async move {
         if let Err(e) = async {
-            let s9pk = S9pk::deserialize(&file).await?;
+            let s9pk = S9pk::deserialize(&file, true).await?;
             let _ = id_send.send(s9pk.as_manifest().id.clone());
             ctx.services
                 .install(ctx.clone(), s9pk, None::<Never>)
@@ -423,7 +424,12 @@ pub async fn uninstall(
 
     let return_id = id.clone();
 
-    tokio::spawn(async move { ctx.services.uninstall(&ctx, &id).await });
+    tokio::spawn(async move {
+        if let Err(e) = ctx.services.uninstall(&ctx, &id).await {
+            tracing::error!("Error uninstalling service {id}: {e}");
+            tracing::debug!("{e:?}");
+        }
+    });
 
     Ok(return_id)
 }
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 448db9ff2..d6dad2c87 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -38,8 +38,6 @@ pub mod error;
 pub mod firmware;
 pub mod hostname;
 pub mod init;
-pub mod progress;
-// pub mod inspect;
 pub mod install;
 pub mod logs;
 pub mod lxc;
@@ -48,6 +46,7 @@ pub mod net;
 pub mod notifications;
 pub mod os_install;
 pub mod prelude;
+pub mod progress;
 pub mod properties;
 pub mod registry;
 pub mod s9pk;
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 99bfac250..7c4ed1c28 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -18,17 +18,13 @@ use tokio_stream::wrappers::LinesStream;
 use tokio_tungstenite::tungstenite::Message;
 use tracing::instrument;
 
+use crate::context::{CliContext, RpcContext};
+use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::error::ResultExt;
+use crate::lxc::ContainerId;
 use crate::prelude::*;
 use crate::util::serde::Reversible;
-use crate::{
-    context::{CliContext, RpcContext},
-    lxc::ContainerId,
-};
-use crate::{
-    core::rpc_continuations::{RequestGuid, RpcContinuation},
-    util::Invoke,
-};
+use crate::util::Invoke;
 
 #[pin_project::pin_project]
 pub struct LogStream {
@@ -393,7 +389,9 @@ pub async fn journalctl(
     before: bool,
     follow: bool,
 ) -> Result<LogStream, Error> {
-    let mut cmd = gen_journalctl_command(&id, limit);
+    let mut cmd = gen_journalctl_command(&id);
+
+    cmd.arg(format!("--lines={}", limit));
 
     let cursor_formatted = format!("--after-cursor={}", cursor.unwrap_or(""));
     if cursor.is_some() {
@@ -410,12 +408,15 @@ pub async fn journalctl(
         .with_kind(ErrorKind::Deserialization)?;
 
     if follow {
-        let mut follow_cmd = gen_journalctl_command(&id, limit);
+        let mut follow_cmd = gen_journalctl_command(&id);
         follow_cmd.arg("-f");
         if let Some(last) = deserialized_entries.last() {
-            cmd.arg(format!("--after-cursor={}", last.cursor));
+            follow_cmd.arg(format!("--after-cursor={}", last.cursor));
+            follow_cmd.arg("--lines=all");
+        } else {
+            follow_cmd.arg("--lines=0");
         }
-        let mut child = cmd.stdout(Stdio::piped()).spawn()?;
+        let mut child = follow_cmd.stdout(Stdio::piped()).spawn()?;
         let out =
             BufReader::new(child.stdout.take().ok_or_else(|| {
                 Error::new(eyre!("No stdout available"), crate::ErrorKind::Journald)
@@ -450,7 +451,7 @@ pub async fn journalctl(
     }
 }
 
-fn gen_journalctl_command(id: &LogSource, limit: usize) -> Command {
+fn gen_journalctl_command(id: &LogSource) -> Command {
     let mut cmd = match id {
         LogSource::Container(container_id) => {
             let mut cmd = Command::new("lxc-attach");
@@ -465,7 +466,6 @@ fn gen_journalctl_command(id: &LogSource, limit: usize) -> Command {
 
     cmd.arg("--output=json");
     cmd.arg("--output-fields=MESSAGE");
-    cmd.arg(format!("-n{}", limit));
     match id {
         LogSource::Kernel => {
             cmd.arg("-k");
@@ -477,7 +477,6 @@ fn gen_journalctl_command(id: &LogSource, limit: usize) -> Command {
         LogSource::System => {
             cmd.arg("-u");
             cmd.arg(SYSTEM_UNIT);
-            cmd.arg(format!("_COMM={}", SYSTEM_UNIT));
         }
         LogSource::Container(_container_id) => {
             cmd.arg("-u").arg("container-runtime.service");
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 5a6e05500..9dfdff7f9 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -288,14 +288,6 @@ impl LxcContainer {
         }
         self.rootfs.take().unmount(true).await?;
         let rootfs_path = self.rootfs_dir();
-        let err_path = rootfs_path.join("var/log/containerRuntime.err");
-        if tokio::fs::metadata(&err_path).await.is_ok() {
-            let mut lines = BufReader::new(File::open(&err_path).await?).lines();
-            while let Some(line) = lines.next_line().await? {
-                let container = &**self.guid;
-                tracing::error!(container, "{}", line);
-            }
-        }
         if tokio::fs::metadata(&rootfs_path).await.is_ok()
             && tokio_stream::wrappers::ReadDirStream::new(tokio::fs::read_dir(&rootfs_path).await?)
                 .count()
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 968393e4e..5fc538602 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -134,7 +134,7 @@ pub async fn publish(
             .with_prefix("[1/3]")
             .with_message("Querying s9pk");
         pb.enable_steady_tick(Duration::from_millis(200));
-        let s9pk = S9pk::open(&path, None).await?;
+        let s9pk = S9pk::open(&path, None, false).await?;
         let m = s9pk.as_manifest().clone();
         pb.set_style(plain_line_style.clone());
         pb.abandon();
@@ -145,7 +145,7 @@ pub async fn publish(
             .with_prefix("[1/3]")
             .with_message("Verifying s9pk");
         pb.enable_steady_tick(Duration::from_millis(200));
-        let s9pk = S9pk::open(&path, None).await?;
+        let s9pk = S9pk::open(&path, None, false).await?;
         // s9pk.validate().await?;
         todo!();
         let m = s9pk.as_manifest().clone();
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index 582a0a9d9..312d663fd 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeSet;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
@@ -60,6 +61,10 @@ fn inspect() -> ParentHandler<S9pkPath> {
                 .with_inherited(only_parent)
                 .with_display_serializable(),
         )
+        .subcommand(
+            "cat",
+            from_fn_async(cat).with_inherited(only_parent).no_display(),
+        )
         .subcommand(
             "manifest",
             from_fn_async(inspect_manifest)
@@ -72,109 +77,116 @@ fn inspect() -> ParentHandler<S9pkPath> {
 struct AddImageParams {
     id: ImageId,
     image: String,
+    arches: Option<Vec<String>>,
 }
 async fn add_image(
     ctx: CliContext,
-    AddImageParams { id, image }: AddImageParams,
+    AddImageParams { id, image, arches }: AddImageParams,
     S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<(), Error> {
+    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?, false)
+        .await?
+        .into_dyn();
+    let arches: BTreeSet<_> = arches
+        .unwrap_or_else(|| vec!["x86_64".to_owned(), "aarch64".to_owned()])
+        .into_iter()
+        .collect();
     let tmpdir = TmpDir::new().await?;
-    let sqfs_path = tmpdir.join("image.squashfs");
-    let arch = String::from_utf8(
-        Command::new(CONTAINER_TOOL)
-            .arg("run")
-            .arg("--rm")
-            .arg("--entrypoint")
-            .arg("uname")
-            .arg(&image)
-            .arg("-m")
-            .invoke(ErrorKind::Docker)
-            .await?,
-    )?;
-    let env = String::from_utf8(
-        Command::new(CONTAINER_TOOL)
-            .arg("run")
-            .arg("--rm")
-            .arg("--entrypoint")
-            .arg("env")
-            .arg(&image)
-            .invoke(ErrorKind::Docker)
-            .await?,
-    )?
-    .lines()
-    .filter(|l| {
-        l.trim()
-            .split_once("=")
-            .map_or(false, |(v, _)| !SKIP_ENV.contains(&v))
-    })
-    .join("\n")
-        + "\n";
-    let workdir = Path::new(
-        String::from_utf8(
+    for arch in arches {
+        let sqfs_path = tmpdir.join(format!("image.{arch}.squashfs"));
+        let docker_platform = if arch == "x86_64" {
+            "--platform=linux/amd64".to_owned()
+        } else if arch == "aarch64" {
+            "--platform=linux/arm64".to_owned()
+        } else {
+            format!("--platform=linux/{arch}")
+        };
+        let env = String::from_utf8(
             Command::new(CONTAINER_TOOL)
                 .arg("run")
                 .arg("--rm")
+                .arg(&docker_platform)
                 .arg("--entrypoint")
-                .arg("pwd")
+                .arg("env")
                 .arg(&image)
                 .invoke(ErrorKind::Docker)
                 .await?,
         )?
-        .trim(),
-    )
-    .to_owned();
-    let container_id = String::from_utf8(
+        .lines()
+        .filter(|l| {
+            l.trim()
+                .split_once("=")
+                .map_or(false, |(v, _)| !SKIP_ENV.contains(&v))
+        })
+        .join("\n")
+            + "\n";
+        let workdir = Path::new(
+            String::from_utf8(
+                Command::new(CONTAINER_TOOL)
+                    .arg("run")
+                    .arg(&docker_platform)
+                    .arg("--rm")
+                    .arg("--entrypoint")
+                    .arg("pwd")
+                    .arg(&image)
+                    .invoke(ErrorKind::Docker)
+                    .await?,
+            )?
+            .trim(),
+        )
+        .to_owned();
+        let container_id = String::from_utf8(
+            Command::new(CONTAINER_TOOL)
+                .arg("create")
+                .arg(&docker_platform)
+                .arg(&image)
+                .invoke(ErrorKind::Docker)
+                .await?,
+        )?;
+        Command::new("bash")
+            .arg("-c")
+            .arg(format!(
+                "{CONTAINER_TOOL} export {container_id} | mksquashfs - {sqfs} -tar",
+                container_id = container_id.trim(),
+                sqfs = sqfs_path.display()
+            ))
+            .invoke(ErrorKind::Docker)
+            .await?;
         Command::new(CONTAINER_TOOL)
-            .arg("create")
-            .arg(&image)
+            .arg("rm")
+            .arg(container_id.trim())
             .invoke(ErrorKind::Docker)
-            .await?,
-    )?;
-    Command::new("bash")
-        .arg("-c")
-        .arg(format!(
-            "{CONTAINER_TOOL} export {container_id} | mksquashfs - {sqfs} -tar",
-            container_id = container_id.trim(),
-            sqfs = sqfs_path.display()
-        ))
-        .invoke(ErrorKind::Docker)
-        .await?;
-    Command::new(CONTAINER_TOOL)
-        .arg("rm")
-        .arg(container_id.trim())
-        .invoke(ErrorKind::Docker)
-        .await?;
-    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?)
-        .await?
-        .into_dyn();
-    let archive = s9pk.as_archive_mut();
-    archive.set_signer(ctx.developer_key()?.clone());
-    archive.contents_mut().insert_path(
-        Path::new("images")
-            .join(arch.trim())
-            .join(&id)
-            .with_extension("squashfs"),
-        Entry::file(DynFileSource::new(sqfs_path)),
-    )?;
-    archive.contents_mut().insert_path(
-        Path::new("images")
-            .join(arch.trim())
-            .join(&id)
-            .with_extension("env"),
-        Entry::file(DynFileSource::new(Arc::from(Vec::from(env)))),
-    )?;
-    archive.contents_mut().insert_path(
-        Path::new("images")
-            .join(arch.trim())
-            .join(&id)
-            .with_extension("json"),
-        Entry::file(DynFileSource::new(Arc::from(
-            serde_json::to_vec(&serde_json::json!({
-                "workdir": workdir
-            }))
-            .with_kind(ErrorKind::Serialization)?,
-        ))),
-    )?;
+            .await?;
+        let archive = s9pk.as_archive_mut();
+        archive.set_signer(ctx.developer_key()?.clone());
+        archive.contents_mut().insert_path(
+            Path::new("images")
+                .join(&arch)
+                .join(&id)
+                .with_extension("squashfs"),
+            Entry::file(DynFileSource::new(sqfs_path)),
+        )?;
+        archive.contents_mut().insert_path(
+            Path::new("images")
+                .join(&arch)
+                .join(&id)
+                .with_extension("env"),
+            Entry::file(DynFileSource::new(Arc::from(Vec::from(env)))),
+        )?;
+        archive.contents_mut().insert_path(
+            Path::new("images")
+                .join(&arch)
+                .join(&id)
+                .with_extension("json"),
+            Entry::file(DynFileSource::new(Arc::from(
+                serde_json::to_vec(&serde_json::json!({
+                    "workdir": workdir
+                }))
+                .with_kind(ErrorKind::Serialization)?,
+            ))),
+        )?;
+    }
+    s9pk.as_manifest_mut().images.insert(id);
     let tmp_path = s9pk_path.with_extension("s9pk.tmp");
     let mut tmp_file = File::create(&tmp_path).await?;
     s9pk.serialize(&mut tmp_file, true).await?;
@@ -193,7 +205,7 @@ async fn edit_manifest(
     EditManifestParams { expression }: EditManifestParams,
     S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<Manifest, Error> {
-    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?).await?;
+    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?, false).await?;
     let old = serde_json::to_value(s9pk.as_manifest()).with_kind(ErrorKind::Serialization)?;
     *s9pk.as_manifest_mut() = serde_json::from_value(apply_expr(old.into(), &expression)?.into())
         .with_kind(ErrorKind::Serialization)?;
@@ -214,15 +226,45 @@ async fn file_tree(
     _: Empty,
     S9pkPath { s9pk }: S9pkPath,
 ) -> Result<Vec<PathBuf>, Error> {
-    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
+    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?, false).await?;
     Ok(s9pk.as_archive().contents().file_paths(""))
 }
 
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+struct CatParams {
+    file_path: PathBuf,
+}
+async fn cat(
+    ctx: CliContext,
+    CatParams { file_path }: CatParams,
+    S9pkPath { s9pk }: S9pkPath,
+) -> Result<(), Error> {
+    use crate::s9pk::merkle_archive::source::FileSource;
+
+    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?, false).await?;
+    tokio::io::copy(
+        &mut s9pk
+            .as_archive()
+            .contents()
+            .get_path(&file_path)
+            .or_not_found(&file_path.display())?
+            .as_file()
+            .or_not_found(&file_path.display())?
+            .reader()
+            .await?,
+        &mut tokio::io::stdout(),
+    )
+    .await?;
+    Ok(())
+}
+
 async fn inspect_manifest(
     ctx: CliContext,
     _: Empty,
     S9pkPath { s9pk }: S9pkPath,
 ) -> Result<Manifest, Error> {
-    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
+    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?, false).await?;
     Ok(s9pk.as_manifest().clone())
 }
diff --git a/core/startos/src/s9pk/v1/docker.rs b/core/startos/src/s9pk/v1/docker.rs
index 7f1507703..bbb1f2f09 100644
--- a/core/startos/src/s9pk/v1/docker.rs
+++ b/core/startos/src/s9pk/v1/docker.rs
@@ -1,4 +1,3 @@
-use std::borrow::Cow;
 use std::collections::BTreeSet;
 use std::io::SeekFrom;
 use std::path::Path;
@@ -10,7 +9,7 @@ use tokio::io::{AsyncRead, AsyncSeek, AsyncSeekExt};
 use tokio_tar::{Archive, Entry};
 
 use crate::util::io::from_cbor_async_reader;
-use crate::{Error, ErrorKind, ARCH};
+use crate::{Error, ErrorKind};
 
 #[derive(Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -26,8 +25,8 @@ pub enum DockerReader<R: AsyncRead + Unpin> {
     MultiArch(#[pin] Entry<Archive<R>>),
 }
 impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> DockerReader<R> {
-    pub async fn new(mut rdr: R) -> Result<Self, Error> {
-        let arch = if let Some(multiarch) = tokio_tar::Archive::new(&mut rdr)
+    pub async fn list_arches(rdr: &mut R) -> Result<BTreeSet<String>, Error> {
+        if let Some(multiarch) = tokio_tar::Archive::new(rdr)
             .entries()?
             .try_filter_map(|e| {
                 async move {
@@ -43,41 +42,38 @@ impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> DockerReader<R> {
             .await?
         {
             let multiarch: DockerMultiArch = from_cbor_async_reader(multiarch).await?;
-            Some(if multiarch.available.contains(&**ARCH) {
-                Cow::Borrowed(&**ARCH)
-            } else {
-                Cow::Owned(multiarch.default)
-            })
+            Ok(multiarch.available)
         } else {
-            None
-        };
+            Err(Error::new(
+                eyre!("Single arch legacy s9pks not supported"),
+                ErrorKind::ParseS9pk,
+            ))
+        }
+    }
+    pub async fn new(mut rdr: R, arch: &str) -> Result<Self, Error> {
         rdr.seek(SeekFrom::Start(0)).await?;
-        if let Some(arch) = arch {
-            if let Some(image) = tokio_tar::Archive::new(rdr)
-                .entries()?
-                .try_filter_map(|e| {
-                    let arch = arch.clone();
-                    async move {
-                        Ok(if &*e.path()? == Path::new(&format!("{}.tar", arch)) {
-                            Some(e)
-                        } else {
-                            None
-                        })
-                    }
-                    .boxed()
-                })
-                .try_next()
-                .await?
-            {
-                Ok(Self::MultiArch(image))
-            } else {
-                Err(Error::new(
-                    eyre!("Docker image section does not contain tarball for architecture"),
-                    ErrorKind::ParseS9pk,
-                ))
-            }
+        if let Some(image) = tokio_tar::Archive::new(rdr)
+            .entries()?
+            .try_filter_map(|e| {
+                let arch = arch.clone();
+                async move {
+                    Ok(if &*e.path()? == Path::new(&format!("{}.tar", arch)) {
+                        Some(e)
+                    } else {
+                        None
+                    })
+                }
+                .boxed()
+            })
+            .try_next()
+            .await?
+        {
+            Ok(Self::MultiArch(image))
         } else {
-            Ok(Self::SingleArch(rdr))
+            Err(Error::new(
+                eyre!("Docker image section does not contain tarball for architecture"),
+                ErrorKind::ParseS9pk,
+            ))
         }
     }
 }
diff --git a/core/startos/src/s9pk/v1/reader.rs b/core/startos/src/s9pk/v1/reader.rs
index 82f62e1df..4288ac0b0 100644
--- a/core/startos/src/s9pk/v1/reader.rs
+++ b/core/startos/src/s9pk/v1/reader.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeSet;
 use std::io::SeekFrom;
 use std::ops::Range;
 use std::path::Path;
@@ -158,8 +159,8 @@ impl S9pkReader {
 }
 impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<R> {
     #[instrument(skip_all)]
-    pub async fn image_tags(&mut self) -> Result<Vec<ImageTag>, Error> {
-        let mut tar = tokio_tar::Archive::new(self.docker_images().await?);
+    pub async fn image_tags(&mut self, arch: &str) -> Result<Vec<ImageTag>, Error> {
+        let mut tar = tokio_tar::Archive::new(self.docker_images(arch).await?);
         let mut entries = tar.entries()?;
         while let Some(mut entry) = entries.try_next().await? {
             if &*entry.path()? != Path::new("manifest.json") {
@@ -280,8 +281,15 @@ impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<R> {
         self.read_handle(self.toc.icon).await
     }
 
-    pub async fn docker_images(&mut self) -> Result<DockerReader<ReadHandle<'_, R>>, Error> {
-        DockerReader::new(self.read_handle(self.toc.docker_images).await?).await
+    pub async fn docker_arches(&mut self) -> Result<BTreeSet<String>, Error> {
+        DockerReader::list_arches(&mut self.read_handle(self.toc.docker_images).await?).await
+    }
+
+    pub async fn docker_images(
+        &mut self,
+        arch: &str,
+    ) -> Result<DockerReader<ReadHandle<'_, R>>, Error> {
+        DockerReader::new(self.read_handle(self.toc.docker_images).await?, arch).await
     }
 
     pub async fn assets(&mut self) -> Result<ReadHandle<'_, R>, Error> {
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index b4c2e1c14..f95a7e4bf 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -21,7 +21,6 @@ use crate::s9pk::v1::reader::S9pkReader;
 use crate::s9pk::v2::S9pk;
 use crate::util::io::TmpDir;
 use crate::util::Invoke;
-use crate::ARCH;
 
 pub const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x01];
 
@@ -96,155 +95,166 @@ impl S9pk<Section<MultiCursorFile>> {
         )?;
 
         // images
-        let images_dir = scratch_dir.join("images");
-        tokio::fs::create_dir_all(&images_dir).await?;
-        Command::new(CONTAINER_TOOL)
-            .arg("load")
-            .input(Some(&mut reader.docker_images().await?))
-            .invoke(ErrorKind::Docker)
-            .await?;
-        #[derive(serde::Deserialize)]
-        #[serde(rename_all = "PascalCase")]
-        struct DockerImagesOut {
-            repository: Option<String>,
-            tag: Option<String>,
-            #[serde(default)]
-            names: Vec<String>,
-        }
-        for image in {
-            #[cfg(feature = "docker")]
-            let images = std::str::from_utf8(
-                &Command::new(CONTAINER_TOOL)
-                    .arg("images")
-                    .arg("--format=json")
-                    .invoke(ErrorKind::Docker)
-                    .await?,
-            )?
-            .lines()
-            .map(|l| serde_json::from_str::<DockerImagesOut>(l))
-            .collect::<Result<Vec<_>, _>>()
-            .with_kind(ErrorKind::Deserialization)?
-            .into_iter();
-            #[cfg(not(feature = "docker"))]
-            let images = serde_json::from_slice::<Vec<DockerImagesOut>>(
-                &Command::new(CONTAINER_TOOL)
-                    .arg("images")
-                    .arg("--format=json")
-                    .invoke(ErrorKind::Docker)
-                    .await?,
-            )
-            .with_kind(ErrorKind::Deserialization)?
-            .into_iter();
-            images
-        }
-        .flat_map(|i| {
-            if let (Some(repository), Some(tag)) = (i.repository, i.tag) {
-                vec![format!("{repository}:{tag}")]
+        for arch in reader.docker_arches().await? {
+            let images_dir = scratch_dir.join("images").join(&arch);
+            let docker_platform = if arch == "x86_64" {
+                "--platform=linux/amd64".to_owned()
+            } else if arch == "aarch64" {
+                "--platform=linux/arm64".to_owned()
             } else {
-                i.names
-                    .into_iter()
-                    .filter_map(|i| i.strip_prefix("docker.io/").map(|s| s.to_owned()))
-                    .collect()
+                format!("--platform=linux/{arch}")
+            };
+            tokio::fs::create_dir_all(&images_dir).await?;
+            Command::new(CONTAINER_TOOL)
+                .arg("load")
+                .input(Some(&mut reader.docker_images(&arch).await?))
+                .invoke(ErrorKind::Docker)
+                .await?;
+            #[derive(serde::Deserialize)]
+            #[serde(rename_all = "PascalCase")]
+            struct DockerImagesOut {
+                repository: Option<String>,
+                tag: Option<String>,
+                #[serde(default)]
+                names: Vec<String>,
             }
-        })
-        .filter_map(|i| {
-            i.strip_suffix(&format!(":{}", manifest.version))
-                .map(|s| s.to_owned())
-        })
-        .filter_map(|i| {
-            i.strip_prefix(&format!("start9/{}/", manifest.id))
-                .map(|s| s.to_owned())
-        }) {
-            new_manifest.images.insert(image.parse()?);
-            let sqfs_path = images_dir.join(&image).with_extension("squashfs");
-            let image_name = format!("start9/{}/{}:{}", manifest.id, image, manifest.version);
-            let id = String::from_utf8(
-                Command::new(CONTAINER_TOOL)
-                    .arg("create")
-                    .arg(&image_name)
-                    .invoke(ErrorKind::Docker)
-                    .await?,
-            )?;
-            let env = String::from_utf8(
-                Command::new(CONTAINER_TOOL)
-                    .arg("run")
-                    .arg("--rm")
-                    .arg("--entrypoint")
-                    .arg("env")
-                    .arg(&image_name)
-                    .invoke(ErrorKind::Docker)
-                    .await?,
-            )?
-            .lines()
-            .filter(|l| {
-                l.trim()
-                    .split_once("=")
-                    .map_or(false, |(v, _)| !SKIP_ENV.contains(&v))
+            for image in {
+                #[cfg(feature = "docker")]
+                let images = std::str::from_utf8(
+                    &Command::new(CONTAINER_TOOL)
+                        .arg("images")
+                        .arg("--format=json")
+                        .invoke(ErrorKind::Docker)
+                        .await?,
+                )?
+                .lines()
+                .map(|l| serde_json::from_str::<DockerImagesOut>(l))
+                .collect::<Result<Vec<_>, _>>()
+                .with_kind(ErrorKind::Deserialization)?
+                .into_iter();
+                #[cfg(not(feature = "docker"))]
+                let images = serde_json::from_slice::<Vec<DockerImagesOut>>(
+                    &Command::new(CONTAINER_TOOL)
+                        .arg("images")
+                        .arg("--format=json")
+                        .invoke(ErrorKind::Docker)
+                        .await?,
+                )
+                .with_kind(ErrorKind::Deserialization)?
+                .into_iter();
+                images
+            }
+            .flat_map(|i| {
+                if let (Some(repository), Some(tag)) = (i.repository, i.tag) {
+                    vec![format!("{repository}:{tag}")]
+                } else {
+                    i.names
+                        .into_iter()
+                        .filter_map(|i| i.strip_prefix("docker.io/").map(|s| s.to_owned()))
+                        .collect()
+                }
             })
-            .join("\n")
-                + "\n";
-            let workdir = Path::new(
-                String::from_utf8(
+            .filter_map(|i| {
+                i.strip_suffix(&format!(":{}", manifest.version))
+                    .map(|s| s.to_owned())
+            })
+            .filter_map(|i| {
+                i.strip_prefix(&format!("start9/{}/", manifest.id))
+                    .map(|s| s.to_owned())
+            }) {
+                new_manifest.images.insert(image.parse()?);
+                let sqfs_path = images_dir.join(&image).with_extension("squashfs");
+                let image_name = format!("start9/{}/{}:{}", manifest.id, image, manifest.version);
+                let id = String::from_utf8(
+                    Command::new(CONTAINER_TOOL)
+                        .arg("create")
+                        .arg(&docker_platform)
+                        .arg(&image_name)
+                        .invoke(ErrorKind::Docker)
+                        .await?,
+                )?;
+                let env = String::from_utf8(
                     Command::new(CONTAINER_TOOL)
                         .arg("run")
                         .arg("--rm")
+                        .arg(&docker_platform)
                         .arg("--entrypoint")
-                        .arg("pwd")
+                        .arg("env")
                         .arg(&image_name)
                         .invoke(ErrorKind::Docker)
                         .await?,
                 )?
-                .trim(),
-            )
-            .to_owned();
-            Command::new("bash")
-                .arg("-c")
-                .arg(format!(
-                    "{CONTAINER_TOOL} export {id} | mksquashfs - {sqfs} -tar",
-                    id = id.trim(),
-                    sqfs = sqfs_path.display()
-                ))
-                .invoke(ErrorKind::Docker)
-                .await?;
-            Command::new(CONTAINER_TOOL)
-                .arg("rm")
-                .arg(id.trim())
-                .invoke(ErrorKind::Docker)
-                .await?;
-            archive.insert_path(
-                Path::new("images")
-                    .join(&*ARCH)
-                    .join(&image)
-                    .with_extension("squashfs"),
-                Entry::file(CompatSource::File(sqfs_path)),
-            )?;
-            archive.insert_path(
-                Path::new("images")
-                    .join(&*ARCH)
-                    .join(&image)
-                    .with_extension("env"),
-                Entry::file(CompatSource::Buffered(Vec::from(env).into())),
-            )?;
-            archive.insert_path(
-                Path::new("images")
-                    .join(&*ARCH)
-                    .join(&image)
-                    .with_extension("json"),
-                Entry::file(CompatSource::Buffered(
-                    serde_json::to_vec(&serde_json::json!({
-                        "workdir": workdir
-                    }))
-                    .with_kind(ErrorKind::Serialization)?
-                    .into(),
-                )),
-            )?;
+                .lines()
+                .filter(|l| {
+                    l.trim()
+                        .split_once("=")
+                        .map_or(false, |(v, _)| !SKIP_ENV.contains(&v))
+                })
+                .join("\n")
+                    + "\n";
+                let workdir = Path::new(
+                    String::from_utf8(
+                        Command::new(CONTAINER_TOOL)
+                            .arg("run")
+                            .arg("--rm")
+                            .arg(&docker_platform)
+                            .arg("--entrypoint")
+                            .arg("pwd")
+                            .arg(&image_name)
+                            .invoke(ErrorKind::Docker)
+                            .await?,
+                    )?
+                    .trim(),
+                )
+                .to_owned();
+                Command::new("bash")
+                    .arg("-c")
+                    .arg(format!(
+                        "{CONTAINER_TOOL} export {id} | mksquashfs - {sqfs} -tar",
+                        id = id.trim(),
+                        sqfs = sqfs_path.display()
+                    ))
+                    .invoke(ErrorKind::Docker)
+                    .await?;
+                Command::new(CONTAINER_TOOL)
+                    .arg("rm")
+                    .arg(id.trim())
+                    .invoke(ErrorKind::Docker)
+                    .await?;
+                archive.insert_path(
+                    Path::new("images")
+                        .join(&arch)
+                        .join(&image)
+                        .with_extension("squashfs"),
+                    Entry::file(CompatSource::File(sqfs_path)),
+                )?;
+                archive.insert_path(
+                    Path::new("images")
+                        .join(&arch)
+                        .join(&image)
+                        .with_extension("env"),
+                    Entry::file(CompatSource::Buffered(Vec::from(env).into())),
+                )?;
+                archive.insert_path(
+                    Path::new("images")
+                        .join(&arch)
+                        .join(&image)
+                        .with_extension("json"),
+                    Entry::file(CompatSource::Buffered(
+                        serde_json::to_vec(&serde_json::json!({
+                            "workdir": workdir
+                        }))
+                        .with_kind(ErrorKind::Serialization)?
+                        .into(),
+                    )),
+                )?;
+                Command::new(CONTAINER_TOOL)
+                    .arg("rmi")
+                    .arg(&image_name)
+                    .invoke(ErrorKind::Docker)
+                    .await?;
+            }
         }
-        Command::new(CONTAINER_TOOL)
-            .arg("image")
-            .arg("prune")
-            .arg("-af")
-            .invoke(ErrorKind::Docker)
-            .await?;
 
         // assets
         let asset_dir = scratch_dir.join("assets");
@@ -312,9 +322,10 @@ impl S9pk<Section<MultiCursorFile>> {
 
         scratch_dir.delete().await?;
 
-        Ok(S9pk::deserialize(&MultiCursorFile::from(
-            File::open(destination.as_ref()).await?,
-        ))
+        Ok(S9pk::deserialize(
+            &MultiCursorFile::from(File::open(destination.as_ref()).await?),
+            false,
+        )
         .await?)
     }
 }
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index df82baf7e..1051aaaf8 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -173,7 +173,7 @@ impl<S: FileSource> S9pk<S> {
 
 impl<S: ArchiveSource> S9pk<Section<S>> {
     #[instrument(skip_all)]
-    pub async fn deserialize(source: &S) -> Result<Self, Error> {
+    pub async fn deserialize(source: &S, apply_filter: bool) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
 
         let mut header = source
@@ -193,7 +193,9 @@ impl<S: ArchiveSource> S9pk<Section<S>> {
 
         let mut archive = MerkleArchive::deserialize(source, &mut header).await?;
 
-        archive.filter(filter)?;
+        if apply_filter {
+            archive.filter(filter)?;
+        }
 
         archive.sort_by(|a, b| match (priority(a), priority(b)) {
             (Some(a), Some(b)) => a.cmp(&b),
@@ -206,11 +208,15 @@ impl<S: ArchiveSource> S9pk<Section<S>> {
     }
 }
 impl S9pk {
-    pub async fn from_file(file: File) -> Result<Self, Error> {
-        Self::deserialize(&MultiCursorFile::from(file)).await
+    pub async fn from_file(file: File, apply_filter: bool) -> Result<Self, Error> {
+        Self::deserialize(&MultiCursorFile::from(file), apply_filter).await
     }
-    pub async fn open(path: impl AsRef<Path>, id: Option<&PackageId>) -> Result<Self, Error> {
-        let res = Self::from_file(tokio::fs::File::open(path).await?).await?;
+    pub async fn open(
+        path: impl AsRef<Path>,
+        id: Option<&PackageId>,
+        apply_filter: bool,
+    ) -> Result<Self, Error> {
+        let res = Self::from_file(tokio::fs::File::open(path).await?, apply_filter).await?;
         if let Some(id) = id {
             ensure_code!(
                 &res.as_manifest().id == id,
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index e092a59e6..a4e3a4858 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -13,12 +13,14 @@ use start_stop::StartStop;
 use tokio::sync::Notify;
 use ts_rs::TS;
 
+use crate::context::{CliContext, RpcContext};
 use crate::core::rpc_continuations::RequestGuid;
 use crate::db::model::package::{
     InstalledState, PackageDataEntry, PackageState, PackageStateMatchModelRef, UpdatingState,
 };
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::install::PKG_ARCHIVE_DIR;
+use crate::lxc::ContainerId;
 use crate::prelude::*;
 use crate::progress::{NamedProgress, Progress};
 use crate::s9pk::S9pk;
@@ -31,10 +33,6 @@ use crate::util::actor::concurrent::ConcurrentActor;
 use crate::util::actor::Actor;
 use crate::util::serde::Pem;
 use crate::volume::data_dir;
-use crate::{
-    context::{CliContext, RpcContext},
-    lxc::ContainerId,
-};
 
 mod action;
 pub mod cli;
@@ -138,7 +136,7 @@ impl Service {
         match entry.as_state_info().as_match() {
             PackageStateMatchModelRef::Installing(_) => {
                 if disposition == LoadDisposition::Retry {
-                    if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id)).await.map_err(|e| {
+                    if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id), true).await.map_err(|e| {
                         tracing::error!("Error opening s9pk for install: {e}");
                         tracing::debug!("{e:?}")
                     }) {
@@ -171,7 +169,7 @@ impl Service {
                                 && progress == &Progress::Complete(true)
                         })
                 {
-                    if let Ok(s9pk) = S9pk::open(&s9pk_path, Some(id)).await.map_err(|e| {
+                    if let Ok(s9pk) = S9pk::open(&s9pk_path, Some(id), true).await.map_err(|e| {
                         tracing::error!("Error opening s9pk for update: {e}");
                         tracing::debug!("{e:?}")
                     }) {
@@ -190,7 +188,7 @@ impl Service {
                         }
                     }
                 }
-                let s9pk = S9pk::open(s9pk_path, Some(id)).await?;
+                let s9pk = S9pk::open(s9pk_path, Some(id), true).await?;
                 ctx.db
                     .mutate({
                         |db| {
@@ -215,7 +213,7 @@ impl Service {
                 handle_installed(s9pk, entry).await
             }
             PackageStateMatchModelRef::Removing(_) | PackageStateMatchModelRef::Restoring(_) => {
-                if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id)).await.map_err(|e| {
+                if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id), true).await.map_err(|e| {
                     tracing::error!("Error opening s9pk for removal: {e}");
                     tracing::debug!("{e:?}")
                 }) {
@@ -243,7 +241,7 @@ impl Service {
                 Ok(None)
             }
             PackageStateMatchModelRef::Installed(_) => {
-                handle_installed(S9pk::open(s9pk_path, Some(id)).await?, entry).await
+                handle_installed(S9pk::open(s9pk_path, Some(id), true).await?, entry).await
             }
             PackageStateMatchModelRef::Error(e) => Err(Error::new(
                 eyre!("Failed to parse PackageDataEntry, found {e:?}"),
@@ -349,6 +347,7 @@ impl Service {
         }
         Ok(())
     }
+
     pub async fn backup(&self, _guard: impl GenericMountGuard) -> Result<BackupReturn, Error> {
         // TODO
         Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index d1303b0f9..e69498e5f 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -4,7 +4,7 @@ use std::sync::{Arc, Weak};
 use std::time::Duration;
 
 use futures::future::ready;
-use futures::Future;
+use futures::{Future, FutureExt};
 use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use models::{ProcedureName, VolumeId};
@@ -92,6 +92,7 @@ pub struct PersistentContainer {
     pub(super) overlays: Arc<Mutex<BTreeMap<InternedString, OverlayGuard>>>,
     pub(super) state: Arc<watch::Sender<ServiceState>>,
     pub(super) net_service: Mutex<NetService>,
+    destroyed: bool,
 }
 
 impl PersistentContainer {
@@ -217,6 +218,7 @@ impl PersistentContainer {
             overlays: Arc::new(Mutex::new(BTreeMap::new())),
             state: Arc::new(watch::channel(ServiceState::new(start)).0),
             net_service: Mutex::new(net_service),
+            destroyed: false,
         })
     }
 
@@ -285,7 +287,10 @@ impl PersistentContainer {
     }
 
     #[instrument(skip_all)]
-    fn destroy(&mut self) -> impl Future<Output = Result<(), Error>> + 'static {
+    fn destroy(&mut self) -> Option<impl Future<Output = Result<(), Error>> + 'static> {
+        if self.destroyed {
+            return None;
+        }
         let rpc_client = self.rpc_client.clone();
         let rpc_server = self.rpc_server.send_replace(None);
         let js_mount = self.js_mount.take();
@@ -293,33 +298,45 @@ impl PersistentContainer {
         let assets = std::mem::take(&mut self.assets);
         let overlays = self.overlays.clone();
         let lxc_container = self.lxc_container.take();
-        async move {
-            let mut errs = ErrorCollection::new();
-            if let Some((hdl, shutdown)) = rpc_server {
-                errs.handle(rpc_client.request(rpc::Exit, Empty {}).await);
-                shutdown.shutdown();
-                errs.handle(hdl.await.with_kind(ErrorKind::Cancelled));
-            }
-            for (_, volume) in volumes {
-                errs.handle(volume.unmount(true).await);
-            }
-            for (_, assets) in assets {
-                errs.handle(assets.unmount(true).await);
-            }
-            for (_, overlay) in std::mem::take(&mut *overlays.lock().await) {
-                errs.handle(overlay.unmount(true).await);
-            }
-            errs.handle(js_mount.unmount(true).await);
-            if let Some(lxc_container) = lxc_container {
-                errs.handle(lxc_container.exit().await);
+        self.destroyed = true;
+        Some(
+            async move {
+                dbg!(
+                    async move {
+                        let mut errs = ErrorCollection::new();
+                        if let Some((hdl, shutdown)) = rpc_server {
+                            errs.handle(rpc_client.request(rpc::Exit, Empty {}).await);
+                            shutdown.shutdown();
+                            errs.handle(hdl.await.with_kind(ErrorKind::Cancelled));
+                        }
+                        for (_, volume) in volumes {
+                            errs.handle(volume.unmount(true).await);
+                        }
+                        for (_, assets) in assets {
+                            errs.handle(assets.unmount(true).await);
+                        }
+                        for (_, overlay) in std::mem::take(&mut *overlays.lock().await) {
+                            errs.handle(overlay.unmount(true).await);
+                        }
+                        errs.handle(js_mount.unmount(true).await);
+                        if let Some(lxc_container) = lxc_container {
+                            errs.handle(lxc_container.exit().await);
+                        }
+                        dbg!(errs.into_result())
+                    }
+                    .await
+                )
             }
-            errs.into_result()
-        }
+            .map(|a| dbg!(a)),
+        )
     }
 
     #[instrument(skip_all)]
     pub async fn exit(mut self) -> Result<(), Error> {
-        self.destroy().await?;
+        if let Some(destroy) = self.destroy() {
+            dbg!(destroy.await)?;
+        }
+        tracing::info!("Service for {} exited", self.s9pk.as_manifest().id);
 
         Ok(())
     }
@@ -416,7 +433,8 @@ impl PersistentContainer {
 
 impl Drop for PersistentContainer {
     fn drop(&mut self) {
-        let destroy = self.destroy();
-        tokio::spawn(async move { destroy.await.unwrap() });
+        if let Some(destroy) = self.destroy() {
+            tokio::spawn(async move { destroy.await.unwrap() });
+        }
     }
 }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 6d0f87c53..b1411450c 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1165,6 +1165,7 @@ async fn set_dependencies(
                         .join(&format!("package/v2/{}.s9pk?spec={}", dep_id, version_spec))?,
                 )
                 .await?,
+                true,
             )
             .await?;
 
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 4386b39b7..891741754 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -42,10 +42,9 @@ pub struct InstallProgressHandles {
 pub struct ServiceMap(Mutex<OrdMap<PackageId, Arc<RwLock<Option<Service>>>>>);
 impl ServiceMap {
     async fn entry(&self, id: &PackageId) -> Arc<RwLock<Option<Service>>> {
-        self.0
-            .lock()
-            .await
-            .entry(id.clone())
+        let mut lock = self.0.lock().await;
+        dbg!(lock.keys().collect::<Vec<_>>());
+        lock.entry(id.clone())
             .or_insert_with(|| Arc::new(RwLock::new(None)))
             .clone()
     }
@@ -230,7 +229,7 @@ impl ServiceMap {
                 .await?;
             Ok(reload_guard
                 .handle_last(async move {
-                    let s9pk = S9pk::open(&installed_path, Some(&id)).await?;
+                    let s9pk = S9pk::open(&installed_path, Some(&id), true).await?;
                     let prev = if let Some(service) = service.take() {
                         ensure_code!(
                             recovery_source.is_none(),
@@ -293,9 +292,14 @@ impl ServiceMap {
     /// This is ran during the cleanup, so when we are uninstalling the service
     #[instrument(skip_all)]
     pub async fn uninstall(&self, ctx: &RpcContext, id: &PackageId) -> Result<(), Error> {
-        if let Some(service) = self.get_mut(id).await.take() {
+        let mut guard = self.get_mut(id).await;
+        if let Some(service) = guard.take() {
             ServiceReloadGuard::new(ctx.clone(), id.clone(), "Uninstall")
-                .handle_last(service.uninstall(None))
+                .handle_last(async move {
+                    let res = service.uninstall(None).await;
+                    drop(guard);
+                    res
+                })
                 .await?;
         }
         Ok(())
diff --git a/core/startos/src/util/actor/concurrent.rs b/core/startos/src/util/actor/concurrent.rs
index d330102ca..e32470d80 100644
--- a/core/startos/src/util/actor/concurrent.rs
+++ b/core/startos/src/util/actor/concurrent.rs
@@ -96,7 +96,7 @@ impl<A: Actor + Clone> Future for ConcurrentRunner<A> {
             cont
         } {}
         let _ = this.bg_runner.as_mut().poll(cx);
-        if this.waiting.is_empty() && this.handlers.is_empty() && this.bg_runner.is_empty() {
+        if this.waiting.is_empty() && this.handlers.is_empty() && this.recv.is_closed() {
             std::task::Poll::Ready(())
         } else {
             std::task::Poll::Pending
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 772a64a32..63cbd323a 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -498,7 +498,7 @@ impl<'a, T> From<&'a T> for MaybeOwned<'a, T> {
 
 pub fn new_guid() -> InternedString {
     use rand::RngCore;
-    let mut buf = [0; 40];
+    let mut buf = [0; 20];
     rand::thread_rng().fill_bytes(&mut buf);
     InternedString::intern(base32::encode(
         base32::Alphabet::RFC4648 { padding: false },
diff --git a/debian/postinst b/debian/postinst
index 731298af9..e26f7cfee 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,7 +6,7 @@ if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ]; then
 	  SYSTEMCTL=deb-systemd-helper
 fi
 
-if [ -f /usr/sbin/grub-probe ]; then
+if [ -f /usr/sbin/grub-probe ] && ! [ -L /usr/sbin/grub-probe ]; then
   mv /usr/sbin/grub-probe /usr/sbin/grub-probe-default
   ln -s /usr/lib/startos/scripts/grub-probe-eos /usr/sbin/grub-probe
 fi
@@ -84,7 +84,9 @@ if cat /usr/lib/startos/ENVIRONMENT.txt | grep '(^|-)docker(-|$)'; then
     mkdir -p /etc/docker
     echo '{ "storage-driver": "overlay2" }' > /etc/docker/daemon.json
 else
-    podman network create -d bridge --subnet 172.18.0.1/24 --opt com.docker.network.bridge.name=br-start9 start9
+    if ! podman network ls | grep start9; then
+        podman network create -d bridge --subnet 172.18.0.1/24 --opt com.docker.network.bridge.name=br-start9 start9
+    fi
 fi
 mkdir -p /etc/nginx/ssl
 
@@ -110,12 +112,14 @@ echo "fs.inotify.max_user_watches=1048576" > /etc/sysctl.d/97-embassy.conf
 locale-gen en_GB en_GB.UTF-8 
 echo "locales locales/locales_to_be_generated multiselect en_GB.UTF-8 UTF-8" | debconf-set-selections
 update-locale  LANGUAGE
-rm "/etc/locale.gen"
+rm -f "/etc/locale.gen"
 dpkg-reconfigure --frontend noninteractive locales
 
-groupadd embassy
+if ! getent group | grep '^embassy:'; then
+    groupadd embassy
+fi
 
-ln -s /usr/lib/startos/scripts/dhclient-exit-hook /etc/dhcp/dhclient-exit-hooks.d/embassy
+ln -sf /usr/lib/startos/scripts/dhclient-exit-hook /etc/dhcp/dhclient-exit-hooks.d/embassy
 
 rm -f /etc/motd
 ln -sf /usr/lib/startos/motd /etc/update-motd.d/00-embassy
@@ -123,7 +127,15 @@ chmod -x /etc/update-motd.d/*
 chmod +x /etc/update-motd.d/00-embassy
 
 # LXC
-echo "root:100000:65536" >>/etc/subuid
-echo "root:100000:65536" >>/etc/subgid
-echo "lxc.idmap = u 0 100000 65536" >>/etc/lxc/default.conf
-echo "lxc.idmap = g 0 100000 65536" >>/etc/lxc/default.conf
+cat /etc/subuid | grep -v '^root:' > /etc/subuid.tmp || true
+echo "root:100000:65536" >> /etc/subuid.tmp
+mv /etc/subuid.tmp /etc/subuid
+
+cat /etc/subgid | grep -v '^root:' > /etc/subgid.tmp || true
+echo "root:100000:65536" >> /etc/subgid.tmp
+mv /etc/subgid.tmp /etc/subgid
+
+cat /etc/lxc/default.conf | grep -v '^lxc\.idmap = [ug]' > /etc/lxc/default.conf.tmp || true
+echo "lxc.idmap = u 0 100000 65536" >> /etc/lxc/default.conf.tmp
+echo "lxc.idmap = g 0 100000 65536" >> /etc/lxc/default.conf.tmp
+mv /etc/lxc/default.conf.tmp /etc/lxc/default.conf
\ No newline at end of file
diff --git a/sdk/Makefile b/sdk/Makefile
index 8370650b8..091f4c7bb 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -1,19 +1,23 @@
-TS_FILES := $(shell find ./**/*.ts )
+TS_FILES := $(shell git ls-files lib) lib/test/output.ts
 version = $(shell git tag --sort=committerdate | tail -1)
+
+.PHONY: test clean bundle fmt buildOutput check
+
 test: $(TS_FILES) lib/test/output.ts
 	npm test
 
 clean:
-	rm -rf dist/* | true
+	rm -rf dist
+	rm -f lib/test/output.ts
+	rm -rf node_modules
 	
-lib/test/output.ts: lib/test/makeOutput.ts scripts/oldSpecToBuilder.ts
+lib/test/output.ts: node_modules lib/test/makeOutput.ts scripts/oldSpecToBuilder.ts
 	npm run buildOutput
 
-buildOutput: lib/test/output.ts fmt
-	echo 'done'
-
+bundle: dist | test fmt
+	touch dist
 
-bundle: $(TS_FILES) package.json .FORCE node_modules test fmt
+dist: $(TS_FILES) package.json node_modules README.md LICENSE
 	npx tsc
 	npx tsc --project tsconfig-cjs.json
 	cp package.json dist/package.json
@@ -21,9 +25,7 @@ bundle: $(TS_FILES) package.json .FORCE node_modules test fmt
 	cp LICENSE dist/LICENSE
 	touch dist
 
-full-bundle:
-	make clean
-	make bundle
+full-bundle: clean bundle
 
 check:
 	npm run check
@@ -32,13 +34,10 @@ fmt: node_modules
 	npx prettier --write "**/*.ts"
 
 node_modules: package.json
-	npm install
+	npm ci
 
-publish: clean bundle	 package.json README.md LICENSE
+publish: clean bundle package.json README.md LICENSE
 	cd dist && npm publish --access=public
-link: bundle	
-	cp package.json dist/package.json
-	cp README.md dist/README.md
-	cp LICENSE dist/LICENSE
+
+link: bundle
 	cd dist && npm link
-.FORCE: 
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index de54f7dc0..ab64cd7b0 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -1,10 +1,10 @@
 import { object, string } from "ts-matches"
 import { Effects } from "../types"
 import { Origin } from "./Origin"
-import { AddSslOptions } from "../../../core/startos/bindings/AddSslOptions"
-import { Security } from "../../../core/startos/bindings/Security"
-import { BindOptions } from "../../../core/startos/bindings/BindOptions"
-import { AlpnInfo } from "../../../core/startos/bindings/AlpnInfo"
+import { AddSslOptions } from ".././osBindings"
+import { Security } from ".././osBindings"
+import { BindOptions } from ".././osBindings"
+import { AlpnInfo } from ".././osBindings"
 
 export { AddSslOptions, Security, BindOptions }
 
diff --git a/core/startos/bindings/ActionId.ts b/sdk/lib/osBindings/ActionId.ts
similarity index 78%
rename from core/startos/bindings/ActionId.ts
rename to sdk/lib/osBindings/ActionId.ts
index 9bb1f9990..ebfaba49e 100644
--- a/core/startos/bindings/ActionId.ts
+++ b/sdk/lib/osBindings/ActionId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ActionId = string;
+export type ActionId = string
diff --git a/sdk/lib/osBindings/ActionMetadata.ts b/sdk/lib/osBindings/ActionMetadata.ts
new file mode 100644
index 000000000..b103b82b0
--- /dev/null
+++ b/sdk/lib/osBindings/ActionMetadata.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AllowedStatuses } from "./AllowedStatuses"
+
+export type ActionMetadata = {
+  name: string
+  description: string
+  warning: string | null
+  input: any
+  disabled: boolean
+  allowedStatuses: AllowedStatuses
+  group: string | null
+}
diff --git a/core/startos/bindings/AddSslOptions.ts b/sdk/lib/osBindings/AddSslOptions.ts
similarity index 53%
rename from core/startos/bindings/AddSslOptions.ts
rename to sdk/lib/osBindings/AddSslOptions.ts
index 984a1a7c6..daa9aee0e 100644
--- a/core/startos/bindings/AddSslOptions.ts
+++ b/sdk/lib/osBindings/AddSslOptions.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AlpnInfo } from "./AlpnInfo";
+import type { AlpnInfo } from "./AlpnInfo"
 
 export type AddSslOptions = {
-  scheme: string | null;
-  preferredExternalPort: number;
-  alpn: AlpnInfo;
-};
+  scheme: string | null
+  preferredExternalPort: number
+  alpn: AlpnInfo
+}
diff --git a/sdk/lib/osBindings/AddressInfo.ts b/sdk/lib/osBindings/AddressInfo.ts
new file mode 100644
index 000000000..818b570bb
--- /dev/null
+++ b/sdk/lib/osBindings/AddressInfo.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BindOptions } from "./BindOptions"
+import type { HostId } from "./HostId"
+
+export type AddressInfo = {
+  username: string | null
+  hostId: HostId
+  bindOptions: BindOptions
+  suffix: string
+}
diff --git a/core/startos/bindings/Alerts.ts b/sdk/lib/osBindings/Alerts.ts
similarity index 50%
rename from core/startos/bindings/Alerts.ts
rename to sdk/lib/osBindings/Alerts.ts
index c6a671e83..819d1c407 100644
--- a/core/startos/bindings/Alerts.ts
+++ b/sdk/lib/osBindings/Alerts.ts
@@ -1,9 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type Alerts = {
-  install: string | null;
-  uninstall: string | null;
-  restore: string | null;
-  start: string | null;
-  stop: string | null;
-};
+  install: string | null
+  uninstall: string | null
+  restore: string | null
+  start: string | null
+  stop: string | null
+}
diff --git a/core/startos/bindings/Algorithm.ts b/sdk/lib/osBindings/Algorithm.ts
similarity index 70%
rename from core/startos/bindings/Algorithm.ts
rename to sdk/lib/osBindings/Algorithm.ts
index 877325fdf..94f2040e1 100644
--- a/core/startos/bindings/Algorithm.ts
+++ b/sdk/lib/osBindings/Algorithm.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Algorithm = "ecdsa" | "ed25519";
+export type Algorithm = "ecdsa" | "ed25519"
diff --git a/core/startos/bindings/AllPackageData.ts b/sdk/lib/osBindings/AllPackageData.ts
similarity index 61%
rename from core/startos/bindings/AllPackageData.ts
rename to sdk/lib/osBindings/AllPackageData.ts
index c7698d10d..b51b41bf5 100644
--- a/core/startos/bindings/AllPackageData.ts
+++ b/sdk/lib/osBindings/AllPackageData.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PackageDataEntry } from "./PackageDataEntry";
-import type { PackageId } from "./PackageId";
+import type { PackageDataEntry } from "./PackageDataEntry"
+import type { PackageId } from "./PackageId"
 
-export type AllPackageData = { [key: PackageId]: PackageDataEntry };
+export type AllPackageData = { [key: PackageId]: PackageDataEntry }
diff --git a/core/startos/bindings/AllowedStatuses.ts b/sdk/lib/osBindings/AllowedStatuses.ts
similarity index 97%
rename from core/startos/bindings/AllowedStatuses.ts
rename to sdk/lib/osBindings/AllowedStatuses.ts
index a04ee2bac..960187fd9 100644
--- a/core/startos/bindings/AllowedStatuses.ts
+++ b/sdk/lib/osBindings/AllowedStatuses.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AllowedStatuses = "onlyRunning" | "onlyStopped" | "any";
+export type AllowedStatuses = "onlyRunning" | "onlyStopped" | "any"
diff --git a/core/startos/bindings/AlpnInfo.ts b/sdk/lib/osBindings/AlpnInfo.ts
similarity index 71%
rename from core/startos/bindings/AlpnInfo.ts
rename to sdk/lib/osBindings/AlpnInfo.ts
index eac072fc0..2dacb3d3f 100644
--- a/core/startos/bindings/AlpnInfo.ts
+++ b/sdk/lib/osBindings/AlpnInfo.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { MaybeUtf8String } from "./MaybeUtf8String";
+import type { MaybeUtf8String } from "./MaybeUtf8String"
 
-export type AlpnInfo = "reflect" | { specified: Array<MaybeUtf8String> };
+export type AlpnInfo = "reflect" | { specified: Array<MaybeUtf8String> }
diff --git a/core/startos/bindings/DependencyKind.ts b/sdk/lib/osBindings/BackupProgress.ts
similarity index 68%
rename from core/startos/bindings/DependencyKind.ts
rename to sdk/lib/osBindings/BackupProgress.ts
index 71fd49762..407a4195a 100644
--- a/core/startos/bindings/DependencyKind.ts
+++ b/sdk/lib/osBindings/BackupProgress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DependencyKind = "exists" | "running";
+export type BackupProgress = { complete: boolean }
diff --git a/core/startos/bindings/BindInfo.ts b/sdk/lib/osBindings/BindInfo.ts
similarity index 72%
rename from core/startos/bindings/BindInfo.ts
rename to sdk/lib/osBindings/BindInfo.ts
index 8bda6d37e..d7b37a70f 100644
--- a/core/startos/bindings/BindInfo.ts
+++ b/sdk/lib/osBindings/BindInfo.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BindOptions } from "./BindOptions";
+import type { BindOptions } from "./BindOptions"
 
-export type BindInfo = { options: BindOptions; assignedLanPort: number | null };
+export type BindInfo = { options: BindOptions; assignedLanPort: number | null }
diff --git a/sdk/lib/osBindings/BindOptions.ts b/sdk/lib/osBindings/BindOptions.ts
new file mode 100644
index 000000000..a462a8cfc
--- /dev/null
+++ b/sdk/lib/osBindings/BindOptions.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddSslOptions } from "./AddSslOptions"
+import type { Security } from "./Security"
+
+export type BindOptions = {
+  scheme: string | null
+  preferredExternalPort: number
+  addSsl: AddSslOptions | null
+  secure: Security | null
+}
diff --git a/sdk/lib/osBindings/BindParams.ts b/sdk/lib/osBindings/BindParams.ts
new file mode 100644
index 000000000..544f65a40
--- /dev/null
+++ b/sdk/lib/osBindings/BindParams.ts
@@ -0,0 +1,15 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddSslOptions } from "./AddSslOptions"
+import type { HostId } from "./HostId"
+import type { HostKind } from "./HostKind"
+import type { Security } from "./Security"
+
+export type BindParams = {
+  kind: HostKind
+  id: HostId
+  internalPort: number
+  scheme: string | null
+  preferredExternalPort: number
+  addSsl: AddSslOptions | null
+  secure: Security | null
+}
diff --git a/core/startos/bindings/Callback.ts b/sdk/lib/osBindings/Callback.ts
similarity index 75%
rename from core/startos/bindings/Callback.ts
rename to sdk/lib/osBindings/Callback.ts
index e6c5b004f..1e5cb1af5 100644
--- a/core/startos/bindings/Callback.ts
+++ b/sdk/lib/osBindings/Callback.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Callback = () => void;
+export type Callback = () => void
diff --git a/core/startos/bindings/ChrootParams.ts b/sdk/lib/osBindings/ChrootParams.ts
similarity index 52%
rename from core/startos/bindings/ChrootParams.ts
rename to sdk/lib/osBindings/ChrootParams.ts
index 9ee6e8959..19131b224 100644
--- a/core/startos/bindings/ChrootParams.ts
+++ b/sdk/lib/osBindings/ChrootParams.ts
@@ -1,10 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type ChrootParams = {
-  env: string | null;
-  workdir: string | null;
-  user: string | null;
-  path: string;
-  command: string;
-  args: string[];
-};
+  env: string | null
+  workdir: string | null
+  user: string | null
+  path: string
+  command: string
+  args: string[]
+}
diff --git a/sdk/lib/osBindings/CreateOverlayedImageParams.ts b/sdk/lib/osBindings/CreateOverlayedImageParams.ts
new file mode 100644
index 000000000..b8579ac7d
--- /dev/null
+++ b/sdk/lib/osBindings/CreateOverlayedImageParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type CreateOverlayedImageParams = { imageId: string }
diff --git a/core/startos/bindings/CurrentDependencies.ts b/sdk/lib/osBindings/CurrentDependencies.ts
similarity index 78%
rename from core/startos/bindings/CurrentDependencies.ts
rename to sdk/lib/osBindings/CurrentDependencies.ts
index 75645e200..029a2f018 100644
--- a/core/startos/bindings/CurrentDependencies.ts
+++ b/sdk/lib/osBindings/CurrentDependencies.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CurrentDependencyInfo } from "./CurrentDependencyInfo";
-import type { PackageId } from "./PackageId";
+import type { CurrentDependencyInfo } from "./CurrentDependencyInfo"
+import type { PackageId } from "./PackageId"
 
-export type CurrentDependencies = { [key: PackageId]: CurrentDependencyInfo };
+export type CurrentDependencies = { [key: PackageId]: CurrentDependencyInfo }
diff --git a/core/startos/bindings/CurrentDependencyInfo.ts b/sdk/lib/osBindings/CurrentDependencyInfo.ts
similarity index 57%
rename from core/startos/bindings/CurrentDependencyInfo.ts
rename to sdk/lib/osBindings/CurrentDependencyInfo.ts
index 8b2b0100d..de46e4b52 100644
--- a/core/startos/bindings/CurrentDependencyInfo.ts
+++ b/sdk/lib/osBindings/CurrentDependencyInfo.ts
@@ -1,10 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { DataUrl } from "./DataUrl";
+import type { DataUrl } from "./DataUrl"
 
 export type CurrentDependencyInfo = {
-  title: string;
-  icon: DataUrl;
-  registryUrl: string;
-  versionSpec: string;
-  configSatisfied: boolean;
-} & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] });
+  title: string
+  icon: DataUrl
+  registryUrl: string
+  versionSpec: string
+  configSatisfied: boolean
+} & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] })
diff --git a/core/startos/bindings/DataUrl.ts b/sdk/lib/osBindings/DataUrl.ts
similarity index 78%
rename from core/startos/bindings/DataUrl.ts
rename to sdk/lib/osBindings/DataUrl.ts
index 65fa15059..cf79cb4a4 100644
--- a/core/startos/bindings/DataUrl.ts
+++ b/sdk/lib/osBindings/DataUrl.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DataUrl = string;
+export type DataUrl = string
diff --git a/core/startos/bindings/DepInfo.ts b/sdk/lib/osBindings/DepInfo.ts
similarity index 95%
rename from core/startos/bindings/DepInfo.ts
rename to sdk/lib/osBindings/DepInfo.ts
index 3c01e0939..20b9eb4cd 100644
--- a/core/startos/bindings/DepInfo.ts
+++ b/sdk/lib/osBindings/DepInfo.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type DepInfo = { description: string | null; optional: boolean };
+export type DepInfo = { description: string | null; optional: boolean }
diff --git a/sdk/lib/osBindings/Dependencies.ts b/sdk/lib/osBindings/Dependencies.ts
new file mode 100644
index 000000000..ad4c9b745
--- /dev/null
+++ b/sdk/lib/osBindings/Dependencies.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DepInfo } from "./DepInfo"
+import type { PackageId } from "./PackageId"
+
+export type Dependencies = { [key: PackageId]: DepInfo }
diff --git a/sdk/lib/osBindings/DependencyKind.ts b/sdk/lib/osBindings/DependencyKind.ts
new file mode 100644
index 000000000..e7021ba16
--- /dev/null
+++ b/sdk/lib/osBindings/DependencyKind.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type DependencyKind = "exists" | "running"
diff --git a/core/startos/bindings/DependencyRequirement.ts b/sdk/lib/osBindings/DependencyRequirement.ts
similarity index 61%
rename from core/startos/bindings/DependencyRequirement.ts
rename to sdk/lib/osBindings/DependencyRequirement.ts
index e6224ce48..d0415bee9 100644
--- a/core/startos/bindings/DependencyRequirement.ts
+++ b/sdk/lib/osBindings/DependencyRequirement.ts
@@ -2,10 +2,10 @@
 
 export type DependencyRequirement =
   | {
-      kind: "running";
-      id: string;
-      healthChecks: string[];
-      versionSpec: string;
-      registryUrl: string;
+      kind: "running"
+      id: string
+      healthChecks: string[]
+      versionSpec: string
+      registryUrl: string
     }
-  | { kind: "exists"; id: string; versionSpec: string; registryUrl: string };
+  | { kind: "exists"; id: string; versionSpec: string; registryUrl: string }
diff --git a/sdk/lib/osBindings/Description.ts b/sdk/lib/osBindings/Description.ts
new file mode 100644
index 000000000..bcb92071f
--- /dev/null
+++ b/sdk/lib/osBindings/Description.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Description = { short: string; long: string }
diff --git a/core/startos/bindings/Description.ts b/sdk/lib/osBindings/DestroyOverlayedImageParams.ts
similarity index 65%
rename from core/startos/bindings/Description.ts
rename to sdk/lib/osBindings/DestroyOverlayedImageParams.ts
index 918bd09c5..82fc1cc67 100644
--- a/core/startos/bindings/Description.ts
+++ b/sdk/lib/osBindings/DestroyOverlayedImageParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Description = { short: string; long: string };
+export type DestroyOverlayedImageParams = { guid: string }
diff --git a/core/startos/bindings/Duration.ts b/sdk/lib/osBindings/Duration.ts
similarity index 78%
rename from core/startos/bindings/Duration.ts
rename to sdk/lib/osBindings/Duration.ts
index 889c729b8..b44758a28 100644
--- a/core/startos/bindings/Duration.ts
+++ b/sdk/lib/osBindings/Duration.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Duration = string;
+export type Duration = string
diff --git a/sdk/lib/osBindings/EncryptedWire.ts b/sdk/lib/osBindings/EncryptedWire.ts
new file mode 100644
index 000000000..16a2f95b8
--- /dev/null
+++ b/sdk/lib/osBindings/EncryptedWire.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EncryptedWire = { encrypted: any }
diff --git a/core/startos/bindings/ExecuteAction.ts b/sdk/lib/osBindings/ExecuteAction.ts
similarity index 68%
rename from core/startos/bindings/ExecuteAction.ts
rename to sdk/lib/osBindings/ExecuteAction.ts
index aaa340747..abd8c151f 100644
--- a/core/startos/bindings/ExecuteAction.ts
+++ b/sdk/lib/osBindings/ExecuteAction.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type ExecuteAction = {
-  serviceId: string | null;
-  actionId: string;
-  input: any;
-};
+  serviceId: string | null
+  actionId: string
+  input: any
+}
diff --git a/core/startos/bindings/ExportActionParams.ts b/sdk/lib/osBindings/ExportActionParams.ts
similarity index 72%
rename from core/startos/bindings/ExportActionParams.ts
rename to sdk/lib/osBindings/ExportActionParams.ts
index 4961c4a11..5eee8fc63 100644
--- a/core/startos/bindings/ExportActionParams.ts
+++ b/sdk/lib/osBindings/ExportActionParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ActionMetadata } from "./ActionMetadata";
+import type { ActionMetadata } from "./ActionMetadata"
 
-export type ExportActionParams = { id: string; metadata: ActionMetadata };
+export type ExportActionParams = { id: string; metadata: ActionMetadata }
diff --git a/sdk/lib/osBindings/ExportServiceInterfaceParams.ts b/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
new file mode 100644
index 000000000..152a800bb
--- /dev/null
+++ b/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
@@ -0,0 +1,14 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddressInfo } from "./AddressInfo"
+import type { ServiceInterfaceType } from "./ServiceInterfaceType"
+
+export type ExportServiceInterfaceParams = {
+  id: string
+  name: string
+  description: string
+  hasPrimary: boolean
+  disabled: boolean
+  masked: boolean
+  addressInfo: AddressInfo
+  type: ServiceInterfaceType
+}
diff --git a/core/startos/bindings/ExportedHostInfo.ts b/sdk/lib/osBindings/ExportedHostInfo.ts
similarity index 55%
rename from core/startos/bindings/ExportedHostInfo.ts
rename to sdk/lib/osBindings/ExportedHostInfo.ts
index d8339a074..5e8a25ad6 100644
--- a/core/startos/bindings/ExportedHostInfo.ts
+++ b/sdk/lib/osBindings/ExportedHostInfo.ts
@@ -1,10 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ExportedHostnameInfo } from "./ExportedHostnameInfo";
-import type { HostId } from "./HostId";
-import type { HostKind } from "./HostKind";
+import type { ExportedHostnameInfo } from "./ExportedHostnameInfo"
+import type { HostId } from "./HostId"
+import type { HostKind } from "./HostKind"
 
 export type ExportedHostInfo = {
-  id: HostId;
-  kind: HostKind;
-  hostnames: Array<ExportedHostnameInfo>;
-};
+  id: HostId
+  kind: HostKind
+  hostnames: Array<ExportedHostnameInfo>
+}
diff --git a/sdk/lib/osBindings/ExportedHostnameInfo.ts b/sdk/lib/osBindings/ExportedHostnameInfo.ts
new file mode 100644
index 000000000..42f849529
--- /dev/null
+++ b/sdk/lib/osBindings/ExportedHostnameInfo.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ExportedIpHostname } from "./ExportedIpHostname"
+import type { ExportedOnionHostname } from "./ExportedOnionHostname"
+
+export type ExportedHostnameInfo =
+  | {
+      kind: "ip"
+      networkInterfaceId: string
+      public: boolean
+      hostname: ExportedIpHostname
+    }
+  | { kind: "onion"; hostname: ExportedOnionHostname }
diff --git a/core/startos/bindings/ExportedIpHostname.ts b/sdk/lib/osBindings/ExportedIpHostname.ts
similarity index 57%
rename from core/startos/bindings/ExportedIpHostname.ts
rename to sdk/lib/osBindings/ExportedIpHostname.ts
index 1e02ab2be..ea06fe05b 100644
--- a/core/startos/bindings/ExportedIpHostname.ts
+++ b/sdk/lib/osBindings/ExportedIpHostname.ts
@@ -4,15 +4,15 @@ export type ExportedIpHostname =
   | { kind: "ipv4"; value: string; port: number | null; sslPort: number | null }
   | { kind: "ipv6"; value: string; port: number | null; sslPort: number | null }
   | {
-      kind: "local";
-      value: string;
-      port: number | null;
-      sslPort: number | null;
+      kind: "local"
+      value: string
+      port: number | null
+      sslPort: number | null
     }
   | {
-      kind: "domain";
-      domain: string;
-      subdomain: string | null;
-      port: number | null;
-      sslPort: number | null;
-    };
+      kind: "domain"
+      domain: string
+      subdomain: string | null
+      port: number | null
+      sslPort: number | null
+    }
diff --git a/core/startos/bindings/ExportedOnionHostname.ts b/sdk/lib/osBindings/ExportedOnionHostname.ts
similarity index 68%
rename from core/startos/bindings/ExportedOnionHostname.ts
rename to sdk/lib/osBindings/ExportedOnionHostname.ts
index af072289f..2c7d67cec 100644
--- a/core/startos/bindings/ExportedOnionHostname.ts
+++ b/sdk/lib/osBindings/ExportedOnionHostname.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type ExportedOnionHostname = {
-  value: string;
-  port: number | null;
-  sslPort: number | null;
-};
+  value: string
+  port: number | null
+  sslPort: number | null
+}
diff --git a/sdk/lib/osBindings/ExposeForDependentsParams.ts b/sdk/lib/osBindings/ExposeForDependentsParams.ts
new file mode 100644
index 000000000..5b55368b9
--- /dev/null
+++ b/sdk/lib/osBindings/ExposeForDependentsParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ExposeForDependentsParams = { paths: string[] }
diff --git a/core/startos/bindings/FullProgress.ts b/sdk/lib/osBindings/FullProgress.ts
similarity index 60%
rename from core/startos/bindings/FullProgress.ts
rename to sdk/lib/osBindings/FullProgress.ts
index 56f6a1a15..8961ea0e7 100644
--- a/core/startos/bindings/FullProgress.ts
+++ b/sdk/lib/osBindings/FullProgress.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { NamedProgress } from "./NamedProgress";
-import type { Progress } from "./Progress";
+import type { NamedProgress } from "./NamedProgress"
+import type { Progress } from "./Progress"
 
-export type FullProgress = { overall: Progress; phases: Array<NamedProgress> };
+export type FullProgress = { overall: Progress; phases: Array<NamedProgress> }
diff --git a/core/startos/bindings/GetHostInfoParams.ts b/sdk/lib/osBindings/GetHostInfoParams.ts
similarity index 54%
rename from core/startos/bindings/GetHostInfoParams.ts
rename to sdk/lib/osBindings/GetHostInfoParams.ts
index 7c2b1b6b6..1ffb95de0 100644
--- a/core/startos/bindings/GetHostInfoParams.ts
+++ b/sdk/lib/osBindings/GetHostInfoParams.ts
@@ -1,10 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback";
-import type { GetHostInfoParamsKind } from "./GetHostInfoParamsKind";
+import type { Callback } from "./Callback"
+import type { GetHostInfoParamsKind } from "./GetHostInfoParamsKind"
 
 export type GetHostInfoParams = {
-  kind: GetHostInfoParamsKind | null;
-  serviceInterfaceId: string;
-  packageId: string | null;
-  callback: Callback;
-};
+  kind: GetHostInfoParamsKind | null
+  serviceInterfaceId: string
+  packageId: string | null
+  callback: Callback
+}
diff --git a/core/startos/bindings/GetHostInfoParamsKind.ts b/sdk/lib/osBindings/GetHostInfoParamsKind.ts
similarity index 70%
rename from core/startos/bindings/GetHostInfoParamsKind.ts
rename to sdk/lib/osBindings/GetHostInfoParamsKind.ts
index 6353044ce..482eb7177 100644
--- a/core/startos/bindings/GetHostInfoParamsKind.ts
+++ b/sdk/lib/osBindings/GetHostInfoParamsKind.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type GetHostInfoParamsKind = "multi";
+export type GetHostInfoParamsKind = "multi"
diff --git a/core/startos/bindings/GetPrimaryUrlParams.ts b/sdk/lib/osBindings/GetPrimaryUrlParams.ts
similarity index 53%
rename from core/startos/bindings/GetPrimaryUrlParams.ts
rename to sdk/lib/osBindings/GetPrimaryUrlParams.ts
index c5aaa0ebe..d9394f4ce 100644
--- a/core/startos/bindings/GetPrimaryUrlParams.ts
+++ b/sdk/lib/osBindings/GetPrimaryUrlParams.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback";
+import type { Callback } from "./Callback"
 
 export type GetPrimaryUrlParams = {
-  packageId: string | null;
-  serviceInterfaceId: string;
-  callback: Callback;
-};
+  packageId: string | null
+  serviceInterfaceId: string
+  callback: Callback
+}
diff --git a/core/startos/bindings/GetServiceInterfaceParams.ts b/sdk/lib/osBindings/GetServiceInterfaceParams.ts
similarity index 54%
rename from core/startos/bindings/GetServiceInterfaceParams.ts
rename to sdk/lib/osBindings/GetServiceInterfaceParams.ts
index 03990c10b..ee3a0c03d 100644
--- a/core/startos/bindings/GetServiceInterfaceParams.ts
+++ b/sdk/lib/osBindings/GetServiceInterfaceParams.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback";
+import type { Callback } from "./Callback"
 
 export type GetServiceInterfaceParams = {
-  packageId: string | null;
-  serviceInterfaceId: string;
-  callback: Callback;
-};
+  packageId: string | null
+  serviceInterfaceId: string
+  callback: Callback
+}
diff --git a/core/startos/bindings/GetServicePortForwardParams.ts b/sdk/lib/osBindings/GetServicePortForwardParams.ts
similarity index 57%
rename from core/startos/bindings/GetServicePortForwardParams.ts
rename to sdk/lib/osBindings/GetServicePortForwardParams.ts
index 70d69c674..beb423d9a 100644
--- a/core/startos/bindings/GetServicePortForwardParams.ts
+++ b/sdk/lib/osBindings/GetServicePortForwardParams.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HostId } from "./HostId";
+import type { HostId } from "./HostId"
 
 export type GetServicePortForwardParams = {
-  packageId: string | null;
-  internalPort: number;
-  hostId: HostId;
-};
+  packageId: string | null
+  internalPort: number
+  hostId: HostId
+}
diff --git a/core/startos/bindings/GetSslCertificateParams.ts b/sdk/lib/osBindings/GetSslCertificateParams.ts
similarity index 54%
rename from core/startos/bindings/GetSslCertificateParams.ts
rename to sdk/lib/osBindings/GetSslCertificateParams.ts
index a1fd17bdd..a33eff540 100644
--- a/core/startos/bindings/GetSslCertificateParams.ts
+++ b/sdk/lib/osBindings/GetSslCertificateParams.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Algorithm } from "./Algorithm";
+import type { Algorithm } from "./Algorithm"
 
 export type GetSslCertificateParams = {
-  packageId: string | null;
-  hostId: string;
-  algorithm: Algorithm | null;
-};
+  packageId: string | null
+  hostId: string
+  algorithm: Algorithm | null
+}
diff --git a/core/startos/bindings/GetSslKeyParams.ts b/sdk/lib/osBindings/GetSslKeyParams.ts
similarity index 52%
rename from core/startos/bindings/GetSslKeyParams.ts
rename to sdk/lib/osBindings/GetSslKeyParams.ts
index 8c5170c9c..0438c345a 100644
--- a/core/startos/bindings/GetSslKeyParams.ts
+++ b/sdk/lib/osBindings/GetSslKeyParams.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Algorithm } from "./Algorithm";
+import type { Algorithm } from "./Algorithm"
 
 export type GetSslKeyParams = {
-  packageId: string | null;
-  hostId: string;
-  algorithm: Algorithm | null;
-};
+  packageId: string | null
+  hostId: string
+  algorithm: Algorithm | null
+}
diff --git a/core/startos/bindings/GetStoreParams.ts b/sdk/lib/osBindings/GetStoreParams.ts
similarity index 95%
rename from core/startos/bindings/GetStoreParams.ts
rename to sdk/lib/osBindings/GetStoreParams.ts
index bfd97377b..dc3d4e211 100644
--- a/core/startos/bindings/GetStoreParams.ts
+++ b/sdk/lib/osBindings/GetStoreParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type GetStoreParams = { packageId: string | null; path: string };
+export type GetStoreParams = { packageId: string | null; path: string }
diff --git a/sdk/lib/osBindings/GetSystemSmtpParams.ts b/sdk/lib/osBindings/GetSystemSmtpParams.ts
new file mode 100644
index 000000000..650d59c49
--- /dev/null
+++ b/sdk/lib/osBindings/GetSystemSmtpParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Callback } from "./Callback"
+
+export type GetSystemSmtpParams = { callback: Callback }
diff --git a/core/startos/bindings/Governor.ts b/sdk/lib/osBindings/Governor.ts
similarity index 78%
rename from core/startos/bindings/Governor.ts
rename to sdk/lib/osBindings/Governor.ts
index 82c9e39f1..25e5f757f 100644
--- a/core/startos/bindings/Governor.ts
+++ b/sdk/lib/osBindings/Governor.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Governor = string;
+export type Governor = string
diff --git a/core/startos/bindings/HardwareRequirements.ts b/sdk/lib/osBindings/HardwareRequirements.ts
similarity index 61%
rename from core/startos/bindings/HardwareRequirements.ts
rename to sdk/lib/osBindings/HardwareRequirements.ts
index 079483289..bbe7c3ef5 100644
--- a/core/startos/bindings/HardwareRequirements.ts
+++ b/sdk/lib/osBindings/HardwareRequirements.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type HardwareRequirements = {
-  device: { [key: string]: string };
-  ram: bigint | null;
-  arch: Array<string> | null;
-};
+  device: { [key: string]: string }
+  ram: bigint | null
+  arch: Array<string> | null
+}
diff --git a/core/startos/bindings/HealthCheckId.ts b/sdk/lib/osBindings/HealthCheckId.ts
similarity index 75%
rename from core/startos/bindings/HealthCheckId.ts
rename to sdk/lib/osBindings/HealthCheckId.ts
index eeefafbb1..bc5300473 100644
--- a/core/startos/bindings/HealthCheckId.ts
+++ b/sdk/lib/osBindings/HealthCheckId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HealthCheckId = string;
+export type HealthCheckId = string
diff --git a/core/startos/bindings/HealthCheckResult.ts b/sdk/lib/osBindings/HealthCheckResult.ts
similarity index 99%
rename from core/startos/bindings/HealthCheckResult.ts
rename to sdk/lib/osBindings/HealthCheckResult.ts
index ae4d3c3c2..6fa3d3f8c 100644
--- a/core/startos/bindings/HealthCheckResult.ts
+++ b/sdk/lib/osBindings/HealthCheckResult.ts
@@ -6,4 +6,4 @@ export type HealthCheckResult = { name: string } & (
   | { result: "starting"; message: string | null }
   | { result: "loading"; message: string }
   | { result: "failure"; message: string }
-);
+)
diff --git a/sdk/lib/osBindings/Host.ts b/sdk/lib/osBindings/Host.ts
new file mode 100644
index 000000000..a476c0adc
--- /dev/null
+++ b/sdk/lib/osBindings/Host.ts
@@ -0,0 +1,11 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BindInfo } from "./BindInfo"
+import type { HostAddress } from "./HostAddress"
+import type { HostKind } from "./HostKind"
+
+export type Host = {
+  kind: HostKind
+  bindings: { [key: number]: BindInfo }
+  addresses: Array<HostAddress>
+  primary: HostAddress | null
+}
diff --git a/sdk/lib/osBindings/HostAddress.ts b/sdk/lib/osBindings/HostAddress.ts
new file mode 100644
index 000000000..0388e49c7
--- /dev/null
+++ b/sdk/lib/osBindings/HostAddress.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HostAddress = { kind: "onion"; address: string }
diff --git a/core/startos/bindings/HostId.ts b/sdk/lib/osBindings/HostId.ts
similarity index 79%
rename from core/startos/bindings/HostId.ts
rename to sdk/lib/osBindings/HostId.ts
index 23049a51d..f18dc2498 100644
--- a/core/startos/bindings/HostId.ts
+++ b/sdk/lib/osBindings/HostId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HostId = string;
+export type HostId = string
diff --git a/sdk/lib/osBindings/HostInfo.ts b/sdk/lib/osBindings/HostInfo.ts
new file mode 100644
index 000000000..d39b56ebe
--- /dev/null
+++ b/sdk/lib/osBindings/HostInfo.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Host } from "./Host"
+import type { HostId } from "./HostId"
+
+export type HostInfo = { [key: HostId]: Host }
diff --git a/core/startos/bindings/HostKind.ts b/sdk/lib/osBindings/HostKind.ts
similarity index 77%
rename from core/startos/bindings/HostKind.ts
rename to sdk/lib/osBindings/HostKind.ts
index 09e61b91b..3c2f5ad87 100644
--- a/core/startos/bindings/HostKind.ts
+++ b/sdk/lib/osBindings/HostKind.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HostKind = "multi";
+export type HostKind = "multi"
diff --git a/core/startos/bindings/ImageId.ts b/sdk/lib/osBindings/ImageId.ts
similarity index 78%
rename from core/startos/bindings/ImageId.ts
rename to sdk/lib/osBindings/ImageId.ts
index 408331f72..330b812b9 100644
--- a/core/startos/bindings/ImageId.ts
+++ b/sdk/lib/osBindings/ImageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ImageId = string;
+export type ImageId = string
diff --git a/sdk/lib/osBindings/InstalledState.ts b/sdk/lib/osBindings/InstalledState.ts
new file mode 100644
index 000000000..48177287e
--- /dev/null
+++ b/sdk/lib/osBindings/InstalledState.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Manifest } from "./Manifest"
+
+export type InstalledState = { manifest: Manifest }
diff --git a/core/startos/bindings/InstallingInfo.ts b/sdk/lib/osBindings/InstallingInfo.ts
similarity index 60%
rename from core/startos/bindings/InstallingInfo.ts
rename to sdk/lib/osBindings/InstallingInfo.ts
index 7627f4502..6b77b49d9 100644
--- a/core/startos/bindings/InstallingInfo.ts
+++ b/sdk/lib/osBindings/InstallingInfo.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { FullProgress } from "./FullProgress";
-import type { Manifest } from "./Manifest";
+import type { FullProgress } from "./FullProgress"
+import type { Manifest } from "./Manifest"
 
-export type InstallingInfo = { newManifest: Manifest; progress: FullProgress };
+export type InstallingInfo = { newManifest: Manifest; progress: FullProgress }
diff --git a/core/startos/bindings/InstallingState.ts b/sdk/lib/osBindings/InstallingState.ts
similarity index 75%
rename from core/startos/bindings/InstallingState.ts
rename to sdk/lib/osBindings/InstallingState.ts
index 3203cfd6b..db752df90 100644
--- a/core/startos/bindings/InstallingState.ts
+++ b/sdk/lib/osBindings/InstallingState.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { InstallingInfo } from "./InstallingInfo";
+import type { InstallingInfo } from "./InstallingInfo"
 
-export type InstallingState = { installingInfo: InstallingInfo };
+export type InstallingState = { installingInfo: InstallingInfo }
diff --git a/core/startos/bindings/IpInfo.ts b/sdk/lib/osBindings/IpInfo.ts
similarity index 55%
rename from core/startos/bindings/IpInfo.ts
rename to sdk/lib/osBindings/IpInfo.ts
index 1208fafb9..ae8c88d1b 100644
--- a/core/startos/bindings/IpInfo.ts
+++ b/sdk/lib/osBindings/IpInfo.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type IpInfo = {
-  ipv4Range: string | null;
-  ipv4: string | null;
-  ipv6Range: string | null;
-  ipv6: string | null;
-};
+  ipv4Range: string | null
+  ipv4: string | null
+  ipv6Range: string | null
+  ipv6: string | null
+}
diff --git a/core/startos/bindings/ListServiceInterfacesParams.ts b/sdk/lib/osBindings/ListServiceInterfacesParams.ts
similarity index 61%
rename from core/startos/bindings/ListServiceInterfacesParams.ts
rename to sdk/lib/osBindings/ListServiceInterfacesParams.ts
index 03d1cdfc8..4140831d0 100644
--- a/core/startos/bindings/ListServiceInterfacesParams.ts
+++ b/sdk/lib/osBindings/ListServiceInterfacesParams.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback";
+import type { Callback } from "./Callback"
 
 export type ListServiceInterfacesParams = {
-  packageId: string | null;
-  callback: Callback;
-};
+  packageId: string | null
+  callback: Callback
+}
diff --git a/sdk/lib/osBindings/MainStatus.ts b/sdk/lib/osBindings/MainStatus.ts
new file mode 100644
index 000000000..534cad76f
--- /dev/null
+++ b/sdk/lib/osBindings/MainStatus.ts
@@ -0,0 +1,20 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Duration } from "./Duration"
+import type { HealthCheckId } from "./HealthCheckId"
+import type { HealthCheckResult } from "./HealthCheckResult"
+
+export type MainStatus =
+  | { status: "stopped" }
+  | { status: "restarting" }
+  | { status: "stopping"; timeout: Duration }
+  | { status: "starting" }
+  | {
+      status: "running"
+      started: string
+      health: { [key: HealthCheckId]: HealthCheckResult }
+    }
+  | {
+      status: "backingUp"
+      started: string | null
+      health: { [key: HealthCheckId]: HealthCheckResult }
+    }
diff --git a/sdk/lib/osBindings/Manifest.ts b/sdk/lib/osBindings/Manifest.ts
new file mode 100644
index 000000000..14f2224ef
--- /dev/null
+++ b/sdk/lib/osBindings/Manifest.ts
@@ -0,0 +1,32 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Alerts } from "./Alerts"
+import type { Dependencies } from "./Dependencies"
+import type { Description } from "./Description"
+import type { HardwareRequirements } from "./HardwareRequirements"
+import type { ImageId } from "./ImageId"
+import type { PackageId } from "./PackageId"
+import type { VolumeId } from "./VolumeId"
+
+export type Manifest = {
+  id: PackageId
+  title: string
+  version: string
+  releaseNotes: string
+  license: string
+  replaces: Array<string>
+  wrapperRepo: string
+  upstreamRepo: string
+  supportSite: string
+  marketingSite: string
+  donationUrl: string | null
+  description: Description
+  images: Array<ImageId>
+  assets: Array<VolumeId>
+  volumes: Array<VolumeId>
+  alerts: Alerts
+  dependencies: Dependencies
+  hardwareRequirements: HardwareRequirements
+  gitHash: string | null
+  osVersion: string
+  hasConfig: boolean
+}
diff --git a/core/startos/bindings/EncryptedWire.ts b/sdk/lib/osBindings/MaybeUtf8String.ts
similarity index 69%
rename from core/startos/bindings/EncryptedWire.ts
rename to sdk/lib/osBindings/MaybeUtf8String.ts
index efffd7112..9532e9b97 100644
--- a/core/startos/bindings/EncryptedWire.ts
+++ b/sdk/lib/osBindings/MaybeUtf8String.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type EncryptedWire = { encrypted: any };
+export type MaybeUtf8String = string | number[]
diff --git a/core/startos/bindings/MountParams.ts b/sdk/lib/osBindings/MountParams.ts
similarity index 75%
rename from core/startos/bindings/MountParams.ts
rename to sdk/lib/osBindings/MountParams.ts
index daa4ddf32..778983fd6 100644
--- a/core/startos/bindings/MountParams.ts
+++ b/sdk/lib/osBindings/MountParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { MountTarget } from "./MountTarget";
+import type { MountTarget } from "./MountTarget"
 
-export type MountParams = { location: string; target: MountTarget };
+export type MountParams = { location: string; target: MountTarget }
diff --git a/core/startos/bindings/MountTarget.ts b/sdk/lib/osBindings/MountTarget.ts
similarity index 60%
rename from core/startos/bindings/MountTarget.ts
rename to sdk/lib/osBindings/MountTarget.ts
index 3009861fb..e4888d075 100644
--- a/core/startos/bindings/MountTarget.ts
+++ b/sdk/lib/osBindings/MountTarget.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type MountTarget = {
-  packageId: string;
-  volumeId: string;
-  subpath: string | null;
-  readonly: boolean;
-};
+  packageId: string
+  volumeId: string
+  subpath: string | null
+  readonly: boolean
+}
diff --git a/core/startos/bindings/NamedProgress.ts b/sdk/lib/osBindings/NamedProgress.ts
similarity index 79%
rename from core/startos/bindings/NamedProgress.ts
rename to sdk/lib/osBindings/NamedProgress.ts
index 42104c48b..52a410a51 100644
--- a/core/startos/bindings/NamedProgress.ts
+++ b/sdk/lib/osBindings/NamedProgress.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Progress } from "./Progress";
+import type { Progress } from "./Progress"
 
-export type NamedProgress = { name: string; progress: Progress };
+export type NamedProgress = { name: string; progress: Progress }
diff --git a/sdk/lib/osBindings/PackageDataEntry.ts b/sdk/lib/osBindings/PackageDataEntry.ts
new file mode 100644
index 000000000..28074a08d
--- /dev/null
+++ b/sdk/lib/osBindings/PackageDataEntry.ts
@@ -0,0 +1,24 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId"
+import type { ActionMetadata } from "./ActionMetadata"
+import type { CurrentDependencies } from "./CurrentDependencies"
+import type { DataUrl } from "./DataUrl"
+import type { HostInfo } from "./HostInfo"
+import type { PackageState } from "./PackageState"
+import type { ServiceInterfaceId } from "./ServiceInterfaceId"
+import type { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo"
+import type { Status } from "./Status"
+
+export type PackageDataEntry = {
+  stateInfo: PackageState
+  status: Status
+  marketplaceUrl: string | null
+  developerKey: string
+  icon: DataUrl
+  lastBackup: string | null
+  currentDependencies: CurrentDependencies
+  actions: { [key: ActionId]: ActionMetadata }
+  serviceInterfaces: { [key: ServiceInterfaceId]: ServiceInterfaceWithHostInfo }
+  hosts: HostInfo
+  storeExposedDependents: string[]
+}
diff --git a/core/startos/bindings/PackageId.ts b/sdk/lib/osBindings/PackageId.ts
similarity index 77%
rename from core/startos/bindings/PackageId.ts
rename to sdk/lib/osBindings/PackageId.ts
index 349bf44d7..9e3403303 100644
--- a/core/startos/bindings/PackageId.ts
+++ b/sdk/lib/osBindings/PackageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type PackageId = string;
+export type PackageId = string
diff --git a/core/startos/bindings/PackageState.ts b/sdk/lib/osBindings/PackageState.ts
similarity index 60%
rename from core/startos/bindings/PackageState.ts
rename to sdk/lib/osBindings/PackageState.ts
index 6c90bff09..fd15076ca 100644
--- a/core/startos/bindings/PackageState.ts
+++ b/sdk/lib/osBindings/PackageState.ts
@@ -1,11 +1,11 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { InstalledState } from "./InstalledState";
-import type { InstallingState } from "./InstallingState";
-import type { UpdatingState } from "./UpdatingState";
+import type { InstalledState } from "./InstalledState"
+import type { InstallingState } from "./InstallingState"
+import type { UpdatingState } from "./UpdatingState"
 
 export type PackageState =
   | ({ state: "installing" } & InstallingState)
   | ({ state: "restoring" } & InstallingState)
   | ({ state: "updating" } & UpdatingState)
   | ({ state: "installed" } & InstalledState)
-  | ({ state: "removing" } & InstalledState);
+  | ({ state: "removing" } & InstalledState)
diff --git a/core/startos/bindings/CreateOverlayedImageParams.ts b/sdk/lib/osBindings/ParamsMaybePackageId.ts
similarity index 63%
rename from core/startos/bindings/CreateOverlayedImageParams.ts
rename to sdk/lib/osBindings/ParamsMaybePackageId.ts
index d17f2e8c1..a20bb9aa5 100644
--- a/core/startos/bindings/CreateOverlayedImageParams.ts
+++ b/sdk/lib/osBindings/ParamsMaybePackageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type CreateOverlayedImageParams = { imageId: string };
+export type ParamsMaybePackageId = { packageId: string | null }
diff --git a/core/startos/bindings/BackupProgress.ts b/sdk/lib/osBindings/ParamsPackageId.ts
similarity index 67%
rename from core/startos/bindings/BackupProgress.ts
rename to sdk/lib/osBindings/ParamsPackageId.ts
index 42812a7b7..f4dd1c1eb 100644
--- a/core/startos/bindings/BackupProgress.ts
+++ b/sdk/lib/osBindings/ParamsPackageId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type BackupProgress = { complete: boolean };
+export type ParamsPackageId = { packageId: string }
diff --git a/sdk/lib/osBindings/PasswordType.ts b/sdk/lib/osBindings/PasswordType.ts
new file mode 100644
index 000000000..7fdcc0f5d
--- /dev/null
+++ b/sdk/lib/osBindings/PasswordType.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EncryptedWire } from "./EncryptedWire"
+
+export type PasswordType = EncryptedWire | string
diff --git a/core/startos/bindings/Progress.ts b/sdk/lib/osBindings/Progress.ts
similarity index 95%
rename from core/startos/bindings/Progress.ts
rename to sdk/lib/osBindings/Progress.ts
index c8e5e4431..3ece4307c 100644
--- a/core/startos/bindings/Progress.ts
+++ b/sdk/lib/osBindings/Progress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Progress = boolean | { done: number; total: number | null };
+export type Progress = boolean | { done: number; total: number | null }
diff --git a/sdk/lib/osBindings/Public.ts b/sdk/lib/osBindings/Public.ts
new file mode 100644
index 000000000..c77ae05e3
--- /dev/null
+++ b/sdk/lib/osBindings/Public.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AllPackageData } from "./AllPackageData"
+import type { ServerInfo } from "./ServerInfo"
+
+export type Public = {
+  serverInfo: ServerInfo
+  packageData: AllPackageData
+  ui: any
+}
diff --git a/sdk/lib/osBindings/RemoveActionParams.ts b/sdk/lib/osBindings/RemoveActionParams.ts
new file mode 100644
index 000000000..c343620b8
--- /dev/null
+++ b/sdk/lib/osBindings/RemoveActionParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type RemoveActionParams = { id: string }
diff --git a/core/startos/bindings/MaybeUtf8String.ts b/sdk/lib/osBindings/RemoveAddressParams.ts
similarity index 69%
rename from core/startos/bindings/MaybeUtf8String.ts
rename to sdk/lib/osBindings/RemoveAddressParams.ts
index a77f8ce4e..bdc781837 100644
--- a/core/startos/bindings/MaybeUtf8String.ts
+++ b/sdk/lib/osBindings/RemoveAddressParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type MaybeUtf8String = string | number[];
+export type RemoveAddressParams = { id: string }
diff --git a/sdk/lib/osBindings/ReverseProxyBind.ts b/sdk/lib/osBindings/ReverseProxyBind.ts
new file mode 100644
index 000000000..bd07b9489
--- /dev/null
+++ b/sdk/lib/osBindings/ReverseProxyBind.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ReverseProxyBind = { ip: string | null; port: number; ssl: boolean }
diff --git a/core/startos/bindings/ReverseProxyDestination.ts b/sdk/lib/osBindings/ReverseProxyDestination.ts
similarity index 72%
rename from core/startos/bindings/ReverseProxyDestination.ts
rename to sdk/lib/osBindings/ReverseProxyDestination.ts
index 216d1310f..88b5dd650 100644
--- a/core/startos/bindings/ReverseProxyDestination.ts
+++ b/sdk/lib/osBindings/ReverseProxyDestination.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type ReverseProxyDestination = {
-  ip: string | null;
-  port: number;
-  ssl: boolean;
-};
+  ip: string | null
+  port: number
+  ssl: boolean
+}
diff --git a/core/startos/bindings/ReverseProxyHttp.ts b/sdk/lib/osBindings/ReverseProxyHttp.ts
similarity index 92%
rename from core/startos/bindings/ReverseProxyHttp.ts
rename to sdk/lib/osBindings/ReverseProxyHttp.ts
index 07cf41862..ba49e81dc 100644
--- a/core/startos/bindings/ReverseProxyHttp.ts
+++ b/sdk/lib/osBindings/ReverseProxyHttp.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ReverseProxyHttp = { headers: null | { [key: string]: string } };
+export type ReverseProxyHttp = { headers: null | { [key: string]: string } }
diff --git a/sdk/lib/osBindings/ReverseProxyParams.ts b/sdk/lib/osBindings/ReverseProxyParams.ts
new file mode 100644
index 000000000..00062cbdf
--- /dev/null
+++ b/sdk/lib/osBindings/ReverseProxyParams.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ReverseProxyBind } from "./ReverseProxyBind"
+import type { ReverseProxyDestination } from "./ReverseProxyDestination"
+import type { ReverseProxyHttp } from "./ReverseProxyHttp"
+
+export type ReverseProxyParams = {
+  bind: ReverseProxyBind
+  dst: ReverseProxyDestination
+  http: ReverseProxyHttp
+}
diff --git a/core/startos/bindings/Security.ts b/sdk/lib/osBindings/Security.ts
similarity index 72%
rename from core/startos/bindings/Security.ts
rename to sdk/lib/osBindings/Security.ts
index e722707df..333783cd2 100644
--- a/core/startos/bindings/Security.ts
+++ b/sdk/lib/osBindings/Security.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Security = { ssl: boolean };
+export type Security = { ssl: boolean }
diff --git a/sdk/lib/osBindings/ServerInfo.ts b/sdk/lib/osBindings/ServerInfo.ts
new file mode 100644
index 000000000..284eba336
--- /dev/null
+++ b/sdk/lib/osBindings/ServerInfo.ts
@@ -0,0 +1,31 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Governor } from "./Governor"
+import type { IpInfo } from "./IpInfo"
+import type { ServerStatus } from "./ServerStatus"
+import type { WifiInfo } from "./WifiInfo"
+
+export type ServerInfo = {
+  arch: string
+  platform: string
+  id: string
+  hostname: string
+  version: string
+  lastBackup: string | null
+  eosVersionCompat: string
+  lanAddress: string
+  onionAddress: string
+  /**
+   * for backwards compatibility
+   */
+  torAddress: string
+  ipInfo: { [key: string]: IpInfo }
+  statusInfo: ServerStatus
+  wifi: WifiInfo
+  unreadNotificationCount: number
+  passwordHash: string
+  pubkey: string
+  caFingerprint: string
+  ntpSynced: boolean
+  zram: boolean
+  governor: Governor | null
+}
diff --git a/core/startos/bindings/ServerSpecs.ts b/sdk/lib/osBindings/ServerSpecs.ts
similarity index 95%
rename from core/startos/bindings/ServerSpecs.ts
rename to sdk/lib/osBindings/ServerSpecs.ts
index b2278873c..c736ca5c8 100644
--- a/core/startos/bindings/ServerSpecs.ts
+++ b/sdk/lib/osBindings/ServerSpecs.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ServerSpecs = { cpu: string; disk: string; memory: string };
+export type ServerSpecs = { cpu: string; disk: string; memory: string }
diff --git a/sdk/lib/osBindings/ServerStatus.ts b/sdk/lib/osBindings/ServerStatus.ts
new file mode 100644
index 000000000..2d3a362d7
--- /dev/null
+++ b/sdk/lib/osBindings/ServerStatus.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BackupProgress } from "./BackupProgress"
+import type { PackageId } from "./PackageId"
+import type { UpdateProgress } from "./UpdateProgress"
+
+export type ServerStatus = {
+  backupProgress: { [key: PackageId]: BackupProgress } | null
+  updated: boolean
+  updateProgress: UpdateProgress | null
+  shuttingDown: boolean
+  restarting: boolean
+}
diff --git a/sdk/lib/osBindings/ServiceInterface.ts b/sdk/lib/osBindings/ServiceInterface.ts
new file mode 100644
index 000000000..91ac77515
--- /dev/null
+++ b/sdk/lib/osBindings/ServiceInterface.ts
@@ -0,0 +1,15 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddressInfo } from "./AddressInfo"
+import type { ServiceInterfaceId } from "./ServiceInterfaceId"
+import type { ServiceInterfaceType } from "./ServiceInterfaceType"
+
+export type ServiceInterface = {
+  id: ServiceInterfaceId
+  name: string
+  description: string
+  hasPrimary: boolean
+  disabled: boolean
+  masked: boolean
+  addressInfo: AddressInfo
+  type: ServiceInterfaceType
+}
diff --git a/core/startos/bindings/ServiceInterfaceId.ts b/sdk/lib/osBindings/ServiceInterfaceId.ts
similarity index 72%
rename from core/startos/bindings/ServiceInterfaceId.ts
rename to sdk/lib/osBindings/ServiceInterfaceId.ts
index 55315ab60..3ad454e04 100644
--- a/core/startos/bindings/ServiceInterfaceId.ts
+++ b/sdk/lib/osBindings/ServiceInterfaceId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ServiceInterfaceId = string;
+export type ServiceInterfaceId = string
diff --git a/sdk/lib/osBindings/ServiceInterfaceType.ts b/sdk/lib/osBindings/ServiceInterfaceType.ts
new file mode 100644
index 000000000..109691474
--- /dev/null
+++ b/sdk/lib/osBindings/ServiceInterfaceType.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ServiceInterfaceType = "ui" | "p2p" | "api"
diff --git a/sdk/lib/osBindings/ServiceInterfaceWithHostInfo.ts b/sdk/lib/osBindings/ServiceInterfaceWithHostInfo.ts
new file mode 100644
index 000000000..979e6b500
--- /dev/null
+++ b/sdk/lib/osBindings/ServiceInterfaceWithHostInfo.ts
@@ -0,0 +1,17 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AddressInfo } from "./AddressInfo"
+import type { ExportedHostInfo } from "./ExportedHostInfo"
+import type { ServiceInterfaceId } from "./ServiceInterfaceId"
+import type { ServiceInterfaceType } from "./ServiceInterfaceType"
+
+export type ServiceInterfaceWithHostInfo = {
+  hostInfo: ExportedHostInfo
+  id: ServiceInterfaceId
+  name: string
+  description: string
+  hasPrimary: boolean
+  disabled: boolean
+  masked: boolean
+  addressInfo: AddressInfo
+  type: ServiceInterfaceType
+}
diff --git a/core/startos/bindings/Session.ts b/sdk/lib/osBindings/Session.ts
similarity index 92%
rename from core/startos/bindings/Session.ts
rename to sdk/lib/osBindings/Session.ts
index 05a3ae65d..f9cffaf36 100644
--- a/core/startos/bindings/Session.ts
+++ b/sdk/lib/osBindings/Session.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Session = { loggedIn: string; lastActive: string; metadata: any };
+export type Session = { loggedIn: string; lastActive: string; metadata: any }
diff --git a/core/startos/bindings/SessionList.ts b/sdk/lib/osBindings/SessionList.ts
similarity index 78%
rename from core/startos/bindings/SessionList.ts
rename to sdk/lib/osBindings/SessionList.ts
index ef1561188..a85a42dee 100644
--- a/core/startos/bindings/SessionList.ts
+++ b/sdk/lib/osBindings/SessionList.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Sessions } from "./Sessions";
+import type { Sessions } from "./Sessions"
 
-export type SessionList = { current: string; sessions: Sessions };
+export type SessionList = { current: string; sessions: Sessions }
diff --git a/core/startos/bindings/Sessions.ts b/sdk/lib/osBindings/Sessions.ts
similarity index 93%
rename from core/startos/bindings/Sessions.ts
rename to sdk/lib/osBindings/Sessions.ts
index a5ac67b65..bb153ddb4 100644
--- a/core/startos/bindings/Sessions.ts
+++ b/sdk/lib/osBindings/Sessions.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type Sessions = {
-  [key: string]: { loggedIn: string; lastActive: string; metadata: any };
-};
+  [key: string]: { loggedIn: string; lastActive: string; metadata: any }
+}
diff --git a/sdk/lib/osBindings/SetConfigured.ts b/sdk/lib/osBindings/SetConfigured.ts
new file mode 100644
index 000000000..e1478422a
--- /dev/null
+++ b/sdk/lib/osBindings/SetConfigured.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetConfigured = { configured: boolean }
diff --git a/core/startos/bindings/SetDependenciesParams.ts b/sdk/lib/osBindings/SetDependenciesParams.ts
similarity index 79%
rename from core/startos/bindings/SetDependenciesParams.ts
rename to sdk/lib/osBindings/SetDependenciesParams.ts
index d4d2d45cb..7b34b50c9 100644
--- a/core/startos/bindings/SetDependenciesParams.ts
+++ b/sdk/lib/osBindings/SetDependenciesParams.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { DependencyRequirement } from "./DependencyRequirement";
+import type { DependencyRequirement } from "./DependencyRequirement"
 
 export type SetDependenciesParams = {
-  dependencies: Array<DependencyRequirement>;
-};
+  dependencies: Array<DependencyRequirement>
+}
diff --git a/core/startos/bindings/SetHealth.ts b/sdk/lib/osBindings/SetHealth.ts
similarity index 87%
rename from core/startos/bindings/SetHealth.ts
rename to sdk/lib/osBindings/SetHealth.ts
index 8a4a1bcff..47f67886a 100644
--- a/core/startos/bindings/SetHealth.ts
+++ b/sdk/lib/osBindings/SetHealth.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HealthCheckId } from "./HealthCheckId";
+import type { HealthCheckId } from "./HealthCheckId"
 
 export type SetHealth = { id: HealthCheckId; name: string } & (
   | { result: "success"; message: string | null }
@@ -7,4 +7,4 @@ export type SetHealth = { id: HealthCheckId; name: string } & (
   | { result: "starting"; message: string | null }
   | { result: "loading"; message: string }
   | { result: "failure"; message: string }
-);
+)
diff --git a/sdk/lib/osBindings/SetMainStatus.ts b/sdk/lib/osBindings/SetMainStatus.ts
new file mode 100644
index 000000000..32a839984
--- /dev/null
+++ b/sdk/lib/osBindings/SetMainStatus.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Status } from "./Status"
+
+export type SetMainStatus = { status: Status }
diff --git a/sdk/lib/osBindings/SetStoreParams.ts b/sdk/lib/osBindings/SetStoreParams.ts
new file mode 100644
index 000000000..ecdd7b042
--- /dev/null
+++ b/sdk/lib/osBindings/SetStoreParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetStoreParams = { value: any; path: string }
diff --git a/sdk/lib/osBindings/Status.ts b/sdk/lib/osBindings/Status.ts
new file mode 100644
index 000000000..b784f4d6a
--- /dev/null
+++ b/sdk/lib/osBindings/Status.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { MainStatus } from "./MainStatus"
+
+export type Status = { configured: boolean; main: MainStatus }
diff --git a/core/startos/bindings/UpdateProgress.ts b/sdk/lib/osBindings/UpdateProgress.ts
similarity index 94%
rename from core/startos/bindings/UpdateProgress.ts
rename to sdk/lib/osBindings/UpdateProgress.ts
index 3d07c56b4..19b55f262 100644
--- a/core/startos/bindings/UpdateProgress.ts
+++ b/sdk/lib/osBindings/UpdateProgress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type UpdateProgress = { size: number | null; downloaded: number };
+export type UpdateProgress = { size: number | null; downloaded: number }
diff --git a/sdk/lib/osBindings/UpdatingState.ts b/sdk/lib/osBindings/UpdatingState.ts
new file mode 100644
index 000000000..117124f91
--- /dev/null
+++ b/sdk/lib/osBindings/UpdatingState.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { InstallingInfo } from "./InstallingInfo"
+import type { Manifest } from "./Manifest"
+
+export type UpdatingState = {
+  manifest: Manifest
+  installingInfo: InstallingInfo
+}
diff --git a/core/startos/bindings/VolumeId.ts b/sdk/lib/osBindings/VolumeId.ts
similarity index 78%
rename from core/startos/bindings/VolumeId.ts
rename to sdk/lib/osBindings/VolumeId.ts
index e5c63994e..b4657af4c 100644
--- a/core/startos/bindings/VolumeId.ts
+++ b/sdk/lib/osBindings/VolumeId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type VolumeId = string;
+export type VolumeId = string
diff --git a/core/startos/bindings/WifiInfo.ts b/sdk/lib/osBindings/WifiInfo.ts
similarity index 54%
rename from core/startos/bindings/WifiInfo.ts
rename to sdk/lib/osBindings/WifiInfo.ts
index 812cc431f..c5103e7e2 100644
--- a/core/startos/bindings/WifiInfo.ts
+++ b/sdk/lib/osBindings/WifiInfo.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type WifiInfo = {
-  interface: string | null;
-  ssids: Array<string>;
-  selected: string | null;
-  lastRegion: string | null;
-};
+  interface: string | null
+  ssids: Array<string>
+  selected: string | null
+  lastRegion: string | null
+}
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
new file mode 100644
index 000000000..67129fba1
--- /dev/null
+++ b/sdk/lib/osBindings/index.ts
@@ -0,0 +1,101 @@
+export { ActionId } from "./ActionId"
+export { ActionMetadata } from "./ActionMetadata"
+export { AddressInfo } from "./AddressInfo"
+export { AddSslOptions } from "./AddSslOptions"
+export { Alerts } from "./Alerts"
+export { Algorithm } from "./Algorithm"
+export { AllowedStatuses } from "./AllowedStatuses"
+export { AllPackageData } from "./AllPackageData"
+export { AlpnInfo } from "./AlpnInfo"
+export { BackupProgress } from "./BackupProgress"
+export { BindInfo } from "./BindInfo"
+export { BindOptions } from "./BindOptions"
+export { BindParams } from "./BindParams"
+export { Callback } from "./Callback"
+export { ChrootParams } from "./ChrootParams"
+export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams"
+export { CurrentDependencies } from "./CurrentDependencies"
+export { CurrentDependencyInfo } from "./CurrentDependencyInfo"
+export { DataUrl } from "./DataUrl"
+export { Dependencies } from "./Dependencies"
+export { DependencyKind } from "./DependencyKind"
+export { DependencyRequirement } from "./DependencyRequirement"
+export { DepInfo } from "./DepInfo"
+export { Description } from "./Description"
+export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams"
+export { Duration } from "./Duration"
+export { EncryptedWire } from "./EncryptedWire"
+export { ExecuteAction } from "./ExecuteAction"
+export { ExportActionParams } from "./ExportActionParams"
+export { ExportedHostInfo } from "./ExportedHostInfo"
+export { ExportedHostnameInfo } from "./ExportedHostnameInfo"
+export { ExportedIpHostname } from "./ExportedIpHostname"
+export { ExportedOnionHostname } from "./ExportedOnionHostname"
+export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams"
+export { ExposeForDependentsParams } from "./ExposeForDependentsParams"
+export { FullProgress } from "./FullProgress"
+export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind"
+export { GetHostInfoParams } from "./GetHostInfoParams"
+export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams"
+export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams"
+export { GetServicePortForwardParams } from "./GetServicePortForwardParams"
+export { GetSslCertificateParams } from "./GetSslCertificateParams"
+export { GetSslKeyParams } from "./GetSslKeyParams"
+export { GetStoreParams } from "./GetStoreParams"
+export { GetSystemSmtpParams } from "./GetSystemSmtpParams"
+export { Governor } from "./Governor"
+export { HardwareRequirements } from "./HardwareRequirements"
+export { HealthCheckId } from "./HealthCheckId"
+export { HealthCheckResult } from "./HealthCheckResult"
+export { HostAddress } from "./HostAddress"
+export { HostId } from "./HostId"
+export { HostInfo } from "./HostInfo"
+export { HostKind } from "./HostKind"
+export { Host } from "./Host"
+export { ImageId } from "./ImageId"
+export { InstalledState } from "./InstalledState"
+export { InstallingInfo } from "./InstallingInfo"
+export { InstallingState } from "./InstallingState"
+export { IpInfo } from "./IpInfo"
+export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"
+export { MainStatus } from "./MainStatus"
+export { Manifest } from "./Manifest"
+export { MaybeUtf8String } from "./MaybeUtf8String"
+export { MountParams } from "./MountParams"
+export { MountTarget } from "./MountTarget"
+export { NamedProgress } from "./NamedProgress"
+export { PackageDataEntry } from "./PackageDataEntry"
+export { PackageId } from "./PackageId"
+export { PackageState } from "./PackageState"
+export { ParamsMaybePackageId } from "./ParamsMaybePackageId"
+export { ParamsPackageId } from "./ParamsPackageId"
+export { PasswordType } from "./PasswordType"
+export { Progress } from "./Progress"
+export { Public } from "./Public"
+export { RemoveActionParams } from "./RemoveActionParams"
+export { RemoveAddressParams } from "./RemoveAddressParams"
+export { ReverseProxyBind } from "./ReverseProxyBind"
+export { ReverseProxyDestination } from "./ReverseProxyDestination"
+export { ReverseProxyHttp } from "./ReverseProxyHttp"
+export { ReverseProxyParams } from "./ReverseProxyParams"
+export { Security } from "./Security"
+export { ServerInfo } from "./ServerInfo"
+export { ServerSpecs } from "./ServerSpecs"
+export { ServerStatus } from "./ServerStatus"
+export { ServiceInterfaceId } from "./ServiceInterfaceId"
+export { ServiceInterface } from "./ServiceInterface"
+export { ServiceInterfaceType } from "./ServiceInterfaceType"
+export { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo"
+export { SessionList } from "./SessionList"
+export { Sessions } from "./Sessions"
+export { Session } from "./Session"
+export { SetConfigured } from "./SetConfigured"
+export { SetDependenciesParams } from "./SetDependenciesParams"
+export { SetHealth } from "./SetHealth"
+export { SetMainStatus } from "./SetMainStatus"
+export { SetStoreParams } from "./SetStoreParams"
+export { Status } from "./Status"
+export { UpdateProgress } from "./UpdateProgress"
+export { UpdatingState } from "./UpdatingState"
+export { VolumeId } from "./VolumeId"
+export { WifiInfo } from "./WifiInfo"
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index 5fa3f74b3..0743db4fa 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -1,28 +1,28 @@
 import { Effects } from "../types"
-import { ExecuteAction } from "../../../core/startos/bindings/ExecuteAction"
-import { CreateOverlayedImageParams } from "../../../core/startos/bindings/CreateOverlayedImageParams"
-import { DestroyOverlayedImageParams } from "../../../core/startos/bindings/DestroyOverlayedImageParams"
-import { BindParams } from "../../../core/startos/bindings/BindParams"
-import { GetHostInfoParams } from "../../../core/startos/bindings/GetHostInfoParams"
-import { ParamsPackageId } from "../../../core/startos/bindings/ParamsPackageId"
-import { ParamsMaybePackageId } from "../../../core/startos/bindings/ParamsMaybePackageId"
-import { SetConfigured } from "../../../core/startos/bindings/SetConfigured"
-import { SetHealth } from "../../../core/startos/bindings/SetHealth"
-import { ExposeForDependentsParams } from "../../../core/startos/bindings/ExposeForDependentsParams"
-import { GetSslCertificateParams } from "../../../core/startos/bindings/GetSslCertificateParams"
-import { GetSslKeyParams } from "../../../core/startos/bindings/GetSslKeyParams"
-import { GetServiceInterfaceParams } from "../../../core/startos/bindings/GetServiceInterfaceParams"
-import { SetDependenciesParams } from "../../../core/startos/bindings/SetDependenciesParams"
-import { GetSystemSmtpParams } from "../../../core/startos/bindings/GetSystemSmtpParams"
-import { GetServicePortForwardParams } from "../../../core/startos/bindings/GetServicePortForwardParams"
-import { ExportServiceInterfaceParams } from "../../../core/startos/bindings/ExportServiceInterfaceParams"
-import { GetPrimaryUrlParams } from "../../../core/startos/bindings/GetPrimaryUrlParams"
-import { ListServiceInterfacesParams } from "../../../core/startos/bindings/ListServiceInterfacesParams"
-import { RemoveAddressParams } from "../../../core/startos/bindings/RemoveAddressParams"
-import { ExportActionParams } from "../../../core/startos/bindings/ExportActionParams"
-import { RemoveActionParams } from "../../../core/startos/bindings/RemoveActionParams"
-import { ReverseProxyParams } from "../../../core/startos/bindings/ReverseProxyParams"
-import { MountParams } from "../../../core/startos/bindings/MountParams"
+import { ExecuteAction } from ".././osBindings"
+import { CreateOverlayedImageParams } from ".././osBindings"
+import { DestroyOverlayedImageParams } from ".././osBindings"
+import { BindParams } from ".././osBindings"
+import { GetHostInfoParams } from ".././osBindings"
+import { ParamsPackageId } from ".././osBindings"
+import { ParamsMaybePackageId } from ".././osBindings"
+import { SetConfigured } from ".././osBindings"
+import { SetHealth } from ".././osBindings"
+import { ExposeForDependentsParams } from ".././osBindings"
+import { GetSslCertificateParams } from ".././osBindings"
+import { GetSslKeyParams } from ".././osBindings"
+import { GetServiceInterfaceParams } from ".././osBindings"
+import { SetDependenciesParams } from ".././osBindings"
+import { GetSystemSmtpParams } from ".././osBindings"
+import { GetServicePortForwardParams } from ".././osBindings"
+import { ExportServiceInterfaceParams } from ".././osBindings"
+import { GetPrimaryUrlParams } from ".././osBindings"
+import { ListServiceInterfacesParams } from ".././osBindings"
+import { RemoveAddressParams } from ".././osBindings"
+import { ExportActionParams } from ".././osBindings"
+import { RemoveActionParams } from ".././osBindings"
+import { ReverseProxyParams } from ".././osBindings"
+import { MountParams } from ".././osBindings"
 function typeEquality<ExpectedType>(_a: ExpectedType) {}
 describe("startosTypeValidation ", () => {
   test(`checking the params match`, () => {
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index f266d2870..d33bda79f 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -1,6 +1,6 @@
 export * as configTypes from "./config/configTypes"
-import { HealthCheckId } from "../../core/startos/bindings/HealthCheckId"
-import { HealthCheckResult } from "../../core/startos/bindings/HealthCheckResult"
+import { HealthCheckId } from "./osBindings"
+import { HealthCheckResult } from "./osBindings"
 import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
 import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
@@ -9,7 +9,7 @@ import { Daemons } from "./mainFn/Daemons"
 import { PathBuilder, StorePath } from "./store/PathBuilder"
 import { ExposedStorePaths } from "./store/setupExposeStore"
 import { UrlString } from "./util/getServiceInterface"
-export * from "../../core/startos/bindings"
+export * from "./osBindings"
 export { SDKManifest } from "./manifest/ManifestTypes"
 
 export type ExportedAction = (options: {
diff --git a/sdk/package.json b/sdk/package.json
index 6176f4d8e..409c5bb02 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -2,10 +2,10 @@
   "name": "@start9labs/start-sdk",
   "version": "0.4.0-rev0.lib0.rc8.beta10",
   "description": "Software development kit to facilitate packaging services for StartOS",
-  "main": "./cjs/sdk/lib/index.js",
-  "types": "./cjs/sdk/lib/index.d.ts",
-  "module": "./mjs/sdk/lib/index.js",
-  "browser": "./mjs/sdk/lib/index.browser.js",
+  "main": "./cjs/lib/index.js",
+  "types": "./cjs/lib/index.d.ts",
+  "module": "./mjs/lib/index.js",
+  "browser": "./mjs/lib/index.browser.js",
   "sideEffects": true,
   "typesVersion": {
     ">=3.1": {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index 082f8aa0d..a48ac8185 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -17,7 +17,6 @@ import { isEmptyObject, ErrorToastService, getPkgId } from '@start9labs/shared'
 import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
-import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types'
 import { T } from '@start9labs/start-sdk'
 
 @Component({
@@ -43,7 +42,7 @@ export class AppActionsPage {
 
   async handleAction(
     status: T.Status,
-    action: { key: string; value: ActionMetadata },
+    action: { key: string; value: T.ActionMetadata },
   ) {
     if (
       status &&

From 7b8a0114f5d872b437fdba9bef785cdb1de11c32 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 23 Apr 2024 14:01:29 -0600
Subject: [PATCH 142/341] fix log response (#2607)

---
 core/startos/src/logs.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 7c4ed1c28..d8b7c898f 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -242,7 +242,7 @@ pub fn logs() -> ParentHandler<LogsParam> {
                 .with_inherited(|params, _| params),
         )
         .root_handler(
-            from_fn_async(logs_follow)
+            from_fn_async(logs_nofollow)
                 .with_inherited(|params, _| params)
                 .no_cli(),
         )

From 3a5ee4a296e1f08edfb0a5cdb9b40f834608405a Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 23 Apr 2024 14:01:40 -0600
Subject: [PATCH 143/341] kill process by session, and add timeout (#2608)

---
 .../DockerProcedureContainer.ts               |  15 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |   2 +-
 .../Systems/SystemForEmbassy/index.ts         | 181 ++++++++++++------
 .../src/service/service_effect_handler.rs     |   1 +
 sdk/lib/mainFn/Daemons.ts                     |  29 +--
 sdk/lib/util/Overlay.ts                       |  48 ++++-
 6 files changed, 191 insertions(+), 85 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 1a8b54e22..c8388d151 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -84,10 +84,19 @@ export class DockerProcedureContainer {
     }
   }
 
-  async execSpawn(commands: string[]) {
+  async execFail(commands: string[], timeoutMs: number | null) {
     try {
-      const spawned = await this.overlay.spawn(commands)
-      return spawned
+      const res = await this.overlay.exec(commands, {}, timeoutMs)
+      if (res.exitCode !== 0) {
+        const codeOrSignal =
+          res.exitCode !== null
+            ? `code ${res.exitCode}`
+            : `signal ${res.exitSignal}`
+        throw new Error(
+          `Process exited with ${codeOrSignal}: ${res.stderr.toString()}`,
+        )
+      }
+      return res
     } finally {
       await this.overlay.destroy()
     }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index c28615fc9..0b4f92002 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -140,7 +140,7 @@ export class MainLoop {
               actionProcedure,
               manifest.volumes,
             )
-            const executed = await container.execSpawn([
+            const executed = await container.exec([
               actionProcedure.entrypoint,
               ...actionProcedure.args,
               JSON.stringify(timeChanged),
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index a76307368..4cd3d1bfe 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -263,37 +263,65 @@ export class SystemForEmbassy implements System {
     const input = options.input
     switch (options.procedure) {
       case "/backup/create":
-        return this.createBackup(effects)
+        return this.createBackup(effects, options.timeout || null)
       case "/backup/restore":
-        return this.restoreBackup(effects)
+        return this.restoreBackup(effects, options.timeout || null)
       case "/config/get":
-        return this.getConfig(effects)
+        return this.getConfig(effects, options.timeout || null)
       case "/config/set":
-        return this.setConfig(effects, input)
+        return this.setConfig(effects, input, options.timeout || null)
       case "/properties":
-        return this.properties(effects)
+        return this.properties(effects, options.timeout || null)
       case "/actions/metadata":
         return todo()
       case "/init":
-        return this.init(effects, string.optional().unsafeCast(input))
+        return this.init(
+          effects,
+          string.optional().unsafeCast(input),
+          options.timeout || null,
+        )
       case "/uninit":
-        return this.uninit(effects, string.optional().unsafeCast(input))
+        return this.uninit(
+          effects,
+          string.optional().unsafeCast(input),
+          options.timeout || null,
+        )
       case "/main/start":
-        return this.mainStart(effects)
+        return this.mainStart(effects, options.timeout || null)
       case "/main/stop":
-        return this.mainStop(effects)
+        return this.mainStop(effects, options.timeout || null)
       default:
         const procedures = unNestPath(options.procedure)
         switch (true) {
           case procedures[1] === "actions" && procedures[3] === "get":
-            return this.action(effects, procedures[2], input)
+            return this.action(
+              effects,
+              procedures[2],
+              input,
+              options.timeout || null,
+            )
           case procedures[1] === "actions" && procedures[3] === "run":
-            return this.action(effects, procedures[2], input)
+            return this.action(
+              effects,
+              procedures[2],
+              input,
+              options.timeout || null,
+            )
           case procedures[1] === "dependencies" && procedures[3] === "query":
-            return this.dependenciesAutoconfig(effects, procedures[2], input)
+            return this.dependenciesAutoconfig(
+              effects,
+              procedures[2],
+              input,
+              options.timeout || null,
+            )
 
           case procedures[1] === "dependencies" && procedures[3] === "update":
-            return this.dependenciesAutoconfig(effects, procedures[2], input)
+            return this.dependenciesAutoconfig(
+              effects,
+              procedures[2],
+              input,
+              options.timeout || null,
+            )
         }
     }
     throw new Error(`Could not find the path for ${options.procedure}`)
@@ -301,8 +329,10 @@ export class SystemForEmbassy implements System {
   private async init(
     effects: HostSystemStartOs,
     previousVersion: Optional<string>,
+    timeoutMs: number | null,
   ): Promise<void> {
-    if (previousVersion) await this.migration(effects, previousVersion)
+    if (previousVersion)
+      await this.migration(effects, previousVersion, timeoutMs)
     await effects.setMainStatus({ status: "stopped" })
     await this.exportActions(effects)
   }
@@ -337,29 +367,36 @@ export class SystemForEmbassy implements System {
   private async uninit(
     effects: HostSystemStartOs,
     nextVersion: Optional<string>,
+    timeoutMs: number | null,
   ): Promise<void> {
     // TODO Do a migration down if the version exists
     await effects.setMainStatus({ status: "stopped" })
   }
-  private async mainStart(effects: HostSystemStartOs): Promise<void> {
+  private async mainStart(
+    effects: HostSystemStartOs,
+    timeoutMs: number | null,
+  ): Promise<void> {
     if (!!this.currentRunning) return
 
     this.currentRunning = new MainLoop(this, effects)
   }
   private async mainStop(
     effects: HostSystemStartOs,
-    options?: { timeout?: number },
+    timeoutMs: number | null,
   ): Promise<Duration> {
     const { currentRunning } = this
     delete this.currentRunning
     if (currentRunning) {
       await currentRunning.clean({
-        timeout: options?.timeout || this.manifest.main["sigterm-timeout"],
+        timeout: this.manifest.main["sigterm-timeout"],
       })
     }
     return duration(this.manifest.main["sigterm-timeout"], "s")
   }
-  private async createBackup(effects: HostSystemStartOs): Promise<void> {
+  private async createBackup(
+    effects: HostSystemStartOs,
+    timeoutMs: number | null,
+  ): Promise<void> {
     const backup = this.manifest.backup.create
     if (backup.type === "docker") {
       const container = await DockerProcedureContainer.of(
@@ -367,7 +404,7 @@ export class SystemForEmbassy implements System {
         backup,
         this.manifest.volumes,
       )
-      await container.exec([backup.entrypoint, ...backup.args])
+      await container.execFail([backup.entrypoint, ...backup.args], timeoutMs)
     } else {
       const moduleCode = await this.moduleCode
       await moduleCode.createBackup?.(
@@ -375,7 +412,10 @@ export class SystemForEmbassy implements System {
       )
     }
   }
-  private async restoreBackup(effects: HostSystemStartOs): Promise<void> {
+  private async restoreBackup(
+    effects: HostSystemStartOs,
+    timeoutMs: number | null,
+  ): Promise<void> {
     const restoreBackup = this.manifest.backup.restore
     if (restoreBackup.type === "docker") {
       const container = await DockerProcedureContainer.of(
@@ -383,7 +423,10 @@ export class SystemForEmbassy implements System {
         restoreBackup,
         this.manifest.volumes,
       )
-      await container.exec([restoreBackup.entrypoint, ...restoreBackup.args])
+      await container.execFail(
+        [restoreBackup.entrypoint, ...restoreBackup.args],
+        timeoutMs,
+      )
     } else {
       const moduleCode = await this.moduleCode
       await moduleCode.restoreBackup?.(
@@ -391,11 +434,15 @@ export class SystemForEmbassy implements System {
       )
     }
   }
-  private async getConfig(effects: HostSystemStartOs): Promise<T.ConfigRes> {
-    return this.getConfigUncleaned(effects).then(removePointers)
+  private async getConfig(
+    effects: HostSystemStartOs,
+    timeoutMs: number | null,
+  ): Promise<T.ConfigRes> {
+    return this.getConfigUncleaned(effects, timeoutMs).then(removePointers)
   }
   private async getConfigUncleaned(
     effects: HostSystemStartOs,
+    timeoutMs: number | null,
   ): Promise<T.ConfigRes> {
     const config = this.manifest.config?.get
     if (!config) return { spec: {} }
@@ -408,7 +455,10 @@ export class SystemForEmbassy implements System {
       // TODO: yaml
       return JSON.parse(
         (
-          await container.exec([config.entrypoint, ...config.args])
+          await container.execFail(
+            [config.entrypoint, ...config.args],
+            timeoutMs,
+          )
         ).stdout.toString(),
       )
     } else {
@@ -427,11 +477,12 @@ export class SystemForEmbassy implements System {
   private async setConfig(
     effects: HostSystemStartOs,
     newConfigWithoutPointers: unknown,
+    timeoutMs: number | null,
   ): Promise<void> {
     const newConfig = structuredClone(newConfigWithoutPointers)
     await updateConfig(
       effects,
-      await this.getConfigUncleaned(effects).then((x) => x.spec),
+      await this.getConfigUncleaned(effects, timeoutMs).then((x) => x.spec),
       newConfig,
     )
     const setConfigValue = this.manifest.config?.set
@@ -445,11 +496,14 @@ export class SystemForEmbassy implements System {
       const answer = matchSetResult.unsafeCast(
         JSON.parse(
           (
-            await container.exec([
-              setConfigValue.entrypoint,
-              ...setConfigValue.args,
-              JSON.stringify(newConfig),
-            ])
+            await container.execFail(
+              [
+                setConfigValue.entrypoint,
+                ...setConfigValue.args,
+                JSON.stringify(newConfig),
+              ],
+              timeoutMs,
+            )
           ).stdout.toString(),
         ),
       )
@@ -508,6 +562,7 @@ export class SystemForEmbassy implements System {
   private async migration(
     effects: HostSystemStartOs,
     fromVersion: string,
+    timeoutMs: number | null,
   ): Promise<T.MigrationRes> {
     const fromEmver = EmVer.from(fromVersion)
     const currentEmver = EmVer.from(this.manifest.version)
@@ -542,11 +597,14 @@ export class SystemForEmbassy implements System {
         )
         return JSON.parse(
           (
-            await container.exec([
-              procedure.entrypoint,
-              ...procedure.args,
-              JSON.stringify(fromVersion),
-            ])
+            await container.execFail(
+              [
+                procedure.entrypoint,
+                ...procedure.args,
+                JSON.stringify(fromVersion),
+              ],
+              timeoutMs,
+            )
           ).stdout.toString(),
         )
       } else if (procedure.type === "script") {
@@ -568,6 +626,7 @@ export class SystemForEmbassy implements System {
   }
   private async properties(
     effects: HostSystemStartOs,
+    timeoutMs: number | null,
   ): Promise<ReturnType<T.ExpectedExports.Properties>> {
     // TODO BLU-J set the properties ever so often
     const setConfigValue = this.manifest.properties
@@ -581,10 +640,10 @@ export class SystemForEmbassy implements System {
       const properties = matchProperties.unsafeCast(
         JSON.parse(
           (
-            await container.exec([
-              setConfigValue.entrypoint,
-              ...setConfigValue.args,
-            ])
+            await container.execFail(
+              [setConfigValue.entrypoint, ...setConfigValue.args],
+              timeoutMs,
+            )
           ).stdout.toString(),
         ),
       )
@@ -609,6 +668,7 @@ export class SystemForEmbassy implements System {
     effects: HostSystemStartOs,
     healthId: string,
     timeSinceStarted: unknown,
+    timeoutMs: number | null,
   ): Promise<void> {
     const healthProcedure = this.manifest["health-checks"][healthId]
     if (!healthProcedure) return
@@ -620,11 +680,14 @@ export class SystemForEmbassy implements System {
       )
       return JSON.parse(
         (
-          await container.exec([
-            healthProcedure.entrypoint,
-            ...healthProcedure.args,
-            JSON.stringify(timeSinceStarted),
-          ])
+          await container.execFail(
+            [
+              healthProcedure.entrypoint,
+              ...healthProcedure.args,
+              JSON.stringify(timeSinceStarted),
+            ],
+            timeoutMs,
+          )
         ).stdout.toString(),
       )
     } else if (healthProcedure.type === "script") {
@@ -645,6 +708,7 @@ export class SystemForEmbassy implements System {
     effects: HostSystemStartOs,
     actionId: string,
     formData: unknown,
+    timeoutMs: number | null,
   ): Promise<T.ActionResult> {
     const actionProcedure = this.manifest.actions?.[actionId]?.implementation
     if (!actionProcedure) return { message: "Action not found", value: null }
@@ -656,11 +720,14 @@ export class SystemForEmbassy implements System {
       )
       return JSON.parse(
         (
-          await container.exec([
-            actionProcedure.entrypoint,
-            ...actionProcedure.args,
-            JSON.stringify(formData),
-          ])
+          await container.execFail(
+            [
+              actionProcedure.entrypoint,
+              ...actionProcedure.args,
+              JSON.stringify(formData),
+            ],
+            timeoutMs,
+          )
         ).stdout.toString(),
       )
     } else {
@@ -681,6 +748,7 @@ export class SystemForEmbassy implements System {
     effects: HostSystemStartOs,
     id: string,
     oldConfig: unknown,
+    timeoutMs: number | null,
   ): Promise<object> {
     const actionProcedure = this.manifest.dependencies?.[id]?.config?.check
     if (!actionProcedure) return { message: "Action not found", value: null }
@@ -692,11 +760,14 @@ export class SystemForEmbassy implements System {
       )
       return JSON.parse(
         (
-          await container.exec([
-            actionProcedure.entrypoint,
-            ...actionProcedure.args,
-            JSON.stringify(oldConfig),
-          ])
+          await container.execFail(
+            [
+              actionProcedure.entrypoint,
+              ...actionProcedure.args,
+              JSON.stringify(oldConfig),
+            ],
+            timeoutMs,
+          )
         ).stdout.toString(),
       )
     } else if (actionProcedure.type === "script") {
@@ -722,7 +793,9 @@ export class SystemForEmbassy implements System {
     effects: HostSystemStartOs,
     id: string,
     oldConfig: unknown,
+    timeoutMs: number | null,
   ): Promise<void> {
+    // TODO: docker
     const moduleCode = await this.moduleCode
     const method = moduleCode.dependencies?.[id]?.autoConfigure
     if (!method)
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index b1411450c..b0d4f4ffd 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -539,6 +539,7 @@ fn chroot(
             cmd.env(k, v);
         }
     }
+    nix::unistd::setsid().with_kind(ErrorKind::Lxc)?; // TODO: error code
     std::os::unix::fs::chroot(path)?;
     if let Some(uid) = user.as_deref().and_then(|u| u.parse::<u32>().ok()) {
         cmd.uid(uid);
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 640ab8c4b..01fd7f2c7 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -15,13 +15,6 @@ import * as CP from "node:child_process"
 
 const cpExec = promisify(CP.exec)
 const cpExecFile = promisify(CP.execFile)
-async function psTree(pid: number, overlay: Overlay): Promise<number[]> {
-  const { stdout } = await cpExec(`pstree -p ${pid}`)
-  const regex: RegExp = /\((\d+)\)/g
-  return [...stdout.toString().matchAll(regex)].map(([_all, pid]) =>
-    parseInt(pid),
-  )
-}
 type Daemon<
   Manifest extends SDKManifest,
   Ids extends string,
@@ -81,19 +74,15 @@ export const runDaemon =
     const pid = childProcess.pid
     return {
       async wait() {
-        const pids = pid ? await psTree(pid, overlay) : []
         try {
           return await answer
         } finally {
-          for (const process of pids) {
-            cpExecFile("kill", [`-9`, String(process)]).catch((_) => {})
-          }
+          await cpExecFile("pkill", ["-9", "-s", String(pid)]).catch((_) => {})
         }
       },
       async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
-        const pids = pid ? await psTree(pid, overlay) : []
         try {
-          childProcess.kill(signal)
+          await cpExecFile("pkill", [`-${signal}`, "-s", String(pid)])
 
           if (timeout > NO_TIMEOUT) {
             const didTimeout = await Promise.race([
@@ -103,7 +92,9 @@ export const runDaemon =
               answer.then(() => false),
             ])
             if (didTimeout) {
-              childProcess.kill(SIGKILL)
+              await cpExecFile("pkill", [`-9`, "-s", String(pid)]).catch(
+                (_) => {},
+              )
             }
           } else {
             await answer
@@ -111,16 +102,6 @@ export const runDaemon =
         } finally {
           await overlay.destroy()
         }
-
-        try {
-          for (const process of pids) {
-            await cpExecFile("kill", [`-${signal}`, String(process)])
-          }
-        } finally {
-          for (const process of pids) {
-            cpExecFile("kill", [`-9`, String(process)]).catch((_) => {})
-          }
-        }
       },
     }
   }
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index f5ff0e0d1..50c596801 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -70,7 +70,13 @@ export class Overlay {
   async exec(
     command: string[],
     options?: CommandOptions,
-  ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
+    timeoutMs: number | null = 30000,
+  ): Promise<{
+    exitCode: number | null
+    exitSignal: NodeJS.Signals | null
+    stdout: string | Buffer
+    stderr: string | Buffer
+  }> {
     const imageMeta = await fs
       .readFile(`/media/startos/images/${this.imageId}.json`, {
         encoding: "utf8",
@@ -87,7 +93,7 @@ export class Overlay {
       workdir = options.cwd
       delete options.cwd
     }
-    return await execFile(
+    const child = cp.spawn(
       "start-cli",
       [
         "chroot",
@@ -97,8 +103,44 @@ export class Overlay {
         this.rootfs,
         ...command,
       ],
-      options,
+      options || {},
     )
+    const pid = child.pid
+    const stdout = { data: "" as string | Buffer }
+    const stderr = { data: "" as string | Buffer }
+    const appendData =
+      (appendTo: { data: string | Buffer }) =>
+      (chunk: string | Buffer | any) => {
+        if (typeof appendTo.data === "string" && typeof chunk === "string") {
+          appendTo.data += chunk
+        } else if (typeof chunk === "string" || chunk instanceof Buffer) {
+          appendTo.data = Buffer.concat([
+            Buffer.from(appendTo.data),
+            Buffer.from(chunk),
+          ])
+        } else {
+          console.error("received unexpected chunk", chunk)
+        }
+      }
+    return new Promise((resolve, reject) => {
+      child.on("error", reject)
+      if (timeoutMs !== null && pid) {
+        setTimeout(
+          () => execFile("pkill", ["-9", "-s", String(pid)]).catch((_) => {}),
+          timeoutMs,
+        )
+      }
+      child.stdout.on("data", appendData(stdout))
+      child.stderr.on("data", appendData(stderr))
+      child.on("exit", (code, signal) =>
+        resolve({
+          exitCode: code,
+          exitSignal: signal,
+          stdout: stdout.data,
+          stderr: stderr.data,
+        }),
+      )
+    })
   }
 
   async spawn(

From e08d93b2aaf0ae68fdbc2f6b40ee162568eded0a Mon Sep 17 00:00:00 2001
From: Dominion5254 <musashidisciple@proton.me>
Date: Thu, 25 Apr 2024 17:16:20 -0600
Subject: [PATCH 144/341] complete export_service_interface and
 list_service_interfaces fns (#2595)

* complete export_service_interface fn

* refactor export_service_interface fn

* complete list_service_interfaces fn

* call insert on model and remove unnecessary code

* Refactor export_service_interface

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* Refactor list_service_interfaces

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* get ServiceInterfaceId and HostId from params

* formatting

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
---
 .../src/service/service_effect_handler.rs     | 104 +++++++++++++-----
 1 file changed, 78 insertions(+), 26 deletions(-)

diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index b0d4f4ffd..c60f8b230 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -11,7 +11,9 @@ use clap::Parser;
 use emver::VersionRange;
 use imbl::OrdMap;
 use imbl_value::{json, InternedString};
-use models::{ActionId, DataUrl, HealthCheckId, HostId, ImageId, PackageId, VolumeId};
+use models::{
+    ActionId, DataUrl, HealthCheckId, HostId, Id, ImageId, PackageId, ServiceInterfaceId, VolumeId,
+};
 use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -26,7 +28,11 @@ use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::net::host::binding::BindOptions;
-use crate::net::host::HostKind;
+use crate::net::host::{self, HostKind};
+use crate::net::service_interface::{
+    AddressInfo, ExportedHostInfo, ExportedHostnameInfo, ServiceInterface, ServiceInterfaceType,
+    ServiceInterfaceWithHostInfo,
+};
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::http::{HttpReader, HttpSource};
 use crate::s9pk::rpc::SKIP_ENV;
@@ -191,29 +197,11 @@ struct GetServicePortForwardParams {
     host_id: HostId,
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct AddressInfo {
-    username: Option<String>,
-    host_id: String,
-    bind_options: BindOptions,
-    suffix: String,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-enum ServiceInterfaceType {
-    Ui,
-    P2p,
-    Api,
-}
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 struct ExportServiceInterfaceParams {
-    id: String,
+    id: ServiceInterfaceId,
     name: String,
     description: String,
     has_primary: bool,
@@ -221,6 +209,8 @@ struct ExportServiceInterfaceParams {
     masked: bool,
     address_info: AddressInfo,
     r#type: ServiceInterfaceType,
+    host_kind: HostKind,
+    hostnames: Vec<ExportedHostnameInfo>,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
@@ -336,9 +326,57 @@ async fn clear_network_interfaces(context: EffectContext, _: Empty) -> Result<Va
 }
 async fn export_service_interface(
     context: EffectContext,
-    data: ExportServiceInterfaceParams,
-) -> Result<Value, Error> {
-    todo!()
+    ExportServiceInterfaceParams {
+        id,
+        name,
+        description,
+        has_primary,
+        disabled,
+        masked,
+        address_info,
+        r#type,
+        host_kind,
+        hostnames,
+    }: ExportServiceInterfaceParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+    let host_id = address_info.host_id.clone();
+
+    let service_interface = ServiceInterface {
+        id: id.clone(),
+        name,
+        description,
+        has_primary,
+        disabled,
+        masked,
+        address_info,
+        interface_type: r#type,
+    };
+    let host_info = ExportedHostInfo {
+        id: host_id,
+        kind: host_kind,
+        hostnames,
+    };
+    let svc_interface_with_host_info = ServiceInterfaceWithHostInfo {
+        service_interface,
+        host_info,
+    };
+
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_service_interfaces_mut()
+                .insert(&id, &svc_interface_with_host_info)?;
+            Ok(())
+        })
+        .await?;
+    Ok(())
 }
 async fn get_primary_url(
     context: EffectContext,
@@ -349,9 +387,23 @@ async fn get_primary_url(
 async fn list_service_interfaces(
     context: EffectContext,
     data: ListServiceInterfacesParams,
-) -> Result<Value, Error> {
-    todo!()
+) -> Result<BTreeMap<ServiceInterfaceId, ServiceInterfaceWithHostInfo>, Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+
+    context
+        .ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_package_data()
+        .into_idx(&package_id)
+        .or_not_found(&package_id)?
+        .into_service_interfaces()
+        .de()
 }
+
 async fn remove_address(context: EffectContext, data: RemoveAddressParams) -> Result<Value, Error> {
     todo!()
 }

From 8a38666105b6daf782fea2648f456d24ffaa927f Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:51:33 -0600
Subject: [PATCH 145/341] Feature/sdk040dependencies (#2609)

* update registry upload to take id for new admin permissions (#2605)

* wip

* wip: Get the get dependencies

* wip check_dependencies

* wip: Get the build working to the vm

* wip: Add in the last of the things that where needed for the new sdk

* Add fix

* wip: implement the changes

* wip: Fix the naming

---------

Co-authored-by: Lucy <12953208+elvece@users.noreply.github.com>
---
 .../src/Adapters/HostSystemStartOs.ts         |  12 ++
 core/Cargo.lock                               |   4 +-
 core/models/src/version.rs                    |   4 +-
 core/startos/src/registry/admin.rs            |   3 +
 .../src/service/service_effect_handler.rs     | 150 ++++++++++++++++++
 core/startos/src/status/health_check.rs       |  44 +++++
 core/startos/src/status/mod.rs                |   9 ++
 sdk/lib/StartSdk.ts                           |  10 +-
 sdk/lib/config/configDependencies.ts          |  13 +-
 sdk/lib/config/setupConfig.ts                 |   8 +-
 .../DependencyConfig.ts                       |   0
 sdk/lib/dependencies/dependencies.ts          | 115 ++++++++++++++
 .../index.ts                                  |   0
 .../setupDependencyConfig.ts                  |   0
 sdk/lib/health/HealthCheck.ts                 |   4 +-
 sdk/lib/index.browser.ts                      |   2 +-
 sdk/lib/index.ts                              |   2 +-
 sdk/lib/interfaces/Host.ts                    |   9 +-
 sdk/lib/osBindings/CheckDependenciesParam.ts  |   4 +
 sdk/lib/osBindings/CheckDependenciesResult.ts |  11 ++
 sdk/lib/osBindings/index.ts                   |   2 +
 sdk/lib/test/startosTypeValidation.test.ts    |   4 +-
 sdk/lib/types.ts                              |  42 +++--
 sdk/lib/util/Overlay.ts                       |   4 +-
 24 files changed, 417 insertions(+), 39 deletions(-)
 rename sdk/lib/{dependencyConfig => dependencies}/DependencyConfig.ts (100%)
 create mode 100644 sdk/lib/dependencies/dependencies.ts
 rename sdk/lib/{dependencyConfig => dependencies}/index.ts (100%)
 rename sdk/lib/{dependencyConfig => dependencies}/setupDependencyConfig.ts (100%)
 create mode 100644 sdk/lib/osBindings/CheckDependenciesParam.ts
 create mode 100644 sdk/lib/osBindings/CheckDependenciesResult.ts

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index e7db00e07..b745799e1 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -256,6 +256,18 @@ export class HostSystemStartOs implements Effects {
       T.Effects["setDependencies"]
     >
   }
+  checkDependencies(
+    options: Parameters<T.Effects["checkDependencies"]>[0],
+  ): ReturnType<T.Effects["checkDependencies"]> {
+    return this.rpcRound("checkDependencies", options) as ReturnType<
+      T.Effects["checkDependencies"]
+    >
+  }
+  getDependencies(): ReturnType<T.Effects["getDependencies"]> {
+    return this.rpcRound("getDependencies", null) as ReturnType<
+      T.Effects["getDependencies"]
+    >
+  }
   setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
     return this.rpcRound("setHealth", options) as ReturnType<
       T.Effects["setHealth"]
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 455272344..a93a77e1e 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -3121,9 +3121,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
diff --git a/core/models/src/version.rs b/core/models/src/version.rs
index 1e4798ba1..012f362aa 100644
--- a/core/models/src/version.rs
+++ b/core/models/src/version.rs
@@ -3,8 +3,10 @@ use std::ops::Deref;
 use std::str::FromStr;
 
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use ts_rs::TS;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, TS)]
+#[ts(type = "string")]
 pub struct Version {
     version: emver::Version,
     string: String,
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 5fc538602..d416ebdbd 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -74,12 +74,14 @@ async fn do_upload(
     mut url: Url,
     user: &str,
     pass: &str,
+    pkg_id: &str,
     body: Body,
 ) -> Result<(), Error> {
     url.set_path("/admin/v0/upload");
     let req = httpc
         .post(url)
         .header(header::ACCEPT, "text/plain")
+        .query(&["id", pkg_id])
         .basic_auth(user, Some(pass))
         .body(body)
         .build()?;
@@ -198,6 +200,7 @@ pub async fn publish(
             registry.clone(),
             &user,
             &pass,
+            &pkg.id,
             Body::wrap_stream(file_stream),
         )
         .await?;
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index c60f8b230..0ad45aad1 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -11,6 +11,7 @@ use clap::Parser;
 use emver::VersionRange;
 use imbl::OrdMap;
 use imbl_value::{json, InternedString};
+use itertools::Itertools;
 use models::{
     ActionId, DataUrl, HealthCheckId, HostId, Id, ImageId, PackageId, ServiceInterfaceId, VolumeId,
 };
@@ -23,6 +24,7 @@ use url::Url;
 
 use crate::db::model::package::{
     ActionMetadata, CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind,
+    ManifestPreference,
 };
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
@@ -154,6 +156,18 @@ pub fn service_effect_handler() -> ParentHandler {
                 .no_display()
                 .with_remote_cli::<ContainerCliContext>(),
         )
+        .subcommand(
+            "getDependencies",
+            from_fn_async(get_dependencies)
+                .no_display()
+                .with_remote_cli::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "checkDependencies",
+            from_fn_async(check_dependencies)
+                .no_display()
+                .with_remote_cli::<ContainerCliContext>(),
+        )
         .subcommand("getSystemSmtp", from_fn_async(get_system_smtp).no_cli())
         .subcommand("getContainerIp", from_fn_async(get_container_ip).no_cli())
         .subcommand(
@@ -178,6 +192,7 @@ pub fn service_effect_handler() -> ParentHandler {
         .subcommand("removeAction", from_fn_async(remove_action).no_cli())
         .subcommand("reverseProxy", from_fn_async(reverse_proxy).no_cli())
         .subcommand("mount", from_fn_async(mount).no_cli())
+
     // TODO Callbacks
 }
 
@@ -1270,3 +1285,138 @@ async fn set_dependencies(
         })
         .await
 }
+
+async fn get_dependencies(ctx: EffectContext) -> Result<Vec<DependencyRequirement>, Error> {
+    let ctx = ctx.deref()?;
+    let id = &ctx.id;
+    let db = ctx.ctx.db.peek().await;
+    let data = db
+        .as_public()
+        .as_package_data()
+        .as_idx(id)
+        .or_not_found(id)?
+        .as_current_dependencies()
+        .de()?;
+
+    data.0
+        .into_iter()
+        .map(|(id, current_dependency_info)| {
+            let CurrentDependencyInfo {
+                registry_url,
+                version_spec,
+                kind,
+                ..
+            } = current_dependency_info;
+            Ok::<_, Error>(match kind {
+                CurrentDependencyKind::Exists => DependencyRequirement::Exists {
+                    id,
+                    registry_url,
+                    version_spec,
+                },
+                CurrentDependencyKind::Running { health_checks } => {
+                    DependencyRequirement::Running {
+                        id,
+                        health_checks,
+                        version_spec,
+                        registry_url,
+                    }
+                }
+            })
+        })
+        .try_collect()
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "camelCase")]
+#[ts(export)]
+struct CheckDependenciesParam {
+    package_ids: Option<Vec<PackageId>>,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+struct CheckDependenciesResult {
+    package_id: PackageId,
+    is_installed: bool,
+    is_running: bool,
+    health_checks: Vec<HealthCheckResult>,
+    #[ts(type = "string | null")]
+    version: Option<emver::Version>,
+}
+
+async fn check_dependencies(
+    ctx: EffectContext,
+    CheckDependenciesParam { package_ids }: CheckDependenciesParam,
+) -> Result<Vec<CheckDependenciesResult>, Error> {
+    let ctx = ctx.deref()?;
+    let db = ctx.ctx.db.peek().await;
+    let current_dependencies = db
+        .as_public()
+        .as_package_data()
+        .as_idx(&ctx.id)
+        .or_not_found(&ctx.id)?
+        .as_current_dependencies()
+        .de()?;
+    let package_ids: Vec<_> = package_ids
+        .unwrap_or_else(|| current_dependencies.0.keys().cloned().collect())
+        .into_iter()
+        .filter_map(|x| {
+            let info = current_dependencies.0.get(&x)?;
+            Some((x, info))
+        })
+        .collect();
+    let mut results = Vec::with_capacity(package_ids.len());
+
+    for (package_id, dependency_info) in package_ids {
+        let Some(package) = db.as_public().as_package_data().as_idx(&package_id) else {
+            results.push(CheckDependenciesResult {
+                package_id,
+                is_installed: false,
+                is_running: false,
+                health_checks: vec![],
+                version: None,
+            });
+            continue;
+        };
+        let installed_version = package
+            .as_state_info()
+            .as_manifest(ManifestPreference::New)
+            .as_version()
+            .de()?
+            .into_version();
+        let version = Some(installed_version.clone());
+        if !installed_version.satisfies(&dependency_info.version_spec) {
+            results.push(CheckDependenciesResult {
+                package_id,
+                is_installed: false,
+                is_running: false,
+                health_checks: vec![],
+                version,
+            });
+            continue;
+        }
+        let is_installed = true;
+        let status = package.as_status().as_main().de()?;
+        let is_running = if is_installed {
+            status.running()
+        } else {
+            false
+        };
+        let health_checks = status
+            .health()
+            .cloned()
+            .unwrap_or_default()
+            .into_iter()
+            .map(|(_, val)| val)
+            .collect();
+        results.push(CheckDependenciesResult {
+            package_id,
+            is_installed,
+            is_running,
+            health_checks,
+            version,
+        });
+    }
+    Ok(results)
+}
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index cd5616527..90b20f8c5 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -1,7 +1,12 @@
+use std::str::FromStr;
+
+use clap::builder::ValueParserFactory;
 pub use models::HealthCheckId;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+use crate::util::clap::FromStrParser;
+
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
 pub struct HealthCheckResult {
@@ -9,6 +14,45 @@ pub struct HealthCheckResult {
     #[serde(flatten)]
     pub kind: HealthCheckResultKind,
 }
+// healthCheckName:kind:message OR healthCheckName:kind
+impl FromStr for HealthCheckResult {
+    type Err = color_eyre::eyre::Report;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let from_parts = |name: &str, kind: &str, message: Option<&str>| {
+            let message = message.map(|x| x.to_string());
+            let kind = match kind {
+                "success" => HealthCheckResultKind::Success { message },
+                "disabled" => HealthCheckResultKind::Disabled { message },
+                "starting" => HealthCheckResultKind::Starting { message },
+                "loading" => HealthCheckResultKind::Loading {
+                    message: message.unwrap_or_default(),
+                },
+                "failure" => HealthCheckResultKind::Failure {
+                    message: message.unwrap_or_default(),
+                },
+                _ => return Err(color_eyre::eyre::eyre!("Invalid health check kind")),
+            };
+            Ok(Self {
+                name: name.to_string(),
+                kind,
+            })
+        };
+        let parts = s.split(':').collect::<Vec<_>>();
+        match &*parts {
+            [name, kind, message] => from_parts(name, kind, Some(message)),
+            [name, kind] => from_parts(name, kind, None),
+            _ => Err(color_eyre::eyre::eyre!(
+                "Could not match the shape of the result ${parts:?}"
+            )),
+        }
+    }
+}
+impl ValueParserFactory for HealthCheckResult {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 645c082f4..09d10fb2d 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -91,4 +91,13 @@ impl MainStatus {
         };
         MainStatus::BackingUp { started, health }
     }
+
+    pub fn health(&self) -> Option<&OrdMap<HealthCheckId, HealthCheckResult>> {
+        match self {
+            MainStatus::Running { health, .. } => Some(health),
+            MainStatus::BackingUp { health, .. } => Some(health),
+            MainStatus::Stopped | MainStatus::Stopping { .. } | MainStatus::Restarting => None,
+            MainStatus::Starting { .. } => None,
+        }
+    }
 }
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 43dc3ba5f..4d7514d88 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -24,7 +24,7 @@ import {
   ValidIfNoStupidEscape,
 } from "./types"
 import * as patterns from "./util/patterns"
-import { DependencyConfig, Update } from "./dependencyConfig/DependencyConfig"
+import { DependencyConfig, Update } from "./dependencies/DependencyConfig"
 import { BackupSet, Backups } from "./backup/Backups"
 import { smtpConfig } from "./config/configConstants"
 import { Daemons } from "./mainFn/Daemons"
@@ -35,7 +35,7 @@ import { List } from "./config/builder/list"
 import { Migration } from "./inits/migrations/Migration"
 import { Install, InstallFn } from "./inits/setupInstall"
 import { setupActions } from "./actions/setupActions"
-import { setupDependencyConfig } from "./dependencyConfig/setupDependencyConfig"
+import { setupDependencyConfig } from "./dependencies/setupDependencyConfig"
 import { SetupBackupsParams, setupBackups } from "./backup/setupBackups"
 import { setupInit } from "./inits/setupInit"
 import {
@@ -77,6 +77,7 @@ import * as T from "./types"
 import { Checker, EmVer } from "./emverLite/mod"
 import { ExposedStorePaths } from "./store/setupExposeStore"
 import { PathBuilder, extractJsonPath, pathBuilder } from "./store/PathBuilder"
+import { checkAllDependencies } from "./dependencies/dependencies"
 
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
@@ -124,6 +125,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
     }
 
     return {
+      checkAllDependencies,
       serviceInterface: {
         getOwn: <E extends Effects>(effects: E, id: ServiceInterfaceId) =>
           removeConstType<E>()(
@@ -284,7 +286,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         Type extends Record<string, any> = ExtractConfigType<ConfigType>,
       >(
         spec: ConfigType,
-        write: Save<Store, Type, Manifest>,
+        write: Save<Type>,
         read: Read<Manifest, Store, Type>,
       ) => setupConfig<Store, ConfigType, Manifest, Type>(spec, write, read),
       setupConfigRead: <
@@ -301,7 +303,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           | Config<Record<string, never>, never>,
       >(
         _configSpec: ConfigSpec,
-        fn: Save<Store, ConfigSpec, Manifest>,
+        fn: Save<ConfigSpec>,
       ) => fn,
       setupDependencyConfig: <Input extends Record<string, any>>(
         config: Config<Input, Store> | Config<Input, never>,
diff --git a/sdk/lib/config/configDependencies.ts b/sdk/lib/config/configDependencies.ts
index be0475b0f..2ab091e18 100644
--- a/sdk/lib/config/configDependencies.ts
+++ b/sdk/lib/config/configDependencies.ts
@@ -1,9 +1,12 @@
 import { SDKManifest } from "../manifest/ManifestTypes"
-import { Dependency } from "../types"
+import { Dependencies } from "../types"
 
 export type ConfigDependencies<T extends SDKManifest> = {
-  exists(id: keyof T["dependencies"]): Dependency
-  running(id: keyof T["dependencies"], healthChecks: string[]): Dependency
+  exists(id: keyof T["dependencies"]): Dependencies[number]
+  running(
+    id: keyof T["dependencies"],
+    healthChecks: string[],
+  ): Dependencies[number]
 }
 
 export const configDependenciesSet = <
@@ -13,7 +16,7 @@ export const configDependenciesSet = <
     return {
       id,
       kind: "exists",
-    } as Dependency
+    } as Dependencies[number]
   },
 
   running(id: keyof T["dependencies"], healthChecks: string[]) {
@@ -21,6 +24,6 @@ export const configDependenciesSet = <
       id,
       kind: "running",
       healthChecks,
-    } as Dependency
+    } as Dependencies[number]
   },
 })
diff --git a/sdk/lib/config/setupConfig.ts b/sdk/lib/config/setupConfig.ts
index a49e545a8..ba82dbad6 100644
--- a/sdk/lib/config/setupConfig.ts
+++ b/sdk/lib/config/setupConfig.ts
@@ -11,16 +11,13 @@ export type DependenciesReceipt = void & {
 }
 
 export type Save<
-  Store,
   A extends
     | Record<string, any>
     | Config<Record<string, any>, any>
     | Config<Record<string, never>, never>,
-  Manifest extends SDKManifest,
 > = (options: {
   effects: Effects
   input: ExtractConfigType<A> & Record<string, any>
-  dependencies: D.ConfigDependencies<Manifest>
 }) => Promise<{
   dependenciesReceipt: DependenciesReceipt
   interfacesReceipt: InterfacesReceipt
@@ -53,7 +50,7 @@ export function setupConfig<
   Type extends Record<string, any> = ExtractConfigType<ConfigType>,
 >(
   spec: Config<Type, Store> | Config<Type, never>,
-  write: Save<Store, Type, Manifest>,
+  write: Save<Type>,
   read: Read<Manifest, Store, Type>,
 ) {
   const validator = spec.validator
@@ -66,9 +63,8 @@ export function setupConfig<
       await effects.clearBindings()
       await effects.clearServiceInterfaces()
       const { restart } = await write({
-        input: JSON.parse(JSON.stringify(input)),
+        input: JSON.parse(JSON.stringify(input)) as any,
         effects,
-        dependencies: D.configDependenciesSet<Manifest>(),
       })
       if (restart) {
         await effects.restart()
diff --git a/sdk/lib/dependencyConfig/DependencyConfig.ts b/sdk/lib/dependencies/DependencyConfig.ts
similarity index 100%
rename from sdk/lib/dependencyConfig/DependencyConfig.ts
rename to sdk/lib/dependencies/DependencyConfig.ts
diff --git a/sdk/lib/dependencies/dependencies.ts b/sdk/lib/dependencies/dependencies.ts
new file mode 100644
index 000000000..c074d2ad7
--- /dev/null
+++ b/sdk/lib/dependencies/dependencies.ts
@@ -0,0 +1,115 @@
+import {
+  Effects,
+  PackageId,
+  DependencyRequirement,
+  SetHealth,
+  CheckDependencyResult,
+} from "../types"
+
+export type CheckAllDependencies = {
+  notRunning: () => Promise<CheckDependencyResult[]>
+
+  notInstalled: () => Promise<CheckDependencyResult[]>
+
+  healthErrors: () => Promise<{ [id: string]: SetHealth[] }>
+  throwIfNotRunning: () => Promise<void>
+  throwIfNotValid: () => Promise<undefined>
+  throwIfNotInstalled: () => Promise<void>
+  throwIfError: () => Promise<void>
+  isValid: () => Promise<boolean>
+}
+export function checkAllDependencies(effects: Effects): CheckAllDependencies {
+  const dependenciesPromise = effects.getDependencies()
+  const resultsPromise = dependenciesPromise.then((dependencies) =>
+    effects.checkDependencies({
+      packageIds: dependencies.map((dep) => dep.id),
+    }),
+  )
+
+  const dependenciesByIdPromise = dependenciesPromise.then((d) =>
+    d.reduce(
+      (acc, dep) => {
+        acc[dep.id] = dep
+        return acc
+      },
+      {} as { [id: PackageId]: DependencyRequirement },
+    ),
+  )
+
+  const healthErrors = async () => {
+    const results = await resultsPromise
+    const dependenciesById = await dependenciesByIdPromise
+    const answer: { [id: PackageId]: SetHealth[] } = {}
+    for (const result of results) {
+      const dependency = dependenciesById[result.packageId]
+      if (!dependency) continue
+      if (dependency.kind !== "running") continue
+
+      const healthChecks = result.healthChecks
+        .filter((x) => dependency.healthChecks.includes(x.id))
+        .filter((x) => !!x.message)
+      if (healthChecks.length === 0) continue
+      answer[result.packageId] = healthChecks
+    }
+    return answer
+  }
+  const notInstalled = () =>
+    resultsPromise.then((x) => x.filter((x) => !x.isInstalled))
+  const notRunning = async () => {
+    const results = await resultsPromise
+    const dependenciesById = await dependenciesByIdPromise
+    return results.filter((x) => {
+      const dependency = dependenciesById[x.packageId]
+      if (!dependency) return false
+      if (dependency.kind !== "running") return false
+      return !x.isRunning
+    })
+  }
+  const entries = <B>(x: { [k: string]: B }) => Object.entries(x)
+  const first = <A>(x: A[]): A | undefined => x[0]
+  const sinkVoid = <A>(x: A) => void 0
+  const throwIfError = () =>
+    healthErrors()
+      .then(entries)
+      .then(first)
+      .then((x) => {
+        if (!x) return
+        const [id, healthChecks] = x
+        if (healthChecks.length > 0)
+          throw `Package ${id} has the following errors: ${healthChecks.map((x) => x.message).join(", ")}`
+      })
+  const throwIfNotRunning = () =>
+    notRunning().then((results) => {
+      if (results[0])
+        throw new Error(`Package ${results[0].packageId} is not running`)
+    })
+
+  const throwIfNotInstalled = () =>
+    notInstalled().then((results) => {
+      if (results[0])
+        throw new Error(`Package ${results[0].packageId} is not installed`)
+    })
+  const throwIfNotValid = async () =>
+    Promise.all([
+      throwIfNotRunning(),
+      throwIfNotInstalled(),
+      throwIfError(),
+    ]).then(sinkVoid)
+
+  const isValid = () =>
+    throwIfNotValid().then(
+      () => true,
+      () => false,
+    )
+
+  return {
+    notRunning,
+    notInstalled,
+    healthErrors,
+    throwIfNotRunning,
+    throwIfNotValid,
+    throwIfNotInstalled,
+    throwIfError,
+    isValid,
+  }
+}
diff --git a/sdk/lib/dependencyConfig/index.ts b/sdk/lib/dependencies/index.ts
similarity index 100%
rename from sdk/lib/dependencyConfig/index.ts
rename to sdk/lib/dependencies/index.ts
diff --git a/sdk/lib/dependencyConfig/setupDependencyConfig.ts b/sdk/lib/dependencies/setupDependencyConfig.ts
similarity index 100%
rename from sdk/lib/dependencyConfig/setupDependencyConfig.ts
rename to sdk/lib/dependencies/setupDependencyConfig.ts
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index e1fbee97b..d7bbc2f44 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -7,6 +7,7 @@ import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
 import { once } from "../util/once"
 import { Overlay } from "../util/Overlay"
+import { object, unknown } from "ts-matches"
 
 export function healthCheck(o: {
   effects: Effects
@@ -66,8 +67,7 @@ export function healthCheck(o: {
   return {} as HealthReceipt
 }
 function asMessage(e: unknown) {
-  if (typeof e === "object" && e != null && "message" in e)
-    return String(e.message)
+  if (object({ message: unknown }).test(e)) return String(e.message)
   const value = String(e)
   if (value.length == null) return null
   return value
diff --git a/sdk/lib/index.browser.ts b/sdk/lib/index.browser.ts
index ff422a7f2..d7c10093f 100644
--- a/sdk/lib/index.browser.ts
+++ b/sdk/lib/index.browser.ts
@@ -4,7 +4,7 @@ export { setupExposeStore } from "./store/setupExposeStore"
 export * as config from "./config"
 export * as CB from "./config/builder"
 export * as CT from "./config/configTypes"
-export * as dependencyConfig from "./dependencyConfig"
+export * as dependencyConfig from "./dependencies"
 export * as manifest from "./manifest"
 export * as types from "./types"
 export * as T from "./types"
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index ef3d2ccb0..89d147ed1 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -12,7 +12,7 @@ export * as backup from "./backup"
 export * as config from "./config"
 export * as CB from "./config/builder"
 export * as CT from "./config/configTypes"
-export * as dependencyConfig from "./dependencyConfig"
+export * as dependencyConfig from "./dependencies"
 export * as daemons from "./mainFn/Daemons"
 export * as health from "./health"
 export * as healthFns from "./health/checkFns"
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index ab64cd7b0..2f1353cc1 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -161,7 +161,7 @@ export class Host {
     options: BindOptionsByKnownProtocol,
     protoInfo: KnownProtocols[keyof KnownProtocols],
   ): AddSslOptions | null {
-    if ("noAddSsl" in options && options.noAddSsl) return null
+    if (inObject("noAddSsl", options) && options.noAddSsl) return null
     if ("withSsl" in protoInfo && protoInfo.withSsl)
       return {
         // addXForwardedHeaders: null,
@@ -174,6 +174,13 @@ export class Host {
   }
 }
 
+function inObject<Key extends string>(
+  key: Key,
+  obj: any,
+): obj is { [K in Key]: unknown } {
+  return key in obj
+}
+
 export class StaticHost extends Host {
   constructor(options: { effects: Effects; id: string }) {
     super({ ...options, kind: "static" })
diff --git a/sdk/lib/osBindings/CheckDependenciesParam.ts b/sdk/lib/osBindings/CheckDependenciesParam.ts
new file mode 100644
index 000000000..54580a7ff
--- /dev/null
+++ b/sdk/lib/osBindings/CheckDependenciesParam.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId"
+
+export type CheckDependenciesParam = { packageIds: Array<PackageId> | null }
diff --git a/sdk/lib/osBindings/CheckDependenciesResult.ts b/sdk/lib/osBindings/CheckDependenciesResult.ts
new file mode 100644
index 000000000..c102c733a
--- /dev/null
+++ b/sdk/lib/osBindings/CheckDependenciesResult.ts
@@ -0,0 +1,11 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HealthCheckResult } from "./HealthCheckResult"
+import type { PackageId } from "./PackageId"
+
+export type CheckDependenciesResult = {
+  packageId: PackageId
+  isInstalled: boolean
+  isRunning: boolean
+  healthChecks: Array<HealthCheckResult>
+  version: string | null
+}
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 67129fba1..215f16b8b 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -12,6 +12,8 @@ export { BindInfo } from "./BindInfo"
 export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
 export { Callback } from "./Callback"
+export { CheckDependenciesParam } from "./CheckDependenciesParam"
+export { CheckDependenciesResult } from "./CheckDependenciesResult"
 export { ChrootParams } from "./ChrootParams"
 export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams"
 export { CurrentDependencies } from "./CurrentDependencies"
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index 0743db4fa..fd11ab5b6 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -1,5 +1,5 @@
 import { Effects } from "../types"
-import { ExecuteAction } from ".././osBindings"
+import { CheckDependenciesParam, ExecuteAction } from ".././osBindings"
 import { CreateOverlayedImageParams } from ".././osBindings"
 import { DestroyOverlayedImageParams } from ".././osBindings"
 import { BindParams } from ".././osBindings"
@@ -64,6 +64,8 @@ describe("startosTypeValidation ", () => {
       removeAction: {} as RemoveActionParams,
       reverseProxy: {} as ReverseProxyParams,
       mount: {} as MountParams,
+      checkDependencies: {} as CheckDependenciesParam,
+      getDependencies: undefined,
     })
     typeEquality<Parameters<Effects["executeAction"]>[0]>(
       testInput as ExecuteAction,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index d33bda79f..96e256766 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -1,6 +1,11 @@
 export * as configTypes from "./config/configTypes"
-import { HealthCheckId } from "./osBindings"
-import { HealthCheckResult } from "./osBindings"
+
+import {
+  DependencyRequirement,
+  SetHealth,
+  HealthCheckResult,
+} from "./osBindings"
+
 import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
 import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
@@ -11,6 +16,7 @@ import { ExposedStorePaths } from "./store/setupExposeStore"
 import { UrlString } from "./util/getServiceInterface"
 export * from "./osBindings"
 export { SDKManifest } from "./manifest/ManifestTypes"
+export { HealthReceipt } from "./health/HealthReceipt"
 
 export type ExportedAction = (options: {
   effects: Effects
@@ -471,16 +477,22 @@ export type Effects = {
     algorithm: "ecdsa" | "ed25519" | null
   }) => Promise<string>
 
-  setHealth(
-    o: HealthCheckResult & {
-      id: HealthCheckId
-    },
-  ): Promise<void>
+  setHealth(o: SetHealth): Promise<void>
 
   /** Set the dependencies of what the service needs, usually ran during the set config as a best practice */
   setDependencies(options: {
     dependencies: Dependencies
   }): Promise<DependenciesReceipt>
+
+  /** Get the list of the dependencies, both the dynamic set by the effect of setDependencies and the end result any required in the manifest  */
+  getDependencies(): Promise<DependencyRequirement[]>
+
+  /** When one wants to checks the status of several services during the checking of dependencies. The result will include things like the status
+   * of the service and what the current health checks are.
+   */
+  checkDependencies(options: {
+    packageIds: PackageId[] | null
+  }): Promise<CheckDependencyResult[]>
   /** Exists could be useful during the runtime to know if some service exists, option dep */
   exists(options: { packageId: PackageId }): Promise<boolean>
   /** Exists could be useful during the runtime to know if some service is running, option dep */
@@ -578,13 +590,17 @@ export type KnownError =
       errorCode: [number, string] | readonly [number, string]
     }
 
-export type Dependency = {
-  id: PackageId
-  versionSpec: string
-  registryUrl: string
-} & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] })
-export type Dependencies = Array<Dependency>
+export type Dependencies = Array<DependencyRequirement>
 
 export type DeepPartial<T> = T extends {}
   ? { [P in keyof T]?: DeepPartial<T[P]> }
   : T
+
+export type CheckDependencyResult = {
+  packageId: PackageId
+  isInstalled: boolean
+  isRunning: boolean
+  healthChecks: SetHealth[]
+  version: string | null
+}
+export type CheckResults = CheckDependencyResult[]
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 50c596801..fecb718d5 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -77,7 +77,7 @@ export class Overlay {
     stdout: string | Buffer
     stderr: string | Buffer
   }> {
-    const imageMeta = await fs
+    const imageMeta: any = await fs
       .readFile(`/media/startos/images/${this.imageId}.json`, {
         encoding: "utf8",
       })
@@ -147,7 +147,7 @@ export class Overlay {
     command: string[],
     options?: CommandOptions,
   ): Promise<cp.ChildProcessWithoutNullStreams> {
-    const imageMeta = await fs
+    const imageMeta: any = await fs
       .readFile(`/media/startos/images/${this.imageId}.json`, {
         encoding: "utf8",
       })

From 9b14d714ca70d709579cba16a2964b94b5338fe8 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 6 May 2024 10:20:44 -0600
Subject: [PATCH 146/341] Feature/new registry (#2612)

* wip

* overhaul boot process

* wip: new registry

* wip

* wip

* wip

* wip

* wip

* wip

* os registry complete

* ui fixes

* fixes

* fixes

* more fixes

* fix merkle archive
---
 .gitignore                                    |    1 -
 Makefile                                      |   14 +-
 build/README.md                               |  107 --
 build/RELEASE.md                              |   76 -
 build/dpkg-deps/depends                       |    1 -
 build/lib/scripts/chroot-and-upgrade          |  104 +-
 build/lib/scripts/embassy-initramfs-module    |   98 -
 build/lib/scripts/grub-probe-eos              |    4 +-
 build/lib/scripts/startos-initramfs-module    |  114 ++
 build/raspberrypi/make-image.sh               |    2 +-
 core/Cargo.lock                               | 1655 ++++++++---------
 core/build-prod.sh                            |    2 +-
 core/build-reg.sh                             |   42 +
 core/helpers/Cargo.toml                       |    2 +-
 core/install-cli.sh                           |    2 +-
 core/models/Cargo.toml                        |    5 +-
 core/models/src/errors.rs                     |   10 +-
 core/startos/Cargo.toml                       |   21 +-
 .../s9pk/merkle_archive/test.txt              |    7 +
 core/startos/src/action.rs                    |    1 -
 core/startos/src/auth.rs                      |   82 +-
 core/startos/src/backup/backup_bulk.rs        |    8 +-
 core/startos/src/backup/mod.rs                |   14 +-
 core/startos/src/backup/target/cifs.rs        |   10 +-
 core/startos/src/backup/target/mod.rs         |   12 +-
 core/startos/src/bins/mod.rs                  |    4 +
 core/startos/src/bins/registry.rs             |   86 +
 core/startos/src/bins/start_cli.rs            |    2 +-
 core/startos/src/bins/start_init.rs           |   12 +-
 core/startos/src/bins/startd.rs               |    6 +-
 core/startos/src/config/mod.rs                |   15 +-
 core/startos/src/context/cli.rs               |   62 +-
 core/startos/src/context/config.rs            |    6 +-
 core/startos/src/context/diagnostic.rs        |    9 +-
 core/startos/src/context/rpc.rs               |   89 +-
 core/startos/src/control.rs                   |    1 -
 core/startos/src/core/mod.rs                  |    1 -
 core/startos/src/core/rpc_continuations.rs    |   75 -
 core/startos/src/db/mod.rs                    |   87 +-
 core/startos/src/db/model/package.rs          |    8 +-
 core/startos/src/db/model/public.rs           |   14 +-
 core/startos/src/db/prelude.rs                |   67 +-
 core/startos/src/dependencies.rs              |    8 +-
 core/startos/src/developer/mod.rs             |    5 +
 core/startos/src/diagnostic.rs                |   77 +-
 core/startos/src/disk/fsck/ext4.rs            |    2 +-
 core/startos/src/disk/main.rs                 |    2 +-
 core/startos/src/disk/mod.rs                  |   19 +-
 .../src/disk/mount/filesystem/overlayfs.rs    |   50 +-
 core/startos/src/disk/mount/guard.rs          |    3 +-
 core/startos/src/error.rs                     |    2 +-
 core/startos/src/init.rs                      |    9 +-
 core/startos/src/install/mod.rs               |   81 +-
 core/startos/src/lib.rs                       |  168 +-
 core/startos/src/logs.rs                      |  321 ++--
 core/startos/src/lxc/mod.rs                   |  134 +-
 core/startos/src/middleware/auth.rs           |    6 +-
 core/startos/src/middleware/cors.rs           |    3 +-
 core/startos/src/middleware/db.rs             |    1 -
 core/startos/src/middleware/diagnostic.rs     |    1 -
 core/startos/src/net/dhcp.rs                  |    6 +-
 core/startos/src/net/mod.rs                   |    8 +-
 core/startos/src/net/net_controller.rs        |   28 +-
 core/startos/src/net/ssl.rs                   |    1 -
 core/startos/src/net/static_server.rs         |   29 +-
 core/startos/src/net/tor.rs                   |  107 +-
 core/startos/src/net/vhost.rs                 |    7 +-
 core/startos/src/net/wifi.rs                  |   58 +-
 core/startos/src/notifications.rs             |   12 +-
 core/startos/src/os_install/mod.rs            |  163 +-
 core/startos/src/progress.rs                  |   34 +-
 core/startos/src/properties.rs                |    1 -
 core/startos/src/registry/admin.rs            |  423 +++--
 core/startos/src/registry/asset.rs            |   36 +
 core/startos/src/registry/auth.rs             |  214 +++
 core/startos/src/registry/context.rs          |  242 +++
 core/startos/src/registry/db.rs               |  171 ++
 core/startos/src/registry/marketplace.rs      |  101 -
 core/startos/src/registry/mod.rs              |  126 +-
 core/startos/src/registry/os/asset/add.rs     |  341 ++++
 core/startos/src/registry/os/asset/get.rs     |  182 ++
 core/startos/src/registry/os/asset/mod.rs     |   14 +
 core/startos/src/registry/os/asset/sign.rs    |  188 ++
 core/startos/src/registry/os/index.rs         |   44 +
 core/startos/src/registry/os/mod.rs           |   22 +
 core/startos/src/registry/os/version/mod.rs   |  183 ++
 .../startos/src/registry/os/version/signer.rs |  133 ++
 core/startos/src/registry/signer.rs           |  477 +++++
 core/startos/src/rpc_continuations.rs         |  142 ++
 .../s9pk/merkle_archive/directory_contents.rs |   28 +-
 .../src/s9pk/merkle_archive/file_contents.rs  |   35 +-
 core/startos/src/s9pk/merkle_archive/hash.rs  |  116 +-
 core/startos/src/s9pk/merkle_archive/mod.rs   |   81 +-
 core/startos/src/s9pk/merkle_archive/sink.rs  |    3 +
 .../src/s9pk/merkle_archive/source/http.rs    |    8 +-
 .../src/s9pk/merkle_archive/source/mod.rs     |   96 +-
 .../source/multi_cursor_file.rs               |   11 +-
 core/startos/src/s9pk/merkle_archive/test.rs  |    4 +-
 core/startos/src/s9pk/rpc.rs                  |   15 +-
 core/startos/src/s9pk/v1/docker.rs            |    1 -
 core/startos/src/s9pk/v2/compat.rs            |    5 +-
 core/startos/src/s9pk/v2/mod.rs               |    4 +-
 core/startos/src/service/cli.rs               |    8 +-
 core/startos/src/service/mod.rs               |   26 +-
 .../src/service/persistent_container.rs       |    2 +-
 .../src/service/service_effect_handler.rs     |   49 +-
 core/startos/src/service/service_map.rs       |    5 +-
 core/startos/src/setup.rs                     |   22 +-
 core/startos/src/ssh.rs                       |   12 +-
 core/startos/src/system.rs                    |  186 +-
 core/startos/src/update/latest_information.rs |   23 -
 core/startos/src/update/mod.rs                |  482 +++--
 core/startos/src/upload.rs                    |  110 +-
 core/startos/src/util/io.rs                   |  265 ++-
 core/startos/src/util/mod.rs                  |    1 +
 core/startos/src/util/rpc.rs                  |   72 +
 core/startos/src/util/serde.rs                |  149 +-
 core/startos/src/version/mod.rs               |   18 +-
 core/startos/src/version/v0_3_5.rs            |    5 +-
 core/startos/src/version/v0_3_5_1.rs          |    5 +-
 core/startos/src/version/v0_3_5_2.rs          |    5 +-
 core/startos/src/version/v0_3_6.rs            |    5 +-
 core/startos/src/volume.rs                    |    2 +-
 debian/postinst                               |   13 +-
 foo                                           |    1 +
 image-recipe/build.sh                         |    2 +-
 .../usr/lib/startos/scripts/init_resize.sh    |    2 +-
 .../raspberrypi/squashfs/boot/cmdline.txt     |    2 +-
 patch-db                                      |    2 +-
 sdk/lib/osBindings/AcceptSigners.ts           |    7 +
 .../{UpdateProgress.ts => AddAdminParams.ts}  |    2 +-
 sdk/lib/osBindings/AddAssetParams.ts          |   12 +
 sdk/lib/osBindings/AddVersionParams.ts        |    8 +
 sdk/lib/osBindings/Base64.ts                  |    3 +
 sdk/lib/osBindings/Blake3Ed25519Signature.ts  |   10 +
 .../osBindings/Blake3Ed2551SignatureInfo.ts   |    9 +
 sdk/lib/osBindings/ContactInfo.ts             |    6 +
 sdk/lib/osBindings/FullIndex.ts               |    5 +
 sdk/lib/osBindings/GetOsAssetParams.ts        |    3 +
 sdk/lib/osBindings/GetVersionParams.ts        |    3 +
 .../osBindings/ListVersionSignersParams.ts    |    3 +
 sdk/lib/osBindings/OsIndex.ts                 |    4 +
 sdk/lib/osBindings/OsVersionInfo.ts           |   12 +
 sdk/lib/osBindings/PackageDataEntry.ts        |    2 +-
 sdk/lib/osBindings/Pem.ts                     |    3 +
 sdk/lib/osBindings/Progress.ts                |    2 +-
 sdk/lib/osBindings/RegistryAsset.ts           |    4 +
 sdk/lib/osBindings/RemoveVersionParams.ts     |    3 +
 sdk/lib/osBindings/ServerStatus.ts            |    4 +-
 sdk/lib/osBindings/SignAssetParams.ts         |    8 +
 sdk/lib/osBindings/Signature.ts               |    4 +
 sdk/lib/osBindings/SignatureInfo.ts           |    7 +
 sdk/lib/osBindings/SignerInfo.ts              |    9 +
 sdk/lib/osBindings/SignerKey.ts               |    4 +
 sdk/lib/osBindings/VersionSignerParams.ts     |    3 +
 sdk/lib/osBindings/index.ts                   |   24 +-
 .../src/app/app/footer/footer.component.html  |    6 +-
 .../app-show-progress.component.html          |    2 +-
 .../app-show/pipes/to-buttons.pipe.ts         |    2 +-
 .../marketplace-show-controls.component.ts    |    2 +-
 .../install-progress/install-progress.pipe.ts |    5 +-
 .../ui/src/app/services/api/api.fixures.ts    |    6 +-
 .../ui/src/app/services/api/api.types.ts      |    4 +-
 .../services/api/embassy-live-api.service.ts  |    4 +-
 .../services/api/embassy-mock-api.service.ts  |   18 +-
 .../ui/src/app/services/api/mock-patch.ts     |    4 +-
 .../src/app/services/marketplace.service.ts   |    2 +-
 167 files changed, 6265 insertions(+), 3158 deletions(-)
 delete mode 100644 build/README.md
 delete mode 100644 build/RELEASE.md
 delete mode 100755 build/lib/scripts/embassy-initramfs-module
 create mode 100755 build/lib/scripts/startos-initramfs-module
 create mode 100755 core/build-reg.sh
 create mode 100644 core/startos/proptest-regressions/s9pk/merkle_archive/test.txt
 create mode 100644 core/startos/src/bins/registry.rs
 delete mode 100644 core/startos/src/core/mod.rs
 delete mode 100644 core/startos/src/core/rpc_continuations.rs
 create mode 100644 core/startos/src/registry/asset.rs
 create mode 100644 core/startos/src/registry/auth.rs
 create mode 100644 core/startos/src/registry/context.rs
 create mode 100644 core/startos/src/registry/db.rs
 delete mode 100644 core/startos/src/registry/marketplace.rs
 create mode 100644 core/startos/src/registry/os/asset/add.rs
 create mode 100644 core/startos/src/registry/os/asset/get.rs
 create mode 100644 core/startos/src/registry/os/asset/mod.rs
 create mode 100644 core/startos/src/registry/os/asset/sign.rs
 create mode 100644 core/startos/src/registry/os/index.rs
 create mode 100644 core/startos/src/registry/os/mod.rs
 create mode 100644 core/startos/src/registry/os/version/mod.rs
 create mode 100644 core/startos/src/registry/os/version/signer.rs
 create mode 100644 core/startos/src/registry/signer.rs
 create mode 100644 core/startos/src/rpc_continuations.rs
 delete mode 100644 core/startos/src/update/latest_information.rs
 create mode 100644 core/startos/src/util/rpc.rs
 create mode 120000 foo
 create mode 100644 sdk/lib/osBindings/AcceptSigners.ts
 rename sdk/lib/osBindings/{UpdateProgress.ts => AddAdminParams.ts} (60%)
 create mode 100644 sdk/lib/osBindings/AddAssetParams.ts
 create mode 100644 sdk/lib/osBindings/AddVersionParams.ts
 create mode 100644 sdk/lib/osBindings/Base64.ts
 create mode 100644 sdk/lib/osBindings/Blake3Ed25519Signature.ts
 create mode 100644 sdk/lib/osBindings/Blake3Ed2551SignatureInfo.ts
 create mode 100644 sdk/lib/osBindings/ContactInfo.ts
 create mode 100644 sdk/lib/osBindings/FullIndex.ts
 create mode 100644 sdk/lib/osBindings/GetOsAssetParams.ts
 create mode 100644 sdk/lib/osBindings/GetVersionParams.ts
 create mode 100644 sdk/lib/osBindings/ListVersionSignersParams.ts
 create mode 100644 sdk/lib/osBindings/OsIndex.ts
 create mode 100644 sdk/lib/osBindings/OsVersionInfo.ts
 create mode 100644 sdk/lib/osBindings/Pem.ts
 create mode 100644 sdk/lib/osBindings/RegistryAsset.ts
 create mode 100644 sdk/lib/osBindings/RemoveVersionParams.ts
 create mode 100644 sdk/lib/osBindings/SignAssetParams.ts
 create mode 100644 sdk/lib/osBindings/Signature.ts
 create mode 100644 sdk/lib/osBindings/SignatureInfo.ts
 create mode 100644 sdk/lib/osBindings/SignerInfo.ts
 create mode 100644 sdk/lib/osBindings/SignerKey.ts
 create mode 100644 sdk/lib/osBindings/VersionSignerParams.ts

diff --git a/.gitignore b/.gitignore
index 1df3692ee..766d876e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ secrets.db
 /ENVIRONMENT.txt
 /GIT_HASH.txt
 /VERSION.txt
-/eos-*.tar.gz
 /*.deb
 /target
 /*.squashfs
diff --git a/Makefile b/Makefile
index 02328a1d8..dbe10d677 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,6 @@ install: $(ALL_TARGETS)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/startd)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-cli)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-sdk)
-	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/embassy-cli)
 	if [ "$(PLATFORM)" = "raspberrypi" ]; then $(call cp,cargo-deps/aarch64-unknown-linux-musl/release/pi-beep,$(DESTDIR)/usr/bin/pi-beep); fi
 	if /bin/bash -c '[[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]'; then $(call cp,cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console,$(DESTDIR)/usr/bin/tokio-console); fi
 	
@@ -164,15 +163,16 @@ wormhole-deb: results/$(BASENAME).deb
 
 update: $(ALL_TARGETS)
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
-	$(call ssh,"sudo rsync -a --delete --force --info=progress2 /media/embassy/embassyfs/current/ /media/embassy/next/")
-	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) DESTDIR=/media/embassy/next PLATFORM=$(PLATFORM)
-	$(call ssh,'sudo NO_SYNC=1 /media/embassy/next/usr/lib/startos/scripts/chroot-and-upgrade "apt-get install -y $(shell cat ./build/lib/depends)"')
+	$(call ssh,'sudo /usr/lib/startos/scripts/chroot-and-upgrade --create')
+	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) DESTDIR=/media/startos/next PLATFORM=$(PLATFORM)
+	$(call ssh,'sudo /media/startos/next/usr/lib/startos/scripts/chroot-and-upgrade --no-sync "apt-get install -y $(shell cat ./build/lib/depends)"')
 
 emulate-reflash: $(ALL_TARGETS)
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
-	$(call ssh,"sudo rsync -a --delete --force --info=progress2 /media/embassy/embassyfs/current/ /media/embassy/next/")
-	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) DESTDIR=/media/embassy/next PLATFORM=$(PLATFORM)
-	$(call ssh,"sudo touch /media/embassy/config/upgrade && sudo rm -f /media/embassy/config/disk.guid && sudo sync && sudo reboot")
+	$(call ssh,'sudo /usr/lib/startos/scripts/chroot-and-upgrade --create')
+	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) DESTDIR=/media/startos/next PLATFORM=$(PLATFORM)
+	$(call ssh,'sudo rm -f /media/startos/config/disk.guid')
+	$(call ssh,'sudo /media/startos/next/usr/lib/startos/scripts/chroot-and-upgrade --no-sync "apt-get install -y $(shell cat ./build/lib/depends)"')
 
 upload-ota: results/$(BASENAME).squashfs
 	TARGET=$(TARGET) KEY=$(KEY) ./upload-ota.sh
diff --git a/build/README.md b/build/README.md
deleted file mode 100644
index 3bab01866..000000000
--- a/build/README.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Building StartOS
-
-⚠️ The commands given assume a Debian or Ubuntu-based environment. _Building in
-a VM is NOT yet supported_ ⚠️
-
-## Prerequisites
-
-1. Install dependencies
-
-- Avahi
-  - `sudo apt install -y avahi-daemon`
-  - Installed by default on most Debian systems - https://avahi.org
-- Build Essentials (needed to run `make`)
-  - `sudo apt install -y build-essential`
-- Docker
-  - `curl -fsSL https://get.docker.com | sh`
-  - https://docs.docker.com/get-docker
-  - Add your user to the docker group: `sudo usermod -a -G docker $USER`
-  - Reload user environment `exec sudo su -l $USER`
-- Prepare Docker environment
-  - Setup buildx (https://docs.docker.com/buildx/working-with-buildx/)
-  - Create a builder: `docker buildx create --use`
-  - Add multi-arch build ability:
-    `docker run --rm --privileged linuxkit/binfmt:v0.8`
-- Node Version 12+
-  - snap: `sudo snap install node`
-  - [nvm](https://github.com/nvm-sh/nvm#installing-and-updating):
-    `nvm install --lts`
-  - https://nodejs.org/en/docs
-- NPM Version 7+
-  - apt: `sudo apt install -y npm`
-  - [nvm](https://github.com/nvm-sh/nvm#installing-and-updating):
-    `nvm install --lts`
-  - https://docs.npmjs.com/downloading-and-installing-node-js-and-npm
-- jq
-  - `sudo apt install -y jq`
-  - https://stedolan.github.io/jq
-- yq
-  - snap: `sudo snap install yq`
-  - binaries: https://github.com/mikefarah/yq/releases/
-  - https://mikefarah.gitbook.io/yq
-
-2. Clone the latest repo with required submodules
-   > :information_source: You chan check latest available version
-   > [here](https://github.com/Start9Labs/start-os/releases)
-   ```
-   git clone --recursive https://github.com/Start9Labs/start-os.git --branch latest
-   ```
-
-## Build Raspberry Pi Image
-
-```
-cd start-os
-make embassyos-raspi.img ARCH=aarch64
-```
-
-## Flash
-
-Flash the resulting `embassyos-raspi.img` to your SD Card
-
-We recommend [Balena Etcher](https://www.balena.io/etcher/)
-
-## Setup
-
-Visit http://start.local from any web browser - We recommend
-[Firefox](https://www.mozilla.org/firefox/browsers)
-
-Enter your product key. This is generated during the build process and can be
-found in `product_key.txt`, located in the root directory.
-
-## Troubleshooting
-
-1. I just flashed my SD card, fired up StartOS, bootup sounds and all, but my
-   browser is saying "Unable to connect" with start.local.
-
-- Try doing a hard refresh on your browser, or opening the url in a
-  private/incognito window. If you've ran an instance of StartOS before,
-  sometimes you can have a stale cache that will block you from navigating to
-  the page.
-
-2. Flashing the image isn't working with balenaEtcher. I'm getting
-   `Cannot read property 'message' of null` when I try.
-
-- The latest versions of Balena may not flash properly. This version here:
-  https://github.com/balena-io/etcher/releases/tag/v1.5.122 should work
-  properly.
-
-3. Startup isn't working properly and I'm curious as to why. How can I view logs
-   regarding startup for debugging?
-
-- Find the IP of your device
-- Run `nc <ip> 8080` and it will print the logs
-
-4. I need to ssh into my server to fix something, but I cannot get to the
-   console to add ssh keys normally.
-
-- During the Build step, instead of running just
-  `make embassyos-raspi.img ARCH=aarch64` run
-  `ENVIRONMENT=dev make embassyos-raspi.img ARCH=aarch64`. Flash like normal,
-  and insert into your server. Boot up StartOS, then on another computer on
-  the same network, ssh into the the server with the username `start9` password
-  `embassy`.
-
-4. I need to reset my password, how can I do that?
-
-- You will need to reflash your device. Select "Use Existing Drive" once you are
-  in setup, and it will prompt you to set a new password.
diff --git a/build/RELEASE.md b/build/RELEASE.md
deleted file mode 100644
index bdbecc00e..000000000
--- a/build/RELEASE.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Release Process
-
-## `embassyos_0.3.x-1_amd64.deb`
-
-- Description: debian package for x86_64 - intended to be installed on pureos
-- Destination: GitHub Release Tag
-- Requires: N/A
-- Build steps:
-  - Clone `https://github.com/Start9Labs/embassy-os-deb` at `master`
-  - Run `make TAG=master` from that folder
-- Artifact: `./embassyos_0.3.x-1_amd64.deb`
-
-## `eos-<version>-<git hash>-<date>_amd64.iso`
-
-- Description: live usb image for x86_64
-- Destination: GitHub Release Tag
-- Requires: `embassyos_0.3.x-1_amd64.deb`
-- Build steps:
-  - Clone `https://github.com/Start9Labs/eos-image-recipes` at `master`
-  - Copy `embassyos_0.3.x-1_amd64.deb` to
-    `overlays/vendor/root/embassyos_0.3.x-1_amd64.deb`
-  - Run `./run-local-build.sh byzantium` from that folder
-- Artifact: `./results/eos-<version>-<git hash>-<date>_amd64.iso`
-
-## `eos.x86_64.squashfs`
-
-- Description: compressed embassyOS x86_64 filesystem image
-- Destination: GitHub Release Tag, Registry @
-  `resources/eos/<version>/eos.x86_64.squashfs`
-- Requires: `eos-<version>-<git hash>-<date>_amd64.iso`
-- Build steps:
-  - From `https://github.com/Start9Labs/eos-image-recipes` at `master`
-  - `./extract-squashfs.sh results/eos-<version>-<git hash>-<date>_amd64.iso`
-- Artifact: `./results/eos.x86_64.squashfs`
-
-## `eos.raspberrypi.squashfs`
-
-- Description: compressed embassyOS raspberrypi filesystem image
-- Destination: GitHub Release Tag, Registry @
-  `resources/eos/<version>/eos.raspberrypi.squashfs`
-- Requires: N/A
-- Build steps:
-  - Clone `https://github.com/Start9Labs/embassy-os` at `master`
-  - `make embassyos-raspi.img`
-  - flash `embassyos-raspi.img` to raspberry pi
-  - boot raspberry pi with ethernet
-  - wait for chime
-    - you can watch logs using `nc <ip> 8080`
-  - unplug raspberry pi, put sd card back in build machine
-  - `./build/raspberry-pi/rip-image.sh`
-- Artifact: `./eos.raspberrypi.squashfs`
-
-## `lite-upgrade.img`
-
-- Description: update image for users coming from 0.3.2.1 and before
-- Destination: Registry @ `resources/eos/<version>/eos.img`
-- Requires: `eos.raspberrypi.squashfs`
-- Build steps:
-  - From `https://github.com/Start9Labs/embassy-os` at `master`
-  - `make lite-upgrade.img`
-- Artifact `./lite-upgrade.img`
-
-## `eos-<version>-<git hash>-<date>_raspberrypi.tar.gz`
-
-- Description: pre-initialized raspberrypi image
-- Destination: GitHub Release Tag (as tar.gz)
-- Requires: `eos.raspberrypi.squashfs`
-- Build steps:
-  - From `https://github.com/Start9Labs/embassy-os` at `master`
-  - `make eos_raspberrypi.img`
-  - `tar --format=posix -cS -f- eos-<version>-<git hash>-<date>_raspberrypi.img | gzip > eos-<version>-<git hash>-<date>_raspberrypi.tar.gz`
-- Artifact `./eos-<version>-<git hash>-<date>_raspberrypi.tar.gz`
-
-## `embassy-sdk`
-
-- Build and deploy to all registries
\ No newline at end of file
diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index 5209b5421..38d9b1a58 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -34,7 +34,6 @@ network-manager
 nvme-cli
 nyx
 openssh-server
-podman
 postgresql
 psmisc
 qemu-guest-agent
diff --git a/build/lib/scripts/chroot-and-upgrade b/build/lib/scripts/chroot-and-upgrade
index a7fafb8bc..ef3208806 100755
--- a/build/lib/scripts/chroot-and-upgrade
+++ b/build/lib/scripts/chroot-and-upgrade
@@ -5,44 +5,104 @@ if [ "$UID" -ne 0 ]; then
     exit 1
 fi
 
+POSITIONAL_ARGS=()
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --no-sync)
+      NO_SYNC=1
+      shift
+      ;;
+    --create)
+      ONLY_CREATE=1
+      shift
+      ;;
+    -*|--*)
+      echo "Unknown option $1"
+      exit 1
+      ;;
+    *)
+      POSITIONAL_ARGS+=("$1") # save positional arg
+      shift # past argument
+      ;;
+  esac
+done
+
+set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
+
 if [ -z "$NO_SYNC" ]; then
     echo 'Syncing...'
-    rsync -a --delete --force --info=progress2 /media/embassy/embassyfs/current/ /media/embassy/next
+    umount -R /media/startos/next 2> /dev/null
+    rm -rf /media/startos/upper /media/startos/next
+    mkdir /media/startos/upper
+    mount -t tmpfs tmpfs /media/startos/upper
+    mkdir -p /media/startos/upper/data /media/startos/upper/work /media/startos/next
+    mount -t overlay \
+		  -olowerdir=/media/startos/current,upperdir=/media/startos/upper/data,workdir=/media/startos/upper/work \
+		  overlay /media/startos/next
+fi
+
+if [ -n "$ONLY_CREATE" ]; then
+    exit 0
 fi
 
-mkdir -p /media/embassy/next/run
-mkdir -p /media/embassy/next/dev
-mkdir -p /media/embassy/next/sys
-mkdir -p /media/embassy/next/proc
-mkdir -p /media/embassy/next/boot
-mount --bind /run /media/embassy/next/run
-mount --bind /tmp /media/embassy/next/tmp
-mount --bind /dev /media/embassy/next/dev
-mount --bind /sys /media/embassy/next/sys
-mount --bind /proc /media/embassy/next/proc
-mount --bind /boot /media/embassy/next/boot
+mkdir -p /media/startos/next/run
+mkdir -p /media/startos/next/dev
+mkdir -p /media/startos/next/sys
+mkdir -p /media/startos/next/proc
+mkdir -p /media/startos/next/boot
+mount --bind /run /media/startos/next/run
+mount --bind /tmp /media/startos/next/tmp
+mount --bind /dev /media/startos/next/dev
+mount --bind /sys /media/startos/next/sys
+mount --bind /proc /media/startos/next/proc
+mount --bind /boot /media/startos/next/boot
 
 if [ -z "$*" ]; then
-    chroot /media/embassy/next
+    chroot /media/startos/next
     CHROOT_RES=$?
 else
-    chroot /media/embassy/next "$SHELL" -c "$*"
+    chroot /media/startos/next "$SHELL" -c "$*"
     CHROOT_RES=$?
 fi
 
-umount /media/embassy/next/run
-umount /media/embassy/next/tmp
-umount /media/embassy/next/dev
-umount /media/embassy/next/sys
-umount /media/embassy/next/proc
-umount /media/embassy/next/boot
+umount /media/startos/next/run
+umount /media/startos/next/tmp
+umount /media/startos/next/dev
+umount /media/startos/next/sys
+umount /media/startos/next/proc
+umount /media/startos/next/boot
 
 if [ "$CHROOT_RES" -eq 0 ]; then
+
+    if [ -h /media/startos/config/current.rootfs ] && [ -e /media/startos/config/current.rootfs ]; then
+        echo 'Pruning...'
+        current="$(readlink -f /media/startos/config/current.rootfs)"
+        needed=$(du -s --bytes /media/startos/next | awk '{print $1}')
+        while [[ "$(df -B1 --output=avail --sync /media/startos/images | tail -n1)" -lt "$needed" ]]; do
+            to_prune="$(ls -t1 /media/startos/images/*.rootfs | grep -v "$current" | tail -n1)"
+            if [ -e "$to_prune" ]; then
+                echo "  Pruning $to_prune"
+                rm -rf "$to_prune"
+            else
+                >&2 echo "Not enough space and nothing to prune!"
+                exit 1
+            fi
+        done
+        echo 'done.'
+    fi
+
     echo 'Upgrading...'
 
-    touch /media/embassy/config/upgrade
+    time mksquashfs /media/startos/next /media/startos/images/next.squashfs -b 4096 -comp gzip
+    hash=$(start-cli util b3sum /media/startos/images/next.squashfs | head -c 32)
+    mv /media/startos/images/next.squashfs /media/startos/images/${hash}.rootfs
+    ln -rsf /media/startos/images/${hash}.rootfs /media/startos/config/current.rootfs
 
     sync
 
     reboot
-fi
\ No newline at end of file
+fi
+
+umount -R /media/startos/next
+rm -rf /media/startos/upper /media/startos/next
\ No newline at end of file
diff --git a/build/lib/scripts/embassy-initramfs-module b/build/lib/scripts/embassy-initramfs-module
deleted file mode 100755
index 2a2f08a07..000000000
--- a/build/lib/scripts/embassy-initramfs-module
+++ /dev/null
@@ -1,98 +0,0 @@
-# Local filesystem mounting			-*- shell-script -*-
-
-#
-# This script overrides local_mount_root() in /scripts/local
-# and mounts root as a read-only filesystem with a temporary (rw)
-# overlay filesystem.
-#
-
-. /scripts/local
-
-local_mount_root()
-{
-	echo 'using embassy initramfs module'
-
-	local_top
-	local_device_setup "${ROOT}" "root file system"
-	ROOT="${DEV}"
-
-	# Get the root filesystem type if not set
-	if [ -z "${ROOTFSTYPE}" ]; then
-		FSTYPE=$(get_fstype "${ROOT}")
-	else
-		FSTYPE=${ROOTFSTYPE}
-	fi
-
-	local_premount
-
-	# CHANGES TO THE ORIGINAL FUNCTION BEGIN HERE
-	# N.B. this code still lacks error checking
-
-	modprobe ${FSTYPE}
-	checkfs ${ROOT} root "${FSTYPE}"
-
-	ROOTFLAGS="$(echo "${ROOTFLAGS}" | sed 's/subvol=\(next\|current\)//' | sed 's/^-o *$//')"
-
-	if [ "${FSTYPE}" != "unknown" ]; then
-		mount -t ${FSTYPE} ${ROOTFLAGS} ${ROOT} ${rootmnt}
-	else
-		mount ${ROOTFLAGS} ${ROOT} ${rootmnt}
-	fi
-
-	echo 'mounting embassyfs'
-
-	mkdir /embassyfs
-
-	mount --move ${rootmnt} /embassyfs
-
-	if ! [ -d /embassyfs/current ] && [ -d /embassyfs/prev ]; then
-		mv /embassyfs/prev /embassyfs/current
-	fi
-
-	if ! [ -d /embassyfs/current ]; then
-		mkdir /embassyfs/current
-		for FILE in $(ls /embassyfs); do
-			if [ "$FILE" != current ]; then
-				mv /embassyfs/$FILE /embassyfs/current/
-			fi
-		done
-	fi
-
-	mkdir -p /embassyfs/config
-
-	if [ -f /embassyfs/config/upgrade ] && [ -d /embassyfs/next ]; then
-		mv /embassyfs/current /embassyfs/prev
-		mv /embassyfs/next /embassyfs/current
-		rm /embassyfs/config/upgrade
-	fi
-
-	if ! [ -d /embassyfs/next ]; then
-		if [ -d /embassyfs/prev ]; then
-			mv /embassyfs/prev /embassyfs/next
-		else
-			mkdir /embassyfs/next
-		fi
-	fi
-
-	mkdir /lower /upper
-
-	mount -r --bind /embassyfs/current /lower
-
-	modprobe overlay || insmod "/lower/lib/modules/$(uname -r)/kernel/fs/overlayfs/overlay.ko"
-
-	# Mount a tmpfs for the overlay in /upper
-	mount -t tmpfs tmpfs /upper
-	mkdir /upper/data /upper/work
-
-	# Mount the final overlay-root in $rootmnt
-	mount -t overlay \
-	    -olowerdir=/lower,upperdir=/upper/data,workdir=/upper/work \
-	    overlay ${rootmnt}
-
-	mkdir -p ${rootmnt}/media/embassy/config
-	mount --bind /embassyfs/config ${rootmnt}/media/embassy/config
-	mkdir -p ${rootmnt}/media/embassy/next
-	mount --bind /embassyfs/next ${rootmnt}/media/embassy/next
-	mkdir -p ${rootmnt}/media/embassy/embassyfs
-	mount -r --bind /embassyfs ${rootmnt}/media/embassy/embassyfs
-}
\ No newline at end of file
diff --git a/build/lib/scripts/grub-probe-eos b/build/lib/scripts/grub-probe-eos
index ed37eefaa..aa2e1cacc 100755
--- a/build/lib/scripts/grub-probe-eos
+++ b/build/lib/scripts/grub-probe-eos
@@ -3,8 +3,8 @@
 ARGS=
 
 for ARG in $@; do
-  if [ -d "/media/embassy/embassyfs" ] && [ "$ARG" = "/" ]; then
-   ARG=/media/embassy/embassyfs
+  if [ -d "/media/startos/root" ] && [ "$ARG" = "/" ]; then
+   ARG=/media/startos/root
   fi
   ARGS="$ARGS $ARG"
 done
diff --git a/build/lib/scripts/startos-initramfs-module b/build/lib/scripts/startos-initramfs-module
new file mode 100755
index 000000000..e13c887e2
--- /dev/null
+++ b/build/lib/scripts/startos-initramfs-module
@@ -0,0 +1,114 @@
+# Local filesystem mounting			-*- shell-script -*-
+
+#
+# This script overrides local_mount_root() in /scripts/local
+# and mounts root as a read-only filesystem with a temporary (rw)
+# overlay filesystem.
+#
+
+. /scripts/local
+
+local_mount_root()
+{
+	echo 'using startos initramfs module'
+
+	local_top
+	local_device_setup "${ROOT}" "root file system"
+	ROOT="${DEV}"
+
+	# Get the root filesystem type if not set
+	if [ -z "${ROOTFSTYPE}" ]; then
+		FSTYPE=$(get_fstype "${ROOT}")
+	else
+		FSTYPE=${ROOTFSTYPE}
+	fi
+
+	local_premount
+
+	# CHANGES TO THE ORIGINAL FUNCTION BEGIN HERE
+	# N.B. this code still lacks error checking
+
+	modprobe ${FSTYPE}
+	checkfs ${ROOT} root "${FSTYPE}"
+
+	echo 'mounting startos'
+	mkdir /startos
+
+	ROOTFLAGS="$(echo "${ROOTFLAGS}" | sed 's/subvol=\(next\|current\)//' | sed 's/^-o *$//')"
+
+	if [ "${FSTYPE}" != "unknown" ]; then
+		mount -t ${FSTYPE} ${ROOTFLAGS} ${ROOT} /startos
+	else
+		mount ${ROOTFLAGS} ${ROOT} /startos
+	fi
+
+	if [ -d /startos/images ]; then
+		if [ -h /startos/config/current.rootfs ] && [ -e /startos/config/current.rootfs ]; then
+			image=$(readlink -f /startos/config/current.rootfs)
+		else
+			image="$(ls -t1 /startos/images/*.rootfs | head -n1)"
+		fi
+		if ! [ -f "$image" ]; then
+			>&2 echo "image $image not available to boot"
+			exit 1
+		fi
+	else
+		if [ -f /startos/config/upgrade ] && [ -d /startos/next ]; then
+			oldroot=/startos/next
+		elif [ -d /startos/current ]; then
+			oldroot=/startos/current
+		elif [ -d /startos/prev ]; then
+			oldroot=/startos/prev
+		else
+			>&2 echo no StartOS filesystem found
+			exit 1
+		fi
+
+		mkdir -p /startos/config/overlay/etc
+		mv $oldroot/etc/fstab /startos/config/overlay/etc/fstab
+		mv $oldroot/etc/machine-id /startos/config/overlay/etc/machine-id
+		mv $oldroot/etc/ssh /startos/config/overlay/etc/ssh
+
+		mkdir -p /startos/images
+		mv $oldroot /startos/images/legacy.rootfs
+
+		rm -rf /startos/next /startos/current /startos/prev
+
+		ln -rsf /startos/images/old.squashfs /startos/config/current.rootfs
+		image=$(readlink -f /startos/config/current.rootfs)
+	fi
+
+	mkdir /lower /upper
+
+	if [ -d "$image" ]; then
+		mount -r --bind $image /lower
+	elif [ -f "$image" ]; then
+		modprobe squashfs
+		mount -r $image /lower
+	else
+		>&2 echo "not a regular file or directory: $image"
+		exit 1
+	fi
+
+	modprobe overlay || insmod "/lower/lib/modules/$(uname -r)/kernel/fs/overlayfs/overlay.ko"
+
+	# Mount a tmpfs for the overlay in /upper
+	mount -t tmpfs tmpfs /upper
+	mkdir /upper/data /upper/work
+
+	mkdir -p /startos/config/overlay
+
+	# Mount the final overlay-root in $rootmnt
+	mount -t overlay \
+		-olowerdir=/startos/config/overlay:/lower,upperdir=/upper/data,workdir=/upper/work \
+		overlay ${rootmnt}
+
+	mkdir -p ${rootmnt}/media/startos/config
+	mount --bind /startos/config ${rootmnt}/media/startos/config
+	mkdir -p ${rootmnt}/media/startos/images
+	mount --bind /startos/images ${rootmnt}/media/startos/images
+	mkdir -p ${rootmnt}/media/startos/root
+	mount -r --bind /startos ${rootmnt}/media/startos/root
+	mkdir -p ${rootmnt}/media/startos/current
+	mount -r --bind /lower ${rootmnt}/media/startos/current
+}
\ No newline at end of file
diff --git a/build/raspberrypi/make-image.sh b/build/raspberrypi/make-image.sh
index 3b07cb3a8..ec5ea4297 100755
--- a/build/raspberrypi/make-image.sh
+++ b/build/raspberrypi/make-image.sh
@@ -63,7 +63,7 @@ sudo unsquashfs -f -d $TMPDIR startos.raspberrypi.squashfs
 REAL_GIT_HASH=$(cat $TMPDIR/usr/lib/startos/GIT_HASH.txt)
 REAL_VERSION=$(cat $TMPDIR/usr/lib/startos/VERSION.txt)
 REAL_ENVIRONMENT=$(cat $TMPDIR/usr/lib/startos/ENVIRONMENT.txt)
-sudo sed -i 's| boot=embassy| init=/usr/lib/startos/scripts/init_resize\.sh|' $TMPDIR/boot/cmdline.txt
+sudo sed -i 's| boot=startos| init=/usr/lib/startos/scripts/init_resize\.sh|' $TMPDIR/boot/cmdline.txt
 sudo cp ./build/raspberrypi/fstab $TMPDIR/etc/
 sudo cp ./build/raspberrypi/init_resize.sh $TMPDIR/usr/lib/startos/scripts/init_resize.sh
 sudo umount $TMPDIR/boot
diff --git a/core/Cargo.lock b/core/Cargo.lock
index a93a77e1e..920390d65 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -38,23 +38,23 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.14",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.11",
+ "getrandom 0.2.14",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -86,9 +86,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "android-tzdata"
@@ -107,47 +107,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -155,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
 
 [[package]]
 name = "arrayref"
@@ -193,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.4"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2"
+checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693"
 dependencies = [
  "brotli",
  "flate2",
@@ -224,18 +225,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -260,9 +261,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "axum"
@@ -275,9 +276,9 @@ dependencies = [
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
- "http 0.2.11",
- "http-body 0.4.5",
- "hyper 0.14.27",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
  "itoa",
  "matchit",
  "memchr",
@@ -300,13 +301,13 @@ checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
  "async-trait",
  "axum-core 0.4.3",
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.2.0",
+ "hyper 1.3.1",
  "hyper-util",
  "itoa",
  "matchit",
@@ -320,7 +321,7 @@ dependencies = [
  "serde_path_to_error",
  "serde_urlencoded",
  "sha1",
- "sync_wrapper 1.0.0",
+ "sync_wrapper 1.0.1",
  "tokio",
  "tokio-tungstenite",
  "tower",
@@ -338,8 +339,8 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 0.2.11",
- "http-body 0.4.5",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "mime",
  "rustversion",
  "tower-layer",
@@ -378,7 +379,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.2.0",
+ "hyper 1.3.1",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -388,9 +389,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
@@ -415,15 +416,15 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
 
 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
@@ -433,9 +434,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "basic-cookies"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38"
+checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7"
 dependencies = [
  "lalrpop",
  "lalrpop-util",
@@ -474,18 +475,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "bitmaps"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403"
+checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
 
 [[package]]
 name = "bitvec"
@@ -512,15 +513,17 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
 dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
  "cfg-if",
  "constant_time_eq",
+ "memmap2",
+ "rayon",
 ]
 
 [[package]]
@@ -543,9 +546,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "3.4.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
+checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -554,9 +557,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "2.5.1"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
+checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -564,9 +567,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byteorder"
@@ -576,18 +579,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.84"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
-dependencies = [
- "libc",
-]
+checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
 
 [[package]]
 name = "cfg-if"
@@ -597,9 +597,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -607,7 +607,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -616,14 +616,14 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
 dependencies = [
- "hashbrown 0.14.2",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "ciborium"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -632,18 +632,18 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
- "half",
+ "half 2.4.1",
 ]
 
 [[package]]
@@ -665,21 +665,6 @@ dependencies = [
  "inout",
 ]
 
-[[package]]
-name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_lex 0.2.4",
- "indexmap 1.9.3",
- "strsim 0.10.0",
- "termcolor",
- "textwrap",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.4"
@@ -698,8 +683,8 @@ checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.0",
- "strsim 0.11.0",
+ "clap_lex",
+ "strsim 0.11.1",
 ]
 
 [[package]]
@@ -711,16 +696,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -731,9 +707,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "color-eyre"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
 dependencies = [
  "backtrace",
  "color-spantrace",
@@ -746,9 +722,9 @@ dependencies = [
 
 [[package]]
 name = "color-spantrace"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
 dependencies = [
  "once_cell",
  "owo-colors",
@@ -758,30 +734,30 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "concurrent-queue"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -823,9 +799,9 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const_format"
@@ -881,9 +857,9 @@ dependencies = [
 
 [[package]]
 name = "cookie"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
 dependencies = [
  "time",
  "version_check",
@@ -908,9 +884,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -918,24 +894,24 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc"
-version = "3.0.1"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
 dependencies = [
  "crc-catalog",
 ]
@@ -948,49 +924,63 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
-name = "crossbeam-queue"
-version = "0.3.8"
+name = "crossbeam-deque"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
+ "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
-name = "crossbeam-utils"
-version = "0.8.16"
+name = "crossbeam-epoch"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
 [[package]]
 name = "crossterm"
 version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "crossterm_winapi",
  "futures-core",
  "libc",
@@ -1018,9 +1008,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28f85c3514d2a6e64160359b45a3918c3b4178bcbf4ae5d03ab2d02e521c479a"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -1089,9 +1079,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1112,14 +1102,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1127,40 +1117,40 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.4.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "der"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1169,9 +1159,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
  "serde",
@@ -1190,12 +1180,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -1252,30 +1236,30 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
 name = "drain"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f1a0abf3fcefad9b4dd0e414207a7408e12b68414a01e6bb19b897d5bd7632d"
+checksum = "9d105028bd2b5dfcb33318fd79a445001ead36004dd8dffef1bdd7e493d8bc1e"
 dependencies = [
  "tokio",
 ]
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ecdsa"
-version = "0.16.8"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
  "der",
  "digest 0.10.7",
  "elliptic-curve",
  "rfc6979",
- "signature 2.0.0",
+ "signature 2.2.0",
  "spki",
 ]
 
@@ -1296,7 +1280,7 @@ checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
  "serde",
- "signature 2.0.0",
+ "signature 2.2.0",
 ]
 
 [[package]]
@@ -1319,30 +1303,30 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "elliptic-curve"
-version = "0.13.6"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct",
  "crypto-bigint",
@@ -1392,9 +1376,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if",
 ]
@@ -1408,7 +1392,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1419,12 +1403,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1446,9 +1430,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "eyre"
-version = "0.6.8"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
 dependencies = [
  "indenter",
  "once_cell",
@@ -1456,9 +1440,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "fd-lock-rs"
@@ -1481,20 +1465,20 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.3"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd"
+checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e"
 
 [[package]]
 name = "filetime"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1511,9 +1495,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1553,9 +1537,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -1577,9 +1561,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1592,9 +1576,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1602,15 +1586,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1630,38 +1614,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1699,9 +1683,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1710,9 +1694,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "gpt"
@@ -1720,7 +1704,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8283e7331b8c93b9756e0cfdbcfb90312852f953c6faf9bf741e684cc3b6ad69"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "crc",
  "log",
  "uuid",
@@ -1739,17 +1723,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.11",
- "indexmap 1.9.3",
+ "http 0.2.12",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -1758,9 +1742,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4"
+checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
 dependencies = [
  "bytes",
  "fnv",
@@ -1768,7 +1752,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 1.1.0",
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -1777,9 +1761,19 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "half"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
 
 [[package]]
 name = "hashbrown"
@@ -1793,16 +1787,16 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
@@ -1812,16 +1806,16 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.14.2",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "hdrhistogram"
-version = "7.5.3"
+version = "7.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5b38e5c02b7c7be48c8dc5217c4f1634af2ea221caae2e024bffc7a7651c691"
+checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
  "byteorder",
  "flate2",
  "nom",
@@ -1852,7 +1846,7 @@ dependencies = [
  "lazy_async_pool",
  "models",
  "pin-project",
- "rpc-toolkit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rpc-toolkit",
  "serde",
  "serde_json",
  "tokio",
@@ -1871,9 +1865,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -1883,15 +1877,15 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hifijson"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85ef6b41c333e6dd2a4aaa59125a19b633cd17e7aaf372b2260809777bcdef4a"
+checksum = "18ae468bcb4dfecf0e4949ee28abbc99076b6a0077f51ddbc94dbfff8e6a870c"
 
 [[package]]
 name = "hkdf"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac",
 ]
@@ -1907,18 +1901,18 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.5"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1938,12 +1932,12 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http 0.2.11",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
@@ -1990,22 +1984,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.21",
- "http 0.2.11",
- "http-body 0.4.5",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -2014,14 +2008,14 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.3",
+ "h2 0.4.4",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
@@ -2030,6 +2024,7 @@ dependencies = [
  "pin-project-lite",
  "smallvec",
  "tokio",
+ "want",
 ]
 
 [[package]]
@@ -2038,7 +2033,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.27",
+ "hyper 0.14.28",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2046,15 +2041,18 @@ dependencies = [
 
 [[package]]
 name = "hyper-tls"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
- "hyper 0.14.27",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
 ]
 
 [[package]]
@@ -2064,20 +2062,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
  "bytes",
+ "futures-channel",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
- "hyper 1.2.0",
+ "hyper 1.3.1",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2",
  "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.58"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2131,6 +2133,16 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "imbl"
 version = "2.0.3"
@@ -2147,9 +2159,9 @@ dependencies = [
 
 [[package]]
 name = "imbl-sized-chunks"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076"
+checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63"
 dependencies = [
  "bitmaps",
 ]
@@ -2157,7 +2169,7 @@ dependencies = [
 [[package]]
 name = "imbl-value"
 version = "0.1.0"
-source = "git+https://github.com/Start9Labs/imbl-value.git#929395141c3a882ac366c12ac9402d0ebaa2201b"
+source = "git+https://github.com/Start9Labs/imbl-value.git#48dc39a762a3b4f9300d3b9f850cbd394e777ae0"
 dependencies = [
  "imbl",
  "serde",
@@ -2204,20 +2216,20 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.5",
  "serde",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
  "console",
  "instant",
@@ -2276,15 +2288,21 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi 0.3.3",
- "rustix",
- "windows-sys 0.48.0",
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "isocountry"
 version = "0.3.2"
@@ -2333,9 +2351,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jaq-core"
@@ -2343,7 +2361,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb52eeac20f256459e909bd4a03bb8c4fab6a1fdbb8ed52d00f644152df48ece"
 dependencies = [
- "ahash 0.7.7",
+ "ahash 0.7.8",
  "dyn-clone",
  "hifijson",
  "indexmap 1.9.3",
@@ -2377,12 +2395,12 @@ dependencies = [
 
 [[package]]
 name = "josekit"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5754487a088f527b1407df470db8e654e4064dccbbe1fe850e0773721e9962b7"
+checksum = "0953340cf63354cec4a385f1fbcb3f409a5823778cae236078892f6030ed4565"
 dependencies = [
  "anyhow",
- "base64 0.21.5",
+ "base64 0.21.7",
  "flate2",
  "once_cell",
  "openssl",
@@ -2395,9 +2413,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2435,42 +2453,42 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
 
 [[package]]
 name = "lalrpop"
-version = "0.19.12"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b"
+checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
 dependencies = [
  "ascii-canvas",
  "bit-set",
- "diff",
  "ena",
- "is-terminal",
- "itertools 0.10.5",
+ "itertools 0.11.0",
  "lalrpop-util",
  "petgraph",
+ "pico-args",
  "regex",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.8.3",
  "string_cache",
  "term",
  "tiny-keccak",
  "unicode-xid",
+ "walkdir",
 ]
 
 [[package]]
 name = "lalrpop-util"
-version = "0.19.12"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed"
+checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex",
+ "regex-automata 0.4.6",
 ]
 
 [[package]]
@@ -2500,9 +2518,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "libm"
@@ -2512,20 +2530,19 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libredox"
-version = "0.0.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "libc",
- "redox_syscall 0.4.1",
 ]
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2534,15 +2551,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2550,9 +2567,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "matchers"
@@ -2594,9 +2611,18 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "memmap2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "memoffset"
@@ -2630,18 +2656,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
@@ -2653,7 +2679,8 @@ dependencies = [
 name = "models"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.5",
+ "axum 0.7.5",
+ "base64 0.21.7",
  "color-eyre",
  "ed25519-dalek 2.1.1",
  "emver",
@@ -2666,7 +2693,7 @@ dependencies = [
  "rand 0.8.5",
  "regex",
  "reqwest",
- "rpc-toolkit 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rpc-toolkit",
  "serde",
  "serde_json",
  "sqlx",
@@ -2699,9 +2726,9 @@ dependencies = [
 
 [[package]]
 name = "new_debug_unreachable"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "new_mime_guess"
@@ -2744,7 +2771,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "cfg-if",
  "libc",
 ]
@@ -2771,9 +2798,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -2813,28 +2840,33 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2855,9 +2887,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
@@ -2869,29 +2901,29 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -2902,9 +2934,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -2917,17 +2949,17 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssh-keys"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75a0ec2d1b302412fb503224289325fcc0e44600176864804c7211b055cfd58"
+checksum = "e9939566c441a6542e87c74310d4ac713c17679c76f296932e732f405bc25e3d"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "byteorder",
  "md-5",
  "sha2 0.10.8",
@@ -2936,11 +2968,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.59"
+version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2957,7 +2989,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -2968,18 +3000,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.1.6+3.1.4"
+version = "300.2.3+3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
+checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.95"
+version = "0.9.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
 dependencies = [
  "cc",
  "libc",
@@ -2988,12 +3020,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3030,11 +3056,25 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
+[[package]]
+name = "p521"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2"
+dependencies = [
+ "base16ct",
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "rand_core 0.6.4",
+ "sha2 0.10.8",
+]
+
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3042,15 +3082,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.1",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -3074,7 +3114,7 @@ dependencies = [
  "nix 0.26.4",
  "patch-db-macro",
  "serde",
- "serde_cbor 0.11.1",
+ "serde_cbor",
  "thiserror",
  "tokio",
  "tracing",
@@ -3132,7 +3172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
@@ -3144,31 +3184,37 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -3199,21 +3245,21 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "platforms"
-version = "3.2.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0"
+checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
 
 [[package]]
 name = "portable-atomic"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
 
 [[package]]
 name = "powerfmt"
@@ -3249,27 +3295,27 @@ dependencies = [
 
 [[package]]
 name = "primeorder"
-version = "0.13.3"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
 dependencies = [
  "elliptic-curve",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.20.7",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
  "unicode-ident",
 ]
@@ -3282,13 +3328,13 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3307,9 +3353,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.1"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
+checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -3317,22 +3363,22 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.12.1"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
+checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.1"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
+checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
 dependencies = [
  "prost",
 ]
@@ -3361,9 +3407,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -3433,7 +3479,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.14",
 ]
 
 [[package]]
@@ -3463,6 +3509,26 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.1.57"
@@ -3480,43 +3546,43 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.14",
  "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -3530,13 +3596,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -3547,28 +3613,30 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.22.1",
  "bytes",
  "cookie 0.17.0",
  "cookie_store",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.21",
- "http 0.2.11",
- "http-body 0.4.5",
- "hyper 0.14.27",
+ "h2 0.4.4",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.3.1",
  "hyper-tls",
+ "hyper-util",
  "ipnet",
  "js-sys",
  "log",
@@ -3577,7 +3645,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pemfile 2.1.2",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -3598,9 +3666,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest_cookie_store"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba529055ea150e42e4eb9c11dcd380a41025ad4d594b0cb4904ef28b037e1061"
+checksum = "93ea5c6f30c19d766efe8d823c88f9abd1c56516648a0d4264ab2dc04cc19472"
 dependencies = [
  "bytes",
  "cookie_store",
@@ -3620,16 +3688,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.5"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
- "getrandom 0.2.11",
+ "cfg-if",
+ "getrandom 0.2.14",
  "libc",
  "spin 0.9.8",
  "untrusted",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3646,34 +3715,12 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c48252a30abb9426a3239fa8dfd2c8dd2647bb24db0b6145db2df04ae53fe647"
-dependencies = [
- "clap 3.2.25",
- "futures",
- "hyper 0.14.27",
- "lazy_static",
- "openssl",
- "reqwest",
- "rpc-toolkit-macro 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde",
- "serde_cbor 0.11.2",
- "serde_json",
- "thiserror",
- "tokio",
- "url",
- "yajrc",
-]
-
-[[package]]
-name = "rpc-toolkit"
-version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#c89e0abdb15dd3bed9adb5339cf0b61a96f32b50"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#f5566840bb9af0743612fede4034f5a390cd1eee"
 dependencies = [
  "async-stream",
  "async-trait",
  "axum 0.7.5",
- "clap 4.5.4",
+ "clap",
  "futures",
  "http 1.1.0",
  "http-body-util",
@@ -3684,7 +3731,6 @@ dependencies = [
  "openssl",
  "pin-project",
  "reqwest",
- "rpc-toolkit-macro 0.2.2 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
  "serde",
  "serde_json",
  "thiserror",
@@ -3694,54 +3740,11 @@ dependencies = [
  "yajrc",
 ]
 
-[[package]]
-name = "rpc-toolkit-macro"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e4b9cb00baf2d61bcd35e98d67dcb760382a3b4540df7e63b38d053c8a7b8b"
-dependencies = [
- "proc-macro2",
- "rpc-toolkit-macro-internals 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "rpc-toolkit-macro"
-version = "0.2.2"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#c89e0abdb15dd3bed9adb5339cf0b61a96f32b50"
-dependencies = [
- "proc-macro2",
- "rpc-toolkit-macro-internals 0.2.2 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "rpc-toolkit-macro-internals"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e2ce21b936feaecdab9c9a8e75b9dca64374ccc11951a58045ad6559b75f42"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "rpc-toolkit-macro-internals"
-version = "0.2.2"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits#c89e0abdb15dd3bed9adb5339cf0b61a96f32b50"
-dependencies = [
- "itertools 0.12.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "rsa"
-version = "0.9.3"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -3752,7 +3755,7 @@ dependencies = [
  "pkcs8",
  "rand_core 0.6.4",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
  "spki",
  "subtle",
  "zeroize",
@@ -3770,11 +3773,11 @@ dependencies = [
 
 [[package]]
 name = "rust-argon2"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e71971821b3ae0e769e4a4328dbcb517607b434db7697e9aba17203ec14e46a"
+checksum = "9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "blake2b_simd",
  "constant_time_eq",
 ]
@@ -3796,22 +3799,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.8"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "ring",
  "rustls-webpki 0.101.7",
@@ -3820,14 +3823,14 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.3"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c"
+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.2",
+ "rustls-webpki 0.102.3",
  "subtle",
  "zeroize",
 ]
@@ -3838,14 +3841,24 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+dependencies = [
+ "base64 0.22.1",
+ "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
+checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
 
 [[package]]
 name = "rustls-webpki"
@@ -3859,9 +3872,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.2"
+version = "0.102.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
+checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3870,9 +3883,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
 
 [[package]]
 name = "rusty-fork"
@@ -3904,17 +3917,26 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3949,9 +3971,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -3962,9 +3984,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3972,18 +3994,18 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.200"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
 dependencies = [
  "serde_derive",
 ]
@@ -4001,38 +4023,28 @@ dependencies = [
 name = "serde_cbor"
 version = "0.11.1"
 dependencies = [
- "half",
- "serde",
-]
-
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
+ "half 1.8.3",
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.200"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
@@ -4040,9 +4052,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
 dependencies = [
  "itoa",
  "serde",
@@ -4050,9 +4062,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
  "serde",
 ]
@@ -4071,16 +4083,17 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.4.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "serde",
+ "serde_derive",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -4088,23 +4101,23 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.4.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.27"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
@@ -4194,9 +4207,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -4209,9 +4222,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
 [[package]]
 name = "signature"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
  "rand_core 0.6.4",
@@ -4251,22 +4264,12 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.5"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4286,9 +4289,9 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
  "der",
@@ -4296,20 +4299,20 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85"
+checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
 dependencies = [
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "nom",
  "unicode_categories",
 ]
 
 [[package]]
 name = "sqlx"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33"
+checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -4320,18 +4323,17 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
+checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
  "atoi",
  "byteorder",
  "bytes",
  "chrono",
  "crc",
  "crossbeam-queue",
- "dotenvy",
  "either",
  "event-listener",
  "futures-channel",
@@ -4341,14 +4343,14 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "log",
  "memchr",
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls 0.21.8",
- "rustls-pemfile",
+ "rustls 0.21.12",
+ "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -4364,9 +4366,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec"
+checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4377,9 +4379,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc"
+checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8"
 dependencies = [
  "dotenvy",
  "either",
@@ -4403,13 +4405,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
+checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418"
 dependencies = [
  "atoi",
- "base64 0.21.5",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.5.0",
  "byteorder",
  "bytes",
  "chrono",
@@ -4446,13 +4448,13 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
+checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e"
 dependencies = [
  "atoi",
- "base64 0.21.5",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.5.0",
  "byteorder",
  "chrono",
  "crc",
@@ -4474,7 +4476,6 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "sha1",
  "sha2 0.10.8",
  "smallvec",
  "sqlx-core",
@@ -4486,9 +4487,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f"
+checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa"
 dependencies = [
  "atoi",
  "chrono",
@@ -4505,6 +4506,7 @@ dependencies = [
  "sqlx-core",
  "tracing",
  "url",
+ "urlencoding",
 ]
 
 [[package]]
@@ -4530,7 +4532,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.39",
+ "syn 2.0.60",
  "unicode-width",
 ]
 
@@ -4557,18 +4559,19 @@ dependencies = [
 
 [[package]]
 name = "ssh-key"
-version = "0.6.2"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2180b3bc4955efd5661a97658d3cf4c8107e0d132f619195afe9486c13cca313"
+checksum = "ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc"
 dependencies = [
  "ed25519-dalek 2.1.1",
  "p256",
  "p384",
+ "p521",
  "rand_core 0.6.4",
  "rsa",
  "sec1",
  "sha2 0.10.8",
- "signature 2.0.0",
+ "signature 2.2.0",
  "ssh-cipher",
  "ssh-encoding",
  "subtle",
@@ -4586,18 +4589,18 @@ dependencies = [
  "axum 0.7.5",
  "axum-server",
  "base32",
- "base64 0.21.5",
+ "base64 0.21.7",
  "base64ct",
  "basic-cookies",
  "blake3",
  "bytes",
  "chrono",
  "ciborium",
- "clap 4.5.4",
+ "clap",
  "color-eyre",
  "console",
  "console-subscriber",
- "cookie 0.18.0",
+ "cookie 0.18.1",
  "cookie_store",
  "current_platform",
  "digest 0.10.7",
@@ -4613,11 +4616,12 @@ dependencies = [
  "hex",
  "hmac",
  "http 1.1.0",
+ "http-body-util",
  "id-pool",
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "indicatif",
  "integer-encoding",
  "ipnet",
@@ -4656,12 +4660,13 @@ dependencies = [
  "reqwest",
  "reqwest_cookie_store",
  "rpassword",
- "rpc-toolkit 0.2.3 (git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/traits)",
+ "rpc-toolkit",
  "rust-argon2",
  "rustyline-async",
  "semver",
  "serde",
  "serde_json",
+ "serde_urlencoded",
  "serde_with",
  "serde_yaml",
  "sha2 0.10.8",
@@ -4680,7 +4685,7 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite",
  "tokio-util",
- "toml 0.8.8",
+ "toml 0.8.12",
  "torut",
  "tracing",
  "tracing-error",
@@ -4741,9 +4746,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "strsim"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "subtle"
@@ -4764,9 +4769,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4781,9 +4786,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
 [[package]]
 name = "system-configuration"
@@ -4820,20 +4825,19 @@ checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
 dependencies = [
  "filetime",
  "libc",
- "xattr 1.0.1",
+ "xattr 1.3.1",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall 0.4.1",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4856,17 +4860,11 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thingbuf"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4706f1bfb859af03f099ada2de3cea3e515843c2d3e93b7893f16d94a37f9415"
+checksum = "662b54ef6f7b4e71f683dadc787bbb2d8e8ef2f91b682ebed3164a5a7abca905"
 dependencies = [
  "parking_lot",
  "pin-project",
@@ -4874,22 +4872,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -4905,9 +4903,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4915,12 +4913,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
+ "num-conv",
  "powerfmt",
  "serde",
  "time-core",
@@ -4935,10 +4934,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -4980,7 +4980,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2",
  "tokio-macros",
  "tracing",
  "windows-sys 0.48.0",
@@ -5004,7 +5004,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5023,7 +5023,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls 0.22.3",
+ "rustls 0.22.4",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5042,9 +5042,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5108,14 +5108,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.8"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.21.0",
+ "toml_edit 0.22.12",
 ]
 
 [[package]]
@@ -5133,35 +5133,35 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.7"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.21.0"
+version = "0.22.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.7",
 ]
 
 [[package]]
@@ -5173,12 +5173,12 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum 0.6.20",
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
- "h2 0.3.21",
- "http 0.2.11",
- "http-body 0.4.5",
- "hyper 0.14.27",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -5197,7 +5197,7 @@ version = "0.2.1"
 source = "git+https://github.com/Start9Labs/torut.git?branch=update/dependencies#cc7a1425a01214465e106975e6690794d8551bdb"
 dependencies = [
  "base32",
- "base64 0.21.5",
+ "base64 0.21.7",
  "derive_more",
  "ed25519-dalek 1.0.1",
  "hex",
@@ -5262,7 +5262,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5337,9 +5337,9 @@ dependencies = [
 
 [[package]]
 name = "treediff"
-version = "4.0.2"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303"
+checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5"
 dependencies = [
  "serde_json",
 ]
@@ -5393,14 +5393,14 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "ts-rs"
 version = "8.1.0"
-source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-as#d5f359d803158e06f47977a6f785878a82221d4f"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-as#7ae88ade90b5e724159048a663a0bdb04bed27f7"
 dependencies = [
  "thiserror",
  "ts-rs-macros",
@@ -5409,12 +5409,12 @@ dependencies = [
 [[package]]
 name = "ts-rs-macros"
 version = "8.1.0"
-source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-as#d5f359d803158e06f47977a6f785878a82221d4f"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-as#7ae88ade90b5e724159048a663a0bdb04bed27f7"
 dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
  "termcolor",
 ]
 
@@ -5440,22 +5440,22 @@ dependencies = [
 
 [[package]]
 name = "typed-builder"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444d8748011b93cb168770e8092458cb0f8854f931ff82fdf6ddfbd72a9c933e"
+checksum = "77739c880e00693faef3d65ea3aad725f196da38b22fdc7ea6ded6e1ce4d3add"
 dependencies = [
  "typed-builder-macro",
 ]
 
 [[package]]
 name = "typed-builder-macro"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352"
+checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5481,9 +5481,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
@@ -5493,24 +5493,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
 
 [[package]]
 name = "unicode-xid"
@@ -5526,9 +5526,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "untrusted"
@@ -5538,12 +5538,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 0.4.0",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
@@ -5568,11 +5568,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.5.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.14",
 ]
 
 [[package]]
@@ -5602,6 +5602,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -5623,11 +5633,17 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5635,24 +5651,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.38"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5662,9 +5678,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5672,22 +5688,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-streams"
@@ -5704,9 +5720,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5714,18 +5730,19 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.24.0"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
-dependencies = [
- "rustls-webpki 0.101.7",
-]
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "whoami"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+dependencies = [
+ "redox_syscall 0.4.1",
+ "wasite",
+]
 
 [[package]]
 name = "winapi"
@@ -5745,11 +5762,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5760,20 +5777,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -5791,22 +5799,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -5826,25 +5819,20 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -5853,15 +5841,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5871,15 +5853,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5889,15 +5865,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+name = "windows_i686_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5907,15 +5883,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5925,15 +5895,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5943,42 +5907,45 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.4"
+name = "winnow"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "winnow"
-version = "0.5.19"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
+checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winreg"
-version = "0.50.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
  "cfg-if",
  "windows-sys 0.48.0",
@@ -6004,11 +5971,13 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.0.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
+ "linux-raw-sys",
+ "rustix",
 ]
 
 [[package]]
@@ -6029,7 +5998,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f355ab62ebe30b758c1f4ab096a306722c4b7dbfb9d8c07d18c70d71a945588"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
  "hashbrown 0.13.2",
  "lazy_static",
  "serde",
@@ -6037,29 +6006,29 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.25"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.25"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 dependencies = [
  "zeroize_derive",
 ]
@@ -6072,5 +6041,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.60",
 ]
diff --git a/core/build-prod.sh b/core/build-prod.sh
index 8b6184942..f81ddb093 100755
--- a/core/build-prod.sh
+++ b/core/build-prod.sh
@@ -28,7 +28,7 @@ set +e
 fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "(cd core && cargo build --release $(if [ -n "$FEATURES" ]; then echo "--features $FEATURES"; fi) --locked --bin startbox --target=$ARCH-unknown-linux-musl)"; then 
+if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl)"; then 
 	fail=true
 fi
 if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl)"; then 
diff --git a/core/build-reg.sh b/core/build-reg.sh
new file mode 100755
index 000000000..9928b6714
--- /dev/null
+++ b/core/build-reg.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -e
+shopt -s expand_aliases
+
+if [ -z "$ARCH" ]; then
+	ARCH=$(uname -m)
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+cd ..
+FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
+RUSTFLAGS=""
+
+if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
+	RUSTFLAGS="--cfg tokio_unstable"
+fi
+
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+
+set +e
+fail=
+echo "FEATURES=\"$FEATURES\""
+echo "RUSTFLAGS=\"$RUSTFLAGS\""
+if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl)"; then 
+	fail=true
+fi
+set -e
+cd core
+
+sudo chown -R $USER target
+sudo chown -R $USER ~/.cargo
+
+if [ -n "$fail" ]; then
+	exit 1
+fi
diff --git a/core/helpers/Cargo.toml b/core/helpers/Cargo.toml
index 228f3ef54..9af19018e 100644
--- a/core/helpers/Cargo.toml
+++ b/core/helpers/Cargo.toml
@@ -11,7 +11,7 @@ futures = "0.3.28"
 lazy_async_pool = "0.3.3"
 models = { path = "../models" }
 pin-project = "1.1.3"
-rpc-toolkit = "0.2.3"
+rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "refactor/no-dyn-ctx" }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 tokio = { version = "1", features = ["full"] }
diff --git a/core/install-cli.sh b/core/install-cli.sh
index f4fe712ee..620600d92 100755
--- a/core/install-cli.sh
+++ b/core/install-cli.sh
@@ -12,4 +12,4 @@ if [ -z "$PLATFORM" ]; then
   export PLATFORM=$(uname -m)
 fi
 
-cargo install --path=./startos --no-default-features --features=cli,docker --bin start-cli --locked
+cargo install --path=./startos --no-default-features --features=cli,docker,registry --bin start-cli --locked
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index 3611f45d5..76c66b4f2 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+axum = "0.7.5"
 base64 = "0.21.4"
 color-eyre = "0.6.2"
 ed25519-dalek = { version = "2.0.0", features = ["serde"] }
@@ -22,8 +23,8 @@ patch-db = { version = "*", path = "../../patch-db/patch-db", features = [
 ] }
 rand = "0.8.5"
 regex = "1.10.2"
-reqwest = "0.11.22"
-rpc-toolkit = "0.2.2"
+reqwest = "0.12"
+rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "refactor/no-dyn-ctx" }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 sqlx = { version = "0.7.2", features = [
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index 2362b6dba..340fd15ca 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -1,9 +1,10 @@
 use std::fmt::{Debug, Display};
 
+use axum::http::uri::InvalidUri;
+use axum::http::StatusCode;
 use color_eyre::eyre::eyre;
 use num_enum::TryFromPrimitive;
 use patch_db::Revision;
-use rpc_toolkit::hyper::http::uri::InvalidUri;
 use rpc_toolkit::reqwest;
 use rpc_toolkit::yajrc::{
     RpcError, INVALID_PARAMS_ERROR, INVALID_REQUEST_ERROR, METHOD_NOT_FOUND_ERROR, PARSE_ERROR,
@@ -207,6 +208,13 @@ impl Error {
         }
     }
 }
+impl axum::response::IntoResponse for Error {
+    fn into_response(self) -> axum::response::Response {
+        let mut res = axum::Json(RpcError::from(self)).into_response();
+        *res.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
+        res
+    }
+}
 impl From<std::convert::Infallible> for Error {
     fn from(value: std::convert::Infallible) -> Self {
         match value {}
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index cded2ab41..d88b51f96 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -22,7 +22,7 @@ name = "startos"
 path = "src/lib.rs"
 
 [[bin]]
-name = "containerbox"
+name = "startbox"
 path = "src/main.rs"
 
 [[bin]]
@@ -30,14 +30,19 @@ name = "start-cli"
 path = "src/main.rs"
 
 [[bin]]
-name = "startbox"
+name = "containerbox"
+path = "src/main.rs"
+
+[[bin]]
+name = "registrybox"
 path = "src/main.rs"
 
 [features]
 cli = []
 container-runtime = []
 daemon = []
-default = ["cli", "daemon"]
+registry = []
+default = ["cli", "daemon", "registry"]
 dev = []
 unstable = ["console-subscriber", "tokio/tracing"]
 docker = []
@@ -58,7 +63,7 @@ base32 = "0.4.0"
 base64 = "0.21.4"
 base64ct = "1.6.0"
 basic-cookies = "0.1.4"
-blake3 = "1.5.0"
+blake3 = { version = "1.5.0", features = ["mmap", "rayon"] }
 bytes = "1"
 chrono = { version = "0.4.31", features = ["serde"] }
 clap = "4.4.12"
@@ -89,6 +94,7 @@ helpers = { path = "../helpers" }
 hex = "0.4.3"
 hmac = "0.12.1"
 http = "1.0.0"
+http-body-util = "0.1"
 id-pool = { version = "0.2.2", default-features = false, features = [
   "serde",
   "u16",
@@ -134,10 +140,10 @@ proptest = "1.3.1"
 proptest-derive = "0.4.0"
 rand = { version = "0.8.5", features = ["std"] }
 regex = "1.10.2"
-reqwest = { version = "0.11.23", features = ["stream", "json", "socks"] }
-reqwest_cookie_store = "0.6.0"
+reqwest = { version = "0.12.4", features = ["stream", "json", "socks"] }
+reqwest_cookie_store = "0.7.0"
 rpassword = "7.2.0"
-rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "refactor/traits" }
+rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "refactor/no-dyn-ctx" }
 rust-argon2 = "2.0.0"
 rustyline-async = "0.4.1"
 semver = { version = "1.0.20", features = ["serde"] }
@@ -145,6 +151,7 @@ serde = { version = "1.0", features = ["derive", "rc"] }
 serde_cbor = { package = "ciborium", version = "0.2.1" }
 serde_json = "1.0"
 serde_toml = { package = "toml", version = "0.8.2" }
+serde_urlencoded = "0.7"
 serde_with = { version = "3.4.0", features = ["macros", "json"] }
 serde_yaml = "0.9.25"
 sha2 = "0.10.2"
diff --git a/core/startos/proptest-regressions/s9pk/merkle_archive/test.txt b/core/startos/proptest-regressions/s9pk/merkle_archive/test.txt
new file mode 100644
index 000000000..116de6aba
--- /dev/null
+++ b/core/startos/proptest-regressions/s9pk/merkle_archive/test.txt
@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc dbb4790c31f9e400ed29a9ba2dbd61e3c55ce8a3fbae16601ca3512e803020ed # shrinks to files = []
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index 396e7ed50..87ff317f8 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -1,7 +1,6 @@
 use clap::Parser;
 pub use models::ActionId;
 use models::PackageId;
-use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 915ac10bd..4838f2ea2 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -4,9 +4,10 @@ use chrono::{DateTime, Utc};
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use imbl_value::{json, InternedString};
+use itertools::Itertools;
 use josekit::jwk::Jwk;
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{command, from_fn_async, AnyContext, CallRemote, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
@@ -82,7 +83,7 @@ impl std::str::FromStr for PasswordType {
         })
     }
 }
-pub fn auth() -> ParentHandler {
+pub fn auth<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "login",
@@ -94,11 +95,11 @@ pub fn auth() -> ParentHandler {
         .subcommand(
             "logout",
             from_fn_async(logout)
-                .with_metadata("get-session", Value::Bool(true))
-                .with_remote_cli::<CliContext>()
-                .no_display(),
+                .with_metadata("get_session", Value::Bool(true))
+                .no_display()
+                .with_call_remote::<CliContext>(),
         )
-        .subcommand("session", session())
+        .subcommand("session", session::<C>())
         .subcommand(
             "reset-password",
             from_fn_async(reset_password_impl).no_cli(),
@@ -112,7 +113,7 @@ pub fn auth() -> ParentHandler {
             from_fn_async(get_pubkey)
                 .with_metadata("authenticated", Value::Bool(false))
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
@@ -128,26 +129,20 @@ fn gen_pwd() {
         .unwrap()
     )
 }
-#[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct CliLoginParams {
-    password: Option<PasswordType>,
-}
 
 #[instrument(skip_all)]
 async fn cli_login(
-    ctx: CliContext,
-    CliLoginParams { password }: CliLoginParams,
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        ..
+    }: HandlerArgs<CliContext>,
 ) -> Result<(), RpcError> {
-    let password = if let Some(password) = password {
-        password.decrypt(&ctx)?
-    } else {
-        rpassword::prompt_password("Password: ")?
-    };
+    let password = rpassword::prompt_password("Password: ")?;
 
-    ctx.call_remote(
-        "auth.login",
+    ctx.call_remote::<RpcContext>(
+        &parent_method.into_iter().chain(method).join("."),
         json!({
             "password": password,
             "metadata": {
@@ -185,7 +180,8 @@ pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<(
 #[command(rename_all = "kebab-case")]
 pub struct LoginParams {
     password: Option<PasswordType>,
-    #[serde(default)]
+    #[ts(skip)]
+    #[serde(rename = "__auth_userAgent")] // from Auth middleware
     user_agent: Option<String>,
     #[serde(default)]
     #[ts(type = "any")]
@@ -226,7 +222,8 @@ pub async fn login_impl(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogoutParams {
-    #[ts(type = "string")]
+    #[ts(skip)]
+    #[serde(rename = "__auth_session")] // from Auth middleware
     session: InternedString,
 }
 
@@ -262,23 +259,23 @@ pub struct SessionList {
     sessions: Sessions,
 }
 
-pub fn session() -> ParentHandler {
+pub fn session<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "list",
             from_fn_async(list)
-                .with_metadata("get-session", Value::Bool(true))
+                .with_metadata("get_session", Value::Bool(true))
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                .with_custom_display_fn(|handle, result| {
                     Ok(display_sessions(handle.params, result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "kill",
             from_fn_async(kill)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
@@ -374,21 +371,16 @@ pub struct ResetPasswordParams {
 
 #[instrument(skip_all)]
 async fn cli_reset_password(
-    ctx: CliContext,
-    ResetPasswordParams {
-        old_password,
-        new_password,
-    }: ResetPasswordParams,
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        ..
+    }: HandlerArgs<CliContext>,
 ) -> Result<(), RpcError> {
-    let old_password = if let Some(old_password) = old_password {
-        old_password.decrypt(&ctx)?
-    } else {
-        rpassword::prompt_password("Current Password: ")?
-    };
+    let old_password = rpassword::prompt_password("Current Password: ")?;
 
-    let new_password = if let Some(new_password) = new_password {
-        new_password.decrypt(&ctx)?
-    } else {
+    let new_password = {
         let new_password = rpassword::prompt_password("New Password: ")?;
         if new_password != rpassword::prompt_password("Confirm: ")? {
             return Err(Error::new(
@@ -400,8 +392,8 @@ async fn cli_reset_password(
         new_password
     };
 
-    ctx.call_remote(
-        "auth.reset-password",
+    ctx.call_remote::<RpcContext>(
+        &parent_method.into_iter().chain(method).join("."),
         imbl_value::json!({ "old-password": old_password, "new-password": new_password }),
     )
     .await?;
@@ -447,7 +439,7 @@ pub async fn reset_password_impl(
 
 #[instrument(skip_all)]
 pub async fn get_pubkey(ctx: RpcContext) -> Result<Jwk, RpcError> {
-    let secret = ctx.as_ref().clone();
+    let secret = <RpcContext as AsRef<Jwk>>::as_ref(&ctx).clone();
     let pub_key = secret.to_public_key()?;
     Ok(pub_key)
 }
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 928e4811a..b72ce7b7b 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -20,7 +20,7 @@ use crate::backup::os::OsBackup;
 use crate::backup::{BackupReport, ServerBackupReport};
 use crate::context::RpcContext;
 use crate::db::model::public::BackupProgress;
-use crate::db::model::DatabaseModel;
+use crate::db::model::{Database, DatabaseModel};
 use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
@@ -42,9 +42,9 @@ pub struct BackupParams {
     password: crate::auth::PasswordType,
 }
 
-struct BackupStatusGuard(Option<PatchDb>);
+struct BackupStatusGuard(Option<TypedPatchDb<Database>>);
 impl BackupStatusGuard {
-    fn new(db: PatchDb) -> Self {
+    fn new(db: TypedPatchDb<Database>) -> Self {
         Self(Some(db))
     }
     async fn handle_result(
@@ -296,7 +296,7 @@ async fn perform_backup(
     if tokio::fs::metadata(&luks_folder_bak).await.is_ok() {
         tokio::fs::rename(&luks_folder_bak, &luks_folder_old).await?;
     }
-    let luks_folder = Path::new("/media/embassy/config/luks");
+    let luks_folder = Path::new("/media/startos/config/luks");
     if tokio::fs::metadata(&luks_folder).await.is_ok() {
         dir_copy(&luks_folder, &luks_folder_bak, None).await?;
     }
diff --git a/core/startos/src/backup/mod.rs b/core/startos/src/backup/mod.rs
index c963118c4..8afafaa33 100644
--- a/core/startos/src/backup/mod.rs
+++ b/core/startos/src/backup/mod.rs
@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use chrono::{DateTime, Utc};
 use models::{HostId, PackageId};
 use reqwest::Url;
-use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 
 use crate::context::CliContext;
@@ -34,23 +34,23 @@ pub struct PackageBackupReport {
 }
 
 // #[command(subcommands(backup_bulk::backup_all, target::target))]
-pub fn backup() -> ParentHandler {
+pub fn backup<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "create",
             from_fn_async(backup_bulk::backup_all)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
-        .subcommand("target", target::target())
+        .subcommand("target", target::target::<C>())
 }
 
-pub fn package_backup() -> ParentHandler {
+pub fn package_backup<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand(
         "restore",
         from_fn_async(restore::restore_packages_rpc)
             .no_display()
-            .with_remote_cli::<CliContext>(),
+            .with_call_remote::<CliContext>(),
     )
 }
 
@@ -61,5 +61,5 @@ struct BackupMetadata {
     pub network_keys: BTreeMap<HostId, Base64<[u8; 32]>>,
     #[serde(default)]
     pub tor_keys: BTreeMap<HostId, Base32<[u8; 64]>>, // DEPRECATED
-    pub marketplace_url: Option<Url>,
+    pub registry: Option<Url>,
 }
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index ab2e91c0e..ad4f81aa0 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use imbl_value::InternedString;
-use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
@@ -46,25 +46,25 @@ pub struct CifsBackupTarget {
     start_os: Option<EmbassyOsRecoveryInfo>,
 }
 
-pub fn cifs() -> ParentHandler {
+pub fn cifs<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "add",
             from_fn_async(add)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "update",
             from_fn_async(update)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index c0f2ef10e..4d00a2501 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -8,7 +8,7 @@ use color_eyre::eyre::eyre;
 use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
 use models::PackageId;
-use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
 use tokio::sync::Mutex;
@@ -138,23 +138,23 @@ impl FileSystem for BackupTargetFS {
 }
 
 // #[command(subcommands(cifs::cifs, list, info, mount, umount))]
-pub fn target() -> ParentHandler {
+pub fn target<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("cifs", cifs::cifs())
+        .subcommand("cifs", cifs::cifs::<C>())
         .subcommand(
             "list",
             from_fn_async(list)
                 .with_display_serializable()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "info",
             from_fn_async(info)
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|params, info| {
+                .with_custom_display_fn::<CliContext, _>(|params, info| {
                     Ok(display_backup_info(params.params, info))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/bins/mod.rs b/core/startos/src/bins/mod.rs
index 68f2802e0..4a4670a5b 100644
--- a/core/startos/src/bins/mod.rs
+++ b/core/startos/src/bins/mod.rs
@@ -5,6 +5,8 @@ use std::path::Path;
 #[cfg(feature = "container-runtime")]
 pub mod container_cli;
 pub mod deprecated;
+#[cfg(feature = "registry")]
+pub mod registry;
 #[cfg(feature = "cli")]
 pub mod start_cli;
 #[cfg(feature = "daemon")]
@@ -20,6 +22,8 @@ fn select_executable(name: &str) -> Option<fn(VecDeque<OsString>)> {
         "start-cli" => Some(container_cli::main),
         #[cfg(feature = "daemon")]
         "startd" => Some(startd::main),
+        #[cfg(feature = "registry")]
+        "registry" => Some(registry::main),
         "embassy-cli" => Some(|_| deprecated::renamed("embassy-cli", "start-cli")),
         "embassy-sdk" => Some(|_| deprecated::renamed("embassy-sdk", "start-sdk")),
         "embassyd" => Some(|_| deprecated::renamed("embassyd", "startd")),
diff --git a/core/startos/src/bins/registry.rs b/core/startos/src/bins/registry.rs
new file mode 100644
index 000000000..3028d1766
--- /dev/null
+++ b/core/startos/src/bins/registry.rs
@@ -0,0 +1,86 @@
+use std::ffi::OsString;
+
+use clap::Parser;
+use futures::FutureExt;
+use tokio::signal::unix::signal;
+use tracing::instrument;
+
+use crate::net::web_server::WebServer;
+use crate::prelude::*;
+use crate::registry::context::{RegistryConfig, RegistryContext};
+use crate::util::logger::EmbassyLogger;
+
+#[instrument(skip_all)]
+async fn inner_main(config: &RegistryConfig) -> Result<(), Error> {
+    let server = async {
+        let ctx = RegistryContext::init(config).await?;
+        let server = WebServer::registry(ctx.listen, ctx.clone());
+
+        let mut shutdown_recv = ctx.shutdown.subscribe();
+
+        let sig_handler_ctx = ctx;
+        let sig_handler = tokio::spawn(async move {
+            use tokio::signal::unix::SignalKind;
+            futures::future::select_all(
+                [
+                    SignalKind::interrupt(),
+                    SignalKind::quit(),
+                    SignalKind::terminate(),
+                ]
+                .iter()
+                .map(|s| {
+                    async move {
+                        signal(*s)
+                            .unwrap_or_else(|_| panic!("register {:?} handler", s))
+                            .recv()
+                            .await
+                    }
+                    .boxed()
+                }),
+            )
+            .await;
+            sig_handler_ctx
+                .shutdown
+                .send(())
+                .map_err(|_| ())
+                .expect("send shutdown signal");
+        });
+
+        shutdown_recv
+            .recv()
+            .await
+            .with_kind(crate::ErrorKind::Unknown)?;
+
+        sig_handler.abort();
+
+        Ok::<_, Error>(server)
+    }
+    .await?;
+    server.shutdown().await;
+
+    Ok(())
+}
+
+pub fn main(args: impl IntoIterator<Item = OsString>) {
+    EmbassyLogger::init();
+
+    let config = RegistryConfig::parse_from(args).load().unwrap();
+
+    let res = {
+        let rt = tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .expect("failed to initialize runtime");
+        rt.block_on(inner_main(&config))
+    };
+
+    match res {
+        Ok(()) => (),
+        Err(e) => {
+            eprintln!("{}", e.source);
+            tracing::debug!("{:?}", e.source);
+            drop(e.source);
+            std::process::exit(e.kind as i32)
+        }
+    }
+}
diff --git a/core/startos/src/bins/start_cli.rs b/core/startos/src/bins/start_cli.rs
index 374247f2e..17cc095a3 100644
--- a/core/startos/src/bins/start_cli.rs
+++ b/core/startos/src/bins/start_cli.rs
@@ -16,7 +16,7 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
     EmbassyLogger::init();
     if let Err(e) = CliApp::new(
         |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
-        crate::main_api(),
+        crate::expanded_api(),
     )
     .run(args)
     {
diff --git a/core/startos/src/bins/start_init.rs b/core/startos/src/bins/start_init.rs
index 284748339..8e60884f1 100644
--- a/core/startos/src/bins/start_init.rs
+++ b/core/startos/src/bins/start_init.rs
@@ -104,7 +104,7 @@ async fn setup_or_init(config: &ServerConfig) -> Result<Option<Shutdown>, Error>
         Command::new("reboot")
             .invoke(crate::ErrorKind::Unknown)
             .await?;
-    } else if tokio::fs::metadata("/media/embassy/config/disk.guid")
+    } else if tokio::fs::metadata("/media/startos/config/disk.guid")
         .await
         .is_err()
     {
@@ -136,7 +136,7 @@ async fn setup_or_init(config: &ServerConfig) -> Result<Option<Shutdown>, Error>
             tracing::debug!("{:?}", e);
         }
     } else {
-        let guid_string = tokio::fs::read_to_string("/media/embassy/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
+        let guid_string = tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
             .await?;
         let guid = guid_string.trim();
         let requires_reboot = crate::disk::main::import(
@@ -202,7 +202,7 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
 
     crate::sound::BEP.play().await?;
 
-    run_script_if_exists("/media/embassy/config/preinit.sh").await;
+    run_script_if_exists("/media/startos/config/preinit.sh").await;
 
     let res = match setup_or_init(config).await {
         Err(e) => {
@@ -213,12 +213,12 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
 
                 let ctx = DiagnosticContext::init(
                     config,
-                    if tokio::fs::metadata("/media/embassy/config/disk.guid")
+                    if tokio::fs::metadata("/media/startos/config/disk.guid")
                         .await
                         .is_ok()
                     {
                         Some(Arc::new(
-                            tokio::fs::read_to_string("/media/embassy/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
+                            tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
                                 .await?
                                 .trim()
                                 .to_owned(),
@@ -245,7 +245,7 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
         Ok(s) => Ok(s),
     };
 
-    run_script_if_exists("/media/embassy/config/postinit.sh").await;
+    run_script_if_exists("/media/startos/config/postinit.sh").await;
 
     res
 }
diff --git a/core/startos/src/bins/startd.rs b/core/startos/src/bins/startd.rs
index 3e571d6b2..f0bc428be 100644
--- a/core/startos/src/bins/startd.rs
+++ b/core/startos/src/bins/startd.rs
@@ -23,7 +23,7 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
         let rpc_ctx = RpcContext::init(
             config,
             Arc::new(
-                tokio::fs::read_to_string("/media/embassy/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
+                tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
                     .await?
                     .trim()
                     .to_owned(),
@@ -129,12 +129,12 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
                         crate::sound::BEETHOVEN.play().await?;
                         let ctx = DiagnosticContext::init(
                             &config,
-                            if tokio::fs::metadata("/media/embassy/config/disk.guid")
+                            if tokio::fs::metadata("/media/startos/config/disk.guid")
                                 .await
                                 .is_ok()
                             {
                                 Some(Arc::new(
-                                    tokio::fs::read_to_string("/media/embassy/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
+                                    tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
                                         .await?
                                         .trim()
                                         .to_owned(),
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index c600f590c..e61517794 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -9,7 +9,7 @@ use models::{ErrorKind, OptionExt, PackageId};
 use patch_db::value::InternedString;
 use patch_db::Value;
 use regex::Regex;
-use rpc_toolkit::{from_fn_async, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
@@ -134,16 +134,19 @@ pub struct ConfigParams {
 }
 
 // #[command(subcommands(get, set))]
-pub fn config() -> ParentHandler<ConfigParams> {
+pub fn config<C: Context>() -> ParentHandler<C, ConfigParams> {
     ParentHandler::new()
         .subcommand(
             "get",
             from_fn_async(get)
                 .with_inherited(|ConfigParams { id }, _| id)
                 .with_display_serializable()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "set",
+            set::<C>().with_inherited(|ConfigParams { id }, _| id),
         )
-        .subcommand("set", set().with_inherited(|ConfigParams { id }, _| id))
 }
 
 #[instrument(skip_all)]
@@ -173,13 +176,13 @@ pub struct SetParams {
 //     metadata(sync_db = true)
 // )]
 #[instrument(skip_all)]
-pub fn set() -> ParentHandler<SetParams, PackageId> {
+pub fn set<C: Context>() -> ParentHandler<C, SetParams, PackageId> {
     ParentHandler::new().root_handler(
         from_fn_async(set_impl)
             .with_metadata("sync_db", Value::Bool(true))
             .with_inherited(|set_params, id| (id, set_params))
             .no_display()
-            .with_remote_cli::<CliContext>(),
+            .with_call_remote::<CliContext>(),
     )
 }
 
diff --git a/core/startos/src/context/cli.rs b/core/startos/src/context/cli.rs
index cc2fe232b..166ab3fd7 100644
--- a/core/startos/src/context/cli.rs
+++ b/core/startos/src/context/cli.rs
@@ -10,7 +10,7 @@ use reqwest::Proxy;
 use reqwest_cookie_store::CookieStoreMutex;
 use rpc_toolkit::reqwest::{Client, Url};
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{call_remote_http, CallRemote, Context};
+use rpc_toolkit::{call_remote_http, CallRemote, Context, Empty};
 use tokio::net::TcpStream;
 use tokio::runtime::Runtime;
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
@@ -18,15 +18,17 @@ use tracing::instrument;
 
 use super::setup::CURRENT_SECRET;
 use crate::context::config::{local_config_path, ClientConfig};
-use crate::core::rpc_continuations::RequestGuid;
+use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext};
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::prelude::*;
+use crate::rpc_continuations::RequestGuid;
 
 #[derive(Debug)]
 pub struct CliContextSeed {
     pub runtime: OnceCell<Runtime>,
     pub base_url: Url,
     pub rpc_url: Url,
+    pub registry_url: Option<Url>,
     pub client: Client,
     pub cookie_store: Arc<CookieStoreMutex>,
     pub cookie_path: PathBuf,
@@ -66,6 +68,8 @@ impl CliContext {
             "http://localhost".parse()?
         };
 
+        let registry = config.registry.clone();
+
         let cookie_path = config.cookie_path.unwrap_or_else(|| {
             local_config_path()
                 .as_deref()
@@ -104,6 +108,17 @@ impl CliContext {
                     .push("v1");
                 url
             },
+            registry_url: registry
+                .map(|mut registry| {
+                    registry
+                        .path_segments_mut()
+                        .map_err(|_| eyre!("Url cannot be base"))
+                        .with_kind(crate::ErrorKind::ParseUrl)?
+                        .push("rpc")
+                        .push("v0");
+                    Ok::<_, Error>(registry)
+                })
+                .transpose()?,
             client: {
                 let mut builder = Client::builder().cookie_provider(cookie_store.clone());
                 if let Some(proxy) = config.proxy {
@@ -198,6 +213,29 @@ impl CliContext {
             .await
             .with_kind(ErrorKind::Network)
     }
+
+    pub async fn call_remote<RemoteContext>(
+        &self,
+        method: &str,
+        params: Value,
+    ) -> Result<Value, RpcError>
+    where
+        Self: CallRemote<RemoteContext>,
+    {
+        <Self as CallRemote<RemoteContext, Empty>>::call_remote(&self, method, params, Empty {})
+            .await
+    }
+    pub async fn call_remote_with<RemoteContext, T>(
+        &self,
+        method: &str,
+        params: Value,
+        extra: T,
+    ) -> Result<Value, RpcError>
+    where
+        Self: CallRemote<RemoteContext, T>,
+    {
+        <Self as CallRemote<RemoteContext, T>>::call_remote(&self, method, params, extra).await
+    }
 }
 impl AsRef<Jwk> for CliContext {
     fn as_ref(&self) -> &Jwk {
@@ -223,9 +261,23 @@ impl Context for CliContext {
             .clone()
     }
 }
-#[async_trait::async_trait]
-impl CallRemote for CliContext {
-    async fn call_remote(&self, method: &str, params: Value) -> Result<Value, RpcError> {
+impl CallRemote<RpcContext> for CliContext {
+    async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
+        call_remote_http(&self.client, self.rpc_url.clone(), method, params).await
+    }
+}
+impl CallRemote<DiagnosticContext> for CliContext {
+    async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
+        call_remote_http(&self.client, self.rpc_url.clone(), method, params).await
+    }
+}
+impl CallRemote<SetupContext> for CliContext {
+    async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
+        call_remote_http(&self.client, self.rpc_url.clone(), method, params).await
+    }
+}
+impl CallRemote<InstallContext> for CliContext {
+    async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
         call_remote_http(&self.client, self.rpc_url.clone(), method, params).await
     }
 }
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
index 0e6d9feff..bc2da00e2 100644
--- a/core/startos/src/context/config.rs
+++ b/core/startos/src/context/config.rs
@@ -14,7 +14,7 @@ use crate::init::init_postgres;
 use crate::prelude::*;
 use crate::util::serde::IoFormat;
 
-pub const DEVICE_CONFIG_PATH: &str = "/media/embassy/config/config.yaml"; // "/media/startos/config/config.yaml";
+pub const DEVICE_CONFIG_PATH: &str = "/media/startos/config/config.yaml"; // "/media/startos/config/config.yaml";
 pub const CONFIG_PATH: &str = "/etc/startos/config.yaml";
 pub const CONFIG_PATH_LOCAL: &str = ".startos/config.yaml";
 
@@ -58,6 +58,8 @@ pub struct ClientConfig {
     pub config: Option<PathBuf>,
     #[arg(short = 'h', long = "host")]
     pub host: Option<Url>,
+    #[arg(short = 'r', long = "registry")]
+    pub registry: Option<Url>,
     #[arg(short = 'p', long = "proxy")]
     pub proxy: Option<Url>,
     #[arg(long = "cookie-path")]
@@ -71,8 +73,10 @@ impl ContextConfig for ClientConfig {
     }
     fn merge_with(&mut self, other: Self) {
         self.host = self.host.take().or(other.host);
+        self.registry = self.registry.take().or(other.registry);
         self.proxy = self.proxy.take().or(other.proxy);
         self.cookie_path = self.cookie_path.take().or(other.cookie_path);
+        self.developer_key_path = self.developer_key_path.take().or(other.developer_key_path);
     }
 }
 impl ClientConfig {
diff --git a/core/startos/src/context/diagnostic.rs b/core/startos/src/context/diagnostic.rs
index 117e56061..10379dcf3 100644
--- a/core/startos/src/context/diagnostic.rs
+++ b/core/startos/src/context/diagnostic.rs
@@ -8,6 +8,7 @@ use tokio::sync::broadcast::Sender;
 use tracing::instrument;
 
 use crate::context::config::ServerConfig;
+use crate::rpc_continuations::RpcContinuations;
 use crate::shutdown::Shutdown;
 use crate::Error;
 
@@ -16,6 +17,7 @@ pub struct DiagnosticContextSeed {
     pub shutdown: Sender<Option<Shutdown>>,
     pub error: Arc<RpcError>,
     pub disk_guid: Option<Arc<String>>,
+    pub rpc_continuations: RpcContinuations,
 }
 
 #[derive(Clone)]
@@ -37,10 +39,15 @@ impl DiagnosticContext {
             shutdown,
             disk_guid,
             error: Arc::new(error.into()),
+            rpc_continuations: RpcContinuations::new(),
         })))
     }
 }
-
+impl AsRef<RpcContinuations> for DiagnosticContext {
+    fn as_ref(&self) -> &RpcContinuations {
+        &self.rpc_continuations
+    }
+}
 impl Context for DiagnosticContext {}
 impl Deref for DiagnosticContext {
     type Target = DiagnosticContextSeed;
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index f2c859273..cf2d28085 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -6,33 +6,32 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
-use imbl_value::InternedString;
 use josekit::jwk::Jwk;
-use patch_db::PatchDb;
 use reqwest::{Client, Proxy};
-use rpc_toolkit::Context;
+use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{CallRemote, Context, Empty};
 use tokio::sync::{broadcast, oneshot, Mutex, RwLock};
 use tokio::time::Instant;
 use tracing::instrument;
 
 use super::setup::CURRENT_SECRET;
+use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
-use crate::core::rpc_continuations::{RequestGuid, RestHandler, RpcContinuation, WebSocketHandler};
-use crate::db::prelude::PatchDbExt;
+use crate::db::model::Database;
 use crate::dependencies::compute_dependency_config_errs;
 use crate::disk::OsPartitionInfo;
 use crate::init::check_time_is_synchronized;
-use crate::lxc::{LxcContainer, LxcManager};
+use crate::lxc::{ContainerId, LxcContainer, LxcManager};
 use crate::middleware::auth::HashSessionToken;
 use crate::net::net_controller::NetController;
 use crate::net::utils::{find_eth_iface, find_wifi_iface};
 use crate::net::wifi::WpaCli;
 use crate::prelude::*;
+use crate::rpc_continuations::RpcContinuations;
 use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
 use crate::system::get_mem_info;
 use crate::util::lshw::{lshw, LshwDevice};
-use crate::{account::AccountInfo, lxc::ContainerId};
 
 pub struct RpcContextSeed {
     is_closed: AtomicBool,
@@ -41,7 +40,7 @@ pub struct RpcContextSeed {
     pub ethernet_interface: String,
     pub datadir: PathBuf,
     pub disk_guid: Arc<String>,
-    pub db: PatchDb,
+    pub db: TypedPatchDb<Database>,
     pub account: RwLock<AccountInfo>,
     pub net_controller: Arc<NetController>,
     pub services: ServiceMap,
@@ -50,7 +49,7 @@ pub struct RpcContextSeed {
     pub tor_socks: SocketAddr,
     pub lxc_manager: Arc<LxcManager>,
     pub open_authed_websockets: Mutex<BTreeMap<HashSessionToken, Vec<oneshot::Sender<()>>>>,
-    pub rpc_stream_continuations: Mutex<BTreeMap<RequestGuid, RpcContinuation>>,
+    pub rpc_continuations: RpcContinuations,
     pub wifi_manager: Option<Arc<RwLock<WpaCli>>>,
     pub current_secret: Arc<Jwk>,
     pub client: Client,
@@ -80,7 +79,7 @@ impl RpcContext {
         )));
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
 
-        let db = config.db().await?;
+        let db = TypedPatchDb::<Database>::load(config.db().await?).await?;
         let peek = db.peek().await;
         let account = AccountInfo::load(&peek)?;
         tracing::info!("Opened PatchDB");
@@ -159,7 +158,7 @@ impl RpcContext {
             tor_socks: tor_proxy,
             lxc_manager: Arc::new(LxcManager::new()),
             open_authed_websockets: Mutex::new(BTreeMap::new()),
-            rpc_stream_continuations: Mutex::new(BTreeMap::new()),
+            rpc_continuations: RpcContinuations::new(),
             wifi_manager: wifi_interface
                 .clone()
                 .map(|i| Arc::new(RwLock::new(WpaCli::init(i)))),
@@ -236,54 +235,27 @@ impl RpcContext {
 
         Ok(())
     }
-
-    #[instrument(skip_all)]
-    pub async fn clean_continuations(&self) {
-        let mut continuations = self.rpc_stream_continuations.lock().await;
-        let mut to_remove = Vec::new();
-        for (guid, cont) in &*continuations {
-            if cont.is_timed_out() {
-                to_remove.push(guid.clone());
-            }
-        }
-        for guid in to_remove {
-            continuations.remove(&guid);
-        }
-    }
-
-    #[instrument(skip_all)]
-    pub async fn add_continuation(&self, guid: RequestGuid, handler: RpcContinuation) {
-        self.clean_continuations().await;
-        self.rpc_stream_continuations
-            .lock()
+    pub async fn call_remote<RemoteContext>(
+        &self,
+        method: &str,
+        params: Value,
+    ) -> Result<Value, RpcError>
+    where
+        Self: CallRemote<RemoteContext>,
+    {
+        <Self as CallRemote<RemoteContext, Empty>>::call_remote(&self, method, params, Empty {})
             .await
-            .insert(guid, handler);
     }
-
-    pub async fn get_ws_continuation_handler(
+    pub async fn call_remote_with<RemoteContext, T>(
         &self,
-        guid: &RequestGuid,
-    ) -> Option<WebSocketHandler> {
-        let mut continuations = self.rpc_stream_continuations.lock().await;
-        if !matches!(continuations.get(guid), Some(RpcContinuation::WebSocket(_))) {
-            return None;
-        }
-        let Some(RpcContinuation::WebSocket(x)) = continuations.remove(guid) else {
-            return None;
-        };
-        x.get().await
-    }
-
-    pub async fn get_rest_continuation_handler(&self, guid: &RequestGuid) -> Option<RestHandler> {
-        let mut continuations: tokio::sync::MutexGuard<'_, BTreeMap<RequestGuid, RpcContinuation>> =
-            self.rpc_stream_continuations.lock().await;
-        if !matches!(continuations.get(guid), Some(RpcContinuation::Rest(_))) {
-            return None;
-        }
-        let Some(RpcContinuation::Rest(x)) = continuations.remove(guid) else {
-            return None;
-        };
-        x.get().await
+        method: &str,
+        params: Value,
+        extra: T,
+    ) -> Result<Value, RpcError>
+    where
+        Self: CallRemote<RemoteContext, T>,
+    {
+        <Self as CallRemote<RemoteContext, T>>::call_remote(&self, method, params, extra).await
     }
 }
 impl AsRef<Jwk> for RpcContext {
@@ -291,6 +263,11 @@ impl AsRef<Jwk> for RpcContext {
         &CURRENT_SECRET
     }
 }
+impl AsRef<RpcContinuations> for RpcContext {
+    fn as_ref(&self) -> &RpcContinuations {
+        &self.rpc_continuations
+    }
+}
 impl Context for RpcContext {}
 impl Deref for RpcContext {
     type Target = RpcContextSeed;
diff --git a/core/startos/src/control.rs b/core/startos/src/control.rs
index 3ef7d6030..d4a595a61 100644
--- a/core/startos/src/control.rs
+++ b/core/startos/src/control.rs
@@ -1,7 +1,6 @@
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use models::PackageId;
-use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
diff --git a/core/startos/src/core/mod.rs b/core/startos/src/core/mod.rs
deleted file mode 100644
index 7c2dbbb06..000000000
--- a/core/startos/src/core/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod rpc_continuations;
diff --git a/core/startos/src/core/rpc_continuations.rs b/core/startos/src/core/rpc_continuations.rs
deleted file mode 100644
index 0f25dd383..000000000
--- a/core/startos/src/core/rpc_continuations.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::time::Duration;
-
-use axum::extract::ws::WebSocket;
-use axum::extract::Request;
-use axum::response::Response;
-use futures::future::BoxFuture;
-use helpers::TimedResource;
-use imbl_value::InternedString;
-
-#[allow(unused_imports)]
-use crate::prelude::*;
-use crate::util::new_guid;
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
-pub struct RequestGuid(InternedString);
-impl RequestGuid {
-    pub fn new() -> Self {
-        Self(new_guid())
-    }
-
-    pub fn from(r: &str) -> Option<RequestGuid> {
-        if r.len() != 32 {
-            return None;
-        }
-        for c in r.chars() {
-            if !(c >= 'A' && c <= 'Z' || c >= '2' && c <= '7') {
-                return None;
-            }
-        }
-        Some(RequestGuid(InternedString::intern(r)))
-    }
-}
-impl AsRef<str> for RequestGuid {
-    fn as_ref(&self) -> &str {
-        self.0.as_ref()
-    }
-}
-
-#[test]
-fn parse_guid() {
-    println!(
-        "{:?}",
-        RequestGuid::from(&format!("{}", RequestGuid::new()))
-    )
-}
-
-impl std::fmt::Display for RequestGuid {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-pub type RestHandler =
-    Box<dyn FnOnce(Request) -> BoxFuture<'static, Result<Response, crate::Error>> + Send>;
-
-pub type WebSocketHandler = Box<dyn FnOnce(WebSocket) -> BoxFuture<'static, ()> + Send>;
-
-pub enum RpcContinuation {
-    Rest(TimedResource<RestHandler>),
-    WebSocket(TimedResource<WebSocketHandler>),
-}
-impl RpcContinuation {
-    pub fn rest(handler: RestHandler, timeout: Duration) -> Self {
-        RpcContinuation::Rest(TimedResource::new(handler, timeout))
-    }
-    pub fn ws(handler: WebSocketHandler, timeout: Duration) -> Self {
-        RpcContinuation::WebSocket(TimedResource::new(handler, timeout))
-    }
-    pub fn is_timed_out(&self) -> bool {
-        match self {
-            RpcContinuation::Rest(a) => a.is_timed_out(),
-            RpcContinuation::WebSocket(a) => a.is_timed_out(),
-        }
-    }
-}
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 95e42f46b..0bb8a23db 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -11,10 +11,11 @@ use clap::Parser;
 use futures::{FutureExt, StreamExt};
 use http::header::COOKIE;
 use http::HeaderMap;
+use itertools::Itertools;
 use patch_db::json_ptr::{JsonPointer, ROOT};
 use patch_db::{Dump, Revision};
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{command, from_fn_async, CallRemote, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use tokio::sync::oneshot;
@@ -167,11 +168,11 @@ pub async fn subscribe(
     }))
 }
 
-pub fn db() -> ParentHandler {
+pub fn db<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand("dump", from_fn_async(cli_dump).with_display_serializable())
         .subcommand("dump", from_fn_async(dump).no_cli())
-        .subcommand("put", put())
+        .subcommand("put", put::<C>())
         .subcommand("apply", from_fn_async(cli_apply).no_display())
         .subcommand("apply", from_fn_async(apply).no_cli())
 }
@@ -195,21 +196,28 @@ pub struct CliDumpParams {
 
 #[instrument(skip_all)]
 async fn cli_dump(
-    ctx: CliContext,
-    CliDumpParams {
-        path,
-        include_private,
-    }: CliDumpParams,
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        params: CliDumpParams {
+            include_private,
+            path,
+        },
+        ..
+    }: HandlerArgs<CliContext, CliDumpParams>,
 ) -> Result<Dump, RpcError> {
     let dump = if let Some(path) = path {
         PatchDb::open(path).await?.dump(&ROOT).await
     } else {
+        let method = parent_method.into_iter().chain(method).join(".");
         from_value::<Dump>(
-            ctx.call_remote(
-                "db.dump",
-                imbl_value::json!({ "includePrivate":include_private }),
-            )
-            .await?,
+            context
+                .call_remote::<RpcContext>(
+                    &method,
+                    imbl_value::json!({ "includePrivate":include_private }),
+                )
+                .await?,
         )?
     };
 
@@ -237,36 +245,54 @@ pub async fn dump(
     })
 }
 
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+pub struct CliApplyParams {
+    expr: String,
+    path: Option<PathBuf>,
+}
+
 #[instrument(skip_all)]
 async fn cli_apply(
-    ctx: CliContext,
-    ApplyParams { expr, path }: ApplyParams,
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        params: CliApplyParams { expr, path },
+        ..
+    }: HandlerArgs<CliContext, CliApplyParams>,
 ) -> Result<(), RpcError> {
     if let Some(path) = path {
         PatchDb::open(path)
             .await?
-            .mutate(|db| {
+            .apply_function(|db| {
                 let res = apply_expr(
-                    serde_json::to_value(patch_db::Value::from(db.clone()))
+                    serde_json::to_value(patch_db::Value::from(db))
                         .with_kind(ErrorKind::Deserialization)?
                         .into(),
                     &expr,
                 )?;
 
-                db.ser(
-                    &serde_json::from_value::<model::Database>(res.clone().into()).with_ctx(
-                        |_| {
-                            (
-                                crate::ErrorKind::Deserialization,
-                                "result does not match database model",
-                            )
-                        },
+                Ok::<_, Error>((
+                    to_value(
+                        &serde_json::from_value::<model::Database>(res.clone().into()).with_ctx(
+                            |_| {
+                                (
+                                    crate::ErrorKind::Deserialization,
+                                    "result does not match database model",
+                                )
+                            },
+                        )?,
                     )?,
-                )
+                    (),
+                ))
             })
             .await?;
     } else {
-        ctx.call_remote("db.apply", imbl_value::json!({ "expr": expr }))
+        let method = parent_method.into_iter().chain(method).join(".");
+        context
+            .call_remote::<RpcContext>(&method, imbl_value::json!({ "expr": expr }))
             .await?;
     }
 
@@ -278,10 +304,9 @@ async fn cli_apply(
 #[command(rename_all = "kebab-case")]
 pub struct ApplyParams {
     expr: String,
-    path: Option<PathBuf>,
 }
 
-pub async fn apply(ctx: RpcContext, ApplyParams { expr, .. }: ApplyParams) -> Result<(), Error> {
+pub async fn apply(ctx: RpcContext, ApplyParams { expr }: ApplyParams) -> Result<(), Error> {
     ctx.db
         .mutate(|db| {
             let res = apply_expr(
@@ -303,12 +328,12 @@ pub async fn apply(ctx: RpcContext, ApplyParams { expr, .. }: ApplyParams) -> Re
         .await
 }
 
-pub fn put() -> ParentHandler {
+pub fn put<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand(
         "ui",
         from_fn_async(ui)
             .with_display_serializable()
-            .with_remote_cli::<CliContext>(),
+            .with_call_remote::<CliContext>(),
     )
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 29b7bb90f..3fad0ad9f 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -54,7 +54,7 @@ impl PackageState {
     pub fn expect_installed(&self) -> Result<&InstalledState, Error> {
         match self {
             Self::Installed(a) => Ok(a),
-            a => Err(Error::new(
+            _ => Err(Error::new(
                 eyre!(
                     "Package {} is not in installed state",
                     self.as_manifest(ManifestPreference::Old).id
@@ -161,7 +161,7 @@ impl Model<PackageState> {
     pub fn expect_installed(&self) -> Result<&Model<InstalledState>, Error> {
         match self.as_match() {
             PackageStateMatchModelRef::Installed(a) => Ok(a),
-            a => Err(Error::new(
+            _ => Err(Error::new(
                 eyre!(
                     "Package {} is not in installed state",
                     self.as_manifest(ManifestPreference::Old).as_id().de()?
@@ -251,7 +251,7 @@ impl Model<PackageState> {
             PackageStateMatchModelMut::Installed(s) | PackageStateMatchModelMut::Removing(s) => {
                 s.as_manifest_mut()
             }
-            PackageStateMatchModelMut::Error(s) => {
+            PackageStateMatchModelMut::Error(_) => {
                 return Err(Error::new(
                     eyre!("could not determine package state to get manifest"),
                     ErrorKind::Database,
@@ -325,7 +325,7 @@ pub struct PackageDataEntry {
     pub state_info: PackageState,
     pub status: Status,
     #[ts(type = "string | null")]
-    pub marketplace_url: Option<Url>,
+    pub registry: Option<Url>,
     #[ts(type = "string")]
     pub developer_key: Pem<ed25519_dalek::VerifyingKey>,
     pub icon: DataUrl<'static>,
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index a51303cf4..d79948c6f 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -19,6 +19,7 @@ use crate::account::AccountInfo;
 use crate::db::model::package::AllPackageData;
 use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
 use crate::prelude::*;
+use crate::progress::FullProgress;
 use crate::util::cpupower::Governor;
 use crate::util::Version;
 use crate::version::{Current, VersionT};
@@ -175,24 +176,13 @@ pub struct BackupProgress {
 pub struct ServerStatus {
     pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
     pub updated: bool,
-    pub update_progress: Option<UpdateProgress>,
+    pub update_progress: Option<FullProgress>,
     #[serde(default)]
     pub shutting_down: bool,
     #[serde(default)]
     pub restarting: bool,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
-#[serde(rename_all = "camelCase")]
-#[model = "Model<Self>"]
-#[ts(export)]
-pub struct UpdateProgress {
-    #[ts(type = "number | null")]
-    pub size: Option<u64>,
-    #[ts(type = "number")]
-    pub downloaded: u64,
-}
-
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
diff --git a/core/startos/src/db/prelude.rs b/core/startos/src/db/prelude.rs
index 43dd59002..d40c3c17c 100644
--- a/core/startos/src/db/prelude.rs
+++ b/core/startos/src/db/prelude.rs
@@ -1,22 +1,16 @@
 use std::collections::BTreeMap;
-use std::future::Future;
 use std::marker::PhantomData;
-use std::panic::UnwindSafe;
 use std::str::FromStr;
 
 use chrono::{DateTime, Utc};
 pub use imbl_value::Value;
-use patch_db::json_ptr::ROOT;
 use patch_db::value::InternedString;
 pub use patch_db::{HasModel, PatchDb};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 
-use crate::db::model::DatabaseModel;
 use crate::prelude::*;
 
-pub type Peeked = Model<super::model::Database>;
-
 pub fn to_value<T>(value: &T) -> Result<Value, Error>
 where
     T: Serialize,
@@ -31,45 +25,7 @@ where
     patch_db::value::from_value(value).with_kind(ErrorKind::Deserialization)
 }
 
-pub trait PatchDbExt {
-    fn peek(&self) -> impl Future<Output = DatabaseModel> + Send;
-    fn mutate<U: UnwindSafe + Send>(
-        &self,
-        f: impl FnOnce(&mut DatabaseModel) -> Result<U, Error> + UnwindSafe + Send,
-    ) -> impl Future<Output = Result<U, Error>> + Send;
-    fn map_mutate(
-        &self,
-        f: impl FnOnce(DatabaseModel) -> Result<DatabaseModel, Error> + UnwindSafe + Send,
-    ) -> impl Future<Output = Result<DatabaseModel, Error>> + Send;
-}
-impl PatchDbExt for PatchDb {
-    async fn peek(&self) -> DatabaseModel {
-        DatabaseModel::from(self.dump(&ROOT).await.value)
-    }
-    async fn mutate<U: UnwindSafe + Send>(
-        &self,
-        f: impl FnOnce(&mut DatabaseModel) -> Result<U, Error> + UnwindSafe + Send,
-    ) -> Result<U, Error> {
-        Ok(self
-            .apply_function(|mut v| {
-                let model = <&mut DatabaseModel>::from(&mut v);
-                let res = f(model)?;
-                Ok::<_, Error>((v, res))
-            })
-            .await?
-            .1)
-    }
-    async fn map_mutate(
-        &self,
-        f: impl FnOnce(DatabaseModel) -> Result<DatabaseModel, Error> + UnwindSafe + Send,
-    ) -> Result<DatabaseModel, Error> {
-        Ok(DatabaseModel::from(
-            self.apply_function(|v| f(DatabaseModel::from(v)).map(|a| (a.into(), ())))
-                .await?
-                .0,
-        ))
-    }
-}
+pub type TypedPatchDb<T> = patch_db::TypedPatchDb<T, Error>;
 
 /// &mut Model<T> <=> &mut Value
 #[repr(transparent)]
@@ -125,7 +81,7 @@ impl<T: Serialize + DeserializeOwned> Model<T> {
         Ok(res)
     }
     pub fn map_mutate(&mut self, f: impl FnOnce(T) -> Result<T, Error>) -> Result<T, Error> {
-        let mut orig = self.de()?;
+        let orig = self.de()?;
         let res = f(orig)?;
         self.ser(&res)?;
         Ok(res)
@@ -262,10 +218,9 @@ where
             .into()),
         }
     }
-    pub fn upsert<F, D>(&mut self, key: &T::Key, value: F) -> Result<&mut Model<T::Value>, Error>
+    pub fn upsert<F>(&mut self, key: &T::Key, value: F) -> Result<&mut Model<T::Value>, Error>
     where
-        F: FnOnce() -> D,
-        D: AsRef<T::Value>,
+        F: FnOnce() -> T::Value,
     {
         use serde::ser::Error;
         match &mut self.value {
@@ -278,7 +233,7 @@ where
                     s.as_ref().index_or_insert(v)
                 });
                 if !exists {
-                    res.ser(value().as_ref())?;
+                    res.ser(&value())?;
                 }
                 Ok(res)
             }
@@ -375,6 +330,18 @@ where
     }
 }
 impl<T: Map> Model<T> {
+    pub fn contains_key(&self, key: &T::Key) -> Result<bool, Error> {
+        use serde::de::Error;
+        let s = T::key_str(key)?;
+        match &self.value {
+            Value::Object(o) => Ok(o.contains_key(s.as_ref())),
+            v => Err(patch_db::value::Error {
+                source: patch_db::value::ErrorSource::custom(format!("expected object found {v}")),
+                kind: patch_db::value::ErrorKind::Deserialization,
+            }
+            .into()),
+        }
+    }
     pub fn into_idx(self, key: &T::Key) -> Option<Model<T::Value>> {
         use patch_db::ModelExt;
         let s = T::key_str(key).ok()?;
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 42a19abe3..a746a42c9 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 use clap::Parser;
 use models::PackageId;
 use patch_db::json_patch::merge;
-use rpc_toolkit::{command, from_fn_async, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
@@ -15,8 +15,8 @@ use crate::db::model::package::CurrentDependencies;
 use crate::prelude::*;
 use crate::Error;
 
-pub fn dependency() -> ParentHandler {
-    ParentHandler::new().subcommand("configure", configure())
+pub fn dependency<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new().subcommand("configure", configure::<C>())
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel, TS)]
@@ -50,7 +50,7 @@ pub struct ConfigureParams {
     dependent_id: PackageId,
     dependency_id: PackageId,
 }
-pub fn configure() -> ParentHandler<ConfigureParams> {
+pub fn configure<C: Context>() -> ParentHandler<C, ConfigureParams> {
     ParentHandler::new().root_handler(
         from_fn_async(configure_impl)
             .with_inherited(|params, _| params)
diff --git a/core/startos/src/developer/mod.rs b/core/startos/src/developer/mod.rs
index 596957445..79a875dfc 100644
--- a/core/startos/src/developer/mod.rs
+++ b/core/startos/src/developer/mod.rs
@@ -8,6 +8,7 @@ use ed25519_dalek::{SigningKey, VerifyingKey};
 use tracing::instrument;
 
 use crate::context::CliContext;
+use crate::util::serde::Pem;
 use crate::{Error, ResultExt};
 
 #[instrument(skip_all)]
@@ -45,3 +46,7 @@ pub fn init(ctx: CliContext) -> Result<(), Error> {
     }
     Ok(())
 }
+
+pub fn pubkey(ctx: CliContext) -> Result<Pem<ed25519_dalek::VerifyingKey>, Error> {
+    Ok(Pem(ctx.developer_key()?.verifying_key()))
+}
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index 1cef6d7ef..485f2359f 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -1,38 +1,48 @@
 use std::path::Path;
 use std::sync::Arc;
 
-use clap::Parser;
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{command, from_fn, from_fn_async, AnyContext, HandlerExt, ParentHandler};
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
+use rpc_toolkit::{
+    from_fn, from_fn_async, CallRemoteHandler, Context, Empty, HandlerExt, ParentHandler,
+};
 
-use crate::context::{CliContext, DiagnosticContext};
+use crate::context::{CliContext, DiagnosticContext, RpcContext};
 use crate::init::SYSTEM_REBUILD_PATH;
-use crate::logs::{fetch_logs, LogResponse, LogSource};
 use crate::shutdown::Shutdown;
 use crate::Error;
 
-pub fn diagnostic() -> ParentHandler {
+pub fn diagnostic<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("error", from_fn(error).with_remote_cli::<CliContext>())
-        .subcommand("logs", from_fn_async(logs).no_cli())
+        .subcommand("error", from_fn(error).with_call_remote::<CliContext>())
+        .subcommand("logs", crate::system::logs::<DiagnosticContext>())
+        .subcommand(
+            "logs",
+            from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>).no_display(),
+        )
+        .subcommand(
+            "kernel-logs",
+            crate::system::kernel_logs::<DiagnosticContext>(),
+        )
+        .subcommand(
+            "kernel-logs",
+            from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>).no_display(),
+        )
         .subcommand(
             "exit",
-            from_fn(exit).no_display().with_remote_cli::<CliContext>(),
+            from_fn(exit).no_display().with_call_remote::<CliContext>(),
         )
         .subcommand(
             "restart",
             from_fn(restart)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
-        .subcommand("disk", disk())
+        .subcommand("disk", disk::<C>())
         .subcommand(
             "rebuild",
             from_fn_async(rebuild)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
@@ -41,26 +51,6 @@ pub fn error(ctx: DiagnosticContext) -> Result<Arc<RpcError>, Error> {
     Ok(ctx.error.clone())
 }
 
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct LogsParams {
-    #[ts(type = "number | null")]
-    limit: Option<usize>,
-    cursor: Option<String>,
-    before: bool,
-}
-pub async fn logs(
-    _: AnyContext,
-    LogsParams {
-        limit,
-        cursor,
-        before,
-    }: LogsParams,
-) -> Result<LogResponse, Error> {
-    Ok(fetch_logs(LogSource::System, limit, cursor, before).await?)
-}
-
 pub fn exit(ctx: DiagnosticContext) -> Result<(), Error> {
     ctx.shutdown.send(None).expect("receiver dropped");
     Ok(())
@@ -83,17 +73,20 @@ pub async fn rebuild(ctx: DiagnosticContext) -> Result<(), Error> {
     restart(ctx)
 }
 
-pub fn disk() -> ParentHandler {
-    ParentHandler::new().subcommand(
-        "forget",
-        from_fn_async(forget_disk)
-            .no_display()
-            .with_remote_cli::<CliContext>(),
-    )
+pub fn disk<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("forget", from_fn_async(forget_disk::<C>).no_cli())
+        .subcommand(
+            "forget",
+            CallRemoteHandler::<CliContext, _, _>::new(
+                from_fn_async(forget_disk::<RpcContext>).no_display(),
+            )
+            .no_display(),
+        )
 }
 
-pub async fn forget_disk(_: AnyContext) -> Result<(), Error> {
-    let disk_guid = Path::new("/media/embassy/config/disk.guid");
+pub async fn forget_disk<C: Context>(_: C) -> Result<(), Error> {
+    let disk_guid = Path::new("/media/startos/config/disk.guid");
     if tokio::fs::metadata(disk_guid).await.is_ok() {
         tokio::fs::remove_file(disk_guid).await?;
     }
diff --git a/core/startos/src/disk/fsck/ext4.rs b/core/startos/src/disk/fsck/ext4.rs
index 7bcbbc8b3..a068749fa 100644
--- a/core/startos/src/disk/fsck/ext4.rs
+++ b/core/startos/src/disk/fsck/ext4.rs
@@ -38,7 +38,7 @@ fn backup_existing_undo_file<'a>(path: &'a Path) -> BoxFuture<'a, Result<(), Err
 pub async fn e2fsck_aggressive(
     logicalname: impl AsRef<Path> + std::fmt::Debug,
 ) -> Result<RequiresReboot, Error> {
-    let undo_path = Path::new("/media/embassy/config")
+    let undo_path = Path::new("/media/startos/config")
         .join(
             logicalname
                 .as_ref()
diff --git a/core/startos/src/disk/main.rs b/core/startos/src/disk/main.rs
index c7c634303..d414c247e 100644
--- a/core/startos/src/disk/main.rs
+++ b/core/startos/src/disk/main.rs
@@ -302,7 +302,7 @@ pub async fn mount_fs<P: AsRef<Path>>(
 
     if !guid.ends_with("_UNENC") {
         // Backup LUKS header if e2fsck succeeded
-        let luks_folder = Path::new("/media/embassy/config/luks");
+        let luks_folder = Path::new("/media/startos/config/luks");
         tokio::fs::create_dir_all(luks_folder).await?;
         let tmp_luks_bak = luks_folder.join(format!(".{full_name}.luks.bak.tmp"));
         if tokio::fs::metadata(&tmp_luks_bak).await.is_ok() {
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index f74c944a4..68eb2b187 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -1,6 +1,8 @@
 use std::path::{Path, PathBuf};
 
-use rpc_toolkit::{from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{
+    from_fn_async, CallRemoteHandler, Context, Empty, HandlerExt, ParentHandler,
+};
 use serde::{Deserialize, Serialize};
 
 use crate::context::{CliContext, RpcContext};
@@ -14,7 +16,7 @@ pub mod mount;
 pub mod util;
 
 pub const BOOT_RW_PATH: &str = "/media/boot-rw";
-pub const REPAIR_DISK_PATH: &str = "/media/embassy/config/repair-disk";
+pub const REPAIR_DISK_PATH: &str = "/media/startos/config/repair-disk";
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -40,22 +42,23 @@ impl OsPartitionInfo {
     }
 }
 
-pub fn disk() -> ParentHandler {
+pub fn disk<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "list",
             from_fn_async(list)
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                .with_custom_display_fn(|handle, result| {
                     Ok(display_disk_info(handle.params, result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
+        .subcommand("repair", from_fn_async(|_: C| repair()).no_cli())
         .subcommand(
             "repair",
-            from_fn_async(repair)
-                .no_display()
-                .with_remote_cli::<CliContext>(),
+            CallRemoteHandler::<CliContext, _, _>::new(
+                from_fn_async(|_: RpcContext| repair()).no_display(),
+            ),
         )
 }
 
diff --git a/core/startos/src/disk/mount/filesystem/overlayfs.rs b/core/startos/src/disk/mount/filesystem/overlayfs.rs
index ad5eec501..f96de7b11 100644
--- a/core/startos/src/disk/mount/filesystem/overlayfs.rs
+++ b/core/startos/src/disk/mount/filesystem/overlayfs.rs
@@ -11,17 +11,21 @@ use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::prelude::*;
 use crate::util::io::TmpDir;
 
-struct OverlayFs<P0: AsRef<Path>, P1: AsRef<Path>> {
+pub struct OverlayFs<P0: AsRef<Path>, P1: AsRef<Path>, P2: AsRef<Path>> {
     lower: P0,
     upper: P1,
+    work: P2,
 }
-impl<P0: AsRef<Path>, P1: AsRef<Path>> OverlayFs<P0, P1> {
-    pub fn new(lower: P0, upper: P1) -> Self {
-        Self { lower, upper }
+impl<P0: AsRef<Path>, P1: AsRef<Path>, P2: AsRef<Path>> OverlayFs<P0, P1, P2> {
+    pub fn new(lower: P0, upper: P1, work: P2) -> Self {
+        Self { lower, upper, work }
     }
 }
-impl<P0: AsRef<Path> + Send + Sync, P1: AsRef<Path> + Send + Sync> FileSystem
-    for OverlayFs<P0, P1>
+impl<
+        P0: AsRef<Path> + Send + Sync,
+        P1: AsRef<Path> + Send + Sync,
+        P2: AsRef<Path> + Send + Sync,
+    > FileSystem for OverlayFs<P0, P1, P2>
 {
     fn mount_type(&self) -> Option<impl AsRef<str>> {
         Some("overlay")
@@ -33,24 +37,20 @@ impl<P0: AsRef<Path> + Send + Sync, P1: AsRef<Path> + Send + Sync> FileSystem
         [
             Box::new(lazy_format!("lowerdir={}", self.lower.as_ref().display()))
                 as Box<dyn Display>,
-            Box::new(lazy_format!(
-                "upperdir={}/upper",
-                self.upper.as_ref().display()
-            )),
-            Box::new(lazy_format!(
-                "workdir={}/work",
-                self.upper.as_ref().display()
-            )),
+            Box::new(lazy_format!("upperdir={}", self.upper.as_ref().display())),
+            Box::new(lazy_format!("workdir={}", self.work.as_ref().display())),
         ]
     }
     async fn pre_mount(&self) -> Result<(), Error> {
-        tokio::fs::create_dir_all(self.upper.as_ref().join("upper")).await?;
-        tokio::fs::create_dir_all(self.upper.as_ref().join("work")).await?;
+        tokio::fs::create_dir_all(self.upper.as_ref()).await?;
+        tokio::fs::create_dir_all(self.work.as_ref()).await?;
         Ok(())
     }
     async fn source_hash(
         &self,
     ) -> Result<GenericArray<u8, <Sha256 as OutputSizeUser>::OutputSize>, Error> {
+        tokio::fs::create_dir_all(self.upper.as_ref()).await?;
+        tokio::fs::create_dir_all(self.work.as_ref()).await?;
         let mut sha = Sha256::new();
         sha.update("OverlayFs");
         sha.update(
@@ -77,6 +77,18 @@ impl<P0: AsRef<Path> + Send + Sync, P1: AsRef<Path> + Send + Sync> FileSystem
                 .as_os_str()
                 .as_bytes(),
         );
+        sha.update(
+            tokio::fs::canonicalize(self.work.as_ref())
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        self.upper.as_ref().display().to_string(),
+                    )
+                })?
+                .as_os_str()
+                .as_bytes(),
+        );
         Ok(sha.finalize())
     }
 }
@@ -95,7 +107,11 @@ impl OverlayGuard {
         let lower = TmpMountGuard::mount(base, ReadOnly).await?;
         let upper = TmpDir::new().await?;
         let inner_guard = MountGuard::mount(
-            &OverlayFs::new(lower.path(), upper.as_ref()),
+            &OverlayFs::new(
+                lower.path(),
+                upper.as_ref().join("upper"),
+                upper.as_ref().join("work"),
+            ),
             mountpoint,
             ReadWrite,
         )
diff --git a/core/startos/src/disk/mount/guard.rs b/core/startos/src/disk/mount/guard.rs
index dc73f5527..d08b04881 100644
--- a/core/startos/src/disk/mount/guard.rs
+++ b/core/startos/src/disk/mount/guard.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Weak};
 
-use bytes::Buf;
 use lazy_static::lazy_static;
 use models::ResultExt;
 use tokio::sync::Mutex;
@@ -13,7 +12,7 @@ use super::util::unmount;
 use crate::util::{Invoke, Never};
 use crate::Error;
 
-pub const TMP_MOUNTPOINT: &'static str = "/media/embassy/tmp";
+pub const TMP_MOUNTPOINT: &'static str = "/media/startos/tmp";
 
 #[async_trait::async_trait]
 pub trait GenericMountGuard: std::fmt::Debug + Send + Sync + 'static {
diff --git a/core/startos/src/error.rs b/core/startos/src/error.rs
index 9f0493f10..a0ca5707c 100644
--- a/core/startos/src/error.rs
+++ b/core/startos/src/error.rs
@@ -58,7 +58,7 @@ impl std::error::Error for ErrorCollection {}
 macro_rules! ensure_code {
     ($x:expr, $c:expr, $fmt:expr $(, $arg:expr)*) => {
         if !($x) {
-            return Err(crate::error::Error::new(color_eyre::eyre::eyre!($fmt, $($arg, )*), $c));
+            Err::<(), _>(crate::error::Error::new(color_eyre::eyre::eyre!($fmt, $($arg, )*), $c))?;
         }
     };
 }
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 3f7d7f1bc..361288c10 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -12,6 +12,7 @@ use tracing::instrument;
 use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
 use crate::db::model::public::ServerStatus;
+use crate::db::model::Database;
 use crate::disk::mount::util::unmount;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::prelude::*;
@@ -20,8 +21,8 @@ use crate::util::cpupower::{get_available_governors, get_preferred_governor, set
 use crate::util::Invoke;
 use crate::{Error, ARCH};
 
-pub const SYSTEM_REBUILD_PATH: &str = "/media/embassy/config/system-rebuild";
-pub const STANDBY_MODE_PATH: &str = "/media/embassy/config/standby";
+pub const SYSTEM_REBUILD_PATH: &str = "/media/startos/config/system-rebuild";
+pub const STANDBY_MODE_PATH: &str = "/media/startos/config/standby";
 
 pub async fn check_time_is_synchronized() -> Result<bool, Error> {
     Ok(String::from_utf8(
@@ -179,7 +180,7 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
 }
 
 pub struct InitResult {
-    pub db: patch_db::PatchDb,
+    pub db: TypedPatchDb<Database>,
 }
 
 #[instrument(skip_all)]
@@ -207,7 +208,7 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
             .await?;
     }
 
-    let db = cfg.db().await?;
+    let db = TypedPatchDb::<Database>::load_unchecked(cfg.db().await?);
     let peek = db.peek().await;
     tracing::info!("Opened PatchDB");
 
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index ca8f1edbd..f5cff36d9 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -6,11 +6,12 @@ use clap::{value_parser, CommandFactory, FromArgMatches, Parser};
 use color_eyre::eyre::eyre;
 use emver::VersionRange;
 use futures::{FutureExt, StreamExt};
+use itertools::Itertools;
 use patch_db::json_ptr::JsonPointer;
 use reqwest::header::{HeaderMap, CONTENT_LENGTH};
 use reqwest::Url;
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::CallRemote;
+use rpc_toolkit::HandlerArgs;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tokio::sync::oneshot;
@@ -18,10 +19,10 @@ use tracing::instrument;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
-use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::db::model::package::{ManifestPreference, PackageState, PackageStateMatchModelRef};
 use crate::prelude::*;
 use crate::progress::{FullProgress, PhasedProgressBar};
+use crate::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::S9pk;
@@ -110,7 +111,7 @@ pub struct InstallParams {
     id: PackageId,
     #[arg(short = 'm', long = "marketplace-url")]
     #[ts(type = "string | null")]
-    marketplace_url: Option<Url>,
+    registry: Option<Url>,
     #[arg(short = 'v', long = "version-spec")]
     version_spec: Option<String>,
     #[arg(long = "version-priority")]
@@ -125,7 +126,7 @@ pub async fn install(
     ctx: RpcContext,
     InstallParams {
         id,
-        marketplace_url,
+        registry,
         version_spec,
         version_priority,
     }: InstallParams,
@@ -135,15 +136,14 @@ pub async fn install(
         Some(v) => &*v,
     };
     let version: VersionRange = version_str.parse()?;
-    let marketplace_url =
-        marketplace_url.unwrap_or_else(|| crate::DEFAULT_MARKETPLACE.parse().unwrap());
+    let registry = registry.unwrap_or_else(|| crate::DEFAULT_MARKETPLACE.parse().unwrap());
     let version_priority = version_priority.unwrap_or_default();
     let s9pk = S9pk::deserialize(
         &HttpSource::new(
             ctx.client.clone(),
             format!(
                 "{}/package/v0/{}.s9pk?spec={}&version-priority={}",
-                marketplace_url, id, version, version_priority,
+                registry, id, version, version_priority,
             )
             .parse()?,
         )
@@ -188,7 +188,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                 .with_kind(ErrorKind::Database)?,
         )
         .await;
-    ctx.add_continuation(
+    ctx.rpc_continuations.add(
         progress.clone(),
         RpcContinuation::ws(
             Box::new(|mut ws| {
@@ -203,28 +203,26 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                         })?;
                         tokio::select! {
                             res = async {
-                                while let Some(rev) = sub.recv().await {
-                                    if !rev.patch.0.is_empty() { // TODO: don't send empty patches?
-                                        ws.send(Message::Text(
-                                            serde_json::to_string(&if let Some(p) = db
-                                                .peek()
-                                                .await
-                                                .as_public()
-                                                .as_package_data()
-                                                .as_idx(&id)
-                                                .and_then(|e| e.as_state_info().as_installing_info()).map(|i| i.as_progress())
-                                            {
-                                                Ok::<_, ()>(p.de()?)
-                                            } else {
-                                                let mut p = FullProgress::new();
-                                                p.overall.complete();
-                                                Ok(p)
-                                            })
-                                            .with_kind(ErrorKind::Serialization)?,
-                                        ))
-                                        .await
-                                        .with_kind(ErrorKind::Network)?;
-                                    }
+                                while let Some(_) = sub.recv().await {
+                                    ws.send(Message::Text(
+                                        serde_json::to_string(&if let Some(p) = db
+                                            .peek()
+                                            .await
+                                            .as_public()
+                                            .as_package_data()
+                                            .as_idx(&id)
+                                            .and_then(|e| e.as_state_info().as_installing_info()).map(|i| i.as_progress())
+                                        {
+                                            Ok::<_, ()>(p.de()?)
+                                        } else {
+                                            let mut p = FullProgress::new();
+                                            p.overall.complete();
+                                            Ok(p)
+                                        })
+                                        .with_kind(ErrorKind::Serialization)?,
+                                    ))
+                                    .await
+                                    .with_kind(ErrorKind::Network)?;
                                 }
                                 Ok::<_, Error>(())
                             } => res?,
@@ -322,15 +320,30 @@ impl FromArgMatches for CliInstallParams {
 }
 
 #[instrument(skip_all)]
-pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<(), RpcError> {
+pub async fn cli_install(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params,
+        ..
+    }: HandlerArgs<CliContext, CliInstallParams>,
+) -> Result<(), RpcError> {
+    let method = parent_method.into_iter().chain(method).collect_vec();
     match params {
         CliInstallParams::Sideload(path) => {
             let file = crate::s9pk::load(&ctx, path).await?;
 
             // rpc call remote sideload
             let SideloadResponse { upload, progress } = from_value::<SideloadResponse>(
-                ctx.call_remote("package.sideload", imbl_value::json!({}))
-                    .await?,
+                ctx.call_remote::<RpcContext>(
+                    &method[..method.len() - 1]
+                        .into_iter()
+                        .chain(std::iter::once(&"sideload"))
+                        .join("."),
+                    imbl_value::json!({}),
+                )
+                .await?,
             )?;
 
             let upload = async {
@@ -387,7 +400,7 @@ pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<()
             upload?;
         }
         CliInstallParams::Marketplace(params) => {
-            ctx.call_remote("package.install", to_value(&params)?)
+            ctx.call_remote::<RpcContext>(&method.join("."), to_value(&params)?)
                 .await?;
         }
     }
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index d6dad2c87..3152fcab3 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -28,7 +28,6 @@ pub mod bins;
 pub mod config;
 pub mod context;
 pub mod control;
-pub mod core;
 pub mod db;
 pub mod dependencies;
 pub mod developer;
@@ -49,6 +48,7 @@ pub mod prelude;
 pub mod progress;
 pub mod properties;
 pub mod registry;
+pub mod rpc_continuations;
 pub mod s9pk;
 pub mod service;
 pub mod setup;
@@ -71,12 +71,14 @@ pub use error::{Error, ErrorKind, ResultExt};
 use imbl_value::Value;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{
-    command, from_fn, from_fn_async, from_fn_blocking, AnyContext, HandlerExt, ParentHandler,
+    from_fn, from_fn_async, from_fn_blocking, CallRemoteHandler, Context, Empty, HandlerExt,
+    ParentHandler,
 };
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::context::CliContext;
+use crate::context::{CliContext, DiagnosticContext, InstallContext, RpcContext, SetupContext};
+use crate::registry::context::{RegistryContext, RegistryUrlParams};
 use crate::util::serde::HandlerExtSerde;
 
 #[derive(Deserialize, Serialize, Parser, TS)]
@@ -86,102 +88,117 @@ pub struct EchoParams {
     message: String,
 }
 
-pub fn echo(_: AnyContext, EchoParams { message }: EchoParams) -> Result<String, RpcError> {
+pub fn echo<C: Context>(_: C, EchoParams { message }: EchoParams) -> Result<String, RpcError> {
     Ok(message)
 }
 
-pub fn main_api() -> ParentHandler {
+pub fn main_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("git-info", from_fn(version::git_info))
+        .subcommand::<C, _>("git-info", from_fn(version::git_info))
         .subcommand(
             "echo",
-            from_fn(echo)
+            from_fn(echo::<RpcContext>)
                 .with_metadata("authenticated", Value::Bool(false))
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
-        .subcommand("init", from_fn_blocking(developer::init).no_display())
-        .subcommand("server", server())
-        .subcommand("package", package())
-        .subcommand("net", net::net())
-        .subcommand("auth", auth::auth())
-        .subcommand("db", db::db())
-        .subcommand("ssh", ssh::ssh())
-        .subcommand("wifi", net::wifi::wifi())
-        .subcommand("disk", disk::disk())
-        .subcommand("notification", notifications::notification())
-        .subcommand("backup", backup::backup())
-        .subcommand("marketplace", registry::marketplace::marketplace())
-        .subcommand("lxc", lxc::lxc())
+        .subcommand("server", server::<C>())
+        .subcommand("package", package::<C>())
+        .subcommand("net", net::net::<C>())
+        .subcommand("auth", auth::auth::<C>())
+        .subcommand("db", db::db::<C>())
+        .subcommand("ssh", ssh::ssh::<C>())
+        .subcommand("wifi", net::wifi::wifi::<C>())
+        .subcommand("disk", disk::disk::<C>())
+        .subcommand("notification", notifications::notification::<C>())
+        .subcommand("backup", backup::backup::<C>())
+        .subcommand(
+            "registry",
+            CallRemoteHandler::<RpcContext, _, _, RegistryUrlParams>::new(
+                registry::registry_api::<RegistryContext>(),
+            )
+            .no_cli(),
+        )
+        .subcommand("lxc", lxc::lxc::<C>())
         .subcommand("s9pk", s9pk::rpc::s9pk())
+        .subcommand("util", util::rpc::util::<C>())
 }
 
-pub fn server() -> ParentHandler {
+pub fn server<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "time",
             from_fn_async(system::time)
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                .with_custom_display_fn(|handle, result| {
                     Ok(system::display_time(handle.params, result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand("experimental", system::experimental::<C>())
+        .subcommand("logs", system::logs::<RpcContext>())
+        .subcommand(
+            "logs",
+            from_fn_async(logs::cli_logs::<RpcContext, Empty>).no_display(),
+        )
+        .subcommand("kernel-logs", system::kernel_logs::<RpcContext>())
+        .subcommand(
+            "kernel-logs",
+            from_fn_async(logs::cli_logs::<RpcContext, Empty>).no_display(),
         )
-        .subcommand("experimental", system::experimental())
-        .subcommand("logs", system::logs())
-        .subcommand("kernel-logs", system::kernel_logs())
         .subcommand(
             "metrics",
             from_fn_async(system::metrics)
                 .with_display_serializable()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "shutdown",
             from_fn_async(shutdown::shutdown)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "restart",
             from_fn_async(shutdown::restart)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "rebuild",
             from_fn_async(shutdown::rebuild)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "update",
             from_fn_async(update::update_system)
                 .with_metadata("sync_db", Value::Bool(true))
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
-                    Ok(update::display_update_result(handle.params, result))
-                })
-                .with_remote_cli::<CliContext>(),
+                .no_cli(),
+        )
+        .subcommand(
+            "update",
+            from_fn_async(update::cli_update_system).no_display(),
         )
         .subcommand(
             "update-firmware",
-            from_fn_async(firmware::update_firmware)
-                .with_custom_display_fn::<AnyContext, _>(|_handle, result| {
+            from_fn_async(|_: RpcContext| firmware::update_firmware())
+                .with_custom_display_fn(|_handle, result| {
                     Ok(firmware::display_firmware_update_result(result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
-pub fn package() -> ParentHandler {
+pub fn package<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "action",
             from_fn_async(action::action)
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                .with_custom_display_fn(|handle, result| {
                     Ok(action::display_action_result(handle.params, result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "install",
@@ -196,47 +213,51 @@ pub fn package() -> ParentHandler {
             from_fn_async(install::uninstall)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
             from_fn_async(install::list)
                 .with_display_serializable()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
-        .subcommand("config", config::config())
+        .subcommand("config", config::config::<C>())
         .subcommand(
             "start",
             from_fn_async(control::start)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "stop",
             from_fn_async(control::stop)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "restart",
             from_fn_async(control::restart)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand("logs", logs::package_logs())
+        .subcommand(
+            "logs",
+            from_fn_async(logs::cli_logs::<RpcContext, logs::PackageIdParams>).no_display(),
         )
-        .subcommand("logs", logs::logs())
         .subcommand(
             "properties",
             from_fn_async(properties::properties)
-                .with_custom_display_fn::<AnyContext, _>(|_handle, result| {
+                .with_custom_display_fn(|_handle, result| {
                     Ok(properties::display_properties(result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
-        .subcommand("dependency", dependencies::dependency())
-        .subcommand("backup", backup::package_backup())
+        .subcommand("dependency", dependencies::dependency::<C>())
+        .subcommand("backup", backup::package_backup::<C>())
         .subcommand("connect", from_fn_async(service::connect_rpc).no_cli())
         .subcommand(
             "connect",
@@ -244,32 +265,51 @@ pub fn package() -> ParentHandler {
         )
 }
 
-pub fn diagnostic_api() -> ParentHandler {
+pub fn diagnostic_api() -> ParentHandler<DiagnosticContext> {
     ParentHandler::new()
-        .subcommand(
+        .subcommand::<DiagnosticContext, _>(
             "git-info",
             from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
         )
-        .subcommand("echo", from_fn(echo).with_remote_cli::<CliContext>())
-        .subcommand("diagnostic", diagnostic::diagnostic())
+        .subcommand(
+            "echo",
+            from_fn(echo::<DiagnosticContext>).with_call_remote::<CliContext>(),
+        )
+        .subcommand("diagnostic", diagnostic::diagnostic::<DiagnosticContext>())
 }
 
-pub fn setup_api() -> ParentHandler {
+pub fn setup_api() -> ParentHandler<SetupContext> {
     ParentHandler::new()
-        .subcommand(
+        .subcommand::<SetupContext, _>(
             "git-info",
             from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
         )
-        .subcommand("echo", from_fn(echo).with_remote_cli::<CliContext>())
-        .subcommand("setup", setup::setup())
+        .subcommand(
+            "echo",
+            from_fn(echo::<SetupContext>).with_call_remote::<CliContext>(),
+        )
+        .subcommand("setup", setup::setup::<SetupContext>())
 }
 
-pub fn install_api() -> ParentHandler {
+pub fn install_api() -> ParentHandler<InstallContext> {
     ParentHandler::new()
-        .subcommand(
+        .subcommand::<InstallContext, _>(
             "git-info",
             from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
         )
-        .subcommand("echo", from_fn(echo).with_remote_cli::<CliContext>())
-        .subcommand("install", os_install::install())
+        .subcommand(
+            "echo",
+            from_fn(echo::<InstallContext>).with_call_remote::<CliContext>(),
+        )
+        .subcommand("install", os_install::install::<InstallContext>())
+}
+
+pub fn expanded_api() -> ParentHandler<CliContext> {
+    main_api()
+        .subcommand("init", from_fn_blocking(developer::init).no_display())
+        .subcommand("pubkey", from_fn_blocking(developer::pubkey))
+        .subcommand("diagnostic", diagnostic::diagnostic::<CliContext>())
+        .subcommand("setup", setup::setup::<CliContext>())
+        .subcommand("install", os_install::install::<CliContext>())
+        .subcommand("registry", registry::registry_api::<CliContext>())
 }
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index d8b7c898f..340b04b8b 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -4,13 +4,17 @@ use std::time::{Duration, UNIX_EPOCH};
 
 use axum::extract::ws::{self, WebSocket};
 use chrono::{DateTime, Utc};
-use clap::Parser;
+use clap::{Args, FromArgMatches, Parser};
 use color_eyre::eyre::eyre;
 use futures::stream::BoxStream;
-use futures::{FutureExt, Stream, StreamExt, TryStreamExt};
+use futures::{Future, FutureExt, Stream, StreamExt, TryStreamExt};
+use itertools::Itertools;
 use models::PackageId;
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{command, from_fn_async, CallRemote, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{
+    from_fn_async, CallRemote, Context, Empty, HandlerArgs, HandlerExt, HandlerFor, ParentHandler,
+};
+use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio::process::{Child, Command};
@@ -19,10 +23,10 @@ use tokio_tungstenite::tungstenite::Message;
 use tracing::instrument;
 
 use crate::context::{CliContext, RpcContext};
-use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::error::ResultExt;
 use crate::lxc::ContainerId;
 use crate::prelude::*;
+use crate::rpc_continuations::{RequestGuid, RpcContinuation, RpcContinuations};
 use crate::util::serde::Reversible;
 use crate::util::Invoke;
 
@@ -211,7 +215,6 @@ fn deserialize_log_message<'de, D: serde::de::Deserializer<'de>>(
 pub enum LogSource {
     Kernel,
     Unit(&'static str),
-    System,
     Container(ContainerId),
 }
 
@@ -220,98 +223,176 @@ pub const SYSTEM_UNIT: &str = "startd";
 #[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
-pub struct LogsParam {
+pub struct PackageIdParams {
     id: PackageId,
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+pub struct LogsParams<Extra: FromArgMatches + Args = Empty> {
+    #[command(flatten)]
+    #[serde(flatten)]
+    extra: Extra,
     #[arg(short = 'l', long = "limit")]
     limit: Option<usize>,
-    #[arg(short = 'c', long = "cursor")]
+    #[arg(short = 'c', long = "cursor", conflicts_with = "follow")]
     cursor: Option<String>,
-    #[arg(short = 'B', long = "before")]
+    #[arg(short = 'B', long = "before", conflicts_with = "follow")]
     #[serde(default)]
     before: bool,
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+pub struct CliLogsParams<Extra: FromArgMatches + Args = Empty> {
+    #[command(flatten)]
+    #[serde(flatten)]
+    rpc_params: LogsParams<Extra>,
     #[arg(short = 'f', long = "follow")]
     #[serde(default)]
     follow: bool,
 }
 
-pub fn logs() -> ParentHandler<LogsParam> {
-    ParentHandler::<LogsParam>::new()
-        .root_handler(
-            from_fn_async(cli_logs)
-                .no_display()
-                .with_inherited(|params, _| params),
-        )
+#[allow(private_bounds)]
+pub fn logs<
+    C: Context + AsRef<RpcContinuations>,
+    Extra: FromArgMatches + Serialize + DeserializeOwned + Args + Send + Sync + 'static,
+>(
+    source: impl for<'a> LogSourceFn<'a, C, Extra>,
+) -> ParentHandler<C, LogsParams<Extra>> {
+    ParentHandler::new()
         .root_handler(
-            from_fn_async(logs_nofollow)
+            logs_nofollow::<C, Extra>(source.clone())
                 .with_inherited(|params, _| params)
                 .no_cli(),
         )
         .subcommand(
             "follow",
-            from_fn_async(logs_follow)
+            logs_follow::<C, Extra>(source)
                 .with_inherited(|params, _| params)
                 .no_cli(),
         )
 }
-pub async fn cli_logs(
-    ctx: CliContext,
-    _: Empty,
-    LogsParam {
-        id,
-        limit,
-        cursor,
-        before,
-        follow,
-    }: LogsParam,
-) -> Result<(), RpcError> {
+
+pub async fn cli_logs<RemoteContext, Extra>(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params: CliLogsParams { rpc_params, follow },
+        ..
+    }: HandlerArgs<CliContext, CliLogsParams<Extra>>,
+) -> Result<(), RpcError>
+where
+    CliContext: CallRemote<RemoteContext>,
+    Extra: FromArgMatches + Args + Serialize + Send + Sync,
+{
+    let method = parent_method
+        .into_iter()
+        .chain(method)
+        .chain(follow.then_some("follow"))
+        .join(".");
+
     if follow {
-        if cursor.is_some() {
-            return Err(RpcError::from(Error::new(
-                eyre!("The argument '--cursor <cursor>' cannot be used with '--follow'"),
-                crate::ErrorKind::InvalidRequest,
-            )));
-        }
-        if before {
-            return Err(RpcError::from(Error::new(
-                eyre!("The argument '--before' cannot be used with '--follow'"),
-                crate::ErrorKind::InvalidRequest,
-            )));
+        let res = from_value::<LogFollowResponse>(
+            ctx.call_remote::<RemoteContext>(&method, to_value(&rpc_params)?)
+                .await?,
+        )?;
+
+        let mut stream = ctx.ws_continuation(res.guid).await?;
+        while let Some(log) = stream.try_next().await? {
+            if let Message::Text(log) = log {
+                println!("{}", serde_json::from_str::<LogEntry>(&log)?);
+            }
         }
-        cli_logs_generic_follow(ctx, "package.logs.follow", Some(id), limit).await
     } else {
-        cli_logs_generic_nofollow(ctx, "package.logs", Some(id), limit, cursor, before).await
+        let res = from_value::<LogResponse>(
+            ctx.call_remote::<RemoteContext>(&method, to_value(&rpc_params)?)
+                .await?,
+        )?;
+
+        for entry in res.entries.iter() {
+            println!("{}", entry);
+        }
     }
+
+    Ok(())
 }
-pub async fn logs_nofollow(
-    ctx: RpcContext,
-    _: Empty,
-    LogsParam {
-        id,
-        limit,
-        cursor,
-        before,
-        ..
-    }: LogsParam,
-) -> Result<LogResponse, Error> {
-    let container_id = ctx
-        .services
-        .get(&id)
-        .await
-        .as_ref()
-        .map(|x| x.container_id())
-        .ok_or_else(|| {
-            Error::new(
-                eyre!("No service found with id: {}", id),
-                ErrorKind::NotFound,
-            )
-        })??;
-    fetch_logs(LogSource::Container(container_id), limit, cursor, before).await
+
+trait LogSourceFn<'a, Context, Extra>: Clone + Send + Sync + 'static {
+    type Fut: Future<Output = Result<LogSource, Error>> + Send + 'a;
+    fn call(&self, ctx: &'a Context, extra: Extra) -> Self::Fut;
 }
-pub async fn logs_follow(
-    ctx: RpcContext,
-    _: Empty,
-    LogsParam { id, limit, .. }: LogsParam,
-) -> Result<LogFollowResponse, Error> {
+
+impl<'a, C: Context, Extra, F, Fut> LogSourceFn<'a, C, Extra> for F
+where
+    F: Fn(&'a C, Extra) -> Fut + Clone + Send + Sync + 'static,
+    Fut: Future<Output = Result<LogSource, Error>> + Send + 'a,
+{
+    type Fut = Fut;
+    fn call(&self, ctx: &'a C, extra: Extra) -> Self::Fut {
+        self(ctx, extra)
+    }
+}
+
+fn logs_nofollow<C, Extra>(
+    f: impl for<'a> LogSourceFn<'a, C, Extra>,
+) -> impl HandlerFor<C, Params = Empty, InheritedParams = LogsParams<Extra>, Ok = LogResponse, Err = Error>
+where
+    C: Context,
+    Extra: FromArgMatches + Args + Send + Sync + 'static,
+{
+    from_fn_async(
+        move |HandlerArgs {
+                  context,
+                  inherited_params:
+                      LogsParams {
+                          extra,
+                          limit,
+                          cursor,
+                          before,
+                      },
+                  ..
+              }: HandlerArgs<C, Empty, LogsParams<Extra>>| {
+            let f = f.clone();
+            async move { fetch_logs(f.call(&context, extra).await?, limit, cursor, before).await }
+        },
+    )
+}
+
+fn logs_follow<
+    C: Context + AsRef<RpcContinuations>,
+    Extra: FromArgMatches + Args + Send + Sync + 'static,
+>(
+    f: impl for<'a> LogSourceFn<'a, C, Extra>,
+) -> impl HandlerFor<
+    C,
+    Params = Empty,
+    InheritedParams = LogsParams<Extra>,
+    Ok = LogFollowResponse,
+    Err = Error,
+> {
+    from_fn_async(
+        move |HandlerArgs {
+                  context,
+                  inherited_params: LogsParams { extra, limit, .. },
+                  ..
+              }: HandlerArgs<C, Empty, LogsParams<Extra>>| {
+            let f = f.clone();
+            async move {
+                let src = f.call(&context, extra).await?;
+                follow_logs(context, src, limit).await
+            }
+        },
+    )
+}
+
+async fn get_package_id(
+    ctx: &RpcContext,
+    PackageIdParams { id }: PackageIdParams,
+) -> Result<LogSource, Error> {
     let container_id = ctx
         .services
         .get(&id)
@@ -324,62 +405,11 @@ pub async fn logs_follow(
                 ErrorKind::NotFound,
             )
         })??;
-    follow_logs(ctx, LogSource::Container(container_id), limit).await
-}
-
-pub async fn cli_logs_generic_nofollow(
-    ctx: CliContext,
-    method: &str,
-    id: Option<PackageId>,
-    limit: Option<usize>,
-    cursor: Option<String>,
-    before: bool,
-) -> Result<(), RpcError> {
-    let res = from_value::<LogResponse>(
-        ctx.call_remote(
-            method,
-            imbl_value::json!({
-                "id": id,
-                "limit": limit,
-                "cursor": cursor,
-                "before": before,
-            }),
-        )
-        .await?,
-    )?;
-
-    for entry in res.entries.iter() {
-        println!("{}", entry);
-    }
-
-    Ok(())
+    Ok(LogSource::Container(container_id))
 }
 
-pub async fn cli_logs_generic_follow(
-    ctx: CliContext,
-    method: &str,
-    id: Option<PackageId>,
-    limit: Option<usize>,
-) -> Result<(), RpcError> {
-    let res = from_value::<LogFollowResponse>(
-        ctx.call_remote(
-            method,
-            imbl_value::json!({
-                "id": id,
-                "limit": limit,
-            }),
-        )
-        .await?,
-    )?;
-
-    let mut stream = ctx.ws_continuation(res.guid).await?;
-    while let Some(log) = stream.try_next().await? {
-        if let Message::Text(log) = log {
-            println!("{}", serde_json::from_str::<LogEntry>(&log)?);
-        }
-    }
-
-    Ok(())
+pub fn package_logs() -> ParentHandler<RpcContext, LogsParams<PackageIdParams>> {
+    logs::<RpcContext, PackageIdParams>(get_package_id)
 }
 
 pub async fn journalctl(
@@ -474,10 +504,6 @@ fn gen_journalctl_command(id: &LogSource) -> Command {
             cmd.arg("-u");
             cmd.arg(id);
         }
-        LogSource::System => {
-            cmd.arg("-u");
-            cmd.arg(SYSTEM_UNIT);
-        }
         LogSource::Container(_container_id) => {
             cmd.arg("-u").arg("container-runtime.service");
         }
@@ -533,8 +559,8 @@ pub async fn fetch_logs(
 }
 
 #[instrument(skip_all)]
-pub async fn follow_logs(
-    ctx: RpcContext,
+pub async fn follow_logs<Context: AsRef<RpcContinuations>>(
+    ctx: Context,
     id: LogSource,
     limit: Option<usize>,
 ) -> Result<LogFollowResponse, Error> {
@@ -556,23 +582,24 @@ pub async fn follow_logs(
     }
 
     let guid = RequestGuid::new();
-    ctx.add_continuation(
-        guid.clone(),
-        RpcContinuation::ws(
-            Box::new(move |socket| {
-                ws_handler(first_entry, stream, socket)
-                    .map(|x| match x {
-                        Ok(_) => (),
-                        Err(e) => {
-                            tracing::error!("Error in log stream: {}", e);
-                        }
-                    })
-                    .boxed()
-            }),
-            Duration::from_secs(30),
-        ),
-    )
-    .await;
+    ctx.as_ref()
+        .add(
+            guid.clone(),
+            RpcContinuation::ws(
+                Box::new(move |socket| {
+                    ws_handler(first_entry, stream, socket)
+                        .map(|x| match x {
+                            Ok(_) => (),
+                            Err(e) => {
+                                tracing::error!("Error in log stream: {}", e);
+                            }
+                        })
+                        .boxed()
+                }),
+                Duration::from_secs(30),
+            ),
+        )
+        .await;
     Ok(LogFollowResponse { start_cursor, guid })
 }
 
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 9dfdff7f9..084364c4a 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -12,8 +12,8 @@ use imbl_value::{InOMap, InternedString};
 use models::InvalidId;
 use rpc_toolkit::yajrc::{RpcError, RpcResponse};
 use rpc_toolkit::{
-    from_fn_async, AnyContext, CallRemoteHandler, GenericRpcMethod, Handler, HandlerArgs,
-    HandlerExt, ParentHandler, RpcRequest,
+    from_fn_async, CallRemoteHandler, Context, Empty, GenericRpcMethod, HandlerArgs, HandlerExt,
+    HandlerFor, ParentHandler, RpcRequest,
 };
 use rustyline_async::{ReadlineEvent, SharedWriter};
 use serde::{Deserialize, Serialize};
@@ -25,7 +25,6 @@ use tokio::time::Instant;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
-use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
@@ -34,6 +33,7 @@ use crate::disk::mount::filesystem::{MountType, ReadWrite};
 use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::disk::mount::util::unmount;
 use crate::prelude::*;
+use crate::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::util::clap::FromStrParser;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::{new_guid, Invoke};
@@ -370,16 +370,16 @@ impl Drop for LxcContainer {
 #[derive(Default, Serialize)]
 pub struct LxcConfig {}
 
-pub fn lxc() -> ParentHandler {
+pub fn lxc<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "create",
-            from_fn_async(create).with_remote_cli::<CliContext>(),
+            from_fn_async(create).with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
             from_fn_async(list)
-                .with_custom_display_fn::<AnyContext, _>(|_, res| {
+                .with_custom_display_fn(|_, res| {
                     use prettytable::*;
                     let mut table = table!([bc => "GUID"]);
                     for guid in res {
@@ -388,13 +388,13 @@ pub fn lxc() -> ParentHandler {
                     table.printstd();
                     Ok(())
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand("connect", from_fn_async(connect_rpc).no_cli())
         .subcommand("connect", from_fn_async(connect_rpc_cli).no_display())
@@ -448,59 +448,59 @@ pub async fn connect(ctx: &RpcContext, container: &LxcContainer) -> Result<Reque
 
     let rpc = container.connect_rpc(Some(Duration::from_secs(30))).await?;
     let guid = RequestGuid::new();
-    ctx.add_continuation(
-        guid.clone(),
-        RpcContinuation::ws(
-            Box::new(|mut ws| {
-                async move {
-                    if let Err(e) = async {
-                        loop {
-                            match ws.next().await {
-                                None => break,
-                                Some(Ok(Message::Text(txt))) => {
-                                    let mut id = None;
-                                    let result = async {
-                                        let req: RpcRequest =
-                                            serde_json::from_str(&txt).map_err(|e| RpcError {
-                                                data: Some(serde_json::Value::String(
-                                                    e.to_string(),
-                                                )),
-                                                ..rpc_toolkit::yajrc::PARSE_ERROR
-                                            })?;
-                                        id = req.id;
-                                        rpc.request(req.method, req.params).await
+    ctx.rpc_continuations
+        .add(
+            guid.clone(),
+            RpcContinuation::ws(
+                Box::new(|mut ws| {
+                    async move {
+                        if let Err(e) = async {
+                            loop {
+                                match ws.next().await {
+                                    None => break,
+                                    Some(Ok(Message::Text(txt))) => {
+                                        let mut id = None;
+                                        let result = async {
+                                            let req: RpcRequest = serde_json::from_str(&txt)
+                                                .map_err(|e| RpcError {
+                                                    data: Some(serde_json::Value::String(
+                                                        e.to_string(),
+                                                    )),
+                                                    ..rpc_toolkit::yajrc::PARSE_ERROR
+                                                })?;
+                                            id = req.id;
+                                            rpc.request(req.method, req.params).await
+                                        }
+                                        .await;
+                                        ws.send(Message::Text(
+                                            serde_json::to_string(
+                                                &RpcResponse::<GenericRpcMethod> { id, result },
+                                            )
+                                            .with_kind(ErrorKind::Serialization)?,
+                                        ))
+                                        .await
+                                        .with_kind(ErrorKind::Network)?;
+                                    }
+                                    Some(Ok(_)) => (),
+                                    Some(Err(e)) => {
+                                        return Err(Error::new(e, ErrorKind::Network));
                                     }
-                                    .await;
-                                    ws.send(Message::Text(
-                                        serde_json::to_string(&RpcResponse::<GenericRpcMethod> {
-                                            id,
-                                            result,
-                                        })
-                                        .with_kind(ErrorKind::Serialization)?,
-                                    ))
-                                    .await
-                                    .with_kind(ErrorKind::Network)?;
-                                }
-                                Some(Ok(_)) => (),
-                                Some(Err(e)) => {
-                                    return Err(Error::new(e, ErrorKind::Network));
                                 }
                             }
+                            Ok::<_, Error>(())
+                        }
+                        .await
+                        {
+                            tracing::error!("{e}");
+                            tracing::debug!("{e:?}");
                         }
-                        Ok::<_, Error>(())
-                    }
-                    .await
-                    {
-                        tracing::error!("{e}");
-                        tracing::debug!("{e:?}");
                     }
-                }
-                .boxed()
-            }),
-            Duration::from_secs(30),
-        ),
-    )
-    .await;
+                    .boxed()
+                }),
+                Duration::from_secs(30),
+            ),
+        )
+        .await;
     Ok(guid)
 }
 
@@ -614,11 +614,25 @@ pub async fn connect_cli(ctx: &CliContext, guid: RequestGuid) -> Result<(), Erro
 }
 
 pub async fn connect_rpc_cli(
-    handle_args: HandlerArgs<CliContext, ConnectParams>,
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        params,
+        inherited_params,
+        raw_params,
+    }: HandlerArgs<CliContext, ConnectParams>,
 ) -> Result<(), Error> {
-    let ctx = handle_args.context.clone();
-    let guid = CallRemoteHandler::<CliContext, _>::new(from_fn_async(connect_rpc))
-        .handle_async(handle_args)
+    let ctx = context.clone();
+    let guid = CallRemoteHandler::<CliContext, _, _>::new(from_fn_async(connect_rpc))
+        .handle_async(HandlerArgs {
+            context,
+            parent_method,
+            method,
+            params: rpc_toolkit::util::Flat(params, Empty {}),
+            inherited_params,
+            raw_params,
+        })
         .await?;
 
     connect_cli(&ctx, guid).await
diff --git a/core/startos/src/middleware/auth.rs b/core/startos/src/middleware/auth.rs
index 30ae56744..1852c4890 100644
--- a/core/startos/src/middleware/auth.rs
+++ b/core/startos/src/middleware/auth.rs
@@ -245,7 +245,6 @@ impl Borrow<str> for HashSessionToken {
 }
 
 #[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
 pub struct Metadata {
     #[serde(default = "const_true")]
     authenticated: bool,
@@ -274,7 +273,6 @@ impl Auth {
         }
     }
 }
-#[async_trait::async_trait]
 impl Middleware<RpcContext> for Auth {
     type Metadata = Metadata;
     async fn process_http_request(
@@ -306,7 +304,7 @@ impl Middleware<RpcContext> for Auth {
                 });
             }
             if let Some(user_agent) = self.user_agent.as_ref().and_then(|h| h.to_str().ok()) {
-                request.params["user-agent"] = Value::String(Arc::new(user_agent.to_owned()))
+                request.params["__auth_userAgent"] = Value::String(Arc::new(user_agent.to_owned()))
                 // TODO: will this panic?
             }
         } else if metadata.authenticated {
@@ -318,7 +316,7 @@ impl Middleware<RpcContext> for Auth {
                     })
                 }
                 Ok(HasValidSession(SessionType::Session(s))) if metadata.get_session => {
-                    request.params["session"] =
+                    request.params["__auth_session"] =
                         Value::String(Arc::new(s.hashed().deref().to_owned()));
                     // TODO: will this panic?
                 }
diff --git a/core/startos/src/middleware/cors.rs b/core/startos/src/middleware/cors.rs
index 60a472cdd..a8c406a8a 100644
--- a/core/startos/src/middleware/cors.rs
+++ b/core/startos/src/middleware/cors.rs
@@ -44,8 +44,7 @@ impl Cors {
         }
     }
 }
-#[async_trait::async_trait]
-impl<Context: Send + 'static> Middleware<Context> for Cors {
+impl<Context: Send + Sync + 'static> Middleware<Context> for Cors {
     type Metadata = Empty;
     async fn process_http_request(
         &mut self,
diff --git a/core/startos/src/middleware/db.rs b/core/startos/src/middleware/db.rs
index b8cdaa231..dca0418e5 100644
--- a/core/startos/src/middleware/db.rs
+++ b/core/startos/src/middleware/db.rs
@@ -23,7 +23,6 @@ impl SyncDb {
     }
 }
 
-#[async_trait::async_trait]
 impl Middleware<RpcContext> for SyncDb {
     type Metadata = Metadata;
     async fn process_rpc_request(
diff --git a/core/startos/src/middleware/diagnostic.rs b/core/startos/src/middleware/diagnostic.rs
index f779d632f..2a7467e34 100644
--- a/core/startos/src/middleware/diagnostic.rs
+++ b/core/startos/src/middleware/diagnostic.rs
@@ -14,7 +14,6 @@ impl DiagnosticMode {
     }
 }
 
-#[async_trait::async_trait]
 impl Middleware<DiagnosticContext> for DiagnosticMode {
     type Metadata = Empty;
     async fn process_rpc_request(
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index b0d538e81..104cda961 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -3,7 +3,7 @@ use std::net::IpAddr;
 
 use clap::Parser;
 use futures::TryStreamExt;
-use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context,  HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::sync::RwLock;
 use ts_rs::TS;
@@ -53,12 +53,12 @@ pub async fn init_ips() -> Result<BTreeMap<String, IpInfo>, Error> {
 }
 
 // #[command(subcommands(update))]
-pub fn dhcp() -> ParentHandler {
+pub fn dhcp<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand(
         "update",
         from_fn_async::<_, _, (), Error, (RpcContext, UpdateParams)>(update)
             .no_display()
-            .with_remote_cli::<CliContext>(),
+            .with_call_remote::<CliContext>(),
     )
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs
index aaf019e66..e55da4206 100644
--- a/core/startos/src/net/mod.rs
+++ b/core/startos/src/net/mod.rs
@@ -1,4 +1,4 @@
-use rpc_toolkit::ParentHandler;
+use rpc_toolkit::{Context, ParentHandler};
 
 pub mod dhcp;
 pub mod dns;
@@ -18,8 +18,8 @@ pub mod wifi;
 
 pub const PACKAGE_CERT_PATH: &str = "/var/lib/embassy/ssl";
 
-pub fn net() -> ParentHandler {
+pub fn net<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("tor", tor::tor())
-        .subcommand("dhcp", dhcp::dhcp())
+        .subcommand("tor", tor::tor::<C>())
+        .subcommand("dhcp", dhcp::dhcp::<C>())
 }
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index 97f38567d..aae98ae96 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -6,12 +6,10 @@ use color_eyre::eyre::eyre;
 use imbl::OrdMap;
 use lazy_format::lazy_format;
 use models::{HostId, OptionExt, PackageId};
-use patch_db::PatchDb;
-use tokio::sync::Mutex;
 use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
 
-use crate::db::prelude::PatchDbExt;
+use crate::db::model::Database;
 use crate::error::ErrorCollection;
 use crate::hostname::Hostname;
 use crate::net::dns::DnsController;
@@ -21,11 +19,12 @@ use crate::net::host::binding::{AddSslOptions, BindOptions};
 use crate::net::host::{Host, HostKind};
 use crate::net::tor::TorController;
 use crate::net::vhost::{AlpnInfo, VHostController};
+use crate::prelude::*;
 use crate::util::serde::MaybeUtf8String;
-use crate::{Error, HOST_IP};
+use crate::HOST_IP;
 
 pub struct NetController {
-    db: PatchDb,
+    db: TypedPatchDb<Database>,
     pub(super) tor: TorController,
     pub(super) vhost: VHostController,
     pub(super) dns: DnsController,
@@ -36,7 +35,7 @@ pub struct NetController {
 impl NetController {
     #[instrument(skip_all)]
     pub async fn init(
-        db: PatchDb,
+        db: TypedPatchDb<Database>,
         tor_control: SocketAddr,
         tor_socks: SocketAddr,
         dns_bind: &[SocketAddr],
@@ -394,14 +393,23 @@ impl NetService {
     pub fn get_ext_port(&self, host_id: HostId, internal_port: u16) -> Result<u16, Error> {
         let host_id_binds = self.binds.get_key_value(&host_id);
         match host_id_binds {
-            Some((id, binds)) => {
+            Some((_, binds)) => {
                 if let Some(ext_port_info) = binds.lan.get(&internal_port) {
                     Ok(ext_port_info.0)
                 } else {
-                    Err(Error::new(eyre!("Internal Port {} not found in NetService binds", internal_port), crate::ErrorKind::NotFound))
+                    Err(Error::new(
+                        eyre!(
+                            "Internal Port {} not found in NetService binds",
+                            internal_port
+                        ),
+                        crate::ErrorKind::NotFound,
+                    ))
                 }
-            },
-            None => Err(Error::new(eyre!("HostID {} not found in NetService binds", host_id), crate::ErrorKind::NotFound))
+            }
+            None => Err(Error::new(
+                eyre!("HostID {} not found in NetService binds", host_id),
+                crate::ErrorKind::NotFound,
+            )),
         }
     }
 }
diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index 245881c55..382006072 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -17,7 +17,6 @@ use openssl::x509::{X509Builder, X509Extension, X509NameBuilder, X509};
 use openssl::*;
 use patch_db::HasModel;
 use serde::{Deserialize, Serialize};
-use tokio::sync::Mutex;
 use tracing::instrument;
 
 use crate::account::AccountInfo;
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index fa71672b3..85737598b 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -24,18 +24,19 @@ use tokio::io::BufReader;
 use tokio_util::io::ReaderStream;
 
 use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext};
-use crate::core::rpc_continuations::RequestGuid;
 use crate::db::subscribe;
 use crate::hostname::Hostname;
 use crate::middleware::auth::{Auth, HasValidSession};
 use crate::middleware::cors::Cors;
 use crate::middleware::db::SyncDb;
 use crate::middleware::diagnostic::DiagnosticMode;
+use crate::rpc_continuations::RequestGuid;
 use crate::{diagnostic_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt};
 
 const NOT_FOUND: &[u8] = b"Not Found";
 const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
 const NOT_AUTHORIZED: &[u8] = b"Not Authorized";
+const INTERNAL_SERVER_ERROR: &[u8] = b"Internal Server Error";
 
 #[cfg(all(feature = "daemon", not(feature = "test")))]
 const EMBEDDED_UIS: Dir<'_> =
@@ -112,7 +113,7 @@ pub fn main_ui_server_router(ctx: RpcContext) -> Router {
         .route("/rpc/*path", {
             let ctx = ctx.clone();
             post(
-                Server::new(move || ready(Ok(ctx.clone())), main_api())
+                Server::new(move || ready(Ok(ctx.clone())), main_api::<RpcContext>())
                     .middleware(Cors::new())
                     .middleware(Auth::new())
                     .middleware(SyncDb::new()),
@@ -140,7 +141,7 @@ pub fn main_ui_server_router(ctx: RpcContext) -> Router {
                             tracing::debug!("No Guid Path");
                             bad_request()
                         }
-                        Some(guid) => match ctx.get_ws_continuation_handler(&guid).await {
+                        Some(guid) => match ctx.rpc_continuations.get_ws_handler(&guid).await {
                             Some(cont) => ws.on_upgrade(cont),
                             _ => not_found(),
                         },
@@ -163,7 +164,7 @@ pub fn main_ui_server_router(ctx: RpcContext) -> Router {
                             tracing::debug!("No Guid Path");
                             bad_request()
                         }
-                        Some(guid) => match ctx.get_rest_continuation_handler(&guid).await {
+                        Some(guid) => match ctx.rpc_continuations.get_rest_handler(&guid).await {
                             None => not_found(),
                             Some(cont) => cont(request).await.unwrap_or_else(server_error),
                         },
@@ -216,7 +217,7 @@ async fn if_authorized<
 ) -> Result<Response, Error> {
     if let Err(e) = HasValidSession::from_header(parts.headers.get(http::header::COOKIE), ctx).await
     {
-        un_authorized(e, parts.uri.path())
+        Ok(unauthorized(e, parts.uri.path()))
     } else {
         f().await
     }
@@ -305,17 +306,17 @@ async fn main_start_os_ui(req: Request, ctx: RpcContext) -> Result<Response, Err
     }
 }
 
-fn un_authorized(err: Error, path: &str) -> Result<Response, Error> {
+pub fn unauthorized(err: Error, path: &str) -> Response {
     tracing::warn!("unauthorized for {} @{:?}", err, path);
     tracing::debug!("{:?}", err);
-    Ok(Response::builder()
+    Response::builder()
         .status(StatusCode::UNAUTHORIZED)
         .body(NOT_AUTHORIZED.into())
-        .unwrap())
+        .unwrap()
 }
 
 /// HTTP status code 404
-fn not_found() -> Response {
+pub fn not_found() -> Response {
     Response::builder()
         .status(StatusCode::NOT_FOUND)
         .body(NOT_FOUND.into())
@@ -323,21 +324,23 @@ fn not_found() -> Response {
 }
 
 /// HTTP status code 405
-fn method_not_allowed() -> Response {
+pub fn method_not_allowed() -> Response {
     Response::builder()
         .status(StatusCode::METHOD_NOT_ALLOWED)
         .body(METHOD_NOT_ALLOWED.into())
         .unwrap()
 }
 
-fn server_error(err: Error) -> Response {
+pub fn server_error(err: Error) -> Response {
+    tracing::error!("internal server error: {}", err);
+    tracing::debug!("{:?}", err);
     Response::builder()
         .status(StatusCode::INTERNAL_SERVER_ERROR)
-        .body(err.to_string().into())
+        .body(INTERNAL_SERVER_ERROR.into())
         .unwrap()
 }
 
-fn bad_request() -> Response {
+pub fn bad_request() -> Response {
     Response::builder()
         .status(StatusCode::BAD_REQUEST)
         .body(Body::empty())
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index dfca0fc0b..31eae5fab 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -12,8 +12,7 @@ use helpers::NonDetachingJoinHandle;
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use regex::Regex;
-use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::net::TcpStream;
 use tokio::process::Command;
@@ -25,10 +24,7 @@ use tracing::instrument;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
-use crate::logs::{
-    cli_logs_generic_follow, cli_logs_generic_nofollow, fetch_logs, follow_logs, journalctl,
-    LogFollowResponse, LogResponse, LogSource,
-};
+use crate::logs::{journalctl, LogSource, LogsParams};
 use crate::prelude::*;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::util::Invoke;
@@ -86,23 +82,27 @@ lazy_static! {
     static ref PROGRESS_REGEX: Regex = Regex::new("PROGRESS=([0-9]+)").unwrap();
 }
 
-pub fn tor() -> ParentHandler {
+pub fn tor<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "list-services",
             from_fn_async(list_services)
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                .with_custom_display_fn(|handle, result| {
                     Ok(display_services(handle.params, result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand("logs", logs())
+        .subcommand(
+            "logs",
+            from_fn_async(crate::logs::cli_logs::<RpcContext, Empty>).no_display(),
+        )
         .subcommand(
             "reset",
             from_fn_async(reset)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
@@ -143,89 +143,10 @@ pub async fn list_services(ctx: RpcContext, _: Empty) -> Result<Vec<OnionAddress
     ctx.net_controller.tor.list_services().await
 }
 
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct LogsParams {
-    #[arg(short = 'l', long = "limit")]
-    #[ts(type = "number | null")]
-    limit: Option<usize>,
-    #[arg(short = 'c', long = "cursor")]
-    cursor: Option<String>,
-    #[arg(short = 'B', long = "before")]
-    #[serde(default)]
-    before: bool,
-    #[arg(short = 'f', long = "follow")]
-    #[serde(default)]
-    follow: bool,
-}
-
-pub fn logs() -> ParentHandler<LogsParams> {
-    ParentHandler::new()
-        .root_handler(
-            from_fn_async(cli_logs)
-                .no_display()
-                .with_inherited(|params, _| params),
-        )
-        .root_handler(
-            from_fn_async(logs_nofollow)
-                .with_inherited(|params, _| params)
-                .no_cli(),
-        )
-        .subcommand(
-            "follow",
-            from_fn_async(logs_follow)
-                .with_inherited(|params, _| params)
-                .no_cli(),
-        )
-}
-pub async fn cli_logs(
-    ctx: CliContext,
-    _: Empty,
-    LogsParams {
-        limit,
-        cursor,
-        before,
-        follow,
-    }: LogsParams,
-) -> Result<(), RpcError> {
-    if follow {
-        if cursor.is_some() {
-            return Err(RpcError::from(Error::new(
-                eyre!("The argument '--cursor <cursor>' cannot be used with '--follow'"),
-                crate::ErrorKind::InvalidRequest,
-            )));
-        }
-        if before {
-            return Err(RpcError::from(Error::new(
-                eyre!("The argument '--before' cannot be used with '--follow'"),
-                crate::ErrorKind::InvalidRequest,
-            )));
-        }
-        cli_logs_generic_follow(ctx, "net.tor.logs.follow", None, limit).await
-    } else {
-        cli_logs_generic_nofollow(ctx, "net.tor.logs", None, limit, cursor, before).await
-    }
-}
-pub async fn logs_nofollow(
-    _: AnyContext,
-    _: Empty,
-    LogsParams {
-        limit,
-        cursor,
-        before,
-        ..
-    }: LogsParams,
-) -> Result<LogResponse, Error> {
-    fetch_logs(LogSource::Unit(SYSTEMD_UNIT), limit, cursor, before).await
-}
-
-pub async fn logs_follow(
-    ctx: RpcContext,
-    _: Empty,
-    LogsParams { limit, .. }: LogsParams,
-) -> Result<LogFollowResponse, Error> {
-    follow_logs(ctx, LogSource::Unit(SYSTEMD_UNIT), limit).await
+pub fn logs() -> ParentHandler<RpcContext, LogsParams> {
+    crate::logs::logs::<RpcContext, Empty>(|_: &RpcContext, _| async {
+        Ok(LogSource::Unit(SYSTEMD_UNIT))
+    })
 }
 
 fn event_handler(_event: AsyncEvent<'static>) -> BoxFuture<'static, Result<(), ConnError>> {
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index 47cf30ad5..8dc1e6da3 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -19,6 +19,7 @@ use tokio_rustls::{LazyConfigAcceptor, TlsConnector};
 use tracing::instrument;
 use ts_rs::TS;
 
+use crate::db::model::Database;
 use crate::prelude::*;
 use crate::util::io::{BackTrackingReader, TimeoutStream};
 use crate::util::serde::MaybeUtf8String;
@@ -26,11 +27,11 @@ use crate::util::serde::MaybeUtf8String;
 // not allowed: <=1024, >=32768, 5355, 5432, 9050, 6010, 9051, 5353
 
 pub struct VHostController {
-    db: PatchDb,
+    db: TypedPatchDb<Database>,
     servers: Mutex<BTreeMap<u16, VHostServer>>,
 }
 impl VHostController {
-    pub fn new(db: PatchDb) -> Self {
+    pub fn new(db: TypedPatchDb<Database>) -> Self {
         Self {
             db,
             servers: Mutex::new(BTreeMap::new()),
@@ -100,7 +101,7 @@ struct VHostServer {
 }
 impl VHostServer {
     #[instrument(skip_all)]
-    async fn new(port: u16, db: PatchDb) -> Result<Self, Error> {
+    async fn new(port: u16, db: TypedPatchDb<Database>) -> Result<Self, Error> {
         // check if port allowed
         let listener = TcpListener::bind(SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), port))
             .await
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index 93f610a42..298fad71f 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -8,7 +8,7 @@ use clap::Parser;
 use isocountry::CountryCode;
 use lazy_static::lazy_static;
 use regex::Regex;
-use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use tokio::sync::RwLock;
@@ -17,6 +17,7 @@ use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::db::model::public::WifiInfo;
+use crate::db::model::Database;
 use crate::net::utils::find_wifi_iface;
 use crate::prelude::*;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
@@ -36,57 +37,55 @@ pub fn wifi_manager(ctx: &RpcContext) -> Result<&WifiManager, Error> {
     }
 }
 
-pub fn wifi() -> ParentHandler {
+pub fn wifi<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "add",
             from_fn_async(add)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "connect",
             from_fn_async(connect)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "get",
             from_fn_async(get)
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                .with_custom_display_fn(|handle, result| {
                     Ok(display_wifi_info(handle.params, result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
-        .subcommand("country", country())
-        .subcommand("available", available())
+        .subcommand("country", country::<C>())
+        .subcommand("available", available::<C>())
 }
 
-pub fn available() -> ParentHandler {
+pub fn available<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand(
         "get",
         from_fn_async(get_available)
             .with_display_serializable()
-            .with_custom_display_fn::<AnyContext, _>(|handle, result| {
-                Ok(display_wifi_list(handle.params, result))
-            })
-            .with_remote_cli::<CliContext>(),
+            .with_custom_display_fn(|handle, result| Ok(display_wifi_list(handle.params, result)))
+            .with_call_remote::<CliContext>(),
     )
 }
 
-pub fn country() -> ParentHandler {
+pub fn country<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand(
         "set",
         from_fn_async(set_country)
             .no_display()
-            .with_remote_cli::<CliContext>(),
+            .with_call_remote::<CliContext>(),
     )
 }
 
@@ -113,7 +112,7 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
         ));
     }
     async fn add_procedure(
-        db: PatchDb,
+        db: TypedPatchDb<Database>,
         wifi_manager: WifiManager,
         ssid: &Ssid,
         password: &Psk,
@@ -170,7 +169,7 @@ pub async fn connect(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result
         ));
     }
     async fn connect_procedure(
-        db: PatchDb,
+        db: TypedPatchDb<Database>,
         wifi_manager: WifiManager,
         ssid: &Ssid,
     ) -> Result<(), Error> {
@@ -718,7 +717,7 @@ impl WpaCli {
 
         Ok(())
     }
-    pub async fn save_config(&mut self, db: PatchDb) -> Result<(), Error> {
+    pub async fn save_config(&mut self, db: TypedPatchDb<Database>) -> Result<(), Error> {
         let new_country = self.get_country_low().await?;
         db.mutate(|d| {
             d.as_public_mut()
@@ -758,7 +757,11 @@ impl WpaCli {
             .collect())
     }
     #[instrument(skip_all)]
-    pub async fn select_network(&mut self, db: PatchDb, ssid: &Ssid) -> Result<bool, Error> {
+    pub async fn select_network(
+        &mut self,
+        db: TypedPatchDb<Database>,
+        ssid: &Ssid,
+    ) -> Result<bool, Error> {
         let m_id = self.check_active_network(ssid).await?;
         match m_id {
             None => Err(Error::new(
@@ -810,7 +813,11 @@ impl WpaCli {
         }
     }
     #[instrument(skip_all)]
-    pub async fn remove_network(&mut self, db: PatchDb, ssid: &Ssid) -> Result<bool, Error> {
+    pub async fn remove_network(
+        &mut self,
+        db: TypedPatchDb<Database>,
+        ssid: &Ssid,
+    ) -> Result<bool, Error> {
         let found_networks = self.find_networks(ssid).await?;
         if found_networks.is_empty() {
             return Ok(true);
@@ -824,7 +831,7 @@ impl WpaCli {
     #[instrument(skip_all)]
     pub async fn set_add_network(
         &mut self,
-        db: PatchDb,
+        db: TypedPatchDb<Database>,
         ssid: &Ssid,
         psk: &Psk,
     ) -> Result<(), Error> {
@@ -833,7 +840,12 @@ impl WpaCli {
         Ok(())
     }
     #[instrument(skip_all)]
-    pub async fn add_network(&mut self, db: PatchDb, ssid: &Ssid, psk: &Psk) -> Result<(), Error> {
+    pub async fn add_network(
+        &mut self,
+        db: TypedPatchDb<Database>,
+        ssid: &Ssid,
+        psk: &Psk,
+    ) -> Result<(), Error> {
         self.add_network_low(ssid, psk).await?;
         self.save_config(db).await?;
         Ok(())
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index 8a5732462..fde3d5e80 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -8,7 +8,7 @@ use clap::Parser;
 use color_eyre::eyre::eyre;
 use imbl_value::InternedString;
 use models::PackageId;
-use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
@@ -21,31 +21,31 @@ use crate::util::clap::FromStrParser;
 use crate::util::serde::HandlerExtSerde;
 
 // #[command(subcommands(list, delete, delete_before, create))]
-pub fn notification() -> ParentHandler {
+pub fn notification<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "list",
             from_fn_async(list)
                 .with_display_serializable()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete-before",
             from_fn_async(delete_before)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "create",
             from_fn_async(create)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 4bbbe70a6..c3931b236 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use models::Error;
-use rpc_toolkit::{command, from_fn_async, AnyContext, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use ts_rs::TS;
@@ -13,11 +13,15 @@ use crate::context::{CliContext, InstallContext};
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
 use crate::disk::mount::filesystem::efivarfs::EfiVarFs;
+use crate::disk::mount::filesystem::overlayfs::OverlayFs;
 use crate::disk::mount::filesystem::{MountType, ReadWrite};
 use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::disk::util::{DiskInfo, PartitionTable};
 use crate::disk::OsPartitionInfo;
 use crate::net::utils::find_eth_iface;
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::util::io::TmpDir;
 use crate::util::serde::IoFormat;
 use crate::util::Invoke;
 use crate::ARCH;
@@ -25,33 +29,33 @@ use crate::ARCH;
 mod gpt;
 mod mbr;
 
-pub fn install() -> ParentHandler {
+pub fn install<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("disk", disk())
+        .subcommand("disk", disk::<C>())
         .subcommand(
             "execute",
-            from_fn_async(execute)
+            from_fn_async(execute::<InstallContext>)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "reboot",
             from_fn_async(reboot)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
-pub fn disk() -> ParentHandler {
+pub fn disk<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand(
         "list",
         from_fn_async(list)
             .no_display()
-            .with_remote_cli::<CliContext>(),
+            .with_call_remote::<CliContext>(),
     )
 }
 
-pub async fn list() -> Result<Vec<DiskInfo>, Error> {
+pub async fn list(_: InstallContext) -> Result<Vec<DiskInfo>, Error> {
     let skip = match async {
         Ok::<_, Error>(
             Path::new(
@@ -122,8 +126,8 @@ pub struct ExecuteParams {
     overwrite: bool,
 }
 
-pub async fn execute(
-    _: AnyContext,
+pub async fn execute<C: Context>(
+    _: C,
     ExecuteParams {
         logicalname,
         mut overwrite,
@@ -215,44 +219,62 @@ pub async fn execute(
         .arg("rootfs")
         .invoke(crate::ErrorKind::DiskManagement)
         .await?;
-
     let rootfs = TmpMountGuard::mount(&BlockDev::new(&part_info.root), ReadWrite).await?;
+
+    let config_path = rootfs.path().join("config");
+
     if tokio::fs::metadata("/tmp/config.bak").await.is_ok() {
+        if tokio::fs::metadata(&config_path).await.is_ok() {
+            tokio::fs::remove_dir_all(&config_path).await?;
+        }
         Command::new("cp")
             .arg("-r")
             .arg("/tmp/config.bak")
-            .arg(rootfs.path().join("config"))
+            .arg(&config_path)
             .invoke(crate::ErrorKind::Filesystem)
             .await?;
     } else {
-        tokio::fs::create_dir(rootfs.path().join("config")).await?;
+        tokio::fs::create_dir_all(&config_path).await?;
     }
-    tokio::fs::create_dir(rootfs.path().join("next")).await?;
-    let current = rootfs.path().join("current");
-    tokio::fs::create_dir(&current).await?;
 
-    tokio::fs::create_dir(current.join("boot")).await?;
-    let boot = MountGuard::mount(
+    let images_path = rootfs.path().join("images");
+    tokio::fs::create_dir_all(&images_path).await?;
+    let image_path = images_path
+        .join(hex::encode(
+            &MultiCursorFile::from(
+                tokio::fs::File::open("/run/live/medium/live/filesystem.squashfs").await?,
+            )
+            .blake3_mmap()
+            .await?
+            .as_bytes()[..16],
+        ))
+        .with_extension("rootfs");
+    tokio::fs::copy("/run/live/medium/live/filesystem.squashfs", &image_path).await?;
+    // TODO: check hash of fs
+    let unsquash_target = TmpDir::new().await?;
+    let bootfs = MountGuard::mount(
         &BlockDev::new(&part_info.boot),
-        current.join("boot"),
+        unsquash_target.join("boot"),
         ReadWrite,
     )
     .await?;
-
-    let efi = if let Some(efi) = &part_info.efi {
-        Some(MountGuard::mount(&BlockDev::new(efi), current.join("boot/efi"), ReadWrite).await?)
-    } else {
-        None
-    };
-
     Command::new("unsquashfs")
         .arg("-n")
         .arg("-f")
         .arg("-d")
-        .arg(&current)
+        .arg(&*unsquash_target)
         .arg("/run/live/medium/live/filesystem.squashfs")
+        .arg("boot")
         .invoke(crate::ErrorKind::Filesystem)
         .await?;
+    bootfs.unmount(true).await?;
+    unsquash_target.delete().await?;
+    Command::new("ln")
+        .arg("-rsf")
+        .arg(&image_path)
+        .arg(config_path.join("current.rootfs"))
+        .invoke(ErrorKind::DiskManagement)
+        .await?;
 
     tokio::fs::write(
         rootfs.path().join("config/config.yaml"),
@@ -264,8 +286,55 @@ pub async fn execute(
     )
     .await?;
 
+    let lower = TmpMountGuard::mount(&BlockDev::new(&image_path), MountType::ReadOnly).await?;
+    let work = config_path.join("work");
+    let upper = config_path.join("overlay");
+    let overlay =
+        TmpMountGuard::mount(&OverlayFs::new(&lower.path(), &upper, &work), ReadWrite).await?;
+
+    let boot = MountGuard::mount(
+        &BlockDev::new(&part_info.boot),
+        overlay.path().join("boot"),
+        ReadWrite,
+    )
+    .await?;
+    let efi = if let Some(efi) = &part_info.efi {
+        Some(
+            MountGuard::mount(
+                &BlockDev::new(efi),
+                overlay.path().join("boot/efi"),
+                ReadWrite,
+            )
+            .await?,
+        )
+    } else {
+        None
+    };
+    let start_os_fs = MountGuard::mount(
+        &Bind::new(rootfs.path()),
+        overlay.path().join("media/startos/root"),
+        MountType::ReadOnly,
+    )
+    .await?;
+    let dev = MountGuard::mount(&Bind::new("/dev"), overlay.path().join("dev"), ReadWrite).await?;
+    let proc =
+        MountGuard::mount(&Bind::new("/proc"), overlay.path().join("proc"), ReadWrite).await?;
+    let sys = MountGuard::mount(&Bind::new("/sys"), overlay.path().join("sys"), ReadWrite).await?;
+    let efivarfs = if tokio::fs::metadata("/sys/firmware/efi").await.is_ok() {
+        Some(
+            MountGuard::mount(
+                &EfiVarFs,
+                overlay.path().join("sys/firmware/efi/efivars"),
+                ReadWrite,
+            )
+            .await?,
+        )
+    } else {
+        None
+    };
+
     tokio::fs::write(
-        current.join("etc/fstab"),
+        overlay.path().join("etc/fstab"),
         format!(
             include_str!("fstab.template"),
             boot = part_info.boot.display(),
@@ -280,42 +349,20 @@ pub async fn execute(
     .await?;
 
     Command::new("chroot")
-        .arg(&current)
+        .arg(overlay.path())
         .arg("systemd-machine-id-setup")
         .invoke(crate::ErrorKind::Systemd)
         .await?;
 
     Command::new("chroot")
-        .arg(&current)
+        .arg(overlay.path())
         .arg("ssh-keygen")
         .arg("-A")
         .invoke(crate::ErrorKind::OpenSsh)
         .await?;
 
-    let start_os_fs = MountGuard::mount(
-        &Bind::new(rootfs.path()),
-        current.join("media/embassy/embassyfs"),
-        MountType::ReadOnly,
-    )
-    .await?;
-    let dev = MountGuard::mount(&Bind::new("/dev"), current.join("dev"), ReadWrite).await?;
-    let proc = MountGuard::mount(&Bind::new("/proc"), current.join("proc"), ReadWrite).await?;
-    let sys = MountGuard::mount(&Bind::new("/sys"), current.join("sys"), ReadWrite).await?;
-    let efivarfs = if tokio::fs::metadata("/sys/firmware/efi").await.is_ok() {
-        Some(
-            MountGuard::mount(
-                &EfiVarFs,
-                current.join("sys/firmware/efi/efivars"),
-                ReadWrite,
-            )
-            .await?,
-        )
-    } else {
-        None
-    };
-
     let mut install = Command::new("chroot");
-    install.arg(&current).arg("grub-install");
+    install.arg(overlay.path()).arg("grub-install");
     if tokio::fs::metadata("/sys/firmware/efi").await.is_err() {
         install.arg("--target=i386-pc");
     } else {
@@ -331,7 +378,7 @@ pub async fn execute(
         .await?;
 
     Command::new("chroot")
-        .arg(&current)
+        .arg(overlay.path())
         .arg("update-grub2")
         .invoke(crate::ErrorKind::Grub)
         .await?;
@@ -346,7 +393,13 @@ pub async fn execute(
         efi.unmount(false).await?;
     }
     boot.unmount(false).await?;
+
+    overlay.unmount().await?;
+    tokio::fs::remove_dir_all(&work).await?;
+    lower.unmount().await?;
+
     rootfs.unmount().await?;
+
     Ok(())
 }
 
diff --git a/core/startos/src/progress.rs b/core/startos/src/progress.rs
index eec637575..9a22405ca 100644
--- a/core/startos/src/progress.rs
+++ b/core/startos/src/progress.rs
@@ -11,7 +11,7 @@ use tokio::io::{AsyncSeek, AsyncWrite};
 use tokio::sync::{mpsc, watch};
 use ts_rs::TS;
 
-use crate::db::model::DatabaseModel;
+use crate::db::model::{Database, DatabaseModel};
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
@@ -23,6 +23,7 @@ lazy_static::lazy_static! {
 #[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, TS)]
 #[serde(untagged)]
 pub enum Progress {
+    NotStarted(()),
     Complete(bool),
     Progress {
         #[ts(type = "number")]
@@ -33,10 +34,13 @@ pub enum Progress {
 }
 impl Progress {
     pub fn new() -> Self {
-        Progress::Complete(false)
+        Progress::NotStarted(())
     }
     pub fn update_bar(self, bar: &ProgressBar) {
         match self {
+            Self::NotStarted(()) => {
+                bar.set_style(SPINNER.clone());
+            }
             Self::Complete(false) => {
                 bar.set_style(SPINNER.clone());
                 bar.tick();
@@ -60,9 +64,15 @@ impl Progress {
             }
         }
     }
+    pub fn start(&mut self) {
+        *self = match *self {
+            Self::NotStarted(()) => Self::Complete(false),
+            a => a,
+        };
+    }
     pub fn set_done(&mut self, done: u64) {
         *self = match *self {
-            Self::Complete(false) => Self::Progress { done, total: None },
+            Self::Complete(false) | Self::NotStarted(()) => Self::Progress { done, total: None },
             Self::Progress { mut done, total } => {
                 if let Some(total) = total {
                     if done > total {
@@ -76,7 +86,7 @@ impl Progress {
     }
     pub fn set_total(&mut self, total: u64) {
         *self = match *self {
-            Self::Complete(false) => Self::Progress {
+            Self::Complete(false) | Self::NotStarted(()) => Self::Progress {
                 done: 0,
                 total: Some(total),
             },
@@ -104,12 +114,15 @@ impl Progress {
     pub fn complete(&mut self) {
         *self = Self::Complete(true);
     }
+    pub fn is_complete(&self) -> bool {
+        matches!(self, Self::Complete(true))
+    }
 }
 impl std::ops::Add<u64> for Progress {
     type Output = Self;
     fn add(self, rhs: u64) -> Self::Output {
         match self {
-            Self::Complete(false) => Self::Progress {
+            Self::Complete(false) | Self::NotStarted(()) => Self::Progress {
                 done: rhs,
                 total: None,
             },
@@ -218,7 +231,7 @@ impl FullProgressTracker {
     }
     pub fn sync_to_db<DerefFn>(
         mut self,
-        db: PatchDb,
+        db: TypedPatchDb<Database>,
         deref: DerefFn,
         min_interval: Option<Duration>,
     ) -> impl Future<Output = Result<(), Error>> + 'static
@@ -308,6 +321,9 @@ impl PhaseProgressTrackerHandle {
             }
         }
     }
+    pub fn start(&mut self) {
+        self.progress.send_modify(|p| p.start());
+    }
     pub fn set_done(&mut self, done: u64) {
         self.progress.send_modify(|p| p.set_done(done));
         self.update_overall();
@@ -324,6 +340,12 @@ impl PhaseProgressTrackerHandle {
         self.progress.send_modify(|p| p.complete());
         self.update_overall();
     }
+    pub fn writer<W>(self, writer: W) -> ProgressTrackerWriter<W> {
+        ProgressTrackerWriter {
+            writer,
+            progress: self,
+        }
+    }
 }
 impl std::ops::AddAssign<u64> for PhaseProgressTrackerHandle {
     fn add_assign(&mut self, rhs: u64) {
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
index f8753ab10..e24b14965 100644
--- a/core/startos/src/properties.rs
+++ b/core/startos/src/properties.rs
@@ -1,7 +1,6 @@
 use clap::Parser;
 use imbl_value::{json, Value};
 use models::PackageId;
-use rpc_toolkit::command;
 use serde::{Deserialize, Serialize};
 
 use crate::context::RpcContext;
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index d416ebdbd..b09fa05aa 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -1,234 +1,255 @@
+use std::collections::BTreeMap;
 use std::path::PathBuf;
-use std::time::Duration;
 
 use clap::Parser;
-use color_eyre::eyre::eyre;
-use console::style;
-use futures::StreamExt;
-use indicatif::{ProgressBar, ProgressStyle};
-use reqwest::{header, Body, Client, Url};
-use rpc_toolkit::command;
+use itertools::Itertools;
+use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
 use crate::context::CliContext;
-use crate::s9pk::S9pk;
-use crate::{Error, ErrorKind};
-
-async fn registry_user_pass(location: &str) -> Result<(Url, String, String), Error> {
-    let mut url = Url::parse(location)?;
-    let user = url.username().to_string();
-    let pass = url.password().map(str::to_string);
-    if user.is_empty() || url.path() != "/" {
-        return Err(Error::new(
-            eyre!("{location:?} is not like \"https://user@registry.example.com/\""),
-            ErrorKind::ParseUrl,
-        ));
+use crate::prelude::*;
+use crate::registry::context::RegistryContext;
+use crate::registry::signer::{ContactInfo, SignerInfo, SignerKey};
+use crate::registry::RegistryDatabase;
+use crate::rpc_continuations::RequestGuid;
+use crate::util::serde::{display_serializable, HandlerExtSerde, Pem, WithIoFormat};
+
+pub fn admin_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("signer", signers_api::<C>())
+        .subcommand("add", from_fn_async(add_admin).no_cli())
+        .subcommand("add", from_fn_async(cli_add_admin).no_display())
+        .subcommand(
+            "list",
+            from_fn_async(list_admins)
+                .with_display_serializable()
+                .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+fn signers_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "list",
+            from_fn_async(list_signers)
+                .with_metadata("admin", Value::Bool(true))
+                .with_display_serializable()
+                .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "add",
+            from_fn_async(add_signer)
+                .with_metadata("admin", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand("add", from_fn_async(cli_add_signer).no_display())
+}
+
+impl Model<BTreeMap<RequestGuid, SignerInfo>> {
+    pub fn get_signer(&self, key: &SignerKey) -> Result<RequestGuid, Error> {
+        self.as_entries()?
+            .into_iter()
+            .map(|(guid, s)| Ok::<_, Error>((guid, s.as_keys().de()?)))
+            .filter_ok(|(_, s)| s.contains(key))
+            .next()
+            .transpose()?
+            .map(|(a, _)| a)
+            .ok_or_else(|| Error::new(eyre!("unknown signer"), ErrorKind::Authorization))
+    }
+
+    pub fn get_signer_info(&self, key: &SignerKey) -> Result<(RequestGuid, SignerInfo), Error> {
+        self.as_entries()?
+            .into_iter()
+            .map(|(guid, s)| Ok::<_, Error>((guid, s.de()?)))
+            .filter_ok(|(_, s)| s.keys.contains(key))
+            .next()
+            .transpose()?
+            .ok_or_else(|| Error::new(eyre!("unknown signer"), ErrorKind::Authorization))
     }
-    let _ = url.set_username("");
-    let _ = url.set_password(None);
-
-    let pass = match pass {
-        Some(p) => p,
-        None => {
-            let pass_prompt = format!("{} Password for {user}: ", style("?").yellow());
-            tokio::task::spawn_blocking(move || rpassword::prompt_password(pass_prompt))
-                .await
-                .unwrap()?
+
+    pub fn add_signer(&mut self, signer: &SignerInfo) -> Result<(), Error> {
+        if let Some((guid, s)) = self
+            .as_entries()?
+            .into_iter()
+            .map(|(guid, s)| Ok::<_, Error>((guid, s.de()?)))
+            .filter_ok(|(_, s)| !s.keys.is_disjoint(&signer.keys))
+            .next()
+            .transpose()?
+        {
+            return Err(Error::new(
+                eyre!(
+                    "A signer {} ({}) already exists with a matching key",
+                    guid,
+                    s.name
+                ),
+                ErrorKind::InvalidRequest,
+            ));
         }
-    };
-    Ok((url, user.to_string(), pass.to_string()))
+        self.insert(&RequestGuid::new(), signer)
+    }
 }
 
-#[derive(serde::Serialize, Debug)]
-struct Package {
-    id: String,
-    version: String,
-    arches: Option<Vec<String>>,
+pub async fn list_signers(
+    ctx: RegistryContext,
+) -> Result<BTreeMap<RequestGuid, SignerInfo>, Error> {
+    ctx.db.peek().await.into_index().into_signers().de()
 }
 
-async fn do_index(
-    httpc: &Client,
-    mut url: Url,
-    user: &str,
-    pass: &str,
-    pkg: &Package,
-) -> Result<(), Error> {
-    url.set_path("/admin/v0/index");
-    let req = httpc
-        .post(url)
-        .header(header::ACCEPT, "text/plain")
-        .basic_auth(user, Some(pass))
-        .json(pkg)
-        .build()?;
-    let res = httpc.execute(req).await?;
-    if !res.status().is_success() {
-        let info = res.text().await?;
-        return Err(Error::new(eyre!("{}", info), ErrorKind::Registry));
+pub fn display_signers<T>(params: WithIoFormat<T>, signers: BTreeMap<RequestGuid, SignerInfo>) {
+    use prettytable::*;
+
+    if let Some(format) = params.format {
+        return display_serializable(format, signers);
     }
-    Ok(())
-}
 
-async fn do_upload(
-    httpc: &Client,
-    mut url: Url,
-    user: &str,
-    pass: &str,
-    pkg_id: &str,
-    body: Body,
-) -> Result<(), Error> {
-    url.set_path("/admin/v0/upload");
-    let req = httpc
-        .post(url)
-        .header(header::ACCEPT, "text/plain")
-        .query(&["id", pkg_id])
-        .basic_auth(user, Some(pass))
-        .body(body)
-        .build()?;
-    let res = httpc.execute(req).await?;
-    if !res.status().is_success() {
-        let info = res.text().await?;
-        return Err(Error::new(eyre!("{}", info), ErrorKind::Registry));
+    let mut table = Table::new();
+    table.add_row(row![bc =>
+        "ID",
+        "NAME",
+        "CONTACT",
+        "KEYS",
+    ]);
+    for (id, info) in signers {
+        table.add_row(row![
+            id.as_ref(),
+            &info.name,
+            &info.contact.into_iter().join("\n"),
+            &info.keys.into_iter().join("\n"),
+        ]);
     }
-    Ok(())
+    table.print_tty(false).unwrap();
 }
 
-#[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "camelCase")]
+pub async fn add_signer(ctx: RegistryContext, signer: SignerInfo) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| db.as_index_mut().as_signers_mut().add_signer(&signer))
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser)]
 #[command(rename_all = "kebab-case")]
-pub struct PublishParams {
-    location: String,
-    path: PathBuf,
-    #[arg(name = "no-verify", long = "no-verify")]
-    no_verify: bool,
-    #[arg(name = "no-upload", long = "no-upload")]
-    no_upload: bool,
-    #[arg(name = "no-index", long = "no-index")]
-    no_index: bool,
+#[serde(rename_all = "camelCase")]
+pub struct CliAddSignerParams {
+    #[arg(long = "name", short = 'n')]
+    pub name: String,
+    #[arg(long = "contact", short = 'c')]
+    pub contact: Vec<ContactInfo>,
+    #[arg(long = "ed25519-key")]
+    pub ed25519_keys: Vec<Pem<ed25519_dalek::VerifyingKey>>,
+    pub database: Option<PathBuf>,
 }
 
-pub async fn publish(
-    _: CliContext,
-    PublishParams {
-        location,
-        no_index,
-        no_upload,
-        no_verify,
-        path,
-    }: PublishParams,
+pub async fn cli_add_signer(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params:
+            CliAddSignerParams {
+                name,
+                contact,
+                ed25519_keys,
+                database,
+            },
+        ..
+    }: HandlerArgs<CliContext, CliAddSignerParams>,
 ) -> Result<(), Error> {
-    // Prepare for progress bars.
-    let bytes_bar_style =
-        ProgressStyle::with_template("{percent}% {wide_bar} [{bytes}/{total_bytes}] [{eta}]")
-            .unwrap();
-    let plain_line_style =
-        ProgressStyle::with_template("{prefix:.bold.dim} {wide_msg}...").unwrap();
-    let spinner_line_style =
-        ProgressStyle::with_template("{prefix:.bold.dim} {spinner} {wide_msg}...").unwrap();
-
-    // Read the file to get manifest information and check validity..
-    // Open file right away so it can not change out from under us.
-    let file = tokio::fs::File::open(&path).await?;
-
-    let manifest = if no_verify {
-        let pb = ProgressBar::new(1)
-            .with_style(spinner_line_style.clone())
-            .with_prefix("[1/3]")
-            .with_message("Querying s9pk");
-        pb.enable_steady_tick(Duration::from_millis(200));
-        let s9pk = S9pk::open(&path, None, false).await?;
-        let m = s9pk.as_manifest().clone();
-        pb.set_style(plain_line_style.clone());
-        pb.abandon();
-        m
-    } else {
-        let pb = ProgressBar::new(1)
-            .with_style(spinner_line_style.clone())
-            .with_prefix("[1/3]")
-            .with_message("Verifying s9pk");
-        pb.enable_steady_tick(Duration::from_millis(200));
-        let s9pk = S9pk::open(&path, None, false).await?;
-        // s9pk.validate().await?;
-        todo!();
-        let m = s9pk.as_manifest().clone();
-        pb.set_style(plain_line_style.clone());
-        pb.abandon();
-        m
-    };
-    let pkg = Package {
-        id: manifest.id.to_string(),
-        version: manifest.version.to_string(),
-        arches: manifest.hardware_requirements.arch.clone(),
+    let signer = SignerInfo {
+        name,
+        contact,
+        keys: ed25519_keys.into_iter().map(SignerKey::Ed25519).collect(),
     };
-    println!("{} id = {}", style(">").green(), pkg.id);
-    println!("{} version = {}", style(">").green(), pkg.version);
-    if let Some(arches) = &pkg.arches {
-        println!("{} arches = {:?}", style(">").green(), arches);
+    if let Some(database) = database {
+        TypedPatchDb::<RegistryDatabase>::load(PatchDb::open(database).await?)
+            .await?
+            .mutate(|db| db.as_index_mut().as_signers_mut().add_signer(&signer))
+            .await?;
     } else {
-        println!(
-            "{} No architecture listed in hardware_requirements",
-            style(">").red()
-        );
+        ctx.call_remote::<RegistryContext>(
+            &parent_method.into_iter().chain(method).join("."),
+            to_value(&signer)?,
+        )
+        .await?;
     }
+    Ok(())
+}
 
-    // Process the url and get the user's password.
-    let (registry, user, pass) = registry_user_pass(&location).await?;
-
-    // Now prepare a stream of the file which will show a progress bar as it is consumed.
-    let file_size = file.metadata().await?.len();
-    let file_stream = tokio_util::io::ReaderStream::new(file);
-    ProgressBar::new(0)
-        .with_style(plain_line_style.clone())
-        .with_prefix("[2/3]")
-        .with_message("Uploading s9pk")
-        .abandon();
-    let pb = ProgressBar::new(file_size).with_style(bytes_bar_style.clone());
-    let stream_pb = pb.clone();
-    let file_stream = file_stream.inspect(move |bytes| {
-        if let Ok(bytes) = bytes {
-            stream_pb.inc(bytes.len() as u64);
-        }
-    });
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct AddAdminParams {
+    #[ts(type = "string")]
+    pub signer: RequestGuid,
+}
+
+pub async fn add_admin(
+    ctx: RegistryContext,
+    AddAdminParams { signer }: AddAdminParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            ensure_code!(
+                db.as_index().as_signers().contains_key(&signer)?,
+                ErrorKind::InvalidRequest,
+                "unknown signer {signer}"
+            );
+            db.as_admins_mut().mutate(|a| Ok(a.insert(signer)))?;
+            Ok(())
+        })
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+pub struct CliAddAdminParams {
+    pub signer: RequestGuid,
+    pub database: Option<PathBuf>,
+}
 
-    let httpc = Client::builder().build().unwrap();
-    // And upload!
-    if no_upload {
-        println!("{} Skipping upload", style(">").yellow());
+pub async fn cli_add_admin(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params: CliAddAdminParams { signer, database },
+        ..
+    }: HandlerArgs<CliContext, CliAddAdminParams>,
+) -> Result<(), Error> {
+    if let Some(database) = database {
+        TypedPatchDb::<RegistryDatabase>::load(PatchDb::open(database).await?)
+            .await?
+            .mutate(|db| {
+                ensure_code!(
+                    db.as_index().as_signers().contains_key(&signer)?,
+                    ErrorKind::InvalidRequest,
+                    "unknown signer {signer}"
+                );
+                db.as_admins_mut().mutate(|a| Ok(a.insert(signer)))?;
+                Ok(())
+            })
+            .await?;
     } else {
-        do_upload(
-            &httpc,
-            registry.clone(),
-            &user,
-            &pass,
-            &pkg.id,
-            Body::wrap_stream(file_stream),
+        ctx.call_remote::<RegistryContext>(
+            &parent_method.into_iter().chain(method).join("."),
+            to_value(&AddAdminParams { signer })?,
         )
         .await?;
     }
-    pb.finish_and_clear();
-
-    // Also index, so it will show up in the registry.
-    let pb = ProgressBar::new(0)
-        .with_style(spinner_line_style.clone())
-        .with_prefix("[3/3]")
-        .with_message("Indexing registry");
-    pb.enable_steady_tick(Duration::from_millis(200));
-    if no_index {
-        println!("{} Skipping index", style(">").yellow());
-    } else {
-        do_index(&httpc, registry.clone(), &user, &pass, &pkg).await?;
-    }
-    pb.set_style(plain_line_style.clone());
-    pb.abandon();
-
-    // All done
-    if !no_index {
-        println!(
-            "{} Package {} is now published to {}",
-            style(">").green(),
-            pkg.id,
-            registry
-        );
-    }
     Ok(())
 }
+
+pub async fn list_admins(ctx: RegistryContext) -> Result<BTreeMap<RequestGuid, SignerInfo>, Error> {
+    let db = ctx.db.peek().await;
+    let admins = db.as_admins().de()?;
+    Ok(db
+        .into_index()
+        .into_signers()
+        .de()?
+        .into_iter()
+        .filter(|(id, _)| admins.contains(id))
+        .collect())
+}
diff --git a/core/startos/src/registry/asset.rs b/core/startos/src/registry/asset.rs
new file mode 100644
index 000000000..c9acced45
--- /dev/null
+++ b/core/startos/src/registry/asset.rs
@@ -0,0 +1,36 @@
+use reqwest::Client;
+use serde::{Deserialize, Serialize};
+use tokio::io::AsyncWrite;
+use ts_rs::TS;
+use url::Url;
+
+use crate::prelude::*;
+use crate::registry::signer::{AcceptSigners, FileValidator, SignatureInfo};
+
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct RegistryAsset {
+    #[ts(type = "string")]
+    pub url: Url,
+    pub signature_info: SignatureInfo,
+}
+impl AsRef<RegistryAsset> for RegistryAsset {
+    fn as_ref(&self) -> &RegistryAsset {
+        self
+    }
+}
+impl RegistryAsset {
+    pub fn validate(&self, accept: AcceptSigners) -> Result<FileValidator, Error> {
+        self.signature_info.validate(accept)
+    }
+    pub async fn download(
+        &self,
+        client: Client,
+        dst: &mut (impl AsyncWrite + Unpin + Send + ?Sized),
+        validator: &FileValidator,
+    ) -> Result<(), Error> {
+        validator.download(self.url.clone(), client, dst).await
+    }
+}
diff --git a/core/startos/src/registry/auth.rs b/core/startos/src/registry/auth.rs
new file mode 100644
index 000000000..187750870
--- /dev/null
+++ b/core/startos/src/registry/auth.rs
@@ -0,0 +1,214 @@
+use std::collections::BTreeMap;
+use std::sync::Arc;
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+
+use axum::body::Body;
+use axum::extract::Request;
+use axum::response::Response;
+use chrono::Utc;
+use http_body_util::BodyExt;
+use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{Middleware, RpcRequest, RpcResponse};
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha512};
+use tokio::io::AsyncWriteExt;
+use tokio::sync::Mutex;
+use ts_rs::TS;
+
+use crate::prelude::*;
+use crate::registry::context::RegistryContext;
+use crate::registry::signer::SignerKey;
+use crate::util::serde::{Base64, Pem};
+
+pub const AUTH_SIG_HEADER: &str = "X-StartOS-Registry-Auth-Sig";
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Metadata {
+    #[serde(default)]
+    admin: bool,
+    #[serde(default)]
+    get_signer: bool,
+}
+
+#[derive(Clone)]
+pub struct Auth {
+    nonce_cache: Arc<Mutex<BTreeMap<Instant, u64>>>, // for replay protection
+    signer: Option<Result<SignerKey, RpcError>>,
+}
+impl Auth {
+    pub fn new() -> Self {
+        Self {
+            nonce_cache: Arc::new(Mutex::new(BTreeMap::new())),
+            signer: None,
+        }
+    }
+    async fn handle_nonce(&mut self, nonce: u64) -> Result<(), Error> {
+        let mut cache = self.nonce_cache.lock().await;
+        if cache.values().any(|n| *n == nonce) {
+            return Err(Error::new(
+                eyre!("replay attack detected"),
+                ErrorKind::Authorization,
+            ));
+        }
+        while let Some(entry) = cache.first_entry() {
+            if entry.key().elapsed() > Duration::from_secs(60) {
+                entry.remove_entry();
+            } else {
+                break;
+            }
+        }
+        Ok(())
+    }
+}
+
+#[derive(Serialize, Deserialize, TS)]
+pub struct RegistryAdminLogRecord {
+    pub timestamp: String,
+    pub name: String,
+    #[ts(type = "{ id: string | number | null; method: string; params: any }")]
+    pub request: RpcRequest,
+    pub key: SignerKey,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct SignatureHeader {
+    pub timestamp: i64,
+    pub nonce: u64,
+    #[serde(flatten)]
+    pub signer: SignerKey,
+    pub signature: Base64<[u8; 64]>,
+}
+impl SignatureHeader {
+    pub fn sign_ed25519(
+        key: &ed25519_dalek::SigningKey,
+        body: &[u8],
+        context: &str,
+    ) -> Result<Self, Error> {
+        let timestamp = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .map(|d| d.as_secs() as i64)
+            .unwrap_or_else(|e| e.duration().as_secs() as i64 * -1);
+        let nonce = rand::random();
+        let signer = SignerKey::Ed25519(Pem(key.verifying_key()));
+        let mut hasher = Sha512::new();
+        hasher.update(&i64::to_be_bytes(timestamp));
+        hasher.update(&u64::to_be_bytes(nonce));
+        hasher.update(body);
+        let signature = Base64(
+            key.sign_prehashed(hasher, Some(context.as_bytes()))?
+                .to_bytes(),
+        );
+        Ok(Self {
+            timestamp,
+            nonce,
+            signer,
+            signature,
+        })
+    }
+}
+
+impl Middleware<RegistryContext> for Auth {
+    type Metadata = Metadata;
+    async fn process_http_request(
+        &mut self,
+        ctx: &RegistryContext,
+        request: &mut Request,
+    ) -> Result<(), Response> {
+        if request.headers().contains_key(AUTH_SIG_HEADER) {
+            self.signer = Some(
+                async {
+                    let request = request;
+                    let SignatureHeader {
+                        timestamp,
+                        nonce,
+                        signer,
+                        signature,
+                    } = serde_urlencoded::from_str(
+                        request
+                            .headers()
+                            .get(AUTH_SIG_HEADER)
+                            .or_not_found("missing X-StartOS-Registry-Auth-Sig")
+                            .with_kind(ErrorKind::InvalidRequest)?
+                            .to_str()
+                            .with_kind(ErrorKind::Utf8)?,
+                    )
+                    .with_kind(ErrorKind::Deserialization)?;
+                    let now = SystemTime::now()
+                        .duration_since(UNIX_EPOCH)
+                        .map(|d| d.as_secs() as i64)
+                        .unwrap_or_else(|e| e.duration().as_secs() as i64 * -1);
+                    if (now - timestamp).abs() > 30 {
+                        return Err(Error::new(
+                            eyre!("timestamp not within 30s of now"),
+                            ErrorKind::InvalidSignature,
+                        ));
+                    }
+                    self.handle_nonce(nonce).await?;
+                    let body = std::mem::replace(request.body_mut(), Body::empty())
+                        .collect()
+                        .await
+                        .with_kind(ErrorKind::Network)?
+                        .to_bytes();
+                    let mut verifier = signer.verifier();
+                    verifier.update(&i64::to_be_bytes(timestamp));
+                    verifier.update(&u64::to_be_bytes(nonce));
+                    verifier.update(&body);
+                    *request.body_mut() = Body::from(body);
+
+                    verifier.verify(&*signature, &ctx.hostname)?;
+                    Ok(signer)
+                }
+                .await
+                .map_err(RpcError::from),
+            );
+        }
+        Ok(())
+    }
+    async fn process_rpc_request(
+        &mut self,
+        ctx: &RegistryContext,
+        metadata: Self::Metadata,
+        request: &mut RpcRequest,
+    ) -> Result<(), RpcResponse> {
+        async move {
+            let signer = self.signer.take().transpose()?;
+            if metadata.get_signer {
+                if let Some(signer) = &signer {
+                    request.params["__auth_signer"] = to_value(signer)?;
+                }
+            }
+            if metadata.admin {
+                let signer = signer
+                    .ok_or_else(|| Error::new(eyre!("UNAUTHORIZED"), ErrorKind::Authorization))?;
+                let db = ctx.db.peek().await;
+                let (guid, admin) = db.as_index().as_signers().get_signer_info(&signer)?;
+                if db.into_admins().de()?.contains(&guid) {
+                    let mut log = tokio::fs::OpenOptions::new()
+                        .create(true)
+                        .append(true)
+                        .open(ctx.datadir.join("admin.log"))
+                        .await?;
+                    log.write_all(
+                        (serde_json::to_string(&RegistryAdminLogRecord {
+                            timestamp: Utc::now().to_rfc3339(),
+                            name: admin.name,
+                            request: request.clone(),
+                            key: signer,
+                        })
+                        .with_kind(ErrorKind::Serialization)?
+                            + "\n")
+                            .as_bytes(),
+                    )
+                    .await?;
+                } else {
+                    return Err(Error::new(eyre!("UNAUTHORIZED"), ErrorKind::Authorization));
+                }
+            }
+
+            Ok(())
+        }
+        .await
+        .map_err(|e| RpcResponse::from_result(Err(e)))
+    }
+}
diff --git a/core/startos/src/registry/context.rs b/core/startos/src/registry/context.rs
new file mode 100644
index 000000000..dac833434
--- /dev/null
+++ b/core/startos/src/registry/context.rs
@@ -0,0 +1,242 @@
+use std::net::{Ipv4Addr, SocketAddr};
+use std::ops::Deref;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use clap::Parser;
+use imbl_value::InternedString;
+use patch_db::PatchDb;
+use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{CallRemote, Context, Empty};
+use serde::{Deserialize, Serialize};
+use tokio::sync::broadcast::Sender;
+use tracing::instrument;
+use url::Url;
+
+use crate::context::config::{ContextConfig, CONFIG_PATH};
+use crate::context::{CliContext, RpcContext};
+use crate::prelude::*;
+use crate::registry::auth::{SignatureHeader, AUTH_SIG_HEADER};
+use crate::registry::RegistryDatabase;
+use crate::rpc_continuations::RpcContinuations;
+use crate::version::VersionT;
+
+#[derive(Debug, Clone, Default, Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct RegistryConfig {
+    #[arg(short = 'c', long = "config")]
+    pub config: Option<PathBuf>,
+    #[arg(short = 'l', long = "listen")]
+    pub listen: Option<SocketAddr>,
+    #[arg(short = 'h', long = "hostname")]
+    pub hostname: InternedString,
+    #[arg(short = 'd', long = "datadir")]
+    pub datadir: Option<PathBuf>,
+}
+impl ContextConfig for RegistryConfig {
+    fn next(&mut self) -> Option<PathBuf> {
+        self.config.take()
+    }
+    fn merge_with(&mut self, other: Self) {
+        self.datadir = self.datadir.take().or(other.datadir);
+    }
+}
+
+impl RegistryConfig {
+    pub fn load(mut self) -> Result<Self, Error> {
+        let path = self.next();
+        self.load_path_rec(path)?;
+        self.load_path_rec(Some(CONFIG_PATH))?;
+        Ok(self)
+    }
+}
+
+pub struct RegistryContextSeed {
+    pub hostname: InternedString,
+    pub listen: SocketAddr,
+    pub db: TypedPatchDb<RegistryDatabase>,
+    pub datadir: PathBuf,
+    pub rpc_continuations: RpcContinuations,
+    pub shutdown: Sender<()>,
+}
+
+#[derive(Clone)]
+pub struct RegistryContext(Arc<RegistryContextSeed>);
+impl RegistryContext {
+    #[instrument(skip_all)]
+    pub async fn init(config: &RegistryConfig) -> Result<Self, Error> {
+        let (shutdown, _) = tokio::sync::broadcast::channel(1);
+        let datadir = config
+            .datadir
+            .as_deref()
+            .unwrap_or_else(|| Path::new("/var/lib/startos"))
+            .to_owned();
+        if tokio::fs::metadata(&datadir).await.is_err() {
+            tokio::fs::create_dir_all(&datadir).await?;
+        }
+        let db_path = datadir.join("registry.db");
+        let db = TypedPatchDb::<RegistryDatabase>::load_or_init(
+            PatchDb::open(&db_path).await?,
+            || async { Ok(Default::default()) },
+        )
+        .await?;
+        Ok(Self(Arc::new(RegistryContextSeed {
+            hostname: config.hostname.clone(),
+            listen: config
+                .listen
+                .unwrap_or(SocketAddr::new(Ipv4Addr::LOCALHOST.into(), 5959)),
+            db,
+            datadir,
+            rpc_continuations: RpcContinuations::new(),
+            shutdown,
+        })))
+    }
+}
+impl AsRef<RpcContinuations> for RegistryContext {
+    fn as_ref(&self) -> &RpcContinuations {
+        &self.rpc_continuations
+    }
+}
+
+impl Context for RegistryContext {}
+impl Deref for RegistryContext {
+    type Target = RegistryContextSeed;
+    fn deref(&self) -> &Self::Target {
+        &*self.0
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser)]
+pub struct RegistryUrlParams {
+    pub registry: Url,
+}
+
+impl CallRemote<RegistryContext> for CliContext {
+    async fn call_remote(
+        &self,
+        mut method: &str,
+        params: Value,
+        _: Empty,
+    ) -> Result<Value, RpcError> {
+        use reqwest::header::{ACCEPT, CONTENT_LENGTH, CONTENT_TYPE};
+        use reqwest::Method;
+        use rpc_toolkit::yajrc::{GenericRpcMethod, Id, RpcRequest};
+        use rpc_toolkit::RpcResponse;
+
+        let url = self
+            .registry_url
+            .clone()
+            .ok_or_else(|| Error::new(eyre!("`--registry` required"), ErrorKind::InvalidRequest))?;
+        method = method.strip_prefix("registry.").unwrap_or(method);
+
+        let rpc_req = RpcRequest {
+            id: Some(Id::Number(0.into())),
+            method: GenericRpcMethod::<_, _, Value>::new(method),
+            params,
+        };
+        let body = serde_json::to_vec(&rpc_req)?;
+        let host = url.host().or_not_found("registry hostname")?.to_string();
+        let res = self
+            .client
+            .request(Method::POST, url)
+            .header(CONTENT_TYPE, "application/json")
+            .header(ACCEPT, "application/json")
+            .header(CONTENT_LENGTH, body.len())
+            .header(
+                AUTH_SIG_HEADER,
+                serde_urlencoded::to_string(&SignatureHeader::sign_ed25519(
+                    self.developer_key()?,
+                    &body,
+                    &host,
+                )?)
+                .with_kind(ErrorKind::Serialization)?,
+            )
+            .body(body)
+            .send()
+            .await?;
+
+        match res
+            .headers()
+            .get(CONTENT_TYPE)
+            .and_then(|v| v.to_str().ok())
+        {
+            Some("application/json") => {
+                serde_json::from_slice::<RpcResponse>(&*res.bytes().await?)
+                    .with_kind(ErrorKind::Deserialization)?
+                    .result
+            }
+            _ => Err(Error::new(eyre!("missing content type"), ErrorKind::Network).into()),
+        }
+    }
+}
+
+fn hardware_header(ctx: &RpcContext) -> String {
+    let mut url: Url = "http://localhost".parse().unwrap();
+    url.query_pairs_mut()
+        .append_pair(
+            "os.version",
+            &crate::version::Current::new().semver().to_string(),
+        )
+        .append_pair(
+            "os.compat",
+            &crate::version::Current::new().compat().to_string(),
+        )
+        .append_pair("os.arch", &*crate::PLATFORM)
+        .append_pair("hardware.arch", &*crate::ARCH)
+        .append_pair("hardware.ram", &ctx.hardware.ram.to_string());
+
+    for hw in &ctx.hardware.devices {
+        url.query_pairs_mut()
+            .append_pair(&format!("hardware.device.{}", hw.class()), hw.product());
+    }
+
+    url.query().unwrap_or_default().to_string()
+}
+
+impl CallRemote<RegistryContext, RegistryUrlParams> for RpcContext {
+    async fn call_remote(
+        &self,
+        mut method: &str,
+        params: Value,
+        RegistryUrlParams { registry }: RegistryUrlParams,
+    ) -> Result<Value, RpcError> {
+        use reqwest::header::{ACCEPT, CONTENT_LENGTH, CONTENT_TYPE};
+        use reqwest::Method;
+        use rpc_toolkit::yajrc::{GenericRpcMethod, Id, RpcRequest};
+        use rpc_toolkit::RpcResponse;
+
+        let url = registry.join("rpc/v0")?;
+        method = method.strip_prefix("registry.").unwrap_or(method);
+
+        let rpc_req = RpcRequest {
+            id: Some(Id::Number(0.into())),
+            method: GenericRpcMethod::<_, _, Value>::new(method),
+            params,
+        };
+        let body = serde_json::to_vec(&rpc_req)?;
+        let res = self
+            .client
+            .request(Method::POST, url)
+            .header(CONTENT_TYPE, "application/json")
+            .header(ACCEPT, "application/json")
+            .header(CONTENT_LENGTH, body.len())
+            .header("X-StartOS-Hardware", &hardware_header(self))
+            .body(body)
+            .send()
+            .await?;
+
+        match res
+            .headers()
+            .get(CONTENT_TYPE)
+            .and_then(|v| v.to_str().ok())
+        {
+            Some("application/json") => {
+                serde_json::from_slice::<RpcResponse>(&*res.bytes().await?)
+                    .with_kind(ErrorKind::Deserialization)?
+                    .result
+            }
+            _ => Err(Error::new(eyre!("missing content type"), ErrorKind::Network).into()),
+        }
+    }
+}
diff --git a/core/startos/src/registry/db.rs b/core/startos/src/registry/db.rs
new file mode 100644
index 000000000..df39604f1
--- /dev/null
+++ b/core/startos/src/registry/db.rs
@@ -0,0 +1,171 @@
+use std::path::PathBuf;
+
+use clap::Parser;
+use itertools::Itertools;
+use patch_db::json_ptr::{JsonPointer, ROOT};
+use patch_db::Dump;
+use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use tracing::instrument;
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::registry::context::RegistryContext;
+use crate::registry::RegistryDatabase;
+use crate::util::serde::{apply_expr, HandlerExtSerde};
+
+pub fn db_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("dump", from_fn_async(cli_dump).with_display_serializable())
+        .subcommand(
+            "dump",
+            from_fn_async(dump)
+                .with_metadata("admin", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand("apply", from_fn_async(cli_apply).no_display())
+        .subcommand(
+            "apply",
+            from_fn_async(apply)
+                .with_metadata("admin", Value::Bool(true))
+                .no_cli(),
+        )
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+pub struct CliDumpParams {
+    #[arg(long = "pointer", short = 'p')]
+    pointer: Option<JsonPointer>,
+    path: Option<PathBuf>,
+}
+
+#[instrument(skip_all)]
+async fn cli_dump(
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        params: CliDumpParams { pointer, path },
+        ..
+    }: HandlerArgs<CliContext, CliDumpParams>,
+) -> Result<Dump, RpcError> {
+    let dump = if let Some(path) = path {
+        PatchDb::open(path).await?.dump(&ROOT).await
+    } else {
+        let method = parent_method.into_iter().chain(method).join(".");
+        from_value::<Dump>(
+            context
+                .call_remote::<RegistryContext>(&method, imbl_value::json!({ "pointer": pointer }))
+                .await?,
+        )?
+    };
+
+    Ok(dump)
+}
+
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+pub struct DumpParams {
+    #[arg(long = "pointer", short = 'p')]
+    #[ts(type = "string | null")]
+    pointer: Option<JsonPointer>,
+}
+
+pub async fn dump(ctx: RegistryContext, DumpParams { pointer }: DumpParams) -> Result<Dump, Error> {
+    Ok(ctx
+        .db
+        .dump(&pointer.as_ref().map_or(ROOT, |p| p.borrowed()))
+        .await)
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+pub struct CliApplyParams {
+    expr: String,
+    path: Option<PathBuf>,
+}
+
+#[instrument(skip_all)]
+async fn cli_apply(
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        params: CliApplyParams { expr, path },
+        ..
+    }: HandlerArgs<CliContext, CliApplyParams>,
+) -> Result<(), RpcError> {
+    if let Some(path) = path {
+        PatchDb::open(path)
+            .await?
+            .apply_function(|db| {
+                let res = apply_expr(
+                    serde_json::to_value(patch_db::Value::from(db))
+                        .with_kind(ErrorKind::Deserialization)?
+                        .into(),
+                    &expr,
+                )?;
+
+                Ok::<_, Error>((
+                    to_value(
+                        &serde_json::from_value::<RegistryDatabase>(res.clone().into()).with_ctx(
+                            |_| {
+                                (
+                                    crate::ErrorKind::Deserialization,
+                                    "result does not match database model",
+                                )
+                            },
+                        )?,
+                    )?,
+                    (),
+                ))
+            })
+            .await?;
+    } else {
+        let method = parent_method.into_iter().chain(method).join(".");
+        context
+            .call_remote::<RegistryContext>(&method, imbl_value::json!({ "expr": expr }))
+            .await?;
+    }
+
+    Ok(())
+}
+
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+pub struct ApplyParams {
+    expr: String,
+    path: Option<PathBuf>,
+}
+
+pub async fn apply(
+    ctx: RegistryContext,
+    ApplyParams { expr, .. }: ApplyParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            let res = apply_expr(
+                serde_json::to_value(patch_db::Value::from(db.clone()))
+                    .with_kind(ErrorKind::Deserialization)?
+                    .into(),
+                &expr,
+            )?;
+
+            db.ser(
+                &serde_json::from_value::<RegistryDatabase>(res.clone().into()).with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Deserialization,
+                        "result does not match database model",
+                    )
+                })?,
+            )
+        })
+        .await
+}
diff --git a/core/startos/src/registry/marketplace.rs b/core/startos/src/registry/marketplace.rs
deleted file mode 100644
index 82ead81cb..000000000
--- a/core/startos/src/registry/marketplace.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use base64::Engine;
-use clap::Parser;
-use color_eyre::eyre::eyre;
-use reqwest::{StatusCode, Url};
-use rpc_toolkit::{command, from_fn_async, HandlerExt, ParentHandler};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use ts_rs::TS;
-
-use crate::context::{CliContext, RpcContext};
-use crate::version::VersionT;
-use crate::{Error, ResultExt};
-
-pub fn marketplace() -> ParentHandler {
-    ParentHandler::new().subcommand("get", from_fn_async(get).with_remote_cli::<CliContext>())
-}
-
-pub fn with_query_params(ctx: RpcContext, mut url: Url) -> Url {
-    url.query_pairs_mut()
-        .append_pair(
-            "os.version",
-            &crate::version::Current::new().semver().to_string(),
-        )
-        .append_pair(
-            "os.compat",
-            &crate::version::Current::new().compat().to_string(),
-        )
-        .append_pair("os.arch", &*crate::PLATFORM)
-        .append_pair("hardware.arch", &*crate::ARCH)
-        .append_pair("hardware.ram", &ctx.hardware.ram.to_string());
-
-    for hw in &ctx.hardware.devices {
-        url.query_pairs_mut()
-            .append_pair(&format!("hardware.device.{}", hw.class()), hw.product());
-    }
-
-    url
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct GetParams {
-    #[ts(type = "string")]
-    url: Url,
-}
-
-pub async fn get(ctx: RpcContext, GetParams { url }: GetParams) -> Result<Value, Error> {
-    let mut response = ctx
-        .client
-        .get(with_query_params(ctx.clone(), url))
-        .send()
-        .await
-        .with_kind(crate::ErrorKind::Network)?;
-    let status = response.status();
-    if status.is_success() {
-        match response
-            .headers_mut()
-            .remove("Content-Type")
-            .as_ref()
-            .and_then(|h| h.to_str().ok())
-            .and_then(|h| h.split(";").next())
-            .map(|h| h.trim())
-        {
-            Some("application/json") => response
-                .json()
-                .await
-                .with_kind(crate::ErrorKind::Deserialization),
-            Some("text/plain") => Ok(Value::String(
-                response
-                    .text()
-                    .await
-                    .with_kind(crate::ErrorKind::Registry)?,
-            )),
-            Some(ctype) => Ok(Value::String(format!(
-                "data:{};base64,{}",
-                ctype,
-                base64::engine::general_purpose::URL_SAFE.encode(
-                    &response
-                        .bytes()
-                        .await
-                        .with_kind(crate::ErrorKind::Registry)?
-                )
-            ))),
-            _ => Err(Error::new(
-                eyre!("missing Content-Type"),
-                crate::ErrorKind::Registry,
-            )),
-        }
-    } else {
-        let message = response.text().await.with_kind(crate::ErrorKind::Network)?;
-        Err(Error::new(
-            eyre!("{}", message),
-            match status {
-                StatusCode::BAD_REQUEST => crate::ErrorKind::InvalidRequest,
-                StatusCode::NOT_FOUND => crate::ErrorKind::NotFound,
-                _ => crate::ErrorKind::Registry,
-            },
-        ))
-    }
-}
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index 27f541f1d..c063e5823 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -1,2 +1,126 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::net::SocketAddr;
+
+use axum::Router;
+use futures::future::ready;
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler, Server};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::{CliContext};
+use crate::middleware::cors::Cors;
+use crate::net::static_server::{bad_request, not_found, server_error};
+use crate::net::web_server::WebServer;
+use crate::prelude::*;
+use crate::registry::auth::Auth;
+use crate::registry::context::{RegistryContext};
+use crate::registry::os::index::OsIndex;
+use crate::registry::signer::SignerInfo;
+use crate::rpc_continuations::RequestGuid;
+use crate::util::serde::HandlerExtSerde;
+
 pub mod admin;
-pub mod marketplace;
+pub mod asset;
+pub mod auth;
+pub mod context;
+pub mod db;
+pub mod os;
+pub mod signer;
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+pub struct RegistryDatabase {
+    pub admins: BTreeSet<RequestGuid>,
+    pub index: FullIndex,
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct FullIndex {
+    // pub package: PackageIndex,
+    pub os: OsIndex,
+    #[ts(as = "BTreeMap::<String, SignerInfo>")]
+    pub signers: BTreeMap<RequestGuid, SignerInfo>,
+}
+
+pub async fn get_full_index(ctx: RegistryContext) -> Result<FullIndex, Error> {
+    ctx.db.peek().await.into_index().de()
+}
+
+pub fn registry_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "index",
+            from_fn_async(get_full_index)
+                .with_display_serializable()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand("os", os::os_api::<C>())
+        .subcommand("admin", admin::admin_api::<C>())
+        .subcommand("db", db::db_api::<C>())
+}
+
+pub fn registry_server_router(ctx: RegistryContext) -> Router {
+    use axum::extract as x;
+    use axum::routing::{any, get, post};
+    Router::new()
+        .route("/rpc/*path", {
+            let ctx = ctx.clone();
+            post(
+                Server::new(move || ready(Ok(ctx.clone())), registry_api())
+                    .middleware(Cors::new())
+                    .middleware(Auth::new()),
+            )
+        })
+        .route(
+            "/ws/rpc/*path",
+            get({
+                let ctx = ctx.clone();
+                move |x::Path(path): x::Path<String>,
+                      ws: axum::extract::ws::WebSocketUpgrade| async move {
+                    match RequestGuid::from(&path) {
+                        None => {
+                            tracing::debug!("No Guid Path");
+                            bad_request()
+                        }
+                        Some(guid) => match ctx.rpc_continuations.get_ws_handler(&guid).await {
+                            Some(cont) => ws.on_upgrade(cont),
+                            _ => not_found(),
+                        },
+                    }
+                }
+            }),
+        )
+        .route(
+            "/rest/rpc/*path",
+            any({
+                let ctx = ctx.clone();
+                move |request: x::Request| async move {
+                    let path = request
+                        .uri()
+                        .path()
+                        .strip_prefix("/rest/rpc/")
+                        .unwrap_or_default();
+                    match RequestGuid::from(&path) {
+                        None => {
+                            tracing::debug!("No Guid Path");
+                            bad_request()
+                        }
+                        Some(guid) => match ctx.rpc_continuations.get_rest_handler(&guid).await {
+                            None => not_found(),
+                            Some(cont) => cont(request).await.unwrap_or_else(server_error),
+                        },
+                    }
+                }
+            }),
+        )
+}
+
+impl WebServer {
+    pub fn registry(bind: SocketAddr, ctx: RegistryContext) -> Self {
+        Self::new(bind, registry_server_router(ctx))
+    }
+}
diff --git a/core/startos/src/registry/os/asset/add.rs b/core/startos/src/registry/os/asset/add.rs
new file mode 100644
index 000000000..6e259e314
--- /dev/null
+++ b/core/startos/src/registry/os/asset/add.rs
@@ -0,0 +1,341 @@
+use std::collections::BTreeMap;
+use std::panic::UnwindSafe;
+use std::path::PathBuf;
+use std::time::Duration;
+
+use axum::response::Response;
+use clap::Parser;
+use futures::{FutureExt, TryStreamExt};
+use helpers::NonDetachingJoinHandle;
+use imbl_value::InternedString;
+use itertools::Itertools;
+use rpc_toolkit::{from_fn_async, CallRemote, Context, HandlerArgs, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha512};
+use ts_rs::TS;
+use url::Url;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::registry::asset::RegistryAsset;
+use crate::registry::context::RegistryContext;
+use crate::registry::os::index::OsVersionInfo;
+use crate::registry::os::SIG_CONTEXT;
+use crate::registry::signer::{Blake3Ed25519Signature, Signature, SignatureInfo, SignerKey};
+use crate::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::s9pk::merkle_archive::source::ArchiveSource;
+use crate::util::{Apply, Version};
+
+pub fn add_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "iso",
+            from_fn_async(add_iso)
+                .with_metadata("getSigner", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand(
+            "img",
+            from_fn_async(add_img)
+                .with_metadata("getSigner", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand(
+            "squashfs",
+            from_fn_async(add_squashfs)
+                .with_metadata("getSigner", Value::Bool(true))
+                .no_cli(),
+        )
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct AddAssetParams {
+    #[ts(type = "string")]
+    pub url: Url,
+    pub signature: Signature,
+    #[ts(type = "string")]
+    pub version: Version,
+    #[ts(type = "string")]
+    pub platform: InternedString,
+    #[serde(default)]
+    pub upload: bool,
+    #[serde(rename = "__auth_signer")]
+    pub signer: SignerKey,
+}
+
+async fn add_asset(
+    ctx: RegistryContext,
+    AddAssetParams {
+        url,
+        signature,
+        version,
+        platform,
+        upload,
+        signer,
+    }: AddAssetParams,
+    accessor: impl FnOnce(&mut Model<OsVersionInfo>) -> &mut Model<BTreeMap<InternedString, RegistryAsset>>
+        + UnwindSafe
+        + Send,
+) -> Result<Option<RequestGuid>, Error> {
+    ensure_code!(
+        signature.signer() == signer,
+        ErrorKind::InvalidSignature,
+        "asset signature does not match request signer"
+    );
+
+    ctx.db
+        .mutate(|db| {
+            let signer_guid = db.as_index().as_signers().get_signer(&signer)?;
+            if db
+                .as_index()
+                .as_os()
+                .as_versions()
+                .as_idx(&version)
+                .or_not_found(&version)?
+                .as_signers()
+                .de()?
+                .contains(&signer_guid)
+            {
+                accessor(
+                    db.as_index_mut()
+                        .as_os_mut()
+                        .as_versions_mut()
+                        .as_idx_mut(&version)
+                        .or_not_found(&version)?,
+                )
+                .upsert(&platform, || RegistryAsset {
+                    url,
+                    signature_info: SignatureInfo::new(SIG_CONTEXT),
+                })?
+                .as_signature_info_mut()
+                .mutate(|s| s.add_sig(&signature))?;
+                Ok(())
+            } else {
+                Err(Error::new(eyre!("UNAUTHORIZED"), ErrorKind::Authorization))
+            }
+        })
+        .await?;
+
+    let guid = if upload {
+        let guid = RequestGuid::new();
+        let auth_guid = guid.clone();
+        let signer = signature.signer();
+        let hostname = ctx.hostname.clone();
+        ctx.rpc_continuations
+            .add(
+                guid.clone(),
+                RpcContinuation::rest(
+                    Box::new(|req| {
+                        async move {
+                            Ok(
+                                if async move {
+                                    let auth_sig = base64::decode(
+                                        req.headers().get("X-StartOS-Registry-Auth-Sig")?,
+                                    )
+                                    .ok()?;
+                                    signer
+                                        .verify_message(
+                                            auth_guid.as_ref().as_bytes(),
+                                            &auth_sig,
+                                            &hostname,
+                                        )
+                                        .ok()?;
+
+                                    Some(())
+                                }
+                                .await
+                                .is_some()
+                                {
+                                    Response::builder()
+                                        .status(200)
+                                        .body(axum::body::Body::empty())
+                                        .with_kind(ErrorKind::Network)?
+                                } else {
+                                    Response::builder()
+                                        .status(401)
+                                        .body(axum::body::Body::empty())
+                                        .with_kind(ErrorKind::Network)?
+                                },
+                            )
+                        }
+                        .boxed()
+                    }),
+                    Duration::from_secs(30),
+                ),
+            )
+            .await;
+        Some(guid)
+    } else {
+        None
+    };
+
+    Ok(guid)
+}
+
+pub async fn add_iso(
+    ctx: RegistryContext,
+    params: AddAssetParams,
+) -> Result<Option<RequestGuid>, Error> {
+    add_asset(ctx, params, |m| m.as_iso_mut()).await
+}
+
+pub async fn add_img(
+    ctx: RegistryContext,
+    params: AddAssetParams,
+) -> Result<Option<RequestGuid>, Error> {
+    add_asset(ctx, params, |m| m.as_img_mut()).await
+}
+
+pub async fn add_squashfs(
+    ctx: RegistryContext,
+    params: AddAssetParams,
+) -> Result<Option<RequestGuid>, Error> {
+    add_asset(ctx, params, |m| m.as_squashfs_mut()).await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+pub struct CliAddAssetParams {
+    #[arg(short = 'p', long = "platform")]
+    pub platform: InternedString,
+    #[arg(short = 'v', long = "version")]
+    pub version: Version,
+    pub file: PathBuf,
+    pub url: Url,
+    #[arg(short = 'u', long = "upload")]
+    pub upload: bool,
+}
+
+pub async fn cli_add_asset(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params:
+            CliAddAssetParams {
+                platform,
+                version,
+                file: path,
+                url,
+                upload,
+            },
+        ..
+    }: HandlerArgs<CliContext, CliAddAssetParams>,
+) -> Result<(), Error> {
+    let ext = match path.extension().and_then(|e| e.to_str()) {
+        Some("iso") => "iso",
+        Some("img") => "img",
+        Some("squashfs") => "squashfs",
+        _ => {
+            return Err(Error::new(
+                eyre!("Unknown extension"),
+                ErrorKind::InvalidRequest,
+            ))
+        }
+    };
+
+    let file = tokio::fs::File::open(&path).await?.into();
+
+    let mut progress = FullProgressTracker::new();
+    let progress_handle = progress.handle();
+    let mut sign_phase =
+        progress_handle.add_phase(InternedString::intern("Signing File"), Some(10));
+    let mut index_phase = progress_handle.add_phase(
+        InternedString::intern("Adding File to Registry Index"),
+        Some(1),
+    );
+    let mut upload_phase = if upload {
+        Some(progress_handle.add_phase(InternedString::intern("Uploading File"), Some(100)))
+    } else {
+        None
+    };
+
+    let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
+        let mut bar = PhasedProgressBar::new(&format!("Adding {} to registry...", path.display()));
+        loop {
+            let snap = progress.snapshot();
+            bar.update(&snap);
+            if snap.overall.is_complete() {
+                break;
+            }
+            progress.changed().await
+        }
+    })
+    .into();
+
+    sign_phase.start();
+    let blake3_sig =
+        Blake3Ed25519Signature::sign_file(ctx.developer_key()?, &file, SIG_CONTEXT).await?;
+    let size = blake3_sig.size;
+    let signature = Signature::Blake3Ed25519(blake3_sig);
+    sign_phase.complete();
+
+    index_phase.start();
+    let add_res = from_value::<Option<RequestGuid>>(
+        ctx.call_remote::<RegistryContext>(
+            &parent_method
+                .into_iter()
+                .chain(method)
+                .chain([ext])
+                .join("."),
+            imbl_value::json!({
+                "platform": platform,
+                "version": version,
+                "url": &url,
+                "signature": signature,
+                "upload": upload,
+            }),
+        )
+        .await?,
+    )?;
+    index_phase.complete();
+
+    if let Some(guid) = add_res {
+        upload_phase.as_mut().map(|p| p.start());
+        upload_phase.as_mut().map(|p| p.set_total(size));
+        let reg_url = ctx.registry_url.as_ref().or_not_found("--registry")?;
+        ctx.client
+            .post(url)
+            .header("X-StartOS-Registry-Token", guid.as_ref())
+            .header(
+                "X-StartOS-Registry-Auth-Sig",
+                base64::encode(
+                    ctx.developer_key()?
+                        .sign_prehashed(
+                            Sha512::new_with_prefix(guid.as_ref().as_bytes()),
+                            Some(
+                                reg_url
+                                    .host()
+                                    .or_not_found("registry hostname")?
+                                    .to_string()
+                                    .as_bytes(),
+                            ),
+                        )?
+                        .to_bytes(),
+                ),
+            )
+            .body(reqwest::Body::wrap_stream(
+                tokio_util::io::ReaderStream::new(file.fetch(0, size).await?).inspect_ok(
+                    move |b| {
+                        upload_phase
+                            .as_mut()
+                            .map(|p| *p += b.len() as u64)
+                            .apply(|_| ())
+                    },
+                ),
+            ))
+            .send()
+            .await?;
+        // upload_phase.as_mut().map(|p| p.complete());
+    }
+
+    progress_handle.complete();
+
+    progress_task.await.with_kind(ErrorKind::Unknown)?;
+
+    Ok(())
+}
diff --git a/core/startos/src/registry/os/asset/get.rs b/core/startos/src/registry/os/asset/get.rs
new file mode 100644
index 000000000..52e95bc98
--- /dev/null
+++ b/core/startos/src/registry/os/asset/get.rs
@@ -0,0 +1,182 @@
+use std::collections::BTreeMap;
+use std::panic::UnwindSafe;
+use std::path::{Path, PathBuf};
+
+use clap::Parser;
+use helpers::{AtomicFile, NonDetachingJoinHandle};
+use imbl_value::{json, InternedString};
+use itertools::Itertools;
+use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::registry::asset::RegistryAsset;
+use crate::registry::context::RegistryContext;
+use crate::registry::os::index::OsVersionInfo;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::util::Version;
+
+pub fn get_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("iso", from_fn_async(get_iso).no_cli())
+        .subcommand("iso", from_fn_async(cli_get_os_asset).no_display())
+        .subcommand("img", from_fn_async(get_img).no_cli())
+        .subcommand("img", from_fn_async(cli_get_os_asset).no_display())
+        .subcommand("squashfs", from_fn_async(get_squashfs).no_cli())
+        .subcommand("squashfs", from_fn_async(cli_get_os_asset).no_display())
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetOsAssetParams {
+    #[ts(type = "string")]
+    pub version: Version,
+    #[ts(type = "string")]
+    pub platform: InternedString,
+}
+
+async fn get_os_asset(
+    ctx: RegistryContext,
+    GetOsAssetParams { version, platform }: GetOsAssetParams,
+    accessor: impl FnOnce(&Model<OsVersionInfo>) -> &Model<BTreeMap<InternedString, RegistryAsset>>
+        + UnwindSafe
+        + Send,
+) -> Result<RegistryAsset, Error> {
+    accessor(
+        ctx.db
+            .peek()
+            .await
+            .as_index()
+            .as_os()
+            .as_versions()
+            .as_idx(&version)
+            .or_not_found(&version)?,
+    )
+    .as_idx(&platform)
+    .or_not_found(&platform)?
+    .de()
+}
+
+pub async fn get_iso(
+    ctx: RegistryContext,
+    params: GetOsAssetParams,
+) -> Result<RegistryAsset, Error> {
+    get_os_asset(ctx, params, |info| info.as_iso()).await
+}
+
+pub async fn get_img(
+    ctx: RegistryContext,
+    params: GetOsAssetParams,
+) -> Result<RegistryAsset, Error> {
+    get_os_asset(ctx, params, |info| info.as_img()).await
+}
+
+pub async fn get_squashfs(
+    ctx: RegistryContext,
+    params: GetOsAssetParams,
+) -> Result<RegistryAsset, Error> {
+    get_os_asset(ctx, params, |info| info.as_squashfs()).await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+pub struct CliGetOsAssetParams {
+    pub version: Version,
+    pub platform: InternedString,
+    #[arg(long = "download", short = 'd')]
+    pub download: Option<PathBuf>,
+    #[arg(
+        long = "reverify",
+        short = 'r',
+        help = "verify the hash of the file a second time after download"
+    )]
+    pub reverify: bool,
+}
+
+async fn cli_get_os_asset(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params:
+            CliGetOsAssetParams {
+                version,
+                platform,
+                download,
+                reverify,
+            },
+        ..
+    }: HandlerArgs<CliContext, CliGetOsAssetParams>,
+) -> Result<RegistryAsset, Error> {
+    let res = from_value::<RegistryAsset>(
+        ctx.call_remote::<RegistryContext>(
+            &parent_method.into_iter().chain(method).join("."),
+            json!({
+                "version": version,
+                "platform": platform,
+            }),
+        )
+        .await?,
+    )?;
+
+    let validator = res.validate(res.signature_info.all_signers())?;
+
+    if let Some(download) = download {
+        let mut file = AtomicFile::new(&download, None::<&Path>)
+            .await
+            .with_kind(ErrorKind::Filesystem)?;
+
+        let mut progress = FullProgressTracker::new();
+        let progress_handle = progress.handle();
+        let mut download_phase =
+            progress_handle.add_phase(InternedString::intern("Downloading File"), Some(100));
+        download_phase.set_total(validator.size()?);
+        let reverify_phase = if reverify {
+            Some(progress_handle.add_phase(InternedString::intern("Reverifying File"), Some(10)))
+        } else {
+            None
+        };
+
+        let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
+            let mut bar = PhasedProgressBar::new("Downloading...");
+            loop {
+                let snap = progress.snapshot();
+                bar.update(&snap);
+                if snap.overall.is_complete() {
+                    break;
+                }
+                progress.changed().await
+            }
+        })
+        .into();
+
+        download_phase.start();
+        let mut download_writer = download_phase.writer(&mut *file);
+        res.download(ctx.client.clone(), &mut download_writer, &validator)
+            .await?;
+        let (_, mut download_phase) = download_writer.into_inner();
+        file.save().await.with_kind(ErrorKind::Filesystem)?;
+        download_phase.complete();
+
+        if let Some(mut reverify_phase) = reverify_phase {
+            reverify_phase.start();
+            validator
+                .validate_file(&MultiCursorFile::from(
+                    tokio::fs::File::open(download).await?,
+                ))
+                .await?;
+            reverify_phase.complete();
+        }
+
+        progress_handle.complete();
+
+        progress_task.await.with_kind(ErrorKind::Unknown)?;
+    }
+
+    Ok(res)
+}
diff --git a/core/startos/src/registry/os/asset/mod.rs b/core/startos/src/registry/os/asset/mod.rs
new file mode 100644
index 000000000..ec9d6cae7
--- /dev/null
+++ b/core/startos/src/registry/os/asset/mod.rs
@@ -0,0 +1,14 @@
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
+
+pub mod add;
+pub mod get;
+pub mod sign;
+
+pub fn asset_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("add", add::add_api::<C>())
+        .subcommand("add", from_fn_async(add::cli_add_asset).no_display())
+        .subcommand("sign", sign::sign_api::<C>())
+        .subcommand("sign", from_fn_async(sign::cli_sign_asset).no_display())
+        .subcommand("get", get::get_api::<C>())
+}
diff --git a/core/startos/src/registry/os/asset/sign.rs b/core/startos/src/registry/os/asset/sign.rs
new file mode 100644
index 000000000..e19a82899
--- /dev/null
+++ b/core/startos/src/registry/os/asset/sign.rs
@@ -0,0 +1,188 @@
+use std::collections::BTreeMap;
+use std::panic::UnwindSafe;
+use std::path::PathBuf;
+
+use clap::Parser;
+use helpers::NonDetachingJoinHandle;
+use imbl_value::InternedString;
+use itertools::Itertools;
+use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::registry::asset::RegistryAsset;
+use crate::registry::context::RegistryContext;
+use crate::registry::os::index::OsVersionInfo;
+use crate::registry::os::SIG_CONTEXT;
+use crate::registry::signer::{Blake3Ed25519Signature, Signature};
+use crate::util::Version;
+
+pub fn sign_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("iso", from_fn_async(sign_iso).no_cli())
+        .subcommand("img", from_fn_async(sign_img).no_cli())
+        .subcommand("squashfs", from_fn_async(sign_squashfs).no_cli())
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SignAssetParams {
+    #[ts(type = "string")]
+    version: Version,
+    #[ts(type = "string")]
+    platform: InternedString,
+    signature: Signature,
+}
+
+async fn sign_asset(
+    ctx: RegistryContext,
+    SignAssetParams {
+        version,
+        platform,
+        signature,
+    }: SignAssetParams,
+    accessor: impl FnOnce(&mut Model<OsVersionInfo>) -> &mut Model<BTreeMap<InternedString, RegistryAsset>>
+        + UnwindSafe
+        + Send,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            let guid = db.as_index().as_signers().get_signer(&signature.signer())?;
+            if !db
+                .as_index()
+                .as_os()
+                .as_versions()
+                .as_idx(&version)
+                .or_not_found(&version)?
+                .as_signers()
+                .de()?
+                .contains(&guid)
+            {
+                return Err(Error::new(
+                    eyre!("signer {guid} is not authorized"),
+                    ErrorKind::Authorization,
+                ));
+            }
+
+            accessor(
+                db.as_index_mut()
+                    .as_os_mut()
+                    .as_versions_mut()
+                    .as_idx_mut(&version)
+                    .or_not_found(&version)?,
+            )
+            .as_idx_mut(&platform)
+            .or_not_found(&platform)?
+            .as_signature_info_mut()
+            .mutate(|s| s.add_sig(&signature))?;
+
+            Ok(())
+        })
+        .await
+}
+
+pub async fn sign_iso(ctx: RegistryContext, params: SignAssetParams) -> Result<(), Error> {
+    sign_asset(ctx, params, |m| m.as_iso_mut()).await
+}
+
+pub async fn sign_img(ctx: RegistryContext, params: SignAssetParams) -> Result<(), Error> {
+    sign_asset(ctx, params, |m| m.as_img_mut()).await
+}
+
+pub async fn sign_squashfs(ctx: RegistryContext, params: SignAssetParams) -> Result<(), Error> {
+    sign_asset(ctx, params, |m| m.as_squashfs_mut()).await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+pub struct CliSignAssetParams {
+    #[arg(short = 'p', long = "platform")]
+    pub platform: InternedString,
+    #[arg(short = 'v', long = "version")]
+    pub version: Version,
+    pub file: PathBuf,
+}
+
+pub async fn cli_sign_asset(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params:
+            CliSignAssetParams {
+                platform,
+                version,
+                file: path,
+            },
+        ..
+    }: HandlerArgs<CliContext, CliSignAssetParams>,
+) -> Result<(), Error> {
+    let ext = match path.extension().and_then(|e| e.to_str()) {
+        Some("iso") => "iso",
+        Some("img") => "img",
+        Some("squashfs") => "squashfs",
+        _ => {
+            return Err(Error::new(
+                eyre!("Unknown extension"),
+                ErrorKind::InvalidRequest,
+            ))
+        }
+    };
+
+    let file = tokio::fs::File::open(&path).await?.into();
+
+    let mut progress = FullProgressTracker::new();
+    let progress_handle = progress.handle();
+    let mut sign_phase =
+        progress_handle.add_phase(InternedString::intern("Signing File"), Some(10));
+    let mut index_phase = progress_handle.add_phase(
+        InternedString::intern("Adding Signature to Registry Index"),
+        Some(1),
+    );
+
+    let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
+        let mut bar = PhasedProgressBar::new(&format!("Adding {} to registry...", path.display()));
+        loop {
+            let snap = progress.snapshot();
+            bar.update(&snap);
+            if snap.overall.is_complete() {
+                break;
+            }
+            progress.changed().await
+        }
+    })
+    .into();
+
+    sign_phase.start();
+    let blake3_sig =
+        Blake3Ed25519Signature::sign_file(ctx.developer_key()?, &file, SIG_CONTEXT).await?;
+    let signature = Signature::Blake3Ed25519(blake3_sig);
+    sign_phase.complete();
+
+    index_phase.start();
+    ctx.call_remote::<RegistryContext>(
+        &parent_method
+            .into_iter()
+            .chain(method)
+            .chain([ext])
+            .join("."),
+        imbl_value::json!({
+            "platform": platform,
+            "version": version,
+            "signature": signature,
+        }),
+    )
+    .await?;
+    index_phase.complete();
+
+    progress_handle.complete();
+
+    progress_task.await.with_kind(ErrorKind::Unknown)?;
+
+    Ok(())
+}
diff --git a/core/startos/src/registry/os/index.rs b/core/startos/src/registry/os/index.rs
new file mode 100644
index 000000000..186a7e95e
--- /dev/null
+++ b/core/startos/src/registry/os/index.rs
@@ -0,0 +1,44 @@
+use std::collections::{BTreeMap, BTreeSet};
+
+use emver::VersionRange;
+use imbl_value::InternedString;
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::prelude::*;
+use crate::registry::asset::RegistryAsset;
+use crate::registry::context::RegistryContext;
+use crate::rpc_continuations::RequestGuid;
+use crate::util::Version;
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct OsIndex {
+    #[ts(as = "BTreeMap::<String, OsVersionInfo>")]
+    pub versions: BTreeMap<Version, OsVersionInfo>,
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct OsVersionInfo {
+    pub headline: String,
+    pub release_notes: String,
+    #[ts(type = "string")]
+    pub source_version: VersionRange,
+    #[ts(type = "string[]")]
+    pub signers: BTreeSet<RequestGuid>,
+    #[ts(as = "BTreeMap::<String, RegistryAsset>")]
+    pub iso: BTreeMap<InternedString, RegistryAsset>, // platform (i.e. x86_64-nonfree) -> asset
+    #[ts(as = "BTreeMap::<String, RegistryAsset>")]
+    pub squashfs: BTreeMap<InternedString, RegistryAsset>, // platform (i.e. x86_64-nonfree) -> asset
+    #[ts(as = "BTreeMap::<String, RegistryAsset>")]
+    pub img: BTreeMap<InternedString, RegistryAsset>, // platform (i.e. raspberrypi) -> asset
+}
+
+pub async fn get_os_index(ctx: RegistryContext) -> Result<OsIndex, Error> {
+    ctx.db.peek().await.into_index().into_os().de()
+}
diff --git a/core/startos/src/registry/os/mod.rs b/core/startos/src/registry/os/mod.rs
new file mode 100644
index 000000000..64ce44eaf
--- /dev/null
+++ b/core/startos/src/registry/os/mod.rs
@@ -0,0 +1,22 @@
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
+
+use crate::context::CliContext;
+use crate::util::serde::HandlerExtSerde;
+
+pub const SIG_CONTEXT: &str = "startos";
+
+pub mod asset;
+pub mod index;
+pub mod version;
+
+pub fn os_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "index",
+            from_fn_async(index::get_os_index)
+                .with_display_serializable()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand("asset", asset::asset_api::<C>())
+        .subcommand("version", version::version_api::<C>())
+}
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
new file mode 100644
index 000000000..414994875
--- /dev/null
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -0,0 +1,183 @@
+use std::collections::BTreeMap;
+
+use clap::Parser;
+use emver::VersionRange;
+use itertools::Itertools;
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::registry::context::RegistryContext;
+use crate::registry::os::index::OsVersionInfo;
+use crate::registry::signer::SignerKey;
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
+use crate::util::Version;
+
+pub mod signer;
+
+pub fn version_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "add",
+            from_fn_async(add_version)
+                .with_metadata("admin", Value::Bool(true))
+                .with_metadata("getSigner", Value::Bool(true))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove_version)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand("signer", signer::signer_api::<C>())
+        .subcommand(
+            "get",
+            from_fn_async(get_version)
+                .with_display_serializable()
+                .with_custom_display_fn(|handle, result| {
+                    Ok(display_version_info(handle.params, result))
+                })
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct AddVersionParams {
+    #[ts(type = "string")]
+    pub version: Version,
+    pub headline: String,
+    pub release_notes: String,
+    #[ts(type = "string")]
+    pub source_version: VersionRange,
+    #[arg(skip)]
+    #[ts(skip)]
+    #[serde(rename = "__auth_signer")]
+    pub signer: Option<SignerKey>,
+}
+
+pub async fn add_version(
+    ctx: RegistryContext,
+    AddVersionParams {
+        version,
+        headline,
+        release_notes,
+        source_version,
+        signer,
+    }: AddVersionParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            let signer = signer
+                .map(|s| db.as_index().as_signers().get_signer(&s))
+                .transpose()?;
+            db.as_index_mut()
+                .as_os_mut()
+                .as_versions_mut()
+                .upsert(&version, || OsVersionInfo::default())?
+                .mutate(|i| {
+                    i.headline = headline;
+                    i.release_notes = release_notes;
+                    i.source_version = source_version;
+                    i.signers.extend(signer);
+                    Ok(())
+                })
+        })
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct RemoveVersionParams {
+    #[ts(type = "string")]
+    pub version: Version,
+}
+
+pub async fn remove_version(
+    ctx: RegistryContext,
+    RemoveVersionParams { version }: RemoveVersionParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_index_mut()
+                .as_os_mut()
+                .as_versions_mut()
+                .remove(&version)?;
+            Ok(())
+        })
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetVersionParams {
+    #[ts(type = "string | null")]
+    #[arg(long = "src")]
+    pub source: Option<Version>,
+    #[ts(type = "string | null")]
+    #[arg(long = "target")]
+    pub target: Option<VersionRange>,
+}
+
+pub async fn get_version(
+    ctx: RegistryContext,
+    GetVersionParams { source, target }: GetVersionParams,
+) -> Result<BTreeMap<Version, OsVersionInfo>, Error> {
+    let target = target.unwrap_or(VersionRange::Any);
+    ctx.db
+        .peek()
+        .await
+        .into_index()
+        .into_os()
+        .into_versions()
+        .into_entries()?
+        .into_iter()
+        .map(|(v, i)| i.de().map(|i| (v, i)))
+        .filter_ok(|(version, info)| {
+            version.satisfies(&target)
+                && source
+                    .as_ref()
+                    .map_or(true, |s| s.satisfies(&info.source_version))
+        })
+        .collect()
+}
+
+pub fn display_version_info<T>(params: WithIoFormat<T>, info: BTreeMap<Version, OsVersionInfo>) {
+    use prettytable::*;
+
+    if let Some(format) = params.format {
+        return display_serializable(format, info);
+    }
+
+    let mut table = Table::new();
+    table.add_row(row![bc =>
+        "VERSION",
+        "HEADLINE",
+        "RELEASE NOTES",
+        "ISO PLATFORMS",
+        "IMG PLATFORMS",
+        "SQUASHFS PLATFORMS",
+    ]);
+    for (version, info) in &info {
+        table.add_row(row![
+            version.as_str(),
+            &info.headline,
+            &info.release_notes,
+            &info.iso.keys().into_iter().join(", "),
+            &info.img.keys().into_iter().join(", "),
+            &info.squashfs.keys().into_iter().join(", "),
+        ]);
+    }
+    table.print_tty(false).unwrap();
+}
diff --git a/core/startos/src/registry/os/version/signer.rs b/core/startos/src/registry/os/version/signer.rs
new file mode 100644
index 000000000..01173ad18
--- /dev/null
+++ b/core/startos/src/registry/os/version/signer.rs
@@ -0,0 +1,133 @@
+use std::collections::BTreeMap;
+
+use clap::Parser;
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::registry::admin::display_signers;
+use crate::registry::context::RegistryContext;
+use crate::registry::signer::SignerInfo;
+use crate::rpc_continuations::RequestGuid;
+use crate::util::serde::HandlerExtSerde;
+use crate::util::Version;
+
+pub fn signer_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "add",
+            from_fn_async(add_version_signer)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove_version_signer)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list_version_signers)
+                .with_display_serializable()
+                .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct VersionSignerParams {
+    #[ts(type = "string")]
+    pub version: Version,
+    #[ts(type = "string")]
+    pub signer: RequestGuid,
+}
+
+pub async fn add_version_signer(
+    ctx: RegistryContext,
+    VersionSignerParams { version, signer }: VersionSignerParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            ensure_code!(
+                db.as_index().as_signers().contains_key(&signer)?,
+                ErrorKind::InvalidRequest,
+                "unknown signer {signer}"
+            );
+
+            db.as_index_mut()
+                .as_os_mut()
+                .as_versions_mut()
+                .as_idx_mut(&version)
+                .or_not_found(&version)?
+                .as_signers_mut()
+                .mutate(|s| Ok(s.insert(signer)))?;
+
+            Ok(())
+        })
+        .await
+}
+
+pub async fn remove_version_signer(
+    ctx: RegistryContext,
+    VersionSignerParams { version, signer }: VersionSignerParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            if !db
+                .as_index_mut()
+                .as_os_mut()
+                .as_versions_mut()
+                .as_idx_mut(&version)
+                .or_not_found(&version)?
+                .as_signers_mut()
+                .mutate(|s| Ok(s.remove(&signer)))?
+            {
+                return Err(Error::new(
+                    eyre!("signer {signer} is not authorized to sign for v{version}"),
+                    ErrorKind::NotFound,
+                ));
+            }
+
+            Ok(())
+        })
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct ListVersionSignersParams {
+    #[ts(type = "string")]
+    pub version: Version,
+}
+
+pub async fn list_version_signers(
+    ctx: RegistryContext,
+    ListVersionSignersParams { version }: ListVersionSignersParams,
+) -> Result<BTreeMap<RequestGuid, SignerInfo>, Error> {
+    let db = ctx.db.peek().await;
+    db.as_index()
+        .as_os()
+        .as_versions()
+        .as_idx(&version)
+        .or_not_found(&version)?
+        .as_signers()
+        .de()?
+        .into_iter()
+        .filter_map(|guid| {
+            db.as_index()
+                .as_signers()
+                .as_idx(&guid)
+                .map(|s| s.de().map(|s| (guid, s)))
+        })
+        .collect()
+}
diff --git a/core/startos/src/registry/signer.rs b/core/startos/src/registry/signer.rs
new file mode 100644
index 000000000..bf5374d75
--- /dev/null
+++ b/core/startos/src/registry/signer.rs
@@ -0,0 +1,477 @@
+use std::collections::{HashMap, HashSet};
+use std::path::Path;
+use std::str::FromStr;
+
+use clap::builder::ValueParserFactory;
+use imbl_value::InternedString;
+use reqwest::Client;
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha512};
+use tokio::io::AsyncWrite;
+use ts_rs::TS;
+use url::Url;
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::http::HttpSource;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource};
+use crate::util::clap::FromStrParser;
+use crate::util::serde::{Base64, Pem};
+
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct SignerInfo {
+    pub name: String,
+    pub contact: Vec<ContactInfo>,
+    pub keys: HashSet<SignerKey>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, Hash, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+#[serde(tag = "alg", content = "pubkey")]
+pub enum SignerKey {
+    Ed25519(Pem<ed25519_dalek::VerifyingKey>),
+}
+impl SignerKey {
+    pub fn verifier(&self) -> Verifier {
+        match self {
+            Self::Ed25519(k) => Verifier::Ed25519(*k, Sha512::new()),
+        }
+    }
+    pub fn verify_message(
+        &self,
+        message: &[u8],
+        signature: &[u8],
+        context: &str,
+    ) -> Result<(), Error> {
+        let mut v = self.verifier();
+        v.update(message);
+        v.verify(signature, context)
+    }
+}
+impl std::fmt::Display for SignerKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Ed25519(k) => write!(f, "{k}"),
+        }
+    }
+}
+
+pub enum Verifier {
+    Ed25519(Pem<ed25519_dalek::VerifyingKey>, Sha512),
+}
+impl Verifier {
+    pub fn update(&mut self, data: &[u8]) {
+        match self {
+            Self::Ed25519(_, h) => h.update(data),
+        }
+    }
+    pub fn verify(self, signature: &[u8], context: &str) -> Result<(), Error> {
+        match self {
+            Self::Ed25519(k, h) => k.verify_prehashed_strict(
+                h,
+                Some(context.as_bytes()),
+                &ed25519_dalek::Signature::from_slice(signature)?,
+            )?,
+        }
+        Ok(())
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+// TODO: better types
+pub enum ContactInfo {
+    Email(String),
+    Matrix(String),
+    Website(#[ts(type = "string")] Url),
+}
+impl std::fmt::Display for ContactInfo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Email(e) => write!(f, "mailto:{e}"),
+            Self::Matrix(m) => write!(f, "https://matrix.to/#/{m}"),
+            Self::Website(w) => write!(f, "{w}"),
+        }
+    }
+}
+impl FromStr for ContactInfo {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(if let Some(s) = s.strip_prefix("mailto:") {
+            Self::Email(s.to_owned())
+        } else if let Some(s) = s.strip_prefix("https://matrix.to/#/") {
+            Self::Matrix(s.to_owned())
+        } else {
+            Self::Website(s.parse()?)
+        })
+    }
+}
+impl ValueParserFactory for ContactInfo {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "kebab-case")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct SignatureInfo {
+    #[ts(type = "string")]
+    pub context: InternedString,
+    pub blake3_ed255i9: Option<Blake3Ed2551SignatureInfo>,
+}
+impl SignatureInfo {
+    pub fn new(context: &str) -> Self {
+        Self {
+            context: context.into(),
+            blake3_ed255i9: None,
+        }
+    }
+    pub fn validate(&self, accept: AcceptSigners) -> Result<FileValidator, Error> {
+        FileValidator::from_signatures(self.signatures(), accept, &self.context)
+    }
+    pub fn all_signers(&self) -> AcceptSigners {
+        AcceptSigners::All(
+            self.signatures()
+                .map(|s| AcceptSigners::Signer(s.signer()))
+                .collect(),
+        )
+        .flatten()
+    }
+    pub fn signatures(&self) -> impl Iterator<Item = Signature> + '_ {
+        self.blake3_ed255i9.iter().flat_map(|info| {
+            info.signatures
+                .iter()
+                .map(|(k, s)| (k.clone(), *s))
+                .map(|(pubkey, signature)| {
+                    Signature::Blake3Ed25519(Blake3Ed25519Signature {
+                        hash: info.hash,
+                        size: info.size,
+                        pubkey,
+                        signature,
+                    })
+                })
+        })
+    }
+    pub fn add_sig(&mut self, signature: &Signature) -> Result<(), Error> {
+        signature.validate(&self.context)?;
+        match signature {
+            Signature::Blake3Ed25519(s) => {
+                if self
+                    .blake3_ed255i9
+                    .as_ref()
+                    .map_or(true, |info| info.hash == s.hash)
+                {
+                    let new = if let Some(mut info) = self.blake3_ed255i9.take() {
+                        info.signatures.insert(s.pubkey, s.signature);
+                        info
+                    } else {
+                        s.info()
+                    };
+                    self.blake3_ed255i9 = Some(new);
+                    Ok(())
+                } else {
+                    Err(Error::new(
+                        eyre!("hash sum mismatch"),
+                        ErrorKind::InvalidSignature,
+                    ))
+                }
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum AcceptSigners {
+    #[serde(skip)]
+    Accepted(Signature),
+    Signer(SignerKey),
+    Any(Vec<AcceptSigners>),
+    All(Vec<AcceptSigners>),
+}
+impl AcceptSigners {
+    const fn null() -> Self {
+        Self::Any(Vec::new())
+    }
+    pub fn flatten(self) -> Self {
+        match self {
+            Self::Any(mut s) | Self::All(mut s) if s.len() == 1 => s.swap_remove(0).flatten(),
+            s => s,
+        }
+    }
+    pub fn accepted(&self) -> bool {
+        match self {
+            Self::Accepted(_) => true,
+            Self::All(s) => s.iter().all(|s| s.accepted()),
+            _ => false,
+        }
+    }
+    pub fn try_accept(
+        self,
+        context: &str,
+    ) -> Box<dyn Iterator<Item = Result<Signature, Error>> + Send + Sync + '_> {
+        match self {
+            Self::Accepted(s) => Box::new(std::iter::once(s).map(|s| {
+                s.validate(context)?;
+                Ok(s)
+            })),
+            Self::All(s) => Box::new(s.into_iter().flat_map(|s| s.try_accept(context))),
+            _ => Box::new(std::iter::once(Err(Error::new(
+                eyre!("signer(s) not accepted"),
+                ErrorKind::InvalidSignature,
+            )))),
+        }
+    }
+    pub fn process_signature(&mut self, sig: &Signature) {
+        let new = match std::mem::replace(self, Self::null()) {
+            Self::Accepted(s) => Self::Accepted(s),
+            Self::Signer(s) => {
+                if s == sig.signer() {
+                    Self::Accepted(sig.clone())
+                } else {
+                    Self::Signer(s)
+                }
+            }
+            Self::All(mut s) => {
+                s.iter_mut().for_each(|s| s.process_signature(sig));
+
+                Self::All(s)
+            }
+            Self::Any(mut s) => {
+                if let Some(s) = s
+                    .iter_mut()
+                    .map(|s| {
+                        s.process_signature(sig);
+                        s
+                    })
+                    .filter(|s| s.accepted())
+                    .next()
+                {
+                    std::mem::replace(s, Self::null())
+                } else {
+                    Self::Any(s)
+                }
+            }
+        };
+        *self = new;
+    }
+}
+
+#[must_use]
+pub struct FileValidator {
+    blake3: Option<blake3::Hash>,
+    size: Option<u64>,
+}
+impl FileValidator {
+    fn add_blake3(&mut self, hash: [u8; 32], size: u64) -> Result<(), Error> {
+        if let Some(h) = self.blake3 {
+            ensure_code!(h == hash, ErrorKind::InvalidSignature, "hash sum mismatch");
+        }
+        self.blake3 = Some(blake3::Hash::from_bytes(hash));
+        if let Some(s) = self.size {
+            ensure_code!(s == size, ErrorKind::InvalidSignature, "file size mismatch");
+        }
+        self.size = Some(size);
+        Ok(())
+    }
+    pub fn blake3(&self) -> Result<blake3::Hash, Error> {
+        if let Some(hash) = self.blake3 {
+            Ok(hash)
+        } else {
+            Err(Error::new(
+                eyre!("no BLAKE3 signatures found"),
+                ErrorKind::InvalidSignature,
+            ))
+        }
+    }
+    pub fn size(&self) -> Result<u64, Error> {
+        if let Some(size) = self.size {
+            Ok(size)
+        } else {
+            Err(Error::new(
+                eyre!("no signatures found"),
+                ErrorKind::InvalidSignature,
+            ))
+        }
+    }
+    pub fn from_signatures(
+        signatures: impl IntoIterator<Item = Signature>,
+        mut accept: AcceptSigners,
+        context: &str,
+    ) -> Result<Self, Error> {
+        let mut res = Self {
+            blake3: None,
+            size: None,
+        };
+        for signature in signatures {
+            accept.process_signature(&signature);
+        }
+        for signature in accept.try_accept(context) {
+            match signature? {
+                Signature::Blake3Ed25519(s) => res.add_blake3(*s.hash, s.size)?,
+            }
+        }
+
+        Ok(res)
+    }
+    pub async fn download(
+        &self,
+        url: Url,
+        client: Client,
+        dst: &mut (impl AsyncWrite + Unpin + Send + ?Sized),
+    ) -> Result<(), Error> {
+        let src = HttpSource::new(client, url).await?;
+        let (Some(hash), Some(size)) = (self.blake3, self.size) else {
+            return Err(Error::new(
+                eyre!("no BLAKE3 signatures found"),
+                ErrorKind::InvalidSignature,
+            ));
+        };
+        src.section(0, size)
+            .copy_verify(dst, Some((hash, size)))
+            .await?;
+
+        Ok(())
+    }
+    pub async fn validate_file(&self, file: &MultiCursorFile) -> Result<(), Error> {
+        ensure_code!(
+            file.size().await == Some(self.size()?),
+            ErrorKind::InvalidSignature,
+            "file size mismatch"
+        );
+        ensure_code!(
+            file.blake3_mmap().await? == self.blake3()?,
+            ErrorKind::InvalidSignature,
+            "hash sum mismatch"
+        );
+        Ok(())
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct Blake3Ed2551SignatureInfo {
+    pub hash: Base64<[u8; 32]>,
+    pub size: u64,
+    pub signatures: HashMap<Pem<ed25519_dalek::VerifyingKey>, Base64<[u8; 64]>>,
+}
+impl Blake3Ed2551SignatureInfo {
+    pub fn validate(&self, context: &str) -> Result<Vec<Pem<ed25519_dalek::VerifyingKey>>, Error> {
+        self.signatures
+            .iter()
+            .map(|(k, s)| {
+                let sig = Blake3Ed25519Signature {
+                    hash: self.hash,
+                    size: self.size,
+                    pubkey: k.clone(),
+                    signature: *s,
+                };
+                sig.validate(context)?;
+                Ok(sig.pubkey)
+            })
+            .collect()
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum Signature {
+    Blake3Ed25519(Blake3Ed25519Signature),
+}
+impl Signature {
+    pub fn validate(&self, context: &str) -> Result<(), Error> {
+        match self {
+            Self::Blake3Ed25519(a) => a.validate(context),
+        }
+    }
+    pub fn signer(&self) -> SignerKey {
+        match self {
+            Self::Blake3Ed25519(s) => SignerKey::Ed25519(s.pubkey.clone()),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct Blake3Ed25519Signature {
+    pub hash: Base64<[u8; 32]>,
+    pub size: u64,
+    pub pubkey: Pem<ed25519_dalek::VerifyingKey>,
+    // ed25519-sig(sha512(blake3(file) + len_u64_be(file)))
+    pub signature: Base64<[u8; 64]>,
+}
+impl Blake3Ed25519Signature {
+    pub async fn sign_file(
+        key: &ed25519_dalek::SigningKey,
+        file: &MultiCursorFile,
+        context: &str,
+    ) -> Result<Self, Error> {
+        let size = file
+            .size()
+            .await
+            .ok_or_else(|| Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem))?;
+        let hash = file.blake3_mmap().await?;
+        let signature = key.sign_prehashed(
+            Sha512::new_with_prefix(hash.as_bytes()).chain_update(u64::to_be_bytes(size)),
+            Some(context.as_bytes()),
+        )?;
+        Ok(Self {
+            hash: Base64(*hash.as_bytes()),
+            size,
+            pubkey: Pem::new(key.verifying_key()),
+            signature: Base64(signature.to_bytes()),
+        })
+    }
+
+    pub fn validate(&self, context: &str) -> Result<(), Error> {
+        let sig = ed25519_dalek::Signature::from_bytes(&*self.signature);
+        self.pubkey.verify_prehashed_strict(
+            Sha512::new_with_prefix(*self.hash).chain_update(u64::to_be_bytes(self.size)),
+            Some(context.as_bytes()),
+            &sig,
+        )?;
+        Ok(())
+    }
+
+    pub async fn check_file(&self, file: &MultiCursorFile) -> Result<(), Error> {
+        let size = file
+            .size()
+            .await
+            .ok_or_else(|| Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem))?;
+        if self.size != size {
+            return Err(Error::new(
+                eyre!("incorrect file size: expected {} got {}", self.size, size),
+                ErrorKind::InvalidSignature,
+            ));
+        }
+        let hash = file.blake3_mmap().await?;
+        if &*self.hash != hash.as_bytes() {
+            return Err(Error::new(
+                eyre!("hash sum mismatch"),
+                ErrorKind::InvalidSignature,
+            ));
+        }
+        Ok(())
+    }
+
+    pub fn info(&self) -> Blake3Ed2551SignatureInfo {
+        Blake3Ed2551SignatureInfo {
+            hash: self.hash,
+            size: self.size,
+            signatures: [(self.pubkey, self.signature)].into_iter().collect(),
+        }
+    }
+}
diff --git a/core/startos/src/rpc_continuations.rs b/core/startos/src/rpc_continuations.rs
new file mode 100644
index 000000000..04b88ea8e
--- /dev/null
+++ b/core/startos/src/rpc_continuations.rs
@@ -0,0 +1,142 @@
+use std::collections::BTreeMap;
+use std::str::FromStr;
+use std::time::Duration;
+
+use axum::extract::ws::WebSocket;
+use axum::extract::Request;
+use axum::response::Response;
+use clap::builder::ValueParserFactory;
+use futures::future::BoxFuture;
+use helpers::TimedResource;
+use imbl_value::InternedString;
+use tokio::sync::Mutex;
+
+#[allow(unused_imports)]
+use crate::prelude::*;
+use crate::util::clap::FromStrParser;
+use crate::util::new_guid;
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
+pub struct RequestGuid(InternedString);
+impl RequestGuid {
+    pub fn new() -> Self {
+        Self(new_guid())
+    }
+
+    pub fn from(r: &str) -> Option<RequestGuid> {
+        if r.len() != 32 {
+            return None;
+        }
+        for c in r.chars() {
+            if !(c >= 'A' && c <= 'Z' || c >= '2' && c <= '7') {
+                return None;
+            }
+        }
+        Some(RequestGuid(InternedString::intern(r)))
+    }
+}
+impl AsRef<str> for RequestGuid {
+    fn as_ref(&self) -> &str {
+        self.0.as_ref()
+    }
+}
+impl FromStr for RequestGuid {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::from(s).ok_or_else(|| Error::new(eyre!("invalid guid"), ErrorKind::Deserialization))
+    }
+}
+impl ValueParserFactory for RequestGuid {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
+
+#[test]
+fn parse_guid() {
+    println!(
+        "{:?}",
+        RequestGuid::from(&format!("{}", RequestGuid::new()))
+    )
+}
+
+impl std::fmt::Display for RequestGuid {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+pub type RestHandler =
+    Box<dyn FnOnce(Request) -> BoxFuture<'static, Result<Response, crate::Error>> + Send>;
+
+pub type WebSocketHandler = Box<dyn FnOnce(WebSocket) -> BoxFuture<'static, ()> + Send>;
+
+pub enum RpcContinuation {
+    Rest(TimedResource<RestHandler>),
+    WebSocket(TimedResource<WebSocketHandler>),
+}
+impl RpcContinuation {
+    pub fn rest(handler: RestHandler, timeout: Duration) -> Self {
+        RpcContinuation::Rest(TimedResource::new(handler, timeout))
+    }
+    pub fn ws(handler: WebSocketHandler, timeout: Duration) -> Self {
+        RpcContinuation::WebSocket(TimedResource::new(handler, timeout))
+    }
+    pub fn is_timed_out(&self) -> bool {
+        match self {
+            RpcContinuation::Rest(a) => a.is_timed_out(),
+            RpcContinuation::WebSocket(a) => a.is_timed_out(),
+        }
+    }
+}
+
+pub struct RpcContinuations(Mutex<BTreeMap<RequestGuid, RpcContinuation>>);
+impl RpcContinuations {
+    pub fn new() -> Self {
+        RpcContinuations(Mutex::new(BTreeMap::new()))
+    }
+
+    #[instrument(skip_all)]
+    pub async fn clean(&self) {
+        let mut continuations = self.0.lock().await;
+        let mut to_remove = Vec::new();
+        for (guid, cont) in &*continuations {
+            if cont.is_timed_out() {
+                to_remove.push(guid.clone());
+            }
+        }
+        for guid in to_remove {
+            continuations.remove(&guid);
+        }
+    }
+
+    #[instrument(skip_all)]
+    pub async fn add(&self, guid: RequestGuid, handler: RpcContinuation) {
+        self.clean().await;
+        self.0.lock().await.insert(guid, handler);
+    }
+
+    pub async fn get_ws_handler(&self, guid: &RequestGuid) -> Option<WebSocketHandler> {
+        let mut continuations = self.0.lock().await;
+        if !matches!(continuations.get(guid), Some(RpcContinuation::WebSocket(_))) {
+            return None;
+        }
+        let Some(RpcContinuation::WebSocket(x)) = continuations.remove(guid) else {
+            return None;
+        };
+        x.get().await
+    }
+
+    pub async fn get_rest_handler(&self, guid: &RequestGuid) -> Option<RestHandler> {
+        let mut continuations: tokio::sync::MutexGuard<'_, BTreeMap<RequestGuid, RpcContinuation>> =
+            self.0.lock().await;
+        if !matches!(continuations.get(guid), Some(RpcContinuation::Rest(_))) {
+            return None;
+        }
+        let Some(RpcContinuation::Rest(x)) = continuations.remove(guid) else {
+            return None;
+        };
+        x.get().await
+    }
+}
diff --git a/core/startos/src/s9pk/merkle_archive/directory_contents.rs b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
index c5373a31b..19821cf32 100644
--- a/core/startos/src/s9pk/merkle_archive/directory_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
@@ -3,6 +3,7 @@ use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
+use blake3::Hash;
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use imbl::OrdMap;
@@ -11,11 +12,11 @@ use itertools::Itertools;
 use tokio::io::AsyncRead;
 
 use crate::prelude::*;
-use crate::s9pk::merkle_archive::hash::{Hash, HashWriter};
 use crate::s9pk::merkle_archive::sink::{Sink, TrackingWriter};
 use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
 use crate::s9pk::merkle_archive::write_queue::WriteQueue;
 use crate::s9pk::merkle_archive::{varint, Entry, EntryContents};
+use crate::util::io::ParallelBlake3Writer;
 
 #[derive(Clone)]
 pub struct DirectoryContents<S> {
@@ -155,7 +156,7 @@ impl<S: ArchiveSource> DirectoryContents<Section<S>> {
     pub fn deserialize<'a>(
         source: &'a S,
         header: &'a mut (impl AsyncRead + Unpin + Send),
-        sighash: Hash,
+        (sighash, max_size): (Hash, u64),
     ) -> BoxFuture<'a, Result<Self, Error>> {
         async move {
             use tokio::io::AsyncReadExt;
@@ -168,15 +169,20 @@ impl<S: ArchiveSource> DirectoryContents<Section<S>> {
             header.read_exact(&mut size).await?;
             let size = u64::from_be_bytes(size);
 
+            ensure_code!(
+                size <= max_size,
+                ErrorKind::InvalidSignature,
+                "size is greater than signed"
+            );
+
             let mut toc_reader = source.fetch(position, size).await?;
 
             let len = varint::deserialize_varint(&mut toc_reader).await?;
             let mut entries = OrdMap::new();
             for _ in 0..len {
-                entries.insert(
-                    varint::deserialize_varstring(&mut toc_reader).await?.into(),
-                    Entry::deserialize(source, &mut toc_reader).await?,
-                );
+                let name = varint::deserialize_varstring(&mut toc_reader).await?;
+                let entry = Entry::deserialize(source, &mut toc_reader).await?;
+                entries.insert(name.into(), entry);
             }
 
             let res = Self {
@@ -233,7 +239,8 @@ impl<S: FileSource> DirectoryContents<S> {
     #[instrument(skip_all)]
     pub fn sighash<'a>(&'a self) -> BoxFuture<'a, Result<Hash, Error>> {
         async move {
-            let mut hasher = TrackingWriter::new(0, HashWriter::new());
+            let mut hasher =
+                TrackingWriter::new(0, ParallelBlake3Writer::new(super::hash::BUFFER_CAPACITY));
             let mut sig_contents = OrdMap::new();
             for (name, entry) in &**self {
                 sig_contents.insert(name.clone(), entry.to_missing().await?);
@@ -244,7 +251,8 @@ impl<S: FileSource> DirectoryContents<S> {
             }
             .serialize_toc(&mut WriteQueue::new(0), &mut hasher)
             .await?;
-            Ok(hasher.into_inner().finalize())
+            let hash = hasher.into_inner().finalize().await?;
+            Ok(hash)
         }
         .boxed()
     }
@@ -267,7 +275,9 @@ impl<S: FileSource> DirectoryContents<S> {
             _ => std::cmp::Ordering::Equal,
         }) {
             varint::serialize_varstring(&**name, w).await?;
-            entry.serialize_header(queue.add(entry).await?, w).await?;
+            if let Some(pos) = entry.serialize_header(queue.add(entry).await?, w).await? {
+                eprintln!("DEBUG ====> {name} @ {pos}");
+            }
         }
 
         Ok(())
diff --git a/core/startos/src/s9pk/merkle_archive/file_contents.rs b/core/startos/src/s9pk/merkle_archive/file_contents.rs
index 7529fd2d0..a2d19ed88 100644
--- a/core/startos/src/s9pk/merkle_archive/file_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/file_contents.rs
@@ -1,9 +1,10 @@
+use blake3::Hash;
 use tokio::io::AsyncRead;
 
 use crate::prelude::*;
-use crate::s9pk::merkle_archive::hash::{Hash, HashWriter};
 use crate::s9pk::merkle_archive::sink::{Sink, TrackingWriter};
 use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
+use crate::util::io::ParallelBlake3Writer;
 
 #[derive(Debug, Clone)]
 pub struct FileContents<S>(S);
@@ -13,7 +14,6 @@ impl<S> FileContents<S> {
     }
     pub const fn header_size() -> u64 {
         8 // position: u64 BE
-        + 8 // size: u64 BE
     }
 }
 impl<S: ArchiveSource> FileContents<Section<S>> {
@@ -21,6 +21,7 @@ impl<S: ArchiveSource> FileContents<Section<S>> {
     pub async fn deserialize(
         source: &S,
         header: &mut (impl AsyncRead + Unpin + Send),
+        size: u64,
     ) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
 
@@ -28,27 +29,23 @@ impl<S: ArchiveSource> FileContents<Section<S>> {
         header.read_exact(&mut position).await?;
         let position = u64::from_be_bytes(position);
 
-        let mut size = [0u8; 8];
-        header.read_exact(&mut size).await?;
-        let size = u64::from_be_bytes(size);
-
         Ok(Self(source.section(position, size)))
     }
 }
 impl<S: FileSource> FileContents<S> {
-    pub async fn hash(&self) -> Result<Hash, Error> {
-        let mut hasher = TrackingWriter::new(0, HashWriter::new());
+    pub async fn hash(&self) -> Result<(Hash, u64), Error> {
+        let mut hasher =
+            TrackingWriter::new(0, ParallelBlake3Writer::new(super::hash::BUFFER_CAPACITY));
         self.serialize_body(&mut hasher, None).await?;
-        Ok(hasher.into_inner().finalize())
+        let size = hasher.position();
+        let hash = hasher.into_inner().finalize().await?;
+        Ok((hash, size))
     }
     #[instrument(skip_all)]
     pub async fn serialize_header<W: Sink>(&self, position: u64, w: &mut W) -> Result<u64, Error> {
         use tokio::io::AsyncWriteExt;
 
-        let size = self.0.size().await?;
-
         w.write_all(&position.to_be_bytes()).await?;
-        w.write_all(&size.to_be_bytes()).await?;
 
         Ok(position)
     }
@@ -56,21 +53,9 @@ impl<S: FileSource> FileContents<S> {
     pub async fn serialize_body<W: Sink>(
         &self,
         w: &mut W,
-        verify: Option<Hash>,
+        verify: Option<(Hash, u64)>,
     ) -> Result<(), Error> {
-        let start = if verify.is_some() {
-            Some(w.current_position().await?)
-        } else {
-            None
-        };
         self.0.copy_verify(w, verify).await?;
-        if let Some(start) = start {
-            ensure_code!(
-                w.current_position().await? - start == self.0.size().await?,
-                ErrorKind::Pack,
-                "FileSource::copy wrote a number of bytes that does not match FileSource::size"
-            );
-        }
         Ok(())
     }
     pub fn into_dyn(self) -> FileContents<DynFileSource> {
diff --git a/core/startos/src/s9pk/merkle_archive/hash.rs b/core/startos/src/s9pk/merkle_archive/hash.rs
index ae2829012..fc635c435 100644
--- a/core/startos/src/s9pk/merkle_archive/hash.rs
+++ b/core/startos/src/s9pk/merkle_archive/hash.rs
@@ -1,68 +1,57 @@
-pub use blake3::Hash;
-use blake3::Hasher;
+use std::task::Poll;
+
+use blake3::Hash;
 use tokio::io::AsyncWrite;
+use tokio_util::either::Either;
 
 use crate::prelude::*;
+use crate::util::io::{ParallelBlake3Writer, TeeWriter};
 
-#[pin_project::pin_project]
-pub struct HashWriter {
-    hasher: Hasher,
-}
-impl HashWriter {
-    pub fn new() -> Self {
-        Self {
-            hasher: Hasher::new(),
-        }
-    }
-    pub fn finalize(self) -> Hash {
-        self.hasher.finalize()
-    }
-}
-impl AsyncWrite for HashWriter {
-    fn poll_write(
-        self: std::pin::Pin<&mut Self>,
-        _cx: &mut std::task::Context<'_>,
-        buf: &[u8],
-    ) -> std::task::Poll<Result<usize, std::io::Error>> {
-        self.project().hasher.update(buf);
-        std::task::Poll::Ready(Ok(buf.len()))
-    }
-    fn poll_flush(
-        self: std::pin::Pin<&mut Self>,
-        _cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), std::io::Error>> {
-        std::task::Poll::Ready(Ok(()))
-    }
-    fn poll_shutdown(
-        self: std::pin::Pin<&mut Self>,
-        _cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), std::io::Error>> {
-        std::task::Poll::Ready(Ok(()))
-    }
-}
+pub const BUFFER_CAPACITY: usize = 10 * 1024 * 1024; // 10MiB
 
 #[pin_project::pin_project]
 pub struct VerifyingWriter<W> {
-    verify: Option<(Hasher, Hash)>,
+    verify: Option<(Hash, u64)>,
     #[pin]
-    writer: W,
+    writer: Either<TeeWriter<W, ParallelBlake3Writer>, W>,
 }
 impl<W: AsyncWrite> VerifyingWriter<W> {
-    pub fn new(w: W, verify: Option<Hash>) -> Self {
+    pub fn new(w: W, verify: Option<(Hash, u64)>) -> Self {
         Self {
-            verify: verify.map(|v| (Hasher::new(), v)),
-            writer: w,
+            writer: if verify.is_some() {
+                Either::Left(TeeWriter::new(
+                    w,
+                    ParallelBlake3Writer::new(BUFFER_CAPACITY),
+                    BUFFER_CAPACITY,
+                ))
+            } else {
+                Either::Right(w)
+            },
+            verify,
         }
     }
-    pub fn verify(self) -> Result<W, Error> {
-        if let Some((actual, expected)) = self.verify {
-            ensure_code!(
-                actual.finalize() == expected,
-                ErrorKind::InvalidSignature,
-                "hash sum does not match"
-            );
+}
+impl<W: AsyncWrite + Unpin> VerifyingWriter<W> {
+    pub async fn verify(self) -> Result<W, Error> {
+        match self.writer {
+            Either::Left(writer) => {
+                let (writer, actual) = writer.into_inner().await?;
+                if let Some((expected, remaining)) = self.verify {
+                    ensure_code!(
+                        actual.finalize().await? == expected,
+                        ErrorKind::InvalidSignature,
+                        "hash sum mismatch"
+                    );
+                    ensure_code!(
+                        remaining == 0,
+                        ErrorKind::InvalidSignature,
+                        "file size mismatch"
+                    );
+                }
+                Ok(writer)
+            }
+            Either::Right(writer) => Ok(writer),
         }
-        Ok(self.writer)
     }
 }
 impl<W: AsyncWrite> AsyncWrite for VerifyingWriter<W> {
@@ -70,28 +59,35 @@ impl<W: AsyncWrite> AsyncWrite for VerifyingWriter<W> {
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
         buf: &[u8],
-    ) -> std::task::Poll<Result<usize, std::io::Error>> {
+    ) -> Poll<Result<usize, std::io::Error>> {
         let this = self.project();
-        match this.writer.poll_write(cx, buf) {
-            std::task::Poll::Ready(Ok(written)) => {
-                if let Some((h, _)) = this.verify {
-                    h.update(&buf[..written]);
+        if let Some((_, remaining)) = this.verify {
+            if *remaining < buf.len() as u64 {
+                return Poll::Ready(Err(std::io::Error::other(eyre!(
+                    "attempted to write more bytes than signed"
+                ))));
+            }
+        }
+        match this.writer.poll_write(cx, buf)? {
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(n) => {
+                if let Some((_, remaining)) = this.verify {
+                    *remaining -= n as u64;
                 }
-                std::task::Poll::Ready(Ok(written))
+                Poll::Ready(Ok(n))
             }
-            a => a,
         }
     }
     fn poll_flush(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), std::io::Error>> {
+    ) -> Poll<Result<(), std::io::Error>> {
         self.project().writer.poll_flush(cx)
     }
     fn poll_shutdown(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), std::io::Error>> {
+    ) -> Poll<Result<(), std::io::Error>> {
         self.project().writer.poll_shutdown(cx)
     }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
index afd00032a..3863ceeaf 100644
--- a/core/startos/src/s9pk/merkle_archive/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/mod.rs
@@ -1,12 +1,14 @@
 use std::path::Path;
 
+use blake3::Hash;
 use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
+use imbl_value::InternedString;
+use sha2::{Digest, Sha512};
 use tokio::io::AsyncRead;
 
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
 use crate::s9pk::merkle_archive::file_contents::FileContents;
-use crate::s9pk::merkle_archive::hash::Hash;
 use crate::s9pk::merkle_archive::sink::Sink;
 use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
 use crate::s9pk::merkle_archive::write_queue::WriteQueue;
@@ -23,8 +25,8 @@ pub mod write_queue;
 
 #[derive(Debug, Clone)]
 enum Signer {
-    Signed(VerifyingKey, Signature),
-    Signer(SigningKey),
+    Signed(VerifyingKey, Signature, u64, InternedString),
+    Signer(SigningKey, InternedString),
 }
 
 #[derive(Debug, Clone)]
@@ -33,22 +35,23 @@ pub struct MerkleArchive<S> {
     contents: DirectoryContents<S>,
 }
 impl<S> MerkleArchive<S> {
-    pub fn new(contents: DirectoryContents<S>, signer: SigningKey) -> Self {
+    pub fn new(contents: DirectoryContents<S>, signer: SigningKey, context: &str) -> Self {
         Self {
-            signer: Signer::Signer(signer),
+            signer: Signer::Signer(signer, context.into()),
             contents,
         }
     }
     pub fn signer(&self) -> VerifyingKey {
         match &self.signer {
-            Signer::Signed(k, _) => *k,
-            Signer::Signer(k) => k.verifying_key(),
+            Signer::Signed(k, _, _, _) => *k,
+            Signer::Signer(k, _) => k.verifying_key(),
         }
     }
     pub const fn header_size() -> u64 {
         32 // pubkey
                  + 64 // signature
                  + 32 // sighash
+                 + 8 // size
                  + DirectoryContents::<Section<S>>::header_size()
     }
     pub fn contents(&self) -> &DirectoryContents<S> {
@@ -57,8 +60,8 @@ impl<S> MerkleArchive<S> {
     pub fn contents_mut(&mut self) -> &mut DirectoryContents<S> {
         &mut self.contents
     }
-    pub fn set_signer(&mut self, key: SigningKey) {
-        self.signer = Signer::Signer(key);
+    pub fn set_signer(&mut self, key: SigningKey, context: &str) {
+        self.signer = Signer::Signer(key, context.into());
     }
     pub fn sort_by(
         &mut self,
@@ -71,6 +74,7 @@ impl<S: ArchiveSource> MerkleArchive<Section<S>> {
     #[instrument(skip_all)]
     pub async fn deserialize(
         source: &S,
+        context: &str,
         header: &mut (impl AsyncRead + Unpin + Send),
     ) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
@@ -87,12 +91,20 @@ impl<S: ArchiveSource> MerkleArchive<Section<S>> {
         header.read_exact(&mut sighash).await?;
         let sighash = Hash::from_bytes(sighash);
 
-        let contents = DirectoryContents::deserialize(source, header, sighash).await?;
+        let mut max_size = [0u8; 8];
+        header.read_exact(&mut max_size).await?;
+        let max_size = u64::from_be_bytes(max_size);
 
-        pubkey.verify_strict(contents.sighash().await?.as_bytes(), &signature)?;
+        pubkey.verify_prehashed_strict(
+            Sha512::new_with_prefix(sighash.as_bytes()).chain_update(&u64::to_be_bytes(max_size)),
+            Some(context.as_bytes()),
+            &signature,
+        )?;
+
+        let contents = DirectoryContents::deserialize(source, header, (sighash, max_size)).await?;
 
         Ok(Self {
-            signer: Signer::Signed(pubkey, signature),
+            signer: Signer::Signed(pubkey, signature, max_size, context.into()),
             contents,
         })
     }
@@ -109,15 +121,26 @@ impl<S: FileSource> MerkleArchive<S> {
         use tokio::io::AsyncWriteExt;
 
         let sighash = self.contents.sighash().await?;
+        let size = self.contents.toc_size();
 
-        let (pubkey, signature) = match &self.signer {
-            Signer::Signed(pubkey, signature) => (*pubkey, *signature),
-            Signer::Signer(s) => (s.into(), ed25519_dalek::Signer::sign(s, sighash.as_bytes())),
+        let (pubkey, signature, max_size) = match &self.signer {
+            Signer::Signed(pubkey, signature, max_size, _) => (*pubkey, *signature, *max_size),
+            Signer::Signer(s, context) => (
+                s.into(),
+                ed25519_dalek::SigningKey::sign_prehashed(
+                    s,
+                    Sha512::new_with_prefix(sighash.as_bytes())
+                        .chain_update(&u64::to_be_bytes(size)),
+                    Some(context.as_bytes()),
+                )?,
+                size,
+            ),
         };
 
         w.write_all(pubkey.as_bytes()).await?;
         w.write_all(&signature.to_bytes()).await?;
         w.write_all(sighash.as_bytes()).await?;
+        w.write_all(&u64::to_be_bytes(max_size)).await?;
         let mut next_pos = w.current_position().await?;
         next_pos += DirectoryContents::<S>::header_size();
         self.contents.serialize_header(next_pos, w).await?;
@@ -137,7 +160,7 @@ impl<S: FileSource> MerkleArchive<S> {
 
 #[derive(Debug, Clone)]
 pub struct Entry<S> {
-    hash: Option<Hash>,
+    hash: Option<(Hash, u64)>,
     contents: EntryContents<S>,
 }
 impl<S> Entry<S> {
@@ -150,7 +173,7 @@ impl<S> Entry<S> {
     pub fn file(source: S) -> Self {
         Self::new(EntryContents::File(FileContents::new(source)))
     }
-    pub fn hash(&self) -> Option<Hash> {
+    pub fn hash(&self) -> Option<(Hash, u64)> {
         self.hash
     }
     pub fn as_contents(&self) -> &EntryContents<S> {
@@ -189,6 +212,7 @@ impl<S> Entry<S> {
     }
     pub fn header_size(&self) -> u64 {
         32 // hash
+        + 8 // size: u64 BE
         + self.contents.header_size()
     }
 }
@@ -205,10 +229,14 @@ impl<S: ArchiveSource> Entry<Section<S>> {
         header.read_exact(&mut hash).await?;
         let hash = Hash::from_bytes(hash);
 
-        let contents = EntryContents::deserialize(source, header, hash).await?;
+        let mut size = [0u8; 8];
+        header.read_exact(&mut size).await?;
+        let size = u64::from_be_bytes(size);
+
+        let contents = EntryContents::deserialize(source, header, (hash, size)).await?;
 
         Ok(Self {
-            hash: Some(hash),
+            hash: Some((hash, size)),
             contents,
         })
     }
@@ -258,12 +286,13 @@ impl<S: FileSource> Entry<S> {
     ) -> Result<Option<u64>, Error> {
         use tokio::io::AsyncWriteExt;
 
-        let hash = if let Some(hash) = self.hash {
+        let (hash, size) = if let Some(hash) = self.hash {
             hash
         } else {
             self.contents.hash().await?
         };
         w.write_all(hash.as_bytes()).await?;
+        w.write_all(&u64::to_be_bytes(size)).await?;
         self.contents.serialize_header(position, w).await
     }
     pub fn into_dyn(self) -> Entry<DynFileSource> {
@@ -305,7 +334,7 @@ impl<S: ArchiveSource> EntryContents<Section<S>> {
     pub async fn deserialize(
         source: &S,
         header: &mut (impl AsyncRead + Unpin + Send),
-        hash: Hash,
+        (hash, size): (Hash, u64),
     ) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
 
@@ -313,9 +342,11 @@ impl<S: ArchiveSource> EntryContents<Section<S>> {
         header.read_exact(&mut type_id).await?;
         match type_id[0] {
             0 => Ok(Self::Missing),
-            1 => Ok(Self::File(FileContents::deserialize(source, header).await?)),
+            1 => Ok(Self::File(
+                FileContents::deserialize(source, header, size).await?,
+            )),
             2 => Ok(Self::Directory(
-                DirectoryContents::deserialize(source, header, hash).await?,
+                DirectoryContents::deserialize(source, header, (hash, size)).await?,
             )),
             id => Err(Error::new(
                 eyre!("Unknown type id {id} found in MerkleArchive"),
@@ -325,14 +356,14 @@ impl<S: ArchiveSource> EntryContents<Section<S>> {
     }
 }
 impl<S: FileSource> EntryContents<S> {
-    pub async fn hash(&self) -> Result<Hash, Error> {
+    pub async fn hash(&self) -> Result<(Hash, u64), Error> {
         match self {
             Self::Missing => Err(Error::new(
                 eyre!("Cannot compute hash of missing file"),
                 ErrorKind::Pack,
             )),
             Self::File(f) => f.hash().await,
-            Self::Directory(d) => d.sighash().await,
+            Self::Directory(d) => Ok((d.sighash().await?, d.toc_size())),
         }
     }
     #[instrument(skip_all)]
diff --git a/core/startos/src/s9pk/merkle_archive/sink.rs b/core/startos/src/s9pk/merkle_archive/sink.rs
index c71377808..ec1431b8e 100644
--- a/core/startos/src/s9pk/merkle_archive/sink.rs
+++ b/core/startos/src/s9pk/merkle_archive/sink.rs
@@ -36,6 +36,9 @@ impl<W> TrackingWriter<W> {
             writer: w,
         }
     }
+    pub fn position(&self) -> u64 {
+        self.position
+    }
     pub fn into_inner(self) -> W {
         self.writer
     }
diff --git a/core/startos/src/s9pk/merkle_archive/source/http.rs b/core/startos/src/s9pk/merkle_archive/source/http.rs
index 1cb9ba961..738c480ed 100644
--- a/core/startos/src/s9pk/merkle_archive/source/http.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/http.rs
@@ -3,7 +3,7 @@ use futures::stream::BoxStream;
 use futures::{StreamExt, TryStreamExt};
 use reqwest::header::{ACCEPT_RANGES, CONTENT_LENGTH, RANGE};
 use reqwest::{Client, Url};
-use tokio::io::AsyncRead;
+use tokio::io::{AsyncRead, AsyncReadExt, Take};
 use tokio_util::io::StreamReader;
 
 use crate::prelude::*;
@@ -50,9 +50,8 @@ impl HttpSource {
         })
     }
 }
-#[async_trait::async_trait]
 impl ArchiveSource for HttpSource {
-    type Reader = HttpReader;
+    type Reader = Take<HttpReader>;
     async fn size(&self) -> Option<u64> {
         self.size
     }
@@ -72,7 +71,8 @@ impl ArchiveSource for HttpSource {
                     .boxed()
             } else {
                 futures::stream::empty().boxed()
-            }))),
+            }))
+            .take(size)),
             _ => todo!(),
         }
     }
diff --git a/core/startos/src/s9pk/merkle_archive/source/mod.rs b/core/startos/src/s9pk/merkle_archive/source/mod.rs
index 97c94b480..6e3b1e584 100644
--- a/core/startos/src/s9pk/merkle_archive/source/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/mod.rs
@@ -2,6 +2,8 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use blake3::Hash;
+use futures::future::BoxFuture;
+use futures::{Future, FutureExt};
 use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncWrite};
 
@@ -11,29 +13,51 @@ use crate::s9pk::merkle_archive::hash::VerifyingWriter;
 pub mod http;
 pub mod multi_cursor_file;
 
-#[async_trait::async_trait]
 pub trait FileSource: Clone + Send + Sync + Sized + 'static {
     type Reader: AsyncRead + Unpin + Send;
-    async fn size(&self) -> Result<u64, Error>;
-    async fn reader(&self) -> Result<Self::Reader, Error>;
-    async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(&self, w: &mut W) -> Result<(), Error> {
-        tokio::io::copy(&mut self.reader().await?, w).await?;
-        Ok(())
+    fn size(&self) -> impl Future<Output = Result<u64, Error>> + Send;
+    fn reader(&self) -> impl Future<Output = Result<Self::Reader, Error>> + Send;
+    fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        w: &mut W,
+    ) -> impl Future<Output = Result<(), Error>> + Send {
+        async move {
+            tokio::io::copy(&mut self.reader().await?, w).await?;
+            Ok(())
+        }
     }
-    async fn copy_verify<W: AsyncWrite + Unpin + Send + ?Sized>(
+    fn copy_verify<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         w: &mut W,
-        verify: Option<Hash>,
-    ) -> Result<(), Error> {
-        let mut w = VerifyingWriter::new(w, verify);
-        tokio::io::copy(&mut self.reader().await?, &mut w).await?;
-        w.verify()?;
-        Ok(())
+        verify: Option<(Hash, u64)>,
+    ) -> impl Future<Output = Result<(), Error>> + Send {
+        async move {
+            let mut w = VerifyingWriter::new(w, verify);
+            tokio::io::copy(&mut self.reader().await?, &mut w).await?;
+            w.verify().await?;
+            Ok(())
+        }
     }
-    async fn to_vec(&self, verify: Option<Hash>) -> Result<Vec<u8>, Error> {
-        let mut vec = Vec::with_capacity(self.size().await? as usize);
-        self.copy_verify(&mut vec, verify).await?;
-        Ok(vec)
+    fn to_vec(
+        &self,
+        verify: Option<(Hash, u64)>,
+    ) -> impl Future<Output = Result<Vec<u8>, Error>> + Send {
+        fn to_vec(
+            src: &impl FileSource,
+            verify: Option<(Hash, u64)>,
+        ) -> BoxFuture<Result<Vec<u8>, Error>> {
+            async move {
+                let mut vec = Vec::with_capacity(if let Some((_, size)) = &verify {
+                    *size
+                } else {
+                    src.size().await?
+                } as usize);
+                src.copy_verify(&mut vec, verify).await?;
+                Ok(vec)
+            }
+            .boxed()
+        }
+        to_vec(self, verify)
     }
 }
 
@@ -44,7 +68,6 @@ impl DynFileSource {
         Self(Arc::new(source))
     }
 }
-#[async_trait::async_trait]
 impl FileSource for DynFileSource {
     type Reader = Box<dyn AsyncRead + Unpin + Send>;
     async fn size(&self) -> Result<u64, Error> {
@@ -62,11 +85,11 @@ impl FileSource for DynFileSource {
     async fn copy_verify<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         mut w: &mut W,
-        verify: Option<Hash>,
+        verify: Option<(Hash, u64)>,
     ) -> Result<(), Error> {
         self.0.copy_verify(&mut w, verify).await
     }
-    async fn to_vec(&self, verify: Option<Hash>) -> Result<Vec<u8>, Error> {
+    async fn to_vec(&self, verify: Option<(Hash, u64)>) -> Result<Vec<u8>, Error> {
         self.0.to_vec(verify).await
     }
 }
@@ -79,9 +102,9 @@ trait DynableFileSource: Send + Sync + 'static {
     async fn copy_verify(
         &self,
         w: &mut (dyn AsyncWrite + Unpin + Send),
-        verify: Option<Hash>,
+        verify: Option<(Hash, u64)>,
     ) -> Result<(), Error>;
-    async fn to_vec(&self, verify: Option<Hash>) -> Result<Vec<u8>, Error>;
+    async fn to_vec(&self, verify: Option<(Hash, u64)>) -> Result<Vec<u8>, Error>;
 }
 #[async_trait::async_trait]
 impl<T: FileSource> DynableFileSource for T {
@@ -97,16 +120,15 @@ impl<T: FileSource> DynableFileSource for T {
     async fn copy_verify(
         &self,
         w: &mut (dyn AsyncWrite + Unpin + Send),
-        verify: Option<Hash>,
+        verify: Option<(Hash, u64)>,
     ) -> Result<(), Error> {
         FileSource::copy_verify(self, w, verify).await
     }
-    async fn to_vec(&self, verify: Option<Hash>) -> Result<Vec<u8>, Error> {
+    async fn to_vec(&self, verify: Option<(Hash, u64)>) -> Result<Vec<u8>, Error> {
         FileSource::to_vec(self, verify).await
     }
 }
 
-#[async_trait::async_trait]
 impl FileSource for PathBuf {
     type Reader = File;
     async fn size(&self) -> Result<u64, Error> {
@@ -117,7 +139,6 @@ impl FileSource for PathBuf {
     }
 }
 
-#[async_trait::async_trait]
 impl FileSource for Arc<[u8]> {
     type Reader = std::io::Cursor<Self>;
     async fn size(&self) -> Result<u64, Error> {
@@ -134,21 +155,26 @@ impl FileSource for Arc<[u8]> {
     }
 }
 
-#[async_trait::async_trait]
 pub trait ArchiveSource: Clone + Send + Sync + Sized + 'static {
     type Reader: AsyncRead + Unpin + Send;
-    async fn size(&self) -> Option<u64> {
-        None
+    fn size(&self) -> impl Future<Output = Option<u64>> + Send {
+        async { None }
     }
-    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error>;
-    async fn copy_to<W: AsyncWrite + Unpin + Send + ?Sized>(
+    fn fetch(
+        &self,
+        position: u64,
+        size: u64,
+    ) -> impl Future<Output = Result<Self::Reader, Error>> + Send;
+    fn copy_to<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         position: u64,
         size: u64,
         w: &mut W,
-    ) -> Result<(), Error> {
-        tokio::io::copy(&mut self.fetch(position, size).await?, w).await?;
-        Ok(())
+    ) -> impl Future<Output = Result<(), Error>> + Send {
+        async move {
+            tokio::io::copy(&mut self.fetch(position, size).await?, w).await?;
+            Ok(())
+        }
     }
     fn section(&self, position: u64, size: u64) -> Section<Self> {
         Section {
@@ -159,7 +185,6 @@ pub trait ArchiveSource: Clone + Send + Sync + Sized + 'static {
     }
 }
 
-#[async_trait::async_trait]
 impl ArchiveSource for Arc<[u8]> {
     type Reader = tokio::io::Take<std::io::Cursor<Self>>;
     async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
@@ -177,7 +202,6 @@ pub struct Section<S> {
     position: u64,
     size: u64,
 }
-#[async_trait::async_trait]
 impl<S: ArchiveSource> FileSource for Section<S> {
     type Reader = S::Reader;
     async fn size(&self) -> Result<u64, Error> {
diff --git a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
index 7add68e6f..00188559a 100644
--- a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
@@ -31,6 +31,16 @@ impl MultiCursorFile {
             file: Arc::new(Mutex::new(File::open(path_from_fd(fd)).await?)),
         })
     }
+    pub async fn blake3_mmap(&self) -> Result<blake3::Hash, Error> {
+        let path = self.path();
+        tokio::task::spawn_blocking(move || {
+            let mut hasher = blake3::Hasher::new();
+            hasher.update_mmap_rayon(path)?;
+            Ok(hasher.finalize())
+        })
+        .await
+        .with_kind(ErrorKind::Unknown)?
+    }
 }
 impl From<File> for MultiCursorFile {
     fn from(value: File) -> Self {
@@ -67,7 +77,6 @@ impl AsyncRead for FileSectionReader {
     }
 }
 
-#[async_trait::async_trait]
 impl ArchiveSource for MultiCursorFile {
     type Reader = FileSectionReader;
     async fn size(&self) -> Option<u64> {
diff --git a/core/startos/src/s9pk/merkle_archive/test.rs b/core/startos/src/s9pk/merkle_archive/test.rs
index 430ab4f31..e902aafd9 100644
--- a/core/startos/src/s9pk/merkle_archive/test.rs
+++ b/core/startos/src/s9pk/merkle_archive/test.rs
@@ -52,7 +52,7 @@ fn test(files: Vec<(PathBuf, String)>) -> Result<(), Error> {
         }
     }
     let key = SigningKey::generate(&mut rand::thread_rng());
-    let mut a1 = MerkleArchive::new(root, key);
+    let mut a1 = MerkleArchive::new(root, key, "test");
     tokio::runtime::Builder::new_current_thread()
         .enable_io()
         .build()
@@ -63,7 +63,7 @@ fn test(files: Vec<(PathBuf, String)>) -> Result<(), Error> {
             a1.serialize(&mut TrackingWriter::new(0, &mut s1), true)
                 .await?;
             let s1: Arc<[u8]> = s1.into();
-            let a2 = MerkleArchive::deserialize(&s1, &mut Cursor::new(s1.clone())).await?;
+            let a2 = MerkleArchive::deserialize(&s1, "test", &mut Cursor::new(s1.clone())).await?;
 
             for (path, content) in check_set {
                 match a2
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index 312d663fd..ca149c3e3 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -17,6 +17,7 @@ use crate::s9pk::manifest::Manifest;
 use crate::s9pk::merkle_archive::source::DynFileSource;
 use crate::s9pk::merkle_archive::Entry;
 use crate::s9pk::v2::compat::CONTAINER_TOOL;
+use crate::s9pk::v2::SIG_CONTEXT;
 use crate::s9pk::S9pk;
 use crate::util::io::TmpDir;
 use crate::util::serde::{apply_expr, HandlerExtSerde};
@@ -24,7 +25,7 @@ use crate::util::Invoke;
 
 pub const SKIP_ENV: &[&str] = &["TERM", "container", "HOME", "HOSTNAME"];
 
-pub fn s9pk() -> ParentHandler {
+pub fn s9pk() -> ParentHandler<CliContext> {
     ParentHandler::new()
         .subcommand("edit", edit())
         .subcommand("inspect", inspect())
@@ -35,9 +36,9 @@ struct S9pkPath {
     s9pk: PathBuf,
 }
 
-fn edit() -> ParentHandler<S9pkPath> {
+fn edit() -> ParentHandler<CliContext, S9pkPath> {
     let only_parent = |a, _| a;
-    ParentHandler::<S9pkPath>::new()
+    ParentHandler::new()
         .subcommand(
             "add-image",
             from_fn_async(add_image)
@@ -52,9 +53,9 @@ fn edit() -> ParentHandler<S9pkPath> {
         )
 }
 
-fn inspect() -> ParentHandler<S9pkPath> {
+fn inspect() -> ParentHandler<CliContext, S9pkPath> {
     let only_parent = |a, _| a;
-    ParentHandler::<S9pkPath>::new()
+    ParentHandler::new()
         .subcommand(
             "file-tree",
             from_fn_async(file_tree)
@@ -158,7 +159,7 @@ async fn add_image(
             .invoke(ErrorKind::Docker)
             .await?;
         let archive = s9pk.as_archive_mut();
-        archive.set_signer(ctx.developer_key()?.clone());
+        archive.set_signer(ctx.developer_key()?.clone(), SIG_CONTEXT);
         archive.contents_mut().insert_path(
             Path::new("images")
                 .join(&arch)
@@ -213,7 +214,7 @@ async fn edit_manifest(
     let tmp_path = s9pk_path.with_extension("s9pk.tmp");
     let mut tmp_file = File::create(&tmp_path).await?;
     s9pk.as_archive_mut()
-        .set_signer(ctx.developer_key()?.clone());
+        .set_signer(ctx.developer_key()?.clone(), SIG_CONTEXT);
     s9pk.serialize(&mut tmp_file, true).await?;
     tmp_file.sync_all().await?;
     tokio::fs::rename(&tmp_path, &s9pk_path).await?;
diff --git a/core/startos/src/s9pk/v1/docker.rs b/core/startos/src/s9pk/v1/docker.rs
index bbb1f2f09..96c532479 100644
--- a/core/startos/src/s9pk/v1/docker.rs
+++ b/core/startos/src/s9pk/v1/docker.rs
@@ -55,7 +55,6 @@ impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> DockerReader<R> {
         if let Some(image) = tokio_tar::Archive::new(rdr)
             .entries()?
             .try_filter_map(|e| {
-                let arch = arch.clone();
                 async move {
                     Ok(if &*e.path()? == Path::new(&format!("{}.tar", arch)) {
                         Some(e)
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index f95a7e4bf..109ea43b4 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -18,7 +18,7 @@ use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
 use crate::s9pk::rpc::SKIP_ENV;
 use crate::s9pk::v1::manifest::Manifest as ManifestV1;
 use crate::s9pk::v1::reader::S9pkReader;
-use crate::s9pk::v2::S9pk;
+use crate::s9pk::v2::{S9pk, SIG_CONTEXT};
 use crate::util::io::TmpDir;
 use crate::util::Invoke;
 
@@ -40,7 +40,6 @@ enum CompatSource {
     Buffered(Arc<[u8]>),
     File(PathBuf),
 }
-#[async_trait::async_trait]
 impl FileSource for CompatSource {
     type Reader = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
     async fn size(&self) -> Result<u64, Error> {
@@ -315,7 +314,7 @@ impl S9pk<Section<MultiCursorFile>> {
             )),
         )?;
 
-        let mut s9pk = S9pk::new(MerkleArchive::new(archive, signer), None).await?;
+        let mut s9pk = S9pk::new(MerkleArchive::new(archive, signer, SIG_CONTEXT), None).await?;
         let mut dest_file = File::create(destination.as_ref()).await?;
         s9pk.serialize(&mut dest_file, false).await?;
         dest_file.sync_all().await?;
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index 1051aaaf8..9452b7a72 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -17,6 +17,8 @@ use crate::ARCH;
 
 const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x02];
 
+pub const SIG_CONTEXT: &str = "s9pk";
+
 pub mod compat;
 pub mod manifest;
 
@@ -191,7 +193,7 @@ impl<S: ArchiveSource> S9pk<Section<S>> {
             "Invalid Magic or Unexpected Version"
         );
 
-        let mut archive = MerkleArchive::deserialize(source, &mut header).await?;
+        let mut archive = MerkleArchive::deserialize(source, SIG_CONTEXT, &mut header).await?;
 
         if apply_filter {
             archive.filter(filter)?;
diff --git a/core/startos/src/service/cli.rs b/core/startos/src/service/cli.rs
index d3bdccd72..82c63d6a7 100644
--- a/core/startos/src/service/cli.rs
+++ b/core/startos/src/service/cli.rs
@@ -5,10 +5,11 @@ use clap::Parser;
 use imbl_value::Value;
 use once_cell::sync::OnceCell;
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{call_remote_socket, yajrc, CallRemote, Context};
+use rpc_toolkit::{call_remote_socket, yajrc, CallRemote, Context, Empty};
 use tokio::runtime::Runtime;
 
 use crate::lxc::HOST_RPC_SERVER_SOCKET;
+use crate::service::service_effect_handler::EffectContext;
 
 #[derive(Debug, Default, Parser)]
 pub struct ContainerClientConfig {
@@ -48,9 +49,8 @@ impl Context for ContainerCliContext {
     }
 }
 
-#[async_trait::async_trait]
-impl CallRemote for ContainerCliContext {
-    async fn call_remote(&self, method: &str, params: Value) -> Result<Value, RpcError> {
+impl CallRemote<EffectContext> for ContainerCliContext {
+    async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
         call_remote_socket(
             tokio::net::UnixStream::connect(&self.0.socket)
                 .await
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index a4e3a4858..a9ee0bd81 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -7,14 +7,13 @@ use futures::future::BoxFuture;
 use imbl::OrdMap;
 use models::{HealthCheckId, PackageId, ProcedureName};
 use persistent_container::PersistentContainer;
-use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, Handler, HandlerArgs};
+use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
 use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
 use tokio::sync::Notify;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
-use crate::core::rpc_continuations::RequestGuid;
 use crate::db::model::package::{
     InstalledState, PackageDataEntry, PackageState, PackageStateMatchModelRef, UpdatingState,
 };
@@ -23,6 +22,7 @@ use crate::install::PKG_ARCHIVE_DIR;
 use crate::lxc::ContainerId;
 use crate::prelude::*;
 use crate::progress::{NamedProgress, Progress};
+use crate::rpc_continuations::RequestGuid;
 use crate::s9pk::S9pk;
 use crate::service::service_map::InstallProgressHandles;
 use crate::service::transition::TransitionKind;
@@ -510,11 +510,25 @@ pub async fn connect_rpc(
 }
 
 pub async fn connect_rpc_cli(
-    handle_args: HandlerArgs<CliContext, ConnectParams>,
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        params,
+        inherited_params,
+        raw_params,
+    }: HandlerArgs<CliContext, ConnectParams>,
 ) -> Result<(), Error> {
-    let ctx = handle_args.context.clone();
-    let guid = CallRemoteHandler::<CliContext, _>::new(from_fn_async(connect_rpc))
-        .handle_async(handle_args)
+    let ctx = context.clone();
+    let guid = CallRemoteHandler::<CliContext, _, _>::new(from_fn_async(connect_rpc))
+        .handle_async(HandlerArgs {
+            context,
+            parent_method,
+            method,
+            params: rpc_toolkit::util::Flat(params, Empty {}),
+            inherited_params,
+            raw_params,
+        })
         .await?;
 
     crate::lxc::connect_cli(&ctx, guid).await
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index e69498e5f..2cb68a121 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -10,7 +10,7 @@ use imbl_value::InternedString;
 use models::{ProcedureName, VolumeId};
 use rpc_toolkit::{Empty, Server, ShutdownHandle};
 use serde::de::DeserializeOwned;
-use tokio::fs::{create_dir_all, File};
+use tokio::fs::{ File};
 use tokio::process::Command;
 use tokio::sync::{oneshot, watch, Mutex, OnceCell};
 use tracing::instrument;
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 0ad45aad1..c5e5433e6 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -16,7 +16,7 @@ use models::{
     ActionId, DataUrl, HealthCheckId, HostId, Id, ImageId, PackageId, ServiceInterfaceId, VolumeId,
 };
 use patch_db::json_ptr::JsonPointer;
-use rpc_toolkit::{from_fn, from_fn_async, AnyContext, Context, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn, from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use ts_rs::TS;
@@ -36,7 +36,7 @@ use crate::net::service_interface::{
     ServiceInterfaceWithHostInfo,
 };
 use crate::prelude::*;
-use crate::s9pk::merkle_archive::source::http::{HttpReader, HttpSource};
+use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::rpc::SKIP_ENV;
 use crate::s9pk::S9pk;
 use crate::service::cli::ContainerCliContext;
@@ -74,14 +74,17 @@ struct RpcData {
     method: String,
     params: Value,
 }
-pub fn service_effect_handler() -> ParentHandler {
+pub fn service_effect_handler<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("gitInfo", from_fn(crate::version::git_info))
+        .subcommand("gitInfo", from_fn(|_: C| crate::version::git_info()))
         .subcommand(
             "echo",
-            from_fn(echo).with_remote_cli::<ContainerCliContext>(),
+            from_fn(echo::<EffectContext>).with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "chroot",
+            from_fn(chroot::<ContainerCliContext>).no_display(),
         )
-        .subcommand("chroot", from_fn(chroot).no_display())
         .subcommand("exists", from_fn_async(exists).no_cli())
         .subcommand("executeAction", from_fn_async(execute_action).no_cli())
         .subcommand("getConfigured", from_fn_async(get_configured).no_cli())
@@ -89,35 +92,35 @@ pub fn service_effect_handler() -> ParentHandler {
             "stopped",
             from_fn_async(stopped)
                 .no_display()
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
             "running",
             from_fn_async(running)
                 .no_display()
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
             "restart",
             from_fn_async(restart)
                 .no_display()
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
             "shutdown",
             from_fn_async(shutdown)
                 .no_display()
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
             "setConfigured",
             from_fn_async(set_configured)
                 .no_display()
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
             "setMainStatus",
-            from_fn_async(set_main_status).with_remote_cli::<ContainerCliContext>(),
+            from_fn_async(set_main_status).with_call_remote::<ContainerCliContext>(),
         )
         .subcommand("setHealth", from_fn_async(set_health).no_cli())
         .subcommand("getStore", from_fn_async(get_store).no_cli())
@@ -129,10 +132,8 @@ pub fn service_effect_handler() -> ParentHandler {
         .subcommand(
             "createOverlayedImage",
             from_fn_async(create_overlayed_image)
-                .with_custom_display_fn::<AnyContext, _>(|_, (path, _)| {
-                    Ok(println!("{}", path.display()))
-                })
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_custom_display_fn(|_, (path, _)| Ok(println!("{}", path.display())))
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
             "destroyOverlayedImage",
@@ -154,19 +155,19 @@ pub fn service_effect_handler() -> ParentHandler {
             "setDependencies",
             from_fn_async(set_dependencies)
                 .no_display()
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
             "getDependencies",
             from_fn_async(get_dependencies)
                 .no_display()
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
             "checkDependencies",
             from_fn_async(check_dependencies)
                 .no_display()
-                .with_remote_cli::<ContainerCliContext>(),
+                .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand("getSystemSmtp", from_fn_async(get_system_smtp).no_cli())
         .subcommand("getContainerIp", from_fn_async(get_container_ip).no_cli())
@@ -493,7 +494,7 @@ struct GetHostInfoParams {
     callback: Callback,
 }
 async fn get_host_info(
-    _: AnyContext,
+    _: EffectContext,
     GetHostInfoParams { .. }: GetHostInfoParams,
 ) -> Result<Value, Error> {
     todo!()
@@ -537,7 +538,7 @@ struct GetServiceInterfaceParams {
     callback: Callback,
 }
 async fn get_service_interface(
-    _: AnyContext,
+    _: EffectContext,
     GetServiceInterfaceParams {
         callback,
         package_id,
@@ -584,8 +585,8 @@ struct ChrootParams {
     #[ts(type = "string[]")]
     args: Vec<OsString>,
 }
-fn chroot(
-    _: AnyContext,
+fn chroot<C: Context>(
+    _: C,
     ChrootParams {
         env,
         workdir,
@@ -734,7 +735,7 @@ async fn set_store(
             let model = db
                 .as_private_mut()
                 .as_package_stores_mut()
-                .upsert(&package_id, || Box::new(json!({})))?;
+                .upsert(&package_id, || json!({}))?;
             let mut model_value = model.de()?;
             if model_value.is_null() {
                 model_value = json!({});
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 891741754..02b0538ec 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -165,7 +165,7 @@ impl ServiceMap {
                                     configured: false,
                                     main: MainStatus::Stopped,
                                 },
-                                marketplace_url: None,
+                                registry: None,
                                 developer_key: Pem::new(developer_key),
                                 icon,
                                 last_backup: None,
@@ -206,6 +206,7 @@ impl ServiceMap {
                             Some(Duration::from_millis(100)),
                         )));
 
+                    download_progress.start();
                     let mut progress_writer = ProgressTrackerWriter::new(
                         crate::util::io::create_file(&download_path).await?,
                         download_progress,
@@ -229,6 +230,7 @@ impl ServiceMap {
                 .await?;
             Ok(reload_guard
                 .handle_last(async move {
+                    finalization_progress.start();
                     let s9pk = S9pk::open(&installed_path, Some(&id), true).await?;
                     let prev = if let Some(service) = service.take() {
                         ensure_code!(
@@ -246,7 +248,6 @@ impl ServiceMap {
                         service
                             .uninstall(Some(s9pk.as_manifest().version.clone()))
                             .await?;
-                        finalization_progress.complete();
                         progress_handle.complete();
                         Some(version)
                     } else {
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 9120544e3..a035e932f 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -7,7 +7,7 @@ use josekit::jwk::Jwk;
 use openssl::x509::X509;
 use patch_db::json_ptr::ROOT;
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{from_fn_async, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
@@ -37,7 +37,7 @@ use crate::util::crypto::EncryptedWire;
 use crate::util::io::{dir_copy, dir_size, Counter};
 use crate::{Error, ErrorKind, ResultExt};
 
-pub fn setup() -> ParentHandler {
+pub fn setup<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "status",
@@ -45,10 +45,10 @@ pub fn setup() -> ParentHandler {
                 .with_metadata("authenticated", Value::Bool(false))
                 .no_cli(),
         )
-        .subcommand("disk", disk())
+        .subcommand("disk", disk::<C>())
         .subcommand("attach", from_fn_async(attach).no_cli())
         .subcommand("execute", from_fn_async(execute).no_cli())
-        .subcommand("cifs", cifs())
+        .subcommand("cifs", cifs::<C>())
         .subcommand("complete", from_fn_async(complete).no_cli())
         .subcommand(
             "get-pubkey",
@@ -59,7 +59,7 @@ pub fn setup() -> ParentHandler {
         .subcommand("exit", from_fn_async(exit).no_cli())
 }
 
-pub fn disk() -> ParentHandler {
+pub fn disk<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand(
         "list",
         from_fn_async(list_disks)
@@ -207,7 +207,7 @@ pub async fn get_pubkey(ctx: SetupContext) -> Result<Jwk, RpcError> {
     Ok(pub_key)
 }
 
-pub fn cifs() -> ParentHandler {
+pub fn cifs<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand("verify", from_fn_async(verify_cifs).no_cli())
 }
 
@@ -360,7 +360,7 @@ pub async fn complete(ctx: SetupContext) -> Result<SetupResult, Error> {
             crate::ErrorKind::InvalidRequest,
         ));
     };
-    let mut guid_file = File::create("/media/embassy/config/disk.guid").await?;
+    let mut guid_file = File::create("/media/startos/config/disk.guid").await?;
     guid_file.write_all(guid.as_bytes()).await?;
     guid_file.sync_all().await?;
     Ok(setup_result)
@@ -463,7 +463,7 @@ async fn migrate(
 
     let _ = crate::disk::main::import(
         &old_guid,
-        "/media/embassy/migrate",
+        "/media/startos/migrate",
         RepairStrategy::Preen,
         if guid.ends_with("_UNENC") {
             None
@@ -473,9 +473,9 @@ async fn migrate(
     )
     .await?;
 
-    let main_transfer_args = ("/media/embassy/migrate/main/", "/embassy-data/main/");
+    let main_transfer_args = ("/media/startos/migrate/main/", "/embassy-data/main/");
     let package_data_transfer_args = (
-        "/media/embassy/migrate/package-data/",
+        "/media/startos/migrate/package-data/",
         "/embassy-data/package-data/",
     );
 
@@ -540,7 +540,7 @@ async fn migrate(
 
     let (hostname, tor_addr, root_ca) = setup_init(&ctx, Some(start_os_password)).await?;
 
-    crate::disk::main::export(&old_guid, "/media/embassy/migrate").await?;
+    crate::disk::main::export(&old_guid, "/media/startos/migrate").await?;
 
     Ok((guid, hostname, tor_addr, root_ca))
 }
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index 787d54056..82d06be4c 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -5,7 +5,7 @@ use clap::builder::ValueParserFactory;
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use imbl_value::InternedString;
-use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
@@ -79,28 +79,28 @@ impl std::str::FromStr for SshPubKey {
 }
 
 // #[command(subcommands(add, delete, list,))]
-pub fn ssh() -> ParentHandler {
+pub fn ssh<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "add",
             from_fn_async(add)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
             from_fn_async(list)
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                .with_custom_display_fn(|handle, result| {
                     Ok(display_all_ssh_keys(handle.params, result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index 1a851fd2e..50b17b54a 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -5,8 +5,7 @@ use chrono::Utc;
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::FutureExt;
-use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use tokio::process::Command;
 use tokio::sync::broadcast::Receiver;
@@ -16,33 +15,30 @@ use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::disk::util::{get_available, get_used};
-use crate::logs::{
-    cli_logs_generic_follow, cli_logs_generic_nofollow, fetch_logs, follow_logs, LogFollowResponse,
-    LogResponse, LogSource,
-};
+use crate::logs::{LogSource, LogsParams, SYSTEM_UNIT};
 use crate::prelude::*;
+use crate::rpc_continuations::RpcContinuations;
 use crate::shutdown::Shutdown;
 use crate::util::cpupower::{get_available_governors, set_governor, Governor};
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::util::Invoke;
-use crate::{Error, ErrorKind, ResultExt};
 
-pub fn experimental() -> ParentHandler {
+pub fn experimental<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "zram",
             from_fn_async(zram)
                 .no_display()
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "governor",
             from_fn_async(governor)
                 .with_display_serializable()
-                .with_custom_display_fn::<AnyContext, _>(|handle, result| {
+                .with_custom_display_fn(|handle, result| {
                     Ok(display_governor_info(handle.params, result))
                 })
-                .with_remote_cli::<CliContext>(),
+                .with_call_remote::<CliContext>(),
         )
 }
 
@@ -230,173 +226,13 @@ pub async fn time(ctx: RpcContext, _: Empty) -> Result<TimeInfo, Error> {
         uptime: ctx.start_time.elapsed().as_secs(),
     })
 }
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct LogsParams {
-    #[arg(short = 'l', long = "limit")]
-    #[ts(type = "number | null")]
-    limit: Option<usize>,
-    #[arg(short = 'c', long = "cursor")]
-    cursor: Option<String>,
-    #[arg(short = 'B', long = "before")]
-    #[serde(default)]
-    before: bool,
-    #[arg(short = 'f', long = "follow")]
-    #[serde(default)]
-    follow: bool,
-}
-
-pub fn logs() -> ParentHandler<LogsParams> {
-    ParentHandler::new()
-        .root_handler(
-            from_fn_async(cli_logs)
-                .no_display()
-                .with_inherited(|params, _| params),
-        )
-        .root_handler(
-            from_fn_async(logs_nofollow)
-                .with_inherited(|params, _| params)
-                .no_cli(),
-        )
-        .subcommand(
-            "follow",
-            from_fn_async(logs_follow)
-                .with_inherited(|params, _| params)
-                .no_cli(),
-        )
-}
 
-pub async fn cli_logs(
-    ctx: CliContext,
-    _: Empty,
-    LogsParams {
-        limit,
-        cursor,
-        before,
-        follow,
-    }: LogsParams,
-) -> Result<(), RpcError> {
-    if follow {
-        if cursor.is_some() {
-            return Err(RpcError::from(Error::new(
-                eyre!("The argument '--cursor <cursor>' cannot be used with '--follow'"),
-                crate::ErrorKind::InvalidRequest,
-            )));
-        }
-        if before {
-            return Err(RpcError::from(Error::new(
-                eyre!("The argument '--before' cannot be used with '--follow'"),
-                crate::ErrorKind::InvalidRequest,
-            )));
-        }
-        cli_logs_generic_follow(ctx, "server.logs.follow", None, limit).await
-    } else {
-        cli_logs_generic_nofollow(ctx, "server.logs", None, limit, cursor, before).await
-    }
-}
-pub async fn logs_nofollow(
-    _ctx: AnyContext,
-    _: Empty,
-    LogsParams {
-        limit,
-        cursor,
-        before,
-        ..
-    }: LogsParams,
-) -> Result<LogResponse, Error> {
-    fetch_logs(LogSource::System, limit, cursor, before).await
+pub fn logs<C: Context + AsRef<RpcContinuations>>() -> ParentHandler<C, LogsParams> {
+    crate::logs::logs(|_: &C, _| async { Ok(LogSource::Unit(SYSTEM_UNIT)) })
 }
 
-pub async fn logs_follow(
-    ctx: RpcContext,
-    _: Empty,
-    LogsParams { limit, .. }: LogsParams,
-) -> Result<LogFollowResponse, Error> {
-    follow_logs(ctx, LogSource::System, limit).await
-}
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct KernelLogsParams {
-    #[arg(short = 'l', long = "limit")]
-    #[ts(type = "number | null")]
-    limit: Option<usize>,
-    #[arg(short = 'c', long = "cursor")]
-    cursor: Option<String>,
-    #[arg(short = 'B', long = "before")]
-    #[serde(default)]
-    before: bool,
-    #[arg(short = 'f', long = "follow")]
-    #[serde(default)]
-    follow: bool,
-}
-pub fn kernel_logs() -> ParentHandler<KernelLogsParams> {
-    ParentHandler::new()
-        .root_handler(
-            from_fn_async(cli_kernel_logs)
-                .no_display()
-                .with_inherited(|params, _| params),
-        )
-        .root_handler(
-            from_fn_async(kernel_logs_nofollow)
-                .with_inherited(|params, _| params)
-                .no_cli(),
-        )
-        .subcommand(
-            "follow",
-            from_fn_async(kernel_logs_follow)
-                .with_inherited(|params, _| params)
-                .no_cli(),
-        )
-}
-pub async fn cli_kernel_logs(
-    ctx: CliContext,
-    _: Empty,
-    KernelLogsParams {
-        limit,
-        cursor,
-        before,
-        follow,
-    }: KernelLogsParams,
-) -> Result<(), RpcError> {
-    if follow {
-        if cursor.is_some() {
-            return Err(RpcError::from(Error::new(
-                eyre!("The argument '--cursor <cursor>' cannot be used with '--follow'"),
-                crate::ErrorKind::InvalidRequest,
-            )));
-        }
-        if before {
-            return Err(RpcError::from(Error::new(
-                eyre!("The argument '--before' cannot be used with '--follow'"),
-                crate::ErrorKind::InvalidRequest,
-            )));
-        }
-        cli_logs_generic_follow(ctx, "server.kernel-logs.follow", None, limit).await
-    } else {
-        cli_logs_generic_nofollow(ctx, "server.kernel-logs", None, limit, cursor, before).await
-    }
-}
-pub async fn kernel_logs_nofollow(
-    _ctx: AnyContext,
-    _: Empty,
-    KernelLogsParams {
-        limit,
-        cursor,
-        before,
-        ..
-    }: KernelLogsParams,
-) -> Result<LogResponse, Error> {
-    fetch_logs(LogSource::Kernel, limit, cursor, before).await
-}
-
-pub async fn kernel_logs_follow(
-    ctx: RpcContext,
-    _: Empty,
-    KernelLogsParams { limit, .. }: KernelLogsParams,
-) -> Result<LogFollowResponse, Error> {
-    follow_logs(ctx, LogSource::Kernel, limit).await
+pub fn kernel_logs<C: Context + AsRef<RpcContinuations>>() -> ParentHandler<C, LogsParams> {
+    crate::logs::logs(|_: &C, _| async { Ok(LogSource::Kernel) })
 }
 
 #[derive(Serialize, Deserialize)]
diff --git a/core/startos/src/update/latest_information.rs b/core/startos/src/update/latest_information.rs
deleted file mode 100644
index e897dd40a..000000000
--- a/core/startos/src/update/latest_information.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::collections::HashMap;
-
-use emver::Version;
-use serde::{Deserialize, Serialize};
-use serde_with::{serde_as, DisplayFromStr};
-
-#[serde_as]
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct LatestInformation {
-    release_notes: HashMap<String, String>,
-    headline: String,
-    #[serde_as(as = "DisplayFromStr")]
-    pub version: Version,
-}
-
-/// Captured from https://beta-registry-0-3.start9labs.com/eos/latest 2021-09-24
-#[test]
-fn latest_information_from_server() {
-    let data_from_server = r#"{"release-notes":{"0.3.0":"This major software release encapsulates the optimal performance, security, and management enhancments to the embassyOS experience."},"headline":"Major embassyOS release","version":"0.3.0"}"#;
-    let latest_information: LatestInformation = serde_json::from_str(data_from_server).unwrap();
-    assert_eq!(latest_information.version.minor(), 3);
-}
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index 05303182d..5bcf8445d 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -1,46 +1,60 @@
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::collections::BTreeMap;
+use std::path::Path;
+use std::time::Duration;
 
-use clap::Parser;
+use clap::{ArgAction, Parser};
 use color_eyre::eyre::{eyre, Result};
-use emver::Version;
-use helpers::{Rsync, RsyncOptions};
-use lazy_static::lazy_static;
+use emver::{Version, VersionRange};
+use futures::{FutureExt, TryStreamExt};
+use helpers::{AtomicFile, NonDetachingJoinHandle};
+use imbl_value::json;
+use itertools::Itertools;
+use patch_db::json_ptr::JsonPointer;
 use reqwest::Url;
-use rpc_toolkit::command;
+use rpc_toolkit::HandlerArgs;
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
-use tokio_stream::StreamExt;
 use tracing::instrument;
 use ts_rs::TS;
 
-use crate::context::RpcContext;
-use crate::db::model::public::UpdateProgress;
-use crate::disk::mount::filesystem::bind::Bind;
-use crate::disk::mount::filesystem::ReadWrite;
-use crate::disk::mount::guard::MountGuard;
+use crate::context::{CliContext, RpcContext};
 use crate::notifications::{notify, NotificationLevel};
 use crate::prelude::*;
-use crate::registry::marketplace::with_query_params;
+use crate::progress::{
+    FullProgressTracker, FullProgressTrackerHandle, PhaseProgressTrackerHandle, PhasedProgressBar,
+};
+use crate::registry::asset::RegistryAsset;
+use crate::registry::context::{RegistryContext, RegistryUrlParams};
+use crate::registry::os::index::OsVersionInfo;
+use crate::registry::signer::FileValidator;
+use crate::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::sound::{
     CIRCLE_OF_5THS_SHORT, UPDATE_FAILED_1, UPDATE_FAILED_2, UPDATE_FAILED_3, UPDATE_FAILED_4,
 };
-use crate::update::latest_information::LatestInformation;
 use crate::util::Invoke;
-use crate::{Error, ErrorKind, ResultExt, PLATFORM};
-
-mod latest_information;
-
-lazy_static! {
-    static ref UPDATED: AtomicBool = AtomicBool::new(false);
-}
+use crate::PLATFORM;
 
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateSystemParams {
     #[ts(type = "string")]
-    marketplace_url: Url,
+    registry: Url,
+    #[ts(type = "string | null")]
+    #[arg(long = "to")]
+    target: Option<VersionRange>,
+    #[arg(long = "no-progress", action = ArgAction::SetFalse)]
+    #[serde(default)]
+    progress: bool,
+}
+
+#[derive(Deserialize, Serialize, TS)]
+pub struct UpdateSystemRes {
+    #[ts(type = "string | null")]
+    target: Option<Version>,
+    #[ts(type = "string | null")]
+    progress: Option<RequestGuid>,
 }
 
 /// An user/ daemon would call this to update the system to the latest version and do the updates available,
@@ -48,16 +62,137 @@ pub struct UpdateSystemParams {
 #[instrument(skip_all)]
 pub async fn update_system(
     ctx: RpcContext,
-    UpdateSystemParams { marketplace_url }: UpdateSystemParams,
-) -> Result<UpdateResult, Error> {
-    if UPDATED.load(Ordering::SeqCst) {
-        return Ok(UpdateResult::NoUpdates);
+    UpdateSystemParams {
+        target,
+        registry,
+        progress,
+    }: UpdateSystemParams,
+) -> Result<UpdateSystemRes, Error> {
+    if ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_server_info()
+        .into_status_info()
+        .into_updated()
+        .de()?
+    {
+        return Err(Error::new(eyre!("Server was already updated. Please restart your device before attempting to update again."), ErrorKind::InvalidRequest));
     }
-    Ok(if maybe_do_update(ctx, marketplace_url).await?.is_some() {
-        UpdateResult::Updating
+    let target =
+        maybe_do_update(ctx.clone(), registry, target.unwrap_or(VersionRange::Any)).await?;
+    let progress = if progress && target.is_some() {
+        let guid = RequestGuid::new();
+        ctx.clone()
+            .rpc_continuations
+            .add(
+                guid.clone(),
+                RpcContinuation::ws(
+                    Box::new(|mut ws| {
+                        async move {
+                            if let Err(e) = async {
+                                let mut sub = ctx
+                                    .db
+                                    .subscribe(
+                                        "/public/serverInfo/statusInfo/updateProgress"
+                                            .parse::<JsonPointer>()
+                                            .with_kind(ErrorKind::Database)?,
+                                    )
+                                    .await;
+                                while {
+                                    let progress = ctx
+                                        .db
+                                        .peek()
+                                        .await
+                                        .into_public()
+                                        .into_server_info()
+                                        .into_status_info()
+                                        .into_update_progress()
+                                        .de()?;
+                                    ws.send(axum::extract::ws::Message::Text(
+                                        serde_json::to_string(&progress)
+                                            .with_kind(ErrorKind::Serialization)?,
+                                    ))
+                                    .await
+                                    .with_kind(ErrorKind::Network)?;
+                                    progress.is_some()
+                                } {
+                                    sub.recv().await;
+                                }
+
+                                ws.close().await.with_kind(ErrorKind::Network)?;
+
+                                Ok::<_, Error>(())
+                            }
+                            .await
+                            {
+                                tracing::error!("Error returning progress of update: {e}");
+                                tracing::debug!("{e:?}")
+                            }
+                        }
+                        .boxed()
+                    }),
+                    Duration::from_secs(30),
+                ),
+            )
+            .await;
+        Some(guid)
     } else {
-        UpdateResult::NoUpdates
-    })
+        None
+    };
+    Ok(UpdateSystemRes { target, progress })
+}
+
+pub async fn cli_update_system(
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        raw_params,
+        ..
+    }: HandlerArgs<CliContext, UpdateSystemParams>,
+) -> Result<(), Error> {
+    let res = from_value::<UpdateSystemRes>(
+        context
+            .call_remote::<RpcContext>(
+                &parent_method.into_iter().chain(method).join("."),
+                raw_params,
+            )
+            .await?,
+    )?;
+    match res.target {
+        None => println!("No updates available"),
+        Some(v) => {
+            if let Some(progress) = res.progress {
+                let mut ws = context.ws_continuation(progress).await?;
+                let mut progress = PhasedProgressBar::new(&format!("Updating to v{v}..."));
+                let mut prev = None;
+                while let Some(msg) = ws.try_next().await.with_kind(ErrorKind::Network)? {
+                    if let tokio_tungstenite::tungstenite::Message::Text(msg) = msg {
+                        if let Some(snap) =
+                            serde_json::from_str(&msg).with_kind(ErrorKind::Deserialization)?
+                        {
+                            progress.update(&snap);
+                            prev = Some(snap);
+                        } else {
+                            break;
+                        }
+                    }
+                }
+                if let Some(mut prev) = prev {
+                    for phase in &mut prev.phases {
+                        phase.progress.complete();
+                    }
+                    prev.overall.complete();
+                    progress.update(&prev);
+                }
+            } else {
+                println!("Updating to v{v}...")
+            }
+        }
+    }
+    Ok(())
 }
 
 /// What is the status of the updates?
@@ -80,30 +215,49 @@ pub fn display_update_result(_: UpdateSystemParams, status: UpdateResult) {
 }
 
 #[instrument(skip_all)]
-async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option<()>, Error> {
+async fn maybe_do_update(
+    ctx: RpcContext,
+    registry: Url,
+    target: VersionRange,
+) -> Result<Option<Version>, Error> {
     let peeked = ctx.db.peek().await;
-    let latest_version: Version = ctx
-        .client
-        .get(with_query_params(
-            ctx.clone(),
-            format!("{}/eos/v0/latest", marketplace_url,).parse()?,
-        ))
-        .send()
-        .await
-        .with_kind(ErrorKind::Network)?
-        .json::<LatestInformation>()
-        .await
-        .with_kind(ErrorKind::Network)?
-        .version;
     let current_version = peeked.as_public().as_server_info().as_version().de()?;
-    if latest_version < *current_version {
+    let mut available = from_value::<BTreeMap<Version, OsVersionInfo>>(
+        ctx.call_remote_with::<RegistryContext, _>(
+            "os.version.get",
+            json!({
+                "source": current_version,
+                "target": target,
+            }),
+            RegistryUrlParams { registry },
+        )
+        .await?,
+    )?;
+    let Some((target_version, asset)) = available
+        .pop_last()
+        .and_then(|(v, mut info)| info.squashfs.remove(&**PLATFORM).map(|a| (v, a)))
+    else {
         return Ok(None);
+    };
+    if !target_version.satisfies(&target) {
+        return Err(Error::new(
+            eyre!("got back version from registry that does not satisfy {target}"),
+            ErrorKind::Registry,
+        ));
     }
 
-    let eos_url = EosUrl {
-        base: marketplace_url,
-        version: latest_version,
-    };
+    let validator = asset.validate(asset.signature_info.all_signers())?;
+
+    let mut progress = FullProgressTracker::new();
+    let progress_handle = progress.handle();
+    let mut download_phase = progress_handle.add_phase("Downloading File".into(), Some(100));
+    download_phase.set_total(validator.size()?);
+    let reverify_phase = progress_handle.add_phase("Reverifying File".into(), Some(10));
+    let sync_boot_phase = progress_handle.add_phase("Syncing Boot Files".into(), Some(1));
+    let finalize_phase = progress_handle.add_phase("Finalizing Update".into(), Some(1));
+
+    let start_progress = progress.snapshot();
+
     let status = ctx
         .db
         .mutate(|db| {
@@ -115,10 +269,7 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
                 ));
             }
 
-            status.update_progress = Some(UpdateProgress {
-                size: None,
-                downloaded: 0,
-            });
+            status.update_progress = Some(start_progress);
             db.as_public_mut()
                 .as_server_info_mut()
                 .as_status_info_mut()
@@ -128,11 +279,38 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
         .await?;
 
     if status.updated {
-        return Ok(None);
+        return Err(Error::new(
+            eyre!("Server was already updated. Please restart your device before attempting to update again."),
+            crate::ErrorKind::InvalidRequest,
+        ));
     }
 
+    let progress_task = NonDetachingJoinHandle::from(tokio::spawn(progress.sync_to_db(
+        ctx.db.clone(),
+        |db| {
+            db.as_public_mut()
+                .as_server_info_mut()
+                .as_status_info_mut()
+                .as_update_progress_mut()
+                .transpose_mut()
+        },
+        Some(Duration::from_millis(300)),
+    )));
+
     tokio::spawn(async move {
-        let res = do_update(ctx.clone(), eos_url).await;
+        let res = do_update(
+            ctx.clone(),
+            validator,
+            asset,
+            UpdateProgressHandles {
+                progress_handle,
+                download_phase,
+                reverify_phase,
+                sync_boot_phase,
+                finalize_phase,
+            },
+        )
+        .await;
         match res {
             Ok(()) => {
                 ctx.db
@@ -143,6 +321,7 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
                         status_info.as_updated_mut().ser(&true)
                     })
                     .await?;
+                progress_task.await.with_kind(ErrorKind::Unknown)??;
                 CIRCLE_OF_5THS_SHORT
                     .play()
                     .await
@@ -189,146 +368,73 @@ async fn maybe_do_update(ctx: RpcContext, marketplace_url: Url) -> Result<Option
         }
         Ok::<(), Error>(())
     });
-    Ok(Some(()))
+    Ok(Some(target_version))
 }
 
-#[instrument(skip_all)]
-async fn do_update(ctx: RpcContext, eos_url: EosUrl) -> Result<(), Error> {
-    let mut rsync = Rsync::new(
-        eos_url.rsync_path()?,
-        "/media/embassy/next/",
-        Default::default(),
-    )
-    .await?;
-    while let Some(progress) = rsync.progress.next().await {
-        ctx.db
-            .mutate(|db| {
-                db.as_public_mut()
-                    .as_server_info_mut()
-                    .as_status_info_mut()
-                    .as_update_progress_mut()
-                    .ser(&Some(UpdateProgress {
-                        size: Some(100),
-                        downloaded: (100.0 * progress) as u64,
-                    }))
-            })
-            .await?;
-    }
-    rsync.wait().await?;
-
-    copy_fstab().await?;
-    copy_machine_id().await?;
-    copy_ssh_host_keys().await?;
-    sync_boot().await?;
-    swap_boot_label().await?;
-
-    Ok(())
+struct UpdateProgressHandles {
+    progress_handle: FullProgressTrackerHandle,
+    download_phase: PhaseProgressTrackerHandle,
+    reverify_phase: PhaseProgressTrackerHandle,
+    sync_boot_phase: PhaseProgressTrackerHandle,
+    finalize_phase: PhaseProgressTrackerHandle,
 }
 
-#[derive(Debug)]
-struct EosUrl {
-    base: Url,
-    version: Version,
-}
-
-impl EosUrl {
-    #[instrument()]
-    pub fn rsync_path(&self) -> Result<PathBuf, Error> {
-        let host = self
-            .base
-            .host_str()
-            .ok_or_else(|| Error::new(eyre!("Could not get host of base"), ErrorKind::ParseUrl))?;
-        let version: &Version = &self.version;
-        Ok(format!("{host}::{version}/{}/", &*PLATFORM)
-            .parse()
-            .map_err(|_| Error::new(eyre!("Could not parse path"), ErrorKind::ParseUrl))?)
-    }
-}
+#[instrument(skip_all)]
+async fn do_update(
+    ctx: RpcContext,
+    validator: FileValidator,
+    asset: RegistryAsset,
+    UpdateProgressHandles {
+        progress_handle,
+        mut download_phase,
+        mut reverify_phase,
+        mut sync_boot_phase,
+        mut finalize_phase,
+    }: UpdateProgressHandles,
+) -> Result<(), Error> {
+    download_phase.start();
+    let path = Path::new("/media/startos/images")
+        .join(hex::encode(&validator.blake3()?.as_bytes()[..16]))
+        .with_extension("rootfs");
+    let mut dst = AtomicFile::new(&path, None::<&Path>)
+        .await
+        .with_kind(ErrorKind::Filesystem)?;
+    let mut download_writer = download_phase.writer(&mut *dst);
+    asset
+        .download(ctx.client.clone(), &mut download_writer, &validator)
+        .await?;
+    let (_, mut download_phase) = download_writer.into_inner();
+    download_phase.complete();
 
-async fn copy_fstab() -> Result<(), Error> {
-    tokio::fs::copy("/etc/fstab", "/media/embassy/next/etc/fstab").await?;
-    Ok(())
-}
+    reverify_phase.start();
+    validator
+        .validate_file(&MultiCursorFile::open(&*dst).await?)
+        .await?;
+    dst.save().await.with_kind(ErrorKind::Filesystem)?;
+    reverify_phase.complete();
 
-async fn copy_machine_id() -> Result<(), Error> {
-    tokio::fs::copy("/etc/machine-id", "/media/embassy/next/etc/machine-id").await?;
-    Ok(())
-}
+    sync_boot_phase.start();
+    Command::new("unsquashfs")
+        .arg("-n")
+        .arg("-f")
+        .arg("-d")
+        .arg("/")
+        .arg(&path)
+        .arg("boot")
+        .invoke(crate::ErrorKind::Filesystem)
+        .await?;
+    sync_boot_phase.complete();
 
-async fn copy_ssh_host_keys() -> Result<(), Error> {
-    tokio::fs::copy(
-        "/etc/ssh/ssh_host_rsa_key",
-        "/media/embassy/next/etc/ssh/ssh_host_rsa_key",
-    )
-    .await?;
-    tokio::fs::copy(
-        "/etc/ssh/ssh_host_rsa_key.pub",
-        "/media/embassy/next/etc/ssh/ssh_host_rsa_key.pub",
-    )
-    .await?;
-    tokio::fs::copy(
-        "/etc/ssh/ssh_host_ecdsa_key",
-        "/media/embassy/next/etc/ssh/ssh_host_ecdsa_key",
-    )
-    .await?;
-    tokio::fs::copy(
-        "/etc/ssh/ssh_host_ecdsa_key.pub",
-        "/media/embassy/next/etc/ssh/ssh_host_ecdsa_key.pub",
-    )
-    .await?;
-    tokio::fs::copy(
-        "/etc/ssh/ssh_host_ed25519_key",
-        "/media/embassy/next/etc/ssh/ssh_host_ed25519_key",
-    )
-    .await?;
-    tokio::fs::copy(
-        "/etc/ssh/ssh_host_ed25519_key.pub",
-        "/media/embassy/next/etc/ssh/ssh_host_ed25519_key.pub",
-    )
-    .await?;
-    Ok(())
-}
+    finalize_phase.start();
+    Command::new("ln")
+        .arg("-rsf")
+        .arg(&path)
+        .arg("/media/startos/config/current.rootfs")
+        .invoke(crate::ErrorKind::Filesystem)
+        .await?;
+    finalize_phase.complete();
 
-async fn sync_boot() -> Result<(), Error> {
-    Rsync::new(
-        "/media/embassy/next/boot/",
-        "/boot/",
-        RsyncOptions {
-            delete: false,
-            force: false,
-            ignore_existing: false,
-            exclude: Vec::new(),
-            no_permissions: false,
-            no_owner: false,
-        },
-    )
-    .await?
-    .wait()
-    .await?;
-    if &*PLATFORM != "raspberrypi" {
-        let dev_mnt =
-            MountGuard::mount(&Bind::new("/dev"), "/media/embassy/next/dev", ReadWrite).await?;
-        let sys_mnt =
-            MountGuard::mount(&Bind::new("/sys"), "/media/embassy/next/sys", ReadWrite).await?;
-        let proc_mnt =
-            MountGuard::mount(&Bind::new("/proc"), "/media/embassy/next/proc", ReadWrite).await?;
-        let boot_mnt =
-            MountGuard::mount(&Bind::new("/boot"), "/media/embassy/next/boot", ReadWrite).await?;
-        Command::new("chroot")
-            .arg("/media/embassy/next")
-            .arg("update-grub2")
-            .invoke(ErrorKind::MigrationFailed)
-            .await?;
-        boot_mnt.unmount(false).await?;
-        proc_mnt.unmount(false).await?;
-        sys_mnt.unmount(false).await?;
-        dev_mnt.unmount(false).await?;
-    }
-    Ok(())
-}
+    progress_handle.complete();
 
-#[instrument(skip_all)]
-async fn swap_boot_label() -> Result<(), Error> {
-    tokio::fs::write("/media/embassy/config/upgrade", b"").await?;
     Ok(())
 }
diff --git a/core/startos/src/upload.rs b/core/startos/src/upload.rs
index 5dd2c4dda..65494b1e4 100644
--- a/core/startos/src/upload.rs
+++ b/core/startos/src/upload.rs
@@ -13,8 +13,8 @@ use tokio::io::{AsyncWrite, AsyncWriteExt};
 use tokio::sync::watch;
 
 use crate::context::RpcContext;
-use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::prelude::*;
+use crate::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::TmpDir;
@@ -22,68 +22,69 @@ use crate::util::io::TmpDir;
 pub async fn upload(ctx: &RpcContext) -> Result<(RequestGuid, UploadingFile), Error> {
     let guid = RequestGuid::new();
     let (mut handle, file) = UploadingFile::new().await?;
-    ctx.add_continuation(
-        guid.clone(),
-        RpcContinuation::rest(
-            Box::new(|request| {
-                async move {
-                    let headers = request.headers();
-                    let content_length = match headers.get(CONTENT_LENGTH).map(|a| a.to_str()) {
-                        None => {
-                            return Response::builder()
-                                .status(StatusCode::BAD_REQUEST)
-                                .body(Body::from("Content-Length is required"))
-                                .with_kind(ErrorKind::Network)
-                        }
-                        Some(Err(_)) => {
-                            return Response::builder()
-                                .status(StatusCode::BAD_REQUEST)
-                                .body(Body::from("Invalid Content-Length"))
-                                .with_kind(ErrorKind::Network)
-                        }
-                        Some(Ok(a)) => match a.parse::<u64>() {
-                            Err(_) => {
+    ctx.rpc_continuations
+        .add(
+            guid.clone(),
+            RpcContinuation::rest(
+                Box::new(|request| {
+                    async move {
+                        let headers = request.headers();
+                        let content_length = match headers.get(CONTENT_LENGTH).map(|a| a.to_str()) {
+                            None => {
+                                return Response::builder()
+                                    .status(StatusCode::BAD_REQUEST)
+                                    .body(Body::from("Content-Length is required"))
+                                    .with_kind(ErrorKind::Network)
+                            }
+                            Some(Err(_)) => {
                                 return Response::builder()
                                     .status(StatusCode::BAD_REQUEST)
                                     .body(Body::from("Invalid Content-Length"))
                                     .with_kind(ErrorKind::Network)
                             }
-                            Ok(a) => a,
-                        },
-                    };
+                            Some(Ok(a)) => match a.parse::<u64>() {
+                                Err(_) => {
+                                    return Response::builder()
+                                        .status(StatusCode::BAD_REQUEST)
+                                        .body(Body::from("Invalid Content-Length"))
+                                        .with_kind(ErrorKind::Network)
+                                }
+                                Ok(a) => a,
+                            },
+                        };
 
-                    handle
-                        .progress
-                        .send_modify(|p| p.expected_size = Some(content_length));
+                        handle
+                            .progress
+                            .send_modify(|p| p.expected_size = Some(content_length));
 
-                    let mut body = request.into_body().into_data_stream();
-                    while let Some(next) = body.next().await {
-                        if let Err(e) = async {
-                            handle
-                                .write_all(&next.map_err(|e| {
-                                    std::io::Error::new(std::io::ErrorKind::Other, e)
-                                })?)
-                                .await?;
-                            Ok(())
-                        }
-                        .await
-                        {
-                            handle.progress.send_if_modified(|p| p.handle_error(&e));
-                            break;
+                        let mut body = request.into_body().into_data_stream();
+                        while let Some(next) = body.next().await {
+                            if let Err(e) = async {
+                                handle
+                                    .write_all(&next.map_err(|e| {
+                                        std::io::Error::new(std::io::ErrorKind::Other, e)
+                                    })?)
+                                    .await?;
+                                Ok(())
+                            }
+                            .await
+                            {
+                                handle.progress.send_if_modified(|p| p.handle_error(&e));
+                                break;
+                            }
                         }
-                    }
 
-                    Response::builder()
-                        .status(StatusCode::NO_CONTENT)
-                        .body(Body::empty())
-                        .with_kind(ErrorKind::Network)
-                }
-                .boxed()
-            }),
-            Duration::from_secs(30),
-        ),
-    )
-    .await;
+                        Response::builder()
+                            .status(StatusCode::NO_CONTENT)
+                            .body(Body::empty())
+                            .with_kind(ErrorKind::Network)
+                    }
+                    .boxed()
+                }),
+                Duration::from_secs(30),
+            ),
+        )
+        .await;
     Ok((guid, file))
 }
 
@@ -198,7 +199,6 @@ impl UploadingFile {
         Ok(())
     }
 }
-#[async_trait::async_trait]
 impl ArchiveSource for UploadingFile {
     type Reader = <MultiCursorFile as ArchiveSource>::Reader;
     async fn size(&self) -> Option<u64> {
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index f5a951142..75ab2c708 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -1,11 +1,15 @@
+use std::collections::VecDeque;
 use std::future::Future;
 use std::io::Cursor;
 use std::os::unix::prelude::MetadataExt;
 use std::path::{Path, PathBuf};
+use std::pin::Pin;
 use std::sync::atomic::AtomicU64;
-use std::task::Poll;
+use std::sync::Arc;
+use std::task::{Poll, Waker};
 use std::time::Duration;
 
+use bytes::{Buf, BytesMut};
 use futures::future::{BoxFuture, Fuse};
 use futures::{AsyncSeek, FutureExt, TryStreamExt};
 use helpers::NonDetachingJoinHandle;
@@ -15,6 +19,7 @@ use tokio::io::{
     duplex, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, DuplexStream, ReadBuf, WriteHalf,
 };
 use tokio::net::TcpStream;
+use tokio::sync::Notify;
 use tokio::time::{Instant, Sleep};
 
 use crate::prelude::*;
@@ -312,6 +317,7 @@ impl AsyncRead for BufferedWriteReader {
 
 pub trait CursorExt {
     fn pure_read(&mut self, buf: &mut ReadBuf<'_>);
+    fn remaining_slice(&self) -> &[u8];
 }
 
 impl<T: AsRef<[u8]>> CursorExt for Cursor<T> {
@@ -324,6 +330,10 @@ impl<T: AsRef<[u8]>> CursorExt for Cursor<T> {
         buf.put_slice(&self.get_ref().as_ref()[self.position() as usize..end]);
         self.set_position(end as u64);
     }
+    fn remaining_slice(&self) -> &[u8] {
+        let len = self.position().min(self.get_ref().as_ref().len() as u64);
+        &self.get_ref().as_ref()[(len as usize)..]
+    }
 }
 
 #[pin_project::pin_project]
@@ -744,3 +754,256 @@ pub async fn rename(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> Result<(),
         .await
         .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("mv {src:?} -> {dst:?}")))
 }
+
+fn poll_flush_prefix<W: AsyncWrite>(
+    mut writer: Pin<&mut W>,
+    cx: &mut std::task::Context<'_>,
+    prefix: &mut VecDeque<Cursor<Vec<u8>>>,
+    flush_writer: bool,
+) -> Poll<Result<(), std::io::Error>> {
+    while let Some(mut cur) = prefix.pop_front() {
+        let buf = cur.remaining_slice();
+        if !buf.is_empty() {
+            match writer.as_mut().poll_write(cx, buf)? {
+                Poll::Ready(n) if n == buf.len() => (),
+                Poll::Ready(n) => {
+                    cur.advance(n);
+                    prefix.push_front(cur);
+                }
+                Poll::Pending => {
+                    prefix.push_front(cur);
+                    return Poll::Pending;
+                }
+            }
+        }
+    }
+    if flush_writer {
+        writer.poll_flush(cx)
+    } else {
+        Poll::Ready(Ok(()))
+    }
+}
+
+fn poll_write_prefix_buf<W: AsyncWrite>(
+    mut writer: Pin<&mut W>,
+    cx: &mut std::task::Context<'_>,
+    prefix: &mut VecDeque<Cursor<Vec<u8>>>,
+    buf: &[u8],
+) -> Poll<Result<usize, std::io::Error>> {
+    futures::ready!(poll_flush_prefix(writer.as_mut(), cx, prefix, false)?);
+    writer.poll_write(cx, buf)
+}
+
+#[pin_project::pin_project]
+pub struct TeeWriter<W1, W2> {
+    capacity: usize,
+    buffer1: VecDeque<Cursor<Vec<u8>>>,
+    buffer2: VecDeque<Cursor<Vec<u8>>>,
+    #[pin]
+    writer1: W1,
+    #[pin]
+    writer2: W2,
+}
+impl<W1: AsyncWrite, W2: AsyncWrite> TeeWriter<W1, W2> {
+    pub fn new(writer1: W1, writer2: W2, capacity: usize) -> Self {
+        Self {
+            capacity,
+            buffer1: VecDeque::new(),
+            buffer2: VecDeque::new(),
+            writer1,
+            writer2,
+        }
+    }
+}
+
+impl<W1: AsyncWrite + Unpin, W2: AsyncWrite + Unpin> TeeWriter<W1, W2> {
+    pub async fn into_inner(mut self) -> Result<(W1, W2), Error> {
+        self.flush().await?;
+
+        Ok((self.writer1, self.writer2))
+    }
+}
+impl<W1: AsyncWrite, W2: AsyncWrite> AsyncWrite for TeeWriter<W1, W2> {
+    fn poll_write(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        mut buf: &[u8],
+    ) -> Poll<Result<usize, std::io::Error>> {
+        let mut this = self.project();
+        let buffer_size = this
+            .buffer1
+            .iter()
+            .chain(this.buffer2.iter())
+            .map(|b| b.get_ref().len())
+            .sum::<usize>();
+        if buffer_size < *this.capacity {
+            let to_write = std::cmp::min(*this.capacity - buffer_size, buf.len());
+            buf = &buf[0..to_write];
+        } else {
+            match (
+                poll_flush_prefix(this.writer1.as_mut(), cx, &mut this.buffer1, false)?,
+                poll_flush_prefix(this.writer2.as_mut(), cx, &mut this.buffer2, false)?,
+            ) {
+                (Poll::Ready(()), Poll::Ready(())) => (),
+                _ => return Poll::Pending,
+            }
+        }
+        let (w1, w2) = match (
+            poll_write_prefix_buf(this.writer1.as_mut(), cx, &mut this.buffer1, buf)?,
+            poll_write_prefix_buf(this.writer2.as_mut(), cx, &mut this.buffer2, buf)?,
+        ) {
+            (Poll::Pending, Poll::Pending) => return Poll::Pending,
+            (Poll::Ready(n), Poll::Pending) => (n, 0),
+            (Poll::Pending, Poll::Ready(n)) => (0, n),
+            (Poll::Ready(n1), Poll::Ready(n2)) => (n1, n2),
+        };
+        if w1 > w2 {
+            this.buffer2.push_back(Cursor::new(buf[w2..w1].to_vec()));
+        } else if w1 < w2 {
+            this.buffer1.push_back(Cursor::new(buf[w1..w2].to_vec()));
+        }
+        Poll::Ready(Ok(std::cmp::max(w1, w2)))
+    }
+    fn poll_flush(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        let mut this = self.project();
+        match (
+            poll_flush_prefix(this.writer1, cx, &mut this.buffer1, true)?,
+            poll_flush_prefix(this.writer2, cx, &mut this.buffer2, true)?,
+        ) {
+            (Poll::Ready(()), Poll::Ready(())) => Poll::Ready(Ok(())),
+            _ => Poll::Pending,
+        }
+    }
+    fn poll_shutdown(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        self.poll_flush(cx)
+    }
+}
+
+#[pin_project::pin_project]
+pub struct ParallelBlake3Writer {
+    #[pin]
+    hasher: NonDetachingJoinHandle<blake3::Hash>,
+    buffer: Arc<(std::sync::Mutex<(BytesMut, Vec<Waker>, bool)>, Notify)>,
+    capacity: usize,
+}
+impl ParallelBlake3Writer {
+    /// memory usage can be as much as 2x capacity
+    pub fn new(capacity: usize) -> Self {
+        let buffer = Arc::new((
+            std::sync::Mutex::new((BytesMut::new(), Vec::<Waker>::new(), false)),
+            Notify::new(),
+        ));
+        let hasher_buffer = buffer.clone();
+        Self {
+            hasher: tokio::spawn(async move {
+                let mut hasher = blake3::Hasher::new();
+                let mut to_hash = BytesMut::new();
+                let mut notified;
+                while {
+                    let mut guard = hasher_buffer.0.lock().unwrap();
+                    let (buffer, wakers, shutdown) = &mut *guard;
+                    std::mem::swap(buffer, &mut to_hash);
+                    let wakers = std::mem::take(wakers);
+                    let shutdown = *shutdown;
+                    notified = hasher_buffer.1.notified();
+                    drop(guard);
+                    if to_hash.len() > 128 * 1024
+                    /* 128 KiB */
+                    {
+                        hasher.update_rayon(&to_hash);
+                    } else {
+                        hasher.update(&to_hash);
+                    }
+                    to_hash.truncate(0);
+                    for waker in wakers {
+                        waker.wake();
+                    }
+                    !shutdown && to_hash.len() == 0
+                } {
+                    notified.await;
+                }
+                hasher.finalize()
+            })
+            .into(),
+            buffer,
+            capacity,
+        }
+    }
+
+    pub async fn finalize(mut self) -> Result<blake3::Hash, Error> {
+        self.shutdown().await?;
+        self.hasher.await.with_kind(ErrorKind::Unknown)
+    }
+}
+impl AsyncWrite for ParallelBlake3Writer {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> Poll<Result<usize, std::io::Error>> {
+        let this = self.project();
+        let mut guard = this.buffer.0.lock().map_err(|_| {
+            std::io::Error::new(std::io::ErrorKind::Other, eyre!("hashing thread panicked"))
+        })?;
+        let (buffer, wakers, shutdown) = &mut *guard;
+        if !*shutdown {
+            if buffer.len() < *this.capacity {
+                let to_write = std::cmp::min(*this.capacity - buffer.len(), buf.len());
+                buffer.extend_from_slice(&buf[0..to_write]);
+                if buffer.len() >= *this.capacity / 2 {
+                    this.buffer.1.notify_waiters();
+                }
+                Poll::Ready(Ok(to_write))
+            } else {
+                wakers.push(cx.waker().clone());
+                Poll::Pending
+            }
+        } else {
+            Poll::Ready(Err(std::io::Error::new(
+                std::io::ErrorKind::BrokenPipe,
+                eyre!("write after shutdown"),
+            )))
+        }
+    }
+    fn poll_flush(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        let this = self.project();
+        let mut guard = this.buffer.0.lock().map_err(|_| {
+            std::io::Error::new(std::io::ErrorKind::Other, eyre!("hashing thread panicked"))
+        })?;
+        let (buffer, wakers, _) = &mut *guard;
+        if buffer.is_empty() {
+            Poll::Ready(Ok(()))
+        } else {
+            wakers.push(cx.waker().clone());
+            this.buffer.1.notify_waiters();
+            Poll::Pending
+        }
+    }
+    fn poll_shutdown(
+        mut self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        futures::ready!(self.as_mut().poll_flush(cx)?);
+        let this = self.project();
+        let mut guard = this.buffer.0.lock().map_err(|_| {
+            std::io::Error::new(std::io::ErrorKind::Other, eyre!("hashing thread panicked"))
+        })?;
+        let (buffer, wakers, shutdown) = &mut *guard;
+        if *shutdown && buffer.len() == 0 {
+            return Poll::Ready(Ok(()));
+        }
+        wakers.push(cx.waker().clone());
+        *shutdown = true;
+        this.buffer.1.notify_waiters();
+        Poll::Pending
+    }
+}
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 63cbd323a..ec64c6f97 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -33,6 +33,7 @@ pub mod http_reader;
 pub mod io;
 pub mod logger;
 pub mod lshw;
+pub mod rpc;
 pub mod rpc_client;
 pub mod serde;
 
diff --git a/core/startos/src/util/rpc.rs b/core/startos/src/util/rpc.rs
new file mode 100644
index 000000000..7d2356877
--- /dev/null
+++ b/core/startos/src/util/rpc.rs
@@ -0,0 +1,72 @@
+
+use clap::Parser;
+use rpc_toolkit::{from_fn_async, Context, ParentHandler};
+use serde::{Deserialize, Serialize};
+use tokio::fs::File;
+use url::Url;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::http::HttpSource;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource};
+use crate::util::io::ParallelBlake3Writer;
+use crate::util::serde::Base16;
+
+pub fn util<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new().subcommand("b3sum", from_fn_async(b3sum))
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser)]
+pub struct B3sumParams {
+    #[arg(long = "no-mmap", action = clap::ArgAction::SetFalse)]
+    allow_mmap: bool,
+    file: String,
+}
+
+pub async fn b3sum(
+    ctx: CliContext,
+    B3sumParams { file, allow_mmap }: B3sumParams,
+) -> Result<Base16<[u8; 32]>, Error> {
+    let source = if let Ok(url) = file.parse::<Url>() {
+        if url.scheme() == "file" {
+            let file = MultiCursorFile::from(File::open(url.path()).await?);
+            if allow_mmap {
+                return file.blake3_mmap().await.map(|h| *h.as_bytes()).map(Base16);
+            }
+            DynFileSource::new(file.section(
+                0,
+                file.size().await.ok_or_else(|| {
+                    Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem)
+                })?,
+            ))
+        } else if url.scheme() == "http" || url.scheme() == "https" {
+            let file = HttpSource::new(ctx.client.clone(), url).await?;
+            DynFileSource::new(file.section(
+                0,
+                file.size().await.ok_or_else(|| {
+                    Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem)
+                })?,
+            ))
+        } else {
+            return Err(Error::new(
+                eyre!("unknown scheme: {}", url.scheme()),
+                ErrorKind::InvalidRequest,
+            ));
+        }
+    } else {
+        let file = MultiCursorFile::from(File::open(file).await?);
+        if allow_mmap {
+            return file.blake3_mmap().await.map(|h| *h.as_bytes()).map(Base16);
+        }
+        DynFileSource::new(file.section(
+            0,
+            file.size().await.ok_or_else(|| {
+                Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem)
+            })?,
+        ))
+    };
+    let mut hasher = ParallelBlake3Writer::new(crate::s9pk::merkle_archive::hash::BUFFER_CAPACITY);
+    source.copy(&mut hasher).await?;
+    hasher.finalize().await.map(|h| *h.as_bytes()).map(Base16)
+}
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 5b1e660b5..9696f9c91 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -10,7 +10,10 @@ use color_eyre::eyre::eyre;
 use imbl::OrdMap;
 use openssl::pkey::{PKey, Private};
 use openssl::x509::{X509Ref, X509};
-use rpc_toolkit::{AnyContext, Handler, HandlerArgs, HandlerArgsFor, HandlerTypes, PrintCliResult};
+use rpc_toolkit::{
+    CliBindings, Context, Handler, HandlerArgs, HandlerArgsFor, HandlerFor, HandlerTypes,
+    PrintCliResult,
+};
 use serde::de::DeserializeOwned;
 use serde::ser::{SerializeMap, SerializeSeq};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -18,8 +21,8 @@ use serde_json::Value;
 use ts_rs::TS;
 
 use super::IntoDoubleEndedIterator;
+use crate::prelude::*;
 use crate::util::clap::FromStrParser;
-use crate::{Error, ResultExt};
 
 pub fn deserialize_from_str<
     'de,
@@ -489,10 +492,10 @@ impl<T: CommandFactory> CommandFactory for WithIoFormat<T> {
     }
 }
 
-pub trait HandlerExtSerde: Handler {
+pub trait HandlerExtSerde<C: Context>: HandlerFor<C> {
     fn with_display_serializable(self) -> DisplaySerializable<Self>;
 }
-impl<T: Handler> HandlerExtSerde for T {
+impl<T: HandlerFor<C>, C: Context> HandlerExtSerde<C> for T {
     fn with_display_serializable(self) -> DisplaySerializable<Self> {
         DisplaySerializable(self)
     }
@@ -506,9 +509,7 @@ impl<T: HandlerTypes> HandlerTypes for DisplaySerializable<T> {
     type Ok = T::Ok;
     type Err = T::Err;
 }
-#[async_trait::async_trait]
-impl<T: Handler> Handler for DisplaySerializable<T> {
-    type Context = T::Context;
+impl<T: HandlerFor<C>, C: Context> HandlerFor<C> for DisplaySerializable<T> {
     fn handle_sync(
         &self,
         HandlerArgs {
@@ -518,7 +519,7 @@ impl<T: Handler> Handler for DisplaySerializable<T> {
             params,
             inherited_params,
             raw_params,
-        }: HandlerArgsFor<Self::Context, Self>,
+        }: HandlerArgsFor<C, Self>,
     ) -> Result<Self::Ok, Self::Err> {
         self.0.handle_sync(HandlerArgs {
             context,
@@ -538,7 +539,7 @@ impl<T: Handler> Handler for DisplaySerializable<T> {
             params,
             inherited_params,
             raw_params,
-        }: HandlerArgsFor<Self::Context, Self>,
+        }: HandlerArgsFor<C, Self>,
     ) -> Result<Self::Ok, Self::Err> {
         self.0
             .handle_async(HandlerArgs {
@@ -551,34 +552,56 @@ impl<T: Handler> Handler for DisplaySerializable<T> {
             })
             .await
     }
-    fn contexts(&self) -> Option<imbl::OrdSet<std::any::TypeId>> {
-        self.0.contexts()
+    fn metadata(&self, method: VecDeque<&'static str>) -> OrdMap<&'static str, imbl_value::Value> {
+        self.0.metadata(method)
     }
-    fn metadata(
-        &self,
-        method: VecDeque<&'static str>,
-        ctx_ty: TypeId,
-    ) -> OrdMap<&'static str, imbl_value::Value> {
-        self.0.metadata(method, ctx_ty)
-    }
-    fn method_from_dots(&self, method: &str, ctx_ty: TypeId) -> Option<VecDeque<&'static str>> {
-        self.0.method_from_dots(method, ctx_ty)
+    fn method_from_dots(&self, method: &str) -> Option<VecDeque<&'static str>> {
+        self.0.method_from_dots(method)
     }
 }
-impl<T: HandlerTypes> PrintCliResult for DisplaySerializable<T>
+impl<T: HandlerTypes, C: Context> PrintCliResult<C> for DisplaySerializable<T>
 where
     T::Ok: Serialize,
 {
-    type Context = AnyContext;
     fn print(
         &self,
-        HandlerArgs { params, .. }: HandlerArgsFor<Self::Context, Self>,
+        HandlerArgs { params, .. }: HandlerArgsFor<C, Self>,
         result: Self::Ok,
     ) -> Result<(), Self::Err> {
         display_serializable(params.format.unwrap_or_default(), result);
         Ok(())
     }
 }
+impl<Context, T> CliBindings<Context> for DisplaySerializable<T>
+where
+    Context: crate::Context,
+    Self: HandlerTypes,
+    Self::Params: CommandFactory + FromArgMatches + Serialize,
+    Self: PrintCliResult<Context>,
+{
+    fn cli_command(&self) -> clap::Command {
+        Self::Params::command()
+    }
+    fn cli_parse(
+        &self,
+        matches: &clap::ArgMatches,
+    ) -> Result<(VecDeque<&'static str>, patch_db::Value), clap::Error> {
+        Self::Params::from_arg_matches(matches).and_then(|a| {
+            Ok((
+                VecDeque::new(),
+                imbl_value::to_value(&a)
+                    .map_err(|e| clap::Error::raw(clap::error::ErrorKind::ValueValidation, e))?,
+            ))
+        })
+    }
+    fn cli_display(
+        &self,
+        handle_args: HandlerArgsFor<Context, Self>,
+        result: Self::Ok,
+    ) -> Result<(), Self::Err> {
+        self.print(handle_args, result)
+    }
+}
 
 #[derive(Deserialize, Serialize, TS)]
 pub struct StdinDeserializable<T>(pub T);
@@ -938,6 +961,43 @@ impl<'de, K: Deserialize<'de>, V: Deserialize<'de>> Deserialize<'de> for KeyVal<
     }
 }
 
+#[derive(TS)]
+#[ts(type = "string", concrete(T = Vec<u8>))]
+pub struct Base16<T>(pub T);
+impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base16<T> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        hex::decode(&s)
+            .map_err(|_| {
+                serde::de::Error::invalid_value(
+                    serde::de::Unexpected::Str(&s),
+                    &"a valid hex string",
+                )
+            })?
+            .try_into()
+            .map_err(|_| serde::de::Error::custom("invalid length"))
+            .map(Self)
+    }
+}
+impl<T: AsRef<[u8]>> Serialize for Base16<T> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&hex::encode(self.0.as_ref()))
+    }
+}
+impl<T: AsRef<[u8]>> std::fmt::Display for Base16<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        hex::encode(self.0.as_ref()).fmt(f)
+    }
+}
+
+#[derive(TS)]
+#[ts(type = "string", concrete(T = Vec<u8>))]
 pub struct Base32<T>(pub T);
 impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base32<T> {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
@@ -968,7 +1028,14 @@ impl<T: AsRef<[u8]>> Serialize for Base32<T> {
         ))
     }
 }
+impl<T: AsRef<[u8]>> std::fmt::Display for Base32<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        base32::encode(base32::Alphabet::RFC4648 { padding: true }, self.0.as_ref()).fmt(f)
+    }
+}
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, TS)]
+#[ts(type = "string", concrete(T = Vec<u8>))]
 pub struct Base64<T>(pub T);
 impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base64<T> {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
@@ -991,6 +1058,12 @@ impl<T: AsRef<[u8]>> Serialize for Base64<T> {
         serializer.serialize_str(&base64::encode(self.0.as_ref()))
     }
 }
+impl<T> Deref for Base64<T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
 
 #[derive(Clone, Debug)]
 pub struct Regex(regex::Regex);
@@ -1163,7 +1236,8 @@ pub mod pem {
 }
 
 #[repr(transparent)]
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, Hash, TS)]
+#[ts(type = "string", concrete(T = ed25519_dalek::VerifyingKey))]
 pub struct Pem<T: PemEncoding>(#[serde(with = "pem")] pub T);
 impl<T: PemEncoding> Pem<T> {
     pub fn new(value: T) -> Self {
@@ -1176,6 +1250,33 @@ impl<T: PemEncoding> Pem<T> {
         unsafe { std::mem::transmute(value) }
     }
 }
+impl<T: PemEncoding> Deref for Pem<T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl<T: PemEncoding> std::fmt::Display for Pem<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.to_pem::<serde_json::Error>()
+            .map_err(|_| std::fmt::Error::default())?
+            .fmt(f)
+    }
+}
+impl<T: PemEncoding> FromStr for Pem<T> {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self(
+            T::from_pem::<serde_json::Error>(s).with_kind(ErrorKind::Pem)?,
+        ))
+    }
+}
+impl<T: PemEncoding> ValueParserFactory for Pem<T> {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, TS)]
 #[ts(export, type = "string | number[]")]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 181b5fe4b..1acce7896 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -5,6 +5,7 @@ use futures::future::BoxFuture;
 use futures::{Future, FutureExt};
 use imbl_value::InternedString;
 
+use crate::db::model::Database;
 use crate::prelude::*;
 use crate::Error;
 
@@ -56,9 +57,12 @@ where
     fn new() -> Self;
     fn semver(&self) -> emver::Version;
     fn compat(&self) -> &'static emver::VersionRange;
-    fn up(&self, db: &PatchDb) -> impl Future<Output = Result<(), Error>> + Send;
-    fn down(&self, db: &PatchDb) -> impl Future<Output = Result<(), Error>> + Send;
-    fn commit(&self, db: &PatchDb) -> impl Future<Output = Result<(), Error>> + Send {
+    fn up(&self, db: &TypedPatchDb<Database>) -> impl Future<Output = Result<(), Error>> + Send;
+    fn down(&self, db: &TypedPatchDb<Database>) -> impl Future<Output = Result<(), Error>> + Send;
+    fn commit(
+        &self,
+        db: &TypedPatchDb<Database>,
+    ) -> impl Future<Output = Result<(), Error>> + Send {
         async {
             let semver = self.semver().into();
             let compat = self.compat().clone();
@@ -80,7 +84,7 @@ where
     fn migrate_to<V: VersionT>(
         &self,
         version: &V,
-        db: &PatchDb,
+        db: &TypedPatchDb<Database>,
     ) -> impl Future<Output = Result<(), Error>> + Send {
         async {
             match self.semver().cmp(&version.semver()) {
@@ -93,7 +97,7 @@ where
     fn migrate_from_unchecked<'a, V: VersionT>(
         &'a self,
         version: &'a V,
-        db: &'a PatchDb,
+        db: &'a TypedPatchDb<Database>,
     ) -> BoxFuture<'a, Result<(), Error>> {
         async {
             let previous = Self::Previous::new();
@@ -118,7 +122,7 @@ where
     fn rollback_to_unchecked<'a, V: VersionT>(
         &'a self,
         version: &'a V,
-        db: &'a PatchDb,
+        db: &'a TypedPatchDb<Database>,
     ) -> BoxFuture<'a, Result<(), Error>> {
         async {
             let previous = Self::Previous::new();
@@ -192,7 +196,7 @@ where
     }
 }
 
-pub async fn init(db: &PatchDb) -> Result<(), Error> {
+pub async fn init(db: &TypedPatchDb<Database>) -> Result<(), Error> {
     let version = Version::from_util_version(
         db.peek()
             .await
diff --git a/core/startos/src/version/v0_3_5.rs b/core/startos/src/version/v0_3_5.rs
index e5634d2d9..21be1ca49 100644
--- a/core/startos/src/version/v0_3_5.rs
+++ b/core/startos/src/version/v0_3_5.rs
@@ -1,6 +1,7 @@
 use emver::VersionRange;
 
 use super::VersionT;
+use crate::db::model::Database;
 use crate::prelude::*;
 use crate::version::Current;
 
@@ -30,10 +31,10 @@ impl VersionT for Version {
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &PatchDb) -> Result<(), Error> {
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &PatchDb) -> Result<(), Error> {
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_5_1.rs b/core/startos/src/version/v0_3_5_1.rs
index 27e77c8ff..d0f99c153 100644
--- a/core/startos/src/version/v0_3_5_1.rs
+++ b/core/startos/src/version/v0_3_5_1.rs
@@ -2,6 +2,7 @@ use emver::VersionRange;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5, VersionT};
+use crate::db::model::Database;
 use crate::prelude::*;
 
 const V0_3_5_1: emver::Version = emver::Version::new(0, 3, 5, 1);
@@ -20,10 +21,10 @@ impl VersionT for Version {
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &PatchDb) -> Result<(), Error> {
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &PatchDb) -> Result<(), Error> {
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_5_2.rs b/core/startos/src/version/v0_3_5_2.rs
index c70623a04..fae689997 100644
--- a/core/startos/src/version/v0_3_5_2.rs
+++ b/core/startos/src/version/v0_3_5_2.rs
@@ -2,6 +2,7 @@ use emver::VersionRange;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5_1, VersionT};
+use crate::db::model::Database;
 use crate::prelude::*;
 
 const V0_3_5_2: emver::Version = emver::Version::new(0, 3, 5, 2);
@@ -20,10 +21,10 @@ impl VersionT for Version {
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &PatchDb) -> Result<(), Error> {
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &PatchDb) -> Result<(), Error> {
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6.rs b/core/startos/src/version/v0_3_6.rs
index b75e28b27..0ff6d662a 100644
--- a/core/startos/src/version/v0_3_6.rs
+++ b/core/startos/src/version/v0_3_6.rs
@@ -2,6 +2,7 @@ use emver::VersionRange;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5_1, VersionT};
+use crate::db::model::Database;
 use crate::prelude::*;
 
 const V0_3_6: emver::Version = emver::Version::new(0, 3, 6, 0);
@@ -20,10 +21,10 @@ impl VersionT for Version {
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &PatchDb) -> Result<(), Error> {
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
         Err(Error::new(eyre!("unimplemented"), ErrorKind::Unknown))
     }
-    async fn down(&self, _db: &PatchDb) -> Result<(), Error> {
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index 593422a67..32935bc7a 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -9,7 +9,7 @@ use crate::prelude::*;
 use crate::util::Version;
 
 pub const PKG_VOLUME_DIR: &str = "package-data/volumes";
-pub const BACKUP_DIR: &str = "/media/embassy/backups";
+pub const BACKUP_DIR: &str = "/media/startos/backups";
 
 pub fn data_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, volume_id: &VolumeId) -> PathBuf {
     datadir
diff --git a/debian/postinst b/debian/postinst
index e26f7cfee..4e8350376 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -11,7 +11,7 @@ if [ -f /usr/sbin/grub-probe ] && ! [ -L /usr/sbin/grub-probe ]; then
   ln -s /usr/lib/startos/scripts/grub-probe-eos /usr/sbin/grub-probe
 fi
 
-cp /usr/lib/startos/scripts/embassy-initramfs-module /etc/initramfs-tools/scripts/embassy
+cp /usr/lib/startos/scripts/startos-initramfs-module /etc/initramfs-tools/scripts/startos
 
 if ! grep overlay /etc/initramfs-tools/modules > /dev/null; then
     echo overlay >> /etc/initramfs-tools/modules
@@ -20,7 +20,7 @@ fi
 update-initramfs -u -k all
 
 if [ -f /etc/default/grub ]; then
-    sed -i '/\(^\|#\)GRUB_CMDLINE_LINUX=/c\GRUB_CMDLINE_LINUX="boot=embassy"' /etc/default/grub
+    sed -i '/\(^\|#\)GRUB_CMDLINE_LINUX=/c\GRUB_CMDLINE_LINUX="boot=startos"' /etc/default/grub
     sed -i '/\(^\|#\)GRUB_DISTRIBUTOR=/c\GRUB_DISTRIBUTOR="StartOS v$(cat /usr/lib/startos/VERSION.txt)"' /etc/default/grub
 fi
 
@@ -79,15 +79,6 @@ sed -i '/\(^\|#\)SystemMaxUse=/c\SystemMaxUse=1G' /etc/systemd/journald.conf
 sed -i '/\(^\|#\)ForwardToSyslog=/c\ForwardToSyslog=no' /etc/systemd/journald.conf
 sed -i '/^\s*#\?\s*issue_discards\s*=\s*/c\issue_discards = 1' /etc/lvm/lvm.conf
 
-if cat /usr/lib/startos/ENVIRONMENT.txt | grep '(^|-)docker(-|$)'; then
-    sed -i 's/ExecStart=\/usr\/bin\/dockerd/ExecStart=\/usr\/bin\/dockerd --exec-opt native.cgroupdriver=systemd/g' /lib/systemd/system/docker.service
-    mkdir -p /etc/docker
-    echo '{ "storage-driver": "overlay2" }' > /etc/docker/daemon.json
-else
-    if ! podman network ls | grep start9; then
-        podman network create -d bridge --subnet 172.18.0.1/24 --opt com.docker.network.bridge.name=br-start9 start9
-    fi
-fi
 mkdir -p /etc/nginx/ssl
 
 # fix to suppress docker warning, fixed in 21.xx release of docker cli: https://github.com/docker/cli/pull/2934
diff --git a/foo b/foo
new file mode 120000
index 000000000..5cea28a80
--- /dev/null
+++ b/foo
@@ -0,0 +1 @@
+firmware/x86_64/foo.romr.gz
\ No newline at end of file
diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 7aae39c7f..9f62000ce 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -326,7 +326,7 @@ elif [ "${IMAGE_TYPE}" = img ]; then
 	unsquashfs -f -d $TMPDIR $prep_results_dir/binary/live/filesystem.squashfs
 
 	if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
-		sed -i 's| boot=embassy| init=/usr/lib/startos/scripts/init_resize\.sh|' $TMPDIR/boot/cmdline.txt
+		sed -i 's| boot=startos| init=/usr/lib/startos/scripts/init_resize\.sh|' $TMPDIR/boot/cmdline.txt
 		rsync -a $base_dir/raspberrypi/img/ $TMPDIR/
 	fi
 
diff --git a/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh b/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
index 931649897..cf6489f5f 100755
--- a/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
+++ b/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
@@ -114,7 +114,7 @@ mount / -o remount,ro
 beep
 
 if main; then
-  sed -i 's| init=/usr/lib/startos/scripts/init_resize\.sh| boot=embassy|' /boot/cmdline.txt
+  sed -i 's| init=/usr/lib/startos/scripts/init_resize\.sh| boot=startos|' /boot/cmdline.txt
   echo "Resized root filesystem. Rebooting in 5 seconds..."
   sleep 5
 else
diff --git a/image-recipe/raspberrypi/squashfs/boot/cmdline.txt b/image-recipe/raspberrypi/squashfs/boot/cmdline.txt
index 02de34729..315dc67a7 100644
--- a/image-recipe/raspberrypi/squashfs/boot/cmdline.txt
+++ b/image-recipe/raspberrypi/squashfs/boot/cmdline.txt
@@ -1 +1 @@
-usb-storage.quirks=152d:0562:u,14cd:121c:u,0781:cfcb:u console=serial0,115200 console=tty1 root=PARTUUID=cb15ae4d-02 rootfstype=ext4 fsck.repair=yes rootwait cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory quiet boot=embassy
\ No newline at end of file
+usb-storage.quirks=152d:0562:u,14cd:121c:u,0781:cfcb:u console=serial0,115200 console=tty1 root=PARTUUID=cb15ae4d-02 rootfstype=ext4 fsck.repair=yes rootwait cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory quiet boot=startos
\ No newline at end of file
diff --git a/patch-db b/patch-db
index e4a3f7b57..88a804f56 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit e4a3f7b577df56c611b21d5ad03eb459e80fb919
+Subproject commit 88a804f56f446d34896ef331d915b821a581cf01
diff --git a/sdk/lib/osBindings/AcceptSigners.ts b/sdk/lib/osBindings/AcceptSigners.ts
new file mode 100644
index 000000000..55d3997fe
--- /dev/null
+++ b/sdk/lib/osBindings/AcceptSigners.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { SignerKey } from "./SignerKey"
+
+export type AcceptSigners =
+  | { signer: SignerKey }
+  | { any: Array<AcceptSigners> }
+  | { all: Array<AcceptSigners> }
diff --git a/sdk/lib/osBindings/UpdateProgress.ts b/sdk/lib/osBindings/AddAdminParams.ts
similarity index 60%
rename from sdk/lib/osBindings/UpdateProgress.ts
rename to sdk/lib/osBindings/AddAdminParams.ts
index 19b55f262..a900f793b 100644
--- a/sdk/lib/osBindings/UpdateProgress.ts
+++ b/sdk/lib/osBindings/AddAdminParams.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type UpdateProgress = { size: number | null; downloaded: number }
+export type AddAdminParams = { signer: string }
diff --git a/sdk/lib/osBindings/AddAssetParams.ts b/sdk/lib/osBindings/AddAssetParams.ts
new file mode 100644
index 000000000..6a4d3fdf7
--- /dev/null
+++ b/sdk/lib/osBindings/AddAssetParams.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Signature } from "./Signature"
+import type { SignerKey } from "./SignerKey"
+
+export type AddAssetParams = {
+  url: string
+  signature: Signature
+  version: string
+  platform: string
+  upload: boolean
+  __auth_signer: SignerKey
+}
diff --git a/sdk/lib/osBindings/AddVersionParams.ts b/sdk/lib/osBindings/AddVersionParams.ts
new file mode 100644
index 000000000..9fc281a6f
--- /dev/null
+++ b/sdk/lib/osBindings/AddVersionParams.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AddVersionParams = {
+  version: string
+  headline: string
+  releaseNotes: string
+  sourceVersion: string
+}
diff --git a/sdk/lib/osBindings/Base64.ts b/sdk/lib/osBindings/Base64.ts
new file mode 100644
index 000000000..597227fc9
--- /dev/null
+++ b/sdk/lib/osBindings/Base64.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Base64 = string
diff --git a/sdk/lib/osBindings/Blake3Ed25519Signature.ts b/sdk/lib/osBindings/Blake3Ed25519Signature.ts
new file mode 100644
index 000000000..8d28cb9ec
--- /dev/null
+++ b/sdk/lib/osBindings/Blake3Ed25519Signature.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Base64 } from "./Base64"
+import type { Pem } from "./Pem"
+
+export type Blake3Ed25519Signature = {
+  hash: Base64
+  size: bigint
+  pubkey: Pem
+  signature: Base64
+}
diff --git a/sdk/lib/osBindings/Blake3Ed2551SignatureInfo.ts b/sdk/lib/osBindings/Blake3Ed2551SignatureInfo.ts
new file mode 100644
index 000000000..efe18aca7
--- /dev/null
+++ b/sdk/lib/osBindings/Blake3Ed2551SignatureInfo.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Base64 } from "./Base64"
+import type { Pem } from "./Pem"
+
+export type Blake3Ed2551SignatureInfo = {
+  hash: Base64
+  size: bigint
+  signatures: { [key: Pem]: Base64 }
+}
diff --git a/sdk/lib/osBindings/ContactInfo.ts b/sdk/lib/osBindings/ContactInfo.ts
new file mode 100644
index 000000000..e6d4c13b2
--- /dev/null
+++ b/sdk/lib/osBindings/ContactInfo.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ContactInfo =
+  | { email: string }
+  | { matrix: string }
+  | { website: string }
diff --git a/sdk/lib/osBindings/FullIndex.ts b/sdk/lib/osBindings/FullIndex.ts
new file mode 100644
index 000000000..8da15b4c0
--- /dev/null
+++ b/sdk/lib/osBindings/FullIndex.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { OsIndex } from "./OsIndex"
+import type { SignerInfo } from "./SignerInfo"
+
+export type FullIndex = { os: OsIndex; signers: { [key: string]: SignerInfo } }
diff --git a/sdk/lib/osBindings/GetOsAssetParams.ts b/sdk/lib/osBindings/GetOsAssetParams.ts
new file mode 100644
index 000000000..100f711c7
--- /dev/null
+++ b/sdk/lib/osBindings/GetOsAssetParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GetOsAssetParams = { version: string; platform: string }
diff --git a/sdk/lib/osBindings/GetVersionParams.ts b/sdk/lib/osBindings/GetVersionParams.ts
new file mode 100644
index 000000000..71762c8dd
--- /dev/null
+++ b/sdk/lib/osBindings/GetVersionParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GetVersionParams = { source: string | null; target: string | null }
diff --git a/sdk/lib/osBindings/ListVersionSignersParams.ts b/sdk/lib/osBindings/ListVersionSignersParams.ts
new file mode 100644
index 000000000..baf516bf2
--- /dev/null
+++ b/sdk/lib/osBindings/ListVersionSignersParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ListVersionSignersParams = { version: string }
diff --git a/sdk/lib/osBindings/OsIndex.ts b/sdk/lib/osBindings/OsIndex.ts
new file mode 100644
index 000000000..590e9f577
--- /dev/null
+++ b/sdk/lib/osBindings/OsIndex.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { OsVersionInfo } from "./OsVersionInfo"
+
+export type OsIndex = { versions: { [key: string]: OsVersionInfo } }
diff --git a/sdk/lib/osBindings/OsVersionInfo.ts b/sdk/lib/osBindings/OsVersionInfo.ts
new file mode 100644
index 000000000..fc40ef842
--- /dev/null
+++ b/sdk/lib/osBindings/OsVersionInfo.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { RegistryAsset } from "./RegistryAsset"
+
+export type OsVersionInfo = {
+  headline: string
+  releaseNotes: string
+  sourceVersion: string
+  signers: string[]
+  iso: { [key: string]: RegistryAsset }
+  squashfs: { [key: string]: RegistryAsset }
+  img: { [key: string]: RegistryAsset }
+}
diff --git a/sdk/lib/osBindings/PackageDataEntry.ts b/sdk/lib/osBindings/PackageDataEntry.ts
index 28074a08d..f88c6d7be 100644
--- a/sdk/lib/osBindings/PackageDataEntry.ts
+++ b/sdk/lib/osBindings/PackageDataEntry.ts
@@ -12,7 +12,7 @@ import type { Status } from "./Status"
 export type PackageDataEntry = {
   stateInfo: PackageState
   status: Status
-  marketplaceUrl: string | null
+  registry: string | null
   developerKey: string
   icon: DataUrl
   lastBackup: string | null
diff --git a/sdk/lib/osBindings/Pem.ts b/sdk/lib/osBindings/Pem.ts
new file mode 100644
index 000000000..1ec1cd375
--- /dev/null
+++ b/sdk/lib/osBindings/Pem.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Pem = string
diff --git a/sdk/lib/osBindings/Progress.ts b/sdk/lib/osBindings/Progress.ts
index 3ece4307c..9509ed7e1 100644
--- a/sdk/lib/osBindings/Progress.ts
+++ b/sdk/lib/osBindings/Progress.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Progress = boolean | { done: number; total: number | null }
+export type Progress = null | boolean | { done: number; total: number | null }
diff --git a/sdk/lib/osBindings/RegistryAsset.ts b/sdk/lib/osBindings/RegistryAsset.ts
new file mode 100644
index 000000000..cb878c66a
--- /dev/null
+++ b/sdk/lib/osBindings/RegistryAsset.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { SignatureInfo } from "./SignatureInfo"
+
+export type RegistryAsset = { url: string; signatureInfo: SignatureInfo }
diff --git a/sdk/lib/osBindings/RemoveVersionParams.ts b/sdk/lib/osBindings/RemoveVersionParams.ts
new file mode 100644
index 000000000..2c974de56
--- /dev/null
+++ b/sdk/lib/osBindings/RemoveVersionParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type RemoveVersionParams = { version: string }
diff --git a/sdk/lib/osBindings/ServerStatus.ts b/sdk/lib/osBindings/ServerStatus.ts
index 2d3a362d7..6bce57333 100644
--- a/sdk/lib/osBindings/ServerStatus.ts
+++ b/sdk/lib/osBindings/ServerStatus.ts
@@ -1,12 +1,12 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BackupProgress } from "./BackupProgress"
+import type { FullProgress } from "./FullProgress"
 import type { PackageId } from "./PackageId"
-import type { UpdateProgress } from "./UpdateProgress"
 
 export type ServerStatus = {
   backupProgress: { [key: PackageId]: BackupProgress } | null
   updated: boolean
-  updateProgress: UpdateProgress | null
+  updateProgress: FullProgress | null
   shuttingDown: boolean
   restarting: boolean
 }
diff --git a/sdk/lib/osBindings/SignAssetParams.ts b/sdk/lib/osBindings/SignAssetParams.ts
new file mode 100644
index 000000000..3b3612c47
--- /dev/null
+++ b/sdk/lib/osBindings/SignAssetParams.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Signature } from "./Signature"
+
+export type SignAssetParams = {
+  version: string
+  platform: string
+  signature: Signature
+}
diff --git a/sdk/lib/osBindings/Signature.ts b/sdk/lib/osBindings/Signature.ts
new file mode 100644
index 000000000..a27ada0e7
--- /dev/null
+++ b/sdk/lib/osBindings/Signature.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Blake3Ed25519Signature } from "./Blake3Ed25519Signature"
+
+export type Signature = { blake3Ed25519: Blake3Ed25519Signature }
diff --git a/sdk/lib/osBindings/SignatureInfo.ts b/sdk/lib/osBindings/SignatureInfo.ts
new file mode 100644
index 000000000..41a093742
--- /dev/null
+++ b/sdk/lib/osBindings/SignatureInfo.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Blake3Ed2551SignatureInfo } from "./Blake3Ed2551SignatureInfo"
+
+export type SignatureInfo = {
+  context: string
+  "blake-3-ed-25-5i-9": Blake3Ed2551SignatureInfo | null
+}
diff --git a/sdk/lib/osBindings/SignerInfo.ts b/sdk/lib/osBindings/SignerInfo.ts
new file mode 100644
index 000000000..06293cbab
--- /dev/null
+++ b/sdk/lib/osBindings/SignerInfo.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ContactInfo } from "./ContactInfo"
+import type { SignerKey } from "./SignerKey"
+
+export type SignerInfo = {
+  name: string
+  contact: Array<ContactInfo>
+  keys: Array<SignerKey>
+}
diff --git a/sdk/lib/osBindings/SignerKey.ts b/sdk/lib/osBindings/SignerKey.ts
new file mode 100644
index 000000000..bd5c7c043
--- /dev/null
+++ b/sdk/lib/osBindings/SignerKey.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Pem } from "./Pem"
+
+export type SignerKey = { alg: "ed25519"; pubkey: Pem }
diff --git a/sdk/lib/osBindings/VersionSignerParams.ts b/sdk/lib/osBindings/VersionSignerParams.ts
new file mode 100644
index 000000000..70acdaa2e
--- /dev/null
+++ b/sdk/lib/osBindings/VersionSignerParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type VersionSignerParams = { version: string; signer: string }
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 215f16b8b..d14a9fb87 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -1,20 +1,28 @@
+export { AcceptSigners } from "./AcceptSigners"
 export { ActionId } from "./ActionId"
 export { ActionMetadata } from "./ActionMetadata"
+export { AddAdminParams } from "./AddAdminParams"
+export { AddAssetParams } from "./AddAssetParams"
 export { AddressInfo } from "./AddressInfo"
 export { AddSslOptions } from "./AddSslOptions"
+export { AddVersionParams } from "./AddVersionParams"
 export { Alerts } from "./Alerts"
 export { Algorithm } from "./Algorithm"
 export { AllowedStatuses } from "./AllowedStatuses"
 export { AllPackageData } from "./AllPackageData"
 export { AlpnInfo } from "./AlpnInfo"
 export { BackupProgress } from "./BackupProgress"
+export { Base64 } from "./Base64"
 export { BindInfo } from "./BindInfo"
 export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
+export { Blake3Ed25519Signature } from "./Blake3Ed25519Signature"
+export { Blake3Ed2551SignatureInfo } from "./Blake3Ed2551SignatureInfo"
 export { Callback } from "./Callback"
 export { CheckDependenciesParam } from "./CheckDependenciesParam"
 export { CheckDependenciesResult } from "./CheckDependenciesResult"
 export { ChrootParams } from "./ChrootParams"
+export { ContactInfo } from "./ContactInfo"
 export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams"
 export { CurrentDependencies } from "./CurrentDependencies"
 export { CurrentDependencyInfo } from "./CurrentDependencyInfo"
@@ -35,9 +43,11 @@ export { ExportedIpHostname } from "./ExportedIpHostname"
 export { ExportedOnionHostname } from "./ExportedOnionHostname"
 export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams"
 export { ExposeForDependentsParams } from "./ExposeForDependentsParams"
+export { FullIndex } from "./FullIndex"
 export { FullProgress } from "./FullProgress"
 export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind"
 export { GetHostInfoParams } from "./GetHostInfoParams"
+export { GetOsAssetParams } from "./GetOsAssetParams"
 export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams"
 export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams"
 export { GetServicePortForwardParams } from "./GetServicePortForwardParams"
@@ -45,6 +55,7 @@ export { GetSslCertificateParams } from "./GetSslCertificateParams"
 export { GetSslKeyParams } from "./GetSslKeyParams"
 export { GetStoreParams } from "./GetStoreParams"
 export { GetSystemSmtpParams } from "./GetSystemSmtpParams"
+export { GetVersionParams } from "./GetVersionParams"
 export { Governor } from "./Governor"
 export { HardwareRequirements } from "./HardwareRequirements"
 export { HealthCheckId } from "./HealthCheckId"
@@ -60,22 +71,28 @@ export { InstallingInfo } from "./InstallingInfo"
 export { InstallingState } from "./InstallingState"
 export { IpInfo } from "./IpInfo"
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"
+export { ListVersionSignersParams } from "./ListVersionSignersParams"
 export { MainStatus } from "./MainStatus"
 export { Manifest } from "./Manifest"
 export { MaybeUtf8String } from "./MaybeUtf8String"
 export { MountParams } from "./MountParams"
 export { MountTarget } from "./MountTarget"
 export { NamedProgress } from "./NamedProgress"
+export { OsIndex } from "./OsIndex"
+export { OsVersionInfo } from "./OsVersionInfo"
 export { PackageDataEntry } from "./PackageDataEntry"
 export { PackageId } from "./PackageId"
 export { PackageState } from "./PackageState"
 export { ParamsMaybePackageId } from "./ParamsMaybePackageId"
 export { ParamsPackageId } from "./ParamsPackageId"
 export { PasswordType } from "./PasswordType"
+export { Pem } from "./Pem"
 export { Progress } from "./Progress"
 export { Public } from "./Public"
+export { RegistryAsset } from "./RegistryAsset"
 export { RemoveActionParams } from "./RemoveActionParams"
 export { RemoveAddressParams } from "./RemoveAddressParams"
+export { RemoveVersionParams } from "./RemoveVersionParams"
 export { ReverseProxyBind } from "./ReverseProxyBind"
 export { ReverseProxyDestination } from "./ReverseProxyDestination"
 export { ReverseProxyHttp } from "./ReverseProxyHttp"
@@ -96,8 +113,13 @@ export { SetDependenciesParams } from "./SetDependenciesParams"
 export { SetHealth } from "./SetHealth"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetStoreParams } from "./SetStoreParams"
+export { SignAssetParams } from "./SignAssetParams"
+export { SignatureInfo } from "./SignatureInfo"
+export { Signature } from "./Signature"
+export { SignerInfo } from "./SignerInfo"
+export { SignerKey } from "./SignerKey"
 export { Status } from "./Status"
-export { UpdateProgress } from "./UpdateProgress"
 export { UpdatingState } from "./UpdatingState"
+export { VersionSignerParams } from "./VersionSignerParams"
 export { VolumeId } from "./VolumeId"
 export { WifiInfo } from "./WifiInfo"
diff --git a/web/projects/ui/src/app/app/footer/footer.component.html b/web/projects/ui/src/app/app/footer/footer.component.html
index 0d5987a8e..c62a8c2de 100644
--- a/web/projects/ui/src/app/app/footer/footer.component.html
+++ b/web/projects/ui/src/app/app/footer/footer.component.html
@@ -5,16 +5,16 @@
 >
   <ion-list class="list">
     <!-- show progress -->
-    <ng-container *ngIf="progress.size !== null; else calculating">
+    <ng-container *ngIf="!!progress.overall && progress.overall !== true && progress.overall.total; else calculating">
       <ion-list-header>
         <ion-label>
-          Downloading: {{ getProgress(progress.size, progress.downloaded) }}%
+          Downloading: {{ getProgress(progress.overall.total, progress.overall.done) }}%
         </ion-label>
       </ion-list-header>
       <ion-progress-bar
         class="progress"
         color="secondary"
-        [value]="getProgress(progress.size, progress.downloaded) / 100"
+        [value]="getProgress(progress.overall.total, progress.overall.done) / 100"
       ></ion-progress-bar>
     </ng-container>
     <!-- show calculating -->
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
index e259f2792..9b62a6402 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
@@ -8,7 +8,7 @@
   <ion-progress-bar
     [type]="
       phase.progress === true ||
-      (phase.progress !== false && phase.progress.total)
+      (phase.progress !== false && phase.progress!== null && phase.progress.total)
         ? 'determinate'
         : 'indeterminate'
     "
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index f7ae9f973..692d5d55f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -122,7 +122,7 @@ export class ToButtonsPipe implements PipeTransform {
   private viewInMarketplaceButton(
     pkg: PackageDataEntry<InstalledState>,
   ): Button {
-    const url = pkg.marketplaceUrl
+    const url = pkg.registry
     const queryParams = url ? { url } : {}
 
     let button: Button = {
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index a2e94aee0..4e44e2af3 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -65,7 +65,7 @@ export class MarketplaceShowControlsComponent {
     if (!this.localPkg) {
       this.alertInstall(url)
     } else {
-      const originalUrl = this.localPkg.marketplaceUrl
+      const originalUrl = this.localPkg.registry
 
       if (!sameUrl(url, originalUrl)) {
         const proceed = await this.presentAlertDifferentMarketplace(
diff --git a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
index 8eb0a57ec..157afed4e 100644
--- a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
+++ b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
@@ -7,7 +7,8 @@ import { T } from '@start9labs/start-sdk'
 export class InstallingProgressDisplayPipe implements PipeTransform {
   transform(progress: T.Progress): string {
     if (progress === true) return 'finalizing'
-    if (progress === false || !progress.total) return 'unknown %'
+    if (progress === false || progress === null || !progress.total)
+      return 'unknown %'
     const percentage = Math.round((100 * progress.done) / progress.total)
 
     return percentage < 99 ? String(percentage) + '%' : 'finalizing'
@@ -20,7 +21,7 @@ export class InstallingProgressDisplayPipe implements PipeTransform {
 export class InstallingProgressPipe implements PipeTransform {
   transform(progress: T.Progress): number | null {
     if (progress === true) return 1
-    if (progress === false || !progress.total) return null
+    if (progress === false || progress === null || !progress.total) return null
     return Number((progress.done / progress.total).toFixed(2))
   }
 }
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 7933109b3..59ef6dd1e 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1633,7 +1633,7 @@ export module Mock {
     currentDependencies: {},
     hosts: {},
     storeExposedDependents: [],
-    marketplaceUrl: 'https://registry.start9.com/',
+    registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
   }
 
@@ -1773,7 +1773,7 @@ export module Mock {
     },
     hosts: {},
     storeExposedDependents: [],
-    marketplaceUrl: 'https://registry.start9.com/',
+    registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
   }
 
@@ -2024,7 +2024,7 @@ export module Mock {
     },
     hosts: {},
     storeExposedDependents: [],
-    marketplaceUrl: 'https://registry.start9.com/',
+    registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
   }
 
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 1d9ce3de3..3539164f5 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -56,7 +56,7 @@ export module RR {
   export type GetServerMetricsReq = {} // server.metrics
   export type GetServerMetricsRes = Metrics
 
-  export type UpdateServerReq = { marketplaceUrl: string } // server.update
+  export type UpdateServerReq = { registry: string } // server.update
   export type UpdateServerRes = 'updating' | 'no-updates'
 
   export type RestartServerReq = {} // server.restart
@@ -192,7 +192,7 @@ export module RR {
     id: string
     versionSpec?: string
     versionPriority?: 'min' | 'max'
-    marketplaceUrl: string
+    registry: string
   } // package.install
   export type InstallPackageRes = null
 
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 12b6f1d1a..631c12e6b 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -30,7 +30,7 @@ export class LiveApiService extends ApiService {
     private readonly patch: PatchDB<DataModel>,
   ) {
     super()
-    ; (window as any).rpcClient = this
+    ;(window as any).rpcClient = this
   }
 
   // for getting static files: ex icons, instructions, licenses
@@ -158,7 +158,7 @@ export class LiveApiService extends ApiService {
 
   async updateServer(url?: string): Promise<RR.UpdateServerRes> {
     const params = {
-      marketplaceUrl: url || this.config.marketplace.start9,
+      registry: url || this.config.marketplace.start9,
     }
     return this.rpcRequest({ method: 'server.update', params })
   }
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 31ab11201..f623f6db3 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -1017,7 +1017,11 @@ export class MockApiService extends ApiService {
     const progress = JSON.parse(JSON.stringify(PROGRESS))
 
     for (let [i, phase] of progress.phases.entries()) {
-      if (typeof phase.progress !== 'object' || !phase.progress.total) {
+      if (
+        !phase.progress ||
+        typeof phase.progress !== 'object' ||
+        !phase.progress.total
+      ) {
         await pauseFor(2000)
 
         const patches: Operation<any>[] = [
@@ -1029,7 +1033,11 @@ export class MockApiService extends ApiService {
         ]
 
         // overall
-        if (typeof progress.overall === 'object' && progress.overall.total) {
+        if (
+          progress.overall &&
+          typeof progress.overall === 'object' &&
+          progress.overall.total
+        ) {
           const step = progress.overall.total / progress.phases.length
 
           progress.overall.done += step
@@ -1059,7 +1067,11 @@ export class MockApiService extends ApiService {
           ]
 
           // overall
-          if (typeof progress.overall === 'object' && progress.overall.total) {
+          if (
+            progress.overall &&
+            typeof progress.overall === 'object' &&
+            progress.overall.total
+          ) {
             const step = progress.overall.total / progress.phases.length / 4
 
             progress.overall.done += step
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index ed0edacbe..9f17c22eb 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -348,7 +348,7 @@ export const mockPatchData: DataModel = {
       currentDependencies: {},
       hosts: {},
       storeExposedDependents: [],
-      marketplaceUrl: 'https://registry.start9.com/',
+      registry: 'https://registry.start9.com/',
       developerKey: 'developer-key',
     },
     lnd: {
@@ -600,7 +600,7 @@ export const mockPatchData: DataModel = {
       },
       hosts: {},
       storeExposedDependents: [],
-      marketplaceUrl: 'https://registry.start9.com/',
+      registry: 'https://registry.start9.com/',
       developerKey: 'developer-key',
     },
   },
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index 30055df56..40d2247e7 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -211,7 +211,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
     const params: RR.InstallPackageReq = {
       id,
       versionSpec: `=${version}`,
-      marketplaceUrl: url,
+      registry: url,
     }
 
     await this.api.installPackage(params)

From 30aabe255b18858e61aaa2e8da4eacbe95dc4620 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 6 May 2024 15:46:36 -0600
Subject: [PATCH 147/341] Feature/backup+restore (#2613)

* feat: Implementation on the backup for the service.

* wip: Getting the flow of backup/restore

* feat: Recover

* Feature: Commit the full pass on the backup restore.

* use special type for backup instead of special id (#2614)

* fix: Allow compat docker style to run again

* fix: Backup for the js side

* chore: Update some of the callbacks

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
---
 container-runtime/src/Adapters/RpcListener.ts |  2 +-
 .../DockerProcedureContainer.ts               |  2 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |  9 ++
 .../Systems/SystemForEmbassy/index.ts         | 54 ++---------
 .../Systems/SystemForEmbassy/matchManifest.ts |  1 +
 .../SystemForEmbassy/polyfillEffects.ts       | 31 +++++++
 .../src/Models/CallbackHolder.ts              |  6 +-
 container-runtime/src/Models/Volume.ts        |  9 +-
 core/startos/src/backup/backup_bulk.rs        | 41 ++++++--
 core/startos/src/service/mod.rs               | 42 +++++++--
 .../src/service/persistent_container.rs       | 36 ++++++-
 .../src/service/service_effect_handler.rs     | 12 +--
 core/startos/src/service/start_stop.rs        |  1 +
 core/startos/src/service/transition/backup.rs | 93 +++++++++++++++++++
 core/startos/src/service/transition/mod.rs    | 16 ++--
 .../startos/src/service/transition/restart.rs | 48 +++++++---
 .../startos/src/service/transition/restore.rs | 74 +++++++++++++++
 core/startos/src/status/mod.rs                | 15 ++-
 .../ExportServiceInterfaceParams.ts           |  7 +-
 sdk/lib/osBindings/MainStatus.ts              |  1 +
 sdk/lib/util/Overlay.ts                       | 17 ++++
 21 files changed, 415 insertions(+), 102 deletions(-)
 create mode 100644 core/startos/src/service/transition/restore.rs

diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index db5b786fc..faff253fe 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -81,7 +81,7 @@ const callbackType = object({
   id: idType,
   method: literal("callback"),
   params: object({
-    callback: string,
+    callback: number,
     args: array,
   }),
 })
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index c8388d151..b4a5f5829 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -68,7 +68,7 @@ export class DockerProcedureContainer {
             },
           })
         } else if (volumeMount.type === "backup") {
-          throw new Error("TODO")
+          await overlay.mount({ type: "backup", subpath: null }, mounts[mount])
         }
       }
     }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 0b4f92002..7e18c69f1 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -145,6 +145,15 @@ export class MainLoop {
               ...actionProcedure.args,
               JSON.stringify(timeChanged),
             ])
+            if (executed.exitCode === 0) {
+              await effects.setHealth({
+                id: healthId,
+                name: value.name,
+                result: "success",
+                message: actionProcedure["success-message"],
+              })
+              return
+            }
             if (executed.exitCode === 59) {
               await effects.setHealth({
                 id: healthId,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 4cd3d1bfe..8988c5446 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -399,11 +399,10 @@ export class SystemForEmbassy implements System {
   ): Promise<void> {
     const backup = this.manifest.backup.create
     if (backup.type === "docker") {
-      const container = await DockerProcedureContainer.of(
-        effects,
-        backup,
-        this.manifest.volumes,
-      )
+      const container = await DockerProcedureContainer.of(effects, backup, {
+        ...this.manifest.volumes,
+        BACKUP: { type: "backup", readonly: false },
+      })
       await container.execFail([backup.entrypoint, ...backup.args], timeoutMs)
     } else {
       const moduleCode = await this.moduleCode
@@ -421,7 +420,10 @@ export class SystemForEmbassy implements System {
       const container = await DockerProcedureContainer.of(
         effects,
         restoreBackup,
-        this.manifest.volumes,
+        {
+          ...this.manifest.volumes,
+          BACKUP: { type: "backup", readonly: true },
+        },
       )
       await container.execFail(
         [restoreBackup.entrypoint, ...restoreBackup.args],
@@ -664,46 +666,6 @@ export class SystemForEmbassy implements System {
     }
     throw new Error(`Unknown type in the fetch properties: ${setConfigValue}`)
   }
-  private async health(
-    effects: HostSystemStartOs,
-    healthId: string,
-    timeSinceStarted: unknown,
-    timeoutMs: number | null,
-  ): Promise<void> {
-    const healthProcedure = this.manifest["health-checks"][healthId]
-    if (!healthProcedure) return
-    if (healthProcedure.type === "docker") {
-      const container = await DockerProcedureContainer.of(
-        effects,
-        healthProcedure,
-        this.manifest.volumes,
-      )
-      return JSON.parse(
-        (
-          await container.execFail(
-            [
-              healthProcedure.entrypoint,
-              ...healthProcedure.args,
-              JSON.stringify(timeSinceStarted),
-            ],
-            timeoutMs,
-          )
-        ).stdout.toString(),
-      )
-    } else if (healthProcedure.type === "script") {
-      const moduleCode = await this.moduleCode
-      const method = moduleCode.health?.[healthId]
-      if (!method) throw new Error("Expecting that the method health exists")
-      await method(
-        new PolyfillEffects(effects, this.manifest),
-        Number(timeSinceStarted),
-      ).then((x) => {
-        if ("result" in x) return x.result
-        if ("error" in x) throw new Error("Error getting config: " + x.error)
-        throw new Error("Error getting config: " + x["error-code"][1])
-      })
-    }
-  }
   private async action(
     effects: HostSystemStartOs,
     actionId: string,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
index 85cd1bac3..d4758669b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
@@ -57,6 +57,7 @@ export const matchManifest = object(
         matchProcedure,
         object({
           name: string,
+          ["success-message"]: string,
         }),
       ),
     ]),
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index ab6cb1c64..66a303e7b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -267,6 +267,7 @@ export class PolyfillEffects implements oet.Effects {
       json: () => fetched.json(),
     }
   }
+
   runRsync(rsyncOptions: {
     srcVolume: string
     dstVolume: string
@@ -277,6 +278,36 @@ export class PolyfillEffects implements oet.Effects {
     id: () => Promise<string>
     wait: () => Promise<null>
     progress: () => Promise<number>
+  } {
+    let secondRun: ReturnType<typeof this._runRsync> | undefined
+    let firstRun = this._runRsync(rsyncOptions)
+    let waitValue = firstRun.wait().then((x) => {
+      secondRun = this._runRsync(rsyncOptions)
+      return secondRun.wait()
+    })
+    const id = async () => {
+      return secondRun?.id?.() ?? firstRun.id()
+    }
+    const wait = () => waitValue
+    const progress = async () => {
+      const secondProgress = secondRun?.progress?.()
+      if (secondProgress) {
+        return (await secondProgress) / 2.0 + 0.5
+      }
+      return (await firstRun.progress()) / 2.0
+    }
+    return { id, wait, progress }
+  }
+  _runRsync(rsyncOptions: {
+    srcVolume: string
+    dstVolume: string
+    srcPath: string
+    dstPath: string
+    options: oet.BackupOptions
+  }): {
+    id: () => Promise<string>
+    wait: () => Promise<null>
+    progress: () => Promise<number>
   } {
     const { srcVolume, dstVolume, srcPath, dstPath, options } = rsyncOptions
     const command = "rsync"
diff --git a/container-runtime/src/Models/CallbackHolder.ts b/container-runtime/src/Models/CallbackHolder.ts
index b562e8dd0..6539dda88 100644
--- a/container-runtime/src/Models/CallbackHolder.ts
+++ b/container-runtime/src/Models/CallbackHolder.ts
@@ -2,16 +2,16 @@ export class CallbackHolder {
   constructor() {}
   private root = (Math.random() + 1).toString(36).substring(7)
   private inc = 0
-  private callbacks = new Map<string, Function>()
+  private callbacks = new Map<number, Function>()
   private newId() {
-    return this.root + (this.inc++).toString(36)
+    return this.inc++
   }
   addCallback(callback: Function) {
     const id = this.newId()
     this.callbacks.set(id, callback)
     return id
   }
-  callCallback(index: string, args: any[]): Promise<unknown> {
+  callCallback(index: number, args: any[]): Promise<unknown> {
     const callback = this.callbacks.get(index)
     if (!callback) throw new Error(`Callback ${index} does not exist`)
     this.callbacks.delete(index)
diff --git a/container-runtime/src/Models/Volume.ts b/container-runtime/src/Models/Volume.ts
index ebf013b68..061bb1fd0 100644
--- a/container-runtime/src/Models/Volume.ts
+++ b/container-runtime/src/Models/Volume.ts
@@ -1,14 +1,17 @@
 import * as fs from "node:fs/promises"
 
+export const BACKUP = "backup"
 export class Volume {
   readonly path: string
   constructor(
     readonly volumeId: string,
     _path = "",
   ) {
-    const path = (this.path = `/media/startos/volumes/${volumeId}${
-      !_path ? "" : `/${_path}`
-    }`)
+    if (volumeId.toLowerCase() === BACKUP) {
+      this.path = `/media/startos/backup${!_path ? "" : `/${_path}`}`
+    } else {
+      this.path = `/media/startos/volumes/${volumeId}${!_path ? "" : `/${_path}`}`
+    }
   }
   async exists() {
     return fs.stat(this.path).then(
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index b72ce7b7b..79cb3b98a 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -13,7 +13,7 @@ use tokio::io::AsyncWriteExt;
 use tracing::instrument;
 use ts_rs::TS;
 
-use super::target::BackupTargetId;
+use super::target::{BackupTargetId, PackageBackupInfo};
 use super::PackageBackupReport;
 use crate::auth::check_password_against_db;
 use crate::backup::os::OsBackup;
@@ -246,19 +246,43 @@ async fn perform_backup(
     backup_guard: BackupMountGuard<TmpMountGuard>,
     package_ids: &OrdSet<PackageId>,
 ) -> Result<BTreeMap<PackageId, PackageBackupReport>, Error> {
+    let db = ctx.db.peek().await;
     let mut backup_report = BTreeMap::new();
     let backup_guard = Arc::new(backup_guard);
+    let mut package_backups: BTreeMap<PackageId, PackageBackupInfo> =
+        backup_guard.metadata.package_backups.clone();
 
     for id in package_ids {
         if let Some(service) = &*ctx.services.get(id).await {
+            let backup_result = service
+                .backup(backup_guard.package_backup(id))
+                .await
+                .err()
+                .map(|e| e.to_string());
+            if backup_result.is_none() {
+                let manifest = db
+                    .as_public()
+                    .as_package_data()
+                    .as_idx(id)
+                    .or_not_found(id)?
+                    .as_state_info()
+                    .expect_installed()?
+                    .as_manifest();
+
+                package_backups.insert(
+                    id.clone(),
+                    PackageBackupInfo {
+                        os_version: manifest.as_os_version().de()?,
+                        version: manifest.as_version().de()?,
+                        title: manifest.as_title().de()?,
+                        timestamp: Utc::now(),
+                    },
+                );
+            }
             backup_report.insert(
                 id.clone(),
                 PackageBackupReport {
-                    error: service
-                        .backup(backup_guard.package_backup(id))
-                        .await
-                        .err()
-                        .map(|e| e.to_string()),
+                    error: backup_result,
                 },
             );
         }
@@ -298,7 +322,7 @@ async fn perform_backup(
     }
     let luks_folder = Path::new("/media/startos/config/luks");
     if tokio::fs::metadata(&luks_folder).await.is_ok() {
-        dir_copy(&luks_folder, &luks_folder_bak, None).await?;
+        dir_copy(luks_folder, &luks_folder_bak, None).await?;
     }
 
     let timestamp = Some(Utc::now());
@@ -307,8 +331,9 @@ async fn perform_backup(
     backup_guard.unencrypted_metadata.full = true;
     backup_guard.metadata.version = crate::version::Current::new().semver().into();
     backup_guard.metadata.timestamp = timestamp;
+    backup_guard.metadata.package_backups = package_backups;
 
-    backup_guard.save_and_unmount().await?;
+    backup_guard.save().await?;
 
     ctx.db
         .mutate(|v| {
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index a9ee0bd81..ec8566133 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -10,7 +10,7 @@ use persistent_container::PersistentContainer;
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
 use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
-use tokio::sync::Notify;
+use tokio::{fs::File, sync::Notify};
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
@@ -296,13 +296,20 @@ impl Service {
     }
 
     pub async fn restore(
-        _ctx: RpcContext,
-        _s9pk: S9pk,
-        _guard: impl GenericMountGuard,
-        _progress: Option<InstallProgressHandles>,
+        ctx: RpcContext,
+        s9pk: S9pk,
+        backup_source: impl GenericMountGuard,
+        progress: Option<InstallProgressHandles>,
     ) -> Result<Self, Error> {
-        // TODO
-        Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
+        let service = Service::install(ctx.clone(), s9pk, None, progress).await?;
+
+        service
+            .actor
+            .send(transition::restore::Restore {
+                path: backup_source.path().to_path_buf(),
+            })
+            .await?;
+        Ok(service)
     }
 
     pub async fn shutdown(self) -> Result<(), Error> {
@@ -348,9 +355,23 @@ impl Service {
         Ok(())
     }
 
-    pub async fn backup(&self, _guard: impl GenericMountGuard) -> Result<BackupReturn, Error> {
-        // TODO
-        Err(Error::new(eyre!("not yet implemented"), ErrorKind::Unknown))
+    #[instrument(skip_all)]
+    pub async fn backup(&self, guard: impl GenericMountGuard) -> Result<(), Error> {
+        let id = &self.seed.id;
+        let mut file = File::create(guard.path().join(id).with_extension("s9pk")).await?;
+        self.seed
+            .persistent_container
+            .s9pk
+            .clone()
+            .serialize(&mut file, true)
+            .await?;
+        drop(file);
+        self.actor
+            .send(transition::backup::Backup {
+                path: guard.path().to_path_buf(),
+            })
+            .await?;
+        Ok(())
     }
 
     pub fn container_id(&self) -> Result<ContainerId, Error> {
@@ -425,6 +446,7 @@ impl Actor for ServiceActor {
                         kinds.running_status,
                     ) {
                         (Some(TransitionKind::Restarting), _, _) => MainStatus::Restarting,
+                        (Some(TransitionKind::Restoring), _, _) => MainStatus::Restoring,
                         (Some(TransitionKind::BackingUp), _, Some(status)) => {
                             MainStatus::BackingUp {
                                 started: Some(status.started),
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 2cb68a121..06dcdc28e 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
@@ -222,6 +222,40 @@ impl PersistentContainer {
         })
     }
 
+    #[instrument(skip_all)]
+    pub async fn mount_backup(
+        &self,
+        backup_path: impl AsRef<Path>,
+        mount_type: MountType,
+    ) -> Result<MountGuard, Error> {
+        let backup_path: PathBuf = backup_path.as_ref().to_path_buf();
+        let mountpoint = self
+            .lxc_container
+            .get()
+            .ok_or_else(|| {
+                Error::new(
+                    eyre!("PersistentContainer has been destroyed"),
+                    ErrorKind::Incoherent,
+                )
+            })?
+            .rootfs_dir()
+            .join("media/startos/backup");
+        tokio::fs::create_dir_all(&mountpoint).await?;
+        Command::new("chown")
+            .arg("100000:100000")
+            .arg(mountpoint.as_os_str())
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        let bind = Bind::new(&backup_path);
+        let mount_guard = MountGuard::mount(&bind, &mountpoint, mount_type).await;
+        Command::new("chown")
+            .arg("100000:100000")
+            .arg(backup_path.as_os_str())
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        mount_guard
+    }
+
     #[instrument(skip_all)]
     pub async fn init(&self, seed: Weak<ServiceActorSeed>) -> Result<(), Error> {
         let socket_server_context = EffectContext::new(seed);
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index c5e5433e6..c5023476a 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1070,11 +1070,6 @@ pub async fn create_overlayed_image(
             .rootfs_dir();
         let mountpoint = rootfs_dir.join("media/startos/overlays").join(&*guid);
         tokio::fs::create_dir_all(&mountpoint).await?;
-        Command::new("chown")
-            .arg("100000:100000")
-            .arg(&mountpoint)
-            .invoke(ErrorKind::Filesystem)
-            .await?;
         let container_mountpoint = Path::new("/").join(
             mountpoint
                 .strip_prefix(rootfs_dir)
@@ -1083,9 +1078,14 @@ pub async fn create_overlayed_image(
         tracing::info!("Mounting overlay {guid} for {image_id}");
         let guard = OverlayGuard::mount(
             &IdMapped::new(LoopDev::from(&**image), 0, 100000, 65536),
-            mountpoint,
+            &mountpoint,
         )
         .await?;
+        Command::new("chown")
+            .arg("100000:100000")
+            .arg(&mountpoint)
+            .invoke(ErrorKind::Filesystem)
+            .await?;
         tracing::info!("Mounted overlay {guid} for {image_id}");
         ctx.persistent_container
             .overlays
diff --git a/core/startos/src/service/start_stop.rs b/core/startos/src/service/start_stop.rs
index bc24574ac..178176023 100644
--- a/core/startos/src/service/start_stop.rs
+++ b/core/startos/src/service/start_stop.rs
@@ -15,6 +15,7 @@ impl From<MainStatus> for StartStop {
     fn from(value: MainStatus) -> Self {
         match value {
             MainStatus::Stopped => StartStop::Stop,
+            MainStatus::Restoring => StartStop::Stop,
             MainStatus::Restarting => StartStop::Start,
             MainStatus::Stopping { .. } => StartStop::Stop,
             MainStatus::Starting => StartStop::Start,
diff --git a/core/startos/src/service/transition/backup.rs b/core/startos/src/service/transition/backup.rs
index 8b1378917..e6a5cb817 100644
--- a/core/startos/src/service/transition/backup.rs
+++ b/core/startos/src/service/transition/backup.rs
@@ -1 +1,94 @@
+use std::path::PathBuf;
 
+use futures::FutureExt;
+use models::ProcedureName;
+
+use super::TempDesiredRestore;
+use crate::disk::mount::filesystem::ReadWrite;
+use crate::prelude::*;
+use crate::service::config::GetConfig;
+use crate::service::dependencies::DependencyConfig;
+use crate::service::transition::{TransitionKind, TransitionState};
+use crate::service::ServiceActor;
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::{ConflictBuilder, Handler};
+use crate::util::future::RemoteCancellable;
+
+pub(in crate::service) struct Backup {
+    pub path: PathBuf,
+}
+impl Handler<Backup> for ServiceActor {
+    type Response = Result<(), Error>;
+    fn conflicts_with(_: &Backup) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything()
+            .except::<GetConfig>()
+            .except::<DependencyConfig>()
+    }
+    async fn handle(&mut self, backup: Backup, jobs: &BackgroundJobQueue) -> Self::Response {
+        // So Need a handle to just a single field in the state
+        let temp: TempDesiredRestore = TempDesiredRestore::new(&self.0.persistent_container.state);
+        let mut current = self.0.persistent_container.state.subscribe();
+        let path = backup.path.clone();
+        let seed = self.0.clone();
+
+        let state = self.0.persistent_container.state.clone();
+        let transition = RemoteCancellable::new(
+            async move {
+                temp.stop();
+                current
+                    .wait_for(|s| s.running_status.is_none())
+                    .await
+                    .with_kind(ErrorKind::Unknown)?;
+
+                let backup_guard = seed
+                    .persistent_container
+                    .mount_backup(path, ReadWrite)
+                    .await?;
+                seed.persistent_container
+                    .execute(ProcedureName::CreateBackup, Value::Null, None)
+                    .await?;
+                backup_guard.unmount(true).await?;
+
+                if temp.restore().is_start() {
+                    current
+                        .wait_for(|s| s.running_status.is_some())
+                        .await
+                        .with_kind(ErrorKind::Unknown)?;
+                }
+                drop(temp);
+                state.send_modify(|s| {
+                    s.transition_state.take();
+                });
+                Ok::<_, Error>(())
+            }
+            .map(|x| {
+                if let Err(err) = dbg!(x) {
+                    tracing::debug!("{:?}", err);
+                    tracing::warn!("{}", err);
+                }
+            }),
+        );
+        let cancel_handle = transition.cancellation_handle();
+        let transition = transition.shared();
+        let job_transition = transition.clone();
+        jobs.add_job(job_transition.map(|_| ()));
+
+        let mut old = None;
+        self.0.persistent_container.state.send_modify(|s| {
+            old = std::mem::replace(
+                &mut s.transition_state,
+                Some(TransitionState {
+                    kind: TransitionKind::BackingUp,
+                    cancel_handle,
+                }),
+            )
+        });
+        if let Some(t) = old {
+            t.abort().await;
+        }
+        match transition.await {
+            None => Err(Error::new(eyre!("Backup canceled"), ErrorKind::Unknown)),
+            Some(x) => Ok(x),
+        }
+    }
+}
diff --git a/core/startos/src/service/transition/mod.rs b/core/startos/src/service/transition/mod.rs
index 25d225492..7b7f10f2a 100644
--- a/core/startos/src/service/transition/mod.rs
+++ b/core/startos/src/service/transition/mod.rs
@@ -10,11 +10,13 @@ use crate::util::future::{CancellationHandle, RemoteCancellable};
 
 pub mod backup;
 pub mod restart;
+pub mod restore;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum TransitionKind {
     BackingUp,
     Restarting,
+    Restoring,
 }
 
 /// Used only in the manager/mod and is used to keep track of the state of the manager during the
@@ -59,21 +61,23 @@ impl Drop for TransitionState {
 }
 
 #[derive(Debug, Clone)]
-pub struct TempDesiredState(pub(super) Arc<watch::Sender<ServiceState>>);
-impl TempDesiredState {
+pub struct TempDesiredRestore(pub(super) Arc<watch::Sender<ServiceState>>, StartStop);
+impl TempDesiredRestore {
     pub fn new(state: &Arc<watch::Sender<ServiceState>>) -> Self {
-        Self(state.clone())
+        Self(state.clone(), state.borrow().desired_state)
     }
     pub fn stop(&self) {
         self.0
             .send_modify(|s| s.temp_desired_state = Some(StartStop::Stop));
     }
-    pub fn start(&self) {
+    pub fn restore(&self) -> StartStop {
+        let restore_state = self.1;
         self.0
-            .send_modify(|s| s.temp_desired_state = Some(StartStop::Start));
+            .send_modify(|s| s.temp_desired_state = Some(restore_state));
+        restore_state
     }
 }
-impl Drop for TempDesiredState {
+impl Drop for TempDesiredRestore {
     fn drop(&mut self) {
         self.0.send_modify(|s| s.temp_desired_state = None);
     }
diff --git a/core/startos/src/service/transition/restart.rs b/core/startos/src/service/transition/restart.rs
index dbf066e6f..07466def1 100644
--- a/core/startos/src/service/transition/restart.rs
+++ b/core/startos/src/service/transition/restart.rs
@@ -1,6 +1,6 @@
 use futures::FutureExt;
 
-use super::TempDesiredState;
+use super::TempDesiredRestore;
 use crate::prelude::*;
 use crate::service::config::GetConfig;
 use crate::service::dependencies::DependencyConfig;
@@ -20,18 +20,39 @@ impl Handler<Restart> for ServiceActor {
     }
     async fn handle(&mut self, _: Restart, jobs: &BackgroundJobQueue) -> Self::Response {
         // So Need a handle to just a single field in the state
-        let temp = TempDesiredState::new(&self.0.persistent_container.state);
+        let temp = TempDesiredRestore::new(&self.0.persistent_container.state);
         let mut current = self.0.persistent_container.state.subscribe();
-        let transition = RemoteCancellable::new(async move {
-            temp.stop();
-            current.wait_for(|s| s.running_status.is_none()).await;
-            temp.start();
-            current.wait_for(|s| s.running_status.is_some()).await;
-            drop(temp);
-        });
+        let state = self.0.persistent_container.state.clone();
+        let transition = RemoteCancellable::new(
+            async move {
+                temp.stop();
+                current
+                    .wait_for(|s| s.running_status.is_none())
+                    .await
+                    .with_kind(ErrorKind::Unknown)?;
+                if temp.restore().is_start() {
+                    current
+                        .wait_for(|s| s.running_status.is_some())
+                        .await
+                        .with_kind(ErrorKind::Unknown)?;
+                }
+                drop(temp);
+                state.send_modify(|s| {
+                    s.transition_state.take();
+                });
+                Ok::<_, Error>(())
+            }
+            .map(|x| {
+                if let Err(err) = x {
+                    tracing::debug!("{:?}", err);
+                    tracing::warn!("{}", err);
+                }
+            }),
+        );
         let cancel_handle = transition.cancellation_handle();
-        jobs.add_job(transition.map(|_| ()));
-        let notified = self.0.synchronized.notified();
+        let transition = transition.shared();
+        let job_transition = transition.clone();
+        jobs.add_job(job_transition.map(|_| ()));
 
         let mut old = None;
         self.0.persistent_container.state.send_modify(|s| {
@@ -46,10 +67,13 @@ impl Handler<Restart> for ServiceActor {
         if let Some(t) = old {
             t.abort().await;
         }
-        notified.await
+        if transition.await.is_none() {
+            tracing::warn!("Service {} has been cancelled", &self.0.id);
+        }
     }
 }
 impl Service {
+    #[instrument(skip_all)]
     pub async fn restart(&self) -> Result<(), Error> {
         self.actor.send(Restart).await
     }
diff --git a/core/startos/src/service/transition/restore.rs b/core/startos/src/service/transition/restore.rs
new file mode 100644
index 000000000..b32ade4f5
--- /dev/null
+++ b/core/startos/src/service/transition/restore.rs
@@ -0,0 +1,74 @@
+use std::path::PathBuf;
+
+use futures::FutureExt;
+use models::ProcedureName;
+
+use crate::disk::mount::filesystem::ReadOnly;
+use crate::prelude::*;
+use crate::service::transition::{TransitionKind, TransitionState};
+use crate::service::ServiceActor;
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::{ConflictBuilder, Handler};
+use crate::util::future::RemoteCancellable;
+
+pub(in crate::service) struct Restore {
+    pub path: PathBuf,
+}
+impl Handler<Restore> for ServiceActor {
+    type Response = Result<(), Error>;
+    fn conflicts_with(_: &Restore) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything()
+    }
+    async fn handle(&mut self, restore: Restore, jobs: &BackgroundJobQueue) -> Self::Response {
+        // So Need a handle to just a single field in the state
+        let path = restore.path.clone();
+        let seed = self.0.clone();
+
+        let state = self.0.persistent_container.state.clone();
+        let transition = RemoteCancellable::new(
+            async move {
+                let backup_guard = seed
+                    .persistent_container
+                    .mount_backup(path, ReadOnly)
+                    .await?;
+                seed.persistent_container
+                    .execute(ProcedureName::RestoreBackup, Value::Null, None)
+                    .await?;
+                backup_guard.unmount(true).await?;
+
+                state.send_modify(|s| {
+                    s.transition_state.take();
+                });
+                Ok::<_, Error>(())
+            }
+            .map(|x| {
+                if let Err(err) = dbg!(x) {
+                    tracing::debug!("{:?}", err);
+                    tracing::warn!("{}", err);
+                }
+            }),
+        );
+        let cancel_handle = transition.cancellation_handle();
+        let transition = transition.shared();
+        let job_transition = transition.clone();
+        jobs.add_job(job_transition.map(|_| ()));
+
+        let mut old = None;
+        self.0.persistent_container.state.send_modify(|s| {
+            old = std::mem::replace(
+                &mut s.transition_state,
+                Some(TransitionState {
+                    kind: TransitionKind::Restoring,
+                    cancel_handle,
+                }),
+            )
+        });
+        if let Some(t) = old {
+            t.abort().await;
+        }
+        match transition.await {
+            None => Err(Error::new(eyre!("Restoring canceled"), ErrorKind::Unknown)),
+            Some(x) => Ok(x),
+        }
+    }
+}
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 09d10fb2d..520fe5089 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -25,6 +25,7 @@ pub struct Status {
 pub enum MainStatus {
     Stopped,
     Restarting,
+    Restoring,
     #[serde(rename_all = "camelCase")]
     Stopping {
         timeout: crate::util::serde::Duration,
@@ -54,6 +55,7 @@ impl MainStatus {
                 started: Some(_), ..
             } => true,
             MainStatus::Stopped
+            | MainStatus::Restoring
             | MainStatus::Stopping { .. }
             | MainStatus::Restarting
             | MainStatus::BackingUp { started: None, .. } => false,
@@ -75,6 +77,7 @@ impl MainStatus {
             MainStatus::Running { started, .. } => Some(*started),
             MainStatus::BackingUp { started, .. } => *started,
             MainStatus::Stopped => None,
+            MainStatus::Restoring => None,
             MainStatus::Restarting => None,
             MainStatus::Stopping { .. } => None,
             MainStatus::Starting { .. } => None,
@@ -84,9 +87,10 @@ impl MainStatus {
         let (started, health) = match self {
             MainStatus::Starting { .. } => (Some(Utc::now()), Default::default()),
             MainStatus::Running { started, health } => (Some(started.clone()), health.clone()),
-            MainStatus::Stopped | MainStatus::Stopping { .. } | MainStatus::Restarting => {
-                (None, Default::default())
-            }
+            MainStatus::Stopped
+            | MainStatus::Stopping { .. }
+            | MainStatus::Restoring
+            | MainStatus::Restarting => (None, Default::default()),
             MainStatus::BackingUp { .. } => return self.clone(),
         };
         MainStatus::BackingUp { started, health }
@@ -96,7 +100,10 @@ impl MainStatus {
         match self {
             MainStatus::Running { health, .. } => Some(health),
             MainStatus::BackingUp { health, .. } => Some(health),
-            MainStatus::Stopped | MainStatus::Stopping { .. } | MainStatus::Restarting => None,
+            MainStatus::Stopped
+            | MainStatus::Restoring
+            | MainStatus::Stopping { .. }
+            | MainStatus::Restarting => None,
             MainStatus::Starting { .. } => None,
         }
     }
diff --git a/sdk/lib/osBindings/ExportServiceInterfaceParams.ts b/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
index 152a800bb..847a6090a 100644
--- a/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
+++ b/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
@@ -1,9 +1,12 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AddressInfo } from "./AddressInfo"
+import type { ExportedHostnameInfo } from "./ExportedHostnameInfo"
+import type { HostKind } from "./HostKind"
+import type { ServiceInterfaceId } from "./ServiceInterfaceId"
 import type { ServiceInterfaceType } from "./ServiceInterfaceType"
 
 export type ExportServiceInterfaceParams = {
-  id: string
+  id: ServiceInterfaceId
   name: string
   description: string
   hasPrimary: boolean
@@ -11,4 +14,6 @@ export type ExportServiceInterfaceParams = {
   masked: boolean
   addressInfo: AddressInfo
   type: ServiceInterfaceType
+  hostKind: HostKind
+  hostnames: Array<ExportedHostnameInfo>
 }
diff --git a/sdk/lib/osBindings/MainStatus.ts b/sdk/lib/osBindings/MainStatus.ts
index 534cad76f..1b9d8482e 100644
--- a/sdk/lib/osBindings/MainStatus.ts
+++ b/sdk/lib/osBindings/MainStatus.ts
@@ -6,6 +6,7 @@ import type { HealthCheckResult } from "./HealthCheckResult"
 export type MainStatus =
   | { status: "stopped" }
   | { status: "restarting" }
+  | { status: "restoring" }
   | { status: "stopping"; timeout: Duration }
   | { status: "starting" }
   | {
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index fecb718d5..0e2dec58e 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -55,6 +55,17 @@ export class Overlay {
       ])
     } else if (options.type === "pointer") {
       await this.effects.mount({ location: path, target: options })
+    } else if (options.type === "backup") {
+      const subpath = options.subpath
+        ? options.subpath.startsWith("/")
+          ? options.subpath
+          : `/${options.subpath}`
+        : "/"
+      await execFile("mount", [
+        "--bind",
+        `/media/startos/backup${subpath}`,
+        path,
+      ])
     } else {
       throw new Error(`unknown type ${(options as any).type}`)
     }
@@ -188,6 +199,7 @@ export type MountOptions =
   | MountOptionsVolume
   | MountOptionsAssets
   | MountOptionsPointer
+  | MountOptionsBackup
 
 export type MountOptionsVolume = {
   type: "volume"
@@ -209,3 +221,8 @@ export type MountOptionsPointer = {
   subpath: string | null
   readonly: boolean
 }
+
+export type MountOptionsBackup = {
+  type: "backup"
+  subpath: string | null
+}

From 800b0763e4372931efe2446de228524d6ef34959 Mon Sep 17 00:00:00 2001
From: Dominion5254 <musashidisciple@proton.me>
Date: Fri, 10 May 2024 13:20:24 -0600
Subject: [PATCH 148/341] More svc effect handlers (#2610)

* complete get_primary_url fn

* complete clear_network_interfaces fn

* formatting

* complete remove_address fn

* get_system_smtp wip

* complete get_system_smtp and set_system_smtp

* add SetSystemSmtpParams struct

* add set_system_smtp subcommand

* Remove 'Copy' implementation from `HostAddress`

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* Refactor `get_host_primary` fn and clone  resulting `HostAddress`

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* misc fixes and debug info

* seed hosts with a tor address

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 Makefile                                      |   2 +-
 build/dpkg-deps/depends                       |   2 +
 build/lib/scripts/add-apt-sources             |   3 -
 build/lib/scripts/chroot-and-upgrade          |   2 +
 .../DockerProcedureContainer.ts               |   2 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |   2 +-
 .../SystemForEmbassy/polyfillEffects.ts       |   8 +-
 core/models/src/id/mod.rs                     |   7 +-
 core/startos/src/db/model/public.rs           |   2 +
 core/startos/src/db/prelude.rs                |   4 +-
 core/startos/src/init.rs                      |   6 +
 core/startos/src/net/host/address.rs          |   2 +-
 core/startos/src/net/host/mod.rs              |  79 +++++++++---
 core/startos/src/net/net_controller.rs        |  28 ++---
 core/startos/src/registry/os/asset/add.rs     |  10 +-
 core/startos/src/registry/os/version/mod.rs   |   2 +-
 .../s9pk/merkle_archive/directory_contents.rs |   4 +-
 core/startos/src/service/cli.rs               |   2 +-
 .../src/service/service_effect_handler.rs     | 113 ++++++++++++++++--
 debian/postinst                               |   4 -
 image-recipe/build.sh                         |   6 -
 sdk/lib/StartSdk.ts                           |  15 ++-
 sdk/lib/health/HealthCheck.ts                 |  17 ++-
 sdk/lib/mainFn/Daemons.ts                     |  10 +-
 sdk/lib/osBindings/GetPrimaryUrlParams.ts     |   2 +
 sdk/lib/osBindings/RemoveAddressParams.ts     |   3 +-
 sdk/lib/osBindings/ServerInfo.ts              |   1 +
 sdk/lib/osBindings/SetSystemSmtpParams.ts     |   3 +
 sdk/lib/osBindings/index.ts                   |   1 +
 sdk/lib/util/Overlay.ts                       |  13 +-
 .../ui/src/app/services/api/mock-patch.ts     |   1 +
 31 files changed, 259 insertions(+), 97 deletions(-)
 create mode 100644 sdk/lib/osBindings/SetSystemSmtpParams.ts

diff --git a/Makefile b/Makefile
index dbe10d677..1dffd3629 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 	npm --prefix container-runtime ci
 	touch container-runtime/node_modules
 
-sdk/lib/osBindings: core/startos/bindings
+sdk/lib/osBindings: $(shell core/startos/bindings)
 	mkdir -p sdk/lib/osBindings
 	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1";/g' > core/startos/bindings/index.ts
 	npm --prefix sdk exec -- prettier --config ./sdk/package.json -w ./core/startos/bindings/*.ts
diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index 38d9b1a58..7519cff1b 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -18,6 +18,7 @@ grub-common
 htop
 httpdirfs
 iotop
+iptables
 iw
 jq
 libyajl2
@@ -34,6 +35,7 @@ network-manager
 nvme-cli
 nyx
 openssh-server
+podman
 postgresql
 psmisc
 qemu-guest-agent
diff --git a/build/lib/scripts/add-apt-sources b/build/lib/scripts/add-apt-sources
index 638d8dad6..9d4f54a28 100755
--- a/build/lib/scripts/add-apt-sources
+++ b/build/lib/scripts/add-apt-sources
@@ -4,6 +4,3 @@ set -e
 
 curl -fsSL https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor -o- > /usr/share/keyrings/tor-archive-keyring.gpg
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org bullseye main" > /etc/apt/sources.list.d/tor.list
-
-curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o- > /usr/share/keyrings/docker-archive-keyring.gpg
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bullseye stable" > /etc/apt/sources.list.d/docker.list
diff --git a/build/lib/scripts/chroot-and-upgrade b/build/lib/scripts/chroot-and-upgrade
index ef3208806..7adaaaccb 100755
--- a/build/lib/scripts/chroot-and-upgrade
+++ b/build/lib/scripts/chroot-and-upgrade
@@ -33,6 +33,7 @@ set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
 if [ -z "$NO_SYNC" ]; then
     echo 'Syncing...'
     umount -R /media/startos/next 2> /dev/null
+    umount -R /media/startos/upper 2> /dev/null
     rm -rf /media/startos/upper /media/startos/next
     mkdir /media/startos/upper
     mount -t tmpfs tmpfs /media/startos/upper
@@ -105,4 +106,5 @@ if [ "$CHROOT_RES" -eq 0 ]; then
 fi
 
 umount -R /media/startos/next
+umount -R /media/startos/upper
 rm -rf /media/startos/upper /media/startos/next
\ No newline at end of file
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index b4a5f5829..c06395a17 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -17,7 +17,7 @@ export class DockerProcedureContainer {
     data: DockerProcedure,
     volumes: { [id: VolumeId]: Volume },
   ) {
-    const overlay = await Overlay.of(effects, data.image)
+    const overlay = await Overlay.of(effects, { id: data.image })
 
     if (data.mounts) {
       const mounts = data.mounts
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 7e18c69f1..23be7071f 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -53,7 +53,7 @@ export class MainLoop {
     }
     const daemon = await daemons.runDaemon()(
       this.effects,
-      this.system.manifest.main.image,
+      { id: this.system.manifest.main.image },
       currentCommand,
       {
         overlay: dockerProcedureContainer.overlay,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 66a303e7b..30e572d97 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -96,7 +96,7 @@ export class PolyfillEffects implements oet.Effects {
     return startSdk
       .runCommand(
         this.effects,
-        this.manifest.main.image,
+        { id: this.manifest.main.image },
         [command, ...(args || [])],
         {},
       )
@@ -118,7 +118,7 @@ export class PolyfillEffects implements oet.Effects {
     const daemon = dockerProcedureContainer.then((dockerProcedureContainer) =>
       daemons.runDaemon()(
         this.effects,
-        this.manifest.main.image,
+        { id: this.manifest.main.image },
         [input.command, ...(input.args || [])],
         {
           overlay: dockerProcedureContainer.overlay,
@@ -143,7 +143,7 @@ export class PolyfillEffects implements oet.Effects {
     await startSdk
       .runCommand(
         this.effects,
-        this.manifest.main.image,
+        { id: this.manifest.main.image },
         ["chown", "--recursive", input.uid, `/drive/${input.path}`],
         {
           mounts: [
@@ -178,7 +178,7 @@ export class PolyfillEffects implements oet.Effects {
     await startSdk
       .runCommand(
         this.effects,
-        this.manifest.main.image,
+        { id: this.manifest.main.image },
         ["chmod", "--recursive", input.mode, `/drive/${input.path}`],
         {
           mounts: [
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index 11644c71d..10882d4f1 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -28,8 +28,13 @@ lazy_static::lazy_static! {
     pub static ref SYSTEM_ID: Id = Id(InternedString::intern("x_system"));
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
 pub struct Id(InternedString);
+impl std::fmt::Debug for Id {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
 impl TryFrom<InternedString> for Id {
     type Error = InvalidId;
     fn try_from(value: InternedString) -> Result<Self, Self::Error> {
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index d79948c6f..fe85056f9 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -76,6 +76,7 @@ impl Public {
                 ntp_synced: false,
                 zram: true,
                 governor: None,
+                smtp: None,
             },
             package_data: AllPackageData::default(),
             ui: serde_json::from_str(include_str!(concat!(
@@ -135,6 +136,7 @@ pub struct ServerInfo {
     #[serde(default)]
     pub zram: bool,
     pub governor: Option<Governor>,
+    pub smtp: Option<String>
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
diff --git a/core/startos/src/db/prelude.rs b/core/startos/src/db/prelude.rs
index d40c3c17c..419b356ef 100644
--- a/core/startos/src/db/prelude.rs
+++ b/core/startos/src/db/prelude.rs
@@ -220,7 +220,7 @@ where
     }
     pub fn upsert<F>(&mut self, key: &T::Key, value: F) -> Result<&mut Model<T::Value>, Error>
     where
-        F: FnOnce() -> T::Value,
+        F: FnOnce() -> Result<T::Value, Error>,
     {
         use serde::ser::Error;
         match &mut self.value {
@@ -233,7 +233,7 @@ where
                     s.as_ref().index_or_insert(v)
                 });
                 if !exists {
-                    res.ser(&value())?;
+                    res.ser(&value()?)?;
                 }
                 Ok(res)
             }
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 361288c10..694d4e3a3 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -348,6 +348,12 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
     })
     .await?;
 
+    Command::new("systemctl")
+        .arg("start")
+        .arg("lxc-net.service")
+        .invoke(ErrorKind::Lxc)
+        .await?;
+
     crate::version::init(&db).await?;
 
     db.mutate(|d| {
diff --git a/core/startos/src/net/host/address.rs b/core/startos/src/net/host/address.rs
index cb3b485f6..d9e2f4206 100644
--- a/core/startos/src/net/host/address.rs
+++ b/core/startos/src/net/host/address.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
 use ts_rs::TS;
 
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, TS)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "kind")]
 #[ts(export)]
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
index 2d50df15a..2d8599ba9 100644
--- a/core/startos/src/net/host/mod.rs
+++ b/core/startos/src/net/host/mod.rs
@@ -1,10 +1,12 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use imbl_value::InternedString;
-use models::HostId;
+use models::{HostId, PackageId};
 use serde::{Deserialize, Serialize};
+use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use ts_rs::TS;
 
+use crate::db::model::DatabaseModel;
 use crate::net::forward::AvailablePorts;
 use crate::net::host::address::HostAddress;
 use crate::net::host::binding::{BindInfo, BindOptions};
@@ -64,25 +66,72 @@ impl Map for HostInfo {
     }
 }
 
-impl Model<HostInfo> {
+pub fn host_for<'a>(
+    db: &'a mut DatabaseModel,
+    package_id: &PackageId,
+    host_id: &HostId,
+    host_kind: HostKind,
+) -> Result<&'a mut Model<Host>, Error> {
+    fn host_info<'a>(
+        db: &'a mut DatabaseModel,
+        package_id: &PackageId,
+    ) -> Result<&'a mut Model<HostInfo>, Error> {
+        Ok::<_, Error>(
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(package_id)
+                .or_not_found(package_id)?
+                .as_hosts_mut(),
+        )
+    }
+    let tor_key = if host_info(db, package_id)?.as_idx(host_id).is_none() {
+        Some(
+            db.as_private_mut()
+                .as_key_store_mut()
+                .as_onion_mut()
+                .new_key()?,
+        )
+    } else {
+        None
+    };
+    host_info(db, package_id)?.upsert(host_id, || {
+        let mut h = Host::new(host_kind);
+        h.addresses.insert(HostAddress::Onion {
+            address: tor_key
+                .or_not_found("generated tor key")?
+                .public()
+                .get_onion_address(),
+        });
+        Ok(h)
+    })
+}
+
+impl Model<Host> {
+    pub fn set_kind(&mut self, kind: HostKind) -> Result<(), Error> {
+        match (self.as_kind().de()?, kind) {
+            (HostKind::Multi, HostKind::Multi) => Ok(()),
+        }
+    }
     pub fn add_binding(
         &mut self,
         available_ports: &mut AvailablePorts,
-        kind: HostKind,
-        id: &HostId,
         internal_port: u16,
         options: BindOptions,
     ) -> Result<(), Error> {
-        self.upsert(id, || Host::new(kind))?
-            .as_bindings_mut()
-            .mutate(|b| {
-                let info = if let Some(info) = b.remove(&internal_port) {
-                    info.update(available_ports, options)?
-                } else {
-                    BindInfo::new(available_ports, options)?
-                };
-                b.insert(internal_port, info);
-                Ok(())
-            }) // TODO: handle host kind change
+        self.as_bindings_mut().mutate(|b| {
+            let info = if let Some(info) = b.remove(&internal_port) {
+                info.update(available_ports, options)?
+            } else {
+                BindInfo::new(available_ports, options)?
+            };
+            b.insert(internal_port, info);
+            Ok(())
+        })
+    }
+}
+
+impl HostInfo {
+    pub fn get_host_primary(&self, host_id: &HostId) -> Option<HostAddress> {
+        self.0.get(&host_id).and_then(|h| h.primary.clone())
     }
 }
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index aae98ae96..205cc4e36 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -16,7 +16,7 @@ use crate::net::dns::DnsController;
 use crate::net::forward::LanPortForwardController;
 use crate::net::host::address::HostAddress;
 use crate::net::host::binding::{AddSslOptions, BindOptions};
-use crate::net::host::{Host, HostKind};
+use crate::net::host::{host_for, Host, HostKind};
 use crate::net::tor::TorController;
 use crate::net::vhost::{AlpnInfo, VHostController};
 use crate::prelude::*;
@@ -162,7 +162,7 @@ impl NetController {
     }
 }
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 struct HostBinds {
     lan: BTreeMap<u16, (u16, Option<AddSslOptions>, Arc<()>)>,
     tor: BTreeMap<OnionAddressV3, (OrdMap<u16, SocketAddr>, Vec<Arc<()>>)>,
@@ -193,25 +193,17 @@ impl NetService {
         internal_port: u16,
         options: BindOptions,
     ) -> Result<(), Error> {
-        let id_ref = &id;
+        dbg!("bind", &kind, &id, internal_port, &options);
         let pkg_id = &self.id;
         let host = self
             .net_controller()?
             .db
-            .mutate(|d| {
-                let mut ports = d.as_private().as_available_ports().de()?;
-                let hosts = d
-                    .as_public_mut()
-                    .as_package_data_mut()
-                    .as_idx_mut(pkg_id)
-                    .or_not_found(pkg_id)?
-                    .as_hosts_mut();
-                hosts.add_binding(&mut ports, kind, &id, internal_port, options)?;
-                let host = hosts
-                    .as_idx(&id)
-                    .or_not_found(lazy_format!("Host {id_ref} for {pkg_id}"))?
-                    .de()?;
-                d.as_private_mut().as_available_ports_mut().ser(&ports)?;
+            .mutate(|db| {
+                let mut ports = db.as_private().as_available_ports().de()?;
+                let host = host_for(db, pkg_id, &id, kind)?;
+                host.add_binding(&mut ports, internal_port, options)?;
+                let host = host.de()?;
+                db.as_private_mut().as_available_ports_mut().ser(&ports)?;
                 Ok(host)
             })
             .await?;
@@ -219,6 +211,8 @@ impl NetService {
     }
 
     async fn update(&mut self, id: HostId, host: Host) -> Result<(), Error> {
+        dbg!(&host);
+        dbg!(&self.binds);
         let ctrl = self.net_controller()?;
         let binds = {
             if !self.binds.contains_key(&id) {
diff --git a/core/startos/src/registry/os/asset/add.rs b/core/startos/src/registry/os/asset/add.rs
index 6e259e314..d2c20e711 100644
--- a/core/startos/src/registry/os/asset/add.rs
+++ b/core/startos/src/registry/os/asset/add.rs
@@ -9,7 +9,7 @@ use futures::{FutureExt, TryStreamExt};
 use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use itertools::Itertools;
-use rpc_toolkit::{from_fn_async, CallRemote, Context, HandlerArgs, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha512};
 use ts_rs::TS;
@@ -106,9 +106,11 @@ async fn add_asset(
                         .as_idx_mut(&version)
                         .or_not_found(&version)?,
                 )
-                .upsert(&platform, || RegistryAsset {
-                    url,
-                    signature_info: SignatureInfo::new(SIG_CONTEXT),
+                .upsert(&platform, || {
+                    Ok(RegistryAsset {
+                        url,
+                        signature_info: SignatureInfo::new(SIG_CONTEXT),
+                    })
                 })?
                 .as_signature_info_mut()
                 .mutate(|s| s.add_sig(&signature))?;
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index 414994875..5af407c5c 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -81,7 +81,7 @@ pub async fn add_version(
             db.as_index_mut()
                 .as_os_mut()
                 .as_versions_mut()
-                .upsert(&version, || OsVersionInfo::default())?
+                .upsert(&version, || Ok(OsVersionInfo::default()))?
                 .mutate(|i| {
                     i.headline = headline;
                     i.release_notes = release_notes;
diff --git a/core/startos/src/s9pk/merkle_archive/directory_contents.rs b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
index 19821cf32..ebc46a60b 100644
--- a/core/startos/src/s9pk/merkle_archive/directory_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
@@ -275,9 +275,7 @@ impl<S: FileSource> DirectoryContents<S> {
             _ => std::cmp::Ordering::Equal,
         }) {
             varint::serialize_varstring(&**name, w).await?;
-            if let Some(pos) = entry.serialize_header(queue.add(entry).await?, w).await? {
-                eprintln!("DEBUG ====> {name} @ {pos}");
-            }
+            entry.serialize_header(queue.add(entry).await?, w).await?;
         }
 
         Ok(())
diff --git a/core/startos/src/service/cli.rs b/core/startos/src/service/cli.rs
index 82c63d6a7..87491932b 100644
--- a/core/startos/src/service/cli.rs
+++ b/core/startos/src/service/cli.rs
@@ -29,7 +29,7 @@ impl ContainerCliContext {
         Self(Arc::new(ContainerCliSeed {
             socket: cfg
                 .socket
-                .unwrap_or_else(|| Path::new("/").join(HOST_RPC_SERVER_SOCKET)),
+                .unwrap_or_else(|| Path::new("/media/startos/rpc").join(HOST_RPC_SERVER_SOCKET)),
             runtime: OnceCell::new(),
         }))
     }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index c5023476a..0bd31dc9b 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -13,7 +13,7 @@ use imbl::OrdMap;
 use imbl_value::{json, InternedString};
 use itertools::Itertools;
 use models::{
-    ActionId, DataUrl, HealthCheckId, HostId, Id, ImageId, PackageId, ServiceInterfaceId, VolumeId,
+    ActionId, DataUrl, HealthCheckId, HostId, ImageId, PackageId, ServiceInterfaceId, VolumeId,
 };
 use patch_db::json_ptr::JsonPointer;
 use rpc_toolkit::{from_fn, from_fn_async, Context, Empty, HandlerExt, ParentHandler};
@@ -29,6 +29,7 @@ use crate::db::model::package::{
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
+use crate::net::host::address::HostAddress;
 use crate::net::host::binding::BindOptions;
 use crate::net::host::{self, HostKind};
 use crate::net::service_interface::{
@@ -169,6 +170,7 @@ pub fn service_effect_handler<C: Context>() -> ParentHandler<C> {
                 .no_display()
                 .with_call_remote::<ContainerCliContext>(),
         )
+        .subcommand("setSystemSmtp", from_fn_async(set_system_smtp).no_cli())
         .subcommand("getSystemSmtp", from_fn_async(get_system_smtp).no_cli())
         .subcommand("getContainerIp", from_fn_async(get_container_ip).no_cli())
         .subcommand(
@@ -206,6 +208,12 @@ struct GetSystemSmtpParams {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
+struct SetSystemSmtpParams {
+    smtp: String,
+}
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
 struct GetServicePortForwardParams {
     #[ts(type = "string | null")]
     package_id: Option<PackageId>,
@@ -236,6 +244,7 @@ struct GetPrimaryUrlParams {
     package_id: Option<PackageId>,
     service_interface_id: String,
     callback: Callback,
+    host_id: HostId,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
@@ -249,7 +258,7 @@ struct ListServiceInterfacesParams {
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 struct RemoveAddressParams {
-    id: String,
+    id: ServiceInterfaceId,
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
@@ -316,11 +325,39 @@ struct MountParams {
     location: String,
     target: MountTarget,
 }
+async fn set_system_smtp(context: EffectContext, data: SetSystemSmtpParams) -> Result<(), Error> {
+    let context = context.deref()?;
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            let model = db.as_public_mut().as_server_info_mut().as_smtp_mut();
+            model.ser(&mut Some(data.smtp))
+        })
+        .await
+}
 async fn get_system_smtp(
     context: EffectContext,
     data: GetSystemSmtpParams,
-) -> Result<Value, Error> {
-    todo!()
+) -> Result<String, Error> {
+    let context = context.deref()?;
+    let res = context
+        .ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_server_info()
+        .into_smtp()
+        .de()?;
+
+    match res {
+        Some(smtp) => Ok(smtp),
+        None => Err(Error::new(
+            eyre!("SMTP not found"),
+            crate::ErrorKind::NotFound,
+        )),
+    }
 }
 async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Ipv4Addr, Error> {
     let context = context.deref()?;
@@ -337,8 +374,24 @@ async fn get_service_port_forward(
     let net_service = context.persistent_container.net_service.lock().await;
     net_service.get_ext_port(data.host_id, internal_port)
 }
-async fn clear_network_interfaces(context: EffectContext, _: Empty) -> Result<Value, Error> {
-    todo!()
+async fn clear_network_interfaces(context: EffectContext, _: Empty) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            let model = db
+                .as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_service_interfaces_mut();
+            let mut new_map = BTreeMap::new();
+            model.ser(&mut new_map)
+        })
+        .await
 }
 async fn export_service_interface(
     context: EffectContext,
@@ -397,8 +450,27 @@ async fn export_service_interface(
 async fn get_primary_url(
     context: EffectContext,
     data: GetPrimaryUrlParams,
-) -> Result<Value, Error> {
-    todo!()
+) -> Result<HostAddress, Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
+
+    let db_model = context.ctx.db.peek().await;
+
+    let pkg_data_model = db_model
+        .as_public()
+        .as_package_data()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?;
+
+    let host = pkg_data_model.de()?.hosts.get_host_primary(&data.host_id);
+
+    match host {
+        Some(host_address) => Ok(host_address),
+        None => Err(Error::new(
+            eyre!("Primary Url not found for {}", data.host_id),
+            crate::ErrorKind::NotFound,
+        )),
+    }
 }
 async fn list_service_interfaces(
     context: EffectContext,
@@ -419,9 +491,24 @@ async fn list_service_interfaces(
         .into_service_interfaces()
         .de()
 }
+async fn remove_address(context: EffectContext, data: RemoveAddressParams) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.id.clone();
 
-async fn remove_address(context: EffectContext, data: RemoveAddressParams) -> Result<Value, Error> {
-    todo!()
+    context
+        .ctx
+        .db
+        .mutate(|db| {
+            let model = db
+                .as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_service_interfaces_mut();
+            model.remove(&data.id)
+        })
+        .await?;
+    Ok(())
 }
 async fn export_action(context: EffectContext, data: ExportActionParams) -> Result<(), Error> {
     let context = context.deref()?;
@@ -607,7 +694,7 @@ fn chroot<C: Context>(
             cmd.env(k, v);
         }
     }
-    nix::unistd::setsid().with_kind(ErrorKind::Lxc)?; // TODO: error code
+    nix::unistd::setsid().ok(); // https://stackoverflow.com/questions/25701333/os-setsid-operation-not-permitted
     std::os::unix::fs::chroot(path)?;
     if let Some(uid) = user.as_deref().and_then(|u| u.parse::<u32>().ok()) {
         cmd.uid(uid);
@@ -735,7 +822,7 @@ async fn set_store(
             let model = db
                 .as_private_mut()
                 .as_package_stores_mut()
-                .upsert(&package_id, || json!({}))?;
+                .upsert(&package_id, || Ok(json!({})))?;
             let mut model_value = model.de()?;
             if model_value.is_null() {
                 model_value = json!({});
@@ -1053,7 +1140,7 @@ pub async fn create_overlayed_image(
         .s9pk
         .as_archive()
         .contents()
-        .get_path(dbg!(&path))
+        .get_path(&path)
         .and_then(|e| e.as_file())
     {
         let guid = new_guid();
diff --git a/debian/postinst b/debian/postinst
index 4e8350376..238bd9457 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -81,10 +81,6 @@ sed -i '/^\s*#\?\s*issue_discards\s*=\s*/c\issue_discards = 1' /etc/lvm/lvm.conf
 
 mkdir -p /etc/nginx/ssl
 
-# fix to suppress docker warning, fixed in 21.xx release of docker cli: https://github.com/docker/cli/pull/2934
-mkdir -p /root/.docker
-touch /root/.docker/config.json
-
 cat << EOF > /etc/tor/torrc
 SocksPort 0.0.0.0:9050
 SocksPolicy accept 127.0.0.1
diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 9f62000ce..5ec500ce3 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -166,12 +166,6 @@ fi
 curl -fsSL https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc > config/archives/tor.key
 echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/tor.key.gpg] https://deb.torproject.org/torproject.org ${IB_SUITE} main" > config/archives/tor.list
 
-curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o config/archives/docker.key
-echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gpg] https://download.docker.com/linux/debian ${IB_SUITE} stable" > config/archives/docker.list
-
-curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/ /" > config/archives/podman.list
-
 # Dependencies
 
 ## Base dependencies
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 4d7514d88..f2eabe6be 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -28,7 +28,7 @@ import { DependencyConfig, Update } from "./dependencies/DependencyConfig"
 import { BackupSet, Backups } from "./backup/Backups"
 import { smtpConfig } from "./config/configConstants"
 import { Daemons } from "./mainFn/Daemons"
-import { healthCheck } from "./health/HealthCheck"
+import { healthCheck, HealthCheckParams } from "./health/HealthCheck"
 import { checkPortListening } from "./health/checkFns/checkPortListening"
 import { checkWebUrl, runHealthScript } from "./health/checkFns"
 import { List } from "./config/builder/list"
@@ -78,6 +78,7 @@ import { Checker, EmVer } from "./emverLite/mod"
 import { ExposedStorePaths } from "./store/setupExposeStore"
 import { PathBuilder, extractJsonPath, pathBuilder } from "./store/PathBuilder"
 import { checkAllDependencies } from "./dependencies/dependencies"
+import { health } from "."
 
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
@@ -186,13 +187,13 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       nullIfEmpty,
       runCommand: async <A extends string>(
         effects: Effects,
-        imageId: Manifest["images"][number],
+        image: { id: Manifest["images"][number]; sharedRun?: boolean },
         command: ValidIfNoStupidEscape<A> | [string, ...string[]],
         options: CommandOptions & {
           mounts?: { path: string; options: MountOptions }[]
         },
       ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
-        return runCommand<Manifest>(effects, imageId, command, options)
+        return runCommand<Manifest>(effects, image, command, options)
       },
 
       createAction: <
@@ -264,7 +265,9 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         )
       },
       HealthCheck: {
-        of: healthCheck,
+        of(o: HealthCheckParams<Manifest>) {
+          return healthCheck<Manifest>(o)
+        },
       },
       Dependency: {
         of(data: Dependency["data"]) {
@@ -740,14 +743,14 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
 
 export async function runCommand<Manifest extends SDKManifest>(
   effects: Effects,
-  imageId: Manifest["images"][number],
+  image: { id: Manifest["images"][number]; sharedRun?: boolean },
   command: string | [string, ...string[]],
   options: CommandOptions & {
     mounts?: { path: string; options: MountOptions }[]
   },
 ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
   const commands = splitCommand(command)
-  const overlay = await Overlay.of(effects, imageId)
+  const overlay = await Overlay.of(effects, image)
   try {
     for (let mount of options.mounts || []) {
       await overlay.mount(mount.options, mount.path)
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index d7bbc2f44..ca0e3ebb9 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -1,5 +1,5 @@
 import { InterfaceReceipt } from "../interfaces/interfaceReceipt"
-import { Daemon, Effects } from "../types"
+import { Daemon, Effects, SDKManifest } from "../types"
 import { CheckResult } from "./checkFns/CheckResult"
 import { HealthReceipt } from "./HealthReceipt"
 import { Trigger } from "../trigger"
@@ -9,16 +9,23 @@ import { once } from "../util/once"
 import { Overlay } from "../util/Overlay"
 import { object, unknown } from "ts-matches"
 
-export function healthCheck(o: {
+export type HealthCheckParams<Manifest extends SDKManifest> = {
   effects: Effects
   name: string
-  imageId: string
+  image: {
+    id: Manifest["images"][number]
+    sharedRun?: boolean
+  }
   trigger?: Trigger
   fn(overlay: Overlay): Promise<CheckResult> | CheckResult
   onFirstSuccess?: () => unknown | Promise<unknown>
-}) {
+}
+
+export function healthCheck<Manifest extends SDKManifest>(
+  o: HealthCheckParams<Manifest>,
+) {
   new Promise(async () => {
-    const overlay = await Overlay.of(o.effects, o.imageId)
+    const overlay = await Overlay.of(o.effects, o.image)
     try {
       let currentValue: TriggerInput = {
         hadSuccess: false,
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 01fd7f2c7..efa1a2484 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -23,7 +23,7 @@ type Daemon<
 > = {
   id: "" extends Id ? never : Id
   command: ValidIfNoStupidEscape<Command> | [string, ...string[]]
-  imageId: Manifest["images"][number]
+  image: { id: Manifest["images"][number]; sharedRun?: boolean }
   mounts: Mounts<Manifest>
   env?: Record<string, string>
   ready: {
@@ -40,7 +40,7 @@ export const runDaemon =
   <Manifest extends SDKManifest>() =>
   async <A extends string>(
     effects: Effects,
-    imageId: Manifest["images"][number],
+    image: { id: Manifest["images"][number]; sharedRun?: boolean },
     command: ValidIfNoStupidEscape<A> | [string, ...string[]],
     options: CommandOptions & {
       mounts?: { path: string; options: MountOptions }[]
@@ -48,7 +48,7 @@ export const runDaemon =
     },
   ): Promise<DaemonReturned> => {
     const commands = splitCommand(command)
-    const overlay = options.overlay || (await Overlay.of(effects, imageId))
+    const overlay = options.overlay || (await Overlay.of(effects, image))
     for (let mount of options.mounts || []) {
       await overlay.mount(mount.options, mount.path)
     }
@@ -183,9 +183,9 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
         daemon.requires?.map((id) => daemonsStarted[id]) ?? [],
       )
       daemonsStarted[daemon.id] = requiredPromise.then(async () => {
-        const { command, imageId } = daemon
+        const { command, image } = daemon
 
-        const child = runDaemon<Manifest>()(effects, imageId, command, {
+        const child = runDaemon<Manifest>()(effects, image, command, {
           env: daemon.env,
           mounts: daemon.mounts.build(),
         })
diff --git a/sdk/lib/osBindings/GetPrimaryUrlParams.ts b/sdk/lib/osBindings/GetPrimaryUrlParams.ts
index d9394f4ce..1a68ecc7b 100644
--- a/sdk/lib/osBindings/GetPrimaryUrlParams.ts
+++ b/sdk/lib/osBindings/GetPrimaryUrlParams.ts
@@ -1,8 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback"
+import type { HostId } from "./HostId"
 
 export type GetPrimaryUrlParams = {
   packageId: string | null
   serviceInterfaceId: string
   callback: Callback
+  hostId: HostId
 }
diff --git a/sdk/lib/osBindings/RemoveAddressParams.ts b/sdk/lib/osBindings/RemoveAddressParams.ts
index bdc781837..14099ebbc 100644
--- a/sdk/lib/osBindings/RemoveAddressParams.ts
+++ b/sdk/lib/osBindings/RemoveAddressParams.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ServiceInterfaceId } from "./ServiceInterfaceId"
 
-export type RemoveAddressParams = { id: string }
+export type RemoveAddressParams = { id: ServiceInterfaceId }
diff --git a/sdk/lib/osBindings/ServerInfo.ts b/sdk/lib/osBindings/ServerInfo.ts
index 284eba336..935e3a99f 100644
--- a/sdk/lib/osBindings/ServerInfo.ts
+++ b/sdk/lib/osBindings/ServerInfo.ts
@@ -28,4 +28,5 @@ export type ServerInfo = {
   ntpSynced: boolean
   zram: boolean
   governor: Governor | null
+  smtp: string | null
 }
diff --git a/sdk/lib/osBindings/SetSystemSmtpParams.ts b/sdk/lib/osBindings/SetSystemSmtpParams.ts
new file mode 100644
index 000000000..49c66e86c
--- /dev/null
+++ b/sdk/lib/osBindings/SetSystemSmtpParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetSystemSmtpParams = { smtp: string }
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index d14a9fb87..4fcb9a617 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -113,6 +113,7 @@ export { SetDependenciesParams } from "./SetDependenciesParams"
 export { SetHealth } from "./SetHealth"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetStoreParams } from "./SetStoreParams"
+export { SetSystemSmtpParams } from "./SetSystemSmtpParams"
 export { SignAssetParams } from "./SignAssetParams"
 export { SignatureInfo } from "./SignatureInfo"
 export { Signature } from "./Signature"
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 0e2dec58e..794b78732 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -12,10 +12,19 @@ export class Overlay {
     readonly rootfs: string,
     readonly guid: string,
   ) {}
-  static async of(effects: T.Effects, imageId: string) {
+  static async of(
+    effects: T.Effects,
+    image: { id: string; sharedRun?: boolean },
+  ) {
+    const { id: imageId, sharedRun } = image
     const [rootfs, guid] = await effects.createOverlayedImage({ imageId })
 
-    for (const dirPart of ["dev", "sys", "proc", "run"] as const) {
+    const shared = ["dev", "sys", "proc"]
+    if (!!sharedRun) {
+      shared.push("run")
+    }
+
+    for (const dirPart of shared) {
       await fs.mkdir(`${rootfs}/${dirPart}`, { recursive: true })
       await execFile("mount", [
         "--rbind",
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 9f17c22eb..a4ed61278 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -74,6 +74,7 @@ export const mockPatchData: DataModel = {
     platform: 'x86_64-nonfree',
     zram: true,
     governor: 'performance',
+    smtp: 'todo',
     wifi: {
       interface: 'wlan0',
       ssids: [],

From 0b8a142de0c3dc8d791bcc6420e2fde407ed81dd Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 13 May 2024 10:50:25 -0600
Subject: [PATCH 149/341] fix: Making the daemons keep up the status. (#2617)

* complete get_primary_url fn

* complete clear_network_interfaces fn

* formatting

* complete remove_address fn

* get_system_smtp wip

* complete get_system_smtp and set_system_smtp

* add SetSystemSmtpParams struct

* add set_system_smtp subcommand

* Remove 'Copy' implementation from `HostAddress`

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* Refactor `get_host_primary` fn and clone  resulting `HostAddress`

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* misc fixes and debug info

* seed hosts with a tor address

* fix: Making the daemons keep up the status.

* wipFix: Making a service start

* fix: Both the start + stop of the service.

* fix: Weird edge case of failure and kids

---------

Co-authored-by: Shadowy Super Coder <musashidisciple@proton.me>
Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 .../Systems/SystemForEmbassy/MainLoop.ts      |  16 +-
 .../Systems/SystemForEmbassy/index.ts         |   4 +-
 .../SystemForEmbassy/polyfillEffects.ts       |   2 +-
 container-runtime/src/Models/Duration.ts      |   2 +-
 container-runtime/src/Models/Effects.ts       |   4 +-
 .../src/service/service_effect_handler.rs     |  37 ++-
 sdk/lib/mainFn/CommandController.ts           | 108 +++++++++
 sdk/lib/mainFn/Daemon.ts                      |  79 +++++++
 sdk/lib/mainFn/Daemons.ts                     | 215 ++++++------------
 sdk/lib/mainFn/HealthDaemon.ts                | 152 +++++++++++++
 sdk/lib/osBindings/SetMainStatus.ts           |   2 +-
 sdk/lib/test/startosTypeValidation.test.ts    |   7 +-
 sdk/lib/types.ts                              |   5 +-
 sdk/package.json                              |   2 +-
 14 files changed, 467 insertions(+), 168 deletions(-)
 create mode 100644 sdk/lib/mainFn/CommandController.ts
 create mode 100644 sdk/lib/mainFn/Daemon.ts
 create mode 100644 sdk/lib/mainFn/HealthDaemon.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 23be7071f..917bfff83 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -3,6 +3,7 @@ import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { SystemForEmbassy } from "."
 import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { Daemons, T, daemons } from "@start9labs/start-sdk"
+import { Daemon } from "@start9labs/start-sdk/cjs/lib/mainFn/Daemon"
 
 const EMBASSY_HEALTH_INTERVAL = 15 * 1000
 const EMBASSY_PROPERTIES_LOOP = 30 * 1000
@@ -21,8 +22,7 @@ export class MainLoop {
 
   private mainEvent:
     | Promise<{
-        daemon: T.DaemonReturned
-        wait: Promise<unknown>
+        daemon: Daemon
       }>
     | undefined
   constructor(
@@ -51,7 +51,7 @@ export class MainLoop {
     if (jsMain) {
       throw new Error("Unreachable")
     }
-    const daemon = await daemons.runDaemon()(
+    const daemon = await Daemon.of()(
       this.effects,
       { id: this.system.manifest.main.image },
       currentCommand,
@@ -59,14 +59,9 @@ export class MainLoop {
         overlay: dockerProcedureContainer.overlay,
       },
     )
+    daemon.start()
     return {
       daemon,
-      wait: daemon.wait().finally(() => {
-        this.clean()
-        effects
-          .setMainStatus({ status: "stopped" })
-          .catch((e) => console.error("Could not set the status to stopped"))
-      }),
     }
   }
 
@@ -121,7 +116,8 @@ export class MainLoop {
     const main = await mainEvent
     delete this.mainEvent
     delete this.healthLoops
-    if (mainEvent) await main?.daemon.term()
+    await main?.daemon.stop().catch((e) => console.error(e))
+    this.effects.setMainStatus({ status: "stopped" })
     if (healthLoops) healthLoops.forEach((x) => clearInterval(x.interval))
   }
 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 8988c5446..ada893b2b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -385,13 +385,15 @@ export class SystemForEmbassy implements System {
     timeoutMs: number | null,
   ): Promise<Duration> {
     const { currentRunning } = this
+    this.currentRunning?.clean()
     delete this.currentRunning
     if (currentRunning) {
       await currentRunning.clean({
         timeout: this.manifest.main["sigterm-timeout"],
       })
     }
-    return duration(this.manifest.main["sigterm-timeout"], "s")
+    const durationValue = duration(this.manifest.main["sigterm-timeout"], "s")
+    return durationValue
   }
   private async createBackup(
     effects: HostSystemStartOs,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 30e572d97..12c0a58d5 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -116,7 +116,7 @@ export class PolyfillEffects implements oet.Effects {
       this.manifest.volumes,
     )
     const daemon = dockerProcedureContainer.then((dockerProcedureContainer) =>
-      daemons.runDaemon()(
+      daemons.runCommand()(
         this.effects,
         { id: this.manifest.main.image },
         [input.command, ...(input.args || [])],
diff --git a/container-runtime/src/Models/Duration.ts b/container-runtime/src/Models/Duration.ts
index 8c701a703..75154c782 100644
--- a/container-runtime/src/Models/Duration.ts
+++ b/container-runtime/src/Models/Duration.ts
@@ -2,5 +2,5 @@ export type TimeUnit = "d" | "h" | "s" | "ms"
 export type Duration = `${number}${TimeUnit}`
 
 export function duration(timeValue: number, timeUnit: TimeUnit = "s") {
-  return `${timeValue}${timeUnit}` as Duration
+  return `${timeValue > 0 ? timeValue : 0}${timeUnit}` as Duration
 }
diff --git a/container-runtime/src/Models/Effects.ts b/container-runtime/src/Models/Effects.ts
index 757d51238..bacf8894a 100644
--- a/container-runtime/src/Models/Effects.ts
+++ b/container-runtime/src/Models/Effects.ts
@@ -1,5 +1,3 @@
 import { types as T } from "@start9labs/start-sdk"
 
-export type Effects = T.Effects & {
-  setMainStatus(o: { status: "running" | "stopped" }): Promise<void>
-}
+export type Effects = T.Effects
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 0bd31dc9b..44d17da30 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -581,10 +581,28 @@ struct GetHostInfoParams {
     callback: Callback,
 }
 async fn get_host_info(
-    _: EffectContext,
+    ctx: EffectContext,
     GetHostInfoParams { .. }: GetHostInfoParams,
 ) -> Result<Value, Error> {
-    todo!()
+    let ctx = ctx.deref()?;
+    Ok(json!({
+        "id": "fakeId1",
+        "kind": "multi",
+        "hostnames": [{
+            "kind": "ip",
+            "networkInterfaceId": "fakeNetworkInterfaceId1",
+            "public": true,
+            "hostname":{
+                  "kind": "domain",
+                  "domain": format!("{}", ctx.id),
+                  "subdomain": (),
+                  "port": (),
+                  "sslPort": ()
+                }
+          }
+
+        ]
+    }))
 }
 
 async fn clear_bindings(context: EffectContext, _: Empty) -> Result<Value, Error> {
@@ -1011,21 +1029,23 @@ async fn set_configured(context: EffectContext, params: SetConfigured) -> Result
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
-enum Status {
+enum SetMainStatusStatus {
     Running,
     Stopped,
+    Starting,
 }
-impl FromStr for Status {
+impl FromStr for SetMainStatusStatus {
     type Err = color_eyre::eyre::Report;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "running" => Ok(Self::Running),
             "stopped" => Ok(Self::Stopped),
+            "starting" => Ok(Self::Starting),
             _ => Err(eyre!("unknown status {s}")),
         }
     }
 }
-impl ValueParserFactory for Status {
+impl ValueParserFactory for SetMainStatusStatus {
     type Parser = FromStrParser<Self>;
     fn value_parser() -> Self::Parser {
         FromStrParser::new()
@@ -1037,14 +1057,15 @@ impl ValueParserFactory for Status {
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 struct SetMainStatus {
-    status: Status,
+    status: SetMainStatusStatus,
 }
 async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Result<Value, Error> {
     dbg!(format!("Status for main will be is {params:?}"));
     let context = context.deref()?;
     match params.status {
-        Status::Running => context.started(),
-        Status::Stopped => context.stopped(),
+        SetMainStatusStatus::Running => context.started(),
+        SetMainStatusStatus::Stopped => context.stopped(),
+        SetMainStatusStatus::Starting => context.stopped(),
     }
     Ok(Value::Null)
 }
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/lib/mainFn/CommandController.ts
new file mode 100644
index 000000000..e2e11dbfc
--- /dev/null
+++ b/sdk/lib/mainFn/CommandController.ts
@@ -0,0 +1,108 @@
+import { NO_TIMEOUT, SIGTERM } from "../StartSdk"
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Effects, ValidIfNoStupidEscape } from "../types"
+import { MountOptions, Overlay } from "../util/Overlay"
+import { splitCommand } from "../util/splitCommand"
+import { cpExecFile } from "./Daemons"
+
+export class CommandController {
+  private constructor(
+    readonly runningAnswer: Promise<unknown>,
+    readonly overlay: Overlay,
+    readonly pid: number | undefined,
+  ) {}
+  static of<Manifest extends SDKManifest>() {
+    return async <A extends string>(
+      effects: Effects,
+      imageId: {
+        id: Manifest["images"][number]
+        sharedRun?: boolean
+      },
+      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+      options: {
+        mounts?: { path: string; options: MountOptions }[]
+        overlay?: Overlay
+        env?:
+          | {
+              [variable: string]: string
+            }
+          | undefined
+        cwd?: string | undefined
+        user?: string | undefined
+        onStdout?: (x: Buffer) => void
+        onStderr?: (x: Buffer) => void
+      },
+    ) => {
+      const commands = splitCommand(command)
+      const overlay = options.overlay || (await Overlay.of(effects, imageId))
+      for (let mount of options.mounts || []) {
+        await overlay.mount(mount.options, mount.path)
+      }
+      const childProcess = await overlay.spawn(commands, {
+        env: options.env,
+      })
+      const answer = new Promise<null>((resolve, reject) => {
+        childProcess.stdout.on(
+          "data",
+          options.onStdout ??
+            ((data: any) => {
+              console.log(data.toString())
+            }),
+        )
+        childProcess.stderr.on(
+          "data",
+          options.onStderr ??
+            ((data: any) => {
+              console.error(data.toString())
+            }),
+        )
+
+        childProcess.on("exit", (code: any) => {
+          if (code === 0) {
+            return resolve(null)
+          }
+          return reject(new Error(`${commands[0]} exited with code ${code}`))
+        })
+      })
+
+      const pid = childProcess.pid
+
+      return new CommandController(answer, overlay, pid)
+    }
+  }
+  async wait() {
+    try {
+      return await this.runningAnswer
+    } finally {
+      await cpExecFile("pkill", ["-9", "-s", String(this.pid)]).catch((_) => {})
+      await this.overlay.destroy().catch((_) => {})
+    }
+  }
+  async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
+    try {
+      await cpExecFile("pkill", [
+        `-${signal.replace("SIG", "")}`,
+        "-s",
+        String(this.pid),
+      ])
+
+      if (timeout > NO_TIMEOUT) {
+        const didTimeout = await Promise.race([
+          new Promise((resolve) => setTimeout(resolve, timeout)).then(
+            () => true,
+          ),
+          this.runningAnswer.then(() => false),
+        ])
+        if (didTimeout) {
+          await cpExecFile("pkill", [`-9`, "-s", String(this.pid)]).catch(
+            (_: any) => {},
+          )
+        }
+      } else {
+        await this.runningAnswer
+      }
+    } finally {
+      await this.overlay.destroy()
+    }
+  }
+}
diff --git a/sdk/lib/mainFn/Daemon.ts b/sdk/lib/mainFn/Daemon.ts
new file mode 100644
index 000000000..2ec438801
--- /dev/null
+++ b/sdk/lib/mainFn/Daemon.ts
@@ -0,0 +1,79 @@
+import { SDKManifest } from "../manifest/ManifestTypes"
+import { Effects, ValidIfNoStupidEscape } from "../types"
+import { MountOptions, Overlay } from "../util/Overlay"
+import { CommandController } from "./CommandController"
+
+const TIMEOUT_INCREMENT_MS = 1000
+const MAX_TIMEOUT_MS = 30000
+/**
+ * This is a wrapper around CommandController that has a state of off, where the command shouldn't be running
+ * and the others state of running, where it will keep a living running command
+ */
+
+export class Daemon {
+  private commandController: CommandController | null = null
+  private shouldBeRunning = false
+  private constructor(private startCommand: () => Promise<CommandController>) {}
+  static of<Manifest extends SDKManifest>() {
+    return async <A extends string>(
+      effects: Effects,
+      imageId: {
+        id: Manifest["images"][number]
+        sharedRun?: boolean
+      },
+      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+      options: {
+        mounts?: { path: string; options: MountOptions }[]
+        overlay?: Overlay
+        env?:
+          | {
+              [variable: string]: string
+            }
+          | undefined
+        cwd?: string | undefined
+        user?: string | undefined
+        onStdout?: (x: Buffer) => void
+        onStderr?: (x: Buffer) => void
+      },
+    ) => {
+      const startCommand = () =>
+        CommandController.of<Manifest>()(effects, imageId, command, options)
+      return new Daemon(startCommand)
+    }
+  }
+
+  async start() {
+    if (this.commandController) {
+      return
+    }
+    this.shouldBeRunning = true
+    let timeoutCounter = 0
+    new Promise(async () => {
+      while (this.shouldBeRunning) {
+        this.commandController = await this.startCommand()
+        await this.commandController.wait().catch((err) => console.error(err))
+        await new Promise((resolve) => setTimeout(resolve, timeoutCounter))
+        timeoutCounter += TIMEOUT_INCREMENT_MS
+        timeoutCounter = Math.max(MAX_TIMEOUT_MS, timeoutCounter)
+      }
+    }).catch((err) => {
+      console.error(err)
+    })
+  }
+  async term(termOptions?: {
+    signal?: NodeJS.Signals | undefined
+    timeout?: number | undefined
+  }) {
+    return this.stop(termOptions)
+  }
+  async stop(termOptions?: {
+    signal?: NodeJS.Signals | undefined
+    timeout?: number | undefined
+  }) {
+    this.shouldBeRunning = false
+    await this.commandController
+      ?.term(termOptions)
+      .catch((e) => console.error(e))
+    this.commandController = null
+  }
+}
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index efa1a2484..5771136c9 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -13,98 +13,38 @@ import { splitCommand } from "../util/splitCommand"
 import { promisify } from "node:util"
 import * as CP from "node:child_process"
 
+export { Daemon } from "./Daemon"
+export { CommandController } from "./CommandController"
+import { HealthDaemon } from "./HealthDaemon"
+import { Daemon } from "./Daemon"
+import { CommandController } from "./CommandController"
+
 const cpExec = promisify(CP.exec)
-const cpExecFile = promisify(CP.execFile)
-type Daemon<
+export const cpExecFile = promisify(CP.execFile)
+export type Ready = {
+  display: string | null
+  fn: () => Promise<CheckResult> | CheckResult
+  trigger?: Trigger
+}
+
+type DaemonsParams<
   Manifest extends SDKManifest,
   Ids extends string,
   Command extends string,
   Id extends string,
 > = {
-  id: "" extends Id ? never : Id
   command: ValidIfNoStupidEscape<Command> | [string, ...string[]]
   image: { id: Manifest["images"][number]; sharedRun?: boolean }
-  mounts: Mounts<Manifest>
+  mounts: { path: string; options: MountOptions }[]
   env?: Record<string, string>
-  ready: {
-    display: string | null
-    fn: () => Promise<CheckResult> | CheckResult
-    trigger?: Trigger
-  }
+  ready: Ready
   requires: Exclude<Ids, Id>[]
 }
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
 
-export const runDaemon =
-  <Manifest extends SDKManifest>() =>
-  async <A extends string>(
-    effects: Effects,
-    image: { id: Manifest["images"][number]; sharedRun?: boolean },
-    command: ValidIfNoStupidEscape<A> | [string, ...string[]],
-    options: CommandOptions & {
-      mounts?: { path: string; options: MountOptions }[]
-      overlay?: Overlay
-    },
-  ): Promise<DaemonReturned> => {
-    const commands = splitCommand(command)
-    const overlay = options.overlay || (await Overlay.of(effects, image))
-    for (let mount of options.mounts || []) {
-      await overlay.mount(mount.options, mount.path)
-    }
-    const childProcess = await overlay.spawn(commands, {
-      env: options.env,
-    })
-    const answer = new Promise<null>((resolve, reject) => {
-      childProcess.stdout.on("data", (data: any) => {
-        console.log(data.toString())
-      })
-      childProcess.stderr.on("data", (data: any) => {
-        console.error(data.toString())
-      })
-
-      childProcess.on("exit", (code: any) => {
-        if (code === 0) {
-          return resolve(null)
-        }
-        return reject(new Error(`${commands[0]} exited with code ${code}`))
-      })
-    })
-
-    const pid = childProcess.pid
-    return {
-      async wait() {
-        try {
-          return await answer
-        } finally {
-          await cpExecFile("pkill", ["-9", "-s", String(pid)]).catch((_) => {})
-        }
-      },
-      async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
-        try {
-          await cpExecFile("pkill", [`-${signal}`, "-s", String(pid)])
-
-          if (timeout > NO_TIMEOUT) {
-            const didTimeout = await Promise.race([
-              new Promise((resolve) => setTimeout(resolve, timeout)).then(
-                () => true,
-              ),
-              answer.then(() => false),
-            ])
-            if (didTimeout) {
-              await cpExecFile("pkill", [`-9`, "-s", String(pid)]).catch(
-                (_) => {},
-              )
-            }
-          } else {
-            await answer
-          }
-        } finally {
-          await overlay.destroy()
-        }
-      },
-    }
-  }
+export const runCommand = <Manifest extends SDKManifest>() =>
+  CommandController.of<Manifest>()
 
 /**
  * A class for defining and controlling the service daemons
@@ -133,7 +73,9 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
   private constructor(
     readonly effects: Effects,
     readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>,
-    readonly daemons?: Daemon<Manifest, Ids, "command", Ids>[],
+    readonly daemons: Promise<Daemon>[],
+    readonly ids: Ids[],
+    readonly healthDaemons: HealthDaemon[],
   ) {}
   /**
    * Returns an empty new Daemons class with the provided config.
@@ -150,7 +92,13 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
     started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
     healthReceipts: HealthReceipt[]
   }) {
-    return new Daemons<Manifest, never>(config.effects, config.started)
+    return new Daemons<Manifest, never>(
+      config.effects,
+      config.started,
+      [],
+      [],
+      [],
+    )
   }
   /**
    * Returns the complete list of daemons, including the one defined here
@@ -165,73 +113,60 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
       ErrorDuplicateId<Id> extends Id ? never :
       Id extends Ids ? ErrorDuplicateId<Id> :
       Id,
-    newDaemon: Omit<Daemon<Manifest, Ids, Command, Id>, "id">,
+    options: DaemonsParams<Manifest, Ids, Command, Id>,
   ) {
-    const daemons = ((this?.daemons ?? []) as any[]).concat({
-      ...newDaemon,
+    const daemonIndex = this.daemons.length
+    const daemon = Daemon.of()(
+      this.effects,
+      options.image,
+      options.command,
+      options,
+    )
+    const healthDaemon = new HealthDaemon(
+      daemon,
+      daemonIndex,
+      options.requires
+        .map((x) => this.ids.indexOf(id as any))
+        .filter((x) => x >= 0)
+        .map((id) => this.healthDaemons[id]),
       id,
-    })
-    return new Daemons<Manifest, Ids | Id>(this.effects, this.started, daemons)
+      this.ids,
+      options.ready,
+      this.effects,
+    )
+    const daemons = this.daemons.concat(daemon)
+    const ids = [...this.ids, id] as (Ids | Id)[]
+    const healthDaemons = [...this.healthDaemons, healthDaemon]
+    return new Daemons<Manifest, Ids | Id>(
+      this.effects,
+      this.started,
+      daemons,
+      ids,
+      healthDaemons,
+    )
   }
 
   async build() {
-    const daemonsStarted = {} as Record<Ids, Promise<DaemonReturned>>
-    const { effects } = this
-    const daemons = this.daemons ?? []
-    for (const daemon of daemons) {
-      const requiredPromise = Promise.all(
-        daemon.requires?.map((id) => daemonsStarted[id]) ?? [],
-      )
-      daemonsStarted[daemon.id] = requiredPromise.then(async () => {
-        const { command, image } = daemon
-
-        const child = runDaemon<Manifest>()(effects, image, command, {
-          env: daemon.env,
-          mounts: daemon.mounts.build(),
-        })
-        let currentInput: TriggerInput = {}
-        const getCurrentInput = () => currentInput
-        const trigger = (daemon.ready.trigger ?? defaultTrigger)(
-          getCurrentInput,
-        )
-        return new Promise(async (resolve) => {
-          for (
-            let res = await trigger.next();
-            !res.done;
-            res = await trigger.next()
-          ) {
-            const response = await Promise.resolve(daemon.ready.fn()).catch(
-              (err) =>
-                ({
-                  status: "failure",
-                  message: "message" in err ? err.message : String(err),
-                }) as CheckResult,
-            )
-            currentInput.lastResult = response.status || null
-            if (!currentInput.hadSuccess && response.status === "success") {
-              currentInput.hadSuccess = true
-              resolve(child)
-            }
-          }
-          resolve(child)
-        })
-      })
-    }
+    this.updateMainHealth()
+    this.healthDaemons.forEach((x) =>
+      x.addWatcher(() => this.updateMainHealth()),
+    )
     return {
-      async term(options?: { signal?: Signals; timeout?: number }) {
-        await Promise.all(
-          Object.values<Promise<DaemonReturned>>(daemonsStarted).map((x) =>
-            x.then((x) => x.term(options)),
-          ),
-        )
-      },
-      async wait() {
-        await Promise.all(
-          Object.values<Promise<DaemonReturned>>(daemonsStarted).map((x) =>
-            x.then((x) => x.wait()),
-          ),
-        )
+      term: async (options?: { signal?: Signals; timeout?: number }) => {
+        try {
+          await Promise.all(this.healthDaemons.map((x) => x.term(options)))
+        } finally {
+          this.effects.setMainStatus({ status: "stopped" })
+        }
       },
     }
   }
+
+  private updateMainHealth() {
+    if (this.healthDaemons.every((x) => x.health.status === "success")) {
+      this.effects.setMainStatus({ status: "running" })
+    } else {
+      this.effects.setMainStatus({ status: "starting" })
+    }
+  }
 }
diff --git a/sdk/lib/mainFn/HealthDaemon.ts b/sdk/lib/mainFn/HealthDaemon.ts
new file mode 100644
index 000000000..84e9e34d7
--- /dev/null
+++ b/sdk/lib/mainFn/HealthDaemon.ts
@@ -0,0 +1,152 @@
+import { CheckResult } from "../health/checkFns"
+import { defaultTrigger } from "../trigger/defaultTrigger"
+import { Ready } from "./Daemons"
+import { Daemon } from "./Daemon"
+import { Effects } from "../types"
+
+const oncePromise = <T>() => {
+  let resolve: (value: T) => void
+  const promise = new Promise<T>((res) => {
+    resolve = res
+  })
+  return { resolve: resolve!, promise }
+}
+
+/**
+ * Wanted a structure that deals with controlling daemons by their health status
+ * States:
+ * -- Waiting for dependencies to be success
+ * -- Running: Daemon is running and the status is in the health
+ *
+ */
+export class HealthDaemon {
+  #health: CheckResult = { status: "starting", message: null }
+  #healthWatchers: Array<() => unknown> = []
+  #running = false
+  #hadSuccess = false
+  constructor(
+    readonly daemon: Promise<Daemon>,
+    readonly daemonIndex: number,
+    readonly dependencies: HealthDaemon[],
+    readonly id: string,
+    readonly ids: string[],
+    readonly ready: Ready,
+    readonly effects: Effects,
+  ) {
+    this.updateStatus()
+    this.dependencies.forEach((d) => d.addWatcher(() => this.updateStatus()))
+  }
+
+  /** Run after we want to do cleanup */
+  async term(termOptions?: {
+    signal?: NodeJS.Signals | undefined
+    timeout?: number | undefined
+  }) {
+    this.#healthWatchers = []
+    this.#running = false
+    this.#healthCheckCleanup?.()
+
+    await this.daemon.then((d) => d.stop(termOptions))
+  }
+
+  /** Want to add another notifier that the health might have changed */
+  addWatcher(watcher: () => unknown) {
+    this.#healthWatchers.push(watcher)
+  }
+
+  get health() {
+    return Object.freeze(this.#health)
+  }
+
+  private async changeRunning(newStatus: boolean) {
+    if (this.#running === newStatus) return
+
+    this.#running = newStatus
+
+    if (newStatus) {
+      ;(await this.daemon).start()
+      this.setupHealthCheck()
+    } else {
+      ;(await this.daemon).stop()
+      this.turnOffHealthCheck()
+
+      this.setHealth({ status: "starting", message: null })
+    }
+  }
+
+  #healthCheckCleanup: (() => void) | null = null
+  private turnOffHealthCheck() {
+    this.#healthCheckCleanup?.()
+  }
+  private async setupHealthCheck() {
+    if (this.#healthCheckCleanup) return
+    const trigger = (this.ready.trigger ?? defaultTrigger)(() => ({
+      hadSuccess: this.#hadSuccess,
+      lastResult: this.#health.status,
+    }))
+
+    const { promise: status, resolve: setStatus } = oncePromise<{
+      done: true
+    }>()
+    new Promise(async () => {
+      for (
+        let res = await Promise.race([status, trigger.next()]);
+        !res.done;
+        res = await Promise.race([status, trigger.next()])
+      ) {
+        const response: CheckResult = await Promise.resolve(
+          this.ready.fn(),
+        ).catch((err) => {
+          console.error(err)
+          return {
+            status: "failure",
+            message: "message" in err ? err.message : String(err),
+          }
+        })
+        this.setHealth(response)
+        if (response.status === "success") {
+          this.#hadSuccess = true
+        }
+      }
+    }).catch((err) => console.error(`Daemon ${this.id} failed: ${err}`))
+
+    this.#healthCheckCleanup = () => {
+      setStatus({ done: true })
+      this.#healthCheckCleanup = null
+    }
+  }
+
+  private setHealth(health: CheckResult) {
+    this.#health = health
+    this.#healthWatchers.forEach((watcher) => watcher())
+    const display = this.ready.display
+    const status = health.status
+    if (!display) {
+      return
+    }
+    if (
+      status === "success" ||
+      status === "disabled" ||
+      status === "starting"
+    ) {
+      this.effects.setHealth({
+        result: status,
+        message: health.message,
+        id: display,
+        name: display,
+      })
+    } else {
+      this.effects.setHealth({
+        result: health.status,
+        message: health.message || "",
+        id: display,
+        name: display,
+      })
+    }
+  }
+
+  private async updateStatus() {
+    const healths = this.dependencies.map((d) => d.#health)
+    this.changeRunning(healths.every((x) => x.status === "success"))
+  }
+}
diff --git a/sdk/lib/osBindings/SetMainStatus.ts b/sdk/lib/osBindings/SetMainStatus.ts
index 32a839984..aa4aff0b2 100644
--- a/sdk/lib/osBindings/SetMainStatus.ts
+++ b/sdk/lib/osBindings/SetMainStatus.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Status } from "./Status"
 
-export type SetMainStatus = { status: Status }
+export type SetMainStatus = { status: "running" | "stopped" | "starting" }
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index fd11ab5b6..4f6d50f53 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -1,5 +1,9 @@
 import { Effects } from "../types"
-import { CheckDependenciesParam, ExecuteAction } from ".././osBindings"
+import {
+  CheckDependenciesParam,
+  ExecuteAction,
+  SetMainStatus,
+} from ".././osBindings"
 import { CreateOverlayedImageParams } from ".././osBindings"
 import { DestroyOverlayedImageParams } from ".././osBindings"
 import { BindParams } from ".././osBindings"
@@ -66,6 +70,7 @@ describe("startosTypeValidation ", () => {
       mount: {} as MountParams,
       checkDependencies: {} as CheckDependenciesParam,
       getDependencies: undefined,
+      setMainStatus: {} as SetMainStatus,
     })
     typeEquality<Parameters<Effects["executeAction"]>[0]>(
       testInput as ExecuteAction,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 96e256766..7db42e5a9 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -4,6 +4,7 @@ import {
   DependencyRequirement,
   SetHealth,
   HealthCheckResult,
+  SetMainStatus,
 } from "./osBindings"
 
 import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
@@ -163,7 +164,7 @@ export type CommandType<A extends string> =
   | [string, ...string[]]
 
 export type DaemonReturned = {
-  wait(): Promise<null>
+  wait(): Promise<unknown>
   term(options?: { signal?: Signals; timeout?: number }): Promise<void>
 }
 
@@ -380,6 +381,8 @@ export type Effects = {
     }): Promise<void>
   }
 
+  setMainStatus(o: SetMainStatus): Promise<void>
+
   getSystemSmtp(input: {
     callback: (config: unknown, previousConfig: unknown) => void
   }): Promise<SmtpValue>
diff --git a/sdk/package.json b/sdk/package.json
index 409c5bb02..db387c036 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.4.0-rev0.lib0.rc8.beta10",
+  "version": "0.3.6-alpha1",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./cjs/lib/index.js",
   "types": "./cjs/lib/index.d.ts",

From 0ccbb52c1fdf3c3a7e935207d18502ee6bde34f8 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 16 May 2024 19:54:36 -0600
Subject: [PATCH 150/341] wait for whole session to exit when sigterm (#2620)

* wait for whole session to exit when sigterm

* fix lint

* rename poorly named variable
---
 sdk/lib/StartSdk.ts                 |  2 +-
 sdk/lib/mainFn/CommandController.ts | 74 ++++++++++++++++++++++-------
 sdk/lib/mainFn/Daemons.ts           |  2 +-
 3 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index f2eabe6be..381914c13 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -91,7 +91,7 @@ export type ServiceInterfaceType = "ui" | "p2p" | "api"
 export type MainEffects = Effects & { _type: "main" }
 export type Signals = NodeJS.Signals
 export const SIGTERM: Signals = "SIGTERM"
-export const SIGKILL: Signals = "SIGTERM"
+export const SIGKILL: Signals = "SIGKILL"
 export const NO_TIMEOUT = -1
 
 function removeConstType<E>() {
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/lib/mainFn/CommandController.ts
index e2e11dbfc..a68e1e426 100644
--- a/sdk/lib/mainFn/CommandController.ts
+++ b/sdk/lib/mainFn/CommandController.ts
@@ -1,9 +1,9 @@
-import { NO_TIMEOUT, SIGTERM } from "../StartSdk"
+import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../StartSdk"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { Effects, ValidIfNoStupidEscape } from "../types"
 import { MountOptions, Overlay } from "../util/Overlay"
 import { splitCommand } from "../util/splitCommand"
-import { cpExecFile } from "./Daemons"
+import { cpExecFile, cpExec } from "./Daemons"
 
 export class CommandController {
   private constructor(
@@ -74,11 +74,16 @@ export class CommandController {
     try {
       return await this.runningAnswer
     } finally {
-      await cpExecFile("pkill", ["-9", "-s", String(this.pid)]).catch((_) => {})
+      if (this.pid !== undefined) {
+        await cpExecFile("pkill", ["-9", "-s", String(this.pid)]).catch(
+          (_) => {},
+        )
+      }
       await this.overlay.destroy().catch((_) => {})
     }
   }
   async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
+    if (this.pid === undefined) return
     try {
       await cpExecFile("pkill", [
         `-${signal.replace("SIG", "")}`,
@@ -86,23 +91,58 @@ export class CommandController {
         String(this.pid),
       ])
 
-      if (timeout > NO_TIMEOUT) {
-        const didTimeout = await Promise.race([
-          new Promise((resolve) => setTimeout(resolve, timeout)).then(
-            () => true,
-          ),
-          this.runningAnswer.then(() => false),
-        ])
-        if (didTimeout) {
-          await cpExecFile("pkill", [`-9`, "-s", String(this.pid)]).catch(
-            (_: any) => {},
-          )
-        }
-      } else {
-        await this.runningAnswer
+      const didTimeout = await waitSession(this.pid, timeout)
+      if (didTimeout) {
+        await cpExecFile("pkill", [`-9`, "-s", String(this.pid)]).catch(
+          (_) => {},
+        )
       }
     } finally {
       await this.overlay.destroy()
     }
   }
 }
+
+function waitSession(
+  sid: number,
+  timeout = NO_TIMEOUT,
+  interval = 100,
+): Promise<boolean> {
+  let nextInterval = interval * 2
+  if (timeout >= 0 && timeout < nextInterval) {
+    nextInterval = timeout
+  }
+  let nextTimeout = timeout
+  if (timeout > 0) {
+    if (timeout >= interval) {
+      nextTimeout -= interval
+    } else {
+      nextTimeout = 0
+    }
+  }
+  return new Promise((resolve, reject) => {
+    let next: NodeJS.Timeout | null = null
+    if (timeout !== 0) {
+      next = setTimeout(() => {
+        waitSession(sid, nextTimeout, nextInterval).then(resolve, reject)
+      }, interval)
+    }
+    cpExecFile("ps", [`--sid=${sid}`, "-o", "--pid="]).then(
+      (_) => {
+        if (timeout === 0) {
+          resolve(true)
+        }
+      },
+      (e) => {
+        if (next) {
+          clearTimeout(next)
+        }
+        if (typeof e === "object" && e && "code" in e && e.code) {
+          resolve(false)
+        } else {
+          reject(e)
+        }
+      },
+    )
+  })
+}
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 5771136c9..8962061f5 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -19,7 +19,7 @@ import { HealthDaemon } from "./HealthDaemon"
 import { Daemon } from "./Daemon"
 import { CommandController } from "./CommandController"
 
-const cpExec = promisify(CP.exec)
+export const cpExec = promisify(CP.exec)
 export const cpExecFile = promisify(CP.execFile)
 export type Ready = {
   display: string | null

From fd7c2fbe9343eafee33f818e8a4650ce639fe0f2 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 31 May 2024 12:13:23 -0600
Subject: [PATCH 151/341] Feature/registry package index (#2623)

* include system images in compat s9pk

* wip

* wip

* update types

* wip

* fix signature serialization

* Add SignatureHeader conversions

* finish display impl for get

---------

Co-authored-by: Shadowy Super Coder <musashidisciple@proton.me>
---
 Makefile                                      |   3 +-
 core/Cargo.lock                               |  13 +
 core/helpers/src/script_dir.rs                |   8 +-
 core/models/src/errors.rs                     |   2 +
 core/models/src/id/image.rs                   |   4 +-
 core/models/src/version.rs                    |  44 +-
 core/startos/Cargo.toml                       |   1 +
 core/startos/src/backup/target/mod.rs         |   8 +-
 core/startos/src/context/cli.rs               |   6 +-
 core/startos/src/db/model/public.rs           |   7 +-
 core/startos/src/disk/util.rs                 |   4 +-
 core/startos/src/install/mod.rs               |  34 +-
 core/startos/src/lib.rs                       |   4 +-
 core/startos/src/logs.rs                      |   6 +-
 core/startos/src/lxc/mod.rs                   |  10 +-
 core/startos/src/net/static_server.rs         |   6 +-
 core/startos/src/registry/admin.rs            |  36 +-
 core/startos/src/registry/asset.rs            |  44 +-
 core/startos/src/registry/auth.rs             | 109 ++--
 core/startos/src/registry/context.rs          |  54 +-
 core/startos/src/registry/device_info.rs      | 199 ++++++++
 core/startos/src/registry/mod.rs              |  28 +-
 core/startos/src/registry/os/asset/add.rs     | 251 +++------
 core/startos/src/registry/os/asset/get.rs     |  36 +-
 core/startos/src/registry/os/asset/sign.rs    |  76 ++-
 core/startos/src/registry/os/index.rs         |  23 +-
 core/startos/src/registry/os/version/mod.rs   |  23 +-
 .../startos/src/registry/os/version/signer.rs |  21 +-
 core/startos/src/registry/package/add.rs      | 170 +++++++
 core/startos/src/registry/package/get.rs      | 387 ++++++++++++++
 core/startos/src/registry/package/index.rs    | 163 ++++++
 core/startos/src/registry/package/mod.rs      |  29 ++
 core/startos/src/registry/signer.rs           | 477 ------------------
 .../src/registry/signer/commitment/blake3.rs  |  50 ++
 .../signer/commitment/merkle_archive.rs       |  98 ++++
 .../src/registry/signer/commitment/mod.rs     |  25 +
 .../src/registry/signer/commitment/request.rs | 102 ++++
 core/startos/src/registry/signer/mod.rs       | 154 ++++++
 .../src/registry/signer/sign/ed25519.rs       |  34 ++
 core/startos/src/registry/signer/sign/mod.rs  | 348 +++++++++++++
 core/startos/src/rpc_continuations.rs         |  37 +-
 core/startos/src/s9pk/{v1 => }/git_hash.rs    |  35 +-
 .../s9pk/merkle_archive/directory_contents.rs |  15 +-
 .../src/s9pk/merkle_archive/file_contents.rs  |  10 +-
 core/startos/src/s9pk/merkle_archive/hash.rs  |   7 +-
 core/startos/src/s9pk/merkle_archive/mod.rs   | 147 ++++--
 core/startos/src/s9pk/merkle_archive/sink.rs  |  54 +-
 .../src/s9pk/merkle_archive/source/http.rs    | 163 ++++--
 .../src/s9pk/merkle_archive/source/mod.rs     |  74 ++-
 .../source/multi_cursor_file.rs               | 121 +++--
 core/startos/src/s9pk/merkle_archive/test.rs  |  16 +-
 .../src/s9pk/merkle_archive/write_queue.rs    |   2 +
 core/startos/src/s9pk/mod.rs                  |   1 +
 core/startos/src/s9pk/rpc.rs                  |   4 +-
 core/startos/src/s9pk/v1/manifest.rs          | 164 +++++-
 core/startos/src/s9pk/v1/mod.rs               |   1 -
 core/startos/src/s9pk/v1/reader.rs            |   6 +-
 core/startos/src/s9pk/v2/compat.rs            |  81 +--
 core/startos/src/s9pk/v2/manifest.rs          |  26 +-
 core/startos/src/s9pk/v2/mod.rs               |  16 +-
 core/startos/src/service/mod.rs               |   8 +-
 .../src/service/service_effect_handler.rs     |  15 +-
 core/startos/src/service/service_map.rs       |   2 +-
 core/startos/src/update/mod.rs                |  28 +-
 core/startos/src/upload.rs                    |  68 ++-
 core/startos/src/util/io.rs                   | 118 ++++-
 core/startos/src/util/lshw.rs                 |   7 +-
 core/startos/src/util/mod.rs                  |   2 +-
 core/startos/src/util/rpc.rs                  |  60 +--
 core/startos/src/util/serde.rs                |  41 +-
 core/startos/src/version/mod.rs               |   6 +-
 core/startos/src/volume.rs                    |   4 +-
 sdk/lib/osBindings/AcceptSigners.ts           |   4 +-
 sdk/lib/osBindings/AddAdminParams.ts          |   3 +-
 sdk/lib/osBindings/AddAssetParams.ts          |  13 +-
 sdk/lib/osBindings/AddVersionParams.ts        |   3 +-
 .../{SignerKey.ts => AnySignature.ts}         |   3 +-
 sdk/lib/osBindings/AnySigningKey.ts           |   3 +
 sdk/lib/osBindings/AnyVerifyingKey.ts         |   3 +
 sdk/lib/osBindings/Blake3Commitment.ts        |   4 +
 sdk/lib/osBindings/Category.ts                |   4 +
 sdk/lib/osBindings/FullIndex.ts               |  10 +-
 sdk/lib/osBindings/GetOsAssetParams.ts        |   3 +-
 sdk/lib/osBindings/GetPackageParams.ts        |  10 +
 sdk/lib/osBindings/GetPackageResponse.ts      |   9 +
 sdk/lib/osBindings/GetPackageResponseFull.ts  |   8 +
 sdk/lib/osBindings/{Pem.ts => Guid.ts}        |   2 +-
 sdk/lib/osBindings/HardwareRequirements.ts    |   2 +-
 .../osBindings/ListVersionSignersParams.ts    |   3 +-
 sdk/lib/osBindings/Manifest.ts                |   6 +-
 ...ignature.ts => MerkleArchiveCommitment.ts} |   9 +-
 sdk/lib/osBindings/OsIndex.ts                 |   3 +-
 sdk/lib/osBindings/OsVersionInfo.ts           |  10 +-
 sdk/lib/osBindings/PackageDetailLevel.ts      |   3 +
 sdk/lib/osBindings/PackageIndex.ts            |   9 +
 sdk/lib/osBindings/PackageInfo.ts             |   9 +
 sdk/lib/osBindings/PackageInfoShort.ts        |   3 +
 sdk/lib/osBindings/PackageVersionInfo.ts      |  25 +
 sdk/lib/osBindings/RegistryAsset.ts           |   9 +-
 sdk/lib/osBindings/RemoveVersionParams.ts     |   3 +-
 ...1SignatureInfo.ts => RequestCommitment.ts} |  10 +-
 sdk/lib/osBindings/ServerInfo.ts              |   3 +-
 sdk/lib/osBindings/SetMainStatus.ts           |   4 +-
 sdk/lib/osBindings/SetMainStatusStatus.ts     |   3 +
 sdk/lib/osBindings/SignAssetParams.ts         |   7 +-
 sdk/lib/osBindings/Signature.ts               |   4 -
 sdk/lib/osBindings/SignatureInfo.ts           |   7 -
 sdk/lib/osBindings/SignerInfo.ts              |   4 +-
 sdk/lib/osBindings/Version.ts                 |   3 +
 sdk/lib/osBindings/VersionSignerParams.ts     |   4 +-
 sdk/lib/osBindings/index.ts                   |  24 +-
 .../show/additional/additional.component.html |  11 -
 .../ui/src/app/services/api/api.fixures.ts    |   3 -
 113 files changed, 3264 insertions(+), 1435 deletions(-)
 create mode 100644 core/startos/src/registry/device_info.rs
 create mode 100644 core/startos/src/registry/package/add.rs
 create mode 100644 core/startos/src/registry/package/get.rs
 create mode 100644 core/startos/src/registry/package/index.rs
 create mode 100644 core/startos/src/registry/package/mod.rs
 delete mode 100644 core/startos/src/registry/signer.rs
 create mode 100644 core/startos/src/registry/signer/commitment/blake3.rs
 create mode 100644 core/startos/src/registry/signer/commitment/merkle_archive.rs
 create mode 100644 core/startos/src/registry/signer/commitment/mod.rs
 create mode 100644 core/startos/src/registry/signer/commitment/request.rs
 create mode 100644 core/startos/src/registry/signer/mod.rs
 create mode 100644 core/startos/src/registry/signer/sign/ed25519.rs
 create mode 100644 core/startos/src/registry/signer/sign/mod.rs
 rename core/startos/src/s9pk/{v1 => }/git_hash.rs (52%)
 rename sdk/lib/osBindings/{SignerKey.ts => AnySignature.ts} (55%)
 create mode 100644 sdk/lib/osBindings/AnySigningKey.ts
 create mode 100644 sdk/lib/osBindings/AnyVerifyingKey.ts
 create mode 100644 sdk/lib/osBindings/Blake3Commitment.ts
 create mode 100644 sdk/lib/osBindings/Category.ts
 create mode 100644 sdk/lib/osBindings/GetPackageParams.ts
 create mode 100644 sdk/lib/osBindings/GetPackageResponse.ts
 create mode 100644 sdk/lib/osBindings/GetPackageResponseFull.ts
 rename sdk/lib/osBindings/{Pem.ts => Guid.ts} (80%)
 rename sdk/lib/osBindings/{Blake3Ed25519Signature.ts => MerkleArchiveCommitment.ts} (52%)
 create mode 100644 sdk/lib/osBindings/PackageDetailLevel.ts
 create mode 100644 sdk/lib/osBindings/PackageIndex.ts
 create mode 100644 sdk/lib/osBindings/PackageInfo.ts
 create mode 100644 sdk/lib/osBindings/PackageInfoShort.ts
 create mode 100644 sdk/lib/osBindings/PackageVersionInfo.ts
 rename sdk/lib/osBindings/{Blake3Ed2551SignatureInfo.ts => RequestCommitment.ts} (51%)
 create mode 100644 sdk/lib/osBindings/SetMainStatusStatus.ts
 delete mode 100644 sdk/lib/osBindings/Signature.ts
 delete mode 100644 sdk/lib/osBindings/SignatureInfo.ts
 create mode 100644 sdk/lib/osBindings/Version.ts

diff --git a/Makefile b/Makefile
index 1dffd3629..ff5b9c4ad 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,6 @@ install: $(ALL_TARGETS)
 	$(call mkdir,$(DESTDIR)/usr/lib/startos/system-images)
 	$(call cp,system-images/compat/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/compat.tar)
 	$(call cp,system-images/utils/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/utils.tar)
-	$(call cp,system-images/binfmt/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/binfmt.tar)
 	
 	$(call cp,firmware/$(PLATFORM),$(DESTDIR)/usr/lib/startos/firmware)
 
@@ -184,7 +183,7 @@ container-runtime/node_modules: container-runtime/package.json container-runtime
 	npm --prefix container-runtime ci
 	touch container-runtime/node_modules
 
-sdk/lib/osBindings: $(shell core/startos/bindings)
+sdk/lib/osBindings: core/startos/bindings
 	mkdir -p sdk/lib/osBindings
 	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1";/g' > core/startos/bindings/index.ts
 	npm --prefix sdk exec -- prettier --config ./sdk/package.json -w ./core/startos/bindings/*.ts
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 920390d65..4ae02e98e 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -1153,10 +1153,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
+ "der_derive",
  "pem-rfc7468",
  "zeroize",
 ]
 
+[[package]]
+name = "der_derive"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "deranged"
 version = "0.3.11"
@@ -4603,6 +4615,7 @@ dependencies = [
  "cookie 0.18.1",
  "cookie_store",
  "current_platform",
+ "der",
  "digest 0.10.7",
  "divrem",
  "ed25519 2.2.3",
diff --git a/core/helpers/src/script_dir.rs b/core/helpers/src/script_dir.rs
index d90051899..5cedd419f 100644
--- a/core/helpers/src/script_dir.rs
+++ b/core/helpers/src/script_dir.rs
@@ -1,10 +1,14 @@
 use std::path::{Path, PathBuf};
 
-use models::{PackageId, Version};
+use models::{PackageId, VersionString};
 
 pub const PKG_SCRIPT_DIR: &str = "package-data/scripts";
 
-pub fn script_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, version: &Version) -> PathBuf {
+pub fn script_dir<P: AsRef<Path>>(
+    datadir: P,
+    pkg_id: &PackageId,
+    version: &VersionString,
+) -> PathBuf {
     datadir
         .as_ref()
         .join(&*PKG_SCRIPT_DIR)
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index 340fd15ca..95416ec80 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -89,6 +89,7 @@ pub enum ErrorKind {
     Timeout = 71,
     Lxc = 72,
     Cancelled = 73,
+    Git = 74,
 }
 impl ErrorKind {
     pub fn as_str(&self) -> &'static str {
@@ -167,6 +168,7 @@ impl ErrorKind {
             Timeout => "Timeout Error",
             Lxc => "LXC Error",
             Cancelled => "Cancelled",
+            Git => "Git Error",
         }
     }
 }
diff --git a/core/models/src/id/image.rs b/core/models/src/id/image.rs
index bbb0a601e..69a04f880 100644
--- a/core/models/src/id/image.rs
+++ b/core/models/src/id/image.rs
@@ -5,7 +5,7 @@ use std::str::FromStr;
 use serde::{Deserialize, Deserializer, Serialize};
 use ts_rs::TS;
 
-use crate::{Id, InvalidId, PackageId, Version};
+use crate::{Id, InvalidId, PackageId, VersionString};
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TS)]
 #[ts(type = "string")]
@@ -21,7 +21,7 @@ impl std::fmt::Display for ImageId {
     }
 }
 impl ImageId {
-    pub fn for_package(&self, pkg_id: &PackageId, pkg_version: Option<&Version>) -> String {
+    pub fn for_package(&self, pkg_id: &PackageId, pkg_version: Option<&VersionString>) -> String {
         format!(
             "start9/{}/{}:{}",
             pkg_id,
diff --git a/core/models/src/version.rs b/core/models/src/version.rs
index 012f362aa..48871e3a1 100644
--- a/core/models/src/version.rs
+++ b/core/models/src/version.rs
@@ -6,12 +6,12 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use ts_rs::TS;
 
 #[derive(Debug, Clone, TS)]
-#[ts(type = "string")]
-pub struct Version {
+#[ts(type = "string", rename = "Version")]
+pub struct VersionString {
     version: emver::Version,
     string: String,
 }
-impl Version {
+impl VersionString {
     pub fn as_str(&self) -> &str {
         self.string.as_str()
     }
@@ -19,76 +19,76 @@ impl Version {
         self.version
     }
 }
-impl std::fmt::Display for Version {
+impl std::fmt::Display for VersionString {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", self.string)
     }
 }
-impl std::str::FromStr for Version {
+impl std::str::FromStr for VersionString {
     type Err = <emver::Version as FromStr>::Err;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(Version {
+        Ok(VersionString {
             string: s.to_owned(),
             version: s.parse()?,
         })
     }
 }
-impl From<emver::Version> for Version {
+impl From<emver::Version> for VersionString {
     fn from(v: emver::Version) -> Self {
-        Version {
+        VersionString {
             string: v.to_string(),
             version: v,
         }
     }
 }
-impl From<Version> for emver::Version {
-    fn from(v: Version) -> Self {
+impl From<VersionString> for emver::Version {
+    fn from(v: VersionString) -> Self {
         v.version
     }
 }
-impl Default for Version {
+impl Default for VersionString {
     fn default() -> Self {
         Self::from(emver::Version::default())
     }
 }
-impl Deref for Version {
+impl Deref for VersionString {
     type Target = emver::Version;
     fn deref(&self) -> &Self::Target {
         &self.version
     }
 }
-impl AsRef<emver::Version> for Version {
+impl AsRef<emver::Version> for VersionString {
     fn as_ref(&self) -> &emver::Version {
         &self.version
     }
 }
-impl AsRef<str> for Version {
+impl AsRef<str> for VersionString {
     fn as_ref(&self) -> &str {
         self.as_str()
     }
 }
-impl PartialEq for Version {
-    fn eq(&self, other: &Version) -> bool {
+impl PartialEq for VersionString {
+    fn eq(&self, other: &VersionString) -> bool {
         self.version.eq(&other.version)
     }
 }
-impl Eq for Version {}
-impl PartialOrd for Version {
+impl Eq for VersionString {}
+impl PartialOrd for VersionString {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         self.version.partial_cmp(&other.version)
     }
 }
-impl Ord for Version {
+impl Ord for VersionString {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
         self.version.cmp(&other.version)
     }
 }
-impl Hash for Version {
+impl Hash for VersionString {
     fn hash<H: Hasher>(&self, state: &mut H) {
         self.version.hash(state)
     }
 }
-impl<'de> Deserialize<'de> for Version {
+impl<'de> Deserialize<'de> for VersionString {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
@@ -98,7 +98,7 @@ impl<'de> Deserialize<'de> for Version {
         Ok(Self { string, version })
     }
 }
-impl Serialize for Version {
+impl Serialize for VersionString {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index d88b51f96..bd064a167 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -73,6 +73,7 @@ console-subscriber = { version = "0.2", optional = true }
 cookie = "0.18.0"
 cookie_store = "0.20.0"
 current_platform = "0.2.0"
+der = { version = "0.7.9", features = ["derive", "pem"] }
 digest = "0.10.7"
 divrem = "1.0.0"
 ed25519 = { version = "2.2.3", features = ["pkcs8", "pem", "alloc"] }
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index 4d00a2501..2c7a28d94 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -29,7 +29,7 @@ use crate::util::clap::FromStrParser;
 use crate::util::serde::{
     deserialize_from_str, display_serializable, serialize_display, HandlerExtSerde, WithIoFormat,
 };
-use crate::util::Version;
+use crate::util::VersionString;
 
 pub mod cifs;
 
@@ -194,7 +194,7 @@ pub async fn list(ctx: RpcContext) -> Result<BTreeMap<BackupTargetId, BackupTarg
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BackupInfo {
-    pub version: Version,
+    pub version: VersionString,
     pub timestamp: Option<DateTime<Utc>>,
     pub package_backups: BTreeMap<PackageId, PackageBackupInfo>,
 }
@@ -203,8 +203,8 @@ pub struct BackupInfo {
 #[serde(rename_all = "camelCase")]
 pub struct PackageBackupInfo {
     pub title: String,
-    pub version: Version,
-    pub os_version: Version,
+    pub version: VersionString,
+    pub os_version: VersionString,
     pub timestamp: DateTime<Utc>,
 }
 
diff --git a/core/startos/src/context/cli.rs b/core/startos/src/context/cli.rs
index 166ab3fd7..014457b67 100644
--- a/core/startos/src/context/cli.rs
+++ b/core/startos/src/context/cli.rs
@@ -21,7 +21,7 @@ use crate::context::config::{local_config_path, ClientConfig};
 use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext};
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::prelude::*;
-use crate::rpc_continuations::RequestGuid;
+use crate::rpc_continuations::Guid;
 
 #[derive(Debug)]
 pub struct CliContextSeed {
@@ -164,7 +164,7 @@ impl CliContext {
 
     pub async fn ws_continuation(
         &self,
-        guid: RequestGuid,
+        guid: Guid,
     ) -> Result<WebSocketStream<MaybeTlsStream<TcpStream>>, Error> {
         let mut url = self.base_url.clone();
         let ws_scheme = match url.scheme() {
@@ -194,7 +194,7 @@ impl CliContext {
 
     pub async fn rest_continuation(
         &self,
-        guid: RequestGuid,
+        guid: Guid,
         body: reqwest::Body,
         headers: reqwest::header::HeaderMap,
     ) -> Result<reqwest::Response, Error> {
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index fe85056f9..e5257f2a4 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -21,7 +21,7 @@ use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::util::cpupower::Governor;
-use crate::util::Version;
+use crate::util::VersionString;
 use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
 
@@ -109,8 +109,7 @@ pub struct ServerInfo {
     pub platform: InternedString,
     pub id: String,
     pub hostname: String,
-    #[ts(type = "string")]
-    pub version: Version,
+    pub version: VersionString,
     #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
     #[ts(type = "string")]
@@ -136,7 +135,7 @@ pub struct ServerInfo {
     #[serde(default)]
     pub zram: bool,
     pub governor: Option<Governor>,
-    pub smtp: Option<String>
+    pub smtp: Option<String>,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
diff --git a/core/startos/src/disk/util.rs b/core/startos/src/disk/util.rs
index b0bc00a5d..a98c52418 100644
--- a/core/startos/src/disk/util.rs
+++ b/core/startos/src/disk/util.rs
@@ -20,7 +20,7 @@ use super::mount::guard::TmpMountGuard;
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::disk::OsPartitionInfo;
 use crate::util::serde::IoFormat;
-use crate::util::{Invoke, Version};
+use crate::util::{Invoke, VersionString};
 use crate::{Error, ResultExt as _};
 
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
@@ -56,7 +56,7 @@ pub struct PartitionInfo {
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct EmbassyOsRecoveryInfo {
-    pub version: Version,
+    pub version: VersionString,
     pub full: bool,
     pub password_hash: Option<String>,
     pub wrapped_key: Option<String>,
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index f5cff36d9..c4e4452b7 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -1,4 +1,5 @@
 use std::path::PathBuf;
+use std::sync::Arc;
 use std::time::Duration;
 
 use clap::builder::ValueParserFactory;
@@ -22,7 +23,7 @@ use crate::context::{CliContext, RpcContext};
 use crate::db::model::package::{ManifestPreference, PackageState, PackageStateMatchModelRef};
 use crate::prelude::*;
 use crate::progress::{FullProgress, PhasedProgressBar};
-use crate::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::S9pk;
@@ -139,15 +140,18 @@ pub async fn install(
     let registry = registry.unwrap_or_else(|| crate::DEFAULT_MARKETPLACE.parse().unwrap());
     let version_priority = version_priority.unwrap_or_default();
     let s9pk = S9pk::deserialize(
-        &HttpSource::new(
-            ctx.client.clone(),
-            format!(
-                "{}/package/v0/{}.s9pk?spec={}&version-priority={}",
-                registry, id, version, version_priority,
+        &Arc::new(
+            HttpSource::new(
+                ctx.client.clone(),
+                format!(
+                    "{}/package/v0/{}.s9pk?spec={}&version-priority={}",
+                    registry, id, version, version_priority,
+                )
+                .parse()?,
             )
-            .parse()?,
-        )
-        .await?,
+            .await?,
+        ),
+        None, // TODO
         true,
     )
     .await?;
@@ -170,8 +174,8 @@ pub async fn install(
 #[derive(Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SideloadResponse {
-    pub upload: RequestGuid,
-    pub progress: RequestGuid,
+    pub upload: Guid,
+    pub progress: Guid,
 }
 
 #[instrument(skip_all)]
@@ -179,7 +183,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
     let (upload, file) = upload(&ctx).await?;
     let (id_send, id_recv) = oneshot::channel();
     let (err_send, err_recv) = oneshot::channel();
-    let progress = RequestGuid::new();
+    let progress = Guid::new();
     let db = ctx.db.clone();
     let mut sub = db
         .subscribe(
@@ -256,7 +260,11 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
     .await;
     tokio::spawn(async move {
         if let Err(e) = async {
-            let s9pk = S9pk::deserialize(&file, true).await?;
+            let s9pk = S9pk::deserialize(
+                &file, None, // TODO
+                true,
+            )
+            .await?;
             let _ = id_send.send(s9pk.as_manifest().id.clone());
             ctx.services
                 .install(ctx.clone(), s9pk, None::<Never>)
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 3152fcab3..d60a2db24 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -1,6 +1,8 @@
 pub const DEFAULT_MARKETPLACE: &str = "https://registry.start9.com";
 // pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com";
-pub const BUFFER_SIZE: usize = 1024;
+pub const CAP_1_KiB: usize = 1024;
+pub const CAP_1_MiB: usize = CAP_1_KiB * CAP_1_KiB;
+pub const CAP_10_MiB: usize = 10 * CAP_1_MiB;
 pub const HOST_IP: [u8; 4] = [172, 18, 0, 1];
 pub const TARGET: &str = current_platform::CURRENT_PLATFORM;
 lazy_static::lazy_static! {
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 340b04b8b..bb1198451 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -26,7 +26,7 @@ use crate::context::{CliContext, RpcContext};
 use crate::error::ResultExt;
 use crate::lxc::ContainerId;
 use crate::prelude::*;
-use crate::rpc_continuations::{RequestGuid, RpcContinuation, RpcContinuations};
+use crate::rpc_continuations::{Guid, RpcContinuation, RpcContinuations};
 use crate::util::serde::Reversible;
 use crate::util::Invoke;
 
@@ -118,7 +118,7 @@ pub struct LogResponse {
 #[serde(rename_all = "camelCase")]
 pub struct LogFollowResponse {
     start_cursor: Option<String>,
-    guid: RequestGuid,
+    guid: Guid,
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
@@ -581,7 +581,7 @@ pub async fn follow_logs<Context: AsRef<RpcContinuations>>(
         first_entry = Some(entry);
     }
 
-    let guid = RequestGuid::new();
+    let guid = Guid::new();
     ctx.as_ref()
         .add(
             guid.clone(),
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 084364c4a..f64ecebe7 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -33,7 +33,7 @@ use crate::disk::mount::filesystem::{MountType, ReadWrite};
 use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::disk::mount::util::unmount;
 use crate::prelude::*;
-use crate::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::util::clap::FromStrParser;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::{new_guid, Invoke};
@@ -433,7 +433,7 @@ pub struct ConnectParams {
 pub async fn connect_rpc(
     ctx: RpcContext,
     ConnectParams { guid }: ConnectParams,
-) -> Result<RequestGuid, Error> {
+) -> Result<Guid, Error> {
     connect(
         &ctx,
         ctx.dev.lxc.lock().await.get(&guid).ok_or_else(|| {
@@ -443,11 +443,11 @@ pub async fn connect_rpc(
     .await
 }
 
-pub async fn connect(ctx: &RpcContext, container: &LxcContainer) -> Result<RequestGuid, Error> {
+pub async fn connect(ctx: &RpcContext, container: &LxcContainer) -> Result<Guid, Error> {
     use axum::extract::ws::Message;
 
     let rpc = container.connect_rpc(Some(Duration::from_secs(30))).await?;
-    let guid = RequestGuid::new();
+    let guid = Guid::new();
     ctx.rpc_continuations
         .add(
             guid.clone(),
@@ -504,7 +504,7 @@ pub async fn connect(ctx: &RpcContext, container: &LxcContainer) -> Result<Reque
     Ok(guid)
 }
 
-pub async fn connect_cli(ctx: &CliContext, guid: RequestGuid) -> Result<(), Error> {
+pub async fn connect_cli(ctx: &CliContext, guid: Guid) -> Result<(), Error> {
     use futures::SinkExt;
     use tokio_tungstenite::tungstenite::Message;
 
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index 85737598b..fff1731ce 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -30,7 +30,7 @@ use crate::middleware::auth::{Auth, HasValidSession};
 use crate::middleware::cors::Cors;
 use crate::middleware::db::SyncDb;
 use crate::middleware::diagnostic::DiagnosticMode;
-use crate::rpc_continuations::RequestGuid;
+use crate::rpc_continuations::Guid;
 use crate::{diagnostic_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt};
 
 const NOT_FOUND: &[u8] = b"Not Found";
@@ -136,7 +136,7 @@ pub fn main_ui_server_router(ctx: RpcContext) -> Router {
                 let ctx = ctx.clone();
                 move |x::Path(path): x::Path<String>,
                       ws: axum::extract::ws::WebSocketUpgrade| async move {
-                    match RequestGuid::from(&path) {
+                    match Guid::from(&path) {
                         None => {
                             tracing::debug!("No Guid Path");
                             bad_request()
@@ -159,7 +159,7 @@ pub fn main_ui_server_router(ctx: RpcContext) -> Router {
                         .path()
                         .strip_prefix("/rest/rpc/")
                         .unwrap_or_default();
-                    match RequestGuid::from(&path) {
+                    match Guid::from(&path) {
                         None => {
                             tracing::debug!("No Guid Path");
                             bad_request()
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index b09fa05aa..cd795e5cd 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -10,10 +10,11 @@ use ts_rs::TS;
 use crate::context::CliContext;
 use crate::prelude::*;
 use crate::registry::context::RegistryContext;
-use crate::registry::signer::{ContactInfo, SignerInfo, SignerKey};
+use crate::registry::signer::sign::AnyVerifyingKey;
+use crate::registry::signer::{ContactInfo, SignerInfo};
 use crate::registry::RegistryDatabase;
-use crate::rpc_continuations::RequestGuid;
-use crate::util::serde::{display_serializable, HandlerExtSerde, Pem, WithIoFormat};
+use crate::rpc_continuations::Guid;
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 
 pub fn admin_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -48,8 +49,8 @@ fn signers_api<C: Context>() -> ParentHandler<C> {
         .subcommand("add", from_fn_async(cli_add_signer).no_display())
 }
 
-impl Model<BTreeMap<RequestGuid, SignerInfo>> {
-    pub fn get_signer(&self, key: &SignerKey) -> Result<RequestGuid, Error> {
+impl Model<BTreeMap<Guid, SignerInfo>> {
+    pub fn get_signer(&self, key: &AnyVerifyingKey) -> Result<Guid, Error> {
         self.as_entries()?
             .into_iter()
             .map(|(guid, s)| Ok::<_, Error>((guid, s.as_keys().de()?)))
@@ -60,7 +61,7 @@ impl Model<BTreeMap<RequestGuid, SignerInfo>> {
             .ok_or_else(|| Error::new(eyre!("unknown signer"), ErrorKind::Authorization))
     }
 
-    pub fn get_signer_info(&self, key: &SignerKey) -> Result<(RequestGuid, SignerInfo), Error> {
+    pub fn get_signer_info(&self, key: &AnyVerifyingKey) -> Result<(Guid, SignerInfo), Error> {
         self.as_entries()?
             .into_iter()
             .map(|(guid, s)| Ok::<_, Error>((guid, s.de()?)))
@@ -88,17 +89,15 @@ impl Model<BTreeMap<RequestGuid, SignerInfo>> {
                 ErrorKind::InvalidRequest,
             ));
         }
-        self.insert(&RequestGuid::new(), signer)
+        self.insert(&Guid::new(), signer)
     }
 }
 
-pub async fn list_signers(
-    ctx: RegistryContext,
-) -> Result<BTreeMap<RequestGuid, SignerInfo>, Error> {
+pub async fn list_signers(ctx: RegistryContext) -> Result<BTreeMap<Guid, SignerInfo>, Error> {
     ctx.db.peek().await.into_index().into_signers().de()
 }
 
-pub fn display_signers<T>(params: WithIoFormat<T>, signers: BTreeMap<RequestGuid, SignerInfo>) {
+pub fn display_signers<T>(params: WithIoFormat<T>, signers: BTreeMap<Guid, SignerInfo>) {
     use prettytable::*;
 
     if let Some(format) = params.format {
@@ -137,8 +136,8 @@ pub struct CliAddSignerParams {
     pub name: String,
     #[arg(long = "contact", short = 'c')]
     pub contact: Vec<ContactInfo>,
-    #[arg(long = "ed25519-key")]
-    pub ed25519_keys: Vec<Pem<ed25519_dalek::VerifyingKey>>,
+    #[arg(long = "key")]
+    pub keys: Vec<AnyVerifyingKey>,
     pub database: Option<PathBuf>,
 }
 
@@ -151,7 +150,7 @@ pub async fn cli_add_signer(
             CliAddSignerParams {
                 name,
                 contact,
-                ed25519_keys,
+                keys,
                 database,
             },
         ..
@@ -160,7 +159,7 @@ pub async fn cli_add_signer(
     let signer = SignerInfo {
         name,
         contact,
-        keys: ed25519_keys.into_iter().map(SignerKey::Ed25519).collect(),
+        keys: keys.into_iter().collect(),
     };
     if let Some(database) = database {
         TypedPatchDb::<RegistryDatabase>::load(PatchDb::open(database).await?)
@@ -181,8 +180,7 @@ pub async fn cli_add_signer(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddAdminParams {
-    #[ts(type = "string")]
-    pub signer: RequestGuid,
+    pub signer: Guid,
 }
 
 pub async fn add_admin(
@@ -206,7 +204,7 @@ pub async fn add_admin(
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliAddAdminParams {
-    pub signer: RequestGuid,
+    pub signer: Guid,
     pub database: Option<PathBuf>,
 }
 
@@ -242,7 +240,7 @@ pub async fn cli_add_admin(
     Ok(())
 }
 
-pub async fn list_admins(ctx: RegistryContext) -> Result<BTreeMap<RequestGuid, SignerInfo>, Error> {
+pub async fn list_admins(ctx: RegistryContext) -> Result<BTreeMap<Guid, SignerInfo>, Error> {
     let db = ctx.db.peek().await;
     let admins = db.as_admins().de()?;
     Ok(db
diff --git a/core/startos/src/registry/asset.rs b/core/startos/src/registry/asset.rs
index c9acced45..ea37b2309 100644
--- a/core/startos/src/registry/asset.rs
+++ b/core/startos/src/registry/asset.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWrite;
@@ -5,32 +7,48 @@ use ts_rs::TS;
 use url::Url;
 
 use crate::prelude::*;
-use crate::registry::signer::{AcceptSigners, FileValidator, SignatureInfo};
+use crate::registry::signer::commitment::{Commitment, Digestable};
+use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey};
+use crate::registry::signer::AcceptSigners;
+use crate::s9pk::merkle_archive::source::http::HttpSource;
 
-#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[model = "Model<Self>"]
 #[ts(export)]
-pub struct RegistryAsset {
+pub struct RegistryAsset<Commitment> {
     #[ts(type = "string")]
     pub url: Url,
-    pub signature_info: SignatureInfo,
+    pub commitment: Commitment,
+    pub signatures: HashMap<AnyVerifyingKey, AnySignature>,
 }
-impl AsRef<RegistryAsset> for RegistryAsset {
-    fn as_ref(&self) -> &RegistryAsset {
-        self
+impl<Commitment> RegistryAsset<Commitment> {
+    pub fn all_signers(&self) -> AcceptSigners {
+        AcceptSigners::All(
+            self.signatures
+                .keys()
+                .cloned()
+                .map(AcceptSigners::Signer)
+                .collect(),
+        )
     }
 }
-impl RegistryAsset {
-    pub fn validate(&self, accept: AcceptSigners) -> Result<FileValidator, Error> {
-        self.signature_info.validate(accept)
+impl<Commitment: Digestable> RegistryAsset<Commitment> {
+    pub fn validate(&self, context: &str, mut accept: AcceptSigners) -> Result<&Commitment, Error> {
+        for (signer, signature) in &self.signatures {
+            accept.process_signature(signer, &self.commitment, context, signature)?;
+        }
+        accept.try_accept()?;
+        Ok(&self.commitment)
     }
+}
+impl<C: for<'a> Commitment<&'a HttpSource>> RegistryAsset<C> {
     pub async fn download(
         &self,
         client: Client,
         dst: &mut (impl AsyncWrite + Unpin + Send + ?Sized),
-        validator: &FileValidator,
     ) -> Result<(), Error> {
-        validator.download(self.url.clone(), client, dst).await
+        self.commitment
+            .copy_to(&HttpSource::new(client, self.url.clone()).await?, dst)
+            .await
     }
 }
diff --git a/core/startos/src/registry/auth.rs b/core/startos/src/registry/auth.rs
index 187750870..741090b4d 100644
--- a/core/startos/src/registry/auth.rs
+++ b/core/startos/src/registry/auth.rs
@@ -6,19 +6,23 @@ use axum::body::Body;
 use axum::extract::Request;
 use axum::response::Response;
 use chrono::Utc;
-use http_body_util::BodyExt;
+use http::HeaderValue;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{Middleware, RpcRequest, RpcResponse};
 use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha512};
 use tokio::io::AsyncWriteExt;
 use tokio::sync::Mutex;
 use ts_rs::TS;
+use url::Url;
 
 use crate::prelude::*;
 use crate::registry::context::RegistryContext;
-use crate::registry::signer::SignerKey;
-use crate::util::serde::{Base64, Pem};
+use crate::registry::signer::commitment::request::RequestCommitment;
+use crate::registry::signer::commitment::Commitment;
+use crate::registry::signer::sign::{
+    AnySignature, AnySigningKey, AnyVerifyingKey, SignatureScheme,
+};
+use crate::util::serde::Base64;
 
 pub const AUTH_SIG_HEADER: &str = "X-StartOS-Registry-Auth-Sig";
 
@@ -34,7 +38,7 @@ pub struct Metadata {
 #[derive(Clone)]
 pub struct Auth {
     nonce_cache: Arc<Mutex<BTreeMap<Instant, u64>>>, // for replay protection
-    signer: Option<Result<SignerKey, RpcError>>,
+    signer: Option<Result<AnyVerifyingKey, RpcError>>,
 }
 impl Auth {
     pub fn new() -> Self {
@@ -68,41 +72,57 @@ pub struct RegistryAdminLogRecord {
     pub name: String,
     #[ts(type = "{ id: string | number | null; method: string; params: any }")]
     pub request: RpcRequest,
-    pub key: SignerKey,
+    pub key: AnyVerifyingKey,
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct SignatureHeader {
-    pub timestamp: i64,
-    pub nonce: u64,
     #[serde(flatten)]
-    pub signer: SignerKey,
-    pub signature: Base64<[u8; 64]>,
+    pub commitment: RequestCommitment,
+    pub signer: AnyVerifyingKey,
+    pub signature: AnySignature,
 }
 impl SignatureHeader {
-    pub fn sign_ed25519(
-        key: &ed25519_dalek::SigningKey,
-        body: &[u8],
-        context: &str,
-    ) -> Result<Self, Error> {
+    pub fn to_header(&self) -> HeaderValue {
+        let mut url: Url = "http://localhost".parse().unwrap();
+        self.commitment.append_query(&mut url);
+        url.query_pairs_mut()
+            .append_pair("signer", &self.signer.to_string());
+        url.query_pairs_mut()
+            .append_pair("signature", &self.signature.to_string());
+        HeaderValue::from_str(url.query().unwrap_or_default()).unwrap()
+    }
+    pub fn from_header(header: &HeaderValue) -> Result<Self, Error> {
+        let url: Url = format!(
+            "http://localhost/?{}",
+            header.to_str().with_kind(ErrorKind::Utf8)?
+        )
+        .parse()?;
+        let query: BTreeMap<_, _> = url.query_pairs().collect();
+        Ok(Self {
+            commitment: RequestCommitment::from_query(&url)?,
+            signer: query.get("signer").or_not_found("signer")?.parse()?,
+            signature: query.get("signature").or_not_found("signature")?.parse()?,
+        })
+    }
+    pub fn sign(signer: &AnySigningKey, body: &[u8], context: &str) -> Result<Self, Error> {
         let timestamp = SystemTime::now()
             .duration_since(UNIX_EPOCH)
             .map(|d| d.as_secs() as i64)
             .unwrap_or_else(|e| e.duration().as_secs() as i64 * -1);
         let nonce = rand::random();
-        let signer = SignerKey::Ed25519(Pem(key.verifying_key()));
-        let mut hasher = Sha512::new();
-        hasher.update(&i64::to_be_bytes(timestamp));
-        hasher.update(&u64::to_be_bytes(nonce));
-        hasher.update(body);
-        let signature = Base64(
-            key.sign_prehashed(hasher, Some(context.as_bytes()))?
-                .to_bytes(),
-        );
-        Ok(Self {
+        let commitment = RequestCommitment {
             timestamp,
             nonce,
-            signer,
+            size: body.len() as u64,
+            blake3: Base64(*blake3::hash(body).as_bytes()),
+        };
+        let signature = signer
+            .scheme()
+            .sign_commitment(&signer, &commitment, context)?;
+        Ok(Self {
+            commitment,
+            signer: signer.verifying_key(),
             signature,
         })
     }
@@ -120,43 +140,40 @@ impl Middleware<RegistryContext> for Auth {
                 async {
                     let request = request;
                     let SignatureHeader {
-                        timestamp,
-                        nonce,
+                        commitment,
                         signer,
                         signature,
-                    } = serde_urlencoded::from_str(
+                    } = SignatureHeader::from_header(
                         request
                             .headers()
                             .get(AUTH_SIG_HEADER)
                             .or_not_found("missing X-StartOS-Registry-Auth-Sig")
-                            .with_kind(ErrorKind::InvalidRequest)?
-                            .to_str()
-                            .with_kind(ErrorKind::Utf8)?,
-                    )
-                    .with_kind(ErrorKind::Deserialization)?;
+                            .with_kind(ErrorKind::InvalidRequest)?,
+                    )?;
+
+                    signer.scheme().verify_commitment(
+                        &signer,
+                        &commitment,
+                        &ctx.hostname,
+                        &signature,
+                    )?;
+
                     let now = SystemTime::now()
                         .duration_since(UNIX_EPOCH)
                         .map(|d| d.as_secs() as i64)
                         .unwrap_or_else(|e| e.duration().as_secs() as i64 * -1);
-                    if (now - timestamp).abs() > 30 {
+                    if (now - commitment.timestamp).abs() > 30 {
                         return Err(Error::new(
                             eyre!("timestamp not within 30s of now"),
                             ErrorKind::InvalidSignature,
                         ));
                     }
-                    self.handle_nonce(nonce).await?;
-                    let body = std::mem::replace(request.body_mut(), Body::empty())
-                        .collect()
-                        .await
-                        .with_kind(ErrorKind::Network)?
-                        .to_bytes();
-                    let mut verifier = signer.verifier();
-                    verifier.update(&i64::to_be_bytes(timestamp));
-                    verifier.update(&u64::to_be_bytes(nonce));
-                    verifier.update(&body);
+                    self.handle_nonce(commitment.nonce).await?;
+
+                    let mut body = Vec::with_capacity(commitment.size as usize);
+                    commitment.copy_to(request, &mut body).await?;
                     *request.body_mut() = Body::from(body);
 
-                    verifier.verify(&*signature, &ctx.hostname)?;
                     Ok(signer)
                 }
                 .await
diff --git a/core/startos/src/registry/context.rs b/core/startos/src/registry/context.rs
index dac833434..99d60307b 100644
--- a/core/startos/src/registry/context.rs
+++ b/core/startos/src/registry/context.rs
@@ -6,6 +6,7 @@ use std::sync::Arc;
 use clap::Parser;
 use imbl_value::InternedString;
 use patch_db::PatchDb;
+use reqwest::{Client, Proxy};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{CallRemote, Context, Empty};
 use serde::{Deserialize, Serialize};
@@ -17,9 +18,10 @@ use crate::context::config::{ContextConfig, CONFIG_PATH};
 use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
 use crate::registry::auth::{SignatureHeader, AUTH_SIG_HEADER};
+use crate::registry::device_info::{DeviceInfo, DEVICE_INFO_HEADER};
+use crate::registry::signer::sign::AnySigningKey;
 use crate::registry::RegistryDatabase;
 use crate::rpc_continuations::RpcContinuations;
-use crate::version::VersionT;
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize, Parser)]
 #[serde(rename_all = "kebab-case")]
@@ -31,6 +33,8 @@ pub struct RegistryConfig {
     pub listen: Option<SocketAddr>,
     #[arg(short = 'h', long = "hostname")]
     pub hostname: InternedString,
+    #[arg(short = 'p', long = "proxy")]
+    pub tor_proxy: Option<Url>,
     #[arg(short = 'd', long = "datadir")]
     pub datadir: Option<PathBuf>,
 }
@@ -58,6 +62,7 @@ pub struct RegistryContextSeed {
     pub db: TypedPatchDb<RegistryDatabase>,
     pub datadir: PathBuf,
     pub rpc_continuations: RpcContinuations,
+    pub client: Client,
     pub shutdown: Sender<()>,
 }
 
@@ -81,6 +86,11 @@ impl RegistryContext {
             || async { Ok(Default::default()) },
         )
         .await?;
+        let tor_proxy_url = config
+            .tor_proxy
+            .clone()
+            .map(Ok)
+            .unwrap_or_else(|| "socks5h://localhost:9050".parse())?;
         Ok(Self(Arc::new(RegistryContextSeed {
             hostname: config.hostname.clone(),
             listen: config
@@ -89,6 +99,16 @@ impl RegistryContext {
             db,
             datadir,
             rpc_continuations: RpcContinuations::new(),
+            client: Client::builder()
+                .proxy(Proxy::custom(move |url| {
+                    if url.host_str().map_or(false, |h| h.ends_with(".onion")) {
+                        Some(tor_proxy_url.clone())
+                    } else {
+                        None
+                    }
+                }))
+                .build()
+                .with_kind(crate::ErrorKind::ParseUrl)?,
             shutdown,
         })))
     }
@@ -145,12 +165,11 @@ impl CallRemote<RegistryContext> for CliContext {
             .header(CONTENT_LENGTH, body.len())
             .header(
                 AUTH_SIG_HEADER,
-                serde_urlencoded::to_string(&SignatureHeader::sign_ed25519(
-                    self.developer_key()?,
+                SignatureHeader::sign(
+                    &AnySigningKey::Ed25519(self.developer_key()?.clone()),
                     &body,
                     &host,
-                )?)
-                .with_kind(ErrorKind::Serialization)?,
+                )?.to_header(),
             )
             .body(body)
             .send()
@@ -171,29 +190,6 @@ impl CallRemote<RegistryContext> for CliContext {
     }
 }
 
-fn hardware_header(ctx: &RpcContext) -> String {
-    let mut url: Url = "http://localhost".parse().unwrap();
-    url.query_pairs_mut()
-        .append_pair(
-            "os.version",
-            &crate::version::Current::new().semver().to_string(),
-        )
-        .append_pair(
-            "os.compat",
-            &crate::version::Current::new().compat().to_string(),
-        )
-        .append_pair("os.arch", &*crate::PLATFORM)
-        .append_pair("hardware.arch", &*crate::ARCH)
-        .append_pair("hardware.ram", &ctx.hardware.ram.to_string());
-
-    for hw in &ctx.hardware.devices {
-        url.query_pairs_mut()
-            .append_pair(&format!("hardware.device.{}", hw.class()), hw.product());
-    }
-
-    url.query().unwrap_or_default().to_string()
-}
-
 impl CallRemote<RegistryContext, RegistryUrlParams> for RpcContext {
     async fn call_remote(
         &self,
@@ -221,7 +217,7 @@ impl CallRemote<RegistryContext, RegistryUrlParams> for RpcContext {
             .header(CONTENT_TYPE, "application/json")
             .header(ACCEPT, "application/json")
             .header(CONTENT_LENGTH, body.len())
-            .header("X-StartOS-Hardware", &hardware_header(self))
+            .header(DEVICE_INFO_HEADER, DeviceInfo::from(self).to_header_value())
             .body(body)
             .send()
             .await?;
diff --git a/core/startos/src/registry/device_info.rs b/core/startos/src/registry/device_info.rs
new file mode 100644
index 000000000..7da5bd8b9
--- /dev/null
+++ b/core/startos/src/registry/device_info.rs
@@ -0,0 +1,199 @@
+use std::collections::BTreeMap;
+use std::convert::identity;
+use std::ops::Deref;
+
+use axum::extract::Request;
+use axum::response::Response;
+use emver::{Version, VersionRange};
+use http::HeaderValue;
+use imbl_value::InternedString;
+use rpc_toolkit::{Middleware, RpcRequest, RpcResponse};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+use url::Url;
+
+use crate::context::RpcContext;
+use crate::prelude::*;
+use crate::registry::context::RegistryContext;
+use crate::util::VersionString;
+use crate::version::VersionT;
+
+pub const DEVICE_INFO_HEADER: &str = "X-StartOS-Device-Info";
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct DeviceInfo {
+    pub os: OsInfo,
+    pub hardware: HardwareInfo,
+}
+impl From<&RpcContext> for DeviceInfo {
+    fn from(value: &RpcContext) -> Self {
+        Self {
+            os: OsInfo::from(value),
+            hardware: HardwareInfo::from(value),
+        }
+    }
+}
+impl DeviceInfo {
+    pub fn to_header_value(&self) -> HeaderValue {
+        let mut url: Url = "http://localhost".parse().unwrap();
+        url.query_pairs_mut()
+            .append_pair("os.version", &self.os.version.to_string())
+            .append_pair("os.compat", &self.os.compat.to_string())
+            .append_pair("os.platform", &*self.os.platform)
+            .append_pair("hardware.arch", &*self.hardware.arch)
+            .append_pair("hardware.ram", &self.hardware.ram.to_string());
+
+        for (class, products) in &self.hardware.devices {
+            for product in products {
+                url.query_pairs_mut()
+                    .append_pair(&format!("hardware.device.{}", class), product);
+            }
+        }
+
+        HeaderValue::from_str(url.query().unwrap_or_default()).unwrap()
+    }
+    pub fn from_header_value(header: &HeaderValue) -> Result<Self, Error> {
+        let url: Url = format!(
+            "http://localhost/?{}",
+            header.to_str().with_kind(ErrorKind::ParseUrl)?
+        )
+        .parse()?;
+        let query: BTreeMap<_, _> = url.query_pairs().collect();
+        Ok(Self {
+            os: OsInfo {
+                version: query
+                    .get("os.version")
+                    .or_not_found("os.version")?
+                    .parse()?,
+                compat: query.get("os.compat").or_not_found("os.compat")?.parse()?,
+                platform: query
+                    .get("os.platform")
+                    .or_not_found("os.platform")?
+                    .deref()
+                    .into(),
+            },
+            hardware: HardwareInfo {
+                arch: query
+                    .get("hardware.arch")
+                    .or_not_found("hardware.arch")?
+                    .parse()?,
+                ram: query
+                    .get("hardware.ram")
+                    .or_not_found("hardware.ram")?
+                    .parse()?,
+                devices: identity(query)
+                    .split_off("hardware.device.")
+                    .into_iter()
+                    .filter_map(|(k, v)| {
+                        k.strip_prefix("hardware.device.")
+                            .map(|k| (k.into(), v.into_owned()))
+                    })
+                    .fold(BTreeMap::new(), |mut acc, (k, v)| {
+                        let mut devs = acc.remove(&k).unwrap_or_default();
+                        devs.push(v);
+                        acc.insert(k, devs);
+                        acc
+                    }),
+            },
+        })
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct OsInfo {
+    #[ts(as = "VersionString")]
+    pub version: Version,
+    #[ts(type = "string")]
+    pub compat: VersionRange,
+    #[ts(type = "string")]
+    pub platform: InternedString,
+}
+impl From<&RpcContext> for OsInfo {
+    fn from(_: &RpcContext) -> Self {
+        Self {
+            version: crate::version::Current::new().semver(),
+            compat: crate::version::Current::new().compat().clone(),
+            platform: InternedString::intern(&*crate::PLATFORM),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct HardwareInfo {
+    #[ts(type = "string")]
+    pub arch: InternedString,
+    #[ts(type = "number")]
+    pub ram: u64,
+    #[ts(as = "BTreeMap::<String, Vec<String>>")]
+    pub devices: BTreeMap<InternedString, Vec<String>>,
+}
+
+impl From<&RpcContext> for HardwareInfo {
+    fn from(value: &RpcContext) -> Self {
+        Self {
+            arch: InternedString::intern(&**crate::ARCH),
+            ram: value.hardware.ram,
+            devices: value
+                .hardware
+                .devices
+                .iter()
+                .fold(BTreeMap::new(), |mut acc, dev| {
+                    let mut devs = acc.remove(dev.class()).unwrap_or_default();
+                    devs.push(dev.product().to_owned());
+                    acc.insert(dev.class().into(), devs);
+                    acc
+                }),
+        }
+    }
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Metadata {
+    #[serde(default)]
+    get_device_info: bool,
+}
+
+#[derive(Clone)]
+pub struct DeviceInfoMiddleware {
+    device_info: Option<HeaderValue>,
+}
+impl DeviceInfoMiddleware {
+    pub fn new() -> Self {
+        Self { device_info: None }
+    }
+}
+
+impl Middleware<RegistryContext> for DeviceInfoMiddleware {
+    type Metadata = Metadata;
+    async fn process_http_request(
+        &mut self,
+        _: &RegistryContext,
+        request: &mut Request,
+    ) -> Result<(), Response> {
+        self.device_info = request.headers_mut().remove(DEVICE_INFO_HEADER);
+        Ok(())
+    }
+    async fn process_rpc_request(
+        &mut self,
+        _: &RegistryContext,
+        metadata: Self::Metadata,
+        request: &mut RpcRequest,
+    ) -> Result<(), RpcResponse> {
+        async move {
+            if metadata.get_device_info {
+                if let Some(device_info) = &self.device_info {
+                    request.params["__device_info"] =
+                        to_value(&DeviceInfo::from_header_value(device_info)?)?;
+                }
+            }
+
+            Ok::<_, Error>(())
+        }
+        .await
+        .map_err(|e| RpcResponse::from_result(Err(e)))
+    }
+}
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index c063e5823..656edf337 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -3,20 +3,23 @@ use std::net::SocketAddr;
 
 use axum::Router;
 use futures::future::ready;
+use models::DataUrl;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler, Server};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::context::{CliContext};
+use crate::context::CliContext;
 use crate::middleware::cors::Cors;
 use crate::net::static_server::{bad_request, not_found, server_error};
 use crate::net::web_server::WebServer;
 use crate::prelude::*;
 use crate::registry::auth::Auth;
-use crate::registry::context::{RegistryContext};
+use crate::registry::context::RegistryContext;
+use crate::registry::device_info::DeviceInfoMiddleware;
 use crate::registry::os::index::OsIndex;
+use crate::registry::package::index::PackageIndex;
 use crate::registry::signer::SignerInfo;
-use crate::rpc_continuations::RequestGuid;
+use crate::rpc_continuations::Guid;
 use crate::util::serde::HandlerExtSerde;
 
 pub mod admin;
@@ -24,26 +27,29 @@ pub mod asset;
 pub mod auth;
 pub mod context;
 pub mod db;
+pub mod device_info;
 pub mod os;
+pub mod package;
 pub mod signer;
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct RegistryDatabase {
-    pub admins: BTreeSet<RequestGuid>,
+    pub admins: BTreeSet<Guid>,
     pub index: FullIndex,
 }
+impl RegistryDatabase {}
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct FullIndex {
-    // pub package: PackageIndex,
+    pub icon: Option<DataUrl<'static>>,
+    pub package: PackageIndex,
     pub os: OsIndex,
-    #[ts(as = "BTreeMap::<String, SignerInfo>")]
-    pub signers: BTreeMap<RequestGuid, SignerInfo>,
+    pub signers: BTreeMap<Guid, SignerInfo>,
 }
 
 pub async fn get_full_index(ctx: RegistryContext) -> Result<FullIndex, Error> {
@@ -59,6 +65,7 @@ pub fn registry_api<C: Context>() -> ParentHandler<C> {
                 .with_call_remote::<CliContext>(),
         )
         .subcommand("os", os::os_api::<C>())
+        .subcommand("package", package::package_api::<C>())
         .subcommand("admin", admin::admin_api::<C>())
         .subcommand("db", db::db_api::<C>())
 }
@@ -72,7 +79,8 @@ pub fn registry_server_router(ctx: RegistryContext) -> Router {
             post(
                 Server::new(move || ready(Ok(ctx.clone())), registry_api())
                     .middleware(Cors::new())
-                    .middleware(Auth::new()),
+                    .middleware(Auth::new())
+                    .middleware(DeviceInfoMiddleware::new()),
             )
         })
         .route(
@@ -81,7 +89,7 @@ pub fn registry_server_router(ctx: RegistryContext) -> Router {
                 let ctx = ctx.clone();
                 move |x::Path(path): x::Path<String>,
                       ws: axum::extract::ws::WebSocketUpgrade| async move {
-                    match RequestGuid::from(&path) {
+                    match Guid::from(&path) {
                         None => {
                             tracing::debug!("No Guid Path");
                             bad_request()
@@ -104,7 +112,7 @@ pub fn registry_server_router(ctx: RegistryContext) -> Router {
                         .path()
                         .strip_prefix("/rest/rpc/")
                         .unwrap_or_default();
-                    match RequestGuid::from(&path) {
+                    match Guid::from(&path) {
                         None => {
                             tracing::debug!("No Guid Path");
                             bad_request()
diff --git a/core/startos/src/registry/os/asset/add.rs b/core/startos/src/registry/os/asset/add.rs
index d2c20e711..6ca495547 100644
--- a/core/startos/src/registry/os/asset/add.rs
+++ b/core/startos/src/registry/os/asset/add.rs
@@ -1,17 +1,13 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use std::panic::UnwindSafe;
 use std::path::PathBuf;
-use std::time::Duration;
 
-use axum::response::Response;
 use clap::Parser;
-use futures::{FutureExt, TryStreamExt};
 use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha512};
 use ts_rs::TS;
 use url::Url;
 
@@ -22,10 +18,15 @@ use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
 use crate::registry::os::SIG_CONTEXT;
-use crate::registry::signer::{Blake3Ed25519Signature, Signature, SignatureInfo, SignerKey};
-use crate::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::registry::signer::commitment::blake3::Blake3Commitment;
+use crate::registry::signer::sign::ed25519::Ed25519;
+use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
+use crate::s9pk::merkle_archive::hash::VerifyingWriter;
+use crate::s9pk::merkle_archive::source::http::HttpSource;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
-use crate::util::{Apply, Version};
+use crate::util::serde::Base64;
+use crate::util::VersionString;
 
 pub fn add_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -53,39 +54,37 @@ pub fn add_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddAssetParams {
-    #[ts(type = "string")]
-    pub url: Url,
-    pub signature: Signature,
-    #[ts(type = "string")]
-    pub version: Version,
+    pub version: VersionString,
     #[ts(type = "string")]
     pub platform: InternedString,
-    #[serde(default)]
-    pub upload: bool,
+    #[ts(type = "string")]
+    pub url: Url,
     #[serde(rename = "__auth_signer")]
-    pub signer: SignerKey,
+    #[ts(skip)]
+    pub signer: AnyVerifyingKey,
+    pub signature: AnySignature,
+    pub commitment: Blake3Commitment,
 }
 
 async fn add_asset(
     ctx: RegistryContext,
     AddAssetParams {
-        url,
-        signature,
         version,
         platform,
-        upload,
+        url,
         signer,
+        signature,
+        commitment,
     }: AddAssetParams,
-    accessor: impl FnOnce(&mut Model<OsVersionInfo>) -> &mut Model<BTreeMap<InternedString, RegistryAsset>>
+    accessor: impl FnOnce(
+            &mut Model<OsVersionInfo>,
+        ) -> &mut Model<BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>>
         + UnwindSafe
         + Send,
-) -> Result<Option<RequestGuid>, Error> {
-    ensure_code!(
-        signature.signer() == signer,
-        ErrorKind::InvalidSignature,
-        "asset signature does not match request signer"
-    );
-
+) -> Result<(), Error> {
+    signer
+        .scheme()
+        .verify_commitment(&signer, &commitment, SIG_CONTEXT, &signature)?;
     ctx.db
         .mutate(|db| {
             let signer_guid = db.as_index().as_signers().get_signer(&signer)?;
@@ -95,7 +94,7 @@ async fn add_asset(
                 .as_versions()
                 .as_idx(&version)
                 .or_not_found(&version)?
-                .as_signers()
+                .as_authorized()
                 .de()?
                 .contains(&signer_guid)
             {
@@ -109,11 +108,21 @@ async fn add_asset(
                 .upsert(&platform, || {
                     Ok(RegistryAsset {
                         url,
-                        signature_info: SignatureInfo::new(SIG_CONTEXT),
+                        commitment: commitment.clone(),
+                        signatures: HashMap::new(),
                     })
                 })?
-                .as_signature_info_mut()
-                .mutate(|s| s.add_sig(&signature))?;
+                .mutate(|s| {
+                    if s.commitment != commitment {
+                        Err(Error::new(
+                            eyre!("commitment does not match"),
+                            ErrorKind::InvalidSignature,
+                        ))
+                    } else {
+                        s.signatures.insert(signer, signature);
+                        Ok(())
+                    }
+                })?;
                 Ok(())
             } else {
                 Err(Error::new(eyre!("UNAUTHORIZED"), ErrorKind::Authorization))
@@ -121,80 +130,18 @@ async fn add_asset(
         })
         .await?;
 
-    let guid = if upload {
-        let guid = RequestGuid::new();
-        let auth_guid = guid.clone();
-        let signer = signature.signer();
-        let hostname = ctx.hostname.clone();
-        ctx.rpc_continuations
-            .add(
-                guid.clone(),
-                RpcContinuation::rest(
-                    Box::new(|req| {
-                        async move {
-                            Ok(
-                                if async move {
-                                    let auth_sig = base64::decode(
-                                        req.headers().get("X-StartOS-Registry-Auth-Sig")?,
-                                    )
-                                    .ok()?;
-                                    signer
-                                        .verify_message(
-                                            auth_guid.as_ref().as_bytes(),
-                                            &auth_sig,
-                                            &hostname,
-                                        )
-                                        .ok()?;
-
-                                    Some(())
-                                }
-                                .await
-                                .is_some()
-                                {
-                                    Response::builder()
-                                        .status(200)
-                                        .body(axum::body::Body::empty())
-                                        .with_kind(ErrorKind::Network)?
-                                } else {
-                                    Response::builder()
-                                        .status(401)
-                                        .body(axum::body::Body::empty())
-                                        .with_kind(ErrorKind::Network)?
-                                },
-                            )
-                        }
-                        .boxed()
-                    }),
-                    Duration::from_secs(30),
-                ),
-            )
-            .await;
-        Some(guid)
-    } else {
-        None
-    };
-
-    Ok(guid)
+    Ok(())
 }
 
-pub async fn add_iso(
-    ctx: RegistryContext,
-    params: AddAssetParams,
-) -> Result<Option<RequestGuid>, Error> {
+pub async fn add_iso(ctx: RegistryContext, params: AddAssetParams) -> Result<(), Error> {
     add_asset(ctx, params, |m| m.as_iso_mut()).await
 }
 
-pub async fn add_img(
-    ctx: RegistryContext,
-    params: AddAssetParams,
-) -> Result<Option<RequestGuid>, Error> {
+pub async fn add_img(ctx: RegistryContext, params: AddAssetParams) -> Result<(), Error> {
     add_asset(ctx, params, |m| m.as_img_mut()).await
 }
 
-pub async fn add_squashfs(
-    ctx: RegistryContext,
-    params: AddAssetParams,
-) -> Result<Option<RequestGuid>, Error> {
+pub async fn add_squashfs(ctx: RegistryContext, params: AddAssetParams) -> Result<(), Error> {
     add_asset(ctx, params, |m| m.as_squashfs_mut()).await
 }
 
@@ -205,11 +152,9 @@ pub struct CliAddAssetParams {
     #[arg(short = 'p', long = "platform")]
     pub platform: InternedString,
     #[arg(short = 'v', long = "version")]
-    pub version: Version,
+    pub version: VersionString,
     pub file: PathBuf,
     pub url: Url,
-    #[arg(short = 'u', long = "upload")]
-    pub upload: bool,
 }
 
 pub async fn cli_add_asset(
@@ -223,7 +168,6 @@ pub async fn cli_add_asset(
                 version,
                 file: path,
                 url,
-                upload,
             },
         ..
     }: HandlerArgs<CliContext, CliAddAssetParams>,
@@ -240,21 +184,18 @@ pub async fn cli_add_asset(
         }
     };
 
-    let file = tokio::fs::File::open(&path).await?.into();
+    let file = MultiCursorFile::from(tokio::fs::File::open(&path).await?);
 
     let mut progress = FullProgressTracker::new();
     let progress_handle = progress.handle();
     let mut sign_phase =
         progress_handle.add_phase(InternedString::intern("Signing File"), Some(10));
+    let mut verify_phase =
+        progress_handle.add_phase(InternedString::intern("Verifying URL"), Some(100));
     let mut index_phase = progress_handle.add_phase(
         InternedString::intern("Adding File to Registry Index"),
         Some(1),
     );
-    let mut upload_phase = if upload {
-        Some(progress_handle.add_phase(InternedString::intern("Uploading File"), Some(100)))
-    } else {
-        None
-    };
 
     let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
         let mut bar = PhasedProgressBar::new(&format!("Adding {} to registry...", path.display()));
@@ -270,71 +211,47 @@ pub async fn cli_add_asset(
     .into();
 
     sign_phase.start();
-    let blake3_sig =
-        Blake3Ed25519Signature::sign_file(ctx.developer_key()?, &file, SIG_CONTEXT).await?;
-    let size = blake3_sig.size;
-    let signature = Signature::Blake3Ed25519(blake3_sig);
+    let blake3 = file.blake3_mmap().await?;
+    let size = file
+        .size()
+        .await
+        .ok_or_else(|| Error::new(eyre!("failed to read file metadata"), ErrorKind::Filesystem))?;
+    let commitment = Blake3Commitment {
+        hash: Base64(*blake3.as_bytes()),
+        size,
+    };
+    let signature = Ed25519.sign_commitment(ctx.developer_key()?, &commitment, SIG_CONTEXT)?;
     sign_phase.complete();
 
+    verify_phase.start();
+    let src = HttpSource::new(ctx.client.clone(), url.clone()).await?;
+    let mut writer = verify_phase.writer(VerifyingWriter::new(
+        tokio::io::sink(),
+        Some((blake3::Hash::from_bytes(*commitment.hash), commitment.size)),
+    ));
+    src.copy_all_to(&mut writer).await?;
+    let (verifier, mut verify_phase) = writer.into_inner();
+    verifier.verify().await?;
+    verify_phase.complete();
+
     index_phase.start();
-    let add_res = from_value::<Option<RequestGuid>>(
-        ctx.call_remote::<RegistryContext>(
-            &parent_method
-                .into_iter()
-                .chain(method)
-                .chain([ext])
-                .join("."),
-            imbl_value::json!({
-                "platform": platform,
-                "version": version,
-                "url": &url,
-                "signature": signature,
-                "upload": upload,
-            }),
-        )
-        .await?,
-    )?;
+    ctx.call_remote::<RegistryContext>(
+        &parent_method
+            .into_iter()
+            .chain(method)
+            .chain([ext])
+            .join("."),
+        imbl_value::json!({
+            "platform": platform,
+            "version": version,
+            "url": &url,
+            "signature": signature,
+            "commitment": commitment,
+        }),
+    )
+    .await?;
     index_phase.complete();
 
-    if let Some(guid) = add_res {
-        upload_phase.as_mut().map(|p| p.start());
-        upload_phase.as_mut().map(|p| p.set_total(size));
-        let reg_url = ctx.registry_url.as_ref().or_not_found("--registry")?;
-        ctx.client
-            .post(url)
-            .header("X-StartOS-Registry-Token", guid.as_ref())
-            .header(
-                "X-StartOS-Registry-Auth-Sig",
-                base64::encode(
-                    ctx.developer_key()?
-                        .sign_prehashed(
-                            Sha512::new_with_prefix(guid.as_ref().as_bytes()),
-                            Some(
-                                reg_url
-                                    .host()
-                                    .or_not_found("registry hostname")?
-                                    .to_string()
-                                    .as_bytes(),
-                            ),
-                        )?
-                        .to_bytes(),
-                ),
-            )
-            .body(reqwest::Body::wrap_stream(
-                tokio_util::io::ReaderStream::new(file.fetch(0, size).await?).inspect_ok(
-                    move |b| {
-                        upload_phase
-                            .as_mut()
-                            .map(|p| *p += b.len() as u64)
-                            .apply(|_| ())
-                    },
-                ),
-            ))
-            .send()
-            .await?;
-        // upload_phase.as_mut().map(|p| p.complete());
-    }
-
     progress_handle.complete();
 
     progress_task.await.with_kind(ErrorKind::Unknown)?;
diff --git a/core/startos/src/registry/os/asset/get.rs b/core/startos/src/registry/os/asset/get.rs
index 52e95bc98..e099a50cf 100644
--- a/core/startos/src/registry/os/asset/get.rs
+++ b/core/startos/src/registry/os/asset/get.rs
@@ -16,8 +16,11 @@ use crate::progress::{FullProgressTracker, PhasedProgressBar};
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
+use crate::registry::os::SIG_CONTEXT;
+use crate::registry::signer::commitment::blake3::Blake3Commitment;
+use crate::registry::signer::commitment::Commitment;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::util::Version;
+use crate::util::VersionString;
 
 pub fn get_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -33,8 +36,7 @@ pub fn get_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct GetOsAssetParams {
-    #[ts(type = "string")]
-    pub version: Version,
+    pub version: VersionString,
     #[ts(type = "string")]
     pub platform: InternedString,
 }
@@ -42,10 +44,12 @@ pub struct GetOsAssetParams {
 async fn get_os_asset(
     ctx: RegistryContext,
     GetOsAssetParams { version, platform }: GetOsAssetParams,
-    accessor: impl FnOnce(&Model<OsVersionInfo>) -> &Model<BTreeMap<InternedString, RegistryAsset>>
+    accessor: impl FnOnce(
+            &Model<OsVersionInfo>,
+        ) -> &Model<BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>>
         + UnwindSafe
         + Send,
-) -> Result<RegistryAsset, Error> {
+) -> Result<RegistryAsset<Blake3Commitment>, Error> {
     accessor(
         ctx.db
             .peek()
@@ -64,21 +68,21 @@ async fn get_os_asset(
 pub async fn get_iso(
     ctx: RegistryContext,
     params: GetOsAssetParams,
-) -> Result<RegistryAsset, Error> {
+) -> Result<RegistryAsset<Blake3Commitment>, Error> {
     get_os_asset(ctx, params, |info| info.as_iso()).await
 }
 
 pub async fn get_img(
     ctx: RegistryContext,
     params: GetOsAssetParams,
-) -> Result<RegistryAsset, Error> {
+) -> Result<RegistryAsset<Blake3Commitment>, Error> {
     get_os_asset(ctx, params, |info| info.as_img()).await
 }
 
 pub async fn get_squashfs(
     ctx: RegistryContext,
     params: GetOsAssetParams,
-) -> Result<RegistryAsset, Error> {
+) -> Result<RegistryAsset<Blake3Commitment>, Error> {
     get_os_asset(ctx, params, |info| info.as_squashfs()).await
 }
 
@@ -86,7 +90,7 @@ pub async fn get_squashfs(
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliGetOsAssetParams {
-    pub version: Version,
+    pub version: VersionString,
     pub platform: InternedString,
     #[arg(long = "download", short = 'd')]
     pub download: Option<PathBuf>,
@@ -112,8 +116,8 @@ async fn cli_get_os_asset(
             },
         ..
     }: HandlerArgs<CliContext, CliGetOsAssetParams>,
-) -> Result<RegistryAsset, Error> {
-    let res = from_value::<RegistryAsset>(
+) -> Result<RegistryAsset<Blake3Commitment>, Error> {
+    let res = from_value::<RegistryAsset<Blake3Commitment>>(
         ctx.call_remote::<RegistryContext>(
             &parent_method.into_iter().chain(method).join("."),
             json!({
@@ -124,7 +128,7 @@ async fn cli_get_os_asset(
         .await?,
     )?;
 
-    let validator = res.validate(res.signature_info.all_signers())?;
+    res.validate(SIG_CONTEXT, res.all_signers())?;
 
     if let Some(download) = download {
         let mut file = AtomicFile::new(&download, None::<&Path>)
@@ -135,7 +139,7 @@ async fn cli_get_os_asset(
         let progress_handle = progress.handle();
         let mut download_phase =
             progress_handle.add_phase(InternedString::intern("Downloading File"), Some(100));
-        download_phase.set_total(validator.size()?);
+        download_phase.set_total(res.commitment.size);
         let reverify_phase = if reverify {
             Some(progress_handle.add_phase(InternedString::intern("Reverifying File"), Some(10)))
         } else {
@@ -157,7 +161,7 @@ async fn cli_get_os_asset(
 
         download_phase.start();
         let mut download_writer = download_phase.writer(&mut *file);
-        res.download(ctx.client.clone(), &mut download_writer, &validator)
+        res.download(ctx.client.clone(), &mut download_writer)
             .await?;
         let (_, mut download_phase) = download_writer.into_inner();
         file.save().await.with_kind(ErrorKind::Filesystem)?;
@@ -165,8 +169,8 @@ async fn cli_get_os_asset(
 
         if let Some(mut reverify_phase) = reverify_phase {
             reverify_phase.start();
-            validator
-                .validate_file(&MultiCursorFile::from(
+            res.commitment
+                .check(&MultiCursorFile::from(
                     tokio::fs::File::open(download).await?,
                 ))
                 .await?;
diff --git a/core/startos/src/registry/os/asset/sign.rs b/core/startos/src/registry/os/asset/sign.rs
index e19a82899..0cb657bef 100644
--- a/core/startos/src/registry/os/asset/sign.rs
+++ b/core/startos/src/registry/os/asset/sign.rs
@@ -17,25 +17,47 @@ use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
 use crate::registry::os::SIG_CONTEXT;
-use crate::registry::signer::{Blake3Ed25519Signature, Signature};
-use crate::util::Version;
+use crate::registry::signer::commitment::blake3::Blake3Commitment;
+use crate::registry::signer::sign::ed25519::Ed25519;
+use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::s9pk::merkle_archive::source::ArchiveSource;
+use crate::util::serde::Base64;
+use crate::util::VersionString;
 
 pub fn sign_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("iso", from_fn_async(sign_iso).no_cli())
-        .subcommand("img", from_fn_async(sign_img).no_cli())
-        .subcommand("squashfs", from_fn_async(sign_squashfs).no_cli())
+        .subcommand(
+            "iso",
+            from_fn_async(sign_iso)
+                .with_metadata("getSigner", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand(
+            "img",
+            from_fn_async(sign_img)
+                .with_metadata("getSigner", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand(
+            "squashfs",
+            from_fn_async(sign_squashfs)
+                .with_metadata("getSigner", Value::Bool(true))
+                .no_cli(),
+        )
 }
 
 #[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SignAssetParams {
-    #[ts(type = "string")]
-    version: Version,
+    version: VersionString,
     #[ts(type = "string")]
     platform: InternedString,
-    signature: Signature,
+    #[ts(skip)]
+    #[serde(rename = "__auth_signer")]
+    signer: AnyVerifyingKey,
+    signature: AnySignature,
 }
 
 async fn sign_asset(
@@ -43,22 +65,25 @@ async fn sign_asset(
     SignAssetParams {
         version,
         platform,
+        signer,
         signature,
     }: SignAssetParams,
-    accessor: impl FnOnce(&mut Model<OsVersionInfo>) -> &mut Model<BTreeMap<InternedString, RegistryAsset>>
+    accessor: impl FnOnce(
+            &mut Model<OsVersionInfo>,
+        ) -> &mut Model<BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>>
         + UnwindSafe
         + Send,
 ) -> Result<(), Error> {
     ctx.db
         .mutate(|db| {
-            let guid = db.as_index().as_signers().get_signer(&signature.signer())?;
+            let guid = db.as_index().as_signers().get_signer(&signer)?;
             if !db
                 .as_index()
                 .as_os()
                 .as_versions()
                 .as_idx(&version)
                 .or_not_found(&version)?
-                .as_signers()
+                .as_authorized()
                 .de()?
                 .contains(&guid)
             {
@@ -77,8 +102,16 @@ async fn sign_asset(
             )
             .as_idx_mut(&platform)
             .or_not_found(&platform)?
-            .as_signature_info_mut()
-            .mutate(|s| s.add_sig(&signature))?;
+            .mutate(|s| {
+                signer.scheme().verify_commitment(
+                    &signer,
+                    &s.commitment,
+                    SIG_CONTEXT,
+                    &signature,
+                )?;
+                s.signatures.insert(signer, signature);
+                Ok(())
+            })?;
 
             Ok(())
         })
@@ -104,7 +137,7 @@ pub struct CliSignAssetParams {
     #[arg(short = 'p', long = "platform")]
     pub platform: InternedString,
     #[arg(short = 'v', long = "version")]
-    pub version: Version,
+    pub version: VersionString,
     pub file: PathBuf,
 }
 
@@ -134,7 +167,7 @@ pub async fn cli_sign_asset(
         }
     };
 
-    let file = tokio::fs::File::open(&path).await?.into();
+    let file = MultiCursorFile::from(tokio::fs::File::open(&path).await?);
 
     let mut progress = FullProgressTracker::new();
     let progress_handle = progress.handle();
@@ -159,9 +192,16 @@ pub async fn cli_sign_asset(
     .into();
 
     sign_phase.start();
-    let blake3_sig =
-        Blake3Ed25519Signature::sign_file(ctx.developer_key()?, &file, SIG_CONTEXT).await?;
-    let signature = Signature::Blake3Ed25519(blake3_sig);
+    let blake3 = file.blake3_mmap().await?;
+    let size = file
+        .size()
+        .await
+        .ok_or_else(|| Error::new(eyre!("failed to read file metadata"), ErrorKind::Filesystem))?;
+    let commitment = Blake3Commitment {
+        hash: Base64(*blake3.as_bytes()),
+        size,
+    };
+    let signature = Ed25519.sign_commitment(ctx.developer_key()?, &commitment, SIG_CONTEXT)?;
     sign_phase.complete();
 
     index_phase.start();
diff --git a/core/startos/src/registry/os/index.rs b/core/startos/src/registry/os/index.rs
index 186a7e95e..3ee75bc6a 100644
--- a/core/startos/src/registry/os/index.rs
+++ b/core/startos/src/registry/os/index.rs
@@ -8,16 +8,16 @@ use ts_rs::TS;
 use crate::prelude::*;
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
-use crate::rpc_continuations::RequestGuid;
-use crate::util::Version;
+use crate::registry::signer::commitment::blake3::Blake3Commitment;
+use crate::rpc_continuations::Guid;
+use crate::util::VersionString;
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct OsIndex {
-    #[ts(as = "BTreeMap::<String, OsVersionInfo>")]
-    pub versions: BTreeMap<Version, OsVersionInfo>,
+    pub versions: BTreeMap<VersionString, OsVersionInfo>,
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
@@ -29,14 +29,13 @@ pub struct OsVersionInfo {
     pub release_notes: String,
     #[ts(type = "string")]
     pub source_version: VersionRange,
-    #[ts(type = "string[]")]
-    pub signers: BTreeSet<RequestGuid>,
-    #[ts(as = "BTreeMap::<String, RegistryAsset>")]
-    pub iso: BTreeMap<InternedString, RegistryAsset>, // platform (i.e. x86_64-nonfree) -> asset
-    #[ts(as = "BTreeMap::<String, RegistryAsset>")]
-    pub squashfs: BTreeMap<InternedString, RegistryAsset>, // platform (i.e. x86_64-nonfree) -> asset
-    #[ts(as = "BTreeMap::<String, RegistryAsset>")]
-    pub img: BTreeMap<InternedString, RegistryAsset>, // platform (i.e. raspberrypi) -> asset
+    pub authorized: BTreeSet<Guid>,
+    #[ts(as = "BTreeMap::<String, RegistryAsset::<Blake3Commitment>>")]
+    pub iso: BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>, // platform (i.e. x86_64-nonfree) -> asset
+    #[ts(as = "BTreeMap::<String, RegistryAsset::<Blake3Commitment>>")]
+    pub squashfs: BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>, // platform (i.e. x86_64-nonfree) -> asset
+    #[ts(as = "BTreeMap::<String, RegistryAsset::<Blake3Commitment>>")]
+    pub img: BTreeMap<InternedString, RegistryAsset<Blake3Commitment>>, // platform (i.e. raspberrypi) -> asset
 }
 
 pub async fn get_os_index(ctx: RegistryContext) -> Result<OsIndex, Error> {
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index 5af407c5c..5bf926e5e 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -11,9 +11,9 @@ use crate::context::CliContext;
 use crate::prelude::*;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
-use crate::registry::signer::SignerKey;
+use crate::registry::signer::sign::AnyVerifyingKey;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
-use crate::util::Version;
+use crate::util::VersionString;
 
 pub mod signer;
 
@@ -51,8 +51,7 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddVersionParams {
-    #[ts(type = "string")]
-    pub version: Version,
+    pub version: VersionString,
     pub headline: String,
     pub release_notes: String,
     #[ts(type = "string")]
@@ -60,7 +59,7 @@ pub struct AddVersionParams {
     #[arg(skip)]
     #[ts(skip)]
     #[serde(rename = "__auth_signer")]
-    pub signer: Option<SignerKey>,
+    pub signer: Option<AnyVerifyingKey>,
 }
 
 pub async fn add_version(
@@ -86,7 +85,7 @@ pub async fn add_version(
                     i.headline = headline;
                     i.release_notes = release_notes;
                     i.source_version = source_version;
-                    i.signers.extend(signer);
+                    i.authorized.extend(signer);
                     Ok(())
                 })
         })
@@ -98,8 +97,7 @@ pub async fn add_version(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct RemoveVersionParams {
-    #[ts(type = "string")]
-    pub version: Version,
+    pub version: VersionString,
 }
 
 pub async fn remove_version(
@@ -124,7 +122,7 @@ pub async fn remove_version(
 pub struct GetVersionParams {
     #[ts(type = "string | null")]
     #[arg(long = "src")]
-    pub source: Option<Version>,
+    pub source: Option<VersionString>,
     #[ts(type = "string | null")]
     #[arg(long = "target")]
     pub target: Option<VersionRange>,
@@ -133,7 +131,7 @@ pub struct GetVersionParams {
 pub async fn get_version(
     ctx: RegistryContext,
     GetVersionParams { source, target }: GetVersionParams,
-) -> Result<BTreeMap<Version, OsVersionInfo>, Error> {
+) -> Result<BTreeMap<VersionString, OsVersionInfo>, Error> {
     let target = target.unwrap_or(VersionRange::Any);
     ctx.db
         .peek()
@@ -153,7 +151,10 @@ pub async fn get_version(
         .collect()
 }
 
-pub fn display_version_info<T>(params: WithIoFormat<T>, info: BTreeMap<Version, OsVersionInfo>) {
+pub fn display_version_info<T>(
+    params: WithIoFormat<T>,
+    info: BTreeMap<VersionString, OsVersionInfo>,
+) {
     use prettytable::*;
 
     if let Some(format) = params.format {
diff --git a/core/startos/src/registry/os/version/signer.rs b/core/startos/src/registry/os/version/signer.rs
index 01173ad18..bb15860aa 100644
--- a/core/startos/src/registry/os/version/signer.rs
+++ b/core/startos/src/registry/os/version/signer.rs
@@ -10,9 +10,9 @@ use crate::prelude::*;
 use crate::registry::admin::display_signers;
 use crate::registry::context::RegistryContext;
 use crate::registry::signer::SignerInfo;
-use crate::rpc_continuations::RequestGuid;
+use crate::rpc_continuations::Guid;
 use crate::util::serde::HandlerExtSerde;
-use crate::util::Version;
+use crate::util::VersionString;
 
 pub fn signer_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -44,10 +44,8 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct VersionSignerParams {
-    #[ts(type = "string")]
-    pub version: Version,
-    #[ts(type = "string")]
-    pub signer: RequestGuid,
+    pub version: VersionString,
+    pub signer: Guid,
 }
 
 pub async fn add_version_signer(
@@ -67,7 +65,7 @@ pub async fn add_version_signer(
                 .as_versions_mut()
                 .as_idx_mut(&version)
                 .or_not_found(&version)?
-                .as_signers_mut()
+                .as_authorized_mut()
                 .mutate(|s| Ok(s.insert(signer)))?;
 
             Ok(())
@@ -87,7 +85,7 @@ pub async fn remove_version_signer(
                 .as_versions_mut()
                 .as_idx_mut(&version)
                 .or_not_found(&version)?
-                .as_signers_mut()
+                .as_authorized_mut()
                 .mutate(|s| Ok(s.remove(&signer)))?
             {
                 return Err(Error::new(
@@ -106,21 +104,20 @@ pub async fn remove_version_signer(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct ListVersionSignersParams {
-    #[ts(type = "string")]
-    pub version: Version,
+    pub version: VersionString,
 }
 
 pub async fn list_version_signers(
     ctx: RegistryContext,
     ListVersionSignersParams { version }: ListVersionSignersParams,
-) -> Result<BTreeMap<RequestGuid, SignerInfo>, Error> {
+) -> Result<BTreeMap<Guid, SignerInfo>, Error> {
     let db = ctx.db.peek().await;
     db.as_index()
         .as_os()
         .as_versions()
         .as_idx(&version)
         .or_not_found(&version)?
-        .as_signers()
+        .as_authorized()
         .de()?
         .into_iter()
         .filter_map(|guid| {
diff --git a/core/startos/src/registry/package/add.rs b/core/startos/src/registry/package/add.rs
new file mode 100644
index 000000000..6a1050b99
--- /dev/null
+++ b/core/startos/src/registry/package/add.rs
@@ -0,0 +1,170 @@
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use clap::Parser;
+use helpers::NonDetachingJoinHandle;
+use imbl_value::InternedString;
+use itertools::Itertools;
+use rpc_toolkit::HandlerArgs;
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+use url::Url;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::registry::context::RegistryContext;
+use crate::registry::package::index::PackageVersionInfo;
+use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
+use crate::registry::signer::sign::ed25519::Ed25519;
+use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
+use crate::s9pk::merkle_archive::source::http::HttpSource;
+use crate::s9pk::v2::SIG_CONTEXT;
+use crate::s9pk::S9pk;
+use crate::util::io::TrackingIO;
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct AddPackageParams {
+    #[ts(type = "string")]
+    pub url: Url,
+    #[ts(skip)]
+    #[serde(rename = "__auth_signer")]
+    pub uploader: AnyVerifyingKey,
+    pub commitment: MerkleArchiveCommitment,
+    pub signature: AnySignature,
+}
+
+pub async fn add_package(
+    ctx: RegistryContext,
+    AddPackageParams {
+        url,
+        uploader,
+        commitment,
+        signature,
+    }: AddPackageParams,
+) -> Result<(), Error> {
+    uploader
+        .scheme()
+        .verify_commitment(&uploader, &commitment, SIG_CONTEXT, &signature)?;
+    let peek = ctx.db.peek().await;
+    let uploader_guid = peek.as_index().as_signers().get_signer(&uploader)?;
+    let s9pk = S9pk::deserialize(
+        &Arc::new(HttpSource::new(ctx.client.clone(), url.clone()).await?),
+        Some(&commitment),
+        false,
+    )
+    .await?;
+
+    let manifest = s9pk.as_manifest();
+
+    let mut info = PackageVersionInfo::from_s9pk(&s9pk, url).await?;
+    if !info.s9pk.signatures.contains_key(&uploader) {
+        info.s9pk.signatures.insert(uploader.clone(), signature);
+    }
+
+    ctx.db
+        .mutate(|db| {
+            if db.as_admins().de()?.contains(&uploader_guid)
+                || db
+                    .as_index()
+                    .as_package()
+                    .as_packages()
+                    .as_idx(&manifest.id)
+                    .or_not_found(&manifest.id)?
+                    .as_authorized()
+                    .de()?
+                    .contains(&uploader_guid)
+            {
+                let package = db
+                    .as_index_mut()
+                    .as_package_mut()
+                    .as_packages_mut()
+                    .upsert(&manifest.id, || Ok(Default::default()))?;
+                package.as_versions_mut().insert(&manifest.version, &info)?;
+
+                Ok(())
+            } else {
+                Err(Error::new(eyre!("UNAUTHORIZED"), ErrorKind::Authorization))
+            }
+        })
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+pub struct CliAddPackageParams {
+    pub file: PathBuf,
+    pub url: Url,
+}
+
+pub async fn cli_add_package(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params: CliAddPackageParams { file, url },
+        ..
+    }: HandlerArgs<CliContext, CliAddPackageParams>,
+) -> Result<(), Error> {
+    let s9pk = S9pk::open(&file, None, false).await?;
+
+    let mut progress = FullProgressTracker::new();
+    let progress_handle = progress.handle();
+    let mut sign_phase = progress_handle.add_phase(InternedString::intern("Signing File"), Some(1));
+    let mut verify_phase =
+        progress_handle.add_phase(InternedString::intern("Verifying URL"), Some(100));
+    let mut index_phase = progress_handle.add_phase(
+        InternedString::intern("Adding File to Registry Index"),
+        Some(1),
+    );
+
+    let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
+        let mut bar = PhasedProgressBar::new(&format!("Adding {} to registry...", file.display()));
+        loop {
+            let snap = progress.snapshot();
+            bar.update(&snap);
+            if snap.overall.is_complete() {
+                break;
+            }
+            progress.changed().await
+        }
+    })
+    .into();
+
+    sign_phase.start();
+    let commitment = s9pk.as_archive().commitment().await?;
+    let signature = Ed25519.sign_commitment(ctx.developer_key()?, &commitment, SIG_CONTEXT)?;
+    sign_phase.complete();
+
+    verify_phase.start();
+    let mut src = S9pk::deserialize(
+        &Arc::new(HttpSource::new(ctx.client.clone(), url.clone()).await?),
+        Some(&commitment),
+        false,
+    )
+    .await?;
+    src.serialize(&mut TrackingIO::new(0, tokio::io::sink()), true)
+        .await?;
+    verify_phase.complete();
+
+    index_phase.start();
+    ctx.call_remote::<RegistryContext>(
+        &parent_method.into_iter().chain(method).join("."),
+        imbl_value::json!({
+            "url": &url,
+            "signature": signature,
+            "commitment": commitment,
+        }),
+    )
+    .await?;
+    index_phase.complete();
+
+    progress_handle.complete();
+
+    progress_task.await.with_kind(ErrorKind::Unknown)?;
+
+    Ok(())
+}
diff --git a/core/startos/src/registry/package/get.rs b/core/startos/src/registry/package/get.rs
new file mode 100644
index 000000000..835192361
--- /dev/null
+++ b/core/startos/src/registry/package/get.rs
@@ -0,0 +1,387 @@
+use std::collections::{BTreeMap, BTreeSet};
+
+use clap::{Parser, ValueEnum};
+use emver::{Version, VersionRange};
+use imbl_value::InternedString;
+use itertools::Itertools;
+use models::PackageId;
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::prelude::*;
+use crate::registry::context::RegistryContext;
+use crate::registry::device_info::DeviceInfo;
+use crate::registry::package::index::{PackageIndex, PackageVersionInfo};
+use crate::util::serde::{display_serializable, WithIoFormat};
+use crate::util::VersionString;
+
+#[derive(
+    Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS, ValueEnum,
+)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum PackageDetailLevel {
+    Short,
+    Full,
+}
+impl Default for PackageDetailLevel {
+    fn default() -> Self {
+        Self::Short
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct PackageInfoShort {
+    pub release_notes: String,
+}
+
+#[derive(Debug, Deserialize, Serialize, TS, Parser)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+#[ts(export)]
+pub struct GetPackageParams {
+    pub id: Option<PackageId>,
+    #[ts(type = "string | null")]
+    pub version: Option<VersionRange>,
+    #[ts(type = "string | null")]
+    pub source_version: Option<Version>,
+    #[ts(skip)]
+    #[arg(skip)]
+    #[serde(rename = "__device_info")]
+    pub device_info: Option<DeviceInfo>,
+    pub other_versions: Option<PackageDetailLevel>,
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetPackageResponse {
+    #[ts(type = "string[]")]
+    pub categories: BTreeSet<InternedString>,
+    pub best: BTreeMap<VersionString, PackageVersionInfo>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
+    pub other_versions: Option<BTreeMap<VersionString, PackageInfoShort>>,
+}
+impl GetPackageResponse {
+    pub fn tables(&self) -> Vec<prettytable::Table> {
+        use prettytable::*;
+
+        let mut res = Vec::with_capacity(self.best.len());
+
+        for (version, info) in &self.best {
+            let mut table = info.table(version);
+
+            let lesser_versions: BTreeMap<_, _> = self
+                .other_versions
+                .as_ref()
+                .into_iter()
+                .flatten()
+                .filter(|(v, _)| ***v < **version)
+                .collect();
+
+            if !lesser_versions.is_empty() {
+                table.add_row(row![bc => "OLDER VERSIONS"]);
+                table.add_row(row![bc => "VERSION", "RELEASE NOTES"]);
+                for (version, info) in lesser_versions {
+                    table.add_row(row![AsRef::<str>::as_ref(version), &info.release_notes]);
+                }
+            }
+
+            res.push(table);
+        }
+
+        res
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetPackageResponseFull {
+    #[ts(type = "string[]")]
+    pub categories: BTreeSet<InternedString>,
+    pub best: BTreeMap<VersionString, PackageVersionInfo>,
+    pub other_versions: BTreeMap<VersionString, PackageVersionInfo>,
+}
+impl GetPackageResponseFull {
+    pub fn tables(&self) -> Vec<prettytable::Table> {
+        let mut res = Vec::with_capacity(self.best.len());
+
+        let all: BTreeMap<_, _> = self.best.iter().chain(self.other_versions.iter()).collect();
+
+        for (version, info) in all {
+            res.push(info.table(version));
+        }
+
+        res
+    }
+}
+
+pub type GetPackagesResponse = BTreeMap<PackageId, GetPackageResponse>;
+pub type GetPackagesResponseFull = BTreeMap<PackageId, GetPackageResponseFull>;
+
+fn get_matching_models<'a>(
+    db: &'a Model<PackageIndex>,
+    GetPackageParams {
+        id,
+        version,
+        source_version,
+        device_info,
+        ..
+    }: &GetPackageParams,
+) -> Result<Vec<(PackageId, Version, &'a Model<PackageVersionInfo>)>, Error> {
+    if let Some(id) = id {
+        if let Some(pkg) = db.as_packages().as_idx(id) {
+            vec![(id.clone(), pkg)]
+        } else {
+            vec![]
+        }
+    } else {
+        db.as_packages().as_entries()?
+    }
+    .iter()
+    .map(|(k, v)| {
+        Ok(v.as_versions()
+            .as_entries()?
+            .into_iter()
+            .map(|(v, info)| {
+                Ok::<_, Error>(
+                    if version
+                        .as_ref()
+                        .map_or(true, |version| v.satisfies(version))
+                        && source_version.as_ref().map_or(Ok(true), |source_version| {
+                            Ok::<_, Error>(
+                                source_version.satisfies(
+                                    &info
+                                        .as_source_version()
+                                        .de()?
+                                        .unwrap_or(VersionRange::any()),
+                                ),
+                            )
+                        })?
+                        && device_info
+                            .as_ref()
+                            .map_or(Ok(true), |device_info| info.works_for_device(device_info))?
+                    {
+                        Some((k.clone(), Version::from(v), info))
+                    } else {
+                        None
+                    },
+                )
+            })
+            .flatten_ok())
+    })
+    .flatten_ok()
+    .map(|res| res.and_then(|a| a))
+    .collect()
+}
+
+pub async fn get_package(ctx: RegistryContext, params: GetPackageParams) -> Result<Value, Error> {
+    use patch_db::ModelExt;
+
+    let peek = ctx.db.peek().await;
+    let mut best: BTreeMap<PackageId, BTreeMap<VersionString, &Model<PackageVersionInfo>>> =
+        Default::default();
+    let mut other: BTreeMap<PackageId, BTreeMap<VersionString, &Model<PackageVersionInfo>>> =
+        Default::default();
+    for (id, version, info) in get_matching_models(&peek.as_index().as_package(), &params)? {
+        let mut package_best = best.remove(&id).unwrap_or_default();
+        let mut package_other = other.remove(&id).unwrap_or_default();
+        for worse_version in package_best
+            .keys()
+            .filter(|k| ***k < version)
+            .cloned()
+            .collect_vec()
+        {
+            if let Some(info) = package_best.remove(&worse_version) {
+                package_other.insert(worse_version, info);
+            }
+        }
+        if package_best.keys().all(|k| !(**k > version)) {
+            package_best.insert(version.into(), info);
+        }
+        best.insert(id.clone(), package_best);
+        if params.other_versions.is_some() {
+            other.insert(id.clone(), package_other);
+        }
+    }
+    if let Some(id) = params.id {
+        let categories = peek
+            .as_index()
+            .as_package()
+            .as_packages()
+            .as_idx(&id)
+            .map(|p| p.as_categories().de())
+            .transpose()?
+            .unwrap_or_default();
+        let best = best
+            .remove(&id)
+            .unwrap_or_default()
+            .into_iter()
+            .map(|(k, v)| v.de().map(|v| (k, v)))
+            .try_collect()?;
+        let other = other.remove(&id).unwrap_or_default();
+        match params.other_versions {
+            None => to_value(&GetPackageResponse {
+                categories,
+                best,
+                other_versions: None,
+            }),
+            Some(PackageDetailLevel::Short) => to_value(&GetPackageResponse {
+                categories,
+                best,
+                other_versions: Some(
+                    other
+                        .into_iter()
+                        .map(|(k, v)| from_value(v.as_value().clone()).map(|v| (k, v)))
+                        .try_collect()?,
+                ),
+            }),
+            Some(PackageDetailLevel::Full) => to_value(&GetPackageResponseFull {
+                categories,
+                best,
+                other_versions: other
+                    .into_iter()
+                    .map(|(k, v)| v.de().map(|v| (k, v)))
+                    .try_collect()?,
+            }),
+        }
+    } else {
+        match params.other_versions {
+            None => to_value(
+                &best
+                    .into_iter()
+                    .map(|(id, best)| {
+                        let categories = peek
+                            .as_index()
+                            .as_package()
+                            .as_packages()
+                            .as_idx(&id)
+                            .map(|p| p.as_categories().de())
+                            .transpose()?
+                            .unwrap_or_default();
+                        Ok::<_, Error>((
+                            id,
+                            GetPackageResponse {
+                                categories,
+                                best: best
+                                    .into_iter()
+                                    .map(|(k, v)| v.de().map(|v| (k, v)))
+                                    .try_collect()?,
+                                other_versions: None,
+                            },
+                        ))
+                    })
+                    .try_collect::<_, GetPackagesResponse, _>()?,
+            ),
+            Some(PackageDetailLevel::Short) => to_value(
+                &best
+                    .into_iter()
+                    .map(|(id, best)| {
+                        let categories = peek
+                            .as_index()
+                            .as_package()
+                            .as_packages()
+                            .as_idx(&id)
+                            .map(|p| p.as_categories().de())
+                            .transpose()?
+                            .unwrap_or_default();
+                        let other = other.remove(&id).unwrap_or_default();
+                        Ok::<_, Error>((
+                            id,
+                            GetPackageResponse {
+                                categories,
+                                best: best
+                                    .into_iter()
+                                    .map(|(k, v)| v.de().map(|v| (k, v)))
+                                    .try_collect()?,
+                                other_versions: Some(
+                                    other
+                                        .into_iter()
+                                        .map(|(k, v)| {
+                                            from_value(v.as_value().clone()).map(|v| (k, v))
+                                        })
+                                        .try_collect()?,
+                                ),
+                            },
+                        ))
+                    })
+                    .try_collect::<_, GetPackagesResponse, _>()?,
+            ),
+            Some(PackageDetailLevel::Full) => to_value(
+                &best
+                    .into_iter()
+                    .map(|(id, best)| {
+                        let categories = peek
+                            .as_index()
+                            .as_package()
+                            .as_packages()
+                            .as_idx(&id)
+                            .map(|p| p.as_categories().de())
+                            .transpose()?
+                            .unwrap_or_default();
+                        let other = other.remove(&id).unwrap_or_default();
+                        Ok::<_, Error>((
+                            id,
+                            GetPackageResponseFull {
+                                categories,
+                                best: best
+                                    .into_iter()
+                                    .map(|(k, v)| v.de().map(|v| (k, v)))
+                                    .try_collect()?,
+                                other_versions: other
+                                    .into_iter()
+                                    .map(|(k, v)| v.de().map(|v| (k, v)))
+                                    .try_collect()?,
+                            },
+                        ))
+                    })
+                    .try_collect::<_, GetPackagesResponseFull, _>()?,
+            ),
+        }
+    }
+}
+
+pub fn display_package_info(
+    params: WithIoFormat<GetPackageParams>,
+    info: Value,
+) -> Result<(), Error> {
+    if let Some(format) = params.format {
+        display_serializable(format, info);
+        return Ok(());
+    }
+
+    if let Some(_) = params.rest.id {
+        if params.rest.other_versions == Some(PackageDetailLevel::Full) {
+            for table in from_value::<GetPackageResponseFull>(info)?.tables() {
+                table.print_tty(false)?;
+                println!();
+            }
+        } else {
+            for table in from_value::<GetPackageResponse>(info)?.tables() {
+                table.print_tty(false)?;
+                println!();
+            }
+        }
+    } else {
+        if params.rest.other_versions == Some(PackageDetailLevel::Full) {
+            for (_, package) in from_value::<GetPackagesResponseFull>(info)? {
+                for table in package.tables() {
+                    table.print_tty(false)?;
+                    println!();
+                }
+            }
+        } else {
+            for (_, package) in from_value::<GetPackagesResponse>(info)? {
+                for table in package.tables() {
+                    table.print_tty(false)?;
+                    println!();
+                }
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/core/startos/src/registry/package/index.rs b/core/startos/src/registry/package/index.rs
new file mode 100644
index 000000000..0e6969fa5
--- /dev/null
+++ b/core/startos/src/registry/package/index.rs
@@ -0,0 +1,163 @@
+use std::collections::{BTreeMap, BTreeSet};
+
+use emver::{Version, VersionRange};
+use imbl_value::InternedString;
+use models::{DataUrl, PackageId, VersionString};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+use url::Url;
+
+use crate::prelude::*;
+use crate::registry::asset::RegistryAsset;
+use crate::registry::context::RegistryContext;
+use crate::registry::device_info::DeviceInfo;
+use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
+use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey};
+use crate::rpc_continuations::Guid;
+use crate::s9pk::git_hash::GitHash;
+use crate::s9pk::manifest::{Description, HardwareRequirements};
+use crate::s9pk::merkle_archive::source::FileSource;
+use crate::s9pk::S9pk;
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct PackageIndex {
+    #[ts(as = "BTreeMap::<String, Category>")]
+    pub categories: BTreeMap<InternedString, Category>,
+    pub packages: BTreeMap<PackageId, PackageInfo>,
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct PackageInfo {
+    pub authorized: BTreeSet<Guid>,
+    pub versions: BTreeMap<VersionString, PackageVersionInfo>,
+    #[ts(type = "string[]")]
+    pub categories: BTreeSet<InternedString>,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct Category {
+    pub name: String,
+    pub description: Description,
+}
+
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct PackageVersionInfo {
+    pub title: String,
+    pub icon: DataUrl<'static>,
+    pub description: Description,
+    pub release_notes: String,
+    #[ts(type = "string")]
+    pub git_hash: GitHash,
+    #[ts(type = "string")]
+    pub license: InternedString,
+    #[ts(type = "string")]
+    pub wrapper_repo: Url,
+    #[ts(type = "string")]
+    pub upstream_repo: Url,
+    #[ts(type = "string")]
+    pub support_site: Url,
+    #[ts(type = "string")]
+    pub marketing_site: Url,
+    pub os_version: VersionString,
+    pub hardware_requirements: HardwareRequirements,
+    #[ts(type = "string | null")]
+    pub source_version: Option<VersionRange>,
+    pub s9pk: RegistryAsset<MerkleArchiveCommitment>,
+}
+impl PackageVersionInfo {
+    pub async fn from_s9pk<S: FileSource + Clone>(s9pk: &S9pk<S>, url: Url) -> Result<Self, Error> {
+        let manifest = s9pk.as_manifest();
+        Ok(Self {
+            title: manifest.title.clone(),
+            icon: s9pk.icon_data_url().await?,
+            description: manifest.description.clone(),
+            release_notes: manifest.release_notes.clone(),
+            git_hash: manifest.git_hash.clone().or_not_found("git hash")?,
+            license: manifest.license.clone(),
+            wrapper_repo: manifest.wrapper_repo.clone(),
+            upstream_repo: manifest.upstream_repo.clone(),
+            support_site: manifest.support_site.clone(),
+            marketing_site: manifest.marketing_site.clone(),
+            os_version: manifest.os_version.clone(),
+            hardware_requirements: manifest.hardware_requirements.clone(),
+            source_version: None, // TODO
+            s9pk: RegistryAsset {
+                url,
+                commitment: s9pk.as_archive().commitment().await?,
+                signatures: [(
+                    AnyVerifyingKey::Ed25519(s9pk.as_archive().signer()),
+                    AnySignature::Ed25519(s9pk.as_archive().signature().await?),
+                )]
+                .into_iter()
+                .collect(),
+            },
+        })
+    }
+    pub fn table(&self, version: &VersionString) -> prettytable::Table {
+        use prettytable::*;
+
+        let mut table = Table::new();
+
+        table.add_row(row![bc => &self.title]);
+        table.add_row(row![br -> "VERSION", AsRef::<str>::as_ref(version)]);
+        table.add_row(row![br -> "RELEASE NOTES", &self.release_notes]);
+        table.add_row(row![br -> "ABOUT", &self.description.short]);
+        table.add_row(row![br -> "DESCRIPTION", &self.description.long]);
+        table.add_row(row![br -> "GIT HASH", AsRef::<str>::as_ref(&self.git_hash)]);
+        table.add_row(row![br -> "LICENSE", &self.license]);
+        table.add_row(row![br -> "PACKAGE REPO", &self.wrapper_repo.to_string()]);
+        table.add_row(row![br -> "SERVICE REPO", &self.upstream_repo.to_string()]);
+        table.add_row(row![br -> "WEBSITE", &self.marketing_site.to_string()]);
+        table.add_row(row![br -> "SUPPORT", &self.support_site.to_string()]);
+
+        table
+    }
+}
+impl Model<PackageVersionInfo> {
+    pub fn works_for_device(&self, device_info: &DeviceInfo) -> Result<bool, Error> {
+        if !self.as_os_version().de()?.satisfies(&device_info.os.compat) {
+            return Ok(false);
+        }
+        let hw = self.as_hardware_requirements().de()?;
+        if let Some(arch) = hw.arch {
+            if !arch.contains(&device_info.hardware.arch) {
+                return Ok(false);
+            }
+        }
+        if let Some(ram) = hw.ram {
+            if device_info.hardware.ram < ram {
+                return Ok(false);
+            }
+        }
+        for (class, regex) in hw.device {
+            if !device_info
+                .hardware
+                .devices
+                .get(&*class)
+                .unwrap_or(&Vec::new())
+                .iter()
+                .any(|product| regex.as_ref().is_match(product))
+            {
+                return Ok(false);
+            }
+        }
+
+        Ok(true)
+    }
+}
+
+pub async fn get_package_index(ctx: RegistryContext) -> Result<PackageIndex, Error> {
+    ctx.db.peek().await.into_index().into_package().de()
+}
diff --git a/core/startos/src/registry/package/mod.rs b/core/startos/src/registry/package/mod.rs
new file mode 100644
index 000000000..ac09afbb1
--- /dev/null
+++ b/core/startos/src/registry/package/mod.rs
@@ -0,0 +1,29 @@
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::util::serde::HandlerExtSerde;
+
+pub mod add;
+pub mod get;
+pub mod index;
+
+pub fn package_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "index",
+            from_fn_async(index::get_package_index)
+                .with_display_serializable()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand("add", from_fn_async(add::add_package).no_cli())
+        .subcommand("add", from_fn_async(add::cli_add_package).no_display())
+        .subcommand(
+            "get",
+            from_fn_async(get::get_package)
+                .with_display_serializable()
+                .with_custom_display_fn(|handle, result| {
+                    get::display_package_info(handle.params, result)
+                }),
+        )
+}
diff --git a/core/startos/src/registry/signer.rs b/core/startos/src/registry/signer.rs
deleted file mode 100644
index bf5374d75..000000000
--- a/core/startos/src/registry/signer.rs
+++ /dev/null
@@ -1,477 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::path::Path;
-use std::str::FromStr;
-
-use clap::builder::ValueParserFactory;
-use imbl_value::InternedString;
-use reqwest::Client;
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha512};
-use tokio::io::AsyncWrite;
-use ts_rs::TS;
-use url::Url;
-
-use crate::prelude::*;
-use crate::s9pk::merkle_archive::source::http::HttpSource;
-use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::s9pk::merkle_archive::source::{ArchiveSource, FileSource};
-use crate::util::clap::FromStrParser;
-use crate::util::serde::{Base64, Pem};
-
-#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
-#[serde(rename_all = "camelCase")]
-#[model = "Model<Self>"]
-#[ts(export)]
-pub struct SignerInfo {
-    pub name: String,
-    pub contact: Vec<ContactInfo>,
-    pub keys: HashSet<SignerKey>,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, Hash, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-#[serde(tag = "alg", content = "pubkey")]
-pub enum SignerKey {
-    Ed25519(Pem<ed25519_dalek::VerifyingKey>),
-}
-impl SignerKey {
-    pub fn verifier(&self) -> Verifier {
-        match self {
-            Self::Ed25519(k) => Verifier::Ed25519(*k, Sha512::new()),
-        }
-    }
-    pub fn verify_message(
-        &self,
-        message: &[u8],
-        signature: &[u8],
-        context: &str,
-    ) -> Result<(), Error> {
-        let mut v = self.verifier();
-        v.update(message);
-        v.verify(signature, context)
-    }
-}
-impl std::fmt::Display for SignerKey {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Ed25519(k) => write!(f, "{k}"),
-        }
-    }
-}
-
-pub enum Verifier {
-    Ed25519(Pem<ed25519_dalek::VerifyingKey>, Sha512),
-}
-impl Verifier {
-    pub fn update(&mut self, data: &[u8]) {
-        match self {
-            Self::Ed25519(_, h) => h.update(data),
-        }
-    }
-    pub fn verify(self, signature: &[u8], context: &str) -> Result<(), Error> {
-        match self {
-            Self::Ed25519(k, h) => k.verify_prehashed_strict(
-                h,
-                Some(context.as_bytes()),
-                &ed25519_dalek::Signature::from_slice(signature)?,
-            )?,
-        }
-        Ok(())
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-// TODO: better types
-pub enum ContactInfo {
-    Email(String),
-    Matrix(String),
-    Website(#[ts(type = "string")] Url),
-}
-impl std::fmt::Display for ContactInfo {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Email(e) => write!(f, "mailto:{e}"),
-            Self::Matrix(m) => write!(f, "https://matrix.to/#/{m}"),
-            Self::Website(w) => write!(f, "{w}"),
-        }
-    }
-}
-impl FromStr for ContactInfo {
-    type Err = Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(if let Some(s) = s.strip_prefix("mailto:") {
-            Self::Email(s.to_owned())
-        } else if let Some(s) = s.strip_prefix("https://matrix.to/#/") {
-            Self::Matrix(s.to_owned())
-        } else {
-            Self::Website(s.parse()?)
-        })
-    }
-}
-impl ValueParserFactory for ContactInfo {
-    type Parser = FromStrParser<Self>;
-    fn value_parser() -> Self::Parser {
-        Self::Parser::new()
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-#[ts(export)]
-pub struct SignatureInfo {
-    #[ts(type = "string")]
-    pub context: InternedString,
-    pub blake3_ed255i9: Option<Blake3Ed2551SignatureInfo>,
-}
-impl SignatureInfo {
-    pub fn new(context: &str) -> Self {
-        Self {
-            context: context.into(),
-            blake3_ed255i9: None,
-        }
-    }
-    pub fn validate(&self, accept: AcceptSigners) -> Result<FileValidator, Error> {
-        FileValidator::from_signatures(self.signatures(), accept, &self.context)
-    }
-    pub fn all_signers(&self) -> AcceptSigners {
-        AcceptSigners::All(
-            self.signatures()
-                .map(|s| AcceptSigners::Signer(s.signer()))
-                .collect(),
-        )
-        .flatten()
-    }
-    pub fn signatures(&self) -> impl Iterator<Item = Signature> + '_ {
-        self.blake3_ed255i9.iter().flat_map(|info| {
-            info.signatures
-                .iter()
-                .map(|(k, s)| (k.clone(), *s))
-                .map(|(pubkey, signature)| {
-                    Signature::Blake3Ed25519(Blake3Ed25519Signature {
-                        hash: info.hash,
-                        size: info.size,
-                        pubkey,
-                        signature,
-                    })
-                })
-        })
-    }
-    pub fn add_sig(&mut self, signature: &Signature) -> Result<(), Error> {
-        signature.validate(&self.context)?;
-        match signature {
-            Signature::Blake3Ed25519(s) => {
-                if self
-                    .blake3_ed255i9
-                    .as_ref()
-                    .map_or(true, |info| info.hash == s.hash)
-                {
-                    let new = if let Some(mut info) = self.blake3_ed255i9.take() {
-                        info.signatures.insert(s.pubkey, s.signature);
-                        info
-                    } else {
-                        s.info()
-                    };
-                    self.blake3_ed255i9 = Some(new);
-                    Ok(())
-                } else {
-                    Err(Error::new(
-                        eyre!("hash sum mismatch"),
-                        ErrorKind::InvalidSignature,
-                    ))
-                }
-            }
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-pub enum AcceptSigners {
-    #[serde(skip)]
-    Accepted(Signature),
-    Signer(SignerKey),
-    Any(Vec<AcceptSigners>),
-    All(Vec<AcceptSigners>),
-}
-impl AcceptSigners {
-    const fn null() -> Self {
-        Self::Any(Vec::new())
-    }
-    pub fn flatten(self) -> Self {
-        match self {
-            Self::Any(mut s) | Self::All(mut s) if s.len() == 1 => s.swap_remove(0).flatten(),
-            s => s,
-        }
-    }
-    pub fn accepted(&self) -> bool {
-        match self {
-            Self::Accepted(_) => true,
-            Self::All(s) => s.iter().all(|s| s.accepted()),
-            _ => false,
-        }
-    }
-    pub fn try_accept(
-        self,
-        context: &str,
-    ) -> Box<dyn Iterator<Item = Result<Signature, Error>> + Send + Sync + '_> {
-        match self {
-            Self::Accepted(s) => Box::new(std::iter::once(s).map(|s| {
-                s.validate(context)?;
-                Ok(s)
-            })),
-            Self::All(s) => Box::new(s.into_iter().flat_map(|s| s.try_accept(context))),
-            _ => Box::new(std::iter::once(Err(Error::new(
-                eyre!("signer(s) not accepted"),
-                ErrorKind::InvalidSignature,
-            )))),
-        }
-    }
-    pub fn process_signature(&mut self, sig: &Signature) {
-        let new = match std::mem::replace(self, Self::null()) {
-            Self::Accepted(s) => Self::Accepted(s),
-            Self::Signer(s) => {
-                if s == sig.signer() {
-                    Self::Accepted(sig.clone())
-                } else {
-                    Self::Signer(s)
-                }
-            }
-            Self::All(mut s) => {
-                s.iter_mut().for_each(|s| s.process_signature(sig));
-
-                Self::All(s)
-            }
-            Self::Any(mut s) => {
-                if let Some(s) = s
-                    .iter_mut()
-                    .map(|s| {
-                        s.process_signature(sig);
-                        s
-                    })
-                    .filter(|s| s.accepted())
-                    .next()
-                {
-                    std::mem::replace(s, Self::null())
-                } else {
-                    Self::Any(s)
-                }
-            }
-        };
-        *self = new;
-    }
-}
-
-#[must_use]
-pub struct FileValidator {
-    blake3: Option<blake3::Hash>,
-    size: Option<u64>,
-}
-impl FileValidator {
-    fn add_blake3(&mut self, hash: [u8; 32], size: u64) -> Result<(), Error> {
-        if let Some(h) = self.blake3 {
-            ensure_code!(h == hash, ErrorKind::InvalidSignature, "hash sum mismatch");
-        }
-        self.blake3 = Some(blake3::Hash::from_bytes(hash));
-        if let Some(s) = self.size {
-            ensure_code!(s == size, ErrorKind::InvalidSignature, "file size mismatch");
-        }
-        self.size = Some(size);
-        Ok(())
-    }
-    pub fn blake3(&self) -> Result<blake3::Hash, Error> {
-        if let Some(hash) = self.blake3 {
-            Ok(hash)
-        } else {
-            Err(Error::new(
-                eyre!("no BLAKE3 signatures found"),
-                ErrorKind::InvalidSignature,
-            ))
-        }
-    }
-    pub fn size(&self) -> Result<u64, Error> {
-        if let Some(size) = self.size {
-            Ok(size)
-        } else {
-            Err(Error::new(
-                eyre!("no signatures found"),
-                ErrorKind::InvalidSignature,
-            ))
-        }
-    }
-    pub fn from_signatures(
-        signatures: impl IntoIterator<Item = Signature>,
-        mut accept: AcceptSigners,
-        context: &str,
-    ) -> Result<Self, Error> {
-        let mut res = Self {
-            blake3: None,
-            size: None,
-        };
-        for signature in signatures {
-            accept.process_signature(&signature);
-        }
-        for signature in accept.try_accept(context) {
-            match signature? {
-                Signature::Blake3Ed25519(s) => res.add_blake3(*s.hash, s.size)?,
-            }
-        }
-
-        Ok(res)
-    }
-    pub async fn download(
-        &self,
-        url: Url,
-        client: Client,
-        dst: &mut (impl AsyncWrite + Unpin + Send + ?Sized),
-    ) -> Result<(), Error> {
-        let src = HttpSource::new(client, url).await?;
-        let (Some(hash), Some(size)) = (self.blake3, self.size) else {
-            return Err(Error::new(
-                eyre!("no BLAKE3 signatures found"),
-                ErrorKind::InvalidSignature,
-            ));
-        };
-        src.section(0, size)
-            .copy_verify(dst, Some((hash, size)))
-            .await?;
-
-        Ok(())
-    }
-    pub async fn validate_file(&self, file: &MultiCursorFile) -> Result<(), Error> {
-        ensure_code!(
-            file.size().await == Some(self.size()?),
-            ErrorKind::InvalidSignature,
-            "file size mismatch"
-        );
-        ensure_code!(
-            file.blake3_mmap().await? == self.blake3()?,
-            ErrorKind::InvalidSignature,
-            "hash sum mismatch"
-        );
-        Ok(())
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
-#[serde(rename_all = "camelCase")]
-#[model = "Model<Self>"]
-#[ts(export)]
-pub struct Blake3Ed2551SignatureInfo {
-    pub hash: Base64<[u8; 32]>,
-    pub size: u64,
-    pub signatures: HashMap<Pem<ed25519_dalek::VerifyingKey>, Base64<[u8; 64]>>,
-}
-impl Blake3Ed2551SignatureInfo {
-    pub fn validate(&self, context: &str) -> Result<Vec<Pem<ed25519_dalek::VerifyingKey>>, Error> {
-        self.signatures
-            .iter()
-            .map(|(k, s)| {
-                let sig = Blake3Ed25519Signature {
-                    hash: self.hash,
-                    size: self.size,
-                    pubkey: k.clone(),
-                    signature: *s,
-                };
-                sig.validate(context)?;
-                Ok(sig.pubkey)
-            })
-            .collect()
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-pub enum Signature {
-    Blake3Ed25519(Blake3Ed25519Signature),
-}
-impl Signature {
-    pub fn validate(&self, context: &str) -> Result<(), Error> {
-        match self {
-            Self::Blake3Ed25519(a) => a.validate(context),
-        }
-    }
-    pub fn signer(&self) -> SignerKey {
-        match self {
-            Self::Blake3Ed25519(s) => SignerKey::Ed25519(s.pubkey.clone()),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-pub struct Blake3Ed25519Signature {
-    pub hash: Base64<[u8; 32]>,
-    pub size: u64,
-    pub pubkey: Pem<ed25519_dalek::VerifyingKey>,
-    // ed25519-sig(sha512(blake3(file) + len_u64_be(file)))
-    pub signature: Base64<[u8; 64]>,
-}
-impl Blake3Ed25519Signature {
-    pub async fn sign_file(
-        key: &ed25519_dalek::SigningKey,
-        file: &MultiCursorFile,
-        context: &str,
-    ) -> Result<Self, Error> {
-        let size = file
-            .size()
-            .await
-            .ok_or_else(|| Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem))?;
-        let hash = file.blake3_mmap().await?;
-        let signature = key.sign_prehashed(
-            Sha512::new_with_prefix(hash.as_bytes()).chain_update(u64::to_be_bytes(size)),
-            Some(context.as_bytes()),
-        )?;
-        Ok(Self {
-            hash: Base64(*hash.as_bytes()),
-            size,
-            pubkey: Pem::new(key.verifying_key()),
-            signature: Base64(signature.to_bytes()),
-        })
-    }
-
-    pub fn validate(&self, context: &str) -> Result<(), Error> {
-        let sig = ed25519_dalek::Signature::from_bytes(&*self.signature);
-        self.pubkey.verify_prehashed_strict(
-            Sha512::new_with_prefix(*self.hash).chain_update(u64::to_be_bytes(self.size)),
-            Some(context.as_bytes()),
-            &sig,
-        )?;
-        Ok(())
-    }
-
-    pub async fn check_file(&self, file: &MultiCursorFile) -> Result<(), Error> {
-        let size = file
-            .size()
-            .await
-            .ok_or_else(|| Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem))?;
-        if self.size != size {
-            return Err(Error::new(
-                eyre!("incorrect file size: expected {} got {}", self.size, size),
-                ErrorKind::InvalidSignature,
-            ));
-        }
-        let hash = file.blake3_mmap().await?;
-        if &*self.hash != hash.as_bytes() {
-            return Err(Error::new(
-                eyre!("hash sum mismatch"),
-                ErrorKind::InvalidSignature,
-            ));
-        }
-        Ok(())
-    }
-
-    pub fn info(&self) -> Blake3Ed2551SignatureInfo {
-        Blake3Ed2551SignatureInfo {
-            hash: self.hash,
-            size: self.size,
-            signatures: [(self.pubkey, self.signature)].into_iter().collect(),
-        }
-    }
-}
diff --git a/core/startos/src/registry/signer/commitment/blake3.rs b/core/startos/src/registry/signer/commitment/blake3.rs
new file mode 100644
index 000000000..d99e68c16
--- /dev/null
+++ b/core/startos/src/registry/signer/commitment/blake3.rs
@@ -0,0 +1,50 @@
+use blake3::Hash;
+use digest::Update;
+use serde::{Deserialize, Serialize};
+use tokio::io::AsyncWrite;
+use ts_rs::TS;
+
+use crate::prelude::*;
+use crate::registry::signer::commitment::{Commitment, Digestable};
+use crate::s9pk::merkle_archive::hash::VerifyingWriter;
+use crate::s9pk::merkle_archive::source::ArchiveSource;
+use crate::util::io::{ParallelBlake3Writer, TrackingIO};
+use crate::util::serde::Base64;
+use crate::CAP_10_MiB;
+
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, PartialEq, Eq, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct Blake3Commitment {
+    pub hash: Base64<[u8; 32]>,
+    #[ts(type = "number")]
+    pub size: u64,
+}
+impl Digestable for Blake3Commitment {
+    fn update<D: Update>(&self, digest: &mut D) {
+        digest.update(&*self.hash);
+        digest.update(&u64::to_be_bytes(self.size));
+    }
+}
+impl<'a, Resource: ArchiveSource> Commitment<&'a Resource> for Blake3Commitment {
+    async fn create(resource: &'a Resource) -> Result<Self, Error> {
+        let mut hasher = TrackingIO::new(0, ParallelBlake3Writer::new(CAP_10_MiB));
+        resource.copy_all_to(&mut hasher).await?;
+        Ok(Self {
+            size: hasher.position(),
+            hash: Base64(*hasher.into_inner().finalize().await?.as_bytes()),
+        })
+    }
+    async fn copy_to<W: AsyncWrite + Unpin + Send>(
+        &self,
+        resource: &'a Resource,
+        writer: W,
+    ) -> Result<(), Error> {
+        let mut hasher =
+            VerifyingWriter::new(writer, Some((Hash::from_bytes(*self.hash), self.size)));
+        resource.copy_to(0, self.size, &mut hasher).await?;
+        hasher.verify().await?;
+        Ok(())
+    }
+}
diff --git a/core/startos/src/registry/signer/commitment/merkle_archive.rs b/core/startos/src/registry/signer/commitment/merkle_archive.rs
new file mode 100644
index 000000000..0b61734b4
--- /dev/null
+++ b/core/startos/src/registry/signer/commitment/merkle_archive.rs
@@ -0,0 +1,98 @@
+use digest::Update;
+use serde::{Deserialize, Serialize};
+use tokio::io::AsyncWrite;
+use ts_rs::TS;
+
+use crate::prelude::*;
+use crate::registry::signer::commitment::{Commitment, Digestable};
+use crate::s9pk::merkle_archive::source::FileSource;
+use crate::s9pk::merkle_archive::MerkleArchive;
+use crate::s9pk::S9pk;
+use crate::util::io::TrackingIO;
+use crate::util::serde::Base64;
+
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct MerkleArchiveCommitment {
+    pub root_sighash: Base64<[u8; 32]>,
+    #[ts(type = "number")]
+    pub root_maxsize: u64,
+}
+impl Digestable for MerkleArchiveCommitment {
+    fn update<D: Update>(&self, digest: &mut D) {
+        digest.update(&*self.root_sighash);
+        digest.update(&u64::to_be_bytes(self.root_maxsize));
+    }
+}
+impl<'a, S: FileSource + Clone> Commitment<&'a MerkleArchive<S>> for MerkleArchiveCommitment {
+    async fn create(resource: &'a MerkleArchive<S>) -> Result<Self, Error> {
+        resource.commitment().await
+    }
+    async fn check(&self, resource: &'a MerkleArchive<S>) -> Result<(), Error> {
+        let MerkleArchiveCommitment {
+            root_sighash,
+            root_maxsize,
+        } = resource.commitment().await?;
+        if root_sighash != self.root_sighash {
+            return Err(Error::new(
+                eyre!("merkle root mismatch"),
+                ErrorKind::InvalidSignature,
+            ));
+        }
+        if root_maxsize > self.root_maxsize {
+            return Err(Error::new(
+                eyre!("merkle root directory max size too large"),
+                ErrorKind::InvalidSignature,
+            ));
+        }
+        Ok(())
+    }
+    async fn copy_to<W: AsyncWrite + Unpin + Send>(
+        &self,
+        resource: &'a MerkleArchive<S>,
+        writer: W,
+    ) -> Result<(), Error> {
+        self.check(resource).await?;
+        resource
+            .serialize(&mut TrackingIO::new(0, writer), true)
+            .await
+    }
+}
+
+impl<'a, S: FileSource + Clone> Commitment<&'a S9pk<S>> for MerkleArchiveCommitment {
+    async fn create(resource: &'a S9pk<S>) -> Result<Self, Error> {
+        resource.as_archive().commitment().await
+    }
+    async fn check(&self, resource: &'a S9pk<S>) -> Result<(), Error> {
+        let MerkleArchiveCommitment {
+            root_sighash,
+            root_maxsize,
+        } = resource.as_archive().commitment().await?;
+        if root_sighash != self.root_sighash {
+            return Err(Error::new(
+                eyre!("merkle root mismatch"),
+                ErrorKind::InvalidSignature,
+            ));
+        }
+        if root_maxsize > self.root_maxsize {
+            return Err(Error::new(
+                eyre!("merkle root directory max size too large"),
+                ErrorKind::InvalidSignature,
+            ));
+        }
+        Ok(())
+    }
+    async fn copy_to<W: AsyncWrite + Unpin + Send>(
+        &self,
+        resource: &'a S9pk<S>,
+        writer: W,
+    ) -> Result<(), Error> {
+        self.check(resource).await?;
+        resource
+            .clone()
+            .serialize(&mut TrackingIO::new(0, writer), true)
+            .await
+    }
+}
diff --git a/core/startos/src/registry/signer/commitment/mod.rs b/core/startos/src/registry/signer/commitment/mod.rs
new file mode 100644
index 000000000..b85e02a4e
--- /dev/null
+++ b/core/startos/src/registry/signer/commitment/mod.rs
@@ -0,0 +1,25 @@
+use digest::Update;
+use futures::Future;
+use tokio::io::AsyncWrite;
+
+use crate::prelude::*;
+
+pub mod blake3;
+pub mod merkle_archive;
+pub mod request;
+
+pub trait Digestable {
+    fn update<D: Update>(&self, digest: &mut D);
+}
+
+pub trait Commitment<Resource>: Sized + Digestable {
+    fn create(resource: Resource) -> impl Future<Output = Result<Self, Error>> + Send;
+    fn copy_to<W: AsyncWrite + Unpin + Send>(
+        &self,
+        resource: Resource,
+        writer: W,
+    ) -> impl Future<Output = Result<(), Error>> + Send;
+    fn check(&self, resource: Resource) -> impl Future<Output = Result<(), Error>> + Send {
+        self.copy_to(resource, tokio::io::sink())
+    }
+}
diff --git a/core/startos/src/registry/signer/commitment/request.rs b/core/startos/src/registry/signer/commitment/request.rs
new file mode 100644
index 000000000..62d59163f
--- /dev/null
+++ b/core/startos/src/registry/signer/commitment/request.rs
@@ -0,0 +1,102 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+use std::collections::BTreeMap;
+
+use axum::body::Body;
+use axum::extract::Request;
+use digest::Update;
+use futures::TryStreamExt;
+use serde::{Deserialize, Serialize};
+use tokio::io::AsyncWrite;
+use tokio_util::io::StreamReader;
+use ts_rs::TS;
+use url::Url;
+
+use crate::prelude::*;
+use crate::registry::signer::commitment::{Commitment, Digestable};
+use crate::s9pk::merkle_archive::hash::VerifyingWriter;
+use crate::util::serde::Base64;
+
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, PartialEq, Eq, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct RequestCommitment {
+    #[ts(type = "number")]
+    pub timestamp: i64,
+    #[ts(type = "number")]
+    pub nonce: u64,
+    #[ts(type = "number")]
+    pub size: u64,
+    pub blake3: Base64<[u8; 32]>,
+}
+impl RequestCommitment {
+    pub fn append_query(&self, url: &mut Url) {
+        url.query_pairs_mut()
+            .append_pair("timestamp", &self.timestamp.to_string())
+            .append_pair("nonce", &self.nonce.to_string())
+            .append_pair("size", &self.size.to_string())
+            .append_pair("blake3", &self.blake3.to_string());
+    }
+    pub fn from_query(url: &Url) -> Result<Self, Error> {
+        let query: BTreeMap<_, _> = url.query_pairs().collect();
+        Ok(Self {
+            timestamp: query.get("timestamp").or_not_found("timestamp")?.parse()?,
+            nonce: query.get("nonce").or_not_found("nonce")?.parse()?,
+            size: query.get("size").or_not_found("size")?.parse()?,
+            blake3: query.get("blake3").or_not_found("blake3")?.parse()?,
+        })
+    }
+}
+impl Digestable for RequestCommitment {
+    fn update<D: Update>(&self, digest: &mut D) {
+        digest.update(&i64::to_be_bytes(self.timestamp));
+        digest.update(&u64::to_be_bytes(self.nonce));
+        digest.update(&u64::to_be_bytes(self.size));
+        digest.update(&*self.blake3);
+    }
+}
+impl<'a> Commitment<&'a mut Request> for RequestCommitment {
+    async fn create(resource: &'a mut Request) -> Result<Self, Error> {
+        use http_body_util::BodyExt;
+
+        let body = std::mem::replace(resource.body_mut(), Body::empty())
+            .collect()
+            .await
+            .with_kind(ErrorKind::Network)?
+            .to_bytes();
+        let res = Self {
+            timestamp: SystemTime::now()
+                .duration_since(UNIX_EPOCH)
+                .map(|d| d.as_secs() as i64)
+                .unwrap_or_else(|e| e.duration().as_secs() as i64 * -1),
+            nonce: rand::random(),
+            size: body.len() as u64,
+            blake3: Base64(*blake3::hash(&*body).as_bytes()),
+        };
+        *resource.body_mut() = Body::from(body);
+        Ok(res)
+    }
+    async fn copy_to<W: AsyncWrite + Unpin + Send>(
+        &self,
+        resource: &'a mut Request,
+        writer: W,
+    ) -> Result<(), Error> {
+        use tokio::io::AsyncReadExt;
+
+        let mut body = StreamReader::new(
+            std::mem::replace(resource.body_mut(), Body::empty())
+                .into_data_stream()
+                .map_err(std::io::Error::other),
+        )
+        .take(self.size);
+
+        let mut writer = VerifyingWriter::new(
+            writer,
+            Some((blake3::Hash::from_bytes(*self.blake3), self.size)),
+        );
+        tokio::io::copy(&mut body, &mut writer).await?;
+        writer.verify().await?;
+
+        Ok(())
+    }
+}
diff --git a/core/startos/src/registry/signer/mod.rs b/core/startos/src/registry/signer/mod.rs
new file mode 100644
index 000000000..99b23b88e
--- /dev/null
+++ b/core/startos/src/registry/signer/mod.rs
@@ -0,0 +1,154 @@
+use std::collections::HashSet;
+use std::str::FromStr;
+
+use clap::builder::ValueParserFactory;
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+use url::Url;
+
+use crate::prelude::*;
+use crate::registry::signer::commitment::Digestable;
+use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
+use crate::util::clap::FromStrParser;
+
+pub mod commitment;
+pub mod sign;
+
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct SignerInfo {
+    pub name: String,
+    pub contact: Vec<ContactInfo>,
+    pub keys: HashSet<AnyVerifyingKey>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+// TODO: better types
+pub enum ContactInfo {
+    Email(String),
+    Matrix(String),
+    Website(#[ts(type = "string")] Url),
+}
+impl std::fmt::Display for ContactInfo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Email(e) => write!(f, "mailto:{e}"),
+            Self::Matrix(m) => write!(f, "https://matrix.to/#/{m}"),
+            Self::Website(w) => write!(f, "{w}"),
+        }
+    }
+}
+impl FromStr for ContactInfo {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(if let Some(s) = s.strip_prefix("mailto:") {
+            Self::Email(s.to_owned())
+        } else if let Some(s) = s.strip_prefix("https://matrix.to/#/") {
+            Self::Matrix(s.to_owned())
+        } else {
+            Self::Website(s.parse()?)
+        })
+    }
+}
+impl ValueParserFactory for ContactInfo {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum AcceptSigners {
+    #[serde(skip)]
+    Accepted,
+    Signer(AnyVerifyingKey),
+    Any(Vec<AcceptSigners>),
+    All(Vec<AcceptSigners>),
+}
+impl AcceptSigners {
+    const fn null() -> Self {
+        Self::Any(Vec::new())
+    }
+    pub fn flatten(self) -> Self {
+        match self {
+            Self::Any(mut s) | Self::All(mut s) if s.len() == 1 => s.swap_remove(0).flatten(),
+            s => s,
+        }
+    }
+    pub fn accepted(&self) -> bool {
+        match self {
+            Self::Accepted => true,
+            _ => false,
+        }
+    }
+    pub fn try_accept(self) -> Result<(), Error> {
+        if self.accepted() {
+            Ok(())
+        } else {
+            Err(Error::new(
+                eyre!("signer(s) not accepted"),
+                ErrorKind::InvalidSignature,
+            ))
+        }
+    }
+    pub fn process_signature(
+        &mut self,
+        signer: &AnyVerifyingKey,
+        commitment: &impl Digestable,
+        context: &str,
+        signature: &AnySignature,
+    ) -> Result<(), Error> {
+        let mut res = Ok(());
+        let new = match std::mem::replace(self, Self::null()) {
+            Self::Accepted => Self::Accepted,
+            Self::Signer(s) => {
+                if &s == signer {
+                    res = signer
+                        .scheme()
+                        .verify_commitment(signer, commitment, context, signature);
+                    Self::Accepted
+                } else {
+                    Self::Signer(s)
+                }
+            }
+            Self::All(mut s) => {
+                res = s
+                    .iter_mut()
+                    .map(|s| s.process_signature(signer, commitment, context, signature))
+                    .collect();
+                if s.iter().all(|s| s.accepted()) {
+                    Self::Accepted
+                } else {
+                    Self::All(s)
+                }
+            }
+            Self::Any(mut s) => {
+                match s
+                    .iter_mut()
+                    .map(|s| {
+                        s.process_signature(signer, commitment, context, signature)?;
+                        Ok(s)
+                    })
+                    .filter_ok(|s| s.accepted())
+                    .next()
+                {
+                    Some(Ok(s)) => std::mem::replace(s, Self::null()),
+                    Some(Err(e)) => {
+                        res = Err(e);
+                        Self::Any(s)
+                    }
+                    None => Self::Any(s),
+                }
+            }
+        };
+        *self = new;
+        res
+    }
+}
diff --git a/core/startos/src/registry/signer/sign/ed25519.rs b/core/startos/src/registry/signer/sign/ed25519.rs
new file mode 100644
index 000000000..3ec4c136e
--- /dev/null
+++ b/core/startos/src/registry/signer/sign/ed25519.rs
@@ -0,0 +1,34 @@
+use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
+use sha2::Sha512;
+
+use crate::prelude::*;
+use crate::registry::signer::sign::SignatureScheme;
+
+pub struct Ed25519;
+impl SignatureScheme for Ed25519 {
+    type SigningKey = SigningKey;
+    type VerifyingKey = VerifyingKey;
+    type Signature = Signature;
+    type Digest = Sha512;
+    fn new_digest(&self) -> Self::Digest {
+        <Self::Digest as digest::Digest>::new()
+    }
+    fn sign(
+        &self,
+        key: &Self::SigningKey,
+        digest: Self::Digest,
+        context: &str,
+    ) -> Result<Self::Signature, Error> {
+        Ok(key.sign_prehashed(digest, Some(context.as_bytes()))?)
+    }
+    fn verify(
+        &self,
+        key: &Self::VerifyingKey,
+        digest: Self::Digest,
+        context: &str,
+        signature: &Self::Signature,
+    ) -> Result<(), Error> {
+        key.verify_prehashed_strict(digest, Some(context.as_bytes()), signature)?;
+        Ok(())
+    }
+}
diff --git a/core/startos/src/registry/signer/sign/mod.rs b/core/startos/src/registry/signer/sign/mod.rs
new file mode 100644
index 000000000..50576a198
--- /dev/null
+++ b/core/startos/src/registry/signer/sign/mod.rs
@@ -0,0 +1,348 @@
+use std::fmt::Display;
+use std::str::FromStr;
+
+use ::ed25519::pkcs8::BitStringRef;
+use clap::builder::ValueParserFactory;
+use der::referenced::OwnedToRef;
+use der::{Decode, Encode};
+use pkcs8::der::AnyRef;
+use pkcs8::{PrivateKeyInfo, SubjectPublicKeyInfo};
+use serde::{Deserialize, Serialize};
+use sha2::Sha512;
+use ts_rs::TS;
+
+use crate::prelude::*;
+use crate::registry::signer::commitment::Digestable;
+use crate::registry::signer::sign::ed25519::Ed25519;
+use crate::util::clap::FromStrParser;
+use crate::util::serde::{deserialize_from_str, serialize_display};
+
+pub mod ed25519;
+
+pub trait SignatureScheme {
+    type SigningKey;
+    type VerifyingKey;
+    type Signature;
+    type Digest: digest::Update;
+    fn new_digest(&self) -> Self::Digest;
+    fn sign(
+        &self,
+        key: &Self::SigningKey,
+        digest: Self::Digest,
+        context: &str,
+    ) -> Result<Self::Signature, Error>;
+    fn sign_commitment<C: Digestable>(
+        &self,
+        key: &Self::SigningKey,
+        commitment: &C,
+        context: &str,
+    ) -> Result<Self::Signature, Error> {
+        let mut digest = self.new_digest();
+        commitment.update(&mut digest);
+        self.sign(key, digest, context)
+    }
+    fn verify(
+        &self,
+        key: &Self::VerifyingKey,
+        digest: Self::Digest,
+        context: &str,
+        signature: &Self::Signature,
+    ) -> Result<(), Error>;
+    fn verify_commitment<C: Digestable>(
+        &self,
+        key: &Self::VerifyingKey,
+        commitment: &C,
+        context: &str,
+        signature: &Self::Signature,
+    ) -> Result<(), Error> {
+        let mut digest = self.new_digest();
+        commitment.update(&mut digest);
+        self.verify(key, digest, context, signature)
+    }
+}
+
+pub enum AnyScheme {
+    Ed25519(Ed25519),
+}
+impl From<Ed25519> for AnyScheme {
+    fn from(value: Ed25519) -> Self {
+        Self::Ed25519(value)
+    }
+}
+impl SignatureScheme for AnyScheme {
+    type SigningKey = AnySigningKey;
+    type VerifyingKey = AnyVerifyingKey;
+    type Signature = AnySignature;
+    type Digest = AnyDigest;
+    fn new_digest(&self) -> Self::Digest {
+        match self {
+            Self::Ed25519(s) => AnyDigest::Sha512(s.new_digest()),
+        }
+    }
+    fn sign(
+        &self,
+        key: &Self::SigningKey,
+        digest: Self::Digest,
+        context: &str,
+    ) -> Result<Self::Signature, Error> {
+        match (self, key, digest) {
+            (Self::Ed25519(s), AnySigningKey::Ed25519(key), AnyDigest::Sha512(digest)) => {
+                Ok(AnySignature::Ed25519(s.sign(key, digest, context)?))
+            }
+            _ => Err(Error::new(
+                eyre!("mismatched signature algorithm"),
+                ErrorKind::InvalidSignature,
+            )),
+        }
+    }
+    fn verify(
+        &self,
+        key: &Self::VerifyingKey,
+        digest: Self::Digest,
+        context: &str,
+        signature: &Self::Signature,
+    ) -> Result<(), Error> {
+        match (self, key, digest, signature) {
+            (
+                Self::Ed25519(s),
+                AnyVerifyingKey::Ed25519(key),
+                AnyDigest::Sha512(digest),
+                AnySignature::Ed25519(signature),
+            ) => s.verify(key, digest, context, signature),
+            _ => Err(Error::new(
+                eyre!("mismatched signature algorithm"),
+                ErrorKind::InvalidSignature,
+            )),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, TS)]
+#[ts(export, type = "string")]
+pub enum AnySigningKey {
+    Ed25519(<Ed25519 as SignatureScheme>::SigningKey),
+}
+impl AnySigningKey {
+    pub fn scheme(&self) -> AnyScheme {
+        match self {
+            Self::Ed25519(_) => AnyScheme::Ed25519(Ed25519),
+        }
+    }
+    pub fn verifying_key(&self) -> AnyVerifyingKey {
+        match self {
+            Self::Ed25519(k) => AnyVerifyingKey::Ed25519(k.into()),
+        }
+    }
+}
+impl<'a> TryFrom<PrivateKeyInfo<'a>> for AnySigningKey {
+    type Error = pkcs8::Error;
+    fn try_from(value: PrivateKeyInfo<'a>) -> Result<Self, Self::Error> {
+        if value.algorithm == ed25519_dalek::pkcs8::ALGORITHM_ID {
+            Ok(Self::Ed25519(ed25519_dalek::SigningKey::try_from(value)?))
+        } else {
+            Err(pkcs8::spki::Error::OidUnknown {
+                oid: value.algorithm.oid,
+            }
+            .into())
+        }
+    }
+}
+impl pkcs8::EncodePrivateKey for AnySigningKey {
+    fn to_pkcs8_der(&self) -> pkcs8::Result<pkcs8::SecretDocument> {
+        match self {
+            Self::Ed25519(s) => s.to_pkcs8_der(),
+        }
+    }
+}
+impl FromStr for AnySigningKey {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use pkcs8::DecodePrivateKey;
+        Self::from_pkcs8_pem(s).with_kind(ErrorKind::Deserialization)
+    }
+}
+impl Display for AnySigningKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use pkcs8::EncodePrivateKey;
+        f.write_str(
+            &self
+                .to_pkcs8_pem(pkcs8::LineEnding::LF)
+                .map_err(|_| std::fmt::Error)?,
+        )
+    }
+}
+impl<'de> Deserialize<'de> for AnySigningKey {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        deserialize_from_str(deserializer)
+    }
+}
+impl Serialize for AnySigningKey {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serialize_display(self, serializer)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, TS)]
+#[ts(export, type = "string")]
+pub enum AnyVerifyingKey {
+    Ed25519(<Ed25519 as SignatureScheme>::VerifyingKey),
+}
+impl AnyVerifyingKey {
+    pub fn scheme(&self) -> AnyScheme {
+        match self {
+            Self::Ed25519(_) => AnyScheme::Ed25519(Ed25519),
+        }
+    }
+}
+impl<'a> TryFrom<SubjectPublicKeyInfo<AnyRef<'a>, BitStringRef<'a>>> for AnyVerifyingKey {
+    type Error = pkcs8::spki::Error;
+    fn try_from(
+        value: SubjectPublicKeyInfo<AnyRef<'a>, BitStringRef<'a>>,
+    ) -> Result<Self, Self::Error> {
+        if value.algorithm == ed25519_dalek::pkcs8::ALGORITHM_ID {
+            Ok(Self::Ed25519(ed25519_dalek::VerifyingKey::try_from(value)?))
+        } else {
+            Err(pkcs8::spki::Error::OidUnknown {
+                oid: value.algorithm.oid,
+            })
+        }
+    }
+}
+impl pkcs8::EncodePublicKey for AnyVerifyingKey {
+    fn to_public_key_der(&self) -> pkcs8::spki::Result<pkcs8::Document> {
+        match self {
+            Self::Ed25519(s) => s.to_public_key_der(),
+        }
+    }
+}
+impl FromStr for AnyVerifyingKey {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use pkcs8::DecodePublicKey;
+        Self::from_public_key_pem(s).with_kind(ErrorKind::Deserialization)
+    }
+}
+impl Display for AnyVerifyingKey {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use pkcs8::EncodePublicKey;
+        f.write_str(
+            &self
+                .to_public_key_pem(pkcs8::LineEnding::LF)
+                .map_err(|_| std::fmt::Error)?,
+        )
+    }
+}
+impl<'de> Deserialize<'de> for AnyVerifyingKey {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        deserialize_from_str(deserializer)
+    }
+}
+impl Serialize for AnyVerifyingKey {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serialize_display(self, serializer)
+    }
+}
+impl ValueParserFactory for AnyVerifyingKey {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
+
+#[derive(Clone, Debug)]
+pub enum AnyDigest {
+    Sha512(Sha512),
+}
+impl digest::Update for AnyDigest {
+    fn update(&mut self, data: &[u8]) {
+        match self {
+            Self::Sha512(d) => digest::Update::update(d, data),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, TS)]
+#[ts(export, type = "string")]
+pub enum AnySignature {
+    Ed25519(<Ed25519 as SignatureScheme>::Signature),
+}
+impl FromStr for AnySignature {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use der::DecodePem;
+
+        #[derive(der::Sequence)]
+        struct AnySignatureDer {
+            alg: pkcs8::spki::AlgorithmIdentifierOwned,
+            sig: der::asn1::OctetString,
+        }
+        impl der::pem::PemLabel for AnySignatureDer {
+            const PEM_LABEL: &'static str = "SIGNATURE";
+        }
+
+        let der = AnySignatureDer::from_pem(s.as_bytes()).with_kind(ErrorKind::Deserialization)?;
+        if der.alg.oid == ed25519_dalek::pkcs8::ALGORITHM_ID.oid
+            && der.alg.parameters.owned_to_ref() == ed25519_dalek::pkcs8::ALGORITHM_ID.parameters
+        {
+            Ok(Self::Ed25519(
+                ed25519_dalek::Signature::from_slice(der.sig.as_bytes())
+                    .with_kind(ErrorKind::Deserialization)?,
+            ))
+        } else {
+            Err(pkcs8::spki::Error::OidUnknown { oid: der.alg.oid })
+                .with_kind(ErrorKind::Deserialization)
+        }
+    }
+}
+impl Display for AnySignature {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use der::EncodePem;
+
+        #[derive(der::Sequence)]
+        struct AnySignatureDer<'a> {
+            alg: pkcs8::AlgorithmIdentifierRef<'a>,
+            sig: der::asn1::OctetString,
+        }
+        impl<'a> der::pem::PemLabel for AnySignatureDer<'a> {
+            const PEM_LABEL: &'static str = "SIGNATURE";
+        }
+        f.write_str(
+            &match self {
+                Self::Ed25519(s) => AnySignatureDer {
+                    alg: ed25519_dalek::pkcs8::ALGORITHM_ID,
+                    sig: der::asn1::OctetString::new(s.to_bytes()).map_err(|_| std::fmt::Error)?,
+                },
+            }
+            .to_pem(der::pem::LineEnding::LF)
+            .map_err(|_| std::fmt::Error)?,
+        )
+    }
+}
+impl<'de> Deserialize<'de> for AnySignature {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        deserialize_from_str(deserializer)
+    }
+}
+impl Serialize for AnySignature {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serialize_display(self, serializer)
+    }
+}
diff --git a/core/startos/src/rpc_continuations.rs b/core/startos/src/rpc_continuations.rs
index 04b88ea8e..ce8bf43fd 100644
--- a/core/startos/src/rpc_continuations.rs
+++ b/core/startos/src/rpc_continuations.rs
@@ -10,20 +10,24 @@ use futures::future::BoxFuture;
 use helpers::TimedResource;
 use imbl_value::InternedString;
 use tokio::sync::Mutex;
+use ts_rs::TS;
 
 #[allow(unused_imports)]
 use crate::prelude::*;
 use crate::util::clap::FromStrParser;
 use crate::util::new_guid;
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
-pub struct RequestGuid(InternedString);
-impl RequestGuid {
+#[derive(
+    Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, TS,
+)]
+#[ts(type = "string")]
+pub struct Guid(InternedString);
+impl Guid {
     pub fn new() -> Self {
         Self(new_guid())
     }
 
-    pub fn from(r: &str) -> Option<RequestGuid> {
+    pub fn from(r: &str) -> Option<Guid> {
         if r.len() != 32 {
             return None;
         }
@@ -32,21 +36,21 @@ impl RequestGuid {
                 return None;
             }
         }
-        Some(RequestGuid(InternedString::intern(r)))
+        Some(Guid(InternedString::intern(r)))
     }
 }
-impl AsRef<str> for RequestGuid {
+impl AsRef<str> for Guid {
     fn as_ref(&self) -> &str {
         self.0.as_ref()
     }
 }
-impl FromStr for RequestGuid {
+impl FromStr for Guid {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         Self::from(s).ok_or_else(|| Error::new(eyre!("invalid guid"), ErrorKind::Deserialization))
     }
 }
-impl ValueParserFactory for RequestGuid {
+impl ValueParserFactory for Guid {
     type Parser = FromStrParser<Self>;
     fn value_parser() -> Self::Parser {
         Self::Parser::new()
@@ -55,13 +59,10 @@ impl ValueParserFactory for RequestGuid {
 
 #[test]
 fn parse_guid() {
-    println!(
-        "{:?}",
-        RequestGuid::from(&format!("{}", RequestGuid::new()))
-    )
+    println!("{:?}", Guid::from(&format!("{}", Guid::new())))
 }
 
-impl std::fmt::Display for RequestGuid {
+impl std::fmt::Display for Guid {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.0.fmt(f)
     }
@@ -91,7 +92,7 @@ impl RpcContinuation {
     }
 }
 
-pub struct RpcContinuations(Mutex<BTreeMap<RequestGuid, RpcContinuation>>);
+pub struct RpcContinuations(Mutex<BTreeMap<Guid, RpcContinuation>>);
 impl RpcContinuations {
     pub fn new() -> Self {
         RpcContinuations(Mutex::new(BTreeMap::new()))
@@ -112,12 +113,12 @@ impl RpcContinuations {
     }
 
     #[instrument(skip_all)]
-    pub async fn add(&self, guid: RequestGuid, handler: RpcContinuation) {
+    pub async fn add(&self, guid: Guid, handler: RpcContinuation) {
         self.clean().await;
         self.0.lock().await.insert(guid, handler);
     }
 
-    pub async fn get_ws_handler(&self, guid: &RequestGuid) -> Option<WebSocketHandler> {
+    pub async fn get_ws_handler(&self, guid: &Guid) -> Option<WebSocketHandler> {
         let mut continuations = self.0.lock().await;
         if !matches!(continuations.get(guid), Some(RpcContinuation::WebSocket(_))) {
             return None;
@@ -128,8 +129,8 @@ impl RpcContinuations {
         x.get().await
     }
 
-    pub async fn get_rest_handler(&self, guid: &RequestGuid) -> Option<RestHandler> {
-        let mut continuations: tokio::sync::MutexGuard<'_, BTreeMap<RequestGuid, RpcContinuation>> =
+    pub async fn get_rest_handler(&self, guid: &Guid) -> Option<RestHandler> {
+        let mut continuations: tokio::sync::MutexGuard<'_, BTreeMap<Guid, RpcContinuation>> =
             self.0.lock().await;
         if !matches!(continuations.get(guid), Some(RpcContinuation::Rest(_))) {
             return None;
diff --git a/core/startos/src/s9pk/v1/git_hash.rs b/core/startos/src/s9pk/git_hash.rs
similarity index 52%
rename from core/startos/src/s9pk/v1/git_hash.rs
rename to core/startos/src/s9pk/git_hash.rs
index b2990a111..02f83bf4a 100644
--- a/core/startos/src/s9pk/v1/git_hash.rs
+++ b/core/startos/src/s9pk/git_hash.rs
@@ -1,24 +1,35 @@
 use std::path::Path;
 
-use crate::Error;
+use tokio::process::Command;
+
+use crate::prelude::*;
+use crate::util::Invoke;
 
 #[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
 pub struct GitHash(String);
 
 impl GitHash {
     pub async fn from_path(path: impl AsRef<Path>) -> Result<GitHash, Error> {
-        let hash = tokio::process::Command::new("git")
-            .args(["describe", "--always", "--abbrev=40", "--dirty=-modified"])
-            .current_dir(path)
-            .output()
-            .await?;
-        if !hash.status.success() {
-            return Err(Error::new(
-                color_eyre::eyre::eyre!("Could not get hash: {}", String::from_utf8(hash.stderr)?),
-                crate::ErrorKind::Filesystem,
-            ));
+        let mut hash = String::from_utf8(
+            Command::new("git")
+                .arg("rev-parse")
+                .arg("HEAD")
+                .current_dir(&path)
+                .invoke(ErrorKind::Git)
+                .await?,
+        )?;
+        if Command::new("git")
+            .arg("diff-index")
+            .arg("--quiet")
+            .arg("HEAD")
+            .arg("--")
+            .invoke(ErrorKind::Git)
+            .await
+            .is_err()
+        {
+            hash += "-modified";
         }
-        Ok(GitHash(String::from_utf8(hash.stdout)?))
+        Ok(GitHash(hash))
     }
 }
 
diff --git a/core/startos/src/s9pk/merkle_archive/directory_contents.rs b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
index ebc46a60b..77c3582d9 100644
--- a/core/startos/src/s9pk/merkle_archive/directory_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
@@ -12,11 +12,12 @@ use itertools::Itertools;
 use tokio::io::AsyncRead;
 
 use crate::prelude::*;
-use crate::s9pk::merkle_archive::sink::{Sink, TrackingWriter};
+use crate::s9pk::merkle_archive::sink::Sink;
 use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
 use crate::s9pk::merkle_archive::write_queue::WriteQueue;
 use crate::s9pk::merkle_archive::{varint, Entry, EntryContents};
-use crate::util::io::ParallelBlake3Writer;
+use crate::util::io::{ParallelBlake3Writer, TrackingIO};
+use crate::CAP_10_MiB;
 
 #[derive(Clone)]
 pub struct DirectoryContents<S> {
@@ -151,7 +152,7 @@ impl<S: Clone> DirectoryContents<S> {
         Ok(())
     }
 }
-impl<S: ArchiveSource> DirectoryContents<Section<S>> {
+impl<S: ArchiveSource + Clone> DirectoryContents<Section<S>> {
     #[instrument(skip_all)]
     pub fn deserialize<'a>(
         source: &'a S,
@@ -181,7 +182,7 @@ impl<S: ArchiveSource> DirectoryContents<Section<S>> {
             let mut entries = OrdMap::new();
             for _ in 0..len {
                 let name = varint::deserialize_varstring(&mut toc_reader).await?;
-                let entry = Entry::deserialize(source, &mut toc_reader).await?;
+                let entry = Entry::deserialize(source.clone(), &mut toc_reader).await?;
                 entries.insert(name.into(), entry);
             }
 
@@ -202,7 +203,7 @@ impl<S: ArchiveSource> DirectoryContents<Section<S>> {
         .boxed()
     }
 }
-impl<S: FileSource> DirectoryContents<S> {
+impl<S: FileSource + Clone> DirectoryContents<S> {
     pub fn filter(&mut self, filter: impl Fn(&Path) -> bool) -> Result<(), Error> {
         for k in self.keys().cloned().collect::<Vec<_>>() {
             let path = Path::new(&*k);
@@ -239,8 +240,7 @@ impl<S: FileSource> DirectoryContents<S> {
     #[instrument(skip_all)]
     pub fn sighash<'a>(&'a self) -> BoxFuture<'a, Result<Hash, Error>> {
         async move {
-            let mut hasher =
-                TrackingWriter::new(0, ParallelBlake3Writer::new(super::hash::BUFFER_CAPACITY));
+            let mut hasher = TrackingIO::new(0, ParallelBlake3Writer::new(CAP_10_MiB));
             let mut sig_contents = OrdMap::new();
             for (name, entry) in &**self {
                 sig_contents.insert(name.clone(), entry.to_missing().await?);
@@ -280,6 +280,7 @@ impl<S: FileSource> DirectoryContents<S> {
 
         Ok(())
     }
+
     pub fn into_dyn(self) -> DirectoryContents<DynFileSource> {
         DirectoryContents {
             contents: self
diff --git a/core/startos/src/s9pk/merkle_archive/file_contents.rs b/core/startos/src/s9pk/merkle_archive/file_contents.rs
index a2d19ed88..c34193e31 100644
--- a/core/startos/src/s9pk/merkle_archive/file_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/file_contents.rs
@@ -2,9 +2,10 @@ use blake3::Hash;
 use tokio::io::AsyncRead;
 
 use crate::prelude::*;
-use crate::s9pk::merkle_archive::sink::{Sink, TrackingWriter};
+use crate::s9pk::merkle_archive::sink::Sink;
 use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
-use crate::util::io::ParallelBlake3Writer;
+use crate::util::io::{ParallelBlake3Writer, TrackingIO};
+use crate::CAP_10_MiB;
 
 #[derive(Debug, Clone)]
 pub struct FileContents<S>(S);
@@ -19,7 +20,7 @@ impl<S> FileContents<S> {
 impl<S: ArchiveSource> FileContents<Section<S>> {
     #[instrument(skip_all)]
     pub async fn deserialize(
-        source: &S,
+        source: S,
         header: &mut (impl AsyncRead + Unpin + Send),
         size: u64,
     ) -> Result<Self, Error> {
@@ -34,8 +35,7 @@ impl<S: ArchiveSource> FileContents<Section<S>> {
 }
 impl<S: FileSource> FileContents<S> {
     pub async fn hash(&self) -> Result<(Hash, u64), Error> {
-        let mut hasher =
-            TrackingWriter::new(0, ParallelBlake3Writer::new(super::hash::BUFFER_CAPACITY));
+        let mut hasher = TrackingIO::new(0, ParallelBlake3Writer::new(CAP_10_MiB));
         self.serialize_body(&mut hasher, None).await?;
         let size = hasher.position();
         let hash = hasher.into_inner().finalize().await?;
diff --git a/core/startos/src/s9pk/merkle_archive/hash.rs b/core/startos/src/s9pk/merkle_archive/hash.rs
index fc635c435..c7ad470e4 100644
--- a/core/startos/src/s9pk/merkle_archive/hash.rs
+++ b/core/startos/src/s9pk/merkle_archive/hash.rs
@@ -6,8 +6,7 @@ use tokio_util::either::Either;
 
 use crate::prelude::*;
 use crate::util::io::{ParallelBlake3Writer, TeeWriter};
-
-pub const BUFFER_CAPACITY: usize = 10 * 1024 * 1024; // 10MiB
+use crate::CAP_10_MiB;
 
 #[pin_project::pin_project]
 pub struct VerifyingWriter<W> {
@@ -21,8 +20,8 @@ impl<W: AsyncWrite> VerifyingWriter<W> {
             writer: if verify.is_some() {
                 Either::Left(TeeWriter::new(
                     w,
-                    ParallelBlake3Writer::new(BUFFER_CAPACITY),
-                    BUFFER_CAPACITY,
+                    ParallelBlake3Writer::new(CAP_10_MiB),
+                    CAP_10_MiB,
                 ))
             } else {
                 Either::Right(w)
diff --git a/core/startos/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
index 3863ceeaf..1c0d6b786 100644
--- a/core/startos/src/s9pk/merkle_archive/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/mod.rs
@@ -7,11 +7,16 @@ use sha2::{Digest, Sha512};
 use tokio::io::AsyncRead;
 
 use crate::prelude::*;
+use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
+use crate::registry::signer::sign::ed25519::Ed25519;
+use crate::registry::signer::sign::SignatureScheme;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
 use crate::s9pk::merkle_archive::file_contents::FileContents;
 use crate::s9pk::merkle_archive::sink::Sink;
 use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
 use crate::s9pk::merkle_archive::write_queue::WriteQueue;
+use crate::util::serde::Base64;
+use crate::CAP_1_MiB;
 
 pub mod directory_contents;
 pub mod file_contents;
@@ -70,12 +75,13 @@ impl<S> MerkleArchive<S> {
         self.contents.sort_by(sort_by)
     }
 }
-impl<S: ArchiveSource> MerkleArchive<Section<S>> {
+impl<S: ArchiveSource + Clone> MerkleArchive<Section<S>> {
     #[instrument(skip_all)]
     pub async fn deserialize(
         source: &S,
         context: &str,
         header: &mut (impl AsyncRead + Unpin + Send),
+        commitment: Option<&MerkleArchiveCommitment>,
     ) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
 
@@ -101,6 +107,32 @@ impl<S: ArchiveSource> MerkleArchive<Section<S>> {
             &signature,
         )?;
 
+        if let Some(MerkleArchiveCommitment {
+            root_sighash,
+            root_maxsize,
+        }) = commitment
+        {
+            if sighash.as_bytes() != &**root_sighash {
+                return Err(Error::new(
+                    eyre!("merkle root mismatch"),
+                    ErrorKind::InvalidSignature,
+                ));
+            }
+            if max_size > *root_maxsize {
+                return Err(Error::new(
+                    eyre!("merkle root directory max size too large"),
+                    ErrorKind::InvalidSignature,
+                ));
+            }
+        } else {
+            if max_size > CAP_1_MiB as u64 {
+                return Err(Error::new(
+                    eyre!("merkle root directory max size over 1MiB, cancelling download in case of DOS attack"),
+                    ErrorKind::InvalidSignature,
+                ));
+            }
+        }
+
         let contents = DirectoryContents::deserialize(source, header, (sighash, max_size)).await?;
 
         Ok(Self {
@@ -109,38 +141,50 @@ impl<S: ArchiveSource> MerkleArchive<Section<S>> {
         })
     }
 }
-impl<S: FileSource> MerkleArchive<S> {
+impl<S: FileSource + Clone> MerkleArchive<S> {
     pub async fn update_hashes(&mut self, only_missing: bool) -> Result<(), Error> {
         self.contents.update_hashes(only_missing).await
     }
     pub fn filter(&mut self, filter: impl Fn(&Path) -> bool) -> Result<(), Error> {
         self.contents.filter(filter)
     }
+    pub async fn commitment(&self) -> Result<MerkleArchiveCommitment, Error> {
+        let root_maxsize = match self.signer {
+            Signer::Signed(_, _, s, _) => s,
+            _ => self.contents.toc_size(),
+        };
+        let root_sighash = self.contents.sighash().await?;
+        Ok(MerkleArchiveCommitment {
+            root_sighash: Base64(*root_sighash.as_bytes()),
+            root_maxsize,
+        })
+    }
+    pub async fn signature(&self) -> Result<Signature, Error> {
+        match &self.signer {
+            Signer::Signed(_, s, _, _) => Ok(*s),
+            Signer::Signer(k, context) => {
+                Ed25519.sign_commitment(k, &self.commitment().await?, context)
+            }
+        }
+    }
     #[instrument(skip_all)]
     pub async fn serialize<W: Sink>(&self, w: &mut W, verify: bool) -> Result<(), Error> {
         use tokio::io::AsyncWriteExt;
 
-        let sighash = self.contents.sighash().await?;
-        let size = self.contents.toc_size();
+        let commitment = self.commitment().await?;
 
-        let (pubkey, signature, max_size) = match &self.signer {
-            Signer::Signed(pubkey, signature, max_size, _) => (*pubkey, *signature, *max_size),
-            Signer::Signer(s, context) => (
-                s.into(),
-                ed25519_dalek::SigningKey::sign_prehashed(
-                    s,
-                    Sha512::new_with_prefix(sighash.as_bytes())
-                        .chain_update(&u64::to_be_bytes(size)),
-                    Some(context.as_bytes()),
-                )?,
-                size,
-            ),
+        let (pubkey, signature) = match &self.signer {
+            Signer::Signed(pubkey, signature, _, _) => (*pubkey, *signature),
+            Signer::Signer(s, context) => {
+                (s.into(), Ed25519.sign_commitment(s, &commitment, context)?)
+            }
         };
 
         w.write_all(pubkey.as_bytes()).await?;
         w.write_all(&signature.to_bytes()).await?;
-        w.write_all(sighash.as_bytes()).await?;
-        w.write_all(&u64::to_be_bytes(max_size)).await?;
+        w.write_all(&*commitment.root_sighash).await?;
+        w.write_all(&u64::to_be_bytes(commitment.root_maxsize))
+            .await?;
         let mut next_pos = w.current_position().await?;
         next_pos += DirectoryContents::<S>::header_size();
         self.contents.serialize_header(next_pos, w).await?;
@@ -216,11 +260,10 @@ impl<S> Entry<S> {
         + self.contents.header_size()
     }
 }
-impl<S: Clone> Entry<S> {}
-impl<S: ArchiveSource> Entry<Section<S>> {
+impl<S: ArchiveSource + Clone> Entry<Section<S>> {
     #[instrument(skip_all)]
     pub async fn deserialize(
-        source: &S,
+        source: S,
         header: &mut (impl AsyncRead + Unpin + Send),
     ) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
@@ -241,24 +284,19 @@ impl<S: ArchiveSource> Entry<Section<S>> {
         })
     }
 }
-impl<S: FileSource> Entry<S> {
+impl<S: FileSource + Clone> Entry<S> {
     pub fn filter(&mut self, filter: impl Fn(&Path) -> bool) -> Result<(), Error> {
         if let EntryContents::Directory(d) = &mut self.contents {
             d.filter(filter)?;
         }
         Ok(())
     }
-    pub async fn read_file_to_vec(&self) -> Result<Vec<u8>, Error> {
-        match self.as_contents() {
-            EntryContents::File(f) => Ok(f.to_vec(self.hash).await?),
-            EntryContents::Directory(_) => Err(Error::new(
-                eyre!("expected file, found directory"),
-                ErrorKind::ParseS9pk,
-            )),
-            EntryContents::Missing => {
-                Err(Error::new(eyre!("entry is missing"), ErrorKind::ParseS9pk))
-            }
+    pub async fn update_hash(&mut self, only_missing: bool) -> Result<(), Error> {
+        if let EntryContents::Directory(d) = &mut self.contents {
+            d.update_hashes(only_missing).await?;
         }
+        self.hash = Some(self.contents.hash().await?);
+        Ok(())
     }
     pub async fn to_missing(&self) -> Result<Self, Error> {
         let hash = if let Some(hash) = self.hash {
@@ -271,13 +309,6 @@ impl<S: FileSource> Entry<S> {
             contents: EntryContents::Missing,
         })
     }
-    pub async fn update_hash(&mut self, only_missing: bool) -> Result<(), Error> {
-        if let EntryContents::Directory(d) = &mut self.contents {
-            d.update_hashes(only_missing).await?;
-        }
-        self.hash = Some(self.contents.hash().await?);
-        Ok(())
-    }
     #[instrument(skip_all)]
     pub async fn serialize_header<W: Sink>(
         &self,
@@ -302,6 +333,20 @@ impl<S: FileSource> Entry<S> {
         }
     }
 }
+impl<S: FileSource> Entry<S> {
+    pub async fn read_file_to_vec(&self) -> Result<Vec<u8>, Error> {
+        match self.as_contents() {
+            EntryContents::File(f) => Ok(f.to_vec(self.hash).await?),
+            EntryContents::Directory(_) => Err(Error::new(
+                eyre!("expected file, found directory"),
+                ErrorKind::ParseS9pk,
+            )),
+            EntryContents::Missing => {
+                Err(Error::new(eyre!("entry is missing"), ErrorKind::ParseS9pk))
+            }
+        }
+    }
+}
 
 #[derive(Debug, Clone)]
 pub enum EntryContents<S> {
@@ -329,10 +374,10 @@ impl<S> EntryContents<S> {
         matches!(self, &EntryContents::Directory(_))
     }
 }
-impl<S: ArchiveSource> EntryContents<Section<S>> {
+impl<S: ArchiveSource + Clone> EntryContents<Section<S>> {
     #[instrument(skip_all)]
     pub async fn deserialize(
-        source: &S,
+        source: S,
         header: &mut (impl AsyncRead + Unpin + Send),
         (hash, size): (Hash, u64),
     ) -> Result<Self, Error> {
@@ -346,7 +391,7 @@ impl<S: ArchiveSource> EntryContents<Section<S>> {
                 FileContents::deserialize(source, header, size).await?,
             )),
             2 => Ok(Self::Directory(
-                DirectoryContents::deserialize(source, header, (hash, size)).await?,
+                DirectoryContents::deserialize(&source, header, (hash, size)).await?,
             )),
             id => Err(Error::new(
                 eyre!("Unknown type id {id} found in MerkleArchive"),
@@ -355,7 +400,7 @@ impl<S: ArchiveSource> EntryContents<Section<S>> {
         }
     }
 }
-impl<S: FileSource> EntryContents<S> {
+impl<S: FileSource + Clone> EntryContents<S> {
     pub async fn hash(&self) -> Result<(Hash, u64), Error> {
         match self {
             Self::Missing => Err(Error::new(
@@ -366,6 +411,15 @@ impl<S: FileSource> EntryContents<S> {
             Self::Directory(d) => Ok((d.sighash().await?, d.toc_size())),
         }
     }
+    pub fn into_dyn(self) -> EntryContents<DynFileSource> {
+        match self {
+            Self::Missing => EntryContents::Missing,
+            Self::File(f) => EntryContents::File(f.into_dyn()),
+            Self::Directory(d) => EntryContents::Directory(d.into_dyn()),
+        }
+    }
+}
+impl<S: FileSource> EntryContents<S> {
     #[instrument(skip_all)]
     pub async fn serialize_header<W: Sink>(
         &self,
@@ -381,11 +435,4 @@ impl<S: FileSource> EntryContents<S> {
             Self::Directory(d) => Some(d.serialize_header(position, w).await?),
         })
     }
-    pub fn into_dyn(self) -> EntryContents<DynFileSource> {
-        match self {
-            Self::Missing => EntryContents::Missing,
-            Self::File(f) => EntryContents::File(f.into_dyn()),
-            Self::Directory(d) => EntryContents::Directory(d.into_dyn()),
-        }
-    }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/sink.rs b/core/startos/src/s9pk/merkle_archive/sink.rs
index ec1431b8e..5357eb2d6 100644
--- a/core/startos/src/s9pk/merkle_archive/sink.rs
+++ b/core/startos/src/s9pk/merkle_archive/sink.rs
@@ -1,6 +1,7 @@
 use tokio::io::{AsyncSeek, AsyncWrite};
 
 use crate::prelude::*;
+use crate::util::io::TrackingIO;
 
 #[async_trait::async_trait]
 pub trait Sink: AsyncWrite + Unpin + Send {
@@ -17,57 +18,8 @@ impl<S: AsyncWrite + AsyncSeek + Unpin + Send> Sink for S {
 }
 
 #[async_trait::async_trait]
-impl<W: AsyncWrite + Unpin + Send> Sink for TrackingWriter<W> {
+impl<W: AsyncWrite + Unpin + Send> Sink for TrackingIO<W> {
     async fn current_position(&mut self) -> Result<u64, Error> {
-        Ok(self.position)
-    }
-}
-
-#[pin_project::pin_project]
-pub struct TrackingWriter<W> {
-    position: u64,
-    #[pin]
-    writer: W,
-}
-impl<W> TrackingWriter<W> {
-    pub fn new(start: u64, w: W) -> Self {
-        Self {
-            position: start,
-            writer: w,
-        }
-    }
-    pub fn position(&self) -> u64 {
-        self.position
-    }
-    pub fn into_inner(self) -> W {
-        self.writer
-    }
-}
-impl<W: AsyncWrite + Unpin + Send> AsyncWrite for TrackingWriter<W> {
-    fn poll_write(
-        self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-        buf: &[u8],
-    ) -> std::task::Poll<Result<usize, std::io::Error>> {
-        let this = self.project();
-        match this.writer.poll_write(cx, buf) {
-            std::task::Poll::Ready(Ok(written)) => {
-                *this.position += written as u64;
-                std::task::Poll::Ready(Ok(written))
-            }
-            a => a,
-        }
-    }
-    fn poll_flush(
-        self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), std::io::Error>> {
-        self.project().writer.poll_flush(cx)
-    }
-    fn poll_shutdown(
-        self: std::pin::Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), std::io::Error>> {
-        self.project().writer.poll_shutdown(cx)
+        Ok(self.position())
     }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/source/http.rs b/core/startos/src/s9pk/merkle_archive/source/http.rs
index 738c480ed..fda9d32ed 100644
--- a/core/startos/src/s9pk/merkle_archive/source/http.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/http.rs
@@ -1,23 +1,25 @@
+use std::collections::BTreeSet;
+use std::pin::Pin;
+use std::sync::{Arc, Mutex};
+use std::task::Poll;
+
 use bytes::Bytes;
-use futures::stream::BoxStream;
-use futures::{StreamExt, TryStreamExt};
+use futures::{Stream, StreamExt, TryStreamExt};
 use reqwest::header::{ACCEPT_RANGES, CONTENT_LENGTH, RANGE};
 use reqwest::{Client, Url};
-use tokio::io::{AsyncRead, AsyncReadExt, Take};
+use tokio::io::{AsyncRead, AsyncReadExt, ReadBuf, Take};
 use tokio_util::io::StreamReader;
 
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
+use crate::util::io::TrackingIO;
+use crate::util::Apply;
 
-#[derive(Clone)]
 pub struct HttpSource {
     url: Url,
     client: Client,
     size: Option<u64>,
-    range_support: Result<
-        (),
-        (), // Arc<Mutex<Option<RangelessReader>>>
-    >,
+    range_support: Result<(), Arc<Mutex<BTreeSet<TrackingIO<HttpBodyReader>>>>>,
 }
 impl HttpSource {
     pub async fn new(client: Client, url: Url) -> Result<Self, Error> {
@@ -32,7 +34,8 @@ impl HttpSource {
             .headers()
             .get(ACCEPT_RANGES)
             .and_then(|s| s.to_str().ok())
-            == Some("bytes");
+            == Some("bytes")
+            && false;
         let size = head
             .headers()
             .get(CONTENT_LENGTH)
@@ -45,53 +48,141 @@ impl HttpSource {
             range_support: if range_support {
                 Ok(())
             } else {
-                Err(()) // Err(Arc::new(Mutex::new(None)))
+                Err(Arc::new(Mutex::new(BTreeSet::new())))
             },
         })
     }
 }
 impl ArchiveSource for HttpSource {
-    type Reader = Take<HttpReader>;
+    type Reader = HttpReader;
     async fn size(&self) -> Option<u64> {
         self.size
     }
+    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+        Ok(StreamReader::new(
+            self.client
+                .get(self.url.clone())
+                .send()
+                .await
+                .with_kind(ErrorKind::Network)?
+                .error_for_status()
+                .with_kind(ErrorKind::Network)?
+                .bytes_stream()
+                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+                .apply(boxed),
+        ))
+    }
     async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
-        match self.range_support {
-            Ok(_) => Ok(HttpReader::Range(StreamReader::new(if size > 0 {
-                self.client
-                    .get(self.url.clone())
-                    .header(RANGE, format!("bytes={}-{}", position, position + size - 1))
-                    .send()
-                    .await
-                    .with_kind(ErrorKind::Network)?
-                    .error_for_status()
-                    .with_kind(ErrorKind::Network)?
-                    .bytes_stream()
-                    .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
-                    .boxed()
-            } else {
-                futures::stream::empty().boxed()
-            }))
-            .take(size)),
-            _ => todo!(),
+        match &self.range_support {
+            Ok(_) => Ok(HttpReader::Range(
+                StreamReader::new(if size > 0 {
+                    self.client
+                        .get(self.url.clone())
+                        .header(RANGE, format!("bytes={}-{}", position, position + size - 1))
+                        .send()
+                        .await
+                        .with_kind(ErrorKind::Network)?
+                        .error_for_status()
+                        .with_kind(ErrorKind::Network)?
+                        .bytes_stream()
+                        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+                        .apply(boxed)
+                } else {
+                    futures::stream::empty().apply(boxed)
+                })
+                .take(size),
+            )),
+            Err(pool) => {
+                fn get_reader_for(
+                    pool: &Arc<Mutex<BTreeSet<TrackingIO<HttpBodyReader>>>>,
+                    position: u64,
+                ) -> Option<TrackingIO<HttpBodyReader>> {
+                    let mut lock = pool.lock().unwrap();
+                    let pos = lock.range(..position).last()?.position();
+                    lock.take(&pos)
+                }
+                let reader = get_reader_for(pool, position);
+                let mut reader = if let Some(reader) = reader {
+                    reader
+                } else {
+                    TrackingIO::new(
+                        0,
+                        StreamReader::new(
+                            self.client
+                                .get(self.url.clone())
+                                .send()
+                                .await
+                                .with_kind(ErrorKind::Network)?
+                                .error_for_status()
+                                .with_kind(ErrorKind::Network)?
+                                .bytes_stream()
+                                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+                                .apply(boxed),
+                        ),
+                    )
+                };
+                if reader.position() < position {
+                    let to_skip = position - reader.position();
+                    tokio::io::copy(&mut (&mut reader).take(to_skip), &mut tokio::io::sink())
+                        .await?;
+                }
+                Ok(HttpReader::Rangeless {
+                    pool: pool.clone(),
+                    reader: Some(reader.take(size)),
+                })
+            }
         }
     }
 }
 
-#[pin_project::pin_project(project = HttpReaderProj)]
+type BoxStream<'a, T> = Pin<Box<dyn Stream<Item = T> + Send + Sync + 'a>>;
+fn boxed<'a, T>(stream: impl Stream<Item = T> + Send + Sync + 'a) -> BoxStream<'a, T> {
+    Box::pin(stream)
+}
+type HttpBodyReader = StreamReader<BoxStream<'static, Result<Bytes, std::io::Error>>, Bytes>;
+
+#[pin_project::pin_project(project = HttpReaderProj, PinnedDrop)]
 pub enum HttpReader {
-    Range(#[pin] StreamReader<BoxStream<'static, Result<Bytes, std::io::Error>>, Bytes>),
-    // Rangeless(#[pin] RangelessReader),
+    Range(#[pin] Take<HttpBodyReader>),
+    Rangeless {
+        pool: Arc<Mutex<BTreeSet<TrackingIO<HttpBodyReader>>>>,
+        #[pin]
+        reader: Option<Take<TrackingIO<HttpBodyReader>>>,
+    },
 }
 impl AsyncRead for HttpReader {
     fn poll_read(
-        self: std::pin::Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
-        buf: &mut tokio::io::ReadBuf<'_>,
-    ) -> std::task::Poll<std::io::Result<()>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
         match self.project() {
             HttpReaderProj::Range(r) => r.poll_read(cx, buf),
-            // HttpReaderProj::Rangeless(r) => r.poll_read(cx, buf),
+            HttpReaderProj::Rangeless { mut reader, .. } => {
+                let mut finished = false;
+                if let Some(reader) = reader.as_mut().as_pin_mut() {
+                    let start = buf.filled().len();
+                    futures::ready!(reader.poll_read(cx, buf)?);
+                    finished = start == buf.filled().len();
+                }
+                if finished {
+                    reader.take();
+                }
+                Poll::Ready(Ok(()))
+            }
+        }
+    }
+}
+#[pin_project::pinned_drop]
+impl PinnedDrop for HttpReader {
+    fn drop(self: Pin<&mut Self>) {
+        match self.project() {
+            HttpReaderProj::Range(_) => (),
+            HttpReaderProj::Rangeless { pool, mut reader } => {
+                if let Some(reader) = reader.take() {
+                    pool.lock().unwrap().insert(reader.into_inner());
+                }
+            }
         }
     }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/source/mod.rs b/core/startos/src/s9pk/merkle_archive/source/mod.rs
index 6e3b1e584..f6922d109 100644
--- a/core/startos/src/s9pk/merkle_archive/source/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/mod.rs
@@ -1,3 +1,4 @@
+use std::ops::Deref;
 use std::path::PathBuf;
 use std::sync::Arc;
 
@@ -13,7 +14,7 @@ use crate::s9pk::merkle_archive::hash::VerifyingWriter;
 pub mod http;
 pub mod multi_cursor_file;
 
-pub trait FileSource: Clone + Send + Sync + Sized + 'static {
+pub trait FileSource: Send + Sync + Sized + 'static {
     type Reader: AsyncRead + Unpin + Send;
     fn size(&self) -> impl Future<Output = Result<u64, Error>> + Send;
     fn reader(&self) -> impl Future<Output = Result<Self::Reader, Error>> + Send;
@@ -61,6 +62,29 @@ pub trait FileSource: Clone + Send + Sync + Sized + 'static {
     }
 }
 
+impl<T: FileSource> FileSource for Arc<T> {
+    type Reader = T::Reader;
+    async fn size(&self) -> Result<u64, Error> {
+        self.deref().size().await
+    }
+    async fn reader(&self) -> Result<Self::Reader, Error> {
+        self.deref().reader().await
+    }
+    async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(&self, w: &mut W) -> Result<(), Error> {
+        self.deref().copy(w).await
+    }
+    async fn copy_verify<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        w: &mut W,
+        verify: Option<(Hash, u64)>,
+    ) -> Result<(), Error> {
+        self.deref().copy_verify(w, verify).await
+    }
+    async fn to_vec(&self, verify: Option<(Hash, u64)>) -> Result<Vec<u8>, Error> {
+        self.deref().to_vec(verify).await
+    }
+}
+
 #[derive(Clone)]
 pub struct DynFileSource(Arc<dyn DynableFileSource>);
 impl DynFileSource {
@@ -155,16 +179,28 @@ impl FileSource for Arc<[u8]> {
     }
 }
 
-pub trait ArchiveSource: Clone + Send + Sync + Sized + 'static {
+pub trait ArchiveSource: Send + Sync + Sized + 'static {
     type Reader: AsyncRead + Unpin + Send;
     fn size(&self) -> impl Future<Output = Option<u64>> + Send {
         async { None }
     }
+    fn fetch_all(
+        &self,
+    ) -> impl Future<Output = Result<impl AsyncRead + Unpin + Send, Error>> + Send;
     fn fetch(
         &self,
         position: u64,
         size: u64,
     ) -> impl Future<Output = Result<Self::Reader, Error>> + Send;
+    fn copy_all_to<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        w: &mut W,
+    ) -> impl Future<Output = Result<(), Error>> + Send {
+        async move {
+            tokio::io::copy(&mut self.fetch_all().await?, w).await?;
+            Ok(())
+        }
+    }
     fn copy_to<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         position: u64,
@@ -176,17 +212,47 @@ pub trait ArchiveSource: Clone + Send + Sync + Sized + 'static {
             Ok(())
         }
     }
-    fn section(&self, position: u64, size: u64) -> Section<Self> {
+    fn section(self, position: u64, size: u64) -> Section<Self> {
         Section {
-            source: self.clone(),
+            source: self,
             position,
             size,
         }
     }
 }
 
+impl<T: ArchiveSource> ArchiveSource for Arc<T> {
+    type Reader = T::Reader;
+    async fn size(&self) -> Option<u64> {
+        self.deref().size().await
+    }
+    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+        self.deref().fetch_all().await
+    }
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+        self.deref().fetch(position, size).await
+    }
+    async fn copy_all_to<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        w: &mut W,
+    ) -> Result<(), Error> {
+        self.deref().copy_all_to(w).await
+    }
+    async fn copy_to<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        position: u64,
+        size: u64,
+        w: &mut W,
+    ) -> Result<(), Error> {
+        self.deref().copy_to(position, size, w).await
+    }
+}
+
 impl ArchiveSource for Arc<[u8]> {
     type Reader = tokio::io::Take<std::io::Cursor<Self>>;
+    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+        Ok(std::io::Cursor::new(self.clone()))
+    }
     async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
         use tokio::io::AsyncReadExt;
 
diff --git a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
index 00188559a..9cc162f0e 100644
--- a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
@@ -1,18 +1,35 @@
 use std::io::SeekFrom;
 use std::os::fd::{AsRawFd, RawFd};
 use std::path::{Path, PathBuf};
+use std::pin::Pin;
 use std::sync::Arc;
+use std::task::Poll;
 
 use tokio::fs::File;
-use tokio::io::{AsyncRead, AsyncReadExt};
+use tokio::io::{AsyncRead, AsyncReadExt, ReadBuf, Take};
 use tokio::sync::{Mutex, OwnedMutexGuard};
 
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::{ArchiveSource, Section};
 
-fn path_from_fd(fd: RawFd) -> PathBuf {
-    Path::new("/proc/self/fd").join(fd.to_string())
+fn path_from_fd(fd: RawFd) -> Result<PathBuf, Error> {
+    #[cfg(target_os = "linux")]
+    let path = Path::new("/proc/self/fd").join(fd.to_string());
+    #[cfg(target_os = "macos")] // here be dragons
+    let path = unsafe {
+        let mut buf = [0u8; libc::PATH_MAX as usize];
+        if libc::fcntl(fd, libc::F_GETPATH, buf.as_mut_ptr().cast::<libc::c_char>()) == -1 {
+            return Err(std::io::Error::last_os_error().into());
+        }
+        Path::new(
+            &*std::ffi::CStr::from_bytes_until_nul(&buf)
+                .with_kind(ErrorKind::Utf8)?
+                .to_string_lossy(),
+        )
+        .to_owned()
+    };
+    Ok(path)
 }
 
 #[derive(Clone)]
@@ -21,18 +38,26 @@ pub struct MultiCursorFile {
     file: Arc<Mutex<File>>,
 }
 impl MultiCursorFile {
-    fn path(&self) -> PathBuf {
+    fn path(&self) -> Result<PathBuf, Error> {
         path_from_fd(self.fd)
     }
     pub async fn open(fd: &impl AsRawFd) -> Result<Self, Error> {
-        let fd = fd.as_raw_fd();
-        Ok(Self {
-            fd,
-            file: Arc::new(Mutex::new(File::open(path_from_fd(fd)).await?)),
-        })
+        let f = File::open(path_from_fd(fd.as_raw_fd())?).await?;
+        Ok(Self::from(f))
+    }
+    pub async fn cursor(&self) -> Result<FileCursor, Error> {
+        Ok(FileCursor(
+            if let Ok(file) = self.file.clone().try_lock_owned() {
+                file
+            } else {
+                Arc::new(Mutex::new(File::open(self.path()?).await?))
+                    .try_lock_owned()
+                    .expect("freshly created")
+            },
+        ))
     }
     pub async fn blake3_mmap(&self) -> Result<blake3::Hash, Error> {
-        let path = self.path();
+        let path = self.path()?;
         tokio::task::spawn_blocking(move || {
             let mut hasher = blake3::Hasher::new();
             hasher.update_mmap_rayon(path)?;
@@ -52,76 +77,44 @@ impl From<File> for MultiCursorFile {
 }
 
 #[pin_project::pin_project]
-pub struct FileSectionReader {
-    #[pin]
-    file: OwnedMutexGuard<File>,
-    remaining: u64,
-}
-impl AsyncRead for FileSectionReader {
+pub struct FileCursor(#[pin] OwnedMutexGuard<File>);
+impl AsyncRead for FileCursor {
     fn poll_read(
-        self: std::pin::Pin<&mut Self>,
+        self: Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
-        buf: &mut tokio::io::ReadBuf<'_>,
-    ) -> std::task::Poll<std::io::Result<()>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
         let this = self.project();
-        if *this.remaining == 0 {
-            return std::task::Poll::Ready(Ok(()));
-        }
-        let before = buf.filled().len() as u64;
-        let res = std::pin::Pin::new(&mut (&mut **this.file.get_mut()).take(*this.remaining))
-            .poll_read(cx, buf);
-        *this.remaining = this
-            .remaining
-            .saturating_sub(buf.filled().len() as u64 - before);
-        res
+        Pin::new(&mut (&mut **this.0.get_mut())).poll_read(cx, buf)
     }
 }
 
 impl ArchiveSource for MultiCursorFile {
-    type Reader = FileSectionReader;
+    type Reader = Take<FileCursor>;
     async fn size(&self) -> Option<u64> {
-        tokio::fs::metadata(self.path()).await.ok().map(|m| m.len())
+        tokio::fs::metadata(self.path().ok()?)
+            .await
+            .ok()
+            .map(|m| m.len())
+    }
+    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+        use tokio::io::AsyncSeekExt;
+
+        let mut file = self.cursor().await?;
+        file.0.seek(SeekFrom::Start(0)).await?;
+        Ok(file)
     }
     async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
         use tokio::io::AsyncSeekExt;
 
-        let mut file = if let Ok(file) = self.file.clone().try_lock_owned() {
-            file
-        } else {
-            #[cfg(target_os = "linux")]
-            let file = File::open(self.path()).await?;
-            #[cfg(target_os = "macos")] // here be dragons
-            let file = unsafe {
-                let mut buf = [0u8; libc::PATH_MAX as usize];
-                if libc::fcntl(
-                    self.fd,
-                    libc::F_GETPATH,
-                    buf.as_mut_ptr().cast::<libc::c_char>(),
-                ) == -1
-                {
-                    return Err(std::io::Error::last_os_error().into());
-                }
-                File::open(
-                    &*std::ffi::CStr::from_bytes_until_nul(&buf)
-                        .with_kind(ErrorKind::Utf8)?
-                        .to_string_lossy(),
-                )
-                .await?
-            };
-            Arc::new(Mutex::new(file))
-                .try_lock_owned()
-                .expect("freshly created")
-        };
-        file.seek(SeekFrom::Start(position)).await?;
-        Ok(Self::Reader {
-            file,
-            remaining: size,
-        })
+        let mut file = self.cursor().await?;
+        file.0.seek(SeekFrom::Start(position)).await?;
+        Ok(file.take(size))
     }
 }
 
 impl From<&Section<MultiCursorFile>> for LoopDev<PathBuf> {
     fn from(value: &Section<MultiCursorFile>) -> Self {
-        LoopDev::new(value.source.path(), value.position, value.size)
+        LoopDev::new(value.source.path().unwrap(), value.position, value.size)
     }
 }
diff --git a/core/startos/src/s9pk/merkle_archive/test.rs b/core/startos/src/s9pk/merkle_archive/test.rs
index e902aafd9..861f3b04c 100644
--- a/core/startos/src/s9pk/merkle_archive/test.rs
+++ b/core/startos/src/s9pk/merkle_archive/test.rs
@@ -8,9 +8,9 @@ use ed25519_dalek::SigningKey;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
 use crate::s9pk::merkle_archive::file_contents::FileContents;
-use crate::s9pk::merkle_archive::sink::TrackingWriter;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::merkle_archive::{Entry, EntryContents, MerkleArchive};
+use crate::util::io::TrackingIO;
 
 /// Creates a MerkleArchive (a1) with the provided files at the provided paths. NOTE: later files can overwrite previous files/directories at the same path
 /// Tests:
@@ -60,10 +60,15 @@ fn test(files: Vec<(PathBuf, String)>) -> Result<(), Error> {
         .block_on(async move {
             a1.update_hashes(true).await?;
             let mut s1 = Vec::new();
-            a1.serialize(&mut TrackingWriter::new(0, &mut s1), true)
-                .await?;
+            a1.serialize(&mut TrackingIO::new(0, &mut s1), true).await?;
             let s1: Arc<[u8]> = s1.into();
-            let a2 = MerkleArchive::deserialize(&s1, "test", &mut Cursor::new(s1.clone())).await?;
+            let a2 = MerkleArchive::deserialize(
+                &s1,
+                "test",
+                &mut Cursor::new(s1.clone()),
+                Some(&a1.commitment().await?),
+            )
+            .await?;
 
             for (path, content) in check_set {
                 match a2
@@ -88,8 +93,7 @@ fn test(files: Vec<(PathBuf, String)>) -> Result<(), Error> {
             }
 
             let mut s2 = Vec::new();
-            a2.serialize(&mut TrackingWriter::new(0, &mut s2), true)
-                .await?;
+            a2.serialize(&mut TrackingIO::new(0, &mut s2), true).await?;
             let s2: Arc<[u8]> = s2.into();
             ensure_code!(s1 == s2, ErrorKind::Pack, "s1 does not match s2");
 
diff --git a/core/startos/src/s9pk/merkle_archive/write_queue.rs b/core/startos/src/s9pk/merkle_archive/write_queue.rs
index 9496d5e83..4e1bb3a73 100644
--- a/core/startos/src/s9pk/merkle_archive/write_queue.rs
+++ b/core/startos/src/s9pk/merkle_archive/write_queue.rs
@@ -30,6 +30,8 @@ impl<'a, S: FileSource> WriteQueue<'a, S> {
         self.queue.push_back(entry);
         Ok(res)
     }
+}
+impl<'a, S: FileSource + Clone> WriteQueue<'a, S> {
     pub async fn serialize<W: Sink>(&mut self, w: &mut W, verify: bool) -> Result<(), Error> {
         loop {
             let Some(next) = self.queue.pop_front() else {
diff --git a/core/startos/src/s9pk/mod.rs b/core/startos/src/s9pk/mod.rs
index 83924293a..fcf9379a0 100644
--- a/core/startos/src/s9pk/mod.rs
+++ b/core/startos/src/s9pk/mod.rs
@@ -1,3 +1,4 @@
+pub mod git_hash;
 pub mod merkle_archive;
 pub mod rpc;
 pub mod v1;
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index ca149c3e3..89cfc9b5a 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -172,14 +172,14 @@ async fn add_image(
                 .join(&arch)
                 .join(&id)
                 .with_extension("env"),
-            Entry::file(DynFileSource::new(Arc::from(Vec::from(env)))),
+            Entry::file(DynFileSource::new(Arc::<[u8]>::from(Vec::from(env)))),
         )?;
         archive.contents_mut().insert_path(
             Path::new("images")
                 .join(&arch)
                 .join(&id)
                 .with_extension("json"),
-            Entry::file(DynFileSource::new(Arc::from(
+            Entry::file(DynFileSource::new(Arc::<[u8]>::from(
                 serde_json::to_vec(&serde_json::json!({
                     "workdir": workdir
                 }))
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index 264843766..845d8f773 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -3,35 +3,38 @@ use std::path::{Path, PathBuf};
 
 use emver::VersionRange;
 use imbl_value::InOMap;
+use indexmap::IndexMap;
 pub use models::PackageId;
-use models::VolumeId;
+use models::{ActionId, HealthCheckId, ImageId, VolumeId};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
-use super::git_hash::GitHash;
 use crate::prelude::*;
+use crate::s9pk::git_hash::GitHash;
 use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
-use crate::util::Version;
+use crate::util::serde::{Duration, IoFormat};
+use crate::util::VersionString;
 use crate::version::{Current, VersionT};
 
-fn current_version() -> Version {
+fn current_version() -> VersionString {
     Current::new().semver().into()
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
 pub struct Manifest {
     #[serde(default = "current_version")]
-    pub eos_version: Version,
+    pub eos_version: VersionString,
     pub id: PackageId,
     #[serde(default)]
     pub git_hash: Option<GitHash>,
-    #[serde(default)]
-    pub assets: Assets,
     pub title: String,
-    pub version: Version,
+    pub version: VersionString,
     pub description: Description,
+    #[serde(default)]
+    pub assets: Assets,
+    #[serde(default)]
+    pub build: Option<Vec<String>>,
     pub release_notes: String,
     pub license: String, // type of license
     pub wrapper_repo: Url,
@@ -41,10 +44,23 @@ pub struct Manifest {
     pub donation_url: Option<Url>,
     #[serde(default)]
     pub alerts: Alerts,
+    pub main: PackageProcedure,
+    pub health_checks: HealthChecks,
+    pub config: Option<ConfigActions>,
+    pub properties: Option<PackageProcedure>,
     pub volumes: BTreeMap<VolumeId, Value>,
+    // #[serde(default)]
+    // pub interfaces: Interfaces,
+    // #[serde(default)]
+    pub backup: BackupActions,
+    #[serde(default)]
+    pub migrations: Migrations,
+    #[serde(default)]
+    pub actions: BTreeMap<ActionId, Action>,
+    // #[serde(default)]
+    // pub permissions: Permissions,
     #[serde(default)]
     pub dependencies: BTreeMap<PackageId, DepInfo>,
-    pub config: Option<InOMap<String, Value>>,
 
     #[serde(default)]
     pub replaces: Vec<String>,
@@ -53,6 +69,123 @@ pub struct Manifest {
     pub hardware_requirements: HardwareRequirements,
 }
 
+impl Manifest {
+    pub fn package_procedures(&self) -> impl Iterator<Item = &PackageProcedure> {
+        use std::iter::once;
+        let main = once(&self.main);
+        let cfg_get = self.config.as_ref().map(|a| &a.get).into_iter();
+        let cfg_set = self.config.as_ref().map(|a| &a.set).into_iter();
+        let props = self.properties.iter();
+        let backups = vec![&self.backup.create, &self.backup.restore].into_iter();
+        let migrations = self
+            .migrations
+            .to
+            .values()
+            .chain(self.migrations.from.values());
+        let actions = self.actions.values().map(|a| &a.implementation);
+        main.chain(cfg_get)
+            .chain(cfg_set)
+            .chain(props)
+            .chain(backups)
+            .chain(migrations)
+            .chain(actions)
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
+#[serde(rename_all = "kebab-case")]
+#[serde(tag = "type")]
+#[model = "Model<Self>"]
+pub enum PackageProcedure {
+    Docker(DockerProcedure),
+    Script(Value),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct DockerProcedure {
+    pub image: ImageId,
+    #[serde(default)]
+    pub system: bool,
+    pub entrypoint: String,
+    #[serde(default)]
+    pub args: Vec<String>,
+    #[serde(default)]
+    pub inject: bool,
+    #[serde(default)]
+    pub mounts: BTreeMap<VolumeId, PathBuf>,
+    #[serde(default)]
+    pub io_format: Option<IoFormat>,
+    #[serde(default)]
+    pub sigterm_timeout: Option<Duration>,
+    #[serde(default)]
+    pub shm_size_mb: Option<usize>, // TODO: use postfix sizing? like 1k vs 1m vs 1g
+    #[serde(default)]
+    pub gpu_acceleration: bool,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct HealthChecks(pub BTreeMap<HealthCheckId, HealthCheck>);
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct HealthCheck {
+    pub name: String,
+    pub success_message: Option<String>,
+    #[serde(flatten)]
+    implementation: PackageProcedure,
+    pub timeout: Option<Duration>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct ConfigActions {
+    pub get: PackageProcedure,
+    pub set: PackageProcedure,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct BackupActions {
+    pub create: PackageProcedure,
+    pub restore: PackageProcedure,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Migrations {
+    pub from: IndexMap<VersionRange, PackageProcedure>,
+    pub to: IndexMap<VersionRange, PackageProcedure>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Action {
+    pub name: String,
+    pub description: String,
+    #[serde(default)]
+    pub warning: Option<String>,
+    pub implementation: PackageProcedure,
+    // pub allowed_statuses: Vec<DockerStatus>,
+    // #[serde(default)]
+    // pub input_spec: ConfigSpec,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct DepInfo {
+    pub version: VersionRange,
+    pub requirement: DependencyRequirement,
+    pub description: Option<String>,
+    #[serde(default)]
+    pub config: Option<DependencyConfig>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct DependencyConfig {
+    check: PackageProcedure,
+    auto_configure: PackageProcedure,
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 #[serde(tag = "type")]
@@ -67,15 +200,6 @@ impl DependencyRequirement {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel)]
-#[serde(rename_all = "kebab-case")]
-#[model = "Model<Self>"]
-pub struct DepInfo {
-    pub version: VersionRange,
-    pub requirement: DependencyRequirement,
-    pub description: Option<String>,
-}
-
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct Assets {
diff --git a/core/startos/src/s9pk/v1/mod.rs b/core/startos/src/s9pk/v1/mod.rs
index 173921a75..9910d0adb 100644
--- a/core/startos/src/s9pk/v1/mod.rs
+++ b/core/startos/src/s9pk/v1/mod.rs
@@ -6,7 +6,6 @@ use ts_rs::TS;
 
 pub mod builder;
 pub mod docker;
-pub mod git_hash;
 pub mod header;
 pub mod manifest;
 pub mod reader;
diff --git a/core/startos/src/s9pk/v1/reader.rs b/core/startos/src/s9pk/v1/reader.rs
index 4288ac0b0..7437fdaa9 100644
--- a/core/startos/src/s9pk/v1/reader.rs
+++ b/core/startos/src/s9pk/v1/reader.rs
@@ -20,7 +20,7 @@ use super::header::{FileSection, Header, TableOfContents};
 use super::SIG_CONTEXT;
 use crate::prelude::*;
 use crate::s9pk::v1::docker::DockerReader;
-use crate::util::Version;
+use crate::util::VersionString;
 
 #[pin_project::pin_project]
 #[derive(Debug)]
@@ -83,11 +83,11 @@ impl<'a, R: AsyncSeek + Unpin> AsyncSeek for ReadHandle<'a, R> {
 pub struct ImageTag {
     pub package_id: PackageId,
     pub image_id: ImageId,
-    pub version: Version,
+    pub version: VersionString,
 }
 impl ImageTag {
     #[instrument(skip_all)]
-    pub fn validate(&self, id: &PackageId, version: &Version) -> Result<(), Error> {
+    pub fn validate(&self, id: &PackageId, version: &VersionString) -> Result<(), Error> {
         if id != &self.package_id {
             return Err(Error::new(
                 eyre!(
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 109ea43b4..5d4ad2f44 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -1,9 +1,10 @@
-use std::collections::BTreeSet;
+use std::collections::{BTreeMap, BTreeSet};
 use std::io::Cursor;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use itertools::Itertools;
+use models::ImageId;
 use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncSeek, AsyncWriteExt};
 use tokio::process::Command;
@@ -16,7 +17,7 @@ use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::{FileSource, Section};
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
 use crate::s9pk::rpc::SKIP_ENV;
-use crate::s9pk::v1::manifest::Manifest as ManifestV1;
+use crate::s9pk::v1::manifest::{Manifest as ManifestV1, PackageProcedure};
 use crate::s9pk::v1::reader::S9pkReader;
 use crate::s9pk::v2::{S9pk, SIG_CONTEXT};
 use crate::util::io::TmpDir;
@@ -72,6 +73,17 @@ impl S9pk<Section<MultiCursorFile>> {
         let manifest = from_value::<ManifestV1>(manifest_raw.clone())?;
         let mut new_manifest = Manifest::from(manifest.clone());
 
+        let images: BTreeMap<ImageId, bool> = manifest
+            .package_procedures()
+            .filter_map(|p| {
+                if let PackageProcedure::Docker(p) = p {
+                    Some((p.image.clone(), p.system))
+                } else {
+                    None
+                }
+            })
+            .collect();
+
         // LICENSE.md
         let license: Arc<[u8]> = reader.license().await?.to_vec().await?.into();
         archive.insert_path(
@@ -109,61 +121,14 @@ impl S9pk<Section<MultiCursorFile>> {
                 .input(Some(&mut reader.docker_images(&arch).await?))
                 .invoke(ErrorKind::Docker)
                 .await?;
-            #[derive(serde::Deserialize)]
-            #[serde(rename_all = "PascalCase")]
-            struct DockerImagesOut {
-                repository: Option<String>,
-                tag: Option<String>,
-                #[serde(default)]
-                names: Vec<String>,
-            }
-            for image in {
-                #[cfg(feature = "docker")]
-                let images = std::str::from_utf8(
-                    &Command::new(CONTAINER_TOOL)
-                        .arg("images")
-                        .arg("--format=json")
-                        .invoke(ErrorKind::Docker)
-                        .await?,
-                )?
-                .lines()
-                .map(|l| serde_json::from_str::<DockerImagesOut>(l))
-                .collect::<Result<Vec<_>, _>>()
-                .with_kind(ErrorKind::Deserialization)?
-                .into_iter();
-                #[cfg(not(feature = "docker"))]
-                let images = serde_json::from_slice::<Vec<DockerImagesOut>>(
-                    &Command::new(CONTAINER_TOOL)
-                        .arg("images")
-                        .arg("--format=json")
-                        .invoke(ErrorKind::Docker)
-                        .await?,
-                )
-                .with_kind(ErrorKind::Deserialization)?
-                .into_iter();
-                images
-            }
-            .flat_map(|i| {
-                if let (Some(repository), Some(tag)) = (i.repository, i.tag) {
-                    vec![format!("{repository}:{tag}")]
+            for (image, system) in &images {
+                new_manifest.images.insert(image.clone());
+                let sqfs_path = images_dir.join(image).with_extension("squashfs");
+                let image_name = if *system {
+                    format!("start9/{}:latest", image)
                 } else {
-                    i.names
-                        .into_iter()
-                        .filter_map(|i| i.strip_prefix("docker.io/").map(|s| s.to_owned()))
-                        .collect()
-                }
-            })
-            .filter_map(|i| {
-                i.strip_suffix(&format!(":{}", manifest.version))
-                    .map(|s| s.to_owned())
-            })
-            .filter_map(|i| {
-                i.strip_prefix(&format!("start9/{}/", manifest.id))
-                    .map(|s| s.to_owned())
-            }) {
-                new_manifest.images.insert(image.parse()?);
-                let sqfs_path = images_dir.join(&image).with_extension("squashfs");
-                let image_name = format!("start9/{}/{}:{}", manifest.id, image, manifest.version);
+                    format!("start9/{}/{}:{}", manifest.id, image, manifest.version)
+                };
                 let id = String::from_utf8(
                     Command::new(CONTAINER_TOOL)
                         .arg("create")
@@ -323,6 +288,7 @@ impl S9pk<Section<MultiCursorFile>> {
 
         Ok(S9pk::deserialize(
             &MultiCursorFile::from(File::open(destination.as_ref()).await?),
+            None,
             false,
         )
         .await?)
@@ -337,8 +303,7 @@ impl From<ManifestV1> for Manifest {
             title: value.title,
             version: value.version,
             release_notes: value.release_notes,
-            license: value.license,
-            replaces: value.replaces,
+            license: value.license.into(),
             wrapper_repo: value.wrapper_repo,
             upstream_repo: value.upstream_repo,
             support_site: value.support_site.unwrap_or_else(|| default_url.clone()),
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index ee2358b13..b5ada621b 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -2,6 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use color_eyre::eyre::eyre;
 use helpers::const_true;
+use imbl_value::InternedString;
 pub use models::PackageId;
 use models::{ImageId, VolumeId};
 use serde::{Deserialize, Serialize};
@@ -10,12 +11,12 @@ use url::Url;
 
 use crate::dependencies::Dependencies;
 use crate::prelude::*;
-use crate::s9pk::v1::git_hash::GitHash;
+use crate::s9pk::git_hash::GitHash;
 use crate::util::serde::Regex;
-use crate::util::Version;
+use crate::util::VersionString;
 use crate::version::{Current, VersionT};
 
-fn current_version() -> Version {
+fn current_version() -> VersionString {
     Current::new().semver().into()
 }
 
@@ -26,12 +27,10 @@ fn current_version() -> Version {
 pub struct Manifest {
     pub id: PackageId,
     pub title: String,
-    #[ts(type = "string")]
-    pub version: Version,
+    pub version: VersionString,
     pub release_notes: String,
-    pub license: String, // type of license
-    #[serde(default)]
-    pub replaces: Vec<String>,
+    #[ts(type = "string")]
+    pub license: InternedString, // type of license
     #[ts(type = "string")]
     pub wrapper_repo: Url,
     #[ts(type = "string")]
@@ -56,8 +55,7 @@ pub struct Manifest {
     #[ts(type = "string | null")]
     pub git_hash: Option<GitHash>,
     #[serde(default = "current_version")]
-    #[ts(type = "string")]
-    pub os_version: Version,
+    pub os_version: VersionString,
     #[serde(default = "const_true")]
     pub has_config: bool,
 }
@@ -68,9 +66,11 @@ pub struct Manifest {
 pub struct HardwareRequirements {
     #[serde(default)]
     #[ts(type = "{ [key: string]: string }")]
-    device: BTreeMap<String, Regex>,
-    ram: Option<u64>,
-    pub arch: Option<Vec<String>>,
+    pub device: BTreeMap<String, Regex>,
+    #[ts(type = "number | null")]
+    pub ram: Option<u64>,
+    #[ts(type = "string[] | null")]
+    pub arch: Option<BTreeSet<InternedString>>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index 9452b7a72..e206c8553 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -7,6 +7,7 @@ use models::{mime, DataUrl, PackageId};
 use tokio::fs::File;
 
 use crate::prelude::*;
+use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
 use crate::s9pk::manifest::Manifest;
 use crate::s9pk::merkle_archive::file_contents::FileContents;
 use crate::s9pk::merkle_archive::sink::Sink;
@@ -96,7 +97,7 @@ impl<S> S9pk<S> {
     }
 }
 
-impl<S: FileSource> S9pk<S> {
+impl<S: FileSource + Clone> S9pk<S> {
     pub async fn new(archive: MerkleArchive<S>, size: Option<u64>) -> Result<Self, Error> {
         let manifest = extract_manifest(&archive).await?;
         Ok(Self {
@@ -173,9 +174,13 @@ impl<S: FileSource> S9pk<S> {
     }
 }
 
-impl<S: ArchiveSource> S9pk<Section<S>> {
+impl<S: ArchiveSource + Clone> S9pk<Section<S>> {
     #[instrument(skip_all)]
-    pub async fn deserialize(source: &S, apply_filter: bool) -> Result<Self, Error> {
+    pub async fn deserialize(
+        source: &S,
+        commitment: Option<&MerkleArchiveCommitment>,
+        apply_filter: bool,
+    ) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
 
         let mut header = source
@@ -193,7 +198,8 @@ impl<S: ArchiveSource> S9pk<Section<S>> {
             "Invalid Magic or Unexpected Version"
         );
 
-        let mut archive = MerkleArchive::deserialize(source, SIG_CONTEXT, &mut header).await?;
+        let mut archive =
+            MerkleArchive::deserialize(source, SIG_CONTEXT, &mut header, commitment).await?;
 
         if apply_filter {
             archive.filter(filter)?;
@@ -211,7 +217,7 @@ impl<S: ArchiveSource> S9pk<Section<S>> {
 }
 impl S9pk {
     pub async fn from_file(file: File, apply_filter: bool) -> Result<Self, Error> {
-        Self::deserialize(&MultiCursorFile::from(file), apply_filter).await
+        Self::deserialize(&MultiCursorFile::from(file), None, apply_filter).await
     }
     pub async fn open(
         path: impl AsRef<Path>,
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index ec8566133..e6ccdd131 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -22,7 +22,7 @@ use crate::install::PKG_ARCHIVE_DIR;
 use crate::lxc::ContainerId;
 use crate::prelude::*;
 use crate::progress::{NamedProgress, Progress};
-use crate::rpc_continuations::RequestGuid;
+use crate::rpc_continuations::Guid;
 use crate::s9pk::S9pk;
 use crate::service::service_map::InstallProgressHandles;
 use crate::service::transition::TransitionKind;
@@ -254,7 +254,7 @@ impl Service {
     pub async fn install(
         ctx: RpcContext,
         s9pk: S9pk,
-        src_version: Option<models::Version>,
+        src_version: Option<models::VersionString>,
         progress: Option<InstallProgressHandles>,
     ) -> Result<Self, Error> {
         let manifest = s9pk.as_manifest().clone();
@@ -339,7 +339,7 @@ impl Service {
         Ok(())
     }
 
-    pub async fn uninstall(self, target_version: Option<models::Version>) -> Result<(), Error> {
+    pub async fn uninstall(self, target_version: Option<models::VersionString>) -> Result<(), Error> {
         self.seed
             .persistent_container
             .execute(ProcedureName::Uninit, to_value(&target_version)?, None) // TODO timeout
@@ -513,7 +513,7 @@ pub struct ConnectParams {
 pub async fn connect_rpc(
     ctx: RpcContext,
     ConnectParams { id }: ConnectParams,
-) -> Result<RequestGuid, Error> {
+) -> Result<Guid, Error> {
     let id_ref = &id;
     crate::lxc::connect(
         &ctx,
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 44d17da30..31c5a8026 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1336,12 +1336,15 @@ async fn set_dependencies(
         };
         let (icon, title) = match async {
             let remote_s9pk = S9pk::deserialize(
-                &HttpSource::new(
-                    ctx.ctx.client.clone(),
-                    registry_url
-                        .join(&format!("package/v2/{}.s9pk?spec={}", dep_id, version_spec))?,
-                )
-                .await?,
+                &Arc::new(
+                    HttpSource::new(
+                        ctx.ctx.client.clone(),
+                        registry_url
+                            .join(&format!("package/v2/{}.s9pk?spec={}", dep_id, version_spec))?,
+                    )
+                    .await?,
+                ),
+                None, // TODO
                 true,
             )
             .await?;
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 02b0538ec..ba9188f32 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -89,7 +89,7 @@ impl ServiceMap {
     }
 
     #[instrument(skip_all)]
-    pub async fn install<S: FileSource>(
+    pub async fn install<S: FileSource + Clone>(
         &self,
         ctx: RpcContext,
         mut s9pk: S9pk<S>,
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index 5bcf8445d..be908e776 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -26,8 +26,10 @@ use crate::progress::{
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::{RegistryContext, RegistryUrlParams};
 use crate::registry::os::index::OsVersionInfo;
-use crate::registry::signer::FileValidator;
-use crate::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::registry::os::SIG_CONTEXT;
+use crate::registry::signer::commitment::blake3::Blake3Commitment;
+use crate::registry::signer::commitment::Commitment;
+use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::sound::{
     CIRCLE_OF_5THS_SHORT, UPDATE_FAILED_1, UPDATE_FAILED_2, UPDATE_FAILED_3, UPDATE_FAILED_4,
@@ -54,7 +56,7 @@ pub struct UpdateSystemRes {
     #[ts(type = "string | null")]
     target: Option<Version>,
     #[ts(type = "string | null")]
-    progress: Option<RequestGuid>,
+    progress: Option<Guid>,
 }
 
 /// An user/ daemon would call this to update the system to the latest version and do the updates available,
@@ -83,7 +85,7 @@ pub async fn update_system(
     let target =
         maybe_do_update(ctx.clone(), registry, target.unwrap_or(VersionRange::Any)).await?;
     let progress = if progress && target.is_some() {
-        let guid = RequestGuid::new();
+        let guid = Guid::new();
         ctx.clone()
             .rpc_continuations
             .add(
@@ -246,12 +248,12 @@ async fn maybe_do_update(
         ));
     }
 
-    let validator = asset.validate(asset.signature_info.all_signers())?;
+    asset.validate(SIG_CONTEXT, asset.all_signers())?;
 
     let mut progress = FullProgressTracker::new();
     let progress_handle = progress.handle();
     let mut download_phase = progress_handle.add_phase("Downloading File".into(), Some(100));
-    download_phase.set_total(validator.size()?);
+    download_phase.set_total(asset.commitment.size);
     let reverify_phase = progress_handle.add_phase("Reverifying File".into(), Some(10));
     let sync_boot_phase = progress_handle.add_phase("Syncing Boot Files".into(), Some(1));
     let finalize_phase = progress_handle.add_phase("Finalizing Update".into(), Some(1));
@@ -300,7 +302,6 @@ async fn maybe_do_update(
     tokio::spawn(async move {
         let res = do_update(
             ctx.clone(),
-            validator,
             asset,
             UpdateProgressHandles {
                 progress_handle,
@@ -382,8 +383,7 @@ struct UpdateProgressHandles {
 #[instrument(skip_all)]
 async fn do_update(
     ctx: RpcContext,
-    validator: FileValidator,
-    asset: RegistryAsset,
+    asset: RegistryAsset<Blake3Commitment>,
     UpdateProgressHandles {
         progress_handle,
         mut download_phase,
@@ -394,21 +394,23 @@ async fn do_update(
 ) -> Result<(), Error> {
     download_phase.start();
     let path = Path::new("/media/startos/images")
-        .join(hex::encode(&validator.blake3()?.as_bytes()[..16]))
+        .join(hex::encode(&asset.commitment.hash[..16]))
         .with_extension("rootfs");
     let mut dst = AtomicFile::new(&path, None::<&Path>)
         .await
         .with_kind(ErrorKind::Filesystem)?;
     let mut download_writer = download_phase.writer(&mut *dst);
     asset
-        .download(ctx.client.clone(), &mut download_writer, &validator)
+        .download(ctx.client.clone(), &mut download_writer)
         .await?;
     let (_, mut download_phase) = download_writer.into_inner();
+    dst.sync_all().await?;
     download_phase.complete();
 
     reverify_phase.start();
-    validator
-        .validate_file(&MultiCursorFile::open(&*dst).await?)
+    asset
+        .commitment
+        .check(&MultiCursorFile::open(&*dst).await?)
         .await?;
     dst.save().await.with_kind(ErrorKind::Filesystem)?;
     reverify_phase.complete();
diff --git a/core/startos/src/upload.rs b/core/startos/src/upload.rs
index 65494b1e4..f28d81799 100644
--- a/core/startos/src/upload.rs
+++ b/core/startos/src/upload.rs
@@ -9,18 +9,18 @@ use futures::{FutureExt, StreamExt};
 use http::header::CONTENT_LENGTH;
 use http::StatusCode;
 use tokio::fs::File;
-use tokio::io::{AsyncWrite, AsyncWriteExt};
+use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
 use tokio::sync::watch;
 
 use crate::context::RpcContext;
 use crate::prelude::*;
-use crate::rpc_continuations::{RequestGuid, RpcContinuation};
+use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::TmpDir;
 
-pub async fn upload(ctx: &RpcContext) -> Result<(RequestGuid, UploadingFile), Error> {
-    let guid = RequestGuid::new();
+pub async fn upload(ctx: &RpcContext) -> Result<(Guid, UploadingFile), Error> {
+    let guid = Guid::new();
     let (mut handle, file) = UploadingFile::new().await?;
     ctx.rpc_continuations
         .add(
@@ -120,22 +120,44 @@ impl Progress {
             .and_then(|a| a.expected_size)
     }
     async fn ready_for(watch: &mut watch::Receiver<Self>, size: u64) -> Result<(), Error> {
-        if let Some(e) = watch
-            .wait_for(|progress| progress.error.is_some() || progress.written >= size)
+        match &*watch
+            .wait_for(|progress| {
+                progress.error.is_some()
+                    || progress.written >= size
+                    || progress.expected_size.map_or(false, |e| e < size)
+            })
             .await
             .map_err(|_| {
                 Error::new(
                     eyre!("failed to determine upload progress"),
                     ErrorKind::Network,
                 )
-            })?
-            .error
-            .as_ref()
-            .map(|e| e.clone_output())
-        {
-            Err(e)
-        } else {
-            Ok(())
+            })? {
+            Progress { error: Some(e), .. } => Err(e.clone_output()),
+            Progress {
+                expected_size: Some(e),
+                ..
+            } if *e < size => Err(Error::new(
+                eyre!("file size is less than requested"),
+                ErrorKind::Network,
+            )),
+            _ => Ok(()),
+        }
+    }
+    async fn ready(watch: &mut watch::Receiver<Self>) -> Result<(), Error> {
+        match &*watch
+            .wait_for(|progress| {
+                progress.error.is_some() || Some(progress.written) == progress.expected_size
+            })
+            .await
+            .map_err(|_| {
+                Error::new(
+                    eyre!("failed to determine upload progress"),
+                    ErrorKind::Network,
+                )
+            })? {
+            Progress { error: Some(e), .. } => Err(e.clone_output()),
+            _ => Ok(()),
         }
     }
     fn complete(&mut self) -> bool {
@@ -156,13 +178,25 @@ impl Progress {
                 ));
                 true
             }
-            Self { error, .. } if error.is_none() => {
+            Self {
+                error,
+                expected_size: Some(_),
+                ..
+            } if error.is_none() => {
                 *error = Some(Error::new(
                     eyre!("Connection closed or timed out before full file received"),
                     ErrorKind::Network,
                 ));
                 true
             }
+            Self {
+                expected_size,
+                written,
+                ..
+            } if expected_size.is_none() => {
+                *expected_size = Some(*written);
+                true
+            }
             _ => false,
         }
     }
@@ -204,6 +238,10 @@ impl ArchiveSource for UploadingFile {
     async fn size(&self) -> Option<u64> {
         Progress::expected_size(&mut self.progress.clone()).await
     }
+    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+        Progress::ready(&mut self.progress.clone()).await?;
+        self.file.fetch_all().await
+    }
     async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
         Progress::ready_for(&mut self.progress.clone(), position + size).await?;
         self.file.fetch(position, size).await
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index 75ab2c708..16bafd8f6 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -1,4 +1,4 @@
-use std::collections::VecDeque;
+use std::collections::{BTreeSet, VecDeque};
 use std::future::Future;
 use std::io::Cursor;
 use std::os::unix::prelude::MetadataExt;
@@ -19,7 +19,7 @@ use tokio::io::{
     duplex, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, DuplexStream, ReadBuf, WriteHalf,
 };
 use tokio::net::TcpStream;
-use tokio::sync::Notify;
+use tokio::sync::{Notify, OwnedMutexGuard};
 use tokio::time::{Instant, Sleep};
 
 use crate::prelude::*;
@@ -804,7 +804,7 @@ pub struct TeeWriter<W1, W2> {
     #[pin]
     writer2: W2,
 }
-impl<W1: AsyncWrite, W2: AsyncWrite> TeeWriter<W1, W2> {
+impl<W1, W2> TeeWriter<W1, W2> {
     pub fn new(writer1: W1, writer2: W2, capacity: usize) -> Self {
         Self {
             capacity,
@@ -815,7 +815,6 @@ impl<W1: AsyncWrite, W2: AsyncWrite> TeeWriter<W1, W2> {
         }
     }
 }
-
 impl<W1: AsyncWrite + Unpin, W2: AsyncWrite + Unpin> TeeWriter<W1, W2> {
     pub async fn into_inner(mut self) -> Result<(W1, W2), Error> {
         self.flush().await?;
@@ -1007,3 +1006,114 @@ impl AsyncWrite for ParallelBlake3Writer {
         Poll::Pending
     }
 }
+
+#[pin_project::pin_project]
+pub struct TrackingIO<T> {
+    position: u64,
+    #[pin]
+    io: T,
+}
+impl<T> TrackingIO<T> {
+    pub fn new(start: u64, io: T) -> Self {
+        Self {
+            position: start,
+            io,
+        }
+    }
+    pub fn position(&self) -> u64 {
+        self.position
+    }
+    pub fn into_inner(self) -> T {
+        self.io
+    }
+}
+impl<W: AsyncWrite> AsyncWrite for TrackingIO<W> {
+    fn poll_write(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> std::task::Poll<Result<usize, std::io::Error>> {
+        let this = self.project();
+        let written = futures::ready!(this.io.poll_write(cx, buf)?);
+        *this.position += written as u64;
+        Poll::Ready(Ok(written))
+    }
+    fn poll_flush(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        self.project().io.poll_flush(cx)
+    }
+    fn poll_shutdown(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), std::io::Error>> {
+        self.project().io.poll_shutdown(cx)
+    }
+}
+impl<R: AsyncRead> AsyncRead for TrackingIO<R> {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
+        let this = self.project();
+        let start = buf.filled().len();
+        futures::ready!(this.io.poll_read(cx, buf)?);
+        *this.position += (buf.filled().len() - start) as u64;
+        Poll::Ready(Ok(()))
+    }
+}
+impl<T> std::cmp::PartialEq for TrackingIO<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.position.eq(&other.position)
+    }
+}
+impl<T> std::cmp::Eq for TrackingIO<T> {}
+impl<T> std::cmp::PartialOrd for TrackingIO<T> {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        self.position.partial_cmp(&other.position)
+    }
+}
+impl<T> std::cmp::Ord for TrackingIO<T> {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.position.cmp(&other.position)
+    }
+}
+impl<T> std::borrow::Borrow<u64> for TrackingIO<T> {
+    fn borrow(&self) -> &u64 {
+        &self.position
+    }
+}
+
+pub struct MutexIO<T>(OwnedMutexGuard<T>);
+impl<R: AsyncRead + Unpin> AsyncRead for MutexIO<R> {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
+        Pin::new(&mut *self.get_mut().0).poll_read(cx, buf)
+    }
+}
+impl<W: AsyncWrite + Unpin> AsyncWrite for MutexIO<W> {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> Poll<Result<usize, std::io::Error>> {
+        Pin::new(&mut *self.get_mut().0).poll_write(cx, buf)
+    }
+    fn poll_flush(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        Pin::new(&mut *self.get_mut().0).poll_flush(cx)
+    }
+    fn poll_shutdown(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        Pin::new(&mut *self.get_mut().0).poll_shutdown(cx)
+    }
+}
diff --git a/core/startos/src/util/lshw.rs b/core/startos/src/util/lshw.rs
index 2a658a8c8..eb5293d89 100644
--- a/core/startos/src/util/lshw.rs
+++ b/core/startos/src/util/lshw.rs
@@ -1,12 +1,13 @@
 use models::{Error, ResultExt};
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
+use ts_rs::TS;
 
 use crate::util::Invoke;
 
 const KNOWN_CLASSES: &[&str] = &["processor", "display"];
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(tag = "class")]
 #[serde(rename_all = "camelCase")]
 pub enum LshwDevice {
@@ -28,12 +29,12 @@ impl LshwDevice {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
 pub struct LshwProcessor {
     pub product: String,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
 pub struct LshwDisplay {
     pub product: String,
 }
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index ec64c6f97..aa17b6d7a 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -15,7 +15,7 @@ use helpers::canonicalize;
 pub use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use lazy_static::lazy_static;
-pub use models::Version;
+pub use models::VersionString;
 use pin_project::pin_project;
 use sha2::Digest;
 use tokio::fs::File;
diff --git a/core/startos/src/util/rpc.rs b/core/startos/src/util/rpc.rs
index 7d2356877..e80aac6cb 100644
--- a/core/startos/src/util/rpc.rs
+++ b/core/startos/src/util/rpc.rs
@@ -1,3 +1,4 @@
+use std::path::Path;
 
 use clap::Parser;
 use rpc_toolkit::{from_fn_async, Context, ParentHandler};
@@ -9,9 +10,11 @@ use crate::context::CliContext;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource};
+use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::ParallelBlake3Writer;
 use crate::util::serde::Base16;
+use crate::util::Apply;
+use crate::CAP_10_MiB;
 
 pub fn util<C: Context>() -> ParentHandler<C> {
     ParentHandler::new().subcommand("b3sum", from_fn_async(b3sum))
@@ -28,26 +31,29 @@ pub async fn b3sum(
     ctx: CliContext,
     B3sumParams { file, allow_mmap }: B3sumParams,
 ) -> Result<Base16<[u8; 32]>, Error> {
-    let source = if let Ok(url) = file.parse::<Url>() {
+    async fn b3sum_source<S: ArchiveSource>(source: S) -> Result<Base16<[u8; 32]>, Error> {
+        let mut hasher = ParallelBlake3Writer::new(CAP_10_MiB);
+        source.copy_all_to(&mut hasher).await?;
+        hasher.finalize().await.map(|h| *h.as_bytes()).map(Base16)
+    }
+    async fn b3sum_file(
+        path: impl AsRef<Path>,
+        allow_mmap: bool,
+    ) -> Result<Base16<[u8; 32]>, Error> {
+        let file = MultiCursorFile::from(File::open(path).await?);
+        if allow_mmap {
+            return file.blake3_mmap().await.map(|h| *h.as_bytes()).map(Base16);
+        }
+        b3sum_source(file).await
+    }
+    if let Ok(url) = file.parse::<Url>() {
         if url.scheme() == "file" {
-            let file = MultiCursorFile::from(File::open(url.path()).await?);
-            if allow_mmap {
-                return file.blake3_mmap().await.map(|h| *h.as_bytes()).map(Base16);
-            }
-            DynFileSource::new(file.section(
-                0,
-                file.size().await.ok_or_else(|| {
-                    Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem)
-                })?,
-            ))
+            b3sum_file(url.path(), allow_mmap).await
         } else if url.scheme() == "http" || url.scheme() == "https" {
-            let file = HttpSource::new(ctx.client.clone(), url).await?;
-            DynFileSource::new(file.section(
-                0,
-                file.size().await.ok_or_else(|| {
-                    Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem)
-                })?,
-            ))
+            HttpSource::new(ctx.client.clone(), url)
+                .await?
+                .apply(b3sum_source)
+                .await
         } else {
             return Err(Error::new(
                 eyre!("unknown scheme: {}", url.scheme()),
@@ -55,18 +61,6 @@ pub async fn b3sum(
             ));
         }
     } else {
-        let file = MultiCursorFile::from(File::open(file).await?);
-        if allow_mmap {
-            return file.blake3_mmap().await.map(|h| *h.as_bytes()).map(Base16);
-        }
-        DynFileSource::new(file.section(
-            0,
-            file.size().await.ok_or_else(|| {
-                Error::new(eyre!("failed to get file size"), ErrorKind::Filesystem)
-            })?,
-        ))
-    };
-    let mut hasher = ParallelBlake3Writer::new(crate::s9pk::merkle_archive::hash::BUFFER_CAPACITY);
-    source.copy(&mut hasher).await?;
-    hasher.finalize().await.map(|h| *h.as_bytes()).map(Base16)
+        b3sum_file(file, allow_mmap).await
+    }
 }
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 9696f9c91..382ef2814 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -22,6 +22,7 @@ use ts_rs::TS;
 
 use super::IntoDoubleEndedIterator;
 use crate::prelude::*;
+use crate::util::Apply;
 use crate::util::clap::FromStrParser;
 
 pub fn deserialize_from_str<
@@ -999,6 +1000,11 @@ impl<T: AsRef<[u8]>> std::fmt::Display for Base16<T> {
 #[derive(TS)]
 #[ts(type = "string", concrete(T = Vec<u8>))]
 pub struct Base32<T>(pub T);
+impl<T: AsRef<[u8]>> std::fmt::Display for Base32<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        base32::encode(base32::Alphabet::RFC4648 { padding: true }, self.0.as_ref()).fmt(f)
+    }
+}
 impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base32<T> {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -1022,32 +1028,35 @@ impl<T: AsRef<[u8]>> Serialize for Base32<T> {
     where
         S: Serializer,
     {
-        serializer.serialize_str(&base32::encode(
-            base32::Alphabet::RFC4648 { padding: true },
-            self.0.as_ref(),
-        ))
-    }
-}
-impl<T: AsRef<[u8]>> std::fmt::Display for Base32<T> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        base32::encode(base32::Alphabet::RFC4648 { padding: true }, self.0.as_ref()).fmt(f)
+        serialize_display(self, serializer)
     }
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, TS)]
 #[ts(type = "string", concrete(T = Vec<u8>))]
 pub struct Base64<T>(pub T);
+impl<T: AsRef<[u8]>> std::fmt::Display for Base64<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&base64::encode(self.0.as_ref()))
+    }
+}
+impl<T: TryFrom<Vec<u8>>> FromStr for Base64<T>
+{
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        base64::decode(&s)
+            .with_kind(ErrorKind::Deserialization)?
+            .apply(TryFrom::try_from)
+            .map(Self)
+            .map_err(|_| Error::new(eyre!("failed to create from buffer"), ErrorKind::Deserialization))
+    }
+}
 impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base64<T> {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        base64::decode(&s)
-            .map_err(serde::de::Error::custom)?
-            .try_into()
-            .map_err(|_| serde::de::Error::custom("invalid length"))
-            .map(Self)
+        deserialize_from_str(deserializer)
     }
 }
 impl<T: AsRef<[u8]>> Serialize for Base64<T> {
@@ -1055,7 +1064,7 @@ impl<T: AsRef<[u8]>> Serialize for Base64<T> {
     where
         S: Serializer,
     {
-        serializer.serialize_str(&base64::encode(self.0.as_ref()))
+        serialize_display(self, serializer)
     }
 }
 impl<T> Deref for Base64<T> {
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 1acce7896..7212b8801 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -28,7 +28,7 @@ enum Version {
 }
 
 impl Version {
-    fn from_util_version(version: crate::util::Version) -> Self {
+    fn from_util_version(version: crate::util::VersionString) -> Self {
         serde_json::to_value(version.clone())
             .and_then(serde_json::from_value)
             .unwrap_or_else(|_e| {
@@ -161,7 +161,7 @@ where
     T: VersionT,
 {
     fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        let v = crate::util::Version::deserialize(deserializer)?;
+        let v = crate::util::VersionString::deserialize(deserializer)?;
         let version = T::new();
         if *v < version.semver() {
             Ok(Self(version, v.into_version()))
@@ -186,7 +186,7 @@ where
     T: VersionT,
 {
     fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        let v = crate::util::Version::deserialize(deserializer)?;
+        let v = crate::util::VersionString::deserialize(deserializer)?;
         let version = T::new();
         if *v == version.semver() {
             Ok(Wrapper(version))
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index 32935bc7a..e801da79b 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -6,7 +6,7 @@ use models::{HostId, PackageId};
 
 use crate::net::PACKAGE_CERT_PATH;
 use crate::prelude::*;
-use crate::util::Version;
+use crate::util::VersionString;
 
 pub const PKG_VOLUME_DIR: &str = "package-data/volumes";
 pub const BACKUP_DIR: &str = "/media/startos/backups";
@@ -20,7 +20,7 @@ pub fn data_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, volume_id: &Volu
         .join(volume_id)
 }
 
-pub fn asset_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, version: &Version) -> PathBuf {
+pub fn asset_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, version: &VersionString) -> PathBuf {
     datadir
         .as_ref()
         .join(PKG_VOLUME_DIR)
diff --git a/sdk/lib/osBindings/AcceptSigners.ts b/sdk/lib/osBindings/AcceptSigners.ts
index 55d3997fe..1ef417623 100644
--- a/sdk/lib/osBindings/AcceptSigners.ts
+++ b/sdk/lib/osBindings/AcceptSigners.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { SignerKey } from "./SignerKey"
+import type { AnyVerifyingKey } from "./AnyVerifyingKey"
 
 export type AcceptSigners =
-  | { signer: SignerKey }
+  | { signer: AnyVerifyingKey }
   | { any: Array<AcceptSigners> }
   | { all: Array<AcceptSigners> }
diff --git a/sdk/lib/osBindings/AddAdminParams.ts b/sdk/lib/osBindings/AddAdminParams.ts
index a900f793b..9da08b54b 100644
--- a/sdk/lib/osBindings/AddAdminParams.ts
+++ b/sdk/lib/osBindings/AddAdminParams.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Guid } from "./Guid"
 
-export type AddAdminParams = { signer: string }
+export type AddAdminParams = { signer: Guid }
diff --git a/sdk/lib/osBindings/AddAssetParams.ts b/sdk/lib/osBindings/AddAssetParams.ts
index 6a4d3fdf7..ce6128cf7 100644
--- a/sdk/lib/osBindings/AddAssetParams.ts
+++ b/sdk/lib/osBindings/AddAssetParams.ts
@@ -1,12 +1,13 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Signature } from "./Signature"
-import type { SignerKey } from "./SignerKey"
+import type { AnySignature } from "./AnySignature"
+import type { Blake3Commitment } from "./Blake3Commitment"
+import type { Version } from "./Version"
 
 export type AddAssetParams = {
-  url: string
-  signature: Signature
-  version: string
+  version: Version
   platform: string
   upload: boolean
-  __auth_signer: SignerKey
+  url: string
+  signature: AnySignature
+  commitment: Blake3Commitment
 }
diff --git a/sdk/lib/osBindings/AddVersionParams.ts b/sdk/lib/osBindings/AddVersionParams.ts
index 9fc281a6f..4ecbb7dcc 100644
--- a/sdk/lib/osBindings/AddVersionParams.ts
+++ b/sdk/lib/osBindings/AddVersionParams.ts
@@ -1,7 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Version } from "./Version"
 
 export type AddVersionParams = {
-  version: string
+  version: Version
   headline: string
   releaseNotes: string
   sourceVersion: string
diff --git a/sdk/lib/osBindings/SignerKey.ts b/sdk/lib/osBindings/AnySignature.ts
similarity index 55%
rename from sdk/lib/osBindings/SignerKey.ts
rename to sdk/lib/osBindings/AnySignature.ts
index bd5c7c043..32b68b911 100644
--- a/sdk/lib/osBindings/SignerKey.ts
+++ b/sdk/lib/osBindings/AnySignature.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Pem } from "./Pem"
 
-export type SignerKey = { alg: "ed25519"; pubkey: Pem }
+export type AnySignature = string
diff --git a/sdk/lib/osBindings/AnySigningKey.ts b/sdk/lib/osBindings/AnySigningKey.ts
new file mode 100644
index 000000000..4933251e8
--- /dev/null
+++ b/sdk/lib/osBindings/AnySigningKey.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AnySigningKey = string
diff --git a/sdk/lib/osBindings/AnyVerifyingKey.ts b/sdk/lib/osBindings/AnyVerifyingKey.ts
new file mode 100644
index 000000000..58a45aaa7
--- /dev/null
+++ b/sdk/lib/osBindings/AnyVerifyingKey.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AnyVerifyingKey = string
diff --git a/sdk/lib/osBindings/Blake3Commitment.ts b/sdk/lib/osBindings/Blake3Commitment.ts
new file mode 100644
index 000000000..690559122
--- /dev/null
+++ b/sdk/lib/osBindings/Blake3Commitment.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Base64 } from "./Base64"
+
+export type Blake3Commitment = { hash: Base64; size: number }
diff --git a/sdk/lib/osBindings/Category.ts b/sdk/lib/osBindings/Category.ts
new file mode 100644
index 000000000..6e0815675
--- /dev/null
+++ b/sdk/lib/osBindings/Category.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Description } from "./Description"
+
+export type Category = { name: string; description: Description }
diff --git a/sdk/lib/osBindings/FullIndex.ts b/sdk/lib/osBindings/FullIndex.ts
index 8da15b4c0..4d9914015 100644
--- a/sdk/lib/osBindings/FullIndex.ts
+++ b/sdk/lib/osBindings/FullIndex.ts
@@ -1,5 +1,13 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DataUrl } from "./DataUrl"
+import type { Guid } from "./Guid"
 import type { OsIndex } from "./OsIndex"
+import type { PackageIndex } from "./PackageIndex"
 import type { SignerInfo } from "./SignerInfo"
 
-export type FullIndex = { os: OsIndex; signers: { [key: string]: SignerInfo } }
+export type FullIndex = {
+  icon: DataUrl | null
+  package: PackageIndex
+  os: OsIndex
+  signers: { [key: Guid]: SignerInfo }
+}
diff --git a/sdk/lib/osBindings/GetOsAssetParams.ts b/sdk/lib/osBindings/GetOsAssetParams.ts
index 100f711c7..9872d0b59 100644
--- a/sdk/lib/osBindings/GetOsAssetParams.ts
+++ b/sdk/lib/osBindings/GetOsAssetParams.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Version } from "./Version"
 
-export type GetOsAssetParams = { version: string; platform: string }
+export type GetOsAssetParams = { version: Version; platform: string }
diff --git a/sdk/lib/osBindings/GetPackageParams.ts b/sdk/lib/osBindings/GetPackageParams.ts
new file mode 100644
index 000000000..6dfecc9b2
--- /dev/null
+++ b/sdk/lib/osBindings/GetPackageParams.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageDetailLevel } from "./PackageDetailLevel"
+import type { PackageId } from "./PackageId"
+
+export type GetPackageParams = {
+  id: PackageId | null
+  version: string | null
+  sourceVersion: string | null
+  otherVersions: PackageDetailLevel | null
+}
diff --git a/sdk/lib/osBindings/GetPackageResponse.ts b/sdk/lib/osBindings/GetPackageResponse.ts
new file mode 100644
index 000000000..5bf24bfc0
--- /dev/null
+++ b/sdk/lib/osBindings/GetPackageResponse.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageInfoShort } from "./PackageInfoShort"
+import type { PackageVersionInfo } from "./PackageVersionInfo"
+import type { Version } from "./Version"
+
+export type GetPackageResponse = {
+  best: { [key: Version]: PackageVersionInfo }
+  otherVersions?: { [key: Version]: PackageInfoShort }
+}
diff --git a/sdk/lib/osBindings/GetPackageResponseFull.ts b/sdk/lib/osBindings/GetPackageResponseFull.ts
new file mode 100644
index 000000000..579924291
--- /dev/null
+++ b/sdk/lib/osBindings/GetPackageResponseFull.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageVersionInfo } from "./PackageVersionInfo"
+import type { Version } from "./Version"
+
+export type GetPackageResponseFull = {
+  best: { [key: Version]: PackageVersionInfo }
+  otherVersions: { [key: Version]: PackageVersionInfo }
+}
diff --git a/sdk/lib/osBindings/Pem.ts b/sdk/lib/osBindings/Guid.ts
similarity index 80%
rename from sdk/lib/osBindings/Pem.ts
rename to sdk/lib/osBindings/Guid.ts
index 1ec1cd375..28dc4d92d 100644
--- a/sdk/lib/osBindings/Pem.ts
+++ b/sdk/lib/osBindings/Guid.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Pem = string
+export type Guid = string
diff --git a/sdk/lib/osBindings/HardwareRequirements.ts b/sdk/lib/osBindings/HardwareRequirements.ts
index bbe7c3ef5..4964bc66f 100644
--- a/sdk/lib/osBindings/HardwareRequirements.ts
+++ b/sdk/lib/osBindings/HardwareRequirements.ts
@@ -2,6 +2,6 @@
 
 export type HardwareRequirements = {
   device: { [key: string]: string }
-  ram: bigint | null
+  ram: number | null
   arch: Array<string> | null
 }
diff --git a/sdk/lib/osBindings/ListVersionSignersParams.ts b/sdk/lib/osBindings/ListVersionSignersParams.ts
index baf516bf2..d066fbeb4 100644
--- a/sdk/lib/osBindings/ListVersionSignersParams.ts
+++ b/sdk/lib/osBindings/ListVersionSignersParams.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Version } from "./Version"
 
-export type ListVersionSignersParams = { version: string }
+export type ListVersionSignersParams = { version: Version }
diff --git a/sdk/lib/osBindings/Manifest.ts b/sdk/lib/osBindings/Manifest.ts
index 14f2224ef..7f06be25e 100644
--- a/sdk/lib/osBindings/Manifest.ts
+++ b/sdk/lib/osBindings/Manifest.ts
@@ -5,15 +5,15 @@ import type { Description } from "./Description"
 import type { HardwareRequirements } from "./HardwareRequirements"
 import type { ImageId } from "./ImageId"
 import type { PackageId } from "./PackageId"
+import type { Version } from "./Version"
 import type { VolumeId } from "./VolumeId"
 
 export type Manifest = {
   id: PackageId
   title: string
-  version: string
+  version: Version
   releaseNotes: string
   license: string
-  replaces: Array<string>
   wrapperRepo: string
   upstreamRepo: string
   supportSite: string
@@ -27,6 +27,6 @@ export type Manifest = {
   dependencies: Dependencies
   hardwareRequirements: HardwareRequirements
   gitHash: string | null
-  osVersion: string
+  osVersion: Version
   hasConfig: boolean
 }
diff --git a/sdk/lib/osBindings/Blake3Ed25519Signature.ts b/sdk/lib/osBindings/MerkleArchiveCommitment.ts
similarity index 52%
rename from sdk/lib/osBindings/Blake3Ed25519Signature.ts
rename to sdk/lib/osBindings/MerkleArchiveCommitment.ts
index 8d28cb9ec..5dcaa0aa3 100644
--- a/sdk/lib/osBindings/Blake3Ed25519Signature.ts
+++ b/sdk/lib/osBindings/MerkleArchiveCommitment.ts
@@ -1,10 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Base64 } from "./Base64"
-import type { Pem } from "./Pem"
 
-export type Blake3Ed25519Signature = {
-  hash: Base64
-  size: bigint
-  pubkey: Pem
-  signature: Base64
+export type MerkleArchiveCommitment = {
+  rootSighash: Base64
+  rootMaxsize: number
 }
diff --git a/sdk/lib/osBindings/OsIndex.ts b/sdk/lib/osBindings/OsIndex.ts
index 590e9f577..9fb795402 100644
--- a/sdk/lib/osBindings/OsIndex.ts
+++ b/sdk/lib/osBindings/OsIndex.ts
@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { OsVersionInfo } from "./OsVersionInfo"
+import type { Version } from "./Version"
 
-export type OsIndex = { versions: { [key: string]: OsVersionInfo } }
+export type OsIndex = { versions: { [key: Version]: OsVersionInfo } }
diff --git a/sdk/lib/osBindings/OsVersionInfo.ts b/sdk/lib/osBindings/OsVersionInfo.ts
index fc40ef842..7cd0fde9e 100644
--- a/sdk/lib/osBindings/OsVersionInfo.ts
+++ b/sdk/lib/osBindings/OsVersionInfo.ts
@@ -1,12 +1,14 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Blake3Commitment } from "./Blake3Commitment"
+import type { Guid } from "./Guid"
 import type { RegistryAsset } from "./RegistryAsset"
 
 export type OsVersionInfo = {
   headline: string
   releaseNotes: string
   sourceVersion: string
-  signers: string[]
-  iso: { [key: string]: RegistryAsset }
-  squashfs: { [key: string]: RegistryAsset }
-  img: { [key: string]: RegistryAsset }
+  signers: Array<Guid>
+  iso: { [key: string]: RegistryAsset<Blake3Commitment> }
+  squashfs: { [key: string]: RegistryAsset<Blake3Commitment> }
+  img: { [key: string]: RegistryAsset<Blake3Commitment> }
 }
diff --git a/sdk/lib/osBindings/PackageDetailLevel.ts b/sdk/lib/osBindings/PackageDetailLevel.ts
new file mode 100644
index 000000000..b5e1ae42b
--- /dev/null
+++ b/sdk/lib/osBindings/PackageDetailLevel.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type PackageDetailLevel = "short" | "full"
diff --git a/sdk/lib/osBindings/PackageIndex.ts b/sdk/lib/osBindings/PackageIndex.ts
new file mode 100644
index 000000000..5e8c94945
--- /dev/null
+++ b/sdk/lib/osBindings/PackageIndex.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Category } from "./Category"
+import type { PackageId } from "./PackageId"
+import type { PackageInfo } from "./PackageInfo"
+
+export type PackageIndex = {
+  categories: { [key: string]: Category }
+  packages: { [key: PackageId]: PackageInfo }
+}
diff --git a/sdk/lib/osBindings/PackageInfo.ts b/sdk/lib/osBindings/PackageInfo.ts
new file mode 100644
index 000000000..af340424f
--- /dev/null
+++ b/sdk/lib/osBindings/PackageInfo.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Guid } from "./Guid"
+import type { PackageVersionInfo } from "./PackageVersionInfo"
+import type { Version } from "./Version"
+
+export type PackageInfo = {
+  signers: Array<Guid>
+  versions: { [key: Version]: PackageVersionInfo }
+}
diff --git a/sdk/lib/osBindings/PackageInfoShort.ts b/sdk/lib/osBindings/PackageInfoShort.ts
new file mode 100644
index 000000000..22c7fbea4
--- /dev/null
+++ b/sdk/lib/osBindings/PackageInfoShort.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type PackageInfoShort = { releaseNotes: string }
diff --git a/sdk/lib/osBindings/PackageVersionInfo.ts b/sdk/lib/osBindings/PackageVersionInfo.ts
new file mode 100644
index 000000000..da82540cd
--- /dev/null
+++ b/sdk/lib/osBindings/PackageVersionInfo.ts
@@ -0,0 +1,25 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DataUrl } from "./DataUrl"
+import type { Description } from "./Description"
+import type { HardwareRequirements } from "./HardwareRequirements"
+import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
+import type { RegistryAsset } from "./RegistryAsset"
+import type { Version } from "./Version"
+
+export type PackageVersionInfo = {
+  title: string
+  icon: DataUrl
+  description: Description
+  releaseNotes: string
+  gitHash: string
+  license: string
+  wrapperRepo: string
+  upstreamRepo: string
+  supportSite: string
+  marketingSite: string
+  categories: string[]
+  osVersion: Version
+  hardwareRequirements: HardwareRequirements
+  sourceVersion: string | null
+  s9pk: RegistryAsset<MerkleArchiveCommitment>
+}
diff --git a/sdk/lib/osBindings/RegistryAsset.ts b/sdk/lib/osBindings/RegistryAsset.ts
index cb878c66a..3eb13e8a4 100644
--- a/sdk/lib/osBindings/RegistryAsset.ts
+++ b/sdk/lib/osBindings/RegistryAsset.ts
@@ -1,4 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { SignatureInfo } from "./SignatureInfo"
+import type { AnySignature } from "./AnySignature"
+import type { AnyVerifyingKey } from "./AnyVerifyingKey"
 
-export type RegistryAsset = { url: string; signatureInfo: SignatureInfo }
+export type RegistryAsset<Commitment> = {
+  url: string
+  commitment: Commitment
+  signatures: { [key: AnyVerifyingKey]: AnySignature }
+}
diff --git a/sdk/lib/osBindings/RemoveVersionParams.ts b/sdk/lib/osBindings/RemoveVersionParams.ts
index 2c974de56..d00a6ee9e 100644
--- a/sdk/lib/osBindings/RemoveVersionParams.ts
+++ b/sdk/lib/osBindings/RemoveVersionParams.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Version } from "./Version"
 
-export type RemoveVersionParams = { version: string }
+export type RemoveVersionParams = { version: Version }
diff --git a/sdk/lib/osBindings/Blake3Ed2551SignatureInfo.ts b/sdk/lib/osBindings/RequestCommitment.ts
similarity index 51%
rename from sdk/lib/osBindings/Blake3Ed2551SignatureInfo.ts
rename to sdk/lib/osBindings/RequestCommitment.ts
index efe18aca7..89df04e4a 100644
--- a/sdk/lib/osBindings/Blake3Ed2551SignatureInfo.ts
+++ b/sdk/lib/osBindings/RequestCommitment.ts
@@ -1,9 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Base64 } from "./Base64"
-import type { Pem } from "./Pem"
 
-export type Blake3Ed2551SignatureInfo = {
-  hash: Base64
-  size: bigint
-  signatures: { [key: Pem]: Base64 }
+export type RequestCommitment = {
+  timestamp: number
+  nonce: number
+  size: number
+  blake3: Base64
 }
diff --git a/sdk/lib/osBindings/ServerInfo.ts b/sdk/lib/osBindings/ServerInfo.ts
index 935e3a99f..92b8b9b8f 100644
--- a/sdk/lib/osBindings/ServerInfo.ts
+++ b/sdk/lib/osBindings/ServerInfo.ts
@@ -2,6 +2,7 @@
 import type { Governor } from "./Governor"
 import type { IpInfo } from "./IpInfo"
 import type { ServerStatus } from "./ServerStatus"
+import type { Version } from "./Version"
 import type { WifiInfo } from "./WifiInfo"
 
 export type ServerInfo = {
@@ -9,7 +10,7 @@ export type ServerInfo = {
   platform: string
   id: string
   hostname: string
-  version: string
+  version: Version
   lastBackup: string | null
   eosVersionCompat: string
   lanAddress: string
diff --git a/sdk/lib/osBindings/SetMainStatus.ts b/sdk/lib/osBindings/SetMainStatus.ts
index aa4aff0b2..6dcca73e9 100644
--- a/sdk/lib/osBindings/SetMainStatus.ts
+++ b/sdk/lib/osBindings/SetMainStatus.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Status } from "./Status"
+import type { SetMainStatusStatus } from "./SetMainStatusStatus"
 
-export type SetMainStatus = { status: "running" | "stopped" | "starting" }
+export type SetMainStatus = { status: SetMainStatusStatus }
diff --git a/sdk/lib/osBindings/SetMainStatusStatus.ts b/sdk/lib/osBindings/SetMainStatusStatus.ts
new file mode 100644
index 000000000..6db32e7bf
--- /dev/null
+++ b/sdk/lib/osBindings/SetMainStatusStatus.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetMainStatusStatus = "running" | "stopped" | "starting"
diff --git a/sdk/lib/osBindings/SignAssetParams.ts b/sdk/lib/osBindings/SignAssetParams.ts
index 3b3612c47..d55a061a7 100644
--- a/sdk/lib/osBindings/SignAssetParams.ts
+++ b/sdk/lib/osBindings/SignAssetParams.ts
@@ -1,8 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Signature } from "./Signature"
+import type { AnySignature } from "./AnySignature"
+import type { Version } from "./Version"
 
 export type SignAssetParams = {
-  version: string
+  version: Version
   platform: string
-  signature: Signature
+  signature: AnySignature
 }
diff --git a/sdk/lib/osBindings/Signature.ts b/sdk/lib/osBindings/Signature.ts
deleted file mode 100644
index a27ada0e7..000000000
--- a/sdk/lib/osBindings/Signature.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Blake3Ed25519Signature } from "./Blake3Ed25519Signature"
-
-export type Signature = { blake3Ed25519: Blake3Ed25519Signature }
diff --git a/sdk/lib/osBindings/SignatureInfo.ts b/sdk/lib/osBindings/SignatureInfo.ts
deleted file mode 100644
index 41a093742..000000000
--- a/sdk/lib/osBindings/SignatureInfo.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Blake3Ed2551SignatureInfo } from "./Blake3Ed2551SignatureInfo"
-
-export type SignatureInfo = {
-  context: string
-  "blake-3-ed-25-5i-9": Blake3Ed2551SignatureInfo | null
-}
diff --git a/sdk/lib/osBindings/SignerInfo.ts b/sdk/lib/osBindings/SignerInfo.ts
index 06293cbab..7e7aa2588 100644
--- a/sdk/lib/osBindings/SignerInfo.ts
+++ b/sdk/lib/osBindings/SignerInfo.ts
@@ -1,9 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AnyVerifyingKey } from "./AnyVerifyingKey"
 import type { ContactInfo } from "./ContactInfo"
-import type { SignerKey } from "./SignerKey"
 
 export type SignerInfo = {
   name: string
   contact: Array<ContactInfo>
-  keys: Array<SignerKey>
+  keys: Array<AnyVerifyingKey>
 }
diff --git a/sdk/lib/osBindings/Version.ts b/sdk/lib/osBindings/Version.ts
new file mode 100644
index 000000000..b49b6e887
--- /dev/null
+++ b/sdk/lib/osBindings/Version.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Version = string
diff --git a/sdk/lib/osBindings/VersionSignerParams.ts b/sdk/lib/osBindings/VersionSignerParams.ts
index 70acdaa2e..102eecefd 100644
--- a/sdk/lib/osBindings/VersionSignerParams.ts
+++ b/sdk/lib/osBindings/VersionSignerParams.ts
@@ -1,3 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Guid } from "./Guid"
+import type { Version } from "./Version"
 
-export type VersionSignerParams = { version: string; signer: string }
+export type VersionSignerParams = { version: Version; signer: Guid }
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 4fcb9a617..16fc56a74 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -11,14 +11,17 @@ export { Algorithm } from "./Algorithm"
 export { AllowedStatuses } from "./AllowedStatuses"
 export { AllPackageData } from "./AllPackageData"
 export { AlpnInfo } from "./AlpnInfo"
+export { AnySignature } from "./AnySignature"
+export { AnySigningKey } from "./AnySigningKey"
+export { AnyVerifyingKey } from "./AnyVerifyingKey"
 export { BackupProgress } from "./BackupProgress"
 export { Base64 } from "./Base64"
 export { BindInfo } from "./BindInfo"
 export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
-export { Blake3Ed25519Signature } from "./Blake3Ed25519Signature"
-export { Blake3Ed2551SignatureInfo } from "./Blake3Ed2551SignatureInfo"
+export { Blake3Commitment } from "./Blake3Commitment"
 export { Callback } from "./Callback"
+export { Category } from "./Category"
 export { CheckDependenciesParam } from "./CheckDependenciesParam"
 export { CheckDependenciesResult } from "./CheckDependenciesResult"
 export { ChrootParams } from "./ChrootParams"
@@ -48,6 +51,9 @@ export { FullProgress } from "./FullProgress"
 export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind"
 export { GetHostInfoParams } from "./GetHostInfoParams"
 export { GetOsAssetParams } from "./GetOsAssetParams"
+export { GetPackageParams } from "./GetPackageParams"
+export { GetPackageResponseFull } from "./GetPackageResponseFull"
+export { GetPackageResponse } from "./GetPackageResponse"
 export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams"
 export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams"
 export { GetServicePortForwardParams } from "./GetServicePortForwardParams"
@@ -57,6 +63,7 @@ export { GetStoreParams } from "./GetStoreParams"
 export { GetSystemSmtpParams } from "./GetSystemSmtpParams"
 export { GetVersionParams } from "./GetVersionParams"
 export { Governor } from "./Governor"
+export { Guid } from "./Guid"
 export { HardwareRequirements } from "./HardwareRequirements"
 export { HealthCheckId } from "./HealthCheckId"
 export { HealthCheckResult } from "./HealthCheckResult"
@@ -75,24 +82,30 @@ export { ListVersionSignersParams } from "./ListVersionSignersParams"
 export { MainStatus } from "./MainStatus"
 export { Manifest } from "./Manifest"
 export { MaybeUtf8String } from "./MaybeUtf8String"
+export { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
 export { MountParams } from "./MountParams"
 export { MountTarget } from "./MountTarget"
 export { NamedProgress } from "./NamedProgress"
 export { OsIndex } from "./OsIndex"
 export { OsVersionInfo } from "./OsVersionInfo"
 export { PackageDataEntry } from "./PackageDataEntry"
+export { PackageDetailLevel } from "./PackageDetailLevel"
 export { PackageId } from "./PackageId"
+export { PackageIndex } from "./PackageIndex"
+export { PackageInfoShort } from "./PackageInfoShort"
+export { PackageInfo } from "./PackageInfo"
 export { PackageState } from "./PackageState"
+export { PackageVersionInfo } from "./PackageVersionInfo"
 export { ParamsMaybePackageId } from "./ParamsMaybePackageId"
 export { ParamsPackageId } from "./ParamsPackageId"
 export { PasswordType } from "./PasswordType"
-export { Pem } from "./Pem"
 export { Progress } from "./Progress"
 export { Public } from "./Public"
 export { RegistryAsset } from "./RegistryAsset"
 export { RemoveActionParams } from "./RemoveActionParams"
 export { RemoveAddressParams } from "./RemoveAddressParams"
 export { RemoveVersionParams } from "./RemoveVersionParams"
+export { RequestCommitment } from "./RequestCommitment"
 export { ReverseProxyBind } from "./ReverseProxyBind"
 export { ReverseProxyDestination } from "./ReverseProxyDestination"
 export { ReverseProxyHttp } from "./ReverseProxyHttp"
@@ -111,16 +124,15 @@ export { Session } from "./Session"
 export { SetConfigured } from "./SetConfigured"
 export { SetDependenciesParams } from "./SetDependenciesParams"
 export { SetHealth } from "./SetHealth"
+export { SetMainStatusStatus } from "./SetMainStatusStatus"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetStoreParams } from "./SetStoreParams"
 export { SetSystemSmtpParams } from "./SetSystemSmtpParams"
 export { SignAssetParams } from "./SignAssetParams"
-export { SignatureInfo } from "./SignatureInfo"
-export { Signature } from "./Signature"
 export { SignerInfo } from "./SignerInfo"
-export { SignerKey } from "./SignerKey"
 export { Status } from "./Status"
 export { UpdatingState } from "./UpdatingState"
 export { VersionSignerParams } from "./VersionSignerParams"
+export { Version } from "./Version"
 export { VolumeId } from "./VolumeId"
 export { WifiInfo } from "./WifiInfo"
diff --git a/web/projects/marketplace/src/pages/show/additional/additional.component.html b/web/projects/marketplace/src/pages/show/additional/additional.component.html
index d362991e3..a75daa3db 100644
--- a/web/projects/marketplace/src/pages/show/additional/additional.component.html
+++ b/web/projects/marketplace/src/pages/show/additional/additional.component.html
@@ -1,14 +1,3 @@
-<ng-container *ngIf="pkg.manifest.replaces as replaces">
-  <div *ngIf="replaces.length" class="ion-padding-bottom">
-    <ion-item-divider>Intended to replace</ion-item-divider>
-    <ul>
-      <li *ngFor="let app of replaces">
-        {{ app }}
-      </li>
-    </ul>
-  </div>
-</ng-container>
-
 <ion-item-divider>Additional Info</ion-item-divider>
 <ion-grid *ngIf="pkg.manifest as manifest">
   <ion-row>
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 59ef6dd1e..2b0b96d23 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -51,7 +51,6 @@ export module Mock {
       short: 'A Bitcoin full node by Bitcoin Core.',
       long: 'Bitcoin is a decentralized consensus protocol and settlement network.',
     },
-    replaces: ['banks', 'governments'],
     releaseNotes: 'Taproot, Schnorr, and more.',
     license: 'MIT',
     wrapperRepo: 'https://github.com/start9labs/bitcoind-wrapper',
@@ -89,7 +88,6 @@ export module Mock {
       short: 'A bolt spec compliant client.',
       long: 'More info about LND. More info about LND. More info about LND.',
     },
-    replaces: ['banks', 'governments'],
     releaseNotes: 'Dual funded channels!',
     license: 'MIT',
     wrapperRepo: 'https://github.com/start9labs/lnd-wrapper',
@@ -158,7 +156,6 @@ export module Mock {
         optional: false,
       },
     },
-    replaces: [],
     hasConfig: false,
     images: ['main'],
     assets: [],

From 2568bfde5e94bac25e3e8353daeb6943bdc4bca9 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 31 May 2024 13:46:58 -0600
Subject: [PATCH 152/341] create skeleton

---
 Makefile                                      |   2 +-
 core/build-analyticsd.sh                      |  42 ++++++
 core/{build-reg.sh => build-registrybox.sh}   |   0
 core/{build-prod.sh => build-startos-bins.sh} |   0
 core/startos/Cargo.toml                       |   7 +-
 core/startos/src/analytics/context.rs         | 121 ++++++++++++++++++
 core/startos/src/analytics/mod.rs             |  78 +++++++++++
 core/startos/src/bins/analyticsd.rs           |  86 +++++++++++++
 core/startos/src/bins/mod.rs                  |   4 +
 core/startos/src/context/config.rs            |   3 +
 core/startos/src/context/rpc.rs               |   5 +
 core/startos/src/lib.rs                       |   9 +-
 core/startos/src/lxc/dev.rs                   | 112 ++++++++++++++++
 core/startos/src/lxc/mod.rs                   | 117 +----------------
 core/startos/src/os_install/mod.rs            |   4 +
 core/startos/src/registry/context.rs          |  21 ++-
 sdk/lib/osBindings/AddAssetParams.ts          |   1 -
 sdk/lib/osBindings/AddPackageParams.ts        |   9 ++
 sdk/lib/osBindings/GetPackageResponse.ts      |   1 +
 sdk/lib/osBindings/GetPackageResponseFull.ts  |   1 +
 sdk/lib/osBindings/HardwareRequirements.ts    |   2 +-
 sdk/lib/osBindings/OsVersionInfo.ts           |   2 +-
 sdk/lib/osBindings/PackageInfo.ts             |   3 +-
 sdk/lib/osBindings/PackageVersionInfo.ts      |   1 -
 sdk/lib/osBindings/index.ts                   |   1 +
 25 files changed, 508 insertions(+), 124 deletions(-)
 create mode 100755 core/build-analyticsd.sh
 rename core/{build-reg.sh => build-registrybox.sh} (100%)
 rename core/{build-prod.sh => build-startos-bins.sh} (100%)
 create mode 100644 core/startos/src/analytics/context.rs
 create mode 100644 core/startos/src/analytics/mod.rs
 create mode 100644 core/startos/src/bins/analyticsd.rs
 create mode 100644 core/startos/src/lxc/dev.rs
 create mode 100644 sdk/lib/osBindings/AddPackageParams.ts

diff --git a/Makefile b/Makefile
index ff5b9c4ad..7b488d2d2 100644
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,7 @@ system-images/binfmt/docker-images/$(ARCH).tar: $(BINFMT_SRC)
 	cd system-images/binfmt && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
 
 $(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE)
-	cd core && ARCH=$(ARCH) ./build-prod.sh
+	cd core && ARCH=$(ARCH) ./build-startos-bins.sh
 	touch $(BINS)
 
 web/node_modules/.package-lock.json: web/package.json sdk/dist
diff --git a/core/build-analyticsd.sh b/core/build-analyticsd.sh
new file mode 100755
index 000000000..4f8578da1
--- /dev/null
+++ b/core/build-analyticsd.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -e
+shopt -s expand_aliases
+
+if [ -z "$ARCH" ]; then
+	ARCH=$(uname -m)
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+cd ..
+FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
+RUSTFLAGS=""
+
+if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
+	RUSTFLAGS="--cfg tokio_unstable"
+fi
+
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+
+set +e
+fail=
+echo "FEATURES=\"$FEATURES\""
+echo "RUSTFLAGS=\"$RUSTFLAGS\""
+if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features analyticsd,$FEATURES --locked --bin analyticsd --target=$ARCH-unknown-linux-musl)"; then 
+	fail=true
+fi
+set -e
+cd core
+
+sudo chown -R $USER target
+sudo chown -R $USER ~/.cargo
+
+if [ -n "$fail" ]; then
+	exit 1
+fi
diff --git a/core/build-reg.sh b/core/build-registrybox.sh
similarity index 100%
rename from core/build-reg.sh
rename to core/build-registrybox.sh
diff --git a/core/build-prod.sh b/core/build-startos-bins.sh
similarity index 100%
rename from core/build-prod.sh
rename to core/build-startos-bins.sh
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index bd064a167..fa2bac69d 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -37,12 +37,17 @@ path = "src/main.rs"
 name = "registrybox"
 path = "src/main.rs"
 
+[[bin]]
+name = "analyticsd"
+path = "src/main.rs"
+
 [features]
 cli = []
 container-runtime = []
 daemon = []
 registry = []
-default = ["cli", "daemon", "registry"]
+analyticsd = []
+default = ["cli", "daemon"]
 dev = []
 unstable = ["console-subscriber", "tokio/tracing"]
 docker = []
diff --git a/core/startos/src/analytics/context.rs b/core/startos/src/analytics/context.rs
new file mode 100644
index 000000000..8ece8479b
--- /dev/null
+++ b/core/startos/src/analytics/context.rs
@@ -0,0 +1,121 @@
+use std::net::{Ipv4Addr, SocketAddr};
+use std::ops::Deref;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use clap::Parser;
+use reqwest::{Client, Proxy};
+use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{call_remote_http, CallRemote, Context, Empty};
+use serde::{Deserialize, Serialize};
+use sqlx::PgPool;
+use tokio::sync::broadcast::Sender;
+use tracing::instrument;
+use url::Url;
+
+use crate::context::config::{ContextConfig, CONFIG_PATH};
+use crate::context::RpcContext;
+use crate::prelude::*;
+use crate::rpc_continuations::RpcContinuations;
+
+#[derive(Debug, Clone, Default, Deserialize, Serialize, Parser)]
+#[serde(rename_all = "kebab-case")]
+#[command(rename_all = "kebab-case")]
+pub struct AnalyticsConfig {
+    #[arg(short = 'c', long = "config")]
+    pub config: Option<PathBuf>,
+    #[arg(short = 'l', long = "listen")]
+    pub listen: Option<SocketAddr>,
+    #[arg(short = 'p', long = "proxy")]
+    pub tor_proxy: Option<Url>,
+    #[arg(short = 'd', long = "dbconnect")]
+    pub dbconnect: Option<Url>,
+}
+impl ContextConfig for AnalyticsConfig {
+    fn next(&mut self) -> Option<PathBuf> {
+        self.config.take()
+    }
+    fn merge_with(&mut self, other: Self) {
+        self.listen = self.listen.take().or(other.listen);
+        self.tor_proxy = self.tor_proxy.take().or(other.tor_proxy);
+        self.dbconnect = self.dbconnect.take().or(other.dbconnect);
+    }
+}
+
+impl AnalyticsConfig {
+    pub fn load(mut self) -> Result<Self, Error> {
+        let path = self.next();
+        self.load_path_rec(path)?;
+        self.load_path_rec(Some(CONFIG_PATH))?;
+        Ok(self)
+    }
+}
+
+pub struct AnalyticsContextSeed {
+    pub listen: SocketAddr,
+    pub db: PgPool,
+    pub rpc_continuations: RpcContinuations,
+    pub client: Client,
+    pub shutdown: Sender<()>,
+}
+
+#[derive(Clone)]
+pub struct AnalyticsContext(Arc<AnalyticsContextSeed>);
+impl AnalyticsContext {
+    #[instrument(skip_all)]
+    pub async fn init(config: &AnalyticsConfig) -> Result<Self, Error> {
+        let (shutdown, _) = tokio::sync::broadcast::channel(1);
+        let dbconnect = config
+            .dbconnect
+            .clone()
+            .unwrap_or_else(|| "postgres://localhost/analytics".parse().unwrap())
+            .to_owned();
+        let db = PgPool::connect(dbconnect.as_str()).await?;
+        let tor_proxy_url = config
+            .tor_proxy
+            .clone()
+            .map(Ok)
+            .unwrap_or_else(|| "socks5h://localhost:9050".parse())?;
+        Ok(Self(Arc::new(AnalyticsContextSeed {
+            listen: config
+                .listen
+                .unwrap_or(SocketAddr::new(Ipv4Addr::LOCALHOST.into(), 5959)),
+            db,
+            rpc_continuations: RpcContinuations::new(),
+            client: Client::builder()
+                .proxy(Proxy::custom(move |url| {
+                    if url.host_str().map_or(false, |h| h.ends_with(".onion")) {
+                        Some(tor_proxy_url.clone())
+                    } else {
+                        None
+                    }
+                }))
+                .build()
+                .with_kind(crate::ErrorKind::ParseUrl)?,
+            shutdown,
+        })))
+    }
+}
+impl AsRef<RpcContinuations> for AnalyticsContext {
+    fn as_ref(&self) -> &RpcContinuations {
+        &self.rpc_continuations
+    }
+}
+
+impl Context for AnalyticsContext {}
+impl Deref for AnalyticsContext {
+    type Target = AnalyticsContextSeed;
+    fn deref(&self) -> &Self::Target {
+        &*self.0
+    }
+}
+
+impl CallRemote<AnalyticsContext> for RpcContext {
+    async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
+        if let Some(analytics_url) = self.analytics_url.clone() {
+            call_remote_http(&self.client, analytics_url, method, params).await
+        } else {
+            Ok(Value::Null)
+        }
+    }
+}
diff --git a/core/startos/src/analytics/mod.rs b/core/startos/src/analytics/mod.rs
new file mode 100644
index 000000000..52ca37948
--- /dev/null
+++ b/core/startos/src/analytics/mod.rs
@@ -0,0 +1,78 @@
+use std::net::SocketAddr;
+
+use axum::Router;
+use futures::future::ready;
+use rpc_toolkit::{Context, ParentHandler, Server};
+
+use crate::analytics::context::AnalyticsContext;
+use crate::middleware::cors::Cors;
+use crate::net::static_server::{bad_request, not_found, server_error};
+use crate::net::web_server::WebServer;
+use crate::rpc_continuations::Guid;
+
+pub mod context;
+
+pub fn analytics_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new() // TODO: FullMetal
+}
+
+pub fn analytics_server_router(ctx: AnalyticsContext) -> Router {
+    use axum::extract as x;
+    use axum::routing::{any, get, post};
+    Router::new()
+        .route("/rpc/*path", {
+            let ctx = ctx.clone();
+            post(
+                Server::new(move || ready(Ok(ctx.clone())), analytics_api())
+                    .middleware(Cors::new())
+            )
+        })
+        .route(
+            "/ws/rpc/*path",
+            get({
+                let ctx = ctx.clone();
+                move |x::Path(path): x::Path<String>,
+                      ws: axum::extract::ws::WebSocketUpgrade| async move {
+                    match Guid::from(&path) {
+                        None => {
+                            tracing::debug!("No Guid Path");
+                            bad_request()
+                        }
+                        Some(guid) => match ctx.rpc_continuations.get_ws_handler(&guid).await {
+                            Some(cont) => ws.on_upgrade(cont),
+                            _ => not_found(),
+                        },
+                    }
+                }
+            }),
+        )
+        .route(
+            "/rest/rpc/*path",
+            any({
+                let ctx = ctx.clone();
+                move |request: x::Request| async move {
+                    let path = request
+                        .uri()
+                        .path()
+                        .strip_prefix("/rest/rpc/")
+                        .unwrap_or_default();
+                    match Guid::from(&path) {
+                        None => {
+                            tracing::debug!("No Guid Path");
+                            bad_request()
+                        }
+                        Some(guid) => match ctx.rpc_continuations.get_rest_handler(&guid).await {
+                            None => not_found(),
+                            Some(cont) => cont(request).await.unwrap_or_else(server_error),
+                        },
+                    }
+                }
+            }),
+        )
+}
+
+impl WebServer {
+    pub fn analytics(bind: SocketAddr, ctx: AnalyticsContext) -> Self {
+        Self::new(bind, analytics_server_router(ctx))
+    }
+}
diff --git a/core/startos/src/bins/analyticsd.rs b/core/startos/src/bins/analyticsd.rs
new file mode 100644
index 000000000..e37a7dae1
--- /dev/null
+++ b/core/startos/src/bins/analyticsd.rs
@@ -0,0 +1,86 @@
+use std::ffi::OsString;
+
+use clap::Parser;
+use futures::FutureExt;
+use tokio::signal::unix::signal;
+use tracing::instrument;
+
+use crate::analytics::context::{AnalyticsConfig, AnalyticsContext};
+use crate::net::web_server::WebServer;
+use crate::prelude::*;
+use crate::util::logger::EmbassyLogger;
+
+#[instrument(skip_all)]
+async fn inner_main(config: &AnalyticsConfig) -> Result<(), Error> {
+    let server = async {
+        let ctx = AnalyticsContext::init(config).await?;
+        let server = WebServer::analytics(ctx.listen, ctx.clone());
+
+        let mut shutdown_recv = ctx.shutdown.subscribe();
+
+        let sig_handler_ctx = ctx;
+        let sig_handler = tokio::spawn(async move {
+            use tokio::signal::unix::SignalKind;
+            futures::future::select_all(
+                [
+                    SignalKind::interrupt(),
+                    SignalKind::quit(),
+                    SignalKind::terminate(),
+                ]
+                .iter()
+                .map(|s| {
+                    async move {
+                        signal(*s)
+                            .unwrap_or_else(|_| panic!("register {:?} handler", s))
+                            .recv()
+                            .await
+                    }
+                    .boxed()
+                }),
+            )
+            .await;
+            sig_handler_ctx
+                .shutdown
+                .send(())
+                .map_err(|_| ())
+                .expect("send shutdown signal");
+        });
+
+        shutdown_recv
+            .recv()
+            .await
+            .with_kind(crate::ErrorKind::Unknown)?;
+
+        sig_handler.abort();
+
+        Ok::<_, Error>(server)
+    }
+    .await?;
+    server.shutdown().await;
+
+    Ok(())
+}
+
+pub fn main(args: impl IntoIterator<Item = OsString>) {
+    EmbassyLogger::init();
+
+    let config = AnalyticsConfig::parse_from(args).load().unwrap();
+
+    let res = {
+        let rt = tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .expect("failed to initialize runtime");
+        rt.block_on(inner_main(&config))
+    };
+
+    match res {
+        Ok(()) => (),
+        Err(e) => {
+            eprintln!("{}", e.source);
+            tracing::debug!("{:?}", e.source);
+            drop(e.source);
+            std::process::exit(e.kind as i32)
+        }
+    }
+}
diff --git a/core/startos/src/bins/mod.rs b/core/startos/src/bins/mod.rs
index 4a4670a5b..70f87aa99 100644
--- a/core/startos/src/bins/mod.rs
+++ b/core/startos/src/bins/mod.rs
@@ -2,6 +2,8 @@ use std::collections::VecDeque;
 use std::ffi::OsString;
 use std::path::Path;
 
+#[cfg(feature = "analytics")]
+pub mod analytics;
 #[cfg(feature = "container-runtime")]
 pub mod container_cli;
 pub mod deprecated;
@@ -24,6 +26,8 @@ fn select_executable(name: &str) -> Option<fn(VecDeque<OsString>)> {
         "startd" => Some(startd::main),
         #[cfg(feature = "registry")]
         "registry" => Some(registry::main),
+        #[cfg(feature = "analyticsd")]
+        "analyticsd" => Some(analyticsd::main),
         "embassy-cli" => Some(|_| deprecated::renamed("embassy-cli", "start-cli")),
         "embassy-sdk" => Some(|_| deprecated::renamed("embassy-sdk", "start-sdk")),
         "embassyd" => Some(|_| deprecated::renamed("embassyd", "startd")),
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
index bc2da00e2..886361777 100644
--- a/core/startos/src/context/config.rs
+++ b/core/startos/src/context/config.rs
@@ -113,6 +113,8 @@ pub struct ServerConfig {
     pub datadir: Option<PathBuf>,
     #[arg(long = "disable-encryption")]
     pub disable_encryption: Option<bool>,
+    #[arg(short = 'a', long = "analytics-url")]
+    pub analytics_url: Option<Url>,
 }
 impl ContextConfig for ServerConfig {
     fn next(&mut self) -> Option<PathBuf> {
@@ -131,6 +133,7 @@ impl ContextConfig for ServerConfig {
             .or(other.revision_cache_size);
         self.datadir = self.datadir.take().or(other.datadir);
         self.disable_encryption = self.disable_encryption.take().or(other.disable_encryption);
+        self.analytics_url = self.analytics_url.take().or(other.analytics_url);
     }
 }
 
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index cf2d28085..1042def74 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -13,6 +13,7 @@ use rpc_toolkit::{CallRemote, Context, Empty};
 use tokio::sync::{broadcast, oneshot, Mutex, RwLock};
 use tokio::time::Instant;
 use tracing::instrument;
+use url::Url;
 
 use super::setup::CURRENT_SECRET;
 use crate::account::AccountInfo;
@@ -55,7 +56,9 @@ pub struct RpcContextSeed {
     pub client: Client,
     pub hardware: Hardware,
     pub start_time: Instant,
+    #[cfg(feature = "dev")]
     pub dev: Dev,
+    pub analytics_url: Option<Url>,
 }
 
 pub struct Dev {
@@ -184,9 +187,11 @@ impl RpcContext {
                 .with_kind(crate::ErrorKind::ParseUrl)?,
             hardware: Hardware { devices, ram },
             start_time: Instant::now(),
+            #[cfg(feature = "dev")]
             dev: Dev {
                 lxc: Mutex::new(BTreeMap::new()),
             },
+            analytics_url: config.analytics_url.clone(),
         });
 
         let res = Self(seed.clone());
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index d60a2db24..96210114f 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -24,6 +24,7 @@ lazy_static::lazy_static! {
 
 pub mod account;
 pub mod action;
+pub mod analytics;
 pub mod auth;
 pub mod backup;
 pub mod bins;
@@ -95,7 +96,7 @@ pub fn echo<C: Context>(_: C, EchoParams { message }: EchoParams) -> Result<Stri
 }
 
 pub fn main_api<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new()
+    let api = ParentHandler::new()
         .subcommand::<C, _>("git-info", from_fn(version::git_info))
         .subcommand(
             "echo",
@@ -120,9 +121,11 @@ pub fn main_api<C: Context>() -> ParentHandler<C> {
             )
             .no_cli(),
         )
-        .subcommand("lxc", lxc::lxc::<C>())
         .subcommand("s9pk", s9pk::rpc::s9pk())
-        .subcommand("util", util::rpc::util::<C>())
+        .subcommand("util", util::rpc::util::<C>());
+    #[cfg(feature = "dev")]
+    let api = api.subcommand("lxc", lxc::dev::lxc::<C>());
+    api
 }
 
 pub fn server<C: Context>() -> ParentHandler<C> {
diff --git a/core/startos/src/lxc/dev.rs b/core/startos/src/lxc/dev.rs
new file mode 100644
index 000000000..61dd8e598
--- /dev/null
+++ b/core/startos/src/lxc/dev.rs
@@ -0,0 +1,112 @@
+use std::ops::Deref;
+
+use clap::Parser;
+use rpc_toolkit::{
+    from_fn_async, CallRemoteHandler, Context, Empty, HandlerArgs, HandlerExt, HandlerFor,
+    ParentHandler,
+};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::{CliContext, RpcContext};
+use crate::lxc::{ContainerId, LxcConfig};
+use crate::prelude::*;
+use crate::rpc_continuations::Guid;
+
+pub fn lxc<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "create",
+            from_fn_async(create).with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list)
+                .with_custom_display_fn(|_, res| {
+                    use prettytable::*;
+                    let mut table = table!([bc => "GUID"]);
+                    for guid in res {
+                        table.add_row(row![&*guid]);
+                    }
+                    table.printstd();
+                    Ok(())
+                })
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove)
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand("connect", from_fn_async(connect_rpc).no_cli())
+        .subcommand("connect", from_fn_async(connect_rpc_cli).no_display())
+}
+
+pub async fn create(ctx: RpcContext) -> Result<ContainerId, Error> {
+    let container = ctx.lxc_manager.create(None, LxcConfig::default()).await?;
+    let guid = container.guid.deref().clone();
+    ctx.dev.lxc.lock().await.insert(guid.clone(), container);
+    Ok(guid)
+}
+
+pub async fn list(ctx: RpcContext) -> Result<Vec<ContainerId>, Error> {
+    Ok(ctx.dev.lxc.lock().await.keys().cloned().collect())
+}
+
+#[derive(Deserialize, Serialize, Parser, TS)]
+pub struct RemoveParams {
+    #[ts(type = "string")]
+    pub guid: ContainerId,
+}
+
+pub async fn remove(ctx: RpcContext, RemoveParams { guid }: RemoveParams) -> Result<(), Error> {
+    if let Some(container) = ctx.dev.lxc.lock().await.remove(&guid) {
+        container.exit().await?;
+    }
+    Ok(())
+}
+
+#[derive(Deserialize, Serialize, Parser, TS)]
+pub struct ConnectParams {
+    #[ts(type = "string")]
+    pub guid: ContainerId,
+}
+
+pub async fn connect_rpc(
+    ctx: RpcContext,
+    ConnectParams { guid }: ConnectParams,
+) -> Result<Guid, Error> {
+    super::connect(
+        &ctx,
+        ctx.dev.lxc.lock().await.get(&guid).ok_or_else(|| {
+            Error::new(eyre!("No container with guid: {guid}"), ErrorKind::NotFound)
+        })?,
+    )
+    .await
+}
+
+pub async fn connect_rpc_cli(
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        params,
+        inherited_params,
+        raw_params,
+    }: HandlerArgs<CliContext, ConnectParams>,
+) -> Result<(), Error> {
+    let ctx = context.clone();
+    let guid = CallRemoteHandler::<CliContext, _, _>::new(from_fn_async(connect_rpc))
+        .handle_async(HandlerArgs {
+            context,
+            parent_method,
+            method,
+            params: rpc_toolkit::util::Flat(params, Empty {}),
+            inherited_params,
+            raw_params,
+        })
+        .await?;
+
+    super::connect_cli(&ctx, guid).await
+}
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index f64ecebe7..997c17c8a 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -1,20 +1,15 @@
 use std::collections::BTreeSet;
 use std::net::Ipv4Addr;
-use std::ops::Deref;
 use std::path::Path;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
 use clap::builder::ValueParserFactory;
-use clap::Parser;
 use futures::{AsyncWriteExt, FutureExt, StreamExt};
 use imbl_value::{InOMap, InternedString};
 use models::InvalidId;
-use rpc_toolkit::yajrc::{RpcError, RpcResponse};
-use rpc_toolkit::{
-    from_fn_async, CallRemoteHandler, Context, Empty, GenericRpcMethod, HandlerArgs, HandlerExt,
-    HandlerFor, ParentHandler, RpcRequest,
-};
+use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::{GenericRpcMethod, RpcRequest, RpcResponse};
 use rustyline_async::{ReadlineEvent, SharedWriter};
 use serde::{Deserialize, Serialize};
 use tokio::fs::File;
@@ -38,6 +33,9 @@ use crate::util::clap::FromStrParser;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::{new_guid, Invoke};
 
+#[cfg(feature = "dev")]
+pub mod dev;
+
 const LXC_CONTAINER_DIR: &str = "/var/lib/lxc";
 const RPC_DIR: &str = "media/startos/rpc"; // must not be absolute path
 pub const CONTAINER_RPC_SERVER_SOCKET: &str = "service.sock"; // must not be absolute path
@@ -369,80 +367,6 @@ impl Drop for LxcContainer {
 
 #[derive(Default, Serialize)]
 pub struct LxcConfig {}
-
-pub fn lxc<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new()
-        .subcommand(
-            "create",
-            from_fn_async(create).with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "list",
-            from_fn_async(list)
-                .with_custom_display_fn(|_, res| {
-                    use prettytable::*;
-                    let mut table = table!([bc => "GUID"]);
-                    for guid in res {
-                        table.add_row(row![&*guid]);
-                    }
-                    table.printstd();
-                    Ok(())
-                })
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "remove",
-            from_fn_async(remove)
-                .no_display()
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand("connect", from_fn_async(connect_rpc).no_cli())
-        .subcommand("connect", from_fn_async(connect_rpc_cli).no_display())
-}
-
-pub async fn create(ctx: RpcContext) -> Result<ContainerId, Error> {
-    let container = ctx.lxc_manager.create(None, LxcConfig::default()).await?;
-    let guid = container.guid.deref().clone();
-    ctx.dev.lxc.lock().await.insert(guid.clone(), container);
-    Ok(guid)
-}
-
-pub async fn list(ctx: RpcContext) -> Result<Vec<ContainerId>, Error> {
-    Ok(ctx.dev.lxc.lock().await.keys().cloned().collect())
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-pub struct RemoveParams {
-    #[ts(type = "string")]
-    pub guid: ContainerId,
-}
-
-pub async fn remove(ctx: RpcContext, RemoveParams { guid }: RemoveParams) -> Result<(), Error> {
-    if let Some(container) = ctx.dev.lxc.lock().await.remove(&guid) {
-        container.exit().await?;
-    }
-    Ok(())
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-pub struct ConnectParams {
-    #[ts(type = "string")]
-    pub guid: ContainerId,
-}
-
-pub async fn connect_rpc(
-    ctx: RpcContext,
-    ConnectParams { guid }: ConnectParams,
-) -> Result<Guid, Error> {
-    connect(
-        &ctx,
-        ctx.dev.lxc.lock().await.get(&guid).ok_or_else(|| {
-            Error::new(eyre!("No container with guid: {guid}"), ErrorKind::NotFound)
-        })?,
-    )
-    .await
-}
-
 pub async fn connect(ctx: &RpcContext, container: &LxcContainer) -> Result<Guid, Error> {
     use axum::extract::ws::Message;
 
@@ -473,10 +397,8 @@ pub async fn connect(ctx: &RpcContext, container: &LxcContainer) -> Result<Guid,
                                         }
                                         .await;
                                         ws.send(Message::Text(
-                                            serde_json::to_string(
-                                                &RpcResponse::<GenericRpcMethod> { id, result },
-                                            )
-                                            .with_kind(ErrorKind::Serialization)?,
+                                            serde_json::to_string(&RpcResponse { id, result })
+                                                .with_kind(ErrorKind::Serialization)?,
                                         ))
                                         .await
                                         .with_kind(ErrorKind::Network)?;
@@ -612,28 +534,3 @@ pub async fn connect_cli(ctx: &CliContext, guid: Guid) -> Result<(), Error> {
 
     Ok(())
 }
-
-pub async fn connect_rpc_cli(
-    HandlerArgs {
-        context,
-        parent_method,
-        method,
-        params,
-        inherited_params,
-        raw_params,
-    }: HandlerArgs<CliContext, ConnectParams>,
-) -> Result<(), Error> {
-    let ctx = context.clone();
-    let guid = CallRemoteHandler::<CliContext, _, _>::new(from_fn_async(connect_rpc))
-        .handle_async(HandlerArgs {
-            context,
-            parent_method,
-            method,
-            params: rpc_toolkit::util::Flat(params, Empty {}),
-            inherited_params,
-            raw_params,
-        })
-        .await?;
-
-    connect_cli(&ctx, guid).await
-}
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index c3931b236..b1d9ef1c4 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -281,6 +281,10 @@ pub async fn execute<C: Context>(
         IoFormat::Yaml.to_vec(&ServerConfig {
             os_partitions: Some(part_info.clone()),
             ethernet_interface: Some(eth_iface),
+            #[cfg(feature = "dev")]
+            analytics_url: None,
+            #[cfg(not(feature = "dev"))]
+            analytics_url: Some("https://analytics.start9.com".parse()?), // TODO: FullMetal
             ..Default::default()
         })?,
     )
diff --git a/core/startos/src/registry/context.rs b/core/startos/src/registry/context.rs
index 99d60307b..0461aa924 100644
--- a/core/startos/src/registry/context.rs
+++ b/core/startos/src/registry/context.rs
@@ -32,8 +32,8 @@ pub struct RegistryConfig {
     #[arg(short = 'l', long = "listen")]
     pub listen: Option<SocketAddr>,
     #[arg(short = 'h', long = "hostname")]
-    pub hostname: InternedString,
-    #[arg(short = 'p', long = "proxy")]
+    pub hostname: Option<InternedString>,
+    #[arg(short = 'p', long = "tor-proxy")]
     pub tor_proxy: Option<Url>,
     #[arg(short = 'd', long = "datadir")]
     pub datadir: Option<PathBuf>,
@@ -43,6 +43,9 @@ impl ContextConfig for RegistryConfig {
         self.config.take()
     }
     fn merge_with(&mut self, other: Self) {
+        self.listen = self.listen.take().or(other.listen);
+        self.hostname = self.hostname.take().or(other.hostname);
+        self.tor_proxy = self.tor_proxy.take().or(other.tor_proxy);
         self.datadir = self.datadir.take().or(other.datadir);
     }
 }
@@ -92,7 +95,16 @@ impl RegistryContext {
             .map(Ok)
             .unwrap_or_else(|| "socks5h://localhost:9050".parse())?;
         Ok(Self(Arc::new(RegistryContextSeed {
-            hostname: config.hostname.clone(),
+            hostname: config
+                .hostname
+                .as_ref()
+                .ok_or_else(|| {
+                    Error::new(
+                        eyre!("missing required configuration: hostname"),
+                        ErrorKind::NotFound,
+                    )
+                })?
+                .clone(),
             listen: config
                 .listen
                 .unwrap_or(SocketAddr::new(Ipv4Addr::LOCALHOST.into(), 5959)),
@@ -169,7 +181,8 @@ impl CallRemote<RegistryContext> for CliContext {
                     &AnySigningKey::Ed25519(self.developer_key()?.clone()),
                     &body,
                     &host,
-                )?.to_header(),
+                )?
+                .to_header(),
             )
             .body(body)
             .send()
diff --git a/sdk/lib/osBindings/AddAssetParams.ts b/sdk/lib/osBindings/AddAssetParams.ts
index ce6128cf7..ffd7db675 100644
--- a/sdk/lib/osBindings/AddAssetParams.ts
+++ b/sdk/lib/osBindings/AddAssetParams.ts
@@ -6,7 +6,6 @@ import type { Version } from "./Version"
 export type AddAssetParams = {
   version: Version
   platform: string
-  upload: boolean
   url: string
   signature: AnySignature
   commitment: Blake3Commitment
diff --git a/sdk/lib/osBindings/AddPackageParams.ts b/sdk/lib/osBindings/AddPackageParams.ts
new file mode 100644
index 000000000..4395b9b8a
--- /dev/null
+++ b/sdk/lib/osBindings/AddPackageParams.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AnySignature } from "./AnySignature"
+import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
+
+export type AddPackageParams = {
+  url: string
+  commitment: MerkleArchiveCommitment
+  signature: AnySignature
+}
diff --git a/sdk/lib/osBindings/GetPackageResponse.ts b/sdk/lib/osBindings/GetPackageResponse.ts
index 5bf24bfc0..3e1dd4e9d 100644
--- a/sdk/lib/osBindings/GetPackageResponse.ts
+++ b/sdk/lib/osBindings/GetPackageResponse.ts
@@ -4,6 +4,7 @@ import type { PackageVersionInfo } from "./PackageVersionInfo"
 import type { Version } from "./Version"
 
 export type GetPackageResponse = {
+  categories: string[]
   best: { [key: Version]: PackageVersionInfo }
   otherVersions?: { [key: Version]: PackageInfoShort }
 }
diff --git a/sdk/lib/osBindings/GetPackageResponseFull.ts b/sdk/lib/osBindings/GetPackageResponseFull.ts
index 579924291..e375dd489 100644
--- a/sdk/lib/osBindings/GetPackageResponseFull.ts
+++ b/sdk/lib/osBindings/GetPackageResponseFull.ts
@@ -3,6 +3,7 @@ import type { PackageVersionInfo } from "./PackageVersionInfo"
 import type { Version } from "./Version"
 
 export type GetPackageResponseFull = {
+  categories: string[]
   best: { [key: Version]: PackageVersionInfo }
   otherVersions: { [key: Version]: PackageVersionInfo }
 }
diff --git a/sdk/lib/osBindings/HardwareRequirements.ts b/sdk/lib/osBindings/HardwareRequirements.ts
index 4964bc66f..0e1da1f36 100644
--- a/sdk/lib/osBindings/HardwareRequirements.ts
+++ b/sdk/lib/osBindings/HardwareRequirements.ts
@@ -3,5 +3,5 @@
 export type HardwareRequirements = {
   device: { [key: string]: string }
   ram: number | null
-  arch: Array<string> | null
+  arch: string[] | null
 }
diff --git a/sdk/lib/osBindings/OsVersionInfo.ts b/sdk/lib/osBindings/OsVersionInfo.ts
index 7cd0fde9e..a88115350 100644
--- a/sdk/lib/osBindings/OsVersionInfo.ts
+++ b/sdk/lib/osBindings/OsVersionInfo.ts
@@ -7,7 +7,7 @@ export type OsVersionInfo = {
   headline: string
   releaseNotes: string
   sourceVersion: string
-  signers: Array<Guid>
+  authorized: Array<Guid>
   iso: { [key: string]: RegistryAsset<Blake3Commitment> }
   squashfs: { [key: string]: RegistryAsset<Blake3Commitment> }
   img: { [key: string]: RegistryAsset<Blake3Commitment> }
diff --git a/sdk/lib/osBindings/PackageInfo.ts b/sdk/lib/osBindings/PackageInfo.ts
index af340424f..6d07cd43e 100644
--- a/sdk/lib/osBindings/PackageInfo.ts
+++ b/sdk/lib/osBindings/PackageInfo.ts
@@ -4,6 +4,7 @@ import type { PackageVersionInfo } from "./PackageVersionInfo"
 import type { Version } from "./Version"
 
 export type PackageInfo = {
-  signers: Array<Guid>
+  authorized: Array<Guid>
   versions: { [key: Version]: PackageVersionInfo }
+  categories: string[]
 }
diff --git a/sdk/lib/osBindings/PackageVersionInfo.ts b/sdk/lib/osBindings/PackageVersionInfo.ts
index da82540cd..bdded46bd 100644
--- a/sdk/lib/osBindings/PackageVersionInfo.ts
+++ b/sdk/lib/osBindings/PackageVersionInfo.ts
@@ -17,7 +17,6 @@ export type PackageVersionInfo = {
   upstreamRepo: string
   supportSite: string
   marketingSite: string
-  categories: string[]
   osVersion: Version
   hardwareRequirements: HardwareRequirements
   sourceVersion: string | null
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 16fc56a74..3059c6087 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -3,6 +3,7 @@ export { ActionId } from "./ActionId"
 export { ActionMetadata } from "./ActionMetadata"
 export { AddAdminParams } from "./AddAdminParams"
 export { AddAssetParams } from "./AddAssetParams"
+export { AddPackageParams } from "./AddPackageParams"
 export { AddressInfo } from "./AddressInfo"
 export { AddSslOptions } from "./AddSslOptions"
 export { AddVersionParams } from "./AddVersionParams"

From 8f7072d7e96e4898d5b7b2fe694ee33d0cdf2e42 Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Tue, 4 Jun 2024 09:21:55 -0600
Subject: [PATCH 153/341] metrics wip

---
 core/startos/src/analytics/mod.rs | 69 ++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/core/startos/src/analytics/mod.rs b/core/startos/src/analytics/mod.rs
index 52ca37948..6903ecfe1 100644
--- a/core/startos/src/analytics/mod.rs
+++ b/core/startos/src/analytics/mod.rs
@@ -1,19 +1,28 @@
 use std::net::SocketAddr;
 
 use axum::Router;
+use chrono::Utc;
 use futures::future::ready;
-use rpc_toolkit::{Context, ParentHandler, Server};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler, Server};
+use sqlx::query;
+use ts_rs::TS;
 
 use crate::analytics::context::AnalyticsContext;
 use crate::middleware::cors::Cors;
 use crate::net::static_server::{bad_request, not_found, server_error};
 use crate::net::web_server::WebServer;
 use crate::rpc_continuations::Guid;
+use crate::Error;
 
 pub mod context;
 
 pub fn analytics_api<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new() // TODO: FullMetal
+    ParentHandler::new()
+        .subcommand("recordMetrics", from_fn_async(record_metrics).no_cli())
+        .subcommand(
+            "recordUserActivity",
+            from_fn_async(record_user_activity).no_cli(),
+        )
 }
 
 pub fn analytics_server_router(ctx: AnalyticsContext) -> Router {
@@ -76,3 +85,59 @@ impl WebServer {
         Self::new(bind, analytics_server_router(ctx))
     }
 }
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct MetricsParams {
+    version: char,
+    pkg_id: char,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+struct ActivityParams {
+    server_id: String,
+    os_version: String,
+    arch: String,
+}
+
+async fn record_metrics(
+    ctx: AnalyticsContext,
+    MetricsParams {
+        version,
+        pkg_id,
+    }: MetricsParams,
+) -> Result<(), Error> {
+    let pool = ctx.db;
+    let created_at = Utc::now().to_rfc3339();
+    query!(
+        "INSERT INTO metric (created_at, version, pkg_id) VALUES ($1, $2, $3)",
+        created_at,
+        version,
+        pkg_id
+    )
+    .execute(pool)
+    .await?;
+    Ok(())
+}
+
+async fn record_user_activity(
+    analytics_ctx: AnalyticsContext,
+    ActivityParams { server_id, os_version, arch }: ActivityParams,
+) -> Result<(), Error> {
+    let pool = analytics_ctx.db;
+    let created_at = Utc::now().to_rfc3339();
+
+    query!("INSERT INTO user_activity (created_at, server_id, os_version, arch) VALUES ($1, $2, $3, $4)",
+    created_at,
+    server_id,
+    os_vers,
+    arch
+    )
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}

From fa347fd49d92a7373f0080243127fc1e87ba8c87 Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Tue, 4 Jun 2024 11:53:30 -0600
Subject: [PATCH 154/341] remove record_metrics fn

---
 core/startos/src/analytics/mod.rs | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/core/startos/src/analytics/mod.rs b/core/startos/src/analytics/mod.rs
index 6903ecfe1..551082d6b 100644
--- a/core/startos/src/analytics/mod.rs
+++ b/core/startos/src/analytics/mod.rs
@@ -18,7 +18,6 @@ pub mod context;
 
 pub fn analytics_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("recordMetrics", from_fn_async(record_metrics).no_cli())
         .subcommand(
             "recordUserActivity",
             from_fn_async(record_user_activity).no_cli(),
@@ -86,14 +85,6 @@ impl WebServer {
     }
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct MetricsParams {
-    version: char,
-    pkg_id: char,
-}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
@@ -103,26 +94,6 @@ struct ActivityParams {
     arch: String,
 }
 
-async fn record_metrics(
-    ctx: AnalyticsContext,
-    MetricsParams {
-        version,
-        pkg_id,
-    }: MetricsParams,
-) -> Result<(), Error> {
-    let pool = ctx.db;
-    let created_at = Utc::now().to_rfc3339();
-    query!(
-        "INSERT INTO metric (created_at, version, pkg_id) VALUES ($1, $2, $3)",
-        created_at,
-        version,
-        pkg_id
-    )
-    .execute(pool)
-    .await?;
-    Ok(())
-}
-
 async fn record_user_activity(
     analytics_ctx: AnalyticsContext,
     ActivityParams { server_id, os_version, arch }: ActivityParams,

From 94875299920e8a54c5b0f45fbbd4adade2bb7a07 Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Tue, 4 Jun 2024 11:54:49 -0600
Subject: [PATCH 155/341] remove os version from activity

---
 core/startos/src/analytics/mod.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/startos/src/analytics/mod.rs b/core/startos/src/analytics/mod.rs
index 551082d6b..1fa08dd3f 100644
--- a/core/startos/src/analytics/mod.rs
+++ b/core/startos/src/analytics/mod.rs
@@ -90,21 +90,19 @@ impl WebServer {
 #[serde(rename_all = "camelCase")]
 struct ActivityParams {
     server_id: String,
-    os_version: String,
     arch: String,
 }
 
 async fn record_user_activity(
-    analytics_ctx: AnalyticsContext,
-    ActivityParams { server_id, os_version, arch }: ActivityParams,
+    ctx: AnalyticsContext,
+    ActivityParams { server_id, arch }: ActivityParams,
 ) -> Result<(), Error> {
-    let pool = analytics_ctx.db;
+    let pool = ctx.db;
     let created_at = Utc::now().to_rfc3339();
 
     query!("INSERT INTO user_activity (created_at, server_id, os_version, arch) VALUES ($1, $2, $3, $4)",
     created_at,
     server_id,
-    os_vers,
     arch
     )
     .execute(pool)

From 2c12af5af8668cb82c2ffc85eb6a5bbc6e455d4c Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:39:54 -0600
Subject: [PATCH 156/341] Feature/network (#2622)

* Feature: Add in the clear bindings

* wip: Working on network

* fix: Make it so the config gives the url

* chore: Remove the repeated types

* chore: Add in the todo's here

* chore: UPdate and remove some poorly name var

* chore: Remove the clear-bindings impl

* chore: Remove the wrapper

* handle HostnameInfo for Host bindings

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* ??

* chore: Make the install work

* Fix: Url's not being created

* chore: Fix the local onion in url

* include port in hostname

* Chore of adding a comment just to modify.

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
Co-authored-by: Jade <Blu-J@users.noreply.github.com>
---
 container-runtime/package-lock.json           |  16 +-
 container-runtime/package.json                |   2 +-
 .../src/Adapters/HostSystemStartOs.ts         |  10 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |   2 -
 .../Systems/SystemForEmbassy/index.ts         | 140 +++++-
 .../Systems/SystemForEmbassy/matchManifest.ts |   1 +
 .../SystemForEmbassy/oldEmbassyTypes.ts       |   1 +
 core/models/src/id/mod.rs                     |   2 +-
 core/startos/src/db/model/package.rs          |   8 +-
 core/startos/src/disk/mod.rs                  |   4 +-
 core/startos/src/net/dhcp.rs                  |   2 +-
 core/startos/src/net/host/binding.rs          |  65 ++-
 core/startos/src/net/host/mod.rs              |  19 +-
 core/startos/src/net/net_controller.rs        | 264 ++++++----
 core/startos/src/net/service_interface.rs     |  39 +-
 core/startos/src/net/vhost.rs                 |   2 +-
 core/startos/src/registry/auth.rs             |   1 -
 core/startos/src/service/mod.rs               |   7 +-
 .../src/service/persistent_container.rs       |   2 +-
 .../src/service/service_effect_handler.rs     | 208 +++-----
 sdk/lib/StartSdk.ts                           |  10 +-
 sdk/lib/interfaces/Host.ts                    |  88 ++--
 sdk/lib/interfaces/Origin.ts                  |  19 +-
 sdk/lib/osBindings/AddAssetParams.ts          |   1 -
 sdk/lib/osBindings/AddPackageParams.ts        |   9 +
 sdk/lib/osBindings/AddSslOptions.ts           |   3 +-
 sdk/lib/osBindings/AddressInfo.ts             |   5 +-
 sdk/lib/osBindings/BindInfo.ts                |   3 +-
 sdk/lib/osBindings/BindOptions.ts             |   1 -
 sdk/lib/osBindings/BindParams.ts              |   1 -
 .../ExportServiceInterfaceParams.ts           |   4 -
 sdk/lib/osBindings/ExportedHostInfo.ts        |  10 -
 sdk/lib/osBindings/ExportedHostnameInfo.ts    |  12 -
 sdk/lib/osBindings/GetHostInfoParams.ts       |   5 +-
 sdk/lib/osBindings/GetHostInfoParamsKind.ts   |   3 -
 sdk/lib/osBindings/GetPackageResponse.ts      |   1 +
 sdk/lib/osBindings/GetPackageResponseFull.ts  |   1 +
 sdk/lib/osBindings/GetPrimaryUrlParams.ts     |   5 +-
 .../osBindings/GetServiceInterfaceParams.ts   |   3 +-
 sdk/lib/osBindings/HardwareRequirements.ts    |   2 +-
 sdk/lib/osBindings/Host.ts                    |   6 +-
 sdk/lib/osBindings/HostnameInfo.ts            |  12 +
 sdk/lib/osBindings/{HostInfo.ts => Hosts.ts}  |   2 +-
 .../{ExportedIpHostname.ts => IpHostname.ts}  |   2 +-
 ...{ReverseProxyDestination.ts => LanInfo.ts} |   7 +-
 ...ortedOnionHostname.ts => OnionHostname.ts} |   2 +-
 sdk/lib/osBindings/OsVersionInfo.ts           |   2 +-
 sdk/lib/osBindings/PackageDataEntry.ts        |   8 +-
 sdk/lib/osBindings/PackageInfo.ts             |   3 +-
 sdk/lib/osBindings/PackageVersionInfo.ts      |   1 -
 sdk/lib/osBindings/ReverseProxyBind.ts        |   3 -
 sdk/lib/osBindings/ReverseProxyHttp.ts        |   3 -
 sdk/lib/osBindings/ReverseProxyParams.ts      |  10 -
 .../ServiceInterfaceWithHostInfo.ts           |  17 -
 sdk/lib/osBindings/index.ts                   |  17 +-
 sdk/lib/test/host.test.ts                     |   1 +
 sdk/lib/test/startosTypeValidation.test.ts    |   2 -
 sdk/lib/types.ts                              |  97 +---
 sdk/lib/util/Hostname.ts                      |  25 +
 sdk/lib/util/getServiceInterface.ts           | 178 +++----
 sdk/lib/util/getServiceInterfaces.ts          |  40 +-
 sdk/lib/util/index.ts                         |   2 +
 .../app-interfaces/app-interfaces.page.ts     |  57 +--
 .../ui/src/app/services/api/api.fixures.ts    | 450 +-----------------
 .../ui/src/app/services/api/mock-patch.ts     | 352 +-------------
 .../ui/src/app/services/config.service.ts     |  29 +-
 .../src/app/services/ui-launcher.service.ts   |   5 +-
 67 files changed, 798 insertions(+), 1516 deletions(-)
 create mode 100644 sdk/lib/osBindings/AddPackageParams.ts
 delete mode 100644 sdk/lib/osBindings/ExportedHostInfo.ts
 delete mode 100644 sdk/lib/osBindings/ExportedHostnameInfo.ts
 delete mode 100644 sdk/lib/osBindings/GetHostInfoParamsKind.ts
 create mode 100644 sdk/lib/osBindings/HostnameInfo.ts
 rename sdk/lib/osBindings/{HostInfo.ts => Hosts.ts} (79%)
 rename sdk/lib/osBindings/{ExportedIpHostname.ts => IpHostname.ts} (94%)
 rename sdk/lib/osBindings/{ReverseProxyDestination.ts => LanInfo.ts} (55%)
 rename sdk/lib/osBindings/{ExportedOnionHostname.ts => OnionHostname.ts} (82%)
 delete mode 100644 sdk/lib/osBindings/ReverseProxyBind.ts
 delete mode 100644 sdk/lib/osBindings/ReverseProxyHttp.ts
 delete mode 100644 sdk/lib/osBindings/ReverseProxyParams.ts
 delete mode 100644 sdk/lib/osBindings/ServiceInterfaceWithHostInfo.ts
 create mode 100644 sdk/lib/util/Hostname.ts

diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index dd8ba7855..838dcb769 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -14,7 +14,7 @@
         "filebrowser": "^1.0.0",
         "isomorphic-fetch": "^3.0.0",
         "node-fetch": "^3.1.0",
-        "ts-matches": "^5.4.1",
+        "ts-matches": "^5.5.1",
         "tslib": "^2.5.3",
         "typescript": "^5.1.3",
         "yaml": "^2.3.1"
@@ -29,7 +29,7 @@
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-rev0.lib0.rc8.beta10",
+      "version": "0.3.6-alpha1",
       "license": "MIT",
       "dependencies": {
         "isomorphic-fetch": "^3.0.0",
@@ -2428,9 +2428,9 @@
       }
     },
     "node_modules/ts-matches": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.4.1.tgz",
-      "integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
+      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
     },
     "node_modules/tslib": {
       "version": "2.6.2",
@@ -4195,9 +4195,9 @@
       }
     },
     "ts-matches": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.4.1.tgz",
-      "integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
+      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
     },
     "tslib": {
       "version": "2.6.2",
diff --git a/container-runtime/package.json b/container-runtime/package.json
index f5e34a618..e2c56afff 100644
--- a/container-runtime/package.json
+++ b/container-runtime/package.json
@@ -22,7 +22,7 @@
     "filebrowser": "^1.0.0",
     "isomorphic-fetch": "^3.0.0",
     "node-fetch": "^3.1.0",
-    "ts-matches": "^5.4.1",
+    "ts-matches": "^5.5.1",
     "tslib": "^2.5.3",
     "typescript": "^5.1.3",
     "yaml": "^2.3.1"
diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index b745799e1..ba2076f52 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -96,7 +96,10 @@ export class HostSystemStartOs implements Effects {
   }
 
   bind(...[options]: Parameters<T.Effects["bind"]>) {
-    return this.rpcRound("bind", options) as ReturnType<T.Effects["bind"]>
+    return this.rpcRound("bind", {
+      ...options,
+      stack: new Error().stack,
+    }) as ReturnType<T.Effects["bind"]>
   }
   clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
     return this.rpcRound("clearBindings", null) as ReturnType<
@@ -228,11 +231,6 @@ export class HostSystemStartOs implements Effects {
   restart(...[]: Parameters<T.Effects["restart"]>) {
     return this.rpcRound("restart", null)
   }
-  reverseProxy(...[options]: Parameters<T.Effects["reverseProxy"]>) {
-    return this.rpcRound("reverseProxy", options) as ReturnType<
-      T.Effects["reverseProxy"]
-    >
-  }
   running(...[packageId]: Parameters<T.Effects["running"]>) {
     return this.rpcRound("running", { packageId }) as ReturnType<
       T.Effects["running"]
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 917bfff83..08bf944ed 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -97,11 +97,9 @@ export class MainLoop {
           id: interfaceId,
           internalPort,
           preferredExternalPort: torConf?.external || internalPort,
-          scheme: "http",
           secure: null,
           addSsl: lanConf?.ssl
             ? {
-                scheme: "https",
                 preferredExternalPort: lanConf.external,
                 alpn: { specified: ["http/1.1"] },
               }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index ada893b2b..8e0cb28c5 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -31,6 +31,16 @@ import { HostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
 import { RpcResult, matchRpcResult } from "../../RpcListener"
 import { CT } from "@start9labs/start-sdk"
+import {
+  AddSslOptions,
+  BindOptions,
+} from "@start9labs/start-sdk/cjs/lib/osBindings"
+import {
+  BindOptionsByProtocol,
+  Host,
+  MultiHost,
+} from "@start9labs/start-sdk/cjs/lib/interfaces/Host"
+import { ServiceInterfaceBuilder } from "@start9labs/start-sdk/cjs/lib/interfaces/ServiceInterfaceBuilder"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -335,6 +345,85 @@ export class SystemForEmbassy implements System {
       await this.migration(effects, previousVersion, timeoutMs)
     await effects.setMainStatus({ status: "stopped" })
     await this.exportActions(effects)
+    await this.exportNetwork(effects)
+  }
+  async exportNetwork(effects: HostSystemStartOs) {
+    for (const [id, interfaceValue] of Object.entries(
+      this.manifest.interfaces,
+    )) {
+      const host = new MultiHost({ effects, id })
+      const internalPorts = new Set(
+        Object.values(interfaceValue["tor-config"]?.["port-mapping"] ?? {})
+          .map(Number.parseInt)
+          .concat(
+            ...Object.values(interfaceValue["lan-config"] ?? {}).map(
+              (c) => c.internal,
+            ),
+          )
+          .filter(Boolean),
+      )
+      const bindings = Array.from(internalPorts).map<
+        [number, BindOptionsByProtocol]
+      >((port) => {
+        const lanPort = Object.entries(interfaceValue["lan-config"] ?? {}).find(
+          ([external, internal]) => internal.internal === port,
+        )?.[0]
+        const torPort = Object.entries(
+          interfaceValue["tor-config"]?.["port-mapping"] ?? {},
+        ).find(
+          ([external, internal]) => Number.parseInt(internal) === port,
+        )?.[0]
+        let addSsl: AddSslOptions | null = null
+        if (lanPort) {
+          const lanPortNum = Number.parseInt(lanPort)
+          if (lanPortNum === 443) {
+            return [port, { protocol: "http", preferredExternalPort: 80 }]
+          }
+          addSsl = {
+            preferredExternalPort: lanPortNum,
+            alpn: { specified: [] },
+          }
+        }
+        return [
+          port,
+          {
+            secure: null,
+            preferredExternalPort: Number.parseInt(
+              torPort || lanPort || String(port),
+            ),
+            addSsl,
+          },
+        ]
+      })
+
+      await Promise.all(
+        bindings.map(async ([internal, options]) => {
+          if (internal == null) {
+            return
+          }
+          if (options?.preferredExternalPort == null) {
+            return
+          }
+          const origin = await host.bindPort(internal, options)
+          await origin.export([
+            new ServiceInterfaceBuilder({
+              effects,
+              name: interfaceValue.name,
+              id: `${id}-${internal}`,
+              description: interfaceValue.description,
+              hasPrimary: false,
+              disabled: false,
+              type: "api",
+              masked: false,
+              path: "",
+              schemeOverride: null,
+              search: {},
+              username: null,
+            }),
+          ])
+        }),
+      )
+    }
   }
   async exportActions(effects: HostSystemStartOs) {
     const manifest = this.manifest
@@ -486,6 +575,7 @@ export class SystemForEmbassy implements System {
     const newConfig = structuredClone(newConfigWithoutPointers)
     await updateConfig(
       effects,
+      this.manifest,
       await this.getConfigUncleaned(effects, timeoutMs).then((x) => x.spec),
       newConfig,
     )
@@ -866,6 +956,7 @@ function cleanConfigFromPointers<C, S>(
 
 async function updateConfig(
   effects: HostSystemStartOs,
+  manifest: Manifest,
   spec: unknown,
   mutConfigValue: unknown,
 ) {
@@ -877,7 +968,12 @@ async function updateConfig(
     const newConfigValue = mutConfigValue[key]
     if (matchSpec.test(specValue)) {
       const updateObject = { spec: null }
-      await updateConfig(effects, { spec: specValue.spec }, updateObject)
+      await updateConfig(
+        effects,
+        manifest,
+        { spec: specValue.spec },
+        updateObject,
+      )
       mutConfigValue[key] = updateObject.spec
     }
     if (
@@ -899,20 +995,48 @@ async function updateConfig(
     if (matchPointerPackage.test(specValue)) {
       if (specValue.target === "tor-key")
         throw new Error("This service uses an unsupported target TorKey")
+
+      const specInterface = specValue.interface
+      const serviceInterfaceId = extractServiceInterfaceId(
+        manifest,
+        specInterface,
+      )
       const filled = await utils
         .getServiceInterface(effects, {
           packageId: specValue["package-id"],
-          id: specValue.interface,
+          id: serviceInterfaceId,
         })
         .once()
-        .catch(() => null)
-
-      mutConfigValue[key] =
+        .catch((x) => {
+          console.error("Could not get the service interface", x)
+          return null
+        })
+      const catchFn = <X>(fn: () => X) => {
+        try {
+          return fn()
+        } catch (e) {
+          return undefined
+        }
+      }
+      const url: string =
         filled === null
           ? ""
-          : specValue.target === "lan-address"
-            ? filled.addressInfo.localHostnames[0]
-            : filled.addressInfo.onionHostnames[0]
+          : catchFn(() =>
+              utils.hostnameInfoToAddress(
+                specValue.target === "lan-address"
+                  ? filled.addressInfo.localHostnames[0] ||
+                      filled.addressInfo.onionHostnames[0]
+                  : filled.addressInfo.onionHostnames[0] ||
+                      filled.addressInfo.localHostnames[0],
+              ),
+            ) || ""
+      mutConfigValue[key] = url
     }
   }
 }
+function extractServiceInterfaceId(manifest: Manifest, specInterface: string) {
+  let serviceInterfaceId
+  const lanConfig = manifest.interfaces[specInterface]?.["lan-config"] || {}
+  serviceInterfaceId = `${specInterface}-${Object.entries(lanConfig)[0]?.[1]?.internal}`
+  return serviceInterfaceId
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
index d4758669b..8ce6cabbc 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
@@ -72,6 +72,7 @@ export const matchManifest = object(
       object(
         {
           name: string,
+          description: string,
           "tor-config": object({
             "port-mapping": dictionary([string, string]),
           }),
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
index 35b95e095..0d7521626 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
@@ -99,6 +99,7 @@ export type Effects = {
   /** Sandbox mode lets us read but not write */
   is_sandboxed(): boolean
 
+  // Does a volume and path exist?
   exists(input: { volumeId: string; path: string }): Promise<boolean>
 
   fetch(
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index 10882d4f1..85c9d8255 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -24,7 +24,7 @@ pub use service_interface::ServiceInterfaceId;
 pub use volume::VolumeId;
 
 lazy_static::lazy_static! {
-    static ref ID_REGEX: Regex = Regex::new("^[a-z]+(-[a-z]+)*$").unwrap();
+    static ref ID_REGEX: Regex = Regex::new("^[a-z]+(-[a-z0-9]+)*$").unwrap();
     pub static ref SYSTEM_ID: Id = Id(InternedString::intern("x_system"));
 }
 
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 3fad0ad9f..8bb5a9517 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -10,8 +10,8 @@ use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::net::host::HostInfo;
-use crate::net::service_interface::ServiceInterfaceWithHostInfo;
+use crate::net::host::Hosts;
+use crate::net::service_interface::ServiceInterface;
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::s9pk::manifest::Manifest;
@@ -333,8 +333,8 @@ pub struct PackageDataEntry {
     pub last_backup: Option<DateTime<Utc>>,
     pub current_dependencies: CurrentDependencies,
     pub actions: BTreeMap<ActionId, ActionMetadata>,
-    pub service_interfaces: BTreeMap<ServiceInterfaceId, ServiceInterfaceWithHostInfo>,
-    pub hosts: HostInfo,
+    pub service_interfaces: BTreeMap<ServiceInterfaceId, ServiceInterface>,
+    pub hosts: Hosts,
     #[ts(type = "string[]")]
     pub store_exposed_dependents: Vec<JsonPointer>,
 }
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index 68eb2b187..705a34f98 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -1,8 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use rpc_toolkit::{
-    from_fn_async, CallRemoteHandler, Context, Empty, HandlerExt, ParentHandler,
-};
+use rpc_toolkit::{from_fn_async, CallRemoteHandler, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 
 use crate::context::{CliContext, RpcContext};
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index 104cda961..ffcb9774b 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -3,7 +3,7 @@ use std::net::IpAddr;
 
 use clap::Parser;
 use futures::TryStreamExt;
-use rpc_toolkit::{from_fn_async, Context,  HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::sync::RwLock;
 use ts_rs::TS;
diff --git a/core/startos/src/net/host/binding.rs b/core/startos/src/net/host/binding.rs
index 8301821f5..76dd04059 100644
--- a/core/startos/src/net/host/binding.rs
+++ b/core/startos/src/net/host/binding.rs
@@ -1,4 +1,3 @@
-use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
@@ -11,17 +10,31 @@ use crate::prelude::*;
 #[ts(export)]
 pub struct BindInfo {
     pub options: BindOptions,
-    pub assigned_lan_port: Option<u16>,
+    pub lan: LanInfo,
+}
+#[derive(Clone, Copy, Debug, Deserialize, Serialize, TS, PartialEq, Eq, PartialOrd, Ord)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct LanInfo {
+    pub assigned_port: Option<u16>,
+    pub assigned_ssl_port: Option<u16>,
 }
 impl BindInfo {
     pub fn new(available_ports: &mut AvailablePorts, options: BindOptions) -> Result<Self, Error> {
-        let mut assigned_lan_port = None;
-        if options.add_ssl.is_some() || options.secure.is_some() {
-            assigned_lan_port = Some(available_ports.alloc()?);
+        let mut assigned_port = None;
+        let mut assigned_ssl_port = None;
+        if options.secure.is_some() {
+            assigned_port = Some(available_ports.alloc()?);
+        }
+        if options.add_ssl.is_some() {
+            assigned_ssl_port = Some(available_ports.alloc()?);
         }
         Ok(Self {
             options,
-            assigned_lan_port,
+            lan: LanInfo {
+                assigned_port,
+                assigned_ssl_port,
+            },
         })
     }
     pub fn update(
@@ -29,29 +42,38 @@ impl BindInfo {
         available_ports: &mut AvailablePorts,
         options: BindOptions,
     ) -> Result<Self, Error> {
-        let Self {
-            mut assigned_lan_port,
-            ..
-        } = self;
-        if options.add_ssl.is_some() || options.secure.is_some() {
-            assigned_lan_port = if let Some(port) = assigned_lan_port.take() {
+        let Self { mut lan, .. } = self;
+        if options
+            .secure
+            .map_or(false, |s| !(s.ssl && options.add_ssl.is_some()))
+        // doesn't make sense to have 2 listening ports, both with ssl
+        {
+            lan.assigned_port = if let Some(port) = lan.assigned_port.take() {
                 Some(port)
             } else {
                 Some(available_ports.alloc()?)
             };
         } else {
-            if let Some(port) = assigned_lan_port.take() {
+            if let Some(port) = lan.assigned_port.take() {
                 available_ports.free([port]);
             }
         }
-        Ok(Self {
-            options,
-            assigned_lan_port,
-        })
+        if options.add_ssl.is_some() {
+            lan.assigned_ssl_port = if let Some(port) = lan.assigned_ssl_port.take() {
+                Some(port)
+            } else {
+                Some(available_ports.alloc()?)
+            };
+        } else {
+            if let Some(port) = lan.assigned_ssl_port.take() {
+                available_ports.free([port]);
+            }
+        }
+        Ok(Self { options, lan })
     }
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct Security {
@@ -62,8 +84,6 @@ pub struct Security {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct BindOptions {
-    #[ts(type = "string | null")]
-    pub scheme: Option<InternedString>,
     pub preferred_external_port: u16,
     pub add_ssl: Option<AddSslOptions>,
     pub secure: Option<Security>,
@@ -73,11 +93,8 @@ pub struct BindOptions {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddSslOptions {
-    #[ts(type = "string | null")]
-    pub scheme: Option<InternedString>,
     pub preferred_external_port: u16,
     // #[serde(default)]
     // pub add_x_forwarded_headers: bool, // TODO
-    #[serde(default)]
-    pub alpn: AlpnInfo,
+    pub alpn: Option<AlpnInfo>,
 }
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
index 2d8599ba9..6cbb2dfd5 100644
--- a/core/startos/src/net/host/mod.rs
+++ b/core/startos/src/net/host/mod.rs
@@ -3,13 +3,13 @@ use std::collections::{BTreeMap, BTreeSet};
 use imbl_value::InternedString;
 use models::{HostId, PackageId};
 use serde::{Deserialize, Serialize};
-use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use ts_rs::TS;
 
 use crate::db::model::DatabaseModel;
 use crate::net::forward::AvailablePorts;
 use crate::net::host::address::HostAddress;
 use crate::net::host::binding::{BindInfo, BindOptions};
+use crate::net::service_interface::HostnameInfo;
 use crate::prelude::*;
 
 pub mod address;
@@ -23,7 +23,8 @@ pub struct Host {
     pub kind: HostKind,
     pub bindings: BTreeMap<u16, BindInfo>,
     pub addresses: BTreeSet<HostAddress>,
-    pub primary: Option<HostAddress>,
+    /// COMPUTED: NetService::update
+    pub hostname_info: BTreeMap<u16, Vec<HostnameInfo>>, // internal port -> Hostnames
 }
 impl AsRef<Host> for Host {
     fn as_ref(&self) -> &Host {
@@ -36,7 +37,7 @@ impl Host {
             kind,
             bindings: BTreeMap::new(),
             addresses: BTreeSet::new(),
-            primary: None,
+            hostname_info: BTreeMap::new(),
         }
     }
 }
@@ -53,9 +54,9 @@ pub enum HostKind {
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[model = "Model<Self>"]
 #[ts(export)]
-pub struct HostInfo(BTreeMap<HostId, Host>);
+pub struct Hosts(pub BTreeMap<HostId, Host>);
 
-impl Map for HostInfo {
+impl Map for Hosts {
     type Key = HostId;
     type Value = Host;
     fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
@@ -75,7 +76,7 @@ pub fn host_for<'a>(
     fn host_info<'a>(
         db: &'a mut DatabaseModel,
         package_id: &PackageId,
-    ) -> Result<&'a mut Model<HostInfo>, Error> {
+    ) -> Result<&'a mut Model<Hosts>, Error> {
         Ok::<_, Error>(
             db.as_public_mut()
                 .as_package_data_mut()
@@ -129,9 +130,3 @@ impl Model<Host> {
         })
     }
 }
-
-impl HostInfo {
-    pub fn get_host_primary(&self, host_id: &HostId) -> Option<HostAddress> {
-        self.0.get(&host_id).and_then(|h| h.primary.clone())
-    }
-}
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index 205cc4e36..69c5c7940 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -4,7 +4,6 @@ use std::sync::{Arc, Weak};
 
 use color_eyre::eyre::eyre;
 use imbl::OrdMap;
-use lazy_format::lazy_format;
 use models::{HostId, OptionExt, PackageId};
 use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
@@ -15,8 +14,9 @@ use crate::hostname::Hostname;
 use crate::net::dns::DnsController;
 use crate::net::forward::LanPortForwardController;
 use crate::net::host::address::HostAddress;
-use crate::net::host::binding::{AddSslOptions, BindOptions};
+use crate::net::host::binding::{AddSslOptions, BindOptions, LanInfo};
 use crate::net::host::{host_for, Host, HostKind};
+use crate::net::service_interface::{HostnameInfo, IpHostname, OnionHostname};
 use crate::net::tor::TorController;
 use crate::net::vhost::{AlpnInfo, VHostController};
 use crate::prelude::*;
@@ -164,7 +164,7 @@ impl NetController {
 
 #[derive(Default, Debug)]
 struct HostBinds {
-    lan: BTreeMap<u16, (u16, Option<AddSslOptions>, Arc<()>)>,
+    lan: BTreeMap<u16, (LanInfo, Option<AddSslOptions>, Vec<Arc<()>>)>,
     tor: BTreeMap<OnionAddressV3, (OrdMap<u16, SocketAddr>, Vec<Arc<()>>)>,
 }
 
@@ -209,105 +209,173 @@ impl NetService {
             .await?;
         self.update(id, host).await
     }
+    pub async fn clear_bindings(&mut self) -> Result<(), Error> {
+        // TODO BLUJ
+        Ok(())
+    }
 
     async fn update(&mut self, id: HostId, host: Host) -> Result<(), Error> {
-        dbg!(&host);
-        dbg!(&self.binds);
         let ctrl = self.net_controller()?;
+        let mut hostname_info = BTreeMap::new();
         let binds = {
             if !self.binds.contains_key(&id) {
                 self.binds.insert(id.clone(), Default::default());
             }
             self.binds.get_mut(&id).unwrap()
         };
-        if true
-        // TODO: if should listen lan
-        {
-            for (port, bind) in &host.bindings {
-                let old_lan_bind = binds.lan.remove(port);
-                let old_lan_port = old_lan_bind.as_ref().map(|(external, _, _)| *external);
-                let lan_bind = old_lan_bind.filter(|(external, ssl, _)| {
-                    ssl == &bind.options.add_ssl
-                        && bind.assigned_lan_port.as_ref() == Some(external)
-                }); // only keep existing binding if relevant details match
-                if let Some(external) = bind.assigned_lan_port {
-                    let new_lan_bind = if let Some(b) = lan_bind {
-                        b
-                    } else {
-                        if let Some(ssl) = &bind.options.add_ssl {
-                            let rc = ctrl
-                                .vhost
+        let peek = ctrl.db.peek().await;
+
+        // LAN
+        let server_info = peek.as_public().as_server_info();
+        let ip_info = server_info.as_ip_info().de()?;
+        let hostname = server_info.as_hostname().de()?;
+        for (port, bind) in &host.bindings {
+            let old_lan_bind = binds.lan.remove(port);
+            let old_lan_port = old_lan_bind.as_ref().map(|(external, _, _)| *external);
+            let lan_bind = old_lan_bind
+                .filter(|(external, ssl, _)| ssl == &bind.options.add_ssl && bind.lan == *external); // only keep existing binding if relevant details match
+            if bind.lan.assigned_port.is_some() || bind.lan.assigned_ssl_port.is_some() {
+                let new_lan_bind = if let Some(b) = lan_bind {
+                    b
+                } else {
+                    let mut rcs = Vec::with_capacity(2);
+                    if let Some(ssl) = &bind.options.add_ssl {
+                        let external = bind
+                            .lan
+                            .assigned_ssl_port
+                            .or_not_found("assigned ssl port")?;
+                        rcs.push(
+                            ctrl.vhost
                                 .add(
                                     None,
                                     external,
                                     (self.ip, *port).into(),
-                                    if bind.options.secure.as_ref().map_or(false, |s| s.ssl) {
-                                        Ok(())
+                                    if let Some(alpn) = ssl.alpn.clone() {
+                                        Err(alpn)
                                     } else {
-                                        Err(ssl.alpn.clone())
+                                        if bind.options.secure.as_ref().map_or(false, |s| s.ssl) {
+                                            Ok(())
+                                        } else {
+                                            Err(AlpnInfo::Reflect)
+                                        }
                                     },
                                 )
-                                .await?;
-                            (*port, Some(ssl.clone()), rc)
+                                .await?,
+                        );
+                    }
+                    if let Some(security) = bind.options.secure {
+                        if bind.options.add_ssl.is_some() && security.ssl {
+                            // doesn't make sense to have 2 listening ports, both with ssl
                         } else {
-                            let rc = ctrl.forward.add(external, (self.ip, *port).into()).await?;
-                            (*port, None, rc)
+                            let external =
+                                bind.lan.assigned_port.or_not_found("assigned lan port")?;
+                            rcs.push(ctrl.forward.add(external, (self.ip, *port).into()).await?);
                         }
-                    };
-                    binds.lan.insert(*port, new_lan_bind);
+                    }
+                    (bind.lan, bind.options.add_ssl.clone(), rcs)
+                };
+                let mut bind_hostname_info: Vec<HostnameInfo> =
+                    hostname_info.remove(port).unwrap_or_default();
+                for (interface, ip_info) in &ip_info {
+                    bind_hostname_info.push(HostnameInfo::Ip {
+                        network_interface_id: interface.clone(),
+                        public: false,
+                        hostname: IpHostname::Local {
+                            value: format!("{hostname}.local"),
+                            port: new_lan_bind.0.assigned_port,
+                            ssl_port: new_lan_bind.0.assigned_ssl_port,
+                        },
+                    });
+                    if let Some(ipv4) = ip_info.ipv4 {
+                        bind_hostname_info.push(HostnameInfo::Ip {
+                            network_interface_id: interface.clone(),
+                            public: false,
+                            hostname: IpHostname::Ipv4 {
+                                value: ipv4,
+                                port: new_lan_bind.0.assigned_port,
+                                ssl_port: new_lan_bind.0.assigned_ssl_port,
+                            },
+                        });
+                    }
+                    if let Some(ipv6) = ip_info.ipv6 {
+                        bind_hostname_info.push(HostnameInfo::Ip {
+                            network_interface_id: interface.clone(),
+                            public: false,
+                            hostname: IpHostname::Ipv6 {
+                                value: ipv6,
+                                port: new_lan_bind.0.assigned_port,
+                                ssl_port: new_lan_bind.0.assigned_ssl_port,
+                            },
+                        });
+                    }
                 }
-                if let Some(external) = old_lan_port {
+                hostname_info.insert(*port, bind_hostname_info);
+                binds.lan.insert(*port, new_lan_bind);
+            }
+            if let Some(lan) = old_lan_port {
+                if let Some(external) = lan.assigned_ssl_port {
                     ctrl.vhost.gc(None, external).await?;
+                }
+                if let Some(external) = lan.assigned_port {
                     ctrl.forward.gc(external).await?;
                 }
             }
-            let mut removed = BTreeSet::new();
-            let mut removed_ssl = BTreeSet::new();
-            binds.lan.retain(|internal, (external, ssl, _)| {
-                if host.bindings.contains_key(internal) {
-                    true
-                } else {
-                    if ssl.is_some() {
-                        removed_ssl.insert(*external);
-                    } else {
-                        removed.insert(*external);
-                    }
-                    false
-                }
-            });
-            for external in removed {
-                ctrl.forward.gc(external).await?;
+        }
+        let mut removed = BTreeSet::new();
+        binds.lan.retain(|internal, (external, _, _)| {
+            if host.bindings.contains_key(internal) {
+                true
+            } else {
+                removed.insert(*external);
+
+                false
             }
-            for external in removed_ssl {
+        });
+        for lan in removed {
+            if let Some(external) = lan.assigned_ssl_port {
                 ctrl.vhost.gc(None, external).await?;
             }
+            if let Some(external) = lan.assigned_port {
+                ctrl.forward.gc(external).await?;
+            }
         }
-        let tor_binds: OrdMap<u16, SocketAddr> = host
-            .bindings
-            .iter()
-            .flat_map(|(internal, info)| {
-                let non_ssl = (
-                    info.options.preferred_external_port,
-                    SocketAddr::from((self.ip, *internal)),
+
+        struct TorHostnamePorts {
+            non_ssl: Option<u16>,
+            ssl: Option<u16>,
+        }
+        let mut tor_hostname_ports = BTreeMap::<u16, TorHostnamePorts>::new();
+        let mut tor_binds = OrdMap::<u16, SocketAddr>::new();
+        for (internal, info) in &host.bindings {
+            tor_binds.insert(
+                info.options.preferred_external_port,
+                SocketAddr::from((self.ip, *internal)),
+            );
+            if let (Some(ssl), Some(ssl_internal)) =
+                (&info.options.add_ssl, info.lan.assigned_ssl_port)
+            {
+                tor_binds.insert(
+                    ssl.preferred_external_port,
+                    SocketAddr::from(([127, 0, 0, 1], ssl_internal)),
                 );
-                if let (Some(ssl), Some(ssl_internal)) =
-                    (&info.options.add_ssl, info.assigned_lan_port)
-                {
-                    itertools::Either::Left(
-                        [
-                            (
-                                ssl.preferred_external_port,
-                                SocketAddr::from(([127, 0, 0, 1], ssl_internal)),
-                            ),
-                            non_ssl,
-                        ]
-                        .into_iter(),
-                    )
-                } else {
-                    itertools::Either::Right([non_ssl].into_iter())
-                }
-            })
-            .collect();
+                tor_hostname_ports.insert(
+                    *internal,
+                    TorHostnamePorts {
+                        non_ssl: Some(info.options.preferred_external_port)
+                            .filter(|p| *p != ssl.preferred_external_port),
+                        ssl: Some(ssl.preferred_external_port),
+                    },
+                );
+            } else {
+                tor_hostname_ports.insert(
+                    *internal,
+                    TorHostnamePorts {
+                        non_ssl: Some(info.options.preferred_external_port),
+                        ssl: None,
+                    },
+                );
+            }
+        }
         let mut keep_tor_addrs = BTreeSet::new();
         for addr in match host.kind {
             HostKind::Multi => {
@@ -324,13 +392,10 @@ impl NetService {
                     let new_tor_bind = if let Some(tor_bind) = tor_bind {
                         tor_bind
                     } else {
-                        let key = ctrl
-                            .db
-                            .peek()
-                            .await
-                            .into_private()
-                            .into_key_store()
-                            .into_onion()
+                        let key = peek
+                            .as_private()
+                            .as_key_store()
+                            .as_onion()
                             .get_key(address)?;
                         let rcs = ctrl
                             .tor
@@ -338,6 +403,18 @@ impl NetService {
                             .await?;
                         (tor_binds.clone(), rcs)
                     };
+                    for (internal, ports) in &tor_hostname_ports {
+                        let mut bind_hostname_info =
+                            hostname_info.remove(internal).unwrap_or_default();
+                        bind_hostname_info.push(HostnameInfo::Onion {
+                            hostname: OnionHostname {
+                                value: address.to_string(),
+                                port: ports.non_ssl,
+                                ssl_port: ports.ssl,
+                            },
+                        });
+                        hostname_info.insert(*internal, bind_hostname_info);
+                    }
                     binds.tor.insert(address.clone(), new_tor_bind);
                 }
             }
@@ -347,6 +424,14 @@ impl NetService {
                 ctrl.tor.gc(Some(addr.clone()), None).await?;
             }
         }
+        self.net_controller()?
+            .db
+            .mutate(|db| {
+                host_for(db, &self.id, &id, host.kind)?
+                    .as_hostname_info_mut()
+                    .ser(&hostname_info)
+            })
+            .await?;
         Ok(())
     }
 
@@ -355,12 +440,13 @@ impl NetService {
         let mut errors = ErrorCollection::new();
         if let Some(ctrl) = Weak::upgrade(&self.controller) {
             for (_, binds) in std::mem::take(&mut self.binds) {
-                for (_, (external, ssl, rc)) in binds.lan {
+                for (_, (lan, _, rc)) in binds.lan {
                     drop(rc);
-                    if ssl.is_some() {
-                        errors.handle(ctrl.vhost.gc(None, external).await);
-                    } else {
-                        errors.handle(ctrl.forward.gc(external).await);
+                    if let Some(external) = lan.assigned_ssl_port {
+                        ctrl.vhost.gc(None, external).await?;
+                    }
+                    if let Some(external) = lan.assigned_port {
+                        ctrl.forward.gc(external).await?;
                     }
                 }
                 for (addr, (_, rcs)) in binds.tor {
@@ -384,12 +470,12 @@ impl NetService {
         self.ip
     }
 
-    pub fn get_ext_port(&self, host_id: HostId, internal_port: u16) -> Result<u16, Error> {
+    pub fn get_ext_port(&self, host_id: HostId, internal_port: u16) -> Result<LanInfo, Error> {
         let host_id_binds = self.binds.get_key_value(&host_id);
         match host_id_binds {
             Some((_, binds)) => {
-                if let Some(ext_port_info) = binds.lan.get(&internal_port) {
-                    Ok(ext_port_info.0)
+                if let Some((lan, _, _)) = binds.lan.get(&internal_port) {
+                    Ok(*lan)
                 } else {
                     Err(Error::new(
                         eyre!(
diff --git a/core/startos/src/net/service_interface.rs b/core/startos/src/net/service_interface.rs
index 9a4659cfd..e905be545 100644
--- a/core/startos/src/net/service_interface.rs
+++ b/core/startos/src/net/service_interface.rs
@@ -1,51 +1,32 @@
 use std::net::{Ipv4Addr, Ipv6Addr};
 
+use imbl_value::InternedString;
 use models::{HostId, ServiceInterfaceId};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::net::host::binding::BindOptions;
-use crate::net::host::HostKind;
-use crate::prelude::*;
-
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-pub struct ServiceInterfaceWithHostInfo {
-    #[serde(flatten)]
-    pub service_interface: ServiceInterface,
-    pub host_info: ExportedHostInfo,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-pub struct ExportedHostInfo {
-    pub id: HostId,
-    pub kind: HostKind,
-    pub hostnames: Vec<ExportedHostnameInfo>,
-}
+use crate::net::host::address::HostAddress;
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[serde(rename_all_fields = "camelCase")]
 #[serde(tag = "kind")]
-pub enum ExportedHostnameInfo {
+pub enum HostnameInfo {
     Ip {
         network_interface_id: String,
         public: bool,
-        hostname: ExportedIpHostname,
+        hostname: IpHostname,
     },
     Onion {
-        hostname: ExportedOnionHostname,
+        hostname: OnionHostname,
     },
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
-pub struct ExportedOnionHostname {
+pub struct OnionHostname {
     pub value: String,
     pub port: Option<u16>,
     pub ssl_port: Option<u16>,
@@ -56,7 +37,7 @@ pub struct ExportedOnionHostname {
 #[serde(rename_all = "camelCase")]
 #[serde(rename_all_fields = "camelCase")]
 #[serde(tag = "kind")]
-pub enum ExportedIpHostname {
+pub enum IpHostname {
     Ipv4 {
         value: Ipv4Addr,
         port: Option<u16>,
@@ -110,6 +91,10 @@ pub enum ServiceInterfaceType {
 pub struct AddressInfo {
     pub username: Option<String>,
     pub host_id: HostId,
-    pub bind_options: BindOptions,
+    pub internal_port: u16,
+    #[ts(type = "string | null")]
+    pub scheme: Option<InternedString>,
+    #[ts(type = "string | null")]
+    pub ssl_scheme: Option<InternedString>,
     pub suffix: String,
 }
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index 8dc1e6da3..b4f5715ae 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -205,7 +205,7 @@ impl VHostServer {
                                                     .into_entries()?
                                                     .into_iter()
                                                     .flat_map(|(_, ips)| [
-                                                        ips.as_ipv4().de().map(|ip| ip.map(IpAddr::V4)), 
+                                                        ips.as_ipv4().de().map(|ip| ip.map(IpAddr::V4)),
                                                         ips.as_ipv6().de().map(|ip| ip.map(IpAddr::V6))
                                                     ])
                                                     .filter_map(|a| a.transpose())
diff --git a/core/startos/src/registry/auth.rs b/core/startos/src/registry/auth.rs
index 741090b4d..27655c4a8 100644
--- a/core/startos/src/registry/auth.rs
+++ b/core/startos/src/registry/auth.rs
@@ -138,7 +138,6 @@ impl Middleware<RegistryContext> for Auth {
         if request.headers().contains_key(AUTH_SIG_HEADER) {
             self.signer = Some(
                 async {
-                    let request = request;
                     let SignatureHeader {
                         commitment,
                         signer,
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index e6ccdd131..da641468b 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -10,7 +10,8 @@ use persistent_container::PersistentContainer;
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
 use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
-use tokio::{fs::File, sync::Notify};
+use tokio::fs::File;
+use tokio::sync::Notify;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
@@ -308,7 +309,7 @@ impl Service {
             .send(transition::restore::Restore {
                 path: backup_source.path().to_path_buf(),
             })
-            .await?;
+            .await??;
         Ok(service)
     }
 
@@ -370,7 +371,7 @@ impl Service {
             .send(transition::backup::Backup {
                 path: guard.path().to_path_buf(),
             })
-            .await?;
+            .await??;
         Ok(())
     }
 
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 06dcdc28e..03203633a 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -10,7 +10,7 @@ use imbl_value::InternedString;
 use models::{ProcedureName, VolumeId};
 use rpc_toolkit::{Empty, Server, ShutdownHandle};
 use serde::de::DeserializeOwned;
-use tokio::fs::{ File};
+use tokio::fs::File;
 use tokio::process::Command;
 use tokio::sync::{oneshot, watch, Mutex, OnceCell};
 use tracing::instrument;
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 31c5a8026..aedf4c194 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -9,7 +9,6 @@ use std::sync::{Arc, Weak};
 use clap::builder::ValueParserFactory;
 use clap::Parser;
 use emver::VersionRange;
-use imbl::OrdMap;
 use imbl_value::{json, InternedString};
 use itertools::Itertools;
 use models::{
@@ -30,12 +29,9 @@ use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::net::host::address::HostAddress;
-use crate::net::host::binding::BindOptions;
-use crate::net::host::{self, HostKind};
-use crate::net::service_interface::{
-    AddressInfo, ExportedHostInfo, ExportedHostnameInfo, ServiceInterface, ServiceInterfaceType,
-    ServiceInterfaceWithHostInfo,
-};
+use crate::net::host::binding::{BindOptions, LanInfo};
+use crate::net::host::{Host, HostKind};
+use crate::net::service_interface::{AddressInfo, ServiceInterface, ServiceInterfaceType};
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::rpc::SKIP_ENV;
@@ -193,7 +189,6 @@ pub fn service_effect_handler<C: Context>() -> ParentHandler<C> {
         .subcommand("removeAddress", from_fn_async(remove_address).no_cli())
         .subcommand("exportAction", from_fn_async(export_action).no_cli())
         .subcommand("removeAction", from_fn_async(remove_action).no_cli())
-        .subcommand("reverseProxy", from_fn_async(reverse_proxy).no_cli())
         .subcommand("mount", from_fn_async(mount).no_cli())
 
     // TODO Callbacks
@@ -233,8 +228,6 @@ struct ExportServiceInterfaceParams {
     masked: bool,
     address_info: AddressInfo,
     r#type: ServiceInterfaceType,
-    host_kind: HostKind,
-    hostnames: Vec<ExportedHostnameInfo>,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
@@ -242,9 +235,8 @@ struct ExportServiceInterfaceParams {
 struct GetPrimaryUrlParams {
     #[ts(type = "string | null")]
     package_id: Option<PackageId>,
-    service_interface_id: String,
+    service_interface_id: ServiceInterfaceId,
     callback: Callback,
-    host_id: HostId,
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
@@ -276,37 +268,7 @@ struct RemoveActionParams {
     #[ts(type = "string")]
     id: ActionId,
 }
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ReverseProxyBind {
-    ip: Option<String>,
-    port: u32,
-    ssl: bool,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ReverseProxyDestination {
-    ip: Option<String>,
-    port: u32,
-    ssl: bool,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ReverseProxyHttp {
-    #[ts(type = "null | {[key: string]: string}")]
-    headers: Option<OrdMap<String, String>>,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ReverseProxyParams {
-    bind: ReverseProxyBind,
-    dst: ReverseProxyDestination,
-    http: ReverseProxyHttp,
-}
+
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
@@ -367,7 +329,7 @@ async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Ipv4Addr,
 async fn get_service_port_forward(
     context: EffectContext,
     data: GetServicePortForwardParams,
-) -> Result<u16, Error> {
+) -> Result<LanInfo, Error> {
     let internal_port = data.internal_port as u16;
 
     let context = context.deref()?;
@@ -404,13 +366,10 @@ async fn export_service_interface(
         masked,
         address_info,
         r#type,
-        host_kind,
-        hostnames,
     }: ExportServiceInterfaceParams,
 ) -> Result<(), Error> {
     let context = context.deref()?;
     let package_id = context.id.clone();
-    let host_id = address_info.host_id.clone();
 
     let service_interface = ServiceInterface {
         id: id.clone(),
@@ -422,15 +381,7 @@ async fn export_service_interface(
         address_info,
         interface_type: r#type,
     };
-    let host_info = ExportedHostInfo {
-        id: host_id,
-        kind: host_kind,
-        hostnames,
-    };
-    let svc_interface_with_host_info = ServiceInterfaceWithHostInfo {
-        service_interface,
-        host_info,
-    };
+    let svc_interface_with_host_info = service_interface;
 
     context
         .ctx
@@ -449,35 +400,26 @@ async fn export_service_interface(
 }
 async fn get_primary_url(
     context: EffectContext,
-    data: GetPrimaryUrlParams,
-) -> Result<HostAddress, Error> {
+    GetPrimaryUrlParams {
+        package_id,
+        service_interface_id,
+        callback,
+    }: GetPrimaryUrlParams,
+) -> Result<Option<HostAddress>, Error> {
     let context = context.deref()?;
-    let package_id = context.id.clone();
-
-    let db_model = context.ctx.db.peek().await;
-
-    let pkg_data_model = db_model
-        .as_public()
-        .as_package_data()
-        .as_idx(&package_id)
-        .or_not_found(&package_id)?;
-
-    let host = pkg_data_model.de()?.hosts.get_host_primary(&data.host_id);
+    let package_id = package_id.unwrap_or_else(|| context.id.clone());
 
-    match host {
-        Some(host_address) => Ok(host_address),
-        None => Err(Error::new(
-            eyre!("Primary Url not found for {}", data.host_id),
-            crate::ErrorKind::NotFound,
-        )),
-    }
+    Ok(None) // TODO
 }
 async fn list_service_interfaces(
     context: EffectContext,
-    data: ListServiceInterfacesParams,
-) -> Result<BTreeMap<ServiceInterfaceId, ServiceInterfaceWithHostInfo>, Error> {
+    ListServiceInterfacesParams {
+        package_id,
+        callback,
+    }: ListServiceInterfacesParams,
+) -> Result<BTreeMap<ServiceInterfaceId, ServiceInterface>, Error> {
     let context = context.deref()?;
-    let package_id = context.id.clone();
+    let package_id = package_id.unwrap_or_else(|| context.id.clone());
 
     context
         .ctx
@@ -553,10 +495,8 @@ async fn remove_action(context: EffectContext, data: RemoveActionParams) -> Resu
         .await?;
     Ok(())
 }
-async fn reverse_proxy(context: EffectContext, data: ReverseProxyParams) -> Result<Value, Error> {
-    todo!()
-}
 async fn mount(context: EffectContext, data: MountParams) -> Result<Value, Error> {
+    // TODO
     todo!()
 }
 
@@ -564,49 +504,42 @@ async fn mount(context: EffectContext, data: MountParams) -> Result<Value, Error
 #[ts(export)]
 struct Callback(#[ts(type = "() => void")] i64);
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-enum GetHostInfoParamsKind {
-    Multi,
-}
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct GetHostInfoParams {
-    kind: Option<GetHostInfoParamsKind>,
-    service_interface_id: String,
+    host_id: HostId,
     #[ts(type = "string | null")]
     package_id: Option<PackageId>,
     callback: Callback,
 }
 async fn get_host_info(
     ctx: EffectContext,
-    GetHostInfoParams { .. }: GetHostInfoParams,
-) -> Result<Value, Error> {
+    GetHostInfoParams {
+        callback,
+        package_id,
+        host_id,
+    }: GetHostInfoParams,
+) -> Result<Host, Error> {
     let ctx = ctx.deref()?;
-    Ok(json!({
-        "id": "fakeId1",
-        "kind": "multi",
-        "hostnames": [{
-            "kind": "ip",
-            "networkInterfaceId": "fakeNetworkInterfaceId1",
-            "public": true,
-            "hostname":{
-                  "kind": "domain",
-                  "domain": format!("{}", ctx.id),
-                  "subdomain": (),
-                  "port": (),
-                  "sslPort": ()
-                }
-          }
+    let db = ctx.ctx.db.peek().await;
+    let package_id = package_id.unwrap_or_else(|| ctx.id.clone());
 
-        ]
-    }))
+    db.as_public()
+        .as_package_data()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?
+        .as_hosts()
+        .as_idx(&host_id)
+        .or_not_found(&host_id)?
+        .de()
 }
 
-async fn clear_bindings(context: EffectContext, _: Empty) -> Result<Value, Error> {
-    todo!()
+async fn clear_bindings(context: EffectContext, _: Empty) -> Result<(), Error> {
+    let ctx = context.deref()?;
+    let mut svc = ctx.persistent_container.net_service.lock().await;
+    svc.clear_bindings().await?;
+    Ok(())
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
@@ -619,15 +552,13 @@ struct BindParams {
     #[serde(flatten)]
     options: BindOptions,
 }
-async fn bind(
-    context: EffectContext,
-    BindParams {
+async fn bind(context: EffectContext, bind_params: Value) -> Result<(), Error> {
+    let BindParams {
         kind,
         id,
         internal_port,
         options,
-    }: BindParams,
-) -> Result<(), Error> {
+    } = from_value(bind_params)?;
     let ctx = context.deref()?;
     let mut svc = ctx.persistent_container.net_service.lock().await;
     svc.bind(kind, id, internal_port, options).await
@@ -639,39 +570,32 @@ async fn bind(
 struct GetServiceInterfaceParams {
     #[ts(type = "string | null")]
     package_id: Option<PackageId>,
-    service_interface_id: String,
+    service_interface_id: ServiceInterfaceId,
     callback: Callback,
 }
+
 async fn get_service_interface(
-    _: EffectContext,
+    ctx: EffectContext,
     GetServiceInterfaceParams {
         callback,
         package_id,
         service_interface_id,
     }: GetServiceInterfaceParams,
-) -> Result<Value, Error> {
-    // TODO @Dr_Bonez
-    Ok(json!({
-        "id": service_interface_id,
-        "name": service_interface_id,
-        "description": "This is a fake",
-        "hasPrimary": true,
-        "disabled": false,
-        "masked": false,
-        "addressInfo": json!({
-            "username": Value::Null,
-            "hostId": "HostId?",
-            "options": json!({
-                "scheme": Value::Null,
-                "preferredExternalPort": 80,
-                "addSsl":Value::Null,
-                "secure": false,
-                "ssl": false
-            }),
-            "suffix": "http"
-        }),
-        "type": "api"
-    }))
+) -> Result<ServiceInterface, Error> {
+    let ctx = ctx.deref()?;
+    let package_id = package_id.unwrap_or_else(|| ctx.id.clone());
+    let db = ctx.ctx.db.peek().await;
+
+    let interface = db
+        .as_public()
+        .as_package_data()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?
+        .as_service_interfaces()
+        .as_idx(&service_interface_id)
+        .or_not_found(&service_interface_id)?
+        .de()?;
+    Ok(interface)
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
@@ -764,6 +688,7 @@ async fn get_ssl_certificate(
         host_id,
     }: GetSslCertificateParams,
 ) -> Result<Value, Error> {
+    // TODO
     let fake = include_str!("./fake.cert.pem");
     Ok(json!([fake, fake, fake]))
 }
@@ -785,6 +710,7 @@ async fn get_ssl_key(
         algorithm,
     }: GetSslKeyParams,
 ) -> Result<Value, Error> {
+    // TODO
     let fake = include_str!("./fake.cert.key");
     Ok(json!(fake))
 }
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 381914c13..f5959a084 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -59,7 +59,7 @@ import {
 } from "./interfaces/setupInterfaces"
 import { successFailure } from "./trigger/successFailure"
 import { HealthReceipt } from "./health/HealthReceipt"
-import { MultiHost, Scheme, SingleHost, StaticHost } from "./interfaces/Host"
+import { MultiHost, Scheme } from "./interfaces/Host"
 import { ServiceInterfaceBuilder } from "./interfaces/ServiceInterfaceBuilder"
 import { GetSystemSmtp } from "./util/GetSystemSmtp"
 import nullIfEmpty from "./util/nullIfEmpty"
@@ -178,10 +178,10 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       },
 
       host: {
-        static: (effects: Effects, id: string) =>
-          new StaticHost({ id, effects }),
-        single: (effects: Effects, id: string) =>
-          new SingleHost({ id, effects }),
+        // static: (effects: Effects, id: string) =>
+        //   new StaticHost({ id, effects }),
+        // single: (effects: Effects, id: string) =>
+        //   new SingleHost({ id, effects }),
         multi: (effects: Effects, id: string) => new MultiHost({ id, effects }),
       },
       nullIfEmpty,
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index 2f1353cc1..96a76628a 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -1,14 +1,14 @@
-import { object, string } from "ts-matches"
+import { number, object, string } from "ts-matches"
 import { Effects } from "../types"
 import { Origin } from "./Origin"
-import { AddSslOptions } from ".././osBindings"
+import { AddSslOptions, BindParams } from ".././osBindings"
 import { Security } from ".././osBindings"
 import { BindOptions } from ".././osBindings"
 import { AlpnInfo } from ".././osBindings"
 
 export { AddSslOptions, Security, BindOptions }
 
-const knownProtocols = {
+export const knownProtocols = {
   http: {
     secure: null,
     defaultPort: 80,
@@ -69,19 +69,17 @@ type NotProtocolsWithSslVariants = Exclude<
 type BindOptionsByKnownProtocol =
   | {
       protocol: ProtocolsWithSslVariants
-      preferredExternalPort?: number
-      scheme?: Scheme
+      preferredExternalPort: number
       addSsl?: Partial<AddSslOptions>
     }
   | {
       protocol: NotProtocolsWithSslVariants
-      preferredExternalPort?: number
-      scheme?: Scheme
+      preferredExternalPort: number
       addSsl?: AddSslOptions
     }
-type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions
+export type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions
 
-export type HostKind = "static" | "single" | "multi"
+export type HostKind = BindParams["kind"]
 
 const hasStringProtocol = object({
   protocol: string,
@@ -110,66 +108,62 @@ export class Host {
   private async bindPortForUnknown(
     internalPort: number,
     options: {
-      scheme: Scheme
       preferredExternalPort: number
       addSsl: AddSslOptions | null
       secure: { ssl: boolean } | null
     },
   ) {
-    await this.options.effects.bind({
+    const binderOptions = {
       kind: this.options.kind,
       id: this.options.id,
-      internalPort: internalPort,
+      internalPort,
       ...options,
-    })
+    }
+    await this.options.effects.bind(binderOptions)
 
-    return new Origin(this, options)
+    return new Origin(this, internalPort, null, null)
   }
 
   private async bindPortForKnown(
     options: BindOptionsByKnownProtocol,
     internalPort: number,
   ) {
-    const scheme =
-      options.scheme === undefined ? options.protocol : options.scheme
     const protoInfo = knownProtocols[options.protocol]
     const preferredExternalPort =
       options.preferredExternalPort ||
       knownProtocols[options.protocol].defaultPort
-    const addSsl = this.getAddSsl(options, protoInfo)
+    const sslProto = this.getSslProto(options, protoInfo)
+    const addSsl =
+      sslProto && "alpn" in protoInfo
+        ? {
+            // addXForwardedHeaders: null,
+            preferredExternalPort: knownProtocols[sslProto].defaultPort,
+            scheme: sslProto,
+            alpn: protoInfo.alpn,
+            ...("addSsl" in options ? options.addSsl : null),
+          }
+        : null
 
     const secure: Security | null = !protoInfo.secure ? null : { ssl: false }
 
-    const newOptions = {
-      scheme,
-      preferredExternalPort,
-      addSsl,
-      secure,
-    }
-
     await this.options.effects.bind({
       kind: this.options.kind,
       id: this.options.id,
       internalPort,
-      ...newOptions,
+      preferredExternalPort,
+      addSsl,
+      secure,
     })
 
-    return new Origin(this, newOptions)
+    return new Origin(this, internalPort, options.protocol, sslProto)
   }
 
-  private getAddSsl(
+  private getSslProto(
     options: BindOptionsByKnownProtocol,
     protoInfo: KnownProtocols[keyof KnownProtocols],
-  ): AddSslOptions | null {
+  ) {
     if (inObject("noAddSsl", options) && options.noAddSsl) return null
-    if ("withSsl" in protoInfo && protoInfo.withSsl)
-      return {
-        // addXForwardedHeaders: null,
-        preferredExternalPort: knownProtocols[protoInfo.withSsl].defaultPort,
-        scheme: protoInfo.withSsl,
-        alpn: protoInfo.alpn,
-        ...("addSsl" in options ? options.addSsl : null),
-      }
+    if ("withSsl" in protoInfo && protoInfo.withSsl) return protoInfo.withSsl
     return null
   }
 }
@@ -181,17 +175,17 @@ function inObject<Key extends string>(
   return key in obj
 }
 
-export class StaticHost extends Host {
-  constructor(options: { effects: Effects; id: string }) {
-    super({ ...options, kind: "static" })
-  }
-}
-
-export class SingleHost extends Host {
-  constructor(options: { effects: Effects; id: string }) {
-    super({ ...options, kind: "single" })
-  }
-}
+// export class StaticHost extends Host {
+//   constructor(options: { effects: Effects; id: string }) {
+//     super({ ...options, kind: "static" })
+//   }
+// }
+
+// export class SingleHost extends Host {
+//   constructor(options: { effects: Effects; id: string }) {
+//     super({ ...options, kind: "single" })
+//   }
+// }
 
 export class MultiHost extends Host {
   constructor(options: { effects: Effects; id: string }) {
diff --git a/sdk/lib/interfaces/Origin.ts b/sdk/lib/interfaces/Origin.ts
index aaadbea50..52afe1ed3 100644
--- a/sdk/lib/interfaces/Origin.ts
+++ b/sdk/lib/interfaces/Origin.ts
@@ -6,7 +6,9 @@ import { ServiceInterfaceBuilder } from "./ServiceInterfaceBuilder"
 export class Origin<T extends Host> {
   constructor(
     readonly host: T,
-    readonly options: BindOptions,
+    readonly internalPort: number,
+    readonly scheme: string | null,
+    readonly sslScheme: string | null,
   ) {}
 
   build({ username, path, search, schemeOverride }: BuildOptions): AddressInfo {
@@ -20,18 +22,9 @@ export class Origin<T extends Host> {
 
     return {
       hostId: this.host.options.id,
-      bindOptions: {
-        ...this.options,
-        scheme: schemeOverride ? schemeOverride.noSsl : this.options.scheme,
-        addSsl: this.options.addSsl
-          ? {
-              ...this.options.addSsl,
-              scheme: schemeOverride
-                ? schemeOverride.ssl
-                : this.options.addSsl.scheme,
-            }
-          : null,
-      },
+      internalPort: this.internalPort,
+      scheme: schemeOverride ? schemeOverride.noSsl : this.scheme,
+      sslScheme: schemeOverride ? schemeOverride.ssl : this.sslScheme,
       suffix: `${path}${qp}`,
       username,
     }
diff --git a/sdk/lib/osBindings/AddAssetParams.ts b/sdk/lib/osBindings/AddAssetParams.ts
index ce6128cf7..ffd7db675 100644
--- a/sdk/lib/osBindings/AddAssetParams.ts
+++ b/sdk/lib/osBindings/AddAssetParams.ts
@@ -6,7 +6,6 @@ import type { Version } from "./Version"
 export type AddAssetParams = {
   version: Version
   platform: string
-  upload: boolean
   url: string
   signature: AnySignature
   commitment: Blake3Commitment
diff --git a/sdk/lib/osBindings/AddPackageParams.ts b/sdk/lib/osBindings/AddPackageParams.ts
new file mode 100644
index 000000000..4395b9b8a
--- /dev/null
+++ b/sdk/lib/osBindings/AddPackageParams.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AnySignature } from "./AnySignature"
+import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
+
+export type AddPackageParams = {
+  url: string
+  commitment: MerkleArchiveCommitment
+  signature: AnySignature
+}
diff --git a/sdk/lib/osBindings/AddSslOptions.ts b/sdk/lib/osBindings/AddSslOptions.ts
index daa9aee0e..35071aff3 100644
--- a/sdk/lib/osBindings/AddSslOptions.ts
+++ b/sdk/lib/osBindings/AddSslOptions.ts
@@ -2,7 +2,6 @@
 import type { AlpnInfo } from "./AlpnInfo"
 
 export type AddSslOptions = {
-  scheme: string | null
   preferredExternalPort: number
-  alpn: AlpnInfo
+  alpn: AlpnInfo | null
 }
diff --git a/sdk/lib/osBindings/AddressInfo.ts b/sdk/lib/osBindings/AddressInfo.ts
index 818b570bb..c7a1c1af1 100644
--- a/sdk/lib/osBindings/AddressInfo.ts
+++ b/sdk/lib/osBindings/AddressInfo.ts
@@ -1,10 +1,11 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { BindOptions } from "./BindOptions"
 import type { HostId } from "./HostId"
 
 export type AddressInfo = {
   username: string | null
   hostId: HostId
-  bindOptions: BindOptions
+  internalPort: number
+  scheme: string | null
+  sslScheme: string | null
   suffix: string
 }
diff --git a/sdk/lib/osBindings/BindInfo.ts b/sdk/lib/osBindings/BindInfo.ts
index d7b37a70f..221b1c37c 100644
--- a/sdk/lib/osBindings/BindInfo.ts
+++ b/sdk/lib/osBindings/BindInfo.ts
@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BindOptions } from "./BindOptions"
+import type { LanInfo } from "./LanInfo"
 
-export type BindInfo = { options: BindOptions; assignedLanPort: number | null }
+export type BindInfo = { options: BindOptions; lan: LanInfo }
diff --git a/sdk/lib/osBindings/BindOptions.ts b/sdk/lib/osBindings/BindOptions.ts
index a462a8cfc..49d9ecbf2 100644
--- a/sdk/lib/osBindings/BindOptions.ts
+++ b/sdk/lib/osBindings/BindOptions.ts
@@ -3,7 +3,6 @@ import type { AddSslOptions } from "./AddSslOptions"
 import type { Security } from "./Security"
 
 export type BindOptions = {
-  scheme: string | null
   preferredExternalPort: number
   addSsl: AddSslOptions | null
   secure: Security | null
diff --git a/sdk/lib/osBindings/BindParams.ts b/sdk/lib/osBindings/BindParams.ts
index 544f65a40..fcc450476 100644
--- a/sdk/lib/osBindings/BindParams.ts
+++ b/sdk/lib/osBindings/BindParams.ts
@@ -8,7 +8,6 @@ export type BindParams = {
   kind: HostKind
   id: HostId
   internalPort: number
-  scheme: string | null
   preferredExternalPort: number
   addSsl: AddSslOptions | null
   secure: Security | null
diff --git a/sdk/lib/osBindings/ExportServiceInterfaceParams.ts b/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
index 847a6090a..b93e83f7c 100644
--- a/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
+++ b/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
@@ -1,7 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AddressInfo } from "./AddressInfo"
-import type { ExportedHostnameInfo } from "./ExportedHostnameInfo"
-import type { HostKind } from "./HostKind"
 import type { ServiceInterfaceId } from "./ServiceInterfaceId"
 import type { ServiceInterfaceType } from "./ServiceInterfaceType"
 
@@ -14,6 +12,4 @@ export type ExportServiceInterfaceParams = {
   masked: boolean
   addressInfo: AddressInfo
   type: ServiceInterfaceType
-  hostKind: HostKind
-  hostnames: Array<ExportedHostnameInfo>
 }
diff --git a/sdk/lib/osBindings/ExportedHostInfo.ts b/sdk/lib/osBindings/ExportedHostInfo.ts
deleted file mode 100644
index 5e8a25ad6..000000000
--- a/sdk/lib/osBindings/ExportedHostInfo.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ExportedHostnameInfo } from "./ExportedHostnameInfo"
-import type { HostId } from "./HostId"
-import type { HostKind } from "./HostKind"
-
-export type ExportedHostInfo = {
-  id: HostId
-  kind: HostKind
-  hostnames: Array<ExportedHostnameInfo>
-}
diff --git a/sdk/lib/osBindings/ExportedHostnameInfo.ts b/sdk/lib/osBindings/ExportedHostnameInfo.ts
deleted file mode 100644
index 42f849529..000000000
--- a/sdk/lib/osBindings/ExportedHostnameInfo.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ExportedIpHostname } from "./ExportedIpHostname"
-import type { ExportedOnionHostname } from "./ExportedOnionHostname"
-
-export type ExportedHostnameInfo =
-  | {
-      kind: "ip"
-      networkInterfaceId: string
-      public: boolean
-      hostname: ExportedIpHostname
-    }
-  | { kind: "onion"; hostname: ExportedOnionHostname }
diff --git a/sdk/lib/osBindings/GetHostInfoParams.ts b/sdk/lib/osBindings/GetHostInfoParams.ts
index 1ffb95de0..120b4cfe1 100644
--- a/sdk/lib/osBindings/GetHostInfoParams.ts
+++ b/sdk/lib/osBindings/GetHostInfoParams.ts
@@ -1,10 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback"
-import type { GetHostInfoParamsKind } from "./GetHostInfoParamsKind"
+import type { HostId } from "./HostId"
 
 export type GetHostInfoParams = {
-  kind: GetHostInfoParamsKind | null
-  serviceInterfaceId: string
+  hostId: HostId
   packageId: string | null
   callback: Callback
 }
diff --git a/sdk/lib/osBindings/GetHostInfoParamsKind.ts b/sdk/lib/osBindings/GetHostInfoParamsKind.ts
deleted file mode 100644
index 482eb7177..000000000
--- a/sdk/lib/osBindings/GetHostInfoParamsKind.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GetHostInfoParamsKind = "multi"
diff --git a/sdk/lib/osBindings/GetPackageResponse.ts b/sdk/lib/osBindings/GetPackageResponse.ts
index 5bf24bfc0..3e1dd4e9d 100644
--- a/sdk/lib/osBindings/GetPackageResponse.ts
+++ b/sdk/lib/osBindings/GetPackageResponse.ts
@@ -4,6 +4,7 @@ import type { PackageVersionInfo } from "./PackageVersionInfo"
 import type { Version } from "./Version"
 
 export type GetPackageResponse = {
+  categories: string[]
   best: { [key: Version]: PackageVersionInfo }
   otherVersions?: { [key: Version]: PackageInfoShort }
 }
diff --git a/sdk/lib/osBindings/GetPackageResponseFull.ts b/sdk/lib/osBindings/GetPackageResponseFull.ts
index 579924291..e375dd489 100644
--- a/sdk/lib/osBindings/GetPackageResponseFull.ts
+++ b/sdk/lib/osBindings/GetPackageResponseFull.ts
@@ -3,6 +3,7 @@ import type { PackageVersionInfo } from "./PackageVersionInfo"
 import type { Version } from "./Version"
 
 export type GetPackageResponseFull = {
+  categories: string[]
   best: { [key: Version]: PackageVersionInfo }
   otherVersions: { [key: Version]: PackageVersionInfo }
 }
diff --git a/sdk/lib/osBindings/GetPrimaryUrlParams.ts b/sdk/lib/osBindings/GetPrimaryUrlParams.ts
index 1a68ecc7b..dbafa4152 100644
--- a/sdk/lib/osBindings/GetPrimaryUrlParams.ts
+++ b/sdk/lib/osBindings/GetPrimaryUrlParams.ts
@@ -1,10 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback"
-import type { HostId } from "./HostId"
+import type { ServiceInterfaceId } from "./ServiceInterfaceId"
 
 export type GetPrimaryUrlParams = {
   packageId: string | null
-  serviceInterfaceId: string
+  serviceInterfaceId: ServiceInterfaceId
   callback: Callback
-  hostId: HostId
 }
diff --git a/sdk/lib/osBindings/GetServiceInterfaceParams.ts b/sdk/lib/osBindings/GetServiceInterfaceParams.ts
index ee3a0c03d..0a8bdfcb2 100644
--- a/sdk/lib/osBindings/GetServiceInterfaceParams.ts
+++ b/sdk/lib/osBindings/GetServiceInterfaceParams.ts
@@ -1,8 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Callback } from "./Callback"
+import type { ServiceInterfaceId } from "./ServiceInterfaceId"
 
 export type GetServiceInterfaceParams = {
   packageId: string | null
-  serviceInterfaceId: string
+  serviceInterfaceId: ServiceInterfaceId
   callback: Callback
 }
diff --git a/sdk/lib/osBindings/HardwareRequirements.ts b/sdk/lib/osBindings/HardwareRequirements.ts
index 4964bc66f..0e1da1f36 100644
--- a/sdk/lib/osBindings/HardwareRequirements.ts
+++ b/sdk/lib/osBindings/HardwareRequirements.ts
@@ -3,5 +3,5 @@
 export type HardwareRequirements = {
   device: { [key: string]: string }
   ram: number | null
-  arch: Array<string> | null
+  arch: string[] | null
 }
diff --git a/sdk/lib/osBindings/Host.ts b/sdk/lib/osBindings/Host.ts
index a476c0adc..7d8cf3a90 100644
--- a/sdk/lib/osBindings/Host.ts
+++ b/sdk/lib/osBindings/Host.ts
@@ -2,10 +2,14 @@
 import type { BindInfo } from "./BindInfo"
 import type { HostAddress } from "./HostAddress"
 import type { HostKind } from "./HostKind"
+import type { HostnameInfo } from "./HostnameInfo"
 
 export type Host = {
   kind: HostKind
   bindings: { [key: number]: BindInfo }
   addresses: Array<HostAddress>
-  primary: HostAddress | null
+  /**
+   * COMPUTED: NetService::update
+   */
+  hostnameInfo: { [key: number]: Array<HostnameInfo> }
 }
diff --git a/sdk/lib/osBindings/HostnameInfo.ts b/sdk/lib/osBindings/HostnameInfo.ts
new file mode 100644
index 000000000..ef8bafac0
--- /dev/null
+++ b/sdk/lib/osBindings/HostnameInfo.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { IpHostname } from "./IpHostname"
+import type { OnionHostname } from "./OnionHostname"
+
+export type HostnameInfo =
+  | {
+      kind: "ip"
+      networkInterfaceId: string
+      public: boolean
+      hostname: IpHostname
+    }
+  | { kind: "onion"; hostname: OnionHostname }
diff --git a/sdk/lib/osBindings/HostInfo.ts b/sdk/lib/osBindings/Hosts.ts
similarity index 79%
rename from sdk/lib/osBindings/HostInfo.ts
rename to sdk/lib/osBindings/Hosts.ts
index d39b56ebe..c7aa84996 100644
--- a/sdk/lib/osBindings/HostInfo.ts
+++ b/sdk/lib/osBindings/Hosts.ts
@@ -2,4 +2,4 @@
 import type { Host } from "./Host"
 import type { HostId } from "./HostId"
 
-export type HostInfo = { [key: HostId]: Host }
+export type Hosts = { [key: HostId]: Host }
diff --git a/sdk/lib/osBindings/ExportedIpHostname.ts b/sdk/lib/osBindings/IpHostname.ts
similarity index 94%
rename from sdk/lib/osBindings/ExportedIpHostname.ts
rename to sdk/lib/osBindings/IpHostname.ts
index ea06fe05b..4a6b5e87c 100644
--- a/sdk/lib/osBindings/ExportedIpHostname.ts
+++ b/sdk/lib/osBindings/IpHostname.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ExportedIpHostname =
+export type IpHostname =
   | { kind: "ipv4"; value: string; port: number | null; sslPort: number | null }
   | { kind: "ipv6"; value: string; port: number | null; sslPort: number | null }
   | {
diff --git a/sdk/lib/osBindings/ReverseProxyDestination.ts b/sdk/lib/osBindings/LanInfo.ts
similarity index 55%
rename from sdk/lib/osBindings/ReverseProxyDestination.ts
rename to sdk/lib/osBindings/LanInfo.ts
index 88b5dd650..59b8a5519 100644
--- a/sdk/lib/osBindings/ReverseProxyDestination.ts
+++ b/sdk/lib/osBindings/LanInfo.ts
@@ -1,7 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ReverseProxyDestination = {
-  ip: string | null
-  port: number
-  ssl: boolean
+export type LanInfo = {
+  assignedPort: number | null
+  assignedSslPort: number | null
 }
diff --git a/sdk/lib/osBindings/ExportedOnionHostname.ts b/sdk/lib/osBindings/OnionHostname.ts
similarity index 82%
rename from sdk/lib/osBindings/ExportedOnionHostname.ts
rename to sdk/lib/osBindings/OnionHostname.ts
index 2c7d67cec..0bea8245e 100644
--- a/sdk/lib/osBindings/ExportedOnionHostname.ts
+++ b/sdk/lib/osBindings/OnionHostname.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ExportedOnionHostname = {
+export type OnionHostname = {
   value: string
   port: number | null
   sslPort: number | null
diff --git a/sdk/lib/osBindings/OsVersionInfo.ts b/sdk/lib/osBindings/OsVersionInfo.ts
index 7cd0fde9e..a88115350 100644
--- a/sdk/lib/osBindings/OsVersionInfo.ts
+++ b/sdk/lib/osBindings/OsVersionInfo.ts
@@ -7,7 +7,7 @@ export type OsVersionInfo = {
   headline: string
   releaseNotes: string
   sourceVersion: string
-  signers: Array<Guid>
+  authorized: Array<Guid>
   iso: { [key: string]: RegistryAsset<Blake3Commitment> }
   squashfs: { [key: string]: RegistryAsset<Blake3Commitment> }
   img: { [key: string]: RegistryAsset<Blake3Commitment> }
diff --git a/sdk/lib/osBindings/PackageDataEntry.ts b/sdk/lib/osBindings/PackageDataEntry.ts
index f88c6d7be..ef805741b 100644
--- a/sdk/lib/osBindings/PackageDataEntry.ts
+++ b/sdk/lib/osBindings/PackageDataEntry.ts
@@ -3,10 +3,10 @@ import type { ActionId } from "./ActionId"
 import type { ActionMetadata } from "./ActionMetadata"
 import type { CurrentDependencies } from "./CurrentDependencies"
 import type { DataUrl } from "./DataUrl"
-import type { HostInfo } from "./HostInfo"
+import type { Hosts } from "./Hosts"
 import type { PackageState } from "./PackageState"
+import type { ServiceInterface } from "./ServiceInterface"
 import type { ServiceInterfaceId } from "./ServiceInterfaceId"
-import type { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo"
 import type { Status } from "./Status"
 
 export type PackageDataEntry = {
@@ -18,7 +18,7 @@ export type PackageDataEntry = {
   lastBackup: string | null
   currentDependencies: CurrentDependencies
   actions: { [key: ActionId]: ActionMetadata }
-  serviceInterfaces: { [key: ServiceInterfaceId]: ServiceInterfaceWithHostInfo }
-  hosts: HostInfo
+  serviceInterfaces: { [key: ServiceInterfaceId]: ServiceInterface }
+  hosts: Hosts
   storeExposedDependents: string[]
 }
diff --git a/sdk/lib/osBindings/PackageInfo.ts b/sdk/lib/osBindings/PackageInfo.ts
index af340424f..6d07cd43e 100644
--- a/sdk/lib/osBindings/PackageInfo.ts
+++ b/sdk/lib/osBindings/PackageInfo.ts
@@ -4,6 +4,7 @@ import type { PackageVersionInfo } from "./PackageVersionInfo"
 import type { Version } from "./Version"
 
 export type PackageInfo = {
-  signers: Array<Guid>
+  authorized: Array<Guid>
   versions: { [key: Version]: PackageVersionInfo }
+  categories: string[]
 }
diff --git a/sdk/lib/osBindings/PackageVersionInfo.ts b/sdk/lib/osBindings/PackageVersionInfo.ts
index da82540cd..bdded46bd 100644
--- a/sdk/lib/osBindings/PackageVersionInfo.ts
+++ b/sdk/lib/osBindings/PackageVersionInfo.ts
@@ -17,7 +17,6 @@ export type PackageVersionInfo = {
   upstreamRepo: string
   supportSite: string
   marketingSite: string
-  categories: string[]
   osVersion: Version
   hardwareRequirements: HardwareRequirements
   sourceVersion: string | null
diff --git a/sdk/lib/osBindings/ReverseProxyBind.ts b/sdk/lib/osBindings/ReverseProxyBind.ts
deleted file mode 100644
index bd07b9489..000000000
--- a/sdk/lib/osBindings/ReverseProxyBind.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ReverseProxyBind = { ip: string | null; port: number; ssl: boolean }
diff --git a/sdk/lib/osBindings/ReverseProxyHttp.ts b/sdk/lib/osBindings/ReverseProxyHttp.ts
deleted file mode 100644
index ba49e81dc..000000000
--- a/sdk/lib/osBindings/ReverseProxyHttp.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ReverseProxyHttp = { headers: null | { [key: string]: string } }
diff --git a/sdk/lib/osBindings/ReverseProxyParams.ts b/sdk/lib/osBindings/ReverseProxyParams.ts
deleted file mode 100644
index 00062cbdf..000000000
--- a/sdk/lib/osBindings/ReverseProxyParams.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ReverseProxyBind } from "./ReverseProxyBind"
-import type { ReverseProxyDestination } from "./ReverseProxyDestination"
-import type { ReverseProxyHttp } from "./ReverseProxyHttp"
-
-export type ReverseProxyParams = {
-  bind: ReverseProxyBind
-  dst: ReverseProxyDestination
-  http: ReverseProxyHttp
-}
diff --git a/sdk/lib/osBindings/ServiceInterfaceWithHostInfo.ts b/sdk/lib/osBindings/ServiceInterfaceWithHostInfo.ts
deleted file mode 100644
index 979e6b500..000000000
--- a/sdk/lib/osBindings/ServiceInterfaceWithHostInfo.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AddressInfo } from "./AddressInfo"
-import type { ExportedHostInfo } from "./ExportedHostInfo"
-import type { ServiceInterfaceId } from "./ServiceInterfaceId"
-import type { ServiceInterfaceType } from "./ServiceInterfaceType"
-
-export type ServiceInterfaceWithHostInfo = {
-  hostInfo: ExportedHostInfo
-  id: ServiceInterfaceId
-  name: string
-  description: string
-  hasPrimary: boolean
-  disabled: boolean
-  masked: boolean
-  addressInfo: AddressInfo
-  type: ServiceInterfaceType
-}
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 16fc56a74..efd7a5efb 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -3,6 +3,7 @@ export { ActionId } from "./ActionId"
 export { ActionMetadata } from "./ActionMetadata"
 export { AddAdminParams } from "./AddAdminParams"
 export { AddAssetParams } from "./AddAssetParams"
+export { AddPackageParams } from "./AddPackageParams"
 export { AddressInfo } from "./AddressInfo"
 export { AddSslOptions } from "./AddSslOptions"
 export { AddVersionParams } from "./AddVersionParams"
@@ -40,15 +41,10 @@ export { Duration } from "./Duration"
 export { EncryptedWire } from "./EncryptedWire"
 export { ExecuteAction } from "./ExecuteAction"
 export { ExportActionParams } from "./ExportActionParams"
-export { ExportedHostInfo } from "./ExportedHostInfo"
-export { ExportedHostnameInfo } from "./ExportedHostnameInfo"
-export { ExportedIpHostname } from "./ExportedIpHostname"
-export { ExportedOnionHostname } from "./ExportedOnionHostname"
 export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams"
 export { ExposeForDependentsParams } from "./ExposeForDependentsParams"
 export { FullIndex } from "./FullIndex"
 export { FullProgress } from "./FullProgress"
-export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind"
 export { GetHostInfoParams } from "./GetHostInfoParams"
 export { GetOsAssetParams } from "./GetOsAssetParams"
 export { GetPackageParams } from "./GetPackageParams"
@@ -69,14 +65,17 @@ export { HealthCheckId } from "./HealthCheckId"
 export { HealthCheckResult } from "./HealthCheckResult"
 export { HostAddress } from "./HostAddress"
 export { HostId } from "./HostId"
-export { HostInfo } from "./HostInfo"
 export { HostKind } from "./HostKind"
+export { HostnameInfo } from "./HostnameInfo"
+export { Hosts } from "./Hosts"
 export { Host } from "./Host"
 export { ImageId } from "./ImageId"
 export { InstalledState } from "./InstalledState"
 export { InstallingInfo } from "./InstallingInfo"
 export { InstallingState } from "./InstallingState"
+export { IpHostname } from "./IpHostname"
 export { IpInfo } from "./IpInfo"
+export { LanInfo } from "./LanInfo"
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"
 export { ListVersionSignersParams } from "./ListVersionSignersParams"
 export { MainStatus } from "./MainStatus"
@@ -86,6 +85,7 @@ export { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
 export { MountParams } from "./MountParams"
 export { MountTarget } from "./MountTarget"
 export { NamedProgress } from "./NamedProgress"
+export { OnionHostname } from "./OnionHostname"
 export { OsIndex } from "./OsIndex"
 export { OsVersionInfo } from "./OsVersionInfo"
 export { PackageDataEntry } from "./PackageDataEntry"
@@ -106,10 +106,6 @@ export { RemoveActionParams } from "./RemoveActionParams"
 export { RemoveAddressParams } from "./RemoveAddressParams"
 export { RemoveVersionParams } from "./RemoveVersionParams"
 export { RequestCommitment } from "./RequestCommitment"
-export { ReverseProxyBind } from "./ReverseProxyBind"
-export { ReverseProxyDestination } from "./ReverseProxyDestination"
-export { ReverseProxyHttp } from "./ReverseProxyHttp"
-export { ReverseProxyParams } from "./ReverseProxyParams"
 export { Security } from "./Security"
 export { ServerInfo } from "./ServerInfo"
 export { ServerSpecs } from "./ServerSpecs"
@@ -117,7 +113,6 @@ export { ServerStatus } from "./ServerStatus"
 export { ServiceInterfaceId } from "./ServiceInterfaceId"
 export { ServiceInterface } from "./ServiceInterface"
 export { ServiceInterfaceType } from "./ServiceInterfaceType"
-export { ServiceInterfaceWithHostInfo } from "./ServiceInterfaceWithHostInfo"
 export { SessionList } from "./SessionList"
 export { Sessions } from "./Sessions"
 export { Session } from "./Session"
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
index 82372f61b..a8ae317ed 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/lib/test/host.test.ts
@@ -8,6 +8,7 @@ describe("host", () => {
       const foo = sdk.host.multi(effects, "foo")
       const fooOrigin = await foo.bindPort(80, {
         protocol: "http" as const,
+        preferredExternalPort: 80,
       })
       const fooInterface = new ServiceInterfaceBuilder({
         effects,
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index 4f6d50f53..79ec62106 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -25,7 +25,6 @@ import { ListServiceInterfacesParams } from ".././osBindings"
 import { RemoveAddressParams } from ".././osBindings"
 import { ExportActionParams } from ".././osBindings"
 import { RemoveActionParams } from ".././osBindings"
-import { ReverseProxyParams } from ".././osBindings"
 import { MountParams } from ".././osBindings"
 function typeEquality<ExpectedType>(_a: ExpectedType) {}
 describe("startosTypeValidation ", () => {
@@ -66,7 +65,6 @@ describe("startosTypeValidation ", () => {
       removeAddress: {} as RemoveAddressParams,
       exportAction: {} as ExportActionParams,
       removeAction: {} as RemoveActionParams,
-      reverseProxy: {} as ReverseProxyParams,
       mount: {} as MountParams,
       checkDependencies: {} as CheckDependenciesParam,
       getDependencies: undefined,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 7db42e5a9..2da92cd56 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -5,6 +5,12 @@ import {
   SetHealth,
   HealthCheckResult,
   SetMainStatus,
+  ServiceInterface,
+  Host,
+  ExportServiceInterfaceParams,
+  GetPrimaryUrlParams,
+  LanInfo,
+  BindParams,
 } from "./osBindings"
 
 import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
@@ -12,7 +18,7 @@ import { InputSpec } from "./config/configTypes"
 import { DependenciesReceipt } from "./config/setupConfig"
 import { BindOptions, Scheme } from "./interfaces/Host"
 import { Daemons } from "./mainFn/Daemons"
-import { PathBuilder, StorePath } from "./store/PathBuilder"
+import { StorePath } from "./store/PathBuilder"
 import { ExposedStorePaths } from "./store/setupExposeStore"
 import { UrlString } from "./util/getServiceInterface"
 export * from "./osBindings"
@@ -184,14 +190,6 @@ export declare const hostName: unique symbol
 // asdflkjadsf.onion | 1.2.3.4
 export type Hostname = string & { [hostName]: never }
 
-/** ${scheme}://${username}@${host}:${externalPort}${suffix} */
-export type AddressInfo = {
-  username: string | null
-  hostId: string
-  bindOptions: BindOptions
-  suffix: string
-}
-
 export type HostnameInfoIp = {
   kind: "ip"
   networkInterfaceId: string
@@ -219,44 +217,9 @@ export type HostnameInfoOnion = {
 
 export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion
 
-export type SingleHost = {
-  id: string
-  kind: "single" | "static"
-  hostname: HostnameInfo | null
-}
-
-export type MultiHost = {
-  id: string
-  kind: "multi"
-  hostnames: HostnameInfo[]
-}
-
-export type HostInfo = SingleHost | MultiHost
-
 export type ServiceInterfaceId = string
 
-export type ServiceInterface = {
-  id: ServiceInterfaceId
-  /** The title of this field to be displayed */
-  name: string
-  /** Human readable description, used as tooltip usually */
-  description: string
-  /** Whether or not one address must be the primary address */
-  hasPrimary: boolean
-  /** Disabled interfaces do not serve, but they retain their metadata and addresses */
-  disabled: boolean
-  /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
-  masked: boolean
-  /** URI Information */
-  addressInfo: AddressInfo
-  /** The network interface could be several types, something like ui, p2p, or network */
-  type: ServiceInterfaceType
-}
-
-export type ServiceInterfaceWithHostInfo = ServiceInterface & {
-  hostInfo: HostInfo
-}
-
+export { ServiceInterface }
 export type ExposeServicePaths<Store = never> = {
   /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
   paths: ExposedStorePaths
@@ -326,13 +289,7 @@ export type Effects = {
   /** Removes all network bindings */
   clearBindings(): Promise<void>
   /** Creates a host connected to the specified port with the provided options */
-  bind(
-    options: {
-      kind: "static" | "single" | "multi"
-      id: string
-      internalPort: number
-    } & BindOptions,
-  ): Promise<void>
+  bind(options: BindParams): Promise<void>
   /** Retrieves the current hostname(s) associated with a host id */
   // getHostInfo(options: {
   //   kind: "static" | "single"
@@ -341,11 +298,10 @@ export type Effects = {
   //   callback: () => void
   // }): Promise<SingleHost>
   getHostInfo(options: {
-    kind: "multi" | null
-    serviceInterfaceId: string
+    hostId: string
     packageId: string | null
     callback: () => void
-  }): Promise<MultiHost>
+  }): Promise<Host>
 
   // /**
   //  * Run rsync between two volumes. This is used to backup data between volumes.
@@ -395,14 +351,14 @@ export type Effects = {
   getServicePortForward(options: {
     internalPort: number
     packageId: string | null
-  }): Promise<number>
+  }): Promise<LanInfo>
 
   /** Removes all network interfaces */
   clearServiceInterfaces(): Promise<void>
   /** When we want to create a link in the front end interfaces, and example is
    * exposing a url to view a web service
    */
-  exportServiceInterface(options: ServiceInterface): Promise<string>
+  exportServiceInterface(options: ExportServiceInterfaceParams): Promise<string>
 
   exposeForDependents(options: { paths: string[] }): Promise<void>
 
@@ -422,11 +378,7 @@ export type Effects = {
    * The user sets the primary url for a interface
    * @param options
    */
-  getPrimaryUrl(options: {
-    packageId: PackageId | null
-    serviceInterfaceId: ServiceInterfaceId
-    callback: () => void
-  }): Promise<UrlString | null>
+  getPrimaryUrl(options: GetPrimaryUrlParams): Promise<UrlString | null>
 
   /**
    * There are times that we want to see the addresses that where exported
@@ -437,7 +389,7 @@ export type Effects = {
   listServiceInterfaces(options: {
     packageId: PackageId | null
     callback: () => void
-  }): Promise<ServiceInterface[]>
+  }): Promise<Record<ServiceInterfaceId, ServiceInterface>>
 
   /**
    *Remove an address that was exported. Used problably during main or during setConfig.
@@ -501,25 +453,6 @@ export type Effects = {
   /** Exists could be useful during the runtime to know if some service is running, option dep */
   running(options: { packageId: PackageId }): Promise<boolean>
 
-  /** Instead of creating proxies with nginx, we have a utility to create and maintain a proxy in the lifetime of this running. */
-  reverseProxy(options: {
-    bind: {
-      /** Optional, default is 0.0.0.0 */
-      ip: string | null
-      port: number
-      ssl: boolean
-    }
-    dst: {
-      /** Optional: default is 127.0.0.1 */
-      ip: string | null // optional, default 127.0.0.1
-      port: number
-      ssl: boolean
-    }
-    http: {
-      // optional, will do TCP layer proxy only if not present
-      headers: Record<string, string> | null
-    } | null
-  }): Promise<{ stop(): Promise<void> }>
   restart(): void
   shutdown(): void
 
diff --git a/sdk/lib/util/Hostname.ts b/sdk/lib/util/Hostname.ts
new file mode 100644
index 000000000..ee68abe4f
--- /dev/null
+++ b/sdk/lib/util/Hostname.ts
@@ -0,0 +1,25 @@
+import { HostnameInfo } from "../types"
+
+export function hostnameInfoToAddress(hostInfo: HostnameInfo): string {
+  if (hostInfo.kind === "onion") {
+    return `${hostInfo.hostname.value}`
+  }
+  if (hostInfo.kind !== "ip") {
+    throw Error("Expecting that the kind is ip.")
+  }
+  const hostname = hostInfo.hostname
+  if (hostname.kind === "domain") {
+    return `${hostname.subdomain ? `${hostname.subdomain}.` : ""}${hostname.domain}`
+  }
+  const port = hostname.sslPort || hostname.port
+  const portString = port ? `:${port}` : ""
+  if ("ipv4" === hostname.kind || "ipv6" === hostname.kind) {
+    return `${hostname.value}${portString}`
+  }
+  if ("local" === hostname.kind) {
+    return `${hostname.value}${portString}`
+  }
+  throw Error(
+    "Expecting to have a valid hostname kind." + JSON.stringify(hostname),
+  )
+}
diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index 3b7af1c41..737cbbc16 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -1,10 +1,15 @@
 import { ServiceInterfaceType } from "../StartSdk"
+import { knownProtocols } from "../interfaces/Host"
 import {
   AddressInfo,
   Effects,
-  HostInfo,
+  Host,
+  HostAddress,
   Hostname,
   HostnameInfo,
+  HostnameInfoIp,
+  HostnameInfoOnion,
+  IpInfo,
 } from "../types"
 
 export type UrlString = string
@@ -20,13 +25,13 @@ export const getHostname = (url: string): Hostname | null => {
 }
 
 export type Filled = {
-  hostnames: Hostname[]
-  onionHostnames: Hostname[]
-  localHostnames: Hostname[]
-  ipHostnames: Hostname[]
-  ipv4Hostnames: Hostname[]
-  ipv6Hostnames: Hostname[]
-  nonIpHostnames: Hostname[]
+  hostnames: HostnameInfo[]
+  onionHostnames: HostnameInfo[]
+  localHostnames: HostnameInfo[]
+  ipHostnames: HostnameInfo[]
+  ipv4Hostnames: HostnameInfo[]
+  ipv6Hostnames: HostnameInfo[]
+  nonIpHostnames: HostnameInfo[]
 
   urls: UrlString[]
   onionUrls: UrlString[]
@@ -50,7 +55,7 @@ export type ServiceInterfaceFilled = {
   /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
   masked: boolean
   /** Information about the host for this binding */
-  hostInfo: HostInfo
+  host: Host
   /** URI information */
   addressInfo: FilledAddressInfo
   /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
@@ -69,110 +74,103 @@ const negate =
   (a: A) =>
     !fn(a)
 const unique = <A>(values: A[]) => Array.from(new Set(values))
-function stringifyHostname(info: HostnameInfo): Hostname {
-  let base: string
-  if ("kind" in info.hostname && info.hostname.kind === "domain") {
-    base = info.hostname.subdomain
-      ? `${info.hostname.subdomain}.${info.hostname.domain}`
-      : info.hostname.domain
-  } else {
-    base = info.hostname.value
+export const addressHostToUrl = (
+  { scheme, sslScheme, username, suffix }: AddressInfo,
+  host: HostnameInfo,
+): UrlString[] => {
+  const res = []
+  const fmt = (scheme: string | null, host: HostnameInfo, port: number) => {
+    const includePort =
+      scheme &&
+      scheme in knownProtocols &&
+      port === knownProtocols[scheme as keyof typeof knownProtocols].defaultPort
+    let hostname
+    if (host.kind === "onion") {
+      hostname = host.hostname.value
+    } else if (host.kind === "ip") {
+      if (host.hostname.kind === "domain") {
+        hostname = `${host.hostname.subdomain ? `${host.hostname.subdomain}.` : ""}${host.hostname.domain}`
+      } else {
+        hostname = host.hostname.value
+      }
+    }
+    return `${scheme ? `${scheme}://` : ""}${
+      username ? `${username}@` : ""
+    }${hostname}${includePort ? `:${port}` : ""}${suffix}`
   }
-  if (info.hostname.port && info.hostname.sslPort) {
-    return `${base}:${info.hostname.port}` as Hostname
-  } else if (info.hostname.sslPort) {
-    return `${base}:${info.hostname.sslPort}` as Hostname
-  } else if (info.hostname.port) {
-    return `${base}:${info.hostname.port}` as Hostname
+  if (host.hostname.sslPort !== null) {
+    res.push(fmt(sslScheme, host, host.hostname.sslPort))
   }
-  return base as Hostname
-}
-const addressHostToUrl = (
-  { bindOptions, username, suffix }: AddressInfo,
-  host: Hostname,
-): UrlString => {
-  const scheme = host.endsWith(".onion")
-    ? bindOptions.scheme
-    : bindOptions.addSsl
-      ? bindOptions.addSsl.scheme
-      : bindOptions.scheme // TODO: encode whether hostname transport is "secure"?
-  return `${scheme ? `${scheme}//` : ""}${
-    username ? `${username}@` : ""
-  }${host}${suffix}`
+  if (host.hostname.port !== null) {
+    res.push(fmt(scheme, host, host.hostname.port))
+  }
+
+  return res
 }
+
 export const filledAddress = (
-  hostInfo: HostInfo,
+  host: Host,
   addressInfo: AddressInfo,
 ): FilledAddressInfo => {
   const toUrl = addressHostToUrl.bind(null, addressInfo)
-  const hostnameInfo =
-    hostInfo.kind == "multi"
-      ? hostInfo.hostnames
-      : hostInfo.hostname
-        ? [hostInfo.hostname]
-        : []
+  const hostnames = host.hostnameInfo[addressInfo.internalPort]
+
   return {
     ...addressInfo,
-    hostnames: hostnameInfo.flatMap((h) => stringifyHostname(h)),
+    hostnames,
     get onionHostnames() {
-      return hostnameInfo
-        .filter((h) => h.kind === "onion")
-        .map((h) => stringifyHostname(h))
+      return hostnames.filter((h) => h.kind === "onion")
     },
     get localHostnames() {
-      return hostnameInfo
-        .filter((h) => h.kind === "ip" && h.hostname.kind === "local")
-        .map((h) => stringifyHostname(h))
+      return hostnames.filter(
+        (h) => h.kind === "ip" && h.hostname.kind === "local",
+      )
     },
     get ipHostnames() {
-      return hostnameInfo
-        .filter(
-          (h) =>
-            h.kind === "ip" &&
-            (h.hostname.kind === "ipv4" || h.hostname.kind === "ipv6"),
-        )
-        .map((h) => stringifyHostname(h))
+      return hostnames.filter(
+        (h) =>
+          h.kind === "ip" &&
+          (h.hostname.kind === "ipv4" || h.hostname.kind === "ipv6"),
+      )
     },
     get ipv4Hostnames() {
-      return hostnameInfo
-        .filter((h) => h.kind === "ip" && h.hostname.kind === "ipv4")
-        .map((h) => stringifyHostname(h))
+      return hostnames.filter(
+        (h) => h.kind === "ip" && h.hostname.kind === "ipv4",
+      )
     },
     get ipv6Hostnames() {
-      return hostnameInfo
-        .filter((h) => h.kind === "ip" && h.hostname.kind === "ipv6")
-        .map((h) => stringifyHostname(h))
+      return hostnames.filter(
+        (h) => h.kind === "ip" && h.hostname.kind === "ipv6",
+      )
     },
     get nonIpHostnames() {
-      return hostnameInfo
-        .filter(
-          (h) =>
-            h.kind === "ip" &&
-            h.hostname.kind !== "ipv4" &&
-            h.hostname.kind !== "ipv6",
-        )
-        .map((h) => stringifyHostname(h))
+      return hostnames.filter(
+        (h) =>
+          h.kind === "ip" &&
+          h.hostname.kind !== "ipv4" &&
+          h.hostname.kind !== "ipv6",
+      )
     },
     get urls() {
-      return this.hostnames.map(toUrl)
+      return this.hostnames.flatMap(toUrl)
     },
     get onionUrls() {
-      return this.onionHostnames.map(toUrl)
+      return this.onionHostnames.flatMap(toUrl)
     },
     get localUrls() {
-      return this.localHostnames.map(toUrl)
+      return this.localHostnames.flatMap(toUrl)
     },
     get ipUrls() {
-      return this.ipHostnames.map(toUrl)
+      return this.ipHostnames.flatMap(toUrl)
     },
     get ipv4Urls() {
-      return this.ipv4Hostnames.map(toUrl)
+      return this.ipv4Hostnames.flatMap(toUrl)
     },
     get ipv6Urls() {
-      return this.ipv6Hostnames.map(toUrl)
+      return this.ipv6Hostnames.flatMap(toUrl)
     },
     get nonIpUrls() {
-      return this.nonIpHostnames.map(toUrl)
+      return this.nonIpHostnames.flatMap(toUrl)
     },
   }
 }
@@ -193,23 +191,25 @@ const makeInterfaceFilled = async ({
     packageId,
     callback,
   })
-  const hostInfo = await effects.getHostInfo({
-    packageId,
-    kind: null,
-    serviceInterfaceId: serviceInterfaceValue.id,
-    callback,
-  })
-  const primaryUrl = await effects.getPrimaryUrl({
-    serviceInterfaceId: id,
+  const hostId = serviceInterfaceValue.addressInfo.hostId
+  const host = await effects.getHostInfo({
     packageId,
+    hostId,
     callback,
   })
+  const primaryUrl = await effects
+    .getPrimaryUrl({
+      serviceInterfaceId: id,
+      packageId,
+      callback,
+    })
+    .catch((e) => null)
 
   const interfaceFilled: ServiceInterfaceFilled = {
     ...serviceInterfaceValue,
     primaryUrl: primaryUrl,
-    hostInfo,
-    addressInfo: filledAddress(hostInfo, serviceInterfaceValue.addressInfo),
+    host,
+    addressInfo: filledAddress(host, serviceInterfaceValue.addressInfo),
     get primaryHostname() {
       if (primaryUrl == null) return null
       return getHostname(primaryUrl)
diff --git a/sdk/lib/util/getServiceInterfaces.ts b/sdk/lib/util/getServiceInterfaces.ts
index a7106568b..c4cdc6b59 100644
--- a/sdk/lib/util/getServiceInterfaces.ts
+++ b/sdk/lib/util/getServiceInterfaces.ts
@@ -18,41 +18,27 @@ const makeManyInterfaceFilled = async ({
     packageId,
     callback,
   })
-  const hostIdsRecord = Object.fromEntries(
-    await Promise.all(
-      Array.from(new Set(serviceInterfaceValues.map((x) => x.id))).map(
-        async (id) =>
-          [
-            id,
-            await effects.getHostInfo({
-              kind: null,
-              packageId,
-              serviceInterfaceId: id,
-              callback,
-            }),
-          ] as const,
-      ),
-    ),
-  )
 
   const serviceInterfacesFilled: ServiceInterfaceFilled[] = await Promise.all(
-    serviceInterfaceValues.map(async (serviceInterfaceValue) => {
-      const hostInfo = await effects.getHostInfo({
-        kind: null,
-        packageId,
-        serviceInterfaceId: serviceInterfaceValue.id,
-        callback,
-      })
-      const primaryUrl = await effects.getPrimaryUrl({
-        serviceInterfaceId: serviceInterfaceValue.id,
+    Object.values(serviceInterfaceValues).map(async (serviceInterfaceValue) => {
+      const hostId = serviceInterfaceValue.addressInfo.hostId
+      const host = await effects.getHostInfo({
         packageId,
+        hostId,
         callback,
       })
+      const primaryUrl = await effects
+        .getPrimaryUrl({
+          serviceInterfaceId: serviceInterfaceValue.id,
+          packageId,
+          callback,
+        })
+        .catch(() => null)
       return {
         ...serviceInterfaceValue,
         primaryUrl: primaryUrl,
-        hostInfo,
-        addressInfo: filledAddress(hostInfo, serviceInterfaceValue.addressInfo),
+        host,
+        addressInfo: filledAddress(host, serviceInterfaceValue.addressInfo),
         get primaryHostname() {
           if (primaryUrl == null) return null
           return getHostname(primaryUrl)
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index bd144f35a..9b19aeb38 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -10,6 +10,8 @@ import "./once"
 
 export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
 export { getServiceInterfaces } from "./getServiceInterfaces"
+export { addressHostToUrl } from "./getServiceInterface"
+export { hostnameInfoToAddress } from "./Hostname"
 // prettier-ignore
 export type FlattenIntersection<T> = 
 T extends ArrayLike<any> ? T :
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 8baa0bfde..f3fe7a0cc 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -8,6 +8,7 @@ import { PatchDB } from 'patch-db-client'
 import { QRComponent } from 'src/app/components/qr/qr.component'
 import { map } from 'rxjs'
 import { T } from '@start9labs/start-sdk'
+import { addressHostToUrl } from '@start9labs/start-sdk/cjs/lib/util/getServiceInterface'
 
 type MappedInterface = T.ServiceInterface & {
   addresses: MappedAddress[]
@@ -33,10 +34,14 @@ export class AppInterfacesPage {
           .sort(iface =>
             iface.name.toLowerCase() > iface.name.toLowerCase() ? -1 : 1,
           )
-          .map(iface => ({
-            ...iface,
-            addresses: getAddresses(iface),
-          }))
+          .map(iface => {
+            // TODO @Matt
+            const host = {} as any
+            return {
+              ...iface,
+              addresses: getAddresses(iface, host),
+            }
+          })
 
         return {
           ui: sorted.filter(val => val.type === 'ui'),
@@ -99,66 +104,40 @@ export class AppInterfacesItemComponent {
 }
 
 function getAddresses(
-  serviceInterface: T.ServiceInterfaceWithHostInfo,
+  serviceInterface: T.ServiceInterface,
+  host: T.Host,
 ): MappedAddress[] {
-  const host = serviceInterface.hostInfo
   const addressInfo = serviceInterface.addressInfo
   const username = addressInfo.username ? addressInfo.username + '@' : ''
   const suffix = addressInfo.suffix || ''
 
-  const hostnames = host.kind === 'multi' ? host.hostnames : [] // TODO: non-multi
+  const hostnames =
+    host.kind === 'multi' ? host.hostnameInfo[addressInfo.internalPort] : [] // TODO: non-multi
   /* host.hostname
       ? [host.hostname]
       : [] */
 
-  const addresses: MappedAddress[] = []
-
-  hostnames.forEach(h => {
+  return hostnames.flatMap(h => {
     let name = ''
-    let hostname = ''
 
     if (h.kind === 'onion') {
       name = 'Tor'
-      hostname = h.hostname.value
     } else {
       const hostnameKind = h.hostname.kind
 
       if (hostnameKind === 'domain') {
         name = 'Domain'
-        hostname = `${h.hostname.subdomain}.${h.hostname.domain}`
       } else {
         name =
           hostnameKind === 'local'
             ? 'Local'
             : `${h.networkInterfaceId} (${hostnameKind})`
-        hostname = h.hostname.value
       }
     }
 
-    if (h.hostname.sslPort) {
-      const port = h.hostname.sslPort === 443 ? '' : `:${h.hostname.sslPort}`
-      const scheme = addressInfo.bindOptions.addSsl?.scheme
-        ? `${addressInfo.bindOptions.addSsl.scheme}://`
-        : ''
-
-      addresses.push({
-        name: name === 'Tor' ? 'Tor (HTTPS)' : name,
-        url: `${scheme}${username}${hostname}${port}${suffix}`,
-      })
-    }
-
-    if (h.hostname.port) {
-      const port = h.hostname.port === 80 ? '' : `:${h.hostname.port}`
-      const scheme = addressInfo.bindOptions.scheme
-        ? `${addressInfo.bindOptions.scheme}://`
-        : ''
-
-      addresses.push({
-        name: name === 'Tor' ? 'Tor (HTTP)' : name,
-        url: `${scheme}${username}${hostname}${port}${suffix}`,
-      })
-    }
+    return addressHostToUrl(addressInfo, h).map(url => ({
+      name,
+      url,
+    }))
   })
-
-  return addresses
 }
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 2b0b96d23..11d56ff15 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1422,66 +1422,11 @@ export module Mock {
         addressInfo: {
           username: null,
           hostId: 'abcdefg',
-          bindOptions: {
-            scheme: 'http',
-            preferredExternalPort: 80,
-            addSsl: {
-              // addXForwardedHeaders: false,
-              preferredExternalPort: 443,
-              scheme: 'https',
-              alpn: { specified: ['http/1.1', 'h2'] },
-            },
-            secure: null,
-          },
+          internalPort: 80,
+          scheme: 'http',
+          sslScheme: 'https',
           suffix: '',
         },
-        hostInfo: {
-          id: 'abcdefg',
-          kind: 'multi',
-          hostnames: [
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'local',
-                value: 'adjective-noun.local',
-                port: null,
-                sslPort: 1234,
-              },
-            },
-            {
-              kind: 'onion',
-              hostname: {
-                value: 'bitcoin-ui-address.onion',
-                port: 80,
-                sslPort: 443,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv4',
-                value: '192.168.1.5',
-                port: null,
-                sslPort: 1234,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv6',
-                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                port: null,
-                sslPort: 1234,
-              },
-            },
-          ],
-        },
       },
       rpc: {
         id: 'rpc',
@@ -1495,66 +1440,11 @@ export module Mock {
         addressInfo: {
           username: null,
           hostId: 'bcdefgh',
-          bindOptions: {
-            scheme: 'http',
-            preferredExternalPort: 80,
-            addSsl: {
-              // addXForwardedHeaders: false,
-              preferredExternalPort: 443,
-              scheme: 'https',
-              alpn: { specified: ['http/1.1'] },
-            },
-            secure: null,
-          },
+          internalPort: 8332,
+          scheme: 'http',
+          sslScheme: 'https',
           suffix: '',
         },
-        hostInfo: {
-          id: 'bcdefgh',
-          kind: 'multi',
-          hostnames: [
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'local',
-                value: 'adjective-noun.local',
-                port: null,
-                sslPort: 2345,
-              },
-            },
-            {
-              kind: 'onion',
-              hostname: {
-                value: 'bitcoin-rpc-address.onion',
-                port: 80,
-                sslPort: 443,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv4',
-                value: '192.168.1.5',
-                port: null,
-                sslPort: 2345,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv6',
-                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                port: null,
-                sslPort: 2345,
-              },
-            },
-          ],
-        },
       },
       p2p: {
         id: 'p2p',
@@ -1568,63 +1458,11 @@ export module Mock {
         addressInfo: {
           username: null,
           hostId: 'cdefghi',
-          bindOptions: {
-            scheme: 'bitcoin',
-            preferredExternalPort: 8333,
-            addSsl: null,
-            secure: {
-              ssl: false,
-            },
-          },
+          internalPort: 8333,
+          scheme: 'bitcoin',
+          sslScheme: null,
           suffix: '',
         },
-        hostInfo: {
-          id: 'cdefghi',
-          kind: 'multi',
-          hostnames: [
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'local',
-                value: 'adjective-noun.local',
-                port: 3456,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'onion',
-              hostname: {
-                value: 'bitcoin-p2p-address.onion',
-                port: 8333,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv4',
-                value: '192.168.1.5',
-                port: 3456,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv6',
-                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                port: 3456,
-                sslPort: null,
-              },
-            },
-          ],
-        },
       },
     },
     currentDependencies: {},
@@ -1660,101 +1498,11 @@ export module Mock {
         addressInfo: {
           username: null,
           hostId: 'hijklmnop',
-          bindOptions: {
-            scheme: 'http',
-            preferredExternalPort: 80,
-            addSsl: {
-              // addXForwardedHeaders: false,
-              preferredExternalPort: 443,
-              scheme: 'https',
-              alpn: { specified: ['http/1.1', 'h2'] },
-            },
-            secure: {
-              ssl: true,
-            },
-          },
+          internalPort: 80,
+          scheme: 'http',
+          sslScheme: 'https',
           suffix: '',
         },
-        hostInfo: {
-          id: 'hijklmnop',
-          kind: 'multi',
-          hostnames: [
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'local',
-                value: 'adjective-noun.local',
-                port: null,
-                sslPort: 4567,
-              },
-            },
-            {
-              kind: 'onion',
-              hostname: {
-                value: 'proxy-ui-address.onion',
-                port: 80,
-                sslPort: 443,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv4',
-                value: '192.168.1.5',
-                port: null,
-                sslPort: 4567,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv6',
-                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                port: null,
-                sslPort: 4567,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'wlan0',
-              public: false,
-              hostname: {
-                kind: 'local',
-                value: 'adjective-noun.local',
-                port: null,
-                sslPort: 4567,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'wlan0',
-              public: false,
-              hostname: {
-                kind: 'ipv4',
-                value: '192.168.1.7',
-                port: null,
-                sslPort: 4567,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'wlan0',
-              public: false,
-              hostname: {
-                kind: 'ipv6',
-                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                port: null,
-                sslPort: 4567,
-              },
-            },
-          ],
-        },
       },
     },
     currentDependencies: {
@@ -1801,63 +1549,11 @@ export module Mock {
         addressInfo: {
           username: null,
           hostId: 'qrstuv',
-          bindOptions: {
-            scheme: 'grpc',
-            preferredExternalPort: 10009,
-            addSsl: null,
-            secure: {
-              ssl: true,
-            },
-          },
+          internalPort: 10009,
+          scheme: null,
+          sslScheme: 'grpc',
           suffix: '',
         },
-        hostInfo: {
-          id: 'qrstuv',
-          kind: 'multi',
-          hostnames: [
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'local',
-                value: 'adjective-noun.local',
-                port: 5678,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'onion',
-              hostname: {
-                value: 'lnd-grpc-address.onion',
-                port: 10009,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv4',
-                value: '192.168.1.5',
-                port: 5678,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv6',
-                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                port: 5678,
-                sslPort: null,
-              },
-            },
-          ],
-        },
       },
       lndconnect: {
         id: 'lndconnect',
@@ -1871,63 +1567,11 @@ export module Mock {
         addressInfo: {
           username: null,
           hostId: 'qrstuv',
-          bindOptions: {
-            scheme: 'lndconnect',
-            preferredExternalPort: 10009,
-            addSsl: null,
-            secure: {
-              ssl: true,
-            },
-          },
+          internalPort: 10009,
+          scheme: null,
+          sslScheme: 'lndconnect',
           suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
         },
-        hostInfo: {
-          id: 'qrstuv',
-          kind: 'multi',
-          hostnames: [
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'local',
-                value: 'adjective-noun.local',
-                port: 5678,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'onion',
-              hostname: {
-                value: 'lnd-grpc-address.onion',
-                port: 10009,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv4',
-                value: '192.168.1.5',
-                port: 5678,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv6',
-                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                port: 5678,
-                sslPort: null,
-              },
-            },
-          ],
-        },
       },
       p2p: {
         id: 'p2p',
@@ -1941,63 +1585,11 @@ export module Mock {
         addressInfo: {
           username: null,
           hostId: 'rstuvw',
-          bindOptions: {
-            scheme: null,
-            preferredExternalPort: 9735,
-            addSsl: null,
-            secure: {
-              ssl: true,
-            },
-          },
+          internalPort: 9735,
+          scheme: 'lightning',
+          sslScheme: null,
           suffix: '',
         },
-        hostInfo: {
-          id: 'rstuvw',
-          kind: 'multi',
-          hostnames: [
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'local',
-                value: 'adjective-noun.local',
-                port: 6789,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'onion',
-              hostname: {
-                value: 'lnd-p2p-address.onion',
-                port: 9735,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv4',
-                value: '192.168.1.5',
-                port: 6789,
-                sslPort: null,
-              },
-            },
-            {
-              kind: 'ip',
-              networkInterfaceId: 'elan0',
-              public: false,
-              hostname: {
-                kind: 'ipv6',
-                value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                port: 6789,
-                sslPort: null,
-              },
-            },
-          ],
-        },
       },
     },
     currentDependencies: {
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index a4ed61278..ee96f9fe2 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -141,66 +141,11 @@ export const mockPatchData: DataModel = {
           addressInfo: {
             username: null,
             hostId: 'abcdefg',
-            bindOptions: {
-              scheme: 'http',
-              preferredExternalPort: 80,
-              addSsl: {
-                // addXForwardedHeaders: false,
-                preferredExternalPort: 443,
-                scheme: 'https',
-                alpn: { specified: ['http/1.1', 'h2'] },
-              },
-              secure: null,
-            },
+            internalPort: 80,
+            scheme: 'http',
+            sslScheme: 'https',
             suffix: '',
           },
-          hostInfo: {
-            id: 'abcdefg',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: null,
-                  sslPort: 1234,
-                },
-              },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-ui-address.onion',
-                  port: 80,
-                  sslPort: 443,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: null,
-                  sslPort: 1234,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: null,
-                  sslPort: 1234,
-                },
-              },
-            ],
-          },
         },
         rpc: {
           id: 'rpc',
@@ -214,66 +159,11 @@ export const mockPatchData: DataModel = {
           addressInfo: {
             username: null,
             hostId: 'bcdefgh',
-            bindOptions: {
-              scheme: 'http',
-              preferredExternalPort: 80,
-              addSsl: {
-                // addXForwardedHeaders: false,
-                preferredExternalPort: 443,
-                scheme: 'https',
-                alpn: { specified: ['http/1.1'] },
-              },
-              secure: null,
-            },
+            internalPort: 8332,
+            scheme: 'http',
+            sslScheme: 'https',
             suffix: '',
           },
-          hostInfo: {
-            id: 'bcdefgh',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: null,
-                  sslPort: 2345,
-                },
-              },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-rpc-address.onion',
-                  port: 80,
-                  sslPort: 443,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: null,
-                  sslPort: 2345,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: null,
-                  sslPort: 2345,
-                },
-              },
-            ],
-          },
         },
         p2p: {
           id: 'p2p',
@@ -287,63 +177,11 @@ export const mockPatchData: DataModel = {
           addressInfo: {
             username: null,
             hostId: 'cdefghi',
-            bindOptions: {
-              scheme: 'bitcoin',
-              preferredExternalPort: 8333,
-              addSsl: null,
-              secure: {
-                ssl: false,
-              },
-            },
+            internalPort: 8333,
+            scheme: 'bitcoin',
+            sslScheme: null,
             suffix: '',
           },
-          hostInfo: {
-            id: 'cdefghi',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: 3456,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'bitcoin-p2p-address.onion',
-                  port: 8333,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: 3456,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: 3456,
-                  sslPort: null,
-                },
-              },
-            ],
-          },
         },
       },
       currentDependencies: {},
@@ -382,63 +220,11 @@ export const mockPatchData: DataModel = {
           addressInfo: {
             username: null,
             hostId: 'qrstuv',
-            bindOptions: {
-              scheme: 'grpc',
-              preferredExternalPort: 10009,
-              addSsl: null,
-              secure: {
-                ssl: true,
-              },
-            },
+            internalPort: 10009,
+            scheme: null,
+            sslScheme: 'grpc',
             suffix: '',
           },
-          hostInfo: {
-            id: 'qrstuv',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: 5678,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-grpc-address.onion',
-                  port: 10009,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: 5678,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: 5678,
-                  sslPort: null,
-                },
-              },
-            ],
-          },
         },
         lndconnect: {
           id: 'lndconnect',
@@ -452,63 +238,11 @@ export const mockPatchData: DataModel = {
           addressInfo: {
             username: null,
             hostId: 'qrstuv',
-            bindOptions: {
-              scheme: 'lndconnect',
-              preferredExternalPort: 10009,
-              addSsl: null,
-              secure: {
-                ssl: true,
-              },
-            },
+            internalPort: 10009,
+            scheme: null,
+            sslScheme: 'lndconnect',
             suffix: 'cert=askjdfbjadnaskjnd&macaroon=ksjbdfnhjasbndjksand',
           },
-          hostInfo: {
-            id: 'qrstuv',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: 5678,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-grpc-address.onion',
-                  port: 10009,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: 5678,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: 5678,
-                  sslPort: null,
-                },
-              },
-            ],
-          },
         },
         p2p: {
           id: 'p2p',
@@ -522,61 +256,11 @@ export const mockPatchData: DataModel = {
           addressInfo: {
             username: null,
             hostId: 'rstuvw',
-            bindOptions: {
-              scheme: null,
-              preferredExternalPort: 9735,
-              addSsl: null,
-              secure: { ssl: true },
-            },
+            internalPort: 8333,
+            scheme: 'bitcoin',
+            sslScheme: null,
             suffix: '',
           },
-          hostInfo: {
-            id: 'rstuvw',
-            kind: 'multi',
-            hostnames: [
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'local',
-                  value: 'adjective-noun.local',
-                  port: 6789,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'onion',
-                hostname: {
-                  value: 'lnd-p2p-address.onion',
-                  port: 9735,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv4',
-                  value: '192.168.1.5',
-                  port: 6789,
-                  sslPort: null,
-                },
-              },
-              {
-                kind: 'ip',
-                networkInterfaceId: 'elan0',
-                public: false,
-                hostname: {
-                  kind: 'ipv6',
-                  value: '[2001:db8:85a3:8d3:1319:8a2e:370:7348]',
-                  port: 6789,
-                  sslPort: null,
-                },
-              },
-            ],
-          },
         },
       },
       currentDependencies: {
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index 3eca4f48d..42116bdd8 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -57,12 +57,14 @@ export class ConfigService {
   }
 
   /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
-  launchableAddress(interfaces: PackageDataEntry['serviceInterfaces']): string {
+  launchableAddress(
+    interfaces: PackageDataEntry['serviceInterfaces'],
+    host: T.Host,
+  ): string {
     const ui = Object.values(interfaces).find(i => i.type === 'ui')
 
     if (!ui) return ''
 
-    const host = ui.hostInfo
     const addressInfo = ui.addressInfo
     const scheme = this.isHttps() ? 'https' : 'http'
     const username = addressInfo.username ? addressInfo.username + '@' : ''
@@ -70,20 +72,25 @@ export class ConfigService {
     const url = new URL(`${scheme}://${username}placeholder${suffix}`)
 
     if (host.kind === 'multi') {
-      const onionHostname = host.hostnames.find(h => h.kind === 'onion')
-        ?.hostname as T.ExportedOnionHostname
+      const onionHostname = host.addresses.find(h => h.kind === 'onion')
+        ?.address as T.OnionHostname | undefined
+
+      if (!onionHostname)
+        throw new Error('Expecting that there is an onion hostname')
 
       if (this.isTor() && onionHostname) {
         url.hostname = onionHostname.value
-      } else {
-        const ipHostname = host.hostnames.find(h => h.kind === 'ip')
-          ?.hostname as T.ExportedIpHostname
+      }
+      // TODO Handle single
+      //  else {
+      //   const ipHostname = host.addresses.find(h => h.kind === 'ip')
+      //     ?.hostname as T.ExportedIpHostname
 
-        if (!ipHostname) return ''
+      //   if (!ipHostname) return ''
 
-        url.hostname = this.hostname
-        url.port = String(ipHostname.sslPort || ipHostname.port)
-      }
+      //   url.hostname = this.hostname
+      //   url.port = String(ipHostname.sslPort || ipHostname.port)
+      // }
     } else {
       throw new Error('unimplemented')
       // const hostname = {} as T.ExportedHostnameInfo // host.hostname
diff --git a/web/projects/ui/src/app/services/ui-launcher.service.ts b/web/projects/ui/src/app/services/ui-launcher.service.ts
index badbc7a3e..9c36036f3 100644
--- a/web/projects/ui/src/app/services/ui-launcher.service.ts
+++ b/web/projects/ui/src/app/services/ui-launcher.service.ts
@@ -2,6 +2,7 @@ import { Inject, Injectable } from '@angular/core'
 import { WINDOW } from '@ng-web-apis/common'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { ConfigService } from './config.service'
+import { T } from '@start9labs/start-sdk'
 
 @Injectable({
   providedIn: 'root',
@@ -13,8 +14,10 @@ export class UiLauncherService {
   ) {}
 
   launch(interfaces: PackageDataEntry['serviceInterfaces']): void {
+    // TODO @Matt
+    const host = {} as any
     this.windowRef.open(
-      this.config.launchableAddress(interfaces),
+      this.config.launchableAddress(interfaces, host),
       '_blank',
       'noreferrer',
     )

From 4d6cb091cca261e17f5f84ea81c190968ecbadd0 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 7 Jun 2024 12:17:45 -0600
Subject: [PATCH 157/341] Feature/disk usage (#2637)

* feat: Add disk usage

* Fixed: let the set config work with nesting.

* chore: Changes

* chore: Add default route

* fix: Tor only config

* chore
---
 .../Systems/SystemForEmbassy/index.ts         | 29 +++++++--
 .../SystemForEmbassy/oldEmbassyTypes.ts       |  4 ++
 .../SystemForEmbassy/polyfillEffects.ts       | 64 +++++++++++++++++--
 .../src/Models/DockerProcedure.ts             |  4 +-
 container-runtime/src/Models/Duration.ts      | 26 +++++++-
 5 files changed, 113 insertions(+), 14 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 8e0cb28c5..0bdb0d769 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -2,7 +2,7 @@ import { types as T, utils, EmVer } from "@start9labs/start-sdk"
 import * as fs from "fs/promises"
 
 import { PolyfillEffects } from "./polyfillEffects"
-import { Duration, duration } from "../../../Models/Duration"
+import { Duration, duration, fromDuration } from "../../../Models/Duration"
 import { System } from "../../../Interfaces/System"
 import { matchManifest, Manifest, Procedure } from "./matchManifest"
 import * as childProcess from "node:child_process"
@@ -478,10 +478,13 @@ export class SystemForEmbassy implements System {
     delete this.currentRunning
     if (currentRunning) {
       await currentRunning.clean({
-        timeout: this.manifest.main["sigterm-timeout"],
+        timeout: fromDuration(this.manifest.main["sigterm-timeout"]),
       })
     }
-    const durationValue = duration(this.manifest.main["sigterm-timeout"], "s")
+    const durationValue = duration(
+      fromDuration(this.manifest.main["sigterm-timeout"]),
+      "s",
+    )
     return durationValue
   }
   private async createBackup(
@@ -967,7 +970,7 @@ async function updateConfig(
 
     const newConfigValue = mutConfigValue[key]
     if (matchSpec.test(specValue)) {
-      const updateObject = { spec: null }
+      const updateObject = { spec: newConfigValue }
       await updateConfig(
         effects,
         manifest,
@@ -1001,6 +1004,10 @@ async function updateConfig(
         manifest,
         specInterface,
       )
+      if (!serviceInterfaceId) {
+        mutConfigValue[key] = ""
+        return
+      }
       const filled = await utils
         .getServiceInterface(effects, {
           packageId: specValue["package-id"],
@@ -1035,8 +1042,16 @@ async function updateConfig(
   }
 }
 function extractServiceInterfaceId(manifest: Manifest, specInterface: string) {
-  let serviceInterfaceId
-  const lanConfig = manifest.interfaces[specInterface]?.["lan-config"] || {}
-  serviceInterfaceId = `${specInterface}-${Object.entries(lanConfig)[0]?.[1]?.internal}`
+  const internalPort =
+    Object.entries(
+      manifest.interfaces[specInterface]?.["lan-config"] || {},
+    )[0]?.[1]?.internal ||
+    Object.entries(
+      manifest.interfaces[specInterface]?.["tor-config"]?.["port-mapping"] ||
+        {},
+    )?.[0]?.[1]
+
+  if (!internalPort) return null
+  const serviceInterfaceId = `${specInterface}-${internalPort}`
   return serviceInterfaceId
 }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
index 0d7521626..73d130c9a 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/oldEmbassyTypes.ts
@@ -120,6 +120,10 @@ export type Effects = {
     /// Returns the body as a json
     json(): Promise<unknown>
   }>
+  diskUsage(options?: {
+    volumeId: string
+    path: string
+  }): Promise<{ used: number; total: number }>
 
   runRsync(options: {
     srcVolume: string
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 12c0a58d5..3a8d5f624 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -8,7 +8,8 @@ import { HostSystemStartOs } from "../../HostSystemStartOs"
 import "isomorphic-fetch"
 import { Manifest } from "./matchManifest"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
-
+import * as cp from "child_process"
+export const execFile = promisify(cp.execFile)
 export class PolyfillEffects implements oet.Effects {
   constructor(
     readonly effects: HostSystemStartOs,
@@ -104,7 +105,9 @@ export class PolyfillEffects implements oet.Effects {
         stderr: x.stderr.toString(),
         stdout: x.stdout.toString(),
       }))
-      .then((x) => (!!x.stderr ? { error: x.stderr } : { result: x.stdout }))
+      .then((x: any) =>
+        !!x.stderr ? { error: x.stderr } : { result: x.stdout },
+      )
   }
   runDaemon(input: { command: string; args?: string[] | undefined }): {
     wait(): Promise<oet.ResultType<string>>
@@ -163,7 +166,7 @@ export class PolyfillEffects implements oet.Effects {
         stderr: x.stderr.toString(),
         stdout: x.stdout.toString(),
       }))
-      .then((x) => {
+      .then((x: any) => {
         if (!!x.stderr) {
           throw new Error(x.stderr)
         }
@@ -198,7 +201,7 @@ export class PolyfillEffects implements oet.Effects {
         stderr: x.stderr.toString(),
         stdout: x.stdout.toString(),
       }))
-      .then((x) => {
+      .then((x: any) => {
         if (!!x.stderr) {
           throw new Error(x.stderr)
         }
@@ -352,7 +355,7 @@ export class PolyfillEffects implements oet.Effects {
       return String(pid)
     }
     const waitPromise = new Promise<null>((resolve, reject) => {
-      spawned.on("exit", (code) => {
+      spawned.on("exit", (code: any) => {
         if (code === 0) {
           resolve(null)
         } else {
@@ -364,4 +367,55 @@ export class PolyfillEffects implements oet.Effects {
     const progress = () => Promise.resolve(percentage)
     return { id, wait, progress }
   }
+  async diskUsage(
+    options?: { volumeId: string; path: string } | undefined,
+  ): Promise<{ used: number; total: number }> {
+    const output = await execFile("df", ["--block-size=1", "-P", "/"])
+      .then((x: any) => ({
+        stderr: x.stderr.toString(),
+        stdout: x.stdout.toString(),
+      }))
+      .then((x: any) => {
+        if (!!x.stderr) {
+          throw new Error(x.stderr)
+        }
+        return parseDfOutput(x.stdout)
+      })
+    if (!!options) {
+      const used = await execFile("du", [
+        "-s",
+        "--block-size=1",
+        "-P",
+        new Volume(options.volumeId, options.path).path,
+      ])
+        .then((x: any) => ({
+          stderr: x.stderr.toString(),
+          stdout: x.stdout.toString(),
+        }))
+        .then((x: any) => {
+          if (!!x.stderr) {
+            throw new Error(x.stderr)
+          }
+          return Number.parseInt(x.stdout.split(/\s+/)[0])
+        })
+      return {
+        ...output,
+        used,
+      }
+    }
+    return output
+  }
+}
+
+function parseDfOutput(output: string): { used: number; total: number } {
+  const lines = output
+    .split("\n")
+    .filter((x) => x.length)
+    .map((x) => x.split(/\s+/))
+  const index = lines.splice(0, 1)[0].map((x) => x.toLowerCase())
+  const usedIndex = index.indexOf("used")
+  const availableIndex = index.indexOf("available")
+  const used = lines.map((x) => Number.parseInt(x[usedIndex]))[0] || 0
+  const total = lines.map((x) => Number.parseInt(x[availableIndex]))[0] || 0
+  return { used, total }
 }
diff --git a/container-runtime/src/Models/DockerProcedure.ts b/container-runtime/src/Models/DockerProcedure.ts
index 91ae73b5f..20c8145ab 100644
--- a/container-runtime/src/Models/DockerProcedure.ts
+++ b/container-runtime/src/Models/DockerProcedure.ts
@@ -8,7 +8,9 @@ import {
   literals,
   number,
   Parser,
+  some,
 } from "ts-matches"
+import { matchDuration } from "./Duration"
 
 const VolumeId = string
 const Path = string
@@ -31,7 +33,7 @@ export const matchDockerProcedure = object(
       "toml",
       "toml-pretty",
     ),
-    "sigterm-timeout": number,
+    "sigterm-timeout": some(number, matchDuration),
     inject: boolean,
   },
   ["io-format", "sigterm-timeout", "system", "args", "inject", "mounts"],
diff --git a/container-runtime/src/Models/Duration.ts b/container-runtime/src/Models/Duration.ts
index 75154c782..5f61c362a 100644
--- a/container-runtime/src/Models/Duration.ts
+++ b/container-runtime/src/Models/Duration.ts
@@ -1,6 +1,30 @@
-export type TimeUnit = "d" | "h" | "s" | "ms"
+import { string } from "ts-matches"
+
+export type TimeUnit = "d" | "h" | "s" | "ms" | "m" | "µs" | "ns"
 export type Duration = `${number}${TimeUnit}`
 
+const durationRegex = /^([0-9]*(\.[0-9]+)?)(ns|µs|ms|s|m|d)$/
+
+export const matchDuration = string.refine(isDuration)
+export function isDuration(value: string): value is Duration {
+  return durationRegex.test(value)
+}
+
 export function duration(timeValue: number, timeUnit: TimeUnit = "s") {
   return `${timeValue > 0 ? timeValue : 0}${timeUnit}` as Duration
 }
+const unitsToSeconds: Record<string, number> = {
+  ns: 1e-9,
+  µs: 1e-6,
+  ms: 0.001,
+  s: 1,
+  m: 60,
+  h: 3600,
+  d: 86400,
+}
+
+export function fromDuration(duration: Duration | number): number {
+  if (typeof duration === "number") return duration
+  const [, num, , unit] = duration.match(durationRegex) || []
+  return Number(num) * unitsToSeconds[unit]
+}

From 4afd3c2322ab30ab877c491f08b1c6a4cd23eb51 Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Mon, 10 Jun 2024 18:56:39 -0600
Subject: [PATCH 158/341] move MAU tracking back to registry

---
 core/startos/src/analytics/mod.rs           | 36 +--------------------
 core/startos/src/registry/context.rs        | 12 +++++++
 core/startos/src/registry/os/version/mod.rs | 26 ++++++++++++++-
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/core/startos/src/analytics/mod.rs b/core/startos/src/analytics/mod.rs
index 1fa08dd3f..7c84ff386 100644
--- a/core/startos/src/analytics/mod.rs
+++ b/core/startos/src/analytics/mod.rs
@@ -1,27 +1,19 @@
 use std::net::SocketAddr;
 
 use axum::Router;
-use chrono::Utc;
 use futures::future::ready;
-use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler, Server};
-use sqlx::query;
-use ts_rs::TS;
+use rpc_toolkit::{Context, ParentHandler, Server};
 
 use crate::analytics::context::AnalyticsContext;
 use crate::middleware::cors::Cors;
 use crate::net::static_server::{bad_request, not_found, server_error};
 use crate::net::web_server::WebServer;
 use crate::rpc_continuations::Guid;
-use crate::Error;
 
 pub mod context;
 
 pub fn analytics_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand(
-            "recordUserActivity",
-            from_fn_async(record_user_activity).no_cli(),
-        )
 }
 
 pub fn analytics_server_router(ctx: AnalyticsContext) -> Router {
@@ -84,29 +76,3 @@ impl WebServer {
         Self::new(bind, analytics_server_router(ctx))
     }
 }
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ActivityParams {
-    server_id: String,
-    arch: String,
-}
-
-async fn record_user_activity(
-    ctx: AnalyticsContext,
-    ActivityParams { server_id, arch }: ActivityParams,
-) -> Result<(), Error> {
-    let pool = ctx.db;
-    let created_at = Utc::now().to_rfc3339();
-
-    query!("INSERT INTO user_activity (created_at, server_id, os_version, arch) VALUES ($1, $2, $3, $4)",
-    created_at,
-    server_id,
-    arch
-    )
-    .execute(pool)
-    .await?;
-
-    Ok(())
-}
diff --git a/core/startos/src/registry/context.rs b/core/startos/src/registry/context.rs
index 0461aa924..64a157073 100644
--- a/core/startos/src/registry/context.rs
+++ b/core/startos/src/registry/context.rs
@@ -10,6 +10,7 @@ use reqwest::{Client, Proxy};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{CallRemote, Context, Empty};
 use serde::{Deserialize, Serialize};
+use sqlx::PgPool;
 use tokio::sync::broadcast::Sender;
 use tracing::instrument;
 use url::Url;
@@ -37,6 +38,8 @@ pub struct RegistryConfig {
     pub tor_proxy: Option<Url>,
     #[arg(short = 'd', long = "datadir")]
     pub datadir: Option<PathBuf>,
+    #[arg(short = 'u', long = "pg-connection-url")]
+    pub pg_connection_url: Option<String>,
 }
 impl ContextConfig for RegistryConfig {
     fn next(&mut self) -> Option<PathBuf> {
@@ -67,6 +70,7 @@ pub struct RegistryContextSeed {
     pub rpc_continuations: RpcContinuations,
     pub client: Client,
     pub shutdown: Sender<()>,
+    pub pool: Option<PgPool>,
 }
 
 #[derive(Clone)]
@@ -94,6 +98,13 @@ impl RegistryContext {
             .clone()
             .map(Ok)
             .unwrap_or_else(|| "socks5h://localhost:9050".parse())?;
+        let pool: Option<PgPool> = match &config.pg_connection_url {
+            Some(url) => match PgPool::connect(url.as_str()).await {
+                Ok(pool) => Some(pool),
+                Err(_) => None,
+            },
+            None => None,
+        };
         Ok(Self(Arc::new(RegistryContextSeed {
             hostname: config
                 .hostname
@@ -122,6 +133,7 @@ impl RegistryContext {
                 .build()
                 .with_kind(crate::ErrorKind::ParseUrl)?,
             shutdown,
+            pool,
         })))
     }
 }
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index 5bf926e5e..cb36f078a 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -1,10 +1,12 @@
 use std::collections::BTreeMap;
 
+use chrono::Utc;
 use clap::Parser;
 use emver::VersionRange;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
+use sqlx::query;
 use ts_rs::TS;
 
 use crate::context::CliContext;
@@ -126,12 +128,34 @@ pub struct GetVersionParams {
     #[ts(type = "string | null")]
     #[arg(long = "target")]
     pub target: Option<VersionRange>,
+    #[ts(type = "string | null")]
+    #[arg(long = "id")]
+    server_id: Option<String>,
+    #[ts(type = "string | null")]
+    #[arg(long = "arch")]
+    arch: Option<String>,
 }
 
 pub async fn get_version(
     ctx: RegistryContext,
-    GetVersionParams { source, target }: GetVersionParams,
+    GetVersionParams {
+        source,
+        target,
+        server_id,
+        arch,
+    }: GetVersionParams,
 ) -> Result<BTreeMap<VersionString, OsVersionInfo>, Error> {
+    if let (Some(pool), Some(server_id), Some(arch)) = (ctx.pool, server_id, arch) {
+        let created_at = Utc::now().to_rfc3339();
+
+        query!("INSERT INTO user_activity (created_at, server_id, os_version, arch) VALUES ($1, $2, $3, $4)",
+        created_at,
+        server_id,
+        arch
+        )
+        .execute(pool)
+        .await?;
+    }
     let target = target.unwrap_or(VersionRange::Any);
     ctx.db
         .peek()

From 5aefb707fa3d882098cfad2685ddf31344dd3371 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:38:12 -0600
Subject: [PATCH 159/341] feat: Add the merge to the file. (#2643)

* feat: Add the merge to the file.

* chore: Fix the early escape
---
 sdk/lib/util/fileHelper.ts |  7 +++++++
 sdk/package-lock.json      | 17 +++++++++++++++--
 sdk/package.json           |  6 ++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/sdk/lib/util/fileHelper.ts b/sdk/lib/util/fileHelper.ts
index 56706f95a..07cfb2c4a 100644
--- a/sdk/lib/util/fileHelper.ts
+++ b/sdk/lib/util/fileHelper.ts
@@ -1,6 +1,7 @@
 import * as matches from "ts-matches"
 import * as YAML from "yaml"
 import * as TOML from "@iarna/toml"
+import _ from "lodash"
 import * as T from "../types"
 import * as fs from "fs"
 
@@ -82,6 +83,12 @@ export class FileHelper<A> {
       ),
     )
   }
+
+  async merge(data: A, effects: T.Effects) {
+    const fileData = (await this.read(effects).catch(() => ({}))) || {}
+    const mergeData = _.merge({}, fileData, data)
+    return await this.write(mergeData, effects)
+  }
   /**
    * Create a File Helper for an arbitrary file type.
    *
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index f0d61ea4d..0c457540f 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -1,20 +1,22 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.4.0-rev0.lib0.rc8.beta10",
+  "version": "0.3.6-alpha1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-rev0.lib0.rc8.beta10",
+      "version": "0.3.6-alpha1",
       "license": "MIT",
       "dependencies": {
         "isomorphic-fetch": "^3.0.0",
+        "lodash": "4.*.*",
         "ts-matches": "^5.4.1"
       },
       "devDependencies": {
         "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
+        "@types/lodash": "^4.17.5",
         "jest": "^29.4.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
@@ -1136,6 +1138,12 @@
         "pretty-format": "^29.0.0"
       }
     },
+    "node_modules/@types/lodash": {
+      "version": "4.17.5",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz",
+      "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==",
+      "dev": true
+    },
     "node_modules/@types/node": {
       "version": "18.15.10",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz",
@@ -2841,6 +2849,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
diff --git a/sdk/package.json b/sdk/package.json
index db387c036..53ee291ee 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -31,6 +31,7 @@
   "homepage": "https://github.com/Start9Labs/start-sdk#readme",
   "dependencies": {
     "isomorphic-fetch": "^3.0.0",
+    "lodash": "4.*.*",
     "ts-matches": "^5.4.1"
   },
   "prettier": {
@@ -41,13 +42,14 @@
   },
   "devDependencies": {
     "@iarna/toml": "^2.2.5",
-    "yaml": "^2.2.2",
     "@types/jest": "^29.4.0",
+    "@types/lodash": "^4.17.5",
     "jest": "^29.4.3",
     "prettier": "^3.2.5",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "tsx": "^4.7.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.0.4",
+    "yaml": "^2.2.2"
   }
 }

From 3f380fa0da46c041db7313c9e006b1724b5af8ff Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Wed, 12 Jun 2024 11:46:59 -0600
Subject: [PATCH 160/341] feature: pack s9pk (#2642)

* TODO: images

* wip

* pack s9pk images

* include path in packsource error

* debug info

* add cmd as context to invoke

* filehelper bugfix

* fix file helper

* fix exposeForDependents

* misc fixes

* force image removal

* fix filtering

* fix deadlock

* fix api

* chore: Up the version of the package.json

* always allow concurrency within same call stack

* Update core/startos/src/s9pk/merkle_archive/expected.rs

Co-authored-by: Jade <2364004+Blu-J@users.noreply.github.com>

---------

Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: Jade <2364004+Blu-J@users.noreply.github.com>
---
 Makefile                                      |    4 +
 container-runtime/deb-install.sh              |    2 +-
 container-runtime/package-lock.json           | 1609 ++++-------------
 container-runtime/package.json                |    1 +
 .../src/Adapters/HostSystemStartOs.ts         |   26 +-
 container-runtime/src/Adapters/RpcListener.ts |    3 +
 .../Systems/SystemForEmbassy/index.ts         |    7 +-
 .../src/Adapters/Systems/SystemForStartOs.ts  |  139 +-
 .../src/Adapters/Systems/index.ts             |   22 +-
 container-runtime/src/Interfaces/System.ts    |    1 +
 core/Cargo.lock                               |  172 +-
 core/startos/Cargo.toml                       |    4 +-
 core/startos/src/action.rs                    |    2 +
 core/startos/src/auth.rs                      |    1 +
 core/startos/src/backup/restore.rs            |    1 -
 core/startos/src/config/mod.rs                |    5 +-
 core/startos/src/context/config.rs            |   21 +-
 core/startos/src/context/rpc.rs               |    6 +
 core/startos/src/control.rs                   |    7 +-
 core/startos/src/dependencies.rs              |   13 +-
 core/startos/src/disk/mount/backup.rs         |    1 -
 .../src/disk/mount/filesystem/overlayfs.rs    |   23 +-
 core/startos/src/disk/mount/guard.rs          |   19 +-
 core/startos/src/init.rs                      |    2 +-
 core/startos/src/install/mod.rs               |    2 -
 core/startos/src/lib.rs                       |    6 +-
 core/startos/src/lxc/mod.rs                   |   20 +-
 core/startos/src/os_install/gpt.rs            |    2 +-
 core/startos/src/os_install/mod.rs            |    2 +-
 core/startos/src/registry/device_info.rs      |    2 +-
 core/startos/src/registry/package/add.rs      |    4 +-
 core/startos/src/rpc_continuations.rs         |    5 +
 .../s9pk/merkle_archive/directory_contents.rs |    5 +-
 .../src/s9pk/merkle_archive/expected.rs       |  103 ++
 core/startos/src/s9pk/merkle_archive/mod.rs   |    4 +
 .../src/s9pk/merkle_archive/source/mod.rs     |    5 +
 .../source/multi_cursor_file.rs               |    2 +-
 core/startos/src/s9pk/rpc.rs                  |  130 +-
 core/startos/src/s9pk/v2/compat.rs            |   67 +-
 core/startos/src/s9pk/v2/manifest.rs          |   85 +-
 core/startos/src/s9pk/v2/mod.rs               |   76 +-
 core/startos/src/s9pk/v2/pack.rs              |  536 ++++++
 core/startos/src/service/action.rs            |   27 +-
 core/startos/src/service/config.rs            |   15 +-
 core/startos/src/service/control.rs           |   13 +-
 core/startos/src/service/dependencies.rs      |   67 +-
 core/startos/src/service/mod.rs               |  179 +-
 .../src/service/persistent_container.rs       |   97 +-
 core/startos/src/service/properties.rs        |    2 +
 core/startos/src/service/rpc.rs               |   10 +-
 .../src/service/service_effect_handler.rs     |  326 ++--
 core/startos/src/service/service_map.rs       |   38 +-
 core/startos/src/service/transition/backup.rs |   10 +-
 .../startos/src/service/transition/restart.rs |    9 +-
 .../startos/src/service/transition/restore.rs |   10 +-
 core/startos/src/util/actor/concurrent.rs     |   39 +-
 core/startos/src/util/actor/mod.rs            |   12 +-
 core/startos/src/util/actor/simple.rs         |    7 +-
 core/startos/src/util/io.rs                   |   10 +-
 core/startos/src/util/mod.rs                  |  246 ++-
 sdk/lib/StartSdk.ts                           |    9 +-
 sdk/lib/health/HealthCheck.ts                 |    3 +-
 sdk/lib/interfaces/Host.ts                    |    4 +-
 sdk/lib/mainFn/CommandController.ts           |    4 +-
 sdk/lib/mainFn/Daemon.ts                      |    4 +-
 sdk/lib/mainFn/Daemons.ts                     |   21 +-
 sdk/lib/manifest/ManifestTypes.ts             |    6 +-
 sdk/lib/manifest/setupManifest.ts             |    9 +-
 .../osBindings/CreateOverlayedImageParams.ts  |    3 +-
 .../osBindings/DestroyOverlayedImageParams.ts |    3 +-
 sdk/lib/osBindings/ImageConfig.ts             |    8 +
 sdk/lib/osBindings/ImageMetadata.ts           |    3 +
 sdk/lib/osBindings/ImageSource.ts             |    6 +
 sdk/lib/osBindings/LoginParams.ts             |    4 +
 sdk/lib/osBindings/Manifest.ts                |    3 +-
 sdk/lib/osBindings/index.ts                   |    4 +
 sdk/lib/test/configBuilder.test.ts            |    2 +-
 sdk/lib/test/output.sdk.ts                    |    2 +-
 sdk/lib/types.ts                              |   24 +-
 sdk/lib/util/Overlay.ts                       |   16 +-
 sdk/lib/util/fileHelper.ts                    |   30 +-
 sdk/package-lock.json                         |    2 +-
 sdk/package.json                              |   12 +-
 .../ui/src/app/services/api/api.fixures.ts    |   24 +-
 84 files changed, 2457 insertions(+), 2013 deletions(-)
 create mode 100644 core/startos/src/s9pk/merkle_archive/expected.rs
 create mode 100644 core/startos/src/s9pk/v2/pack.rs
 create mode 100644 sdk/lib/osBindings/ImageConfig.ts
 create mode 100644 sdk/lib/osBindings/ImageMetadata.ts
 create mode 100644 sdk/lib/osBindings/ImageSource.ts
 create mode 100644 sdk/lib/osBindings/LoginParams.ts

diff --git a/Makefile b/Makefile
index ff5b9c4ad..34064e799 100644
--- a/Makefile
+++ b/Makefile
@@ -160,6 +160,10 @@ wormhole-deb: results/$(BASENAME).deb
 	@echo "Paste the following command into the shell of your start-os server:"
 	@wormhole send results/$(BASENAME).deb 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade '"'"'cd $$(mktemp -d) && wormhole receive --accept-file %s && apt-get install -y --reinstall ./$(BASENAME).deb'"'"'\n", $$3 }'
 
+wormhole-cli: core/target/$(ARCH)-unknown-linux-musl/release/start-cli
+	@echo "Paste the following command into the shell of your start-os server:"
+	@wormhole send results/$(BASENAME).deb 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade '"'"'cd $$(mktemp -d) && wormhole receive --accept-file %s && apt-get install -y --reinstall ./$(BASENAME).deb'"'"'\n", $$3 }'
+
 update: $(ALL_TARGETS)
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
 	$(call ssh,'sudo /usr/lib/startos/scripts/chroot-and-upgrade --create')
diff --git a/container-runtime/deb-install.sh b/container-runtime/deb-install.sh
index b439c6308..697bfd10e 100644
--- a/container-runtime/deb-install.sh
+++ b/container-runtime/deb-install.sh
@@ -6,7 +6,7 @@ mkdir -p /run/systemd/resolve
 echo "nameserver 8.8.8.8" > /run/systemd/resolve/stub-resolv.conf
 
 apt-get update
-apt-get install -y curl rsync
+apt-get install -y curl rsync qemu-user-static
 
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 source ~/.bashrc
diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index 838dcb769..9b211c077 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -13,6 +13,7 @@
         "esbuild-plugin-resolve": "^2.0.0",
         "filebrowser": "^1.0.0",
         "isomorphic-fetch": "^3.0.0",
+        "lodash": "^4.17.21",
         "node-fetch": "^3.1.0",
         "ts-matches": "^5.5.1",
         "tslib": "^2.5.3",
@@ -33,11 +34,13 @@
       "license": "MIT",
       "dependencies": {
         "isomorphic-fetch": "^3.0.0",
+        "lodash": "^4.17.21",
         "ts-matches": "^5.4.1"
       },
       "devDependencies": {
         "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
+        "@types/lodash": "^4.17.5",
         "jest": "^29.4.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
@@ -49,14 +52,12 @@
     },
     "node_modules/@iarna/toml": {
       "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+      "license": "ISC"
     },
     "node_modules/@mole-inc/bin-wrapper": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@mole-inc/bin-wrapper/-/bin-wrapper-8.0.1.tgz",
-      "integrity": "sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bin-check": "^4.1.0",
         "bin-version-check": "^5.0.0",
@@ -73,9 +74,8 @@
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -86,18 +86,16 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -108,9 +106,8 @@
     },
     "node_modules/@sindresorhus/is": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -124,9 +121,8 @@
     },
     "node_modules/@swc/cli": {
       "version": "0.1.65",
-      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.65.tgz",
-      "integrity": "sha512-4NcgsvJVHhA7trDnMmkGLLvWMHu2kSy+qHx6QwRhhJhdiYdNUrhdp+ERxen73sYtaeEOYeLJcWrQ60nzKi6rpg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@mole-inc/bin-wrapper": "^8.0.1",
         "commander": "^7.1.0",
@@ -155,14 +151,13 @@
       }
     },
     "node_modules/@swc/core": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.4.1.tgz",
-      "integrity": "sha512-3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ==",
+      "version": "1.5.28",
       "dev": true,
       "hasInstallScript": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@swc/counter": "^0.1.2",
-        "@swc/types": "^0.1.5"
+        "@swc/counter": "^0.1.3",
+        "@swc/types": "^0.1.8"
       },
       "engines": {
         "node": ">=10"
@@ -172,19 +167,19 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.4.1",
-        "@swc/core-darwin-x64": "1.4.1",
-        "@swc/core-linux-arm-gnueabihf": "1.4.1",
-        "@swc/core-linux-arm64-gnu": "1.4.1",
-        "@swc/core-linux-arm64-musl": "1.4.1",
-        "@swc/core-linux-x64-gnu": "1.4.1",
-        "@swc/core-linux-x64-musl": "1.4.1",
-        "@swc/core-win32-arm64-msvc": "1.4.1",
-        "@swc/core-win32-ia32-msvc": "1.4.1",
-        "@swc/core-win32-x64-msvc": "1.4.1"
+        "@swc/core-darwin-arm64": "1.5.28",
+        "@swc/core-darwin-x64": "1.5.28",
+        "@swc/core-linux-arm-gnueabihf": "1.5.28",
+        "@swc/core-linux-arm64-gnu": "1.5.28",
+        "@swc/core-linux-arm64-musl": "1.5.28",
+        "@swc/core-linux-x64-gnu": "1.5.28",
+        "@swc/core-linux-x64-musl": "1.5.28",
+        "@swc/core-win32-arm64-msvc": "1.5.28",
+        "@swc/core-win32-ia32-msvc": "1.5.28",
+        "@swc/core-win32-x64-msvc": "1.5.28"
       },
       "peerDependencies": {
-        "@swc/helpers": "^0.5.0"
+        "@swc/helpers": "*"
       },
       "peerDependenciesMeta": {
         "@swc/helpers": {
@@ -192,94 +187,13 @@
         }
       }
     },
-    "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.1.tgz",
-      "integrity": "sha512-ePyfx0348UbR4DOAW24TedeJbafnzha8liXFGuQ4bdXtEVXhLfPngprrxKrAddCuv42F9aTxydlF6+adD3FBhA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-darwin-x64": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.1.tgz",
-      "integrity": "sha512-eLf4JSe6VkCMdDowjM8XNC5rO+BrgfbluEzAVtKR8L2HacNYukieumN7EzpYCi0uF1BYwu1ku6tLyG2r0VcGxA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.1.tgz",
-      "integrity": "sha512-K8VtTLWMw+rkN/jDC9o/Q9SMmzdiHwYo2CfgkwVT29NsGccwmNhCQx6XoYiPKyKGIFKt4tdQnJHKUFzxUqQVtQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.1.tgz",
-      "integrity": "sha512-0e8p4g0Bfkt8lkiWgcdiENH3RzkcqKtpRXIVNGOmVc0OBkvc2tpm2WTx/eoCnes2HpTT4CTtR3Zljj4knQ4Fvw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.1.tgz",
-      "integrity": "sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.1.tgz",
-      "integrity": "sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ==",
+      "version": "1.5.28",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
         "linux"
@@ -289,13 +203,12 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.1.tgz",
-      "integrity": "sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg==",
+      "version": "1.5.28",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
         "linux"
@@ -304,71 +217,23 @@
         "node": ">=10"
       }
     },
-    "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.1.tgz",
-      "integrity": "sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.1.tgz",
-      "integrity": "sha512-MBuc3/QfKX9FnLOU7iGN+6yHRTQaPQ9WskiC8s8JFiKQ+7I2p25tay2RplR9dIEEGgVAu6L7auv96LbNTh+FaA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.1.tgz",
-      "integrity": "sha512-lu4h4wFBb/bOK6N2MuZwg7TrEpwYXgpQf5R7ObNSXL65BwZ9BG8XRzD+dLJmALu8l5N08rP/TrpoKRoGT4WSxw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@swc/counter": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
-      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/@swc/types": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz",
-      "integrity": "sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==",
-      "dev": true
+      "version": "0.1.8",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3"
+      }
     },
     "node_modules/@szmarczak/http-timer": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "defer-to-connect": "^2.0.0"
       },
@@ -378,15 +243,13 @@
     },
     "node_modules/@tokenizer/token": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
-      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/cacheable-request": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-cache-semantics": "*",
         "@types/keyv": "^3.1.4",
@@ -396,41 +259,36 @@
     },
     "node_modules/@types/http-cache-semantics": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
-      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz",
-      "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==",
+      "version": "20.14.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@types/responselike": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
-      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/accepts": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "license": "MIT",
       "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -441,8 +299,6 @@
     },
     "node_modules/arch": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
       "dev": true,
       "funding": [
         {
@@ -457,24 +313,22 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/array-flatten": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+      "license": "MIT"
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/bin-check": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
-      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "execa": "^0.7.0",
         "executable": "^4.1.0"
@@ -485,9 +339,8 @@
     },
     "node_modules/bin-version": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-6.0.0.tgz",
-      "integrity": "sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "execa": "^5.0.0",
         "find-versions": "^5.0.0"
@@ -501,9 +354,8 @@
     },
     "node_modules/bin-version-check": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-5.1.0.tgz",
-      "integrity": "sha512-bYsvMqJ8yNGILLz1KP9zKLzQ6YpljV3ln1gqhuLkUtyfGi3qXKGuK2p+U4NAvjVFzDFiBBtOpCOSFNuYYEGZ5g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bin-version": "^6.0.0",
         "semver": "^7.5.3",
@@ -518,9 +370,8 @@
     },
     "node_modules/bin-version/node_modules/cross-spawn": {
       "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -532,9 +383,8 @@
     },
     "node_modules/bin-version/node_modules/execa": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -555,9 +405,8 @@
     },
     "node_modules/bin-version/node_modules/get-stream": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -567,9 +416,8 @@
     },
     "node_modules/bin-version/node_modules/is-stream": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -579,9 +427,8 @@
     },
     "node_modules/bin-version/node_modules/npm-run-path": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -591,18 +438,16 @@
     },
     "node_modules/bin-version/node_modules/path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/bin-version/node_modules/shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -612,18 +457,16 @@
     },
     "node_modules/bin-version/node_modules/shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/bin-version/node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -635,12 +478,11 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -648,7 +490,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -659,20 +501,18 @@
     },
     "node_modules/brace-expansion": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -680,26 +520,23 @@
     },
     "node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/cacheable-lookup": {
       "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.6.0"
       }
     },
     "node_modules/cacheable-request": {
       "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
-      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clone-response": "^1.0.2",
         "get-stream": "^5.1.0",
@@ -715,9 +552,8 @@
     },
     "node_modules/cacheable-request/node_modules/get-stream": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -730,8 +566,7 @@
     },
     "node_modules/call-bind": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -748,9 +583,8 @@
     },
     "node_modules/clone-response": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-response": "^1.0.0"
       },
@@ -760,17 +594,15 @@
     },
     "node_modules/commander": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -780,30 +612,26 @@
     },
     "node_modules/content-type": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.6.0",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+      "license": "MIT"
     },
     "node_modules/cross-spawn": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lru-cache": "^4.0.1",
         "shebang-command": "^1.2.0",
@@ -812,25 +640,22 @@
     },
     "node_modules/data-uri-to-buffer": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
-      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 12"
       }
     },
     "node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/decompress-response": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -843,9 +668,8 @@
     },
     "node_modules/decompress-response/node_modules/mimic-response": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -855,17 +679,15 @@
     },
     "node_modules/defer-to-connect": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/define-data-property": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -880,16 +702,14 @@
     },
     "node_modules/depd": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/destroy": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
@@ -897,30 +717,26 @@
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+      "license": "MIT"
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
     },
     "node_modules/es-define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.4"
       },
@@ -930,27 +746,23 @@
     },
     "node_modules/es-errors": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/esbuild-plugin-resolve": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/esbuild-plugin-resolve/-/esbuild-plugin-resolve-2.0.0.tgz",
-      "integrity": "sha512-eJy9B8yDW5X/J48eWtR1uVmv+DKfHvYYnrrcqQoe/nUkVHVOTZlJnSevkYyGOz6hI90t036Y5QIPDrGzmppxfg=="
+      "license": "MIT"
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+      "license": "MIT"
     },
     "node_modules/escape-string-regexp": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -960,17 +772,15 @@
     },
     "node_modules/etag": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/execa": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^5.0.1",
         "get-stream": "^3.0.0",
@@ -986,9 +796,8 @@
     },
     "node_modules/executable": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pify": "^2.2.0"
       },
@@ -997,16 +806,15 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -1039,9 +847,8 @@
     },
     "node_modules/ext-list": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
-      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": "^1.28.0"
       },
@@ -1051,9 +858,8 @@
     },
     "node_modules/ext-name": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
-      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ext-list": "^2.0.0",
         "sort-keys-length": "^1.0.0"
@@ -1064,9 +870,8 @@
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -1080,17 +885,14 @@
     },
     "node_modules/fastq": {
       "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/fetch-blob": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
-      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
       "funding": [
         {
           "type": "github",
@@ -1101,6 +903,7 @@
           "url": "https://paypal.me/jimmywarting"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "node-domexception": "^1.0.0",
         "web-streams-polyfill": "^3.0.3"
@@ -1111,9 +914,8 @@
     },
     "node_modules/file-type": {
       "version": "17.1.6",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz",
-      "integrity": "sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-web-to-node-stream": "^3.0.2",
         "strtok3": "^7.0.0-alpha.9",
@@ -1128,8 +930,7 @@
     },
     "node_modules/filebrowser": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/filebrowser/-/filebrowser-1.0.0.tgz",
-      "integrity": "sha512-RRONYpCDzbmWPhBX43T4dE+ptqLznJ7lKfbMaZLChB2i2ZIdFXoqT9qZTi70Dpq6fnJHuvcdeiRqMIPZKhVgTQ==",
+      "license": "ISC",
       "dependencies": {
         "commander": "^2.9.0",
         "content-disposition": "^0.5.1",
@@ -1138,14 +939,12 @@
     },
     "node_modules/filebrowser/node_modules/commander": {
       "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+      "license": "MIT"
     },
     "node_modules/filename-reserved-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz",
-      "integrity": "sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -1155,9 +954,8 @@
     },
     "node_modules/filenamify": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-5.1.1.tgz",
-      "integrity": "sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "filename-reserved-regex": "^3.0.0",
         "strip-outer": "^2.0.0",
@@ -1171,10 +969,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -1184,8 +981,7 @@
     },
     "node_modules/finalhandler": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -1201,9 +997,8 @@
     },
     "node_modules/find-versions": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-5.1.0.tgz",
-      "integrity": "sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver-regex": "^4.0.5"
       },
@@ -1216,8 +1011,7 @@
     },
     "node_modules/formdata-polyfill": {
       "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
-      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "license": "MIT",
       "dependencies": {
         "fetch-blob": "^3.1.2"
       },
@@ -1227,32 +1021,28 @@
     },
     "node_modules/forwarded": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/fresh": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
@@ -1269,18 +1059,16 @@
     },
     "node_modules/get-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -1290,8 +1078,7 @@
     },
     "node_modules/gopd": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.3"
       },
@@ -1301,9 +1088,8 @@
     },
     "node_modules/got": {
       "version": "11.8.6",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
@@ -1326,8 +1112,7 @@
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -1336,9 +1121,8 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.0.3",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -1348,8 +1132,7 @@
     },
     "node_modules/has-symbols": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -1358,9 +1141,8 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
-      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+      "version": "2.0.2",
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -1370,14 +1152,12 @@
     },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "license": "MIT",
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -1391,9 +1171,8 @@
     },
     "node_modules/http2-wrapper": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "quick-lru": "^5.1.1",
         "resolve-alpn": "^1.0.0"
@@ -1404,17 +1183,15 @@
     },
     "node_modules/human-signals": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -1424,8 +1201,6 @@
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true,
       "funding": [
         {
@@ -1440,35 +1215,32 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "license": "ISC"
     },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-glob": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -1478,41 +1250,36 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-plain-obj": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-stream": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/isomorphic-fetch": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
-      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+      "license": "MIT",
       "dependencies": {
         "node-fetch": "^2.6.1",
         "whatwg-fetch": "^3.4.1"
@@ -1520,8 +1287,7 @@
     },
     "node_modules/isomorphic-fetch/node_modules/node-fetch": {
       "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -1539,33 +1305,34 @@
     },
     "node_modules/json-buffer": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/keyv": {
       "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
     },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
     "node_modules/lowercase-keys": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/lru-cache": {
       "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
@@ -1573,47 +1340,41 @@
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "license": "MIT"
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/methods": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.7",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -1622,8 +1383,7 @@
     },
     "node_modules/mime": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -1633,16 +1393,14 @@
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
       "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -1652,27 +1410,24 @@
     },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/mimic-response": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.4",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -1685,21 +1440,17 @@
     },
     "node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "license": "MIT"
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/node-domexception": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
       "funding": [
         {
           "type": "github",
@@ -1710,14 +1461,14 @@
           "url": "https://paypal.me/jimmywarting"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=10.5.0"
       }
     },
     "node_modules/node-fetch": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
-      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "license": "MIT",
       "dependencies": {
         "data-uri-to-buffer": "^4.0.0",
         "fetch-blob": "^3.1.4",
@@ -1733,9 +1484,8 @@
     },
     "node_modules/normalize-url": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -1745,9 +1495,8 @@
     },
     "node_modules/npm-run-path": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^2.0.0"
       },
@@ -1757,16 +1506,14 @@
     },
     "node_modules/object-inspect": {
       "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -1776,18 +1523,16 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/onetime": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -1800,9 +1545,8 @@
     },
     "node_modules/os-filter-obj": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
-      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arch": "^2.1.0"
       },
@@ -1812,49 +1556,43 @@
     },
     "node_modules/p-cancelable": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/p-finally": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/parseurl": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/path-key": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "license": "MIT"
     },
     "node_modules/peek-readable": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0.tgz",
-      "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.16"
       },
@@ -1865,9 +1603,8 @@
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -1877,18 +1614,16 @@
     },
     "node_modules/pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "version": "3.3.2",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -1901,8 +1636,7 @@
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "license": "MIT",
       "dependencies": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -1913,15 +1647,13 @@
     },
     "node_modules/pseudomap": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/pump": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -1929,8 +1661,7 @@
     },
     "node_modules/qs": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -1943,8 +1674,6 @@
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true,
       "funding": [
         {
@@ -1959,13 +1688,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/quick-lru": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -1975,16 +1704,14 @@
     },
     "node_modules/range-parser": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -1997,9 +1724,8 @@
     },
     "node_modules/readable-stream": {
       "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -2011,9 +1737,8 @@
     },
     "node_modules/readable-web-to-node-stream": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "readable-stream": "^3.6.0"
       },
@@ -2027,15 +1752,13 @@
     },
     "node_modules/resolve-alpn": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/responselike": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lowercase-keys": "^2.0.0"
       },
@@ -2045,9 +1768,8 @@
     },
     "node_modules/reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -2055,8 +1777,6 @@
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "funding": [
         {
@@ -2072,14 +1792,13 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "funding": [
         {
           "type": "github",
@@ -2093,21 +1812,17 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.6.2",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2117,9 +1832,8 @@
     },
     "node_modules/semver-regex": {
       "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-4.0.5.tgz",
-      "integrity": "sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -2129,9 +1843,8 @@
     },
     "node_modules/semver-truncate": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-3.0.0.tgz",
-      "integrity": "sha512-LJWA9kSvMolR51oDE6PN3kALBNaUdkxzAGcexw8gjMA8xr5zUqK0JiR3CgARSqanYF3Z1YHvsErb1KDgh+v7Rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -2142,28 +1855,9 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/semver/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/send": {
       "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -2185,13 +1879,11 @@
     },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+      "license": "MIT"
     },
     "node_modules/serve-static": {
       "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "license": "MIT",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -2203,16 +1895,15 @@
       }
     },
     "node_modules/set-function-length": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
-      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
+      "version": "1.2.2",
+      "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.1.2",
+        "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.3",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.1"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2220,14 +1911,12 @@
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+      "license": "ISC"
     },
     "node_modules/shebang-command": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^1.0.0"
       },
@@ -2237,19 +1926,17 @@
     },
     "node_modules/shebang-regex": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
-      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
+      "version": "1.0.6",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
         "get-intrinsic": "^1.2.4",
         "object-inspect": "^1.13.1"
@@ -2263,24 +1950,21 @@
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/sort-keys": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-obj": "^1.0.0"
       },
@@ -2290,9 +1974,8 @@
     },
     "node_modules/sort-keys-length": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
-      "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sort-keys": "^1.0.0"
       },
@@ -2302,53 +1985,47 @@
     },
     "node_modules/source-map": {
       "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/statuses": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/strip-outer": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-2.0.0.tgz",
-      "integrity": "sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -2358,9 +2035,8 @@
     },
     "node_modules/strtok3": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz",
-      "integrity": "sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tokenizer/token": "^0.3.0",
         "peek-readable": "^5.0.0"
@@ -2375,9 +2051,8 @@
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -2387,17 +2062,15 @@
     },
     "node_modules/toidentifier": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
     },
     "node_modules/token-types": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz",
-      "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tokenizer/token": "^0.3.0",
         "ieee754": "^1.2.1"
@@ -2412,14 +2085,12 @@
     },
     "node_modules/tr46": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+      "license": "MIT"
     },
     "node_modules/trim-repeated": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-2.0.0.tgz",
-      "integrity": "sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^5.0.0"
       },
@@ -2429,18 +2100,15 @@
     },
     "node_modules/ts-matches": {
       "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
-      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
+      "license": "MIT"
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.6.3",
+      "license": "0BSD"
     },
     "node_modules/type-is": {
       "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -2450,10 +2118,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "version": "5.4.5",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -2464,62 +2131,53 @@
     },
     "node_modules/undici-types": {
       "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/vary": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/web-streams-polyfill": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz",
-      "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==",
+      "version": "3.3.3",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+      "license": "BSD-2-Clause"
     },
     "node_modules/whatwg-fetch": {
       "version": "3.6.20",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
-      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
+      "license": "MIT"
     },
     "node_modules/whatwg-url": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
         "webidl-conversions": "^3.0.0"
@@ -2527,9 +2185,8 @@
     },
     "node_modules/which": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -2539,20 +2196,20 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/yallist": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
+      "version": "2.4.5",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
         "node": ">= 14"
       }
@@ -2560,14 +2217,10 @@
   },
   "dependencies": {
     "@iarna/toml": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+      "version": "2.2.5"
     },
     "@mole-inc/bin-wrapper": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@mole-inc/bin-wrapper/-/bin-wrapper-8.0.1.tgz",
-      "integrity": "sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==",
       "dev": true,
       "requires": {
         "bin-check": "^4.1.0",
@@ -2582,8 +2235,6 @@
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "2.0.5",
@@ -2592,14 +2243,10 @@
     },
     "@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true
     },
     "@nodelib/fs.walk": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "requires": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -2608,8 +2255,6 @@
     },
     "@sindresorhus/is": {
       "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
       "dev": true
     },
     "@start9labs/start-sdk": {
@@ -2617,8 +2262,10 @@
       "requires": {
         "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
+        "@types/lodash": "^4.17.5",
         "isomorphic-fetch": "^3.0.0",
         "jest": "^29.4.3",
+        "lodash": "^4.17.21",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-matches": "^5.4.1",
@@ -2630,8 +2277,6 @@
     },
     "@swc/cli": {
       "version": "0.1.65",
-      "resolved": "https://registry.npmjs.org/@swc/cli/-/cli-0.1.65.tgz",
-      "integrity": "sha512-4NcgsvJVHhA7trDnMmkGLLvWMHu2kSy+qHx6QwRhhJhdiYdNUrhdp+ERxen73sYtaeEOYeLJcWrQ60nzKi6rpg==",
       "dev": true,
       "requires": {
         "@mole-inc/bin-wrapper": "^8.0.1",
@@ -2644,111 +2289,46 @@
       }
     },
     "@swc/core": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.4.1.tgz",
-      "integrity": "sha512-3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ==",
+      "version": "1.5.28",
       "dev": true,
       "requires": {
-        "@swc/core-darwin-arm64": "1.4.1",
-        "@swc/core-darwin-x64": "1.4.1",
-        "@swc/core-linux-arm-gnueabihf": "1.4.1",
-        "@swc/core-linux-arm64-gnu": "1.4.1",
-        "@swc/core-linux-arm64-musl": "1.4.1",
-        "@swc/core-linux-x64-gnu": "1.4.1",
-        "@swc/core-linux-x64-musl": "1.4.1",
-        "@swc/core-win32-arm64-msvc": "1.4.1",
-        "@swc/core-win32-ia32-msvc": "1.4.1",
-        "@swc/core-win32-x64-msvc": "1.4.1",
-        "@swc/counter": "^0.1.2",
-        "@swc/types": "^0.1.5"
-      }
-    },
-    "@swc/core-darwin-arm64": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.1.tgz",
-      "integrity": "sha512-ePyfx0348UbR4DOAW24TedeJbafnzha8liXFGuQ4bdXtEVXhLfPngprrxKrAddCuv42F9aTxydlF6+adD3FBhA==",
-      "dev": true,
-      "optional": true
-    },
-    "@swc/core-darwin-x64": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.1.tgz",
-      "integrity": "sha512-eLf4JSe6VkCMdDowjM8XNC5rO+BrgfbluEzAVtKR8L2HacNYukieumN7EzpYCi0uF1BYwu1ku6tLyG2r0VcGxA==",
-      "dev": true,
-      "optional": true
-    },
-    "@swc/core-linux-arm-gnueabihf": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.1.tgz",
-      "integrity": "sha512-K8VtTLWMw+rkN/jDC9o/Q9SMmzdiHwYo2CfgkwVT29NsGccwmNhCQx6XoYiPKyKGIFKt4tdQnJHKUFzxUqQVtQ==",
-      "dev": true,
-      "optional": true
-    },
-    "@swc/core-linux-arm64-gnu": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.1.tgz",
-      "integrity": "sha512-0e8p4g0Bfkt8lkiWgcdiENH3RzkcqKtpRXIVNGOmVc0OBkvc2tpm2WTx/eoCnes2HpTT4CTtR3Zljj4knQ4Fvw==",
-      "dev": true,
-      "optional": true
-    },
-    "@swc/core-linux-arm64-musl": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.1.tgz",
-      "integrity": "sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA==",
-      "dev": true,
-      "optional": true
+        "@swc/core-darwin-arm64": "1.5.28",
+        "@swc/core-darwin-x64": "1.5.28",
+        "@swc/core-linux-arm-gnueabihf": "1.5.28",
+        "@swc/core-linux-arm64-gnu": "1.5.28",
+        "@swc/core-linux-arm64-musl": "1.5.28",
+        "@swc/core-linux-x64-gnu": "1.5.28",
+        "@swc/core-linux-x64-musl": "1.5.28",
+        "@swc/core-win32-arm64-msvc": "1.5.28",
+        "@swc/core-win32-ia32-msvc": "1.5.28",
+        "@swc/core-win32-x64-msvc": "1.5.28",
+        "@swc/counter": "^0.1.3",
+        "@swc/types": "^0.1.8"
+      }
     },
     "@swc/core-linux-x64-gnu": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.1.tgz",
-      "integrity": "sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ==",
+      "version": "1.5.28",
       "dev": true,
       "optional": true
     },
     "@swc/core-linux-x64-musl": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.1.tgz",
-      "integrity": "sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg==",
-      "dev": true,
-      "optional": true
-    },
-    "@swc/core-win32-arm64-msvc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.1.tgz",
-      "integrity": "sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA==",
-      "dev": true,
-      "optional": true
-    },
-    "@swc/core-win32-ia32-msvc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.1.tgz",
-      "integrity": "sha512-MBuc3/QfKX9FnLOU7iGN+6yHRTQaPQ9WskiC8s8JFiKQ+7I2p25tay2RplR9dIEEGgVAu6L7auv96LbNTh+FaA==",
-      "dev": true,
-      "optional": true
-    },
-    "@swc/core-win32-x64-msvc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.1.tgz",
-      "integrity": "sha512-lu4h4wFBb/bOK6N2MuZwg7TrEpwYXgpQf5R7ObNSXL65BwZ9BG8XRzD+dLJmALu8l5N08rP/TrpoKRoGT4WSxw==",
+      "version": "1.5.28",
       "dev": true,
       "optional": true
     },
     "@swc/counter": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
-      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
       "dev": true
     },
     "@swc/types": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz",
-      "integrity": "sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==",
-      "dev": true
+      "version": "0.1.8",
+      "dev": true,
+      "requires": {
+        "@swc/counter": "^0.1.3"
+      }
     },
     "@szmarczak/http-timer": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
       "dev": true,
       "requires": {
         "defer-to-connect": "^2.0.0"
@@ -2756,14 +2336,10 @@
     },
     "@tokenizer/token": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
-      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
       "dev": true
     },
     "@types/cacheable-request": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
       "dev": true,
       "requires": {
         "@types/http-cache-semantics": "*",
@@ -2774,23 +2350,17 @@
     },
     "@types/http-cache-semantics": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
-      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
       "dev": true
     },
     "@types/keyv": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/node": {
-      "version": "20.11.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz",
-      "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==",
+      "version": "20.14.2",
       "dev": true,
       "requires": {
         "undici-types": "~5.26.4"
@@ -2798,8 +2368,6 @@
     },
     "@types/responselike": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
-      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -2807,8 +2375,6 @@
     },
     "accepts": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "requires": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -2816,25 +2382,17 @@
     },
     "arch": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
       "dev": true
     },
     "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+      "version": "1.1.1"
     },
     "balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
     "bin-check": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
-      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
       "dev": true,
       "requires": {
         "execa": "^0.7.0",
@@ -2843,8 +2401,6 @@
     },
     "bin-version": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-6.0.0.tgz",
-      "integrity": "sha512-nk5wEsP4RiKjG+vF+uG8lFsEn4d7Y6FVDamzzftSunXOoOcOOkzcWdKVlGgFFwlUQCj63SgnUkLLGF8v7lufhw==",
       "dev": true,
       "requires": {
         "execa": "^5.0.0",
@@ -2853,8 +2409,6 @@
       "dependencies": {
         "cross-spawn": {
           "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
           "dev": true,
           "requires": {
             "path-key": "^3.1.0",
@@ -2864,8 +2418,6 @@
         },
         "execa": {
           "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
           "dev": true,
           "requires": {
             "cross-spawn": "^7.0.3",
@@ -2881,20 +2433,14 @@
         },
         "get-stream": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
           "dev": true
         },
         "is-stream": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
           "dev": true
         },
         "npm-run-path": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
           "dev": true,
           "requires": {
             "path-key": "^3.0.0"
@@ -2902,14 +2448,10 @@
         },
         "path-key": {
           "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
           "dev": true
         },
         "shebang-command": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
           "dev": true,
           "requires": {
             "shebang-regex": "^3.0.0"
@@ -2917,14 +2459,10 @@
         },
         "shebang-regex": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
           "dev": true
         },
         "which": {
           "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
           "dev": true,
           "requires": {
             "isexe": "^2.0.0"
@@ -2934,8 +2472,6 @@
     },
     "bin-version-check": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-5.1.0.tgz",
-      "integrity": "sha512-bYsvMqJ8yNGILLz1KP9zKLzQ6YpljV3ln1gqhuLkUtyfGi3qXKGuK2p+U4NAvjVFzDFiBBtOpCOSFNuYYEGZ5g==",
       "dev": true,
       "requires": {
         "bin-version": "^6.0.0",
@@ -2944,12 +2480,10 @@
       }
     },
     "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
       "requires": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -2957,44 +2491,34 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       }
     },
     "brace-expansion": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "requires": {
         "balanced-match": "^1.0.0"
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+      "version": "3.1.2"
     },
     "cacheable-lookup": {
       "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
       "dev": true
     },
     "cacheable-request": {
       "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
-      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
       "dev": true,
       "requires": {
         "clone-response": "^1.0.2",
@@ -3008,8 +2532,6 @@
       "dependencies": {
         "get-stream": {
           "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
           "dev": true,
           "requires": {
             "pump": "^3.0.0"
@@ -3019,8 +2541,6 @@
     },
     "call-bind": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "requires": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -3031,8 +2551,6 @@
     },
     "clone-response": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
       "dev": true,
       "requires": {
         "mimic-response": "^1.0.0"
@@ -3040,37 +2558,25 @@
     },
     "commander": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true
     },
     "content-disposition": {
       "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
         "safe-buffer": "5.2.1"
       }
     },
     "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
+      "version": "1.0.5"
     },
     "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+      "version": "0.6.0"
     },
     "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+      "version": "1.0.6"
     },
     "cross-spawn": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
       "dev": true,
       "requires": {
         "lru-cache": "^4.0.1",
@@ -3079,22 +2585,16 @@
       }
     },
     "data-uri-to-buffer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
-      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="
+      "version": "4.0.1"
     },
     "debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "requires": {
         "ms": "2.0.0"
       }
     },
     "decompress-response": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
       "requires": {
         "mimic-response": "^3.1.0"
@@ -3102,22 +2602,16 @@
       "dependencies": {
         "mimic-response": {
           "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
           "dev": true
         }
       }
     },
     "defer-to-connect": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
       "dev": true
     },
     "define-data-property": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "requires": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -3125,29 +2619,19 @@
       }
     },
     "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+      "version": "2.0.0"
     },
     "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
+      "version": "1.2.0"
     },
     "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+      "version": "1.1.1"
     },
     "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+      "version": "1.0.2"
     },
     "end-of-stream": {
       "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
       "requires": {
         "once": "^1.4.0"
@@ -3155,42 +2639,28 @@
     },
     "es-define-property": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "requires": {
         "get-intrinsic": "^1.2.4"
       }
     },
     "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+      "version": "1.3.0"
     },
     "esbuild-plugin-resolve": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/esbuild-plugin-resolve/-/esbuild-plugin-resolve-2.0.0.tgz",
-      "integrity": "sha512-eJy9B8yDW5X/J48eWtR1uVmv+DKfHvYYnrrcqQoe/nUkVHVOTZlJnSevkYyGOz6hI90t036Y5QIPDrGzmppxfg=="
+      "version": "2.0.0"
     },
     "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+      "version": "1.0.3"
     },
     "escape-string-regexp": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
       "dev": true
     },
     "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
+      "version": "1.8.1"
     },
     "execa": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
       "dev": true,
       "requires": {
         "cross-spawn": "^5.0.1",
@@ -3204,24 +2674,20 @@
     },
     "executable": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
       "dev": true,
       "requires": {
         "pify": "^2.2.0"
       }
     },
     "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -3251,8 +2717,6 @@
     },
     "ext-list": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
-      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
       "dev": true,
       "requires": {
         "mime-db": "^1.28.0"
@@ -3260,8 +2724,6 @@
     },
     "ext-name": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
-      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
       "dev": true,
       "requires": {
         "ext-list": "^2.0.0",
@@ -3270,8 +2732,6 @@
     },
     "fast-glob": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -3283,8 +2743,6 @@
     },
     "fastq": {
       "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -3292,8 +2750,6 @@
     },
     "fetch-blob": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
-      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
       "requires": {
         "node-domexception": "^1.0.0",
         "web-streams-polyfill": "^3.0.3"
@@ -3301,8 +2757,6 @@
     },
     "file-type": {
       "version": "17.1.6",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-17.1.6.tgz",
-      "integrity": "sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==",
       "dev": true,
       "requires": {
         "readable-web-to-node-stream": "^3.0.2",
@@ -3312,8 +2766,6 @@
     },
     "filebrowser": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/filebrowser/-/filebrowser-1.0.0.tgz",
-      "integrity": "sha512-RRONYpCDzbmWPhBX43T4dE+ptqLznJ7lKfbMaZLChB2i2ZIdFXoqT9qZTi70Dpq6fnJHuvcdeiRqMIPZKhVgTQ==",
       "requires": {
         "commander": "^2.9.0",
         "content-disposition": "^0.5.1",
@@ -3321,22 +2773,16 @@
       },
       "dependencies": {
         "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+          "version": "2.20.3"
         }
       }
     },
     "filename-reserved-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz",
-      "integrity": "sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==",
       "dev": true
     },
     "filenamify": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-5.1.1.tgz",
-      "integrity": "sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==",
       "dev": true,
       "requires": {
         "filename-reserved-regex": "^3.0.0",
@@ -3345,9 +2791,7 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
@@ -3355,8 +2799,6 @@
     },
     "finalhandler": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -3369,8 +2811,6 @@
     },
     "find-versions": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-5.1.0.tgz",
-      "integrity": "sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==",
       "dev": true,
       "requires": {
         "semver-regex": "^4.0.5"
@@ -3378,31 +2818,21 @@
     },
     "formdata-polyfill": {
       "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
-      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
       "requires": {
         "fetch-blob": "^3.1.2"
       }
     },
     "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+      "version": "0.2.0"
     },
     "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+      "version": "0.5.2"
     },
     "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+      "version": "1.1.2"
     },
     "get-intrinsic": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "requires": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
@@ -3413,14 +2843,10 @@
     },
     "get-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
       "dev": true
     },
     "glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
@@ -3428,16 +2854,12 @@
     },
     "gopd": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "requires": {
         "get-intrinsic": "^1.1.3"
       }
     },
     "got": {
       "version": "11.8.6",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
       "dev": true,
       "requires": {
         "@sindresorhus/is": "^4.0.0",
@@ -3455,40 +2877,28 @@
     },
     "has-property-descriptors": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "requires": {
         "es-define-property": "^1.0.0"
       }
     },
     "has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+      "version": "1.0.3"
     },
     "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+      "version": "1.0.3"
     },
     "hasown": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
-      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
+      "version": "2.0.2",
       "requires": {
         "function-bind": "^1.1.2"
       }
     },
     "http-cache-semantics": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
       "dev": true
     },
     "http-errors": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "requires": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -3499,8 +2909,6 @@
     },
     "http2-wrapper": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
       "dev": true,
       "requires": {
         "quick-lru": "^5.1.1",
@@ -3509,44 +2917,30 @@
     },
     "human-signals": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true
     },
     "iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
     "ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true
     },
     "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "version": "2.0.4"
     },
     "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+      "version": "1.9.1"
     },
     "is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
     "is-glob": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
@@ -3554,32 +2948,22 @@
     },
     "is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
     "is-plain-obj": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
       "dev": true
     },
     "is-stream": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "dev": true
     },
     "isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
     "isomorphic-fetch": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
-      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
       "requires": {
         "node-fetch": "^2.6.1",
         "whatwg-fetch": "^3.4.1"
@@ -3587,8 +2971,6 @@
       "dependencies": {
         "node-fetch": {
           "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-          "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
           "requires": {
             "whatwg-url": "^5.0.0"
           }
@@ -3597,29 +2979,26 @@
     },
     "json-buffer": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
     "keyv": {
       "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
       "requires": {
         "json-buffer": "3.0.1"
       }
     },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
     "lowercase-keys": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
       "dev": true
     },
     "lru-cache": {
       "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "requires": {
         "pseudomap": "^1.0.2",
@@ -3627,100 +3006,68 @@
       }
     },
     "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+      "version": "0.3.0"
     },
     "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "version": "1.0.1"
     },
     "merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
     "merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
     "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
+      "version": "1.1.2"
     },
     "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.7",
       "dev": true,
       "requires": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       }
     },
     "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+      "version": "1.6.0"
     },
     "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+      "version": "1.52.0"
     },
     "mime-types": {
       "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
         "mime-db": "1.52.0"
       }
     },
     "mimic-fn": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
     "mimic-response": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
       "dev": true
     },
     "minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.4",
       "dev": true,
       "requires": {
         "brace-expansion": "^2.0.1"
       }
     },
     "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "version": "2.0.0"
     },
     "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+      "version": "0.6.3"
     },
     "node-domexception": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
+      "version": "1.0.0"
     },
     "node-fetch": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
-      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
       "requires": {
         "data-uri-to-buffer": "^4.0.0",
         "fetch-blob": "^3.1.4",
@@ -3729,36 +3076,26 @@
     },
     "normalize-url": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true
     },
     "npm-run-path": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "dev": true,
       "requires": {
         "path-key": "^2.0.0"
       }
     },
     "object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
+      "version": "1.13.1"
     },
     "on-finished": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
     },
     "once": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "requires": {
         "wrappy": "1"
@@ -3766,8 +3103,6 @@
     },
     "onetime": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
       "requires": {
         "mimic-fn": "^2.1.0"
@@ -3775,8 +3110,6 @@
     },
     "os-filter-obj": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
-      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
       "dev": true,
       "requires": {
         "arch": "^2.1.0"
@@ -3784,60 +3117,40 @@
     },
     "p-cancelable": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
       "dev": true
     },
     "p-finally": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "dev": true
     },
     "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+      "version": "1.3.3"
     },
     "path-key": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "dev": true
     },
     "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "version": "0.1.7"
     },
     "peek-readable": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0.tgz",
-      "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==",
       "dev": true
     },
     "picomatch": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true
     },
     "prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "version": "3.3.2",
       "dev": true
     },
     "proxy-addr": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "requires": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -3845,14 +3158,10 @@
     },
     "pseudomap": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
     "pump": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
@@ -3861,33 +3170,23 @@
     },
     "qs": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "requires": {
         "side-channel": "^1.0.4"
       }
     },
     "queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
     "quick-lru": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true
     },
     "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+      "version": "1.2.1"
     },
     "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
       "requires": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -3897,8 +3196,6 @@
     },
     "readable-stream": {
       "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -3908,8 +3205,6 @@
     },
     "readable-web-to-node-stream": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
       "dev": true,
       "requires": {
         "readable-stream": "^3.6.0"
@@ -3917,14 +3212,10 @@
     },
     "resolve-alpn": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
       "dev": true
     },
     "responselike": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
       "dev": true,
       "requires": {
         "lowercase-keys": "^2.0.0"
@@ -3932,65 +3223,31 @@
     },
     "reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true
     },
     "run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "requires": {
         "queue-microtask": "^1.2.2"
       }
     },
     "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+      "version": "5.2.1"
     },
     "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "version": "2.1.2"
     },
     "semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
+      "version": "7.6.2",
+      "dev": true
     },
     "semver-regex": {
       "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-4.0.5.tgz",
-      "integrity": "sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==",
       "dev": true
     },
     "semver-truncate": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-3.0.0.tgz",
-      "integrity": "sha512-LJWA9kSvMolR51oDE6PN3kALBNaUdkxzAGcexw8gjMA8xr5zUqK0JiR3CgARSqanYF3Z1YHvsErb1KDgh+v7Rg==",
       "dev": true,
       "requires": {
         "semver": "^7.3.5"
@@ -3998,8 +3255,6 @@
     },
     "send": {
       "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -4017,16 +3272,12 @@
       },
       "dependencies": {
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+          "version": "2.1.3"
         }
       }
     },
     "serve-static": {
       "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -4035,27 +3286,21 @@
       }
     },
     "set-function-length": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
-      "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
+      "version": "1.2.2",
       "requires": {
-        "define-data-property": "^1.1.2",
+        "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.3",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.1"
+        "has-property-descriptors": "^1.0.2"
       }
     },
     "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+      "version": "1.2.0"
     },
     "shebang-command": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
       "requires": {
         "shebang-regex": "^1.0.0"
@@ -4063,16 +3308,12 @@
     },
     "shebang-regex": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "dev": true
     },
     "side-channel": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
-      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
+      "version": "1.0.6",
       "requires": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
         "get-intrinsic": "^1.2.4",
         "object-inspect": "^1.13.1"
@@ -4080,20 +3321,14 @@
     },
     "signal-exit": {
       "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
     "slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
     "sort-keys": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
       "dev": true,
       "requires": {
         "is-plain-obj": "^1.0.0"
@@ -4101,8 +3336,6 @@
     },
     "sort-keys-length": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
-      "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
       "dev": true,
       "requires": {
         "sort-keys": "^1.0.0"
@@ -4110,19 +3343,13 @@
     },
     "source-map": {
       "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "dev": true
     },
     "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+      "version": "2.0.1"
     },
     "string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "requires": {
         "safe-buffer": "~5.2.0"
@@ -4130,26 +3357,18 @@
     },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
       "dev": true
     },
     "strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true
     },
     "strip-outer": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-2.0.0.tgz",
-      "integrity": "sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==",
       "dev": true
     },
     "strtok3": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz",
-      "integrity": "sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==",
       "dev": true,
       "requires": {
         "@tokenizer/token": "^0.3.0",
@@ -4158,22 +3377,16 @@
     },
     "to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "requires": {
         "is-number": "^7.0.0"
       }
     },
     "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+      "version": "1.0.1"
     },
     "token-types": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz",
-      "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==",
       "dev": true,
       "requires": {
         "@tokenizer/token": "^0.3.0",
@@ -4181,90 +3394,60 @@
       }
     },
     "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+      "version": "0.0.3"
     },
     "trim-repeated": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-2.0.0.tgz",
-      "integrity": "sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^5.0.0"
       }
     },
     "ts-matches": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
-      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
+      "version": "5.5.1"
     },
     "tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.6.3"
     },
     "type-is": {
       "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "requires": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
       }
     },
     "typescript": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "version": "5.4.5",
       "dev": true
     },
     "undici-types": {
       "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "dev": true
     },
     "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
+      "version": "1.0.0"
     },
     "util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+      "version": "1.0.1"
     },
     "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+      "version": "1.1.2"
     },
     "web-streams-polyfill": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz",
-      "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ=="
+      "version": "3.3.3"
     },
     "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+      "version": "3.0.1"
     },
     "whatwg-fetch": {
-      "version": "3.6.20",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
-      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
+      "version": "3.6.20"
     },
     "whatwg-url": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "requires": {
         "tr46": "~0.0.3",
         "webidl-conversions": "^3.0.0"
@@ -4272,8 +3455,6 @@
     },
     "which": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
         "isexe": "^2.0.0"
@@ -4281,20 +3462,14 @@
     },
     "wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
     "yallist": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
     "yaml": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA=="
+      "version": "2.4.5"
     }
   }
 }
diff --git a/container-runtime/package.json b/container-runtime/package.json
index e2c56afff..357c606fc 100644
--- a/container-runtime/package.json
+++ b/container-runtime/package.json
@@ -21,6 +21,7 @@
     "esbuild-plugin-resolve": "^2.0.0",
     "filebrowser": "^1.0.0",
     "isomorphic-fetch": "^3.0.0",
+    "lodash": "^4.17.21",
     "node-fetch": "^3.1.0",
     "ts-matches": "^5.5.1",
     "tslib": "^2.5.3",
diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index ba2076f52..93905825a 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -32,6 +32,8 @@ type RpcError = typeof matchRpcError._TYPE
 const SOCKET_PATH = "/media/startos/rpc/host.sock"
 const MAIN = "/main" as const
 export class HostSystemStartOs implements Effects {
+  procedureId: string | null = null
+
   static of(callbackHolder: CallbackHolder) {
     return new HostSystemStartOs(callbackHolder)
   }
@@ -40,7 +42,7 @@ export class HostSystemStartOs implements Effects {
   id = 0
   rpcRound<K extends keyof Effects | "getStore" | "setStore">(
     method: K,
-    params: unknown,
+    params: Record<string, unknown>,
   ) {
     const id = this.id++
     const client = net.createConnection({ path: SOCKET_PATH }, () => {
@@ -48,7 +50,7 @@ export class HostSystemStartOs implements Effects {
         JSON.stringify({
           id,
           method,
-          params,
+          params: { ...params, procedureId: this.procedureId },
         }) + "\n",
       )
     })
@@ -102,14 +104,14 @@ export class HostSystemStartOs implements Effects {
     }) as ReturnType<T.Effects["bind"]>
   }
   clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
-    return this.rpcRound("clearBindings", null) as ReturnType<
+    return this.rpcRound("clearBindings", {}) as ReturnType<
       T.Effects["clearBindings"]
     >
   }
   clearServiceInterfaces(
     ...[]: Parameters<T.Effects["clearServiceInterfaces"]>
   ) {
-    return this.rpcRound("clearServiceInterfaces", null) as ReturnType<
+    return this.rpcRound("clearServiceInterfaces", {}) as ReturnType<
       T.Effects["clearServiceInterfaces"]
     >
   }
@@ -145,18 +147,20 @@ export class HostSystemStartOs implements Effects {
       T.Effects["exportServiceInterface"]
     >
   }
-  exposeForDependents(...[options]: any) {
-    return this.rpcRound("exposeForDependents", null) as ReturnType<
+  exposeForDependents(
+    ...[options]: Parameters<T.Effects["exposeForDependents"]>
+  ) {
+    return this.rpcRound("exposeForDependents", options) as ReturnType<
       T.Effects["exposeForDependents"]
     >
   }
   getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
-    return this.rpcRound("getConfigured", null) as ReturnType<
+    return this.rpcRound("getConfigured", {}) as ReturnType<
       T.Effects["getConfigured"]
     >
   }
   getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
-    return this.rpcRound("getContainerIp", null) as ReturnType<
+    return this.rpcRound("getContainerIp", {}) as ReturnType<
       T.Effects["getContainerIp"]
     >
   }
@@ -229,7 +233,7 @@ export class HostSystemStartOs implements Effects {
     >
   }
   restart(...[]: Parameters<T.Effects["restart"]>) {
-    return this.rpcRound("restart", null)
+    return this.rpcRound("restart", {}) as ReturnType<T.Effects["restart"]>
   }
   running(...[packageId]: Parameters<T.Effects["running"]>) {
     return this.rpcRound("running", { packageId }) as ReturnType<
@@ -262,7 +266,7 @@ export class HostSystemStartOs implements Effects {
     >
   }
   getDependencies(): ReturnType<T.Effects["getDependencies"]> {
-    return this.rpcRound("getDependencies", null) as ReturnType<
+    return this.rpcRound("getDependencies", {}) as ReturnType<
       T.Effects["getDependencies"]
     >
   }
@@ -279,7 +283,7 @@ export class HostSystemStartOs implements Effects {
   }
 
   shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
-    return this.rpcRound("shutdown", null)
+    return this.rpcRound("shutdown", {}) as ReturnType<T.Effects["shutdown"]>
   }
   stopped(...[packageId]: Parameters<T.Effects["stopped"]>) {
     return this.rpcRound("stopped", { packageId }) as ReturnType<
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index faff253fe..5391d943e 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -58,6 +58,7 @@ const runType = object({
   method: literal("execute"),
   params: object(
     {
+      id: string,
       procedure: string,
       input: any,
       timeout: number,
@@ -70,6 +71,7 @@ const sandboxRunType = object({
   method: literal("sandbox"),
   params: object(
     {
+      id: string,
       procedure: string,
       input: any,
       timeout: number,
@@ -195,6 +197,7 @@ export class RpcListener {
         const procedure = jsonPath.unsafeCast(params.procedure)
         return system
           .execute(this.effects, {
+            id: params.id,
             procedure,
             input: params.input,
             timeout: params.timeout,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 0bdb0d769..731b38903 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -49,7 +49,7 @@ function todo(): never {
 const execFile = promisify(childProcess.execFile)
 
 const MANIFEST_LOCATION = "/usr/lib/startos/package/embassyManifest.json"
-const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
+export const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
 const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig"
 
 const matchSetResult = object(
@@ -199,11 +199,14 @@ export class SystemForEmbassy implements System {
   async execute(
     effects: HostSystemStartOs,
     options: {
+      id: string
       procedure: JsonPath
       input: unknown
       timeout?: number | undefined
     },
   ): Promise<RpcResult> {
+    effects = Object.create(effects)
+    effects.procedureId = options.id
     return this._execute(effects, options)
       .then((x) =>
         matches(x)
@@ -724,7 +727,7 @@ export class SystemForEmbassy implements System {
   private async properties(
     effects: HostSystemStartOs,
     timeoutMs: number | null,
-  ): Promise<ReturnType<T.ExpectedExports.Properties>> {
+  ): Promise<ReturnType<T.ExpectedExports.properties>> {
     // TODO BLU-J set the properties ever so often
     const setConfigValue = this.manifest.properties
     if (!setConfigValue) throw new Error("There is no properties")
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 7549bf0f2..bf27f222d 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -1,20 +1,23 @@
 import { ExecuteResult, System } from "../../Interfaces/System"
 import { unNestPath } from "../../Models/JsonPath"
-import { string } from "ts-matches"
+import matches, { any, number, object, string, tuple } from "ts-matches"
 import { HostSystemStartOs } from "../HostSystemStartOs"
 import { Effects } from "../../Models/Effects"
-import { RpcResult } from "../RpcListener"
+import { RpcResult, matchRpcResult } from "../RpcListener"
 import { duration } from "../../Models/Duration"
-const LOCATION = "/usr/lib/startos/package/startos"
+import { T } from "@start9labs/start-sdk"
+import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+export const STARTOS_JS_LOCATION = "/usr/lib/startos/package/index.js"
 export class SystemForStartOs implements System {
   private onTerm: (() => Promise<void>) | undefined
   static of() {
-    return new SystemForStartOs()
+    return new SystemForStartOs(require(STARTOS_JS_LOCATION))
   }
-  constructor() {}
+  constructor(readonly abi: T.ABI) {}
   async execute(
     effects: HostSystemStartOs,
     options: {
+      id: string
       procedure:
         | "/init"
         | "/uninit"
@@ -33,7 +36,61 @@ export class SystemForStartOs implements System {
       timeout?: number | undefined
     },
   ): Promise<RpcResult> {
-    return { result: await this._execute(effects, options) }
+    effects = Object.create(effects)
+    effects.procedureId = options.id
+    return this._execute(effects, options)
+      .then((x) =>
+        matches(x)
+          .when(
+            object({
+              result: any,
+            }),
+            (x) => x,
+          )
+          .when(
+            object({
+              error: string,
+            }),
+            (x) => ({
+              error: {
+                code: 0,
+                message: x.error,
+              },
+            }),
+          )
+          .when(
+            object({
+              "error-code": tuple(number, string),
+            }),
+            ({ "error-code": [code, message] }) => ({
+              error: {
+                code,
+                message,
+              },
+            }),
+          )
+          .defaultTo({ result: x }),
+      )
+      .catch((error: unknown) => {
+        if (error instanceof Error)
+          return {
+            error: {
+              code: 0,
+              message: error.name,
+              data: {
+                details: error.message,
+                debug: `${error?.cause ?? "[noCause]"}:${error?.stack ?? "[noStack]"}`,
+              },
+            },
+          }
+        if (matchRpcResult.test(error)) return error
+        return {
+          error: {
+            code: 0,
+            message: String(error),
+          },
+        }
+      })
   }
   async _execute(
     effects: Effects,
@@ -58,26 +115,27 @@ export class SystemForStartOs implements System {
   ): Promise<unknown> {
     switch (options.procedure) {
       case "/init": {
-        const path = `${LOCATION}/procedures/init`
-        const procedure: any = await import(path).catch(() => require(path))
-        const previousVersion = string.optional().unsafeCast(options)
-        return procedure.init({ effects, previousVersion })
+        const previousVersion =
+          string.optional().unsafeCast(options.input) || null
+        return this.abi.init({ effects, previousVersion })
       }
       case "/uninit": {
-        const path = `${LOCATION}/procedures/init`
-        const procedure: any = await import(path).catch(() => require(path))
-        const nextVersion = string.optional().unsafeCast(options)
-        return procedure.uninit({ effects, nextVersion })
+        const nextVersion = string.optional().unsafeCast(options.input) || null
+        return this.abi.uninit({ effects, nextVersion })
       }
       case "/main/start": {
-        const path = `${LOCATION}/procedures/main`
-        const procedure: any = await import(path).catch(() => require(path))
         const started = async (onTerm: () => Promise<void>) => {
           await effects.setMainStatus({ status: "running" })
           if (this.onTerm) await this.onTerm()
           this.onTerm = onTerm
         }
-        return procedure.main({ effects, started })
+        const daemons = await (
+          await this.abi.main({
+            effects: { ...effects, _type: "main" },
+            started,
+          })
+        ).build()
+        this.onTerm = daemons.term
       }
       case "/main/stop": {
         await effects.setMainStatus({ status: "stopped" })
@@ -86,67 +144,50 @@ export class SystemForStartOs implements System {
         return duration(30, "s")
       }
       case "/config/set": {
-        const path = `${LOCATION}/procedures/config`
-        const procedure: any = await import(path).catch(() => require(path))
-        const input = options.input
-        return procedure.setConfig({ effects, input })
+        const input = options.input as any // TODO
+        return this.abi.setConfig({ effects, input })
       }
       case "/config/get": {
-        const path = `${LOCATION}/procedures/config`
-        const procedure: any = await import(path).catch(() => require(path))
-        return procedure.getConfig({ effects })
+        return this.abi.getConfig({ effects })
       }
       case "/backup/create":
       case "/backup/restore":
         throw new Error("this should be called with the init/unit")
       case "/actions/metadata": {
-        const path = `${LOCATION}/procedures/actions`
-        const procedure: any = await import(path).catch(() => require(path))
-        return procedure.actionsMetadata({ effects })
+        return this.abi.actionsMetadata({ effects })
       }
       default:
         const procedures = unNestPath(options.procedure)
         const id = procedures[2]
         switch (true) {
           case procedures[1] === "actions" && procedures[3] === "get": {
-            const path = `${LOCATION}/procedures/actions`
-            const action: any = (await import(path).catch(() => require(path)))
-              .actions[id]
+            const action = (await this.abi.actions({ effects }))[id]
             if (!action) throw new Error(`Action ${id} not found`)
-            return action.get({ effects })
+            return action.getConfig({ effects })
           }
           case procedures[1] === "actions" && procedures[3] === "run": {
-            const path = `${LOCATION}/procedures/actions`
-            const action: any = (await import(path).catch(() => require(path)))
-              .actions[id]
+            const action = (await this.abi.actions({ effects }))[id]
             if (!action) throw new Error(`Action ${id} not found`)
-            const input = options.input
-            return action.run({ effects, input })
+            return action.run({ effects, input: options.input as any }) // TODO
           }
           case procedures[1] === "dependencies" && procedures[3] === "query": {
-            const path = `${LOCATION}/procedures/dependencies`
-            const dependencyConfig: any = (
-              await import(path).catch(() => require(path))
-            ).dependencyConfig[id]
+            const dependencyConfig = this.abi.dependencyConfig[id]
             if (!dependencyConfig)
               throw new Error(`dependencyConfig ${id} not found`)
             const localConfig = options.input
-            return dependencyConfig.query({ effects, localConfig })
+            return dependencyConfig.query({ effects })
           }
           case procedures[1] === "dependencies" && procedures[3] === "update": {
-            const path = `${LOCATION}/procedures/dependencies`
-            const dependencyConfig: any = (
-              await import(path).catch(() => require(path))
-            ).dependencyConfig[id]
+            const dependencyConfig = this.abi.dependencyConfig[id]
             if (!dependencyConfig)
               throw new Error(`dependencyConfig ${id} not found`)
-            return dependencyConfig.update(options.input)
+            return dependencyConfig.update(options.input as any) // TODO
           }
         }
     }
-    throw new Error("Method not implemented.")
+    throw new Error(`Method ${options.procedure} not implemented.`)
   }
-  exit(effects: Effects): Promise<void> {
-    throw new Error("Method not implemented.")
+  async exit(effects: Effects): Promise<void> {
+    return void null
   }
 }
diff --git a/container-runtime/src/Adapters/Systems/index.ts b/container-runtime/src/Adapters/Systems/index.ts
index eadc67318..a44ad533e 100644
--- a/container-runtime/src/Adapters/Systems/index.ts
+++ b/container-runtime/src/Adapters/Systems/index.ts
@@ -1,6 +1,22 @@
+import * as fs from "node:fs/promises"
 import { System } from "../../Interfaces/System"
-import { SystemForEmbassy } from "./SystemForEmbassy"
-import { SystemForStartOs } from "./SystemForStartOs"
+import { EMBASSY_JS_LOCATION, SystemForEmbassy } from "./SystemForEmbassy"
+import { STARTOS_JS_LOCATION, SystemForStartOs } from "./SystemForStartOs"
 export async function getSystem(): Promise<System> {
-  return SystemForEmbassy.of()
+  if (
+    await fs.access(STARTOS_JS_LOCATION).then(
+      () => true,
+      () => false,
+    )
+  ) {
+    return SystemForStartOs.of()
+  } else if (
+    await fs.access(EMBASSY_JS_LOCATION).then(
+      () => true,
+      () => false,
+    )
+  ) {
+    return SystemForEmbassy.of()
+  }
+  throw new Error(`${STARTOS_JS_LOCATION} not found`)
 }
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
index 86b2aa492..85ba0fb0f 100644
--- a/container-runtime/src/Interfaces/System.ts
+++ b/container-runtime/src/Interfaces/System.ts
@@ -14,6 +14,7 @@ export interface System {
   execute(
     effects: T.Effects,
     options: {
+      id: string
       procedure: JsonPath
       input: unknown
       timeout?: number
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 4ae02e98e..cf10152c2 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -387,6 +387,22 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "backhand"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f2fc1bc7bb7fd449e02000cc1592cc63dcdcd61710f8b9efe32bab2d1784603"
+dependencies = [
+ "deku",
+ "flate2",
+ "rustc-hash",
+ "thiserror",
+ "tracing",
+ "xz2",
+ "zstd",
+ "zstd-safe",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.71"
@@ -588,6 +604,11 @@ name = "cc"
 version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+dependencies = [
+ "jobserver",
+ "libc",
+ "once_cell",
+]
 
 [[package]]
 name = "cfg-if"
@@ -1058,12 +1079,6 @@ dependencies = [
  "cipher 0.3.0",
 ]
 
-[[package]]
-name = "current_platform"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a74858bcfe44b22016cb49337d7b6f04618c58e5dbfdef61b06b8c434324a0bc"
-
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -1146,6 +1161,31 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
+[[package]]
+name = "deku"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "709ade444d53896e60f6265660eb50480dd08b77bfc822e5dcc233b88b0b2fba"
+dependencies = [
+ "bitvec",
+ "deku_derive",
+ "no_std_io",
+ "rustversion",
+]
+
+[[package]]
+name = "deku_derive"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7534973f93f9de83203e41c8ddd32d230599fa73fa889f3deb1580ccd186913"
+dependencies = [
+ "darling",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "der"
 version = "0.7.9"
@@ -2405,6 +2445,15 @@ dependencies = [
  "jaq-parse",
 ]
 
+[[package]]
+name = "jobserver"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "josekit"
 version = "0.8.6"
@@ -2561,6 +2610,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "libyml"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e281a65eeba3d4503a2839252f86374528f9ceafe6fed97c1d3b52e1fb625c1"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.13"
@@ -2583,6 +2638,17 @@ version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -2788,6 +2854,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "no_std_io"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fa5f306a6f2c01b4fd172f29bb46195b1764061bf926c75e96ff55df3178208"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -3800,6 +3875,12 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -3895,9 +3976,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "rusty-fork"
@@ -3929,9 +4010,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -4015,9 +4096,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.200"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
@@ -4041,9 +4122,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.200"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4052,9 +4133,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "indexmap 2.2.6",
  "itoa",
@@ -4124,16 +4205,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
+name = "serde_yml"
+version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+checksum = "78ce6afeda22f0b55dde2c34897bce76a629587348480384231205c14b59a01f"
 dependencies = [
  "indexmap 2.2.6",
  "itoa",
+ "libyml",
+ "log",
+ "memchr",
  "ryu",
  "serde",
- "unsafe-libyaml",
+ "serde_json",
+ "tempfile",
 ]
 
 [[package]]
@@ -4600,6 +4685,7 @@ dependencies = [
  "async-trait",
  "axum 0.7.5",
  "axum-server",
+ "backhand",
  "base32",
  "base64 0.21.7",
  "base64ct",
@@ -4614,7 +4700,6 @@ dependencies = [
  "console-subscriber",
  "cookie 0.18.1",
  "cookie_store",
- "current_platform",
  "der",
  "digest 0.10.7",
  "divrem",
@@ -4681,7 +4766,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "serde_with",
- "serde_yaml",
+ "serde_yml",
  "sha2 0.10.8",
  "shell-words",
  "simple-logging",
@@ -5537,12 +5622,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -5993,6 +6072,15 @@ dependencies = [
  "rustix",
 ]
 
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
+
 [[package]]
 name = "yajrc"
 version = "0.1.3"
@@ -6056,3 +6144,31 @@ dependencies = [
  "quote",
  "syn 2.0.60",
 ]
+
+[[package]]
+name = "zstd"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.10+zstd.1.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index bd064a167..3ad4f9eeb 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -59,6 +59,7 @@ async-stream = "0.3.5"
 async-trait = "0.1.74"
 axum = { version = "0.7.3", features = ["ws"] }
 axum-server = "0.6.0"
+backhand = "0.18.0"
 base32 = "0.4.0"
 base64 = "0.21.4"
 base64ct = "1.6.0"
@@ -72,7 +73,6 @@ console = "0.15.7"
 console-subscriber = { version = "0.2", optional = true }
 cookie = "0.18.0"
 cookie_store = "0.20.0"
-current_platform = "0.2.0"
 der = { version = "0.7.9", features = ["derive", "pem"] }
 digest = "0.10.7"
 divrem = "1.0.0"
@@ -154,7 +154,7 @@ serde_json = "1.0"
 serde_toml = { package = "toml", version = "0.8.2" }
 serde_urlencoded = "0.7"
 serde_with = { version = "3.4.0", features = ["macros", "json"] }
-serde_yaml = "0.9.25"
+serde_yaml = { package = "serde_yml", version = "0.0.10" }
 sha2 = "0.10.2"
 shell-words = "1"
 simple-logging = "2.0.2"
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index 87ff317f8..e93af4a4d 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -8,6 +8,7 @@ use ts_rs::TS;
 use crate::config::Config;
 use crate::context::RpcContext;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::util::serde::{display_serializable, StdinDeserializable, WithIoFormat};
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -77,6 +78,7 @@ pub async fn action(
         .as_ref()
         .or_not_found(lazy_format!("Manager for {}", package_id))?
         .action(
+            Guid::new(),
             action_id,
             input.map(|c| to_value(&c)).transpose()?.unwrap_or_default(),
         )
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 4838f2ea2..d33320b78 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -178,6 +178,7 @@ pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<(
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct LoginParams {
     password: Option<PasswordType>,
     #[ts(skip)]
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 774b1f1cf..4753a4290 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -149,7 +149,6 @@ async fn restore_packages(
                 S9pk::open(
                     backup_dir.path().join(&id).with_extension("s9pk"),
                     Some(&id),
-                    true,
                 )
                 .await?,
                 Some(backup_dir),
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index e61517794..01309a16f 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -16,6 +16,7 @@ use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::util::serde::{HandlerExtSerde, StdinDeserializable};
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
@@ -156,7 +157,7 @@ pub async fn get(ctx: RpcContext, _: Empty, id: PackageId) -> Result<ConfigRes,
         .await
         .as_ref()
         .or_not_found(lazy_format!("Manager for {id}"))?
-        .get_config()
+        .get_config(Guid::new())
         .await
 }
 
@@ -218,7 +219,7 @@ pub async fn set_impl(
                 ErrorKind::Unknown,
             )
         })?
-        .configure(configure_context)
+        .configure(Guid::new(), configure_context)
         .await?;
     Ok(())
 }
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
index bc2da00e2..7b4865301 100644
--- a/core/startos/src/context/config.rs
+++ b/core/startos/src/context/config.rs
@@ -93,26 +93,28 @@ impl ClientConfig {
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct ServerConfig {
-    #[arg(short = 'c', long = "config")]
+    #[arg(short, long)]
     pub config: Option<PathBuf>,
-    #[arg(long = "ethernet-interface")]
+    #[arg(long)]
     pub ethernet_interface: Option<String>,
     #[arg(skip)]
     pub os_partitions: Option<OsPartitionInfo>,
-    #[arg(long = "bind-rpc")]
+    #[arg(long)]
     pub bind_rpc: Option<SocketAddr>,
-    #[arg(long = "tor-control")]
+    #[arg(long)]
     pub tor_control: Option<SocketAddr>,
-    #[arg(long = "tor-socks")]
+    #[arg(long)]
     pub tor_socks: Option<SocketAddr>,
-    #[arg(long = "dns-bind")]
+    #[arg(long)]
     pub dns_bind: Option<Vec<SocketAddr>>,
-    #[arg(long = "revision-cache-size")]
+    #[arg(long)]
     pub revision_cache_size: Option<usize>,
-    #[arg(short = 'd', long = "datadir")]
+    #[arg(short, long)]
     pub datadir: Option<PathBuf>,
-    #[arg(long = "disable-encryption")]
+    #[arg(long)]
     pub disable_encryption: Option<bool>,
+    #[arg(long)]
+    pub multi_arch_s9pks: Option<bool>,
 }
 impl ContextConfig for ServerConfig {
     fn next(&mut self) -> Option<PathBuf> {
@@ -131,6 +133,7 @@ impl ContextConfig for ServerConfig {
             .or(other.revision_cache_size);
         self.datadir = self.datadir.take().or(other.datadir);
         self.disable_encryption = self.disable_encryption.take().or(other.disable_encryption);
+        self.multi_arch_s9pks = self.multi_arch_s9pks.take().or(other.multi_arch_s9pks);
     }
 }
 
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index cf2d28085..a3e77a62c 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -43,6 +43,7 @@ pub struct RpcContextSeed {
     pub db: TypedPatchDb<Database>,
     pub account: RwLock<AccountInfo>,
     pub net_controller: Arc<NetController>,
+    pub s9pk_arch: Option<&'static str>,
     pub services: ServiceMap,
     pub metrics_cache: RwLock<Option<crate::system::Metrics>>,
     pub shutdown: broadcast::Sender<Option<Shutdown>>,
@@ -152,6 +153,11 @@ impl RpcContext {
             db,
             account: RwLock::new(account),
             net_controller,
+            s9pk_arch: if config.multi_arch_s9pks.unwrap_or(false) {
+                None
+            } else {
+                Some(crate::ARCH)
+            },
             services,
             metrics_cache,
             shutdown,
diff --git a/core/startos/src/control.rs b/core/startos/src/control.rs
index d4a595a61..e831e07d6 100644
--- a/core/startos/src/control.rs
+++ b/core/startos/src/control.rs
@@ -7,6 +7,7 @@ use ts_rs::TS;
 
 use crate::context::RpcContext;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::Error;
 
 #[derive(Deserialize, Serialize, Parser, TS)]
@@ -23,7 +24,7 @@ pub async fn start(ctx: RpcContext, ControlParams { id }: ControlParams) -> Resu
         .await
         .as_ref()
         .or_not_found(lazy_format!("Manager for {id}"))?
-        .start()
+        .start(Guid::new())
         .await?;
 
     Ok(())
@@ -36,7 +37,7 @@ pub async fn stop(ctx: RpcContext, ControlParams { id }: ControlParams) -> Resul
         .await
         .as_ref()
         .ok_or_else(|| Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest))?
-        .stop()
+        .stop(Guid::new())
         .await?;
 
     Ok(())
@@ -48,7 +49,7 @@ pub async fn restart(ctx: RpcContext, ControlParams { id }: ControlParams) -> Re
         .await
         .as_ref()
         .ok_or_else(|| Error::new(eyre!("Manager not found"), crate::ErrorKind::InvalidRequest))?
-        .restart()
+        .restart(Guid::new())
         .await?;
 
     Ok(())
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index a746a42c9..f6ccc53ad 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -13,6 +13,7 @@ use crate::config::{Config, ConfigSpec, ConfigureContext};
 use crate::context::RpcContext;
 use crate::db::model::package::CurrentDependencies;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::Error;
 
 pub fn dependency<C: Context>() -> ParentHandler<C> {
@@ -86,7 +87,7 @@ pub async fn configure_impl(
                 ErrorKind::Unknown,
             )
         })?
-        .configure(configure_context)
+        .configure(Guid::new(), configure_context)
         .await?;
     Ok(())
 }
@@ -103,14 +104,15 @@ pub async fn configure_logic(
     ctx: RpcContext,
     (dependent_id, dependency_id): (PackageId, PackageId),
 ) -> Result<ConfigDryRes, Error> {
+    let procedure_id = Guid::new();
     let dependency_guard = ctx.services.get(&dependency_id).await;
     let dependency = dependency_guard.as_ref().or_not_found(&dependency_id)?;
     let dependent_guard = ctx.services.get(&dependent_id).await;
     let dependent = dependent_guard.as_ref().or_not_found(&dependent_id)?;
-    let config_res = dependency.get_config().await?;
+    let config_res = dependency.get_config(procedure_id.clone()).await?;
     let diff = Value::Object(
         dependent
-            .dependency_config(dependency_id, config_res.config.clone())
+            .dependency_config(procedure_id, dependency_id, config_res.config.clone())
             .await?
             .unwrap_or_default(),
     );
@@ -129,6 +131,7 @@ pub async fn compute_dependency_config_errs(
     id: &PackageId,
     current_dependencies: &mut CurrentDependencies,
 ) -> Result<(), Error> {
+    let procedure_id = Guid::new();
     let service_guard = ctx.services.get(id).await;
     let service = service_guard.as_ref().or_not_found(id)?;
     for (dep_id, dep_info) in current_dependencies.0.iter_mut() {
@@ -137,10 +140,10 @@ pub async fn compute_dependency_config_errs(
             continue;
         };
 
-        let dep_config = dependency.get_config().await?.config;
+        let dep_config = dependency.get_config(procedure_id.clone()).await?.config;
 
         dep_info.config_satisfied = service
-            .dependency_config(dep_id.clone(), dep_config)
+            .dependency_config(procedure_id.clone(), dep_id.clone(), dep_config)
             .await?
             .is_none();
     }
diff --git a/core/startos/src/disk/mount/backup.rs b/core/startos/src/disk/mount/backup.rs
index 5dbd80db3..ad9f5090b 100644
--- a/core/startos/src/disk/mount/backup.rs
+++ b/core/startos/src/disk/mount/backup.rs
@@ -178,7 +178,6 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
         Ok(())
     }
 }
-#[async_trait::async_trait]
 impl<G: GenericMountGuard> GenericMountGuard for BackupMountGuard<G> {
     fn path(&self) -> &Path {
         if let Some(guard) = &self.encrypted_guard {
diff --git a/core/startos/src/disk/mount/filesystem/overlayfs.rs b/core/startos/src/disk/mount/filesystem/overlayfs.rs
index f96de7b11..5e40a21a1 100644
--- a/core/startos/src/disk/mount/filesystem/overlayfs.rs
+++ b/core/startos/src/disk/mount/filesystem/overlayfs.rs
@@ -6,8 +6,8 @@ use digest::generic_array::GenericArray;
 use digest::{Digest, OutputSizeUser};
 use sha2::Sha256;
 
-use crate::disk::mount::filesystem::{FileSystem, ReadOnly, ReadWrite};
-use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
+use crate::disk::mount::filesystem::{FileSystem, ReadWrite};
+use crate::disk::mount::guard::{GenericMountGuard, MountGuard};
 use crate::prelude::*;
 use crate::util::io::TmpDir;
 
@@ -94,17 +94,13 @@ impl<
 }
 
 #[derive(Debug)]
-pub struct OverlayGuard {
-    lower: Option<TmpMountGuard>,
+pub struct OverlayGuard<G: GenericMountGuard> {
+    lower: Option<G>,
     upper: Option<TmpDir>,
     inner_guard: MountGuard,
 }
-impl OverlayGuard {
-    pub async fn mount(
-        base: &impl FileSystem,
-        mountpoint: impl AsRef<Path>,
-    ) -> Result<Self, Error> {
-        let lower = TmpMountGuard::mount(base, ReadOnly).await?;
+impl<G: GenericMountGuard> OverlayGuard<G> {
+    pub async fn mount(lower: G, mountpoint: impl AsRef<Path>) -> Result<Self, Error> {
         let upper = TmpDir::new().await?;
         let inner_guard = MountGuard::mount(
             &OverlayFs::new(
@@ -140,16 +136,15 @@ impl OverlayGuard {
         }
     }
 }
-#[async_trait::async_trait]
-impl GenericMountGuard for OverlayGuard {
+impl<G: GenericMountGuard> GenericMountGuard for OverlayGuard<G> {
     fn path(&self) -> &Path {
         self.inner_guard.path()
     }
-    async fn unmount(mut self) -> Result<(), Error> {
+    async fn unmount(self) -> Result<(), Error> {
         self.unmount(false).await
     }
 }
-impl Drop for OverlayGuard {
+impl<G: GenericMountGuard> Drop for OverlayGuard<G> {
     fn drop(&mut self) {
         let lower = self.lower.take();
         let upper = self.upper.take();
diff --git a/core/startos/src/disk/mount/guard.rs b/core/startos/src/disk/mount/guard.rs
index d08b04881..4686a10b8 100644
--- a/core/startos/src/disk/mount/guard.rs
+++ b/core/startos/src/disk/mount/guard.rs
@@ -2,6 +2,7 @@ use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Weak};
 
+use futures::Future;
 use lazy_static::lazy_static;
 use models::ResultExt;
 use tokio::sync::Mutex;
@@ -14,23 +15,20 @@ use crate::Error;
 
 pub const TMP_MOUNTPOINT: &'static str = "/media/startos/tmp";
 
-#[async_trait::async_trait]
 pub trait GenericMountGuard: std::fmt::Debug + Send + Sync + 'static {
     fn path(&self) -> &Path;
-    async fn unmount(mut self) -> Result<(), Error>;
+    fn unmount(self) -> impl Future<Output = Result<(), Error>> + Send;
 }
 
-#[async_trait::async_trait]
 impl GenericMountGuard for Never {
     fn path(&self) -> &Path {
         match *self {}
     }
-    async fn unmount(mut self) -> Result<(), Error> {
+    async fn unmount(self) -> Result<(), Error> {
         match self {}
     }
 }
 
-#[async_trait::async_trait]
 impl<T> GenericMountGuard for Arc<T>
 where
     T: GenericMountGuard,
@@ -38,7 +36,7 @@ where
     fn path(&self) -> &Path {
         (&**self).path()
     }
-    async fn unmount(mut self) -> Result<(), Error> {
+    async fn unmount(self) -> Result<(), Error> {
         if let Ok(guard) = Arc::try_unwrap(self) {
             guard.unmount().await?;
         }
@@ -102,12 +100,11 @@ impl Drop for MountGuard {
         }
     }
 }
-#[async_trait::async_trait]
 impl GenericMountGuard for MountGuard {
     fn path(&self) -> &Path {
         &self.mountpoint
     }
-    async fn unmount(mut self) -> Result<(), Error> {
+    async fn unmount(self) -> Result<(), Error> {
         MountGuard::unmount(self, false).await
     }
 }
@@ -165,12 +162,11 @@ impl TmpMountGuard {
         std::mem::replace(self, unmounted)
     }
 }
-#[async_trait::async_trait]
 impl GenericMountGuard for TmpMountGuard {
     fn path(&self) -> &Path {
         self.guard.path()
     }
-    async fn unmount(mut self) -> Result<(), Error> {
+    async fn unmount(self) -> Result<(), Error> {
         self.guard.unmount().await
     }
 }
@@ -187,12 +183,11 @@ impl<G: GenericMountGuard> SubPath<G> {
         Self { guard, path }
     }
 }
-#[async_trait::async_trait]
 impl<G: GenericMountGuard> GenericMountGuard for SubPath<G> {
     fn path(&self) -> &Path {
         self.path.as_path()
     }
-    async fn unmount(mut self) -> Result<(), Error> {
+    async fn unmount(self) -> Result<(), Error> {
         self.guard.unmount().await
     }
 }
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 694d4e3a3..97c674ac5 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -242,7 +242,7 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
 
     let should_rebuild = tokio::fs::metadata(SYSTEM_REBUILD_PATH).await.is_ok()
         || &*server_info.version < &emver::Version::new(0, 3, 2, 0)
-        || (*ARCH == "x86_64" && &*server_info.version < &emver::Version::new(0, 3, 4, 0));
+        || (ARCH == "x86_64" && &*server_info.version < &emver::Version::new(0, 3, 4, 0));
 
     let log_dir = cfg.datadir().join("main/logs");
     if tokio::fs::metadata(&log_dir).await.is_err() {
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index c4e4452b7..bb7d1a02e 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -152,7 +152,6 @@ pub async fn install(
             .await?,
         ),
         None, // TODO
-        true,
     )
     .await?;
 
@@ -262,7 +261,6 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
         if let Err(e) = async {
             let s9pk = S9pk::deserialize(
                 &file, None, // TODO
-                true,
             )
             .await?;
             let _ = id_send.send(s9pk.as_manifest().id.clone());
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index d60a2db24..0e125af98 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -4,12 +4,8 @@ pub const CAP_1_KiB: usize = 1024;
 pub const CAP_1_MiB: usize = CAP_1_KiB * CAP_1_KiB;
 pub const CAP_10_MiB: usize = 10 * CAP_1_MiB;
 pub const HOST_IP: [u8; 4] = [172, 18, 0, 1];
-pub const TARGET: &str = current_platform::CURRENT_PLATFORM;
+pub use std::env::consts::ARCH;
 lazy_static::lazy_static! {
-    pub static ref ARCH: &'static str = {
-        let (arch, _) = TARGET.split_once("-").unwrap();
-        arch
-    };
     pub static ref PLATFORM: String = {
         if let Ok(platform) = std::fs::read_to_string("/usr/lib/startos/PLATFORM.txt") {
             platform
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index f64ecebe7..8d37120ba 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -29,7 +29,7 @@ use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
-use crate::disk::mount::filesystem::{MountType, ReadWrite};
+use crate::disk::mount::filesystem::{MountType, ReadOnly, ReadWrite};
 use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::disk::mount::util::unmount;
 use crate::prelude::*;
@@ -153,7 +153,7 @@ impl LxcManager {
 
 pub struct LxcContainer {
     manager: Weak<LxcManager>,
-    rootfs: OverlayGuard,
+    rootfs: OverlayGuard<TmpMountGuard>,
     pub guid: Arc<ContainerId>,
     rpc_bind: TmpMountGuard,
     log_mount: Option<MountGuard>,
@@ -184,12 +184,16 @@ impl LxcContainer {
             .invoke(ErrorKind::Filesystem)
             .await?;
         let rootfs = OverlayGuard::mount(
-            &IdMapped::new(
-                BlockDev::new("/usr/lib/startos/container-runtime/rootfs.squashfs"),
-                0,
-                100000,
-                65536,
-            ),
+            TmpMountGuard::mount(
+                &IdMapped::new(
+                    BlockDev::new("/usr/lib/startos/container-runtime/rootfs.squashfs"),
+                    0,
+                    100000,
+                    65536,
+                ),
+                ReadOnly,
+            )
+            .await?,
             &rootfs_dir,
         )
         .await?;
diff --git a/core/startos/src/os_install/gpt.rs b/core/startos/src/os_install/gpt.rs
index 4139b4cf2..01703083b 100644
--- a/core/startos/src/os_install/gpt.rs
+++ b/core/startos/src/os_install/gpt.rs
@@ -87,7 +87,7 @@ pub async fn partition(disk: &DiskInfo, overwrite: bool) -> Result<OsPartitionIn
             gpt.add_partition(
                 "root",
                 15 * 1024 * 1024 * 1024,
-                match *crate::ARCH {
+                match crate::ARCH {
                     "x86_64" => gpt::partition_types::LINUX_ROOT_X64,
                     "aarch64" => gpt::partition_types::LINUX_ROOT_ARM_64,
                     _ => gpt::partition_types::LINUX_FS,
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index c3931b236..4e5c7ed15 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -366,7 +366,7 @@ pub async fn execute<C: Context>(
     if tokio::fs::metadata("/sys/firmware/efi").await.is_err() {
         install.arg("--target=i386-pc");
     } else {
-        match *ARCH {
+        match ARCH {
             "x86_64" => install.arg("--target=x86_64-efi"),
             "aarch64" => install.arg("--target=arm64-efi"),
             _ => &mut install,
diff --git a/core/startos/src/registry/device_info.rs b/core/startos/src/registry/device_info.rs
index 7da5bd8b9..51d6ac46b 100644
--- a/core/startos/src/registry/device_info.rs
+++ b/core/startos/src/registry/device_info.rs
@@ -134,7 +134,7 @@ pub struct HardwareInfo {
 impl From<&RpcContext> for HardwareInfo {
     fn from(value: &RpcContext) -> Self {
         Self {
-            arch: InternedString::intern(&**crate::ARCH),
+            arch: InternedString::intern(crate::ARCH),
             ram: value.hardware.ram,
             devices: value
                 .hardware
diff --git a/core/startos/src/registry/package/add.rs b/core/startos/src/registry/package/add.rs
index 6a1050b99..d28aeaaa4 100644
--- a/core/startos/src/registry/package/add.rs
+++ b/core/startos/src/registry/package/add.rs
@@ -53,7 +53,6 @@ pub async fn add_package(
     let s9pk = S9pk::deserialize(
         &Arc::new(HttpSource::new(ctx.client.clone(), url.clone()).await?),
         Some(&commitment),
-        false,
     )
     .await?;
 
@@ -109,7 +108,7 @@ pub async fn cli_add_package(
         ..
     }: HandlerArgs<CliContext, CliAddPackageParams>,
 ) -> Result<(), Error> {
-    let s9pk = S9pk::open(&file, None, false).await?;
+    let s9pk = S9pk::open(&file, None).await?;
 
     let mut progress = FullProgressTracker::new();
     let progress_handle = progress.handle();
@@ -143,7 +142,6 @@ pub async fn cli_add_package(
     let mut src = S9pk::deserialize(
         &Arc::new(HttpSource::new(ctx.client.clone(), url.clone()).await?),
         Some(&commitment),
-        false,
     )
     .await?;
     src.serialize(&mut TrackingIO::new(0, tokio::io::sink()), true)
diff --git a/core/startos/src/rpc_continuations.rs b/core/startos/src/rpc_continuations.rs
index ce8bf43fd..e6b823ef9 100644
--- a/core/startos/src/rpc_continuations.rs
+++ b/core/startos/src/rpc_continuations.rs
@@ -39,6 +39,11 @@ impl Guid {
         Some(Guid(InternedString::intern(r)))
     }
 }
+impl Default for Guid {
+    fn default() -> Self {
+        Self::new()
+    }
+}
 impl AsRef<str> for Guid {
     fn as_ref(&self) -> &str {
         self.0.as_ref()
diff --git a/core/startos/src/s9pk/merkle_archive/directory_contents.rs b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
index 77c3582d9..c5e5c4a7d 100644
--- a/core/startos/src/s9pk/merkle_archive/directory_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
@@ -211,7 +211,10 @@ impl<S: FileSource + Clone> DirectoryContents<S> {
                 if !filter(path) {
                     if v.hash.is_none() {
                         return Err(Error::new(
-                            eyre!("cannot filter out unhashed file, run `update_hashes` first"),
+                            eyre!(
+                                "cannot filter out unhashed file {}, run `update_hashes` first",
+                                path.display()
+                            ),
                             ErrorKind::InvalidRequest,
                         ));
                     }
diff --git a/core/startos/src/s9pk/merkle_archive/expected.rs b/core/startos/src/s9pk/merkle_archive/expected.rs
new file mode 100644
index 000000000..a0f095b7a
--- /dev/null
+++ b/core/startos/src/s9pk/merkle_archive/expected.rs
@@ -0,0 +1,103 @@
+
+use std::ffi::OsStr;
+use std::path::Path;
+
+use crate::prelude::*;
+use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
+use crate::s9pk::merkle_archive::source::FileSource;
+use crate::s9pk::merkle_archive::Entry;
+
+/// An object for tracking the files expected to be in an s9pk 
+pub struct Expected<'a, T> {
+    keep: DirectoryContents<()>,
+    dir: &'a DirectoryContents<T>,
+}
+impl<'a, T> Expected<'a, T> {
+    pub fn new(dir: &'a DirectoryContents<T>,) -> Self {
+        Self {
+            keep: DirectoryContents::new(),
+            dir
+        }
+    }
+}
+impl<'a, T: Clone> Expected<'a, T> {
+    pub fn check_file(&mut self, path: impl AsRef<Path>) -> Result<(), Error> {
+        if self
+            .dir
+            .get_path(path.as_ref())
+            .and_then(|e| e.as_file())
+            .is_some()
+        {
+            self.keep.insert_path(path, Entry::file(()))?;
+            Ok(())
+        } else {
+            Err(Error::new(
+                eyre!("file {} missing from archive", path.as_ref().display()),
+                ErrorKind::ParseS9pk,
+            ))
+        }
+    }
+    pub fn check_stem(
+        &mut self,
+        path: impl AsRef<Path>,
+        mut valid_extension: impl FnMut(Option<&OsStr>) -> bool,
+    ) -> Result<(), Error> {
+        let (dir, stem) = if let Some(parent) = path.as_ref().parent().filter(|p| *p != Path::new("")) {
+            (
+                self.dir
+                    .get_path(parent)
+                    .and_then(|e| e.as_directory())
+                    .ok_or_else(|| {
+                        Error::new(
+                            eyre!("directory {} missing from archive", parent.display()),
+                            ErrorKind::ParseS9pk,
+                        )
+                    })?,
+                path.as_ref().strip_prefix(parent).unwrap(),
+            )
+        } else {
+            (self.dir, path.as_ref())
+        };
+        let name = dir
+            .with_stem(&stem.as_os_str().to_string_lossy())
+            .filter(|(_, e)| e.as_file().is_some())
+            .try_fold(
+                Err(Error::new(
+                    eyre!(
+                        "file {} with valid extension missing from archive",
+                        path.as_ref().display()
+                    ),
+                    ErrorKind::ParseS9pk,
+                )),
+                |acc, (name, _)| 
+                    if valid_extension(Path::new(&*name).extension()) {
+                        match acc {
+                            Ok(_) => Err(Error::new(
+                                eyre!(
+                                    "more than one file matching {} with valid extension in archive",
+                                    path.as_ref().display()
+                                ),
+                                ErrorKind::ParseS9pk,
+                            )),
+                            Err(_) => Ok(Ok(name))
+                        }
+                    } else {
+                        Ok(acc)
+                    }
+            )??;
+        self.keep
+            .insert_path(path.as_ref().with_file_name(name), Entry::file(()))?;
+        Ok(())
+    }
+    pub fn into_filter(self) -> Filter {
+        Filter(self.keep)
+    }
+}
+
+pub struct Filter(DirectoryContents<()>);
+impl Filter {
+    pub fn keep_checked<T: FileSource + Clone>(&self, dir: &mut DirectoryContents<T>) -> Result<(), Error> {
+        dir.filter(|path| self.0.get_path(path).is_some())
+    }
+}
+
diff --git a/core/startos/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
index 1c0d6b786..00ead65c5 100644
--- a/core/startos/src/s9pk/merkle_archive/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/mod.rs
@@ -19,6 +19,7 @@ use crate::util::serde::Base64;
 use crate::CAP_1_MiB;
 
 pub mod directory_contents;
+pub mod expected;
 pub mod file_contents;
 pub mod hash;
 pub mod sink;
@@ -217,6 +218,9 @@ impl<S> Entry<S> {
     pub fn file(source: S) -> Self {
         Self::new(EntryContents::File(FileContents::new(source)))
     }
+    pub fn directory(directory: DirectoryContents<S>) -> Self {
+        Self::new(EntryContents::Directory(directory))
+    }
     pub fn hash(&self) -> Option<(Hash, u64)> {
         self.hash
     }
diff --git a/core/startos/src/s9pk/merkle_archive/source/mod.rs b/core/startos/src/s9pk/merkle_archive/source/mod.rs
index f6922d109..0a00b18dd 100644
--- a/core/startos/src/s9pk/merkle_archive/source/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/mod.rs
@@ -280,3 +280,8 @@ impl<S: ArchiveSource> FileSource for Section<S> {
         self.source.copy_to(self.position, self.size, w).await
     }
 }
+
+pub type DynRead = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
+pub fn into_dyn_read<R: AsyncRead + Unpin + Send + Sync + 'static>(r: R) -> DynRead {
+    Box::new(r)
+}
diff --git a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
index 9cc162f0e..92eb40f9d 100644
--- a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
@@ -97,7 +97,7 @@ impl ArchiveSource for MultiCursorFile {
             .ok()
             .map(|m| m.len())
     }
-    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send + 'static, Error> {
         use tokio::io::AsyncSeekExt;
 
         let mut file = self.cursor().await?;
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index 89cfc9b5a..fac9e6724 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -1,32 +1,26 @@
-use std::collections::BTreeSet;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
+use std::path::PathBuf;
 
 use clap::Parser;
-use itertools::Itertools;
 use models::ImageId;
 use rpc_toolkit::{from_fn_async, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::fs::File;
-use tokio::process::Command;
 use ts_rs::TS;
 
 use crate::context::CliContext;
 use crate::prelude::*;
 use crate::s9pk::manifest::Manifest;
-use crate::s9pk::merkle_archive::source::DynFileSource;
-use crate::s9pk::merkle_archive::Entry;
-use crate::s9pk::v2::compat::CONTAINER_TOOL;
+use crate::s9pk::v2::pack::ImageConfig;
 use crate::s9pk::v2::SIG_CONTEXT;
 use crate::s9pk::S9pk;
 use crate::util::io::TmpDir;
 use crate::util::serde::{apply_expr, HandlerExtSerde};
-use crate::util::Invoke;
 
 pub const SKIP_ENV: &[&str] = &["TERM", "container", "HOME", "HOSTNAME"];
 
 pub fn s9pk() -> ParentHandler<CliContext> {
     ParentHandler::new()
+        .subcommand("pack", from_fn_async(super::v2::pack::pack).no_display())
         .subcommand("edit", edit())
         .subcommand("inspect", inspect())
 }
@@ -77,117 +71,21 @@ fn inspect() -> ParentHandler<CliContext, S9pkPath> {
 #[derive(Deserialize, Serialize, Parser, TS)]
 struct AddImageParams {
     id: ImageId,
-    image: String,
-    arches: Option<Vec<String>>,
+    #[command(flatten)]
+    config: ImageConfig,
 }
 async fn add_image(
     ctx: CliContext,
-    AddImageParams { id, image, arches }: AddImageParams,
+    AddImageParams { id, config }: AddImageParams,
     S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<(), Error> {
-    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?, false)
+    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?)
         .await?
         .into_dyn();
-    let arches: BTreeSet<_> = arches
-        .unwrap_or_else(|| vec!["x86_64".to_owned(), "aarch64".to_owned()])
-        .into_iter()
-        .collect();
+    s9pk.as_manifest_mut().images.insert(id, config);
     let tmpdir = TmpDir::new().await?;
-    for arch in arches {
-        let sqfs_path = tmpdir.join(format!("image.{arch}.squashfs"));
-        let docker_platform = if arch == "x86_64" {
-            "--platform=linux/amd64".to_owned()
-        } else if arch == "aarch64" {
-            "--platform=linux/arm64".to_owned()
-        } else {
-            format!("--platform=linux/{arch}")
-        };
-        let env = String::from_utf8(
-            Command::new(CONTAINER_TOOL)
-                .arg("run")
-                .arg("--rm")
-                .arg(&docker_platform)
-                .arg("--entrypoint")
-                .arg("env")
-                .arg(&image)
-                .invoke(ErrorKind::Docker)
-                .await?,
-        )?
-        .lines()
-        .filter(|l| {
-            l.trim()
-                .split_once("=")
-                .map_or(false, |(v, _)| !SKIP_ENV.contains(&v))
-        })
-        .join("\n")
-            + "\n";
-        let workdir = Path::new(
-            String::from_utf8(
-                Command::new(CONTAINER_TOOL)
-                    .arg("run")
-                    .arg(&docker_platform)
-                    .arg("--rm")
-                    .arg("--entrypoint")
-                    .arg("pwd")
-                    .arg(&image)
-                    .invoke(ErrorKind::Docker)
-                    .await?,
-            )?
-            .trim(),
-        )
-        .to_owned();
-        let container_id = String::from_utf8(
-            Command::new(CONTAINER_TOOL)
-                .arg("create")
-                .arg(&docker_platform)
-                .arg(&image)
-                .invoke(ErrorKind::Docker)
-                .await?,
-        )?;
-        Command::new("bash")
-            .arg("-c")
-            .arg(format!(
-                "{CONTAINER_TOOL} export {container_id} | mksquashfs - {sqfs} -tar",
-                container_id = container_id.trim(),
-                sqfs = sqfs_path.display()
-            ))
-            .invoke(ErrorKind::Docker)
-            .await?;
-        Command::new(CONTAINER_TOOL)
-            .arg("rm")
-            .arg(container_id.trim())
-            .invoke(ErrorKind::Docker)
-            .await?;
-        let archive = s9pk.as_archive_mut();
-        archive.set_signer(ctx.developer_key()?.clone(), SIG_CONTEXT);
-        archive.contents_mut().insert_path(
-            Path::new("images")
-                .join(&arch)
-                .join(&id)
-                .with_extension("squashfs"),
-            Entry::file(DynFileSource::new(sqfs_path)),
-        )?;
-        archive.contents_mut().insert_path(
-            Path::new("images")
-                .join(&arch)
-                .join(&id)
-                .with_extension("env"),
-            Entry::file(DynFileSource::new(Arc::<[u8]>::from(Vec::from(env)))),
-        )?;
-        archive.contents_mut().insert_path(
-            Path::new("images")
-                .join(&arch)
-                .join(&id)
-                .with_extension("json"),
-            Entry::file(DynFileSource::new(Arc::<[u8]>::from(
-                serde_json::to_vec(&serde_json::json!({
-                    "workdir": workdir
-                }))
-                .with_kind(ErrorKind::Serialization)?,
-            ))),
-        )?;
-    }
-    s9pk.as_manifest_mut().images.insert(id);
+    s9pk.load_images(&tmpdir).await?;
+    s9pk.validate_and_filter(None)?;
     let tmp_path = s9pk_path.with_extension("s9pk.tmp");
     let mut tmp_file = File::create(&tmp_path).await?;
     s9pk.serialize(&mut tmp_file, true).await?;
@@ -206,7 +104,7 @@ async fn edit_manifest(
     EditManifestParams { expression }: EditManifestParams,
     S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<Manifest, Error> {
-    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?, false).await?;
+    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?).await?;
     let old = serde_json::to_value(s9pk.as_manifest()).with_kind(ErrorKind::Serialization)?;
     *s9pk.as_manifest_mut() = serde_json::from_value(apply_expr(old.into(), &expression)?.into())
         .with_kind(ErrorKind::Serialization)?;
@@ -227,7 +125,7 @@ async fn file_tree(
     _: Empty,
     S9pkPath { s9pk }: S9pkPath,
 ) -> Result<Vec<PathBuf>, Error> {
-    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?, false).await?;
+    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
     Ok(s9pk.as_archive().contents().file_paths(""))
 }
 
@@ -244,7 +142,7 @@ async fn cat(
 ) -> Result<(), Error> {
     use crate::s9pk::merkle_archive::source::FileSource;
 
-    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?, false).await?;
+    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
     tokio::io::copy(
         &mut s9pk
             .as_archive()
@@ -266,6 +164,6 @@ async fn inspect_manifest(
     _: Empty,
     S9pkPath { s9pk }: S9pkPath,
 ) -> Result<Manifest, Error> {
-    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?, false).await?;
+    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
     Ok(s9pk.as_manifest().clone())
 }
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 5d4ad2f44..835c86b87 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -1,6 +1,5 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::io::Cursor;
-use std::path::{Path, PathBuf};
+use std::collections::BTreeMap;
+use std::path::Path;
 use std::sync::Arc;
 
 use itertools::Itertools;
@@ -14,49 +13,18 @@ use crate::prelude::*;
 use crate::s9pk::manifest::Manifest;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::s9pk::merkle_archive::source::{FileSource, Section};
+use crate::s9pk::merkle_archive::source::Section;
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
 use crate::s9pk::rpc::SKIP_ENV;
 use crate::s9pk::v1::manifest::{Manifest as ManifestV1, PackageProcedure};
 use crate::s9pk::v1::reader::S9pkReader;
+use crate::s9pk::v2::pack::{PackSource, CONTAINER_TOOL};
 use crate::s9pk::v2::{S9pk, SIG_CONTEXT};
 use crate::util::io::TmpDir;
 use crate::util::Invoke;
 
 pub const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x01];
 
-#[cfg(not(feature = "docker"))]
-pub const CONTAINER_TOOL: &str = "podman";
-
-#[cfg(feature = "docker")]
-pub const CONTAINER_TOOL: &str = "docker";
-
-type DynRead = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
-fn into_dyn_read<R: AsyncRead + Unpin + Send + Sync + 'static>(r: R) -> DynRead {
-    Box::new(r)
-}
-
-#[derive(Clone)]
-enum CompatSource {
-    Buffered(Arc<[u8]>),
-    File(PathBuf),
-}
-impl FileSource for CompatSource {
-    type Reader = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
-    async fn size(&self) -> Result<u64, Error> {
-        match self {
-            Self::Buffered(a) => Ok(a.len() as u64),
-            Self::File(f) => Ok(tokio::fs::metadata(f).await?.len()),
-        }
-    }
-    async fn reader(&self) -> Result<Self::Reader, Error> {
-        match self {
-            Self::Buffered(a) => Ok(into_dyn_read(Cursor::new(a.clone()))),
-            Self::File(f) => Ok(into_dyn_read(File::open(f).await?)),
-        }
-    }
-}
-
 impl S9pk<Section<MultiCursorFile>> {
     #[instrument(skip_all)]
     pub async fn from_v1<R: AsyncRead + AsyncSeek + Unpin + Send + Sync>(
@@ -66,7 +34,7 @@ impl S9pk<Section<MultiCursorFile>> {
     ) -> Result<Self, Error> {
         let scratch_dir = TmpDir::new().await?;
 
-        let mut archive = DirectoryContents::<CompatSource>::new();
+        let mut archive = DirectoryContents::<PackSource>::new();
 
         // manifest.json
         let manifest_raw = reader.manifest().await?;
@@ -88,21 +56,21 @@ impl S9pk<Section<MultiCursorFile>> {
         let license: Arc<[u8]> = reader.license().await?.to_vec().await?.into();
         archive.insert_path(
             "LICENSE.md",
-            Entry::file(CompatSource::Buffered(license.into())),
+            Entry::file(PackSource::Buffered(license.into())),
         )?;
 
         // instructions.md
         let instructions: Arc<[u8]> = reader.instructions().await?.to_vec().await?.into();
         archive.insert_path(
             "instructions.md",
-            Entry::file(CompatSource::Buffered(instructions.into())),
+            Entry::file(PackSource::Buffered(instructions.into())),
         )?;
 
         // icon.md
         let icon: Arc<[u8]> = reader.icon().await?.to_vec().await?.into();
         archive.insert_path(
             format!("icon.{}", manifest.assets.icon_type()),
-            Entry::file(CompatSource::Buffered(icon.into())),
+            Entry::file(PackSource::Buffered(icon.into())),
         )?;
 
         // images
@@ -122,7 +90,9 @@ impl S9pk<Section<MultiCursorFile>> {
                 .invoke(ErrorKind::Docker)
                 .await?;
             for (image, system) in &images {
-                new_manifest.images.insert(image.clone());
+                let mut image_config = new_manifest.images.remove(image).unwrap_or_default();
+                image_config.arch.insert(arch.as_str().into());
+                new_manifest.images.insert(image.clone(), image_config);
                 let sqfs_path = images_dir.join(image).with_extension("squashfs");
                 let image_name = if *system {
                     format!("start9/{}:latest", image)
@@ -190,21 +160,21 @@ impl S9pk<Section<MultiCursorFile>> {
                         .join(&arch)
                         .join(&image)
                         .with_extension("squashfs"),
-                    Entry::file(CompatSource::File(sqfs_path)),
+                    Entry::file(PackSource::File(sqfs_path)),
                 )?;
                 archive.insert_path(
                     Path::new("images")
                         .join(&arch)
                         .join(&image)
                         .with_extension("env"),
-                    Entry::file(CompatSource::Buffered(Vec::from(env).into())),
+                    Entry::file(PackSource::Buffered(Vec::from(env).into())),
                 )?;
                 archive.insert_path(
                     Path::new("images")
                         .join(&arch)
                         .join(&image)
                         .with_extension("json"),
-                    Entry::file(CompatSource::Buffered(
+                    Entry::file(PackSource::Buffered(
                         serde_json::to_vec(&serde_json::json!({
                             "workdir": workdir
                         }))
@@ -240,7 +210,7 @@ impl S9pk<Section<MultiCursorFile>> {
                 .await?;
             archive.insert_path(
                 Path::new("assets").join(&asset_id),
-                Entry::file(CompatSource::File(sqfs_path)),
+                Entry::file(PackSource::File(sqfs_path)),
             )?;
         }
 
@@ -267,12 +237,12 @@ impl S9pk<Section<MultiCursorFile>> {
             .await?;
         archive.insert_path(
             Path::new("javascript.squashfs"),
-            Entry::file(CompatSource::File(sqfs_path)),
+            Entry::file(PackSource::File(sqfs_path)),
         )?;
 
         archive.insert_path(
             "manifest.json",
-            Entry::file(CompatSource::Buffered(
+            Entry::file(PackSource::Buffered(
                 serde_json::to_vec::<Manifest>(&new_manifest)
                     .with_kind(ErrorKind::Serialization)?
                     .into(),
@@ -289,7 +259,6 @@ impl S9pk<Section<MultiCursorFile>> {
         Ok(S9pk::deserialize(
             &MultiCursorFile::from(File::open(destination.as_ref()).await?),
             None,
-            false,
         )
         .await?)
     }
@@ -310,7 +279,7 @@ impl From<ManifestV1> for Manifest {
             marketing_site: value.marketing_site.unwrap_or_else(|| default_url.clone()),
             donation_url: value.donation_url,
             description: value.description,
-            images: BTreeSet::new(),
+            images: BTreeMap::new(),
             assets: value
                 .volumes
                 .iter()
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index b5ada621b..77e48c126 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -1,10 +1,11 @@
 use std::collections::{BTreeMap, BTreeSet};
+use std::path::Path;
 
 use color_eyre::eyre::eyre;
 use helpers::const_true;
 use imbl_value::InternedString;
 pub use models::PackageId;
-use models::{ImageId, VolumeId};
+use models::{mime, ImageId, VolumeId};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 use url::Url;
@@ -12,6 +13,9 @@ use url::Url;
 use crate::dependencies::Dependencies;
 use crate::prelude::*;
 use crate::s9pk::git_hash::GitHash;
+use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
+use crate::s9pk::merkle_archive::expected::{Expected, Filter};
+use crate::s9pk::v2::pack::ImageConfig;
 use crate::util::serde::Regex;
 use crate::util::VersionString;
 use crate::version::{Current, VersionT};
@@ -42,7 +46,7 @@ pub struct Manifest {
     #[ts(type = "string | null")]
     pub donation_url: Option<Url>,
     pub description: Description,
-    pub images: BTreeSet<ImageId>,
+    pub images: BTreeMap<ImageId, ImageConfig>,
     pub assets: BTreeSet<VolumeId>, // TODO: AssetsId
     pub volumes: BTreeSet<VolumeId>,
     #[serde(default)]
@@ -59,6 +63,83 @@ pub struct Manifest {
     #[serde(default = "const_true")]
     pub has_config: bool,
 }
+impl Manifest {
+    pub fn validate_for<'a, T: Clone>(
+        &self,
+        arch: Option<&str>,
+        archive: &'a DirectoryContents<T>,
+    ) -> Result<Filter, Error> {
+        let mut expected = Expected::new(archive);
+        expected.check_file("manifest.json")?;
+        expected.check_stem("icon", |ext| {
+            ext.and_then(|e| e.to_str())
+                .and_then(mime)
+                .map_or(false, |mime| mime.starts_with("image/"))
+        })?;
+        expected.check_file("LICENSE.md")?;
+        expected.check_file("instructions.md")?;
+        expected.check_file("javascript.squashfs")?;
+        for assets in &self.assets {
+            expected.check_file(Path::new("assets").join(assets).with_extension("squashfs"))?;
+        }
+        for (image_id, config) in &self.images {
+            let mut check_arch = |arch: &str| {
+                let mut arch = arch;
+                if let Err(e) = expected.check_file(
+                    Path::new("images")
+                        .join(arch)
+                        .join(image_id)
+                        .with_extension("squashfs"),
+                ) {
+                    if let Some(emulate_as) = &config.emulate_missing_as {
+                        expected.check_file(
+                            Path::new("images")
+                                .join(arch)
+                                .join(image_id)
+                                .with_extension("squashfs"),
+                        )?;
+                        arch = &**emulate_as;
+                    } else {
+                        return Err(e);
+                    }
+                }
+                expected.check_file(
+                    Path::new("images")
+                        .join(arch)
+                        .join(image_id)
+                        .with_extension("json"),
+                )?;
+                expected.check_file(
+                    Path::new("images")
+                        .join(arch)
+                        .join(image_id)
+                        .with_extension("env"),
+                )?;
+                Ok(())
+            };
+            if let Some(arch) = arch {
+                check_arch(arch)?;
+            } else if let Some(arches) = &self.hardware_requirements.arch {
+                for arch in arches {
+                    check_arch(arch)?;
+                }
+            } else if let Some(arch) = config.emulate_missing_as.as_deref() {
+                if !config.arch.contains(arch) {
+                    return Err(Error::new(
+                        eyre!("`emulateMissingAs` must match an included `arch`"),
+                        ErrorKind::ParseS9pk,
+                    ));
+                }
+                for arch in &config.arch {
+                    check_arch(&arch)?;
+                }
+            } else {
+                return Err(Error::new(eyre!("`emulateMissingAs` required for all images if no `arch` specified in `hardwareRequirements`"), ErrorKind::ParseS9pk));
+            }
+        }
+        Ok(expected.into_filter())
+    }
+}
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index e206c8553..a1183efa8 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -14,7 +14,8 @@ use crate::s9pk::merkle_archive::sink::Sink;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
-use crate::ARCH;
+use crate::s9pk::v2::pack::{ImageSource, PackSource};
+use crate::util::io::TmpDir;
 
 const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x02];
 
@@ -22,6 +23,7 @@ pub const SIG_CONTEXT: &str = "s9pk";
 
 pub mod compat;
 pub mod manifest;
+pub mod pack;
 
 /**
     /
@@ -34,10 +36,14 @@ pub mod manifest;
     │   └── <id>.squashfs (xN)
     └── images
         └── <arch>
+            ├── <id>.json (xN)
             ├── <id>.env (xN)
             └── <id>.squashfs (xN)
 */
 
+// this sorts the s9pk to optimize such that the parts that are used first appear earlier in the s9pk
+// this is useful for manipulating an s9pk while partially downloaded on a source that does not support
+// random access
 fn priority(s: &str) -> Option<usize> {
     match s {
         "manifest.json" => Some(0),
@@ -51,26 +57,6 @@ fn priority(s: &str) -> Option<usize> {
     }
 }
 
-fn filter(p: &Path) -> bool {
-    match p.iter().count() {
-        1 if p.file_name() == Some(OsStr::new("manifest.json")) => true,
-        1 if p.file_stem() == Some(OsStr::new("icon")) => true,
-        1 if p.file_name() == Some(OsStr::new("LICENSE.md")) => true,
-        1 if p.file_name() == Some(OsStr::new("instructions.md")) => true,
-        1 if p.file_name() == Some(OsStr::new("javascript.squashfs")) => true,
-        1 if p.file_name() == Some(OsStr::new("assets")) => true,
-        1 if p.file_name() == Some(OsStr::new("images")) => true,
-        2 if p.parent() == Some(Path::new("assets")) => {
-            p.extension().map_or(false, |ext| ext == "squashfs")
-        }
-        2 if p.parent() == Some(Path::new("images")) => p.file_name() == Some(OsStr::new(&*ARCH)),
-        3 if p.parent() == Some(&*Path::new("images").join(&*ARCH)) => p
-            .extension()
-            .map_or(false, |ext| ext == "squashfs" || ext == "env"),
-        _ => false,
-    }
-}
-
 #[derive(Clone)]
 pub struct S9pk<S = Section<MultiCursorFile>> {
     pub manifest: Manifest,
@@ -108,6 +94,11 @@ impl<S: FileSource + Clone> S9pk<S> {
         })
     }
 
+    pub fn validate_and_filter(&mut self, arch: Option<&str>) -> Result<(), Error> {
+        let filter = self.manifest.validate_for(arch, self.archive.contents())?;
+        filter.keep_checked(self.archive.contents_mut())
+    }
+
     pub async fn icon(&self) -> Result<(InternedString, FileContents<S>), Error> {
         let mut best_icon = None;
         for (path, icon) in self
@@ -174,12 +165,37 @@ impl<S: FileSource + Clone> S9pk<S> {
     }
 }
 
+impl<S: From<PackSource> + FileSource + Clone> S9pk<S> {
+    pub async fn load_images(&mut self, tmpdir: &TmpDir) -> Result<(), Error> {
+        let id = &self.manifest.id;
+        let version = &self.manifest.version;
+        for (image_id, image_config) in &mut self.manifest.images {
+            self.manifest_dirty = true;
+            for arch in &image_config.arch {
+                image_config
+                    .source
+                    .load(
+                        tmpdir,
+                        id,
+                        version,
+                        image_id,
+                        arch,
+                        self.archive.contents_mut(),
+                    )
+                    .await?;
+            }
+            image_config.source = ImageSource::Packed;
+        }
+
+        Ok(())
+    }
+}
+
 impl<S: ArchiveSource + Clone> S9pk<Section<S>> {
     #[instrument(skip_all)]
     pub async fn deserialize(
         source: &S,
         commitment: Option<&MerkleArchiveCommitment>,
-        apply_filter: bool,
     ) -> Result<Self, Error> {
         use tokio::io::AsyncReadExt;
 
@@ -201,10 +217,6 @@ impl<S: ArchiveSource + Clone> S9pk<Section<S>> {
         let mut archive =
             MerkleArchive::deserialize(source, SIG_CONTEXT, &mut header, commitment).await?;
 
-        if apply_filter {
-            archive.filter(filter)?;
-        }
-
         archive.sort_by(|a, b| match (priority(a), priority(b)) {
             (Some(a), Some(b)) => a.cmp(&b),
             (Some(_), None) => std::cmp::Ordering::Less,
@@ -216,15 +228,11 @@ impl<S: ArchiveSource + Clone> S9pk<Section<S>> {
     }
 }
 impl S9pk {
-    pub async fn from_file(file: File, apply_filter: bool) -> Result<Self, Error> {
-        Self::deserialize(&MultiCursorFile::from(file), None, apply_filter).await
+    pub async fn from_file(file: File) -> Result<Self, Error> {
+        Self::deserialize(&MultiCursorFile::from(file), None).await
     }
-    pub async fn open(
-        path: impl AsRef<Path>,
-        id: Option<&PackageId>,
-        apply_filter: bool,
-    ) -> Result<Self, Error> {
-        let res = Self::from_file(tokio::fs::File::open(path).await?, apply_filter).await?;
+    pub async fn open(path: impl AsRef<Path>, id: Option<&PackageId>) -> Result<Self, Error> {
+        let res = Self::from_file(tokio::fs::File::open(path).await?).await?;
         if let Some(id) = id {
             ensure_code!(
                 &res.as_manifest().id == id,
diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
new file mode 100644
index 000000000..18fe0472b
--- /dev/null
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -0,0 +1,536 @@
+use std::collections::BTreeSet;
+use std::ffi::OsStr;
+use std::io::Cursor;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use clap::Parser;
+use futures::future::{ready, BoxFuture};
+use futures::{FutureExt, TryStreamExt};
+use imbl_value::InternedString;
+use models::{ImageId, PackageId, VersionString};
+use serde::{Deserialize, Serialize};
+use tokio::fs::File;
+use tokio::io::AsyncRead;
+use tokio::process::Command;
+use tokio::sync::OnceCell;
+use tokio_stream::wrappers::ReadDirStream;
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::rpc_continuations::Guid;
+use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::s9pk::merkle_archive::source::{
+    into_dyn_read, ArchiveSource, DynFileSource, FileSource,
+};
+use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
+use crate::s9pk::v2::SIG_CONTEXT;
+use crate::s9pk::S9pk;
+use crate::util::io::TmpDir;
+use crate::util::Invoke;
+
+#[cfg(not(feature = "docker"))]
+pub const CONTAINER_TOOL: &str = "podman";
+
+#[cfg(feature = "docker")]
+pub const CONTAINER_TOOL: &str = "docker";
+
+pub struct SqfsDir {
+    path: PathBuf,
+    tmpdir: Arc<TmpDir>,
+    sqfs: OnceCell<MultiCursorFile>,
+}
+impl SqfsDir {
+    pub fn new(path: PathBuf, tmpdir: Arc<TmpDir>) -> Self {
+        Self {
+            path,
+            tmpdir,
+            sqfs: OnceCell::new(),
+        }
+    }
+    async fn file(&self) -> Result<&MultiCursorFile, Error> {
+        self.sqfs
+            .get_or_try_init(|| async move {
+                let guid = Guid::new();
+                let path = self.tmpdir.join(guid.as_ref()).with_extension("squashfs");
+                let mut cmd = Command::new("mksquashfs");
+                if self.path.extension().and_then(|s| s.to_str()) == Some("tar") {
+                    cmd.arg("-tar");
+                }
+                cmd.arg(&self.path)
+                    .arg(&path)
+                    .invoke(ErrorKind::Filesystem)
+                    .await?;
+                Ok(MultiCursorFile::from(
+                    File::open(&path)
+                        .await
+                        .with_ctx(|_| (ErrorKind::Filesystem, path.display()))?,
+                ))
+            })
+            .await
+    }
+}
+
+#[derive(Clone)]
+pub enum PackSource {
+    Buffered(Arc<[u8]>),
+    File(PathBuf),
+    Squashfs(Arc<SqfsDir>),
+}
+impl FileSource for PackSource {
+    type Reader = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
+    async fn size(&self) -> Result<u64, Error> {
+        match self {
+            Self::Buffered(a) => Ok(a.len() as u64),
+            Self::File(f) => Ok(tokio::fs::metadata(f)
+                .await
+                .with_ctx(|_| (ErrorKind::Filesystem, f.display()))?
+                .len()),
+            Self::Squashfs(dir) => dir
+                .file()
+                .await
+                .with_ctx(|_| (ErrorKind::Filesystem, dir.path.display()))?
+                .size()
+                .await
+                .or_not_found("file metadata"),
+        }
+    }
+    async fn reader(&self) -> Result<Self::Reader, Error> {
+        match self {
+            Self::Buffered(a) => Ok(into_dyn_read(Cursor::new(a.clone()))),
+            Self::File(f) => Ok(into_dyn_read(
+                File::open(f)
+                    .await
+                    .with_ctx(|_| (ErrorKind::Filesystem, f.display()))?,
+            )),
+            Self::Squashfs(dir) => dir.file().await?.fetch_all().await.map(into_dyn_read),
+        }
+    }
+}
+impl From<PackSource> for DynFileSource {
+    fn from(value: PackSource) -> Self {
+        DynFileSource::new(value)
+    }
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct PackParams {
+    pub path: Option<PathBuf>,
+    #[arg(short = 'o', long = "output")]
+    pub output: Option<PathBuf>,
+    #[arg(long = "javascript")]
+    pub javascript: Option<PathBuf>,
+    #[arg(long = "icon")]
+    pub icon: Option<PathBuf>,
+    #[arg(long = "license")]
+    pub license: Option<PathBuf>,
+    #[arg(long = "instructions")]
+    pub instructions: Option<PathBuf>,
+    #[arg(long = "assets")]
+    pub assets: Option<PathBuf>,
+}
+impl PackParams {
+    fn path(&self) -> &Path {
+        self.path.as_deref().unwrap_or(Path::new("."))
+    }
+    fn output(&self, id: &PackageId) -> PathBuf {
+        self.output
+            .as_ref()
+            .cloned()
+            .unwrap_or_else(|| self.path().join(id).with_extension("s9pk"))
+    }
+    fn javascript(&self) -> PathBuf {
+        self.javascript
+            .as_ref()
+            .cloned()
+            .unwrap_or_else(|| self.path().join("javascript"))
+    }
+    async fn icon(&self) -> Result<PathBuf, Error> {
+        if let Some(icon) = &self.icon {
+            Ok(icon.clone())
+        } else {
+            ReadDirStream::new(tokio::fs::read_dir(self.path()).await?).try_filter(|x| ready(x.path().file_stem() == Some(OsStr::new("icon")))).map_err(Error::from).try_fold(Err(Error::new(eyre!("icon not found"), ErrorKind::NotFound)), |acc, x| async move { match acc {
+                Ok(_) => Err(Error::new(eyre!("multiple icons found in working directory, please specify which to use with `--icon`"), ErrorKind::InvalidRequest)),
+                Err(e) => Ok({
+                    let path = x.path();
+                    if path.file_stem().and_then(|s| s.to_str()) == Some("icon") {
+                    Ok(path)
+                    } else {
+                        Err(e)
+                    }
+                })
+            }}).await?
+        }
+    }
+    fn license(&self) -> PathBuf {
+        self.license
+            .as_ref()
+            .cloned()
+            .unwrap_or_else(|| self.path().join("LICENSE.md"))
+    }
+    fn instructions(&self) -> PathBuf {
+        self.instructions
+            .as_ref()
+            .cloned()
+            .unwrap_or_else(|| self.path().join("instructions.md"))
+    }
+    fn assets(&self) -> PathBuf {
+        self.assets
+            .as_ref()
+            .cloned()
+            .unwrap_or_else(|| self.path().join("assets"))
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct ImageConfig {
+    pub source: ImageSource,
+    #[ts(type = "string[]")]
+    pub arch: BTreeSet<InternedString>,
+    #[ts(type = "string | null")]
+    pub emulate_missing_as: Option<InternedString>,
+}
+impl Default for ImageConfig {
+    fn default() -> Self {
+        Self {
+            source: ImageSource::Packed,
+            arch: BTreeSet::new(),
+            emulate_missing_as: None,
+        }
+    }
+}
+
+#[derive(Parser)]
+struct CliImageConfig {
+    #[arg(long, conflicts_with("docker-tag"))]
+    docker_build: bool,
+    #[arg(long, requires("docker-build"))]
+    dockerfile: Option<PathBuf>,
+    #[arg(long, requires("docker-build"))]
+    workdir: Option<PathBuf>,
+    #[arg(long, conflicts_with_all(["dockerfile", "workdir"]))]
+    docker_tag: Option<String>,
+    #[arg(long)]
+    arch: Vec<InternedString>,
+    #[arg(long)]
+    emulate_missing_as: Option<InternedString>,
+}
+impl TryFrom<CliImageConfig> for ImageConfig {
+    type Error = clap::Error;
+    fn try_from(value: CliImageConfig) -> Result<Self, Self::Error> {
+        let res = Self {
+            source: if value.docker_build {
+                ImageSource::DockerBuild {
+                    dockerfile: value.dockerfile,
+                    workdir: value.workdir,
+                }
+            } else if let Some(tag) = value.docker_tag {
+                ImageSource::DockerTag(tag)
+            } else {
+                ImageSource::Packed
+            },
+            arch: value.arch.into_iter().collect(),
+            emulate_missing_as: value.emulate_missing_as,
+        };
+        res.emulate_missing_as
+            .as_ref()
+            .map(|a| {
+                if !res.arch.contains(a) {
+                    Err(clap::Error::raw(
+                        clap::error::ErrorKind::InvalidValue,
+                        "`emulate-missing-as` must match one of the provided `arch`es",
+                    ))
+                } else {
+                    Ok(())
+                }
+            })
+            .transpose()?;
+        Ok(res)
+    }
+}
+impl clap::Args for ImageConfig {
+    fn augment_args(cmd: clap::Command) -> clap::Command {
+        CliImageConfig::augment_args(cmd)
+    }
+    fn augment_args_for_update(cmd: clap::Command) -> clap::Command {
+        CliImageConfig::augment_args_for_update(cmd)
+    }
+}
+impl clap::FromArgMatches for ImageConfig {
+    fn from_arg_matches(matches: &clap::ArgMatches) -> Result<Self, clap::Error> {
+        Self::try_from(CliImageConfig::from_arg_matches(matches)?)
+    }
+    fn update_from_arg_matches(&mut self, matches: &clap::ArgMatches) -> Result<(), clap::Error> {
+        *self = Self::try_from(CliImageConfig::from_arg_matches(matches)?)?;
+        Ok(())
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum ImageSource {
+    Packed,
+    #[serde(rename_all = "camelCase")]
+    DockerBuild {
+        workdir: Option<PathBuf>,
+        dockerfile: Option<PathBuf>,
+    },
+    DockerTag(String),
+}
+impl ImageSource {
+    #[instrument(skip_all)]
+    pub fn load<'a, S: From<PackSource> + FileSource + Clone>(
+        &'a self,
+        tmpdir: &'a TmpDir,
+        id: &'a PackageId,
+        version: &'a VersionString,
+        image_id: &'a ImageId,
+        arch: &'a str,
+        into: &'a mut DirectoryContents<S>,
+    ) -> BoxFuture<'a, Result<(), Error>> {
+        #[derive(Deserialize)]
+        #[serde(rename_all = "PascalCase")]
+        struct DockerImageConfig {
+            env: Vec<String>,
+            #[serde(default)]
+            working_dir: PathBuf,
+            #[serde(default)]
+            user: String,
+        }
+        async move {
+            match self {
+                ImageSource::Packed => Ok(()),
+                ImageSource::DockerBuild {
+                    workdir,
+                    dockerfile,
+                } => {
+                    let workdir = workdir.as_deref().unwrap_or(Path::new("."));
+                    let dockerfile = dockerfile
+                        .clone()
+                        .unwrap_or_else(|| workdir.join("Dockerfile"));
+                    let docker_platform = if arch == "x86_64" {
+                        "--platform=linux/amd64".to_owned()
+                    } else if arch == "aarch64" {
+                        "--platform=linux/arm64".to_owned()
+                    } else {
+                        format!("--platform=linux/{arch}")
+                    };
+                    // docker buildx build ${path} -o type=image,name=start9/${id}
+                    let tag = format!("start9/{id}/{image_id}:{version}");
+                    Command::new(CONTAINER_TOOL)
+                        .arg("build")
+                        .arg(workdir)
+                        .arg("-f")
+                        .arg(dockerfile)
+                        .arg("-t")
+                        .arg(&tag)
+                        .arg(&docker_platform)
+                        .arg("-o")
+                        .arg("type=image")
+                        .capture(false)
+                        .invoke(ErrorKind::Docker)
+                        .await?;
+                    ImageSource::DockerTag(tag.clone())
+                        .load(tmpdir, id, version, image_id, arch, into)
+                        .await?;
+                    Command::new(CONTAINER_TOOL)
+                        .arg("rmi")
+                        .arg("-f")
+                        .arg(&tag)
+                        .invoke(ErrorKind::Docker)
+                        .await?;
+                    Ok(())
+                }
+                ImageSource::DockerTag(tag) => {
+                    let docker_platform = if arch == "x86_64" {
+                        "--platform=linux/amd64".to_owned()
+                    } else if arch == "aarch64" {
+                        "--platform=linux/arm64".to_owned()
+                    } else {
+                        format!("--platform=linux/{arch}")
+                    };
+                    let mut inspect_cmd = Command::new(CONTAINER_TOOL);
+                    inspect_cmd
+                        .arg("image")
+                        .arg("inspect")
+                        .arg("--format")
+                        .arg("{{json .Config}}")
+                        .arg(&tag);
+                    let inspect_res = match inspect_cmd.invoke(ErrorKind::Docker).await {
+                        Ok(a) => a,
+                        Err(e)
+                            if {
+                                let msg = e.source.to_string();
+                                #[cfg(feature = "docker")]
+                                let matches = msg.contains("No such image:");
+                                #[cfg(not(feature = "docker"))]
+                                let matches = msg.contains(": image not known");
+                                matches
+                            } =>
+                        {
+                            Command::new(CONTAINER_TOOL)
+                                .arg("pull")
+                                .arg(&docker_platform)
+                                .arg(tag)
+                                .capture(false)
+                                .invoke(ErrorKind::Docker)
+                                .await?;
+                            inspect_cmd.invoke(ErrorKind::Docker).await?
+                        }
+                        Err(e) => return Err(e),
+                    };
+                    let config = serde_json::from_slice::<DockerImageConfig>(&inspect_res)
+                        .with_kind(ErrorKind::Deserialization)?;
+                    let base_path = Path::new("images").join(arch).join(image_id);
+                    into.insert_path(
+                        base_path.with_extension("json"),
+                        Entry::file(
+                            PackSource::Buffered(
+                                serde_json::to_vec(&ImageMetadata {
+                                    workdir: if config.working_dir == Path::new("") {
+                                        "/".into()
+                                    } else {
+                                        config.working_dir
+                                    },
+                                    user: if config.user.is_empty() {
+                                        "root".into()
+                                    } else {
+                                        config.user.into()
+                                    },
+                                })
+                                .with_kind(ErrorKind::Serialization)?
+                                .into(),
+                            )
+                            .into(),
+                        ),
+                    )?;
+                    into.insert_path(
+                        base_path.with_extension("env"),
+                        Entry::file(
+                            PackSource::Buffered(config.env.join("\n").into_bytes().into()).into(),
+                        ),
+                    )?;
+                    let dest = tmpdir.join(Guid::new().as_ref()).with_extension("squashfs");
+                    let container = String::from_utf8(
+                        Command::new(CONTAINER_TOOL)
+                            .arg("create")
+                            .arg(&docker_platform)
+                            .arg(&tag)
+                            .invoke(ErrorKind::Docker)
+                            .await?,
+                    )?;
+                    Command::new(CONTAINER_TOOL)
+                        .arg("export")
+                        .arg(container.trim())
+                        .pipe(Command::new("mksquashfs").arg("-").arg(&dest).arg("-tar"))
+                        .capture(false)
+                        .invoke(ErrorKind::Docker)
+                        .await?;
+                    Command::new(CONTAINER_TOOL)
+                        .arg("rm")
+                        .arg(container.trim())
+                        .invoke(ErrorKind::Docker)
+                        .await?;
+                    into.insert_path(
+                        base_path.with_extension("squashfs"),
+                        Entry::file(PackSource::File(dest).into()),
+                    )?;
+
+                    Ok(())
+                }
+            }
+        }
+        .boxed()
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct ImageMetadata {
+    pub workdir: PathBuf,
+    #[ts(type = "string")]
+    pub user: InternedString,
+}
+
+#[instrument(skip_all)]
+pub async fn pack(ctx: CliContext, params: PackParams) -> Result<(), Error> {
+    let tmpdir = Arc::new(TmpDir::new().await?);
+    let mut files = DirectoryContents::<PackSource>::new();
+    let js_dir = params.javascript();
+    let manifest: Arc<[u8]> = Command::new("node")
+        .arg("-e")
+        .arg(format!(
+            "console.log(JSON.stringify(require('{}/index.js').manifest))",
+            js_dir.display()
+        ))
+        .invoke(ErrorKind::Javascript)
+        .await?
+        .into();
+    files.insert(
+        "manifest.json".into(),
+        Entry::file(PackSource::Buffered(manifest.clone())),
+    );
+    let icon = params.icon().await?;
+    let icon_ext = icon
+        .extension()
+        .or_not_found("icon file extension")?
+        .to_string_lossy();
+    files.insert(
+        InternedString::from_display(&lazy_format!("icon.{}", icon_ext)),
+        Entry::file(PackSource::File(icon)),
+    );
+    files.insert(
+        "LICENSE.md".into(),
+        Entry::file(PackSource::File(params.license())),
+    );
+    files.insert(
+        "instructions.md".into(),
+        Entry::file(PackSource::File(params.instructions())),
+    );
+    files.insert(
+        "javascript.squashfs".into(),
+        Entry::file(PackSource::Squashfs(Arc::new(SqfsDir::new(
+            js_dir,
+            tmpdir.clone(),
+        )))),
+    );
+
+    let mut s9pk = S9pk::new(
+        MerkleArchive::new(files, ctx.developer_key()?.clone(), SIG_CONTEXT),
+        None,
+    )
+    .await?;
+
+    let assets_dir = params.assets();
+    for assets in s9pk.as_manifest().assets.clone() {
+        s9pk.as_archive_mut().contents_mut().insert_path(
+            Path::new("assets").join(&assets).with_extension("squashfs"),
+            Entry::file(PackSource::Squashfs(Arc::new(SqfsDir::new(
+                assets_dir.join(&assets),
+                tmpdir.clone(),
+            )))),
+        )?;
+    }
+
+    s9pk.load_images(&*tmpdir).await?;
+
+    s9pk.validate_and_filter(None)?;
+
+    s9pk.serialize(
+        &mut File::create(params.output(&s9pk.as_manifest().id)).await?,
+        false,
+    )
+    .await?;
+
+    drop(s9pk);
+
+    tmpdir.gc().await?;
+
+    Ok(())
+}
diff --git a/core/startos/src/service/action.rs b/core/startos/src/service/action.rs
index 5f97685ae..6c5ac4eab 100644
--- a/core/startos/src/service/action.rs
+++ b/core/startos/src/service/action.rs
@@ -4,6 +4,7 @@ use models::{ActionId, ProcedureName};
 
 use crate::action::ActionResult;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::service::config::GetConfig;
 use crate::service::dependencies::DependencyConfig;
 use crate::service::{Service, ServiceActor};
@@ -23,13 +24,18 @@ impl Handler<Action> for ServiceActor {
     }
     async fn handle(
         &mut self,
-        Action { id, input }: Action,
+        id: Guid,
+        Action {
+            id: action_id,
+            input,
+        }: Action,
         _: &BackgroundJobQueue,
     ) -> Self::Response {
         let container = &self.0.persistent_container;
         container
             .execute::<ActionResult>(
-                ProcedureName::RunAction(id),
+                id,
+                ProcedureName::RunAction(action_id),
                 input,
                 Some(Duration::from_secs(30)),
             )
@@ -39,7 +45,20 @@ impl Handler<Action> for ServiceActor {
 }
 
 impl Service {
-    pub async fn action(&self, id: ActionId, input: Value) -> Result<ActionResult, Error> {
-        self.actor.send(Action { id, input }).await?
+    pub async fn action(
+        &self,
+        id: Guid,
+        action_id: ActionId,
+        input: Value,
+    ) -> Result<ActionResult, Error> {
+        self.actor
+            .send(
+                id,
+                Action {
+                    id: action_id,
+                    input,
+                },
+            )
+            .await?
     }
 }
diff --git a/core/startos/src/service/config.rs b/core/startos/src/service/config.rs
index 0f166eedb..faa70fc41 100644
--- a/core/startos/src/service/config.rs
+++ b/core/startos/src/service/config.rs
@@ -5,6 +5,7 @@ use models::ProcedureName;
 use crate::config::action::ConfigRes;
 use crate::config::ConfigureContext;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::service::dependencies::DependencyConfig;
 use crate::service::{Service, ServiceActor};
 use crate::util::actor::background::BackgroundJobQueue;
@@ -19,6 +20,7 @@ impl Handler<Configure> for ServiceActor {
     }
     async fn handle(
         &mut self,
+        id: Guid,
         Configure(ConfigureContext { timeout, config }): Configure,
         _: &BackgroundJobQueue,
     ) -> Self::Response {
@@ -26,7 +28,7 @@ impl Handler<Configure> for ServiceActor {
         let package_id = &self.0.id;
 
         container
-            .execute::<NoOutput>(ProcedureName::SetConfig, to_value(&config)?, timeout)
+            .execute::<NoOutput>(id, ProcedureName::SetConfig, to_value(&config)?, timeout)
             .await
             .with_kind(ErrorKind::ConfigRulesViolation)?;
         self.0
@@ -52,10 +54,11 @@ impl Handler<GetConfig> for ServiceActor {
     fn conflicts_with(_: &GetConfig) -> ConflictBuilder<Self> {
         ConflictBuilder::nothing().except::<Configure>()
     }
-    async fn handle(&mut self, _: GetConfig, _: &BackgroundJobQueue) -> Self::Response {
+    async fn handle(&mut self, id: Guid, _: GetConfig, _: &BackgroundJobQueue) -> Self::Response {
         let container = &self.0.persistent_container;
         container
             .execute::<ConfigRes>(
+                id,
                 ProcedureName::GetConfig,
                 Value::Null,
                 Some(Duration::from_secs(30)), // TODO timeout
@@ -66,10 +69,10 @@ impl Handler<GetConfig> for ServiceActor {
 }
 
 impl Service {
-    pub async fn configure(&self, ctx: ConfigureContext) -> Result<(), Error> {
-        self.actor.send(Configure(ctx)).await?
+    pub async fn configure(&self, id: Guid, ctx: ConfigureContext) -> Result<(), Error> {
+        self.actor.send(id, Configure(ctx)).await?
     }
-    pub async fn get_config(&self) -> Result<ConfigRes, Error> {
-        self.actor.send(GetConfig).await?
+    pub async fn get_config(&self, id: Guid) -> Result<ConfigRes, Error> {
+        self.actor.send(id, GetConfig).await?
     }
 }
diff --git a/core/startos/src/service/control.rs b/core/startos/src/service/control.rs
index 0443b80b1..7c4bdf815 100644
--- a/core/startos/src/service/control.rs
+++ b/core/startos/src/service/control.rs
@@ -1,4 +1,5 @@
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::service::config::GetConfig;
 use crate::service::dependencies::DependencyConfig;
 use crate::service::start_stop::StartStop;
@@ -15,7 +16,7 @@ impl Handler<Start> for ServiceActor {
             .except::<GetConfig>()
             .except::<DependencyConfig>()
     }
-    async fn handle(&mut self, _: Start, _: &BackgroundJobQueue) -> Self::Response {
+    async fn handle(&mut self, _: Guid, _: Start, _: &BackgroundJobQueue) -> Self::Response {
         self.0.persistent_container.state.send_modify(|x| {
             x.desired_state = StartStop::Start;
         });
@@ -23,8 +24,8 @@ impl Handler<Start> for ServiceActor {
     }
 }
 impl Service {
-    pub async fn start(&self) -> Result<(), Error> {
-        self.actor.send(Start).await
+    pub async fn start(&self, id: Guid) -> Result<(), Error> {
+        self.actor.send(id, Start).await
     }
 }
 
@@ -36,7 +37,7 @@ impl Handler<Stop> for ServiceActor {
             .except::<GetConfig>()
             .except::<DependencyConfig>()
     }
-    async fn handle(&mut self, _: Stop, _: &BackgroundJobQueue) -> Self::Response {
+    async fn handle(&mut self, _: Guid, _: Stop, _: &BackgroundJobQueue) -> Self::Response {
         let mut transition_state = None;
         self.0.persistent_container.state.send_modify(|x| {
             x.desired_state = StartStop::Stop;
@@ -51,7 +52,7 @@ impl Handler<Stop> for ServiceActor {
     }
 }
 impl Service {
-    pub async fn stop(&self) -> Result<(), Error> {
-        self.actor.send(Stop).await
+    pub async fn stop(&self, id: Guid) -> Result<(), Error> {
+        self.actor.send(id, Stop).await
     }
 }
diff --git a/core/startos/src/service/dependencies.rs b/core/startos/src/service/dependencies.rs
index e71b62917..60fd76ad6 100644
--- a/core/startos/src/service/dependencies.rs
+++ b/core/startos/src/service/dependencies.rs
@@ -4,35 +4,28 @@ use imbl_value::json;
 use models::{PackageId, ProcedureName};
 
 use crate::prelude::*;
-use crate::service::{Service, ServiceActor};
+use crate::rpc_continuations::Guid;
+use crate::service::{Service, ServiceActor, ServiceActorSeed};
 use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::{ConflictBuilder, Handler};
 use crate::Config;
 
-pub(super) struct DependencyConfig {
-    dependency_id: PackageId,
-    remote_config: Option<Config>,
-}
-impl Handler<DependencyConfig> for ServiceActor {
-    type Response = Result<Option<Config>, Error>;
-    fn conflicts_with(_: &DependencyConfig) -> ConflictBuilder<Self> {
-        ConflictBuilder::nothing()
-    }
-    async fn handle(
-        &mut self,
-        DependencyConfig {
-            dependency_id,
-            remote_config,
-        }: DependencyConfig,
-        _: &BackgroundJobQueue,
-    ) -> Self::Response {
-        let container = &self.0.persistent_container;
+impl ServiceActorSeed {
+    async fn dependency_config(
+        &self,
+        id: Guid,
+        dependency_id: PackageId,
+        remote_config: Option<Config>,
+    ) -> Result<Option<Config>, Error> {
+        let container = &self.persistent_container;
         container
             .sanboxed::<Option<Config>>(
+                id.clone(),
                 ProcedureName::UpdateDependency(dependency_id.clone()),
                 json!({
                     "queryResults": container
                         .execute::<Value>(
+                            id,
                             ProcedureName::QueryDependency(dependency_id),
                             Value::Null,
                             Some(Duration::from_secs(30)),
@@ -49,17 +42,45 @@ impl Handler<DependencyConfig> for ServiceActor {
     }
 }
 
+pub(super) struct DependencyConfig {
+    dependency_id: PackageId,
+    remote_config: Option<Config>,
+}
+impl Handler<DependencyConfig> for ServiceActor {
+    type Response = Result<Option<Config>, Error>;
+    fn conflicts_with(_: &DependencyConfig) -> ConflictBuilder<Self> {
+        ConflictBuilder::nothing()
+    }
+    async fn handle(
+        &mut self,
+        id: Guid,
+        DependencyConfig {
+            dependency_id,
+            remote_config,
+        }: DependencyConfig,
+        _: &BackgroundJobQueue,
+    ) -> Self::Response {
+        self.0
+            .dependency_config(id, dependency_id, remote_config)
+            .await
+    }
+}
+
 impl Service {
     pub async fn dependency_config(
         &self,
+        id: Guid,
         dependency_id: PackageId,
         remote_config: Option<Config>,
     ) -> Result<Option<Config>, Error> {
         self.actor
-            .send(DependencyConfig {
-                dependency_id,
-                remote_config,
-            })
+            .send(
+                id,
+                DependencyConfig {
+                    dependency_id,
+                    remote_config,
+                },
+            )
             .await?
     }
 }
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index da641468b..6588de836 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -1,4 +1,5 @@
-use std::sync::Arc;
+use std::ops::Deref;
+use std::sync::{Arc, Weak};
 use std::time::Duration;
 
 use chrono::{DateTime, Utc};
@@ -68,13 +69,87 @@ pub enum LoadDisposition {
     Undo,
 }
 
+pub struct ServiceRef(Arc<Service>);
+impl ServiceRef {
+    pub fn weak(&self) -> Weak<Service> {
+        Arc::downgrade(&self.0)
+    }
+    pub async fn uninstall(
+        self,
+        target_version: Option<models::VersionString>,
+    ) -> Result<(), Error> {
+        self.seed
+            .persistent_container
+            .execute(
+                Guid::new(),
+                ProcedureName::Uninit,
+                to_value(&target_version)?,
+                None,
+            ) // TODO timeout
+            .await?;
+        let id = self.seed.persistent_container.s9pk.as_manifest().id.clone();
+        let ctx = self.seed.ctx.clone();
+        self.shutdown().await?;
+        if target_version.is_none() {
+            ctx.db
+                .mutate(|d| d.as_public_mut().as_package_data_mut().remove(&id))
+                .await?;
+        }
+        Ok(())
+    }
+    pub async fn shutdown(self) -> Result<(), Error> {
+        if let Some((hdl, shutdown)) = self.seed.persistent_container.rpc_server.send_replace(None)
+        {
+            self.seed
+                .persistent_container
+                .rpc_client
+                .request(rpc::Exit, Empty {})
+                .await?;
+            shutdown.shutdown();
+            hdl.await.with_kind(ErrorKind::Cancelled)?;
+        }
+        let service = Arc::try_unwrap(self.0).map_err(|_| {
+            Error::new(
+                eyre!("ServiceActor held somewhere after actor shutdown"),
+                ErrorKind::Unknown,
+            )
+        })?;
+        service
+            .actor
+            .shutdown(crate::util::actor::PendingMessageStrategy::FinishAll { timeout: None }) // TODO timeout
+            .await;
+        Arc::try_unwrap(service.seed)
+            .map_err(|_| {
+                Error::new(
+                    eyre!("ServiceActorSeed held somewhere after actor shutdown"),
+                    ErrorKind::Unknown,
+                )
+            })?
+            .persistent_container
+            .exit()
+            .await?;
+        Ok(())
+    }
+}
+impl Deref for ServiceRef {
+    type Target = Service;
+    fn deref(&self) -> &Self::Target {
+        &*self.0
+    }
+}
+impl From<Service> for ServiceRef {
+    fn from(value: Service) -> Self {
+        Self(Arc::new(value))
+    }
+}
+
 pub struct Service {
     actor: ConcurrentActor<ServiceActor>,
     seed: Arc<ServiceActorSeed>,
 }
 impl Service {
     #[instrument(skip_all)]
-    async fn new(ctx: RpcContext, s9pk: S9pk, start: StartStop) -> Result<Self, Error> {
+    async fn new(ctx: RpcContext, s9pk: S9pk, start: StartStop) -> Result<ServiceRef, Error> {
         let id = s9pk.as_manifest().id.clone();
         let persistent_container = PersistentContainer::new(
             &ctx, s9pk,
@@ -89,13 +164,17 @@ impl Service {
             ctx,
             synchronized: Arc::new(Notify::new()),
         });
-        seed.persistent_container
-            .init(Arc::downgrade(&seed))
-            .await?;
-        Ok(Self {
+        let service: ServiceRef = Self {
             actor: ConcurrentActor::new(ServiceActor(seed.clone())),
             seed,
-        })
+        }
+        .into();
+        service
+            .seed
+            .persistent_container
+            .init(service.weak())
+            .await?;
+        Ok(service)
     }
 
     #[instrument(skip_all)]
@@ -103,7 +182,7 @@ impl Service {
         ctx: &RpcContext,
         id: &PackageId,
         disposition: LoadDisposition,
-    ) -> Result<Option<Self>, Error> {
+    ) -> Result<Option<ServiceRef>, Error> {
         let handle_installed = {
             let ctx = ctx.clone();
             move |s9pk: S9pk, i: Model<PackageDataEntry>| async move {
@@ -137,7 +216,7 @@ impl Service {
         match entry.as_state_info().as_match() {
             PackageStateMatchModelRef::Installing(_) => {
                 if disposition == LoadDisposition::Retry {
-                    if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id), true).await.map_err(|e| {
+                    if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id)).await.map_err(|e| {
                         tracing::error!("Error opening s9pk for install: {e}");
                         tracing::debug!("{e:?}")
                     }) {
@@ -170,7 +249,7 @@ impl Service {
                                 && progress == &Progress::Complete(true)
                         })
                 {
-                    if let Ok(s9pk) = S9pk::open(&s9pk_path, Some(id), true).await.map_err(|e| {
+                    if let Ok(s9pk) = S9pk::open(&s9pk_path, Some(id)).await.map_err(|e| {
                         tracing::error!("Error opening s9pk for update: {e}");
                         tracing::debug!("{e:?}")
                     }) {
@@ -189,7 +268,7 @@ impl Service {
                         }
                     }
                 }
-                let s9pk = S9pk::open(s9pk_path, Some(id), true).await?;
+                let s9pk = S9pk::open(s9pk_path, Some(id)).await?;
                 ctx.db
                     .mutate({
                         |db| {
@@ -214,7 +293,7 @@ impl Service {
                 handle_installed(s9pk, entry).await
             }
             PackageStateMatchModelRef::Removing(_) | PackageStateMatchModelRef::Restoring(_) => {
-                if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id), true).await.map_err(|e| {
+                if let Ok(s9pk) = S9pk::open(s9pk_path, Some(id)).await.map_err(|e| {
                     tracing::error!("Error opening s9pk for removal: {e}");
                     tracing::debug!("{e:?}")
                 }) {
@@ -225,7 +304,7 @@ impl Service {
                             tracing::debug!("{e:?}")
                         })
                     {
-                        match service.uninstall(None).await {
+                        match ServiceRef::from(service).uninstall(None).await {
                             Err(e) => {
                                 tracing::error!("Error uninstalling service: {e}");
                                 tracing::debug!("{e:?}")
@@ -242,7 +321,7 @@ impl Service {
                 Ok(None)
             }
             PackageStateMatchModelRef::Installed(_) => {
-                handle_installed(S9pk::open(s9pk_path, Some(id), true).await?, entry).await
+                handle_installed(S9pk::open(s9pk_path, Some(id)).await?, entry).await
             }
             PackageStateMatchModelRef::Error(e) => Err(Error::new(
                 eyre!("Failed to parse PackageDataEntry, found {e:?}"),
@@ -257,7 +336,7 @@ impl Service {
         s9pk: S9pk,
         src_version: Option<models::VersionString>,
         progress: Option<InstallProgressHandles>,
-    ) -> Result<Self, Error> {
+    ) -> Result<ServiceRef, Error> {
         let manifest = s9pk.as_manifest().clone();
         let developer_key = s9pk.as_archive().signer();
         let icon = s9pk.icon_data_url().await?;
@@ -265,7 +344,12 @@ impl Service {
         service
             .seed
             .persistent_container
-            .execute(ProcedureName::Init, to_value(&src_version)?, None) // TODO timeout
+            .execute(
+                Guid::new(),
+                ProcedureName::Init,
+                to_value(&src_version)?,
+                None,
+            ) // TODO timeout
             .await
             .with_kind(ErrorKind::MigrationFailed)?; // TODO: handle cancellation
         if let Some(mut progress) = progress {
@@ -301,61 +385,21 @@ impl Service {
         s9pk: S9pk,
         backup_source: impl GenericMountGuard,
         progress: Option<InstallProgressHandles>,
-    ) -> Result<Self, Error> {
+    ) -> Result<ServiceRef, Error> {
         let service = Service::install(ctx.clone(), s9pk, None, progress).await?;
 
         service
             .actor
-            .send(transition::restore::Restore {
-                path: backup_source.path().to_path_buf(),
-            })
+            .send(
+                Guid::new(),
+                transition::restore::Restore {
+                    path: backup_source.path().to_path_buf(),
+                },
+            )
             .await??;
         Ok(service)
     }
 
-    pub async fn shutdown(self) -> Result<(), Error> {
-        self.actor
-            .shutdown(crate::util::actor::PendingMessageStrategy::FinishAll { timeout: None }) // TODO timeout
-            .await;
-        if let Some((hdl, shutdown)) = self.seed.persistent_container.rpc_server.send_replace(None)
-        {
-            self.seed
-                .persistent_container
-                .rpc_client
-                .request(rpc::Exit, Empty {})
-                .await?;
-            shutdown.shutdown();
-            hdl.await.with_kind(ErrorKind::Cancelled)?;
-        }
-        Arc::try_unwrap(self.seed)
-            .map_err(|_| {
-                Error::new(
-                    eyre!("ServiceActorSeed held somewhere after actor shutdown"),
-                    ErrorKind::Unknown,
-                )
-            })?
-            .persistent_container
-            .exit()
-            .await?;
-        Ok(())
-    }
-
-    pub async fn uninstall(self, target_version: Option<models::VersionString>) -> Result<(), Error> {
-        self.seed
-            .persistent_container
-            .execute(ProcedureName::Uninit, to_value(&target_version)?, None) // TODO timeout
-            .await?;
-        let id = self.seed.persistent_container.s9pk.as_manifest().id.clone();
-        let ctx = self.seed.ctx.clone();
-        self.shutdown().await?;
-        if target_version.is_none() {
-            ctx.db
-                .mutate(|d| d.as_public_mut().as_package_data_mut().remove(&id))
-                .await?;
-        }
-        Ok(())
-    }
-
     #[instrument(skip_all)]
     pub async fn backup(&self, guard: impl GenericMountGuard) -> Result<(), Error> {
         let id = &self.seed.id;
@@ -368,9 +412,12 @@ impl Service {
             .await?;
         drop(file);
         self.actor
-            .send(transition::backup::Backup {
-                path: guard.path().to_path_buf(),
-            })
+            .send(
+                Guid::new(),
+                transition::backup::Backup {
+                    path: guard.path().to_path_buf(),
+                },
+            )
             .await??;
         Ok(())
     }
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 03203633a..d9d08e5d3 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -6,8 +6,7 @@ use std::time::Duration;
 use futures::future::ready;
 use futures::{Future, FutureExt};
 use helpers::NonDetachingJoinHandle;
-use imbl_value::InternedString;
-use models::{ProcedureName, VolumeId};
+use models::{ImageId, ProcedureName, VolumeId};
 use rpc_toolkit::{Empty, Server, ShutdownHandle};
 use serde::de::DeserializeOwned;
 use tokio::fs::File;
@@ -24,14 +23,15 @@ use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::disk::mount::filesystem::{MountType, ReadOnly};
-use crate::disk::mount::guard::MountGuard;
+use crate::disk::mount::guard::{GenericMountGuard, MountGuard};
 use crate::lxc::{LxcConfig, LxcContainer, HOST_RPC_SERVER_SOCKET};
 use crate::net::net_controller::NetService;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
 use crate::service::start_stop::StartStop;
-use crate::service::{rpc, RunningStatus};
+use crate::service::{rpc, RunningStatus, Service};
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::Invoke;
 use crate::volume::{asset_dir, data_dir};
@@ -89,7 +89,8 @@ pub struct PersistentContainer {
     js_mount: MountGuard,
     volumes: BTreeMap<VolumeId, MountGuard>,
     assets: BTreeMap<VolumeId, MountGuard>,
-    pub(super) overlays: Arc<Mutex<BTreeMap<InternedString, OverlayGuard>>>,
+    pub(super) images: BTreeMap<ImageId, Arc<MountGuard>>,
+    pub(super) overlays: Arc<Mutex<BTreeMap<Guid, OverlayGuard<Arc<MountGuard>>>>>,
     pub(super) state: Arc<watch::Sender<ServiceState>>,
     pub(super) net_service: Mutex<NetService>,
     destroyed: bool,
@@ -178,14 +179,62 @@ impl PersistentContainer {
                 .await?,
             );
         }
+
+        let mut images = BTreeMap::new();
         let image_path = lxc_container.rootfs_dir().join("media/startos/images");
         tokio::fs::create_dir_all(&image_path).await?;
-        for image in &s9pk.as_manifest().images {
+        for (image, config) in &s9pk.as_manifest().images {
+            let mut arch = ARCH;
+            let mut sqfs_path = Path::new("images")
+                .join(arch)
+                .join(image)
+                .with_extension("squashfs");
+            if !s9pk
+                .as_archive()
+                .contents()
+                .get_path(&sqfs_path)
+                .and_then(|e| e.as_file())
+                .is_some()
+            {
+                arch = if let Some(arch) = config.emulate_missing_as.as_deref() {
+                    arch
+                } else {
+                    continue;
+                };
+                sqfs_path = Path::new("images")
+                    .join(arch)
+                    .join(image)
+                    .with_extension("squashfs");
+            }
+            let sqfs = s9pk
+                .as_archive()
+                .contents()
+                .get_path(&sqfs_path)
+                .and_then(|e| e.as_file())
+                .or_not_found(sqfs_path.display())?;
+            let mountpoint = image_path.join(image);
+            tokio::fs::create_dir_all(&mountpoint).await?;
+            Command::new("chown")
+                .arg("100000:100000")
+                .arg(&mountpoint)
+                .invoke(ErrorKind::Filesystem)
+                .await?;
+            images.insert(
+                image.clone(),
+                Arc::new(
+                    MountGuard::mount(
+                        &IdMapped::new(LoopDev::from(&**sqfs), 0, 100000, 65536),
+                        &mountpoint,
+                        ReadOnly,
+                    )
+                    .await?,
+                ),
+            );
             let env_filename = Path::new(image.as_ref()).with_extension("env");
             if let Some(env) = s9pk
                 .as_archive()
                 .contents()
-                .get_path(Path::new("images").join(*ARCH).join(&env_filename))
+                .get_path(Path::new("images").join(arch).join(&env_filename))
                 .and_then(|e| e.as_file())
             {
                 env.copy(&mut File::create(image_path.join(&env_filename)).await?)
@@ -195,7 +244,7 @@ impl PersistentContainer {
             if let Some(json) = s9pk
                 .as_archive()
                 .contents()
-                .get_path(Path::new("images").join(*ARCH).join(&json_filename))
+                .get_path(Path::new("images").join(arch).join(&json_filename))
                 .and_then(|e| e.as_file())
             {
                 json.copy(&mut File::create(image_path.join(&json_filename)).await?)
@@ -215,6 +264,7 @@ impl PersistentContainer {
             js_mount,
             volumes,
             assets,
+            images,
             overlays: Arc::new(Mutex::new(BTreeMap::new())),
             state: Arc::new(watch::channel(ServiceState::new(start)).0),
             net_service: Mutex::new(net_service),
@@ -257,7 +307,7 @@ impl PersistentContainer {
     }
 
     #[instrument(skip_all)]
-    pub async fn init(&self, seed: Weak<ServiceActorSeed>) -> Result<(), Error> {
+    pub async fn init(&self, seed: Weak<Service>) -> Result<(), Error> {
         let socket_server_context = EffectContext::new(seed);
         let server = Server::new(
             move || ready(Ok(socket_server_context.clone())),
@@ -330,6 +380,7 @@ impl PersistentContainer {
         let js_mount = self.js_mount.take();
         let volumes = std::mem::take(&mut self.volumes);
         let assets = std::mem::take(&mut self.assets);
+        let images = std::mem::take(&mut self.images);
         let overlays = self.overlays.clone();
         let lxc_container = self.lxc_container.take();
         self.destroyed = true;
@@ -352,6 +403,9 @@ impl PersistentContainer {
                         for (_, overlay) in std::mem::take(&mut *overlays.lock().await) {
                             errs.handle(overlay.unmount(true).await);
                         }
+                        for (_, images) in images {
+                            errs.handle(images.unmount().await);
+                        }
                         errs.handle(js_mount.unmount(true).await);
                         if let Some(lxc_container) = lxc_container {
                             errs.handle(lxc_container.exit().await);
@@ -378,6 +432,7 @@ impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn start(&self) -> Result<(), Error> {
         self.execute(
+            Guid::new(),
             ProcedureName::StartMain,
             Value::Null,
             Some(Duration::from_secs(5)), // TODO
@@ -389,7 +444,7 @@ impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn stop(&self) -> Result<Duration, Error> {
         let timeout: Option<crate::util::serde::Duration> = self
-            .execute(ProcedureName::StopMain, Value::Null, None)
+            .execute(Guid::new(), ProcedureName::StopMain, Value::Null, None)
             .await?;
         Ok(timeout.map(|a| *a).unwrap_or(Duration::from_secs(30)))
     }
@@ -397,6 +452,7 @@ impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn execute<O>(
         &self,
+        id: Guid,
         name: ProcedureName,
         input: Value,
         timeout: Option<Duration>,
@@ -404,7 +460,7 @@ impl PersistentContainer {
     where
         O: DeserializeOwned,
     {
-        self._execute(name, input, timeout)
+        self._execute(id, name, input, timeout)
             .await
             .and_then(from_value)
     }
@@ -412,6 +468,7 @@ impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn sanboxed<O>(
         &self,
+        id: Guid,
         name: ProcedureName,
         input: Value,
         timeout: Option<Duration>,
@@ -419,7 +476,7 @@ impl PersistentContainer {
     where
         O: DeserializeOwned,
     {
-        self._sandboxed(name, input, timeout)
+        self._sandboxed(id, name, input, timeout)
             .await
             .and_then(from_value)
     }
@@ -427,13 +484,15 @@ impl PersistentContainer {
     #[instrument(skip_all)]
     async fn _execute(
         &self,
+        id: Guid,
         name: ProcedureName,
         input: Value,
         timeout: Option<Duration>,
     ) -> Result<Value, Error> {
-        let fut = self
-            .rpc_client
-            .request(rpc::Execute, rpc::ExecuteParams::new(name, input, timeout));
+        let fut = self.rpc_client.request(
+            rpc::Execute,
+            rpc::ExecuteParams::new(id, name, input, timeout),
+        );
 
         Ok(if let Some(timeout) = timeout {
             tokio::time::timeout(timeout, fut)
@@ -447,13 +506,15 @@ impl PersistentContainer {
     #[instrument(skip_all)]
     async fn _sandboxed(
         &self,
+        id: Guid,
         name: ProcedureName,
         input: Value,
         timeout: Option<Duration>,
     ) -> Result<Value, Error> {
-        let fut = self
-            .rpc_client
-            .request(rpc::Sandbox, rpc::ExecuteParams::new(name, input, timeout));
+        let fut = self.rpc_client.request(
+            rpc::Sandbox,
+            rpc::ExecuteParams::new(id, name, input, timeout),
+        );
 
         Ok(if let Some(timeout) = timeout {
             tokio::time::timeout(timeout, fut)
diff --git a/core/startos/src/service/properties.rs b/core/startos/src/service/properties.rs
index 3e795207a..3f5201f1d 100644
--- a/core/startos/src/service/properties.rs
+++ b/core/startos/src/service/properties.rs
@@ -3,6 +3,7 @@ use std::time::Duration;
 use models::ProcedureName;
 
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::service::Service;
 
 impl Service {
@@ -11,6 +12,7 @@ impl Service {
         let container = &self.seed.persistent_container;
         container
             .execute::<Value>(
+                Guid::new(),
                 ProcedureName::Properties,
                 Value::Null,
                 Some(Duration::from_secs(30)),
diff --git a/core/startos/src/service/rpc.rs b/core/startos/src/service/rpc.rs
index 65c8b98fe..eff44b2cf 100644
--- a/core/startos/src/service/rpc.rs
+++ b/core/startos/src/service/rpc.rs
@@ -7,6 +7,7 @@ use rpc_toolkit::Empty;
 use ts_rs::TS;
 
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 
 #[derive(Clone)]
 pub struct Init;
@@ -46,14 +47,21 @@ impl serde::Serialize for Exit {
 
 #[derive(Clone, serde::Deserialize, serde::Serialize, TS)]
 pub struct ExecuteParams {
+    id: Guid,
     procedure: String,
     #[ts(type = "any")]
     input: Value,
     timeout: Option<u128>,
 }
 impl ExecuteParams {
-    pub fn new(procedure: ProcedureName, input: Value, timeout: Option<Duration>) -> Self {
+    pub fn new(
+        id: Guid,
+        procedure: ProcedureName,
+        input: Value,
+        timeout: Option<Duration>,
+    ) -> Self {
         Self {
+            id,
             procedure: procedure.js_function_name(),
             input,
             timeout: timeout.map(|d| d.as_millis()),
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index aedf4c194..28a611854 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -7,9 +7,9 @@ use std::str::FromStr;
 use std::sync::{Arc, Weak};
 
 use clap::builder::ValueParserFactory;
-use clap::Parser;
+use clap::{CommandFactory, FromArgMatches, Parser};
 use emver::VersionRange;
-use imbl_value::{json, InternedString};
+use imbl_value::json;
 use itertools::Itertools;
 use models::{
     ActionId, DataUrl, HealthCheckId, HostId, ImageId, PackageId, ServiceInterfaceId, VolumeId,
@@ -25,35 +25,34 @@ use crate::db::model::package::{
     ActionMetadata, CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind,
     ManifestPreference,
 };
-use crate::disk::mount::filesystem::idmapped::IdMapped;
-use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
+use crate::echo;
 use crate::net::host::address::HostAddress;
 use crate::net::host::binding::{BindOptions, LanInfo};
 use crate::net::host::{Host, HostKind};
 use crate::net::service_interface::{AddressInfo, ServiceInterface, ServiceInterfaceType};
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::rpc::SKIP_ENV;
 use crate::s9pk::S9pk;
 use crate::service::cli::ContainerCliContext;
-use crate::service::ServiceActorSeed;
+use crate::service::Service;
 use crate::status::health_check::HealthCheckResult;
 use crate::status::MainStatus;
 use crate::util::clap::FromStrParser;
-use crate::util::{new_guid, Invoke};
-use crate::{echo, ARCH};
+use crate::util::Invoke;
 
 #[derive(Clone)]
-pub(super) struct EffectContext(Weak<ServiceActorSeed>);
+pub(super) struct EffectContext(Weak<Service>);
 impl EffectContext {
-    pub fn new(seed: Weak<ServiceActorSeed>) -> Self {
-        Self(seed)
+    pub fn new(service: Weak<Service>) -> Self {
+        Self(service)
     }
 }
 impl Context for EffectContext {}
 impl EffectContext {
-    fn deref(&self) -> Result<Arc<ServiceActorSeed>, Error> {
+    fn deref(&self) -> Result<Arc<Service>, Error> {
         if let Some(seed) = Weak::upgrade(&self.0) {
             Ok(seed)
         } else {
@@ -66,11 +65,55 @@ impl EffectContext {
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-struct RpcData {
-    id: i64,
-    method: String,
-    params: Value,
+#[serde(rename_all = "camelCase")]
+pub struct WithProcedureId<T> {
+    #[serde(default)]
+    procedure_id: Guid,
+    #[serde(flatten)]
+    rest: T,
+}
+impl<T: FromArgMatches> FromArgMatches for WithProcedureId<T> {
+    fn from_arg_matches(matches: &clap::ArgMatches) -> Result<Self, clap::Error> {
+        let rest = T::from_arg_matches(matches)?;
+        Ok(Self {
+            procedure_id: matches.get_one("procedure-id").cloned().unwrap_or_default(),
+            rest,
+        })
+    }
+    fn from_arg_matches_mut(matches: &mut clap::ArgMatches) -> Result<Self, clap::Error> {
+        let rest = T::from_arg_matches_mut(matches)?;
+        Ok(Self {
+            procedure_id: matches.get_one("procedure-id").cloned().unwrap_or_default(),
+            rest,
+        })
+    }
+    fn update_from_arg_matches(&mut self, matches: &clap::ArgMatches) -> Result<(), clap::Error> {
+        self.rest.update_from_arg_matches(matches)?;
+        self.procedure_id = matches.get_one("procedure-id").cloned().unwrap_or_default();
+        Ok(())
+    }
+    fn update_from_arg_matches_mut(
+        &mut self,
+        matches: &mut clap::ArgMatches,
+    ) -> Result<(), clap::Error> {
+        self.rest.update_from_arg_matches_mut(matches)?;
+        self.procedure_id = matches.get_one("procedure-id").cloned().unwrap_or_default();
+        Ok(())
+    }
+}
+impl<T: CommandFactory> CommandFactory for WithProcedureId<T> {
+    fn command() -> clap::Command {
+        T::command_for_update().arg(
+            clap::Arg::new("procedure-id")
+                .action(clap::ArgAction::Set)
+                .value_parser(clap::value_parser!(Guid)),
+        )
+    }
+    fn command_for_update() -> clap::Command {
+        Self::command()
+    }
 }
+
 pub fn service_effect_handler<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand("gitInfo", from_fn(|_: C| crate::version::git_info()))
@@ -290,6 +333,7 @@ struct MountParams {
 async fn set_system_smtp(context: EffectContext, data: SetSystemSmtpParams) -> Result<(), Error> {
     let context = context.deref()?;
     context
+        .seed
         .ctx
         .db
         .mutate(|db| {
@@ -304,6 +348,7 @@ async fn get_system_smtp(
 ) -> Result<String, Error> {
     let context = context.deref()?;
     let res = context
+        .seed
         .ctx
         .db
         .peek()
@@ -323,7 +368,7 @@ async fn get_system_smtp(
 }
 async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Ipv4Addr, Error> {
     let context = context.deref()?;
-    let net_service = context.persistent_container.net_service.lock().await;
+    let net_service = context.seed.persistent_container.net_service.lock().await;
     Ok(net_service.get_ip())
 }
 async fn get_service_port_forward(
@@ -333,14 +378,15 @@ async fn get_service_port_forward(
     let internal_port = data.internal_port as u16;
 
     let context = context.deref()?;
-    let net_service = context.persistent_container.net_service.lock().await;
+    let net_service = context.seed.persistent_container.net_service.lock().await;
     net_service.get_ext_port(data.host_id, internal_port)
 }
 async fn clear_network_interfaces(context: EffectContext, _: Empty) -> Result<(), Error> {
     let context = context.deref()?;
-    let package_id = context.id.clone();
+    let package_id = context.seed.id.clone();
 
     context
+        .seed
         .ctx
         .db
         .mutate(|db| {
@@ -369,7 +415,7 @@ async fn export_service_interface(
     }: ExportServiceInterfaceParams,
 ) -> Result<(), Error> {
     let context = context.deref()?;
-    let package_id = context.id.clone();
+    let package_id = context.seed.id.clone();
 
     let service_interface = ServiceInterface {
         id: id.clone(),
@@ -384,6 +430,7 @@ async fn export_service_interface(
     let svc_interface_with_host_info = service_interface;
 
     context
+        .seed
         .ctx
         .db
         .mutate(|db| {
@@ -407,7 +454,7 @@ async fn get_primary_url(
     }: GetPrimaryUrlParams,
 ) -> Result<Option<HostAddress>, Error> {
     let context = context.deref()?;
-    let package_id = package_id.unwrap_or_else(|| context.id.clone());
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
 
     Ok(None) // TODO
 }
@@ -419,9 +466,10 @@ async fn list_service_interfaces(
     }: ListServiceInterfacesParams,
 ) -> Result<BTreeMap<ServiceInterfaceId, ServiceInterface>, Error> {
     let context = context.deref()?;
-    let package_id = package_id.unwrap_or_else(|| context.id.clone());
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
 
     context
+        .seed
         .ctx
         .db
         .peek()
@@ -435,9 +483,10 @@ async fn list_service_interfaces(
 }
 async fn remove_address(context: EffectContext, data: RemoveAddressParams) -> Result<(), Error> {
     let context = context.deref()?;
-    let package_id = context.id.clone();
+    let package_id = context.seed.id.clone();
 
     context
+        .seed
         .ctx
         .db
         .mutate(|db| {
@@ -454,8 +503,9 @@ async fn remove_address(context: EffectContext, data: RemoveAddressParams) -> Re
 }
 async fn export_action(context: EffectContext, data: ExportActionParams) -> Result<(), Error> {
     let context = context.deref()?;
-    let package_id = context.id.clone();
+    let package_id = context.seed.id.clone();
     context
+        .seed
         .ctx
         .db
         .mutate(|db| {
@@ -477,8 +527,9 @@ async fn export_action(context: EffectContext, data: ExportActionParams) -> Resu
 }
 async fn remove_action(context: EffectContext, data: RemoveActionParams) -> Result<(), Error> {
     let context = context.deref()?;
-    let package_id = context.id.clone();
+    let package_id = context.seed.id.clone();
     context
+        .seed
         .ctx
         .db
         .mutate(|db| {
@@ -514,16 +565,16 @@ struct GetHostInfoParams {
     callback: Callback,
 }
 async fn get_host_info(
-    ctx: EffectContext,
+    context: EffectContext,
     GetHostInfoParams {
         callback,
         package_id,
         host_id,
     }: GetHostInfoParams,
 ) -> Result<Host, Error> {
-    let ctx = ctx.deref()?;
-    let db = ctx.ctx.db.peek().await;
-    let package_id = package_id.unwrap_or_else(|| ctx.id.clone());
+    let context = context.deref()?;
+    let db = context.seed.ctx.db.peek().await;
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
 
     db.as_public()
         .as_package_data()
@@ -536,8 +587,8 @@ async fn get_host_info(
 }
 
 async fn clear_bindings(context: EffectContext, _: Empty) -> Result<(), Error> {
-    let ctx = context.deref()?;
-    let mut svc = ctx.persistent_container.net_service.lock().await;
+    let context = context.deref()?;
+    let mut svc = context.seed.persistent_container.net_service.lock().await;
     svc.clear_bindings().await?;
     Ok(())
 }
@@ -559,8 +610,8 @@ async fn bind(context: EffectContext, bind_params: Value) -> Result<(), Error> {
         internal_port,
         options,
     } = from_value(bind_params)?;
-    let ctx = context.deref()?;
-    let mut svc = ctx.persistent_container.net_service.lock().await;
+    let context = context.deref()?;
+    let mut svc = context.seed.persistent_container.net_service.lock().await;
     svc.bind(kind, id, internal_port, options).await
 }
 
@@ -575,16 +626,16 @@ struct GetServiceInterfaceParams {
 }
 
 async fn get_service_interface(
-    ctx: EffectContext,
+    context: EffectContext,
     GetServiceInterfaceParams {
         callback,
         package_id,
         service_interface_id,
     }: GetServiceInterfaceParams,
 ) -> Result<ServiceInterface, Error> {
-    let ctx = ctx.deref()?;
-    let package_id = package_id.unwrap_or_else(|| ctx.id.clone());
-    let db = ctx.ctx.db.peek().await;
+    let context = context.deref()?;
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
+    let db = context.seed.ctx.db.peek().await;
 
     let interface = db
         .as_public()
@@ -729,8 +780,8 @@ async fn get_store(
     GetStoreParams { package_id, path }: GetStoreParams,
 ) -> Result<Value, Error> {
     let context = context.deref()?;
-    let peeked = context.ctx.db.peek().await;
-    let package_id = package_id.unwrap_or(context.id.clone());
+    let peeked = context.seed.ctx.db.peek().await;
+    let package_id = package_id.unwrap_or(context.seed.id.clone());
     let value = peeked
         .as_private()
         .as_package_stores()
@@ -758,8 +809,9 @@ async fn set_store(
     SetStoreParams { value, path }: SetStoreParams,
 ) -> Result<(), Error> {
     let context = context.deref()?;
-    let package_id = context.id.clone();
+    let package_id = context.seed.id.clone();
     context
+        .seed
         .ctx
         .db
         .mutate(|db| {
@@ -812,7 +864,7 @@ struct ParamsMaybePackageId {
 
 async fn exists(context: EffectContext, params: ParamsPackageId) -> Result<Value, Error> {
     let context = context.deref()?;
-    let peeked = context.ctx.db.peek().await;
+    let peeked = context.seed.ctx.db.peek().await;
     let package = peeked
         .as_public()
         .as_package_data()
@@ -834,31 +886,30 @@ struct ExecuteAction {
 }
 async fn execute_action(
     context: EffectContext,
-    ExecuteAction {
-        action_id,
-        input,
-        service_id,
-    }: ExecuteAction,
+    WithProcedureId {
+        procedure_id,
+        rest:
+            ExecuteAction {
+                service_id,
+                action_id,
+                input,
+            },
+    }: WithProcedureId<ExecuteAction>,
 ) -> Result<Value, Error> {
     let context = context.deref()?;
-    let package_id = service_id.clone().unwrap_or_else(|| context.id.clone());
-    let service = context.ctx.services.get(&package_id).await;
-    let service = service.as_ref().ok_or_else(|| {
-        Error::new(
-            eyre!("Could not find package {package_id}"),
-            ErrorKind::Unknown,
-        )
-    })?;
+    let package_id = service_id
+        .clone()
+        .unwrap_or_else(|| context.seed.id.clone());
 
-    Ok(json!(service.action(action_id, input).await?))
+    Ok(json!(context.action(procedure_id, action_id, input).await?))
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct FromService {}
 async fn get_configured(context: EffectContext, _: Empty) -> Result<Value, Error> {
     let context = context.deref()?;
-    let peeked = context.ctx.db.peek().await;
-    let package_id = &context.id;
+    let peeked = context.seed.ctx.db.peek().await;
+    let package_id = &context.seed.id;
     let package = peeked
         .as_public()
         .as_package_data()
@@ -872,8 +923,8 @@ async fn get_configured(context: EffectContext, _: Empty) -> Result<Value, Error
 
 async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result<Value, Error> {
     let context = context.deref()?;
-    let peeked = context.ctx.db.peek().await;
-    let package_id = params.package_id.unwrap_or_else(|| context.id.clone());
+    let peeked = context.seed.ctx.db.peek().await;
+    let package_id = params.package_id.unwrap_or_else(|| context.seed.id.clone());
     let package = peeked
         .as_public()
         .as_package_data()
@@ -887,7 +938,7 @@ async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result
 async fn running(context: EffectContext, params: ParamsPackageId) -> Result<Value, Error> {
     dbg!("Starting the running {params:?}");
     let context = context.deref()?;
-    let peeked = context.ctx.db.peek().await;
+    let peeked = context.seed.ctx.db.peek().await;
     let package_id = params.package_id;
     let package = peeked
         .as_public()
@@ -900,30 +951,24 @@ async fn running(context: EffectContext, params: ParamsPackageId) -> Result<Valu
     Ok(json!(matches!(package, MainStatus::Running { .. })))
 }
 
-async fn restart(context: EffectContext, _: Empty) -> Result<Value, Error> {
+async fn restart(
+    context: EffectContext,
+    WithProcedureId { procedure_id, .. }: WithProcedureId<Empty>,
+) -> Result<(), Error> {
     let context = context.deref()?;
-    let service = context.ctx.services.get(&context.id).await;
-    let service = service.as_ref().ok_or_else(|| {
-        Error::new(
-            eyre!("Could not find package {}", context.id),
-            ErrorKind::Unknown,
-        )
-    })?;
-    service.restart().await?;
-    Ok(json!(()))
+    dbg!("here");
+    context.restart(procedure_id).await?;
+    dbg!("here");
+    Ok(())
 }
 
-async fn shutdown(context: EffectContext, _: Empty) -> Result<Value, Error> {
+async fn shutdown(
+    context: EffectContext,
+    WithProcedureId { procedure_id, .. }: WithProcedureId<Empty>,
+) -> Result<(), Error> {
     let context = context.deref()?;
-    let service = context.ctx.services.get(&context.id).await;
-    let service = service.as_ref().ok_or_else(|| {
-        Error::new(
-            eyre!("Could not find package {}", context.id),
-            ErrorKind::Unknown,
-        )
-    })?;
-    service.stop().await?;
-    Ok(json!(()))
+    context.stop(procedure_id).await?;
+    Ok(())
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
@@ -935,8 +980,9 @@ struct SetConfigured {
 }
 async fn set_configured(context: EffectContext, params: SetConfigured) -> Result<Value, Error> {
     let context = context.deref()?;
-    let package_id = &context.id;
+    let package_id = &context.seed.id;
     context
+        .seed
         .ctx
         .db
         .mutate(|db| {
@@ -989,9 +1035,9 @@ async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Resul
     dbg!(format!("Status for main will be is {params:?}"));
     let context = context.deref()?;
     match params.status {
-        SetMainStatusStatus::Running => context.started(),
-        SetMainStatusStatus::Stopped => context.stopped(),
-        SetMainStatusStatus::Starting => context.stopped(),
+        SetMainStatusStatus::Running => context.seed.started(),
+        SetMainStatusStatus::Stopped => context.seed.stopped(),
+        SetMainStatusStatus::Starting => context.seed.stopped(),
     }
     Ok(Value::Null)
 }
@@ -1011,8 +1057,9 @@ async fn set_health(
 ) -> Result<Value, Error> {
     let context = context.deref()?;
 
-    let package_id = &context.id;
+    let package_id = &context.seed.id;
     context
+        .seed
         .ctx
         .db
         .mutate(move |db| {
@@ -1041,17 +1088,17 @@ async fn set_health(
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 pub struct DestroyOverlayedImageParams {
-    #[ts(type = "string")]
-    guid: InternedString,
+    guid: Guid,
 }
 
 #[instrument(skip_all)]
 pub async fn destroy_overlayed_image(
-    ctx: EffectContext,
+    context: EffectContext,
     DestroyOverlayedImageParams { guid }: DestroyOverlayedImageParams,
 ) -> Result<(), Error> {
-    let ctx = ctx.deref()?;
-    if ctx
+    let context = context.deref()?;
+    if context
+        .seed
         .persistent_container
         .overlays
         .lock()
@@ -1068,30 +1115,25 @@ pub async fn destroy_overlayed_image(
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 pub struct CreateOverlayedImageParams {
-    #[ts(type = "string")]
     image_id: ImageId,
 }
 
 #[instrument(skip_all)]
 pub async fn create_overlayed_image(
-    ctx: EffectContext,
+    context: EffectContext,
     CreateOverlayedImageParams { image_id }: CreateOverlayedImageParams,
-) -> Result<(PathBuf, InternedString), Error> {
-    let ctx = ctx.deref()?;
-    let path = Path::new("images")
-        .join(*ARCH)
-        .join(&image_id)
-        .with_extension("squashfs");
-    if let Some(image) = ctx
+) -> Result<(PathBuf, Guid), Error> {
+    let context = context.deref()?;
+    if let Some(image) = context
+        .seed
         .persistent_container
-        .s9pk
-        .as_archive()
-        .contents()
-        .get_path(&path)
-        .and_then(|e| e.as_file())
+        .images
+        .get(&image_id)
+        .cloned()
     {
-        let guid = new_guid();
-        let rootfs_dir = ctx
+        let guid = Guid::new();
+        let rootfs_dir = context
+            .seed
             .persistent_container
             .lxc_container
             .get()
@@ -1102,7 +1144,9 @@ pub async fn create_overlayed_image(
                 )
             })?
             .rootfs_dir();
-        let mountpoint = rootfs_dir.join("media/startos/overlays").join(&*guid);
+        let mountpoint = rootfs_dir
+            .join("media/startos/overlays")
+            .join(guid.as_ref());
         tokio::fs::create_dir_all(&mountpoint).await?;
         let container_mountpoint = Path::new("/").join(
             mountpoint
@@ -1110,18 +1154,16 @@ pub async fn create_overlayed_image(
                 .with_kind(ErrorKind::Incoherent)?,
         );
         tracing::info!("Mounting overlay {guid} for {image_id}");
-        let guard = OverlayGuard::mount(
-            &IdMapped::new(LoopDev::from(&**image), 0, 100000, 65536),
-            &mountpoint,
-        )
-        .await?;
+        let guard = OverlayGuard::mount(image, &mountpoint).await?;
         Command::new("chown")
             .arg("100000:100000")
             .arg(&mountpoint)
             .invoke(ErrorKind::Filesystem)
             .await?;
         tracing::info!("Mounted overlay {guid} for {image_id}");
-        ctx.persistent_container
+        context
+            .seed
+            .persistent_container
             .overlays
             .lock()
             .await
@@ -1228,13 +1270,15 @@ struct SetDependenciesParams {
 }
 
 async fn set_dependencies(
-    ctx: EffectContext,
-    SetDependenciesParams { dependencies }: SetDependenciesParams,
+    context: EffectContext,
+    WithProcedureId {
+        procedure_id,
+        rest: SetDependenciesParams { dependencies },
+    }: WithProcedureId<SetDependenciesParams>,
 ) -> Result<(), Error> {
-    let ctx = ctx.deref()?;
-    let id = &ctx.id;
-    let service_guard = ctx.ctx.services.get(id).await;
-    let service = service_guard.as_ref().or_not_found(id)?;
+    let context = context.deref()?;
+    let id = &context.seed.id;
+
     let mut deps = BTreeMap::new();
     for dependency in dependencies {
         let (dep_id, kind, registry_url, version_spec) = match dependency {
@@ -1264,14 +1308,13 @@ async fn set_dependencies(
             let remote_s9pk = S9pk::deserialize(
                 &Arc::new(
                     HttpSource::new(
-                        ctx.ctx.client.clone(),
+                        context.seed.ctx.client.clone(),
                         registry_url
                             .join(&format!("package/v2/{}.s9pk?spec={}", dep_id, version_spec))?,
                     )
                     .await?,
                 ),
                 None, // TODO
-                true,
             )
             .await?;
 
@@ -1291,14 +1334,19 @@ async fn set_dependencies(
                 )
             }
         };
-        let config_satisfied = if let Some(dep_service) = &*ctx.ctx.services.get(&dep_id).await {
-            service
-                .dependency_config(dep_id.clone(), dep_service.get_config().await?.config)
-                .await?
-                .is_none()
-        } else {
-            true
-        };
+        let config_satisfied =
+            if let Some(dep_service) = &*context.seed.ctx.services.get(&dep_id).await {
+                context
+                    .dependency_config(
+                        procedure_id.clone(),
+                        dep_id.clone(),
+                        dep_service.get_config(procedure_id.clone()).await?.config,
+                    )
+                    .await?
+                    .is_none()
+            } else {
+                true
+            };
         deps.insert(
             dep_id,
             CurrentDependencyInfo {
@@ -1311,7 +1359,9 @@ async fn set_dependencies(
             },
         );
     }
-    ctx.ctx
+    context
+        .seed
+        .ctx
         .db
         .mutate(|db| {
             db.as_public_mut()
@@ -1324,10 +1374,10 @@ async fn set_dependencies(
         .await
 }
 
-async fn get_dependencies(ctx: EffectContext) -> Result<Vec<DependencyRequirement>, Error> {
-    let ctx = ctx.deref()?;
-    let id = &ctx.id;
-    let db = ctx.ctx.db.peek().await;
+async fn get_dependencies(context: EffectContext) -> Result<Vec<DependencyRequirement>, Error> {
+    let context = context.deref()?;
+    let id = &context.seed.id;
+    let db = context.seed.ctx.db.peek().await;
     let data = db
         .as_public()
         .as_package_data()
@@ -1384,16 +1434,16 @@ struct CheckDependenciesResult {
 }
 
 async fn check_dependencies(
-    ctx: EffectContext,
+    context: EffectContext,
     CheckDependenciesParam { package_ids }: CheckDependenciesParam,
 ) -> Result<Vec<CheckDependenciesResult>, Error> {
-    let ctx = ctx.deref()?;
-    let db = ctx.ctx.db.peek().await;
+    let context = context.deref()?;
+    let db = context.seed.ctx.db.peek().await;
     let current_dependencies = db
         .as_public()
         .as_package_data()
-        .as_idx(&ctx.id)
-        .or_not_found(&ctx.id)?
+        .as_idx(&context.seed.id)
+        .or_not_found(&context.seed.id)?
         .as_current_dependencies()
         .de()?;
     let package_ids: Vec<_> = package_ids
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index ba9188f32..1474ea35e 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -25,7 +25,7 @@ use crate::progress::{
 use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
-use crate::service::{LoadDisposition, Service};
+use crate::service::{LoadDisposition, Service, ServiceRef};
 use crate::status::{MainStatus, Status};
 use crate::util::serde::Pem;
 
@@ -39,23 +39,22 @@ pub struct InstallProgressHandles {
 
 /// This is the structure to contain all the services
 #[derive(Default)]
-pub struct ServiceMap(Mutex<OrdMap<PackageId, Arc<RwLock<Option<Service>>>>>);
+pub struct ServiceMap(Mutex<OrdMap<PackageId, Arc<RwLock<Option<ServiceRef>>>>>);
 impl ServiceMap {
-    async fn entry(&self, id: &PackageId) -> Arc<RwLock<Option<Service>>> {
+    async fn entry(&self, id: &PackageId) -> Arc<RwLock<Option<ServiceRef>>> {
         let mut lock = self.0.lock().await;
-        dbg!(lock.keys().collect::<Vec<_>>());
         lock.entry(id.clone())
             .or_insert_with(|| Arc::new(RwLock::new(None)))
             .clone()
     }
 
     #[instrument(skip_all)]
-    pub async fn get(&self, id: &PackageId) -> OwnedRwLockReadGuard<Option<Service>> {
+    pub async fn get(&self, id: &PackageId) -> OwnedRwLockReadGuard<Option<ServiceRef>> {
         self.entry(id).await.read_owned().await
     }
 
     #[instrument(skip_all)]
-    pub async fn get_mut(&self, id: &PackageId) -> OwnedRwLockWriteGuard<Option<Service>> {
+    pub async fn get_mut(&self, id: &PackageId) -> OwnedRwLockWriteGuard<Option<ServiceRef>> {
         self.entry(id).await.write_owned().await
     }
 
@@ -83,7 +82,7 @@ impl ServiceMap {
             shutdown_err = service.shutdown().await;
         }
         // TODO: retry on error?
-        *service = Service::load(ctx, id, disposition).await?;
+        *service = Service::load(ctx, id, disposition).await?.map(From::from);
         shutdown_err?;
         Ok(())
     }
@@ -95,6 +94,7 @@ impl ServiceMap {
         mut s9pk: S9pk<S>,
         recovery_source: Option<impl GenericMountGuard>,
     ) -> Result<DownloadInstallFuture, Error> {
+        s9pk.validate_and_filter(ctx.s9pk_arch)?;
         let manifest = s9pk.as_manifest().clone();
         let id = manifest.id.clone();
         let icon = s9pk.icon_data_url().await?;
@@ -128,7 +128,7 @@ impl ServiceMap {
         );
         let restoring = recovery_source.is_some();
 
-        let mut reload_guard = ServiceReloadGuard::new(ctx.clone(), id.clone(), op_name);
+        let mut reload_guard = ServiceRefReloadGuard::new(ctx.clone(), id.clone(), op_name);
 
         reload_guard
             .handle(ctx.db.mutate({
@@ -231,7 +231,7 @@ impl ServiceMap {
             Ok(reload_guard
                 .handle_last(async move {
                     finalization_progress.start();
-                    let s9pk = S9pk::open(&installed_path, Some(&id), true).await?;
+                    let s9pk = S9pk::open(&installed_path, Some(&id)).await?;
                     let prev = if let Some(service) = service.take() {
                         ensure_code!(
                             recovery_source.is_none(),
@@ -264,7 +264,8 @@ impl ServiceMap {
                                     progress_handle,
                                 }),
                             )
-                            .await?,
+                            .await?
+                            .into(),
                         );
                     } else {
                         *service = Some(
@@ -277,7 +278,8 @@ impl ServiceMap {
                                     progress_handle,
                                 }),
                             )
-                            .await?,
+                            .await?
+                            .into(),
                         );
                     }
                     sync_progress_task.await.map_err(|_| {
@@ -295,7 +297,7 @@ impl ServiceMap {
     pub async fn uninstall(&self, ctx: &RpcContext, id: &PackageId) -> Result<(), Error> {
         let mut guard = self.get_mut(id).await;
         if let Some(service) = guard.take() {
-            ServiceReloadGuard::new(ctx.clone(), id.clone(), "Uninstall")
+            ServiceRefReloadGuard::new(ctx.clone(), id.clone(), "Uninstall")
                 .handle_last(async move {
                     let res = service.uninstall(None).await;
                     drop(guard);
@@ -326,17 +328,17 @@ impl ServiceMap {
     }
 }
 
-pub struct ServiceReloadGuard(Option<ServiceReloadInfo>);
-impl Drop for ServiceReloadGuard {
+pub struct ServiceRefReloadGuard(Option<ServiceRefReloadInfo>);
+impl Drop for ServiceRefReloadGuard {
     fn drop(&mut self) {
         if let Some(info) = self.0.take() {
             tokio::spawn(info.reload(None));
         }
     }
 }
-impl ServiceReloadGuard {
+impl ServiceRefReloadGuard {
     pub fn new(ctx: RpcContext, id: PackageId, operation: &'static str) -> Self {
-        Self(Some(ServiceReloadInfo { ctx, id, operation }))
+        Self(Some(ServiceRefReloadInfo { ctx, id, operation }))
     }
 
     pub async fn handle<T>(
@@ -365,12 +367,12 @@ impl ServiceReloadGuard {
     }
 }
 
-struct ServiceReloadInfo {
+struct ServiceRefReloadInfo {
     ctx: RpcContext,
     id: PackageId,
     operation: &'static str,
 }
-impl ServiceReloadInfo {
+impl ServiceRefReloadInfo {
     async fn reload(self, error: Option<Error>) -> Result<(), Error> {
         self.ctx
             .services
diff --git a/core/startos/src/service/transition/backup.rs b/core/startos/src/service/transition/backup.rs
index e6a5cb817..f7591f0d9 100644
--- a/core/startos/src/service/transition/backup.rs
+++ b/core/startos/src/service/transition/backup.rs
@@ -6,6 +6,7 @@ use models::ProcedureName;
 use super::TempDesiredRestore;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::service::config::GetConfig;
 use crate::service::dependencies::DependencyConfig;
 use crate::service::transition::{TransitionKind, TransitionState};
@@ -24,7 +25,12 @@ impl Handler<Backup> for ServiceActor {
             .except::<GetConfig>()
             .except::<DependencyConfig>()
     }
-    async fn handle(&mut self, backup: Backup, jobs: &BackgroundJobQueue) -> Self::Response {
+    async fn handle(
+        &mut self,
+        id: Guid,
+        backup: Backup,
+        jobs: &BackgroundJobQueue,
+    ) -> Self::Response {
         // So Need a handle to just a single field in the state
         let temp: TempDesiredRestore = TempDesiredRestore::new(&self.0.persistent_container.state);
         let mut current = self.0.persistent_container.state.subscribe();
@@ -45,7 +51,7 @@ impl Handler<Backup> for ServiceActor {
                     .mount_backup(path, ReadWrite)
                     .await?;
                 seed.persistent_container
-                    .execute(ProcedureName::CreateBackup, Value::Null, None)
+                    .execute(id, ProcedureName::CreateBackup, Value::Null, None)
                     .await?;
                 backup_guard.unmount(true).await?;
 
diff --git a/core/startos/src/service/transition/restart.rs b/core/startos/src/service/transition/restart.rs
index 07466def1..a39291621 100644
--- a/core/startos/src/service/transition/restart.rs
+++ b/core/startos/src/service/transition/restart.rs
@@ -2,6 +2,7 @@ use futures::FutureExt;
 
 use super::TempDesiredRestore;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::service::config::GetConfig;
 use crate::service::dependencies::DependencyConfig;
 use crate::service::transition::{TransitionKind, TransitionState};
@@ -18,7 +19,8 @@ impl Handler<Restart> for ServiceActor {
             .except::<GetConfig>()
             .except::<DependencyConfig>()
     }
-    async fn handle(&mut self, _: Restart, jobs: &BackgroundJobQueue) -> Self::Response {
+    async fn handle(&mut self, _: Guid, _: Restart, jobs: &BackgroundJobQueue) -> Self::Response {
+        dbg!("here");
         // So Need a handle to just a single field in the state
         let temp = TempDesiredRestore::new(&self.0.persistent_container.state);
         let mut current = self.0.persistent_container.state.subscribe();
@@ -74,7 +76,8 @@ impl Handler<Restart> for ServiceActor {
 }
 impl Service {
     #[instrument(skip_all)]
-    pub async fn restart(&self) -> Result<(), Error> {
-        self.actor.send(Restart).await
+    pub async fn restart(&self, id: Guid) -> Result<(), Error> {
+        dbg!("here");
+        self.actor.send(id, Restart).await
     }
 }
diff --git a/core/startos/src/service/transition/restore.rs b/core/startos/src/service/transition/restore.rs
index b32ade4f5..1c4020ea4 100644
--- a/core/startos/src/service/transition/restore.rs
+++ b/core/startos/src/service/transition/restore.rs
@@ -5,6 +5,7 @@ use models::ProcedureName;
 
 use crate::disk::mount::filesystem::ReadOnly;
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::service::transition::{TransitionKind, TransitionState};
 use crate::service::ServiceActor;
 use crate::util::actor::background::BackgroundJobQueue;
@@ -19,7 +20,12 @@ impl Handler<Restore> for ServiceActor {
     fn conflicts_with(_: &Restore) -> ConflictBuilder<Self> {
         ConflictBuilder::everything()
     }
-    async fn handle(&mut self, restore: Restore, jobs: &BackgroundJobQueue) -> Self::Response {
+    async fn handle(
+        &mut self,
+        id: Guid,
+        restore: Restore,
+        jobs: &BackgroundJobQueue,
+    ) -> Self::Response {
         // So Need a handle to just a single field in the state
         let path = restore.path.clone();
         let seed = self.0.clone();
@@ -32,7 +38,7 @@ impl Handler<Restore> for ServiceActor {
                     .mount_backup(path, ReadOnly)
                     .await?;
                 seed.persistent_container
-                    .execute(ProcedureName::RestoreBackup, Value::Null, None)
+                    .execute(id, ProcedureName::RestoreBackup, Value::Null, None)
                     .await?;
                 backup_guard.unmount(true).await?;
 
diff --git a/core/startos/src/util/actor/concurrent.rs b/core/startos/src/util/actor/concurrent.rs
index e32470d80..7b26fc4c7 100644
--- a/core/startos/src/util/actor/concurrent.rs
+++ b/core/startos/src/util/actor/concurrent.rs
@@ -8,6 +8,7 @@ use helpers::NonDetachingJoinHandle;
 use tokio::sync::{mpsc, oneshot};
 
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::util::actor::background::{BackgroundJobQueue, BackgroundJobRunner};
 use crate::util::actor::{Actor, ConflictFn, Handler, PendingMessageStrategy, Request};
 
@@ -18,6 +19,7 @@ struct ConcurrentRunner<A> {
     waiting: Vec<Request<A>>,
     recv: mpsc::UnboundedReceiver<Request<A>>,
     handlers: Vec<(
+        Guid,
         Arc<ConflictFn<A>>,
         oneshot::Sender<Box<dyn Any + Send>>,
         BoxFuture<'static, Box<dyn Any + Send>>,
@@ -41,16 +43,21 @@ impl<A: Actor + Clone> Future for ConcurrentRunner<A> {
             }
         });
         if this.shutdown.is_some() {
-            while let std::task::Poll::Ready(Some((msg, reply))) = this.recv.poll_recv(cx) {
-                if this.handlers.iter().any(|(f, _, _)| f(&*msg)) {
-                    this.waiting.push((msg, reply));
+            while let std::task::Poll::Ready(Some((id, msg, reply))) = this.recv.poll_recv(cx) {
+                if this
+                    .handlers
+                    .iter()
+                    .any(|(hid, f, _, _)| &id != hid && f(&*msg))
+                {
+                    this.waiting.push((id, msg, reply));
                 } else {
                     let mut actor = this.actor.clone();
                     let queue = this.queue.clone();
                     this.handlers.push((
+                        id.clone(),
                         msg.conflicts_with(),
                         reply,
-                        async move { msg.handle_with(&mut actor, &queue).await }.boxed(),
+                        async move { msg.handle_with(id, &mut actor, &queue).await }.boxed(),
                     ))
                 }
             }
@@ -62,29 +69,34 @@ impl<A: Actor + Clone> Future for ConcurrentRunner<A> {
                 .handlers
                 .iter_mut()
                 .enumerate()
-                .filter_map(|(i, (_, _, f))| match f.poll_unpin(cx) {
+                .filter_map(|(i, (_, _, _, f))| match f.poll_unpin(cx) {
                     std::task::Poll::Pending => None,
                     std::task::Poll::Ready(res) => Some((i, res)),
                 })
                 .collect::<Vec<_>>();
             for (idx, res) in complete.into_iter().rev() {
                 #[allow(clippy::let_underscore_future)]
-                let (f, reply, _) = this.handlers.swap_remove(idx);
+                let (_, f, reply, _) = this.handlers.swap_remove(idx);
                 let _ = reply.send(res);
                 // TODO: replace with Vec::extract_if once stable
                 if this.shutdown.is_some() {
                     let mut i = 0;
                     while i < this.waiting.len() {
-                        if f(&*this.waiting[i].0)
-                            && !this.handlers.iter().any(|(f, _, _)| f(&*this.waiting[i].0))
+                        if f(&*this.waiting[i].1)
+                            && !this
+                                .handlers
+                                .iter()
+                                .any(|(_, f, _, _)| f(&*this.waiting[i].1))
                         {
-                            let (msg, reply) = this.waiting.remove(i);
+                            let (id, msg, reply) = this.waiting.remove(i);
                             let mut actor = this.actor.clone();
                             let queue = this.queue.clone();
                             this.handlers.push((
+                                id.clone(),
                                 msg.conflicts_with(),
                                 reply,
-                                async move { msg.handle_with(&mut actor, &queue).await }.boxed(),
+                                async move { msg.handle_with(id, &mut actor, &queue).await }
+                                    .boxed(),
                             ));
                             cont = true;
                         } else {
@@ -137,6 +149,7 @@ impl<A: Actor + Clone> ConcurrentActor<A> {
     /// Message is guaranteed to be queued immediately
     pub fn queue<M: Send + 'static>(
         &self,
+        id: Guid,
         message: M,
     ) -> impl Future<Output = Result<A::Response, Error>>
     where
@@ -150,7 +163,7 @@ impl<A: Actor + Clone> ConcurrentActor<A> {
         }
         let (reply_send, reply_recv) = oneshot::channel();
         self.messenger
-            .send((Box::new(message), reply_send))
+            .send((id, Box::new(message), reply_send))
             .unwrap();
         futures::future::Either::Right(
             reply_recv
@@ -170,11 +183,11 @@ impl<A: Actor + Clone> ConcurrentActor<A> {
         )
     }
 
-    pub async fn send<M: Send + 'static>(&self, message: M) -> Result<A::Response, Error>
+    pub async fn send<M: Send + 'static>(&self, id: Guid, message: M) -> Result<A::Response, Error>
     where
         A: Handler<M>,
     {
-        self.queue(message).await
+        self.queue(id, message).await
     }
 
     pub async fn shutdown(self, strategy: PendingMessageStrategy) {
diff --git a/core/startos/src/util/actor/mod.rs b/core/startos/src/util/actor/mod.rs
index 5cef7c22e..d85e53757 100644
--- a/core/startos/src/util/actor/mod.rs
+++ b/core/startos/src/util/actor/mod.rs
@@ -9,6 +9,7 @@ use tokio::sync::oneshot;
 
 #[allow(unused_imports)]
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::util::actor::background::BackgroundJobQueue;
 
 pub mod background;
@@ -28,6 +29,7 @@ pub trait Handler<M: Any + Send>: Actor {
     }
     fn handle(
         &mut self,
+        id: Guid,
         msg: M,
         jobs: &BackgroundJobQueue,
     ) -> impl Future<Output = Self::Response> + Send;
@@ -39,6 +41,7 @@ trait Message<A>: Send + Any {
     fn conflicts_with(&self) -> Arc<ConflictFn<A>>;
     fn handle_with<'a>(
         self: Box<Self>,
+        id: Guid,
         actor: &'a mut A,
         jobs: &'a BackgroundJobQueue,
     ) -> BoxFuture<'a, Box<dyn Any + Send>>;
@@ -52,10 +55,11 @@ where
     }
     fn handle_with<'a>(
         self: Box<Self>,
+        id: Guid,
         actor: &'a mut A,
         jobs: &'a BackgroundJobQueue,
     ) -> BoxFuture<'a, Box<dyn Any + Send>> {
-        async move { Box::new(actor.handle(*self, jobs).await) as Box<dyn Any + Send> }.boxed()
+        async move { Box::new(actor.handle(id, *self, jobs).await) as Box<dyn Any + Send> }.boxed()
     }
 }
 impl<A: Actor> dyn Message<A> {
@@ -80,7 +84,11 @@ impl<A: Actor> dyn Message<A> {
     }
 }
 
-type Request<A> = (Box<dyn Message<A>>, oneshot::Sender<Box<dyn Any + Send>>);
+type Request<A> = (
+    Guid,
+    Box<dyn Message<A>>,
+    oneshot::Sender<Box<dyn Any + Send>>,
+);
 
 pub enum PendingMessageStrategy {
     CancelAll,
diff --git a/core/startos/src/util/actor/simple.rs b/core/startos/src/util/actor/simple.rs
index 6f880a57a..7f2ad388e 100644
--- a/core/startos/src/util/actor/simple.rs
+++ b/core/startos/src/util/actor/simple.rs
@@ -7,6 +7,7 @@ use tokio::sync::oneshot::error::TryRecvError;
 use tokio::sync::{mpsc, oneshot};
 
 use crate::prelude::*;
+use crate::rpc_continuations::Guid;
 use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::{Actor, Handler, PendingMessageStrategy, Request};
 
@@ -26,9 +27,9 @@ impl<A: Actor> SimpleActor<A> {
                 tokio::select! {
                     _ = &mut runner => (),
                     msg = messenger_recv.recv() => match msg {
-                        Some((msg, reply)) if shutdown_recv.try_recv() == Err(TryRecvError::Empty) => {
+                        Some((id, msg, reply)) if shutdown_recv.try_recv() == Err(TryRecvError::Empty) => {
                             tokio::select! {
-                                res = msg.handle_with(&mut actor, &queue) => { let _ = reply.send(res); },
+                                res = msg.handle_with(id, &mut actor, &queue) => { let _ = reply.send(res); },
                                 _ = &mut runner => (),
                             }
                         }
@@ -60,7 +61,7 @@ impl<A: Actor> SimpleActor<A> {
         }
         let (reply_send, reply_recv) = oneshot::channel();
         self.messenger
-            .send((Box::new(message), reply_send))
+            .send((Guid::new(), Box::new(message), reply_send))
             .unwrap();
         futures::future::Either::Right(
             reply_recv
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index 16bafd8f6..f4476ee2b 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -681,8 +681,6 @@ impl<S: AsyncRead + AsyncWrite> AsyncWrite for TimeoutStream<S> {
     }
 }
 
-pub struct TmpFile {}
-
 #[derive(Debug)]
 pub struct TmpDir {
     path: PathBuf,
@@ -707,6 +705,14 @@ impl TmpDir {
         tokio::fs::remove_dir_all(&self.path).await?;
         Ok(())
     }
+
+    pub async fn gc(self: Arc<Self>) -> Result<(), Error> {
+        if let Ok(dir) = Arc::try_unwrap(self) {
+            dir.delete().await
+        } else {
+            Ok(())
+        }
+    }
 }
 impl std::ops::Deref for TmpDir {
     type Target = Path;
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index aa17b6d7a..4346a0b1e 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, VecDeque};
 use std::future::Future;
 use std::marker::PhantomData;
 use std::path::{Path, PathBuf};
@@ -11,6 +11,8 @@ use std::time::Duration;
 use async_trait::async_trait;
 use color_eyre::eyre::{self, eyre};
 use fd_lock_rs::FdLock;
+use futures::future::BoxFuture;
+use futures::FutureExt;
 use helpers::canonicalize;
 pub use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
@@ -19,7 +21,8 @@ pub use models::VersionString;
 use pin_project::pin_project;
 use sha2::Digest;
 use tokio::fs::File;
-use tokio::sync::{Mutex, OwnedMutexGuard, RwLock};
+use tokio::io::{AsyncRead, AsyncReadExt, BufReader};
+use tokio::sync::{oneshot, Mutex, OwnedMutexGuard, RwLock};
 use tracing::instrument;
 
 use crate::shutdown::Shutdown;
@@ -62,11 +65,16 @@ pub trait Invoke<'a> {
     where
         Self: 'ext,
         'ext: 'a;
+    fn pipe<'ext: 'a>(
+        &'ext mut self,
+        next: &'ext mut tokio::process::Command,
+    ) -> Self::Extended<'ext>;
     fn timeout<'ext: 'a>(&'ext mut self, timeout: Option<Duration>) -> Self::Extended<'ext>;
     fn input<'ext: 'a, Input: tokio::io::AsyncRead + Unpin + Send>(
         &'ext mut self,
         input: Option<&'ext mut Input>,
     ) -> Self::Extended<'ext>;
+    fn capture<'ext: 'a>(&'ext mut self, capture: bool) -> Self::Extended<'ext>;
     fn invoke(
         &mut self,
         error_kind: crate::ErrorKind,
@@ -76,7 +84,20 @@ pub trait Invoke<'a> {
 pub struct ExtendedCommand<'a> {
     cmd: &'a mut tokio::process::Command,
     timeout: Option<Duration>,
-    input: Option<&'a mut (dyn tokio::io::AsyncRead + Unpin + Send)>,
+    input: Option<&'a mut (dyn AsyncRead + Unpin + Send)>,
+    pipe: VecDeque<&'a mut tokio::process::Command>,
+    capture: bool,
+}
+impl<'a> From<&'a mut tokio::process::Command> for ExtendedCommand<'a> {
+    fn from(value: &'a mut tokio::process::Command) -> Self {
+        ExtendedCommand {
+            cmd: value,
+            timeout: None,
+            input: None,
+            pipe: VecDeque::new(),
+            capture: true,
+        }
+    }
 }
 impl<'a> std::ops::Deref for ExtendedCommand<'a> {
     type Target = tokio::process::Command;
@@ -95,35 +116,38 @@ impl<'a> Invoke<'a> for tokio::process::Command {
     where
         Self: 'ext,
         'ext: 'a;
+    fn pipe<'ext: 'a>(
+        &'ext mut self,
+        next: &'ext mut tokio::process::Command,
+    ) -> Self::Extended<'ext> {
+        let mut cmd = ExtendedCommand::from(self);
+        cmd.pipe.push_back(next);
+        cmd
+    }
     fn timeout<'ext: 'a>(&'ext mut self, timeout: Option<Duration>) -> Self::Extended<'ext> {
-        ExtendedCommand {
-            cmd: self,
-            timeout,
-            input: None,
-        }
+        let mut cmd = ExtendedCommand::from(self);
+        cmd.timeout = timeout;
+        cmd
     }
-    fn input<'ext: 'a, Input: tokio::io::AsyncRead + Unpin + Send>(
+    fn input<'ext: 'a, Input: AsyncRead + Unpin + Send>(
         &'ext mut self,
         input: Option<&'ext mut Input>,
     ) -> Self::Extended<'ext> {
-        ExtendedCommand {
-            cmd: self,
-            timeout: None,
-            input: if let Some(input) = input {
-                Some(&mut *input)
-            } else {
-                None
-            },
-        }
+        let mut cmd = ExtendedCommand::from(self);
+        cmd.input = if let Some(input) = input {
+            Some(&mut *input)
+        } else {
+            None
+        };
+        cmd
+    }
+    fn capture<'ext: 'a>(&'ext mut self, capture: bool) -> Self::Extended<'ext> {
+        let mut cmd = ExtendedCommand::from(self);
+        cmd.capture = capture;
+        cmd
     }
     async fn invoke(&mut self, error_kind: crate::ErrorKind) -> Result<Vec<u8>, Error> {
-        ExtendedCommand {
-            cmd: self,
-            timeout: None,
-            input: None,
-        }
-        .invoke(error_kind)
-        .await
+        ExtendedCommand::from(self).invoke(error_kind).await
     }
 }
 
@@ -132,6 +156,13 @@ impl<'a> Invoke<'a> for ExtendedCommand<'a> {
     where
         Self: 'ext,
         'ext: 'a;
+    fn pipe<'ext: 'a>(
+        &'ext mut self,
+        next: &'ext mut tokio::process::Command,
+    ) -> Self::Extended<'ext> {
+        self.pipe.push_back(next.kill_on_drop(true));
+        self
+    }
     fn timeout<'ext: 'a>(&'ext mut self, timeout: Option<Duration>) -> Self::Extended<'ext> {
         self.timeout = timeout;
         self
@@ -147,39 +178,150 @@ impl<'a> Invoke<'a> for ExtendedCommand<'a> {
         };
         self
     }
+    fn capture<'ext: 'a>(&'ext mut self, capture: bool) -> Self::Extended<'ext> {
+        self.capture = capture;
+        self
+    }
+    #[instrument(skip_all)]
     async fn invoke(&mut self, error_kind: crate::ErrorKind) -> Result<Vec<u8>, Error> {
+        let cmd_str = self
+            .cmd
+            .as_std()
+            .get_program()
+            .to_string_lossy()
+            .into_owned();
         self.cmd.kill_on_drop(true);
         if self.input.is_some() {
             self.cmd.stdin(Stdio::piped());
         }
-        self.cmd.stdout(Stdio::piped());
-        self.cmd.stderr(Stdio::piped());
-        let mut child = self.cmd.spawn().with_kind(error_kind)?;
-        if let (Some(mut stdin), Some(input)) = (child.stdin.take(), self.input.take()) {
-            use tokio::io::AsyncWriteExt;
-            tokio::io::copy(input, &mut stdin).await?;
-            stdin.flush().await?;
-            stdin.shutdown().await?;
-            drop(stdin);
+        if self.pipe.is_empty() {
+            if self.capture {
+                self.cmd.stdout(Stdio::piped());
+                self.cmd.stderr(Stdio::piped());
+            }
+            let mut child = self.cmd.spawn().with_ctx(|_| (error_kind, &cmd_str))?;
+            if let (Some(mut stdin), Some(input)) = (child.stdin.take(), self.input.take()) {
+                use tokio::io::AsyncWriteExt;
+                tokio::io::copy(input, &mut stdin).await?;
+                stdin.flush().await?;
+                stdin.shutdown().await?;
+                drop(stdin);
+            }
+            let res = match self.timeout {
+                None => child
+                    .wait_with_output()
+                    .await
+                    .with_ctx(|_| (error_kind, &cmd_str))?,
+                Some(t) => tokio::time::timeout(t, child.wait_with_output())
+                    .await
+                    .with_kind(ErrorKind::Timeout)?
+                    .with_ctx(|_| (error_kind, &cmd_str))?,
+            };
+            crate::ensure_code!(
+                res.status.success(),
+                error_kind,
+                "{}",
+                Some(&res.stderr)
+                    .filter(|a| !a.is_empty())
+                    .or(Some(&res.stdout))
+                    .filter(|a| !a.is_empty())
+                    .and_then(|a| std::str::from_utf8(a).ok())
+                    .unwrap_or(&format!(
+                        "{} exited with code {}",
+                        self.cmd.as_std().get_program().to_string_lossy(),
+                        res.status
+                    ))
+            );
+            Ok(res.stdout)
+        } else {
+            let mut futures = Vec::<BoxFuture<'_, Result<(), Error>>>::new(); // todo: predict capacity
+
+            let mut cmds = std::mem::take(&mut self.pipe);
+            cmds.push_front(&mut *self.cmd);
+            let len = cmds.len();
+
+            let timeout = self.timeout;
+
+            let mut prev = self
+                .input
+                .take()
+                .map(|i| Box::new(i) as Box<dyn AsyncRead + Unpin + Send>);
+            for (idx, cmd) in IntoIterator::into_iter(cmds).enumerate() {
+                let last = idx == len - 1;
+                if self.capture || !last {
+                    cmd.stdout(Stdio::piped());
+                }
+                if self.capture {
+                    cmd.stderr(Stdio::piped());
+                }
+                if prev.is_some() {
+                    cmd.stdin(Stdio::piped());
+                }
+                let mut child = cmd.spawn().with_kind(error_kind)?;
+                let input = std::mem::replace(
+                    &mut prev,
+                    child
+                        .stdout
+                        .take()
+                        .map(|i| Box::new(BufReader::new(i)) as Box<dyn AsyncRead + Unpin + Send>),
+                );
+                futures.push(
+                    async move {
+                        if let (Some(mut stdin), Some(mut input)) = (child.stdin.take(), input) {
+                            use tokio::io::AsyncWriteExt;
+                            tokio::io::copy(&mut input, &mut stdin).await?;
+                            stdin.flush().await?;
+                            stdin.shutdown().await?;
+                            drop(stdin);
+                        }
+                        let res = match timeout {
+                            None => child.wait_with_output().await?,
+                            Some(t) => tokio::time::timeout(t, child.wait_with_output())
+                                .await
+                                .with_kind(ErrorKind::Timeout)??,
+                        };
+                        crate::ensure_code!(
+                            res.status.success(),
+                            error_kind,
+                            "{}",
+                            Some(&res.stderr)
+                                .filter(|a| !a.is_empty())
+                                .or(Some(&res.stdout))
+                                .filter(|a| !a.is_empty())
+                                .and_then(|a| std::str::from_utf8(a).ok())
+                                .unwrap_or(&format!(
+                                    "{} exited with code {}",
+                                    cmd.as_std().get_program().to_string_lossy(),
+                                    res.status
+                                ))
+                        );
+
+                        Ok(())
+                    }
+                    .boxed(),
+                );
+            }
+
+            let (send, recv) = oneshot::channel();
+            futures.push(
+                async move {
+                    if let Some(mut prev) = prev {
+                        let mut res = Vec::new();
+                        prev.read_to_end(&mut res).await?;
+                        send.send(res).unwrap();
+                    } else {
+                        send.send(Vec::new()).unwrap();
+                    }
+
+                    Ok(())
+                }
+                .boxed(),
+            );
+
+            futures::future::try_join_all(futures).await?;
+
+            Ok(recv.await.unwrap())
         }
-        let res = match self.timeout {
-            None => child.wait_with_output().await?,
-            Some(t) => tokio::time::timeout(t, child.wait_with_output())
-                .await
-                .with_kind(ErrorKind::Timeout)??,
-        };
-        crate::ensure_code!(
-            res.status.success(),
-            error_kind,
-            "{}",
-            Some(&res.stderr)
-                .filter(|a| !a.is_empty())
-                .or(Some(&res.stdout))
-                .filter(|a| !a.is_empty())
-                .and_then(|a| std::str::from_utf8(a).ok())
-                .unwrap_or(&format!("Unknown Error ({})", res.status))
-        );
-        Ok(res.stdout)
     }
 }
 
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index f5959a084..4208928c9 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -187,7 +187,10 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       nullIfEmpty,
       runCommand: async <A extends string>(
         effects: Effects,
-        image: { id: Manifest["images"][number]; sharedRun?: boolean },
+        image: {
+          id: keyof Manifest["images"] & T.ImageId
+          sharedRun?: boolean
+        },
         command: ValidIfNoStupidEscape<A> | [string, ...string[]],
         options: CommandOptions & {
           mounts?: { path: string; options: MountOptions }[]
@@ -396,7 +399,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       setupProperties:
         (
           fn: (options: { effects: Effects }) => Promise<T.SdkPropertiesReturn>,
-        ): T.ExpectedExports.Properties =>
+        ): T.ExpectedExports.properties =>
         (options) =>
           fn(options).then(nullifyProperties),
       setupUninstall: (fn: UninstallFn<Manifest, Store>) =>
@@ -743,7 +746,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
 
 export async function runCommand<Manifest extends SDKManifest>(
   effects: Effects,
-  image: { id: Manifest["images"][number]; sharedRun?: boolean },
+  image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean },
   command: string | [string, ...string[]],
   options: CommandOptions & {
     mounts?: { path: string; options: MountOptions }[]
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index ca0e3ebb9..1ed8652bf 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -8,12 +8,13 @@ import { defaultTrigger } from "../trigger/defaultTrigger"
 import { once } from "../util/once"
 import { Overlay } from "../util/Overlay"
 import { object, unknown } from "ts-matches"
+import { T } from ".."
 
 export type HealthCheckParams<Manifest extends SDKManifest> = {
   effects: Effects
   name: string
   image: {
-    id: Manifest["images"][number]
+    id: keyof Manifest["images"] & T.ImageId
     sharedRun?: boolean
   }
   trigger?: Trigger
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/lib/interfaces/Host.ts
index 96a76628a..aa27a289c 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/lib/interfaces/Host.ts
@@ -69,12 +69,12 @@ type NotProtocolsWithSslVariants = Exclude<
 type BindOptionsByKnownProtocol =
   | {
       protocol: ProtocolsWithSslVariants
-      preferredExternalPort: number
+      preferredExternalPort?: number
       addSsl?: Partial<AddSslOptions>
     }
   | {
       protocol: NotProtocolsWithSslVariants
-      preferredExternalPort: number
+      preferredExternalPort?: number
       addSsl?: AddSslOptions
     }
 export type BindOptionsByProtocol = BindOptionsByKnownProtocol | BindOptions
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/lib/mainFn/CommandController.ts
index a68e1e426..264574f7c 100644
--- a/sdk/lib/mainFn/CommandController.ts
+++ b/sdk/lib/mainFn/CommandController.ts
@@ -1,6 +1,6 @@
 import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../StartSdk"
 import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects, ValidIfNoStupidEscape } from "../types"
+import { Effects, ImageId, ValidIfNoStupidEscape } from "../types"
 import { MountOptions, Overlay } from "../util/Overlay"
 import { splitCommand } from "../util/splitCommand"
 import { cpExecFile, cpExec } from "./Daemons"
@@ -15,7 +15,7 @@ export class CommandController {
     return async <A extends string>(
       effects: Effects,
       imageId: {
-        id: Manifest["images"][number]
+        id: keyof Manifest["images"] & ImageId
         sharedRun?: boolean
       },
       command: ValidIfNoStupidEscape<A> | [string, ...string[]],
diff --git a/sdk/lib/mainFn/Daemon.ts b/sdk/lib/mainFn/Daemon.ts
index 2ec438801..c48865f94 100644
--- a/sdk/lib/mainFn/Daemon.ts
+++ b/sdk/lib/mainFn/Daemon.ts
@@ -1,5 +1,5 @@
 import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects, ValidIfNoStupidEscape } from "../types"
+import { Effects, ImageId, ValidIfNoStupidEscape } from "../types"
 import { MountOptions, Overlay } from "../util/Overlay"
 import { CommandController } from "./CommandController"
 
@@ -18,7 +18,7 @@ export class Daemon {
     return async <A extends string>(
       effects: Effects,
       imageId: {
-        id: Manifest["images"][number]
+        id: keyof Manifest["images"] & ImageId
         sharedRun?: boolean
       },
       command: ValidIfNoStupidEscape<A> | [string, ...string[]],
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 8962061f5..d51d444a8 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -5,7 +5,12 @@ import { SDKManifest } from "../manifest/ManifestTypes"
 import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
-import { DaemonReturned, Effects, ValidIfNoStupidEscape } from "../types"
+import {
+  DaemonReturned,
+  Effects,
+  ImageId,
+  ValidIfNoStupidEscape,
+} from "../types"
 import { Mounts } from "./Mounts"
 import { CommandOptions, MountOptions, Overlay } from "../util/Overlay"
 import { splitCommand } from "../util/splitCommand"
@@ -34,8 +39,8 @@ type DaemonsParams<
   Id extends string,
 > = {
   command: ValidIfNoStupidEscape<Command> | [string, ...string[]]
-  image: { id: Manifest["images"][number]; sharedRun?: boolean }
-  mounts: { path: string; options: MountOptions }[]
+  image: { id: keyof Manifest["images"] & ImageId; sharedRun?: boolean }
+  mounts: Mounts<Manifest>
   env?: Record<string, string>
   ready: Ready
   requires: Exclude<Ids, Id>[]
@@ -116,12 +121,10 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
     options: DaemonsParams<Manifest, Ids, Command, Id>,
   ) {
     const daemonIndex = this.daemons.length
-    const daemon = Daemon.of()(
-      this.effects,
-      options.image,
-      options.command,
-      options,
-    )
+    const daemon = Daemon.of()(this.effects, options.image, options.command, {
+      ...options,
+      mounts: options.mounts.build(),
+    })
     const healthDaemon = new HealthDaemon(
       daemon,
       daemonIndex,
diff --git a/sdk/lib/manifest/ManifestTypes.ts b/sdk/lib/manifest/ManifestTypes.ts
index ed8703bf2..c820930c8 100644
--- a/sdk/lib/manifest/ManifestTypes.ts
+++ b/sdk/lib/manifest/ManifestTypes.ts
@@ -1,5 +1,5 @@
 import { ValidEmVer } from "../emverLite/mod"
-import { ActionMetadata } from "../types"
+import { ActionMetadata, ImageConfig, ImageId } from "../types"
 
 export interface Container {
   /** This should be pointing to a docker container name */
@@ -28,8 +28,6 @@ export type SDKManifest = {
   readonly releaseNotes: string
   /** The type of license for the project. Include the LICENSE in the root of the project directory. A license is required for a Start9 package.*/
   readonly license: string // name of license
-  /** A list of normie (hosted, SaaS, custodial, etc) services this services intends to replace */
-  readonly replaces: Readonly<string[]>
   /** The Start9 wrapper repository URL for the package. This repo contains the manifest file (this),
    * any scripts necessary for configuration, backups, actions, or health checks (more below). This key
    * must exist. But could be embedded into the source repository
@@ -52,7 +50,7 @@ export type SDKManifest = {
   }
 
   /** Defines the os images needed to run the container processes */
-  readonly images: string[]
+  readonly images: Record<ImageId, ImageConfig>
   /** This denotes readonly asset directories that should be available to mount to the container.
    * Assuming that there will be three files with names along the lines:
    * icon.* : the icon that will be this packages icon on the ui
diff --git a/sdk/lib/manifest/setupManifest.ts b/sdk/lib/manifest/setupManifest.ts
index 41c74baa0..8bd39a7aa 100644
--- a/sdk/lib/manifest/setupManifest.ts
+++ b/sdk/lib/manifest/setupManifest.ts
@@ -1,18 +1,19 @@
+import { ImageConfig, ImageId, VolumeId } from "../osBindings"
 import { SDKManifest, ManifestVersion } from "./ManifestTypes"
 
 export function setupManifest<
   Id extends string,
   Version extends ManifestVersion,
   Dependencies extends Record<string, unknown>,
-  VolumesTypes extends string,
-  AssetTypes extends string,
-  ImagesTypes extends string,
+  VolumesTypes extends VolumeId,
+  AssetTypes extends VolumeId,
+  ImagesTypes extends ImageId,
   Manifest extends SDKManifest & {
     dependencies: Dependencies
     id: Id
     version: Version
     assets: AssetTypes[]
-    images: ImagesTypes[]
+    images: Record<ImagesTypes, ImageConfig>
     volumes: VolumesTypes[]
   },
 >(manifest: Manifest): Manifest {
diff --git a/sdk/lib/osBindings/CreateOverlayedImageParams.ts b/sdk/lib/osBindings/CreateOverlayedImageParams.ts
index b8579ac7d..aad94f01f 100644
--- a/sdk/lib/osBindings/CreateOverlayedImageParams.ts
+++ b/sdk/lib/osBindings/CreateOverlayedImageParams.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ImageId } from "./ImageId"
 
-export type CreateOverlayedImageParams = { imageId: string }
+export type CreateOverlayedImageParams = { imageId: ImageId }
diff --git a/sdk/lib/osBindings/DestroyOverlayedImageParams.ts b/sdk/lib/osBindings/DestroyOverlayedImageParams.ts
index 82fc1cc67..b5b7484a2 100644
--- a/sdk/lib/osBindings/DestroyOverlayedImageParams.ts
+++ b/sdk/lib/osBindings/DestroyOverlayedImageParams.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Guid } from "./Guid"
 
-export type DestroyOverlayedImageParams = { guid: string }
+export type DestroyOverlayedImageParams = { guid: Guid }
diff --git a/sdk/lib/osBindings/ImageConfig.ts b/sdk/lib/osBindings/ImageConfig.ts
new file mode 100644
index 000000000..2b1033b83
--- /dev/null
+++ b/sdk/lib/osBindings/ImageConfig.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ImageSource } from "./ImageSource"
+
+export type ImageConfig = {
+  source: ImageSource
+  arch: string[]
+  emulateMissingAs: string | null
+}
diff --git a/sdk/lib/osBindings/ImageMetadata.ts b/sdk/lib/osBindings/ImageMetadata.ts
new file mode 100644
index 000000000..b50f7a084
--- /dev/null
+++ b/sdk/lib/osBindings/ImageMetadata.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ImageMetadata = { workdir: string; user: string }
diff --git a/sdk/lib/osBindings/ImageSource.ts b/sdk/lib/osBindings/ImageSource.ts
new file mode 100644
index 000000000..a71684e46
--- /dev/null
+++ b/sdk/lib/osBindings/ImageSource.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ImageSource =
+  | "packed"
+  | { dockerBuild: { workdir: string | null; dockerfile: string | null } }
+  | { dockerTag: string }
diff --git a/sdk/lib/osBindings/LoginParams.ts b/sdk/lib/osBindings/LoginParams.ts
new file mode 100644
index 000000000..272f7ed07
--- /dev/null
+++ b/sdk/lib/osBindings/LoginParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PasswordType } from "./PasswordType"
+
+export type LoginParams = { password: PasswordType | null; metadata: any }
diff --git a/sdk/lib/osBindings/Manifest.ts b/sdk/lib/osBindings/Manifest.ts
index 7f06be25e..15b96bd13 100644
--- a/sdk/lib/osBindings/Manifest.ts
+++ b/sdk/lib/osBindings/Manifest.ts
@@ -3,6 +3,7 @@ import type { Alerts } from "./Alerts"
 import type { Dependencies } from "./Dependencies"
 import type { Description } from "./Description"
 import type { HardwareRequirements } from "./HardwareRequirements"
+import type { ImageConfig } from "./ImageConfig"
 import type { ImageId } from "./ImageId"
 import type { PackageId } from "./PackageId"
 import type { Version } from "./Version"
@@ -20,7 +21,7 @@ export type Manifest = {
   marketingSite: string
   donationUrl: string | null
   description: Description
-  images: Array<ImageId>
+  images: { [key: ImageId]: ImageConfig }
   assets: Array<VolumeId>
   volumes: Array<VolumeId>
   alerts: Alerts
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index efd7a5efb..06a4bed7e 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -69,7 +69,10 @@ export { HostKind } from "./HostKind"
 export { HostnameInfo } from "./HostnameInfo"
 export { Hosts } from "./Hosts"
 export { Host } from "./Host"
+export { ImageConfig } from "./ImageConfig"
 export { ImageId } from "./ImageId"
+export { ImageMetadata } from "./ImageMetadata"
+export { ImageSource } from "./ImageSource"
 export { InstalledState } from "./InstalledState"
 export { InstallingInfo } from "./InstallingInfo"
 export { InstallingState } from "./InstallingState"
@@ -78,6 +81,7 @@ export { IpInfo } from "./IpInfo"
 export { LanInfo } from "./LanInfo"
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"
 export { ListVersionSignersParams } from "./ListVersionSignersParams"
+export { LoginParams } from "./LoginParams"
 export { MainStatus } from "./MainStatus"
 export { Manifest } from "./Manifest"
 export { MaybeUtf8String } from "./MaybeUtf8String"
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
index 2df40b95c..9738475a6 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -400,7 +400,7 @@ describe("values", () => {
               long: "",
             },
             containers: {},
-            images: [],
+            images: {},
             volumes: [],
             assets: [],
             alerts: {
diff --git a/sdk/lib/test/output.sdk.ts b/sdk/lib/test/output.sdk.ts
index a0bab1f6e..189491be5 100644
--- a/sdk/lib/test/output.sdk.ts
+++ b/sdk/lib/test/output.sdk.ts
@@ -21,7 +21,7 @@ export const sdk = StartSdk.of()
         long: "",
       },
       containers: {},
-      images: [],
+      images: {},
       volumes: [],
       assets: [],
       alerts: {
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 2da92cd56..1f1245adc 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -11,6 +11,7 @@ import {
   GetPrimaryUrlParams,
   LanInfo,
   BindParams,
+  Manifest,
 } from "./osBindings"
 
 import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
@@ -110,9 +111,26 @@ export namespace ExpectedExports {
    */
   export type dependencyConfig = Record<PackageId, DependencyConfig | null>
 
-  export type Properties = (options: {
+  export type properties = (options: {
     effects: Effects
   }) => Promise<PropertiesReturn>
+
+  export type manifest = Manifest
+}
+export type ABI = {
+  setConfig: ExpectedExports.setConfig
+  getConfig: ExpectedExports.getConfig
+  createBackup: ExpectedExports.createBackup
+  restoreBackup: ExpectedExports.restoreBackup
+  actions: ExpectedExports.actions
+  actionsMetadata: ExpectedExports.actionsMetadata
+  main: ExpectedExports.main
+  afterShutdown: ExpectedExports.afterShutdown
+  init: ExpectedExports.init
+  uninit: ExpectedExports.uninit
+  dependencyConfig: ExpectedExports.dependencyConfig
+  properties: ExpectedExports.properties
+  manifest: ExpectedExports.manifest
 }
 export type TimeMs = number
 export type VersionString = string
@@ -453,8 +471,8 @@ export type Effects = {
   /** Exists could be useful during the runtime to know if some service is running, option dep */
   running(options: { packageId: PackageId }): Promise<boolean>
 
-  restart(): void
-  shutdown(): void
+  restart(): Promise<void>
+  shutdown(): Promise<void>
 
   mount(options: {
     location: string
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 794b78732..fbc854c57 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -8,16 +8,18 @@ const WORKDIR = (imageId: string) => `/media/startos/images/${imageId}/`
 export class Overlay {
   private constructor(
     readonly effects: T.Effects,
-    readonly imageId: string,
+    readonly imageId: T.ImageId,
     readonly rootfs: string,
-    readonly guid: string,
+    readonly guid: T.Guid,
   ) {}
   static async of(
     effects: T.Effects,
-    image: { id: string; sharedRun?: boolean },
+    image: { id: T.ImageId; sharedRun?: boolean },
   ) {
-    const { id: imageId, sharedRun } = image
-    const [rootfs, guid] = await effects.createOverlayedImage({ imageId })
+    const { id, sharedRun } = image
+    const [rootfs, guid] = await effects.createOverlayedImage({
+      imageId: id as string,
+    })
 
     const shared = ["dev", "sys", "proc"]
     if (!!sharedRun) {
@@ -33,7 +35,7 @@ export class Overlay {
       ])
     }
 
-    return new Overlay(effects, imageId, rootfs, guid)
+    return new Overlay(effects, id, rootfs, guid)
   }
 
   async mount(options: MountOptions, path: string): Promise<Overlay> {
@@ -97,7 +99,7 @@ export class Overlay {
     stdout: string | Buffer
     stderr: string | Buffer
   }> {
-    const imageMeta: any = await fs
+    const imageMeta: T.ImageMetadata = await fs
       .readFile(`/media/startos/images/${this.imageId}.json`, {
         encoding: "utf8",
       })
diff --git a/sdk/lib/util/fileHelper.ts b/sdk/lib/util/fileHelper.ts
index 07cfb2c4a..54f1eca06 100644
--- a/sdk/lib/util/fileHelper.ts
+++ b/sdk/lib/util/fileHelper.ts
@@ -3,7 +3,7 @@ import * as YAML from "yaml"
 import * as TOML from "@iarna/toml"
 import _ from "lodash"
 import * as T from "../types"
-import * as fs from "fs"
+import * as fs from "node:fs/promises"
 
 const previousPath = /(.+?)\/([^/]*)$/
 
@@ -59,28 +59,24 @@ export class FileHelper<A> {
     readonly readData: (stringValue: string) => A,
   ) {}
   async write(data: A, effects: T.Effects) {
-    if (previousPath.exec(this.path)) {
-      await new Promise((resolve, reject) =>
-        fs.mkdir(this.path, (err: any) => (!err ? resolve(null) : reject(err))),
-      )
+    const parent = previousPath.exec(this.path)
+    if (parent) {
+      await fs.mkdir(parent[1], { recursive: true })
     }
 
-    await new Promise((resolve, reject) =>
-      fs.writeFile(this.path, this.writeData(data), (err: any) =>
-        !err ? resolve(null) : reject(err),
-      ),
-    )
+    await fs.writeFile(this.path, this.writeData(data))
   }
   async read(effects: T.Effects) {
-    if (!fs.existsSync(this.path)) {
+    if (
+      !(await fs.access(this.path).then(
+        () => true,
+        () => false,
+      ))
+    ) {
       return null
     }
     return this.readData(
-      await new Promise((resolve, reject) =>
-        fs.readFile(this.path, (err: any, data: any) =>
-          !err ? resolve(data.toString("utf-8")) : reject(err),
-        ),
-      ),
+      await fs.readFile(this.path).then((data) => data.toString("utf-8")),
     )
   }
 
@@ -142,7 +138,7 @@ export class FileHelper<A> {
     return new FileHelper<A>(
       path,
       (inData) => {
-        return JSON.stringify(inData, null, 2)
+        return YAML.stringify(inData, null, 2)
       },
       (inString) => {
         return shape.unsafeCast(YAML.parse(inString))
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index 0c457540f..a50066b34 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "isomorphic-fetch": "^3.0.0",
-        "lodash": "4.*.*",
+        "lodash": "^4.17.21",
         "ts-matches": "^5.4.1"
       },
       "devDependencies": {
diff --git a/sdk/package.json b/sdk/package.json
index 53ee291ee..d6c3a1ca5 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha1",
+  "version": "0.3.6-alpha5",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./cjs/lib/index.js",
   "types": "./cjs/lib/index.d.ts",
@@ -31,8 +31,10 @@
   "homepage": "https://github.com/Start9Labs/start-sdk#readme",
   "dependencies": {
     "isomorphic-fetch": "^3.0.0",
-    "lodash": "4.*.*",
-    "ts-matches": "^5.4.1"
+    "lodash": "^4.17.21",
+    "ts-matches": "^5.4.1",
+    "yaml": "^2.2.2",
+    "@iarna/toml": "^2.2.5"
   },
   "prettier": {
     "trailingComma": "all",
@@ -41,7 +43,6 @@
     "singleQuote": false
   },
   "devDependencies": {
-    "@iarna/toml": "^2.2.5",
     "@types/jest": "^29.4.0",
     "@types/lodash": "^4.17.5",
     "jest": "^29.4.3",
@@ -49,7 +50,6 @@
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "tsx": "^4.7.1",
-    "typescript": "^5.0.4",
-    "yaml": "^2.2.2"
+    "typescript": "^5.0.4"
   }
 }
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 11d56ff15..5642eece5 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -69,7 +69,13 @@ export module Mock {
     osVersion: '0.2.12',
     dependencies: {},
     hasConfig: true,
-    images: ['main'],
+    images: {
+      main: {
+        source: 'packed',
+        arch: ['x86_64', 'aarch64'],
+        emulateMissingAs: 'aarch64',
+      },
+    },
     assets: [],
     volumes: ['main'],
     hardwareRequirements: {
@@ -116,7 +122,13 @@ export module Mock {
       },
     },
     hasConfig: true,
-    images: ['main'],
+    images: {
+      main: {
+        source: 'packed',
+        arch: ['x86_64', 'aarch64'],
+        emulateMissingAs: 'aarch64',
+      },
+    },
     assets: [],
     volumes: ['main'],
     hardwareRequirements: {
@@ -157,7 +169,13 @@ export module Mock {
       },
     },
     hasConfig: false,
-    images: ['main'],
+    images: {
+      main: {
+        source: 'packed',
+        arch: ['x86_64', 'aarch64'],
+        emulateMissingAs: 'aarch64',
+      },
+    },
     assets: [],
     volumes: ['main'],
     hardwareRequirements: {

From bb514d621657333284c622a7bb66673328535a3c Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 14 Jun 2024 14:16:12 -0600
Subject: [PATCH 161/341] Chore/refactoring effects (#2644)

* fix mac build

* wip

* chore: Update the effects to get rid of bad pattern

* chore: Some small changes

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 .../src/Adapters/HostSystemStartOs.ts         | 519 ++++++------
 container-runtime/src/Adapters/RpcListener.ts |   2 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |  11 +-
 .../Systems/SystemForEmbassy/index.ts         |  72 +-
 .../SystemForEmbassy/polyfillEffects.ts       | 754 +++++++++---------
 .../src/Adapters/Systems/SystemForStartOs.ts  |   7 +-
 .../src/Interfaces/HostSystem.ts              |   5 +-
 container-runtime/src/Interfaces/System.ts    |   4 +-
 container-runtime/src/index.ts                |   4 +-
 download-firmware.sh                          |   3 +-
 10 files changed, 696 insertions(+), 685 deletions(-)

diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
index 93905825a..1996af0fd 100644
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ b/container-runtime/src/Adapters/HostSystemStartOs.ts
@@ -31,274 +31,273 @@ type RpcError = typeof matchRpcError._TYPE
 
 const SOCKET_PATH = "/media/startos/rpc/host.sock"
 const MAIN = "/main" as const
-export class HostSystemStartOs implements Effects {
-  procedureId: string | null = null
-
-  static of(callbackHolder: CallbackHolder) {
-    return new HostSystemStartOs(callbackHolder)
-  }
-
-  constructor(readonly callbackHolder: CallbackHolder) {}
-  id = 0
-  rpcRound<K extends keyof Effects | "getStore" | "setStore">(
-    method: K,
-    params: Record<string, unknown>,
-  ) {
-    const id = this.id++
-    const client = net.createConnection({ path: SOCKET_PATH }, () => {
-      client.write(
-        JSON.stringify({
-          id,
-          method,
-          params: { ...params, procedureId: this.procedureId },
-        }) + "\n",
-      )
-    })
-    let bufs: Buffer[] = []
-    return new Promise((resolve, reject) => {
-      client.on("data", (data) => {
-        try {
-          bufs.push(data)
-          if (data.reduce((acc, x) => acc || x == 10, false)) {
-            const res: unknown = JSON.parse(
-              Buffer.concat(bufs).toString().split("\n")[0],
-            )
-            if (testRpcError(res)) {
-              let message = res.error.message
-              console.error({ method, params, hostSystemStartOs: true })
-              if (string.test(res.error.data)) {
-                message += ": " + res.error.data
-                console.error(res.error.data)
-              } else {
-                if (res.error.data?.details) {
-                  message += ": " + res.error.data.details
-                  console.error(res.error.data.details)
-                }
-                if (res.error.data?.debug) {
-                  message += "\n" + res.error.data.debug
-                  console.error("Debug: " + res.error.data.debug)
+let hostSystemId = 0
+export const hostSystemStartOs =
+  (callbackHolder: CallbackHolder) =>
+  (procedureId: null | string): Effects => {
+    const rpcRound = <K extends keyof Effects | "getStore" | "setStore">(
+      method: K,
+      params: Record<string, unknown>,
+    ) => {
+      const id = hostSystemId++
+      const client = net.createConnection({ path: SOCKET_PATH }, () => {
+        client.write(
+          JSON.stringify({
+            id,
+            method,
+            params: { ...params, procedureId: procedureId },
+          }) + "\n",
+        )
+      })
+      let bufs: Buffer[] = []
+      return new Promise((resolve, reject) => {
+        client.on("data", (data) => {
+          try {
+            bufs.push(data)
+            if (data.reduce((acc, x) => acc || x == 10, false)) {
+              const res: unknown = JSON.parse(
+                Buffer.concat(bufs).toString().split("\n")[0],
+              )
+              if (testRpcError(res)) {
+                let message = res.error.message
+                console.error({ method, params, hostSystemStartOs: true })
+                if (string.test(res.error.data)) {
+                  message += ": " + res.error.data
+                  console.error(res.error.data)
+                } else {
+                  if (res.error.data?.details) {
+                    message += ": " + res.error.data.details
+                    console.error(res.error.data.details)
+                  }
+                  if (res.error.data?.debug) {
+                    message += "\n" + res.error.data.debug
+                    console.error("Debug: " + res.error.data.debug)
+                  }
                 }
+                reject(new Error(`${message}@${method}`))
+              } else if (testRpcResult(res)) {
+                resolve(res.result)
+              } else {
+                reject(new Error(`malformed response ${JSON.stringify(res)}`))
               }
-              reject(new Error(`${message}@${method}`))
-            } else if (testRpcResult(res)) {
-              resolve(res.result)
-            } else {
-              reject(new Error(`malformed response ${JSON.stringify(res)}`))
             }
+          } catch (error) {
+            reject(error)
           }
-        } catch (error) {
+          client.end()
+        })
+        client.on("error", (error) => {
           reject(error)
-        }
-        client.end()
-      })
-      client.on("error", (error) => {
-        reject(error)
+        })
       })
-    })
-  }
-
-  bind(...[options]: Parameters<T.Effects["bind"]>) {
-    return this.rpcRound("bind", {
-      ...options,
-      stack: new Error().stack,
-    }) as ReturnType<T.Effects["bind"]>
-  }
-  clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
-    return this.rpcRound("clearBindings", {}) as ReturnType<
-      T.Effects["clearBindings"]
-    >
-  }
-  clearServiceInterfaces(
-    ...[]: Parameters<T.Effects["clearServiceInterfaces"]>
-  ) {
-    return this.rpcRound("clearServiceInterfaces", {}) as ReturnType<
-      T.Effects["clearServiceInterfaces"]
-    >
-  }
-  createOverlayedImage(options: {
-    imageId: string
-  }): Promise<[string, string]> {
-    return this.rpcRound("createOverlayedImage", options) as ReturnType<
-      T.Effects["createOverlayedImage"]
-    >
-  }
-  destroyOverlayedImage(options: { guid: string }): Promise<void> {
-    return this.rpcRound("destroyOverlayedImage", options) as ReturnType<
-      T.Effects["destroyOverlayedImage"]
-    >
-  }
-  executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
-    return this.rpcRound("executeAction", options) as ReturnType<
-      T.Effects["executeAction"]
-    >
-  }
-  exists(...[packageId]: Parameters<T.Effects["exists"]>) {
-    return this.rpcRound("exists", packageId) as ReturnType<T.Effects["exists"]>
-  }
-  exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
-    return this.rpcRound("exportAction", options) as ReturnType<
-      T.Effects["exportAction"]
-    >
-  }
-  exportServiceInterface: Effects["exportServiceInterface"] = (
-    ...[options]: Parameters<Effects["exportServiceInterface"]>
-  ) => {
-    return this.rpcRound("exportServiceInterface", options) as ReturnType<
-      T.Effects["exportServiceInterface"]
-    >
-  }
-  exposeForDependents(
-    ...[options]: Parameters<T.Effects["exposeForDependents"]>
-  ) {
-    return this.rpcRound("exposeForDependents", options) as ReturnType<
-      T.Effects["exposeForDependents"]
-    >
-  }
-  getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
-    return this.rpcRound("getConfigured", {}) as ReturnType<
-      T.Effects["getConfigured"]
-    >
-  }
-  getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
-    return this.rpcRound("getContainerIp", {}) as ReturnType<
-      T.Effects["getContainerIp"]
-    >
-  }
-  getHostInfo: Effects["getHostInfo"] = (...[allOptions]: any[]) => {
-    const options = {
-      ...allOptions,
-      callback: this.callbackHolder.addCallback(allOptions.callback),
     }
-    return this.rpcRound("getHostInfo", options) as ReturnType<
-      T.Effects["getHostInfo"]
-    > as any
-  }
-  getServiceInterface(
-    ...[options]: Parameters<T.Effects["getServiceInterface"]>
-  ) {
-    return this.rpcRound("getServiceInterface", {
-      ...options,
-      callback: this.callbackHolder.addCallback(options.callback),
-    }) as ReturnType<T.Effects["getServiceInterface"]>
-  }
+    const self: Effects = {
+      bind(...[options]: Parameters<T.Effects["bind"]>) {
+        return rpcRound("bind", {
+          ...options,
+          stack: new Error().stack,
+        }) as ReturnType<T.Effects["bind"]>
+      },
+      clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
+        return rpcRound("clearBindings", {}) as ReturnType<
+          T.Effects["clearBindings"]
+        >
+      },
+      clearServiceInterfaces(
+        ...[]: Parameters<T.Effects["clearServiceInterfaces"]>
+      ) {
+        return rpcRound("clearServiceInterfaces", {}) as ReturnType<
+          T.Effects["clearServiceInterfaces"]
+        >
+      },
+      createOverlayedImage(options: {
+        imageId: string
+      }): Promise<[string, string]> {
+        return rpcRound("createOverlayedImage", options) as ReturnType<
+          T.Effects["createOverlayedImage"]
+        >
+      },
+      destroyOverlayedImage(options: { guid: string }): Promise<void> {
+        return rpcRound("destroyOverlayedImage", options) as ReturnType<
+          T.Effects["destroyOverlayedImage"]
+        >
+      },
+      executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
+        return rpcRound("executeAction", options) as ReturnType<
+          T.Effects["executeAction"]
+        >
+      },
+      exists(...[packageId]: Parameters<T.Effects["exists"]>) {
+        return rpcRound("exists", packageId) as ReturnType<T.Effects["exists"]>
+      },
+      exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
+        return rpcRound("exportAction", options) as ReturnType<
+          T.Effects["exportAction"]
+        >
+      },
+      exportServiceInterface: ((
+        ...[options]: Parameters<Effects["exportServiceInterface"]>
+      ) => {
+        return rpcRound("exportServiceInterface", options) as ReturnType<
+          T.Effects["exportServiceInterface"]
+        >
+      }) as Effects["exportServiceInterface"],
+      exposeForDependents(
+        ...[options]: Parameters<T.Effects["exposeForDependents"]>
+      ) {
+        return rpcRound("exposeForDependents", options) as ReturnType<
+          T.Effects["exposeForDependents"]
+        >
+      },
+      getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
+        return rpcRound("getConfigured", {}) as ReturnType<
+          T.Effects["getConfigured"]
+        >
+      },
+      getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
+        return rpcRound("getContainerIp", {}) as ReturnType<
+          T.Effects["getContainerIp"]
+        >
+      },
+      getHostInfo: ((...[allOptions]: any[]) => {
+        const options = {
+          ...allOptions,
+          callback: callbackHolder.addCallback(allOptions.callback),
+        }
+        return rpcRound("getHostInfo", options) as ReturnType<
+          T.Effects["getHostInfo"]
+        > as any
+      }) as Effects["getHostInfo"],
+      getServiceInterface(
+        ...[options]: Parameters<T.Effects["getServiceInterface"]>
+      ) {
+        return rpcRound("getServiceInterface", {
+          ...options,
+          callback: callbackHolder.addCallback(options.callback),
+        }) as ReturnType<T.Effects["getServiceInterface"]>
+      },
 
-  getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
-    return this.rpcRound("getPrimaryUrl", {
-      ...options,
-      callback: this.callbackHolder.addCallback(options.callback),
-    }) as ReturnType<T.Effects["getPrimaryUrl"]>
-  }
-  getServicePortForward(
-    ...[options]: Parameters<T.Effects["getServicePortForward"]>
-  ) {
-    return this.rpcRound("getServicePortForward", options) as ReturnType<
-      T.Effects["getServicePortForward"]
-    >
-  }
-  getSslCertificate(options: Parameters<T.Effects["getSslCertificate"]>[0]) {
-    return this.rpcRound("getSslCertificate", options) as ReturnType<
-      T.Effects["getSslCertificate"]
-    >
-  }
-  getSslKey(options: Parameters<T.Effects["getSslKey"]>[0]) {
-    return this.rpcRound("getSslKey", options) as ReturnType<
-      T.Effects["getSslKey"]
-    >
-  }
-  getSystemSmtp(...[options]: Parameters<T.Effects["getSystemSmtp"]>) {
-    return this.rpcRound("getSystemSmtp", {
-      ...options,
-      callback: this.callbackHolder.addCallback(options.callback),
-    }) as ReturnType<T.Effects["getSystemSmtp"]>
-  }
-  listServiceInterfaces(
-    ...[options]: Parameters<T.Effects["listServiceInterfaces"]>
-  ) {
-    return this.rpcRound("listServiceInterfaces", {
-      ...options,
-      callback: this.callbackHolder.addCallback(options.callback),
-    }) as ReturnType<T.Effects["listServiceInterfaces"]>
-  }
-  mount(...[options]: Parameters<T.Effects["mount"]>) {
-    return this.rpcRound("mount", options) as ReturnType<T.Effects["mount"]>
-  }
-  removeAction(...[options]: Parameters<T.Effects["removeAction"]>) {
-    return this.rpcRound("removeAction", options) as ReturnType<
-      T.Effects["removeAction"]
-    >
-  }
-  removeAddress(...[options]: Parameters<T.Effects["removeAddress"]>) {
-    return this.rpcRound("removeAddress", options) as ReturnType<
-      T.Effects["removeAddress"]
-    >
-  }
-  restart(...[]: Parameters<T.Effects["restart"]>) {
-    return this.rpcRound("restart", {}) as ReturnType<T.Effects["restart"]>
-  }
-  running(...[packageId]: Parameters<T.Effects["running"]>) {
-    return this.rpcRound("running", { packageId }) as ReturnType<
-      T.Effects["running"]
-    >
-  }
-  // runRsync(...[options]: Parameters<T.Effects[""]>) {
-  //
-  // return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
-  //
-  // return this.rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
-  // }
-  setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
-    return this.rpcRound("setConfigured", { configured }) as ReturnType<
-      T.Effects["setConfigured"]
-    >
-  }
-  setDependencies(
-    dependencies: Parameters<T.Effects["setDependencies"]>[0],
-  ): ReturnType<T.Effects["setDependencies"]> {
-    return this.rpcRound("setDependencies", dependencies) as ReturnType<
-      T.Effects["setDependencies"]
-    >
-  }
-  checkDependencies(
-    options: Parameters<T.Effects["checkDependencies"]>[0],
-  ): ReturnType<T.Effects["checkDependencies"]> {
-    return this.rpcRound("checkDependencies", options) as ReturnType<
-      T.Effects["checkDependencies"]
-    >
-  }
-  getDependencies(): ReturnType<T.Effects["getDependencies"]> {
-    return this.rpcRound("getDependencies", {}) as ReturnType<
-      T.Effects["getDependencies"]
-    >
-  }
-  setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
-    return this.rpcRound("setHealth", options) as ReturnType<
-      T.Effects["setHealth"]
-    >
-  }
+      getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
+        return rpcRound("getPrimaryUrl", {
+          ...options,
+          callback: callbackHolder.addCallback(options.callback),
+        }) as ReturnType<T.Effects["getPrimaryUrl"]>
+      },
+      getServicePortForward(
+        ...[options]: Parameters<T.Effects["getServicePortForward"]>
+      ) {
+        return rpcRound("getServicePortForward", options) as ReturnType<
+          T.Effects["getServicePortForward"]
+        >
+      },
+      getSslCertificate(
+        options: Parameters<T.Effects["getSslCertificate"]>[0],
+      ) {
+        return rpcRound("getSslCertificate", options) as ReturnType<
+          T.Effects["getSslCertificate"]
+        >
+      },
+      getSslKey(options: Parameters<T.Effects["getSslKey"]>[0]) {
+        return rpcRound("getSslKey", options) as ReturnType<
+          T.Effects["getSslKey"]
+        >
+      },
+      getSystemSmtp(...[options]: Parameters<T.Effects["getSystemSmtp"]>) {
+        return rpcRound("getSystemSmtp", {
+          ...options,
+          callback: callbackHolder.addCallback(options.callback),
+        }) as ReturnType<T.Effects["getSystemSmtp"]>
+      },
+      listServiceInterfaces(
+        ...[options]: Parameters<T.Effects["listServiceInterfaces"]>
+      ) {
+        return rpcRound("listServiceInterfaces", {
+          ...options,
+          callback: callbackHolder.addCallback(options.callback),
+        }) as ReturnType<T.Effects["listServiceInterfaces"]>
+      },
+      mount(...[options]: Parameters<T.Effects["mount"]>) {
+        return rpcRound("mount", options) as ReturnType<T.Effects["mount"]>
+      },
+      removeAction(...[options]: Parameters<T.Effects["removeAction"]>) {
+        return rpcRound("removeAction", options) as ReturnType<
+          T.Effects["removeAction"]
+        >
+      },
+      removeAddress(...[options]: Parameters<T.Effects["removeAddress"]>) {
+        return rpcRound("removeAddress", options) as ReturnType<
+          T.Effects["removeAddress"]
+        >
+      },
+      restart(...[]: Parameters<T.Effects["restart"]>) {
+        return rpcRound("restart", {}) as ReturnType<T.Effects["restart"]>
+      },
+      running(...[packageId]: Parameters<T.Effects["running"]>) {
+        return rpcRound("running", { packageId }) as ReturnType<
+          T.Effects["running"]
+        >
+      },
+      // runRsync(...[options]: Parameters<T.Effects[""]>) {
+      //
+      // return rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
+      //
+      // return rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
+      // }
+      setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
+        return rpcRound("setConfigured", { configured }) as ReturnType<
+          T.Effects["setConfigured"]
+        >
+      },
+      setDependencies(
+        dependencies: Parameters<T.Effects["setDependencies"]>[0],
+      ): ReturnType<T.Effects["setDependencies"]> {
+        return rpcRound("setDependencies", dependencies) as ReturnType<
+          T.Effects["setDependencies"]
+        >
+      },
+      checkDependencies(
+        options: Parameters<T.Effects["checkDependencies"]>[0],
+      ): ReturnType<T.Effects["checkDependencies"]> {
+        return rpcRound("checkDependencies", options) as ReturnType<
+          T.Effects["checkDependencies"]
+        >
+      },
+      getDependencies(): ReturnType<T.Effects["getDependencies"]> {
+        return rpcRound("getDependencies", {}) as ReturnType<
+          T.Effects["getDependencies"]
+        >
+      },
+      setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
+        return rpcRound("setHealth", options) as ReturnType<
+          T.Effects["setHealth"]
+        >
+      },
 
-  setMainStatus(o: { status: "running" | "stopped" }): Promise<void> {
-    return this.rpcRound("setMainStatus", o) as ReturnType<
-      T.Effects["setHealth"]
-    >
-  }
+      setMainStatus(o: { status: "running" | "stopped" }): Promise<void> {
+        return rpcRound("setMainStatus", o) as ReturnType<
+          T.Effects["setHealth"]
+        >
+      },
 
-  shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
-    return this.rpcRound("shutdown", {}) as ReturnType<T.Effects["shutdown"]>
-  }
-  stopped(...[packageId]: Parameters<T.Effects["stopped"]>) {
-    return this.rpcRound("stopped", { packageId }) as ReturnType<
-      T.Effects["stopped"]
-    >
-  }
-  store: T.Effects["store"] = {
-    get: async (options: any) =>
-      this.rpcRound("getStore", {
-        ...options,
-        callback: this.callbackHolder.addCallback(options.callback),
-      }) as any,
-    set: async (options: any) =>
-      this.rpcRound("setStore", options) as ReturnType<
-        T.Effects["store"]["set"]
-      >,
+      shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
+        return rpcRound("shutdown", {}) as ReturnType<T.Effects["shutdown"]>
+      },
+      stopped(...[packageId]: Parameters<T.Effects["stopped"]>) {
+        return rpcRound("stopped", { packageId }) as ReturnType<
+          T.Effects["stopped"]
+        >
+      },
+      store: {
+        get: async (options: any) =>
+          rpcRound("getStore", {
+            ...options,
+            callback: callbackHolder.addCallback(options.callback),
+          }) as any,
+        set: async (options: any) =>
+          rpcRound("setStore", options) as ReturnType<
+            T.Effects["store"]["set"]
+          >,
+      } as T.Effects["store"],
+    }
+    return self
   }
-}
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 5391d943e..04e9bc40f 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -247,7 +247,7 @@ export class RpcListener {
           })),
       )
       .when(exitType, async ({ id }) => {
-        if (this._system) await this._system.exit(this.effects)
+        if (this._system) await this._system.exit(this.effects(null))
         delete this._system
         delete this._effects
 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 08bf944ed..975bb52ca 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -1,9 +1,10 @@
-import { PolyfillEffects } from "./polyfillEffects"
+import { polyfillEffects } from "./polyfillEffects"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { SystemForEmbassy } from "."
-import { HostSystemStartOs } from "../../HostSystemStartOs"
+import { hostSystemStartOs } from "../../HostSystemStartOs"
 import { Daemons, T, daemons } from "@start9labs/start-sdk"
 import { Daemon } from "@start9labs/start-sdk/cjs/lib/mainFn/Daemon"
+import { Effects } from "../../../Models/Effects"
 
 const EMBASSY_HEALTH_INTERVAL = 15 * 1000
 const EMBASSY_PROPERTIES_LOOP = 30 * 1000
@@ -27,7 +28,7 @@ export class MainLoop {
     | undefined
   constructor(
     readonly system: SystemForEmbassy,
-    readonly effects: HostSystemStartOs,
+    readonly effects: Effects,
   ) {
     this.healthLoops = this.constructHealthLoops()
     this.mainEvent = this.constructMainEvent()
@@ -65,7 +66,7 @@ export class MainLoop {
     }
   }
 
-  private async setupInterfaces(effects: HostSystemStartOs) {
+  private async setupInterfaces(effects: T.Effects) {
     for (const interfaceId in this.system.manifest.interfaces) {
       const iface = this.system.manifest.interfaces[interfaceId]
       const internalPorts = new Set<number>()
@@ -211,7 +212,7 @@ export class MainLoop {
             }
 
             const result = await method(
-              new PolyfillEffects(effects, this.system.manifest),
+              polyfillEffects(effects, this.system.manifest),
               timeChanged,
             )
 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 731b38903..127fb0e09 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -1,7 +1,7 @@
 import { types as T, utils, EmVer } from "@start9labs/start-sdk"
 import * as fs from "fs/promises"
 
-import { PolyfillEffects } from "./polyfillEffects"
+import { polyfillEffects } from "./polyfillEffects"
 import { Duration, duration, fromDuration } from "../../../Models/Duration"
 import { System } from "../../../Interfaces/System"
 import { matchManifest, Manifest, Procedure } from "./matchManifest"
@@ -27,7 +27,7 @@ import {
   Parser,
   array,
 } from "ts-matches"
-import { HostSystemStartOs } from "../../HostSystemStartOs"
+import { hostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
 import { RpcResult, matchRpcResult } from "../../RpcListener"
 import { CT } from "@start9labs/start-sdk"
@@ -41,6 +41,7 @@ import {
   MultiHost,
 } from "@start9labs/start-sdk/cjs/lib/interfaces/Host"
 import { ServiceInterfaceBuilder } from "@start9labs/start-sdk/cjs/lib/interfaces/ServiceInterfaceBuilder"
+import { Effects } from "../../../Models/Effects"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -197,7 +198,7 @@ export class SystemForEmbassy implements System {
     readonly moduleCode: Partial<U.ExpectedExports>,
   ) {}
   async execute(
-    effects: HostSystemStartOs,
+    effectCreator: ReturnType<typeof hostSystemStartOs>,
     options: {
       id: string
       procedure: JsonPath
@@ -205,8 +206,7 @@ export class SystemForEmbassy implements System {
       timeout?: number | undefined
     },
   ): Promise<RpcResult> {
-    effects = Object.create(effects)
-    effects.procedureId = options.id
+    const effects = effectCreator(options.id)
     return this._execute(effects, options)
       .then((x) =>
         matches(x)
@@ -261,12 +261,12 @@ export class SystemForEmbassy implements System {
         }
       })
   }
-  async exit(effects: HostSystemStartOs): Promise<void> {
+  async exit(): Promise<void> {
     if (this.currentRunning) await this.currentRunning.clean()
     delete this.currentRunning
   }
   async _execute(
-    effects: HostSystemStartOs,
+    effects: Effects,
     options: {
       procedure: JsonPath
       input: unknown
@@ -340,7 +340,7 @@ export class SystemForEmbassy implements System {
     throw new Error(`Could not find the path for ${options.procedure}`)
   }
   private async init(
-    effects: HostSystemStartOs,
+    effects: Effects,
     previousVersion: Optional<string>,
     timeoutMs: number | null,
   ): Promise<void> {
@@ -350,7 +350,7 @@ export class SystemForEmbassy implements System {
     await this.exportActions(effects)
     await this.exportNetwork(effects)
   }
-  async exportNetwork(effects: HostSystemStartOs) {
+  async exportNetwork(effects: Effects) {
     for (const [id, interfaceValue] of Object.entries(
       this.manifest.interfaces,
     )) {
@@ -428,7 +428,7 @@ export class SystemForEmbassy implements System {
       )
     }
   }
-  async exportActions(effects: HostSystemStartOs) {
+  async exportActions(effects: Effects) {
     const manifest = this.manifest
     if (!manifest.actions) return
     for (const [actionId, action] of Object.entries(manifest.actions)) {
@@ -457,7 +457,7 @@ export class SystemForEmbassy implements System {
     }
   }
   private async uninit(
-    effects: HostSystemStartOs,
+    effects: Effects,
     nextVersion: Optional<string>,
     timeoutMs: number | null,
   ): Promise<void> {
@@ -465,7 +465,7 @@ export class SystemForEmbassy implements System {
     await effects.setMainStatus({ status: "stopped" })
   }
   private async mainStart(
-    effects: HostSystemStartOs,
+    effects: Effects,
     timeoutMs: number | null,
   ): Promise<void> {
     if (!!this.currentRunning) return
@@ -473,7 +473,7 @@ export class SystemForEmbassy implements System {
     this.currentRunning = new MainLoop(this, effects)
   }
   private async mainStop(
-    effects: HostSystemStartOs,
+    effects: Effects,
     timeoutMs: number | null,
   ): Promise<Duration> {
     const { currentRunning } = this
@@ -491,7 +491,7 @@ export class SystemForEmbassy implements System {
     return durationValue
   }
   private async createBackup(
-    effects: HostSystemStartOs,
+    effects: Effects,
     timeoutMs: number | null,
   ): Promise<void> {
     const backup = this.manifest.backup.create
@@ -503,13 +503,11 @@ export class SystemForEmbassy implements System {
       await container.execFail([backup.entrypoint, ...backup.args], timeoutMs)
     } else {
       const moduleCode = await this.moduleCode
-      await moduleCode.createBackup?.(
-        new PolyfillEffects(effects, this.manifest),
-      )
+      await moduleCode.createBackup?.(polyfillEffects(effects, this.manifest))
     }
   }
   private async restoreBackup(
-    effects: HostSystemStartOs,
+    effects: Effects,
     timeoutMs: number | null,
   ): Promise<void> {
     const restoreBackup = this.manifest.backup.restore
@@ -528,19 +526,17 @@ export class SystemForEmbassy implements System {
       )
     } else {
       const moduleCode = await this.moduleCode
-      await moduleCode.restoreBackup?.(
-        new PolyfillEffects(effects, this.manifest),
-      )
+      await moduleCode.restoreBackup?.(polyfillEffects(effects, this.manifest))
     }
   }
   private async getConfig(
-    effects: HostSystemStartOs,
+    effects: Effects,
     timeoutMs: number | null,
   ): Promise<T.ConfigRes> {
     return this.getConfigUncleaned(effects, timeoutMs).then(removePointers)
   }
   private async getConfigUncleaned(
-    effects: HostSystemStartOs,
+    effects: Effects,
     timeoutMs: number | null,
   ): Promise<T.ConfigRes> {
     const config = this.manifest.config?.get
@@ -564,7 +560,7 @@ export class SystemForEmbassy implements System {
       const moduleCode = await this.moduleCode
       const method = moduleCode.getConfig
       if (!method) throw new Error("Expecting that the method getConfig exists")
-      return (await method(new PolyfillEffects(effects, this.manifest)).then(
+      return (await method(polyfillEffects(effects, this.manifest)).then(
         (x) => {
           if ("result" in x) return x.result
           if ("error" in x) throw new Error("Error getting config: " + x.error)
@@ -574,7 +570,7 @@ export class SystemForEmbassy implements System {
     }
   }
   private async setConfig(
-    effects: HostSystemStartOs,
+    effects: Effects,
     newConfigWithoutPointers: unknown,
     timeoutMs: number | null,
   ): Promise<void> {
@@ -617,7 +613,7 @@ export class SystemForEmbassy implements System {
 
       const answer = matchSetResult.unsafeCast(
         await method(
-          new PolyfillEffects(effects, this.manifest),
+          polyfillEffects(effects, this.manifest),
           newConfig as U.Config,
         ).then((x): T.SetResult => {
           if ("result" in x)
@@ -636,7 +632,7 @@ export class SystemForEmbassy implements System {
     }
   }
   private async setConfigSetConfig(
-    effects: HostSystemStartOs,
+    effects: Effects,
     dependsOn: { [x: string]: readonly string[] },
   ) {
     await effects.setDependencies({
@@ -660,7 +656,7 @@ export class SystemForEmbassy implements System {
   }
 
   private async migration(
-    effects: HostSystemStartOs,
+    effects: Effects,
     fromVersion: string,
     timeoutMs: number | null,
   ): Promise<T.MigrationRes> {
@@ -713,7 +709,7 @@ export class SystemForEmbassy implements System {
         if (!method)
           throw new Error("Expecting that the method migration exists")
         return (await method(
-          new PolyfillEffects(effects, this.manifest),
+          polyfillEffects(effects, this.manifest),
           fromVersion as string,
         ).then((x) => {
           if ("result" in x) return x.result
@@ -725,7 +721,7 @@ export class SystemForEmbassy implements System {
     return { configured: true }
   }
   private async properties(
-    effects: HostSystemStartOs,
+    effects: Effects,
     timeoutMs: number | null,
   ): Promise<ReturnType<T.ExpectedExports.properties>> {
     // TODO BLU-J set the properties ever so often
@@ -754,7 +750,7 @@ export class SystemForEmbassy implements System {
       if (!method)
         throw new Error("Expecting that the method properties exists")
       const properties = matchProperties.unsafeCast(
-        await method(new PolyfillEffects(effects, this.manifest)).then((x) => {
+        await method(polyfillEffects(effects, this.manifest)).then((x) => {
           if ("result" in x) return x.result
           if ("error" in x) throw new Error("Error getting config: " + x.error)
           throw new Error("Error getting config: " + x["error-code"][1])
@@ -765,7 +761,7 @@ export class SystemForEmbassy implements System {
     throw new Error(`Unknown type in the fetch properties: ${setConfigValue}`)
   }
   private async action(
-    effects: HostSystemStartOs,
+    effects: Effects,
     actionId: string,
     formData: unknown,
     timeoutMs: number | null,
@@ -795,7 +791,7 @@ export class SystemForEmbassy implements System {
       const method = moduleCode.action?.[actionId]
       if (!method) throw new Error("Expecting that the method action exists")
       return (await method(
-        new PolyfillEffects(effects, this.manifest),
+        polyfillEffects(effects, this.manifest),
         formData as any,
       ).then((x) => {
         if ("result" in x) return x.result
@@ -805,7 +801,7 @@ export class SystemForEmbassy implements System {
     }
   }
   private async dependenciesCheck(
-    effects: HostSystemStartOs,
+    effects: Effects,
     id: string,
     oldConfig: unknown,
     timeoutMs: number | null,
@@ -838,7 +834,7 @@ export class SystemForEmbassy implements System {
           `Expecting that the method dependency check ${id} exists`,
         )
       return (await method(
-        new PolyfillEffects(effects, this.manifest),
+        polyfillEffects(effects, this.manifest),
         oldConfig as any,
       ).then((x) => {
         if ("result" in x) return x.result
@@ -850,7 +846,7 @@ export class SystemForEmbassy implements System {
     }
   }
   private async dependenciesAutoconfig(
-    effects: HostSystemStartOs,
+    effects: Effects,
     id: string,
     oldConfig: unknown,
     timeoutMs: number | null,
@@ -863,7 +859,7 @@ export class SystemForEmbassy implements System {
         `Expecting that the method dependency autoConfigure ${id} exists`,
       )
     return (await method(
-      new PolyfillEffects(effects, this.manifest),
+      polyfillEffects(effects, this.manifest),
       oldConfig as any,
     ).then((x) => {
       if ("result" in x) return x.result
@@ -961,7 +957,7 @@ function cleanConfigFromPointers<C, S>(
 }
 
 async function updateConfig(
-  effects: HostSystemStartOs,
+  effects: Effects,
   manifest: Manifest,
   spec: unknown,
   mutConfigValue: unknown,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 3a8d5f624..2b7363cbf 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -4,390 +4,385 @@ import { Volume } from "../../../Models/Volume"
 import * as child_process from "child_process"
 import { promisify } from "util"
 import { daemons, startSdk, T } from "@start9labs/start-sdk"
-import { HostSystemStartOs } from "../../HostSystemStartOs"
 import "isomorphic-fetch"
 import { Manifest } from "./matchManifest"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import * as cp from "child_process"
+import { Effects } from "../../../Models/Effects"
 export const execFile = promisify(cp.execFile)
-export class PolyfillEffects implements oet.Effects {
-  constructor(
-    readonly effects: HostSystemStartOs,
-    private manifest: Manifest,
-  ) {}
-  async writeFile(input: {
-    path: string
-    volumeId: string
-    toWrite: string
-  }): Promise<void> {
-    await fs.writeFile(
-      new Volume(input.volumeId, input.path).path,
-      input.toWrite,
-    )
-  }
-  async readFile(input: { volumeId: string; path: string }): Promise<string> {
-    return (
-      await fs.readFile(new Volume(input.volumeId, input.path).path)
-    ).toString()
-  }
-  async metadata(input: {
-    volumeId: string
-    path: string
-  }): Promise<oet.Metadata> {
-    const stats = await fs.stat(new Volume(input.volumeId, input.path).path)
-    return {
-      fileType: stats.isFile() ? "file" : "directory",
-      gid: stats.gid,
-      uid: stats.uid,
-      mode: stats.mode,
-      isDir: stats.isDirectory(),
-      isFile: stats.isFile(),
-      isSymlink: stats.isSymbolicLink(),
-      len: stats.size,
-      readonly: (stats.mode & 0o200) > 0,
-    }
-  }
-  async createDir(input: { volumeId: string; path: string }): Promise<string> {
-    const path = new Volume(input.volumeId, input.path).path
-    await fs.mkdir(path, { recursive: true })
-    return path
-  }
-  async readDir(input: { volumeId: string; path: string }): Promise<string[]> {
-    return fs.readdir(new Volume(input.volumeId, input.path).path)
-  }
-  async removeDir(input: { volumeId: string; path: string }): Promise<string> {
-    const path = new Volume(input.volumeId, input.path).path
-    await fs.rmdir(new Volume(input.volumeId, input.path).path, {
-      recursive: true,
-    })
-    return path
-  }
-  removeFile(input: { volumeId: string; path: string }): Promise<void> {
-    return fs.rm(new Volume(input.volumeId, input.path).path)
-  }
-  async writeJsonFile(input: {
-    volumeId: string
-    path: string
-    toWrite: Record<string, unknown>
-  }): Promise<void> {
-    await fs.writeFile(
-      new Volume(input.volumeId, input.path).path,
-      JSON.stringify(input.toWrite),
-    )
-  }
-  async readJsonFile(input: {
-    volumeId: string
-    path: string
-  }): Promise<Record<string, unknown>> {
-    return JSON.parse(
-      (
+export const polyfillEffects = (
+  effects: Effects,
+  manifest: Manifest,
+): oet.Effects => {
+  const self = {
+    effects,
+    manifest,
+    async writeFile(input: {
+      path: string
+      volumeId: string
+      toWrite: string
+    }): Promise<void> {
+      await fs.writeFile(
+        new Volume(input.volumeId, input.path).path,
+        input.toWrite,
+      )
+    },
+    async readFile(input: { volumeId: string; path: string }): Promise<string> {
+      return (
         await fs.readFile(new Volume(input.volumeId, input.path).path)
-      ).toString(),
-    )
-  }
-  runCommand({
-    command,
-    args,
-    timeoutMillis,
-  }: {
-    command: string
-    args?: string[] | undefined
-    timeoutMillis?: number | undefined
-  }): Promise<oet.ResultType<string>> {
-    return startSdk
-      .runCommand(
-        this.effects,
-        { id: this.manifest.main.image },
-        [command, ...(args || [])],
-        {},
+      ).toString()
+    },
+    async metadata(input: {
+      volumeId: string
+      path: string
+    }): Promise<oet.Metadata> {
+      const stats = await fs.stat(new Volume(input.volumeId, input.path).path)
+      return {
+        fileType: stats.isFile() ? "file" : "directory",
+        gid: stats.gid,
+        uid: stats.uid,
+        mode: stats.mode,
+        isDir: stats.isDirectory(),
+        isFile: stats.isFile(),
+        isSymlink: stats.isSymbolicLink(),
+        len: stats.size,
+        readonly: (stats.mode & 0o200) > 0,
+      }
+    },
+    async createDir(input: {
+      volumeId: string
+      path: string
+    }): Promise<string> {
+      const path = new Volume(input.volumeId, input.path).path
+      await fs.mkdir(path, { recursive: true })
+      return path
+    },
+    async readDir(input: {
+      volumeId: string
+      path: string
+    }): Promise<string[]> {
+      return fs.readdir(new Volume(input.volumeId, input.path).path)
+    },
+    async removeDir(input: {
+      volumeId: string
+      path: string
+    }): Promise<string> {
+      const path = new Volume(input.volumeId, input.path).path
+      await fs.rmdir(new Volume(input.volumeId, input.path).path, {
+        recursive: true,
+      })
+      return path
+    },
+    removeFile(input: { volumeId: string; path: string }): Promise<void> {
+      return fs.rm(new Volume(input.volumeId, input.path).path)
+    },
+    async writeJsonFile(input: {
+      volumeId: string
+      path: string
+      toWrite: Record<string, unknown>
+    }): Promise<void> {
+      await fs.writeFile(
+        new Volume(input.volumeId, input.path).path,
+        JSON.stringify(input.toWrite),
       )
-      .then((x: any) => ({
-        stderr: x.stderr.toString(),
-        stdout: x.stdout.toString(),
-      }))
-      .then((x: any) =>
-        !!x.stderr ? { error: x.stderr } : { result: x.stdout },
+    },
+    async readJsonFile(input: {
+      volumeId: string
+      path: string
+    }): Promise<Record<string, unknown>> {
+      return JSON.parse(
+        (
+          await fs.readFile(new Volume(input.volumeId, input.path).path)
+        ).toString(),
       )
-  }
-  runDaemon(input: { command: string; args?: string[] | undefined }): {
-    wait(): Promise<oet.ResultType<string>>
-    term(): Promise<void>
-  } {
-    const dockerProcedureContainer = DockerProcedureContainer.of(
-      this.effects,
-      this.manifest.main,
-      this.manifest.volumes,
-    )
-    const daemon = dockerProcedureContainer.then((dockerProcedureContainer) =>
-      daemons.runCommand()(
-        this.effects,
-        { id: this.manifest.main.image },
-        [input.command, ...(input.args || [])],
-        {
-          overlay: dockerProcedureContainer.overlay,
-        },
-      ),
-    )
-    return {
-      wait: () =>
-        daemon.then((daemon) =>
-          daemon.wait().then(() => {
-            return { result: "" }
-          }),
+    },
+    runCommand({
+      command,
+      args,
+      timeoutMillis,
+    }: {
+      command: string
+      args?: string[] | undefined
+      timeoutMillis?: number | undefined
+    }): Promise<oet.ResultType<string>> {
+      return startSdk
+        .runCommand(
+          effects,
+          { id: manifest.main.image },
+          [command, ...(args || [])],
+          {},
+        )
+        .then((x: any) => ({
+          stderr: x.stderr.toString(),
+          stdout: x.stdout.toString(),
+        }))
+        .then((x: any) =>
+          !!x.stderr ? { error: x.stderr } : { result: x.stdout },
+        )
+    },
+    runDaemon(input: { command: string; args?: string[] | undefined }): {
+      wait(): Promise<oet.ResultType<string>>
+      term(): Promise<void>
+    } {
+      const dockerProcedureContainer = DockerProcedureContainer.of(
+        effects,
+        manifest.main,
+        manifest.volumes,
+      )
+      const daemon = dockerProcedureContainer.then((dockerProcedureContainer) =>
+        daemons.runCommand()(
+          effects,
+          { id: manifest.main.image },
+          [input.command, ...(input.args || [])],
+          {
+            overlay: dockerProcedureContainer.overlay,
+          },
         ),
-      term: () => daemon.then((daemon) => daemon.term()),
-    }
-  }
-  async chown(input: {
-    volumeId: string
-    path: string
-    uid: string
-  }): Promise<null> {
-    await startSdk
-      .runCommand(
-        this.effects,
-        { id: this.manifest.main.image },
-        ["chown", "--recursive", input.uid, `/drive/${input.path}`],
-        {
-          mounts: [
-            {
-              path: "/drive",
-              options: {
-                type: "volume",
-                id: input.volumeId,
-                subpath: null,
-                readonly: false,
-              },
-            },
-          ],
-        },
       )
-      .then((x: any) => ({
-        stderr: x.stderr.toString(),
-        stdout: x.stdout.toString(),
-      }))
-      .then((x: any) => {
-        if (!!x.stderr) {
-          throw new Error(x.stderr)
-        }
-      })
-    return null
-  }
-  async chmod(input: {
-    volumeId: string
-    path: string
-    mode: string
-  }): Promise<null> {
-    await startSdk
-      .runCommand(
-        this.effects,
-        { id: this.manifest.main.image },
-        ["chmod", "--recursive", input.mode, `/drive/${input.path}`],
-        {
-          mounts: [
-            {
-              path: "/drive",
-              options: {
-                type: "volume",
-                id: input.volumeId,
-                subpath: null,
-                readonly: false,
+      return {
+        wait: () =>
+          daemon.then((daemon) =>
+            daemon.wait().then(() => {
+              return { result: "" }
+            }),
+          ),
+        term: () => daemon.then((daemon) => daemon.term()),
+      }
+    },
+    async chown(input: {
+      volumeId: string
+      path: string
+      uid: string
+    }): Promise<null> {
+      await startSdk
+        .runCommand(
+          effects,
+          { id: manifest.main.image },
+          ["chown", "--recursive", input.uid, `/drive/${input.path}`],
+          {
+            mounts: [
+              {
+                path: "/drive",
+                options: {
+                  type: "volume",
+                  id: input.volumeId,
+                  subpath: null,
+                  readonly: false,
+                },
               },
-            },
-          ],
-        },
-      )
-      .then((x: any) => ({
-        stderr: x.stderr.toString(),
-        stdout: x.stdout.toString(),
-      }))
-      .then((x: any) => {
-        if (!!x.stderr) {
-          throw new Error(x.stderr)
-        }
+            ],
+          },
+        )
+        .then((x: any) => ({
+          stderr: x.stderr.toString(),
+          stdout: x.stdout.toString(),
+        }))
+        .then((x: any) => {
+          if (!!x.stderr) {
+            throw new Error(x.stderr)
+          }
+        })
+      return null
+    },
+    async chmod(input: {
+      volumeId: string
+      path: string
+      mode: string
+    }): Promise<null> {
+      await startSdk
+        .runCommand(
+          effects,
+          { id: manifest.main.image },
+          ["chmod", "--recursive", input.mode, `/drive/${input.path}`],
+          {
+            mounts: [
+              {
+                path: "/drive",
+                options: {
+                  type: "volume",
+                  id: input.volumeId,
+                  subpath: null,
+                  readonly: false,
+                },
+              },
+            ],
+          },
+        )
+        .then((x: any) => ({
+          stderr: x.stderr.toString(),
+          stdout: x.stdout.toString(),
+        }))
+        .then((x: any) => {
+          if (!!x.stderr) {
+            throw new Error(x.stderr)
+          }
+        })
+      return null
+    },
+    sleep(timeMs: number): Promise<null> {
+      return new Promise((resolve) => setTimeout(resolve, timeMs))
+    },
+    trace(whatToPrint: string): void {
+      console.trace(whatToPrint)
+    },
+    warn(whatToPrint: string): void {
+      console.warn(whatToPrint)
+    },
+    error(whatToPrint: string): void {
+      console.error(whatToPrint)
+    },
+    debug(whatToPrint: string): void {
+      console.debug(whatToPrint)
+    },
+    info(whatToPrint: string): void {
+      console.log(false)
+    },
+    is_sandboxed(): boolean {
+      return false
+    },
+    exists(input: { volumeId: string; path: string }): Promise<boolean> {
+      return self
+        .metadata(input)
+        .then(() => true)
+        .catch(() => false)
+    },
+    async fetch(
+      url: string,
+      options?:
+        | {
+            method?:
+              | "GET"
+              | "POST"
+              | "PUT"
+              | "DELETE"
+              | "HEAD"
+              | "PATCH"
+              | undefined
+            headers?: Record<string, string> | undefined
+            body?: string | undefined
+          }
+        | undefined,
+    ): Promise<{
+      method: string
+      ok: boolean
+      status: number
+      headers: Record<string, string>
+      body?: string | null | undefined
+      text(): Promise<string>
+      json(): Promise<unknown>
+    }> {
+      const fetched = await fetch(url, options)
+      return {
+        method: fetched.type,
+        ok: fetched.ok,
+        status: fetched.status,
+        headers: Object.fromEntries(fetched.headers.entries()),
+        body: await fetched.text(),
+        text: () => fetched.text(),
+        json: () => fetched.json(),
+      }
+    },
+
+    runRsync(rsyncOptions: {
+      srcVolume: string
+      dstVolume: string
+      srcPath: string
+      dstPath: string
+      options: oet.BackupOptions
+    }): {
+      id: () => Promise<string>
+      wait: () => Promise<null>
+      progress: () => Promise<number>
+    } {
+      let secondRun: ReturnType<typeof self._runRsync> | undefined
+      let firstRun = self._runRsync(rsyncOptions)
+      let waitValue = firstRun.wait().then((x) => {
+        secondRun = self._runRsync(rsyncOptions)
+        return secondRun.wait()
       })
-    return null
-  }
-  sleep(timeMs: number): Promise<null> {
-    return new Promise((resolve) => setTimeout(resolve, timeMs))
-  }
-  trace(whatToPrint: string): void {
-    console.trace(whatToPrint)
-  }
-  warn(whatToPrint: string): void {
-    console.warn(whatToPrint)
-  }
-  error(whatToPrint: string): void {
-    console.error(whatToPrint)
-  }
-  debug(whatToPrint: string): void {
-    console.debug(whatToPrint)
-  }
-  info(whatToPrint: string): void {
-    console.log(false)
-  }
-  is_sandboxed(): boolean {
-    return false
-  }
-  exists(input: { volumeId: string; path: string }): Promise<boolean> {
-    return this.metadata(input)
-      .then(() => true)
-      .catch(() => false)
-  }
-  async fetch(
-    url: string,
-    options?:
-      | {
-          method?:
-            | "GET"
-            | "POST"
-            | "PUT"
-            | "DELETE"
-            | "HEAD"
-            | "PATCH"
-            | undefined
-          headers?: Record<string, string> | undefined
-          body?: string | undefined
+      const id = async () => {
+        return secondRun?.id?.() ?? firstRun.id()
+      }
+      const wait = () => waitValue
+      const progress = async () => {
+        const secondProgress = secondRun?.progress?.()
+        if (secondProgress) {
+          return (await secondProgress) / 2.0 + 0.5
         }
-      | undefined,
-  ): Promise<{
-    method: string
-    ok: boolean
-    status: number
-    headers: Record<string, string>
-    body?: string | null | undefined
-    text(): Promise<string>
-    json(): Promise<unknown>
-  }> {
-    const fetched = await fetch(url, options)
-    return {
-      method: fetched.type,
-      ok: fetched.ok,
-      status: fetched.status,
-      headers: Object.fromEntries(fetched.headers.entries()),
-      body: await fetched.text(),
-      text: () => fetched.text(),
-      json: () => fetched.json(),
-    }
-  }
-
-  runRsync(rsyncOptions: {
-    srcVolume: string
-    dstVolume: string
-    srcPath: string
-    dstPath: string
-    options: oet.BackupOptions
-  }): {
-    id: () => Promise<string>
-    wait: () => Promise<null>
-    progress: () => Promise<number>
-  } {
-    let secondRun: ReturnType<typeof this._runRsync> | undefined
-    let firstRun = this._runRsync(rsyncOptions)
-    let waitValue = firstRun.wait().then((x) => {
-      secondRun = this._runRsync(rsyncOptions)
-      return secondRun.wait()
-    })
-    const id = async () => {
-      return secondRun?.id?.() ?? firstRun.id()
-    }
-    const wait = () => waitValue
-    const progress = async () => {
-      const secondProgress = secondRun?.progress?.()
-      if (secondProgress) {
-        return (await secondProgress) / 2.0 + 0.5
+        return (await firstRun.progress()) / 2.0
       }
-      return (await firstRun.progress()) / 2.0
-    }
-    return { id, wait, progress }
-  }
-  _runRsync(rsyncOptions: {
-    srcVolume: string
-    dstVolume: string
-    srcPath: string
-    dstPath: string
-    options: oet.BackupOptions
-  }): {
-    id: () => Promise<string>
-    wait: () => Promise<null>
-    progress: () => Promise<number>
-  } {
-    const { srcVolume, dstVolume, srcPath, dstPath, options } = rsyncOptions
-    const command = "rsync"
-    const args: string[] = []
-    if (options.delete) {
-      args.push("--delete")
-    }
-    if (options.force) {
-      args.push("--force")
-    }
-    if (options.ignoreExisting) {
-      args.push("--ignore-existing")
-    }
-    for (const exclude of options.exclude) {
-      args.push(`--exclude=${exclude}`)
-    }
-    args.push("-actAXH")
-    args.push("--info=progress2")
-    args.push("--no-inc-recursive")
-    args.push(new Volume(srcVolume, srcPath).path)
-    args.push(new Volume(dstVolume, dstPath).path)
-    const spawned = child_process.spawn(command, args, { detached: true })
-    let percentage = 0.0
-    spawned.stdout.on("data", (data: unknown) => {
-      const lines = String(data).replace("\r", "\n").split("\n")
-      for (const line of lines) {
-        const parsed = /$([0-9.]+)%/.exec(line)?.[1]
-        if (!parsed) continue
-        percentage = Number.parseFloat(parsed)
+      return { id, wait, progress }
+    },
+    _runRsync(rsyncOptions: {
+      srcVolume: string
+      dstVolume: string
+      srcPath: string
+      dstPath: string
+      options: oet.BackupOptions
+    }): {
+      id: () => Promise<string>
+      wait: () => Promise<null>
+      progress: () => Promise<number>
+    } {
+      const { srcVolume, dstVolume, srcPath, dstPath, options } = rsyncOptions
+      const command = "rsync"
+      const args: string[] = []
+      if (options.delete) {
+        args.push("--delete")
       }
-    })
-
-    spawned.stderr.on("data", (data: unknown) => {
-      console.error(String(data))
-    })
-
-    const id = async () => {
-      const pid = spawned.pid
-      if (pid === undefined) {
-        throw new Error("rsync process has no pid")
+      if (options.force) {
+        args.push("--force")
+      }
+      if (options.ignoreExisting) {
+        args.push("--ignore-existing")
+      }
+      for (const exclude of options.exclude) {
+        args.push(`--exclude=${exclude}`)
       }
-      return String(pid)
-    }
-    const waitPromise = new Promise<null>((resolve, reject) => {
-      spawned.on("exit", (code: any) => {
-        if (code === 0) {
-          resolve(null)
-        } else {
-          reject(new Error(`rsync exited with code ${code}`))
+      args.push("-actAXH")
+      args.push("--info=progress2")
+      args.push("--no-inc-recursive")
+      args.push(new Volume(srcVolume, srcPath).path)
+      args.push(new Volume(dstVolume, dstPath).path)
+      const spawned = child_process.spawn(command, args, { detached: true })
+      let percentage = 0.0
+      spawned.stdout.on("data", (data: unknown) => {
+        const lines = String(data).replace("\r", "\n").split("\n")
+        for (const line of lines) {
+          const parsed = /$([0-9.]+)%/.exec(line)?.[1]
+          if (!parsed) continue
+          percentage = Number.parseFloat(parsed)
         }
       })
-    })
-    const wait = () => waitPromise
-    const progress = () => Promise.resolve(percentage)
-    return { id, wait, progress }
-  }
-  async diskUsage(
-    options?: { volumeId: string; path: string } | undefined,
-  ): Promise<{ used: number; total: number }> {
-    const output = await execFile("df", ["--block-size=1", "-P", "/"])
-      .then((x: any) => ({
-        stderr: x.stderr.toString(),
-        stdout: x.stdout.toString(),
-      }))
-      .then((x: any) => {
-        if (!!x.stderr) {
-          throw new Error(x.stderr)
+
+      spawned.stderr.on("data", (data: unknown) => {
+        console.error(String(data))
+      })
+
+      const id = async () => {
+        const pid = spawned.pid
+        if (pid === undefined) {
+          throw new Error("rsync process has no pid")
         }
-        return parseDfOutput(x.stdout)
+        return String(pid)
+      }
+      const waitPromise = new Promise<null>((resolve, reject) => {
+        spawned.on("exit", (code: any) => {
+          if (code === 0) {
+            resolve(null)
+          } else {
+            reject(new Error(`rsync exited with code ${code}`))
+          }
+        })
       })
-    if (!!options) {
-      const used = await execFile("du", [
-        "-s",
-        "--block-size=1",
-        "-P",
-        new Volume(options.volumeId, options.path).path,
-      ])
+      const wait = () => waitPromise
+      const progress = () => Promise.resolve(percentage)
+      return { id, wait, progress }
+    },
+    async diskUsage(
+      options?: { volumeId: string; path: string } | undefined,
+    ): Promise<{ used: number; total: number }> {
+      const output = await execFile("df", ["--block-size=1", "-P", "/"])
         .then((x: any) => ({
           stderr: x.stderr.toString(),
           stdout: x.stdout.toString(),
@@ -396,15 +391,34 @@ export class PolyfillEffects implements oet.Effects {
           if (!!x.stderr) {
             throw new Error(x.stderr)
           }
-          return Number.parseInt(x.stdout.split(/\s+/)[0])
+          return parseDfOutput(x.stdout)
         })
-      return {
-        ...output,
-        used,
+      if (!!options) {
+        const used = await execFile("du", [
+          "-s",
+          "--block-size=1",
+          "-P",
+          new Volume(options.volumeId, options.path).path,
+        ])
+          .then((x: any) => ({
+            stderr: x.stderr.toString(),
+            stdout: x.stdout.toString(),
+          }))
+          .then((x: any) => {
+            if (!!x.stderr) {
+              throw new Error(x.stderr)
+            }
+            return Number.parseInt(x.stdout.split(/\s+/)[0])
+          })
+        return {
+          ...output,
+          used,
+        }
       }
-    }
-    return output
+      return output
+    },
   }
+  return self
 }
 
 function parseDfOutput(output: string): { used: number; total: number } {
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index bf27f222d..e10434032 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -1,7 +1,7 @@
 import { ExecuteResult, System } from "../../Interfaces/System"
 import { unNestPath } from "../../Models/JsonPath"
 import matches, { any, number, object, string, tuple } from "ts-matches"
-import { HostSystemStartOs } from "../HostSystemStartOs"
+import { hostSystemStartOs } from "../HostSystemStartOs"
 import { Effects } from "../../Models/Effects"
 import { RpcResult, matchRpcResult } from "../RpcListener"
 import { duration } from "../../Models/Duration"
@@ -15,7 +15,7 @@ export class SystemForStartOs implements System {
   }
   constructor(readonly abi: T.ABI) {}
   async execute(
-    effects: HostSystemStartOs,
+    effectCreator: ReturnType<typeof hostSystemStartOs>,
     options: {
       id: string
       procedure:
@@ -36,8 +36,7 @@ export class SystemForStartOs implements System {
       timeout?: number | undefined
     },
   ): Promise<RpcResult> {
-    effects = Object.create(effects)
-    effects.procedureId = options.id
+    const effects = effectCreator(options.id)
     return this._execute(effects, options)
       .then((x) =>
         matches(x)
diff --git a/container-runtime/src/Interfaces/HostSystem.ts b/container-runtime/src/Interfaces/HostSystem.ts
index 4e04bbcc8..4ba986e3b 100644
--- a/container-runtime/src/Interfaces/HostSystem.ts
+++ b/container-runtime/src/Interfaces/HostSystem.ts
@@ -2,6 +2,7 @@ import { types as T } from "@start9labs/start-sdk"
 
 import { CallbackHolder } from "../Models/CallbackHolder"
 import { Effects } from "../Models/Effects"
-
 export type HostSystem = Effects
-export type GetHostSystem = (callbackHolder: CallbackHolder) => HostSystem
+export type GetHostSystem = (
+  callbackHolder: CallbackHolder,
+) => (procedureId: null | string) => Effects
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
index 85ba0fb0f..986288411 100644
--- a/container-runtime/src/Interfaces/System.ts
+++ b/container-runtime/src/Interfaces/System.ts
@@ -1,7 +1,7 @@
 import { types as T } from "@start9labs/start-sdk"
 import { JsonPath } from "../Models/JsonPath"
-import { HostSystemStartOs } from "../Adapters/HostSystemStartOs"
 import { RpcResult } from "../Adapters/RpcListener"
+import { hostSystemStartOs } from "../Adapters/HostSystemStartOs"
 export type ExecuteResult =
   | { ok: unknown }
   | { err: { code: number; message: string } }
@@ -12,7 +12,7 @@ export interface System {
   // stop(effects: Effects, options: { timeout: number, signal?: number }): Promise<void>
 
   execute(
-    effects: T.Effects,
+    effectCreator: ReturnType<typeof hostSystemStartOs>,
     options: {
       id: string
       procedure: JsonPath
diff --git a/container-runtime/src/index.ts b/container-runtime/src/index.ts
index d86111ecb..74be5b73a 100644
--- a/container-runtime/src/index.ts
+++ b/container-runtime/src/index.ts
@@ -1,12 +1,12 @@
 import { RpcListener } from "./Adapters/RpcListener"
 import { SystemForEmbassy } from "./Adapters/Systems/SystemForEmbassy"
-import { HostSystemStartOs } from "./Adapters/HostSystemStartOs"
+import { hostSystemStartOs } from "./Adapters/HostSystemStartOs"
 import { AllGetDependencies } from "./Interfaces/AllGetDependencies"
 import { getSystem } from "./Adapters/Systems"
 
 const getDependencies: AllGetDependencies = {
   system: getSystem,
-  hostSystem: () => HostSystemStartOs.of,
+  hostSystem: () => hostSystemStartOs,
 }
 
 new RpcListener(getDependencies)
diff --git a/download-firmware.sh b/download-firmware.sh
index 2457b3062..be72e6a6d 100755
--- a/download-firmware.sh
+++ b/download-firmware.sh
@@ -16,7 +16,8 @@ mkdir -p ./firmware/$PLATFORM
 
 cd ./firmware/$PLATFORM
 
-mapfile -t firmwares <<< "$(jq -c ".[] | select(.platform[] | contains(\"$PLATFORM\"))" ../../build/lib/firmware.json)"
+firmwares=()
+while IFS= read -r line; do firmwares+=("$line"); done < <(jq -c ".[] | select(.platform[] | contains(\"$PLATFORM\"))" ../../build/lib/firmware.json)
 for firmware in "${firmwares[@]}"; do
 	if [ -n "$firmware" ]; then
 		id=$(echo "$firmware" | jq --raw-output '.id')

From e92d4ff1471ec5c3fea8edb7962b2427a1c1fb5e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:37:57 -0600
Subject: [PATCH 162/341] fix compat assets (#2645)

* fix compat assets

* return error on s9pk parse fail in sideload

* return parse error over websocket
---
 core/startos/src/install/mod.rs    | 40 ++++++++++++++++++++++--------
 core/startos/src/s9pk/v2/compat.rs |  4 ++-
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index bb7d1a02e..707503615 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -198,12 +198,22 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                 use axum::extract::ws::Message;
                 async move {
                     if let Err(e) = async {
-                        let id = id_recv.await.map_err(|_| {
+                        let id = match id_recv.await.map_err(|_| {
                             Error::new(
                                 eyre!("Could not get id to watch progress"),
                                 ErrorKind::Cancelled,
                             )
-                        })?;
+                        }).and_then(|a|a) {
+                            Ok(a) => a,
+                            Err(e) =>{ ws.send(Message::Text(
+                                serde_json::to_string(&Err::<(), _>(RpcError::from(e.clone_output())))
+                                .with_kind(ErrorKind::Serialization)?,
+                            ))
+                            .await
+                            .with_kind(ErrorKind::Network)?;
+                            return Err(e);
+                        }
+                        };
                         tokio::select! {
                             res = async {
                                 while let Some(_) = sub.recv().await {
@@ -259,17 +269,25 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
     .await;
     tokio::spawn(async move {
         if let Err(e) = async {
-            let s9pk = S9pk::deserialize(
+            match S9pk::deserialize(
                 &file, None, // TODO
             )
-            .await?;
-            let _ = id_send.send(s9pk.as_manifest().id.clone());
-            ctx.services
-                .install(ctx.clone(), s9pk, None::<Never>)
-                .await?
-                .await?
-                .await?;
-            file.delete().await
+            .await
+            {
+                Ok(s9pk) => {
+                    let _ = id_send.send(Ok(s9pk.as_manifest().id.clone()));
+                    ctx.services
+                        .install(ctx.clone(), s9pk, None::<Never>)
+                        .await?
+                        .await?
+                        .await?;
+                    file.delete().await
+                }
+                Err(e) => {
+                    let _ = id_send.send(Err(e.clone_output()));
+                    return Err(e);
+                }
+            }
         }
         .await
         {
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 835c86b87..ec5b586ea 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -209,7 +209,9 @@ impl S9pk<Section<MultiCursorFile>> {
                 .invoke(ErrorKind::Filesystem)
                 .await?;
             archive.insert_path(
-                Path::new("assets").join(&asset_id),
+                Path::new("assets")
+                    .join(&asset_id)
+                    .with_extension("squashfs"),
                 Entry::file(PackSource::File(sqfs_path)),
             )?;
         }

From da3720c7a9e158d64a6d9825f883f972597e05ae Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Wed, 19 Jun 2024 13:51:44 -0600
Subject: [PATCH 163/341] Feat/combine uis (#2633)

* wip

* restructure backend for new ui structure

* new patchdb bootstrap, single websocket api, local storage migration, more

* update db websocket

* init apis

* update patch-db

* setup progress

* feat: implement state service, alert and routing

Signed-off-by: waterplea <alexander@inkin.ru>

* update setup wizard for new types

* feat: add init page

Signed-off-by: waterplea <alexander@inkin.ru>

* chore: refactor message, patch-db source stream and connection service

Signed-off-by: waterplea <alexander@inkin.ru>

* fix method not found on state

* fix backend bugs

* fix compat assets

* address comments

* remove unneeded styling

* cleaner progress

* bugfixes

* fix init logs

* fix progress reporting

* fix navigation by getting state after init

* remove patch dependency from live api

* fix caching

* re-add patchDB to live api

* fix metrics values

* send close frame

* add bootId and fix polling

---------

Signed-off-by: waterplea <alexander@inkin.ru>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
Co-authored-by: waterplea <alexander@inkin.ru>
---
 Makefile                                      |   7 +-
 core/Cargo.lock                               | 712 ++++++++++++------
 core/startos/Cargo.toml                       |   4 +-
 core/startos/src/backup/restore.rs            |  60 +-
 core/startos/src/bins/registry.rs             |   3 +-
 core/startos/src/bins/start_init.rs           | 209 +++--
 core/startos/src/bins/startd.rs               |  76 +-
 core/startos/src/context/cli.rs               |   7 +-
 core/startos/src/context/diagnostic.rs        |   2 +-
 core/startos/src/context/init.rs              |  47 ++
 core/startos/src/context/install.rs           |   9 +
 core/startos/src/context/mod.rs               |   2 +
 core/startos/src/context/rpc.rs               | 114 ++-
 core/startos/src/context/setup.rs             | 147 +++-
 core/startos/src/db/mod.rs                    | 242 ++----
 core/startos/src/diagnostic.rs                |  13 +-
 core/startos/src/disk/main.rs                 |   2 +-
 core/startos/src/firmware.rs                  |  83 +-
 core/startos/src/init.rs                      | 323 +++++++-
 core/startos/src/install/mod.rs               |  30 +-
 core/startos/src/lib.rs                       |  87 ++-
 core/startos/src/lxc/mod.rs                   |  80 +-
 core/startos/src/middleware/auth.rs           |  18 +-
 core/startos/src/middleware/diagnostic.rs     |  42 --
 core/startos/src/middleware/mod.rs            |   1 -
 core/startos/src/net/net_controller.rs        |  53 +-
 core/startos/src/net/refresher.html           |  11 +
 core/startos/src/net/static_server.rs         | 359 ++++-----
 core/startos/src/net/web_server.rs            | 103 ++-
 core/startos/src/progress.rs                  | 163 ++--
 core/startos/src/registry/context.rs          |   3 +-
 core/startos/src/registry/mod.rs              |   6 +-
 core/startos/src/registry/os/asset/add.rs     |  27 +-
 core/startos/src/registry/os/asset/get.rs     |  26 +-
 core/startos/src/registry/os/asset/sign.rs    |  27 +-
 core/startos/src/registry/package/add.rs      |  29 +-
 .../src/registry/signer/commitment/request.rs |   2 +-
 core/startos/src/rpc_continuations.rs         | 131 +++-
 .../source/multi_cursor_file.rs               |   1 +
 core/startos/src/service/mod.rs               |   2 +-
 core/startos/src/service/service_map.rs       |  35 +-
 core/startos/src/setup.rs                     | 363 ++++-----
 core/startos/src/update/mod.rs                | 101 ++-
 core/startos/src/upload.rs                    | 101 +--
 core/startos/src/util/io.rs                   |  77 +-
 core/startos/src/util/mod.rs                  |   1 +
 core/startos/src/util/net.rs                  |  24 +
 core/startos/src/util/serde.rs                |  12 +-
 core/startos/src/version/mod.rs               |  34 +-
 core/startos/src/volume.rs                    |   6 +-
 patch-db                                      |   2 +-
 sdk/lib/osBindings/AttachParams.ts            |   7 +
 sdk/lib/osBindings/BackupTargetFS.ts          |   7 +
 sdk/lib/osBindings/BlockDev.ts                |   3 +
 sdk/lib/osBindings/Cifs.ts                    |   8 +
 sdk/lib/osBindings/InitProgressRes.ts         |   5 +
 sdk/lib/osBindings/RecoverySource.ts          |   6 +
 sdk/lib/osBindings/SetupExecuteParams.ts      |  10 +
 sdk/lib/osBindings/SetupProgress.ts           |   5 +
 sdk/lib/osBindings/SetupResult.ts             |   7 +
 sdk/lib/osBindings/SetupStatusRes.ts          |   7 +
 sdk/lib/osBindings/VerifyCifsParams.ts        |   9 +
 sdk/lib/osBindings/index.ts                   |  11 +
 web/package-lock.json                         |  19 +-
 web/package.json                              |   3 +-
 .../src/app/app-routing.module.ts             |  27 -
 .../diagnostic-ui/src/app/app.component.html  |   5 -
 .../diagnostic-ui/src/app/app.component.scss  |   8 -
 .../diagnostic-ui/src/app/app.component.ts    |  10 -
 .../diagnostic-ui/src/app/app.module.ts       |  43 --
 .../src/app/pages/home/home-routing.module.ts |  16 -
 .../src/app/services/api/api.service.ts       |  16 -
 .../src/app/services/api/live-api.service.ts  |  68 --
 .../src/app/services/api/mock-api.service.ts  |  67 --
 .../src/environments/environment.prod.ts      |   3 -
 .../src/environments/environment.ts           |  16 -
 web/projects/diagnostic-ui/src/index.html     |  23 -
 web/projects/diagnostic-ui/src/main.ts        |  12 -
 web/projects/diagnostic-ui/src/polyfills.ts   |  64 --
 web/projects/diagnostic-ui/src/styles.scss    |  41 -
 web/projects/diagnostic-ui/src/zone-flags.ts  |   6 -
 web/projects/diagnostic-ui/tsconfig.json      |   9 -
 .../setup-wizard/src/app/app.component.ts     |   2 +-
 .../src/app/pages/embassy/embassy.page.ts     |  24 +-
 .../src/app/pages/loading/loading.module.ts   |   4 +-
 .../src/app/pages/loading/loading.page.html   |  54 +-
 .../src/app/pages/loading/loading.page.scss   |   3 -
 .../src/app/pages/loading/loading.page.ts     | 158 ++--
 .../src/app/services/api/api.service.ts       |  63 +-
 .../src/app/services/api/live-api.service.ts  |  60 +-
 .../src/app/services/api/mock-api.service.ts  | 184 ++++-
 .../src/app/services/state.service.ts         |   6 +-
 web/projects/shared/src/types/api.ts          |   1 +
 web/projects/ui/src/app/app-routing.module.ts |  27 +-
 web/projects/ui/src/app/app.component.html    |   1 +
 web/projects/ui/src/app/app.component.scss    |   6 +-
 web/projects/ui/src/app/app.component.ts      |  20 +-
 web/projects/ui/src/app/app.module.ts         |   2 +
 web/projects/ui/src/app/app.providers.ts      |   7 +-
 .../ui/src/app/app/menu/menu.component.ts     |   4 +-
 .../connection-bar.component.ts               |  12 +-
 .../src/app/components/logs/logs.component.ts |  68 +-
 .../components/status/status.component.html   |   4 +-
 .../app/components/status/status.component.ts |   4 +-
 .../app/modals/os-update/os-update.page.ts    |   3 +-
 .../app-list-icon.component.html              |   2 +-
 .../app-list-icon/app-list-icon.component.ts  |   4 +-
 .../app-show-health-checks.component.html     |   2 +-
 .../app-show-health-checks.component.ts       |   4 +-
 .../app-show-status.component.html            |   2 +-
 .../app-show-status.component.ts              |   4 +-
 .../diagnostic-routing.module.ts              |  21 +
 .../diagnostic-routes}/home/home.module.ts    |  12 +-
 .../diagnostic-routes}/home/home.page.html    |   6 -
 .../diagnostic-routes}/home/home.page.scss    |   0
 .../diagnostic-routes}/home/home.page.ts      |  59 +-
 .../diagnostic-routes}/logs/logs.module.ts    |   0
 .../diagnostic-routes}/logs/logs.page.html    |   0
 .../diagnostic-routes}/logs/logs.page.scss    |   0
 .../diagnostic-routes}/logs/logs.page.ts      |   4 +-
 .../ui/src/app/pages/init/init.module.ts      |  24 +
 .../ui/src/app/pages/init/init.page.html      |  18 +
 .../ui/src/app/pages/init/init.page.scss      |  23 +
 .../ui/src/app/pages/init/init.page.ts        |  11 +
 .../ui/src/app/pages/init/init.service.ts     |  91 +++
 .../src/app/pages/init/logs/logs.component.ts |  33 +
 .../ui/src/app/pages/init/logs/logs.module.ts |  20 +
 .../src/app/pages/init/logs/logs.service.ts   |  49 ++
 .../app/pages/init/logs/logs.template.html    |   9 +
 .../login/ca-wizard/ca-wizard.component.ts    |   2 +-
 .../server-metrics/server-metrics.page.html   |   4 +-
 .../server-show/server-show.page.ts           |  49 --
 .../ui/src/app/services/api/api.fixures.ts    |  21 +-
 .../ui/src/app/services/api/api.types.ts      |  47 +-
 .../app/services/api/embassy-api.service.ts   |  49 +-
 .../services/api/embassy-live-api.service.ts  | 121 +--
 .../services/api/embassy-mock-api.service.ts  | 242 ++++--
 .../ui/src/app/services/auth.service.ts       |   2 +-
 .../ui/src/app/services/connection.service.ts |  30 +-
 .../ui/src/app/services/eos.service.ts        |  11 +-
 .../ui/src/app/services/network.service.ts    |  22 +
 .../ui/src/app/services/patch-data.service.ts |  27 +-
 .../patch-db/local-storage-bootstrap.ts       |  16 +-
 .../app/services/patch-db/patch-db.factory.ts |  56 +-
 .../src/app/services/patch-monitor.service.ts |   9 +-
 .../ui/src/app/services/state.service.ts      | 136 ++++
 .../ui/src/app/services/storage.service.ts    |  21 +-
 147 files changed, 3921 insertions(+), 2619 deletions(-)
 create mode 100644 core/startos/src/context/init.rs
 delete mode 100644 core/startos/src/middleware/diagnostic.rs
 create mode 100644 core/startos/src/net/refresher.html
 create mode 100644 core/startos/src/util/net.rs
 create mode 100644 sdk/lib/osBindings/AttachParams.ts
 create mode 100644 sdk/lib/osBindings/BackupTargetFS.ts
 create mode 100644 sdk/lib/osBindings/BlockDev.ts
 create mode 100644 sdk/lib/osBindings/Cifs.ts
 create mode 100644 sdk/lib/osBindings/InitProgressRes.ts
 create mode 100644 sdk/lib/osBindings/RecoverySource.ts
 create mode 100644 sdk/lib/osBindings/SetupExecuteParams.ts
 create mode 100644 sdk/lib/osBindings/SetupProgress.ts
 create mode 100644 sdk/lib/osBindings/SetupResult.ts
 create mode 100644 sdk/lib/osBindings/SetupStatusRes.ts
 create mode 100644 sdk/lib/osBindings/VerifyCifsParams.ts
 delete mode 100644 web/projects/diagnostic-ui/src/app/app-routing.module.ts
 delete mode 100644 web/projects/diagnostic-ui/src/app/app.component.html
 delete mode 100644 web/projects/diagnostic-ui/src/app/app.component.scss
 delete mode 100644 web/projects/diagnostic-ui/src/app/app.component.ts
 delete mode 100644 web/projects/diagnostic-ui/src/app/app.module.ts
 delete mode 100644 web/projects/diagnostic-ui/src/app/pages/home/home-routing.module.ts
 delete mode 100644 web/projects/diagnostic-ui/src/app/services/api/api.service.ts
 delete mode 100644 web/projects/diagnostic-ui/src/app/services/api/live-api.service.ts
 delete mode 100644 web/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts
 delete mode 100644 web/projects/diagnostic-ui/src/environments/environment.prod.ts
 delete mode 100644 web/projects/diagnostic-ui/src/environments/environment.ts
 delete mode 100644 web/projects/diagnostic-ui/src/index.html
 delete mode 100644 web/projects/diagnostic-ui/src/main.ts
 delete mode 100644 web/projects/diagnostic-ui/src/polyfills.ts
 delete mode 100644 web/projects/diagnostic-ui/src/styles.scss
 delete mode 100644 web/projects/diagnostic-ui/src/zone-flags.ts
 delete mode 100644 web/projects/diagnostic-ui/tsconfig.json
 create mode 100644 web/projects/ui/src/app/pages/diagnostic-routes/diagnostic-routing.module.ts
 rename web/projects/{diagnostic-ui/src/app/pages => ui/src/app/pages/diagnostic-routes}/home/home.module.ts (55%)
 rename web/projects/{diagnostic-ui/src/app/pages => ui/src/app/pages/diagnostic-routes}/home/home.page.html (92%)
 rename web/projects/{diagnostic-ui/src/app/pages => ui/src/app/pages/diagnostic-routes}/home/home.page.scss (100%)
 rename web/projects/{diagnostic-ui/src/app/pages => ui/src/app/pages/diagnostic-routes}/home/home.page.ts (74%)
 rename web/projects/{diagnostic-ui/src/app/pages => ui/src/app/pages/diagnostic-routes}/logs/logs.module.ts (100%)
 rename web/projects/{diagnostic-ui/src/app/pages => ui/src/app/pages/diagnostic-routes}/logs/logs.page.html (100%)
 rename web/projects/{diagnostic-ui/src/app/pages => ui/src/app/pages/diagnostic-routes}/logs/logs.page.scss (100%)
 rename web/projects/{diagnostic-ui/src/app/pages => ui/src/app/pages/diagnostic-routes}/logs/logs.page.ts (93%)
 create mode 100644 web/projects/ui/src/app/pages/init/init.module.ts
 create mode 100644 web/projects/ui/src/app/pages/init/init.page.html
 create mode 100644 web/projects/ui/src/app/pages/init/init.page.scss
 create mode 100644 web/projects/ui/src/app/pages/init/init.page.ts
 create mode 100644 web/projects/ui/src/app/pages/init/init.service.ts
 create mode 100644 web/projects/ui/src/app/pages/init/logs/logs.component.ts
 create mode 100644 web/projects/ui/src/app/pages/init/logs/logs.module.ts
 create mode 100644 web/projects/ui/src/app/pages/init/logs/logs.service.ts
 create mode 100644 web/projects/ui/src/app/pages/init/logs/logs.template.html
 create mode 100644 web/projects/ui/src/app/services/network.service.ts
 create mode 100644 web/projects/ui/src/app/services/state.service.ts

diff --git a/Makefile b/Makefile
index 34064e799..4915101e3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PLATFORM := $(shell if [ -f ./PLATFORM.txt ]; then cat ./PLATFORM.txt; else echo
 ARCH := $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo aarch64; else echo $(PLATFORM) | sed 's/-nonfree$$//g'; fi)
 IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo iso; fi)
 BINS := core/target/$(ARCH)-unknown-linux-musl/release/startbox core/target/$(ARCH)-unknown-linux-musl/release/containerbox
-WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/diagnostic-ui web/dist/raw/install-wizard
+WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/install-wizard
 FIRMWARE_ROMS := ./firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json)
 BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts $(FIRMWARE_ROMS)
 DEBIAN_SRC := $(shell git ls-files debian/)
@@ -20,7 +20,6 @@ CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules
 WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist web/patchdb-ui-seed.json
 WEB_UI_SRC := $(shell git ls-files web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
-WEB_DIAGNOSTIC_UI_SRC := $(shell git ls-files web/projects/diagnostic-ui)
 WEB_INSTALL_WIZARD_SRC := $(shell git ls-files web/projects/install-wizard)
 PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client)
 GZIP_BIN := $(shell which pigz || which gzip)
@@ -244,10 +243,6 @@ web/dist/raw/setup-wizard: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC)
 	npm --prefix web run build:setup
 	touch web/dist/raw/setup-wizard
 
-web/dist/raw/diagnostic-ui: $(WEB_DIAGNOSTIC_UI_SRC) $(WEB_SHARED_SRC)
-	npm --prefix web run build:dui
-	touch web/dist/raw/diagnostic-ui
-
 web/dist/raw/install-wizard: $(WEB_INSTALL_WIZARD_SRC) $(WEB_SHARED_SRC)
 	npm --prefix web run build:install-wiz
 	touch web/dist/raw/install-wizard
diff --git a/core/Cargo.lock b/core/Cargo.lock
index cf10152c2..031ec41ab 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -42,7 +42,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
 ]
@@ -54,7 +54,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -137,9 +137,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
@@ -156,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "arrayref"
@@ -187,16 +187,16 @@ version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
- "concurrent-queue",
+ "concurrent-queue 2.5.0",
  "event-listener",
  "futures-core",
 ]
 
 [[package]]
 name = "async-compression"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693"
+checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
 dependencies = [
  "brotli",
  "flate2",
@@ -225,7 +225,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -236,7 +236,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -248,6 +248,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -278,7 +284,7 @@ dependencies = [
  "futures-util",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "itoa",
  "matchit",
  "memchr",
@@ -418,6 +424,17 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "barrage"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be5951c75bdabb58753d140dd5802f12ff3a483cb2e16fb5276e111b94b19e87"
+dependencies = [
+ "concurrent-queue 1.2.4",
+ "event-listener",
+ "spin 0.9.8",
+]
+
 [[package]]
 name = "base16ct"
 version = "0.2.0"
@@ -562,9 +579,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "5.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67"
+checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -573,9 +590,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76"
+checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -599,11 +616,17 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
+[[package]]
+name = "cache-padded"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
+
 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 dependencies = [
  "jobserver",
  "libc",
@@ -688,9 +711,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -698,9 +721,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -710,21 +733,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "color-eyre"
@@ -759,6 +782,15 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
+[[package]]
+name = "concurrent-queue"
+version = "1.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
+dependencies = [
+ "cache-padded",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -945,18 +977,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -991,9 +1023,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crossterm"
@@ -1117,14 +1149,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1132,27 +1164,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
- "syn 2.0.60",
+ "strsim 0.11.1",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1183,7 +1215,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1206,7 +1238,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1274,6 +1306,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "divrem"
 version = "1.0.0"
@@ -1367,9 +1410,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 dependencies = [
  "serde",
 ]
@@ -1407,9 +1450,9 @@ dependencies = [
 
 [[package]]
 name = "ena"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1"
+checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
 dependencies = [
  "log",
 ]
@@ -1444,7 +1487,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1455,9 +1498,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1517,9 +1560,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "filetime"
@@ -1533,12 +1576,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "finl_unicode"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
-
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -1678,7 +1715,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1735,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1794,15 +1831,15 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
  "http 1.1.0",
  "indexmap 2.2.6",
  "slab",
@@ -2005,12 +2042,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
+ "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
  "pin-project-lite",
@@ -2018,9 +2055,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545"
 
 [[package]]
 name = "httpdate"
@@ -2036,9 +2073,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2067,7 +2104,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.4",
+ "h2 0.4.5",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
@@ -2085,7 +2122,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2109,9 +2146,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2150,6 +2187,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "id-pool"
 version = "0.2.2"
@@ -2187,12 +2342,14 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
+ "smallvec",
+ "utf8_iter",
 ]
 
 [[package]]
@@ -2302,9 +2459,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
@@ -2535,7 +2692,7 @@ dependencies = [
  "petgraph",
  "pico-args",
  "regex",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -2549,7 +2706,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex-automata 0.4.6",
+ "regex-automata 0.4.7",
 ]
 
 [[package]]
@@ -2579,9 +2736,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libm"
@@ -2618,9 +2775,15 @@ checksum = "3e281a65eeba3d4503a2839252f86374528f9ceafe6fed97c1d3b52e1fb625c1"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "litemap"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
 
 [[package]]
 name = "lock_api"
@@ -2734,9 +2897,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
 dependencies = [
  "adler",
 ]
@@ -2786,11 +2949,10 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -2885,9 +3047,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -2899,11 +3061,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -2927,9 +3088,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
@@ -2962,11 +3123,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -3010,7 +3170,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3076,7 +3236,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3087,9 +3247,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.2.3+3.2.1"
+version = "300.3.1+3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
 dependencies = [
  "cc",
 ]
@@ -3159,9 +3319,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3182,9 +3342,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "patch-db"
@@ -3254,9 +3414,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap 2.2.6",
@@ -3294,7 +3454,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3400,9 +3560,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
  "unicode-ident",
 ]
@@ -3421,7 +3581,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3440,9 +3600,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -3450,22 +3610,22 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
 dependencies = [
  "prost",
 ]
@@ -3566,7 +3726,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -3655,21 +3815,21 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -3683,13 +3843,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -3700,9 +3860,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
@@ -3717,7 +3877,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.4",
+ "h2 0.4.5",
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
@@ -3781,7 +3941,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "libc",
  "spin 0.9.8",
  "untrusted",
@@ -3802,7 +3962,7 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#f5566840bb9af0743612fede4034f5a390cd1eee"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#5a24903031e72ac75fd23889215361edc7b20842"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -3871,9 +4031,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -3923,7 +4083,7 @@ dependencies = [
  "log",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.3",
+ "rustls-webpki 0.102.4",
  "subtle",
  "zeroize",
 ]
@@ -3949,9 +4109,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.5.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-webpki"
@@ -3965,9 +4125,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.3"
+version = "0.102.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4064,11 +4224,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -4077,9 +4237,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4087,9 +4247,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 dependencies = [
  "serde",
 ]
@@ -4128,7 +4288,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4155,9 +4315,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -4201,7 +4361,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4396,11 +4556,10 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
+checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f"
 dependencies = [
- "itertools 0.12.1",
  "nom",
  "unicode_categories",
 ]
@@ -4629,7 +4788,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.60",
+ "syn 2.0.66",
  "unicode-width",
 ]
 
@@ -4675,6 +4834,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "start-os"
 version = "0.3.5-rev.2"
@@ -4686,6 +4851,7 @@ dependencies = [
  "axum 0.7.5",
  "axum-server",
  "backhand",
+ "barrage",
  "base32",
  "base64 0.21.7",
  "base64ct",
@@ -4783,8 +4949,9 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite",
  "tokio-util",
- "toml 0.8.12",
+ "toml 0.8.14",
  "torut",
+ "tower-service",
  "tracing",
  "tracing-error",
  "tracing-futures",
@@ -4827,13 +4994,13 @@ dependencies = [
 
 [[package]]
 name = "stringprep"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
 dependencies = [
- "finl_unicode",
  "unicode-bidi",
  "unicode-normalization",
+ "unicode-properties",
 ]
 
 [[package]]
@@ -4867,9 +5034,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4888,6 +5055,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -4917,9 +5095,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
 dependencies = [
  "filetime",
  "libc",
@@ -4970,22 +5148,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5049,6 +5227,16 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -5066,9 +5254,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5096,13 +5284,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5180,16 +5368,15 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -5206,21 +5393,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.12",
+ "toml_edit 0.22.14",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
@@ -5251,15 +5438,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.12"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.7",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -5276,7 +5463,7 @@ dependencies = [
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -5360,7 +5547,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5512,7 +5699,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
  "termcolor",
 ]
 
@@ -5553,7 +5740,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5598,6 +5785,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-properties"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
@@ -5606,9 +5799,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
@@ -5630,12 +5823,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna 1.0.0",
  "percent-encoding",
  "serde",
 ]
@@ -5652,11 +5845,23 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
@@ -5664,7 +5869,7 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -5752,7 +5957,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
  "wasm-bindgen-shared",
 ]
 
@@ -5786,7 +5991,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6026,9 +6231,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.7"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]
@@ -6043,6 +6248,18 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -6105,31 +6322,76 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
+ "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
@@ -6142,7 +6404,29 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
 ]
 
 [[package]]
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 3ad4f9eeb..a8707bf65 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -59,6 +59,7 @@ async-stream = "0.3.5"
 async-trait = "0.1.74"
 axum = { version = "0.7.3", features = ["ws"] }
 axum-server = "0.6.0"
+barrage = "0.2.3"
 backhand = "0.18.0"
 base32 = "0.4.0"
 base64 = "0.21.4"
@@ -102,7 +103,7 @@ id-pool = { version = "0.2.2", default-features = false, features = [
 ] }
 imbl = "2.0.2"
 imbl-value = { git = "https://github.com/Start9Labs/imbl-value.git" }
-include_dir = "0.7.3"
+include_dir = { version = "0.7.3", features = ["metadata"] }
 indexmap = { version = "2.0.2", features = ["serde"] }
 indicatif = { version = "0.17.7", features = ["tokio"] }
 integer-encoding = { version = "4.0.0", features = ["tokio_async"] }
@@ -178,6 +179,7 @@ tokio-util = { version = "0.7.9", features = ["io"] }
 torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies", features = [
   "serialize",
 ] }
+tower-service = "0.3.2"
 tracing = "0.1.39"
 tracing-error = "0.2.0"
 tracing-futures = "0.2.5"
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 4753a4290..556f750ec 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -4,25 +4,25 @@ use std::sync::Arc;
 use clap::Parser;
 use futures::{stream, StreamExt};
 use models::PackageId;
-use openssl::x509::X509;
 use patch_db::json_ptr::ROOT;
 use serde::{Deserialize, Serialize};
-use torut::onion::OnionAddressV3;
+use tokio::sync::Mutex;
 use tracing::instrument;
 use ts_rs::TS;
 
 use super::target::BackupTargetId;
 use crate::backup::os::OsBackup;
+use crate::context::setup::SetupResult;
 use crate::context::{RpcContext, SetupContext};
 use crate::db::model::Database;
 use crate::disk::mount::backup::BackupMountGuard;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
-use crate::hostname::Hostname;
-use crate::init::init;
+use crate::init::{init, InitResult};
 use crate::prelude::*;
 use crate::s9pk::S9pk;
 use crate::service::service_map::DownloadInstallFuture;
+use crate::setup::SetupExecuteProgress;
 use crate::util::serde::IoFormat;
 
 #[derive(Deserialize, Serialize, Parser, TS)]
@@ -67,14 +67,21 @@ pub async fn restore_packages_rpc(
     Ok(())
 }
 
-#[instrument(skip(ctx))]
+#[instrument(skip_all)]
 pub async fn recover_full_embassy(
-    ctx: SetupContext,
+    ctx: &SetupContext,
     disk_guid: Arc<String>,
     start_os_password: String,
     recovery_source: TmpMountGuard,
     recovery_password: Option<String>,
-) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
+    SetupExecuteProgress {
+        init_phases,
+        restore_phase,
+        rpc_ctx_phases,
+    }: SetupExecuteProgress,
+) -> Result<(SetupResult, RpcContext), Error> {
+    let mut restore_phase = restore_phase.or_not_found("restore progress")?;
+
     let backup_guard = BackupMountGuard::mount(
         recovery_source,
         recovery_password.as_deref().unwrap_or_default(),
@@ -99,10 +106,17 @@ pub async fn recover_full_embassy(
     db.put(&ROOT, &Database::init(&os_backup.account)?).await?;
     drop(db);
 
-    init(&ctx.config).await?;
+    let InitResult { net_ctrl } = init(&ctx.config, init_phases).await?;
 
-    let rpc_ctx = RpcContext::init(&ctx.config, disk_guid.clone()).await?;
+    let rpc_ctx = RpcContext::init(
+        &ctx.config,
+        disk_guid.clone(),
+        Some(net_ctrl),
+        rpc_ctx_phases,
+    )
+    .await?;
 
+    restore_phase.start();
     let ids: Vec<_> = backup_guard
         .metadata
         .package_backups
@@ -110,26 +124,26 @@ pub async fn recover_full_embassy(
         .cloned()
         .collect();
     let tasks = restore_packages(&rpc_ctx, backup_guard, ids).await?;
+    restore_phase.set_total(tasks.len() as u64);
+    let restore_phase = Arc::new(Mutex::new(restore_phase));
     stream::iter(tasks)
-        .for_each_concurrent(5, |(id, res)| async move {
-            match async { res.await?.await }.await {
-                Ok(_) => (),
-                Err(err) => {
-                    tracing::error!("Error restoring package {}: {}", id, err);
-                    tracing::debug!("{:?}", err);
+        .for_each_concurrent(5, |(id, res)| {
+            let restore_phase = restore_phase.clone();
+            async move {
+                match async { res.await?.await }.await {
+                    Ok(_) => (),
+                    Err(err) => {
+                        tracing::error!("Error restoring package {}: {}", id, err);
+                        tracing::debug!("{:?}", err);
+                    }
                 }
+                *restore_phase.lock().await += 1;
             }
         })
         .await;
+    restore_phase.lock().await.complete();
 
-    rpc_ctx.shutdown().await?;
-
-    Ok((
-        disk_guid,
-        os_backup.account.hostname,
-        os_backup.account.tor_key.public().get_onion_address(),
-        os_backup.account.root_ca_cert,
-    ))
+    Ok(((&os_backup.account).try_into()?, rpc_ctx))
 }
 
 #[instrument(skip(ctx, backup_guard))]
diff --git a/core/startos/src/bins/registry.rs b/core/startos/src/bins/registry.rs
index 3028d1766..132e0984a 100644
--- a/core/startos/src/bins/registry.rs
+++ b/core/startos/src/bins/registry.rs
@@ -14,7 +14,8 @@ use crate::util::logger::EmbassyLogger;
 async fn inner_main(config: &RegistryConfig) -> Result<(), Error> {
     let server = async {
         let ctx = RegistryContext::init(config).await?;
-        let server = WebServer::registry(ctx.listen, ctx.clone());
+        let mut server = WebServer::new(ctx.listen);
+        server.serve_registry(ctx.clone());
 
         let mut shutdown_recv = ctx.shutdown.subscribe();
 
diff --git a/core/startos/src/bins/start_init.rs b/core/startos/src/bins/start_init.rs
index 8e60884f1..f4aa411b5 100644
--- a/core/startos/src/bins/start_init.rs
+++ b/core/startos/src/bins/start_init.rs
@@ -1,47 +1,56 @@
-use std::net::{Ipv6Addr, SocketAddr};
-use std::path::Path;
 use std::sync::Arc;
-use std::time::Duration;
 
-use helpers::NonDetachingJoinHandle;
 use tokio::process::Command;
 use tracing::instrument;
 
 use crate::context::config::ServerConfig;
-use crate::context::{DiagnosticContext, InstallContext, SetupContext};
-use crate::disk::fsck::{RepairStrategy, RequiresReboot};
+use crate::context::rpc::InitRpcContextPhases;
+use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
+use crate::disk::fsck::RepairStrategy;
 use crate::disk::main::DEFAULT_PASSWORD;
 use crate::disk::REPAIR_DISK_PATH;
-use crate::firmware::update_firmware;
-use crate::init::STANDBY_MODE_PATH;
+use crate::firmware::{check_for_firmware_update, update_firmware};
+use crate::init::{InitPhases, InitResult, STANDBY_MODE_PATH};
 use crate::net::web_server::WebServer;
+use crate::prelude::*;
+use crate::progress::FullProgressTracker;
 use crate::shutdown::Shutdown;
-use crate::sound::{BEP, CHIME};
 use crate::util::Invoke;
-use crate::{Error, ErrorKind, ResultExt, PLATFORM};
+use crate::PLATFORM;
 
 #[instrument(skip_all)]
-async fn setup_or_init(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
-    let song = NonDetachingJoinHandle::from(tokio::spawn(async {
-        loop {
-            BEP.play().await.unwrap();
-            BEP.play().await.unwrap();
-            tokio::time::sleep(Duration::from_secs(30)).await;
-        }
-    }));
+async fn setup_or_init(
+    server: &mut WebServer,
+    config: &ServerConfig,
+) -> Result<Result<(RpcContext, FullProgressTracker), Shutdown>, Error> {
+    if let Some(firmware) = check_for_firmware_update()
+        .await
+        .map_err(|e| {
+            tracing::warn!("Error checking for firmware update: {e}");
+            tracing::debug!("{e:?}");
+        })
+        .ok()
+        .and_then(|a| a)
+    {
+        let init_ctx = InitContext::init(config).await?;
+        let handle = &init_ctx.progress;
+        let mut update_phase = handle.add_phase("Updating Firmware".into(), Some(10));
+        let mut reboot_phase = handle.add_phase("Rebooting".into(), Some(1));
 
-    match update_firmware().await {
-        Ok(RequiresReboot(true)) => {
-            return Ok(Some(Shutdown {
-                export_args: None,
-                restart: true,
-            }))
-        }
-        Err(e) => {
+        server.serve_init(init_ctx);
+
+        update_phase.start();
+        if let Err(e) = update_firmware(firmware).await {
             tracing::warn!("Error performing firmware update: {e}");
             tracing::debug!("{e:?}");
+        } else {
+            update_phase.complete();
+            reboot_phase.start();
+            return Ok(Err(Shutdown {
+                export_args: None,
+                restart: true,
+            }));
         }
-        _ => (),
     }
 
     Command::new("ln")
@@ -84,14 +93,7 @@ async fn setup_or_init(config: &ServerConfig) -> Result<Option<Shutdown>, Error>
 
         let ctx = InstallContext::init().await?;
 
-        let server = WebServer::install(
-            SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
-            ctx.clone(),
-        )?;
-
-        drop(song);
-        tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this
-        CHIME.play().await?;
+        server.serve_install(ctx.clone());
 
         ctx.shutdown
             .subscribe()
@@ -99,33 +101,23 @@ async fn setup_or_init(config: &ServerConfig) -> Result<Option<Shutdown>, Error>
             .await
             .expect("context dropped");
 
-        server.shutdown().await;
+        return Ok(Err(Shutdown {
+            export_args: None,
+            restart: true,
+        }));
+    }
 
-        Command::new("reboot")
-            .invoke(crate::ErrorKind::Unknown)
-            .await?;
-    } else if tokio::fs::metadata("/media/startos/config/disk.guid")
+    if tokio::fs::metadata("/media/startos/config/disk.guid")
         .await
         .is_err()
     {
         let ctx = SetupContext::init(config)?;
 
-        let server = WebServer::setup(
-            SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
-            ctx.clone(),
-        )?;
-
-        drop(song);
-        tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this
-        CHIME.play().await?;
+        server.serve_setup(ctx.clone());
 
         let mut shutdown = ctx.shutdown.subscribe();
         shutdown.recv().await.expect("context dropped");
 
-        server.shutdown().await;
-
-        drop(shutdown);
-
         tokio::task::yield_now().await;
         if let Err(e) = Command::new("killall")
             .arg("firefox-esr")
@@ -135,19 +127,40 @@ async fn setup_or_init(config: &ServerConfig) -> Result<Option<Shutdown>, Error>
             tracing::error!("Failed to kill kiosk: {}", e);
             tracing::debug!("{:?}", e);
         }
+
+        Ok(Ok(match ctx.result.get() {
+            Some(Ok((_, rpc_ctx))) => (rpc_ctx.clone(), ctx.progress.clone()),
+            Some(Err(e)) => return Err(e.clone_output()),
+            None => {
+                return Err(Error::new(
+                    eyre!("Setup mode exited before setup completed"),
+                    ErrorKind::Unknown,
+                ))
+            }
+        }))
     } else {
+        let init_ctx = InitContext::init(config).await?;
+        let handle = init_ctx.progress.clone();
+
+        let mut disk_phase = handle.add_phase("Opening data drive".into(), Some(10));
+        let init_phases = InitPhases::new(&handle);
+        let rpc_ctx_phases = InitRpcContextPhases::new(&handle);
+
+        server.serve_init(init_ctx);
+
+        disk_phase.start();
         let guid_string = tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
             .await?;
-        let guid = guid_string.trim();
+        let disk_guid = Arc::new(String::from(guid_string.trim()));
         let requires_reboot = crate::disk::main::import(
-            guid,
+            &**disk_guid,
             config.datadir(),
             if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
                 RepairStrategy::Aggressive
             } else {
                 RepairStrategy::Preen
             },
-            if guid.ends_with("_UNENC") {
+            if disk_guid.ends_with("_UNENC") {
                 None
             } else {
                 Some(DEFAULT_PASSWORD)
@@ -159,40 +172,31 @@ async fn setup_or_init(config: &ServerConfig) -> Result<Option<Shutdown>, Error>
                 .await
                 .with_ctx(|_| (crate::ErrorKind::Filesystem, REPAIR_DISK_PATH))?;
         }
+        disk_phase.complete();
+        tracing::info!("Loaded Disk");
+
         if requires_reboot.0 {
-            crate::disk::main::export(guid, config.datadir()).await?;
-            Command::new("reboot")
-                .invoke(crate::ErrorKind::Unknown)
-                .await?;
+            let mut reboot_phase = handle.add_phase("Rebooting".into(), Some(1));
+            reboot_phase.start();
+            return Ok(Err(Shutdown {
+                export_args: Some((disk_guid, config.datadir().to_owned())),
+                restart: true,
+            }));
         }
-        tracing::info!("Loaded Disk");
-        crate::init::init(config).await?;
-        drop(song);
-    }
 
-    Ok(None)
-}
+        let InitResult { net_ctrl } = crate::init::init(config, init_phases).await?;
 
-async fn run_script_if_exists<P: AsRef<Path>>(path: P) {
-    let script = path.as_ref();
-    if script.exists() {
-        match Command::new("/bin/bash").arg(script).spawn() {
-            Ok(mut c) => {
-                if let Err(e) = c.wait().await {
-                    tracing::error!("Error Running {}: {}", script.display(), e);
-                    tracing::debug!("{:?}", e);
-                }
-            }
-            Err(e) => {
-                tracing::error!("Error Running {}: {}", script.display(), e);
-                tracing::debug!("{:?}", e);
-            }
-        }
+        let rpc_ctx = RpcContext::init(config, disk_guid, Some(net_ctrl), rpc_ctx_phases).await?;
+
+        Ok(Ok((rpc_ctx, handle)))
     }
 }
 
 #[instrument(skip_all)]
-async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
+pub async fn main(
+    server: &mut WebServer,
+    config: &ServerConfig,
+) -> Result<Result<(RpcContext, FullProgressTracker), Shutdown>, Error> {
     if &*PLATFORM == "raspberrypi" && tokio::fs::metadata(STANDBY_MODE_PATH).await.is_ok() {
         tokio::fs::remove_file(STANDBY_MODE_PATH).await?;
         Command::new("sync").invoke(ErrorKind::Filesystem).await?;
@@ -200,16 +204,11 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
         futures::future::pending::<()>().await;
     }
 
-    crate::sound::BEP.play().await?;
-
-    run_script_if_exists("/media/startos/config/preinit.sh").await;
-
-    let res = match setup_or_init(config).await {
+    let res = match setup_or_init(server, config).await {
         Err(e) => {
             async move {
-                tracing::error!("{}", e.source);
-                tracing::debug!("{}", e.source);
-                crate::sound::BEETHOVEN.play().await?;
+                tracing::error!("{e}");
+                tracing::debug!("{e:?}");
 
                 let ctx = DiagnosticContext::init(
                     config,
@@ -229,44 +228,16 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
                     e,
                 )?;
 
-                let server = WebServer::diagnostic(
-                    SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
-                    ctx.clone(),
-                )?;
+                server.serve_diagnostic(ctx.clone());
 
                 let shutdown = ctx.shutdown.subscribe().recv().await.unwrap();
 
-                server.shutdown().await;
-
-                Ok(shutdown)
+                Ok(Err(shutdown))
             }
             .await
         }
         Ok(s) => Ok(s),
     };
 
-    run_script_if_exists("/media/startos/config/postinit.sh").await;
-
     res
 }
-
-pub fn main(config: &ServerConfig) {
-    let res = {
-        let rt = tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .build()
-            .expect("failed to initialize runtime");
-        rt.block_on(inner_main(config))
-    };
-
-    match res {
-        Ok(Some(shutdown)) => shutdown.execute(),
-        Ok(None) => (),
-        Err(e) => {
-            eprintln!("{}", e.source);
-            tracing::debug!("{:?}", e.source);
-            drop(e.source);
-            std::process::exit(e.kind as i32)
-        }
-    }
-}
diff --git a/core/startos/src/bins/startd.rs b/core/startos/src/bins/startd.rs
index f0bc428be..7576c41e9 100644
--- a/core/startos/src/bins/startd.rs
+++ b/core/startos/src/bins/startd.rs
@@ -1,6 +1,5 @@
 use std::ffi::OsString;
 use std::net::{Ipv6Addr, SocketAddr};
-use std::path::Path;
 use std::sync::Arc;
 
 use clap::Parser;
@@ -10,7 +9,8 @@ use tokio::signal::unix::signal;
 use tracing::instrument;
 
 use crate::context::config::ServerConfig;
-use crate::context::{DiagnosticContext, RpcContext};
+use crate::context::rpc::InitRpcContextPhases;
+use crate::context::{DiagnosticContext, InitContext, RpcContext};
 use crate::net::web_server::WebServer;
 use crate::shutdown::Shutdown;
 use crate::system::launch_metrics_task;
@@ -18,9 +18,31 @@ use crate::util::logger::EmbassyLogger;
 use crate::{Error, ErrorKind, ResultExt};
 
 #[instrument(skip_all)]
-async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
-    let (rpc_ctx, server, shutdown) = async {
-        let rpc_ctx = RpcContext::init(
+async fn inner_main(
+    server: &mut WebServer,
+    config: &ServerConfig,
+) -> Result<Option<Shutdown>, Error> {
+    let rpc_ctx = if !tokio::fs::metadata("/run/startos/initialized")
+        .await
+        .is_ok()
+    {
+        let (ctx, handle) = match super::start_init::main(server, &config).await? {
+            Err(s) => return Ok(Some(s)),
+            Ok(ctx) => ctx,
+        };
+        tokio::fs::write("/run/startos/initialized", "").await?;
+
+        server.serve_main(ctx.clone());
+        handle.complete();
+
+        ctx
+    } else {
+        let init_ctx = InitContext::init(config).await?;
+        let handle = init_ctx.progress.clone();
+        let rpc_ctx_phases = InitRpcContextPhases::new(&handle);
+        server.serve_init(init_ctx);
+
+        let ctx = RpcContext::init(
             config,
             Arc::new(
                 tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
@@ -28,13 +50,19 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
                     .trim()
                     .to_owned(),
             ),
+            None,
+            rpc_ctx_phases,
         )
         .await?;
+
+        server.serve_main(ctx.clone());
+        handle.complete();
+
+        ctx
+    };
+
+    let (rpc_ctx, shutdown) = async {
         crate::hostname::sync_hostname(&rpc_ctx.account.read().await.hostname).await?;
-        let server = WebServer::main(
-            SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
-            rpc_ctx.clone(),
-        )?;
 
         let mut shutdown_recv = rpc_ctx.shutdown.subscribe();
 
@@ -74,8 +102,6 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
             .await
         });
 
-        crate::sound::CHIME.play().await?;
-
         metrics_task
             .map_err(|e| {
                 Error::new(
@@ -93,10 +119,9 @@ async fn inner_main(config: &ServerConfig) -> Result<Option<Shutdown>, Error> {
 
         sig_handler.abort();
 
-        Ok::<_, Error>((rpc_ctx, server, shutdown))
+        Ok::<_, Error>((rpc_ctx, shutdown))
     }
     .await?;
-    server.shutdown().await;
     rpc_ctx.shutdown().await?;
 
     tracing::info!("RPC Context is dropped");
@@ -109,24 +134,22 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
 
     let config = ServerConfig::parse_from(args).load().unwrap();
 
-    if !Path::new("/run/embassy/initialized").exists() {
-        super::start_init::main(&config);
-        std::fs::write("/run/embassy/initialized", "").unwrap();
-    }
-
     let res = {
         let rt = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
             .build()
             .expect("failed to initialize runtime");
         rt.block_on(async {
-            match inner_main(&config).await {
-                Ok(a) => Ok(a),
+            let mut server = WebServer::new(SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80));
+            match inner_main(&mut server, &config).await {
+                Ok(a) => {
+                    server.shutdown().await;
+                    Ok(a)
+                }
                 Err(e) => {
                     async {
-                        tracing::error!("{}", e.source);
-                        tracing::debug!("{:?}", e.source);
-                        crate::sound::BEETHOVEN.play().await?;
+                        tracing::error!("{e}");
+                        tracing::debug!("{e:?}");
                         let ctx = DiagnosticContext::init(
                             &config,
                             if tokio::fs::metadata("/media/startos/config/disk.guid")
@@ -145,10 +168,7 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
                             e,
                         )?;
 
-                        let server = WebServer::diagnostic(
-                            SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80),
-                            ctx.clone(),
-                        )?;
+                        server.serve_diagnostic(ctx.clone());
 
                         let mut shutdown = ctx.shutdown.subscribe();
 
@@ -157,7 +177,7 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
 
                         server.shutdown().await;
 
-                        Ok::<_, Error>(shutdown)
+                        Ok::<_, Error>(Some(shutdown))
                     }
                     .await
                 }
diff --git a/core/startos/src/context/cli.rs b/core/startos/src/context/cli.rs
index 014457b67..22084bbe1 100644
--- a/core/startos/src/context/cli.rs
+++ b/core/startos/src/context/cli.rs
@@ -18,7 +18,7 @@ use tracing::instrument;
 
 use super::setup::CURRENT_SECRET;
 use crate::context::config::{local_config_path, ClientConfig};
-use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext};
+use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
@@ -271,6 +271,11 @@ impl CallRemote<DiagnosticContext> for CliContext {
         call_remote_http(&self.client, self.rpc_url.clone(), method, params).await
     }
 }
+impl CallRemote<InitContext> for CliContext {
+    async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
+        call_remote_http(&self.client, self.rpc_url.clone(), method, params).await
+    }
+}
 impl CallRemote<SetupContext> for CliContext {
     async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
         call_remote_http(&self.client, self.rpc_url.clone(), method, params).await
diff --git a/core/startos/src/context/diagnostic.rs b/core/startos/src/context/diagnostic.rs
index 10379dcf3..0bf67e172 100644
--- a/core/startos/src/context/diagnostic.rs
+++ b/core/startos/src/context/diagnostic.rs
@@ -14,7 +14,7 @@ use crate::Error;
 
 pub struct DiagnosticContextSeed {
     pub datadir: PathBuf,
-    pub shutdown: Sender<Option<Shutdown>>,
+    pub shutdown: Sender<Shutdown>,
     pub error: Arc<RpcError>,
     pub disk_guid: Option<Arc<String>>,
     pub rpc_continuations: RpcContinuations,
diff --git a/core/startos/src/context/init.rs b/core/startos/src/context/init.rs
new file mode 100644
index 000000000..f5f4a5430
--- /dev/null
+++ b/core/startos/src/context/init.rs
@@ -0,0 +1,47 @@
+use std::ops::Deref;
+use std::sync::Arc;
+
+use rpc_toolkit::Context;
+use tokio::sync::broadcast::Sender;
+use tracing::instrument;
+
+use crate::context::config::ServerConfig;
+use crate::progress::FullProgressTracker;
+use crate::rpc_continuations::RpcContinuations;
+use crate::Error;
+
+pub struct InitContextSeed {
+    pub config: ServerConfig,
+    pub progress: FullProgressTracker,
+    pub shutdown: Sender<()>,
+    pub rpc_continuations: RpcContinuations,
+}
+
+#[derive(Clone)]
+pub struct InitContext(Arc<InitContextSeed>);
+impl InitContext {
+    #[instrument(skip_all)]
+    pub async fn init(cfg: &ServerConfig) -> Result<Self, Error> {
+        let (shutdown, _) = tokio::sync::broadcast::channel(1);
+        Ok(Self(Arc::new(InitContextSeed {
+            config: cfg.clone(),
+            progress: FullProgressTracker::new(),
+            shutdown,
+            rpc_continuations: RpcContinuations::new(),
+        })))
+    }
+}
+
+impl AsRef<RpcContinuations> for InitContext {
+    fn as_ref(&self) -> &RpcContinuations {
+        &self.rpc_continuations
+    }
+}
+
+impl Context for InitContext {}
+impl Deref for InitContext {
+    type Target = InitContextSeed;
+    fn deref(&self) -> &Self::Target {
+        &*self.0
+    }
+}
diff --git a/core/startos/src/context/install.rs b/core/startos/src/context/install.rs
index d4717d2b0..c0c564b34 100644
--- a/core/startos/src/context/install.rs
+++ b/core/startos/src/context/install.rs
@@ -6,11 +6,13 @@ use tokio::sync::broadcast::Sender;
 use tracing::instrument;
 
 use crate::net::utils::find_eth_iface;
+use crate::rpc_continuations::RpcContinuations;
 use crate::Error;
 
 pub struct InstallContextSeed {
     pub ethernet_interface: String,
     pub shutdown: Sender<()>,
+    pub rpc_continuations: RpcContinuations,
 }
 
 #[derive(Clone)]
@@ -22,10 +24,17 @@ impl InstallContext {
         Ok(Self(Arc::new(InstallContextSeed {
             ethernet_interface: find_eth_iface().await?,
             shutdown,
+            rpc_continuations: RpcContinuations::new(),
         })))
     }
 }
 
+impl AsRef<RpcContinuations> for InstallContext {
+    fn as_ref(&self) -> &RpcContinuations {
+        &self.rpc_continuations
+    }
+}
+
 impl Context for InstallContext {}
 impl Deref for InstallContext {
     type Target = InstallContextSeed;
diff --git a/core/startos/src/context/mod.rs b/core/startos/src/context/mod.rs
index 77f54f26c..efe261b0c 100644
--- a/core/startos/src/context/mod.rs
+++ b/core/startos/src/context/mod.rs
@@ -1,12 +1,14 @@
 pub mod cli;
 pub mod config;
 pub mod diagnostic;
+pub mod init;
 pub mod install;
 pub mod rpc;
 pub mod setup;
 
 pub use cli::CliContext;
 pub use diagnostic::DiagnosticContext;
+pub use init::InitContext;
 pub use install::InstallContext;
 pub use rpc::RpcContext;
 pub use setup::SetupContext;
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index a3e77a62c..3dd3354aa 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -6,11 +6,12 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
+use imbl_value::InternedString;
 use josekit::jwk::Jwk;
 use reqwest::{Client, Proxy};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{CallRemote, Context, Empty};
-use tokio::sync::{broadcast, oneshot, Mutex, RwLock};
+use tokio::sync::{broadcast, Mutex, RwLock};
 use tokio::time::Instant;
 use tracing::instrument;
 
@@ -22,12 +23,12 @@ use crate::dependencies::compute_dependency_config_errs;
 use crate::disk::OsPartitionInfo;
 use crate::init::check_time_is_synchronized;
 use crate::lxc::{ContainerId, LxcContainer, LxcManager};
-use crate::middleware::auth::HashSessionToken;
-use crate::net::net_controller::NetController;
+use crate::net::net_controller::{NetController, PreInitNetController};
 use crate::net::utils::{find_eth_iface, find_wifi_iface};
 use crate::net::wifi::WpaCli;
 use crate::prelude::*;
-use crate::rpc_continuations::RpcContinuations;
+use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle};
+use crate::rpc_continuations::{OpenAuthedContinuations, RpcContinuations};
 use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
 use crate::system::get_mem_info;
@@ -49,7 +50,7 @@ pub struct RpcContextSeed {
     pub shutdown: broadcast::Sender<Option<Shutdown>>,
     pub tor_socks: SocketAddr,
     pub lxc_manager: Arc<LxcManager>,
-    pub open_authed_websockets: Mutex<BTreeMap<HashSessionToken, Vec<oneshot::Sender<()>>>>,
+    pub open_authed_continuations: OpenAuthedContinuations<InternedString>,
     pub rpc_continuations: RpcContinuations,
     pub wifi_manager: Option<Arc<RwLock<WpaCli>>>,
     pub current_secret: Arc<Jwk>,
@@ -68,45 +69,103 @@ pub struct Hardware {
     pub ram: u64,
 }
 
+pub struct InitRpcContextPhases {
+    load_db: PhaseProgressTrackerHandle,
+    init_net_ctrl: PhaseProgressTrackerHandle,
+    read_device_info: PhaseProgressTrackerHandle,
+    cleanup_init: CleanupInitPhases,
+}
+impl InitRpcContextPhases {
+    pub fn new(handle: &FullProgressTracker) -> Self {
+        Self {
+            load_db: handle.add_phase("Loading database".into(), Some(5)),
+            init_net_ctrl: handle.add_phase("Initializing network".into(), Some(1)),
+            read_device_info: handle.add_phase("Reading device information".into(), Some(1)),
+            cleanup_init: CleanupInitPhases::new(handle),
+        }
+    }
+}
+
+pub struct CleanupInitPhases {
+    init_services: PhaseProgressTrackerHandle,
+    check_dependencies: PhaseProgressTrackerHandle,
+}
+impl CleanupInitPhases {
+    pub fn new(handle: &FullProgressTracker) -> Self {
+        Self {
+            init_services: handle.add_phase("Initializing services".into(), Some(10)),
+            check_dependencies: handle.add_phase("Checking dependencies".into(), Some(1)),
+        }
+    }
+}
+
 #[derive(Clone)]
 pub struct RpcContext(Arc<RpcContextSeed>);
 impl RpcContext {
     #[instrument(skip_all)]
-    pub async fn init(config: &ServerConfig, disk_guid: Arc<String>) -> Result<Self, Error> {
-        tracing::info!("Loaded Config");
+    pub async fn init(
+        config: &ServerConfig,
+        disk_guid: Arc<String>,
+        net_ctrl: Option<PreInitNetController>,
+        InitRpcContextPhases {
+            mut load_db,
+            mut init_net_ctrl,
+            mut read_device_info,
+            cleanup_init,
+        }: InitRpcContextPhases,
+    ) -> Result<Self, Error> {
         let tor_proxy = config.tor_socks.unwrap_or(SocketAddr::V4(SocketAddrV4::new(
             Ipv4Addr::new(127, 0, 0, 1),
             9050,
         )));
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
 
-        let db = TypedPatchDb::<Database>::load(config.db().await?).await?;
+        load_db.start();
+        let db = if let Some(net_ctrl) = &net_ctrl {
+            net_ctrl.db.clone()
+        } else {
+            TypedPatchDb::<Database>::load(config.db().await?).await?
+        };
         let peek = db.peek().await;
         let account = AccountInfo::load(&peek)?;
+        load_db.complete();
         tracing::info!("Opened PatchDB");
+
+        init_net_ctrl.start();
         let net_controller = Arc::new(
             NetController::init(
-                db.clone(),
-                config
-                    .tor_control
-                    .unwrap_or(SocketAddr::from(([127, 0, 0, 1], 9051))),
-                tor_proxy,
+                if let Some(net_ctrl) = net_ctrl {
+                    net_ctrl
+                } else {
+                    PreInitNetController::init(
+                        db.clone(),
+                        config
+                            .tor_control
+                            .unwrap_or(SocketAddr::from(([127, 0, 0, 1], 9051))),
+                        tor_proxy,
+                        &account.hostname,
+                        account.tor_key.clone(),
+                    )
+                    .await?
+                },
                 config
                     .dns_bind
                     .as_deref()
                     .unwrap_or(&[SocketAddr::from(([127, 0, 0, 1], 53))]),
-                &account.hostname,
-                account.tor_key.clone(),
             )
             .await?,
         );
+        init_net_ctrl.complete();
         tracing::info!("Initialized Net Controller");
+
         let services = ServiceMap::default();
         let metrics_cache = RwLock::<Option<crate::system::Metrics>>::new(None);
-        tracing::info!("Initialized Notification Manager");
         let tor_proxy_url = format!("socks5h://{tor_proxy}");
+
+        read_device_info.start();
         let devices = lshw().await?;
         let ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024;
+        read_device_info.complete();
 
         if !db
             .peek()
@@ -163,7 +222,7 @@ impl RpcContext {
             shutdown,
             tor_socks: tor_proxy,
             lxc_manager: Arc::new(LxcManager::new()),
-            open_authed_websockets: Mutex::new(BTreeMap::new()),
+            open_authed_continuations: OpenAuthedContinuations::new(),
             rpc_continuations: RpcContinuations::new(),
             wifi_manager: wifi_interface
                 .clone()
@@ -196,7 +255,7 @@ impl RpcContext {
         });
 
         let res = Self(seed.clone());
-        res.cleanup_and_initialize().await?;
+        res.cleanup_and_initialize(cleanup_init).await?;
         tracing::info!("Cleaned up transient states");
         Ok(res)
     }
@@ -210,11 +269,18 @@ impl RpcContext {
         Ok(())
     }
 
-    #[instrument(skip(self))]
-    pub async fn cleanup_and_initialize(&self) -> Result<(), Error> {
-        self.services.init(&self).await?;
+    #[instrument(skip_all)]
+    pub async fn cleanup_and_initialize(
+        &self,
+        CleanupInitPhases {
+            init_services,
+            mut check_dependencies,
+        }: CleanupInitPhases,
+    ) -> Result<(), Error> {
+        self.services.init(&self, init_services).await?;
         tracing::info!("Initialized Package Managers");
 
+        check_dependencies.start();
         let mut updated_current_dependents = BTreeMap::new();
         let peek = self.db.peek().await;
         for (package_id, package) in peek.as_public().as_package_data().as_entries()?.into_iter() {
@@ -238,6 +304,7 @@ impl RpcContext {
                 Ok(())
             })
             .await?;
+        check_dependencies.complete();
 
         Ok(())
     }
@@ -274,6 +341,11 @@ impl AsRef<RpcContinuations> for RpcContext {
         &self.rpc_continuations
     }
 }
+impl AsRef<OpenAuthedContinuations<InternedString>> for RpcContext {
+    fn as_ref(&self) -> &OpenAuthedContinuations<InternedString> {
+        &self.open_authed_continuations
+    }
+}
 impl Context for RpcContext {}
 impl Deref for RpcContext {
     type Target = RpcContextSeed;
diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index 013dc060b..6041f49b9 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -1,23 +1,31 @@
 use std::ops::Deref;
 use std::path::PathBuf;
 use std::sync::Arc;
+use std::time::Duration;
 
+use futures::{Future, StreamExt};
+use helpers::NonDetachingJoinHandle;
 use josekit::jwk::Jwk;
 use patch_db::PatchDb;
-use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::Context;
 use serde::{Deserialize, Serialize};
 use sqlx::postgres::PgConnectOptions;
 use sqlx::PgPool;
 use tokio::sync::broadcast::Sender;
-use tokio::sync::RwLock;
+use tokio::sync::OnceCell;
 use tracing::instrument;
+use ts_rs::TS;
 
+use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
+use crate::context::RpcContext;
 use crate::disk::OsPartitionInfo;
 use crate::init::init_postgres;
 use crate::prelude::*;
-use crate::setup::SetupStatus;
+use crate::progress::FullProgressTracker;
+use crate::rpc_continuations::{Guid, RpcContinuation, RpcContinuations};
+use crate::setup::SetupProgress;
+use crate::util::net::WebSocketExt;
 
 lazy_static::lazy_static! {
     pub static ref CURRENT_SECRET: Jwk = Jwk::generate_ec_key(josekit::jwk::alg::ec::EcCurve::P256).unwrap_or_else(|e| {
@@ -27,30 +35,35 @@ lazy_static::lazy_static! {
     });
 }
 
-#[derive(Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct SetupResult {
     pub tor_address: String,
     pub lan_address: String,
     pub root_ca: String,
 }
+impl TryFrom<&AccountInfo> for SetupResult {
+    type Error = Error;
+    fn try_from(value: &AccountInfo) -> Result<Self, Self::Error> {
+        Ok(Self {
+            tor_address: format!("https://{}", value.tor_key.public().get_onion_address()),
+            lan_address: value.hostname.lan_address(),
+            root_ca: String::from_utf8(value.root_ca_cert.to_pem()?)?,
+        })
+    }
+}
 
 pub struct SetupContextSeed {
     pub config: ServerConfig,
     pub os_partitions: OsPartitionInfo,
     pub disable_encryption: bool,
+    pub progress: FullProgressTracker,
+    pub task: OnceCell<NonDetachingJoinHandle<()>>,
+    pub result: OnceCell<Result<(SetupResult, RpcContext), Error>>,
     pub shutdown: Sender<()>,
     pub datadir: PathBuf,
-    pub selected_v2_drive: RwLock<Option<PathBuf>>,
-    pub cached_product_key: RwLock<Option<Arc<String>>>,
-    pub setup_status: RwLock<Option<Result<SetupStatus, RpcError>>>,
-    pub setup_result: RwLock<Option<(Arc<String>, SetupResult)>>,
-}
-
-impl AsRef<Jwk> for SetupContextSeed {
-    fn as_ref(&self) -> &Jwk {
-        &*CURRENT_SECRET
-    }
+    pub rpc_continuations: RpcContinuations,
 }
 
 #[derive(Clone)]
@@ -69,12 +82,12 @@ impl SetupContext {
                 )
             })?,
             disable_encryption: config.disable_encryption.unwrap_or(false),
+            progress: FullProgressTracker::new(),
+            task: OnceCell::new(),
+            result: OnceCell::new(),
             shutdown,
             datadir,
-            selected_v2_drive: RwLock::new(None),
-            cached_product_key: RwLock::new(None),
-            setup_status: RwLock::new(None),
-            setup_result: RwLock::new(None),
+            rpc_continuations: RpcContinuations::new(),
         })))
     }
     #[instrument(skip_all)]
@@ -97,6 +110,104 @@ impl SetupContext {
             .with_kind(crate::ErrorKind::Database)?;
         Ok(secret_store)
     }
+
+    pub fn run_setup<F, Fut>(&self, f: F) -> Result<(), Error>
+    where
+        F: FnOnce() -> Fut + Send + 'static,
+        Fut: Future<Output = Result<(SetupResult, RpcContext), Error>> + Send,
+    {
+        let local_ctx = self.clone();
+        self.task
+            .set(
+                tokio::spawn(async move {
+                    local_ctx
+                        .result
+                        .get_or_init(|| async {
+                            match f().await {
+                                Ok(res) => {
+                                    tracing::info!("Setup complete!");
+                                    Ok(res)
+                                }
+                                Err(e) => {
+                                    tracing::error!("Setup failed: {e}");
+                                    tracing::debug!("{e:?}");
+                                    Err(e)
+                                }
+                            }
+                        })
+                        .await;
+                    local_ctx.progress.complete();
+                })
+                .into(),
+            )
+            .map_err(|_| {
+                if self.result.initialized() {
+                    Error::new(eyre!("Setup already complete"), ErrorKind::InvalidRequest)
+                } else {
+                    Error::new(
+                        eyre!("Setup already in progress"),
+                        ErrorKind::InvalidRequest,
+                    )
+                }
+            })?;
+        Ok(())
+    }
+
+    pub async fn progress(&self) -> SetupProgress {
+        use axum::extract::ws;
+
+        let guid = Guid::new();
+        let progress_tracker = self.progress.clone();
+        let progress = progress_tracker.snapshot();
+        self.rpc_continuations
+            .add(
+                guid.clone(),
+                RpcContinuation::ws(
+                    |mut ws| async move {
+                        if let Err(e) = async {
+                            let mut stream =
+                                progress_tracker.stream(Some(Duration::from_millis(100)));
+                            while let Some(progress) = stream.next().await {
+                                ws.send(ws::Message::Text(
+                                    serde_json::to_string(&progress)
+                                        .with_kind(ErrorKind::Serialization)?,
+                                ))
+                                .await
+                                .with_kind(ErrorKind::Network)?;
+                                if progress.overall.is_complete() {
+                                    break;
+                                }
+                            }
+
+                            ws.normal_close("complete").await?;
+
+                            Ok::<_, Error>(())
+                        }
+                        .await
+                        {
+                            tracing::error!("Error in setup progress websocket: {e}");
+                            tracing::debug!("{e:?}");
+                        }
+                    },
+                    Duration::from_secs(30),
+                ),
+            )
+            .await;
+
+        SetupProgress { progress, guid }
+    }
+}
+
+impl AsRef<Jwk> for SetupContext {
+    fn as_ref(&self) -> &Jwk {
+        &*CURRENT_SECRET
+    }
+}
+
+impl AsRef<RpcContinuations> for SetupContext {
+    fn as_ref(&self) -> &RpcContinuations {
+        &self.rpc_continuations
+    }
 }
 
 impl Context for SetupContext {}
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 0bb8a23db..e59161e9b 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -3,175 +3,40 @@ pub mod prelude;
 
 use std::path::PathBuf;
 use std::sync::Arc;
+use std::time::Duration;
 
-use axum::extract::ws::{self, WebSocket};
-use axum::extract::WebSocketUpgrade;
-use axum::response::Response;
+use axum::extract::ws;
 use clap::Parser;
-use futures::{FutureExt, StreamExt};
-use http::header::COOKIE;
-use http::HeaderMap;
+use imbl_value::InternedString;
 use itertools::Itertools;
 use patch_db::json_ptr::{JsonPointer, ROOT};
 use patch_db::{Dump, Revision};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use tokio::sync::oneshot;
 use tracing::instrument;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
-use crate::middleware::auth::{HasValidSession, HashSessionToken};
 use crate::prelude::*;
+use crate::rpc_continuations::{Guid, RpcContinuation};
+use crate::util::net::WebSocketExt;
 use crate::util::serde::{apply_expr, HandlerExtSerde};
 
 lazy_static::lazy_static! {
     static ref PUBLIC: JsonPointer = "/public".parse().unwrap();
 }
 
-#[instrument(skip_all)]
-async fn ws_handler(
-    ctx: RpcContext,
-    session: Option<(HasValidSession, HashSessionToken)>,
-    mut stream: WebSocket,
-) -> Result<(), Error> {
-    let (dump, sub) = ctx.db.dump_and_sub(PUBLIC.clone()).await;
-
-    if let Some((session, token)) = session {
-        let kill = subscribe_to_session_kill(&ctx, token).await;
-        send_dump(session.clone(), &mut stream, dump).await?;
-
-        deal_with_messages(session, kill, sub, stream).await?;
-    } else {
-        stream
-            .send(ws::Message::Close(Some(ws::CloseFrame {
-                code: ws::close_code::ERROR,
-                reason: "UNAUTHORIZED".into(),
-            })))
-            .await
-            .with_kind(ErrorKind::Network)?;
-        drop(stream);
-    }
-
-    Ok(())
-}
-
-async fn subscribe_to_session_kill(
-    ctx: &RpcContext,
-    token: HashSessionToken,
-) -> oneshot::Receiver<()> {
-    let (send, recv) = oneshot::channel();
-    let mut guard = ctx.open_authed_websockets.lock().await;
-    if !guard.contains_key(&token) {
-        guard.insert(token, vec![send]);
-    } else {
-        guard.get_mut(&token).unwrap().push(send);
-    }
-    recv
-}
-
-#[instrument(skip_all)]
-async fn deal_with_messages(
-    _has_valid_authentication: HasValidSession,
-    mut kill: oneshot::Receiver<()>,
-    mut sub: patch_db::Subscriber,
-    mut stream: WebSocket,
-) -> Result<(), Error> {
-    let mut timer = tokio::time::interval(tokio::time::Duration::from_secs(5));
-
-    loop {
-        futures::select! {
-            _ = (&mut kill).fuse() => {
-                tracing::info!("Closing WebSocket: Reason: Session Terminated");
-                stream
-                .send(ws::Message::Close(Some(ws::CloseFrame {
-                    code: ws::close_code::ERROR,
-                    reason: "UNAUTHORIZED".into(),
-                }))).await
-                .with_kind(ErrorKind::Network)?;
-                drop(stream);
-                return Ok(())
-            }
-            new_rev = sub.recv().fuse() => {
-                let rev = new_rev.expect("UNREACHABLE: patch-db is dropped");
-                stream
-                    .send(ws::Message::Text(serde_json::to_string(&rev).with_kind(ErrorKind::Serialization)?))
-                    .await
-                    .with_kind(ErrorKind::Network)?;
-            }
-            message = stream.next().fuse() => {
-                let message = message.transpose().with_kind(ErrorKind::Network)?;
-                match message {
-                    None => {
-                        tracing::info!("Closing WebSocket: Stream Finished");
-                        return Ok(())
-                    }
-                    _ => (),
-                }
-            }
-            // This is trying to give a health checks to the home to keep the ui alive.
-            _ = timer.tick().fuse() => {
-                stream
-                    .send(ws::Message::Ping(vec![]))
-                    .await
-                    .with_kind(crate::ErrorKind::Network)?;
-            }
-        }
-    }
-}
-
-async fn send_dump(
-    _has_valid_authentication: HasValidSession,
-    stream: &mut WebSocket,
-    dump: Dump,
-) -> Result<(), Error> {
-    stream
-        .send(ws::Message::Text(
-            serde_json::to_string(&dump).with_kind(ErrorKind::Serialization)?,
-        ))
-        .await
-        .with_kind(ErrorKind::Network)?;
-    Ok(())
-}
-
-pub async fn subscribe(
-    ctx: RpcContext,
-    headers: HeaderMap,
-    ws: WebSocketUpgrade,
-) -> Result<Response, Error> {
-    let session = match async {
-        let token = HashSessionToken::from_header(headers.get(COOKIE))?;
-        let session = HasValidSession::from_header(headers.get(COOKIE), &ctx).await?;
-        Ok::<_, Error>((session, token))
-    }
-    .await
-    {
-        Ok(a) => Some(a),
-        Err(e) => {
-            if e.kind != ErrorKind::Authorization {
-                tracing::error!("Error Authenticating Websocket: {}", e);
-                tracing::debug!("{:?}", e);
-            }
-            None
-        }
-    };
-    Ok(ws.on_upgrade(|ws| async move {
-        match ws_handler(ctx, session, ws).await {
-            Ok(()) => (),
-            Err(e) => {
-                tracing::error!("WebSocket Closed: {}", e);
-                tracing::debug!("{:?}", e);
-            }
-        }
-    }))
-}
-
 pub fn db<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand("dump", from_fn_async(cli_dump).with_display_serializable())
         .subcommand("dump", from_fn_async(dump).no_cli())
+        .subcommand(
+            "subscribe",
+            from_fn_async(subscribe)
+                .with_metadata("get_session", Value::Bool(true))
+                .no_cli(),
+        )
         .subcommand("put", put::<C>())
         .subcommand("apply", from_fn_async(cli_apply).no_display())
         .subcommand("apply", from_fn_async(apply).no_cli())
@@ -215,7 +80,13 @@ async fn cli_dump(
             context
                 .call_remote::<RpcContext>(
                     &method,
-                    imbl_value::json!({ "includePrivate":include_private }),
+                    imbl_value::json!({
+                        "pointer": if include_private {
+                            AsRef::<str>::as_ref(&ROOT)
+                        } else {
+                            AsRef::<str>::as_ref(&*PUBLIC)
+                        }
+                    }),
                 )
                 .await?,
         )?
@@ -224,25 +95,76 @@ async fn cli_dump(
     Ok(dump)
 }
 
-#[derive(Deserialize, Serialize, Parser, TS)]
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
 pub struct DumpParams {
-    #[arg(long = "include-private", short = 'p')]
-    #[serde(default)]
+    #[ts(type = "string | null")]
+    pointer: Option<JsonPointer>,
+}
+
+pub async fn dump(ctx: RpcContext, DumpParams { pointer }: DumpParams) -> Result<Dump, Error> {
+    Ok(ctx.db.dump(pointer.as_ref().unwrap_or(&*PUBLIC)).await)
+}
+
+#[derive(Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct SubscribeParams {
+    #[ts(type = "string | null")]
+    pointer: Option<JsonPointer>,
     #[ts(skip)]
-    include_private: bool,
+    #[serde(rename = "__auth_session")]
+    session: InternedString,
 }
 
-pub async fn dump(
+#[derive(Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct SubscribeRes {
+    #[ts(type = "{ id: number; value: unknown }")]
+    pub dump: Dump,
+    pub guid: Guid,
+}
+
+pub async fn subscribe(
     ctx: RpcContext,
-    DumpParams { include_private }: DumpParams,
-) -> Result<Dump, Error> {
-    Ok(if include_private {
-        ctx.db.dump(&ROOT).await
-    } else {
-        ctx.db.dump(&PUBLIC).await
-    })
+    SubscribeParams { pointer, session }: SubscribeParams,
+) -> Result<SubscribeRes, Error> {
+    let (dump, mut sub) = ctx
+        .db
+        .dump_and_sub(pointer.unwrap_or_else(|| PUBLIC.clone()))
+        .await;
+    let guid = Guid::new();
+    ctx.rpc_continuations
+        .add(
+            guid.clone(),
+            RpcContinuation::ws_authed(
+                &ctx,
+                session,
+                |mut ws| async move {
+                    if let Err(e) = async {
+                        while let Some(rev) = sub.recv().await {
+                            ws.send(ws::Message::Text(
+                                serde_json::to_string(&rev).with_kind(ErrorKind::Serialization)?,
+                            ))
+                            .await
+                            .with_kind(ErrorKind::Network)?;
+                        }
+
+                        ws.normal_close("complete").await?;
+
+                        Ok::<_, Error>(())
+                    }
+                    .await
+                    {
+                        tracing::error!("Error in db websocket: {e}");
+                        tracing::debug!("{e:?}");
+                    }
+                },
+                Duration::from_secs(30),
+            ),
+        )
+        .await;
+
+    Ok(SubscribeRes { dump, guid })
 }
 
 #[derive(Deserialize, Serialize, Parser)]
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index 485f2359f..5e99580e9 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -27,10 +27,6 @@ pub fn diagnostic<C: Context>() -> ParentHandler<C> {
             "kernel-logs",
             from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>).no_display(),
         )
-        .subcommand(
-            "exit",
-            from_fn(exit).no_display().with_call_remote::<CliContext>(),
-        )
         .subcommand(
             "restart",
             from_fn(restart)
@@ -51,20 +47,15 @@ pub fn error(ctx: DiagnosticContext) -> Result<Arc<RpcError>, Error> {
     Ok(ctx.error.clone())
 }
 
-pub fn exit(ctx: DiagnosticContext) -> Result<(), Error> {
-    ctx.shutdown.send(None).expect("receiver dropped");
-    Ok(())
-}
-
 pub fn restart(ctx: DiagnosticContext) -> Result<(), Error> {
     ctx.shutdown
-        .send(Some(Shutdown {
+        .send(Shutdown {
             export_args: ctx
                 .disk_guid
                 .clone()
                 .map(|guid| (guid, ctx.datadir.clone())),
             restart: true,
-        }))
+        })
         .expect("receiver dropped");
     Ok(())
 }
diff --git a/core/startos/src/disk/main.rs b/core/startos/src/disk/main.rs
index d414c247e..ee807a938 100644
--- a/core/startos/src/disk/main.rs
+++ b/core/startos/src/disk/main.rs
@@ -13,7 +13,7 @@ use crate::disk::mount::util::unmount;
 use crate::util::Invoke;
 use crate::{Error, ErrorKind, ResultExt};
 
-pub const PASSWORD_PATH: &'static str = "/run/embassy/password";
+pub const PASSWORD_PATH: &'static str = "/run/startos/password";
 pub const DEFAULT_PASSWORD: &'static str = "password";
 pub const MAIN_FS_SIZE: FsSize = FsSize::Gigabytes(8);
 
diff --git a/core/startos/src/firmware.rs b/core/startos/src/firmware.rs
index 20347bcff..a9d5ced79 100644
--- a/core/startos/src/firmware.rs
+++ b/core/startos/src/firmware.rs
@@ -9,6 +9,7 @@ use tokio::process::Command;
 
 use crate::disk::fsck::RequiresReboot;
 use crate::prelude::*;
+use crate::progress::PhaseProgressTrackerHandle;
 use crate::util::Invoke;
 use crate::PLATFORM;
 
@@ -49,12 +50,7 @@ pub fn display_firmware_update_result(result: RequiresReboot) {
     }
 }
 
-/// We wanted to make sure during every init
-/// that the firmware was the correct and updated for
-/// systems like the Pure System that a new firmware
-/// was released and the updates where pushed through the pure os.
-// #[command(rename = "update-firmware", display(display_firmware_update_result))]
-pub async fn update_firmware() -> Result<RequiresReboot, Error> {
+pub async fn check_for_firmware_update() -> Result<Option<Firmware>, Error> {
     let system_product_name = String::from_utf8(
         Command::new("dmidecode")
             .arg("-s")
@@ -74,22 +70,21 @@ pub async fn update_firmware() -> Result<RequiresReboot, Error> {
     .trim()
     .to_owned();
     if system_product_name.is_empty() || bios_version.is_empty() {
-        return Ok(RequiresReboot(false));
+        return Ok(None);
     }
 
-    let firmware_dir = Path::new("/usr/lib/startos/firmware");
-
     for firmware in serde_json::from_str::<Vec<Firmware>>(
         &tokio::fs::read_to_string("/usr/lib/startos/firmware.json").await?,
     )
     .with_kind(ErrorKind::Deserialization)?
     {
-        let id = firmware.id;
         let matches_product_name = firmware
             .system_product_name
-            .map_or(true, |spn| spn == system_product_name);
+            .as_ref()
+            .map_or(true, |spn| spn == &system_product_name);
         let matches_bios_version = firmware
             .bios_version
+            .as_ref()
             .map_or(Some(true), |bv| {
                 let mut semver_str = bios_version.as_str();
                 if let Some(prefix) = &bv.semver_prefix {
@@ -113,35 +108,45 @@ pub async fn update_firmware() -> Result<RequiresReboot, Error> {
             })
             .unwrap_or(false);
         if firmware.platform.contains(&*PLATFORM) && matches_product_name && matches_bios_version {
-            let filename = format!("{id}.rom.gz");
-            let firmware_path = firmware_dir.join(&filename);
-            Command::new("sha256sum")
-                .arg("-c")
-                .input(Some(&mut std::io::Cursor::new(format!(
-                    "{} {}",
-                    firmware.shasum,
-                    firmware_path.display()
-                ))))
-                .invoke(ErrorKind::Filesystem)
-                .await?;
-            let mut rdr = if tokio::fs::metadata(&firmware_path).await.is_ok() {
-                GzipDecoder::new(BufReader::new(File::open(&firmware_path).await?))
-            } else {
-                return Err(Error::new(
-                    eyre!("Firmware {id}.rom.gz not found in {firmware_dir:?}"),
-                    ErrorKind::NotFound,
-                ));
-            };
-            Command::new("flashrom")
-                .arg("-p")
-                .arg("internal")
-                .arg("-w-")
-                .input(Some(&mut rdr))
-                .invoke(ErrorKind::Firmware)
-                .await?;
-            return Ok(RequiresReboot(true));
+            return Ok(Some(firmware));
         }
     }
 
-    Ok(RequiresReboot(false))
+    Ok(None)
+}
+
+/// We wanted to make sure during every init
+/// that the firmware was the correct and updated for
+/// systems like the Pure System that a new firmware
+/// was released and the updates where pushed through the pure os.
+pub async fn update_firmware(firmware: Firmware) -> Result<(), Error> {
+    let id = &firmware.id;
+    let firmware_dir = Path::new("/usr/lib/startos/firmware");
+    let filename = format!("{id}.rom.gz");
+    let firmware_path = firmware_dir.join(&filename);
+    Command::new("sha256sum")
+        .arg("-c")
+        .input(Some(&mut std::io::Cursor::new(format!(
+            "{} {}",
+            firmware.shasum,
+            firmware_path.display()
+        ))))
+        .invoke(ErrorKind::Filesystem)
+        .await?;
+    let mut rdr = if tokio::fs::metadata(&firmware_path).await.is_ok() {
+        GzipDecoder::new(BufReader::new(File::open(&firmware_path).await?))
+    } else {
+        return Err(Error::new(
+            eyre!("Firmware {id}.rom.gz not found in {firmware_dir:?}"),
+            ErrorKind::NotFound,
+        ));
+    };
+    Command::new("flashrom")
+        .arg("-p")
+        .arg("internal")
+        .arg("-w-")
+        .input(Some(&mut rdr))
+        .invoke(ErrorKind::Firmware)
+        .await?;
+    Ok(())
 }
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 97c674ac5..cdc444c32 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -1,25 +1,40 @@
 use std::fs::Permissions;
+use std::io::Cursor;
+use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
 use std::time::{Duration, SystemTime};
 
+use axum::extract::ws::{self, CloseFrame};
 use color_eyre::eyre::eyre;
+use futures::{StreamExt, TryStreamExt};
+use itertools::Itertools;
 use models::ResultExt;
 use rand::random;
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerArgs, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use tracing::instrument;
+use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
+use crate::context::{CliContext, InitContext};
 use crate::db::model::public::ServerStatus;
 use crate::db::model::Database;
 use crate::disk::mount::util::unmount;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
+use crate::net::net_controller::PreInitNetController;
 use crate::prelude::*;
+use crate::progress::{
+    FullProgress, FullProgressTracker, PhaseProgressTrackerHandle, PhasedProgressBar,
+};
+use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::ssh::SSH_AUTHORIZED_KEYS_FILE;
-use crate::util::cpupower::{get_available_governors, get_preferred_governor, set_governor};
-use crate::util::Invoke;
-use crate::{Error, ARCH};
+use crate::util::io::IOHook;
+use crate::util::net::WebSocketExt;
+use crate::util::{cpupower, Invoke};
+use crate::Error;
 
 pub const SYSTEM_REBUILD_PATH: &str = "/media/startos/config/system-rebuild";
 pub const STANDBY_MODE_PATH: &str = "/media/startos/config/standby";
@@ -180,14 +195,114 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
 }
 
 pub struct InitResult {
-    pub db: TypedPatchDb<Database>,
+    pub net_ctrl: PreInitNetController,
+}
+
+pub struct InitPhases {
+    preinit: Option<PhaseProgressTrackerHandle>,
+    local_auth: PhaseProgressTrackerHandle,
+    load_database: PhaseProgressTrackerHandle,
+    load_ssh_keys: PhaseProgressTrackerHandle,
+    start_net: PhaseProgressTrackerHandle,
+    mount_logs: PhaseProgressTrackerHandle,
+    load_ca_cert: PhaseProgressTrackerHandle,
+    load_wifi: PhaseProgressTrackerHandle,
+    init_tmp: PhaseProgressTrackerHandle,
+    set_governor: PhaseProgressTrackerHandle,
+    sync_clock: PhaseProgressTrackerHandle,
+    enable_zram: PhaseProgressTrackerHandle,
+    update_server_info: PhaseProgressTrackerHandle,
+    launch_service_network: PhaseProgressTrackerHandle,
+    run_migrations: PhaseProgressTrackerHandle,
+    validate_db: PhaseProgressTrackerHandle,
+    postinit: Option<PhaseProgressTrackerHandle>,
+}
+impl InitPhases {
+    pub fn new(handle: &FullProgressTracker) -> Self {
+        Self {
+            preinit: if Path::new("/media/startos/config/preinit.sh").exists() {
+                Some(handle.add_phase("Running preinit.sh".into(), Some(5)))
+            } else {
+                None
+            },
+            local_auth: handle.add_phase("Enabling local authentication".into(), Some(1)),
+            load_database: handle.add_phase("Loading database".into(), Some(5)),
+            load_ssh_keys: handle.add_phase("Loading SSH Keys".into(), Some(1)),
+            start_net: handle.add_phase("Starting network controller".into(), Some(1)),
+            mount_logs: handle.add_phase("Switching logs to write to data drive".into(), Some(1)),
+            load_ca_cert: handle.add_phase("Loading CA certificate".into(), Some(1)),
+            load_wifi: handle.add_phase("Loading WiFi configuration".into(), Some(1)),
+            init_tmp: handle.add_phase("Initializing temporary files".into(), Some(1)),
+            set_governor: handle.add_phase("Setting CPU performance profile".into(), Some(1)),
+            sync_clock: handle.add_phase("Synchronizing system clock".into(), Some(10)),
+            enable_zram: handle.add_phase("Enabling ZRAM".into(), Some(1)),
+            update_server_info: handle.add_phase("Updating server info".into(), Some(1)),
+            launch_service_network: handle.add_phase("Launching service intranet".into(), Some(10)),
+            run_migrations: handle.add_phase("Running migrations".into(), Some(10)),
+            validate_db: handle.add_phase("Validating database".into(), Some(1)),
+            postinit: if Path::new("/media/startos/config/postinit.sh").exists() {
+                Some(handle.add_phase("Running postinit.sh".into(), Some(5)))
+            } else {
+                None
+            },
+        }
+    }
+}
+
+pub async fn run_script<P: AsRef<Path>>(path: P, mut progress: PhaseProgressTrackerHandle) {
+    let script = path.as_ref();
+    progress.start();
+    if let Err(e) = async {
+        let script = tokio::fs::read_to_string(script).await?;
+        progress.set_total(script.as_bytes().iter().filter(|b| **b == b'\n').count() as u64);
+        let mut reader = IOHook::new(Cursor::new(script.as_bytes()));
+        reader.post_read(|buf| progress += buf.iter().filter(|b| **b == b'\n').count() as u64);
+        Command::new("/bin/bash")
+            .input(Some(&mut reader))
+            .invoke(ErrorKind::Unknown)
+            .await?;
+
+        Ok::<_, Error>(())
+    }
+    .await
+    {
+        tracing::error!("Error Running {}: {}", script.display(), e);
+        tracing::debug!("{:?}", e);
+    }
+    progress.complete();
 }
 
 #[instrument(skip_all)]
-pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
-    tokio::fs::create_dir_all("/run/embassy")
+pub async fn init(
+    cfg: &ServerConfig,
+    InitPhases {
+        preinit,
+        mut local_auth,
+        mut load_database,
+        mut load_ssh_keys,
+        mut start_net,
+        mut mount_logs,
+        mut load_ca_cert,
+        mut load_wifi,
+        mut init_tmp,
+        mut set_governor,
+        mut sync_clock,
+        mut enable_zram,
+        mut update_server_info,
+        mut launch_service_network,
+        run_migrations,
+        mut validate_db,
+        postinit,
+    }: InitPhases,
+) -> Result<InitResult, Error> {
+    if let Some(progress) = preinit {
+        run_script("/media/startos/config/preinit.sh", progress).await;
+    }
+
+    local_auth.start();
+    tokio::fs::create_dir_all("/run/startos")
         .await
-        .with_ctx(|_| (crate::ErrorKind::Filesystem, "mkdir -p /run/embassy"))?;
+        .with_ctx(|_| (crate::ErrorKind::Filesystem, "mkdir -p /run/startos"))?;
     if tokio::fs::metadata(LOCAL_AUTH_COOKIE_PATH).await.is_err() {
         tokio::fs::write(
             LOCAL_AUTH_COOKIE_PATH,
@@ -207,43 +322,41 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
             .invoke(crate::ErrorKind::Filesystem)
             .await?;
     }
+    local_auth.complete();
 
+    load_database.start();
     let db = TypedPatchDb::<Database>::load_unchecked(cfg.db().await?);
     let peek = db.peek().await;
+    load_database.complete();
     tracing::info!("Opened PatchDB");
 
+    load_ssh_keys.start();
     crate::ssh::sync_keys(
         &peek.as_private().as_ssh_pubkeys().de()?,
         SSH_AUTHORIZED_KEYS_FILE,
     )
     .await?;
+    load_ssh_keys.complete();
     tracing::info!("Synced SSH Keys");
 
     let account = AccountInfo::load(&peek)?;
 
-    let mut server_info = peek.as_public().as_server_info().de()?;
-
-    // write to ca cert store
-    tokio::fs::write(
-        "/usr/local/share/ca-certificates/startos-root-ca.crt",
-        account.root_ca_cert.to_pem()?,
+    start_net.start();
+    let net_ctrl = PreInitNetController::init(
+        db.clone(),
+        cfg.tor_control
+            .unwrap_or(SocketAddr::from(([127, 0, 0, 1], 9051))),
+        cfg.tor_socks.unwrap_or(SocketAddr::V4(SocketAddrV4::new(
+            Ipv4Addr::new(127, 0, 0, 1),
+            9050,
+        ))),
+        &account.hostname,
+        account.tor_key,
     )
     .await?;
-    Command::new("update-ca-certificates")
-        .invoke(crate::ErrorKind::OpenSsl)
-        .await?;
-
-    crate::net::wifi::synchronize_wpa_supplicant_conf(
-        &cfg.datadir().join("main"),
-        &mut server_info.wifi,
-    )
-    .await?;
-    tracing::info!("Synchronized WiFi");
-
-    let should_rebuild = tokio::fs::metadata(SYSTEM_REBUILD_PATH).await.is_ok()
-        || &*server_info.version < &emver::Version::new(0, 3, 2, 0)
-        || (ARCH == "x86_64" && &*server_info.version < &emver::Version::new(0, 3, 4, 0));
+    start_net.complete();
 
+    mount_logs.start();
     let log_dir = cfg.datadir().join("main/logs");
     if tokio::fs::metadata(&log_dir).await.is_err() {
         tokio::fs::create_dir_all(&log_dir).await?;
@@ -272,10 +385,35 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
         .arg("systemd-journald")
         .invoke(crate::ErrorKind::Journald)
         .await?;
+    mount_logs.complete();
     tracing::info!("Mounted Logs");
 
+    let mut server_info = peek.as_public().as_server_info().de()?;
+
+    load_ca_cert.start();
+    // write to ca cert store
+    tokio::fs::write(
+        "/usr/local/share/ca-certificates/startos-root-ca.crt",
+        account.root_ca_cert.to_pem()?,
+    )
+    .await?;
+    Command::new("update-ca-certificates")
+        .invoke(crate::ErrorKind::OpenSsl)
+        .await?;
+    load_ca_cert.complete();
+
+    load_wifi.start();
+    crate::net::wifi::synchronize_wpa_supplicant_conf(
+        &cfg.datadir().join("main"),
+        &mut server_info.wifi,
+    )
+    .await?;
+    load_wifi.complete();
+    tracing::info!("Synchronized WiFi");
+
+    init_tmp.start();
     let tmp_dir = cfg.datadir().join("package-data/tmp");
-    if should_rebuild && tokio::fs::metadata(&tmp_dir).await.is_ok() {
+    if tokio::fs::metadata(&tmp_dir).await.is_ok() {
         tokio::fs::remove_dir_all(&tmp_dir).await?;
     }
     if tokio::fs::metadata(&tmp_dir).await.is_err() {
@@ -286,23 +424,30 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
         tokio::fs::remove_dir_all(&tmp_var).await?;
     }
     crate::disk::mount::util::bind(&tmp_var, "/var/tmp", false).await?;
+    init_tmp.complete();
 
+    set_governor.start();
     let governor = if let Some(governor) = &server_info.governor {
-        if get_available_governors().await?.contains(governor) {
+        if cpupower::get_available_governors()
+            .await?
+            .contains(governor)
+        {
             Some(governor)
         } else {
             tracing::warn!("CPU Governor \"{governor}\" Not Available");
             None
         }
     } else {
-        get_preferred_governor().await?
+        cpupower::get_preferred_governor().await?
     };
     if let Some(governor) = governor {
         tracing::info!("Setting CPU Governor to \"{governor}\"");
-        set_governor(governor).await?;
+        cpupower::set_governor(governor).await?;
         tracing::info!("Set CPU Governor");
     }
+    set_governor.complete();
 
+    sync_clock.start();
     server_info.ntp_synced = false;
     let mut not_made_progress = 0u32;
     for _ in 0..1800 {
@@ -329,10 +474,15 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
     } else {
         tracing::info!("Syncronized system clock");
     }
+    sync_clock.complete();
 
+    enable_zram.start();
     if server_info.zram {
         crate::system::enable_zram().await?
     }
+    enable_zram.complete();
+
+    update_server_info.start();
     server_info.ip_info = crate::net::dhcp::init_ips().await?;
     server_info.status_info = ServerStatus {
         updated: false,
@@ -341,36 +491,129 @@ pub async fn init(cfg: &ServerConfig) -> Result<InitResult, Error> {
         shutting_down: false,
         restarting: false,
     };
-
     db.mutate(|v| {
         v.as_public_mut().as_server_info_mut().ser(&server_info)?;
         Ok(())
     })
     .await?;
+    update_server_info.complete();
 
+    launch_service_network.start();
     Command::new("systemctl")
         .arg("start")
         .arg("lxc-net.service")
         .invoke(ErrorKind::Lxc)
         .await?;
+    launch_service_network.complete();
 
-    crate::version::init(&db).await?;
+    crate::version::init(&db, run_migrations).await?;
 
+    validate_db.start();
     db.mutate(|d| {
         let model = d.de()?;
         d.ser(&model)
     })
     .await?;
+    validate_db.complete();
 
-    if should_rebuild {
-        match tokio::fs::remove_file(SYSTEM_REBUILD_PATH).await {
-            Ok(()) => Ok(()),
-            Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(()),
-            Err(e) => Err(e),
-        }?;
+    if let Some(progress) = postinit {
+        run_script("/media/startos/config/postinit.sh", progress).await;
     }
 
     tracing::info!("System initialized.");
 
-    Ok(InitResult { db })
+    Ok(InitResult { net_ctrl })
+}
+
+pub fn init_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("logs", crate::system::logs::<InitContext>())
+        .subcommand(
+            "logs",
+            from_fn_async(crate::logs::cli_logs::<InitContext, Empty>).no_display(),
+        )
+        .subcommand("kernel-logs", crate::system::kernel_logs::<InitContext>())
+        .subcommand(
+            "kernel-logs",
+            from_fn_async(crate::logs::cli_logs::<InitContext, Empty>).no_display(),
+        )
+        .subcommand("subscribe", from_fn_async(init_progress).no_cli())
+        .subcommand("subscribe", from_fn_async(cli_init_progress).no_display())
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct InitProgressRes {
+    pub progress: FullProgress,
+    pub guid: Guid,
+}
+
+pub async fn init_progress(ctx: InitContext) -> Result<InitProgressRes, Error> {
+    let progress_tracker = ctx.progress.clone();
+    let progress = progress_tracker.snapshot();
+    let guid = Guid::new();
+    ctx.rpc_continuations
+        .add(
+            guid.clone(),
+            RpcContinuation::ws(
+                |mut ws| async move {
+                    if let Err(e) = async {
+                        let mut stream = progress_tracker.stream(Some(Duration::from_millis(100)));
+                        while let Some(progress) = stream.next().await {
+                            ws.send(ws::Message::Text(
+                                serde_json::to_string(&progress)
+                                    .with_kind(ErrorKind::Serialization)?,
+                            ))
+                            .await
+                            .with_kind(ErrorKind::Network)?;
+                            if progress.overall.is_complete() {
+                                break;
+                            }
+                        }
+
+                        ws.normal_close("complete").await?;
+
+                        Ok::<_, Error>(())
+                    }
+                    .await
+                    {
+                        tracing::error!("error in init progress websocket: {e}");
+                        tracing::debug!("{e:?}");
+                    }
+                },
+                Duration::from_secs(30),
+            ),
+        )
+        .await;
+    Ok(InitProgressRes { progress, guid })
+}
+
+pub async fn cli_init_progress(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        raw_params,
+        ..
+    }: HandlerArgs<CliContext>,
+) -> Result<(), Error> {
+    let res: InitProgressRes = from_value(
+        ctx.call_remote::<InitContext>(
+            &parent_method
+                .into_iter()
+                .chain(method.into_iter())
+                .join("."),
+            raw_params,
+        )
+        .await?,
+    )?;
+    let mut ws = ctx.ws_continuation(res.guid).await?;
+    let mut bar = PhasedProgressBar::new("Initializing...");
+    while let Some(msg) = ws.try_next().await.with_kind(ErrorKind::Network)? {
+        if let tokio_tungstenite::tungstenite::Message::Text(msg) = msg {
+            bar.update(&serde_json::from_str(&msg).with_kind(ErrorKind::Deserialization)?);
+        }
+    }
+    Ok(())
 }
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 707503615..5d50da27d 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -6,7 +6,8 @@ use clap::builder::ValueParserFactory;
 use clap::{value_parser, CommandFactory, FromArgMatches, Parser};
 use color_eyre::eyre::eyre;
 use emver::VersionRange;
-use futures::{FutureExt, StreamExt};
+use futures::StreamExt;
+use imbl_value::InternedString;
 use itertools::Itertools;
 use patch_db::json_ptr::JsonPointer;
 use reqwest::header::{HeaderMap, CONTENT_LENGTH};
@@ -29,6 +30,7 @@ use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::S9pk;
 use crate::upload::upload;
 use crate::util::clap::FromStrParser;
+use crate::util::net::WebSocketExt;
 use crate::util::Never;
 
 pub const PKG_ARCHIVE_DIR: &str = "package-data/archive";
@@ -170,7 +172,15 @@ pub async fn install(
     Ok(())
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct SideloadParams {
+    #[ts(skip)]
+    #[serde(rename = "__auth_session")]
+    session: InternedString,
+}
+
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 pub struct SideloadResponse {
     pub upload: Guid,
@@ -178,8 +188,11 @@ pub struct SideloadResponse {
 }
 
 #[instrument(skip_all)]
-pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
-    let (upload, file) = upload(&ctx).await?;
+pub async fn sideload(
+    ctx: RpcContext,
+    SideloadParams { session }: SideloadParams,
+) -> Result<SideloadResponse, Error> {
+    let (upload, file) = upload(&ctx, session.clone()).await?;
     let (id_send, id_recv) = oneshot::channel();
     let (err_send, err_recv) = oneshot::channel();
     let progress = Guid::new();
@@ -193,8 +206,8 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
         .await;
     ctx.rpc_continuations.add(
         progress.clone(),
-        RpcContinuation::ws(
-            Box::new(|mut ws| {
+        RpcContinuation::ws_authed(&ctx, session,
+            |mut ws| {
                 use axum::extract::ws::Message;
                 async move {
                     if let Err(e) = async {
@@ -251,7 +264,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                             }
                         }
 
-                        ws.close().await.with_kind(ErrorKind::Network)?;
+                        ws.normal_close("complete").await?;
 
                         Ok::<_, Error>(())
                     }
@@ -261,8 +274,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                         tracing::debug!("{e:?}");
                     }
                 }
-                .boxed()
-            }),
+            },
             Duration::from_secs(600),
         ),
     )
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 0e125af98..6e7cc8f8b 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -1,8 +1,5 @@
 pub const DEFAULT_MARKETPLACE: &str = "https://registry.start9.com";
 // pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com";
-pub const CAP_1_KiB: usize = 1024;
-pub const CAP_1_MiB: usize = CAP_1_KiB * CAP_1_KiB;
-pub const CAP_10_MiB: usize = 10 * CAP_1_MiB;
 pub const HOST_IP: [u8; 4] = [172, 18, 0, 1];
 pub use std::env::consts::ARCH;
 lazy_static::lazy_static! {
@@ -18,6 +15,15 @@ lazy_static::lazy_static! {
     };
 }
 
+mod cap {
+    #![allow(non_upper_case_globals)]
+
+    pub const CAP_1_KiB: usize = 1024;
+    pub const CAP_1_MiB: usize = CAP_1_KiB * CAP_1_KiB;
+    pub const CAP_10_MiB: usize = 10 * CAP_1_MiB;
+}
+pub use cap::*;
+
 pub mod account;
 pub mod action;
 pub mod auth;
@@ -75,13 +81,17 @@ use rpc_toolkit::{
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::context::{CliContext, DiagnosticContext, InstallContext, RpcContext, SetupContext};
+use crate::context::{
+    CliContext, DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext,
+};
+use crate::disk::fsck::RequiresReboot;
 use crate::registry::context::{RegistryContext, RegistryUrlParams};
 use crate::util::serde::HandlerExtSerde;
 
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
+#[ts(export)]
 pub struct EchoParams {
     message: String,
 }
@@ -90,6 +100,20 @@ pub fn echo<C: Context>(_: C, EchoParams { message }: EchoParams) -> Result<Stri
     Ok(message)
 }
 
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum ApiState {
+    Error,
+    Initializing,
+    Running,
+}
+impl std::fmt::Display for ApiState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Debug::fmt(&self, f)
+    }
+}
+
 pub fn main_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand::<C, _>("git-info", from_fn(version::git_info))
@@ -99,6 +123,12 @@ pub fn main_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("authenticated", Value::Bool(false))
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "state",
+            from_fn(|_: RpcContext| Ok::<_, Error>(ApiState::Running))
+                .with_metadata("authenticated", Value::Bool(false))
+                .with_call_remote::<CliContext>(),
+        )
         .subcommand("server", server::<C>())
         .subcommand("package", package::<C>())
         .subcommand("net", net::net::<C>())
@@ -179,11 +209,18 @@ pub fn server<C: Context>() -> ParentHandler<C> {
         )
         .subcommand(
             "update-firmware",
-            from_fn_async(|_: RpcContext| firmware::update_firmware())
-                .with_custom_display_fn(|_handle, result| {
-                    Ok(firmware::display_firmware_update_result(result))
-                })
-                .with_call_remote::<CliContext>(),
+            from_fn_async(|_: RpcContext| async {
+                if let Some(firmware) = firmware::check_for_firmware_update().await? {
+                    firmware::update_firmware(firmware).await?;
+                    Ok::<_, Error>(RequiresReboot(true))
+                } else {
+                    Ok(RequiresReboot(false))
+                }
+            })
+            .with_custom_display_fn(|_handle, result| {
+                Ok(firmware::display_firmware_update_result(result))
+            })
+            .with_call_remote::<CliContext>(),
         )
 }
 
@@ -204,7 +241,12 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_cli(),
         )
-        .subcommand("sideload", from_fn_async(install::sideload).no_cli())
+        .subcommand(
+            "sideload",
+            from_fn_async(install::sideload)
+                .with_metadata("get_session", Value::Bool(true))
+                .no_cli(),
+        )
         .subcommand("install", from_fn_async(install::cli_install).no_display())
         .subcommand(
             "uninstall",
@@ -273,9 +315,34 @@ pub fn diagnostic_api() -> ParentHandler<DiagnosticContext> {
             "echo",
             from_fn(echo::<DiagnosticContext>).with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "state",
+            from_fn(|_: DiagnosticContext| Ok::<_, Error>(ApiState::Error))
+                .with_metadata("authenticated", Value::Bool(false))
+                .with_call_remote::<CliContext>(),
+        )
         .subcommand("diagnostic", diagnostic::diagnostic::<DiagnosticContext>())
 }
 
+pub fn init_api() -> ParentHandler<InitContext> {
+    ParentHandler::new()
+        .subcommand::<InitContext, _>(
+            "git-info",
+            from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
+        )
+        .subcommand(
+            "echo",
+            from_fn(echo::<InitContext>).with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "state",
+            from_fn(|_: InitContext| Ok::<_, Error>(ApiState::Initializing))
+                .with_metadata("authenticated", Value::Bool(false))
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand("init", init::init_api::<InitContext>())
+}
+
 pub fn setup_api() -> ParentHandler<SetupContext> {
     ParentHandler::new()
         .subcommand::<SetupContext, _>(
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 8d37120ba..1f1424338 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -7,7 +7,7 @@ use std::time::Duration;
 
 use clap::builder::ValueParserFactory;
 use clap::Parser;
-use futures::{AsyncWriteExt, FutureExt, StreamExt};
+use futures::{AsyncWriteExt, StreamExt};
 use imbl_value::{InOMap, InternedString};
 use models::InvalidId;
 use rpc_toolkit::yajrc::{RpcError, RpcResponse};
@@ -456,51 +456,49 @@ pub async fn connect(ctx: &RpcContext, container: &LxcContainer) -> Result<Guid,
         .add(
             guid.clone(),
             RpcContinuation::ws(
-                Box::new(|mut ws| {
-                    async move {
-                        if let Err(e) = async {
-                            loop {
-                                match ws.next().await {
-                                    None => break,
-                                    Some(Ok(Message::Text(txt))) => {
-                                        let mut id = None;
-                                        let result = async {
-                                            let req: RpcRequest = serde_json::from_str(&txt)
-                                                .map_err(|e| RpcError {
-                                                    data: Some(serde_json::Value::String(
-                                                        e.to_string(),
-                                                    )),
-                                                    ..rpc_toolkit::yajrc::PARSE_ERROR
-                                                })?;
-                                            id = req.id;
-                                            rpc.request(req.method, req.params).await
-                                        }
-                                        .await;
-                                        ws.send(Message::Text(
-                                            serde_json::to_string(
-                                                &RpcResponse::<GenericRpcMethod> { id, result },
-                                            )
-                                            .with_kind(ErrorKind::Serialization)?,
-                                        ))
-                                        .await
-                                        .with_kind(ErrorKind::Network)?;
-                                    }
-                                    Some(Ok(_)) => (),
-                                    Some(Err(e)) => {
-                                        return Err(Error::new(e, ErrorKind::Network));
+                |mut ws| async move {
+                    if let Err(e) = async {
+                        loop {
+                            match ws.next().await {
+                                None => break,
+                                Some(Ok(Message::Text(txt))) => {
+                                    let mut id = None;
+                                    let result = async {
+                                        let req: RpcRequest =
+                                            serde_json::from_str(&txt).map_err(|e| RpcError {
+                                                data: Some(serde_json::Value::String(
+                                                    e.to_string(),
+                                                )),
+                                                ..rpc_toolkit::yajrc::PARSE_ERROR
+                                            })?;
+                                        id = req.id;
+                                        rpc.request(req.method, req.params).await
                                     }
+                                    .await;
+                                    ws.send(Message::Text(
+                                        serde_json::to_string(&RpcResponse::<GenericRpcMethod> {
+                                            id,
+                                            result,
+                                        })
+                                        .with_kind(ErrorKind::Serialization)?,
+                                    ))
+                                    .await
+                                    .with_kind(ErrorKind::Network)?;
+                                }
+                                Some(Ok(_)) => (),
+                                Some(Err(e)) => {
+                                    return Err(Error::new(e, ErrorKind::Network));
                                 }
                             }
-                            Ok::<_, Error>(())
-                        }
-                        .await
-                        {
-                            tracing::error!("{e}");
-                            tracing::debug!("{e:?}");
                         }
+                        Ok::<_, Error>(())
+                    }
+                    .await
+                    {
+                        tracing::error!("{e}");
+                        tracing::debug!("{e:?}");
                     }
-                    .boxed()
-                }),
+                },
                 Duration::from_secs(30),
             ),
         )
diff --git a/core/startos/src/middleware/auth.rs b/core/startos/src/middleware/auth.rs
index 1852c4890..ecf88dba7 100644
--- a/core/startos/src/middleware/auth.rs
+++ b/core/startos/src/middleware/auth.rs
@@ -23,7 +23,7 @@ use tokio::sync::Mutex;
 use crate::context::RpcContext;
 use crate::prelude::*;
 
-pub const LOCAL_AUTH_COOKIE_PATH: &str = "/run/embassy/rpc.authcookie";
+pub const LOCAL_AUTH_COOKIE_PATH: &str = "/run/startos/rpc.authcookie";
 
 #[derive(Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -48,19 +48,9 @@ impl HasLoggedOutSessions {
             .into_iter()
             .map(|s| s.as_logout_session_id())
             .collect();
-        ctx.open_authed_websockets
-            .lock()
-            .await
-            .retain(|session, sockets| {
-                if to_log_out.contains(session.hashed()) {
-                    for socket in std::mem::take(sockets) {
-                        let _ = socket.send(());
-                    }
-                    false
-                } else {
-                    true
-                }
-            });
+        for sid in &to_log_out {
+            ctx.open_authed_continuations.kill(sid)
+        }
         ctx.db
             .mutate(|db| {
                 let sessions = db.as_private_mut().as_sessions_mut();
diff --git a/core/startos/src/middleware/diagnostic.rs b/core/startos/src/middleware/diagnostic.rs
deleted file mode 100644
index 2a7467e34..000000000
--- a/core/startos/src/middleware/diagnostic.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use rpc_toolkit::yajrc::RpcMethod;
-use rpc_toolkit::{Empty, Middleware, RpcRequest, RpcResponse};
-
-use crate::context::DiagnosticContext;
-use crate::prelude::*;
-
-#[derive(Clone)]
-pub struct DiagnosticMode {
-    method: Option<String>,
-}
-impl DiagnosticMode {
-    pub fn new() -> Self {
-        Self { method: None }
-    }
-}
-
-impl Middleware<DiagnosticContext> for DiagnosticMode {
-    type Metadata = Empty;
-    async fn process_rpc_request(
-        &mut self,
-        _: &DiagnosticContext,
-        _: Self::Metadata,
-        request: &mut RpcRequest,
-    ) -> Result<(), RpcResponse> {
-        self.method = Some(request.method.as_str().to_owned());
-        Ok(())
-    }
-    async fn process_rpc_response(&mut self, _: &DiagnosticContext, response: &mut RpcResponse) {
-        if let Err(e) = &mut response.result {
-            if e.code == -32601 {
-                *e = Error::new(
-                    eyre!(
-                        "{} is not available on the Diagnostic API",
-                        self.method.as_ref().map(|s| s.as_str()).unwrap_or_default()
-                    ),
-                    crate::ErrorKind::DiagnosticMode,
-                )
-                .into();
-            }
-        }
-    }
-}
diff --git a/core/startos/src/middleware/mod.rs b/core/startos/src/middleware/mod.rs
index 3af0cb5a4..3438dc3db 100644
--- a/core/startos/src/middleware/mod.rs
+++ b/core/startos/src/middleware/mod.rs
@@ -1,4 +1,3 @@
 pub mod auth;
 pub mod cors;
 pub mod db;
-pub mod diagnostic;
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index 69c5c7940..270c7ca09 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -23,22 +23,18 @@ use crate::prelude::*;
 use crate::util::serde::MaybeUtf8String;
 use crate::HOST_IP;
 
-pub struct NetController {
-    db: TypedPatchDb<Database>,
-    pub(super) tor: TorController,
-    pub(super) vhost: VHostController,
-    pub(super) dns: DnsController,
-    pub(super) forward: LanPortForwardController,
-    pub(super) os_bindings: Vec<Arc<()>>,
+pub struct PreInitNetController {
+    pub db: TypedPatchDb<Database>,
+    tor: TorController,
+    vhost: VHostController,
+    os_bindings: Vec<Arc<()>>,
 }
-
-impl NetController {
+impl PreInitNetController {
     #[instrument(skip_all)]
     pub async fn init(
         db: TypedPatchDb<Database>,
         tor_control: SocketAddr,
         tor_socks: SocketAddr,
-        dns_bind: &[SocketAddr],
         hostname: &Hostname,
         os_tor_key: TorSecretKeyV3,
     ) -> Result<Self, Error> {
@@ -46,8 +42,6 @@ impl NetController {
             db: db.clone(),
             tor: TorController::new(tor_control, tor_socks),
             vhost: VHostController::new(db),
-            dns: DnsController::init(dns_bind).await?,
-            forward: LanPortForwardController::new(),
             os_bindings: Vec::new(),
         };
         res.add_os_bindings(hostname, os_tor_key).await?;
@@ -73,8 +67,6 @@ impl NetController {
                 alpn.clone(),
             )
             .await?;
-        self.os_bindings
-            .push(self.dns.add(None, HOST_IP.into()).await?);
 
         // LAN IP
         self.os_bindings.push(
@@ -142,6 +134,39 @@ impl NetController {
 
         Ok(())
     }
+}
+
+pub struct NetController {
+    db: TypedPatchDb<Database>,
+    pub(super) tor: TorController,
+    pub(super) vhost: VHostController,
+    pub(super) dns: DnsController,
+    pub(super) forward: LanPortForwardController,
+    pub(super) os_bindings: Vec<Arc<()>>,
+}
+
+impl NetController {
+    pub async fn init(
+        PreInitNetController {
+            db,
+            tor,
+            vhost,
+            os_bindings,
+        }: PreInitNetController,
+        dns_bind: &[SocketAddr],
+    ) -> Result<Self, Error> {
+        let mut res = Self {
+            db,
+            tor,
+            vhost,
+            dns: DnsController::init(dns_bind).await?,
+            forward: LanPortForwardController::new(),
+            os_bindings,
+        };
+        res.os_bindings
+            .push(res.dns.add(None, HOST_IP.into()).await?);
+        Ok(res)
+    }
 
     #[instrument(skip_all)]
     pub async fn create_service(
diff --git a/core/startos/src/net/refresher.html b/core/startos/src/net/refresher.html
new file mode 100644
index 000000000..445c6b5be
--- /dev/null
+++ b/core/startos/src/net/refresher.html
@@ -0,0 +1,11 @@
+<html>
+    <head>
+        <title>StartOS: Loading...</title>
+        <script>
+            setTimeout(window.location.reload, 1000)
+        </script>
+    </head>
+    <body>
+        Loading...
+    </body>
+</html>
\ No newline at end of file
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index fff1731ce..7e8034d99 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -1,4 +1,3 @@
-use std::fs::Metadata;
 use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::time::UNIX_EPOCH;
@@ -13,25 +12,26 @@ use digest::Digest;
 use futures::future::ready;
 use http::header::ACCEPT_ENCODING;
 use http::request::Parts as RequestParts;
-use http::{HeaderMap, Method, StatusCode};
+use http::{Method, StatusCode};
+use imbl_value::InternedString;
 use include_dir::Dir;
 use new_mime_guess::MimeGuess;
 use openssl::hash::MessageDigest;
 use openssl::x509::X509;
-use rpc_toolkit::Server;
+use rpc_toolkit::{Context, HttpServer, Server};
 use tokio::fs::File;
 use tokio::io::BufReader;
 use tokio_util::io::ReaderStream;
 
-use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext};
-use crate::db::subscribe;
+use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::hostname::Hostname;
 use crate::middleware::auth::{Auth, HasValidSession};
 use crate::middleware::cors::Cors;
 use crate::middleware::db::SyncDb;
-use crate::middleware::diagnostic::DiagnosticMode;
-use crate::rpc_continuations::Guid;
-use crate::{diagnostic_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt};
+use crate::rpc_continuations::{Guid, RpcContinuations};
+use crate::{
+    diagnostic_api, init_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt,
+};
 
 const NOT_FOUND: &[u8] = b"Not Found";
 const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
@@ -49,7 +49,6 @@ const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "u
 #[derive(Clone)]
 pub enum UiMode {
     Setup,
-    Diag,
     Install,
     Main,
 }
@@ -58,128 +57,46 @@ impl UiMode {
     fn path(&self, path: &str) -> PathBuf {
         match self {
             Self::Setup => Path::new("setup-wizard").join(path),
-            Self::Diag => Path::new("diagnostic-ui").join(path),
             Self::Install => Path::new("install-wizard").join(path),
             Self::Main => Path::new("ui").join(path),
         }
     }
 }
 
-pub fn setup_ui_file_router(ctx: SetupContext) -> Router {
+pub fn rpc_router<C: Context + Clone + AsRef<RpcContinuations>>(
+    ctx: C,
+    server: HttpServer<C>,
+) -> Router {
     Router::new()
-        .route_service(
-            "/rpc/*path",
-            post(Server::new(move || ready(Ok(ctx.clone())), setup_api()).middleware(Cors::new())),
-        )
-        .fallback(any(|request: Request| async move {
-            alt_ui(request, UiMode::Setup)
-                .await
-                .unwrap_or_else(server_error)
-        }))
-}
-
-pub fn diag_ui_file_router(ctx: DiagnosticContext) -> Router {
-    Router::new()
-        .route(
-            "/rpc/*path",
-            post(
-                Server::new(move || ready(Ok(ctx.clone())), diagnostic_api())
-                    .middleware(Cors::new())
-                    .middleware(DiagnosticMode::new()),
-            ),
-        )
-        .fallback(any(|request: Request| async move {
-            alt_ui(request, UiMode::Diag)
-                .await
-                .unwrap_or_else(server_error)
-        }))
-}
-
-pub fn install_ui_file_router(ctx: InstallContext) -> Router {
-    Router::new()
-        .route("/rpc/*path", {
-            let ctx = ctx.clone();
-            post(Server::new(move || ready(Ok(ctx.clone())), install_api()).middleware(Cors::new()))
-        })
-        .fallback(any(|request: Request| async move {
-            alt_ui(request, UiMode::Install)
-                .await
-                .unwrap_or_else(server_error)
-        }))
-}
-
-pub fn main_ui_server_router(ctx: RpcContext) -> Router {
-    Router::new()
-        .route("/rpc/*path", {
-            let ctx = ctx.clone();
-            post(
-                Server::new(move || ready(Ok(ctx.clone())), main_api::<RpcContext>())
-                    .middleware(Cors::new())
-                    .middleware(Auth::new())
-                    .middleware(SyncDb::new()),
-            )
-        })
+        .route("/rpc/*path", post(server))
         .route(
-            "/ws/db",
-            any({
-                let ctx = ctx.clone();
-                move |headers: HeaderMap, ws: x::WebSocketUpgrade| async move {
-                    subscribe(ctx, headers, ws)
-                        .await
-                        .unwrap_or_else(server_error)
-                }
-            }),
-        )
-        .route(
-            "/ws/rpc/*path",
+            "/ws/rpc/:guid",
             get({
                 let ctx = ctx.clone();
-                move |x::Path(path): x::Path<String>,
+                move |x::Path(guid): x::Path<Guid>,
                       ws: axum::extract::ws::WebSocketUpgrade| async move {
-                    match Guid::from(&path) {
-                        None => {
-                            tracing::debug!("No Guid Path");
-                            bad_request()
-                        }
-                        Some(guid) => match ctx.rpc_continuations.get_ws_handler(&guid).await {
-                            Some(cont) => ws.on_upgrade(cont),
-                            _ => not_found(),
-                        },
+                    match AsRef::<RpcContinuations>::as_ref(&ctx).get_ws_handler(&guid).await {
+                        Some(cont) => ws.on_upgrade(cont),
+                        _ => not_found(),
                     }
                 }
             }),
         )
         .route(
-            "/rest/rpc/*path",
+            "/rest/rpc/:guid",
             any({
                 let ctx = ctx.clone();
-                move |request: x::Request| async move {
-                    let path = request
-                        .uri()
-                        .path()
-                        .strip_prefix("/rest/rpc/")
-                        .unwrap_or_default();
-                    match Guid::from(&path) {
-                        None => {
-                            tracing::debug!("No Guid Path");
-                            bad_request()
-                        }
-                        Some(guid) => match ctx.rpc_continuations.get_rest_handler(&guid).await {
-                            None => not_found(),
-                            Some(cont) => cont(request).await.unwrap_or_else(server_error),
-                        },
+                move |x::Path(guid): x::Path<Guid>, request: x::Request| async move {
+                    match AsRef::<RpcContinuations>::as_ref(&ctx).get_rest_handler(&guid).await {
+                        None => not_found(),
+                        Some(cont) => cont(request).await.unwrap_or_else(server_error),
                     }
                 }
             }),
         )
-        .fallback(any(move |request: Request| async move {
-            main_start_os_ui(request, ctx)
-                .await
-                .unwrap_or_else(server_error)
-        }))
 }
 
-async fn alt_ui(req: Request, ui_mode: UiMode) -> Result<Response, Error> {
+fn serve_ui(req: Request, ui_mode: UiMode) -> Result<Response, Error> {
     let (request_parts, _body) = req.into_parts();
     match &request_parts.method {
         &Method::GET => {
@@ -196,9 +113,7 @@ async fn alt_ui(req: Request, ui_mode: UiMode) -> Result<Response, Error> {
                 .or_else(|| EMBEDDED_UIS.get_file(&*ui_mode.path("index.html")));
 
             if let Some(file) = file {
-                FileData::from_embedded(&request_parts, file)
-                    .into_response(&request_parts)
-                    .await
+                FileData::from_embedded(&request_parts, file).into_response(&request_parts)
             } else {
                 Ok(not_found())
             }
@@ -207,6 +122,75 @@ async fn alt_ui(req: Request, ui_mode: UiMode) -> Result<Response, Error> {
     }
 }
 
+pub fn setup_ui_router(ctx: SetupContext) -> Router {
+    rpc_router(
+        ctx.clone(),
+        Server::new(move || ready(Ok(ctx.clone())), setup_api()).middleware(Cors::new()),
+    )
+    .fallback(any(|request: Request| async move {
+        serve_ui(request, UiMode::Setup).unwrap_or_else(server_error)
+    }))
+}
+
+pub fn diagnostic_ui_router(ctx: DiagnosticContext) -> Router {
+    rpc_router(
+        ctx.clone(),
+        Server::new(move || ready(Ok(ctx.clone())), diagnostic_api()).middleware(Cors::new()),
+    )
+    .fallback(any(|request: Request| async move {
+        serve_ui(request, UiMode::Main).unwrap_or_else(server_error)
+    }))
+}
+
+pub fn install_ui_router(ctx: InstallContext) -> Router {
+    rpc_router(
+        ctx.clone(),
+        Server::new(move || ready(Ok(ctx.clone())), install_api()).middleware(Cors::new()),
+    )
+    .fallback(any(|request: Request| async move {
+        serve_ui(request, UiMode::Install).unwrap_or_else(server_error)
+    }))
+}
+
+pub fn init_ui_router(ctx: InitContext) -> Router {
+    rpc_router(
+        ctx.clone(),
+        Server::new(move || ready(Ok(ctx.clone())), init_api()).middleware(Cors::new()),
+    )
+    .fallback(any(|request: Request| async move {
+        serve_ui(request, UiMode::Main).unwrap_or_else(server_error)
+    }))
+}
+
+pub fn main_ui_router(ctx: RpcContext) -> Router {
+    rpc_router(
+        ctx.clone(),
+        Server::new(move || ready(Ok(ctx.clone())), main_api::<RpcContext>())
+            .middleware(Cors::new())
+            .middleware(Auth::new())
+            .middleware(SyncDb::new()),
+    )
+    // TODO: cert
+    .fallback(any(|request: Request| async move {
+        serve_ui(request, UiMode::Main).unwrap_or_else(server_error)
+    }))
+}
+
+pub fn refresher() -> Router {
+    Router::new().fallback(get(|request: Request| async move {
+        let res = include_bytes!("./refresher.html");
+        FileData {
+            data: Body::from(&res[..]),
+            e_tag: None,
+            encoding: None,
+            len: Some(res.len() as u64),
+            mime: Some("text/html".into()),
+        }
+        .into_response(&request.into_parts().0)
+        .unwrap_or_else(server_error)
+    }))
+}
+
 async fn if_authorized<
     F: FnOnce() -> Fut,
     Fut: Future<Output = Result<Response, Error>> + Send + Sync,
@@ -223,89 +207,6 @@ async fn if_authorized<
     }
 }
 
-async fn main_start_os_ui(req: Request, ctx: RpcContext) -> Result<Response, Error> {
-    let (request_parts, _body) = req.into_parts();
-    match (
-        &request_parts.method,
-        request_parts
-            .uri
-            .path()
-            .strip_prefix('/')
-            .unwrap_or(request_parts.uri.path())
-            .split_once('/'),
-    ) {
-        (&Method::GET, Some(("public", path))) => {
-            todo!("pull directly from s9pk")
-        }
-        (&Method::GET, Some(("proxy", target))) => {
-            if_authorized(&ctx, &request_parts, || async {
-                let target = urlencoding::decode(target)?;
-                let res = ctx
-                    .client
-                    .get(target.as_ref())
-                    .headers(
-                        request_parts
-                            .headers
-                            .iter()
-                            .filter(|(h, _)| {
-                                !PROXY_STRIP_HEADERS
-                                    .iter()
-                                    .any(|bad| h.as_str().eq_ignore_ascii_case(bad))
-                            })
-                            .flat_map(|(h, v)| {
-                                Some((
-                                    reqwest::header::HeaderName::from_lowercase(
-                                        h.as_str().as_bytes(),
-                                    )
-                                    .ok()?,
-                                    reqwest::header::HeaderValue::from_bytes(v.as_bytes()).ok()?,
-                                ))
-                            })
-                            .collect(),
-                    )
-                    .send()
-                    .await
-                    .with_kind(crate::ErrorKind::Network)?;
-                let mut hres = Response::builder().status(res.status().as_u16());
-                for (h, v) in res.headers().clone() {
-                    if let Some(h) = h {
-                        hres = hres.header(h.to_string(), v.as_bytes());
-                    }
-                }
-                hres.body(Body::from_stream(res.bytes_stream()))
-                    .with_kind(crate::ErrorKind::Network)
-            })
-            .await
-        }
-        (&Method::GET, Some(("eos", "local.crt"))) => {
-            let account = ctx.account.read().await;
-            cert_send(&account.root_ca_cert, &account.hostname)
-        }
-        (&Method::GET, _) => {
-            let uri_path = UiMode::Main.path(
-                request_parts
-                    .uri
-                    .path()
-                    .strip_prefix('/')
-                    .unwrap_or(request_parts.uri.path()),
-            );
-
-            let file = EMBEDDED_UIS
-                .get_file(&*uri_path)
-                .or_else(|| EMBEDDED_UIS.get_file(&*UiMode::Main.path("index.html")));
-
-            if let Some(file) = file {
-                FileData::from_embedded(&request_parts, file)
-                    .into_response(&request_parts)
-                    .await
-            } else {
-                Ok(not_found())
-            }
-        }
-        _ => Ok(method_not_allowed()),
-    }
-}
-
 pub fn unauthorized(err: Error, path: &str) -> Response {
     tracing::warn!("unauthorized for {} @{:?}", err, path);
     tracing::debug!("{:?}", err);
@@ -373,8 +274,8 @@ struct FileData {
     data: Body,
     len: Option<u64>,
     encoding: Option<&'static str>,
-    e_tag: String,
-    mime: Option<String>,
+    e_tag: Option<String>,
+    mime: Option<InternedString>,
 }
 impl FileData {
     fn from_embedded(req: &RequestParts, file: &'static include_dir::File<'static>) -> Self {
@@ -407,10 +308,23 @@ impl FileData {
             len: Some(data.len() as u64),
             encoding,
             data: data.into(),
-            e_tag: e_tag(path, None),
+            e_tag: file.metadata().map(|metadata| {
+                e_tag(
+                    path,
+                    format!(
+                        "{}",
+                        metadata
+                            .modified()
+                            .duration_since(UNIX_EPOCH)
+                            .map(|d| d.as_secs() as i64)
+                            .unwrap_or_else(|e| e.duration().as_secs() as i64 * -1),
+                    )
+                    .as_bytes(),
+                )
+            }),
             mime: MimeGuess::from_path(path)
                 .first()
-                .map(|m| m.essence_str().to_owned()),
+                .map(|m| m.essence_str().into()),
         }
     }
 
@@ -434,7 +348,18 @@ impl FileData {
             .await
             .with_ctx(|_| (ErrorKind::Filesystem, path.display().to_string()))?;
 
-        let e_tag = e_tag(path, Some(&metadata));
+        let e_tag = Some(e_tag(
+            path,
+            format!(
+                "{}",
+                metadata
+                    .modified()?
+                    .duration_since(UNIX_EPOCH)
+                    .map(|d| d.as_secs() as i64)
+                    .unwrap_or_else(|e| e.duration().as_secs() as i64 * -1)
+            )
+            .as_bytes(),
+        ));
 
         let (len, data) = if encoding == Some("gzip") {
             (
@@ -455,16 +380,18 @@ impl FileData {
             e_tag,
             mime: MimeGuess::from_path(path)
                 .first()
-                .map(|m| m.essence_str().to_owned()),
+                .map(|m| m.essence_str().into()),
         })
     }
 
-    async fn into_response(self, req: &RequestParts) -> Result<Response, Error> {
+    fn into_response(self, req: &RequestParts) -> Result<Response, Error> {
         let mut builder = Response::builder();
         if let Some(mime) = self.mime {
             builder = builder.header(http::header::CONTENT_TYPE, &*mime);
         }
-        builder = builder.header(http::header::ETAG, &*self.e_tag);
+        if let Some(e_tag) = &self.e_tag {
+            builder = builder.header(http::header::ETAG, &**e_tag);
+        }
         builder = builder.header(
             http::header::CACHE_CONTROL,
             "public, max-age=21000000, immutable",
@@ -481,11 +408,12 @@ impl FileData {
             builder = builder.header(http::header::CONNECTION, "keep-alive");
         }
 
-        if req
-            .headers
-            .get("if-none-match")
-            .and_then(|h| h.to_str().ok())
-            == Some(self.e_tag.as_ref())
+        if self.e_tag.is_some()
+            && req
+                .headers
+                .get("if-none-match")
+                .and_then(|h| h.to_str().ok())
+                == self.e_tag.as_deref()
         {
             builder = builder.status(StatusCode::NOT_MODIFIED);
             builder.body(Body::empty())
@@ -503,21 +431,14 @@ impl FileData {
     }
 }
 
-fn e_tag(path: &Path, metadata: Option<&Metadata>) -> String {
+lazy_static::lazy_static! {
+    static ref INSTANCE_NONCE: u64 = rand::random();
+}
+
+fn e_tag(path: &Path, modified: impl AsRef<[u8]>) -> String {
     let mut hasher = sha2::Sha256::new();
     hasher.update(format!("{:?}", path).as_bytes());
-    if let Some(modified) = metadata.and_then(|m| m.modified().ok()) {
-        hasher.update(
-            format!(
-                "{}",
-                modified
-                    .duration_since(UNIX_EPOCH)
-                    .unwrap_or_default()
-                    .as_secs()
-            )
-            .as_bytes(),
-        );
-    }
+    hasher.update(modified.as_ref());
     let res = hasher.finalize();
     format!(
         "\"{}\"",
diff --git a/core/startos/src/net/web_server.rs b/core/startos/src/net/web_server.rs
index a89aae92f..a9cfdf046 100644
--- a/core/startos/src/net/web_server.rs
+++ b/core/startos/src/net/web_server.rs
@@ -1,23 +1,84 @@
+use std::convert::Infallible;
 use std::net::SocketAddr;
+use std::task::Poll;
 use std::time::Duration;
 
+use axum::extract::Request;
 use axum::Router;
 use axum_server::Handle;
+use bytes::Bytes;
+use futures::future::ready;
+use futures::FutureExt;
 use helpers::NonDetachingJoinHandle;
-use tokio::sync::oneshot;
+use tokio::sync::{oneshot, watch};
 
-use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext};
+use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::net::static_server::{
-    diag_ui_file_router, install_ui_file_router, main_ui_server_router, setup_ui_file_router,
+    diagnostic_ui_router, init_ui_router, install_ui_router, main_ui_router, refresher,
+    setup_ui_router,
 };
-use crate::Error;
+use crate::prelude::*;
+
+#[derive(Clone)]
+pub struct SwappableRouter(watch::Sender<Router>);
+impl SwappableRouter {
+    pub fn new(router: Router) -> Self {
+        Self(watch::channel(router).0)
+    }
+    pub fn swap(&self, router: Router) {
+        let _ = self.0.send_replace(router);
+    }
+}
+
+#[derive(Clone)]
+pub struct SwappableRouterService(watch::Receiver<Router>);
+impl<B> tower_service::Service<Request<B>> for SwappableRouterService
+where
+    B: axum::body::HttpBody<Data = Bytes> + Send + 'static,
+    B::Error: Into<axum::BoxError>,
+{
+    type Response = <Router as tower_service::Service<Request<B>>>::Response;
+    type Error = <Router as tower_service::Service<Request<B>>>::Error;
+    type Future = <Router as tower_service::Service<Request<B>>>::Future;
+    #[inline]
+    fn poll_ready(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<(), Self::Error>> {
+        let mut changed = self.0.changed().boxed();
+        if changed.poll_unpin(cx).is_ready() {
+            return Poll::Ready(Ok(()));
+        }
+        drop(changed);
+        tower_service::Service::<Request<B>>::poll_ready(&mut self.0.borrow().clone(), cx)
+    }
+    fn call(&mut self, req: Request<B>) -> Self::Future {
+        self.0.borrow().clone().call(req)
+    }
+}
+
+impl<T> tower_service::Service<T> for SwappableRouter {
+    type Response = SwappableRouterService;
+    type Error = Infallible;
+    type Future = futures::future::Ready<Result<Self::Response, Self::Error>>;
+    #[inline]
+    fn poll_ready(
+        &mut self,
+        _: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+    fn call(&mut self, _: T) -> Self::Future {
+        ready(Ok(SwappableRouterService(self.0.subscribe())))
+    }
+}
 
 pub struct WebServer {
     shutdown: oneshot::Sender<()>,
+    router: SwappableRouter,
     thread: NonDetachingJoinHandle<()>,
 }
 impl WebServer {
-    pub fn new(bind: SocketAddr, router: Router) -> Self {
+    pub fn new(bind: SocketAddr) -> Self {
+        let router = SwappableRouter::new(refresher());
+        let thread_router = router.clone();
         let (shutdown, shutdown_recv) = oneshot::channel();
         let thread = NonDetachingJoinHandle::from(tokio::spawn(async move {
             let handle = Handle::new();
@@ -25,14 +86,18 @@ impl WebServer {
             server.http_builder().http1().preserve_header_case(true);
             server.http_builder().http1().title_case_headers(true);
 
-            if let (Err(e), _) = tokio::join!(server.serve(router.into_make_service()), async {
+            if let (Err(e), _) = tokio::join!(server.serve(thread_router), async {
                 let _ = shutdown_recv.await;
                 handle.graceful_shutdown(Some(Duration::from_secs(0)));
             }) {
                 tracing::error!("Spawning hyper server error: {}", e);
             }
         }));
-        Self { shutdown, thread }
+        Self {
+            shutdown,
+            router,
+            thread,
+        }
     }
 
     pub async fn shutdown(self) {
@@ -40,19 +105,27 @@ impl WebServer {
         self.thread.await.unwrap()
     }
 
-    pub fn main(bind: SocketAddr, ctx: RpcContext) -> Result<Self, Error> {
-        Ok(Self::new(bind, main_ui_server_router(ctx)))
+    pub fn serve_router(&mut self, router: Router) {
+        self.router.swap(router)
+    }
+
+    pub fn serve_main(&mut self, ctx: RpcContext) {
+        self.serve_router(main_ui_router(ctx))
+    }
+
+    pub fn serve_setup(&mut self, ctx: SetupContext) {
+        self.serve_router(setup_ui_router(ctx))
     }
 
-    pub fn setup(bind: SocketAddr, ctx: SetupContext) -> Result<Self, Error> {
-        Ok(Self::new(bind, setup_ui_file_router(ctx)))
+    pub fn serve_diagnostic(&mut self, ctx: DiagnosticContext) {
+        self.serve_router(diagnostic_ui_router(ctx))
     }
 
-    pub fn diagnostic(bind: SocketAddr, ctx: DiagnosticContext) -> Result<Self, Error> {
-        Ok(Self::new(bind, diag_ui_file_router(ctx)))
+    pub fn serve_install(&mut self, ctx: InstallContext) {
+        self.serve_router(install_ui_router(ctx))
     }
 
-    pub fn install(bind: SocketAddr, ctx: InstallContext) -> Result<Self, Error> {
-        Ok(Self::new(bind, install_ui_file_router(ctx)))
+    pub fn serve_init(&mut self, ctx: InitContext) {
+        self.serve_router(init_ui_router(ctx))
     }
 }
diff --git a/core/startos/src/progress.rs b/core/startos/src/progress.rs
index 9a22405ca..f70a5adbc 100644
--- a/core/startos/src/progress.rs
+++ b/core/startos/src/progress.rs
@@ -1,14 +1,16 @@
 use std::panic::UnwindSafe;
-use std::sync::Arc;
 use std::time::Duration;
 
-use futures::Future;
+use futures::future::pending;
+use futures::stream::BoxStream;
+use futures::{Future, FutureExt, StreamExt, TryFutureExt};
+use helpers::NonDetachingJoinHandle;
 use imbl_value::{InOMap, InternedString};
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncSeek, AsyncWrite};
-use tokio::sync::{mpsc, watch};
+use tokio::sync::watch;
 use ts_rs::TS;
 
 use crate::db::model::{Database, DatabaseModel};
@@ -168,39 +170,23 @@ impl FullProgress {
     }
 }
 
+#[derive(Clone)]
 pub struct FullProgressTracker {
-    overall: Arc<watch::Sender<Progress>>,
-    overall_recv: watch::Receiver<Progress>,
-    phases: InOMap<InternedString, watch::Receiver<Progress>>,
-    new_phase: (
-        mpsc::UnboundedSender<(InternedString, watch::Receiver<Progress>)>,
-        mpsc::UnboundedReceiver<(InternedString, watch::Receiver<Progress>)>,
-    ),
+    overall: watch::Sender<Progress>,
+    phases: watch::Sender<InOMap<InternedString, watch::Receiver<Progress>>>,
 }
 impl FullProgressTracker {
     pub fn new() -> Self {
-        let (overall, overall_recv) = watch::channel(Progress::new());
-        Self {
-            overall: Arc::new(overall),
-            overall_recv,
-            phases: InOMap::new(),
-            new_phase: mpsc::unbounded_channel(),
-        }
+        let (overall, _) = watch::channel(Progress::new());
+        let (phases, _) = watch::channel(InOMap::new());
+        Self { overall, phases }
     }
-    fn fill_phases(&mut self) -> bool {
-        let mut changed = false;
-        while let Ok((name, phase)) = self.new_phase.1.try_recv() {
-            self.phases.insert(name, phase);
-            changed = true;
-        }
-        changed
-    }
-    pub fn snapshot(&mut self) -> FullProgress {
-        self.fill_phases();
+    pub fn snapshot(&self) -> FullProgress {
         FullProgress {
             overall: *self.overall.borrow(),
             phases: self
                 .phases
+                .borrow()
                 .iter()
                 .map(|(name, progress)| NamedProgress {
                     name: name.clone(),
@@ -209,28 +195,75 @@ impl FullProgressTracker {
                 .collect(),
         }
     }
-    pub async fn changed(&mut self) {
-        if self.fill_phases() {
-            return;
-        }
-        let phases = self
-            .phases
-            .iter_mut()
-            .map(|(_, p)| Box::pin(p.changed()))
-            .collect_vec();
-        tokio::select! {
-            _ = self.overall_recv.changed() => (),
-            _ = futures::future::select_all(phases) => (),
-        }
-    }
-    pub fn handle(&self) -> FullProgressTrackerHandle {
-        FullProgressTrackerHandle {
-            overall: self.overall.clone(),
-            new_phase: self.new_phase.0.clone(),
+    pub fn stream(&self, min_interval: Option<Duration>) -> BoxStream<'static, FullProgress> {
+        struct StreamState {
+            overall: watch::Receiver<Progress>,
+            phases_recv: watch::Receiver<InOMap<InternedString, watch::Receiver<Progress>>>,
+            phases: InOMap<InternedString, watch::Receiver<Progress>>,
         }
+        let mut overall = self.overall.subscribe();
+        overall.mark_changed(); // make sure stream starts with a value
+        let phases_recv = self.phases.subscribe();
+        let phases = phases_recv.borrow().clone();
+        let state = StreamState {
+            overall,
+            phases_recv,
+            phases,
+        };
+        futures::stream::unfold(
+            state,
+            move |StreamState {
+                      mut overall,
+                      mut phases_recv,
+                      mut phases,
+                  }| async move {
+                let changed = phases
+                    .iter_mut()
+                    .map(|(_, p)| async move { p.changed().or_else(|_| pending()).await }.boxed())
+                    .chain([overall.changed().boxed()])
+                    .chain([phases_recv.changed().boxed()])
+                    .map(|fut| fut.map(|r| r.unwrap_or_default()))
+                    .collect_vec();
+                if let Some(min_interval) = min_interval {
+                    tokio::join!(
+                        tokio::time::sleep(min_interval),
+                        futures::future::select_all(changed),
+                    );
+                } else {
+                    futures::future::select_all(changed).await;
+                }
+
+                for (name, phase) in &*phases_recv.borrow_and_update() {
+                    if !phases.contains_key(name) {
+                        phases.insert(name.clone(), phase.clone());
+                    }
+                }
+
+                let o = *overall.borrow_and_update();
+
+                Some((
+                    FullProgress {
+                        overall: o,
+                        phases: phases
+                            .iter_mut()
+                            .map(|(name, progress)| NamedProgress {
+                                name: name.clone(),
+                                progress: *progress.borrow_and_update(),
+                            })
+                            .collect(),
+                    },
+                    StreamState {
+                        overall,
+                        phases_recv,
+                        phases,
+                    },
+                ))
+            },
+        )
+        .boxed()
     }
     pub fn sync_to_db<DerefFn>(
-        mut self,
+        &self,
         db: TypedPatchDb<Database>,
         deref: DerefFn,
         min_interval: Option<Duration>,
@@ -239,9 +272,9 @@ impl FullProgressTracker {
         DerefFn: Fn(&mut DatabaseModel) -> Option<&mut Model<FullProgress>> + 'static,
         for<'a> &'a DerefFn: UnwindSafe + Send,
     {
+        let mut stream = self.stream(min_interval);
         async move {
-            loop {
-                let progress = self.snapshot();
+            while let Some(progress) = stream.next().await {
                 if db
                     .mutate(|v| {
                         if let Some(p) = deref(v) {
@@ -255,25 +288,23 @@ impl FullProgressTracker {
                 {
                     break;
                 }
-                tokio::join!(self.changed(), async {
-                    if let Some(interval) = min_interval {
-                        tokio::time::sleep(interval).await
-                    } else {
-                        futures::future::ready(()).await
-                    }
-                });
             }
             Ok(())
         }
     }
-}
-
-#[derive(Clone)]
-pub struct FullProgressTrackerHandle {
-    overall: Arc<watch::Sender<Progress>>,
-    new_phase: mpsc::UnboundedSender<(InternedString, watch::Receiver<Progress>)>,
-}
-impl FullProgressTrackerHandle {
+    pub fn progress_bar_task(&self, name: &str) -> NonDetachingJoinHandle<()> {
+        let mut stream = self.stream(None);
+        let mut bar = PhasedProgressBar::new(name);
+        tokio::spawn(async move {
+            while let Some(progress) = stream.next().await {
+                bar.update(&progress);
+                if progress.overall.is_complete() {
+                    break;
+                }
+            }
+        })
+        .into()
+    }
     pub fn add_phase(
         &self,
         name: InternedString,
@@ -284,7 +315,9 @@ impl FullProgressTrackerHandle {
                 .send_modify(|o| o.add_total(overall_contribution));
         }
         let (send, recv) = watch::channel(Progress::new());
-        let _ = self.new_phase.send((name, recv));
+        self.phases.send_modify(|p| {
+            p.insert(name, recv);
+        });
         PhaseProgressTrackerHandle {
             overall: self.overall.clone(),
             overall_contribution,
@@ -298,7 +331,7 @@ impl FullProgressTrackerHandle {
 }
 
 pub struct PhaseProgressTrackerHandle {
-    overall: Arc<watch::Sender<Progress>>,
+    overall: watch::Sender<Progress>,
     overall_contribution: Option<u64>,
     contributed: u64,
     progress: watch::Sender<Progress>,
diff --git a/core/startos/src/registry/context.rs b/core/startos/src/registry/context.rs
index 99d60307b..e5beabca7 100644
--- a/core/startos/src/registry/context.rs
+++ b/core/startos/src/registry/context.rs
@@ -169,7 +169,8 @@ impl CallRemote<RegistryContext> for CliContext {
                     &AnySigningKey::Ed25519(self.developer_key()?.clone()),
                     &body,
                     &host,
-                )?.to_header(),
+                )?
+                .to_header(),
             )
             .body(body)
             .send()
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index 656edf337..9a53d6338 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -70,7 +70,7 @@ pub fn registry_api<C: Context>() -> ParentHandler<C> {
         .subcommand("db", db::db_api::<C>())
 }
 
-pub fn registry_server_router(ctx: RegistryContext) -> Router {
+pub fn registry_router(ctx: RegistryContext) -> Router {
     use axum::extract as x;
     use axum::routing::{any, get, post};
     Router::new()
@@ -128,7 +128,7 @@ pub fn registry_server_router(ctx: RegistryContext) -> Router {
 }
 
 impl WebServer {
-    pub fn registry(bind: SocketAddr, ctx: RegistryContext) -> Self {
-        Self::new(bind, registry_server_router(ctx))
+    pub fn serve_registry(&mut self, ctx: RegistryContext) {
+        self.serve_router(registry_router(ctx))
     }
 }
diff --git a/core/startos/src/registry/os/asset/add.rs b/core/startos/src/registry/os/asset/add.rs
index 6ca495547..33f5ef90f 100644
--- a/core/startos/src/registry/os/asset/add.rs
+++ b/core/startos/src/registry/os/asset/add.rs
@@ -186,29 +186,16 @@ pub async fn cli_add_asset(
 
     let file = MultiCursorFile::from(tokio::fs::File::open(&path).await?);
 
-    let mut progress = FullProgressTracker::new();
-    let progress_handle = progress.handle();
-    let mut sign_phase =
-        progress_handle.add_phase(InternedString::intern("Signing File"), Some(10));
-    let mut verify_phase =
-        progress_handle.add_phase(InternedString::intern("Verifying URL"), Some(100));
-    let mut index_phase = progress_handle.add_phase(
+    let progress = FullProgressTracker::new();
+    let mut sign_phase = progress.add_phase(InternedString::intern("Signing File"), Some(10));
+    let mut verify_phase = progress.add_phase(InternedString::intern("Verifying URL"), Some(100));
+    let mut index_phase = progress.add_phase(
         InternedString::intern("Adding File to Registry Index"),
         Some(1),
     );
 
-    let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
-        let mut bar = PhasedProgressBar::new(&format!("Adding {} to registry...", path.display()));
-        loop {
-            let snap = progress.snapshot();
-            bar.update(&snap);
-            if snap.overall.is_complete() {
-                break;
-            }
-            progress.changed().await
-        }
-    })
-    .into();
+    let progress_task =
+        progress.progress_bar_task(&format!("Adding {} to registry...", path.display()));
 
     sign_phase.start();
     let blake3 = file.blake3_mmap().await?;
@@ -252,7 +239,7 @@ pub async fn cli_add_asset(
     .await?;
     index_phase.complete();
 
-    progress_handle.complete();
+    progress.complete();
 
     progress_task.await.with_kind(ErrorKind::Unknown)?;
 
diff --git a/core/startos/src/registry/os/asset/get.rs b/core/startos/src/registry/os/asset/get.rs
index e099a50cf..29ff24da6 100644
--- a/core/startos/src/registry/os/asset/get.rs
+++ b/core/startos/src/registry/os/asset/get.rs
@@ -3,7 +3,7 @@ use std::panic::UnwindSafe;
 use std::path::{Path, PathBuf};
 
 use clap::Parser;
-use helpers::{AtomicFile, NonDetachingJoinHandle};
+use helpers::AtomicFile;
 use imbl_value::{json, InternedString};
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
@@ -12,7 +12,7 @@ use ts_rs::TS;
 
 use crate::context::CliContext;
 use crate::prelude::*;
-use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::progress::FullProgressTracker;
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
@@ -135,29 +135,17 @@ async fn cli_get_os_asset(
             .await
             .with_kind(ErrorKind::Filesystem)?;
 
-        let mut progress = FullProgressTracker::new();
-        let progress_handle = progress.handle();
+        let progress = FullProgressTracker::new();
         let mut download_phase =
-            progress_handle.add_phase(InternedString::intern("Downloading File"), Some(100));
+            progress.add_phase(InternedString::intern("Downloading File"), Some(100));
         download_phase.set_total(res.commitment.size);
         let reverify_phase = if reverify {
-            Some(progress_handle.add_phase(InternedString::intern("Reverifying File"), Some(10)))
+            Some(progress.add_phase(InternedString::intern("Reverifying File"), Some(10)))
         } else {
             None
         };
 
-        let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
-            let mut bar = PhasedProgressBar::new("Downloading...");
-            loop {
-                let snap = progress.snapshot();
-                bar.update(&snap);
-                if snap.overall.is_complete() {
-                    break;
-                }
-                progress.changed().await
-            }
-        })
-        .into();
+        let progress_task = progress.progress_bar_task("Downloading...");
 
         download_phase.start();
         let mut download_writer = download_phase.writer(&mut *file);
@@ -177,7 +165,7 @@ async fn cli_get_os_asset(
             reverify_phase.complete();
         }
 
-        progress_handle.complete();
+        progress.complete();
 
         progress_task.await.with_kind(ErrorKind::Unknown)?;
     }
diff --git a/core/startos/src/registry/os/asset/sign.rs b/core/startos/src/registry/os/asset/sign.rs
index 0cb657bef..50c583593 100644
--- a/core/startos/src/registry/os/asset/sign.rs
+++ b/core/startos/src/registry/os/asset/sign.rs
@@ -3,7 +3,6 @@ use std::panic::UnwindSafe;
 use std::path::PathBuf;
 
 use clap::Parser;
-use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
@@ -12,7 +11,7 @@ use ts_rs::TS;
 
 use crate::context::CliContext;
 use crate::prelude::*;
-use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::progress::FullProgressTracker;
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
@@ -169,27 +168,15 @@ pub async fn cli_sign_asset(
 
     let file = MultiCursorFile::from(tokio::fs::File::open(&path).await?);
 
-    let mut progress = FullProgressTracker::new();
-    let progress_handle = progress.handle();
-    let mut sign_phase =
-        progress_handle.add_phase(InternedString::intern("Signing File"), Some(10));
-    let mut index_phase = progress_handle.add_phase(
+    let progress = FullProgressTracker::new();
+    let mut sign_phase = progress.add_phase(InternedString::intern("Signing File"), Some(10));
+    let mut index_phase = progress.add_phase(
         InternedString::intern("Adding Signature to Registry Index"),
         Some(1),
     );
 
-    let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
-        let mut bar = PhasedProgressBar::new(&format!("Adding {} to registry...", path.display()));
-        loop {
-            let snap = progress.snapshot();
-            bar.update(&snap);
-            if snap.overall.is_complete() {
-                break;
-            }
-            progress.changed().await
-        }
-    })
-    .into();
+    let progress_task =
+        progress.progress_bar_task(&format!("Adding {} to registry...", path.display()));
 
     sign_phase.start();
     let blake3 = file.blake3_mmap().await?;
@@ -220,7 +207,7 @@ pub async fn cli_sign_asset(
     .await?;
     index_phase.complete();
 
-    progress_handle.complete();
+    progress.complete();
 
     progress_task.await.with_kind(ErrorKind::Unknown)?;
 
diff --git a/core/startos/src/registry/package/add.rs b/core/startos/src/registry/package/add.rs
index d28aeaaa4..9bc772f78 100644
--- a/core/startos/src/registry/package/add.rs
+++ b/core/startos/src/registry/package/add.rs
@@ -2,7 +2,6 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use clap::Parser;
-use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::HandlerArgs;
@@ -12,7 +11,7 @@ use url::Url;
 
 use crate::context::CliContext;
 use crate::prelude::*;
-use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::progress::FullProgressTracker;
 use crate::registry::context::RegistryContext;
 use crate::registry::package::index::PackageVersionInfo;
 use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
@@ -110,28 +109,16 @@ pub async fn cli_add_package(
 ) -> Result<(), Error> {
     let s9pk = S9pk::open(&file, None).await?;
 
-    let mut progress = FullProgressTracker::new();
-    let progress_handle = progress.handle();
-    let mut sign_phase = progress_handle.add_phase(InternedString::intern("Signing File"), Some(1));
-    let mut verify_phase =
-        progress_handle.add_phase(InternedString::intern("Verifying URL"), Some(100));
-    let mut index_phase = progress_handle.add_phase(
+    let progress = FullProgressTracker::new();
+    let mut sign_phase = progress.add_phase(InternedString::intern("Signing File"), Some(1));
+    let mut verify_phase = progress.add_phase(InternedString::intern("Verifying URL"), Some(100));
+    let mut index_phase = progress.add_phase(
         InternedString::intern("Adding File to Registry Index"),
         Some(1),
     );
 
-    let progress_task: NonDetachingJoinHandle<()> = tokio::spawn(async move {
-        let mut bar = PhasedProgressBar::new(&format!("Adding {} to registry...", file.display()));
-        loop {
-            let snap = progress.snapshot();
-            bar.update(&snap);
-            if snap.overall.is_complete() {
-                break;
-            }
-            progress.changed().await
-        }
-    })
-    .into();
+    let progress_task =
+        progress.progress_bar_task(&format!("Adding {} to registry...", file.display()));
 
     sign_phase.start();
     let commitment = s9pk.as_archive().commitment().await?;
@@ -160,7 +147,7 @@ pub async fn cli_add_package(
     .await?;
     index_phase.complete();
 
-    progress_handle.complete();
+    progress.complete();
 
     progress_task.await.with_kind(ErrorKind::Unknown)?;
 
diff --git a/core/startos/src/registry/signer/commitment/request.rs b/core/startos/src/registry/signer/commitment/request.rs
index 62d59163f..ce60b7f88 100644
--- a/core/startos/src/registry/signer/commitment/request.rs
+++ b/core/startos/src/registry/signer/commitment/request.rs
@@ -1,5 +1,5 @@
-use std::time::{SystemTime, UNIX_EPOCH};
 use std::collections::BTreeMap;
+use std::time::{SystemTime, UNIX_EPOCH};
 
 use axum::body::Body;
 use axum::extract::Request;
diff --git a/core/startos/src/rpc_continuations.rs b/core/startos/src/rpc_continuations.rs
index e6b823ef9..043130b69 100644
--- a/core/startos/src/rpc_continuations.rs
+++ b/core/startos/src/rpc_continuations.rs
@@ -1,5 +1,8 @@
 use std::collections::BTreeMap;
+use std::pin::Pin;
 use std::str::FromStr;
+use std::sync::Mutex as SyncMutex;
+use std::task::{Context, Poll};
 use std::time::Duration;
 
 use axum::extract::ws::WebSocket;
@@ -7,9 +10,10 @@ use axum::extract::Request;
 use axum::response::Response;
 use clap::builder::ValueParserFactory;
 use futures::future::BoxFuture;
+use futures::{Future, FutureExt};
 use helpers::TimedResource;
 use imbl_value::InternedString;
-use tokio::sync::Mutex;
+use tokio::sync::{broadcast, Mutex as AsyncMutex};
 use ts_rs::TS;
 
 #[allow(unused_imports)]
@@ -73,21 +77,103 @@ impl std::fmt::Display for Guid {
     }
 }
 
-pub type RestHandler =
-    Box<dyn FnOnce(Request) -> BoxFuture<'static, Result<Response, crate::Error>> + Send>;
+pub struct RestFuture {
+    kill: Option<broadcast::Receiver<()>>,
+    fut: BoxFuture<'static, Result<Response, Error>>,
+}
+impl Future for RestFuture {
+    type Output = Result<Response, Error>;
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        if self.kill.as_ref().map_or(false, |k| !k.is_empty()) {
+            Poll::Ready(Err(Error::new(
+                eyre!("session killed"),
+                ErrorKind::Authorization,
+            )))
+        } else {
+            self.fut.poll_unpin(cx)
+        }
+    }
+}
+pub type RestHandler = Box<dyn FnOnce(Request) -> RestFuture + Send>;
 
-pub type WebSocketHandler = Box<dyn FnOnce(WebSocket) -> BoxFuture<'static, ()> + Send>;
+pub struct WebSocketFuture {
+    kill: Option<broadcast::Receiver<()>>,
+    fut: BoxFuture<'static, ()>,
+}
+impl Future for WebSocketFuture {
+    type Output = ();
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        if self.kill.as_ref().map_or(false, |k| !k.is_empty()) {
+            Poll::Ready(())
+        } else {
+            self.fut.poll_unpin(cx)
+        }
+    }
+}
+pub type WebSocketHandler = Box<dyn FnOnce(WebSocket) -> WebSocketFuture + Send>;
 
 pub enum RpcContinuation {
     Rest(TimedResource<RestHandler>),
     WebSocket(TimedResource<WebSocketHandler>),
 }
 impl RpcContinuation {
-    pub fn rest(handler: RestHandler, timeout: Duration) -> Self {
-        RpcContinuation::Rest(TimedResource::new(handler, timeout))
+    pub fn rest<F, Fut>(handler: F, timeout: Duration) -> Self
+    where
+        F: FnOnce(Request) -> Fut + Send + 'static,
+        Fut: Future<Output = Result<Response, Error>> + Send + 'static,
+    {
+        RpcContinuation::Rest(TimedResource::new(
+            Box::new(|req| RestFuture {
+                kill: None,
+                fut: handler(req).boxed(),
+            }),
+            timeout,
+        ))
+    }
+    pub fn ws<F, Fut>(handler: F, timeout: Duration) -> Self
+    where
+        F: FnOnce(WebSocket) -> Fut + Send + 'static,
+        Fut: Future<Output = ()> + Send + 'static,
+    {
+        RpcContinuation::WebSocket(TimedResource::new(
+            Box::new(|ws| WebSocketFuture {
+                kill: None,
+                fut: handler(ws).boxed(),
+            }),
+            timeout,
+        ))
     }
-    pub fn ws(handler: WebSocketHandler, timeout: Duration) -> Self {
-        RpcContinuation::WebSocket(TimedResource::new(handler, timeout))
+    pub fn rest_authed<Ctx, T, F, Fut>(ctx: Ctx, session: T, handler: F, timeout: Duration) -> Self
+    where
+        Ctx: AsRef<OpenAuthedContinuations<T>>,
+        T: Eq + Ord,
+        F: FnOnce(Request) -> Fut + Send + 'static,
+        Fut: Future<Output = Result<Response, Error>> + Send + 'static,
+    {
+        let kill = Some(ctx.as_ref().subscribe_to_kill(session));
+        RpcContinuation::Rest(TimedResource::new(
+            Box::new(|req| RestFuture {
+                kill,
+                fut: handler(req).boxed(),
+            }),
+            timeout,
+        ))
+    }
+    pub fn ws_authed<Ctx, T, F, Fut>(ctx: Ctx, session: T, handler: F, timeout: Duration) -> Self
+    where
+        Ctx: AsRef<OpenAuthedContinuations<T>>,
+        T: Eq + Ord,
+        F: FnOnce(WebSocket) -> Fut + Send + 'static,
+        Fut: Future<Output = ()> + Send + 'static,
+    {
+        let kill = Some(ctx.as_ref().subscribe_to_kill(session));
+        RpcContinuation::WebSocket(TimedResource::new(
+            Box::new(|ws| WebSocketFuture {
+                kill,
+                fut: handler(ws).boxed(),
+            }),
+            timeout,
+        ))
     }
     pub fn is_timed_out(&self) -> bool {
         match self {
@@ -97,10 +183,10 @@ impl RpcContinuation {
     }
 }
 
-pub struct RpcContinuations(Mutex<BTreeMap<Guid, RpcContinuation>>);
+pub struct RpcContinuations(AsyncMutex<BTreeMap<Guid, RpcContinuation>>);
 impl RpcContinuations {
     pub fn new() -> Self {
-        RpcContinuations(Mutex::new(BTreeMap::new()))
+        RpcContinuations(AsyncMutex::new(BTreeMap::new()))
     }
 
     #[instrument(skip_all)]
@@ -146,3 +232,28 @@ impl RpcContinuations {
         x.get().await
     }
 }
+
+pub struct OpenAuthedContinuations<Key: Eq + Ord>(SyncMutex<BTreeMap<Key, broadcast::Sender<()>>>);
+impl<T> OpenAuthedContinuations<T>
+where
+    T: Eq + Ord,
+{
+    pub fn new() -> Self {
+        Self(SyncMutex::new(BTreeMap::new()))
+    }
+    pub fn kill(&self, session: &T) {
+        if let Some(channel) = self.0.lock().unwrap().remove(session) {
+            channel.send(()).ok();
+        }
+    }
+    fn subscribe_to_kill(&self, session: T) -> broadcast::Receiver<()> {
+        let mut map = self.0.lock().unwrap();
+        if let Some(send) = map.get(&session) {
+            send.subscribe()
+        } else {
+            let (send, recv) = broadcast::channel(1);
+            map.insert(session, send);
+            recv
+        }
+    }
+}
diff --git a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
index 92eb40f9d..4b7d5736d 100644
--- a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
@@ -97,6 +97,7 @@ impl ArchiveSource for MultiCursorFile {
             .ok()
             .map(|m| m.len())
     }
+    #[allow(refining_impl_trait)]
     async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send + 'static, Error> {
         use tokio::io::AsyncSeekExt;
 
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 6588de836..2eecc565e 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -354,7 +354,7 @@ impl Service {
             .with_kind(ErrorKind::MigrationFailed)?; // TODO: handle cancellation
         if let Some(mut progress) = progress {
             progress.finalization_progress.complete();
-            progress.progress_handle.complete();
+            progress.progress.complete();
             tokio::task::yield_now().await;
         }
         ctx.db
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 1474ea35e..f8874d21a 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -18,10 +18,7 @@ use crate::disk::mount::guard::GenericMountGuard;
 use crate::install::PKG_ARCHIVE_DIR;
 use crate::notifications::{notify, NotificationLevel};
 use crate::prelude::*;
-use crate::progress::{
-    FullProgressTracker, FullProgressTrackerHandle, PhaseProgressTrackerHandle,
-    ProgressTrackerWriter,
-};
+use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle, ProgressTrackerWriter};
 use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
@@ -34,7 +31,7 @@ pub type InstallFuture = BoxFuture<'static, Result<(), Error>>;
 
 pub struct InstallProgressHandles {
     pub finalization_progress: PhaseProgressTrackerHandle,
-    pub progress_handle: FullProgressTrackerHandle,
+    pub progress: FullProgressTracker,
 }
 
 /// This is the structure to contain all the services
@@ -59,13 +56,22 @@ impl ServiceMap {
     }
 
     #[instrument(skip_all)]
-    pub async fn init(&self, ctx: &RpcContext) -> Result<(), Error> {
-        for id in ctx.db.peek().await.as_public().as_package_data().keys()? {
+    pub async fn init(
+        &self,
+        ctx: &RpcContext,
+        mut progress: PhaseProgressTrackerHandle,
+    ) -> Result<(), Error> {
+        progress.start();
+        let ids = ctx.db.peek().await.as_public().as_package_data().keys()?;
+        progress.set_total(ids.len() as u64);
+        for id in ids {
             if let Err(e) = self.load(ctx, &id, LoadDisposition::Retry).await {
                 tracing::error!("Error loading installed package as service: {e}");
                 tracing::debug!("{e:?}");
             }
+            progress += 1;
         }
+        progress.complete();
         Ok(())
     }
 
@@ -112,17 +118,16 @@ impl ServiceMap {
         };
 
         let size = s9pk.size();
-        let mut progress = FullProgressTracker::new();
+        let progress = FullProgressTracker::new();
         let download_progress_contribution = size.unwrap_or(60);
-        let progress_handle = progress.handle();
-        let mut download_progress = progress_handle.add_phase(
+        let mut download_progress = progress.add_phase(
             InternedString::intern("Download"),
             Some(download_progress_contribution),
         );
         if let Some(size) = size {
             download_progress.set_total(size);
         }
-        let mut finalization_progress = progress_handle.add_phase(
+        let mut finalization_progress = progress.add_phase(
             InternedString::intern(op_name),
             Some(download_progress_contribution / 2),
         );
@@ -194,7 +199,7 @@ impl ServiceMap {
 
                     let deref_id = id.clone();
                     let sync_progress_task =
-                        NonDetachingJoinHandle::from(tokio::spawn(progress.sync_to_db(
+                        NonDetachingJoinHandle::from(tokio::spawn(progress.clone().sync_to_db(
                             ctx.db.clone(),
                             move |v| {
                                 v.as_public_mut()
@@ -248,7 +253,7 @@ impl ServiceMap {
                         service
                             .uninstall(Some(s9pk.as_manifest().version.clone()))
                             .await?;
-                        progress_handle.complete();
+                        progress.complete();
                         Some(version)
                     } else {
                         None
@@ -261,7 +266,7 @@ impl ServiceMap {
                                 recovery_source,
                                 Some(InstallProgressHandles {
                                     finalization_progress,
-                                    progress_handle,
+                                    progress,
                                 }),
                             )
                             .await?
@@ -275,7 +280,7 @@ impl ServiceMap {
                                 prev,
                                 Some(InstallProgressHandles {
                                     finalization_progress,
-                                    progress_handle,
+                                    progress,
                                 }),
                             )
                             .await?
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index a035e932f..2b701c01f 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -4,7 +4,6 @@ use std::time::Duration;
 
 use color_eyre::eyre::eyre;
 use josekit::jwk::Jwk;
-use openssl::x509::X509;
 use patch_db::json_ptr::ROOT;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
@@ -12,15 +11,15 @@ use serde::{Deserialize, Serialize};
 use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
 use tokio::try_join;
-use torut::onion::OnionAddressV3;
 use tracing::instrument;
 use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::backup::restore::recover_full_embassy;
 use crate::backup::target::BackupTargetFS;
+use crate::context::rpc::InitRpcContextPhases;
 use crate::context::setup::SetupResult;
-use crate::context::SetupContext;
+use crate::context::{RpcContext, SetupContext};
 use crate::db::model::Database;
 use crate::disk::fsck::RepairStrategy;
 use crate::disk::main::DEFAULT_PASSWORD;
@@ -29,10 +28,12 @@ use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
 use crate::disk::util::{pvscan, recovery_info, DiskInfo, EmbassyOsRecoveryInfo};
 use crate::disk::REPAIR_DISK_PATH;
-use crate::hostname::Hostname;
-use crate::init::{init, InitResult};
+use crate::init::{init, InitPhases, InitResult};
+use crate::net::net_controller::PreInitNetController;
 use crate::net::ssl::root_ca_start_time;
 use crate::prelude::*;
+use crate::progress::{FullProgress, PhaseProgressTrackerHandle};
+use crate::rpc_continuations::Guid;
 use crate::util::crypto::EncryptedWire;
 use crate::util::io::{dir_copy, dir_size, Counter};
 use crate::{Error, ErrorKind, ResultExt};
@@ -75,10 +76,12 @@ pub async fn list_disks(ctx: SetupContext) -> Result<Vec<DiskInfo>, Error> {
 async fn setup_init(
     ctx: &SetupContext,
     password: Option<String>,
-) -> Result<(Hostname, OnionAddressV3, X509), Error> {
-    let InitResult { db } = init(&ctx.config).await?;
+    init_phases: InitPhases,
+) -> Result<(AccountInfo, PreInitNetController), Error> {
+    let InitResult { net_ctrl } = init(&ctx.config, init_phases).await?;
 
-    let account = db
+    let account = net_ctrl
+        .db
         .mutate(|m| {
             let mut account = AccountInfo::load(m)?;
             if let Some(password) = password {
@@ -93,15 +96,12 @@ async fn setup_init(
         })
         .await?;
 
-    Ok((
-        account.hostname,
-        account.tor_key.public().get_onion_address(),
-        account.root_ca_cert,
-    ))
+    Ok((account, net_ctrl))
 }
 
 #[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct AttachParams {
     #[serde(rename = "startOsPassword")]
     password: Option<EncryptedWire>,
@@ -110,25 +110,20 @@ pub struct AttachParams {
 
 pub async fn attach(
     ctx: SetupContext,
-    AttachParams { password, guid }: AttachParams,
-) -> Result<(), Error> {
-    let mut status = ctx.setup_status.write().await;
-    if status.is_some() {
-        return Err(Error::new(
-            eyre!("Setup already in progress"),
-            ErrorKind::InvalidRequest,
-        ));
-    }
-    *status = Some(Ok(SetupStatus {
-        bytes_transferred: 0,
-        total_bytes: None,
-        complete: false,
-    }));
-    drop(status);
-    tokio::task::spawn(async move {
-        if let Err(e) = async {
+    AttachParams {
+        password,
+        guid: disk_guid,
+    }: AttachParams,
+) -> Result<SetupProgress, Error> {
+    let setup_ctx = ctx.clone();
+    ctx.run_setup(|| async move {
+            let progress = &setup_ctx.progress;
+            let mut disk_phase = progress.add_phase("Opening data drive".into(), Some(10));
+            let init_phases = InitPhases::new(&progress);
+            let rpc_ctx_phases = InitRpcContextPhases::new(&progress);
+
             let password: Option<String> = match password {
-                Some(a) => match a.decrypt(&*ctx) {
+                Some(a) => match a.decrypt(&setup_ctx) {
                     a @ Some(_) => a,
                     None => {
                         return Err(Error::new(
@@ -139,15 +134,17 @@ pub async fn attach(
                 },
                 None => None,
             };
+
+            disk_phase.start();
             let requires_reboot = crate::disk::main::import(
-                &*guid,
-                &ctx.datadir,
+                &*disk_guid,
+                &setup_ctx.datadir,
                 if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
                     RepairStrategy::Aggressive
                 } else {
                     RepairStrategy::Preen
                 },
-                if guid.ends_with("_UNENC") { None } else { Some(DEFAULT_PASSWORD) },
+                if disk_guid.ends_with("_UNENC") { None } else { Some(DEFAULT_PASSWORD) },
             )
             .await?;
             if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
@@ -156,7 +153,7 @@ pub async fn attach(
                     .with_ctx(|_| (ErrorKind::Filesystem, REPAIR_DISK_PATH))?;
             }
             if requires_reboot.0 {
-                crate::disk::main::export(&*guid, &ctx.datadir).await?;
+                crate::disk::main::export(&*disk_guid, &setup_ctx.datadir).await?;
                 return Err(Error::new(
                     eyre!(
                         "Errors were corrected with your disk, but the server must be restarted in order to proceed"
@@ -164,37 +161,48 @@ pub async fn attach(
                     ErrorKind::DiskManagement,
                 ));
             }
-            let (hostname, tor_addr, root_ca) = setup_init(&ctx, password).await?;
-            *ctx.setup_result.write().await = Some((guid, SetupResult {
-                tor_address: format!("https://{}", tor_addr),
-                lan_address: hostname.lan_address(),
-                root_ca: String::from_utf8(root_ca.to_pem()?)?,
-            }));
-            *ctx.setup_status.write().await = Some(Ok(SetupStatus {
-                bytes_transferred: 0,
-                total_bytes: None,
-                complete: true,
-            }));
-            Ok(())
-        }.await {
-            tracing::error!("Error Setting Up Embassy: {}", e);
-            tracing::debug!("{:?}", e);
-            *ctx.setup_status.write().await = Some(Err(e.into()));
-        }
-    });
-    Ok(())
+            disk_phase.complete();
+
+            let (account, net_ctrl) = setup_init(&setup_ctx, password, init_phases).await?;
+
+            let rpc_ctx = RpcContext::init(&setup_ctx.config, disk_guid, Some(net_ctrl), rpc_ctx_phases).await?;
+
+            Ok(((&account).try_into()?, rpc_ctx))
+        })?;
+
+    Ok(ctx.progress().await)
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+#[serde(tag = "status")]
+pub enum SetupStatusRes {
+    Complete(SetupResult),
+    Running(SetupProgress),
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-pub struct SetupStatus {
-    pub bytes_transferred: u64,
-    pub total_bytes: Option<u64>,
-    pub complete: bool,
+#[ts(export)]
+pub struct SetupProgress {
+    pub progress: FullProgress,
+    pub guid: Guid,
 }
 
-pub async fn status(ctx: SetupContext) -> Result<Option<SetupStatus>, RpcError> {
-    ctx.setup_status.read().await.clone().transpose()
+pub async fn status(ctx: SetupContext) -> Result<Option<SetupStatusRes>, Error> {
+    if let Some(res) = ctx.result.get() {
+        match res {
+            Ok((res, _)) => Ok(Some(SetupStatusRes::Complete(res.clone()))),
+            Err(e) => Err(e.clone_output()),
+        }
+    } else {
+        if ctx.task.initialized() {
+            Ok(Some(SetupStatusRes::Running(ctx.progress().await)))
+        } else {
+            Ok(None)
+        }
+    }
 }
 
 /// We want to be able to get a secret, a shared private key with the frontend
@@ -202,7 +210,7 @@ pub async fn status(ctx: SetupContext) -> Result<Option<SetupStatus>, RpcError>
 /// without knowing the password over clearnet. We use the public key shared across the network
 /// since it is fine to share the public, and encrypt against the public.
 pub async fn get_pubkey(ctx: SetupContext) -> Result<Jwk, RpcError> {
-    let secret = ctx.as_ref().clone();
+    let secret = AsRef::<Jwk>::as_ref(&ctx).clone();
     let pub_key = secret.to_public_key()?;
     Ok(pub_key)
 }
@@ -213,6 +221,7 @@ pub fn cifs<C: Context>() -> ParentHandler<C> {
 
 #[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct VerifyCifsParams {
     hostname: String,
     path: PathBuf,
@@ -230,7 +239,7 @@ pub async fn verify_cifs(
         password,
     }: VerifyCifsParams,
 ) -> Result<EmbassyOsRecoveryInfo, Error> {
-    let password: Option<String> = password.map(|x| x.decrypt(&*ctx)).flatten();
+    let password: Option<String> = password.map(|x| x.decrypt(&ctx)).flatten();
     let guard = TmpMountGuard::mount(
         &Cifs {
             hostname,
@@ -256,7 +265,8 @@ pub enum RecoverySource {
 
 #[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-pub struct ExecuteParams {
+#[ts(export)]
+pub struct SetupExecuteParams {
     start_os_logicalname: PathBuf,
     start_os_password: EncryptedWire,
     recovery_source: Option<RecoverySource>,
@@ -266,104 +276,65 @@ pub struct ExecuteParams {
 // #[command(rpc_only)]
 pub async fn execute(
     ctx: SetupContext,
-    ExecuteParams {
+    SetupExecuteParams {
         start_os_logicalname,
         start_os_password,
         recovery_source,
         recovery_password,
-    }: ExecuteParams,
-) -> Result<(), Error> {
-    let start_os_password = match start_os_password.decrypt(&*ctx) {
+    }: SetupExecuteParams,
+) -> Result<SetupProgress, Error> {
+    let start_os_password = match start_os_password.decrypt(&ctx) {
         Some(a) => a,
         None => {
             return Err(Error::new(
-                color_eyre::eyre::eyre!("Couldn't decode embassy-password"),
+                color_eyre::eyre::eyre!("Couldn't decode startOsPassword"),
                 crate::ErrorKind::Unknown,
             ))
         }
     };
     let recovery_password: Option<String> = match recovery_password {
-        Some(a) => match a.decrypt(&*ctx) {
+        Some(a) => match a.decrypt(&ctx) {
             Some(a) => Some(a),
             None => {
                 return Err(Error::new(
-                    color_eyre::eyre::eyre!("Couldn't decode recovery-password"),
+                    color_eyre::eyre::eyre!("Couldn't decode recoveryPassword"),
                     crate::ErrorKind::Unknown,
                 ))
             }
         },
         None => None,
     };
-    let mut status = ctx.setup_status.write().await;
-    if status.is_some() {
-        return Err(Error::new(
-            eyre!("Setup already in progress"),
-            ErrorKind::InvalidRequest,
-        ));
-    }
-    *status = Some(Ok(SetupStatus {
-        bytes_transferred: 0,
-        total_bytes: None,
-        complete: false,
-    }));
-    drop(status);
-    tokio::task::spawn({
-        async move {
-            let ctx = ctx.clone();
-            match execute_inner(
-                ctx.clone(),
-                start_os_logicalname,
-                start_os_password,
-                recovery_source,
-                recovery_password,
-            )
-            .await
-            {
-                Ok((guid, hostname, tor_addr, root_ca)) => {
-                    tracing::info!("Setup Complete!");
-                    *ctx.setup_result.write().await = Some((
-                        guid,
-                        SetupResult {
-                            tor_address: format!("https://{}", tor_addr),
-                            lan_address: hostname.lan_address(),
-                            root_ca: String::from_utf8(
-                                root_ca.to_pem().expect("failed to serialize root ca"),
-                            )
-                            .expect("invalid pem string"),
-                        },
-                    ));
-                    *ctx.setup_status.write().await = Some(Ok(SetupStatus {
-                        bytes_transferred: 0,
-                        total_bytes: None,
-                        complete: true,
-                    }));
-                }
-                Err(e) => {
-                    tracing::error!("Error Setting Up Server: {}", e);
-                    tracing::debug!("{:?}", e);
-                    *ctx.setup_status.write().await = Some(Err(e.into()));
-                }
-            }
-        }
-    });
-    Ok(())
+
+    let setup_ctx = ctx.clone();
+    ctx.run_setup(|| {
+        execute_inner(
+            setup_ctx,
+            start_os_logicalname,
+            start_os_password,
+            recovery_source,
+            recovery_password,
+        )
+    })?;
+
+    Ok(ctx.progress().await)
 }
 
 #[instrument(skip_all)]
 // #[command(rpc_only)]
 pub async fn complete(ctx: SetupContext) -> Result<SetupResult, Error> {
-    let (guid, setup_result) = if let Some((guid, setup_result)) = &*ctx.setup_result.read().await {
-        (guid.clone(), setup_result.clone())
-    } else {
-        return Err(Error::new(
+    match ctx.result.get() {
+        Some(Ok((res, ctx))) => {
+            let mut guid_file = File::create("/media/startos/config/disk.guid").await?;
+            guid_file.write_all(ctx.disk_guid.as_bytes()).await?;
+            guid_file.sync_all().await?;
+            Ok(res.clone())
+        }
+        Some(Err(e)) => Err(e.clone_output()),
+        None => Err(Error::new(
             eyre!("setup.execute has not completed successfully"),
             crate::ErrorKind::InvalidRequest,
-        ));
-    };
-    let mut guid_file = File::create("/media/startos/config/disk.guid").await?;
-    guid_file.write_all(guid.as_bytes()).await?;
-    guid_file.sync_all().await?;
-    Ok(setup_result)
+        )),
+    }
 }
 
 #[instrument(skip_all)]
@@ -380,7 +351,22 @@ pub async fn execute_inner(
     start_os_password: String,
     recovery_source: Option<RecoverySource>,
     recovery_password: Option<String>,
-) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
+) -> Result<(SetupResult, RpcContext), Error> {
+    let progress = &ctx.progress;
+    let mut disk_phase = progress.add_phase("Formatting data drive".into(), Some(10));
+    let restore_phase = match &recovery_source {
+        Some(RecoverySource::Backup { .. }) => {
+            Some(progress.add_phase("Restoring backup".into(), Some(100)))
+        }
+        Some(RecoverySource::Migrate { .. }) => {
+            Some(progress.add_phase("Transferring data".into(), Some(100)))
+        }
+        None => None,
+    };
+    let init_phases = InitPhases::new(&progress);
+    let rpc_ctx_phases = InitRpcContextPhases::new(&progress);
+
+    disk_phase.start();
     let encryption_password = if ctx.disable_encryption {
         None
     } else {
@@ -402,41 +388,70 @@ pub async fn execute_inner(
         encryption_password,
     )
     .await?;
+    disk_phase.complete();
 
-    if let Some(RecoverySource::Backup { target }) = recovery_source {
-        recover(ctx, guid, start_os_password, target, recovery_password).await
-    } else if let Some(RecoverySource::Migrate { guid: old_guid }) = recovery_source {
-        migrate(ctx, guid, &old_guid, start_os_password).await
-    } else {
-        let (hostname, tor_addr, root_ca) = fresh_setup(&ctx, &start_os_password).await?;
-        Ok((guid, hostname, tor_addr, root_ca))
+    let progress = SetupExecuteProgress {
+        init_phases,
+        restore_phase,
+        rpc_ctx_phases,
+    };
+
+    match recovery_source {
+        Some(RecoverySource::Backup { target }) => {
+            recover(
+                &ctx,
+                guid,
+                start_os_password,
+                target,
+                recovery_password,
+                progress,
+            )
+            .await
+        }
+        Some(RecoverySource::Migrate { guid: old_guid }) => {
+            migrate(&ctx, guid, &old_guid, start_os_password, progress).await
+        }
+        None => fresh_setup(&ctx, guid, &start_os_password, progress).await,
     }
 }
 
+pub struct SetupExecuteProgress {
+    pub init_phases: InitPhases,
+    pub restore_phase: Option<PhaseProgressTrackerHandle>,
+    pub rpc_ctx_phases: InitRpcContextPhases,
+}
+
 async fn fresh_setup(
     ctx: &SetupContext,
+    guid: Arc<String>,
     start_os_password: &str,
-) -> Result<(Hostname, OnionAddressV3, X509), Error> {
+    SetupExecuteProgress {
+        init_phases,
+        rpc_ctx_phases,
+        ..
+    }: SetupExecuteProgress,
+) -> Result<(SetupResult, RpcContext), Error> {
     let account = AccountInfo::new(start_os_password, root_ca_start_time().await?)?;
     let db = ctx.db().await?;
     db.put(&ROOT, &Database::init(&account)?).await?;
     drop(db);
-    init(&ctx.config).await?;
-    Ok((
-        account.hostname,
-        account.tor_key.public().get_onion_address(),
-        account.root_ca_cert,
-    ))
+
+    let InitResult { net_ctrl } = init(&ctx.config, init_phases).await?;
+
+    let rpc_ctx = RpcContext::init(&ctx.config, guid, Some(net_ctrl), rpc_ctx_phases).await?;
+
+    Ok(((&account).try_into()?, rpc_ctx))
 }
 
 #[instrument(skip_all)]
 async fn recover(
-    ctx: SetupContext,
+    ctx: &SetupContext,
     guid: Arc<String>,
     start_os_password: String,
     recovery_source: BackupTargetFS,
     recovery_password: Option<String>,
-) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
+    progress: SetupExecuteProgress,
+) -> Result<(SetupResult, RpcContext), Error> {
     let recovery_source = TmpMountGuard::mount(&recovery_source, ReadWrite).await?;
     recover_full_embassy(
         ctx,
@@ -444,23 +459,26 @@ async fn recover(
         start_os_password,
         recovery_source,
         recovery_password,
+        progress,
     )
     .await
 }
 
 #[instrument(skip_all)]
 async fn migrate(
-    ctx: SetupContext,
+    ctx: &SetupContext,
     guid: Arc<String>,
     old_guid: &str,
     start_os_password: String,
-) -> Result<(Arc<String>, Hostname, OnionAddressV3, X509), Error> {
-    *ctx.setup_status.write().await = Some(Ok(SetupStatus {
-        bytes_transferred: 0,
-        total_bytes: None,
-        complete: false,
-    }));
-
+    SetupExecuteProgress {
+        init_phases,
+        restore_phase,
+        rpc_ctx_phases,
+    }: SetupExecuteProgress,
+) -> Result<(SetupResult, RpcContext), Error> {
+    let mut restore_phase = restore_phase.or_not_found("restore progress")?;
+
+    restore_phase.start();
     let _ = crate::disk::main::import(
         &old_guid,
         "/media/startos/migrate",
@@ -500,20 +518,12 @@ async fn migrate(
         res = async {
             loop {
                 tokio::time::sleep(Duration::from_secs(1)).await;
-                *ctx.setup_status.write().await = Some(Ok(SetupStatus {
-                    bytes_transferred: 0,
-                    total_bytes: Some(main_transfer_size.load() + package_data_transfer_size.load()),
-                    complete: false,
-                }));
+                restore_phase.set_total(main_transfer_size.load() + package_data_transfer_size.load());
             }
         } => res,
     };
 
-    *ctx.setup_status.write().await = Some(Ok(SetupStatus {
-        bytes_transferred: 0,
-        total_bytes: Some(size),
-        complete: false,
-    }));
+    restore_phase.set_total(size);
 
     let main_transfer_progress = Counter::new(0, ordering);
     let package_data_transfer_progress = Counter::new(0, ordering);
@@ -529,18 +539,17 @@ async fn migrate(
         res = async {
             loop {
                 tokio::time::sleep(Duration::from_secs(1)).await;
-                *ctx.setup_status.write().await = Some(Ok(SetupStatus {
-                    bytes_transferred: main_transfer_progress.load() + package_data_transfer_progress.load(),
-                    total_bytes: Some(size),
-                    complete: false,
-                }));
+                restore_phase.set_done(main_transfer_progress.load() + package_data_transfer_progress.load());
             }
         } => res,
     }
 
-    let (hostname, tor_addr, root_ca) = setup_init(&ctx, Some(start_os_password)).await?;
-
     crate::disk::main::export(&old_guid, "/media/startos/migrate").await?;
+    restore_phase.complete();
+
+    let (account, net_ctrl) = setup_init(&ctx, Some(start_os_password), init_phases).await?;
+
+    let rpc_ctx = RpcContext::init(&ctx.config, guid, Some(net_ctrl), rpc_ctx_phases).await?;
 
-    Ok((guid, hostname, tor_addr, root_ca))
+    Ok(((&account).try_into()?, rpc_ctx))
 }
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index be908e776..dc164d2cd 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -20,9 +20,7 @@ use ts_rs::TS;
 use crate::context::{CliContext, RpcContext};
 use crate::notifications::{notify, NotificationLevel};
 use crate::prelude::*;
-use crate::progress::{
-    FullProgressTracker, FullProgressTrackerHandle, PhaseProgressTrackerHandle, PhasedProgressBar,
-};
+use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle, PhasedProgressBar};
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::{RegistryContext, RegistryUrlParams};
 use crate::registry::os::index::OsVersionInfo;
@@ -34,6 +32,7 @@ use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::sound::{
     CIRCLE_OF_5THS_SHORT, UPDATE_FAILED_1, UPDATE_FAILED_2, UPDATE_FAILED_3, UPDATE_FAILED_4,
 };
+use crate::util::net::WebSocketExt;
 use crate::util::Invoke;
 use crate::PLATFORM;
 
@@ -91,50 +90,47 @@ pub async fn update_system(
             .add(
                 guid.clone(),
                 RpcContinuation::ws(
-                    Box::new(|mut ws| {
-                        async move {
-                            if let Err(e) = async {
-                                let mut sub = ctx
+                    |mut ws| async move {
+                        if let Err(e) = async {
+                            let mut sub = ctx
+                                .db
+                                .subscribe(
+                                    "/public/serverInfo/statusInfo/updateProgress"
+                                        .parse::<JsonPointer>()
+                                        .with_kind(ErrorKind::Database)?,
+                                )
+                                .await;
+                            while {
+                                let progress = ctx
                                     .db
-                                    .subscribe(
-                                        "/public/serverInfo/statusInfo/updateProgress"
-                                            .parse::<JsonPointer>()
-                                            .with_kind(ErrorKind::Database)?,
-                                    )
-                                    .await;
-                                while {
-                                    let progress = ctx
-                                        .db
-                                        .peek()
-                                        .await
-                                        .into_public()
-                                        .into_server_info()
-                                        .into_status_info()
-                                        .into_update_progress()
-                                        .de()?;
-                                    ws.send(axum::extract::ws::Message::Text(
-                                        serde_json::to_string(&progress)
-                                            .with_kind(ErrorKind::Serialization)?,
-                                    ))
+                                    .peek()
                                     .await
-                                    .with_kind(ErrorKind::Network)?;
-                                    progress.is_some()
-                                } {
-                                    sub.recv().await;
-                                }
+                                    .into_public()
+                                    .into_server_info()
+                                    .into_status_info()
+                                    .into_update_progress()
+                                    .de()?;
+                                ws.send(axum::extract::ws::Message::Text(
+                                    serde_json::to_string(&progress)
+                                        .with_kind(ErrorKind::Serialization)?,
+                                ))
+                                .await
+                                .with_kind(ErrorKind::Network)?;
+                                progress.is_some()
+                            } {
+                                sub.recv().await;
+                            }
 
-                                ws.close().await.with_kind(ErrorKind::Network)?;
+                            ws.normal_close("complete").await?;
 
-                                Ok::<_, Error>(())
-                            }
-                            .await
-                            {
-                                tracing::error!("Error returning progress of update: {e}");
-                                tracing::debug!("{e:?}")
-                            }
+                            Ok::<_, Error>(())
                         }
-                        .boxed()
-                    }),
+                        .await
+                        {
+                            tracing::error!("Error returning progress of update: {e}");
+                            tracing::debug!("{e:?}")
+                        }
+                    },
                     Duration::from_secs(30),
                 ),
             )
@@ -250,13 +246,12 @@ async fn maybe_do_update(
 
     asset.validate(SIG_CONTEXT, asset.all_signers())?;
 
-    let mut progress = FullProgressTracker::new();
-    let progress_handle = progress.handle();
-    let mut download_phase = progress_handle.add_phase("Downloading File".into(), Some(100));
+    let progress = FullProgressTracker::new();
+    let mut download_phase = progress.add_phase("Downloading File".into(), Some(100));
     download_phase.set_total(asset.commitment.size);
-    let reverify_phase = progress_handle.add_phase("Reverifying File".into(), Some(10));
-    let sync_boot_phase = progress_handle.add_phase("Syncing Boot Files".into(), Some(1));
-    let finalize_phase = progress_handle.add_phase("Finalizing Update".into(), Some(1));
+    let reverify_phase = progress.add_phase("Reverifying File".into(), Some(10));
+    let sync_boot_phase = progress.add_phase("Syncing Boot Files".into(), Some(1));
+    let finalize_phase = progress.add_phase("Finalizing Update".into(), Some(1));
 
     let start_progress = progress.snapshot();
 
@@ -287,7 +282,7 @@ async fn maybe_do_update(
         ));
     }
 
-    let progress_task = NonDetachingJoinHandle::from(tokio::spawn(progress.sync_to_db(
+    let progress_task = NonDetachingJoinHandle::from(tokio::spawn(progress.clone().sync_to_db(
         ctx.db.clone(),
         |db| {
             db.as_public_mut()
@@ -304,7 +299,7 @@ async fn maybe_do_update(
             ctx.clone(),
             asset,
             UpdateProgressHandles {
-                progress_handle,
+                progress,
                 download_phase,
                 reverify_phase,
                 sync_boot_phase,
@@ -373,7 +368,7 @@ async fn maybe_do_update(
 }
 
 struct UpdateProgressHandles {
-    progress_handle: FullProgressTrackerHandle,
+    progress: FullProgressTracker,
     download_phase: PhaseProgressTrackerHandle,
     reverify_phase: PhaseProgressTrackerHandle,
     sync_boot_phase: PhaseProgressTrackerHandle,
@@ -385,7 +380,7 @@ async fn do_update(
     ctx: RpcContext,
     asset: RegistryAsset<Blake3Commitment>,
     UpdateProgressHandles {
-        progress_handle,
+        progress,
         mut download_phase,
         mut reverify_phase,
         mut sync_boot_phase,
@@ -436,7 +431,7 @@ async fn do_update(
         .await?;
     finalize_phase.complete();
 
-    progress_handle.complete();
+    progress.complete();
 
     Ok(())
 }
diff --git a/core/startos/src/upload.rs b/core/startos/src/upload.rs
index f28d81799..b922ab9d2 100644
--- a/core/startos/src/upload.rs
+++ b/core/startos/src/upload.rs
@@ -5,9 +5,10 @@ use std::time::Duration;
 
 use axum::body::Body;
 use axum::response::Response;
-use futures::{FutureExt, StreamExt};
+use futures::StreamExt;
 use http::header::CONTENT_LENGTH;
 use http::StatusCode;
+use imbl_value::InternedString;
 use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
 use tokio::sync::watch;
@@ -19,68 +20,70 @@ use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::TmpDir;
 
-pub async fn upload(ctx: &RpcContext) -> Result<(Guid, UploadingFile), Error> {
+pub async fn upload(
+    ctx: &RpcContext,
+    session: InternedString,
+) -> Result<(Guid, UploadingFile), Error> {
     let guid = Guid::new();
     let (mut handle, file) = UploadingFile::new().await?;
     ctx.rpc_continuations
         .add(
             guid.clone(),
-            RpcContinuation::rest(
-                Box::new(|request| {
-                    async move {
-                        let headers = request.headers();
-                        let content_length = match headers.get(CONTENT_LENGTH).map(|a| a.to_str()) {
-                            None => {
-                                return Response::builder()
-                                    .status(StatusCode::BAD_REQUEST)
-                                    .body(Body::from("Content-Length is required"))
-                                    .with_kind(ErrorKind::Network)
-                            }
-                            Some(Err(_)) => {
+            RpcContinuation::rest_authed(
+                ctx,
+                session,
+                |request| async move {
+                    let headers = request.headers();
+                    let content_length = match headers.get(CONTENT_LENGTH).map(|a| a.to_str()) {
+                        None => {
+                            return Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from("Content-Length is required"))
+                                .with_kind(ErrorKind::Network)
+                        }
+                        Some(Err(_)) => {
+                            return Response::builder()
+                                .status(StatusCode::BAD_REQUEST)
+                                .body(Body::from("Invalid Content-Length"))
+                                .with_kind(ErrorKind::Network)
+                        }
+                        Some(Ok(a)) => match a.parse::<u64>() {
+                            Err(_) => {
                                 return Response::builder()
                                     .status(StatusCode::BAD_REQUEST)
                                     .body(Body::from("Invalid Content-Length"))
                                     .with_kind(ErrorKind::Network)
                             }
-                            Some(Ok(a)) => match a.parse::<u64>() {
-                                Err(_) => {
-                                    return Response::builder()
-                                        .status(StatusCode::BAD_REQUEST)
-                                        .body(Body::from("Invalid Content-Length"))
-                                        .with_kind(ErrorKind::Network)
-                                }
-                                Ok(a) => a,
-                            },
-                        };
+                            Ok(a) => a,
+                        },
+                    };
 
-                        handle
-                            .progress
-                            .send_modify(|p| p.expected_size = Some(content_length));
+                    handle
+                        .progress
+                        .send_modify(|p| p.expected_size = Some(content_length));
 
-                        let mut body = request.into_body().into_data_stream();
-                        while let Some(next) = body.next().await {
-                            if let Err(e) = async {
-                                handle
-                                    .write_all(&next.map_err(|e| {
-                                        std::io::Error::new(std::io::ErrorKind::Other, e)
-                                    })?)
-                                    .await?;
-                                Ok(())
-                            }
-                            .await
-                            {
-                                handle.progress.send_if_modified(|p| p.handle_error(&e));
-                                break;
-                            }
+                    let mut body = request.into_body().into_data_stream();
+                    while let Some(next) = body.next().await {
+                        if let Err(e) = async {
+                            handle
+                                .write_all(&next.map_err(|e| {
+                                    std::io::Error::new(std::io::ErrorKind::Other, e)
+                                })?)
+                                .await?;
+                            Ok(())
+                        }
+                        .await
+                        {
+                            handle.progress.send_if_modified(|p| p.handle_error(&e));
+                            break;
                         }
-
-                        Response::builder()
-                            .status(StatusCode::NO_CONTENT)
-                            .body(Body::empty())
-                            .with_kind(ErrorKind::Network)
                     }
-                    .boxed()
-                }),
+
+                    Response::builder()
+                        .status(StatusCode::NO_CONTENT)
+                        .body(Body::empty())
+                        .with_kind(ErrorKind::Network)
+                },
                 Duration::from_secs(30),
             ),
         )
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index f4476ee2b..9a6bab64b 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -274,6 +274,81 @@ pub fn response_to_reader(response: reqwest::Response) -> impl AsyncRead + Unpin
     }))
 }
 
+#[pin_project::pin_project]
+pub struct IOHook<'a, T> {
+    #[pin]
+    pub io: T,
+    pre_write: Option<Box<dyn FnMut(&[u8]) -> Result<(), std::io::Error> + Send + 'a>>,
+    post_write: Option<Box<dyn FnMut(&[u8]) + Send + 'a>>,
+    post_read: Option<Box<dyn FnMut(&[u8]) + Send + 'a>>,
+}
+impl<'a, T> IOHook<'a, T> {
+    pub fn new(io: T) -> Self {
+        Self {
+            io,
+            pre_write: None,
+            post_write: None,
+            post_read: None,
+        }
+    }
+    pub fn into_inner(self) -> T {
+        self.io
+    }
+    pub fn pre_write<F: FnMut(&[u8]) -> Result<(), std::io::Error> + Send + 'a>(&mut self, f: F) {
+        self.pre_write = Some(Box::new(f))
+    }
+    pub fn post_write<F: FnMut(&[u8]) + Send + 'a>(&mut self, f: F) {
+        self.post_write = Some(Box::new(f))
+    }
+    pub fn post_read<F: FnMut(&[u8]) + Send + 'a>(&mut self, f: F) {
+        self.post_read = Some(Box::new(f))
+    }
+}
+impl<'a, T: AsyncWrite> AsyncWrite for IOHook<'a, T> {
+    fn poll_write(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> Poll<Result<usize, std::io::Error>> {
+        let this = self.project();
+        if let Some(pre_write) = this.pre_write {
+            pre_write(buf)?;
+        }
+        let written = futures::ready!(this.io.poll_write(cx, buf)?);
+        if let Some(post_write) = this.post_write {
+            post_write(&buf[..written]);
+        }
+        Poll::Ready(Ok(written))
+    }
+    fn poll_flush(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        self.project().io.poll_flush(cx)
+    }
+    fn poll_shutdown(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        self.project().io.poll_shutdown(cx)
+    }
+}
+impl<'a, T: AsyncRead> AsyncRead for IOHook<'a, T> {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
+        let this = self.project();
+        let start = buf.filled().len();
+        futures::ready!(this.io.poll_read(cx, buf)?);
+        if let Some(post_read) = this.post_read {
+            post_read(&buf.filled()[start..]);
+        }
+        Poll::Ready(Ok(()))
+    }
+}
+
 #[pin_project::pin_project]
 pub struct BufferedWriteReader {
     #[pin]
@@ -768,7 +843,7 @@ fn poll_flush_prefix<W: AsyncWrite>(
     flush_writer: bool,
 ) -> Poll<Result<(), std::io::Error>> {
     while let Some(mut cur) = prefix.pop_front() {
-        let buf = cur.remaining_slice();
+        let buf = CursorExt::remaining_slice(&cur);
         if !buf.is_empty() {
             match writer.as_mut().poll_write(cx, buf)? {
                 Poll::Ready(n) if n == buf.len() => (),
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 4346a0b1e..f2334632e 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -36,6 +36,7 @@ pub mod http_reader;
 pub mod io;
 pub mod logger;
 pub mod lshw;
+pub mod net;
 pub mod rpc;
 pub mod rpc_client;
 pub mod serde;
diff --git a/core/startos/src/util/net.rs b/core/startos/src/util/net.rs
new file mode 100644
index 000000000..93131f16e
--- /dev/null
+++ b/core/startos/src/util/net.rs
@@ -0,0 +1,24 @@
+use std::borrow::Cow;
+
+use axum::extract::ws::{self, CloseFrame};
+use futures::Future;
+
+use crate::prelude::*;
+
+pub trait WebSocketExt {
+    fn normal_close(
+        self,
+        msg: impl Into<Cow<'static, str>>,
+    ) -> impl Future<Output = Result<(), Error>>;
+}
+
+impl WebSocketExt for ws::WebSocket {
+    async fn normal_close(mut self, msg: impl Into<Cow<'static, str>>) -> Result<(), Error> {
+        self.send(ws::Message::Close(Some(CloseFrame {
+            code: 1000,
+            reason: msg.into(),
+        })))
+        .await
+        .with_kind(ErrorKind::Network)
+    }
+}
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 382ef2814..5d1289e7e 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -22,8 +22,8 @@ use ts_rs::TS;
 
 use super::IntoDoubleEndedIterator;
 use crate::prelude::*;
-use crate::util::Apply;
 use crate::util::clap::FromStrParser;
+use crate::util::Apply;
 
 pub fn deserialize_from_str<
     'de,
@@ -1040,15 +1040,19 @@ impl<T: AsRef<[u8]>> std::fmt::Display for Base64<T> {
         f.write_str(&base64::encode(self.0.as_ref()))
     }
 }
-impl<T: TryFrom<Vec<u8>>> FromStr for Base64<T>
-{
+impl<T: TryFrom<Vec<u8>>> FromStr for Base64<T> {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         base64::decode(&s)
             .with_kind(ErrorKind::Deserialization)?
             .apply(TryFrom::try_from)
             .map(Self)
-            .map_err(|_| Error::new(eyre!("failed to create from buffer"), ErrorKind::Deserialization))
+            .map_err(|_| {
+                Error::new(
+                    eyre!("failed to create from buffer"),
+                    ErrorKind::Deserialization,
+                )
+            })
     }
 }
 impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base64<T> {
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 7212b8801..d063558e2 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -7,6 +7,7 @@ use imbl_value::InternedString;
 
 use crate::db::model::Database;
 use crate::prelude::*;
+use crate::progress::PhaseProgressTrackerHandle;
 use crate::Error;
 
 mod v0_3_5;
@@ -85,11 +86,12 @@ where
         &self,
         version: &V,
         db: &TypedPatchDb<Database>,
+        progress: &mut PhaseProgressTrackerHandle,
     ) -> impl Future<Output = Result<(), Error>> + Send {
         async {
             match self.semver().cmp(&version.semver()) {
-                Ordering::Greater => self.rollback_to_unchecked(version, db).await,
-                Ordering::Less => version.migrate_from_unchecked(self, db).await,
+                Ordering::Greater => self.rollback_to_unchecked(version, db, progress).await,
+                Ordering::Less => version.migrate_from_unchecked(self, db, progress).await,
                 Ordering::Equal => Ok(()),
             }
         }
@@ -98,11 +100,15 @@ where
         &'a self,
         version: &'a V,
         db: &'a TypedPatchDb<Database>,
+        progress: &'a mut PhaseProgressTrackerHandle,
     ) -> BoxFuture<'a, Result<(), Error>> {
+        progress.add_total(1);
         async {
             let previous = Self::Previous::new();
             if version.semver() < previous.semver() {
-                previous.migrate_from_unchecked(version, db).await?;
+                previous
+                    .migrate_from_unchecked(version, db, progress)
+                    .await?;
             } else if version.semver() > previous.semver() {
                 return Err(Error::new(
                     eyre!(
@@ -115,6 +121,7 @@ where
             tracing::info!("{} -> {}", previous.semver(), self.semver(),);
             self.up(db).await?;
             self.commit(db).await?;
+            *progress += 1;
             Ok(())
         }
         .boxed()
@@ -123,14 +130,18 @@ where
         &'a self,
         version: &'a V,
         db: &'a TypedPatchDb<Database>,
+        progress: &'a mut PhaseProgressTrackerHandle,
     ) -> BoxFuture<'a, Result<(), Error>> {
         async {
             let previous = Self::Previous::new();
             tracing::info!("{} -> {}", self.semver(), previous.semver(),);
             self.down(db).await?;
             previous.commit(db).await?;
+            *progress += 1;
             if version.semver() < previous.semver() {
-                previous.rollback_to_unchecked(version, db).await?;
+                previous
+                    .rollback_to_unchecked(version, db, progress)
+                    .await?;
             } else if version.semver() > previous.semver() {
                 return Err(Error::new(
                     eyre!(
@@ -196,7 +207,11 @@ where
     }
 }
 
-pub async fn init(db: &TypedPatchDb<Database>) -> Result<(), Error> {
+pub async fn init(
+    db: &TypedPatchDb<Database>,
+    mut progress: PhaseProgressTrackerHandle,
+) -> Result<(), Error> {
+    progress.start();
     let version = Version::from_util_version(
         db.peek()
             .await
@@ -213,10 +228,10 @@ pub async fn init(db: &TypedPatchDb<Database>) -> Result<(), Error> {
                 ErrorKind::MigrationFailed,
             ));
         }
-        Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), &db).await?,
-        Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), &db).await?,
-        Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db).await?,
-        Version::V0_3_6(v) => v.0.migrate_to(&Current::new(), &db).await?,
+        Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -224,6 +239,7 @@ pub async fn init(db: &TypedPatchDb<Database>) -> Result<(), Error> {
             ))
         }
     }
+    progress.complete();
     Ok(())
 }
 
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index e801da79b..c7165b202 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -20,7 +20,11 @@ pub fn data_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, volume_id: &Volu
         .join(volume_id)
 }
 
-pub fn asset_dir<P: AsRef<Path>>(datadir: P, pkg_id: &PackageId, version: &VersionString) -> PathBuf {
+pub fn asset_dir<P: AsRef<Path>>(
+    datadir: P,
+    pkg_id: &PackageId,
+    version: &VersionString,
+) -> PathBuf {
     datadir
         .as_ref()
         .join(PKG_VOLUME_DIR)
diff --git a/patch-db b/patch-db
index 88a804f56..7aa53249f 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 88a804f56f446d34896ef331d915b821a581cf01
+Subproject commit 7aa53249f9353162475ea347abac92abcfba5493
diff --git a/sdk/lib/osBindings/AttachParams.ts b/sdk/lib/osBindings/AttachParams.ts
new file mode 100644
index 000000000..048151d2f
--- /dev/null
+++ b/sdk/lib/osBindings/AttachParams.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EncryptedWire } from "./EncryptedWire"
+
+export type AttachParams = {
+  startOsPassword: EncryptedWire | null
+  guid: string
+}
diff --git a/sdk/lib/osBindings/BackupTargetFS.ts b/sdk/lib/osBindings/BackupTargetFS.ts
new file mode 100644
index 000000000..0cff2cc4e
--- /dev/null
+++ b/sdk/lib/osBindings/BackupTargetFS.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BlockDev } from "./BlockDev"
+import type { Cifs } from "./Cifs"
+
+export type BackupTargetFS =
+  | ({ type: "disk" } & BlockDev)
+  | ({ type: "cifs" } & Cifs)
diff --git a/sdk/lib/osBindings/BlockDev.ts b/sdk/lib/osBindings/BlockDev.ts
new file mode 100644
index 000000000..46db81011
--- /dev/null
+++ b/sdk/lib/osBindings/BlockDev.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BlockDev = { logicalname: string }
diff --git a/sdk/lib/osBindings/Cifs.ts b/sdk/lib/osBindings/Cifs.ts
new file mode 100644
index 000000000..f7099bd7f
--- /dev/null
+++ b/sdk/lib/osBindings/Cifs.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Cifs = {
+  hostname: string
+  path: string
+  username: string
+  password: string | null
+}
diff --git a/sdk/lib/osBindings/InitProgressRes.ts b/sdk/lib/osBindings/InitProgressRes.ts
new file mode 100644
index 000000000..38caf7bdb
--- /dev/null
+++ b/sdk/lib/osBindings/InitProgressRes.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { FullProgress } from "./FullProgress"
+import type { Guid } from "./Guid"
+
+export type InitProgressRes = { progress: FullProgress; guid: Guid }
diff --git a/sdk/lib/osBindings/RecoverySource.ts b/sdk/lib/osBindings/RecoverySource.ts
new file mode 100644
index 000000000..c40ec5132
--- /dev/null
+++ b/sdk/lib/osBindings/RecoverySource.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BackupTargetFS } from "./BackupTargetFS"
+
+export type RecoverySource =
+  | { type: "migrate"; guid: string }
+  | { type: "backup"; target: BackupTargetFS }
diff --git a/sdk/lib/osBindings/SetupExecuteParams.ts b/sdk/lib/osBindings/SetupExecuteParams.ts
new file mode 100644
index 000000000..4593e7667
--- /dev/null
+++ b/sdk/lib/osBindings/SetupExecuteParams.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EncryptedWire } from "./EncryptedWire"
+import type { RecoverySource } from "./RecoverySource"
+
+export type SetupExecuteParams = {
+  startOsLogicalname: string
+  startOsPassword: EncryptedWire
+  recoverySource: RecoverySource | null
+  recoveryPassword: EncryptedWire | null
+}
diff --git a/sdk/lib/osBindings/SetupProgress.ts b/sdk/lib/osBindings/SetupProgress.ts
new file mode 100644
index 000000000..845636da3
--- /dev/null
+++ b/sdk/lib/osBindings/SetupProgress.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { FullProgress } from "./FullProgress"
+import type { Guid } from "./Guid"
+
+export type SetupProgress = { progress: FullProgress; guid: Guid }
diff --git a/sdk/lib/osBindings/SetupResult.ts b/sdk/lib/osBindings/SetupResult.ts
new file mode 100644
index 000000000..464aeb4b7
--- /dev/null
+++ b/sdk/lib/osBindings/SetupResult.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetupResult = {
+  torAddress: string
+  lanAddress: string
+  rootCa: string
+}
diff --git a/sdk/lib/osBindings/SetupStatusRes.ts b/sdk/lib/osBindings/SetupStatusRes.ts
new file mode 100644
index 000000000..93d10c59b
--- /dev/null
+++ b/sdk/lib/osBindings/SetupStatusRes.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { SetupProgress } from "./SetupProgress"
+import type { SetupResult } from "./SetupResult"
+
+export type SetupStatusRes =
+  | ({ status: "complete" } & SetupResult)
+  | ({ status: "running" } & SetupProgress)
diff --git a/sdk/lib/osBindings/VerifyCifsParams.ts b/sdk/lib/osBindings/VerifyCifsParams.ts
new file mode 100644
index 000000000..407e6caaa
--- /dev/null
+++ b/sdk/lib/osBindings/VerifyCifsParams.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EncryptedWire } from "./EncryptedWire"
+
+export type VerifyCifsParams = {
+  hostname: string
+  path: string
+  username: string
+  password: EncryptedWire | null
+}
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 06a4bed7e..ac2e19e45 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -15,17 +15,21 @@ export { AlpnInfo } from "./AlpnInfo"
 export { AnySignature } from "./AnySignature"
 export { AnySigningKey } from "./AnySigningKey"
 export { AnyVerifyingKey } from "./AnyVerifyingKey"
+export { AttachParams } from "./AttachParams"
 export { BackupProgress } from "./BackupProgress"
+export { BackupTargetFS } from "./BackupTargetFS"
 export { Base64 } from "./Base64"
 export { BindInfo } from "./BindInfo"
 export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
 export { Blake3Commitment } from "./Blake3Commitment"
+export { BlockDev } from "./BlockDev"
 export { Callback } from "./Callback"
 export { Category } from "./Category"
 export { CheckDependenciesParam } from "./CheckDependenciesParam"
 export { CheckDependenciesResult } from "./CheckDependenciesResult"
 export { ChrootParams } from "./ChrootParams"
+export { Cifs } from "./Cifs"
 export { ContactInfo } from "./ContactInfo"
 export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams"
 export { CurrentDependencies } from "./CurrentDependencies"
@@ -73,6 +77,7 @@ export { ImageConfig } from "./ImageConfig"
 export { ImageId } from "./ImageId"
 export { ImageMetadata } from "./ImageMetadata"
 export { ImageSource } from "./ImageSource"
+export { InitProgressRes } from "./InitProgressRes"
 export { InstalledState } from "./InstalledState"
 export { InstallingInfo } from "./InstallingInfo"
 export { InstallingState } from "./InstallingState"
@@ -105,6 +110,7 @@ export { ParamsPackageId } from "./ParamsPackageId"
 export { PasswordType } from "./PasswordType"
 export { Progress } from "./Progress"
 export { Public } from "./Public"
+export { RecoverySource } from "./RecoverySource"
 export { RegistryAsset } from "./RegistryAsset"
 export { RemoveActionParams } from "./RemoveActionParams"
 export { RemoveAddressParams } from "./RemoveAddressParams"
@@ -127,10 +133,15 @@ export { SetMainStatusStatus } from "./SetMainStatusStatus"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetStoreParams } from "./SetStoreParams"
 export { SetSystemSmtpParams } from "./SetSystemSmtpParams"
+export { SetupExecuteParams } from "./SetupExecuteParams"
+export { SetupProgress } from "./SetupProgress"
+export { SetupResult } from "./SetupResult"
+export { SetupStatusRes } from "./SetupStatusRes"
 export { SignAssetParams } from "./SignAssetParams"
 export { SignerInfo } from "./SignerInfo"
 export { Status } from "./Status"
 export { UpdatingState } from "./UpdatingState"
+export { VerifyCifsParams } from "./VerifyCifsParams"
 export { VersionSignerParams } from "./VersionSignerParams"
 export { Version } from "./Version"
 export { VolumeId } from "./VolumeId"
diff --git a/web/package-lock.json b/web/package-lock.json
index 68156eb21..81b612ac1 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -31,6 +31,7 @@
         "@taiga-ui/core": "3.20.0",
         "@taiga-ui/icons": "3.20.0",
         "@taiga-ui/kit": "3.20.0",
+        "@tinkoff/ng-dompurify": "4.0.0",
         "angular-svg-round-progressbar": "^9.0.0",
         "ansi-to-html": "^0.7.2",
         "base64-js": "^1.5.1",
@@ -1973,7 +1974,7 @@
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-rev0.lib0.rc8.beta10",
+      "version": "0.3.6-alpha1",
       "license": "MIT",
       "dependencies": {
         "isomorphic-fetch": "^3.0.0",
@@ -5432,6 +5433,20 @@
         "rxjs": ">=6.0.0"
       }
     },
+    "node_modules/@tinkoff/ng-dompurify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@tinkoff/ng-dompurify/-/ng-dompurify-4.0.0.tgz",
+      "integrity": "sha512-BjKUweWLrOx8UOZw+Tl+Dae5keYuSbeMkppcXQdsvwASMrPfmP7d3Q206Q6HDqOV2WnpnFqGUB95IMbLAeRRuw==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=12.0.0",
+        "@angular/platform-browser": ">=12.0.0",
+        "@types/dompurify": ">=2.3.0",
+        "dompurify": ">= 2.3.0"
+      }
+    },
     "node_modules/@tinkoff/ng-event-plugins": {
       "version": "3.1.0",
       "license": "Apache-2.0",
@@ -5549,7 +5564,6 @@
     },
     "node_modules/@types/dompurify": {
       "version": "2.3.4",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/trusted-types": "*"
@@ -5726,7 +5740,6 @@
     },
     "node_modules/@types/trusted-types": {
       "version": "2.0.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/uuid": {
diff --git a/web/package.json b/web/package.json
index 9e842455e..3ea29c6fd 100644
--- a/web/package.json
+++ b/web/package.json
@@ -13,7 +13,6 @@
     "check:setup": "tsc --project projects/setup-wizard/tsconfig.json --noEmit --skipLibCheck",
     "check:ui": "tsc --project projects/ui/tsconfig.json --noEmit --skipLibCheck",
     "build:deps": "rm -rf .angular/cache && (cd ../patch-db/client && npm ci && npm run build) && (cd ../sdk && make bundle)",
-    "build:dui": "ng run diagnostic-ui:build",
     "build:install-wiz": "ng run install-wizard:build",
     "build:setup": "ng run setup-wizard:build",
     "build:ui": "ng run ui:build",
@@ -25,7 +24,6 @@
     "analyze:ui": "webpack-bundle-analyzer dist/raw/ui/stats.json",
     "publish:shared": "npm run build:shared && npm publish ./dist/shared --access public",
     "publish:marketplace": "npm run build:marketplace && npm publish ./dist/marketplace --access public",
-    "start:dui": "npm run-script build-config && ionic serve --project diagnostic-ui --host 0.0.0.0",
     "start:install-wiz": "npm run-script build-config && ionic serve --project install-wizard --host 0.0.0.0",
     "start:setup": "npm run-script build-config && ionic serve --project setup-wizard --host 0.0.0.0",
     "start:ui": "npm run-script build-config && ionic serve --project ui --ip --host 0.0.0.0",
@@ -56,6 +54,7 @@
     "@taiga-ui/core": "3.20.0",
     "@taiga-ui/icons": "3.20.0",
     "@taiga-ui/kit": "3.20.0",
+    "@tinkoff/ng-dompurify": "4.0.0",
     "angular-svg-round-progressbar": "^9.0.0",
     "ansi-to-html": "^0.7.2",
     "base64-js": "^1.5.1",
diff --git a/web/projects/diagnostic-ui/src/app/app-routing.module.ts b/web/projects/diagnostic-ui/src/app/app-routing.module.ts
deleted file mode 100644
index f9f009b48..000000000
--- a/web/projects/diagnostic-ui/src/app/app-routing.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule } from '@angular/core'
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router'
-
-const routes: Routes = [
-  {
-    path: '',
-    loadChildren: () =>
-      import('./pages/home/home.module').then(m => m.HomePageModule),
-  },
-  {
-    path: 'logs',
-    loadChildren: () =>
-      import('./pages/logs/logs.module').then(m => m.LogsPageModule),
-  },
-]
-
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, {
-      scrollPositionRestoration: 'enabled',
-      preloadingStrategy: PreloadAllModules,
-      useHash: true,
-    }),
-  ],
-  exports: [RouterModule],
-})
-export class AppRoutingModule {}
diff --git a/web/projects/diagnostic-ui/src/app/app.component.html b/web/projects/diagnostic-ui/src/app/app.component.html
deleted file mode 100644
index cd28a7e80..000000000
--- a/web/projects/diagnostic-ui/src/app/app.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<tui-root>
-  <ion-app>
-    <ion-router-outlet></ion-router-outlet>
-  </ion-app>
-</tui-root>
diff --git a/web/projects/diagnostic-ui/src/app/app.component.scss b/web/projects/diagnostic-ui/src/app/app.component.scss
deleted file mode 100644
index b528fd9bd..000000000
--- a/web/projects/diagnostic-ui/src/app/app.component.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-:host {
-  display: block;
-  height: 100%;
-}
-
-tui-root {
-  height: 100%;
-}
diff --git a/web/projects/diagnostic-ui/src/app/app.component.ts b/web/projects/diagnostic-ui/src/app/app.component.ts
deleted file mode 100644
index 5ac82a652..000000000
--- a/web/projects/diagnostic-ui/src/app/app.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
-  selector: 'app-root',
-  templateUrl: 'app.component.html',
-  styleUrls: ['app.component.scss'],
-})
-export class AppComponent {
-  constructor() {}
-}
diff --git a/web/projects/diagnostic-ui/src/app/app.module.ts b/web/projects/diagnostic-ui/src/app/app.module.ts
deleted file mode 100644
index 1abde53a3..000000000
--- a/web/projects/diagnostic-ui/src/app/app.module.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { NgModule } from '@angular/core'
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
-import { RouteReuseStrategy } from '@angular/router'
-import { IonicModule, IonicRouteStrategy } from '@ionic/angular'
-import { TuiRootModule } from '@taiga-ui/core'
-import { AppComponent } from './app.component'
-import { AppRoutingModule } from './app-routing.module'
-import { HttpClientModule } from '@angular/common/http'
-import { ApiService } from './services/api/api.service'
-import { MockApiService } from './services/api/mock-api.service'
-import { LiveApiService } from './services/api/live-api.service'
-import { RELATIVE_URL, WorkspaceConfig } from '@start9labs/shared'
-
-const {
-  useMocks,
-  ui: { api },
-} = require('../../../../config.json') as WorkspaceConfig
-
-@NgModule({
-  declarations: [AppComponent],
-  imports: [
-    HttpClientModule,
-    BrowserAnimationsModule,
-    IonicModule.forRoot({
-      mode: 'md',
-    }),
-    AppRoutingModule,
-    TuiRootModule,
-  ],
-  providers: [
-    { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
-    {
-      provide: ApiService,
-      useClass: useMocks ? MockApiService : LiveApiService,
-    },
-    {
-      provide: RELATIVE_URL,
-      useValue: `/${api.url}/${api.version}`,
-    },
-  ],
-  bootstrap: [AppComponent],
-})
-export class AppModule {}
diff --git a/web/projects/diagnostic-ui/src/app/pages/home/home-routing.module.ts b/web/projects/diagnostic-ui/src/app/pages/home/home-routing.module.ts
deleted file mode 100644
index efb1977dc..000000000
--- a/web/projects/diagnostic-ui/src/app/pages/home/home-routing.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-import { HomePage } from './home.page'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: HomePage,
-  },
-]
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class HomePageRoutingModule {}
diff --git a/web/projects/diagnostic-ui/src/app/services/api/api.service.ts b/web/projects/diagnostic-ui/src/app/services/api/api.service.ts
deleted file mode 100644
index 562d486c3..000000000
--- a/web/projects/diagnostic-ui/src/app/services/api/api.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { LogsRes, ServerLogsReq } from '@start9labs/shared'
-
-export abstract class ApiService {
-  abstract getError(): Promise<GetErrorRes>
-  abstract restart(): Promise<void>
-  abstract forgetDrive(): Promise<void>
-  abstract repairDisk(): Promise<void>
-  abstract systemRebuild(): Promise<void>
-  abstract getLogs(params: ServerLogsReq): Promise<LogsRes>
-}
-
-export interface GetErrorRes {
-  code: number
-  message: string
-  data: { details: string }
-}
diff --git a/web/projects/diagnostic-ui/src/app/services/api/live-api.service.ts b/web/projects/diagnostic-ui/src/app/services/api/live-api.service.ts
deleted file mode 100644
index bbde6e5ba..000000000
--- a/web/projects/diagnostic-ui/src/app/services/api/live-api.service.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Injectable } from '@angular/core'
-import {
-  HttpService,
-  isRpcError,
-  RpcError,
-  RPCOptions,
-} from '@start9labs/shared'
-import { ApiService, GetErrorRes } from './api.service'
-import { LogsRes, ServerLogsReq } from '@start9labs/shared'
-
-@Injectable()
-export class LiveApiService implements ApiService {
-  constructor(private readonly http: HttpService) {}
-
-  async getError(): Promise<GetErrorRes> {
-    return this.rpcRequest<GetErrorRes>({
-      method: 'diagnostic.error',
-      params: {},
-    })
-  }
-
-  async restart(): Promise<void> {
-    return this.rpcRequest<void>({
-      method: 'diagnostic.restart',
-      params: {},
-    })
-  }
-
-  async forgetDrive(): Promise<void> {
-    return this.rpcRequest<void>({
-      method: 'diagnostic.disk.forget',
-      params: {},
-    })
-  }
-
-  async repairDisk(): Promise<void> {
-    return this.rpcRequest<void>({
-      method: 'diagnostic.disk.repair',
-      params: {},
-    })
-  }
-
-  async systemRebuild(): Promise<void> {
-    return this.rpcRequest<void>({
-      method: 'diagnostic.rebuild',
-      params: {},
-    })
-  }
-
-  async getLogs(params: ServerLogsReq): Promise<LogsRes> {
-    return this.rpcRequest<LogsRes>({
-      method: 'diagnostic.logs',
-      params,
-    })
-  }
-
-  private async rpcRequest<T>(opts: RPCOptions): Promise<T> {
-    const res = await this.http.rpcRequest<T>(opts)
-
-    const rpcRes = res.body
-
-    if (isRpcError(rpcRes)) {
-      throw new RpcError(rpcRes.error)
-    }
-
-    return rpcRes.result
-  }
-}
diff --git a/web/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts b/web/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts
deleted file mode 100644
index d991edd32..000000000
--- a/web/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Injectable } from '@angular/core'
-import { pauseFor } from '@start9labs/shared'
-import { ApiService, GetErrorRes } from './api.service'
-import { LogsRes, ServerLogsReq, Log } from '@start9labs/shared'
-
-@Injectable()
-export class MockApiService implements ApiService {
-  async getError(): Promise<GetErrorRes> {
-    await pauseFor(1000)
-    return {
-      code: 15,
-      message: 'Unknown server',
-      data: { details: 'Some details about the error here' },
-    }
-  }
-
-  async restart(): Promise<void> {
-    await pauseFor(1000)
-  }
-
-  async forgetDrive(): Promise<void> {
-    await pauseFor(1000)
-  }
-
-  async repairDisk(): Promise<void> {
-    await pauseFor(1000)
-  }
-
-  async systemRebuild(): Promise<void> {
-    await pauseFor(1000)
-  }
-
-  async getLogs(params: ServerLogsReq): Promise<LogsRes> {
-    await pauseFor(1000)
-    let entries: Log[]
-    if (Math.random() < 0.2) {
-      entries = packageLogs
-    } else {
-      const arrLength = params.limit
-        ? Math.ceil(params.limit / packageLogs.length)
-        : 10
-      entries = new Array(arrLength)
-        .fill(packageLogs)
-        .reduce((acc, val) => acc.concat(val), [])
-    }
-    return {
-      entries,
-      startCursor: 'start-cursor',
-      endCursor: 'end-cursor',
-    }
-  }
-}
-
-const packageLogs = [
-  {
-    timestamp: '2019-12-26T14:20:30.872Z',
-    message: '****** START *****',
-  },
-  {
-    timestamp: '2019-12-26T14:21:30.872Z',
-    message: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs',
-  },
-  {
-    timestamp: '2019-12-26T14:22:30.872Z',
-    message: '****** FINISH *****',
-  },
-]
diff --git a/web/projects/diagnostic-ui/src/environments/environment.prod.ts b/web/projects/diagnostic-ui/src/environments/environment.prod.ts
deleted file mode 100644
index 970e25bd7..000000000
--- a/web/projects/diagnostic-ui/src/environments/environment.prod.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const environment = {
-  production: true,
-}
diff --git a/web/projects/diagnostic-ui/src/environments/environment.ts b/web/projects/diagnostic-ui/src/environments/environment.ts
deleted file mode 100644
index 5c68c17ab..000000000
--- a/web/projects/diagnostic-ui/src/environments/environment.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
-
-export const environment = {
-  production: false,
-}
-
-/*
- * For easier debugging in development mode, you can import the following file
- * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
- *
- * This import should be commented out in production mode because it will have a negative impact
- * on performance if an error is thrown.
- */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
diff --git a/web/projects/diagnostic-ui/src/index.html b/web/projects/diagnostic-ui/src/index.html
deleted file mode 100644
index 1822018f3..000000000
--- a/web/projects/diagnostic-ui/src/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>StartOS Diagnostic UI</title>
-
-    <base href="/" />
-
-    <meta name="color-scheme" content="light dark" />
-    <meta
-      name="viewport"
-      content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"
-    />
-    <meta name="format-detection" content="telephone=no" />
-    <meta name="msapplication-tap-highlight" content="no" />
-
-    <link rel="icon" type="image/png" href="assets/icon/favicon.ico" />
-  </head>
-
-  <body>
-    <app-root></app-root>
-  </body>
-</html>
diff --git a/web/projects/diagnostic-ui/src/main.ts b/web/projects/diagnostic-ui/src/main.ts
deleted file mode 100644
index 21499c3cd..000000000
--- a/web/projects/diagnostic-ui/src/main.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { enableProdMode } from '@angular/core'
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
-import { AppModule } from './app/app.module'
-import { environment } from './environments/environment'
-
-if (environment.production) {
-  enableProdMode()
-}
-
-platformBrowserDynamic()
-  .bootstrapModule(AppModule)
-  .catch(err => console.error(err))
diff --git a/web/projects/diagnostic-ui/src/polyfills.ts b/web/projects/diagnostic-ui/src/polyfills.ts
deleted file mode 100644
index 4437ced44..000000000
--- a/web/projects/diagnostic-ui/src/polyfills.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * This file includes polyfills needed by Angular and is loaded before the app.
- * You can add your own extra polyfills to this file.
- *
- * This file is divided into 2 sections:
- *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
- *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
- *      file.
- *
- * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
- * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
- * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
- *
- * Learn more in https://angular.io/guide/browser-support
- */
-
-/***************************************************************************************************
- * BROWSER POLYFILLS
- */
-
-/** IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
-/**
- * By default, zone.js will patch all possible macroTask and DomEvents
- * user can disable parts of macroTask/DomEvents patch by setting following flags
- * because those flags need to be set before `zone.js` being loaded, and webpack
- * will put import in the top of bundle, so user need to create a separate file
- * in this directory (for example: zone-flags.ts), and put the following flags
- * into that file, and then add the following code before importing zone.js.
- * import './zone-flags';
- *
- * The flags allowed in zone-flags.ts are listed here.
- *
- * The following flags will work for all browsers.
- *
- * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
- * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
- *
- *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
- *  with the following flag, it will bypass `zone.js` patch for IE/Edge
- *
- *  (window as any).__Zone_enable_cross_context_check = true;
- *
- */
-
-import './zone-flags'
-
-/***************************************************************************************************
- * Zone JS is required by default for Angular itself.
- */
-import 'zone.js/dist/zone' // Included with Angular CLI.
-
-/***************************************************************************************************
- * APPLICATION IMPORTS
- */
diff --git a/web/projects/diagnostic-ui/src/styles.scss b/web/projects/diagnostic-ui/src/styles.scss
deleted file mode 100644
index ac0aadb69..000000000
--- a/web/projects/diagnostic-ui/src/styles.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-@font-face {
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: normal;
-  src: url('/assets/fonts/Montserrat/Montserrat-Regular.ttf');
-}
-
-/** Ionic CSS Variables overrides **/
-:root {
-  --ion-font-family: 'Montserrat';
-
-  --ion-color-primary: #0075e1;
-
-  --ion-color-medium: #989aa2;
-  --ion-color-medium-rgb: 152,154,162;
-  --ion-color-medium-contrast: #000000;
-  --ion-color-medium-contrast-rgb: 0,0,0;
-  --ion-color-medium-shade: #86888f;
-  --ion-color-medium-tint: #a2a4ab;
-
-  --ion-color-light: #222428;
-  --ion-color-light-rgb: 34,36,40;
-  --ion-color-light-contrast: #ffffff;
-  --ion-color-light-contrast-rgb: 255,255,255;
-  --ion-color-light-shade: #1e2023;
-  --ion-color-light-tint: #383a3e;
-
-  --ion-item-background: #2b2b2b;
-  --ion-toolbar-background: #2b2b2b;
-  --ion-card-background: #2b2b2b;
-
-  --ion-background-color: #282828;
-  --ion-background-color-rgb: 30,30,30;
-  --ion-text-color: var(--ion-color-dark);
-  --ion-text-color-rgb: var(--ion-color-dark-rgb);
-}
-
-.loader {
-  --spinner-color: var(--ion-color-warning) !important;
-  z-index: 40000 !important;
-}
diff --git a/web/projects/diagnostic-ui/src/zone-flags.ts b/web/projects/diagnostic-ui/src/zone-flags.ts
deleted file mode 100644
index 24ca60fe2..000000000
--- a/web/projects/diagnostic-ui/src/zone-flags.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Prevents Angular change detection from
- * running with certain Web Component callbacks
- */
-// eslint-disable-next-line no-underscore-dangle
-(window as any).__Zone_disable_customElements = true
diff --git a/web/projects/diagnostic-ui/tsconfig.json b/web/projects/diagnostic-ui/tsconfig.json
deleted file mode 100644
index f642f09b3..000000000
--- a/web/projects/diagnostic-ui/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": "./"
-  },
-  "files": ["src/main.ts", "src/polyfills.ts"],
-  "include": ["src/**/*.d.ts"]
-}
diff --git a/web/projects/setup-wizard/src/app/app.component.ts b/web/projects/setup-wizard/src/app/app.component.ts
index e4bf41f5c..e10d672e5 100644
--- a/web/projects/setup-wizard/src/app/app.component.ts
+++ b/web/projects/setup-wizard/src/app/app.component.ts
@@ -21,7 +21,7 @@ export class AppComponent {
 
       let route = '/home'
       if (inProgress) {
-        route = inProgress.complete ? '/success' : '/loading'
+        route = inProgress.status === 'complete' ? '/success' : '/loading'
       }
 
       await this.navCtrl.navigateForward(route)
diff --git a/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts b/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
index 1a5dd042d..7f7ee6241 100644
--- a/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
@@ -5,12 +5,7 @@ import {
   ModalController,
   NavController,
 } from '@ionic/angular'
-import {
-  ApiService,
-  BackupRecoverySource,
-  DiskRecoverySource,
-  DiskMigrateSource,
-} from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/api.service'
 import { DiskInfo, ErrorToastService, GuidPipe } from '@start9labs/shared'
 import { StateService } from 'src/app/services/state.service'
 import { PasswordPage } from '../../modals/password/password.page'
@@ -58,18 +53,17 @@ export class EmbassyPage {
       } else if (this.stateService.setupType === 'restore') {
         this.storageDrives = disks.filter(
           d =>
+            this.stateService.recoverySource?.type === 'backup' &&
+            this.stateService.recoverySource.target?.type === 'disk' &&
             !d.partitions
               .map(p => p.logicalname)
-              .includes(
-                (
-                  (this.stateService.recoverySource as BackupRecoverySource)
-                    ?.target as DiskRecoverySource
-                )?.logicalname,
-              ),
+              .includes(this.stateService.recoverySource.target.logicalname),
         )
-      } else if (this.stateService.setupType === 'transfer') {
-        const guid = (this.stateService.recoverySource as DiskMigrateSource)
-          .guid
+      } else if (
+        this.stateService.setupType === 'transfer' &&
+        this.stateService.recoverySource?.type === 'migrate'
+      ) {
+        const guid = this.stateService.recoverySource.guid
         this.storageDrives = disks.filter(d => {
           return (
             d.guid !== guid && !d.partitions.map(p => p.guid).includes(guid)
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.module.ts b/web/projects/setup-wizard/src/app/pages/loading/loading.module.ts
index e937a7e19..2f3507941 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.module.ts
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.module.ts
@@ -2,11 +2,11 @@ import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { IonicModule } from '@ionic/angular'
 import { FormsModule } from '@angular/forms'
-import { LoadingPage, ToMessagePipe } from './loading.page'
+import { LoadingPage } from './loading.page'
 import { LoadingPageRoutingModule } from './loading-routing.module'
 
 @NgModule({
   imports: [CommonModule, FormsModule, IonicModule, LoadingPageRoutingModule],
-  declarations: [LoadingPage, ToMessagePipe],
+  declarations: [LoadingPage],
 })
 export class LoadingPageModule {}
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.page.html b/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
index fd7fcc24c..6c9ca41ab 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
@@ -1,39 +1,17 @@
-<ion-content>
-  <ion-grid>
-    <ion-row class="ion-align-items-center">
-      <ion-col class="ion-text-center">
-        <ion-card *ngIf="progress$ | async as progress" color="dark">
-          <ion-card-header>
-            <ion-card-title>Initializing StartOS</ion-card-title>
-            <div class="center-wrapper">
-              <ion-card-subtitle>
-                {{ progress.transferred | toMessage }}
-              </ion-card-subtitle>
-            </div>
-          </ion-card-header>
+<section *ngIf="progress$ | async as progress">
+  <h1 [style.font-size.rem]="2.5" [style.margin.rem]="1">
+    Setting up your server
+  </h1>
+  <div class="center-wrapper" *ngIf="progress.total">
+    Progress: {{ (progress.total * 100).toFixed(0) }}%
+  </div>
 
-          <ion-card-content class="ion-margin">
-            <ion-progress-bar
-              color="tertiary"
-              style="max-width: 700px; margin: auto; margin-bottom: 36px"
-              [type]="progress.transferred && progress.transferred < 1 ? 'determinate' : 'indeterminate'"
-              [value]="progress.transferred || 0"
-            ></ion-progress-bar>
-            <p>
-              <ng-container *ngIf="progress.totalBytes as total">
-                <ng-container
-                  *ngIf="progress.transferred as transferred; else calculating"
-                >
-                  Progress: {{ (transferred * 100).toFixed() }}%
-                </ng-container>
-                <ng-template #calculating>
-                  {{ (progress.totalBytes / 1073741824).toFixed(2) }} GB
-                </ng-template>
-              </ng-container>
-            </p>
-          </ion-card-content>
-        </ion-card>
-      </ion-col>
-    </ion-row>
-  </ion-grid>
-</ion-content>
+  <progress
+    tuiProgressBar
+    class="progress"
+    [style.max-width.rem]="40"
+    [style.margin]="'1rem auto'"
+    [attr.value]="progress.total"
+  ></progress>
+  <p>{{ progress.message }}</p>
+</section>
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.page.scss b/web/projects/setup-wizard/src/app/pages/loading/loading.page.scss
index 87bfffa33..e69de29bb 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.scss
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.scss
@@ -1,3 +0,0 @@
-ion-card-title {
-  font-size: 42px;
-}
\ No newline at end of file
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts b/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
index ce1a1b3c0..459be5c7a 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
@@ -1,15 +1,23 @@
 import { Component } from '@angular/core'
 import { NavController } from '@ionic/angular'
-import { StateService } from 'src/app/services/state.service'
 import { Pipe, PipeTransform } from '@angular/core'
-import { BehaviorSubject } from 'rxjs'
+import {
+  EMPTY,
+  Observable,
+  catchError,
+  filter,
+  from,
+  interval,
+  map,
+  of,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs'
 import { ApiService } from 'src/app/services/api/api.service'
-import { ErrorToastService, pauseFor } from '@start9labs/shared'
-
-type Progress = {
-  totalBytes: number | null
-  transferred: number
-}
+import { ErrorToastService } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'app-loading',
@@ -17,10 +25,46 @@ type Progress = {
   styleUrls: ['loading.page.scss'],
 })
 export class LoadingPage {
-  readonly progress$ = new BehaviorSubject<Progress>({
-    totalBytes: null,
-    transferred: 0,
-  })
+  readonly progress$ = this.getRunningStatus$().pipe(
+    switchMap(res =>
+      this.api.openProgressWebsocket$(res.guid).pipe(
+        startWith(res.progress),
+        catchError((_, watch$) => {
+          return interval(2000).pipe(
+            switchMap(() =>
+              from(this.api.getStatus()).pipe(catchError(() => EMPTY)),
+            ),
+            take(1),
+            switchMap(() => watch$),
+          )
+        }),
+        tap(progress => {
+          if (progress.overall === true) {
+            this.getStatus()
+          }
+        }),
+      ),
+    ),
+    map(({ phases, overall }) => {
+      return {
+        total: getDecimal(overall),
+        message: phases
+          .filter(
+            (
+              p,
+            ): p is {
+              name: string
+              progress: {
+                done: number
+                total: number | null
+              }
+            } => p.progress !== true && p.progress !== null,
+          )
+          .map(p => `${p.name}${getPhaseBytes(p.progress)}`)
+          .join(','),
+      }
+    }),
+  )
 
   constructor(
     private readonly navCtrl: NavController,
@@ -28,55 +72,55 @@ export class LoadingPage {
     private readonly errorToastService: ErrorToastService,
   ) {}
 
-  ngOnInit() {
-    this.poll()
-  }
-
-  async poll() {
-    try {
-      const progress = await this.api.getStatus()
-
-      if (!progress) return
-
-      const { totalBytes, bytesTransferred } = progress
-
-      this.progress$.next({
-        totalBytes,
-        transferred: totalBytes ? bytesTransferred / totalBytes : 0,
-      })
-
-      if (progress.complete) {
-        this.navCtrl.navigateForward(`/success`)
-        this.progress$.complete()
-        return
-      }
-
-      await pauseFor(250)
+  private async getStatus(): Promise<{
+    status: 'running'
+    guid: string
+    progress: T.FullProgress
+  } | void> {
+    const res = await this.api.getStatus()
 
-      setTimeout(() => this.poll(), 0) // prevent call stack from growing
-    } catch (e: any) {
-      this.errorToastService.present(e)
+    if (!res) {
+      this.navCtrl.navigateRoot('/home')
+    } else if (res.status === 'complete') {
+      this.navCtrl.navigateForward(`/success`)
+    } else {
+      return res
     }
   }
-}
-
-@Pipe({
-  name: 'toMessage',
-})
-export class ToMessagePipe implements PipeTransform {
-  constructor(private readonly stateService: StateService) {}
 
-  transform(progress: number | null): string {
-    if (['fresh', 'attach'].includes(this.stateService.setupType || '')) {
-      return 'Setting up your server'
-    }
+  private getRunningStatus$(): Observable<{
+    status: 'running'
+    guid: string
+    progress: T.FullProgress
+  }> {
+    return from(this.getStatus()).pipe(
+      filter(Boolean),
+      catchError(e => {
+        this.errorToastService.present(e)
+        return of(e)
+      }),
+      take(1),
+    )
+  }
+}
 
-    if (!progress) {
-      return 'Calculating size'
-    } else if (progress < 1) {
-      return 'Copying data'
-    } else {
-      return 'Finalizing'
-    }
+function getDecimal(progress: T.Progress): number {
+  if (progress === true) {
+    return 1
+  } else if (!progress || !progress.total) {
+    return 0
+  } else {
+    return progress.total && progress.done / progress.total
   }
 }
+
+function getPhaseBytes(
+  progress:
+    | false
+    | {
+        done: number
+        total: number | null
+      },
+): string {
+  return progress === false ? '' : `: (${progress.done}/${progress.total})`
+}
diff --git a/web/projects/setup-wizard/src/app/services/api/api.service.ts b/web/projects/setup-wizard/src/app/services/api/api.service.ts
index 375e64a78..6719ce859 100644
--- a/web/projects/setup-wizard/src/app/services/api/api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/api.service.ts
@@ -1,16 +1,21 @@
 import * as jose from 'node-jose'
 import { DiskListResponse, StartOSDiskInfo } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
+import { WebSocketSubjectConfig } from 'rxjs/webSocket'
+import { Observable } from 'rxjs'
+
 export abstract class ApiService {
   pubkey?: jose.JWK.Key
 
-  abstract getStatus(): Promise<StatusRes> // setup.status
+  abstract getStatus(): Promise<T.SetupStatusRes | null> // setup.status
   abstract getPubKey(): Promise<void> // setup.get-pubkey
   abstract getDrives(): Promise<DiskListResponse> // setup.disk.list
-  abstract verifyCifs(cifs: CifsRecoverySource): Promise<StartOSDiskInfo> // setup.cifs.verify
-  abstract attach(importInfo: AttachReq): Promise<void> // setup.attach
-  abstract execute(setupInfo: ExecuteReq): Promise<void> // setup.execute
-  abstract complete(): Promise<CompleteRes> // setup.complete
+  abstract verifyCifs(cifs: T.VerifyCifsParams): Promise<StartOSDiskInfo> // setup.cifs.verify
+  abstract attach(importInfo: T.AttachParams): Promise<T.SetupProgress> // setup.attach
+  abstract execute(setupInfo: T.SetupExecuteParams): Promise<T.SetupProgress> // setup.execute
+  abstract complete(): Promise<T.SetupResult> // setup.complete
   abstract exit(): Promise<void> // setup.exit
+  abstract openProgressWebsocket$(guid: string): Observable<T.FullProgress>
 
   async encrypt(toEncrypt: string): Promise<Encrypted> {
     if (!this.pubkey) throw new Error('No pubkey found!')
@@ -27,29 +32,7 @@ type Encrypted = {
   encrypted: string
 }
 
-export type StatusRes = {
-  bytesTransferred: number
-  totalBytes: number | null
-  complete: boolean
-} | null
-
-export type AttachReq = {
-  guid: string
-  startOsPassword: Encrypted
-}
-
-export type ExecuteReq = {
-  startOsLogicalname: string
-  startOsPassword: Encrypted
-  recoverySource: RecoverySource | null
-  recoveryPassword: Encrypted | null
-}
-
-export type CompleteRes = {
-  torAddress: string
-  lanAddress: string
-  rootCa: string
-}
+export type WebsocketConfig<T> = Omit<WebSocketSubjectConfig<T>, 'url'>
 
 export type DiskBackupTarget = {
   vendor: string | null
@@ -68,27 +51,3 @@ export type CifsBackupTarget = {
   mountable: boolean
   startOs: StartOSDiskInfo | null
 }
-
-export type DiskRecoverySource = {
-  type: 'disk'
-  logicalname: string // partition logicalname
-}
-
-export type BackupRecoverySource = {
-  type: 'backup'
-  target: CifsRecoverySource | DiskRecoverySource
-}
-export type RecoverySource = BackupRecoverySource | DiskMigrateSource
-
-export type DiskMigrateSource = {
-  type: 'migrate'
-  guid: string
-}
-
-export type CifsRecoverySource = {
-  type: 'cifs'
-  hostname: string
-  path: string
-  username: string
-  password: Encrypted | null
-}
diff --git a/web/projects/setup-wizard/src/app/services/api/live-api.service.ts b/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
index 566cc84cf..f431f5151 100644
--- a/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core'
+import { Inject, Injectable } from '@angular/core'
 import {
   DiskListResponse,
   StartOSDiskInfo,
@@ -8,27 +8,35 @@ import {
   RpcError,
   RPCOptions,
 } from '@start9labs/shared'
-import {
-  ApiService,
-  CifsRecoverySource,
-  DiskRecoverySource,
-  StatusRes,
-  AttachReq,
-  ExecuteReq,
-  CompleteRes,
-} from './api.service'
+import { T } from '@start9labs/start-sdk'
+import { ApiService, WebsocketConfig } from './api.service'
 import * as jose from 'node-jose'
+import { Observable } from 'rxjs'
+import { DOCUMENT } from '@angular/common'
+import { webSocket } from 'rxjs/webSocket'
 
 @Injectable({
   providedIn: 'root',
 })
 export class LiveApiService extends ApiService {
-  constructor(private readonly http: HttpService) {
+  constructor(
+    private readonly http: HttpService,
+    @Inject(DOCUMENT) private readonly document: Document,
+  ) {
     super()
   }
 
-  async getStatus() {
-    return this.rpcRequest<StatusRes>({
+  openProgressWebsocket$(guid: string): Observable<T.FullProgress> {
+    const { location } = this.document.defaultView!
+    const host = location.host
+
+    return webSocket({
+      url: `ws://${host}/ws/rpc/${guid}`,
+    })
+  }
+
+  async getStatus(): Promise<T.SetupStatusRes | null> {
+    return this.rpcRequest<T.SetupStatusRes | null>({
       method: 'setup.status',
       params: {},
     })
@@ -41,7 +49,7 @@ export class LiveApiService extends ApiService {
    * this wil all public/private key, which means that there is no information loss
    * through the network.
    */
-  async getPubKey() {
+  async getPubKey(): Promise<void> {
     const response: jose.JWK.Key = await this.rpcRequest({
       method: 'setup.get-pubkey',
       params: {},
@@ -50,14 +58,14 @@ export class LiveApiService extends ApiService {
     this.pubkey = response
   }
 
-  async getDrives() {
+  async getDrives(): Promise<DiskListResponse> {
     return this.rpcRequest<DiskListResponse>({
       method: 'setup.disk.list',
       params: {},
     })
   }
 
-  async verifyCifs(source: CifsRecoverySource) {
+  async verifyCifs(source: T.VerifyCifsParams): Promise<StartOSDiskInfo> {
     source.path = source.path.replace('/\\/g', '/')
     return this.rpcRequest<StartOSDiskInfo>({
       method: 'setup.cifs.verify',
@@ -65,14 +73,14 @@ export class LiveApiService extends ApiService {
     })
   }
 
-  async attach(params: AttachReq) {
-    await this.rpcRequest<void>({
+  async attach(params: T.AttachParams): Promise<T.SetupProgress> {
+    return this.rpcRequest<T.SetupProgress>({
       method: 'setup.attach',
       params,
     })
   }
 
-  async execute(setupInfo: ExecuteReq) {
+  async execute(setupInfo: T.SetupExecuteParams): Promise<T.SetupProgress> {
     if (setupInfo.recoverySource?.type === 'backup') {
       if (isCifsSource(setupInfo.recoverySource.target)) {
         setupInfo.recoverySource.target.path =
@@ -80,14 +88,14 @@ export class LiveApiService extends ApiService {
       }
     }
 
-    await this.rpcRequest<void>({
+    return this.rpcRequest<T.SetupProgress>({
       method: 'setup.execute',
       params: setupInfo,
     })
   }
 
-  async complete() {
-    const res = await this.rpcRequest<CompleteRes>({
+  async complete(): Promise<T.SetupResult> {
+    const res = await this.rpcRequest<T.SetupResult>({
       method: 'setup.complete',
       params: {},
     })
@@ -98,7 +106,7 @@ export class LiveApiService extends ApiService {
     }
   }
 
-  async exit() {
+  async exit(): Promise<void> {
     await this.rpcRequest<void>({
       method: 'setup.exit',
       params: {},
@@ -119,7 +127,7 @@ export class LiveApiService extends ApiService {
 }
 
 function isCifsSource(
-  source: CifsRecoverySource | DiskRecoverySource | null,
-): source is CifsRecoverySource {
-  return !!(source as CifsRecoverySource)?.hostname
+  source: T.BackupTargetFS | null,
+): source is T.Cifs & { type: 'cifs' } {
+  return !!(source as T.Cifs)?.hostname
 }
diff --git a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
index df32bd09e..0a1c221f7 100644
--- a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
@@ -1,42 +1,151 @@
 import { Injectable } from '@angular/core'
-import { encodeBase64, pauseFor } from '@start9labs/shared'
 import {
-  ApiService,
-  AttachReq,
-  CifsRecoverySource,
-  CompleteRes,
-  ExecuteReq,
-} from './api.service'
+  DiskListResponse,
+  StartOSDiskInfo,
+  encodeBase64,
+  pauseFor,
+} from '@start9labs/shared'
+import { ApiService } from './api.service'
 import * as jose from 'node-jose'
-
-let tries: number
+import { T } from '@start9labs/start-sdk'
+import {
+  Observable,
+  concatMap,
+  delay,
+  from,
+  interval,
+  map,
+  mergeScan,
+  of,
+  startWith,
+  switchMap,
+  switchScan,
+  takeWhile,
+} from 'rxjs'
 
 @Injectable({
   providedIn: 'root',
 })
 export class MockApiService extends ApiService {
-  async getStatus() {
-    const restoreOrMigrate = true
-    await pauseFor(1000)
+  // fullProgress$(): Observable<T.FullProgress> {
+  //   const phases = [
+  //     {
+  //       name: 'Preparing Data',
+  //       progress: null,
+  //     },
+  //     {
+  //       name: 'Transferring Data',
+  //       progress: null,
+  //     },
+  //     {
+  //       name: 'Finalizing Setup',
+  //       progress: null,
+  //     },
+  //   ]
 
-    if (tries === undefined) {
-      tries = 0
-      return null
-    }
+  //   return from(phases).pipe(
+  //     switchScan((acc, val, i) => {}, { overall: null, phases }),
+  //   )
+  // }
 
-    tries++
+  // namedProgress$(namedProgress: T.NamedProgress): Observable<T.NamedProgress> {
+  //   return of(namedProgress).pipe(startWith(namedProgress))
+  // }
 
-    const total = tries <= 4 ? tries * 268435456 : 1073741824
-    const progress = tries > 4 ? (tries - 4) * 268435456 : 0
+  // progress$(progress: T.Progress): Observable<T.Progress> {}
 
-    return {
-      bytesTransferred: restoreOrMigrate ? progress : 0,
-      totalBytes: restoreOrMigrate ? total : null,
-      complete: progress === total,
+  // websocket
+
+  openProgressWebsocket$(guid: string): Observable<T.FullProgress> {
+    return of(PROGRESS)
+    // const numPhases = PROGRESS.phases.length
+
+    // return of(PROGRESS).pipe(
+    //   switchMap(full =>
+    //     from(PROGRESS.phases).pipe(
+    //       mergeScan((full, phase, i) => {
+    //         if (
+    //           !phase.progress ||
+    //           typeof phase.progress !== 'object' ||
+    //           !phase.progress.total
+    //         ) {
+    //           full.phases[i].progress = true
+
+    //           if (
+    //             full.overall &&
+    //             typeof full.overall === 'object' &&
+    //             full.overall.total
+    //           ) {
+    //             const step = full.overall.total / numPhases
+    //             full.overall.done += step
+    //           }
+
+    //           return of(full).pipe(delay(2000))
+    //         } else {
+    //           const total = phase.progress.total
+    //           const step = total / 4
+    //           let done = phase.progress.done
+
+    //           return interval(1000).pipe(
+    //             takeWhile(() => done < total),
+    //             map(() => {
+    //               done += step
+
+    //               console.error(done)
+
+    //               if (
+    //                 full.overall &&
+    //                 typeof full.overall === 'object' &&
+    //                 full.overall.total
+    //               ) {
+    //                 const step = full.overall.total / numPhases / 4
+
+    //                 full.overall.done += step
+    //               }
+
+    //               if (done === total) {
+    //                 full.phases[i].progress = true
+
+    //                 if (i === numPhases - 1) {
+    //                   full.overall = true
+    //                 }
+    //               }
+    //               return full
+    //             }),
+    //           )
+    //         }
+    //       }, full),
+    //     ),
+    //   ),
+    // )
+  }
+
+  private statusIndex = 0
+  async getStatus(): Promise<T.SetupStatusRes | null> {
+    await pauseFor(1000)
+
+    this.statusIndex++
+
+    switch (this.statusIndex) {
+      case 2:
+        return {
+          status: 'running',
+          progress: PROGRESS,
+          guid: 'progress-guid',
+        }
+      case 3:
+        return {
+          status: 'complete',
+          torAddress: 'https://asdafsadasdasasdasdfasdfasdf.onion',
+          lanAddress: 'https://adjective-noun.local',
+          rootCa: encodeBase64(rootCA),
+        }
+      default:
+        return null
     }
   }
 
-  async getPubKey() {
+  async getPubKey(): Promise<void> {
     await pauseFor(1000)
 
     // randomly generated
@@ -52,7 +161,7 @@ export class MockApiService extends ApiService {
     })
   }
 
-  async getDrives() {
+  async getDrives(): Promise<DiskListResponse> {
     await pauseFor(1000)
     return [
       {
@@ -127,7 +236,7 @@ export class MockApiService extends ApiService {
     ]
   }
 
-  async verifyCifs(params: CifsRecoverySource) {
+  async verifyCifs(params: T.VerifyCifsParams): Promise<StartOSDiskInfo> {
     await pauseFor(1000)
     return {
       version: '0.3.0',
@@ -138,15 +247,25 @@ export class MockApiService extends ApiService {
     }
   }
 
-  async attach(params: AttachReq) {
+  async attach(params: T.AttachParams): Promise<T.SetupProgress> {
     await pauseFor(1000)
+
+    return {
+      progress: PROGRESS,
+      guid: 'progress-guid',
+    }
   }
 
-  async execute(setupInfo: ExecuteReq) {
+  async execute(setupInfo: T.SetupExecuteParams): Promise<T.SetupProgress> {
     await pauseFor(1000)
+
+    return {
+      progress: PROGRESS,
+      guid: 'progress-guid',
+    }
   }
 
-  async complete(): Promise<CompleteRes> {
+  async complete(): Promise<T.SetupResult> {
     await pauseFor(1000)
     return {
       torAddress: 'https://asdafsadasdasasdasdfasdfasdf.onion',
@@ -155,7 +274,7 @@ export class MockApiService extends ApiService {
     }
   }
 
-  async exit() {
+  async exit(): Promise<void> {
     await pauseFor(1000)
   }
 }
@@ -182,3 +301,8 @@ Rf3ZOPm9QP92YpWyYDkfAU04xdDo1vR0MYjKPkl4LjRqSU/tcCJnPMbJiwq+bWpX
 2WJoEBXB/p15Kn6JxjI0ze2SnSI48JZ8it4fvxrhOo0VoLNIuCuNXJOwU17Rdl1W
 YJidaq7je6k18AdgPA0Kh8y1XtfUH3fTaVw4
 -----END CERTIFICATE-----`
+
+const PROGRESS = {
+  overall: null,
+  phases: [],
+}
diff --git a/web/projects/setup-wizard/src/app/services/state.service.ts b/web/projects/setup-wizard/src/app/services/state.service.ts
index 916b066ee..8c653a088 100644
--- a/web/projects/setup-wizard/src/app/services/state.service.ts
+++ b/web/projects/setup-wizard/src/app/services/state.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from '@angular/core'
-import { ApiService, RecoverySource } from './api/api.service'
+import { ApiService } from './api/api.service'
+import { T } from '@start9labs/start-sdk'
 
 @Injectable({
   providedIn: 'root',
 })
 export class StateService {
   setupType?: 'fresh' | 'restore' | 'attach' | 'transfer'
-
-  recoverySource?: RecoverySource
+  recoverySource?: T.RecoverySource
   recoveryPassword?: string
 
   constructor(private readonly api: ApiService) {}
diff --git a/web/projects/shared/src/types/api.ts b/web/projects/shared/src/types/api.ts
index 26cd00218..743ea6ac8 100644
--- a/web/projects/shared/src/types/api.ts
+++ b/web/projects/shared/src/types/api.ts
@@ -13,6 +13,7 @@ export type LogsRes = {
 export interface Log {
   timestamp: string
   message: string
+  bootId: string
 }
 
 export type DiskListResponse = DiskInfo[]
diff --git a/web/projects/ui/src/app/app-routing.module.ts b/web/projects/ui/src/app/app-routing.module.ts
index ddb66d3c5..e7a2036ec 100644
--- a/web/projects/ui/src/app/app-routing.module.ts
+++ b/web/projects/ui/src/app/app-routing.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core'
 import { PreloadAllModules, RouterModule, Routes } from '@angular/router'
+import { stateNot } from 'src/app/services/state.service'
 import { AuthGuard } from './guards/auth.guard'
 import { UnauthGuard } from './guards/unauth.guard'
 
@@ -15,15 +16,29 @@ const routes: Routes = [
     loadChildren: () =>
       import('./pages/login/login.module').then(m => m.LoginPageModule),
   },
+  {
+    path: 'diagnostic',
+    canActivate: [stateNot(['initializing', 'running'])],
+    loadChildren: () =>
+      import('./pages/diagnostic-routes/diagnostic-routing.module').then(
+        m => m.DiagnosticModule,
+      ),
+  },
+  {
+    path: 'initializing',
+    canActivate: [stateNot(['error', 'running'])],
+    loadChildren: () =>
+      import('./pages/init/init.module').then(m => m.InitPageModule),
+  },
   {
     path: 'home',
-    canActivate: [AuthGuard],
+    canActivate: [AuthGuard, stateNot(['error', 'initializing'])],
     loadChildren: () =>
       import('./pages/home/home.module').then(m => m.HomePageModule),
   },
   {
     path: 'system',
-    canActivate: [AuthGuard],
+    canActivate: [AuthGuard, stateNot(['error', 'initializing'])],
     canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/server-routes/server-routing.module').then(
@@ -32,14 +47,14 @@ const routes: Routes = [
   },
   {
     path: 'updates',
-    canActivate: [AuthGuard],
+    canActivate: [AuthGuard, stateNot(['error', 'initializing'])],
     canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/updates/updates.module').then(m => m.UpdatesPageModule),
   },
   {
     path: 'marketplace',
-    canActivate: [AuthGuard],
+    canActivate: [AuthGuard, stateNot(['error', 'initializing'])],
     canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/marketplace-routes/marketplace-routing.module').then(
@@ -48,7 +63,7 @@ const routes: Routes = [
   },
   {
     path: 'notifications',
-    canActivate: [AuthGuard],
+    canActivate: [AuthGuard, stateNot(['error', 'initializing'])],
     loadChildren: () =>
       import('./pages/notifications/notifications.module').then(
         m => m.NotificationsPageModule,
@@ -56,7 +71,7 @@ const routes: Routes = [
   },
   {
     path: 'services',
-    canActivate: [AuthGuard],
+    canActivate: [AuthGuard, stateNot(['error', 'initializing'])],
     canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/apps-routes/apps-routing.module').then(
diff --git a/web/projects/ui/src/app/app.component.html b/web/projects/ui/src/app/app.component.html
index 0506d5214..0d9fb860f 100644
--- a/web/projects/ui/src/app/app.component.html
+++ b/web/projects/ui/src/app/app.component.html
@@ -15,6 +15,7 @@
           type="overlay"
           side="start"
           class="left-menu"
+          [class.left-menu_hidden]="withoutMenu"
         >
           <ion-content color="light" scrollY="false" class="menu">
             <app-menu *ngIf="authService.isVerified$ | async"></app-menu>
diff --git a/web/projects/ui/src/app/app.component.scss b/web/projects/ui/src/app/app.component.scss
index 55135b1e5..aedbdc6c4 100644
--- a/web/projects/ui/src/app/app.component.scss
+++ b/web/projects/ui/src/app/app.component.scss
@@ -9,11 +9,15 @@ tui-root {
 
 .left-menu {
   --side-max-width: 280px;
+
+  &_hidden {
+    display: none;
+  }
 }
 
 .menu {
   :host-context(body[data-theme='Light']) & {
-    --ion-color-base: #F4F4F5 !important;
+    --ion-color-base: #f4f4f5 !important;
   }
 }
 
diff --git a/web/projects/ui/src/app/app.component.ts b/web/projects/ui/src/app/app.component.ts
index 1210eba7a..ddf8c074f 100644
--- a/web/projects/ui/src/app/app.component.ts
+++ b/web/projects/ui/src/app/app.component.ts
@@ -1,4 +1,5 @@
 import { Component, inject, OnDestroy } from '@angular/core'
+import { IsActiveMatchOptions, Router } from '@angular/router'
 import { combineLatest, map, merge, startWith } from 'rxjs'
 import { AuthService } from './services/auth.service'
 import { SplitPaneTracker } from './services/split-pane.service'
@@ -15,6 +16,13 @@ import { THEME } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
 import { DataModel } from './services/patch-db/data-model'
 
+const OPTIONS: IsActiveMatchOptions = {
+  paths: 'subset',
+  queryParams: 'exact',
+  fragment: 'ignored',
+  matrixParams: 'ignored',
+}
+
 @Component({
   selector: 'app-root',
   templateUrl: 'app.component.html',
@@ -27,7 +35,7 @@ export class AppComponent implements OnDestroy {
   readonly theme$ = inject(THEME)
   readonly offline$ = combineLatest([
     this.authService.isVerified$,
-    this.connection.connected$,
+    this.connection$,
     this.patch
       .watch$('serverInfo', 'statusInfo')
       .pipe(startWith({ restarting: false, shuttingDown: false })),
@@ -44,8 +52,9 @@ export class AppComponent implements OnDestroy {
     private readonly patchMonitor: PatchMonitorService,
     private readonly splitPane: SplitPaneTracker,
     private readonly patch: PatchDB<DataModel>,
+    private readonly router: Router,
     readonly authService: AuthService,
-    readonly connection: ConnectionService,
+    readonly connection$: ConnectionService,
     readonly clientStorageService: ClientStorageService,
     readonly themeSwitcher: ThemeSwitcherService,
   ) {}
@@ -56,6 +65,13 @@ export class AppComponent implements OnDestroy {
       .subscribe(name => this.titleService.setTitle(name || 'StartOS'))
   }
 
+  get withoutMenu(): boolean {
+    return (
+      this.router.isActive('initializing', OPTIONS) ||
+      this.router.isActive('diagnostic', OPTIONS)
+    )
+  }
+
   splitPaneVisible({ detail }: any) {
     this.splitPane.sidebarOpen$.next(detail.visible)
   }
diff --git a/web/projects/ui/src/app/app.module.ts b/web/projects/ui/src/app/app.module.ts
index 324300851..c0264f064 100644
--- a/web/projects/ui/src/app/app.module.ts
+++ b/web/projects/ui/src/app/app.module.ts
@@ -1,4 +1,5 @@
 import {
+  TuiAlertModule,
   TuiDialogModule,
   TuiModeModule,
   TuiRootModule,
@@ -58,6 +59,7 @@ import { environment } from '../environments/environment'
     ConnectionBarComponentModule,
     TuiRootModule,
     TuiDialogModule,
+    TuiAlertModule,
     TuiModeModule,
     TuiThemeNightModule,
     WidgetsPageModule,
diff --git a/web/projects/ui/src/app/app.providers.ts b/web/projects/ui/src/app/app.providers.ts
index 5d0ccc4f2..bf26a8cb9 100644
--- a/web/projects/ui/src/app/app.providers.ts
+++ b/web/projects/ui/src/app/app.providers.ts
@@ -10,6 +10,7 @@ import { AuthService } from './services/auth.service'
 import { ClientStorageService } from './services/client-storage.service'
 import { FilterPackagesPipe } from '../../../marketplace/src/pipes/filter-packages.pipe'
 import { ThemeSwitcherService } from './services/theme-switcher.service'
+import { StorageService } from './services/storage.service'
 
 const {
   useMocks,
@@ -30,7 +31,7 @@ export const APP_PROVIDERS: Provider[] = [
   },
   {
     provide: APP_INITIALIZER,
-    deps: [AuthService, ClientStorageService, Router],
+    deps: [StorageService, AuthService, ClientStorageService, Router],
     useFactory: appInitializer,
     multi: true,
   },
@@ -45,13 +46,15 @@ export const APP_PROVIDERS: Provider[] = [
 ]
 
 export function appInitializer(
+  storage: StorageService,
   auth: AuthService,
   localStorage: ClientStorageService,
   router: Router,
 ): () => void {
   return () => {
+    storage.migrate036()
     auth.init()
-    localStorage.init()
+    localStorage.init() // @TODO pretty sure we can navigate before this step
     router.initialNavigation()
   }
 }
diff --git a/web/projects/ui/src/app/app/menu/menu.component.ts b/web/projects/ui/src/app/app/menu/menu.component.ts
index 5c1fbe8bd..b2ab62368 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.ts
+++ b/web/projects/ui/src/app/app/menu/menu.component.ts
@@ -70,7 +70,7 @@ export class MenuComponent {
 
   readonly showEOSUpdate$ = this.eosService.showUpdate$
 
-  private readonly local$ = this.connectionService.connected$.pipe(
+  private readonly local$ = this.connection$.pipe(
     filter(Boolean),
     switchMap(() => this.patch.watch$('packageData').pipe(first())),
     switchMap(outer =>
@@ -126,6 +126,6 @@ export class MenuComponent {
     private readonly marketplaceService: MarketplaceService,
     private readonly splitPane: SplitPaneTracker,
     private readonly emver: Emver,
-    private readonly connectionService: ConnectionService,
+    private readonly connection$: ConnectionService,
   ) {}
 }
diff --git a/web/projects/ui/src/app/components/connection-bar/connection-bar.component.ts b/web/projects/ui/src/app/components/connection-bar/connection-bar.component.ts
index da28f805f..cf0eab598 100644
--- a/web/projects/ui/src/app/components/connection-bar/connection-bar.component.ts
+++ b/web/projects/ui/src/app/components/connection-bar/connection-bar.component.ts
@@ -1,8 +1,9 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { PatchDB } from 'patch-db-client'
 import { combineLatest, map, Observable, startWith } from 'rxjs'
-import { ConnectionService } from 'src/app/services/connection.service'
+import { NetworkService } from 'src/app/services/network.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
+import { StateService } from 'src/app/services/state.service'
 
 @Component({
   selector: 'connection-bar',
@@ -11,16 +12,14 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ConnectionBarComponent {
-  private readonly websocket$ = this.connectionService.websocketConnected$
-
   readonly connection$: Observable<{
     message: string
     color: string
     icon: string
     dots: boolean
   }> = combineLatest([
-    this.connectionService.networkConnected$,
-    this.websocket$.pipe(startWith(false)),
+    this.network$,
+    this.state$.pipe(map(Boolean)),
     this.patch
       .watch$('serverInfo', 'statusInfo')
       .pipe(startWith({ restarting: false, shuttingDown: false })),
@@ -65,7 +64,8 @@ export class ConnectionBarComponent {
   )
 
   constructor(
-    private readonly connectionService: ConnectionService,
+    private readonly network$: NetworkService,
+    private readonly state$: StateService,
     private readonly patch: PatchDB<DataModel>,
   ) {}
 }
diff --git a/web/projects/ui/src/app/components/logs/logs.component.ts b/web/projects/ui/src/app/components/logs/logs.component.ts
index 5d033fc83..3d31313cb 100644
--- a/web/projects/ui/src/app/components/logs/logs.component.ts
+++ b/web/projects/ui/src/app/components/logs/logs.component.ts
@@ -11,7 +11,6 @@ import {
   takeUntil,
   tap,
 } from 'rxjs'
-import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 import {
   LogsRes,
   ServerLogsReq,
@@ -72,7 +71,7 @@ export class LogsComponent {
     private readonly api: ApiService,
     private readonly loadingCtrl: LoadingController,
     private readonly downloadHtml: DownloadHTMLService,
-    private readonly connectionService: ConnectionService,
+    private readonly connection$: ConnectionService,
   ) {}
 
   async ngOnInit() {
@@ -149,43 +148,42 @@ export class LogsComponent {
   private reconnect$(): Observable<Log[]> {
     return from(this.followLogs({})).pipe(
       tap(_ => this.recordConnectionChange()),
-      switchMap(({ guid }) => this.connect$(guid, true)),
+      switchMap(({ guid }) => this.connect$(guid)),
     )
   }
 
-  private connect$(guid: string, reconnect = false) {
-    const config: WebSocketSubjectConfig<Log> = {
-      url: `/rpc/${guid}`,
-      openObserver: {
-        next: () => {
-          this.websocketStatus = 'connected'
+  private connect$(guid: string) {
+    return this.api
+      .openWebsocket$<Log>(guid, {
+        openObserver: {
+          next: () => {
+            this.websocketStatus = 'connected'
+          },
         },
-      },
-    }
-
-    return this.api.openLogsWebsocket$(config).pipe(
-      tap(_ => this.count++),
-      bufferTime(1000),
-      tap(msgs => {
-        this.loading = false
-        this.processRes({ entries: msgs })
-        if (this.infiniteStatus === 0 && this.count >= this.limit)
-          this.infiniteStatus = 1
-      }),
-      catchError(() => {
-        this.recordConnectionChange(false)
-        return this.connectionService.connected$.pipe(
-          tap(
-            connected =>
-              (this.websocketStatus = connected
-                ? 'reconnecting'
-                : 'disconnected'),
-          ),
-          filter(Boolean),
-          switchMap(() => this.reconnect$()),
-        )
-      }),
-    )
+      })
+      .pipe(
+        tap(_ => this.count++),
+        bufferTime(1000),
+        tap(msgs => {
+          this.loading = false
+          this.processRes({ entries: msgs })
+          if (this.infiniteStatus === 0 && this.count >= this.limit)
+            this.infiniteStatus = 1
+        }),
+        catchError(() => {
+          this.recordConnectionChange(false)
+          return this.connection$.pipe(
+            tap(
+              connected =>
+                (this.websocketStatus = connected
+                  ? 'reconnecting'
+                  : 'disconnected'),
+            ),
+            filter(Boolean),
+            switchMap(() => this.reconnect$()),
+          )
+        }),
+      )
   }
 
   private recordConnectionChange(success = true) {
diff --git a/web/projects/ui/src/app/components/status/status.component.html b/web/projects/ui/src/app/components/status/status.component.html
index db9e8f8f7..65c142f4a 100644
--- a/web/projects/ui/src/app/components/status/status.component.html
+++ b/web/projects/ui/src/app/components/status/status.component.html
@@ -1,12 +1,12 @@
 <p
   [style.color]="
-    (connected$ | async) ? 'var(--ion-color-' + rendering.color + ')' : 'gray'
+    (connection$ | async) ? 'var(--ion-color-' + rendering.color + ')' : 'gray'
   "
   [style.font-size]="size"
   [style.font-style]="style"
   [style.font-weight]="weight"
 >
-  {{ (connected$ | async) ? rendering.display : 'Unknown' }}
+  {{ (connection$ | async) ? rendering.display : 'Unknown' }}
 
   <span *ngIf="sigtermTimeout && (sigtermTimeout | durationToSeconds) > 30">
     . This may take a while
diff --git a/web/projects/ui/src/app/components/status/status.component.ts b/web/projects/ui/src/app/components/status/status.component.ts
index c9fec4968..45f66f291 100644
--- a/web/projects/ui/src/app/components/status/status.component.ts
+++ b/web/projects/ui/src/app/components/status/status.component.ts
@@ -21,7 +21,5 @@ export class StatusComponent {
   @Input() installingInfo?: InstallingInfo
   @Input() sigtermTimeout?: string | null = null
 
-  readonly connected$ = this.connectionService.connected$
-
-  constructor(private readonly connectionService: ConnectionService) {}
+  constructor(readonly connection$: ConnectionService) {}
 }
diff --git a/web/projects/ui/src/app/modals/os-update/os-update.page.ts b/web/projects/ui/src/app/modals/os-update/os-update.page.ts
index 9c49b72bf..9900bbb47 100644
--- a/web/projects/ui/src/app/modals/os-update/os-update.page.ts
+++ b/web/projects/ui/src/app/modals/os-update/os-update.page.ts
@@ -20,9 +20,8 @@ export class OSUpdatePage {
     private readonly embassyApi: ApiService,
     private readonly eosService: EOSService,
   ) {}
-
   ngOnInit() {
-    const releaseNotes = this.eosService.eos?.releaseNotes!
+    const releaseNotes = this.eosService.osUpdate?.releaseNotes!
 
     this.versions = Object.keys(releaseNotes)
       .sort()
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
index 8f1af1470..b0bfbbb24 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="connected$ | async; else disconnected">
+<ng-container *ngIf="connection$ | async; else disconnected">
   <ion-icon
     *ngIf="pkg.error; else noError"
     class="warning-icon"
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts
index 7ae537ad8..6fb6d4baf 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts
@@ -12,7 +12,5 @@ export class AppListIconComponent {
   @Input()
   pkg!: PkgInfo
 
-  readonly connected$ = this.connectionService.connected$
-
-  constructor(private readonly connectionService: ConnectionService) {}
+  constructor(readonly connection$: ConnectionService) {}
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
index 3668adc7b..8e4bb760d 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="!(healthChecks | empty)">
   <ion-item-divider>Health Checks</ion-item-divider>
   <!-- connected -->
-  <ng-container *ngIf="connected$ | async; else disconnected">
+  <ng-container *ngIf="connection$ | async; else disconnected">
     <ion-item *ngFor="let check of healthChecks | keyvalue">
       <!-- result -->
       <ng-container *ngIf="check.value.result as result; else noResult">
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
index f3db08063..fef84a5ba 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
@@ -12,9 +12,7 @@ export class AppShowHealthChecksComponent {
   @Input()
   healthChecks!: Record<string, T.HealthCheckResult>
 
-  readonly connected$ = this.connectionService.connected$
-
-  constructor(private readonly connectionService: ConnectionService) {}
+  constructor(readonly connection$: ConnectionService) {}
 
   isLoading(result: T.HealthCheckResult['result']): boolean {
     return result === 'starting' || result === 'loading'
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index f9db34c73..be7bc1c30 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -11,7 +11,7 @@
   </ion-label>
 </ion-item>
 
-<ng-container *ngIf="isInstalled(pkg) && (connected$ | async)">
+<ng-container *ngIf="isInstalled(pkg) && (connection$ | async)">
   <ion-grid>
     <ion-row style="padding-left: 12px">
       <ion-col>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 4bc1bc464..ba60c331d 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -39,8 +39,6 @@ export class AppShowStatusComponent {
 
   isInstalled = isInstalled
 
-  readonly connected$ = this.connectionService.connected$
-
   constructor(
     private readonly alertCtrl: AlertController,
     private readonly errToast: ErrorToastService,
@@ -48,7 +46,7 @@ export class AppShowStatusComponent {
     private readonly embassyApi: ApiService,
     private readonly launcherService: UiLauncherService,
     private readonly modalService: ModalService,
-    private readonly connectionService: ConnectionService,
+    readonly connection$: ConnectionService,
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
diff --git a/web/projects/ui/src/app/pages/diagnostic-routes/diagnostic-routing.module.ts b/web/projects/ui/src/app/pages/diagnostic-routes/diagnostic-routing.module.ts
new file mode 100644
index 000000000..4409288c1
--- /dev/null
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/diagnostic-routing.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+
+const ROUTES: Routes = [
+  {
+    path: '',
+    loadChildren: () =>
+      import('./home/home.module').then(m => m.HomePageModule),
+  },
+  {
+    path: 'logs',
+    loadChildren: () =>
+      import('./logs/logs.module').then(m => m.LogsPageModule),
+  },
+]
+
+@NgModule({
+  imports: [RouterModule.forChild(ROUTES)],
+  exports: [RouterModule],
+})
+export class DiagnosticModule {}
diff --git a/web/projects/diagnostic-ui/src/app/pages/home/home.module.ts b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.module.ts
similarity index 55%
rename from web/projects/diagnostic-ui/src/app/pages/home/home.module.ts
rename to web/projects/ui/src/app/pages/diagnostic-routes/home/home.module.ts
index 1664b7c72..9565220ae 100644
--- a/web/projects/diagnostic-ui/src/app/pages/home/home.module.ts
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.module.ts
@@ -1,12 +1,18 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
+import { Routes, RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
-import { FormsModule } from '@angular/forms'
 import { HomePage } from './home.page'
-import { HomePageRoutingModule } from './home-routing.module'
+
+const routes: Routes = [
+  {
+    path: '',
+    component: HomePage,
+  },
+]
 
 @NgModule({
-  imports: [CommonModule, FormsModule, IonicModule, HomePageRoutingModule],
+  imports: [CommonModule, IonicModule, RouterModule.forChild(routes)],
   declarations: [HomePage],
 })
 export class HomePageModule {}
diff --git a/web/projects/diagnostic-ui/src/app/pages/home/home.page.html b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.html
similarity index 92%
rename from web/projects/diagnostic-ui/src/app/pages/home/home.page.html
rename to web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.html
index 9cba08258..69a58a3aa 100644
--- a/web/projects/diagnostic-ui/src/app/pages/home/home.page.html
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.html
@@ -51,12 +51,6 @@
           }}
         </ion-button>
 
-        <div class="ion-padding-top">
-          <ion-button (click)="presentAlertSystemRebuild()" color="warning">
-            System Rebuild
-          </ion-button>
-        </div>
-
         <div class="ion-padding-top">
           <ion-button (click)="presentAlertRepairDisk()" color="danger">
             Repair Drive
diff --git a/web/projects/diagnostic-ui/src/app/pages/home/home.page.scss b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.scss
similarity index 100%
rename from web/projects/diagnostic-ui/src/app/pages/home/home.page.scss
rename to web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.scss
diff --git a/web/projects/diagnostic-ui/src/app/pages/home/home.page.ts b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
similarity index 74%
rename from web/projects/diagnostic-ui/src/app/pages/home/home.page.ts
rename to web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
index bbda6939f..9bb7376bc 100644
--- a/web/projects/diagnostic-ui/src/app/pages/home/home.page.ts
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core'
 import { AlertController, LoadingController } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 @Component({
-  selector: 'app-home',
+  selector: 'diagnostic-home',
   templateUrl: 'home.page.html',
   styleUrls: ['home.page.scss'],
 })
@@ -25,7 +25,7 @@ export class HomePage {
 
   async ngOnInit() {
     try {
-      const error = await this.api.getError()
+      const error = await this.api.diagnosticGetError()
       // incorrect drive
       if (error.code === 15) {
         this.error = {
@@ -92,7 +92,7 @@ export class HomePage {
     await loader.present()
 
     try {
-      await this.api.restart()
+      await this.api.diagnosticRestart()
       this.restarted = true
     } catch (e) {
       console.error(e)
@@ -108,8 +108,8 @@ export class HomePage {
     await loader.present()
 
     try {
-      await this.api.forgetDrive()
-      await this.api.restart()
+      await this.api.diagnosticForgetDrive()
+      await this.api.diagnosticRestart()
       this.restarted = true
     } catch (e) {
       console.error(e)
@@ -118,32 +118,6 @@ export class HomePage {
     }
   }
 
-  async presentAlertSystemRebuild() {
-    const alert = await this.alertCtrl.create({
-      header: 'Warning',
-      message:
-        '<p>This action will tear down all service containers and rebuild them from scratch. No data will be deleted.</p><p>A system rebuild can be useful if your system gets into a bad state, and it should only be performed if you are experiencing general performance or reliability issues.</p><p>It may take up to an hour to complete. During this time, you will lose all connectivity to your Start9 server.</p>',
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Rebuild',
-          handler: () => {
-            try {
-              this.systemRebuild()
-            } catch (e) {
-              console.error(e)
-            }
-          },
-        },
-      ],
-      cssClass: 'alert-warning-message',
-    })
-    await alert.present()
-  }
-
   async presentAlertRepairDisk() {
     const alert = await this.alertCtrl.create({
       header: 'Warning',
@@ -174,23 +148,6 @@ export class HomePage {
     window.location.reload()
   }
 
-  private async systemRebuild(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      cssClass: 'loader',
-    })
-    await loader.present()
-
-    try {
-      await this.api.systemRebuild()
-      await this.api.restart()
-      this.restarted = true
-    } catch (e) {
-      console.error(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
-
   private async repairDisk(): Promise<void> {
     const loader = await this.loadingCtrl.create({
       cssClass: 'loader',
@@ -198,8 +155,8 @@ export class HomePage {
     await loader.present()
 
     try {
-      await this.api.repairDisk()
-      await this.api.restart()
+      await this.api.diagnosticRepairDisk()
+      await this.api.diagnosticRestart()
       this.restarted = true
     } catch (e) {
       console.error(e)
diff --git a/web/projects/diagnostic-ui/src/app/pages/logs/logs.module.ts b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.module.ts
similarity index 100%
rename from web/projects/diagnostic-ui/src/app/pages/logs/logs.module.ts
rename to web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.module.ts
diff --git a/web/projects/diagnostic-ui/src/app/pages/logs/logs.page.html b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.html
similarity index 100%
rename from web/projects/diagnostic-ui/src/app/pages/logs/logs.page.html
rename to web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.html
diff --git a/web/projects/diagnostic-ui/src/app/pages/logs/logs.page.scss b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.scss
similarity index 100%
rename from web/projects/diagnostic-ui/src/app/pages/logs/logs.page.scss
rename to web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.scss
diff --git a/web/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
similarity index 93%
rename from web/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts
rename to web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
index 44c314a96..5119b9d93 100644
--- a/web/projects/diagnostic-ui/src/app/pages/logs/logs.page.ts
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild } from '@angular/core'
 import { IonContent } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ErrorToastService, toLocalIsoString } from '@start9labs/shared'
 
 var Convert = require('ansi-to-html')
@@ -49,7 +49,7 @@ export class LogsPage {
 
   private async getLogs() {
     try {
-      const { startCursor, entries } = await this.api.getLogs({
+      const { startCursor, entries } = await this.api.diagnosticGetLogs({
         cursor: this.startCursor,
         before: !!this.startCursor,
         limit: this.limit,
diff --git a/web/projects/ui/src/app/pages/init/init.module.ts b/web/projects/ui/src/app/pages/init/init.module.ts
new file mode 100644
index 000000000..07dd71185
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/init.module.ts
@@ -0,0 +1,24 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { TuiProgressModule } from '@taiga-ui/kit'
+import { LogsModule } from 'src/app/pages/init/logs/logs.module'
+import { InitPage } from './init.page'
+
+const routes: Routes = [
+  {
+    path: '',
+    component: InitPage,
+  },
+]
+
+@NgModule({
+  imports: [
+    CommonModule,
+    LogsModule,
+    TuiProgressModule,
+    RouterModule.forChild(routes),
+  ],
+  declarations: [InitPage],
+})
+export class InitPageModule {}
diff --git a/web/projects/ui/src/app/pages/init/init.page.html b/web/projects/ui/src/app/pages/init/init.page.html
new file mode 100644
index 000000000..bd3467bbb
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/init.page.html
@@ -0,0 +1,18 @@
+<section *ngIf="progress$ | async as progress">
+  <h1 [style.font-size.rem]="2.5" [style.margin.rem]="1">
+    Initializing StartOS
+  </h1>
+  <div class="center-wrapper" *ngIf="progress.total">
+    Progress: {{ (progress.total * 100).toFixed(0) }}%
+  </div>
+
+  <progress
+    tuiProgressBar
+    class="progress"
+    [style.max-width.rem]="40"
+    [style.margin]="'1rem auto'"
+    [attr.value]="progress.total"
+  ></progress>
+  <p [innerHTML]="progress.message"></p>
+</section>
+<logs-window></logs-window>
diff --git a/web/projects/ui/src/app/pages/init/init.page.scss b/web/projects/ui/src/app/pages/init/init.page.scss
new file mode 100644
index 000000000..9fbf7098a
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/init.page.scss
@@ -0,0 +1,23 @@
+section {
+  border-radius: 0.25rem;
+  padding: 1rem;
+  margin: 1.5rem;
+  text-align: center;
+  /* TODO: Theme */
+  background: #e0e0e0;
+  color: #333;
+  --tui-clear-inverse: rgba(0, 0, 0, 0.1);
+}
+
+logs-window {
+  display: flex;
+  flex-direction: column;
+  height: 18rem;
+  padding: 1rem;
+  margin: 0 1.5rem auto;
+  text-align: left;
+  overflow: hidden;
+  border-radius: 2rem;
+  /* TODO: Theme */
+  background: #181818;
+}
diff --git a/web/projects/ui/src/app/pages/init/init.page.ts b/web/projects/ui/src/app/pages/init/init.page.ts
new file mode 100644
index 000000000..318881223
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/init.page.ts
@@ -0,0 +1,11 @@
+import { Component, inject } from '@angular/core'
+import { InitService } from 'src/app/pages/init/init.service'
+
+@Component({
+  selector: 'init-page',
+  templateUrl: 'init.page.html',
+  styleUrls: ['init.page.scss'],
+})
+export class InitPage {
+  readonly progress$ = inject(InitService)
+}
diff --git a/web/projects/ui/src/app/pages/init/init.service.ts b/web/projects/ui/src/app/pages/init/init.service.ts
new file mode 100644
index 000000000..3cca42a58
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/init.service.ts
@@ -0,0 +1,91 @@
+import { inject, Injectable } from '@angular/core'
+import { ErrorToastService } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
+import {
+  catchError,
+  defer,
+  EMPTY,
+  from,
+  map,
+  Observable,
+  startWith,
+  switchMap,
+  tap,
+} from 'rxjs'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { StateService } from 'src/app/services/state.service'
+
+interface MappedProgress {
+  readonly total: number | null
+  readonly message: string
+}
+
+@Injectable({ providedIn: 'root' })
+export class InitService extends Observable<MappedProgress> {
+  private readonly state = inject(StateService)
+  private readonly api = inject(ApiService)
+  private readonly errorService = inject(ErrorToastService)
+  private readonly progress$ = defer(() =>
+    from(this.api.initGetProgress()),
+  ).pipe(
+    switchMap(({ guid, progress }) =>
+      this.api
+        .openWebsocket$<T.FullProgress>(guid, {})
+        .pipe(startWith(progress)),
+    ),
+    map(({ phases, overall }) => {
+      return {
+        total: getOverallDecimal(overall),
+        message: phases
+          .filter(
+            (
+              p,
+            ): p is {
+              name: string
+              progress: {
+                done: number
+                total: number | null
+              }
+            } => p.progress !== true && p.progress !== null,
+          )
+          .map(p => `<b>${p.name}</b>${getPhaseBytes(p.progress)}`)
+          .join(', '),
+      }
+    }),
+    tap(({ total }) => {
+      if (total === 1) {
+        this.state.syncState()
+      }
+    }),
+    catchError(e => {
+      this.errorService.present(e)
+
+      return EMPTY
+    }),
+  )
+
+  constructor() {
+    super(subscriber => this.progress$.subscribe(subscriber))
+  }
+}
+
+function getOverallDecimal(progress: T.Progress): number {
+  if (progress === true) {
+    return 1
+  } else if (!progress || !progress.total) {
+    return 0
+  } else {
+    return progress.total && progress.done / progress.total
+  }
+}
+
+function getPhaseBytes(
+  progress:
+    | false
+    | {
+        done: number
+        total: number | null
+      },
+): string {
+  return progress === false ? '' : `: (${progress.done}/${progress.total})`
+}
diff --git a/web/projects/ui/src/app/pages/init/logs/logs.component.ts b/web/projects/ui/src/app/pages/init/logs/logs.component.ts
new file mode 100644
index 000000000..edce1f282
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/logs/logs.component.ts
@@ -0,0 +1,33 @@
+import { Component, ElementRef, inject } from '@angular/core'
+import { INTERSECTION_ROOT } from '@ng-web-apis/intersection-observer'
+import { LogsService } from 'src/app/pages/init/logs/logs.service'
+
+@Component({
+  selector: 'logs-window',
+  templateUrl: 'logs.template.html',
+  styles: [
+    `
+      pre {
+        margin: 0;
+      }
+    `,
+  ],
+  providers: [
+    {
+      provide: INTERSECTION_ROOT,
+      useExisting: ElementRef,
+    },
+  ],
+})
+export class LogsComponent {
+  readonly logs$ = inject(LogsService)
+  scroll = true
+
+  scrollTo(bottom: HTMLElement) {
+    if (this.scroll) bottom.scrollIntoView({ behavior: 'smooth' })
+  }
+
+  onBottom([{ isIntersecting }]: readonly IntersectionObserverEntry[]) {
+    this.scroll = isIntersecting
+  }
+}
diff --git a/web/projects/ui/src/app/pages/init/logs/logs.module.ts b/web/projects/ui/src/app/pages/init/logs/logs.module.ts
new file mode 100644
index 000000000..ee4a1bc1d
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/logs/logs.module.ts
@@ -0,0 +1,20 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { IntersectionObserverModule } from '@ng-web-apis/intersection-observer'
+import { MutationObserverModule } from '@ng-web-apis/mutation-observer'
+import { TuiScrollbarModule } from '@taiga-ui/core'
+import { NgDompurifyModule } from '@tinkoff/ng-dompurify'
+import { LogsComponent } from './logs.component'
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MutationObserverModule,
+    IntersectionObserverModule,
+    NgDompurifyModule,
+    TuiScrollbarModule,
+  ],
+  declarations: [LogsComponent],
+  exports: [LogsComponent],
+})
+export class LogsModule {}
diff --git a/web/projects/ui/src/app/pages/init/logs/logs.service.ts b/web/projects/ui/src/app/pages/init/logs/logs.service.ts
new file mode 100644
index 000000000..e06d56b42
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/logs/logs.service.ts
@@ -0,0 +1,49 @@
+import { inject, Injectable } from '@angular/core'
+import { Log, toLocalIsoString } from '@start9labs/shared'
+import {
+  bufferTime,
+  defer,
+  filter,
+  map,
+  Observable,
+  scan,
+  switchMap,
+} from 'rxjs'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+
+var Convert = require('ansi-to-html')
+var convert = new Convert({
+  newline: true,
+  bg: 'transparent',
+  colors: {
+    4: 'Cyan',
+  },
+  escapeXML: true,
+})
+
+function convertAnsi(entries: readonly any[]): string {
+  return entries
+    .map(
+      ({ timestamp, message }) =>
+        `<b style="color: #FFF">${toLocalIsoString(
+          new Date(timestamp),
+        )}</b>&nbsp;&nbsp;${convert.toHtml(message)}`,
+    )
+    .join('<br />')
+}
+
+@Injectable({ providedIn: 'root' })
+export class LogsService extends Observable<readonly string[]> {
+  private readonly api = inject(ApiService)
+  private readonly log$ = defer(() => this.api.initFollowLogs({})).pipe(
+    switchMap(({ guid }) => this.api.openWebsocket$<Log>(guid, {})),
+    bufferTime(250),
+    filter(logs => !!logs.length),
+    map(convertAnsi),
+    scan((logs: readonly string[], log) => [...logs, log], []),
+  )
+
+  constructor() {
+    super(subscriber => this.log$.subscribe(subscriber))
+  }
+}
diff --git a/web/projects/ui/src/app/pages/init/logs/logs.template.html b/web/projects/ui/src/app/pages/init/logs/logs.template.html
new file mode 100644
index 000000000..24ea6d0c1
--- /dev/null
+++ b/web/projects/ui/src/app/pages/init/logs/logs.template.html
@@ -0,0 +1,9 @@
+<tui-scrollbar childList subtree (waMutationObserver)="scrollTo(bottom)">
+  <pre *ngFor="let log of logs$ | async" [innerHTML]="log | dompurify"></pre>
+  <section
+    #bottom
+    waIntersectionObserver
+    [style.padding.rem]="1"
+    (waIntersectionObservee)="onBottom($event)"
+  ></section>
+</tui-scrollbar>
diff --git a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.ts b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.ts
index fde1c968f..2c0e9c7fe 100644
--- a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.ts
+++ b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.ts
@@ -42,7 +42,7 @@ export class CAWizardComponent {
 
   private async testHttps() {
     const url = `https://${this.document.location.host}${this.relativeUrl}`
-    await this.api.echo({ message: 'ping' }, url).then(() => {
+    await this.api.getState().then(() => {
       this.caTrusted = true
     })
   }
diff --git a/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html b/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
index 70b977ecc..859d48129 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
@@ -74,7 +74,7 @@ <h2>
       <ion-item-divider>Memory</ion-item-divider>
       <ion-item>
         <ion-label>Percentage Used</ion-label>
-        <ion-note slot="end">{{ memory.percentageUsed }} %</ion-note>
+        <ion-note slot="end">{{ memory.percentageUsed.value }} %</ion-note>
       </ion-item>
       <ion-item>
         <ion-label>Total</ion-label>
@@ -98,7 +98,7 @@ <h2>
       </ion-item>
       <ion-item>
         <ion-label>zram Total</ion-label>
-        <ion-note slot="end">{{ memory.zramTotal }} MiB</ion-note>
+        <ion-note slot="end">{{ memory.zramTotal.value }} MiB</ion-note>
       </ion-item>
       <ion-item>
         <ion-label>zram Available</ion-label>
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 73763578e..f375b0e86 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -319,30 +319,6 @@ export class ServerShowPage {
     await alert.present()
   }
 
-  async presentAlertSystemRebuild() {
-    const localPkgs = await getAllPackages(this.patch)
-    const minutes = Object.keys(localPkgs).length * 2
-    const alert = await this.alertCtrl.create({
-      header: 'Warning',
-      message: `This action will tear down all service containers and rebuild them from scratch. No data will be deleted. This action is useful if your system gets into a bad state, and it should only be performed if you are experiencing general performance or reliability issues. It may take up to ${minutes} minutes to complete. During this time, you will lose all connectivity to your server.`,
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Rebuild',
-          handler: () => {
-            this.systemRebuild()
-          },
-          cssClass: 'enter-click',
-        },
-      ],
-      cssClass: 'alert-warning-message',
-    })
-    await alert.present()
-  }
-
   async presentAlertRepairDisk() {
     const alert = await this.alertCtrl.create({
       header: 'Warning',
@@ -437,23 +413,6 @@ export class ServerShowPage {
     }
   }
 
-  private async systemRebuild() {
-    const action = 'System Rebuild'
-
-    const loader = await this.loadingCtrl.create({
-      message: `Beginning ${action}...`,
-    })
-    await loader.present()
-
-    try {
-      await this.embassyApi.systemRebuild({})
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
-
   private async checkForEosUpdate(): Promise<void> {
     const loader = await this.loadingCtrl.create({
       message: 'Checking for updates',
@@ -718,14 +677,6 @@ export class ServerShowPage {
         detail: false,
         disabled$: of(false),
       },
-      {
-        title: 'System Rebuild',
-        description: '',
-        icon: 'construct-outline',
-        action: () => this.presentAlertSystemRebuild(),
-        detail: false,
-        disabled$: of(false),
-      },
       {
         title: 'Repair Disk',
         description: '',
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 5642eece5..38ee4774b 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -16,7 +16,7 @@ export module Mock {
     restarting: false,
     shuttingDown: false,
   }
-  export const MarketplaceEos: RR.GetMarketplaceEosRes = {
+  export const MarketplaceEos: RR.CheckOSUpdateRes = {
     version: '0.3.5.2',
     headline: 'Our biggest release ever.',
     releaseNotes: {
@@ -493,30 +493,23 @@ export module Mock {
     {
       timestamp: '2022-07-28T03:52:54.808769Z',
       message: '****** START *****',
+      bootId: 'hsjnfdklasndhjasvbjamsksajbndjn',
     },
     {
       timestamp: '2019-12-26T14:21:30.872Z',
       message:
         '\u001b[34mPOST \u001b[0;32;49m200\u001b[0m photoview.startos/api/graphql \u001b[0;36;49m1.169406ms\u001b',
+      bootId: 'hsjnfdklasndhjasvbjamsksajbndjn',
     },
     {
       timestamp: '2019-12-26T14:22:30.872Z',
       message: '****** FINISH *****',
-    },
-  ]
-
-  export const PackageLogs: Log[] = [
-    {
-      timestamp: '2022-07-28T03:52:54.808769Z',
-      message: '****** START *****',
+      bootId: 'gvbwfiuasokdasjndasnjdmfvbahjdmdkfm',
     },
     {
-      timestamp: '2019-12-26T14:21:30.872Z',
-      message: 'PackageLogs PackageLogs PackageLogs PackageLogs PackageLogs',
-    },
-    {
-      timestamp: '2019-12-26T14:22:30.872Z',
-      message: '****** FINISH *****',
+      timestamp: '2019-12-26T15:22:30.872Z',
+      message: '****** AGAIN *****',
+      bootId: 'gvbwfiuasokdasjndasnjdmfvbahjdmdkfm',
     },
   ]
 
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 3539164f5..a5c52e9a2 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -1,17 +1,28 @@
-import { Dump, Revision } from 'patch-db-client'
+import { Dump } from 'patch-db-client'
 import { MarketplacePkg, StoreInfo } from '@start9labs/marketplace'
 import { PackagePropertiesVersioned } from 'src/app/util/properties.util'
 import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
+import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 
 export module RR {
-  // DB
+  // websocket
+
+  export type WebsocketConfig<T> = Omit<WebSocketSubjectConfig<T>, 'url'>
+
+  // server state
+
+  export type ServerState = 'initializing' | 'error' | 'running'
 
-  export type GetRevisionsRes = Revision[] | Dump<DataModel>
+  // DB
 
-  export type GetDumpRes = Dump<DataModel>
+  export type SubscribePatchReq = {}
+  export type SubscribePatchRes = {
+    dump: Dump<DataModel>
+    guid: string
+  }
 
   export type SetDBValueReq<T> = { pointer: string; value: T } // db.put.ui
   export type SetDBValueRes = null
@@ -33,10 +44,22 @@ export module RR {
   } // auth.reset-password
   export type ResetPasswordRes = null
 
-  // server
+  // diagnostic
 
-  export type EchoReq = { message: string; timeout?: number } // server.echo
-  export type EchoRes = string
+  export type DiagnosticErrorRes = {
+    code: number
+    message: string
+    data: { details: string }
+  }
+
+  // init
+
+  export type InitGetProgressRes = {
+    progress: T.FullProgress
+    guid: string
+  }
+
+  // server
 
   export type GetSystemTimeReq = {} // server.time
   export type GetSystemTimeRes = {
@@ -65,8 +88,8 @@ export module RR {
   export type ShutdownServerReq = {} // server.shutdown
   export type ShutdownServerRes = null
 
-  export type SystemRebuildReq = {} // server.rebuild
-  export type SystemRebuildRes = null
+  export type DiskRepairReq = {} // server.disk.repair
+  export type DiskRepairRes = null
 
   export type ResetTorReq = {
     wipeState: boolean
@@ -254,8 +277,8 @@ export module RR {
   export type GetMarketplaceInfoReq = { serverId: string }
   export type GetMarketplaceInfoRes = StoreInfo
 
-  export type GetMarketplaceEosReq = { serverId: string }
-  export type GetMarketplaceEosRes = MarketplaceEOS
+  export type CheckOSUpdateReq = { serverId: string }
+  export type CheckOSUpdateRes = OSUpdate
 
   export type GetMarketplacePackagesReq = {
     ids?: { id: string; version: string }[]
@@ -271,7 +294,7 @@ export module RR {
   export type GetReleaseNotesRes = { [version: string]: string }
 }
 
-export interface MarketplaceEOS {
+export interface OSUpdate {
   version: string
   headline: string
   releaseNotes: { [version: string]: string }
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 3f1d9881d..d6bb11632 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -1,9 +1,5 @@
 import { Observable } from 'rxjs'
-import { Update } from 'patch-db-client'
 import { RR } from './api.types'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-import { Log } from '@start9labs/shared'
-import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 
 export abstract class ApiService {
   // http
@@ -14,8 +10,23 @@ export abstract class ApiService {
   // for sideloading packages
   abstract uploadPackage(guid: string, body: Blob): Promise<string>
 
+  // websocket
+
+  abstract openWebsocket$<T>(
+    guid: string,
+    config: RR.WebsocketConfig<T>,
+  ): Observable<T>
+
+  // server state
+
+  abstract getState(): Promise<RR.ServerState>
+
   // db
 
+  abstract subscribeToPatchDB(
+    params: RR.SubscribePatchReq,
+  ): Promise<RR.SubscribePatchRes>
+
   abstract setDbValue<T>(
     pathArr: Array<string | number>,
     value: T,
@@ -35,15 +46,25 @@ export abstract class ApiService {
     params: RR.ResetPasswordReq,
   ): Promise<RR.ResetPasswordRes>
 
-  // server
+  // diagnostic
+
+  abstract diagnosticGetError(): Promise<RR.DiagnosticErrorRes>
+  abstract diagnosticRestart(): Promise<void>
+  abstract diagnosticForgetDrive(): Promise<void>
+  abstract diagnosticRepairDisk(): Promise<void>
+  abstract diagnosticGetLogs(
+    params: RR.GetServerLogsReq,
+  ): Promise<RR.GetServerLogsRes>
 
-  abstract echo(params: RR.EchoReq, urlOverride?: string): Promise<RR.EchoRes>
+  // init
 
-  abstract openPatchWebsocket$(): Observable<Update<DataModel>>
+  abstract initGetProgress(): Promise<RR.InitGetProgressRes>
 
-  abstract openLogsWebsocket$(
-    config: WebSocketSubjectConfig<Log>,
-  ): Observable<Log>
+  abstract initFollowLogs(
+    params: RR.FollowServerLogsReq,
+  ): Promise<RR.FollowServerLogsRes>
+
+  // server
 
   abstract getSystemTime(
     params: RR.GetSystemTimeReq,
@@ -89,11 +110,7 @@ export abstract class ApiService {
     params: RR.ShutdownServerReq,
   ): Promise<RR.ShutdownServerRes>
 
-  abstract systemRebuild(
-    params: RR.SystemRebuildReq,
-  ): Promise<RR.SystemRebuildRes>
-
-  abstract repairDisk(params: RR.SystemRebuildReq): Promise<RR.SystemRebuildRes>
+  abstract repairDisk(params: RR.DiskRepairReq): Promise<RR.DiskRepairRes>
 
   abstract resetTor(params: RR.ResetTorReq): Promise<RR.ResetTorRes>
 
@@ -105,7 +122,7 @@ export abstract class ApiService {
     url: string,
   ): Promise<T>
 
-  abstract getEos(): Promise<RR.GetMarketplaceEosRes>
+  abstract checkOSUpdate(qp: RR.CheckOSUpdateReq): Promise<RR.CheckOSUpdateRes>
 
   // notification
 
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 631c12e6b..8826b2883 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -3,7 +3,6 @@ import {
   HttpOptions,
   HttpService,
   isRpcError,
-  Log,
   Method,
   RpcError,
   RPCOptions,
@@ -12,13 +11,12 @@ import { ApiService } from './embassy-api.service'
 import { RR } from './api.types'
 import { parsePropertiesPermissive } from 'src/app/util/properties.util'
 import { ConfigService } from '../config.service'
-import { webSocket, WebSocketSubjectConfig } from 'rxjs/webSocket'
+import { webSocket } from 'rxjs/webSocket'
 import { Observable, filter, firstValueFrom } from 'rxjs'
 import { AuthService } from '../auth.service'
 import { DOCUMENT } from '@angular/common'
 import { DataModel } from '../patch-db/data-model'
-import { PatchDB, pathFromArray, Update } from 'patch-db-client'
-import { getServerInfo } from 'src/app/util/get-server-info'
+import { PatchDB, pathFromArray } from 'patch-db-client'
 
 @Injectable()
 export class LiveApiService extends ApiService {
@@ -30,10 +28,11 @@ export class LiveApiService extends ApiService {
     private readonly patch: PatchDB<DataModel>,
   ) {
     super()
-    ;(window as any).rpcClient = this
+    ; (window as any).rpcClient = this
   }
 
   // for getting static files: ex icons, instructions, licenses
+
   async getStatic(url: string): Promise<string> {
     return this.httpRequest({
       method: Method.GET,
@@ -43,6 +42,7 @@ export class LiveApiService extends ApiService {
   }
 
   // for sideloading packages
+
   async uploadPackage(guid: string, body: Blob): Promise<string> {
     return this.httpRequest({
       method: Method.POST,
@@ -52,8 +52,36 @@ export class LiveApiService extends ApiService {
     })
   }
 
+  // websocket
+
+  openWebsocket$<T>(
+    guid: string,
+    config: RR.WebsocketConfig<T>,
+  ): Observable<T> {
+    const { location } = this.document.defaultView!
+    const protocol = location.protocol === 'http:' ? 'ws' : 'wss'
+    const host = location.host
+
+    return webSocket({
+      url: `${protocol}://${host}/ws/rpc/${guid}`,
+      ...config,
+    })
+  }
+
+  // state
+
+  async getState(): Promise<RR.ServerState> {
+    return this.rpcRequest({ method: 'state', params: {} })
+  }
+
   // db
 
+  async subscribeToPatchDB(
+    params: RR.SubscribePatchReq,
+  ): Promise<RR.SubscribePatchRes> {
+    return this.rpcRequest({ method: 'db.subscribe', params })
+  }
+
   async setDbValue<T>(
     pathArr: Array<string | number>,
     value: T,
@@ -87,29 +115,57 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'auth.reset-password', params })
   }
 
-  // server
+  // diagnostic
 
-  async echo(params: RR.EchoReq, urlOverride?: string): Promise<RR.EchoRes> {
-    return this.rpcRequest({ method: 'echo', params }, urlOverride)
+  async diagnosticGetError(): Promise<RR.DiagnosticErrorRes> {
+    return this.rpcRequest<RR.DiagnosticErrorRes>({
+      method: 'diagnostic.error',
+      params: {},
+    })
   }
 
-  openPatchWebsocket$(): Observable<Update<DataModel>> {
-    const config: WebSocketSubjectConfig<Update<DataModel>> = {
-      url: `/db`,
-      closeObserver: {
-        next: val => {
-          if (val.reason === 'UNAUTHORIZED') this.auth.setUnverified()
-        },
-      },
-    }
+  async diagnosticRestart(): Promise<void> {
+    return this.rpcRequest<void>({
+      method: 'diagnostic.restart',
+      params: {},
+    })
+  }
 
-    return this.openWebsocket(config)
+  async diagnosticForgetDrive(): Promise<void> {
+    return this.rpcRequest<void>({
+      method: 'diagnostic.disk.forget',
+      params: {},
+    })
   }
 
-  openLogsWebsocket$(config: WebSocketSubjectConfig<Log>): Observable<Log> {
-    return this.openWebsocket(config)
+  async diagnosticRepairDisk(): Promise<void> {
+    return this.rpcRequest<void>({
+      method: 'diagnostic.disk.repair',
+      params: {},
+    })
   }
 
+  async diagnosticGetLogs(
+    params: RR.GetServerLogsReq,
+  ): Promise<RR.GetServerLogsRes> {
+    return this.rpcRequest<RR.GetServerLogsRes>({
+      method: 'diagnostic.logs',
+      params,
+    })
+  }
+
+  // init
+
+  async initGetProgress(): Promise<RR.InitGetProgressRes> {
+    return this.rpcRequest({ method: 'init.subscribe', params: {} })
+  }
+
+  async initFollowLogs(): Promise<RR.FollowServerLogsRes> {
+    return this.rpcRequest({ method: 'init.logs.follow', params: {} })
+  }
+
+  // server
+
   async getSystemTime(
     params: RR.GetSystemTimeReq,
   ): Promise<RR.GetSystemTimeRes> {
@@ -175,12 +231,6 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'server.shutdown', params })
   }
 
-  async systemRebuild(
-    params: RR.RestartServerReq,
-  ): Promise<RR.RestartServerRes> {
-    return this.rpcRequest({ method: 'server.rebuild', params })
-  }
-
   async repairDisk(params: RR.RestartServerReq): Promise<RR.RestartServerRes> {
     return this.rpcRequest({ method: 'disk.repair', params })
   }
@@ -203,10 +253,7 @@ export class LiveApiService extends ApiService {
     })
   }
 
-  async getEos(): Promise<RR.GetMarketplaceEosRes> {
-    const { id } = await getServerInfo(this.patch)
-    const qp: RR.GetMarketplaceEosReq = { serverId: id }
-
+  async checkOSUpdate(qp: RR.CheckOSUpdateReq): Promise<RR.CheckOSUpdateRes> {
     return this.marketplaceProxy(
       '/eos/v0/latest',
       qp,
@@ -417,16 +464,6 @@ export class LiveApiService extends ApiService {
     })
   }
 
-  private openWebsocket<T>(config: WebSocketSubjectConfig<T>): Observable<T> {
-    const { location } = this.document.defaultView!
-    const protocol = location.protocol === 'http:' ? 'ws' : 'wss'
-    const host = location.host
-
-    config.url = `${protocol}://${host}/ws${config.url}`
-
-    return webSocket(config)
-  }
-
   private async rpcRequest<T>(
     options: RPCOptions,
     urlOverride?: string,
@@ -445,9 +482,7 @@ export class LiveApiService extends ApiService {
     const patchSequence = res.headers.get('x-patch-sequence')
     if (patchSequence)
       await firstValueFrom(
-        this.patch.cache$.pipe(
-          filter(({ sequence }) => sequence >= Number(patchSequence)),
-        ),
+        this.patch.cache$.pipe(filter(({ id }) => id >= Number(patchSequence))),
       )
 
     return body.result
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index f623f6db3..728b4ff35 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -1,15 +1,14 @@
 import { Injectable } from '@angular/core'
-import { Log, pauseFor } from '@start9labs/shared'
+import { Log, RPCErrorDetails, pauseFor } from '@start9labs/shared'
 import { ApiService } from './embassy-api.service'
 import {
   Operation,
   PatchOp,
   pathFromArray,
   RemoveOperation,
-  Update,
+  Revision,
 } from 'patch-db-client'
 import {
-  DataModel,
   InstallingState,
   PackageDataEntry,
   StateInfo,
@@ -20,22 +19,17 @@ import { parsePropertiesPermissive } from 'src/app/util/properties.util'
 import { Mock } from './api.fixures'
 import markdown from 'raw-loader!../../../../../shared/assets/markdown/md-sample.md'
 import {
-  EMPTY,
-  iif,
+  from,
   interval,
   map,
   Observable,
   shareReplay,
+  startWith,
   Subject,
-  switchMap,
   tap,
-  timer,
 } from 'rxjs'
-import { LocalStorageBootstrap } from '../patch-db/local-storage-bootstrap'
 import { mockPatchData } from './mock-patch'
-import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 import { AuthService } from '../auth.service'
-import { ConnectionService } from '../connection.service'
 import { StoreInfo } from '@start9labs/marketplace'
 import { T } from '@start9labs/start-sdk'
 
@@ -71,32 +65,17 @@ const PROGRESS: T.FullProgress = {
 
 @Injectable()
 export class MockApiService extends ApiService {
-  readonly mockWsSource$ = new Subject<Update<DataModel>>()
+  readonly mockWsSource$ = new Subject<Revision>()
   private readonly revertTime = 1800
   sequence = 0
 
-  constructor(
-    private readonly bootstrapper: LocalStorageBootstrap,
-    private readonly connectionService: ConnectionService,
-    private readonly auth: AuthService,
-  ) {
+  constructor(private readonly auth: AuthService) {
     super()
     this.auth.isVerified$
       .pipe(
         tap(() => {
           this.sequence = 0
         }),
-        switchMap(verified =>
-          iif(
-            () => verified,
-            timer(2000).pipe(
-              tap(() => {
-                this.connectionService.websocketConnected$.next(true)
-              }),
-            ),
-            EMPTY,
-          ),
-        ),
       )
       .subscribe()
   }
@@ -111,8 +90,57 @@ export class MockApiService extends ApiService {
     return 'success'
   }
 
+  // websocket
+
+  openWebsocket$<T>(
+    guid: string,
+    config: RR.WebsocketConfig<T>,
+  ): Observable<T> {
+    if (guid === 'db-guid') {
+      return this.mockWsSource$.pipe<any>(
+        shareReplay({ bufferSize: 1, refCount: true }),
+      )
+    } else if (guid === 'logs-guid') {
+      return interval(50).pipe<any>(
+        map((_, index) => {
+          // mock fire open observer
+          if (index === 0) config.openObserver?.next(new Event(''))
+          if (index === 100) throw new Error('HAAHHA')
+          return Mock.ServerLogs[0]
+        }),
+      )
+    } else if (guid === 'init-progress-guid') {
+      return from(this.initProgress()).pipe(
+        startWith(PROGRESS),
+      ) as Observable<T>
+    } else {
+      throw new Error('invalid guid type')
+    }
+  }
+
+  // server state
+
+  private stateIndex = 0
+  async getState(): Promise<RR.ServerState> {
+    await pauseFor(1000)
+
+    this.stateIndex++
+
+    return this.stateIndex === 1 ? 'initializing' : 'running'
+  }
+
   // db
 
+  async subscribeToPatchDB(
+    params: RR.SubscribePatchReq,
+  ): Promise<RR.SubscribePatchRes> {
+    await pauseFor(2000)
+    return {
+      dump: { id: 1, value: mockPatchData },
+      guid: 'db-guid',
+    }
+  }
+
   async setDbValue<T>(
     pathArr: Array<string | number>,
     value: T,
@@ -136,11 +164,6 @@ export class MockApiService extends ApiService {
 
   async login(params: RR.LoginReq): Promise<RR.loginRes> {
     await pauseFor(2000)
-
-    setTimeout(() => {
-      this.mockWsSource$.next({ id: 1, value: mockPatchData })
-    }, 2000)
-
     return null
   }
 
@@ -166,35 +189,64 @@ export class MockApiService extends ApiService {
     return null
   }
 
-  // server
+  // diagnostic
 
-  async echo(params: RR.EchoReq, url?: string): Promise<RR.EchoRes> {
-    if (url) {
-      const num = Math.floor(Math.random() * 10) + 1
-      if (num > 8) return params.message
-      throw new Error()
+  async getError(): Promise<RPCErrorDetails> {
+    await pauseFor(1000)
+    return {
+      code: 15,
+      message: 'Unknown server',
+      data: { details: 'Some details about the error here' },
     }
-    await pauseFor(2000)
-    return params.message
   }
 
-  openPatchWebsocket$(): Observable<Update<DataModel>> {
-    return this.mockWsSource$.pipe(
-      shareReplay({ bufferSize: 1, refCount: true }),
-    )
+  async diagnosticGetError(): Promise<RR.DiagnosticErrorRes> {
+    await pauseFor(1000)
+    return {
+      code: 15,
+      message: 'Unknown server',
+      data: { details: 'Some details about the error here' },
+    }
+  }
+
+  async diagnosticRestart(): Promise<void> {
+    await pauseFor(1000)
+  }
+
+  async diagnosticForgetDrive(): Promise<void> {
+    await pauseFor(1000)
+  }
+
+  async diagnosticRepairDisk(): Promise<void> {
+    await pauseFor(1000)
   }
 
-  openLogsWebsocket$(config: WebSocketSubjectConfig<Log>): Observable<Log> {
-    return interval(50).pipe(
-      map((_, index) => {
-        // mock fire open observer
-        if (index === 0) config.openObserver?.next(new Event(''))
-        if (index === 100) throw new Error('HAAHHA')
-        return Mock.ServerLogs[0]
-      }),
-    )
+  async diagnosticGetLogs(
+    params: RR.GetServerLogsReq,
+  ): Promise<RR.GetServerLogsRes> {
+    return this.getServerLogs(params)
+  }
+
+  // init
+
+  async initGetProgress(): Promise<RR.InitGetProgressRes> {
+    await pauseFor(250)
+    return {
+      progress: PROGRESS,
+      guid: 'init-progress-guid',
+    }
+  }
+
+  async initFollowLogs(): Promise<RR.FollowServerLogsRes> {
+    await pauseFor(2000)
+    return {
+      startCursor: 'start-cursor',
+      guid: 'logs-guid',
+    }
   }
 
+  // server
+
   async getSystemTime(
     params: RR.GetSystemTimeReq,
   ): Promise<RR.GetSystemTimeRes> {
@@ -248,7 +300,7 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     return {
       startCursor: 'start-cursor',
-      guid: '7251d5be-645f-4362-a51b-3a85be92b31e',
+      guid: 'logs-guid',
     }
   }
 
@@ -258,7 +310,7 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     return {
       startCursor: 'start-cursor',
-      guid: '7251d5be-645f-4362-a51b-3a85be92b31e',
+      guid: 'logs-guid',
     }
   }
 
@@ -268,11 +320,11 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     return {
       startCursor: 'start-cursor',
-      guid: '7251d5be-645f-4362-a51b-3a85be92b31e',
+      guid: 'logs-guid',
     }
   }
 
-  randomLogs(limit = 1): Log[] {
+  private randomLogs(limit = 1): Log[] {
     const arrLength = Math.ceil(limit / Mock.ServerLogs.length)
     const logs = new Array(arrLength)
       .fill(Mock.ServerLogs)
@@ -374,12 +426,6 @@ export class MockApiService extends ApiService {
     return null
   }
 
-  async systemRebuild(
-    params: RR.SystemRebuildReq,
-  ): Promise<RR.SystemRebuildRes> {
-    return this.restartServer(params)
-  }
-
   async repairDisk(params: RR.RestartServerReq): Promise<RR.RestartServerRes> {
     await pauseFor(2000)
     return null
@@ -422,7 +468,7 @@ export class MockApiService extends ApiService {
     }
   }
 
-  async getEos(): Promise<RR.GetMarketplaceEosRes> {
+  async checkOSUpdate(qp: RR.CheckOSUpdateReq): Promise<RR.CheckOSUpdateRes> {
     await pauseFor(2000)
     return Mock.MarketplaceEos
   }
@@ -641,13 +687,13 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     let entries
     if (Math.random() < 0.2) {
-      entries = Mock.PackageLogs
+      entries = Mock.ServerLogs
     } else {
       const arrLength = params.limit
-        ? Math.ceil(params.limit / Mock.PackageLogs.length)
+        ? Math.ceil(params.limit / Mock.ServerLogs.length)
         : 10
       entries = new Array(arrLength)
-        .fill(Mock.PackageLogs)
+        .fill(Mock.ServerLogs)
         .reduce((acc, val) => acc.concat(val), [])
     }
     return {
@@ -663,7 +709,7 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     return {
       startCursor: 'start-cursor',
-      guid: '7251d5be-645f-4362-a51b-3a85be92b31e',
+      guid: 'logs-guid',
     }
   }
 
@@ -673,7 +719,7 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
 
     setTimeout(async () => {
-      this.updateProgress(params.id)
+      this.installProgress(params.id)
     }, 1000)
 
     const patch: Operation<
@@ -745,7 +791,7 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     const patch: Operation<PackageDataEntry>[] = params.ids.map(id => {
       setTimeout(async () => {
-        this.updateProgress(id)
+        this.installProgress(id)
       }, 2000)
 
       return {
@@ -1013,7 +1059,57 @@ export class MockApiService extends ApiService {
     return '4120e092-05ab-4de2-9fbd-c3f1f4b1df9e' // no significance, randomly generated
   }
 
-  private async updateProgress(id: string): Promise<void> {
+  private async initProgress(): Promise<T.FullProgress> {
+    const progress = JSON.parse(JSON.stringify(PROGRESS))
+
+    for (let [i, phase] of progress.phases.entries()) {
+      if (
+        !phase.progress ||
+        typeof phase.progress !== 'object' ||
+        !phase.progress.total
+      ) {
+        await pauseFor(2000)
+
+        progress.phases[i].progress = true
+
+        if (
+          progress.overall &&
+          typeof progress.overall === 'object' &&
+          progress.overall.total
+        ) {
+          const step = progress.overall.total / progress.phases.length
+          progress.overall.done += step
+        }
+      } else {
+        const step = phase.progress.total / 4
+
+        while (phase.progress.done < phase.progress.total) {
+          await pauseFor(200)
+
+          phase.progress.done += step
+
+          if (
+            progress.overall &&
+            typeof progress.overall === 'object' &&
+            progress.overall.total
+          ) {
+            const step = progress.overall.total / progress.phases.length / 4
+
+            progress.overall.done += step
+          }
+
+          if (phase.progress.done === phase.progress.total) {
+            await pauseFor(250)
+
+            progress.phases[i].progress = true
+          }
+        }
+      }
+    }
+    return progress
+  }
+
+  private async installProgress(id: string): Promise<void> {
     const progress = JSON.parse(JSON.stringify(PROGRESS))
 
     for (let [i, phase] of progress.phases.entries()) {
@@ -1194,10 +1290,6 @@ export class MockApiService extends ApiService {
   }
 
   private async mockRevision<T>(patch: Operation<T>[]): Promise<void> {
-    if (!this.sequence) {
-      const { sequence } = this.bootstrapper.init()
-      this.sequence = sequence
-    }
     const revision = {
       id: ++this.sequence,
       patch,
diff --git a/web/projects/ui/src/app/services/auth.service.ts b/web/projects/ui/src/app/services/auth.service.ts
index 5d755aa98..9c16d0e26 100644
--- a/web/projects/ui/src/app/services/auth.service.ts
+++ b/web/projects/ui/src/app/services/auth.service.ts
@@ -12,7 +12,7 @@ export enum AuthState {
   providedIn: 'root',
 })
 export class AuthService {
-  private readonly LOGGED_IN_KEY = 'loggedInKey'
+  private readonly LOGGED_IN_KEY = 'loggedIn'
   private readonly authState$ = new ReplaySubject<AuthState>(1)
 
   readonly isVerified$ = this.authState$.pipe(
diff --git a/web/projects/ui/src/app/services/connection.service.ts b/web/projects/ui/src/app/services/connection.service.ts
index a45d5ec4c..7d3328503 100644
--- a/web/projects/ui/src/app/services/connection.service.ts
+++ b/web/projects/ui/src/app/services/connection.service.ts
@@ -1,25 +1,23 @@
-import { Injectable } from '@angular/core'
-import { combineLatest, fromEvent, merge, ReplaySubject } from 'rxjs'
-import { distinctUntilChanged, map, startWith } from 'rxjs/operators'
+import { inject, Injectable } from '@angular/core'
+import { combineLatest, Observable, shareReplay } from 'rxjs'
+import { distinctUntilChanged, map } from 'rxjs/operators'
+import { NetworkService } from 'src/app/services/network.service'
+import { StateService } from 'src/app/services/state.service'
 
 @Injectable({
   providedIn: 'root',
 })
-export class ConnectionService {
-  readonly networkConnected$ = merge(
-    fromEvent(window, 'online'),
-    fromEvent(window, 'offline'),
-  ).pipe(
-    startWith(null),
-    map(() => navigator.onLine),
-    distinctUntilChanged(),
-  )
-  readonly websocketConnected$ = new ReplaySubject<boolean>(1)
-  readonly connected$ = combineLatest([
-    this.networkConnected$,
-    this.websocketConnected$.pipe(distinctUntilChanged()),
+export class ConnectionService extends Observable<boolean> {
+  private readonly stream$ = combineLatest([
+    inject(NetworkService),
+    inject(StateService).pipe(map(Boolean)),
   ]).pipe(
     map(([network, websocket]) => network && websocket),
     distinctUntilChanged(),
+    shareReplay(1),
   )
+
+  constructor() {
+    super(subscriber => this.stream$.subscribe(subscriber))
+  }
 }
diff --git a/web/projects/ui/src/app/services/eos.service.ts b/web/projects/ui/src/app/services/eos.service.ts
index dcd1d0de0..81b97bf11 100644
--- a/web/projects/ui/src/app/services/eos.service.ts
+++ b/web/projects/ui/src/app/services/eos.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
 import { Emver } from '@start9labs/shared'
 import { BehaviorSubject, combineLatest } from 'rxjs'
 import { distinctUntilChanged, map } from 'rxjs/operators'
-import { MarketplaceEOS } from 'src/app/services/api/api.types'
+import { OSUpdate } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { PatchDB } from 'patch-db-client'
 import { getServerInfo } from 'src/app/util/get-server-info'
@@ -12,7 +12,7 @@ import { DataModel } from './patch-db/data-model'
   providedIn: 'root',
 })
 export class EOSService {
-  eos?: MarketplaceEOS
+  osUpdate?: OSUpdate
   updateAvailable$ = new BehaviorSubject<boolean>(false)
 
   readonly updating$ = this.patch.watch$('serverInfo', 'statusInfo').pipe(
@@ -52,9 +52,10 @@ export class EOSService {
   ) {}
 
   async loadEos(): Promise<void> {
-    const { version } = await getServerInfo(this.patch)
-    this.eos = await this.api.getEos()
-    const updateAvailable = this.emver.compare(this.eos.version, version) === 1
+    const { version, id } = await getServerInfo(this.patch)
+    this.osUpdate = await this.api.checkOSUpdate({ serverId: id })
+    const updateAvailable =
+      this.emver.compare(this.osUpdate.version, version) === 1
     this.updateAvailable$.next(updateAvailable)
   }
 }
diff --git a/web/projects/ui/src/app/services/network.service.ts b/web/projects/ui/src/app/services/network.service.ts
new file mode 100644
index 000000000..e1568603d
--- /dev/null
+++ b/web/projects/ui/src/app/services/network.service.ts
@@ -0,0 +1,22 @@
+import { inject, Injectable } from '@angular/core'
+import { WINDOW } from '@ng-web-apis/common'
+import { fromEvent, merge, Observable, shareReplay } from 'rxjs'
+import { distinctUntilChanged, map, startWith } from 'rxjs/operators'
+
+@Injectable({ providedIn: 'root' })
+export class NetworkService extends Observable<boolean> {
+  private readonly win = inject(WINDOW)
+  private readonly stream$ = merge(
+    fromEvent(this.win, 'online'),
+    fromEvent(this.win, 'offline'),
+  ).pipe(
+    startWith(null),
+    map(() => this.win.navigator.onLine),
+    distinctUntilChanged(),
+    shareReplay(1),
+  )
+
+  constructor() {
+    super(subscriber => this.stream$.subscribe(subscriber))
+  }
+}
diff --git a/web/projects/ui/src/app/services/patch-data.service.ts b/web/projects/ui/src/app/services/patch-data.service.ts
index 5372a665c..50023c1f1 100644
--- a/web/projects/ui/src/app/services/patch-data.service.ts
+++ b/web/projects/ui/src/app/services/patch-data.service.ts
@@ -1,9 +1,9 @@
 import { Inject, Injectable } from '@angular/core'
 import { ModalController } from '@ionic/angular'
 import { Observable } from 'rxjs'
-import { filter, share, switchMap, take, tap } from 'rxjs/operators'
+import { filter, map, share, switchMap, take, tap } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
-import { DataModel, UIData } from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { EOSService } from 'src/app/services/eos.service'
 import { OSWelcomePage } from 'src/app/modals/os-welcome/os-welcome.page'
 import { ConfigService } from 'src/app/services/config.service'
@@ -11,21 +11,25 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { ConnectionService } from 'src/app/services/connection.service'
+import { LocalStorageBootstrap } from './patch-db/local-storage-bootstrap'
 
 // Get data from PatchDb after is starts and act upon it
 @Injectable({
   providedIn: 'root',
 })
-export class PatchDataService extends Observable<DataModel> {
-  private readonly stream$ = this.connectionService.connected$.pipe(
+export class PatchDataService extends Observable<void> {
+  private readonly stream$ = this.connection$.pipe(
     filter(Boolean),
     switchMap(() => this.patch.watch$()),
-    take(1),
-    tap(({ ui }) => {
-      // check for updates to eOS and services
-      this.checkForUpdates()
-      // show eos welcome message
-      this.showEosWelcome(ui.ackWelcome)
+    map((cache, index) => {
+      this.bootstrapper.update(cache)
+
+      if (index === 0) {
+        // check for updates to StartOS and services
+        this.checkForUpdates()
+        // show eos welcome message
+        this.showEosWelcome(cache.ui.ackWelcome)
+      }
     }),
     share(),
   )
@@ -38,7 +42,8 @@ export class PatchDataService extends Observable<DataModel> {
     private readonly embassyApi: ApiService,
     @Inject(AbstractMarketplaceService)
     private readonly marketplaceService: MarketplaceService,
-    private readonly connectionService: ConnectionService,
+    private readonly connection$: ConnectionService,
+    private readonly bootstrapper: LocalStorageBootstrap,
   ) {
     super(subscriber => this.stream$.subscribe(subscriber))
   }
diff --git a/web/projects/ui/src/app/services/patch-db/local-storage-bootstrap.ts b/web/projects/ui/src/app/services/patch-db/local-storage-bootstrap.ts
index 2ea5bef02..079def855 100644
--- a/web/projects/ui/src/app/services/patch-db/local-storage-bootstrap.ts
+++ b/web/projects/ui/src/app/services/patch-db/local-storage-bootstrap.ts
@@ -1,4 +1,4 @@
-import { Bootstrapper, DBCache } from 'patch-db-client'
+import { Dump } from 'patch-db-client'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { Injectable } from '@angular/core'
 import { StorageService } from '../storage.service'
@@ -6,20 +6,18 @@ import { StorageService } from '../storage.service'
 @Injectable({
   providedIn: 'root',
 })
-export class LocalStorageBootstrap implements Bootstrapper<DataModel> {
-  static CONTENT_KEY = 'patch-db-cache'
+export class LocalStorageBootstrap {
+  static CONTENT_KEY = 'patchDB'
 
   constructor(private readonly storage: StorageService) {}
 
-  init(): DBCache<DataModel> {
-    const cache = this.storage.get<DBCache<DataModel>>(
-      LocalStorageBootstrap.CONTENT_KEY,
-    )
+  init(): Dump<DataModel> {
+    const cache = this.storage.get<DataModel>(LocalStorageBootstrap.CONTENT_KEY)
 
-    return cache || { sequence: 0, data: {} as DataModel }
+    return cache ? { id: 1, value: cache } : { id: 0, value: {} as DataModel }
   }
 
-  update(cache: DBCache<DataModel>): void {
+  update(cache: DataModel): void {
     this.storage.set(LocalStorageBootstrap.CONTENT_KEY, cache)
   }
 }
diff --git a/web/projects/ui/src/app/services/patch-db/patch-db.factory.ts b/web/projects/ui/src/app/services/patch-db/patch-db.factory.ts
index 51d29edc8..bb2dcdf57 100644
--- a/web/projects/ui/src/app/services/patch-db/patch-db.factory.ts
+++ b/web/projects/ui/src/app/services/patch-db/patch-db.factory.ts
@@ -1,19 +1,19 @@
 import { InjectionToken, Injector } from '@angular/core'
+import { Revision, Update } from 'patch-db-client'
+import { defer, EMPTY, from, Observable } from 'rxjs'
 import {
   bufferTime,
   catchError,
   filter,
+  startWith,
   switchMap,
   take,
-  tap,
 } from 'rxjs/operators'
-import { Update } from 'patch-db-client'
-import { DataModel } from './data-model'
-import { defer, EMPTY, from, interval, Observable } from 'rxjs'
-import { AuthService } from '../auth.service'
-import { ConnectionService } from '../connection.service'
+import { StateService } from 'src/app/services/state.service'
 import { ApiService } from '../api/embassy-api.service'
-import { ConfigService } from '../config.service'
+import { AuthService } from '../auth.service'
+import { DataModel } from './data-model'
+import { LocalStorageBootstrap } from './local-storage-bootstrap'
 
 export const PATCH_SOURCE = new InjectionToken<Observable<Update<DataModel>[]>>(
   '',
@@ -25,33 +25,31 @@ export function sourceFactory(
   // defer() needed to avoid circular dependency with ApiService, since PatchDB is needed there
   return defer(() => {
     const api = injector.get(ApiService)
-    const authService = injector.get(AuthService)
-    const connectionService = injector.get(ConnectionService)
-    const configService = injector.get(ConfigService)
-    const isTor = configService.isTor()
-    const timeout = isTor ? 16000 : 4000
+    const auth = injector.get(AuthService)
+    const state = injector.get(StateService)
+    const bootstrapper = injector.get(LocalStorageBootstrap)
 
-    const websocket$ = api.openPatchWebsocket$().pipe(
-      bufferTime(250),
-      filter(updates => !!updates.length),
-      catchError((_, watch$) => {
-        connectionService.websocketConnected$.next(false)
+    return auth.isVerified$.pipe(
+      switchMap(verified =>
+        verified ? from(api.subscribeToPatchDB({})) : EMPTY,
+      ),
+      switchMap(({ dump, guid }) =>
+        api.openWebsocket$<Revision>(guid, {}).pipe(
+          bufferTime(250),
+          filter(revisions => !!revisions.length),
+          startWith([dump]),
+        ),
+      ),
+      catchError((_, original$) => {
+        state.retrigger()
 
-        return interval(timeout).pipe(
-          switchMap(() =>
-            from(api.echo({ message: 'ping', timeout })).pipe(
-              catchError(() => EMPTY),
-            ),
-          ),
+        return state.pipe(
+          filter(current => current === 'running'),
           take(1),
-          switchMap(() => watch$),
+          switchMap(() => original$),
         )
       }),
-      tap(() => connectionService.websocketConnected$.next(true)),
-    )
-
-    return authService.isVerified$.pipe(
-      switchMap(verified => (verified ? websocket$ : EMPTY)),
+      startWith([bootstrapper.init()]),
     )
   })
 }
diff --git a/web/projects/ui/src/app/services/patch-monitor.service.ts b/web/projects/ui/src/app/services/patch-monitor.service.ts
index cafb9f0fe..675531dda 100644
--- a/web/projects/ui/src/app/services/patch-monitor.service.ts
+++ b/web/projects/ui/src/app/services/patch-monitor.service.ts
@@ -4,24 +4,19 @@ import { tap } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
 import { AuthService } from 'src/app/services/auth.service'
 import { DataModel } from './patch-db/data-model'
-import { LocalStorageBootstrap } from './patch-db/local-storage-bootstrap'
 
 // Start and stop PatchDb upon verification
 @Injectable({
   providedIn: 'root',
 })
-export class PatchMonitorService extends Observable<any> {
-  // @TODO not happy with Observable<void>
+export class PatchMonitorService extends Observable<unknown> {
   private readonly stream$ = this.authService.isVerified$.pipe(
-    tap(verified =>
-      verified ? this.patch.start(this.bootstrapper) : this.patch.stop(),
-    ),
+    tap(verified => (verified ? this.patch.start() : this.patch.stop())),
   )
 
   constructor(
     private readonly authService: AuthService,
     private readonly patch: PatchDB<DataModel>,
-    private readonly bootstrapper: LocalStorageBootstrap,
   ) {
     super(subscriber => this.stream$.subscribe(subscriber))
   }
diff --git a/web/projects/ui/src/app/services/state.service.ts b/web/projects/ui/src/app/services/state.service.ts
new file mode 100644
index 000000000..33569a751
--- /dev/null
+++ b/web/projects/ui/src/app/services/state.service.ts
@@ -0,0 +1,136 @@
+import { inject, Injectable } from '@angular/core'
+import { CanActivateFn, IsActiveMatchOptions, Router } from '@angular/router'
+import { ALWAYS_TRUE_HANDLER } from '@taiga-ui/cdk'
+import { TuiAlertService, TuiNotification } from '@taiga-ui/core'
+import {
+  BehaviorSubject,
+  combineLatest,
+  concat,
+  EMPTY,
+  exhaustMap,
+  from,
+  merge,
+  Observable,
+  startWith,
+  Subject,
+  timer,
+} from 'rxjs'
+import {
+  catchError,
+  filter,
+  map,
+  shareReplay,
+  skip,
+  switchMap,
+  take,
+  takeUntil,
+  tap,
+} from 'rxjs/operators'
+import { RR } from 'src/app/services/api/api.types'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { NetworkService } from 'src/app/services/network.service'
+
+const OPTIONS: IsActiveMatchOptions = {
+  paths: 'subset',
+  queryParams: 'exact',
+  fragment: 'ignored',
+  matrixParams: 'ignored',
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class StateService extends Observable<RR.ServerState | null> {
+  private readonly alerts = inject(TuiAlertService)
+  private readonly api = inject(ApiService)
+  private readonly router = inject(Router)
+  private readonly network$ = inject(NetworkService)
+
+  private readonly single$ = new Subject<RR.ServerState>()
+
+  private readonly trigger$ = new BehaviorSubject<void>(undefined)
+  private readonly poll$ = this.trigger$.pipe(
+    switchMap(() =>
+      timer(0, 2000).pipe(
+        switchMap(() =>
+          from(this.api.getState()).pipe(catchError(() => EMPTY)),
+        ),
+        take(1),
+      ),
+    ),
+  )
+
+  private readonly stream$ = merge(this.single$, this.poll$).pipe(
+    tap(state => {
+      switch (state) {
+        case 'initializing':
+          this.router.navigate(['initializing'], { replaceUrl: true })
+          break
+        case 'error':
+          this.router.navigate(['diagnostic'], { replaceUrl: true })
+          break
+        case 'running':
+          if (
+            this.router.isActive('initializing', OPTIONS) ||
+            this.router.isActive('diagnostic', OPTIONS)
+          ) {
+            this.router.navigate([''], { replaceUrl: true })
+          }
+
+          break
+      }
+    }),
+    startWith(null),
+    shareReplay(1),
+  )
+
+  private readonly alert = merge(
+    this.trigger$.pipe(skip(1)),
+    this.network$.pipe(filter(v => !v)),
+  )
+    .pipe(
+      exhaustMap(() =>
+        concat(
+          this.alerts
+            .open('Trying to reach server', {
+              label: 'State unknown',
+              autoClose: false,
+              status: TuiNotification.Error,
+            })
+            .pipe(
+              takeUntil(
+                combineLatest([this.stream$, this.network$]).pipe(
+                  filter(state => state.every(Boolean)),
+                ),
+              ),
+            ),
+          this.alerts.open('Connection restored', {
+            label: 'Server reached',
+            status: TuiNotification.Success,
+          }),
+        ),
+      ),
+    )
+    .subscribe() // @TODO shouldn't this be subscribed in app component with the others? Do we ever need to unsubscribe?
+
+  constructor() {
+    super(subscriber => this.stream$.subscribe(subscriber))
+  }
+
+  retrigger() {
+    this.trigger$.next()
+  }
+
+  async syncState() {
+    const state = await this.api.getState()
+    this.single$.next(state)
+  }
+}
+
+export function stateNot(state: RR.ServerState[]): CanActivateFn {
+  return () =>
+    inject(StateService).pipe(
+      filter(current => !current || !state.includes(current)),
+      map(ALWAYS_TRUE_HANDLER),
+    )
+}
diff --git a/web/projects/ui/src/app/services/storage.service.ts b/web/projects/ui/src/app/services/storage.service.ts
index ec87864b5..e59eba439 100644
--- a/web/projects/ui/src/app/services/storage.service.ts
+++ b/web/projects/ui/src/app/services/storage.service.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core'
 import { DOCUMENT } from '@angular/common'
 
-const PREFIX = '_embassystorage/_embassykv/'
+const PREFIX = '_startos/'
 
 @Injectable({
   providedIn: 'root',
@@ -15,16 +15,21 @@ export class StorageService {
     return JSON.parse(String(this.storage.getItem(`${PREFIX}${key}`)))
   }
 
-  set<T>(key: string, value: T) {
+  set(key: string, value: any) {
     this.storage.setItem(`${PREFIX}${key}`, JSON.stringify(value))
   }
 
   clear() {
-    Array.from(
-      { length: this.storage.length },
-      (_, i) => this.storage.key(i) || '',
-    )
-      .filter(key => key.startsWith(PREFIX))
-      .forEach(key => this.storage.removeItem(key))
+    this.storage.clear()
+  }
+
+  migrate036() {
+    const oldPrefix = '_embassystorage/_embassykv/'
+    if (!!this.storage.getItem(`${oldPrefix}loggedInKey`)) {
+      const cache = this.storage.getItem(`${oldPrefix}patch-db-cache`)
+      this.clear()
+      this.set('loggedIn', true)
+      this.set('patchDB', cache)
+    }
   }
 }

From 355452cdb30c73fe3a9b134987310414a86f830b Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 19 Jun 2024 17:30:05 -0600
Subject: [PATCH 164/341] Feat/next packages (#2646)

* fix mac build

* wip

* chore: Update the effects to get rid of bad pattern

* chore: Some small changes

* wip

* fix: Health checks don't show during race

* fix: Restart working

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 .../src/Adapters/Systems/SystemForStartOs.ts  |  6 ++-
 core/startos/src/service/mod.rs               | 34 ++++++++++++++-
 .../src/service/service_effect_handler.rs     |  6 +--
 sdk/Makefile                                  |  4 +-
 sdk/lib/mainFn/Daemons.ts                     |  4 +-
 sdk/lib/mainFn/HealthDaemon.ts                |  4 +-
 sdk/lib/util/Overlay.ts                       | 41 +++++++++----------
 7 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index e10434032..e7f09952a 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -123,9 +123,9 @@ export class SystemForStartOs implements System {
         return this.abi.uninit({ effects, nextVersion })
       }
       case "/main/start": {
+        if (this.onTerm) await this.onTerm()
         const started = async (onTerm: () => Promise<void>) => {
           await effects.setMainStatus({ status: "running" })
-          if (this.onTerm) await this.onTerm()
           this.onTerm = onTerm
         }
         const daemons = await (
@@ -135,10 +135,11 @@ export class SystemForStartOs implements System {
           })
         ).build()
         this.onTerm = daemons.term
+        return
       }
       case "/main/stop": {
-        await effects.setMainStatus({ status: "stopped" })
         if (this.onTerm) await this.onTerm()
+        await effects.setMainStatus({ status: "stopped" })
         delete this.onTerm
         return duration(30, "s")
       }
@@ -183,6 +184,7 @@ export class SystemForStartOs implements System {
             return dependencyConfig.update(options.input as any) // TODO
           }
         }
+        return
     }
     throw new Error(`Method ${options.procedure} not implemented.`)
   }
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 2eecc565e..92564b8e4 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -485,7 +485,7 @@ impl Actor for ServiceActor {
             let mut current = seed.persistent_container.state.subscribe();
 
             loop {
-                let kinds = dbg!(current.borrow().kinds());
+                let kinds = current.borrow().kinds();
 
                 if let Err(e) = async {
                     let main_status = match (
@@ -493,6 +493,14 @@ impl Actor for ServiceActor {
                         kinds.desired_state,
                         kinds.running_status,
                     ) {
+                        (Some(TransitionKind::Restarting), StartStop::Stop, Some(_)) => {
+                            seed.persistent_container.stop().await?;
+                            MainStatus::Restarting
+                        }
+                        (Some(TransitionKind::Restarting), StartStop::Start, _) => {
+                            seed.persistent_container.start().await?;
+                            MainStatus::Restarting
+                        }
                         (Some(TransitionKind::Restarting), _, _) => MainStatus::Restarting,
                         (Some(TransitionKind::Restoring), _, _) => MainStatus::Restoring,
                         (Some(TransitionKind::BackingUp), _, Some(status)) => {
@@ -523,6 +531,30 @@ impl Actor for ServiceActor {
                         .mutate(|d| {
                             if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id)
                             {
+                                let previous = i.as_status().as_main().de()?;
+                                let previous_health = previous.health();
+                                let previous_started = previous.started();
+                                let mut main_status = main_status;
+                                match &mut main_status {
+                                    &mut MainStatus::Running { ref mut health, .. }
+                                    | &mut MainStatus::BackingUp { ref mut health, .. } => {
+                                        *health = previous_health.unwrap_or(health).clone();
+                                    }
+                                    _ => (),
+                                };
+                                match &mut main_status {
+                                    MainStatus::Running {
+                                        ref mut started, ..
+                                    } => {
+                                        *started = previous_started.unwrap_or(*started);
+                                    }
+                                    MainStatus::BackingUp {
+                                        ref mut started, ..
+                                    } => {
+                                        *started = previous_started.map(Some).unwrap_or(*started);
+                                    }
+                                    _ => (),
+                                };
                                 i.as_status_mut().as_main_mut().ser(&main_status)?;
                             }
                             Ok(())
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 28a611854..bcd6da7d1 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -936,7 +936,6 @@ async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result
     Ok(json!(matches!(package, MainStatus::Stopped)))
 }
 async fn running(context: EffectContext, params: ParamsPackageId) -> Result<Value, Error> {
-    dbg!("Starting the running {params:?}");
     let context = context.deref()?;
     let peeked = context.seed.ctx.db.peek().await;
     let package_id = params.package_id;
@@ -956,9 +955,7 @@ async fn restart(
     WithProcedureId { procedure_id, .. }: WithProcedureId<Empty>,
 ) -> Result<(), Error> {
     let context = context.deref()?;
-    dbg!("here");
     context.restart(procedure_id).await?;
-    dbg!("here");
     Ok(())
 }
 
@@ -1032,12 +1029,11 @@ struct SetMainStatus {
     status: SetMainStatusStatus,
 }
 async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Result<Value, Error> {
-    dbg!(format!("Status for main will be is {params:?}"));
     let context = context.deref()?;
     match params.status {
         SetMainStatusStatus::Running => context.seed.started(),
         SetMainStatusStatus::Stopped => context.seed.stopped(),
-        SetMainStatusStatus::Starting => context.seed.stopped(),
+        SetMainStatusStatus::Starting => context.seed.started(),
     }
     Ok(Value::Null)
 }
diff --git a/sdk/Makefile b/sdk/Makefile
index 091f4c7bb..4d01fa3d7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -25,7 +25,7 @@ dist: $(TS_FILES) package.json node_modules README.md LICENSE
 	cp LICENSE dist/LICENSE
 	touch dist
 
-full-bundle: clean bundle
+full-bundle: bundle
 
 check:
 	npm run check
@@ -36,7 +36,7 @@ fmt: node_modules
 node_modules: package.json
 	npm ci
 
-publish: clean bundle package.json README.md LICENSE
+publish: bundle package.json README.md LICENSE
 	cd dist && npm publish --access=public
 
 link: bundle
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index d51d444a8..f48dd51c0 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -154,7 +154,7 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
     this.healthDaemons.forEach((x) =>
       x.addWatcher(() => this.updateMainHealth()),
     )
-    return {
+    const built = {
       term: async (options?: { signal?: Signals; timeout?: number }) => {
         try {
           await Promise.all(this.healthDaemons.map((x) => x.term(options)))
@@ -163,6 +163,8 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
         }
       },
     }
+    this.started(() => built.term())
+    return built
   }
 
   private updateMainHealth() {
diff --git a/sdk/lib/mainFn/HealthDaemon.ts b/sdk/lib/mainFn/HealthDaemon.ts
index 84e9e34d7..48f3fab55 100644
--- a/sdk/lib/mainFn/HealthDaemon.ts
+++ b/sdk/lib/mainFn/HealthDaemon.ts
@@ -132,14 +132,14 @@ export class HealthDaemon {
       this.effects.setHealth({
         result: status,
         message: health.message,
-        id: display,
+        id: this.id,
         name: display,
       })
     } else {
       this.effects.setHealth({
         result: health.status,
         message: health.message || "",
-        id: display,
+        id: this.id,
         name: display,
       })
     }
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index fbc854c57..4d6d36b34 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -27,12 +27,11 @@ export class Overlay {
     }
 
     for (const dirPart of shared) {
-      await fs.mkdir(`${rootfs}/${dirPart}`, { recursive: true })
-      await execFile("mount", [
-        "--rbind",
-        `/${dirPart}`,
-        `${rootfs}/${dirPart}`,
-      ])
+      const from = `/${dirPart}`
+      const to = `${rootfs}/${dirPart}`
+      await fs.mkdir(from, { recursive: true })
+      await fs.mkdir(to, { recursive: true })
+      await execFile("mount", ["--rbind", from, to])
     }
 
     return new Overlay(effects, id, rootfs, guid)
@@ -48,22 +47,22 @@ export class Overlay {
           ? options.subpath
           : `/${options.subpath}`
         : "/"
-      await execFile("mount", [
-        "--bind",
-        `/media/startos/volumes/${options.id}${subpath}`,
-        path,
-      ])
+      const from = `/media/startos/volumes/${options.id}${subpath}`
+
+      await fs.mkdir(from, { recursive: true })
+      await fs.mkdir(path, { recursive: true })
+      await await execFile("mount", ["--bind", from, path])
     } else if (options.type === "assets") {
       const subpath = options.subpath
         ? options.subpath.startsWith("/")
           ? options.subpath
           : `/${options.subpath}`
         : "/"
-      await execFile("mount", [
-        "--bind",
-        `/media/startos/assets/${options.id}${subpath}`,
-        path,
-      ])
+      const from = `/media/startos/assets/${options.id}${subpath}`
+
+      await fs.mkdir(from, { recursive: true })
+      await fs.mkdir(path, { recursive: true })
+      await execFile("mount", ["--bind", from, path])
     } else if (options.type === "pointer") {
       await this.effects.mount({ location: path, target: options })
     } else if (options.type === "backup") {
@@ -72,11 +71,11 @@ export class Overlay {
           ? options.subpath
           : `/${options.subpath}`
         : "/"
-      await execFile("mount", [
-        "--bind",
-        `/media/startos/backup${subpath}`,
-        path,
-      ])
+      const from = `/media/startos/backup${subpath}`
+
+      await fs.mkdir(from, { recursive: true })
+      await fs.mkdir(path, { recursive: true })
+      await execFile("mount", ["--bind", from, path])
     } else {
       throw new Error(`unknown type ${(options as any).type}`)
     }

From c6c97491ac3467c4a602aa82cbe7ce2d3ec56a55 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Thu, 20 Jun 2024 10:07:39 -0600
Subject: [PATCH 165/341] add boot param to logs subscription

---
 .../ui/src/app/components/logs/logs.component.ts       |  2 +-
 .../src/app/pages/diagnostic-routes/logs/logs.page.ts  |  2 +-
 .../ui/src/app/pages/init/logs/logs.service.ts         |  4 +++-
 web/projects/ui/src/app/services/api/api.types.ts      |  7 ++++++-
 .../src/app/services/api/embassy-live-api.service.ts   | 10 ++++++----
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/web/projects/ui/src/app/components/logs/logs.component.ts b/web/projects/ui/src/app/components/logs/logs.component.ts
index 3d31313cb..8ce328f91 100644
--- a/web/projects/ui/src/app/components/logs/logs.component.ts
+++ b/web/projects/ui/src/app/components/logs/logs.component.ts
@@ -62,7 +62,7 @@ export class LogsComponent {
     | 'connected'
     | 'reconnecting'
     | 'disconnected' = 'connecting'
-  limit = 400
+  limit = 200
   count = 0
 
   constructor(
diff --git a/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
index 5119b9d93..976abc2a0 100644
--- a/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
@@ -18,7 +18,7 @@ export class LogsPage {
   loading = true
   needInfinite = true
   startCursor?: string
-  limit = 200
+  limit = 400
   isOnBottom = true
 
   constructor(
diff --git a/web/projects/ui/src/app/pages/init/logs/logs.service.ts b/web/projects/ui/src/app/pages/init/logs/logs.service.ts
index e06d56b42..5fe550d45 100644
--- a/web/projects/ui/src/app/pages/init/logs/logs.service.ts
+++ b/web/projects/ui/src/app/pages/init/logs/logs.service.ts
@@ -35,7 +35,9 @@ function convertAnsi(entries: readonly any[]): string {
 @Injectable({ providedIn: 'root' })
 export class LogsService extends Observable<readonly string[]> {
   private readonly api = inject(ApiService)
-  private readonly log$ = defer(() => this.api.initFollowLogs({})).pipe(
+  private readonly log$ = defer(() =>
+    this.api.initFollowLogs({ boot: 0 }),
+  ).pipe(
     switchMap(({ guid }) => this.api.openWebsocket$<Log>(guid, {})),
     bufferTime(250),
     filter(logs => !!logs.length),
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index a5c52e9a2..256f6848b 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -70,7 +70,12 @@ export module RR {
   export type GetServerLogsReq = ServerLogsReq // server.logs & server.kernel-logs
   export type GetServerLogsRes = LogsRes
 
-  export type FollowServerLogsReq = { limit?: number } // server.logs.follow & server.kernel-logs.follow
+  // @param limit: BE default is 50
+  // @param boot: number is offset (0: current, -1 prev, +1 first), string is a specific boot id, and null is all
+  export type FollowServerLogsReq = {
+    limit?: number
+    boot?: number | string | null
+  } // server.logs.follow & server.kernel-logs.follow
   export type FollowServerLogsRes = {
     startCursor: string
     guid: string
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 8826b2883..b460e00ff 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -160,8 +160,10 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'init.subscribe', params: {} })
   }
 
-  async initFollowLogs(): Promise<RR.FollowServerLogsRes> {
-    return this.rpcRequest({ method: 'init.logs.follow', params: {} })
+  async initFollowLogs(
+    params: RR.FollowServerLogsReq,
+  ): Promise<RR.FollowServerLogsRes> {
+    return this.rpcRequest({ method: 'init.logs.follow', params })
   }
 
   // server
@@ -379,8 +381,8 @@ export class LiveApiService extends ApiService {
   }
 
   async followPackageLogs(
-    params: RR.FollowServerLogsReq,
-  ): Promise<RR.FollowServerLogsRes> {
+    params: RR.FollowPackageLogsReq,
+  ): Promise<RR.FollowPackageLogsRes> {
     return this.rpcRequest({ method: 'package.logs.follow', params })
   }
 

From f39b85abf2a36622ba7b19d1c4fa6da0ef722215 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Thu, 20 Jun 2024 10:08:00 -0600
Subject: [PATCH 166/341] bump to 036

---
 web/package-lock.json                         |  4 +-
 web/package.json                              |  2 +-
 web/patchdb-ui-seed.json                      |  2 +-
 .../modals/os-welcome/os-welcome.page.html    | 51 ++-----------------
 .../ui/src/app/services/api/api.fixures.ts    |  4 +-
 .../ui/src/app/services/api/mock-patch.ts     |  2 +-
 6 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 81b612ac1..97a049b98 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "startos-ui",
-  "version": "0.3.5.2",
+  "version": "0.3.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "startos-ui",
-      "version": "0.3.5.2",
+      "version": "0.3.6",
       "dependencies": {
         "@angular/animations": "^14.1.0",
         "@angular/common": "^14.1.0",
diff --git a/web/package.json b/web/package.json
index 3ea29c6fd..6d7db5863 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.5.2",
+  "version": "0.3.6",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "scripts": {
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 30eb8900b..7bea3ea14 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -1,6 +1,6 @@
 {
   "name": null,
-  "ack-welcome": "0.3.5.2",
+  "ack-welcome": "0.3.6",
   "marketplace": {
     "selected-url": "https://registry.start9.com/",
     "known-hosts": {
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 292480e09..9603d454a 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,40 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.5.2</h4>
-  <p class="note-padding">
-    View the complete
-    <a
-      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.2"
-      target="_blank"
-      noreferrer
-    >
-      release notes
-    </a>
-    for more details.
-  </p>
-  <h6>Highlights</h6>
-  <ul class="spaced-list">
-    <li>Revert perpetual performance mode for quieter fan</li>
-    <li>Minor bug fixes</li>
-  </ul>
-
-  <h2>Previous 0.3.5.x Releases</h2>
-
-  <h4>0.3.5.1</h4>
-  <p class="note-padding">
-    View the complete
-    <a
-      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5.1"
-      target="_blank"
-      noreferrer
-    >
-      release notes
-    </a>
-    for more details.
-  </p>
-
-  <h4>0.3.5</h4>
+  <h4>0.3.6</h4>
   <p class="note-padding">
     View the complete
     <a
@@ -59,18 +26,10 @@ <h4>0.3.5</h4>
   </p>
   <h6>Highlights</h6>
   <ul class="spaced-list">
-    <li>
-      This release contains significant under-the-hood improvements to
-      performance and reliability
-    </li>
-    <li>Ditch Docker, replace with Podman</li>
-    <li>Remove locking behavior from PatchDB and optimize</li>
-    <li>Boost efficiency of service manager</li>
-    <li>Require HTTPS on LAN, and improve setup flow for trusting Root CA</li>
-    <li>Better default privacy settings for Firefox kiosk mode</li>
-    <li>Eliminate memory leak from Javascript runtime</li>
-    <li>Other small bug fixes</li>
-    <li>Update license to MIT</li>
+    <li>Ditch Podman, replace with LXC</li>
+    <li></li>
+    <li></li>
+    <li></li>
   </ul>
 
   <div class="ion-text-center ion-padding">
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 38ee4774b..8c0f447a0 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -17,10 +17,10 @@ export module Mock {
     shuttingDown: false,
   }
   export const MarketplaceEos: RR.CheckOSUpdateRes = {
-    version: '0.3.5.2',
+    version: '0.3.6',
     headline: 'Our biggest release ever.',
     releaseNotes: {
-      '0.3.5.2': 'Some **Markdown** release _notes_ for 0.3.5.2',
+      '0.3.6': 'Some **Markdown** release _notes_ for 0.3.6',
       '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1',
       '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4',
       '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3',
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index ee96f9fe2..14fdaa724 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -37,7 +37,7 @@ export const mockPatchData: DataModel = {
     arch: 'x86_64',
     onionAddress: 'myveryownspecialtoraddress',
     id: 'abcdefgh',
-    version: '0.3.5.2',
+    version: '0.3.6',
     lastBackup: new Date(new Date().valueOf() - 604800001).toISOString(),
     lanAddress: 'https://adjective-noun.local',
     torAddress: 'https://myveryownspecialtoraddress.onion',

From 07104b18f579e96a7fdea27a613355176eb710ca Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Thu, 20 Jun 2024 20:59:16 +0200
Subject: [PATCH 167/341] Update workflows actions (#2628)

* Update workflows actions to the latest versions
---
 .github/workflows/startos-iso.yaml | 20 ++++++++++----------
 .github/workflows/test.yaml        |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 30b2bec0f..c51eafc5c 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -71,27 +71,27 @@ jobs:
           sudo mount -t tmpfs tmpfs .
         if: ${{ github.event.inputs.runner == 'fast' }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODEJS_VERSION }}
 
       - name: Set up docker QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up system dependencies
         run: sudo apt-get update && sudo apt-get install -y qemu-user-static systemd-container
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Make
         run: make ARCH=${{ matrix.arch }} compiled-${{ matrix.arch }}.tar
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: compiled-${{ matrix.arch }}.tar
           path: compiled-${{ matrix.arch }}.tar
@@ -144,7 +144,7 @@ jobs:
         run: rm -rf /opt/hostedtoolcache*
         if: ${{ github.event.inputs.runner != 'fast' }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -166,7 +166,7 @@ jobs:
         if: ${{ github.event.inputs.runner == 'fast' && (matrix.platform == 'x86_64' || matrix.platform == 'x86_64-nonfree') }}
 
       - name: Download compiled artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: compiled-${{ env.ARCH }}.tar
 
@@ -190,18 +190,18 @@ jobs:
         run: PLATFORM=${{ matrix.platform }} make img
         if: ${{ matrix.platform == 'raspberrypi' }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.platform }}.squashfs
           path: results/*.squashfs
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.platform }}.iso
           path: results/*.iso
         if: ${{ matrix.platform != 'raspberrypi' }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.platform }}.img
           path: results/*.img
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c6082ac25..0a5eb38e9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -19,11 +19,11 @@ jobs:
     name: Run Automated Tests
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODEJS_VERSION }}
 

From e6abf4e33b841961ff37c701daa2eb4e203d7e9f Mon Sep 17 00:00:00 2001
From: waterplea <alexander@inkin.ru>
Date: Fri, 21 Jun 2024 15:51:04 +0500
Subject: [PATCH 168/341] feat: get rid of cyclic dep between patch-db and api
 service

Signed-off-by: waterplea <alexander@inkin.ru>
---
 web/projects/ui/src/app/app.module.ts         |  2 -
 web/projects/ui/src/app/app.providers.ts      | 10 ++++
 .../services/api/embassy-live-api.service.ts  |  7 ++-
 .../app/services/patch-db/patch-db-source.ts  | 56 +++++++++++++++++++
 .../app/services/patch-db/patch-db.factory.ts | 55 ------------------
 .../app/services/patch-db/patch-db.module.ts  | 20 -------
 6 files changed, 70 insertions(+), 80 deletions(-)
 create mode 100644 web/projects/ui/src/app/services/patch-db/patch-db-source.ts
 delete mode 100644 web/projects/ui/src/app/services/patch-db/patch-db.factory.ts
 delete mode 100644 web/projects/ui/src/app/services/patch-db/patch-db.module.ts

diff --git a/web/projects/ui/src/app/app.module.ts b/web/projects/ui/src/app/app.module.ts
index c0264f064..f13b4fbfa 100644
--- a/web/projects/ui/src/app/app.module.ts
+++ b/web/projects/ui/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { PreloaderModule } from './app/preloader/preloader.module'
 import { FooterModule } from './app/footer/footer.module'
 import { MenuModule } from './app/menu/menu.module'
 import { APP_PROVIDERS } from './app.providers'
-import { PatchDbModule } from './services/patch-db/patch-db.module'
 import { ToastContainerModule } from './components/toast-container/toast-container.module'
 import { ConnectionBarComponentModule } from './components/connection-bar/connection-bar.component.module'
 import { WidgetsPageModule } from './pages/widgets/widgets.module'
@@ -54,7 +53,6 @@ import { environment } from '../environments/environment'
     MonacoEditorModule,
     SharedPipesModule,
     MarketplaceModule,
-    PatchDbModule,
     ToastContainerModule,
     ConnectionBarComponentModule,
     TuiRootModule,
diff --git a/web/projects/ui/src/app/app.providers.ts b/web/projects/ui/src/app/app.providers.ts
index bf26a8cb9..c6a8d756e 100644
--- a/web/projects/ui/src/app/app.providers.ts
+++ b/web/projects/ui/src/app/app.providers.ts
@@ -3,6 +3,11 @@ import { UntypedFormBuilder } from '@angular/forms'
 import { Router, RouteReuseStrategy } from '@angular/router'
 import { IonicRouteStrategy, IonNav } from '@ionic/angular'
 import { RELATIVE_URL, THEME, WorkspaceConfig } from '@start9labs/shared'
+import { PatchDB } from 'patch-db-client'
+import {
+  PATCH_CACHE,
+  PatchDbSource,
+} from 'src/app/services/patch-db/patch-db-source'
 import { ApiService } from './services/api/embassy-api.service'
 import { MockApiService } from './services/api/embassy-mock-api.service'
 import { LiveApiService } from './services/api/embassy-live-api.service'
@@ -29,6 +34,11 @@ export const APP_PROVIDERS: Provider[] = [
     provide: ApiService,
     useClass: useMocks ? MockApiService : LiveApiService,
   },
+  {
+    provide: PatchDB,
+    deps: [PatchDbSource, PATCH_CACHE],
+    useClass: PatchDB,
+  },
   {
     provide: APP_INITIALIZER,
     deps: [StorageService, AuthService, ClientStorageService, Router],
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 8826b2883..954a4475e 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -7,6 +7,7 @@ import {
   RpcError,
   RPCOptions,
 } from '@start9labs/shared'
+import { PATCH_CACHE } from 'src/app/services/patch-db/patch-db-source'
 import { ApiService } from './embassy-api.service'
 import { RR } from './api.types'
 import { parsePropertiesPermissive } from 'src/app/util/properties.util'
@@ -16,7 +17,7 @@ import { Observable, filter, firstValueFrom } from 'rxjs'
 import { AuthService } from '../auth.service'
 import { DOCUMENT } from '@angular/common'
 import { DataModel } from '../patch-db/data-model'
-import { PatchDB, pathFromArray } from 'patch-db-client'
+import { Dump, pathFromArray } from 'patch-db-client'
 
 @Injectable()
 export class LiveApiService extends ApiService {
@@ -25,7 +26,7 @@ export class LiveApiService extends ApiService {
     private readonly http: HttpService,
     private readonly config: ConfigService,
     private readonly auth: AuthService,
-    private readonly patch: PatchDB<DataModel>,
+    @Inject(PATCH_CACHE) private readonly cache$: Observable<Dump<DataModel>>,
   ) {
     super()
     ; (window as any).rpcClient = this
@@ -482,7 +483,7 @@ export class LiveApiService extends ApiService {
     const patchSequence = res.headers.get('x-patch-sequence')
     if (patchSequence)
       await firstValueFrom(
-        this.patch.cache$.pipe(filter(({ id }) => id >= Number(patchSequence))),
+        this.cache$.pipe(filter(({ id }) => id >= Number(patchSequence))),
       )
 
     return body.result
diff --git a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
new file mode 100644
index 000000000..803fbce2c
--- /dev/null
+++ b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
@@ -0,0 +1,56 @@
+import { inject, Injectable, InjectionToken } from '@angular/core'
+import { Dump, Revision, Update } from 'patch-db-client'
+import { BehaviorSubject, EMPTY, Observable } from 'rxjs'
+import {
+  bufferTime,
+  catchError,
+  filter,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators'
+import { StateService } from 'src/app/services/state.service'
+import { ApiService } from '../api/embassy-api.service'
+import { AuthService } from '../auth.service'
+import { DataModel } from './data-model'
+import { LocalStorageBootstrap } from './local-storage-bootstrap'
+
+export const PATCH_CACHE = new InjectionToken('', {
+  factory: () =>
+    new BehaviorSubject<Dump<DataModel>>({
+      id: 0,
+      value: {} as DataModel,
+    }),
+})
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PatchDbSource extends Observable<Update<DataModel>[]> {
+  private readonly api = inject(ApiService)
+  private readonly state = inject(StateService)
+  private readonly stream$ = inject(AuthService).isVerified$.pipe(
+    switchMap(verified => (verified ? this.api.subscribeToPatchDB({}) : EMPTY)),
+    switchMap(({ dump, guid }) =>
+      this.api.openWebsocket$<Revision>(guid, {}).pipe(
+        bufferTime(250),
+        filter(revisions => !!revisions.length),
+        startWith([dump]),
+      ),
+    ),
+    catchError((_, original$) => {
+      this.state.retrigger()
+
+      return this.state.pipe(
+        filter(current => current === 'running'),
+        take(1),
+        switchMap(() => original$),
+      )
+    }),
+    startWith([inject(LocalStorageBootstrap).init()]),
+  )
+
+  constructor() {
+    super(subscriber => this.stream$.subscribe(subscriber))
+  }
+}
diff --git a/web/projects/ui/src/app/services/patch-db/patch-db.factory.ts b/web/projects/ui/src/app/services/patch-db/patch-db.factory.ts
deleted file mode 100644
index bb2dcdf57..000000000
--- a/web/projects/ui/src/app/services/patch-db/patch-db.factory.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { InjectionToken, Injector } from '@angular/core'
-import { Revision, Update } from 'patch-db-client'
-import { defer, EMPTY, from, Observable } from 'rxjs'
-import {
-  bufferTime,
-  catchError,
-  filter,
-  startWith,
-  switchMap,
-  take,
-} from 'rxjs/operators'
-import { StateService } from 'src/app/services/state.service'
-import { ApiService } from '../api/embassy-api.service'
-import { AuthService } from '../auth.service'
-import { DataModel } from './data-model'
-import { LocalStorageBootstrap } from './local-storage-bootstrap'
-
-export const PATCH_SOURCE = new InjectionToken<Observable<Update<DataModel>[]>>(
-  '',
-)
-
-export function sourceFactory(
-  injector: Injector,
-): Observable<Update<DataModel>[]> {
-  // defer() needed to avoid circular dependency with ApiService, since PatchDB is needed there
-  return defer(() => {
-    const api = injector.get(ApiService)
-    const auth = injector.get(AuthService)
-    const state = injector.get(StateService)
-    const bootstrapper = injector.get(LocalStorageBootstrap)
-
-    return auth.isVerified$.pipe(
-      switchMap(verified =>
-        verified ? from(api.subscribeToPatchDB({})) : EMPTY,
-      ),
-      switchMap(({ dump, guid }) =>
-        api.openWebsocket$<Revision>(guid, {}).pipe(
-          bufferTime(250),
-          filter(revisions => !!revisions.length),
-          startWith([dump]),
-        ),
-      ),
-      catchError((_, original$) => {
-        state.retrigger()
-
-        return state.pipe(
-          filter(current => current === 'running'),
-          take(1),
-          switchMap(() => original$),
-        )
-      }),
-      startWith([bootstrapper.init()]),
-    )
-  })
-}
diff --git a/web/projects/ui/src/app/services/patch-db/patch-db.module.ts b/web/projects/ui/src/app/services/patch-db/patch-db.module.ts
deleted file mode 100644
index 3c816e339..000000000
--- a/web/projects/ui/src/app/services/patch-db/patch-db.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { PatchDB } from 'patch-db-client'
-import { Injector, NgModule } from '@angular/core'
-import { PATCH_SOURCE, sourceFactory } from './patch-db.factory'
-
-// This module is purely for providers organization purposes
-@NgModule({
-  providers: [
-    {
-      provide: PATCH_SOURCE,
-      deps: [Injector],
-      useFactory: sourceFactory,
-    },
-    {
-      provide: PatchDB,
-      deps: [PATCH_SOURCE],
-      useClass: PatchDB,
-    },
-  ],
-})
-export class PatchDbModule {}

From 133dfd5063a36b8db2b5bd1b54a20a3e462f4082 Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Fri, 21 Jun 2024 18:39:05 -0600
Subject: [PATCH 169/341] match query to registry table

---
 core/startos/src/registry/os/version/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index cb36f078a..234143295 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -145,10 +145,10 @@ pub async fn get_version(
         arch,
     }: GetVersionParams,
 ) -> Result<BTreeMap<VersionString, OsVersionInfo>, Error> {
-    if let (Some(pool), Some(server_id), Some(arch)) = (ctx.pool, server_id, arch) {
-        let created_at = Utc::now().to_rfc3339();
+    if let (Some(pool), Some(server_id), Some(arch)) = (&ctx.pool, server_id, arch) {
+        let created_at = Utc::now();
 
-        query!("INSERT INTO user_activity (created_at, server_id, os_version, arch) VALUES ($1, $2, $3, $4)",
+        query!("INSERT INTO user_activity (created_at, server_id, arch) VALUES ($1, $2, $3)",
         created_at,
         server_id,
         arch

From b0c0cd7fda2400712fc928a25da5e4cbd42031cf Mon Sep 17 00:00:00 2001
From: Shadowy Super Coder <musashidisciple@proton.me>
Date: Fri, 21 Jun 2024 18:40:32 -0600
Subject: [PATCH 170/341] add script to cache registry db

---
 ...3452e7a69768da179e78479cd35ee42b493ae.json |  16 +
 .../os/version/db/registry-sqlx-data.sh       |  27 +
 .../os/version/db/registry_schema.sql         | 828 ++++++++++++++++++
 3 files changed, 871 insertions(+)
 create mode 100644 core/startos/.sqlx/query-bc9382d34bf93f468c64d0d02613452e7a69768da179e78479cd35ee42b493ae.json
 create mode 100755 core/startos/src/registry/os/version/db/registry-sqlx-data.sh
 create mode 100644 core/startos/src/registry/os/version/db/registry_schema.sql

diff --git a/core/startos/.sqlx/query-bc9382d34bf93f468c64d0d02613452e7a69768da179e78479cd35ee42b493ae.json b/core/startos/.sqlx/query-bc9382d34bf93f468c64d0d02613452e7a69768da179e78479cd35ee42b493ae.json
new file mode 100644
index 000000000..d5fae12b7
--- /dev/null
+++ b/core/startos/.sqlx/query-bc9382d34bf93f468c64d0d02613452e7a69768da179e78479cd35ee42b493ae.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO user_activity (created_at, server_id, arch) VALUES ($1, $2, $3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Timestamptz",
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "bc9382d34bf93f468c64d0d02613452e7a69768da179e78479cd35ee42b493ae"
+}
diff --git a/core/startos/src/registry/os/version/db/registry-sqlx-data.sh b/core/startos/src/registry/os/version/db/registry-sqlx-data.sh
new file mode 100755
index 000000000..2a422bf38
--- /dev/null
+++ b/core/startos/src/registry/os/version/db/registry-sqlx-data.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+TMP_DIR=$(mktemp -d)
+mkdir $TMP_DIR/pgdata
+docker run -d --rm --name=tmp_postgres -e POSTGRES_PASSWORD=password -v $TMP_DIR/pgdata:/var/lib/postgresql/data postgres
+
+(
+    set -e
+    ctr=0
+    until docker exec tmp_postgres psql -U postgres || [ $ctr -ge 5 ]; do
+    	ctr=$[ctr + 1]
+    	sleep 5;
+    done
+    
+    PG_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' tmp_postgres)
+
+    SCHEMA_DUMP="registry_schema.sql"
+    
+    DATABASE_URL=postgres://postgres:password@$PG_IP/postgres
+    psql $DATABASE_URL -f "$SCRIPT_DIR/$SCHEMA_DUMP"
+    DATABASE_URL=postgres://postgres:password@$PG_IP/postgres PLATFORM=$(uname -m) cargo sqlx prepare -- --lib --profile=test --workspace
+    echo "Subscript Complete"
+)
+
+docker stop tmp_postgres
+sudo rm -rf $TMP_DIR
diff --git a/core/startos/src/registry/os/version/db/registry_schema.sql b/core/startos/src/registry/os/version/db/registry_schema.sql
new file mode 100644
index 000000000..abd9f4ea6
--- /dev/null
+++ b/core/startos/src/registry/os/version/db/registry_schema.sql
@@ -0,0 +1,828 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 14.12 (Ubuntu 14.12-0ubuntu0.22.04.1)
+-- Dumped by pg_dump version 14.12 (Ubuntu 14.12-0ubuntu0.22.04.1)
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- Name: admin; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.admin (
+    id character varying NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    pass_hash character varying NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+ALTER TABLE public.admin OWNER TO alpha_admin;
+
+--
+-- Name: admin_pkgs; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.admin_pkgs (
+    id bigint NOT NULL,
+    admin character varying NOT NULL,
+    pkg_id character varying NOT NULL
+);
+
+
+ALTER TABLE public.admin_pkgs OWNER TO alpha_admin;
+
+--
+-- Name: admin_pkgs_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.admin_pkgs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.admin_pkgs_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: admin_pkgs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.admin_pkgs_id_seq OWNED BY public.admin_pkgs.id;
+
+
+--
+-- Name: category; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.category (
+    id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    name character varying NOT NULL,
+    description character varying NOT NULL,
+    priority bigint DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE public.category OWNER TO alpha_admin;
+
+--
+-- Name: category_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.category_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.category_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: category_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.category_id_seq OWNED BY public.category.id;
+
+
+--
+-- Name: eos_hash; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.eos_hash (
+    id bigint NOT NULL,
+    version character varying NOT NULL,
+    hash character varying NOT NULL
+);
+
+
+ALTER TABLE public.eos_hash OWNER TO alpha_admin;
+
+--
+-- Name: eos_hash_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.eos_hash_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.eos_hash_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: eos_hash_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.eos_hash_id_seq OWNED BY public.eos_hash.id;
+
+
+--
+-- Name: error_log_record; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.error_log_record (
+    id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    epoch character varying NOT NULL,
+    commit_hash character varying NOT NULL,
+    source_file character varying NOT NULL,
+    line bigint NOT NULL,
+    target character varying NOT NULL,
+    level character varying NOT NULL,
+    message character varying NOT NULL,
+    incidents bigint NOT NULL
+);
+
+
+ALTER TABLE public.error_log_record OWNER TO alpha_admin;
+
+--
+-- Name: error_log_record_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.error_log_record_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.error_log_record_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: error_log_record_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.error_log_record_id_seq OWNED BY public.error_log_record.id;
+
+
+--
+-- Name: metric; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.metric (
+    id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    version character varying NOT NULL,
+    pkg_id character varying NOT NULL
+);
+
+
+ALTER TABLE public.metric OWNER TO alpha_admin;
+
+--
+-- Name: metric_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.metric_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.metric_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: metric_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.metric_id_seq OWNED BY public.metric.id;
+
+
+--
+-- Name: os_version; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.os_version (
+    id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    number character varying NOT NULL,
+    headline character varying NOT NULL,
+    release_notes character varying NOT NULL,
+    arch character varying
+);
+
+
+ALTER TABLE public.os_version OWNER TO alpha_admin;
+
+--
+-- Name: os_version_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.os_version_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.os_version_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: os_version_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.os_version_id_seq OWNED BY public.os_version.id;
+
+
+--
+-- Name: persistent_migration; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.persistent_migration (
+    id integer NOT NULL,
+    version integer NOT NULL,
+    label character varying,
+    "timestamp" timestamp with time zone NOT NULL
+);
+
+
+ALTER TABLE public.persistent_migration OWNER TO alpha_admin;
+
+--
+-- Name: persistent_migration_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.persistent_migration_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.persistent_migration_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: persistent_migration_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.persistent_migration_id_seq OWNED BY public.persistent_migration.id;
+
+
+--
+-- Name: pkg_category; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.pkg_category (
+    id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    category_id bigint NOT NULL,
+    pkg_id character varying NOT NULL
+);
+
+
+ALTER TABLE public.pkg_category OWNER TO alpha_admin;
+
+--
+-- Name: pkg_dependency; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.pkg_dependency (
+    id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    pkg_id character varying NOT NULL,
+    pkg_version character varying NOT NULL,
+    dep_id character varying NOT NULL,
+    dep_version_range character varying NOT NULL
+);
+
+
+ALTER TABLE public.pkg_dependency OWNER TO alpha_admin;
+
+--
+-- Name: pkg_dependency_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.pkg_dependency_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.pkg_dependency_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: pkg_dependency_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.pkg_dependency_id_seq OWNED BY public.pkg_dependency.id;
+
+
+--
+-- Name: pkg_record; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.pkg_record (
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone,
+    pkg_id character varying NOT NULL,
+    hidden boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.pkg_record OWNER TO alpha_admin;
+
+--
+-- Name: service_category_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.service_category_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.service_category_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: service_category_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.service_category_id_seq OWNED BY public.pkg_category.id;
+
+
+--
+-- Name: upload; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.upload (
+    id bigint NOT NULL,
+    uploader character varying NOT NULL,
+    pkg_id character varying NOT NULL,
+    pkg_version character varying NOT NULL,
+    created_at timestamp with time zone NOT NULL
+);
+
+
+ALTER TABLE public.upload OWNER TO alpha_admin;
+
+--
+-- Name: upload_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.upload_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.upload_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: upload_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.upload_id_seq OWNED BY public.upload.id;
+
+
+--
+-- Name: user_activity; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.user_activity (
+    id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    server_id character varying NOT NULL,
+    os_version character varying,
+    arch character varying
+);
+
+
+ALTER TABLE public.user_activity OWNER TO alpha_admin;
+
+--
+-- Name: user_activity_id_seq; Type: SEQUENCE; Schema: public; Owner: alpha_admin
+--
+
+CREATE SEQUENCE public.user_activity_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.user_activity_id_seq OWNER TO alpha_admin;
+
+--
+-- Name: user_activity_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: alpha_admin
+--
+
+ALTER SEQUENCE public.user_activity_id_seq OWNED BY public.user_activity.id;
+
+
+--
+-- Name: version; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.version (
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone,
+    number character varying NOT NULL,
+    release_notes character varying NOT NULL,
+    os_version character varying NOT NULL,
+    pkg_id character varying NOT NULL,
+    title character varying NOT NULL,
+    desc_short character varying NOT NULL,
+    desc_long character varying NOT NULL,
+    icon_type character varying NOT NULL,
+    deprecated_at timestamp with time zone
+);
+
+
+ALTER TABLE public.version OWNER TO alpha_admin;
+
+--
+-- Name: version_platform; Type: TABLE; Schema: public; Owner: alpha_admin
+--
+
+CREATE TABLE public.version_platform (
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone,
+    pkg_id character varying NOT NULL,
+    version_number character varying NOT NULL,
+    arch character varying NOT NULL,
+    ram bigint,
+    device jsonb
+);
+
+
+ALTER TABLE public.version_platform OWNER TO alpha_admin;
+
+--
+-- Name: admin_pkgs id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.admin_pkgs ALTER COLUMN id SET DEFAULT nextval('public.admin_pkgs_id_seq'::regclass);
+
+
+--
+-- Name: category id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.category ALTER COLUMN id SET DEFAULT nextval('public.category_id_seq'::regclass);
+
+
+--
+-- Name: eos_hash id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.eos_hash ALTER COLUMN id SET DEFAULT nextval('public.eos_hash_id_seq'::regclass);
+
+
+--
+-- Name: error_log_record id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.error_log_record ALTER COLUMN id SET DEFAULT nextval('public.error_log_record_id_seq'::regclass);
+
+
+--
+-- Name: metric id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.metric ALTER COLUMN id SET DEFAULT nextval('public.metric_id_seq'::regclass);
+
+
+--
+-- Name: os_version id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.os_version ALTER COLUMN id SET DEFAULT nextval('public.os_version_id_seq'::regclass);
+
+
+--
+-- Name: persistent_migration id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.persistent_migration ALTER COLUMN id SET DEFAULT nextval('public.persistent_migration_id_seq'::regclass);
+
+
+--
+-- Name: pkg_category id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_category ALTER COLUMN id SET DEFAULT nextval('public.service_category_id_seq'::regclass);
+
+
+--
+-- Name: pkg_dependency id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_dependency ALTER COLUMN id SET DEFAULT nextval('public.pkg_dependency_id_seq'::regclass);
+
+
+--
+-- Name: upload id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.upload ALTER COLUMN id SET DEFAULT nextval('public.upload_id_seq'::regclass);
+
+
+--
+-- Name: user_activity id; Type: DEFAULT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.user_activity ALTER COLUMN id SET DEFAULT nextval('public.user_activity_id_seq'::regclass);
+
+
+--
+-- Name: admin admin_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.admin
+    ADD CONSTRAINT admin_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: admin_pkgs admin_pkgs_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.admin_pkgs
+    ADD CONSTRAINT admin_pkgs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: category category_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.category
+    ADD CONSTRAINT category_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: eos_hash eos_hash_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.eos_hash
+    ADD CONSTRAINT eos_hash_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: error_log_record error_log_record_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.error_log_record
+    ADD CONSTRAINT error_log_record_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: metric metric_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.metric
+    ADD CONSTRAINT metric_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: os_version os_version_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.os_version
+    ADD CONSTRAINT os_version_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: persistent_migration persistent_migration_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.persistent_migration
+    ADD CONSTRAINT persistent_migration_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: pkg_category pkg_category_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_category
+    ADD CONSTRAINT pkg_category_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: pkg_dependency pkg_dependency_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_dependency
+    ADD CONSTRAINT pkg_dependency_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: admin_pkgs unique_admin_pkg; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.admin_pkgs
+    ADD CONSTRAINT unique_admin_pkg UNIQUE (pkg_id, admin);
+
+
+--
+-- Name: error_log_record unique_log_record; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.error_log_record
+    ADD CONSTRAINT unique_log_record UNIQUE (epoch, commit_hash, source_file, line, target, level, message);
+
+
+--
+-- Name: category unique_name; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.category
+    ADD CONSTRAINT unique_name UNIQUE (name);
+
+
+--
+-- Name: pkg_category unique_pkg_category; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_category
+    ADD CONSTRAINT unique_pkg_category UNIQUE (pkg_id, category_id);
+
+
+--
+-- Name: pkg_dependency unique_pkg_dep_version; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_dependency
+    ADD CONSTRAINT unique_pkg_dep_version UNIQUE (pkg_id, pkg_version, dep_id);
+
+
+--
+-- Name: eos_hash unique_version; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.eos_hash
+    ADD CONSTRAINT unique_version UNIQUE (version);
+
+
+--
+-- Name: upload upload_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.upload
+    ADD CONSTRAINT upload_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: user_activity user_activity_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.user_activity
+    ADD CONSTRAINT user_activity_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: version version_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.version
+    ADD CONSTRAINT version_pkey PRIMARY KEY (pkg_id, number);
+
+
+--
+-- Name: version_platform version_platform_pkey; Type: CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.version_platform
+    ADD CONSTRAINT version_platform_pkey PRIMARY KEY (pkg_id, version_number, arch);
+
+
+--
+-- Name: category_name_idx; Type: INDEX; Schema: public; Owner: alpha_admin
+--
+
+CREATE UNIQUE INDEX category_name_idx ON public.category USING btree (name);
+
+
+--
+-- Name: pkg_record_pkg_id_idx; Type: INDEX; Schema: public; Owner: alpha_admin
+--
+
+CREATE UNIQUE INDEX pkg_record_pkg_id_idx ON public.pkg_record USING btree (pkg_id);
+
+
+--
+-- Name: version_number_idx; Type: INDEX; Schema: public; Owner: alpha_admin
+--
+
+CREATE INDEX version_number_idx ON public.version USING btree (number);
+
+
+--
+-- Name: admin_pkgs admin_pkgs_admin_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.admin_pkgs
+    ADD CONSTRAINT admin_pkgs_admin_fkey FOREIGN KEY (admin) REFERENCES public.admin(id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: metric metric_pkg_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.metric
+    ADD CONSTRAINT metric_pkg_id_fkey FOREIGN KEY (pkg_id) REFERENCES public.pkg_record(pkg_id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: pkg_category pkg_category_category_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_category
+    ADD CONSTRAINT pkg_category_category_id_fkey FOREIGN KEY (category_id) REFERENCES public.category(id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: pkg_category pkg_category_pkg_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_category
+    ADD CONSTRAINT pkg_category_pkg_id_fkey FOREIGN KEY (pkg_id) REFERENCES public.pkg_record(pkg_id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: pkg_dependency pkg_dependency_dep_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_dependency
+    ADD CONSTRAINT pkg_dependency_dep_id_fkey FOREIGN KEY (dep_id) REFERENCES public.pkg_record(pkg_id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: pkg_dependency pkg_dependency_pkg_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.pkg_dependency
+    ADD CONSTRAINT pkg_dependency_pkg_id_fkey FOREIGN KEY (pkg_id) REFERENCES public.pkg_record(pkg_id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: upload upload_pkg_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.upload
+    ADD CONSTRAINT upload_pkg_id_fkey FOREIGN KEY (pkg_id) REFERENCES public.pkg_record(pkg_id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: upload upload_uploader_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.upload
+    ADD CONSTRAINT upload_uploader_fkey FOREIGN KEY (uploader) REFERENCES public.admin(id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: version version_pkg_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.version
+    ADD CONSTRAINT version_pkg_id_fkey FOREIGN KEY (pkg_id) REFERENCES public.pkg_record(pkg_id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- Name: version_platform version_platform_pkg_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: alpha_admin
+--
+
+ALTER TABLE ONLY public.version_platform
+    ADD CONSTRAINT version_platform_pkg_id_fkey FOREIGN KEY (pkg_id) REFERENCES public.pkg_record(pkg_id) ON UPDATE RESTRICT ON DELETE RESTRICT;
+
+
+--
+-- PostgreSQL database dump complete
+--
+

From e0d23f4436cb7bc28106702efaf45a5c581fca9e Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Sat, 22 Jun 2024 11:33:30 -0600
Subject: [PATCH 171/341] bump patchDB dep

---
 patch-db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch-db b/patch-db
index 7aa53249f..c537a07ea 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 7aa53249f9353162475ea347abac92abcfba5493
+Subproject commit c537a07ea937e69b66841d903c70fd75623e5457

From 68ed1c80ce5edf546081e86e9cb62309fff4112a Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Sat, 22 Jun 2024 21:47:18 -0600
Subject: [PATCH 172/341] update todos

---
 web/projects/ui/src/app/app.providers.ts                 | 2 +-
 .../ui/src/app/modals/generic-form/generic-form.page.ts  | 1 -
 .../pages/apps-routes/app-actions/app-actions.page.ts    | 9 ++-------
 web/projects/ui/src/app/pages/init/init.service.ts       | 1 +
 web/projects/ui/src/app/services/api/api.fixures.ts      | 6 +++---
 web/projects/ui/src/app/services/api/mock-patch.ts       | 2 +-
 .../ui/src/app/services/patch-db/patch-db-source.ts      | 1 +
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/web/projects/ui/src/app/app.providers.ts b/web/projects/ui/src/app/app.providers.ts
index c6a8d756e..e93c323d0 100644
--- a/web/projects/ui/src/app/app.providers.ts
+++ b/web/projects/ui/src/app/app.providers.ts
@@ -64,7 +64,7 @@ export function appInitializer(
   return () => {
     storage.migrate036()
     auth.init()
-    localStorage.init() // @TODO pretty sure we can navigate before this step
+    localStorage.init()
     router.initialNavigation()
   }
 }
diff --git a/web/projects/ui/src/app/modals/generic-form/generic-form.page.ts b/web/projects/ui/src/app/modals/generic-form/generic-form.page.ts
index eb690a787..e74c65d47 100644
--- a/web/projects/ui/src/app/modals/generic-form/generic-form.page.ts
+++ b/web/projects/ui/src/app/modals/generic-form/generic-form.page.ts
@@ -54,7 +54,6 @@ export class GenericFormPage {
       return
     }
 
-    // @TODO make this more like generic input component dismissal
     const success = await handler(this.formGroup.value)
     if (success !== false) this.modalCtrl.dismiss()
   }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index a48ac8185..fc008a17a 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -44,12 +44,7 @@ export class AppActionsPage {
     status: T.Status,
     action: { key: string; value: T.ActionMetadata },
   ) {
-    if (
-      status &&
-      action.value.allowedStatuses.includes(
-        status.main.status, // @TODO
-      )
-    ) {
+    if (status && action.value.allowedStatuses.includes(status.main.status)) {
       if (!isEmptyObject(action.value.input || {})) {
         const modal = await this.modalCtrl.create({
           component: GenericFormPage,
@@ -91,7 +86,7 @@ export class AppActionsPage {
         await alert.present()
       }
     } else {
-      const statuses = [...action.value.allowedStatuses] // @TODO
+      const statuses = [...action.value.allowedStatuses]
       const last = statuses.pop()
       let statusesStr = statuses.join(', ')
       let error = ''
diff --git a/web/projects/ui/src/app/pages/init/init.service.ts b/web/projects/ui/src/app/pages/init/init.service.ts
index 3cca42a58..7102c9db5 100644
--- a/web/projects/ui/src/app/pages/init/init.service.ts
+++ b/web/projects/ui/src/app/pages/init/init.service.ts
@@ -58,6 +58,7 @@ export class InitService extends Observable<MappedProgress> {
       }
     }),
     catchError(e => {
+      // @TODO this toast is presenting when we navigate away from init page. It seems other websockets exhibit the same behavior, but we never noticed because the error were not being caught and presented in this manner
       this.errorService.present(e)
 
       return EMPTY
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 38ee4774b..acebdfdfb 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -714,7 +714,7 @@ export module Mock {
         value: 'https://guessagain.com',
       },
     },
-  } as any // @TODO why is this necessary?
+  }
 
   export const ConfigSpec: RR.GetPackageConfigRes['spec'] = {
     bitcoin: {
@@ -1419,7 +1419,7 @@ export module Mock {
         health: {},
       },
     },
-    actions: {}, // @TODO need mocks
+    actions: {},
     serviceInterfaces: {
       ui: {
         id: 'ui',
@@ -1618,7 +1618,7 @@ export module Mock {
         icon: 'assets/img/service-icons/btc-rpc-proxy.png',
         kind: 'exists',
         registryUrl: 'https://community-registry.start9.com',
-        versionSpec: '>2.0.0', // @TODO
+        versionSpec: '>2.0.0',
         configSatisfied: false,
       },
     },
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index ee96f9fe2..755799522 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -127,7 +127,7 @@ export const mockPatchData: DataModel = {
           },
         },
       },
-      actions: {}, // @TODO
+      actions: {},
       serviceInterfaces: {
         ui: {
           id: 'ui',
diff --git a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
index 803fbce2c..0b80370d0 100644
--- a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
+++ b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
@@ -41,6 +41,7 @@ export class PatchDbSource extends Observable<Update<DataModel>[]> {
     catchError((_, original$) => {
       this.state.retrigger()
 
+      // @TODO this is returning right away, but we need to wait until state emits again from the retrigger() above.
       return this.state.pipe(
         filter(current => current === 'running'),
         take(1),

From 2c255b6dfefb31e9ef9187cf8f54b8240a176049 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:00:31 -0600
Subject: [PATCH 173/341] chore: Do some type cleanups (#2650)

chore: fix the WithProcedureId
---
 .../src/service/service_effect_handler.rs     | 124 ++++++++----------
 sdk/lib/mainFn/Daemons.ts                     |   6 +-
 sdk/lib/osBindings/ExecuteAction.ts           |   2 +
 sdk/lib/osBindings/ProcedureId.ts             |   4 +
 sdk/lib/osBindings/SetDependenciesParams.ts   |   2 +
 sdk/lib/osBindings/SetMainStatusStatus.ts     |   2 +-
 sdk/lib/osBindings/index.ts                   |   1 +
 7 files changed, 69 insertions(+), 72 deletions(-)
 create mode 100644 sdk/lib/osBindings/ProcedureId.ts

diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index bcd6da7d1..a61a00b9b 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -64,56 +64,6 @@ impl EffectContext {
     }
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct WithProcedureId<T> {
-    #[serde(default)]
-    procedure_id: Guid,
-    #[serde(flatten)]
-    rest: T,
-}
-impl<T: FromArgMatches> FromArgMatches for WithProcedureId<T> {
-    fn from_arg_matches(matches: &clap::ArgMatches) -> Result<Self, clap::Error> {
-        let rest = T::from_arg_matches(matches)?;
-        Ok(Self {
-            procedure_id: matches.get_one("procedure-id").cloned().unwrap_or_default(),
-            rest,
-        })
-    }
-    fn from_arg_matches_mut(matches: &mut clap::ArgMatches) -> Result<Self, clap::Error> {
-        let rest = T::from_arg_matches_mut(matches)?;
-        Ok(Self {
-            procedure_id: matches.get_one("procedure-id").cloned().unwrap_or_default(),
-            rest,
-        })
-    }
-    fn update_from_arg_matches(&mut self, matches: &clap::ArgMatches) -> Result<(), clap::Error> {
-        self.rest.update_from_arg_matches(matches)?;
-        self.procedure_id = matches.get_one("procedure-id").cloned().unwrap_or_default();
-        Ok(())
-    }
-    fn update_from_arg_matches_mut(
-        &mut self,
-        matches: &mut clap::ArgMatches,
-    ) -> Result<(), clap::Error> {
-        self.rest.update_from_arg_matches_mut(matches)?;
-        self.procedure_id = matches.get_one("procedure-id").cloned().unwrap_or_default();
-        Ok(())
-    }
-}
-impl<T: CommandFactory> CommandFactory for WithProcedureId<T> {
-    fn command() -> clap::Command {
-        T::command_for_update().arg(
-            clap::Arg::new("procedure-id")
-                .action(clap::ArgAction::Set)
-                .value_parser(clap::value_parser!(Guid)),
-        )
-    }
-    fn command_for_update() -> clap::Command {
-        Self::command()
-    }
-}
-
 pub fn service_effect_handler<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand("gitInfo", from_fn(|_: C| crate::version::git_info()))
@@ -877,6 +827,8 @@ async fn exists(context: EffectContext, params: ParamsPackageId) -> Result<Value
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct ExecuteAction {
+    #[serde(default)]
+    procedure_id: Guid,
     #[ts(type = "string | null")]
     service_id: Option<PackageId>,
     #[ts(type = "string")]
@@ -886,15 +838,12 @@ struct ExecuteAction {
 }
 async fn execute_action(
     context: EffectContext,
-    WithProcedureId {
+    ExecuteAction {
         procedure_id,
-        rest:
-            ExecuteAction {
-                service_id,
-                action_id,
-                input,
-            },
-    }: WithProcedureId<ExecuteAction>,
+        service_id,
+        action_id,
+        input,
+    }: ExecuteAction,
 ) -> Result<Value, Error> {
     let context = context.deref()?;
     let package_id = service_id
@@ -950,9 +899,53 @@ async fn running(context: EffectContext, params: ParamsPackageId) -> Result<Valu
     Ok(json!(matches!(package, MainStatus::Running { .. })))
 }
 
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+struct ProcedureId {
+    #[serde(default)]
+    procedure_id: Guid,
+}
+
+impl FromArgMatches for ProcedureId {
+    fn from_arg_matches(matches: &clap::ArgMatches) -> Result<Self, clap::Error> {
+        Ok(Self {
+            procedure_id: matches.get_one("procedure-id").cloned().unwrap_or_default(),
+        })
+    }
+    fn from_arg_matches_mut(matches: &mut clap::ArgMatches) -> Result<Self, clap::Error> {
+        Ok(Self {
+            procedure_id: matches.get_one("procedure-id").cloned().unwrap_or_default(),
+        })
+    }
+    fn update_from_arg_matches(&mut self, matches: &clap::ArgMatches) -> Result<(), clap::Error> {
+        self.procedure_id = matches.get_one("procedure-id").cloned().unwrap_or_default();
+        Ok(())
+    }
+    fn update_from_arg_matches_mut(
+        &mut self,
+        matches: &mut clap::ArgMatches,
+    ) -> Result<(), clap::Error> {
+        self.procedure_id = matches.get_one("procedure-id").cloned().unwrap_or_default();
+        Ok(())
+    }
+}
+impl CommandFactory for ProcedureId {
+    fn command() -> clap::Command {
+        Self::command_for_update().arg(
+            clap::Arg::new("procedure-id")
+                .action(clap::ArgAction::Set)
+                .value_parser(clap::value_parser!(Guid)),
+        )
+    }
+    fn command_for_update() -> clap::Command {
+        Self::command()
+    }
+}
+
 async fn restart(
     context: EffectContext,
-    WithProcedureId { procedure_id, .. }: WithProcedureId<Empty>,
+    ProcedureId { procedure_id }: ProcedureId,
 ) -> Result<(), Error> {
     let context = context.deref()?;
     context.restart(procedure_id).await?;
@@ -961,7 +954,7 @@ async fn restart(
 
 async fn shutdown(
     context: EffectContext,
-    WithProcedureId { procedure_id, .. }: WithProcedureId<Empty>,
+    ProcedureId { procedure_id }: ProcedureId,
 ) -> Result<(), Error> {
     let context = context.deref()?;
     context.stop(procedure_id).await?;
@@ -1001,7 +994,6 @@ async fn set_configured(context: EffectContext, params: SetConfigured) -> Result
 enum SetMainStatusStatus {
     Running,
     Stopped,
-    Starting,
 }
 impl FromStr for SetMainStatusStatus {
     type Err = color_eyre::eyre::Report;
@@ -1009,7 +1001,6 @@ impl FromStr for SetMainStatusStatus {
         match s {
             "running" => Ok(Self::Running),
             "stopped" => Ok(Self::Stopped),
-            "starting" => Ok(Self::Starting),
             _ => Err(eyre!("unknown status {s}")),
         }
     }
@@ -1033,7 +1024,6 @@ async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Resul
     match params.status {
         SetMainStatusStatus::Running => context.seed.started(),
         SetMainStatusStatus::Stopped => context.seed.stopped(),
-        SetMainStatusStatus::Starting => context.seed.started(),
     }
     Ok(Value::Null)
 }
@@ -1262,15 +1252,17 @@ impl ValueParserFactory for DependencyRequirement {
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 struct SetDependenciesParams {
+    #[serde(default)]
+    procedure_id: Guid,
     dependencies: Vec<DependencyRequirement>,
 }
 
 async fn set_dependencies(
     context: EffectContext,
-    WithProcedureId {
+    SetDependenciesParams {
         procedure_id,
-        rest: SetDependenciesParams { dependencies },
-    }: WithProcedureId<SetDependenciesParams>,
+        dependencies,
+    }: SetDependenciesParams,
 ) -> Result<(), Error> {
     let context = context.deref()?;
     let id = &context.seed.id;
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index f48dd51c0..059d148ab 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -168,10 +168,6 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
   }
 
   private updateMainHealth() {
-    if (this.healthDaemons.every((x) => x.health.status === "success")) {
-      this.effects.setMainStatus({ status: "running" })
-    } else {
-      this.effects.setMainStatus({ status: "starting" })
-    }
+    this.effects.setMainStatus({ status: "running" })
   }
 }
diff --git a/sdk/lib/osBindings/ExecuteAction.ts b/sdk/lib/osBindings/ExecuteAction.ts
index abd8c151f..b4eb60949 100644
--- a/sdk/lib/osBindings/ExecuteAction.ts
+++ b/sdk/lib/osBindings/ExecuteAction.ts
@@ -1,6 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Guid } from "./Guid"
 
 export type ExecuteAction = {
+  procedureId: Guid
   serviceId: string | null
   actionId: string
   input: any
diff --git a/sdk/lib/osBindings/ProcedureId.ts b/sdk/lib/osBindings/ProcedureId.ts
new file mode 100644
index 000000000..4d9a0debd
--- /dev/null
+++ b/sdk/lib/osBindings/ProcedureId.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Guid } from "./Guid"
+
+export type ProcedureId = { procedureId: Guid }
diff --git a/sdk/lib/osBindings/SetDependenciesParams.ts b/sdk/lib/osBindings/SetDependenciesParams.ts
index 7b34b50c9..bbc9b325f 100644
--- a/sdk/lib/osBindings/SetDependenciesParams.ts
+++ b/sdk/lib/osBindings/SetDependenciesParams.ts
@@ -1,6 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DependencyRequirement } from "./DependencyRequirement"
+import type { Guid } from "./Guid"
 
 export type SetDependenciesParams = {
+  procedureId: Guid
   dependencies: Array<DependencyRequirement>
 }
diff --git a/sdk/lib/osBindings/SetMainStatusStatus.ts b/sdk/lib/osBindings/SetMainStatusStatus.ts
index 6db32e7bf..03bb4a119 100644
--- a/sdk/lib/osBindings/SetMainStatusStatus.ts
+++ b/sdk/lib/osBindings/SetMainStatusStatus.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type SetMainStatusStatus = "running" | "stopped" | "starting"
+export type SetMainStatusStatus = "running" | "stopped"
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index ac2e19e45..22b03a7ca 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -108,6 +108,7 @@ export { PackageVersionInfo } from "./PackageVersionInfo"
 export { ParamsMaybePackageId } from "./ParamsMaybePackageId"
 export { ParamsPackageId } from "./ParamsPackageId"
 export { PasswordType } from "./PasswordType"
+export { ProcedureId } from "./ProcedureId"
 export { Progress } from "./Progress"
 export { Public } from "./Public"
 export { RecoverySource } from "./RecoverySource"

From 00f7fa507b1560393366eb6d29867ad855efcd9c Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 24 Jun 2024 16:15:32 -0600
Subject: [PATCH 174/341] remove analyticsd, clean up script

---
 core/build-analyticsd.sh                      |  42 ------
 ...00f2b22433c86617a0dbf796bf2170186dd2e.json |  16 ---
 ...ea745ffa5da4479478c1fd2158a45324b1930.json |  14 --
 ...36e463c20c841a7d6a0eb15be0f24f4a928ec.json |  40 ------
 ...b8c606ca400e43e31b9a05d2937217e0f6962.json |  15 ---
 ...ef6cb0f1e9a4e158260700f1639dd4b438997.json |  34 -----
 ...4f925f61dc5ea371903e62cdffa5d7b67ca96.json |  50 --------
 ...c3afb81c2be5c681cfa8b4be0ce70610e9c3a.json |  14 --
 ...a83dbc6afd07cae69d246987f62cf0cc35c2a.json |  20 ---
 ...bd8361776290a9411d527eaf1fdb40bef399d.json |  23 ----
 ...9c1550a41ee580dad3f49d35cb843ebef10ca.json |  14 --
 ...5b987c5af5807151ff71a59000014586752e0.json |  24 ----
 ...d514a66c421a11ab04c26d89a7aa8f6b67210.json |  65 ----------
 ...b98a73045adf618696cd838d79203ef5383fb.json |  19 ---
 ...9f96a8bdb0fc97ee8a3c6df1069e1e2b98576.json |  14 --
 ...e3526b70bccf3e407327917294a993bc17ed5.json |  16 ---
 ...bbf6bea226d38efaf6559923c79a36d5ca08c.json |  64 ---------
 ...5ab58252362694cf0f56999bf60194d20583a.json |  44 -------
 ...337527233c84eee758ac9be967906e5841d27.json |  14 --
 ...9424e6b5a1d1402e028219e21726f1ebd282e.json |  32 -----
 ...c4393a9a8fde2833cf096af766a979d94dee6.json |  18 ---
 ...9bd10d5717b2a0ddecf22330b7d531aac7c5d.json |  14 --
 ...090d45cfa4c85168a587b1a41dc5393cccea1.json |  12 --
 ...429d4c9b2cf534e76f35c80a2bf60e8599cca.json |  20 ---
 ...21ea72db8cfb362e7181c8226d9297507c62b.json |  19 ---
 ...4351ba0cae3825988b3e0ecd3b6781bcff524.json |  15 ---
 ...9e34aeaef1154dcd3d6811ab504915497ccf7.json |  14 --
 ...f3ff3f9aed7f90027a9ba97634bcb47d772f0.json |  20 ---
 ...799bd4f82e761837b526a0972c3d4439a264d.json |  16 ---
 ...b81803f1e9ec9e8ebbf15cafddfc1c5a028ed.json |  40 ------
 ...139c7b7569602adb58f2d6b3a94da4f167b0a.json |  14 --
 ...4ac6a5f34dd820c4073b7728c7067aab9fded.json |  25 ----
 ...67b9deb46da75788c7fe6082b43821c22d556.json |  16 ---
 ...cc96547f3f6dbec11bf2eadfaf53ad8ab51b5.json |  20 ---
 ...ad285680ce157aae9d7837ac020c8b2945e7f.json |  62 ---------
 core/startos/Cargo.toml                       |   5 -
 core/startos/src/analytics/context.rs         | 121 ------------------
 core/startos/src/analytics/mod.rs             |  78 -----------
 core/startos/src/bins/analyticsd.rs           |  86 -------------
 core/startos/src/bins/mod.rs                  |   4 -
 core/startos/src/context/config.rs            |   3 -
 core/startos/src/context/rpc.rs               |   2 -
 core/startos/src/lib.rs                       |   1 -
 core/startos/src/os_install/mod.rs            |   4 -
 .../db => metrics-db}/registry-sqlx-data.sh   |  10 +-
 .../db => metrics-db}/registry_schema.sql     |   0
 patch-db                                      |   2 +-
 sdk/lib/osBindings/GetVersionParams.ts        |   7 +-
 48 files changed, 11 insertions(+), 1211 deletions(-)
 delete mode 100755 core/build-analyticsd.sh
 delete mode 100644 core/startos/.sqlx/query-1ce5254f27de971fd87f5ab66d300f2b22433c86617a0dbf796bf2170186dd2e.json
 delete mode 100644 core/startos/.sqlx/query-21471490cdc3adb206274cc68e1ea745ffa5da4479478c1fd2158a45324b1930.json
 delete mode 100644 core/startos/.sqlx/query-28ea34bbde836e0618c5fc9bb7c36e463c20c841a7d6a0eb15be0f24f4a928ec.json
 delete mode 100644 core/startos/.sqlx/query-350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962.json
 delete mode 100644 core/startos/.sqlx/query-4099028a5c0de578255bf54a67cef6cb0f1e9a4e158260700f1639dd4b438997.json
 delete mode 100644 core/startos/.sqlx/query-4691e3a2ce80b59009ac17124f54f925f61dc5ea371903e62cdffa5d7b67ca96.json
 delete mode 100644 core/startos/.sqlx/query-4bcfbefb1eb3181343871a1cd7fc3afb81c2be5c681cfa8b4be0ce70610e9c3a.json
 delete mode 100644 core/startos/.sqlx/query-629be61c3c341c131ddbbff0293a83dbc6afd07cae69d246987f62cf0cc35c2a.json
 delete mode 100644 core/startos/.sqlx/query-687688055e63d27123cdc89a5bbbd8361776290a9411d527eaf1fdb40bef399d.json
 delete mode 100644 core/startos/.sqlx/query-6d35ccf780fb2bb62586dd1d3df9c1550a41ee580dad3f49d35cb843ebef10ca.json
 delete mode 100644 core/startos/.sqlx/query-770c1017734720453dc87b58c385b987c5af5807151ff71a59000014586752e0.json
 delete mode 100644 core/startos/.sqlx/query-7b64f032d507e8ffe37c41f4c7ad514a66c421a11ab04c26d89a7aa8f6b67210.json
 delete mode 100644 core/startos/.sqlx/query-7c7a3549c997eb75bf964ea65fbb98a73045adf618696cd838d79203ef5383fb.json
 delete mode 100644 core/startos/.sqlx/query-7e0649d839927e57fa03ee51a2c9f96a8bdb0fc97ee8a3c6df1069e1e2b98576.json
 delete mode 100644 core/startos/.sqlx/query-8951b9126fbf60dbb5997241e11e3526b70bccf3e407327917294a993bc17ed5.json
 delete mode 100644 core/startos/.sqlx/query-94d471bb374b4965c6cbedf8c17bbf6bea226d38efaf6559923c79a36d5ca08c.json
 delete mode 100644 core/startos/.sqlx/query-95c4ab4c645f3302568c6ff13d85ab58252362694cf0f56999bf60194d20583a.json
 delete mode 100644 core/startos/.sqlx/query-a60d6e66719325b08dc4ecfacaf337527233c84eee758ac9be967906e5841d27.json
 delete mode 100644 core/startos/.sqlx/query-a6b0c8909a3a5d6d9156aebfb359424e6b5a1d1402e028219e21726f1ebd282e.json
 delete mode 100644 core/startos/.sqlx/query-b1147beaaabbed89f2ab8c1e13ec4393a9a8fde2833cf096af766a979d94dee6.json
 delete mode 100644 core/startos/.sqlx/query-b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d.json
 delete mode 100644 core/startos/.sqlx/query-b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1.json
 delete mode 100644 core/startos/.sqlx/query-d5117054072476377f3c4f040ea429d4c9b2cf534e76f35c80a2bf60e8599cca.json
 delete mode 100644 core/startos/.sqlx/query-da71f94b29798d1738d2b10b9a721ea72db8cfb362e7181c8226d9297507c62b.json
 delete mode 100644 core/startos/.sqlx/query-dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524.json
 delete mode 100644 core/startos/.sqlx/query-e185203cf84e43b801dfb23b4159e34aeaef1154dcd3d6811ab504915497ccf7.json
 delete mode 100644 core/startos/.sqlx/query-e545696735f202f9d13cf22a561f3ff3f9aed7f90027a9ba97634bcb47d772f0.json
 delete mode 100644 core/startos/.sqlx/query-e5843c5b0e7819b29aa1abf2266799bd4f82e761837b526a0972c3d4439a264d.json
 delete mode 100644 core/startos/.sqlx/query-e95322a8e2ae3b93f1e974b24c0b81803f1e9ec9e8ebbf15cafddfc1c5a028ed.json
 delete mode 100644 core/startos/.sqlx/query-eb750adaa305bdbf3c5b70aaf59139c7b7569602adb58f2d6b3a94da4f167b0a.json
 delete mode 100644 core/startos/.sqlx/query-ecc765d8205c0876956f95f76944ac6a5f34dd820c4073b7728c7067aab9fded.json
 delete mode 100644 core/startos/.sqlx/query-f6d1c5ef0f9d9577bea8382318967b9deb46da75788c7fe6082b43821c22d556.json
 delete mode 100644 core/startos/.sqlx/query-f7d2dae84613bcef330f7403352cc96547f3f6dbec11bf2eadfaf53ad8ab51b5.json
 delete mode 100644 core/startos/.sqlx/query-fe6e4f09f3028e5b6b6259e86cbad285680ce157aae9d7837ac020c8b2945e7f.json
 delete mode 100644 core/startos/src/analytics/context.rs
 delete mode 100644 core/startos/src/analytics/mod.rs
 delete mode 100644 core/startos/src/bins/analyticsd.rs
 rename core/startos/src/registry/{os/version/db => metrics-db}/registry-sqlx-data.sh (65%)
 rename core/startos/src/registry/{os/version/db => metrics-db}/registry_schema.sql (100%)

diff --git a/core/build-analyticsd.sh b/core/build-analyticsd.sh
deleted file mode 100755
index 4f8578da1..000000000
--- a/core/build-analyticsd.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-set -e
-shopt -s expand_aliases
-
-if [ -z "$ARCH" ]; then
-	ARCH=$(uname -m)
-fi
-
-USE_TTY=
-if tty -s; then
-	USE_TTY="-it"
-fi
-
-cd ..
-FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
-RUSTFLAGS=""
-
-if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
-	RUSTFLAGS="--cfg tokio_unstable"
-fi
-
-alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
-
-set +e
-fail=
-echo "FEATURES=\"$FEATURES\""
-echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features analyticsd,$FEATURES --locked --bin analyticsd --target=$ARCH-unknown-linux-musl)"; then 
-	fail=true
-fi
-set -e
-cd core
-
-sudo chown -R $USER target
-sudo chown -R $USER ~/.cargo
-
-if [ -n "$fail" ]; then
-	exit 1
-fi
diff --git a/core/startos/.sqlx/query-1ce5254f27de971fd87f5ab66d300f2b22433c86617a0dbf796bf2170186dd2e.json b/core/startos/.sqlx/query-1ce5254f27de971fd87f5ab66d300f2b22433c86617a0dbf796bf2170186dd2e.json
deleted file mode 100644
index d36100fef..000000000
--- a/core/startos/.sqlx/query-1ce5254f27de971fd87f5ab66d300f2b22433c86617a0dbf796bf2170186dd2e.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO network_keys (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO NOTHING",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Bytea"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "1ce5254f27de971fd87f5ab66d300f2b22433c86617a0dbf796bf2170186dd2e"
-}
diff --git a/core/startos/.sqlx/query-21471490cdc3adb206274cc68e1ea745ffa5da4479478c1fd2158a45324b1930.json b/core/startos/.sqlx/query-21471490cdc3adb206274cc68e1ea745ffa5da4479478c1fd2158a45324b1930.json
deleted file mode 100644
index e0b1d7cf2..000000000
--- a/core/startos/.sqlx/query-21471490cdc3adb206274cc68e1ea745ffa5da4479478c1fd2158a45324b1930.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM ssh_keys WHERE fingerprint = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "21471490cdc3adb206274cc68e1ea745ffa5da4479478c1fd2158a45324b1930"
-}
diff --git a/core/startos/.sqlx/query-28ea34bbde836e0618c5fc9bb7c36e463c20c841a7d6a0eb15be0f24f4a928ec.json b/core/startos/.sqlx/query-28ea34bbde836e0618c5fc9bb7c36e463c20c841a7d6a0eb15be0f24f4a928ec.json
deleted file mode 100644
index e234a72a9..000000000
--- a/core/startos/.sqlx/query-28ea34bbde836e0618c5fc9bb7c36e463c20c841a7d6a0eb15be0f24f4a928ec.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT hostname, path, username, password FROM cifs_shares WHERE id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "hostname",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 1,
-        "name": "path",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "username",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 3,
-        "name": "password",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "28ea34bbde836e0618c5fc9bb7c36e463c20c841a7d6a0eb15be0f24f4a928ec"
-}
diff --git a/core/startos/.sqlx/query-350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962.json b/core/startos/.sqlx/query-350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962.json
deleted file mode 100644
index c451ce9f3..000000000
--- a/core/startos/.sqlx/query-350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM tor WHERE package = $1 AND interface = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962"
-}
diff --git a/core/startos/.sqlx/query-4099028a5c0de578255bf54a67cef6cb0f1e9a4e158260700f1639dd4b438997.json b/core/startos/.sqlx/query-4099028a5c0de578255bf54a67cef6cb0f1e9a4e158260700f1639dd4b438997.json
deleted file mode 100644
index 761af064b..000000000
--- a/core/startos/.sqlx/query-4099028a5c0de578255bf54a67cef6cb0f1e9a4e158260700f1639dd4b438997.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT * FROM ssh_keys WHERE fingerprint = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "fingerprint",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 1,
-        "name": "openssh_pubkey",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "created_at",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "4099028a5c0de578255bf54a67cef6cb0f1e9a4e158260700f1639dd4b438997"
-}
diff --git a/core/startos/.sqlx/query-4691e3a2ce80b59009ac17124f54f925f61dc5ea371903e62cdffa5d7b67ca96.json b/core/startos/.sqlx/query-4691e3a2ce80b59009ac17124f54f925f61dc5ea371903e62cdffa5d7b67ca96.json
deleted file mode 100644
index 1f7edd1ce..000000000
--- a/core/startos/.sqlx/query-4691e3a2ce80b59009ac17124f54f925f61dc5ea371903e62cdffa5d7b67ca96.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT * FROM session WHERE logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 1,
-        "name": "logged_in",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 2,
-        "name": "logged_out",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 3,
-        "name": "last_active",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 4,
-        "name": "user_agent",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 5,
-        "name": "metadata",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      true,
-      false,
-      true,
-      false
-    ]
-  },
-  "hash": "4691e3a2ce80b59009ac17124f54f925f61dc5ea371903e62cdffa5d7b67ca96"
-}
diff --git a/core/startos/.sqlx/query-4bcfbefb1eb3181343871a1cd7fc3afb81c2be5c681cfa8b4be0ce70610e9c3a.json b/core/startos/.sqlx/query-4bcfbefb1eb3181343871a1cd7fc3afb81c2be5c681cfa8b4be0ce70610e9c3a.json
deleted file mode 100644
index 2157198e5..000000000
--- a/core/startos/.sqlx/query-4bcfbefb1eb3181343871a1cd7fc3afb81c2be5c681cfa8b4be0ce70610e9c3a.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE session SET logged_out = CURRENT_TIMESTAMP WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "4bcfbefb1eb3181343871a1cd7fc3afb81c2be5c681cfa8b4be0ce70610e9c3a"
-}
diff --git a/core/startos/.sqlx/query-629be61c3c341c131ddbbff0293a83dbc6afd07cae69d246987f62cf0cc35c2a.json b/core/startos/.sqlx/query-629be61c3c341c131ddbbff0293a83dbc6afd07cae69d246987f62cf0cc35c2a.json
deleted file mode 100644
index 764cff84a..000000000
--- a/core/startos/.sqlx/query-629be61c3c341c131ddbbff0293a83dbc6afd07cae69d246987f62cf0cc35c2a.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT password FROM account",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "password",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "629be61c3c341c131ddbbff0293a83dbc6afd07cae69d246987f62cf0cc35c2a"
-}
diff --git a/core/startos/.sqlx/query-687688055e63d27123cdc89a5bbbd8361776290a9411d527eaf1fdb40bef399d.json b/core/startos/.sqlx/query-687688055e63d27123cdc89a5bbbd8361776290a9411d527eaf1fdb40bef399d.json
deleted file mode 100644
index 2e8a9ee0e..000000000
--- a/core/startos/.sqlx/query-687688055e63d27123cdc89a5bbbd8361776290a9411d527eaf1fdb40bef399d.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT key FROM tor WHERE package = $1 AND interface = $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "key",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "687688055e63d27123cdc89a5bbbd8361776290a9411d527eaf1fdb40bef399d"
-}
diff --git a/core/startos/.sqlx/query-6d35ccf780fb2bb62586dd1d3df9c1550a41ee580dad3f49d35cb843ebef10ca.json b/core/startos/.sqlx/query-6d35ccf780fb2bb62586dd1d3df9c1550a41ee580dad3f49d35cb843ebef10ca.json
deleted file mode 100644
index 3f859bd10..000000000
--- a/core/startos/.sqlx/query-6d35ccf780fb2bb62586dd1d3df9c1550a41ee580dad3f49d35cb843ebef10ca.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE session SET last_active = CURRENT_TIMESTAMP WHERE id = $1 AND logged_out IS NULL OR logged_out > CURRENT_TIMESTAMP",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "6d35ccf780fb2bb62586dd1d3df9c1550a41ee580dad3f49d35cb843ebef10ca"
-}
diff --git a/core/startos/.sqlx/query-770c1017734720453dc87b58c385b987c5af5807151ff71a59000014586752e0.json b/core/startos/.sqlx/query-770c1017734720453dc87b58c385b987c5af5807151ff71a59000014586752e0.json
deleted file mode 100644
index cf3591e01..000000000
--- a/core/startos/.sqlx/query-770c1017734720453dc87b58c385b987c5af5807151ff71a59000014586752e0.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO network_keys (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO UPDATE SET package = EXCLUDED.package RETURNING key",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "key",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Bytea"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "770c1017734720453dc87b58c385b987c5af5807151ff71a59000014586752e0"
-}
diff --git a/core/startos/.sqlx/query-7b64f032d507e8ffe37c41f4c7ad514a66c421a11ab04c26d89a7aa8f6b67210.json b/core/startos/.sqlx/query-7b64f032d507e8ffe37c41f4c7ad514a66c421a11ab04c26d89a7aa8f6b67210.json
deleted file mode 100644
index 53fc6f066..000000000
--- a/core/startos/.sqlx/query-7b64f032d507e8ffe37c41f4c7ad514a66c421a11ab04c26d89a7aa8f6b67210.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT id, package_id, created_at, code, level, title, message, data FROM notifications WHERE id < $1 ORDER BY id DESC LIMIT $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "package_id",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "created_at",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 3,
-        "name": "code",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 4,
-        "name": "level",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 5,
-        "name": "title",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 6,
-        "name": "message",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 7,
-        "name": "data",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      true,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "7b64f032d507e8ffe37c41f4c7ad514a66c421a11ab04c26d89a7aa8f6b67210"
-}
diff --git a/core/startos/.sqlx/query-7c7a3549c997eb75bf964ea65fbb98a73045adf618696cd838d79203ef5383fb.json b/core/startos/.sqlx/query-7c7a3549c997eb75bf964ea65fbb98a73045adf618696cd838d79203ef5383fb.json
deleted file mode 100644
index 245a838d8..000000000
--- a/core/startos/.sqlx/query-7c7a3549c997eb75bf964ea65fbb98a73045adf618696cd838d79203ef5383fb.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO account (\n                id,\n                server_id,\n                hostname,\n                password,\n                network_key,\n                root_ca_key_pem,\n                root_ca_cert_pem\n            ) VALUES (\n                0, $1, $2, $3, $4, $5, $6\n            ) ON CONFLICT (id) DO UPDATE SET\n                server_id = EXCLUDED.server_id,\n                hostname = EXCLUDED.hostname,\n                password = EXCLUDED.password,\n                network_key = EXCLUDED.network_key,\n                root_ca_key_pem = EXCLUDED.root_ca_key_pem,\n                root_ca_cert_pem = EXCLUDED.root_ca_cert_pem\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text",
-        "Bytea",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "7c7a3549c997eb75bf964ea65fbb98a73045adf618696cd838d79203ef5383fb"
-}
diff --git a/core/startos/.sqlx/query-7e0649d839927e57fa03ee51a2c9f96a8bdb0fc97ee8a3c6df1069e1e2b98576.json b/core/startos/.sqlx/query-7e0649d839927e57fa03ee51a2c9f96a8bdb0fc97ee8a3c6df1069e1e2b98576.json
deleted file mode 100644
index e3ce7957d..000000000
--- a/core/startos/.sqlx/query-7e0649d839927e57fa03ee51a2c9f96a8bdb0fc97ee8a3c6df1069e1e2b98576.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM tor WHERE package = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "7e0649d839927e57fa03ee51a2c9f96a8bdb0fc97ee8a3c6df1069e1e2b98576"
-}
diff --git a/core/startos/.sqlx/query-8951b9126fbf60dbb5997241e11e3526b70bccf3e407327917294a993bc17ed5.json b/core/startos/.sqlx/query-8951b9126fbf60dbb5997241e11e3526b70bccf3e407327917294a993bc17ed5.json
deleted file mode 100644
index e39aebf69..000000000
--- a/core/startos/.sqlx/query-8951b9126fbf60dbb5997241e11e3526b70bccf3e407327917294a993bc17ed5.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO tor (package, interface, key) VALUES ($1, $2, $3) ON CONFLICT (package, interface) DO NOTHING",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Bytea"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "8951b9126fbf60dbb5997241e11e3526b70bccf3e407327917294a993bc17ed5"
-}
diff --git a/core/startos/.sqlx/query-94d471bb374b4965c6cbedf8c17bbf6bea226d38efaf6559923c79a36d5ca08c.json b/core/startos/.sqlx/query-94d471bb374b4965c6cbedf8c17bbf6bea226d38efaf6559923c79a36d5ca08c.json
deleted file mode 100644
index e7fe8d38c..000000000
--- a/core/startos/.sqlx/query-94d471bb374b4965c6cbedf8c17bbf6bea226d38efaf6559923c79a36d5ca08c.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT id, package_id, created_at, code, level, title, message, data FROM notifications ORDER BY id DESC LIMIT $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "package_id",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "created_at",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 3,
-        "name": "code",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 4,
-        "name": "level",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 5,
-        "name": "title",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 6,
-        "name": "message",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 7,
-        "name": "data",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      true,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "94d471bb374b4965c6cbedf8c17bbf6bea226d38efaf6559923c79a36d5ca08c"
-}
diff --git a/core/startos/.sqlx/query-95c4ab4c645f3302568c6ff13d85ab58252362694cf0f56999bf60194d20583a.json b/core/startos/.sqlx/query-95c4ab4c645f3302568c6ff13d85ab58252362694cf0f56999bf60194d20583a.json
deleted file mode 100644
index aadc0fc3a..000000000
--- a/core/startos/.sqlx/query-95c4ab4c645f3302568c6ff13d85ab58252362694cf0f56999bf60194d20583a.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT id, hostname, path, username, password FROM cifs_shares",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "hostname",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "path",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 3,
-        "name": "username",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 4,
-        "name": "password",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "95c4ab4c645f3302568c6ff13d85ab58252362694cf0f56999bf60194d20583a"
-}
diff --git a/core/startos/.sqlx/query-a60d6e66719325b08dc4ecfacaf337527233c84eee758ac9be967906e5841d27.json b/core/startos/.sqlx/query-a60d6e66719325b08dc4ecfacaf337527233c84eee758ac9be967906e5841d27.json
deleted file mode 100644
index c56a9ebd1..000000000
--- a/core/startos/.sqlx/query-a60d6e66719325b08dc4ecfacaf337527233c84eee758ac9be967906e5841d27.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM cifs_shares WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "a60d6e66719325b08dc4ecfacaf337527233c84eee758ac9be967906e5841d27"
-}
diff --git a/core/startos/.sqlx/query-a6b0c8909a3a5d6d9156aebfb359424e6b5a1d1402e028219e21726f1ebd282e.json b/core/startos/.sqlx/query-a6b0c8909a3a5d6d9156aebfb359424e6b5a1d1402e028219e21726f1ebd282e.json
deleted file mode 100644
index 86bd9250e..000000000
--- a/core/startos/.sqlx/query-a6b0c8909a3a5d6d9156aebfb359424e6b5a1d1402e028219e21726f1ebd282e.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT fingerprint, openssh_pubkey, created_at FROM ssh_keys",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "fingerprint",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 1,
-        "name": "openssh_pubkey",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "created_at",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "a6b0c8909a3a5d6d9156aebfb359424e6b5a1d1402e028219e21726f1ebd282e"
-}
diff --git a/core/startos/.sqlx/query-b1147beaaabbed89f2ab8c1e13ec4393a9a8fde2833cf096af766a979d94dee6.json b/core/startos/.sqlx/query-b1147beaaabbed89f2ab8c1e13ec4393a9a8fde2833cf096af766a979d94dee6.json
deleted file mode 100644
index c8ff84277..000000000
--- a/core/startos/.sqlx/query-b1147beaaabbed89f2ab8c1e13ec4393a9a8fde2833cf096af766a979d94dee6.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE cifs_shares SET hostname = $1, path = $2, username = $3, password = $4 WHERE id = $5",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text",
-        "Text",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "b1147beaaabbed89f2ab8c1e13ec4393a9a8fde2833cf096af766a979d94dee6"
-}
diff --git a/core/startos/.sqlx/query-b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d.json b/core/startos/.sqlx/query-b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d.json
deleted file mode 100644
index b76542db8..000000000
--- a/core/startos/.sqlx/query-b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM network_keys WHERE package = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d"
-}
diff --git a/core/startos/.sqlx/query-b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1.json b/core/startos/.sqlx/query-b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1.json
deleted file mode 100644
index e2e8a1620..000000000
--- a/core/startos/.sqlx/query-b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE account SET tor_key = NULL, network_key = gen_random_bytes(32)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": []
-  },
-  "hash": "b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1"
-}
diff --git a/core/startos/.sqlx/query-d5117054072476377f3c4f040ea429d4c9b2cf534e76f35c80a2bf60e8599cca.json b/core/startos/.sqlx/query-d5117054072476377f3c4f040ea429d4c9b2cf534e76f35c80a2bf60e8599cca.json
deleted file mode 100644
index b77ba7ce9..000000000
--- a/core/startos/.sqlx/query-d5117054072476377f3c4f040ea429d4c9b2cf534e76f35c80a2bf60e8599cca.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT openssh_pubkey FROM ssh_keys",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "openssh_pubkey",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "d5117054072476377f3c4f040ea429d4c9b2cf534e76f35c80a2bf60e8599cca"
-}
diff --git a/core/startos/.sqlx/query-da71f94b29798d1738d2b10b9a721ea72db8cfb362e7181c8226d9297507c62b.json b/core/startos/.sqlx/query-da71f94b29798d1738d2b10b9a721ea72db8cfb362e7181c8226d9297507c62b.json
deleted file mode 100644
index 5c5c89c27..000000000
--- a/core/startos/.sqlx/query-da71f94b29798d1738d2b10b9a721ea72db8cfb362e7181c8226d9297507c62b.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO notifications (package_id, code, level, title, message, data) VALUES ($1, $2, $3, $4, $5, $6)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int4",
-        "Text",
-        "Text",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "da71f94b29798d1738d2b10b9a721ea72db8cfb362e7181c8226d9297507c62b"
-}
diff --git a/core/startos/.sqlx/query-dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524.json b/core/startos/.sqlx/query-dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524.json
deleted file mode 100644
index 2fc8ad1ba..000000000
--- a/core/startos/.sqlx/query-dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM network_keys WHERE package = $1 AND interface = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524"
-}
diff --git a/core/startos/.sqlx/query-e185203cf84e43b801dfb23b4159e34aeaef1154dcd3d6811ab504915497ccf7.json b/core/startos/.sqlx/query-e185203cf84e43b801dfb23b4159e34aeaef1154dcd3d6811ab504915497ccf7.json
deleted file mode 100644
index a4dc187cd..000000000
--- a/core/startos/.sqlx/query-e185203cf84e43b801dfb23b4159e34aeaef1154dcd3d6811ab504915497ccf7.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM notifications WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "e185203cf84e43b801dfb23b4159e34aeaef1154dcd3d6811ab504915497ccf7"
-}
diff --git a/core/startos/.sqlx/query-e545696735f202f9d13cf22a561f3ff3f9aed7f90027a9ba97634bcb47d772f0.json b/core/startos/.sqlx/query-e545696735f202f9d13cf22a561f3ff3f9aed7f90027a9ba97634bcb47d772f0.json
deleted file mode 100644
index 97a4ec95a..000000000
--- a/core/startos/.sqlx/query-e545696735f202f9d13cf22a561f3ff3f9aed7f90027a9ba97634bcb47d772f0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT tor_key FROM account WHERE id = 0",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "tor_key",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "e545696735f202f9d13cf22a561f3ff3f9aed7f90027a9ba97634bcb47d772f0"
-}
diff --git a/core/startos/.sqlx/query-e5843c5b0e7819b29aa1abf2266799bd4f82e761837b526a0972c3d4439a264d.json b/core/startos/.sqlx/query-e5843c5b0e7819b29aa1abf2266799bd4f82e761837b526a0972c3d4439a264d.json
deleted file mode 100644
index b2aa04370..000000000
--- a/core/startos/.sqlx/query-e5843c5b0e7819b29aa1abf2266799bd4f82e761837b526a0972c3d4439a264d.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO session (id, user_agent, metadata) VALUES ($1, $2, $3)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "e5843c5b0e7819b29aa1abf2266799bd4f82e761837b526a0972c3d4439a264d"
-}
diff --git a/core/startos/.sqlx/query-e95322a8e2ae3b93f1e974b24c0b81803f1e9ec9e8ebbf15cafddfc1c5a028ed.json b/core/startos/.sqlx/query-e95322a8e2ae3b93f1e974b24c0b81803f1e9ec9e8ebbf15cafddfc1c5a028ed.json
deleted file mode 100644
index fd5a467ec..000000000
--- a/core/startos/.sqlx/query-e95322a8e2ae3b93f1e974b24c0b81803f1e9ec9e8ebbf15cafddfc1c5a028ed.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    network_keys.package,\n                    network_keys.interface,\n                    network_keys.key,\n                    tor.key AS \"tor_key?\"\n                FROM\n                    network_keys\n                LEFT JOIN\n                    tor\n                ON\n                    network_keys.package = tor.package\n                AND\n                    network_keys.interface = tor.interface\n                WHERE\n                    network_keys.package = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "package",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 1,
-        "name": "interface",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "key",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 3,
-        "name": "tor_key?",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "e95322a8e2ae3b93f1e974b24c0b81803f1e9ec9e8ebbf15cafddfc1c5a028ed"
-}
diff --git a/core/startos/.sqlx/query-eb750adaa305bdbf3c5b70aaf59139c7b7569602adb58f2d6b3a94da4f167b0a.json b/core/startos/.sqlx/query-eb750adaa305bdbf3c5b70aaf59139c7b7569602adb58f2d6b3a94da4f167b0a.json
deleted file mode 100644
index fb8a7c1e5..000000000
--- a/core/startos/.sqlx/query-eb750adaa305bdbf3c5b70aaf59139c7b7569602adb58f2d6b3a94da4f167b0a.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM notifications WHERE id < $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "eb750adaa305bdbf3c5b70aaf59139c7b7569602adb58f2d6b3a94da4f167b0a"
-}
diff --git a/core/startos/.sqlx/query-ecc765d8205c0876956f95f76944ac6a5f34dd820c4073b7728c7067aab9fded.json b/core/startos/.sqlx/query-ecc765d8205c0876956f95f76944ac6a5f34dd820c4073b7728c7067aab9fded.json
deleted file mode 100644
index 27c9752b2..000000000
--- a/core/startos/.sqlx/query-ecc765d8205c0876956f95f76944ac6a5f34dd820c4073b7728c7067aab9fded.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO cifs_shares (hostname, path, username, password) VALUES ($1, $2, $3, $4) RETURNING id",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "ecc765d8205c0876956f95f76944ac6a5f34dd820c4073b7728c7067aab9fded"
-}
diff --git a/core/startos/.sqlx/query-f6d1c5ef0f9d9577bea8382318967b9deb46da75788c7fe6082b43821c22d556.json b/core/startos/.sqlx/query-f6d1c5ef0f9d9577bea8382318967b9deb46da75788c7fe6082b43821c22d556.json
deleted file mode 100644
index 6ed9898f6..000000000
--- a/core/startos/.sqlx/query-f6d1c5ef0f9d9577bea8382318967b9deb46da75788c7fe6082b43821c22d556.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO ssh_keys (fingerprint, openssh_pubkey, created_at) VALUES ($1, $2, $3)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "f6d1c5ef0f9d9577bea8382318967b9deb46da75788c7fe6082b43821c22d556"
-}
diff --git a/core/startos/.sqlx/query-f7d2dae84613bcef330f7403352cc96547f3f6dbec11bf2eadfaf53ad8ab51b5.json b/core/startos/.sqlx/query-f7d2dae84613bcef330f7403352cc96547f3f6dbec11bf2eadfaf53ad8ab51b5.json
deleted file mode 100644
index f48ccb074..000000000
--- a/core/startos/.sqlx/query-f7d2dae84613bcef330f7403352cc96547f3f6dbec11bf2eadfaf53ad8ab51b5.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT network_key FROM account WHERE id = 0",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "network_key",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "f7d2dae84613bcef330f7403352cc96547f3f6dbec11bf2eadfaf53ad8ab51b5"
-}
diff --git a/core/startos/.sqlx/query-fe6e4f09f3028e5b6b6259e86cbad285680ce157aae9d7837ac020c8b2945e7f.json b/core/startos/.sqlx/query-fe6e4f09f3028e5b6b6259e86cbad285680ce157aae9d7837ac020c8b2945e7f.json
deleted file mode 100644
index 6ef1d5023..000000000
--- a/core/startos/.sqlx/query-fe6e4f09f3028e5b6b6259e86cbad285680ce157aae9d7837ac020c8b2945e7f.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT * FROM account WHERE id = 0",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "password",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "tor_key",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 3,
-        "name": "server_id",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 4,
-        "name": "hostname",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 5,
-        "name": "network_key",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 6,
-        "name": "root_ca_key_pem",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 7,
-        "name": "root_ca_cert_pem",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "fe6e4f09f3028e5b6b6259e86cbad285680ce157aae9d7837ac020c8b2945e7f"
-}
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index fa2bac69d..539f3de11 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -37,16 +37,11 @@ path = "src/main.rs"
 name = "registrybox"
 path = "src/main.rs"
 
-[[bin]]
-name = "analyticsd"
-path = "src/main.rs"
-
 [features]
 cli = []
 container-runtime = []
 daemon = []
 registry = []
-analyticsd = []
 default = ["cli", "daemon"]
 dev = []
 unstable = ["console-subscriber", "tokio/tracing"]
diff --git a/core/startos/src/analytics/context.rs b/core/startos/src/analytics/context.rs
deleted file mode 100644
index 8ece8479b..000000000
--- a/core/startos/src/analytics/context.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use std::net::{Ipv4Addr, SocketAddr};
-use std::ops::Deref;
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use clap::Parser;
-use reqwest::{Client, Proxy};
-use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::{call_remote_http, CallRemote, Context, Empty};
-use serde::{Deserialize, Serialize};
-use sqlx::PgPool;
-use tokio::sync::broadcast::Sender;
-use tracing::instrument;
-use url::Url;
-
-use crate::context::config::{ContextConfig, CONFIG_PATH};
-use crate::context::RpcContext;
-use crate::prelude::*;
-use crate::rpc_continuations::RpcContinuations;
-
-#[derive(Debug, Clone, Default, Deserialize, Serialize, Parser)]
-#[serde(rename_all = "kebab-case")]
-#[command(rename_all = "kebab-case")]
-pub struct AnalyticsConfig {
-    #[arg(short = 'c', long = "config")]
-    pub config: Option<PathBuf>,
-    #[arg(short = 'l', long = "listen")]
-    pub listen: Option<SocketAddr>,
-    #[arg(short = 'p', long = "proxy")]
-    pub tor_proxy: Option<Url>,
-    #[arg(short = 'd', long = "dbconnect")]
-    pub dbconnect: Option<Url>,
-}
-impl ContextConfig for AnalyticsConfig {
-    fn next(&mut self) -> Option<PathBuf> {
-        self.config.take()
-    }
-    fn merge_with(&mut self, other: Self) {
-        self.listen = self.listen.take().or(other.listen);
-        self.tor_proxy = self.tor_proxy.take().or(other.tor_proxy);
-        self.dbconnect = self.dbconnect.take().or(other.dbconnect);
-    }
-}
-
-impl AnalyticsConfig {
-    pub fn load(mut self) -> Result<Self, Error> {
-        let path = self.next();
-        self.load_path_rec(path)?;
-        self.load_path_rec(Some(CONFIG_PATH))?;
-        Ok(self)
-    }
-}
-
-pub struct AnalyticsContextSeed {
-    pub listen: SocketAddr,
-    pub db: PgPool,
-    pub rpc_continuations: RpcContinuations,
-    pub client: Client,
-    pub shutdown: Sender<()>,
-}
-
-#[derive(Clone)]
-pub struct AnalyticsContext(Arc<AnalyticsContextSeed>);
-impl AnalyticsContext {
-    #[instrument(skip_all)]
-    pub async fn init(config: &AnalyticsConfig) -> Result<Self, Error> {
-        let (shutdown, _) = tokio::sync::broadcast::channel(1);
-        let dbconnect = config
-            .dbconnect
-            .clone()
-            .unwrap_or_else(|| "postgres://localhost/analytics".parse().unwrap())
-            .to_owned();
-        let db = PgPool::connect(dbconnect.as_str()).await?;
-        let tor_proxy_url = config
-            .tor_proxy
-            .clone()
-            .map(Ok)
-            .unwrap_or_else(|| "socks5h://localhost:9050".parse())?;
-        Ok(Self(Arc::new(AnalyticsContextSeed {
-            listen: config
-                .listen
-                .unwrap_or(SocketAddr::new(Ipv4Addr::LOCALHOST.into(), 5959)),
-            db,
-            rpc_continuations: RpcContinuations::new(),
-            client: Client::builder()
-                .proxy(Proxy::custom(move |url| {
-                    if url.host_str().map_or(false, |h| h.ends_with(".onion")) {
-                        Some(tor_proxy_url.clone())
-                    } else {
-                        None
-                    }
-                }))
-                .build()
-                .with_kind(crate::ErrorKind::ParseUrl)?,
-            shutdown,
-        })))
-    }
-}
-impl AsRef<RpcContinuations> for AnalyticsContext {
-    fn as_ref(&self) -> &RpcContinuations {
-        &self.rpc_continuations
-    }
-}
-
-impl Context for AnalyticsContext {}
-impl Deref for AnalyticsContext {
-    type Target = AnalyticsContextSeed;
-    fn deref(&self) -> &Self::Target {
-        &*self.0
-    }
-}
-
-impl CallRemote<AnalyticsContext> for RpcContext {
-    async fn call_remote(&self, method: &str, params: Value, _: Empty) -> Result<Value, RpcError> {
-        if let Some(analytics_url) = self.analytics_url.clone() {
-            call_remote_http(&self.client, analytics_url, method, params).await
-        } else {
-            Ok(Value::Null)
-        }
-    }
-}
diff --git a/core/startos/src/analytics/mod.rs b/core/startos/src/analytics/mod.rs
deleted file mode 100644
index 7c84ff386..000000000
--- a/core/startos/src/analytics/mod.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use std::net::SocketAddr;
-
-use axum::Router;
-use futures::future::ready;
-use rpc_toolkit::{Context, ParentHandler, Server};
-
-use crate::analytics::context::AnalyticsContext;
-use crate::middleware::cors::Cors;
-use crate::net::static_server::{bad_request, not_found, server_error};
-use crate::net::web_server::WebServer;
-use crate::rpc_continuations::Guid;
-
-pub mod context;
-
-pub fn analytics_api<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new()
-}
-
-pub fn analytics_server_router(ctx: AnalyticsContext) -> Router {
-    use axum::extract as x;
-    use axum::routing::{any, get, post};
-    Router::new()
-        .route("/rpc/*path", {
-            let ctx = ctx.clone();
-            post(
-                Server::new(move || ready(Ok(ctx.clone())), analytics_api())
-                    .middleware(Cors::new())
-            )
-        })
-        .route(
-            "/ws/rpc/*path",
-            get({
-                let ctx = ctx.clone();
-                move |x::Path(path): x::Path<String>,
-                      ws: axum::extract::ws::WebSocketUpgrade| async move {
-                    match Guid::from(&path) {
-                        None => {
-                            tracing::debug!("No Guid Path");
-                            bad_request()
-                        }
-                        Some(guid) => match ctx.rpc_continuations.get_ws_handler(&guid).await {
-                            Some(cont) => ws.on_upgrade(cont),
-                            _ => not_found(),
-                        },
-                    }
-                }
-            }),
-        )
-        .route(
-            "/rest/rpc/*path",
-            any({
-                let ctx = ctx.clone();
-                move |request: x::Request| async move {
-                    let path = request
-                        .uri()
-                        .path()
-                        .strip_prefix("/rest/rpc/")
-                        .unwrap_or_default();
-                    match Guid::from(&path) {
-                        None => {
-                            tracing::debug!("No Guid Path");
-                            bad_request()
-                        }
-                        Some(guid) => match ctx.rpc_continuations.get_rest_handler(&guid).await {
-                            None => not_found(),
-                            Some(cont) => cont(request).await.unwrap_or_else(server_error),
-                        },
-                    }
-                }
-            }),
-        )
-}
-
-impl WebServer {
-    pub fn analytics(bind: SocketAddr, ctx: AnalyticsContext) -> Self {
-        Self::new(bind, analytics_server_router(ctx))
-    }
-}
diff --git a/core/startos/src/bins/analyticsd.rs b/core/startos/src/bins/analyticsd.rs
deleted file mode 100644
index e37a7dae1..000000000
--- a/core/startos/src/bins/analyticsd.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use std::ffi::OsString;
-
-use clap::Parser;
-use futures::FutureExt;
-use tokio::signal::unix::signal;
-use tracing::instrument;
-
-use crate::analytics::context::{AnalyticsConfig, AnalyticsContext};
-use crate::net::web_server::WebServer;
-use crate::prelude::*;
-use crate::util::logger::EmbassyLogger;
-
-#[instrument(skip_all)]
-async fn inner_main(config: &AnalyticsConfig) -> Result<(), Error> {
-    let server = async {
-        let ctx = AnalyticsContext::init(config).await?;
-        let server = WebServer::analytics(ctx.listen, ctx.clone());
-
-        let mut shutdown_recv = ctx.shutdown.subscribe();
-
-        let sig_handler_ctx = ctx;
-        let sig_handler = tokio::spawn(async move {
-            use tokio::signal::unix::SignalKind;
-            futures::future::select_all(
-                [
-                    SignalKind::interrupt(),
-                    SignalKind::quit(),
-                    SignalKind::terminate(),
-                ]
-                .iter()
-                .map(|s| {
-                    async move {
-                        signal(*s)
-                            .unwrap_or_else(|_| panic!("register {:?} handler", s))
-                            .recv()
-                            .await
-                    }
-                    .boxed()
-                }),
-            )
-            .await;
-            sig_handler_ctx
-                .shutdown
-                .send(())
-                .map_err(|_| ())
-                .expect("send shutdown signal");
-        });
-
-        shutdown_recv
-            .recv()
-            .await
-            .with_kind(crate::ErrorKind::Unknown)?;
-
-        sig_handler.abort();
-
-        Ok::<_, Error>(server)
-    }
-    .await?;
-    server.shutdown().await;
-
-    Ok(())
-}
-
-pub fn main(args: impl IntoIterator<Item = OsString>) {
-    EmbassyLogger::init();
-
-    let config = AnalyticsConfig::parse_from(args).load().unwrap();
-
-    let res = {
-        let rt = tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .build()
-            .expect("failed to initialize runtime");
-        rt.block_on(inner_main(&config))
-    };
-
-    match res {
-        Ok(()) => (),
-        Err(e) => {
-            eprintln!("{}", e.source);
-            tracing::debug!("{:?}", e.source);
-            drop(e.source);
-            std::process::exit(e.kind as i32)
-        }
-    }
-}
diff --git a/core/startos/src/bins/mod.rs b/core/startos/src/bins/mod.rs
index 70f87aa99..4a4670a5b 100644
--- a/core/startos/src/bins/mod.rs
+++ b/core/startos/src/bins/mod.rs
@@ -2,8 +2,6 @@ use std::collections::VecDeque;
 use std::ffi::OsString;
 use std::path::Path;
 
-#[cfg(feature = "analytics")]
-pub mod analytics;
 #[cfg(feature = "container-runtime")]
 pub mod container_cli;
 pub mod deprecated;
@@ -26,8 +24,6 @@ fn select_executable(name: &str) -> Option<fn(VecDeque<OsString>)> {
         "startd" => Some(startd::main),
         #[cfg(feature = "registry")]
         "registry" => Some(registry::main),
-        #[cfg(feature = "analyticsd")]
-        "analyticsd" => Some(analyticsd::main),
         "embassy-cli" => Some(|_| deprecated::renamed("embassy-cli", "start-cli")),
         "embassy-sdk" => Some(|_| deprecated::renamed("embassy-sdk", "start-sdk")),
         "embassyd" => Some(|_| deprecated::renamed("embassyd", "startd")),
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
index 886361777..bc2da00e2 100644
--- a/core/startos/src/context/config.rs
+++ b/core/startos/src/context/config.rs
@@ -113,8 +113,6 @@ pub struct ServerConfig {
     pub datadir: Option<PathBuf>,
     #[arg(long = "disable-encryption")]
     pub disable_encryption: Option<bool>,
-    #[arg(short = 'a', long = "analytics-url")]
-    pub analytics_url: Option<Url>,
 }
 impl ContextConfig for ServerConfig {
     fn next(&mut self) -> Option<PathBuf> {
@@ -133,7 +131,6 @@ impl ContextConfig for ServerConfig {
             .or(other.revision_cache_size);
         self.datadir = self.datadir.take().or(other.datadir);
         self.disable_encryption = self.disable_encryption.take().or(other.disable_encryption);
-        self.analytics_url = self.analytics_url.take().or(other.analytics_url);
     }
 }
 
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 1042def74..cac1b46e0 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -58,7 +58,6 @@ pub struct RpcContextSeed {
     pub start_time: Instant,
     #[cfg(feature = "dev")]
     pub dev: Dev,
-    pub analytics_url: Option<Url>,
 }
 
 pub struct Dev {
@@ -191,7 +190,6 @@ impl RpcContext {
             dev: Dev {
                 lxc: Mutex::new(BTreeMap::new()),
             },
-            analytics_url: config.analytics_url.clone(),
         });
 
         let res = Self(seed.clone());
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 96210114f..228ac27c8 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -24,7 +24,6 @@ lazy_static::lazy_static! {
 
 pub mod account;
 pub mod action;
-pub mod analytics;
 pub mod auth;
 pub mod backup;
 pub mod bins;
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index b1d9ef1c4..c3931b236 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -281,10 +281,6 @@ pub async fn execute<C: Context>(
         IoFormat::Yaml.to_vec(&ServerConfig {
             os_partitions: Some(part_info.clone()),
             ethernet_interface: Some(eth_iface),
-            #[cfg(feature = "dev")]
-            analytics_url: None,
-            #[cfg(not(feature = "dev"))]
-            analytics_url: Some("https://analytics.start9.com".parse()?), // TODO: FullMetal
             ..Default::default()
         })?,
     )
diff --git a/core/startos/src/registry/os/version/db/registry-sqlx-data.sh b/core/startos/src/registry/metrics-db/registry-sqlx-data.sh
similarity index 65%
rename from core/startos/src/registry/os/version/db/registry-sqlx-data.sh
rename to core/startos/src/registry/metrics-db/registry-sqlx-data.sh
index 2a422bf38..2b24873a4 100755
--- a/core/startos/src/registry/os/version/db/registry-sqlx-data.sh
+++ b/core/startos/src/registry/metrics-db/registry-sqlx-data.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+cd "$(dirname "${BASH_SOURCE[0]}")"
 TMP_DIR=$(mktemp -d)
 mkdir $TMP_DIR/pgdata
 docker run -d --rm --name=tmp_postgres -e POSTGRES_PASSWORD=password -v $TMP_DIR/pgdata:/var/lib/postgresql/data postgres
@@ -8,17 +8,15 @@ docker run -d --rm --name=tmp_postgres -e POSTGRES_PASSWORD=password -v $TMP_DIR
 (
     set -e
     ctr=0
-    until docker exec tmp_postgres psql -U postgres || [ $ctr -ge 5 ]; do
+    until docker exec tmp_postgres psql -U postgres 2> /dev/null || [ $ctr -ge 5 ]; do
     	ctr=$[ctr + 1]
     	sleep 5;
     done
     
     PG_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' tmp_postgres)
-
-    SCHEMA_DUMP="registry_schema.sql"
     
-    DATABASE_URL=postgres://postgres:password@$PG_IP/postgres
-    psql $DATABASE_URL -f "$SCRIPT_DIR/$SCHEMA_DUMP"
+    cat "./registry_schema.sql" | docker exec -i tmp_postgres psql -U postgres -d postgres -f-
+    cd ../../..
     DATABASE_URL=postgres://postgres:password@$PG_IP/postgres PLATFORM=$(uname -m) cargo sqlx prepare -- --lib --profile=test --workspace
     echo "Subscript Complete"
 )
diff --git a/core/startos/src/registry/os/version/db/registry_schema.sql b/core/startos/src/registry/metrics-db/registry_schema.sql
similarity index 100%
rename from core/startos/src/registry/os/version/db/registry_schema.sql
rename to core/startos/src/registry/metrics-db/registry_schema.sql
diff --git a/patch-db b/patch-db
index 88a804f56..99076d349 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 88a804f56f446d34896ef331d915b821a581cf01
+Subproject commit 99076d349c6768000483ea8d47216d273586552e
diff --git a/sdk/lib/osBindings/GetVersionParams.ts b/sdk/lib/osBindings/GetVersionParams.ts
index 71762c8dd..853d76022 100644
--- a/sdk/lib/osBindings/GetVersionParams.ts
+++ b/sdk/lib/osBindings/GetVersionParams.ts
@@ -1,3 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type GetVersionParams = { source: string | null; target: string | null }
+export type GetVersionParams = {
+  source: string | null
+  target: string | null
+  serverId: string | null
+  arch: string | null
+}

From 9da49be44d0da70c28755dd531ea689813fc10c6 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:15:56 -0600
Subject: [PATCH 175/341] Bugfix/patch db subscriber (#2652)

* fix socket sending empty patches

* do not timeout tcp connections, just poll them more

* switch from poll to tcp keepalive
---
 core/Cargo.lock                      |  2 +
 core/startos/Cargo.toml              |  2 +
 core/startos/src/net/utils.rs        | 18 ------
 core/startos/src/net/vhost.rs        | 85 ++++++++++++++++------------
 core/startos/src/s9pk/v2/manifest.rs |  2 +-
 core/startos/src/util/io.rs          | 36 +++++++++---
 patch-db                             |  2 +-
 7 files changed, 83 insertions(+), 64 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 031ec41ab..f8db0bd7e 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -4881,6 +4881,7 @@ dependencies = [
  "hmac",
  "http 1.1.0",
  "http-body-util",
+ "hyper-util",
  "id-pool",
  "imbl",
  "imbl-value",
@@ -4936,6 +4937,7 @@ dependencies = [
  "sha2 0.10.8",
  "shell-words",
  "simple-logging",
+ "socket2",
  "sqlx",
  "sscanf",
  "ssh-key",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index a8707bf65..750bc4953 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -97,6 +97,7 @@ hex = "0.4.3"
 hmac = "0.12.1"
 http = "1.0.0"
 http-body-util = "0.1"
+hyper-util = { version = "0.1.5", features = ["tokio", "service"] }
 id-pool = { version = "0.2.2", default-features = false, features = [
   "serde",
   "u16",
@@ -159,6 +160,7 @@ serde_yaml = { package = "serde_yml", version = "0.0.10" }
 sha2 = "0.10.2"
 shell-words = "1"
 simple-logging = "2.0.2"
+socket2 = "0.5.7"
 sqlx = { version = "0.7.2", features = [
   "chrono",
   "runtime-tokio-rustls",
diff --git a/core/startos/src/net/utils.rs b/core/startos/src/net/utils.rs
index 6de319a5e..9cba8a0cd 100644
--- a/core/startos/src/net/utils.rs
+++ b/core/startos/src/net/utils.rs
@@ -112,24 +112,6 @@ pub async fn find_eth_iface() -> Result<String, Error> {
     ))
 }
 
-#[pin_project::pin_project]
-pub struct SingleAccept<T>(Option<T>);
-impl<T> SingleAccept<T> {
-    pub fn new(conn: T) -> Self {
-        Self(Some(conn))
-    }
-}
-// impl<T> axum_server::accept::Accept for SingleAccept<T> {
-//     type Conn = T;
-//     type Error = Infallible;
-//     fn poll_accept(
-//         self: std::pin::Pin<&mut Self>,
-//         _cx: &mut std::task::Context<'_>,
-//     ) -> std::task::Poll<Option<Result<Self::Conn, Self::Error>>> {
-//         std::task::Poll::Ready(self.project().0.take().map(Ok))
-//     }
-// }
-
 pub struct TcpListeners {
     listeners: Vec<TcpListener>,
 }
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index b4f5715ae..e6a9d5b21 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -1,10 +1,15 @@
 use std::collections::BTreeMap;
 use std::net::{IpAddr, Ipv6Addr, SocketAddr};
+use std::str::FromStr;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
+use axum::body::Body;
+use axum::extract::Request;
+use axum::response::Response;
 use color_eyre::eyre::eyre;
 use helpers::NonDetachingJoinHandle;
+use http::Uri;
 use imbl_value::InternedString;
 use models::ResultExt;
 use serde::{Deserialize, Serialize};
@@ -20,8 +25,9 @@ use tracing::instrument;
 use ts_rs::TS;
 
 use crate::db::model::Database;
+use crate::net::static_server::server_error;
 use crate::prelude::*;
-use crate::util::io::{BackTrackingReader, TimeoutStream};
+use crate::util::io::BackTrackingReader;
 use crate::util::serde::MaybeUtf8String;
 
 // not allowed: <=1024, >=32768, 5355, 5432, 9050, 6010, 9051, 5353
@@ -113,8 +119,16 @@ impl VHostServer {
                 loop {
                     match listener.accept().await {
                         Ok((stream, _)) => {
-                            let stream =
-                                Box::pin(TimeoutStream::new(stream, Duration::from_secs(300)));
+                            if let Err(e) = socket2::SockRef::from(&stream).set_tcp_keepalive(
+                                &socket2::TcpKeepalive::new()
+                                    .with_time(Duration::from_secs(900))
+                                    .with_interval(Duration::from_secs(60))
+                                    .with_retries(5),
+                            ) {
+                                tracing::error!("Failed to set tcp keepalive: {e}");
+                                tracing::debug!("{e:?}");
+                            }
+
                             let mut stream = BackTrackingReader::new(stream);
                             stream.start_buffering();
                             let mapping = mapping.clone();
@@ -129,38 +143,39 @@ impl VHostServer {
                                     {
                                         Ok(a) => a,
                                         Err(_) => {
-                                            // stream.rewind();
-                                            // return hyper::server::Server::builder(
-                                            //     SingleAccept::new(stream),
-                                            // )
-                                            // .serve(make_service_fn(|_| async {
-                                            //     Ok::<_, Infallible>(service_fn(|req| async move {
-                                            //         let host = req
-                                            //             .headers()
-                                            //             .get(http::header::HOST)
-                                            //             .and_then(|host| host.to_str().ok());
-                                            //         let uri = Uri::from_parts({
-                                            //             let mut parts =
-                                            //                 req.uri().to_owned().into_parts();
-                                            //             parts.authority = host
-                                            //                 .map(FromStr::from_str)
-                                            //                 .transpose()?;
-                                            //             parts
-                                            //         })?;
-                                            //         Response::builder()
-                                            //             .status(
-                                            //                 http::StatusCode::TEMPORARY_REDIRECT,
-                                            //             )
-                                            //             .header(
-                                            //                 http::header::LOCATION,
-                                            //                 uri.to_string(),
-                                            //             )
-                                            //             .body(Body::default())
-                                            //     }))
-                                            // }))
-                                            // .await
-                                            // .with_kind(crate::ErrorKind::Network);
-                                            todo!()
+                                            stream.rewind();
+                                            return hyper_util::server::conn::auto::Builder::new(hyper_util::rt::TokioExecutor::new())
+                                                .serve_connection(
+                                                    hyper_util::rt::TokioIo::new(stream),
+                                                    hyper_util::service::TowerToHyperService::new(axum::Router::new().fallback(
+                                                        axum::routing::method_routing::any(move |req: Request| async move {
+                                                            match async move {
+                                                                let host = req
+                                                                    .headers()
+                                                                    .get(http::header::HOST)
+                                                                    .and_then(|host| host.to_str().ok());
+                                                                let uri = Uri::from_parts({
+                                                                    let mut parts = req.uri().to_owned().into_parts();
+                                                                    parts.authority = host.map(FromStr::from_str).transpose()?;
+                                                                    parts
+                                                                })?;
+                                                                Response::builder()
+                                                                    .status(http::StatusCode::TEMPORARY_REDIRECT)
+                                                                    .header(http::header::LOCATION, uri.to_string())
+                                                                    .body(Body::default())
+                                                            }.await {
+                                                                Ok(a) => a,
+                                                                Err(e) => {
+                                                                    tracing::warn!("Error redirecting http request on ssl port: {e}");
+                                                                    tracing::error!("{e:?}");
+                                                                    server_error(Error::new(e, ErrorKind::Network))
+                                                                }
+                                                            }
+                                                        }),
+                                                    )),
+                                                )
+                                                .await
+                                                .map_err(|e| Error::new(color_eyre::eyre::Report::msg(e), ErrorKind::Network));
                                         }
                                     };
                                     let target_name =
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index 77e48c126..9ae8524fa 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -146,7 +146,7 @@ impl Manifest {
 #[ts(export)]
 pub struct HardwareRequirements {
     #[serde(default)]
-    #[ts(type = "{ [key: string]: string }")]
+    #[ts(type = "{ [key: string]: string }")] // TODO more specific key
     pub device: BTreeMap<String, Regex>,
     #[ts(type = "number | null")]
     pub ram: Option<u64>,
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index 9a6bab64b..b5748d1d9 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -1,4 +1,4 @@
-use std::collections::{BTreeSet, VecDeque};
+use std::collections::VecDeque;
 use std::future::Future;
 use std::io::Cursor;
 use std::os::unix::prelude::MetadataExt;
@@ -706,16 +706,16 @@ impl<S: AsyncRead + AsyncWrite> AsyncRead for TimeoutStream<S> {
         buf: &mut tokio::io::ReadBuf<'_>,
     ) -> std::task::Poll<std::io::Result<()>> {
         let mut this = self.project();
-        if let std::task::Poll::Ready(_) = this.sleep.as_mut().poll(cx) {
+        let timeout = this.sleep.as_mut().poll(cx);
+        let res = this.stream.poll_read(cx, buf);
+        if res.is_ready() {
+            this.sleep.reset(Instant::now() + *this.timeout);
+        } else if timeout.is_ready() {
             return std::task::Poll::Ready(Err(std::io::Error::new(
                 std::io::ErrorKind::TimedOut,
                 "timed out",
             )));
         }
-        let res = this.stream.poll_read(cx, buf);
-        if res.is_ready() {
-            this.sleep.reset(Instant::now() + *this.timeout);
-        }
         res
     }
 }
@@ -725,10 +725,16 @@ impl<S: AsyncRead + AsyncWrite> AsyncWrite for TimeoutStream<S> {
         cx: &mut std::task::Context<'_>,
         buf: &[u8],
     ) -> std::task::Poll<Result<usize, std::io::Error>> {
-        let this = self.project();
+        let mut this = self.project();
+        let timeout = this.sleep.as_mut().poll(cx);
         let res = this.stream.poll_write(cx, buf);
         if res.is_ready() {
             this.sleep.reset(Instant::now() + *this.timeout);
+        } else if timeout.is_ready() {
+            return std::task::Poll::Ready(Err(std::io::Error::new(
+                std::io::ErrorKind::TimedOut,
+                "timed out",
+            )));
         }
         res
     }
@@ -736,10 +742,16 @@ impl<S: AsyncRead + AsyncWrite> AsyncWrite for TimeoutStream<S> {
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Result<(), std::io::Error>> {
-        let this = self.project();
+        let mut this = self.project();
+        let timeout = this.sleep.as_mut().poll(cx);
         let res = this.stream.poll_flush(cx);
         if res.is_ready() {
             this.sleep.reset(Instant::now() + *this.timeout);
+        } else if timeout.is_ready() {
+            return std::task::Poll::Ready(Err(std::io::Error::new(
+                std::io::ErrorKind::TimedOut,
+                "timed out",
+            )));
         }
         res
     }
@@ -747,10 +759,16 @@ impl<S: AsyncRead + AsyncWrite> AsyncWrite for TimeoutStream<S> {
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Result<(), std::io::Error>> {
-        let this = self.project();
+        let mut this = self.project();
+        let timeout = this.sleep.as_mut().poll(cx);
         let res = this.stream.poll_shutdown(cx);
         if res.is_ready() {
             this.sleep.reset(Instant::now() + *this.timeout);
+        } else if timeout.is_ready() {
+            return std::task::Poll::Ready(Err(std::io::Error::new(
+                std::io::ErrorKind::TimedOut,
+                "timed out",
+            )));
         }
         res
     }
diff --git a/patch-db b/patch-db
index c537a07ea..99076d349 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit c537a07ea937e69b66841d903c70fd75623e5457
+Subproject commit 99076d349c6768000483ea8d47216d273586552e

From 0c188f6d10fe7380a3b6b757906304aeea28944a Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Tue, 25 Jun 2024 10:54:09 -0600
Subject: [PATCH 176/341] fix ca trust test and snek high score

---
 web/package-lock.json                                | 12 +++++++-----
 web/projects/ui/src/app/app/snek/snek.directive.ts   |  2 +-
 .../app/pages/login/ca-wizard/ca-wizard.component.ts |  2 +-
 web/projects/ui/src/app/services/api/api.types.ts    |  5 ++++-
 .../ui/src/app/services/api/embassy-api.service.ts   |  4 +++-
 .../src/app/services/api/embassy-live-api.service.ts |  4 ++++
 .../src/app/services/api/embassy-mock-api.service.ts | 12 +++++++++++-
 7 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 81b612ac1..ca5c8efe8 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1974,22 +1974,24 @@
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha1",
+      "version": "0.3.6-alpha5",
       "license": "MIT",
       "dependencies": {
+        "@iarna/toml": "^2.2.5",
         "isomorphic-fetch": "^3.0.0",
-        "ts-matches": "^5.4.1"
+        "lodash": "^4.17.21",
+        "ts-matches": "^5.4.1",
+        "yaml": "^2.2.2"
       },
       "devDependencies": {
-        "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
+        "@types/lodash": "^4.17.5",
         "jest": "^29.4.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         "tsx": "^4.7.1",
-        "typescript": "^5.0.4",
-        "yaml": "^2.2.2"
+        "typescript": "^5.0.4"
       }
     },
     "node_modules/@adobe/css-tools": {
diff --git a/web/projects/ui/src/app/app/snek/snek.directive.ts b/web/projects/ui/src/app/app/snek/snek.directive.ts
index 255926792..db812ae4a 100644
--- a/web/projects/ui/src/app/app/snek/snek.directive.ts
+++ b/web/projects/ui/src/app/app/snek/snek.directive.ts
@@ -39,7 +39,7 @@ export class SnekDirective {
 
       try {
         await this.embassyApi.setDbValue<number>(
-          ['gaming', 'snake', 'high-score'],
+          ['gaming', 'snake', 'highScore'],
           data.highScore,
         )
       } catch (e: any) {
diff --git a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.ts b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.ts
index 2c0e9c7fe..fde1c968f 100644
--- a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.ts
+++ b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.ts
@@ -42,7 +42,7 @@ export class CAWizardComponent {
 
   private async testHttps() {
     const url = `https://${this.document.location.host}${this.relativeUrl}`
-    await this.api.getState().then(() => {
+    await this.api.echo({ message: 'ping' }, url).then(() => {
       this.caTrusted = true
     })
   }
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index a5c52e9a2..0c7679754 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -12,7 +12,10 @@ export module RR {
 
   export type WebsocketConfig<T> = Omit<WebSocketSubjectConfig<T>, 'url'>
 
-  // server state
+  // state
+
+  export type EchoReq = { message: string } // server.echo
+  export type EchoRes = string
 
   export type ServerState = 'initializing' | 'error' | 'running'
 
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index d6bb11632..1d9c6f805 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -17,7 +17,9 @@ export abstract class ApiService {
     config: RR.WebsocketConfig<T>,
   ): Observable<T>
 
-  // server state
+  // state
+
+  abstract echo(params: RR.EchoReq, url: string): Promise<RR.EchoRes>
 
   abstract getState(): Promise<RR.ServerState>
 
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 954a4475e..057c51013 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -71,6 +71,10 @@ export class LiveApiService extends ApiService {
 
   // state
 
+  async echo(params: RR.EchoReq, url: string): Promise<RR.EchoRes> {
+    return this.rpcRequest({ method: 'echo', params }, url)
+  }
+
   async getState(): Promise<RR.ServerState> {
     return this.rpcRequest({ method: 'state', params: {} })
   }
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 728b4ff35..98efee2ef 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -118,7 +118,17 @@ export class MockApiService extends ApiService {
     }
   }
 
-  // server state
+  // state
+
+  async echo(params: RR.EchoReq, url: string): Promise<RR.EchoRes> {
+    if (url) {
+      const num = Math.floor(Math.random() * 10) + 1
+      if (num > 8) return params.message
+      throw new Error()
+    }
+    await pauseFor(2000)
+    return params.message
+  }
 
   private stateIndex = 0
   async getState(): Promise<RR.ServerState> {

From 0e506f571611a3b67b94e6a8482b268f02642a1a Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 25 Jun 2024 12:34:47 -0600
Subject: [PATCH 177/341] fix container cli (#2654)

---
 core/Cargo.lock                               | 490 +++++-------------
 core/startos/src/context/cli.rs               |  27 +-
 core/startos/src/service/cli.rs               |  27 +-
 .../src/service/service_effect_handler.rs     |  39 +-
 4 files changed, 173 insertions(+), 410 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index f8db0bd7e..6db13b8cd 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -225,7 +225,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -236,7 +236,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -432,7 +432,7 @@ checksum = "be5951c75bdabb58753d140dd5802f12ff3a483cb2e16fb5276e111b94b19e87"
 dependencies = [
  "concurrent-queue 1.2.4",
  "event-listener",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -624,9 +624,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b"
 dependencies = [
  "jobserver",
  "libc",
@@ -740,7 +740,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -914,6 +914,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
 dependencies = [
+ "percent-encoding",
  "time",
  "version_check",
 ]
@@ -935,6 +936,23 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "cookie_store"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
+dependencies = [
+ "cookie 0.18.1",
+ "idna 0.5.0",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time",
+ "url",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1126,16 +1144,15 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.2"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "platforms",
  "rustc_version",
  "subtle",
  "zeroize",
@@ -1149,7 +1166,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1173,7 +1190,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1184,7 +1201,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1215,7 +1232,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1238,7 +1255,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1253,15 +1270,15 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 1.0.109",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1306,17 +1323,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "displaydoc"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "divrem"
 version = "1.0.0"
@@ -1398,7 +1404,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
@@ -1487,7 +1493,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1600,7 +1606,7 @@ checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
  "futures-core",
  "futures-sink",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -1715,7 +1721,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -2055,9 +2061,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.3"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "httpdate"
@@ -2116,6 +2122,23 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.3.1",
+ "hyper-util",
+ "rustls 0.23.10",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-timeout"
 version = "0.4.1"
@@ -2187,124 +2210,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "id-pool"
 version = "0.2.2"
@@ -2342,14 +2247,12 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "1.0.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
- "icu_normalizer",
- "icu_properties",
- "smallvec",
- "utf8_iter",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -2389,18 +2292,18 @@ dependencies = [
 
 [[package]]
 name = "include_dir"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
 dependencies = [
  "include_dir_macros",
 ]
 
 [[package]]
 name = "include_dir_macros"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2727,11 +2630,11 @@ checksum = "e479e99b287d578ed5f6cd4c92cdf48db219088adb9c5b14f7c155b71dfba792"
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.5.2",
+ "spin",
 ]
 
 [[package]]
@@ -2779,12 +2682,6 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
-[[package]]
-name = "litemap"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -2852,9 +2749,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -2897,9 +2794,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
 ]
@@ -3170,7 +3067,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3236,7 +3133,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3335,7 +3232,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.1",
+ "redox_syscall 0.5.2",
  "smallvec",
  "windows-targets 0.52.5",
 ]
@@ -3454,7 +3351,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3496,12 +3393,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
-[[package]]
-name = "platforms"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
-
 [[package]]
 name = "portable-atomic"
 version = "1.6.0"
@@ -3560,18 +3451,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -3618,7 +3509,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3802,9 +3693,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
  "bitflags 2.5.0",
 ]
@@ -3866,14 +3757,14 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "base64 0.22.1",
  "bytes",
- "cookie 0.17.0",
- "cookie_store",
+ "cookie 0.18.1",
+ "cookie_store 0.21.0",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -3882,6 +3773,7 @@ dependencies = [
  "http-body 1.0.0",
  "http-body-util",
  "hyper 1.3.1",
+ "hyper-rustls",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -3896,7 +3788,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 0.1.2",
+ "sync_wrapper 1.0.1",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -3918,7 +3810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93ea5c6f30c19d766efe8d823c88f9abd1c56516648a0d4264ab2dc04cc19472"
 dependencies = [
  "bytes",
- "cookie_store",
+ "cookie_store 0.20.0",
  "reqwest",
  "url",
 ]
@@ -3943,7 +3835,7 @@ dependencies = [
  "cfg-if",
  "getrandom 0.2.15",
  "libc",
- "spin 0.9.8",
+ "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
@@ -3962,7 +3854,7 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#5a24903031e72ac75fd23889215361edc7b20842"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#f608480034942f1f521ab95949ab33fbc51d99a9"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -4088,6 +3980,19 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -4288,7 +4193,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -4361,7 +4266,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -4529,12 +4434,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -4788,7 +4687,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.66",
+ "syn 2.0.68",
  "unicode-width",
 ]
 
@@ -4834,12 +4733,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "start-os"
 version = "0.3.5-rev.2"
@@ -4865,7 +4758,7 @@ dependencies = [
  "console",
  "console-subscriber",
  "cookie 0.18.1",
- "cookie_store",
+ "cookie_store 0.20.0",
  "der",
  "digest 0.10.7",
  "divrem",
@@ -4945,7 +4838,7 @@ dependencies = [
  "tar",
  "thiserror",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.25.0",
  "tokio-socks",
  "tokio-stream",
  "tokio-tar",
@@ -5019,9 +4912,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -5036,9 +4929,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.66"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5057,17 +4950,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -5165,7 +5047,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -5229,16 +5111,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -5292,7 +5164,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -5316,6 +5188,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls 0.23.10",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-socks"
 version = "0.5.1"
@@ -5549,7 +5432,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -5701,7 +5584,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "termcolor",
 ]
 
@@ -5742,7 +5625,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -5825,12 +5708,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
- "idna 1.0.0",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
@@ -5847,18 +5730,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -5867,9 +5738,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
 dependencies = [
  "getrandom 0.2.15",
 ]
@@ -5959,7 +5830,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "wasm-bindgen-shared",
 ]
 
@@ -5993,7 +5864,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6250,18 +6121,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -6324,30 +6183,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "yoke"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.34"
@@ -6365,28 +6200,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -6406,29 +6220,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -6451,9 +6243,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
+version = "2.0.11+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/core/startos/src/context/cli.rs b/core/startos/src/context/cli.rs
index 22084bbe1..d560d575d 100644
--- a/core/startos/src/context/cli.rs
+++ b/core/startos/src/context/cli.rs
@@ -25,7 +25,7 @@ use crate::rpc_continuations::Guid;
 
 #[derive(Debug)]
 pub struct CliContextSeed {
-    pub runtime: OnceCell<Runtime>,
+    pub runtime: OnceCell<Arc<Runtime>>,
     pub base_url: Url,
     pub rpc_url: Url,
     pub registry_url: Option<Url>,
@@ -249,16 +249,19 @@ impl std::ops::Deref for CliContext {
     }
 }
 impl Context for CliContext {
-    fn runtime(&self) -> tokio::runtime::Handle {
-        self.runtime
-            .get_or_init(|| {
-                tokio::runtime::Builder::new_multi_thread()
-                    .enable_all()
-                    .build()
-                    .unwrap()
-            })
-            .handle()
-            .clone()
+    fn runtime(&self) -> Option<Arc<Runtime>> {
+        Some(
+            self.runtime
+                .get_or_init(|| {
+                    Arc::new(
+                        tokio::runtime::Builder::new_current_thread()
+                            .enable_all()
+                            .build()
+                            .unwrap(),
+                    )
+                })
+                .clone(),
+        )
     }
 }
 impl CallRemote<RpcContext> for CliContext {
@@ -290,7 +293,7 @@ impl CallRemote<InstallContext> for CliContext {
 #[test]
 fn test() {
     let ctx = CliContext::init(ClientConfig::default()).unwrap();
-    ctx.runtime().block_on(async {
+    ctx.runtime().unwrap().block_on(async {
         reqwest::Client::new()
             .get("http://example.com")
             .send()
diff --git a/core/startos/src/service/cli.rs b/core/startos/src/service/cli.rs
index 87491932b..f5e04999c 100644
--- a/core/startos/src/service/cli.rs
+++ b/core/startos/src/service/cli.rs
@@ -19,7 +19,7 @@ pub struct ContainerClientConfig {
 
 pub struct ContainerCliSeed {
     socket: PathBuf,
-    runtime: OnceCell<Runtime>,
+    runtime: OnceCell<Arc<Runtime>>,
 }
 
 #[derive(Clone)]
@@ -35,17 +35,20 @@ impl ContainerCliContext {
     }
 }
 impl Context for ContainerCliContext {
-    fn runtime(&self) -> tokio::runtime::Handle {
-        self.0
-            .runtime
-            .get_or_init(|| {
-                tokio::runtime::Builder::new_current_thread()
-                    .enable_all()
-                    .build()
-                    .unwrap()
-            })
-            .handle()
-            .clone()
+    fn runtime(&self) -> Option<Arc<Runtime>> {
+        Some(
+            self.0
+                .runtime
+                .get_or_init(|| {
+                    Arc::new(
+                        tokio::runtime::Builder::new_current_thread()
+                            .enable_all()
+                            .build()
+                            .unwrap(),
+                    )
+                })
+                .clone(),
+        )
     }
 }
 
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index a61a00b9b..63c313ead 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -899,50 +899,15 @@ async fn running(context: EffectContext, params: ParamsPackageId) -> Result<Valu
     Ok(json!(matches!(package, MainStatus::Running { .. })))
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct ProcedureId {
     #[serde(default)]
+    #[arg(default_value_t, long)]
     procedure_id: Guid,
 }
 
-impl FromArgMatches for ProcedureId {
-    fn from_arg_matches(matches: &clap::ArgMatches) -> Result<Self, clap::Error> {
-        Ok(Self {
-            procedure_id: matches.get_one("procedure-id").cloned().unwrap_or_default(),
-        })
-    }
-    fn from_arg_matches_mut(matches: &mut clap::ArgMatches) -> Result<Self, clap::Error> {
-        Ok(Self {
-            procedure_id: matches.get_one("procedure-id").cloned().unwrap_or_default(),
-        })
-    }
-    fn update_from_arg_matches(&mut self, matches: &clap::ArgMatches) -> Result<(), clap::Error> {
-        self.procedure_id = matches.get_one("procedure-id").cloned().unwrap_or_default();
-        Ok(())
-    }
-    fn update_from_arg_matches_mut(
-        &mut self,
-        matches: &mut clap::ArgMatches,
-    ) -> Result<(), clap::Error> {
-        self.procedure_id = matches.get_one("procedure-id").cloned().unwrap_or_default();
-        Ok(())
-    }
-}
-impl CommandFactory for ProcedureId {
-    fn command() -> clap::Command {
-        Self::command_for_update().arg(
-            clap::Arg::new("procedure-id")
-                .action(clap::ArgAction::Set)
-                .value_parser(clap::value_parser!(Guid)),
-        )
-    }
-    fn command_for_update() -> clap::Command {
-        Self::command()
-    }
-}
-
 async fn restart(
     context: EffectContext,
     ProcedureId { procedure_id }: ProcedureId,

From ab1fdf69c8ea4b3ef260c9881f433cc09e32ca6f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 25 Jun 2024 18:11:11 -0600
Subject: [PATCH 178/341] add docs for development environment (#2655)

---
 DEVELOPMENT.md                       | 133 +++++++++++++++++++++++++++
 Makefile                             |  37 +++++++-
 assets/create-vm/step-1.png          | Bin 0 -> 28070 bytes
 assets/create-vm/step-10.png         | Bin 0 -> 45200 bytes
 assets/create-vm/step-11.png         | Bin 0 -> 54662 bytes
 assets/create-vm/step-12.png         | Bin 0 -> 49039 bytes
 assets/create-vm/step-2.png          | Bin 0 -> 47071 bytes
 assets/create-vm/step-3.png          | Bin 0 -> 46699 bytes
 assets/create-vm/step-4.png          | Bin 0 -> 51398 bytes
 assets/create-vm/step-5.png          | Bin 0 -> 65075 bytes
 assets/create-vm/step-6.png          | Bin 0 -> 53461 bytes
 assets/create-vm/step-7.png          | Bin 0 -> 65527 bytes
 assets/create-vm/step-8.png          | Bin 0 -> 53991 bytes
 assets/create-vm/step-9.png          | Bin 0 -> 45452 bytes
 build/lib/scripts/chroot-and-upgrade |  17 +---
 build/lib/scripts/prune-images       |  49 ++++++++++
 16 files changed, 217 insertions(+), 19 deletions(-)
 create mode 100644 DEVELOPMENT.md
 create mode 100644 assets/create-vm/step-1.png
 create mode 100644 assets/create-vm/step-10.png
 create mode 100644 assets/create-vm/step-11.png
 create mode 100644 assets/create-vm/step-12.png
 create mode 100644 assets/create-vm/step-2.png
 create mode 100644 assets/create-vm/step-3.png
 create mode 100644 assets/create-vm/step-4.png
 create mode 100644 assets/create-vm/step-5.png
 create mode 100644 assets/create-vm/step-6.png
 create mode 100644 assets/create-vm/step-7.png
 create mode 100644 assets/create-vm/step-8.png
 create mode 100644 assets/create-vm/step-9.png
 create mode 100755 build/lib/scripts/prune-images

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 000000000..cb9385f41
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,133 @@
+# Setting up your development environment on Debian/Ubuntu
+
+A step-by-step guide
+
+> This is the only officially supported build environment.
+> MacOS has limited build capabilities and Windows requires [WSL2](https://learn.microsoft.com/en-us/windows/wsl/install)
+
+## Installing dependencies
+
+Run the following commands one at a time
+
+```sh
+sudo apt update
+sudo apt install -y ca-certificates curl gpg build-essential
+curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+echo "deb [arch=$(dpkg-architecture -q DEB_HOST_ARCH) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | sudo tee /etc/apt/sources.list.d/docker.list
+sudo apt update
+sudo apt install -y sed grep gawk jq gzip brotli containerd.io docker-ce docker-ce-cli docker-compose-plugin qemu-user-static binfmt-support squashfs-tools git debspawn rsync b3sum
+sudo mkdir -p /etc/debspawn/
+echo "AllowUnsafePermissions=true" | sudo tee /etc/debspawn/global.toml
+sudo usermod -aG docker $USER
+sudo su $USER
+docker run --privileged --rm tonistiigi/binfmt --install all
+docker buildx create --use
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh # proceed with default installation
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
+source ~/.bashrc
+nvm install 20
+nvm use 20
+```
+
+## Cloning the repository
+
+```sh
+git clone --recursive https://github.com/Start9Labs/start-os.git --branch next/minor
+cd start-os
+```
+
+## Building an ISO
+
+```sh
+PLATFORM=$(uname -m) ENVIRONMENT=dev make iso
+```
+
+This will build an ISO for your current architecture. If you are building to run on an architecture other than the one you are currently on, replace `$(uname -m)` with the correct platform for the device (one of `aarch64`, `aarch64-nonfree`, `x86_64`, `x86_64-nonfree`, `raspberrypi`)
+
+## Creating a VM
+
+### Install virt-manager
+
+```sh
+sudo apt update
+sudo apt install -y virt-manager
+sudo usermod -aG libvirt $USER
+sudo su $USER
+```
+
+### Launch virt-manager
+
+```sh
+virt-manager
+```
+
+### Create new virtual machine
+
+![Select "Create a new virtual machine"](assets/create-vm/step-1.png)
+![Click "Forward"](assets/create-vm/step-2.png)
+![Click "Browse"](assets/create-vm/step-3.png)
+![Click "+"](assets/create-vm/step-4.png)
+
+#### make sure to set "Target Path" to the path to your results directory in start-os
+
+![Create storage pool](assets/create-vm/step-5.png)
+![Select storage pool](assets/create-vm/step-6.png)
+![Select ISO](assets/create-vm/step-7.png)
+![Select "Generic or unknown OS" and click "Forward"](assets/create-vm/step-8.png)
+![Set Memory and CPUs](assets/create-vm/step-9.png)
+![Create disk](assets/create-vm/step-10.png)
+![Name VM](assets/create-vm/step-11.png)
+![Create network](assets/create-vm/step-12.png)
+
+## Updating a VM
+
+The fastest way to update a VM to your latest code depends on what you changed:
+
+### UI or startd:
+
+```sh
+PLATFORM=$(uname -m) ENVIRONMENT=dev make update-startbox REMOTE=start9@<VM IP>
+```
+
+### Container runtime or debian dependencies:
+
+```sh
+PLATFORM=$(uname -m) ENVIRONMENT=dev make update-deb REMOTE=start9@<VM IP>
+```
+
+### Image recipe:
+
+```sh
+PLATFORM=$(uname -m) ENVIRONMENT=dev make update-squashfs REMOTE=start9@<VM IP>
+```
+
+---
+
+If the device you are building for is not available via ssh, it is also possible to use `magic-wormhole` to send the relevant files.
+
+### Prerequisites:
+
+```sh
+sudo apt update
+sudo apt install -y magic-wormhole
+```
+
+As before, the fastest way to update a VM to your latest code depends on what you changed. Each of the following commands will return a command to paste into the shell of the device you would like to upgrade.
+
+### UI or startd:
+
+```sh
+PLATFORM=$(uname -m) ENVIRONMENT=dev make wormhole
+```
+
+### Container runtime or debian dependencies:
+
+```sh
+PLATFORM=$(uname -m) ENVIRONMENT=dev make wormhole-deb
+```
+
+### Image recipe:
+
+```sh
+PLATFORM=$(uname -m) ENVIRONMENT=dev make wormhole-squashfs
+```
diff --git a/Makefile b/Makefile
index 5a0440196..5e038a08d 100644
--- a/Makefile
+++ b/Makefile
@@ -152,16 +152,21 @@ update-overlay: $(ALL_TARGETS)
 	$(call ssh,"sudo systemctl start startd")
 
 wormhole: core/target/$(ARCH)-unknown-linux-musl/release/startbox
-	@echo "Paste the following command into the shell of your start-os server:"
+	@echo "Paste the following command into the shell of your StartOS server:"
+	@echo
 	@wormhole send core/target/$(ARCH)-unknown-linux-musl/release/startbox 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade \"cd /usr/bin && rm startbox && wormhole receive --accept-file %s && chmod +x startbox\"\n", $$3 }'
 
 wormhole-deb: results/$(BASENAME).deb
-	@echo "Paste the following command into the shell of your start-os server:"
+	@echo "Paste the following command into the shell of your StartOS server:"
+	@echo
 	@wormhole send results/$(BASENAME).deb 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade '"'"'cd $$(mktemp -d) && wormhole receive --accept-file %s && apt-get install -y --reinstall ./$(BASENAME).deb'"'"'\n", $$3 }'
 
-wormhole-cli: core/target/$(ARCH)-unknown-linux-musl/release/start-cli
-	@echo "Paste the following command into the shell of your start-os server:"
-	@wormhole send results/$(BASENAME).deb 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo /usr/lib/startos/scripts/chroot-and-upgrade '"'"'cd $$(mktemp -d) && wormhole receive --accept-file %s && apt-get install -y --reinstall ./$(BASENAME).deb'"'"'\n", $$3 }'
+wormhole-squashfs: results/$(BASENAME).squashfs
+	$(eval SQFS_SUM := $(shell b3sum results/$(BASENAME).squashfs | head -c 32))
+	$(eval SQFS_SIZE := $(shell du -s --bytes results/$(BASENAME).squashfs | awk '{print $$1}'))
+	@echo "Paste the following command into the shell of your StartOS server:"
+	@echo
+	@wormhole send results/$(BASENAME).squashfs 2>&1 | awk -Winteractive '/wormhole receive/ { printf "sudo sh -c '"'"'/usr/lib/startos/scripts/prune-images $(SQFS_SIZE) && cd /media/startos/images && wormhole receive --accept-file %s && mv $(BASENAME).squashfs $(SQFS_SUM).rootfs && ln -rsf ./$(SQFS_SUM).rootfs ../config/current.rootfs && sync && reboot'"'"'\n", $$3 }'
 
 update: $(ALL_TARGETS)
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
@@ -169,6 +174,28 @@ update: $(ALL_TARGETS)
 	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) DESTDIR=/media/startos/next PLATFORM=$(PLATFORM)
 	$(call ssh,'sudo /media/startos/next/usr/lib/startos/scripts/chroot-and-upgrade --no-sync "apt-get install -y $(shell cat ./build/lib/depends)"')
 
+update-startbox: core/target/$(ARCH)-unknown-linux-musl/release/startbox # only update binary (faster than full update)
+	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
+	$(call ssh,'sudo /usr/lib/startos/scripts/chroot-and-upgrade --create')
+	$(call cp,core/target/$(ARCH)-unknown-linux-musl/release/startbox,/media/startos/next/usr/bin/startbox)
+	$(call ssh,'sudo /media/startos/next/usr/lib/startos/scripts/chroot-and-upgrade --no-sync true')
+
+update-deb: results/$(BASENAME).deb # better than update, but only available from debian
+	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
+	$(call ssh,'sudo /usr/lib/startos/scripts/chroot-and-upgrade --create')
+	$(call mkdir,/media/startos/next/tmp/startos-deb)
+	$(call cp,results/$(BASENAME).deb,/media/startos/next/tmp/startos-deb/$(BASENAME).deb)
+	$(call ssh,'sudo /media/startos/next/usr/lib/startos/scripts/chroot-and-upgrade --no-sync "apt-get install -y --reinstall /tmp/startos-deb/$(BASENAME).deb"')
+
+update-squashfs: results/$(BASENAME).squashfs
+	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
+	$(eval SQFS_SUM := $(shell b3sum results/$(BASENAME).squashfs))
+	$(eval SQFS_SIZE := $(shell du -s --bytes results/$(BASENAME).squashfs | awk '{print $$1}'))
+	$(call ssh,'/usr/lib/startos/scripts/prune-images $(SQFS_SIZE)')
+	$(call cp,results/$(BASENAME).squashfs,/media/startos/images/$(SQFS_SUM).rootfs)
+	$(call ssh,'sudo ln -rsf /media/startos/images/$(SQFS_SUM).rootfs /media/startos/config/current.rootfs')
+	$(call ssh,'sudo reboot')
+
 emulate-reflash: $(ALL_TARGETS)
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
 	$(call ssh,'sudo /usr/lib/startos/scripts/chroot-and-upgrade --create')
diff --git a/assets/create-vm/step-1.png b/assets/create-vm/step-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dfafc25f28c9aed407ade6bba082031a7198b7b
GIT binary patch
literal 28070
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%0A~~67(4io63xsrHFma81p~rN%Iq5)
z9($+E&Aa~BY=E?KTMR4K2Umbc@hVjtvCsh&ZanXLugPL>mjBv>vdj@?mJ{~d03L9_
zbs>pK7RKhLq6S$P0Y}?T)<w*P-c02?UA=(7N<6(PZh71?%#Wgd>(21sP<R}~t{j(m
z3K!q3ISu>dxAp0TAIeHuoNF970P<+8b+Sy?soLbss!o{!g6#tF$FJ$xw=e^n<;YDT
z-Ek{p*dvRt;a-ZprfMx=Of|%Dk{7E08V8Cv-4wPPrW)4Tf<>vRP90yDS~d>%@thPg
zv7j0hk|IS7g$rz)hA_;Gk)0zUL2>sEL*YPHG@}@ZX5fd<+2c~|z%+%R`(vwa$B73Z
z3~2DqMO)w&?P!4pi{U2kg>r!*)X;hy#2C~9;{<NupE-;{432@5_PRI_7;?T4#E!1%
zcm&*1-=|^6K|b3xW*pb><S{2gJF&EreseO|oD7{O^UcZZd9vg<SwQ{&t4<x*z{BHr
z2OPg6;A91QvYtKxAt#XP1c#oW>JuvBgjhLYqfWTB6GHOe^eWE50)#gzjV28J>L7G1
z^$-RMQW=lgT6mCQM2|&3@Eh>Y_u0+0&F{cP`K~h^k8R#q>Ob14+j<4Mgh;R$Yg{s#
zQ&6|To<Gh85Wq|8c@;mtvP3_D1exrTjT^{zAQn77jL?x$lW}@m^f(cErjHut&>Aj@
zi`HwS-C#t{_%ss(?uFH{e4UOtrh%ch)R*jdSqM2}BvKoeG_(#0YZH=cWAed-k^=6L
z_qf7{A;eW&kNdpQadEiz3PxMIX};DlHSD47bUu6ge%njzat5jGFtVT3$N%-4RyE!P
zC7=>4(es23ckFQ<P(*=*52Z^Paku)eky7cK?ft>PwwL+aRAlb<I_J4_;eix9ghEow
zynEyje;94^-%KJtlxpRpsiSYx6bFg}IQI|@R;>W76;PVB+uJVA*iun4em8+^5P=P+
zQ(Kx|FW7crZ}(@MsU-II&wMRVS0zRMNpUWsjq>IQkh6d5SiupH2+z@u4Qy{yFY3|z
z_TQF4RgXe{5!J7Q$?7y4VGioafAZ!ZGwpxcu`gB#nwl@AgpQVBC4MVU|Cp2iBbiVj
zie`P&6x-9avyVJ(^|UF_3qZe>wZTWj-X2OG#`bgX8tEK!@pr`mGXD1i;6ZrE5mjcv
W^-B<W%~}xfxuSDTyIRxn!G8dInwr4?

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-10.png b/assets/create-vm/step-10.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc1985394de78c730c1b1a317845f6a894289057
GIT binary patch
literal 45200
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
DyPTO6

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-11.png b/assets/create-vm/step-11.png
new file mode 100644
index 0000000000000000000000000000000000000000..322dd5394c9558979e09eafe00074dcefb0f5e80
GIT binary patch
literal 54662
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

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-12.png b/assets/create-vm/step-12.png
new file mode 100644
index 0000000000000000000000000000000000000000..52f14f56e8a6ef39cf3ba7d592831db8eee3605a
GIT binary patch
literal 49039
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

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-2.png b/assets/create-vm/step-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..020f3d7d178cf929b693778b1b69344519cddc13
GIT binary patch
literal 47071
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
ZHZ;&tn&jSMzzyJ|EU*5uQqJ=2{{XxEIZ6Nk

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-3.png b/assets/create-vm/step-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0295ba6bcb461ad348efd06d155a1b891976ace5
GIT binary patch
literal 46699
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

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-4.png b/assets/create-vm/step-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..85832d2601ac1e112c3e95c1f949fcd220e01224
GIT binary patch
literal 51398
zcmZ^~by!v17B38l0)n6@ozmS%ZV;q9rMr=C*o1(TG)Rb~bcZyXlJ0KUbjPMQ&A0SD
z?>YB*?sxwH)-zdi&M`-i-yADUNkQ_(bHe8c2na8vrNmSa5RmSHpO2_Wz=)V%xg7!m
zIfAs9h?)oDL9@H&>*dA@pNE?kc+;?u1q^;*pxpMp00~!({|gix3k9Q-h#<F%Dytnd
zXVZlSJjHqX^wrA>#&<<@@@<$>vZrZ%R38|~n+5fq`%F1L4ROK=tL&zKnV*u0{xq&Y
zKqN;%{*3Sv0qMP=(95gnYlk?8sP_n{2#EiTzr@CQ0`p&G`QKYDFA-qhS(#s?VEtzv
z0_tb@XZXJp5RlG-5Ijb_t*jip|2qi*f&xML@0!W1$Zg;)S=qq#C;!<60ci!a0{ZW^
zZQgGYpq!V9xNlwsJ^jzLwr{UKkENWvMt~87!z=XHep3Yem-u8Vq(MLP=vG+92={0B
zT{@hN5KCVZ8Ta4)RV6-GVx^26ailw=z^-4w+F9zeWOb$RS*e&1(El7AIIq7n<>&lM
zZq1oMSBdrAhizM}<MicA(o}@>=!{2Jp$B2lYrNyr$D#1sA9(O>BvQ?Pn1+BVhwU$n
zd;C!O8D1Xb4GDMf=Ji$c*(z;{*zRlxOYDPo#Dnp0MRGz=>ON!DImEX87Dp1~6=eGN
zurvvOM$oUW9<_UKw?#>z;=GUw)Pj-O0~E-1UGp}u^;7S9>E@O!r+<$_jCNP^lHdXn
zM)2dj4PN<Jd%hAR{;;tbVniC%8d>q`ACA%dXhQ<X#y$S&>|@w#fpPg{9h9v?#?%*t
zhpmqQeNqVeXT4+^By>D9awsJg#s?vj7*c!~LBcs|*jIM1k!48CMgYD1KcuqRB0uQ1
zJ%Mt*+eL(3lfbfsN+sV*;X^E{BptJS|5*z^xGe+S19|j>bnjq`ov7`O3DvVqxe$v3
z`T?FUjCYLT%=cU8e<ug@#3SMb#3Iily5NdK5A>Qy2M>(m4*Uk5l~2s#Z+<*U_>YcI
z`aAk!Drz|%lOCrlHw<{N$?th!v9@N$eGP67YzoXqSvQ8Ql;!+vA7Jgh`h>QxD*awx
zs{`8S{yTa{HbR>|n`?E-7)M)^Z=a~FTi=+GX6tg^%Y0T=lYko07UayRQ)lG1HJwQc
z%~BbE-tp#3ojK;;9UUEy(@$J>*r1#Y7Aa~lWtB0*Ns>fY>VWRSYs=*L*j~DVXUGy~
zr|3o&v=B`Wn;{8+@BrgDM$<QyhY^gjIi^&JrN)aKH?C1jrk0)0jFm7l+LZ7Gc_Bdw
z&K?`)R-OrC8c~UBJ0RJd96VO76CL%+gOXeeLed5;y@gQ6rqHYL<6e2Y^tTa27I%%A
z6e0s-UCTYf;{!a46Fh^Xlh0VIl1*k!E=jFCaeUvhN4fs){w`sdn$e-EOAMHuh1wAZ
zsoWxjmWjdburboS`0xt(%d}WeS0`=BGQ@1DJID0|Ei0CNpT}OSm7P!Mt++=eRh@wo
zaEb#;P{f`IYy}gI)$W|eR3PIsIXj(sLJ7ymABkm!@kFn{eU4rI(|XF{;p;k-b{ktD
zQXwNJnLSNMUlC<vhmvT64KYuwk7vmm)#q{`@85zxzX?8#a#o!mW2Rk0DVg(sN{w!`
zuX<hwl^hB(*)Db_N@dXoyngf6atC}Xff~kaB*^XJ!v*aaik|yK<QN`TG>km`Zf(^N
zg_PL$&jAgHAr^up{1Nbo{_pjk(a{E@m&X^e`)j$I32P?rB>2I?o(~+bkL^L>d`aa?
z1zs07YTEO)lg)ecH;Y2LE*En6%pvQIW$9>jYZX4CsQBOKw6&Xz)je;%yq<LNbnu{7
zC$WIPCneSw^Dc}w$oW<sp!hzgZkdo$bzw9#vU5e#!1!Bg+zmGU_mv9XlKSANu*hcG
z8x`4^$psz?a^CI%R^tR>#HHRLaP|4nL7I1kmm1eObEzK0yF(eax`|g+?RG&e@hZ?H
zZ7K98cJ;1-sIhFxAt><oTEOqM2ss<Tjy|Xo2}r`)Vl;)<v~gTP)e20Hxj989R_o^0
zNAEGBsGs#DYw;THs+p;ikUjQhj$TBuJW#C3RvM1tFoRS%(NTnr&&P49c5wB5-wGR7
z*QV2NfyPf6?9$sGME38VWOKX9SANL0z<Yz+gCCc?;RLoYcx<cb%uJqoXE*DR)EHIC
z>S${yRWfHy`)f*pfv|d+JZkkCJ3CRTuigVWxO9#Vk{no1{?-$DZWb)Vq}LbNL1|Gr
zABGY#0|@%`g*zPc<Q#1q51X=JH>KQ7;)y<W{=w>N+&8$}J8Sl)#(|p+iKQ{l7pR!e
z^<b;7gQ*#P!juX5Y4lrG{oht9lp)S$5>Ag2FDL*aU}cvPS6xo3e@Exi-2AIN6aN%t
zJZ_W2O#wQ5<R8HjCGqr85&N&v`uxvLIG&L{4QQ-O_!aH`xitGnc}s3!!hKL`s!9Gh
z<Q}QnJIsQE#b&N{eJ5<9*fthRD=Iv)6kT%0XwlL{_LgZ&^N9_yus^lRc)O7!@7q^^
zE;u!~NL@YS0=4gevR)CT>OK*pPFzKfUD5>wRGg$6K_smcAeo`OSeWH`Ry*rtVZmQr
zLn2~BBy2Pxrs7JP#M91Ao=;f~s7H9Azht5+P+3Ju${cv=e(K=>Lc#qwjPyJFI;c}g
zwX(tq;7O~PObSX!Qrt(3$XO~nhW6w~6_qKp=*66$Wj(aybP&yPVav4CpM+SLttt{>
z_{5YgrqqB}^sh|#A^FneO96YbHvb-h)=y|#V8;Mm0e|BaBX%_#ObcQfbcHR(N|huH
zP==lL6_s#&9LH%#xgzH3sklZj-RUX%33}M|l_W!<<=M(Hpfa7A_+hzH_>)RJ+0YJV
zK|uBE?7w`grl@&Ju-$>y&rsChg$zizTlY(n!Kg4BA#0UpZ06?LtI(8>N;_VunRE(D
zojl}UQ9|(E#A9HFCuvM?w4<?TvAo8|4)?;+R}*BTN^B%S<KX2YwbcbyFP0?N7fVet
zkQx~s@1VuFkm?RLw->PXb@&yOz^R~wOiQ=6a$sR&7lN3iS!-PrNn|YSqSp-#NI;`y
z8y;CLWW|JXrel(HgC#Zr_ZMQIIXN~qG}JcUwL~jA$L4JtfyI8+Id?ww&Q1S8jE5B#
z*rO2qrOeUgQu7Pm)>RX~cN}^R84!)4%#7BNv5(KuBn9*U!=HLrEnN};eNEaxK*IbU
zi(dxTPVpu|6PL6B&8Kgc#8}{qgw0ERCM%=Ol5BhbhcVb@cuu_c9p6U7H+9!k-Fv{T
zR8p&~#{STxiPhBP)6s4+<bEA!oLDaQCD0MllT?qp&^|w`CrkDnW@B||ZE78Ehlibj
z8of9e2N#i)5$j5N8q~FlEDo%rgTneWAn#{?4BT+)bmiE$vu3ALADz(xUEwYJk&V$|
zKzdV9O?VbPheHsHzVE97xC8n~5`J!;)#t<L(j7u=<e)C2Y>u7Ft~eDy^?-;}7!=ru
z%b^^m_?`}kW2D5S0FNajw%S+GtQ+n0dxdt4t#?Dcutel%mOfb$#wQtkp+M|&y}{1@
zrsg`DhPN8@f%09}R!?PCW$lM%6rwuSsY!Q-lMc+UWq+b%NY|&mwoumXRw6Bj$m>mB
z;gI|mUJopfk%C1t!Q^^REWl)nKjB-NZ*Oh1jP>z&_9&pxCY3IzKKan0CkPp0vgM)8
zPfpPxNKRqZin@C`*b;Gu_4M+&(ZDRK<z5Ou@9oJc`ZY>vd}8(xrTGbIcf&}BM>Gv+
zq>Glkpw!~%fOKc;)y5GHHXyplNE7!^uaQ&r)5*6eBC6;pFKkUDV6Wc9b8)*nT%bCg
zp`M;ZyEwhb#N4Js4l1+YGXwYvqGYtm_FK`Ww=#8mmkqD?AioxHsjPOK;(l*B&^IMa
z$HYQzNz#ZM(iO&P(r8zS5t|*}T9pzNlWh8alwSzZNCKuzZpmMN)!>N?7)y|ZO&jJA
zdk!_DY3ZThXj+&EyCps*i*G?}<|<#~)n6<7lFt-!yY6uvwDD~+Z7~#Z?oMC#ypej9
zM#phDE{A(TUfPY-Hc3b#oK%A822yg;>OBGcU-L>W><(A_PujQOJ3BgnLbhE2vM#iy
zK;tzqe&aTDymAa!vr7QxAJ2+;LCRDksWc(J@FvZls=Q=(gK%YMjkUNS*z9d(jG>t^
zTEv;N$6k0KJR<)?$Vs{~-vk@<m+5sse(Q?Q{_FMM*{^GJIy-Gq(ZZ!h2G37uZ=NAP
zeHLOjo4T{LS|gKqc3845hoN}D`siIIFD1vpWt^QF7wk96KWMKBK{@1AmMJ6k*G!i+
zo-2wuet{37RMm0ujjl~EY|=nYd9KAo&rJwhZC`D^qcFvp3T?0SP^J<Ij)cz&+@_Se
ziK1Yl5#CsmHF)$rH-&`op9ehseEp&^C>x%6mN-hn1_Q)1!CBS0XJpV0k@U~pJs<^C
zAqsQQ5c<m|NY}v<vcW;s)g9Pzi&EMF2|2;#<f0NnT+OWD-BV-el=`?(p9KYiZIQj;
zhV7C5+v*cimQ^FKc2c%Rv#@W~fOP>0LCMdQ%;cOpdt@xk5mq{DtM#qDS2m{BO)^m{
zTLi{d>onvMi{n8NaJG%Bh(VjN6H*|KTPVDS0)ejo{Dd?$Q))IPl4%`8ybyH+s_rD-
z0zF5TU;a$z%(%_I%+?$E#Af@Sd=5x={>|q)JVq!W6<PkPyBE@0NmbDqf;jltKeH_y
zTB{F^$JU2g>>8g*XwA)?5b+E!zT$ltdpAskSbtC0amoJD!Qt}kBw8&0S$0>*38{dj
zy^Es0uZZv4N+72hD2UhiB1U}|I#vKTyr;%eP+IP_{szr1G!ey!s;SMU=3$4O9Ak<%
z`K4xt#up2}d$+PmVr{<q`8BrI7d(-s1$OX=j21PJ<X(s&<E@HU^bO$44T6D`^T~%8
zzOgmgSfX`ySgg9*8Ra<Xb8_Z<z!*L8VXt2569ZP6=1ED>!bP6^4oX>Efcp}knWlj_
zZ9h;>{O9neEnH|QG_aeMj-m1kKgq%rWeoLoP#Sq71ywB-FOxp*_cJQG7SminuO`9B
z;xX5tertZnov1fbK-@sim}v$pd;bupn37t6B7&9W<@FzK|9~^;yzM!R@=D}g-4uI;
zzrB4tiH8CsPz=EYN+qW}BM3?Zii(_ZW&Orzm8OcWG1`raO=YL?3H7A7)2p*=t%~JY
zN1-dkVw8{F((hw4gXGqXJQzj*>+sG^1@wWP_Zi8B^2dpjlW-UKb4QmGASDuOmIN}H
zV#!P(c!o;?**v<el;c7Em>?cU;YT$J!0jIBlMaGE_R)iHOaE}%Nv`*flxjr0>FG=#
zEiac49TO%A4Z$yX=Ck!(B3xozNsO=UG^{3u?0<|Ta_F$alwb?wjU-xZyLcD+Nly^z
zBBJCV6;N$buDK1#2)7GV{m6(-&8&6M`QfLqc6Qup7KO5ELA<(S-qTKFbAwpT#&KG5
z6}<se66FrGu#z}+bI-OF2EKrN)<a(wS6j+SaEzyh3I~vyp&pK20DpF_Ud~GZ`Pz<z
z4JJ1(eoyWC7U%%6Baxo`PaLLa!Gr=uBZE5uR^Do}#VQ42cMwWQkN)Y3rTxhYa{c`t
z1yAYAdcpGV2qT}i*yz6!NzV$=qSbpL_tDEAPY48cCgOjetp|r(UA-M)uC9fP+57#7
zM_A2~`0#I$^WPdE7@j_MrxIC@bsw&mTDUy2iLpGwO~F2EREGT$J3+HnG>U&fMoB>g
z#LGn5ROeTg&XGEU@%As3jQ^vO{y3fB^b?j5g1;3lIYZ0fTpB(;HW5Dd{t=F7n#Ge2
zU!Z`+cm?1PfAxe?;57w^;-`nvD@aAf=a^%l{-tR&F_ein;^WXn{0Ca#`(T(nhuON2
zKiVvb&&m{VskDCb`TAobAVuO;zX${x5K@4s-(9oAnjhBn72fFy>*xQ#9$UozL6eGC
zXa~FxSKzGAnK7SZ*z`T5d@3-}KjNcR=#Uh{*^VMh(8JpTq@rJPj8l@+bqZHPInVba
zb=pF7+QOOqI*^e6LKV&d2sedM-VjRk(;nuv_k(r6BUU%b{8%^e-ux`YG8P_H{q-u7
z#+ohHs5;{<tR0%S?IKnXNPH|TiV#og3t0hPO|JJR7<9$GA8OjM{}%u;9DcPTF0@KO
zYzfJ}1<vr9jFmS>sFw>vllQfu3(=&nB{Z;^y;DId`CYF+rt9F@V<9Ez&O?M)|9II?
zJ`_G0?DlZ7{CGFwcQ@1epnD8^>g~s@d%i8&B8+!>e_Q_aKPXRIDtX1R--GsXx!>b;
z#^Y7F-yK}|F)wQ0q(j)`mhooUkGXC2DZv!V^*S-`GbE3q4nvth>8O|j{CN1vaX>io
zF*+{VUEe_K=Oi-u`n!hDDF20r0C^5lAo($^+?yc6kn|TR5Ct(=LyNG6z@vB`MzP{Z
z9%ACx4wj84?iR@%5C6g!08^9Eka1bCHQRa~XGEc`xTh@GZ6@%Rx9gx}IMaK#-$P#<
z-ah*mv;n3?WV9Ke$14BfZVn17(<v=0$B6e`&u7Aap(F%Ea<<o~Oe^b;CWx&3Gm=VT
z=fc4dNhuFR53GxDQVUT55sd$C-*$z@q)YYL1Iw#JI2?XAgf3l{h2kHb!99uakHCR9
z<plfz)P)U<b<yI7_}1t+-O8Q_^?%@AvL@2G{pEX7d#NGkv1SYG7SHFwivK4uX~=o=
z;N$-JDxG0#Gsx&b$&B#j*Ov(_Oxc{33@9~-i2t5WRqlOcTawRC1{v%gK7;aT&2ZJq
zcl%II=x=|{9$LWqOVFYsub-o6m|-QT#;CC}^rmVIk0<d>i!Ie<zxfH6=tP5Nt!@gB
zC>+h1Nyru2!AQ<T(4t(E`H`|*<kmV+e;VB3OeUw`!zMgQXW#l=<Fm6jabR%dpEH8|
zS1Jl7^=>^KuFM$C?3P%5hcl(m;@9RKL_~Z|o8_l1uQj0^uJ^otq3U-OiR44cc}c>e
z3n?kJ=xiaWMev`KHH<|NqTh>#u|AF&+{65fTAyXGP^lls%3d`cJ*2%k*{1M+CE@OI
z5@7vf63dru@IEJftjMQi&TvLDekc;xcM9_>5x3__Ku5e*C##2?PBlm+qDt~x9Jxf8
zw%iF`KCg5&krZ(}o=)e8w)Y-HlENv_$trDc$qN@&$$K|uZ66OA%3D>$fIdZ1mCmd_
zi2d4l*-5G_uBRg+?!)COGr*`fI9%#|CAcmcwNaG-Wa_N!SMwJOSp6A`je6f2KM7}i
zeyJVZRJR-yo&-x$gEBMmd2D=1Nj$RLBU=yxwDC8(&K!SKX`GRad=vcm6n&nro>bWJ
za<4{bE~(t0zb`U!8RCJq-OAf@0HVSD2p|Z-s|fap{#ugc^n1&o$j2SON7hcT{tHj6
z&9W6k|M$jM866q1^E4L$m{UJ7k;36(QwvwqybLy@ge_O>ddlNyull85b%L?G=ssCN
zKd{GB5lE57zc!&4Vt}EAf7NTU%bv3q5JJr29&=<rLHmO~)v;UYd5c<_4&DsuOxw#v
zDN4Q4XX;ZCxQsJUm(7Bh<HIWF9z<NIsUQ+D#u2n7a_{{6j?>ecux14sqd1%j)twTs
zGSI`qfO54vuQ>ecz*Noob&!}wKOO#$atTJQCKeV}SlPApLYHi!bZH#rGs!p0<)fq1
zWSeh&-FXJVzI7{f@C+~5Djv2g{PM%oB*piZGwFc~s&GI6S%~Z6xJ{ln`Yle*Vc)oJ
z=_9(qE-&O~(W7i-r99r?&dyqYR(Wq2hg$IJs^#NjMoZ$OC?r4l2$az4fpuL*PHj+M
zY`DsX#`@~QY&)ff%tv`;2ZUIId1<c~BJDxI`pR1IO_nZpUaIkNI)dZZU&vi@amI9W
zS+rK2smFu~@T;q*wpa#a4J`WF`t(BPCON<0@!PCtb~w8A$<EjFkwqHiin+PAvP;Fo
z_fOpCvbcgmT!HH6u$IOa<{UrCpv3(0N)L&+xo5cj!r0AD+0k=4_tRFfZ6&|nl24iL
z5F<0#g&RK2z$Z>hoQ_ZIc-=pA7qFJf$P*#Q3>emI{g4?JDc&M|U$b(>e78SJh{nvg
zqOf0KMFG?PIQQijRG=R6yfWAAZO05LlVZ`)(mzp?TuycbF9vt2=8tgN0oe(Oo?u=6
zk-QvKUsKboX(c@gYYd>q`l$5h+G${jqM=_IZ<Ck)P_w$Gn%hAq0U%II>fk(Ft)#N0
zCIjEQ&bir(A3&l+xIiJuv31_M4c^$<g+Q9FpTdD<JJ7xwO5(-q>R+x@mi&C)C@$tL
zJr~%s6N)Dpmkci`_=LAy-nMr_8+^3n_XR*yw5gN8*=++M$w}^T=>6$NX<-rJ{5A&*
zuvPkZSFPAge_R4mrbevRnB*iZ_U-=2`WIowaRUG^+G377Hx31P?@|hq4^kHgO9t?M
zIg58D@iuu<+sli~K1B{PXw_2ERIBAP+K<i7uN1_SbZOvueixQC$JY=PluN6SJHYUA
zRHot%_=ly5?L4GrMWHXP3C=^CmuUhnwk78H#bU3x6n-N1De%$1t@?GZ(4|3h+9O#!
zTu?_!v^oFf38_qr!*IHvbNIw6<Y>Wu`~Vt1YWYgt{<YHnipt^71oPq2D_b4qe%rSx
z@B^G&D&-!q5{z9E5@Jl}8Q%8o8(9LJ?&V~2X{rz8i4Dn;_XRUa$pP!e2C+cG)*;@`
zrmSGRqtQSuiKJqxzU_V|GspM1d`gdzOPc*i`v#nl!}o??(JH{vQT~08ZsN$U%s>SJ
z`Y-|R!m*V6WYf}EQ2|IFpO%iIJSX5%McXTQO*YrV!GqOcZE8`+^4MbHSH%hGN$vnT
zx@_rTi~+%G^kQJ{&cmz~hu26|0!NUz*;pk}XA%X7t5I`-Z>a%H1`aE;+$H>`A-IW$
zZMJx{v!<ndJviK+p!mLb*4x#yYvLXy8ZAr)HB2UTWDpbe`F8v2MdaYoVl!)gXeSxT
z>kQu`3M@?42Jg-LIGIlZv;f5cDbq{8vE5*=aN|e0xmI7l#C~PqbTQA2Ld(<r0XFZ<
z#=(!dw6=HTEX4T(C1hK|i3_TFeSF<Lq~j1kG4Qc}k(sH%iQ7Im0x9G3=vL0RKuHCl
zw5ANed5L>=g5KZg!EGbYWi1F?_hfulf|mXU9M2qIeY*6B*kS1o^ofYFBcyk2k?0z5
z=nV;a?P=Ig0|+xd$24bu+U(c{;2N=>z>aMw9q$ic5jiJ5U=1--IlydpYWzL1{%B5v
z=M~FubY{J`K8&rs<NcUVdk0u8jg4IQ&aZ)ZxS3%2u1|_+8c?8@SI1Y6xn3i}H$;!p
zL@<%&{BId@@boPrKZkJUi?sGosL4ZTkj{z5TjOuuZ)M)OLQpQ!ce>tCxI#jXK;>Mq
z{?0Z83Gid|aDM*A1_I5-`dcwNqTuq#lef<@cz?9acMlI_>}+lN9MAT}jB-Z}lZGFs
z=F<)cm648t53q#|joP2TOx8y_fc~PU<~F|{WvV_byd6yfd}~*??H2B#3_;M>ev6%^
z2<ZC3Ru}J=c<0UFv?r?1BgViU4p%tir_wsA=;8ftheDq*={-Ge4F-qJ_>LI(y81&#
zsFNsF11h@4x?UePj4|h$MPtZW`U#5nbY=$<(+gZ0TD)zrF#{M1+^?i9L6lTQ(Crjt
zjNqgPbbt*{A2xmHnBlNve`k;e&i<UlUw+(K=)y_{sLDv>23<3N<}!JOQc5bCsF>L_
z-t<oi0(TE$6|{;O1H*k?&#Fg@Og9on%yie<S9xe{E>6&a2gd*kATk4*;1S!!b9Mwk
zbErQrKD_X`?w6kg^ZxwM+|%Cmq%^}o>OkaLm2YnpZwnNW$>tKpl0IXPYiNHs??X<<
zgbfCubl_SkSh9?<+=IW+xdA^Kb^pDg2U42-BUvX{`*AG9W8@J7^57gZ1a84`NLzD0
z$OdX;lk5339Sm6Z4%AuuOI0*KG|($L969I+^kN=6qDyiU1ZZ1XnNjBVv>)-e612-3
zBmyL<y0vzSFEC!XpB%sYRlSs&YHV$1W@z2=<@yPp0Coi2kj~KT<4Z$$I*>?Zf+z_6
z)Lgv#qd<=fBI&%IiH-sQ`i#o@h8WlNM$Y`EA)EluiGfT=GMvpz(ei43yh^eT{U}RT
z*|8y{PMDGa7bdcdjhzr071pYwNkP-F*gx%fz7Db&=dA1xhiT9ij;e^pDp%^Ly8X0p
zg!%H}DxTawe;T0epgEa-A5s}Gdq>(Wm{gQETn0j!7||2_k)B}SAPiVqtuTL-)4p45
zZTi?a&UmgFmN<0`-|s~!r?d3WZEQ><>et77i82BnJ73EE*t~dsD1R*yg|bATe$<rv
zJtKUjqF@J{X-~VlK?w*2l2PdrufIv_xB+sk#T=&2#roso8$Il#MNV~l6jDzv(L0AR
ze=Iw%ZD_f<6u|L+jGG&utQ-T;=mJB2?9fs>o|0b@PqDjuKCuzy0|Q0nBo8_7{&-F4
zg8S=9$>iOzE;PpXhE-^z-GFB<6mPab+<nXHIk^sk)o(ORPwQlRmc8oU<Hno&w-*5X
zykH$v0H+F9o(8<RE)^Yawcw0q_a6hH9?<B%dJ5CYz{ev^tDvT)vHKvUDduIK7cD%-
zLr%xW>(a3$#)DO^UiF;#RmUA^l&0Z&1a;dHXhG%s!{TzK^KwefJ`mafuR+k`4=k7&
z6B>ceX9<;&(Er{JW-;_+(QwaDwIb+96_SLBJT9^_u*|Tt0a!u6`dxZ_zSedhU!zC5
z5N80~MscZ$h9Q`m6wlqBYc<Hup!Kc4834aaRTtDR&JCfHjLlU#lTAyTsEhXi7-907
zBF0k9Eka`~k@O(=4H_XJwn{?d^>>_JSp4OofY;ptQ3i+?Z@zxXVPFeh+n59B8b6hZ
z8_)n!v3TG%0Xtzfy^-hsE*HpAB=QosIjbJwxuKmZfSu~>rSBwrFcqQWv1SAK+E|wF
z`oUh<Q8b>Gu6{dkulRyQ*2D<<nxyG1T*B95ga7<NhzSEI+9wnczAvAB7XnOY#Ca0z
zut9NWxdo2^C>ey&zx=s@syhBx6v$syU&3PXZ|_L=GAe!tKMT&Ep*7R%7xFz-Gn5LA
zN^id(uj-JD7HF#9CB!!~v*@v3WGWYXFN~<AjdZkajEKZ)!Rrs02jTq9ov887Z(8yk
z3(K!VurY3~2KQFtv_fkuGxzNyA8uwnAX5gsAdr`{39oG8MSP9wfo!+6uUr27qWE6Q
zyHL%@s4%{Gn*wr70f_;w#53tspQVg}t1lu@t+js}V~ZNEu^d6+M@iW{8s&O;?wl|d
zF9YCWa2(O!s0+?GS$(cKTji2V+ylml7&=2gD*m(!_@3ve;aPm&fXgqqEW=RgfyedJ
z%{S_Ho0N5<*=OO5WI_gC@UUYwwE?s07qL#z^%Y@ng7-2MZ7ea!3HzZD-K|JqpOLP1
z#Q~{fb|8D)z(?p{lYkeD;1v@(F%arf&iH@$`un)?tq&)DbgMfJH^qsG<_({6!$}xX
zf~|&PUZkH9%wfxF0OgCgc+amv*lKW8ZY3LxovX(1du<m!QOOg3E2__nBkE^<F@iH8
zewUmcScMT=Ad{vH#;h?U5*Wd?ZyD7qAO*t9HH5A+h*XL}^7Ryrnc&V@@5Q^QaKmLW
znZv2Os1q|;yKrTha1BKDsPM)zn0}9A9N&@Rk{>(KyuMnNW&<h<6LhbIZ-Ma(n~Xf+
zM<Cve?~(GcKvL^-7f`0xs;7O4nr6;eBXeYP6EvV<2gLYlX9s2`h7TiZs*;bV2|wJA
zppue4YLhjJ=|b-1^*<{L4mNh3EiqA-oD))wr@M-QEiy)W6Lo9H+q(k2T4y_etoU{Q
zIJax?k(xXFa-hG_sWqpnqT<`a8CbJXB?{UR*s&ncsNdgrzw8c(EW3ep1J~=<RFad^
z*lmONlK?FUiaf^BVABuZhw;lvpV%?SgFkaJ<VX6O)I&kee~e2C5D+Obv~TLHe+mLv
z7U0;lUgK~AMNs={2%^9sb$(`v*Wrz=ed~Ld)A|?y01D$9c=9Yzl)`RniJ6IMsoL|?
z>9pD;xIU{X1v~&GVwaoy;&4(2NJcn*#AJ8CUwIMGIC-E0U<BgEHHhpnehXy(K%5f=
z&xCTaO>YB#)-~1(UJ8qT#Pjr3OhM&<{xbMhB_4tOD;b+kA<GNv^p5nJ9n^|q*60w6
zu>L!+!-Un-p}Nk)0cnvC!BgLP_Suy8^fvd8w<DjR$N-4g{h}6V8e!u`PLz`FDO*nc
z?s^TJ?qFcX9VUP=VVM^!NNiU7T9fLtV#M9L&XjP>3F#!5^dzp|K^Xl}0fTJmEQP0t
z%+OcgSu{Jyucmn|cuc6g!K8FH296x2y4WcYK^4^}zkil8<|f{f!N@1ixgKO^o(4V9
zVE8oB26rC1WF%cfLHY-&`Rpw`)9&ZP^Z;YUdYE(BHUMA|i{u`hs&#B-gIfNjmw<+9
zZ`?LS45wh6)r(%PNnnfCMRe)UvD#JO_?gl8%9^mtdZ9CN%-=RtAXWSa%=@#pzm^OF
z#A1h?_E$C9TbqB8nD>U?fbOa`@PA<(|7%g;wU+90I&plrC;y>}Ed=fVw`psaj|t{r
z{SV~`$P&{3SL2q%CJ3~o_utMd1fXp!5xY$yunqiv_kUaRDF9nW@f<T<IHCf86XGA@
z+Dw7QF+|uukm#S0Ep)`=^y~5Qc%vaD+JC#S=EVQ6E&uk4jj)h~So;6%Qv)EMXNW)>
z5b6Jp{GXmQ5WzHtE7ITH0B}z4|G|fYQ^!!;|2I+oVes@Gtgl9hNbw?>l`YTy3llD)
zMwokBsz4-Zve0nJ+5C}}!q?ogI^6yxBl3cK1(a#v`~|@S%lqd)*jQUAa^5od+^q(C
zLf|0Umt$^$FmcYx{Y%H!u7}!+L51Q#TN9m1{?Ipdv&-*-apIdx-6VyA%-o`EyA0in
zC)jhYU}g2`mRJJ^lXG(%wKyZHQjS9;%qE)3@>ZA9`=|p4#0y_f6SqFQ{CN{O4Tdpr
z@J-R0a7ac<f|kAc1B;{7d>dHe&NhVPAL$sTH1}947F)~w8c*Cp8+3oKe)i?FiqkJ>
z*++nuo$CO2TMxlM!ibOpUZy?P&F}vhlb$6K?)j7HwQEWd{gD4QKhW8B2l{tS1ZuW4
zDCLh))5?s?o*OaOFCA0yi=H)Lw*5he6zZmCAA^gwI+5pv`2tkeJg!uguAiP<i~If{
zmYYi#MM7@m=>Ygu@IQV{fK9Pe4x+pXht+6mZ;6B8_?s7()sIw1R%5f%Opi^H7U$`m
z(}$58`E@$&{xnTK_rq?PApjnKQb*#3fb`citS-|l<h0|AtH6>u56T|V3xWPeGZ_iK
zGajS&?cnZiTkqToSyTv$(C~lQB8D^pAYWh|+9?myx;mKG(qnGM-MXy3*X0b6W;$a7
zcge=g0@+53h{`8bcvL)d71~gxeczj#R@jI@0(Oc`xm!Xlrtcvw{1QXZ>#oa<k^3xR
zGX3&<s$Xn6YxbU+g!Zq&7&uo*E0u|BY|G=h^v%$>xhpk8mDu6x{<kCCYpi?+2*`hl
z!S@HKmmYSmDe>W+UAp1Cu`E7`9oZ#&)`T*44H{~}d6FUg5CNJqhrm@wmkcs|FFTK{
z<D@O!{MbhCpA*5X+?p?a&Klf`n@baETXikpa(}C#{2)RJR*c8kXvmXUA|DC5=jeF;
ze@GccRz<FxF5uv(eDnUvw&KJy^KT0Gcke|ZlJ71CnhowzFvoffu@~HUVr9!HJ_rp$
zKP>yt2QgZ>_}M+KenW<Kd@<u7JgVF4WXbxTzFkx*xFS;l)f-nbnCPv?G$=v*=U}RT
z6v{&7O!s-dU+wut$%lAVG<gmk;cfU^Xtu+i1!rQ=PwLv<a#(F&rDyczu6+a9vzBvJ
zsmUd&r6rNR6%gkDn1*XaJz=Z7T29;TdqnCtViD<?aUqBG)qSk}kjJ1BpNf$%!#Wru
z1y=`?>qyz5?vJ?pt9y)-boXnW67}=-GDvB5(EU4};rDa=g)6QmpoGAPxFOP_+$`D)
zenwp#-|r>6-3zdSd@W#;k~gvH0)zA&I)7E_yX3#rTZO{K?6Tk!eQ7*?%FWy7BZ&_N
zKio#^u*^)8d%(4>&?{*#kMa%<oQ68t6FChXo{KHFTEUr`Bay9ZP|UWmg@Be0aE_q!
z&C`bv*ix&8ipy<x*Sb!i24nB8R|Xw{f{(;5D5CX_(*%;g<rY_1rL}mG6xstBj^v?C
zrrDYzcU0lq*<o0)VJ*znQI<&l8r6~_=rK~^HZa>?feE<U2r9NAXdpGcFJldRe_E`d
zhQVW2M>VO&(I}i}@)}en(E9B>*3Q5>mV|@Ug^UIkD}0$<_BeC%M%ytP0u?&X5(=|L
z(eBNivFzHs^!DLuYX_@9<1;#bd26C6LhcQdM#VN7W_#H5w`{9)b4gt;J-I1Rrm(8w
z?uJ~{KGGLh&4(NgfiGJgE`pS%Hpi=a>0+x(zCmvmQ{1~~ryI41=olHLi+{|P3+Uga
z%&T%VVy=7L?~hmGqfoxE;-lu1ryPjMHglQ6w>!5q7LqSI#b(+Ze7DtH)|g;OZ_z@J
z^#bRFG(e)Wn>=kQ%)KyMz;$H!Wlaf>O@#*1KQYG8?RBy_%xKt|yS!!THeRmLDP4$i
zyDdqU>=~iJGs2X{_-GZLylR-&gw8`5d~Dx7Y7#l|;Bq+pg<j_&vA|?v@=TzueT$}z
zRovV-?xS@@27jw04dVBi#oKInZ<kv*$hMYNAb!A?hQh0J;}1vQJQ5Bz&oX3;=6J8j
zLh()!4vm6`pg2#KiCX4tY~z;3anEcrlRCFRXhW}9r8AbjYoJp<YwqD>Pr0re*<{>P
zubbpu(!;skCzKjSL_|Pz*+rEPW_GFHzjg#yL)Ij5+<&Pyb61C2DHaiF^?;#UWXo=X
z0_8btB3jTs%TKNyUw%k&gpRr5PZN=nx=<tsrM0ME7gRxxt#3|Bz80RPr*zNEtPP?D
z`}%hGZ#m8s@8kt}M4QWfyyX87IOKV8!41nGg^xNcXSlbaK`e|ToZZ}s&i9drkx&O^
z{&+`)o{)5%0*9T2K=_hpX&@I&+GgS2v0{htCrP8$l6*!CUsq9*7c`-ck%sFv8P<mR
zJJlC?@YAQ4u|z4)`i?A@&+=NEKOLJ$F4sU{*Rwtc(xv`EAlBBnn`eE?t#D!Qhoy{(
zdtF>Uy^+@V7H_hG+tD<q;-;rV&eU9ed2YmI1XnlVljCDQJP&n9!Rd@y($}+f0g5^L
z98Zr-GSoa%js@}dQxo<MxKm^<Z%HSGg;#UU<5ePt?Fy|*nCHyO_k7p-z#m~oH{=Bk
z_*uq@9{GvI@JT!>f<g~6uw1!YQPb4k48dDuEzd(&KKl?%`HS?~V*9gqdqia;KJcRx
zBlm!r%KT_dfB5?(p!vPchV~yTGmR5IEQEm^?k3V{QsBLZx0fZw0;!k1sZoRF_dQYX
z=q=ndgm=~CEyKL#{MehnJDf^hhmSO}@pD9@0j9LE(O^xu3snVk>gyyXj)?x!9>~FA
zQiX9>c#SkA@mzl4PkH%mGuO1Bk2SLQz`6`Nq3L5$SDaYg*dRL_OhQ}!ahyY5?vyJm
zgQF%P|Gvg70gYptJ_uG3I1b5gc_%#foBVWq38XMDWTi;d1`eKlY4Vg2aA|`af28`X
zX>1$!-2&dF5W`*0x7lFNXwmtREk$ACG1>>}+QS>E#`HO+_{rK@NdC@Jxej$&w~jDL
z;eOb12Ybg;qHT1<AS&&TE^(0jEaQyk052tT_4|tpZ5e3KXqZsMJy|$hEe&gY+(oXB
z1+1@bprPu{Eul)eHqHhO%xOzc&;vCHy!|~Vr9RDcWR2s>@@oAp&8Oy@xj92_ZupbB
zk&yjj&3tHSHc99a=mK_R|4Y5bons8Mub{{i3(BeWf_<PdQu>V}IR-LKMjICxD`i`S
z|MI@?7IxVu&q3)mGTJ8bYbnjZy}Yi7^dav0Mq{k$$j74IyorW;1Svt0)gSF%$j$C7
zC2%4`qt(xAQBRAJ{GQ&4l7C%A$FVKp^U|rFA8nu19E{6$c55m73Cs8%r6*Q%Eu2;1
z`lSm6YpYRF#>3GUd+*0{-I%Dxj+V8Xn>{=NBSMDZCYTAl;5C;?`Si>T*SEte<rodU
z_=_@9NJzsHZK)m&Br8i4NFDLf<bXB+>E{y==x|0L^K#5)4|#6Wr_2@Y;@`f(f*Ks$
zBd#`<7#|*1>ek#1nB%n9mM?SDY!VmlYpSn9o_LdV#^7OArs%VNKgd?}NDp@-13UUc
zbJywLe#C%Rw)RGH#!sI}4cA{}R#o$|?jLW}Q^KL#(;8;M)&<DK^qzMco8d)``8^=@
z7auqo_V+(o_bWUjq%Xyv2JfL`+Dpkd>1&>DIBGqFq57DGq*1GK%;X<Qn}6|#Oq9hD
zTD$ARk8NV2e(pb@^p;rLK=Sh{9}b)F6qj2*h#Hf@V$YT|9O^PdYZpDQoMb3aRuPZ@
z&5H>9BP-B|I4p;t8$4Q>0iMyu!A?16p*TxPV=tAqk@r3O1Yb4({$+Y&UTC9lU_p4h
z?!l$UE!l7B(R9BnqSWu_neOB^uFL>)lDf($dmZ|sN9ajI5cekELSQMzWbS5cJ|VwE
zj=oR8`8l`y<+YZj^gzEd%*5|(MXowB{h7$fY_HXj|NW=n5ohj2;a9sxrMU{4^pfPs
zp51Bmc|sx<RUx=V#Vium^a2NTgoHZQ9xmfLsvU>DfzN1Q1Yf@lft5barqWWwxc0I?
zcb|B6Uhxo={QXpc=I`Ow?{%d{`gcHR@-iVU8{Wj0H-g7m4d4Oxc`nTFUud$6L1sZ2
zqxSMM3XjT{S#{?=uo_0&(@cT0=(aCg4Z$~8eOG3I{Qnd@hVy@P#8CPxfj}yP|BwUH
zEH&4wvy}G#)Odzbe?#4nv;2XBxQgVKyOaBj;VqV_mG8YcYs1-Iv;mPjSDzu{Yj9_0
zE%(!m!?<0mCdZEok&oLW?TO`2m<>>hp!bVjjpCT4&Vnb3HZkjhJ&t%8qk=QUkG2_?
z!oSE7{?s_YJ=C9&I^-PLgl9^aDkW<EA%l0=@-4G@&wTZ3+97b9K)L(<*M)A6PRA0?
z?u=PupIr-e4L`!e{mot4-|yvE99?>D(#R!sXg}b~$+KNA0D12r8O6(gzCOZz1+3m4
z_a=T^i^J>5JfcYl)vSzY{P1_!HQ8<P!VS^9*90rYM1h&gygTHm_;&I!ujWyHh$ke6
zW+0#iD_TIUAffl@PUY%wCOGY&iTm}yjWAXmq0qTd*<*t_ZGK9;@b<-dI_sY2Jpbrv
zE)Vm%s^LjFUdA&apIwkg%At^V?bTuUtsmsNB(`nEwlCw%_d<_;pQY$QJ?2q5<6aj#
z#bv~o)socmYSLh0+Fj@ucMN^6d3;I6X2vsXVdYkg4NcC|G_yfhZD&DvA6|;GKK3j%
zvS*prdBc;ezg1~oIH30<Z#EiY1YbFY+_haC;A+Xa?=V(1wY;fyEnkX^_|^-%@y<Te
z_<cmP84k)=_8I%>cKCcj``hajQ+MBn+Zx(;ICDc3t>wE``PN7wOQ!h2D!kJXbmC-%
zS6)9<MC0eL%ci0J2eOky(=71n89#1Af(oNE(yp_mjD=X(K7Rj%G9$#fL7gQlZ2i@y
zn_t6YHmnz|NR9g4CtG`S3>7=r%vZAJ!jKrg^=C<qKLmUmsa2cvqrXhkcWf?7(o?He
z5CJvB{;wxd=zo&><VfVaIdC5Ti1-Z2Adwo&g^MeepzVQA1e1?F|4me?O`^bY&Bp%w
z-E7!Gl>n2abn(__$tTfvb$!%z8P+giPvTckF`L*uuzFHn!FI246z_4>=kyE){M<s6
zXrJ_v+&xs?hcFKKTmko+WA{NzU@u?W%#Xb%p+$2bVe8gCHp~$=WN9CG_`4fBr=DDx
z&n=d6bBI2zx-M_(?Hkk~IxIxbvbn2<C+vT1^RED~5_9m)XyM?dO3x>G0<+J@Pg)<X
zdpSnqMyZm<_Y$wo+`G!L44P&r47BE{{5EcX)RMIT`Ay{V;O_0Oqwb$?4!9|y6R!h(
z<L`#c&6b-&3*ZNjmnG}@3sTT^rNzfIz_FFbtTz;x!@VDwVSGTxG_%wj-X7=2=32uy
z<!E|6EN^?A<!3@riShox5NzS7fO*S#rH7m8b1ry9FCMYNeJ?H2KV=Es=FhEM(Z=V{
zbm`gV(N6*&Pt8xvqbOu#meJPIOkvjgkU`=<{0QwZ;xX;baVNT9?BJc215nR+I908t
zo@w%opbNzZimsE;-fozWq=Jfxg7w(k7*hv6757LDx+fBqb9(rZ3Ri=X0GxmV#DOLs
zvz;PN#`BWlPi^>*+mQpO%hF^?(;n*RPqg(6`v;FaDTn$v%iF1dZr7C;-XG>aG!8$U
zqNGWjkC9v)q?0W-A&r)YDz4P){F-To29MlNF)y(T@J-$=K+n?Tnxjd+XQ*8qZ6~VQ
zz$-a1$Q=do2we1?2iiiS9vT&Wb_syeIzr^#5B)o>F`?rYlNF!Wrw&r{5OZ9Zw52g0
z{QEjkLZw_{0bjZOk9mM^{5}!w6rD2%TW#C_sd#o;ILZlMtdvDP)%~^Oj3W9J2?#rK
zcz-JEKEP2f3Su{a4D703cw64B%BG17E=3j)RE7y0$?=ZL3AtYb3^$#}OU8hKIQ=&|
zyV>-}2pn|(`oIzzAm_`DpI>t<BH3@GsWtgLzx58WYr}j*_0arweslsE_I)Zt?4{se
z4qE?_Y%ldYEi!A)*(GcD4OLC^{676@oWP}0g`Su?U-zyHF)%PTJe*ir>X9z`_0y3h
z!NONXZAoCzTILM@<F`64lpM+~KX>XKZwp}1TV-PQ<8O}GH9%S>nz4$aGEdVaqaK<V
z5qC-Yby7Mw1bQlrT`OLIe{y+@OnRHPDgOl(ex>|zJ&U9<pMU+3K?3fUZ~Yi3zo(cu
z3aHKk72_Wl-0|nb&OlD5yu9T!D@l=Zr{{P7!i8;VZPlJw@R$`6ayDGxTTPR!XJ&ur
zoJ9cN@Ckl8ZU8r~fSl`WR|o$Nzm@>-zu!ut;uEsKgV%M(*xyL@D*$-A#F7Tp$rM<G
zk~0AG&m!r-Fr*cE>p8-4dc$~}1L@y_Tbc^^2sF$gYp?LnLqhec=HKDJsAu9k;x9u0
z{27vf3VHTNwg`ytfF*6D3_A{}ju)UGtVfPjUHQ*qxdcYs^Tb}@)8<io9d%k09eE3}
zvDb(&15+HR5uhD7FCgqqs2J;@KwGnrnTGvOFF(>-7yRJ6w&T6s5%@0ppzO%M>oA9R
zTEaKdlC-Nl{80kgELWYu%lv_U&b}!*fYu!v#r-YrBWBZm_+jd^^aHkpxI{e(oel0d
z#vA%K{cY=}l%6*ddrcgBW8ywGUGzT8SPC@AW$z}xsVl`zaMYp8OEZ4j%T-EdztoLZ
zlK7;<l1*N0wp&ZT-{qc%U&xJh7<|NJR&}=f#r-O$_N=Ax)wQtJNN&?*cl!$=w{DrQ
zUpWYI?ZPyQ!39k*{9iAF1hfh1=om`W#_BNU3?}(`=c{IYeO$MZTysq$<H?)_$;RRC
zb(cNYI{23TbaZ`II=p3bX=i&x#?YK7uw>jsx(g+DtWdg}D&g+}+s$TB>nkhfEx%qn
z<X`vpvp-FtFThi9!@ww+wyE+DhayD+2T~RM+UR@HA^{24?*VZORi8q5CCi{6ia>iM
zq7DnOs@Jt;M~CaT4U%<7tru4Bd?(@Ro9X=!y_@5%eY}LaOBBM=Nkxd_Azk4Mxf>VG
z`N{B|0@0N<koohs1nMwovv}g(ydp^IQS#_o%|L$X^ysjuZZo9Wl>4WB<#!oBpTvx)
zs=SdX=b&f<^_dpWhn1VTG?8JQqpIgBBNwOv#$s-+A3pf_9G-#mkzTy1iD#H)!kCkP
z%M?#K*i?5xGHF?Xo-nyA41Gr7*Fu;{;`Uws6G}QMnr_pr95gUreI$IO2cMp9A;UT|
zMe_cTQ;SE2wAJH&&*(u}81z)sX7#0>wWaRBPycwKCFsfl?n+T6vDfB8jNa%-Q8|l%
zjAB=(^TM@Gf;!B)$Uto)V~N17Y1IwS2Wx&Ly-9hGP(*9$;>8Qsn)0uTAy)lXU2iDk
z`p%;pbv8&Q=aZqUR{@g_{R(|<WZ5+LgXqd*QOxGH;!#~jlrNJx|9nU-r#cLOy}AX;
zsg-jV&&~<4@nhwrvb-6H=Q6FVd^u+}E<=h}U_QC5;$j$C(~?sCGq_CWPD{ZAZ=x$r
z&3RC!??mav5SCPF!`rRSvznm&$$GEo(;K5EUX`A%_uP>$Fc^Z;i3%@7Kc@t^dy$}v
zVuux>N9>A<S)vlj?2zoX#gmwGq;LPwBndX-*)x)gq}5elx-@_iS?A~GS^HJ_cfJs+
zJCtJ<dGKYF8DcGtycm@eP?mZjnfC34n~(`n>TW~LM|C4x#Bewpjyb*T!-+#izK={_
ze7qe;ZOC#J=I@v$(jzuy{pQO0cxsAo#(tY0ZPSq7EUxT7F_$6D-$m0rO=9$wx%oj_
zF`A#*ly>uZat6$*FD@)}sPZ*G!Jk58f{J4O#Sa?SCH>;emUQL#XX%F=N~a)6Gp<>E
zU*36n4L#2wNKsJ(%%8TPBu+?pXmQ7)R6!|mtonRTRS-#$=KV1Mf+ztFhO^p;ykwcW
zZ3s*!j6Q8yz)$LRl2FrOv{NA+=;Pzl+&jJyM^>J{=XC5!7BsHcu%x|YG82gx$;@0s
zP5YtRbq2aarAn8xbp{>hmo_T_jlqHiFYl$7hN!`dZ{%x*-h<6m&bnTrFPB8;v=|>j
zO&V3yb;PBmKMwr1Z7XCn{kIpuWJ}fBEr=aSWx^BBEWT5wv3hiw(%lryXf3w!D@tY*
zYB4JLJV@EHw^dtK^*}9BC8KJ(x0>jlEfh{yI(|N<F*l}o1SDMDPlf6vvSvQq&N;g`
zx134E*GU~}AaO;!`^JIw9pkQmaq%$IHvTk*FS6Ggd8^8Ydpl4=QrGGL)>89P&+{HM
z{g!3Chf5JBvK}lv8{!{hEgfkgxN*-?s~WP>qKg(grI?lXmOiJfTVNqojTo!d^a7v5
zwT^kSSDg3ivf^Hb`YdK5df`Uuo|#YVMX4)X^EpP#tS$X|tU?|AMy4&^ooR$>28I${
z4%{lev6jBh!1ut?zRc%ahHAvln}%P!eS=@>_q*5U^Ac0yKG+d9js@wmJTd1zevUf$
zC&X|zxRTc{lebNQ>F!@N5HU|}<Z?5U1gxnlEO|o}aB%Z5f4F7(W6dG*H$Ef@0sCx}
z&jfO%Mo&(-hMk{$`{C7AQ*Qdafl|1OlB@LVh5gNPsM}!E<x;ptTzpboZ2Y^gy#*q-
zwe8&{?*rRpr8K&xz)~>u;hbf!<D5OS>md^nn*OgX1h8ETi5J0Y;6dqb;}Pd~--$db
z7o^4>-g6(?py(gG`xuiHmyo2wrs&D>-spFz+@cmsF<of^Q)vMmb#~^S&zcqwSYw2v
zRdVcM5{$hD>erUW*`ap~R9u^<8x*_k=ON%T3N#vojTyMMf_C%mU%J<&4I3SA3aLK*
za`>F2H88q$lxG5Nao4AoIGIA$I)BFIlozNjz>LbWoubtrmolD)bHS51h7mLA0#y&|
zS5k16_vHy1SACgnR=xk!b+)k8I6UiH$!~@)S>w;OJgM`Ss57+ovX$t1?W+7WgyLiA
zKhFGCn=(Eccls0vyId#=f*L3CIY}l8i-7kjgJVlu)*>67jCf)S?GEukXv30w-&uE#
zsv^5_r4uwkOAV_<ZnTAbA`))^@Y<XRxD}k6Hh#&9hqTy?LjQixu9TtK^GHgjBJEN}
zepwZElPq9koeNUGP2<Ag!J+g)3*tDo$rn;Rm38}Gy;kja6yGE~H8l<K(sf`Ok27qA
zDdT;gOkOo2jtioRulK@wT?5^2io~&nb0}Qkd(<q*cwVd$Zk0v%`_F;tn$sd(Yo-*V
z_!(1dR#!mh*Ps`!<&4gC^}9P|O+)X#e>L+}bY0&Tdd@wv>DBV|aJ8WwMx>X0E<9&s
zS_7lL?Hgr}5fWb9w=%```xR@%_H{9+qO=GSyO&$Mk=9-sV!<N&aBbQexRfWL2BvV|
zx}tMTp1j*vhzOuyM<-y)dAOarZYjI86{(8-xqkwu>R<T*`be1NIY~b|IoIE<^VOP&
zaF1xOh}2a4dojMP-=NTEF0Mk)l|EdPA?~LxBG>BGA1AD7!xP{M_LIt4+5*9uM-@-n
z_fWZ&Z}#UDKK*8}ZTc*KJAuBOMVYPllwF1+qR(K?j04%2WnqKW%jftt>foOY?^kXv
z`S2@LAOrpobPFYMP*Ryw8Xw?N63L2bePdgz<idX!0QJEToXg55j_WWA*i$l_Xqfh4
z)s_Vbw%*Ph(h(5st@tyYJ~|OJY*w9C`6pE>Bz}ll@_Z|!y${2>xNeTF+ox~HurVdm
z$c$NFRX)>|<B^CJHn>z@I{;yv0S23(Q}YH?S;%lMg+F0*ZmR~%k}v-M*n8`!sG{$2
zR1rl=kQ9^>X=$Vfq>+^F?(Q4`B_$-JyFt2p2t~T2d*~cs=%IOc`22qBz3+PO{r}!t
zAJ$zAbGhg2efHUX_Bl7_bK~!=`gDEFE0;>^%rcRFllp9?IepLvKAZOu3pg%hV>^D)
zc?AT%KXxLT;&0vP)bUAfb65w=*7Ho!$&<^l==%&R0;QRP^)82B(OzEvc<!~BS1p8b
zIiTi8xRtxz`xa)q@vTr`D4$HR66(@b`MT&s=MOe63d_TND$KJwufa=t<#9d>n(+PY
z?|2_Dj<=Y61GA~<`zxmC8b;uA%MMvNzY=w!5+q-$Eb0JDVZHl<-BuF~r3UHamO6;?
zK91|KYz?_#rjyp9T~+6aMPPC1V<?TI_le@^*7~iFOrxl}POp!s9%T>fU<|?Ddei~D
zJe4(&iusMPU&um#y8gy++heCt{QeUeyvpbme1`#QO1YIN@!B>UE_waQdgxR`?a(-7
zT2KbQQ?gK;&lX3Wt07p8a10o+6KFNxRa9OyqU&r_o}$9r1qayCw2+;aO>eYWB;Wt}
zEOy_LtH8k>LK4#1m`HXrr7IO+pyOkaS{E@{FEEL1H#pmR7s4=i9DGC*!NGCp*-|9;
zQ2{M^%pf_ZtcIlS^RBHKA{OA&UXf2_TM%>^8%)hN5mw4BN6!cY%C^5yz5{`oRexU+
zBxFd8*i>Fs=D*EFU`-Ty^^-XGd~En~wS&{fXG#Zi$&TkbbS(_3U98$QVxjgXxj;uX
zCr0XpNqt;q4HRHI_kt7ilt<_90R*G|<dmB5fbh%gieEdK<1#?~JaoEePgOqmM5jn4
zH3oh7NpFvj#)i8M$!*6I4+EZh?nwxJ-(0MBm3uUY-U;|wM&`WNm9tUTxJE@rg8n?d
z>D#gz7M!6zBh{p1-2jKNTtU2(Xt3k6jC>l3Va8HVZ8fzFkN3T*TB8C_V5EIZ@X}FL
zI(?HO%#ye<jntLgveJ#3wJ$5N({*kR263Bv=>JqJXO8@Rd~p)Civ3OwuZVbt)QDPU
zX}P2JKnp7_HgVaOpX7H~_^Z-3jS!Gl-0~7*a`(2?5Bt7%DdvB1S_TvfGn%!|*C$hp
z>AHv!!P_qfjSt@P=$`>A9PpO47ddSU{V&K8MOQeANIs=Zz41`d$%dsm7p+^l>Fv*3
zNX&wLu;Q3sw36jT3#A>!AqH~HpTx}ebCBAwPI67~a7{qUd!YwKqK*sK{#`4t=sv_k
z$(*8bAfoL?e#=H-p^|?Bva<!bIu5R3ZiHMYQHwrW8U`mf!#l53*8SlhSx%rmRszGD
z!X<Y0aLX@0@$HJ%l0yf54_IW!Vx~{{yzlK?Y)sB-T8Pj0+WOor$k%2&`EiqI0N>U8
zlbA>n^~>c=P#m-w^5nJ8UPL@0VIINc2fOd79GTRduY!R+m{n$z|2S`79hgv9GJ(ip
zmN^W$S)y#UCku|vZ+5T?cYMo#H>U+sGMU)%J(VEA#-FcToVHGqBBXzRl7dEF@JhC&
zfa)X>&8B+lI%&tIzn7_hM-xnA3VKc2{nkStQ)5E6=Wd2va=lePzlY}~Gd7pmdc0}T
z2(#cx)>9G=l0VYf&=Co+{R#)krCM>YI#r7UcO_0KumOagVEC}fp)g4H$~EQ}o^Qa)
z(U;Sc?TVSaftzSaE&TPz0eQpMXn*W}xUCZqm~zRL2GnQxOo*hDiWdv)ytRWo@p?wp
zP<`4Qlc`JlA-5&EUCk^%P?JRYv31HUD$Sd=vjlGyy^(ZH=BwD0qS%yCStUu|_^@vh
zACH?X_BczEX+LZQm*9X}qbI&}t4uPL1PH}G505&%9NqaaOdA%4QKEV(=fjik`7e0$
zabM=Zc@RI$rlkC*hEm<>yyG3o{;-tubV+!so?H=e`?nuDrx~ed3mhRcN`_CL527HA
zKvoRp-%;G<T~ICq*7YC>%6f%{nA;bYDvukNO{^7hAbNj=6icU-fIplefPx#e3g3wc
zoX}14t@2OlNFHWeo&f^wK~<zHR%b?8z63<_C#fBV9uK*cFUYu_LdQoTgVS>)%~qY4
z;o<gQJRlFDnelnP7T9E&%zf%;_;7m<c_tKi4&yCZ0syJfb6FmF`w{L(;P|NyH#RBY
zV=yK-aQqPp08)+?K&vkg(@l{I_=6!3I|K!Jdr%!Ys=5tId!&tf|8be-KSdCgz_C(B
z7AQLAG{DnZv$nWg|4H8fMN)Fi4!m=DNKCkDKeIpFK0qc)1nl@mMoh0-Lv~V&%@u9f
zf`@9Mo`2LP*HF%298Kxi<9GWczQqa_(G|6M(UM9DRSMnSuNrXLh3b_%r_td+KA3G9
z=zj2wD1&FKXA#WngSi=KNL5z=E^5wj5b^fL2>M^i2a?<HD!O&tz4++4;p<(=^?Osl
zt%imywMF|^$AsM~ub_I}DhZ&^-D}m50TdFSMEBFFqDRAcI1p51aTYML<PGfSE92;L
z?TCNW$rG9DBN|U?J6WP+%cXB`zZZ`d@7{2&gCeqVV4yXI0ng}|sZY19LvqfanAu+9
zO7e3+kZYZ9fMf}$)NA*<^eMPEPSf>bJ}Si%><u->XX-DdWarVW2CsC&UP#Q6TKCcy
zTWP-ZAn=H$5BM<s^Oj6r?Rh^3uotaw+S;3*K*nIj`wS=v82A+)H+ml8gB41S5#(~K
zn(Qd-x+a|$TVBxov&!Q*o#^VD)VTRNydh`ehDA^okx(OWL&P+zLRwh(T5m>T<qaeA
z(R%&;G4!(l^9Qx-SnPKg+G^_akHlsolBu~SavP$g=872b;|9MAglX@fz0uJE>^6&0
z4Ot?2aac?%BOsmPGrw>(-%4@V9Q42oBm{optE!gfjurd5w+?8*t@E;e8NKq{TjAk|
zXYDBvhf?{0WrS7k?Yy)`=ek32u48zRBQC9)(uh@`_~#Zbe7!1Am(zBY%0Rw3$8p?`
z!N2KVr9o;L;G1hDJ_DS7_H75r@9C#2Gx*ZW2uR3HKIPQsVcM1B@F@8Y`5`xF>w1c6
zILh?vnK;Vt&E%)j=!@=VZrY01Wz=Ws@XVGs;@9|qMQm;DrS`^{^*pnBgc$`#co5%6
z*Nm4-2}KM#jaBQi$w)hv@>Poc-)&2YEh;^ZqDx3at%5R1UCBmd{?>uF&lV>Inl{Ix
z+TM9<u9x)4tvo6JQP3g*#`NcywetTnGTbTrY^fIWs?%IsDy-Lrzihzk=t#xnatBwQ
z5V7XA{jx_h;V-jo{o0G5xw9BMNXXjgYsE%JrtRjQ4Z)%^zvLRIX!oCy9#)~;>iWC0
zGWjV+T5vJ0*=l#lf)}-n#;hG8eRnEhZgugl8zW3o6~0rxU|)7n1?vv)PDq&h8A~<S
zY~$ei^OGHMt7_SrJ;dJH;r{dO#Z<iVZY}M>{xkR^K!8k;GM`lN^<%fxas%KKWbBKv
zefo6~L>@blwo+`{wm<vm@}%w&VP_-WU&_W?SZn*I#jB2z-z$(1o!bfY_Wox@BbMId
z8f{7=yj9hiqEsI1g`R;0YNJxBycDe!Ut(j%vq|xSCcK9=CRZu>SI1o(0@}KRulGba
z1H&x8sVhscs>464bw(iQU*=%?W<8<Fn{t5`cY}XDj%<40P^r}#LZwR7B>rrU?Ri9u
ziXz*}<GGx?ITLk^=1~c~iE)|_nI{P@iWVC95jaJ+KO4f%SX6(|$9<bd8zRKQr#O#o
z*T)%i6jD~C7^LzM+$bP-+=q3f25eeW&61t&zfwc)FE{K)O8AjH>f^}B4hOFhARW`(
zzcTInuY}yQsZ+P>zJL0zu*kdLNTX`M7V*g-Gb8-0R+WZcx{orHnPETh=iLJ}Ou4+`
zW+h>4X!-@(mXgF&0aCe_)Ayz!F_UeH-(SbfRihA;;<S<HeQpjnam8AdiC%ae^oLpX
z9X1!&(^OHC;;=qGO*zpZcRwQKla3laqUvlO--wd;iIvI5hA-lWz>VUOan1ruVg57?
z2B&Wu$@~;M7u+~Sp+xeS&YJ<Xi880mDbJ|+2I)VTLM)bN6@0X`8S&*USz^^|1!h0)
zR(v{{j32E%3Y~WoL^$F1`*O)YzecjaBH%?7v^-tDz!x`s4-Hr(_;BdI2~u=-Jj}?H
z7;WaykQ!L>yZs<ta4IY}Ito=4B!wH5P@H9Cr*;-WYw8{2pq!d@BU6+c?ELED)+6Ui
zRkPRTSta!P^1|7u`!!9$VV1xDIWb_VvGes<0;i3cF{E{xhkfHyRfn&*yA~*~pUdhq
z9ux|(c}8JRf*TK4c0s*oxIe{GU;q7*|I?RC6)HX7GCHrTH_TXfL&yKV8-fD?Op)Ox
z(xQ0Tp}hPN3d|Z#6Ln9B;ZMy^ve(fmoC}RxP0yCdIq1aK$Ht`drsNDrfQ>^!=?FD9
zA=!~kHdpAvu7ywK5YVpZpfc7-m%-<=|AG_y=SAD4PMxaexzLU6WJjF%Pnh%(YV3jX
zM%q%F2)2!;FTcFXkK!aYaa^9K?l)qENg96}eDv+ZT(&acP`{=C4w-n>?}FWyz10*A
zDLhE|61ghYBG<R%5d3S`fsw+<d@6~>njRG}27i$(=UMQ1trqtc6io1kqXgOtmesLN
zY4;%dOWHe6qgQe@qbrp<tt*y3ty|wEI`!^Y)k<DvAY>Y+T+jQ^>d?hLt66JLZ#}XC
zio-LN!c-yN8gdLf@U}ba9dIKvX!nJanC=C~cnziP76QxR-Fm?g3!r#BufUZ!eddd6
zKZbwOf)k(k@0nq_PESrB=!;~XUxPhn#bNBW1#WYY&7=X=)Hz|*ydZ15g~-Vlk%jNi
z{w(93J3>3LnlfLa*wj*kaWsV1hhe>tO^}E6oHpzLo;_@%;LZCn+f~iJAz>6p&=KKg
zVxuw?{<9QRL~MhGW?%uh;kT7nYlV@UiPPMqC7x+{TN4Evt04hMYwitr6uA~p!NZm)
zo!(I#KF-hhHN^NX%z2uw_q$LX)`i^tzp4F=!P^r$Zz~YEep?!SoiO>KG*lqwdgl7|
zNj>jts}fSJB(R-OW|bE4kc$$1s{?1Jotv5I2Jd3eaFMV1eHND2$ajQGjF8^D;=rYg
z{%D2l;Xetn9CAgkWa6CA<98Yd)!1jB$Y#h+-daLq9A6XCm`UK@+j*p-(XTPcw)pY}
z4iP*#`A2}iZg)xiiqes_3sBvES{eEbGT#`O6c*=|n(j6*vr;Q}8qd3&zNoApTdRts
zP2s>`L=_Vl!7dyS_>>n6OZ~3ktzBHQt~OEXU%%)r%w_aN@;>3CBj8|t?f@^pO`=9^
z1dpWgiX2auWb+Fp^1rIJDBb#yQQWQKUV8K*KD9VEc2{xs<qb#hZCGUXFGFl(F*{KB
zZK3{w7<C}M;|+pb*~RIqD-6BK$y-qEN8x)!{p)>!Sg+FqVxDRlsPEpzn6{5YW<|NP
z;fvdADaqGlduRY(mQn%+mMI0@|4lN`M@G!!4)V3P|IQ98fh@3p&MKoC^?V)OfPfXk
z|3`^3Jr>YnkQ!)lGKcz>6d&;X*o^{2fk8a_c8NsBw+`_}NarwvZ=vx&CGp=v-vUo7
zz01z9q6PjK!hRI;P~|`P4Cz&7$5VDI0iGer(|0our+2U|A^kf9li_fhFyP->$?(2>
zaAen!qAytg`6LeM=qfKzlSK#~_)(KRhCcKbfjmA{^Os06i8O$O<cI#{#`~dP<KGMc
zU-$o#@K1Jtp6tt7oRw@TGRchMXYSo+s>i9fdmrr&Said%j1BW1!;l^?1`@ZNWXj$c
z^g$-Lm31lj=ojQfWuPMC;I0kIpy_+&>fvkcb(vRPR7GwV5e2s?$x!z_uzdX{%QtGW
zSDp(BdWQB)$fLIPi}K}>53}~P+%j;&jsG#wxg0Y<w4x1csZ=hMlOAxJ&*jakl9!^#
zG{N?Z0V?n27JWg+`}2*H2G(>nMaJvvt1E9mDvGyy!iB~=2fMJ_$)#zXvpj#&&Qq79
z+5r+qU?tD68nEedL|VT*!q5jP;6=V?0J50jF><p5k@X3?8mz?zt=qQu6XT1Mi)Suj
zi5Umw!{^-ASmPr`VXV%)ZvY2<jSiR`-{8-k5tM9xkS!|-E4XTY!;IUmh9aV-f2@!&
zAEaV07~vn(&9?u>{BJ&v2w+GK1pq_h8$z@v5P*d1b(58(Csp8#8Ae(aohe*kwzG2;
z+RYYkG2~kcY!0wEWJL{phI;3B4t)ao0UMkytl80`bHWptH3cfhp|?x71H<Lwgagj3
zPOE?2jRl6P*8WDe!g$?R|9-OVY5gUeC+`1frbIf7po{kW?Ku=&vE7mN<lWb6tl&T@
zTuOFSY4X9Fi$Rko0elv1@Y@0iKj*8jUp-I`$>F+eJnPRpz*8AX4VEtgv@6CBmQms8
zO(25D0gtFqmqCF9C`PC<kDxUY2{rZe^5BudJyi=29kG**-MQ+qu$;N(erQ{H(4|&-
zf_73SQw2m-OGSu>XFp28ZVWs~JN_>#yIwLip&&BivxMYlE32y%>$QJblU_ZibEebD
z0Y@1hJ+y1lzNJ$>g3qGwYHktXenphJ1iv_tVuI%8pZY3do^WFS_~7HC=iO>=bq0p3
zm#DEM*46PO#u052Z|t5m?<5z=<_F!mwxGk=W#6fOfzYa#%F2EqAWTXjjlgybz7e!j
z_Lq5;8y3#V%u<c=6h7;J`%2HhBLV*_!j{jt)DR4epIgwP0c)^p-A!`K{qMS4J=UOI
zBc$T#s|kMQjjf6KrO6p(3+~i?_m)}Pv7K7$I^{C;-824@N#mN?_e8Q*UR9kdpNj}S
z6&>BV4h#e1_7MxX+9T0356;f{>&Re`8DIV*bP6NqbW0gKsOf4od=5Cu)HJZZeE9ww
z1+Wc%Z%z~QIcnk~2wkJ#=zQeM=WU4hXBnP`OXZ6^LMeha^HsHwQqOV3hn{t}^N4{f
zx{bQU8h_0Fwp#Pf%TkDir)OnhLpVEmyiC!g^{IFI?<^itZ12{{94_m+F<b7PGw*Kj
zDqfHXg4{<hUHet;z|d$ujY`bR;9{AzkL_AioJ^(#-+aZ?Xb4HN<s-)P3mJ2Ul@nPV
zq`zuCg07jt{=Ubh%m9|hFYu^7-aq$5kk1>>!C&aNgW(w#)kMP4#Phauu`P%|1HZ%B
z_p@j&py^INc<Au{c5-xly}Y`|P#S1ycWc&X-<Sz1X65=?o|7}S&P~m|Wzq1T4VQI*
zh;Tcb&XQ+SEo9qR#NI`=b8wIABt|A*Q(s@bh(Oe7B6x9^9vi=NZf0tjoq3SyEw!sw
zvZ`ww3ux$lqE?xC$>b_`@{n^f3+M+wev!Pw&oq83-6VtgkvYCY@)5mfa1lxZV3tL*
zWxkK%pg>!DjAA!#guW<VoT2$9a<muo)+YxVEP37@v|bzZYRvd}3<2o(Tftt%tn);~
z*UF{!*=vE{E;&Ya*>aFz%hwU^|EPOC7pk7i(j2EKJT_}PWvS}jTHjosb2!#jw1Xb6
z&BxA{5g$tx8O2cXUZo_SG2TCU7~?JXUUCp3DWYGKJw8sltH)|wd8Y>?kZ)ntS6yrB
zrV#Ncnb|y+n>ik@+frOKl&#yE!(RFcbPc@qn~w4$3vg^tQ=N!u>GO+2@(?|(!)r0H
z$9~h1MoD6cZ7jO*e1pey#=HUj)W12C6vpr?*odEJPsS}8V(Fw;#UT@>%7@+82`)Xm
zZ}b893N5oKt3ao$&4=5-#$cEKO6)3ZhV`jgQH7v4OrB@y>O^DgS#7oCN)66p)7J7L
z&K+OAY=gCC!fbI;B1P+c`6067>wztWM1`az@gKQQdwdbSt=BkjW_-5G1^kX-79$gV
z8frsiT?G{`>7b=K4z^4^P?~`-Y4U9CikHtm$^jtY6EMZ`ar__hXWXgsW$L6@S6AJ0
z!36{AC0&O9cHC6;fz52W=Eug8-l~j2qErGtn}4qsIWn*KpeC<KRiEe76)~iY7Y=e1
zbs3izl`%50j_%YB49Ef(e|mjhZDT=w*c4~7s>>AtA#uwqlI+)SG*jDp-grh`n}<$Q
z;xYmXE?b%5Z`0$)2GF%io3K0Q>$4Wb-Ly$)Y^~&sWLMPP*1_Rxd%q?*nB&a5r+#-(
z?3T`oCGa)E_v+9N4RJ8n%5y{PPafO3(h0s37)eCz&4af$;ZV;3XsavT((Rp?FmJ8H
zNOo#_3*DFLj3<apGTj0VmX=cl#X_Y89J>K@lS-TczBqVYvD6B$ZzqtoeKGI3pooCC
z3f&B&-CvLRUEHeR+%8XnqPnBdHbL?}HU10dHCyw;84jS>MZDA{t!d6w?YTrf(7Rr%
zAH9~m>7$PPtwL{e+uCf#*76R{_6ec6N;cE!+B&K4#w1E6MU_$jm3i|=FjoX_{nJgz
z#NJ*#UztAMIY^W?RyJ=;BGmNmqOY^uY|3k;5Mfzd!u2+rRuYI|cv9tw!khAHc|p{5
zm23uu<GZeNfBxK@Mod&6<ArzGRwcO-Zlu&$5GYy1#}n$KH;x1%Y%3L4O>ilH0=lEO
znv(t;^^12@XLiY#v(KIv<vvjubheQjF~2hRm+HVv%oWqSWRV-cx33YwaEx}?B}&oI
z3frl;kTlNI#q%D#vc(X@jiS(o3B&^KcY9--2rX#5xDlFjJ74lEO|LErH)vi9UR=39
zGwt>tsuFzX>F98AcJ1qB{!dirpWJcob*IPv?QHUj8Ek{cVGjRpF+{;*JH6VZp_h1_
ziCRQs?9dNF$KOy^?NeND(+pe%HqFg0{0;8B^;rT{jSZ!4ImIT$)xhOb+-SAunqt6n
zQhl5Oxp`AEnKKPL_14o9+wb_8+0rvOGD2JMH$4I{(5ItobWv{voG!MH5I7WI#BDCT
zk#!SRmkG_4Rw!6qn|N7>?bE6NXSb?T6<O&5h<W1=0WRPV|3Bf{%w|<dgXXbDS&BZp
zdHj-<Nzu#Yy!r;6;PM5wqZg>60f5Qi+6|=Vc~=>U;KfQbXte=k`<enTGDSmt3(7+(
z_aa2k=jd{=rPG7#!i0Q7w^JEWb-hCa58u`~Ujdy4F~g^u&O=#8jQ@8nz`Z70^`7H<
zxAYr*V2)aG(sy;-{}rFqzz<&Bk7R~R*_D*cleNLZc9to^PPw)2Y8v+E>jZAD4#jwu
z?zdGc#7*6pTCowlH;4?*S>}9Z{6FF8>|Uqu8vngapMU9-E#{alwwy){nW2Hq#OscE
zylv`+6)l<+v>-l{PF|@fTl+8CPg|-==2GqJhN(7hw?PzSwaSP#jbnTK7Ku;J<`m&t
zyiU5YxD|r#6ZCpqsXt0~bNfaLe}vR$-UybdcS=Xi+Hx_j_vcDYu=^L~N(nj}ToXZS
zR`f%ke*F3oaC%U}{iC_X3_)<GBvR<*9U#)}*N4f2u{b^+9v9dMGP`UvU3H1|4hmN5
zbSAwe@Ie+FuGKVbR(x}k-P+<#;o9CFa@l?DY_RSF26zfAn9x>UFNk}q0vryk-nw;l
zizDo}J6I$=O^_~N=*qj-TopD$&3b<@E!=Wl4+uJ$?`^il2(u?U#eM6Rt-GwKlY{do
z17`+Me%v`70U`{e89(e=dEnVtf3g)@Q|-Me1{khX^2@DoBH~@iq>K`2fCwB?{GsOV
zxK!wD9K5OcX8LazV-z{NG?6?lb*>OWzB__EOgVLkwr19ngXD*E(Q&U)9i{hb?@C?H
z8ao=aCYg-T?xSHLdI#9O8Aa1C`gth~^g?#Ns-?5jBWMY7|F2E21>tjV+A!G!-S|eo
z<yPL3$(q+b+6Hwi&o8G&jEafiq>*Vl&rD7_ERc{7kAb%bta1J&PLh9V>Ep8$k9y6}
z%&LZ+^u~REp>Yu6d{Wc4%G$8MNa%}zVap|HupKXfNxch(O}U#6)<XNOi?@>^+b0s0
z_`YoFc80E};P*}T#1<>kYD~LDfYT;g+ggnw7J56`6U8S@$^2Ju6V)rG2@M#xVf*K1
z+#EZ`(5^I<mp$WSKMQH;zA$eJEh)ldXlaX0P{Z(h+(3(xxxY<0EV+vPQGk)$2zL8o
zV6a$oF~;^8a*?|FfWl0q;w|28t**7=IcB26n~YojzQ%q266G)hmx18V!uO6Vz&HT)
zQWT=wkd9i!%J`F0`R>ytG{lD`C-?|?lTZ3}3R!cQ#z6u6tB@nSQ&GqrA%AT@)9DWB
zS*iSlY0!*#b~P%3xV^#gyS(L$TJqTX4Z{)i`&K=kD~@L0vPG;2x?PnWxw{GhZ=3lh
zuI`71-hrbgMg2hYAAlOyFHIgSO<(9++)q87>uiK>_wB=HGy4|7T-F;`<N2~dnBgbh
ztqQqHLxaQbXnVZ$^oycH*NmS%yV`TVo;WqNP3wgjlXKpllAD<Yt?rR@?Wm-T$x7xz
zEhiEa^m2d|-^O3+B@?@ZXw9n1f4>wnw7wH|()HfWD}~sKQ66T*r$4`c@-6!9BRG1I
zGnM8ND)%9IkMsSkR2%Fx1AZsRTU!ir^(!bEt6{ypX%jf#YjIjy#1X!94@SVN#>bSw
zdpp+%xUlDT&j=Z_+&!j`z>5-??(jBqP5d7X-?NUzm1~CuaF37h)mbK#KuuALtiCHn
zg%xxgdwn3}Xn61809ng0XeH1B!Od!WR^YcFqMAP2oXjxWf3Tz-aTz<Ydr|K*OZ(2h
zM|q6XUvfnpxJhoSGMOM!`4goA*jVQl8>T68w4tU@Qw~CX#zw~#h%!q{b^Kc<f!u<6
zYcDUaFV3oO^}cMi@(^<D#1D9C#Q@rwY&$cGw~QAo>AqfRZ!~Q9Pi<ONpOHbiC@y0A
zmuml5_3CblOn^wCPEsrx-+N&<=goC=c>`8R4+0vj_>nRYkS)<h&*zKj9g@(sHe1W~
za~DXDF*nI6|CI-&s!Y6ccJx3bodyr~r<z^b<J7_^IyHuM4&b&r1H+HGtm!HQd5~ls
zG;i7(FLsTNt|wlmNtdc_HUUP;((^o*bl1kBfR2_<a$Y<2ZLR_#!8$W5tD;<Fq++DI
zdmW~6&USXX8+hs$fv<N|mt_(kSkjkP*?l+fEtP&nF4nX3=}#581n5WAYdxlg3XxK2
z^{=oGGyXvpaY4^7fKcq{@v|DSACDkCYl8d7<dWV*#6$}3G^Wp3iRy<oKgg#`m+R|l
z8ctY*L!@$*Bch_ZpN|wz_Rn4>H(e%gY?$RMYb|N|T@4ofjSH*}!vj!<K)65xAJ}FD
z__=ScQY&7(IJct*A$i<*YGg>^4WAs&<s0DwX_<e+Bm540W6k#(0>UNIGSTD$#k@Y&
z7p)#{HJs#Zt!-Uy<(~zlDfMx)0Qy#vIR*kbjs2$Nrs4c)tGYNz+IWI#SAGZ6a{d@y
zJ>7AJSee>5$%=7~>82@e1A(4f{zUDf8OJeeE}Hx<6r+iSo58`oiNo!$ax5Q`Bivi;
ztgL`{+Vq+Jj4YqZUbzeHtLl`3mKB%(Q%=EdQDeF#gBvMF13oQ)>UVx70k9+>B*mqw
z<MU;)EW3H(DNuVgEe0R4kz{Ev)4zX5segw3$kgn0#e}c)Rz0ygi~zhKi>F)m&4(Fv
zDXYyDv!-01N$X6VjNIML&CR{t-6g9VKUz)D=6-8xnYGa|;3S!_&R@vv`!zi|Io*c1
z(^+gycR8t9Tch^5T_n>hOJB5GY$dyW0#X^ruS+a3@H?4ITd-|afGK8L=ck4K)(AW}
zIpZ%=W=Uo2rSL_NT>^NOYQ`i{MiCC=<eH8uoz4e(Hc8X}-~}C?>%?9XPs#*|RJg!@
zPuqCnc;L|WMhpNBvTiv`g>wMnf*-_rZo)yD^o>F$*F4zk)s9wSd_|O|SCpxdy}NmH
z`N46j!~L4+-y{DV$U(+%U(r!^_T718LRfLN2h<NnQPHZbsyj13zPL0GV&{IVl{Ej)
z_vVy5b~H<=#8kQO@SmYdUp}-G9!2i!_l;yRH1emERNt`paHb&p%^g?|-af6a&dtYO
z9z9SS*PYptz6^r!|Dn_x1`-C21#w>#QK4(HD!M0&?TrT`UW=3e)}97v=SMs6_T~TF
z=?l&Nc85&u)Ypd-vx;YcZW|H}ybppb3@*kg?vBU8E8356sx(#AwYAlhMn8Kr<+j>c
zX8CzLi?YO*E;VIBP3n@8t5}-k`1v^&7G^$su;dEyH{bTIWbiC)d!78K?}SfFNlgQr
zEFA2TQ_?;&uKUUWyd8`<yv+)@5sO87X|Uj5(*UlXGksI7dS~RxGF3-;>iuRvyPA@V
zMuDSWz5)3&Xhz1tL3w%P`8j|o@EbrFK>Ax-2Jk>rGDEVdQdykCOwB!XZM9=zKQGsT
zQW;PhMW#x$@$`hwGPzT*+SFIK{)p09O!g<JqF({Hs9}M)w^WbdPU*`HS5KMXMp)(>
z&6E8N<LM)7M&#heV^qo@?R>+8*?*o%Pq|k>B0VVZBa5ED9F!kPfq>JBP((2GT?Ykx
z$F`j3^2jwgD|0jXg}kJghOCc;ORFxUQoor1M_)c3Z7|tZW#13Np^uMH-6H|9+?p{N
z5}^TFlI*~hq>1aLZMgT;sq|j$z)22Z8R>6S`tt=ih7^8aBiv#;sD7og@jrQtJM#jt
zy8BrXZnjSz-+4w!=I`xWvXh*?=9l?L%tmtBO2$lDr%bE0XXWrymbhUFygt@-P*0m|
z8iV>`zS78qkn$1AZyLZ*u_&I_o1k8-fnJ1|*n8)+lzn2+nyJSG(dOz?>22>@CTAvR
z`AI;n$tcK5D;Sesk;Hx4Z0PYd{dpPs(mQ`GH$a`~cHT^2*r<owqx2Q(N5dLG5>jbG
z+yh@O$0K;(y!au*H?}lBsXX$oZSsEKx`={gJ9`3Hi2NbBwlJt_;i6~fWi*)&u}iWZ
zz!XS@ZJHNENaiv{kZmo8p|S!b67>h>=3RdvB@b-}4}3PMcZ$`hPP<OKOuJ0I>~b9K
zrlCMKUb}3{x^7T<WQs22!&hL30l-Hgscsua>WAbxVfN@3QNLVqv7Uc@WC7$hcvWQD
z=uqHP)|i?v{_p=-9RMd?Ua$hsBClGWsXyS0a?G^8%-PK8f`E|Sa<kPG&YAHQZ!%|A
zQT~e#s}sT7j>kD@zIa~|hcyQagQU=!(B|ONCeFNoCGjdjU~{w&4yh+53i5#qbd2zz
zM~^*6Xu}A`wuYl$_~LgRTmCsY1z9dLKfm|{q>$+7-xHxANl33Oohcy3e<4pWkc&Pt
zj>!7fK)Fo!*fT0Kt5WkhARo3l(o{YNSUbx+O7Ej+1r?V9o<aS;W&&+}{r?zKeKbsk
z^w8P~(nS(=Z=QZW$IYr1`JT$>fhT6j`P-p`I!*{$b!vA~$8gHxSY<HsO^-58CQ>s%
z<Pj7fD{MOe3*|keryMpEh5x)O$KQ7mP0C(iGL@Ae6xB%rMm7@42SW>L9&ss@5YqHx
z;QXLOABj&_P_Rjmz#UQiO8qbHAvr{EKAreAGeMK0|3!c3M%JTwaXMKOGpA9}szzgu
zMyk@xwn|IKjRrwmOgF1l%WU4G<1{<`l?uD+HbmnIap==3baWEpu-8%qrz1rxIH>MG
zUd>|5=Ie8RiLXHj-o2~e#xc_Gz5}Orm4`*8@AiiiKJQwU?WDN57@u4I&IhZ&w!?RU
zWD1aV$5fj>E_<<>G=u6?s!560R1z>GDIE8&UdA3DhAo2+|J{=5p|Rfs@)Xvv!_@W`
zJR=wRqV28j?k(g0QQSeA!3|T^H>by#vN9eZuFfZ79|zXQ+|V`0S5jfCU86ZO3zGwC
z?rzgwRlM49njF>zPYlK)8WJ)U74bsX{xZy7*7=0fZh1jF!M2=gpH?l6bbm*O+Sgsx
zTh8oNe%c*R*Z4cv4Q6z~TV2H;);RAUx|%)D88lVWJ#MNd4>gM)<@hkGo*WzV9<Qeh
zpfJym5{+Rz+5VVd|GkNs8BL=v&d%ogN&^v8o_|*K$P#E}*8Yy>1m2L>#p_R3f2v^{
z6Ua6V#w>qlsADOet!Qf>%UcoN^lY26XtMOlbvt5Nqg6_Crb5RV#N|C{%>CX5W~pIj
zulz;VJAAM^$G^L%VD%)~>gdRcef8oZ0+XgJcA~n|NTWWz-T9EA-qR3NW-ekHaOx9@
zxPaz-nI5oDvSIEEiwch#cyFKbrd)rEKQUYw|Ev6BhAjT~zJ29+W_-0ilx*H|+rg#=
z-ZurK#@;+~Wf?&PRrDYtY`{;U!}Ye5C3@@*U1N(%puq?<rt;x+|3~*LGVN8ibhIj;
zy%R9`G1aQyKEK1I%Qv^6=^jl)7w5AZqX}8-uW6HY#qjZt(tJZffuBf8G@kx9&#a&;
zT;k}6{jE|hJ$J5zLQ9~YuzCzFZs^lcEn-$ei~N6`3ZZ7X-YuQwyMsjGPjl8?g7Uk%
zF14&e|11p0!{kdYbmr$O{=M*c>eOa$=U|{Wb#f0KNtadGKwq^~(luX9QnfjP@H*2x
zPR%K#=iw2c11`D`N^)Z10DI0(f9mJ_KGcRFhrl4P15m`dt*&|%8;b&N;?I<fl(TP$
z3l$Oht)RboC&2Nm8;N1gvBp;ULeq>jvqj(fF^fW7cb<lBRXaP^ob1x2>9@}230pRZ
zTnRyXwum;s)UGohK$qyQW)h)&TVreL+~yPrMB|0PlS-1UT@I7npw$Zuet7=n6@mBO
zA)d?2VL^RzCOq`9-K_vH`r#94&!;FE09$8>9}2mmSDuoGm{oJ=zY8PUsxR4lky`yB
zRfwNXRZ)lRMJnWj*!wUd8Uxa7_(H8r$_Trdh>3Y7lygro)r$oF5_6<M`n~(wAr1Q)
zKQ^X$i&gFWPm~1cC)c&^A@ZZ{3h(j0yJ)YUt}K=B48IJ|>6&H6NVRLGRd^THXRTe!
z79cqAtjuU%_{X$TrdwXmile8n2Y+ceGoNd%s8X%;d%6BWW}7`7w$kVS;-PDEhNWZY
zZ{`y4Tm&|1DXtXyC*O4tLjw#z@a7gumzr=2GeYz+8`^F0eeP5{x4-sl82oPr%ws1H
zH0xivY0Geq$B|JJbeY!imnD?Kbld8Gx$T<8*5!@2h$*jRO>H{9DlCrOu`_uBcUohO
z{8W<1oI#Eo&tuUg8NPagcIqDDmh%=ETp>4$ceC49oo6WlUmbva$&&5ir(Z7(ffNDE
z)r`Z3jIl<q3G$YoX>Gq?MOHMMp1<Do`(<I1{8+RIYclkGombk~qC`)RTe*wf>C?BV
zdF=61rGvC2w+hfr!4Dbm&vRr<B`0qRLz&3y=FU1LPA$JlQ-&$__6}9p9wfdZd2;+K
zO5;q+!21h0s&l2%+Wd;NB&=o}e<z#4dmFZ}!MD{~M2?!~G*e4WQ)K*&p1aIEtO=_@
zL76<p;fh%YepFbxGvw-}ey3jHVy7t*(#f@?<<7z|<)t#wPa`a%ypOd=%m?LE#7vK3
zwodm>mXb+p>D(o3-q;C4U0T}GK2zAd%ZP{|h>?E7j7JxTCE$=>W7B*R__pfMnAI$~
zTn<kvob&Z!bVW|jy@+86V0-Js-d`>HqLjAwRB@@K(q`T3LC2PoJ{hcQlR0>#Q-&m8
zJKO+qG)z|(-|XmgUr1wNX$=z8OKVebKl;AypNN4*O`i^^Rf=-Bd17L0VlPD-&Fr){
zQsTp?l7UjRhY(GSP#MN*_|-yN;O1~sZppwt#cU3CzJ(s#$<4Om*RwDy5dykt=6_p9
zbx;$1OI`|A+_1IqtGE*4_pgH6emb9#_lBRfZUwM%m6ZobXeHB@KsyC%4AU`KIC=O&
zm5)iUrMl^!S&s-*Bu~jXv?F*UZi4`W7Q<E{Rl_09tG5IBmoWFvEN&P^RHx872oxwa
z-jT4uAcc0o0-o9(cX7kV^*5Ss_LnbOj4CPh-{Wr8pH93B6K9{b8&;~Ce7kZ_S=og&
zGFYz`9jG6lL)SDxdNkjyv|bi+%Ov3kY(0Is!#~|bl$@G4!UvyVFVjUa+yZfX!T7HD
z|1`}tO<t$jN%qaW^J(hMQQOg|u+gIJ#{*1M+^!a_9IK<=?poC8#VN2TC1vJ=$Wt|`
zoqH2WW8E0o7NwRpwhSR(Spf~~wyhFeWj~tzQN!d>GWM-3F)p!#hcmnkQAy8)AGriI
zdGnqKL&E>>E`#=Uf;nu=N=zQeIeF#yCx{yLNk`l7X&G&Rd_wH1*aP&z3qhL_u|sWn
zBrJ+Ktd+C`KX?b$Ov1Gb^-HFk#)>U=9t)@DFsne0+*mx|FUO!_1`Te(_T(j5aC@Sz
z9?ZZhEi&?k5<7F*kFRkLGl4MMPhIn;D@rPmSLy#4dGaTacfjjue{#V!cI8%0>{L_5
ztWol>y!K<}@A5<aBl3~>nBt{9V0HW40t&J?_qN8;U(2H2%4wA6W6`rBQS5(d3)a_(
z;}Qt<qzl`@6p8Iugj{e!D?1=KIq{;dk$Mf^8jcV5I2{79S5*zesm7<9b~n?Xx#uI2
zf@Qb;hQj|kku>oUA8#{MB(yPy8ErE&M7`p^odO@0Olzr+wAe4!(3jN212l`}Djdbd
zt0~sjVIh9k!w-k+ACaf#4DsDiE65D>4V1ldgi67QCe01J6_-{ji>{BiVV_-<wo^BD
zV1=tmE@w3gMdwWtWh$&K1=q&@AL)tS0VjecY~^+H@f>4!gUcI-X$X2uxmZdgpRx?;
zyF;no;e9{h*O1KTmVLbc@hc4wpvW3(rWvB79+8L0Pl*~h<g{C)F18(yDAD%N40&SS
zg50xt)zf~ujZPzGc3#sKkYaEccR3v;cVSbvo<?I0z;sVB5{vrI`*p9tdsVA>wWpXg
zAIMZlQ#;F3tr?km<rG7I{P+<nE7QkplaT{w#-7SVxD+nZlO6nGXiBQ8hOXB_juSpv
zn=S0fz}c|~MtS@i6%Uq75D61RXzj-fqO5?ZWpuPxkBMCE1JQ`YoK8&g8`cO}K8-Q%
z33X|l`%=%SPWv<~MnU4Oxa_3CDZ|B~)mC?fM)ONYpHKEO#$O_MS-5Fn#%|LQzGfv_
z4&ldDFZtV@c*m8~NQhq(r@B`aw-^42f>#OfpkF1hI*m1@RZlq$?N-vb6ir;xuwJoH
zRCts;wZRt=rmPGGoK0-J!RJ~ismB@7L)_BeDqIe*#z^ZcQ=?x9IkIG@wK*LsLp~Dt
zjoy0ge8U&Pp<G4-ymN}^O6l(p-udV3F9)Y*G&k~w&--YzwFFXY8wzT91r**9z0-IK
zQ<9|85=Lzm1B6`wmAqsT1qkQlKVlELY{}$Mk=@XSZH&I-8ZT_0WX0|3E+FO}dA9R=
zl3e$Y2z3ew+q8&rgs>QpP2!liM$(x=gIy0(=@X>zGYa7%PaH%#6ai}_EMioJi!2uq
zj}g6EAQ}7ZkfTX1@0rnth7Ec8SQy9)-2iVVL&m-q_!1a9E*8>g?V-kATq|Bz<Xixt
zn|DBd3!i`p^Dz<-0YlzM`v1Z#aBBzruR{m-5QwvS6hCXeM@3c!C;{6XJpSJi0oGlx
z&Rq>r9^*bjUY?52(}rK>WTH+Tkqd)6jDdg@xE5$10rh=8m+@r4(Zy$y^~k#&$OUy^
z2PkDc@Hx>>$%5>FG6?t*Cqo(80gMC1;ybW)9rfead4QY?<*e=10f@sAXfF{eaCZhM
zU#PSQCdvZ>uxM?PzfX~H@_;FdR!0B(k{3W^8Ef<jGTL)Y1^S#n+t6@7B=?<sJ?oE*
z0l@$z&j<hcs{)_OOaYA#a0rlJ7{BqN&;cQI8kP6Mi0lDCjxB9B{V$-M72ec3NHh%<
zfxYe-B-+tHWr&!y87?srPP8cSMTQ1fY8gQH8>cwV!zk^5KJBLy4Q79XFVq}NF_CEQ
z0fU?26vI>oKBddBRv(C`3=mto2zB*&8sIBC25&z`j<Qi60JMK~%p~B6)4uz|Rs=~7
z5Fqwob4w9M;Ik-R1UN|nh4Lc?@P#4%<C|{)x~Rjrz)=7IP7MHnMm+;xGc@>$Mr#Z+
z63t3ra7H6o%+dhEQPpvL$3()B1~Md6`FP){9Ra53Ajv^Pj&hkB=(7PfP_efRx+&(V
zeu|vnb6{|L$=OeffX_VjXHMUca2SwZR8gEz6@WOCSM2n^lm6dH|F5L~SJMCgsNSg>
zh2{QtEx><O{eM;cf9?B!?fZY7y8k+L9sl*@{~NyjH+=hV%>MtSn0@vO&7QqqD*P#P
zfD{mV3npx%Kco$SHRqbk=4PuXpOe-svqK=Y;NOD>dWh9|fSdrgmWIcUk-kGUH5Vp1
zkSaOU%mH2*0z~|@z$&)+ZvXe;<KyG8v7eLHdiwgoSGK_>mGeLs@&vaJT}%W0X=+T^
zH_Y2|mrPm%wd=#eHM6#L+IHNji;<Z6rC!gf9z*E9vyBoWGY*c(@@G9Qs~z@aTh=zq
z_5=QFw`r10utHU3)~F@cvw%tKu3tC;DZlkeq4>5r+c*zHkOVRxIXQ#UQTtuQWJX5i
zpU&1}IXO8wk_Qdh-ZL{B^@cqCXUK{HN9R^LMMGv)bg6;FRzuF9W~7_@)X`{Eb6(F&
zBJ<0IEq;Ff?(S{^jG$Rt^MkXa29@{3K-woGYgOC=nL6nZ0a7%6;nofFiHV72e)lac
zr@Vju$YtKz8W|a>sEiK|Mko|^PO|uYv;XaUn8ExtjO8H>qXHy7eB)zd$T1~mD_W;I
z!NCp?c4p=>2;_^ctz7PCk{s=q)&bT6ol0DY1!h)`>;r`ffNY|{M(zB*ddVan{u&i1
zva<5D{q6$;Ls4z5tE;POnR*M0+lnMbd+#$hDo@4FPC1+p4Jm=C>6S2i29}dtJNCN?
z2|>vD!E|1}e96GTFzAT`u`o%|X+niqFzw_xJTyQ-Hc$f~$;!%Z$|edT$&qk!v8JS?
zG&?(cc6K&CJ`Pk^7+1039RCI$H4SJ*h0x82k5W8L8c_ab5fIj#q1@;SZzYH3-ra0P
zQGghU!hxTb=H|_<ts{a=Y)kv29)Kp#A`Xx=p<G8Y7yU}Vp`t<NT5*XWr0}%uS|Oc3
z{^w8U%j1pFQKc_YK2PFw?%5$0FcK4NB>i#c07Akhqe%9uG~Z8IWE@44pY#a1@0K;7
zqKGIcD1gD&3kz=~lm;u*N~fuX=4F7nE6WRSdzb`FWLq_-jY#v*zjsB7UY?34zXJ*t
z(v92tKCrQU-TF|`<J2M)fUqUDDn&!`l_-#Iv}o;TH!$F7M`VPY&QvtZ98R}ON=R&M
zZgO*T0{}S`4}L4gmP@(7gn@=26X1m#$c8`~vB%;z={I@JZ^P?d4G{3MAmO{Ui=#Cs
zCnqyAGvK^ByiimRuIu&29~8iv*h_Bphnyr8vi_sSmMH*aWko)=_8e2zXEV9Cw>Kgp
z0^rKfQ1p124R77-k%PnEQ^+k@{{tTQHc24GDwWT%qZ3TjejLBn6B*jIdUJDgaBvV5
z^mKZ}*$a;8(hv@esYTiZ^gzyHfFw|+24^W3z4Q<yE3*h4ON)z(dwYAUsZDNg|57gE
zBK>he;tqe);K2g10DGC(Jv8(N8tPkbdaGxj6$+mnk}pnbQ24=HlaiAB{r&6f>t|=R
z!g2=9IS(w)|2WNC{07&P@u@#YiXIgptZVs(gN9LN*8N8@QJ$WPLwX(njVp?ZNXW^}
z+uH2wwD*UFS$&MAxPgSNEwyba#sg6S)zDL88}VDSOdTf63Y?%Y79#xSa?WND$GNVq
zZfJ1Ol8ba<bnlbn7Eoy69toPlLc+@i>RHy1^>-B|ljkFTz`ytrdwfo-;-aE|@?{fs
zM;J|?fd#?8umAVHIyxjv2jT&;XHl0_QK6HQ^B@jH*FC}+AaKIv*;!E$1J=1`_52Rv
zFeAPE(G(66P988Jx=Pvc0^q^T4ZnL29C-50uty}B0MYB$I?Bpp<G_noE3>9y$rS6=
z^ZOd7{yYNWfaVojuF^(|;ByjyRheY!j!Xai5yjbY3Jfw6y7L64LR(u~Ozg=?sc39p
zZEbC!KuQH=W3B_RW)Mcfga%|;zabO+ms!%~1_lPr*Y-GYr7tU(JyGO@7(qa}uAZJ=
zxdq`W3`Vg`y-WxR`TCX;6$y?q<q>2n;J8$<q_SmR%=?XzQKIi@?s%bMVSc`vx_V?p
z#IjZp#b@drpiQ1NCDB8h7-XAbHsYpIMbO3ys36MkW_{kF=kMS3jg7k6+QGrW|K~;)
z`HV~ecEBN9tN7&5anJ34q4;!o`1njrOlW9mW*o_*mVaw7&==BHK&V7dsUGZx62M@t
zd_tb;D=lzu>8M*Vim<!urQDpH>gsAhu6{_GRB0Xt=!)C*$g%xrn*tzrAHUKA`nmZH
zlgIhCYrWsC1`eELrVjQu6#wYxsH>~%LGA)CulU<q6eipUQJ=u6D(Rm;n8EKr&35)c
z)$!Tcy6FS?Y3@hv)A(FynV4Y58v|==YmD(2!g3-LM0?~|ke>8s`T@vn_VZHYS`5iv
zHmlzLB5Vb8au4$(6L6P%Pee>i?BV7%G%^Bn<zJYsap!z%`T`OXElP>?K+6Qc&YfrE
z=hL{@l|4w_vG3i<_wU~)CMKGjo2#nWgG5)n)v2loH(U%4$%Qm1nvn3m3Zq^efXW3@
z63KmMI>EJ>mxH05A$lW>X_=XY^kJ7q7=FFR$@@Use%5zWllp;^i2zRa@$#A#6gs##
z3;{t3cQe5MQM1bW`a*(&rJw1so;_*nmN-7ghEp~1f5%2jn>1yI4cy2#>5p}t_T4ER
z&Q6u@I`zwnb{5>{fW1#iO+6|V#p9mBHUT8``*Tcy5?>#UpdT)R6A}~UW%6%RYygFB
zvebr8r||CGJ5^QHQv^cx9bUliuL3FPOFF=AS>op_$eHel#9yvJG#>0#iAw?#P5oZ(
zW;NVmIIVAR(AM5QBPHd}^t8tp*)zIFo>9VamB<>t=ZDFUDq2Ix_t;78?yvp8o+C5u
zxARA9Jtih5n3$MHrGIeeK+7O1)%SrINYNA!{W=X5^Ygh~mH3Zj2_A`?nwpxM(*j}z
zcp@Chj#4L)wppd>7;vK?Ow5Ow#X&!u0PA{iu`W6R_OrL5<zPF8`fbcF;HRc0)=NFR
z%eZRR_QDS14+7T{XXUA=Cjg1Eat-wY20ArVv?zR-)i8=L(U(_O8v}__Qc@eve7-(D
zJv=JHPySO0_`vB7=!c_VfThE`jBke=1R*^aeTo@h5Q~5=O-oCQjC_HxAT+KFxk*Qb
ziuwM)r9u*5@BQNpZ=BoGKS56cwREro!ft?iAFubVudf60k)2J|q#J2Lc(C`Z-+KR$
zT)nZ9?SX93j}%)&eAQP{9RN!210v;pxdDs^00Wp8K&$;nW$&TKlRbgrGscUiJq$?&
z)pHBv-f|Mc;L1Or*uJ*{^5I!<ytz2KxVShzcHV@+04Y_lOH9>ag;=;O{Cm*W7h+$5
zeS&~};G_EepkL5OgkF=7cpWV8nOCA27~nK50#2wijabJ6j3Fe9(;5u<f{n!%z+9f&
z7?@<JX@36vZ+x6OM%tC1?4*-mUKg*_ejHE?sgfbV$Yve*D3BAR5UHreKaktm?<gD)
zBEVjzq@(~s6fYBGK^VLs1gz0D{iHHPO5Th)ir_K%<}mpc42C1Ly#h)Z@jaiph68Gh
zfQYERp<!fr7~pxq635hrt_}^f|Lf}Bay5d@<D~J<re?NOy~GMA;8wg}UjY#!py1t!
zqP)Dk-QC@l6(hkCHgO(rPsQ&<FN~19)KUL(xfH?HT(fsBC7d;DTQ7JI2|3jiz8W2O
zfV?Cl^SQh6GOrBDp%3r!r&yn>FJseW@<*VCzq@*jTt+L$Th2nTb=TC^n$~F#nb!by
z_Z4>}rX1H6LTf7^yK6+Ipce<=6XxZa8XA72jU~Yf21p{9#kbB4AkiC-_4ok^Zv5o}
z#QUucX5p(}XASL>(^JaB!s#a?o;QsE?aG^FF1Ca@M;L7_Et67GluIVfYe)h>^AM_M
zW^RB3Y$#6mKyf1!-4pVwhK9Fq7dE;*$K^RyR8CG##=5%l9ef6EsewAe?e_cYDw7^#
z6BEFh1bcfE5fPnwgHF!eA`pQK?l}KrCen_{TNc|)>*gw&y2b1#t`P`Tjge4s@)N*|
zw`#xL-x)6)9~;|+!Fqan0E5<N`bVPN4vG;_$M30FDV;-soX};)#|NG`Crq%ZrlvY)
zz-i*t_gEY&6y86IIh8fwcfN3xlN$`eB<2?oNH#F&AsfnWDeDA_Hn@L(gH&|&A&&|n
zA-+T>6LBF6r6=6?ztN&7gfrseRJFDF+1M!KWs)tp)<UEkEY>iuw3k65QeiJ1+({Eu
z-c=Cbs;QTZI>6ceZr0$f=W_tUK;U6xV<ROgY08ldY|fPj;D!EAc+-%c<pu=cZ4pfC
z3%GY;2Sf>S91jbuot**xvUMG4`|mc84phDLDYS-Ab@ag>aSVMl4Urn@1~0IFn-xB#
z>T($Y9G>0{XGtH&I;M4Q*Z(=uX$U#RmU*oCX))22?QMGBLgUniKZa#5p!n~9Za?_8
zjWS<dpqv5&Q*H~16t^3!send5{e!!>umYme<_*L~>dkpc;F+~G@ZN!Q%`hyOE~C+P
zN7=w2Q~a$_+k8+VvHg7gtBbJzv4EX+l5u(IR%?D6rD|{?sw*z8pb!bu5>hWA^tcTC
z_X3c^Y-1|b2RVF+0z4cPbhgnwT^PptMdYHNiJhJOKRyef#XS>7B5h;7l@dVlpMz>2
z){}*BXFdTh7E>0vbkGr#2QC*qH4~)_)*3B~yHmI6*7HHQ{^hj+PWyEN8zTn~XIXV#
zR(5k~etB_OHZ5>YRID9!rF;8gy_$&xl9wN$tmCthp1xKvxZCAP+L>eZxr8lUo%6Ka
zraSmv3m7fk47dB7%r9MbH?*IeIrv-yPt4Z+3toKc^Eg1iaN3IDhc^3%rbu8jyyg1q
zCC~ef#3*vmTY~QO&CQ8PJ#rF~1R0_a*75&Gb>A7*#M8a4h=2`{-a!%R9Yn!^f>H&f
zcaSc<282+4h*G6@q(~DGLN6vX=_T|QdZhP+7DCUv`aI9Se0i_y{rKjZYd6`Qot>RI
zbLQ;i-1m7|F1i7J8AHST*PGyvB949Yt3a#+G9(s>Dt7(!8H`8a&j)3$S`~**cS>i{
zw*YtpY?>YbI2DM+vcyX$cM$!lEs%^}v3WMyhIAf67>;**wz0@RH>9}b;o%{GoIJuF
z_rFmGKn}`zAxDlQU7wu)$mt)e$dw>x8B{H5Drf`EH1I|6yR@9Hg;N64WoONiaoH|r
zJ2NXi5t0Ap=of?p#dV+MPaT2ect41Fk7aFvK?Yxfw9Bl=6<K*O%G3`BOz6OH3+Km1
zE}74L9!g6K$lxvH<St(XqWX^#jUP`G=}7Xwjy^h3dY9Q*_x|gPdbVF6g6$oJlb+Y_
zc(>478GE!waZ+cG5`K|>h*48Hm9gW#SD;anczaWR8Ki<gQnw=m9SzR9WJ`iY9z2j1
z#K;1r5C8tP(_bSiz^>~1h3L#{_Zp{&1ox|(1cVeMu4c<hhfpr#qHnVib0eH-gmrxo
zt4I$y5Od}L_Ikjs(<)>qg_p5U5ZaW#nr?Zvp^(RN*2`GlLgRMksi|q<rlFx_X{li3
z0WfuRrAMqGlAzcLqsvb0;M!SEmfG}EBcvd>vsL{|N7wH`!t$5zB1s$%(QE6b^rMkJ
zp!`yPR?gnTXE^ei_m_M?VD|=&1yPXnC~`VCQ6)Jgc~aWr^8{1Fyz}2lBP-W9d3j$J
zSFC<3E8q+&f%>o=g|x^W1hiz0n1qDH_=HXpfb?+Sj_Q41k*ca2>7&94;C^BSj=XC6
z-+U1c3+`!Ee~(a6QHJH$=UMyueF`_Xv8XA8Dm^d}qQ7U9-du86%QPqPw2>%?|6#>t
z!`EzxwW46%acotcpD_nU9X%WP5183*|Ko#-a8b3rCWX4ENaTn`tv;U(WmD(|IOq*g
zrfzuwSFQ2`gQH>QHRwUQgPII(?i|y?N)3Jj0`YS^ICfXn(Ni#z0|P_@5*y%Ic2Jq>
z@cUt0jd(B3dN88ZEQAPT`N5xgV32MNGL!y=sEN1H39`6Uam*F|jE&rrK&raorkCrX
zcj3Zxt+9`yfzeZe1k_U;v(zu=*|_K0x*c0zDE%<>JDb`)`SQWiT;7$N;F+X#n!bDl
z(sVmVI@0W7sgl<0xnF8>R!z<LXngz`d}b!1D)}rOws|Yq)b<H|y?K7OB_dXZCd5}V
z7!gGMChui=tP&AKGSpX+YV>BzUfnK#yZLSqg~toF4MHzhZ_8Sjkd3x7xxSe;x2y|E
z7-r|X*KG7kPSr#F(9>32*5I0C-l1L3%jtHRJr>xT^P@5Jg6Ju>oYm(PqY%S%pCngQ
zWR$lLAvH7G-6b!mmnddZHmZ@%9LG}Pky=s$6ZpyW<a%{Nbk0JfNlN`Bn(=X7P6^EU
zziQy;J=?*;;I8_<$0305AI=s3mF5KEsoGHEtf77UpXRW0DJ{U+W<JqRFjcV=xBqNh
zCnPKYxo{g3N79uy!!MJK)LQThzzk&3nY&Zk-xqO!9vlqc7v5Zw)#CSOukLi5xr$>!
z+H}uR(HN7Keqg{#J|@yrlsae|G7C3?2z4@%zkAKL5z4IFz{pBtL(1(C*+zV@z0%Cy
zty4NqdtGMesnHUspG~#ms$@(vQ68$@Lrc3BN<_@V%PS%})Y;t~-kCd|nAmuS7SKk=
zp5CfoVgv>Hd8u!&Nho-~^)00lU1n;1SOE+84RVMXNp0650JuTE&Z-Xg1rnI5^E`im
z;q^A-eAkb<Phg6uIsQgV05}A~V*^5BjGu@<8(CP;)iE#tY{J-VGgH&a@hPFF!!jUo
z?j$~*KY%Wq=Cfw@VH4i@Pq>X5ZHTRd-Rn4Hadm@gVZnurEFeFszA@8Q3=Cr9lkdky
z$K&q*=po_ZS2fdeVq&PN!mDLu8!gW40^;xw_4TX_e*@<0ADb(X^Jzd&tfD2?mT%r7
zY)rP>jk9uSR8ZLrmfYlu(#_N5r55R38t>@Xdlm16_>V8Z?-wrK-s*bDcY&ylp1q5m
zF97z7dnM7ZAWy8{!`G{hh<9OGf{?jjbHjd<b*FZAmo#+Us($v2$X60>=$Y6RSONIA
zR=<+%>~^r|gx6@xX#^D)w@$sa?HL+-%u)17_{YzuV@nTtD*~K9JJhT6U%#$PxKUk>
zYG6#BW4d16AgbPT-j_MCPkzTm{Cc^yA>`3C1!j8ghGd@m%&|;n-Fa`~rF!A()!}wV
zmW1TdqQu*2+Eqd_0Bk{2O0-ExhBJw;ZxsO8zO)-RRF;cL7n`h;m^|x6T8VAcB)VbG
zBLeDXT!kMK#hmyzO^l9?Z6&gNRV&mfNn%M*QvmGS=GLs}GTp}tW+t#9+s;<|C!356
z<F-Q^BBFPxIYLxU&q_U=-qh%l7s#a8bM;TqnvFl^>|<xI0fVo|E>2+7W%B~U#Dx0y
z-@BB8Q78Mpyd)pyGks(i^w5l1cPf5)QS2FhuT`M<*l3Fyvr7}Vq}}3-&e$di<nh@J
z*ghM${n_~Y+a79ndduewwS62Q$0h|JAjbEuby}O+#K&PnuzeJyCh>dqEC)y%S(#U?
zXOcugvzD$|4*zl3V-8K$&AtjkN0-saOoS%kHnz9M+vrT3qXqcWBEAS|>o5=lcSr+>
zfbJbJ{@^L@A#t+E5CG}i2Peb*riWCghoG*zUVxhW6>&{{u-PFdqICUz7iG5Ok;gt;
z?HX$`qt`0fo0Q|gD7GP6LAHfPRK=+3(|SW<GJilvnOW-zWw60S8vAqPV|LDW<zF{u
z*n1~GkQIznW_!t`#p_5NyBjYz*f~i&XTj7GL*=0pMdCaK4!PqzHs2k5bk`xuc`WqI
z+9gSrl<b<l4+}JiI|FnZZP`f-qu|vg(7=jr=lV@gZCv>BdU>-i`YS5Y|9m#m41YG)
za<zSw(k$jWAa0O-roFz1qsMOUVw{~E#_h+;{QR5tvV-l+P4Cm^Ao}ui^E@~0Y+(KN
z;zm%K`d-Im1n_%2P0`6ceq~%~xvfz~D&~I-r?Z`g5p<o+_1@EUGV}~{vxD~u7IGYl
zy82aas%oD#`(em%Y{-Vxn-MJA?X|Z`!LgnH<hDF0>!RUnAicz^O3d^&x{>?9Gd5yz
zbVD!eYy?z~o(^=y1HrnEzTVQYJcz1rOq@Sca(aorVj@BcSZaO|Pg#A`9XTj}hwv7?
zkIpV7PaZh5Nnz}(AO#KCR+$jX^3G~v^?G`~jZ2HyHH`2ExSy=h#aH5Fh?62gIW&M(
z<5EK765B#?K69N8;f62oj=##rKxwL#i|Oc@jSZ{x`5vbkiwHmCN#c7y{zG*(=09{t
zSFRiG30YYQoP%cm*dt`~<MYY-N2rsoHoX?f^Q7`O{`-;3fN6{=l*z>Qs(Y~n#N>`Y
znRQptGm;zYQt%0U_P;rgFs;x2Z=6SE^Vy)a51_YIlG*0w<ocm6-i0#Tp;=ud_X>A%
zDl11u76<#L@TUtwQVT_ikSr-3o}2#5zmL^C9VMC!)zWc41AadfI$+RIAJy_^Y22+>
z80DEg4<&Bc5|D2>n^IqZ>bP*P|7z?`YH$cX!iU_(-N;j#@p+)eHdu^i$~4u_$j;nw
z;Tw2Uk|l<zz@>tNJ7qOqW_PK&ebLeh7dF^+$FNK8vEb%ks1!>G&+mO`6l%fgVUnaF
z@GU(4b-yI&EklxnVMA)mI;3!dXXPL$$279D6d>jz${evuP0M6pWld711&rwF7_EkL
zBB$D6_umIuwUs{o+)yrH9Tng%T0iRD3A|e04?IozT<-6*?_g$hvZc4#ngtvP-!5Z3
zpIZ-+K1_>N4-h$|%zh8SF&8K|*I0p4lD0-BX6ggnh3?+tAsm?*ryAJQvPm1a5Jryc
zCMBh8c+RY@7ObvvWU3iy8X9XESy!eGh!n3Kaq|dx35&=|JpCPaK2yKPf_y+BSoiTy
z%imh2;bAU7YWRXC{EieLS&DSJCAC`%8wzBXTd!vJQ8Iq#1EDPUkBT^)it#4{p!$Uq
zGl}`b<#l#MH?^TMKmP?nm5j+nx41UZ{>e5BwCLSpERctLWw#hvkKf4jg(b&h*BY@W
zG3cpkOqaj+)y87V==u1dWu8UR$;zP&Y<+E>*tzLYFEG+6Bj<Tc8gC_cS%$jLonX^H
zIgVIa&laE%(mB8FnCt+|=+6*MPwVFW@ga1>=I>TeJ!o%=aUGsNs8gPCPAsl>+<1Jg
z%1aGm3EiG!CHKK99*9a{AP>zIZN;`~)lMW6rrA=Ixw6g2sC{-ky;knXv>etMk^14o
zC2og|zqxJd?oD8z@>CJlP`5JhA;w@D{F2VU`L%`T*qulX6}z<ktexbz!O?#GoENdN
zCgS-*qIrU6r|5{oTNbSb=6;6e?LU37sEmbmMyt!D^@L815rUVFn!ZXgU+AI2-16IZ
zMwdR@-pu`38h=dRcNhj`<qoG@^C~e;wqz2Fp<eSUexqB?>yBd?b9AbzaD9)}V^huJ
za0}Pb;tkfH9*}eDq_;5t!Ue5xQY$gr5a?AVCwX<tCrWFaC-h!>g9V#??L?C3<@062
zT}dQ$L(rjp;(6>BBr+~-U{U>XAP#v8(7@i8mX-C=U%f<1makF{Ss?XR7)m!hirp4}
zxhRTX&*{ORE3WM4+n0krWNxmXW^uzbi#Im6YxMi=qcn38d#Na(YI$QCmdowS%kAzk
zZ52Cx(Cv-enCUP%z<2>5mL*BR<RtF7TPtdIb+Dt?ECOhde!o-1nAzFr3K$vXe|5;7
zeYx{{LJ#M^L<wa*Rov3i1J<1Np~)*Xgypb?p`(Q0?{H;y3VRDec!YcPv{hxQigM(b
zsOFtJhhRylS|LAQzxt3OKd)e=K7f2w($gpd7%=XGbqx#_VY9}tTOvck?#%3a1cV>e
z-cg1!*ZW&d@NZmdbFgyzug852bgj`S)^O0dZ0mNuD4z|0{0L}$FRpp8f02ToKi^|~
zmZ>!+CvKbF3_<06R4XtPO}d(uYYAu8v=^^BK(=^qL^rTLpZ_sgq;s#kIq)1M*gKv+
zvcgFUI#Lc8I%;cMdFP?w)mfnoo#4}MIZQAL@aJo>wD9u!DSt7??0v~?Yq9EkY5xIT
zIYNuuR03^^--Y^?E$tGwVb1f4d|mBr8XM013_DZh*<E_6tR}o-`Uj)E*IKZVvw<H<
zHC`5W8Lu;pJ9>H=Mp=P(8EVxr=F`;TS!c61>aQvlf3#HP96}nJ+rINwouh4UI#C?P
zn@i$dyce!4&|mr#(9$Ht+}=o=MtaPM=PJpoo52nl?G|3XF)zqd3`WJd;|5|Tt-CvD
z?u{CLqZbH|QRCgtOyZ_hV02&3txo57oPEguV~|P1-VR@?3Dx9NyLbGB`#okvRktu=
z2zj?(S*P!FWpZSt+v^)>IjN%&BN>e}@}#jGW7v-ZX6`8J6`V#h!5$K_k+0lPm_It5
z6~9u={R{@<$ke)11-m+^NzF%8tJNQJKF5?T2Qb{ej+wrk?U11S8l7LyqT~X~m^^S+
zMkFXGyIjhx;jS_cfBd}K&Hr8>pT6+M@yx>$i$C4(t(D3te-@C1q1Wdr$jvL6aD2j@
zC{pa_rXk50$IqoBlBZEVQglY_`<Sy^TluqTA$BZa$~R_S4Wh2BKXpReEaWo}P5|E4
z#%Wug0$(YSrU=EM;X;{te6c##Z^tr|^~x2<dDNfZ>lmRzb*hXKN2!xWtXT0#t1-LH
z3<G3gED5?Q)KsQ#h7<<`dk}&>DuB3hH5N^1(nR(;KA|T%8!uD?_=_TM-9j^FAd!Gg
zT((SN`p-39g6oi>*6nt(9cforT+j`Po$0_0CAWr;0g{bl5YmNxuS|IbnU}%R>L^c?
z5!OC0dejaa(mUQwx`21iG%neayzJQ>S{<}cf^r6&^)zUd&mA|c2q(F}z36Bz94j2R
z2OD)<);~{qw%aKGePVRPetg{X7(aJb^iJPpSVJ;GWTR`Dr3Jg$&wYlVXMJPZ*sVu5
zZnZWRiuSKHv~%|=LT*M4R$zUDH3}!R7&6rqbeaOT)zxZw!uMEomMbx=Cw8yuNBL1?
z?zsD2Eqj&0I2MNqNv*MBd$WdhVi#>h;~F|a==y?XR<SC1z64(>>C{iWQC#yNM;Me&
zR7CV1d&&|8&-X97V7+Le91Hi=^#cBg<I>dpExYW)fkSL>ZX-+7W`w24L<*-glFKC1
zF1gk!^1v5_MTnUskS9z(^bq*Y%tan~CzLDu`pGV+ET1pFt7c<r={{8SNkSD!O0pqp
zQUu@D@Q~fxv!oo*mX5t2VzwWSp9z-Xb#_p%!4g;AXIHkPI8Y|dRYT&u`u80l9`OtB
zVo0{yEdI?|5PtCK9%?;cufEY`-rMuCY)%Gy=r=^3FSeCjC!a9A5zhjX&DBPTCn~!P
zr}ICC8PCj*35!ZW3&a>@aX$xFS(1>*0_xX*TS>8Y{-@7T#vTJ3>(Ua(r$aG-Zp_O*
zpX(7v-VIz64c0UJD{=uB%O-%D><*Pqq@Z~s{LEfx!}67Flh=mym^$el&S(dUrKIj?
zhJr|&YBwE!vD4F<{o&(;?7|6qx=rD)QSzUSeU8E;<%PgUJs~eH=58BgZUKL;{3Q7a
zi8=4WptfHFfY?^R@T!b!?rQXAZ8<EHS&uH(PW&ObR{51xg+WJ3u$Wh{B@o$4>rOMl
zJI`YjJr}sK*{>8OuZvy7q5VpfpQK-OfXY);tw0{@Dn55arv>MZ0bX`Ev<hfVfW>l`
zv*mR5T*F{Oj^d1<sp_f+w0JZy?mQNh-E}0iZ5Wjiz587cvEqz8^8cJuB;{8R`M|46
zB?_(-1YP~g2|jn3k}Ka1kunoZDB+q&J#1bJ;?={oX5J{d{vmDIq0u(;v8jyald%O4
zxE6X>%M6&`Pr-dt%2N?*>|}FSDJm2N^>h9dq?+im0T;?;5Tj3wP=h7*-1sPo-EBXt
z^|=W%Z33#$gn9SddbjaLj^99iI*p-+#ZcGxwZus=oGK62Q|{1H)o*+{tQxK5=^NPr
zR&rQ<=bT=mPMt5#Z^&o!L(q&|Px6Pvxp7>}!g6vVTvQ=-y8lB`XDLQ7OwC1K=#+Wk
z2kJx;d*ahI%>WR-amjpVWT8Y|u4k}b@MD@=#>U9-0sCdN9%RxfU|hD~^F904U_6)K
z9_weB0O&?@ieSKcsKUi&tU=e%A?Su$VF3e!AfqagO@22A$S||(-EdleR{=-Kw4=S9
zQ#_x*nMXs+`G=tp;S^mefIX^rB|fpDqP3))<?N_%b5k^%9@rBD?^D0C@i0t6_Ri^4
zH{GV4M*z&<$}w!z9-y6anu29B{XfvpnVT_YJ2Ynl;e?)kqy^q3e^D<icMGrgHQ5N`
zZq`FWYbBl9A@!^$wH0PBx%Gys2Bnk0p%}@Nw$syz_VmVmp<R#`L#_J*+~*rIAgz@1
zQRtBM5chd5tN-uah*2c^birXlWF0OhpXXk>XmQc27kHj$)E0PQx|%WS^W&=B=QG&H
zu2<aP9)n9|Qty2H0d>e2Bx@+k=w6JSh~D0kiMRB96A1yNL8;33?>G$nuvRlILbJ>_
z#%M^d?5r<fj^=O^<cv5OOR^DJ?!8ejoh`9#ZJuo|N=>gLx*abuvY^!ucvzsNZ~d7<
zAH#29D$9)5Er_1$>V!PYgv=ow)1j*OX<>~D_3#S2wc8j2(QN69bna=Z!0pxe3@Z&!
z`+-l<UMVN3kxgY^?fh<kQkwA-;Hh<9$lrpqeSxM6jSj9*mDlnf>}65apF_Unaa6L-
zp$=P94mT@H`e{!4DkyhBc3*HO^b0(Mto!GHBq?FS`yCgscUrgnpWnxyB2tkFhL{VL
z1$LJtQ~a1Hsu8mx5$Jlthzi8d;+Un=jJK`H_A9GTeVT0t2W%25kKL0-ic)%Lp67?c
zre6!B)OpwR4-A~JgR+)E(hogXHMQMG>}&Z11`9uZ#s(}=`e$EQ;kU+d;p#_#TAF9Q
ze2)y3ncL4HtNr|0ctP~(c%de@T88x2RtNHq%riww$_ZhD&hTY;mUG_7I}v&@2A!8d
z0K_+d#Zu<xO<Hk=q+Tl_hI{a4md?t&KG8Uj{e6L!eQethbQsLkdgssL9^JxWkWo(w
z3TBBPdMLSCvQX`wJn<$Avi1FZp(tMHJl$7l5twFLP_JazOhuXSk#g!yCrg(yv{;An
z12`_=XwS^l_jfX_`&v?o)OW+e3Hm7c>fGOC5~#zN+naa?On>m#p9jxLwQV9UKtxuK
z%d@904z{Axp9es_YBW4nPm&x}Cw3fdL~9e$mFnt3tRB;gz-$Rp5pzTyL>3f^t|a7p
z*Xbzz5XnwTbt`gJ(00vw_(at>zsiD4ogsg{HM1@PUV+{9T?IUpE~AH}0?b-)@XjwL
zzL(+IO{cqD_@&A)wPCAj>*d3Uw|C7xeqDfy-uy0)AiJ1db}_9}J&<znnjM}-viPh8
zjDSdePcF9AolXY!O&`WyGp7^PydTMIiu(kGylTS*qxUl%q<xFW`dEkW&+ow248n!-
zAdPP@5<1!Q44L!mXNFVj5meG&cM`od!K)|5UnK_-TrE(^UKhig0gM1xe3dpP(?Q$Y
z&jeg%*I&;{%boXPUewyI;Vl?8l-(SvYb;3<jE*yHJVgkOEIoRS6Y^4yuryJN>0Zus
zD-cA_AA&J!WLu`w6Z$89Fgo=92mKT+<&UyV;m4-GBzCcL&W^w5c9=%mpMhBFGjpU?
zo#1f~P<iuNr*4rbqB7ho{=?Ohl<(i?h?e!S2dm6v&xg<3StH8UiDllNP^lviRzGgo
z8Pt{fp1LQ&yOs6(yqzM`f4(9e-!-ah4|P1p31e%S)|Z~@`OEPKeqW!VZpf^gy<{k=
zL&Nv@waiq|^Oo~^FXtS|9hiIBD`~r|w#exTUl9bsIk&<{!rzrmADqazJVVVR$7TyR
z92-x1d1d@hI-8sxb-q<bmGzPDX7}BdxT<oy6qIfp{xN<uj)v^Qur1QX6wSGY-i>=3
zF%phfHJ`0^5?5ztW3I+RvM-Q!_XdW7w9jF?N#fq{#CG<r$w&+c-{BHnq7+gohPl8g
zTw%Sb^=7pVlX6$PrcGuCxx-+c%ZR!~vh3Pksg(duBwg1-D$88E*+~4!MRFeY;CfV5
z-Xda%v1WXuKqBkvG`swsrdPyUf9&KC>v^cHbSXPm2!kY|r9}axC9dRA`?gMT8|0xP
z!11!7spYKJmKAbbKP%JVrdJkQFXji{o5%ZYj!9W{SPVJcuL7?}4qa?^5n7UIc}r3(
z5>A-x1l%#e?7xBWn}`=iXO-G*(KCn|^%G_OfIgV>*vUoTkERZE)3ScVg>c=2t;Ozf
zTMo^uVT;l#MDsOta0U~4&4-c+XHpXiYG%$O431)U!gsNLsBwo|kp8f()9+gw;me^z
z5??Qu`n@Y8AF;c9L+@AQc@OIPv)5N?nI><z6iI8+N22!?1x%kpA2YCp({Mh6bN+7n
zxO9go_<2p#N}#(%+jDb~^eCe0k+&CZ=o_dXW($)ivo~<JpE%JHaK4d8e43Wmw_~JF
zl+BN!*ll`YKeJuz@^jIvx-E^Ra7<Xd^I2xXe1ux9VJ|#m%(OT{LD4lD9p1HAk}jAr
zsFY{d=+s?E%j#DF?u<awbM`T792x7ws`m466F2(YmZwm4{!GPZ7JwusT-uKXT>`=w
zmbt1{9cP{Co$idBG%2)GCYKabosgLOIp+D*IukfGWuS&Gp(~$46eU`?M6Se5-Rblp
zWFZd=|HU*<>GU&P&a%t0Y<elsWf29cx?1FX(sa>6jU=+;R26=*TB(=ihn*weRZsAm
zNu-rI#YCygob6dMn)x2SPl!u93bcmpqeTPp<C7S^3xxKr+<HKh`DK?0v@NRUV3fE8
zACnC_>}cO+4Lm52=qo21z1ullGiLtNs1}<tgg=VA7b8=*Pg~yXovTDE)^am(Adq5X
zL_#3#Ayu%K$l2MYk?9iam%y#fl)(CG=TCK7aww<siSM@AQ%8rirkB4RvE4(Lh)}R@
zMCGaHkP`OIgbnJtR4|8y;;VT|QJ)C&3{ro~)${VEy}1M#1N>A-REwX#Uew%s%ZD@&
z=SXttc@O`Oq4b70#ZQ#l-j$I8Z*U(#T1?NT49z^y+DZ7P&#L}Jk5`&LSHo@laCE20
z=JhFc9Ww{!tV1S<>(A~Va35gBfwP2Ek44J#ayK)e#Ax`ovweQkaoaRyC~u5T=Ci=!
zW;t5VV;_0VJx&OzUcd;8>se@EH0Ws_3@CGZxZe2m;v`(F@P~sl?<(>}mSwg{M?}R?
zrxAH?XQY*LzRb&vNAs4J8(h&3p%;u_Lx_oM8KS<om_hmcnlE~=t!BGTI2i@0J5QW2
zdc5N4S1+OR63?HSi@ePjw@;TP1Qg;sKp`5pxPk2>ESbc*Vfupwnpm)B&5WI-ZYTSr
zr+T<oLBpfR{+45^4Vj}co9Qx_+n<T`>Q0WU38Cy)P6l;5ZGB1gDAW&aZqK}S+Y)uN
zW=+bZkXNKE(abV_Vb48dr}WIFJZ4rsD@sL6J)SYwi57-~8p8dl*@=%KKhyNY`@bX)
zqe<r3)#COZ1^+Uhr?me0`7V9mY8J>!bQk+!PJp&t#qq9c^+iI<(GI_t6av;{Du|EP
zsvonXJ<K)E@SZ`yK9Spu0-3A4@KImdce4)WS2K@)!lnuB3L_6c_+f5h)qH;bBK(}V
zo;curw?}F<KQ*lLn+f0gV&pp3cW&;HS)>vtBJ=}jfjb#oX)3r)RkC)w$gl=x_=(&A
z7ba%0FLZZZVQW=gqbh-5;xqzuXL!)35v}x~K?uB#eM{HYY!lUhwoo^%K;O#bxgSqX
zK*6tO2#%R9Vx=FoKO-LRD;peK8d#-HA+F2Nytq<??5`aFhpyLZmTV$p?y9Cn^^Sq`
z$^w?LzE7i>>FMEPo(RV${BQP2251t{ZXS+f^F|U|E!7msIp(|b>eBEEcil5j0i#Kn
zqXDAI+N{iYx&rI;+6DPLc5OUuImKSUy;LRR%R`?>TP)?aeb!<dUde|l(hx6z(>+a$
z-ngunO~OuOYA~x3y<k1tqTb;DbxcU0;H&b^=cVTaWF#H0*rewvBjb|!NFPRZbC74f
zo3Ad4C7LwZ$sGo1mcHOwR;+odGy?MKqnS9x!TKL3nEPp$YaJgq)-L-2&-PJuHc}#`
zrFOZos@_(+T$H{G2s%(PL@loR;G-u5gMFh40qK>SJW;1}kysetRyd)FaI@qs(zpSR
zNhI*#gB<G4ukwn^k9}y7pEwyg&lWT@ZSwQMMo>@i>iRWXbe<Bk6hYRZ0<R%0@;cz$
zgQZTvr;{8UtEo?8qoS69$BbrrOv+k?F8Ri|MQ>d`Cb?LnCe&vN&&iS*_Sj(a+55*C
zsfK_8OYl?`ivRu0Z*hwBRAH24K`&;r?N)AV3wUX4WU(El9LE6t+2*PKPOm~MpGskt
zB;pa*sIq>49^5>ss=T40q`Eq<M5RpgIBF~8R%F^kD3#Li6IsCI$VlC}tU->=xqE*z
z+g<zlA=&5Sj1gCGhlodMN!@XSprG#dQM*6S=f;Mn>XKTyh0%rSxk<P3+RJlNABS>f
zx0Q|7t;2P{Tm=f#O(x?(rHDuJ<t7u(=ZV0$dhXM9JWYSFax3?MM8oG3{==G>Ph+3&
zyFfhZ>PL%jr`oiBifB=vxeU;$7VAO8gfsxdKDMl5G35Q7$K+m5ZAnfQ!DLdH2SO%<
zZBMi|664k8*-2$yo~7QkT+Tbwxa^rK8nmLLd=*2d09SxF;cBC7XAlh?by{!Wp%tn8
zlxyY9S4;h{g!I;c-Qi#V=t3vCbT0js!RqQ}DZm3+;In=#EAUg=v{@vF$vz~O=oaxx
zuQ04h52}M3TAxPe95CCMg9{Hx417L4^&Hl&)N8PW3`OrAgb+13cgRyv1UAcA2;SXI
zA-NuuN@5j;O?rBqK*hh~I!JyHx0R*e9yGr6h`cUM);2zWgJnj(Ys>GB%%`Y|+iE9t
z4i9Dh!jGlZnh#L|i7%B;qn0fV2VRut8VRJZ%J}TG$Dq!C=e0EAS|_2Hro+L8KwlsV
zg5UNozsuD=8HCphv3g+ox?WfG9TRIpe3d7ub2M1UE53sCp8c$m5!&RW3RYF+VC#e8
zWX1U(R5to4cvxE>cHS|`WX|(twr1yuVA(9(mOJN=eZlsazy#`DaQAjcc<2lLy!Zzz
z>=XV0a{st!y<u|{{XF<cX%uuZs148Xgk(29P8$J@JecB+uTi7xIx^h-M_zOoRgT`&
z=vmEVX5IyoyN|7UOs*L~+DTM1bG<z^t43{#Tl4npP1jU+52kH*HAy-tC-zh1U2@$!
z)<Br1`PB?hkJ1iSZpv0b400|h9<Y&9UeCrxNzdiqW$Flj#rE&^6c_~W&5`{Tgf|59
z?9IZWaV(o~g;a}AU^_e|YcnqA*-oOI9}ruhmH2^LJ~y|R-*q_WBD3EA>Y{thYsGhO
zNo9zB^2>*F`VGGNxKB<p`zA+JX$c&Yd&y!~OTwsAj8`!P*3%#n$2Rq!>Jc67-dT`&
zrrGwC>%Z7u{JwUL<h9bPm)cApNOSy2AF#!`5^OR%7iVv1X6FgjhCDHT92;Yd^JGZ(
zaeQkNz@fh|EWp4J|6yKqc-Co{>^!Tz>ibo>x#x#(^+scb6$S&F_K>d=rJGv+1pj(a
zGxUIvkV1{EshuB7X|m-(^?h<U1VQ*moJ{2s1a5ev)_CWa9+~2R*7rAY$_GEhvM1E2
z9rexLwe+=U%ilq}R$sBYt5{3H3{t8Zf-6#gz5Gossqye{sZswawGb%P=wM~N7{YK*
zl_zQ@w@0O>F~>wq?9o2FyLBp5?8jP{<oxez=E4OwVH7k8&aU5JmClNJ?m}MC;Hd2o
z$f{F*XGYaML5cM$gMmIYX>dTQrO9tLSCU;1U@&~5R7AL{46GzC7|Rw;eycNTTgjUQ
z@rT%G6vb-Oi1Zu~VTUSMDa#>GCtpwZ#657*Q_<3DukD&~(fXavPzJ6Qi@Iyi#mGIG
zkSb(%Mg`i%eWGmcy_y{hP|wqjrAg4g=1Q*d>jpvZ<Jhys<d13my9S>!4TIC&i{n!?
zy`#YeQ^SvDWBK7na{MlD@pms%spi>Bz4TAbj3m-jyVw*cCZC$T{b-Zm*5+7c$ls={
z{+?ruZt305?^yY(9?3kCN8q2G&m8z8W@(?-3S2+9QwEX0S6QGjZMB)@vmxXqsV1Sm
z6uD9I^ns9<?|mJb*EfTXD8d4NTFc(<eV^Ca#!nAcNXKyoiEXf~=d-JM2j+gM)pnD0
zRg<(BxWE6B&GJ@<%$&%B&sLr>|10z4>X)(kY%WWFoeXk7GfpzyXC)L#esR&xPpPRW
zkJIOyi`VeZ_X(s>3`WCbUVhX5m+K&~Rmr;M8RO7fFU<27iSy?;8~H!zAoO21<3CQB
zJyZn4ptRA^w`c!#(J*NEFIMQU|6!W!H8`i1Ap-;JU&q2fFs>>zH$N{QH$R_%0f!N<
zJb~b!a{iU{8wp=2RV&xkRs77a$ge4?aWv4dGZ^`T?u}oyTBj!2r*Q#kxc_&4@}oCi
zrZ1EEI5W`P+yn8eJ?@9E{Rzqb?TrXHB=Xr4RL%LB;t~_jkdO!j3q^{b)w69~+jYLJ
zt(?98sxliJg??rxJHmi7j3pqO_bqOPnhLN|7A;rSA{kAWGWY)F-uP$xE0--cQ;!WX
zV3wI#%_GHG{tb9lxnD2@Z_91`C~GhX=QB`C=Ce(5<Y)RH)sQ6k7$3J<is0ok*3*CF
z=tP|Y>L|yB!Mg*0P1h55WnbeF;Qoh_go=8d7DzNuUcR#t`!qfYGuKysDV-L=UkBv#
z-2D9f00>_>a@+MU41k310fBE*008Ur^P77wmOfw;*;)0j;X!&9D>NA>p-&J<JOW%i
zAqAuyZ13q7-^BbJ)zUV6QUW0;7-GV*zyJ0Hj}Xm_lQwX$0h2M~tgELL<7*6|ABjYO
z@D_iWp8yf~_|LSr0Ur$z8zVj+xJCE-FgT|}6yMvUuu0~uw*+k>F+Zn76>x<77bkhi
zi8R)Y%g=~P&#a)mgM+-}b5;)pLfcz~?y8O@VyYJZMdYPVLHNla^SfP$ITNWu292B;
z$iShhGl>PiJWcOX99$cLVFu-H+^32LpmRgibW}CR><h`gEZLuqcF(A(iMLn;a%d4%
z0{^LC*fm5|xCm7cTw!W~hi|_nQZV7((FK?+Uc!75B5TR^>K%`A_OE(F$iL{MNd9@D
zOcJK90gZ?9|3*na=k<M8TtG?EvcP_MbvL|Mg%$On@FT2cZ9niYZ`U7*<sg*xjKQ!)
zU`m}srj|ZwQ^G?7Gx&c5qm_EU$v^&=6y3k|0{2RMQu86OqXk{vP}j$VKc(Bh`Bw;D
zi~?sB<HR+VU*KNg9{HC(yzy6vgHHZjH6ixrsu#Ep8M-)v|8MgvPJ#-oFVqv3aIhuT
z2F1Uy#usc}!0Jw6EZ$^PbJ4cCfDY2}r=2=VAyrn-rhRV8;v<_-OQio9{Uq00(ZDdb
z>UIAHdBsdwLJa4WpV!h%=Rm}*u0_HbS^k|-k^Z`YvvfJcPli4mo2CC+-ECTK7!>ar
zgD+I_H!^XUT!Rh{DjCo!$p3qU{~g}dHcl*0U^L%8d@}k5v6uwGPESj!kY$5wdj1{v
z1S=KVZv5M4`WEMZk8tI>ClWHOaALT^4?hDTZns`rlb7bs0axj@J_c18eDtWBi+>!Z
z|42zOAz>tN4`<*k{G;rSEB{owWfLb+>!YLUhl{NOs0E(Ds?wkN*GT`Z3FGBoREPr$
zAZ`VPfTC-ylSy#-gbsg+3saH)c#Wcg?fJheA4@>6)Pf=h-AQ&H232mdT=#r8w0y}?
s;QF8Qd;|s7L0-14k69&XQb0#|ZV$pmz3Jq(Yrse8wc4vP*>@lR4-=J@$^ZZW

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-5.png b/assets/create-vm/step-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..d34cb16a73caeddcb13b67d29593d217812bd22f
GIT binary patch
literal 65075
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%0D%
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
G=YIfYb+K0f

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-6.png b/assets/create-vm/step-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..92f2c2f1f3797c4a7bf9c7b0daa09b0093e47e42
GIT binary patch
literal 53461
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
Q2;iT%h>UQlpsvsV0Y+KGfB*mh

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-7.png b/assets/create-vm/step-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad8eb9b81c5e54449f432fc300d14a1fc661057b
GIT binary patch
literal 65527
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

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-8.png b/assets/create-vm/step-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce5443c767179e342ef227a5ffcbdc7be260941a
GIT binary patch
literal 53991
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

literal 0
HcmV?d00001

diff --git a/assets/create-vm/step-9.png b/assets/create-vm/step-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..0427354903fa5fdb8e87527e84f4a1b001f4ae3b
GIT binary patch
literal 45452
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

literal 0
HcmV?d00001

diff --git a/build/lib/scripts/chroot-and-upgrade b/build/lib/scripts/chroot-and-upgrade
index 7adaaaccb..59581fbc6 100755
--- a/build/lib/scripts/chroot-and-upgrade
+++ b/build/lib/scripts/chroot-and-upgrade
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+SOURCE_DIR="$(dirname "${BASH_SOURCE[0]}")"
+
 if [ "$UID" -ne 0 ]; then
     >&2 echo 'Must be run as root'
     exit 1
@@ -77,20 +79,7 @@ umount /media/startos/next/boot
 if [ "$CHROOT_RES" -eq 0 ]; then
 
     if [ -h /media/startos/config/current.rootfs ] && [ -e /media/startos/config/current.rootfs ]; then
-        echo 'Pruning...'
-        current="$(readlink -f /media/startos/config/current.rootfs)"
-        needed=$(du -s --bytes /media/startos/next | awk '{print $1}')
-        while [[ "$(df -B1 --output=avail --sync /media/startos/images | tail -n1)" -lt "$needed" ]]; do
-            to_prune="$(ls -t1 /media/startos/images/*.rootfs | grep -v "$current" | tail -n1)"
-            if [ -e "$to_prune" ]; then
-                echo "  Pruning $to_prune"
-                rm -rf "$to_prune"
-            else
-                >&2 echo "Not enough space and nothing to prune!"
-                exit 1
-            fi
-        done
-        echo 'done.'
+        ${SOURCE_DIR}/prune-images $(du -s --bytes /media/startos/next | awk '{print $1}')
     fi
 
     echo 'Upgrading...'
diff --git a/build/lib/scripts/prune-images b/build/lib/scripts/prune-images
new file mode 100755
index 000000000..21861467f
--- /dev/null
+++ b/build/lib/scripts/prune-images
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+if [ "$UID" -ne 0 ]; then
+    >&2 echo 'Must be run as root'
+    exit 1
+fi
+
+POSITIONAL_ARGS=()
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -*|--*)
+      echo "Unknown option $1"
+      exit 1
+      ;;
+    *)
+      POSITIONAL_ARGS+=("$1") # save positional arg
+      shift # past argument
+      ;;
+  esac
+done
+
+set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
+
+needed=$1
+
+if [ -z "$needed" ]; then
+    >&2 echo "usage: $0 <SPACE NEEDED>"
+    exit 1
+fi
+
+if [ -h /media/startos/config/current.rootfs ] && [ -e /media/startos/config/current.rootfs ]; then
+    echo 'Pruning...'
+    current="$(readlink -f /media/startos/config/current.rootfs)"
+    while [[ "$(df -B1 --output=avail --sync /media/startos/images | tail -n1)" -lt "$needed" ]]; do
+        to_prune="$(ls -t1 /media/startos/images/*.rootfs | grep -v "$current" | tail -n1)"
+        if [ -e "$to_prune" ]; then
+            echo "  Pruning $to_prune"
+            rm -rf "$to_prune"
+        else
+            >&2 echo "Not enough space and nothing to prune!"
+            exit 1
+        fi
+    done
+    echo 'done.'
+else
+    >&2 echo 'No current.rootfs, not safe to prune'
+    exit 1
+fi
\ No newline at end of file

From c16d8a1da192af57a41098dab305330e0302d380 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Tue, 25 Jun 2024 20:58:24 -0600
Subject: [PATCH 179/341] fix setup wizard styles and remove diagnostic from
 angular.json (#2656)

---
 web/angular.json                              | 131 +-----------------
 .../src/app/pages/loading/loading.module.ts   |  11 +-
 .../src/app/pages/loading/loading.page.html   |  40 +++---
 .../src/app/pages/loading/loading.page.scss   |   9 ++
 .../ui/src/app/pages/init/init.page.html      |   2 +-
 5 files changed, 42 insertions(+), 151 deletions(-)

diff --git a/web/angular.json b/web/angular.json
index 3a91dd00b..cf6c113a4 100644
--- a/web/angular.json
+++ b/web/angular.json
@@ -302,6 +302,7 @@
               }
             ],
             "styles": [
+              "node_modules/@taiga-ui/core/styles/taiga-ui-theme.less",
               "projects/shared/styles/variables.scss",
               "projects/shared/styles/global.scss",
               "projects/shared/styles/shared.scss",
@@ -393,136 +394,6 @@
         }
       }
     },
-    "diagnostic-ui": {
-      "projectType": "application",
-      "schematics": {},
-      "root": "projects/diagnostic-ui",
-      "sourceRoot": "projects/diagnostic-ui/src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "dist/raw/diagnostic-ui",
-            "index": "projects/diagnostic-ui/src/index.html",
-            "main": "projects/diagnostic-ui/src/main.ts",
-            "polyfills": "projects/diagnostic-ui/src/polyfills.ts",
-            "tsConfig": "projects/diagnostic-ui/tsconfig.json",
-            "inlineStyleLanguage": "scss",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "projects/shared/assets",
-                "output": "assets"
-              },
-              {
-                "glob": "**/*.svg",
-                "input": "node_modules/ionicons/dist/ionicons/svg",
-                "output": "./svg"
-              }
-            ],
-            "styles": [
-              "projects/shared/styles/variables.scss",
-              "projects/shared/styles/global.scss",
-              "projects/shared/styles/shared.scss",
-              "projects/diagnostic-ui/src/styles.scss"
-            ],
-            "scripts": []
-          },
-          "configurations": {
-            "production": {
-              "fileReplacements": [
-                {
-                  "replace": "projects/diagnostic-ui/src/environments/environment.ts",
-                  "with": "projects/diagnostic-ui/src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                }
-              ]
-            },
-            "ci": {
-              "progress": false
-            },
-            "development": {
-              "buildOptimizer": false,
-              "optimization": false,
-              "vendorChunk": true,
-              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "diagnostic-ui:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "diagnostic-ui:build:production"
-            },
-            "development": {
-              "browserTarget": "diagnostic-ui:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "diagnostic-ui:build"
-          }
-        },
-        "lint": {
-          "builder": "@angular-eslint/builder:lint",
-          "options": {
-            "lintFilePatterns": [
-              "projects/diagnostic-ui/src/**/*.ts",
-              "projects/diagnostic-ui/src/**/*.html"
-            ]
-          }
-        },
-        "ionic-cordova-build": {
-          "builder": "@ionic/angular-toolkit:cordova-build",
-          "options": {
-            "browserTarget": "diagnostic-ui:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "diagnostic-ui:build:production"
-            }
-          }
-        },
-        "ionic-cordova-serve": {
-          "builder": "@ionic/angular-toolkit:cordova-serve",
-          "options": {
-            "cordovaBuildTarget": "diagnostic-ui:ionic-cordova-build",
-            "devServerTarget": "diagnostic-ui:serve"
-          },
-          "configurations": {
-            "production": {
-              "cordovaBuildTarget": "diagnostic-ui:ionic-cordova-build:production",
-              "devServerTarget": "diagnostic-ui:serve:production"
-            }
-          }
-        }
-      }
-    },
     "marketplace": {
       "projectType": "library",
       "root": "projects/marketplace",
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.module.ts b/web/projects/setup-wizard/src/app/pages/loading/loading.module.ts
index 2f3507941..498620697 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.module.ts
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.module.ts
@@ -1,12 +1,17 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { FormsModule } from '@angular/forms'
+import { TuiProgressModule } from '@taiga-ui/kit'
 import { LoadingPage } from './loading.page'
 import { LoadingPageRoutingModule } from './loading-routing.module'
+import { IonicModule } from '@ionic/angular'
 
 @NgModule({
-  imports: [CommonModule, FormsModule, IonicModule, LoadingPageRoutingModule],
+  imports: [
+    CommonModule,
+    IonicModule,
+    TuiProgressModule,
+    LoadingPageRoutingModule,
+  ],
   declarations: [LoadingPage],
 })
 export class LoadingPageModule {}
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.page.html b/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
index 6c9ca41ab..94a666223 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
@@ -1,17 +1,23 @@
-<section *ngIf="progress$ | async as progress">
-  <h1 [style.font-size.rem]="2.5" [style.margin.rem]="1">
-    Setting up your server
-  </h1>
-  <div class="center-wrapper" *ngIf="progress.total">
-    Progress: {{ (progress.total * 100).toFixed(0) }}%
-  </div>
-
-  <progress
-    tuiProgressBar
-    class="progress"
-    [style.max-width.rem]="40"
-    [style.margin]="'1rem auto'"
-    [attr.value]="progress.total"
-  ></progress>
-  <p>{{ progress.message }}</p>
-</section>
+<ion-content>
+  <ion-grid>
+    <ion-row class="ion-align-items-center">
+      <ion-col>
+        <section *ngIf="progress$ | async as progress">
+          <h1 [style.font-size.rem]="2" [style.margin-bottom.rem]="2">
+            Setting up your server
+          </h1>
+          <div *ngIf="progress.total">
+            Progress: {{ (progress.total * 100).toFixed(0) }}%
+          </div>
+          <progress
+            tuiProgressBar
+            [style.max-width.rem]="40"
+            [style.margin]="'1rem auto'"
+            [attr.value]="progress.total"
+          ></progress>
+          <p>{{ progress.message }}</p>
+        </section>
+      </ion-col>
+    </ion-row>
+  </ion-grid>
+</ion-content>
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.page.scss b/web/projects/setup-wizard/src/app/pages/loading/loading.page.scss
index e69de29bb..099f7084e 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.scss
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.scss
@@ -0,0 +1,9 @@
+section {
+  border-radius: 0.25rem;
+  padding: 3rem;
+  margin: 2rem;
+  text-align: center;
+  background: #e0e0e0;
+  color: #333;
+  --tui-clear-inverse: rgba(0, 0, 0, 0.1);
+}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/pages/init/init.page.html b/web/projects/ui/src/app/pages/init/init.page.html
index bd3467bbb..5cd21bb07 100644
--- a/web/projects/ui/src/app/pages/init/init.page.html
+++ b/web/projects/ui/src/app/pages/init/init.page.html
@@ -2,7 +2,7 @@
   <h1 [style.font-size.rem]="2.5" [style.margin.rem]="1">
     Initializing StartOS
   </h1>
-  <div class="center-wrapper" *ngIf="progress.total">
+  <div *ngIf="progress.total">
     Progress: {{ (progress.total * 100).toFixed(0) }}%
   </div>
 

From 822dd5e1004bacf836b098c4eba0b753e6005ef6 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 28 Jun 2024 15:03:01 -0600
Subject: [PATCH 180/341] Feature/UI sideload (#2658)

* ui sideloading

* remove subtlecrypto import

* fix parser

* misc fixes

* allow docker pull during compat conversion
---
 Makefile                                      |  12 +-
 container-runtime/package-lock.json           |  81 +++-
 container-runtime/package.json                |   4 +-
 core/Cargo.lock                               | 223 +++++++--
 core/models/Cargo.toml                        |   2 +-
 core/models/src/errors.rs                     |   4 +-
 core/models/src/version.rs                    |  31 +-
 core/startos/Cargo.toml                       |   2 +-
 core/startos/src/account.rs                   |   8 +
 core/startos/src/backup/os.rs                 |  19 +-
 core/startos/src/backup/restore.rs            |   8 +-
 core/startos/src/backup/target/mod.rs         |  13 +-
 core/startos/src/context/cli.rs               |  13 +-
 core/startos/src/context/config.rs            |   5 +-
 core/startos/src/context/rpc.rs               |   1 -
 core/startos/src/db/model/mod.rs              |   1 +
 core/startos/src/db/model/package.rs          |   2 +-
 core/startos/src/db/model/private.rs          |   6 +
 core/startos/src/db/model/public.rs           |   8 +-
 core/startos/src/developer/mod.rs             |   5 +-
 core/startos/src/disk/mod.rs                  |   6 +-
 core/startos/src/disk/util.rs                 |   4 +-
 core/startos/src/firmware.rs                  |   5 +-
 core/startos/src/init.rs                      |   9 +-
 core/startos/src/install/mod.rs               | 430 ++++++++++--------
 core/startos/src/lib.rs                       |   8 +-
 core/startos/src/lxc/mod.rs                   |   4 +-
 core/startos/src/net/service_interface.rs     |   2 -
 core/startos/src/net/static_server.rs         |   9 +-
 core/startos/src/notifications.rs             |   2 +
 core/startos/src/os_install/mod.rs            |  12 +-
 core/startos/src/registry/asset.rs            |  16 +
 core/startos/src/registry/device_info.rs      |   2 +-
 core/startos/src/registry/mod.rs              |   1 -
 core/startos/src/registry/os/asset/add.rs     |   6 +-
 core/startos/src/registry/os/asset/get.rs     |   5 +-
 core/startos/src/registry/os/asset/sign.rs    |   3 +-
 core/startos/src/registry/os/index.rs         |   2 +-
 core/startos/src/registry/os/version/mod.rs   |  11 +-
 core/startos/src/registry/package/get.rs      |   9 +-
 core/startos/src/registry/package/index.rs    |   5 +-
 core/startos/src/registry/signer/sign/mod.rs  |   1 -
 .../s9pk/merkle_archive/directory_contents.rs |  15 +
 core/startos/src/s9pk/merkle_archive/mod.rs   |   7 +-
 .../src/s9pk/merkle_archive/source/http.rs    |   9 +-
 .../src/s9pk/merkle_archive/source/mod.rs     | 106 ++++-
 .../source/multi_cursor_file.rs               |  39 +-
 .../startos/src/s9pk/merkle_archive/varint.rs |  14 +-
 core/startos/src/s9pk/mod.rs                  |  54 ++-
 core/startos/src/s9pk/rpc.rs                  |  60 ++-
 core/startos/src/s9pk/v1/manifest.rs          |  14 +-
 core/startos/src/s9pk/v1/reader.rs            |   5 +-
 core/startos/src/s9pk/v2/compat.rs            | 184 +++-----
 core/startos/src/s9pk/v2/manifest.rs          |   8 +-
 core/startos/src/s9pk/v2/mod.rs               |  16 +-
 core/startos/src/s9pk/v2/pack.rs              | 113 +++--
 core/startos/src/service/mod.rs               |   4 +-
 .../src/service/persistent_container.rs       |   7 +-
 .../src/service/service_effect_handler.rs     |   6 +-
 core/startos/src/service/service_map.rs       |  15 +-
 core/startos/src/setup.rs                     |   5 +-
 core/startos/src/ssh.rs                       |   3 +-
 core/startos/src/system.rs                    |   3 +-
 core/startos/src/update/mod.rs                |   4 +-
 core/startos/src/upload.rs                    | 129 +++++-
 core/startos/src/util/io.rs                   |  11 +-
 core/startos/src/util/mod.rs                  |  13 +-
 core/startos/src/util/rpc.rs                  |   5 +-
 core/startos/src/util/serde.rs                |  27 +-
 core/startos/src/version/mod.rs               |  51 ++-
 core/startos/src/version/v0_3_5.rs            |  30 +-
 core/startos/src/version/v0_3_5_1.rs          |  10 +-
 core/startos/src/version/v0_3_5_2.rs          |  10 +-
 core/startos/src/version/v0_3_6.rs            |  10 +-
 debian/postinst                               |   1 +
 package-lock.json                             |   6 +
 sdk/lib/emverLite/mod.ts                      |   4 +-
 sdk/lib/index.browser.ts                      |   1 +
 sdk/lib/index.ts                              |   1 +
 sdk/lib/osBindings/GetPackageParams.ts        |   3 +-
 sdk/lib/osBindings/Manifest.ts                |   2 +-
 sdk/lib/osBindings/PackageVersionInfo.ts      |   3 +-
 sdk/lib/osBindings/ServerInfo.ts              |   3 +-
 sdk/lib/s9pk/index.ts                         |  67 +++
 .../s9pk/merkleArchive/directoryContents.ts   |  80 ++++
 sdk/lib/s9pk/merkleArchive/fileContents.ts    |  24 +
 sdk/lib/s9pk/merkleArchive/index.ts           | 167 +++++++
 sdk/lib/s9pk/merkleArchive/varint.ts          |  62 +++
 sdk/lib/test/emverList.test.ts                |   9 -
 sdk/lib/util/fileHelper.ts                    |   4 +-
 sdk/package-lock.json                         |  84 +++-
 sdk/package.json                              |  11 +-
 system-images/compat/src/config/mod.rs        |   2 +-
 web/package-lock.json                         |  80 +++-
 web/package.json                              |   6 +-
 .../server-routes/sideload/sideload.page.ts   |  56 ++-
 .../ui/src/app/services/api/api.types.ts      |   5 +-
 .../app/services/api/embassy-api.service.ts   |   4 +-
 .../services/api/embassy-live-api.service.ts  |   8 +-
 .../services/api/embassy-mock-api.service.ts  |   9 +-
 web/projects/ui/src/polyfills.ts              |   7 +-
 101 files changed, 1900 insertions(+), 796 deletions(-)
 create mode 100644 package-lock.json
 create mode 100644 sdk/lib/s9pk/index.ts
 create mode 100644 sdk/lib/s9pk/merkleArchive/directoryContents.ts
 create mode 100644 sdk/lib/s9pk/merkleArchive/fileContents.ts
 create mode 100644 sdk/lib/s9pk/merkleArchive/index.ts
 create mode 100644 sdk/lib/s9pk/merkleArchive/varint.ts

diff --git a/Makefile b/Makefile
index 5e038a08d..9a9a001b7 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ COMPAT_SRC := $(shell git ls-files system-images/compat/)
 UTILS_SRC := $(shell git ls-files system-images/utils/)
 BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
 CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
-WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist web/patchdb-ui-seed.json
+WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist web/patchdb-ui-seed.json sdk/dist
 WEB_UI_SRC := $(shell git ls-files web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
 WEB_INSTALL_WIZARD_SRC := $(shell git ls-files web/projects/install-wizard)
@@ -262,15 +262,19 @@ web/node_modules/.package-lock.json: web/package.json sdk/dist
 	npm --prefix web ci
 	touch web/node_modules/.package-lock.json
 
-web/dist/raw/ui: $(WEB_UI_SRC) $(WEB_SHARED_SRC)
+web/.angular: patch-db/client/dist sdk/dist web/node_modules/.package-lock.json
+	rm -rf web/.angular
+	mkdir -p web/.angular
+
+web/dist/raw/ui: $(WEB_UI_SRC) $(WEB_SHARED_SRC) web/.angular
 	npm --prefix web run build:ui
 	touch web/dist/raw/ui
 
-web/dist/raw/setup-wizard: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC)
+web/dist/raw/setup-wizard: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular
 	npm --prefix web run build:setup
 	touch web/dist/raw/setup-wizard
 
-web/dist/raw/install-wizard: $(WEB_INSTALL_WIZARD_SRC) $(WEB_SHARED_SRC)
+web/dist/raw/install-wizard: $(WEB_INSTALL_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular
 	npm --prefix web run build:install-wiz
 	touch web/dist/raw/install-wizard
 
diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index 9b211c077..e63bec6a1 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -9,11 +9,13 @@
       "version": "0.0.0",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
         "@start9labs/start-sdk": "file:../sdk/dist",
         "esbuild-plugin-resolve": "^2.0.0",
         "filebrowser": "^1.0.0",
         "isomorphic-fetch": "^3.0.0",
-        "lodash": "^4.17.21",
+        "lodash.merge": "^4.6.2",
         "node-fetch": "^3.1.0",
         "ts-matches": "^5.5.1",
         "tslib": "^2.5.3",
@@ -30,24 +32,27 @@
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha1",
+      "version": "0.3.6-alpha5",
       "license": "MIT",
       "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
         "isomorphic-fetch": "^3.0.0",
-        "lodash": "^4.17.21",
-        "ts-matches": "^5.4.1"
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
+        "ts-matches": "^5.5.1",
+        "yaml": "^2.2.2"
       },
       "devDependencies": {
-        "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
-        "@types/lodash": "^4.17.5",
+        "@types/lodash.merge": "^4.6.2",
         "jest": "^29.4.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         "tsx": "^4.7.1",
-        "typescript": "^5.0.4",
-        "yaml": "^2.2.2"
+        "typescript": "^5.0.4"
       }
     },
     "node_modules/@iarna/toml": {
@@ -72,6 +77,28 @@
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
+    "node_modules/@noble/curves": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
+      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "dev": true,
@@ -1316,10 +1343,10 @@
         "json-buffer": "3.0.1"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "node_modules/lowercase-keys": {
       "version": "2.0.0",
@@ -2233,6 +2260,19 @@
         "os-filter-obj": "^2.0.0"
       }
     },
+    "@noble/curves": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
+      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+      "requires": {
+        "@noble/hashes": "1.4.0"
+      }
+    },
+    "@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "dev": true,
@@ -2261,14 +2301,17 @@
       "version": "file:../sdk/dist",
       "requires": {
         "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
         "@types/jest": "^29.4.0",
-        "@types/lodash": "^4.17.5",
+        "@types/lodash.merge": "^4.6.2",
         "isomorphic-fetch": "^3.0.0",
         "jest": "^29.4.3",
-        "lodash": "^4.17.21",
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
-        "ts-matches": "^5.4.1",
+        "ts-matches": "^5.5.1",
         "ts-node": "^10.9.1",
         "tsx": "^4.7.1",
         "typescript": "^5.0.4",
@@ -2988,10 +3031,10 @@
         "json-buffer": "3.0.1"
       }
     },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "lowercase-keys": {
       "version": "2.0.0",
diff --git a/container-runtime/package.json b/container-runtime/package.json
index 357c606fc..515f50ee7 100644
--- a/container-runtime/package.json
+++ b/container-runtime/package.json
@@ -18,10 +18,12 @@
   "dependencies": {
     "@iarna/toml": "^2.2.5",
     "@start9labs/start-sdk": "file:../sdk/dist",
+    "@noble/hashes": "^1.4.0",
+    "@noble/curves": "^1.4.0",
     "esbuild-plugin-resolve": "^2.0.0",
     "filebrowser": "^1.0.0",
     "isomorphic-fetch": "^3.0.0",
-    "lodash": "^4.17.21",
+    "lodash.merge": "^4.6.2",
     "node-fetch": "^3.1.0",
     "ts-matches": "^5.5.1",
     "tslib": "^2.5.3",
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 6db13b8cd..80c2dcc0e 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -166,6 +166,12 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -508,9 +514,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -521,16 +527,28 @@ version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
 
+[[package]]
+name = "bitvec"
+version = "0.19.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33"
+dependencies = [
+ "funty 1.1.0",
+ "radium 0.5.3",
+ "tap",
+ "wyz 0.2.0",
+]
+
 [[package]]
 name = "bitvec"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
- "funty",
- "radium",
+ "funty 2.0.0",
+ "radium 0.7.0",
  "tap",
- "wyz",
+ "wyz 0.5.1",
 ]
 
 [[package]]
@@ -540,7 +558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
- "arrayvec",
+ "arrayvec 0.7.4",
  "constant_time_eq",
 ]
 
@@ -551,7 +569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
 dependencies = [
  "arrayref",
- "arrayvec",
+ "arrayvec 0.7.4",
  "cc",
  "cfg-if",
  "constant_time_eq",
@@ -624,9 +642,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.0.100"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b"
+checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
 dependencies = [
  "jobserver",
  "libc",
@@ -1051,7 +1069,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "crossterm_winapi",
  "futures-core",
  "libc",
@@ -1216,7 +1234,7 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "709ade444d53896e60f6265660eb50480dd08b77bfc822e5dcc233b88b0b2fba"
 dependencies = [
- "bitvec",
+ "bitvec 1.0.1",
  "deku_derive",
  "no_std_io",
  "rustversion",
@@ -1416,9 +1434,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 dependencies = [
  "serde",
 ]
@@ -1445,12 +1463,13 @@ dependencies = [
 
 [[package]]
 name = "emver"
-version = "0.1.7"
-source = "git+https://github.com/Start9Labs/emver-rs.git#61cf0bc96711b4d6f3f30df8efef025e0cc02bad"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed260c4d7efaec031b9c4f6c4d3cf136e3df2bbfe50925800236f5e847f28704"
 dependencies = [
  "either",
  "fp-core",
- "nom",
+ "nom 6.1.2",
  "serde",
 ]
 
@@ -1529,6 +1548,24 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[package]]
+name = "exver"
+version = "0.2.0"
+source = "git+https://github.com/Start9Labs/exver-rs.git#29f52c1be18a0fe187670beac92822994b0d1949"
+dependencies = [
+ "either",
+ "emver",
+ "fp-core",
+ "getrandom 0.2.15",
+ "itertools 0.13.0",
+ "memchr",
+ "pest",
+ "pest_derive",
+ "serde",
+ "smallvec",
+ "yasi",
+]
+
 [[package]]
 name = "eyre"
 version = "0.6.12"
@@ -1648,6 +1685,12 @@ dependencies = [
  "itertools 0.8.2",
 ]
 
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1799,7 +1842,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8283e7331b8c93b9756e0cfdbcfb90312852f953c6faf9bf741e684cc3b6ad69"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "crc",
  "log",
  "uuid",
@@ -1913,7 +1956,7 @@ dependencies = [
  "base64 0.21.7",
  "byteorder",
  "flate2",
- "nom",
+ "nom 7.1.3",
  "num-traits",
 ]
 
@@ -2461,6 +2504,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -2637,6 +2689,19 @@ dependencies = [
  "spin",
 ]
 
+[[package]]
+name = "lexical-core"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
+dependencies = [
+ "arrayvec 0.5.2",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.155"
@@ -2655,7 +2720,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
 ]
 
@@ -2731,7 +2796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c487024623ae38584610237dd1be8932bb2b324474b23c37a25f9fbe6bf5e9e"
 dependencies = [
  "bincode",
- "bitvec",
+ "bitvec 1.0.1",
  "serde",
  "serde-big-array",
  "thiserror",
@@ -2821,7 +2886,7 @@ dependencies = [
  "base64 0.21.7",
  "color-eyre",
  "ed25519-dalek 2.1.1",
- "emver",
+ "exver",
  "ipnet",
  "lazy_static",
  "mbrman",
@@ -2908,7 +2973,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "libc",
 ]
@@ -2922,6 +2987,19 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "nom"
+version = "6.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
+dependencies = [
+ "bitvec 0.19.6",
+ "funty 1.1.0",
+ "lexical-core",
+ "memchr",
+ "version_check",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2958,9 +3036,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -3116,7 +3194,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -3309,6 +3387,51 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "pest"
+version = "2.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+dependencies = [
+ "memchr",
+ "thiserror",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+dependencies = [
+ "once_cell",
+ "pest",
+ "sha2 0.10.8",
+]
+
 [[package]]
 name = "petgraph"
 version = "0.6.5"
@@ -3466,7 +3589,7 @@ checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -3552,6 +3675,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -3697,7 +3826,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -3948,7 +4077,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -4133,7 +4262,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -4198,9 +4327,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
 dependencies = [
  "indexmap 2.2.6",
  "itoa",
@@ -4459,7 +4588,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f"
 dependencies = [
- "nom",
+ "nom 7.1.3",
  "unicode_categories",
 ]
 
@@ -4566,7 +4695,7 @@ checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418"
 dependencies = [
  "atoi",
  "base64 0.21.7",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "byteorder",
  "bytes",
  "chrono",
@@ -4609,7 +4738,7 @@ checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e"
 dependencies = [
  "atoi",
  "base64 0.21.7",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "byteorder",
  "chrono",
  "crc",
@@ -4765,7 +4894,7 @@ dependencies = [
  "ed25519 2.2.3",
  "ed25519-dalek 1.0.1",
  "ed25519-dalek 2.1.1",
- "emver",
+ "exver",
  "fd-lock-rs",
  "futures",
  "gpt",
@@ -4799,7 +4928,7 @@ dependencies = [
  "models",
  "new_mime_guess",
  "nix 0.27.1",
- "nom",
+ "nom 7.1.3",
  "num",
  "num_enum",
  "once_cell",
@@ -4861,6 +4990,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "stderrlog"
 version = "0.5.4"
@@ -5113,9 +5248,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -5634,6 +5769,12 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
+[[package]]
+name = "ucd-trie"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+
 [[package]]
 name = "unarray"
 version = "0.1.4"
@@ -6121,6 +6262,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index 76c66b4f2..44295745d 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -12,7 +12,7 @@ color-eyre = "0.6.2"
 ed25519-dalek = { version = "2.0.0", features = ["serde"] }
 lazy_static = "1.4"
 mbrman = "0.5.2"
-emver = { version = "0.1", git = "https://github.com/Start9Labs/emver-rs.git", features = [
+exver = { version = "0.2.0", git = "https://github.com/Start9Labs/exver-rs.git", features = [
   "serde",
 ] }
 ipnet = "2.8.0"
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index 95416ec80..8bbc705ee 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -242,8 +242,8 @@ impl From<std::string::FromUtf8Error> for Error {
         Error::new(e, ErrorKind::Utf8)
     }
 }
-impl From<emver::ParseError> for Error {
-    fn from(e: emver::ParseError) -> Self {
+impl From<exver::ParseError> for Error {
+    fn from(e: exver::ParseError) -> Self {
         Error::new(e, ErrorKind::ParseVersion)
     }
 }
diff --git a/core/models/src/version.rs b/core/models/src/version.rs
index 48871e3a1..f0c7b19ae 100644
--- a/core/models/src/version.rs
+++ b/core/models/src/version.rs
@@ -8,14 +8,14 @@ use ts_rs::TS;
 #[derive(Debug, Clone, TS)]
 #[ts(type = "string", rename = "Version")]
 pub struct VersionString {
-    version: emver::Version,
+    version: exver::ExtendedVersion,
     string: String,
 }
 impl VersionString {
     pub fn as_str(&self) -> &str {
         self.string.as_str()
     }
-    pub fn into_version(self) -> emver::Version {
+    pub fn into_version(self) -> exver::ExtendedVersion {
         self.version
     }
 }
@@ -25,7 +25,7 @@ impl std::fmt::Display for VersionString {
     }
 }
 impl std::str::FromStr for VersionString {
-    type Err = <emver::Version as FromStr>::Err;
+    type Err = <exver::ExtendedVersion as FromStr>::Err;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(VersionString {
             string: s.to_owned(),
@@ -33,32 +33,32 @@ impl std::str::FromStr for VersionString {
         })
     }
 }
-impl From<emver::Version> for VersionString {
-    fn from(v: emver::Version) -> Self {
+impl From<exver::ExtendedVersion> for VersionString {
+    fn from(v: exver::ExtendedVersion) -> Self {
         VersionString {
             string: v.to_string(),
             version: v,
         }
     }
 }
-impl From<VersionString> for emver::Version {
+impl From<VersionString> for exver::ExtendedVersion {
     fn from(v: VersionString) -> Self {
         v.version
     }
 }
 impl Default for VersionString {
     fn default() -> Self {
-        Self::from(emver::Version::default())
+        Self::from(exver::ExtendedVersion::default())
     }
 }
 impl Deref for VersionString {
-    type Target = emver::Version;
+    type Target = exver::ExtendedVersion;
     fn deref(&self) -> &Self::Target {
         &self.version
     }
 }
-impl AsRef<emver::Version> for VersionString {
-    fn as_ref(&self) -> &emver::Version {
+impl AsRef<exver::ExtendedVersion> for VersionString {
+    fn as_ref(&self) -> &exver::ExtendedVersion {
         &self.version
     }
 }
@@ -80,7 +80,13 @@ impl PartialOrd for VersionString {
 }
 impl Ord for VersionString {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.version.cmp(&other.version)
+        self.version.partial_cmp(&other.version).unwrap_or_else(|| {
+            match (self.version.flavor(), other.version.flavor()) {
+                (None, Some(_)) => std::cmp::Ordering::Greater,
+                (Some(_), None) => std::cmp::Ordering::Less,
+                (a, b) => a.cmp(&b),
+            }
+        })
     }
 }
 impl Hash for VersionString {
@@ -94,7 +100,8 @@ impl<'de> Deserialize<'de> for VersionString {
         D: Deserializer<'de>,
     {
         let string = String::deserialize(deserializer)?;
-        let version = emver::Version::from_str(&string).map_err(::serde::de::Error::custom)?;
+        let version =
+            exver::ExtendedVersion::from_str(&string).map_err(::serde::de::Error::custom)?;
         Ok(Self { string, version })
     }
 }
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 401ee66a8..d2304fedb 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -86,7 +86,7 @@ ed25519-dalek = { version = "2.1.1", features = [
   "pkcs8",
 ] }
 ed25519-dalek-v1 = { package = "ed25519-dalek", version = "1" }
-emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
+exver = { version = "0.2.0", git = "https://github.com/Start9Labs/exver-rs.git", features = [
   "serde",
 ] }
 fd-lock-rs = "0.1.4"
diff --git a/core/startos/src/account.rs b/core/startos/src/account.rs
index e074d301d..9e755342f 100644
--- a/core/startos/src/account.rs
+++ b/core/startos/src/account.rs
@@ -28,6 +28,7 @@ pub struct AccountInfo {
     pub root_ca_key: PKey<Private>,
     pub root_ca_cert: X509,
     pub ssh_key: ssh_key::PrivateKey,
+    pub compat_s9pk_key: ed25519_dalek::SigningKey,
 }
 impl AccountInfo {
     pub fn new(password: &str, start_time: SystemTime) -> Result<Self, Error> {
@@ -39,6 +40,7 @@ impl AccountInfo {
         let ssh_key = ssh_key::PrivateKey::from(ssh_key::private::Ed25519Keypair::random(
             &mut rand::thread_rng(),
         ));
+        let compat_s9pk_key = ed25519_dalek::SigningKey::generate(&mut rand::thread_rng());
         Ok(Self {
             server_id,
             hostname,
@@ -47,6 +49,7 @@ impl AccountInfo {
             root_ca_key,
             root_ca_cert,
             ssh_key,
+            compat_s9pk_key,
         })
     }
 
@@ -61,6 +64,7 @@ impl AccountInfo {
         let root_ca_key = cert_store.as_root_key().de()?.0;
         let root_ca_cert = cert_store.as_root_cert().de()?.0;
         let ssh_key = db.as_private().as_ssh_privkey().de()?.0;
+        let compat_s9pk_key = db.as_private().as_compat_s9pk_key().de()?.0;
 
         Ok(Self {
             server_id,
@@ -70,6 +74,7 @@ impl AccountInfo {
             root_ca_key,
             root_ca_cert,
             ssh_key,
+            compat_s9pk_key,
         })
     }
 
@@ -92,6 +97,9 @@ impl AccountInfo {
         db.as_private_mut()
             .as_ssh_privkey_mut()
             .ser(Pem::new_ref(&self.ssh_key))?;
+        db.as_private_mut()
+            .as_compat_s9pk_key_mut()
+            .ser(Pem::new_ref(&self.compat_s9pk_key))?;
         let key_store = db.as_private_mut().as_key_store_mut();
         key_store.as_onion_mut().insert_key(&self.tor_key)?;
         let cert_store = key_store.as_local_certs_mut();
diff --git a/core/startos/src/backup/os.rs b/core/startos/src/backup/os.rs
index 6848473a7..7c8119e79 100644
--- a/core/startos/src/backup/os.rs
+++ b/core/startos/src/backup/os.rs
@@ -85,6 +85,7 @@ impl OsBackupV0 {
                     ssh_key::Algorithm::Ed25519,
                 )?,
                 tor_key: TorSecretKeyV3::from(self.tor_key.0),
+                compat_s9pk_key: ed25519_dalek::SigningKey::generate(&mut rand::thread_rng()),
             },
             ui: self.ui,
         })
@@ -113,6 +114,7 @@ impl OsBackupV1 {
                 root_ca_cert: self.root_ca_cert.0,
                 ssh_key: ssh_key::PrivateKey::from(Ed25519Keypair::from_seed(&self.net_key.0)),
                 tor_key: TorSecretKeyV3::from(ed25519_expand_key(&self.net_key.0)),
+                compat_s9pk_key: ed25519_dalek::SigningKey::from_bytes(&self.net_key),
             },
             ui: self.ui,
         }
@@ -124,13 +126,14 @@ impl OsBackupV1 {
 #[serde(rename = "kebab-case")]
 
 struct OsBackupV2 {
-    server_id: String,                 // uuidv4
-    hostname: String,                  // <adjective>-<noun>
-    root_ca_key: Pem<PKey<Private>>,   // PEM Encoded OpenSSL Key
-    root_ca_cert: Pem<X509>,           // PEM Encoded OpenSSL X509 Certificate
-    ssh_key: Pem<ssh_key::PrivateKey>, // PEM Encoded OpenSSH Key
-    tor_key: TorSecretKeyV3,           // Base64 Encoded Ed25519 Expanded Secret Key
-    ui: Value,                         // JSON Value
+    server_id: String,                               // uuidv4
+    hostname: String,                                // <adjective>-<noun>
+    root_ca_key: Pem<PKey<Private>>,                 // PEM Encoded OpenSSL Key
+    root_ca_cert: Pem<X509>,                         // PEM Encoded OpenSSL X509 Certificate
+    ssh_key: Pem<ssh_key::PrivateKey>,               // PEM Encoded OpenSSH Key
+    tor_key: TorSecretKeyV3,                         // Base64 Encoded Ed25519 Expanded Secret Key
+    compat_s9pk_key: Pem<ed25519_dalek::SigningKey>, // PEM Encoded ED25519 Key
+    ui: Value,                                       // JSON Value
 }
 impl OsBackupV2 {
     fn project(self) -> OsBackup {
@@ -143,6 +146,7 @@ impl OsBackupV2 {
                 root_ca_cert: self.root_ca_cert.0,
                 ssh_key: self.ssh_key.0,
                 tor_key: self.tor_key,
+                compat_s9pk_key: self.compat_s9pk_key.0,
             },
             ui: self.ui,
         }
@@ -155,6 +159,7 @@ impl OsBackupV2 {
             root_ca_cert: Pem(backup.account.root_ca_cert.clone()),
             ssh_key: Pem(backup.account.ssh_key.clone()),
             tor_key: backup.account.tor_key.clone(),
+            compat_s9pk_key: Pem(backup.account.compat_s9pk_key.clone()),
             ui: backup.ui.clone(),
         }
     }
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 556f750ec..3f0aacbe8 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -156,16 +156,14 @@ async fn restore_packages(
     let mut tasks = BTreeMap::new();
     for id in ids {
         let backup_dir = backup_guard.clone().package_backup(&id);
+        let s9pk_path = backup_dir.path().join(&id).with_extension("s9pk");
         let task = ctx
             .services
             .install(
                 ctx.clone(),
-                S9pk::open(
-                    backup_dir.path().join(&id).with_extension("s9pk"),
-                    Some(&id),
-                )
-                .await?,
+                || S9pk::open(s9pk_path, Some(&id)),
                 Some(backup_dir),
+                None,
             )
             .await?;
         tasks.insert(id, task);
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index 2c7a28d94..f1273aa6a 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -7,6 +7,7 @@ use clap::Parser;
 use color_eyre::eyre::eyre;
 use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
+use exver::Version;
 use models::PackageId;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -194,7 +195,7 @@ pub async fn list(ctx: RpcContext) -> Result<BTreeMap<BackupTargetId, BackupTarg
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BackupInfo {
-    pub version: VersionString,
+    pub version: Version,
     pub timestamp: Option<DateTime<Utc>>,
     pub package_backups: BTreeMap<PackageId, PackageBackupInfo>,
 }
@@ -204,7 +205,7 @@ pub struct BackupInfo {
 pub struct PackageBackupInfo {
     pub title: String,
     pub version: VersionString,
-    pub os_version: VersionString,
+    pub os_version: Version,
     pub timestamp: DateTime<Utc>,
 }
 
@@ -223,9 +224,9 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
         "TIMESTAMP",
     ]);
     table.add_row(row![
-        "EMBASSY OS",
-        info.version.as_str(),
-        info.version.as_str(),
+        "StartOS",
+        &info.version.to_string(),
+        &info.version.to_string(),
         &if let Some(ts) = &info.timestamp {
             ts.to_string()
         } else {
@@ -236,7 +237,7 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
         let row = row![
             &*id,
             info.version.as_str(),
-            info.os_version.as_str(),
+            &info.os_version.to_string(),
             &info.timestamp.to_string(),
         ];
         table.add_row(row);
diff --git a/core/startos/src/context/cli.rs b/core/startos/src/context/cli.rs
index d560d575d..0eca1d2c2 100644
--- a/core/startos/src/context/cli.rs
+++ b/core/startos/src/context/cli.rs
@@ -43,7 +43,9 @@ impl Drop for CliContextSeed {
             std::fs::create_dir_all(&parent_dir).unwrap();
         }
         let mut writer = fd_lock_rs::FdLock::lock(
-            File::create(&tmp).unwrap(),
+            File::create(&tmp)
+                .with_ctx(|_| (ErrorKind::Filesystem, &tmp))
+                .unwrap(),
             fd_lock_rs::LockType::Exclusive,
             true,
         )
@@ -80,9 +82,12 @@ impl CliContext {
         });
         let cookie_store = Arc::new(CookieStoreMutex::new({
             let mut store = if cookie_path.exists() {
-                CookieStore::load_json(BufReader::new(File::open(&cookie_path)?))
-                    .map_err(|e| eyre!("{}", e))
-                    .with_kind(crate::ErrorKind::Deserialization)?
+                CookieStore::load_json(BufReader::new(
+                    File::open(&cookie_path)
+                        .with_ctx(|_| (ErrorKind::Filesystem, cookie_path.display()))?,
+                ))
+                .map_err(|e| eyre!("{}", e))
+                .with_kind(crate::ErrorKind::Deserialization)?
             } else {
                 CookieStore::default()
             };
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
index 7b4865301..e02648919 100644
--- a/core/startos/src/context/config.rs
+++ b/core/startos/src/context/config.rs
@@ -37,7 +37,10 @@ pub trait ContextConfig: DeserializeOwned + Default {
             .map(|f| f.parse())
             .transpose()?
             .unwrap_or_default();
-        format.from_reader(File::open(path)?)
+        format.from_reader(
+            File::open(path.as_ref())
+                .with_ctx(|_| (ErrorKind::Filesystem, path.as_ref().display()))?,
+        )
     }
     fn load_path_rec(&mut self, path: Option<impl AsRef<Path>>) -> Result<(), Error> {
         if let Some(path) = path.filter(|p| p.as_ref().exists()) {
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index cf758e0fb..4920a6223 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -14,7 +14,6 @@ use rpc_toolkit::{CallRemote, Context, Empty};
 use tokio::sync::{broadcast, Mutex, RwLock};
 use tokio::time::Instant;
 use tracing::instrument;
-use url::Url;
 
 use super::setup::CURRENT_SECRET;
 use crate::account::AccountInfo;
diff --git a/core/startos/src/db/model/mod.rs b/core/startos/src/db/model/mod.rs
index cae1bfe51..678f7e5fb 100644
--- a/core/startos/src/db/model/mod.rs
+++ b/core/startos/src/db/model/mod.rs
@@ -40,6 +40,7 @@ impl Database {
                 notifications: Notifications::new(),
                 cifs: CifsTargets::new(),
                 package_stores: BTreeMap::new(),
+                compat_s9pk_key: Pem(account.compat_s9pk_key.clone()),
             }, // TODO
         })
     }
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 8bb5a9517..22d6440bb 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use chrono::{DateTime, Utc};
-use emver::VersionRange;
+use exver::VersionRange;
 use imbl_value::InternedString;
 use models::{ActionId, DataUrl, HealthCheckId, HostId, PackageId, ServiceInterfaceId};
 use patch_db::json_ptr::JsonPointer;
diff --git a/core/startos/src/db/model/private.rs b/core/startos/src/db/model/private.rs
index 2b8c55dbd..c57364fc3 100644
--- a/core/startos/src/db/model/private.rs
+++ b/core/startos/src/db/model/private.rs
@@ -19,6 +19,8 @@ use crate::util::serde::Pem;
 pub struct Private {
     pub key_store: KeyStore,
     pub password: String, // argon2 hash
+    #[serde(default = "generate_compat_key")]
+    pub compat_s9pk_key: Pem<ed25519_dalek::SigningKey>,
     pub ssh_privkey: Pem<ssh_key::PrivateKey>,
     pub ssh_pubkeys: SshKeys,
     pub available_ports: AvailablePorts,
@@ -28,3 +30,7 @@ pub struct Private {
     #[serde(default)]
     pub package_stores: BTreeMap<PackageId, Value>,
 }
+
+fn generate_compat_key() -> Pem<ed25519_dalek::SigningKey> {
+    Pem(ed25519_dalek::SigningKey::generate(&mut rand::thread_rng()))
+}
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index e5257f2a4..5f8dc029a 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::net::{Ipv4Addr, Ipv6Addr};
 
 use chrono::{DateTime, Utc};
-use emver::VersionRange;
+use exver::{Version, VersionRange};
 use imbl_value::InternedString;
 use ipnet::{Ipv4Net, Ipv6Net};
 use isocountry::CountryCode;
@@ -21,7 +21,6 @@ use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::util::cpupower::Governor;
-use crate::util::VersionString;
 use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
 
@@ -43,7 +42,7 @@ impl Public {
                 arch: get_arch(),
                 platform: get_platform(),
                 id: account.server_id.clone(),
-                version: Current::new().semver().into(),
+                version: Current::new().semver(),
                 hostname: account.hostname.no_dot_host_name(),
                 last_backup: None,
                 eos_version_compat: Current::new().compat().clone(),
@@ -109,7 +108,8 @@ pub struct ServerInfo {
     pub platform: InternedString,
     pub id: String,
     pub hostname: String,
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
     #[ts(type = "string")]
diff --git a/core/startos/src/developer/mod.rs b/core/startos/src/developer/mod.rs
index 79a875dfc..4a2a4c3df 100644
--- a/core/startos/src/developer/mod.rs
+++ b/core/startos/src/developer/mod.rs
@@ -8,8 +8,8 @@ use ed25519_dalek::{SigningKey, VerifyingKey};
 use tracing::instrument;
 
 use crate::context::CliContext;
+use crate::prelude::*;
 use crate::util::serde::Pem;
-use crate::{Error, ResultExt};
 
 #[instrument(skip_all)]
 pub fn init(ctx: CliContext) -> Result<(), Error> {
@@ -26,7 +26,8 @@ pub fn init(ctx: CliContext) -> Result<(), Error> {
             secret_key: secret.to_bytes(),
             public_key: Some(PublicKeyBytes(VerifyingKey::from(&secret).to_bytes())),
         };
-        let mut dev_key_file = File::create(&ctx.developer_key_path)?;
+        let mut dev_key_file = File::create(&ctx.developer_key_path)
+            .with_ctx(|_| (ErrorKind::Filesystem, ctx.developer_key_path.display()))?;
         dev_key_file.write_all(
             keypair_bytes
                 .to_pkcs8_pem(base64ct::LineEnding::default())
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index 705a34f98..d7ce5f766 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -102,10 +102,10 @@ fn display_disk_info(params: WithIoFormat<Empty>, args: Vec<DiskInfo>) {
                 } else {
                     "N/A"
                 },
-                if let Some(eos) = part.start_os.as_ref() {
-                    eos.version.as_str()
+                &if let Some(eos) = part.start_os.as_ref() {
+                    eos.version.to_string()
                 } else {
-                    "N/A"
+                    "N/A".to_owned()
                 },
             ];
             table.add_row(row);
diff --git a/core/startos/src/disk/util.rs b/core/startos/src/disk/util.rs
index a98c52418..d3f2a8d27 100644
--- a/core/startos/src/disk/util.rs
+++ b/core/startos/src/disk/util.rs
@@ -20,7 +20,7 @@ use super::mount::guard::TmpMountGuard;
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::disk::OsPartitionInfo;
 use crate::util::serde::IoFormat;
-use crate::util::{Invoke, VersionString};
+use crate::util::Invoke;
 use crate::{Error, ResultExt as _};
 
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
@@ -56,7 +56,7 @@ pub struct PartitionInfo {
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct EmbassyOsRecoveryInfo {
-    pub version: VersionString,
+    pub version: exver::Version,
     pub full: bool,
     pub password_hash: Option<String>,
     pub wrapped_key: Option<String>,
diff --git a/core/startos/src/firmware.rs b/core/startos/src/firmware.rs
index a9d5ced79..7e7b9d70f 100644
--- a/core/startos/src/firmware.rs
+++ b/core/startos/src/firmware.rs
@@ -3,13 +3,12 @@ use std::path::Path;
 
 use async_compression::tokio::bufread::GzipDecoder;
 use serde::{Deserialize, Serialize};
-use tokio::fs::File;
 use tokio::io::BufReader;
 use tokio::process::Command;
 
 use crate::disk::fsck::RequiresReboot;
 use crate::prelude::*;
-use crate::progress::PhaseProgressTrackerHandle;
+use crate::util::io::open_file;
 use crate::util::Invoke;
 use crate::PLATFORM;
 
@@ -134,7 +133,7 @@ pub async fn update_firmware(firmware: Firmware) -> Result<(), Error> {
         .invoke(ErrorKind::Filesystem)
         .await?;
     let mut rdr = if tokio::fs::metadata(&firmware_path).await.is_ok() {
-        GzipDecoder::new(BufReader::new(File::open(&firmware_path).await?))
+        GzipDecoder::new(BufReader::new(open_file(&firmware_path).await?))
     } else {
         return Err(Error::new(
             eyre!("Firmware {id}.rom.gz not found in {firmware_dir:?}"),
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index cdc444c32..fdc38b60d 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -5,7 +5,7 @@ use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
 use std::time::{Duration, SystemTime};
 
-use axum::extract::ws::{self, CloseFrame};
+use axum::extract::ws::{self};
 use color_eyre::eyre::eyre;
 use futures::{StreamExt, TryStreamExt};
 use itertools::Itertools;
@@ -31,7 +31,7 @@ use crate::progress::{
 };
 use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::ssh::SSH_AUTHORIZED_KEYS_FILE;
-use crate::util::io::IOHook;
+use crate::util::io::{create_file, IOHook};
 use crate::util::net::WebSocketExt;
 use crate::util::{cpupower, Invoke};
 use crate::Error;
@@ -138,10 +138,7 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
                 old_version -= 1;
                 let old_datadir = db_dir.join(old_version.to_string());
                 if tokio::fs::metadata(&old_datadir).await.is_ok() {
-                    tokio::fs::File::create(&incomplete_path)
-                        .await?
-                        .sync_all()
-                        .await?;
+                    create_file(&incomplete_path).await?.sync_all().await?;
                     Command::new("pg_upgradecluster")
                         .arg(old_version.to_string())
                         .arg("main")
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 5d50da27d..18591dc8d 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -1,21 +1,21 @@
+use std::ops::Deref;
 use std::path::PathBuf;
-use std::sync::Arc;
 use std::time::Duration;
 
 use clap::builder::ValueParserFactory;
 use clap::{value_parser, CommandFactory, FromArgMatches, Parser};
 use color_eyre::eyre::eyre;
-use emver::VersionRange;
-use futures::StreamExt;
-use imbl_value::InternedString;
+use exver::VersionRange;
+use futures::{AsyncWriteExt, StreamExt};
+use imbl_value::{json, InternedString};
 use itertools::Itertools;
-use patch_db::json_ptr::JsonPointer;
+use models::VersionString;
 use reqwest::header::{HeaderMap, CONTENT_LENGTH};
 use reqwest::Url;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::HandlerArgs;
+use rustyline_async::ReadlineEvent;
 use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
 use tokio::sync::oneshot;
 use tracing::instrument;
 use ts_rs::TS;
@@ -23,13 +23,14 @@ use ts_rs::TS;
 use crate::context::{CliContext, RpcContext};
 use crate::db::model::package::{ManifestPreference, PackageState, PackageStateMatchModelRef};
 use crate::prelude::*;
-use crate::progress::{FullProgress, PhasedProgressBar};
+use crate::progress::{FullProgress, FullProgressTracker, PhasedProgressBar};
+use crate::registry::context::{RegistryContext, RegistryUrlParams};
+use crate::registry::package::get::GetPackageResponse;
 use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::s9pk::manifest::PackageId;
-use crate::s9pk::merkle_archive::source::http::HttpSource;
-use crate::s9pk::S9pk;
 use crate::upload::upload;
 use crate::util::clap::FromStrParser;
+use crate::util::io::open_file;
 use crate::util::net::WebSocketExt;
 use crate::util::Never;
 
@@ -38,32 +39,33 @@ pub const PKG_PUBLIC_DIR: &str = "package-data/public";
 pub const PKG_WASM_DIR: &str = "package-data/wasm";
 
 // #[command(display(display_serializable))]
-pub async fn list(ctx: RpcContext) -> Result<Value, Error> {
-    Ok(ctx.db.peek().await.as_public().as_package_data().as_entries()?
+pub async fn list(ctx: RpcContext) -> Result<Vec<Value>, Error> {
+    Ok(ctx
+        .db
+        .peek()
+        .await
+        .as_public()
+        .as_package_data()
+        .as_entries()?
         .iter()
         .filter_map(|(id, pde)| {
             let status = match pde.as_state_info().as_match() {
-                PackageStateMatchModelRef::Installed(_) => {
-                    "installed"
-                }
-                PackageStateMatchModelRef::Installing(_) => {
-                    "installing"
-                }
-                PackageStateMatchModelRef::Updating(_) => {
-                    "updating"
-                }
-                PackageStateMatchModelRef::Restoring(_) => {
-                    "restoring"
-                }
-                PackageStateMatchModelRef::Removing(_) => {
-                    "removing"
-                }
-                PackageStateMatchModelRef::Error(_) => {
-                    "error"
-                }
+                PackageStateMatchModelRef::Installed(_) => "installed",
+                PackageStateMatchModelRef::Installing(_) => "installing",
+                PackageStateMatchModelRef::Updating(_) => "updating",
+                PackageStateMatchModelRef::Restoring(_) => "restoring",
+                PackageStateMatchModelRef::Removing(_) => "removing",
+                PackageStateMatchModelRef::Error(_) => "error",
             };
-            serde_json::to_value(json!({ "status": status, "id": id.clone(), "version": pde.as_state_info().as_manifest(ManifestPreference::Old).as_version().de().ok()?}))
-            .ok()
+            Some(json!({
+                "status": status,
+                "id": id.clone(),
+                "version": pde.as_state_info()
+                    .as_manifest(ManifestPreference::Old)
+                    .as_version()
+                    .de()
+                    .ok()?
+            }))
         })
         .collect())
 }
@@ -107,65 +109,57 @@ impl std::fmt::Display for MinMax {
     }
 }
 
-#[derive(Deserialize, Serialize, Parser, TS)]
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
 pub struct InstallParams {
+    #[ts(type = "string")]
+    registry: Url,
     id: PackageId,
-    #[arg(short = 'm', long = "marketplace-url")]
-    #[ts(type = "string | null")]
-    registry: Option<Url>,
-    #[arg(short = 'v', long = "version-spec")]
-    version_spec: Option<String>,
-    #[arg(long = "version-priority")]
-    version_priority: Option<MinMax>,
+    version: VersionString,
 }
 
-// #[command(
-//     custom_cli(cli_install(async, context(CliContext))),
-// )]
 #[instrument(skip_all)]
 pub async fn install(
     ctx: RpcContext,
     InstallParams {
-        id,
         registry,
-        version_spec,
-        version_priority,
+        id,
+        version,
     }: InstallParams,
 ) -> Result<(), Error> {
-    let version_str = match &version_spec {
-        None => "*",
-        Some(v) => &*v,
-    };
-    let version: VersionRange = version_str.parse()?;
-    let registry = registry.unwrap_or_else(|| crate::DEFAULT_MARKETPLACE.parse().unwrap());
-    let version_priority = version_priority.unwrap_or_default();
-    let s9pk = S9pk::deserialize(
-        &Arc::new(
-            HttpSource::new(
-                ctx.client.clone(),
-                format!(
-                    "{}/package/v0/{}.s9pk?spec={}&version-priority={}",
-                    registry, id, version, version_priority,
-                )
-                .parse()?,
+    let package: GetPackageResponse = from_value(
+        ctx.call_remote_with::<RegistryContext, _>(
+            "package.get",
+            json!({
+                "id": id,
+                "version": VersionRange::exactly(version.deref().clone()),
+            }),
+            RegistryUrlParams {
+                registry: registry.clone(),
+            },
+        )
+        .await?,
+    )?;
+
+    let asset = &package
+        .best
+        .get(&version)
+        .ok_or_else(|| {
+            Error::new(
+                eyre!("{id}@{version} not found on {registry}"),
+                ErrorKind::NotFound,
             )
-            .await?,
-        ),
-        None, // TODO
-    )
-    .await?;
-
-    ensure_code!(
-        &s9pk.as_manifest().id == &id,
-        ErrorKind::ValidateS9pk,
-        "manifest.id does not match expected"
-    );
+        })?
+        .s9pk;
 
     let download = ctx
         .services
-        .install(ctx.clone(), s9pk, None::<Never>)
+        .install(
+            ctx.clone(),
+            || asset.deserialize_s9pk(ctx.client.clone()),
+            None::<Never>,
+            None,
+        )
         .await?;
     tokio::spawn(async move { download.await?.await });
 
@@ -193,113 +187,74 @@ pub async fn sideload(
     SideloadParams { session }: SideloadParams,
 ) -> Result<SideloadResponse, Error> {
     let (upload, file) = upload(&ctx, session.clone()).await?;
-    let (id_send, id_recv) = oneshot::channel();
     let (err_send, err_recv) = oneshot::channel();
     let progress = Guid::new();
-    let db = ctx.db.clone();
-    let mut sub = db
-        .subscribe(
-            "/package-data/{id}/install-progress"
-                .parse::<JsonPointer>()
-                .with_kind(ErrorKind::Database)?,
-        )
-        .await;
-    ctx.rpc_continuations.add(
-        progress.clone(),
-        RpcContinuation::ws_authed(&ctx, session,
-            |mut ws| {
-                use axum::extract::ws::Message;
-                async move {
-                    if let Err(e) = async {
-                        let id = match id_recv.await.map_err(|_| {
-                            Error::new(
-                                eyre!("Could not get id to watch progress"),
-                                ErrorKind::Cancelled,
-                            )
-                        }).and_then(|a|a) {
-                            Ok(a) => a,
-                            Err(e) =>{ ws.send(Message::Text(
-                                serde_json::to_string(&Err::<(), _>(RpcError::from(e.clone_output())))
-                                .with_kind(ErrorKind::Serialization)?,
-                            ))
-                            .await
-                            .with_kind(ErrorKind::Network)?;
-                            return Err(e);
-                        }
-                        };
-                        tokio::select! {
-                            res = async {
-                                while let Some(_) = sub.recv().await {
-                                    ws.send(Message::Text(
-                                        serde_json::to_string(&if let Some(p) = db
-                                            .peek()
-                                            .await
-                                            .as_public()
-                                            .as_package_data()
-                                            .as_idx(&id)
-                                            .and_then(|e| e.as_state_info().as_installing_info()).map(|i| i.as_progress())
-                                        {
-                                            Ok::<_, ()>(p.de()?)
-                                        } else {
-                                            let mut p = FullProgress::new();
-                                            p.overall.complete();
-                                            Ok(p)
-                                        })
-                                        .with_kind(ErrorKind::Serialization)?,
-                                    ))
-                                    .await
-                                    .with_kind(ErrorKind::Network)?;
-                                }
-                                Ok::<_, Error>(())
-                            } => res?,
-                            err = err_recv => {
-                                if let Ok(e) = err {
-                                    ws.send(Message::Text(
-                                        serde_json::to_string(&Err::<(), _>(e))
-                                        .with_kind(ErrorKind::Serialization)?,
-                                    ))
-                                    .await
-                                    .with_kind(ErrorKind::Network)?;
+    let progress_tracker = FullProgressTracker::new();
+    let mut progress_listener = progress_tracker.stream(Some(Duration::from_millis(200)));
+    ctx.rpc_continuations
+        .add(
+            progress.clone(),
+            RpcContinuation::ws_authed(
+                &ctx,
+                session,
+                |mut ws| {
+                    use axum::extract::ws::Message;
+                    async move {
+                        if let Err(e) = async {
+                            tokio::select! {
+                                res = async {
+                                    while let Some(progress) = progress_listener.next().await {
+                                        ws.send(Message::Text(
+                                            serde_json::to_string(&Ok::<_, ()>(progress))
+                                                .with_kind(ErrorKind::Serialization)?,
+                                        ))
+                                        .await
+                                        .with_kind(ErrorKind::Network)?;
+                                    }
+                                    Ok::<_, Error>(())
+                                } => res?,
+                                err = err_recv => {
+                                    if let Ok(e) = err {
+                                        ws.send(Message::Text(
+                                            serde_json::to_string(&Err::<(), _>(e))
+                                            .with_kind(ErrorKind::Serialization)?,
+                                        ))
+                                        .await
+                                        .with_kind(ErrorKind::Network)?;
+                                    }
                                 }
                             }
-                        }
 
-                        ws.normal_close("complete").await?;
+                            ws.normal_close("complete").await?;
 
-                        Ok::<_, Error>(())
-                    }
-                    .await
-                    {
-                        tracing::error!("Error tracking sideload progress: {e}");
-                        tracing::debug!("{e:?}");
+                            Ok::<_, Error>(())
+                        }
+                        .await
+                        {
+                            tracing::error!("Error tracking sideload progress: {e}");
+                            tracing::debug!("{e:?}");
+                        }
                     }
-                }
-            },
-            Duration::from_secs(600),
-        ),
-    )
-    .await;
+                },
+                Duration::from_secs(600),
+            ),
+        )
+        .await;
     tokio::spawn(async move {
         if let Err(e) = async {
-            match S9pk::deserialize(
-                &file, None, // TODO
-            )
-            .await
-            {
-                Ok(s9pk) => {
-                    let _ = id_send.send(Ok(s9pk.as_manifest().id.clone()));
-                    ctx.services
-                        .install(ctx.clone(), s9pk, None::<Never>)
-                        .await?
-                        .await?
-                        .await?;
-                    file.delete().await
-                }
-                Err(e) => {
-                    let _ = id_send.send(Err(e.clone_output()));
-                    return Err(e);
-                }
-            }
+            let key = ctx.db.peek().await.into_private().into_compat_s9pk_key();
+
+            ctx.services
+                .install(
+                    ctx.clone(),
+                    || crate::s9pk::load(file.clone(), || Ok(key.de()?.0), Some(&progress_tracker)),
+                    None::<Never>,
+                    Some(progress_tracker.clone()),
+                )
+                .await?
+                .await?
+                .await?;
+            file.delete().await
         }
         .await
         {
@@ -311,10 +266,16 @@ pub async fn sideload(
     Ok(SideloadResponse { upload, progress })
 }
 
+#[derive(Deserialize, Serialize, Parser)]
+pub struct QueryPackageParams {
+    id: PackageId,
+    version: Option<VersionRange>,
+}
+
 #[derive(Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum CliInstallParams {
-    Marketplace(InstallParams),
+    Marketplace(QueryPackageParams),
     Sideload(PathBuf),
 }
 impl CommandFactory for CliInstallParams {
@@ -328,14 +289,19 @@ impl CommandFactory for CliInstallParams {
                     .required_unless_present("id")
                     .value_parser(value_parser!(PathBuf)),
             )
-            .args(InstallParams::command().get_arguments().cloned().map(|a| {
-                if a.get_id() == "id" {
-                    a.required(false).required_unless_present("sideload")
-                } else {
-                    a
-                }
-                .conflicts_with("sideload")
-            }))
+            .args(
+                QueryPackageParams::command()
+                    .get_arguments()
+                    .cloned()
+                    .map(|a| {
+                        if a.get_id() == "id" {
+                            a.required(false).required_unless_present("sideload")
+                        } else {
+                            a
+                        }
+                        .conflicts_with("sideload")
+                    }),
+            )
     }
     fn command_for_update() -> clap::Command {
         Self::command()
@@ -346,7 +312,9 @@ impl FromArgMatches for CliInstallParams {
         if let Some(sideload) = matches.get_one::<PathBuf>("sideload") {
             Ok(Self::Sideload(sideload.clone()))
         } else {
-            Ok(Self::Marketplace(InstallParams::from_arg_matches(matches)?))
+            Ok(Self::Marketplace(QueryPackageParams::from_arg_matches(
+                matches,
+            )?))
         }
     }
     fn update_from_arg_matches(&mut self, matches: &clap::ArgMatches) -> Result<(), clap::Error> {
@@ -355,6 +323,35 @@ impl FromArgMatches for CliInstallParams {
     }
 }
 
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
+pub struct InstalledVersionParams {
+    id: PackageId,
+}
+
+pub async fn installed_version(
+    ctx: RpcContext,
+    InstalledVersionParams { id }: InstalledVersionParams,
+) -> Result<Option<VersionString>, Error> {
+    if let Some(pde) = ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_package_data()
+        .into_idx(&id)
+    {
+        Ok(Some(
+            pde.into_state_info()
+                .as_manifest(ManifestPreference::Old)
+                .as_version()
+                .de()?,
+        ))
+    } else {
+        Ok(None)
+    }
+}
+
 #[instrument(skip_all)]
 pub async fn cli_install(
     HandlerArgs {
@@ -368,7 +365,7 @@ pub async fn cli_install(
     let method = parent_method.into_iter().chain(method).collect_vec();
     match params {
         CliInstallParams::Sideload(path) => {
-            let file = crate::s9pk::load(&ctx, path).await?;
+            let file = open_file(path).await?;
 
             // rpc call remote sideload
             let SideloadResponse { upload, progress } = from_value::<SideloadResponse>(
@@ -435,9 +432,70 @@ pub async fn cli_install(
             progress?;
             upload?;
         }
-        CliInstallParams::Marketplace(params) => {
-            ctx.call_remote::<RpcContext>(&method.join("."), to_value(&params)?)
-                .await?;
+        CliInstallParams::Marketplace(QueryPackageParams { id, version }) => {
+            let source_version: Option<VersionString> = from_value(
+                ctx.call_remote::<RpcContext>("package.installed-version", json!({ "id": &id }))
+                    .await?,
+            )?;
+            let mut packages: GetPackageResponse = from_value(
+                ctx.call_remote::<RegistryContext>(
+                    "package.get",
+                    json!({ "id": &id, "version": version, "sourceVersion": source_version }),
+                )
+                .await?,
+            )?;
+            let version = if packages.best.len() == 1 {
+                packages.best.pop_first().map(|(k, _)| k).unwrap()
+            } else {
+                println!("Multiple flavors of {id} found. Please select one of the following versions to install:");
+                let version;
+                loop {
+                    let (mut read, mut output) = rustyline_async::Readline::new("> ".into())
+                        .with_kind(ErrorKind::Filesystem)?;
+                    for (idx, version) in packages.best.keys().enumerate() {
+                        output
+                            .write_all(format!("  {}) {}\n", idx + 1, version).as_bytes())
+                            .await?;
+                        read.add_history_entry(version.to_string());
+                    }
+                    if let ReadlineEvent::Line(line) = read.readline().await? {
+                        let trimmed = line.trim();
+                        match trimmed.parse() {
+                            Ok(v) => {
+                                if let Some((k, _)) = packages.best.remove_entry(&v) {
+                                    version = k;
+                                    break;
+                                }
+                            }
+                            Err(_) => match trimmed.parse::<usize>() {
+                                Ok(i) if (1..=packages.best.len()).contains(&i) => {
+                                    version = packages.best.keys().nth(i - 1).unwrap().clone();
+                                    break;
+                                }
+                                _ => (),
+                            },
+                        }
+                        eprintln!("invalid selection: {trimmed}");
+                        println!("Please select one of the following versions to install:");
+                    } else {
+                        return Err(Error::new(
+                            eyre!("Could not determine precise version to install"),
+                            ErrorKind::InvalidRequest,
+                        )
+                        .into());
+                    }
+                }
+                version
+            };
+            ctx.call_remote::<RpcContext>(
+                &method.join("."),
+                to_value(&InstallParams {
+                    id,
+                    registry: ctx.registry_url.clone().or_not_found("--registry")?,
+                    version,
+                })?,
+            )
+            .await?;
         }
     }
     Ok(())
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 5a9561daf..4882d998e 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -1,4 +1,4 @@
-pub const DEFAULT_MARKETPLACE: &str = "https://registry.start9.com";
+pub const DEFAULT_REGISTRY: &str = "https://registry.start9.com";
 // pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com";
 pub const HOST_IP: [u8; 4] = [172, 18, 0, 1];
 pub use std::env::consts::ARCH;
@@ -263,6 +263,12 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .with_display_serializable()
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "installed-version",
+            from_fn_async(install::installed_version)
+                .with_display_serializable()
+                .with_call_remote::<CliContext>(),
+        )
         .subcommand("config", config::config::<C>())
         .subcommand(
             "start",
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 6af707a6d..99f019d5a 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -12,7 +12,6 @@ use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{GenericRpcMethod, RpcRequest, RpcResponse};
 use rustyline_async::{ReadlineEvent, SharedWriter};
 use serde::{Deserialize, Serialize};
-use tokio::fs::File;
 use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio::process::Command;
 use tokio::sync::Mutex;
@@ -30,6 +29,7 @@ use crate::disk::mount::util::unmount;
 use crate::prelude::*;
 use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::util::clap::FromStrParser;
+use crate::util::io::open_file;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::{new_guid, Invoke};
 
@@ -342,7 +342,7 @@ impl Drop for LxcContainer {
                     if let Err(e) = async {
                         let err_path = rootfs.path().join("var/log/containerRuntime.err");
                         if tokio::fs::metadata(&err_path).await.is_ok() {
-                            let mut lines = BufReader::new(File::open(&err_path).await?).lines();
+                            let mut lines = BufReader::new(open_file(&err_path).await?).lines();
                             while let Some(line) = lines.next_line().await? {
                                 let container = &**guid;
                                 tracing::error!(container, "{}", line);
diff --git a/core/startos/src/net/service_interface.rs b/core/startos/src/net/service_interface.rs
index e905be545..dbe228ef2 100644
--- a/core/startos/src/net/service_interface.rs
+++ b/core/startos/src/net/service_interface.rs
@@ -5,8 +5,6 @@ use models::{HostId, ServiceInterfaceId};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::net::host::address::HostAddress;
-
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index 7e8034d99..79adad504 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -19,7 +19,6 @@ use new_mime_guess::MimeGuess;
 use openssl::hash::MessageDigest;
 use openssl::x509::X509;
 use rpc_toolkit::{Context, HttpServer, Server};
-use tokio::fs::File;
 use tokio::io::BufReader;
 use tokio_util::io::ReaderStream;
 
@@ -29,6 +28,7 @@ use crate::middleware::auth::{Auth, HasValidSession};
 use crate::middleware::cors::Cors;
 use crate::middleware::db::SyncDb;
 use crate::rpc_continuations::{Guid, RpcContinuations};
+use crate::util::io::open_file;
 use crate::{
     diagnostic_api, init_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt,
 };
@@ -44,8 +44,6 @@ const EMBEDDED_UIS: Dir<'_> =
 #[cfg(not(all(feature = "daemon", not(feature = "test"))))]
 const EMBEDDED_UIS: Dir<'_> = Dir::new("", &[]);
 
-const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "user-agent"];
-
 #[derive(Clone)]
 pub enum UiMode {
     Setup,
@@ -340,9 +338,8 @@ impl FileData {
             .any(|e| e == "gzip")
             .then_some("gzip");
 
-        let file = File::open(path)
-            .await
-            .with_ctx(|_| (ErrorKind::Filesystem, path.display().to_string()))?;
+        let file = open_file(path)
+            .await?;
         let metadata = file
             .metadata()
             .await
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index fde3d5e80..c99ffb356 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -74,6 +74,7 @@ pub async fn list(
                         .as_notifications()
                         .as_entries()?
                         .into_iter()
+                        .rev()
                         .take(limit);
                     let notifs = records
                         .into_iter()
@@ -97,6 +98,7 @@ pub async fn list(
                         .as_entries()?
                         .into_iter()
                         .filter(|(id, _)| *id < before)
+                        .rev()
                         .take(limit);
                     records
                         .into_iter()
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 4e5c7ed15..28fd2a3be 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -21,7 +21,7 @@ use crate::disk::OsPartitionInfo;
 use crate::net::utils::find_eth_iface;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::util::io::TmpDir;
+use crate::util::io::{open_file, TmpDir};
 use crate::util::serde::IoFormat;
 use crate::util::Invoke;
 use crate::ARCH;
@@ -241,12 +241,10 @@ pub async fn execute<C: Context>(
     tokio::fs::create_dir_all(&images_path).await?;
     let image_path = images_path
         .join(hex::encode(
-            &MultiCursorFile::from(
-                tokio::fs::File::open("/run/live/medium/live/filesystem.squashfs").await?,
-            )
-            .blake3_mmap()
-            .await?
-            .as_bytes()[..16],
+            &MultiCursorFile::from(open_file("/run/live/medium/live/filesystem.squashfs").await?)
+                .blake3_mmap()
+                .await?
+                .as_bytes()[..16],
         ))
         .with_extension("rootfs");
     tokio::fs::copy("/run/live/medium/live/filesystem.squashfs", &image_path).await?;
diff --git a/core/startos/src/registry/asset.rs b/core/startos/src/registry/asset.rs
index ea37b2309..ab251d2aa 100644
--- a/core/startos/src/registry/asset.rs
+++ b/core/startos/src/registry/asset.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::sync::Arc;
 
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
@@ -7,10 +8,13 @@ use ts_rs::TS;
 use url::Url;
 
 use crate::prelude::*;
+use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
 use crate::registry::signer::commitment::{Commitment, Digestable};
 use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey};
 use crate::registry::signer::AcceptSigners;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
+use crate::s9pk::merkle_archive::source::Section;
+use crate::s9pk::S9pk;
 
 #[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
@@ -52,3 +56,15 @@ impl<C: for<'a> Commitment<&'a HttpSource>> RegistryAsset<C> {
             .await
     }
 }
+impl RegistryAsset<MerkleArchiveCommitment> {
+    pub async fn deserialize_s9pk(
+        &self,
+        client: Client,
+    ) -> Result<S9pk<Section<Arc<HttpSource>>>, Error> {
+        S9pk::deserialize(
+            &Arc::new(HttpSource::new(client, self.url.clone()).await?),
+            Some(&self.commitment),
+        )
+        .await
+    }
+}
diff --git a/core/startos/src/registry/device_info.rs b/core/startos/src/registry/device_info.rs
index 51d6ac46b..9a357358a 100644
--- a/core/startos/src/registry/device_info.rs
+++ b/core/startos/src/registry/device_info.rs
@@ -4,7 +4,7 @@ use std::ops::Deref;
 
 use axum::extract::Request;
 use axum::response::Response;
-use emver::{Version, VersionRange};
+use exver::{Version, VersionRange};
 use http::HeaderValue;
 use imbl_value::InternedString;
 use rpc_toolkit::{Middleware, RpcRequest, RpcResponse};
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index 9a53d6338..1039264df 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -1,5 +1,4 @@
 use std::collections::{BTreeMap, BTreeSet};
-use std::net::SocketAddr;
 
 use axum::Router;
 use futures::future::ready;
diff --git a/core/startos/src/registry/os/asset/add.rs b/core/startos/src/registry/os/asset/add.rs
index 33f5ef90f..6108dd5bc 100644
--- a/core/startos/src/registry/os/asset/add.rs
+++ b/core/startos/src/registry/os/asset/add.rs
@@ -3,7 +3,6 @@ use std::panic::UnwindSafe;
 use std::path::PathBuf;
 
 use clap::Parser;
-use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
@@ -13,7 +12,7 @@ use url::Url;
 
 use crate::context::CliContext;
 use crate::prelude::*;
-use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::progress::{FullProgressTracker};
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
@@ -25,6 +24,7 @@ use crate::s9pk::merkle_archive::hash::VerifyingWriter;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
+use crate::util::io::open_file;
 use crate::util::serde::Base64;
 use crate::util::VersionString;
 
@@ -184,7 +184,7 @@ pub async fn cli_add_asset(
         }
     };
 
-    let file = MultiCursorFile::from(tokio::fs::File::open(&path).await?);
+    let file = MultiCursorFile::from(open_file(&path).await?);
 
     let progress = FullProgressTracker::new();
     let mut sign_phase = progress.add_phase(InternedString::intern("Signing File"), Some(10));
diff --git a/core/startos/src/registry/os/asset/get.rs b/core/startos/src/registry/os/asset/get.rs
index 29ff24da6..b185cf6a4 100644
--- a/core/startos/src/registry/os/asset/get.rs
+++ b/core/startos/src/registry/os/asset/get.rs
@@ -20,6 +20,7 @@ use crate::registry::os::SIG_CONTEXT;
 use crate::registry::signer::commitment::blake3::Blake3Commitment;
 use crate::registry::signer::commitment::Commitment;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::util::io::open_file;
 use crate::util::VersionString;
 
 pub fn get_api<C: Context>() -> ParentHandler<C> {
@@ -158,9 +159,7 @@ async fn cli_get_os_asset(
         if let Some(mut reverify_phase) = reverify_phase {
             reverify_phase.start();
             res.commitment
-                .check(&MultiCursorFile::from(
-                    tokio::fs::File::open(download).await?,
-                ))
+                .check(&MultiCursorFile::from(open_file(download).await?))
                 .await?;
             reverify_phase.complete();
         }
diff --git a/core/startos/src/registry/os/asset/sign.rs b/core/startos/src/registry/os/asset/sign.rs
index 50c583593..8bf1cfeb5 100644
--- a/core/startos/src/registry/os/asset/sign.rs
+++ b/core/startos/src/registry/os/asset/sign.rs
@@ -21,6 +21,7 @@ use crate::registry::signer::sign::ed25519::Ed25519;
 use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
+use crate::util::io::open_file;
 use crate::util::serde::Base64;
 use crate::util::VersionString;
 
@@ -166,7 +167,7 @@ pub async fn cli_sign_asset(
         }
     };
 
-    let file = MultiCursorFile::from(tokio::fs::File::open(&path).await?);
+    let file = MultiCursorFile::from(open_file(&path).await?);
 
     let progress = FullProgressTracker::new();
     let mut sign_phase = progress.add_phase(InternedString::intern("Signing File"), Some(10));
diff --git a/core/startos/src/registry/os/index.rs b/core/startos/src/registry/os/index.rs
index 3ee75bc6a..0b1ca5b89 100644
--- a/core/startos/src/registry/os/index.rs
+++ b/core/startos/src/registry/os/index.rs
@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use emver::VersionRange;
+use exver::VersionRange;
 use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index 234143295..9ebe8a696 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 
 use chrono::Utc;
 use clap::Parser;
-use emver::VersionRange;
+use exver::VersionRange;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -148,10 +148,11 @@ pub async fn get_version(
     if let (Some(pool), Some(server_id), Some(arch)) = (&ctx.pool, server_id, arch) {
         let created_at = Utc::now();
 
-        query!("INSERT INTO user_activity (created_at, server_id, arch) VALUES ($1, $2, $3)",
-        created_at,
-        server_id,
-        arch
+        query!(
+            "INSERT INTO user_activity (created_at, server_id, arch) VALUES ($1, $2, $3)",
+            created_at,
+            server_id,
+            arch
         )
         .execute(pool)
         .await?;
diff --git a/core/startos/src/registry/package/get.rs b/core/startos/src/registry/package/get.rs
index 835192361..fb63be1bc 100644
--- a/core/startos/src/registry/package/get.rs
+++ b/core/startos/src/registry/package/get.rs
@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use clap::{Parser, ValueEnum};
-use emver::{Version, VersionRange};
+use exver::{ExtendedVersion, VersionRange};
 use imbl_value::InternedString;
 use itertools::Itertools;
 use models::PackageId;
@@ -45,8 +45,7 @@ pub struct GetPackageParams {
     pub id: Option<PackageId>,
     #[ts(type = "string | null")]
     pub version: Option<VersionRange>,
-    #[ts(type = "string | null")]
-    pub source_version: Option<Version>,
+    pub source_version: Option<VersionString>,
     #[ts(skip)]
     #[arg(skip)]
     #[serde(rename = "__device_info")]
@@ -132,7 +131,7 @@ fn get_matching_models<'a>(
         device_info,
         ..
     }: &GetPackageParams,
-) -> Result<Vec<(PackageId, Version, &'a Model<PackageVersionInfo>)>, Error> {
+) -> Result<Vec<(PackageId, ExtendedVersion, &'a Model<PackageVersionInfo>)>, Error> {
     if let Some(id) = id {
         if let Some(pkg) = db.as_packages().as_idx(id) {
             vec![(id.clone(), pkg)]
@@ -166,7 +165,7 @@ fn get_matching_models<'a>(
                             .as_ref()
                             .map_or(Ok(true), |device_info| info.works_for_device(device_info))?
                     {
-                        Some((k.clone(), Version::from(v), info))
+                        Some((k.clone(), ExtendedVersion::from(v), info))
                     } else {
                         None
                     },
diff --git a/core/startos/src/registry/package/index.rs b/core/startos/src/registry/package/index.rs
index 0e6969fa5..80055f06d 100644
--- a/core/startos/src/registry/package/index.rs
+++ b/core/startos/src/registry/package/index.rs
@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use emver::{Version, VersionRange};
+use exver::{Version, VersionRange};
 use imbl_value::InternedString;
 use models::{DataUrl, PackageId, VersionString};
 use serde::{Deserialize, Serialize};
@@ -70,7 +70,8 @@ pub struct PackageVersionInfo {
     pub support_site: Url,
     #[ts(type = "string")]
     pub marketing_site: Url,
-    pub os_version: VersionString,
+    #[ts(type = "string")]
+    pub os_version: Version,
     pub hardware_requirements: HardwareRequirements,
     #[ts(type = "string | null")]
     pub source_version: Option<VersionRange>,
diff --git a/core/startos/src/registry/signer/sign/mod.rs b/core/startos/src/registry/signer/sign/mod.rs
index 50576a198..a29109864 100644
--- a/core/startos/src/registry/signer/sign/mod.rs
+++ b/core/startos/src/registry/signer/sign/mod.rs
@@ -4,7 +4,6 @@ use std::str::FromStr;
 use ::ed25519::pkcs8::BitStringRef;
 use clap::builder::ValueParserFactory;
 use der::referenced::OwnedToRef;
-use der::{Decode, Encode};
 use pkcs8::der::AnyRef;
 use pkcs8::{PrivateKeyInfo, SubjectPublicKeyInfo};
 use serde::{Deserialize, Serialize};
diff --git a/core/startos/src/s9pk/merkle_archive/directory_contents.rs b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
index c5e5c4a7d..b39789222 100644
--- a/core/startos/src/s9pk/merkle_archive/directory_contents.rs
+++ b/core/startos/src/s9pk/merkle_archive/directory_contents.rs
@@ -274,6 +274,21 @@ impl<S: FileSource + Clone> DirectoryContents<S> {
             ((_, a), (_, b), _) if !a.as_contents().is_dir() && b.as_contents().is_dir() => {
                 std::cmp::Ordering::Greater
             }
+            ((_, a), (_, b), _)
+                if a.as_contents().is_missing() && !b.as_contents().is_missing() =>
+            {
+                std::cmp::Ordering::Greater
+            }
+            ((_, a), (_, b), _)
+                if !a.as_contents().is_missing() && b.as_contents().is_missing() =>
+            {
+                std::cmp::Ordering::Less
+            }
+            ((n_a, a), (n_b, b), _)
+                if a.as_contents().is_missing() && b.as_contents().is_missing() =>
+            {
+                n_a.cmp(n_b)
+            }
             ((a, _), (b, _), Some(sort_by)) => sort_by(&***a, &***b),
             _ => std::cmp::Ordering::Equal,
         }) {
diff --git a/core/startos/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
index 00ead65c5..977e5ebb2 100644
--- a/core/startos/src/s9pk/merkle_archive/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/mod.rs
@@ -121,14 +121,14 @@ impl<S: ArchiveSource + Clone> MerkleArchive<Section<S>> {
             }
             if max_size > *root_maxsize {
                 return Err(Error::new(
-                    eyre!("merkle root directory max size too large"),
+                    eyre!("root directory max size too large"),
                     ErrorKind::InvalidSignature,
                 ));
             }
         } else {
             if max_size > CAP_1_MiB as u64 {
                 return Err(Error::new(
-                    eyre!("merkle root directory max size over 1MiB, cancelling download in case of DOS attack"),
+                    eyre!("root directory max size over 1MiB, cancelling download in case of DOS attack"),
                     ErrorKind::InvalidSignature,
                 ));
             }
@@ -377,6 +377,9 @@ impl<S> EntryContents<S> {
     pub fn is_dir(&self) -> bool {
         matches!(self, &EntryContents::Directory(_))
     }
+    pub fn is_missing(&self) -> bool {
+        matches!(self, &EntryContents::Missing)
+    }
 }
 impl<S: ArchiveSource + Clone> EntryContents<Section<S>> {
     #[instrument(skip_all)]
diff --git a/core/startos/src/s9pk/merkle_archive/source/http.rs b/core/startos/src/s9pk/merkle_archive/source/http.rs
index fda9d32ed..e58208277 100644
--- a/core/startos/src/s9pk/merkle_archive/source/http.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/http.rs
@@ -4,7 +4,7 @@ use std::sync::{Arc, Mutex};
 use std::task::Poll;
 
 use bytes::Bytes;
-use futures::{Stream, StreamExt, TryStreamExt};
+use futures::{Stream, TryStreamExt};
 use reqwest::header::{ACCEPT_RANGES, CONTENT_LENGTH, RANGE};
 use reqwest::{Client, Url};
 use tokio::io::{AsyncRead, AsyncReadExt, ReadBuf, Take};
@@ -54,11 +54,12 @@ impl HttpSource {
     }
 }
 impl ArchiveSource for HttpSource {
-    type Reader = HttpReader;
+    type FetchReader = HttpReader;
+    type FetchAllReader = StreamReader<BoxStream<'static, Result<Bytes, std::io::Error>>, Bytes>;
     async fn size(&self) -> Option<u64> {
         self.size
     }
-    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+    async fn fetch_all(&self) -> Result<Self::FetchAllReader, Error> {
         Ok(StreamReader::new(
             self.client
                 .get(self.url.clone())
@@ -72,7 +73,7 @@ impl ArchiveSource for HttpSource {
                 .apply(boxed),
         ))
     }
-    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::FetchReader, Error> {
         match &self.range_support {
             Ok(_) => Ok(HttpReader::Range(
                 StreamReader::new(if size > 0 {
diff --git a/core/startos/src/s9pk/merkle_archive/source/mod.rs b/core/startos/src/s9pk/merkle_archive/source/mod.rs
index 0a00b18dd..6b7459787 100644
--- a/core/startos/src/s9pk/merkle_archive/source/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/mod.rs
@@ -10,6 +10,7 @@ use tokio::io::{AsyncRead, AsyncWrite};
 
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::hash::VerifyingWriter;
+use crate::util::io::{open_file, TmpDir};
 
 pub mod http;
 pub mod multi_cursor_file;
@@ -159,7 +160,7 @@ impl FileSource for PathBuf {
         Ok(tokio::fs::metadata(self).await?.len())
     }
     async fn reader(&self) -> Result<Self::Reader, Error> {
-        Ok(File::open(self).await?)
+        Ok(open_file(self).await?)
     }
 }
 
@@ -180,18 +181,17 @@ impl FileSource for Arc<[u8]> {
 }
 
 pub trait ArchiveSource: Send + Sync + Sized + 'static {
-    type Reader: AsyncRead + Unpin + Send;
+    type FetchReader: AsyncRead + Unpin + Send;
+    type FetchAllReader: AsyncRead + Unpin + Send;
     fn size(&self) -> impl Future<Output = Option<u64>> + Send {
         async { None }
     }
-    fn fetch_all(
-        &self,
-    ) -> impl Future<Output = Result<impl AsyncRead + Unpin + Send, Error>> + Send;
+    fn fetch_all(&self) -> impl Future<Output = Result<Self::FetchAllReader, Error>> + Send;
     fn fetch(
         &self,
         position: u64,
         size: u64,
-    ) -> impl Future<Output = Result<Self::Reader, Error>> + Send;
+    ) -> impl Future<Output = Result<Self::FetchReader, Error>> + Send;
     fn copy_all_to<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         w: &mut W,
@@ -222,14 +222,15 @@ pub trait ArchiveSource: Send + Sync + Sized + 'static {
 }
 
 impl<T: ArchiveSource> ArchiveSource for Arc<T> {
-    type Reader = T::Reader;
+    type FetchReader = T::FetchReader;
+    type FetchAllReader = T::FetchAllReader;
     async fn size(&self) -> Option<u64> {
         self.deref().size().await
     }
-    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+    async fn fetch_all(&self) -> Result<Self::FetchAllReader, Error> {
         self.deref().fetch_all().await
     }
-    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::FetchReader, Error> {
         self.deref().fetch(position, size).await
     }
     async fn copy_all_to<W: AsyncWrite + Unpin + Send + ?Sized>(
@@ -249,11 +250,12 @@ impl<T: ArchiveSource> ArchiveSource for Arc<T> {
 }
 
 impl ArchiveSource for Arc<[u8]> {
-    type Reader = tokio::io::Take<std::io::Cursor<Self>>;
-    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
+    type FetchReader = tokio::io::Take<std::io::Cursor<Self>>;
+    type FetchAllReader = std::io::Cursor<Self>;
+    async fn fetch_all(&self) -> Result<Self::FetchAllReader, Error> {
         Ok(std::io::Cursor::new(self.clone()))
     }
-    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::FetchReader, Error> {
         use tokio::io::AsyncReadExt;
 
         let mut cur = std::io::Cursor::new(self.clone());
@@ -269,7 +271,7 @@ pub struct Section<S> {
     size: u64,
 }
 impl<S: ArchiveSource> FileSource for Section<S> {
-    type Reader = S::Reader;
+    type Reader = S::FetchReader;
     async fn size(&self) -> Result<u64, Error> {
         Ok(self.size)
     }
@@ -285,3 +287,81 @@ pub type DynRead = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
 pub fn into_dyn_read<R: AsyncRead + Unpin + Send + Sync + 'static>(r: R) -> DynRead {
     Box::new(r)
 }
+
+#[derive(Clone)]
+pub struct TmpSource<S> {
+    tmp_dir: Arc<TmpDir>,
+    source: S,
+}
+impl<S> TmpSource<S> {
+    pub fn new(tmp_dir: Arc<TmpDir>, source: S) -> Self {
+        Self { tmp_dir, source }
+    }
+    pub async fn gc(self) -> Result<(), Error> {
+        self.tmp_dir.gc().await
+    }
+}
+impl<S> std::ops::Deref for TmpSource<S> {
+    type Target = S;
+    fn deref(&self) -> &Self::Target {
+        &self.source
+    }
+}
+impl<S: ArchiveSource> ArchiveSource for TmpSource<S> {
+    type FetchReader = <S as ArchiveSource>::FetchReader;
+    type FetchAllReader = <S as ArchiveSource>::FetchAllReader;
+    async fn size(&self) -> Option<u64> {
+        self.source.size().await
+    }
+    async fn fetch_all(&self) -> Result<Self::FetchAllReader, Error> {
+        self.source.fetch_all().await
+    }
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::FetchReader, Error> {
+        self.source.fetch(position, size).await
+    }
+    async fn copy_all_to<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        w: &mut W,
+    ) -> Result<(), Error> {
+        self.source.copy_all_to(w).await
+    }
+    async fn copy_to<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        position: u64,
+        size: u64,
+        w: &mut W,
+    ) -> Result<(), Error> {
+        self.source.copy_to(position, size, w).await
+    }
+}
+impl<S: FileSource> From<TmpSource<S>> for DynFileSource {
+    fn from(value: TmpSource<S>) -> Self {
+        DynFileSource::new(value)
+    }
+}
+
+impl<S: FileSource> FileSource for TmpSource<S> {
+    type Reader = <S as FileSource>::Reader;
+    async fn size(&self) -> Result<u64, Error> {
+        self.source.size().await
+    }
+    async fn reader(&self) -> Result<Self::Reader, Error> {
+        self.source.reader().await
+    }
+    async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        mut w: &mut W,
+    ) -> Result<(), Error> {
+        self.source.copy(&mut w).await
+    }
+    async fn copy_verify<W: AsyncWrite + Unpin + Send + ?Sized>(
+        &self,
+        mut w: &mut W,
+        verify: Option<(Hash, u64)>,
+    ) -> Result<(), Error> {
+        self.source.copy_verify(&mut w, verify).await
+    }
+    async fn to_vec(&self, verify: Option<(Hash, u64)>) -> Result<Vec<u8>, Error> {
+        self.source.to_vec(verify).await
+    }
+}
diff --git a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
index 4b7d5736d..658f3f923 100644
--- a/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/multi_cursor_file.rs
@@ -6,12 +6,13 @@ use std::sync::Arc;
 use std::task::Poll;
 
 use tokio::fs::File;
-use tokio::io::{AsyncRead, AsyncReadExt, ReadBuf, Take};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeek, ReadBuf, Take};
 use tokio::sync::{Mutex, OwnedMutexGuard};
 
 use crate::disk::mount::filesystem::loop_dev::LoopDev;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::{ArchiveSource, Section};
+use crate::util::io::open_file;
 
 fn path_from_fd(fd: RawFd) -> Result<PathBuf, Error> {
     #[cfg(target_os = "linux")]
@@ -42,7 +43,7 @@ impl MultiCursorFile {
         path_from_fd(self.fd)
     }
     pub async fn open(fd: &impl AsRawFd) -> Result<Self, Error> {
-        let f = File::open(path_from_fd(fd.as_raw_fd())?).await?;
+        let f = open_file(path_from_fd(fd.as_raw_fd())?).await?;
         Ok(Self::from(f))
     }
     pub async fn cursor(&self) -> Result<FileCursor, Error> {
@@ -50,7 +51,7 @@ impl MultiCursorFile {
             if let Ok(file) = self.file.clone().try_lock_owned() {
                 file
             } else {
-                Arc::new(Mutex::new(File::open(self.path()?).await?))
+                Arc::new(Mutex::new(open_file(self.path()?).await?))
                     .try_lock_owned()
                     .expect("freshly created")
             },
@@ -88,24 +89,48 @@ impl AsyncRead for FileCursor {
         Pin::new(&mut (&mut **this.0.get_mut())).poll_read(cx, buf)
     }
 }
+impl AsyncSeek for FileCursor {
+    fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> std::io::Result<()> {
+        let this = self.project();
+        Pin::new(&mut (&mut **this.0.get_mut())).start_seek(position)
+    }
+    fn poll_complete(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<std::io::Result<u64>> {
+        let this = self.project();
+        Pin::new(&mut (&mut **this.0.get_mut())).poll_complete(cx)
+    }
+}
+impl std::ops::Deref for FileCursor {
+    type Target = File;
+    fn deref(&self) -> &Self::Target {
+        &*self.0
+    }
+}
+impl std::ops::DerefMut for FileCursor {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut *self.0
+    }
+}
 
 impl ArchiveSource for MultiCursorFile {
-    type Reader = Take<FileCursor>;
+    type FetchReader = Take<FileCursor>;
+    type FetchAllReader = FileCursor;
     async fn size(&self) -> Option<u64> {
         tokio::fs::metadata(self.path().ok()?)
             .await
             .ok()
             .map(|m| m.len())
     }
-    #[allow(refining_impl_trait)]
-    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send + 'static, Error> {
+    async fn fetch_all(&self) -> Result<Self::FetchAllReader, Error> {
         use tokio::io::AsyncSeekExt;
 
         let mut file = self.cursor().await?;
         file.0.seek(SeekFrom::Start(0)).await?;
         Ok(file)
     }
-    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::FetchReader, Error> {
         use tokio::io::AsyncSeekExt;
 
         let mut file = self.cursor().await?;
diff --git a/core/startos/src/s9pk/merkle_archive/varint.rs b/core/startos/src/s9pk/merkle_archive/varint.rs
index 479b488e6..f4f18d140 100644
--- a/core/startos/src/s9pk/merkle_archive/varint.rs
+++ b/core/startos/src/s9pk/merkle_archive/varint.rs
@@ -3,7 +3,7 @@ use tokio::io::{AsyncRead, AsyncWrite};
 
 use crate::prelude::*;
 
-/// Most-significant byte, == 0x80
+/// Most-significant bit, == 0x80
 pub const MSB: u8 = 0b1000_0000;
 
 const MAX_STR_LEN: u64 = 1024 * 1024; // 1 MiB
@@ -39,22 +39,20 @@ pub async fn serialize_varstring<W: AsyncWrite + Unpin + Send>(
     Ok(())
 }
 
+const MAX_SIZE: usize = (std::mem::size_of::<u64>() * 8 + 7) / 7;
+
 #[derive(Default)]
 struct VarIntProcessor {
-    buf: [u8; 10],
-    maxsize: usize,
+    buf: [u8; MAX_SIZE],
     i: usize,
 }
 
 impl VarIntProcessor {
     fn new() -> VarIntProcessor {
-        VarIntProcessor {
-            maxsize: (std::mem::size_of::<u64>() * 8 + 7) / 7,
-            ..VarIntProcessor::default()
-        }
+        Self::default()
     }
     fn push(&mut self, b: u8) -> Result<(), Error> {
-        if self.i >= self.maxsize {
+        if self.i >= MAX_SIZE {
             return Err(Error::new(
                 eyre!("Unterminated varint"),
                 ErrorKind::ParseS9pk,
diff --git a/core/startos/src/s9pk/mod.rs b/core/startos/src/s9pk/mod.rs
index fcf9379a0..a06218d40 100644
--- a/core/startos/src/s9pk/mod.rs
+++ b/core/startos/src/s9pk/mod.rs
@@ -4,37 +4,57 @@ pub mod rpc;
 pub mod v1;
 pub mod v2;
 
-use std::io::SeekFrom;
-use std::path::Path;
+use std::sync::Arc;
 
-use tokio::fs::File;
-use tokio::io::{AsyncReadExt, AsyncSeekExt};
+use tokio::io::{AsyncReadExt, AsyncSeek};
 pub use v2::{manifest, S9pk};
 
-use crate::context::CliContext;
 use crate::prelude::*;
+use crate::progress::FullProgressTracker;
+use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource};
 use crate::s9pk::v1::reader::S9pkReader;
 use crate::s9pk::v2::compat::MAGIC_AND_VERSION;
+use crate::util::io::TmpDir;
 
-pub async fn load(ctx: &CliContext, path: impl AsRef<Path>) -> Result<File, Error> {
+pub async fn load<S, K>(
+    source: S,
+    key: K,
+    progress: Option<&FullProgressTracker>,
+) -> Result<S9pk<DynFileSource>, Error>
+where
+    S: ArchiveSource,
+    S::FetchAllReader: AsyncSeek + Sync,
+    K: FnOnce() -> Result<ed25519_dalek::SigningKey, Error>,
+{
     // TODO: return s9pk
     const MAGIC_LEN: usize = MAGIC_AND_VERSION.len();
     let mut magic = [0_u8; MAGIC_LEN];
-    let mut file = tokio::fs::File::open(&path).await?;
-    file.read_exact(&mut magic).await?;
-    file.seek(SeekFrom::Start(0)).await?;
+    source.fetch(0, 3).await?.read_exact(&mut magic).await?;
     if magic == v2::compat::MAGIC_AND_VERSION {
+        let phase = if let Some(progress) = progress {
+            let mut phase = progress.add_phase(
+                "Converting Package to V2".into(),
+                Some(source.size().await.unwrap_or(60)),
+            );
+            phase.start();
+            Some(phase)
+        } else {
+            None
+        };
         tracing::info!("Converting package to v2 s9pk");
-        let new_path = path.as_ref().with_extension("compat.s9pk");
-        S9pk::from_v1(
-            S9pkReader::from_reader(file, true).await?,
-            &new_path,
-            ctx.developer_key()?.clone(),
+        let tmp_dir = TmpDir::new().await?;
+        let s9pk = S9pk::from_v1(
+            S9pkReader::from_reader(source.fetch_all().await?, true).await?,
+            Arc::new(tmp_dir),
+            key()?,
         )
         .await?;
-        tokio::fs::rename(&new_path, &path).await?;
-        file = tokio::fs::File::open(&path).await?;
         tracing::info!("Converted s9pk successfully");
+        if let Some(mut phase) = phase {
+            phase.complete();
+        }
+        Ok(s9pk.into_dyn())
+    } else {
+        Ok(S9pk::deserialize(&Arc::new(source), None).await?.into_dyn())
     }
-    Ok(file)
 }
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index fac9e6724..83b78dad7 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -1,19 +1,19 @@
 use std::path::PathBuf;
+use std::sync::Arc;
 
 use clap::Parser;
 use models::ImageId;
 use rpc_toolkit::{from_fn_async, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use tokio::fs::File;
 use ts_rs::TS;
 
 use crate::context::CliContext;
 use crate::prelude::*;
 use crate::s9pk::manifest::Manifest;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::v2::pack::ImageConfig;
 use crate::s9pk::v2::SIG_CONTEXT;
-use crate::s9pk::S9pk;
-use crate::util::io::TmpDir;
+use crate::util::io::{create_file, open_file, TmpDir};
 use crate::util::serde::{apply_expr, HandlerExtSerde};
 
 pub const SKIP_ENV: &[&str] = &["TERM", "container", "HOME", "HOSTNAME"];
@@ -79,19 +79,25 @@ async fn add_image(
     AddImageParams { id, config }: AddImageParams,
     S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<(), Error> {
-    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?)
-        .await?
-        .into_dyn();
+    let mut s9pk = super::load(
+        MultiCursorFile::from(open_file(&s9pk_path).await?),
+        || ctx.developer_key().cloned(),
+        None,
+    )
+    .await?;
     s9pk.as_manifest_mut().images.insert(id, config);
-    let tmpdir = TmpDir::new().await?;
-    s9pk.load_images(&tmpdir).await?;
+    let tmp_dir = Arc::new(TmpDir::new().await?);
+    s9pk.load_images(tmp_dir.clone()).await?;
     s9pk.validate_and_filter(None)?;
     let tmp_path = s9pk_path.with_extension("s9pk.tmp");
-    let mut tmp_file = File::create(&tmp_path).await?;
+    let mut tmp_file = create_file(&tmp_path).await?;
     s9pk.serialize(&mut tmp_file, true).await?;
+    drop(s9pk);
     tmp_file.sync_all().await?;
     tokio::fs::rename(&tmp_path, &s9pk_path).await?;
 
+    tmp_dir.gc().await?;
+
     Ok(())
 }
 
@@ -104,13 +110,18 @@ async fn edit_manifest(
     EditManifestParams { expression }: EditManifestParams,
     S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<Manifest, Error> {
-    let mut s9pk = S9pk::from_file(super::load(&ctx, &s9pk_path).await?).await?;
+    let mut s9pk = super::load(
+        MultiCursorFile::from(open_file(&s9pk_path).await?),
+        || ctx.developer_key().cloned(),
+        None,
+    )
+    .await?;
     let old = serde_json::to_value(s9pk.as_manifest()).with_kind(ErrorKind::Serialization)?;
     *s9pk.as_manifest_mut() = serde_json::from_value(apply_expr(old.into(), &expression)?.into())
         .with_kind(ErrorKind::Serialization)?;
     let manifest = s9pk.as_manifest().clone();
     let tmp_path = s9pk_path.with_extension("s9pk.tmp");
-    let mut tmp_file = File::create(&tmp_path).await?;
+    let mut tmp_file = create_file(&tmp_path).await?;
     s9pk.as_archive_mut()
         .set_signer(ctx.developer_key()?.clone(), SIG_CONTEXT);
     s9pk.serialize(&mut tmp_file, true).await?;
@@ -123,9 +134,14 @@ async fn edit_manifest(
 async fn file_tree(
     ctx: CliContext,
     _: Empty,
-    S9pkPath { s9pk }: S9pkPath,
+    S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<Vec<PathBuf>, Error> {
-    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
+    let s9pk = super::load(
+        MultiCursorFile::from(open_file(&s9pk_path).await?),
+        || ctx.developer_key().cloned(),
+        None,
+    )
+    .await?;
     Ok(s9pk.as_archive().contents().file_paths(""))
 }
 
@@ -138,11 +154,16 @@ struct CatParams {
 async fn cat(
     ctx: CliContext,
     CatParams { file_path }: CatParams,
-    S9pkPath { s9pk }: S9pkPath,
+    S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<(), Error> {
     use crate::s9pk::merkle_archive::source::FileSource;
 
-    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
+    let s9pk = super::load(
+        MultiCursorFile::from(open_file(&s9pk_path).await?),
+        || ctx.developer_key().cloned(),
+        None,
+    )
+    .await?;
     tokio::io::copy(
         &mut s9pk
             .as_archive()
@@ -162,8 +183,13 @@ async fn cat(
 async fn inspect_manifest(
     ctx: CliContext,
     _: Empty,
-    S9pkPath { s9pk }: S9pkPath,
+    S9pkPath { s9pk: s9pk_path }: S9pkPath,
 ) -> Result<Manifest, Error> {
-    let s9pk = S9pk::from_file(super::load(&ctx, &s9pk).await?).await?;
+    let s9pk = super::load(
+        MultiCursorFile::from(open_file(&s9pk_path).await?),
+        || ctx.developer_key().cloned(),
+        None,
+    )
+    .await?;
     Ok(s9pk.as_manifest().clone())
 }
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index 845d8f773..4a9956f9f 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -1,8 +1,7 @@
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
-use emver::VersionRange;
-use imbl_value::InOMap;
+use exver::{Version, VersionRange};
 use indexmap::IndexMap;
 pub use models::PackageId;
 use models::{ActionId, HealthCheckId, ImageId, VolumeId};
@@ -13,23 +12,16 @@ use crate::prelude::*;
 use crate::s9pk::git_hash::GitHash;
 use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
 use crate::util::serde::{Duration, IoFormat};
-use crate::util::VersionString;
-use crate::version::{Current, VersionT};
-
-fn current_version() -> VersionString {
-    Current::new().semver().into()
-}
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct Manifest {
-    #[serde(default = "current_version")]
-    pub eos_version: VersionString,
+    pub eos_version: Version,
     pub id: PackageId,
     #[serde(default)]
     pub git_hash: Option<GitHash>,
     pub title: String,
-    pub version: VersionString,
+    pub version: exver::emver::Version,
     pub description: Description,
     #[serde(default)]
     pub assets: Assets,
diff --git a/core/startos/src/s9pk/v1/reader.rs b/core/startos/src/s9pk/v1/reader.rs
index 7437fdaa9..f2bbf578e 100644
--- a/core/startos/src/s9pk/v1/reader.rs
+++ b/core/startos/src/s9pk/v1/reader.rs
@@ -20,6 +20,7 @@ use super::header::{FileSection, Header, TableOfContents};
 use super::SIG_CONTEXT;
 use crate::prelude::*;
 use crate::s9pk::v1::docker::DockerReader;
+use crate::util::io::open_file;
 use crate::util::VersionString;
 
 #[pin_project::pin_project]
@@ -150,9 +151,7 @@ pub struct S9pkReader<R: AsyncRead + AsyncSeek + Unpin + Send + Sync = BufReader
 impl S9pkReader {
     pub async fn open<P: AsRef<Path>>(path: P, check_sig: bool) -> Result<Self, Error> {
         let p = path.as_ref();
-        let rdr = File::open(p)
-            .await
-            .with_ctx(|_| (crate::error::ErrorKind::Filesystem, p.display().to_string()))?;
+        let rdr = open_file(p).await?;
 
         Self::from_reader(BufReader::new(rdr), check_sig).await
     }
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index ec5b586ea..914d2e5aa 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -2,9 +2,8 @@ use std::collections::BTreeMap;
 use std::path::Path;
 use std::sync::Arc;
 
-use itertools::Itertools;
+use exver::ExtendedVersion;
 use models::ImageId;
-use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncSeek, AsyncWriteExt};
 use tokio::process::Command;
 
@@ -12,29 +11,35 @@ use crate::dependencies::{DepInfo, Dependencies};
 use crate::prelude::*;
 use crate::s9pk::manifest::Manifest;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
-use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::s9pk::merkle_archive::source::Section;
+use crate::s9pk::merkle_archive::source::TmpSource;
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
-use crate::s9pk::rpc::SKIP_ENV;
 use crate::s9pk::v1::manifest::{Manifest as ManifestV1, PackageProcedure};
 use crate::s9pk::v1::reader::S9pkReader;
-use crate::s9pk::v2::pack::{PackSource, CONTAINER_TOOL};
+use crate::s9pk::v2::pack::{ImageSource, PackSource, CONTAINER_TOOL};
 use crate::s9pk::v2::{S9pk, SIG_CONTEXT};
-use crate::util::io::TmpDir;
+use crate::util::io::{create_file, TmpDir};
 use crate::util::Invoke;
 
 pub const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x01];
 
-impl S9pk<Section<MultiCursorFile>> {
+impl S9pk<TmpSource<PackSource>> {
     #[instrument(skip_all)]
     pub async fn from_v1<R: AsyncRead + AsyncSeek + Unpin + Send + Sync>(
         mut reader: S9pkReader<R>,
-        destination: impl AsRef<Path>,
+        tmp_dir: Arc<TmpDir>,
         signer: ed25519_dalek::SigningKey,
     ) -> Result<Self, Error> {
-        let scratch_dir = TmpDir::new().await?;
+        Command::new(CONTAINER_TOOL)
+            .arg("run")
+            .arg("--rm")
+            .arg("--privileged")
+            .arg("tonistiigi/binfmt")
+            .arg("--install")
+            .arg("all")
+            .invoke(ErrorKind::Docker)
+            .await?;
 
-        let mut archive = DirectoryContents::<PackSource>::new();
+        let mut archive = DirectoryContents::<TmpSource<PackSource>>::new();
 
         // manifest.json
         let manifest_raw = reader.manifest().await?;
@@ -56,33 +61,35 @@ impl S9pk<Section<MultiCursorFile>> {
         let license: Arc<[u8]> = reader.license().await?.to_vec().await?.into();
         archive.insert_path(
             "LICENSE.md",
-            Entry::file(PackSource::Buffered(license.into())),
+            Entry::file(TmpSource::new(
+                tmp_dir.clone(),
+                PackSource::Buffered(license.into()),
+            )),
         )?;
 
         // instructions.md
         let instructions: Arc<[u8]> = reader.instructions().await?.to_vec().await?.into();
         archive.insert_path(
             "instructions.md",
-            Entry::file(PackSource::Buffered(instructions.into())),
+            Entry::file(TmpSource::new(
+                tmp_dir.clone(),
+                PackSource::Buffered(instructions.into()),
+            )),
         )?;
 
         // icon.md
         let icon: Arc<[u8]> = reader.icon().await?.to_vec().await?.into();
         archive.insert_path(
             format!("icon.{}", manifest.assets.icon_type()),
-            Entry::file(PackSource::Buffered(icon.into())),
+            Entry::file(TmpSource::new(
+                tmp_dir.clone(),
+                PackSource::Buffered(icon.into()),
+            )),
         )?;
 
         // images
         for arch in reader.docker_arches().await? {
-            let images_dir = scratch_dir.join("images").join(&arch);
-            let docker_platform = if arch == "x86_64" {
-                "--platform=linux/amd64".to_owned()
-            } else if arch == "aarch64" {
-                "--platform=linux/arm64".to_owned()
-            } else {
-                format!("--platform=linux/{arch}")
-            };
+            let images_dir = tmp_dir.join("images").join(&arch);
             tokio::fs::create_dir_all(&images_dir).await?;
             Command::new(CONTAINER_TOOL)
                 .arg("load")
@@ -93,97 +100,24 @@ impl S9pk<Section<MultiCursorFile>> {
                 let mut image_config = new_manifest.images.remove(image).unwrap_or_default();
                 image_config.arch.insert(arch.as_str().into());
                 new_manifest.images.insert(image.clone(), image_config);
-                let sqfs_path = images_dir.join(image).with_extension("squashfs");
                 let image_name = if *system {
                     format!("start9/{}:latest", image)
                 } else {
                     format!("start9/{}/{}:{}", manifest.id, image, manifest.version)
                 };
-                let id = String::from_utf8(
-                    Command::new(CONTAINER_TOOL)
-                        .arg("create")
-                        .arg(&docker_platform)
-                        .arg(&image_name)
-                        .invoke(ErrorKind::Docker)
-                        .await?,
-                )?;
-                let env = String::from_utf8(
-                    Command::new(CONTAINER_TOOL)
-                        .arg("run")
-                        .arg("--rm")
-                        .arg(&docker_platform)
-                        .arg("--entrypoint")
-                        .arg("env")
-                        .arg(&image_name)
-                        .invoke(ErrorKind::Docker)
-                        .await?,
-                )?
-                .lines()
-                .filter(|l| {
-                    l.trim()
-                        .split_once("=")
-                        .map_or(false, |(v, _)| !SKIP_ENV.contains(&v))
-                })
-                .join("\n")
-                    + "\n";
-                let workdir = Path::new(
-                    String::from_utf8(
-                        Command::new(CONTAINER_TOOL)
-                            .arg("run")
-                            .arg("--rm")
-                            .arg(&docker_platform)
-                            .arg("--entrypoint")
-                            .arg("pwd")
-                            .arg(&image_name)
-                            .invoke(ErrorKind::Docker)
-                            .await?,
-                    )?
-                    .trim(),
-                )
-                .to_owned();
-                Command::new("bash")
-                    .arg("-c")
-                    .arg(format!(
-                        "{CONTAINER_TOOL} export {id} | mksquashfs - {sqfs} -tar",
-                        id = id.trim(),
-                        sqfs = sqfs_path.display()
-                    ))
-                    .invoke(ErrorKind::Docker)
-                    .await?;
-                Command::new(CONTAINER_TOOL)
-                    .arg("rm")
-                    .arg(id.trim())
-                    .invoke(ErrorKind::Docker)
+                ImageSource::DockerTag(image_name.clone())
+                    .load(
+                        tmp_dir.clone(),
+                        &new_manifest.id,
+                        &new_manifest.version,
+                        image,
+                        &arch,
+                        &mut archive,
+                    )
                     .await?;
-                archive.insert_path(
-                    Path::new("images")
-                        .join(&arch)
-                        .join(&image)
-                        .with_extension("squashfs"),
-                    Entry::file(PackSource::File(sqfs_path)),
-                )?;
-                archive.insert_path(
-                    Path::new("images")
-                        .join(&arch)
-                        .join(&image)
-                        .with_extension("env"),
-                    Entry::file(PackSource::Buffered(Vec::from(env).into())),
-                )?;
-                archive.insert_path(
-                    Path::new("images")
-                        .join(&arch)
-                        .join(&image)
-                        .with_extension("json"),
-                    Entry::file(PackSource::Buffered(
-                        serde_json::to_vec(&serde_json::json!({
-                            "workdir": workdir
-                        }))
-                        .with_kind(ErrorKind::Serialization)?
-                        .into(),
-                    )),
-                )?;
                 Command::new(CONTAINER_TOOL)
                     .arg("rmi")
+                    .arg("-f")
                     .arg(&image_name)
                     .invoke(ErrorKind::Docker)
                     .await?;
@@ -191,7 +125,7 @@ impl S9pk<Section<MultiCursorFile>> {
         }
 
         // assets
-        let asset_dir = scratch_dir.join("assets");
+        let asset_dir = tmp_dir.join("assets");
         tokio::fs::create_dir_all(&asset_dir).await?;
         tokio_tar::Archive::new(reader.assets().await?)
             .unpack(&asset_dir)
@@ -212,21 +146,21 @@ impl S9pk<Section<MultiCursorFile>> {
                 Path::new("assets")
                     .join(&asset_id)
                     .with_extension("squashfs"),
-                Entry::file(PackSource::File(sqfs_path)),
+                Entry::file(TmpSource::new(tmp_dir.clone(), PackSource::File(sqfs_path))),
             )?;
         }
 
         // javascript
-        let js_dir = scratch_dir.join("javascript");
+        let js_dir = tmp_dir.join("javascript");
         let sqfs_path = js_dir.with_extension("squashfs");
         tokio::fs::create_dir_all(&js_dir).await?;
         if let Some(mut scripts) = reader.scripts().await? {
-            let mut js_file = File::create(js_dir.join("embassy.js")).await?;
+            let mut js_file = create_file(js_dir.join("embassy.js")).await?;
             tokio::io::copy(&mut scripts, &mut js_file).await?;
             js_file.sync_all().await?;
         }
         {
-            let mut js_file = File::create(js_dir.join("embassyManifest.json")).await?;
+            let mut js_file = create_file(js_dir.join("embassyManifest.json")).await?;
             js_file
                 .write_all(&serde_json::to_vec(&manifest_raw).with_kind(ErrorKind::Serialization)?)
                 .await?;
@@ -239,30 +173,24 @@ impl S9pk<Section<MultiCursorFile>> {
             .await?;
         archive.insert_path(
             Path::new("javascript.squashfs"),
-            Entry::file(PackSource::File(sqfs_path)),
+            Entry::file(TmpSource::new(tmp_dir.clone(), PackSource::File(sqfs_path))),
         )?;
 
         archive.insert_path(
             "manifest.json",
-            Entry::file(PackSource::Buffered(
-                serde_json::to_vec::<Manifest>(&new_manifest)
-                    .with_kind(ErrorKind::Serialization)?
-                    .into(),
+            Entry::file(TmpSource::new(
+                tmp_dir.clone(),
+                PackSource::Buffered(
+                    serde_json::to_vec::<Manifest>(&new_manifest)
+                        .with_kind(ErrorKind::Serialization)?
+                        .into(),
+                ),
             )),
         )?;
 
-        let mut s9pk = S9pk::new(MerkleArchive::new(archive, signer, SIG_CONTEXT), None).await?;
-        let mut dest_file = File::create(destination.as_ref()).await?;
-        s9pk.serialize(&mut dest_file, false).await?;
-        dest_file.sync_all().await?;
-
-        scratch_dir.delete().await?;
-
-        Ok(S9pk::deserialize(
-            &MultiCursorFile::from(File::open(destination.as_ref()).await?),
-            None,
-        )
-        .await?)
+        let mut res = S9pk::new(MerkleArchive::new(archive, signer, SIG_CONTEXT), None).await?;
+        res.as_archive_mut().update_hashes(true).await?;
+        Ok(res)
     }
 }
 
@@ -272,7 +200,7 @@ impl From<ManifestV1> for Manifest {
         Self {
             id: value.id,
             title: value.title,
-            version: value.version,
+            version: ExtendedVersion::from(value.version).into(),
             release_notes: value.release_notes,
             license: value.license.into(),
             wrapper_repo: value.wrapper_repo,
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index 9ae8524fa..9607bb654 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -2,6 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::path::Path;
 
 use color_eyre::eyre::eyre;
+use exver::Version;
 use helpers::const_true;
 use imbl_value::InternedString;
 pub use models::PackageId;
@@ -20,8 +21,8 @@ use crate::util::serde::Regex;
 use crate::util::VersionString;
 use crate::version::{Current, VersionT};
 
-fn current_version() -> VersionString {
-    Current::new().semver().into()
+fn current_version() -> Version {
+    Current::new().semver()
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
@@ -59,7 +60,8 @@ pub struct Manifest {
     #[ts(type = "string | null")]
     pub git_hash: Option<GitHash>,
     #[serde(default = "current_version")]
-    pub os_version: VersionString,
+    #[ts(type = "string")]
+    pub os_version: Version,
     #[serde(default = "const_true")]
     pub has_config: bool,
 }
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index a1183efa8..2477e63a0 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -12,10 +12,12 @@ use crate::s9pk::manifest::Manifest;
 use crate::s9pk::merkle_archive::file_contents::FileContents;
 use crate::s9pk::merkle_archive::sink::Sink;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::s9pk::merkle_archive::source::{ArchiveSource, DynFileSource, FileSource, Section};
+use crate::s9pk::merkle_archive::source::{
+    ArchiveSource, DynFileSource, FileSource, Section, TmpSource,
+};
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
 use crate::s9pk::v2::pack::{ImageSource, PackSource};
-use crate::util::io::TmpDir;
+use crate::util::io::{open_file, TmpDir};
 
 const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x02];
 
@@ -165,8 +167,8 @@ impl<S: FileSource + Clone> S9pk<S> {
     }
 }
 
-impl<S: From<PackSource> + FileSource + Clone> S9pk<S> {
-    pub async fn load_images(&mut self, tmpdir: &TmpDir) -> Result<(), Error> {
+impl<S: From<TmpSource<PackSource>> + FileSource + Clone> S9pk<S> {
+    pub async fn load_images(&mut self, tmp_dir: Arc<TmpDir>) -> Result<(), Error> {
         let id = &self.manifest.id;
         let version = &self.manifest.version;
         for (image_id, image_config) in &mut self.manifest.images {
@@ -175,7 +177,7 @@ impl<S: From<PackSource> + FileSource + Clone> S9pk<S> {
                 image_config
                     .source
                     .load(
-                        tmpdir,
+                        tmp_dir.clone(),
                         id,
                         version,
                         image_id,
@@ -206,7 +208,7 @@ impl<S: ArchiveSource + Clone> S9pk<Section<S>> {
             )
             .await?;
 
-        let mut magic_version = [0u8; 3];
+        let mut magic_version = [0u8; MAGIC_AND_VERSION.len()];
         header.read_exact(&mut magic_version).await?;
         ensure_code!(
             &magic_version == MAGIC_AND_VERSION,
@@ -232,7 +234,7 @@ impl S9pk {
         Self::deserialize(&MultiCursorFile::from(file), None).await
     }
     pub async fn open(path: impl AsRef<Path>, id: Option<&PackageId>) -> Result<Self, Error> {
-        let res = Self::from_file(tokio::fs::File::open(path).await?).await?;
+        let res = Self::from_file(open_file(path).await?).await?;
         if let Some(id) = id {
             ensure_code!(
                 &res.as_manifest().id == id,
diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index 18fe0472b..fb271e785 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -10,7 +10,6 @@ use futures::{FutureExt, TryStreamExt};
 use imbl_value::InternedString;
 use models::{ImageId, PackageId, VersionString};
 use serde::{Deserialize, Serialize};
-use tokio::fs::File;
 use tokio::io::AsyncRead;
 use tokio::process::Command;
 use tokio::sync::OnceCell;
@@ -23,12 +22,12 @@ use crate::rpc_continuations::Guid;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::{
-    into_dyn_read, ArchiveSource, DynFileSource, FileSource,
+    into_dyn_read, ArchiveSource, DynFileSource, FileSource, TmpSource,
 };
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
 use crate::s9pk::v2::SIG_CONTEXT;
 use crate::s9pk::S9pk;
-use crate::util::io::TmpDir;
+use crate::util::io::{create_file, open_file, TmpDir};
 use crate::util::Invoke;
 
 #[cfg(not(feature = "docker"))]
@@ -64,7 +63,7 @@ impl SqfsDir {
                     .invoke(ErrorKind::Filesystem)
                     .await?;
                 Ok(MultiCursorFile::from(
-                    File::open(&path)
+                    open_file(&path)
                         .await
                         .with_ctx(|_| (ErrorKind::Filesystem, path.display()))?,
                 ))
@@ -100,11 +99,7 @@ impl FileSource for PackSource {
     async fn reader(&self) -> Result<Self::Reader, Error> {
         match self {
             Self::Buffered(a) => Ok(into_dyn_read(Cursor::new(a.clone()))),
-            Self::File(f) => Ok(into_dyn_read(
-                File::open(f)
-                    .await
-                    .with_ctx(|_| (ErrorKind::Filesystem, f.display()))?,
-            )),
+            Self::File(f) => Ok(into_dyn_read(open_file(f).await?)),
             Self::Squashfs(dir) => dir.file().await?.fetch_all().await.map(into_dyn_read),
         }
     }
@@ -284,9 +279,9 @@ pub enum ImageSource {
 }
 impl ImageSource {
     #[instrument(skip_all)]
-    pub fn load<'a, S: From<PackSource> + FileSource + Clone>(
+    pub fn load<'a, S: From<TmpSource<PackSource>> + FileSource + Clone>(
         &'a self,
-        tmpdir: &'a TmpDir,
+        tmp_dir: Arc<TmpDir>,
         id: &'a PackageId,
         version: &'a VersionString,
         image_id: &'a ImageId,
@@ -331,12 +326,13 @@ impl ImageSource {
                         .arg(&tag)
                         .arg(&docker_platform)
                         .arg("-o")
-                        .arg("type=image")
+                        .arg("type=docker,dest=-")
                         .capture(false)
+                        .pipe(Command::new(CONTAINER_TOOL).arg("load"))
                         .invoke(ErrorKind::Docker)
                         .await?;
                     ImageSource::DockerTag(tag.clone())
-                        .load(tmpdir, id, version, image_id, arch, into)
+                        .load(tmp_dir, id, version, image_id, arch, into)
                         .await?;
                     Command::new(CONTAINER_TOOL)
                         .arg("rmi")
@@ -390,21 +386,24 @@ impl ImageSource {
                     into.insert_path(
                         base_path.with_extension("json"),
                         Entry::file(
-                            PackSource::Buffered(
-                                serde_json::to_vec(&ImageMetadata {
-                                    workdir: if config.working_dir == Path::new("") {
-                                        "/".into()
-                                    } else {
-                                        config.working_dir
-                                    },
-                                    user: if config.user.is_empty() {
-                                        "root".into()
-                                    } else {
-                                        config.user.into()
-                                    },
-                                })
-                                .with_kind(ErrorKind::Serialization)?
-                                .into(),
+                            TmpSource::new(
+                                tmp_dir.clone(),
+                                PackSource::Buffered(
+                                    serde_json::to_vec(&ImageMetadata {
+                                        workdir: if config.working_dir == Path::new("") {
+                                            "/".into()
+                                        } else {
+                                            config.working_dir
+                                        },
+                                        user: if config.user.is_empty() {
+                                            "root".into()
+                                        } else {
+                                            config.user.into()
+                                        },
+                                    })
+                                    .with_kind(ErrorKind::Serialization)?
+                                    .into(),
+                                ),
                             )
                             .into(),
                         ),
@@ -412,10 +411,16 @@ impl ImageSource {
                     into.insert_path(
                         base_path.with_extension("env"),
                         Entry::file(
-                            PackSource::Buffered(config.env.join("\n").into_bytes().into()).into(),
+                            TmpSource::new(
+                                tmp_dir.clone(),
+                                PackSource::Buffered(config.env.join("\n").into_bytes().into()),
+                            )
+                            .into(),
                         ),
                     )?;
-                    let dest = tmpdir.join(Guid::new().as_ref()).with_extension("squashfs");
+                    let dest = tmp_dir
+                        .join(Guid::new().as_ref())
+                        .with_extension("squashfs");
                     let container = String::from_utf8(
                         Command::new(CONTAINER_TOOL)
                             .arg("create")
@@ -438,7 +443,7 @@ impl ImageSource {
                         .await?;
                     into.insert_path(
                         base_path.with_extension("squashfs"),
-                        Entry::file(PackSource::File(dest).into()),
+                        Entry::file(TmpSource::new(tmp_dir.clone(), PackSource::File(dest)).into()),
                     )?;
 
                     Ok(())
@@ -460,8 +465,8 @@ pub struct ImageMetadata {
 
 #[instrument(skip_all)]
 pub async fn pack(ctx: CliContext, params: PackParams) -> Result<(), Error> {
-    let tmpdir = Arc::new(TmpDir::new().await?);
-    let mut files = DirectoryContents::<PackSource>::new();
+    let tmp_dir = Arc::new(TmpDir::new().await?);
+    let mut files = DirectoryContents::<TmpSource<PackSource>>::new();
     let js_dir = params.javascript();
     let manifest: Arc<[u8]> = Command::new("node")
         .arg("-e")
@@ -474,7 +479,10 @@ pub async fn pack(ctx: CliContext, params: PackParams) -> Result<(), Error> {
         .into();
     files.insert(
         "manifest.json".into(),
-        Entry::file(PackSource::Buffered(manifest.clone())),
+        Entry::file(TmpSource::new(
+            tmp_dir.clone(),
+            PackSource::Buffered(manifest.clone()),
+        )),
     );
     let icon = params.icon().await?;
     let icon_ext = icon
@@ -483,22 +491,28 @@ pub async fn pack(ctx: CliContext, params: PackParams) -> Result<(), Error> {
         .to_string_lossy();
     files.insert(
         InternedString::from_display(&lazy_format!("icon.{}", icon_ext)),
-        Entry::file(PackSource::File(icon)),
+        Entry::file(TmpSource::new(tmp_dir.clone(), PackSource::File(icon))),
     );
     files.insert(
         "LICENSE.md".into(),
-        Entry::file(PackSource::File(params.license())),
+        Entry::file(TmpSource::new(
+            tmp_dir.clone(),
+            PackSource::File(params.license()),
+        )),
     );
     files.insert(
         "instructions.md".into(),
-        Entry::file(PackSource::File(params.instructions())),
+        Entry::file(TmpSource::new(
+            tmp_dir.clone(),
+            PackSource::File(params.instructions()),
+        )),
     );
     files.insert(
         "javascript.squashfs".into(),
-        Entry::file(PackSource::Squashfs(Arc::new(SqfsDir::new(
-            js_dir,
-            tmpdir.clone(),
-        )))),
+        Entry::file(TmpSource::new(
+            tmp_dir.clone(),
+            PackSource::Squashfs(Arc::new(SqfsDir::new(js_dir, tmp_dir.clone()))),
+        )),
     );
 
     let mut s9pk = S9pk::new(
@@ -511,26 +525,29 @@ pub async fn pack(ctx: CliContext, params: PackParams) -> Result<(), Error> {
     for assets in s9pk.as_manifest().assets.clone() {
         s9pk.as_archive_mut().contents_mut().insert_path(
             Path::new("assets").join(&assets).with_extension("squashfs"),
-            Entry::file(PackSource::Squashfs(Arc::new(SqfsDir::new(
-                assets_dir.join(&assets),
-                tmpdir.clone(),
-            )))),
+            Entry::file(TmpSource::new(
+                tmp_dir.clone(),
+                PackSource::Squashfs(Arc::new(SqfsDir::new(
+                    assets_dir.join(&assets),
+                    tmp_dir.clone(),
+                ))),
+            )),
         )?;
     }
 
-    s9pk.load_images(&*tmpdir).await?;
+    s9pk.load_images(tmp_dir.clone()).await?;
 
     s9pk.validate_and_filter(None)?;
 
     s9pk.serialize(
-        &mut File::create(params.output(&s9pk.as_manifest().id)).await?,
+        &mut create_file(params.output(&s9pk.as_manifest().id)).await?,
         false,
     )
     .await?;
 
     drop(s9pk);
 
-    tmpdir.gc().await?;
+    tmp_dir.gc().await?;
 
     Ok(())
 }
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 92564b8e4..b85bd8d6d 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -11,7 +11,6 @@ use persistent_container::PersistentContainer;
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
 use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
-use tokio::fs::File;
 use tokio::sync::Notify;
 use ts_rs::TS;
 
@@ -33,6 +32,7 @@ use crate::status::MainStatus;
 use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::concurrent::ConcurrentActor;
 use crate::util::actor::Actor;
+use crate::util::io::create_file;
 use crate::util::serde::Pem;
 use crate::volume::data_dir;
 
@@ -403,7 +403,7 @@ impl Service {
     #[instrument(skip_all)]
     pub async fn backup(&self, guard: impl GenericMountGuard) -> Result<(), Error> {
         let id = &self.seed.id;
-        let mut file = File::create(guard.path().join(id).with_extension("s9pk")).await?;
+        let mut file = create_file(guard.path().join(id).with_extension("s9pk")).await?;
         self.seed
             .persistent_container
             .s9pk
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index d9d08e5d3..e0b31ea97 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -9,14 +9,12 @@ use helpers::NonDetachingJoinHandle;
 use models::{ImageId, ProcedureName, VolumeId};
 use rpc_toolkit::{Empty, Server, ShutdownHandle};
 use serde::de::DeserializeOwned;
-use tokio::fs::File;
 use tokio::process::Command;
 use tokio::sync::{oneshot, watch, Mutex, OnceCell};
 use tracing::instrument;
 
 use super::service_effect_handler::{service_effect_handler, EffectContext};
 use super::transition::{TransitionKind, TransitionState};
-use super::ServiceActorSeed;
 use crate::context::RpcContext;
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
@@ -32,6 +30,7 @@ use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
 use crate::service::start_stop::StartStop;
 use crate::service::{rpc, RunningStatus, Service};
+use crate::util::io::create_file;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::Invoke;
 use crate::volume::{asset_dir, data_dir};
@@ -237,7 +236,7 @@ impl PersistentContainer {
                 .get_path(Path::new("images").join(arch).join(&env_filename))
                 .and_then(|e| e.as_file())
             {
-                env.copy(&mut File::create(image_path.join(&env_filename)).await?)
+                env.copy(&mut create_file(image_path.join(&env_filename)).await?)
                     .await?;
             }
             let json_filename = Path::new(image.as_ref()).with_extension("json");
@@ -247,7 +246,7 @@ impl PersistentContainer {
                 .get_path(Path::new("images").join(arch).join(&json_filename))
                 .and_then(|e| e.as_file())
             {
-                json.copy(&mut File::create(image_path.join(&json_filename)).await?)
+                json.copy(&mut create_file(image_path.join(&json_filename)).await?)
                     .await?;
             }
         }
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 63c313ead..7547584e0 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -7,8 +7,8 @@ use std::str::FromStr;
 use std::sync::{Arc, Weak};
 
 use clap::builder::ValueParserFactory;
-use clap::{CommandFactory, FromArgMatches, Parser};
-use emver::VersionRange;
+use clap::Parser;
+use exver::VersionRange;
 use imbl_value::json;
 use itertools::Itertools;
 use models::{
@@ -1383,7 +1383,7 @@ struct CheckDependenciesResult {
     is_running: bool,
     health_checks: Vec<HealthCheckResult>,
     #[ts(type = "string | null")]
-    version: Option<emver::Version>,
+    version: Option<exver::ExtendedVersion>,
 }
 
 async fn check_dependencies(
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index f8874d21a..02244169c 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -94,12 +94,19 @@ impl ServiceMap {
     }
 
     #[instrument(skip_all)]
-    pub async fn install<S: FileSource + Clone>(
+    pub async fn install<F, Fut, S: FileSource + Clone>(
         &self,
         ctx: RpcContext,
-        mut s9pk: S9pk<S>,
+        s9pk: F,
         recovery_source: Option<impl GenericMountGuard>,
-    ) -> Result<DownloadInstallFuture, Error> {
+        progress: Option<FullProgressTracker>,
+    ) -> Result<DownloadInstallFuture, Error>
+    where
+        F: FnOnce() -> Fut,
+        Fut: Future<Output = Result<S9pk<S>, Error>>,
+        S: FileSource + Clone,
+    {
+        let mut s9pk = s9pk().await?;
         s9pk.validate_and_filter(ctx.s9pk_arch)?;
         let manifest = s9pk.as_manifest().clone();
         let id = manifest.id.clone();
@@ -118,7 +125,7 @@ impl ServiceMap {
         };
 
         let size = s9pk.size();
-        let progress = FullProgressTracker::new();
+        let progress = progress.unwrap_or_else(|| FullProgressTracker::new());
         let download_progress_contribution = size.unwrap_or(60);
         let mut download_progress = progress.add_phase(
             InternedString::intern("Download"),
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 2b701c01f..8fb7cf7c1 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -8,7 +8,6 @@ use patch_db::json_ptr::ROOT;
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
 use tokio::try_join;
 use tracing::instrument;
@@ -35,7 +34,7 @@ use crate::prelude::*;
 use crate::progress::{FullProgress, PhaseProgressTrackerHandle};
 use crate::rpc_continuations::Guid;
 use crate::util::crypto::EncryptedWire;
-use crate::util::io::{dir_copy, dir_size, Counter};
+use crate::util::io::{create_file, dir_copy, dir_size, Counter};
 use crate::{Error, ErrorKind, ResultExt};
 
 pub fn setup<C: Context>() -> ParentHandler<C> {
@@ -324,7 +323,7 @@ pub async fn execute(
 pub async fn complete(ctx: SetupContext) -> Result<SetupResult, Error> {
     match ctx.result.get() {
         Some(Ok((res, ctx))) => {
-            let mut guid_file = File::create("/media/startos/config/disk.guid").await?;
+            let mut guid_file = create_file("/media/startos/config/disk.guid").await?;
             guid_file.write_all(ctx.disk_guid.as_bytes()).await?;
             guid_file.sync_all().await?;
             Ok(res.clone())
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index 82d06be4c..b97fba3e4 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -13,6 +13,7 @@ use ts_rs::TS;
 use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
 use crate::util::clap::FromStrParser;
+use crate::util::io::create_file;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 
 pub const SSH_AUTHORIZED_KEYS_FILE: &str = "/home/start9/.ssh/authorized_keys";
@@ -229,7 +230,7 @@ pub async fn sync_keys<P: AsRef<Path>>(keys: &SshKeys, dest: P) -> Result<(), Er
     if tokio::fs::metadata(ssh_dir).await.is_err() {
         tokio::fs::create_dir_all(ssh_dir).await?;
     }
-    let mut f = tokio::fs::File::create(dest).await?;
+    let mut f = create_file(dest).await?;
     for key in keys.0.values() {
         f.write_all(key.0.to_key_format().as_bytes()).await?;
         f.write_all(b"\n").await?;
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index 50b17b54a..7a8cb9afe 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -20,6 +20,7 @@ use crate::prelude::*;
 use crate::rpc_continuations::RpcContinuations;
 use crate::shutdown::Shutdown;
 use crate::util::cpupower::{get_available_governors, set_governor, Governor};
+use crate::util::io::open_file;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::util::Invoke;
 
@@ -657,7 +658,7 @@ impl ProcStat {
 async fn get_proc_stat() -> Result<ProcStat, Error> {
     use tokio::io::AsyncBufReadExt;
     let mut cpu_line = String::new();
-    let _n = tokio::io::BufReader::new(tokio::fs::File::open("/proc/stat").await?)
+    let _n = tokio::io::BufReader::new(open_file("/proc/stat").await?)
         .read_line(&mut cpu_line)
         .await?;
     let stats: Vec<u64> = cpu_line
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index dc164d2cd..79d852754 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -4,8 +4,8 @@ use std::time::Duration;
 
 use clap::{ArgAction, Parser};
 use color_eyre::eyre::{eyre, Result};
-use emver::{Version, VersionRange};
-use futures::{FutureExt, TryStreamExt};
+use exver::{Version, VersionRange};
+use futures::TryStreamExt;
 use helpers::{AtomicFile, NonDetachingJoinHandle};
 use imbl_value::json;
 use itertools::Itertools;
diff --git a/core/startos/src/upload.rs b/core/startos/src/upload.rs
index b922ab9d2..4735a63fb 100644
--- a/core/startos/src/upload.rs
+++ b/core/startos/src/upload.rs
@@ -1,3 +1,4 @@
+use std::io::SeekFrom;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::Poll;
@@ -5,20 +6,20 @@ use std::time::Duration;
 
 use axum::body::Body;
 use axum::response::Response;
-use futures::StreamExt;
+use futures::{ready, FutureExt, StreamExt};
 use http::header::CONTENT_LENGTH;
 use http::StatusCode;
 use imbl_value::InternedString;
 use tokio::fs::File;
-use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
+use tokio::io::{AsyncRead, AsyncSeek, AsyncSeekExt, AsyncWrite, AsyncWriteExt};
 use tokio::sync::watch;
 
 use crate::context::RpcContext;
 use crate::prelude::*;
 use crate::rpc_continuations::{Guid, RpcContinuation};
-use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::{FileCursor, MultiCursorFile};
 use crate::s9pk::merkle_archive::source::ArchiveSource;
-use crate::util::io::TmpDir;
+use crate::util::io::{create_file, TmpDir};
 
 pub async fn upload(
     ctx: &RpcContext,
@@ -215,14 +216,15 @@ impl UploadingFile {
     pub async fn new() -> Result<(UploadHandle, Self), Error> {
         let progress = watch::channel(Progress::default());
         let tmp_dir = Arc::new(TmpDir::new().await?);
-        let file = File::create(tmp_dir.join("upload.tmp")).await?;
+        let file = create_file(tmp_dir.join("upload.tmp")).await?;
         let uploading = Self {
-            tmp_dir,
+            tmp_dir: tmp_dir.clone(),
             file: MultiCursorFile::open(&file).await?,
             progress: progress.1,
         };
         Ok((
             UploadHandle {
+                tmp_dir,
                 file,
                 progress: progress.0,
             },
@@ -237,22 +239,127 @@ impl UploadingFile {
     }
 }
 impl ArchiveSource for UploadingFile {
-    type Reader = <MultiCursorFile as ArchiveSource>::Reader;
+    type FetchReader = <MultiCursorFile as ArchiveSource>::FetchReader;
+    type FetchAllReader = UploadingFileReader;
     async fn size(&self) -> Option<u64> {
         Progress::expected_size(&mut self.progress.clone()).await
     }
-    async fn fetch_all(&self) -> Result<impl AsyncRead + Unpin + Send, Error> {
-        Progress::ready(&mut self.progress.clone()).await?;
-        self.file.fetch_all().await
+    async fn fetch_all(&self) -> Result<Self::FetchAllReader, Error> {
+        let mut file = self.file.cursor().await?;
+        file.seek(SeekFrom::Start(0)).await?;
+        Ok(UploadingFileReader {
+            tmp_dir: self.tmp_dir.clone(),
+            file,
+            position: 0,
+            to_seek: None,
+            progress: self.progress.clone(),
+        })
     }
-    async fn fetch(&self, position: u64, size: u64) -> Result<Self::Reader, Error> {
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::FetchReader, Error> {
         Progress::ready_for(&mut self.progress.clone(), position + size).await?;
         self.file.fetch(position, size).await
     }
 }
 
+#[pin_project::pin_project(project = UploadingFileReaderProjection)]
+pub struct UploadingFileReader {
+    tmp_dir: Arc<TmpDir>,
+    position: u64,
+    to_seek: Option<SeekFrom>,
+    #[pin]
+    file: FileCursor,
+    progress: watch::Receiver<Progress>,
+}
+impl<'a> UploadingFileReaderProjection<'a> {
+    fn poll_ready(&mut self, cx: &mut std::task::Context<'_>) -> Result<bool, std::io::Error> {
+        let ready = Progress::ready(&mut *self.progress);
+        tokio::pin!(ready);
+        Ok(ready
+            .poll_unpin(cx)
+            .map_err(|e| std::io::Error::other(e.source))?
+            .is_ready())
+    }
+    fn poll_ready_for(
+        &mut self,
+        cx: &mut std::task::Context<'_>,
+        size: u64,
+    ) -> Result<bool, std::io::Error> {
+        let ready = Progress::ready_for(&mut *self.progress, size);
+        tokio::pin!(ready);
+        Ok(ready
+            .poll_unpin(cx)
+            .map_err(|e| std::io::Error::other(e.source))?
+            .is_ready())
+    }
+}
+impl AsyncRead for UploadingFileReader {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &mut tokio::io::ReadBuf<'_>,
+    ) -> Poll<std::io::Result<()>> {
+        let mut this = self.project();
+
+        let position = *this.position;
+        if this.poll_ready(cx)? || this.poll_ready_for(cx, position + buf.remaining() as u64)? {
+            let start = buf.filled().len();
+            let res = this.file.poll_read(cx, buf);
+            *this.position += (buf.filled().len() - start) as u64;
+            res
+        } else {
+            Poll::Pending
+        }
+    }
+}
+impl AsyncSeek for UploadingFileReader {
+    fn start_seek(self: Pin<&mut Self>, position: SeekFrom) -> std::io::Result<()> {
+        let this = self.project();
+        *this.to_seek = Some(position);
+        Ok(())
+    }
+    fn poll_complete(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<std::io::Result<u64>> {
+        let mut this = self.project();
+        if let Some(to_seek) = *this.to_seek {
+            let size = match to_seek {
+                SeekFrom::Current(n) => (*this.position as i64 + n) as u64,
+                SeekFrom::Start(n) => n,
+                SeekFrom::End(n) => {
+                    let expected_size = this.progress.borrow().expected_size;
+                    match expected_size {
+                        Some(end) => (end as i64 + n) as u64,
+                        None => {
+                            if !this.poll_ready(cx)? {
+                                return Poll::Pending;
+                            }
+                            (this.progress.borrow().expected_size.ok_or_else(|| {
+                                std::io::Error::new(
+                                    std::io::ErrorKind::Other,
+                                    eyre!("upload maked complete without expected size"),
+                                )
+                            })? as i64
+                                + n) as u64
+                        }
+                    }
+                }
+            };
+            if !this.poll_ready_for(cx, size)? {
+                return Poll::Pending;
+            }
+        }
+        if let Some(seek) = this.to_seek.take() {
+            this.file.as_mut().start_seek(seek)?;
+        }
+        *this.position = ready!(this.file.as_mut().poll_complete(cx)?);
+        Poll::Ready(Ok(*this.position))
+    }
+}
+
 #[pin_project::pin_project(PinnedDrop)]
 pub struct UploadHandle {
+    tmp_dir: Arc<TmpDir>,
     #[pin]
     file: File,
     progress: watch::Sender<Progress>,
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index b5748d1d9..1ec789f23 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -610,13 +610,13 @@ pub fn dir_copy<'a, P0: AsRef<Path> + 'a + Send + Sync, P1: AsRef<Path> + 'a + S
                 let src_path = e.path();
                 let dst_path = dst_path.join(e.file_name());
                 if m.is_file() {
-                    let mut dst_file = tokio::fs::File::create(&dst_path).await.with_ctx(|_| {
+                    let mut dst_file = create_file(&dst_path).await.with_ctx(|_| {
                         (
                             crate::ErrorKind::Filesystem,
                             format!("create {}", dst_path.display()),
                         )
                     })?;
-                    let mut rdr = tokio::fs::File::open(&src_path).await.with_ctx(|_| {
+                    let mut rdr = open_file(&src_path).await.with_ctx(|_| {
                         (
                             crate::ErrorKind::Filesystem,
                             format!("open {}", src_path.display()),
@@ -829,6 +829,13 @@ impl Drop for TmpDir {
     }
 }
 
+pub async fn open_file(path: impl AsRef<Path>) -> Result<File, Error> {
+    let path = path.as_ref();
+    File::open(path)
+        .await
+        .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("open {path:?}")))
+}
+
 pub async fn create_file(path: impl AsRef<Path>) -> Result<File, Error> {
     let path = path.as_ref();
     if let Some(parent) = path.parent() {
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index f2334632e..7200eaaba 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -26,6 +26,7 @@ use tokio::sync::{oneshot, Mutex, OwnedMutexGuard, RwLock};
 use tracing::instrument;
 
 use crate::shutdown::Shutdown;
+use crate::util::io::create_file;
 use crate::{Error, ErrorKind, ResultExt as _};
 pub mod actor;
 pub mod clap;
@@ -385,16 +386,16 @@ impl<T> SOption<T> for SNone<T> {}
 
 #[async_trait]
 pub trait AsyncFileExt: Sized {
-    async fn maybe_open<P: AsRef<Path> + Send + Sync>(path: P) -> std::io::Result<Option<Self>>;
+    async fn maybe_open<P: AsRef<Path> + Send + Sync>(path: P) -> Result<Option<Self>, Error>;
     async fn delete<P: AsRef<Path> + Send + Sync>(path: P) -> std::io::Result<()>;
 }
 #[async_trait]
 impl AsyncFileExt for File {
-    async fn maybe_open<P: AsRef<Path> + Send + Sync>(path: P) -> std::io::Result<Option<Self>> {
-        match File::open(path).await {
+    async fn maybe_open<P: AsRef<Path> + Send + Sync>(path: P) -> Result<Option<Self>, Error> {
+        match File::open(path.as_ref()).await {
             Ok(f) => Ok(Some(f)),
             Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(None),
-            Err(e) => Err(e),
+            Err(e) => Err(e).with_ctx(|_| (ErrorKind::Filesystem, path.as_ref().display())),
         }
     }
     async fn delete<P: AsRef<Path> + Send + Sync>(path: P) -> std::io::Result<()> {
@@ -590,9 +591,7 @@ impl FileLock {
                 .await
                 .with_ctx(|_| (crate::ErrorKind::Filesystem, parent.display().to_string()))?;
         }
-        let f = File::create(&path)
-            .await
-            .with_ctx(|_| (crate::ErrorKind::Filesystem, path.display().to_string()))?;
+        let f = create_file(&path).await?;
         let file_guard = tokio::task::spawn_blocking(move || {
             fd_lock_rs::FdLock::lock(f, fd_lock_rs::LockType::Exclusive, blocking)
         })
diff --git a/core/startos/src/util/rpc.rs b/core/startos/src/util/rpc.rs
index e80aac6cb..54664833b 100644
--- a/core/startos/src/util/rpc.rs
+++ b/core/startos/src/util/rpc.rs
@@ -3,7 +3,6 @@ use std::path::Path;
 use clap::Parser;
 use rpc_toolkit::{from_fn_async, Context, ParentHandler};
 use serde::{Deserialize, Serialize};
-use tokio::fs::File;
 use url::Url;
 
 use crate::context::CliContext;
@@ -11,7 +10,7 @@ use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
-use crate::util::io::ParallelBlake3Writer;
+use crate::util::io::{open_file, ParallelBlake3Writer};
 use crate::util::serde::Base16;
 use crate::util::Apply;
 use crate::CAP_10_MiB;
@@ -40,7 +39,7 @@ pub async fn b3sum(
         path: impl AsRef<Path>,
         allow_mmap: bool,
     ) -> Result<Base16<[u8; 32]>, Error> {
-        let file = MultiCursorFile::from(File::open(path).await?);
+        let file = MultiCursorFile::from(open_file(path).await?);
         if allow_mmap {
             return file.blake3_mmap().await.map(|h| *h.as_bytes()).map(Base16);
         }
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 5d1289e7e..b3b2dea6a 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -1,4 +1,3 @@
-use std::any::TypeId;
 use std::collections::VecDeque;
 use std::marker::PhantomData;
 use std::ops::Deref;
@@ -9,10 +8,9 @@ use clap::{ArgMatches, CommandFactory, FromArgMatches};
 use color_eyre::eyre::eyre;
 use imbl::OrdMap;
 use openssl::pkey::{PKey, Private};
-use openssl::x509::{X509Ref, X509};
+use openssl::x509::X509;
 use rpc_toolkit::{
-    CliBindings, Context, Handler, HandlerArgs, HandlerArgsFor, HandlerFor, HandlerTypes,
-    PrintCliResult,
+    CliBindings, Context, HandlerArgs, HandlerArgsFor, HandlerFor, HandlerTypes, PrintCliResult,
 };
 use serde::de::DeserializeOwned;
 use serde::ser::{SerializeMap, SerializeSeq};
@@ -1188,7 +1186,7 @@ pub trait PemEncoding: Sized {
 
 impl PemEncoding for X509 {
     fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
-        X509::from_pem(pem.as_bytes()).map_err(E::custom)
+        Self::from_pem(pem.as_bytes()).map_err(E::custom)
     }
     fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
         String::from_utf8((&**self).to_pem().map_err(E::custom)?).map_err(E::custom)
@@ -1197,7 +1195,7 @@ impl PemEncoding for X509 {
 
 impl PemEncoding for PKey<Private> {
     fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
-        PKey::<Private>::private_key_from_pem(pem.as_bytes()).map_err(E::custom)
+        Self::private_key_from_pem(pem.as_bytes()).map_err(E::custom)
     }
     fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
         String::from_utf8((&**self).private_key_to_pem_pkcs8().map_err(E::custom)?)
@@ -1207,7 +1205,7 @@ impl PemEncoding for PKey<Private> {
 
 impl PemEncoding for ssh_key::PrivateKey {
     fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
-        ssh_key::PrivateKey::from_openssh(pem.as_bytes()).map_err(E::custom)
+        Self::from_openssh(pem.as_bytes()).map_err(E::custom)
     }
     fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
         self.to_openssh(ssh_key::LineEnding::LF)
@@ -1219,7 +1217,7 @@ impl PemEncoding for ssh_key::PrivateKey {
 impl PemEncoding for ed25519_dalek::VerifyingKey {
     fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
         use ed25519_dalek::pkcs8::DecodePublicKey;
-        ed25519_dalek::VerifyingKey::from_public_key_pem(pem).map_err(E::custom)
+        Self::from_public_key_pem(pem).map_err(E::custom)
     }
     fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
         use ed25519_dalek::pkcs8::EncodePublicKey;
@@ -1228,6 +1226,19 @@ impl PemEncoding for ed25519_dalek::VerifyingKey {
     }
 }
 
+impl PemEncoding for ed25519_dalek::SigningKey {
+    fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
+        use ed25519_dalek::pkcs8::DecodePrivateKey;
+        Self::from_pkcs8_pem(pem).map_err(E::custom)
+    }
+    fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
+        use ed25519_dalek::pkcs8::EncodePrivateKey;
+        self.to_pkcs8_pem(pkcs8::LineEnding::LF)
+            .map_err(E::custom)
+            .map(|s| s.as_str().to_owned())
+    }
+}
+
 pub mod pem {
     use serde::{Deserialize, Deserializer, Serializer};
 
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index d063558e2..003a44326 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -25,20 +25,20 @@ enum Version {
     V0_3_5_1(Wrapper<v0_3_5_1::Version>),
     V0_3_5_2(Wrapper<v0_3_5_2::Version>),
     V0_3_6(Wrapper<v0_3_6::Version>),
-    Other(emver::Version),
+    Other(exver::Version),
 }
 
 impl Version {
-    fn from_util_version(version: crate::util::VersionString) -> Self {
+    fn from_exver_version(version: exver::Version) -> Self {
         serde_json::to_value(version.clone())
             .and_then(serde_json::from_value)
             .unwrap_or_else(|_e| {
                 tracing::warn!("Can't deserialize: {:?} and falling back to other", version);
-                Version::Other(version.into_version())
+                Version::Other(version)
             })
     }
     #[cfg(test)]
-    fn as_sem_ver(&self) -> emver::Version {
+    fn as_exver(&self) -> exver::Version {
         match self {
             Version::LT0_3_5(LTWrapper(_, x)) => x.clone(),
             Version::V0_3_5(Wrapper(x)) => x.semver(),
@@ -56,8 +56,8 @@ where
 {
     type Previous: VersionT;
     fn new() -> Self;
-    fn semver(&self) -> emver::Version;
-    fn compat(&self) -> &'static emver::VersionRange;
+    fn semver(&self) -> exver::Version;
+    fn compat(&self) -> &'static exver::VersionRange;
     fn up(&self, db: &TypedPatchDb<Database>) -> impl Future<Output = Result<(), Error>> + Send;
     fn down(&self, db: &TypedPatchDb<Database>) -> impl Future<Output = Result<(), Error>> + Send;
     fn commit(
@@ -158,7 +158,7 @@ where
 }
 
 #[derive(Debug, Clone)]
-struct LTWrapper<T>(T, emver::Version);
+struct LTWrapper<T>(T, exver::Version);
 impl<T> serde::Serialize for LTWrapper<T>
 where
     T: VersionT,
@@ -172,10 +172,10 @@ where
     T: VersionT,
 {
     fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        let v = crate::util::VersionString::deserialize(deserializer)?;
+        let v = exver::Version::deserialize(deserializer)?;
         let version = T::new();
-        if *v < version.semver() {
-            Ok(Self(version, v.into_version()))
+        if v < version.semver() {
+            Ok(Self(version, v))
         } else {
             Err(serde::de::Error::custom("Mismatched Version"))
         }
@@ -197,9 +197,9 @@ where
     T: VersionT,
 {
     fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        let v = crate::util::VersionString::deserialize(deserializer)?;
+        let v = exver::Version::deserialize(deserializer)?;
         let version = T::new();
-        if *v == version.semver() {
+        if v == version.semver() {
             Ok(Wrapper(version))
         } else {
             Err(serde::de::Error::custom("Mismatched Version"))
@@ -212,7 +212,7 @@ pub async fn init(
     mut progress: PhaseProgressTrackerHandle,
 ) -> Result<(), Error> {
     progress.start();
-    let version = Version::from_util_version(
+    let version = Version::from_exver_version(
         db.peek()
             .await
             .as_public()
@@ -256,9 +256,18 @@ mod tests {
 
     use super::*;
 
-    fn em_version() -> impl Strategy<Value = emver::Version> {
-        any::<(usize, usize, usize, usize)>().prop_map(|(major, minor, patch, super_minor)| {
-            emver::Version::new(major, minor, patch, super_minor)
+    fn em_version() -> impl Strategy<Value = exver::Version> {
+        any::<(usize, usize, usize, bool)>().prop_map(|(major, minor, patch, alpha)| {
+            if alpha {
+                exver::Version::new(
+                    [0, major, minor]
+                        .into_iter()
+                        .chain(Some(patch).filter(|n| *n != 0)),
+                    [],
+                )
+            } else {
+                exver::Version::new([major, minor, patch], [])
+            }
         })
     }
 
@@ -273,15 +282,15 @@ mod tests {
 
     proptest! {
         #[test]
-        fn emversion_isomorphic_version(original in em_version()) {
-            let version = Version::from_util_version(original.clone().into());
-            let back = version.as_sem_ver();
+        fn exversion_isomorphic_version(original in em_version()) {
+            let version = Version::from_exver_version(original.clone().into());
+            let back = version.as_exver();
             prop_assert_eq!(original, back, "All versions should round trip");
         }
         #[test]
         fn version_isomorphic_em_version(version in versions()) {
-            let sem_ver = version.as_sem_ver();
-            let back = Version::from_util_version(sem_ver.into());
+            let sem_ver = version.as_exver();
+            let back = Version::from_exver_version(sem_ver.into());
             prop_assert_eq!(format!("{:?}",version), format!("{:?}", back), "All versions should round trip");
         }
     }
diff --git a/core/startos/src/version/v0_3_5.rs b/core/startos/src/version/v0_3_5.rs
index 21be1ca49..167132784 100644
--- a/core/startos/src/version/v0_3_5.rs
+++ b/core/startos/src/version/v0_3_5.rs
@@ -1,4 +1,4 @@
-use emver::VersionRange;
+use exver::{ExtendedVersion, VersionRange};
 
 use super::VersionT;
 use crate::db::model::Database;
@@ -6,17 +6,25 @@ use crate::prelude::*;
 use crate::version::Current;
 
 lazy_static::lazy_static! {
-    pub static ref V0_3_0_COMPAT: VersionRange = VersionRange::Conj(
-        Box::new(VersionRange::Anchor(
-            emver::GTE,
-            emver::Version::new(0, 3, 0, 0),
-        )),
-        Box::new(VersionRange::Anchor(emver::LTE, Current::new().semver())),
+    pub static ref V0_3_0_COMPAT: VersionRange = VersionRange::and(
+        VersionRange::anchor(
+            exver::GTE,
+            ExtendedVersion::new(
+                exver::Version::new([0, 3, 0], []),
+                exver::Version::default(),
+            ),
+        ),
+        VersionRange::anchor(
+            exver::LTE,
+            ExtendedVersion::new(
+                Current::new().semver(),
+                exver::Version::default(),
+            )
+        ),
     );
+    static ref V0_3_5: exver::Version = exver::Version::new([0, 3, 5], []);
 }
 
-const V0_3_5: emver::Version = emver::Version::new(0, 3, 5, 0);
-
 #[derive(Clone, Debug)]
 pub struct Version;
 
@@ -25,8 +33,8 @@ impl VersionT for Version {
     fn new() -> Self {
         Version
     }
-    fn semver(&self) -> emver::Version {
-        V0_3_5
+    fn semver(&self) -> exver::Version {
+        V0_3_5.clone()
     }
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
diff --git a/core/startos/src/version/v0_3_5_1.rs b/core/startos/src/version/v0_3_5_1.rs
index d0f99c153..c6c328f6d 100644
--- a/core/startos/src/version/v0_3_5_1.rs
+++ b/core/startos/src/version/v0_3_5_1.rs
@@ -1,11 +1,13 @@
-use emver::VersionRange;
+use exver::VersionRange;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5, VersionT};
 use crate::db::model::Database;
 use crate::prelude::*;
 
-const V0_3_5_1: emver::Version = emver::Version::new(0, 3, 5, 1);
+lazy_static::lazy_static! {
+    static ref V0_3_5_1: exver::Version = exver::Version::new([0, 3, 5, 1], []);
+}
 
 #[derive(Clone, Debug)]
 pub struct Version;
@@ -15,8 +17,8 @@ impl VersionT for Version {
     fn new() -> Self {
         Version
     }
-    fn semver(&self) -> emver::Version {
-        V0_3_5_1
+    fn semver(&self) -> exver::Version {
+        V0_3_5_1.clone()
     }
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
diff --git a/core/startos/src/version/v0_3_5_2.rs b/core/startos/src/version/v0_3_5_2.rs
index fae689997..00143f8cd 100644
--- a/core/startos/src/version/v0_3_5_2.rs
+++ b/core/startos/src/version/v0_3_5_2.rs
@@ -1,11 +1,13 @@
-use emver::VersionRange;
+use exver::VersionRange;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5_1, VersionT};
 use crate::db::model::Database;
 use crate::prelude::*;
 
-const V0_3_5_2: emver::Version = emver::Version::new(0, 3, 5, 2);
+lazy_static::lazy_static! {
+    static ref V0_3_5_2: exver::Version = exver::Version::new([0, 3, 5, 2], []);
+}
 
 #[derive(Clone, Debug)]
 pub struct Version;
@@ -15,8 +17,8 @@ impl VersionT for Version {
     fn new() -> Self {
         Version
     }
-    fn semver(&self) -> emver::Version {
-        V0_3_5_2
+    fn semver(&self) -> exver::Version {
+        V0_3_5_2.clone()
     }
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
diff --git a/core/startos/src/version/v0_3_6.rs b/core/startos/src/version/v0_3_6.rs
index 0ff6d662a..9564a7376 100644
--- a/core/startos/src/version/v0_3_6.rs
+++ b/core/startos/src/version/v0_3_6.rs
@@ -1,11 +1,13 @@
-use emver::VersionRange;
+use exver::VersionRange;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5_1, VersionT};
 use crate::db::model::Database;
 use crate::prelude::*;
 
-const V0_3_6: emver::Version = emver::Version::new(0, 3, 6, 0);
+lazy_static::lazy_static! {
+    static ref V0_3_6: exver::Version = exver::Version::new([0, 3, 6], []);
+}
 
 #[derive(Clone, Debug)]
 pub struct Version;
@@ -15,8 +17,8 @@ impl VersionT for Version {
     fn new() -> Self {
         Version
     }
-    fn semver(&self) -> emver::Version {
-        V0_3_6
+    fn semver(&self) -> exver::Version {
+        V0_3_6.clone()
     }
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
diff --git a/debian/postinst b/debian/postinst
index 238bd9457..96e392fc8 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -78,6 +78,7 @@ sed -i '/\(^\|#\)Compress=/c\Compress=yes' /etc/systemd/journald.conf
 sed -i '/\(^\|#\)SystemMaxUse=/c\SystemMaxUse=1G' /etc/systemd/journald.conf
 sed -i '/\(^\|#\)ForwardToSyslog=/c\ForwardToSyslog=no' /etc/systemd/journald.conf
 sed -i '/^\s*#\?\s*issue_discards\s*=\s*/c\issue_discards = 1' /etc/lvm/lvm.conf
+sed -i '/\(^\|#\)\s*unqualified-search-registries\s*=\s*/c\unqualified-search-registries = ["docker.io"]' /etc/containers/registries.conf
 
 mkdir -p /etc/nginx/ssl
 
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..497f28c49
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "embassy-os",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}
diff --git a/sdk/lib/emverLite/mod.ts b/sdk/lib/emverLite/mod.ts
index f69d4f35d..52fb4e347 100644
--- a/sdk/lib/emverLite/mod.ts
+++ b/sdk/lib/emverLite/mod.ts
@@ -2,9 +2,9 @@ import * as matches from "ts-matches"
 
 const starSub = /((\d+\.)*\d+)\.\*/
 // prettier-ignore
-export type ValidEmVer = `${number}${`.${number}` | ""}${`.${number}` | ""}${`-${string}` | ""}`;
+export type ValidEmVer = string;
 // prettier-ignore
-export type ValidEmVerRange = `${'>=' | '<='| '<' | '>' | ''}${'^' | '~' | ''}${number | '*'}${`.${number | '*'}` | ""}${`.${number | '*'}` | ""}${`-${string}` | ""}`;
+export type ValidEmVerRange = string;
 
 function incrementLastNumber(list: number[]) {
   const newList = [...list]
diff --git a/sdk/lib/index.browser.ts b/sdk/lib/index.browser.ts
index d7c10093f..075bfcf50 100644
--- a/sdk/lib/index.browser.ts
+++ b/sdk/lib/index.browser.ts
@@ -1,6 +1,7 @@
 export { EmVer } from "./emverLite/mod"
 export { setupManifest } from "./manifest/setupManifest"
 export { setupExposeStore } from "./store/setupExposeStore"
+export { S9pk } from "./s9pk"
 export * as config from "./config"
 export * as CB from "./config/builder"
 export * as CT from "./config/configTypes"
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index 89d147ed1..c99798d72 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -6,6 +6,7 @@ export { setupManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
 export { setupExposeStore } from "./store/setupExposeStore"
 export { pathBuilder } from "./store/PathBuilder"
+export { S9pk } from "./s9pk"
 
 export * as actions from "./actions"
 export * as backup from "./backup"
diff --git a/sdk/lib/osBindings/GetPackageParams.ts b/sdk/lib/osBindings/GetPackageParams.ts
index 6dfecc9b2..8b852c35c 100644
--- a/sdk/lib/osBindings/GetPackageParams.ts
+++ b/sdk/lib/osBindings/GetPackageParams.ts
@@ -1,10 +1,11 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { PackageDetailLevel } from "./PackageDetailLevel"
 import type { PackageId } from "./PackageId"
+import type { Version } from "./Version"
 
 export type GetPackageParams = {
   id: PackageId | null
   version: string | null
-  sourceVersion: string | null
+  sourceVersion: Version | null
   otherVersions: PackageDetailLevel | null
 }
diff --git a/sdk/lib/osBindings/Manifest.ts b/sdk/lib/osBindings/Manifest.ts
index 15b96bd13..d808f47a2 100644
--- a/sdk/lib/osBindings/Manifest.ts
+++ b/sdk/lib/osBindings/Manifest.ts
@@ -28,6 +28,6 @@ export type Manifest = {
   dependencies: Dependencies
   hardwareRequirements: HardwareRequirements
   gitHash: string | null
-  osVersion: Version
+  osVersion: string
   hasConfig: boolean
 }
diff --git a/sdk/lib/osBindings/PackageVersionInfo.ts b/sdk/lib/osBindings/PackageVersionInfo.ts
index bdded46bd..364c530f2 100644
--- a/sdk/lib/osBindings/PackageVersionInfo.ts
+++ b/sdk/lib/osBindings/PackageVersionInfo.ts
@@ -4,7 +4,6 @@ import type { Description } from "./Description"
 import type { HardwareRequirements } from "./HardwareRequirements"
 import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
 import type { RegistryAsset } from "./RegistryAsset"
-import type { Version } from "./Version"
 
 export type PackageVersionInfo = {
   title: string
@@ -17,7 +16,7 @@ export type PackageVersionInfo = {
   upstreamRepo: string
   supportSite: string
   marketingSite: string
-  osVersion: Version
+  osVersion: string
   hardwareRequirements: HardwareRequirements
   sourceVersion: string | null
   s9pk: RegistryAsset<MerkleArchiveCommitment>
diff --git a/sdk/lib/osBindings/ServerInfo.ts b/sdk/lib/osBindings/ServerInfo.ts
index 92b8b9b8f..935e3a99f 100644
--- a/sdk/lib/osBindings/ServerInfo.ts
+++ b/sdk/lib/osBindings/ServerInfo.ts
@@ -2,7 +2,6 @@
 import type { Governor } from "./Governor"
 import type { IpInfo } from "./IpInfo"
 import type { ServerStatus } from "./ServerStatus"
-import type { Version } from "./Version"
 import type { WifiInfo } from "./WifiInfo"
 
 export type ServerInfo = {
@@ -10,7 +9,7 @@ export type ServerInfo = {
   platform: string
   id: string
   hostname: string
-  version: Version
+  version: string
   lastBackup: string | null
   eosVersionCompat: string
   lanAddress: string
diff --git a/sdk/lib/s9pk/index.ts b/sdk/lib/s9pk/index.ts
new file mode 100644
index 000000000..eba8ed3f8
--- /dev/null
+++ b/sdk/lib/s9pk/index.ts
@@ -0,0 +1,67 @@
+import { DataUrl, Manifest, MerkleArchiveCommitment } from "../osBindings"
+import { ArrayBufferReader, MerkleArchive } from "./merkleArchive"
+import mime from "mime"
+
+const magicAndVersion = new Uint8Array([59, 59, 2])
+
+export function compare(a: Uint8Array, b: Uint8Array) {
+  if (a.length !== b.length) return false
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== b[i]) return false
+  }
+  return true
+}
+
+export class S9pk {
+  private constructor(
+    readonly manifest: Manifest,
+    readonly archive: MerkleArchive,
+    readonly size: number,
+  ) {}
+  static async deserialize(
+    source: Blob,
+    commitment: MerkleArchiveCommitment | null,
+  ): Promise<S9pk> {
+    const header = new ArrayBufferReader(
+      await source
+        .slice(0, magicAndVersion.length + MerkleArchive.headerSize)
+        .arrayBuffer(),
+    )
+    const magicVersion = new Uint8Array(header.next(magicAndVersion.length))
+    if (!compare(magicVersion, magicAndVersion)) {
+      throw new Error("Invalid Magic or Unexpected Version")
+    }
+
+    const archive = await MerkleArchive.deserialize(
+      source,
+      "s9pk",
+      header,
+      commitment,
+    )
+
+    const manifest = JSON.parse(
+      new TextDecoder().decode(
+        await archive.contents
+          .getPath(["manifest.json"])
+          ?.verifiedFileContents(),
+      ),
+    )
+
+    return new S9pk(manifest, archive, source.length)
+  }
+  async icon(): Promise<DataUrl> {
+    const iconName = Object.keys(this.archive.contents.contents).find(
+      (name) =>
+        name.startsWith("icon.") && mime.getType(name)?.startsWith("image/"),
+    )
+    if (!iconName) {
+      throw new Error("no icon found in archive")
+    }
+    return (
+      `data:${mime.getType(iconName)};base64,` +
+      Buffer.from(
+        await this.archive.contents.getPath([iconName])!.verifiedFileContents(),
+      ).toString("base64")
+    )
+  }
+}
diff --git a/sdk/lib/s9pk/merkleArchive/directoryContents.ts b/sdk/lib/s9pk/merkleArchive/directoryContents.ts
new file mode 100644
index 000000000..dab7ef53a
--- /dev/null
+++ b/sdk/lib/s9pk/merkleArchive/directoryContents.ts
@@ -0,0 +1,80 @@
+import { ArrayBufferReader, Entry } from "."
+import { blake3 } from "@noble/hashes/blake3"
+import { serializeVarint } from "./varint"
+import { FileContents } from "./fileContents"
+import { compare } from ".."
+
+export class DirectoryContents {
+  static readonly headerSize =
+    8 + // position: u64 BE
+    8 // size: u64 BE
+  private constructor(readonly contents: { [name: string]: Entry }) {}
+  static async deserialize(
+    source: Blob,
+    header: ArrayBufferReader,
+    sighash: Uint8Array,
+    maxSize: bigint,
+  ): Promise<DirectoryContents> {
+    const position = header.nextU64()
+    const size = header.nextU64()
+    if (size > maxSize) {
+      throw new Error("size is greater than signed")
+    }
+
+    const tocReader = new ArrayBufferReader(
+      await source
+        .slice(Number(position), Number(position + size))
+        .arrayBuffer(),
+    )
+    const len = tocReader.nextVarint()
+    const entries: { [name: string]: Entry } = {}
+    for (let i = 0; i < len; i++) {
+      const name = tocReader.nextVarstring()
+      const entry = await Entry.deserialize(source, tocReader)
+      entries[name] = entry
+    }
+
+    const res = new DirectoryContents(entries)
+
+    if (!compare(res.sighash(), sighash)) {
+      throw new Error("hash sum does not match")
+    }
+
+    return res
+  }
+  sighash(): Uint8Array {
+    const hasher = blake3.create({})
+    const names = Object.keys(this.contents).sort()
+    hasher.update(new Uint8Array(serializeVarint(names.length)))
+    for (const name of names) {
+      const entry = this.contents[name]
+      const nameBuf = new TextEncoder().encode(name)
+      hasher.update(new Uint8Array(serializeVarint(nameBuf.length)))
+      hasher.update(nameBuf)
+      hasher.update(new Uint8Array(entry.hash))
+      const sizeBuf = new Uint8Array(8)
+      new DataView(sizeBuf.buffer).setBigUint64(0, entry.size)
+      hasher.update(sizeBuf)
+      hasher.update(new Uint8Array([0]))
+    }
+
+    return hasher.digest()
+  }
+  getPath(path: string[]): Entry | null {
+    if (path.length === 0) {
+      return null
+    }
+    const next = this.contents[path[0]]
+    const rest = path.slice(1)
+    if (next === undefined) {
+      return null
+    }
+    if (rest.length === 0) {
+      return next
+    }
+    if (next.contents instanceof DirectoryContents) {
+      return next.contents.getPath(rest)
+    }
+    return null
+  }
+}
diff --git a/sdk/lib/s9pk/merkleArchive/fileContents.ts b/sdk/lib/s9pk/merkleArchive/fileContents.ts
new file mode 100644
index 000000000..7a936f1e8
--- /dev/null
+++ b/sdk/lib/s9pk/merkleArchive/fileContents.ts
@@ -0,0 +1,24 @@
+import { blake3 } from "@noble/hashes/blake3"
+import { ArrayBufferReader } from "."
+import { compare } from ".."
+
+export class FileContents {
+  private constructor(readonly contents: Blob) {}
+  static deserialize(
+    source: Blob,
+    header: ArrayBufferReader,
+    size: bigint,
+  ): FileContents {
+    const position = header.nextU64()
+    return new FileContents(
+      source.slice(Number(position), Number(position + size)),
+    )
+  }
+  async verified(hash: Uint8Array): Promise<ArrayBuffer> {
+    const res = await this.contents.arrayBuffer()
+    if (!compare(hash, blake3(new Uint8Array(res)))) {
+      throw new Error("hash sum mismatch")
+    }
+    return res
+  }
+}
diff --git a/sdk/lib/s9pk/merkleArchive/index.ts b/sdk/lib/s9pk/merkleArchive/index.ts
new file mode 100644
index 000000000..068363599
--- /dev/null
+++ b/sdk/lib/s9pk/merkleArchive/index.ts
@@ -0,0 +1,167 @@
+import { MerkleArchiveCommitment } from "../../osBindings"
+import { DirectoryContents } from "./directoryContents"
+import { FileContents } from "./fileContents"
+import { ed25519ph } from "@noble/curves/ed25519"
+import { sha512 } from "@noble/hashes/sha2"
+import { VarIntProcessor } from "./varint"
+import { compare } from ".."
+
+const maxVarstringLen = 1024 * 1024
+
+export type Signer = {
+  pubkey: Uint8Array
+  signature: Uint8Array
+  maxSize: bigint
+  context: string
+}
+
+export class ArrayBufferReader {
+  constructor(private buffer: ArrayBuffer) {}
+  next(length: number): ArrayBuffer {
+    const res = this.buffer.slice(0, length)
+    this.buffer = this.buffer.slice(length)
+    return res
+  }
+  nextU64(): bigint {
+    return new DataView(this.next(8)).getBigUint64(0)
+  }
+  nextVarint(): number {
+    const p = new VarIntProcessor()
+    while (!p.finished()) {
+      p.push(new Uint8Array(this.buffer.slice(0, 1))[0])
+      this.buffer = this.buffer.slice(1)
+    }
+    const res = p.decode()
+    if (res === null) {
+      throw new Error("Reached EOF")
+    }
+    return res
+  }
+  nextVarstring(): string {
+    const len = Math.min(this.nextVarint(), maxVarstringLen)
+    return new TextDecoder().decode(this.next(len))
+  }
+}
+
+export class MerkleArchive {
+  static readonly headerSize =
+    32 + // pubkey
+    64 + // signature
+    32 + // sighash
+    8 + // size
+    DirectoryContents.headerSize
+  private constructor(
+    readonly signer: Signer,
+    readonly contents: DirectoryContents,
+  ) {}
+  static async deserialize(
+    source: Blob,
+    context: string,
+    header: ArrayBufferReader,
+    commitment: MerkleArchiveCommitment | null,
+  ): Promise<MerkleArchive> {
+    const pubkey = new Uint8Array(header.next(32))
+    const signature = new Uint8Array(header.next(64))
+    const sighash = new Uint8Array(header.next(32))
+    const rootMaxSizeBytes = header.next(8)
+    const maxSize = new DataView(rootMaxSizeBytes).getBigUint64(0)
+
+    if (
+      !ed25519ph.verify(
+        signature,
+        new Uint8Array(
+          await new Blob([sighash, rootMaxSizeBytes]).arrayBuffer(),
+        ),
+        pubkey,
+        {
+          context: new TextEncoder().encode(context),
+          zip215: true,
+        },
+      )
+    ) {
+      throw new Error("signature verification failed")
+    }
+
+    if (commitment) {
+      if (
+        !compare(
+          sighash,
+          new Uint8Array(Buffer.from(commitment.rootSighash, "base64").buffer),
+        )
+      ) {
+        throw new Error("merkle root mismatch")
+      }
+      if (maxSize > commitment.rootMaxsize) {
+        throw new Error("root directory max size too large")
+      }
+    } else if (maxSize > 1024 * 1024) {
+      throw new Error(
+        "root directory max size over 1MiB, cancelling download in case of DOS attack",
+      )
+    }
+
+    const contents = await DirectoryContents.deserialize(
+      source,
+      header,
+      sighash,
+      maxSize,
+    )
+
+    return new MerkleArchive(
+      {
+        pubkey,
+        signature,
+        maxSize,
+        context,
+      },
+      contents,
+    )
+  }
+}
+
+export class Entry {
+  private constructor(
+    readonly hash: Uint8Array,
+    readonly size: bigint,
+    readonly contents: EntryContents,
+  ) {}
+  static async deserialize(
+    source: Blob,
+    header: ArrayBufferReader,
+  ): Promise<Entry> {
+    const hash = new Uint8Array(header.next(32))
+    const size = header.nextU64()
+    const contents = await deserializeEntryContents(source, header, hash, size)
+
+    return new Entry(new Uint8Array(hash), size, contents)
+  }
+  async verifiedFileContents(): Promise<ArrayBuffer> {
+    if (!this.contents) {
+      throw new Error("file is missing from archive")
+    }
+    if (!(this.contents instanceof FileContents)) {
+      throw new Error("is not a regular file")
+    }
+    return this.contents.verified(this.hash)
+  }
+}
+
+export type EntryContents = null | FileContents | DirectoryContents
+async function deserializeEntryContents(
+  source: Blob,
+  header: ArrayBufferReader,
+  hash: Uint8Array,
+  size: bigint,
+): Promise<EntryContents> {
+  const typeId = new Uint8Array(header.next(1))[0]
+  switch (typeId) {
+    case 0:
+      return null
+    case 1:
+      return FileContents.deserialize(source, header, size)
+    case 2:
+      return DirectoryContents.deserialize(source, header, hash, size)
+    default:
+      throw new Error(`Unknown type id ${typeId} found in MerkleArchive`)
+  }
+}
diff --git a/sdk/lib/s9pk/merkleArchive/varint.ts b/sdk/lib/s9pk/merkleArchive/varint.ts
new file mode 100644
index 000000000..2bf4793b1
--- /dev/null
+++ b/sdk/lib/s9pk/merkleArchive/varint.ts
@@ -0,0 +1,62 @@
+const msb = 0x80
+const dropMsb = 0x7f
+const maxSize = Math.floor((8 * 8 + 7) / 7)
+
+export class VarIntProcessor {
+  private buf: Uint8Array
+  private i: number
+  constructor() {
+    this.buf = new Uint8Array(maxSize)
+    this.i = 0
+  }
+  push(b: number) {
+    if (this.i >= maxSize) {
+      throw new Error("Unterminated varint")
+    }
+    this.buf[this.i] = b
+    this.i += 1
+  }
+  finished(): boolean {
+    return this.i > 0 && (this.buf[this.i - 1] & msb) === 0
+  }
+  decode(): number | null {
+    let result = 0
+    let shift = 0
+    let success = false
+    for (let i = 0; i < this.i; i++) {
+      const b = this.buf[i]
+      const msbDropped = b & dropMsb
+      result |= msbDropped << shift
+      shift += 7
+
+      if ((b & msb) == 0 || shift > 9 * 7) {
+        success = (b & msb) === 0
+        break
+      }
+    }
+
+    if (success) {
+      return result
+    } else {
+      console.error(this.buf)
+      return null
+    }
+  }
+}
+
+export function serializeVarint(int: number): ArrayBuffer {
+  const buf = new Uint8Array(maxSize)
+  let n = int
+  let i = 0
+
+  while (n >= msb) {
+    buf[i] = msb | n
+    i += 1
+    n >>= 7
+  }
+
+  buf[i] = n
+  i += 1
+
+  return buf.slice(0, i).buffer
+}
diff --git a/sdk/lib/test/emverList.test.ts b/sdk/lib/test/emverList.test.ts
index 43919aa83..07dbb5aaf 100644
--- a/sdk/lib/test/emverList.test.ts
+++ b/sdk/lib/test/emverList.test.ts
@@ -8,18 +8,14 @@ describe("EmVer", () => {
         checker.check("1.2")
         checker.check("1.2.3")
         checker.check("1.2.3.4")
-        // @ts-expect-error
         checker.check("1.2.3.4.5")
-        // @ts-expect-error
         checker.check("1.2.3.4.5.6")
         expect(checker.check("1")).toEqual(true)
         expect(checker.check("1.2")).toEqual(true)
         expect(checker.check("1.2.3.4")).toEqual(true)
       })
       test("rangeOf('*') invalid", () => {
-        // @ts-expect-error
         expect(() => checker.check("a")).toThrow()
-        // @ts-expect-error
         expect(() => checker.check("")).toThrow()
         expect(() => checker.check("1..3")).toThrow()
       })
@@ -31,7 +27,6 @@ describe("EmVer", () => {
         expect(checker.check("2-beta123")).toEqual(true)
         expect(checker.check("2")).toEqual(true)
         expect(checker.check("1.2.3.5")).toEqual(true)
-        // @ts-expect-error
         expect(checker.check("1.2.3.4.1")).toEqual(true)
       })
 
@@ -58,7 +53,6 @@ describe("EmVer", () => {
       test(`rangeOf(">=1.2.3.4") valid`, () => {
         expect(checker.check("2")).toEqual(true)
         expect(checker.check("1.2.3.5")).toEqual(true)
-        // @ts-expect-error
         expect(checker.check("1.2.3.4.1")).toEqual(true)
         expect(checker.check("1.2.3.4")).toEqual(true)
       })
@@ -73,7 +67,6 @@ describe("EmVer", () => {
       test(`rangeOf("<1.2.3.4") invalid`, () => {
         expect(checker.check("2")).toEqual(false)
         expect(checker.check("1.2.3.5")).toEqual(false)
-        // @ts-expect-error
         expect(checker.check("1.2.3.4.1")).toEqual(false)
         expect(checker.check("1.2.3.4")).toEqual(false)
       })
@@ -88,7 +81,6 @@ describe("EmVer", () => {
       test(`rangeOf("<=1.2.3.4") invalid`, () => {
         expect(checker.check("2")).toEqual(false)
         expect(checker.check("1.2.3.5")).toEqual(false)
-        // @ts-expect-error
         expect(checker.check("1.2.3.4.1")).toEqual(false)
       })
 
@@ -196,7 +188,6 @@ describe("EmVer", () => {
       test(`rangeOf("!>1.2.3.4") invalid`, () => {
         expect(checker.check("2")).toEqual(false)
         expect(checker.check("1.2.3.5")).toEqual(false)
-        // @ts-expect-error
         expect(checker.check("1.2.3.4.1")).toEqual(false)
       })
 
diff --git a/sdk/lib/util/fileHelper.ts b/sdk/lib/util/fileHelper.ts
index 54f1eca06..383b4fd31 100644
--- a/sdk/lib/util/fileHelper.ts
+++ b/sdk/lib/util/fileHelper.ts
@@ -1,7 +1,7 @@
 import * as matches from "ts-matches"
 import * as YAML from "yaml"
 import * as TOML from "@iarna/toml"
-import _ from "lodash"
+import merge from "lodash.merge"
 import * as T from "../types"
 import * as fs from "node:fs/promises"
 
@@ -82,7 +82,7 @@ export class FileHelper<A> {
 
   async merge(data: A, effects: T.Effects) {
     const fileData = (await this.read(effects).catch(() => ({}))) || {}
-    const mergeData = _.merge({}, fileData, data)
+    const mergeData = merge({}, fileData, data)
     return await this.write(mergeData, effects)
   }
   /**
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index a50066b34..0a3655a7d 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -1,29 +1,32 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha1",
+  "version": "0.3.6-alpha5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha1",
+      "version": "0.3.6-alpha5",
       "license": "MIT",
       "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
         "isomorphic-fetch": "^3.0.0",
-        "lodash": "^4.17.21",
-        "ts-matches": "^5.4.1"
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
+        "ts-matches": "^5.5.1",
+        "yaml": "^2.2.2"
       },
       "devDependencies": {
-        "@iarna/toml": "^2.2.5",
         "@types/jest": "^29.4.0",
-        "@types/lodash": "^4.17.5",
+        "@types/lodash.merge": "^4.6.2",
         "jest": "^29.4.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         "tsx": "^4.7.1",
-        "typescript": "^5.0.4",
-        "yaml": "^2.2.2"
+        "typescript": "^5.0.4"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -653,8 +656,7 @@
     "node_modules/@iarna/toml": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==",
-      "dev": true
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -1006,6 +1008,28 @@
         "@jridgewell/sourcemap-codec": "1.4.14"
       }
     },
+    "node_modules/@noble/curves": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
+      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@sinclair/typebox": {
       "version": "0.25.24",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
@@ -1144,6 +1168,15 @@
       "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==",
       "dev": true
     },
+    "node_modules/@types/lodash.merge": {
+      "version": "4.6.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz",
+      "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
     "node_modules/@types/node": {
       "version": "18.15.10",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz",
@@ -2849,17 +2882,17 @@
         "node": ">=8"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
       "dev": true
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -2918,6 +2951,20 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/mime": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
+      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
+      "bin": {
+        "mime": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -3580,9 +3627,9 @@
       "dev": true
     },
     "node_modules/ts-matches": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.4.1.tgz",
-      "integrity": "sha512-kXrY75F0s0WD15N2bWKDScKlKgwnusN6dTRzGs1N7LlxQRnazrsBISC1HL4sy2adsyk65Zbx3Ui3IGN8leAFOQ=="
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
+      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
     },
     "node_modules/ts-node": {
       "version": "10.9.1",
@@ -4249,7 +4296,6 @@
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz",
       "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==",
-      "dev": true,
       "engines": {
         "node": ">= 14"
       }
diff --git a/sdk/package.json b/sdk/package.json
index d6c3a1ca5..8ed984a82 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -31,10 +31,13 @@
   "homepage": "https://github.com/Start9Labs/start-sdk#readme",
   "dependencies": {
     "isomorphic-fetch": "^3.0.0",
-    "lodash": "^4.17.21",
-    "ts-matches": "^5.4.1",
+    "lodash.merge": "^4.6.2",
+    "mime": "^4.0.3",
+    "ts-matches": "^5.5.1",
     "yaml": "^2.2.2",
-    "@iarna/toml": "^2.2.5"
+    "@iarna/toml": "^2.2.5",
+    "@noble/curves": "^1.4.0",
+    "@noble/hashes": "^1.4.0"
   },
   "prettier": {
     "trailingComma": "all",
@@ -44,7 +47,7 @@
   },
   "devDependencies": {
     "@types/jest": "^29.4.0",
-    "@types/lodash": "^4.17.5",
+    "@types/lodash.merge": "^4.6.2",
     "jest": "^29.4.3",
     "prettier": "^3.2.5",
     "ts-jest": "^29.0.5",
diff --git a/system-images/compat/src/config/mod.rs b/system-images/compat/src/config/mod.rs
index ce591b06a..c677dd3d5 100644
--- a/system-images/compat/src/config/mod.rs
+++ b/system-images/compat/src/config/mod.rs
@@ -55,7 +55,7 @@ pub fn validate_configuration(
         Ok(_) => {
             // create temp config file
             serde_yaml::to_writer(
-                std::fs::File::create(config_path.with_extension("tmp"))?,
+                std::fs::create_file(config_path.with_extension("tmp"))?,
                 &config,
             )?;
             std::fs::rename(config_path.with_extension("tmp"), config_path)?;
diff --git a/web/package-lock.json b/web/package-lock.json
index ca5c8efe8..8a48b18fa 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -23,6 +23,8 @@
         "@ng-web-apis/common": "^2.0.0",
         "@ng-web-apis/mutation-observer": "^2.0.0",
         "@ng-web-apis/resize-observer": "^2.0.0",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
         "@start9labs/argon2": "^0.2.2",
         "@start9labs/emver": "^0.1.5",
         "@start9labs/start-sdk": "file:../sdk/dist",
@@ -35,6 +37,7 @@
         "angular-svg-round-progressbar": "^9.0.0",
         "ansi-to-html": "^0.7.2",
         "base64-js": "^1.5.1",
+        "buffer": "^6.0.3",
         "cbor": "npm:@jprochazk/cbor@^0.4.9",
         "cbor-web": "^8.1.0",
         "core-js": "^3.21.1",
@@ -45,6 +48,7 @@
         "jose": "^4.9.0",
         "js-yaml": "^4.1.0",
         "marked": "^4.0.0",
+        "mime": "^4.0.3",
         "monaco-editor": "^0.33.0",
         "mustache": "^4.2.0",
         "ng-qrcode": "^7.0.0",
@@ -53,7 +57,7 @@
         "pbkdf2": "^3.1.2",
         "rxjs": "^7.8.1",
         "swiper": "^8.2.4",
-        "ts-matches": "^5.2.1",
+        "ts-matches": "^5.5.1",
         "tslib": "^2.3.0",
         "uuid": "^8.3.2",
         "zone.js": "^0.11.5"
@@ -1978,14 +1982,17 @@
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
         "isomorphic-fetch": "^3.0.0",
-        "lodash": "^4.17.21",
-        "ts-matches": "^5.4.1",
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
+        "ts-matches": "^5.5.1",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
         "@types/jest": "^29.4.0",
-        "@types/lodash": "^4.17.5",
+        "@types/lodash.merge": "^4.6.2",
         "jest": "^29.4.3",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
@@ -5111,6 +5118,28 @@
         "@ng-web-apis/common": ">=2.0.0"
       }
     },
+    "node_modules/@noble/curves": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
+      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "devOptional": true,
@@ -9954,6 +9983,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/less/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/less/node_modules/pify": {
       "version": "4.0.1",
       "dev": true,
@@ -10551,14 +10593,17 @@
       }
     },
     "node_modules/mime": {
-      "version": "1.6.0",
-      "dev": true,
-      "license": "MIT",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
+      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
       "bin": {
-        "mime": "cli.js"
+        "mime": "bin/cli.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=16"
       }
     },
     "node_modules/mime-db": {
@@ -13644,6 +13689,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
       "dev": true,
@@ -14617,8 +14674,9 @@
       }
     },
     "node_modules/ts-matches": {
-      "version": "v5.2.1",
-      "license": "MIT"
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
+      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
     },
     "node_modules/ts-morph": {
       "version": "10.0.2",
diff --git a/web/package.json b/web/package.json
index 3ea29c6fd..1db0dead4 100644
--- a/web/package.json
+++ b/web/package.json
@@ -46,6 +46,8 @@
     "@ng-web-apis/common": "^2.0.0",
     "@ng-web-apis/mutation-observer": "^2.0.0",
     "@ng-web-apis/resize-observer": "^2.0.0",
+    "@noble/curves": "^1.4.0",
+    "@noble/hashes": "^1.4.0",
     "@start9labs/argon2": "^0.2.2",
     "@start9labs/emver": "^0.1.5",
     "@start9labs/start-sdk": "file:../sdk/dist",
@@ -58,6 +60,7 @@
     "angular-svg-round-progressbar": "^9.0.0",
     "ansi-to-html": "^0.7.2",
     "base64-js": "^1.5.1",
+    "buffer": "^6.0.3",
     "cbor": "npm:@jprochazk/cbor@^0.4.9",
     "cbor-web": "^8.1.0",
     "core-js": "^3.21.1",
@@ -68,6 +71,7 @@
     "jose": "^4.9.0",
     "js-yaml": "^4.1.0",
     "marked": "^4.0.0",
+    "mime": "^4.0.3",
     "monaco-editor": "^0.33.0",
     "mustache": "^4.2.0",
     "ng-qrcode": "^7.0.0",
@@ -76,7 +80,7 @@
     "pbkdf2": "^3.1.2",
     "rxjs": "^7.8.1",
     "swiper": "^8.2.4",
-    "ts-matches": "^5.2.1",
+    "ts-matches": "^5.5.1",
     "tslib": "^2.3.0",
     "uuid": "^8.3.2",
     "zone.js": "^0.11.5"
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index 4026d5183..f6410e748 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -4,14 +4,15 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
 import cbor from 'cbor'
 import { ErrorToastService } from '@start9labs/shared'
-import { T } from '@start9labs/start-sdk'
+import { S9pk, T } from '@start9labs/start-sdk'
 
 interface Positions {
   [key: string]: [bigint, bigint] // [position, length]
 }
 
 const MAGIC = new Uint8Array([59, 59])
-const VERSION = new Uint8Array([1])
+const VERSION_1 = new Uint8Array([1])
+const VERSION_2 = new Uint8Array([2])
 
 @Component({
   selector: 'sideload',
@@ -64,11 +65,36 @@ export class SideloadPage {
   async validateS9pk(file: File) {
     const magic = new Uint8Array(await blobToBuffer(file.slice(0, 2)))
     const version = new Uint8Array(await blobToBuffer(file.slice(2, 3)))
-    if (compare(magic, MAGIC) && compare(version, VERSION)) {
-      await this.parseS9pk(file)
-      return {
-        invalid: false,
-        message: 'A valid package file has been detected!',
+    if (compare(magic, MAGIC)) {
+      try {
+        if (compare(version, VERSION_1)) {
+          await this.parseS9pkV1(file)
+          return {
+            invalid: false,
+            message: 'A valid package file has been detected!',
+          }
+        } else if (compare(version, VERSION_2)) {
+          await this.parseS9pkV2(file)
+          return {
+            invalid: false,
+            message: 'A valid package file has been detected!',
+          }
+        } else {
+          console.error(version)
+          return {
+            invalid: true,
+            message: 'Invalid package file',
+          }
+        }
+      } catch (e) {
+        console.error(e)
+        return {
+          invalid: true,
+          message:
+            e instanceof Error
+              ? `Invalid package file: ${e.message}`
+              : 'Invalid package file',
+        }
       }
     } else {
       return {
@@ -91,12 +117,9 @@ export class SideloadPage {
     })
     await loader.present()
     try {
-      const guid = await this.api.sideloadPackage({
-        manifest: this.toUpload.manifest!,
-        icon: this.toUpload.icon!,
-      })
+      const res = await this.api.sideloadPackage()
       this.api
-        .uploadPackage(guid, this.toUpload.file!)
+        .uploadPackage(res.upload, this.toUpload.file!)
         .catch(e => console.error(e))
 
       this.navCtrl.navigateRoot('/services')
@@ -108,7 +131,7 @@ export class SideloadPage {
     }
   }
 
-  async parseS9pk(file: File) {
+  async parseS9pkV1(file: File) {
     const positions: Positions = {}
     // magic=2bytes, version=1bytes, pubkey=32bytes, signature=64bytes, toc_length=4bytes = 103byte is starting point
     let start = 103
@@ -122,6 +145,12 @@ export class SideloadPage {
     await this.getIcon(positions, file)
   }
 
+  async parseS9pkV2(file: File) {
+    const s9pk = await S9pk.deserialize(file, null)
+    this.toUpload.manifest = s9pk.manifest
+    this.toUpload.icon = await s9pk.icon()
+  }
+
   async getManifest(positions: Positions, file: Blob) {
     const data = await blobToBuffer(
       file.slice(
@@ -225,6 +254,7 @@ async function readBlobToArrayBuffer(
 }
 
 function compare(a: Uint8Array, b: Uint8Array) {
+  if (a.length !== b.length) return false
   for (let i = 0; i < a.length; i++) {
     if (a[i] !== b[i]) return false
   }
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 0c7679754..96be4850b 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -273,7 +273,10 @@ export module RR {
     manifest: T.Manifest
     icon: string // base64
   }
-  export type SideloadPacakgeRes = string //guid
+  export type SideloadPackageRes = {
+    upload: string // guid
+    progress: string // guid
+  }
 
   // marketplace
 
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 1d9c6f805..735b8f1d1 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -243,7 +243,5 @@ export abstract class ApiService {
     params: RR.DryConfigureDependencyReq,
   ): Promise<RR.DryConfigureDependencyRes>
 
-  abstract sideloadPackage(
-    params: RR.SideloadPackageReq,
-  ): Promise<RR.SideloadPacakgeRes>
+  abstract sideloadPackage(): Promise<RR.SideloadPackageRes>
 }
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 057c51013..8cdd0d5e3 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -29,7 +29,7 @@ export class LiveApiService extends ApiService {
     @Inject(PATCH_CACHE) private readonly cache$: Observable<Dump<DataModel>>,
   ) {
     super()
-    ; (window as any).rpcClient = this
+    ;(window as any).rpcClient = this
   }
 
   // for getting static files: ex icons, instructions, licenses
@@ -460,12 +460,10 @@ export class LiveApiService extends ApiService {
     })
   }
 
-  async sideloadPackage(
-    params: RR.SideloadPackageReq,
-  ): Promise<RR.SideloadPacakgeRes> {
+  async sideloadPackage(): Promise<RR.SideloadPackageRes> {
     return this.rpcRequest({
       method: 'package.sideload',
-      params,
+      params: {},
     })
   }
 
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 98efee2ef..0a82ac850 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -1062,11 +1062,12 @@ export class MockApiService extends ApiService {
     }
   }
 
-  async sideloadPackage(
-    params: RR.SideloadPackageReq,
-  ): Promise<RR.SideloadPacakgeRes> {
+  async sideloadPackage(): Promise<RR.SideloadPackageRes> {
     await pauseFor(2000)
-    return '4120e092-05ab-4de2-9fbd-c3f1f4b1df9e' // no significance, randomly generated
+    return {
+      upload: '4120e092-05ab-4de2-9fbd-c3f1f4b1df9e', // no significance, randomly generated
+      progress: '5120e092-05ab-4de2-9fbd-c3f1f4b1df9e', // no significance, randomly generated
+    }
   }
 
   private async initProgress(): Promise<T.FullProgress> {
diff --git a/web/projects/ui/src/polyfills.ts b/web/projects/ui/src/polyfills.ts
index a392d45cf..67caa24e8 100644
--- a/web/projects/ui/src/polyfills.ts
+++ b/web/projects/ui/src/polyfills.ts
@@ -52,8 +52,11 @@
  *
  */
 
-(window as any).global = window
-; (window as any).process = { env: { DEBUG: undefined }, browser: true }
+;(window as any).global = window
+;(window as any).process = { env: { DEBUG: undefined }, browser: true }
+
+import { Buffer } from 'buffer'
+window.Buffer = Buffer
 
 import './zone-flags'
 

From f76e822381c63834cd66aef8682fe1fb48fe56f9 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Wed, 10 Jul 2024 11:58:02 -0600
Subject: [PATCH 181/341] port 040 config (#2657)

* port 040 config, WIP

* update fixtures

* use taiga modal for backups too

* fix: update Taiga UI and refactor everything to work

* chore: package-lock

* fix interfaces and mocks for interfaces

* better mocks

* function to transform old spec to new

* delete unused fns

* delete unused FE config utils

* fix exports from sdk

* reorganize exports

* functions to translate config

* rename unionSelectKey and unionValueKey

* Adding in the transformation of the getConfig to the new types.

* chore: add Taiga UI to preloader

---------

Co-authored-by: waterplea <alexander@inkin.ru>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
Co-authored-by: J H <dragondef@gmail.com>
---
 .../Systems/SystemForEmbassy/index.ts         |   17 +-
 .../SystemForEmbassy/transformConfigSpec.ts   |  550 +
 sdk/lib/StartSdk.ts                           |   24 -
 sdk/lib/config/builder/list.ts                |   90 -
 sdk/lib/config/builder/variants.ts            |    8 +-
 sdk/lib/config/configTypes.ts                 |  186 +-
 sdk/lib/index.browser.ts                      |    2 +-
 sdk/lib/osBindings/InstalledVersionParams.ts  |    4 +
 sdk/lib/osBindings/index.ts                   |    1 +
 sdk/lib/test/configBuilder.test.ts            |   51 +-
 sdk/lib/test/configTypes.test.ts              |   10 +-
 sdk/lib/test/output.test.ts                   |   21 +-
 sdk/lib/util/getRandomCharInSet.ts            |    5 +-
 sdk/lib/util/getServiceInterface.ts           |    4 +-
 sdk/lib/util/index.browser.ts                 |   27 +-
 sdk/lib/util/index.ts                         |   25 +-
 sdk/lib/util/typeHelpers.ts                   |   23 +
 sdk/scripts/oldSpecToBuilder.ts               |   40 +-
 web/package-lock.json                         | 9128 +++++++++--------
 web/package.json                              |   18 +-
 .../setup-wizard/src/app/app.component.ts     |    6 +-
 .../setup-wizard/src/app/app.module.ts        |    3 +-
 .../src/app/pages/attach/attach.page.ts       |   10 +-
 .../src/app/pages/embassy/embassy.page.ts     |    8 +-
 .../src/app/pages/home/home.page.ts           |    8 +-
 .../src/app/pages/loading/loading.page.ts     |   13 +-
 .../src/app/pages/recover/recover.page.ts     |    6 +-
 .../src/app/pages/success/success.page.ts     |    9 +-
 .../src/app/pages/transfer/transfer.page.ts   |    6 +-
 .../shared/assets/img/icon_transparent.png    |  Bin 0 -> 53685 bytes
 .../shared/assets/img/storefront-outline.png  |  Bin 0 -> 10912 bytes
 .../taiga-ui/icons/tuiIconPaintOutline.svg    |   10 +
 .../components/loading/loading.component.scss |   20 +
 .../components/loading/loading.component.ts   |   17 +
 .../src/components/loading/loading.module.ts  |   13 +
 .../src/components/loading/loading.service.ts |   10 +
 .../components/markdown/markdown.component.ts |    2 +-
 web/projects/shared/src/public-api.ts         |    6 +-
 .../src/services/error-toast.service.ts       |   70 -
 .../shared/src/services/error.service.ts      |   43 +
 web/projects/shared/src/util/invert.ts        |   12 +
 web/projects/ui/src/app/app.module.ts         |    4 +-
 web/projects/ui/src/app/app.providers.ts      |    5 +
 .../app/preloader/preloader.component.html    |   42 +-
 .../app/app/preloader/preloader.component.ts  |   34 +
 .../src/app/app/preloader/preloader.module.ts |   56 +-
 .../ui/src/app/app/snek/snek.directive.ts     |   19 +-
 .../backup-drives.component.module.ts         |    2 -
 .../backup-drives/backup-drives.component.ts  |  146 +-
 .../form-object/form-label.component.html     |   16 -
 .../form-object/form-object.component.html    |  372 -
 .../form-object.component.module.ts           |   47 -
 .../form-object/form-object.component.scss    |   42 -
 .../form-object/form-object.component.ts      |  425 -
 .../form-object/form-object.pipes.ts          |   92 -
 .../form-object/form-union.component.html     |   42 -
 .../ui/src/app/components/form.component.ts   |  167 +
 .../app/components/form/control.directive.ts  |   30 +
 .../ui/src/app/components/form/control.ts     |   35 +
 .../form/form-array/form-array.component.html |   58 +
 .../form/form-array/form-array.component.scss |   50 +
 .../form/form-array/form-array.component.ts   |   91 +
 .../form/form-color/form-color.component.html |   31 +
 .../form/form-color/form-color.component.scss |   33 +
 .../form/form-color/form-color.component.ts   |   15 +
 .../form-control/form-control.component.html  |   40 +
 .../form-control/form-control.component.scss  |   11 +
 .../form-control/form-control.component.ts    |   71 +
 .../form-control/form-control.providers.ts    |   25 +
 .../form-datetime.component.html              |   43 +
 .../form-datetime/form-datetime.component.ts  |   36 +
 .../form/form-file/form-file.component.html   |   31 +
 .../form/form-file/form-file.component.scss   |   46 +
 .../form/form-file/form-file.component.ts     |   11 +
 .../form/form-group/form-group.component.html |   30 +
 .../form/form-group/form-group.component.scss |   35 +
 .../form/form-group/form-group.component.ts   |   35 +
 .../form/form-group/form-group.providers.ts   |   34 +
 .../form-multiselect.component.html           |   18 +
 .../form-multiselect.component.ts             |   49 +
 .../form-number/form-number.component.html    |   18 +
 .../form/form-number/form-number.component.ts |   11 +
 .../form-object/form-object.component.html    |   25 +
 .../form-object/form-object.component.scss    |   41 +
 .../form/form-object/form-object.component.ts |   38 +
 .../form-select/form-select.component.html    |   17 +
 .../form/form-select/form-select.component.ts |   30 +
 .../form/form-text/form-text.component.html   |   44 +
 .../form/form-text/form-text.component.scss   |    8 +
 .../form/form-text/form-text.component.ts     |   16 +
 .../form-textarea.component.html              |   15 +
 .../form-textarea/form-textarea.component.ts  |   12 +
 .../form-toggle/form-toggle.component.html    |   11 +
 .../form/form-toggle/form-toggle.component.ts |   10 +
 .../form/form-union/form-union.component.html |   11 +
 .../form/form-union/form-union.component.scss |    8 +
 .../form/form-union/form-union.component.ts   |   55 +
 .../ui/src/app/components/form/form.module.ts |  109 +
 .../ui/src/app/components/form/hint.pipe.ts   |   21 +
 .../app/components/form/invalid.service.ts    |   19 +
 .../src/app/components/form/mustache.pipe.ts  |   12 +
 .../src/app/components/logs/logs.component.ts |   36 +-
 .../refresh-alert/refresh-alert.component.ts  |   13 +-
 .../update-toast/update-toast.component.ts    |   21 +-
 .../modals/app-config/app-config.module.ts    |   21 -
 .../modals/app-config/app-config.page.html    |  144 -
 .../modals/app-config/app-config.page.scss    |   12 -
 .../app/modals/app-config/app-config.page.ts  |  349 -
 .../app-recover-select.page.ts                |   23 +-
 .../ui/src/app/modals/config-dep.component.ts |  104 +
 .../ui/src/app/modals/config.component.ts     |  281 +
 .../app/modals/enum-list/enum-list.module.ts  |   12 -
 .../app/modals/enum-list/enum-list.page.html  |   45 -
 .../app/modals/enum-list/enum-list.page.scss  |    0
 .../app/modals/enum-list/enum-list.page.ts    |   50 -
 .../generic-form/generic-form.module.ts       |   19 -
 .../generic-form/generic-form.page.html       |   35 -
 .../generic-form/generic-form.page.scss       |    9 -
 .../modals/generic-form/generic-form.page.ts  |   60 -
 .../generic-input.component.html              |   67 -
 .../generic-input.component.module.ts         |   20 -
 .../generic-input.component.scss              |    0
 .../generic-input/generic-input.component.ts  |   96 -
 .../marketplace-settings.module.ts            |   17 -
 .../marketplace-settings.page.html            |   95 +-
 .../marketplace-settings.page.scss            |    5 +
 .../marketplace-settings.page.ts              |  350 +-
 .../registry.component.ts                     |   42 +
 .../store-icon.component.ts                   |   46 +
 .../app/modals/os-update/os-update.page.ts    |   19 +-
 .../ui/src/app/modals/prompt.component.ts     |  123 +
 .../app-actions/app-actions.module.ts         |    2 -
 .../app-actions/app-actions.page.ts           |   60 +-
 .../app-interfaces/app-interfaces.page.html   |    4 +-
 .../app-interfaces/app-interfaces.page.ts     |   99 +-
 .../app-metrics/app-metrics.page.ts           |    6 +-
 .../app-properties/app-properties.page.ts     |   20 +-
 .../apps-routes/app-show/app-show.module.ts   |    3 -
 .../apps-routes/app-show/app-show.page.ts     |   28 +-
 .../app-show-health-checks.component.html     |    2 +-
 .../app-show-status.component.ts              |   68 +-
 .../app-show/pipes/to-buttons.pipe.ts         |   10 +-
 .../pages/diagnostic-routes/home/home.page.ts |   26 +-
 .../pages/diagnostic-routes/logs/logs.page.ts |    6 +-
 .../ui/src/app/pages/init/init.service.ts     |    6 +-
 .../ui/src/app/pages/login/login.page.ts      |   16 +-
 .../marketplace-list.module.ts                |    2 -
 .../marketplace-list/marketplace-list.page.ts |   15 +-
 .../marketplace-show-controls.component.ts    |   30 +-
 .../pages/notifications/notifications.page.ts |   44 +-
 .../restore/restore.component.ts              |   49 +-
 .../server-backup/server-backup.page.ts       |   73 +-
 .../server-metrics/server-metrics.page.ts     |    8 +-
 .../server-show/server-show.page.ts           |  290 +-
 .../server-routes/sessions/sessions.page.ts   |   23 +-
 .../server-routes/sideload/sideload.page.ts   |   23 +-
 .../server-routes/ssh-keys/ssh-keys.page.html |    6 +-
 .../server-routes/ssh-keys/ssh-keys.page.ts   |  143 +-
 .../app/pages/server-routes/wifi/wifi.page.ts |  143 +-
 .../ui/src/app/pkg-config/config-types.ts     |  159 -
 .../ui/src/app/pkg-config/config-utilities.ts |  235 -
 .../ui/src/app/services/api/api.fixures.ts    | 1187 ++-
 .../ui/src/app/services/api/api.types.ts      |    7 +-
 .../app/services/api/embassy-api.service.ts   |    2 +
 .../services/api/embassy-live-api.service.ts  |   11 +-
 .../services/api/embassy-mock-api.service.ts  |    9 +-
 .../ui/src/app/services/api/mock-patch.ts     |  102 +-
 .../src/app/services/form-dialog.service.ts   |   41 +
 .../ui/src/app/services/form.service.ts       |  481 +-
 .../ui/src/app/services/modal.service.ts      |   24 -
 .../ui/src/app/util/configBuilderToSpec.ts    |    9 +
 web/projects/ui/src/index.html                |   28 +-
 web/projects/ui/src/styles.scss               |   13 +-
 173 files changed, 9797 insertions(+), 9236 deletions(-)
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
 create mode 100644 sdk/lib/osBindings/InstalledVersionParams.ts
 create mode 100644 sdk/lib/util/typeHelpers.ts
 create mode 100644 web/projects/shared/assets/img/icon_transparent.png
 create mode 100644 web/projects/shared/assets/img/storefront-outline.png
 create mode 100644 web/projects/shared/assets/taiga-ui/icons/tuiIconPaintOutline.svg
 create mode 100644 web/projects/shared/src/components/loading/loading.component.scss
 create mode 100644 web/projects/shared/src/components/loading/loading.component.ts
 create mode 100644 web/projects/shared/src/components/loading/loading.module.ts
 create mode 100644 web/projects/shared/src/components/loading/loading.service.ts
 delete mode 100644 web/projects/shared/src/services/error-toast.service.ts
 create mode 100644 web/projects/shared/src/services/error.service.ts
 create mode 100644 web/projects/shared/src/util/invert.ts
 delete mode 100644 web/projects/ui/src/app/components/form-object/form-label.component.html
 delete mode 100644 web/projects/ui/src/app/components/form-object/form-object.component.html
 delete mode 100644 web/projects/ui/src/app/components/form-object/form-object.component.module.ts
 delete mode 100644 web/projects/ui/src/app/components/form-object/form-object.component.scss
 delete mode 100644 web/projects/ui/src/app/components/form-object/form-object.component.ts
 delete mode 100644 web/projects/ui/src/app/components/form-object/form-object.pipes.ts
 delete mode 100644 web/projects/ui/src/app/components/form-object/form-union.component.html
 create mode 100644 web/projects/ui/src/app/components/form.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/control.directive.ts
 create mode 100644 web/projects/ui/src/app/components/form/control.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-array/form-array.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-array/form-array.component.scss
 create mode 100644 web/projects/ui/src/app/components/form/form-array/form-array.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-color/form-color.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-color/form-color.component.scss
 create mode 100644 web/projects/ui/src/app/components/form/form-color/form-color.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-control/form-control.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-control/form-control.component.scss
 create mode 100644 web/projects/ui/src/app/components/form/form-control/form-control.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-file/form-file.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-file/form-file.component.scss
 create mode 100644 web/projects/ui/src/app/components/form/form-file/form-file.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-group/form-group.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-group/form-group.component.scss
 create mode 100644 web/projects/ui/src/app/components/form/form-group/form-group.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-group/form-group.providers.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-number/form-number.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-number/form-number.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-object/form-object.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-object/form-object.component.scss
 create mode 100644 web/projects/ui/src/app/components/form/form-object/form-object.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-select/form-select.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-select/form-select.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-text/form-text.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-text/form-text.component.scss
 create mode 100644 web/projects/ui/src/app/components/form/form-text/form-text.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form-union/form-union.component.html
 create mode 100644 web/projects/ui/src/app/components/form/form-union/form-union.component.scss
 create mode 100644 web/projects/ui/src/app/components/form/form-union/form-union.component.ts
 create mode 100644 web/projects/ui/src/app/components/form/form.module.ts
 create mode 100644 web/projects/ui/src/app/components/form/hint.pipe.ts
 create mode 100644 web/projects/ui/src/app/components/form/invalid.service.ts
 create mode 100644 web/projects/ui/src/app/components/form/mustache.pipe.ts
 delete mode 100644 web/projects/ui/src/app/modals/app-config/app-config.module.ts
 delete mode 100644 web/projects/ui/src/app/modals/app-config/app-config.page.html
 delete mode 100644 web/projects/ui/src/app/modals/app-config/app-config.page.scss
 delete mode 100644 web/projects/ui/src/app/modals/app-config/app-config.page.ts
 create mode 100644 web/projects/ui/src/app/modals/config-dep.component.ts
 create mode 100644 web/projects/ui/src/app/modals/config.component.ts
 delete mode 100644 web/projects/ui/src/app/modals/enum-list/enum-list.module.ts
 delete mode 100644 web/projects/ui/src/app/modals/enum-list/enum-list.page.html
 delete mode 100644 web/projects/ui/src/app/modals/enum-list/enum-list.page.scss
 delete mode 100644 web/projects/ui/src/app/modals/enum-list/enum-list.page.ts
 delete mode 100644 web/projects/ui/src/app/modals/generic-form/generic-form.module.ts
 delete mode 100644 web/projects/ui/src/app/modals/generic-form/generic-form.page.html
 delete mode 100644 web/projects/ui/src/app/modals/generic-form/generic-form.page.scss
 delete mode 100644 web/projects/ui/src/app/modals/generic-form/generic-form.page.ts
 delete mode 100644 web/projects/ui/src/app/modals/generic-input/generic-input.component.html
 delete mode 100644 web/projects/ui/src/app/modals/generic-input/generic-input.component.module.ts
 delete mode 100644 web/projects/ui/src/app/modals/generic-input/generic-input.component.scss
 delete mode 100644 web/projects/ui/src/app/modals/generic-input/generic-input.component.ts
 delete mode 100644 web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.module.ts
 create mode 100644 web/projects/ui/src/app/modals/marketplace-settings/registry.component.ts
 create mode 100644 web/projects/ui/src/app/modals/marketplace-settings/store-icon.component.ts
 create mode 100644 web/projects/ui/src/app/modals/prompt.component.ts
 delete mode 100644 web/projects/ui/src/app/pkg-config/config-types.ts
 delete mode 100644 web/projects/ui/src/app/pkg-config/config-utilities.ts
 create mode 100644 web/projects/ui/src/app/services/form-dialog.service.ts
 delete mode 100644 web/projects/ui/src/app/services/modal.service.ts
 create mode 100644 web/projects/ui/src/app/util/configBuilderToSpec.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 127fb0e09..3a8d4f4b2 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -42,6 +42,12 @@ import {
 } from "@start9labs/start-sdk/cjs/lib/interfaces/Host"
 import { ServiceInterfaceBuilder } from "@start9labs/start-sdk/cjs/lib/interfaces/ServiceInterfaceBuilder"
 import { Effects } from "../../../Models/Effects"
+import {
+  OldConfigSpec,
+  matchOldConfigSpec,
+  transformConfigSpec,
+  transformOldConfigToNew,
+} from "./transformConfigSpec"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -533,7 +539,9 @@ export class SystemForEmbassy implements System {
     effects: Effects,
     timeoutMs: number | null,
   ): Promise<T.ConfigRes> {
-    return this.getConfigUncleaned(effects, timeoutMs).then(removePointers)
+    return this.getConfigUncleaned(effects, timeoutMs)
+      .then(removePointers)
+      .then(convertToNewConfig)
   }
   private async getConfigUncleaned(
     effects: Effects,
@@ -1054,3 +1062,10 @@ function extractServiceInterfaceId(manifest: Manifest, specInterface: string) {
   const serviceInterfaceId = `${specInterface}-${internalPort}`
   return serviceInterfaceId
 }
+async function convertToNewConfig(value: T.ConfigRes): Promise<T.ConfigRes> {
+  const valueSpec: OldConfigSpec = matchOldConfigSpec.unsafeCast(value.spec)
+  const spec = transformConfigSpec(valueSpec)
+  if (!value.config) return { spec, config: null }
+  const config = transformOldConfigToNew(valueSpec, value.config)
+  return { spec, config }
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
new file mode 100644
index 000000000..cb7809903
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -0,0 +1,550 @@
+import { CT } from "@start9labs/start-sdk"
+import {
+  dictionary,
+  object,
+  anyOf,
+  string,
+  literals,
+  array,
+  number,
+  boolean,
+  Parser,
+  deferred,
+  every,
+  nill,
+} from "ts-matches"
+
+export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
+  return Object.entries(oldSpec).reduce((inputSpec, [key, oldVal]) => {
+    let newVal: CT.ValueSpec
+
+    if (oldVal.type === "boolean") {
+      newVal = {
+        type: "toggle",
+        name: oldVal.name,
+        default: oldVal.default,
+        description: oldVal.description || null,
+        warning: oldVal.warning || null,
+        disabled: false,
+        immutable: false,
+      }
+    } else if (oldVal.type === "enum") {
+      newVal = {
+        type: "select",
+        name: oldVal.name,
+        description: oldVal.description || null,
+        warning: oldVal.warning || null,
+        default: oldVal.default,
+        values: oldVal.values.reduce(
+          (obj, curr) => ({
+            ...obj,
+            [curr]: oldVal["value-names"][curr],
+          }),
+          {},
+        ),
+        required: false,
+        disabled: false,
+        immutable: false,
+      }
+    } else if (oldVal.type === "list") {
+      newVal = getListSpec(oldVal)
+    } else if (oldVal.type === "number") {
+      const range = Range.from(oldVal.range)
+
+      newVal = {
+        type: "number",
+        name: oldVal.name,
+        default: oldVal.default || null,
+        description: oldVal.description || null,
+        warning: oldVal.warning || null,
+        disabled: false,
+        immutable: false,
+        required: !oldVal.nullable,
+        min: range.min
+          ? range.minInclusive
+            ? range.min
+            : range.min + 1
+          : null,
+        max: range.max
+          ? range.maxInclusive
+            ? range.max
+            : range.max - 1
+          : null,
+        integer: oldVal.integral,
+        step: null,
+        units: oldVal.units || null,
+        placeholder: oldVal.placeholder || null,
+      }
+    } else if (oldVal.type === "object") {
+      newVal = {
+        type: "object",
+        name: oldVal.name,
+        description: oldVal.description || null,
+        warning: oldVal.warning || null,
+        spec: transformConfigSpec(matchOldConfigSpec.unsafeCast(oldVal.spec)),
+      }
+    } else if (oldVal.type === "string") {
+      newVal = {
+        type: "text",
+        name: oldVal.name,
+        default: oldVal.default || null,
+        description: oldVal.description || null,
+        warning: oldVal.warning || null,
+        disabled: false,
+        immutable: false,
+        required: !oldVal.nullable,
+        patterns:
+          oldVal.pattern && oldVal["pattern-description"]
+            ? [
+                {
+                  regex: oldVal.pattern,
+                  description: oldVal["pattern-description"],
+                },
+              ]
+            : [],
+        minLength: null,
+        maxLength: null,
+        masked: oldVal.masked,
+        generate: null,
+        inputmode: "text",
+        placeholder: oldVal.placeholder || null,
+      }
+    } else {
+      newVal = {
+        type: "union",
+        name: oldVal.tag.name,
+        description: oldVal.tag.description || null,
+        warning: oldVal.tag.warning || null,
+        variants: Object.entries(oldVal.variants).reduce(
+          (obj, [id, spec]) => ({
+            ...obj,
+            [id]: {
+              name: oldVal.tag["variant-names"][id],
+              spec: transformConfigSpec(matchOldConfigSpec.unsafeCast(spec)),
+            },
+          }),
+          {} as Record<string, { name: string; spec: CT.InputSpec }>,
+        ),
+        disabled: false,
+        required: true,
+        default: oldVal.default,
+        immutable: false,
+      }
+    }
+
+    return {
+      ...inputSpec,
+      [key]: newVal,
+    }
+  }, {} as CT.InputSpec)
+}
+
+export function transformOldConfigToNew(
+  spec: OldConfigSpec,
+  config: Record<string, any>,
+): Record<string, any> {
+  return Object.entries(spec).reduce((obj, [key, val]) => {
+    let newVal = config[key]
+
+    if (isObject(val)) {
+      newVal = transformOldConfigToNew(
+        matchOldConfigSpec.unsafeCast(val.spec),
+        config[key],
+      )
+    }
+
+    if (isUnion(val)) {
+      const selection = config[key][val.tag.id]
+      delete config[key][val.tag.id]
+
+      newVal = {
+        selection,
+        value: transformOldConfigToNew(
+          matchOldConfigSpec.unsafeCast(val.variants[selection]),
+          config[key],
+        ),
+      }
+    }
+
+    if (isList(val) && isObjectList(val)) {
+      newVal = (config[key] as object[]).map((obj) =>
+        transformOldConfigToNew(
+          matchOldConfigSpec.unsafeCast(val.spec.spec),
+          obj,
+        ),
+      )
+    }
+
+    return {
+      ...obj,
+      [key]: newVal,
+    }
+  }, {})
+}
+
+export function transformNewConfigToOld(
+  spec: OldConfigSpec,
+  config: Record<string, any>,
+): Record<string, any> {
+  return Object.entries(spec).reduce((obj, [key, val]) => {
+    let newVal = config[key]
+
+    if (isObject(val)) {
+      newVal = transformNewConfigToOld(
+        matchOldConfigSpec.unsafeCast(val.spec),
+        config[key],
+      )
+    }
+
+    if (isUnion(val)) {
+      newVal = {
+        [val.tag.id]: config[key].selection,
+        ...transformNewConfigToOld(
+          matchOldConfigSpec.unsafeCast(val.variants[config[key].selection]),
+          config[key].unionSelectValue,
+        ),
+      }
+    }
+
+    if (isList(val) && isObjectList(val)) {
+      newVal = (config[key] as object[]).map((obj) =>
+        transformNewConfigToOld(
+          matchOldConfigSpec.unsafeCast(val.spec.spec),
+          obj,
+        ),
+      )
+    }
+
+    return {
+      ...obj,
+      [key]: newVal,
+    }
+  }, {})
+}
+
+function getListSpec(
+  oldVal: OldValueSpecList,
+): CT.ValueSpecMultiselect | CT.ValueSpecList {
+  const range = Range.from(oldVal.range)
+
+  let partial: Omit<CT.ValueSpecList, "type" | "spec" | "default"> = {
+    name: oldVal.name,
+    description: oldVal.description || null,
+    warning: oldVal.warning || null,
+    minLength: range.min
+      ? range.minInclusive
+        ? range.min
+        : range.min + 1
+      : null,
+    maxLength: range.max
+      ? range.maxInclusive
+        ? range.max
+        : range.max - 1
+      : null,
+    disabled: false,
+  }
+
+  if (isEnumList(oldVal)) {
+    return {
+      ...partial,
+      type: "multiselect",
+      default: oldVal.default as string[],
+      immutable: false,
+      values: oldVal.spec.values.reduce(
+        (obj, curr) => ({
+          ...obj,
+          [curr]: oldVal.spec["value-names"][curr],
+        }),
+        {},
+      ),
+    }
+  } else if (isStringList(oldVal)) {
+    return {
+      ...partial,
+      type: "list",
+      default: oldVal.default as string[],
+      spec: {
+        type: "text",
+        patterns:
+          oldVal.spec.pattern && oldVal.spec["pattern-description"]
+            ? [
+                {
+                  regex: oldVal.spec.pattern,
+                  description: oldVal.spec["pattern-description"],
+                },
+              ]
+            : [],
+        minLength: null,
+        maxLength: null,
+        masked: oldVal.spec.masked,
+        generate: null,
+        inputmode: "text",
+        placeholder: oldVal.spec.placeholder || null,
+      },
+    }
+  } else if (isObjectList(oldVal)) {
+    return {
+      ...partial,
+      type: "list",
+      default: oldVal.default as Record<string, unknown>[],
+      spec: {
+        type: "object",
+        spec: transformConfigSpec(
+          matchOldConfigSpec.unsafeCast(oldVal.spec.spec),
+        ),
+        uniqueBy: oldVal.spec["unique-by"],
+        displayAs: oldVal.spec["display-as"] || null,
+      },
+    }
+  } else {
+    throw new Error("Invalid list subtype. enum, string, and object permitted.")
+  }
+}
+
+function isObject(val: OldValueSpec): val is OldValueSpecObject {
+  return val.type === "object"
+}
+
+function isUnion(val: OldValueSpec): val is OldValueSpecUnion {
+  return val.type === "union"
+}
+
+function isList(val: OldValueSpec): val is OldValueSpecList {
+  return val.type === "list"
+}
+
+function isEnumList(
+  val: OldValueSpecList,
+): val is OldValueSpecList & { subtype: "enum" } {
+  return val.subtype === "enum"
+}
+
+function isStringList(
+  val: OldValueSpecList,
+): val is OldValueSpecList & { subtype: "string" } {
+  return val.subtype === "string"
+}
+
+function isObjectList(
+  val: OldValueSpecList,
+): val is OldValueSpecList & { subtype: "object" } {
+  if (["number", "union"].includes(val.subtype)) {
+    throw new Error("Invalid list subtype. enum, string, and object permitted.")
+  }
+  return val.subtype === "object"
+}
+export type OldConfigSpec = Record<string, OldValueSpec>
+const [_matchOldConfigSpec, setMatchOldConfigSpec] = deferred<unknown>()
+export const matchOldConfigSpec = _matchOldConfigSpec as Parser<
+  unknown,
+  OldConfigSpec
+>
+export const matchOldDefaultString = anyOf(
+  string,
+  object({ charset: string, len: number }),
+)
+type OldDefaultString = typeof matchOldDefaultString._TYPE
+
+export const matchOldValueSpecString = object(
+  {
+    masked: boolean,
+    copyable: boolean,
+    type: literals("string"),
+    nullable: boolean,
+    name: string,
+    placeholder: string,
+    pattern: string,
+    "pattern-description": string,
+    default: matchOldDefaultString,
+    textarea: boolean,
+    description: string,
+    warning: string,
+  },
+  [
+    "placeholder",
+    "pattern",
+    "pattern-description",
+    "default",
+    "textarea",
+    "description",
+    "warning",
+  ],
+)
+
+export const matchOldValueSpecNumber = object(
+  {
+    type: literals("number"),
+    nullable: boolean,
+    name: string,
+    range: string,
+    integral: boolean,
+    default: number,
+    description: string,
+    warning: string,
+    units: string,
+    placeholder: string,
+  },
+  ["default", "description", "warning", "units", "placeholder"],
+)
+type OldValueSpecNumber = typeof matchOldValueSpecNumber._TYPE
+
+export const matchOldValueSpecBoolean = object(
+  {
+    type: literals("boolean"),
+    default: boolean,
+    name: string,
+    description: string,
+    warning: string,
+  },
+  ["description", "warning"],
+)
+type OldValueSpecBoolean = typeof matchOldValueSpecBoolean._TYPE
+
+const matchOldValueSpecObject = object(
+  {
+    type: literals("object"),
+    spec: _matchOldConfigSpec,
+    name: string,
+    description: string,
+    warning: string,
+  },
+  ["description", "warning"],
+)
+type OldValueSpecObject = typeof matchOldValueSpecObject._TYPE
+
+const matchOldValueSpecEnum = object(
+  {
+    values: array(string),
+    "value-names": dictionary([string, string]),
+    type: literals("enum"),
+    default: string,
+    name: string,
+    description: string,
+    warning: string,
+  },
+  ["description", "warning"],
+)
+type OldValueSpecEnum = typeof matchOldValueSpecEnum._TYPE
+
+const matchOldUnionTagSpec = object(
+  {
+    id: string, // The name of the field containing one of the union variants
+    "variant-names": dictionary([string, string]), // The name of each variant
+    name: string,
+    description: string,
+    warning: string,
+  },
+  ["description", "warning"],
+)
+const matchOldValueSpecUnion = object({
+  type: literals("union"),
+  tag: matchOldUnionTagSpec,
+  variants: dictionary([string, _matchOldConfigSpec]),
+  default: string,
+})
+type OldValueSpecUnion = typeof matchOldValueSpecUnion._TYPE
+
+const [matchOldUniqueBy, setOldUniqueBy] = deferred<OldUniqueBy>()
+type OldUniqueBy =
+  | null
+  | string
+  | { any: OldUniqueBy[] }
+  | { all: OldUniqueBy[] }
+
+setOldUniqueBy(
+  anyOf(
+    nill,
+    string,
+    object({ any: array(matchOldUniqueBy) }),
+    object({ all: array(matchOldUniqueBy) }),
+  ),
+)
+
+const matchOldListValueSpecObject = object(
+  {
+    spec: _matchOldConfigSpec, // this is a mapped type of the config object at this level, replacing the object's values with specs on those values
+    "unique-by": matchOldUniqueBy, // indicates whether duplicates can be permitted in the list
+    "display-as": string, // this should be a handlebars template which can make use of the entire config which corresponds to 'spec'
+  },
+  ["display-as"],
+)
+const matchOldListValueSpecString = object(
+  {
+    masked: boolean,
+    copyable: boolean,
+    pattern: string,
+    "pattern-description": string,
+    placeholder: string,
+  },
+  ["pattern", "pattern-description", "placeholder"],
+)
+
+const matchOldListValueSpecEnum = object({
+  values: array(string),
+  "value-names": dictionary([string, string]),
+})
+
+// represents a spec for a list
+const matchOldValueSpecList = every(
+  object(
+    {
+      type: literals("list"),
+      range: string, // '[0,1]' (inclusive) OR '[0,*)' (right unbounded), normal math rules
+      default: anyOf(
+        array(string),
+        array(number),
+        array(matchOldDefaultString),
+        array(object),
+      ),
+      name: string,
+      description: string,
+      warning: string,
+    },
+    ["description", "warning"],
+  ),
+  anyOf(
+    object({
+      subtype: literals("string"),
+      spec: matchOldListValueSpecString,
+    }),
+    object({
+      subtype: literals("enum"),
+      spec: matchOldListValueSpecEnum,
+    }),
+    object({
+      subtype: literals("object"),
+      spec: matchOldListValueSpecObject,
+    }),
+  ),
+)
+type OldValueSpecList = typeof matchOldValueSpecList._TYPE
+
+export const matchOldValueSpec = anyOf(
+  matchOldValueSpecString,
+  matchOldValueSpecNumber,
+  matchOldValueSpecBoolean,
+  matchOldValueSpecObject,
+  matchOldValueSpecEnum,
+  matchOldValueSpecList,
+  matchOldValueSpecUnion,
+)
+type OldValueSpec = typeof matchOldValueSpec._TYPE
+
+setMatchOldConfigSpec(dictionary([string, matchOldValueSpec]))
+
+export class Range {
+  min?: number
+  max?: number
+  minInclusive!: boolean
+  maxInclusive!: boolean
+
+  static from(s: string = "(*,*)"): Range {
+    const r = new Range()
+    r.minInclusive = s.startsWith("[")
+    r.maxInclusive = s.endsWith("]")
+    const [minStr, maxStr] = s.split(",").map((a) => a.trim())
+    r.min = minStr === "(*" ? undefined : Number(minStr.slice(1))
+    r.max = maxStr === "*)" ? undefined : Number(maxStr.slice(0, -1))
+    return r
+  }
+}
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 4208928c9..fac78a4af 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -480,7 +480,6 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
       },
       List: {
         text: List.text,
-        number: List.number,
         obj: <Type extends Record<string, any>>(
           a: {
             name: string
@@ -523,29 +522,6 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
             }
           >,
         ) => List.dynamicText<Store>(getA),
-        dynamicNumber: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              /** Default = [] */
-              default?: string[]
-              minLength?: number | null
-              maxLength?: number | null
-              disabled?: false | string
-              spec: {
-                integer: boolean
-                min?: number | null
-                max?: number | null
-                step?: number | null
-                units?: string | null
-                placeholder?: string | null
-              }
-            }
-          >,
-        ) => List.dynamicNumber<Store>(getA),
       },
       Migration: {
         of: <Version extends ManifestVersion>(options: {
diff --git a/sdk/lib/config/builder/list.ts b/sdk/lib/config/builder/list.ts
index 8a251069d..f230b8608 100644
--- a/sdk/lib/config/builder/list.ts
+++ b/sdk/lib/config/builder/list.ts
@@ -125,96 +125,6 @@ export class List<Type, Store> {
       return built
     }, arrayOf(string))
   }
-  static number(
-    a: {
-      name: string
-      description?: string | null
-      warning?: string | null
-      /** Default = [] */
-      default?: string[]
-      minLength?: number | null
-      maxLength?: number | null
-    },
-    aSpec: {
-      integer: boolean
-      min?: number | null
-      max?: number | null
-      step?: number | null
-      units?: string | null
-      placeholder?: string | null
-    },
-  ) {
-    return new List<number[], never>(() => {
-      const spec = {
-        type: "number" as const,
-        placeholder: null,
-        min: null,
-        max: null,
-        step: null,
-        units: null,
-        ...aSpec,
-      }
-      const built: ValueSpecListOf<"number"> = {
-        description: null,
-        warning: null,
-        minLength: null,
-        maxLength: null,
-        default: [],
-        type: "list" as const,
-        disabled: false,
-        ...a,
-        spec,
-      }
-      return built
-    }, arrayOf(number))
-  }
-  static dynamicNumber<Store = never>(
-    getA: LazyBuild<
-      Store,
-      {
-        name: string
-        description?: string | null
-        warning?: string | null
-        /** Default = [] */
-        default?: string[]
-        minLength?: number | null
-        maxLength?: number | null
-        disabled?: false | string
-        spec: {
-          integer: boolean
-          min?: number | null
-          max?: number | null
-          step?: number | null
-          units?: string | null
-          placeholder?: string | null
-        }
-      }
-    >,
-  ) {
-    return new List<number[], Store>(async (options) => {
-      const { spec: aSpec, ...a } = await getA(options)
-      const spec = {
-        type: "number" as const,
-        placeholder: null,
-        min: null,
-        max: null,
-        step: null,
-        units: null,
-        ...aSpec,
-      }
-      return {
-        description: null,
-        warning: null,
-        minLength: null,
-        maxLength: null,
-        default: [],
-        type: "list" as const,
-        disabled: false,
-        ...a,
-        spec,
-      }
-    }, arrayOf(number))
-  }
   static obj<Type extends Record<string, any>, Store>(
     a: {
       name: string
diff --git a/sdk/lib/config/builder/variants.ts b/sdk/lib/config/builder/variants.ts
index 1e7a2a384..352f16828 100644
--- a/sdk/lib/config/builder/variants.ts
+++ b/sdk/lib/config/builder/variants.ts
@@ -69,8 +69,8 @@ export class Variants<Type, Store> {
     const validator = anyOf(
       ...Object.entries(a).map(([name, { spec }]) =>
         object({
-          unionSelectKey: literals(name),
-          unionValueKey: spec.validator,
+          selection: literals(name),
+          value: spec.validator,
         }),
       ),
     ) as Parser<unknown, any>
@@ -78,9 +78,9 @@ export class Variants<Type, Store> {
     return new Variants<
       {
         [K in keyof VariantValues]: {
-          unionSelectKey: K
+          selection: K
           // prettier-ignore
-          unionValueKey: 
+          value: 
             VariantValues[K]["spec"] extends (Config<infer B, Store> | Config<infer B, never>) ? B :
             never
         }
diff --git a/sdk/lib/config/configTypes.ts b/sdk/lib/config/configTypes.ts
index 14e0e1d1d..14d857433 100644
--- a/sdk/lib/config/configTypes.ts
+++ b/sdk/lib/config/configTypes.ts
@@ -15,70 +15,93 @@ export type ValueType =
 export type ValueSpec = ValueSpecOf<ValueType>
 /** core spec types. These types provide the metadata for performing validations */
 // prettier-ignore
-export type ValueSpecOf<T extends ValueType> = T extends "text"
-  ? ValueSpecText
-  : T extends "textarea"
-    ? ValueSpecTextarea
-    : T extends "number"
-      ? ValueSpecNumber
-      : T extends "color"
-        ? ValueSpecColor
-        : T extends "datetime"
-          ? ValueSpecDatetime
-          : T extends "toggle"
-            ? ValueSpecToggle
-            : T extends "select"
-              ? ValueSpecSelect
-              : T extends "multiselect"
-                ? ValueSpecMultiselect
-                : T extends "list"
-                  ? ValueSpecList
-                  : T extends "object"
-                    ? ValueSpecObject
-                    : T extends "file"
-                      ? ValueSpecFile
-                      : T extends "union"
-                        ? ValueSpecUnion
-                        : never
+export type ValueSpecOf<T extends ValueType> = 
+  T extends "text" ? ValueSpecText : 
+  T extends "textarea" ? ValueSpecTextarea : 
+  T extends "number" ? ValueSpecNumber : 
+  T extends "color" ? ValueSpecColor : 
+  T extends "datetime" ? ValueSpecDatetime : 
+  T extends "toggle" ? ValueSpecToggle : 
+  T extends "select" ? ValueSpecSelect : 
+  T extends "multiselect" ? ValueSpecMultiselect : 
+  T extends "list" ? ValueSpecList : 
+  T extends "object" ? ValueSpecObject : 
+  T extends "file" ? ValueSpecFile : 
+  T extends "union" ? ValueSpecUnion : 
+  never
+
+export type ValueSpecText = {
+  name: string
+  description: string | null
+  warning: string | null
+
+  type: "text"
+  patterns: Pattern[]
+  minLength: number | null
+  maxLength: number | null
+  masked: boolean
+
+  inputmode: "text" | "email" | "tel" | "url"
+  placeholder: string | null
 
-export interface ValueSpecText extends ListValueSpecText, WithStandalone {
   required: boolean
   default: DefaultString | null
   disabled: false | string
   generate: null | RandomString
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
-export interface ValueSpecTextarea extends WithStandalone {
+export type ValueSpecTextarea = {
+  name: string
+  description: string | null
+  warning: string | null
+
   type: "textarea"
   placeholder: string | null
   minLength: number | null
   maxLength: number | null
   required: boolean
   disabled: false | string
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 
 export type FilePath = {
   filePath: string
 }
-export interface ValueSpecNumber extends ListValueSpecNumber, WithStandalone {
+export type ValueSpecNumber = {
+  type: "number"
+  min: number | null
+  max: number | null
+  integer: boolean
+  step: number | null
+  units: string | null
+  placeholder: string | null
+  name: string
+  description: string | null
+  warning: string | null
   required: boolean
   default: number | null
   disabled: false | string
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
-export interface ValueSpecColor extends WithStandalone {
+export type ValueSpecColor = {
+  name: string
+  description: string | null
+  warning: string | null
+
   type: "color"
   required: boolean
   default: string | null
   disabled: false | string
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
-export interface ValueSpecDatetime extends WithStandalone {
+export type ValueSpecDatetime = {
+  name: string
+  description: string | null
+  warning: string | null
   type: "datetime"
   required: boolean
   inputmode: "date" | "time" | "datetime-local"
@@ -86,10 +109,14 @@ export interface ValueSpecDatetime extends WithStandalone {
   max: string | null
   default: string | null
   disabled: false | string
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
-export interface ValueSpecSelect extends SelectBase, WithStandalone {
+export type ValueSpecSelect = {
+  values: Record<string, string>
+  name: string
+  description: string | null
+  warning: string | null
   type: "select"
   required: boolean
   default: string | null
@@ -99,10 +126,16 @@ export interface ValueSpecSelect extends SelectBase, WithStandalone {
    *           string[] means that the options are disabled
    */
   disabled: false | string | string[]
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
-export interface ValueSpecMultiselect extends SelectBase, WithStandalone {
+export type ValueSpecMultiselect = {
+  values: Record<string, string>
+
+  name: string
+  description: string | null
+  warning: string | null
+
   type: "multiselect"
   minLength: number | null
   maxLength: number | null
@@ -113,17 +146,25 @@ export interface ValueSpecMultiselect extends SelectBase, WithStandalone {
    */
   disabled: false | string | string[]
   default: string[]
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
-export interface ValueSpecToggle extends WithStandalone {
+export type ValueSpecToggle = {
+  name: string
+  description: string | null
+  warning: string | null
+
   type: "toggle"
   default: boolean | null
   disabled: false | string
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
-export interface ValueSpecUnion extends WithStandalone {
+export type ValueSpecUnion = {
+  name: string
+  description: string | null
+  warning: string | null
+
   type: "union"
   variants: Record<
     string,
@@ -140,39 +181,37 @@ export interface ValueSpecUnion extends WithStandalone {
   disabled: false | string | string[]
   required: boolean
   default: string | null
-  /** Immutable means it can only be configed at the first config then never again */
+  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
-export interface ValueSpecFile extends WithStandalone {
+export type ValueSpecFile = {
+  name: string
+  description: string | null
+  warning: string | null
   type: "file"
   extensions: string[]
   required: boolean
 }
-export interface ValueSpecObject extends WithStandalone {
-  type: "object"
-  spec: InputSpec
-}
-export interface WithStandalone {
+export type ValueSpecObject = {
   name: string
   description: string | null
   warning: string | null
+  type: "object"
+  spec: InputSpec
 }
-export interface SelectBase {
-  values: Record<string, string>
-}
-export type ListValueSpecType = "text" | "number" | "object"
+export type ListValueSpecType = "text" | "object"
 /** represents a spec for the values of a list */
-export type ListValueSpecOf<T extends ListValueSpecType> = T extends "text"
-  ? ListValueSpecText
-  : T extends "number"
-    ? ListValueSpecNumber
-    : T extends "object"
-      ? ListValueSpecObject
-      : never
+// prettier-ignore
+export type ListValueSpecOf<T extends ListValueSpecType> = 
+  T extends "text" ? ListValueSpecText :
+  T extends "object" ? ListValueSpecObject :
+  never
 /** represents a spec for a list */
 export type ValueSpecList = ValueSpecListOf<ListValueSpecType>
-export interface ValueSpecListOf<T extends ListValueSpecType>
-  extends WithStandalone {
+export type ValueSpecListOf<T extends ListValueSpecType> = {
+  name: string
+  description: string | null
+  warning: string | null
   type: "list"
   spec: ListValueSpecOf<T>
   minLength: number | null
@@ -180,19 +219,17 @@ export interface ValueSpecListOf<T extends ListValueSpecType>
   disabled: false | string
   default:
     | string[]
-    | number[]
     | DefaultString[]
     | Record<string, unknown>[]
     | readonly string[]
-    | readonly number[]
     | readonly DefaultString[]
     | readonly Record<string, unknown>[]
 }
-export interface Pattern {
+export type Pattern = {
   regex: string
   description: string
 }
-export interface ListValueSpecText {
+export type ListValueSpecText = {
   type: "text"
   patterns: Pattern[]
   minLength: number | null
@@ -203,16 +240,8 @@ export interface ListValueSpecText {
   inputmode: "text" | "email" | "tel" | "url"
   placeholder: string | null
 }
-export interface ListValueSpecNumber {
-  type: "number"
-  min: number | null
-  max: number | null
-  integer: boolean
-  step: number | null
-  units: string | null
-  placeholder: string | null
-}
-export interface ListValueSpecObject {
+
+export type ListValueSpecObject = {
   type: "object"
   /** this is a mapped type of the config object at this level, replacing the object's values with specs on those values */
   spec: InputSpec
@@ -242,8 +271,3 @@ export function isValueSpecListOf<S extends ListValueSpecType>(
 ): t is ValueSpecListOf<S> & { spec: ListValueSpecOf<S> } {
   return "spec" in t && t.spec.type === s
 }
-export const unionSelectKey = "unionSelectKey" as const
-export type UnionSelectKey = typeof unionSelectKey
-
-export const unionValueKey = "unionValueKey" as const
-export type UnionValueKey = typeof unionValueKey
diff --git a/sdk/lib/index.browser.ts b/sdk/lib/index.browser.ts
index 075bfcf50..c7ab45e60 100644
--- a/sdk/lib/index.browser.ts
+++ b/sdk/lib/index.browser.ts
@@ -12,4 +12,4 @@ export * as T from "./types"
 export * as yaml from "yaml"
 export * as matches from "ts-matches"
 
-export * as util from "./util/index.browser"
+export * as utils from "./util/index.browser"
diff --git a/sdk/lib/osBindings/InstalledVersionParams.ts b/sdk/lib/osBindings/InstalledVersionParams.ts
new file mode 100644
index 000000000..637f9b6ce
--- /dev/null
+++ b/sdk/lib/osBindings/InstalledVersionParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId"
+
+export type InstalledVersionParams = { id: PackageId }
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 22b03a7ca..32e57956a 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -79,6 +79,7 @@ export { ImageMetadata } from "./ImageMetadata"
 export { ImageSource } from "./ImageSource"
 export { InitProgressRes } from "./InitProgressRes"
 export { InstalledState } from "./InstalledState"
+export { InstalledVersionParams } from "./InstalledVersionParams"
 export { InstallingInfo } from "./InstallingInfo"
 export { InstallingState } from "./InstallingState"
 export { IpHostname } from "./IpHostname"
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
index 9738475a6..c5003c55b 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -268,26 +268,9 @@ describe("values", () => {
       }),
     )
     const validator = value.validator
-    validator.unsafeCast({ unionSelectKey: "a", unionValueKey: { b: false } })
+    validator.unsafeCast({ selection: "a", value: { b: false } })
     type Test = typeof validator._TYPE
-    testOutput<Test, { unionSelectKey: "a"; unionValueKey: { b: boolean } }>()(
-      null,
-    )
-  })
-  test("list", async () => {
-    const value = Value.list(
-      List.number(
-        {
-          name: "test",
-        },
-        {
-          integer: false,
-        },
-      ),
-    )
-    const validator = value.validator
-    validator.unsafeCast([1, 2, 3])
-    testOutput<typeof validator._TYPE, number[]>()(null)
+    testOutput<Test, { selection: "a"; value: { b: boolean } }>()(null)
   })
 
   describe("dynamic", () => {
@@ -577,12 +560,12 @@ describe("values", () => {
         }),
       )
       const validator = value.validator
-      validator.unsafeCast({ unionSelectKey: "a", unionValueKey: { b: false } })
+      validator.unsafeCast({ selection: "a", value: { b: false } })
       type Test = typeof validator._TYPE
       testOutput<
         Test,
-        | { unionSelectKey: "a"; unionValueKey: { b: boolean } }
-        | { unionSelectKey: "b"; unionValueKey: { b: boolean } }
+        | { selection: "a"; value: { b: boolean } }
+        | { selection: "b"; value: { b: boolean } }
       >()(null)
 
       const built = await value.build({} as any)
@@ -644,12 +627,12 @@ describe("values", () => {
       }),
     )
     const validator = value.validator
-    validator.unsafeCast({ unionSelectKey: "a", unionValueKey: { b: false } })
+    validator.unsafeCast({ selection: "a", value: { b: false } })
     type Test = typeof validator._TYPE
     testOutput<
       Test,
-      | { unionSelectKey: "a"; unionValueKey: { b: boolean } }
-      | { unionSelectKey: "b"; unionValueKey: { b: boolean } }
+      | { selection: "a"; value: { b: boolean } }
+      | { selection: "b"; value: { b: boolean } }
       | null
       | undefined
     >()(null)
@@ -736,24 +719,6 @@ describe("Builder List", () => {
       })
     })
   })
-  test("number", async () => {
-    const value = Value.list(
-      List.dynamicNumber(() => ({
-        name: "test",
-        spec: { integer: true },
-      })),
-    )
-    const validator = value.validator
-    expect(() => validator.unsafeCast(["test", "text"])).toThrowError()
-    validator.unsafeCast([4, 2])
-    expect(() => validator.unsafeCast(null)).toThrowError()
-    validator.unsafeCast([])
-    testOutput<typeof validator._TYPE, number[]>()(null)
-    expect(await value.build({} as any)).toMatchObject({
-      name: "test",
-      spec: { integer: true },
-    })
-  })
 })
 
 describe("Nested nullable values", () => {
diff --git a/sdk/lib/test/configTypes.test.ts b/sdk/lib/test/configTypes.test.ts
index 7e3ff5ca6..6d0b9a3d8 100644
--- a/sdk/lib/test/configTypes.test.ts
+++ b/sdk/lib/test/configTypes.test.ts
@@ -1,15 +1,11 @@
-import {
-  ListValueSpecOf,
-  ValueSpec,
-  isValueSpecListOf,
-} from "../config/configTypes"
+import { ListValueSpecOf, isValueSpecListOf } from "../config/configTypes"
 import { Config } from "../config/builder/config"
 import { List } from "../config/builder/list"
 import { Value } from "../config/builder/value"
 
 describe("Config Types", () => {
   test("isValueSpecListOf", async () => {
-    const options = [List.obj, List.text, List.number]
+    const options = [List.obj, List.text]
     for (const option of options) {
       const test = (option as any)(
         {} as any,
@@ -18,8 +14,6 @@ describe("Config Types", () => {
       const someList = await Value.list(test).build({} as any)
       if (isValueSpecListOf(someList, "text")) {
         someList.spec satisfies ListValueSpecOf<"text">
-      } else if (isValueSpecListOf(someList, "number")) {
-        someList.spec satisfies ListValueSpecOf<"number">
       } else if (isValueSpecListOf(someList, "object")) {
         someList.spec satisfies ListValueSpecOf<"object">
       } else {
diff --git a/sdk/lib/test/output.test.ts b/sdk/lib/test/output.test.ts
index 2b3afb5de..1df84f3af 100644
--- a/sdk/lib/test/output.test.ts
+++ b/sdk/lib/test/output.test.ts
@@ -1,9 +1,3 @@
-import {
-  UnionSelectKey,
-  unionSelectKey,
-  UnionValueKey,
-  unionValueKey,
-} from "../config/configTypes"
 import { ConfigSpec, matchConfigSpec } from "./output"
 import * as _I from "../index"
 import { camelCase } from "../../scripts/oldSpecToBuilder"
@@ -30,13 +24,10 @@ testOutput<
   ConfigSpec["advanced"]["peers"]["addnode"][0]["hostname"],
   string | null | undefined
 >()(null)
-testOutput<
-  ConfigSpec["testListUnion"][0]["union"][UnionValueKey]["name"],
-  string
->()(null)
-testOutput<ConfigSpec["testListUnion"][0]["union"][UnionSelectKey], "lnd">()(
+testOutput<ConfigSpec["testListUnion"][0]["union"]["value"]["name"], string>()(
   null,
 )
+testOutput<ConfigSpec["testListUnion"][0]["union"]["selection"], "lnd">()(null)
 testOutput<ConfigSpec["mediasources"], Array<"filebrowser" | "nextcloud">>()(
   null,
 )
@@ -45,7 +36,7 @@ testOutput<ConfigSpec["mediasources"], Array<"filebrowser" | "nextcloud">>()(
 testOutput<ConfigSpec["rpc"]["enable"], string>()(null)
 // prettier-ignore
 // @ts-expect-error Expect that the string is the one above
-testOutput<ConfigSpec["testListUnion"][0][UnionSelectKey][UnionSelectKey], "unionSelectKey">()(null);
+testOutput<ConfigSpec["testListUnion"][0]['selection']['selection'], "selection">()(null);
 
 /// Here we test the output of the matchConfigSpec function
 describe("Inputs", () => {
@@ -53,7 +44,7 @@ describe("Inputs", () => {
     mediasources: ["filebrowser"],
     testListUnion: [
       {
-        union: { [unionSelectKey]: "lnd", [unionValueKey]: { name: "string" } },
+        union: { selection: "lnd", value: { name: "string" } },
       },
     ],
     rpc: {
@@ -92,8 +83,8 @@ describe("Inputs", () => {
       },
       dbcache: 5,
       pruning: {
-        unionSelectKey: "disabled",
-        unionValueKey: {},
+        selection: "disabled",
+        value: {},
       },
       blockfilters: {
         blockfilterindex: false,
diff --git a/sdk/lib/util/getRandomCharInSet.ts b/sdk/lib/util/getRandomCharInSet.ts
index b26eef648..7914209a3 100644
--- a/sdk/lib/util/getRandomCharInSet.ts
+++ b/sdk/lib/util/getRandomCharInSet.ts
@@ -1,9 +1,10 @@
 // a,g,h,A-Z,,,,-
 
-import * as crypto from "crypto"
 export function getRandomCharInSet(charset: string): string {
   const set = stringToCharSet(charset)
-  let charIdx = crypto.randomInt(0, set.len)
+  let charIdx = Math.floor(
+    (crypto.getRandomValues(new Uint32Array(1))[0] / 2 ** 32) * set.len,
+  )
   for (let range of set.ranges) {
     if (range.len > charIdx) {
       return String.fromCharCode(range.start.charCodeAt(0) + charIdx)
diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index 737cbbc16..a2f17be10 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -80,7 +80,7 @@ export const addressHostToUrl = (
 ): UrlString[] => {
   const res = []
   const fmt = (scheme: string | null, host: HostnameInfo, port: number) => {
-    const includePort =
+    const excludePort =
       scheme &&
       scheme in knownProtocols &&
       port === knownProtocols[scheme as keyof typeof knownProtocols].defaultPort
@@ -96,7 +96,7 @@ export const addressHostToUrl = (
     }
     return `${scheme ? `${scheme}://` : ""}${
       username ? `${username}@` : ""
-    }${hostname}${includePort ? `:${port}` : ""}${suffix}`
+    }${hostname}${excludePort ? "" : `:${port}`}${suffix}`
   }
   if (host.hostname.sslPort !== null) {
     res.push(fmt(sslScheme, host, host.hostname.sslPort))
diff --git a/sdk/lib/util/index.browser.ts b/sdk/lib/util/index.browser.ts
index 6ff7ed01c..94339e7f7 100644
--- a/sdk/lib/util/index.browser.ts
+++ b/sdk/lib/util/index.browser.ts
@@ -1,25 +1,10 @@
 import * as T from "../types"
 
+/// Currently being used
+export { addressHostToUrl } from "./getServiceInterface"
+export { getDefaultString } from "./getDefaultString"
+
+/// Not being used, but known to be browser compatible
 export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
 export { getServiceInterfaces } from "./getServiceInterfaces"
-// prettier-ignore
-export type FlattenIntersection<T> = 
-T extends ArrayLike<any> ? T :
-T extends object ? {} & {[P in keyof T]: T[P]} :
- T;
-
-export type _<T> = FlattenIntersection<T>
-
-export const isKnownError = (e: unknown): e is T.KnownError =>
-  e instanceof Object && ("error" in e || "error-code" in e)
-
-declare const affine: unique symbol
-
-export type Affine<A> = { [affine]: A }
-
-type NeverPossible = { [affine]: string }
-export type NoAny<A> = NeverPossible extends A
-  ? keyof NeverPossible extends keyof A
-    ? never
-    : A
-  : A
+export * from "./typeHelpers"
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index 9b19aeb38..63629dfaa 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -1,5 +1,3 @@
-import * as T from "../types"
-
 import "./nullIfEmpty"
 import "./fileHelper"
 import "../store/getStore"
@@ -12,26 +10,5 @@ export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
 export { getServiceInterfaces } from "./getServiceInterfaces"
 export { addressHostToUrl } from "./getServiceInterface"
 export { hostnameInfoToAddress } from "./Hostname"
-// prettier-ignore
-export type FlattenIntersection<T> = 
-T extends ArrayLike<any> ? T :
-T extends object ? {} & {[P in keyof T]: T[P]} :
- T;
-
-export type _<T> = FlattenIntersection<T>
-
-export const isKnownError = (e: unknown): e is T.KnownError =>
-  e instanceof Object && ("error" in e || "error-code" in e)
-
-declare const affine: unique symbol
-
-export type Affine<A> = { [affine]: A }
-
-type NeverPossible = { [affine]: string }
-export type NoAny<A> = NeverPossible extends A
-  ? keyof NeverPossible extends keyof A
-    ? never
-    : A
-  : A
-
+export * from "./typeHelpers"
 export { getDefaultString } from "./getDefaultString"
diff --git a/sdk/lib/util/typeHelpers.ts b/sdk/lib/util/typeHelpers.ts
new file mode 100644
index 000000000..f45a46f1e
--- /dev/null
+++ b/sdk/lib/util/typeHelpers.ts
@@ -0,0 +1,23 @@
+import * as T from "../types"
+
+// prettier-ignore
+export type FlattenIntersection<T> = 
+T extends ArrayLike<any> ? T :
+T extends object ? {} & {[P in keyof T]: T[P]} :
+ T;
+
+export type _<T> = FlattenIntersection<T>
+
+export const isKnownError = (e: unknown): e is T.KnownError =>
+  e instanceof Object && ("error" in e || "error-code" in e)
+
+declare const affine: unique symbol
+
+export type Affine<A> = { [affine]: A }
+
+type NeverPossible = { [affine]: string }
+export type NoAny<A> = NeverPossible extends A
+  ? keyof NeverPossible extends keyof A
+    ? never
+    : A
+  : A
diff --git a/sdk/scripts/oldSpecToBuilder.ts b/sdk/scripts/oldSpecToBuilder.ts
index ce8ea4e5f..6dd726e1b 100644
--- a/sdk/scripts/oldSpecToBuilder.ts
+++ b/sdk/scripts/oldSpecToBuilder.ts
@@ -285,26 +285,26 @@ const {Config, List, Value, Variants} = sdk
           maxLength: null,
         })})`
       }
-      case "number": {
-        return `${rangeToTodoComment(value?.range)}List.number(${JSON.stringify(
-          {
-            name: value.name || null,
-            minLength: null,
-            maxLength: null,
-            default: value.default || null,
-            description: value.description || null,
-            warning: value.warning || null,
-          },
-          null,
-          2,
-        )}, ${JSON.stringify({
-          integer: value?.spec?.integral || false,
-          min: null,
-          max: null,
-          units: value?.spec?.units || null,
-          placeholder: value?.spec?.placeholder || null,
-        })})`
-      }
+      // case "number": {
+      //   return `${rangeToTodoComment(value?.range)}List.number(${JSON.stringify(
+      //     {
+      //       name: value.name || null,
+      //       minLength: null,
+      //       maxLength: null,
+      //       default: value.default || null,
+      //       description: value.description || null,
+      //       warning: value.warning || null,
+      //     },
+      //     null,
+      //     2,
+      //   )}, ${JSON.stringify({
+      //     integer: value?.spec?.integral || false,
+      //     min: null,
+      //     max: null,
+      //     units: value?.spec?.units || null,
+      //     placeholder: value?.spec?.placeholder || null,
+      //   })})`
+      // }
       case "enum": {
         return "/* error!! list.enum */"
       }
diff --git a/web/package-lock.json b/web/package-lock.json
index 8a48b18fa..b1f1802e0 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -20,20 +20,22 @@
         "@angular/service-worker": "^14.2.2",
         "@ionic/angular": "^6.1.15",
         "@materia-ui/ngx-monaco-editor": "^6.0.0",
-        "@ng-web-apis/common": "^2.0.0",
-        "@ng-web-apis/mutation-observer": "^2.0.0",
-        "@ng-web-apis/resize-observer": "^2.0.0",
+        "@ng-web-apis/common": "^3.0.6",
+        "@ng-web-apis/mutation-observer": "^3.2.1",
+        "@ng-web-apis/resize-observer": "^3.2.1",
         "@noble/curves": "^1.4.0",
         "@noble/hashes": "^1.4.0",
         "@start9labs/argon2": "^0.2.2",
         "@start9labs/emver": "^0.1.5",
         "@start9labs/start-sdk": "file:../sdk/dist",
-        "@taiga-ui/addon-charts": "3.20.0",
-        "@taiga-ui/cdk": "3.20.0",
-        "@taiga-ui/core": "3.20.0",
-        "@taiga-ui/icons": "3.20.0",
-        "@taiga-ui/kit": "3.20.0",
+        "@taiga-ui/addon-charts": "3.84.0",
+        "@taiga-ui/cdk": "3.84.0",
+        "@taiga-ui/core": "3.84.0",
+        "@taiga-ui/experimental": "3.84.0",
+        "@taiga-ui/icons": "3.84.0",
+        "@taiga-ui/kit": "3.84.0",
         "@tinkoff/ng-dompurify": "4.0.0",
+        "@tinkoff/ng-event-plugins": "3.2.0",
         "angular-svg-round-progressbar": "^9.0.0",
         "ansi-to-html": "^0.7.2",
         "base64-js": "^1.5.1",
@@ -111,1873 +113,7 @@
         "rxjs": ">=7.0.0"
       }
     },
-    "../patch-db/client/node_modules/@babel/code-frame": {
-      "version": "7.21.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/highlight": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "../patch-db/client/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "../patch-db/client/node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "../patch-db/client/node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "../patch-db/client/node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "../patch-db/client/node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "../patch-db/client/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "../patch-db/client/node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/@tsconfig/node16": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/@types/node": {
-      "version": "18.15.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/@types/uuid": {
-      "version": "8.3.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/acorn": {
-      "version": "8.8.2",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "../patch-db/client/node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "../patch-db/client/node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/arg": {
-      "version": "4.1.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/argparse": {
-      "version": "1.0.10",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "../patch-db/client/node_modules/astral-regex": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "../patch-db/client/node_modules/braces": {
-      "version": "3.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/builtin-modules": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "../patch-db/client/node_modules/callsites": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "../patch-db/client/node_modules/chalk": {
-      "version": "4.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/ci-info": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/clean-stack": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "../patch-db/client/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/cli-truncate": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "../patch-db/client/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/colorette": {
-      "version": "2.0.20",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/commander": {
-      "version": "10.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "../patch-db/client/node_modules/compare-versions": {
-      "version": "3.6.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/concat-map": {
-      "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/cosmiconfig": {
-      "version": "7.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "../patch-db/client/node_modules/create-require": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "../patch-db/client/node_modules/debug": {
-      "version": "4.3.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "../patch-db/client/node_modules/diff": {
-      "version": "4.0.2",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "../patch-db/client/node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/error-ex": {
-      "version": "1.3.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "../patch-db/client/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "../patch-db/client/node_modules/esprima": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/execa": {
-      "version": "7.1.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.1",
-        "human-signals": "^4.3.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^3.0.7",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/fill-range": {
-      "version": "7.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/find-up": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/find-versions": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver-regex": "^3.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "../patch-db/client/node_modules/function-bind": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/get-stream": {
-      "version": "6.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/glob": {
-      "version": "7.2.3",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "../patch-db/client/node_modules/has": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "../patch-db/client/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/human-signals": {
-      "version": "4.3.1",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14.18.0"
-      }
-    },
-    "../patch-db/client/node_modules/husky": {
-      "version": "4.3.8",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "ci-info": "^2.0.0",
-        "compare-versions": "^3.6.0",
-        "cosmiconfig": "^7.0.0",
-        "find-versions": "^4.0.0",
-        "opencollective-postinstall": "^2.0.2",
-        "pkg-dir": "^5.0.0",
-        "please-upgrade-node": "^3.2.0",
-        "slash": "^3.0.0",
-        "which-pm-runs": "^1.0.0"
-      },
-      "bin": {
-        "husky-run": "bin/run.js",
-        "husky-upgrade": "lib/upgrader/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/husky"
-      }
-    },
-    "../patch-db/client/node_modules/import-fresh": {
-      "version": "3.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/indent-string": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/inflight": {
-      "version": "1.0.6",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "../patch-db/client/node_modules/inherits": {
-      "version": "2.0.4",
-      "dev": true,
-      "license": "ISC"
-    },
-    "../patch-db/client/node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/is-core-module": {
-      "version": "2.12.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "../patch-db/client/node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/is-number": {
-      "version": "7.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "../patch-db/client/node_modules/is-stream": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/isexe": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "../patch-db/client/node_modules/js-tokens": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "../patch-db/client/node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/lilconfig": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "../patch-db/client/node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/lint-staged": {
-      "version": "13.2.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "5.2.0",
-        "cli-truncate": "^3.1.0",
-        "commander": "^10.0.0",
-        "debug": "^4.3.4",
-        "execa": "^7.0.0",
-        "lilconfig": "2.1.0",
-        "listr2": "^5.0.7",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "object-inspect": "^1.12.3",
-        "pidtree": "^0.6.0",
-        "string-argv": "^0.3.1",
-        "yaml": "^2.2.2"
-      },
-      "bin": {
-        "lint-staged": "bin/lint-staged.js"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/lint-staged"
-      }
-    },
-    "../patch-db/client/node_modules/lint-staged/node_modules/chalk": {
-      "version": "5.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/lint-staged/node_modules/yaml": {
-      "version": "2.3.1",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "../patch-db/client/node_modules/listr2": {
-      "version": "5.0.8",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.19",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.8.0",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
-      },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
-      }
-    },
-    "../patch-db/client/node_modules/listr2/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/listr2/node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/listr2/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/listr2/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/listr2/node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/listr2/node_modules/string-width": {
-      "version": "4.2.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/listr2/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/locate-path": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/log-update": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/log-update/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/log-update/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/log-update/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/log-update/node_modules/string-width": {
-      "version": "4.2.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/log-update/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/make-error": {
-      "version": "1.3.6",
-      "dev": true,
-      "license": "ISC"
-    },
-    "../patch-db/client/node_modules/merge-stream": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/micromatch": {
-      "version": "4.0.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "../patch-db/client/node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/minimatch": {
-      "version": "3.1.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "../patch-db/client/node_modules/minimist": {
-      "version": "1.2.8",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "../patch-db/client/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "../patch-db/client/node_modules/ms": {
-      "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "../patch-db/client/node_modules/npm-run-path": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/npm-run-path/node_modules/path-key": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/object-inspect": {
-      "version": "1.12.3",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "../patch-db/client/node_modules/once": {
-      "version": "1.4.0",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "../patch-db/client/node_modules/onetime": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/opencollective-postinstall": {
-      "version": "2.0.3",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "opencollective-postinstall": "index.js"
-      }
-    },
-    "../patch-db/client/node_modules/p-limit": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/p-locate": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/p-map": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/parent-module": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "../patch-db/client/node_modules/parse-json": {
-      "version": "5.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/path-exists": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "../patch-db/client/node_modules/path-key": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/path-parse": {
-      "version": "1.0.7",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/path-type": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/picomatch": {
-      "version": "2.3.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "../patch-db/client/node_modules/pidtree": {
-      "version": "0.6.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "pidtree": "bin/pidtree.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "../patch-db/client/node_modules/pkg-dir": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "../patch-db/client/node_modules/please-upgrade-node": {
-      "version": "3.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver-compare": "^1.0.0"
-      }
-    },
-    "../patch-db/client/node_modules/prettier": {
-      "version": "2.8.8",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/resolve": {
-      "version": "1.22.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-core-module": "^2.11.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "../patch-db/client/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/restore-cursor/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "../patch-db/client/node_modules/restore-cursor/node_modules/onetime": {
-      "version": "5.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/rfdc": {
-      "version": "1.3.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/rxjs": {
-      "version": "7.8.1",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "../patch-db/client/node_modules/semver": {
-      "version": "5.7.1",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "../patch-db/client/node_modules/semver-compare": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/semver-regex": {
-      "version": "3.1.4",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "dev": true,
-      "license": "ISC"
-    },
-    "../patch-db/client/node_modules/slash": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/sorted-btree": {
-      "version": "1.5.0",
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "../patch-db/client/node_modules/string-argv": {
-      "version": "0.3.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.6.19"
-      }
-    },
-    "../patch-db/client/node_modules/string-width": {
-      "version": "5.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "../patch-db/client/node_modules/through": {
-      "version": "2.3.8",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "../patch-db/client/node_modules/ts-node": {
-      "version": "10.9.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "../patch-db/client/node_modules/tslib": {
-      "version": "2.5.3",
-      "license": "0BSD"
-    },
-    "../patch-db/client/node_modules/tslint": {
-      "version": "6.1.3",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^4.0.1",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.3",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.13.0",
-        "tsutils": "^2.29.0"
-      },
-      "bin": {
-        "tslint": "bin/tslint"
-      },
-      "engines": {
-        "node": ">=4.8.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 4.0.0-dev"
-      }
-    },
-    "../patch-db/client/node_modules/tslint/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/tslint/node_modules/chalk": {
-      "version": "2.4.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/tslint/node_modules/color-convert": {
-      "version": "1.9.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "../patch-db/client/node_modules/tslint/node_modules/color-name": {
-      "version": "1.1.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/tslint/node_modules/commander": {
-      "version": "2.20.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/tslint/node_modules/has-flag": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/tslint/node_modules/supports-color": {
-      "version": "5.5.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/tslint/node_modules/tslib": {
-      "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
-    },
-    "../patch-db/client/node_modules/tsutils": {
-      "version": "2.29.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev"
-      }
-    },
-    "../patch-db/client/node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
-    },
-    "../patch-db/client/node_modules/type-fest": {
-      "version": "0.21.3",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "../patch-db/client/node_modules/typescript": {
-      "version": "4.9.5",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "../patch-db/client/node_modules/uuid": {
-      "version": "8.3.2",
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "../patch-db/client/node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/which": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "../patch-db/client/node_modules/which-pm-runs": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "../patch-db/client/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "../patch-db/client/node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "../patch-db/client/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "4.2.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "../patch-db/client/node_modules/wrappy": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "ISC"
-    },
-    "../patch-db/client/node_modules/yaml": {
-      "version": "1.10.2",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "../patch-db/client/node_modules/yn": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "../patch-db/client/node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "../sdk/dist": {
-      "name": "@start9labs/start-sdk",
       "version": "0.3.6-alpha5",
       "license": "MIT",
       "dependencies": {
@@ -2002,14 +138,16 @@
       }
     },
     "node_modules/@adobe/css-tools": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz",
+      "integrity": "sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==",
+      "dev": true
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.1.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -2019,11 +157,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1402.3",
+      "version": "0.1402.13",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1402.13.tgz",
+      "integrity": "sha512-n0ISBuvkZHoOpAzuAZql1TU9VLHUE9e/a9g4VNOPHewjMzpN02VqeGKvJfOCKtzkCs6gVssIlILm2/SXxkIFxQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "14.2.3",
+        "@angular-devkit/core": "14.2.13",
         "rxjs": "6.6.7"
       },
       "engines": {
@@ -2034,8 +173,9 @@
     },
     "node_modules/@angular-devkit/architect/node_modules/rxjs": {
       "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "devOptional": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -2045,18 +185,20 @@
     },
     "node_modules/@angular-devkit/architect/node_modules/tslib": {
       "version": "1.14.1",
-      "devOptional": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "devOptional": true
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "14.2.3",
+      "version": "14.2.13",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-14.2.13.tgz",
+      "integrity": "sha512-FJZKQ3xYFvEJ807sxVy4bCVyGU2NMl3UUPNfLIdIdzwwDEP9tx/cc+c4VtVPEZZfU8jVenu8XOvL6L0vpjt3yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.2.0",
-        "@angular-devkit/architect": "0.1402.3",
-        "@angular-devkit/build-webpack": "0.1402.3",
-        "@angular-devkit/core": "14.2.3",
+        "@angular-devkit/architect": "0.1402.13",
+        "@angular-devkit/build-webpack": "0.1402.13",
+        "@angular-devkit/core": "14.2.13",
         "@babel/core": "7.18.10",
         "@babel/generator": "7.18.12",
         "@babel/helper-annotate-as-pure": "7.18.6",
@@ -2067,7 +209,7 @@
         "@babel/runtime": "7.18.9",
         "@babel/template": "7.18.10",
         "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "14.2.3",
+        "@ngtools/webpack": "14.2.13",
         "ansi-colors": "4.1.3",
         "babel-loader": "8.2.5",
         "babel-plugin-istanbul": "6.1.1",
@@ -2085,14 +227,14 @@
         "less": "4.1.3",
         "less-loader": "11.0.0",
         "license-webpack-plugin": "4.0.2",
-        "loader-utils": "3.2.0",
+        "loader-utils": "3.2.1",
         "mini-css-extract-plugin": "2.6.1",
         "minimatch": "5.1.0",
         "open": "8.4.0",
         "ora": "5.4.1",
         "parse5-html-rewriting-stream": "6.0.1",
         "piscina": "3.2.0",
-        "postcss": "8.4.16",
+        "postcss": "8.4.31",
         "postcss-import": "15.0.0",
         "postcss-loader": "7.0.1",
         "postcss-preset-env": "7.8.0",
@@ -2101,7 +243,7 @@
         "rxjs": "6.6.7",
         "sass": "1.54.4",
         "sass-loader": "13.0.2",
-        "semver": "7.3.7",
+        "semver": "7.5.3",
         "source-map-loader": "4.0.0",
         "source-map-support": "0.5.21",
         "stylus": "0.59.0",
@@ -2110,7 +252,7 @@
         "text-table": "0.2.0",
         "tree-kill": "1.2.2",
         "tslib": "2.4.0",
-        "webpack": "5.74.0",
+        "webpack": "5.76.1",
         "webpack-dev-middleware": "5.3.3",
         "webpack-dev-server": "4.11.0",
         "webpack-merge": "5.8.0",
@@ -2155,25 +297,194 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
-      "version": "14.2.3",
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/ast": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14.15.0 || >=16.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
       "peerDependencies": {
-        "@angular/compiler-cli": "^14.0.0",
-        "typescript": ">=4.6.2 <4.9",
-        "webpack": "^5.54.0"
+        "ajv": "^6.9.1"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/es-module-lexer": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
       "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -2183,15 +494,88 @@
     },
     "node_modules/@angular-devkit/build-angular/node_modules/rxjs/node_modules/tslib": {
       "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
+      "version": "5.76.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
+      "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
       "dev": true,
-      "license": "0BSD"
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.10.0",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
     },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1402.3",
+      "version": "0.1402.13",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1402.13.tgz",
+      "integrity": "sha512-K27aJmuw86ZOdiu5PoGeGDJ2v7g2ZCK0bGwc8jzkjTLRfvd4FRKIIZumGv3hbQ3vQRLikiU6WMDRTFyCZky/EA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1402.3",
+        "@angular-devkit/architect": "0.1402.13",
         "rxjs": "6.6.7"
       },
       "engines": {
@@ -2206,8 +590,9 @@
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
       "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -2217,13 +602,14 @@
     },
     "node_modules/@angular-devkit/build-webpack/node_modules/tslib": {
       "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/@angular-devkit/core": {
-      "version": "14.2.3",
-      "devOptional": true,
-      "license": "MIT",
+      "version": "14.2.13",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-14.2.13.tgz",
+      "integrity": "sha512-aIefeZcbjghQg/V6U9CTLtyB5fXDJ63KwYqVYkWP+i0XriS5A9puFgq2u/OVsWxAfYvqpDqp5AdQ0g0bi3CAsA==",
       "dependencies": {
         "ajv": "8.11.0",
         "ajv-formats": "2.1.1",
@@ -2247,8 +633,8 @@
     },
     "node_modules/@angular-devkit/core/node_modules/rxjs": {
       "version": "6.6.7",
-      "devOptional": true,
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -2258,15 +644,15 @@
     },
     "node_modules/@angular-devkit/core/node_modules/tslib": {
       "version": "1.14.1",
-      "devOptional": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "14.2.3",
-      "devOptional": true,
-      "license": "MIT",
+      "version": "14.2.13",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.2.13.tgz",
+      "integrity": "sha512-2zczyeNzeBcrT2HOysv52X9SH3tZoHfWJvVf6H0SIa74rfDKEl7hFpKNXnh3x8sIMLj5mZn05n5RCqGxCczcIg==",
       "dependencies": {
-        "@angular-devkit/core": "14.2.3",
+        "@angular-devkit/core": "14.2.13",
         "jsonc-parser": "3.1.0",
         "magic-string": "0.26.2",
         "ora": "5.4.1",
@@ -2280,8 +666,8 @@
     },
     "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
       "version": "6.6.7",
-      "devOptional": true,
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -2291,12 +677,13 @@
     },
     "node_modules/@angular-devkit/schematics/node_modules/tslib": {
       "version": "1.14.1",
-      "devOptional": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@angular/animations": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-14.3.0.tgz",
+      "integrity": "sha512-QoBcIKy1ZiU+4qJsAh5Ls20BupWiXiZzKb0s6L9/dntPt5Msr4Ao289XR2P6O1L+kTsCprH9Kt41zyGQ/bkRqg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2304,18 +691,19 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "14.2.2"
+        "@angular/core": "14.3.0"
       }
     },
     "node_modules/@angular/cli": {
-      "version": "14.2.3",
+      "version": "14.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-14.2.13.tgz",
+      "integrity": "sha512-I5EepRem2CCyS3GDzQxZ2ZrqQwVqoGoLY+ZQhsK1QGWUnUyFOjbv3OlUGxRUYwcedu19V1EBAKjmQ96HzMIcVQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1402.3",
-        "@angular-devkit/core": "14.2.3",
-        "@angular-devkit/schematics": "14.2.3",
-        "@schematics/angular": "14.2.3",
+        "@angular-devkit/architect": "0.1402.13",
+        "@angular-devkit/core": "14.2.13",
+        "@angular-devkit/schematics": "14.2.13",
+        "@schematics/angular": "14.2.13",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
         "debug": "4.3.4",
@@ -2328,7 +716,7 @@
         "ora": "5.4.1",
         "pacote": "13.6.2",
         "resolve": "1.22.1",
-        "semver": "7.3.7",
+        "semver": "7.5.3",
         "symbol-observable": "4.0.0",
         "uuid": "8.3.2",
         "yargs": "17.5.1"
@@ -2343,8 +731,9 @@
       }
     },
     "node_modules/@angular/common": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-14.3.0.tgz",
+      "integrity": "sha512-pV9oyG3JhGWeQ+TFB0Qub6a1VZWMNZ6/7zEopvYivdqa5yDLLDSBRWb6P80RuONXyGnM1pa7l5nYopX+r/23GQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2352,13 +741,14 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "14.2.2",
+        "@angular/core": "14.3.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-14.3.0.tgz",
+      "integrity": "sha512-E15Rh0t3vA+bctbKnBCaDmLvc3ix+ZBt6yFZmhZalReQ+KpOlvOJv+L9oiFEgg+rYVl2QdvN7US1fvT0PqswLw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2366,7 +756,7 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "14.2.2"
+        "@angular/core": "14.3.0"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -2375,9 +765,10 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "14.2.2",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-14.3.0.tgz",
+      "integrity": "sha512-eoKpKdQ2X6axMgzcPUMZVYl3bIlTMzMeTo5V29No4BzgiUB+QoOTYGNJZkGRyqTNpwD9uSBJvmT2vG9+eC4ghQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.17.2",
         "chokidar": "^3.0.0",
@@ -2399,13 +790,14 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "14.2.2",
+        "@angular/compiler": "14.3.0",
         "typescript": ">=4.6.2 <4.9"
       }
     },
     "node_modules/@angular/core": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-14.3.0.tgz",
+      "integrity": "sha512-wYiwItc0Uyn4FWZ/OAx/Ubp2/WrD3EgUJ476y1XI7yATGPF8n9Ld5iCXT08HOvc4eBcYlDfh90kTXR6/MfhzdQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2414,12 +806,13 @@
       },
       "peerDependencies": {
         "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.11.4"
+        "zone.js": "~0.11.4 || ~0.12.0"
       }
     },
     "node_modules/@angular/forms": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-14.3.0.tgz",
+      "integrity": "sha512-fBZZC2UFMom2AZPjGQzROPXFWO6kvCsPDKctjJwClVC8PuMrkm+RRyiYRdBbt2qxWHEqOZM2OCQo73xUyZOYHw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2427,23 +820,25 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "14.2.2",
-        "@angular/core": "14.2.2",
-        "@angular/platform-browser": "14.2.2",
+        "@angular/common": "14.3.0",
+        "@angular/core": "14.3.0",
+        "@angular/platform-browser": "14.3.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "14.2.2",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-14.3.0.tgz",
+      "integrity": "sha512-Sij3OQzj1UGs1O8H9PxVAY/o27+oqZwQRnib66rsWvtbIBTjHp4FV3dTs5iVcr62GGv4V4Mff/2I82NP10GPQg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || >=16.10.0"
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-14.3.0.tgz",
+      "integrity": "sha512-w9Y3740UmTz44T0Egvc+4QV9sEbO61L+aRHbpkLTJdlEGzHByZvxJmJyBYmdqeyTPwc/Zpy7c02frlpfAlyB7A==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2451,9 +846,9 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/animations": "14.2.2",
-        "@angular/common": "14.2.2",
-        "@angular/core": "14.2.2"
+        "@angular/animations": "14.3.0",
+        "@angular/common": "14.3.0",
+        "@angular/core": "14.3.0"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -2462,8 +857,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-14.3.0.tgz",
+      "integrity": "sha512-rneZiMrIiYRhrkQvdL40E2ErKRn4Zdo6EtjBM9pAmWeyoM8oMnOZb9gz5vhrkNWg06kVMVg0yKqluP5How7j3A==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2471,18 +867,19 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "14.2.2",
-        "@angular/compiler": "14.2.2",
-        "@angular/core": "14.2.2",
-        "@angular/platform-browser": "14.2.2"
+        "@angular/common": "14.3.0",
+        "@angular/compiler": "14.3.0",
+        "@angular/core": "14.3.0",
+        "@angular/platform-browser": "14.3.0"
       }
     },
     "node_modules/@angular/pwa": {
-      "version": "14.1.0",
-      "license": "MIT",
+      "version": "14.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-14.2.13.tgz",
+      "integrity": "sha512-WPkTgT3+VC/KeZMydZnTQJWTG5IVTSdkJfqmNQWfHXzpmm1CG4KvFRj3xEOXvaDmcL56nnqKhL/o66kpai15Qw==",
       "dependencies": {
-        "@angular-devkit/schematics": "14.1.0",
-        "@schematics/angular": "14.1.0",
+        "@angular-devkit/schematics": "14.2.13",
+        "@schematics/angular": "14.2.13",
         "parse5-html-rewriting-stream": "6.0.1"
       },
       "engines": {
@@ -2499,77 +896,10 @@
         }
       }
     },
-    "node_modules/@angular/pwa/node_modules/@angular-devkit/core": {
-      "version": "14.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "8.11.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.1.0",
-        "rxjs": "6.6.7",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^14.15.0 || >=16.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/pwa/node_modules/@angular-devkit/schematics": {
-      "version": "14.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/core": "14.1.0",
-        "jsonc-parser": "3.1.0",
-        "magic-string": "0.26.2",
-        "ora": "5.4.1",
-        "rxjs": "6.6.7"
-      },
-      "engines": {
-        "node": "^14.15.0 || >=16.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/pwa/node_modules/@schematics/angular": {
-      "version": "14.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/core": "14.1.0",
-        "@angular-devkit/schematics": "14.1.0",
-        "jsonc-parser": "3.1.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || >=16.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/pwa/node_modules/rxjs": {
-      "version": "6.6.7",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@angular/pwa/node_modules/tslib": {
-      "version": "1.14.1",
-      "license": "0BSD"
-    },
     "node_modules/@angular/router": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-14.3.0.tgz",
+      "integrity": "sha512-uip0V7w7k7xyxxpTPbr7EuMnYLj3FzJrwkLVJSEw3TMMGHt5VU5t4BBa9veGZOta2C205XFrTAHnp8mD+XYY1w==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2577,15 +907,16 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "14.2.2",
-        "@angular/core": "14.2.2",
-        "@angular/platform-browser": "14.2.2",
+        "@angular/common": "14.3.0",
+        "@angular/core": "14.3.0",
+        "@angular/platform-browser": "14.3.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/service-worker": {
-      "version": "14.2.2",
-      "license": "MIT",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-14.3.0.tgz",
+      "integrity": "sha512-i5O7m1gQijWm7cgva0XTmOVBFrPrttNxFDwoMLMYCh8rHOCQUQ4DcVO1qTBPWU4SrY5BYPEvR+r05dYQLFYCBw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -2596,38 +927,43 @@
         "node": "^14.15.0 || >=16.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "14.2.2",
-        "@angular/core": "14.2.2"
+        "@angular/common": "14.3.0",
+        "@angular/core": "14.3.0"
       }
     },
     "node_modules/@assemblyscript/loader": {
       "version": "0.10.1",
-      "dev": true,
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz",
+      "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==",
+      "dev": true
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.19.1",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
+      "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
       "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
+      "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
@@ -2654,17 +990,19 @@
       }
     },
     "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/generator": {
       "version": "7.18.12",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz",
+      "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.18.10",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -2675,13 +1013,14 @@
       }
     },
     "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
@@ -2689,8 +1028,9 @@
     },
     "node_modules/@babel/helper-annotate-as-pure": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.18.6"
       },
@@ -2699,54 +1039,58 @@
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
+      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.19.1",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
+      "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.19.1",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
+        "@babel/compat-data": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "browserslist": "^4.22.2",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz",
+      "integrity": "sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2755,13 +1099,36 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
+      "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.1.0"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2770,10 +1137,32 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/@babel/helper-define-polyfill-provider": {
       "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.17.7",
         "@babel/helper-plugin-utils": "^7.16.7",
@@ -2787,123 +1176,140 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.19.0",
+    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz",
+      "integrity": "sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
+      "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
+      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
+      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
+      "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-wrap-function": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2912,122 +1318,176 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.19.1",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
+      "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.19.1",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
+      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.18.10",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
+      "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
+      "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
+      "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
+      "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers/node_modules/@babel/template": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.19.1",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
+      "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -3036,11 +1496,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
+      "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3050,13 +1511,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
+      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3067,8 +1529,10 @@
     },
     "node_modules/@babel/plugin-proposal-async-generator-functions": {
       "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz",
+      "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-plugin-utils": "^7.18.9",
@@ -3084,8 +1548,10 @@
     },
     "node_modules/@babel/plugin-proposal-class-properties": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -3098,12 +1564,14 @@
       }
     },
     "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.6",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
+      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-static-block instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
       "engines": {
@@ -3115,8 +1583,10 @@
     },
     "node_modules/@babel/plugin-proposal-dynamic-import": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-dynamic-import instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
@@ -3130,8 +1600,10 @@
     },
     "node_modules/@babel/plugin-proposal-export-namespace-from": {
       "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
+      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.9",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
@@ -3145,8 +1617,10 @@
     },
     "node_modules/@babel/plugin-proposal-json-strings": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-json-strings instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
@@ -3159,11 +1633,13 @@
       }
     },
     "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.18.9",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
+      "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-logical-assignment-operators instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
@@ -3175,8 +1651,10 @@
     },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
@@ -3190,8 +1668,10 @@
     },
     "node_modules/@babel/plugin-proposal-numeric-separator": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
@@ -3204,15 +1684,17 @@
       }
     },
     "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.18.9",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
+      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.18.8",
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-compilation-targets": "^7.20.7",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.18.8"
+        "@babel/plugin-transform-parameters": "^7.20.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3223,8 +1705,10 @@
     },
     "node_modules/@babel/plugin-proposal-optional-catch-binding": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
@@ -3237,12 +1721,14 @@
       }
     },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.18.9",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
@@ -3254,8 +1740,10 @@
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -3268,13 +1756,15 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.18.6",
+      "version": "7.21.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
+      "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
@@ -3286,8 +1776,10 @@
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -3301,8 +1793,9 @@
     },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -3312,8 +1805,9 @@
     },
     "node_modules/@babel/plugin-syntax-class-properties": {
       "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -3323,8 +1817,9 @@
     },
     "node_modules/@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -3337,8 +1832,9 @@
     },
     "node_modules/@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -3348,8 +1844,9 @@
     },
     "node_modules/@babel/plugin-syntax-export-namespace-from": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.3"
       },
@@ -3358,11 +1855,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
+      "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3373,8 +1871,9 @@
     },
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -3384,8 +1883,9 @@
     },
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -3395,8 +1895,9 @@
     },
     "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -3406,8 +1907,9 @@
     },
     "node_modules/@babel/plugin-syntax-numeric-separator": {
       "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -3417,8 +1919,9 @@
     },
     "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -3428,8 +1931,9 @@
     },
     "node_modules/@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -3439,8 +1943,9 @@
     },
     "node_modules/@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -3450,8 +1955,9 @@
     },
     "node_modules/@babel/plugin-syntax-private-property-in-object": {
       "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -3464,8 +1970,9 @@
     },
     "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -3477,11 +1984,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
+      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3492,8 +2000,9 @@
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6",
@@ -3507,11 +2016,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
+      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3521,11 +2031,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
+      "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3535,18 +2046,18 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.19.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz",
+      "integrity": "sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -3556,12 +2067,26 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
+      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/template": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3570,12 +2095,27 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/template": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.18.13",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz",
+      "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3585,12 +2125,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
+      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3600,11 +2141,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
+      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3614,12 +2156,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
+      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3629,11 +2172,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
+      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3643,13 +2188,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
+      "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3659,11 +2205,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
+      "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3673,11 +2220,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
+      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3687,13 +2235,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
+      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3703,14 +2251,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz",
+      "integrity": "sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-simple-access": "^7.18.6",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3720,15 +2268,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
+      "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3738,12 +2286,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
+      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3753,12 +2302,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.19.1",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
+      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3768,11 +2318,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
+      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3782,12 +2333,30 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
+      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz",
+      "integrity": "sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3797,11 +2366,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.18.8",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
+      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3811,11 +2381,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
+      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3825,12 +2396,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
+      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "regenerator-transform": "^0.15.0"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "regenerator-transform": "^0.15.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3840,11 +2412,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
+      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3855,8 +2428,9 @@
     },
     "node_modules/@babel/plugin-transform-runtime": {
       "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz",
+      "integrity": "sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.9",
@@ -3873,19 +2447,21 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
+      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3895,12 +2471,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
+      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3910,11 +2487,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
+      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3924,11 +2502,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
+      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3938,11 +2517,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz",
+      "integrity": "sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3952,11 +2532,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
+      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3966,12 +2547,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
+      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3982,8 +2564,9 @@
     },
     "node_modules/@babel/preset-env": {
       "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz",
+      "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.18.8",
         "@babel/helper-compilation-targets": "^7.18.9",
@@ -4069,17 +2652,19 @@
       }
     },
     "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz",
+      "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
@@ -4088,13 +2673,20 @@
         "esutils": "^2.0.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
+    "node_modules/@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+      "dev": true
+    },
     "node_modules/@babel/runtime": {
       "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -4104,8 +2696,9 @@
     },
     "node_modules/@babel/template": {
       "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
         "@babel/parser": "^7.18.10",
@@ -4116,19 +2709,20 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.19.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.0",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.19.1",
-        "@babel/types": "^7.19.0",
-        "debug": "^4.1.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
+      "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -4136,12 +2730,14 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
+      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.19.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
+        "@babel/types": "^7.24.7",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -4149,25 +2745,27 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.19.0",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
+      "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.18.10",
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-string-parser": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -4176,8 +2774,9 @@
     },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
       },
@@ -4187,8 +2786,9 @@
     },
     "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -4196,8 +2796,9 @@
     },
     "node_modules/@csstools/postcss-cascade-layers": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.2",
         "postcss-selector-parser": "^6.0.10"
@@ -4215,8 +2816,9 @@
     },
     "node_modules/@csstools/postcss-color-function": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -4234,8 +2836,9 @@
     },
     "node_modules/@csstools/postcss-font-format-keywords": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -4252,8 +2855,9 @@
     },
     "node_modules/@csstools/postcss-hwb-function": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -4270,8 +2874,9 @@
     },
     "node_modules/@csstools/postcss-ic-unit": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -4289,8 +2894,9 @@
     },
     "node_modules/@csstools/postcss-is-pseudo-class": {
       "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.0",
         "postcss-selector-parser": "^6.0.10"
@@ -4308,8 +2914,9 @@
     },
     "node_modules/@csstools/postcss-nested-calc": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -4326,8 +2933,9 @@
     },
     "node_modules/@csstools/postcss-normalize-display-values": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -4344,8 +2952,9 @@
     },
     "node_modules/@csstools/postcss-oklab-function": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -4363,8 +2972,9 @@
     },
     "node_modules/@csstools/postcss-progressive-custom-properties": {
       "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -4377,8 +2987,9 @@
     },
     "node_modules/@csstools/postcss-stepped-value-functions": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -4395,8 +3006,9 @@
     },
     "node_modules/@csstools/postcss-text-decoration-shorthand": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -4413,8 +3025,9 @@
     },
     "node_modules/@csstools/postcss-trigonometric-functions": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -4431,8 +3044,9 @@
     },
     "node_modules/@csstools/postcss-unset-value": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
       "dev": true,
-      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -4445,39 +3059,59 @@
       }
     },
     "node_modules/@csstools/selector-specificity": {
-      "version": "2.0.2",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
       "dev": true,
-      "license": "CC0-1.0",
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": "^14 || ^16 || >=18"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/csstools"
       },
       "peerDependencies": {
-        "postcss": "^8.2",
         "postcss-selector-parser": "^6.0.10"
       }
     },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.5.tgz",
+      "integrity": "sha512-UHkDFCfSGTuXq08oQltXxSZmH1TXyWsL+4QhZDWvvLl6mEJQqk3u7/wq1LjhrrAXYIllaTtRSzUXl4Olkf2J8A==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@gar/promisify": {
       "version": "1.1.3",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+      "devOptional": true
     },
     "node_modules/@ionic/angular": {
-      "version": "6.2.7",
-      "license": "MIT",
+      "version": "6.7.5",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.7.5.tgz",
+      "integrity": "sha512-nV8HP7RedjYkIAT8nVr5ifHNT0D3XzA74RPG3/WCCFJKunERNJ9SBiNkCTWhUpSkqsYYwEB4+SOOHz+R5NLk/w==",
       "dependencies": {
-        "@ionic/core": "^6.2.7",
+        "@ionic/core": "6.7.5",
+        "ionicons": "^6.1.3",
         "jsonc-parser": "^3.0.0",
         "tslib": "^2.0.0"
       },
@@ -4490,9 +3124,10 @@
       }
     },
     "node_modules/@ionic/cli": {
-      "version": "6.20.1",
+      "version": "6.20.9",
+      "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.20.9.tgz",
+      "integrity": "sha512-sItLCi7zXq1zARWIpZDinHhK8hvy+wzOx176QMOJV90BjDybkjGYu3rGu5TBjoqn104dRIZTC8rtCsnD/P3cQw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/cli-framework": "5.1.3",
         "@ionic/cli-framework-output": "2.2.5",
@@ -4530,8 +3165,9 @@
     },
     "node_modules/@ionic/cli-framework": {
       "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.3.tgz",
+      "integrity": "sha512-T2KN/TurzNoAcc3iDt1KHU6GeEa7x9kXngMnu5xs+DzJv5HhBKjVOoo74b8rgVxdPx+dLOV8aLrorlyvsHR/tQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/cli-framework-output": "2.2.5",
         "@ionic/utils-array": "2.1.5",
@@ -4555,8 +3191,9 @@
     },
     "node_modules/@ionic/cli-framework-output": {
       "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.5.tgz",
+      "integrity": "sha512-YeDLTnTaE6V4IDUxT8GDIep0GuRIFaR7YZDLANMuuWJZDmnTku6DP+MmQoltBeLmVvz1BAAZgk41xzxdq6H2FQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-terminal": "2.3.3",
         "debug": "^4.0.0",
@@ -4568,8 +3205,9 @@
     },
     "node_modules/@ionic/cli-framework-prompts": {
       "version": "2.1.10",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.10.tgz",
+      "integrity": "sha512-h8HbA0teR0vWtGKB3ahzRbDq4yYaxfukgbOqhu9CAEJHosoFlBmDB8PbPnGFYxUg2J1MuCqeiN2ftJQYV/BO1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-terminal": "2.3.3",
         "debug": "^4.0.0",
@@ -4582,8 +3220,9 @@
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -4596,8 +3235,9 @@
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4611,8 +3251,9 @@
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4622,21 +3263,24 @@
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/inquirer": {
       "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.1.0",
@@ -4658,8 +3302,9 @@
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs": {
       "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -4669,13 +3314,15 @@
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/rxjs/node_modules/tslib": {
       "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/@ionic/cli-framework-prompts/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4685,8 +3332,9 @@
     },
     "node_modules/@ionic/cli-framework/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -4699,8 +3347,9 @@
     },
     "node_modules/@ionic/cli-framework/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4714,8 +3363,9 @@
     },
     "node_modules/@ionic/cli-framework/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4725,21 +3375,24 @@
     },
     "node_modules/@ionic/cli-framework/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/@ionic/cli-framework/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@ionic/cli-framework/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4749,8 +3402,9 @@
     },
     "node_modules/@ionic/cli/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -4763,8 +3417,9 @@
     },
     "node_modules/@ionic/cli/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4778,8 +3433,9 @@
     },
     "node_modules/@ionic/cli/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4789,21 +3445,24 @@
     },
     "node_modules/@ionic/cli/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/@ionic/cli/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@ionic/cli/node_modules/open": {
       "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -4817,8 +3476,9 @@
     },
     "node_modules/@ionic/cli/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4827,18 +3487,20 @@
       }
     },
     "node_modules/@ionic/core": {
-      "version": "6.2.7",
-      "license": "MIT",
+      "version": "6.7.5",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
+      "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
       "dependencies": {
-        "@stencil/core": "^2.17.4",
-        "ionicons": "^6.0.3",
+        "@stencil/core": "^2.18.0",
+        "ionicons": "^6.1.3",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@ionic/utils-array": {
       "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
+      "integrity": "sha512-HD72a71IQVBmQckDwmA8RxNVMTbxnaLbgFOl+dO5tbvW9CkkSFCv41h6fUuNsSEVgngfkn0i98HDuZC8mk+lTA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4849,8 +3511,9 @@
     },
     "node_modules/@ionic/utils-fs": {
       "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.6.tgz",
+      "integrity": "sha512-eikrNkK89CfGPmexjTfSWl4EYqsPSBh0Ka7by4F0PLc1hJZYtJxUZV3X4r5ecA8ikjicUmcbU7zJmAjmqutG/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.0",
         "debug": "^4.0.0",
@@ -4863,8 +3526,9 @@
     },
     "node_modules/@ionic/utils-network": {
       "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.5.tgz",
+      "integrity": "sha512-HUQ1Ec4Mh2MXzzKdbbbDS6xYKwpFJ2XRY7SYXbaZT8+jiNahfHbsOfe62/p8bk41Yil7E9EagzGC2JvIFJh01w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4875,8 +3539,9 @@
     },
     "node_modules/@ionic/utils-object": {
       "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.5.tgz",
+      "integrity": "sha512-XnYNSwfewUqxq+yjER1hxTKggftpNjFLJH0s37jcrNDwbzmbpFTQTVAp4ikNK4rd9DOebX/jbeZb8jfD86IYxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4887,8 +3552,9 @@
     },
     "node_modules/@ionic/utils-process": {
       "version": "2.1.10",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.10.tgz",
+      "integrity": "sha512-mZ7JEowcuGQK+SKsJXi0liYTcXd2bNMR3nE0CyTROpMECUpJeAvvaBaPGZf5ERQUPeWBVuwqAqjUmIdxhz5bxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-object": "2.1.5",
         "@ionic/utils-terminal": "2.3.3",
@@ -4903,8 +3569,9 @@
     },
     "node_modules/@ionic/utils-stream": {
       "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.5.tgz",
+      "integrity": "sha512-hkm46uHvEC05X/8PHgdJi4l4zv9VQDELZTM+Kz69odtO9zZYfnt8DkfXHJqJ+PxmtiE5mk/ehJWLnn/XAczTUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -4915,8 +3582,9 @@
     },
     "node_modules/@ionic/utils-subprocess": {
       "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.11.tgz",
+      "integrity": "sha512-6zCDixNmZCbMCy5np8klSxOZF85kuDyzZSTTQKQP90ZtYNCcPYmuFSzaqDwApJT4r5L3MY3JrqK1gLkc6xiUPw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ionic/utils-array": "2.1.5",
         "@ionic/utils-fs": "3.1.6",
@@ -4933,8 +3601,9 @@
     },
     "node_modules/@ionic/utils-terminal": {
       "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.3.tgz",
+      "integrity": "sha512-RnuSfNZ5fLEyX3R5mtcMY97cGD1A0NVBbarsSQ6yMMfRJ5YHU7hHVyUfvZeClbqkBC/pAqI/rYJuXKCT9YeMCQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/slice-ansi": "^4.0.0",
         "debug": "^4.0.0",
@@ -4952,8 +3621,9 @@
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -4967,16 +3637,18 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
       "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
       "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -4985,18 +3657,26 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.0.0",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -5006,65 +3686,106 @@
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.2",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
     "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.15",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "dev": true,
-      "license": "MIT"
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+      "dev": true
+    },
+    "node_modules/@maskito/angular": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@maskito/angular/-/angular-1.9.0.tgz",
+      "integrity": "sha512-Wa/9nM9Nv0oieVZ6yxQNXfDRA4obFDR15xO16o1GKF8i9W1IdQQn+tuMRjkmx6HhJDN9+x3k8OTJ1f80BIrhjA==",
+      "dependencies": {
+        "tslib": "2.6.2"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=12.0.0",
+        "@angular/core": ">=12.0.0",
+        "@angular/forms": ">=12.0.0",
+        "@maskito/core": "^1.9.0",
+        "rxjs": ">=6.0.0"
+      }
+    },
+    "node_modules/@maskito/angular/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
+    "node_modules/@maskito/core": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@maskito/core/-/core-1.9.0.tgz",
+      "integrity": "sha512-WQIUrwkdIUg6PzAb4Apa0RjTPHB0EqZLc9/7kWCKVIixhkITRFXFg2BhiDVSRv0mIKVlAEJcOvvjHK5T3UaIig=="
+    },
+    "node_modules/@maskito/kit": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@maskito/kit/-/kit-1.9.0.tgz",
+      "integrity": "sha512-LNNgOJ0tAfrPoPehvoP+ZyYF9giOYL02sOMKyDC3IcqDNA8BAU0PARmS7TNsVEBpvSuJhU6xVt40nxJaONgUdw==",
+      "peerDependencies": {
+        "@maskito/core": "^1.9.0"
+      }
     },
     "node_modules/@materia-ui/ngx-monaco-editor": {
       "version": "6.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@materia-ui/ngx-monaco-editor/-/ngx-monaco-editor-6.0.0.tgz",
+      "integrity": "sha512-gTqNQjOGznZxOC0NlmKdKSGCJuTts8YmK4dsTQAGc5IgIV7cZdQWiW6AL742h0ruED6q0cAunEYjXT6jzHBoIQ==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -5074,8 +3795,9 @@
       }
     },
     "node_modules/@ng-web-apis/common": {
-      "version": "2.1.0",
-      "license": "MIT",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/common/-/common-3.0.6.tgz",
+      "integrity": "sha512-ral+lzGpFS3aOCFB5DcHOI4lZhhp8GH4BnjSbngH2Xk8J0FKYdxRzvcPQVy7hS+TPUu0tW9uFVp6cC7odu3iyQ==",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -5086,8 +3808,9 @@
       }
     },
     "node_modules/@ng-web-apis/intersection-observer": {
-      "version": "3.0.0",
-      "license": "MIT",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/intersection-observer/-/intersection-observer-3.2.0.tgz",
+      "integrity": "sha512-EhwqEZJFKR9pz55TWp82qyWTXdg8TZeMP6bUw26bVHz8CTkgrpzaXdtxurMTvJ/+gwuFy4JSJLjBeV9nfZ/SXA==",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -5097,8 +3820,9 @@
       }
     },
     "node_modules/@ng-web-apis/mutation-observer": {
-      "version": "2.0.0",
-      "license": "MIT",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/mutation-observer/-/mutation-observer-3.2.1.tgz",
+      "integrity": "sha512-a7krkMx0e9cfnutClwDylWjbTQVRHUP3oUik/nBvUdKlk/Q4anNww9aIKJ64VgiXR+1ZF8OmHGl0+XUzN6xP9Q==",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -5108,20 +3832,37 @@
       }
     },
     "node_modules/@ng-web-apis/resize-observer": {
-      "version": "2.0.0",
-      "license": "MIT",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/resize-observer/-/resize-observer-3.2.1.tgz",
+      "integrity": "sha512-r1YaZUo6DIDeR+4/C/pM4Ar0eTQBxjK0FUhYYJ512EnN8RqAn8d3a0wM8ZYunucwDICwW1sx4IIV6PZ2G77xsg==",
       "dependencies": {
         "tslib": "^2.2.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=12.0.0",
-        "@ng-web-apis/common": ">=2.0.0"
+        "@angular/core": ">=12.0.0",
+        "@ng-web-apis/common": ">=2.0.0"
+      }
+    },
+    "node_modules/@ngtools/webpack": {
+      "version": "14.2.13",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-14.2.13.tgz",
+      "integrity": "sha512-RQx/rGX7K/+R55x1R6Ax1JzyeHi8cW11dEXpzHWipyuSpusQLUN53F02eMB4VTakXsL3mFNWWy4bX3/LSq8/9w==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^14.0.0",
+        "typescript": ">=4.6.2 <4.9",
+        "webpack": "^5.54.0"
       }
     },
     "node_modules/@noble/curves": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
-      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
+      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
       "dependencies": {
         "@noble/hashes": "1.4.0"
       },
@@ -5142,8 +3883,9 @@
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -5154,16 +3896,18 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
       "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -5174,8 +3918,9 @@
     },
     "node_modules/@npmcli/fs": {
       "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz",
+      "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "@gar/promisify": "^1.1.3",
         "semver": "^7.3.5"
@@ -5186,8 +3931,9 @@
     },
     "node_modules/@npmcli/git": {
       "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-3.0.2.tgz",
+      "integrity": "sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "@npmcli/promise-spawn": "^3.0.0",
         "lru-cache": "^7.4.4",
@@ -5203,10 +3949,20 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/@npmcli/git/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@npmcli/installed-package-contents": {
       "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz",
+      "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "npm-bundled": "^1.1.1",
         "npm-normalize-package-bin": "^1.0.1"
@@ -5220,8 +3976,10 @@
     },
     "node_modules/@npmcli/move-file": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz",
+      "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==",
+      "deprecated": "This functionality has been moved to @npmcli/fs",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "mkdirp": "^1.0.4",
         "rimraf": "^3.0.2"
@@ -5232,16 +3990,18 @@
     },
     "node_modules/@npmcli/node-gyp": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz",
+      "integrity": "sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/@npmcli/promise-spawn": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz",
+      "integrity": "sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "infer-owner": "^1.0.4"
       },
@@ -5251,8 +4011,9 @@
     },
     "node_modules/@npmcli/run-script": {
       "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-4.2.1.tgz",
+      "integrity": "sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "@npmcli/node-gyp": "^2.0.0",
         "@npmcli/promise-spawn": "^3.0.0",
@@ -5265,14 +4026,16 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.21",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.0.0-next.25",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
+      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
+      "dev": true
     },
     "node_modules/@rollup/plugin-json": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
+      "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^3.0.8"
       },
@@ -5282,8 +4045,9 @@
     },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz",
+      "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "@types/resolve": "1.17.1",
@@ -5301,8 +4065,9 @@
     },
     "node_modules/@rollup/pluginutils": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "0.0.39",
         "estree-walker": "^1.0.1",
@@ -5317,16 +4082,17 @@
     },
     "node_modules/@rollup/pluginutils/node_modules/@types/estree": {
       "version": "0.0.39",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
     },
     "node_modules/@schematics/angular": {
-      "version": "14.2.3",
-      "devOptional": true,
-      "license": "MIT",
+      "version": "14.2.13",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-14.2.13.tgz",
+      "integrity": "sha512-MLxTpTU3E8QACQ/5c0sENMR2gRiMXpGaKeD5IHY+3wyU2fUSJVB0QPU/l1WhoyZbX8N9ospBgf5UEG7taVF9rg==",
       "dependencies": {
-        "@angular-devkit/core": "14.2.3",
-        "@angular-devkit/schematics": "14.2.3",
+        "@angular-devkit/core": "14.2.13",
+        "@angular-devkit/schematics": "14.2.13",
         "jsonc-parser": "3.1.0"
       },
       "engines": {
@@ -5342,15 +4108,17 @@
     },
     "node_modules/@start9labs/emver": {
       "version": "0.1.5",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@start9labs/emver/-/emver-0.1.5.tgz",
+      "integrity": "sha512-1dhiG03VkfEwSLx/JPKVms6srAbYFQgwfSGhwpUKMDliMXuAHGVaueStmqzVxn3JpH/HEVz0QW8w/PXHqjdiIg=="
     },
     "node_modules/@start9labs/start-sdk": {
       "resolved": "../sdk/dist",
       "link": true
     },
     "node_modules/@stencil/core": {
-      "version": "2.18.0",
-      "license": "MIT",
+      "version": "2.22.3",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
+      "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
       "bin": {
         "stencil": "bin/stencil"
       },
@@ -5360,33 +4128,59 @@
       }
     },
     "node_modules/@taiga-ui/addon-charts": {
-      "version": "3.20.0",
-      "license": "Apache-2.0",
+      "version": "3.84.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-charts/-/addon-charts-3.84.0.tgz",
+      "integrity": "sha512-XR7UFywnrv4NRLHOCbba63gXDYYDL4Rt0MbjnF54p5U2EXnbt2of7VbjlB6cPx40XkQqfqa3CNayYxWZP82Ijg==",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=12.0.0",
+        "@angular/core": ">=12.0.0",
+        "@ng-web-apis/common": "^3.0.6",
+        "@taiga-ui/cdk": "^3.84.0",
+        "@taiga-ui/core": "^3.84.0",
+        "@tinkoff/ng-polymorpheus": "^4.3.0"
+      }
+    },
+    "node_modules/@taiga-ui/addon-commerce": {
+      "version": "3.84.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-commerce/-/addon-commerce-3.84.0.tgz",
+      "integrity": "sha512-1zqLwnZLAYYcHvjH89d7JmtV2+QeZ2YnSJ3YWEMNLjGPzpev4RvQXtDfglIyu0LCyTxqpXmuzes9v/cgq2P5TQ==",
+      "peer": true,
       "dependencies": {
-        "tslib": ">=2.0.0"
+        "tslib": "^2.6.2"
       },
       "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
-        "@ng-web-apis/common": ">=2.0.0",
-        "@taiga-ui/cdk": ">=3.20.0",
-        "@taiga-ui/core": ">=3.20.0",
-        "@tinkoff/ng-polymorpheus": ">=4.0.0"
+        "@angular/forms": ">=12.0.0",
+        "@maskito/angular": "^1.9.0",
+        "@maskito/core": "^1.9.0",
+        "@maskito/kit": "^1.9.0",
+        "@ng-web-apis/common": "^3.0.6",
+        "@taiga-ui/cdk": "^3.84.0",
+        "@taiga-ui/core": "^3.84.0",
+        "@taiga-ui/i18n": "^3.84.0",
+        "@taiga-ui/kit": "^3.84.0",
+        "@tinkoff/ng-polymorpheus": "^4.3.0",
+        "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/cdk": {
-      "version": "3.20.0",
-      "license": "Apache-2.0",
+      "version": "3.84.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/cdk/-/cdk-3.84.0.tgz",
+      "integrity": "sha512-0umw/CUmYNEYOCUNQVTQS53zXzxZsH/6+lj1mFVzocvfJFJWAUT6ltCH9QvxYmxSDDGWwNGg16AaVo2K+aGL0w==",
       "dependencies": {
-        "@ng-web-apis/common": "2.1.0",
-        "@ng-web-apis/mutation-observer": "2.0.0",
-        "@ng-web-apis/resize-observer": "2.0.0",
-        "@tinkoff/ng-event-plugins": "3.1.0",
-        "@tinkoff/ng-polymorpheus": "4.0.10",
-        "tslib": "2.5.0"
+        "@ng-web-apis/common": "3.0.6",
+        "@ng-web-apis/mutation-observer": "3.1.0",
+        "@ng-web-apis/resize-observer": "3.0.6",
+        "@tinkoff/ng-event-plugins": "3.2.0",
+        "@tinkoff/ng-polymorpheus": "4.3.0",
+        "tslib": "2.6.2"
       },
       "optionalDependencies": {
-        "ng-morph": "2.1.0",
+        "ng-morph": "4.0.5",
         "parse5": "6.0.1"
       },
       "peerDependencies": {
@@ -5397,16 +4191,42 @@
         "rxjs": ">=6.0.0"
       }
     },
+    "node_modules/@taiga-ui/cdk/node_modules/@ng-web-apis/mutation-observer": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/mutation-observer/-/mutation-observer-3.1.0.tgz",
+      "integrity": "sha512-MFN0TLLBMFJJPpXkGFe9ChRCSOKvMHZRRtBq5jHWS7tv5/CtdUkqW5CU7RC9KTzZjGeMzYe0cXO4JRkjL5aZ9g==",
+      "dependencies": {
+        "tslib": "^2.2.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=12.0.0",
+        "@ng-web-apis/common": ">=2.0.0"
+      }
+    },
+    "node_modules/@taiga-ui/cdk/node_modules/@ng-web-apis/resize-observer": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/resize-observer/-/resize-observer-3.0.6.tgz",
+      "integrity": "sha512-QdGYdEdC0AzFonLfNOnyYyeCwnvK9jlskoeefvJN3Yyvds3ivBrrTjpeDOdiLsQpCPBp9/673imgq7355vkQow==",
+      "dependencies": {
+        "tslib": "^2.2.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=12.0.0",
+        "@ng-web-apis/common": ">=2.0.0"
+      }
+    },
     "node_modules/@taiga-ui/cdk/node_modules/tslib": {
-      "version": "2.5.0",
-      "license": "0BSD"
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@taiga-ui/core": {
-      "version": "3.20.0",
-      "license": "Apache-2.0",
+      "version": "3.84.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/core/-/core-3.84.0.tgz",
+      "integrity": "sha512-FZy77z0E4qjYcszVcp+qPFkPwJPl8qXZb7t2P+juUtJvSmSn2foQHHdyhbIYN808H26tqCdgkTMG1BWQxVuDSg==",
       "dependencies": {
-        "@taiga-ui/i18n": "^3.20.0",
-        "tslib": ">=2.0.0"
+        "@taiga-ui/i18n": "^3.84.0",
+        "tslib": "^2.6.2"
       },
       "peerDependencies": {
         "@angular/animations": ">=12.0.0",
@@ -5415,52 +4235,81 @@
         "@angular/forms": ">=12.0.0",
         "@angular/platform-browser": ">=12.0.0",
         "@angular/router": ">=12.0.0",
-        "@ng-web-apis/common": ">=2.0.0",
-        "@ng-web-apis/mutation-observer": ">=2.0.0",
-        "@taiga-ui/cdk": ">=3.20.0",
-        "@taiga-ui/i18n": ">=3.20.0",
-        "@tinkoff/ng-event-plugins": ">=3.1.0",
-        "@tinkoff/ng-polymorpheus": ">=4.0.0",
+        "@ng-web-apis/common": "^3.0.6",
+        "@ng-web-apis/mutation-observer": "^3.1.0",
+        "@taiga-ui/cdk": "^3.84.0",
+        "@taiga-ui/i18n": "^3.84.0",
+        "@tinkoff/ng-event-plugins": "^3.2.0",
+        "@tinkoff/ng-polymorpheus": "^4.3.0",
+        "rxjs": ">=6.0.0"
+      }
+    },
+    "node_modules/@taiga-ui/experimental": {
+      "version": "3.84.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/experimental/-/experimental-3.84.0.tgz",
+      "integrity": "sha512-q0hNVy+EmywCG8hpZlg/+haKIFhnmxicQiSeV/D1P7CHO10safjGo0ptT6e1hYMFa5/cJZOM4OwDPen2xs17Wg==",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=12.0.0",
+        "@angular/core": ">=12.0.0",
+        "@taiga-ui/addon-commerce": "^3.84.0",
+        "@taiga-ui/cdk": "^3.84.0",
+        "@taiga-ui/core": "^3.84.0",
+        "@taiga-ui/kit": "^3.84.0",
+        "@tinkoff/ng-polymorpheus": "^4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/i18n": {
-      "version": "3.20.0",
-      "license": "Apache-2.0",
+      "version": "3.85.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/i18n/-/i18n-3.85.0.tgz",
+      "integrity": "sha512-CGoxfq9WY+psX5ZOfWmuQZ6OA/0CAPYJTlbHkw5sRKAyhEQ3NM/Wbx3xcwrcYRRJDnt9yOlfibz+3a+WDF2bFA==",
       "dependencies": {
-        "tslib": ">=2.0.0"
+        "tslib": "^2.6.2"
       },
       "peerDependencies": {
         "@angular/core": ">=12.0.0",
+        "@ng-web-apis/common": "^3.0.6",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/icons": {
-      "version": "3.20.0",
-      "license": "Apache-2.0",
+      "version": "3.84.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/icons/-/icons-3.84.0.tgz",
+      "integrity": "sha512-KiH7BJRZ6wbkOHlJAS0XHq2gYnQTpRgdEogKW+GoD0da/4trCdM66vhDk2j0DwDFdBGq5U0inHJCjnskBI1nSQ==",
       "dependencies": {
-        "tslib": "^2.2.0"
+        "tslib": "^2.6.2"
+      },
+      "peerDependencies": {
+        "@taiga-ui/cdk": "^3.84.0"
       }
     },
     "node_modules/@taiga-ui/kit": {
-      "version": "3.20.0",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ng-web-apis/intersection-observer": "3.0.0",
+      "version": "3.84.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/kit/-/kit-3.84.0.tgz",
+      "integrity": "sha512-lSUPDco5FeBYK3ESnXeEPLCdMCmNXwcdHNK/we+0ZoH4VPx/OGg2hpEP0Fej7jfGHwXFTzDbufQD0hT6WlfTAw==",
+      "dependencies": {
+        "@maskito/angular": "1.9.0",
+        "@maskito/core": "1.9.0",
+        "@maskito/kit": "1.9.0",
+        "@ng-web-apis/intersection-observer": "3.2.0",
         "text-mask-core": "5.1.2",
-        "tslib": ">=2.0.0"
+        "tslib": "^2.6.2"
       },
       "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
         "@angular/forms": ">=12.0.0",
         "@angular/router": ">=12.0.0",
-        "@ng-web-apis/common": ">=2.0.0",
-        "@ng-web-apis/mutation-observer": ">=2.0.0",
-        "@taiga-ui/cdk": ">=3.20.0",
-        "@taiga-ui/core": ">=3.20.0",
-        "@taiga-ui/i18n": ">=3.20.0",
-        "@tinkoff/ng-polymorpheus": ">=4.0.0",
+        "@ng-web-apis/common": "3.0.6",
+        "@ng-web-apis/mutation-observer": "^3.1.0",
+        "@ng-web-apis/resize-observer": "^3.0.6",
+        "@taiga-ui/cdk": "^3.84.0",
+        "@taiga-ui/core": "^3.84.0",
+        "@taiga-ui/i18n": "^3.84.0",
+        "@tinkoff/ng-polymorpheus": "^4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
@@ -5479,8 +4328,9 @@
       }
     },
     "node_modules/@tinkoff/ng-event-plugins": {
-      "version": "3.1.0",
-      "license": "Apache-2.0",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@tinkoff/ng-event-plugins/-/ng-event-plugins-3.2.0.tgz",
+      "integrity": "sha512-n56R5xNfiytabh2WmWdQXfNU6m7dfOo3LLxlARE+DX7f5yciW2xBdDkuEHX74q8dlCuAVlW9aslSfz8c//ymwA==",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -5491,128 +4341,158 @@
       }
     },
     "node_modules/@tinkoff/ng-polymorpheus": {
-      "version": "4.0.10",
-      "license": "Apache-2.0",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@tinkoff/ng-polymorpheus/-/ng-polymorpheus-4.3.0.tgz",
+      "integrity": "sha512-Ck/XCLuBwlUgvK22PxTlLTZhGG6I32kLqLYtDQh8N/QZZhs40+hb/78/ElFGzD567CCvrzNnueFkaOoXhuEVrw==",
       "dependencies": {
-        "tslib": "^2.0.0"
+        "tslib": "2.6.2"
       },
       "peerDependencies": {
-        "@angular/core": ">=12.0.0"
+        "@angular/core": ">=12.0.0",
+        "@angular/platform-browser": ">=12.0.0"
       }
     },
+    "node_modules/@tinkoff/ng-polymorpheus/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/@ts-morph/common": {
-      "version": "0.9.2",
-      "license": "MIT",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.22.0.tgz",
+      "integrity": "sha512-HqNBuV/oIlMKdkLshXd1zKBqNQCsuPEsgQOkfFQ/eUKjRlwndXW1AjN9LVkBEIukm00gGXSRmfkl0Wv5VXLnlw==",
       "optional": true,
       "dependencies": {
-        "fast-glob": "^3.2.5",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^1.0.4",
+        "fast-glob": "^3.3.2",
+        "minimatch": "^9.0.3",
+        "mkdirp": "^3.0.1",
         "path-browserify": "^1.0.1"
       }
     },
-    "node_modules/@ts-morph/common/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "license": "MIT",
+    "node_modules/@ts-morph/common/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "optional": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@ts-morph/common/node_modules/minimatch": {
-      "version": "3.1.2",
-      "license": "ISC",
+    "node_modules/@ts-morph/common/node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
       "optional": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
       },
       "engines": {
-        "node": "*"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "dev": true
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
     },
     "node_modules/@tsconfig/node16": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true
     },
     "node_modules/@types/body-parser": {
-      "version": "1.19.2",
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
       }
     },
     "node_modules/@types/bonjour": {
-      "version": "3.5.10",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/connect": {
-      "version": "3.4.35",
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.3.5",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express-serve-static-core": "*",
         "@types/node": "*"
       }
     },
     "node_modules/@types/dompurify": {
-      "version": "2.3.4",
-      "license": "MIT",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.4.0.tgz",
+      "integrity": "sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==",
       "dependencies": {
         "@types/trusted-types": "*"
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.4.6",
+      "version": "8.56.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
+      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
     "node_modules/@types/eslint-scope": {
-      "version": "3.7.4",
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -5620,332 +4500,422 @@
     },
     "node_modules/@types/estree": {
       "version": "0.0.51",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "dev": true
     },
     "node_modules/@types/express": {
-      "version": "4.17.14",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
+        "@types/express-serve-static-core": "^4.17.33",
         "@types/qs": "*",
         "@types/serve-static": "*"
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.31",
+      "version": "4.19.5",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
+      "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
-        "@types/range-parser": "*"
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
     "node_modules/@types/fs-extra": {
-      "version": "8.1.2",
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+      "dev": true
+    },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.9",
+      "version": "1.17.14",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
+      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/js-yaml": {
-      "version": "4.0.5",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
+      "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
+      "dev": true
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "dev": true,
-      "license": "MIT"
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true
     },
     "node_modules/@types/marked": {
-      "version": "4.0.7",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.3.2.tgz",
+      "integrity": "sha512-a79Yc3TOk6dGdituy8hmTTJXjOkZ7zsFYV10L337ttq/rec8lRMDBpV7fL3uLx6TgbFCa5DU/h8FmIBQPSbU0w==",
+      "dev": true
     },
     "node_modules/@types/mime": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "dev": true
     },
     "node_modules/@types/minimatch": {
       "version": "3.0.5",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
       "optional": true
     },
     "node_modules/@types/mustache": {
-      "version": "4.2.1",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@types/mustache/-/mustache-4.2.5.tgz",
+      "integrity": "sha512-PLwiVvTBg59tGFL/8VpcGvqOu3L4OuveNvPi0EYbWchRdEVP++yRUXJPFl+CApKEq13017/4Nf7aQ5lTtHUNsA==",
+      "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.11.59",
+      "version": "16.18.101",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.101.tgz",
+      "integrity": "sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA==",
+      "dev": true
+    },
+    "node_modules/@types/node-forge": {
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/node-jose": {
-      "version": "1.1.10",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/@types/node-jose/-/node-jose-1.1.13.tgz",
+      "integrity": "sha512-QjMd4yhwy1EvSToQn0YI3cD29YhyfxFwj7NecuymjLys2/P0FwxWnkgBlFxCai6Y3aBCe7rbwmqwJJawxlgcXw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "dev": true
     },
     "node_modules/@types/pbkdf2": {
-      "version": "3.1.0",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "dev": true,
-      "license": "MIT"
+      "version": "6.9.15",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
+      "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
+      "dev": true
     },
     "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true
     },
     "node_modules/@types/resolve": {
       "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/retry": {
       "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true
+    },
+    "node_modules/@types/send": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/serve-index": {
-      "version": "1.9.1",
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.0",
+      "version": "1.15.7",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/mime": "*",
-        "@types/node": "*"
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "*"
       }
     },
     "node_modules/@types/slice-ansi": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==",
+      "dev": true
     },
     "node_modules/@types/sockjs": {
-      "version": "0.3.33",
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/trusted-types": {
-      "version": "2.0.2",
-      "license": "MIT"
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
     },
     "node_modules/@types/uuid": {
       "version": "8.3.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
+      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
+      "dev": true
     },
     "node_modules/@types/ws": {
-      "version": "8.5.3",
+      "version": "8.5.10",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.1",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
       "dev": true,
-      "license": "MIT"
+      "peer": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
       "dev": true,
-      "license": "MIT"
+      "peer": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
       "dev": true,
-      "license": "MIT"
+      "peer": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
       "dev": true,
-      "license": "MIT"
+      "peer": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.1",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.1",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
-      "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.1",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
       "dev": true,
-      "license": "MIT"
+      "peer": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/ast": "1.12.1",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
-      "dev": true,
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
     },
     "node_modules/@yarnpkg/lockfile": {
       "version": "1.1.0",
-      "devOptional": true,
-      "license": "BSD-2-Clause"
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "devOptional": true
     },
     "node_modules/abab": {
       "version": "2.0.6",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+      "dev": true
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "devOptional": true
     },
     "node_modules/accepts": {
       "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -5955,9 +4925,10 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.8.0",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5966,25 +4937,41 @@
       }
     },
     "node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
       "dev": true,
-      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "dev": true,
+      "peer": true,
       "peerDependencies": {
         "acorn": "^8"
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.2.0",
+      "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
+      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/adjust-sourcemap-loader": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "loader-utils": "^2.0.0",
         "regex-parser": "^2.2.11"
@@ -5995,8 +4982,9 @@
     },
     "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -6008,8 +4996,9 @@
     },
     "node_modules/agent-base": {
       "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "4"
       },
@@ -6018,12 +5007,11 @@
       }
     },
     "node_modules/agentkeepalive": {
-      "version": "4.2.1",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
+      "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^1.1.2",
         "humanize-ms": "^1.2.1"
       },
       "engines": {
@@ -6032,8 +5020,9 @@
     },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -6044,7 +5033,8 @@
     },
     "node_modules/ajv": {
       "version": "8.11.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -6058,7 +5048,8 @@
     },
     "node_modules/ajv-formats": {
       "version": "2.1.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -6073,8 +5064,9 @@
     },
     "node_modules/ajv-keywords": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -6084,7 +5076,8 @@
     },
     "node_modules/angular-svg-round-progressbar": {
       "version": "9.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/angular-svg-round-progressbar/-/angular-svg-round-progressbar-9.0.0.tgz",
+      "integrity": "sha512-q8d2AEG9u+GMAMrZY40NgejN5fHwR4iK+rRxtJ7NnMEvvuAMqt9UEtKe0SqVQHvZYE6W16L5J9yaO+TEtfRjpw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6095,16 +5088,18 @@
     },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -6117,26 +5112,29 @@
     },
     "node_modules/ansi-html-community": {
       "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
       "dev": true,
       "engines": [
         "node >= 0.8.0"
       ],
-      "license": "Apache-2.0",
       "bin": {
         "ansi-html": "bin/ansi-html"
       }
     },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -6146,7 +5144,8 @@
     },
     "node_modules/ansi-to-html": {
       "version": "0.7.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.7.2.tgz",
+      "integrity": "sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g==",
       "dependencies": {
         "entities": "^2.2.0"
       },
@@ -6158,9 +5157,10 @@
       }
     },
     "node_modules/anymatch": {
-      "version": "3.1.2",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -6171,13 +5171,16 @@
     },
     "node_modules/aproba": {
       "version": "2.0.0",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "devOptional": true
     },
     "node_modules/are-we-there-yet": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+      "deprecated": "This package is no longer supported.",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "delegates": "^1.0.0",
         "readable-stream": "^3.6.0"
@@ -6188,29 +5191,34 @@
     },
     "node_modules/arg": {
       "version": "4.1.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
     },
     "node_modules/argparse": {
       "version": "2.0.1",
-      "license": "Python-2.0"
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/array-differ": {
       "version": "3.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
+      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
       "optional": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/array-flatten": {
-      "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "dev": true
     },
     "node_modules/array-union": {
       "version": "2.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "optional": true,
       "engines": {
         "node": ">=8"
@@ -6218,7 +5226,8 @@
     },
     "node_modules/arrify": {
       "version": "2.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
       "optional": true,
       "engines": {
         "node": ">=8"
@@ -6226,8 +5235,9 @@
     },
     "node_modules/ast-types": {
       "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.1"
       },
@@ -6237,29 +5247,33 @@
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/atob": {
       "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true,
-      "license": "(MIT OR Apache-2.0)",
       "bin": {
         "atob": "bin/atob.js"
       },
@@ -6268,7 +5282,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.11",
+      "version": "10.4.19",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
+      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
       "dev": true,
       "funding": [
         {
@@ -6278,13 +5294,16 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.21.3",
-        "caniuse-lite": "^1.0.30001399",
-        "fraction.js": "^4.2.0",
+        "browserslist": "^4.23.0",
+        "caniuse-lite": "^1.0.30001599",
+        "fraction.js": "^4.3.7",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
         "postcss-value-parser": "^4.2.0"
@@ -6301,8 +5320,9 @@
     },
     "node_modules/babel-loader": {
       "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
+      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-cache-dir": "^3.3.1",
         "loader-utils": "^2.0.0",
@@ -6319,8 +5339,9 @@
     },
     "node_modules/babel-loader/node_modules/loader-utils": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -6330,18 +5351,11 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -6355,8 +5369,9 @@
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
       "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.17.7",
         "@babel/helper-define-polyfill-provider": "^0.3.3",
@@ -6367,17 +5382,19 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
       "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz",
+      "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.3.2",
         "core-js-compat": "^3.21.0"
@@ -6388,8 +5405,9 @@
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
       "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.3.3"
       },
@@ -6399,11 +5417,14 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "devOptional": true
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "funding": [
         {
           "type": "github",
@@ -6417,40 +5438,47 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/base64url": {
       "version": "3.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
+      "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/batch": {
       "version": "0.6.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true
     },
     "node_modules/big.js": {
       "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/binary-extensions": {
-      "version": "2.2.0",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/bl": {
       "version": "4.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -6459,6 +5487,8 @@
     },
     "node_modules/bl/node_modules/buffer": {
       "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "funding": [
         {
           "type": "github",
@@ -6473,27 +5503,27 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.0",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.10.3",
-        "raw-body": "2.5.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -6504,29 +5534,24 @@
     },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/depd": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/body-parser/node_modules/qs": {
-      "version": "6.10.3",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -6538,42 +5563,46 @@
       }
     },
     "node_modules/bonjour-service": {
-      "version": "1.0.14",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
+      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
         "fast-deep-equal": "^3.1.3",
         "multicast-dns": "^7.2.5"
       }
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
     },
     "node_modules/brace-expansion": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/browserslist": {
-      "version": "4.21.4",
+      "version": "4.23.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
+      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
       "dev": true,
       "funding": [
         {
@@ -6583,14 +5612,17 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
+        "caniuse-lite": "^1.0.30001629",
+        "electron-to-chromium": "^1.4.796",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.16"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -6601,6 +5633,8 @@
     },
     "node_modules/buffer": {
       "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "funding": [
         {
           "type": "github",
@@ -6615,7 +5649,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -6623,13 +5656,15 @@
     },
     "node_modules/buffer-from": {
       "version": "1.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -6638,25 +5673,28 @@
       }
     },
     "node_modules/builtins": {
-      "version": "5.0.1",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
+      "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^7.0.0"
       }
     },
     "node_modules/bytes": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/cacache": {
       "version": "16.1.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.2.tgz",
+      "integrity": "sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "@npmcli/fs": "^2.1.0",
         "@npmcli/move-file": "^2.0.0",
@@ -6681,13 +5719,29 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/call-bind": {
-      "version": "1.0.2",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6695,21 +5749,25 @@
     },
     "node_modules/callsites": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/camelcase": {
       "version": "5.3.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001407",
+      "version": "1.0.30001640",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
+      "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
       "dev": true,
       "funding": [
         {
@@ -6719,26 +5777,32 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
-      ],
-      "license": "CC-BY-4.0"
+      ]
     },
     "node_modules/cbor": {
       "name": "@jprochazk/cbor",
       "version": "0.4.9",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@jprochazk/cbor/-/cbor-0.4.9.tgz",
+      "integrity": "sha512-FWNnkOtWrFOLXKG2nzOHR/EnCCGZZPvatAvWXDmkTDxgjj9JHDK3DkMUHcFCY3a9weylMCSO/nLOUM170NAO0Q=="
     },
     "node_modules/cbor-web": {
       "version": "8.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/cbor-web/-/cbor-web-8.1.0.tgz",
+      "integrity": "sha512-2hWHHMVrfffgoEmsAUh8vCxHoLa1vgodtC73+C5cSarkJlwTapnqAzcHINlP6Ej0DXuP4OmmJ9LF+JaNM5Lj/g==",
       "engines": {
         "node": ">=12.19"
       }
     },
     "node_modules/chalk": {
       "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -6750,19 +5814,15 @@
     },
     "node_modules/chardet": {
       "version": "0.7.0",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "devOptional": true
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "devOptional": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -6775,34 +5835,41 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
     },
     "node_modules/chownr": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0"
       }
     },
     "node_modules/ci-info": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
     },
     "node_modules/cipher-base": {
       "version": "1.0.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dependencies": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -6810,15 +5877,17 @@
     },
     "node_modules/clean-stack": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/cli-cursor": {
       "version": "3.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dependencies": {
         "restore-cursor": "^3.1.0"
       },
@@ -6827,8 +5896,9 @@
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.7.0",
-      "license": "MIT",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
       "engines": {
         "node": ">=6"
       },
@@ -6838,8 +5908,9 @@
     },
     "node_modules/cli-truncate": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^5.0.0",
         "string-width": "^5.0.0"
@@ -6853,8 +5924,9 @@
     },
     "node_modules/cli-truncate/node_modules/ansi-regex": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6863,9 +5935,10 @@
       }
     },
     "node_modules/cli-truncate/node_modules/ansi-styles": {
-      "version": "6.1.1",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6875,13 +5948,15 @@
     },
     "node_modules/cli-truncate/node_modules/emoji-regex": {
       "version": "9.2.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
     },
     "node_modules/cli-truncate/node_modules/is-fullwidth-code-point": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6891,8 +5966,9 @@
     },
     "node_modules/cli-truncate/node_modules/slice-ansi": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.0.0",
         "is-fullwidth-code-point": "^4.0.0"
@@ -6906,8 +5982,9 @@
     },
     "node_modules/cli-truncate/node_modules/string-width": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -6921,9 +5998,10 @@
       }
     },
     "node_modules/cli-truncate/node_modules/strip-ansi": {
-      "version": "7.0.1",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -6936,16 +6014,18 @@
     },
     "node_modules/cli-width": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/cliui": {
       "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -6954,15 +6034,17 @@
     },
     "node_modules/clone": {
       "version": "1.0.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "engines": {
         "node": ">=0.8"
       }
     },
     "node_modules/clone-deep": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -6973,40 +6055,46 @@
       }
     },
     "node_modules/code-block-writer": {
-      "version": "10.1.1",
-      "license": "MIT",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
+      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
       "optional": true
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
     },
     "node_modules/color-name": {
       "version": "1.1.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
     },
     "node_modules/color-support": {
       "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "devOptional": true,
-      "license": "ISC",
       "bin": {
         "color-support": "bin.js"
       }
     },
     "node_modules/colorette": {
-      "version": "2.0.19",
-      "dev": true,
-      "license": "MIT"
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -7015,32 +6103,40 @@
       }
     },
     "node_modules/commander": {
-      "version": "9.4.0",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || >=14"
       }
     },
     "node_modules/commondir": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
     },
     "node_modules/compare-versions": {
       "version": "3.6.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
+      "dev": true
     },
     "node_modules/component-emitter": {
-      "version": "1.3.0",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
       "dev": true,
-      "license": "MIT"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/compressible": {
       "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
       },
@@ -7050,8 +6146,9 @@
     },
     "node_modules/compression": {
       "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
@@ -7067,47 +6164,60 @@
     },
     "node_modules/compression/node_modules/bytes": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/compression/node_modules/debug": {
       "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/compression/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/compression/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "devOptional": true
     },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
     },
     "node_modules/console-control-strings": {
       "version": "1.1.0",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "devOptional": true
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -7115,63 +6225,47 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/content-type": {
-      "version": "1.0.4",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "dev": true
     },
     "node_modules/cookiejar": {
       "version": "2.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
+      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
+      "dev": true
     },
     "node_modules/copy-anything": {
       "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
+      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-what": "^3.14.1"
       },
@@ -7181,8 +6275,9 @@
     },
     "node_modules/copy-webpack-plugin": {
       "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-glob": "^3.2.11",
         "glob-parent": "^6.0.1",
@@ -7204,8 +6299,9 @@
     },
     "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
       "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -7214,14 +6310,15 @@
       }
     },
     "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -7232,20 +6329,22 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.25.2",
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
+      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==",
       "hasInstallScript": true,
-      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.25.2",
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz",
+      "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.21.4"
+        "browserslist": "^4.23.0"
       },
       "funding": {
         "type": "opencollective",
@@ -7254,13 +6353,15 @@
     },
     "node_modules/core-util-is": {
       "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
     },
     "node_modules/cosmiconfig": {
-      "version": "7.0.1",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -7274,7 +6375,8 @@
     },
     "node_modules/create-hash": {
       "version": "1.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dependencies": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -7285,7 +6387,8 @@
     },
     "node_modules/create-hmac": {
       "version": "1.1.7",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dependencies": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -7297,13 +6400,15 @@
     },
     "node_modules/create-require": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
     },
     "node_modules/critters": {
       "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz",
+      "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "chalk": "^4.1.0",
         "css-select": "^4.2.0",
@@ -7315,8 +6420,9 @@
     },
     "node_modules/critters/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -7329,8 +6435,9 @@
     },
     "node_modules/critters/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -7344,8 +6451,9 @@
     },
     "node_modules/critters/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -7355,21 +6463,24 @@
     },
     "node_modules/critters/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/critters/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/critters/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7379,8 +6490,9 @@
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -7392,8 +6504,9 @@
     },
     "node_modules/css-blank-pseudo": {
       "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -7409,8 +6522,9 @@
     },
     "node_modules/css-has-pseudo": {
       "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -7426,8 +6540,9 @@
     },
     "node_modules/css-loader": {
       "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
+      "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.1.0",
         "postcss": "^8.4.7",
@@ -7451,8 +6566,9 @@
     },
     "node_modules/css-prefers-color-scheme": {
       "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
       "dev": true,
-      "license": "CC0-1.0",
       "bin": {
         "css-prefers-color-scheme": "dist/cli.cjs"
       },
@@ -7465,8 +6581,9 @@
     },
     "node_modules/css-select": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^6.0.1",
@@ -7480,8 +6597,9 @@
     },
     "node_modules/css-what": {
       "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
       },
@@ -7490,18 +6608,26 @@
       }
     },
     "node_modules/cssdb": {
-      "version": "7.0.1",
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.11.2.tgz",
+      "integrity": "sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==",
       "dev": true,
-      "license": "CC0-1.0",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      }
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        }
+      ]
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -7511,21 +6637,30 @@
     },
     "node_modules/cuint": {
       "version": "0.2.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
+      "integrity": "sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==",
+      "dev": true
     },
     "node_modules/data-uri-to-buffer": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
+      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
+    "node_modules/debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
+      "dev": true
+    },
     "node_modules/debug": {
       "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -7540,36 +6675,41 @@
     },
     "node_modules/decamelize": {
       "version": "1.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/decode-uri-component": {
       "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
     },
     "node_modules/deep-is": {
       "version": "0.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
     },
     "node_modules/deepmerge": {
-      "version": "4.2.2",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/default-gateway": {
       "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "execa": "^5.0.0"
       },
@@ -7578,60 +6718,52 @@
       }
     },
     "node_modules/defaults": {
-      "version": "1.0.3",
-      "license": "MIT",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dependencies": {
         "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
-      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/degenerator": {
-      "version": "3.0.2",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.4.tgz",
+      "integrity": "sha512-Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ast-types": "^0.13.2",
         "escodegen": "^1.8.1",
         "esprima": "^4.0.0",
-        "vm2": "^3.9.8"
+        "vm2": "^3.9.17"
       },
       "engines": {
         "node": ">= 6"
@@ -7639,37 +6771,42 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/delegates": {
       "version": "1.0.0",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "devOptional": true
     },
     "node_modules/depd": {
-      "version": "1.1.2",
-      "devOptional": true,
-      "license": "MIT",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/dependency-graph": {
       "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
+      "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6.0"
       }
     },
     "node_modules/destroy": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
@@ -7677,25 +6814,29 @@
     },
     "node_modules/detect-node": {
       "version": "2.1.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "dev": true
     },
     "node_modules/diff": {
       "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
     },
     "node_modules/dijkstrajs": {
-      "version": "1.0.2",
-      "license": "MIT"
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
+      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -7703,15 +6844,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/dns-packet": {
-      "version": "5.4.0",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
       },
@@ -7721,8 +6858,9 @@
     },
     "node_modules/dom-serializer": {
       "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -7733,27 +6871,30 @@
       }
     },
     "node_modules/dom7": {
-      "version": "4.0.4",
-      "license": "MIT",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.6.tgz",
+      "integrity": "sha512-emjdpPLhpNubapLFdjNL9tP06Sr+GZkrIHEXLWvOGsytACUrkbeIdjO5g77m00BrHTznnlcNqgmn7pCN192TBA==",
       "dependencies": {
         "ssr-window": "^4.0.0"
       }
     },
     "node_modules/domelementtype": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true,
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/fb55"
         }
-      ],
-      "license": "BSD-2-Clause"
+      ]
     },
     "node_modules/domhandler": {
       "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.2.0"
       },
@@ -7765,13 +6906,15 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "2.4.0",
-      "license": "(MPL-2.0 OR Apache-2.0)"
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.5.tgz",
+      "integrity": "sha512-FgbqnEPiv5Vdtwt6Mxl7XSylttCC03cqP5ldNT2z+Kj0nLxPHJH4+1Cyf5Jasxhw93Rl4Oo11qRoUV72fmya2Q=="
     },
     "node_modules/domutils": {
       "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^1.0.1",
         "domelementtype": "^2.2.0",
@@ -7783,21 +6926,24 @@
     },
     "node_modules/duplexer": {
       "version": "0.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true
     },
     "node_modules/duplexer2": {
       "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "readable-stream": "^2.0.2"
       }
     },
     "node_modules/duplexer2/node_modules/readable-stream": {
-      "version": "2.3.7",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -7808,241 +6954,600 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/duplexer2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/duplexer2/node_modules/string_decoder": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.255",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.4.816",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.816.tgz",
+      "integrity": "sha512-EKH5X5oqC6hLmiS7/vYtZHZFTNdhsYG5NVPRN6Yn0kQHNBlT59+xSM8HBy66P5fxWpKgZbPqb+diC64ng295Jw==",
+      "dev": true
     },
     "node_modules/elementtree": {
       "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "sax": "1.1.4"
       },
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encode-utf8": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
+      "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.17.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
+      "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "devOptional": true
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "node_modules/esbuild": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.5.tgz",
+      "integrity": "sha512-VSf6S1QVqvxfIsSKb3UKr3VhUCis7wgDbtF4Vd9z84UJr05/Sp2fRKmzC+CSPG/dNAPPJZ0BTBLTT1Fhd6N9Gg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/linux-loong64": "0.15.5",
+        "esbuild-android-64": "0.15.5",
+        "esbuild-android-arm64": "0.15.5",
+        "esbuild-darwin-64": "0.15.5",
+        "esbuild-darwin-arm64": "0.15.5",
+        "esbuild-freebsd-64": "0.15.5",
+        "esbuild-freebsd-arm64": "0.15.5",
+        "esbuild-linux-32": "0.15.5",
+        "esbuild-linux-64": "0.15.5",
+        "esbuild-linux-arm": "0.15.5",
+        "esbuild-linux-arm64": "0.15.5",
+        "esbuild-linux-mips64le": "0.15.5",
+        "esbuild-linux-ppc64le": "0.15.5",
+        "esbuild-linux-riscv64": "0.15.5",
+        "esbuild-linux-s390x": "0.15.5",
+        "esbuild-netbsd-64": "0.15.5",
+        "esbuild-openbsd-64": "0.15.5",
+        "esbuild-sunos-64": "0.15.5",
+        "esbuild-windows-32": "0.15.5",
+        "esbuild-windows-64": "0.15.5",
+        "esbuild-windows-arm64": "0.15.5"
+      }
+    },
+    "node_modules/esbuild-android-64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.5.tgz",
+      "integrity": "sha512-dYPPkiGNskvZqmIK29OPxolyY3tp+c47+Fsc2WYSOVjEPWNCHNyqhtFqQadcXMJDQt8eN0NMDukbyQgFcHquXg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-android-arm64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.5.tgz",
+      "integrity": "sha512-YyEkaQl08ze3cBzI/4Cm1S+rVh8HMOpCdq8B78JLbNFHhzi4NixVN93xDrHZLztlocEYqi45rHHCgA8kZFidFg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.5.tgz",
+      "integrity": "sha512-Cr0iIqnWKx3ZTvDUAzG0H/u9dWjLE4c2gTtRLz4pqOBGjfjqdcZSfAObFzKTInLLSmD0ZV1I/mshhPoYSBMMCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-arm64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.5.tgz",
+      "integrity": "sha512-WIfQkocGtFrz7vCu44ypY5YmiFXpsxvz2xqwe688jFfSVCnUsCn2qkEVDo7gT8EpsLOz1J/OmqjExePL1dr1Kg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.5.tgz",
+      "integrity": "sha512-M5/EfzV2RsMd/wqwR18CELcenZ8+fFxQAAEO7TJKDmP3knhWSbD72ILzrXFMMwshlPAS1ShCZ90jsxkm+8FlaA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-arm64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.5.tgz",
+      "integrity": "sha512-2JQQ5Qs9J0440F/n/aUBNvY6lTo4XP/4lt1TwDfHuo0DY3w5++anw+jTjfouLzbJmFFiwmX7SmUhMnysocx96w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "license": "MIT"
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
+    "node_modules/esbuild-linux-32": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.5.tgz",
+      "integrity": "sha512-gO9vNnIN0FTUGjvTFucIXtBSr1Woymmx/aHQtuU+2OllGU6YFLs99960UD4Dib1kFovVgs59MTXwpFdVoSMZoQ==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">= 4"
+        "node": ">=12"
       }
     },
-    "node_modules/encode-utf8": {
-      "version": "1.0.3",
-      "license": "MIT"
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
+    "node_modules/esbuild-linux-64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.5.tgz",
+      "integrity": "sha512-ne0GFdNLsm4veXbTnYAWjbx3shpNKZJUd6XpNbKNUZaNllDZfYQt0/zRqOg0sc7O8GQ+PjSMv9IpIEULXVTVmg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=12"
       }
     },
-    "node_modules/encoding": {
-      "version": "0.1.13",
+    "node_modules/esbuild-linux-arm": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.5.tgz",
+      "integrity": "sha512-wvAoHEN+gJ/22gnvhZnS/+2H14HyAxM07m59RSLn3iXrQsdS518jnEWRBnJz3fR6BJa+VUTo0NxYjGaNt7RA7Q==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
+    "node_modules/esbuild-linux-arm64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.5.tgz",
+      "integrity": "sha512-7EgFyP2zjO065XTfdCxiXVEk+f83RQ1JsryN1X/VSX2li9rnHAt2swRbpoz5Vlrl6qjHrCmq5b6yxD13z6RheA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
+    "node_modules/esbuild-linux-mips64le": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.5.tgz",
+      "integrity": "sha512-KdnSkHxWrJ6Y40ABu+ipTZeRhFtc8dowGyFsZY5prsmMSr1ZTG9zQawguN4/tunJ0wy3+kD54GaGwdcpwWAvZQ==",
+      "cpu": [
+        "mips64el"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "once": "^1.4.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.10.0",
+    "node_modules/esbuild-linux-ppc64le": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.5.tgz",
+      "integrity": "sha512-QdRHGeZ2ykl5P0KRmfGBZIHmqcwIsUKWmmpZTOq573jRWwmpfRmS7xOhmDHBj9pxv+6qRMH8tLr2fe+ZKQvCYw==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=12"
       }
     },
-    "node_modules/entities": {
-      "version": "2.2.0",
-      "license": "BSD-2-Clause",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+    "node_modules/esbuild-linux-riscv64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.5.tgz",
+      "integrity": "sha512-p+WE6RX+jNILsf+exR29DwgV6B73khEQV0qWUbzxaycxawZ8NE0wA6HnnTxbiw5f4Gx9sJDUBemh9v49lKOORA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "devOptional": true,
-      "license": "MIT",
+    "node_modules/esbuild-linux-s390x": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.5.tgz",
+      "integrity": "sha512-J2ngOB4cNzmqLHh6TYMM/ips8aoZIuzxJnDdWutBw5482jGXiOzsPoEF4j2WJ2mGnm7FBCO4StGcwzOgic70JQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
-    "node_modules/err-code": {
-      "version": "2.0.3",
-      "devOptional": true,
-      "license": "MIT"
-    },
-    "node_modules/errno": {
-      "version": "0.1.8",
+    "node_modules/esbuild-netbsd-64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.5.tgz",
+      "integrity": "sha512-MmKUYGDizYjFia0Rwt8oOgmiFH7zaYlsoQ3tIOfPxOqLssAsEgG0MUdRDm5lliqjiuoog8LyDu9srQk5YwWF3w==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
+    "node_modules/esbuild-openbsd-64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.5.tgz",
+      "integrity": "sha512-2mMFfkLk3oPWfopA9Plj4hyhqHNuGyp5KQyTT9Rc8hFd8wAn5ZrbJg+gNcLMo2yzf8Uiu0RT6G9B15YN9WQyMA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "0.9.3",
+    "node_modules/esbuild-sunos-64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.5.tgz",
+      "integrity": "sha512-2sIzhMUfLNoD+rdmV6AacilCHSxZIoGAU2oT7XmJ0lXcZWnCvCtObvO6D4puxX9YRE97GodciRGDLBaiC6x1SA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/es6-promise": {
-      "version": "4.2.8",
-      "license": "MIT"
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/esbuild": {
+    "node_modules/esbuild-wasm": {
       "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.15.5.tgz",
+      "integrity": "sha512-lTJOEKekN/4JI/eOEq0wLcx53co2N6vaT/XjBz46D1tvIVoUEyM0o2K6txW6gEotf31szFD/J1PbxmnbkGlK9A==",
       "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
         "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/linux-loong64": "0.15.5",
-        "esbuild-android-64": "0.15.5",
-        "esbuild-android-arm64": "0.15.5",
-        "esbuild-darwin-64": "0.15.5",
-        "esbuild-darwin-arm64": "0.15.5",
-        "esbuild-freebsd-64": "0.15.5",
-        "esbuild-freebsd-arm64": "0.15.5",
-        "esbuild-linux-32": "0.15.5",
-        "esbuild-linux-64": "0.15.5",
-        "esbuild-linux-arm": "0.15.5",
-        "esbuild-linux-arm64": "0.15.5",
-        "esbuild-linux-mips64le": "0.15.5",
-        "esbuild-linux-ppc64le": "0.15.5",
-        "esbuild-linux-riscv64": "0.15.5",
-        "esbuild-linux-s390x": "0.15.5",
-        "esbuild-netbsd-64": "0.15.5",
-        "esbuild-openbsd-64": "0.15.5",
-        "esbuild-sunos-64": "0.15.5",
-        "esbuild-windows-32": "0.15.5",
-        "esbuild-windows-64": "0.15.5",
-        "esbuild-windows-arm64": "0.15.5"
       }
     },
-    "node_modules/esbuild-darwin-arm64": {
+    "node_modules/esbuild-windows-32": {
       "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.5.tgz",
+      "integrity": "sha512-e+duNED9UBop7Vnlap6XKedA/53lIi12xv2ebeNS4gFmu7aKyTrok7DPIZyU5w/ftHD4MUDs5PJUkQPP9xJRzg==",
       "cpu": [
-        "arm64"
+        "ia32"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "win32"
       ],
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/esbuild-wasm": {
+    "node_modules/esbuild-windows-64": {
       "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.5.tgz",
+      "integrity": "sha512-v+PjvNtSASHOjPDMIai9Yi+aP+Vwox+3WVdg2JB8N9aivJ7lyhp4NVU+J0MV2OkWFPnVO8AE/7xH+72ibUUEnw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-arm64": {
+      "version": "0.15.5",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.5.tgz",
+      "integrity": "sha512-Yz8w/D8CUPYstvVQujByu6mlf48lKmXkq6bkeSZZxTA626efQOJb26aDGLzmFWx6eg/FwrXgt6SZs9V8Pwy/aA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/escodegen": {
       "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
@@ -8062,8 +7567,9 @@
     },
     "node_modules/escodegen/node_modules/source-map": {
       "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -8071,8 +7577,9 @@
     },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -8083,8 +7590,9 @@
     },
     "node_modules/esprima": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -8095,8 +7603,9 @@
     },
     "node_modules/esrecurse": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -8106,63 +7615,72 @@
     },
     "node_modules/esrecurse/node_modules/estraverse": {
       "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/estraverse": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/estree-walker": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+      "dev": true
     },
     "node_modules/esutils": {
       "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/etag": {
       "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/eventemitter-asyncresource": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz",
+      "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==",
+      "dev": true
     },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
     },
     "node_modules/events": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }
     },
     "node_modules/execa": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -8181,17 +7699,24 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
+    "node_modules/exponential-backoff": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
+      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
+      "devOptional": true
+    },
     "node_modules/express": {
-      "version": "4.18.1",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -8207,7 +7732,7 @@
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
         "send": "0.18.0",
@@ -8222,69 +7747,41 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "node_modules/express/node_modules/depd": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/express/node_modules/qs": {
-      "version": "6.10.3",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.4"
       },
       "engines": {
         "node": ">=0.6"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/external-editor": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
@@ -8300,9 +7797,10 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.12",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -8316,35 +7814,41 @@
     },
     "node_modules/fast-json-patch": {
       "version": "3.1.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
+      "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ=="
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
     },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.13.0",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/faye-websocket": {
       "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "websocket-driver": ">=0.5.1"
       },
@@ -8354,8 +7858,9 @@
     },
     "node_modules/figures": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -8368,16 +7873,18 @@
     },
     "node_modules/file-uri-to-path": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+      "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -8387,8 +7894,9 @@
     },
     "node_modules/finalhandler": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -8404,21 +7912,24 @@
     },
     "node_modules/finalhandler/node_modules/debug": {
       "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/find-cache-dir": {
       "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -8433,7 +7944,8 @@
     },
     "node_modules/find-up": {
       "version": "4.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -8444,8 +7956,9 @@
     },
     "node_modules/find-versions": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz",
+      "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver-regex": "^3.1.2"
       },
@@ -8457,7 +7970,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true,
       "funding": [
         {
@@ -8465,7 +7980,6 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -8477,8 +7991,9 @@
     },
     "node_modules/form-data": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -8490,44 +8005,50 @@
     },
     "node_modules/formidable": {
       "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz",
+      "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
+      "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
     },
     "node_modules/forwarded": {
       "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/fraction.js": {
-      "version": "4.2.0",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       },
       "funding": {
         "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
+        "url": "https://github.com/sponsors/rawify"
       }
     },
     "node_modules/fresh": {
       "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/fs-extra": {
       "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -8540,8 +8061,9 @@
     },
     "node_modules/fs-minipass": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -8550,19 +8072,23 @@
       }
     },
     "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "Unlicense"
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
+      "dev": true
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "devOptional": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "license": "MIT",
+      "hasInstallScript": true,
       "optional": true,
       "os": [
         "darwin"
@@ -8573,6 +8099,8 @@
     },
     "node_modules/ftp": {
       "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+      "integrity": "sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==",
       "dev": true,
       "dependencies": {
         "readable-stream": "1.1.x",
@@ -8584,13 +8112,15 @@
     },
     "node_modules/ftp/node_modules/isarray": {
       "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
     },
     "node_modules/ftp/node_modules/readable-stream": {
       "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.1",
@@ -8600,25 +8130,33 @@
     },
     "node_modules/ftp/node_modules/string_decoder": {
       "version": "0.10.31",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "devOptional": true,
-      "license": "MIT"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/fuse.js": {
       "version": "6.6.2",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
+      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/gauge": {
       "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+      "deprecated": "This package is no longer supported.",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "aproba": "^1.0.3 || ^2.0.0",
         "color-support": "^1.1.3",
@@ -8635,29 +8173,35 @@
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8665,16 +8209,18 @@
     },
     "node_modules/get-package-type": {
       "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/get-stream": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -8684,8 +8230,9 @@
     },
     "node_modules/get-uri": {
       "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
+      "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "data-uri-to-buffer": "3",
@@ -8700,16 +8247,18 @@
     },
     "node_modules/get-uri/node_modules/@tootallnate/once": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/get-uri/node_modules/fs-extra": {
       "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -8721,24 +8270,28 @@
     },
     "node_modules/get-uri/node_modules/jsonfile": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
-      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
     },
     "node_modules/get-uri/node_modules/universalify": {
       "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/glob": {
       "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -8755,8 +8308,9 @@
     },
     "node_modules/glob-parent": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -8766,25 +8320,28 @@
     },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
     },
     "node_modules/globals": {
       "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/globby": {
-      "version": "13.1.2",
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
         "merge2": "^1.4.1",
         "slash": "^4.0.0"
       },
@@ -8808,14 +8365,16 @@
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "devOptional": true,
-      "license": "ISC"
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "devOptional": true
     },
     "node_modules/gzip-size": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "duplexer": "^0.1.2"
       },
@@ -8828,43 +8387,35 @@
     },
     "node_modules/handle-thing": {
       "version": "2.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "devOptional": true,
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
     },
     "node_modules/has-flag": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -8875,8 +8426,9 @@
     },
     "node_modules/has-symbols": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8886,12 +8438,14 @@
     },
     "node_modules/has-unicode": {
       "version": "2.0.1",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "devOptional": true
     },
     "node_modules/hash-base": {
       "version": "3.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
       "dependencies": {
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
@@ -8901,28 +8455,23 @@
         "node": ">=4"
       }
     },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "devOptional": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/hdr-histogram-js": {
       "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz",
+      "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==",
       "dev": true,
-      "license": "BSD",
       "dependencies": {
         "@assemblyscript/loader": "^0.10.1",
         "base64-js": "^1.2.0",
@@ -8931,26 +8480,30 @@
     },
     "node_modules/hdr-histogram-js/node_modules/pako": {
       "version": "1.0.11",
-      "dev": true,
-      "license": "(MIT AND Zlib)"
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
     },
     "node_modules/hdr-histogram-percentiles-obj": {
       "version": "3.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz",
+      "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==",
+      "dev": true
     },
     "node_modules/he": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "he": "bin/he"
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "5.1.0",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz",
+      "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^7.5.1"
       },
@@ -8958,10 +8511,20 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/hpack.js": {
       "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -8970,9 +8533,10 @@
       }
     },
     "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.7",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -8983,33 +8547,60 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/hpack.js/node_modules/string_decoder": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/html-entities": {
-      "version": "2.3.3",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+      "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
       "dev": true,
-      "license": "MIT"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ]
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
     },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
-      "devOptional": true,
-      "license": "BSD-2-Clause"
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "devOptional": true
     },
     "node_modules/http-deceiver": {
       "version": "1.2.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "dev": true
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -9021,23 +8612,17 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/http-errors/node_modules/depd": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/http-parser-js": {
       "version": "0.5.8",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "dev": true
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
@@ -9049,8 +8634,9 @@
     },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "2",
         "agent-base": "6",
@@ -9062,8 +8648,9 @@
     },
     "node_modules/http-proxy-middleware": {
       "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -9085,8 +8672,9 @@
     },
     "node_modules/https-proxy-agent": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -9097,25 +8685,28 @@
     },
     "node_modules/human-signals": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
     },
     "node_modules/humanize-ms": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.0.0"
       }
     },
     "node_modules/husky": {
       "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
+      "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "ci-info": "^2.0.0",
@@ -9142,8 +8733,9 @@
     },
     "node_modules/husky/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9156,8 +8748,9 @@
     },
     "node_modules/husky/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9171,8 +8764,9 @@
     },
     "node_modules/husky/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9182,13 +8776,15 @@
     },
     "node_modules/husky/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/husky/node_modules/find-up": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -9202,16 +8798,18 @@
     },
     "node_modules/husky/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/husky/node_modules/locate-path": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -9224,8 +8822,9 @@
     },
     "node_modules/husky/node_modules/p-limit": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -9238,8 +8837,9 @@
     },
     "node_modules/husky/node_modules/p-locate": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -9252,8 +8852,9 @@
     },
     "node_modules/husky/node_modules/pkg-dir": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
+      "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-up": "^5.0.0"
       },
@@ -9263,16 +8864,18 @@
     },
     "node_modules/husky/node_modules/slash": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/husky/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9282,8 +8885,9 @@
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -9293,8 +8897,9 @@
     },
     "node_modules/icss-utils": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -9304,6 +8909,8 @@
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "funding": [
         {
           "type": "github",
@@ -9317,21 +8924,22 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "BSD-3-Clause"
+      ]
     },
     "node_modules/ignore": {
-      "version": "5.2.0",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/ignore-walk": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz",
+      "integrity": "sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "minimatch": "^5.0.1"
       },
@@ -9341,8 +8949,9 @@
     },
     "node_modules/image-size": {
       "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "bin": {
         "image-size": "bin/image-size.js"
@@ -9352,14 +8961,16 @@
       }
     },
     "node_modules/immutable": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+      "dev": true
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -9373,37 +8984,43 @@
     },
     "node_modules/import-fresh/node_modules/resolve-from": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
     },
     "node_modules/indent-string": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/infer-owner": {
       "version": "1.0.4",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "devOptional": true
     },
     "node_modules/inflight": {
       "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -9411,28 +9028,32 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.0.tgz",
+      "integrity": "sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/injection-js": {
       "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.4.0.tgz",
+      "integrity": "sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       }
     },
     "node_modules/inquirer": {
       "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz",
+      "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.1.1",
@@ -9456,8 +9077,9 @@
     },
     "node_modules/inquirer/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9470,8 +9092,9 @@
     },
     "node_modules/inquirer/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9485,8 +9108,9 @@
     },
     "node_modules/inquirer/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9496,21 +9120,24 @@
     },
     "node_modules/inquirer/node_modules/color-name": {
       "version": "1.1.4",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "devOptional": true
     },
     "node_modules/inquirer/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/inquirer/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9519,45 +9146,52 @@
       }
     },
     "node_modules/ionicons": {
-      "version": "6.0.3",
-      "license": "MIT",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
+      "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
       "dependencies": {
-        "@stencil/core": "~2.16.0"
+        "@stencil/core": "^2.18.0"
       }
     },
-    "node_modules/ionicons/node_modules/@stencil/core": {
-      "version": "2.16.1",
-      "license": "MIT",
-      "bin": {
-        "stencil": "bin/stencil"
+    "node_modules/ip": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
+      "dev": true
+    },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "devOptional": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
       },
       "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
+        "node": ">= 12"
       }
     },
-    "node_modules/ip": {
-      "version": "2.0.0",
-      "devOptional": true,
-      "license": "MIT"
-    },
     "node_modules/ipaddr.js": {
-      "version": "2.0.1",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -9566,9 +9200,10 @@
       }
     },
     "node_modules/is-builtin-module": {
-      "version": "3.2.0",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "builtin-modules": "^3.3.0"
       },
@@ -9580,11 +9215,15 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.10.0",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9592,8 +9231,9 @@
     },
     "node_modules/is-docker": {
       "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "devOptional": true,
-      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -9606,23 +9246,26 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/is-glob": {
       "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -9632,33 +9275,38 @@
     },
     "node_modules/is-interactive": {
       "version": "1.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/is-lambda": {
       "version": "1.0.1",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "devOptional": true
     },
     "node_modules/is-module": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+      "dev": true
     },
     "node_modules/is-number": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-plain-obj": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -9668,8 +9316,9 @@
     },
     "node_modules/is-plain-object": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -9679,8 +9328,9 @@
     },
     "node_modules/is-stream": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -9690,12 +9340,14 @@
     },
     "node_modules/is-typedarray": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "engines": {
         "node": ">=10"
       },
@@ -9705,13 +9357,15 @@
     },
     "node_modules/is-what": {
       "version": "3.14.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
+      "dev": true
     },
     "node_modules/is-wsl": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -9721,34 +9375,39 @@
     },
     "node_modules/isarray": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "devOptional": true
     },
     "node_modules/isobject": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.0",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.0",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -9761,17 +9420,19 @@
       }
     },
     "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/jest-worker": {
       "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -9783,16 +9444,18 @@
     },
     "node_modules/jest-worker/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9804,20 +9467,23 @@
       }
     },
     "node_modules/jose": {
-      "version": "4.9.3",
-      "license": "MIT",
+      "version": "4.15.9",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz",
+      "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==",
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -9825,10 +9491,17 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "devOptional": true
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -9838,17 +9511,20 @@
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "devOptional": true
     },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/json5": {
       "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -9858,12 +9534,14 @@
     },
     "node_modules/jsonc-parser": {
       "version": "3.1.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz",
+      "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg=="
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -9873,40 +9551,45 @@
     },
     "node_modules/jsonparse": {
       "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
       "devOptional": true,
       "engines": [
         "node >= 0.2.0"
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/karma-source-map-support": {
       "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
+      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "source-map-support": "^0.5.5"
       }
     },
     "node_modules/kind-of": {
       "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/klona": {
-      "version": "2.0.5",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/leek": {
       "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz",
+      "integrity": "sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^2.1.0",
         "lodash.assign": "^3.2.0",
@@ -9915,21 +9598,24 @@
     },
     "node_modules/leek/node_modules/debug": {
       "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/leek/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/less": {
       "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz",
+      "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "copy-anything": "^2.0.1",
         "parse-node-version": "^1.0.1",
@@ -9953,8 +9639,9 @@
     },
     "node_modules/less-loader": {
       "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.0.0.tgz",
+      "integrity": "sha512-9+LOWWjuoectIEx3zrfN83NAGxSUB5pWEabbbidVQVgZhN+wN68pOvuyirVlH1IK4VT1f3TmlyvAnCXh8O5KEw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "klona": "^2.0.4"
       },
@@ -9972,8 +9659,9 @@
     },
     "node_modules/less/node_modules/make-dir": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "pify": "^4.0.1",
@@ -9998,17 +9686,19 @@
     },
     "node_modules/less/node_modules/pify": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/less/node_modules/semver": {
-      "version": "5.7.1",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
-      "license": "ISC",
       "optional": true,
       "bin": {
         "semver": "bin/semver"
@@ -10016,8 +9706,9 @@
     },
     "node_modules/less/node_modules/source-map": {
       "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -10025,8 +9716,9 @@
     },
     "node_modules/levn": {
       "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -10037,8 +9729,9 @@
     },
     "node_modules/license-webpack-plugin": {
       "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
+      "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "webpack-sources": "^3.0.0"
       },
@@ -10053,21 +9746,24 @@
     },
     "node_modules/lilconfig": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
+      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
     "node_modules/lint-staged": {
       "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.5.0.tgz",
+      "integrity": "sha512-BKLUjWDsKquV/JuIcoQW4MSAI3ggwEImF1+sB4zaKvyVx1wBk3FsG7UK9bpnmBTN1pm7EH2BBcMwINJzCRv12g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^3.1.0",
         "colorette": "^2.0.16",
@@ -10095,9 +9791,10 @@
       }
     },
     "node_modules/lint-staged/node_modules/supports-color": {
-      "version": "9.2.3",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
+      "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -10107,8 +9804,9 @@
     },
     "node_modules/listr2": {
       "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
+      "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^2.1.0",
         "colorette": "^2.0.16",
@@ -10133,8 +9831,9 @@
     },
     "node_modules/listr2/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10147,8 +9846,9 @@
     },
     "node_modules/listr2/node_modules/cli-truncate": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^3.0.0",
         "string-width": "^4.2.0"
@@ -10162,8 +9862,9 @@
     },
     "node_modules/listr2/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10173,13 +9874,15 @@
     },
     "node_modules/listr2/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/listr2/node_modules/slice-ansi": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -10191,23 +9894,26 @@
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
       }
     },
     "node_modules/loader-utils": {
-      "version": "3.2.0",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 12.13.0"
       }
     },
     "node_modules/locate-path": {
       "version": "5.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -10217,12 +9923,14 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash._baseassign": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash._basecopy": "^3.0.0",
         "lodash.keys": "^3.0.0"
@@ -10230,18 +9938,21 @@
     },
     "node_modules/lodash._basecopy": {
       "version": "3.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
+      "dev": true
     },
     "node_modules/lodash._bindcallback": {
       "version": "3.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
+      "dev": true
     },
     "node_modules/lodash._createassigner": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash._bindcallback": "^3.0.0",
         "lodash._isiterateecall": "^3.0.0",
@@ -10250,18 +9961,21 @@
     },
     "node_modules/lodash._getnative": {
       "version": "3.9.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
+      "dev": true
     },
     "node_modules/lodash._isiterateecall": {
       "version": "3.0.9",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
+      "dev": true
     },
     "node_modules/lodash.assign": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
+      "integrity": "sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash._baseassign": "^3.0.0",
         "lodash._createassigner": "^3.0.0",
@@ -10270,23 +9984,27 @@
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true
     },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "dev": true
     },
     "node_modules/lodash.isarray": {
       "version": "3.0.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
+      "dev": true
     },
     "node_modules/lodash.keys": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "lodash._getnative": "^3.0.0",
         "lodash.isarguments": "^3.0.0",
@@ -10295,12 +10013,14 @@
     },
     "node_modules/lodash.restparam": {
       "version": "3.6.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
+      "dev": true
     },
     "node_modules/log-symbols": {
       "version": "4.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dependencies": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
@@ -10314,7 +10034,8 @@
     },
     "node_modules/log-symbols/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10327,7 +10048,8 @@
     },
     "node_modules/log-symbols/node_modules/chalk": {
       "version": "4.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10341,7 +10063,8 @@
     },
     "node_modules/log-symbols/node_modules/color-convert": {
       "version": "2.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10351,18 +10074,21 @@
     },
     "node_modules/log-symbols/node_modules/color-name": {
       "version": "1.1.4",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/log-symbols/node_modules/has-flag": {
       "version": "4.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/log-symbols/node_modules/supports-color": {
       "version": "7.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10372,8 +10098,9 @@
     },
     "node_modules/log-update": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.3.0",
         "cli-cursor": "^3.1.0",
@@ -10389,8 +10116,9 @@
     },
     "node_modules/log-update/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10403,8 +10131,9 @@
     },
     "node_modules/log-update/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10414,13 +10143,15 @@
     },
     "node_modules/log-update/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/log-update/node_modules/wrap-ansi": {
       "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -10431,21 +10162,24 @@
       }
     },
     "node_modules/long": {
-      "version": "5.2.0",
-      "license": "Apache-2.0"
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
     },
     "node_modules/lru-cache": {
-      "version": "7.14.0",
-      "devOptional": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
       }
     },
     "node_modules/macos-release": {
-      "version": "2.5.0",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz",
+      "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -10455,7 +10189,8 @@
     },
     "node_modules/magic-string": {
       "version": "0.26.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz",
+      "integrity": "sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==",
       "dependencies": {
         "sourcemap-codec": "^1.4.8"
       },
@@ -10465,8 +10200,9 @@
     },
     "node_modules/make-dir": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -10478,22 +10214,25 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/make-error": {
       "version": "1.3.6",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
     },
     "node_modules/make-fetch-happen": {
       "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz",
+      "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "agentkeepalive": "^4.2.1",
         "cacache": "^16.1.0",
@@ -10516,9 +10255,19 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/marked": {
-      "version": "4.1.0",
-      "license": "MIT",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -10528,7 +10277,8 @@
     },
     "node_modules/md5.js": {
       "version": "1.3.5",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -10537,18 +10287,20 @@
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/memfs": {
-      "version": "3.4.7",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dev": true,
-      "license": "Unlicense",
       "dependencies": {
-        "fs-monkey": "^1.0.3"
+        "fs-monkey": "^1.0.4"
       },
       "engines": {
         "node": ">= 4.0.0"
@@ -10556,36 +10308,41 @@
     },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+      "dev": true
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
     },
     "node_modules/merge2": {
       "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/methods": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
+      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -10608,16 +10365,18 @@
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
       "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -10627,15 +10386,17 @@
     },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/mini-css-extract-plugin": {
       "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
+      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "schema-utils": "^4.0.0"
       },
@@ -10651,14 +10412,15 @@
       }
     },
     "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -10670,13 +10432,15 @@
     },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
     },
     "node_modules/minimatch": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -10685,14 +10449,19 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
-      "license": "MIT"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/minipass": {
-      "version": "3.3.4",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -10702,8 +10471,9 @@
     },
     "node_modules/minipass-collect": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -10713,8 +10483,9 @@
     },
     "node_modules/minipass-fetch": {
       "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz",
+      "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "minipass": "^3.1.6",
         "minipass-sized": "^1.0.3",
@@ -10729,8 +10500,9 @@
     },
     "node_modules/minipass-flush": {
       "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -10740,8 +10512,9 @@
     },
     "node_modules/minipass-json-stream": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "jsonparse": "^1.3.1",
         "minipass": "^3.0.0"
@@ -10749,8 +10522,9 @@
     },
     "node_modules/minipass-pipeline": {
       "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -10760,8 +10534,9 @@
     },
     "node_modules/minipass-sized": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -10769,10 +10544,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/minipass/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "devOptional": true
+    },
     "node_modules/minizlib": {
       "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -10781,10 +10563,17 @@
         "node": ">= 8"
       }
     },
+    "node_modules/minizlib/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "devOptional": true
+    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "devOptional": true,
-      "license": "MIT",
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -10794,25 +10583,29 @@
     },
     "node_modules/monaco-editor": {
       "version": "0.33.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz",
+      "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
     },
     "node_modules/mrmime": {
-      "version": "1.0.1",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
+      "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/ms": {
       "version": "2.1.2",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "devOptional": true
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "dns-packet": "^5.2.2",
         "thunky": "^1.0.2"
@@ -10823,7 +10616,8 @@
     },
     "node_modules/multimatch": {
       "version": "5.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
+      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
       "optional": true,
       "dependencies": {
         "@types/minimatch": "^3.0.3",
@@ -10841,7 +10635,8 @@
     },
     "node_modules/multimatch/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "optional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -10850,7 +10645,8 @@
     },
     "node_modules/multimatch/node_modules/minimatch": {
       "version": "3.1.2",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "optional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -10861,20 +10657,29 @@
     },
     "node_modules/mustache": {
       "version": "4.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
       "bin": {
         "mustache": "bin/mustache"
       }
     },
     "node_modules/mute-stream": {
       "version": "0.0.8",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "devOptional": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.4",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true,
-      "license": "MIT",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -10883,12 +10688,12 @@
       }
     },
     "node_modules/needle": {
-      "version": "3.1.0",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
+      "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "debug": "^3.2.6",
         "iconv-lite": "^0.6.3",
         "sax": "^1.2.4"
       },
@@ -10899,19 +10704,11 @@
         "node": ">= 4.4.x"
       }
     },
-    "node_modules/needle/node_modules/debug": {
-      "version": "3.2.7",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
     "node_modules/needle/node_modules/iconv-lite": {
       "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -10921,76 +10718,85 @@
       }
     },
     "node_modules/needle/node_modules/sax": {
-      "version": "1.2.4",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
       "dev": true,
-      "license": "ISC",
       "optional": true
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/neo-async": {
       "version": "2.6.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
     },
     "node_modules/netmask": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/ng-morph": {
-      "version": "2.1.0",
-      "license": "Apache-2.0",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/ng-morph/-/ng-morph-4.0.5.tgz",
+      "integrity": "sha512-5tnlb5WrGKeo2E7VRcV7ZHhScyNgliYqpbXqt103kynmfj6Ic8kzhJAhHu9iLkF1yRnKv2kyCE+O7UGZx5RraQ==",
       "optional": true,
       "dependencies": {
-        "jsonc-parser": "3.0.0",
-        "minimatch": "3.0.4",
+        "jsonc-parser": "3.2.0",
+        "minimatch": "9.0.3",
         "multimatch": "5.0.0",
-        "ts-morph": "10.0.2"
+        "ts-morph": "21.0.1",
+        "tslib": "2.6.2"
       },
       "peerDependencies": {
         "@angular-devkit/core": ">=11.0.0",
         "@angular-devkit/schematics": ">=11.0.0"
       }
     },
-    "node_modules/ng-morph/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/ng-morph/node_modules/jsonc-parser": {
-      "version": "3.0.0",
-      "license": "MIT",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
       "optional": true
     },
     "node_modules/ng-morph/node_modules/minimatch": {
-      "version": "3.0.4",
-      "license": "ISC",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "optional": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/ng-morph/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "optional": true
+    },
     "node_modules/ng-packagr": {
-      "version": "14.2.1",
+      "version": "14.2.2",
+      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-14.2.2.tgz",
+      "integrity": "sha512-AqwHcMM6x+JkCHT++IsbulnTdyoXcC2Cr4tbPamuieacc77+fFbB195hdcqEFwsKX5410cymx/ZUyHird9rxlg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@rollup/plugin-json": "^4.1.0",
         "@rollup/plugin-node-resolve": "^13.1.3",
@@ -11034,7 +10840,8 @@
     },
     "node_modules/ng-qrcode": {
       "version": "7.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ng-qrcode/-/ng-qrcode-7.0.0.tgz",
+      "integrity": "sha512-Mx7nf8rtGMVYxGe2qfy8/JNiCnxKD7uFsqpP2Hm5eJSQrOEapQl9FR0yuK0I4MMQorJ7s8mZZDxmszQiH8R2Kg==",
       "dependencies": {
         "qrcode": "^1.5.0",
         "tslib": "^2.4.0"
@@ -11046,9 +10853,10 @@
     },
     "node_modules/nice-napi": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
+      "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "!win32"
@@ -11060,27 +10868,31 @@
     },
     "node_modules/node-addon-api": {
       "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
       "dev": true,
-      "license": "MIT",
       "optional": true
     },
     "node_modules/node-forge": {
       "version": "1.3.1",
-      "license": "(BSD-3-Clause OR GPL-2.0)",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "engines": {
         "node": ">= 6.13.0"
       }
     },
     "node_modules/node-gyp": {
-      "version": "9.1.0",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz",
+      "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
+        "exponential-backoff": "^3.1.1",
         "glob": "^7.1.4",
         "graceful-fs": "^4.2.6",
         "make-fetch-happen": "^10.0.3",
-        "nopt": "^5.0.0",
+        "nopt": "^6.0.0",
         "npmlog": "^6.0.0",
         "rimraf": "^3.0.2",
         "semver": "^7.3.5",
@@ -11091,13 +10903,14 @@
         "node-gyp": "bin/node-gyp.js"
       },
       "engines": {
-        "node": "^12.22 || ^14.13 || >=16"
+        "node": "^12.13 || ^14.13 || >=16"
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.5.0",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
+      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "bin": {
         "node-gyp-build": "bin.js",
@@ -11107,8 +10920,9 @@
     },
     "node_modules/node-gyp/node_modules/brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -11116,8 +10930,10 @@
     },
     "node_modules/node-gyp/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11135,8 +10951,9 @@
     },
     "node_modules/node-gyp/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -11146,8 +10963,9 @@
     },
     "node_modules/node-html-parser": {
       "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz",
+      "integrity": "sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "css-select": "^4.2.1",
         "he": "1.2.0"
@@ -11155,7 +10973,8 @@
     },
     "node_modules/node-jose": {
       "version": "2.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.2.0.tgz",
+      "integrity": "sha512-XPCvJRr94SjLrSIm4pbYHKLEaOsDvJCpyFw/6V/KK/IXmyZ6SFBzAUDO9HQf4DB/nTEFcRGH87mNciOP23kFjw==",
       "dependencies": {
         "base64url": "^3.0.1",
         "buffer": "^6.0.3",
@@ -11169,35 +10988,43 @@
       }
     },
     "node_modules/node-jose/node_modules/uuid": {
-      "version": "9.0.0",
-      "license": "MIT",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.6",
-      "dev": true,
-      "license": "MIT"
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "dev": true
     },
     "node_modules/nopt": {
-      "version": "5.0.0",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
+      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
-        "abbrev": "1"
+        "abbrev": "^1.0.0"
       },
       "bin": {
         "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/normalize-package-data": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-4.0.1.tgz",
+      "integrity": "sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==",
       "devOptional": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^5.0.0",
         "is-core-module": "^2.8.1",
@@ -11210,32 +11037,36 @@
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/normalize-range": {
       "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/npm-bundled": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "node_modules/npm-install-checks": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-5.0.0.tgz",
+      "integrity": "sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==",
       "devOptional": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "semver": "^7.1.1"
       },
@@ -11245,13 +11076,15 @@
     },
     "node_modules/npm-normalize-package-bin": {
       "version": "1.0.1",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+      "devOptional": true
     },
     "node_modules/npm-package-arg": {
       "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.1.0.tgz",
+      "integrity": "sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "hosted-git-info": "^5.0.0",
         "proc-log": "^2.0.1",
@@ -11264,8 +11097,9 @@
     },
     "node_modules/npm-packlist": {
       "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.3.tgz",
+      "integrity": "sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^8.0.1",
         "ignore-walk": "^5.0.1",
@@ -11281,8 +11115,9 @@
     },
     "node_modules/npm-packlist/node_modules/npm-bundled": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-2.0.1.tgz",
+      "integrity": "sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "npm-normalize-package-bin": "^2.0.0"
       },
@@ -11292,16 +11127,18 @@
     },
     "node_modules/npm-packlist/node_modules/npm-normalize-package-bin": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz",
+      "integrity": "sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/npm-pick-manifest": {
       "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz",
+      "integrity": "sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "npm-install-checks": "^5.0.0",
         "npm-normalize-package-bin": "^1.0.1",
@@ -11314,8 +11151,9 @@
     },
     "node_modules/npm-registry-fetch": {
       "version": "13.3.1",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz",
+      "integrity": "sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "make-fetch-happen": "^10.0.6",
         "minipass": "^3.1.6",
@@ -11331,8 +11169,9 @@
     },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -11342,8 +11181,10 @@
     },
     "node_modules/npmlog": {
       "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+      "deprecated": "This package is no longer supported.",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "are-we-there-yet": "^3.0.0",
         "console-control-strings": "^1.1.0",
@@ -11356,8 +11197,9 @@
     },
     "node_modules/nth-check": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -11366,31 +11208,10 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.4",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -11400,13 +11221,15 @@
     },
     "node_modules/obuf": {
       "version": "1.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -11416,23 +11239,26 @@
     },
     "node_modules/on-headers": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/once": {
       "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/onetime": {
       "version": "5.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -11445,8 +11271,9 @@
     },
     "node_modules/open": {
       "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -11461,24 +11288,27 @@
     },
     "node_modules/opencollective-postinstall": {
       "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
+      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "opencollective-postinstall": "index.js"
       }
     },
     "node_modules/opener": {
       "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true,
-      "license": "(WTFPL OR MIT)",
       "bin": {
         "opener": "bin/opener-bin.js"
       }
     },
     "node_modules/optionator": {
       "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -11493,7 +11323,8 @@
     },
     "node_modules/ora": {
       "version": "5.4.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
       "dependencies": {
         "bl": "^4.1.0",
         "chalk": "^4.1.0",
@@ -11514,7 +11345,8 @@
     },
     "node_modules/ora/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -11527,7 +11359,8 @@
     },
     "node_modules/ora/node_modules/chalk": {
       "version": "4.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -11541,7 +11374,8 @@
     },
     "node_modules/ora/node_modules/color-convert": {
       "version": "2.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -11551,18 +11385,21 @@
     },
     "node_modules/ora/node_modules/color-name": {
       "version": "1.1.4",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/ora/node_modules/has-flag": {
       "version": "4.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ora/node_modules/supports-color": {
       "version": "7.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -11572,8 +11409,9 @@
     },
     "node_modules/os-name": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
+      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "macos-release": "^2.5.0",
         "windows-release": "^4.0.0"
@@ -11587,15 +11425,17 @@
     },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/p-limit": {
       "version": "2.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -11608,7 +11448,8 @@
     },
     "node_modules/p-locate": {
       "version": "4.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -11618,8 +11459,9 @@
     },
     "node_modules/p-map": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -11632,8 +11474,9 @@
     },
     "node_modules/p-retry": {
       "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/retry": "0.12.0",
         "retry": "^0.13.1"
@@ -11644,23 +11487,26 @@
     },
     "node_modules/p-retry/node_modules/retry": {
       "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/p-try": {
       "version": "2.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/pac-proxy-agent": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -11678,16 +11524,18 @@
     },
     "node_modules/pac-proxy-agent/node_modules/@tootallnate/once": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -11699,8 +11547,9 @@
     },
     "node_modules/pac-proxy-agent/node_modules/socks-proxy-agent": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "agent-base": "^6.0.2",
         "debug": "4",
@@ -11712,8 +11561,9 @@
     },
     "node_modules/pac-resolver": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.1.tgz",
+      "integrity": "sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "degenerator": "^3.0.2",
         "ip": "^1.1.5",
@@ -11723,15 +11573,11 @@
         "node": ">= 8"
       }
     },
-    "node_modules/pac-resolver/node_modules/ip": {
-      "version": "1.1.8",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/pacote": {
       "version": "13.6.2",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-13.6.2.tgz",
+      "integrity": "sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "@npmcli/git": "^3.0.0",
         "@npmcli/installed-package-contents": "^1.0.7",
@@ -11763,13 +11609,15 @@
       }
     },
     "node_modules/pako": {
-      "version": "2.0.4",
-      "license": "(MIT AND Zlib)"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -11779,8 +11627,9 @@
     },
     "node_modules/parse-json": {
       "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -11796,19 +11645,22 @@
     },
     "node_modules/parse-node-version": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/parse5": {
       "version": "6.0.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
     },
     "node_modules/parse5-html-rewriting-stream": {
       "version": "6.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz",
+      "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==",
       "dependencies": {
         "parse5": "^6.0.1",
         "parse5-sax-parser": "^6.0.1"
@@ -11816,23 +11668,26 @@
     },
     "node_modules/parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "parse5": "^6.0.1"
       }
     },
     "node_modules/parse5-sax-parser": {
       "version": "6.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz",
+      "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==",
       "dependencies": {
         "parse5": "^6.0.1"
       }
     },
     "node_modules/parseurl": {
       "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11843,53 +11698,61 @@
     },
     "node_modules/path-browserify": {
       "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
       "optional": true
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/path-key": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-parse": {
       "version": "1.0.7",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "devOptional": true
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+      "dev": true
     },
     "node_modules/path-type": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/pbkdf2": {
       "version": "3.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
       "dependencies": {
         "create-hash": "^1.1.2",
         "create-hmac": "^1.1.4",
@@ -11902,14 +11765,16 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -11919,8 +11784,9 @@
     },
     "node_modules/pidtree": {
       "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
+      "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "pidtree": "bin/pidtree.js"
       },
@@ -11930,16 +11796,18 @@
     },
     "node_modules/pify": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/piscina": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz",
+      "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eventemitter-asyncresource": "^1.0.0",
         "hdr-histogram-js": "^2.0.1",
@@ -11951,8 +11819,9 @@
     },
     "node_modules/pkg-dir": {
       "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -11962,21 +11831,25 @@
     },
     "node_modules/please-upgrade-node": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver-compare": "^1.0.0"
       }
     },
     "node_modules/pngjs": {
       "version": "5.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
+      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
       "engines": {
         "node": ">=10.13.0"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.16",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "funding": [
         {
@@ -11986,11 +11859,14 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -12000,8 +11876,9 @@
     },
     "node_modules/postcss-attribute-case-insensitive": {
       "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -12018,8 +11895,9 @@
     },
     "node_modules/postcss-clamp": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
+      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12032,8 +11910,9 @@
     },
     "node_modules/postcss-color-functional-notation": {
       "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12050,8 +11929,9 @@
     },
     "node_modules/postcss-color-hex-alpha": {
       "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
+      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12068,8 +11948,9 @@
     },
     "node_modules/postcss-color-rebeccapurple": {
       "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12086,8 +11967,9 @@
     },
     "node_modules/postcss-custom-media": {
       "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
+      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12103,9 +11985,10 @@
       }
     },
     "node_modules/postcss-custom-properties": {
-      "version": "12.1.9",
+      "version": "12.1.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
+      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12122,8 +12005,9 @@
     },
     "node_modules/postcss-custom-selectors": {
       "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
+      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.4"
       },
@@ -12140,8 +12024,9 @@
     },
     "node_modules/postcss-dir-pseudo-class": {
       "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -12158,8 +12043,9 @@
     },
     "node_modules/postcss-double-position-gradients": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -12177,8 +12063,9 @@
     },
     "node_modules/postcss-env-function": {
       "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
+      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12191,8 +12078,9 @@
     },
     "node_modules/postcss-focus-visible": {
       "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -12205,8 +12093,9 @@
     },
     "node_modules/postcss-focus-within": {
       "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -12219,16 +12108,18 @@
     },
     "node_modules/postcss-font-variant": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.1.0"
       }
     },
     "node_modules/postcss-gap-properties": {
       "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
       "dev": true,
-      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -12242,8 +12133,9 @@
     },
     "node_modules/postcss-image-set-function": {
       "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12260,8 +12152,9 @@
     },
     "node_modules/postcss-import": {
       "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.0.0.tgz",
+      "integrity": "sha512-Y20shPQ07RitgBGv2zvkEAu9bqvrD77C9axhj/aA1BQj4czape2MdClCExvB27EwYEJdGgKZBpKanb0t1rK2Kg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
@@ -12276,16 +12169,18 @@
     },
     "node_modules/postcss-initial": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.0.0"
       }
     },
     "node_modules/postcss-lab-function": {
       "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -12303,8 +12198,9 @@
     },
     "node_modules/postcss-loader": {
       "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.1.tgz",
+      "integrity": "sha512-VRviFEyYlLjctSM93gAZtcJJ/iSkPZ79zWbN/1fSH+NisBByEiVLqpdVDrPLVSi8DX0oJo12kL/GppTBdKVXiQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cosmiconfig": "^7.0.0",
         "klona": "^2.0.5",
@@ -12324,8 +12220,9 @@
     },
     "node_modules/postcss-logical": {
       "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
       "dev": true,
-      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -12335,8 +12232,9 @@
     },
     "node_modules/postcss-media-minmax": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -12345,9 +12243,10 @@
       }
     },
     "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -12356,9 +12255,10 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
@@ -12372,9 +12272,10 @@
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "postcss-selector-parser": "^6.0.4"
       },
@@ -12387,8 +12288,9 @@
     },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "icss-utils": "^5.0.0"
       },
@@ -12401,8 +12303,9 @@
     },
     "node_modules/postcss-nesting": {
       "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.0",
         "postcss-selector-parser": "^6.0.10"
@@ -12419,7 +12322,9 @@
       }
     },
     "node_modules/postcss-opacity-percentage": {
-      "version": "1.1.2",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
+      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
       "dev": true,
       "funding": [
         {
@@ -12431,15 +12336,18 @@
           "url": "https://liberapay.com/mrcgrtz"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-overflow-shorthand": {
       "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12456,16 +12364,18 @@
     },
     "node_modules/postcss-page-break": {
       "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8"
       }
     },
     "node_modules/postcss-place": {
       "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12482,8 +12392,9 @@
     },
     "node_modules/postcss-preset-env": {
       "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.0.tgz",
+      "integrity": "sha512-leqiqLOellpLKfbHkD06E04P6d9ZQ24mat6hu4NSqun7WG0UhspHR5Myiv/510qouCjoo4+YJtNOqg5xHaFnCA==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-cascade-layers": "^1.0.5",
         "@csstools/postcss-color-function": "^1.1.1",
@@ -12548,8 +12459,9 @@
     },
     "node_modules/postcss-pseudo-class-any-link": {
       "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
       "dev": true,
-      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -12566,16 +12478,18 @@
     },
     "node_modules/postcss-replace-overflow-wrap": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.0.3"
       }
     },
     "node_modules/postcss-selector-not": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -12591,9 +12505,10 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
+      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -12604,8 +12519,9 @@
     },
     "node_modules/postcss-url": {
       "version": "10.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-10.1.3.tgz",
+      "integrity": "sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "make-dir": "~3.1.0",
         "mime": "~2.5.2",
@@ -12621,8 +12537,9 @@
     },
     "node_modules/postcss-url/node_modules/brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -12630,8 +12547,9 @@
     },
     "node_modules/postcss-url/node_modules/mime": {
       "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -12641,8 +12559,9 @@
     },
     "node_modules/postcss-url/node_modules/minimatch": {
       "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+      "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -12652,20 +12571,24 @@
     },
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
     },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
       "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/prettier": {
-      "version": "2.7.1",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -12678,8 +12601,9 @@
     },
     "node_modules/pretty-bytes": {
       "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -12689,33 +12613,38 @@
     },
     "node_modules/proc-log": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz",
+      "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/process": {
       "version": "0.11.10",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
       "engines": {
         "node": ">= 0.6.0"
       }
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
     "node_modules/promise-inflight": {
       "version": "1.0.1",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "devOptional": true
     },
     "node_modules/promise-retry": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "err-code": "^2.0.2",
         "retry": "^0.12.0"
@@ -12726,8 +12655,9 @@
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -12738,16 +12668,18 @@
     },
     "node_modules/proxy-addr/node_modules/ipaddr.js": {
       "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/proxy-agent": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "agent-base": "^6.0.0",
         "debug": "4",
@@ -12764,16 +12696,18 @@
     },
     "node_modules/proxy-agent/node_modules/@tootallnate/once": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/proxy-agent/node_modules/http-proxy-agent": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -12783,18 +12717,11 @@
         "node": ">= 6"
       }
     },
-    "node_modules/proxy-agent/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
     "node_modules/proxy-agent/node_modules/socks-proxy-agent": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "agent-base": "^6.0.2",
         "debug": "4",
@@ -12804,41 +12731,41 @@
         "node": ">= 6"
       }
     },
-    "node_modules/proxy-agent/node_modules/yallist": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
     },
     "node_modules/prr": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true,
-      "license": "MIT",
       "optional": true
     },
     "node_modules/pump": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
       }
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "license": "MIT",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/qrcode": {
-      "version": "1.5.1",
-      "license": "MIT",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.3.tgz",
+      "integrity": "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==",
       "dependencies": {
         "dijkstrajs": "^1.0.1",
         "encode-utf8": "^1.0.3",
@@ -12854,7 +12781,8 @@
     },
     "node_modules/qrcode/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12867,7 +12795,8 @@
     },
     "node_modules/qrcode/node_modules/cliui": {
       "version": "6.0.0",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -12876,7 +12805,8 @@
     },
     "node_modules/qrcode/node_modules/color-convert": {
       "version": "2.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12886,11 +12816,13 @@
     },
     "node_modules/qrcode/node_modules/color-name": {
       "version": "1.1.4",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/qrcode/node_modules/wrap-ansi": {
       "version": "6.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -12902,11 +12834,13 @@
     },
     "node_modules/qrcode/node_modules/y18n": {
       "version": "4.0.3",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
     },
     "node_modules/qrcode/node_modules/yargs": {
       "version": "15.4.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dependencies": {
         "cliui": "^6.0.0",
         "decamelize": "^1.2.0",
@@ -12926,7 +12860,8 @@
     },
     "node_modules/qrcode/node_modules/yargs-parser": {
       "version": "18.1.3",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -12936,11 +12871,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.11.0",
+      "version": "6.12.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.2.tgz",
+      "integrity": "sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -12951,6 +12887,8 @@
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "devOptional": true,
       "funding": [
         {
@@ -12965,29 +12903,31 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
     "node_modules/range-parser": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -13000,8 +12940,9 @@
     },
     "node_modules/raw-loader": {
       "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
+      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "loader-utils": "^2.0.0",
         "schema-utils": "^3.0.0"
@@ -13019,8 +12960,9 @@
     },
     "node_modules/raw-loader/node_modules/ajv": {
       "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -13034,21 +12976,24 @@
     },
     "node_modules/raw-loader/node_modules/ajv-keywords": {
       "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
     },
     "node_modules/raw-loader/node_modules/json-schema-traverse": {
       "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/raw-loader/node_modules/loader-utils": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -13059,9 +13004,10 @@
       }
     },
     "node_modules/raw-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -13077,16 +13023,19 @@
     },
     "node_modules/read-cache": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pify": "^2.3.0"
       }
     },
     "node_modules/read-package-json": {
       "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-5.0.2.tgz",
+      "integrity": "sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q==",
+      "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^8.0.1",
         "json-parse-even-better-errors": "^2.3.1",
@@ -13099,8 +13048,9 @@
     },
     "node_modules/read-package-json-fast": {
       "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "json-parse-even-better-errors": "^2.3.0",
         "npm-normalize-package-bin": "^1.0.1"
@@ -13111,15 +13061,17 @@
     },
     "node_modules/read-package-json/node_modules/npm-normalize-package-bin": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz",
+      "integrity": "sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "license": "MIT",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -13131,8 +13083,9 @@
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -13141,19 +13094,22 @@
       }
     },
     "node_modules/reflect-metadata": {
-      "version": "0.1.13",
-      "dev": true,
-      "license": "Apache-2.0"
+      "version": "0.1.14",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz",
+      "integrity": "sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==",
+      "dev": true
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.0",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -13163,47 +13119,47 @@
     },
     "node_modules/regenerator-runtime": {
       "version": "0.13.9",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
     },
     "node_modules/regenerator-transform": {
-      "version": "0.15.0",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
     },
     "node_modules/regex-parser": {
-      "version": "2.2.11",
-      "dev": true,
-      "license": "MIT"
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
+      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
+      "dev": true
     },
     "node_modules/regexpu-core": {
-      "version": "5.2.1",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
+        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.1.0",
-        "regjsgen": "^0.7.1",
         "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
+        "unicode-match-property-value-ecmascript": "^2.1.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/regjsgen": {
-      "version": "0.7.1",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/regjsparser": {
       "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "jsesc": "~0.5.0"
       },
@@ -13213,6 +13169,8 @@
     },
     "node_modules/regjsparser/node_modules/jsesc": {
       "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
       "dev": true,
       "bin": {
         "jsesc": "bin/jsesc"
@@ -13220,31 +13178,36 @@
     },
     "node_modules/require-directory": {
       "version": "2.1.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
     },
     "node_modules/resolve": {
       "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
@@ -13259,16 +13222,18 @@
     },
     "node_modules/resolve-from": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/resolve-url-loader": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+      "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "adjust-sourcemap-loader": "^4.0.0",
         "convert-source-map": "^1.7.0",
@@ -13282,8 +13247,9 @@
     },
     "node_modules/resolve-url-loader/node_modules/loader-utils": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -13295,15 +13261,17 @@
     },
     "node_modules/resolve-url-loader/node_modules/source-map": {
       "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -13314,30 +13282,35 @@
     },
     "node_modules/retry": {
       "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/reusify": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.0",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -13350,8 +13323,9 @@
     },
     "node_modules/rimraf/node_modules/brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -13359,8 +13333,10 @@
     },
     "node_modules/rimraf/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -13378,8 +13354,9 @@
     },
     "node_modules/rimraf/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13389,16 +13366,18 @@
     },
     "node_modules/ripemd160": {
       "version": "2.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
       }
     },
     "node_modules/rollup": {
-      "version": "2.79.0",
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -13411,8 +13390,9 @@
     },
     "node_modules/rollup-plugin-sourcemaps": {
       "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz",
+      "integrity": "sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^3.0.9",
         "source-map-resolve": "^0.6.0"
@@ -13432,22 +13412,26 @@
     },
     "node_modules/rsvp": {
       "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "0.12.* || 4.* || 6.* || >= 7.*"
       }
     },
     "node_modules/run-async": {
       "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "devOptional": true,
       "funding": [
         {
@@ -13463,7 +13447,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -13477,18 +13460,35 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "license": "MIT"
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "devOptional": true
     },
     "node_modules/sass": {
       "version": "1.54.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.54.4.tgz",
+      "integrity": "sha512-3tmF16yvnBwtlPrNBHw/H907j8MlOX8aTBnlNX1yrKx24RKcJGPyLhFUwkoKBKesR3unP93/2z14Ll8NicwQUA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -13503,8 +13503,9 @@
     },
     "node_modules/sass-loader": {
       "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz",
+      "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "klona": "^2.0.4",
         "neo-async": "^2.6.2"
@@ -13540,13 +13541,15 @@
     },
     "node_modules/sax": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+      "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==",
+      "dev": true
     },
     "node_modules/schema-utils": {
       "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.5",
         "ajv": "^6.12.4",
@@ -13562,8 +13565,9 @@
     },
     "node_modules/schema-utils/node_modules/ajv": {
       "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -13577,27 +13581,32 @@
     },
     "node_modules/schema-utils/node_modules/ajv-keywords": {
       "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
     },
     "node_modules/schema-utils/node_modules/json-schema-traverse": {
       "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "dev": true
     },
     "node_modules/selfsigned": {
-      "version": "2.1.1",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
+        "@types/node-forge": "^1.3.0",
         "node-forge": "^1"
       },
       "engines": {
@@ -13605,9 +13614,10 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.7",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -13620,13 +13630,15 @@
     },
     "node_modules/semver-compare": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "dev": true
     },
     "node_modules/semver-regex": {
       "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.4.tgz",
+      "integrity": "sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -13636,8 +13648,9 @@
     },
     "node_modules/semver/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -13645,10 +13658,17 @@
         "node": ">=10"
       }
     },
+    "node_modules/semver/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "devOptional": true
+    },
     "node_modules/send": {
       "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -13670,24 +13690,18 @@
     },
     "node_modules/send/node_modules/debug": {
       "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/send/node_modules/depd": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
@@ -13703,21 +13717,24 @@
     },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.0",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
     "node_modules/serve-index": {
       "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -13733,16 +13750,27 @@
     },
     "node_modules/serve-index/node_modules/debug": {
       "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/serve-index/node_modules/http-errors": {
       "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
@@ -13755,31 +13783,36 @@
     },
     "node_modules/serve-index/node_modules/inherits": {
       "version": "2.0.3",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
     },
     "node_modules/serve-index/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
     },
     "node_modules/serve-index/node_modules/statuses": {
       "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/serve-static": {
       "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -13792,16 +13825,36 @@
     },
     "node_modules/set-blocking": {
       "version": "2.0.0",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
     },
     "node_modules/sha.js": {
       "version": "2.4.11",
-      "license": "(MIT AND BSD-3-Clause)",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dependencies": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -13812,8 +13865,9 @@
     },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "kind-of": "^6.0.2"
       },
@@ -13823,8 +13877,9 @@
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -13834,20 +13889,26 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13855,16 +13916,18 @@
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/sirv": {
-      "version": "1.0.19",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@polka/url": "^1.0.0-next.20",
-        "mrmime": "^1.0.0",
-        "totalist": "^1.0.0"
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
       },
       "engines": {
         "node": ">= 10"
@@ -13872,8 +13935,9 @@
     },
     "node_modules/slash": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -13883,8 +13947,9 @@
     },
     "node_modules/slice-ansi": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -13899,8 +13964,9 @@
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13913,8 +13979,9 @@
     },
     "node_modules/slice-ansi/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13924,13 +13991,15 @@
     },
     "node_modules/slice-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -13938,8 +14007,9 @@
     },
     "node_modules/sockjs": {
       "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "faye-websocket": "^0.11.3",
         "uuid": "^8.3.2",
@@ -13947,22 +14017,24 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.7.0",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "ip": "^2.0.0",
+        "ip-address": "^9.0.5",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
-        "node": ">= 10.13.0",
+        "node": ">= 10.0.0",
         "npm": ">= 3.0.0"
       }
     },
     "node_modules/socks-proxy-agent": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "agent-base": "^6.0.2",
         "debug": "^4.3.3",
@@ -13974,23 +14046,26 @@
     },
     "node_modules/source-map": {
       "version": "0.7.4",
-      "license": "BSD-3-Clause",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/source-map-loader": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.0.tgz",
+      "integrity": "sha512-i3KVgM3+QPAHNbGavK+VBq03YoJl24m9JWNbLgsjTj8aJzXG9M61bantBTNBt7CNwY2FYf+RJRYJ3pzalKjIrw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "iconv-lite": "^0.6.3",
@@ -14009,8 +14084,9 @@
     },
     "node_modules/source-map-loader/node_modules/iconv-lite": {
       "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -14020,8 +14096,10 @@
     },
     "node_modules/source-map-resolve": {
       "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0"
@@ -14029,8 +14107,9 @@
     },
     "node_modules/source-map-support": {
       "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -14038,48 +14117,56 @@
     },
     "node_modules/source-map-support/node_modules/source-map": {
       "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/sourcemap-codec": {
       "version": "1.4.8",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
     },
     "node_modules/spdx-correct": {
-      "version": "3.1.1",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "devOptional": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "devOptional": true,
-      "license": "CC-BY-3.0"
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "devOptional": true
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.12",
-      "devOptional": true,
-      "license": "CC0-1.0"
+      "version": "3.0.18",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
+      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "devOptional": true
     },
     "node_modules/spdy": {
       "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "handle-thing": "^2.0.0",
@@ -14093,8 +14180,9 @@
     },
     "node_modules/spdy-transport": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "detect-node": "^2.0.4",
@@ -14106,30 +14194,35 @@
     },
     "node_modules/split2": {
       "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "readable-stream": "^3.0.0"
       }
     },
     "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "devOptional": true
     },
     "node_modules/ssh-config": {
       "version": "1.1.6",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz",
+      "integrity": "sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==",
+      "dev": true
     },
     "node_modules/ssr-window": {
       "version": "4.0.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.2.tgz",
+      "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ=="
     },
     "node_modules/ssri": {
       "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
+      "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "minipass": "^3.1.1"
       },
@@ -14139,25 +14232,28 @@
     },
     "node_modules/statuses": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/stream-combiner2": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
       }
     },
     "node_modules/stream-combiner2/node_modules/readable-stream": {
-      "version": "2.3.7",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -14168,50 +14264,42 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/stream-combiner2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/stream-combiner2/node_modules/string_decoder": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/string_decoder": {
       "version": "1.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/string-argv": {
-      "version": "0.3.1",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
+      "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6.19"
       }
     },
     "node_modules/string-width": {
       "version": "4.2.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -14223,7 +14311,8 @@
     },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -14233,16 +14322,18 @@
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/stylus": {
       "version": "0.59.0",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.59.0.tgz",
+      "integrity": "sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@adobe/css-tools": "^4.0.1",
         "debug": "^4.3.2",
@@ -14262,8 +14353,9 @@
     },
     "node_modules/stylus-loader": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-7.0.0.tgz",
+      "integrity": "sha512-WTbtLrNfOfLgzTaR9Lj/BPhQroKk/LC1hfTXSUbrxmxgfUo3Y3LpmKRVA2R1XbjvTAvOfaian9vOyfv1z99E+A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-glob": "^3.2.11",
         "klona": "^2.0.5",
@@ -14283,8 +14375,9 @@
     },
     "node_modules/stylus/node_modules/brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -14292,8 +14385,10 @@
     },
     "node_modules/stylus/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -14311,8 +14406,9 @@
     },
     "node_modules/stylus/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -14322,13 +14418,16 @@
     },
     "node_modules/stylus/node_modules/sax": {
       "version": "1.2.4",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
     },
     "node_modules/superagent": {
       "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
+      "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
+      "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.2",
@@ -14348,8 +14447,9 @@
     },
     "node_modules/superagent-proxy": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-3.0.0.tgz",
+      "integrity": "sha512-wAlRInOeDFyd9pyonrkJspdRAxdLrcsZ6aSnS+8+nu4x1aXbz6FWSTT9M6Ibze+eG60szlL7JA8wEIV7bPWuyQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.3.2",
         "proxy-agent": "^5.0.0"
@@ -14363,8 +14463,9 @@
     },
     "node_modules/superagent/node_modules/mime": {
       "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -14374,8 +14475,9 @@
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -14385,8 +14487,9 @@
     },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -14395,7 +14498,9 @@
       }
     },
     "node_modules/swiper": {
-      "version": "8.4.2",
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-8.4.7.tgz",
+      "integrity": "sha512-VwO/KU3i9IV2Sf+W2NqyzwWob4yX9Qdedq6vBtS0rFqJ6Fa5iLUJwxQkuD4I38w0WDJwmFl8ojkdcRFPHWD+2g==",
       "funding": [
         {
           "type": "patreon",
@@ -14407,7 +14512,6 @@
         }
       ],
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
         "dom7": "^4.0.4",
         "ssr-window": "^4.0.2"
@@ -14418,40 +14522,59 @@
     },
     "node_modules/symbol-observable": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
+      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
     },
     "node_modules/tapable": {
       "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tar": {
-      "version": "6.1.11",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
+        "minipass": "^5.0.0",
         "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=8"
       }
     },
+    "node_modules/tar/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "devOptional": true
+    },
     "node_modules/terser": {
       "version": "5.14.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.2",
         "acorn": "^8.5.0",
@@ -14466,15 +14589,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.6",
+      "version": "5.3.10",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.14",
+        "@jridgewell/trace-mapping": "^0.3.20",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "terser": "^5.14.1"
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -14500,8 +14624,9 @@
     },
     "node_modules/terser-webpack-plugin/node_modules/ajv": {
       "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -14515,21 +14640,30 @@
     },
     "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
       "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
     },
+    "node_modules/terser-webpack-plugin/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
     "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
       "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -14543,15 +14677,35 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/terser-webpack-plugin/node_modules/terser": {
+      "version": "5.31.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz",
+      "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -14563,8 +14717,9 @@
     },
     "node_modules/test-exclude/node_modules/brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -14572,8 +14727,10 @@
     },
     "node_modules/test-exclude/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -14591,8 +14748,9 @@
     },
     "node_modules/test-exclude/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -14602,27 +14760,32 @@
     },
     "node_modules/text-mask-core": {
       "version": "5.1.2",
-      "license": "Unlicense"
+      "resolved": "https://registry.npmjs.org/text-mask-core/-/text-mask-core-5.1.2.tgz",
+      "integrity": "sha512-VfkCMdmRRZqXgQZFlDMiavm3hzsMzBM23CxHZsaeAYg66ZhXCNJWrFmnJwNy8KF9f74YvAUAuQenxsMCfuvhUw=="
     },
     "node_modules/text-table": {
       "version": "0.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
     },
     "node_modules/through": {
       "version": "2.3.8",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "devOptional": true
     },
     "node_modules/thunky": {
       "version": "1.1.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
     },
     "node_modules/tmp": {
       "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "os-tmpdir": "~1.0.2"
       },
@@ -14632,16 +14795,18 @@
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -14651,24 +14816,27 @@
     },
     "node_modules/toidentifier": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
     },
     "node_modules/totalist": {
-      "version": "1.1.0",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tree-kill": {
       "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "tree-kill": "cli.js"
       }
@@ -14679,18 +14847,20 @@
       "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
     },
     "node_modules/ts-morph": {
-      "version": "10.0.2",
-      "license": "MIT",
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-21.0.1.tgz",
+      "integrity": "sha512-dbDtVdEAncKctzrVZ+Nr7kHpHkv+0JDJb2MjjpBaj8bFeCkePU9rHfMklmhuLFnpeq/EJZk2IhStY6NzqgjOkg==",
       "optional": true,
       "dependencies": {
-        "@ts-morph/common": "~0.9.0",
-        "code-block-writer": "^10.1.1"
+        "@ts-morph/common": "~0.22.0",
+        "code-block-writer": "^12.0.0"
       }
     },
     "node_modules/ts-node": {
-      "version": "10.9.1",
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -14730,13 +14900,16 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.4.0",
-      "license": "0BSD"
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
     },
     "node_modules/tslint": {
       "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
+      "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
+      "deprecated": "TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information.",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
@@ -14764,16 +14937,18 @@
     },
     "node_modules/tslint/node_modules/argparse": {
       "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/tslint/node_modules/brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -14781,21 +14956,25 @@
     },
     "node_modules/tslint/node_modules/builtin-modules": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/tslint/node_modules/commander": {
       "version": "2.20.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
     },
     "node_modules/tslint/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -14813,8 +14992,9 @@
     },
     "node_modules/tslint/node_modules/js-yaml": {
       "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -14825,8 +15005,9 @@
     },
     "node_modules/tslint/node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -14836,8 +15017,9 @@
     },
     "node_modules/tslint/node_modules/mkdirp": {
       "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -14846,22 +15028,31 @@
       }
     },
     "node_modules/tslint/node_modules/semver": {
-      "version": "5.7.1",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
     },
+    "node_modules/tslint/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
     "node_modules/tslint/node_modules/tslib": {
       "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/tsutils": {
       "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -14871,13 +15062,15 @@
     },
     "node_modules/tsutils/node_modules/tslib": {
       "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/type-check": {
       "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2"
       },
@@ -14887,8 +15080,9 @@
     },
     "node_modules/type-fest": {
       "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "devOptional": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -14898,8 +15092,9 @@
     },
     "node_modules/type-is": {
       "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -14910,21 +15105,24 @@
     },
     "node_modules/typed-assert": {
       "version": "1.0.9",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
+      "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==",
+      "dev": true
     },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-typedarray": "^1.0.0"
       }
     },
     "node_modules/typescript": {
       "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -14935,16 +15133,18 @@
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-match-property-ecmascript": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
         "unicode-property-aliases-ecmascript": "^2.0.0"
@@ -14954,63 +15154,72 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-property-aliases-ecmascript": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unique-filename": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "unique-slug": "^2.0.0"
       }
     },
     "node_modules/unique-slug": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
       }
     },
     "node_modules/universalify": {
-      "version": "2.0.0",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/untildify": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.9",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
       "funding": [
         {
@@ -15020,15 +15229,18 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       },
       "bin": {
-        "browserslist-lint": "cli.js"
+        "update-browserslist-db": "cli.js"
       },
       "peerDependencies": {
         "browserslist": ">= 4.21.0"
@@ -15036,39 +15248,45 @@
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
-      "license": "BSD-2-Clause",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "node_modules/uuid": {
       "version": "8.3.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
     },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "devOptional": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
@@ -15076,8 +15294,9 @@
     },
     "node_modules/validate-npm-package-name": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz",
+      "integrity": "sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "builtins": "^5.0.0"
       },
@@ -15087,16 +15306,19 @@
     },
     "node_modules/vary": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/vm2": {
-      "version": "3.9.11",
+      "version": "3.9.19",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.19.tgz",
+      "integrity": "sha512-J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg==",
+      "deprecated": "The library contains critical security issues and should not be used for production! The maintenance of the project has been discontinued. Consider migrating your code to isolated-vm.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"
@@ -15109,9 +15331,10 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.0",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -15122,47 +15345,51 @@
     },
     "node_modules/wbuf": {
       "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minimalistic-assert": "^1.0.0"
       }
     },
     "node_modules/wcwidth": {
       "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dependencies": {
         "defaults": "^1.0.3"
       }
     },
     "node_modules/webpack": {
-      "version": "5.74.0",
+      "version": "5.92.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
+      "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.10.0",
-        "es-module-lexer": "^0.9.0",
+        "enhanced-resolve": "^5.17.0",
+        "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
+        "graceful-fs": "^4.2.11",
         "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.4.0",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
         "webpack-sources": "^3.2.3"
       },
       "bin": {
@@ -15182,19 +15409,22 @@
       }
     },
     "node_modules/webpack-bundle-analyzer": {
-      "version": "4.8.0",
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
+      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@discoveryjs/json-ext": "0.5.7",
         "acorn": "^8.0.4",
         "acorn-walk": "^8.0.0",
-        "chalk": "^4.1.0",
         "commander": "^7.2.0",
+        "debounce": "^1.2.1",
+        "escape-string-regexp": "^4.0.0",
         "gzip-size": "^6.0.0",
-        "lodash": "^4.17.20",
+        "html-escaper": "^2.0.2",
         "opener": "^1.5.2",
-        "sirv": "^1.0.7",
+        "picocolors": "^1.0.0",
+        "sirv": "^2.0.3",
         "ws": "^7.3.1"
       },
       "bin": {
@@ -15204,102 +15434,32 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/chalk": {
-      "version": "4.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/webpack-bundle-analyzer/node_modules/commander": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
+    "node_modules/webpack-bundle-analyzer/node_modules/escape-string-regexp": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
-      "version": "7.5.9",
-      "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "node": ">=10"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/webpack-dev-middleware": {
       "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^3.4.3",
@@ -15319,14 +15479,15 @@
       }
     },
     "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "4.0.0",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -15338,8 +15499,9 @@
     },
     "node_modules/webpack-dev-server": {
       "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.0.tgz",
+      "integrity": "sha512-L5S4Q2zT57SK7tazgzjMiSMBdsw+rGYIX27MgPgx7LDhWO0lViPrHKoLS7jo5In06PWYAhlYu3PbyoC6yAThbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
@@ -15391,14 +15553,15 @@
       }
     },
     "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "4.0.0",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -15408,10 +15571,32 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/webpack-merge": {
       "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "clone-deep": "^4.0.1",
         "wildcard": "^2.0.0"
@@ -15422,16 +15607,18 @@
     },
     "node_modules/webpack-sources": {
       "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
     },
     "node_modules/webpack-subresource-integrity": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz",
+      "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "typed-assert": "^1.0.8"
       },
@@ -15448,10 +15635,19 @@
         }
       }
     },
+    "node_modules/webpack/node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/webpack/node_modules/ajv": {
       "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -15465,21 +15661,27 @@
     },
     "node_modules/webpack/node_modules/ajv-keywords": {
       "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
     },
     "node_modules/webpack/node_modules/json-schema-traverse": {
       "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true,
-      "license": "MIT"
+      "peer": true
     },
     "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
-      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -15495,8 +15697,9 @@
     },
     "node_modules/websocket-driver": {
       "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
@@ -15508,16 +15711,18 @@
     },
     "node_modules/websocket-extensions": {
       "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/which": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -15529,34 +15734,39 @@
       }
     },
     "node_modules/which-module": {
-      "version": "2.0.0",
-      "license": "ISC"
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
     },
     "node_modules/which-pm-runs": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz",
+      "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/wide-align": {
       "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
     "node_modules/wildcard": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+      "dev": true
     },
     "node_modules/windows-release": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "execa": "^4.0.2"
       },
@@ -15569,8 +15779,9 @@
     },
     "node_modules/windows-release/node_modules/execa": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -15591,8 +15802,9 @@
     },
     "node_modules/windows-release/node_modules/get-stream": {
       "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -15605,24 +15817,27 @@
     },
     "node_modules/windows-release/node_modules/human-signals": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=8.12.0"
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -15637,8 +15852,9 @@
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -15651,8 +15867,9 @@
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -15662,18 +15879,21 @@
     },
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "devOptional": true
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "devOptional": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "devOptional": true
     },
     "node_modules/write-file-atomic": {
       "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
@@ -15682,11 +15902,12 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.8.1",
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=8.3.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
@@ -15703,42 +15924,51 @@
     },
     "node_modules/xregexp": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+      "integrity": "sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": "*"
+      }
     },
     "node_modules/xxhashjs": {
       "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
+      "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cuint": "^0.2.2"
       }
     },
     "node_modules/y18n": {
       "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/yallist": {
-      "version": "4.0.0",
-      "devOptional": true,
-      "license": "ISC"
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
     },
     "node_modules/yaml": {
       "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/yargs": {
       "version": "17.5.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -15754,24 +15984,27 @@
     },
     "node_modules/yargs-parser": {
       "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "devOptional": true,
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/yn": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -15781,7 +16014,8 @@
     },
     "node_modules/zone.js": {
       "version": "0.11.8",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz",
+      "integrity": "sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==",
       "dependencies": {
         "tslib": "^2.3.0"
       }
diff --git a/web/package.json b/web/package.json
index 1db0dead4..e159a2ee5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -43,20 +43,22 @@
     "@angular/service-worker": "^14.2.2",
     "@ionic/angular": "^6.1.15",
     "@materia-ui/ngx-monaco-editor": "^6.0.0",
-    "@ng-web-apis/common": "^2.0.0",
-    "@ng-web-apis/mutation-observer": "^2.0.0",
-    "@ng-web-apis/resize-observer": "^2.0.0",
+    "@ng-web-apis/common": "^3.0.6",
+    "@ng-web-apis/mutation-observer": "^3.2.1",
+    "@ng-web-apis/resize-observer": "^3.2.1",
     "@noble/curves": "^1.4.0",
     "@noble/hashes": "^1.4.0",
     "@start9labs/argon2": "^0.2.2",
     "@start9labs/emver": "^0.1.5",
     "@start9labs/start-sdk": "file:../sdk/dist",
-    "@taiga-ui/addon-charts": "3.20.0",
-    "@taiga-ui/cdk": "3.20.0",
-    "@taiga-ui/core": "3.20.0",
-    "@taiga-ui/icons": "3.20.0",
-    "@taiga-ui/kit": "3.20.0",
+    "@taiga-ui/addon-charts": "3.84.0",
+    "@taiga-ui/cdk": "3.84.0",
+    "@taiga-ui/core": "3.84.0",
+    "@taiga-ui/experimental": "3.84.0",
+    "@taiga-ui/icons": "3.84.0",
+    "@taiga-ui/kit": "3.84.0",
     "@tinkoff/ng-dompurify": "4.0.0",
+    "@tinkoff/ng-event-plugins": "3.2.0",
     "angular-svg-round-progressbar": "^9.0.0",
     "ansi-to-html": "^0.7.2",
     "base64-js": "^1.5.1",
diff --git a/web/projects/setup-wizard/src/app/app.component.ts b/web/projects/setup-wizard/src/app/app.component.ts
index e10d672e5..e07df5870 100644
--- a/web/projects/setup-wizard/src/app/app.component.ts
+++ b/web/projects/setup-wizard/src/app/app.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
 import { NavController } from '@ionic/angular'
+import { ErrorService } from '@start9labs/shared'
 import { ApiService } from './services/api/api.service'
-import { ErrorToastService } from '@start9labs/shared'
 
 @Component({
   selector: 'app-root',
@@ -11,7 +11,7 @@ import { ErrorToastService } from '@start9labs/shared'
 export class AppComponent {
   constructor(
     private readonly apiService: ApiService,
-    private readonly errorToastService: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly navCtrl: NavController,
   ) {}
 
@@ -26,7 +26,7 @@ export class AppComponent {
 
       await this.navCtrl.navigateForward(route)
     } catch (e: any) {
-      this.errorToastService.present(e)
+      this.errorService.handleError(e)
     }
   }
 }
diff --git a/web/projects/setup-wizard/src/app/app.module.ts b/web/projects/setup-wizard/src/app/app.module.ts
index f2ba59012..973ce35ee 100644
--- a/web/projects/setup-wizard/src/app/app.module.ts
+++ b/web/projects/setup-wizard/src/app/app.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { RouteReuseStrategy } from '@angular/router'
 import { HttpClientModule } from '@angular/common/http'
-import { TuiRootModule } from '@taiga-ui/core'
+import { TuiAlertModule, TuiRootModule } from '@taiga-ui/core'
 import { ApiService } from './services/api/api.service'
 import { MockApiService } from './services/api/mock-api.service'
 import { LiveApiService } from './services/api/live-api.service'
@@ -41,6 +41,7 @@ const {
     RecoverPageModule,
     TransferPageModule,
     TuiRootModule,
+    TuiAlertModule,
   ],
   providers: [
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
diff --git a/web/projects/setup-wizard/src/app/pages/attach/attach.page.ts b/web/projects/setup-wizard/src/app/pages/attach/attach.page.ts
index b4d6eb9f9..3b8323798 100644
--- a/web/projects/setup-wizard/src/app/pages/attach/attach.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/attach/attach.page.ts
@@ -4,10 +4,10 @@ import {
   ModalController,
   NavController,
 } from '@ionic/angular'
+import { DiskInfo, ErrorService } from '@start9labs/shared'
+import { PasswordPage } from 'src/app/modals/password/password.page'
 import { ApiService } from 'src/app/services/api/api.service'
-import { DiskInfo, ErrorToastService } from '@start9labs/shared'
 import { StateService } from 'src/app/services/state.service'
-import { PasswordPage } from 'src/app/modals/password/password.page'
 
 @Component({
   selector: 'app-attach',
@@ -21,7 +21,7 @@ export class AttachPage {
   constructor(
     private readonly apiService: ApiService,
     private readonly navCtrl: NavController,
-    private readonly errToastService: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly stateService: StateService,
     private readonly modalCtrl: ModalController,
     private readonly loadingCtrl: LoadingController,
@@ -41,7 +41,7 @@ export class AttachPage {
     try {
       this.drives = await this.apiService.getDrives()
     } catch (e: any) {
-      this.errToastService.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
@@ -70,7 +70,7 @@ export class AttachPage {
       await this.stateService.importDrive(guid, password)
       await this.navCtrl.navigateForward(`/loading`)
     } catch (e: any) {
-      this.errToastService.present(e)
+      this.errorService.handleError(e)
     } finally {
       loader.dismiss()
     }
diff --git a/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts b/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
index 7f7ee6241..110768be5 100644
--- a/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
@@ -5,8 +5,8 @@ import {
   ModalController,
   NavController,
 } from '@ionic/angular'
+import { DiskInfo, ErrorService, GuidPipe } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/api.service'
-import { DiskInfo, ErrorToastService, GuidPipe } from '@start9labs/shared'
 import { StateService } from 'src/app/services/state.service'
 import { PasswordPage } from '../../modals/password/password.page'
 
@@ -27,7 +27,7 @@ export class EmbassyPage {
     private readonly alertCtrl: AlertController,
     private readonly stateService: StateService,
     private readonly loadingCtrl: LoadingController,
-    private readonly errorToastService: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly guidPipe: GuidPipe,
   ) {}
 
@@ -71,7 +71,7 @@ export class EmbassyPage {
         })
       }
     } catch (e: any) {
-      this.errorToastService.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
@@ -148,7 +148,7 @@ export class EmbassyPage {
       await this.stateService.setupEmbassy(logicalname, password)
       await this.navCtrl.navigateForward(`/loading`)
     } catch (e: any) {
-      this.errorToastService.present(e)
+      this.errorService.handleError(e)
     } finally {
       loader.dismiss()
     }
diff --git a/web/projects/setup-wizard/src/app/pages/home/home.page.ts b/web/projects/setup-wizard/src/app/pages/home/home.page.ts
index c0e93d18a..f3d165940 100644
--- a/web/projects/setup-wizard/src/app/pages/home/home.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/home/home.page.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core'
 import { IonicSlides } from '@ionic/angular'
+import { ErrorService } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/api.service'
-import SwiperCore, { Swiper } from 'swiper'
-import { ErrorToastService } from '@start9labs/shared'
 import { StateService } from 'src/app/services/state.service'
+import SwiperCore, { Swiper } from 'swiper'
 
 SwiperCore.use([IonicSlides])
 
@@ -19,7 +19,7 @@ export class HomePage {
 
   constructor(
     private readonly api: ApiService,
-    private readonly errToastService: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly stateService: StateService,
   ) {}
 
@@ -33,7 +33,7 @@ export class HomePage {
       await this.api.getPubKey()
     } catch (e: any) {
       this.error = true
-      this.errToastService.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts b/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
index 459be5c7a..2386c09ec 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core'
 import { NavController } from '@ionic/angular'
-import { Pipe, PipeTransform } from '@angular/core'
+import { ErrorService } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
 import {
-  EMPTY,
-  Observable,
   catchError,
+  EMPTY,
   filter,
   from,
   interval,
   map,
+  Observable,
   of,
   startWith,
   switchMap,
@@ -16,8 +17,6 @@ import {
   tap,
 } from 'rxjs'
 import { ApiService } from 'src/app/services/api/api.service'
-import { ErrorToastService } from '@start9labs/shared'
-import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'app-loading',
@@ -69,7 +68,7 @@ export class LoadingPage {
   constructor(
     private readonly navCtrl: NavController,
     private readonly api: ApiService,
-    private readonly errorToastService: ErrorToastService,
+    private readonly errorService: ErrorService,
   ) {}
 
   private async getStatus(): Promise<{
@@ -96,7 +95,7 @@ export class LoadingPage {
     return from(this.getStatus()).pipe(
       filter(Boolean),
       catchError(e => {
-        this.errorToastService.present(e)
+        this.errorService.handleError(e)
         return of(e)
       }),
       take(1),
diff --git a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
index f9e5adbb1..d47105f24 100644
--- a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core'
 import { ModalController, NavController } from '@ionic/angular'
+import { ErrorService } from '@start9labs/shared'
 import { CifsModal } from 'src/app/modals/cifs-modal/cifs-modal.page'
 import { ApiService, DiskBackupTarget } from 'src/app/services/api/api.service'
-import { ErrorToastService } from '@start9labs/shared'
 import { StateService } from 'src/app/services/state.service'
 import { PasswordPage } from '../../modals/password/password.page'
 
@@ -20,7 +20,7 @@ export class RecoverPage {
     private readonly navCtrl: NavController,
     private readonly modalCtrl: ModalController,
     private readonly modalController: ModalController,
-    private readonly errToastService: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly stateService: StateService,
   ) {}
 
@@ -62,7 +62,7 @@ export class RecoverPage {
           })
         })
     } catch (e: any) {
-      this.errToastService.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
diff --git a/web/projects/setup-wizard/src/app/pages/success/success.page.ts b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
index 71566580a..88262bdf2 100644
--- a/web/projects/setup-wizard/src/app/pages/success/success.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
@@ -1,6 +1,6 @@
 import { DOCUMENT } from '@angular/common'
 import { Component, ElementRef, Inject, NgZone, ViewChild } from '@angular/core'
-import { DownloadHTMLService, ErrorToastService } from '@start9labs/shared'
+import { DownloadHTMLService, ErrorService } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/api.service'
 import { StateService } from 'src/app/services/state.service'
 
@@ -12,7 +12,8 @@ import { StateService } from 'src/app/services/state.service'
 })
 export class SuccessPage {
   @ViewChild('canvas', { static: true })
-  private canvas: ElementRef<HTMLCanvasElement> = {} as ElementRef<HTMLCanvasElement>
+  private canvas: ElementRef<HTMLCanvasElement> =
+    {} as ElementRef<HTMLCanvasElement>
   private ctx: CanvasRenderingContext2D = {} as CanvasRenderingContext2D
 
   torAddress?: string
@@ -28,7 +29,7 @@ export class SuccessPage {
 
   constructor(
     @Inject(DOCUMENT) private readonly document: Document,
-    private readonly errCtrl: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly stateService: StateService,
     private readonly api: ApiService,
     private readonly downloadHtml: DownloadHTMLService,
@@ -83,7 +84,7 @@ export class SuccessPage {
         await this.api.exit()
       }
     } catch (e: any) {
-      await this.errCtrl.present(e)
+      await this.errorService.handleError(e)
     }
   }
 
diff --git a/web/projects/setup-wizard/src/app/pages/transfer/transfer.page.ts b/web/projects/setup-wizard/src/app/pages/transfer/transfer.page.ts
index 5de21a289..5034a2272 100644
--- a/web/projects/setup-wizard/src/app/pages/transfer/transfer.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/transfer/transfer.page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
 import { AlertController, NavController } from '@ionic/angular'
+import { DiskInfo, ErrorService } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/api.service'
-import { DiskInfo, ErrorToastService } from '@start9labs/shared'
 import { StateService } from 'src/app/services/state.service'
 
 @Component({
@@ -17,7 +17,7 @@ export class TransferPage {
     private readonly apiService: ApiService,
     private readonly navCtrl: NavController,
     private readonly alertCtrl: AlertController,
-    private readonly errToastService: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly stateService: StateService,
   ) {}
 
@@ -35,7 +35,7 @@ export class TransferPage {
     try {
       this.drives = await this.apiService.getDrives()
     } catch (e: any) {
-      this.errToastService.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
diff --git a/web/projects/shared/assets/img/icon_transparent.png b/web/projects/shared/assets/img/icon_transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0aafd15de4c965ad7238b6d89dde4c1124c986f
GIT binary patch
literal 53685
zcmb5Vc|6qX_W=IP*vA?PMbbicku|$p*%QVxwsDay%atVxgV0TjVkqm#HZjA*2uVg-
zELkE$3Zs%OC5AG#-{XG1zt`{YU$0lU*PZ7)=Q;a1&pFTgUpw2g{HXmX006&*`Cs+`
zaJcUN<>rLHMEmku!hd+e&0Q}6z$>!*7Xk7L#Nm&KOZI0?K~10J9Q+@4e-j%M03P4r
z-Sp-F;GLz#UnY*15#Ps?q7J-i;AHeDA9|?3?QW8dLONqBknN)8HM9th3Pm;dq-j*L
zqtJ8spF@Kj#$jg;V)j}n?V};@dt9B=)ywv2jS;@__3h@RnF(%q&i|i33|=t=09RN`
zQypL5B}Td?gs}Prrk-rZU0h$1_I!S|nGb;3q)bu3c&pF-m+Hvojf%kSxSbiJgv~#H
z`i-`?T$Fm=sG5#tWMrJ%Sr2MpO_nC^EcM5;G?Lu_Zsn*i2M{Oj%`xOVBPW=U7%P1*
z2gkIy-rcVJ#Y8ASdF&&X%%a$i%FZQ}e;6CUwF}oFf#X+`aJ_%I+5-h_9Iz}k>q2&)
z`kVbF-|Mc`C2~HN$>adUoLz#<EpZUcB#`Hv^tQi(&D`Iv2?l(=Mq8IQ_q<er$V&G>
zWXv+A-qy-U%KVVCjPdlJoavDemfmLDpCh=|E@=nuD^Od^Go2_f@Giyjy=0zYjcFk}
zUr%vKFpqcc?>5I5NO18iTwbDe9MViBCR$0WI)GILL!+7WOTXlCtxZi$@{8QdM!Z-A
zD3XE9_VuMq*$@5kA-<nve?-BbOA3C3+uHm3+nuxs1emdesBY4~RJ~uO?igBguzt&5
zjCb5pxXJ;}oZDS8MLAx&tYDq0$K!>-ofm=hr`&t--s0*(eLUN6Ah&}z@nEA=r-4@(
z5@4~{NWi$klAsqqprN@ls3H1#(PB6l<q7p^cS1%H*rlHB->UTH7F{aes2WL3k7fhL
zesB-%ok5jdVVbe%Xs=j%^$lmhaNPaXBz9R)(lu0*;zD*RW<8t#g#wZ(P|UM7yEL)n
z&241f7!AG&<aSINV!i*;;Mk&KnvVbsu)DdhD0Xc}0nEo3xhy>I#RWM7tg5LKAk?cD
z%>Sc`#+9_xMsF!Iqd7qIAt<Dx)!Dfn?UG!DaL;|^W2=UjhyMn^#R^K`YJ_x^md(l?
zu5&x7RUolRnz;I?v3fuhTsDWR{+2`(MXW>-EXhFz3-0bE*><cX;>?-^JsQLSP6JvS
zZjV*T{L%O(ORk;7vO7aURY=L6&tKl$`Him00N{)b#B#(Q1KjcZfU}Gv2hpS^sJA4z
zCZe}wK^@@ELzAJ=ruPAP$1Pc@iItU|Kw#H0okB;lnvpbaZdU{rO9eo@Fdbc^jR1VN
zp@29UCJjNM2sIw?+7hn__%h*d3Xzj;no`s@p5ZDm^Zj}EYO7}ruv3LZJ3e%*{+5Iu
z8gLWERYu?!Hr%K4kRzu77#4y@^8~U1+U-y)2J7da(r&aH0_e!VO_J~858&({=cS-S
zpf{R@DlS=VzIziT0chuWToDYKB}Gqh3+<JP6~%Q7z7Yktts$FSOUGRbIYGf|8%)N&
z>f!m^y-gGBAY2IQW!3`aBxf`9Osffnvy>>{09=Qm<P5l-5aPt?6x1#`S9T?l!(I(;
z-lU0wwOz>yFkLtp)}I>p4s?iuCs2<#O}JjrEZNj&#dyjGu*#5BeY@o0>PX^Msbn;0
zidp&f<xTP6n^cIR2)efMRg`mOdH+0`^`-{^x@+0$axU{%JjxyVK4d@qxg~{Vqj$W|
zl!5|oii_+CR^AI6P_MGS91POeXdv$r?~puf0YH4`mYbM-_*NH93H05~6ve&MprOF+
zpa&`%iQHRm2%RI4%QIG|0MKbZx8>$AswW7<cb%einIJ{`C`3XUD^o=P_B}LSKF>fd
zHJkKC?Gh;f-v5yGNZZ~!#skz2Llm65D8!#cn&^3votg`2hXIzhyXA(A6Hv2E^Fycw
z>_V9gD}Vy7VKU&`r6uSQh67h$@l+Jo4w<qm+*|WJDDPWC6&f6J7)Kc|LIjRS8rjX$
zi9gNY#wC5Y(b1w4MYEXB0Z=OzTosKaLD2Jvj*Z)gE^-h!;Tg835Og5x^ixtVnf)6A
z$U%)U0{CEr5D0j%CO!fctPSx<=0gHfhJ+#G6@!+H%DqpZ&Lv^|#-+U5{qY2u9q6E-
zAX=@a=FuqU$!p=FfY_m)N;WFH!@Il4zPmU8Va0JDBlm13G+?%NX*dUISiARP*aGG3
z#p{f~$;ijMT~bUs4QNG>pYMOQp#k<NGlT;h1_7TOc83vd-eJ<oTM@KCAyCf$Xv{PG
zBv>CO3c#0!s{@u;2{5orRs&x>67;$9xbb%(u}9$9=eV5_z)<7~lJYNHHYyK~f~StW
zKm%OmLFyhCcAyU}k74M(WtduB4@P@K)>j9Xe-&FGUWHuDMBdzK*j#WA+<7=Xd6wmx
zqxx@A%kez@%^eYyEZn$qcP8mHFos^-hk=GDzx2m&D|$ao7n5_R7&*vXVGJ2nX0E6h
zrdKrfZ++O9ti*Zy1n9A^*FD-?^ZpaJKI>eD`(3;4gK|E&vu*)qW@WeZ|HyAC6>tH6
z7+Av7u2rj9{+^myHgRFKrSGh#Ox}@|B-`)=OQ+WtZ`ZpgxxH|0SGw6>=lG<L4Ob6+
zO6SN6w0N1{=6S!k6~c?i^`%l1r4Bq7{}~={=>+S<$;4az-ruW1n&~JiyaLME-?#}i
zjCq}lm|t#Josv(ClfBv7O5I@*)SZNQqxL*O7D&h_(ysG3Pkqh#rTf>Gmp=D-4kDAx
z{#f_o)`|~nY{QM)dn)@H8TgxaqSQ=ZpmnPJHc$Nd>U}*<gjHn!U{F<Sr#opO-YR(`
zkyF5G6r~nn>V(^~r{+bwQYl|HhU~QCyuE%#Q^Dt#HK<1J6EK4y_PZcLHKt)XznT?R
zD>gAz=F<h`n%^9j@)BAVrWPtExhR6(inLBBc~0vl)G4<#HPN-hS5rN?-4JJX2{B%G
z_17ENmVAL8J(^z8qkdVzXk}+F5#=xyzRZEWD)D?m@C%aO<Gm0Q7#}AM`0izjVvQr3
z#!mMB4iquuWjvNF_%{E3LoKSrU*UZT^J=g6LI)#CnC6pV|KTY&;5-e_0CVASt}lig
z5x%;19@#V78EV&1oN~1xzjQBeoej_iiI$ThE5kvnDGmHs9Vly2#i{vx;hMOhu4elZ
zl>cXwB|T-)+9AsJKd+(uI$*LVW`^T6a@mFx(~U*1t77=|`8=mckfnJ!xMr<q-8XoK
zwJ}hAdnJ75`;MWbW;SY+$T#vdOoPy-=zk=>w+)6j)fY}U7L<#^UBR1yUp9Sa&%S9=
z9vWFcEG2Y_SY;_X`>Hf(WP>64I><H6r<V;E1YvDS*Q%Q%qV}s93Knm-IhUg(J4z>N
zbR!EnZ{DGZ5@6uMiFBd0%Oh45u=@M_jE4_z6CFjXkm$<;e>3u7=`*}i@VL`^p)s)6
zgB{2nfp(~FMizgtVYeDTTZ!W9EFFNz!_#~a1+dU!T>tUo$8)h7_3&oQw??~1sGHV2
zFx_I8pcE>h6m*gYV^(L>w(d_g+jzD7>>(%^pp)wD;-1=e98ykG^t!Q~O<!C9jN?$I
zT)sq6wrsQa`SxU%rzjsyI{y8aJG9m3#S2HV;(TwAI>OL=5!uhHf0Ge}=-<kKiRPF+
zL|)MiD4d_^#wm4&ll=ZmVYq`5L9dMUNlt~lXhigHLIVvQsI10A%uXPKbjZ-`zt5{3
zZ5tG5dx#N!fEmo810d$2h~g*0HMVT?buj%hA`h-c6s9?=yg%LMggXcmX>{371<|KA
zT<gDKG@bl)mQsa*(p(?5VyO)|;qn4xz<?mcA^_zPF*zJlayWIU#l|b6?V1(<DfVNi
zPh2&%NL!_N<>yeb=hlQl3rwOHOPC&8hEz@lHRqU%M_J0iVIWQ&bYfUaJ1Y=UVYY{2
zkqY29=7>lf-p~Tt2-<Oj*)J?T_L_pe4eHN7w!8@34+wK0fS<-Q&Q*OWT@tr)Bz*ck
zRS3-5cA_Y0bWm^|W_~%iBXb`TNI?rZ_-;Q=1ZKH`2Q<9MJ5xYNg?dbi4Cr!5NaQ0U
zbe?TYp<#lKmJOdCjo?iZQ}x^w0#{8sQ9_B5c7tiZX2Nx*D4|xAymV(}B#3iFj#LXb
zJxA$CDzk%wkSTvMmGiO#hK=YsEd*--NsqBFUo$n^2G(Wc3)m%%S**NTr)ueE-3S=_
z{YiXJx`(T?aNE;{)$8)(xBh(w3hXCVUe3^l%hlr@hEcF2VesMShoy%ugzp=ul_YKN
zOJur=l3?x}Of*a<J0rHby%$ERFiDq=`EvAikB@tV@-L}4{xeYgNq|ww{AV|FoBhIK
z>A$DYf(Gj1ygJShrIPr?)BO?nd7Ie%jod(-GT62nGN!n7guRA&#JM3MxR|{_L`G39
zuF84tZZrTlF@bVRdhXUkY$=a%mtcB5qv-6HJwNP>Xz5u52^P|m)vp1=Jv$otI|-U=
z45tsmA4=?|t;EGBuU1rxeFF;o3JlY{)t{vJ{V%klTC}MX)^S;e;8<&md=g{yQo)%F
zlkt*VN8M~vl@peFjYK;R@&6pESPY@9?K|e~L4<`vuVZ6f<?q0stA!B88p1FhdHS7=
zBO_@=a3%et{cxNVI0ADZr`4*$sli}TAaH20x5j>yB@2_;fX76Be07zmxE|!pyvq55
zNkYzA7A!q<NcQ6_mBr!hJ!?Ucr4T?L0vv|`gIkBHgVEI>{A%D&tszUCGBF6E?nLpW
z&7+@Cj-#u8vH>04l)BMmNKfW9lJTlz?I2pOsn@xBSQUc=#)VX2EHBiJ3A78eL#rhh
z{E-F%j~R3I*bnOo;<|ZUlY+*_$G3=a_<hY!ry806sJL_BrYyY|&?vXbvPoOEqVt}L
zTZAf6;)6_4qHV&N94-5{ipl4w%R%QA_U}W0o3B%xkgO-ml4!E=FeCvDJ#eC|cc_K=
zu?NS+bmPFS5W*Bg21i~+JqlXA$3wgU@t8jH>}_?fL=?|8!kdGFpplJq4Krj~qPc3d
zI56?D2*5+*l>5E$v#rgx@!d#C9KQcrHJ}yqb$!;I3;sNwA*PzZjYDy}CS`RE^Vkf1
zopP$j87Wyc1>F|~OMi_S*;<Y2@&7TKFiHqHzArooTHMiYPTfYX`|RQuIKV}j#bYbD
z_l;@3=Rf7NevN`onklODw56rRy_KZ}^EmiE)t;&3t@t~|KGAL%Rgesq^VC1hk1#(v
zw>OK_AVKS%C(Fj6(o5uc+3<@H{qg^?-PfY_Y5o%rEW%RuJc;PHQ(}xlGcl0}J^jm2
zkSYu}zF9hSaZA>Hxmd&O@qgD~t}HI$>@|?ZP@2o&fZoUB=3ibHC0uZ1cO8m>>--qo
zXlH@^lmf65@mBOpWO<AgPjJ!@kb6)3l#@~Aq-{$55m?m)$zC+LGR6hCV33W=(jpHD
zQ*4v#ck8{huO_3c`0!}HS4aWq7tGI)+KouXO%)yOjKMEKdjMct!5Y&S7^LIEfCWqX
zwTA|@54+@+%3L&XgE(8E1)Wk{L?qa>wet0)!pc-!*?S>&&=AbRo9O7jYry|3lv@G6
z_rm%+Lok{Pf4l*Ilrt(}IqfbSxiVQ_8V@KMGKvGPfr6RZ53;b|Lx(t5TBz-?NTWTd
z7c^A$lfEhi+#u71pT@^qE%Nyf-1^lsHGgjIOVpUl1Z?OeLd#T2B~PYPqL`K&xS!wu
zO{#%LS53Y9OsR3rx&1yAJ<t<=QpCT=hU<f(#{{nYQ3yGh$e;h_{LoivfW6|ULysTr
zz8qM}5eWlH5qga6nHA*eb<o}I+lgxLQ2-lr>|%WG3;IZVKzZ9_jH>6eKQe$0i8@z?
zTYa<lc`N^G1*0qfaWzmZ`K02|k2eDsg5QP?8nTK#afp5>sYHbX9iI*|&}wHI%Oi$?
z2EehstBqpj91CdW!Er&d<N`Hxl-X)z+egKNI6%1X3;I7phTt;18-Dujg&x<j%^2Jd
z%WxoxpK|$<v+Y^yFu?Kv*D^)>Fk?&)Et{;3+P>t+Cm^*1;WVFH7-)$N4>^rHQT~=Y
z!|w)TL;=A*P%r_V=3|q5;)KgSp}H5k3R}*XXmJuZ&&;*3Y$svS{&a3c&z41f5i3&n
z;=#MbsBESO><Eb~v%j_|cGB@Ob<#N^kL}%Zp5*koTYL<PWcW7%&<^3XJa<rNvd_bF
ziUsfnT!7eeK0EV-%GpHU4**t@DkNSgN!`|190^0}@R~Y_H&b1&ppkS7HBJm04CRi2
zGD}*ElauVFcAiCnBb@$_>LY8ruI@>8iZ#(@1pTpA;s81#819=HNiN|BuaVU3V`5?^
zEA4)Gs9m1>c_OTn3Qa*r0|In!*q`)1CwSzTZ|Yr(1CM(u0+(^su4<9HClxdgnle04
zZeCnw{)hJ6yq_t0<|VHBU6XQaKD?xXl2qDt@#`E%hS}9nel+w%B##T1Qb<#RW!rOM
z3KA^Y)g(N7_H46?dT;sb)usrS?c&IUD+g#qqHpRRHAc{0z9&dP5P`yKH&zlClTqX=
zKscx5y0L9$zZi~z_}$dRgZJ{iOuh?ck1NNm`m@z=_F@$QSbJC%wY#tfE`ah|@5{HV
zQ*x@E6V3C93jp8_W=rtLa{o9ge%J)!%oOE(?f9;JMUorfQY>atW6D!O$0fHu)K4~X
zNqDGvb73E%8sXgGLxI<~vn6UiqY$-s5K{cwWa7?N11{?RGPatz@Du3-z-<{L-8RUR
zLL(8D*MeGoY`59O_u@%vAU3I&H$?4Z74#mRNA|<4ORU9{;@QmKT8Y0tziLGA!2qa`
zi=<0C*!|WL&vtLkGki95MHJxnmr+(j=7#6}K2biE)xR?0f0@kUaV@bA6p3^VEvQYF
zIp2yB0`JYy3)pFm*CWYJ#QY+XT?yB%c@7fW!`})3Xezd1+H9}Te-0YO{i7*a+?O6J
z6aj|qyHNNOJdv4>wMYPSA%<)2Nx`WJE;}ha$?on|4SB58zTs*B_}-;d(WR41I+dpr
zdbgt3h_@}Bh<{;@*LK^~ondwm;GGtCekm{X^5Eo13oNC$J4+5LxRxNHJ%ugb^5u5n
zGFgR0_}Eur+F(YMoclTNp?5Yx+E~-E?!~{;sV7u3+l6M6*a40BC`c-Y8Ke0>ffPW+
z*qYPyj%Nr{U_TR_QAs8Lw8vH2M~H_Gx=t@dIyLh%e6Nwh56fe>bd|5w6QY~rR@158
z%>vMJkH`lU<}~lgB1HEHQ&re>cw`hMUB`&-Ios7kgy{7%e~PsfKzi25t3Rc3>t7!v
zwlX!u8Ptdk98<=*;kiJNTtKRbaNUbN`0X>g*mzM#Wx+<v{H#WVahN56RTY?*SXNvg
ztNgZ2R%-iP*ylSbUv|px@TPDfZmVwb730?sS%eG8PC9$wssC~=r#x0_brwU=CM+p=
z#re<wH8LIU8J!Ga?fl;DFI*6pq5V3(U*hIRVd?~X_(>QPkcb7fvRj?1a~*E{Ul41#
z9m5rY6J^EZb+oZ``@CKc^|gvUgOySxh5MqmH&`fiNN;mZHF3R16(I>rT>+&KV^93Y
z2@5;L4l;<lr@C*b<i~~sUySv_qC31wOQI~&WXNwOb!TY*aJx?7ENOY#2h&LmZ=*Cf
z1e0+cUwxpw;Wu>a#AS5^gJNlQKiKT?e9p+L{|aTA36JZP@nD({M!|)HgjfHBB1rr7
zZs^WeUBKixqgDWe&}~PO?)XrNff9gqmL%<G+s<}e1Ex0xBN56mkYeA;ihtxuwuey)
zR(Y^zXGlnZph_}|OlumZ^)!!5E`rv_spTE#TA`%MhD%Z3TOA4k3S@B;FloiBV#&^-
ztc2LuxlDda<=~}FqZ2oAnmtKNiGzt@%6|g^rNxHH>4#~|kA8NA%$OCGLbpT#LJTxY
zIbCcouan)8MFfabXNnzAxD0OlU{w$H*@jkT(L2J}W^ZMR#vQ_vF`<G>=UV@OwOo3O
z_MHEG6kh>BlyR9VNF3X+zxkQOZU7@o5j$zMdl501=Dp+%jQL+bnRvuN=oIaxdX^Wr
z7^RiCXg-yX@8KX*V7vCa2@RvXd+f;^6#Wf58N4ZtHy&mu53s>Ca~g*HKdvV%SKrm1
zu%Ao(7=^;L@q*i?8@M1Ij5q8*jhYm_zQ2#)YKLdWESnWw*bkTw9i_J9w${|oSl@BN
zeX(5VAyEazS6S-D+I~f^)Ny1US8ppMU12<@7q;$Z;R!pU{)0xffq5UiwwH6gkhoHv
z#;6O%Ipq(dBxp`~Ku?6?BtQ9N+k=K0sEu6O((RjNv|z|JLrGr6#<(M0GM*D}D!q(2
zG}reg%n0e@$lR_aM-ajB%V}?w6^(ZyCVw%#_s>kL|1Ppgw>;;JxPA2Zj&<8ag+c4Y
zXw)9+3jr!GPJo>>+^h`qnfBa%#{2G--ksO$afz|9>-~U1Tn<iF5BNv;z3BoNO}2Cz
zHKt(-H&Q(zIrZ+ZTv=ZV>#Lcumk$6*^w?x#UTAT`6_NL*rxh>4f=e0Vb<N(c*75{g
z11D`lMb!S)$Q8(*JY|QJ^s2cJ^UT|LOd@xXOhD>wNQNdmDXI%*>$VEOI7H>S{P$e}
zmKPV0yXz(T)vA{1)>^kfhyoW0_e6_iuw=_0Z7ecQltI~rtO^0Nxvy*3bx}9gqB=3@
z2Bh<tqW)nB_FQ?Zat(lVynuCmWH?LrvXU1w9$&eO_`E0Pt7g#t_r|9cNhSA04+>G7
zPVb;`M~<hD{7ji~hh2Xk5UyT+ZefH)buxoMGQO#%G|Zh(iJD<$jsgftPt+c-bZ_V2
z=~fdxb6YlCmZg76%$)ynj0yjb6sN6-Da0c3kRb<YvXW!NBRnGZOZJ8;Y;F6GqW#mb
z2*<-@kJ`bp)!?Q>q;{J?DS{5C=`lramxaeliwJfSI6HXqmKI{%8eNZkFViT})9xvL
z9i8H=fSJ<3lL|Bu!J47nxN6va*jwe&Sdk}6P!CjYu?_x^&v@@hH6{8^-{f&w$lMl4
zI8i9f_~ZCE)J9X$*l$qcGdalx{m1d${_t<tNCn3b!BWd<$3t#j2-Qd2Ry10$GD@jz
zcN#?4tMS`CP#0Q&x0SxVm8%MZSpqsfrcQmgaSf=(xu1-W&ty=*c1nSd??Y;k6Ao2=
z>D7k*qzp6A;1M%MO@tZ&3(*2mM6hU1xdBZd=<tX>Xjy4yBRYf{T{uLa!xL8D?9NA~
zFK%vc{H*05$;C)h;B8dy*Hi}=nzV7g7iITIn7VDyAJ1(o8^1mI4OxlPIO034^c5Gi
z8@L=WU-|DKoI#}@>XK>=5~na7D;WDDCCQ}{&s)GwF38Wo-Q9pg#I3T99>&o@<c34h
zrUWQ(#E8fR+H8hVYCpMcDyAGj%;(Ts8w1BzBDby$&g|@7ve+jIIPj#KdAL>PGJhRT
zlptU;L_9uscEZ`^BT&fglNsUsyU?j7pw~NwCSljr9e@uil!TWKhfcKNq(nG}T{>08
zvm)x3k+;Y9p2g|u=^j9c>r1Q5Rf+S58NrL$?f2fXPTg|fyQ~)Ja7{rF<jp|0sSG9f
z>;sOqd@osgj?^OSqPu^GAN7&*^^0Wxe`Pal9$e~#Ft92f8bQzwWfL?T1ujb${Dsj@
z>{Z@Ep0R8JXI?pUX0^y8s!a|7(JuUvY2>{kd{o#Tz;^~CHraet|G_7xA3t@O0^$;o
z!y732kOl9wD$)t3r)g9AdD&QU5RoQV=sGctXl<AO`hu7^Ek;BfDZPh(*VNLop{tx-
z&zN22JQn7N#LZ`G>Fw|f$dXf3J=BqW=ZfNr>7CLk4ozVijeO!f5WOkNC2=pMC=E(5
z6iSe)|Ev)~W0YNb8#OmH|M2@C+48dsel&A#SBYnPDG9~<&ZOsym>2&J;~;@3E2HYl
zc9U|m&j-@~!g+VIU9lQ?%6EGaEr4Nz{n>5;9=GZdez9>n@QpqoI-#~NlsK=S_=+1&
zRiznE%Pp*56-lN$-2X;TM8M93A0=UD>-Pwfp5>BP#;3+7CML$|DfMr^CXHgijR{LG
z?I!O;AkZ|L#MM`a;{Pnk7%Bca7k)7>i;eGE!}1?@QzV~P=*~TQzq@O!s3e;8tnCUc
z5Csuz<@fOI@(%ZQL?!cau>YG^5i0`YU@`FpLcA$*qPZ1To&I_oo5GUlghzQ^Bu>6;
zODE206Pg~+?YRneQbj0|&)8LU=YV7(^q^nn3v;K$0^ay5`w^jeh);h=!>x8M^VdMs
z;T7!`Cv8fRT-c+760;t9ys^&{eCIyx1V2|35EsXj_+BqAhWt?ct)P=9NvXK?N(qQ(
zQ!ji|pj(8a8UwdByQh!RE)xR`coyfyB_a3=*#5X9gEgqS>Z6F|5HE@pDoDkxW~&U<
zLKOvM-=K%3_^{q9sI>*~i*w5;4qG7>eg~Rda?yP#OnJ@=IOU|w^_`6#Gh>!smk43q
z2iF5UlbuvWZ_9C!+c^2IW#X$~?Qc`0CN6mkQr~2`Qx_N>q>C-&0HyZH^jfolIP0P1
zI?*aQ-*U_xLC1!7G%Eb$+{#wrE_7bSJJlLtsH91DP@2_erF|^GgY)cNuP5KcY7lsh
zKQ|PnEej%bx>9QN8&2KZWFDJ*%L!7liz{;*E(tr9@O_6fnNo*7(hh3j$Gftgum6`?
z6`;1}^<7Bpq_c-1&#Ben1JySy-h(gr%8BX#gPP$W&2zCyNu!Qd#}v`$Q!hm}mUn-X
zg}u>_A3yG-t=8)W7H%m>zhuLmw|^HGxz4u{6RfCd-(`s&{LH-MQgHh;4W%aBd?(h$
zD0o#1HVQ<^XLEV$xADAGq{0#3^8Mv^SJB~o(AV|^=6#E@D~}Yqx_F3NEi{>4+ERNk
zt%}?A5%ieJveR=O;e1vIMcU=B{x{}kSV}~+fD23lHwy@>v!3OWQ*UrLxLtLdKQ-wo
zpBZUC!R>-LQxTY_Z8EH)qOvK4C`j53n_KkQ1@6HaR!Hm~UbIkMgnhZipW5~lpSVap
z0DE$<KbjmpALGjUhE$7~dlu!UfZ-sY&GdS?4TJHR?0F6uML8eTm-9Rj_i=K0J>|B5
z>DUU9iqL_6^#u-HM%Gg=(*EUf)qM~-`bSri?~V!N-aeLSueR4=m;`2^h8=SujLKKk
z?!Z{?JgdSw#Y}{Pyy^I8^gd@wiMApwb`SO7a2Y!}7XfF7)3Xt@yp0O>bXlmI6Ku7d
zbKO&djAz`KJM-u<=`HbaI7GOu;5^Rla>o=N_4m52J4@GyH*Gcqggdd5-(>whJ3Xx=
zS(u40l~1Wj;1{rgPzgiW%!nSaOVHVYIQ?ddBDujCaaPuM`uMW<VJU@eQBDu3JXl5W
z-FGw!_|HE5cL8Guo|w46$tAwD(}-b8iwl5S)38&}kZs47$G?N410^2Joo@~$xg$p;
zvoi51id%Ns^U^sGk@bB$BUJ5RN!Wf+aLi=kU4UyRoQUfZ-9vl^hTEYy`~Heu)8gkm
z*TaQdSvv#`JN;xU46P>^+}B8w))JAcm%`0sy|*hNF8z}>NA4fE^9aU<71;oT+f3br
z4cIXV9`0y|D6b1szL_|)iY5C(9${BsvNNp9iZ_O^)>H?i&ZTDTnSr>=aA=@6y|)%A
zVBXnnQijva{c<kZY!3xl@E}s{eriLM<1$cU(*;7*gQpK(Tdj`DH50BIJe5)-psGxp
zL_u0J4i=SW3&w@P*`Qp20V;)}b6iHTReg4T$&$u01Ud)GV`h$u7e<c4S1Urv^dl#@
zGg9`{4IcOpMbl(?YRo}UfUgMT3l^{KxoRN=guK|vjqN7l*It#lvojC<*0ew@B%0!T
z+sjfJ=~M;`Eq#{FFE_)~E@brd^whF}8~SBkYI7;wmu$C-%ocG)MBj2Tn<4SYC}XIS
zdM)19p%{!QpvlE@p4H>p*3ijzKfb1#LYakHX`ME4o=e|R(&2`_6x$;*oAOR$ln?i2
zP&fRpe*}B_!)ck;K^0tUwjAFMkHBGNqEUJ3@Oy8Z2A=-mLGRAG`9cC_&1=4$izYUh
zzz7)=6sJcX@>}bQf_?A0y86K*KSmgb1_fDOuvVL~5ncH3_y^n4Ujkr-_YLDv1dbdc
z7!QkszR<9+OB@T;453gJRn;9R4`sI6KKp|&e&K_hKvC8j=TB;`?tMQ@N}CpUMm*8i
zPp(-onA=70n6{3#w>aairp*_jsD$MuerUz|iv9EO(w}TLP>gSV<m(sA>X6F*r~w=w
z7d65<V;VLxg3IDxxLcKUm=}*Mz{}xPF$x==bg^8L<w%!=nHYCvh~aL-Ol2e3=xOu~
zrsor4=B&51$Q{mzQ$lrh_`Q^E#rXT|@hzehWO#q-x7d~6f;8FkSD(~pJrbJpdEX+R
z9Q7@)hfQN?Gg_Pw(h2;)E4;P{@2jYCMFeD}A4OpVzo~PO+bSCVsAFLxOs^~6<<f_%
z11-$hEiL8DqByW*G4{TVr_XcfWZWWRKtXJt8*ahNlwIs$C~7IhyX=T0T0bj48)&jA
zbM87H;AX4+V_IX!QgBw_095mhbm#JhVvQ^P_5*qwJ@C?GWz41E`k_;Bp+ks*T)KaQ
z=V0d*)!OS|^myCNx2i`|Cdf|J!CS6#mYtT0@h*Z#lyOGT4KFK^1&45l8*dK?3gA=*
z*O%kR&R!K`+9W#ZiPY8Q7?QZ^&3Os^iomOLA+%}qtJS(OY%dO&==pojh-H~fGX2Zp
zsHR`RU}{rn&MVY<yC2}r@;!r%`h^!j3F!5x$__nn5PVlOjihF0HT@~Ww>#@EtgUGY
zjzj6PPOhIghvNg64~2|XmUHRppI;Nq0Jz(O4-9`QR+tno+jX~{8mfnFog!Fw^@x(P
z2<IB1tm%PyXBrL%$9k~So^<ne`wdinDqfwz!M4qEs{3|Pz8+VreG-zUSAM!bkquMU
z`qEh?7%_V0gU{C+bc=y}rfzG(ug|G6KKdp1@J4uPnh|Gfx5z<QZ&3#(GgK}hfLmwo
zrSgZXTC+BD{d)YD|LW{6wuIG6T$bFaZ#;LPb%|d-Ew;XJRB9IXf1YIam1@tqvqA={
zKWWjPzJ<2~L-}|Y^dR&2xyZL!Qfz>3p1<PS#3;+Znt9~_pp-|d#20(HaK`7&_IK|>
zH}IGng->$CKjq<)0b1tym)L4&t%o&0OSh`hQ1ebD;heMlxqp7loa6K=Y<8b0()zx`
zgFYFL$uV*60XR**XMc;O1tKYTV20M`4&Kk4)*|;N#%#+ubj5wktLO?r%9?nELiQrh
z)3KwLsBiJ(fKso{9W22-CRVdmWu*8ZbM@x5VR)>9=Rp1^J9ioi+B*7<=j`{tgC3p$
zEtWIG=Tc2%0v3l9b7y=_=^E&w<1CqhQmWln=7Aer;G)(oBTk9O6E;hv$jqT0F<jyF
z3xfSS%X1Nkd@H+aB>yVw_I&o%PX3oermHG|z$R9>I5^{9q^g?YU*6yQw*D`$cDJuq
zJJ4WVW!9$8mDE3D(;1fr=M>BBp^zO}WxFvIFkta0;y!yYwBwBtnZ|a#wS(aMF>=F*
zisltfd5(|*d6|U=@&=3vj`&}1kvQ_@`PO%zpSQ&($P4Q$N`0On<{+?M)2F{3p6x+n
ziao9s?ZR6eSWe`KUw^OmiJ%CcD&!W{W68|*_33sa&-5UAR0K_r7mPZ{OJX=%J3~sA
zi&S+^LH6y(*sYU2%Tj0E5Q^ZVT5NQwAI5Fw_l}+Hp`CrZhdt+kyIjNC1jO>=o8N0O
z^m$zS|9W~lw%o=zF=8@rP*DKrSuMOd=@M+?)f7wVdw<jiurhhCQ(r6$JAQ;?WM2ce
zW-sTbr`I)Sdo~6eId{Q-DLp&>!S~l6BlF-NhnY9r6pbwSz^sYqrQPwsKnC^9&VAmA
z<a!yncRKL%(OI+S<8W?`wTiVnPjO;xz8z_pihW;+SGAF1fLSX{MlHEz>zx*?EnLs4
zIQN!GXIj4Bc&wCC!+eCmDjs7Oxz+$*92!wK7d}0F!)lpO0t6#nvnC$a(mYhm8-^0x
zr*y7<<r>Lo{lhgAXYl=D;C?h|abHOAMTyQ|4of8J<dwpYW*mS?Ahk3bEvS#Wsazd0
z+tP;{t@Cl);*lJ*n&onT%-IX=7^&i8o?Hv?=F)Qv#5r(!2jWMvpf{z?{^4;wTSeu$
z&v8Z3;PV6r_<mtO)wLoj`uUt7KH5M<e`H`q4EJ2(+Hkdn{57AK*GNaoY>aDjs)xHD
zB58f3uEi&TYy>~!>K-cBGZdJ;YvKZ##%}%(E-aM)DH1Ea?q}hW1zor>PcdjP{q&L&
z%rTPJO<W8h<R=JO3f0C30li`mK~V;F)qnc7b4Jsq`VmS3u-33bImoiDzyoT3o6`5Z
zlO-7W4Gil8?Acfkfh`v|Xs#YbJ2TzR>CZI3b0BoCsdFzBw@*;{#Z_e%t_O$=<frb+
z&I<qHOl<2oYtH*o#k>5d)<^!=fuyO#wN*2Ub_m;Ri%vb^F?OcxWM4cCAnDHnZ5O(r
z_4NDijF{v%A^?{i>fXNg=Mbxm%mO#WTD-YwBJBj?GAo~*OODFfpiax1$)6H@tEU|c
za^}T>KslA)h4Ttz@G4}GU}J1#DeWX8f*8&3>5raUsgE(Pf<lv|^uc#*jP^rHYh@v{
zCT>?Q+k9L?_T1~ANU-LpAS~OCIVJFnW%`3xtVpp2U+u~U1dfUwFIW29g7q5Xym>t{
zibmy`?NygrQxX8o!y(yTT*3H^UOy(b|9Op%_AmB5I5W$I^@fJai4Z*ff8b|XNo!Ga
zi=5y}ml(nGKGh0((ZSad9}&TS_N#nB=p^f3{6_-1{s$w@6ggih;?<rhp~kk&XYJ63
zS@%?o4c>(|D)nz(IUo08uJ`GLqaPngXA+F6t@^i~Sq87QU<a;|*zoyBxUO`i*KIzN
z0R*|gkY*IU+f24Jk-i-LTo$2294uZH3f^?>Qng#ICSoaYM`TP)r44O6XKthg;EKL_
zXM4woW>ve)ysIBvo{5K{4|^pf=mbcwFbX!>`<_2PGYV^2+ZfaC$@JzRgz3IT(JhOM
zPfK3UL69S8EG@uTV)~DJg|7OHA0%dA?O=hlbD+w1&7MVx!*CmiEguU&?b$g%!qX>f
z1wL>YEZ*J58(OE#e9Gx><Gla`6c+#WEH^msnbrDm)WfrJCp6*h646&mC<M8dn=slB
z!#$H6xZmNETUpABuyn)YmmiKQNJp+-;9xMA{)?~5pCCGp`bu3Nlr`@9ld$VAf>%Hs
znm+3~@J(E-pjoxrvR9K@4;U_%-dPEA8(kr6?wJBNGoub!rrwO$FvvE9Hz-_!O^Q}5
zWB9Oul2PhNegoQ&WWxq-A0l^6rfrk1ScsJw?f2AGGNmIrhi;%dzsngp!|EiQJCKcp
zHqJO=B=KIDm|BYlx69oV5)OR#d3bD?!tJW)%o+HnVyyr07A{c?4Ad{*3>GG375`NI
zY~GEnJWa8!xljlnPnsljJv3TKi1=u(dOppp6Vn_S{7Y7HV(oF{6;4`7S;l~NJ7#WW
zWqVZBLh_qd9tV)LkiU#!Kh+b$mTc0*U4^c4**WlCiHkIs&e8`2fBIbSpx)-N{MhQJ
ziHU7RX1B-8lg(CfVNTllY=fc17X=Rr%NsUY)a`EGc;riVVaYISvHr1tQeib|_U=e<
z>8nSql1c+wSi9aj4hCL^`Emk{cWCRY);-Mj`*WR`M=dR<pmMV0Bu*KFaJ4y#8vm|E
zczuri_Uo*XOVM3{AXw?&K3>>AIb%x1I_HjY?rtl&dg^Ze0j^V4#cgm|;3#>xK3rn#
zLTvZQQNM?eQ$EFsn4JVVNilOH>Z8N>)s|3GIto9No`sc*WxRS+B!>(?xSU0XE#S0s
zb8hq(BWmD{lZr_L|EL+JEz#Dbdg2LQxXwv7zTUlDTCX1KoT1(-1Oy&B3Rx#>W#~Ls
z9}V0?(m?aG(H@tt#@<cW;b_UbHZea8_nf(Nt2Lm4pVkhWX2pIP)Z7On%MZ)$-53j6
z$8a+C4jRg|X}PkWvbaLlPQwmcbYkxQPXYuR*obywRrDt}I8~!HTkS42SnIqb<Dci$
z>g%#I_F5)o%ivqO%qR&0RY!cu*SwuK<k1={0N0Vn5fbsSD4%FP=C!qtl*Q(>aSq&8
z5i^hdr%o&+QQ@dB`7ep+@_ShAp5dVBbPd3jtFo$J8+up3s_n1%Zzc8@$je^`4(`R3
z4ryVHAWdgGF^G<uwX9-^01-edDPN7-H^!p6(*IPIS*zDnq?)8IPhH#x!jWT~-~EI=
z%N$Stw;|e@MNxr)(ONXPg}ELpz4}yuZkZSZ`!of{fd{a-)!TgSRT-J9FL&RCT&ue8
zF@56!oC<R}Y1Iy4$$6Zf207KP9hY8ev7REr)dLF?ehzo_!7bM_SFiE4jGbeBikAZ6
z?By|f!P$uH9^(C}{fmQ>CAI$m+c^(b17Gx19aY$rE~3Eo#DdZ=C<`A8gkz`eBlnRS
zFytV~%d4q_o&kGES%Lv@fND!%+Kp&o&sMoE9P%~T!}X+fm)8@}aeGRbXU|=!olMrM
z2k>Fy22TiEw3dbLPz$5%8cFV6sKmDD_rLPt<hV;?KAP=HnvtN$&5`bo@j=9*I$%Uj
zq&`8Mk~gD}zQ`T*HArHfHsTFIMn8ngedEY-vq_GM5M9vce5ilgQKsJ0@csiaK<f%P
zK*_bb#BOWV8Rxt1WODj#AC(7AS0YXu@0KV^e_yUiX}H?U79Iozt|I8H&At$MjdV6A
zRCM`ul<-BHU1H>apF1aAvuirTnHY|%_Y{3!0FqX&fIo0#ctHFjsqvMtetM|>ecpqj
z8G-~lTK(j)X&HMnk9;or*|k~8KA@u+!nUSvvz}#|BqCII@NUQ0e{{?azE0RreelM3
z+W&e<UPG^=rXr}U2%-HLOr5)vhLtMLTs0pQ`(4fK@ZR@7VtO;XZ!L4oZirLd|2;q|
z*H#4h%VLoBzlGCW4;Jo%pIIHj29Lq_{U~Hb^pV(5qjPPcDN!|!H1IzrfBKWB-yHKb
zKn|;&8j^({$0+ufd2xj7I}tuT@Qvs1Q=)31z&&t9V^-{>T*RZ0>3?`!@6eWT<4t5F
zbg>J}D2mhA$lJ5b?yq_-Rvdhw;rKdE?6{j{absh1ykGcUQ#u>GrS>2ej*eRD(%_@P
z+s8vp<>H8qurl!p5M8pUxxmjx8H3XVXy<=Vb9BeF)0c%vyRSmIz7n3)Pu~{^2YlTp
z1M0=yYMFPLxd!(m)f_(X8;cGe^gXC@Hs*x#B1K0{W&wep5X-_Urg<R36)>Art6-+;
z3H9mew})M3@F^0YVL%J3UFCYmtTXOVl}n7n82eio?A{W(Z{_%SlnxawHe!`?1;P8n
zV!pAdby?1SwLJ(PSHYL;jfK1R+I4x~xQbLj!i`^f=~ef&iX@PBxAs!Mwc|6eip_b$
z#yuUvbq9^1v;95pY4|J<?vVc~cDzJ-LH4IlS-0A)6X~7t@Ff!QnvBb-F2uq|2K-8g
zD>IZULEuS)Qsa3L9_dM-DlT5lIT5-hqa0D*I4=f*?yeovRxxkPrLSnyS3368tyvp2
zj+aT_hEuZw<B5QZD094L2JDwUO>(|79YkMZQf}>TTT$7<aDJo|NoQs@_;a#dRMjTa
zp=L$85!DB_R+odbP8T3jPL55_=K`E%cC^tXr(0JuIuL)l{~F1_{?*egzsp5jG@j-|
zAu+b?K0H}s?RvSgB5Zb9b<ua8gl(35m2olo2|**wKYBj;TeDXTmvvlZNUmM4`9{=1
z|D%gG3B2^~R#=NE*r#E;M4wzjueCGHJIAu1A?yxl`nrW~#RA&Du&<^TbeBGVx}Z2#
zhuH8yFB@T(^(n!wr+86*@Au-&2CnAZ)2y^2j*m?qWTymfWVky0XK&v>WR<OPYsJth
zJ5J+}K~~{Mp$Ybn;s1<j$OH@KRh)nIwEXJj6W>ud2ZaUg;IIBG{?D8i#3ogwyZJKM
z2nyvPzzqV!;<w1L{rl11F;~PuxM|>45obuBR)EshXR-eZT2UDOpPl)T7et2-fPa^v
zE?f!C1v(AtGV#KsdZnSb{+x->McC+_AYR}gnEo^kTP2riZoMIhnbHl2&;}%;R}BH<
znzebD9CovGzpP{ZlP*LxY&BKc$5po+AMdNS$L)S0amDV{Q_YSV_&Eyo->bXzRg^wn
zHNtBQ8lxz9PvmRIuouqtjtR;v+=ipWeu^Rp%2ctKWDhR4S-Y~ZTKsLQ%RB#H!%+Cl
zMRS3^ocANO8)7{LwfG-a-Q2SL*r;XK*oXk!8D6~Ve<)eUW|eB^Smd8)JD;*~Q5Pkm
zIgF20nB=D_(B*1Uv?_$z?5f=#%$>H3fiM;j22J|7D^LvaX>jG|FOS@N_p_chSYGjI
zbwv<wi^+eqx-t!2D@M+D-2V9^=T}dq`UMa~6HG_#V7djxHgr)#uxMa}?7`Y}*Ud!O
zl@2}$mxwISixM=YD?h@0ur<uS9L;UazubG3l4E&iHNvZrIVJ1zCW#LhRBq7MXyX4r
z+@^Edn*2{OX@(bo<DuUUg28`eF&oqY%aTGi=-vvs<rxIU+{#nJb)hDr3(=OM)v`mN
zpdev>(Q=3BH*n!#nm@IRtIib|r&?-OM?E`|TM3_GN0;4*3WjOWF7=s-^?`*z3O%U7
zzPveUN+Q3U?SnP~h<4|8(SMPN7sit^8;(FpSQtHfE&zxrNzRL*-5PpY`CK6t<!T5J
zl>Jen>cS#a!`d~H6tscca_Qjx%hQ3U&{E_0t=_{fJ--h?I&19{xS!hhJ}u9{mcoWf
zVrphXJ=1JK5q{#L*(p{o&s=w=^ew|b)dUSMhx`w`NIMOQey7l$r!~kX*hD-4QQJyH
zH}C<X@zBZIlm>g3ChjNp7{yQQA&#xUPI;K*cE0y19GxC$ni{<kBo3<Xs#wa&{{@Gw
zIX61S%WBDubHNL5uu^DM;Algy7hQ-utKjOkOYz4;AZYMpZ$6ex4c(E&j(^bS>kBBI
z=fG8!#}71`IMY{eUn42&pZL_RF7+P1W5b*0&r}n7qbOPGIvq61zSzV60ORuI)AbF{
zTAtM;{#lw*4>;!Qam46^^<;QGA&c3}g6$XKK&j$#!7OZ{-<)#yk8dXVJ<AGwAZS(P
znf08dW-ym2T{Ev@-Ej8kc);5slf`&od~9&+tEMHda>AN3Mp-GjVeog!)=4nDtnPQJ
z%2ivW&d>~M+^HI$vL6h0E?k~{G$HGJQ7O5Vr&>F&3OZ;+bNrzC>|riaJ^U7JLBsKJ
zv~v}FN(1ne+l^Mizpn(x7+LnD=3|w2E!y?bg{Z)>yHTw$f9`<_KmQ74Y(x5z@7l6~
ze?F1GGv*!(??=7eLO)LryefNZ$dE9lpLJ}D%niHZ_yX8H2pqWJz4&8XpRafHC4moA
zRpd3Csu!d~DhVt<#U3@Z7_M8KI%GTSw*x`mLXaS53{Xy1VY+*nb+T{@^dF9ok#_mi
z4=t9`vh8|3%aXUZdsDPH{eYdpFlk)=;^m^uhT~|`5P>)SB&hl_XMbuqC*47%NUR<6
z+z3G|45CAOjZe#L2*{HS+mvlT6B+}EHqVvdL+50zpD8JijmBp29pa$DYGJ+6M6SxU
zSh#Lq+~eqq8=|=Rfb}7jkmQ-MO-ZLm3C%q82yr$-bZpz#)pO7frT5gmuAI+xCH}qm
z7oHPn4lY-Y2Q{cK&2tZqOof@`UloTB^XwYoWgvud{$QxYrbXxe(BVeHF5)Jo@c`E<
zCEaHW;m1Gv?gMs@sbNpiy<;EHfgewEyGp%%LeS;`nh~yJeTvy%<kQvB9m>mqMBRA~
zO+7zj=*NY2Ie+Ooz57v5>^RtrLoB6<7L?o0$KPlR!t!A?1Q@?^tdGuh<7_hC>Tpdb
z30xR2msXkN0FH1hH`0y?9BSddtsvFCyi|RflCvEG_^t)fL){7c{H5x~7*P(g!udJ8
z#^{Kh%19m^UOJqvVK@qK`}hxdRQ#N*2DlrKE-cz=E=c!j`6}Ov4f&xLZp=oor~ld)
zI~cDgsgzQxsGO72j=3QP#JQoGb}JhH9~aH&6@kpZ7YUA!VXIc*NZE&3Jsk-)idJ3@
z-Qz!J9iN`c`R7}oy6@^U$|*DnygyE!t{-r2?H#0bXF06bB_XJgQq9(U=b410xEz^k
z8HsV?-y8&|(C&|OJaKW*-86$+9zlNI+iC{K{2!14J#^QIN(Y_eVZVx9^FCMp{WE+t
zA>xI_Z={ciLXXb*Sa0nr7X%Uie14HMwQ8Oys4cS;>bL&{FeBtOv|LIsNQjoHo;dg4
zVQ0!~S!ha*<}($H_C?=a7+9aCJaaZ0;eB6^a<%GOJ{nMt<iy>u`EtiDZAO_i6(!Hs
z38m4TrwIrVRj#LcuB_Hy<cf5XspfarR=@%xUQB+G4^x%ZmU~Nf#_*OnuHCM8tiAaO
zn_hlq17FwDvv8Pq!29lu>{~g3{KZ_F5r;m~I8gslSHFu&>;DslXBoAAs@7RI^U;Nn
z82Zq4g!tavN~yBe4efs}^d0uqJX(6-|8Ut(aB1dq<^MUzMTmn`ooeBIf9a8LVVaD@
zfk(SSg_tg#$FwnjU&=Dv4KyRa7A_S+!7-rV7@x)vg{M2K-V9xU)&BeM@atiCor*j^
zFV6yHwLW5Fi+#~hG#wA~8tUhCJqWiA|2rAp1B3ANWmlJ;k6)9VGYE0hKLaI5Q8l|{
z9)*Td(91DDYvyF8uIH*#fUr{xjy*Mex8rX>hwm$g^P%HFyZct4Vs}=mZvVY^w>ox{
zovOVj$HG?ydaT;fDo?G>-C`@P{ps@$AKVGI^>$AcImd?}I$?TJm6h$q8@M^k9b1V|
zHqpC>%I+T8!!b|XJygp9hBxwZMmE*9clT0*kGgt)f{V;o!+|w+tPhReCq^vgcjfPz
zeJNrFg0x`E0Kp6kl=9+Caq!%uoUAo8$l?W6PF1dnyjl|RJ-Byiq%_})yOAXCk?+TV
zgM2yhE^_dG=Y3g>+O5p?+7JY1%LKEmdf3$Yx&kU8Tu|)Yy7QiI40NR__Pz6g-Wiwj
zpuj2kk<%Fj8_%K1*Vk{U`-bG55nbS{k^{sCbDtMUU%p`NUY{v7x`|LbxaOZ<Zm_L=
z;%~7N>di3@EUS&MfeR0wukRFXq_G3X*O=$7m^W>MccT78;4iFWoXO1-|9cIDLo~Iv
zZaLpq98g&FX;V>+JL7*752Gr2>}{JE1!-5k>$xF!>A#wBQIg$+n_kIUxif0eQvb2*
zefr`4jLJ<FC~BX2c-Ify576EC_`pkgtgg}x^M$6~jiy<0OVXABFgves64sP+E>~*q
zDEKNje#*is55vr>!bK{wt!<>-zLU}6BDXuO=Sy`~D7;xW!y=l(puyKQYP`w|G#wt(
z`zqoK^p!uoHI&Acn2Qltm?jyo_XYMFbtkQs^0=;K-lUooas-$6_lH$^{pVN*lzS=)
z@5&F81bmd24HHS{coE{o)X>18(a>yzkvEQAdi+}OF)%UPvLQM)+)oW7;8S>WIZy_a
zX0M2e5tU#6NnSjB=JVRxT3ZRLy!XFq1mIB9V)B8dtCLvr-WT!Hr@JptEA%cK5HOco
zKQ6~J22jSUgJavailpd3k3`*ysCf9eyGSgwVnhsR2Isxzq^7pxzvK#v$NdP+W}9^d
zG_|)WHfL5X{r1XK&!irho8mMcwr@JgzZ-d9G_DYiz2uyGF_jN+h~r{kGqB{x<b@PL
z*Oj5FNVOIeeeeq}F0Z`d>OSbPt~u@IH{I8-c(R97_(*0WXgaazXYZ;{kQaQ2zP*U*
z3G|}lX<$c=Oj$f_$(z5j^7-c#jjcr>juIml-mD0ZSdytuaXn@52@qYMHYfa7hEq3n
zHKx@rP#jtU*FPY@@X)1JkG|Dq#Z~bnlXOz7@IN~DVY9=jN(R1r8af#ULq)}<Jq1$a
zBE1J3fX^(!<2y2{^&Q_6$;i$i;a_KXcjJ$OS5Adm;6BoH9rL0`dWTE(33Mw^3zg4p
zj!GH}Rbr!XO4a54^~u&k58(4TL)>$U9z}@P-wDoTqr)D12LstKew@=yK+D&rc=MBZ
zj4-J*{Qy8~JgX?YkzVf~KF2xde?9sL;4^JD-ck<GxRrF^Vki6*_PFK0g0FlrASg%0
z${)6FU?m`0S9oIR`l)86R575&zJev6a4!;2_Z{vaXTcAl%Oi|l!3#*a?{fhyhh7xT
zuE}_OHeyzpEe!)Lhi;kQ+k6n-I3PP|4Og>Hhp%;eTkkxHE}fm?q{R-X6UGNV{>!iK
z8|5<|+JM>BYXf{sl+lpdV}EckKSpD#5Fwr!+hiQFqTo^F`P!IY#TR-+ZF1D|(a%ub
zsA(Gq)UAqkjEYt4%afmbE6fZt5#fg2K<P^B>T;Z6M$&%w&MH>92kXMtF+lK)HSay@
z^2Sfz>v;N!jh0^cr4C<56ovlk)hjI5xS)zJdTUVO+~FcF;MiS15&hyM{jxN*d-0`X
zJyMN*9jVEj4AW4q9p&=3lL-zCGU6%1YvsZru%+u8?FiTIdg~)Ud<Xh@5jv`Ke{ZD|
zdX+c>AmD$6Hw>0x_Mpm7Dr}}MTT8&_|6%IA<Eifd|MBN>j4~_PD;2UOD<PwWjN;%}
z9kO>B*-j)^X~-@amF?K0%#KUSjE+bYDzXxn?85hP^#1&Azw6Jg<Mn!u$Gku8kH;&G
z=N=Q;IFZRz{lkZI?i&YsSfUv5ecu-)ES&B39Yxh0M&T4y4W@yscs;(DazoJ^dqGs_
zjLeF(N~WWB<NL&}aYm?Nzw!jXz!+ENx|*g|pL@RSo08-4Rj%e?Qx9VP2V*fuZ|-tD
zHO{}Sul1fLn=&f=uBcZJ2B;!YX3_3EH4uOt^ClUQ0(3lh<o=1PKF{H+Vx<GWbThMk
zb{<MG6XGgW9Wh5sQ&g{bA;O*|Yj6MKRk3|fOe+kds+WAQSx!2h))7)lA3UbRdL_2I
zbYtW_U!(ktjM=%HN-Ed(2p6^BC9$Pcx}U0TbSFirbI+sl=&RgTw4OU<1p<ONR`xkR
zAEniG8IF`gjwNHFof|10TPU>gS~uCa0tsEFvi_)*H}wkk&=ZPNJ}fp@VR*GgW)&>n
zkR?%JlB}Kyw*u1uWiiGk&~mUni`5Z5mIauIW!gUk9@-Smn&CLcv7;qbf9#wyIK6Tw
zxRK76B)y_(W7|Aafr?}^OlhQZK{zJMNqlTg!$QAPXeBX|v(U*?SzyT29=%O4m*DHR
zM{cDK%dec(sTNt1jxUHMlXli+y~TF1Pg`r#NhSnrM5*Zj#L3D>5iW*gNk?)vVbSa+
zeVJ3+{Y-2=${=^bpC7${Th}ylz>?mSuOipT78usMGZOUM!hT_lbN0EMk5Y;yswd?|
z#}X1C`<$TEg|iPVD^=!OcPEi5$MC?go9|pYj`9ur6f!1j&dsh_cM5Ghl?bl1#-B{Q
z4rJNqRV7f@b>Ah8Eo8yRP`tnF2hlUbz=}Ot^O`LOu536Mp8*Cx)aHy|23dUgP|)P4
znIv3fhAB>VJjR0hb=}vbNMAg?NZ*#av+i^QZea`R@Rrbd*XcsJr6k_DxiYj8V|*;3
zVR(0oO5CjRaz*=L8ycvk%sA8c@K(PJE(PNtkp*?dENu~TD(&p}ha<m;83n=9uSNDi
zNXB7YRA@zS%2naU(d%YsOpmJF9=-Pc#3??8r{%v_n9@z<rEt@fW?FVXy{KpgqUKy+
zjIzwcU!-RHyY1k{=dVu^^!hswx=hILB3@5r=qX%Z4)GT*%3UfpJ%Wsj@BlQ9b~T>)
z(reo2k*smnyxK^Vo><{+P1{pY<EV)fb}xz46|$u>N^E(U!H-PaMO>+hp~%RPvT}P}
zdnCNvMkBG21?5}UasQFFaOUJFERJ862sBfDy#AdgOK&>fk8`8oIX*e>laCK%mHH{#
zI|7P+jp3_nnDZqZifc>%y(O*h2$P7;0`k5;c)GRYs14NV4R-4E`4&Ol4ZAXa6~1Qb
zbJHH6NDz3{>>wVjt_b&b@a?)Vfqgg`ohJSh5q32g<0TnL{f#$E3*!BG)%1lxJ^Nv1
zL9?ZJTafn{hnO6jQoGKvTnzHJy1^yUqc<5Bamul9H(p)Qn)>6y#3GBnxeX}`Nt;AB
z4)VLC#%~8*lHLl*+(P+}xFlwCdOC5QAT7J_onnr>YG2ZJLu4MM1WxGj?aAo$^ZK3a
zDF35cpyAtnmrkE{gK|>IeeKgFkf3BUl57}jtA2lR=;$@=VNwRZh;jL%cI%_9hQh^H
z653{WCqL9(z+g4+>dCfH!JXA(Y%0S2q_l}-M@2(1dSZ<A$jQ>0foIiJdm<LfjxjE(
zdJ@D=68ZFW-}>pqj+B7o1Y9>vI~if<sU^9_O|<I_EVlcE{81Y{g-r97<lfKZr7J#8
zI41RsFXas6G@V4VzWi74t6bMYiMir`?0Ar=c=6}p@|ttkyFc+7p8nn}io-P{vTs8`
zxUGToIU~V}T-kWng&W?2$jx!i>$zny>5J(z(<Z4%Gx~Lm9J19@pT`BcUb`yB0!H@>
zj{8yh+k*&r`*Ru5)%D#KH!O`=)FV$kq#_4Sj`wSsGfYlPR+^Z@h9+G&kY<u;NVUG*
z02?Mr_jiZ&`qTTv^ud)h#wSWMGR^fni3vAJipvK1w}5--W?I+)89WsiHHJe<x6aA*
zrC+2mt~|Z)*p<b7tsTTf){a-rc`q{NX^|Mt>HKzDv#~@+(Vfd1E+Yp@;I5Ac#U=51
z&AwI8ZmGI{bqTT#Ac^$5<={}i-tW%gCG|g6y%Nuvjp0zc8^XhZ&?Ocj9Z?a7D<V#=
zJ7Kae;uI1}ajd1*@$%>wAz`PcK2yCb<J|B65;DzAD+YGnj<r*I#9&&YcGQ}-n9_5i
z_yQPsd`~qBo~h`HQ+b$hgESFQ<*WkfU?e6>$@Oza^mTL3WXIqWrag#cXq&zfM~^%k
zB5mDy#rz8O%#2twzogL;c?)LTQU<&mEqLx+6$bbtYRPvV2KNNljzyfYe7U_>%r8D}
z`Th1Y$?x#vLP(FEwDyR`5-}ILhuW#tk7|lMp?F%H!9q~oK{}?|y!o;v9WqV_=jdB~
zj_Zx@tTNV5!0*el0DwWf!Nm#1qj~ub>GVd~-uEKF!X3VJXFx8e(y6FluL#)EHq7H4
zT(bE}ZN(Q2@hn)xXVIDYPNBQqwns?a!5}TkJ8}|=0yFX~Q4+&arseXcmh^t{5nEKF
z5toeVIpO%=AH4z9@q$-WT=3{xPP&*SGyZt0bfnqz<QPOQdO4d@-p!X&@@9&{-^W$|
zxo^7n*SVnvD0)a-9QXm+(sUr5fjKoc(r{7B69AAr5QBuSNYwyve1Z1WmLJDxj5+$P
zfSYudP3rZ52!Rl%7g|5Nd6BW0`}#4%{=%hvNS%a&D!x~8)JwzVWHAPf;Zh4fOW4HC
zIJb{YU@U?w1LW2FD|L{I$xXc5$@TY3`&%UMb5<m8U+EiTlCT3D2nc_mJMOEW$dYHq
zRR_=AcSCMDva^<Fy?K1P^aflPUct1sYe@4n<%}mUDW{w5@<j=P^@evq{B3SDMG#b*
zoRa-@kF!F_z&Ad87nWecq^a0JOwlcSdofMu^_foMTL{5SbFEWlB4r;xm7RU3ZH7DA
zW0~kpkMbh{HKl}qk0Cw~=VFM>!fmbRKjI+r=BO8%Q;ZDmHF^n&I7nj^M4P#mx>1&>
zV_E0B5H6NB`36n9Y)X?U-<|G7E$E*?ik7rJ$K5)KmvL03l!60>dz>W{$Hp?r8go~M
zULTtc0a+vW=%PXs+Z>BGLb{V_5wG?NK&9)n&<#wR`e!frqqs}yp?}t{?D(H5Mncsh
zUE~NU{k&fPNo3mUKAlIIbV!6GMo=TZ$c_fh9Az1ToZFH7!iIq_C+yEE1}(oEm?`L_
z{JV676|BzoQQ$7qUIN<EhAqaJ<%!mbO^M?SIRZDaLr&BL&(vkF+N4WA=?zsz?|)7X
zhq~!iajDd3rguuUtvzaE%q~2=cLfK~`&{c}naDS}R}M3<;bmoH?hQEv?4o>M9tFr!
zt}VyL^7*p;gh!$_@pP}mYM?%sDPWl#?^2cvE`N`gz#Fw3lR|~Y!TZ7F#}bb{RsX-(
zAm#MJprfl}unz+ZzH@t*a)S|7G<y~9+LELx-Bf{iYb>+t1&d`)CL7iF87EYEH|};{
z^Ub|N8&g7Ev$Vhfg3)O9-A1-iRIp$x@p1a6J_GLo!>i;O=OYOBPJRsErxF=;leAH;
zk)$C8k+kahme>R(<s4r0_MLy(gNy;{IfQ<(SkKlQI0RKdul*=rd&t9uqgPu*Xp(gP
zh|*a?<#Y_25V*hPvhb7siA^L1Cj9bc8~43XA{5zA4L?>iei4s-fBJ-v%M88GwocqR
zEkX=wXOSITC!oU!qNx`(y(0`70u;_KaRaA!SR1AXZ4$Rm1bXl?1eC?$P7dTL2+?QJ
zJC5~BS-3;T=^o;y`!zr-f~6v5`48opwg+3^bcRbZ=nEVgI_OFME_<oTnm(?(Pgb^E
z>D)=>k!&WZVhXH3=&t?d7G>her40VV4*mC+@y{n>`H|twUyKN*2kE2CaWivJ&-fk<
zu<bKXdglv@RI+q%6@sDmA9|-^Fq$ls(^FE+4Q`cw;*3Vt417@11DoQq{tLDe5sOtl
z*Y;=&SbH1q!Gf~0(^ToFU1+rUve)GHiO!xqc@Qha>8M|w;tFGcI6)^gS>6*F7FPZG
zZ^%JiYai(g&C@i$2RW092zTTd{gUG*WjrnnAHs(3jQFU#U>qKN1g2+YQ|o6#2cr+o
zvou6bCMoek$VyEp+@3g+D|4?Lh{<=r3I95$S_N`rc;r%KuED_0xfQ&R;$(IE?9xf2
zd788NGDD{{+g?yi*=(J(C+6t!5L9oCTN(MfTPj;*N+_)Zj?gD49VwgL*&EgUU<PdO
zwj-NrfqNE=^bpH7BGlg(I=Qt^vq%j|hL!%=@An_DSzhVwZI%z5>VG0bJ+hIDK&r}1
zRN7nFE8A#bTQrIByCUF`Xhlyg$I(wmzMq}RW2MMveTc&)tmZ9UrW<=tv0Q=*wWFY4
z3UD7Ji)D6VHkHQH3l^Kg?%cu4VD;n=AYwv0w)9`g1cMQVUVL4u+~E=|mo+lA->ar{
z7dxfspziQ%5L3S!sXX`#4z0-edWI2BOouq_W%aOWSfsEKP5M9)btY26r~yL^_1z9v
zPm*Cvwsb%qh17|_Fzp=s!BT)*6{=oKj$vOb8rEiU-oozdvU#<?u^Z(yKK926)k>w$
zr8t7fE8nSLdb>h;LX|0Y>^&TB-xNMGiKN7KpJXPf3{yMqFct=E=>7W>+6Z*Msiwid
z3>*w3t@2m)#6fVGD<la$mK(_MFCl^$MwKj#MQxZqlwcFhl5MlpeEw-7HAa)BUw#^m
zj9L5wBg@Fp=5)ExpGi855CIUb>1)3SI~asmcIF0q=|&SRu08m`bnNOj$iabCU8C9F
z9XW92K<d2#&(i$Le~F^8s{J$?{qCJaTWz!MPnp%bfF<<z(7gZaOb{m+IR<_@IC$9T
zXcHq+Nr!s~6L!zH4}(x_jP~L`Dl9`?&~!W*^BJymEKyHiKMXJA@+kMiKwjewQrLD1
z?{%w93yexMn~+A=zvLpNTIY@5XhVT5rbZ^$@rW>be48|Ly(!it7&7Y!@j05N@mNk`
zLYoN*vfTSOw%`b+LuT^`&z6o^p5Q`;qQxJ!Sp^?09slDt53W09Z-vGf{DH|4bxNLA
z+G!NyBj9&*E+qaa^03>hHei+e@vKM@ak&5n-8}&Q(dZ=@bQ)WG-Q0&8&g;kZ`d~if
z!)t4MQpBP7v8*M!H`5ZsmH<NVb_ZlN!}w?pUGYm`AQZsv_IKpucg<Yam^?oxP?2l!
z@5#s*uMRG0#NYQ<abl91-f#lo9=j8}8EVFM$}S)OQ+Qu*KzAW;ziRznG&aR-;+mpl
z^pe)cXF3G949}oQ3k$efB)hEiN3Wik0g|UoLv0V<-}P^fbJ|2_itHqYzeR0xvCzFT
zG%JlB@sEPkq<Hw2#`V7*!+XKVze3m&6i$G|ra^qx=2@u$vt3Qf9&qhKkF{N&OlU9Z
z=dt0T^mh6AbSw^p<{dSF6LK%=cN1B-{;iI+E>*%3Gj@uzIdg+IyxO}>b+;f)x9~A_
z)ydjd2>47ZcpQ}ydD?)zepfhP5Qz{Bk9|326vpy$NYcT8A;mU+q<rBtBl+kA{alz~
z3;(lzH^}-QYi@j8(kZ*(wMzL=#sclo2b*P=<^Q;iQezjGqBRzHmG1pv3o*6^OIjbl
zi4gC-9`S5`U~})egBIUXpX0B{y<rZf{}Zrc6mI5Lndma)B{eYsfUS43bCfD>se102
zjtjjCD^*4!vxftx%zBi8Bgm}(kakw8uXGjjn4)%G_9xU6A@27vot9r3ZPrN`?9&jQ
zRai@qHAMFcb}CMg*~ebhVS9XTOYnTicxL3?tKMMIzb*3qzFx(-eQ2f1x6N&;pS?*1
zqjDR>`20nmqyMWrX$q7?$>dH%!;QuA&+1d3okR+*2zLb!NNdnH)jH($B%1C06VpW5
z$h%7)>Brh`kS^7AwMv!8q(e@TYU8^iyZ)7S><C<$%3qovP5w<`zjT9D^-ma0^P88{
z-Af}WHj;Q;dAMuAJRf=!$2wLiw@_$cn=pwnJrrgnqpj#}4zBRf(Mwaig=Y(LWIMK*
zkP1!9g`tAfDAk<#?$OA*l%6%^iT(pH5!U=8n}Wfw4}&cw!f;}3Tp~bzV;xzK_obGf
zjGqN<OiX-m+JPv1_!mhGE1sP-CT)+rECARTkKIR%(pN5`f~Z>#USk~Z#h(x8F{Drr
zOwk>Yue4P*DSVtfeJcR7xo~<nS!=@Xh<H}&jy1)wzMoT_I%uSv0Ro)*#k}Xyt9v!9
z_)e44VUZg3I7KXZFW@i0><^gU%^}H9d%El$$Q?v(Z|vAMbJCgguN63Ol!do*9YPF~
z<j-%9IdIdrOsl3r?l;EG>>Kelp9-U}t=ZF#^-{EcOE9N<REDlEPN)%Qa_0L_Lscjn
zt{Q`4@&Xs&n%)fv&%*OTfx(qAIPB5`ejc7yj+-jk(t}4<zl=Dq(IdaZ4q*q<rMEaw
zP-F-ZKx4&%)6qUT0F<(hUzfR)gEsv6cAOru<FWAUqH}_c?D1-*!31IG@4xsrd{^%F
z#U8P<0Fxh<Sl=$o1JRlfZRgk%-5-RaxN4~d&h;MXhvGkPd(C9e(H%(rC9T}4Us<uC
zD^w<`v8wN%6M-&yG<}{_5zvTh+O-Wl7!`WkYO7>nRWdn|ap~_-DZ}2XnFSxcV!Z*~
z;O&g$=4^=kFwzvqJX?|+p(*A>TKL+69T*#x#bO4i+q?fD49EHJgInE0j5@+FLj?)m
zzT8D9(-W!N^kb0uj8x=i|HDonTw9o<p?uwXKK2B{0ZjIAAGJnnv^YYR<Zkl&=bd?N
znsxUKP8cyfh`D(4&Ma(AQ)Kq1S0C4tY$4)EPSnz2I<}omc;eyFJ1uHk`RAQ0p{nqu
z?S)2tmvhD7#mP8DBNbNRS)Haer1B5U38D4mEVQuWzdCWg&U8b3aO&&Vul~mqFq-qs
z*COm^xegBlW)XQZN4BXRuH>A17gRhaTjf;Y)cDJqSda>H>y1l~UM1fk)mzb`r5|9?
zE6cvu;G06%uL?rDZpYsvi%wxh{I}zlK^!PhqdYTvX|a_-bAHjcmmuA9+wL)CwML`!
z^SIy@+Y`uV7xm6O3Vhohv4%x32~x6zh_*@X@A|U3f1@*#V5MV?U-jOC5R6rLRhLa`
zHZ!1I>v@4gzr*JBrB-M5U7Dp3Fs3M}Ldy=JVae*J$0L~uh?_SP{KJ%PNxO2D@m=ym
zOA-R9V&a7VX$<q7VYLR%*;9~4#l*cmw9T}Y*yA$%XWbBT%ZNus7Ptz|rYWRC1ReuE
zgB^P)DN}r={?kX?@n;y#%;aVrD~`tj#SZDTYy}Q<S?1LKU<P-d+gRtzf_~6&n{^3x
z)UFg^(N@O?l$J*Egs1;whLNX|nmU2>@=0D3Uag*REzGr|Tj(cm#mt)xk;bQJ>h4G|
zwJm2a`J-{|2%go#8H3ctQ_|&2dqju-d?^tw;-kpwu3)B4yXI=_h%^nC%AuU?ip>Cq
z>3uW)Nb_ZKvlw&-4=Y79nY7i-ZTCH>?>1P+qTs(N4%K~G)m~tDdv0T7TV(1hu8st5
zZ|QJx^ETI~;le3Xk=d0`h1lNMPx`W+_CSaVLX$3n8Il3^J_nI{<yLqA-c~T+sn~2X
zMbrt#)UshqhbFF@&tp|itWQ|f-PjPHvM+>mR#05#&&A1q`|b+QD&3kp4(T8m&Z+A&
z&jN0al0W*kQ$FL6=1DNvGuDAaIq^HX!a{6JDtxBf>jb+GUSD(^xdw(E*bko~MG+xl
zh%VHXvdqSae?A!tzf?51e9$j;KX(^P1C43bwd9@9EJPy2=cD<9x1JGmf1FSJd8oS(
zr$-&lYxQ6D7-1*FrIpmwn3AT%IF?<gdmQ`>R+=FdWkjhRcl>Zt(&6)4Pp^N4pt-}3
zZ$oq^UjL+@a`7dt%{UR~ZH6|=m^E}$QX^(JoRx2qrnm8v6@$m9ypF~kGFkXVv?g8P
zxT=~JFzTGZCz}l2=iAu&m^~}><6`?vyY7Rgwx7_l0dpW?@PQ%}C$ONML1_QF$ivQ*
zx4DjG2hoqqJb%QWhs-Wc*4-eLMute>F@v!Z&!89Nmj=ps#E_ny`D~N{{cz?{dtZR6
z6&?CjHh1?VqCtEuCY_$zm6b^|_8>*}(s%n9;N`qO&Pr4lm;ZAykLJBW5~<MQ<#;SJ
zF&!ecy8Qn|9)xsinz4r}w1jK7nO{~#h`3L^*+`X@M*;Cg7ABf<JI***hQ>WdKlOBA
z)1Yo$)y}cmOoUI_b%(i7CfGa~@nX%H9mhn_U@HV`QW!?EB|X7E8EXdl{tulec7RL7
z8b)}vyu9{%{h_Q33UJz^d!mPU{a#5+Qv-VxCuZ>MQ0Dff1>FtnAEOD1(p?cuKY@ur
z5EIe}eZg3&Gqe+Mlxc-G<pZri*D?aMyZ%bS`oj!Tm|j{fSSo?>kw9vYR(T{W6V;_M
zqz9hHkOh;Q8+B7o9(I`X;(?AowFQZ#%brlM1QbzK(sv)H78eze_~F9yr{M9dCG6tF
zGQSEtxFTsdqTBg4CH6M-WX`24KV^z_Ajm0;g>dM#_WNpKcRd$s$UuGQe%kX8OPkRK
zJdknbw2K(g-8ddH;lV&=1tXDQ5Rvt9a(k_7ii3e{MtKszInbxnxj(TBOJI<3RRuoq
zFuW`A;qHpEo`6yZmQ4#G$f^b-uOFIITcum^6JU)<AIIE*s=?rO|CP%2+>=@H)rU;(
zLmMTJg8c3wDH>>SiYS32*@=m3Dw#E)oxhZC`+VoiG}_f<=%JKz$^QH|#>`^)1>7^=
z)iiizc4yZ%T_(w_C?##{P5|b!6c(vcKXP!`^BlB+xh6c_U>>xpBehF6!Ws1~cF>@@
z#lre?DM=x?3PyaapD{E?Pvukl{L|9pdH4z58z-*inX4cxOZwFSq0oMjC+dgb81GT8
zZ%bH6hJ}YS5;GF@(;R#M;tzh$;+Oxo8@@}X$S<C?w6ga@L$^HL!C%lFhOw{;;zPaN
z1`Bz91Mb~=EKM_1OVixi3UI45)i|Qfde-Q@>Er%xeZqSYqx)=104rX)AyXQQl#Uq5
zK{*J(&iPYW*8r(#0Cp8#V-ivf!n3L-nWz|1&+WyJasA!j+2ccy5|n5(A8?AJ_3kq)
zDp{*qVqnYZ6=-^s&i|;?9e(K%uzpfi2lm2Qds{L3pGx5QA^vkb#OhsjFV4>nC?Enb
zZqLqYn<bIh#wX8W&>Wad$K9HURn#WHRhI&RRy5T9{mPkt8Vqga#Q9f(pQmRnnxhpW
zA5HA!r`xwPRHsaL=*_n5i|2h~lESmjO0K9%FXnwwuUnphtv(mVhjv<S&7}9%2y~Ag
z;F5&V9`82hKm3_Y7|W0qMV802YxFZSSLtmrXA^&)9B#Sh>o|23a9xvFzXvB=f3Hg5
zmCrG>z<YTCD4lvU<W_A7IV!(FMqV7N7T7j`b}hVlKK02Egr*6BT&V2KPIv`mNIJu@
zuwLEpyHCJOa!TM&4r@3VFwI?x3TaA37PC9Bj&#2RSv(PA5ercj;V~UjGm=^PXqZF_
zt$~)}*8pHSJ-Hv0=E$h}9pghY9e=hc{@&lpn;N`wSR7pF>fse=CKu4FW^{RSn?oh%
zVz-;@Xm^p{6%`hgg?rfkpOiXYx$-D>?ABH8bXre%j`noLWL_3KR}4~n6B_;V1}P2Z
z69+=)qmiUlcFV@6o6PxS|G}PXicn)A^A1pYL}#~J6XN<E+QmYJF$>XuPL2Qn3J5+|
z;c;fO@x|7#dJ(?g9-dx99=~FG9!T&bLH9@B4Il&v7N&VmJqkf$&J;b-St=?-8$J}!
z`R2Y5Zlg->9bdj~?GhfmMCBN0v}}RH=J~d|XK><JFkq=5wVu>A3?%V&F|Qub*-}Nc
zrfqq4J~G5AniMKpz%a(NF7CL~d_j{XpYy1Hq$#cQ>XThatr`dU;?Ix&U>5SgdWEG@
zZM<Z^y=Kx*7TSA@=`<3=(`Q1`VL$gW<on4!nJi;g7P5}3)~1F_rJUTp{6YUCPp8}-
z$#4QT7Eu-sUzqTGz}hE7gTCIE81P$HVj8$8LjPXMhURl_rpZg%bZcwt7Z$W*K(0I&
za;v>AB2Ua6*!4N_)NcJO1HnLGbkBUBG`&{)2!~-se%WH~Cv??OX8x3`^HpUzT1PZ+
zaB9XAdh<wZ1_PT+NhDO(3{p_?ugJJ)EZWL!tbgfssCJP)^xfoUMB6Urvt>iO?%X1b
z@1i|>;CSS_Qv?Irn+MDGUmxB};=lf7m!?Q>Xi;|ZDZNwA>i_E(>hWb|b9Sy8QM~zM
zW~0A2ga;F&J(q)hodPy8D_ux?pek-_e`q-ia+39yk7}e$Rvuko<c_U-)PJ`+;3}CK
zn0WfcHJhW}18fb9n-+XH93<0n67<W}DXbJ*7(m>5b@XJfOx8ywlv@4t2vDEQMn*<p
z)a{iZ_CoxyWiIv&4#_zWba9%(Cm;lC**<S>Zb}SFh5?>QaG-qYO`kM}CLNkCD_iBL
z(v@XNF8EnEy{+PKE?0>Gy3<#mRZJbWuvX~b)}cI%2sNfZ74$QWc+epn8(AXC?Do^%
zG!DW@jn=a~Z7M|A)z5LFlTcb%7|ul8TmSOqD!;pUm|4%N&3#(p!wc<0Q5o#$SdM+(
zNBi<YXqofE5?;-?na%&18)un-@r*Y}Hm*OI<c#V+dj&;AykuP|EbJh26ZTPlZLMY{
z`H@#HDoT<)JfqIs*EVAkMWKcEVLS>S2l_7|lLabYKWR0#2aCQJ<3x($miYj~IhOSM
zEnUd8-LCVxO^wMJ?uEasETuSyrcqbI;~#u;G^&d&SUDYdod9gQefC>DO6BaSUNKwt
zIftAM3!DpQ<^^RP!*Hl}Qzm~I_FN^n&2S!Z?A5bm3THuMd*@)LXU*_jMviw8b=Tmk
zMRg?;4X-Lvzd%w7>6a&#h(Ee8leM_A62OPpP0cF{-+Oxtpsrhri)j-k5hnEr{bPh9
zb^iYS+rKQOS&sZZXY$j$mSk+}S4Ybe9I(=uxMdi4jzVh~A9;9tdn;q)JiY%Fttf^B
zhY^jzECqB!STJS^x2sD_@JF88%SI}WL>3FKppgry|NJxP$8=GPxg+Xofy+#*x>-Vl
zzE8COF>R|mtD5wg9#v-T%foMkDuF@vy|8nspJ*|uEOUNtr!V|j8XsjtspWrT5mQ`J
zQ6-t=@_^E=2loKo+-xxAR?dBT|3x~(N;ZES7un-|k9t~rGR1P^AR@q!G}JZV^}N3J
z<;zQSAvryht0+~t=j95;x%#cU8zSF<vrRpQEq&zqcV9-{0AO%I1DX>Iwk3P;47`&H
z(}0zmsyftxFhvMe#mAh3G@tO6`s9o1*_U~K;BZOJvgA*mku_Jzb*w10U|wgy5e8*g
zY$>BuDIL{E6EnrY+4n?U7V4;o*%B|s`H~iO!8j@8<otYC`d8e&toAen^cyd;WrMva
z*O@Q$BCdbVB;pdR;m7{d|H->l6c;@Q9aU!=jmB6MPhVq&ORD~vm$%gfpSAc1yNeL~
zk)$EiXn_#~LM*gLg>fReV_<WgL_GftJYiTDc7*w`UQd8!+UO5T0#n^nlUnUzc3ITY
zx(9OuO`w!I*ZiU;IV-7QAXldwf*u~23M|LByxfW_Gsoeef~w}pUX_F$Fvp-{Fou|*
z#N42oZ`#VZPz4hnd8#Tbq)4@>3ua{#@q=>#f2GNMBNWPdAw0zXb_2^0mPfP%CF;4g
zO1M-sHa32yMIkwp<Mnc=ND<=7F6t*b@aOm%FGV#14Y}&sqw0iyujf{DsEY{yr(K_~
z!GEKM`H=?=QE3EN*aQ4mY2>(IkD{`k3%0ayyUv%#I5ba82L)Y=h}hO}ku<M_p>*dz
ztqK>hfAntHh0bdV26AkaD-{+(WtZrsqy;xkEVrW1l;VutIqtf%7xtfoIaetelO^Ix
zo!HV2lvTY^i>EIh$5?>LOjQMSOC>ct0a^GfPtQ@-F>IMCbZ4m|!oRS&^B;ft6zAxc
z*u(D9b0#P2eb~#Ysrn#iM_p>?sc%lxzr?Y`5ulw{e3}b@h1`OV*~sZGpYhs}C7|fM
zq1sL>-?iQ3M5=sdKRsegYtXSHL%mkP_eMUCj=p3YvZRJ+h16FX4w0q%a<2*en7A!T
zZuf|k0p8kWKX!!;4F~`JoMfd;7#o#%`>BsW`NtZ;K^pP{%CD;PqcDiA)&9SO0yl^9
zv3Kq}Un?#w+}2oLjix?O^@tT!UCzqF#~<{1`k!lA1tn}rAcB1r6Czv;sQ;`Ax1Y_7
z48=!Tjmsz$`|`j7@D&AAnGp~A#tFihdG|UD_yZ$NnXPN&FPnkTB6}Bp)whCCP9BT`
zeq%*yu&7W%7?Fb-c3XA=8<}|YL4v?SSX&)S(*hVp`O_Ej|IeKuLmBhR*ON7vs!F|>
zXGMr0HSRF#k-3ou8DHv+stZ;lqobu!jm%C!xs%4$QB{l{ormeu!~zRCgPP~hpQoWQ
z4~lOMa|>O4TR*i6eD|J;pLxu@gj1$1e;vx>bSrFnF_ze@|NGWS+Ph6``1wd#INn3$
z!*c`E!}74&!ciI`P_*!KMV5MLD=Dr5&sS*(=WC2MyUz-{e<lgQ48I#+;eJ16D~9u-
z$2KD-(1xYUYH^7U-FX~<VR@Vn)95~TdU8;WMo|$;Sr&DXHm{^dI%0=Tj1|P;6layg
ziHN@B2xFr~n&+&R6tX@Srn6wvJ7A!y0JE-jL=XM`-u}ZB41>!AAH(YEY7f<GKjV@l
zb5P5`m}GS4+-zKuclHu$fqb%OX4CW{##%QlHj8;jV7RLsd!ehY>$L!ZY}yDL?>V6(
zjVYPj+OjqJ!Fv0tT-!e4Q5TzbxC5}P%%(PT70loRsroY8@q9ObKy{)O;?ZE1Q_JYS
zKPTw`9<_^YFIlr7;CTM|*li{B;!(ryzO?FuhHaQ+%zQVL6b(_v(!PaJpycX{6?9hF
z7DqK&U!dc@qpal)E+*%;II;OZ>n*4Hd7*p<Pl$r)^ZxFB$0C#a`^_0yggs=v$6;<_
z+%7zI*1DW3Y#iL(()v^@qa0A^{3<P^!gnL?+{VTMmL@mj{jEYYM6Hi=0kb}RV{!6`
z`wl3NyjohlML$*s!%d$=8uep@&u^7oEv=zGhH3%11sf~sb!Q(AXi`7N;;AL#9#vTA
z1>%rjWSIfVP~9miNJzbUX#kv<b+=nL1NTj^@~X6-e*Sir!1HCZ{merIx!X?z_bRL#
zU(%%`5CCUw#GkNYKzCl52p9GBdnaSa2Yv+9I}SZAiE8v1!O+he^bUdQJQ#>DH^r2A
z^HA-6#OfwYoJW_-|IgWy2~g7o8%f0z84))|9iJwRC2Gl`XW%qD5Mklx{CotH<*|i*
zV;hvpHMVB1kXVytu+R%sJ>?Hogb*fIfIvGl^3f6GD3~o!5Xmv8Yn#o{2)3ysEU~CV
z{bOV!JY_V`0A>JiNB{Z6Y6%oxAOFs=*tw>N1(;K?x*HBOpRL|Zi#^H|y>?{3ZB=KH
zvw9tee57ygsVOV9AuFxf^B`-33;To1m4*k*jWFD|tOu`xB@XF*1Y^*O_Em&G6Pw)&
zhkye@MAh#8nBwag3G{4&Q(L*GFXXy`207aG*?QDlK)}%0hS`_*OVq1NuQRaX@%v8#
zy-@gF&hW^|?gy0h88#rpwQjX9@0G~X`WrgjNg3Ytc{~{dW?JSgr0uU8mfGVKrB{Ta
zWdF!vthLm~?04*I_i^$+{p!`7S;Y;?a5pK3xqjz{wDC&dUrOBmnuo@|GQUuv`Zc+5
z5VHBG0m|>@STq)YgEZ=qw)G@#nYcu$WJWTDUL{`OJ*zYz8_XrJuUxWGEAp;KK0KXS
z98smLR`iGqw?EpJ)cx1^5S9R!^YdAOv&fi3TsiU8$pe|5eJ5pU5WT3Ul6kW&wAF}C
z8uYeO0~^O|!hdYdVmO@Q+p>%8!GrSXMQW9+WsLK@a2g`WLxF>v*q>CRjZ&V(FQ?f?
zmDV(y`+I9588Qc%YJRu_>EzU5`7h~;p=9Zr>GX}wCmb#lUZ}8EC=jbmrh9L`o!o4T
z!$D>%r!|d=nfpmL<LX02XzY`N{it85Lvd-*Lbp6pso(KFHOr#>#NBl}AyAEllr24)
z6m{6lHLoXn@P&S1U>xhZ>YiLxYt0Z+tH&r8l;%@Z7MoU=asoMLg?(qMG1x8>cc^|5
z0Vnsi8^t;Sxs4s2H*30(%KAQ>?XUIs#nS^itd4;c$oYH6rOKssAm#Hn?5?xuSO1Jr
zQ4bo##taqx1p3|XnKxsxFg#aj8TZohf6+;oX5)29xGk;mQVjXHRFrH@%oZ^KBb|Nv
zHyeih@x{zF<A+M0A%Wmr8v7{)L2wO?N~7aK>q@T>q%Q(YO5}&{yWhh-Z2ZD>>8n~u
z0-w$t!h?j1erpD4eA^QEVLUx@zOX-9GQ4|{TyzaXCS`Yj`kht%Y1js?tUahCyi$FM
z!L*{r)Z7ws?)8t4lpf3yWX;cDoZQ(NFV(ea5kU?5Ea@-tTPH-5=5*&VhTa_f7a;(K
zlCCRP-(A6ZB=(%SX;5$jJ49EtDuq<U`-o|O;~Fxl5l-S~Ks{)jg0w|=8N6%dCTV?K
zfwq`!{R@rClPZ^!Y+}#u78YJ?rj@(AoIzr?^d&O+$lqoWI#Fn&S+q^$fgOl_(;L-t
z9I}qsg`5n$f4+q#9E_oM`IpPXIuT>W;CnU1chunUj9nzvx8!bkBDs)hGF3p*vm4W*
ztcl;Gqe^FnMeg$I3{*A$_68JEDp42v_}tK+7abow(m4M!K$@XLu?=jN`k5bm8)-53
zYG6|}>pF0Tpci5flum;2ZneKak3uVV7k{d2!^{?;tmjo?>pBaqHQhq{Dr&BMQ`kQi
zIE}AkWiW>=Q6kugrHdS`ewwb__6*|ufv(&1KKpxmEiI!?)~x%|U-JLPz&v&?cS{L8
zny6>)a}2r<=hYVS+#mI()I1#Z82%%iMEbmj!K!Gh&t2QG1Q4J6$r5~Vfxb8=suRX{
zznw`#j4Urd!b-IVypmx!eeR}URdL=qESU|gV|Bu`6HaJ>rng%@&}H~Lo8nE<vTH#y
zW>gAGw55nTKU9i=>rQh<kKQv}aqNAhbQ(1RHGzav3eJzOUXJMHhfv-G_38)TY+`;i
zzPw_CG^6|utZGahG_RDw5@o77Lx1R`oqR9q;JGZMz%U*CnvF-(Xqsn3ZP2~kqM^t;
z4rwMB9Jw()gG0To@@s{28gqoUM@p?=;$XGT)Fd+F3H7uj;L{6>XJqHzfo|zDJd~Xg
zmO)i<8EM<>q3`O}stiPCmDaw#{>ls=`1u5pWtA&L=~cf(rw-14ftp~I*zb+p<+;7W
z?$==YakZaHl2tM3uY-V}nO?Gz0zJE4I<kP~TvPD+A=MGjH!FiH0wx()var}v)}h?)
zMNyO$RW;q`l$#bR31xZ(d8q{kv0{gQ)6H^6)T?Kk)hFsB@WU~ISyO15SVEO8h`}#m
zi8=rS=gqcTuKvSbHE{dsnhxq6kWhh0b4pm?eIr|)1q8h+Z7e_E7+SUuO`r6cp~T)1
zQX(ds-l4`aub~g%UfJ%DYQrV?nG27aU!C4S$@cYQWz2|mXfB|q<yhqf91arAUMoSO
z|Bi2J{k3$@-c5-tI4#$~^3(h0j9mf%-uS+MH%G@}`C{eCb`qyqH;h;Nu*AzAktMct
z=r`56*lhU>>kW7=^va{bqKtF3j4Ky|XvyO5J)JwUszdjXeCP?Xp7QQCv4+v4&9&=T
z7vsO)z}2Jyh(On?cK?y4_7=~gu?K!gWIotqc!F)VedxZBDpCEa<GG<9#gUDiv8RFT
zchLVgPe=_b#q!TVw3Z>U{buLgas974-heOFfN99axTM>MkfDTt4{z>Zccq^k3=I>!
zXu4*RhwU;Gc30PR=L?NDRNoduffs|%0Neh6XXNOI&0lCNQR#_FF8jO`I%z@A=5J{}
zY*rDl#g_2`vc;&ngAP0jLF~YutCf3g+`3~anl8XoEv<|$wLi+C`#suhzC7-M1drU-
zj;M4Rt^@A$;}+4WnIN<f9e^42`{_TD6OTKz{N~RXMlFsllXCr&>R{)RGkRO#b=HKQ
z>YIXGoKctcrqq(!pWI(}w`9Qg2fFZ}Q1G2iPBBRs<UFofTFHL|cC?>eqj&PmOTB@N
zi>X;gbY!gSUQ4<VY0g+`qVd@3bMotv;;5=KFPQ<vx$pVxP*iEKo?WDn25|_I$QZ`$
zGdNs<6wTN{itU7FZ>vFY%DXg<)OsjUtOr+ocTEDe8sOGr>>LLelE4?g$TBz*KmDqn
zS?=2O@u}A<mz@Pd`)9YwHzxYt0w7==%=x_|ynmC$bU(&Nw^mcMSp6k~4T*B1TLOLW
z%=npBUpH8l0M${;{B1t9Dn{Z%$=li!XDdA|v!FPhQoUOha+I5aG?j_04;S~4)5c<L
zPv=VD?^iMtc{({Zr;(Syj~pnJx#thRPt@WnQguP8(2mNMt^VoF)Dw5G(}IgSyShG0
zs5rn4(YYqLOxa&6r6GimTiq{kXjCw`e!bSWxa5DZijTA_i$sfHNrD>ESCo`fK7FC>
zx!{S2HcRC&#hk^o96IjQqNP7pF*V}<vmQm1n%v5Umk<PY=~+sGP7cFMMcn7Nb=YfQ
zg@9nmMv4yCMeaf+uI!ACs{h@?cJ)fENz8qdp~xJ_8wOSs<vC4iI>0tkukJ22V+p$!
zJzrIcZVLK6@Rll}A<$EP8I~+t%qyJ;lfW-81$D6<k~?ww0&rBM%*%mgd()2H@9Dgn
z+@a2~B0stH(J9?};vt@Jx-NqfdjqDPUxd;sr9=$EUSPA6ijn~*cKxBT+FGjKfaGG!
zuC8tg4Yp{){T(=rU|dx`-TFjcE(o#>qh_5HCj6|4@!h_cwFM#UG+mLiz6?prmb+2Z
z1-8qka(!BY#H5vA*5vC2CTeSgO2IQG?T_$}g{<hv%<n&Zhmh%JERr*Iy&KF&Ww)7Q
z<Ss00#kXWLP@asR9;O>_T?bar#Rvi?XKZU{mM-AGGKi3>^u^3xZ2j|DID5NA(wln{
z5_49NVhLK(lV9~0Usw`#&l(j#I?1dw^8gD#-Zp=dY+4*yO5t4}RnZ=W*5)S4VeZr@
zD!{5vVup{%8uaQ?Io|Av8Q$CMYT5Dri1{UrsBHQSm<<Y32h|YXEcvNuPH#h+X<9-i
z&uqw-9r>S_w>>I-cq3~$BwX%#yB=Sxzsp@pexU?(W^vQadDiL26nHJ6go~?bw)AWQ
z{m&b`Mce~SchAul(-59|NU=)Xf2h41r6dlJ<o9>`RbLI+o66l9dH=IOecr4<h2SuA
zfZI|z$}MaXe9pWge~Ok^ULLSq!AhLApkouTQGha*-(!RlO!r6Iv31u>zw%{Aax&gu
z+uR@cLI!6$@WCB(#;APk^7O)gqgS#oYY)f=wk=2!t}gmYODoMnrgn7^j?-cBF$~mA
zpCB&d(D^9)<~Jqg?UqKy0gLN{5-8VEKtX<ik+^r5Hhmnpu-vtE=X`k7s_q^VfSYvX
zSx7Yj1cP!$yNE~+k@EYPdq_@onRs7*>TB*#b2d4r#iIH5I>Ps_nzjYs4yQADnn@=o
z;)*S2%}WE_xZ1ssctJm;ZZy)6(lq}8aX-f`^y=O|hpWg)PJqbVv|O-Cz139=S(`K_
zd;S&7qb7&fEL45|ct0k_Emtk}@703O1p434z?G$R2%%gU1oacJ8E%$44}Z**%Nvg6
z$5sFQ(sH>7mR@zmho$7BQdlDsO1-IUmw!b}Jk>T&XF3gWKde*f{WV*zRmIc>0bn*k
zyIoPv4Qg)Q{5yW*AuF%v8GuF_a-k7?0*CHE^+Jf{kb~l%newF|5)I*#nbxzv`r)Re
zB{to=oa1Ij@Boi%vd|l2!qJ=Wpx&4h&B=X?-IuKc23i1MQef4bq{S69`ka-x7a&LT
z_6>5uO<Tu2Xc!s`f#p8&JGZ13W<?)TYq*<i$}=-)qxyJD1f6**!??df!|e5~#|Irg
z-xQr51!dYb;qI-KFbDquRUwkXYyNt2Q(&(6qDwg=@yedEttkiPrTeV-*(SQ-v7-GK
zxx?x17y@|5dW*MU0YjMiG&p5gBtkf4*1UR?y~4>=c*}etE&)UEyZy9GO9eC}wMO|%
zuDv--SrXjC-Qah`VXFVK7+-Kw`e6r_meQtc-#T{5iPkC`smf7-F0Od04>@l$;sL{0
z90gFzq~_H1sy8QGGlB}K$~Vct#mx?pO@86bDk26A(xzwM-G~j&VkRHxZzX1!fLR`S
z`R#_`zKVe)^^!!j8b;!SUi}|gp?6;uLv7`W?XM1?16emP62DwzUVElxR^g<S$u{MS
zxpO+~X)W^#<W=UajARn`%Am~<wuzZ|J>F#Vh=4@$6>TvleBZ%P%D&;<FABu`vCNhi
z_ESx7)fyN{r|glyy5d2D5v&Fq(aw^NE$NDV9?3yEY93FxuGJZ%H67<6@FU4E6yPqN
zs|n9e^pnVYa>6coabyY2VkeJqa#UnoxUhel9buC*OoGb=A&{7jM_v7C03!DndbQHZ
z9o{J4%D=;Y0^b%K5|YL>>bZc^YsFR2M8O~I1o7nsF(+uqKgQK<gUti^{Oq%i$SF+M
zF6l2cCiEn$I*PcDkhUcQ&s{Pjlu>@UQi~h_N4(xgtPSDvgV~!lopd)(iOgOe_TAt2
zSi#}$v1~GX86y!xIrbxKt{~5VhCKM*-3~^pOCb8JpKt1zn^e!995~+=>;$y|aYUbM
z>yqxIbdIUimW1{UywX^-s{uJa@Z)#5>1!T%V6oA0#WN9_@cMr!m^g_6ryyxbEGp}n
z6{E&pFXT5ZGX0VdzJoq3Cm2-Hm%_oF_~*PHgC^D399(=0W^_%o@x&iNzo&}qa(e(I
z@GYtF5o5#m^nW0XL#(V*!N`llO;{dAYAaCx38+3FGhBpT?1Sf;zJB=lSv=6-Afbw&
zAshgYP^y)1kpn(!o;>in9?C5+MrEX)C~4BVk?zYG!-$uquJZ^*_q*z22c?SZw8X{{
zI-6p6%ZH~zvk4t42?;Tz^&7{+hUwWpzZV%o=1H6%xwH~IE#D|%AeH%P2j*V94pZXD
z5n6iZ*zvO>?j<zALZRLq$lR3e3kW*T3<h;mEDOAY&aTIuXpH$xOQ!2@4bM=&AC@1h
z)ALnI*nLqr@YF3OA5ZYby8}|)<4|u_iIXBKO5?u@;@fFScR$<XCn;#67L4;+MgWG~
zKQ3Xm`2=E!Yk<BZ{_o$<UYl0`2G(ROe*f>y{KCSBR-SYqG%FVjk3HdIf$y1GMi(8t
zONn%cpF`3Chn6(j!XJoDsbXw0f6bF#6t9@+m7ypgSb#&;TB@z@C9*!oY-}7tKAJzB
zQ&vJ)#ZJf*_rKVGI^1X|<M;QkAGHU1Q<fQAFKn71Yl}v*4B(3)w8XbdN9Vmn){xAp
zi9gpU8S|r8oF<v^(sd^-r(3YrmOn9^3hiQ#(h#yN@+Kx~iFt8hQnK3Sb)9>}dpIiw
zL|$wx{b_Th@i_`4fWV&$da?%`5lRQ>eVfy-x^T1yy?q+~n!9Q1S>@=9lg=XUwtk}w
zqrak9t<PWBUnl~mqJw@f3eGRWa}4-_#r%b*8|{3~^+urLW)taT?+^YL*?xo7j4K^6
z*C)NgS&>O@Y0$OWqy(j_<l6nGpWw*XWZvCZJaMh9P<Hmd7bOx(u`2aTBz(+u7|ILd
z2f2f!fv90X#g@rDN2-D-rx)8Rp@F92XEh`7*fEPQS)O6td(o75an3bYoo%J5S1f18
z_yG}=*gvE;aZq`#$EF<~%}$Bj&_|CSv@XlFsG>24Pw<IL{L4}xD@&}6oZcvRat5;Y
zrGY%Pz9<Hjyr)M@&+?nmBcG}br*k}hUkCR3xJ}oBa9*Q0Uwj>HebB+baQzv7SqaS;
zGe!9A;?`C;*dNXzs&(~I_4;S2;$k=BW4#duAcHaBaGR1c<3EJm8*hE4r}_k*ol;jK
zrzM{jQh5S3XtjIyK55Vxx^SrF++nIcCE~8p-(caU#>tzGos7?@?THf2kuXCljZ3VH
zAwawE?$cvcq5Bn)QPns;GJjCmeX8eIBA>Yq(L}!|$)7v0zm3)bsiY|bDISIdH!%{w
z6-S<x`FLNk-jsUEeZa5RE*xj;5PJwxVJK5vevS25z5cwnEPTM@O@8c}+Sw)(T>tME
zS+O@rLFERc8npLQH|QT<w6w^KZb>_%6pnlX7(MDbo7+^;MxXpoS4ZpK9Effm!-hI;
ziTFqWPqqSX&SM5+;n;i2_BQ#bnoh>j6Pb;M)Yxd!ms7r(z?Bgf7?kR>8&DmTYz(Br
z(!^i-^M_x88R+_fHrhg(<x;*ed^obw;L!GHn9e0~OCXPhe2Wwb$qgWRh|Ac#a_F~z
z;>yjJ^qSW!>D1=Fwq|evVCwjJ_90}8<qe5KRmIAoh)nkhBv}w7S(1V*O&V6K+<$D#
z;M*T@4aFKR^WNew(_kWIP&(ICt=U}1hYlj^PgJMyrU<zdXrzKHOMYXN;jOr-HxQN>
zfNji4=mbM#-C76xvtKlL?blX-GdjE8_}1WTRupa_%AF&~R>7e^ZPJxyUzV&`N=%Nk
z2M;1Ea)*Di+4(?9u?t6;Igh!|w4RwXHY4D2{NY}x#r<_jP!aQ?^M7E#;}@@;kb>#G
zm-g;thcZv;)r76D!tNFhtN+Df{D6Gd*PP^hwo+cYY#5;u?Mq9x`@bNDoXH!FW9%hC
z3IFj57fBv6GXBc4RCc?^ykoG%;WBz5BmHed_qWdTB;pxJiXLPb<NEu(dM~LtbhGs8
zD9)NB8%kc6X$TccEWM>Nh$Tw;PJQg`*xKU~pHW;iChln6t|)>3#rE&Z$UG8FR`f<r
z2+xm+;Dd<yHTAR}j*!S2D^Vdy{#Pb()*=opNhBk^*r{0L(yV_?63mHtigLsB!Y|L>
z{$KmEU0CS;WF28#f5%R-^aZx`N1V1<SkMa0ze&dQW`!HNTpc+O-OC5DI;1oU(~~$9
zdbWtz*zw}2JFdc3-A1s?A1R#6OaA{3P40mI6Y8OP%K~U32(9I%Y6;(Ttl#x(50sHL
z#HF7`FcRqvrP(BK<uv34K$P`aEk0n3`y|F(#f>Dtb(HW_)X6MXB~ej^>Gd+!yyUw}
zp;)4wUQAXHTfV3DS*L4=O}sA15{EM%Ww4cYD9#H@YBm|bEZkU%FUDzBhMtDxlzf01
zf#So|xl@l9)2tK?Q>^<HC8-igO}E84-?vbH^+`kVriQAR#~9``b8+OpoAI)?iViH&
z*p+wkXze=Pa#>-a=^I2QPVn8m?HLT?*66Aj2i^Cqf5qtx1k1H61$L++xAid*>3neA
zP#6Fn3p!)RzVx3O@#EFX@(VmzpE;^*tpH%N_EyzJ;l`OsM7HxEZIGWj%tqD|?leG^
z<4)gfg>GK-@Li5mtYRK~<G*K2(!`N%i1o?4<EZx@#-b5shT%|UHmr~`DW7VeRun^8
z&b9dVE3cR)wb5^^g7t$oZ%*{`bNImKp*gH?`Q0$W+3B%OM^yO?r}<2t-hNjS$&&uZ
zldCLkYD}y{H?8(U`ca4vsV!g|yUz0t?kM!xe>%*s4!|89A8{@KsKE;2-ohcioIQ12
z3AeF`d&htsV_1+oIc?lARxdW*NMLR=26rq~@_X%cB#*vW@=N-^c|1CEL@2(le=v4k
zK<?1=s`{k%%@K7wmzMhsdn*Pw&P9pO3+&5Fl)D6ZgQwbnR>IXI35PL6TO}=L*UYH{
zf=*A5+`bf<$LzKCpE1>reV%_UF48q1;gX%ghwfN4YRN>ETvaUUP)dFAC!}QIyQ_{n
zM;wc&1B+OyK^4FR7oYg_)?}P#Mt4$m`bKQ&<op-2)C&uFt;@d?v<K=OHF^FVc+Tvj
zxBJ&cqq{crAvr7$A&is5EI%pW5fI1;`>Ox@RH~Bn;ng}m`{wRA34As4pseiUBIML!
zKcolt<1n;Rh|II&D*rt-!6P8d6nxS0*cJy?A%ExkBr`A4%Q12GwNQ>-p~fcXJ9d;Z
zDk!xISJrc2_%(}!L%)31gV*2X*s0J%uqF;yXoCpai?+SpuWgg*MOqXdzIzAd(wouM
z?^KDpMR{l4yhcdp`O4Wa=zO>6)cHNwzJ!(No`3J$6Px%{CPU$W+#F3h+N%(}i}H0{
zADN_J&2Y0Ul&3H`o!G9M_Fevy$B)Z7k2rF3jxb6eTIKWbQh5RCUb#8FQF-9MuL@47
zxTFo-f@#DF4#@1JcpN}fqKDO)%$qf|2V`!lig+9_!<@eu_74<g^@RQ41RQc&-Zum(
zp`vG>ygHcKQg1HRKlWCZiONgV@r1jOcVKA@T+zcs#a~H1!m%p`hg-IShr@Ki6siX#
zEK!<_i`vw0j;MO=#rj{nw%TJ{y`H_Kv+Vo1bXV#>ewMZ8V~%X^UeU|!`JR^<4xs`{
zNS2iEt9!{*SEnD+dXlxagUQ9|(jY1Pwddt581+-=sEJkQvkRuU=8Vo_3kx9^M^0I+
zyID^Cgc5!Umb(&HW^{a<s0d?*crED_f^tV$&&R(0&ftk#z>-6uh}~mf?$gbE=6r11
z=FJg_1MoY`ygtW;{bGr7!qdGD0=#L;dQ62>K{>Si#f=ACSWE%Up@i^jnK|A)kzw=^
zEp}~5q#%<`jlg(zy;N3dP0%yRC?t2{a=s<+!TDr4Ln^c2^P$P8%TvngQ&d@T`FdlY
zXx5gxEePRVZC4@|$UPbk%d7y9OUhumIi$yV?>?P!>V;sXKqe|IgF()1x@z%sFJLFd
zG>C9>G2GaDfGXj<mTdwsSegzDjTL}o%;d=bIymU3d7iUAVh)cy4Bxx*j(q!r!_Inf
z-eVzq>7&Q%tCd$4gxz7^uaFe?bN}9RvOuMK9(=i2IpkVUDRjD@$?}>nXUs6g^}F1b
zWe}=x<LT{!pUUPXF?jazmhDD_fhy)Hu|{{^r`SV)GTZt8o>2ed!aDTYxV<pG;339B
zPCNJ~e{#lVa5)XCUC3pQRu20#DEaRKPhj;W!ASl?^0(s@&nKx-7r=uf6$7rehtYdO
zZ~n2wIDx!>RH3NQ&9rCh!VR!o3VrYSUyE!uX)vi@<L&S6hC<82!++DlKZV}Fn1uGZ
zSdBVx-z_(-m}%*wF7g2&R&P`fq+0}k$D&IU|MG?W8@}WeZ707__;JvZ&H*No%`OeK
zPYBWznpMW56+HKV6=IuyxGjv3U<g?6Pu*v^1%aP+w|v1#LD)T)&FIhvO#;7})*+k(
zBAd)8U48aYUR|z~hI>D@l=p7Mf|DtP1jcMf5flB}h3ipQN7F%@)SB%)PS!d?{f(QI
z`mkmENyzKHc*<BZ91tgSTJ%!c(Us2_B$GG74&SHw9!Mr~2l^ZH98##E`iw_-6+5z2
z_W!g;p-k+@oBAWnFwB)9X<E~h?~p=WoT9=BZ|b8G;89C|hVJ+ur9(0j&mSDyUt8}C
z&s*jR?DyzmaD4{oqtm2g*?qVbO-@P+RO^zUUoUa>MsVfIWesF)?)6`4#-;DmKdvc%
z=MlI}a_BBt`Av{z5@Xgcv9FGUdQ=DrgQ~vV{C|~wcT`l#6Yd>yMi&u~B%&Z013{Fm
z<RFr9fI$f&5(JS9BSBU`MUfym=Oj4|Gk_wZ2!eo;RWb?)LmC8Ljr)7&{rz^&o;`Z+
zo$jvguCA{7>Z_Z|ji=`<k>TfC5snK#pRJV|v9|C#bS2+u--s0wqpZYSHM0|NeW7*>
zKw;RSMeZj#6EU`+#Y(Oo8NTzgo?DZvYG_y;E#|r@idC(Q<+G2YLhj`|s3=3NjclHV
zmZsVtXTLZR>$%@ry-WTYE2qUcr^_ge&VT_1p2{uPKq0rvCSnp*&HXY8Pt!`4o{r*Z
zvoSuM&*R!<1#}rRyE75StXd6Kfm4Ui{{@gBnH=j1q~A{%5>0y-ENJy*&v@P}xA#_@
z#s)H<#Fo5cbe8`qpQ{(?2<F?o6I+x!sX=?Cc*6Lb8elxt%D<l6jL2cJ?6~|+-E0F;
zs0=V63l+==Pfq%9)^<MaV5tXJWBg5j1Mq<6S4r`B188AY3@|}s50+lV^1a|rai>70
z<l$$HUQi}JE9p#ZQ;Pe_@dWqW^gXu23>M%_-ej}4g%)?-Ts>$P!lxsX#DdebAA46U
z$+74&hjUmhf2`jqrZqelC-|*hJeRytJSbS)1B_o#I+<)Kf%1Te{mbv~K1G&#v+^nK
z9h<hfc+{XFl{7MV_KTQeA{pU`6g;00>-NBoCT2tK1nwy-DK>qQ|Hg^@tM8I=jLFkj
zZ(hO`xCouNbv|!E2f=WXaT&B}BHa(xweaTeiGUrFsXdw*M`xL4#Wzc&k`$E6b<P5D
z3VDMQo2gT%=J}Gk5lgD7(GgHZW}V@BdCv!nX6$sK&wu*W7FB*Al#D2>SK;+{e!cUm
z@MgmIl#cu_YHnu*T;yvnbsguE$JfLvu_oUcPy=%wyY9<I%sNeLp!K`Q&eT-jt+n4?
z&5W|r%F<H)TVVgnFd)HhzhDXIhAQE4EmBNn)BYgef}HKyOxJOe*R_0;cgb8>Z)^nH
zN8!C-E?;jIg|a^q2=eiC1owm-c`k%Aw`VJhlnR8|tBzp@yNlC3Xj89}aQ;VyG-Z=-
z^ztGY-=B<6vq>yZavRFx&kEhT9bZa=sjX(2$|a6nxD%!514NNkQa^<!KR}324n@q4
z+Nc!anADTB2a<S}?l?h-R1XCq&APMi(k~(ejB9&q<<l0!Kz0?WVhh$3&)+@Me+Tr+
zquseIRKq_9;xi^Ij3KNFFt2-`6(1*pN-~ygeR<=QOC9|&81}tXGrkukT1-Mzh~zK*
zKFtYXK)3OJ<=~Uu=%~<sSSrGPaOhYXe|9pvfl6;$NB{fIX0-l4a62=>hrCdAYLs(9
z$_6Pr&B1k}*Rt(c9A8?VUl$97Xyl_f`amVDU7|tCp_lchK^t7RvQ9IYmeS_pye@2f
zPkHyS)cYxIym61)qUfbeNI@=pVVuST6K{)?5)b=`4tjW>NzKiP<&9h%v*o$RA6ctC
z)ItozSkL`?2x+JzDy=Ea-!$c5N0@&yUVnMzcTcYRP~UvZ<2;w+eQ5*TW_8X2fLkPZ
zyS7WbZ5=}Wbg=#M5gp|&#9K9l<I}5Af+Rd5c)S)K0AHT!1V_`%7sK=)&(v~Lko4TB
z+W4<WCiVXAr~Bt+BA@UW)Bw1FAl(3Ok^K~_z|H#WL(#V58YDQ*{i2J>#MLAz8BRh_
zW#MHN*<k04A|>49x(9_OD7Rq&2g{9!+!PYxuW~$=Ru9s&TFdsc_#3`O!m{Iy+~qc-
zRxPaGkS^UiU;jPDGQ2eFlb=|z<+n=z_C?WKYgw&V5JZ~O?ZT#01>IA2*i&O}m%t%q
z$?Mj0!hUeR1yH9R*v{EVzX=LNeJ0_i`)1VDf#}*=PdAC_*=rCjxHl2Xrt?M0&`dvi
zLG;$yly}b%!fCQ>Y!<r}lN4b%xw!S8R$V<p_GR2@ct)1HYV^B**La}_C4$Ku^ZY4g
zzC4p1hUGGTGcqC`?LKSrZjr%77dq)2EXR^^oxHqXz-ud}gqWfmu1@7)G*0YQx9?2=
zWNO=B@8T<_&E(N(Ed-Ogc>Re(pQZm~Kv8mhWAW(QvM_bW-Iz4fuH+sW{S}=ze3w86
z!Vc{zpJPF!4K^ciGoVYP)twEu&mNiJd9jx3<0a8*`I-sJ$Nu`h{#_-E`2Dw+^&Vq&
z!tQcz#CK(I$M^K~@I${(_P4HPER2fI7wfGADbs$?!U=!qjdAEZ?Vuf!>e8jqtTUwN
zK6Kxty4`8vb^l5`s#q1lzS3TiS_xCCNxXR<vH+ZxC8iy@sygR1=6u=&jvD@JC^c1*
zsU4gSnNZlfU&Dj!q!>Jtz++I%;d0T-T|n-Atc;w3dC$m`H*t-+jEf4X7P7?w%U?1P
zB<F^$?+bM7x;Tc$<W=3K-Li!692`kF`jM+W-K7_9$&06%-3H%BOni`C$P)GuNIG4;
zgbQ@=VEj^<1l`M|5)#&q>%7R^m=`TXZ2X~$T^d|2qKU0{GSA25N7dH4`lq|yn4Lwx
z6LoMmlo6{okt#f|)%(eEYYc^S_9DF#KvF1*$zBv48g5ff&&lXfurCX^@}f<(*zzU!
zu$t9fP`xqf(7ba7R8Gu}%8m`Isb-dYqx{mlD_MK=x-oP#mwJ%#2P!=SA(-TDC2y(n
z%fZW+FgK2j*Ek(oldEP0g<h8!e0QHun$1~tqsrHU3qb}dwQbcx`An+MUMaR1Eh*L!
z`#ADbeMrx+Z75;kyc4hV-HqNII9qUf?%*pz@=uuCz5Mzq<@!^-DAA$KpN#x$K)p@v
z&1N8R{T<FyKh}P6E%$TgGxEU_Izfd?`quUWFt$>^7;9q#RJyFZZhsv)s~2nE-Y?Kz
z4M)xSomiFvB~S?ApB1U!XFiR;!IQ7T?h;UJ5pvRgPbk9*m=OiG#$I910;Ym@_9_FC
zBpRmpG@CQ>)4Aw;*dNLe5g|@3oTM#1dR6Fck%QQ1(;EhaFwGe=mT`lpvwT^ig<<5h
z>8pLME>hC%p#<?vz0abzUIcHwN06k-d-MBB^MWg^!zjVLs9HtS14A+&I>5rYdoo`h
zW8P);Iz@#fJ<vbhy6^_E?7Uq+TJ~d|=@`rIRr9@dUV){jkdX0$V!?dJ-<v>XVZu7_
zg$GHZd?TmnXJ*^@(8$PRAbsvfu-edy#nombgI*JPZ{^bBVlZi?SyM7O?AUMSOy#qk
zQ#eLvnNdeSVs)X&{^w%UPt!j8B^^3Mnq%Wv+S&OIzGt7h0#s=!e=WQj(d#0Gw`At?
z^RQo+@H>9yK8cav5e&iE&fQ+4blMn|5yn~W$L}+lL7$6<3J(@=9nf28OC47(@w^%H
zr@a38XyKnT^~P}May3F-Sv>KVWncW3CQYwRWeV})9*2MnRF4mUJFkYjnZ_OV^E&v+
zm6qd_h?l+Lmr;F^Kf5%>?fm`hs9I_PmumgKp|fceIH(r>OOmCexZCssf+?3>cyH&$
zx}do0Fd{fX#dH;d>5-?GGTDC_j~uR&Ev&#Ns)`*o>J-{*nYA&3__ZZ#Fib>RV2W@A
zBc3*B8kaRu%5<$;YX5Kz%*ZJypwdq=aDy_YLOYn_x2B_b5G?nTpuDYL94N|afK6u&
zd%AeO+GJ|I{SC?rWn{VEbny;bcO_t*Jtw+1XJ==jE~T{BX80c0^ACNwlXESsXd2fq
zZ1*8=le#DfDlna)DK2MS|4E5#e+V!NaXc=45?B#FC_e?1WpAq+fbFKItGEl|nJkxi
zQ*Ac)rNql0o8(a<fpMGRJA0qlfAIAO%(yPQb9-FbaP3U}B_1XVJpQ@QYfmi%LG=kP
zc?jxh;XAldVhBObe~^F1ln_5y&jnKOtXwv!x(|yjg~+%we5AjHo|9A27iu!$4^o0d
zl&KIT<8yu1TEMh^-=KAnE}%Be?SwR)iY)@Jz8iUP1fMb%AdLT)ib;#~5*>lvh`mN&
zKvpeS=myePw=$o$NSX9>59S7b=T~)Es|beL51$n^0Fuhx5y6>U)6mLvtdW5hsT>xX
zKZT3L(=~*SyVbMoy=eZD|Hp;xo{;@7t>j64Qj1L<ZE_@6SZu|=ujhhGe>$mBBVTfs
zEp2In#Fwr+co^*@xb`KFl_*2XWn;2wyt&-MgUxy@>Z)as1t|!UKe0HfLwoei4K<L|
zeC+<<<LnecI?G)@-g~cfgcFKs8=Ht~E#&x?!vF$tAUDB+kRWBT!BVtN>${{)Y(>}*
z&k0`5t`YUt6OdQ}%nP^ajt-k_eY1pH^yGkk5H$;erP&PIW51FmC&uwj=q8BgDP$L~
zcmsS*FK#*tt*=m8EDGd9*!!{zOOo^A)Sr9Vr###myM*>i%ff~roNm}PVr<<*3h1+9
zX<Tem_b}Rs&vodtzit~uiA-UM6ZZ;|YwLL`MG4<Zk9@tCAGJXhUi#LL*Ffr`Hfs}}
z7M&!f9eJUa3YovdMtr^*0ls`s$%oe7PRhQ=)P@8<7eFRl^BJn>=;D;LiZG#3BH%TU
zTN1x$*H=r<&I>}25X*M%XEBFqDb%@EoFF@p9tl{WpF7S)=1smk%YTd-f<lG+i&D6-
z{eL`eY=(^I&3&;Aje`PB+A=Ouz*QB=sEyAk$pqM$EG>d4epdWdugYKIf1e^1YJ}lh
z&ZYc-YEcE?`V>^JYzS}ZdT4Vg67bQkAn|CF#U7WzYmptlMM*{c{;|}U*bOSkR*T2*
za)rKWoOwu66^!3T5KZHI1Cu(xnF}yqOnsd3Ek+(*R#0h6TRF+kZk)z?n%Z;}qE)T_
zMDbhCxl_4)sS%Ixrg;q+mypeHo;Q^x!8MOBDhe#ogQK?GjT=LERM`B;o9N7EPDi1J
z(VbA6{`A!dMS-^-x^+-%U=C_^W)Ufyv>|~cntR|tzLs>-i<b;zMKpB-+E~Ah7gz99
z7CYu8`m?+hoxjY!<VR;|sOMnevv4lJq4=b59m}x`jX)G65zw~(;acWXH2NlVd&km2
z%9js%t*cz<Am8>=&riAFMFkJ_<NkMf5IsVKO;)HuaB>Xp^Tn;~%}h;S9&QRbk!y|$
zC*i~gvPlY4S{vTa9QtxgD{A0grbdI=C^+#<((`o16|_&WMK4tEqS>Ju_&#FYdgA%}
zJ<2DUQ5({|!U(q7FRpbtR0%Ld&hK5n*wk%^3w*rX<*!uH@qJ|QG3}|hT2c<ZY6I))
z;-v`U^n9XvndjD4ft;8tumBpRVEM+Hl$4<=>-5?Zk+O8o&S!_%Z?Eky64kEz6}9kY
z!x}+63{o;H=A4y%*(x<#_mZm;hE>h^kBp{5X|5JD`+~sM_fN9e^2Imz|3X)gsg}iw
zEr-6uZ0=1Rzc%HtkNq|~y=`Bi9BW~#Xf{uC^O)?EJ8B$)J_}p7bKYG*2s>YCH_dw&
z!5(6TMAsyDNy#vSpOjLX5GG%sy<lGL7FNC{^K1?!@lwMd3}{jq3PG#zJ>=PZ5JWZ-
zSFy6Fy}Y1I^$f<tRW>UAhyFmZAM<L3w%o@=uPPSd<j6Zqi9ra!%aPLkew)=R1j;K$
z)7i&%R5TllZP=G)=q#l&S!BC2OC0u&M`+lzvv@f$1Csv3{QSySat7Dyx$I->a{gZ*
zss?hLvd6^|RkmIFEJ<TFmT2c|tlHNhMMp@R0zsQ8<^b&4aOA<WnZ5Lkh+vafHtDe&
zYHQ)|h?H){KCBB5NItHVUo>mi?G}6rnIOyq9{$>E9_qNs>k#^`X`~QXa=@_+Um^9$
zVuc5LdWTg7AAdw4<$@fe;X`-dN;CO&LTS%l*TtnnRW?_HtS`&Bu#V7Fz9rinJ`>F+
zC=d@t{~ue4PErkn@`g~nG*PKu9}pRgk_KJ=b_=w7-hpmPdYU6NtBTQXVh|>ry1l5{
zH3|y-Ab|bD6A)wLJ6}b$Au%oCmm&1zUR10NKC7JPtMU$|M?8XHQPz{u^VQi<o%Nx$
zbz<xW!(!Zrv-5hRNNbmQWT-|tP&GjGNID~@BBhBC%GD<{b$Zkz?l&ZQnS+v5cBSlM
zbcdvL4X_T;)`}Tqc`=C3szYsBkQS^coi)~0(Q2sGnsnh{pS2_<%^mc7R$pfkKA!vW
zK!HBN$g`wD-@`O|>b9qhBZJyLTSkiCfRX?9KDyopqp`Roc)$_tek^bDsWPO<AP;BA
z2lqD(Gus)s9rU)H9NcaBv-^rkq56Ou@@ULWY`K7UHLea-UCV%463C-IO1`fjJgKTW
zNRf1<AbCaKm4~h;1RwUKB!Wh*XWqUpEtZ_gpFat;^`r;oelrmkS4^cZz_}h+q_5&W
zT3pOC!4w|rjifqmCi1^tIKS>E&A5SIa_GA(#YfH}3P_p^vjH@P?qKP_^HHkY$w$Mg
zQagUxQQpuJWvt;jiJHAZSIUI8>6yf0&|>rmVQOX+Xd!mV)wG7_i*_p+KJI=Us?Xt~
z6Ik+SVPSN&^}~Ld4AU+NBbs{rTU3i6kUBNnH&IkjvlVbyuO0H%H|!ME{Ga@}z<ESq
zNrf}iyJn1P{LyUq;Nw2$%x|y-Z^?76xWC*CF2Q`Rp_eznZS5Xnii-7CVQNz_;QKe%
zm2iHhRo5A1Lk*FcYlp$=q1Zr5&(6P*9{XJ~O4aw&&Ybd;Jul~AsU{RH-9N1N4C4Gj
zg|<T|$oL7s=aiaMKN*H@930*B!ExP}L8}ctI0LNXy^FN6Y~OQ9(!I=ZuPS2g>Y14@
zg8V5<&C?M-mTG)HEmkOZl+);SDd<&n+!(zcjJY_N`h+w&bN1GAjuCK;N{g~|@9JiZ
zuaB9Db3PuMFhup-?eE>|ZNt!8(iZZCZVYGE6Q}l@seO+1<KHK$<`B66l}q59i8@a$
zyEna;9@TZYD3VJm%!WyU54g-!22GtE`plICb_1kuZyc|lQx(+jg<DjSWaXKbngVoe
zR)ZrCIUE1%UTH;GD^v3^l)w@;kG9XYy=eB#+Qwnw6hX6$d;J7wA%rlGV<bTVy6l(-
z@86sgne5Xf()nFY51L$szKI`DEPV1x9b3sOe`p`x-+KUi*x;P05?loT=Gppd2Pi>t
z1j)UNBqxuUex@gP4^^?)D*gIO6EvPnOHvN~^v+mV9iOgVx1oChK?D;@K8LoN(eShW
zPt4w$MeY~QQGlFF0*KoY3LmRUZ6E(lQt(Skyo+F+3t2zbMlHRYuuJm%rZ-Z3>zfai
zD@Es(E(Hp|wn3&n`JJ}qdtR3oL(IX74yGT*L*C?xny8E2Iw=iy?+%p0CpF*8aoE!4
z2-x#J4J7@rU#Dwy#YXt>fUnbh0ZUx}BWd0Q_JZ-V>u>z<OYXc(8sl~DT*O(k^=&9c
zo$bawb$j)$XUGtqHq6X09Zd_%YV8u(>aqU4b2K*%oh!D^{yOCrTC%(S`(`;N=qNEE
zI9+bmJ?3ew_vL;m3#G5(VK++`X_Y7eX&s^*8Bbb65WVO3ukOuYO%Hm--j_}G+qErC
zabCY7^8-rmzHCB|u|F4_rfuCX?TFvsgTn{t9+3Q^a<o{O4J0Ia$awRc)oVVr|1#(c
z)vtvPvYoj-TK-J=#M}F>5#ROI&&7`Y31lNTvNvJmcH}eKkhfAYY+_Lsm4bNz<(y4G
zGaTZ%X({*JQAID~(g$5Rgitd$Sn4LVX>WL!*ZX>_sYeXdqV3f0Qn;4?AuW8rl=51J
zyi}MvxE?Y6{lP0+nHBN3hu-%`Zk(^7=Y%s^E6=ut_2|Tpg<b`oD@HAJ#|F(c>tOMI
zo*9jXm}`H^h9}WZ@g?g<nS%!G5VwkfVOe>d@eFS+wEq4d<0%{q8QX=SMldwjzIZx)
zSujdZX}ilss!Z1)1s!-v`$O&Q5)K<z$|rNvzq(=O>b_N;HLrwe^ZG3*-&rzM3O~>6
zN|CSLrQq2p(o}~Mezse^FVPT1JO_4lkv+^;qCaBBMSM;sAyv#EepMQd+&Edc;Iro~
zO|LfO?8`es!y_SasA5g+FxrIlVfdT>I|09M;G;vTpNox!wvtoM4a%20inSJ~`d7Al
z+wAEqg;hqe1D`TB*7}{wO$n%lbDpM55TgRak+RZXXXO)~O4z(U;5v=wCn1b~cqv<!
zE8*Q(Zp1c!c|2N!lxl8wSE&ntZ`hrx-izJE6J8!Cc7(FC-Uw&u6R7Ad3ue4;aeFZI
zGTms3Azr}K9n0$r`Eid8qEO_d?1{0|i)rYX>GezGaYF@gff1TigYk^P^WEpVUAa=R
zd}gNcWP9$M*~)qg+a~a;W>9O2MSXW@c;tH?KGE$`I79x#ZQAvW68~U(*_|aNG=h9c
z;oEy_Nvmme((5b~vWH?8$u^N7&n)Goom^^v_VZ`;k0RJoC0|fP{jJLpLF1pyvZ6L_
z!Mjk?I<$sazQ}>aDlD$Mr@w<DNK5G(@Hisjl-q)^+%Gl=Lh$zzG;Y|XU<8eS)(IIJ
zs8ZoiP|7)rK*0g?YH&;&`{RRQqBc89uAcM~ccpMt=~8g5P#*<)(5%d*Qw4Sp+zN_C
z;~5~@lpQ;JTFzN&?b7_;sE83%f~OT&3Wp7GtvoUHUuse%F<^H>20X&)WYUOD2*>iT
zpMR30PY8tBGl1DEDzQvdbr-r;w<!cR#zk*|p3%$-)1c}n3H@^$;$xRDX%zi^+3EP6
z+8o0N);1AXK5BmfGj(OVuCT_9C#Z2RSwDTP&XlT;cGBolU|ZnW?fqu;?o)s0A2s)(
zee}5tA3j?k<ZPuihrZ$N^l~-<7ei<FEpu0jS<qu_I~>=2z5ek#V?&#k$MMp;!O>Go
zi4NSF$gwY@ygkfs65t3vpi0Z@b&c~((w7!f8{*Q&Pc`=5<l;G{C>}zuFkru5N#w$L
z^}_)y;4M><5~VnUdjyI5aIvm0EACe9VxqTn%3r3vaYpH5H_#s}&aNGuqZEIQAT<tz
z-$r9s?-+898<n3ozjV$}ZRlmuD9s-k`JwepAR4iuihObO27)Mb$+5Hd5vTLV?V_Ta
z-beC7iPpqe?}uwrfuuJf+&nkgYo2q=64&9<v6DuHWJcFiypMZ7NgE`w#O>oD3imyQ
zB&hBeIHNH+nwfZSai<_NKKpd)A^tk=5qd-g{6O_J6}vK1m;1Bc_U^0-l3&&vEJz3A
zuIa9Kb{f$uzqTEf-$8-&X_DC;NRX93bA)JjimmFSg-xuCu5y&B0c|cv0-3sig)BY)
z%7Tl@*@vFQ&$+a)IKqnaT2PH0r3s`XNjv;TdZt-*Gd^`b5=M}qJfC+yc8Hn#LeQT#
zZuQmm0m&I99d&N>>k+Z>fonT+tE<3&_S4k1+2~gQKo>+=Ap{e3dnkvDQGxUwd|_$k
z16kCillG^S<?H>`?!%>yAF>1H)=$Wvv=uYbW<dzACc>pl>jNnbWtMD4r?huGI*^-u
z|5UAM`%AZIv;JF;5{``w&C4k8?(13sbzg9mRW_KP7*A=2v&@JMF5l<9<dD*8Lwo7C
z{Y+Nil^fh1z*P{;%<@%Xg9-|n%Bs3UtYh_v+)8?E`&`D-eTLQe*!YUYfnH@=9+5pB
zh_)=8T80Y};Zg1$`ekdps%?pXIn~qnHbGKl)zjE`P0x@nB4OLb<Ep7Ce;9u*N1Qh&
z!~IyY{zy$mS-gcD8n@}7f^>nb8`TNH8nO%L{CHQX1jLlP_AEP`O}URI3;UkAP->F|
zK0QSE#l)F)SCQQp`($zy-^=*PiaJwMu45m8YB(KEpD#4}#QYtDAe<xDc^$^;zl}tI
zILpFTTtf{nJi5V^OlRqLZ9HQ`N|jCc^`uCYTJ?5Eoi|<_<Q^G#?vqVk0T3#9){l-;
z*$(a|S{~>P23fFM0f402W=A!d|74pIUnT3bi_F3tBq^+2q(%rA2C2`L`)on2Ci6DI
za}}|Y8+Lij0%DIBX|=fmSJZ?3=vzgj)TD+wfDehR30lY^O_tf7K#S$pyY2KR#Kwm$
z(ss*ki%K*BU0qzT0l@l+UdC`4PqhrfH8YW#istmMmWbs#nfD~G9}2Q?*6r$6-FfhR
zdiGUuF&gi89EUCKAe4mZWy6eJV<ISg1o(yVie`1OW7%$H0!l)H!b(SV#D%d(*hfxI
zuD;FO$H(V@Uce=1j6+PKuNPLd<Vjq?%6G4)M*dnWtICXD`E(lzB`+BNNaR=O?e1q#
zDqMZ1<3g$qPB{9)2QtQFk{vv{;Oc~Byw>BNO5Vy(bJ53FT=FNBdR=Y&4_Ea++Aqy0
z55zOKu6_U1Jwz`LKso7QyDP%aHt|d2ZUz5rUtI9o@zUF#6Ft}(h>TYXFTIzoTvGWn
zi`f3^gA|`?&e(g{KU3|Cc2{P#dFD)4wbB^%Jf9kG*~!c&+rZli>Yc=?9hVQWl|Nqr
zLSbG}JYzKhmdNlcdVex(!?b$;bUkyD)x{{{iobEab~t=QytZZc^16FJ8RXci6Ab~T
z7XjN%w<!=p?Ps~)-I?I@D2FAQQHGwm-g*8`NpZ5n87?U5ombzu;bi)TWTDVw4d7kc
zyoeF7)d9P`d3IKZ$L^KIpMNeDE%z#HE^RdKwe>dQGzf>GHM6a)oeQ&{wD!_Ohu-!_
zKQu!{lGD-<PHZ5f5%%*W+1VY+f2oVQo3lU)wIn;GrDpcznp{h|zxLiZI-qaa7>^MT
z(-4J~z!|DQmtu18LD$&6%65OJsj+d#FI@R1g_(g)SNA8+h`ARWKmD7gWVegSF?<34
zZ3;yCq<iR1NS|?PvuV^^`gi1K(4k7t+iGS8H*PRj;Jd%wRh*8t@_%KK-wP|bzk>t8
z3KZ??e{}WzT~rpPu`u`3dxUZC49z9{sg-r=($uin__&u-$4gngeLsNfph0NB0IsiO
z<^~=o$ZQ3^7&+CPrn0GC$~zgGML_2?$L;y%0-fcBmn79>VMc>*b{jKzM%HPLC}Jbo
z?J?u>!{i9uYPDAi9Zu88Yp__bf3Jz%QeSXU%)C+R)7U<wZ~9TYt6Mvdb|{jb=~4e5
zfBc-?)S&8rC|SaBu8;nyuvgFClISgJ0D1gi?-)9}vNCYM8e)d)Zlt%o(CB|?$o59+
zdAu7Y+fghpgC9X?#J3#SWjB1lv7Jtvh8DQ9_fPpg+T5c9Tr(G<6>jlfU&8uO4DIzt
zzZM10WiHqbSb_J0f&SHen&4|=Z6A_Syk37-;ey2;R1an^_hg1b3p#CM)iubTAPwKg
z8SPa+h8vZ`<Kx!*Tl25$zRKdI!AfDWNUx3EbZ*Y9Z&E2>dXnH3Ms$r27CJbRQ62Wj
z`xfDgtkUG=J@>%nbLiW&gj(oJGm(JKkDQqtur0sg>v=GUx8O+`JYYFsJ6|kpdOH{N
z{**|z{7CcI+&TH^z(a>J!iHwT@M-FwFV-7!i3*5u#PL0^SaM;HG{}{lvF5E*_@yuf
z1aKjS8G{P9ObkoLU{Nul-Dndwoer4%-w*fy5`G{>w4b@L=KZIJZf^zgH*?eHxFco$
zD!=zV{T6D0+FOupMT;+v20D1en4_+;Re2g+2-mS);;HML;UMyq@5^j`_{^6XXUbGS
z@&&9X88(JBI#aVDzmxA6RK}~))$N@dyRM$TnOI>y%(#0&OlLj3O?miRaqvstJdQ})
zFm)xmW!N5BK6fW@Up|xFT8M!COn0kET|PpTrOoo5YI^)*Ix(E56x!-~XXi%3{|1k9
zT6g)6yE%8$V}m~i!vV_qa!jeG`R84*ZK4snunNw?Bg=}>z29uyI`<>DWldM#hqpCv
z-~Ub$*n8PrT)dxlprB;VuJBm#0n{lUqYGg_|8-V$0Ve)%_we{Y@NEuaf>UtAR~kCY
z2f{NC%oiM%lvQ&stuFo#Oh?dyXzZR~(7B&=__LFlOaSF#MA9KY4vK4-{Ke`K{&nW^
zsQJr-B<-SRHbo0qP24TmWbpqjb{6RID^hU)7mxZW=?|%~?7rQi@(|)CpLc9mSq1V7
zpd7+hJu{{*yp+J&&ln17#8sxA7C?>@Z|c9b-y@$qs1FJ7;mNet@_~8?@}?1&$T2#5
zU`Lx+01ZvvC)lsRQS@}$MY2ucFLeVVEddH*?DG{d0@!d5D*74Qs{5X9WFEPkNNza}
zswE($Ij5~2?7(-n>{q_|>oWdt@11mx_Ws{^F2Z=?h$kxbq)e7FjTBx^<g)F9-<v=+
z*kS!XQ!XsrE*-ipe8tH3@U5)>4eCCb+DTrc+!05QF(W@+xN@7Fr>e|w6NO;9$x#Hj
zcp;8gx)?4iqP)1y_h-ODy3j>g+26dfqUug&oVjh5#33M->2&qtf9`$^-vrg$E^?vu
zq{9MYAJB?Bo?ro}-g{|CgwxG2Gk8lPY@(m<`xT^Gz&_&T`(caFu)j(62-fnG<kGG8
zO@-7+DEQLCYBh0TbbTro&InNPNzeS}UATz(GTgwR#_m{pnt?HxF?pX7kv3nj-VXAJ
z0b)D27>Io^fiRqu-qKX8t3sO`dEqyX<Vsc3KLIe`M5#2TnpskXsYk4m30#9L`LHvN
z!*~1VwgSm^hO{$06u~{PI%5P8@DqQ>0bB|~P>tc-3j?EJpe?%fB6Qw|3_Ows4nmnD
z{5+?AN!S!SMmV!owKL^W+ZbjZ{ckXc8h05RP%$WA-~Ch7{^4_+gn63)Il%(i7RPZX
zW+iW&2I(atLb~wdH>(^jF65GD3$e}fnciwUW9I#dQCc+`aTJu8e}B)Plra_iKRf}l
zExL82Y>Ul5deb}~*V&8Gd!l2O1kgaR6#L!b!W8_17L(^QGZ{ucavYF2L6CA6qo2Qk
z6}2m1tdL7H`W~g`@L4ST?9KSr1l64X0lblPfQqOawHx)P|G46YJ49xfvJ>i8D>qg7
z-*Q8kYlao9$SDTxui+U@zsQ0Dpa_hLZ$Qw=aUrb{s0TE`jFh5GIs!9+rEW>PcLHdP
zfIy+Yd3|?^Qw~@a*a>i}w)?&qv1{qkC7ad-Kr-akO>)#=qUK(h^Wm!Y*JN~wyq2v9
zJdgr3`AQ$2_APJ~L@XStY7ft&4tQx3IHbxAkblIwh5ku)Ew>&l2_aY#!-iIX_#~tH
zkxYo79gAXrvhm;4`oq+o28fBNDOBx35Mt)9A?+4`?1q<08^IZRzu%xJ3MQSTz0&Uh
zw?7>>uFPciPQxw+;P`u`#LA+RF#t$9#9w#i^9o3o3@j_8x3o((TX5mxsnQo-0UHc?
z@=Dv*=kK;iL^NR4u)R2Xi?YJ1PZ_4=Ng{b#mS9>+$$3NAPp~Xr=SKMP0u(_Mc7}X}
zT-&Rfz_7!xlESBLfG>GeJ7a*HdW^_FCJ%-4$@9(Ae=)G|WjGns2BN=aO0Gf(0h*D!
zyb`pfy%e0M1jO_%led6OMX0QfDMVR3tQL5i$um>L=!88CA7B0){i@`YM6NWjk$@$i
zI8i%Ei_7aZv^C>|Vj4N-TQ~NcpcYW)|3b=0DtcKYc~j_sp87a0FLPtANtBcGaD1sW
zbIGB~x@^NEU>+MnqW45&2<ww9DY2MXn2h6TM-GnFn8MlSVF1dll!B92KrChq;ujI3
zLuS`Fab$!N@)20&9)5o~(cd~_h>C#~sqvBc4j8h4a|0}4m6Y<FvFS!`R16T|X^6|k
z%LP@{l2iT=w1#3s5fiCDkzGThi{VEdgYm`d+IB?p3`q*%!tkslD;jAimB$GNDU^%<
zk{?IZhi8d3<oV%$k7$5K6U;YNxkyq)AyjBIx%Y2ESV<QDeN_YjVumt`5$UfmwsI%7
zdqC2&e~3^B>$c^*n!5llwdEYS`{g;o98zKBM?Mp};8E^1-|d2_%)fcS2v)4Wl`)AD
z#ykv4qu}M=EwZGuGVMUx6qr{#B^DC{W4cv8IztV#KOI1=hj@4c$&h=PBrM6Z&~;(d
zlHDljHCz-MTJ;0@baXE&iE(nl55^hyP!fYE5bQT7o{ZC7na9(*!cw${?+m~{`j;#Z
zY|a!U=`{Imogtd&H`x&0!CYO;0>ZLRS*#IkGI@GSZj=8u15<3B&9B_vg_}su3Hyk<
z|5Po%vJjWupa(~;wDg9@2y2_b=wFfP>6n^A00iMI-Q5jX`5Ea7U~X~~+Hr<rOL2Fh
zi3V9aL$7~t+y2*4j_1PihiRds&3`+(jHe9{;d}7=zt%%)^rcRacTFdT?PpFDyM`9b
zBmiNah~z=Ld>fS`XSY>HM*oOmKaoGU@HOxbw@n|kVRA(0=Z55ef9o1n0lXfT8R5_?
zL8C2RQ<b$ZX~7@}5Mb8WX{DB!Kp=->^MF1Jbhz-tbp*-}<btHGk%)l_HfpluTL7j;
z)^7GS@G|09$<9-08&N2!0;?>>vNexPei#tzIxv^@oLxf)dMLB|#+>|6uN}hI#gGdQ
zc7jIn@_VaJfSiFE{B7JrvK*N#oR1*y<bQj1uADsZfqZ0uAH`1mvMq2QO%kamV*Wro
zZVn&Tt$JjYY(+o?3Vq+--<LXL?6%Oh4YT=r*1t?>&u70!L<-u{^?xgM^P$A2pYE7r
z@L_QE?SE`-bH2i&k-p$9vy|$#<T@}cg#839cJ-7ddoLY>6I0K;eEvgx+8H(&vcgeR
z%mh$(f^t4c-1p>SOR!N1F0VL5wlD6JGZg@z#FpT`utyv)tp26WXq@w$T?lej_gwTW
zg4%&+2$A+%*gNR`y(7A3(wIlfMt*KzKkC}=JRhBuG{z!8U0MO7NP1j@_cNRPl9F2U
zc4rd)J4CQAw2yFpr#da0KNE%p6+0^&8Ef3~%6zh)t@7_NqPAFvQhs|c|E}B80R$Wf
zOnHhQQ$(2Ciz$bO;h4IQl2(OdqZYOx*N?g~T5DIB>!jM6w|;S(@=`Zn*Qka$8@~fx
zOM5wwI`D(Bs4^YQDOSo;{^cf}`_0_7gB1$1Bw0|4CRPMFL1wE-dh+v?JjHee^RUjY
z&k__vD7|E8=I+Mjk0H5ubSI%v3EJR!zA0ZZz&AI{`QTE6*j79<W({Odxp2zfa_g3L
zr}WGN>kw@z{uLPZ6c)N;N?Rs(M$hl*`rKHz1lAJHsu-pk%Roz7$oGen%$e}!<fgo|
zIvhkVQMIgJhRmHz$Rfir7X}fm$3sj5fK8QbzxW@v9F{uqzM-_a$#O4+xOSHVKG!TR
zu{ucDU-Lt!E3zE7k7#Vhd?5+od|Ox{jE4|j=I-?rPfV76|I->?!d->}hS^o^U@q-R
z&nZ%Yy!BMFt-?h9%F6jbaHmV2s@K+?T=OWk{Z8z7<=HzJ5<&6L6qsDAVWbHAjpH6c
zLu(=4Df>R%WRrZqNl%Ig7@Lu)sQ!JS`a{0KmsPb{uHnZ%1Qgt6_XW*->(rKfRDrG5
z8spnE4p?`XdA^@6o&ws-KS+_j=mr18{RwMR(*ykwoW3ppk*6@2|F3^kSfk1B^8o>&
z+`?$pe$&n}|Ky-8a1a6utTdSl8_Y_nh~g6BFQ6gbHYTMXkn%eY{9o>GDS_2r@n=}X
z7bqXdMl3<tyH;c0-z?-{Ek3AhsB3bd^P4*Cb2N)tboTZPIl*>ZZBV_Nn6V=p6e8?F
zO*SYAdV^Vu>oxGpBUGi|*G(HFl|Hj`uc*JFL8SlLxY(zFd;8~~3^B9b1<Achzr=~e
z-~lrPGXh+f=R9Zi-xNeWu6ghUP=83!pY7ic{<eO+1!Y#Qr*I*z;bq9cDSPUq2S>^!
zqqBYe9+r3*e$Cgv?92vH>nr{o-H{*g8e1tB3lhYxPyT_OiKj;5fGswu65W{GK4@#)
zKoTuifqr=CQ!<$2>-AThlmj#=l31YAm#x<o#<rjZ!YO8XbkMvcu4HB_M-D}p2NF~v
zp?Vsvlqme$9oh@`gziuyAM;w<)~j0Eyf)Nl>-u*;x%{F;$i|PffV0={78VOy+^fQl
zp-U%An4lU_j0`%caCv|<42ly*$@csAkGHl<o5;;;L&MYEkZyos__nCNb4Y=@EQB7>
z(1xEu2{K#oj||z7-EPP9B+x-xaMyvz7D~g70=1;xZiY;08?%`6>m2Ou-{w3@fT$cw
z<IW9uG)fzE9qwNr%oxngMbJUdCj5rZur1)1dPhW1G10N?nA~fGWU&iEwlh~F%kcEq
zQ5YM~hU5v#VEvHBsGWE90sC^egE3&CJ#J6UnN_o3k+1*u;7xc%chHKeg9|z5tLGAW
zulu+-_Abz^#`M7rGNixW;X_<&86thgYoUH59)esy1mNqJ^jmhn7LC6ow<ZEYl^{=V
z&Pwv|@><8E2vg*t<hrq~W=tIpf<B-Z6A-BZTP4<Gc?e0$Z53h4fUaJK;Q#(%SwY|k
zJM8BoNP%>`Xdj&OZfJ`7*4>f+(8RPE2i}vLi1aNrGwicMF{OR3nyh&64umHlZwG*w
zdmF?pc-O}V?wO{2kIVpH!MlT%k0`<CVm)}<2XDrMPf?i`34=w&iNaYJs)?Zx`D%1+
za%-7J-#?gp{Q-LZj~ih#&=k=jG!>AK7<O}pd2(_E`n3+Th@YEMfckq~-)>vkhV(?X
zFNkf$+EN$Pu^=?Mr^E<!(->)BBq>NJxgLVY;et326({fB?Lf{JhL8Hdih*JSlGD@&
z<{Yoe0_s}_o7s_ME_-ho9}#<?b)+G$1CO2C0gBS0?|sd;+)T$A5Y|E~Tr2U(8h(Ly
zMjersKafH=Ylvs}#2a$woGEwyEJK=GeFEgR=Qpuq8?V(W$nW5;!tbbvTB2yg-S1rM
zt7j}PD=oP$2RzD|x4n}VZPtKhunnptN#7~9h!k)?Pxi3lhX%{=&Be5Y&$*ZlOQR$B
zLMz@H2SggYd{{fSDwg+Wx8CZjE-BQrX@%@vCk5o)r$Ay%TV>)}XKH^X5`*H0>M#xc
z_yPbbhMff2);UO<ys!DR6R;nBq+!<1a-|j`cH)co5vd<u7ZKBvAKxa~2`aEA9`-~N
z<pa4AHuBO`mM5(M=dblw)x_NgbI+f~7R6-2@N1uo#vo=;mbyGe!2<}q(W-8=v7v*B
zA{N#WK2aiHCdS78oIyBwU{ho1EroORQby~uLc|b`)u4<)j1DXb$~^G;r`j$D)OUwG
z3tg9bu+)5{VFHQ}s_>R7=`QtD{Py$6C%32y5dOp$l*9Ofig7ahAzk(jxSajFgUr_b
zpAW?!<W@+@VW>(G4?B?Wlnx}ztebw^uzuc(FDYK!1A3WefFN!lCAMn{&-dS^5EYY{
z>oEuom_^92&-&%5WLignGYDABh(Tw`<EIgK&D>9+sK=P`(Ugx8aVFmwq?K*`OBu}k
zPVX@V0zECP3Z$d<^ECvc#79*k)xWO1_48=y8V+bCkCO!`f!D&*`J%riAI$kIgal{c
z3;G5JRk6>C!v^OTcG8D;odhiMUc%<e98;y{ti0r><l3}<xDV1w*Xnly7|``7LT27Z
z5LZUnpl$z_sfw;M?jWZYxM#_7OOUg3rrgZHZYo`(Lz^}uOqUfK77e|*u}-M*AhIWO
z62ZihUxYPOuRG~R(X@M3e#w;q4Y}4g79mg6-(#>~zZj*d<wE*jM(5u(^*~p^#f@Y2
z(v*CoyNl)4-9gZAOf{&f)c#}p)#}FBZ{WvaLXTA9bW&>Z)Tu*}P2C$fW^NT_@7l#`
z+QH)Y*!BNA?cyLw!VEK-q2oSkE~lG4GjHs=Oi)0+RlF`-lK#^O9%KWq^4SkhlSYcq
zi?;{oSRa}#ly$$!%fKlsP*HP&?L(l;Wwu#f*?fv!^0k;D2_Qm0+X%(V&M3kmD73*z
zKIXK>#>Z!X@ztq8wu~C9y;EMXSnc5z{=f*>TUp2oNh^gg3_gottlih4GU|PHHFFGA
zcyY`lQ8Vms;1Q0wtcWZrXC=qmu{BYIt&MMlWQpFa(pRolzOIYvRE1r8!a1kG05vp8
z+4;k6o}_AMJ~h^F)fm&8wRn(=y&b<#vLw*uWlZ98y@ARqCKM*so~$vsiaj_hq!g|3
z;pGkpk3d9mMzJw}I0)&PuJU_)fy^4zL^ww7;5&8&=-+|bD3YI}r#!&VSHs!Bh!wtc
zcSAYElJ#Zsn9x*6StRlUj!-xX-UY_172&D%jNL>kO@A@0Z$bt8K)!2vI`NHtk#MfS
zybH$5W~3acX{Aewj2tY#j<dG2T2%4oD&ITj?&D3k{g{#y3^sz+46`#snrDa^rD9S}
zV8mM36np2~BZfh#;eET0u$u&hp}kj4$}TKci6}Z7JItB_dj{p_JO<M*V)b;})iR8j
zF>+(Vw<5w?YmRM$^LdNZCVg1GjCObrUtu8gf+2aKjY0Y_jFJ9OjhfSiJGkAmXfYF<
znwVjDQO3RkP@q_n_WV*>ah|KR(#-JQqe8h>cczZeoInQjK<Cz^K%hfsc#((MPV9=5
zbC4egqW2KQd!xT|+nd2Egn8<Pl4<Mhi-Z@Kn6CZs>iw+zdHB!zq*o9B$K!iX_R?E%
zb-{?<Q}`mZh7}wAE@j#^uq1dqc&Fd?sX!sE;S9kfmSK29a&LKWa0HRICU;afWy#xm
zu!(8vSZf7#ymJm?#x5@W+xlOBW7}T`B<0BC?B!*8_&9u?6VzbVONQV6zR0}Yv<#nM
zPPdx01=HIpch>8CxroE~olx0R-?uT(4sKjzWs37)$2fw#&I#O!F!JYo?Y4CLOGSuO
zD|J=z4bAN3Fw&{x)<Ypd#<oB3eydQ1DCQY_kWc;~_c5Z^U$-Ac``~9HK4fcE*N`w!
z$XZeLXK(hKxwUt4<e2!6(dzqL1QU95l%oNx*qiNUNjTR)MqA~G>Yd#%?B;TFMdU$1
zMvO>h(4i<t*4=oeKf5pi5xL4iJ9FMwNvpjQl*g46<>VG#?xb`;DTh*o?)n4c9i^D@
zt*zkgN!{K|T*$0y*H`<mYbz)o{RRfY7Q7Q^8d=upv;<xc-+4)1(x3EJ{3k|k><VbW
zZB>Tr=D%IF06m-v-I9k}GQr0CpnVvOCd|X|5~M~5$_8iB+AU?MJyi$8v(CGLbTHaH
zx+L`EG}5uvr!s~bRfYdh%g65_yy5q5C`j}E%kqN!FU@7gT+2&GL%S@RN1o1IaO%}M
zi)WsjS^S8Del=b;Lq3|_a9MgT4h@-!l+V5|1z%I|$tsFf-R@JCH^dNW@9(0Blo0&I
ziJj-AN3Ks6B>I4BlzEi6k{CJewxx}xp85xVMzZ~sB{-rRJ}_Wy{w+n&FK}R&(lwI*
z_^1>i=Kpl<i7NwN6jN`jDMBMqMbX!M<huL7?>14moFjgx2nF|){w)EU*q$0A?GR6}
zZaiHAc^&UxxwB(S4qKuc7)q!h0{ZG71Y5!ee=I&bPC7$9T)zO^KG*}NQ;_y_0*KBT
zPSw?k)a`Sb(L?aPOc#x-hY!xc_nc`*(4+TSyo{hCyakwch0v>*gatFi;yi~XN}B70
z7!rqRVn>d4d=>?VD*Tj4K3I7PdSw*S&g6#<@KC519#$WRhkk?imUiy}3#_!`(h)P|
zNT6PFybN78)A86#3SCO6Gytc^i3-Z?7awVjOOOxGU`p@gP5GOf(SxPx!CWF*o@_;p
zsRPM5_9{Ra=5v0y=@NoiFg;_(UeRuo(HvqOf^J^1q(unX&{uIYhH_VhiFinUCah13
z3<f?LwB0#h%RqQeerOX_CbuxZSr2yXAH9ic(uK6Gc2R@}CgN(*W<5hWvU)mlP|B`X
z6iJ1-C9uALo=ARxSZqRGGvT%a{QaL)IHjFVb2!fImAR{XP-9xr5P`z0*i&PjMB6sh
z8Oq(&;BQIcriib=Gj_!0IQ6hB3tM@p7-D>)l!8DF-S7}FV?d-m{oXFl9Wp~reTTu#
ztFoil!<SqkMX~`XNohcKD!tb{T>I~u3!z65Y;f5%i@oO`caNBXc}FyW)==?NBl%M#
zO}cUf-6^ZMRK;*Sau60y*gs@@<(dah`>i!kwoAGv4rpO}W%tH^SC0Pjw6LZxK|HKs
zqGB#bmAhVAzUxYXq+2D*Ad=-2*k`Z+FyY;AEXx$jk!Z6Dly9XiJJP8O%{>!yp&pS(
zr#o~*6jj#RM89|B82BD&V2DEbrR=wKJzOcVBIn8&kaN&?LikHh>ZDxvX48%uQRG7?
z$n4yWL@~&5>|dFInA4JE**~Tzj3bOZ=~b0gW{M}6#Sdcz7mHKOYT<%CYY0t7$XiLQ
z2K-x&BwkxFwazPq8Ymbe_`;&_h;@qm<>4VEbF5QQ&h3e!CI$ra37%jK?@@1Ok(LgG
zOi|bsm{o%IsixU@iXlcscfi_Y!{<v81Cpw054XH)zwWu}-gBkI@C`ZW$QTxuUp7Ui
z$oqUMF>iGw|3_UZM^}YA&>1dP?9UY@`v7A<GDS^(e&gD`9x>{*0jo1ejLMS&ZsTG^
zWfC4_$~n9tD77Rw5C3VR#|D3HHZkA9iI^f7I*_(>;i6iZLW|Wo<dQkBNzgBTq(Kx!
z*U(hunE9x{g(loQv)Ta9JrpX6NSl%0*U@CFu=aJONUG*B7`DX+m)%@c0PYu<c|<5@
z;`g!0ZIVKoD`H%Yk1b9%7=JBL2)uomP_hu#ioGevKQHZjBRBhg8SDwOobf)DPl0&B
zW<{z`wYFpQ;7`$@s*q@}6Rr1M=+Jf4%Jq*rK7PIw-z3><rbmq=klQ(3oK~@0ogD0{
zhIQbo`|Z19!f|bDCBg*3@`GkUK6>zAY;pb@3Ren+_yooE-Uul!5i{sUZyOdrf_FF$
z!8?+frN_Hab?=_iy^p_>{ZmsSu5diyFguc|31cK6PlW7J0?h<AN1adw-nKt_6Lno7
zAb>Zb9{fXB2&f5ik7F*=ztZQqu~fv#ZFly*L3;SWAJvVGz0*#?YgAx&BAgN+M@*<r
z>@T%Dm)V_kU;GN*pLSB^mz^2Y9LT{mDf(|JpYw+OCPi*C)a34_eEX0SOD%qeW01=A
z^;TBhBj*LRxuUHLPnK;HE57?=xECwqFDU3IQ6QDV&;gIbB2%)$N^aR9Z+{a<=T4md
h|8m*<zn2Hr_$&0iPc|T0ndHCJzG85>Tn!WYe*h^_s|)}D

literal 0
HcmV?d00001

diff --git a/web/projects/shared/assets/img/storefront-outline.png b/web/projects/shared/assets/img/storefront-outline.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa7bd440493aac3fe53df067f6dc7382e6771c33
GIT binary patch
literal 10912
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
Ae*gdg

literal 0
HcmV?d00001

diff --git a/web/projects/shared/assets/taiga-ui/icons/tuiIconPaintOutline.svg b/web/projects/shared/assets/taiga-ui/icons/tuiIconPaintOutline.svg
new file mode 100644
index 000000000..55450c05c
--- /dev/null
+++ b/web/projects/shared/assets/taiga-ui/icons/tuiIconPaintOutline.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" height="1.5em" viewBox="0 0 24 24" width="1.5em">
+  <path
+    vector-effect="non-scaling-stroke"
+    clip-rule="evenodd"
+    d="M7.2395 3.45152L4.01497 3.49988C3.46275 3.50816 3.00837 3.06721 3.00008 2.51499C2.9918 1.96277 3.43275 1.50839 3.98497 1.50011L9.98497 1.41012C10.0214 1.40957 10.0575 1.41098 10.093 1.41425C10.6089 1.4111 11.1258 1.60635 11.5194 2L16 6.48053C16.781 7.26158 16.781 8.52791 16 9.30895L12.5492 12.7597L10.3089 15C9.52787 15.7811 8.26154 15.781 7.48049 15L5.24023 12.7597L2.99997 10.5195C2.21892 9.73843 2.21892 8.4721 2.99997 7.69105L7.2395 3.45152ZM10.1052 3.41422L4.41418 9.10527L5.80892 10.5H11.9805L14.5858 7.89474L10.1052 3.41422ZM20.4206 13.5445L20.4223 13.5453C20.6348 10.9945 18.7416 9.37791 17.9715 8.83085C17.9293 8.80059 17.8726 8.79856 17.8281 8.82545C17.7836 8.85234 17.7676 8.8632 17.7761 8.91357C17.9704 10.0886 16.2673 11.5428 16.2673 11.5428C15.8623 11.9726 15.5886 12.3895 15.4811 12.9331C15.2176 14.2662 16.0981 15.5842 17.4524 15.8519C18.8068 16.1196 20.1167 15.2659 20.3802 13.9329C20.4067 13.7992 20.4166 13.6763 20.4206 13.5445ZM3 18C2.44772 18 2 18.4477 2 19V21C2 21.5523 2.44772 22 3 22H21C21.5523 22 22 21.5523 22 21V19C22 18.4477 21.5523 18 21 18H3Z"
+    fill="currentColor"
+    stroke="none"
+    fill-rule="evenodd"
+  />
+</svg>
diff --git a/web/projects/shared/src/components/loading/loading.component.scss b/web/projects/shared/src/components/loading/loading.component.scss
new file mode 100644
index 000000000..9a7d10100
--- /dev/null
+++ b/web/projects/shared/src/components/loading/loading.component.scss
@@ -0,0 +1,20 @@
+@import '@taiga-ui/core/styles/taiga-ui-local';
+
+:host {
+  @include shadow(3);
+
+  display: flex;
+  align-items: center;
+  max-width: 80%;
+  margin: auto;
+  padding: 1.5rem;
+  background: var(--tui-elevation-01);
+  border-radius: var(--tui-radius-m);
+
+  --tui-primary: var(--tui-warning-fill);
+}
+
+tui-loader {
+  flex-shrink: 0;
+  min-width: 2rem;
+}
diff --git a/web/projects/shared/src/components/loading/loading.component.ts b/web/projects/shared/src/components/loading/loading.component.ts
new file mode 100644
index 000000000..373f013a1
--- /dev/null
+++ b/web/projects/shared/src/components/loading/loading.component.ts
@@ -0,0 +1,17 @@
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
+import {
+  POLYMORPHEUS_CONTEXT,
+  PolymorpheusContent,
+} from '@tinkoff/ng-polymorpheus'
+
+@Component({
+  template: `
+    <tui-loader [textContent]="content"></tui-loader>
+  `,
+  styleUrls: ['./loading.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class LoadingComponent {
+  readonly content: PolymorpheusContent =
+    inject(POLYMORPHEUS_CONTEXT)['content']
+}
diff --git a/web/projects/shared/src/components/loading/loading.module.ts b/web/projects/shared/src/components/loading/loading.module.ts
new file mode 100644
index 000000000..4a3798041
--- /dev/null
+++ b/web/projects/shared/src/components/loading/loading.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core'
+import { TuiLoaderModule } from '@taiga-ui/core'
+import { tuiAsDialog } from '@taiga-ui/cdk'
+import { LoadingComponent } from './loading.component'
+import { LoadingService } from './loading.service'
+
+@NgModule({
+  imports: [TuiLoaderModule],
+  declarations: [LoadingComponent],
+  exports: [LoadingComponent],
+  providers: [tuiAsDialog(LoadingService)],
+})
+export class LoadingModule {}
diff --git a/web/projects/shared/src/components/loading/loading.service.ts b/web/projects/shared/src/components/loading/loading.service.ts
new file mode 100644
index 000000000..96ab4301f
--- /dev/null
+++ b/web/projects/shared/src/components/loading/loading.service.ts
@@ -0,0 +1,10 @@
+import { Injectable } from '@angular/core'
+import { AbstractTuiDialogService } from '@taiga-ui/cdk'
+import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus'
+import { LoadingComponent } from './loading.component'
+
+@Injectable({ providedIn: `root` })
+export class LoadingService extends AbstractTuiDialogService<unknown> {
+  protected readonly component = new PolymorpheusComponent(LoadingComponent)
+  protected readonly defaultOptions = {}
+}
diff --git a/web/projects/shared/src/components/markdown/markdown.component.ts b/web/projects/shared/src/components/markdown/markdown.component.ts
index d560f7537..e3f350e4a 100644
--- a/web/projects/shared/src/components/markdown/markdown.component.ts
+++ b/web/projects/shared/src/components/markdown/markdown.component.ts
@@ -3,7 +3,7 @@ import { ModalController } from '@ionic/angular'
 import { defer, isObservable, Observable, of } from 'rxjs'
 import { catchError, ignoreElements, share } from 'rxjs/operators'
 
-import { getErrorMessage } from '../../services/error-toast.service'
+import { getErrorMessage } from '../../services/error.service'
 
 @Component({
   selector: 'markdown',
diff --git a/web/projects/shared/src/public-api.ts b/web/projects/shared/src/public-api.ts
index 7b1cd71b8..c83fef860 100644
--- a/web/projects/shared/src/public-api.ts
+++ b/web/projects/shared/src/public-api.ts
@@ -9,6 +9,9 @@ export * from './components/alert/alert.component'
 export * from './components/alert/alert.module'
 export * from './components/alert/alert-button.directive'
 export * from './components/alert/alert-input.directive'
+export * from './components/loading/loading.component'
+export * from './components/loading/loading.module'
+export * from './components/loading/loading.service'
 export * from './components/markdown/markdown.component'
 export * from './components/markdown/markdown.component.module'
 export * from './components/text-spinner/text-spinner.component'
@@ -42,7 +45,7 @@ export * from './pipes/unit-conversion/unit-conversion.pipe'
 
 export * from './services/download-html.service'
 export * from './services/emver.service'
-export * from './services/error-toast.service'
+export * from './services/error.service'
 export * from './services/http.service'
 
 export * from './themes/dark-theme/dark-theme.component'
@@ -63,6 +66,7 @@ export * from './util/base-64'
 export * from './util/copy-to-clipboard'
 export * from './util/get-new-entries'
 export * from './util/get-pkg-id'
+export * from './util/invert'
 export * from './util/misc.util'
 export * from './util/rpc.util'
 export * from './util/to-local-iso-string'
diff --git a/web/projects/shared/src/services/error-toast.service.ts b/web/projects/shared/src/services/error-toast.service.ts
deleted file mode 100644
index fe6607995..000000000
--- a/web/projects/shared/src/services/error-toast.service.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Injectable } from '@angular/core'
-import { IonicSafeString, ToastController } from '@ionic/angular'
-import { HttpError } from '../classes/http-error'
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ErrorToastService {
-  private toast?: HTMLIonToastElement
-
-  constructor(private readonly toastCtrl: ToastController) {}
-
-  async present(e: HttpError | string, link?: string): Promise<void> {
-    console.error(e)
-
-    if (this.toast) return
-
-    this.toast = await this.toastCtrl.create({
-      header: 'Error',
-      message: getErrorMessage(e, link),
-      duration: 0,
-      position: 'top',
-      cssClass: 'error-toast',
-      buttons: [
-        {
-          side: 'end',
-          icon: 'close',
-          handler: () => {
-            this.dismiss()
-          },
-        },
-      ],
-    })
-    await this.toast.present()
-  }
-
-  async dismiss(): Promise<void> {
-    if (this.toast) {
-      await this.toast.dismiss()
-      this.toast = undefined
-    }
-  }
-}
-
-export function getErrorMessage(
-  e: HttpError | string,
-  link?: string,
-): string | IonicSafeString {
-  let message = ''
-
-  if (typeof e === 'string') {
-    message = e
-  } else if (e.code === 0) {
-    message =
-      'Request Error. Your browser blocked the request. This is usually caused by a corrupt browser cache or an overly aggressive ad blocker. Please clear your browser cache and/or adjust your ad blocker and try again'
-    link = 'https://docs.start9.com/0.3.5.x/support/common-issues#request-error'
-  } else if (!e.message) {
-    message = 'Unknown Error'
-  } else {
-    message = e.message
-  }
-
-  if (link) {
-    return new IonicSafeString(
-      `${message}<br /><br /><a href=${link} target="_blank" rel="noreferrer" style="color: white;">Get Help</a>`,
-    )
-  }
-
-  return message
-}
diff --git a/web/projects/shared/src/services/error.service.ts b/web/projects/shared/src/services/error.service.ts
new file mode 100644
index 000000000..45891e0f4
--- /dev/null
+++ b/web/projects/shared/src/services/error.service.ts
@@ -0,0 +1,43 @@
+import { ErrorHandler, inject, Injectable } from '@angular/core'
+import { TuiAlertService, TuiNotification } from '@taiga-ui/core'
+import { HttpError } from '../classes/http-error'
+
+// TODO: Enable this as ErrorHandler
+@Injectable({
+  providedIn: 'root',
+})
+export class ErrorService extends ErrorHandler {
+  private readonly alerts = inject(TuiAlertService)
+
+  override handleError(error: HttpError | string, link?: string) {
+    console.error(error)
+
+    this.alerts
+      .open(getErrorMessage(error, link), {
+        label: 'Error',
+        autoClose: false,
+        status: TuiNotification.Error,
+      })
+      .subscribe()
+  }
+}
+
+export function getErrorMessage(e: HttpError | string, link?: string): string {
+  let message = ''
+
+  if (typeof e === 'string') {
+    message = e
+  } else if (e.code === 0) {
+    message =
+      'Request Error. Your browser blocked the request. This is usually caused by a corrupt browser cache or an overly aggressive ad blocker. Please clear your browser cache and/or adjust your ad blocker and try again'
+  } else if (!e.message) {
+    message = 'Unknown Error'
+    link = 'https://docs.start9.com/latest/support/faq'
+  } else {
+    message = e.message
+  }
+
+  return link
+    ? `${message}<br /><br /><a href=${link} target="_blank" rel="noreferrer">Get Help</a>`
+    : message
+}
diff --git a/web/projects/shared/src/util/invert.ts b/web/projects/shared/src/util/invert.ts
new file mode 100644
index 000000000..6931b3660
--- /dev/null
+++ b/web/projects/shared/src/util/invert.ts
@@ -0,0 +1,12 @@
+export function invert<
+  T extends string | number | symbol,
+  D extends string | number | symbol,
+>(obj: Record<T, D>): Record<D, T> {
+  const result = {} as Record<D, T>
+
+  for (const key in obj) {
+    result[obj[key]] = key
+  }
+
+  return result
+}
diff --git a/web/projects/ui/src/app/app.module.ts b/web/projects/ui/src/app/app.module.ts
index f13b4fbfa..048d81fe0 100644
--- a/web/projects/ui/src/app/app.module.ts
+++ b/web/projects/ui/src/app/app.module.ts
@@ -14,6 +14,7 @@ import {
   DarkThemeModule,
   EnterModule,
   LightThemeModule,
+  LoadingModule,
   MarkdownModule,
   ResponsiveColModule,
   SharedPipesModule,
@@ -22,7 +23,6 @@ import {
 import { AppComponent } from './app.component'
 import { AppRoutingModule } from './app-routing.module'
 import { OSWelcomePageModule } from './modals/os-welcome/os-welcome.module'
-import { GenericInputComponentModule } from './modals/generic-input/generic-input.component.module'
 import { MarketplaceModule } from './marketplace.module'
 import { PreloaderModule } from './app/preloader/preloader.module'
 import { FooterModule } from './app/footer/footer.module'
@@ -49,7 +49,7 @@ import { environment } from '../environments/environment'
     EnterModule,
     OSWelcomePageModule,
     MarkdownModule,
-    GenericInputComponentModule,
+    LoadingModule,
     MonacoEditorModule,
     SharedPipesModule,
     MarketplaceModule,
diff --git a/web/projects/ui/src/app/app.providers.ts b/web/projects/ui/src/app/app.providers.ts
index e93c323d0..00ff64690 100644
--- a/web/projects/ui/src/app/app.providers.ts
+++ b/web/projects/ui/src/app/app.providers.ts
@@ -3,6 +3,7 @@ import { UntypedFormBuilder } from '@angular/forms'
 import { Router, RouteReuseStrategy } from '@angular/router'
 import { IonicRouteStrategy, IonNav } from '@ionic/angular'
 import { RELATIVE_URL, THEME, WorkspaceConfig } from '@start9labs/shared'
+import { TUI_ICONS_PATH } from '@taiga-ui/core'
 import { PatchDB } from 'patch-db-client'
 import {
   PATCH_CACHE,
@@ -53,6 +54,10 @@ export const APP_PROVIDERS: Provider[] = [
     provide: THEME,
     useExisting: ThemeSwitcherService,
   },
+  {
+    provide: TUI_ICONS_PATH,
+    useValue: (name: string) => `/assets/taiga-ui/icons/${name}.svg#${name}`,
+  },
 ]
 
 export function appInitializer(
diff --git a/web/projects/ui/src/app/app/preloader/preloader.component.html b/web/projects/ui/src/app/app/preloader/preloader.component.html
index 94d6d7107..82923250e 100644
--- a/web/projects/ui/src/app/app/preloader/preloader.component.html
+++ b/web/projects/ui/src/app/app/preloader/preloader.component.html
@@ -8,8 +8,6 @@
   <!-- Ionic components -->
   <ion-accordion></ion-accordion>
   <ion-accordion-group></ion-accordion-group>
-  <ion-action-sheet></ion-action-sheet>
-  <ion-alert></ion-alert>
   <ion-avatar></ion-avatar>
   <ion-back-button></ion-back-button>
   <ion-badge></ion-badge>
@@ -19,14 +17,11 @@
   <ion-card-content></ion-card-content>
   <ion-card-header></ion-card-header>
   <ion-checkbox></ion-checkbox>
-  <ion-content></ion-content>
   <ion-footer></ion-footer>
   <ion-grid></ion-grid>
   <ion-header></ion-header>
   <ion-popover></ion-popover>
   <ion-content>
-    <ion-refresher slot="fixed"></ion-refresher>
-    <ion-refresher-content pullingContent="lines"></ion-refresher-content>
     <ion-infinite-scroll></ion-infinite-scroll>
     <ion-infinite-scroll-content
       loadingSpinner="lines"
@@ -39,24 +34,16 @@
   <ion-label></ion-label>
   <ion-label style="font-weight: bold"></ion-label>
   <ion-list></ion-list>
-  <ion-loading></ion-loading>
   <ion-modal></ion-modal>
   <ion-menu-button></ion-menu-button>
   <ion-note></ion-note>
   <ion-progress-bar></ion-progress-bar>
-  <ion-radio></ion-radio>
   <ion-row></ion-row>
   <ion-searchbar></ion-searchbar>
-  <ion-segment></ion-segment>
-  <ion-segment-button></ion-segment-button>
-  <ion-select></ion-select>
-  <ion-select-option></ion-select-option>
   <ion-spinner name="lines"></ion-spinner>
   <ion-text></ion-text>
   <ion-text><strong>load bold font</strong></ion-text>
   <ion-title></ion-title>
-  <ion-toast></ion-toast>
-  <ion-toggle></ion-toggle>
   <ion-toolbar></ion-toolbar>
 
   <!-- images -->
@@ -66,10 +53,37 @@
   <img src="assets/img/icons/wifi-1.png" />
   <img src="assets/img/icons/wifi-2.png" />
   <img src="assets/img/icons/wifi-3.png" />
+
+  <!-- Taiga UI icons -->
+  <img *ngFor="let icon of taiga" src="assets/taiga-ui/icons/{{ icon }}.svg" />
+
+  <!-- Taiga UI components -->
+  <tui-input></tui-input>
+  <tui-input-time></tui-input-time>
+  <tui-input-date></tui-input-date>
+  <tui-input-date-time></tui-input-date-time>
+  <tui-input-files></tui-input-files>
+  <tui-input-number></tui-input-number>
+  <tui-text-area></tui-text-area>
+  <tui-select></tui-select>
+  <tui-multi-select></tui-multi-select>
+  <tui-tooltip></tui-tooltip>
+  <tui-toggle></tui-toggle>
+  <tui-radio-list></tui-radio-list>
+  <tui-error></tui-error>
+  <tui-svg></tui-svg>
+  <tui-icon></tui-icon>
+  <tui-expand></tui-expand>
+  <tui-elastic-container></tui-elastic-container>
+  <tui-scrollbar></tui-scrollbar>
+  <button tuiButton></button>
+  <button tuiLink></button>
+  <button tuiCell></button>
+  <progress tuiProgressBar></progress>
 </div>
 
+<!-- fonts -->
 <div style="visibility: hidden; height: 0">
-  <!-- fonts -->
   <p style="font-family: Montserrat">a</p>
   <p style="font-family: Montserrat; font-weight: bold">a</p>
   <p style="font-family: Montserrat; font-weight: 100">a</p>
diff --git a/web/projects/ui/src/app/app/preloader/preloader.component.ts b/web/projects/ui/src/app/app/preloader/preloader.component.ts
index 0b387ac45..f7184008e 100644
--- a/web/projects/ui/src/app/app/preloader/preloader.component.ts
+++ b/web/projects/ui/src/app/app/preloader/preloader.component.ts
@@ -1,4 +1,10 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
+import {
+  ActionSheetController,
+  AlertController,
+  ModalController,
+  ToastController,
+} from '@ionic/angular'
 
 // TODO: Turn into DI token if this is needed someplace else too
 const ICONS = [
@@ -88,6 +94,26 @@ const ICONS = [
   'wifi',
 ]
 
+const TAIGA = [
+  'tuiIconPaintOutline',
+  'tuiIconTrash',
+  'tuiIconTrashOutline',
+  'tuiIconChevronDown',
+  'tuiIconChevronDownOutline',
+  'tuiIconRefreshCcw',
+  'tuiIconRefreshCcwOutline',
+  'tuiIconEye',
+  'tuiIconEyeOutline',
+  'tuiIconEyeOff',
+  'tuiIconEyeOffOutline',
+  'tuiIconPlus',
+  'tuiIconMinus',
+  'tuiIconCheck',
+  'tuiIconClose',
+  'tuiIconCalendarLarge',
+  'tuiIconHelpCircle',
+]
+
 @Component({
   selector: 'section[appPreloader]',
   templateUrl: 'preloader.component.html',
@@ -95,4 +121,12 @@ const ICONS = [
 })
 export class PreloaderComponent {
   readonly icons = ICONS
+  readonly taiga = TAIGA
+
+  constructor(
+    _modals: ModalController,
+    _alerts: AlertController,
+    _toasts: ToastController,
+    _actions: ActionSheetController,
+  ) {}
 }
diff --git a/web/projects/ui/src/app/app/preloader/preloader.module.ts b/web/projects/ui/src/app/app/preloader/preloader.module.ts
index b1496e638..380b70f3a 100644
--- a/web/projects/ui/src/app/app/preloader/preloader.module.ts
+++ b/web/projects/ui/src/app/app/preloader/preloader.module.ts
@@ -1,11 +1,65 @@
 import { CommonModule } from '@angular/common'
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'
 import { IonicModule } from '@ionic/angular'
+import {
+  TuiErrorModule,
+  TuiExpandModule,
+  TuiLinkModule,
+  TuiScrollbarModule,
+  TuiSvgModule,
+  TuiTooltipModule,
+} from '@taiga-ui/core'
+import {
+  TuiButtonModule,
+  TuiCellModule,
+  TuiIconModule,
+} from '@taiga-ui/experimental'
+import {
+  TuiElasticContainerModule,
+  TuiInputDateModule,
+  TuiInputDateTimeModule,
+  TuiInputFilesModule,
+  TuiInputModule,
+  TuiInputNumberModule,
+  TuiInputTimeModule,
+  TuiMultiSelectModule,
+  TuiProgressModule,
+  TuiRadioListModule,
+  TuiSelectModule,
+  TuiTextAreaModule,
+  TuiToggleModule,
+} from '@taiga-ui/kit'
 import { QrCodeModule } from 'ng-qrcode'
 import { PreloaderComponent } from './preloader.component'
 
 @NgModule({
-  imports: [CommonModule, IonicModule, QrCodeModule],
+  imports: [
+    CommonModule,
+    IonicModule,
+    QrCodeModule,
+    TuiTooltipModule,
+    TuiErrorModule,
+    TuiInputModule,
+    TuiSvgModule,
+    TuiIconModule,
+    TuiButtonModule,
+    TuiLinkModule,
+    TuiInputTimeModule,
+    TuiInputDateModule,
+    TuiInputDateTimeModule,
+    TuiInputFilesModule,
+    TuiMultiSelectModule,
+    TuiInputNumberModule,
+    TuiExpandModule,
+    TuiSelectModule,
+    TuiTextAreaModule,
+    TuiToggleModule,
+    TuiElasticContainerModule,
+    TuiCellModule,
+    TuiProgressModule,
+    TuiScrollbarModule,
+    TuiRadioListModule,
+  ],
   declarations: [PreloaderComponent],
   exports: [PreloaderComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
diff --git a/web/projects/ui/src/app/app/snek/snek.directive.ts b/web/projects/ui/src/app/app/snek/snek.directive.ts
index db812ae4a..3e3ad5dc3 100644
--- a/web/projects/ui/src/app/app/snek/snek.directive.ts
+++ b/web/projects/ui/src/app/app/snek/snek.directive.ts
@@ -1,6 +1,6 @@
 import { Directive, HostListener, Input } from '@angular/core'
-import { LoadingController, ModalController } from '@ionic/angular'
-import { ErrorToastService } from '@start9labs/shared'
+import { ModalController } from '@ionic/angular'
+import { ErrorService, LoadingService } from '@start9labs/shared'
 import { SnakePage } from '../../modals/snake/snake.page'
 import { ApiService } from '../../services/api/embassy-api.service'
 
@@ -13,8 +13,8 @@ export class SnekDirective {
 
   constructor(
     private readonly modalCtrl: ModalController,
-    private readonly loadingCtrl: LoadingController,
-    private readonly errToast: ErrorToastService,
+    private readonly loader: LoadingService,
+    private readonly errorService: ErrorService,
     private readonly embassyApi: ApiService,
   ) {}
 
@@ -30,12 +30,7 @@ export class SnekDirective {
     modal.onDidDismiss().then(async ({ data }) => {
       if (data?.highScore <= (this.appSnekHighScore || 0)) return
 
-      const loader = await this.loadingCtrl.create({
-        message: 'Saving high score...',
-        backdropDismiss: true,
-      })
-
-      await loader.present()
+      const loader = this.loader.open('Saving high score...').subscribe()
 
       try {
         await this.embassyApi.setDbValue<number>(
@@ -43,9 +38,9 @@ export class SnekDirective {
           data.highScore,
         )
       } catch (e: any) {
-        this.errToast.present(e)
+        this.errorService.handleError(e)
       } finally {
-        this.loadingCtrl.dismiss()
+        this.loader.subscribe()
       }
     })
 
diff --git a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.module.ts b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.module.ts
index bf7f844e3..60c37d08d 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.module.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.module.ts
@@ -10,7 +10,6 @@ import {
   UnitConversionPipesModule,
   TextSpinnerComponentModule,
 } from '@start9labs/shared'
-import { GenericFormPageModule } from 'src/app/modals/generic-form/generic-form.module'
 
 @NgModule({
   declarations: [
@@ -23,7 +22,6 @@ import { GenericFormPageModule } from 'src/app/modals/generic-form/generic-form.
     IonicModule,
     UnitConversionPipesModule,
     TextSpinnerComponentModule,
-    GenericFormPageModule,
   ],
   exports: [
     BackupDrivesComponent,
diff --git a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
index fa73b8452..5613ae153 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
@@ -1,21 +1,18 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core'
-import { BackupService } from './backup.service'
+import { ActionSheetController, AlertController } from '@ionic/angular'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { CB } from '@start9labs/start-sdk'
 import {
   CifsBackupTarget,
   DiskBackupTarget,
   RR,
 } from 'src/app/services/api/api.types'
-import {
-  ActionSheetController,
-  AlertController,
-  LoadingController,
-  ModalController,
-} from '@ionic/angular'
-import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
-import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ErrorToastService } from '@start9labs/shared'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
 import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
+import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
+import { FormComponent } from '../form.component'
+import { BackupService } from './backup.service'
 
 type BackupType = 'create' | 'restore'
 
@@ -32,13 +29,13 @@ export class BackupDrivesComponent {
   loadingText = ''
 
   constructor(
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
     private readonly actionCtrl: ActionSheetController,
     private readonly alertCtrl: AlertController,
-    private readonly modalCtrl: ModalController,
     private readonly embassyApi: ApiService,
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly backupService: BackupService,
+    private readonly formDialog: FormDialogService,
   ) {}
 
   get loading() {
@@ -87,23 +84,19 @@ export class BackupDrivesComponent {
   }
 
   async presentModalAddCifs(): Promise<void> {
-    const modal = await this.modalCtrl.create({
-      component: GenericFormPage,
-      componentProps: {
-        title: 'New Network Folder',
-        spec: CifsSpec,
+    this.formDialog.open(FormComponent, {
+      label: 'New Network Folder',
+      data: {
+        spec: await configBuilderToSpec(cifsSpec),
         buttons: [
           {
-            text: 'Connect',
-            handler: (value: RR.AddBackupTargetReq) => {
-              return this.addCifs(value)
-            },
-            isSubmit: true,
+            text: 'Execute',
+            handler: async (value: RR.AddBackupTargetReq) =>
+              this.addCifs(value),
           },
         ],
       },
     })
-    await modal.present()
   }
 
   async presentActionCifs(
@@ -151,10 +144,9 @@ export class BackupDrivesComponent {
   }
 
   private async addCifs(value: RR.AddBackupTargetReq): Promise<boolean> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Testing connectivity to shared folder...',
-    })
-    await loader.present()
+    const loader = this.loader
+      .open('Testing connectivity to shared folder...')
+      .subscribe()
 
     try {
       const res = await this.embassyApi.addBackupTarget(value)
@@ -166,10 +158,10 @@ export class BackupDrivesComponent {
       })
       return true
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
       return false
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
@@ -180,62 +172,57 @@ export class BackupDrivesComponent {
   ): Promise<void> {
     const { hostname, path, username } = entry
 
-    const modal = await this.modalCtrl.create({
-      component: GenericFormPage,
-      componentProps: {
-        title: 'Update Shared Folder',
-        spec: CifsSpec,
+    this.formDialog.open(FormComponent, {
+      label: 'Update Network Folder',
+      data: {
+        spec: await configBuilderToSpec(cifsSpec),
         buttons: [
           {
-            text: 'Save',
-            handler: (value: RR.AddBackupTargetReq) => {
-              return this.editCifs({ id, ...value }, index)
-            },
-            isSubmit: true,
+            text: 'Execute',
+            handler: async (value: RR.AddBackupTargetReq) =>
+              this.editCifs({ id, ...value }, index),
           },
         ],
-        initialValue: {
+        value: {
           hostname,
           path,
           username,
         },
       },
     })
-    await modal.present()
   }
 
   private async editCifs(
     value: RR.UpdateBackupTargetReq,
     index: number,
-  ): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Testing connectivity to shared folder...',
-    })
-    await loader.present()
+  ): Promise<boolean> {
+    const loader = this.loader
+      .open('Testing connectivity to shared folder...')
+      .subscribe()
 
     try {
       const res = await this.embassyApi.updateBackupTarget(value)
       this.backupService.cifs[index].entry = Object.values(res)[0]
+
+      return true
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
+      return false
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async deleteCifs(id: string, index: number): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Removing...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Removing...').subscribe()
 
     try {
       await this.embassyApi.removeBackupTarget({ id })
       this.backupService.cifs.splice(index, 1)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
@@ -274,40 +261,33 @@ export class BackupDrivesStatusComponent {
   @Input() hasValidBackup!: boolean
 }
 
-const CifsSpec: ConfigSpec = {
-  hostname: {
-    type: 'string',
-    name: 'Hostname/IP',
+const cifsSpec = CB.Config.of({
+  hostname: CB.Value.text({
+    name: 'Hostname',
     description:
-      'The hostname or IP address of the target device on your Local Area Network.',
-    placeholder: `e.g. 'MyComputer.local' OR '192.168.1.4'`,
-    nullable: false,
-    masked: false,
-    copyable: false,
-  },
-  path: {
-    type: 'string',
+      'The hostname of your target device on the Local Area Network.',
+    warning: null,
+    placeholder: `e.g. 'My Computer' OR 'my-computer.local'`,
+    required: { default: null },
+    patterns: [],
+  }),
+  path: CB.Value.text({
     name: 'Path',
     description: `On Windows, this is the fully qualified path to the shared folder, (e.g. /Desktop/my-folder).\n\n On Linux and Mac, this is the literal name of the shared folder (e.g. my-shared-folder).`,
     placeholder: 'e.g. my-shared-folder or /Desktop/my-folder',
-    nullable: false,
-    masked: false,
-    copyable: false,
-  },
-  username: {
-    type: 'string',
+    required: { default: null },
+  }),
+  username: CB.Value.text({
     name: 'Username',
     description: `On Linux, this is the samba username you created when sharing the folder.\n\n On Mac and Windows, this is the username of the user who is sharing the folder.`,
-    nullable: false,
-    masked: false,
-    copyable: false,
-  },
-  password: {
-    type: 'string',
+    required: { default: null },
+    placeholder: 'My Network Folder',
+  }),
+  password: CB.Value.text({
     name: 'Password',
     description: `On Linux, this is the samba password you created when sharing the folder.\n\n On Mac and Windows, this is the password of the user who is sharing the folder.`,
-    nullable: true,
+    required: false,
     masked: true,
-    copyable: false,
-  },
-}
+    placeholder: 'My Network Folder',
+  }),
+})
diff --git a/web/projects/ui/src/app/components/form-object/form-label.component.html b/web/projects/ui/src/app/components/form-object/form-label.component.html
deleted file mode 100644
index 69c29f99d..000000000
--- a/web/projects/ui/src/app/components/form-object/form-label.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<ion-button
-  *ngIf="data.description"
-  class="slot-start"
-  fill="clear"
-  (click)="presentAlertDescription($event)"
->
-  <ion-icon name="help-circle-outline" slot="icon-only" size="small"></ion-icon>
-</ion-button>
-
-<span>{{ data.name }}</span>
-
-<ion-text color="success" *ngIf="data.new">&nbsp;(New)</ion-text>
-<ion-text color="success" *ngIf="data.newOptions">&nbsp;(New Options)</ion-text>
-<ion-text color="warning" *ngIf="data.edited">&nbsp;(Edited)</ion-text>
-
-<span *ngIf="data.required">&nbsp;*</span>
diff --git a/web/projects/ui/src/app/components/form-object/form-object.component.html b/web/projects/ui/src/app/components/form-object/form-object.component.html
deleted file mode 100644
index 8bbfc5c78..000000000
--- a/web/projects/ui/src/app/components/form-object/form-object.component.html
+++ /dev/null
@@ -1,372 +0,0 @@
-<ion-item-group [formGroup]="formGroup">
-  <div *ngFor="let entry of formGroup.controls | keyvalue: asIsOrder">
-    <div *ngIf="objectSpec[entry.key] as spec">
-      <!-- string or number -->
-      <ng-container *ngIf="spec.type === 'string' || spec.type === 'number'">
-        <!-- label -->
-        <h4 class="input-label">
-          <form-label
-            [data]="{
-              name: spec.name,
-              description: spec.description,
-              new: original?.[entry.key] === undefined,
-              edited: entry.value.dirty,
-              required: !spec.nullable
-            }"
-          ></form-label>
-        </h4>
-        <ion-item [color]="(theme$ | async) === 'Light' ? 'light' : 'dark'">
-          <ion-textarea
-            *ngIf="spec.type === 'string' && spec.textarea; else notTextArea"
-            [placeholder]="spec.placeholder || 'Enter ' + spec.name"
-            [formControlName]="entry.key"
-            (ionFocus)="presentAlertChangeWarning(entry.key, spec)"
-            (ionChange)="handleInputChange()"
-          ></ion-textarea>
-          <ng-template #notTextArea>
-            <ion-input
-              type="text"
-              [inputmode]="spec.type === 'number' ? 'tel' : 'text'"
-              [class.redacted]="
-                spec.type === 'string' &&
-                entry.value.value &&
-                spec.masked &&
-                !unmasked[entry.key]
-              "
-              [placeholder]="spec.placeholder || 'Enter ' + spec.name"
-              [formControlName]="entry.key"
-              (ionFocus)="presentAlertChangeWarning(entry.key, spec)"
-              (ionChange)="handleInputChange()"
-            ></ion-input>
-          </ng-template>
-          <ion-button
-            *ngIf="spec.type === 'string' && spec.masked"
-            slot="end"
-            fill="clear"
-            color="light"
-            (click)="unmasked[entry.key] = !unmasked[entry.key]"
-          >
-            <ion-icon
-              slot="icon-only"
-              [name]="unmasked[entry.key] ? 'eye-off-outline' : 'eye-outline'"
-              size="small"
-            ></ion-icon>
-          </ion-button>
-          <ion-note
-            *ngIf="spec.type === 'number' && spec.units"
-            slot="end"
-            color="light"
-            style="font-size: medium"
-          >
-            {{ spec.units }}
-          </ion-note>
-        </ion-item>
-        <p class="error-message">
-          <span *ngIf="(formGroup | getControl: entry.key).errors as errors">
-            {{ errors | getError: $any(spec)['pattern-description'] }}
-          </span>
-        </p>
-      </ng-container>
-      <!-- boolean or enum -->
-      <ion-item
-        *ngIf="spec.type === 'boolean' || spec.type === 'enum'"
-        style="--padding-start: 0"
-      >
-        <ion-button
-          *ngIf="spec.description"
-          fill="clear"
-          (click)="presentAlertBoolEnumDescription($event, spec)"
-          style="--padding-start: 0"
-        >
-          <ion-icon
-            name="help-circle-outline"
-            slot="icon-only"
-            size="small"
-          ></ion-icon>
-        </ion-button>
-        <ion-label>
-          <b>
-            {{ spec.name }}
-            <ion-text
-              *ngIf="original?.[entry.key] === undefined"
-              color="success"
-            >
-              (New)
-            </ion-text>
-            <ion-text *ngIf="entry.value.dirty" color="warning">
-              (Edited)
-            </ion-text>
-          </b>
-        </ion-label>
-        <!-- boolean -->
-        <ion-toggle
-          *ngIf="spec.type === 'boolean'"
-          slot="end"
-          [formControlName]="entry.key"
-          (ionChange)="handleBooleanChange(entry.key, spec)"
-        ></ion-toggle>
-        <!-- enum -->
-        <!-- class enter-click disables the enter click on the modal behind the select -->
-        <ion-select
-          *ngIf="spec.type === 'enum' && formGroup.get(entry.key) as control"
-          [interfaceOptions]="{
-            message: spec.warning | toWarningText,
-            cssClass: 'enter-click'
-          }"
-          slot="end"
-          placeholder="Select"
-          [formControlName]="entry.key"
-          [selectedText]="spec['value-names'][control.value]"
-        >
-          <ion-select-option
-            *ngFor="let option of spec.values"
-            [value]="option"
-          >
-            {{ spec['value-names'][option] }}
-          </ion-select-option>
-        </ion-select>
-      </ion-item>
-      <!-- object -->
-      <ng-container *ngIf="spec.type === 'object'">
-        <!-- label -->
-        <ion-item-divider
-          (click)="toggleExpandObject(entry.key)"
-          style="cursor: pointer"
-          [class.error-border]="entry.value.invalid"
-        >
-          <form-label
-            [data]="{
-              name: spec.name,
-              description: spec.description,
-              new: original?.[entry.key] === undefined,
-              edited: entry.value.dirty,
-              newOptions: objectDisplay[entry.key].hasNewOptions
-            }"
-          ></form-label>
-          <ion-icon
-            slot="end"
-            name="chevron-up"
-            [color]="entry.value.invalid ? 'danger' : undefined"
-            [ngStyle]="{
-              transform: objectDisplay[entry.key].expanded
-                ? 'rotate(0deg)'
-                : 'rotate(180deg)',
-              transition: 'transform 0.42s ease-out'
-            }"
-          ></ion-icon>
-        </ion-item-divider>
-        <!-- body -->
-        <tui-expand
-          [expanded]="objectDisplay[entry.key].expanded"
-          [id]="objectId | toElementId: entry.key"
-        >
-          <div class="nested-wrapper">
-            <form-object
-              [objectSpec]="spec.spec"
-              [formGroup]="$any(entry.value)"
-              [current]="current?.[entry.key]"
-              [original]="original?.[entry.key]"
-              (hasNewOptions)="setHasNew(entry.key)"
-            ></form-object>
-          </div>
-        </tui-expand>
-      </ng-container>
-      <!-- union -->
-      <form-union
-        *ngIf="spec.type === 'union'"
-        [spec]="spec"
-        [formGroup]="$any(entry.value)"
-        [current]="current?.[entry.key]"
-        [original]="original?.[entry.key]"
-      ></form-union>
-      <!-- list (not enum) -->
-      <ng-container *ngIf="spec.type === 'list' && spec.subtype !== 'enum'">
-        <ng-container
-          *ngIf="formGroup.get(entry.key) as formArr"
-          [formArrayName]="entry.key"
-        >
-          <!-- label -->
-          <ion-item-divider [class.error-border]="entry.value.invalid">
-            <form-label
-              [data]="{
-                name: spec.name,
-                description: spec.description,
-                new: original?.[entry.key] === undefined,
-                edited: entry.value.dirty,
-                required: !!(spec.range | toRange).min
-              }"
-            ></form-label>
-            <ion-button
-              strong
-              fill="clear"
-              color="dark"
-              slot="end"
-              (click)="addListItemWrapper(entry.key, spec)"
-            >
-              <ion-icon slot="start" name="add"></ion-icon>
-              Add
-            </ion-button>
-          </ion-item-divider>
-          <p class="error-message" style="margin-bottom: 8px">
-            <span *ngIf="(formGroup | getControl: entry.key).errors as errors">
-              {{ errors | getError }}
-            </span>
-          </p>
-          <!-- body -->
-          <div class="nested-wrapper">
-            <div
-              *ngFor="
-                let abstractControl of $any(formArr).controls;
-                let i = index
-              "
-            >
-              <!-- object or union -->
-              <ng-container
-                *ngIf="spec.subtype === 'object' || spec.subtype === 'union'"
-              >
-                <!-- object/union label -->
-                <ion-item
-                  button
-                  (click)="toggleExpandListObject(entry.key, i)"
-                  [class.error-border]="abstractControl.invalid"
-                >
-                  <form-label
-                    [data]="{
-                      name:
-                        objectListDisplay[entry.key][i].displayAs ||
-                        'Entry ' + (i + 1),
-                      new: false,
-                      edited: abstractControl.dirty
-                    }"
-                  ></form-label>
-                  <ion-icon
-                    slot="end"
-                    name="chevron-up"
-                    [color]="abstractControl.invalid ? 'danger' : undefined"
-                    [ngStyle]="{
-                      transform: objectListDisplay[entry.key][i].expanded
-                        ? 'rotate(0deg)'
-                        : 'rotate(180deg)',
-                      transition: 'transform 0.42s ease-out'
-                    }"
-                  ></ion-icon>
-                </ion-item>
-                <!-- object/union body -->
-                <tui-expand
-                  style="padding-left: 24px"
-                  [expanded]="objectListDisplay[entry.key][i].expanded"
-                  [id]="objectId | toElementId: entry.key:i"
-                >
-                  <form-object
-                    *ngIf="spec.subtype === 'object'"
-                    [objectSpec]="$any(spec.spec).spec"
-                    [formGroup]="abstractControl"
-                    [current]="current?.[entry.key]?.[i]"
-                    [original]="original?.[entry.key]?.[i]"
-                    (onInputChange)="
-                      updateLabel(entry.key, i, $any(spec.spec)['display-as'])
-                    "
-                  ></form-object>
-                  <form-union
-                    *ngIf="spec.subtype === 'union'"
-                    [spec]="$any(spec.spec)"
-                    [formGroup]="abstractControl"
-                    [current]="current?.[entry.key]?.[i]"
-                    [original]="original?.[entry.key]?.[i]"
-                    (onInputChange)="
-                      updateLabel(entry.key, i, $any(spec.spec)['display-as'])
-                    "
-                  ></form-union>
-                  <div style="text-align: right; padding-top: 12px">
-                    <ion-button
-                      fill="clear"
-                      (click)="presentAlertDelete(entry.key, i)"
-                      color="danger"
-                    >
-                      <ion-icon slot="start" name="close"></ion-icon>
-                      Delete
-                    </ion-button>
-                  </div>
-                </tui-expand>
-              </ng-container>
-              <!-- string or number -->
-              <div
-                *ngIf="spec.subtype === 'string' || spec.subtype === 'number'"
-                [id]="objectId | toElementId: entry.key:i"
-              >
-                <ion-item
-                  [color]="(theme$ | async) === 'Light' ? 'light' : 'dark'"
-                >
-                  <ion-input
-                    type="text"
-                    [inputmode]="spec.subtype === 'number' ? 'tel' : 'text'"
-                    [placeholder]="
-                      $any(spec.spec).placeholder || 'Enter ' + spec.name
-                    "
-                    [formControlName]="i"
-                  ></ion-input>
-                  <ion-button
-                    strong
-                    fill="clear"
-                    slot="end"
-                    color="danger"
-                    (click)="presentAlertDelete(entry.key, i)"
-                  >
-                    <ion-icon slot="icon-only" name="close"></ion-icon>
-                  </ion-button>
-                </ion-item>
-                <p class="error-message">
-                  <span
-                    *ngIf="
-                      (formGroup | getControl: entry.key:i).errors as errors
-                    "
-                  >
-                    {{ errors | getError: $any(spec)['pattern-description'] }}
-                  </span>
-                </p>
-              </div>
-            </div>
-          </div>
-        </ng-container>
-      </ng-container>
-      <!-- list (enum) -->
-      <ng-container *ngIf="spec.type === 'list' && spec.subtype === 'enum'">
-        <ng-container
-          *ngIf="formGroup.get(entry.key) as formArr"
-          [formArrayName]="entry.key"
-        >
-          <!-- label -->
-          <p class="input-label">
-            <form-label
-              [data]="{
-                name: spec.name,
-                description: spec.description,
-                new: original?.[entry.key] === undefined,
-                edited: entry.value.dirty
-              }"
-            ></form-label>
-          </p>
-          <!-- list -->
-          <ion-item
-            button
-            detail="false"
-            color="dark"
-            (click)="presentModalEnumList(entry.key, $any(spec), formArr.value)"
-          >
-            <ion-label style="white-space: nowrap !important">
-              <h2>{{ formArr.value | toEnumListDisplay: $any(spec.spec) }}</h2>
-            </ion-label>
-            <ion-button slot="end" fill="clear" color="light">
-              <ion-icon slot="icon-only" name="chevron-down"></ion-icon>
-            </ion-button>
-          </ion-item>
-          <p class="error-message">
-            <span *ngIf="(formGroup | getControl: entry.key).errors as errors">
-              {{ errors | getError }}
-            </span>
-          </p>
-        </ng-container>
-      </ng-container>
-    </div>
-  </div>
-</ion-item-group>
diff --git a/web/projects/ui/src/app/components/form-object/form-object.component.module.ts b/web/projects/ui/src/app/components/form-object/form-object.component.module.ts
deleted file mode 100644
index 06af388c0..000000000
--- a/web/projects/ui/src/app/components/form-object/form-object.component.module.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import {
-  FormObjectComponent,
-  FormUnionComponent,
-  FormLabelComponent,
-} from './form-object.component'
-import {
-  GetErrorPipe,
-  ToWarningTextPipe,
-  ToElementIdPipe,
-  GetControlPipe,
-  ToEnumListDisplayPipe,
-  ToRangePipe,
-} from './form-object.pipes'
-import { IonicModule } from '@ionic/angular'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { SharedPipesModule } from '@start9labs/shared'
-import { TuiElasticContainerModule } from '@taiga-ui/kit'
-import { EnumListPageModule } from 'src/app/modals/enum-list/enum-list.module'
-import { TuiExpandModule } from '@taiga-ui/core'
-
-@NgModule({
-  declarations: [
-    FormObjectComponent,
-    FormUnionComponent,
-    FormLabelComponent,
-    ToWarningTextPipe,
-    GetErrorPipe,
-    ToEnumListDisplayPipe,
-    ToElementIdPipe,
-    GetControlPipe,
-    ToRangePipe,
-  ],
-  imports: [
-    CommonModule,
-    IonicModule,
-    FormsModule,
-    ReactiveFormsModule,
-    SharedPipesModule,
-    EnumListPageModule,
-    TuiElasticContainerModule,
-    TuiExpandModule,
-  ],
-  exports: [FormObjectComponent, FormLabelComponent],
-})
-export class FormObjectComponentModule {}
diff --git a/web/projects/ui/src/app/components/form-object/form-object.component.scss b/web/projects/ui/src/app/components/form-object/form-object.component.scss
deleted file mode 100644
index a98a0ff72..000000000
--- a/web/projects/ui/src/app/components/form-object/form-object.component.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-.slot-start {
-  display: inline-block;
-  vertical-align: middle;
-  --padding-start: 0;
-  --padding-end: 7px;
-}
-
-.error-border {
-  border-color: var(--ion-color-danger-shade);
-  --border-color: var(--ion-color-danger-shade);
-}
-
-.redacted {
-  font-family: 'Redacted'
-}
-
-ion-input {
-  font-family: 'Courier New';
-  font-weight: bold;
-  --placeholder-font-weight: 400;
-}
-
-ion-item-divider {
-  text-transform: unset;
-  --padding-top: 18px;
-  --padding-start: 0;
-  border-bottom: 1px solid var(--ion-item-border-color, var(--ion-border-color, var(--ion-color-step-150, rgba(0, 0, 0, 0.13))))
-}
-
-.nested-wrapper {
-  padding: 0 0 16px 24px;
-}
-
-.error-message {
-  margin-top: 2px;
-  font-size: small;
-  color: var(--ion-color-danger);
-}
-
-.indent {
-  margin-left: 24px;
-}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/components/form-object/form-object.component.ts b/web/projects/ui/src/app/components/form-object/form-object.component.ts
deleted file mode 100644
index fcc6a0c61..000000000
--- a/web/projects/ui/src/app/components/form-object/form-object.component.ts
+++ /dev/null
@@ -1,425 +0,0 @@
-import {
-  Component,
-  Input,
-  Output,
-  EventEmitter,
-  ChangeDetectionStrategy,
-  Inject,
-  inject,
-  SimpleChanges,
-} from '@angular/core'
-import { FormArray, UntypedFormArray, UntypedFormGroup } from '@angular/forms'
-import { AlertButton, AlertController, ModalController } from '@ionic/angular'
-import {
-  ConfigSpec,
-  ListValueSpecOf,
-  ValueSpec,
-  ValueSpecBoolean,
-  ValueSpecEnum,
-  ValueSpecList,
-  ValueSpecListOf,
-  ValueSpecUnion,
-} from 'src/app/pkg-config/config-types'
-import { FormService } from 'src/app/services/form.service'
-import { EnumListPage } from 'src/app/modals/enum-list/enum-list.page'
-import { THEME, pauseFor } from '@start9labs/shared'
-import { v4 } from 'uuid'
-import { DOCUMENT } from '@angular/common'
-
-const Mustache = require('mustache')
-
-interface Config {
-  [key: string]: any
-}
-@Component({
-  selector: 'form-object',
-  templateUrl: './form-object.component.html',
-  styleUrls: ['./form-object.component.scss'],
-})
-export class FormObjectComponent {
-  @Input() objectSpec!: ConfigSpec
-  @Input() formGroup!: UntypedFormGroup
-  @Input() current?: Config
-  @Input() original?: Config
-  @Output() onInputChange = new EventEmitter<void>()
-  @Output() hasNewOptions = new EventEmitter<void>()
-  warningAck: { [key: string]: boolean } = {}
-  unmasked: { [key: string]: boolean } = {}
-  objectDisplay: {
-    [key: string]: { expanded: boolean; hasNewOptions: boolean }
-  } = {}
-  objectListDisplay: {
-    [key: string]: { expanded: boolean; displayAs: string }[]
-  } = {}
-  objectId = v4()
-
-  readonly theme$ = inject(THEME)
-
-  constructor(
-    private readonly alertCtrl: AlertController,
-    private readonly modalCtrl: ModalController,
-    private readonly formService: FormService,
-    @Inject(DOCUMENT) private readonly document: Document,
-  ) {}
-
-  ngOnInit() {
-    this.setDisplays()
-
-    // setTimeout hack to avoid ExpressionChangedAfterItHasBeenCheckedError
-    setTimeout(() => {
-      if (
-        this.original &&
-        Object.keys(this.current || {}).some(
-          key => this.original![key] === undefined,
-        )
-      )
-        this.hasNewOptions.emit()
-    })
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    const specChanges = changes['objectSpec']
-
-    if (!specChanges) return
-
-    if (
-      !specChanges.firstChange &&
-      Object.keys({
-        ...specChanges.previousValue,
-        ...specChanges.currentValue,
-      }).length !== Object.keys(specChanges.previousValue).length
-    ) {
-      this.setDisplays()
-    }
-  }
-
-  private setDisplays() {
-    Object.keys(this.objectSpec).forEach(key => {
-      const spec = this.objectSpec[key]
-
-      if (spec.type === 'list' && ['object', 'union'].includes(spec.subtype)) {
-        this.objectListDisplay[key] = []
-        this.formGroup.get(key)?.value.forEach((obj: any, index: number) => {
-          const displayAs = (spec.spec as ListValueSpecOf<'object'>)[
-            'display-as'
-          ]
-          this.objectListDisplay[key][index] = {
-            expanded: false,
-            displayAs: displayAs
-              ? (Mustache as any).render(displayAs, obj)
-              : '',
-          }
-        })
-      } else if (spec.type === 'object') {
-        this.objectDisplay[key] = {
-          expanded: false,
-          hasNewOptions: false,
-        }
-      }
-    })
-  }
-
-  addListItemWrapper<T extends ValueSpec>(
-    key: string,
-    spec: T extends ValueSpecUnion ? never : T,
-  ) {
-    this.presentAlertChangeWarning(key, spec, () => this.addListItem(key))
-  }
-
-  toggleExpandObject(key: string) {
-    this.objectDisplay[key].expanded = !this.objectDisplay[key].expanded
-  }
-
-  toggleExpandListObject(key: string, i: number) {
-    this.objectListDisplay[key][i].expanded =
-      !this.objectListDisplay[key][i].expanded
-  }
-
-  updateLabel(key: string, i: number, displayAs: string) {
-    this.objectListDisplay[key][i].displayAs = displayAs
-      ? Mustache.render(displayAs, this.formGroup.get(key)?.value[i])
-      : ''
-  }
-
-  handleInputChange() {
-    this.onInputChange.emit()
-  }
-
-  setHasNew(key: string) {
-    this.hasNewOptions.emit()
-    setTimeout(() => {
-      this.objectDisplay[key].hasNewOptions = true
-    }, 100)
-  }
-
-  handleBooleanChange(key: string, spec: ValueSpecBoolean) {
-    if (spec.warning) {
-      const current = this.formGroup.get(key)?.value
-      const cancelFn = () => this.formGroup.get(key)?.setValue(!current)
-      this.presentAlertChangeWarning(key, spec, undefined, cancelFn)
-    }
-  }
-
-  async presentModalEnumList(
-    key: string,
-    spec: ValueSpecListOf<'enum'>,
-    current: string[],
-  ) {
-    const modal = await this.modalCtrl.create({
-      componentProps: {
-        key,
-        spec,
-        current,
-      },
-      component: EnumListPage,
-    })
-
-    modal.onWillDismiss<string[]>().then(({ data }) => {
-      if (!data) return
-      this.updateEnumList(key, current, data)
-    })
-
-    await modal.present()
-  }
-
-  async presentAlertChangeWarning<T extends ValueSpec>(
-    key: string,
-    spec: T extends ValueSpecUnion ? never : T,
-    okFn?: Function,
-    cancelFn?: Function,
-  ) {
-    if (!spec.warning || this.warningAck[key]) return okFn ? okFn() : null
-    this.warningAck[key] = true
-
-    const buttons: AlertButton[] = [
-      {
-        text: 'Ok',
-        handler: () => {
-          if (okFn) okFn()
-        },
-        cssClass: 'enter-click',
-      },
-    ]
-
-    if (okFn || cancelFn) {
-      buttons.unshift({
-        text: 'Cancel',
-        handler: () => {
-          if (cancelFn) cancelFn()
-        },
-      })
-    }
-
-    const alert = await this.alertCtrl.create({
-      header: 'Warning',
-      subHeader: `Editing ${spec.name} has consequences:`,
-      message: spec.warning,
-      buttons,
-    })
-    await alert.present()
-  }
-
-  async presentAlertDelete(key: string, index: number) {
-    const alert = await this.alertCtrl.create({
-      header: 'Confirm',
-      message: 'Are you sure you want to delete this entry?',
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Delete',
-          handler: () => {
-            this.deleteListItem(key, index)
-          },
-          cssClass: 'enter-click',
-        },
-      ],
-    })
-    await alert.present()
-  }
-
-  async presentAlertBoolEnumDescription(
-    event: Event,
-    spec: ValueSpecBoolean | ValueSpecEnum,
-  ) {
-    event.stopPropagation()
-    const { name, description } = spec
-
-    const alert = await this.alertCtrl.create({
-      header: name,
-      message: description,
-      buttons: [
-        {
-          text: 'OK',
-          cssClass: 'enter-click',
-        },
-      ],
-    })
-    await alert.present()
-  }
-
-  private addListItem(key: string): void {
-    const arr = this.formGroup.get(key) as UntypedFormArray
-    const listSpec = this.objectSpec[key] as ValueSpecList
-    const newItem = this.formService.getListItem(listSpec, undefined)!
-
-    const index = arr.length
-    arr.insert(index, newItem)
-
-    if (['object', 'union'].includes(listSpec.subtype)) {
-      const displayAs = (listSpec.spec as ListValueSpecOf<'object'>)[
-        'display-as'
-      ]
-      this.objectListDisplay[key].push({
-        expanded: false,
-        displayAs: displayAs ? Mustache.render(displayAs, newItem.value) : '',
-      })
-    }
-
-    setTimeout(() => {
-      const element = this.document.getElementById(
-        getElementId(this.objectId, key, index),
-      )
-      element?.parentElement?.scrollIntoView({ behavior: 'smooth' })
-
-      if (['object', 'union'].includes(listSpec.subtype)) {
-        pauseFor(250).then(() => this.toggleExpandListObject(key, index))
-      }
-    }, 100)
-
-    arr.markAsDirty()
-  }
-
-  private deleteListItem(key: string, index: number, markDirty = true): void {
-    // if (this.objectListDisplay[key])
-    //   this.objectListDisplay[key][index].height = '0px'
-    const arr = this.formGroup.get(key) as UntypedFormArray
-    if (markDirty) arr.markAsDirty()
-    pauseFor(250).then(() => {
-      if (this.objectListDisplay[key])
-        this.objectListDisplay[key].splice(index, 1)
-      arr.removeAt(index)
-    })
-  }
-
-  private updateEnumList(key: string, current: string[], updated: string[]) {
-    const arr = this.formGroup.get(key) as FormArray
-
-    for (let i = current.length - 1; i >= 0; i--) {
-      if (!updated.includes(current[i])) {
-        arr.removeAt(i)
-      }
-    }
-
-    const listSpec = this.objectSpec[key] as ValueSpecList
-
-    updated.forEach(val => {
-      if (!current.includes(val)) {
-        const newItem = this.formService.getListItem(listSpec, val)!
-        arr.insert(arr.length, newItem)
-      }
-    })
-
-    arr.markAsDirty()
-  }
-
-  asIsOrder() {
-    return 0
-  }
-}
-
-@Component({
-  selector: 'form-union',
-  templateUrl: './form-union.component.html',
-  styleUrls: ['./form-object.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class FormUnionComponent {
-  @Input() formGroup!: UntypedFormGroup
-  @Input() spec!: ValueSpecUnion
-  @Input() current?: Config
-  @Input() original?: Config
-
-  get unionValue() {
-    return this.formGroup.get(this.spec.tag.id)?.value
-  }
-
-  get isNew() {
-    return !this.original
-  }
-
-  get hasNewOptions() {
-    const tagId = this.spec.tag.id
-    return (
-      this.original?.[tagId] === this.current?.[tagId] &&
-      !!Object.keys(this.current || {}).find(
-        key => this.original![key] === undefined,
-      )
-    )
-  }
-
-  objectId = v4()
-
-  constructor(private readonly formService: FormService) {}
-
-  updateUnion(e: any): void {
-    const tagId = this.spec.tag.id
-
-    Object.keys(this.formGroup.controls).forEach(control => {
-      if (control === tagId) return
-      this.formGroup.removeControl(control)
-    })
-
-    const unionGroup = this.formService.getUnionObject(
-      this.spec as ValueSpecUnion,
-      e.detail.value,
-    )
-
-    Object.keys(unionGroup.controls).forEach(control => {
-      if (control === tagId) return
-      this.formGroup.addControl(control, unionGroup.controls[control])
-    })
-  }
-}
-
-@Component({
-  selector: 'form-label',
-  templateUrl: './form-label.component.html',
-  styleUrls: ['./form-object.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class FormLabelComponent {
-  @Input() data!: {
-    name: string
-    new: boolean
-    edited: boolean
-    description?: string
-    required?: boolean
-    newOptions?: boolean
-  }
-
-  constructor(private readonly alertCtrl: AlertController) {}
-
-  async presentAlertDescription(event: Event) {
-    event.stopPropagation()
-    const { name, description } = this.data
-
-    const alert = await this.alertCtrl.create({
-      header: name,
-      message: description,
-      buttons: [
-        {
-          text: 'OK',
-          cssClass: 'enter-click',
-        },
-      ],
-    })
-    await alert.present()
-  }
-}
-
-export function getElementId(objectId: string, key: string, index = 0): string {
-  return `${key}-${index}-${objectId}`
-}
diff --git a/web/projects/ui/src/app/components/form-object/form-object.pipes.ts b/web/projects/ui/src/app/components/form-object/form-object.pipes.ts
deleted file mode 100644
index 1dc5a18f2..000000000
--- a/web/projects/ui/src/app/components/form-object/form-object.pipes.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core'
-import {
-  AbstractControl,
-  FormGroup,
-  UntypedFormArray,
-  ValidationErrors,
-} from '@angular/forms'
-import { IonicSafeString } from '@ionic/angular'
-import { ListValueSpecOf } from 'src/app/pkg-config/config-types'
-import { Range } from 'src/app/pkg-config/config-utilities'
-import { getElementId } from './form-object.component'
-
-@Pipe({
-  name: 'getError',
-})
-export class GetErrorPipe implements PipeTransform {
-  transform(errors: ValidationErrors, patternDesc?: string): string {
-    if (errors['required']) {
-      return 'Required'
-    } else if (errors['pattern']) {
-      return patternDesc || 'Invalid pattern'
-    } else if (errors['notNumber']) {
-      return 'Must be a number'
-    } else if (errors['numberNotInteger']) {
-      return 'Must be an integer'
-    } else if (errors['numberNotInRange']) {
-      return errors['numberNotInRange'].value
-    } else if (errors['listNotUnique']) {
-      return errors['listNotUnique'].value
-    } else if (errors['listNotInRange']) {
-      return errors['listNotInRange'].value
-    } else if (errors['listItemIssue']) {
-      return errors['listItemIssue'].value
-    } else {
-      return 'Unknown error'
-    }
-  }
-}
-
-@Pipe({
-  name: 'toEnumListDisplay',
-})
-export class ToEnumListDisplayPipe implements PipeTransform {
-  transform(arr: string[], spec: ListValueSpecOf<'enum'>): string {
-    return arr.map((v: string) => spec['value-names'][v]).join(', ')
-  }
-}
-
-@Pipe({
-  name: 'toWarningText',
-})
-export class ToWarningTextPipe implements PipeTransform {
-  transform(text?: string): IonicSafeString | string {
-    return text
-      ? new IonicSafeString(`<ion-text color="warning">${text}</ion-text>`)
-      : ''
-  }
-}
-
-@Pipe({
-  name: 'toRange',
-})
-export class ToRangePipe implements PipeTransform {
-  transform(range: string): Range {
-    return Range.from(range)
-  }
-}
-
-@Pipe({
-  name: 'toElementId',
-})
-export class ToElementIdPipe implements PipeTransform {
-  transform(objectId: string, key: string, index = 0): string {
-    return getElementId(objectId, key, index)
-  }
-}
-
-@Pipe({
-  name: 'getControl',
-})
-export class GetControlPipe implements PipeTransform {
-  transform(
-    formGroup: FormGroup,
-    key: string,
-    index?: number,
-  ): AbstractControl {
-    const abstractControl = formGroup.get(key)!
-    if (index !== undefined)
-      return (abstractControl as UntypedFormArray).at(index)
-    return abstractControl
-  }
-}
diff --git a/web/projects/ui/src/app/components/form-object/form-union.component.html b/web/projects/ui/src/app/components/form-object/form-union.component.html
deleted file mode 100644
index ed9fc31be..000000000
--- a/web/projects/ui/src/app/components/form-object/form-union.component.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div [formGroup]="formGroup">
-  <!-- union enum -->
-  <ion-item-divider [class.error-border]="formGroup.invalid">
-    <form-label
-      [data]="{
-        name: spec.tag.name,
-        description: spec.tag.description,
-        new: isNew,
-        newOptions: hasNewOptions,
-        edited: formGroup.dirty
-      }"
-    ></form-label>
-    <!-- class enter-click disables the enter click on the modal behind the select -->
-    <ion-select
-      [interfaceOptions]="{
-        message: spec.tag.warning | toWarningText,
-        cssClass: 'enter-click'
-      }"
-      slot="end"
-      placeholder="Select"
-      [formControlName]="spec.tag.id"
-      [selectedText]="spec.tag['variant-names'][unionValue]"
-      (ionChange)="updateUnion($event)"
-    >
-      <ion-select-option
-        *ngFor="let option of spec.variants | keyvalue"
-        [value]="option.key"
-      >
-        {{ spec.tag['variant-names'][option.key] }}
-      </ion-select-option>
-    </ion-select>
-  </ion-item-divider>
-
-  <tui-elastic-container [id]="objectId | toElementId: 'union'" class="indent">
-    <form-object
-      [objectSpec]="spec.variants[unionValue]"
-      [formGroup]="formGroup"
-      [current]="current"
-      [original]="original"
-    ></form-object>
-  </tui-elastic-container>
-</div>
diff --git a/web/projects/ui/src/app/components/form.component.ts b/web/projects/ui/src/app/components/form.component.ts
new file mode 100644
index 000000000..830e8de1e
--- /dev/null
+++ b/web/projects/ui/src/app/components/form.component.ts
@@ -0,0 +1,167 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  inject,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { FormGroup, ReactiveFormsModule } from '@angular/forms'
+import { RouterModule } from '@angular/router'
+import { CT } from '@start9labs/start-sdk'
+
+import {
+  tuiMarkControlAsTouchedAndValidate,
+  TuiValueChangesModule,
+} from '@taiga-ui/cdk'
+import { TuiDialogContext, TuiModeModule } from '@taiga-ui/core'
+import { TuiButtonModule } from '@taiga-ui/experimental'
+import { TuiDialogFormService } from '@taiga-ui/kit'
+import { POLYMORPHEUS_CONTEXT } from '@tinkoff/ng-polymorpheus'
+import { compare, Operation } from 'fast-json-patch'
+import { FormModule } from 'src/app/components/form/form.module'
+import { InvalidService } from 'src/app/components/form/invalid.service'
+import { FormService } from 'src/app/services/form.service'
+
+export interface ActionButton<T> {
+  text: string
+  handler?: (value: T) => Promise<boolean | void> | void
+  link?: string
+}
+
+export interface FormContext<T> {
+  spec: CT.InputSpec
+  buttons: ActionButton<T>[]
+  value?: T
+  patch?: Operation[]
+}
+
+@Component({
+  standalone: true,
+  selector: 'app-form',
+  template: `
+    <form
+      [formGroup]="form"
+      (submit.capture.prevent)="(0)"
+      (reset.capture.prevent.stop)="onReset()"
+      (tuiValueChanges)="markAsDirty()"
+    >
+      <form-group [spec]="spec"></form-group>
+      <footer tuiMode="onDark">
+        <ng-content></ng-content>
+        <ng-container *ngFor="let button of buttons; let last = last">
+          <button
+            *ngIf="button.handler; else link"
+            tuiButton
+            [appearance]="last ? 'primary' : 'flat'"
+            [type]="last ? 'submit' : 'button'"
+            (click)="onClick(button.handler)"
+          >
+            {{ button.text }}
+          </button>
+          <ng-template #link>
+            <a
+              tuiButton
+              appearance="flat"
+              [routerLink]="button.link"
+              (click)="close()"
+            >
+              {{ button.text }}
+            </a>
+          </ng-template>
+        </ng-container>
+      </footer>
+    </form>
+  `,
+  styles: [
+    `
+      footer {
+        position: sticky;
+        bottom: 0;
+        z-index: 10;
+        display: flex;
+        justify-content: flex-end;
+        padding: 1rem 0;
+        margin: 1rem 0 -1rem;
+        gap: 1rem;
+        background: var(--tui-elevation-01);
+        border-top: 1px solid var(--tui-base-02);
+      }
+    `,
+  ],
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    RouterModule,
+    TuiValueChangesModule,
+    TuiButtonModule,
+    TuiModeModule,
+    FormModule,
+  ],
+  providers: [InvalidService],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FormComponent<T extends Record<string, any>> implements OnInit {
+  private readonly dialogFormService = inject(TuiDialogFormService)
+  private readonly formService = inject(FormService)
+  private readonly invalidService = inject(InvalidService)
+  private readonly context = inject<TuiDialogContext<void, FormContext<T>>>(
+    POLYMORPHEUS_CONTEXT,
+    { optional: true },
+  )
+
+  @Input() spec = this.context?.data.spec || {}
+  @Input() buttons = this.context?.data.buttons || []
+  @Input() patch = this.context?.data.patch || []
+  @Input() value?: T = this.context?.data.value
+
+  form = new FormGroup({})
+
+  ngOnInit() {
+    this.dialogFormService.markAsPristine()
+    this.form = this.formService.createForm(this.spec, this.value)
+    this.process(this.patch)
+  }
+
+  onReset() {
+    const { value } = this.form
+
+    this.form = this.formService.createForm(this.spec)
+    this.process(compare(this.form.value, value))
+    tuiMarkControlAsTouchedAndValidate(this.form)
+    this.markAsDirty()
+  }
+
+  async onClick(handler: Required<ActionButton<T>>['handler']) {
+    tuiMarkControlAsTouchedAndValidate(this.form)
+    this.invalidService.scrollIntoView()
+
+    if (this.form.valid && (await handler(this.form.value as T))) {
+      this.close()
+    }
+  }
+
+  markAsDirty() {
+    this.dialogFormService.markAsDirty()
+  }
+
+  close() {
+    this.context?.$implicit.complete()
+  }
+
+  private process(patch: Operation[]) {
+    patch.forEach(({ op, path }) => {
+      const control = this.form.get(path.substring(1).split('/'))
+
+      if (!control || !control.parent) return
+
+      if (op !== 'remove') {
+        control.markAsDirty()
+        control.markAsTouched()
+      }
+
+      control.parent.markAsDirty()
+      control.parent.markAsTouched()
+    })
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/control.directive.ts b/web/projects/ui/src/app/components/form/control.directive.ts
new file mode 100644
index 000000000..327eb8255
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/control.directive.ts
@@ -0,0 +1,30 @@
+import { Directive, ElementRef, inject, OnDestroy, OnInit } from '@angular/core'
+import { ControlContainer, NgControl } from '@angular/forms'
+import { InvalidService } from './invalid.service'
+
+@Directive({
+  selector: 'form-control, form-array, form-object',
+})
+export class ControlDirective implements OnInit, OnDestroy {
+  private readonly invalidService = inject(InvalidService, { optional: true })
+  private readonly element: ElementRef<HTMLElement> = inject(ElementRef)
+  private readonly control =
+    inject(NgControl, { optional: true }) ||
+    inject(ControlContainer, { optional: true })
+
+  get invalid(): boolean {
+    return !!this.control?.invalid
+  }
+
+  scrollIntoView() {
+    this.element.nativeElement.scrollIntoView({ behavior: 'smooth' })
+  }
+
+  ngOnInit() {
+    this.invalidService?.add(this)
+  }
+
+  ngOnDestroy() {
+    this.invalidService?.remove(this)
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/control.ts b/web/projects/ui/src/app/components/form/control.ts
new file mode 100644
index 000000000..476826194
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/control.ts
@@ -0,0 +1,35 @@
+import { inject } from '@angular/core'
+import { FormControlComponent } from './form-control/form-control.component'
+import { CT } from '@start9labs/start-sdk'
+
+export abstract class Control<Spec extends CT.ValueSpec, Value> {
+  private readonly control: FormControlComponent<Spec, Value> =
+    inject(FormControlComponent)
+
+  get invalid(): boolean {
+    return this.control.touched && this.control.invalid
+  }
+
+  get spec(): Spec {
+    return this.control.spec
+  }
+
+  // TODO: Properly handle already set immutable value
+  get readOnly(): boolean {
+    return (
+      !!this.value && !!this.control.control?.pristine && this.control.immutable
+    )
+  }
+
+  get value(): Value | null {
+    return this.control.value
+  }
+
+  set value(value: Value | null) {
+    this.control.onInput(value)
+  }
+
+  onFocus(focused: boolean) {
+    this.control.onFocus(focused)
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-array/form-array.component.html b/web/projects/ui/src/app/components/form/form-array/form-array.component.html
new file mode 100644
index 000000000..76c67f837
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-array/form-array.component.html
@@ -0,0 +1,58 @@
+<div class="label">
+  {{ spec.name }}
+  <tui-tooltip
+    *ngIf="spec.description || spec.disabled"
+    [content]="spec | hint"
+  ></tui-tooltip>
+  <button
+    tuiLink
+    type="button"
+    class="add"
+    [disabled]="!canAdd"
+    (click)="add()"
+  >
+    + Add
+  </button>
+</div>
+<tui-error [error]="order | tuiFieldError | async"></tui-error>
+
+<ng-container *ngFor="let item of array.control.controls; let index = index">
+  <form-object
+    *ngIf="spec.spec.type === 'object'; else control"
+    class="object"
+    [class.object_open]="!!open.get(item)"
+    [formGroup]="$any(item)"
+    [spec]="$any(spec.spec)"
+    [@tuiHeightCollapse]="animation"
+    [@tuiFadeIn]="animation"
+    [open]="!!open.get(item)"
+    (openChange)="open.set(item, $event)"
+  >
+    {{ item.value | mustache: $any(spec.spec).displayAs }}
+    <ng-container *ngTemplateOutlet="remove"></ng-container>
+  </form-object>
+  <ng-template #control>
+    <form-control
+      class="control"
+      tuiTextfieldSize="m"
+      [tuiTextfieldLabelOutside]="true"
+      [tuiTextfieldIcon]="remove"
+      [formControl]="$any(item)"
+      [spec]="$any(spec.spec)"
+      [@tuiHeightCollapse]="animation"
+      [@tuiFadeIn]="animation"
+    ></form-control>
+  </ng-template>
+  <ng-template #remove>
+    <button
+      tuiIconButton
+      type="button"
+      class="remove"
+      iconLeft="tuiIconTrash"
+      appearance="icon"
+      size="m"
+      title="Remove"
+      (click.stop)="removeAt(index)"
+    ></button>
+  </ng-template>
+</ng-container>
diff --git a/web/projects/ui/src/app/components/form/form-array/form-array.component.scss b/web/projects/ui/src/app/components/form/form-array/form-array.component.scss
new file mode 100644
index 000000000..9b6415ff7
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-array/form-array.component.scss
@@ -0,0 +1,50 @@
+@import '@taiga-ui/core/styles/taiga-ui-local';
+
+:host {
+  display: block;
+  margin: 2rem 0;
+}
+
+.label {
+  display: flex;
+  font-size: 1.25rem;
+  font-weight: bold;
+}
+
+.add {
+  font-size: 1rem;
+  padding: 0 1rem;
+  margin-left: auto;
+}
+
+.object {
+  display: block;
+  position: relative;
+
+  &_open::after,
+  &:last-child::after {
+    opacity: 0;
+  }
+
+  &:after {
+    @include transition(opacity);
+
+    content: '';
+    position: absolute;
+    bottom: -0.5rem;
+    height: 1px;
+    left: 3rem;
+    right: 1rem;
+    background: var(--tui-clear);
+  }
+}
+
+.remove {
+  margin-left: auto;
+  pointer-events: auto;
+}
+
+.control {
+  display: block;
+  margin: 0.5rem 0;
+}
diff --git a/web/projects/ui/src/app/components/form/form-array/form-array.component.ts b/web/projects/ui/src/app/components/form/form-array/form-array.component.ts
new file mode 100644
index 000000000..11495d510
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-array/form-array.component.ts
@@ -0,0 +1,91 @@
+import { Component, HostBinding, inject, Input } from '@angular/core'
+import { AbstractControl, FormArrayName } from '@angular/forms'
+import { TUI_PARENT_ANIMATION, TuiDestroyService } from '@taiga-ui/cdk'
+import {
+  TUI_ANIMATION_OPTIONS,
+  TuiDialogService,
+  tuiFadeIn,
+  tuiHeightCollapse,
+} from '@taiga-ui/core'
+import { TUI_PROMPT } from '@taiga-ui/kit'
+import { CT } from '@start9labs/start-sdk'
+import { filter, takeUntil } from 'rxjs'
+import { FormService } from 'src/app/services/form.service'
+import { ERRORS } from '../form-group/form-group.component'
+
+@Component({
+  selector: 'form-array',
+  templateUrl: './form-array.component.html',
+  styleUrls: ['./form-array.component.scss'],
+  animations: [tuiFadeIn, tuiHeightCollapse, TUI_PARENT_ANIMATION],
+  providers: [TuiDestroyService],
+})
+export class FormArrayComponent {
+  @Input()
+  spec!: CT.ValueSpecList
+
+  @HostBinding('@tuiParentAnimation')
+  readonly animation = { value: '', ...inject(TUI_ANIMATION_OPTIONS) }
+  readonly order = ERRORS
+  readonly array = inject(FormArrayName)
+  readonly open = new Map<AbstractControl, boolean>()
+
+  private warned = false
+  private readonly formService = inject(FormService)
+  private readonly dialogs = inject(TuiDialogService)
+  private readonly destroy$ = inject(TuiDestroyService)
+
+  get canAdd(): boolean {
+    return (
+      !this.spec.disabled &&
+      (!this.spec.maxLength ||
+        this.spec.maxLength >= this.array.control.controls.length)
+    )
+  }
+
+  add() {
+    if (!this.warned && this.spec.warning) {
+      this.dialogs
+        .open<boolean>(TUI_PROMPT, {
+          label: 'Warning',
+          size: 's',
+          data: { content: this.spec.warning, yes: 'Ok', no: 'Cancel' },
+        })
+        .pipe(filter(Boolean), takeUntil(this.destroy$))
+        .subscribe(() => {
+          this.addItem()
+        })
+    } else {
+      this.addItem()
+    }
+
+    this.warned = true
+  }
+
+  removeAt(index: number) {
+    this.dialogs
+      .open<boolean>(TUI_PROMPT, {
+        label: 'Confirm',
+        size: 's',
+        data: {
+          content: 'Are you sure you want to delete this entry?',
+          yes: 'Delete',
+          no: 'Cancel',
+        },
+      })
+      .pipe(filter(Boolean), takeUntil(this.destroy$))
+      .subscribe(() => {
+        this.removeItem(index)
+      })
+  }
+
+  private removeItem(index: number) {
+    this.open.delete(this.array.control.at(index))
+    this.array.control.removeAt(index)
+  }
+
+  private addItem() {
+    this.array.control.insert(0, this.formService.getListItem(this.spec))
+    this.open.set(this.array.control.at(0), true)
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-color/form-color.component.html b/web/projects/ui/src/app/components/form/form-color/form-color.component.html
new file mode 100644
index 000000000..19cf4051d
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-color/form-color.component.html
@@ -0,0 +1,31 @@
+<tui-input
+  [maskito]="mask"
+  [tuiTextfieldCustomContent]="color"
+  [tuiTextfieldCleaner]="false"
+  [tuiHintContent]="spec | hint"
+  [readOnly]="readOnly"
+  [disabled]="!!spec.disabled"
+  [pseudoInvalid]="invalid"
+  [(ngModel)]="value"
+  (focusedChange)="onFocus($event)"
+>
+  {{ spec.name }}
+  <span *ngIf="spec.required">*</span>
+</tui-input>
+<ng-template #color>
+  <div class="wrapper" [style.color]="value">
+    <input
+      *ngIf="!readOnly && !spec.disabled"
+      type="color"
+      class="color"
+      tabindex="-1"
+      [(ngModel)]="value"
+      (click.stop)="(0)"
+    />
+    <tui-icon
+      icon="tuiIconPaintLarge"
+      tuiAppearance="icon"
+      class="icon"
+    ></tui-icon>
+  </div>
+</ng-template>
diff --git a/web/projects/ui/src/app/components/form/form-color/form-color.component.scss b/web/projects/ui/src/app/components/form/form-color/form-color.component.scss
new file mode 100644
index 000000000..49496946e
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-color/form-color.component.scss
@@ -0,0 +1,33 @@
+@import '@taiga-ui/core/styles/taiga-ui-local';
+
+.wrapper {
+  position: relative;
+  width: 1.5rem;
+  height: 1.5rem;
+  pointer-events: auto;
+
+  &::after {
+    content: '';
+    position: absolute;
+    height: 0.3rem;
+    width: 1.4rem;
+    bottom: 0.125rem;
+    background: currentColor;
+    border-radius: 0.125rem;
+    pointer-events: none;
+  }
+}
+
+.color {
+  @include fullsize();
+  opacity: 0;
+}
+
+.icon {
+  @include fullsize();
+  pointer-events: none;
+
+  input:hover + & {
+    opacity: 1;
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-color/form-color.component.ts b/web/projects/ui/src/app/components/form/form-color/form-color.component.ts
new file mode 100644
index 000000000..32a7c1c04
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-color/form-color.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core'
+import { CT } from '@start9labs/start-sdk'
+import { Control } from '../control'
+import { MaskitoOptions } from '@maskito/core'
+
+@Component({
+  selector: 'form-color',
+  templateUrl: './form-color.component.html',
+  styleUrls: ['./form-color.component.scss'],
+})
+export class FormColorComponent extends Control<CT.ValueSpecColor, string> {
+  readonly mask: MaskitoOptions = {
+    mask: ['#', ...Array(6).fill(/[0-9a-f]/i)],
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.component.html b/web/projects/ui/src/app/components/form/form-control/form-control.component.html
new file mode 100644
index 000000000..614aae05c
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.component.html
@@ -0,0 +1,40 @@
+<ng-container [ngSwitch]="spec.type">
+  <form-color *ngSwitchCase="'color'"></form-color>
+  <form-datetime *ngSwitchCase="'datetime'"></form-datetime>
+  <form-file *ngSwitchCase="'file'"></form-file>
+  <form-multiselect *ngSwitchCase="'multiselect'"></form-multiselect>
+  <form-number *ngSwitchCase="'number'"></form-number>
+  <form-select *ngSwitchCase="'select'"></form-select>
+  <form-text *ngSwitchCase="'text'"></form-text>
+  <form-textarea *ngSwitchCase="'textarea'"></form-textarea>
+  <form-toggle *ngSwitchCase="'toggle'"></form-toggle>
+</ng-container>
+<tui-error [error]="order | tuiFieldError | async"></tui-error>
+<ng-template
+  *ngIf="spec.warning || immutable"
+  #warning
+  let-completeWith="completeWith"
+>
+  {{ spec.warning }}
+  <p *ngIf="immutable">This value cannot be changed once set!</p>
+  <div class="buttons">
+    <button
+      tuiButton
+      type="button"
+      appearance="secondary"
+      size="s"
+      (click)="completeWith(true)"
+    >
+      Rollback
+    </button>
+    <button
+      tuiButton
+      type="button"
+      appearance="flat"
+      size="s"
+      (click)="completeWith(false)"
+    >
+      Accept
+    </button>
+  </div>
+</ng-template>
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.component.scss b/web/projects/ui/src/app/components/form/form-control/form-control.component.scss
new file mode 100644
index 000000000..844651118
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.component.scss
@@ -0,0 +1,11 @@
+:host {
+  display: block;
+}
+
+.buttons {
+  margin-top: 0.5rem;
+
+  :first-child {
+    margin-right: 0.5rem;
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.component.ts b/web/projects/ui/src/app/components/form/form-control/form-control.component.ts
new file mode 100644
index 000000000..ec49bd084
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.component.ts
@@ -0,0 +1,71 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  inject,
+  Input,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core'
+import { AbstractTuiNullableControl } from '@taiga-ui/cdk'
+import {
+  TuiAlertService,
+  TuiDialogContext,
+  TuiNotification,
+} from '@taiga-ui/core'
+import { filter, takeUntil } from 'rxjs'
+import { CT } from '@start9labs/start-sdk'
+import { ERRORS } from '../form-group/form-group.component'
+import { FORM_CONTROL_PROVIDERS } from './form-control.providers'
+
+@Component({
+  selector: 'form-control',
+  templateUrl: './form-control.component.html',
+  styleUrls: ['./form-control.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: FORM_CONTROL_PROVIDERS,
+})
+export class FormControlComponent<
+  T extends CT.ValueSpec,
+  V,
+> extends AbstractTuiNullableControl<V> {
+  @Input()
+  spec!: T
+
+  @ViewChild('warning')
+  warning?: TemplateRef<TuiDialogContext<boolean>>
+
+  warned = false
+  focused = false
+  readonly order = ERRORS
+  private readonly alerts = inject(TuiAlertService)
+
+  get immutable(): boolean {
+    return 'immutable' in this.spec && this.spec.immutable
+  }
+
+  onFocus(focused: boolean) {
+    this.focused = focused
+    this.updateFocused(focused)
+  }
+
+  onInput(value: V | null) {
+    const previous = this.value
+
+    if (!this.warned && this.warning) {
+      this.alerts
+        .open<boolean>(this.warning, {
+          label: 'Warning',
+          status: TuiNotification.Warning,
+          hasCloseButton: false,
+          autoClose: false,
+        })
+        .pipe(filter(Boolean), takeUntil(this.destroy$))
+        .subscribe(() => {
+          this.value = previous
+        })
+    }
+
+    this.warned = true
+    this.value = value === '' ? null : value
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts b/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
new file mode 100644
index 000000000..f065f86cb
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
@@ -0,0 +1,25 @@
+import { forwardRef, Provider } from '@angular/core'
+import { TUI_VALIDATION_ERRORS } from '@taiga-ui/kit'
+import { CT } from '@start9labs/start-sdk'
+import { FormControlComponent } from './form-control.component'
+
+interface ValidatorsPatternError {
+  actualValue: string
+  requiredPattern: string | RegExp
+}
+
+export const FORM_CONTROL_PROVIDERS: Provider[] = [
+  {
+    provide: TUI_VALIDATION_ERRORS,
+    deps: [forwardRef(() => FormControlComponent)],
+    useFactory: (control: FormControlComponent<CT.ValueSpec, string>) => ({
+      required: 'Required',
+      pattern: ({ requiredPattern }: ValidatorsPatternError) =>
+        ('patterns' in control.spec &&
+          control.spec.patterns.find(
+            ({ regex }) => String(regex) === String(requiredPattern),
+          )?.description) ||
+        'Invalid format',
+    }),
+  },
+]
diff --git a/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html b/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html
new file mode 100644
index 000000000..05ffa69f3
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html
@@ -0,0 +1,43 @@
+<ng-container [ngSwitch]="spec.inputmode" [tuiHintContent]="spec.description">
+  <tui-input-time
+    *ngSwitchCase="'time'"
+    [tuiHintContent]="spec | hint"
+    [disabled]="!!spec.disabled"
+    [readOnly]="readOnly"
+    [pseudoInvalid]="invalid"
+    [ngModel]="getTime(value)"
+    (ngModelChange)="value = $event?.toString() || null"
+    (focusedChange)="onFocus($event)"
+  >
+    {{ spec.name }}
+    <span *ngIf="spec.required">*</span>
+  </tui-input-time>
+  <tui-input-date
+    *ngSwitchCase="'date'"
+    [tuiHintContent]="spec | hint"
+    [disabled]="!!spec.disabled"
+    [readOnly]="readOnly"
+    [pseudoInvalid]="invalid"
+    [min]="spec.min ? (spec.min | tuiMapper: getLimit)[0] : min"
+    [max]="spec.max ? (spec.max | tuiMapper: getLimit)[0] : max"
+    [(ngModel)]="value"
+    (focusedChange)="onFocus($event)"
+  >
+    {{ spec.name }}
+    <span *ngIf="spec.required">*</span>
+  </tui-input-date>
+  <tui-input-date-time
+    *ngSwitchCase="'datetime-local'"
+    [tuiHintContent]="spec | hint"
+    [disabled]="!!spec.disabled"
+    [readOnly]="readOnly"
+    [pseudoInvalid]="invalid"
+    [min]="spec.min ? (spec.min | tuiMapper: getLimit) : min"
+    [max]="spec.max ? (spec.max | tuiMapper: getLimit) : max"
+    [(ngModel)]="value"
+    (focusedChange)="onFocus($event)"
+  >
+    {{ spec.name }}
+    <span *ngIf="spec.required">*</span>
+  </tui-input-date-time>
+</ng-container>
diff --git a/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts b/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts
new file mode 100644
index 000000000..e09b22d24
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts
@@ -0,0 +1,36 @@
+import { Component } from '@angular/core'
+import {
+  TUI_FIRST_DAY,
+  TUI_LAST_DAY,
+  TuiDay,
+  tuiPure,
+  TuiTime,
+} from '@taiga-ui/cdk'
+import { CT } from '@start9labs/start-sdk'
+import { Control } from '../control'
+
+@Component({
+  selector: 'form-datetime',
+  templateUrl: './form-datetime.component.html',
+})
+export class FormDatetimeComponent extends Control<
+  CT.ValueSpecDatetime,
+  string
+> {
+  readonly min = TUI_FIRST_DAY
+  readonly max = TUI_LAST_DAY
+
+  @tuiPure
+  getTime(value: string | null) {
+    return value ? TuiTime.fromString(value) : null
+  }
+
+  getLimit(limit: string): [TuiDay, TuiTime] {
+    return [
+      TuiDay.jsonParse(limit.slice(0, 10)),
+      limit.length === 10
+        ? new TuiTime(0, 0)
+        : TuiTime.fromString(limit.slice(-5)),
+    ]
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-file/form-file.component.html b/web/projects/ui/src/app/components/form/form-file/form-file.component.html
new file mode 100644
index 000000000..9e9c16613
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-file/form-file.component.html
@@ -0,0 +1,31 @@
+<tui-input-files
+  [pseudoInvalid]="invalid"
+  [(ngModel)]="value"
+  (focusedChange)="onFocus($event)"
+>
+  <input tuiInputFiles [accept]="spec.extensions.join(',')" />
+  <ng-template let-drop>
+    <div class="template" [class.template_hidden]="drop">
+      <div class="label">
+        {{ spec.name }}
+        <span *ngIf="spec.required">*</span>
+        <tui-tooltip
+          *ngIf="spec.description"
+          [content]="spec.description"
+        ></tui-tooltip>
+      </div>
+      <tui-tag
+        *ngIf="value; else label"
+        class="file"
+        size="l"
+        [value]="value.name"
+        [removable]="true"
+        (edited)="value = null"
+      ></tui-tag>
+      <ng-template #label>
+        <small>Click or drop file here</small>
+      </ng-template>
+    </div>
+    <div class="drop" [class.drop_hidden]="!drop">Drop file here</div>
+  </ng-template>
+</tui-input-files>
diff --git a/web/projects/ui/src/app/components/form/form-file/form-file.component.scss b/web/projects/ui/src/app/components/form/form-file/form-file.component.scss
new file mode 100644
index 000000000..2e314972d
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-file/form-file.component.scss
@@ -0,0 +1,46 @@
+@import '@taiga-ui/core/styles/taiga-ui-local';
+
+.template {
+  @include transition(opacity);
+
+  width: 100%;
+  display: flex;
+  align-items: center;
+  padding: 0 0.5rem;
+  font: var(--tui-font-text-m);
+  font-weight: bold;
+
+  &_hidden {
+    opacity: 0;
+  }
+}
+
+.drop {
+  @include fullsize();
+  @include transition(opacity);
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+
+  &_hidden {
+    opacity: 0;
+  }
+}
+
+.label {
+  display: flex;
+  align-items: center;
+  max-width: 50%;
+}
+
+small {
+  max-width: 50%;
+  font-weight: normal;
+  color: var(--tui-text-02);
+  margin-left: auto;
+}
+
+tui-tag {
+  z-index: 1;
+  margin: -0.25rem -0.25rem -0.25rem auto;
+}
diff --git a/web/projects/ui/src/app/components/form/form-file/form-file.component.ts b/web/projects/ui/src/app/components/form/form-file/form-file.component.ts
new file mode 100644
index 000000000..52d340fa6
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-file/form-file.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core'
+import { TuiFileLike } from '@taiga-ui/kit'
+import { CT } from '@start9labs/start-sdk'
+import { Control } from '../control'
+
+@Component({
+  selector: 'form-file',
+  templateUrl: './form-file.component.html',
+  styleUrls: ['./form-file.component.scss'],
+})
+export class FormFileComponent extends Control<CT.ValueSpecFile, TuiFileLike> {}
diff --git a/web/projects/ui/src/app/components/form/form-group/form-group.component.html b/web/projects/ui/src/app/components/form/form-group/form-group.component.html
new file mode 100644
index 000000000..d3c769b98
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-group/form-group.component.html
@@ -0,0 +1,30 @@
+<ng-container
+  *ngFor="let entry of spec | keyvalue: asIsOrder"
+  tuiMode="onDark"
+  [ngSwitch]="entry.value.type"
+  [tuiTextfieldCleaner]="true"
+>
+  <form-object
+    *ngSwitchCase="'object'"
+    class="g-form-control"
+    [formGroupName]="entry.key"
+    [spec]="$any(entry.value)"
+  ></form-object>
+  <form-union
+    *ngSwitchCase="'union'"
+    class="g-form-control"
+    [formGroupName]="entry.key"
+    [spec]="$any(entry.value)"
+  ></form-union>
+  <form-array
+    *ngSwitchCase="'list'"
+    [formArrayName]="entry.key"
+    [spec]="$any(entry.value)"
+  ></form-array>
+  <form-control
+    *ngSwitchDefault
+    class="g-form-control"
+    [formControlName]="entry.key"
+    [spec]="entry.value"
+  ></form-control>
+</ng-container>
diff --git a/web/projects/ui/src/app/components/form/form-group/form-group.component.scss b/web/projects/ui/src/app/components/form/form-group/form-group.component.scss
new file mode 100644
index 000000000..ce5665fc0
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-group/form-group.component.scss
@@ -0,0 +1,35 @@
+form-group .g-form-control:not(:first-child) {
+  margin-top: 1rem;
+}
+
+form-group .g-form-group {
+  position: relative;
+  padding-left: var(--tui-height-m);
+
+  &::before,
+  &::after {
+    content: '';
+    position: absolute;
+    background: var(--tui-clear);
+  }
+
+  &::before {
+    top: 0;
+    left: calc(1rem - 1px);
+    bottom: 0.5rem;
+    width: 2px;
+  }
+
+  &::after {
+    left: 0.75rem;
+    bottom: 0;
+    width: 0.5rem;
+    height: 0.5rem;
+    border-radius: 100%;
+  }
+}
+
+form-group tui-tooltip {
+  z-index: 1;
+  margin-left: 0.25rem;
+}
diff --git a/web/projects/ui/src/app/components/form/form-group/form-group.component.ts b/web/projects/ui/src/app/components/form/form-group/form-group.component.ts
new file mode 100644
index 000000000..d9d28c8df
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-group/form-group.component.ts
@@ -0,0 +1,35 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  ViewEncapsulation,
+} from '@angular/core'
+import { CT } from '@start9labs/start-sdk'
+import { FORM_GROUP_PROVIDERS } from './form-group.providers'
+
+export const ERRORS = [
+  'required',
+  'pattern',
+  'notNumber',
+  'numberNotInteger',
+  'numberNotInRange',
+  'listNotUnique',
+  'listNotInRange',
+  'listItemIssue',
+]
+
+@Component({
+  selector: 'form-group',
+  templateUrl: './form-group.component.html',
+  styleUrls: ['./form-group.component.scss'],
+  encapsulation: ViewEncapsulation.None,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [FORM_GROUP_PROVIDERS],
+})
+export class FormGroupComponent {
+  @Input() spec: CT.InputSpec = {}
+
+  asIsOrder() {
+    return 0
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-group/form-group.providers.ts b/web/projects/ui/src/app/components/form/form-group/form-group.providers.ts
new file mode 100644
index 000000000..5c9039f40
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-group/form-group.providers.ts
@@ -0,0 +1,34 @@
+import { Provider, SkipSelf } from '@angular/core'
+import {
+  TUI_ARROW_MODE,
+  tuiInputDateOptionsProvider,
+  tuiInputTimeOptionsProvider,
+} from '@taiga-ui/kit'
+import { TUI_DEFAULT_ERROR_MESSAGE } from '@taiga-ui/core'
+import { ControlContainer } from '@angular/forms'
+import { identity, of } from 'rxjs'
+
+export const FORM_GROUP_PROVIDERS: Provider[] = [
+  {
+    provide: TUI_DEFAULT_ERROR_MESSAGE,
+    useValue: of('Unknown error'),
+  },
+  {
+    provide: ControlContainer,
+    deps: [[new SkipSelf(), ControlContainer]],
+    useFactory: identity,
+  },
+  {
+    provide: TUI_ARROW_MODE,
+    useValue: {
+      interactive: null,
+      disabled: null,
+    },
+  },
+  tuiInputDateOptionsProvider({
+    nativePicker: true,
+  }),
+  tuiInputTimeOptionsProvider({
+    nativePicker: true,
+  }),
+]
diff --git a/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.html b/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.html
new file mode 100644
index 000000000..0e2a47cc2
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.html
@@ -0,0 +1,18 @@
+<tui-multi-select
+  [tuiHintContent]="spec | hint"
+  [disabled]="disabled"
+  [readOnly]="readOnly"
+  [pseudoInvalid]="invalid"
+  [editable]="false"
+  [disabledItemHandler]="disabledItemHandler"
+  [(ngModel)]="selected"
+  (focusedChange)="onFocus($event)"
+>
+  {{ spec.name }}
+  <select
+    tuiSelect
+    multiple
+    [items]="items"
+    [disabledItemHandler]="disabledItemHandler"
+  ></select>
+</tui-multi-select>
diff --git a/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts b/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts
new file mode 100644
index 000000000..7134eb1f6
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts
@@ -0,0 +1,49 @@
+import { Component } from '@angular/core'
+import { CT } from '@start9labs/start-sdk'
+import { Control } from '../control'
+import { tuiPure } from '@taiga-ui/cdk'
+import { invert } from '@start9labs/shared'
+
+@Component({
+  selector: 'form-multiselect',
+  templateUrl: './form-multiselect.component.html',
+})
+export class FormMultiselectComponent extends Control<
+  CT.ValueSpecMultiselect,
+  readonly string[]
+> {
+  private readonly inverted = invert(this.spec.values)
+
+  private readonly isDisabled = (item: string) =>
+    Array.isArray(this.spec.disabled) &&
+    this.spec.disabled.includes(this.inverted[item])
+
+  private readonly isExceedingLimit = (item: string) =>
+    !!this.spec.maxLength &&
+    this.selected.length >= this.spec.maxLength &&
+    !this.selected.includes(item)
+
+  readonly disabledItemHandler = (item: string): boolean =>
+    this.isDisabled(item) || this.isExceedingLimit(item)
+
+  readonly items = Object.values(this.spec.values)
+
+  get disabled(): boolean {
+    return typeof this.spec.disabled === 'string'
+  }
+
+  get selected(): string[] {
+    return this.memoize(this.value)
+  }
+
+  set selected(value: string[]) {
+    this.value = Object.entries(this.spec.values)
+      .filter(([_, v]) => value.includes(v))
+      .map(([k]) => k)
+  }
+
+  @tuiPure
+  private memoize(value: null | readonly string[]): string[] {
+    return value?.map(key => this.spec.values[key]) || []
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-number/form-number.component.html b/web/projects/ui/src/app/components/form/form-number/form-number.component.html
new file mode 100644
index 000000000..c205b2bb8
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-number/form-number.component.html
@@ -0,0 +1,18 @@
+<tui-input-number
+  [tuiHintContent]="spec | hint"
+  [disabled]="!!spec.disabled"
+  [readOnly]="readOnly"
+  [tuiTextfieldPostfix]="spec.units || ''"
+  [pseudoInvalid]="invalid"
+  [precision]="Infinity"
+  [decimal]="spec.integer ? 'never' : 'not-zero'"
+  [min]="spec.min ?? -Infinity"
+  [max]="spec.max ?? Infinity"
+  [step]="spec.step || 0"
+  [(ngModel)]="value"
+  (focusedChange)="onFocus($event)"
+>
+  {{ spec.name }}
+  <span *ngIf="spec.required">*</span>
+  <input tuiTextfield [placeholder]="spec.placeholder || ''" />
+</tui-input-number>
diff --git a/web/projects/ui/src/app/components/form/form-number/form-number.component.ts b/web/projects/ui/src/app/components/form/form-number/form-number.component.ts
new file mode 100644
index 000000000..a930b1614
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-number/form-number.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core'
+import { CT } from '@start9labs/start-sdk'
+import { Control } from '../control'
+
+@Component({
+  selector: 'form-number',
+  templateUrl: './form-number.component.html',
+})
+export class FormNumberComponent extends Control<CT.ValueSpecNumber, number> {
+  protected readonly Infinity = Infinity
+}
diff --git a/web/projects/ui/src/app/components/form/form-object/form-object.component.html b/web/projects/ui/src/app/components/form/form-object/form-object.component.html
new file mode 100644
index 000000000..589019c15
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-object/form-object.component.html
@@ -0,0 +1,25 @@
+<h3 class="title" (click)="toggle()">
+  <button
+    tuiIconButton
+    size="s"
+    iconLeft="tuiIconChevronDown"
+    type="button"
+    class="button"
+    [class.button_open]="open"
+    [style.border-radius.%]="100"
+    [appearance]="invalid ? 'destructive' : 'secondary'"
+  ></button>
+  <ng-content></ng-content>
+  {{ spec.name }}
+  <tui-tooltip
+    *ngIf="spec.description"
+    [content]="spec.description"
+    (click.stop)="(0)"
+  ></tui-tooltip>
+</h3>
+
+<tui-expand class="expand" [expanded]="open">
+  <div class="g-form-group" [class.g-form-group_invalid]="invalid">
+    <form-group [spec]="spec.spec"></form-group>
+  </div>
+</tui-expand>
diff --git a/web/projects/ui/src/app/components/form/form-object/form-object.component.scss b/web/projects/ui/src/app/components/form/form-object/form-object.component.scss
new file mode 100644
index 000000000..c167c89fa
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-object/form-object.component.scss
@@ -0,0 +1,41 @@
+@import '@taiga-ui/core/styles/taiga-ui-local';
+
+:host {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.title {
+  position: relative;
+  height: var(--tui-height-l);
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font: var(--tui-font-text-l);
+  font-weight: bold;
+  margin: 0 0 -0.75rem;
+}
+
+.button {
+  @include transition(transform);
+
+  margin-right: 1rem;
+
+  &_open {
+    transform: rotate(180deg);
+  }
+}
+
+.expand {
+  align-self: stretch;
+}
+
+.g-form-group {
+  padding-top: 0.75rem;
+
+  &_invalid::before,
+  &_invalid::after {
+    background: var(--tui-error-bg);
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-object/form-object.component.ts b/web/projects/ui/src/app/components/form/form-object/form-object.component.ts
new file mode 100644
index 000000000..b1aa507cf
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-object/form-object.component.ts
@@ -0,0 +1,38 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  inject,
+  Input,
+  Output,
+} from '@angular/core'
+import { ControlContainer } from '@angular/forms'
+import { CT } from '@start9labs/start-sdk'
+
+@Component({
+  selector: 'form-object',
+  templateUrl: './form-object.component.html',
+  styleUrls: ['./form-object.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FormObjectComponent {
+  @Input()
+  spec!: CT.ValueSpecObject
+
+  @Input()
+  open = false
+
+  @Output()
+  readonly openChange = new EventEmitter<boolean>()
+
+  private readonly container = inject(ControlContainer)
+
+  get invalid() {
+    return !this.container.valid && this.container.touched
+  }
+
+  toggle() {
+    this.open = !this.open
+    this.openChange.emit(this.open)
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-select/form-select.component.html b/web/projects/ui/src/app/components/form/form-select/form-select.component.html
new file mode 100644
index 000000000..c10e62018
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-select/form-select.component.html
@@ -0,0 +1,17 @@
+<tui-select
+  [tuiHintContent]="spec | hint"
+  [disabled]="disabled"
+  [readOnly]="readOnly"
+  [tuiTextfieldCleaner]="!spec.required"
+  [pseudoInvalid]="invalid"
+  [(ngModel)]="selected"
+  (focusedChange)="onFocus($event)"
+>
+  {{ spec.name }}
+  <span *ngIf="spec.required">*</span>
+  <select
+    tuiSelect
+    [items]="items"
+    [disabledItemHandler]="disabledItemHandler"
+  ></select>
+</tui-select>
diff --git a/web/projects/ui/src/app/components/form/form-select/form-select.component.ts b/web/projects/ui/src/app/components/form/form-select/form-select.component.ts
new file mode 100644
index 000000000..ccbbccae8
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-select/form-select.component.ts
@@ -0,0 +1,30 @@
+import { Component } from '@angular/core'
+import { CT } from '@start9labs/start-sdk'
+import { invert } from '@start9labs/shared'
+import { Control } from '../control'
+
+@Component({
+  selector: 'form-select',
+  templateUrl: './form-select.component.html',
+})
+export class FormSelectComponent extends Control<CT.ValueSpecSelect, string> {
+  private readonly inverted = invert(this.spec.values)
+
+  readonly items = Object.values(this.spec.values)
+
+  readonly disabledItemHandler = (item: string) =>
+    Array.isArray(this.spec.disabled) &&
+    this.spec.disabled.includes(this.inverted[item])
+
+  get disabled(): boolean {
+    return typeof this.spec.disabled === 'string'
+  }
+
+  get selected(): string | null {
+    return (this.value && this.spec.values[this.value]) || null
+  }
+
+  set selected(value: string | null) {
+    this.value = (value && this.inverted[value]) || null
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-text/form-text.component.html b/web/projects/ui/src/app/components/form/form-text/form-text.component.html
new file mode 100644
index 000000000..0db900238
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-text/form-text.component.html
@@ -0,0 +1,44 @@
+<tui-input
+  [tuiTextfieldCustomContent]="spec.masked || spec.generate ? toggle : ''"
+  [tuiHintContent]="spec | hint"
+  [disabled]="!!spec.disabled"
+  [readOnly]="readOnly"
+  [pseudoInvalid]="invalid"
+  [(ngModel)]="value"
+  (focusedChange)="onFocus($event)"
+>
+  {{ spec.name }}
+  <span *ngIf="spec.required">*</span>
+  <input
+    tuiTextfield
+    [class.masked]="spec.masked && masked"
+    [placeholder]="spec.placeholder || ''"
+    [attr.minLength]="spec.minLength"
+    [attr.maxLength]="spec.maxLength"
+    [attr.inputmode]="spec.inputmode"
+  />
+</tui-input>
+<ng-template #toggle>
+  <button
+    *ngIf="spec.generate"
+    tuiIconButton
+    type="button"
+    appearance="icon"
+    title="Generate"
+    size="xs"
+    class="button"
+    iconLeft="tuiIconRefreshCcw"
+    (click)="generate()"
+  ></button>
+  <button
+    *ngIf="spec.masked"
+    tuiIconButton
+    type="button"
+    appearance="icon"
+    title="Toggle masking"
+    size="xs"
+    class="button"
+    [iconLeft]="masked ? 'tuiIconEye' : 'tuiIconEyeOff'"
+    (click)="masked = !masked"
+  ></button>
+</ng-template>
diff --git a/web/projects/ui/src/app/components/form/form-text/form-text.component.scss b/web/projects/ui/src/app/components/form/form-text/form-text.component.scss
new file mode 100644
index 000000000..05e47885b
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-text/form-text.component.scss
@@ -0,0 +1,8 @@
+.button {
+  pointer-events: auto;
+  margin-left: 0.25rem;
+}
+
+.masked {
+  -webkit-text-security: disc;
+}
diff --git a/web/projects/ui/src/app/components/form/form-text/form-text.component.ts b/web/projects/ui/src/app/components/form/form-text/form-text.component.ts
new file mode 100644
index 000000000..8a5ac86f0
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-text/form-text.component.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core'
+import { CT, utils } from '@start9labs/start-sdk'
+import { Control } from '../control'
+
+@Component({
+  selector: 'form-text',
+  templateUrl: './form-text.component.html',
+  styleUrls: ['./form-text.component.scss'],
+})
+export class FormTextComponent extends Control<CT.ValueSpecText, string> {
+  masked = true
+
+  generate() {
+    this.value = utils.getDefaultString(this.spec.generate || '')
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html b/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html
new file mode 100644
index 000000000..7a2bf5149
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html
@@ -0,0 +1,15 @@
+<tui-text-area
+  [tuiHintContent]="spec | hint"
+  [disabled]="!!spec.disabled"
+  [readOnly]="readOnly"
+  [pseudoInvalid]="invalid"
+  [expandable]="true"
+  [rows]="6"
+  [maxLength]="spec.maxLength"
+  [(ngModel)]="value"
+  (focusedChange)="onFocus($event)"
+>
+  {{ spec.name }}
+  <span *ngIf="spec.required">*</span>
+  <textarea tuiTextfield [placeholder]="spec.placeholder || ''"></textarea>
+</tui-text-area>
diff --git a/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts b/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts
new file mode 100644
index 000000000..b32685c21
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core'
+import { CT } from '@start9labs/start-sdk'
+import { Control } from '../control'
+
+@Component({
+  selector: 'form-textarea',
+  templateUrl: './form-textarea.component.html',
+})
+export class FormTextareaComponent extends Control<
+  CT.ValueSpecTextarea,
+  string
+> {}
diff --git a/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.html b/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.html
new file mode 100644
index 000000000..73d116f92
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.html
@@ -0,0 +1,11 @@
+{{ spec.name }}
+<tui-tooltip
+  *ngIf="spec.description || spec.disabled"
+  [tuiHintContent]="spec | hint"
+></tui-tooltip>
+<tui-toggle
+  size="l"
+  [disabled]="!!spec.disabled || readOnly"
+  [(ngModel)]="value"
+  (focusedChange)="onFocus($event)"
+></tui-toggle>
diff --git a/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts b/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts
new file mode 100644
index 000000000..6a3c0196f
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core'
+import { CT } from '@start9labs/start-sdk'
+import { Control } from '../control'
+
+@Component({
+  selector: 'form-toggle',
+  templateUrl: './form-toggle.component.html',
+  host: { class: 'g-toggle' },
+})
+export class FormToggleComponent extends Control<CT.ValueSpecToggle, boolean> {}
diff --git a/web/projects/ui/src/app/components/form/form-union/form-union.component.html b/web/projects/ui/src/app/components/form/form-union/form-union.component.html
new file mode 100644
index 000000000..1cb5bfe57
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-union/form-union.component.html
@@ -0,0 +1,11 @@
+<form-control
+  [spec]="selectSpec"
+  formControlName="selection"
+  (tuiValueChanges)="onUnion($event)"
+></form-control>
+<tui-elastic-container class="g-form-group" formGroupName="value">
+  <form-group
+    class="group"
+    [spec]="(union && spec.variants[union].spec) || {}"
+  ></form-group>
+</tui-elastic-container>
diff --git a/web/projects/ui/src/app/components/form/form-union/form-union.component.scss b/web/projects/ui/src/app/components/form/form-union/form-union.component.scss
new file mode 100644
index 000000000..cfb2f95e8
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-union/form-union.component.scss
@@ -0,0 +1,8 @@
+:host {
+  display: block;
+}
+
+.group {
+  display: block;
+  margin-top: 1rem;
+}
diff --git a/web/projects/ui/src/app/components/form/form-union/form-union.component.ts b/web/projects/ui/src/app/components/form/form-union/form-union.component.ts
new file mode 100644
index 000000000..2c164be48
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form-union/form-union.component.ts
@@ -0,0 +1,55 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  inject,
+  Input,
+  OnChanges,
+} from '@angular/core'
+import { ControlContainer, FormGroupName } from '@angular/forms'
+import { CT } from '@start9labs/start-sdk'
+import { FormService } from 'src/app/services/form.service'
+import { tuiPure } from '@taiga-ui/cdk'
+
+@Component({
+  selector: 'form-union',
+  templateUrl: './form-union.component.html',
+  styleUrls: ['./form-union.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [
+    {
+      provide: ControlContainer,
+      useExisting: FormGroupName,
+    },
+  ],
+})
+export class FormUnionComponent implements OnChanges {
+  @Input()
+  spec!: CT.ValueSpecUnion
+
+  selectSpec!: CT.ValueSpecSelect
+
+  private readonly form = inject(FormGroupName)
+  private readonly formService = inject(FormService)
+
+  get union(): string {
+    return this.form.value.selection
+  }
+
+  @tuiPure
+  onUnion(union: string) {
+    this.form.control.setControl(
+      'value',
+      this.formService.getFormGroup(
+        union ? this.spec.variants[union].spec : {},
+      ),
+      {
+        emitEvent: false,
+      },
+    )
+  }
+
+  ngOnChanges() {
+    this.selectSpec = this.formService.getUnionSelectSpec(this.spec, this.union)
+    if (this.union) this.onUnion(this.union)
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form.module.ts b/web/projects/ui/src/app/components/form/form.module.ts
new file mode 100644
index 000000000..fe16b229f
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/form.module.ts
@@ -0,0 +1,109 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { MaskitoModule } from '@maskito/angular'
+import { TuiMapperPipeModule, TuiValueChangesModule } from '@taiga-ui/cdk'
+import {
+  TuiErrorModule,
+  TuiExpandModule,
+  TuiHintModule,
+  TuiLinkModule,
+  TuiModeModule,
+  TuiTextfieldControllerModule,
+  TuiTooltipModule,
+} from '@taiga-ui/core'
+import {
+  TuiAppearanceModule,
+  TuiButtonModule,
+  TuiIconModule,
+} from '@taiga-ui/experimental'
+import {
+  TuiElasticContainerModule,
+  TuiFieldErrorPipeModule,
+  TuiInputDateModule,
+  TuiInputDateTimeModule,
+  TuiInputFilesModule,
+  TuiInputModule,
+  TuiInputNumberModule,
+  TuiInputTimeModule,
+  TuiMultiSelectModule,
+  TuiPromptModule,
+  TuiSelectModule,
+  TuiTagModule,
+  TuiTextAreaModule,
+  TuiToggleModule,
+} from '@taiga-ui/kit'
+
+import { FormGroupComponent } from './form-group/form-group.component'
+import { FormTextComponent } from './form-text/form-text.component'
+import { FormToggleComponent } from './form-toggle/form-toggle.component'
+import { FormTextareaComponent } from './form-textarea/form-textarea.component'
+import { FormNumberComponent } from './form-number/form-number.component'
+import { FormSelectComponent } from './form-select/form-select.component'
+import { FormFileComponent } from './form-file/form-file.component'
+import { FormMultiselectComponent } from './form-multiselect/form-multiselect.component'
+import { FormUnionComponent } from './form-union/form-union.component'
+import { FormObjectComponent } from './form-object/form-object.component'
+import { FormArrayComponent } from './form-array/form-array.component'
+import { FormControlComponent } from './form-control/form-control.component'
+import { MustachePipe } from './mustache.pipe'
+import { ControlDirective } from './control.directive'
+import { FormColorComponent } from './form-color/form-color.component'
+import { FormDatetimeComponent } from './form-datetime/form-datetime.component'
+import { HintPipe } from './hint.pipe'
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    TuiInputModule,
+    TuiInputNumberModule,
+    TuiInputFilesModule,
+    TuiTextAreaModule,
+    TuiSelectModule,
+    TuiMultiSelectModule,
+    TuiToggleModule,
+    TuiTooltipModule,
+    TuiHintModule,
+    TuiModeModule,
+    TuiTagModule,
+    TuiButtonModule,
+    TuiExpandModule,
+    TuiTextfieldControllerModule,
+    TuiLinkModule,
+    TuiPromptModule,
+    TuiErrorModule,
+    TuiFieldErrorPipeModule,
+    TuiValueChangesModule,
+    TuiElasticContainerModule,
+    MaskitoModule,
+    TuiIconModule,
+    TuiAppearanceModule,
+    TuiInputDateModule,
+    TuiInputTimeModule,
+    TuiInputDateTimeModule,
+    TuiMapperPipeModule,
+  ],
+  declarations: [
+    FormGroupComponent,
+    FormControlComponent,
+    FormColorComponent,
+    FormDatetimeComponent,
+    FormTextComponent,
+    FormToggleComponent,
+    FormTextareaComponent,
+    FormNumberComponent,
+    FormSelectComponent,
+    FormMultiselectComponent,
+    FormFileComponent,
+    FormUnionComponent,
+    FormObjectComponent,
+    FormArrayComponent,
+    MustachePipe,
+    HintPipe,
+    ControlDirective,
+  ],
+  exports: [FormGroupComponent],
+})
+export class FormModule {}
diff --git a/web/projects/ui/src/app/components/form/hint.pipe.ts b/web/projects/ui/src/app/components/form/hint.pipe.ts
new file mode 100644
index 000000000..b5a730661
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/hint.pipe.ts
@@ -0,0 +1,21 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { CT } from '@start9labs/start-sdk'
+
+@Pipe({
+  name: 'hint',
+})
+export class HintPipe implements PipeTransform {
+  transform(spec: CT.ValueSpec): string {
+    const hint = []
+
+    if (spec.description) {
+      hint.push(spec.description)
+    }
+
+    if ('disabled' in spec && typeof spec.disabled === 'string') {
+      hint.push(`Disabled: ${spec.disabled}`)
+    }
+
+    return hint.join('\n\n')
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/invalid.service.ts b/web/projects/ui/src/app/components/form/invalid.service.ts
new file mode 100644
index 000000000..9f474e853
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/invalid.service.ts
@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core'
+import { ControlDirective } from './control.directive'
+
+@Injectable()
+export class InvalidService {
+  private readonly controls: ControlDirective[] = []
+
+  scrollIntoView() {
+    this.controls.find(({ invalid }) => invalid)?.scrollIntoView()
+  }
+
+  add(control: ControlDirective) {
+    this.controls.push(control)
+  }
+
+  remove(control: ControlDirective) {
+    this.controls.splice(this.controls.indexOf(control), 1)
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/mustache.pipe.ts b/web/projects/ui/src/app/components/form/mustache.pipe.ts
new file mode 100644
index 000000000..ec04b0104
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/mustache.pipe.ts
@@ -0,0 +1,12 @@
+import { Pipe, PipeTransform } from '@angular/core'
+
+const Mustache = require('mustache')
+
+@Pipe({
+  name: 'mustache',
+})
+export class MustachePipe implements PipeTransform {
+  transform(value: any, displayAs: string): string {
+    return displayAs && Mustache.render(displayAs, value)
+  }
+}
diff --git a/web/projects/ui/src/app/components/logs/logs.component.ts b/web/projects/ui/src/app/components/logs/logs.component.ts
index 3d31313cb..25897c219 100644
--- a/web/projects/ui/src/app/components/logs/logs.component.ts
+++ b/web/projects/ui/src/app/components/logs/logs.component.ts
@@ -1,5 +1,15 @@
 import { Component, Input, ViewChild } from '@angular/core'
-import { IonContent, LoadingController } from '@ionic/angular'
+import { IonContent } from '@ionic/angular'
+import {
+  DownloadHTMLService,
+  ErrorService,
+  LoadingService,
+  Log,
+  LogsRes,
+  ServerLogsReq,
+  toLocalIsoString,
+} from '@start9labs/shared'
+import { TuiDestroyService } from '@taiga-ui/cdk'
 import {
   bufferTime,
   catchError,
@@ -11,15 +21,6 @@ import {
   takeUntil,
   tap,
 } from 'rxjs'
-import {
-  LogsRes,
-  ServerLogsReq,
-  ErrorToastService,
-  toLocalIsoString,
-  Log,
-  DownloadHTMLService,
-} from '@start9labs/shared'
-import { TuiDestroyService } from '@taiga-ui/cdk'
 import { RR } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConnectionService } from 'src/app/services/connection.service'
@@ -66,10 +67,10 @@ export class LogsComponent {
   count = 0
 
   constructor(
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly destroy$: TuiDestroyService,
     private readonly api: ApiService,
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
     private readonly downloadHtml: DownloadHTMLService,
     private readonly connection$: ConnectionService,
   ) {}
@@ -97,7 +98,7 @@ export class LogsComponent {
 
       this.processRes(res)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
       e.target.complete()
     }
@@ -119,10 +120,7 @@ export class LogsComponent {
   }
 
   async download() {
-    const loader = await this.loadingCtrl.create({
-      message: 'Processing 10,000 logs...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Processing 10,000 logs...').subscribe()
 
     try {
       const { entries } = await this.fetchLogs({
@@ -139,9 +137,9 @@ export class LogsComponent {
 
       this.downloadHtml.download(`${this.context}-logs.html`, html, styles)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
diff --git a/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.ts b/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.ts
index f039841d3..04943eb1a 100644
--- a/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.ts
+++ b/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.ts
@@ -1,9 +1,9 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'
+import { SwUpdate } from '@angular/service-worker'
+import { LoadingService } from '@start9labs/shared'
 import { merge, Observable, Subject } from 'rxjs'
 
 import { RefreshAlertService } from './refresh-alert.service'
-import { SwUpdate } from '@angular/service-worker'
-import { LoadingController } from '@ionic/angular'
 
 @Component({
   selector: 'refresh-alert',
@@ -18,7 +18,7 @@ export class RefreshAlertComponent {
   constructor(
     @Inject(RefreshAlertService) private readonly refresh$: Observable<boolean>,
     private readonly updates: SwUpdate,
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
   ) {}
 
   ngOnInit() {
@@ -26,17 +26,14 @@ export class RefreshAlertComponent {
   }
 
   async pwaReload() {
-    const loader = await this.loadingCtrl.create({
-      message: 'Reloading PWA...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Reloading PWA...').subscribe()
     try {
       // attempt to update to the latest client version available
       await this.updates.activateUpdate()
     } catch (e) {
       console.error('Error activating update from service worker: ', e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
       // always reload, as this resolves most out of sync cases
       window.location.reload()
     }
diff --git a/web/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts b/web/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts
index 72b6956ee..276260ba8 100644
--- a/web/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts
+++ b/web/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts
@@ -1,10 +1,9 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'
-import { LoadingController } from '@ionic/angular'
-import { ErrorToastService } from '@start9labs/shared'
-import { Observable, Subject, merge } from 'rxjs'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { merge, Observable, Subject } from 'rxjs'
+import { ApiService } from '../../../services/api/embassy-api.service'
 
 import { UpdateToastService } from './update-toast.service'
-import { ApiService } from '../../../services/api/embassy-api.service'
 
 @Component({
   selector: 'update-toast',
@@ -19,8 +18,8 @@ export class UpdateToastComponent {
   constructor(
     @Inject(UpdateToastService) private readonly update$: Observable<boolean>,
     private readonly embassyApi: ApiService,
-    private readonly errToast: ErrorToastService,
-    private readonly loadingCtrl: LoadingController,
+    private readonly errorService: ErrorService,
+    private readonly loader: LoadingService,
   ) {}
 
   onDismiss() {
@@ -30,18 +29,14 @@ export class UpdateToastComponent {
   async restart(): Promise<void> {
     this.onDismiss()
 
-    const loader = await this.loadingCtrl.create({
-      message: 'Restarting...',
-    })
-
-    await loader.present()
+    const loader = this.loader.open('Restarting...').subscribe()
 
     try {
       await this.embassyApi.restartServer({})
     } catch (e: any) {
-      await this.errToast.present(e)
+      await this.errorService.handleError(e)
     } finally {
-      await loader.dismiss()
+      await loader.unsubscribe()
     }
   }
 }
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.module.ts b/web/projects/ui/src/app/modals/app-config/app-config.module.ts
deleted file mode 100644
index fde422826..000000000
--- a/web/projects/ui/src/app/modals/app-config/app-config.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { IonicModule } from '@ionic/angular'
-import { AppConfigPage } from './app-config.page'
-import { TextSpinnerComponentModule } from '@start9labs/shared'
-import { FormObjectComponentModule } from 'src/app/components/form-object/form-object.component.module'
-
-@NgModule({
-  declarations: [AppConfigPage],
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    TextSpinnerComponentModule,
-    FormObjectComponentModule,
-    ReactiveFormsModule,
-  ],
-  exports: [AppConfigPage],
-})
-export class AppConfigPageModule {}
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.page.html b/web/projects/ui/src/app/modals/app-config/app-config.page.html
deleted file mode 100644
index 42eb6cf39..000000000
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>Config</ion-title>
-    <ion-buttons slot="end">
-      <ion-button (click)="dismiss()">
-        <ion-icon slot="icon-only" name="close"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="ion-padding" *ngIf="pkg.stateInfo.manifest as manifest">
-  <!-- loading -->
-  <text-spinner
-    *ngIf="loading; else notLoading"
-    [text]="loadingText"
-  ></text-spinner>
-
-  <!-- not loading -->
-  <ng-template #notLoading>
-    <ion-item *ngIf="loadingError; else noError">
-      <ion-label>
-        <ion-text color="danger">{{ loadingError }}</ion-text>
-      </ion-label>
-    </ion-item>
-
-    <ng-template #noError>
-      <ng-container *ngIf="configForm && !pkg.status.configured">
-        <ng-container *ngIf="!original; else hasOriginal">
-          <h2
-            *ngIf="!configForm.dirty"
-            class="ion-padding-bottom header-details"
-          >
-            <ion-text color="success">
-              {{ manifest.title }} has been automatically configured with
-              recommended defaults. Make whatever changes you want, then click
-              "Save".
-            </ion-text>
-          </h2>
-        </ng-container>
-        <ng-template #hasOriginal>
-          <h2 *ngIf="hasNewOptions" class="ion-padding-bottom header-details">
-            <ion-text color="success">
-              New config options! To accept the default values, click "Save".
-              You may also customize these new options below.
-            </ion-text>
-          </h2>
-        </ng-template>
-      </ng-container>
-
-      <!-- auto-config -->
-      <ion-item
-        lines="none"
-        *ngIf="dependentInfo"
-        class="rec-item"
-        style="margin-bottom: 48px"
-      >
-        <ion-label>
-          <h2 style="display: flex; align-items: center">
-            <img
-              style="width: 18px; margin: 4px"
-              [src]="pkg.icon"
-              [alt]="manifest.title"
-            />
-            <ion-text
-              style="margin: 5px; font-family: 'Montserrat'; font-size: 18px"
-            >
-              {{ manifest.title }}
-            </ion-text>
-          </h2>
-          <p>
-            <ion-text color="dark">
-              The following modifications have been made to {{ manifest.title }}
-              to satisfy {{ dependentInfo.title }}:
-              <ul>
-                <li *ngFor="let d of diff" [innerHtml]="d"></li>
-              </ul>
-              To accept these modifications, click "Save".
-            </ion-text>
-          </p>
-        </ion-label>
-      </ion-item>
-
-      <!-- no options -->
-      <ion-item *ngIf="!hasConfig">
-        <ion-label>
-          <p>
-            No config options for {{ manifest.title }} {{ manifest.version }}.
-          </p>
-        </ion-label>
-      </ion-item>
-
-      <!-- has config -->
-      <form
-        *ngIf="configForm && configSpec"
-        [formGroup]="configForm"
-        novalidate
-      >
-        <form-object
-          [objectSpec]="configSpec"
-          [formGroup]="configForm"
-          [current]="configForm.value"
-          [original]="original"
-          (hasNewOptions)="hasNewOptions = true"
-        ></form-object>
-      </form>
-    </ng-template>
-  </ng-template>
-</ion-content>
-
-<ion-footer>
-  <ion-toolbar>
-    <ng-container *ngIf="!loading && !loadingError">
-      <ion-buttons *ngIf="hasConfig" slot="start" class="ion-padding-start">
-        <ion-button fill="clear" (click)="resetDefaults()">
-          <ion-icon slot="start" name="refresh"></ion-icon>
-          Reset Defaults
-        </ion-button>
-      </ion-buttons>
-      <ion-buttons slot="end" class="ion-padding-end">
-        <ion-button
-          *ngIf="hasConfig"
-          fill="solid"
-          color="primary"
-          [disabled]="saving"
-          (click)="tryConfigure()"
-          class="enter-click btn-128"
-          [class.no-click]="saving"
-        >
-          Save
-        </ion-button>
-        <ion-button
-          *ngIf="!hasConfig"
-          fill="solid"
-          color="dark"
-          (click)="dismiss()"
-          class="enter-click btn-128"
-        >
-          Close
-        </ion-button>
-      </ion-buttons>
-    </ng-container>
-  </ion-toolbar>
-</ion-footer>
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.page.scss b/web/projects/ui/src/app/modals/app-config/app-config.page.scss
deleted file mode 100644
index e568528a8..000000000
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.notifier-item {
-  margin: 12px;
-  margin-top: 0px;
-  border-radius: 12px;
-  // kills the lines
-  --border-width: 0;
-  --inner-border-width: 0;
-}
-
-.header-details {
-  font-size: 20px;
-}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/modals/app-config/app-config.page.ts b/web/projects/ui/src/app/modals/app-config/app-config.page.ts
deleted file mode 100644
index 4bba83acb..000000000
--- a/web/projects/ui/src/app/modals/app-config/app-config.page.ts
+++ /dev/null
@@ -1,349 +0,0 @@
-import { Component, Input } from '@angular/core'
-import {
-  AlertController,
-  ModalController,
-  LoadingController,
-  IonicSafeString,
-} from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import {
-  ErrorToastService,
-  getErrorMessage,
-  isEmptyObject,
-  isObject,
-} from '@start9labs/shared'
-import { DependentInfo } from 'src/app/types/dependent-info'
-import { ConfigSpec } from 'src/app/pkg-config/config-types'
-import {
-  DataModel,
-  InstalledState,
-  PackageDataEntry,
-} from 'src/app/services/patch-db/data-model'
-import { PatchDB } from 'patch-db-client'
-import { UntypedFormGroup } from '@angular/forms'
-import {
-  convertValuesRecursive,
-  FormService,
-} from 'src/app/services/form.service'
-import { compare, Operation, getValueByPointer } from 'fast-json-patch'
-import { hasCurrentDeps } from 'src/app/util/has-deps'
-import {
-  getAllPackages,
-  getManifest,
-  getPackage,
-  isInstalled,
-} from 'src/app/util/get-package-data'
-import { Breakages } from 'src/app/services/api/api.types'
-
-@Component({
-  selector: 'app-config',
-  templateUrl: './app-config.page.html',
-  styleUrls: ['./app-config.page.scss'],
-})
-export class AppConfigPage {
-  @Input() pkgId!: string
-
-  @Input() dependentInfo?: DependentInfo
-
-  pkg!: PackageDataEntry<InstalledState>
-  loadingText = ''
-
-  configSpec?: ConfigSpec
-  configForm?: UntypedFormGroup
-
-  original?: object // only if existing config
-  diff?: string[] // only if dependent info
-
-  loading = true
-  hasNewOptions = false
-  saving = false
-  loadingError: string | IonicSafeString = ''
-
-  constructor(
-    private readonly embassyApi: ApiService,
-    private readonly errToast: ErrorToastService,
-    private readonly loadingCtrl: LoadingController,
-    private readonly alertCtrl: AlertController,
-    private readonly modalCtrl: ModalController,
-    private readonly formService: FormService,
-    private readonly patch: PatchDB<DataModel>,
-  ) {}
-
-  get hasConfig() {
-    return this.pkg.stateInfo.manifest.hasConfig
-  }
-
-  async ngOnInit() {
-    try {
-      const pkg = await getPackage(this.patch, this.pkgId)
-      if (!pkg || !isInstalled(pkg)) return
-
-      this.pkg = pkg
-
-      if (!this.hasConfig) return
-
-      let newConfig: object | undefined
-      let patch: Operation[] | undefined
-
-      if (this.dependentInfo) {
-        this.loadingText = `Setting properties to accommodate ${this.dependentInfo.title}`
-        const {
-          oldConfig: oc,
-          newConfig: nc,
-          spec: s,
-        } = await this.embassyApi.dryConfigureDependency({
-          dependencyId: this.pkgId,
-          dependentId: this.dependentInfo.id,
-        })
-        this.original = oc
-        newConfig = nc
-        this.configSpec = s
-        patch = compare(this.original, newConfig)
-      } else {
-        this.loadingText = 'Loading Config'
-        const { config: c, spec: s } = await this.embassyApi.getPackageConfig({
-          id: this.pkgId,
-        })
-        this.original = c
-        this.configSpec = s
-      }
-
-      this.configForm = this.formService.createForm(
-        this.configSpec,
-        newConfig || this.original,
-      )
-
-      if (patch) {
-        this.diff = this.getDiff(patch)
-        this.markDirty(patch)
-      }
-    } catch (e: any) {
-      this.loadingError = getErrorMessage(e)
-    } finally {
-      this.loading = false
-    }
-  }
-
-  resetDefaults() {
-    this.configForm = this.formService.createForm(this.configSpec!)
-    const patch = compare(this.original || {}, this.configForm.value)
-    this.markDirty(patch)
-  }
-
-  async dismiss() {
-    if (this.configForm?.dirty) {
-      this.presentAlertUnsaved()
-    } else {
-      this.modalCtrl.dismiss()
-    }
-  }
-
-  async tryConfigure() {
-    convertValuesRecursive(this.configSpec!, this.configForm!)
-
-    if (this.configForm!.invalid) {
-      document
-        .getElementsByClassName('validation-error')[0]
-        ?.scrollIntoView({ behavior: 'smooth' })
-      return
-    }
-
-    this.saving = true
-
-    if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patch))) {
-      this.dryConfigure()
-    } else {
-      this.configure()
-    }
-  }
-
-  private async dryConfigure() {
-    const loader = await this.loadingCtrl.create({
-      message: 'Checking dependent services...',
-    })
-    await loader.present()
-
-    try {
-      const breakages = await this.embassyApi.drySetPackageConfig({
-        id: this.pkgId,
-        config: this.configForm!.value,
-      })
-
-      if (isEmptyObject(breakages)) {
-        this.configure(loader)
-      } else {
-        await loader.dismiss()
-        const proceed = await this.presentAlertBreakages(breakages)
-        if (proceed) {
-          this.configure()
-        } else {
-          this.saving = false
-        }
-      }
-    } catch (e: any) {
-      this.errToast.present(e)
-      this.saving = false
-      loader.dismiss()
-    }
-  }
-
-  private async configure(loader?: HTMLIonLoadingElement) {
-    const message = 'Saving...'
-    if (loader) {
-      loader.message = message
-    } else {
-      loader = await this.loadingCtrl.create({ message })
-      await loader.present()
-    }
-
-    try {
-      await this.embassyApi.setPackageConfig({
-        id: this.pkgId,
-        config: this.configForm!.value,
-      })
-      this.modalCtrl.dismiss()
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      this.saving = false
-      loader.dismiss()
-    }
-  }
-
-  private async presentAlertBreakages(breakages: Breakages): Promise<boolean> {
-    let message: string =
-      'As a result of this change, the following services will no longer work properly and may crash:<ul>'
-    const localPkgs = await getAllPackages(this.patch)
-    const bullets = Object.keys(breakages).map(id => {
-      const title = getManifest(localPkgs[id]).title
-      return `<li><b>${title}</b></li>`
-    })
-    message = `${message}${bullets}</ul>`
-
-    return new Promise(async resolve => {
-      const alert = await this.alertCtrl.create({
-        header: 'Warning',
-        message,
-        buttons: [
-          {
-            text: 'Cancel',
-            role: 'cancel',
-            handler: () => {
-              resolve(false)
-            },
-          },
-          {
-            text: 'Continue',
-            handler: () => {
-              resolve(true)
-            },
-            cssClass: 'enter-click',
-          },
-        ],
-        cssClass: 'alert-warning-message',
-      })
-
-      await alert.present()
-    })
-  }
-
-  private getDiff(patch: Operation[]): string[] {
-    return patch.map(op => {
-      let message: string
-      switch (op.op) {
-        case 'add':
-          message = `Added ${this.getNewValue(op.value)}`
-          break
-        case 'remove':
-          message = `Removed ${this.getOldValue(op.path)}`
-          break
-        case 'replace':
-          message = `Changed from ${this.getOldValue(
-            op.path,
-          )} to ${this.getNewValue(op.value)}`
-          break
-        default:
-          message = `Unknown operation`
-      }
-
-      let displayPath: string
-
-      const arrPath = op.path
-        .substring(1)
-        .split('/')
-        .map(node => {
-          const num = Number(node)
-          return isNaN(num) ? node : num
-        })
-
-      if (typeof arrPath[arrPath.length - 1] === 'number') {
-        arrPath.pop()
-      }
-
-      displayPath = arrPath.join(' &rarr; ')
-
-      return `${displayPath}: ${message}`
-    })
-  }
-
-  private getOldValue(path: any): string {
-    const val = getValueByPointer(this.original, path)
-    if (['string', 'number', 'boolean'].includes(typeof val)) {
-      return val
-    } else if (isObject(val)) {
-      return 'entry'
-    } else {
-      return 'list'
-    }
-  }
-
-  private getNewValue(val: any): string {
-    if (['string', 'number', 'boolean'].includes(typeof val)) {
-      return val
-    } else if (isObject(val)) {
-      return 'new entry'
-    } else {
-      return 'new list'
-    }
-  }
-
-  private markDirty(patch: Operation[]) {
-    patch.forEach(op => {
-      const arrPath = op.path
-        .substring(1)
-        .split('/')
-        .map(node => {
-          const num = Number(node)
-          return isNaN(num) ? node : num
-        })
-
-      if (op.op !== 'remove') this.configForm!.get(arrPath)?.markAsDirty()
-
-      if (typeof arrPath[arrPath.length - 1] === 'number') {
-        const prevPath = arrPath.slice(0, arrPath.length - 1)
-        this.configForm!.get(prevPath)?.markAsDirty()
-      }
-    })
-  }
-
-  private async presentAlertUnsaved() {
-    const alert = await this.alertCtrl.create({
-      header: 'Unsaved Changes',
-      message: 'You have unsaved changes. Are you sure you want to leave?',
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: `Leave`,
-          handler: () => {
-            this.modalCtrl.dismiss()
-          },
-          cssClass: 'enter-click',
-        },
-      ],
-    })
-    await alert.present()
-  }
-}
diff --git a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
index 15bec3d4f..e1d637ecf 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
@@ -1,16 +1,12 @@
 import { Component, Input } from '@angular/core'
-import {
-  LoadingController,
-  ModalController,
-  IonicSafeString,
-} from '@ionic/angular'
-import { getErrorMessage } from '@start9labs/shared'
+import { IonicSafeString, ModalController } from '@ionic/angular'
+import { getErrorMessage, LoadingService } from '@start9labs/shared'
+import { PatchDB } from 'patch-db-client'
+import { take } from 'rxjs'
 import { BackupInfo } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { PatchDB } from 'patch-db-client'
-import { AppRecoverOption } from './to-options.pipe'
 import { DataModel } from 'src/app/services/patch-db/data-model'
-import { take } from 'rxjs'
+import { AppRecoverOption } from './to-options.pipe'
 
 @Component({
   selector: 'app-recover-select',
@@ -30,7 +26,7 @@ export class AppRecoverSelectPage {
 
   constructor(
     private readonly modalCtrl: ModalController,
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
     private readonly embassyApi: ApiService,
     private readonly patch: PatchDB<DataModel>,
   ) {}
@@ -45,10 +41,7 @@ export class AppRecoverSelectPage {
 
   async restore(options: AppRecoverOption[]): Promise<void> {
     const ids = options.filter(({ checked }) => !!checked).map(({ id }) => id)
-    const loader = await this.loadingCtrl.create({
-      message: 'Initializing...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Initializing...').subscribe()
 
     try {
       await this.embassyApi.restorePackages({
@@ -61,7 +54,7 @@ export class AppRecoverSelectPage {
     } catch (e: any) {
       this.error = getErrorMessage(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 }
diff --git a/web/projects/ui/src/app/modals/config-dep.component.ts b/web/projects/ui/src/app/modals/config-dep.component.ts
new file mode 100644
index 000000000..14becf2e8
--- /dev/null
+++ b/web/projects/ui/src/app/modals/config-dep.component.ts
@@ -0,0 +1,104 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnChanges,
+} from '@angular/core'
+import { compare, getValueByPointer, Operation } from 'fast-json-patch'
+import { isObject } from '@start9labs/shared'
+import { tuiIsNumber } from '@taiga-ui/cdk'
+import { CommonModule } from '@angular/common'
+import { TuiNotificationModule } from '@taiga-ui/core'
+
+@Component({
+  selector: 'config-dep',
+  template: `
+    <tui-notification>
+      <h3 style="margin: 0 0 0.5rem; font-size: 1.25rem;">
+        {{ package }}
+      </h3>
+      The following modifications have been made to {{ package }} to satisfy
+      {{ dep }}:
+      <ul>
+        <li *ngFor="let d of diff" [innerHTML]="d"></li>
+      </ul>
+      To accept these modifications, click "Save".
+    </tui-notification>
+  `,
+  standalone: true,
+  imports: [CommonModule, TuiNotificationModule],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ConfigDepComponent implements OnChanges {
+  @Input()
+  package = ''
+
+  @Input()
+  dep = ''
+
+  @Input()
+  original: object = {}
+
+  @Input()
+  value: object = {}
+
+  diff: string[] = []
+
+  ngOnChanges() {
+    this.diff = compare(this.original, this.value).map(
+      op => `${this.getPath(op)}: ${this.getMessage(op)}`,
+    )
+  }
+
+  private getPath(operation: Operation): string {
+    const path = operation.path
+      .substring(1)
+      .split('/')
+      .map(node => {
+        const num = Number(node)
+        return isNaN(num) ? node : num
+      })
+
+    if (tuiIsNumber(path[path.length - 1])) {
+      path.pop()
+    }
+
+    return path.join(' &rarr; ')
+  }
+
+  private getMessage(operation: Operation): string {
+    switch (operation.op) {
+      case 'add':
+        return `Added ${this.getNewValue(operation.value)}`
+      case 'remove':
+        return `Removed ${this.getOldValue(operation.path)}`
+      case 'replace':
+        return `Changed from ${this.getOldValue(
+          operation.path,
+        )} to ${this.getNewValue(operation.value)}`
+      default:
+        return `Unknown operation`
+    }
+  }
+
+  private getOldValue(path: any): string {
+    const val = getValueByPointer(this.original, path)
+    if (['string', 'number', 'boolean'].includes(typeof val)) {
+      return val
+    } else if (isObject(val)) {
+      return 'entry'
+    } else {
+      return 'list'
+    }
+  }
+
+  private getNewValue(val: any): string {
+    if (['string', 'number', 'boolean'].includes(typeof val)) {
+      return val
+    } else if (isObject(val)) {
+      return 'new entry'
+    } else {
+      return 'new list'
+    }
+  }
+}
diff --git a/web/projects/ui/src/app/modals/config.component.ts b/web/projects/ui/src/app/modals/config.component.ts
new file mode 100644
index 000000000..194302f5f
--- /dev/null
+++ b/web/projects/ui/src/app/modals/config.component.ts
@@ -0,0 +1,281 @@
+import { CommonModule } from '@angular/common'
+import { Component, Inject, ViewChild } from '@angular/core'
+import {
+  ErrorService,
+  getErrorMessage,
+  isEmptyObject,
+  LoadingService,
+} from '@start9labs/shared'
+import { CT } from '@start9labs/start-sdk'
+import { TuiButtonModule } from '@taiga-ui/experimental'
+import {
+  TuiDialogContext,
+  TuiDialogService,
+  TuiLoaderModule,
+  TuiModeModule,
+  TuiNotificationModule,
+} from '@taiga-ui/core'
+import { TUI_PROMPT, TuiPromptData } from '@taiga-ui/kit'
+import { POLYMORPHEUS_CONTEXT } from '@tinkoff/ng-polymorpheus'
+import { compare, Operation } from 'fast-json-patch'
+import { PatchDB } from 'patch-db-client'
+import { endWith, firstValueFrom, Subscription } from 'rxjs'
+import { ActionButton, FormComponent } from 'src/app/components/form.component'
+import { InvalidService } from 'src/app/components/form/invalid.service'
+import { ConfigDepComponent } from 'src/app/modals/config-dep.component'
+import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import {
+  DataModel,
+  PackageDataEntry,
+} from 'src/app/services/patch-db/data-model'
+import {
+  getAllPackages,
+  getManifest,
+  getPackage,
+} from 'src/app/util/get-package-data'
+import { hasCurrentDeps } from 'src/app/util/has-deps'
+import { Breakages } from 'src/app/services/api/api.types'
+import { DependentInfo } from 'src/app/types/dependent-info'
+
+export interface PackageConfigData {
+  readonly pkgId: string
+  readonly dependentInfo?: DependentInfo
+}
+
+@Component({
+  template: `
+    <tui-loader
+      *ngIf="loadingText"
+      size="l"
+      [textContent]="loadingText"
+    ></tui-loader>
+
+    <tui-notification
+      *ngIf="!loadingText && (loadingError || !pkg)"
+      status="error"
+    >
+      <div [innerHTML]="loadingError"></div>
+    </tui-notification>
+
+    <ng-container
+      *ngIf="
+        !loadingText && !loadingError && pkg && (pkg | toManifest) as manifest
+      "
+    >
+      <tui-notification *ngIf="success" status="success">
+        {{ manifest.title }} has been automatically configured with recommended
+        defaults. Make whatever changes you want, then click "Save".
+      </tui-notification>
+
+      <config-dep
+        *ngIf="dependentInfo && value && original"
+        [package]="manifest.title"
+        [dep]="dependentInfo.title"
+        [original]="original"
+        [value]="value"
+      ></config-dep>
+
+      <tui-notification *ngIf="!manifest.hasConfig" status="warning">
+        No config options for {{ manifest.title }} {{ manifest.version }}.
+      </tui-notification>
+
+      <app-form
+        tuiMode="onDark"
+        [spec]="spec"
+        [value]="value || {}"
+        [buttons]="buttons"
+        [patch]="patch"
+      >
+        <button
+          tuiButton
+          appearance="flat"
+          type="reset"
+          [style.margin-right]="'auto'"
+        >
+          Reset Defaults
+        </button>
+      </app-form>
+    </ng-container>
+  `,
+  styles: [
+    `
+      tui-notification {
+        font-size: 1rem;
+        margin-bottom: 1rem;
+      }
+    `,
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormComponent,
+    TuiLoaderModule,
+    TuiNotificationModule,
+    TuiButtonModule,
+    TuiModeModule,
+    ConfigDepComponent,
+    UiPipeModule,
+  ],
+  providers: [InvalidService],
+})
+export class ConfigModal {
+  @ViewChild(FormComponent)
+  private readonly form?: FormComponent<Record<string, any>>
+
+  readonly pkgId = this.context.data.pkgId
+  readonly dependentInfo = this.context.data.dependentInfo
+
+  loadingError = ''
+  loadingText = this.dependentInfo
+    ? `Setting properties to accommodate ${this.dependentInfo.title}`
+    : 'Loading Config'
+
+  pkg?: PackageDataEntry
+  spec: CT.InputSpec = {}
+  patch: Operation[] = []
+  buttons: ActionButton<any>[] = [
+    {
+      text: 'Save',
+      handler: value => this.save(value),
+    },
+  ]
+
+  original: object | null = null
+  value: object | null = null
+
+  constructor(
+    @Inject(POLYMORPHEUS_CONTEXT)
+    private readonly context: TuiDialogContext<void, PackageConfigData>,
+    private readonly dialogs: TuiDialogService,
+    private readonly errorService: ErrorService,
+    private readonly loader: LoadingService,
+    private readonly embassyApi: ApiService,
+    private readonly patchDb: PatchDB<DataModel>,
+  ) {}
+
+  get success(): boolean {
+    return (
+      !!this.form &&
+      !this.form.form.dirty &&
+      !this.original &&
+      !this.pkg?.status?.configured
+    )
+  }
+
+  async ngOnInit() {
+    try {
+      this.pkg = await getPackage(this.patchDb, this.pkgId)
+
+      if (!this.pkg) {
+        this.loadingError = 'This service does not exist'
+
+        return
+      }
+
+      if (this.dependentInfo) {
+        const depConfig = await this.embassyApi.dryConfigureDependency({
+          dependencyId: this.pkgId,
+          dependentId: this.dependentInfo.id,
+        })
+
+        this.original = depConfig.oldConfig
+        this.value = depConfig.newConfig || this.original
+        this.spec = depConfig.spec
+        this.patch = compare(this.original, this.value)
+      } else {
+        const { config, spec } = await this.embassyApi.getPackageConfig({
+          id: this.pkgId,
+        })
+
+        this.original = config
+        this.value = config
+        this.spec = spec
+      }
+    } catch (e: any) {
+      this.loadingError = String(getErrorMessage(e))
+    } finally {
+      this.loadingText = ''
+    }
+  }
+
+  private async save(config: any) {
+    const loader = new Subscription()
+
+    try {
+      await this.uploadFiles(config, loader)
+
+      if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patchDb))) {
+        await this.configureDeps(config, loader)
+      } else {
+        await this.configure(config, loader)
+      }
+    } catch (e: any) {
+      this.errorService.handleError(e)
+    } finally {
+      loader.unsubscribe()
+    }
+  }
+
+  private async uploadFiles(config: Record<string, any>, loader: Subscription) {
+    loader.unsubscribe()
+    loader.closed = false
+
+    // TODO: Could be nested files
+    const keys = Object.keys(config).filter(key => config[key] instanceof File)
+    const message = `Uploading File${keys.length > 1 ? 's' : ''}...`
+
+    if (!keys.length) return
+
+    loader.add(this.loader.open(message).subscribe())
+
+    const hashes = await Promise.all(
+      keys.map(key => this.embassyApi.uploadFile(config[key])),
+    )
+    keys.forEach((key, i) => (config[key] = hashes[i]))
+  }
+
+  private async configureDeps(
+    config: Record<string, any>,
+    loader: Subscription,
+  ) {
+    loader.unsubscribe()
+    loader.closed = false
+    loader.add(this.loader.open('Checking dependent services...').subscribe())
+
+    const breakages = await this.embassyApi.drySetPackageConfig({
+      id: this.pkgId,
+      config,
+    })
+
+    loader.unsubscribe()
+    loader.closed = false
+
+    if (isEmptyObject(breakages) || (await this.approveBreakages(breakages))) {
+      await this.configure(config, loader)
+    }
+  }
+
+  private async configure(config: Record<string, any>, loader: Subscription) {
+    loader.unsubscribe()
+    loader.closed = false
+    loader.add(this.loader.open('Saving...').subscribe())
+
+    await this.embassyApi.setPackageConfig({ id: this.pkgId, config })
+    this.context.$implicit.complete()
+  }
+
+  private async approveBreakages(breakages: Breakages): Promise<boolean> {
+    const packages = await getAllPackages(this.patchDb)
+    const message =
+      'As a result of this change, the following services will no longer work properly and may crash:<ul>'
+    const content = `${message}${Object.keys(breakages).map(
+      id => `<li><b>${getManifest(packages[id]).title}</b></li>`,
+    )}</ul>`
+    const data: TuiPromptData = { content, yes: 'Continue', no: 'Cancel' }
+
+    return firstValueFrom(
+      this.dialogs.open<boolean>(TUI_PROMPT, { data }).pipe(endWith(false)),
+    )
+  }
+}
diff --git a/web/projects/ui/src/app/modals/enum-list/enum-list.module.ts b/web/projects/ui/src/app/modals/enum-list/enum-list.module.ts
deleted file mode 100644
index a0acb46d5..000000000
--- a/web/projects/ui/src/app/modals/enum-list/enum-list.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { EnumListPage } from './enum-list.page'
-import { FormsModule } from '@angular/forms'
-
-@NgModule({
-  declarations: [EnumListPage],
-  imports: [CommonModule, IonicModule, FormsModule],
-  exports: [EnumListPage],
-})
-export class EnumListPageModule {}
diff --git a/web/projects/ui/src/app/modals/enum-list/enum-list.page.html b/web/projects/ui/src/app/modals/enum-list/enum-list.page.html
deleted file mode 100644
index 5cc74ba21..000000000
--- a/web/projects/ui/src/app/modals/enum-list/enum-list.page.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>{{ spec.name }}</ion-title>
-    <ion-buttons slot="end">
-      <ion-button (click)="dismiss()">
-        <ion-icon slot="icon-only" name="close"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ion-item-group>
-    <ion-item-divider style="padding-bottom: 6px">
-      <ion-buttons slot="end">
-        <ion-button fill="clear" (click)="toggleSelectAll()">
-          <b>{{ selectAll ? 'Select All' : 'Deselect All' }}</b>
-        </ion-button>
-      </ion-buttons>
-    </ion-item-divider>
-    <ion-item *ngFor="let option of options | keyvalue : asIsOrder">
-      <ion-label>{{ spec.spec['value-names'][option.key] }}</ion-label>
-      <ion-checkbox
-        slot="end"
-        [(ngModel)]="option.value"
-        (click)="toggleSelected(option.key)"
-      ></ion-checkbox>
-    </ion-item>
-  </ion-item-group>
-</ion-content>
-
-<ion-footer>
-  <ion-toolbar>
-    <ion-buttons slot="end" class="ion-padding-end">
-      <ion-button
-        fill="solid"
-        color="primary"
-        (click)="save()"
-        class="enter-click btn-128"
-      >
-        Done
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-footer>
diff --git a/web/projects/ui/src/app/modals/enum-list/enum-list.page.scss b/web/projects/ui/src/app/modals/enum-list/enum-list.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/modals/enum-list/enum-list.page.ts b/web/projects/ui/src/app/modals/enum-list/enum-list.page.ts
deleted file mode 100644
index e5ddc8ed3..000000000
--- a/web/projects/ui/src/app/modals/enum-list/enum-list.page.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Component, Input } from '@angular/core'
-import { ModalController } from '@ionic/angular'
-import { ValueSpecListOf } from 'src/app/pkg-config/config-types'
-
-@Component({
-  selector: 'enum-list',
-  templateUrl: './enum-list.page.html',
-  styleUrls: ['./enum-list.page.scss'],
-})
-export class EnumListPage {
-  @Input() key!: string
-  @Input() spec!: ValueSpecListOf<'enum'>
-  @Input() current: string[] = []
-
-  options: { [option: string]: boolean } = {}
-  selectAll = false
-
-  constructor(private readonly modalCtrl: ModalController) {}
-
-  ngOnInit() {
-    for (let val of this.spec.spec.values || []) {
-      this.options[val] = this.current.includes(val)
-    }
-    // if none are selected, set selectAll to true
-    this.selectAll = Object.values(this.options).some(k => !k)
-  }
-
-  dismiss() {
-    this.modalCtrl.dismiss()
-  }
-
-  save() {
-    this.modalCtrl.dismiss(
-      Object.keys(this.options).filter(key => this.options[key]),
-    )
-  }
-
-  toggleSelectAll() {
-    Object.keys(this.options).forEach(k => (this.options[k] = this.selectAll))
-    this.selectAll = !this.selectAll
-  }
-
-  toggleSelected(key: string) {
-    this.options[key] = !this.options[key]
-  }
-
-  asIsOrder() {
-    return 0
-  }
-}
diff --git a/web/projects/ui/src/app/modals/generic-form/generic-form.module.ts b/web/projects/ui/src/app/modals/generic-form/generic-form.module.ts
deleted file mode 100644
index f278f652b..000000000
--- a/web/projects/ui/src/app/modals/generic-form/generic-form.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { GenericFormPage } from './generic-form.page'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { FormObjectComponentModule } from 'src/app/components/form-object/form-object.component.module'
-
-@NgModule({
-  declarations: [GenericFormPage],
-  imports: [
-    CommonModule,
-    IonicModule,
-    FormsModule,
-    ReactiveFormsModule,
-    FormObjectComponentModule,
-  ],
-  exports: [GenericFormPage],
-})
-export class GenericFormPageModule {}
diff --git a/web/projects/ui/src/app/modals/generic-form/generic-form.page.html b/web/projects/ui/src/app/modals/generic-form/generic-form.page.html
deleted file mode 100644
index 706c8487d..000000000
--- a/web/projects/ui/src/app/modals/generic-form/generic-form.page.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>{{ title }}</ion-title>
-    <ion-buttons slot="end">
-      <ion-button (click)="dismiss()">
-        <ion-icon slot="icon-only" name="close"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="ion-padding">
-  <form
-    [formGroup]="formGroup"
-    (ngSubmit)="handleClick(submitBtn.handler)"
-    novalidate
-  >
-    <form-object [objectSpec]="spec" [formGroup]="formGroup"></form-object>
-    <button hidden type="submit"></button>
-  </form>
-</ion-content>
-
-<ion-footer>
-  <ion-toolbar class="footer">
-    <ion-buttons slot="end">
-      <ion-button
-        class="ion-padding-end"
-        *ngFor="let button of buttons"
-        (click)="handleClick(button.handler)"
-      >
-        {{ button.text }}
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-footer>
diff --git a/web/projects/ui/src/app/modals/generic-form/generic-form.page.scss b/web/projects/ui/src/app/modals/generic-form/generic-form.page.scss
deleted file mode 100644
index 0353411b3..000000000
--- a/web/projects/ui/src/app/modals/generic-form/generic-form.page.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-button:disabled,
-button[disabled]{
-  border: 1px solid #999999;
-  background-color: #cccccc;
-  color: #666666;
-}
-button {
-  color: var(--ion-color-primary);
-}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/modals/generic-form/generic-form.page.ts b/web/projects/ui/src/app/modals/generic-form/generic-form.page.ts
deleted file mode 100644
index e74c65d47..000000000
--- a/web/projects/ui/src/app/modals/generic-form/generic-form.page.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Component, Input } from '@angular/core'
-import { UntypedFormGroup } from '@angular/forms'
-import { ModalController } from '@ionic/angular'
-import {
-  convertValuesRecursive,
-  FormService,
-} from 'src/app/services/form.service'
-import { ConfigSpec } from 'src/app/pkg-config/config-types'
-
-export interface ActionButton {
-  text: string
-  handler: (value: any) => Promise<boolean>
-  isSubmit?: boolean
-}
-
-@Component({
-  selector: 'generic-form',
-  templateUrl: './generic-form.page.html',
-  styleUrls: ['./generic-form.page.scss'],
-})
-export class GenericFormPage {
-  @Input() title!: string
-  @Input() spec!: ConfigSpec
-  @Input() buttons!: ActionButton[]
-  @Input() initialValue: object = {}
-
-  submitBtn!: ActionButton
-  formGroup!: UntypedFormGroup
-
-  constructor(
-    private readonly modalCtrl: ModalController,
-    private readonly formService: FormService,
-  ) {}
-
-  ngOnInit() {
-    this.formGroup = this.formService.createForm(this.spec, this.initialValue)
-    this.submitBtn = this.buttons.find(btn => btn.isSubmit) || {
-      text: '',
-      handler: () => Promise.resolve(true),
-    }
-  }
-
-  async dismiss(): Promise<void> {
-    this.modalCtrl.dismiss()
-  }
-
-  async handleClick(handler: ActionButton['handler']): Promise<void> {
-    convertValuesRecursive(this.spec, this.formGroup)
-
-    if (this.formGroup.invalid) {
-      document
-        .getElementsByClassName('validation-error')[0]
-        ?.scrollIntoView({ behavior: 'smooth' })
-      return
-    }
-
-    const success = await handler(this.formGroup.value)
-    if (success !== false) this.modalCtrl.dismiss()
-  }
-}
diff --git a/web/projects/ui/src/app/modals/generic-input/generic-input.component.html b/web/projects/ui/src/app/modals/generic-input/generic-input.component.html
deleted file mode 100644
index 8ff7e795f..000000000
--- a/web/projects/ui/src/app/modals/generic-input/generic-input.component.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<ion-content>
-  <div
-    style="margin: 24px 24px 12px 24px; display: flex; flex-direction: column"
-  >
-    <ion-item style="padding-bottom: 8px">
-      <ion-label>
-        <h1>{{ options.title }}</h1>
-        <br />
-        <p>{{ options.message }}</p>
-        <ng-container *ngIf="options.warning">
-          <br />
-          <p>
-            <ion-text color="warning">{{ options.warning }}</ion-text>
-          </p>
-        </ng-container>
-      </ion-label>
-    </ion-item>
-
-    <form (ngSubmit)="submit()">
-      <div style="margin: 0 0 24px 16px">
-        <p class="input-label">{{ options.label }}</p>
-        <ion-item
-          lines="none"
-          [color]="(theme$ | async) === 'Light' ? 'light' : 'dark'"
-        >
-          <ion-input
-            #mainInput
-            type="text"
-            name="value"
-            [ngModel]="masked ? maskedValue : value"
-            (ngModelChange)="transformInput($event)"
-            [placeholder]="options.placeholder"
-            (ionChange)="error = ''"
-          ></ion-input>
-          <ion-button
-            slot="end"
-            *ngIf="options.useMask"
-            fill="clear"
-            color="light"
-            (click)="toggleMask()"
-          >
-            <ion-icon
-              slot="icon-only"
-              [name]="!masked ? 'eye-off-outline' : 'eye-outline'"
-              size="small"
-            ></ion-icon>
-          </ion-button>
-        </ion-item>
-        <!-- error -->
-        <p *ngIf="error">
-          <ion-text color="danger">{{ error }}</ion-text>
-        </p>
-      </div>
-
-      <div class="ion-text-right">
-        <ion-button fill="clear" (click)="cancel()">Cancel</ion-button>
-        <ion-button
-          fill="clear"
-          type="submit"
-          [disabled]="!value && !options.nullable"
-        >
-          {{ options.buttonText }}
-        </ion-button>
-      </div>
-    </form>
-  </div>
-</ion-content>
diff --git a/web/projects/ui/src/app/modals/generic-input/generic-input.component.module.ts b/web/projects/ui/src/app/modals/generic-input/generic-input.component.module.ts
deleted file mode 100644
index d2b1faab4..000000000
--- a/web/projects/ui/src/app/modals/generic-input/generic-input.component.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { GenericInputComponent } from './generic-input.component'
-import { IonicModule } from '@ionic/angular'
-import { RouterModule } from '@angular/router'
-import { SharedPipesModule } from '@start9labs/shared'
-import { FormsModule } from '@angular/forms'
-
-@NgModule({
-  declarations: [GenericInputComponent],
-  imports: [
-    CommonModule,
-    IonicModule,
-    FormsModule,
-    RouterModule.forChild([]),
-    SharedPipesModule,
-  ],
-  exports: [GenericInputComponent],
-})
-export class GenericInputComponentModule {}
diff --git a/web/projects/ui/src/app/modals/generic-input/generic-input.component.scss b/web/projects/ui/src/app/modals/generic-input/generic-input.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/modals/generic-input/generic-input.component.ts b/web/projects/ui/src/app/modals/generic-input/generic-input.component.ts
deleted file mode 100644
index 59ebb8c3d..000000000
--- a/web/projects/ui/src/app/modals/generic-input/generic-input.component.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { Component, inject, Input, ViewChild } from '@angular/core'
-import { ModalController, IonicSafeString, IonInput } from '@ionic/angular'
-import { getErrorMessage, THEME } from '@start9labs/shared'
-import { MaskPipe } from 'src/app/pipes/mask/mask.pipe'
-
-@Component({
-  selector: 'generic-input',
-  templateUrl: './generic-input.component.html',
-  styleUrls: ['./generic-input.component.scss'],
-  providers: [MaskPipe],
-})
-export class GenericInputComponent {
-  @ViewChild('mainInput') elem?: IonInput
-
-  @Input() options!: GenericInputOptions
-
-  value!: string
-  masked!: boolean
-
-  maskedValue?: string
-
-  error: string | IonicSafeString = ''
-
-  readonly theme$ = inject(THEME)
-
-  constructor(
-    private readonly modalCtrl: ModalController,
-    private readonly mask: MaskPipe,
-  ) {}
-
-  ngOnInit() {
-    const defaultOptions: Partial<GenericInputOptions> = {
-      buttonText: 'Submit',
-      placeholder: 'Enter value',
-      nullable: false,
-      useMask: false,
-      initialValue: '',
-    }
-    this.options = {
-      ...defaultOptions,
-      ...this.options,
-    }
-
-    this.masked = !!this.options.useMask
-    this.value = this.options.initialValue || ''
-  }
-
-  ngAfterViewInit() {
-    setTimeout(() => this.elem?.setFocus(), 400)
-  }
-
-  toggleMask() {
-    this.masked = !this.masked
-  }
-
-  cancel() {
-    this.modalCtrl.dismiss()
-  }
-
-  transformInput(newValue: string) {
-    let i = 0
-    this.value = newValue
-      .split('')
-      .map(x => (x === '●' ? this.value[i++] : x))
-      .join('')
-    this.maskedValue = this.mask.transform(this.value)
-  }
-
-  async submit() {
-    const value = this.value.trim()
-
-    if (!value && !this.options.nullable) return
-
-    try {
-      await this.options.submitFn(value)
-      this.modalCtrl.dismiss(undefined, 'success')
-    } catch (e: any) {
-      this.error = getErrorMessage(e)
-    }
-  }
-}
-
-export interface GenericInputOptions {
-  // required
-  title: string
-  message: string
-  label: string
-  submitFn: (value: string) => Promise<any>
-  // optional
-  warning?: string
-  buttonText?: string
-  placeholder?: string
-  nullable?: boolean
-  useMask?: boolean
-  initialValue?: string
-}
diff --git a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.module.ts b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.module.ts
deleted file mode 100644
index 096e06add..000000000
--- a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { MarketplaceSettingsPage } from './marketplace-settings.page'
-import { SharedPipesModule } from '@start9labs/shared'
-import { StoreIconComponentModule } from 'src/app/components/store-icon/store-icon.component.module'
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    SharedPipesModule,
-    StoreIconComponentModule,
-  ],
-  declarations: [MarketplaceSettingsPage],
-})
-export class MarketplaceSettingsPageModule {}
diff --git a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.html b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.html
index 663b022cd..ab3bf8b34 100644
--- a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.html
+++ b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.html
@@ -1,67 +1,30 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>Change Registry</ion-title>
-    <ion-buttons slot="end">
-      <ion-button (click)="dismiss()">
-        <ion-icon slot="icon-only" name="close"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="ion-padding-top">
-  <ion-item-group *ngIf="stores$ | async as stores">
-    <ion-item-divider>Default Registries</ion-item-divider>
-    <ion-item
-      *ngFor="let s of stores.standard"
-      detail="false"
-      [button]="!s.selected"
-      (click)="s.selected ? '' : presentAction(s)"
+<ng-container *ngIf="stores$ | async as stores">
+  <h3 class="g-title">Default Registries</h3>
+  <button
+    *ngFor="let registry of stores.standard"
+    tuiCell
+    [disabled]="registry.selected"
+    [registry]="registry"
+    (click)="connect(registry.url)"
+  ></button>
+  <h3 class="g-title">Custom Registries</h3>
+  <button tuiCell (click)="add()" [style.width]="'-webkit-fill-available'">
+    <tui-icon icon="tuiIconPlus" [style.margin-inline.rem]="'0.5'"></tui-icon>
+    <div tuiTitle>Add custom registry</div>
+  </button>
+  <div *ngFor="let registry of stores.alt" class="connect-container">
+    <button
+      tuiCell
+      [registry]="registry"
+      (click)="connect(registry.url)"
+    ></button>
+    <button
+      tuiIconButton
+      appearance="icon"
+      iconLeft="tuiIconTrash"
+      (click)="delete(registry.url, registry.name)"
     >
-      <ion-avatar slot="start">
-        <store-icon [url]="s.url"></store-icon>
-      </ion-avatar>
-      <ion-label>
-        <h2>{{ s.name }}</h2>
-        <p>{{ s.url }}</p>
-      </ion-label>
-      <ion-icon
-        *ngIf="s.selected"
-        slot="end"
-        size="large"
-        name="checkmark"
-        color="success"
-      ></ion-icon>
-    </ion-item>
-
-    <ion-item-divider>Custom Registries</ion-item-divider>
-    <ion-item button detail="false" (click)="presentModalAdd()">
-      <ion-icon slot="start" name="add" color="dark"></ion-icon>
-      <ion-label>
-        <ion-text color="dark">
-          <b>Add custom registry</b>
-        </ion-text>
-      </ion-label>
-    </ion-item>
-
-    <ion-item
-      *ngFor="let a of stores.alt"
-      detail="false"
-      [button]="!a.selected"
-      (click)="a.selected ? '' : presentAction(a, true)"
-    >
-      <store-icon slot="start" [url]="a.url" size="36px"></store-icon>
-      <ion-label>
-        <h2>{{ a.name }}</h2>
-        <p>{{ a.url }}</p>
-      </ion-label>
-      <ion-icon
-        *ngIf="a.selected"
-        slot="end"
-        size="large"
-        name="checkmark"
-        color="success"
-      ></ion-icon>
-    </ion-item>
-  </ion-item-group>
-</ion-content>
+      Delete
+    </button>
+  </div>
+</ng-container>
diff --git a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.scss b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.scss
index e69de29bb..310b9ab30 100644
--- a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.scss
+++ b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.scss
@@ -0,0 +1,5 @@
+.connect-container {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
diff --git a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
index f62331819..dd8fe73eb 100644
--- a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
+++ b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
@@ -1,276 +1,230 @@
+import { CommonModule } from '@angular/common'
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
+import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import {
-  ChangeDetectionStrategy,
-  Component,
-  Inject,
-  ViewChild,
-} from '@angular/core'
+  ErrorService,
+  LoadingService,
+  sameUrl,
+  toUrl,
+} from '@start9labs/shared'
+import { CT } from '@start9labs/start-sdk'
+import { TuiDialogOptions, TuiDialogService } from '@taiga-ui/core'
 import {
-  ActionSheetController,
-  AlertController,
-  LoadingController,
-  ModalController,
-} from '@ionic/angular'
-import { ActionSheetButton } from '@ionic/core'
-import { ErrorToastService, sameUrl, toUrl } from '@start9labs/shared'
-import { AbstractMarketplaceService } from '@start9labs/marketplace'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ValueSpecObject } from 'src/app/pkg-config/config-types'
-import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
+  TuiButtonModule,
+  TuiCellModule,
+  TuiIconModule,
+  TuiTitleModule,
+} from '@taiga-ui/experimental'
+import { TUI_PROMPT, TuiPromptData } from '@taiga-ui/kit'
+import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus'
 import { PatchDB } from 'patch-db-client'
-import { DataModel, UIStore } from 'src/app/services/patch-db/data-model'
-import { MarketplaceService } from 'src/app/services/marketplace.service'
+import { combineLatest, filter, firstValueFrom, Subscription } from 'rxjs'
 import { map } from 'rxjs/operators'
-import { combineLatest, firstValueFrom } from 'rxjs'
+import { FormComponent } from 'src/app/components/form.component'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
+import { MarketplaceService } from 'src/app/services/marketplace.service'
+import { DataModel, UIStore } from 'src/app/services/patch-db/data-model'
+
+import { MarketplaceRegistryComponent } from './registry.component'
 
 @Component({
+  standalone: true,
+  imports: [
+    CommonModule,
+    TuiCellModule,
+    TuiIconModule,
+    TuiTitleModule,
+    TuiButtonModule,
+    MarketplaceRegistryComponent,
+  ],
   selector: 'marketplace-settings',
   templateUrl: 'marketplace-settings.page.html',
   styleUrls: ['marketplace-settings.page.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MarketplaceSettingsPage {
-  stores$ = combineLatest([
-    this.marketplaceService.getKnownHosts$(),
-    this.marketplaceService.getSelectedHost$(),
+  private readonly api = inject(ApiService)
+  private readonly loader = inject(LoadingService)
+  private readonly errorService = inject(ErrorService)
+  private readonly formDialog = inject(FormDialogService)
+  private readonly dialogs = inject(TuiDialogService)
+  private readonly marketplace = inject(
+    AbstractMarketplaceService,
+  ) as MarketplaceService
+  private readonly hosts$ = inject(PatchDB<DataModel>).watch$(
+    'ui',
+    'marketplace',
+    'knownHosts',
+  )
+
+  readonly stores$ = combineLatest([
+    this.marketplace.getKnownHosts$(),
+    this.marketplace.getSelectedHost$(),
   ]).pipe(
-    map(([stores, selected]) => {
-      const toSlice = stores.map(s => ({
+    map(([stores, selected]) =>
+      stores.map(s => ({
         ...s,
         selected: sameUrl(s.url, selected.url),
-      }))
-      // 0 and 1 are prod and community
-      const standard = toSlice.slice(0, 2)
-      // 2 and beyond are alts
-      const alt = toSlice.slice(2)
-
-      return { standard, alt }
-    }),
+      })),
+    ),
+    // 0 and 1 are prod and community, 2 and beyond are alts
+    map(stores => ({ standard: stores.slice(0, 2), alt: stores.slice(2) })),
   )
 
-  constructor(
-    private readonly api: ApiService,
-    private readonly loadingCtrl: LoadingController,
-    private readonly modalCtrl: ModalController,
-    private readonly errToast: ErrorToastService,
-    private readonly actionCtrl: ActionSheetController,
-    @Inject(AbstractMarketplaceService)
-    private readonly marketplaceService: MarketplaceService,
-    private readonly patch: PatchDB<DataModel>,
-    private readonly alertCtrl: AlertController,
-  ) {}
-
-  async dismiss() {
-    this.modalCtrl.dismiss()
-  }
-
-  async presentModalAdd() {
+  async add() {
     const { name, spec } = getMarketplaceValueSpec()
-    const modal = await this.modalCtrl.create({
-      component: GenericFormPage,
-      componentProps: {
-        title: name,
+
+    this.formDialog.open(FormComponent, {
+      label: name,
+      data: {
         spec,
         buttons: [
           {
             text: 'Save for Later',
-            handler: (value: { url: string }) => {
-              this.saveOnly(value.url)
-            },
+            handler: async ({ url }: { url: string }) => this.save(url),
           },
           {
             text: 'Save and Connect',
-            handler: (value: { url: string }) => {
-              this.saveAndConnect(value.url)
-            },
+            handler: async ({ url }: { url: string }) => this.save(url, true),
             isSubmit: true,
           },
         ],
       },
-      cssClass: 'alertlike-modal',
     })
-
-    await modal.present()
   }
-
-  async presentAction(
-    { url, name }: { url: string; name?: string },
-    canDelete = false,
-  ) {
-    const buttons: ActionSheetButton[] = [
-      {
-        text: 'Connect',
-        handler: () => {
-          this.connect(url)
-        },
-      },
-    ]
-
-    if (canDelete) {
-      buttons.unshift({
-        text: 'Delete',
-        role: 'destructive',
-        handler: () => {
-          this.presentAlertDelete(url, name!)
-        },
+  delete(url: string, name: string = '') {
+    this.dialogs
+      .open(TUI_PROMPT, getPromptOptions(name))
+      .pipe(filter(Boolean))
+      .subscribe(async () => {
+        const loader = this.loader.open('Deleting...').subscribe()
+        const hosts = await firstValueFrom(this.hosts$)
+        const filtered: { [url: string]: UIStore } = Object.keys(hosts)
+          .filter(key => !sameUrl(key, url))
+          .reduce(
+            (prev, curr) => ({
+              ...prev,
+              [curr]: hosts[curr],
+            }),
+            {},
+          )
+
+        try {
+          await this.api.setDbValue(['marketplace', 'knownHosts'], filtered)
+        } catch (e: any) {
+          this.errorService.handleError(e)
+        } finally {
+          loader.unsubscribe()
+        }
       })
-    }
-
-    const action = await this.actionCtrl.create({
-      header: name,
-      mode: 'ios',
-      buttons,
-    })
-
-    await action.present()
-  }
-
-  private async presentAlertDelete(url: string, name: string) {
-    const alert = await this.alertCtrl.create({
-      header: 'Confirm',
-      message: `Are you sure you want to delete ${name}?`,
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Delete',
-          handler: () => this.delete(url),
-          cssClass: 'enter-click',
-        },
-      ],
-    })
-
-    await alert.present()
   }
 
-  private async connect(
+  async connect(
     url: string,
-    loader?: HTMLIonLoadingElement,
+    loader: Subscription = new Subscription(),
   ): Promise<void> {
-    const message = 'Changing Registry...'
-    if (!loader) {
-      loader = await this.loadingCtrl.create({ message })
-      await loader.present()
-    } else {
-      loader.message = message
-    }
+    loader.unsubscribe()
+    loader.closed = false
+    loader.add(this.loader.open('Changing Registry...').subscribe())
 
     try {
-      await this.api.setDbValue<string>(['marketplace', 'selected-url'], url)
+      await this.api.setDbValue<string>(['marketplace', 'selectedUrl'], url)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
-      this.dismiss()
+      loader.unsubscribe()
     }
   }
 
-  private async saveOnly(rawUrl: string): Promise<void> {
-    const loader = await this.loadingCtrl.create()
+  private async save(rawUrl: string, connect = false): Promise<boolean> {
+    const loader = this.loader.open('Loading').subscribe()
+    const url = new URL(rawUrl).toString()
 
     try {
-      const url = new URL(rawUrl).toString()
       await this.validateAndSave(url, loader)
+      if (connect) await this.connect(url, loader)
+      return true
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
+      return false
     } finally {
-      loader.dismiss()
-    }
-  }
-
-  private async saveAndConnect(rawUrl: string): Promise<void> {
-    const loader = await this.loadingCtrl.create()
-
-    try {
-      const url = new URL(rawUrl).toString()
-      await this.validateAndSave(url, loader)
-      await this.connect(url, loader)
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-      this.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async validateAndSave(
     url: string,
-    loader: HTMLIonLoadingElement,
+    loader: Subscription,
   ): Promise<void> {
     // Error on duplicates
-    const hosts = await firstValueFrom(
-      this.patch.watch$('ui', 'marketplace', 'knownHosts'),
-    )
+    const hosts = await firstValueFrom(this.hosts$)
     const currentUrls = Object.keys(hosts).map(toUrl)
-    if (currentUrls.includes(url)) throw new Error('marketplace already added')
+    if (currentUrls.includes(url)) throw new Error('Marketplace already added')
 
     // Validate
-    loader.message = 'Validating marketplace...'
-    await loader.present()
+    loader.unsubscribe()
+    loader.closed = false
+    loader.add(this.loader.open('Validating marketplace...').subscribe())
 
-    const { name } = await firstValueFrom(
-      this.marketplaceService.fetchInfo$(url),
-    )
+    const { name } = await firstValueFrom(this.marketplace.fetchInfo$(url))
 
     // Save
-    loader.message = 'Saving...'
+    loader.unsubscribe()
+    loader.closed = false
+    loader.add(this.loader.open('Saving...').subscribe())
 
-    await this.api.setDbValue<{ name: string }>(
-      ['marketplace', 'knownHosts', url],
-      { name },
-    )
-  }
-
-  private async delete(url: string): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Deleting...',
-    })
-    await loader.present()
-
-    const hosts = await firstValueFrom(
-      this.patch.watch$('ui', 'marketplace', 'knownHosts'),
-    )
-
-    const filtered: { [url: string]: UIStore } = Object.keys(hosts)
-      .filter(key => !sameUrl(key, url))
-      .reduce((prev, curr) => {
-        const name = hosts[curr]
-        return {
-          ...prev,
-          [curr]: name,
-        }
-      }, {})
-
-    try {
-      await this.api.setDbValue<{ [url: string]: UIStore }>(
-        ['marketplace', 'knownHosts'],
-        filtered,
-      )
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
+    await this.api.setDbValue(['marketplace', 'knownHosts', url], { name })
   }
 }
 
-function getMarketplaceValueSpec(): ValueSpecObject {
+export const MARKETPLACE_REGISTRY = new PolymorpheusComponent(
+  MarketplaceSettingsPage,
+)
+
+function getMarketplaceValueSpec(): CT.ValueSpecObject {
   return {
     type: 'object',
     name: 'Add Custom Registry',
+    description: null,
+    warning: null,
     spec: {
       url: {
-        type: 'string',
+        type: 'text',
         name: 'URL',
         description: 'A fully-qualified URL of the custom registry',
-        nullable: false,
+        inputmode: 'url',
+        required: true,
         masked: false,
-        copyable: false,
-        pattern: `https?:\/\/[a-zA-Z0-9][a-zA-Z0-9-\.]+[a-zA-Z0-9]\.[^\s]{2,}`,
-        'pattern-description': 'Must be a valid URL',
+        minLength: null,
+        maxLength: null,
+        patterns: [
+          {
+            regex: `https?:\/\/[a-zA-Z0-9][a-zA-Z0-9-\.]+[a-zA-Z0-9]\.[^\s]{2,}`,
+            description: 'Must be a valid URL',
+          },
+        ],
         placeholder: 'e.g. https://example.org',
+        default: null,
+        warning: null,
+        disabled: false,
+        immutable: false,
+        generate: null,
       },
     },
   }
 }
+
+function getPromptOptions(
+  name: string,
+): Partial<TuiDialogOptions<TuiPromptData>> {
+  return {
+    label: 'Confirm',
+    size: 's',
+    data: {
+      content: `Are you sure you want to delete ${name}?`,
+      yes: 'Delete',
+      no: 'Cancel',
+    },
+  }
+}
diff --git a/web/projects/ui/src/app/modals/marketplace-settings/registry.component.ts b/web/projects/ui/src/app/modals/marketplace-settings/registry.component.ts
new file mode 100644
index 000000000..0441ae18f
--- /dev/null
+++ b/web/projects/ui/src/app/modals/marketplace-settings/registry.component.ts
@@ -0,0 +1,42 @@
+import { NgIf } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  inject,
+  Input,
+} from '@angular/core'
+import { TuiIconModule, TuiTitleModule } from '@taiga-ui/experimental'
+import { ConfigService } from 'src/app/services/config.service'
+
+import { StoreIconComponent } from './store-icon.component'
+
+@Component({
+  standalone: true,
+  selector: '[registry]',
+  template: `
+    <store-icon
+      [url]="registry.url"
+      [marketplace]="marketplace"
+      size="40px"
+    ></store-icon>
+    <div tuiTitle>
+      {{ registry.name }}
+      <div tuiSubtitle>{{ registry.url }}</div>
+    </div>
+    <tui-icon
+      *ngIf="registry.selected; else content"
+      icon="tuiIconCheck"
+      [style.color]="'var(--tui-positive)'"
+    ></tui-icon>
+    <ng-template #content><ng-content></ng-content></ng-template>
+  `,
+  styles: [':host { border-radius: 0.25rem; width: stretch; }'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [NgIf, StoreIconComponent, TuiIconModule, TuiTitleModule],
+})
+export class MarketplaceRegistryComponent {
+  readonly marketplace = inject(ConfigService).marketplace
+
+  @Input()
+  registry!: { url: string; selected: boolean; name?: string }
+}
diff --git a/web/projects/ui/src/app/modals/marketplace-settings/store-icon.component.ts b/web/projects/ui/src/app/modals/marketplace-settings/store-icon.component.ts
new file mode 100644
index 000000000..dcdfe3b2f
--- /dev/null
+++ b/web/projects/ui/src/app/modals/marketplace-settings/store-icon.component.ts
@@ -0,0 +1,46 @@
+import { NgIf } from '@angular/common'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { sameUrl } from '@start9labs/shared'
+
+@Component({
+  standalone: true,
+  selector: 'store-icon',
+  template: `
+    <img
+      *ngIf="icon; else noIcon"
+      [style.border-radius.%]="100"
+      [style.max-width]="size || '100%'"
+      [src]="icon"
+      alt="Marketplace Icon"
+    />
+    <ng-template #noIcon>
+      <img
+        [style.max-width]="size || '100%'"
+        [style.border-radius]="0"
+        src="assets/img/storefront-outline.png"
+        alt="Marketplace Icon"
+      />
+    </ng-template>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [NgIf],
+})
+export class StoreIconComponent {
+  @Input()
+  url = ''
+  @Input()
+  size?: string
+  @Input()
+  marketplace!: any
+
+  get icon() {
+    const { start9, community } = this.marketplace
+
+    if (sameUrl(this.url, start9)) {
+      return 'assets/img/icon_transparent.png'
+    } else if (sameUrl(this.url, community)) {
+      return 'assets/img/community-store.png'
+    }
+    return null
+  }
+}
diff --git a/web/projects/ui/src/app/modals/os-update/os-update.page.ts b/web/projects/ui/src/app/modals/os-update/os-update.page.ts
index 9900bbb47..45b9cb009 100644
--- a/web/projects/ui/src/app/modals/os-update/os-update.page.ts
+++ b/web/projects/ui/src/app/modals/os-update/os-update.page.ts
@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
-import { LoadingController, ModalController } from '@ionic/angular'
-import { ApiService } from '../../services/api/embassy-api.service'
-import { ErrorToastService } from '@start9labs/shared'
+import { ModalController } from '@ionic/angular'
+import { ErrorService, LoadingService } from '@start9labs/shared'
 import { EOSService } from 'src/app/services/eos.service'
+import { ApiService } from '../../services/api/embassy-api.service'
 
 @Component({
   selector: 'os-update',
@@ -15,8 +15,8 @@ export class OSUpdatePage {
 
   constructor(
     private readonly modalCtrl: ModalController,
-    private readonly loadingCtrl: LoadingController,
-    private readonly errToast: ErrorToastService,
+    private readonly loader: LoadingService,
+    private readonly errorService: ErrorService,
     private readonly embassyApi: ApiService,
     private readonly eosService: EOSService,
   ) {}
@@ -39,18 +39,15 @@ export class OSUpdatePage {
   }
 
   async updateEOS() {
-    const loader = await this.loadingCtrl.create({
-      message: 'Beginning update...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Beginning update...').subscribe()
 
     try {
       await this.embassyApi.updateServer()
       this.dismiss()
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
diff --git a/web/projects/ui/src/app/modals/prompt.component.ts b/web/projects/ui/src/app/modals/prompt.component.ts
new file mode 100644
index 000000000..e2a2765f5
--- /dev/null
+++ b/web/projects/ui/src/app/modals/prompt.component.ts
@@ -0,0 +1,123 @@
+import { CommonModule } from '@angular/common'
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { TuiAutoFocusModule } from '@taiga-ui/cdk'
+import { TuiDialogContext, TuiTextfieldControllerModule } from '@taiga-ui/core'
+import { TuiButtonModule } from '@taiga-ui/experimental'
+import { TuiInputModule } from '@taiga-ui/kit'
+import {
+  POLYMORPHEUS_CONTEXT,
+  PolymorpheusComponent,
+} from '@tinkoff/ng-polymorpheus'
+
+@Component({
+  standalone: true,
+  template: `
+    <p>{{ options.message }}</p>
+    <p *ngIf="options.warning" class="warning">{{ options.warning }}</p>
+    <form (ngSubmit)="submit(value.trim())">
+      <tui-input
+        tuiAutoFocus
+        [tuiTextfieldLabelOutside]="!options.label"
+        [tuiTextfieldCustomContent]="options.useMask ? toggle : ''"
+        [ngModelOptions]="{ standalone: true }"
+        [(ngModel)]="value"
+      >
+        {{ options.label }}
+        <span *ngIf="options.required !== false && options.label">*</span>
+        <input
+          tuiTextfield
+          [class.masked]="options.useMask && masked && value"
+          [placeholder]="options.placeholder || ''"
+        />
+      </tui-input>
+      <footer class="g-buttons">
+        <button
+          tuiButton
+          type="button"
+          appearance="secondary"
+          (click)="cancel()"
+        >
+          Cancel
+        </button>
+        <button tuiButton [disabled]="!value && options.required !== false">
+          {{ options.buttonText || 'Submit' }}
+        </button>
+      </footer>
+    </form>
+
+    <ng-template #toggle>
+      <button
+        tuiIconButton
+        type="button"
+        appearance="icon"
+        title="Toggle masking"
+        size="xs"
+        class="button"
+        [iconLeft]="masked ? 'tuiIconEye' : 'tuiIconEyeOff'"
+        (click)="masked = !masked"
+      ></button>
+    </ng-template>
+  `,
+  styles: [
+    `
+      .warning {
+        color: var(--tui-warning-fill);
+      }
+
+      .button {
+        pointer-events: auto;
+        margin-left: 0.25rem;
+      }
+
+      .masked {
+        -webkit-text-security: disc;
+      }
+    `,
+  ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    TuiInputModule,
+    TuiButtonModule,
+    TuiTextfieldControllerModule,
+    TuiAutoFocusModule,
+  ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class PromptModal {
+  masked = this.options.useMask
+  value = this.options.initialValue || ''
+
+  constructor(
+    @Inject(POLYMORPHEUS_CONTEXT)
+    private readonly context: TuiDialogContext<string, PromptOptions>,
+  ) {}
+
+  get options(): PromptOptions {
+    return this.context.data
+  }
+
+  cancel() {
+    this.context.$implicit.complete()
+  }
+
+  submit(value: string) {
+    if (value || !this.options.required) {
+      this.context.$implicit.next(value)
+    }
+  }
+}
+
+export const PROMPT = new PolymorpheusComponent(PromptModal)
+
+export interface PromptOptions {
+  message: string
+  label?: string
+  warning?: string
+  buttonText?: string
+  placeholder?: string
+  required?: boolean
+  useMask?: boolean
+  initialValue?: string | null
+}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts
index 5f30abc0e..84e52d15f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts
@@ -5,7 +5,6 @@ import { IonicModule } from '@ionic/angular'
 import { AppActionsPage, AppActionsItemComponent } from './app-actions.page'
 import { QRComponentModule } from 'src/app/components/qr/qr.component.module'
 import { SharedPipesModule } from '@start9labs/shared'
-import { GenericFormPageModule } from 'src/app/modals/generic-form/generic-form.module'
 import { ActionSuccessPageModule } from 'src/app/modals/action-success/action-success.module'
 
 const routes: Routes = [
@@ -22,7 +21,6 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     QRComponentModule,
     SharedPipesModule,
-    GenericFormPageModule,
     ActionSuccessPageModule,
   ],
   declarations: [AppActionsPage, AppActionsItemComponent],
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index fc008a17a..dd4e4b36e 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -1,23 +1,24 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { AlertController, ModalController, NavController } from '@ionic/angular'
 import {
-  AlertController,
-  LoadingController,
-  ModalController,
-  NavController,
-} from '@ionic/angular'
+  ErrorService,
+  getPkgId,
+  isEmptyObject,
+  LoadingService,
+} from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
 import { PatchDB } from 'patch-db-client'
+import { FormComponent } from 'src/app/components/form.component'
+import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
 import {
   DataModel,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
-import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
-import { isEmptyObject, ErrorToastService, getPkgId } from '@start9labs/shared'
-import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page'
-import { hasCurrentDeps } from 'src/app/util/has-deps'
 import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
-import { T } from '@start9labs/start-sdk'
+import { hasCurrentDeps } from 'src/app/util/has-deps'
 
 @Component({
   selector: 'app-actions',
@@ -34,10 +35,11 @@ export class AppActionsPage {
     private readonly embassyApi: ApiService,
     private readonly modalCtrl: ModalController,
     private readonly alertCtrl: AlertController,
-    private readonly errToast: ErrorToastService,
-    private readonly loadingCtrl: LoadingController,
+    private readonly errorService: ErrorService,
+    private readonly loader: LoadingService,
     private readonly navCtrl: NavController,
     private readonly patch: PatchDB<DataModel>,
+    private readonly formDialog: FormDialogService,
   ) {}
 
   async handleAction(
@@ -46,23 +48,19 @@ export class AppActionsPage {
   ) {
     if (status && action.value.allowedStatuses.includes(status.main.status)) {
       if (!isEmptyObject(action.value.input || {})) {
-        const modal = await this.modalCtrl.create({
-          component: GenericFormPage,
-          componentProps: {
-            title: action.value.name,
+        this.formDialog.open(FormComponent, {
+          label: action.value.name,
+          data: {
             spec: action.value.input,
             buttons: [
               {
                 text: 'Execute',
-                handler: (value: any) => {
-                  return this.executeAction(action.key, value)
-                },
-                isSubmit: true,
+                handler: async (value: any) =>
+                  this.executeAction(action.key, value),
               },
             ],
           },
         })
-        await modal.present()
       } else {
         const alert = await this.alertCtrl.create({
           header: 'Confirm',
@@ -147,10 +145,7 @@ export class AppActionsPage {
   }
 
   private async uninstall() {
-    const loader = await this.loadingCtrl.create({
-      message: `Beginning uninstall...`,
-    })
-    await loader.present()
+    const loader = this.loader.open(`Beginning uninstall...`).subscribe()
 
     try {
       await this.embassyApi.uninstallPackage({ id: this.pkgId })
@@ -159,9 +154,9 @@ export class AppActionsPage {
         .catch(e => console.error('Failed to mark instructions as unseen', e))
       this.navCtrl.navigateRoot('/services')
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
@@ -169,10 +164,7 @@ export class AppActionsPage {
     actionId: string,
     input?: object,
   ): Promise<boolean> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Executing action...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Executing action...').subscribe()
 
     try {
       const res = await this.embassyApi.executePackageAction({
@@ -191,10 +183,10 @@ export class AppActionsPage {
       setTimeout(() => successModal.present(), 500)
       return true // needed to dismiss original modal/alert
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
       return false // don't dismiss original modal/alert
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
index 79b1a1fde..ab7940a06 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
@@ -8,7 +8,9 @@
 </ion-header>
 
 <ion-content class="ion-padding-top with-widgets">
-  <ion-item-group *ngIf="serviceInterfaces$ | async as serviceInterfaces">
+  <ion-item-group
+    *ngIf="serviceInterfacesWithHostInfo$ | async as serviceInterfaces"
+  >
     <ng-container *ngIf="serviceInterfaces.ui.length">
       <ion-item-divider>User Interfaces</ion-item-divider>
       <app-interfaces-item
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index f3fe7a0cc..0b31dce4b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -6,9 +6,8 @@ import { copyToClipboard, getPkgId } from '@start9labs/shared'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import { QRComponent } from 'src/app/components/qr/qr.component'
-import { map } from 'rxjs'
-import { T } from '@start9labs/start-sdk'
-import { addressHostToUrl } from '@start9labs/start-sdk/cjs/lib/util/getServiceInterface'
+import { combineLatest, map } from 'rxjs'
+import { T, utils } from '@start9labs/start-sdk'
 
 type MappedInterface = T.ServiceInterface & {
   addresses: MappedAddress[]
@@ -26,30 +25,43 @@ type MappedAddress = {
 export class AppInterfacesPage {
   readonly pkgId = getPkgId(this.route)
 
-  readonly serviceInterfaces$ = this.patch
-    .watch$('packageData', this.pkgId, 'serviceInterfaces')
-    .pipe(
-      map(interfaces => {
-        const sorted = Object.values(interfaces)
-          .sort(iface =>
-            iface.name.toLowerCase() > iface.name.toLowerCase() ? -1 : 1,
-          )
-          .map(iface => {
-            // TODO @Matt
-            const host = {} as any
-            return {
-              ...iface,
-              addresses: getAddresses(iface, host),
-            }
-          })
-
-        return {
-          ui: sorted.filter(val => val.type === 'ui'),
-          api: sorted.filter(val => val.type === 'api'),
-          p2p: sorted.filter(val => val.type === 'p2p'),
-        }
-      }),
-    )
+  private readonly serviceInterfaces$ = this.patch.watch$(
+    'packageData',
+    this.pkgId,
+    'serviceInterfaces',
+  )
+  private readonly hosts$ = this.patch.watch$(
+    'packageData',
+    this.pkgId,
+    'hosts',
+  )
+
+  readonly serviceInterfacesWithHostInfo$ = combineLatest([
+    this.serviceInterfaces$,
+    this.hosts$,
+  ]).pipe(
+    map(([interfaces, hosts]) => {
+      const sorted = Object.values(interfaces)
+        .sort(iface =>
+          iface.name.toLowerCase() > iface.name.toLowerCase() ? -1 : 1,
+        )
+        .map(iface => {
+          return {
+            ...iface,
+            addresses: getAddresses(
+              iface,
+              hosts[iface.addressInfo.hostId] || {},
+            ),
+          }
+        })
+
+      return {
+        ui: sorted.filter(val => val.type === 'ui'),
+        api: sorted.filter(val => val.type === 'api'),
+        p2p: sorted.filter(val => val.type === 'p2p'),
+      }
+    }),
+  )
 
   constructor(
     private readonly route: ActivatedRoute,
@@ -108,20 +120,15 @@ function getAddresses(
   host: T.Host,
 ): MappedAddress[] {
   const addressInfo = serviceInterface.addressInfo
-  const username = addressInfo.username ? addressInfo.username + '@' : ''
-  const suffix = addressInfo.suffix || ''
 
   const hostnames =
-    host.kind === 'multi' ? host.hostnameInfo[addressInfo.internalPort] : [] // TODO: non-multi
-  /* host.hostname
-      ? [host.hostname]
-      : [] */
+    host.kind === 'multi' ? host.hostnameInfo[addressInfo.internalPort] : []
 
-  return hostnames.flatMap(h => {
+  const addressesWithNames = hostnames.flatMap(h => {
     let name = ''
 
     if (h.kind === 'onion') {
-      name = 'Tor'
+      name = `Tor`
     } else {
       const hostnameKind = h.hostname.kind
 
@@ -135,9 +142,23 @@ function getAddresses(
       }
     }
 
-    return addressHostToUrl(addressInfo, h).map(url => ({
-      name,
-      url,
-    }))
+    const addresses = utils.addressHostToUrl(addressInfo, h)
+    if (addresses.length > 1) {
+      return utils.addressHostToUrl(addressInfo, h).map(url => ({
+        name: `${name} (${new URL(url).protocol
+          .replace(':', '')
+          .toUpperCase()})`,
+        url,
+      }))
+    } else {
+      return utils.addressHostToUrl(addressInfo, h).map(url => ({
+        name,
+        url,
+      }))
+    }
   })
+
+  return addressesWithNames.filter(
+    (value, index, self) => index === self.findIndex(t => t.url === value.url),
+  )
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts
index 8cf576bd7..61b17b669 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
+import { ErrorService, getPkgId, pauseFor } from '@start9labs/shared'
 import { Metric } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { pauseFor, ErrorToastService, getPkgId } from '@start9labs/shared'
 
 @Component({
   selector: 'app-metrics',
@@ -17,7 +17,7 @@ export class AppMetricsPage {
 
   constructor(
     private readonly route: ActivatedRoute,
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly embassyApi: ApiService,
   ) {}
 
@@ -46,7 +46,7 @@ export class AppMetricsPage {
     try {
       this.metrics = await this.embassyApi.getPkgMetrics({ id: this.pkgId })
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
       this.stopDaemon()
     } finally {
       this.loading = false
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
index d9b6bbc3e..af659c32b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
@@ -1,6 +1,5 @@
 import { Component, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
 import {
   AlertController,
   IonBackButtonDelegate,
@@ -8,18 +7,15 @@ import {
   NavController,
   ToastController,
 } from '@ionic/angular'
-import { PackageProperties } from 'src/app/util/properties.util'
-import { QRComponent } from 'src/app/components/qr/qr.component'
-import { PatchDB } from 'patch-db-client'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-import {
-  ErrorToastService,
-  getPkgId,
-  copyToClipboard,
-} from '@start9labs/shared'
+import { copyToClipboard, ErrorService, getPkgId } from '@start9labs/shared'
 import { TuiDestroyService } from '@taiga-ui/cdk'
 import { getValueByPointer } from 'fast-json-patch'
+import { PatchDB } from 'patch-db-client'
 import { map, takeUntil } from 'rxjs/operators'
+import { QRComponent } from 'src/app/components/qr/qr.component'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { DataModel } from 'src/app/services/patch-db/data-model'
+import { PackageProperties } from 'src/app/util/properties.util'
 
 @Component({
   selector: 'app-properties',
@@ -47,7 +43,7 @@ export class AppPropertiesPage {
   constructor(
     private readonly route: ActivatedRoute,
     private readonly embassyApi: ApiService,
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly alertCtrl: AlertController,
     private readonly toastCtrl: ToastController,
     private readonly modalCtrl: ModalController,
@@ -139,7 +135,7 @@ export class AppPropertiesPage {
       })
       this.node = getValueByPointer(this.properties, this.pointer)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
index 0b2d82763..86744cc91 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
@@ -4,13 +4,11 @@ import { Routes, RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
 import { AppShowPage } from './app-show.page'
 import {
-  EmptyPipe,
   EmverPipesModule,
   ResponsiveColModule,
   SharedPipesModule,
 } from '@start9labs/shared'
 import { StatusComponentModule } from 'src/app/components/status/status.component.module'
-import { AppConfigPageModule } from 'src/app/modals/app-config/app-config.module'
 import { LaunchablePipeModule } from 'src/app/pipes/launchable/launchable.module'
 import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
 import { AppShowHeaderComponent } from './components/app-show-header/app-show-header.component'
@@ -51,7 +49,6 @@ const routes: Routes = [
     InstallingProgressPipeModule,
     IonicModule,
     RouterModule.forChild(routes),
-    AppConfigPageModule,
     EmverPipesModule,
     LaunchablePipeModule,
     UiPipeModule,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 010a7473c..cb1f6f5f9 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -11,7 +11,6 @@ import { renderPkgStatus } from 'src/app/services/pkg-status-rendering.service'
 import { map, tap } from 'rxjs/operators'
 import { ActivatedRoute, NavigationExtras } from '@angular/router'
 import { getPkgId } from '@start9labs/shared'
-import { ModalService } from 'src/app/services/modal.service'
 import { DependentInfo } from 'src/app/types/dependent-info'
 import {
   DepErrorService,
@@ -26,6 +25,8 @@ import {
   isUpdating,
 } from 'src/app/util/get-package-data'
 import { T } from '@start9labs/start-sdk'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
+import { ConfigModal, PackageConfigData } from 'src/app/modals/config.component'
 
 export interface DependencyInfo {
   id: string
@@ -68,8 +69,8 @@ export class AppShowPage {
     private readonly route: ActivatedRoute,
     private readonly navCtrl: NavController,
     private readonly patch: PatchDB<DataModel>,
-    private readonly modalService: ModalService,
     private readonly depErrorService: DepErrorService,
+    private readonly formDialog: FormDialogService,
   ) {}
 
   showProgress(
@@ -171,7 +172,13 @@ export class AppShowPage {
       case 'update':
         return this.installDep(pkg, pkgManifest, id)
       case 'configure':
-        return this.configureDep(pkgManifest, id)
+        return this.formDialog.open<PackageConfigData>(ConfigModal, {
+          label: `${pkgManifest.title} config`,
+          data: {
+            pkgId: id,
+            dependentInfo: pkgManifest,
+          },
+        })
     }
   }
 
@@ -194,19 +201,4 @@ export class AppShowPage {
       navigationExtras,
     )
   }
-
-  private async configureDep(
-    pkgManifest: T.Manifest,
-    dependencyId: string,
-  ): Promise<void> {
-    const dependentInfo: DependentInfo = {
-      id: pkgManifest.id,
-      title: pkgManifest.title,
-    }
-
-    await this.modalService.presentModalConfig({
-      pkgId: dependencyId,
-      dependentInfo,
-    })
-  }
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
index 8e4bb760d..b0d65b5fd 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
@@ -68,7 +68,7 @@ <h2 class="bold">
   </ng-container>
   <!-- disconnected -->
   <ng-template #disconnected>
-    <ion-item *ngFor="let health; in: checks">
+    <ion-item *ngFor="let health of healthChecks | keyvalue">
       <ion-avatar slot="start">
         <ion-skeleton-text class="avatar"></ion-skeleton-text>
       </ion-avatar>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index ba60c331d..30657ae01 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -1,26 +1,27 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { UiLauncherService } from 'src/app/services/ui-launcher.service'
-import {
-  PackageStatus,
-  PrimaryRendering,
-} from 'src/app/services/pkg-status-rendering.service'
+import { AlertController } from '@ionic/angular'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
+import { PatchDB } from 'patch-db-client'
+import { ConfigModal, PackageConfigData } from 'src/app/modals/config.component'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { ConnectionService } from 'src/app/services/connection.service'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
 import {
   DataModel,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
-import { ErrorToastService } from '@start9labs/shared'
-import { AlertController, LoadingController } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ModalService } from 'src/app/services/modal.service'
-import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { ConnectionService } from 'src/app/services/connection.service'
 import {
-  isInstalled,
-  getManifest,
+  PackageStatus,
+  PrimaryRendering,
+} from 'src/app/services/pkg-status-rendering.service'
+import { UiLauncherService } from 'src/app/services/ui-launcher.service'
+import {
   getAllPackages,
+  getManifest,
+  isInstalled,
 } from 'src/app/util/get-package-data'
-import { PatchDB } from 'patch-db-client'
-import { T } from '@start9labs/start-sdk'
+import { hasCurrentDeps } from 'src/app/util/has-deps'
 
 @Component({
   selector: 'app-show-status',
@@ -41,11 +42,11 @@ export class AppShowStatusComponent {
 
   constructor(
     private readonly alertCtrl: AlertController,
-    private readonly errToast: ErrorToastService,
-    private readonly loadingCtrl: LoadingController,
+    private readonly errorService: ErrorService,
+    private readonly loader: LoadingService,
     private readonly embassyApi: ApiService,
     private readonly launcherService: UiLauncherService,
-    private readonly modalService: ModalService,
+    private readonly formDialog: FormDialogService,
     readonly connection$: ConnectionService,
     private readonly patch: PatchDB<DataModel>,
   ) {}
@@ -85,8 +86,8 @@ export class AppShowStatusComponent {
   }
 
   async presentModalConfig(): Promise<void> {
-    return this.modalService.presentModalConfig({
-      pkgId: this.manifest.id,
+    return this.formDialog.open<PackageConfigData>(ConfigModal, {
+      data: { pkgId: this.manifest.id },
     })
   }
 
@@ -172,47 +173,38 @@ export class AppShowStatusComponent {
   }
 
   private async start(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: `Starting...`,
-    })
-    await loader.present()
+    const loader = this.loader.open(`Starting...`).subscribe()
 
     try {
       await this.embassyApi.startPackage({ id: this.manifest.id })
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async stop(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Stopping...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Stopping...').subscribe()
 
     try {
       await this.embassyApi.stopPackage({ id: this.manifest.id })
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async restart(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: `Restarting...`,
-    })
-    await loader.present()
+    const loader = this.loader.open(`Restarting...`).subscribe()
 
     try {
       await this.embassyApi.restartPackage({ id: this.manifest.id })
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
   private async presentAlertStart(message: string): Promise<boolean> {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index 692d5d55f..e2a03ecf8 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -7,11 +7,12 @@ import {
   InstalledState,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
-import { ModalService } from 'src/app/services/modal.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { from, map, Observable } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
 import { T } from '@start9labs/start-sdk'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
+import { ConfigModal, PackageConfigData } from 'src/app/modals/config.component'
 
 export interface Button {
   title: string
@@ -30,9 +31,9 @@ export class ToButtonsPipe implements PipeTransform {
     private readonly route: ActivatedRoute,
     private readonly navCtrl: NavController,
     private readonly modalCtrl: ModalController,
-    private readonly modalService: ModalService,
     private readonly apiService: ApiService,
     private readonly patch: PatchDB<DataModel>,
+    private readonly formDialog: FormDialogService,
   ) {}
 
   transform(pkg: PackageDataEntry<InstalledState>): Button[] {
@@ -52,7 +53,10 @@ export class ToButtonsPipe implements PipeTransform {
       // config
       {
         action: async () =>
-          this.modalService.presentModalConfig({ pkgId: manifest.id }),
+          this.formDialog.open<PackageConfigData>(ConfigModal, {
+            label: `${manifest.title} configuration`,
+            data: { pkgId: manifest.id },
+          }),
         title: 'Config',
         description: `Customize ${manifest.title}`,
         icon: 'options-outline',
diff --git a/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
index 9bb7376bc..00ee305bc 100644
--- a/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core'
-import { AlertController, LoadingController } from '@ionic/angular'
+import { AlertController } from '@ionic/angular'
+import { LoadingService } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 @Component({
@@ -18,7 +19,7 @@ export class HomePage {
   restarted = false
 
   constructor(
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
     private readonly api: ApiService,
     private readonly alertCtrl: AlertController,
   ) {}
@@ -86,10 +87,7 @@ export class HomePage {
   }
 
   async restart(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      cssClass: 'loader',
-    })
-    await loader.present()
+    const loader = this.loader.open('Loading...').subscribe()
 
     try {
       await this.api.diagnosticRestart()
@@ -97,15 +95,12 @@ export class HomePage {
     } catch (e) {
       console.error(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   async forgetDrive(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      cssClass: 'loader',
-    })
-    await loader.present()
+    const loader = this.loader.open('Loading...').subscribe()
 
     try {
       await this.api.diagnosticForgetDrive()
@@ -114,7 +109,7 @@ export class HomePage {
     } catch (e) {
       console.error(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
@@ -149,10 +144,7 @@ export class HomePage {
   }
 
   private async repairDisk(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      cssClass: 'loader',
-    })
-    await loader.present()
+    const loader = this.loader.open('Loading...').subscribe()
 
     try {
       await this.api.diagnosticRepairDisk()
@@ -161,7 +153,7 @@ export class HomePage {
     } catch (e) {
       console.error(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 }
diff --git a/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
index 5119b9d93..5f98627cb 100644
--- a/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
@@ -1,7 +1,7 @@
 import { Component, ViewChild } from '@angular/core'
 import { IonContent } from '@ionic/angular'
+import { ErrorService, toLocalIsoString } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ErrorToastService, toLocalIsoString } from '@start9labs/shared'
 
 var Convert = require('ansi-to-html')
 var convert = new Convert({
@@ -23,7 +23,7 @@ export class LogsPage {
 
   constructor(
     private readonly api: ApiService,
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
   ) {}
 
   async ngOnInit() {
@@ -89,7 +89,7 @@ export class LogsPage {
         this.needInfinite = false
       }
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     }
   }
 }
diff --git a/web/projects/ui/src/app/pages/init/init.service.ts b/web/projects/ui/src/app/pages/init/init.service.ts
index 7102c9db5..245e1ae24 100644
--- a/web/projects/ui/src/app/pages/init/init.service.ts
+++ b/web/projects/ui/src/app/pages/init/init.service.ts
@@ -1,5 +1,5 @@
 import { inject, Injectable } from '@angular/core'
-import { ErrorToastService } from '@start9labs/shared'
+import { ErrorService } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import {
   catchError,
@@ -24,7 +24,7 @@ interface MappedProgress {
 export class InitService extends Observable<MappedProgress> {
   private readonly state = inject(StateService)
   private readonly api = inject(ApiService)
-  private readonly errorService = inject(ErrorToastService)
+  private readonly errorService = inject(ErrorService)
   private readonly progress$ = defer(() =>
     from(this.api.initGetProgress()),
   ).pipe(
@@ -59,7 +59,7 @@ export class InitService extends Observable<MappedProgress> {
     }),
     catchError(e => {
       // @TODO this toast is presenting when we navigate away from init page. It seems other websockets exhibit the same behavior, but we never noticed because the error were not being caught and presented in this manner
-      this.errorService.present(e)
+      this.errorService.handleError(e)
 
       return EMPTY
     }),
diff --git a/web/projects/ui/src/app/pages/login/login.page.ts b/web/projects/ui/src/app/pages/login/login.page.ts
index db0d1c2c4..065a4cc7f 100644
--- a/web/projects/ui/src/app/pages/login/login.page.ts
+++ b/web/projects/ui/src/app/pages/login/login.page.ts
@@ -1,10 +1,11 @@
+import { DOCUMENT } from '@angular/common'
 import { Component, Inject } from '@angular/core'
-import { getPlatforms, LoadingController } from '@ionic/angular'
+import { Router } from '@angular/router'
+import { getPlatforms } from '@ionic/angular'
+import { LoadingService } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { AuthService } from 'src/app/services/auth.service'
-import { Router } from '@angular/router'
 import { ConfigService } from 'src/app/services/config.service'
-import { DOCUMENT } from '@angular/common'
 
 @Component({
   selector: 'login',
@@ -19,7 +20,7 @@ export class LoginPage {
   constructor(
     private readonly router: Router,
     private readonly authService: AuthService,
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
     private readonly api: ApiService,
     public readonly config: ConfigService,
     @Inject(DOCUMENT) public readonly document: Document,
@@ -28,10 +29,7 @@ export class LoginPage {
   async submit() {
     this.error = ''
 
-    const loader = await this.loadingCtrl.create({
-      message: 'Logging in...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Logging in...').subscribe()
 
     try {
       document.cookie = ''
@@ -51,7 +49,7 @@ export class LoginPage {
       // code 7 is for incorrect password
       this.error = e.code === 7 ? 'Invalid Password' : e.message
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 }
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
index ea1952578..c10ce42aa 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
@@ -18,7 +18,6 @@ import {
 import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
 import { MarketplaceStatusModule } from '../marketplace-status/marketplace-status.module'
 import { MarketplaceListPage } from './marketplace-list.page'
-import { MarketplaceSettingsPageModule } from 'src/app/modals/marketplace-settings/marketplace-settings.module'
 import { StoreIconComponentModule } from 'src/app/components/store-icon/store-icon.component.module'
 
 const routes: Routes = [
@@ -43,7 +42,6 @@ const routes: Routes = [
     CategoriesModule,
     SearchModule,
     SkeletonModule,
-    MarketplaceSettingsPageModule,
     StoreIconComponentModule,
     ResponsiveColModule,
   ],
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
index 6792b917a..e1f13883a 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
@@ -1,10 +1,10 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ModalController } from '@ionic/angular'
 import { AbstractMarketplaceService } from '@start9labs/marketplace'
+import { TuiDialogService } from '@taiga-ui/core'
 import { PatchDB } from 'patch-db-client'
 import { map } from 'rxjs'
-import { MarketplaceSettingsPage } from 'src/app/modals/marketplace-settings/marketplace-settings.page'
+import { MARKETPLACE_REGISTRY } from 'src/app/modals/marketplace-settings/marketplace-settings.page'
 import { ConfigService } from 'src/app/services/config.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
@@ -73,7 +73,7 @@ export class MarketplaceListPage {
     private readonly patch: PatchDB<DataModel>,
     @Inject(AbstractMarketplaceService)
     private readonly marketplaceService: MarketplaceService,
-    private readonly modalCtrl: ModalController,
+    private readonly dialogs: TuiDialogService,
     private readonly config: ConfigService,
     private readonly route: ActivatedRoute,
   ) {}
@@ -82,10 +82,11 @@ export class MarketplaceListPage {
   query = ''
 
   async presentModalMarketplaceSettings() {
-    const modal = await this.modalCtrl.create({
-      component: MarketplaceSettingsPage,
-    })
-    await modal.present()
+    this.dialogs
+      .open(MARKETPLACE_REGISTRY, {
+        label: 'Change Registry',
+      })
+      .subscribe()
   }
 
   onCategoryChange(category: string): void {
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index 4e44e2af3..5c83c536f 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -4,28 +4,29 @@ import {
   Inject,
   Input,
 } from '@angular/core'
-import { AlertController, LoadingController } from '@ionic/angular'
+import { AlertController } from '@ionic/angular'
 import {
   AbstractMarketplaceService,
   MarketplacePkg,
 } from '@start9labs/marketplace'
 import {
   Emver,
-  ErrorToastService,
+  ErrorService,
   isEmptyObject,
+  LoadingService,
   sameUrl,
 } from '@start9labs/shared'
+import { PatchDB } from 'patch-db-client'
+import { firstValueFrom } from 'rxjs'
+import { ClientStorageService } from 'src/app/services/client-storage.service'
+import { MarketplaceService } from 'src/app/services/marketplace.service'
 import {
   DataModel,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
-import { ClientStorageService } from 'src/app/services/client-storage.service'
-import { MarketplaceService } from 'src/app/services/marketplace.service'
-import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { PatchDB } from 'patch-db-client'
-import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
-import { firstValueFrom } from 'rxjs'
 import { dryUpdate } from 'src/app/util/dry-update'
+import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
+import { hasCurrentDeps } from 'src/app/util/has-deps'
 
 @Component({
   selector: 'marketplace-show-controls',
@@ -50,9 +51,9 @@ export class MarketplaceShowControlsComponent {
     private readonly ClientStorageService: ClientStorageService,
     @Inject(AbstractMarketplaceService)
     private readonly marketplaceService: MarketplaceService,
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
     private readonly emver: Emver,
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
@@ -176,19 +177,16 @@ export class MarketplaceShowControlsComponent {
   }
 
   private async install(url: string) {
-    const loader = await this.loadingCtrl.create({
-      message: 'Beginning Install...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Beginning Install...').subscribe()
 
     const { id, version } = this.pkg.manifest
 
     try {
       await this.marketplaceService.installPackage(id, version, url)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
diff --git a/web/projects/ui/src/app/pages/notifications/notifications.page.ts b/web/projects/ui/src/app/pages/notifications/notifications.page.ts
index 933c50e67..69bad6c29 100644
--- a/web/projects/ui/src/app/pages/notifications/notifications.page.ts
+++ b/web/projects/ui/src/app/pages/notifications/notifications.page.ts
@@ -1,21 +1,17 @@
 import { Component } from '@angular/core'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { ActivatedRoute } from '@angular/router'
+import { AlertController, ModalController } from '@ionic/angular'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { PatchDB } from 'patch-db-client'
+import { first } from 'rxjs'
+import { BackupReportPage } from 'src/app/modals/backup-report/backup-report.page'
 import {
-  ServerNotifications,
   NotificationLevel,
   ServerNotification,
+  ServerNotifications,
 } from 'src/app/services/api/api.types'
-import {
-  AlertController,
-  LoadingController,
-  ModalController,
-} from '@ionic/angular'
-import { ActivatedRoute } from '@angular/router'
-import { ErrorToastService } from '@start9labs/shared'
-import { BackupReportPage } from 'src/app/modals/backup-report/backup-report.page'
-import { PatchDB } from 'patch-db-client'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
-import { first } from 'rxjs'
 
 @Component({
   selector: 'notifications',
@@ -34,9 +30,9 @@ export class NotificationsPage {
   constructor(
     private readonly embassyApi: ApiService,
     private readonly alertCtrl: AlertController,
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
     private readonly modalCtrl: ModalController,
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly route: ActivatedRoute,
     private readonly patch: PatchDB<DataModel>,
   ) {}
@@ -66,26 +62,23 @@ export class NotificationsPage {
 
       return notifications
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     }
 
     return []
   }
 
   async delete(id: number, index: number): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Deleting...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Deleting...').subscribe()
 
     try {
       await this.embassyApi.deleteNotification({ id })
       this.notifications.splice(index, 1)
       this.beforeCursor = this.notifications[this.notifications.length - 1]?.id
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
@@ -160,10 +153,7 @@ export class NotificationsPage {
   }
 
   private async deleteAll(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Deleting...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Deleting...').subscribe()
 
     try {
       await this.embassyApi.deleteAllNotifications({
@@ -172,9 +162,9 @@ export class NotificationsPage {
       this.notifications = []
       this.beforeCursor = undefined
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 }
diff --git a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
index 88e9cb4a8..ae644399f 100644
--- a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
+++ b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
@@ -1,14 +1,10 @@
 import { Component } from '@angular/core'
-import {
-  LoadingController,
-  ModalController,
-  NavController,
-} from '@ionic/angular'
+import { ModalController, NavController } from '@ionic/angular'
+import { LoadingService } from '@start9labs/shared'
+import { TuiDialogService } from '@taiga-ui/core'
+import { take } from 'rxjs/operators'
+import { PROMPT, PromptOptions } from 'src/app/modals/prompt.component'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import {
-  GenericInputComponent,
-  GenericInputOptions,
-} from 'src/app/modals/generic-input/generic-input.component'
 import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
 import {
   BackupInfo,
@@ -26,37 +22,35 @@ import * as argon2 from '@start9labs/argon2'
 export class RestorePage {
   constructor(
     private readonly modalCtrl: ModalController,
+    private readonly dialogs: TuiDialogService,
     private readonly navCtrl: NavController,
     private readonly embassyApi: ApiService,
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
   ) {}
 
   async presentModalPassword(
     target: MappedBackupTarget<CifsBackupTarget | DiskBackupTarget>,
   ): Promise<void> {
-    const options: GenericInputOptions = {
-      title: 'Password Required',
+    const options: PromptOptions = {
       message:
         'Enter the master password that was used to encrypt this backup. On the next screen, you will select the individual services you want to restore.',
       label: 'Master Password',
       placeholder: 'Enter master password',
       useMask: true,
       buttonText: 'Next',
-      submitFn: async (password: string) => {
+    }
+
+    this.dialogs
+      .open<string>(PROMPT, {
+        label: 'Password Required',
+        data: options,
+      })
+      .pipe(take(1))
+      .subscribe(async (password: string) => {
         const passwordHash = target.entry.startOs?.passwordHash || ''
         argon2.verify(passwordHash, password)
         await this.restoreFromBackup(target, password)
-      },
-    }
-
-    const modal = await this.modalCtrl.create({
-      componentProps: { options },
-      cssClass: 'alertlike-modal',
-      presentingElement: await this.modalCtrl.getTop(),
-      component: GenericInputComponent,
-    })
-
-    await modal.present()
+      })
   }
 
   private async restoreFromBackup(
@@ -64,10 +58,7 @@ export class RestorePage {
     password: string,
     oldPassword?: string,
   ): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Decrypting drive...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Decrypting drive...').subscribe()
 
     try {
       const backupInfo = await this.embassyApi.getBackupInfo({
@@ -76,7 +67,7 @@ export class RestorePage {
       })
       this.presentModalSelect(target.id, backupInfo, password, oldPassword)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
index 0467df102..804a88fab 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
@@ -1,16 +1,11 @@
 import { Component } from '@angular/core'
-import {
-  LoadingController,
-  ModalController,
-  NavController,
-} from '@ionic/angular'
+import { ModalController, NavController } from '@ionic/angular'
+import { LoadingService } from '@start9labs/shared'
+import { TuiDialogService } from '@taiga-ui/core'
+import { PROMPT, PromptOptions } from 'src/app/modals/prompt.component'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import {
-  GenericInputComponent,
-  GenericInputOptions,
-} from 'src/app/modals/generic-input/generic-input.component'
 import { PatchDB } from 'patch-db-client'
-import { skip, takeUntil } from 'rxjs/operators'
+import { skip, take, takeUntil } from 'rxjs/operators'
 import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
 import * as argon2 from '@start9labs/argon2'
 import { TuiDestroyService } from '@taiga-ui/cdk'
@@ -35,7 +30,8 @@ export class ServerBackupPage {
   readonly backingUp$ = this.eosService.backingUp$
 
   constructor(
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
+    private readonly dialogs: TuiDialogService,
     private readonly modalCtrl: ModalController,
     private readonly embassyApi: ApiService,
     private readonly navCtrl: NavController,
@@ -75,14 +71,21 @@ export class ServerBackupPage {
   private async presentModalPassword(
     target: MappedBackupTarget<CifsBackupTarget | DiskBackupTarget>,
   ): Promise<void> {
-    const options: GenericInputOptions = {
-      title: 'Master Password Needed',
+    const options: PromptOptions = {
       message: 'Enter your master password to encrypt this backup.',
       label: 'Master Password',
       placeholder: 'Enter master password',
       useMask: true,
       buttonText: 'Create Backup',
-      submitFn: async (password: string) => {
+    }
+
+    this.dialogs
+      .open<string>(PROMPT, {
+        label: 'Master Password Needed',
+        data: options,
+      })
+      .pipe(take(1))
+      .subscribe(async (password: string) => {
         // confirm password matches current master password
         const { passwordHash } = await getServerInfo(this.patch)
         argon2.verify(passwordHash, password)
@@ -105,45 +108,34 @@ export class ServerBackupPage {
           }
           await this.createBackup(target, password)
         }
-      },
-    }
-
-    const m = await this.modalCtrl.create({
-      component: GenericInputComponent,
-      componentProps: { options },
-      cssClass: 'alertlike-modal',
-    })
-
-    await m.present()
+      })
   }
 
   private async presentModalOldPassword(
     target: MappedBackupTarget<CifsBackupTarget | DiskBackupTarget>,
     password: string,
   ): Promise<void> {
-    const options: GenericInputOptions = {
-      title: 'Original Password Needed',
+    const options: PromptOptions = {
       message:
         'This backup was created with a different password. Enter the ORIGINAL password that was used to encrypt this backup.',
       label: 'Original Password',
       placeholder: 'Enter original password',
       useMask: true,
       buttonText: 'Create Backup',
-      submitFn: async (oldPassword: string) => {
+    }
+
+    this.dialogs
+      .open<string>(PROMPT, {
+        label: 'Original Password Needed',
+        data: options,
+      })
+      .pipe(take(1))
+      .subscribe(async (oldPassword: string) => {
         const passwordHash = target.entry.startOs?.passwordHash || ''
 
         argon2.verify(passwordHash, oldPassword)
         await this.createBackup(target, password, oldPassword)
-      },
-    }
-
-    const m = await this.modalCtrl.create({
-      component: GenericInputComponent,
-      componentProps: { options },
-      cssClass: 'alertlike-modal',
-    })
-
-    await m.present()
+      })
   }
 
   private async createBackup(
@@ -151,10 +143,7 @@ export class ServerBackupPage {
     password: string,
     oldPassword?: string,
   ): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Beginning backup...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Beginning backup...').subscribe()
 
     try {
       await this.embassyApi.createBackup({
@@ -164,7 +153,7 @@ export class ServerBackupPage {
         password,
       })
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 }
diff --git a/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts b/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts
index 569d34a45..4678fe3ea 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core'
+import { ErrorService, pauseFor } from '@start9labs/shared'
+import { Subject } from 'rxjs'
 import { Metrics } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { TimeService } from 'src/app/services/time-service'
-import { pauseFor, ErrorToastService } from '@start9labs/shared'
-import { Subject } from 'rxjs'
 
 @Component({
   selector: 'server-metrics',
@@ -18,7 +18,7 @@ export class ServerMetricsPage {
   readonly uptime$ = this.timeService.uptime$
 
   constructor(
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly embassyApi: ApiService,
     private readonly timeService: TimeService,
   ) {}
@@ -50,7 +50,7 @@ export class ServerMetricsPage {
       const metrics = await this.embassyApi.getServerMetrics({})
       this.metrics$.next(metrics)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
       this.stopDaemon()
     }
   }
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index f375b0e86..5ade9c666 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -1,32 +1,32 @@
 import { Component, Inject } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
 import {
   AlertController,
-  LoadingController,
   ModalController,
   NavController,
   ToastController,
 } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ActivatedRoute } from '@angular/router'
+import { WINDOW } from '@ng-web-apis/common'
+import * as argon2 from '@start9labs/argon2'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { CB } from '@start9labs/start-sdk'
+import { TuiAlertService, TuiDialogService } from '@taiga-ui/core'
+import { TUI_PROMPT } from '@taiga-ui/kit'
 import { PatchDB } from 'patch-db-client'
-import { firstValueFrom, Observable, of } from 'rxjs'
-import { ErrorToastService } from '@start9labs/shared'
-import { EOSService } from 'src/app/services/eos.service'
-import { ClientStorageService } from 'src/app/services/client-storage.service'
+import { filter, from, Observable, of, switchMap } from 'rxjs'
+import { take } from 'rxjs/operators'
+import { FormComponent } from 'src/app/components/form.component'
 import { OSUpdatePage } from 'src/app/modals/os-update/os-update.page'
-import { getAllPackages } from '../../../util/get-package-data'
+import { PROMPT } from 'src/app/modals/prompt.component'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { AuthService } from 'src/app/services/auth.service'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-import {
-  GenericInputComponent,
-  GenericInputOptions,
-} from 'src/app/modals/generic-input/generic-input.component'
+import { ClientStorageService } from 'src/app/services/client-storage.service'
 import { ConfigService } from 'src/app/services/config.service'
-import { WINDOW } from '@ng-web-apis/common'
+import { EOSService } from 'src/app/services/eos.service'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
+import { DataModel } from 'src/app/services/patch-db/data-model'
+import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
 import { getServerInfo } from 'src/app/util/get-server-info'
-import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
-import { ConfigSpec } from 'src/app/pkg-config/config-types'
-import * as argon2 from '@start9labs/argon2'
 
 @Component({
   selector: 'server-show',
@@ -45,8 +45,11 @@ export class ServerShowPage {
   constructor(
     private readonly alertCtrl: AlertController,
     private readonly modalCtrl: ModalController,
-    private readonly loadingCtrl: LoadingController,
-    private readonly errToast: ErrorToastService,
+    private readonly alerts: TuiAlertService,
+    private readonly dialogs: TuiDialogService,
+    private readonly formDialog: FormDialogService,
+    private readonly loader: LoadingService,
+    private readonly errorService: ErrorService,
     private readonly embassyApi: ApiService,
     private readonly navCtrl: NavController,
     private readonly route: ActivatedRoute,
@@ -60,123 +63,110 @@ export class ServerShowPage {
   ) {}
 
   async setBrowserTab(): Promise<void> {
-    const chosenName = await firstValueFrom(this.patch.watch$('ui', 'name'))
-
-    const options: GenericInputOptions = {
-      title: 'Browser Tab Title',
-      message: `This value will be displayed as the title of your browser tab.`,
-      label: 'Device Name',
-      useMask: false,
-      placeholder: 'StartOS',
-      nullable: true,
-      initialValue: chosenName,
-      buttonText: 'Save',
-      submitFn: (name: string) => this.setName(name || null),
-    }
-
-    const modal = await this.modalCtrl.create({
-      componentProps: { options },
-      cssClass: 'alertlike-modal',
-      presentingElement: await this.modalCtrl.getTop(),
-      component: GenericInputComponent,
-    })
-
-    await modal.present()
+    this.patch
+      .watch$('ui', 'name')
+      .pipe(
+        switchMap(initialValue =>
+          this.dialogs.open<string>(PROMPT, {
+            label: 'Browser Tab Title',
+            data: {
+              message: `This value will be displayed as the title of your browser tab.`,
+              label: 'Device Name',
+              placeholder: 'StartOS',
+              required: false,
+              buttonText: 'Save',
+              initialValue,
+            },
+          }),
+        ),
+        take(1),
+      )
+      .subscribe(async name => {
+        const loader = this.loader.open('Saving...').subscribe()
+
+        try {
+          await this.embassyApi.setDbValue<string | null>(
+            ['name'],
+            name || null,
+          )
+        } finally {
+          loader.unsubscribe()
+        }
+      })
   }
 
   async presentAlertResetPassword() {
-    const alert = await this.alertCtrl.create({
-      header: 'Warning',
-      message:
-        'You will still need your current password to decrypt existing backups!',
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
+    this.dialogs
+      .open(TUI_PROMPT, {
+        label: 'Warning',
+        size: 's',
+        data: {
+          content:
+            'You will still need your current password to decrypt existing backups!',
+          yes: 'Continue',
+          no: 'Cancel',
         },
-        {
-          text: 'Continue',
-          handler: () => this.presentModalResetPassword(),
-          cssClass: 'enter-click',
-        },
-      ],
-      cssClass: 'alert-warning-message',
-    })
-
-    await alert.present()
-  }
-
-  async presentModalResetPassword(): Promise<void> {
-    const modal = await this.modalCtrl.create({
-      component: GenericFormPage,
-      componentProps: {
-        title: 'Change Master Password',
-        spec: PasswordSpec,
-        buttons: [
-          {
-            text: 'Save',
-            handler: (value: any) => {
-              return this.resetPassword(value)
-            },
-            isSubmit: true,
+      })
+      .pipe(
+        filter(Boolean),
+        switchMap(() => from(configBuilderToSpec(passwordSpec))),
+      )
+      .subscribe(spec => {
+        this.formDialog.open(FormComponent, {
+          label: 'Change Master Password',
+          data: {
+            spec,
+            buttons: [
+              {
+                text: 'Save',
+                handler: (value: PasswordSpec) => this.resetPassword(value),
+              },
+            ],
           },
-        ],
-      },
-    })
-    await modal.present()
+        })
+      })
   }
 
-  private async resetPassword(value: {
-    currPass: string
-    newPass: string
-    newPass2: string
-  }): Promise<boolean> {
+  private async resetPassword(value: PasswordSpec): Promise<boolean> {
     let err = ''
 
-    if (value.newPass !== value.newPass2) {
+    if (value.newPassword1 !== value.newPassword2) {
       err = 'New passwords do not match'
-    } else if (value.newPass.length < 12) {
+    } else if (value.newPassword1.length < 12) {
       err = 'New password must be 12 characters or greater'
-    } else if (value.newPass.length > 64) {
+    } else if (value.newPassword1.length > 64) {
       err = 'New password must be less than 65 characters'
     }
 
     // confirm current password is correct
     const { passwordHash } = await getServerInfo(this.patch)
     try {
-      argon2.verify(passwordHash, value.currPass)
+      argon2.verify(passwordHash, value.currentPassword)
     } catch (e) {
       err = 'Current password is invalid'
     }
 
     if (err) {
-      this.errToast.present(err)
+      this.errorService.handleError(err)
       return false
     }
 
-    const loader = await this.loadingCtrl.create({
-      message: 'Changing master password...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Saving...').subscribe()
 
     try {
       await this.embassyApi.resetPassword({
-        oldPassword: value.currPass,
-        newPassword: value.newPass,
-      })
-      const toast = await this.toastCtrl.create({
-        header: 'Password changed!',
-        position: 'bottom',
-        duration: 2000,
+        oldPassword: value.currentPassword,
+        newPassword: value.newPassword1,
       })
 
-      toast.present()
+      this.alerts.open('Password changed!').subscribe()
+
       return true
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
       return false
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
@@ -187,7 +177,7 @@ export class ServerShowPage {
     const alert = await this.alertCtrl.create({
       header: isTor ? 'Warning' : 'Confirm',
       message: isTor
-        ? `You are currently connected over Tor. If you reset the Tor daemon, you will loose connectivity until it comes back online.<br/><br/>${shared}`
+        ? `You are currently connected over Tor. If you reset the Tor daemon, you will lose connectivity until it comes back online.<br/><br/>${shared}`
         : `Reset Tor?<br/><br/>${shared}`,
       inputs: [
         {
@@ -215,10 +205,7 @@ export class ServerShowPage {
   }
 
   private async resetTor(wipeState: boolean) {
-    const loader = await this.loadingCtrl.create({
-      message: 'Resetting Tor...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Resetting Tor...').subscribe()
 
     try {
       await this.embassyApi.resetTor({
@@ -241,9 +228,9 @@ export class ServerShowPage {
       })
       await toast.present()
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
@@ -336,7 +323,7 @@ export class ServerShowPage {
                 this.restart()
               })
             } catch (e: any) {
-              this.errToast.present(e)
+              this.errorService.handleError(e)
             }
           },
           cssClass: 'enter-click',
@@ -360,19 +347,6 @@ export class ServerShowPage {
     }
   }
 
-  private async setName(value: string | null): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Saving...',
-    })
-    await loader.present()
-
-    try {
-      await this.embassyApi.setDbValue<string | null>(['name'], value)
-    } finally {
-      loader.dismiss()
-    }
-  }
-
   // should wipe cache independent of actual BE logout
   private logout() {
     this.embassyApi.logout({}).catch(e => console.error('Failed to log out', e))
@@ -381,48 +355,37 @@ export class ServerShowPage {
 
   private async restart() {
     const action = 'Restart'
-
-    const loader = await this.loadingCtrl.create({
-      message: `Beginning ${action}...`,
-    })
-    await loader.present()
+    const loader = this.loader.open(`Beginning ${action}...`).subscribe()
 
     try {
       await this.embassyApi.restartServer({})
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async shutdown() {
     const action = 'Shutdown'
-
-    const loader = await this.loadingCtrl.create({
-      message: `Beginning ${action}...`,
-    })
-    await loader.present()
+    const loader = this.loader.open(`Beginning ${action}...`).subscribe()
 
     try {
       await this.embassyApi.shutdownServer({})
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async checkForEosUpdate(): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Checking for updates',
-    })
-    await loader.present()
+    const loader = this.loader.open('Checking for updates').subscribe()
 
     try {
       await this.eosService.loadEos()
 
-      await loader.dismiss()
+      await loader.unsubscribe()
 
       if (this.eosService.updateAvailable$.value) {
         this.updateEos()
@@ -430,8 +393,8 @@ export class ServerShowPage {
         this.presentAlertLatest()
       }
     } catch (e: any) {
-      await loader.dismiss()
-      this.errToast.present(e)
+      await loader.unsubscribe()
+      this.errorService.handleError(e)
     }
   }
 
@@ -729,29 +692,28 @@ interface SettingBtn {
   disabled$: Observable<boolean>
 }
 
-const PasswordSpec: ConfigSpec = {
-  currPass: {
-    type: 'string',
+const passwordSpec = CB.Config.of({
+  currentPassword: CB.Value.text({
     name: 'Current Password',
-    placeholder: 'CurrentPass',
-    nullable: false,
+    required: {
+      default: null,
+    },
     masked: true,
-    copyable: false,
-  },
-  newPass: {
-    type: 'string',
+  }),
+  newPassword1: CB.Value.text({
     name: 'New Password',
-    placeholder: 'NewPass',
-    nullable: false,
+    required: {
+      default: null,
+    },
     masked: true,
-    copyable: false,
-  },
-  newPass2: {
-    type: 'string',
+  }),
+  newPassword2: CB.Value.text({
     name: 'Retype New Password',
-    placeholder: 'NewPass',
-    nullable: false,
+    required: {
+      default: null,
+    },
     masked: true,
-    copyable: false,
-  },
-}
+  }),
+})
+
+export type PasswordSpec = typeof passwordSpec.validator._TYPE
diff --git a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
index d6a1a42e5..9dfdccb66 100644
--- a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core'
-import { AlertController, LoadingController } from '@ionic/angular'
-import { ErrorToastService } from '@start9labs/shared'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { AlertController } from '@ionic/angular'
+import { ErrorService, LoadingService } from '@start9labs/shared'
 import { PlatformType, Session } from 'src/app/services/api/api.types'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 @Component({
   selector: 'sessions',
@@ -15,8 +15,8 @@ export class SessionsPage {
   otherSessions: SessionWithId[] = []
 
   constructor(
-    private readonly loadingCtrl: LoadingController,
-    private readonly errToast: ErrorToastService,
+    private readonly loader: LoadingService,
+    private readonly errorService: ErrorService,
     private readonly alertCtrl: AlertController,
     private readonly embassyApi: ApiService,
   ) {}
@@ -39,7 +39,7 @@ export class SessionsPage {
           )
         })
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
@@ -67,18 +67,17 @@ export class SessionsPage {
   }
 
   async kill(ids: string[]): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: `Terminating session${ids.length > 1 ? 's' : ''}...`,
-    })
-    await loader.present()
+    const loader = this.loader
+      .open(`Terminating session${ids.length > 1 ? 's' : ''}...`)
+      .subscribe()
 
     try {
       await this.embassyApi.killSessions({ ids })
       this.otherSessions = this.otherSessions.filter(s => !ids.includes(s.id))
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index f6410e748..a0da8609d 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core'
-import { isPlatform, LoadingController, NavController } from '@ionic/angular'
+import { isPlatform, NavController } from '@ionic/angular'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { S9pk, T } from '@start9labs/start-sdk'
+import cbor from 'cbor'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
-import cbor from 'cbor'
-import { ErrorToastService } from '@start9labs/shared'
-import { S9pk, T } from '@start9labs/start-sdk'
 
 interface Positions {
   [key: string]: [bigint, bigint] // [position, length]
@@ -37,10 +37,10 @@ export class SideloadPage {
   }
 
   constructor(
-    private readonly loadingCtrl: LoadingController,
+    private readonly loader: LoadingService,
     private readonly api: ApiService,
     private readonly navCtrl: NavController,
-    private readonly errToast: ErrorToastService,
+    private readonly errorService: ErrorService,
     private readonly config: ConfigService,
   ) {}
 
@@ -111,11 +111,8 @@ export class SideloadPage {
   }
 
   async handleUpload() {
-    const loader = await this.loadingCtrl.create({
-      message: 'Uploading package',
-      cssClass: 'loader',
-    })
-    await loader.present()
+    const loader = this.loader.open('Uploading package').subscribe()
+
     try {
       const res = await this.api.sideloadPackage()
       this.api
@@ -124,9 +121,9 @@ export class SideloadPage {
 
       this.navCtrl.navigateRoot('/services')
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
       this.clearToUpload()
     }
   }
diff --git a/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html b/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
index 61737639b..4dd44dfd1 100644
--- a/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
@@ -24,7 +24,7 @@ <h2>
 
     <ion-item-divider>Saved Keys</ion-item-divider>
 
-    <ion-item button detail="false" (click)="presentModalAdd()">
+    <ion-item button detail="false" (click)="add()">
       <ion-icon slot="start" name="add" color="dark"></ion-icon>
       <ion-label>
         <b>Add New Key</b>
@@ -62,7 +62,7 @@ <h2>
 
     <!-- not loading -->
     <ng-container *ngIf="!loading">
-      <ion-item *ngFor="let ssh of sshKeys; let i = index">
+      <ion-item *ngFor="let ssh of sshKeys">
         <ion-icon slot="start" name="key-outline" size="large"></ion-icon>
         <ion-label>
           <h1>{{ ssh.hostname }}</h1>
@@ -73,7 +73,7 @@ <h2>{{ ssh.createdAt| date: 'medium' }}</h2>
           slot="end"
           fill="clear"
           color="danger"
-          (click)="presentAlertDelete(i)"
+          (click)="delete(ssh)"
         >
           <ion-icon slot="start" name="close"></ion-icon>
           Remove
diff --git a/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts b/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts
index 476835566..5e474db0f 100644
--- a/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts
@@ -1,16 +1,12 @@
-import { Component } from '@angular/core'
-import {
-  AlertController,
-  LoadingController,
-  ModalController,
-} from '@ionic/angular'
+import { ChangeDetectorRef, Component } from '@angular/core'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { TuiDialogOptions, TuiDialogService } from '@taiga-ui/core'
+import { TUI_PROMPT, TuiPromptData } from '@taiga-ui/kit'
+import { filter } from 'rxjs'
+import { take } from 'rxjs/operators'
+import { PROMPT } from 'src/app/modals/prompt.component'
 import { SSHKey } from 'src/app/services/api/api.types'
-import { ErrorToastService } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import {
-  GenericInputComponent,
-  GenericInputOptions,
-} from 'src/app/modals/generic-input/generic-input.component'
 
 @Component({
   selector: 'ssh-keys',
@@ -23,10 +19,10 @@ export class SSHKeysPage {
   readonly docsUrl = 'https://docs.start9.com/0.3.5.x/user-manual/ssh'
 
   constructor(
-    private readonly loadingCtrl: LoadingController,
-    private readonly modalCtrl: ModalController,
-    private readonly errToast: ErrorToastService,
-    private readonly alertCtrl: AlertController,
+    private readonly cdr: ChangeDetectorRef,
+    private readonly loader: LoadingService,
+    private readonly dialogs: TuiDialogService,
+    private readonly errorService: ErrorService,
     private readonly embassyApi: ApiService,
   ) {}
 
@@ -38,89 +34,62 @@ export class SSHKeysPage {
     try {
       this.sshKeys = await this.embassyApi.getSshKeys({})
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
   }
 
-  async presentModalAdd() {
-    const { name, description } = sshSpec
+  add() {
+    this.dialogs
+      .open<string>(PROMPT, ADD_OPTIONS)
+      .pipe(take(1))
+      .subscribe(async key => {
+        const loader = this.loader.open('Saving...').subscribe()
 
-    const options: GenericInputOptions = {
-      title: name,
-      message: description,
-      label: name,
-      submitFn: (pk: string) => this.add(pk),
-    }
-
-    const modal = await this.modalCtrl.create({
-      component: GenericInputComponent,
-      componentProps: { options },
-      cssClass: 'alertlike-modal',
-    })
-    await modal.present()
+        try {
+          this.sshKeys?.push(await this.embassyApi.addSshKey({ key }))
+        } finally {
+          loader.unsubscribe()
+          this.cdr.markForCheck()
+        }
+      })
   }
 
-  async add(pubkey: string): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Saving...',
-    })
-    await loader.present()
-
-    try {
-      const key = await this.embassyApi.addSshKey({ key: pubkey })
-      this.sshKeys.push(key)
-    } finally {
-      loader.dismiss()
-    }
-  }
+  delete(key: SSHKey) {
+    this.dialogs
+      .open(TUI_PROMPT, DELETE_OPTIONS)
+      .pipe(filter(Boolean))
+      .subscribe(async () => {
+        const loader = this.loader.open('Deleting...').subscribe()
 
-  async presentAlertDelete(i: number) {
-    const alert = await this.alertCtrl.create({
-      header: 'Caution',
-      message: `Are you sure you want to delete this key?`,
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Delete',
-          handler: () => {
-            this.delete(i)
-          },
-          cssClass: 'enter-click',
-        },
-      ],
-    })
-    await alert.present()
+        try {
+          await this.embassyApi.deleteSshKey({ fingerprint: key.fingerprint })
+          this.sshKeys?.splice(this.sshKeys?.indexOf(key), 1)
+        } catch (e: any) {
+          this.errorService.handleError(e)
+        } finally {
+          loader.unsubscribe()
+          this.cdr.markForCheck()
+        }
+      })
   }
+}
 
-  async delete(i: number): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Deleting...',
-    })
-    await loader.present()
-
-    try {
-      const entry = this.sshKeys[i]
-      await this.embassyApi.deleteSshKey({ fingerprint: entry.fingerprint })
-      this.sshKeys.splice(i, 1)
-    } catch (e: any) {
-      this.errToast.present(e)
-    } finally {
-      loader.dismiss()
-    }
-  }
+const ADD_OPTIONS: Partial<TuiDialogOptions<{ message: string }>> = {
+  label: 'SSH Key',
+  data: {
+    message:
+      'Enter the SSH public key you would like to authorize for root access to your Embassy.',
+  },
 }
 
-const sshSpec = {
-  type: 'string',
-  name: 'SSH Key',
-  description:
-    'Enter the SSH public key you would like to authorize for root access to your server.',
-  nullable: false,
-  masked: false,
-  copyable: false,
+const DELETE_OPTIONS: Partial<TuiDialogOptions<TuiPromptData>> = {
+  label: 'Confirm',
+  size: 's',
+  data: {
+    content: 'Delete key? This action cannot be undone.',
+    yes: 'Delete',
+    no: 'Cancel',
+  },
 }
diff --git a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
index e6d5da252..0a1f6a7d9 100644
--- a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
@@ -2,19 +2,23 @@ import { Component, Inject } from '@angular/core'
 import {
   ActionSheetController,
   AlertController,
-  LoadingController,
-  ModalController,
   ToastController,
 } from '@ionic/angular'
-import { AlertInput } from '@ionic/core'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { ActionSheetButton } from '@ionic/core'
-import { ValueSpecObject } from 'src/app/pkg-config/config-types'
+import { ActionSheetButton, AlertInput } from '@ionic/core'
+import { WINDOW } from '@ng-web-apis/common'
+import { ErrorService, LoadingService, pauseFor } from '@start9labs/shared'
+import { CT } from '@start9labs/start-sdk'
+import { TuiDialogOptions } from '@taiga-ui/core'
+import { FormComponent, FormContext } from 'src/app/components/form.component'
 import { RR } from 'src/app/services/api/api.types'
-import { pauseFor, ErrorToastService } from '@start9labs/shared'
-import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
-import { WINDOW } from '@ng-web-apis/common'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
+
+export interface WiFiForm {
+  ssid: string
+  password: string
+}
 
 @Component({
   selector: 'wifi',
@@ -32,9 +36,9 @@ export class WifiPage {
     private readonly api: ApiService,
     private readonly toastCtrl: ToastController,
     private readonly alertCtrl: AlertController,
-    private readonly loadingCtrl: LoadingController,
-    private readonly modalCtrl: ModalController,
-    private readonly errToast: ErrorToastService,
+    private readonly loader: LoadingService,
+    private readonly formDialog: FormDialogService,
+    private readonly errorService: ErrorService,
     private readonly actionCtrl: ActionSheetController,
     private readonly config: ConfigService,
     @Inject(WINDOW) private readonly windowRef: Window,
@@ -60,7 +64,7 @@ export class WifiPage {
         await this.presentAlertCountry()
       }
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
       this.loading = false
     }
@@ -120,30 +124,25 @@ export class WifiPage {
 
   async presentModalAdd(ssid?: string, needsPW: boolean = true) {
     const wifiSpec = getWifiValueSpec(ssid, needsPW)
-    const modal = await this.modalCtrl.create({
-      component: GenericFormPage,
-      componentProps: {
-        title: wifiSpec.name,
+    const options: Partial<TuiDialogOptions<FormContext<WiFiForm>>> = {
+      label: wifiSpec.name,
+      data: {
         spec: wifiSpec.spec,
         buttons: [
           {
             text: 'Save for Later',
-            handler: async (value: { ssid: string; password: string }) => {
-              await this.save(value.ssid, value.password)
-            },
+            handler: async ({ ssid, password }) => this.save(ssid, password),
           },
           {
             text: 'Save and Connect',
-            handler: async (value: { ssid: string; password: string }) => {
-              await this.saveAndConnect(value.ssid, value.password)
-            },
-            isSubmit: true,
+            handler: async ({ ssid, password }) =>
+              this.saveAndConnect(ssid, password),
           },
         ],
       },
-    })
+    }
 
-    await modal.present()
+    this.formDialog.open(FormComponent, options)
   }
 
   async presentAction(ssid: string) {
@@ -179,19 +178,16 @@ export class WifiPage {
   }
 
   private async setCountry(country: string): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Setting country...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Setting country...').subscribe()
 
     try {
       await this.api.setWifiCountry({ country })
       await this.getWifi()
       this.wifi.country = country
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
@@ -270,43 +266,36 @@ export class WifiPage {
   }
 
   private async connect(ssid: string): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Connecting. This could take a while...',
-    })
-    await loader.present()
+    const loader = this.loader
+      .open('Connecting. This could take a while...')
+      .subscribe()
 
     try {
       await this.api.connectWifi({ ssid })
       await this.confirmWifi(ssid)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async delete(ssid: string): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Deleting...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Deleting...').subscribe()
 
     try {
       await this.api.deleteWifi({ ssid })
       await this.getWifi()
       delete this.wifi.ssids[ssid]
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async save(ssid: string, password: string): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Saving...',
-    })
-    await loader.present()
+    const loader = this.loader.open('Saving...').subscribe()
 
     try {
       await this.api.addWifi({
@@ -317,17 +306,16 @@ export class WifiPage {
       })
       await this.getWifi()
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 
   private async saveAndConnect(ssid: string, password: string): Promise<void> {
-    const loader = await this.loadingCtrl.create({
-      message: 'Connecting. This could take a while...',
-    })
-    await loader.present()
+    const loader = this.loader
+      .open('Connecting. This could take a while...')
+      .subscribe()
 
     try {
       await this.api.addWifi({
@@ -339,39 +327,62 @@ export class WifiPage {
 
       await this.confirmWifi(ssid, true)
     } catch (e: any) {
-      this.errToast.present(e)
+      this.errorService.handleError(e)
     } finally {
-      loader.dismiss()
+      loader.unsubscribe()
     }
   }
 }
 
 function getWifiValueSpec(
-  ssid?: string,
+  ssid: string | null = null,
   needsPW: boolean = true,
-): ValueSpecObject {
+): CT.ValueSpecObject {
   return {
+    warning: null,
     type: 'object',
     name: 'WiFi Credentials',
     description:
       'Enter the network SSID and password. You can connect now or save the network for later.',
     spec: {
       ssid: {
-        type: 'string',
+        type: 'text',
+        minLength: null,
+        maxLength: null,
+        patterns: [],
         name: 'Network SSID',
-        nullable: false,
+        description: null,
+        inputmode: 'text',
+        placeholder: null,
+        required: true,
         masked: false,
-        copyable: false,
         default: ssid,
+        warning: null,
+        disabled: false,
+        immutable: false,
+        generate: null,
       },
       password: {
-        type: 'string',
+        type: 'text',
+        minLength: null,
+        maxLength: null,
+        patterns: [
+          {
+            regex: '^.{8,}$',
+            description: 'Must be longer than 8 characters',
+          },
+        ],
         name: 'Password',
-        nullable: !needsPW,
+        description: null,
+        inputmode: 'text',
+        placeholder: null,
+        required: needsPW,
         masked: true,
-        copyable: false,
-        pattern: '^.{8,}$',
-        'pattern-description': 'Must be longer than 8 characters',
+        default: null,
+        warning: null,
+        disabled: false,
+        immutable: false,
+        generate: null,
       },
     },
   }
diff --git a/web/projects/ui/src/app/pkg-config/config-types.ts b/web/projects/ui/src/app/pkg-config/config-types.ts
deleted file mode 100644
index f73dbc0a4..000000000
--- a/web/projects/ui/src/app/pkg-config/config-types.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-export type ConfigSpec = Record<string, ValueSpec>
-
-export type ValueType =
-  | 'string'
-  | 'number'
-  | 'boolean'
-  | 'enum'
-  | 'list'
-  | 'object'
-  | 'pointer'
-  | 'union'
-export type ValueSpec = ValueSpecOf<ValueType>
-
-// core spec types. These types provide the metadata for performing validations
-export type ValueSpecOf<T extends ValueType> = T extends 'string'
-  ? ValueSpecString
-  : T extends 'number'
-  ? ValueSpecNumber
-  : T extends 'boolean'
-  ? ValueSpecBoolean
-  : T extends 'enum'
-  ? ValueSpecEnum
-  : T extends 'list'
-  ? ValueSpecList
-  : T extends 'object'
-  ? ValueSpecObject
-  : T extends 'union'
-  ? ValueSpecUnion
-  : never
-
-export interface ValueSpecString extends ListValueSpecString, WithStandalone {
-  type: 'string'
-  default?: DefaultString
-  nullable: boolean
-  textarea?: boolean
-}
-
-export interface ValueSpecNumber extends ListValueSpecNumber, WithStandalone {
-  type: 'number'
-  nullable: boolean
-  default?: number
-}
-
-export interface ValueSpecEnum extends ListValueSpecEnum, WithStandalone {
-  type: 'enum'
-  default: string
-}
-
-export interface ValueSpecBoolean extends WithStandalone {
-  type: 'boolean'
-  default: boolean
-}
-
-export interface ValueSpecUnion {
-  type: 'union'
-  tag: UnionTagSpec
-  variants: { [key: string]: ConfigSpec }
-  default: string
-}
-
-export interface ValueSpecObject extends WithStandalone {
-  type: 'object'
-  spec: ConfigSpec
-}
-
-export interface WithStandalone {
-  name: string
-  description?: string
-  warning?: string
-}
-
-// no lists of booleans, lists, pointers
-export type ListValueSpecType =
-  | 'string'
-  | 'number'
-  | 'enum'
-  | 'object'
-  | 'union'
-
-// represents a spec for the values of a list
-export type ListValueSpecOf<T extends ListValueSpecType> = T extends 'string'
-  ? ListValueSpecString
-  : T extends 'number'
-  ? ListValueSpecNumber
-  : T extends 'enum'
-  ? ListValueSpecEnum
-  : T extends 'object'
-  ? ListValueSpecObject
-  : T extends 'union'
-  ? ListValueSpecUnion
-  : never
-
-// represents a spec for a list
-export type ValueSpecList = ValueSpecListOf<ListValueSpecType>
-export interface ValueSpecListOf<T extends ListValueSpecType>
-  extends WithStandalone {
-  type: 'list'
-  subtype: T
-  spec: ListValueSpecOf<T>
-  range: string // '[0,1]' (inclusive) OR '[0,*)' (right unbounded), normal math rules
-  default: string[] | number[] | DefaultString[] | object[]
-}
-
-// sometimes the type checker needs just a little bit of help
-export function isValueSpecListOf<S extends ListValueSpecType>(
-  t: ValueSpecList,
-  s: S,
-): t is ValueSpecListOf<S> {
-  return t.subtype === s
-}
-
-export interface ListValueSpecString {
-  pattern?: string
-  'pattern-description'?: string
-  masked: boolean
-  copyable: boolean
-  placeholder?: string
-}
-
-export interface ListValueSpecNumber {
-  range: string
-  integral: boolean
-  units?: string
-  placeholder?: string
-}
-
-export interface ListValueSpecEnum {
-  values: string[]
-  'value-names': { [value: string]: string }
-}
-
-export interface ListValueSpecObject {
-  spec: ConfigSpec // this is a mapped type of the config object at this level, replacing the object's values with specs on those values
-  'unique-by': UniqueBy // indicates whether duplicates can be permitted in the list
-  'display-as'?: string // this should be a handlebars template which can make use of the entire config which corresponds to 'spec'
-}
-
-export type UniqueBy = null | string | { any: UniqueBy[] } | { all: UniqueBy[] }
-
-export interface ListValueSpecUnion {
-  tag: UnionTagSpec
-  variants: { [key: string]: ConfigSpec }
-  'display-as'?: string // this may be a handlebars template which can conditionally (on tag.id) make use of each union's entries, or if left blank will display as tag.id
-  'unique-by': UniqueBy
-  default: string // this should be the variantName which one prefers a user to start with by default when creating a new union instance in a list
-}
-
-export interface UnionTagSpec {
-  id: string // The name of the field containing one of the union variants
-  'variant-names': {
-    // the name of each variant
-    [variant: string]: string
-  }
-  name: string
-  description?: string
-  warning?: string
-}
-
-export type DefaultString = string | { charset: string; len: number }
diff --git a/web/projects/ui/src/app/pkg-config/config-utilities.ts b/web/projects/ui/src/app/pkg-config/config-utilities.ts
deleted file mode 100644
index 431bc1c5d..000000000
--- a/web/projects/ui/src/app/pkg-config/config-utilities.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import { ValueSpec, DefaultString } from './config-types'
-
-export class Range {
-  min?: number
-  max?: number
-  minInclusive!: boolean
-  maxInclusive!: boolean
-
-  static from(s: string): Range {
-    const r = new Range()
-    r.minInclusive = s.startsWith('[')
-    r.maxInclusive = s.endsWith(']')
-    const [minStr, maxStr] = s.split(',').map(a => a.trim())
-    r.min = minStr === '(*' ? undefined : Number(minStr.slice(1))
-    r.max = maxStr === '*)' ? undefined : Number(maxStr.slice(0, -1))
-    return r
-  }
-
-  checkIncludes(n: number) {
-    if (
-      this.hasMin() &&
-      (this.min > n || (!this.minInclusive && this.min == n))
-    ) {
-      throw new Error(this.minMessage())
-    }
-    if (
-      this.hasMax() &&
-      (this.max < n || (!this.maxInclusive && this.max == n))
-    ) {
-      throw new Error(this.maxMessage())
-    }
-  }
-
-  hasMin(): this is Range & { min: number } {
-    return this.min !== undefined
-  }
-
-  hasMax(): this is Range & { max: number } {
-    return this.max !== undefined
-  }
-
-  minMessage(): string {
-    return `greater than${this.minInclusive ? ' or equal to' : ''} ${this.min}`
-  }
-
-  maxMessage(): string {
-    return `less than${this.maxInclusive ? ' or equal to' : ''} ${this.max}`
-  }
-
-  description(): string {
-    let message = 'Value can be any number.'
-
-    if (this.hasMin() || this.hasMax()) {
-      message = 'Value must be'
-    }
-
-    if (this.hasMin() && this.hasMax()) {
-      message = `${message} ${this.minMessage()} AND ${this.maxMessage()}.`
-    } else if (this.hasMin() && !this.hasMax()) {
-      message = `${message} ${this.minMessage()}.`
-    } else if (!this.hasMin() && this.hasMax()) {
-      message = `${message} ${this.maxMessage()}.`
-    }
-
-    return message
-  }
-
-  integralMin(): number | undefined {
-    if (this.min) {
-      const ceil = Math.ceil(this.min)
-      if (this.minInclusive) {
-        return ceil
-      } else {
-        if (ceil === this.min) {
-          return ceil + 1
-        } else {
-          return ceil
-        }
-      }
-    }
-  }
-
-  integralMax(): number | undefined {
-    if (this.max) {
-      const floor = Math.floor(this.max)
-      if (this.maxInclusive) {
-        return floor
-      } else {
-        if (floor === this.max) {
-          return floor - 1
-        } else {
-          return floor
-        }
-      }
-    }
-  }
-}
-
-export function getDefaultDescription(spec: ValueSpec): string {
-  let toReturn: string | undefined
-  switch (spec.type) {
-    case 'string':
-      if (typeof spec.default === 'string') {
-        toReturn = spec.default
-      } else if (typeof spec.default === 'object') {
-        toReturn = 'random'
-      }
-      break
-    case 'number':
-      if (typeof spec.default === 'number') {
-        toReturn = String(spec.default)
-      }
-      break
-    case 'boolean':
-      toReturn = spec.default === true ? 'True' : 'False'
-      break
-    case 'enum':
-      toReturn = spec['value-names'][spec.default]
-      break
-  }
-
-  return toReturn || ''
-}
-
-export function getDefaultString(defaultSpec: DefaultString): string {
-  if (typeof defaultSpec === 'string') {
-    return defaultSpec
-  } else {
-    let s = ''
-    for (let i = 0; i < defaultSpec.len; i++) {
-      s = s + getRandomCharInSet(defaultSpec.charset)
-    }
-
-    return s
-  }
-}
-
-// a,g,h,A-Z,,,,-
-export function getRandomCharInSet(charset: string): string {
-  const set = stringToCharSet(charset)
-  let charIdx = Math.floor(Math.random() * set.len)
-  for (let range of set.ranges) {
-    if (range.len > charIdx) {
-      return String.fromCharCode(range.start.charCodeAt(0) + charIdx)
-    }
-    charIdx -= range.len
-  }
-  throw new Error('unreachable')
-}
-
-function stringToCharSet(charset: string): CharSet {
-  let set: CharSet = { ranges: [], len: 0 }
-  let start: string | null = null
-  let end: string | null = null
-  let in_range = false
-  for (let char of charset) {
-    switch (char) {
-      case ',':
-        if (start !== null && end !== null) {
-          if (start!.charCodeAt(0) > end!.charCodeAt(0)) {
-            throw new Error('start > end of charset')
-          }
-          const len = end.charCodeAt(0) - start.charCodeAt(0) + 1
-          set.ranges.push({
-            start,
-            end,
-            len,
-          })
-          set.len += len
-          start = null
-          end = null
-          in_range = false
-        } else if (start !== null && !in_range) {
-          set.len += 1
-          set.ranges.push({ start, end: start, len: 1 })
-          start = null
-        } else if (start !== null && in_range) {
-          end = ','
-        } else if (start === null && end === null && !in_range) {
-          start = ','
-        } else {
-          throw new Error('unexpected ","')
-        }
-        break
-      case '-':
-        if (start === null) {
-          start = '-'
-        } else if (!in_range) {
-          in_range = true
-        } else if (in_range && end === null) {
-          end = '-'
-        } else {
-          throw new Error('unexpected "-"')
-        }
-        break
-      default:
-        if (start === null) {
-          start = char
-        } else if (in_range && end === null) {
-          end = char
-        } else {
-          throw new Error(`unexpected "${char}"`)
-        }
-    }
-  }
-  if (start !== null && end !== null) {
-    if (start!.charCodeAt(0) > end!.charCodeAt(0)) {
-      throw new Error('start > end of charset')
-    }
-    const len = end.charCodeAt(0) - start.charCodeAt(0) + 1
-    set.ranges.push({
-      start,
-      end,
-      len,
-    })
-    set.len += len
-  } else if (start !== null) {
-    set.len += 1
-    set.ranges.push({
-      start,
-      end: start,
-      len: 1,
-    })
-  }
-  return set
-}
-
-interface CharSet {
-  ranges: {
-    start: string
-    end: string
-    len: number
-  }[]
-  len: number
-}
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index acebdfdfb..e10c682c3 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -6,7 +6,8 @@ import { Metric, NotificationLevel, RR, ServerNotifications } from './api.types'
 import { BTC_ICON, LND_ICON, PROXY_ICON } from './api-icons'
 import { DependencyMetadata, MarketplacePkg } from '@start9labs/marketplace'
 import { Log } from '@start9labs/shared'
-import { T } from '@start9labs/start-sdk'
+import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
+import { T, CB } from '@start9labs/start-sdk'
 
 export module Mock {
   export const ServerUpdated: T.ServerStatus = {
@@ -716,651 +717,512 @@ export module Mock {
     },
   }
 
-  export const ConfigSpec: RR.GetPackageConfigRes['spec'] = {
-    bitcoin: {
-      type: 'object',
-      name: 'Bitcoin Settings',
-      description:
-        'RPC and P2P interface configuration options for Bitcoin Core',
-      spec: {
-        'bitcoind-p2p': {
-          type: 'union',
-          tag: {
-            id: 'type',
-            name: 'Bitcoin Core P2P',
+  export const getInputSpec = async (): Promise<
+    RR.GetPackageConfigRes['spec']
+  > =>
+    configBuilderToSpec(
+      CB.Config.of({
+        bitcoin: CB.Value.object(
+          {
+            name: 'Bitcoin Settings',
             description:
-              '<p>The Bitcoin Core node to connect to over the peer-to-peer (P2P) interface:</p><ul><li><strong>Bitcoin Core</strong>: The Bitcoin Core service installed on this device</li><li><strong>External Node</strong>: A Bitcoin node running on a different device</li></ul>',
-            'variant-names': {
-              internal: 'Bitcoin Core',
-              external: 'External Node',
-            },
+              'RPC and P2P interface configuration options for Bitcoin Core',
           },
-          default: 'internal',
-          variants: {
-            internal: {},
-            external: {
-              'p2p-host': {
-                type: 'string',
-                name: 'Public Address',
-                description: 'The public address of your Bitcoin Core server',
-                nullable: false,
-                masked: false,
-                copyable: false,
-              },
-              'p2p-port': {
-                type: 'number',
-                name: 'P2P Port',
+          CB.Config.of({
+            'bitcoind-p2p': CB.Value.union(
+              {
+                name: 'P2P Settings',
                 description:
-                  'The port that your Bitcoin Core P2P server is bound to',
-                nullable: false,
-                range: '[0,65535]',
-                integral: true,
-                default: 8333,
+                  '<p>The Bitcoin Core node to connect to over the peer-to-peer (P2P) interface:</p><ul><li><strong>Bitcoin Core</strong>: The Bitcoin Core service installed on this device</li><li><strong>External Node</strong>: A Bitcoin node running on a different device</li></ul>',
+                required: { default: 'internal' },
               },
-            },
-          },
-        },
-      },
-    },
-    advanced: {
-      name: 'Advanced',
-      type: 'object',
-      description: 'Advanced settings',
-      spec: {
-        rpcsettings: {
-          name: 'RPC Settings',
-          type: 'object',
-          description: 'rpc username and password',
-          warning:
-            'Adding RPC users gives them special permissions on your node.',
-          spec: {
-            rpcuser2: {
-              name: 'RPC Username',
-              type: 'string',
-              description: 'rpc username',
-              nullable: false,
-              default: 'defaultrpcusername',
-              pattern: '^[a-zA-Z]+$',
-              'pattern-description': 'must contain only letters.',
-              masked: false,
-              copyable: true,
-            },
-            rpcuser: {
-              name: 'RPC Username',
-              type: 'string',
-              description: 'rpc username',
-              nullable: false,
-              default: 'defaultrpcusername',
-              pattern: '^[a-zA-Z]+$',
-              'pattern-description': 'must contain only letters.',
-              masked: false,
-              copyable: true,
-            },
-            rpcpass: {
-              name: 'RPC User Password',
-              type: 'string',
-              description: 'rpc password',
-              nullable: false,
-              default: {
-                charset: 'a-z,A-Z,2-9',
-                len: 20,
-              },
-              masked: true,
-              copyable: true,
-            },
-            rpcpass2: {
-              name: 'RPC User Password',
-              type: 'string',
-              description: 'rpc password',
-              nullable: false,
-              default: {
-                charset: 'a-z,A-Z,2-9',
-                len: 20,
-              },
-              masked: true,
-              copyable: true,
-            },
-          },
-        },
-      },
-    },
-    testnet: {
-      name: 'Testnet',
-      type: 'boolean',
-      description:
-        '<ul><li>determines whether your node is running on testnet or mainnet</li></ul><script src="fake"></script>',
-      warning: 'Chain will have to resync!',
-      default: true,
-    },
-    'object-list': {
-      name: 'Object List',
-      type: 'list',
-      subtype: 'object',
-      description: 'This is a list of objects, like users or something',
-      range: '[0,4]',
-      default: [
-        {
-          'first-name': 'Admin',
-          'last-name': 'User',
-          age: 40,
-        },
-        {
-          'first-name': 'Admin2',
-          'last-name': 'User',
-          age: 40,
-        },
-      ],
-      // the outer spec here, at the list level, says that what's inside (the inner spec) pertains to its inner elements.
-      // it just so happens that ValueSpecObject's have the field { spec: ConfigSpec }
-      // see 'union-list' below for a different example.
-      spec: {
-        'unique-by': 'last-name',
-        'display-as': `I'm {{last-name}}, {{first-name}} {{last-name}}`,
-        spec: {
-          'first-name': {
-            name: 'First Name',
-            type: 'string',
-            description: 'User first name',
-            nullable: true,
-            masked: false,
-            copyable: false,
-          },
-          'last-name': {
-            name: 'Last Name',
-            type: 'string',
-            description: 'User first name',
-            nullable: true,
-            default: {
-              charset: 'a-g,2-9',
-              len: 12,
-            },
-            pattern: '^[a-zA-Z]+$',
-            'pattern-description': 'must contain only letters.',
-            masked: false,
-            copyable: true,
-          },
-          age: {
-            name: 'Age',
-            type: 'number',
-            description: 'The age of the user',
-            nullable: true,
-            integral: false,
-            warning: 'User must be at least 18.',
-            range: '[18,*)',
+              CB.Variants.of({
+                internal: { name: 'Bitcoin Core', spec: CB.Config.of({}) },
+                external: {
+                  name: 'External Node',
+                  spec: CB.Config.of({
+                    'p2p-host': CB.Value.text({
+                      name: 'Public Address',
+                      required: {
+                        default: null,
+                      },
+                      description:
+                        'The public address of your Bitcoin Core server',
+                    }),
+                    'p2p-port': CB.Value.number({
+                      name: 'P2P Port',
+                      description:
+                        'The port that your Bitcoin Core P2P server is bound to',
+                      required: {
+                        default: 8333,
+                      },
+                      min: 0,
+                      max: 65535,
+                      integer: true,
+                    }),
+                  }),
+                },
+              }),
+            ),
+          }),
+        ),
+        color: CB.Value.color({
+          name: 'Color',
+          required: false,
+        }),
+        datetime: CB.Value.datetime({
+          name: 'Datetime',
+          required: false,
+        }),
+        file: CB.Value.file({
+          name: 'File',
+          required: false,
+          extensions: ['png', 'pdf'],
+        }),
+        users: CB.Value.multiselect({
+          name: 'Users',
+          default: [],
+          maxLength: 2,
+          disabled: ['matt'],
+          values: {
+            matt: 'Matt Hill',
+            alex: 'Alex Inkin',
+            blue: 'Blue J',
+            lucy: 'Lucy',
           },
-        },
-      },
-    },
-    'union-list': {
-      name: 'Union List',
-      type: 'list',
-      subtype: 'union',
-      description: 'This is a sample list of unions',
-      warning: 'If you change this, things may work.',
-      // a list of union selections. e.g. 'summer', 'winter',...
-      default: ['summer'],
-      range: '[0, 2]',
-      spec: {
-        tag: {
-          id: 'preference',
-          'variant-names': {
-            summer: 'Summer',
-            winter: 'Winter',
-            other: 'Other',
+        }),
+        advanced: CB.Value.object(
+          {
+            name: 'Advanced',
+            description: 'Advanced settings',
           },
-          name: 'Preference',
-        },
-        // this default is used to make a union selection when a new list element is first created
-        default: 'summer',
-        variants: {
-          summer: {
-            'favorite-tree': {
-              name: 'Favorite Tree',
-              type: 'string',
-              nullable: false,
-              description: 'What is your favorite tree?',
-              default: 'Maple',
-              masked: false,
-              copyable: false,
-            },
-            'favorite-flower': {
-              name: 'Favorite Flower',
-              type: 'enum',
-              description: 'Select your favorite flower',
-              'value-names': {
-                none: 'Hate Flowers',
-                red: 'Red',
-                blue: 'Blue',
-                purple: 'Purple',
+          CB.Config.of({
+            rpcsettings: CB.Value.object(
+              {
+                name: 'RPC Settings',
+                description: 'rpc username and password',
+                warning:
+                  'Adding RPC users gives them special permissions on your node.',
               },
-              values: ['none', 'red', 'blue', 'purple'],
-              default: 'none',
-            },
-          },
-          winter: {
-            'like-snow': {
-              name: 'Like Snow?',
-              type: 'boolean',
-              description: 'Do you like snow or not?',
-              default: true,
-            },
-          },
-        },
-        'unique-by': 'preference',
-      },
-    },
-    'random-enum': {
-      name: 'Random Enum',
-      type: 'enum',
-      'value-names': {
-        null: 'Null',
-        option1: 'One 1',
-        option2: 'Two 2',
-        option3: 'Three 3',
-      },
-      default: 'null',
-      description: 'This is not even real.',
-      warning: 'Be careful changing this!',
-      values: ['null', 'option1', 'option2', 'option3'],
-    },
-    'favorite-number': {
-      name: 'Favorite Number',
-      type: 'number',
-      integral: false,
-      description: 'Your favorite number of all time',
-      warning:
-        'Once you set this number, it can never be changed without severe consequences.',
-      nullable: true,
-      default: 7,
-      range: '(-100,100]',
-      units: 'BTC',
-    },
-    'unlucky-numbers': {
-      name: 'Unlucky Numbers',
-      type: 'list',
-      subtype: 'number',
-      description: 'Numbers that you like but are not your top favorite.',
-      spec: {
-        integral: false,
-        range: '[-100,200)',
-      },
-      range: '[0,10]',
-      default: [2, 3],
-    },
-    rpcsettings: {
-      name: 'RPC Settings',
-      type: 'object',
-      description: 'rpc username and password',
-      warning: 'Adding RPC users gives them special permissions on your node.',
-      spec: {
-        laws: {
-          name: 'Laws',
-          type: 'object',
-          description: 'the law of the realm',
-          spec: {
-            law1: {
-              name: 'First Law',
-              type: 'string',
-              description: 'the first law',
-              nullable: true,
-              masked: false,
-              copyable: true,
+              CB.Config.of({
+                rpcuser2: CB.Value.text({
+                  name: 'RPC Username',
+                  required: {
+                    default: 'defaultrpcusername',
+                  },
+                  description: 'rpc username',
+                  patterns: [
+                    {
+                      regex: '^[a-zA-Z]+$',
+                      description: 'must contain only letters.',
+                    },
+                  ],
+                }),
+                rpcuser: CB.Value.text({
+                  name: 'RPC Username',
+                  required: {
+                    default: 'defaultrpcusername',
+                  },
+                  description: 'rpc username',
+                  patterns: [
+                    {
+                      regex: '^[a-zA-Z]+$',
+                      description: 'must contain only letters.',
+                    },
+                  ],
+                }),
+                rpcpass: CB.Value.text({
+                  name: 'RPC User Password',
+                  required: {
+                    default: {
+                      charset: 'a-z,A-Z,2-9',
+                      len: 20,
+                    },
+                  },
+                  description: 'rpc password',
+                }),
+                rpcpass2: CB.Value.text({
+                  name: 'RPC User Password',
+                  required: {
+                    default: {
+                      charset: 'a-z,A-Z,2-9',
+                      len: 20,
+                    },
+                  },
+                  description: 'rpc password',
+                }),
+              }),
+            ),
+          }),
+        ),
+        testnet: CB.Value.toggle({
+          name: 'Testnet',
+          default: true,
+          description:
+            '<ul><li>determines whether your node is running on testnet or mainnet</li></ul><script src="fake"></script>',
+          warning: 'Chain will have to resync!',
+        }),
+        'object-list': CB.Value.list(
+          CB.List.obj(
+            {
+              name: 'Object List',
+              minLength: 0,
+              maxLength: 4,
+              default: [
+                // { 'first-name': 'Admin', 'last-name': 'User', age: 40 },
+                // { 'first-name': 'Admin2', 'last-name': 'User', age: 40 },
+              ],
+              description: 'This is a list of objects, like users or something',
             },
-            law2: {
-              name: 'Second Law',
-              type: 'string',
-              description: 'the second law',
-              nullable: true,
-              masked: false,
-              copyable: true,
+            {
+              spec: CB.Config.of({
+                'first-name': CB.Value.text({
+                  name: 'First Name',
+                  required: false,
+                  description: 'User first name',
+                }),
+                'last-name': CB.Value.text({
+                  name: 'Last Name',
+                  required: {
+                    default: {
+                      charset: 'a-g,2-9',
+                      len: 12,
+                    },
+                  },
+                  description: 'User first name',
+                  patterns: [
+                    {
+                      regex: '^[a-zA-Z]+$',
+                      description: 'must contain only letters.',
+                    },
+                  ],
+                }),
+                age: CB.Value.number({
+                  name: 'Age',
+                  description: 'The age of the user',
+                  warning: 'User must be at least 18.',
+                  required: false,
+                  min: 18,
+                  integer: false,
+                }),
+              }),
+              displayAs: `I'm {{last-name}}, {{first-name}} {{last-name}}`,
+              uniqueBy: 'last-name',
             },
-          },
-        },
-        rulemakers: {
-          name: 'Rule Makers',
-          type: 'list',
-          subtype: 'object',
-          description: 'the people who make the rules',
-          range: '[0,2]',
-          default: [],
-          spec: {
-            'unique-by': null,
-            spec: {
-              rulemakername: {
-                name: 'Rulemaker Name',
-                type: 'string',
-                description: 'the name of the rule maker',
-                nullable: false,
-                default: {
-                  charset: 'a-g,2-9',
-                  len: 12,
-                },
-                masked: false,
-                copyable: false,
-              },
-              rulemakerip: {
-                name: 'Rulemaker IP',
-                type: 'string',
-                description: 'the ip of the rule maker',
-                nullable: false,
-                default: '192.168.1.0',
-                pattern:
-                  '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$',
-                'pattern-description': 'may only contain numbers and periods',
-                masked: false,
-                copyable: true,
-              },
+          ),
+        ),
+        'union-list': CB.Value.list(
+          CB.List.obj(
+            {
+              name: 'Union List',
+              minLength: 0,
+              maxLength: 2,
+              default: [],
+              description: 'This is a sample list of unions',
+              warning: 'If you change this, things may work.',
             },
-          },
-        },
-        rpcuser: {
-          name: 'RPC Username',
-          type: 'string',
-          description: 'rpc username',
-          nullable: false,
-          default: 'defaultrpcusername',
-          pattern: '^[a-zA-Z]+$',
-          'pattern-description': 'must contain only letters.',
-          masked: false,
-          copyable: true,
-        },
-        rpcpass: {
-          name: 'RPC User Password',
-          type: 'string',
-          description: 'rpc password',
-          nullable: false,
-          default: {
-            charset: 'a-z,A-Z,2-9',
-            len: 20,
-          },
-          masked: true,
-          copyable: true,
-        },
-      },
-    },
-    'bitcoin-node': {
-      type: 'union',
-      default: 'internal',
-      tag: {
-        id: 'type',
-        'variant-names': {
-          internal: 'Internal',
-          external: 'External',
-        },
-        name: 'Bitcoin Node Settings',
-        description: 'Options<ul><li>Item 1</li><li>Item 2</li></ul>',
-        warning: 'Careful changing this',
-      },
-      variants: {
-        internal: {},
-        external: {
-          'emergency-contact': {
-            name: 'Emergency Contact',
-            type: 'object',
-            description: 'The person to contact in case of emergency.',
-            spec: {
-              name: {
-                type: 'string',
-                name: 'Name',
-                nullable: false,
-                masked: false,
-                copyable: false,
-                pattern: '^[a-zA-Z]+$',
-                'pattern-description': 'Must contain only letters.',
-              },
-              email: {
-                type: 'string',
-                name: 'Email',
-                nullable: false,
-                masked: false,
-                copyable: true,
-              },
+            {
+              spec: CB.Config.of({
+                /* TODO: Convert range for this value ([0, 2])*/
+                union: CB.Value.union(
+                  {
+                    name: 'Preference',
+                    description: null,
+                    warning: null,
+                    required: { default: 'summer' },
+                  },
+                  CB.Variants.of({
+                    summer: {
+                      name: 'summer',
+                      spec: CB.Config.of({
+                        'favorite-tree': CB.Value.text({
+                          name: 'Favorite Tree',
+                          required: {
+                            default: 'Maple',
+                          },
+                          description: 'What is your favorite tree?',
+                        }),
+                        'favorite-flower': CB.Value.select({
+                          name: 'Favorite Flower',
+                          description: 'Select your favorite flower',
+                          required: {
+                            default: 'none',
+                          },
+                          values: {
+                            none: 'none',
+                            red: 'red',
+                            blue: 'blue',
+                            purple: 'purple',
+                          },
+                        }),
+                      }),
+                    },
+                    winter: {
+                      name: 'winter',
+                      spec: CB.Config.of({
+                        'like-snow': CB.Value.toggle({
+                          name: 'Like Snow?',
+                          default: true,
+                          description: 'Do you like snow or not?',
+                        }),
+                      }),
+                    },
+                  }),
+                ),
+              }),
+              uniqueBy: 'preference',
             },
+          ),
+        ),
+        'random-select': CB.Value.select({
+          name: 'Random select',
+          description: 'This is not even real.',
+          warning: 'Be careful changing this!',
+          required: {
+            default: null,
           },
-          'public-domain': {
-            name: 'Public Domain',
-            type: 'string',
-            description: 'the public address of the node',
-            nullable: false,
-            default: 'bitcoinnode.com',
-            pattern: '.*',
-            'pattern-description': 'anything',
-            masked: false,
-            copyable: true,
+          values: {
+            option1: 'option1',
+            option2: 'option2',
+            option3: 'option3',
           },
-          'private-domain': {
-            name: 'Private Domain',
-            type: 'string',
-            description: 'the private address of the node',
-            nullable: false,
-            masked: true,
-            copyable: true,
-          },
-        },
-      },
-    },
-    port: {
-      name: 'Port',
-      type: 'number',
-      integral: true,
-      description:
-        'the default port for your Bitcoin node. default: 8333, testnet: 18333, regtest: 18444',
-      nullable: false,
-      default: 8333,
-      range: '(0, 9998]',
-    },
-    'favorite-slogan': {
-      name: 'Favorite Slogan',
-      type: 'string',
-      description:
-        'You most favorite slogan in the whole world, used for paying you.',
-      nullable: true,
-      masked: true,
-      copyable: true,
-    },
-    rpcallowip: {
-      name: 'RPC Allowed IPs',
-      type: 'list',
-      subtype: 'string',
-      description:
-        'external ip addresses that are authorized to access your Bitcoin node',
-      warning:
-        'Any IP you allow here will have RPC access to your Bitcoin node.',
-      range: '[1,10]',
-      default: ['192.168.1.1'],
-      spec: {
-        masked: false,
-        copyable: false,
-        pattern:
-          '((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|((^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$)|(^[a-z2-7]{16}\\.onion$)|(^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$))',
-        'pattern-description': 'must be a valid ipv4, ipv6, or domain name',
-      },
-    },
-    rpcauth: {
-      name: 'RPC Auth',
-      type: 'list',
-      subtype: 'string',
-      description: 'api keys that are authorized to access your Bitcoin node.',
-      range: '[0,*)',
-      default: [],
-      spec: {
-        masked: false,
-        copyable: false,
-      },
-    },
-    'more-advanced': {
-      name: 'More Advanced',
-      type: 'object',
-      description: 'Advanced settings',
-      spec: {
-        notifications: {
-          name: 'Notification Preferences',
-          type: 'list',
-          subtype: 'enum',
-          description: 'how you want to be notified',
-          range: '[1,3]',
-          default: ['email'],
-          spec: {
-            'value-names': {
-              email: 'EEEEmail',
-              text: 'Texxxt',
-              call: 'Ccccall',
-              push: 'PuuuusH',
-              webhook: 'WebHooookkeee',
+          disabled: ['option2'],
+        }),
+        'favorite-number':
+          /* TODO: Convert range for this value ((-100,100])*/ CB.Value.number({
+            name: 'Favorite Number',
+            description: 'Your favorite number of all time',
+            warning:
+              'Once you set this number, it can never be changed without severe consequences.',
+            required: {
+              default: 7,
             },
-            values: ['email', 'text', 'call', 'push', 'webhook'],
+            integer: false,
+            units: 'BTC',
+          }),
+        rpcsettings: CB.Value.object(
+          {
+            name: 'RPC Settings',
+            description: 'rpc username and password',
+            warning:
+              'Adding RPC users gives them special permissions on your node.',
           },
-        },
-        rpcsettings: {
-          name: 'RPC Settings',
-          type: 'object',
-          description: 'rpc username and password',
-          warning:
-            'Adding RPC users gives them special permissions on your node.',
-          spec: {
-            laws: {
-              name: 'Laws',
-              type: 'object',
-              description: 'the law of the realm',
-              spec: {
-                law1: {
+          CB.Config.of({
+            laws: CB.Value.object(
+              {
+                name: 'Laws',
+                description: 'the law of the realm',
+              },
+              CB.Config.of({
+                law1: CB.Value.text({
                   name: 'First Law',
-                  type: 'string',
+                  required: false,
                   description: 'the first law',
-                  nullable: true,
-                  masked: false,
-                  copyable: true,
-                },
-                law2: {
+                }),
+                law2: CB.Value.text({
                   name: 'Second Law',
-                  type: 'string',
+                  required: false,
                   description: 'the second law',
-                  nullable: true,
-                  masked: false,
-                  copyable: true,
+                }),
+              }),
+            ),
+            rulemakers: CB.Value.list(
+              CB.List.obj(
+                {
+                  name: 'Rule Makers',
+                  minLength: 0,
+                  maxLength: 2,
+                  description: 'the people who make the rules',
                 },
-                law4: {
-                  name: 'Fourth Law',
-                  type: 'string',
-                  description: 'the fourth law',
-                  nullable: true,
-                  masked: false,
-                  copyable: true,
-                },
-                law3: {
-                  name: 'Third Law',
-                  type: 'list',
-                  subtype: 'object',
-                  description: 'the third law',
-                  range: '[0,2]',
-                  default: [],
-                  spec: {
-                    'unique-by': null,
-                    spec: {
-                      lawname: {
-                        name: 'Law Name',
-                        type: 'string',
-                        description: 'the name of the law maker',
-                        nullable: false,
+                {
+                  spec: CB.Config.of({
+                    rulemakername: CB.Value.text({
+                      name: 'Rulemaker Name',
+                      required: {
                         default: {
                           charset: 'a-g,2-9',
                           len: 12,
                         },
-                        masked: false,
-                        copyable: false,
                       },
-                      lawagency: {
-                        name: 'Law agency',
-                        type: 'string',
-                        description: 'the ip of the law maker',
-                        nullable: false,
+                      description: 'the name of the rule maker',
+                    }),
+                    rulemakerip: CB.Value.text({
+                      name: 'Rulemaker IP',
+                      required: {
                         default: '192.168.1.0',
-                        pattern:
-                          '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$',
-                        'pattern-description':
-                          'may only contain numbers and periods',
-                        masked: false,
-                        copyable: true,
                       },
-                    },
-                  },
+                      description: 'the ip of the rule maker',
+                      patterns: [
+                        {
+                          regex:
+                            '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$',
+                          description: 'may only contain numbers and periods',
+                        },
+                      ],
+                    }),
+                  }),
+                },
+              ),
+            ),
+            rpcuser: CB.Value.text({
+              name: 'RPC Username',
+              required: {
+                default: 'defaultrpcusername',
+              },
+              description: 'rpc username',
+              patterns: [
+                {
+                  regex: '^[a-zA-Z]+$',
+                  description: 'must contain only letters.',
                 },
-                law5: {
-                  name: 'Fifth Law',
-                  type: 'string',
-                  description: 'the fifth law',
-                  nullable: true,
-                  masked: false,
-                  copyable: true,
+              ],
+            }),
+            rpcpass: CB.Value.text({
+              name: 'RPC User Password',
+              required: {
+                default: {
+                  charset: 'a-z,A-Z,2-9',
+                  len: 20,
                 },
               },
+              description: 'rpc password',
+              masked: true,
+            }),
+          }),
+        ),
+        'bitcoin-node': CB.Value.union(
+          {
+            name: 'Bitcoin Node',
+            description: 'Options<ul><li>Item 1</li><li>Item 2</li></ul>',
+            warning: 'Careful changing this',
+            required: { default: 'internal' },
+            disabled: ['fake'],
+          },
+          CB.Variants.of({
+            fake: {
+              name: 'Fake',
+              spec: CB.Config.of({}),
             },
-            rulemakers: {
-              name: 'Rule Makers',
-              type: 'list',
-              subtype: 'object',
-              description: 'the people who make the rules',
-              range: '[0,2]',
-              default: [],
-              spec: {
-                'unique-by': null,
-                spec: {
-                  rulemakername: {
-                    name: 'Rulemaker Name',
-                    type: 'string',
-                    description: 'the name of the rule maker',
-                    nullable: false,
-                    default: {
-                      charset: 'a-g,2-9',
-                      len: 12,
-                    },
-                    masked: false,
-                    copyable: false,
+            internal: {
+              name: 'Internal',
+              spec: CB.Config.of({}),
+            },
+            external: {
+              name: 'External',
+              spec: CB.Config.of({
+                'emergency-contact': CB.Value.object(
+                  {
+                    name: 'Emergency Contact',
+                    description: 'The person to contact in case of emergency.',
+                  },
+                  CB.Config.of({
+                    name: CB.Value.text({
+                      name: 'Name',
+                      required: {
+                        default: null,
+                      },
+                      patterns: [
+                        {
+                          regex: '^[a-zA-Z]+$',
+                          description: 'Must contain only letters.',
+                        },
+                      ],
+                    }),
+                    email: CB.Value.text({
+                      name: 'Email',
+                      inputmode: 'email',
+                      required: {
+                        default: null,
+                      },
+                    }),
+                  }),
+                ),
+                'public-domain': CB.Value.text({
+                  name: 'Public Domain',
+                  required: {
+                    default: 'bitcoinnode.com',
                   },
-                  rulemakerip: {
-                    name: 'Rulemaker IP',
-                    type: 'string',
-                    description: 'the ip of the rule maker',
-                    nullable: false,
-                    default: '192.168.1.0',
-                    pattern:
-                      '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$',
-                    'pattern-description':
-                      'may only contain numbers and periods',
-                    masked: false,
-                    copyable: true,
+                  description: 'the public address of the node',
+                  patterns: [
+                    {
+                      regex: '.*',
+                      description: 'anything',
+                    },
+                  ],
+                }),
+                'private-domain': CB.Value.text({
+                  name: 'Private Domain',
+                  required: {
+                    default: null,
                   },
+                  description: 'the private address of the node',
+                  masked: true,
+                  inputmode: 'url',
+                }),
+              }),
+            },
+          }),
+        ),
+        port: CB.Value.number({
+          name: 'Port',
+          description:
+            'the default port for your Bitcoin node. default: 8333, testnet: 18333, regtest: 18444',
+          required: {
+            default: 8333,
+          },
+          min: 1,
+          max: 9998,
+          step: 1,
+          integer: true,
+        }),
+        'favorite-slogan': CB.Value.text({
+          name: 'Favorite Slogan',
+          generate: {
+            charset: 'a-z,A-Z,2-9',
+            len: 20,
+          },
+          required: false,
+          description:
+            'You most favorite slogan in the whole world, used for paying you.',
+          masked: true,
+        }),
+        rpcallowip: CB.Value.list(
+          CB.List.text(
+            {
+              name: 'RPC Allowed IPs',
+              minLength: 1,
+              maxLength: 10,
+              default: ['192.168.1.1'],
+              description:
+                'external ip addresses that are authorized to access your Bitcoin node',
+              warning:
+                'Any IP you allow here will have RPC access to your Bitcoin node.',
+            },
+            {
+              patterns: [
+                {
+                  regex:
+                    '((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|((^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$)|(^[a-z2-7]{16}\\.onion$)|(^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$))',
+                  description: 'must be a valid ipv4, ipv6, or domain name',
                 },
-              },
+              ],
             },
-            rpcuser: {
-              name: 'RPC Username',
-              type: 'string',
-              description: 'rpc username',
-              nullable: false,
-              default: 'defaultrpcusername',
-              pattern: '^[a-zA-Z]+$',
-              'pattern-description': 'must contain only letters.',
-              masked: false,
-              copyable: true,
+          ),
+        ),
+        rpcauth: CB.Value.list(
+          CB.List.text(
+            {
+              name: 'RPC Auth',
+              description:
+                'api keys that are authorized to access your Bitcoin node.',
             },
-            rpcpass: {
-              name: 'RPC User Password',
-              type: 'string',
-              description: 'rpc password',
-              nullable: false,
-              default: {
-                charset: 'a-z,A-Z,2-9',
-                len: 20,
-              },
-              masked: true,
-              copyable: true,
+            {
+              patterns: [],
             },
-          },
-        },
-      },
-    },
-  }
+          ),
+        ),
+      }),
+    )
 
   export const MockConfig = {
     testnet: undefined,
@@ -1381,8 +1243,7 @@ export module Mock {
         age: 60,
       },
     ],
-    'union-list': undefined,
-    'random-enum': 'option2',
+    'random-select': ['goodbye'],
     'favorite-number': 0,
     rpcsettings: {
       laws: {
@@ -1394,7 +1255,7 @@ export module Mock {
       rulemakers: [],
     },
     'bitcoin-node': {
-      type: 'internal',
+      selection: 'internal',
     },
     port: 20,
     rpcallowip: undefined,
@@ -1477,7 +1338,107 @@ export module Mock {
       },
     },
     currentDependencies: {},
-    hosts: {},
+    hosts: {
+      abcdefg: {
+        kind: 'multi',
+        bindings: [],
+        addresses: [],
+        hostnameInfo: {
+          80: [
+            {
+              kind: 'ip',
+              networkInterfaceId: 'eth0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: null,
+                sslPort: 1234,
+              },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'wlan0',
+              public: false,
+              hostname: {
+                kind: 'local',
+                value: 'adjective-noun.local',
+                port: null,
+                sslPort: 1234,
+              },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'eth0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '192.168.10.11',
+                port: null,
+                sslPort: 1234,
+              },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'wlan0',
+              public: false,
+              hostname: {
+                kind: 'ipv4',
+                value: '10.0.0.2',
+                port: null,
+                sslPort: 1234,
+              },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'eth0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[FE80:CD00:0000:0CDE:1257:0000:211E:729CD]',
+                port: null,
+                sslPort: 1234,
+              },
+            },
+            {
+              kind: 'ip',
+              networkInterfaceId: 'wlan0',
+              public: false,
+              hostname: {
+                kind: 'ipv6',
+                value: '[FE80:CD00:0000:0CDE:1257:0000:211E:1234]',
+                port: null,
+                sslPort: 1234,
+              },
+            },
+            {
+              kind: 'onion',
+              hostname: {
+                value: 'bitcoin-p2p.onion',
+                port: 80,
+                sslPort: 443,
+              },
+            },
+          ],
+        },
+      },
+      bcdefgh: {
+        kind: 'multi',
+        bindings: [],
+        addresses: [],
+        hostnameInfo: {
+          8332: [],
+        },
+      },
+      cdefghi: {
+        kind: 'multi',
+        bindings: [],
+        addresses: [],
+        hostnameInfo: {
+          8333: [],
+        },
+      },
+    },
     storeExposedDependents: [],
     registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 96be4850b..10e8892fb 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -1,10 +1,9 @@
 import { Dump } from 'patch-db-client'
 import { MarketplacePkg, StoreInfo } from '@start9labs/marketplace'
 import { PackagePropertiesVersioned } from 'src/app/util/properties.util'
-import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
-import { T } from '@start9labs/start-sdk'
+import { CT, T } from '@start9labs/start-sdk'
 import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 
 export module RR {
@@ -223,7 +222,7 @@ export module RR {
   export type InstallPackageRes = null
 
   export type GetPackageConfigReq = { id: string } // package.config.get
-  export type GetPackageConfigRes = { spec: ConfigSpec; config: object }
+  export type GetPackageConfigRes = { spec: CT.InputSpec; config: object }
 
   export type DrySetPackageConfigReq = { id: string; config: object } // package.config.set.dry
   export type DrySetPackageConfigRes = Breakages
@@ -266,7 +265,7 @@ export module RR {
   export type DryConfigureDependencyRes = {
     oldConfig: object
     newConfig: object
-    spec: ConfigSpec
+    spec: CT.InputSpec
   }
 
   export type SideloadPackageReq = {
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 735b8f1d1..a5bce8c62 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -10,6 +10,8 @@ export abstract class ApiService {
   // for sideloading packages
   abstract uploadPackage(guid: string, body: Blob): Promise<string>
 
+  abstract uploadFile(body: Blob): Promise<string>
+
   // websocket
 
   abstract openWebsocket$<T>(
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 8cdd0d5e3..f25ee86ca 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -29,7 +29,7 @@ export class LiveApiService extends ApiService {
     @Inject(PATCH_CACHE) private readonly cache$: Observable<Dump<DataModel>>,
   ) {
     super()
-    ;(window as any).rpcClient = this
+    ; (window as any).rpcClient = this
   }
 
   // for getting static files: ex icons, instructions, licenses
@@ -53,6 +53,15 @@ export class LiveApiService extends ApiService {
     })
   }
 
+  async uploadFile(body: Blob): Promise<string> {
+    return this.httpRequest({
+      method: Method.POST,
+      body,
+      url: `/rest/upload`,
+      responseType: 'text',
+    })
+  }
+
   // websocket
 
   openWebsocket$<T>(
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 0a82ac850..284e3bab8 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -768,7 +768,7 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     return {
       config: Mock.MockConfig,
-      spec: Mock.ConfigSpec,
+      spec: await Mock.getInputSpec(),
     }
   }
 
@@ -1058,7 +1058,7 @@ export class MockApiService extends ApiService {
     return {
       oldConfig: Mock.MockConfig,
       newConfig: Mock.MockDependencyConfig,
-      spec: Mock.ConfigSpec,
+      spec: await Mock.getInputSpec(),
     }
   }
 
@@ -1070,6 +1070,11 @@ export class MockApiService extends ApiService {
     }
   }
 
+  async uploadFile(body: Blob): Promise<string> {
+    await pauseFor(2000)
+    return 'returnedhash'
+  }
+
   private async initProgress(): Promise<T.FullProgress> {
     const progress = JSON.parse(JSON.stringify(PROGRESS))
 
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 755799522..e24556771 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -185,7 +185,107 @@ export const mockPatchData: DataModel = {
         },
       },
       currentDependencies: {},
-      hosts: {},
+      hosts: {
+        abcdefg: {
+          kind: 'multi',
+          bindings: [],
+          addresses: [],
+          hostnameInfo: {
+            80: [
+              {
+                kind: 'ip',
+                networkInterfaceId: 'eth0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'wlan0',
+                public: false,
+                hostname: {
+                  kind: 'local',
+                  value: 'adjective-noun.local',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'eth0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '10.0.0.1',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'wlan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv4',
+                  value: '10.0.0.2',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'eth0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[FE80:CD00:0000:0CDE:1257:0000:211E:729CD]',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+              {
+                kind: 'ip',
+                networkInterfaceId: 'wlan0',
+                public: false,
+                hostname: {
+                  kind: 'ipv6',
+                  value: '[FE80:CD00:0000:0CDE:1257:0000:211E:1234]',
+                  port: null,
+                  sslPort: 1234,
+                },
+              },
+              {
+                kind: 'onion',
+                hostname: {
+                  value: 'bitcoin-p2p.onion',
+                  port: 80,
+                  sslPort: 443,
+                },
+              },
+            ],
+          },
+        },
+        bcdefgh: {
+          kind: 'multi',
+          bindings: [],
+          addresses: [],
+          hostnameInfo: {
+            8332: [],
+          },
+        },
+        cdefghi: {
+          kind: 'multi',
+          bindings: [],
+          addresses: [],
+          hostnameInfo: {
+            8333: [],
+          },
+        },
+      },
       storeExposedDependents: [],
       registry: 'https://registry.start9.com/',
       developerKey: 'developer-key',
diff --git a/web/projects/ui/src/app/services/form-dialog.service.ts b/web/projects/ui/src/app/services/form-dialog.service.ts
new file mode 100644
index 000000000..69df946bb
--- /dev/null
+++ b/web/projects/ui/src/app/services/form-dialog.service.ts
@@ -0,0 +1,41 @@
+import { inject, Injectable, Injector, Type } from '@angular/core'
+import { TuiDialogOptions, TuiDialogService } from '@taiga-ui/core'
+import { TuiDialogFormService, TuiPromptData } from '@taiga-ui/kit'
+import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus'
+
+const PROMPT: Partial<TuiDialogOptions<TuiPromptData>> = {
+  label: 'Unsaved Changes',
+  data: {
+    content: 'You have unsaved changes. Are you sure you want to leave?',
+    yes: 'Leave',
+    no: 'Cancel',
+  },
+}
+
+@Injectable({ providedIn: 'root' })
+export class FormDialogService {
+  private readonly dialogs = inject(TuiDialogService)
+  private readonly formService = new TuiDialogFormService(this.dialogs)
+  private readonly prompt = this.formService.withPrompt(PROMPT)
+  private readonly injector = Injector.create({
+    parent: inject(Injector),
+    providers: [
+      {
+        provide: TuiDialogFormService,
+        useValue: this.formService,
+      },
+    ],
+  })
+
+  open<T>(component: Type<any>, options: Partial<TuiDialogOptions<T>> = {}) {
+    this.dialogs
+      .open(new PolymorpheusComponent(component, this.injector), {
+        closeable: this.prompt,
+        dismissible: this.prompt,
+        ...options,
+      })
+      .subscribe({
+        complete: () => this.formService.markAsPristine(),
+      })
+  }
+}
diff --git a/web/projects/ui/src/app/services/form.service.ts b/web/projects/ui/src/app/services/form.service.ts
index ee8f0f136..3cd0ee591 100644
--- a/web/projects/ui/src/app/services/form.service.ts
+++ b/web/projects/ui/src/app/services/form.service.ts
@@ -7,24 +7,7 @@ import {
   ValidatorFn,
   Validators,
 } from '@angular/forms'
-import {
-  ConfigSpec,
-  isValueSpecListOf,
-  ListValueSpecNumber,
-  ListValueSpecObject,
-  ListValueSpecOf,
-  ListValueSpecString,
-  ListValueSpecUnion,
-  UniqueBy,
-  ValueSpec,
-  ValueSpecEnum,
-  ValueSpecList,
-  ValueSpecNumber,
-  ValueSpecObject,
-  ValueSpecString,
-  ValueSpecUnion,
-} from 'src/app/pkg-config/config-types'
-import { getDefaultString, Range } from '../pkg-config/config-utilities'
+import { CT, utils } from '@start9labs/start-sdk'
 const Mustache = require('mustache')
 
 @Injectable({
@@ -34,55 +17,54 @@ export class FormService {
   constructor(private readonly formBuilder: UntypedFormBuilder) {}
 
   createForm(
-    spec: ConfigSpec,
-    current: { [key: string]: any } = {},
+    spec: CT.InputSpec,
+    current: Record<string, any> = {},
   ): UntypedFormGroup {
     return this.getFormGroup(spec, [], current)
   }
 
-  getUnionObject(
-    spec: ValueSpecUnion | ListValueSpecUnion,
-    selection: string,
-    current?: { [key: string]: any } | null,
-  ): UntypedFormGroup {
-    const { variants, tag } = spec
-    const { name, description, warning, 'variant-names': variantNames } = tag
-
-    const enumSpec: ValueSpecEnum = {
-      type: 'enum',
-      name,
-      description,
-      warning,
+  getUnionSelectSpec(
+    spec: CT.ValueSpecUnion,
+    selection: string | null,
+  ): CT.ValueSpecSelect {
+    return {
+      ...spec,
+      type: 'select',
       default: selection,
-      values: Object.keys(variants),
-      'value-names': variantNames,
+      values: Object.fromEntries(
+        Object.entries(spec.variants).map(([key, { name }]) => [key, name]),
+      ),
     }
-    return this.getFormGroup(
-      { [spec.tag.id]: enumSpec, ...spec.variants[selection] },
-      [],
-      current,
+  }
+
+  getUnionObject(
+    spec: CT.ValueSpecUnion,
+    selected: string | null,
+  ): UntypedFormGroup {
+    const group = this.getFormGroup({
+      selection: this.getUnionSelectSpec(spec, selected),
+    })
+
+    group.setControl(
+      'value',
+      this.getFormGroup(selected ? spec.variants[selected].spec : {}),
     )
+
+    return group
   }
 
-  getListItem(spec: ValueSpecList, entry: any) {
-    const listItemValidators = getListItemValidators(spec)
-    if (isValueSpecListOf(spec, 'string')) {
-      return this.formBuilder.control(entry, listItemValidators)
-    } else if (isValueSpecListOf(spec, 'number')) {
-      return this.formBuilder.control(entry, listItemValidators)
-    } else if (isValueSpecListOf(spec, 'enum')) {
-      return this.formBuilder.control(entry)
-    } else if (isValueSpecListOf(spec, 'object')) {
-      return this.getFormGroup(spec.spec.spec, listItemValidators, entry)
-    } else if (isValueSpecListOf(spec, 'union')) {
-      return this.getUnionObject(spec.spec, spec.spec.default, entry)
+  getListItem(spec: CT.ValueSpecList, entry?: any) {
+    if (CT.isValueSpecListOf(spec, 'text')) {
+      return this.formBuilder.control(entry, stringValidators(spec.spec))
+    } else if (CT.isValueSpecListOf(spec, 'object')) {
+      return this.getFormGroup(spec.spec.spec, [], entry)
     }
   }
 
-  private getFormGroup(
-    config: ConfigSpec,
+  getFormGroup(
+    config: CT.InputSpec,
     validators: ValidatorFn[] = [],
-    current?: { [key: string]: any } | null,
+    current?: Record<string, any> | null,
   ): UntypedFormGroup {
     let group: Record<
       string,
@@ -95,150 +77,281 @@ export class FormService {
   }
 
   private getFormEntry(
-    spec: ValueSpec,
+    spec: CT.ValueSpec,
     currentValue?: any,
   ): UntypedFormGroup | UntypedFormArray | UntypedFormControl {
-    let validators: ValidatorFn[]
     let value: any
     switch (spec.type) {
-      case 'string':
-        validators = stringValidators(spec)
+      case 'text':
         if (currentValue !== undefined) {
           value = currentValue
         } else {
-          value = spec.default ? getDefaultString(spec.default) : null
+          value = spec.default ? utils.getDefaultString(spec.default) : null
         }
-        return this.formBuilder.control(value, validators)
+        return this.formBuilder.control(value, stringValidators(spec))
+      case 'textarea':
+        value = currentValue || null
+        return this.formBuilder.control(value, textareaValidators(spec))
       case 'number':
-        validators = numberValidators(spec)
         if (currentValue !== undefined) {
           value = currentValue
         } else {
           value = spec.default || null
         }
-        return this.formBuilder.control(value, validators)
+        return this.formBuilder.control(value, numberValidators(spec))
+      case 'color':
+        if (currentValue !== undefined) {
+          value = currentValue
+        } else {
+          value = spec.default || null
+        }
+        return this.formBuilder.control(value, colorValidators(spec))
+      case 'datetime':
+        if (currentValue !== undefined) {
+          value = currentValue
+        } else {
+          value = spec.default || null
+        }
+        return this.formBuilder.control(value, datetimeValidators(spec))
       case 'object':
         return this.getFormGroup(spec.spec, [], currentValue)
       case 'list':
-        validators = listValidators(spec)
         const mapped = (
           Array.isArray(currentValue) ? currentValue : (spec.default as any[])
         ).map(entry => {
           return this.getListItem(spec, entry)
         })
-        return this.formBuilder.array(mapped, validators)
+        return this.formBuilder.array(mapped, listValidators(spec))
+      case 'file':
+        return this.formBuilder.control(
+          currentValue || null,
+          fileValidators(spec),
+        )
       case 'union':
-        const currentSelection = currentValue?.[spec.tag.id]
+        const currentSelection = currentValue?.selection
         const isValid = !!spec.variants[currentSelection]
 
         return this.getUnionObject(
           spec,
           isValid ? currentSelection : spec.default,
-          isValid ? currentValue : undefined,
         )
-      case 'boolean':
-      case 'enum':
+      case 'toggle':
         value = currentValue === undefined ? spec.default : currentValue
         return this.formBuilder.control(value)
+      case 'select':
+        value = currentValue === undefined ? spec.default : currentValue
+        return this.formBuilder.control(value, selectValidators(spec))
+      case 'multiselect':
+        value = currentValue === undefined ? spec.default : currentValue
+        return this.formBuilder.control(value, multiselectValidators(spec))
       default:
         return this.formBuilder.control(null)
     }
   }
 }
 
-function getListItemValidators(spec: ValueSpecList) {
-  if (isValueSpecListOf(spec, 'string')) {
-    return stringValidators(spec.spec)
-  } else if (isValueSpecListOf(spec, 'number')) {
-    return numberValidators(spec.spec)
-  }
-}
+// function getListItemValidators(spec: CT.ValueSpecList) {
+//   if (CT.isValueSpecListOf(spec, 'text')) {
+//     return stringValidators(spec.spec)
+//   }
+// }
 
 function stringValidators(
-  spec: ValueSpecString | ListValueSpecString,
+  spec: CT.ValueSpecText | CT.ListValueSpecText,
 ): ValidatorFn[] {
   const validators: ValidatorFn[] = []
 
-  if (!(spec as ValueSpecString).nullable) {
+  if ((spec as CT.ValueSpecText).required) {
     validators.push(Validators.required)
   }
 
-  if (spec.pattern) {
-    validators.push(Validators.pattern(spec.pattern))
+  validators.push(textLengthInRange(spec.minLength, spec.maxLength))
+
+  if (spec.patterns.length) {
+    spec.patterns.forEach(p => validators.push(Validators.pattern(p.regex)))
   }
 
   return validators
 }
 
-function numberValidators(
-  spec: ValueSpecNumber | ListValueSpecNumber,
-): ValidatorFn[] {
+function textareaValidators(spec: CT.ValueSpecTextarea): ValidatorFn[] {
+  const validators: ValidatorFn[] = []
+
+  if (spec.required) {
+    validators.push(Validators.required)
+  }
+
+  validators.push(textLengthInRange(spec.minLength, spec.maxLength))
+
+  return validators
+}
+
+function colorValidators({ required }: CT.ValueSpecColor): ValidatorFn[] {
+  const validators: ValidatorFn[] = [Validators.pattern(/^#[0-9a-f]{6}$/i)]
+
+  if (required) {
+    validators.push(Validators.required)
+  }
+
+  return validators
+}
+
+function datetimeValidators({
+  required,
+  min,
+  max,
+}: CT.ValueSpecDatetime): ValidatorFn[] {
+  const validators: ValidatorFn[] = []
+
+  if (required) {
+    validators.push(Validators.required)
+  }
+
+  if (min) {
+    validators.push(datetimeMin(min))
+  }
+
+  if (max) {
+    validators.push(datetimeMax(max))
+  }
+
+  return validators
+}
+
+function numberValidators(spec: CT.ValueSpecNumber): ValidatorFn[] {
   const validators: ValidatorFn[] = []
 
   validators.push(isNumber())
 
-  if (!(spec as ValueSpecNumber).nullable) {
+  if ((spec as CT.ValueSpecNumber).required) {
     validators.push(Validators.required)
   }
 
-  if (spec.integral) {
+  if (spec.integer) {
     validators.push(isInteger())
   }
 
-  validators.push(numberInRange(spec.range))
+  validators.push(numberInRange(spec.min, spec.max))
 
   return validators
 }
 
-function listValidators(spec: ValueSpecList): ValidatorFn[] {
+function selectValidators(spec: CT.ValueSpecSelect): ValidatorFn[] {
   const validators: ValidatorFn[] = []
 
-  validators.push(listInRange(spec.range))
+  if (spec.required) {
+    validators.push(Validators.required)
+  }
+
+  return validators
+}
+
+function multiselectValidators(spec: CT.ValueSpecMultiselect): ValidatorFn[] {
+  const validators: ValidatorFn[] = []
+  validators.push(listInRange(spec.minLength, spec.maxLength))
+  return validators
+}
 
+function listValidators(spec: CT.ValueSpecList): ValidatorFn[] {
+  const validators: ValidatorFn[] = []
+  validators.push(listInRange(spec.minLength, spec.maxLength))
   validators.push(listItemIssue())
+  return validators
+}
 
-  if (!isValueSpecListOf(spec, 'enum')) {
-    validators.push(listUnique(spec))
+function fileValidators(spec: CT.ValueSpecFile): ValidatorFn[] {
+  const validators: ValidatorFn[] = []
+
+  if (spec.required) {
+    validators.push(Validators.required)
   }
 
   return validators
 }
 
-export function numberInRange(stringRange: string): ValidatorFn {
+export function numberInRange(
+  min: number | null,
+  max: number | null,
+): ValidatorFn {
   return control => {
     const value = control.value
-    if (!value) return null
-    try {
-      Range.from(stringRange).checkIncludes(value)
-      return null
-    } catch (e: any) {
-      return { numberNotInRange: { value: `Number must be ${e.message}` } }
-    }
+    if (typeof value !== 'number') return null
+    if (min && value < min)
+      return {
+        numberNotInRange: `Number must be greater than or equal to ${min}`,
+      }
+    if (max && value > max)
+      return { numberNotInRange: `Number must be less than or equal to ${max}` }
+    return null
   }
 }
 
 export function isNumber(): ValidatorFn {
-  return control =>
-    !control.value || control.value == Number(control.value)
-      ? null
-      : { notNumber: { value: control.value } }
+  return ({ value }) =>
+    !value || value == Number(value) ? null : { notNumber: 'Must be a number' }
 }
 
 export function isInteger(): ValidatorFn {
-  return control =>
-    !control.value || control.value == Math.trunc(control.value)
+  return ({ value }) =>
+    !value || value == Math.trunc(value)
       ? null
-      : { numberNotInteger: { value: control.value } }
+      : { numberNotInteger: 'Must be an integer' }
 }
 
-export function listInRange(stringRange: string): ValidatorFn {
+export function listInRange(
+  minLength: number | null,
+  maxLength: number | null,
+): ValidatorFn {
   return control => {
-    try {
-      Range.from(stringRange).checkIncludes(control.value.length)
-      return null
-    } catch (e: any) {
-      return { listNotInRange: { value: `List must be ${e.message}` } }
-    }
+    const length = control.value.length
+    if (minLength && length < minLength)
+      return {
+        listNotInRange: `List must contain at least ${minLength} entries`,
+      }
+    if (maxLength && length > maxLength)
+      return {
+        listNotInRange: `List cannot contain more than ${maxLength} entries`,
+      }
+    return null
+  }
+}
+
+export function datetimeMin(min: string): ValidatorFn {
+  return ({ value }) => {
+    if (!value) return null
+
+    const date = new Date(value.length === 5 ? `2000-01-01T${value}` : value)
+    const minDate = new Date(min.length === 5 ? `2000-01-01T${min}` : min)
+
+    return date < minDate ? { datetimeMin: `Minimum is ${min}` } : null
+  }
+}
+
+export function datetimeMax(max: string): ValidatorFn {
+  return ({ value }) => {
+    if (!value) return null
+
+    const date = new Date(value.length === 5 ? `2000-01-01T${value}` : value)
+    const maxDate = new Date(max.length === 5 ? `2000-01-01T${max}` : max)
+
+    return date > maxDate ? { datetimeMin: `Maximum is ${max}` } : null
+  }
+}
+
+export function textLengthInRange(
+  minLength: number | null,
+  maxLength: number | null,
+): ValidatorFn {
+  return control => {
+    const value = control.value
+    if (value === null || value === undefined) return null
+
+    const length = value.length
+    if (minLength && length < minLength)
+      return { listNotInRange: `Must be at least ${minLength} characters` }
+    if (maxLength && length > maxLength)
+      return { listNotInRange: `Cannot be great than ${maxLength} characters` }
+    return null
   }
 }
 
@@ -247,36 +360,33 @@ export function listItemIssue(): ValidatorFn {
     const { controls } = parentControl as UntypedFormArray
     const problemChild = controls.find(c => c.invalid)
     if (problemChild) {
-      return { listItemIssue: { value: 'Invalid entries' } }
+      return { listItemIssue: 'Invalid entries' }
     } else {
       return null
     }
   }
 }
 
-export function listUnique(spec: ValueSpecList): ValidatorFn {
+export function listUnique(spec: CT.ValueSpecList): ValidatorFn {
   return control => {
     const list = control.value
     for (let idx = 0; idx < list.length; idx++) {
       for (let idx2 = idx + 1; idx2 < list.length; idx2++) {
         if (listItemEquals(spec, list[idx], list[idx2])) {
+          const objSpec = spec.spec
           let display1: string
           let display2: string
-          let uniqueMessage = isObjectOrUnion(spec.spec)
-            ? uniqueByMessageWrapper(
-                spec.spec['unique-by'],
-                spec.spec,
-                list[idx],
-              )
+          let uniqueMessage = isObject(objSpec)
+            ? uniqueByMessageWrapper(objSpec.uniqueBy, objSpec)
             : ''
 
-          if (isObjectOrUnion(spec.spec) && spec.spec['display-as']) {
+          if (isObject(objSpec) && objSpec.displayAs) {
             display1 = `"${(Mustache as any).render(
-              spec.spec['display-as'],
+              objSpec.displayAs,
               list[idx],
             )}"`
             display2 = `"${(Mustache as any).render(
-              spec.spec['display-as'],
+              objSpec.displayAs,
               list[idx2],
             )}"`
           } else {
@@ -285,9 +395,7 @@ export function listUnique(spec: ValueSpecList): ValidatorFn {
           }
 
           return {
-            listNotUnique: {
-              value: `${display1} and ${display2} are not unique.${uniqueMessage}`,
-            },
+            listNotUnique: `${display1} and ${display2} are not unique.${uniqueMessage}`,
           }
         }
       }
@@ -296,46 +404,40 @@ export function listUnique(spec: ValueSpecList): ValidatorFn {
   }
 }
 
-function listItemEquals(spec: ValueSpecList, val1: any, val2: any): boolean {
+function listItemEquals(spec: CT.ValueSpecList, val1: any, val2: any): boolean {
   // TODO: fix types
-  switch (spec.subtype) {
-    case 'string':
-    case 'number':
-    case 'enum':
+  switch (spec.spec.type) {
+    case 'text':
       return val1 == val2
     case 'object':
-      const obj: ListValueSpecObject = spec.spec as any
-
-      return listObjEquals(obj['unique-by'], obj, val1, val2)
-    case 'union':
-      const union: ListValueSpecUnion = spec.spec as any
-
-      return unionEquals(union['unique-by'], union, val1, val2)
+      const obj = spec.spec
+      return listObjEquals(obj.uniqueBy, obj, val1, val2)
     default:
       return false
   }
 }
 
-function itemEquals(spec: ValueSpec, val1: any, val2: any): boolean {
+function itemEquals(spec: CT.ValueSpec, val1: any, val2: any): boolean {
   switch (spec.type) {
-    case 'string':
+    case 'text':
+    case 'textarea':
     case 'number':
-    case 'boolean':
-    case 'enum':
+    case 'toggle':
+    case 'select':
       return val1 == val2
     case 'object':
       // TODO: 'unique-by' does not exist on ValueSpecObject, fix types
       return objEquals(
         (spec as any)['unique-by'],
-        spec as ValueSpecObject,
+        spec as CT.ValueSpecObject,
         val1,
         val2,
       )
     case 'union':
-      // TODO: 'unique-by' does not exist on ValueSpecUnion, fix types
+      // TODO: 'unique-by' does not exist on CT.ValueSpecUnion, fix types
       return unionEquals(
         (spec as any)['unique-by'],
-        spec as ValueSpecUnion,
+        spec as CT.ValueSpecUnion,
         val1,
         val2,
       )
@@ -355,12 +457,12 @@ function itemEquals(spec: ValueSpec, val1: any, val2: any): boolean {
 }
 
 function listObjEquals(
-  uniqueBy: UniqueBy,
-  spec: ListValueSpecObject,
+  uniqueBy: CT.UniqueBy,
+  spec: CT.ListValueSpecObject,
   val1: any,
   val2: any,
 ): boolean {
-  if (uniqueBy === null) {
+  if (!uniqueBy) {
     return false
   } else if (typeof uniqueBy === 'string') {
     return itemEquals(spec.spec[uniqueBy], val1[uniqueBy], val2[uniqueBy])
@@ -383,12 +485,12 @@ function listObjEquals(
 }
 
 function objEquals(
-  uniqueBy: UniqueBy,
-  spec: ValueSpecObject,
+  uniqueBy: CT.UniqueBy,
+  spec: CT.ValueSpecObject,
   val1: any,
   val2: any,
 ): boolean {
-  if (uniqueBy === null) {
+  if (!uniqueBy) {
     return false
   } else if (typeof uniqueBy === 'string') {
     // TODO: fix types
@@ -412,20 +514,19 @@ function objEquals(
 }
 
 function unionEquals(
-  uniqueBy: UniqueBy,
-  spec: ValueSpecUnion | ListValueSpecUnion,
+  uniqueBy: CT.UniqueBy,
+  spec: CT.ValueSpecUnion,
   val1: any,
   val2: any,
 ): boolean {
-  const tagId = spec.tag.id
-  const variant = spec.variants[val1[tagId]]
-  if (uniqueBy === null) {
+  const variantSpec = spec.variants[val1.selection].spec
+  if (!uniqueBy) {
     return false
   } else if (typeof uniqueBy === 'string') {
-    if (uniqueBy === tagId) {
-      return val1[tagId] === val2[tagId]
+    if (uniqueBy === 'selection') {
+      return val1.selection === val2.selection
     } else {
-      return itemEquals(variant[uniqueBy], val1[uniqueBy], val2[uniqueBy])
+      return itemEquals(variantSpec[uniqueBy], val1[uniqueBy], val2[uniqueBy])
     }
   } else if ('any' in uniqueBy) {
     for (let subSpec of uniqueBy.any) {
@@ -446,20 +547,10 @@ function unionEquals(
 }
 
 function uniqueByMessageWrapper(
-  uniqueBy: UniqueBy,
-  spec: ListValueSpecObject | ListValueSpecUnion,
-  obj: Record<string, string>,
+  uniqueBy: CT.UniqueBy,
+  spec: CT.ListValueSpecObject,
 ) {
-  let configSpec: ConfigSpec
-  if (isUnion(spec)) {
-    const tagId = spec.tag.id
-    configSpec = {
-      [tagId]: { name: spec.tag.name } as ValueSpec,
-      ...spec.variants[obj[tagId]],
-    }
-  } else {
-    configSpec = spec.spec
-  }
+  let configSpec = spec.spec
 
   const message = uniqueByMessage(uniqueBy, configSpec)
   if (message) {
@@ -468,17 +559,17 @@ function uniqueByMessageWrapper(
 }
 
 function uniqueByMessage(
-  uniqueBy: UniqueBy,
-  configSpec: ConfigSpec,
+  uniqueBy: CT.UniqueBy,
+  configSpec: CT.InputSpec,
   outermost = true,
 ): string {
   let joinFunc
   const subSpecs: string[] = []
-  if (uniqueBy === null) {
+  if (!uniqueBy) {
     return ''
   } else if (typeof uniqueBy === 'string') {
     return configSpec[uniqueBy]
-      ? (configSpec[uniqueBy] as ValueSpecObject).name
+      ? (configSpec[uniqueBy] as CT.ValueSpecObject).name
       : uniqueBy
   } else if ('any' in uniqueBy) {
     joinFunc = ' OR '
@@ -497,20 +588,15 @@ function uniqueByMessage(
     : '(' + ret + ')'
 }
 
-function isObjectOrUnion(
-  spec: ListValueSpecOf<any>,
-): spec is ListValueSpecObject | ListValueSpecUnion {
-  // only lists of objects and unions have unique-by
-  return 'unique-by' in spec
-}
-
-function isUnion(spec: any): spec is ListValueSpecUnion {
-  // only unions have tag
-  return !!spec.tag
+function isObject(
+  spec: CT.ListValueSpecOf<any>,
+): spec is CT.ListValueSpecObject {
+  // only lists of objects have uniqueBy
+  return 'uniqueBy' in spec
 }
 
 export function convertValuesRecursive(
-  configSpec: ConfigSpec,
+  configSpec: CT.InputSpec,
   group: UntypedFormGroup,
 ) {
   Object.entries(configSpec).forEach(([key, valueSpec]) => {
@@ -522,40 +608,27 @@ export function convertValuesRecursive(
       control.setValue(
         control.value || control.value === 0 ? Number(control.value) : null,
       )
-    } else if (valueSpec.type === 'string') {
+    } else if (valueSpec.type === 'text' || valueSpec.type === 'textarea') {
       if (!control.value) control.setValue(null)
     } else if (valueSpec.type === 'object') {
       convertValuesRecursive(valueSpec.spec, group.get(key) as UntypedFormGroup)
     } else if (valueSpec.type === 'union') {
       const formGr = group.get(key) as UntypedFormGroup
-      const spec = valueSpec.variants[formGr.controls[valueSpec.tag.id].value]
+      const spec = valueSpec.variants[formGr.controls['selection'].value].spec
       convertValuesRecursive(spec, formGr)
     } else if (valueSpec.type === 'list') {
       const formArr = group.get(key) as UntypedFormArray
       const { controls } = formArr
 
-      if (valueSpec.subtype === 'number') {
-        controls.forEach(control => {
-          control.setValue(control.value ? Number(control.value) : null)
-        })
-      } else if (valueSpec.subtype === 'string') {
+      if (valueSpec.spec.type === 'text') {
         controls.forEach(control => {
           if (!control.value) control.setValue(null)
         })
-      } else if (valueSpec.subtype === 'object') {
+      } else if (valueSpec.spec.type === 'object') {
         controls.forEach(formGroup => {
-          const objectSpec = valueSpec.spec as ListValueSpecObject
+          const objectSpec = valueSpec.spec as CT.ListValueSpecObject
           convertValuesRecursive(objectSpec.spec, formGroup as UntypedFormGroup)
         })
-      } else if (valueSpec.subtype === 'union') {
-        controls.forEach(formGroup => {
-          const unionSpec = valueSpec.spec as ListValueSpecUnion
-          const spec =
-            unionSpec.variants[
-              (formGroup as UntypedFormGroup).controls[unionSpec.tag.id].value
-            ]
-          convertValuesRecursive(spec, formGroup as UntypedFormGroup)
-        })
       }
     }
   })
diff --git a/web/projects/ui/src/app/services/modal.service.ts b/web/projects/ui/src/app/services/modal.service.ts
deleted file mode 100644
index c34fce9a2..000000000
--- a/web/projects/ui/src/app/services/modal.service.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Injectable } from '@angular/core'
-import { ModalController } from '@ionic/angular'
-import { DependentInfo } from 'src/app/types/dependent-info'
-import { AppConfigPage } from 'src/app/modals/app-config/app-config.page'
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ModalService {
-  constructor(private readonly modalCtrl: ModalController) {}
-
-  async presentModalConfig(componentProps: ComponentProps): Promise<void> {
-    const modal = await this.modalCtrl.create({
-      component: AppConfigPage,
-      componentProps,
-    })
-    await modal.present()
-  }
-}
-
-interface ComponentProps {
-  pkgId: string
-  dependentInfo?: DependentInfo
-}
diff --git a/web/projects/ui/src/app/util/configBuilderToSpec.ts b/web/projects/ui/src/app/util/configBuilderToSpec.ts
new file mode 100644
index 000000000..1f75329c5
--- /dev/null
+++ b/web/projects/ui/src/app/util/configBuilderToSpec.ts
@@ -0,0 +1,9 @@
+import { CB } from '@start9labs/start-sdk'
+
+export async function configBuilderToSpec(
+  builder:
+    | CB.Config<Record<string, unknown>, unknown>
+    | CB.Config<Record<string, unknown>, never>,
+) {
+  return builder.build({} as any)
+}
diff --git a/web/projects/ui/src/index.html b/web/projects/ui/src/index.html
index 0248b7462..9c0cc2e89 100644
--- a/web/projects/ui/src/index.html
+++ b/web/projects/ui/src/index.html
@@ -21,10 +21,36 @@
     />
     <link rel="manifest" href="manifest.webmanifest" />
     <meta name="theme-color" content="#ff5b71" />
+    <style>
+      html {
+        height: 100%;
+      }
+
+      html:not(.hydrated):not(.hydrated) body {
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 1rem;
+        text-align: center;
+        color: white;
+        background: #222428;
+        font-family: sans-serif;
+        margin: 0;
+      }
+    </style>
   </head>
 
   <body>
-    <app-root></app-root>
+    <app-root>
+      <img
+        src="assets/img/icon.png"
+        style="width: 8rem; height: 8rem"
+        alt="Start OS "
+      />
+      <h1>Loading</h1>
+      <progress></progress>
+    </app-root>
     <noscript>
       Please enable JavaScript to continue using this application.
     </noscript>
diff --git a/web/projects/ui/src/styles.scss b/web/projects/ui/src/styles.scss
index a00ca4ae2..fa4a6598e 100644
--- a/web/projects/ui/src/styles.scss
+++ b/web/projects/ui/src/styles.scss
@@ -347,4 +347,15 @@ p {
 
 svg:not(:root) {
   overflow: auto;
-}
\ No newline at end of file
+}
+
+tui-dialog {
+  transform: translate3d(0, 0, 0);
+}
+
+.g-buttons {
+  display: flex;
+  justify-content: flex-end;
+  gap: 16px;
+  margin-top: 24px;
+}

From e6cedc257e629da1ed1a7541bd8173ebf4fab072 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Wed, 10 Jul 2024 13:00:02 -0600
Subject: [PATCH 182/341] add boot param to logs request

---
 core/startos/src/logs.rs    | 127 ++++++++++++++++++++++++++++++++++--
 core/startos/src/net/tor.rs |  10 ++-
 2 files changed, 130 insertions(+), 7 deletions(-)

diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index bb1198451..751dd243a 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -1,9 +1,12 @@
+use std::convert::Infallible;
 use std::ops::{Deref, DerefMut};
 use std::process::Stdio;
+use std::str::FromStr;
 use std::time::{Duration, UNIX_EPOCH};
 
 use axum::extract::ws::{self, WebSocket};
 use chrono::{DateTime, Utc};
+use clap::builder::ValueParserFactory;
 use clap::{Args, FromArgMatches, Parser};
 use color_eyre::eyre::eyre;
 use futures::stream::BoxStream;
@@ -14,7 +17,7 @@ use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{
     from_fn_async, CallRemote, Context, Empty, HandlerArgs, HandlerExt, HandlerFor, ParentHandler,
 };
-use serde::de::DeserializeOwned;
+use serde::de::{self, DeserializeOwned};
 use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio::process::{Child, Command};
@@ -27,6 +30,7 @@ use crate::error::ResultExt;
 use crate::lxc::ContainerId;
 use crate::prelude::*;
 use crate::rpc_continuations::{Guid, RpcContinuation, RpcContinuations};
+use crate::util::clap::FromStrParser;
 use crate::util::serde::Reversible;
 use crate::util::Invoke;
 
@@ -227,6 +231,91 @@ pub struct PackageIdParams {
     id: PackageId,
 }
 
+#[derive(Debug, Clone)]
+pub enum BootIdentifier {
+    Index(i32),
+    Id(String),
+}
+impl FromStr for BootIdentifier {
+    type Err = Infallible;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(match s.parse() {
+            Ok(i) => Self::Index(i),
+            Err(_) => Self::Id(s.to_owned()),
+        })
+    }
+}
+impl ValueParserFactory for BootIdentifier {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
+impl Serialize for BootIdentifier {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        match self {
+            Self::Index(i) => serializer.serialize_i32(*i),
+            Self::Id(i) => serializer.serialize_str(i),
+        }
+    }
+}
+impl<'de> Deserialize<'de> for BootIdentifier {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        struct Visitor;
+        impl<'de> de::Visitor<'de> for Visitor {
+            type Value = BootIdentifier;
+            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(formatter, "a string or integer")
+            }
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Self::Value::Id(v.to_owned()))
+            }
+            fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Self::Value::Id(v))
+            }
+            fn visit_i64<E>(self, v: i64) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Self::Value::Index(v as i32))
+            }
+            fn visit_f64<E>(self, v: f64) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Self::Value::Index(v as i32))
+            }
+            fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Self::Value::Index(v as i32))
+            }
+        }
+        deserializer.deserialize_any(Visitor)
+    }
+}
+impl From<BootIdentifier> for String {
+    fn from(value: BootIdentifier) -> Self {
+        match value {
+            BootIdentifier::Index(i) => i.to_string(),
+            BootIdentifier::Id(i) => i,
+        }
+    }
+}
+
 #[derive(Deserialize, Serialize, Parser)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -238,6 +327,9 @@ pub struct LogsParams<Extra: FromArgMatches + Args = Empty> {
     limit: Option<usize>,
     #[arg(short = 'c', long = "cursor", conflicts_with = "follow")]
     cursor: Option<String>,
+    #[arg(short = 'b', long = "boot")]
+    #[serde(default)]
+    boot: Option<BootIdentifier>,
     #[arg(short = 'B', long = "before", conflicts_with = "follow")]
     #[serde(default)]
     before: bool,
@@ -352,12 +444,22 @@ where
                           extra,
                           limit,
                           cursor,
+                          boot,
                           before,
                       },
                   ..
               }: HandlerArgs<C, Empty, LogsParams<Extra>>| {
             let f = f.clone();
-            async move { fetch_logs(f.call(&context, extra).await?, limit, cursor, before).await }
+            async move {
+                fetch_logs(
+                    f.call(&context, extra).await?,
+                    limit,
+                    cursor,
+                    boot.map(String::from),
+                    before,
+                )
+                .await
+            }
         },
     )
 }
@@ -377,13 +479,16 @@ fn logs_follow<
     from_fn_async(
         move |HandlerArgs {
                   context,
-                  inherited_params: LogsParams { extra, limit, .. },
+                  inherited_params:
+                      LogsParams {
+                          extra, limit, boot, ..
+                      },
                   ..
               }: HandlerArgs<C, Empty, LogsParams<Extra>>| {
             let f = f.clone();
             async move {
                 let src = f.call(&context, extra).await?;
-                follow_logs(context, src, limit).await
+                follow_logs(context, src, limit, boot.map(String::from)).await
             }
         },
     )
@@ -416,6 +521,7 @@ pub async fn journalctl(
     id: LogSource,
     limit: usize,
     cursor: Option<&str>,
+    boot: Option<&str>,
     before: bool,
     follow: bool,
 ) -> Result<LogStream, Error> {
@@ -431,6 +537,12 @@ pub async fn journalctl(
         }
     }
 
+    if let Some(boot) = boot {
+        cmd.arg(format!("--boot={boot}"));
+    } else {
+        cmd.arg("--boot=all");
+    }
+
     let deserialized_entries = String::from_utf8(cmd.invoke(ErrorKind::Journald).await?)?
         .lines()
         .map(serde_json::from_str::<JournalctlEntry>)
@@ -516,10 +628,12 @@ pub async fn fetch_logs(
     id: LogSource,
     limit: Option<usize>,
     cursor: Option<String>,
+    boot: Option<String>,
     before: bool,
 ) -> Result<LogResponse, Error> {
     let limit = limit.unwrap_or(50);
-    let mut stream = journalctl(id, limit, cursor.as_deref(), before, false).await?;
+    let mut stream =
+        journalctl(id, limit, cursor.as_deref(), boot.as_deref(), before, false).await?;
 
     let mut entries = Vec::with_capacity(limit);
     let mut start_cursor = None;
@@ -563,9 +677,10 @@ pub async fn follow_logs<Context: AsRef<RpcContinuations>>(
     ctx: Context,
     id: LogSource,
     limit: Option<usize>,
+    boot: Option<String>,
 ) -> Result<LogFollowResponse, Error> {
     let limit = limit.unwrap_or(50);
-    let mut stream = journalctl(id, limit, None, false, true).await?;
+    let mut stream = journalctl(id, limit, None, boot.as_deref(), false, true).await?;
 
     let mut start_cursor = None;
     let mut first_entry = None;
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 31eae5fab..24b8ddb02 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -305,7 +305,15 @@ async fn torctl(
             .invoke(ErrorKind::Tor)
             .await?;
 
-        let logs = journalctl(LogSource::Unit(SYSTEMD_UNIT), 0, None, false, true).await?;
+        let logs = journalctl(
+            LogSource::Unit(SYSTEMD_UNIT),
+            0,
+            None,
+            Some("0"),
+            false,
+            true,
+        )
+        .await?;
 
         let mut tcp_stream = None;
         for _ in 0..60 {

From 87322744d4efaeec8168bbe73c3b4f3aca92cb83 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 11 Jul 2024 11:32:46 -0600
Subject: [PATCH 183/341] Feature/backup fs (#2665)

* port 040 config, WIP

* update fixtures

* use taiga modal for backups too

* fix: update Taiga UI and refactor everything to work

* chore: package-lock

* fix interfaces and mocks for interfaces

* better mocks

* function to transform old spec to new

* delete unused fns

* delete unused FE config utils

* fix exports from sdk

* reorganize exports

* functions to translate config

* rename unionSelectKey and unionValueKey

* new backup fs

* update sdk types

* change types, include fuse module

* fix casing

* rework setup wiz

* rework UI

* only fuse3

* fix arm build

* misc fixes

* fix duplicate server select

* fix: fix throwing inside dialog

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>
Co-authored-by: waterplea <alexander@inkin.ru>
Co-authored-by: Matt Hill <MattDHill@users.noreply.github.com>
---
 Makefile                                      |  10 +-
 build-cargo-dep.sh                            |  13 ++-
 build/dpkg-deps/depends                       |   1 +
 core/startos/src/backup/backup_bulk.rs        |  24 ++--
 core/startos/src/backup/restore.rs            |  25 +++--
 core/startos/src/backup/target/cifs.rs        |   6 +-
 core/startos/src/backup/target/mod.rs         |  16 +++
 core/startos/src/disk/mod.rs                  |  16 ++-
 core/startos/src/disk/mount/backup.rs         |  51 +++++----
 .../src/disk/mount/filesystem/backupfs.rs     |  55 ++++++++++
 core/startos/src/disk/mount/filesystem/mod.rs |   3 +
 core/startos/src/disk/util.rs                 |  71 +++++++-----
 core/startos/src/hostname.rs                  |   2 +-
 core/startos/src/setup.rs                     |  82 ++++++++------
 core/startos/src/util/serde.rs                |  78 +++----------
 foo                                           |   1 -
 sdk/lib/osBindings/RecoverySource.ts          |   9 +-
 sdk/lib/osBindings/SetupExecuteParams.ts      |   3 +-
 .../src/app/services/api/mock-api.service.ts  |  39 ++++---
 .../modals/cifs-modal/cifs-modal.module.ts    |   3 +-
 .../app/modals/cifs-modal/cifs-modal.page.ts  |  25 ++---
 .../src/app/modals/password/password.page.ts  |  15 +--
 .../server-backup-select.module.ts            |  13 +++
 .../server-backup-select.page.html            |  24 ++++
 .../server-backup-select.page.scss            |   0
 .../server-backup-select.page.ts              |  44 ++++++++
 .../src/app/pages/embassy/embassy.page.ts     |  38 ++++---
 .../pages/recover/drive-status.component.html |  14 ---
 .../src/app/pages/recover/recover.module.ts   |   4 +-
 .../src/app/pages/recover/recover.page.html   |  36 +++---
 .../src/app/pages/recover/recover.page.ts     | 101 ++++++-----------
 .../src/app/pages/success/success.module.ts   |   1 -
 .../src/app/pages/success/success.page.ts     |   1 -
 .../src/app/services/api/api.service.ts       |  36 +++---
 .../src/app/services/api/live-api.service.ts  |   8 +-
 .../src/app/services/api/mock-api.service.ts  |  56 ++++++----
 .../src/app/services/state.service.ts         |  13 ++-
 .../src/services/download-html.service.ts     |   4 +-
 web/projects/shared/src/types/api.ts          |   5 +-
 .../app/preloader/preloader.component.html    |  28 ++---
 .../app/app/preloader/preloader.component.ts  |   2 +
 .../src/app/app/preloader/preloader.module.ts |   6 +-
 .../backup-drives-status.component.html       |  14 +--
 .../backup-drives.component.html              |   4 +-
 .../backup-drives/backup-drives.component.ts  |   8 +-
 .../backup-drives/backup.service.ts           |  18 ++-
 .../form/form-group/form-group.component.html |   2 +-
 .../form-textarea.component.html              |   4 +-
 .../ui/src/app/components/form/form.module.ts |   4 +-
 .../src/app/components/logs/logs.component.ts |   2 +-
 .../app-recover-select.page.html              |   8 +-
 .../app-recover-select.page.ts                |   8 +-
 .../app-recover-select/to-options.pipe.ts     |   4 +-
 .../backup-server-select.module.ts            |  13 +++
 .../backup-server-select.page.html            |  35 ++++++
 .../backup-server-select.page.scss            |   0
 .../backup-server-select.page.ts              | 103 ++++++++++++++++++
 .../password-prompt.modal.ts                  |  69 ++++++++++++
 .../restore/restore.component.html            |   2 +-
 .../restore/restore.component.module.ts       |   4 +-
 .../restore/restore.component.ts              |  82 +-------------
 .../server-backup/server-backup.page.ts       |  16 +--
 .../ui/src/app/services/api/api.fixures.ts    |  40 ++++---
 .../ui/src/app/services/api/api.types.ts      |  13 ++-
 .../services/api/embassy-mock-api.service.ts  |   2 +-
 .../ui/src/app/services/api/mock-patch.ts     |   2 +-
 .../ui/src/app/types/mapped-backup-target.ts  |   2 +-
 67 files changed, 879 insertions(+), 562 deletions(-)
 create mode 100644 core/startos/src/disk/mount/filesystem/backupfs.rs
 delete mode 120000 foo
 create mode 100644 web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.module.ts
 create mode 100644 web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.html
 create mode 100644 web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.scss
 create mode 100644 web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.ts
 delete mode 100644 web/projects/setup-wizard/src/app/pages/recover/drive-status.component.html
 create mode 100644 web/projects/ui/src/app/modals/backup-server-select/backup-server-select.module.ts
 create mode 100644 web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.html
 create mode 100644 web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.scss
 create mode 100644 web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
 create mode 100644 web/projects/ui/src/app/modals/backup-server-select/password-prompt.modal.ts

diff --git a/Makefile b/Makefile
index 9a9a001b7..c0492ba55 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client
 GZIP_BIN := $(shell which pigz || which gzip)
 TAR_BIN := $(shell which gtar || which tar)
 COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar container-runtime/rootfs.$(ARCH).squashfs
-ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) 
+ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) cargo-deps/$(ARCH)-unknown-linux-musl/release/startos-backup-fs $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) 
 
 ifeq ($(REMOTE),)
 	mkdir = mkdir -p $1
@@ -115,12 +115,15 @@ results/$(BASENAME).$(IMAGE_TYPE) results/$(BASENAME).squashfs: $(IMAGE_RECIPE_S
 # For creating os images. DO NOT USE
 install: $(ALL_TARGETS) 
 	$(call mkdir,$(DESTDIR)/usr/bin)
+	$(call mkdir,$(DESTDIR)/usr/sbin)
 	$(call cp,core/target/$(ARCH)-unknown-linux-musl/release/startbox,$(DESTDIR)/usr/bin/startbox)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/startd)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-cli)
 	$(call ln,/usr/bin/startbox,$(DESTDIR)/usr/bin/start-sdk)
 	if [ "$(PLATFORM)" = "raspberrypi" ]; then $(call cp,cargo-deps/aarch64-unknown-linux-musl/release/pi-beep,$(DESTDIR)/usr/bin/pi-beep); fi
 	if /bin/bash -c '[[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]'; then $(call cp,cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console,$(DESTDIR)/usr/bin/tokio-console); fi
+	$(call cp,cargo-deps/$(ARCH)-unknown-linux-musl/release/startos-backup-fs,$(DESTDIR)/usr/bin/startos-backup-fs)
+	$(call ln,/usr/bin/startos-backup-fs,$(DESTDIR)/usr/sbin/mount.backup-fs)
 	
 	$(call mkdir,$(DESTDIR)/lib/systemd/system)
 	$(call cp,core/startos/startd.service,$(DESTDIR)/lib/systemd/system/startd.service)
@@ -310,4 +313,7 @@ cargo-deps/aarch64-unknown-linux-musl/release/pi-beep:
 	ARCH=aarch64 ./build-cargo-dep.sh pi-beep
 
 cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console:
-	ARCH=$(ARCH) ./build-cargo-dep.sh tokio-console
\ No newline at end of file
+	ARCH=$(ARCH) PREINSTALL="apk add musl-dev pkgconfig" ./build-cargo-dep.sh tokio-console
+
+cargo-deps/$(ARCH)-unknown-linux-musl/release/startos-backup-fs:
+	ARCH=$(ARCH) PREINSTALL="apk add fuse3 fuse3-dev fuse3-static musl-dev pkgconfig" ./build-cargo-dep.sh --git https://github.com/Start9Labs/start-fs.git startos-backup-fs
\ No newline at end of file
diff --git a/build-cargo-dep.sh b/build-cargo-dep.sh
index 9e20f0caf..c32e4f8ae 100755
--- a/build-cargo-dep.sh
+++ b/build-cargo-dep.sh
@@ -17,9 +17,18 @@ if [ -z "$ARCH" ]; then
 	ARCH=$(uname -m)
 fi
 
+DOCKER_PLATFORM="linux/${ARCH}"
+if [ "$ARCH" = aarch64 ]; then
+	DOCKER_PLATFORM="linux/arm64"
+elif [ "$ARCH" = x86_64 ]; then
+	DOCKER_PLATFORM="linux/amd64"
+fi
+
 mkdir -p cargo-deps
-alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)"/cargo-deps:/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+alias 'rust-musl-builder'='docker run $USE_TTY --platform=${DOCKER_PLATFORM} --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)"/cargo-deps:/home/rust/src -w /home/rust/src -P rust:alpine'
+
+PREINSTALL=${PREINSTALL:-true}
 
-rust-musl-builder cargo install "$1" --target-dir /home/rust/src --target=$ARCH-unknown-linux-musl
+rust-musl-builder sh -c "$PREINSTALL && cargo install $* --target-dir /home/rust/src --target=$ARCH-unknown-linux-musl"
 sudo chown -R $USER cargo-deps
 sudo chown -R $USER ~/.cargo
\ No newline at end of file
diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index 7519cff1b..33b7be2ad 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -14,6 +14,7 @@ e2fsprogs
 ecryptfs-utils
 exfatprogs
 flashrom
+fuse3
 grub-common
 htop
 httpdirfs
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 79cb3b98a..a52c97f9b 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -164,7 +164,7 @@ pub async fn backup_all(
         .decrypt(&ctx)?;
     let password = password.decrypt(&ctx)?;
 
-    let ((fs, package_ids), status_guard) = (
+    let ((fs, package_ids, server_id), status_guard) = (
         ctx.db
             .mutate(|db| {
                 check_password_against_db(db, &password)?;
@@ -181,7 +181,11 @@ pub async fn backup_all(
                         .collect()
                 };
                 assure_backing_up(db, &package_ids)?;
-                Ok((fs, package_ids))
+                Ok((
+                    fs,
+                    package_ids,
+                    db.as_public().as_server_info().as_id().de()?,
+                ))
             })
             .await?,
         BackupStatusGuard::new(ctx.db.clone()),
@@ -189,6 +193,7 @@ pub async fn backup_all(
 
     let mut backup_guard = BackupMountGuard::mount(
         TmpMountGuard::mount(&fs, ReadWrite).await?,
+        &server_id,
         &old_password_decrypted,
     )
     .await?;
@@ -298,11 +303,11 @@ async fn perform_backup(
     let ui = ctx.db.peek().await.into_public().into_ui().de()?;
 
     let mut os_backup_file =
-        AtomicFile::new(backup_guard.path().join("os-backup.cbor"), None::<PathBuf>)
+        AtomicFile::new(backup_guard.path().join("os-backup.json"), None::<PathBuf>)
             .await
             .with_kind(ErrorKind::Filesystem)?;
     os_backup_file
-        .write_all(&IoFormat::Cbor.to_vec(&OsBackup {
+        .write_all(&IoFormat::Json.to_vec(&OsBackup {
             account: ctx.account.read().await.clone(),
             ui,
         })?)
@@ -325,22 +330,23 @@ async fn perform_backup(
         dir_copy(luks_folder, &luks_folder_bak, None).await?;
     }
 
-    let timestamp = Some(Utc::now());
+    let timestamp = Utc::now();
 
     backup_guard.unencrypted_metadata.version = crate::version::Current::new().semver().into();
-    backup_guard.unencrypted_metadata.full = true;
+    backup_guard.unencrypted_metadata.hostname = ctx.account.read().await.hostname.clone();
+    backup_guard.unencrypted_metadata.timestamp = timestamp.clone();
     backup_guard.metadata.version = crate::version::Current::new().semver().into();
-    backup_guard.metadata.timestamp = timestamp;
+    backup_guard.metadata.timestamp = Some(timestamp);
     backup_guard.metadata.package_backups = package_backups;
 
-    backup_guard.save().await?;
+    backup_guard.save_and_unmount().await?;
 
     ctx.db
         .mutate(|v| {
             v.as_public_mut()
                 .as_server_info_mut()
                 .as_last_backup_mut()
-                .ser(&timestamp)
+                .ser(&Some(timestamp))
         })
         .await?;
 
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 3f0aacbe8..23e0c8ac1 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -44,9 +44,14 @@ pub async fn restore_packages_rpc(
         password,
     }: RestorePackageParams,
 ) -> Result<(), Error> {
-    let fs = target_id.load(&ctx.db.peek().await)?;
-    let backup_guard =
-        BackupMountGuard::mount(TmpMountGuard::mount(&fs, ReadWrite).await?, &password).await?;
+    let peek = ctx.db.peek().await;
+    let fs = target_id.load(&peek)?;
+    let backup_guard = BackupMountGuard::mount(
+        TmpMountGuard::mount(&fs, ReadWrite).await?,
+        &peek.as_public().as_server_info().as_id().de()?,
+        &password,
+    )
+    .await?;
 
     let tasks = restore_packages(&ctx, backup_guard, ids).await?;
 
@@ -73,7 +78,8 @@ pub async fn recover_full_embassy(
     disk_guid: Arc<String>,
     start_os_password: String,
     recovery_source: TmpMountGuard,
-    recovery_password: Option<String>,
+    server_id: &str,
+    recovery_password: &str,
     SetupExecuteProgress {
         init_phases,
         restore_phase,
@@ -82,14 +88,11 @@ pub async fn recover_full_embassy(
 ) -> Result<(SetupResult, RpcContext), Error> {
     let mut restore_phase = restore_phase.or_not_found("restore progress")?;
 
-    let backup_guard = BackupMountGuard::mount(
-        recovery_source,
-        recovery_password.as_deref().unwrap_or_default(),
-    )
-    .await?;
+    let backup_guard =
+        BackupMountGuard::mount(recovery_source, server_id, recovery_password).await?;
 
-    let os_backup_path = backup_guard.path().join("os-backup.cbor");
-    let mut os_backup: OsBackup = IoFormat::Cbor.from_slice(
+    let os_backup_path = backup_guard.path().join("os-backup.json");
+    let mut os_backup: OsBackup = IoFormat::Json.from_slice(
         &tokio::fs::read(&os_backup_path)
             .await
             .with_ctx(|_| (ErrorKind::Filesystem, os_backup_path.display().to_string()))?,
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index ad4f81aa0..e83f4e981 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -14,7 +14,7 @@ use crate::db::model::DatabaseModel;
 use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::filesystem::ReadOnly;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
-use crate::disk::util::{recovery_info, EmbassyOsRecoveryInfo};
+use crate::disk::util::{recovery_info, StartOsRecoveryInfo};
 use crate::prelude::*;
 use crate::util::serde::KeyVal;
 
@@ -43,7 +43,7 @@ pub struct CifsBackupTarget {
     path: PathBuf,
     username: String,
     mountable: bool,
-    start_os: Option<EmbassyOsRecoveryInfo>,
+    start_os: BTreeMap<String, StartOsRecoveryInfo>,
 }
 
 pub fn cifs<C: Context>() -> ParentHandler<C> {
@@ -239,7 +239,7 @@ pub async fn list(db: &DatabaseModel) -> Result<Vec<(u32, CifsBackupTarget)>, Er
                 path: mount_info.path,
                 username: mount_info.username,
                 mountable: start_os.is_ok(),
-                start_os: start_os.ok().and_then(|a| a),
+                start_os: start_os.ok().unwrap_or_default(),
             },
         ));
     }
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index f1273aa6a..f3b6b5f5c 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -157,6 +157,16 @@ pub fn target<C: Context>() -> ParentHandler<C> {
                 })
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "mount",
+            from_fn_async(mount).with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "umount",
+            from_fn_async(umount)
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
 }
 
 // #[command(display(display_serializable))]
@@ -250,6 +260,7 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
 #[command(rename_all = "kebab-case")]
 pub struct InfoParams {
     target_id: BackupTargetId,
+    server_id: String,
     password: String,
 }
 
@@ -258,11 +269,13 @@ pub async fn info(
     ctx: RpcContext,
     InfoParams {
         target_id,
+        server_id,
         password,
     }: InfoParams,
 ) -> Result<BackupInfo, Error> {
     let guard = BackupMountGuard::mount(
         TmpMountGuard::mount(&target_id.load(&ctx.db.peek().await)?, ReadWrite).await?,
+        &server_id,
         &password,
     )
     .await?;
@@ -284,6 +297,7 @@ lazy_static::lazy_static! {
 #[command(rename_all = "kebab-case")]
 pub struct MountParams {
     target_id: BackupTargetId,
+    server_id: String,
     password: String,
 }
 
@@ -292,6 +306,7 @@ pub async fn mount(
     ctx: RpcContext,
     MountParams {
         target_id,
+        server_id,
         password,
     }: MountParams,
 ) -> Result<String, Error> {
@@ -303,6 +318,7 @@ pub async fn mount(
 
     let guard = BackupMountGuard::mount(
         TmpMountGuard::mount(&target_id.clone().load(&ctx.db.peek().await)?, ReadWrite).await?,
+        &server_id,
         &password,
     )
     .await?;
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index d7ce5f766..c0a701fc9 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -1,5 +1,7 @@
 use std::path::{Path, PathBuf};
 
+use itertools::Itertools;
+use lazy_format::lazy_format;
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 
@@ -102,10 +104,18 @@ fn display_disk_info(params: WithIoFormat<Empty>, args: Vec<DiskInfo>) {
                 } else {
                     "N/A"
                 },
-                &if let Some(eos) = part.start_os.as_ref() {
-                    eos.version.to_string()
-                } else {
+                &if part.start_os.is_empty() {
                     "N/A".to_owned()
+                } else if part.start_os.len() == 1 {
+                    part.start_os
+                        .first_key_value()
+                        .map(|(_, info)| info.version.to_string())
+                        .unwrap()
+                } else {
+                    part.start_os
+                        .iter()
+                        .map(|(id, info)| lazy_format!("{} ({})", info.version, id))
+                        .join(", ")
                 },
             ];
             table.add_row(row);
diff --git a/core/startos/src/disk/mount/backup.rs b/core/startos/src/disk/mount/backup.rs
index ad9f5090b..67f88d21f 100644
--- a/core/startos/src/disk/mount/backup.rs
+++ b/core/startos/src/disk/mount/backup.rs
@@ -11,9 +11,10 @@ use super::filesystem::ecryptfs::EcryptFS;
 use super::guard::{GenericMountGuard, TmpMountGuard};
 use crate::auth::check_password;
 use crate::backup::target::BackupInfo;
+use crate::disk::mount::filesystem::backupfs::BackupFS;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::SubPath;
-use crate::disk::util::EmbassyOsRecoveryInfo;
+use crate::disk::util::StartOsRecoveryInfo;
 use crate::util::crypto::{decrypt_slice, encrypt_slice};
 use crate::util::serde::IoFormat;
 use crate::{Error, ErrorKind, ResultExt};
@@ -23,29 +24,27 @@ pub struct BackupMountGuard<G: GenericMountGuard> {
     backup_disk_mount_guard: Option<G>,
     encrypted_guard: Option<TmpMountGuard>,
     enc_key: String,
-    pub unencrypted_metadata: EmbassyOsRecoveryInfo,
+    unencrypted_metadata_path: PathBuf,
+    pub unencrypted_metadata: StartOsRecoveryInfo,
     pub metadata: BackupInfo,
 }
 impl<G: GenericMountGuard> BackupMountGuard<G> {
-    fn backup_disk_path(&self) -> &Path {
-        if let Some(guard) = &self.backup_disk_mount_guard {
-            guard.path()
-        } else {
-            unreachable!()
-        }
-    }
-
     #[instrument(skip_all)]
-    pub async fn mount(backup_disk_mount_guard: G, password: &str) -> Result<Self, Error> {
+    pub async fn mount(
+        backup_disk_mount_guard: G,
+        server_id: &str,
+        password: &str,
+    ) -> Result<Self, Error> {
         let backup_disk_path = backup_disk_mount_guard.path();
-        let unencrypted_metadata_path =
-            backup_disk_path.join("EmbassyBackups/unencrypted-metadata.cbor");
-        let mut unencrypted_metadata: EmbassyOsRecoveryInfo =
+        let backup_dir = backup_disk_path.join("StartOSBackups").join(server_id);
+        let unencrypted_metadata_path = backup_dir.join("unencrypted-metadata.json");
+        let crypt_path = backup_dir.join("crypt");
+        let mut unencrypted_metadata: StartOsRecoveryInfo =
             if tokio::fs::metadata(&unencrypted_metadata_path)
                 .await
                 .is_ok()
             {
-                IoFormat::Cbor.from_slice(
+                IoFormat::Json.from_slice(
                     &tokio::fs::read(&unencrypted_metadata_path)
                         .await
                         .with_ctx(|_| {
@@ -56,6 +55,9 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
                         })?,
                 )?
             } else {
+                if tokio::fs::metadata(&crypt_path).await.is_ok() {
+                    tokio::fs::remove_dir_all(&crypt_path).await?;
+                }
                 Default::default()
             };
         let enc_key = if let (Some(hash), Some(wrapped_key)) = (
@@ -96,7 +98,6 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
             ));
         }
 
-        let crypt_path = backup_disk_path.join("EmbassyBackups/crypt");
         if tokio::fs::metadata(&crypt_path).await.is_err() {
             tokio::fs::create_dir_all(&crypt_path).await.with_ctx(|_| {
                 (
@@ -106,11 +107,11 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
             })?;
         }
         let encrypted_guard =
-            TmpMountGuard::mount(&EcryptFS::new(&crypt_path, &enc_key), ReadWrite).await?;
+            TmpMountGuard::mount(&BackupFS::new(&crypt_path, &enc_key), ReadWrite).await?;
 
-        let metadata_path = encrypted_guard.path().join("metadata.cbor");
+        let metadata_path = encrypted_guard.path().join("metadata.json");
         let metadata: BackupInfo = if tokio::fs::metadata(&metadata_path).await.is_ok() {
-            IoFormat::Cbor.from_slice(&tokio::fs::read(&metadata_path).await.with_ctx(|_| {
+            IoFormat::Json.from_slice(&tokio::fs::read(&metadata_path).await.with_ctx(|_| {
                 (
                     crate::ErrorKind::Filesystem,
                     metadata_path.display().to_string(),
@@ -124,6 +125,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
             backup_disk_mount_guard: Some(backup_disk_mount_guard),
             encrypted_guard: Some(encrypted_guard),
             enc_key,
+            unencrypted_metadata_path,
             unencrypted_metadata,
             metadata,
         })
@@ -152,20 +154,17 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
 
     #[instrument(skip_all)]
     pub async fn save(&self) -> Result<(), Error> {
-        let metadata_path = self.path().join("metadata.cbor");
-        let backup_disk_path = self.backup_disk_path();
+        let metadata_path = self.path().join("metadata.json");
         let mut file = AtomicFile::new(&metadata_path, None::<PathBuf>)
             .await
             .with_kind(ErrorKind::Filesystem)?;
-        file.write_all(&IoFormat::Cbor.to_vec(&self.metadata)?)
+        file.write_all(&IoFormat::Json.to_vec(&self.metadata)?)
             .await?;
         file.save().await.with_kind(ErrorKind::Filesystem)?;
-        let unencrypted_metadata_path =
-            backup_disk_path.join("EmbassyBackups/unencrypted-metadata.cbor");
-        let mut file = AtomicFile::new(&unencrypted_metadata_path, None::<PathBuf>)
+        let mut file = AtomicFile::new(&self.unencrypted_metadata_path, None::<PathBuf>)
             .await
             .with_kind(ErrorKind::Filesystem)?;
-        file.write_all(&IoFormat::Cbor.to_vec(&self.unencrypted_metadata)?)
+        file.write_all(&IoFormat::Json.to_vec(&self.unencrypted_metadata)?)
             .await?;
         file.save().await.with_kind(ErrorKind::Filesystem)?;
         Ok(())
diff --git a/core/startos/src/disk/mount/filesystem/backupfs.rs b/core/startos/src/disk/mount/filesystem/backupfs.rs
new file mode 100644
index 000000000..9ef258f34
--- /dev/null
+++ b/core/startos/src/disk/mount/filesystem/backupfs.rs
@@ -0,0 +1,55 @@
+use std::fmt::{self, Display};
+use std::os::unix::ffi::OsStrExt;
+use std::path::Path;
+
+use digest::generic_array::GenericArray;
+use digest::{Digest, OutputSizeUser};
+use sha2::Sha256;
+
+use super::FileSystem;
+use crate::prelude::*;
+
+pub struct BackupFS<DataDir: AsRef<Path>, Password: fmt::Display> {
+    data_dir: DataDir,
+    password: Password,
+}
+impl<DataDir: AsRef<Path>, Password: fmt::Display> BackupFS<DataDir, Password> {
+    pub fn new(data_dir: DataDir, password: Password) -> Self {
+        BackupFS { data_dir, password }
+    }
+}
+impl<DataDir: AsRef<Path> + Send + Sync, Password: fmt::Display + Send + Sync> FileSystem
+    for BackupFS<DataDir, Password>
+{
+    fn mount_type(&self) -> Option<impl AsRef<str>> {
+        Some("backup-fs")
+    }
+    fn mount_options(&self) -> impl IntoIterator<Item = impl Display> {
+        [
+            format!("password={}", self.password),
+            format!("file-size-padding=0.05"),
+        ]
+    }
+    async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
+        Ok(Some(&self.data_dir))
+    }
+    async fn source_hash(
+        &self,
+    ) -> Result<GenericArray<u8, <Sha256 as OutputSizeUser>::OutputSize>, Error> {
+        let mut sha = Sha256::new();
+        sha.update("BackupFS");
+        sha.update(
+            tokio::fs::canonicalize(self.data_dir.as_ref())
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        self.data_dir.as_ref().display().to_string(),
+                    )
+                })?
+                .as_os_str()
+                .as_bytes(),
+        );
+        Ok(sha.finalize())
+    }
+}
diff --git a/core/startos/src/disk/mount/filesystem/mod.rs b/core/startos/src/disk/mount/filesystem/mod.rs
index 53157937c..818549a0a 100644
--- a/core/startos/src/disk/mount/filesystem/mod.rs
+++ b/core/startos/src/disk/mount/filesystem/mod.rs
@@ -1,6 +1,7 @@
 use std::ffi::OsStr;
 use std::fmt::{Display, Write};
 use std::path::Path;
+use std::time::Duration;
 
 use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
@@ -11,6 +12,7 @@ use tokio::process::Command;
 use crate::prelude::*;
 use crate::util::Invoke;
 
+pub mod backupfs;
 pub mod bind;
 pub mod block_dev;
 pub mod cifs;
@@ -71,6 +73,7 @@ pub(self) async fn default_mount_impl(
     fs.pre_mount().await?;
     tokio::fs::create_dir_all(mountpoint.as_ref()).await?;
     Command::from(default_mount_command(fs, mountpoint, mount_type).await?)
+        .capture(false)
         .invoke(ErrorKind::Filesystem)
         .await?;
 
diff --git a/core/startos/src/disk/util.rs b/core/startos/src/disk/util.rs
index d3f2a8d27..c64ea40ae 100644
--- a/core/startos/src/disk/util.rs
+++ b/core/startos/src/disk/util.rs
@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::path::{Path, PathBuf};
 
+use chrono::{DateTime, Utc};
 use color_eyre::eyre::{self, eyre};
 use futures::TryStreamExt;
 use nom::bytes::complete::{tag, take_till1};
@@ -19,6 +20,7 @@ use super::mount::filesystem::ReadOnly;
 use super::mount::guard::TmpMountGuard;
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::disk::OsPartitionInfo;
+use crate::hostname::Hostname;
 use crate::util::serde::IoFormat;
 use crate::util::Invoke;
 use crate::{Error, ResultExt as _};
@@ -49,15 +51,16 @@ pub struct PartitionInfo {
     pub label: Option<String>,
     pub capacity: u64,
     pub used: Option<u64>,
-    pub start_os: Option<EmbassyOsRecoveryInfo>,
+    pub start_os: BTreeMap<String, StartOsRecoveryInfo>,
     pub guid: Option<String>,
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EmbassyOsRecoveryInfo {
+pub struct StartOsRecoveryInfo {
+    pub hostname: Hostname,
     pub version: exver::Version,
-    pub full: bool,
+    pub timestamp: DateTime<Utc>,
     pub password_hash: Option<String>,
     pub wrapped_key: Option<String>,
 }
@@ -223,29 +226,38 @@ pub async fn pvscan() -> Result<BTreeMap<PathBuf, Option<String>>, Error> {
 
 pub async fn recovery_info(
     mountpoint: impl AsRef<Path>,
-) -> Result<Option<EmbassyOsRecoveryInfo>, Error> {
-    let backup_unencrypted_metadata_path = mountpoint
-        .as_ref()
-        .join("EmbassyBackups/unencrypted-metadata.cbor");
-    if tokio::fs::metadata(&backup_unencrypted_metadata_path)
-        .await
-        .is_ok()
-    {
-        return Ok(Some(
-            IoFormat::Cbor.from_slice(
-                &tokio::fs::read(&backup_unencrypted_metadata_path)
-                    .await
-                    .with_ctx(|_| {
-                        (
-                            crate::ErrorKind::Filesystem,
-                            backup_unencrypted_metadata_path.display().to_string(),
-                        )
-                    })?,
-            )?,
-        ));
+) -> Result<BTreeMap<String, StartOsRecoveryInfo>, Error> {
+    let backup_root = mountpoint.as_ref().join("StartOSBackups");
+    let mut res = BTreeMap::new();
+    if tokio::fs::metadata(&backup_root).await.is_ok() {
+        let mut dir = tokio::fs::read_dir(&backup_root).await?;
+        while let Some(entry) = dir.next_entry().await? {
+            let server_id = entry.file_name().to_string_lossy().into_owned();
+            let backup_unencrypted_metadata_path = backup_root
+                .join(&server_id)
+                .join("unencrypted-metadata.json");
+            if tokio::fs::metadata(&backup_unencrypted_metadata_path)
+                .await
+                .is_ok()
+            {
+                res.insert(
+                    server_id,
+                    IoFormat::Json.from_slice(
+                        &tokio::fs::read(&backup_unencrypted_metadata_path)
+                            .await
+                            .with_ctx(|_| {
+                                (
+                                    crate::ErrorKind::Filesystem,
+                                    backup_unencrypted_metadata_path.display().to_string(),
+                                )
+                            })?,
+                    )?,
+                );
+            }
+        }
     }
 
-    Ok(None)
+    Ok(res)
 }
 
 #[instrument(skip_all)]
@@ -390,7 +402,7 @@ async fn disk_info(disk: PathBuf) -> DiskInfo {
 }
 
 async fn part_info(part: PathBuf) -> PartitionInfo {
-    let mut start_os = None;
+    let mut start_os = BTreeMap::new();
     let label = get_label(&part)
         .await
         .map_err(|e| tracing::warn!("Could not get label of {}: {}", part.display(), e.source))
@@ -410,14 +422,13 @@ async fn part_info(part: PathBuf) -> PartitionInfo {
                     tracing::warn!("Could not get usage of {}: {}", part.display(), e.source)
                 })
                 .ok();
-            if let Some(recovery_info) = match recovery_info(mount_guard.path()).await {
-                Ok(a) => a,
+            match recovery_info(mount_guard.path()).await {
+                Ok(a) => {
+                    start_os = a;
+                }
                 Err(e) => {
                     tracing::error!("Error fetching unencrypted backup metadata: {}", e);
-                    None
                 }
-            } {
-                start_os = Some(recovery_info)
             }
             if let Err(e) = mount_guard.unmount().await {
                 tracing::error!("Error unmounting partition {}: {}", part.display(), e);
diff --git a/core/startos/src/hostname.rs b/core/startos/src/hostname.rs
index f68d5c9d8..c4332354c 100644
--- a/core/startos/src/hostname.rs
+++ b/core/startos/src/hostname.rs
@@ -4,7 +4,7 @@ use tracing::instrument;
 
 use crate::util::Invoke;
 use crate::{Error, ErrorKind};
-#[derive(Clone, serde::Deserialize, serde::Serialize, Debug)]
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
 pub struct Hostname(pub String);
 
 lazy_static::lazy_static! {
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 8fb7cf7c1..642dd5476 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::Duration;
@@ -25,7 +26,7 @@ use crate::disk::main::DEFAULT_PASSWORD;
 use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
-use crate::disk::util::{pvscan, recovery_info, DiskInfo, EmbassyOsRecoveryInfo};
+use crate::disk::util::{pvscan, recovery_info, DiskInfo, StartOsRecoveryInfo};
 use crate::disk::REPAIR_DISK_PATH;
 use crate::init::{init, InitPhases, InitResult};
 use crate::net::net_controller::PreInitNetController;
@@ -237,7 +238,7 @@ pub async fn verify_cifs(
         username,
         password,
     }: VerifyCifsParams,
-) -> Result<EmbassyOsRecoveryInfo, Error> {
+) -> Result<BTreeMap<String, StartOsRecoveryInfo>, Error> {
     let password: Option<String> = password.map(|x| x.decrypt(&ctx)).flatten();
     let guard = TmpMountGuard::mount(
         &Cifs {
@@ -251,15 +252,28 @@ pub async fn verify_cifs(
     .await?;
     let start_os = recovery_info(guard.path()).await?;
     guard.unmount().await?;
-    start_os.ok_or_else(|| Error::new(eyre!("No Backup Found"), crate::ErrorKind::NotFound))
+    if start_os.is_empty() {
+        return Err(Error::new(
+            eyre!("No Backup Found"),
+            crate::ErrorKind::NotFound,
+        ));
+    }
+    Ok(start_os)
 }
 
 #[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(tag = "type")]
 #[serde(rename_all = "camelCase")]
-pub enum RecoverySource {
-    Migrate { guid: String },
-    Backup { target: BackupTargetFS },
+#[serde(rename_all_fields = "camelCase")]
+pub enum RecoverySource<Password> {
+    Migrate {
+        guid: String,
+    },
+    Backup {
+        target: BackupTargetFS,
+        password: Password,
+        server_id: String,
+    },
 }
 
 #[derive(Deserialize, Serialize, TS)]
@@ -268,8 +282,7 @@ pub enum RecoverySource {
 pub struct SetupExecuteParams {
     start_os_logicalname: PathBuf,
     start_os_password: EncryptedWire,
-    recovery_source: Option<RecoverySource>,
-    recovery_password: Option<EncryptedWire>,
+    recovery_source: Option<RecoverySource<EncryptedWire>>,
 }
 
 // #[command(rpc_only)]
@@ -279,7 +292,6 @@ pub async fn execute(
         start_os_logicalname,
         start_os_password,
         recovery_source,
-        recovery_password,
     }: SetupExecuteParams,
 ) -> Result<SetupProgress, Error> {
     let start_os_password = match start_os_password.decrypt(&ctx) {
@@ -291,29 +303,27 @@ pub async fn execute(
             ))
         }
     };
-    let recovery_password: Option<String> = match recovery_password {
-        Some(a) => match a.decrypt(&ctx) {
-            Some(a) => Some(a),
-            None => {
-                return Err(Error::new(
+    let recovery = match recovery_source {
+        Some(RecoverySource::Backup {
+            target,
+            password,
+            server_id,
+        }) => Some(RecoverySource::Backup {
+            target,
+            password: password.decrypt(&ctx).ok_or_else(|| {
+                Error::new(
                     color_eyre::eyre::eyre!("Couldn't decode recoveryPassword"),
                     crate::ErrorKind::Unknown,
-                ))
-            }
-        },
+                )
+            })?,
+            server_id,
+        }),
+        Some(RecoverySource::Migrate { guid }) => Some(RecoverySource::Migrate { guid }),
         None => None,
     };
 
     let setup_ctx = ctx.clone();
-    ctx.run_setup(|| {
-        execute_inner(
-            setup_ctx,
-            start_os_logicalname,
-            start_os_password,
-            recovery_source,
-            recovery_password,
-        )
-    })?;
+    ctx.run_setup(|| execute_inner(setup_ctx, start_os_logicalname, start_os_password, recovery))?;
 
     Ok(ctx.progress().await)
 }
@@ -348,12 +358,11 @@ pub async fn execute_inner(
     ctx: SetupContext,
     start_os_logicalname: PathBuf,
     start_os_password: String,
-    recovery_source: Option<RecoverySource>,
-    recovery_password: Option<String>,
+    recovery_source: Option<RecoverySource<String>>,
 ) -> Result<(SetupResult, RpcContext), Error> {
     let progress = &ctx.progress;
     let mut disk_phase = progress.add_phase("Formatting data drive".into(), Some(10));
-    let restore_phase = match &recovery_source {
+    let restore_phase = match recovery_source.as_ref() {
         Some(RecoverySource::Backup { .. }) => {
             Some(progress.add_phase("Restoring backup".into(), Some(100)))
         }
@@ -396,13 +405,18 @@ pub async fn execute_inner(
     };
 
     match recovery_source {
-        Some(RecoverySource::Backup { target }) => {
+        Some(RecoverySource::Backup {
+            target,
+            password,
+            server_id,
+        }) => {
             recover(
                 &ctx,
                 guid,
                 start_os_password,
                 target,
-                recovery_password,
+                server_id,
+                password,
                 progress,
             )
             .await
@@ -448,7 +462,8 @@ async fn recover(
     guid: Arc<String>,
     start_os_password: String,
     recovery_source: BackupTargetFS,
-    recovery_password: Option<String>,
+    server_id: String,
+    recovery_password: String,
     progress: SetupExecuteProgress,
 ) -> Result<(SetupResult, RpcContext), Error> {
     let recovery_source = TmpMountGuard::mount(&recovery_source, ReadWrite).await?;
@@ -457,7 +472,8 @@ async fn recover(
         guid.clone(),
         start_os_password,
         recovery_source,
-        recovery_password,
+        &server_id,
+        &recovery_password,
         progress,
     )
     .await
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index b3b2dea6a..049fad2d2 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -107,64 +107,22 @@ pub fn serialize_display_opt<T: std::fmt::Display, S: Serializer>(
     Option::<String>::serialize(&t.as_ref().map(|t| t.to_string()), serializer)
 }
 
-pub mod ed25519_pubkey {
-    use ed25519_dalek::VerifyingKey;
-    use serde::de::{Error, Unexpected, Visitor};
-    use serde::{Deserializer, Serializer};
-
-    pub fn serialize<S: Serializer>(
-        pubkey: &VerifyingKey,
-        serializer: S,
-    ) -> Result<S::Ok, S::Error> {
-        serializer.serialize_str(&base32::encode(
-            base32::Alphabet::RFC4648 { padding: true },
-            pubkey.as_bytes(),
-        ))
-    }
-    pub fn deserialize<'de, D: Deserializer<'de>>(
-        deserializer: D,
-    ) -> Result<VerifyingKey, D::Error> {
-        struct PubkeyVisitor;
-        impl<'de> Visitor<'de> for PubkeyVisitor {
-            type Value = ed25519_dalek::VerifyingKey;
-            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                write!(formatter, "an RFC4648 encoded string")
-            }
-            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
-            where
-                E: Error,
-            {
-                VerifyingKey::from_bytes(
-                    &<[u8; 32]>::try_from(
-                        base32::decode(base32::Alphabet::RFC4648 { padding: true }, v).ok_or(
-                            Error::invalid_value(Unexpected::Str(v), &"an RFC4648 encoded string"),
-                        )?,
-                    )
-                    .map_err(|e| Error::invalid_length(e.len(), &"32 bytes"))?,
-                )
-                .map_err(Error::custom)
-            }
-        }
-        deserializer.deserialize_str(PubkeyVisitor)
-    }
-}
-
 #[derive(Debug, Serialize)]
 #[serde(untagged)]
-pub enum ValuePrimative {
+pub enum ValuePrimitive {
     Null,
     Boolean(bool),
     String(String),
     Number(serde_json::Number),
 }
-impl<'de> serde::de::Deserialize<'de> for ValuePrimative {
+impl<'de> serde::de::Deserialize<'de> for ValuePrimitive {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: serde::de::Deserializer<'de>,
     {
         struct Visitor;
         impl<'de> serde::de::Visitor<'de> for Visitor {
-            type Value = ValuePrimative;
+            type Value = ValuePrimitive;
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
                 write!(formatter, "a JSON primative value")
             }
@@ -172,37 +130,37 @@ impl<'de> serde::de::Deserialize<'de> for ValuePrimative {
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Null)
+                Ok(ValuePrimitive::Null)
             }
             fn visit_none<E>(self) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Null)
+                Ok(ValuePrimitive::Null)
             }
             fn visit_bool<E>(self, v: bool) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Boolean(v))
+                Ok(ValuePrimitive::Boolean(v))
             }
             fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::String(v.to_owned()))
+                Ok(ValuePrimitive::String(v.to_owned()))
             }
             fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::String(v))
+                Ok(ValuePrimitive::String(v))
             }
             fn visit_f32<E>(self, v: f32) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(
+                Ok(ValuePrimitive::Number(
                     serde_json::Number::from_f64(v as f64).ok_or_else(|| {
                         serde::de::Error::invalid_value(
                             serde::de::Unexpected::Float(v as f64),
@@ -215,7 +173,7 @@ impl<'de> serde::de::Deserialize<'de> for ValuePrimative {
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(
+                Ok(ValuePrimitive::Number(
                     serde_json::Number::from_f64(v).ok_or_else(|| {
                         serde::de::Error::invalid_value(
                             serde::de::Unexpected::Float(v),
@@ -228,49 +186,49 @@ impl<'de> serde::de::Deserialize<'de> for ValuePrimative {
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(v.into()))
+                Ok(ValuePrimitive::Number(v.into()))
             }
             fn visit_u16<E>(self, v: u16) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(v.into()))
+                Ok(ValuePrimitive::Number(v.into()))
             }
             fn visit_u32<E>(self, v: u32) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(v.into()))
+                Ok(ValuePrimitive::Number(v.into()))
             }
             fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(v.into()))
+                Ok(ValuePrimitive::Number(v.into()))
             }
             fn visit_i8<E>(self, v: i8) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(v.into()))
+                Ok(ValuePrimitive::Number(v.into()))
             }
             fn visit_i16<E>(self, v: i16) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(v.into()))
+                Ok(ValuePrimitive::Number(v.into()))
             }
             fn visit_i32<E>(self, v: i32) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(v.into()))
+                Ok(ValuePrimitive::Number(v.into()))
             }
             fn visit_i64<E>(self, v: i64) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                Ok(ValuePrimative::Number(v.into()))
+                Ok(ValuePrimitive::Number(v.into()))
             }
         }
         deserializer.deserialize_any(Visitor)
diff --git a/foo b/foo
deleted file mode 120000
index 5cea28a80..000000000
--- a/foo
+++ /dev/null
@@ -1 +0,0 @@
-firmware/x86_64/foo.romr.gz
\ No newline at end of file
diff --git a/sdk/lib/osBindings/RecoverySource.ts b/sdk/lib/osBindings/RecoverySource.ts
index c40ec5132..40061f215 100644
--- a/sdk/lib/osBindings/RecoverySource.ts
+++ b/sdk/lib/osBindings/RecoverySource.ts
@@ -1,6 +1,11 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BackupTargetFS } from "./BackupTargetFS"
 
-export type RecoverySource =
+export type RecoverySource<Password> =
   | { type: "migrate"; guid: string }
-  | { type: "backup"; target: BackupTargetFS }
+  | {
+      type: "backup"
+      target: BackupTargetFS
+      password: Password
+      serverId: string
+    }
diff --git a/sdk/lib/osBindings/SetupExecuteParams.ts b/sdk/lib/osBindings/SetupExecuteParams.ts
index 4593e7667..17c35c346 100644
--- a/sdk/lib/osBindings/SetupExecuteParams.ts
+++ b/sdk/lib/osBindings/SetupExecuteParams.ts
@@ -5,6 +5,5 @@ import type { RecoverySource } from "./RecoverySource"
 export type SetupExecuteParams = {
   startOsLogicalname: string
   startOsPassword: EncryptedWire
-  recoverySource: RecoverySource | null
-  recoveryPassword: EncryptedWire | null
+  recoverySource: RecoverySource<EncryptedWire> | null
 }
diff --git a/web/projects/install-wizard/src/app/services/api/mock-api.service.ts b/web/projects/install-wizard/src/app/services/api/mock-api.service.ts
index 5be394c67..6b94f18db 100644
--- a/web/projects/install-wizard/src/app/services/api/mock-api.service.ts
+++ b/web/projects/install-wizard/src/app/services/api/mock-api.service.ts
@@ -18,11 +18,14 @@ export class MockApiService implements ApiService {
             capacity: 73264762332,
             used: null,
             startOs: {
-              version: '0.2.17',
-              full: true,
-              passwordHash:
-                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              wrappedKey: null,
+              '1234-5678-9876-5432': {
+                hostname: 'adjective-noun',
+                timestamp: new Date().toISOString(),
+                version: '0.2.17',
+                passwordHash:
+                  '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+                wrappedKey: null,
+              },
             },
             guid: null,
           },
@@ -41,11 +44,14 @@ export class MockApiService implements ApiService {
             capacity: 73264762332,
             used: null,
             startOs: {
-              version: '0.3.3',
-              full: true,
-              passwordHash:
-                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              wrappedKey: null,
+              '1234-5678-9876-5432': {
+                hostname: 'adjective-noun',
+                timestamp: new Date().toISOString(),
+                version: '0.2.17',
+                passwordHash:
+                  '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+                wrappedKey: null,
+              },
             },
             guid: null,
           },
@@ -64,11 +70,14 @@ export class MockApiService implements ApiService {
             capacity: 73264762332,
             used: null,
             startOs: {
-              version: '0.3.2',
-              full: true,
-              passwordHash:
-                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              wrappedKey: null,
+              '1234-5678-9876-5432': {
+                hostname: 'adjective-noun',
+                timestamp: new Date().toISOString(),
+                version: '0.2.17',
+                passwordHash:
+                  '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+                wrappedKey: null,
+              },
             },
             guid: 'guid-guid-guid-guid',
           },
diff --git a/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.module.ts b/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.module.ts
index b5c07d37c..78c09de0e 100644
--- a/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.module.ts
+++ b/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.module.ts
@@ -3,10 +3,11 @@ import { CommonModule } from '@angular/common'
 import { IonicModule } from '@ionic/angular'
 import { FormsModule } from '@angular/forms'
 import { CifsModal } from './cifs-modal.page'
+import { ServerBackupSelectModule } from '../server-backup-select/server-backup-select.module'
 
 @NgModule({
   declarations: [CifsModal],
-  imports: [CommonModule, FormsModule, IonicModule],
+  imports: [CommonModule, FormsModule, IonicModule, ServerBackupSelectModule],
   exports: [CifsModal],
 })
 export class CifsModalModule {}
diff --git a/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts b/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts
index 0664be38f..f6ce0e5bc 100644
--- a/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts
+++ b/web/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts
@@ -4,9 +4,9 @@ import {
   LoadingController,
   ModalController,
 } from '@ionic/angular'
-import { ApiService, CifsBackupTarget } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/api.service'
 import { StartOSDiskInfo } from '@start9labs/shared'
-import { PasswordPage } from '../password/password.page'
+import { ServerBackupSelectModal } from '../server-backup-select/server-backup-select.page'
 
 @Component({
   selector: 'cifs-modal',
@@ -50,30 +50,29 @@ export class CifsModal {
 
       await loader.dismiss()
 
-      this.presentModalPassword(diskInfo)
+      this.presentModalSelectServer(diskInfo)
     } catch (e) {
       await loader.dismiss()
       this.presentAlertFailed()
     }
   }
 
-  private async presentModalPassword(diskInfo: StartOSDiskInfo): Promise<void> {
-    const target: CifsBackupTarget = {
-      ...this.cifs,
-      mountable: true,
-      startOs: diskInfo,
-    }
-
+  private async presentModalSelectServer(
+    servers: Record<string, StartOSDiskInfo>,
+  ): Promise<void> {
     const modal = await this.modalController.create({
-      component: PasswordPage,
-      componentProps: { target },
+      component: ServerBackupSelectModal,
+      componentProps: {
+        servers: Object.keys(servers).map(id => ({ id, ...servers[id] })),
+      },
     })
     modal.onDidDismiss().then(res => {
       if (res.role === 'success') {
         this.modalController.dismiss(
           {
             cifs: this.cifs,
-            recoveryPassword: res.data.password,
+            serverId: res.data.serverId,
+            recoveryPassword: res.data.recoveryPassword,
           },
           'success',
         )
diff --git a/web/projects/setup-wizard/src/app/modals/password/password.page.ts b/web/projects/setup-wizard/src/app/modals/password/password.page.ts
index 8ea00ce0c..f99607002 100644
--- a/web/projects/setup-wizard/src/app/modals/password/password.page.ts
+++ b/web/projects/setup-wizard/src/app/modals/password/password.page.ts
@@ -1,9 +1,5 @@
 import { Component, Input, ViewChild } from '@angular/core'
 import { IonInput, ModalController } from '@ionic/angular'
-import {
-  CifsBackupTarget,
-  DiskBackupTarget,
-} from 'src/app/services/api/api.service'
 import * as argon2 from '@start9labs/argon2'
 
 @Component({
@@ -13,7 +9,7 @@ import * as argon2 from '@start9labs/argon2'
 })
 export class PasswordPage {
   @ViewChild('focusInput') elem?: IonInput
-  @Input() target?: CifsBackupTarget | DiskBackupTarget
+  @Input() passwordHash = ''
   @Input() storageDrive = false
 
   pwError = ''
@@ -31,13 +27,8 @@ export class PasswordPage {
   }
 
   async verifyPw() {
-    if (!this.target || !this.target.startOs)
-      this.pwError = 'No recovery target' // unreachable
-
     try {
-      const passwordHash = this.target!.startOs?.passwordHash || ''
-
-      argon2.verify(passwordHash, this.password)
+      argon2.verify(this.passwordHash, this.password)
       this.modalController.dismiss({ password: this.password }, 'success')
     } catch (e) {
       this.pwError = 'Incorrect password provided'
@@ -55,7 +46,7 @@ export class PasswordPage {
   }
 
   validate() {
-    if (!!this.target) return (this.pwError = '')
+    if (!!this.passwordHash) return (this.pwError = '')
 
     if (this.passwordVer) {
       this.checkVer()
diff --git a/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.module.ts b/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.module.ts
new file mode 100644
index 000000000..8305cd2a6
--- /dev/null
+++ b/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { IonicModule } from '@ionic/angular'
+import { FormsModule } from '@angular/forms'
+import { ServerBackupSelectModal } from './server-backup-select.page'
+import { PasswordPageModule } from '../password/password.module'
+
+@NgModule({
+  declarations: [ServerBackupSelectModal],
+  imports: [CommonModule, FormsModule, IonicModule, PasswordPageModule],
+  exports: [ServerBackupSelectModal],
+})
+export class ServerBackupSelectModule {}
diff --git a/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.html b/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.html
new file mode 100644
index 000000000..37736d78e
--- /dev/null
+++ b/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.html
@@ -0,0 +1,24 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>Select Server to Restore</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content class="ion-padding">
+  <ion-item *ngFor="let server of servers" button (click)="select(server)">
+    <ion-label>
+      <h2>
+        <b>Local Hostname</b>
+        : {{ server.hostname }}.local
+      </h2>
+      <h2>
+        <b>StartOS Version</b>
+        : {{ server.version }}
+      </h2>
+      <h2>
+        <b>Created</b>
+        : {{ server.timestamp | date : 'medium' }}
+      </h2>
+    </ion-label>
+  </ion-item>
+</ion-content>
diff --git a/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.scss b/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.ts b/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.ts
new file mode 100644
index 000000000..9b0d8cf8b
--- /dev/null
+++ b/web/projects/setup-wizard/src/app/modals/server-backup-select/server-backup-select.page.ts
@@ -0,0 +1,44 @@
+import { Component, Input } from '@angular/core'
+import { ModalController } from '@ionic/angular'
+import { StartOSDiskInfoWithId } from 'src/app/services/api/api.service'
+import { PasswordPage } from '../password/password.page'
+
+@Component({
+  selector: 'server-backup-select',
+  templateUrl: 'server-backup-select.page.html',
+  styleUrls: ['server-backup-select.page.scss'],
+})
+export class ServerBackupSelectModal {
+  @Input() servers: StartOSDiskInfoWithId[] = []
+
+  constructor(private readonly modalController: ModalController) {}
+
+  cancel() {
+    this.modalController.dismiss()
+  }
+
+  async select(server: StartOSDiskInfoWithId): Promise<void> {
+    this.presentModalPassword(server)
+  }
+
+  private async presentModalPassword(
+    server: StartOSDiskInfoWithId,
+  ): Promise<void> {
+    const modal = await this.modalController.create({
+      component: PasswordPage,
+      componentProps: { passwordHash: server.passwordHash },
+    })
+    modal.onDidDismiss().then(res => {
+      if (res.role === 'success') {
+        this.modalController.dismiss(
+          {
+            serverId: server.id,
+            recoveryPassword: res.data.password,
+          },
+          'success',
+        )
+      }
+    })
+    await modal.present()
+  }
+}
diff --git a/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts b/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
index 110768be5..2961daf63 100644
--- a/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts
@@ -9,6 +9,7 @@ import { DiskInfo, ErrorService, GuidPipe } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/api.service'
 import { StateService } from 'src/app/services/state.service'
 import { PasswordPage } from '../../modals/password/password.page'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'app-embassy',
@@ -50,15 +51,19 @@ export class EmbassyPage {
       const disks = await this.apiService.getDrives()
       if (this.stateService.setupType === 'fresh') {
         this.storageDrives = disks
-      } else if (this.stateService.setupType === 'restore') {
-        this.storageDrives = disks.filter(
-          d =>
-            this.stateService.recoverySource?.type === 'backup' &&
-            this.stateService.recoverySource.target?.type === 'disk' &&
-            !d.partitions
-              .map(p => p.logicalname)
-              .includes(this.stateService.recoverySource.target.logicalname),
-        )
+      } else if (
+        this.stateService.setupType === 'restore' &&
+        this.stateService.recoverySource?.type === 'backup'
+      ) {
+        if (this.stateService.recoverySource.target.type === 'disk') {
+          const logicalname =
+            this.stateService.recoverySource.target.logicalname
+          this.storageDrives = disks.filter(
+            d => !d.partitions.map(p => p.logicalname).includes(logicalname),
+          )
+        } else {
+          this.storageDrives = disks
+        }
       } else if (
         this.stateService.setupType === 'transfer' &&
         this.stateService.recoverySource?.type === 'migrate'
@@ -95,10 +100,10 @@ export class EmbassyPage {
             text: 'Continue',
             handler: () => {
               // for backup recoveries
-              if (this.stateService.recoveryPassword) {
+              if (this.stateService.recoverySource?.type === 'backup') {
                 this.setupEmbassy(
                   drive.logicalname,
-                  this.stateService.recoveryPassword,
+                  this.stateService.recoverySource.password,
                 )
               } else {
                 // for migrations and fresh setups
@@ -111,8 +116,11 @@ export class EmbassyPage {
       await alert.present()
     } else {
       // for backup recoveries
-      if (this.stateService.recoveryPassword) {
-        this.setupEmbassy(drive.logicalname, this.stateService.recoveryPassword)
+      if (this.stateService.recoverySource?.type === 'backup') {
+        this.setupEmbassy(
+          drive.logicalname,
+          this.stateService.recoverySource.password,
+        )
       } else {
         // for migrations and fresh setups
         this.presentModalPassword(drive.logicalname)
@@ -154,3 +162,7 @@ export class EmbassyPage {
     }
   }
 }
+
+function isDiskRecovery(source: T.RecoverySource<string>): source is any {
+  return source.type === 'backup' && source.target.type === 'disk'
+}
diff --git a/web/projects/setup-wizard/src/app/pages/recover/drive-status.component.html b/web/projects/setup-wizard/src/app/pages/recover/drive-status.component.html
deleted file mode 100644
index 7f4a4e5bd..000000000
--- a/web/projects/setup-wizard/src/app/pages/recover/drive-status.component.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="inline">
-  <!-- has backup -->
-  <h2 *ngIf="hasValidBackup; else noBackup">
-    <ion-icon name="cloud-done" color="success"></ion-icon>
-    StartOS backup detected
-  </h2>
-  <!-- no backup -->
-  <ng-template #noBackup>
-    <h2>
-      <ion-icon name="cloud-offline" color="danger"></ion-icon>
-      No StartOS backup
-    </h2>
-  </ng-template>
-</div>
diff --git a/web/projects/setup-wizard/src/app/pages/recover/recover.module.ts b/web/projects/setup-wizard/src/app/pages/recover/recover.module.ts
index eaf04f506..7ecda048a 100644
--- a/web/projects/setup-wizard/src/app/pages/recover/recover.module.ts
+++ b/web/projects/setup-wizard/src/app/pages/recover/recover.module.ts
@@ -3,13 +3,13 @@ import { CommonModule } from '@angular/common'
 import { IonicModule } from '@ionic/angular'
 import { FormsModule } from '@angular/forms'
 import { UnitConversionPipesModule } from '@start9labs/shared'
-import { DriveStatusComponent, RecoverPage } from './recover.page'
+import { RecoverPage } from './recover.page'
 import { PasswordPageModule } from '../../modals/password/password.module'
 import { RecoverPageRoutingModule } from './recover-routing.module'
 import { CifsModalModule } from 'src/app/modals/cifs-modal/cifs-modal.module'
 
 @NgModule({
-  declarations: [RecoverPage, DriveStatusComponent],
+  declarations: [RecoverPage],
   imports: [
     CommonModule,
     FormsModule,
diff --git a/web/projects/setup-wizard/src/app/pages/recover/recover.page.html b/web/projects/setup-wizard/src/app/pages/recover/recover.page.html
index 32f71a3ad..8b92b36d3 100644
--- a/web/projects/setup-wizard/src/app/pages/recover/recover.page.html
+++ b/web/projects/setup-wizard/src/app/pages/recover/recover.page.html
@@ -54,29 +54,21 @@ <h2 class="target-label">Physical Drive</h2>
                 </b>
               </div>
 
-              <ng-container *ngFor="let mapped of mappedDrives">
-                <ion-item
-                  button
-                  *ngIf="mapped.drive as drive"
-                  [disabled]="!driveClickable(mapped)"
-                  (click)="select(drive)"
-                  lines="none"
-                >
-                  <ion-icon
-                    slot="start"
-                    name="save-outline"
-                    size="large"
-                  ></ion-icon>
+              <ng-container *ngFor="let server of servers">
+                <ion-item button (click)="select(server)" lines="none">
                   <ion-label>
-                    <h1>{{ drive.label || drive.logicalname }}</h1>
-                    <drive-status
-                      [hasValidBackup]="mapped.hasValidBackup"
-                    ></drive-status>
-                    <p>
-                      {{ drive.vendor || 'Unknown Vendor' }} - {{ drive.model ||
-                      'Unknown Model' }}
-                    </p>
-                    <p>Capacity: {{ drive.capacity | convertBytes }}</p>
+                    <h2>
+                      <b>Local Hostname</b>
+                      : {{ server.hostname }}.local
+                    </h2>
+                    <h2>
+                      <b>StartOS Version</b>
+                      : {{ server.version }}
+                    </h2>
+                    <h2>
+                      <b>Created</b>
+                      : {{ server.timestamp | date : 'medium' }}
+                    </h2>
                   </ion-label>
                 </ion-item>
               </ng-container>
diff --git a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
index d47105f24..dd1dae9ce 100644
--- a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -1,8 +1,11 @@
-import { Component, Input } from '@angular/core'
+import { Component } from '@angular/core'
 import { ModalController, NavController } from '@ionic/angular'
 import { ErrorService } from '@start9labs/shared'
 import { CifsModal } from 'src/app/modals/cifs-modal/cifs-modal.page'
-import { ApiService, DiskBackupTarget } from 'src/app/services/api/api.service'
+import {
+  ApiService,
+  StartOSDiskInfoWithId,
+} from 'src/app/services/api/api.service'
 import { StateService } from 'src/app/services/state.service'
 import { PasswordPage } from '../../modals/password/password.page'
 
@@ -13,7 +16,7 @@ import { PasswordPage } from '../../modals/password/password.page'
 })
 export class RecoverPage {
   loading = true
-  mappedDrives: MappedDisk[] = []
+  servers: StartOSDiskInfoWithId[] = []
 
   constructor(
     private readonly apiService: ApiService,
@@ -34,33 +37,19 @@ export class RecoverPage {
     await this.getDrives()
   }
 
-  driveClickable(mapped: MappedDisk) {
-    return mapped.drive.startOs?.full
-  }
-
   async getDrives() {
-    this.mappedDrives = []
     try {
-      const disks = await this.apiService.getDrives()
-      disks
-        .filter(d => d.partitions.length)
-        .forEach(d => {
-          d.partitions.forEach(p => {
-            const drive: DiskBackupTarget = {
-              vendor: d.vendor,
-              model: d.model,
-              logicalname: p.logicalname,
-              label: p.label,
-              capacity: p.capacity,
-              used: p.used,
-              startOs: p.startOs,
-            }
-            this.mappedDrives.push({
-              hasValidBackup: !!p.startOs?.full,
-              drive,
-            })
-          })
-        })
+      const drives = await this.apiService.getDrives()
+      this.servers = drives.flatMap(drive =>
+        drive.partitions.flatMap(partition =>
+          Object.entries(partition.startOs).map(([id, val]) => ({
+            id,
+            ...val,
+            partition,
+            drive,
+          })),
+        ),
+      )
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
@@ -74,65 +63,41 @@ export class RecoverPage {
     })
     modal.onDidDismiss().then(res => {
       if (res.role === 'success') {
-        const { hostname, path, username, password } = res.data.cifs
         this.stateService.recoverySource = {
           type: 'backup',
           target: {
             type: 'cifs',
-            hostname,
-            path,
-            username,
-            password,
+            ...res.data.cifs,
           },
+          serverId: res.data.serverId,
+          password: res.data.recoveryPassword,
         }
-        this.stateService.recoveryPassword = res.data.recoveryPassword
         this.navCtrl.navigateForward('/storage')
       }
     })
     await modal.present()
   }
 
-  async select(target: DiskBackupTarget) {
-    const { logicalname } = target
-
-    if (!logicalname) return
-
+  async select(server: StartOSDiskInfoWithId) {
     const modal = await this.modalController.create({
       component: PasswordPage,
-      componentProps: { target },
+      componentProps: { passwordHash: server.passwordHash },
       cssClass: 'alertlike-modal',
     })
     modal.onDidDismiss().then(res => {
-      if (res.data?.password) {
-        this.selectRecoverySource(logicalname, res.data.password)
+      if (res.role === 'success') {
+        this.stateService.recoverySource = {
+          type: 'backup',
+          target: {
+            type: 'disk',
+            logicalname: res.data.logicalname,
+          },
+          serverId: server.id,
+          password: res.data.password,
+        }
+        this.navCtrl.navigateForward(`/storage`)
       }
     })
     await modal.present()
   }
-
-  private async selectRecoverySource(logicalname: string, password?: string) {
-    this.stateService.recoverySource = {
-      type: 'backup',
-      target: {
-        type: 'disk',
-        logicalname,
-      },
-    }
-    this.stateService.recoveryPassword = password
-    this.navCtrl.navigateForward(`/storage`)
-  }
-}
-
-@Component({
-  selector: 'drive-status',
-  templateUrl: './drive-status.component.html',
-  styleUrls: ['./recover.page.scss'],
-})
-export class DriveStatusComponent {
-  @Input() hasValidBackup!: boolean
-}
-
-interface MappedDisk {
-  hasValidBackup: boolean
-  drive: DiskBackupTarget
 }
diff --git a/web/projects/setup-wizard/src/app/pages/success/success.module.ts b/web/projects/setup-wizard/src/app/pages/success/success.module.ts
index c0a7a0ec2..7abb5d2d8 100644
--- a/web/projects/setup-wizard/src/app/pages/success/success.module.ts
+++ b/web/projects/setup-wizard/src/app/pages/success/success.module.ts
@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'
 import { IonicModule } from '@ionic/angular'
 import { FormsModule } from '@angular/forms'
 import { ResponsiveColModule } from '@start9labs/shared'
-
 import { SuccessPage } from './success.page'
 import { PasswordPageModule } from '../../modals/password/password.module'
 import { SuccessPageRoutingModule } from './success-routing.module'
diff --git a/web/projects/setup-wizard/src/app/pages/success/success.page.ts b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
index 88262bdf2..dab0b44a6 100644
--- a/web/projects/setup-wizard/src/app/pages/success/success.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
@@ -8,7 +8,6 @@ import { StateService } from 'src/app/services/state.service'
   selector: 'success',
   templateUrl: 'success.page.html',
   styleUrls: ['success.page.scss'],
-  providers: [DownloadHTMLService],
 })
 export class SuccessPage {
   @ViewChild('canvas', { static: true })
diff --git a/web/projects/setup-wizard/src/app/services/api/api.service.ts b/web/projects/setup-wizard/src/app/services/api/api.service.ts
index 6719ce859..882d656ae 100644
--- a/web/projects/setup-wizard/src/app/services/api/api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/api.service.ts
@@ -1,5 +1,10 @@
 import * as jose from 'node-jose'
-import { DiskListResponse, StartOSDiskInfo } from '@start9labs/shared'
+import {
+  DiskInfo,
+  DiskListResponse,
+  PartitionInfo,
+  StartOSDiskInfo,
+} from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 import { Observable } from 'rxjs'
@@ -10,14 +15,16 @@ export abstract class ApiService {
   abstract getStatus(): Promise<T.SetupStatusRes | null> // setup.status
   abstract getPubKey(): Promise<void> // setup.get-pubkey
   abstract getDrives(): Promise<DiskListResponse> // setup.disk.list
-  abstract verifyCifs(cifs: T.VerifyCifsParams): Promise<StartOSDiskInfo> // setup.cifs.verify
+  abstract verifyCifs(
+    cifs: T.VerifyCifsParams,
+  ): Promise<Record<string, StartOSDiskInfo>> // setup.cifs.verify
   abstract attach(importInfo: T.AttachParams): Promise<T.SetupProgress> // setup.attach
   abstract execute(setupInfo: T.SetupExecuteParams): Promise<T.SetupProgress> // setup.execute
   abstract complete(): Promise<T.SetupResult> // setup.complete
   abstract exit(): Promise<void> // setup.exit
   abstract openProgressWebsocket$(guid: string): Observable<T.FullProgress>
 
-  async encrypt(toEncrypt: string): Promise<Encrypted> {
+  async encrypt(toEncrypt: string): Promise<T.EncryptedWire> {
     if (!this.pubkey) throw new Error('No pubkey found!')
     const encrypted = await jose.JWE.createEncrypt(this.pubkey!)
       .update(toEncrypt)
@@ -28,26 +35,13 @@ export abstract class ApiService {
   }
 }
 
-type Encrypted = {
-  encrypted: string
-}
-
 export type WebsocketConfig<T> = Omit<WebSocketSubjectConfig<T>, 'url'>
 
-export type DiskBackupTarget = {
-  vendor: string | null
-  model: string | null
-  logicalname: string | null
-  label: string | null
-  capacity: number
-  used: number | null
-  startOs: StartOSDiskInfo | null
+export type StartOSDiskInfoWithId = StartOSDiskInfo & {
+  id: string
 }
 
-export type CifsBackupTarget = {
-  hostname: string
-  path: string
-  username: string
-  mountable: boolean
-  startOs: StartOSDiskInfo | null
+export type StartOSDiskInfoFull = StartOSDiskInfoWithId & {
+  partition: PartitionInfo
+  drive: DiskInfo
 }
diff --git a/web/projects/setup-wizard/src/app/services/api/live-api.service.ts b/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
index f431f5151..0245bf554 100644
--- a/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/live-api.service.ts
@@ -9,7 +9,7 @@ import {
   RPCOptions,
 } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
-import { ApiService, WebsocketConfig } from './api.service'
+import { ApiService } from './api.service'
 import * as jose from 'node-jose'
 import { Observable } from 'rxjs'
 import { DOCUMENT } from '@angular/common'
@@ -65,9 +65,11 @@ export class LiveApiService extends ApiService {
     })
   }
 
-  async verifyCifs(source: T.VerifyCifsParams): Promise<StartOSDiskInfo> {
+  async verifyCifs(
+    source: T.VerifyCifsParams,
+  ): Promise<Record<string, StartOSDiskInfo>> {
     source.path = source.path.replace('/\\/g', '/')
-    return this.rpcRequest<StartOSDiskInfo>({
+    return this.rpcRequest<Record<string, StartOSDiskInfo>>({
       method: 'setup.cifs.verify',
       params: source,
     })
diff --git a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
index 0a1c221f7..a5757b010 100644
--- a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
@@ -175,11 +175,14 @@ export class MockApiService extends ApiService {
             capacity: 1979120929996,
             used: null,
             startOs: {
-              version: '0.2.17',
-              full: true,
-              passwordHash:
-                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              wrappedKey: null,
+              '1234-5678-9876-5432': {
+                hostname: 'adjective-noun',
+                version: '0.2.17',
+                timestamp: new Date().toISOString(),
+                passwordHash:
+                  '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+                wrappedKey: null,
+              },
             },
             guid: null,
           },
@@ -198,11 +201,14 @@ export class MockApiService extends ApiService {
             capacity: 73264762332,
             used: null,
             startOs: {
-              version: '0.3.3',
-              full: true,
-              passwordHash:
-                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              wrappedKey: null,
+              '1234-5678-9876-5432': {
+                hostname: 'adjective-noun',
+                version: '0.2.17',
+                timestamp: new Date().toISOString(),
+                passwordHash:
+                  '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+                wrappedKey: null,
+              },
             },
             guid: null,
           },
@@ -221,11 +227,14 @@ export class MockApiService extends ApiService {
             capacity: 73264762332,
             used: null,
             startOs: {
-              version: '0.3.2',
-              full: true,
-              passwordHash:
-                '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-              wrappedKey: null,
+              '1234-5678-9876-5432': {
+                hostname: 'adjective-noun',
+                version: '0.2.17',
+                timestamp: new Date().toISOString(),
+                passwordHash:
+                  '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+                wrappedKey: null,
+              },
             },
             guid: 'guid-guid-guid-guid',
           },
@@ -236,14 +245,19 @@ export class MockApiService extends ApiService {
     ]
   }
 
-  async verifyCifs(params: T.VerifyCifsParams): Promise<StartOSDiskInfo> {
+  async verifyCifs(
+    params: T.VerifyCifsParams,
+  ): Promise<Record<string, StartOSDiskInfo>> {
     await pauseFor(1000)
     return {
-      version: '0.3.0',
-      full: true,
-      passwordHash:
-        '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-      wrappedKey: '',
+      '9876-5432-1234-5678': {
+        hostname: 'adjective-noun',
+        version: '0.3.6',
+        timestamp: new Date().toISOString(),
+        passwordHash:
+          '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+        wrappedKey: '',
+      },
     }
   }
 
diff --git a/web/projects/setup-wizard/src/app/services/state.service.ts b/web/projects/setup-wizard/src/app/services/state.service.ts
index 8c653a088..8f4290ac0 100644
--- a/web/projects/setup-wizard/src/app/services/state.service.ts
+++ b/web/projects/setup-wizard/src/app/services/state.service.ts
@@ -7,8 +7,7 @@ import { T } from '@start9labs/start-sdk'
 })
 export class StateService {
   setupType?: 'fresh' | 'restore' | 'attach' | 'transfer'
-  recoverySource?: T.RecoverySource
-  recoveryPassword?: string
+  recoverySource?: T.RecoverySource<string>
 
   constructor(private readonly api: ApiService) {}
 
@@ -26,9 +25,13 @@ export class StateService {
     await this.api.execute({
       startOsLogicalname: storageLogicalname,
       startOsPassword: await this.api.encrypt(password),
-      recoverySource: this.recoverySource || null,
-      recoveryPassword: this.recoveryPassword
-        ? await this.api.encrypt(this.recoveryPassword)
+      recoverySource: this.recoverySource
+        ? this.recoverySource.type === 'migrate'
+          ? this.recoverySource
+          : {
+              ...this.recoverySource,
+              password: await this.api.encrypt(this.recoverySource.password),
+            }
         : null,
     })
   }
diff --git a/web/projects/shared/src/services/download-html.service.ts b/web/projects/shared/src/services/download-html.service.ts
index 81f7b945b..13a146186 100644
--- a/web/projects/shared/src/services/download-html.service.ts
+++ b/web/projects/shared/src/services/download-html.service.ts
@@ -1,7 +1,9 @@
 import { DOCUMENT } from '@angular/common'
 import { Inject, Injectable } from '@angular/core'
 
-@Injectable()
+@Injectable({
+  providedIn: 'root',
+})
 export class DownloadHTMLService {
   constructor(@Inject(DOCUMENT) private readonly document: Document) {}
 
diff --git a/web/projects/shared/src/types/api.ts b/web/projects/shared/src/types/api.ts
index 743ea6ac8..c53ed5e33 100644
--- a/web/projects/shared/src/types/api.ts
+++ b/web/projects/shared/src/types/api.ts
@@ -32,13 +32,14 @@ export interface PartitionInfo {
   label: string | null
   capacity: number
   used: number | null
-  startOs: StartOSDiskInfo | null
+  startOs: Record<string, StartOSDiskInfo>
   guid: string | null
 }
 
 export type StartOSDiskInfo = {
+  hostname: string
   version: string
-  full: boolean
+  timestamp: string
   passwordHash: string | null
   wrappedKey: string | null
 }
diff --git a/web/projects/ui/src/app/app/preloader/preloader.component.html b/web/projects/ui/src/app/app/preloader/preloader.component.html
index 82923250e..b94b3fa0c 100644
--- a/web/projects/ui/src/app/app/preloader/preloader.component.html
+++ b/web/projects/ui/src/app/app/preloader/preloader.component.html
@@ -3,7 +3,7 @@
   <ion-icon *ngFor="let icon of icons" [name]="icon"></ion-icon>
 
   <!-- 3rd party components -->
-  <qr-code value="hello"></qr-code>
+  <qr-code control="hello"></qr-code>
 
   <!-- Ionic components -->
   <ion-accordion></ion-accordion>
@@ -58,21 +58,21 @@
   <img *ngFor="let icon of taiga" src="assets/taiga-ui/icons/{{ icon }}.svg" />
 
   <!-- Taiga UI components -->
-  <tui-input></tui-input>
-  <tui-input-time></tui-input-time>
-  <tui-input-date></tui-input-date>
-  <tui-input-date-time></tui-input-date-time>
-  <tui-input-files></tui-input-files>
-  <tui-input-number></tui-input-number>
-  <tui-text-area></tui-text-area>
-  <tui-select></tui-select>
-  <tui-multi-select></tui-multi-select>
+  <tui-input [formControl]="control"></tui-input>
+  <tui-input-time [formControl]="control"></tui-input-time>
+  <tui-input-date [formControl]="control"></tui-input-date>
+  <tui-input-date-time [formControl]="control"></tui-input-date-time>
+  <tui-input-files [formControl]="control"></tui-input-files>
+  <tui-input-number [formControl]="control"></tui-input-number>
+  <tui-textarea [formControl]="control"></tui-textarea>
+  <tui-select [formControl]="control"></tui-select>
+  <tui-multi-select [formControl]="control"></tui-multi-select>
+  <tui-toggle [formControl]="control"></tui-toggle>
+  <tui-radio-list [formControl]="control"></tui-radio-list>
   <tui-tooltip></tui-tooltip>
-  <tui-toggle></tui-toggle>
-  <tui-radio-list></tui-radio-list>
   <tui-error></tui-error>
-  <tui-svg></tui-svg>
-  <tui-icon></tui-icon>
+  <tui-svg src="tuiIconTrash"></tui-svg>
+  <tui-icon icon="tuiIconTrash"></tui-icon>
   <tui-expand></tui-expand>
   <tui-elastic-container></tui-elastic-container>
   <tui-scrollbar></tui-scrollbar>
diff --git a/web/projects/ui/src/app/app/preloader/preloader.component.ts b/web/projects/ui/src/app/app/preloader/preloader.component.ts
index f7184008e..177362222 100644
--- a/web/projects/ui/src/app/app/preloader/preloader.component.ts
+++ b/web/projects/ui/src/app/app/preloader/preloader.component.ts
@@ -1,4 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
+import { FormControl } from '@angular/forms'
 import {
   ActionSheetController,
   AlertController,
@@ -122,6 +123,7 @@ const TAIGA = [
 export class PreloaderComponent {
   readonly icons = ICONS
   readonly taiga = TAIGA
+  readonly control = new FormControl()
 
   constructor(
     _modals: ModalController,
diff --git a/web/projects/ui/src/app/app/preloader/preloader.module.ts b/web/projects/ui/src/app/app/preloader/preloader.module.ts
index 380b70f3a..0f22efb25 100644
--- a/web/projects/ui/src/app/app/preloader/preloader.module.ts
+++ b/web/projects/ui/src/app/app/preloader/preloader.module.ts
@@ -1,5 +1,6 @@
 import { CommonModule } from '@angular/common'
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'
+import { ReactiveFormsModule } from '@angular/forms'
 import { IonicModule } from '@ionic/angular'
 import {
   TuiErrorModule,
@@ -26,7 +27,7 @@ import {
   TuiProgressModule,
   TuiRadioListModule,
   TuiSelectModule,
-  TuiTextAreaModule,
+  TuiTextareaModule,
   TuiToggleModule,
 } from '@taiga-ui/kit'
 import { QrCodeModule } from 'ng-qrcode'
@@ -35,6 +36,7 @@ import { PreloaderComponent } from './preloader.component'
 @NgModule({
   imports: [
     CommonModule,
+    ReactiveFormsModule,
     IonicModule,
     QrCodeModule,
     TuiTooltipModule,
@@ -52,7 +54,7 @@ import { PreloaderComponent } from './preloader.component'
     TuiInputNumberModule,
     TuiExpandModule,
     TuiSelectModule,
-    TuiTextAreaModule,
+    TuiTextareaModule,
     TuiToggleModule,
     TuiElasticContainerModule,
     TuiCellModule,
diff --git a/web/projects/ui/src/app/components/backup-drives/backup-drives-status.component.html b/web/projects/ui/src/app/components/backup-drives/backup-drives-status.component.html
index e0437cd1d..ad422a8f8 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup-drives-status.component.html
+++ b/web/projects/ui/src/app/components/backup-drives/backup-drives-status.component.html
@@ -1,20 +1,16 @@
 <div class="inline">
   <h2 *ngIf="type === 'create'; else restore">
     <ion-icon name="cloud-outline" color="success"></ion-icon>
-    {{
-      hasValidBackup
-        ? 'Available, contains existing backup'
-        : 'Available for fresh backup'
-    }}
+    Available for backup
   </h2>
   <ng-template #restore>
-    <h2 *ngIf="hasValidBackup">
+    <h2 *ngIf="hasAnyBackup">
       <ion-icon name="cloud-done-outline" color="success"></ion-icon>
-      StartOS backup detected
+      StartOS backups detected
     </h2>
-    <h2 *ngIf="!hasValidBackup">
+    <h2 *ngIf="!hasAnyBackup">
       <ion-icon name="cloud-offline-outline" color="danger"></ion-icon>
-      No StartOS backup
+      No StartOS backups
     </h2>
   </ng-template>
 </div>
diff --git a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.html b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.html
index 141872084..82e508420 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.html
+++ b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.html
@@ -73,7 +73,7 @@ <h1>{{ cifs.path.split('/').pop() }}</h1>
               <ng-container *ngIf="cifs.mountable">
                 <backup-drives-status
                   [type]="type"
-                  [hasValidBackup]="target.hasValidBackup"
+                  [hasAnyBackup]="target.hasAnyBackup"
                 ></backup-drives-status>
               </ng-container>
               <h2 *ngIf="!cifs.mountable" class="inline">
@@ -155,7 +155,7 @@ <h2>
                 <h1>{{ drive.label || drive.logicalname }}</h1>
                 <backup-drives-status
                   [type]="type"
-                  [hasValidBackup]="target.hasValidBackup"
+                  [hasAnyBackup]="target.hasAnyBackup"
                 ></backup-drives-status>
                 <p>
                   {{ drive.vendor || 'Unknown Vendor' }} -
diff --git a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
index 5613ae153..a4b272c46 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
@@ -72,10 +72,10 @@ export class BackupDrivesComponent {
       return
     }
 
-    if (this.type === 'restore' && !target.hasValidBackup) {
+    if (this.type === 'restore' && !target.hasAnyBackup) {
       const message = `${
         target.entry.type === 'cifs' ? 'Network Folder' : 'Drive partition'
-      } does not contain a valid Start9 Server backup.`
+      } does not contain a valid backup.`
       this.presentAlertError(message)
       return
     }
@@ -153,7 +153,7 @@ export class BackupDrivesComponent {
       const [id, entry] = Object.entries(res)[0]
       this.backupService.cifs.unshift({
         id,
-        hasValidBackup: this.backupService.hasValidBackup(entry),
+        hasAnyBackup: this.backupService.hasAnyBackup(entry),
         entry,
       })
       return true
@@ -258,7 +258,7 @@ export class BackupDrivesHeaderComponent {
 })
 export class BackupDrivesStatusComponent {
   @Input() type!: BackupType
-  @Input() hasValidBackup!: boolean
+  @Input() hasAnyBackup!: boolean
 }
 
 const cifsSpec = CB.Config.of({
diff --git a/web/projects/ui/src/app/components/backup-drives/backup.service.ts b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
index 6beec7e2d..cc1898e7e 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup.service.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
@@ -34,7 +34,7 @@ export class BackupService {
         .map(([id, cifs]) => {
           return {
             id,
-            hasValidBackup: this.hasValidBackup(cifs),
+            hasAnyBackup: this.hasAnyBackup(cifs),
             entry: cifs as CifsBackupTarget,
           }
         })
@@ -44,7 +44,7 @@ export class BackupService {
         .map(([id, drive]) => {
           return {
             id,
-            hasValidBackup: this.hasValidBackup(drive),
+            hasAnyBackup: this.hasAnyBackup(drive),
             entry: drive as DiskBackupTarget,
           }
         })
@@ -55,8 +55,16 @@ export class BackupService {
     }
   }
 
-  hasValidBackup(target: BackupTarget): boolean {
-    const backup = target.startOs
-    return !!backup && this.emver.compare(backup.version, '0.3.0') !== -1
+  hasAnyBackup(target: BackupTarget): boolean {
+    return Object.values(target.startOs).some(
+      s => this.emver.compare(s.version, '0.3.6') !== -1,
+    )
+  }
+
+  async hasThisBackup(target: BackupTarget, id: string): Promise<boolean> {
+    return (
+      target.startOs[id] &&
+      this.emver.compare(target.startOs[id].version, '0.3.6') !== -1
+    )
   }
 }
diff --git a/web/projects/ui/src/app/components/form/form-group/form-group.component.html b/web/projects/ui/src/app/components/form/form-group/form-group.component.html
index d3c769b98..1c4f8301a 100644
--- a/web/projects/ui/src/app/components/form/form-group/form-group.component.html
+++ b/web/projects/ui/src/app/components/form/form-group/form-group.component.html
@@ -1,5 +1,5 @@
 <ng-container
-  *ngFor="let entry of spec | keyvalue: asIsOrder"
+  *ngFor="let entry of spec | keyvalue : asIsOrder"
   tuiMode="onDark"
   [ngSwitch]="entry.value.type"
   [tuiTextfieldCleaner]="true"
diff --git a/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html b/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html
index 7a2bf5149..1be4a67a2 100644
--- a/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html
+++ b/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.html
@@ -1,4 +1,4 @@
-<tui-text-area
+<tui-textarea
   [tuiHintContent]="spec | hint"
   [disabled]="!!spec.disabled"
   [readOnly]="readOnly"
@@ -12,4 +12,4 @@
   {{ spec.name }}
   <span *ngIf="spec.required">*</span>
   <textarea tuiTextfield [placeholder]="spec.placeholder || ''"></textarea>
-</tui-text-area>
+</tui-textarea>
diff --git a/web/projects/ui/src/app/components/form/form.module.ts b/web/projects/ui/src/app/components/form/form.module.ts
index fe16b229f..b7a36cd1f 100644
--- a/web/projects/ui/src/app/components/form/form.module.ts
+++ b/web/projects/ui/src/app/components/form/form.module.ts
@@ -30,7 +30,7 @@ import {
   TuiPromptModule,
   TuiSelectModule,
   TuiTagModule,
-  TuiTextAreaModule,
+  TuiTextareaModule,
   TuiToggleModule,
 } from '@taiga-ui/kit'
 
@@ -60,7 +60,7 @@ import { HintPipe } from './hint.pipe'
     TuiInputModule,
     TuiInputNumberModule,
     TuiInputFilesModule,
-    TuiTextAreaModule,
+    TuiTextareaModule,
     TuiSelectModule,
     TuiMultiSelectModule,
     TuiToggleModule,
diff --git a/web/projects/ui/src/app/components/logs/logs.component.ts b/web/projects/ui/src/app/components/logs/logs.component.ts
index c1ed61f09..59d78dac7 100644
--- a/web/projects/ui/src/app/components/logs/logs.component.ts
+++ b/web/projects/ui/src/app/components/logs/logs.component.ts
@@ -39,7 +39,7 @@ var convert = new Convert({
   selector: 'logs',
   templateUrl: './logs.component.html',
   styleUrls: ['./logs.component.scss'],
-  providers: [TuiDestroyService, DownloadHTMLService],
+  providers: [TuiDestroyService],
 })
 export class LogsComponent {
   @ViewChild(IonContent)
diff --git a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html
index 9dfb72da9..f1372f468 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html
+++ b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html
@@ -18,8 +18,8 @@
         <ion-label>
           <h2>{{ option.title }}</h2>
           <p>Version {{ option.version }}</p>
-          <p>Backup made: {{ option.timestamp | date : 'medium' }}</p>
-          <p *ngIf="!option.installed && !option['newer-eos']">
+          <p>Created: {{ option.timestamp | date : 'medium' }}</p>
+          <p *ngIf="!option.installed && !option.newerOS">
             <ion-text color="success">Ready to restore</ion-text>
           </p>
           <p *ngIf="option.installed">
@@ -27,7 +27,7 @@ <h2>{{ option.title }}</h2>
               Unavailable. {{ option.title }} is already installed.
             </ion-text>
           </p>
-          <p *ngIf="option['newer-eos']">
+          <p *ngIf="option.newerOS">
             <ion-text color="danger">
               Unavailable. Backup was made on a newer version of StartOS.
             </ion-text>
@@ -36,7 +36,7 @@ <h2>{{ option.title }}</h2>
         <ion-checkbox
           slot="end"
           [(ngModel)]="option.checked"
-          [disabled]="option.installed || option['newer-eos']"
+          [disabled]="option.installed || option.newerOS"
           (ionChange)="handleChange(options)"
         ></ion-checkbox>
       </ion-item>
diff --git a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
index e1d637ecf..c9869bce6 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.ts
@@ -14,10 +14,10 @@ import { AppRecoverOption } from './to-options.pipe'
   styleUrls: ['./app-recover-select.page.scss'],
 })
 export class AppRecoverSelectPage {
-  @Input() id!: string
+  @Input() targetId!: string
+  @Input() serverId!: string
   @Input() backupInfo!: BackupInfo
   @Input() password!: string
-  @Input() oldPassword?: string
 
   readonly packageData$ = this.patch.watch$('packageData').pipe(take(1))
 
@@ -46,8 +46,8 @@ export class AppRecoverSelectPage {
     try {
       await this.embassyApi.restorePackages({
         ids,
-        targetId: this.id,
-        oldPassword: this.oldPassword || null,
+        targetId: this.targetId,
+        serverId: this.serverId,
         password: this.password,
       })
       this.modalCtrl.dismiss(undefined, 'success')
diff --git a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
index 6a81df4bc..8a607896e 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
@@ -10,7 +10,7 @@ export interface AppRecoverOption extends PackageBackupInfo {
   id: string
   checked: boolean
   installed: boolean
-  'newer-eos': boolean
+  newerOS: boolean
 }
 
 @Pipe({
@@ -34,7 +34,7 @@ export class ToOptionsPipe implements PipeTransform {
             id,
             installed: !!packageData[id],
             checked: false,
-            'newer-eos': this.compare(packageBackups[id].osVersion),
+            newerOS: this.compare(packageBackups[id].osVersion),
           }))
           .sort((a, b) =>
             b.title.toLowerCase() > a.title.toLowerCase() ? -1 : 1,
diff --git a/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.module.ts b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.module.ts
new file mode 100644
index 000000000..958b98dff
--- /dev/null
+++ b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { IonicModule } from '@ionic/angular'
+import { FormsModule } from '@angular/forms'
+import { BackupServerSelectModal } from './backup-server-select.page'
+import { AppRecoverSelectPageModule } from 'src/app/modals/app-recover-select/app-recover-select.module'
+
+@NgModule({
+  declarations: [BackupServerSelectModal],
+  imports: [CommonModule, FormsModule, IonicModule, AppRecoverSelectPageModule],
+  exports: [BackupServerSelectModal],
+})
+export class BackupServerSelectModule {}
diff --git a/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.html b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.html
new file mode 100644
index 000000000..e5b2369e5
--- /dev/null
+++ b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.html
@@ -0,0 +1,35 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>Select Server Backup</ion-title>
+    <ion-buttons slot="end">
+      <ion-button (click)="dismiss()">
+        <ion-icon slot="icon-only" name="close"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content class="ion-padding">
+  <ion-item-group>
+    <ion-item
+      *ngFor="let server of target.entry.startOs | keyvalue"
+      button
+      (click)="presentModalPassword(server.key, server.value)"
+    >
+      <ion-label>
+        <h2>
+          <b>Local Hostname</b>
+          : {{ server.value.hostname }}.local
+        </h2>
+        <h2>
+          <b>StartOS Version</b>
+          : {{ server.value.version }}
+        </h2>
+        <h2>
+          <b>Created</b>
+          : {{ server.value.timestamp | date : 'medium' }}
+        </h2>
+      </ion-label>
+    </ion-item>
+  </ion-item-group>
+</ion-content>
diff --git a/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.scss b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
new file mode 100644
index 000000000..e1f4f8961
--- /dev/null
+++ b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
@@ -0,0 +1,103 @@
+import { Component, Input } from '@angular/core'
+import { ModalController, NavController } from '@ionic/angular'
+import * as argon2 from '@start9labs/argon2'
+import {
+  ErrorService,
+  LoadingService,
+  StartOSDiskInfo,
+} from '@start9labs/shared'
+import {
+  BackupInfo,
+  CifsBackupTarget,
+  DiskBackupTarget,
+} from 'src/app/services/api/api.types'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
+import { AppRecoverSelectPage } from '../app-recover-select/app-recover-select.page'
+import { PasswordPromptModal } from './password-prompt.modal'
+
+@Component({
+  selector: 'backup-server-select',
+  templateUrl: 'backup-server-select.page.html',
+  styleUrls: ['backup-server-select.page.scss'],
+})
+export class BackupServerSelectModal {
+  @Input() target!: MappedBackupTarget<CifsBackupTarget | DiskBackupTarget>
+
+  constructor(
+    private readonly modalCtrl: ModalController,
+    private readonly loader: LoadingService,
+    private readonly api: ApiService,
+    private readonly navCtrl: NavController,
+    private readonly errorService: ErrorService,
+  ) {}
+
+  dismiss() {
+    this.modalCtrl.dismiss()
+  }
+
+  async presentModalPassword(
+    serverId: string,
+    server: StartOSDiskInfo,
+  ): Promise<void> {
+    const modal = await this.modalCtrl.create({
+      component: PasswordPromptModal,
+    })
+    modal.present()
+
+    const { data, role } = await modal.onWillDismiss()
+
+    if (role === 'confirm') {
+      try {
+        argon2.verify(server.passwordHash!, data)
+        await this.restoreFromBackup(serverId, data)
+      } catch (e: any) {
+        this.errorService.handleError(e)
+      }
+    }
+  }
+
+  private async restoreFromBackup(
+    serverId: string,
+    password: string,
+  ): Promise<void> {
+    const loader = this.loader.open('Decrypting drive...').subscribe()
+
+    try {
+      const backupInfo = await this.api.getBackupInfo({
+        targetId: this.target.id,
+        serverId,
+        password,
+      })
+      this.presentModalSelect(serverId, backupInfo, password)
+    } finally {
+      loader.unsubscribe()
+    }
+  }
+
+  private async presentModalSelect(
+    serverId: string,
+    backupInfo: BackupInfo,
+    password: string,
+  ): Promise<void> {
+    const modal = await this.modalCtrl.create({
+      componentProps: {
+        targetId: this.target.id,
+        serverId,
+        backupInfo,
+        password,
+      },
+      presentingElement: await this.modalCtrl.getTop(),
+      component: AppRecoverSelectPage,
+    })
+
+    modal.onDidDismiss().then(res => {
+      if (res.role === 'success') {
+        this.modalCtrl.dismiss(undefined, 'success')
+        this.navCtrl.navigateRoot('/services')
+      }
+    })
+
+    await modal.present()
+  }
+}
diff --git a/web/projects/ui/src/app/modals/backup-server-select/password-prompt.modal.ts b/web/projects/ui/src/app/modals/backup-server-select/password-prompt.modal.ts
new file mode 100644
index 000000000..2af89e3d0
--- /dev/null
+++ b/web/projects/ui/src/app/modals/backup-server-select/password-prompt.modal.ts
@@ -0,0 +1,69 @@
+import { Component } from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { IonicModule, ModalController } from '@ionic/angular'
+import { TuiInputPasswordModule } from '@taiga-ui/kit'
+
+@Component({
+  standalone: true,
+  template: `
+    <ion-header>
+      <ion-toolbar>
+        <ion-title>Decrypt Backup</ion-title>
+        <ion-buttons slot="end">
+          <ion-button (click)="cancel()">
+            <ion-icon slot="icon-only" name="close"></ion-icon>
+          </ion-button>
+        </ion-buttons>
+      </ion-toolbar>
+    </ion-header>
+
+    <ion-content class="ion-padding">
+      <p>
+        Enter the password that was used to encrypt this backup. On the next
+        screen, you will select the individual services you want to restore.
+      </p>
+      <p>
+        <tui-input-password [(ngModel)]="password">
+          Enter password
+        </tui-input-password>
+      </p>
+    </ion-content>
+
+    <ion-footer>
+      <ion-toolbar>
+        <ion-button
+          class="ion-padding-end"
+          slot="end"
+          color="dark"
+          (click)="cancel()"
+        >
+          Cancel
+        </ion-button>
+        <ion-button
+          class="ion-padding-end"
+          slot="end"
+          color="primary"
+          strong="true"
+          [disabled]="!password"
+          (click)="confirm()"
+        >
+          Next
+        </ion-button>
+      </ion-toolbar>
+    </ion-footer>
+  `,
+  imports: [IonicModule, FormsModule, TuiInputPasswordModule],
+})
+export class PasswordPromptModal {
+  password = ''
+
+  constructor(private modalCtrl: ModalController) {}
+
+  cancel() {
+    return this.modalCtrl.dismiss(null, 'cancel')
+  }
+
+  confirm() {
+    return this.modalCtrl.dismiss(this.password, 'confirm')
+  }
+}
diff --git a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.html b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.html
index 7440c9a77..ef22a587b 100644
--- a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.html
+++ b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.html
@@ -1,5 +1,5 @@
 <backup-drives
   type="restore"
   class="ion-page"
-  (onSelect)="presentModalPassword($event)"
+  (onSelect)="presentModalSelectServer($event)"
 ></backup-drives>
diff --git a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.module.ts b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.module.ts
index 8cb4f6916..da99e66a2 100644
--- a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.module.ts
+++ b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.module.ts
@@ -5,7 +5,7 @@ import { IonicModule } from '@ionic/angular'
 import { RestorePage } from './restore.component'
 import { SharedPipesModule } from '@start9labs/shared'
 import { BackupDrivesComponentModule } from 'src/app/components/backup-drives/backup-drives.component.module'
-import { AppRecoverSelectPageModule } from 'src/app/modals/app-recover-select/app-recover-select.module'
+import { BackupServerSelectModule } from 'src/app/modals/backup-server-select/backup-server-select.module'
 
 const routes: Routes = [
   {
@@ -21,7 +21,7 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     SharedPipesModule,
     BackupDrivesComponentModule,
-    AppRecoverSelectPageModule,
+    BackupServerSelectModule,
   ],
   declarations: [RestorePage],
 })
diff --git a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
index ae644399f..58f679908 100644
--- a/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
+++ b/web/projects/ui/src/app/pages/server-routes/restore/restore.component.ts
@@ -1,18 +1,11 @@
 import { Component } from '@angular/core'
-import { ModalController, NavController } from '@ionic/angular'
-import { LoadingService } from '@start9labs/shared'
-import { TuiDialogService } from '@taiga-ui/core'
-import { take } from 'rxjs/operators'
-import { PROMPT, PromptOptions } from 'src/app/modals/prompt.component'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { ModalController } from '@ionic/angular'
 import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
 import {
-  BackupInfo,
   CifsBackupTarget,
   DiskBackupTarget,
 } from 'src/app/services/api/api.types'
-import { AppRecoverSelectPage } from 'src/app/modals/app-recover-select/app-recover-select.page'
-import * as argon2 from '@start9labs/argon2'
+import { BackupServerSelectModal } from 'src/app/modals/backup-server-select/backup-server-select.page'
 
 @Component({
   selector: 'restore',
@@ -20,78 +13,15 @@ import * as argon2 from '@start9labs/argon2'
   styleUrls: ['./restore.component.scss'],
 })
 export class RestorePage {
-  constructor(
-    private readonly modalCtrl: ModalController,
-    private readonly dialogs: TuiDialogService,
-    private readonly navCtrl: NavController,
-    private readonly embassyApi: ApiService,
-    private readonly loader: LoadingService,
-  ) {}
+  constructor(private readonly modalCtrl: ModalController) {}
 
-  async presentModalPassword(
+  async presentModalSelectServer(
     target: MappedBackupTarget<CifsBackupTarget | DiskBackupTarget>,
-  ): Promise<void> {
-    const options: PromptOptions = {
-      message:
-        'Enter the master password that was used to encrypt this backup. On the next screen, you will select the individual services you want to restore.',
-      label: 'Master Password',
-      placeholder: 'Enter master password',
-      useMask: true,
-      buttonText: 'Next',
-    }
-
-    this.dialogs
-      .open<string>(PROMPT, {
-        label: 'Password Required',
-        data: options,
-      })
-      .pipe(take(1))
-      .subscribe(async (password: string) => {
-        const passwordHash = target.entry.startOs?.passwordHash || ''
-        argon2.verify(passwordHash, password)
-        await this.restoreFromBackup(target, password)
-      })
-  }
-
-  private async restoreFromBackup(
-    target: MappedBackupTarget<CifsBackupTarget | DiskBackupTarget>,
-    password: string,
-    oldPassword?: string,
-  ): Promise<void> {
-    const loader = this.loader.open('Decrypting drive...').subscribe()
-
-    try {
-      const backupInfo = await this.embassyApi.getBackupInfo({
-        targetId: target.id,
-        password,
-      })
-      this.presentModalSelect(target.id, backupInfo, password, oldPassword)
-    } finally {
-      loader.unsubscribe()
-    }
-  }
-
-  private async presentModalSelect(
-    id: string,
-    backupInfo: BackupInfo,
-    password: string,
-    oldPassword?: string,
   ): Promise<void> {
     const modal = await this.modalCtrl.create({
-      componentProps: {
-        id,
-        backupInfo,
-        password,
-        oldPassword,
-      },
+      componentProps: { target },
       presentingElement: await this.modalCtrl.getTop(),
-      component: AppRecoverSelectPage,
-    })
-
-    modal.onWillDismiss().then(res => {
-      if (res.role === 'success') {
-        this.navCtrl.navigateRoot('/services')
-      }
+      component: BackupServerSelectModal,
     })
 
     await modal.present()
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
index 804a88fab..b570b1603 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
@@ -17,6 +17,7 @@ import { BackupSelectPage } from 'src/app/modals/backup-select/backup-select.pag
 import { EOSService } from 'src/app/services/eos.service'
 import { getServerInfo } from 'src/app/util/get-server-info'
 import { DataModel } from 'src/app/services/patch-db/data-model'
+import { BackupService } from 'src/app/components/backup-drives/backup.service'
 
 @Component({
   selector: 'server-backup',
@@ -38,6 +39,7 @@ export class ServerBackupPage {
     private readonly destroy$: TuiDestroyService,
     private readonly eosService: EOSService,
     private readonly patch: PatchDB<DataModel>,
+    private readonly backupService: BackupService,
   ) {}
 
   ngOnInit() {
@@ -86,19 +88,18 @@ export class ServerBackupPage {
       })
       .pipe(take(1))
       .subscribe(async (password: string) => {
+        const { passwordHash, id } = await getServerInfo(this.patch)
+
         // confirm password matches current master password
-        const { passwordHash } = await getServerInfo(this.patch)
         argon2.verify(passwordHash, password)
 
         // first time backup
-        if (!target.hasValidBackup) {
+        if (!this.backupService.hasThisBackup(target.entry, id)) {
           await this.createBackup(target, password)
           // existing backup
         } else {
           try {
-            const passwordHash = target.entry.startOs?.passwordHash || ''
-
-            argon2.verify(passwordHash, password)
+            argon2.verify(target.entry.startOs[id].passwordHash!, password)
           } catch {
             setTimeout(
               () => this.presentModalOldPassword(target, password),
@@ -124,6 +125,8 @@ export class ServerBackupPage {
       buttonText: 'Create Backup',
     }
 
+    const { id } = await getServerInfo(this.patch)
+
     this.dialogs
       .open<string>(PROMPT, {
         label: 'Original Password Needed',
@@ -131,8 +134,7 @@ export class ServerBackupPage {
       })
       .pipe(take(1))
       .subscribe(async (oldPassword: string) => {
-        const passwordHash = target.entry.startOs?.passwordHash || ''
-
+        const passwordHash = target.entry.startOs[id].passwordHash!
         argon2.verify(passwordHash, oldPassword)
         await this.createBackup(target, password, oldPassword)
       })
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index abddbcf90..a1f81fd95 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -600,12 +600,15 @@ export module Mock {
       username: 'TestUser',
       mountable: false,
       startOs: {
-        version: '0.3.0',
-        full: true,
-        passwordHash:
-          // password is asdfasdf
-          '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-        wrappedKey: '',
+        '1234-5678-9876-5432': {
+          hostname: 'adjective-noun',
+          timestamp: new Date().toISOString(),
+          version: '0.3.6',
+          passwordHash:
+            // password is asdfasdf
+            '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+          wrappedKey: '',
+        },
       },
     },
     // 'ftcvewdnkemfksdm': {
@@ -616,7 +619,7 @@ export module Mock {
     //   used: 0,
     //   model: 'Evo SATA 2.5',
     //   vendor: 'Samsung',
-    //   startOs: null,
+    //   startOs: {},
     // },
     csgashbdjkasnd: {
       type: 'cifs',
@@ -624,7 +627,7 @@ export module Mock {
       path: '/Desktop/startos-backups-2',
       username: 'TestUser',
       mountable: true,
-      startOs: null,
+      startOs: {},
     },
     powjefhjbnwhdva: {
       type: 'disk',
@@ -635,30 +638,33 @@ export module Mock {
       model: null,
       vendor: 'SSK',
       startOs: {
-        version: '0.3.0',
-        full: true,
-        // password is asdfasdf
-        passwordHash:
-          '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-        wrappedKey: '',
+        '1234-5678-9876-5432': {
+          hostname: 'adjective-noun',
+          timestamp: new Date().toISOString(),
+          version: '0.3.6',
+          passwordHash:
+            // password is asdfasdf
+            '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
+          wrappedKey: '',
+        },
       },
     },
   }
 
   export const BackupInfo: RR.GetBackupInfoRes = {
-    version: '0.3.0',
+    version: '0.3.6',
     timestamp: new Date().toISOString(),
     packageBackups: {
       bitcoind: {
         title: 'Bitcoin Core',
         version: '0.21.0',
-        osVersion: '0.3.0',
+        osVersion: '0.3.6',
         timestamp: new Date().toISOString(),
       },
       'btc-rpc-proxy': {
         title: 'Bitcoin Proxy',
         version: '0.2.2',
-        osVersion: '0.3.0',
+        osVersion: '0.3.6',
         timestamp: new Date().toISOString(),
       },
     },
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 7ca97db53..5ada03cad 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -191,7 +191,12 @@ export module RR {
   export type RemoveBackupTargetReq = { id: string } // backup.target.cifs.remove
   export type RemoveBackupTargetRes = null
 
-  export type GetBackupInfoReq = { targetId: string; password: string } // backup.target.info
+  export type GetBackupInfoReq = {
+    // backup.target.info
+    targetId: string
+    serverId: string
+    password: string
+  }
   export type GetBackupInfoRes = BackupInfo
 
   export type CreateBackupReq = {
@@ -239,7 +244,7 @@ export module RR {
     // package.backup.restore
     ids: string[]
     targetId: string
-    oldPassword: string | null
+    serverId: string
     password: string
   }
   export type RestorePackagesRes = null
@@ -403,7 +408,7 @@ export interface DiskBackupTarget {
   label: string | null
   capacity: number
   used: number | null
-  startOs: StartOSDiskInfo | null
+  startOs: Record<string, StartOSDiskInfo>
 }
 
 export interface CifsBackupTarget {
@@ -412,7 +417,7 @@ export interface CifsBackupTarget {
   path: string
   username: string
   mountable: boolean
-  startOs: StartOSDiskInfo | null
+  startOs: Record<string, StartOSDiskInfo>
 }
 
 export type RecoverySource = DiskRecoverySource | CifsRecoverySource
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 284e3bab8..21491dc52 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -582,7 +582,7 @@ export class MockApiService extends ApiService {
         path: path.replace(/\\/g, '/'),
         username,
         mountable: true,
-        startOs: null,
+        startOs: {},
       },
     }
   }
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 92fd979ef..8411b7b7c 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -59,7 +59,7 @@ export const mockPatchData: DataModel = {
     // password is asdfasdf
     passwordHash:
       '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-    eosVersionCompat: '>=0.3.0 <=0.3.0.1',
+    eosVersionCompat: '>=0.3.0 <=0.3.6',
     statusInfo: {
       backupProgress: null,
       updated: false,
diff --git a/web/projects/ui/src/app/types/mapped-backup-target.ts b/web/projects/ui/src/app/types/mapped-backup-target.ts
index 13b51d4b5..4b3610bec 100644
--- a/web/projects/ui/src/app/types/mapped-backup-target.ts
+++ b/web/projects/ui/src/app/types/mapped-backup-target.ts
@@ -1,5 +1,5 @@
 export interface MappedBackupTarget<T> {
   id: string
-  hasValidBackup: boolean
+  hasAnyBackup: boolean
   entry: T
 }

From 6def083b4f8507a9cd64f4a99cc97a2c2ae658ce Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 11 Jul 2024 14:55:13 -0600
Subject: [PATCH 184/341] fix deadlock on install (#2667)

* fix deadlock on install

* improve pruning script

* bump tokio
---
 build/dpkg-deps/depends                       |   1 +
 build/lib/scripts/chroot-and-upgrade          |   2 +-
 build/lib/scripts/prune-images                |   2 +-
 core/Cargo.lock                               | 340 ++++++++++++------
 core/startos/Cargo.toml                       |  25 +-
 core/startos/src/disk/main.rs                 |   2 +-
 core/startos/src/disk/mount/backup.rs         |   8 +-
 core/startos/src/disk/mount/guard.rs          |   2 +-
 core/startos/src/init.rs                      |   5 +
 core/startos/src/middleware/auth.rs           |   4 +-
 core/startos/src/net/static_server.rs         |   7 +-
 core/startos/src/progress.rs                  |   2 +-
 core/startos/src/s9pk/v1/reader.rs            |   2 +-
 core/startos/src/s9pk/v2/pack.rs              |   6 +-
 core/startos/src/service/mod.rs               |   2 +
 core/startos/src/service/service_map.rs       |   3 +
 .../startos/src/service/transition/restart.rs |   2 -
 core/startos/src/util/io.rs                   |   2 +-
 core/startos/src/util/mod.rs                  |   2 +-
 core/startos/src/util/serde.rs                |   4 +-
 20 files changed, 271 insertions(+), 152 deletions(-)

diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index 33b7be2ad..3ccaee4d6 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -1,5 +1,6 @@
 avahi-daemon
 avahi-utils
+b3sum
 bash-completion
 beep
 bmon
diff --git a/build/lib/scripts/chroot-and-upgrade b/build/lib/scripts/chroot-and-upgrade
index 59581fbc6..3af93f5ef 100755
--- a/build/lib/scripts/chroot-and-upgrade
+++ b/build/lib/scripts/chroot-and-upgrade
@@ -85,7 +85,7 @@ if [ "$CHROOT_RES" -eq 0 ]; then
     echo 'Upgrading...'
 
     time mksquashfs /media/startos/next /media/startos/images/next.squashfs -b 4096 -comp gzip
-    hash=$(start-cli util b3sum /media/startos/images/next.squashfs | head -c 32)
+    hash=$(b3sum /media/startos/images/next.squashfs | head -c 32)
     mv /media/startos/images/next.squashfs /media/startos/images/${hash}.rootfs
     ln -rsf /media/startos/images/${hash}.rootfs /media/startos/config/current.rootfs
 
diff --git a/build/lib/scripts/prune-images b/build/lib/scripts/prune-images
index 21861467f..20356a28c 100755
--- a/build/lib/scripts/prune-images
+++ b/build/lib/scripts/prune-images
@@ -33,7 +33,7 @@ if [ -h /media/startos/config/current.rootfs ] && [ -e /media/startos/config/cur
     echo 'Pruning...'
     current="$(readlink -f /media/startos/config/current.rootfs)"
     while [[ "$(df -B1 --output=avail --sync /media/startos/images | tail -n1)" -lt "$needed" ]]; do
-        to_prune="$(ls -t1 /media/startos/images/*.rootfs | grep -v "$current" | tail -n1)"
+        to_prune="$(ls -t1 /media/startos/images/*.rootfs /media/startos/images/*.squashfs | grep -v "$current" | tail -n1)"
         if [ -e "$to_prune" ]; then
             echo "  Pruning $to_prune"
             rm -rf "$to_prune"
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 80c2dcc0e..9f7face93 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -261,21 +261,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "aws-lc-rs"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "a8a47f2fb521b70c11ce7369a6c5fa4bd6af7e5d62ec06303875bafe7c6ba245"
 dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
+ "aws-lc-sys",
+ "mirai-annotations",
+ "paste",
+ "zeroize",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.3.0"
+name = "aws-lc-sys"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "2927c7af777b460b7ccd95f8b67acd7b4c04ec8896bf0c8e80ba30523cffc057"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+ "libc",
+ "paste",
+]
 
 [[package]]
 name = "axum"
@@ -335,7 +351,7 @@ dependencies = [
  "sha1",
  "sync_wrapper 1.0.1",
  "tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.21.0",
  "tower",
  "tower-layer",
  "tower-service",
@@ -453,6 +469,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
 
+[[package]]
+name = "base32"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1ce0365f4d5fb6646220bb52fe547afd51796d90f914d4063cb0b032ebee088"
+
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -491,6 +513,29 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.69.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+dependencies = [
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.12.1",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.68",
+ "which",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -651,12 +696,27 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom 7.1.3",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.38"
@@ -727,6 +787,17 @@ dependencies = [
  "inout",
 ]
 
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "clap"
 version = "4.5.7"
@@ -767,6 +838,15 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
+[[package]]
+name = "cmake"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "color-eyre"
 version = "0.6.3"
@@ -833,9 +913,9 @@ dependencies = [
 
 [[package]]
 name = "console-api"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787"
+checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd"
 dependencies = [
  "futures-core",
  "prost",
@@ -846,9 +926,9 @@ dependencies = [
 
 [[package]]
 name = "console-subscriber"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e"
+checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758"
 dependencies = [
  "console-api",
  "crossbeam-channel",
@@ -856,6 +936,7 @@ dependencies = [
  "futures-task",
  "hdrhistogram",
  "humantime",
+ "prost",
  "prost-types",
  "serde",
  "serde_json",
@@ -915,17 +996,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "cookie"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
 [[package]]
 name = "cookie"
 version = "0.18.1"
@@ -937,30 +1007,13 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "cookie_store"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6"
-dependencies = [
- "cookie 0.17.0",
- "idna 0.3.0",
- "log",
- "publicsuffix",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "url",
-]
-
 [[package]]
 name = "cookie_store"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
 dependencies = [
- "cookie 0.18.1",
+ "cookie",
  "idna 0.5.0",
  "log",
  "publicsuffix",
@@ -1362,6 +1415,12 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "dunce"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.17"
@@ -1685,6 +1744,12 @@ dependencies = [
  "itertools 0.8.2",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "funty"
 version = "1.1.0"
@@ -1836,6 +1901,12 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "gpt"
 version = "3.1.0"
@@ -1992,15 +2063,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -2178,7 +2240,7 @@ dependencies = [
  "rustls 0.23.10",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls",
  "tower-service",
 ]
 
@@ -2447,7 +2509,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -2689,6 +2751,12 @@ dependencies = [
  "spin",
 ]
 
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
 [[package]]
 name = "lexical-core"
 version = "0.7.6"
@@ -2708,6 +2776,16 @@ version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
+[[package]]
+name = "libloading"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.52.5",
+]
+
 [[package]]
 name = "libm"
 version = "0.2.8"
@@ -2878,6 +2956,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mirai-annotations"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
+
 [[package]]
 name = "models"
 version = "0.1.0"
@@ -2969,12 +3053,13 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.27.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
+ "cfg_aliases",
  "libc",
 ]
 
@@ -3123,7 +3208,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
 ]
 
@@ -3540,6 +3625,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.68",
+]
+
 [[package]]
 name = "prettytable-rs"
 version = "0.10.0"
@@ -3603,13 +3698,13 @@ dependencies = [
 
 [[package]]
 name = "proptest-derive"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e"
+checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3892,8 +3987,8 @@ checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "base64 0.22.1",
  "bytes",
- "cookie 0.18.1",
- "cookie_store 0.21.0",
+ "cookie",
+ "cookie_store",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -3934,12 +4029,12 @@ dependencies = [
 
 [[package]]
 name = "reqwest_cookie_store"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ea5c6f30c19d766efe8d823c88f9abd1c56516648a0d4264ab2dc04cc19472"
+checksum = "a0b36498c7452f11b1833900f31fbb01fc46be20992a50269c88cf59d79f54e9"
 dependencies = [
  "bytes",
- "cookie_store 0.20.0",
+ "cookie_store",
  "reqwest",
  "url",
 ]
@@ -4095,26 +4190,14 @@ dependencies = [
  "sct",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring",
- "rustls-pki-types",
- "rustls-webpki 0.102.4",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "rustls"
 version = "0.23.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
 dependencies = [
+ "aws-lc-rs",
+ "log",
  "once_cell",
  "rustls-pki-types",
  "rustls-webpki 0.102.4",
@@ -4163,6 +4246,7 @@ version = "0.102.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -4475,6 +4559,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-hook"
 version = "0.3.17"
@@ -4874,8 +4964,8 @@ dependencies = [
  "axum-server",
  "backhand",
  "barrage",
- "base32",
- "base64 0.21.7",
+ "base32 0.5.0",
+ "base64 0.22.1",
  "base64ct",
  "basic-cookies",
  "blake3",
@@ -4886,8 +4976,8 @@ dependencies = [
  "color-eyre",
  "console",
  "console-subscriber",
- "cookie 0.18.1",
- "cookie_store 0.20.0",
+ "cookie",
+ "cookie_store",
  "der",
  "digest 0.10.7",
  "divrem",
@@ -4914,7 +5004,7 @@ dependencies = [
  "ipnet",
  "iprange",
  "isocountry",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "jaq-core",
  "jaq-std",
  "josekit",
@@ -4927,7 +5017,7 @@ dependencies = [
  "mbrman",
  "models",
  "new_mime_guess",
- "nix 0.27.1",
+ "nix 0.29.0",
  "nom 7.1.3",
  "num",
  "num_enum",
@@ -4963,15 +5053,14 @@ dependencies = [
  "sqlx",
  "sscanf",
  "ssh-key",
- "stderrlog",
  "tar",
  "thiserror",
  "tokio",
- "tokio-rustls 0.25.0",
+ "tokio-rustls",
  "tokio-socks",
  "tokio-stream",
  "tokio-tar",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.23.1",
  "tokio-util",
  "toml 0.8.14",
  "torut",
@@ -4996,19 +5085,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "stderrlog"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b"
-dependencies = [
- "atty",
- "chrono",
- "log",
- "termcolor",
- "thread_local",
-]
-
 [[package]]
 name = "string_cache"
 version = "0.8.7"
@@ -5312,17 +5388,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.26.0"
@@ -5377,13 +5442,25 @@ name = "tokio-tungstenite"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.21.0",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
 dependencies = [
  "futures-util",
  "log",
  "native-tls",
  "tokio",
  "tokio-native-tls",
- "tungstenite",
+ "tungstenite 0.23.0",
 ]
 
 [[package]]
@@ -5471,9 +5548,9 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
+checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -5501,7 +5578,7 @@ name = "torut"
 version = "0.2.1"
 source = "git+https://github.com/Start9Labs/torut.git?branch=update/dependencies#cc7a1425a01214465e106975e6690794d8551bdb"
 dependencies = [
- "base32",
+ "base32 0.4.0",
  "base64 0.21.7",
  "derive_more",
  "ed25519-dalek 1.0.1",
@@ -5728,6 +5805,25 @@ name = "tungstenite"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 1.1.0",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror",
+ "url",
+ "utf-8",
+]
+
+[[package]]
+name = "tungstenite"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
 dependencies = [
  "byteorder",
  "bytes",
@@ -6045,6 +6141,18 @@ version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
 [[package]]
 name = "whoami"
 version = "1.5.1"
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index d2304fedb..842ef44ef 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -61,8 +61,8 @@ axum = { version = "0.7.3", features = ["ws"] }
 axum-server = "0.6.0"
 barrage = "0.2.3"
 backhand = "0.18.0"
-base32 = "0.4.0"
-base64 = "0.21.4"
+base32 = "0.5.0"
+base64 = "0.22.1"
 base64ct = "1.6.0"
 basic-cookies = "0.1.4"
 blake3 = { version = "1.5.0", features = ["mmap", "rayon"] }
@@ -71,9 +71,9 @@ chrono = { version = "0.4.31", features = ["serde"] }
 clap = "4.4.12"
 color-eyre = "0.6.2"
 console = "0.15.7"
-console-subscriber = { version = "0.2", optional = true }
+console-subscriber = { version = "0.3.0", optional = true }
 cookie = "0.18.0"
-cookie_store = "0.20.0"
+cookie_store = "0.21.0"
 der = { version = "0.7.9", features = ["derive", "pem"] }
 digest = "0.10.7"
 divrem = "1.0.0"
@@ -102,7 +102,7 @@ id-pool = { version = "0.2.2", default-features = false, features = [
   "serde",
   "u16",
 ] }
-imbl = "2.0.2"
+imbl = "2.0.3"
 imbl-value = { git = "https://github.com/Start9Labs/imbl-value.git" }
 include_dir = { version = "0.7.3", features = ["metadata"] }
 indexmap = { version = "2.0.2", features = ["serde"] }
@@ -111,7 +111,7 @@ integer-encoding = { version = "4.0.0", features = ["tokio_async"] }
 ipnet = { version = "2.8.0", features = ["serde"] }
 iprange = { version = "0.6.7", features = ["serde"] }
 isocountry = "0.3.2"
-itertools = "0.12.0"
+itertools = "0.13.0"
 jaq-core = "0.10.1"
 jaq-std = "0.10.0"
 josekit = "0.8.4"
@@ -124,7 +124,7 @@ log = "0.4.20"
 mbrman = "0.5.2"
 models = { version = "*", path = "../models" }
 new_mime_guess = "4"
-nix = { version = "0.27.1", features = ["user", "process", "signal", "fs"] }
+nix = { version = "0.29.0", features = ["user", "process", "signal", "fs"] }
 nom = "7.1.3"
 num = "0.4.1"
 num_enum = "0.7.0"
@@ -140,11 +140,11 @@ pin-project = "1.1.3"
 pkcs8 = { version = "0.10.2", features = ["std"] }
 prettytable-rs = "0.10.0"
 proptest = "1.3.1"
-proptest-derive = "0.4.0"
+proptest-derive = "0.5.0"
 rand = { version = "0.8.5", features = ["std"] }
 regex = "1.10.2"
 reqwest = { version = "0.12.4", features = ["stream", "json", "socks"] }
-reqwest_cookie_store = "0.7.0"
+reqwest_cookie_store = "0.8.0"
 rpassword = "7.2.0"
 rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "refactor/no-dyn-ctx" }
 rust-argon2 = "2.0.0"
@@ -168,15 +168,14 @@ sqlx = { version = "0.7.2", features = [
 ] }
 sscanf = "0.4.1"
 ssh-key = { version = "0.6.2", features = ["ed25519"] }
-stderrlog = "0.5.4"
 tar = "0.4.40"
 thiserror = "1.0.49"
-tokio = { version = "1.37", features = ["full"] }
-tokio-rustls = "0.25.0"
+tokio = { version = "1.38.0", features = ["full"] }
+tokio-rustls = "0.26.0"
 tokio-socks = "0.5.1"
 tokio-stream = { version = "0.1.14", features = ["io-util", "sync", "net"] }
 tokio-tar = { git = "https://github.com/dr-bonez/tokio-tar.git" }
-tokio-tungstenite = { version = "0.21.0", features = ["native-tls"] }
+tokio-tungstenite = { version = "0.23.1", features = ["native-tls", "url"] }
 tokio-util = { version = "0.7.9", features = ["io"] }
 torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies", features = [
   "serialize",
diff --git a/core/startos/src/disk/main.rs b/core/startos/src/disk/main.rs
index ee807a938..3a13c5dca 100644
--- a/core/startos/src/disk/main.rs
+++ b/core/startos/src/disk/main.rs
@@ -66,7 +66,7 @@ where
     let mut guid = format!(
         "STARTOS_{}",
         base32::encode(
-            base32::Alphabet::RFC4648 { padding: false },
+            base32::Alphabet::Rfc4648 { padding: false },
             &rand::random::<[u8; 20]>(),
         )
     );
diff --git a/core/startos/src/disk/mount/backup.rs b/core/startos/src/disk/mount/backup.rs
index 67f88d21f..142301a74 100644
--- a/core/startos/src/disk/mount/backup.rs
+++ b/core/startos/src/disk/mount/backup.rs
@@ -65,7 +65,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
             unencrypted_metadata.wrapped_key.as_ref(),
         ) {
             let wrapped_key =
-                base32::decode(base32::Alphabet::RFC4648 { padding: true }, wrapped_key)
+                base32::decode(base32::Alphabet::Rfc4648 { padding: true }, wrapped_key)
                     .ok_or_else(|| {
                         Error::new(
                             eyre!("failed to decode wrapped key"),
@@ -76,7 +76,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
             String::from_utf8(decrypt_slice(wrapped_key, password))?
         } else {
             base32::encode(
-                base32::Alphabet::RFC4648 { padding: false },
+                base32::Alphabet::Rfc4648 { padding: false },
                 &rand::random::<[u8; 32]>()[..],
             )
         };
@@ -93,7 +93,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
         }
         if unencrypted_metadata.wrapped_key.is_none() {
             unencrypted_metadata.wrapped_key = Some(base32::encode(
-                base32::Alphabet::RFC4648 { padding: true },
+                base32::Alphabet::Rfc4648 { padding: true },
                 &encrypt_slice(&enc_key, password),
             ));
         }
@@ -141,7 +141,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
             .with_kind(crate::ErrorKind::PasswordHashGeneration)?,
         );
         self.unencrypted_metadata.wrapped_key = Some(base32::encode(
-            base32::Alphabet::RFC4648 { padding: false },
+            base32::Alphabet::Rfc4648 { padding: false },
             &encrypt_slice(&self.enc_key, new_password),
         ));
         Ok(())
diff --git a/core/startos/src/disk/mount/guard.rs b/core/startos/src/disk/mount/guard.rs
index 4686a10b8..d6e7e3da1 100644
--- a/core/startos/src/disk/mount/guard.rs
+++ b/core/startos/src/disk/mount/guard.rs
@@ -111,7 +111,7 @@ impl GenericMountGuard for MountGuard {
 
 async fn tmp_mountpoint(source: &impl FileSystem) -> Result<PathBuf, Error> {
     Ok(Path::new(TMP_MOUNTPOINT).join(base32::encode(
-        base32::Alphabet::RFC4648 { padding: false },
+        base32::Alphabet::Rfc4648 { padding: false },
         &source.source_hash().await?[0..20],
     )))
 }
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index fdc38b60d..48cb24c9a 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -30,6 +30,7 @@ use crate::progress::{
     FullProgress, FullProgressTracker, PhaseProgressTrackerHandle, PhasedProgressBar,
 };
 use crate::rpc_continuations::{Guid, RpcContinuation};
+use crate::s9pk::v2::pack::{CONTAINER_DATADIR, CONTAINER_TOOL};
 use crate::ssh::SSH_AUTHORIZED_KEYS_FILE;
 use crate::util::io::{create_file, IOHook};
 use crate::util::net::WebSocketExt;
@@ -421,6 +422,10 @@ pub async fn init(
         tokio::fs::remove_dir_all(&tmp_var).await?;
     }
     crate::disk::mount::util::bind(&tmp_var, "/var/tmp", false).await?;
+    let tmp_docker = cfg
+        .datadir()
+        .join(format!("package-data/tmp/{CONTAINER_TOOL}"));
+    crate::disk::mount::util::bind(&tmp_docker, CONTAINER_DATADIR, false).await?;
     init_tmp.complete();
 
     set_governor.start();
diff --git a/core/startos/src/middleware/auth.rs b/core/startos/src/middleware/auth.rs
index ecf88dba7..fd60894db 100644
--- a/core/startos/src/middleware/auth.rs
+++ b/core/startos/src/middleware/auth.rs
@@ -151,7 +151,7 @@ impl HashSessionToken {
     pub fn new() -> Self {
         Self::from_token(InternedString::intern(
             base32::encode(
-                base32::Alphabet::RFC4648 { padding: false },
+                base32::Alphabet::Rfc4648 { padding: false },
                 &rand::random::<[u8; 16]>(),
             )
             .to_lowercase(),
@@ -200,7 +200,7 @@ impl HashSessionToken {
         hasher.update(token.as_bytes());
         InternedString::intern(
             base32::encode(
-                base32::Alphabet::RFC4648 { padding: false },
+                base32::Alphabet::Rfc4648 { padding: false },
                 hasher.finalize().as_slice(),
             )
             .to_lowercase(),
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index 79adad504..3e5f0997d 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -253,7 +253,7 @@ fn cert_send(cert: &X509, hostname: &Hostname) -> Result<Response, Error> {
         .header(
             http::header::ETAG,
             base32::encode(
-                base32::Alphabet::RFC4648 { padding: false },
+                base32::Alphabet::Rfc4648 { padding: false },
                 &*cert.digest(MessageDigest::sha256())?,
             )
             .to_lowercase(),
@@ -338,8 +338,7 @@ impl FileData {
             .any(|e| e == "gzip")
             .then_some("gzip");
 
-        let file = open_file(path)
-            .await?;
+        let file = open_file(path).await?;
         let metadata = file
             .metadata()
             .await
@@ -439,6 +438,6 @@ fn e_tag(path: &Path, modified: impl AsRef<[u8]>) -> String {
     let res = hasher.finalize();
     format!(
         "\"{}\"",
-        base32::encode(base32::Alphabet::RFC4648 { padding: false }, res.as_slice()).to_lowercase()
+        base32::encode(base32::Alphabet::Rfc4648 { padding: false }, res.as_slice()).to_lowercase()
     )
 }
diff --git a/core/startos/src/progress.rs b/core/startos/src/progress.rs
index f70a5adbc..5a2e5ef27 100644
--- a/core/startos/src/progress.rs
+++ b/core/startos/src/progress.rs
@@ -279,7 +279,7 @@ impl FullProgressTracker {
                     .mutate(|v| {
                         if let Some(p) = deref(v) {
                             p.ser(&progress)?;
-                            Ok(false)
+                            Ok(progress.overall.is_complete())
                         } else {
                             Ok(true)
                         }
diff --git a/core/startos/src/s9pk/v1/reader.rs b/core/startos/src/s9pk/v1/reader.rs
index f2bbf578e..05f351343 100644
--- a/core/startos/src/s9pk/v1/reader.rs
+++ b/core/startos/src/s9pk/v1/reader.rs
@@ -206,7 +206,7 @@ impl<R: AsyncRead + AsyncSeek + Unpin + Send + Sync> S9pkReader<R> {
             (
                 Some(hash),
                 Some(base32::encode(
-                    base32::Alphabet::RFC4648 { padding: false },
+                    base32::Alphabet::Rfc4648 { padding: false },
                     hash.as_slice(),
                 )),
             )
diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index fb271e785..ae6807c23 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -32,10 +32,14 @@ use crate::util::Invoke;
 
 #[cfg(not(feature = "docker"))]
 pub const CONTAINER_TOOL: &str = "podman";
-
 #[cfg(feature = "docker")]
 pub const CONTAINER_TOOL: &str = "docker";
 
+#[cfg(feature = "docker")]
+pub const CONTAINER_DATADIR: &str = "/var/lib/docker";
+#[cfg(not(feature = "docker"))]
+pub const CONTAINER_DATADIR: &str = "/var/lib/containers";
+
 pub struct SqfsDir {
     path: PathBuf,
     tmpdir: Arc<TmpDir>,
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index b85bd8d6d..581d2ac0d 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -374,9 +374,11 @@ impl Service {
                 entry.as_icon_mut().ser(&icon)?;
                 // TODO: marketplace url
                 // TODO: dependency info
+
                 Ok(())
             })
             .await?;
+
         Ok(service)
     }
 
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 02244169c..af10a065c 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -294,9 +294,12 @@ impl ServiceMap {
                             .into(),
                         );
                     }
+                    drop(service);
+
                     sync_progress_task.await.map_err(|_| {
                         Error::new(eyre!("progress sync task panicked"), ErrorKind::Unknown)
                     })??;
+
                     Ok(())
                 })
                 .boxed())
diff --git a/core/startos/src/service/transition/restart.rs b/core/startos/src/service/transition/restart.rs
index a39291621..108e232ad 100644
--- a/core/startos/src/service/transition/restart.rs
+++ b/core/startos/src/service/transition/restart.rs
@@ -20,7 +20,6 @@ impl Handler<Restart> for ServiceActor {
             .except::<DependencyConfig>()
     }
     async fn handle(&mut self, _: Guid, _: Restart, jobs: &BackgroundJobQueue) -> Self::Response {
-        dbg!("here");
         // So Need a handle to just a single field in the state
         let temp = TempDesiredRestore::new(&self.0.persistent_container.state);
         let mut current = self.0.persistent_container.state.subscribe();
@@ -77,7 +76,6 @@ impl Handler<Restart> for ServiceActor {
 impl Service {
     #[instrument(skip_all)]
     pub async fn restart(&self, id: Guid) -> Result<(), Error> {
-        dbg!("here");
         self.actor.send(id, Restart).await
     }
 }
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index 1ec789f23..bba45fa69 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -781,7 +781,7 @@ pub struct TmpDir {
 impl TmpDir {
     pub async fn new() -> Result<Self, Error> {
         let path = Path::new("/var/tmp/startos").join(base32::encode(
-            base32::Alphabet::RFC4648 { padding: false },
+            base32::Alphabet::Rfc4648 { padding: false },
             &rand::random::<[u8; 8]>(),
         ));
         if tokio::fs::metadata(&path).await.is_ok() {
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 7200eaaba..0c9e5c5f9 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -644,7 +644,7 @@ pub fn new_guid() -> InternedString {
     let mut buf = [0; 20];
     rand::thread_rng().fill_bytes(&mut buf);
     InternedString::intern(base32::encode(
-        base32::Alphabet::RFC4648 { padding: false },
+        base32::Alphabet::Rfc4648 { padding: false },
         &buf,
     ))
 }
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 049fad2d2..44a69165e 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -958,7 +958,7 @@ impl<T: AsRef<[u8]>> std::fmt::Display for Base16<T> {
 pub struct Base32<T>(pub T);
 impl<T: AsRef<[u8]>> std::fmt::Display for Base32<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        base32::encode(base32::Alphabet::RFC4648 { padding: true }, self.0.as_ref()).fmt(f)
+        base32::encode(base32::Alphabet::Rfc4648 { padding: true }, self.0.as_ref()).fmt(f)
     }
 }
 impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base32<T> {
@@ -967,7 +967,7 @@ impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base32<T> {
         D: Deserializer<'de>,
     {
         let s = String::deserialize(deserializer)?;
-        base32::decode(base32::Alphabet::RFC4648 { padding: true }, &s)
+        base32::decode(base32::Alphabet::Rfc4648 { padding: true }, &s)
             .ok_or_else(|| {
                 serde::de::Error::invalid_value(
                     serde::de::Unexpected::Str(&s),

From d235ebaac989d46a2692433c575af28a86bdd2eb Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Thu, 11 Jul 2024 17:58:07 -0600
Subject: [PATCH 185/341] solve infinite recursion and promise returning true

---
 .../src/app/components/backup-drives/backup.service.ts   | 2 +-
 .../backup-server-select/backup-server-select.page.ts    | 1 +
 .../server-routes/server-backup/server-backup.page.ts    | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/projects/ui/src/app/components/backup-drives/backup.service.ts b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
index cc1898e7e..7e05178bf 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup.service.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
@@ -61,7 +61,7 @@ export class BackupService {
     )
   }
 
-  async hasThisBackup(target: BackupTarget, id: string): Promise<boolean> {
+  hasThisBackup(target: BackupTarget, id: string): boolean {
     return (
       target.startOs[id] &&
       this.emver.compare(target.startOs[id].version, '0.3.6') !== -1
diff --git a/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
index e1f4f8961..0f1c47276 100644
--- a/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
+++ b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
@@ -49,6 +49,7 @@ export class BackupServerSelectModal {
 
     if (role === 'confirm') {
       try {
+        // @TODO Alex if invalid password, we should tell the user "Invalid password" and halt execution of this function. The modal should remain so the user can try again. Correct password is asdfasdf
         argon2.verify(server.passwordHash!, data)
         await this.restoreFromBackup(serverId, data)
       } catch (e: any) {
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
index b570b1603..25532c256 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
@@ -60,7 +60,7 @@ export class ServerBackupPage {
       component: BackupSelectPage,
     })
 
-    modal.onWillDismiss().then(res => {
+    modal.onDidDismiss().then(res => {
       if (res.data) {
         this.serviceIds = res.data
         this.presentModalPassword(target)
@@ -90,6 +90,7 @@ export class ServerBackupPage {
       .subscribe(async (password: string) => {
         const { passwordHash, id } = await getServerInfo(this.patch)
 
+        // @TODO Alex if invalid password, we should tell the user "Invalid password" and halt execution of this function. The modal should remain so the user can try again. Correct password is asdfasdf
         // confirm password matches current master password
         argon2.verify(passwordHash, password)
 
@@ -103,7 +104,7 @@ export class ServerBackupPage {
           } catch {
             setTimeout(
               () => this.presentModalOldPassword(target, password),
-              500,
+              250,
             )
             return
           }
@@ -134,8 +135,8 @@ export class ServerBackupPage {
       })
       .pipe(take(1))
       .subscribe(async (oldPassword: string) => {
-        const passwordHash = target.entry.startOs[id].passwordHash!
-        argon2.verify(passwordHash, oldPassword)
+        // @TODO Alex if invalid password, we should tell the user "Invalid password" and halt execution of this function. The modal should remain so the user can try again. Correct password is asdfasdf
+        argon2.verify(target.entry.startOs[id].passwordHash!, oldPassword)
         await this.createBackup(target, password, oldPassword)
       })
   }

From 0f5cec0a604f4d6714e0640a5684abcaa58e9d9c Mon Sep 17 00:00:00 2001
From: waterplea <alexander@inkin.ru>
Date: Fri, 12 Jul 2024 11:14:45 +0500
Subject: [PATCH 186/341] fix: fix wrong password messaging

---
 web/package-lock.json                         | 94 +++++++++----------
 web/package.json                              | 12 +--
 .../shared/src/services/error.service.ts      |  1 -
 .../badge-menu-button/badge-menu.component.ts |  4 +-
 .../backup-server-select.page.ts              | 44 ++++++---
 ....modal.ts => password-prompt.component.ts} | 45 +++++++--
 .../server-backup/server-backup.page.scss     |  0
 .../server-backup/server-backup.page.ts       | 81 +++++++++-------
 .../ui/src/app/pages/widgets/widgets.page.ts  |  4 +-
 9 files changed, 170 insertions(+), 115 deletions(-)
 rename web/projects/ui/src/app/modals/{backup-server-select/password-prompt.modal.ts => password-prompt.component.ts} (59%)
 delete mode 100644 web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.scss

diff --git a/web/package-lock.json b/web/package-lock.json
index e07531a96..cf32bbc01 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -28,12 +28,12 @@
         "@start9labs/argon2": "^0.2.2",
         "@start9labs/emver": "^0.1.5",
         "@start9labs/start-sdk": "file:../sdk/dist",
-        "@taiga-ui/addon-charts": "3.84.0",
-        "@taiga-ui/cdk": "3.84.0",
-        "@taiga-ui/core": "3.84.0",
-        "@taiga-ui/experimental": "3.84.0",
-        "@taiga-ui/icons": "3.84.0",
-        "@taiga-ui/kit": "3.84.0",
+        "@taiga-ui/addon-charts": "3.86.0",
+        "@taiga-ui/cdk": "3.86.0",
+        "@taiga-ui/core": "3.86.0",
+        "@taiga-ui/experimental": "3.86.0",
+        "@taiga-ui/icons": "3.86.0",
+        "@taiga-ui/kit": "3.86.0",
         "@tinkoff/ng-dompurify": "4.0.0",
         "@tinkoff/ng-event-plugins": "3.2.0",
         "angular-svg-round-progressbar": "^9.0.0",
@@ -4128,9 +4128,9 @@
       }
     },
     "node_modules/@taiga-ui/addon-charts": {
-      "version": "3.84.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-charts/-/addon-charts-3.84.0.tgz",
-      "integrity": "sha512-XR7UFywnrv4NRLHOCbba63gXDYYDL4Rt0MbjnF54p5U2EXnbt2of7VbjlB6cPx40XkQqfqa3CNayYxWZP82Ijg==",
+      "version": "3.86.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-charts/-/addon-charts-3.86.0.tgz",
+      "integrity": "sha512-Du/85qqaj8hpFSI6hPuFeIhtE93Z6WSkYZLt0gvnsaCb2qSAg8D4oHSogrtF1rsWGGoM+fvXjD7UEUw9GzFIPg==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -4138,15 +4138,15 @@
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
         "@ng-web-apis/common": "^3.0.6",
-        "@taiga-ui/cdk": "^3.84.0",
-        "@taiga-ui/core": "^3.84.0",
+        "@taiga-ui/cdk": "^3.86.0",
+        "@taiga-ui/core": "^3.86.0",
         "@tinkoff/ng-polymorpheus": "^4.3.0"
       }
     },
     "node_modules/@taiga-ui/addon-commerce": {
-      "version": "3.84.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-commerce/-/addon-commerce-3.84.0.tgz",
-      "integrity": "sha512-1zqLwnZLAYYcHvjH89d7JmtV2+QeZ2YnSJ3YWEMNLjGPzpev4RvQXtDfglIyu0LCyTxqpXmuzes9v/cgq2P5TQ==",
+      "version": "3.86.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-commerce/-/addon-commerce-3.86.0.tgz",
+      "integrity": "sha512-8QSB490ckI4jnU+1sQ3x8os2GVE162hbvzPVYIZ0TruoeXl076dAz6PT2WRaFwjcaCAIGsuaQgQ4Cv02NjkiYQ==",
       "peer": true,
       "dependencies": {
         "tslib": "^2.6.2"
@@ -4159,18 +4159,18 @@
         "@maskito/core": "^1.9.0",
         "@maskito/kit": "^1.9.0",
         "@ng-web-apis/common": "^3.0.6",
-        "@taiga-ui/cdk": "^3.84.0",
-        "@taiga-ui/core": "^3.84.0",
-        "@taiga-ui/i18n": "^3.84.0",
-        "@taiga-ui/kit": "^3.84.0",
+        "@taiga-ui/cdk": "^3.86.0",
+        "@taiga-ui/core": "^3.86.0",
+        "@taiga-ui/i18n": "^3.86.0",
+        "@taiga-ui/kit": "^3.86.0",
         "@tinkoff/ng-polymorpheus": "^4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/cdk": {
-      "version": "3.84.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/cdk/-/cdk-3.84.0.tgz",
-      "integrity": "sha512-0umw/CUmYNEYOCUNQVTQS53zXzxZsH/6+lj1mFVzocvfJFJWAUT6ltCH9QvxYmxSDDGWwNGg16AaVo2K+aGL0w==",
+      "version": "3.86.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/cdk/-/cdk-3.86.0.tgz",
+      "integrity": "sha512-aVbnW01Oh0Er1sHKVGHP8W05mOSKxjSzFE3Qx4iF4T6KW7Rlz9HZoNx5ADMg0TATYChtWh9Kwjo8I4LSVj2ZUw==",
       "dependencies": {
         "@ng-web-apis/common": "3.0.6",
         "@ng-web-apis/mutation-observer": "3.1.0",
@@ -4221,11 +4221,11 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@taiga-ui/core": {
-      "version": "3.84.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/core/-/core-3.84.0.tgz",
-      "integrity": "sha512-FZy77z0E4qjYcszVcp+qPFkPwJPl8qXZb7t2P+juUtJvSmSn2foQHHdyhbIYN808H26tqCdgkTMG1BWQxVuDSg==",
+      "version": "3.86.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/core/-/core-3.86.0.tgz",
+      "integrity": "sha512-diQKOnPtDDfxPOMk6wLRq8nyDVfNSPSNy+1TeyqzUgOvJ6XAjfaBXGsL3iuR7AN8+sz/b3rJmBce+vdw6FjMLQ==",
       "dependencies": {
-        "@taiga-ui/i18n": "^3.84.0",
+        "@taiga-ui/i18n": "^3.86.0",
         "tslib": "^2.6.2"
       },
       "peerDependencies": {
@@ -4237,35 +4237,35 @@
         "@angular/router": ">=12.0.0",
         "@ng-web-apis/common": "^3.0.6",
         "@ng-web-apis/mutation-observer": "^3.1.0",
-        "@taiga-ui/cdk": "^3.84.0",
-        "@taiga-ui/i18n": "^3.84.0",
+        "@taiga-ui/cdk": "^3.86.0",
+        "@taiga-ui/i18n": "^3.86.0",
         "@tinkoff/ng-event-plugins": "^3.2.0",
         "@tinkoff/ng-polymorpheus": "^4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/experimental": {
-      "version": "3.84.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/experimental/-/experimental-3.84.0.tgz",
-      "integrity": "sha512-q0hNVy+EmywCG8hpZlg/+haKIFhnmxicQiSeV/D1P7CHO10safjGo0ptT6e1hYMFa5/cJZOM4OwDPen2xs17Wg==",
+      "version": "3.86.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/experimental/-/experimental-3.86.0.tgz",
+      "integrity": "sha512-ACjoRVeX5MgsNJsiu2ukliXLD2mfEWm8Vtmk78vqcnkyPUmy1ZWK4sG3p5ybFN8AdIMHkblVq0l+x2qAwr/+LQ==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
       "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
-        "@taiga-ui/addon-commerce": "^3.84.0",
-        "@taiga-ui/cdk": "^3.84.0",
-        "@taiga-ui/core": "^3.84.0",
-        "@taiga-ui/kit": "^3.84.0",
+        "@taiga-ui/addon-commerce": "^3.86.0",
+        "@taiga-ui/cdk": "^3.86.0",
+        "@taiga-ui/core": "^3.86.0",
+        "@taiga-ui/kit": "^3.86.0",
         "@tinkoff/ng-polymorpheus": "^4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/i18n": {
-      "version": "3.85.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/i18n/-/i18n-3.85.0.tgz",
-      "integrity": "sha512-CGoxfq9WY+psX5ZOfWmuQZ6OA/0CAPYJTlbHkw5sRKAyhEQ3NM/Wbx3xcwrcYRRJDnt9yOlfibz+3a+WDF2bFA==",
+      "version": "3.86.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/i18n/-/i18n-3.86.0.tgz",
+      "integrity": "sha512-8zkNhMo/QtxZ2Zp6EP/nxo4SOLwaIrX+P3X/Wt+1cjFNZUYWWfdvfHLLdNviKFPVl4RAOxvkhDfza/wkrwv+iQ==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -4276,20 +4276,20 @@
       }
     },
     "node_modules/@taiga-ui/icons": {
-      "version": "3.84.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/icons/-/icons-3.84.0.tgz",
-      "integrity": "sha512-KiH7BJRZ6wbkOHlJAS0XHq2gYnQTpRgdEogKW+GoD0da/4trCdM66vhDk2j0DwDFdBGq5U0inHJCjnskBI1nSQ==",
+      "version": "3.86.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/icons/-/icons-3.86.0.tgz",
+      "integrity": "sha512-jVBEbvE/r9JG+knmXMTn/l/js3JjYi8nSGbrLCryJZZoS2izRnQARN2txABieUJm8H463CoF0rcdXlHKRuA4Ew==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
       "peerDependencies": {
-        "@taiga-ui/cdk": "^3.84.0"
+        "@taiga-ui/cdk": "^3.86.0"
       }
     },
     "node_modules/@taiga-ui/kit": {
-      "version": "3.84.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/kit/-/kit-3.84.0.tgz",
-      "integrity": "sha512-lSUPDco5FeBYK3ESnXeEPLCdMCmNXwcdHNK/we+0ZoH4VPx/OGg2hpEP0Fej7jfGHwXFTzDbufQD0hT6WlfTAw==",
+      "version": "3.86.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/kit/-/kit-3.86.0.tgz",
+      "integrity": "sha512-naAy4pyhCaQ9+vWxqSMjbV+9KwnMxT5ybrw+MAJgMn2evzRq0FjqzyFZFog7oiRbRvgVdoWPQfBNKaaLhJcpsw==",
       "dependencies": {
         "@maskito/angular": "1.9.0",
         "@maskito/core": "1.9.0",
@@ -4306,9 +4306,9 @@
         "@ng-web-apis/common": "3.0.6",
         "@ng-web-apis/mutation-observer": "^3.1.0",
         "@ng-web-apis/resize-observer": "^3.0.6",
-        "@taiga-ui/cdk": "^3.84.0",
-        "@taiga-ui/core": "^3.84.0",
-        "@taiga-ui/i18n": "^3.84.0",
+        "@taiga-ui/cdk": "^3.86.0",
+        "@taiga-ui/core": "^3.86.0",
+        "@taiga-ui/i18n": "^3.86.0",
         "@tinkoff/ng-polymorpheus": "^4.3.0",
         "rxjs": ">=6.0.0"
       }
diff --git a/web/package.json b/web/package.json
index 69c3585ce..a75701333 100644
--- a/web/package.json
+++ b/web/package.json
@@ -51,12 +51,12 @@
     "@start9labs/argon2": "^0.2.2",
     "@start9labs/emver": "^0.1.5",
     "@start9labs/start-sdk": "file:../sdk/dist",
-    "@taiga-ui/addon-charts": "3.84.0",
-    "@taiga-ui/cdk": "3.84.0",
-    "@taiga-ui/core": "3.84.0",
-    "@taiga-ui/experimental": "3.84.0",
-    "@taiga-ui/icons": "3.84.0",
-    "@taiga-ui/kit": "3.84.0",
+    "@taiga-ui/addon-charts": "3.86.0",
+    "@taiga-ui/cdk": "3.86.0",
+    "@taiga-ui/core": "3.86.0",
+    "@taiga-ui/experimental": "3.86.0",
+    "@taiga-ui/icons": "3.86.0",
+    "@taiga-ui/kit": "3.86.0",
     "@tinkoff/ng-dompurify": "4.0.0",
     "@tinkoff/ng-event-plugins": "3.2.0",
     "angular-svg-round-progressbar": "^9.0.0",
diff --git a/web/projects/shared/src/services/error.service.ts b/web/projects/shared/src/services/error.service.ts
index 45891e0f4..383b3fc97 100644
--- a/web/projects/shared/src/services/error.service.ts
+++ b/web/projects/shared/src/services/error.service.ts
@@ -15,7 +15,6 @@ export class ErrorService extends ErrorHandler {
     this.alerts
       .open(getErrorMessage(error, link), {
         label: 'Error',
-        autoClose: false,
         status: TuiNotification.Error,
       })
       .subscribe()
diff --git a/web/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts b/web/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
index 5fe9b621e..0d7f3ec66 100644
--- a/web/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
+++ b/web/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
@@ -32,7 +32,7 @@ export class BadgeMenuComponent {
   constructor(
     private readonly splitPane: SplitPaneTracker,
     private readonly patch: PatchDB<DataModel>,
-    private readonly dialog: TuiDialogService,
+    private readonly dialogs: TuiDialogService,
     private readonly clientStorageService: ClientStorageService,
   ) {}
 
@@ -44,6 +44,6 @@ export class BadgeMenuComponent {
   }
 
   onWidgets() {
-    this.dialog.open(WIDGETS_COMPONENT, { label: 'Widgets' }).subscribe()
+    this.dialogs.open(WIDGETS_COMPONENT, { label: 'Widgets' }).subscribe()
   }
 }
diff --git a/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
index 0f1c47276..a10067044 100644
--- a/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
+++ b/web/projects/ui/src/app/modals/backup-server-select/backup-server-select.page.ts
@@ -6,6 +6,10 @@ import {
   LoadingService,
   StartOSDiskInfo,
 } from '@start9labs/shared'
+import {
+  PasswordPromptComponent,
+  PromptOptions,
+} from 'src/app/modals/password-prompt.component'
 import {
   BackupInfo,
   CifsBackupTarget,
@@ -14,7 +18,6 @@ import {
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
 import { AppRecoverSelectPage } from '../app-recover-select/app-recover-select.page'
-import { PasswordPromptModal } from './password-prompt.modal'
 
 @Component({
   selector: 'backup-server-select',
@@ -38,24 +41,35 @@ export class BackupServerSelectModal {
 
   async presentModalPassword(
     serverId: string,
-    server: StartOSDiskInfo,
+    { passwordHash }: StartOSDiskInfo,
   ): Promise<void> {
+    const options: PromptOptions = {
+      title: 'Password Required',
+      message:
+        'Enter the password that was used to encrypt this backup. On the next screen, you will select the individual services you want to restore.',
+      label: 'Decrypt Backup',
+      placeholder: 'Enter password',
+      buttonText: 'Next',
+    }
     const modal = await this.modalCtrl.create({
-      component: PasswordPromptModal,
+      component: PasswordPromptComponent,
+      componentProps: { options },
+      canDismiss: async password => {
+        if (password === null) {
+          return true
+        }
+
+        try {
+          argon2.verify(passwordHash!, password)
+          await this.restoreFromBackup(serverId, password)
+          return true
+        } catch (e: any) {
+          this.errorService.handleError(e)
+          return false
+        }
+      },
     })
     modal.present()
-
-    const { data, role } = await modal.onWillDismiss()
-
-    if (role === 'confirm') {
-      try {
-        // @TODO Alex if invalid password, we should tell the user "Invalid password" and halt execution of this function. The modal should remain so the user can try again. Correct password is asdfasdf
-        argon2.verify(server.passwordHash!, data)
-        await this.restoreFromBackup(serverId, data)
-      } catch (e: any) {
-        this.errorService.handleError(e)
-      }
-    }
   }
 
   private async restoreFromBackup(
diff --git a/web/projects/ui/src/app/modals/backup-server-select/password-prompt.modal.ts b/web/projects/ui/src/app/modals/password-prompt.component.ts
similarity index 59%
rename from web/projects/ui/src/app/modals/backup-server-select/password-prompt.modal.ts
rename to web/projects/ui/src/app/modals/password-prompt.component.ts
index 2af89e3d0..a9fec75cd 100644
--- a/web/projects/ui/src/app/modals/backup-server-select/password-prompt.modal.ts
+++ b/web/projects/ui/src/app/modals/password-prompt.component.ts
@@ -1,14 +1,29 @@
-import { Component } from '@angular/core'
+import {
+  AfterViewInit,
+  Component,
+  ElementRef,
+  Input,
+  ViewChild,
+} from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { IonicModule, ModalController } from '@ionic/angular'
+import { TuiTextfieldComponent } from '@taiga-ui/core'
 import { TuiInputPasswordModule } from '@taiga-ui/kit'
 
+export interface PromptOptions {
+  title: string
+  message: string
+  label: string
+  placeholder: string
+  buttonText: string
+}
+
 @Component({
   standalone: true,
   template: `
     <ion-header>
       <ion-toolbar>
-        <ion-title>Decrypt Backup</ion-title>
+        <ion-title>{{ options.title }}</ion-title>
         <ion-buttons slot="end">
           <ion-button (click)="cancel()">
             <ion-icon slot="icon-only" name="close"></ion-icon>
@@ -18,13 +33,11 @@ import { TuiInputPasswordModule } from '@taiga-ui/kit'
     </ion-header>
 
     <ion-content class="ion-padding">
+      <p>{{ options.message }}</p>
       <p>
-        Enter the password that was used to encrypt this backup. On the next
-        screen, you will select the individual services you want to restore.
-      </p>
-      <p>
-        <tui-input-password [(ngModel)]="password">
-          Enter password
+        <tui-input-password [(ngModel)]="password" (keydown.enter)="confirm()">
+          {{ options.label }}
+          <input tuiTextfield [placeholder]="options.placeholder" />
         </tui-input-password>
       </p>
     </ion-content>
@@ -47,18 +60,30 @@ import { TuiInputPasswordModule } from '@taiga-ui/kit'
           [disabled]="!password"
           (click)="confirm()"
         >
-          Next
+          {{ options.buttonText }}
         </ion-button>
       </ion-toolbar>
     </ion-footer>
   `,
   imports: [IonicModule, FormsModule, TuiInputPasswordModule],
 })
-export class PasswordPromptModal {
+export class PasswordPromptComponent implements AfterViewInit {
+  @ViewChild(TuiTextfieldComponent, { read: ElementRef })
+  input?: ElementRef<HTMLInputElement>
+
+  @Input()
+  options!: PromptOptions
+
   password = ''
 
   constructor(private modalCtrl: ModalController) {}
 
+  ngAfterViewInit() {
+    setTimeout(() => {
+      this.input?.nativeElement.focus({ preventScroll: true })
+    }, 300)
+  }
+
   cancel() {
     return this.modalCtrl.dismiss(null, 'cancel')
   }
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.scss b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
index 25532c256..9a067bc1e 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
@@ -1,11 +1,13 @@
 import { Component } from '@angular/core'
 import { ModalController, NavController } from '@ionic/angular'
-import { LoadingService } from '@start9labs/shared'
-import { TuiDialogService } from '@taiga-ui/core'
-import { PROMPT, PromptOptions } from 'src/app/modals/prompt.component'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import {
+  PasswordPromptComponent,
+  PromptOptions,
+} from 'src/app/modals/password-prompt.component'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { PatchDB } from 'patch-db-client'
-import { skip, take, takeUntil } from 'rxjs/operators'
+import { skip, takeUntil } from 'rxjs/operators'
 import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
 import * as argon2 from '@start9labs/argon2'
 import { TuiDestroyService } from '@taiga-ui/cdk'
@@ -22,7 +24,6 @@ import { BackupService } from 'src/app/components/backup-drives/backup.service'
 @Component({
   selector: 'server-backup',
   templateUrl: './server-backup.page.html',
-  styleUrls: ['./server-backup.page.scss'],
   providers: [TuiDestroyService],
 })
 export class ServerBackupPage {
@@ -31,8 +32,8 @@ export class ServerBackupPage {
   readonly backingUp$ = this.eosService.backingUp$
 
   constructor(
+    private readonly errorService: ErrorService,
     private readonly loader: LoadingService,
-    private readonly dialogs: TuiDialogService,
     private readonly modalCtrl: ModalController,
     private readonly embassyApi: ApiService,
     private readonly navCtrl: NavController,
@@ -74,29 +75,35 @@ export class ServerBackupPage {
     target: MappedBackupTarget<CifsBackupTarget | DiskBackupTarget>,
   ): Promise<void> {
     const options: PromptOptions = {
+      title: 'Master Password Needed',
       message: 'Enter your master password to encrypt this backup.',
       label: 'Master Password',
       placeholder: 'Enter master password',
-      useMask: true,
       buttonText: 'Create Backup',
     }
 
-    this.dialogs
-      .open<string>(PROMPT, {
-        label: 'Master Password Needed',
-        data: options,
-      })
-      .pipe(take(1))
-      .subscribe(async (password: string) => {
+    const modal = await this.modalCtrl.create({
+      component: PasswordPromptComponent,
+      componentProps: { options },
+      canDismiss: async password => {
+        if (password === null) {
+          return true
+        }
+
         const { passwordHash, id } = await getServerInfo(this.patch)
 
-        // @TODO Alex if invalid password, we should tell the user "Invalid password" and halt execution of this function. The modal should remain so the user can try again. Correct password is asdfasdf
         // confirm password matches current master password
-        argon2.verify(passwordHash, password)
+        try {
+          argon2.verify(passwordHash, password)
+        } catch (e: any) {
+          this.errorService.handleError(e)
+          return false
+        }
 
         // first time backup
         if (!this.backupService.hasThisBackup(target.entry, id)) {
-          await this.createBackup(target, password)
+          this.createBackup(target, password)
+          return true
           // existing backup
         } else {
           try {
@@ -106,39 +113,49 @@ export class ServerBackupPage {
               () => this.presentModalOldPassword(target, password),
               250,
             )
-            return
+            return true
           }
           await this.createBackup(target, password)
+          return true
         }
-      })
+      },
+    })
+    modal.present()
   }
 
   private async presentModalOldPassword(
     target: MappedBackupTarget<CifsBackupTarget | DiskBackupTarget>,
     password: string,
   ): Promise<void> {
+    const { id } = await getServerInfo(this.patch)
     const options: PromptOptions = {
+      title: 'Original Password Needed',
       message:
         'This backup was created with a different password. Enter the ORIGINAL password that was used to encrypt this backup.',
       label: 'Original Password',
       placeholder: 'Enter original password',
-      useMask: true,
       buttonText: 'Create Backup',
     }
 
-    const { id } = await getServerInfo(this.patch)
+    const modal = await this.modalCtrl.create({
+      component: PasswordPromptComponent,
+      componentProps: { options },
+      canDismiss: async oldPassword => {
+        if (oldPassword === null) {
+          return true
+        }
 
-    this.dialogs
-      .open<string>(PROMPT, {
-        label: 'Original Password Needed',
-        data: options,
-      })
-      .pipe(take(1))
-      .subscribe(async (oldPassword: string) => {
-        // @TODO Alex if invalid password, we should tell the user "Invalid password" and halt execution of this function. The modal should remain so the user can try again. Correct password is asdfasdf
-        argon2.verify(target.entry.startOs[id].passwordHash!, oldPassword)
-        await this.createBackup(target, password, oldPassword)
-      })
+        try {
+          argon2.verify(target.entry.startOs[id].passwordHash!, oldPassword)
+          await this.createBackup(target, password, oldPassword)
+          return true
+        } catch (e: any) {
+          this.errorService.handleError(e)
+          return false
+        }
+      },
+    })
+    modal.present()
   }
 
   private async createBackup(
diff --git a/web/projects/ui/src/app/pages/widgets/widgets.page.ts b/web/projects/ui/src/app/pages/widgets/widgets.page.ts
index ca1541269..30d605bda 100644
--- a/web/projects/ui/src/app/pages/widgets/widgets.page.ts
+++ b/web/projects/ui/src/app/pages/widgets/widgets.page.ts
@@ -56,7 +56,7 @@ export class WidgetsPage {
     @Optional()
     @Inject(POLYMORPHEUS_CONTEXT)
     readonly context: TuiDialogContext | null,
-    private readonly dialog: TuiDialogService,
+    private readonly dialogs: TuiDialogService,
     private readonly patch: PatchDB<DataModel>,
     private readonly cdr: ChangeDetectorRef,
     private readonly api: ApiService,
@@ -83,7 +83,7 @@ export class WidgetsPage {
   }
 
   add() {
-    this.dialog.open(ADD_WIDGET, { label: 'Add widget' }).subscribe(widget => {
+    this.dialogs.open(ADD_WIDGET, { label: 'Add widget' }).subscribe(widget => {
       this.addWidget(widget!)
     })
   }

From 62fc6afd8a0220d4782691acdf24917d80dff977 Mon Sep 17 00:00:00 2001
From: waterplea <alexander@inkin.ru>
Date: Fri, 12 Jul 2024 12:46:07 +0500
Subject: [PATCH 187/341] fix: fix select on mobile

---
 .../app/components/form/form-select/form-select.component.html   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/projects/ui/src/app/components/form/form-select/form-select.component.html b/web/projects/ui/src/app/components/form/form-select/form-select.component.html
index c10e62018..fe2b561c7 100644
--- a/web/projects/ui/src/app/components/form/form-select/form-select.component.html
+++ b/web/projects/ui/src/app/components/form/form-select/form-select.component.html
@@ -11,6 +11,7 @@
   <span *ngIf="spec.required">*</span>
   <select
     tuiSelect
+    [placeholder]="spec.name"
     [items]="items"
     [disabledItemHandler]="disabledItemHandler"
   ></select>

From 8f0bdcd1720939b9135242ee53628c8e69cdfee0 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:46:27 -0600
Subject: [PATCH 188/341] Fix/backups (#2659)

* fix master build (#2639)

* feat: Change ts to use rsync
Chore: Update the ts to use types over interface

* feat: Get the rust and the js to do a backup

* Wip: Got the backup working?

* fix permissions

* remove trixie list

* update tokio to fix timer bug

* fix error handling on backup

* wip

* remove idmap

* run restore before init, and init with own version on restore

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 .../src/Adapters/Systems/SystemForStartOs.ts  |  12 +-
 container-runtime/src/Interfaces/System.ts    |   2 +-
 core/Cargo.lock                               | 354 +++++++++---------
 core/startos/Cargo.toml                       |   3 +-
 core/startos/src/backup/backup_bulk.rs        |   2 +-
 core/startos/src/backup/restore.rs            |   2 +-
 core/startos/src/bins/startd.rs               |   2 +
 core/startos/src/disk/mount/backup.rs         |  26 +-
 .../src/disk/mount/filesystem/backupfs.rs     |  21 +-
 core/startos/src/service/mod.rs               |  76 ++--
 .../src/service/persistent_container.rs       |  12 +-
 core/startos/src/service/service_map.rs       |  43 +--
 core/startos/src/service/transition/backup.rs |  68 ++--
 core/startos/src/service/transition/mod.rs    |   5 +-
 core/startos/src/sound.rs                     |   8 +-
 core/startos/src/util/mod.rs                  |   2 +-
 image-recipe/build.sh                         |   3 +
 sdk/lib/backup/Backups.ts                     | 165 ++++----
 sdk/lib/backup/setupBackups.ts                |   6 +-
 sdk/lib/config/configTypes.ts                 |   1 -
 sdk/lib/manifest/ManifestTypes.ts             |   4 +-
 sdk/lib/types.ts                              |   7 +-
 .../ui/src/app/services/api/api.fixures.ts    |   1 +
 23 files changed, 445 insertions(+), 380 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index e7f09952a..84bf57302 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -7,6 +7,7 @@ import { RpcResult, matchRpcResult } from "../RpcListener"
 import { duration } from "../../Models/Duration"
 import { T } from "@start9labs/start-sdk"
 import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+import { Volume } from "../../Models/Volume"
 export const STARTOS_JS_LOCATION = "/usr/lib/startos/package/index.js"
 export class SystemForStartOs implements System {
   private onTerm: (() => Promise<void>) | undefined
@@ -151,8 +152,17 @@ export class SystemForStartOs implements System {
         return this.abi.getConfig({ effects })
       }
       case "/backup/create":
+        return this.abi.createBackup({
+          effects,
+          pathMaker: ((options) =>
+            new Volume(options.volume, options.path).path) as T.PathMaker,
+        })
       case "/backup/restore":
-        throw new Error("this should be called with the init/unit")
+        return this.abi.restoreBackup({
+          effects,
+          pathMaker: ((options) =>
+            new Volume(options.volume, options.path).path) as T.PathMaker,
+        })
       case "/actions/metadata": {
         return this.abi.actionsMetadata({ effects })
       }
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
index 986288411..58e045356 100644
--- a/container-runtime/src/Interfaces/System.ts
+++ b/container-runtime/src/Interfaces/System.ts
@@ -5,7 +5,7 @@ import { hostSystemStartOs } from "../Adapters/HostSystemStartOs"
 export type ExecuteResult =
   | { ok: unknown }
   | { err: { code: number; message: string } }
-export interface System {
+export type System = {
   // init(effects: Effects): Promise<void>
   // exit(effects: Effects): Promise<void>
   // start(effects: Effects): Promise<void>
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 9f7face93..1072f4203 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -231,18 +231,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -306,7 +306,7 @@ dependencies = [
  "futures-util",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.29",
+ "hyper 0.14.30",
  "itoa",
  "matchit",
  "memchr",
@@ -333,9 +333,9 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-util",
  "itoa",
  "matchit",
@@ -385,7 +385,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body 1.0.1",
  "http-body-util",
  "mime",
  "pin-project-lite",
@@ -405,9 +405,9 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -532,7 +532,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.68",
+ "syn 2.0.71",
  "which",
 ]
 
@@ -609,9 +609,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210"
 dependencies = [
  "arrayref",
  "arrayvec 0.7.4",
@@ -619,7 +619,7 @@ dependencies = [
  "cfg-if",
  "constant_time_eq",
  "memmap2",
- "rayon",
+ "rayon-core",
 ]
 
 [[package]]
@@ -675,9 +675,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 
 [[package]]
 name = "cache-padded"
@@ -687,13 +687,12 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.0.101"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
+checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
 ]
 
 [[package]]
@@ -729,7 +728,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -800,9 +799,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -810,9 +809,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942"
 dependencies = [
  "anstream",
  "anstyle",
@@ -822,14 +821,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1237,14 +1236,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1252,27 +1251,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1303,7 +1302,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1320,13 +1319,13 @@ dependencies = [
 
 [[package]]
 name = "der_derive"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
+checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1349,7 +1348,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1571,7 +1570,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1829,7 +1828,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2143,9 +2142,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
  "http 1.1.0",
@@ -2160,7 +2159,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body 1.0.1",
  "pin-project-lite",
 ]
 
@@ -2184,9 +2183,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.29"
+version = "0.14.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2208,16 +2207,16 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.3.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "h2 0.4.5",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body 1.0.1",
  "httparse",
  "httpdate",
  "itoa",
@@ -2235,9 +2234,9 @@ checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-util",
- "rustls 0.23.10",
+ "rustls 0.23.11",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -2250,7 +2249,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.29",
+ "hyper 0.14.30",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2264,7 +2263,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2274,16 +2273,16 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
+checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.0",
- "hyper 1.3.1",
+ "http-body 1.0.1",
+ "hyper 1.4.1",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2783,7 +2782,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2837,9 +2836,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lzma-sys"
@@ -3230,7 +3229,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3262,9 +3261,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssh-keys"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9939566c441a6542e87c74310d4ac713c17679c76f296932e732f405bc25e3d"
+checksum = "abb830a82898b2ac17c9620ddce839ac3b34b9cb8a1a037cbdbfb9841c756c3e"
 dependencies = [
  "base64 0.21.7",
  "byteorder",
@@ -3296,7 +3295,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3395,9 +3394,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.2",
+ "redox_syscall 0.5.3",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3474,9 +3473,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
 dependencies = [
  "memchr",
  "thiserror",
@@ -3485,9 +3484,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3495,22 +3494,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
 dependencies = [
  "once_cell",
  "pest",
@@ -3559,7 +3558,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3632,7 +3631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3704,7 +3703,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3727,7 +3726,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3871,16 +3870,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
 [[package]]
 name = "rayon-core"
 version = "1.12.1"
@@ -3917,9 +3906,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -3994,9 +3983,9 @@ dependencies = [
  "futures-util",
  "h2 0.4.5",
  "http 1.1.0",
- "http-body 1.0.0",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper 1.3.1",
+ "hyper 1.4.1",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
@@ -4192,15 +4181,15 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.10"
+version = "0.23.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
  "rustls-pki-types",
- "rustls-webpki 0.102.4",
+ "rustls-webpki 0.102.5",
  "subtle",
  "zeroize",
 ]
@@ -4242,9 +4231,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.4"
+version = "0.102.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -4342,9 +4331,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.6.0",
  "core-foundation",
@@ -4355,9 +4344,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4374,9 +4363,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
@@ -4400,20 +4389,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.118"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "indexmap 2.2.6",
  "itoa",
@@ -4454,9 +4443,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -4472,14 +4461,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4906,7 +4895,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.68",
+ "syn 2.0.71",
  "unicode-width",
 ]
 
@@ -5020,6 +5009,7 @@ dependencies = [
  "nix 0.29.0",
  "nom 7.1.3",
  "num",
+ "num_cpus",
  "num_enum",
  "once_cell",
  "openssh-keys",
@@ -5140,9 +5130,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5224,9 +5214,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -5243,22 +5233,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5324,9 +5314,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -5339,9 +5329,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5375,7 +5365,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5394,7 +5384,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.10",
+ "rustls 0.23.11",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5497,7 +5487,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit 0.22.15",
 ]
 
 [[package]]
@@ -5535,9 +5525,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
@@ -5560,7 +5550,7 @@ dependencies = [
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.29",
+ "hyper 0.14.30",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -5644,7 +5634,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5796,7 +5786,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
  "termcolor",
 ]
 
@@ -5856,7 +5846,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5975,9 +5965,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom 0.2.15",
 ]
@@ -6067,7 +6057,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
  "wasm-bindgen-shared",
 ]
 
@@ -6101,7 +6091,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6200,7 +6190,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -6218,7 +6208,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -6238,18 +6228,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -6260,9 +6250,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -6272,9 +6262,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -6284,15 +6274,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -6302,9 +6292,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -6314,9 +6304,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -6326,9 +6316,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -6338,9 +6328,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -6440,22 +6430,22 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6475,32 +6465,32 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.68",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "zstd"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.1.0"
+version = "7.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.11+zstd.1.5.6"
+version = "2.0.12+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
+checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 842ef44ef..2695c7813 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -128,6 +128,7 @@ nix = { version = "0.29.0", features = ["user", "process", "signal", "fs"] }
 nom = "7.1.3"
 num = "0.4.1"
 num_enum = "0.7.0"
+num_cpus = "1.16.0"
 once_cell = "1.19.0"
 openssh-keys = "0.6.2"
 openssl = { version = "0.10.57", features = ["vendored"] }
@@ -170,7 +171,7 @@ sscanf = "0.4.1"
 ssh-key = { version = "0.6.2", features = ["ed25519"] }
 tar = "0.4.40"
 thiserror = "1.0.49"
-tokio = { version = "1.38.0", features = ["full"] }
+tokio = { version = "1.38.1", features = ["full"] }
 tokio-rustls = "0.26.0"
 tokio-socks = "0.5.1"
 tokio-stream = { version = "0.1.14", features = ["io-util", "sync", "net"] }
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index a52c97f9b..b4419e88e 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -260,7 +260,7 @@ async fn perform_backup(
     for id in package_ids {
         if let Some(service) = &*ctx.services.get(id).await {
             let backup_result = service
-                .backup(backup_guard.package_backup(id))
+                .backup(backup_guard.package_backup(id).await?)
                 .await
                 .err()
                 .map(|e| e.to_string());
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 23e0c8ac1..28d70653f 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -158,7 +158,7 @@ async fn restore_packages(
     let backup_guard = Arc::new(backup_guard);
     let mut tasks = BTreeMap::new();
     for id in ids {
-        let backup_dir = backup_guard.clone().package_backup(&id);
+        let backup_dir = backup_guard.clone().package_backup(&id).await?;
         let s9pk_path = backup_dir.path().join(&id).with_extension("s9pk");
         let task = ctx
             .services
diff --git a/core/startos/src/bins/startd.rs b/core/startos/src/bins/startd.rs
index 7576c41e9..d383f3091 100644
--- a/core/startos/src/bins/startd.rs
+++ b/core/startos/src/bins/startd.rs
@@ -1,3 +1,4 @@
+use std::cmp::max;
 use std::ffi::OsString;
 use std::net::{Ipv6Addr, SocketAddr};
 use std::sync::Arc;
@@ -136,6 +137,7 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
 
     let res = {
         let rt = tokio::runtime::Builder::new_multi_thread()
+            .worker_threads(max(4, num_cpus::get()))
             .enable_all()
             .build()
             .expect("failed to initialize runtime");
diff --git a/core/startos/src/disk/mount/backup.rs b/core/startos/src/disk/mount/backup.rs
index 142301a74..8f45b0d4f 100644
--- a/core/startos/src/disk/mount/backup.rs
+++ b/core/startos/src/disk/mount/backup.rs
@@ -106,8 +106,11 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
                 )
             })?;
         }
-        let encrypted_guard =
-            TmpMountGuard::mount(&BackupFS::new(&crypt_path, &enc_key), ReadWrite).await?;
+        let encrypted_guard = TmpMountGuard::mount(
+            &BackupFS::new(&crypt_path, &enc_key, vec![(100000, 65536)]),
+            ReadWrite,
+        )
+        .await?;
 
         let metadata_path = encrypted_guard.path().join("metadata.json");
         let metadata: BackupInfo = if tokio::fs::metadata(&metadata_path).await.is_ok() {
@@ -148,8 +151,23 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
     }
 
     #[instrument(skip_all)]
-    pub fn package_backup(self: &Arc<Self>, id: &PackageId) -> SubPath<Arc<Self>> {
-        SubPath::new(self.clone(), id)
+    pub async fn package_backup(
+        self: &Arc<Self>,
+        id: &PackageId,
+    ) -> Result<SubPath<Arc<Self>>, Error> {
+        let package_guard = SubPath::new(self.clone(), id);
+        let package_path = package_guard.path();
+        if tokio::fs::metadata(&package_path).await.is_err() {
+            tokio::fs::create_dir_all(&package_path)
+                .await
+                .with_ctx(|_| {
+                    (
+                        crate::ErrorKind::Filesystem,
+                        package_path.display().to_string(),
+                    )
+                })?;
+        }
+        Ok(package_guard)
     }
 
     #[instrument(skip_all)]
diff --git a/core/startos/src/disk/mount/filesystem/backupfs.rs b/core/startos/src/disk/mount/filesystem/backupfs.rs
index 9ef258f34..254abde20 100644
--- a/core/startos/src/disk/mount/filesystem/backupfs.rs
+++ b/core/startos/src/disk/mount/filesystem/backupfs.rs
@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::fmt::{self, Display};
 use std::os::unix::ffi::OsStrExt;
 use std::path::Path;
@@ -12,10 +13,15 @@ use crate::prelude::*;
 pub struct BackupFS<DataDir: AsRef<Path>, Password: fmt::Display> {
     data_dir: DataDir,
     password: Password,
+    idmapped_root: Vec<(u32, u32)>,
 }
 impl<DataDir: AsRef<Path>, Password: fmt::Display> BackupFS<DataDir, Password> {
-    pub fn new(data_dir: DataDir, password: Password) -> Self {
-        BackupFS { data_dir, password }
+    pub fn new(data_dir: DataDir, password: Password, idmapped_root: Vec<(u32, u32)>) -> Self {
+        BackupFS {
+            data_dir,
+            password,
+            idmapped_root,
+        }
     }
 }
 impl<DataDir: AsRef<Path> + Send + Sync, Password: fmt::Display + Send + Sync> FileSystem
@@ -26,9 +32,16 @@ impl<DataDir: AsRef<Path> + Send + Sync, Password: fmt::Display + Send + Sync> F
     }
     fn mount_options(&self) -> impl IntoIterator<Item = impl Display> {
         [
-            format!("password={}", self.password),
-            format!("file-size-padding=0.05"),
+            Cow::Owned(format!("password={}", self.password)),
+            Cow::Borrowed("file-size-padding=0.05"),
+            Cow::Borrowed("allow_other"),
         ]
+        .into_iter()
+        .chain(
+            self.idmapped_root
+                .iter()
+                .map(|(root, range)| Cow::Owned(format!("idmapped-root={root}:{range}"))),
+        )
     }
     async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
         Ok(Some(&self.data_dir))
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 581d2ac0d..d78df6c79 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -34,6 +34,7 @@ use crate::util::actor::concurrent::ConcurrentActor;
 use crate::util::actor::Actor;
 use crate::util::io::create_file;
 use crate::util::serde::Pem;
+use crate::util::Never;
 use crate::volume::data_dir;
 
 mod action;
@@ -220,12 +221,13 @@ impl Service {
                         tracing::error!("Error opening s9pk for install: {e}");
                         tracing::debug!("{e:?}")
                     }) {
-                        if let Ok(service) = Self::install(ctx.clone(), s9pk, None, None)
-                            .await
-                            .map_err(|e| {
-                                tracing::error!("Error installing service: {e}");
-                                tracing::debug!("{e:?}")
-                            })
+                        if let Ok(service) =
+                            Self::install(ctx.clone(), s9pk, None, None::<Never>, None)
+                                .await
+                                .map_err(|e| {
+                                    tracing::error!("Error installing service: {e}");
+                                    tracing::debug!("{e:?}")
+                                })
                         {
                             return Ok(Some(service));
                         }
@@ -257,6 +259,7 @@ impl Service {
                             ctx.clone(),
                             s9pk,
                             Some(s.as_manifest().as_version().de()?),
+                            None::<Never>,
                             None,
                         )
                         .await
@@ -334,13 +337,35 @@ impl Service {
     pub async fn install(
         ctx: RpcContext,
         s9pk: S9pk,
-        src_version: Option<models::VersionString>,
+        mut src_version: Option<models::VersionString>,
+        recovery_source: Option<impl GenericMountGuard>,
         progress: Option<InstallProgressHandles>,
     ) -> Result<ServiceRef, Error> {
         let manifest = s9pk.as_manifest().clone();
         let developer_key = s9pk.as_archive().signer();
         let icon = s9pk.icon_data_url().await?;
         let service = Self::new(ctx.clone(), s9pk, StartStop::Stop).await?;
+        if let Some(recovery_source) = recovery_source {
+            service
+                .actor
+                .send(
+                    Guid::new(),
+                    transition::restore::Restore {
+                        path: recovery_source.path().to_path_buf(),
+                    },
+                )
+                .await??;
+            recovery_source.unmount().await?;
+            src_version = Some(
+                service
+                    .seed
+                    .persistent_container
+                    .s9pk
+                    .as_manifest()
+                    .version
+                    .clone(),
+            );
+        }
         service
             .seed
             .persistent_container
@@ -382,26 +407,6 @@ impl Service {
         Ok(service)
     }
 
-    pub async fn restore(
-        ctx: RpcContext,
-        s9pk: S9pk,
-        backup_source: impl GenericMountGuard,
-        progress: Option<InstallProgressHandles>,
-    ) -> Result<ServiceRef, Error> {
-        let service = Service::install(ctx.clone(), s9pk, None, progress).await?;
-
-        service
-            .actor
-            .send(
-                Guid::new(),
-                transition::restore::Restore {
-                    path: backup_source.path().to_path_buf(),
-                },
-            )
-            .await??;
-        Ok(service)
-    }
-
     #[instrument(skip_all)]
     pub async fn backup(&self, guard: impl GenericMountGuard) -> Result<(), Error> {
         let id = &self.seed.id;
@@ -417,10 +422,11 @@ impl Service {
             .send(
                 Guid::new(),
                 transition::backup::Backup {
-                    path: guard.path().to_path_buf(),
+                    path: guard.path().join("data"),
                 },
             )
-            .await??;
+            .await??
+            .await?;
         Ok(())
     }
 
@@ -505,13 +511,21 @@ impl Actor for ServiceActor {
                         }
                         (Some(TransitionKind::Restarting), _, _) => MainStatus::Restarting,
                         (Some(TransitionKind::Restoring), _, _) => MainStatus::Restoring,
-                        (Some(TransitionKind::BackingUp), _, Some(status)) => {
+                        (Some(TransitionKind::BackingUp), StartStop::Stop, Some(status)) => {
+                            seed.persistent_container.stop().await?;
                             MainStatus::BackingUp {
                                 started: Some(status.started),
                                 health: status.health.clone(),
                             }
                         }
-                        (Some(TransitionKind::BackingUp), _, None) => MainStatus::BackingUp {
+                        (Some(TransitionKind::BackingUp), StartStop::Start, _) => {
+                            seed.persistent_container.start().await?;
+                            MainStatus::BackingUp {
+                                started: None,
+                                health: OrdMap::new(),
+                            }
+                        }
+                        (Some(TransitionKind::BackingUp), _, _) => MainStatus::BackingUp {
                             started: None,
                             health: OrdMap::new(),
                         },
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index e0b31ea97..11cc237d3 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
@@ -277,7 +277,7 @@ impl PersistentContainer {
         backup_path: impl AsRef<Path>,
         mount_type: MountType,
     ) -> Result<MountGuard, Error> {
-        let backup_path: PathBuf = backup_path.as_ref().to_path_buf();
+        let backup_path = backup_path.as_ref();
         let mountpoint = self
             .lxc_container
             .get()
@@ -295,14 +295,14 @@ impl PersistentContainer {
             .arg(mountpoint.as_os_str())
             .invoke(ErrorKind::Filesystem)
             .await?;
-        let bind = Bind::new(&backup_path);
-        let mount_guard = MountGuard::mount(&bind, &mountpoint, mount_type).await;
+        tokio::fs::create_dir_all(backup_path).await?;
         Command::new("chown")
             .arg("100000:100000")
-            .arg(backup_path.as_os_str())
+            .arg(backup_path)
             .invoke(ErrorKind::Filesystem)
             .await?;
-        mount_guard
+        let bind = Bind::new(backup_path);
+        MountGuard::mount(&bind, &mountpoint, mount_type).await
     }
 
     #[instrument(skip_all)]
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index af10a065c..90223216c 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -265,35 +265,20 @@ impl ServiceMap {
                     } else {
                         None
                     };
-                    if let Some(recovery_source) = recovery_source {
-                        *service = Some(
-                            Service::restore(
-                                ctx,
-                                s9pk,
-                                recovery_source,
-                                Some(InstallProgressHandles {
-                                    finalization_progress,
-                                    progress,
-                                }),
-                            )
-                            .await?
-                            .into(),
-                        );
-                    } else {
-                        *service = Some(
-                            Service::install(
-                                ctx,
-                                s9pk,
-                                prev,
-                                Some(InstallProgressHandles {
-                                    finalization_progress,
-                                    progress,
-                                }),
-                            )
-                            .await?
-                            .into(),
-                        );
-                    }
+                    *service = Some(
+                        Service::install(
+                            ctx,
+                            s9pk,
+                            prev,
+                            recovery_source,
+                            Some(InstallProgressHandles {
+                                finalization_progress,
+                                progress,
+                            }),
+                        )
+                        .await?
+                        .into(),
+                    );
                     drop(service);
 
                     sync_progress_task.await.map_err(|_| {
diff --git a/core/startos/src/service/transition/backup.rs b/core/startos/src/service/transition/backup.rs
index f7591f0d9..d8606f534 100644
--- a/core/startos/src/service/transition/backup.rs
+++ b/core/startos/src/service/transition/backup.rs
@@ -1,5 +1,7 @@
 use std::path::PathBuf;
+use std::sync::Arc;
 
+use futures::future::BoxFuture;
 use futures::FutureExt;
 use models::ProcedureName;
 
@@ -19,7 +21,7 @@ pub(in crate::service) struct Backup {
     pub path: PathBuf,
 }
 impl Handler<Backup> for ServiceActor {
-    type Response = Result<(), Error>;
+    type Response = Result<BoxFuture<'static, Result<(), Error>>, Error>;
     fn conflicts_with(_: &Backup) -> ConflictBuilder<Self> {
         ConflictBuilder::everything()
             .except::<GetConfig>()
@@ -37,43 +39,31 @@ impl Handler<Backup> for ServiceActor {
         let path = backup.path.clone();
         let seed = self.0.clone();
 
-        let state = self.0.persistent_container.state.clone();
-        let transition = RemoteCancellable::new(
-            async move {
-                temp.stop();
+        let transition = RemoteCancellable::new(async move {
+            temp.stop();
+            current
+                .wait_for(|s| s.running_status.is_none())
+                .await
+                .with_kind(ErrorKind::Unknown)?;
+
+            let backup_guard = seed
+                .persistent_container
+                .mount_backup(path, ReadWrite)
+                .await?;
+            seed.persistent_container
+                .execute(id, ProcedureName::CreateBackup, Value::Null, None)
+                .await?;
+            backup_guard.unmount(true).await?;
+
+            if temp.restore().is_start() {
                 current
-                    .wait_for(|s| s.running_status.is_none())
+                    .wait_for(|s| s.running_status.is_some())
                     .await
                     .with_kind(ErrorKind::Unknown)?;
-
-                let backup_guard = seed
-                    .persistent_container
-                    .mount_backup(path, ReadWrite)
-                    .await?;
-                seed.persistent_container
-                    .execute(id, ProcedureName::CreateBackup, Value::Null, None)
-                    .await?;
-                backup_guard.unmount(true).await?;
-
-                if temp.restore().is_start() {
-                    current
-                        .wait_for(|s| s.running_status.is_some())
-                        .await
-                        .with_kind(ErrorKind::Unknown)?;
-                }
-                drop(temp);
-                state.send_modify(|s| {
-                    s.transition_state.take();
-                });
-                Ok::<_, Error>(())
             }
-            .map(|x| {
-                if let Err(err) = dbg!(x) {
-                    tracing::debug!("{:?}", err);
-                    tracing::warn!("{}", err);
-                }
-            }),
-        );
+            drop(temp);
+            Ok::<_, Arc<Error>>(())
+        });
         let cancel_handle = transition.cancellation_handle();
         let transition = transition.shared();
         let job_transition = transition.clone();
@@ -92,9 +82,11 @@ impl Handler<Backup> for ServiceActor {
         if let Some(t) = old {
             t.abort().await;
         }
-        match transition.await {
-            None => Err(Error::new(eyre!("Backup canceled"), ErrorKind::Unknown)),
-            Some(x) => Ok(x),
-        }
+        Ok(transition
+            .map(|r| {
+                r.ok_or_else(|| Error::new(eyre!("Backup canceled"), ErrorKind::Cancelled))?
+                    .map_err(|e| e.clone_output())
+            })
+            .boxed())
     }
 }
diff --git a/core/startos/src/service/transition/mod.rs b/core/startos/src/service/transition/mod.rs
index 7b7f10f2a..a6a41073b 100644
--- a/core/startos/src/service/transition/mod.rs
+++ b/core/startos/src/service/transition/mod.rs
@@ -79,7 +79,10 @@ impl TempDesiredRestore {
 }
 impl Drop for TempDesiredRestore {
     fn drop(&mut self) {
-        self.0.send_modify(|s| s.temp_desired_state = None);
+        self.0.send_modify(|s| {
+            s.temp_desired_state.take();
+            s.transition_state.take();
+        });
     }
 }
 // impl Deref for TempDesiredState {
diff --git a/core/startos/src/sound.rs b/core/startos/src/sound.rs
index 8dc78357c..8cedd78ce 100644
--- a/core/startos/src/sound.rs
+++ b/core/startos/src/sound.rs
@@ -10,12 +10,12 @@ use crate::util::{FileLock, Invoke};
 use crate::{Error, ErrorKind};
 
 lazy_static::lazy_static! {
-    static ref SEMITONE_K: f64 = 2f64.powf(1f64 / 12f64);
-    static ref A_4: f64 = 440f64;
-    static ref C_0: f64 = *A_4 / SEMITONE_K.powf(9f64) / 2f64.powf(4f64);
+    static ref SEMITONE_K: f64 = 2f64.powf(1.0 / 12.0);
+    static ref A_4: f64 = 440.0;
+    static ref C_0: f64 = *A_4 / SEMITONE_K.powf(9.0) / 2_f64.powf(4.0);
 }
 
-pub const SOUND_LOCK_FILE: &str = "/etc/embassy/sound.lock";
+pub const SOUND_LOCK_FILE: &str = "/run/startos/sound.lock";
 
 struct SoundInterface {
     guard: Option<FileLock>,
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 0c9e5c5f9..f591eaaf3 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -555,7 +555,7 @@ impl<F: FnOnce() -> T, T> Drop for GeneralGuard<F, T> {
     }
 }
 
-pub struct FileLock(OwnedMutexGuard<()>, Option<FdLock<File>>);
+pub struct FileLock(#[allow(unused)] OwnedMutexGuard<()>, Option<FdLock<File>>);
 impl Drop for FileLock {
     fn drop(&mut self) {
         if let Some(fd_lock) = self.1.take() {
diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 5ec500ce3..5635e94f3 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -166,6 +166,9 @@ fi
 curl -fsSL https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc > config/archives/tor.key
 echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/tor.key.gpg] https://deb.torproject.org/torproject.org ${IB_SUITE} main" > config/archives/tor.list
 
+curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o config/archives/docker.key
+echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gpg] https://download.docker.com/linux/debian ${IB_SUITE} stable" > config/archives/docker.list
+
 # Dependencies
 
 ## Base dependencies
diff --git a/sdk/lib/backup/Backups.ts b/sdk/lib/backup/Backups.ts
index 20099c86d..6ffe74b70 100644
--- a/sdk/lib/backup/Backups.ts
+++ b/sdk/lib/backup/Backups.ts
@@ -1,6 +1,10 @@
+import { recursive } from "ts-matches"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import * as T from "../types"
 
+import * as child_process from "child_process"
+import { promises as fsPromises } from "fs"
+
 export type BACKUP = "BACKUP"
 export const DEFAULT_OPTIONS: T.BackupOptions = {
   delete: true,
@@ -91,58 +95,22 @@ export class Backups<M extends SDKManifest> {
     )
     return this
   }
-  build() {
+  build(pathMaker: T.PathMaker) {
     const createBackup: T.ExpectedExports.createBackup = async ({
       effects,
     }) => {
-      // const previousItems = (
-      //   await effects
-      //     .readDir({
-      //       volumeId: Backups.BACKUP,
-      //       path: ".",
-      //     })
-      //     .catch(() => [])
-      // ).map((x) => `${x}`)
-      // const backupPaths = this.backupSet
-      //   .filter((x) => x.dstVolume === Backups.BACKUP)
-      //   .map((x) => x.dstPath)
-      //   .map((x) => x.replace(/\.\/([^]*)\//, "$1"))
-      // const filteredItems = previousItems.filter(
-      //   (x) => backupPaths.indexOf(x) === -1,
-      // )
-      // for (const itemToRemove of filteredItems) {
-      //   effects.console.error(`Trying to remove ${itemToRemove}`)
-      //   await effects
-      //     .removeDir({
-      //       volumeId: Backups.BACKUP,
-      //       path: itemToRemove,
-      //     })
-      //     .catch(() =>
-      //       effects.removeFile({
-      //         volumeId: Backups.BACKUP,
-      //         path: itemToRemove,
-      //       }),
-      //     )
-      //     .catch(() => {
-      //       console.warn(`Failed to remove ${itemToRemove} from backup volume`)
-      //     })
-      // }
       for (const item of this.backupSet) {
-        // if (notEmptyPath(item.dstPath)) {
-        //   await effects.createDir({
-        //     volumeId: item.dstVolume,
-        //     path: item.dstPath,
-        //   })
-        // }
-        // await effects
-        //   .runRsync({
-        //     ...item,
-        //     options: {
-        //       ...this.options,
-        //       ...item.options,
-        //     },
-        //   })
-        //   .wait()
+        const rsyncResults = await runRsync(
+          {
+            dstPath: item.dstPath,
+            dstVolume: item.dstVolume,
+            options: { ...this.options, ...item.options },
+            srcPath: item.srcPath,
+            srcVolume: item.srcVolume,
+          },
+          pathMaker,
+        )
+        await rsyncResults.wait()
       }
       return
     }
@@ -150,26 +118,17 @@ export class Backups<M extends SDKManifest> {
       effects,
     }) => {
       for (const item of this.backupSet) {
-        // if (notEmptyPath(item.srcPath)) {
-        //   await new Promise((resolve, reject) => fs.mkdir(items.src)).createDir(
-        //     {
-        //       volumeId: item.srcVolume,
-        //       path: item.srcPath,
-        //     },
-        //   )
-        // }
-        // await effects
-        //   .runRsync({
-        //     options: {
-        //       ...this.options,
-        //       ...item.options,
-        //     },
-        //     srcVolume: item.dstVolume,
-        //     dstVolume: item.srcVolume,
-        //     srcPath: item.dstPath,
-        //     dstPath: item.srcPath,
-        //   })
-        //   .wait()
+        const rsyncResults = await runRsync(
+          {
+            dstPath: item.dstPath,
+            dstVolume: item.dstVolume,
+            options: { ...this.options, ...item.options },
+            srcPath: item.srcPath,
+            srcVolume: item.srcVolume,
+          },
+          pathMaker,
+        )
+        await rsyncResults.wait()
       }
       return
     }
@@ -179,3 +138,73 @@ export class Backups<M extends SDKManifest> {
 function notEmptyPath(file: string) {
   return ["", ".", "./"].indexOf(file) === -1
 }
+async function runRsync(
+  rsyncOptions: {
+    srcVolume: string
+    dstVolume: string
+    srcPath: string
+    dstPath: string
+    options: T.BackupOptions
+  },
+  pathMaker: T.PathMaker,
+): Promise<{
+  id: () => Promise<string>
+  wait: () => Promise<null>
+  progress: () => Promise<number>
+}> {
+  const { srcVolume, dstVolume, srcPath, dstPath, options } = rsyncOptions
+
+  const command = "rsync"
+  const args: string[] = []
+  if (options.delete) {
+    args.push("--delete")
+  }
+  if (options.force) {
+    args.push("--force")
+  }
+  if (options.ignoreExisting) {
+    args.push("--ignore-existing")
+  }
+  for (const exclude of options.exclude) {
+    args.push(`--exclude=${exclude}`)
+  }
+  args.push("-actAXH")
+  args.push("--info=progress2")
+  args.push("--no-inc-recursive")
+  args.push(pathMaker({ volume: srcVolume, path: srcPath }))
+  args.push(pathMaker({ volume: dstVolume, path: dstPath }))
+  const spawned = child_process.spawn(command, args, { detached: true })
+  let percentage = 0.0
+  spawned.stdout.on("data", (data: unknown) => {
+    const lines = String(data).replace("\r", "\n").split("\n")
+    for (const line of lines) {
+      const parsed = /$([0-9.]+)%/.exec(line)?.[1]
+      if (!parsed) continue
+      percentage = Number.parseFloat(parsed)
+    }
+  })
+
+  spawned.stderr.on("data", (data: unknown) => {
+    console.error(String(data))
+  })
+
+  const id = async () => {
+    const pid = spawned.pid
+    if (pid === undefined) {
+      throw new Error("rsync process has no pid")
+    }
+    return String(pid)
+  }
+  const waitPromise = new Promise<null>((resolve, reject) => {
+    spawned.on("exit", (code: any) => {
+      if (code === 0) {
+        resolve(null)
+      } else {
+        reject(new Error(`rsync exited with code ${code}`))
+      }
+    })
+  })
+  const wait = () => waitPromise
+  const progress = () => Promise.resolve(percentage)
+  return { id, wait, progress }
+}
diff --git a/sdk/lib/backup/setupBackups.ts b/sdk/lib/backup/setupBackups.ts
index af2d08410..69d1bf7df 100644
--- a/sdk/lib/backup/setupBackups.ts
+++ b/sdk/lib/backup/setupBackups.ts
@@ -1,6 +1,6 @@
 import { Backups } from "./Backups"
 import { SDKManifest } from "../manifest/ManifestTypes"
-import { ExpectedExports } from "../types"
+import { ExpectedExports, PathMaker } from "../types"
 import { _ } from "../util"
 
 export type SetupBackupsParams<M extends SDKManifest> = Array<
@@ -27,14 +27,14 @@ export function setupBackups<M extends SDKManifest>(
     get createBackup() {
       return (async (options) => {
         for (const backup of backups) {
-          await backup.build().createBackup(options)
+          await backup.build(options.pathMaker).createBackup(options)
         }
       }) as ExpectedExports.createBackup
     },
     get restoreBackup() {
       return (async (options) => {
         for (const backup of backups) {
-          await backup.build().restoreBackup(options)
+          await backup.build(options.pathMaker).restoreBackup(options)
         }
       }) as ExpectedExports.restoreBackup
     },
diff --git a/sdk/lib/config/configTypes.ts b/sdk/lib/config/configTypes.ts
index 14d857433..0179e531e 100644
--- a/sdk/lib/config/configTypes.ts
+++ b/sdk/lib/config/configTypes.ts
@@ -240,7 +240,6 @@ export type ListValueSpecText = {
   inputmode: "text" | "email" | "tel" | "url"
   placeholder: string | null
 }
-
 export type ListValueSpecObject = {
   type: "object"
   /** this is a mapped type of the config object at this level, replacing the object's values with specs on those values */
diff --git a/sdk/lib/manifest/ManifestTypes.ts b/sdk/lib/manifest/ManifestTypes.ts
index c820930c8..8e6b572d3 100644
--- a/sdk/lib/manifest/ManifestTypes.ts
+++ b/sdk/lib/manifest/ManifestTypes.ts
@@ -1,7 +1,7 @@
 import { ValidEmVer } from "../emverLite/mod"
 import { ActionMetadata, ImageConfig, ImageId } from "../types"
 
-export interface Container {
+export type Container = {
   /** This should be pointing to a docker container name */
   image: string
   /** These should match the manifest data volumes */
@@ -72,7 +72,7 @@ export type SDKManifest = {
   readonly dependencies: Readonly<Record<string, ManifestDependency>>
 }
 
-export interface ManifestDependency {
+export type ManifestDependency = {
   /**
    * A human readable explanation on what the dependency is used for
    */
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 1f1245adc..686cb4750 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -26,6 +26,7 @@ export * from "./osBindings"
 export { SDKManifest } from "./manifest/ManifestTypes"
 export { HealthReceipt } from "./health/HealthReceipt"
 
+export type PathMaker = (options: { volume: string; path: string }) => string
 export type ExportedAction = (options: {
   effects: Effects
   input?: Record<string, unknown>
@@ -43,10 +44,14 @@ export namespace ExpectedExports {
   // /** These are how we make sure the our dependency configurations are valid and if not how to fix them. */
   // export type dependencies = Dependencies;
   /** For backing up service data though the startOS UI */
-  export type createBackup = (options: { effects: Effects }) => Promise<unknown>
+  export type createBackup = (options: {
+    effects: Effects
+    pathMaker: PathMaker
+  }) => Promise<unknown>
   /** For restoring service data that was previously backed up using the startOS UI create backup flow. Backup restores are also triggered via the startOS UI, or doing a system restore flow during setup. */
   export type restoreBackup = (options: {
     effects: Effects
+    pathMaker: PathMaker
   }) => Promise<unknown>
 
   // /** Health checks are used to determine if the service is working properly after starting
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index a1f81fd95..c1f98dcd4 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -22,6 +22,7 @@ export module Mock {
     headline: 'Our biggest release ever.',
     releaseNotes: {
       '0.3.6': 'Some **Markdown** release _notes_ for 0.3.6',
+      '0.3.5.2': 'Some **Markdown** release _notes_ for 0.3.5.2',
       '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1',
       '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4',
       '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3',

From 196561fed2cc1df198022b8e218e7f8c9b5a68d1 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Thu, 18 Jul 2024 21:49:31 -0600
Subject: [PATCH 189/341] init UI increase logs buffer and don't throw on
 websocket unsubscribe (#2669)

* init UI increase logs buffer and don't throw on websocket unsubscribe

* fix: remove smooth scroll for logs

---------

Co-authored-by: waterplea <alexander@inkin.ru>
---
 web/projects/ui/src/app/pages/init/init.service.ts        | 4 ++--
 web/projects/ui/src/app/pages/init/logs/logs.component.ts | 6 +++---
 web/projects/ui/src/app/pages/init/logs/logs.service.ts   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/projects/ui/src/app/pages/init/init.service.ts b/web/projects/ui/src/app/pages/init/init.service.ts
index 245e1ae24..96bf656d3 100644
--- a/web/projects/ui/src/app/pages/init/init.service.ts
+++ b/web/projects/ui/src/app/pages/init/init.service.ts
@@ -58,8 +58,8 @@ export class InitService extends Observable<MappedProgress> {
       }
     }),
     catchError(e => {
-      // @TODO this toast is presenting when we navigate away from init page. It seems other websockets exhibit the same behavior, but we never noticed because the error were not being caught and presented in this manner
-      this.errorService.handleError(e)
+      // @TODO Alex this toast is presenting when we navigate away from init page. It seems other websockets exhibit the same behavior, but we never noticed because the error were not being caught and presented in this manner. It seems odd that unsubscribing from a websocket subject would be treated as an error.
+      // this.errorService.handleError(e)
 
       return EMPTY
     }),
diff --git a/web/projects/ui/src/app/pages/init/logs/logs.component.ts b/web/projects/ui/src/app/pages/init/logs/logs.component.ts
index edce1f282..de05d33bd 100644
--- a/web/projects/ui/src/app/pages/init/logs/logs.component.ts
+++ b/web/projects/ui/src/app/pages/init/logs/logs.component.ts
@@ -24,10 +24,10 @@ export class LogsComponent {
   scroll = true
 
   scrollTo(bottom: HTMLElement) {
-    if (this.scroll) bottom.scrollIntoView({ behavior: 'smooth' })
+    if (this.scroll) bottom.scrollIntoView()
   }
 
-  onBottom([{ isIntersecting }]: readonly IntersectionObserverEntry[]) {
-    this.scroll = isIntersecting
+  onBottom(entries: readonly IntersectionObserverEntry[]) {
+    this.scroll = entries[entries.length - 1].isIntersecting
   }
 }
diff --git a/web/projects/ui/src/app/pages/init/logs/logs.service.ts b/web/projects/ui/src/app/pages/init/logs/logs.service.ts
index 5fe550d45..2553e9872 100644
--- a/web/projects/ui/src/app/pages/init/logs/logs.service.ts
+++ b/web/projects/ui/src/app/pages/init/logs/logs.service.ts
@@ -39,7 +39,7 @@ export class LogsService extends Observable<readonly string[]> {
     this.api.initFollowLogs({ boot: 0 }),
   ).pipe(
     switchMap(({ guid }) => this.api.openWebsocket$<Log>(guid, {})),
-    bufferTime(250),
+    bufferTime(500),
     filter(logs => !!logs.length),
     map(convertAnsi),
     scan((logs: readonly string[], log) => [...logs, log], []),

From 3eb0093d2a9bbcc7f05e5d4347c885b989123659 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 22 Jul 2024 11:40:12 -0600
Subject: [PATCH 190/341] feature: Adding in the stopping state (#2677)

* feature: Adding in the stopping state

* chore: Deal with timeout in the sigterm for main

* chore: Update the timeout

* Update web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* Update web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
---
 .../Systems/SystemForEmbassy/MainLoop.ts      |   5 +-
 .../Systems/SystemForEmbassy/index.ts         |  26 +--
 .../src/Adapters/Systems/SystemForStartOs.ts  |  11 +-
 core/startos/src/service/mod.rs               | 120 +------------
 .../src/service/persistent_container.rs       |   4 +-
 core/startos/src/service/service_actor.rs     | 159 ++++++++++++++++++
 core/startos/src/status/mod.rs                |   9 +-
 sdk/lib/mainFn/CommandController.ts           |  14 +-
 sdk/lib/mainFn/Daemon.ts                      |   1 +
 sdk/lib/mainFn/Daemons.ts                     |   2 +
 sdk/lib/mainFn/HealthDaemon.ts                |   9 +-
 sdk/lib/mainFn/index.ts                       |   1 +
 sdk/lib/osBindings/MainStatus.ts              |   3 +-
 sdk/lib/util/inMs.test.ts                     |  34 ++++
 sdk/lib/util/inMs.ts                          |  31 ++++
 sdk/lib/util/index.ts                         |   1 +
 .../app-list-pkg/app-list-pkg.component.ts    |   4 +-
 .../app-show-status.component.ts              |   4 +-
 18 files changed, 282 insertions(+), 156 deletions(-)
 create mode 100644 core/startos/src/service/service_actor.rs
 create mode 100644 sdk/lib/util/inMs.test.ts
 create mode 100644 sdk/lib/util/inMs.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 975bb52ca..f6e7614ed 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -2,7 +2,7 @@ import { polyfillEffects } from "./polyfillEffects"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { SystemForEmbassy } from "."
 import { hostSystemStartOs } from "../../HostSystemStartOs"
-import { Daemons, T, daemons } from "@start9labs/start-sdk"
+import { Daemons, T, daemons, utils } from "@start9labs/start-sdk"
 import { Daemon } from "@start9labs/start-sdk/cjs/lib/mainFn/Daemon"
 import { Effects } from "../../../Models/Effects"
 
@@ -58,6 +58,9 @@ export class MainLoop {
       currentCommand,
       {
         overlay: dockerProcedureContainer.overlay,
+        sigtermTimeout: utils.inMs(
+          this.system.manifest.main["sigterm-timeout"],
+        ),
       },
     )
     daemon.start()
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 3a8d4f4b2..dd2ccbab3 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -481,20 +481,20 @@ export class SystemForEmbassy implements System {
   private async mainStop(
     effects: Effects,
     timeoutMs: number | null,
-  ): Promise<Duration> {
-    const { currentRunning } = this
-    this.currentRunning?.clean()
-    delete this.currentRunning
-    if (currentRunning) {
-      await currentRunning.clean({
-        timeout: fromDuration(this.manifest.main["sigterm-timeout"]),
-      })
+  ): Promise<void> {
+    try {
+      const { currentRunning } = this
+      this.currentRunning?.clean()
+      delete this.currentRunning
+      if (currentRunning) {
+        await currentRunning.clean({
+          timeout: utils.inMs(this.manifest.main["sigterm-timeout"]),
+        })
+      }
+      return
+    } finally {
+      await effects.setMainStatus({ status: "stopped" })
     }
-    const durationValue = duration(
-      fromDuration(this.manifest.main["sigterm-timeout"]),
-      "s",
-    )
-    return durationValue
   }
   private async createBackup(
     effects: Effects,
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 84bf57302..2c455dc42 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -139,10 +139,13 @@ export class SystemForStartOs implements System {
         return
       }
       case "/main/stop": {
-        if (this.onTerm) await this.onTerm()
-        await effects.setMainStatus({ status: "stopped" })
-        delete this.onTerm
-        return duration(30, "s")
+        try {
+          if (this.onTerm) await this.onTerm()
+          delete this.onTerm
+          return
+        } finally {
+          await effects.setMainStatus({ status: "stopped" })
+        }
       }
       case "/config/set": {
         const input = options.input as any // TODO
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index d78df6c79..9103b70a1 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -10,6 +10,7 @@ use models::{HealthCheckId, PackageId, ProcedureName};
 use persistent_container::PersistentContainer;
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
 use serde::{Deserialize, Serialize};
+use service_actor::ServiceActor;
 use start_stop::StartStop;
 use tokio::sync::Notify;
 use ts_rs::TS;
@@ -45,6 +46,7 @@ mod dependencies;
 pub mod persistent_container;
 mod properties;
 mod rpc;
+mod service_actor;
 pub mod service_effect_handler;
 pub mod service_map;
 mod start_stop;
@@ -482,124 +484,6 @@ impl ServiceActorSeed {
         });
     }
 }
-#[derive(Clone)]
-struct ServiceActor(Arc<ServiceActorSeed>);
-
-impl Actor for ServiceActor {
-    fn init(&mut self, jobs: &BackgroundJobQueue) {
-        let seed = self.0.clone();
-        jobs.add_job(async move {
-            let id = seed.id.clone();
-            let mut current = seed.persistent_container.state.subscribe();
-
-            loop {
-                let kinds = current.borrow().kinds();
-
-                if let Err(e) = async {
-                    let main_status = match (
-                        kinds.transition_state,
-                        kinds.desired_state,
-                        kinds.running_status,
-                    ) {
-                        (Some(TransitionKind::Restarting), StartStop::Stop, Some(_)) => {
-                            seed.persistent_container.stop().await?;
-                            MainStatus::Restarting
-                        }
-                        (Some(TransitionKind::Restarting), StartStop::Start, _) => {
-                            seed.persistent_container.start().await?;
-                            MainStatus::Restarting
-                        }
-                        (Some(TransitionKind::Restarting), _, _) => MainStatus::Restarting,
-                        (Some(TransitionKind::Restoring), _, _) => MainStatus::Restoring,
-                        (Some(TransitionKind::BackingUp), StartStop::Stop, Some(status)) => {
-                            seed.persistent_container.stop().await?;
-                            MainStatus::BackingUp {
-                                started: Some(status.started),
-                                health: status.health.clone(),
-                            }
-                        }
-                        (Some(TransitionKind::BackingUp), StartStop::Start, _) => {
-                            seed.persistent_container.start().await?;
-                            MainStatus::BackingUp {
-                                started: None,
-                                health: OrdMap::new(),
-                            }
-                        }
-                        (Some(TransitionKind::BackingUp), _, _) => MainStatus::BackingUp {
-                            started: None,
-                            health: OrdMap::new(),
-                        },
-                        (None, StartStop::Stop, None) => MainStatus::Stopped,
-                        (None, StartStop::Stop, Some(_)) => MainStatus::Stopping {
-                            timeout: seed.persistent_container.stop().await?.into(),
-                        },
-                        (None, StartStop::Start, Some(status)) => MainStatus::Running {
-                            started: status.started,
-                            health: status.health.clone(),
-                        },
-                        (None, StartStop::Start, None) => {
-                            seed.persistent_container.start().await?;
-                            MainStatus::Starting
-                        }
-                    };
-                    seed.ctx
-                        .db
-                        .mutate(|d| {
-                            if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id)
-                            {
-                                let previous = i.as_status().as_main().de()?;
-                                let previous_health = previous.health();
-                                let previous_started = previous.started();
-                                let mut main_status = main_status;
-                                match &mut main_status {
-                                    &mut MainStatus::Running { ref mut health, .. }
-                                    | &mut MainStatus::BackingUp { ref mut health, .. } => {
-                                        *health = previous_health.unwrap_or(health).clone();
-                                    }
-                                    _ => (),
-                                };
-                                match &mut main_status {
-                                    MainStatus::Running {
-                                        ref mut started, ..
-                                    } => {
-                                        *started = previous_started.unwrap_or(*started);
-                                    }
-                                    MainStatus::BackingUp {
-                                        ref mut started, ..
-                                    } => {
-                                        *started = previous_started.map(Some).unwrap_or(*started);
-                                    }
-                                    _ => (),
-                                };
-                                i.as_status_mut().as_main_mut().ser(&main_status)?;
-                            }
-                            Ok(())
-                        })
-                        .await?;
-
-                    Ok::<_, Error>(())
-                }
-                .await
-                {
-                    tracing::error!("error synchronizing state of service: {e}");
-                    tracing::debug!("{e:?}");
-
-                    seed.synchronized.notify_waiters();
-
-                    tracing::error!("Retrying in {}s...", SYNC_RETRY_COOLDOWN_SECONDS);
-                    tokio::time::sleep(Duration::from_secs(SYNC_RETRY_COOLDOWN_SECONDS)).await;
-                    continue;
-                }
-
-                seed.synchronized.notify_waiters();
-
-                tokio::select! {
-                    _ = current.changed() => (),
-                }
-            }
-        })
-    }
-}
 
 #[derive(Deserialize, Serialize, Parser, TS)]
 pub struct ConnectParams {
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 11cc237d3..e8c504a92 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -441,11 +441,11 @@ impl PersistentContainer {
     }
 
     #[instrument(skip_all)]
-    pub async fn stop(&self) -> Result<Duration, Error> {
+    pub async fn stop(&self) -> Result<(), Error> {
         let timeout: Option<crate::util::serde::Duration> = self
             .execute(Guid::new(), ProcedureName::StopMain, Value::Null, None)
             .await?;
-        Ok(timeout.map(|a| *a).unwrap_or(Duration::from_secs(30)))
+        Ok(())
     }
 
     #[instrument(skip_all)]
diff --git a/core/startos/src/service/service_actor.rs b/core/startos/src/service/service_actor.rs
new file mode 100644
index 000000000..e6e1c4ede
--- /dev/null
+++ b/core/startos/src/service/service_actor.rs
@@ -0,0 +1,159 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use imbl::OrdMap;
+use models::PackageId;
+
+use super::start_stop::StartStop;
+
+use crate::prelude::*;
+use crate::service::transition::TransitionKind;
+use crate::service::SYNC_RETRY_COOLDOWN_SECONDS;
+use crate::status::MainStatus;
+use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::actor::Actor;
+
+use super::ServiceActorSeed;
+
+#[derive(Clone)]
+pub(super) struct ServiceActor(pub(super) Arc<ServiceActorSeed>);
+
+enum ServiceActorLoopNext {
+    Wait,
+    DontWait,
+}
+
+impl Actor for ServiceActor {
+    fn init(&mut self, jobs: &BackgroundJobQueue) {
+        let seed = self.0.clone();
+        jobs.add_job(async move {
+            let id = seed.id.clone();
+            let mut current = seed.persistent_container.state.subscribe();
+
+            loop {
+                match service_actor_loop(&current, &seed, &id).await {
+                    ServiceActorLoopNext::Wait => tokio::select! {
+                        _ = current.changed() => (),
+                    },
+                    ServiceActorLoopNext::DontWait => (),
+                }
+            }
+        })
+    }
+}
+
+async fn service_actor_loop(
+    current: &tokio::sync::watch::Receiver<super::persistent_container::ServiceState>,
+    seed: &Arc<ServiceActorSeed>,
+    id: &PackageId,
+) -> ServiceActorLoopNext {
+    let kinds = current.borrow().kinds();
+    if let Err(e) = async {
+        let main_status = match (
+            kinds.transition_state,
+            kinds.desired_state,
+            kinds.running_status,
+        ) {
+            (Some(TransitionKind::Restarting), StartStop::Stop, Some(_)) => {
+                seed.persistent_container.stop().await?;
+                MainStatus::Restarting
+            }
+            (Some(TransitionKind::Restarting), StartStop::Start, _) => {
+                seed.persistent_container.start().await?;
+                MainStatus::Restarting
+            }
+            (Some(TransitionKind::Restarting), _, _) => MainStatus::Restarting,
+            (Some(TransitionKind::Restoring), _, _) => MainStatus::Restoring,
+            (Some(TransitionKind::BackingUp), StartStop::Stop, Some(status)) => {
+                seed.persistent_container.stop().await?;
+                MainStatus::BackingUp {
+                    started: Some(status.started),
+                    health: status.health.clone(),
+                }
+            }
+            (Some(TransitionKind::BackingUp), StartStop::Start, _) => {
+                seed.persistent_container.start().await?;
+                MainStatus::BackingUp {
+                    started: None,
+                    health: OrdMap::new(),
+                }
+            }
+            (Some(TransitionKind::BackingUp), _, _) => MainStatus::BackingUp {
+                started: None,
+                health: OrdMap::new(),
+            },
+            (None, StartStop::Stop, None) => MainStatus::Stopped,
+            (None, StartStop::Stop, Some(_)) => {
+                let task_seed = seed.clone();
+                seed.ctx
+                    .db
+                    .mutate(|d| {
+                        if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id) {
+                            i.as_status_mut().as_main_mut().ser(&MainStatus::Stopping)?;
+                        }
+                        Ok(())
+                    })
+                    .await?;
+                task_seed.persistent_container.stop().await?;
+                MainStatus::Stopped
+            }
+            (None, StartStop::Start, Some(status)) => MainStatus::Running {
+                started: status.started,
+                health: status.health.clone(),
+            },
+            (None, StartStop::Start, None) => {
+                seed.persistent_container.start().await?;
+                MainStatus::Starting
+            }
+        };
+        seed.ctx
+            .db
+            .mutate(|d| {
+                if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id) {
+                    let previous = i.as_status().as_main().de()?;
+                    let previous_health = previous.health();
+                    let previous_started = previous.started();
+                    let mut main_status = main_status;
+                    match &mut main_status {
+                        &mut MainStatus::Running { ref mut health, .. }
+                        | &mut MainStatus::BackingUp { ref mut health, .. } => {
+                            *health = previous_health.unwrap_or(health).clone();
+                        }
+                        _ => (),
+                    };
+                    match &mut main_status {
+                        MainStatus::Running {
+                            ref mut started, ..
+                        } => {
+                            *started = previous_started.unwrap_or(*started);
+                        }
+                        MainStatus::BackingUp {
+                            ref mut started, ..
+                        } => {
+                            *started = previous_started.map(Some).unwrap_or(*started);
+                        }
+                        _ => (),
+                    };
+                    i.as_status_mut().as_main_mut().ser(&main_status)?;
+                }
+                Ok(())
+            })
+            .await?;
+
+        Ok::<_, Error>(())
+    }
+    .await
+    {
+        tracing::error!("error synchronizing state of service: {e}");
+        tracing::debug!("{e:?}");
+
+        seed.synchronized.notify_waiters();
+
+        tracing::error!("Retrying in {}s...", SYNC_RETRY_COOLDOWN_SECONDS);
+        tokio::time::sleep(Duration::from_secs(SYNC_RETRY_COOLDOWN_SECONDS)).await;
+        return ServiceActorLoopNext::DontWait;
+    }
+    seed.synchronized.notify_waiters();
+
+    ServiceActorLoopNext::Wait
+}
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 520fe5089..c1d3a36ad 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, sync::Arc};
 
 use chrono::{DateTime, Utc};
 use imbl::OrdMap;
@@ -6,8 +6,8 @@ use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
 use self::health_check::HealthCheckId;
-use crate::prelude::*;
 use crate::status::health_check::HealthCheckResult;
+use crate::{prelude::*, util::GeneralGuard};
 
 pub mod health_check;
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
@@ -26,10 +26,7 @@ pub enum MainStatus {
     Stopped,
     Restarting,
     Restoring,
-    #[serde(rename_all = "camelCase")]
-    Stopping {
-        timeout: crate::util::serde::Duration,
-    },
+    Stopping,
     Starting,
     #[serde(rename_all = "camelCase")]
     Running {
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/lib/mainFn/CommandController.ts
index 264574f7c..3af01e915 100644
--- a/sdk/lib/mainFn/CommandController.ts
+++ b/sdk/lib/mainFn/CommandController.ts
@@ -1,3 +1,4 @@
+import { DEFAULT_SIGTERM_TIMEOUT } from "."
 import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../StartSdk"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { Effects, ImageId, ValidIfNoStupidEscape } from "../types"
@@ -10,6 +11,7 @@ export class CommandController {
     readonly runningAnswer: Promise<unknown>,
     readonly overlay: Overlay,
     readonly pid: number | undefined,
+    readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {}
   static of<Manifest extends SDKManifest>() {
     return async <A extends string>(
@@ -20,6 +22,8 @@ export class CommandController {
       },
       command: ValidIfNoStupidEscape<A> | [string, ...string[]],
       options: {
+        // Defaults to the DEFAULT_SIGTERM_TIMEOUT = 30_000ms
+        sigtermTimeout?: number
         mounts?: { path: string; options: MountOptions }[]
         overlay?: Overlay
         env?:
@@ -67,10 +71,14 @@ export class CommandController {
 
       const pid = childProcess.pid
 
-      return new CommandController(answer, overlay, pid)
+      return new CommandController(answer, overlay, pid, options.sigtermTimeout)
     }
   }
-  async wait() {
+  async wait(timeout: number = NO_TIMEOUT) {
+    if (timeout > 0)
+      setTimeout(() => {
+        this.term()
+      }, timeout)
     try {
       return await this.runningAnswer
     } finally {
@@ -82,7 +90,7 @@ export class CommandController {
       await this.overlay.destroy().catch((_) => {})
     }
   }
-  async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
+  async term({ signal = SIGTERM, timeout = this.sigtermTimeout } = {}) {
     if (this.pid === undefined) return
     try {
       await cpExecFile("pkill", [
diff --git a/sdk/lib/mainFn/Daemon.ts b/sdk/lib/mainFn/Daemon.ts
index c48865f94..90882418c 100644
--- a/sdk/lib/mainFn/Daemon.ts
+++ b/sdk/lib/mainFn/Daemon.ts
@@ -34,6 +34,7 @@ export class Daemon {
         user?: string | undefined
         onStdout?: (x: Buffer) => void
         onStderr?: (x: Buffer) => void
+        sigtermTimeout?: number
       },
     ) => {
       const startCommand = () =>
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 059d148ab..fbda547aa 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -44,6 +44,7 @@ type DaemonsParams<
   env?: Record<string, string>
   ready: Ready
   requires: Exclude<Ids, Id>[]
+  sigtermTimeout?: number
 }
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
@@ -136,6 +137,7 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
       this.ids,
       options.ready,
       this.effects,
+      options.sigtermTimeout,
     )
     const daemons = this.daemons.concat(daemon)
     const ids = [...this.ids, id] as (Ids | Id)[]
diff --git a/sdk/lib/mainFn/HealthDaemon.ts b/sdk/lib/mainFn/HealthDaemon.ts
index 48f3fab55..84865e59b 100644
--- a/sdk/lib/mainFn/HealthDaemon.ts
+++ b/sdk/lib/mainFn/HealthDaemon.ts
@@ -3,6 +3,7 @@ import { defaultTrigger } from "../trigger/defaultTrigger"
 import { Ready } from "./Daemons"
 import { Daemon } from "./Daemon"
 import { Effects } from "../types"
+import { DEFAULT_SIGTERM_TIMEOUT } from "."
 
 const oncePromise = <T>() => {
   let resolve: (value: T) => void
@@ -32,6 +33,7 @@ export class HealthDaemon {
     readonly ids: string[],
     readonly ready: Ready,
     readonly effects: Effects,
+    readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {
     this.updateStatus()
     this.dependencies.forEach((d) => d.addWatcher(() => this.updateStatus()))
@@ -46,7 +48,12 @@ export class HealthDaemon {
     this.#running = false
     this.#healthCheckCleanup?.()
 
-    await this.daemon.then((d) => d.stop(termOptions))
+    await this.daemon.then((d) =>
+      d.stop({
+        timeout: this.sigtermTimeout,
+        ...termOptions,
+      }),
+    )
   }
 
   /** Want to add another notifier that the health might have changed */
diff --git a/sdk/lib/mainFn/index.ts b/sdk/lib/mainFn/index.ts
index 3da57d32f..c4f74764c 100644
--- a/sdk/lib/mainFn/index.ts
+++ b/sdk/lib/mainFn/index.ts
@@ -7,6 +7,7 @@ import "./Daemons"
 import { SDKManifest } from "../manifest/ManifestTypes"
 import { MainEffects } from "../StartSdk"
 
+export const DEFAULT_SIGTERM_TIMEOUT = 30_000
 /**
  * Used to ensure that the main function is running with the valid proofs.
  * We first do the folowing order of things
diff --git a/sdk/lib/osBindings/MainStatus.ts b/sdk/lib/osBindings/MainStatus.ts
index 1b9d8482e..6acdce14a 100644
--- a/sdk/lib/osBindings/MainStatus.ts
+++ b/sdk/lib/osBindings/MainStatus.ts
@@ -1,5 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Duration } from "./Duration"
 import type { HealthCheckId } from "./HealthCheckId"
 import type { HealthCheckResult } from "./HealthCheckResult"
 
@@ -7,7 +6,7 @@ export type MainStatus =
   | { status: "stopped" }
   | { status: "restarting" }
   | { status: "restoring" }
-  | { status: "stopping"; timeout: Duration }
+  | { status: "stopping" }
   | { status: "starting" }
   | {
       status: "running"
diff --git a/sdk/lib/util/inMs.test.ts b/sdk/lib/util/inMs.test.ts
new file mode 100644
index 000000000..fbf71bf2c
--- /dev/null
+++ b/sdk/lib/util/inMs.test.ts
@@ -0,0 +1,34 @@
+import { inMs } from "./inMs"
+
+describe("inMs", () => {
+  test("28.001s", () => {
+    expect(inMs("28.001s")).toBe(28001)
+  })
+  test("28.123s", () => {
+    expect(inMs("28.123s")).toBe(28123)
+  })
+  test(".123s", () => {
+    expect(inMs(".123s")).toBe(123)
+  })
+  test("123ms", () => {
+    expect(inMs("123ms")).toBe(123)
+  })
+  test("1h", () => {
+    expect(inMs("1h")).toBe(3600000)
+  })
+  test("1m", () => {
+    expect(inMs("1m")).toBe(60000)
+  })
+  test("1m", () => {
+    expect(inMs("1d")).toBe(1000 * 60 * 60 * 24)
+  })
+  test("123", () => {
+    expect(() => inMs("123")).toThrowError("Invalid time format: 123")
+  })
+  test("123 as number", () => {
+    expect(inMs(123)).toBe(123)
+  })
+  test.only("undefined", () => {
+    expect(inMs(undefined)).toBe(undefined)
+  })
+})
diff --git a/sdk/lib/util/inMs.ts b/sdk/lib/util/inMs.ts
new file mode 100644
index 000000000..547fb8bea
--- /dev/null
+++ b/sdk/lib/util/inMs.ts
@@ -0,0 +1,31 @@
+import { DEFAULT_SIGTERM_TIMEOUT } from "../mainFn"
+
+const matchTimeRegex = /^\s*(\d+)?(\.\d+)?\s*(ms|s|m|h|d)/
+
+const unitMultiplier = (unit?: string) => {
+  if (!unit) return 1
+  if (unit === "ms") return 1
+  if (unit === "s") return 1000
+  if (unit === "m") return 1000 * 60
+  if (unit === "h") return 1000 * 60 * 60
+  if (unit === "d") return 1000 * 60 * 60 * 24
+  throw new Error(`Invalid unit: ${unit}`)
+}
+const digitsMs = (digits: string | null, multiplier: number) => {
+  if (!digits) return 0
+  const value = parseInt(digits.slice(1))
+  const divideBy = multiplier / Math.pow(10, digits.length - 1)
+  return Math.round(value * divideBy)
+}
+export const inMs = (time?: string | number) => {
+  if (typeof time === "number") return time
+  if (!time) return undefined
+  const matches = time.match(matchTimeRegex)
+  if (!matches) throw new Error(`Invalid time format: ${time}`)
+  const [_, leftHandSide, digits, unit] = matches
+  const multiplier = unitMultiplier(unit)
+  const firstValue = parseInt(leftHandSide || "0") * multiplier
+  const secondValue = digitsMs(digits, multiplier)
+
+  return firstValue + secondValue
+}
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index 63629dfaa..d4427adb0 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -12,3 +12,4 @@ export { addressHostToUrl } from "./getServiceInterface"
 export { hostnameInfoToAddress } from "./Hostname"
 export * from "./typeHelpers"
 export { getDefaultString } from "./getDefaultString"
+export { inMs } from "./inMs"
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index 35bf99f8f..4df818956 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -24,9 +24,7 @@ export class AppListPkgComponent {
   }
 
   get sigtermTimeout(): string | null {
-    return this.pkgMainStatus.status === 'stopping'
-      ? this.pkgMainStatus.timeout
-      : null
+    return this.pkgMainStatus.status === 'stopping' ? '30s' : null // @dr-bonez TODO
   }
 
   launchUi(e: Event, interfaces: PackageDataEntry['serviceInterfaces']): void {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 30657ae01..186bbe39a 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -76,9 +76,7 @@ export class AppShowStatusComponent {
   }
 
   get sigtermTimeout(): string | null {
-    return this.pkgStatus?.main.status === 'stopping'
-      ? this.pkgStatus.main.timeout
-      : null
+    return this.pkgStatus?.main.status === 'stopping' ? '30s' : null // @dr-bonez TODO
   }
 
   launchUi(interfaces: PackageDataEntry['serviceInterfaces']): void {

From a535fc17c320bfa778315eabbe670ee4c0a8f72e Mon Sep 17 00:00:00 2001
From: Lucy <12953208+elvece@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:48:12 -0400
Subject: [PATCH 191/341] Feature/fe new registry (#2647)

* bugfixes

* update fe types

* implement new registry types in marketplace and ui

* fix marketplace types to have default params

* add alt implementation toggle

* merge cleanup

* more cleanup and notes

* fix build

* cleanup sync with next/minor

* add exver JS parser

* parse ValidExVer to string

* update types to interface

* add VersionRange and comparative functions

* Parse ExtendedVersion from string

* add conjunction, disjunction, and inversion logic

* consider flavor in satisfiedBy fn

* consider prerelease for ordering

* add compare fn for sorting

* rename fns for consistency

* refactoring

* update compare fn to return null if flavors don't match

* begin simplifying dependencies

* under construction

* wip

* add dependency metadata to CurrentDependencyInfo

* ditch inheritance for recursive VersionRange constructor. Recursive 'satisfiedBy' fn wip

* preprocess manifest

* misc fixes

* use sdk version as osVersion in manifest

* chore: Change the type to just validate and not generate all solutions.

* add publishedAt

* fix pegjs exports

* integrate exver into sdk

* misc fixes

* complete satisfiedBy fn

* refactor - use greaterThanOrEqual and lessThanOrEqual fns

* fix tests

* update dependency details

* update types

* remove interim types

* rename alt implementation to flavor

* cleanup os update

* format exver.ts

* add s9pk parsing endpoints

* fix build

* update to exver

* exver and bug fixes

* update static endpoints + cleanup

* cleanup

* update static proxy verification

* make mocks more robust; fix dep icon fallback; cleanup

* refactor alert versions and update fixtures

* registry bugfixes

* misc fixes

* cleanup unused

* convert patchdb ui seed to camelCase

* update otherVersions type

* change otherVersions: null to 'none'

* refactor and complete feature

* improve static endpoints

* fix install params

* mask systemd-networkd-wait-online

* fix static file fetching

* include non-matching versions in otherVersions

* convert release notes to modal and clean up displayExver

* alert for no other versions

* Fix ack-instructions casing

* fix indeterminate loader on service install

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
Co-authored-by: Shadowy Super Coder <musashidisciple@proton.me>
Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: Matt Hill <mattnine@protonmail.com>
---
 .../Systems/SystemForEmbassy/index.ts         |   20 +-
 core/Cargo.lock                               |   51 +-
 core/startos/Cargo.toml                       |    2 +
 core/startos/src/backup/target/mod.rs         |    3 +-
 core/startos/src/bins/start_init.rs           |   81 +-
 core/startos/src/context/init.rs              |    3 +
 core/startos/src/db/model/package.rs          |    9 +-
 core/startos/src/dependencies.rs              |   13 +
 core/startos/src/init.rs                      |   57 +-
 core/startos/src/install/mod.rs               |    1 +
 core/startos/src/middleware/db.rs             |    1 -
 core/startos/src/net/static_server.rs         |  459 ++-
 core/startos/src/registry/admin.rs            |   25 +-
 core/startos/src/registry/asset.rs            |    3 +
 core/startos/src/registry/auth.rs             |   12 +-
 core/startos/src/registry/context.rs          |   30 +-
 core/startos/src/registry/device_info.rs      |    8 +-
 core/startos/src/registry/mod.rs              |   29 +-
 core/startos/src/registry/os/asset/add.rs     |   10 +-
 core/startos/src/registry/os/asset/sign.rs    |    6 +-
 core/startos/src/registry/os/version/mod.rs   |    8 +-
 core/startos/src/registry/package/add.rs      |   20 +-
 core/startos/src/registry/package/get.rs      |   81 +-
 core/startos/src/registry/package/index.rs    |   46 +-
 core/startos/src/registry/package/mod.rs      |   11 +-
 .../signer/commitment/merkle_archive.rs       |   29 +
 .../src/registry/signer/commitment/request.rs |    5 +-
 .../src/s9pk/merkle_archive/expected.rs       |   48 +-
 core/startos/src/s9pk/merkle_archive/mod.rs   |    4 +
 .../src/s9pk/merkle_archive/source/mod.rs     |   52 +-
 core/startos/src/s9pk/rpc.rs                  |   36 +
 core/startos/src/s9pk/v2/compat.rs            |    6 +-
 core/startos/src/s9pk/v2/manifest.rs          |   15 +-
 core/startos/src/s9pk/v2/mod.rs               |  108 +-
 core/startos/src/s9pk/v2/pack.rs              |  224 +-
 .../src/service/service_effect_handler.rs     |  156 +-
 core/startos/src/util/mod.rs                  |   51 +
 core/startos/src/util/net.rs                  |   51 +-
 core/startos/src/util/rpc.rs                  |   31 +-
 core/startos/src/util/serde.rs                |   18 +-
 debian/postinst                               |    2 +-
 sdk/.prettierignore                           |    1 +
 sdk/Makefile                                  |    5 +-
 sdk/jest.config.js                            |    2 +-
 sdk/lib/Dependency.ts                         |    6 +-
 sdk/lib/StartSdk.ts                           |   29 +-
 sdk/lib/actions/createAction.ts               |    9 +-
 sdk/lib/actions/setupActions.ts               |    4 +-
 sdk/lib/backup/Backups.ts                     |   10 +-
 sdk/lib/backup/setupBackups.ts                |   16 +-
 sdk/lib/config/configDependencies.ts          |   15 +-
 sdk/lib/config/setupConfig.ts                 |   16 +-
 sdk/lib/dependencies/DependencyConfig.ts      |   17 +-
 sdk/lib/dependencies/dependencies.ts          |   40 +-
 sdk/lib/dependencies/setupDependencyConfig.ts |    8 +-
 sdk/lib/emverLite/mod.ts                      |  323 ---
 sdk/lib/exver/exver.pegjs                     |   99 +
 sdk/lib/exver/exver.ts                        | 2507 +++++++++++++++++
 sdk/lib/exver/index.ts                        |  443 +++
 sdk/lib/health/HealthCheck.ts                 |    9 +-
 sdk/lib/index.browser.ts                      |    6 +-
 sdk/lib/index.ts                              |    2 +-
 sdk/lib/inits/migrations/Migration.ts         |   28 +-
 sdk/lib/inits/migrations/setupMigrations.ts   |   38 +-
 sdk/lib/inits/setupInit.ts                    |   12 +-
 sdk/lib/inits/setupInstall.ts                 |   15 +-
 sdk/lib/inits/setupUninstall.ts               |   15 +-
 sdk/lib/interfaces/setupInterfaces.ts         |   12 +-
 sdk/lib/mainFn/CommandController.ts           |   12 +-
 sdk/lib/mainFn/Daemon.ts                      |   11 +-
 sdk/lib/mainFn/Daemons.ts                     |   25 +-
 sdk/lib/mainFn/Mounts.ts                      |    9 +-
 sdk/lib/mainFn/index.ts                       |    8 +-
 sdk/lib/manifest/ManifestTypes.ts             |   74 +-
 sdk/lib/manifest/setupManifest.ts             |   64 +-
 sdk/lib/osBindings/CheckDependenciesResult.ts |    4 +-
 sdk/lib/osBindings/CurrentDependencyInfo.ts   |    7 +-
 sdk/lib/osBindings/DepInfo.ts                 |    7 +-
 sdk/lib/osBindings/DependencyMetadata.ts      |    9 +
 sdk/lib/osBindings/DependencyRequirement.ts   |    5 +-
 sdk/lib/osBindings/FullIndex.ts               |    1 +
 ...VersionParams.ts => GetOsVersionParams.ts} |    2 +-
 sdk/lib/osBindings/GetPackageParams.ts        |    2 +-
 sdk/lib/osBindings/HardwareRequirements.ts    |    2 +-
 sdk/lib/osBindings/InstallParams.ts           |    9 +
 sdk/lib/osBindings/Manifest.ts                |    1 +
 sdk/lib/osBindings/PackageDetailLevel.ts      |    2 +-
 sdk/lib/osBindings/PackageVersionInfo.ts      |    6 +
 sdk/lib/osBindings/PathOrUrl.ts               |    3 +
 sdk/lib/osBindings/RegistryAsset.ts           |    1 +
 sdk/lib/osBindings/RegistryInfo.ts            |    9 +
 sdk/lib/osBindings/index.ts                   |    6 +-
 sdk/lib/test/configBuilder.test.ts            |    5 +-
 sdk/lib/test/emverList.test.ts                |  253 --
 sdk/lib/test/exverList.test.ts                |  355 +++
 sdk/lib/test/output.sdk.ts                    |    5 +-
 sdk/lib/test/setupDependencyConfig.test.ts    |    2 +-
 sdk/lib/test/utils.splitCommand.test.ts       |   42 -
 sdk/lib/types.ts                              |   24 +-
 sdk/lib/util/splitCommand.ts                  |   11 +-
 sdk/package-lock.json                         |  295 ++
 sdk/package.json                              |    2 +
 web/angular.json                              |    3 +-
 web/package-lock.json                         |    4 +
 web/package.json                              |    1 +
 web/patchdb-ui-seed.json                      |   18 +-
 .../release-notes.component.html              |   17 +-
 .../release-notes.component.scss              |    1 +
 .../release-notes/release-notes.component.ts  |   69 +
 .../release-notes/release-notes.module.ts     |    7 +-
 .../list/categories/categories.component.html |    8 +-
 .../list/categories/categories.component.ts   |    7 +-
 .../src/pages/list/item/item.component.html   |   10 +-
 .../release-notes/release-notes.component.ts  |   39 -
 .../src/pages/show/about/about.component.html |   12 +-
 .../src/pages/show/about/about.component.ts   |   13 +
 .../src/pages/show/about/about.module.ts      |    7 +-
 .../show/additional/additional.component.html |   20 +-
 .../show/additional/additional.component.ts   |   81 +-
 .../dependencies/dependencies.component.html  |    8 +-
 .../dependencies/dependencies.component.ts    |    3 +-
 .../show/dependencies/dependencies.module.ts  |    7 +-
 .../pages/show/flavors/flavors.component.html |   21 +
 .../pages/show/flavors/flavors.component.ts   |   12 +
 .../src/pages/show/flavors/flavors.module.ts  |   19 +
 .../pages/show/package/package.component.html |    8 +-
 .../src/pages/show/package/package.module.ts  |    4 +-
 .../src/pipes/filter-packages.pipe.ts         |   15 +-
 web/projects/marketplace/src/public-api.ts    |    4 +-
 .../src/services/marketplace.service.ts       |   15 +-
 web/projects/marketplace/src/types.ts         |   66 +-
 .../assets/img/service-icons/fallback.png     |  Bin 0 -> 30439 bytes
 .../shared/src/pipes/emver/emver.module.ts    |   12 -
 .../shared/src/pipes/emver/emver.pipe.ts      |   52 -
 .../shared/src/pipes/exver/exver.module.ts    |    8 +
 .../shared/src/pipes/exver/exver.pipe.ts      |   35 +
 web/projects/shared/src/public-api.ts         |    6 +-
 .../shared/src/services/emver.service.ts      |   18 -
 .../shared/src/services/exver.service.ts      |   43 +
 web/projects/shared/src/types/http.types.ts   |    6 +-
 .../ui/src/app/app/menu/menu.component.ts     |    8 +-
 .../backup-drives/backup.service.ts           |   10 +-
 .../form/form-array/form-array.component.html |    2 +-
 .../form-datetime.component.html              |    8 +-
 .../refresh-alert/refresh-alert.service.ts    |    9 +-
 .../app-recover-select/to-options.pipe.ts     |   10 +-
 .../app-actions/app-actions.page.ts           |    2 +-
 .../app-list-pkg/app-list-pkg.component.html  |    4 +-
 .../apps-routes/app-list/app-list.module.ts   |    4 +-
 .../apps-routes/app-show/app-show.module.ts   |    4 +-
 .../apps-routes/app-show/app-show.page.html   |    7 +-
 .../apps-routes/app-show/app-show.page.ts     |   51 +-
 .../app-show-additional.component.html        |   32 +-
 .../app-show-additional.component.ts          |   15 +-
 .../app-show-dependencies.component.html      |    2 +-
 .../app-show-header.component.html            |    2 +-
 .../app-show-progress.component.html          |   10 +-
 .../app-show-progress.component.ts            |    2 +-
 .../app-show/pipes/to-buttons.pipe.ts         |   15 +-
 .../login/ca-wizard/ca-wizard.component.html  |    5 +-
 .../marketplace-list.module.ts                |    4 +-
 .../marketplace-list.page.html                |    5 +-
 .../marketplace-list/marketplace-list.page.ts |   20 +-
 .../marketplace-routing.module.ts             |    7 -
 .../marketplace-show-controls.component.html  |   24 +-
 .../marketplace-show-controls.component.ts    |   17 +-
 .../marketplace-show-dependent.component.html |    8 +-
 .../marketplace-show-dependent.component.ts   |    4 +-
 .../marketplace-show.module.ts                |    6 +-
 .../marketplace-show.page.html                |   22 +-
 .../marketplace-show/marketplace-show.page.ts |   68 +-
 .../marketplace-status.component.html         |    6 +-
 .../marketplace-status.component.ts           |   15 +-
 .../marketplace-status.module.ts              |    4 +-
 .../app/pages/server-routes/lan/lan.page.html |    2 +-
 .../server-specs/server-specs.module.ts       |    4 +-
 .../server-specs/server-specs.page.html       |    2 +-
 .../server-routes/sideload/sideload.module.ts |    4 +-
 .../server-routes/sideload/sideload.page.html |    2 +-
 .../src/app/pages/updates/updates.module.ts   |    4 +-
 .../src/app/pages/updates/updates.page.html   |   30 +-
 .../ui/src/app/pages/updates/updates.page.ts  |   34 +-
 .../ui/src/app/services/api/api-icons.ts      |   10 +-
 .../ui/src/app/services/api/api.fixures.ts    |  654 ++++-
 .../ui/src/app/services/api/api.types.ts      |   27 +-
 .../app/services/api/embassy-api.service.ts   |   38 +-
 .../services/api/embassy-live-api.service.ts  |  137 +-
 .../services/api/embassy-mock-api.service.ts  |   96 +-
 .../ui/src/app/services/api/mock-patch.ts     |   10 +-
 .../ui/src/app/services/dep-error.service.ts  |   20 +-
 .../ui/src/app/services/eos.service.ts        |    6 +-
 .../src/app/services/marketplace.service.ts   |  171 +-
 .../src/app/services/patch-db/data-model.ts   |    4 +
 web/projects/ui/src/app/util/dry-update.ts    |    7 +-
 web/projects/ui/src/manifest.webmanifest      |    4 +-
 web/projects/ui/src/polyfills.ts              |    4 +-
 196 files changed, 6993 insertions(+), 2153 deletions(-)
 create mode 100644 sdk/.prettierignore
 delete mode 100644 sdk/lib/emverLite/mod.ts
 create mode 100644 sdk/lib/exver/exver.pegjs
 create mode 100644 sdk/lib/exver/exver.ts
 create mode 100644 sdk/lib/exver/index.ts
 create mode 100644 sdk/lib/osBindings/DependencyMetadata.ts
 rename sdk/lib/osBindings/{GetVersionParams.ts => GetOsVersionParams.ts} (85%)
 create mode 100644 sdk/lib/osBindings/InstallParams.ts
 create mode 100644 sdk/lib/osBindings/PathOrUrl.ts
 create mode 100644 sdk/lib/osBindings/RegistryInfo.ts
 delete mode 100644 sdk/lib/test/emverList.test.ts
 create mode 100644 sdk/lib/test/exverList.test.ts
 delete mode 100644 sdk/lib/test/utils.splitCommand.test.ts
 rename web/projects/marketplace/src/{pages => modals}/release-notes/release-notes.component.html (63%)
 rename web/projects/marketplace/src/{pages => modals}/release-notes/release-notes.component.scss (91%)
 create mode 100644 web/projects/marketplace/src/modals/release-notes/release-notes.component.ts
 rename web/projects/marketplace/src/{pages => modals}/release-notes/release-notes.module.ts (86%)
 delete mode 100644 web/projects/marketplace/src/pages/release-notes/release-notes.component.ts
 create mode 100644 web/projects/marketplace/src/pages/show/flavors/flavors.component.html
 create mode 100644 web/projects/marketplace/src/pages/show/flavors/flavors.component.ts
 create mode 100644 web/projects/marketplace/src/pages/show/flavors/flavors.module.ts
 create mode 100644 web/projects/shared/assets/img/service-icons/fallback.png
 delete mode 100644 web/projects/shared/src/pipes/emver/emver.module.ts
 delete mode 100644 web/projects/shared/src/pipes/emver/emver.pipe.ts
 create mode 100644 web/projects/shared/src/pipes/exver/exver.module.ts
 create mode 100644 web/projects/shared/src/pipes/exver/exver.pipe.ts
 delete mode 100644 web/projects/shared/src/services/emver.service.ts
 create mode 100644 web/projects/shared/src/services/exver.service.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index dd2ccbab3..be8a4d163 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -1,4 +1,4 @@
-import { types as T, utils, EmVer } from "@start9labs/start-sdk"
+import { ExtendedVersion, types as T, utils } from "@start9labs/start-sdk"
 import * as fs from "fs/promises"
 
 import { polyfillEffects } from "./polyfillEffects"
@@ -647,13 +647,13 @@ export class SystemForEmbassy implements System {
       dependencies: Object.entries(dependsOn).flatMap(([key, value]) => {
         const dependency = this.manifest.dependencies?.[key]
         if (!dependency) return []
-        const versionSpec = dependency.version
+        const versionRange = dependency.version
         const registryUrl = DEFAULT_REGISTRY
         const kind = "running"
         return [
           {
             id: key,
-            versionSpec,
+            versionRange,
             registryUrl,
             kind,
             healthChecks: [...value],
@@ -668,18 +668,24 @@ export class SystemForEmbassy implements System {
     fromVersion: string,
     timeoutMs: number | null,
   ): Promise<T.MigrationRes> {
-    const fromEmver = EmVer.from(fromVersion)
-    const currentEmver = EmVer.from(this.manifest.version)
+    const fromEmver = ExtendedVersion.parseEmver(fromVersion)
+    const currentEmver = ExtendedVersion.parseEmver(this.manifest.version)
     if (!this.manifest.migrations) return { configured: true }
     const fromMigration = Object.entries(this.manifest.migrations.from)
-      .map(([version, procedure]) => [EmVer.from(version), procedure] as const)
+      .map(
+        ([version, procedure]) =>
+          [ExtendedVersion.parseEmver(version), procedure] as const,
+      )
       .find(
         ([versionEmver, procedure]) =>
           versionEmver.greaterThan(fromEmver) &&
           versionEmver.lessThanOrEqual(currentEmver),
       )
     const toMigration = Object.entries(this.manifest.migrations.to)
-      .map(([version, procedure]) => [EmVer.from(version), procedure] as const)
+      .map(
+        ([version, procedure]) =>
+          [ExtendedVersion.parseEmver(version), procedure] as const,
+      )
       .find(
         ([versionEmver, procedure]) =>
           versionEmver.greaterThan(fromEmver) &&
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 1072f4203..e3576a8d8 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -471,9 +471,9 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
 
 [[package]]
 name = "base32"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ce0365f4d5fb6646220bb52fe547afd51796d90f914d4063cb0b032ebee088"
+checksum = "022dfe9eb35f19ebbcb51e0b40a5ab759f46ad60cadf7297e0bd085afb50e076"
 
 [[package]]
 name = "base64"
@@ -4632,6 +4632,12 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "smawk"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
+
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -4953,7 +4959,7 @@ dependencies = [
  "axum-server",
  "backhand",
  "barrage",
- "base32 0.5.0",
+ "base32 0.5.1",
  "base64 0.22.1",
  "base64ct",
  "basic-cookies",
@@ -4975,6 +4981,7 @@ dependencies = [
  "ed25519-dalek 2.1.1",
  "exver",
  "fd-lock-rs",
+ "form_urlencoded",
  "futures",
  "gpt",
  "helpers",
@@ -5044,6 +5051,7 @@ dependencies = [
  "sscanf",
  "ssh-key",
  "tar",
+ "textwrap",
  "thiserror",
  "tokio",
  "tokio-rustls",
@@ -5052,7 +5060,7 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite 0.23.1",
  "tokio-util",
- "toml 0.8.14",
+ "toml 0.8.15",
  "torut",
  "tower-service",
  "tracing",
@@ -5221,6 +5229,17 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+dependencies = [
+ "smawk",
+ "unicode-linebreak",
+ "unicode-width",
+]
+
 [[package]]
 name = "thingbuf"
 version = "0.1.6"
@@ -5233,18 +5252,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5480,14 +5499,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.15",
+ "toml_edit 0.22.16",
 ]
 
 [[package]]
@@ -5525,9 +5544,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.15"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
@@ -5888,6 +5907,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
 [[package]]
 name = "unicode-normalization"
 version = "0.1.23"
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 2695c7813..a531477b2 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -90,6 +90,7 @@ exver = { version = "0.2.0", git = "https://github.com/Start9Labs/exver-rs.git",
   "serde",
 ] }
 fd-lock-rs = "0.1.4"
+form_urlencoded = "1.2.1"
 futures = "0.3.28"
 gpt = "3.1.0"
 helpers = { path = "../helpers" }
@@ -171,6 +172,7 @@ sscanf = "0.4.1"
 ssh-key = { version = "0.6.2", features = ["ed25519"] }
 tar = "0.4.40"
 thiserror = "1.0.49"
+textwrap = "0.16.1"
 tokio = { version = "1.38.1", features = ["full"] }
 tokio-rustls = "0.26.0"
 tokio-socks = "0.5.1"
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index f3b6b5f5c..032f70848 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -8,6 +8,7 @@ use color_eyre::eyre::eyre;
 use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
 use exver::Version;
+use imbl_value::InternedString;
 use models::PackageId;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -213,7 +214,7 @@ pub struct BackupInfo {
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PackageBackupInfo {
-    pub title: String,
+    pub title: InternedString,
     pub version: VersionString,
     pub os_version: Version,
     pub timestamp: DateTime<Utc>,
diff --git a/core/startos/src/bins/start_init.rs b/core/startos/src/bins/start_init.rs
index f4aa411b5..394d42c8d 100644
--- a/core/startos/src/bins/start_init.rs
+++ b/core/startos/src/bins/start_init.rs
@@ -141,6 +141,7 @@ async fn setup_or_init(
     } else {
         let init_ctx = InitContext::init(config).await?;
         let handle = init_ctx.progress.clone();
+        let err_channel = init_ctx.error.clone();
 
         let mut disk_phase = handle.add_phase("Opening data drive".into(), Some(10));
         let init_phases = InitPhases::new(&handle);
@@ -148,47 +149,55 @@ async fn setup_or_init(
 
         server.serve_init(init_ctx);
 
-        disk_phase.start();
-        let guid_string = tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
+        async {
+            disk_phase.start();
+            let guid_string = tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
+                .await?;
+            let disk_guid = Arc::new(String::from(guid_string.trim()));
+            let requires_reboot = crate::disk::main::import(
+                &**disk_guid,
+                config.datadir(),
+                if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
+                    RepairStrategy::Aggressive
+                } else {
+                    RepairStrategy::Preen
+                },
+                if disk_guid.ends_with("_UNENC") {
+                    None
+                } else {
+                    Some(DEFAULT_PASSWORD)
+                },
+            )
             .await?;
-        let disk_guid = Arc::new(String::from(guid_string.trim()));
-        let requires_reboot = crate::disk::main::import(
-            &**disk_guid,
-            config.datadir(),
             if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
-                RepairStrategy::Aggressive
-            } else {
-                RepairStrategy::Preen
-            },
-            if disk_guid.ends_with("_UNENC") {
-                None
-            } else {
-                Some(DEFAULT_PASSWORD)
-            },
-        )
-        .await?;
-        if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
-            tokio::fs::remove_file(REPAIR_DISK_PATH)
-                .await
-                .with_ctx(|_| (crate::ErrorKind::Filesystem, REPAIR_DISK_PATH))?;
-        }
-        disk_phase.complete();
-        tracing::info!("Loaded Disk");
-
-        if requires_reboot.0 {
-            let mut reboot_phase = handle.add_phase("Rebooting".into(), Some(1));
-            reboot_phase.start();
-            return Ok(Err(Shutdown {
-                export_args: Some((disk_guid, config.datadir().to_owned())),
-                restart: true,
-            }));
-        }
+                tokio::fs::remove_file(REPAIR_DISK_PATH)
+                    .await
+                    .with_ctx(|_| (crate::ErrorKind::Filesystem, REPAIR_DISK_PATH))?;
+            }
+            disk_phase.complete();
+            tracing::info!("Loaded Disk");
+
+            if requires_reboot.0 {
+                let mut reboot_phase = handle.add_phase("Rebooting".into(), Some(1));
+                reboot_phase.start();
+                return Ok(Err(Shutdown {
+                    export_args: Some((disk_guid, config.datadir().to_owned())),
+                    restart: true,
+                }));
+            }
 
-        let InitResult { net_ctrl } = crate::init::init(config, init_phases).await?;
+            let InitResult { net_ctrl } = crate::init::init(config, init_phases).await?;
 
-        let rpc_ctx = RpcContext::init(config, disk_guid, Some(net_ctrl), rpc_ctx_phases).await?;
+            let rpc_ctx =
+                RpcContext::init(config, disk_guid, Some(net_ctrl), rpc_ctx_phases).await?;
 
-        Ok(Ok((rpc_ctx, handle)))
+            Ok::<_, Error>(Ok((rpc_ctx, handle)))
+        }
+        .await
+        .map_err(|e| {
+            err_channel.send_replace(Some(e.clone_output()));
+            e
+        })
     }
 }
 
diff --git a/core/startos/src/context/init.rs b/core/startos/src/context/init.rs
index f5f4a5430..566457a9c 100644
--- a/core/startos/src/context/init.rs
+++ b/core/startos/src/context/init.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 
 use rpc_toolkit::Context;
 use tokio::sync::broadcast::Sender;
+use tokio::sync::watch;
 use tracing::instrument;
 
 use crate::context::config::ServerConfig;
@@ -12,6 +13,7 @@ use crate::Error;
 
 pub struct InitContextSeed {
     pub config: ServerConfig,
+    pub error: watch::Sender<Option<Error>>,
     pub progress: FullProgressTracker,
     pub shutdown: Sender<()>,
     pub rpc_continuations: RpcContinuations,
@@ -25,6 +27,7 @@ impl InitContext {
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
         Ok(Self(Arc::new(InitContextSeed {
             config: cfg.clone(),
+            error: watch::channel(None).0,
             progress: FullProgressTracker::new(),
             shutdown,
             rpc_continuations: RpcContinuations::new(),
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 22d6440bb..e3b6e613b 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -372,14 +372,13 @@ impl Map for CurrentDependencies {
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 pub struct CurrentDependencyInfo {
+    #[ts(type = "string | null")]
+    pub title: Option<InternedString>,
+    pub icon: Option<DataUrl<'static>>,
     #[serde(flatten)]
     pub kind: CurrentDependencyKind,
-    pub title: String,
-    pub icon: DataUrl<'static>,
-    #[ts(type = "string")]
-    pub registry_url: Url,
     #[ts(type = "string")]
-    pub version_spec: VersionRange,
+    pub version_range: VersionRange,
     pub config_satisfied: bool,
 }
 
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index f6ccc53ad..54e38f299 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -2,18 +2,21 @@ use std::collections::BTreeMap;
 use std::time::Duration;
 
 use clap::Parser;
+use imbl_value::InternedString;
 use models::PackageId;
 use patch_db::json_patch::merge;
 use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
+use url::Url;
 
 use crate::config::{Config, ConfigSpec, ConfigureContext};
 use crate::context::RpcContext;
 use crate::db::model::package::CurrentDependencies;
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
+use crate::util::PathOrUrl;
 use crate::Error;
 
 pub fn dependency<C: Context>() -> ParentHandler<C> {
@@ -42,6 +45,16 @@ impl Map for Dependencies {
 pub struct DepInfo {
     pub description: Option<String>,
     pub optional: bool,
+    pub s9pk: Option<PathOrUrl>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct DependencyMetadata {
+    #[ts(type = "string")]
+    pub title: InternedString,
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 48cb24c9a..735ca85a5 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -554,33 +554,54 @@ pub struct InitProgressRes {
 pub async fn init_progress(ctx: InitContext) -> Result<InitProgressRes, Error> {
     let progress_tracker = ctx.progress.clone();
     let progress = progress_tracker.snapshot();
+    let mut error = ctx.error.subscribe();
     let guid = Guid::new();
     ctx.rpc_continuations
         .add(
             guid.clone(),
             RpcContinuation::ws(
                 |mut ws| async move {
-                    if let Err(e) = async {
-                        let mut stream = progress_tracker.stream(Some(Duration::from_millis(100)));
-                        while let Some(progress) = stream.next().await {
-                            ws.send(ws::Message::Text(
-                                serde_json::to_string(&progress)
-                                    .with_kind(ErrorKind::Serialization)?,
-                            ))
-                            .await
-                            .with_kind(ErrorKind::Network)?;
-                            if progress.overall.is_complete() {
-                                break;
+                    let res = tokio::try_join!(
+                        async {
+                            let mut stream =
+                                progress_tracker.stream(Some(Duration::from_millis(100)));
+                            while let Some(progress) = stream.next().await {
+                                ws.send(ws::Message::Text(
+                                    serde_json::to_string(&progress)
+                                        .with_kind(ErrorKind::Serialization)?,
+                                ))
+                                .await
+                                .with_kind(ErrorKind::Network)?;
+                                if progress.overall.is_complete() {
+                                    break;
+                                }
                             }
-                        }
-
-                        ws.normal_close("complete").await?;
 
-                        Ok::<_, Error>(())
-                    }
-                    .await
+                            Ok::<_, Error>(())
+                        },
+                        async {
+                            if let Some(e) = error
+                                .wait_for(|e| e.is_some())
+                                .await
+                                .ok()
+                                .and_then(|e| e.as_ref().map(|e| e.clone_output()))
+                            {
+                                Err::<(), _>(e)
+                            } else {
+                                Ok(())
+                            }
+                        }
+                    );
+
+                    if let Err(e) = ws
+                        .close_result(res.map(|_| "complete").map_err(|e| {
+                            tracing::error!("error in init progress websocket: {e}");
+                            tracing::debug!("{e:?}");
+                            e
+                        }))
+                        .await
                     {
-                        tracing::error!("error in init progress websocket: {e}");
+                        tracing::error!("error closing init progress websocket: {e}");
                         tracing::debug!("{e:?}");
                     }
                 },
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 18591dc8d..394136024 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -111,6 +111,7 @@ impl std::fmt::Display for MinMax {
 
 #[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct InstallParams {
     #[ts(type = "string")]
     registry: Url,
diff --git a/core/startos/src/middleware/db.rs b/core/startos/src/middleware/db.rs
index dca0418e5..e8b4f8887 100644
--- a/core/startos/src/middleware/db.rs
+++ b/core/startos/src/middleware/db.rs
@@ -7,7 +7,6 @@ use serde::Deserialize;
 use crate::context::RpcContext;
 
 #[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
 pub struct Metadata {
     #[serde(default)]
     sync_db: bool,
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index 3e5f0997d..cd93a9d65 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -1,5 +1,8 @@
+use std::cmp::min;
 use std::future::Future;
+use std::io::Cursor;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 use std::time::UNIX_EPOCH;
 
 use async_compression::tokio::bufread::GzipEncoder;
@@ -8,36 +11,51 @@ use axum::extract::{self as x, Request};
 use axum::response::Response;
 use axum::routing::{any, get, post};
 use axum::Router;
+use base64::display::Base64Display;
 use digest::Digest;
 use futures::future::ready;
-use http::header::ACCEPT_ENCODING;
+use http::header::{
+    ACCEPT_ENCODING, ACCEPT_RANGES, CACHE_CONTROL, CONNECTION, CONTENT_ENCODING, CONTENT_LENGTH,
+    CONTENT_RANGE, CONTENT_TYPE, ETAG, RANGE,
+};
 use http::request::Parts as RequestParts;
-use http::{Method, StatusCode};
+use http::{HeaderValue, Method, StatusCode};
 use imbl_value::InternedString;
 use include_dir::Dir;
 use new_mime_guess::MimeGuess;
 use openssl::hash::MessageDigest;
 use openssl::x509::X509;
 use rpc_toolkit::{Context, HttpServer, Server};
-use tokio::io::BufReader;
+use sqlx::query;
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeekExt, BufReader};
 use tokio_util::io::ReaderStream;
+use url::Url;
 
 use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::hostname::Hostname;
+use crate::install::PKG_ARCHIVE_DIR;
 use crate::middleware::auth::{Auth, HasValidSession};
 use crate::middleware::cors::Cors;
 use crate::middleware::db::SyncDb;
+use crate::prelude::*;
+use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
 use crate::rpc_continuations::{Guid, RpcContinuations};
+use crate::s9pk::merkle_archive::source::http::HttpSource;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
+use crate::s9pk::merkle_archive::source::FileSource;
+use crate::s9pk::S9pk;
 use crate::util::io::open_file;
-use crate::{
-    diagnostic_api, init_api, install_api, main_api, setup_api, Error, ErrorKind, ResultExt,
-};
+use crate::util::net::SyncBody;
+use crate::util::serde::BASE64;
+use crate::{diagnostic_api, init_api, install_api, main_api, setup_api};
 
 const NOT_FOUND: &[u8] = b"Not Found";
 const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
 const NOT_AUTHORIZED: &[u8] = b"Not Authorized";
 const INTERNAL_SERVER_ERROR: &[u8] = b"Internal Server Error";
 
+const PROXY_STRIP_HEADERS: &[&str] = &["cookie", "host", "origin", "referer", "user-agent"];
+
 #[cfg(all(feature = "daemon", not(feature = "test")))]
 const EMBEDDED_UIS: Dir<'_> =
     include_dir::include_dir!("$CARGO_MANIFEST_DIR/../../web/dist/static");
@@ -97,7 +115,7 @@ pub fn rpc_router<C: Context + Clone + AsRef<RpcContinuations>>(
 fn serve_ui(req: Request, ui_mode: UiMode) -> Result<Response, Error> {
     let (request_parts, _body) = req.into_parts();
     match &request_parts.method {
-        &Method::GET => {
+        &Method::GET | &Method::HEAD => {
             let uri_path = ui_mode.path(
                 request_parts
                     .uri
@@ -111,7 +129,7 @@ fn serve_ui(req: Request, ui_mode: UiMode) -> Result<Response, Error> {
                 .or_else(|| EMBEDDED_UIS.get_file(&*ui_mode.path("index.html")));
 
             if let Some(file) = file {
-                FileData::from_embedded(&request_parts, file).into_response(&request_parts)
+                FileData::from_embedded(&request_parts, file)?.into_response(&request_parts)
             } else {
                 Ok(not_found())
             }
@@ -161,14 +179,35 @@ pub fn init_ui_router(ctx: InitContext) -> Router {
 }
 
 pub fn main_ui_router(ctx: RpcContext) -> Router {
-    rpc_router(
-        ctx.clone(),
+    rpc_router(ctx.clone(), {
+        let ctx = ctx.clone();
         Server::new(move || ready(Ok(ctx.clone())), main_api::<RpcContext>())
             .middleware(Cors::new())
             .middleware(Auth::new())
-            .middleware(SyncDb::new()),
+            .middleware(SyncDb::new())
+    })
+    .route("/proxy/:url", {
+        let ctx = ctx.clone();
+        any(move |x::Path(url): x::Path<String>, request: Request| {
+            let ctx = ctx.clone();
+            async move {
+                proxy_request(ctx, request, url)
+                    .await
+                    .unwrap_or_else(server_error)
+            }
+        })
+    })
+    .nest("/s9pk", s9pk_router(ctx.clone()))
+    .route(
+        "/static/local-root-ca.crt",
+        get(move || {
+            let ctx = ctx.clone();
+            async move {
+                let account = ctx.account.read().await;
+                cert_send(&account.root_ca_cert, &account.hostname)
+            }
+        }),
     )
-    // TODO: cert
     .fallback(any(|request: Request| async move {
         serve_ui(request, UiMode::Main).unwrap_or_else(server_error)
     }))
@@ -179,29 +218,133 @@ pub fn refresher() -> Router {
         let res = include_bytes!("./refresher.html");
         FileData {
             data: Body::from(&res[..]),
+            content_range: None,
             e_tag: None,
             encoding: None,
             len: Some(res.len() as u64),
             mime: Some("text/html".into()),
+            digest: None,
         }
         .into_response(&request.into_parts().0)
         .unwrap_or_else(server_error)
     }))
 }
 
+async fn proxy_request(ctx: RpcContext, request: Request, url: String) -> Result<Response, Error> {
+    if_authorized(&ctx, request, |mut request| async {
+        for header in PROXY_STRIP_HEADERS {
+            request.headers_mut().remove(*header);
+        }
+        *request.uri_mut() = url.parse()?;
+        let request = request.map(|b| reqwest::Body::wrap_stream(SyncBody::from(b)));
+        let response = ctx.client.execute(request.try_into()?).await?;
+        Ok(Response::from(response).map(|b| Body::new(b)))
+    })
+    .await
+}
+
+fn s9pk_router(ctx: RpcContext) -> Router {
+    Router::new()
+        .route("/installed/:s9pk", {
+            let ctx = ctx.clone();
+            any(
+                |x::Path(s9pk): x::Path<String>, request: Request| async move {
+                    if_authorized(&ctx, request, |request| async {
+                        let (parts, _) = request.into_parts();
+                        match FileData::from_path(
+                            &parts,
+                            &ctx.datadir
+                                .join(PKG_ARCHIVE_DIR)
+                                .join("installed")
+                                .join(s9pk),
+                        )
+                        .await?
+                        {
+                            Some(file) => file.into_response(&parts),
+                            None => Ok(not_found()),
+                        }
+                    })
+                    .await
+                    .unwrap_or_else(server_error)
+                },
+            )
+        })
+        .route("/installed/:s9pk/*path", {
+            let ctx = ctx.clone();
+            any(
+                |x::Path(s9pk): x::Path<String>,
+                 x::Path(path): x::Path<PathBuf>,
+                 x::Query(commitment): x::Query<Option<MerkleArchiveCommitment>>,
+                 request: Request| async move {
+                    if_authorized(&ctx, request, |request| async {
+                        let s9pk = S9pk::deserialize(
+                            &MultiCursorFile::from(
+                                open_file(
+                                    ctx.datadir
+                                        .join(PKG_ARCHIVE_DIR)
+                                        .join("installed")
+                                        .join(s9pk),
+                                )
+                                .await?,
+                            ),
+                            commitment.as_ref(),
+                        )
+                        .await?;
+                        let (parts, _) = request.into_parts();
+                        match FileData::from_s9pk(&parts, &s9pk, &path).await? {
+                            Some(file) => file.into_response(&parts),
+                            None => Ok(not_found()),
+                        }
+                    })
+                    .await
+                    .unwrap_or_else(server_error)
+                },
+            )
+        })
+        .route(
+            "/proxy/:url/*path",
+            any(
+                |x::Path((url, path)): x::Path<(Url, PathBuf)>,
+                 x::RawQuery(query): x::RawQuery,
+                 request: Request| async move {
+                    if_authorized(&ctx, request, |request| async {
+                        let s9pk = S9pk::deserialize(
+                            &Arc::new(HttpSource::new(ctx.client.clone(), url).await?),
+                            query
+                                .as_deref()
+                                .map(MerkleArchiveCommitment::from_query)
+                                .and_then(|a| a.transpose())
+                                .transpose()?
+                                .as_ref(),
+                        )
+                        .await?;
+                        let (parts, _) = request.into_parts();
+                        match FileData::from_s9pk(&parts, &s9pk, &path).await? {
+                            Some(file) => file.into_response(&parts),
+                            None => Ok(not_found()),
+                        }
+                    })
+                    .await
+                    .unwrap_or_else(server_error)
+                },
+            ),
+        )
+}
+
 async fn if_authorized<
-    F: FnOnce() -> Fut,
-    Fut: Future<Output = Result<Response, Error>> + Send + Sync,
+    F: FnOnce(Request) -> Fut,
+    Fut: Future<Output = Result<Response, Error>> + Send,
 >(
     ctx: &RpcContext,
-    parts: &RequestParts,
+    request: Request,
     f: F,
 ) -> Result<Response, Error> {
-    if let Err(e) = HasValidSession::from_header(parts.headers.get(http::header::COOKIE), ctx).await
+    if let Err(e) =
+        HasValidSession::from_header(request.headers().get(http::header::COOKIE), ctx).await
     {
-        Ok(unauthorized(e, parts.uri.path()))
+        Ok(unauthorized(e, request.uri().path()))
     } else {
-        f().await
+        f(request).await
     }
 }
 
@@ -268,44 +411,117 @@ fn cert_send(cert: &X509, hostname: &Hostname) -> Result<Response, Error> {
         .with_kind(ErrorKind::Network)
 }
 
+fn parse_range(header: &HeaderValue, len: u64) -> Result<(u64, u64, u64), Error> {
+    let r = header
+        .to_str()
+        .with_kind(ErrorKind::Network)?
+        .trim()
+        .strip_prefix("bytes=")
+        .ok_or_else(|| Error::new(eyre!("invalid range units"), ErrorKind::InvalidRequest))?;
+
+    if r.contains(",") {
+        return Err(Error::new(
+            eyre!("multi-range requests are unsupported"),
+            ErrorKind::InvalidRequest,
+        ));
+    }
+    if let Some((start, end)) = r.split_once("-").map(|(s, e)| (s.trim(), e.trim())) {
+        Ok((
+            if start.is_empty() {
+                0u64
+            } else {
+                start.parse()?
+            },
+            if end.is_empty() {
+                len - 1
+            } else {
+                min(end.parse()?, len - 1)
+            },
+            len,
+        ))
+    } else {
+        Ok((len - r.trim().parse::<u64>()?, len - 1, len))
+    }
+}
+
 struct FileData {
     data: Body,
     len: Option<u64>,
+    content_range: Option<(u64, u64, u64)>,
     encoding: Option<&'static str>,
     e_tag: Option<String>,
     mime: Option<InternedString>,
+    digest: Option<(&'static str, Vec<u8>)>,
 }
 impl FileData {
-    fn from_embedded(req: &RequestParts, file: &'static include_dir::File<'static>) -> Self {
+    fn from_embedded(
+        req: &RequestParts,
+        file: &'static include_dir::File<'static>,
+    ) -> Result<Self, Error> {
         let path = file.path();
-        let (encoding, data) = req
-            .headers
-            .get_all(ACCEPT_ENCODING)
-            .into_iter()
-            .filter_map(|h| h.to_str().ok())
-            .flat_map(|s| s.split(","))
-            .filter_map(|s| s.split(";").next())
-            .map(|s| s.trim())
-            .fold((None, file.contents()), |acc, e| {
-                if let Some(file) = (e == "br")
-                    .then_some(())
-                    .and_then(|_| EMBEDDED_UIS.get_file(format!("{}.br", path.display())))
-                {
-                    (Some("br"), file.contents())
-                } else if let Some(file) = (e == "gzip" && acc.0 != Some("br"))
-                    .then_some(())
-                    .and_then(|_| EMBEDDED_UIS.get_file(format!("{}.gz", path.display())))
-                {
-                    (Some("gzip"), file.contents())
-                } else {
-                    acc
-                }
-            });
+        let (encoding, data, len, content_range) = if let Some(range) = req.headers.get(RANGE) {
+            let data = file.contents();
+            let (start, end, size) = parse_range(range, data.len() as u64)?;
+            let encoding = req
+                .headers
+                .get_all(ACCEPT_ENCODING)
+                .into_iter()
+                .filter_map(|h| h.to_str().ok())
+                .flat_map(|s| s.split(","))
+                .filter_map(|s| s.split(";").next())
+                .map(|s| s.trim())
+                .any(|e| e == "gzip")
+                .then_some("gzip");
+            let data = if start > end {
+                &[]
+            } else {
+                &data[(start as usize)..=(end as usize)]
+            };
+            let (len, data) = if encoding == Some("gzip") {
+                (
+                    None,
+                    Body::from_stream(ReaderStream::new(GzipEncoder::new(Cursor::new(data)))),
+                )
+            } else {
+                (Some(data.len() as u64), Body::from(data))
+            };
+            (encoding, data, len, Some((start, end, size)))
+        } else {
+            let (encoding, data) = req
+                .headers
+                .get_all(ACCEPT_ENCODING)
+                .into_iter()
+                .filter_map(|h| h.to_str().ok())
+                .flat_map(|s| s.split(","))
+                .filter_map(|s| s.split(";").next())
+                .map(|s| s.trim())
+                .fold((None, file.contents()), |acc, e| {
+                    if let Some(file) = (e == "br")
+                        .then_some(())
+                        .and_then(|_| EMBEDDED_UIS.get_file(format!("{}.br", path.display())))
+                    {
+                        (Some("br"), file.contents())
+                    } else if let Some(file) = (e == "gzip" && acc.0 != Some("br"))
+                        .then_some(())
+                        .and_then(|_| EMBEDDED_UIS.get_file(format!("{}.gz", path.display())))
+                    {
+                        (Some("gzip"), file.contents())
+                    } else {
+                        acc
+                    }
+                });
+            (encoding, Body::from(data), Some(data.len() as u64), None)
+        };
 
-        Self {
-            len: Some(data.len() as u64),
+        Ok(Self {
+            len,
             encoding,
-            data: data.into(),
+            content_range,
+            data: if req.method == Method::HEAD {
+                Body::empty()
+            } else {
+                data
+            },
             e_tag: file.metadata().map(|metadata| {
                 e_tag(
                     path,
@@ -323,11 +539,28 @@ impl FileData {
             mime: MimeGuess::from_path(path)
                 .first()
                 .map(|m| m.essence_str().into()),
+            digest: None,
+        })
+    }
+
+    fn encode<R: AsyncRead + Send + 'static>(
+        encoding: &mut Option<&str>,
+        data: R,
+        len: u64,
+    ) -> (Option<u64>, Body) {
+        if *encoding == Some("gzip") {
+            (
+                None,
+                Body::from_stream(ReaderStream::new(GzipEncoder::new(BufReader::new(data)))),
+            )
+        } else {
+            *encoding = None;
+            (Some(len), Body::from_stream(ReaderStream::new(data)))
         }
     }
 
-    async fn from_path(req: &RequestParts, path: &Path) -> Result<Self, Error> {
-        let encoding = req
+    async fn from_path(req: &RequestParts, path: &Path) -> Result<Option<Self>, Error> {
+        let mut encoding = req
             .headers
             .get_all(ACCEPT_ENCODING)
             .into_iter()
@@ -338,12 +571,23 @@ impl FileData {
             .any(|e| e == "gzip")
             .then_some("gzip");
 
-        let file = open_file(path).await?;
+        if tokio::fs::metadata(path).await.is_err() {
+            return Ok(None);
+        }
+
+        let mut file = open_file(path).await?;
+
         let metadata = file
             .metadata()
             .await
             .with_ctx(|_| (ErrorKind::Filesystem, path.display().to_string()))?;
 
+        let content_range = req
+            .headers
+            .get(RANGE)
+            .map(|r| parse_range(r, metadata.len()))
+            .transpose()?;
+
         let e_tag = Some(e_tag(
             path,
             format!(
@@ -357,51 +601,123 @@ impl FileData {
             .as_bytes(),
         ));
 
-        let (len, data) = if encoding == Some("gzip") {
-            (
-                None,
-                Body::from_stream(ReaderStream::new(GzipEncoder::new(BufReader::new(file)))),
-            )
+        let (len, data) = if let Some((start, end, _)) = content_range {
+            let len = end + 1 - start;
+            file.seek(std::io::SeekFrom::Start(start)).await?;
+            Self::encode(&mut encoding, file.take(len), len)
         } else {
-            (
-                Some(metadata.len()),
-                Body::from_stream(ReaderStream::new(file)),
-            )
+            Self::encode(&mut encoding, file, metadata.len())
         };
 
-        Ok(Self {
-            data,
+        Ok(Some(Self {
+            data: if req.method == Method::HEAD {
+                Body::empty()
+            } else {
+                data
+            },
             len,
+            content_range,
             encoding,
             e_tag,
             mime: MimeGuess::from_path(path)
                 .first()
                 .map(|m| m.essence_str().into()),
-        })
+            digest: None,
+        }))
+    }
+
+    async fn from_s9pk<S: FileSource>(
+        req: &RequestParts,
+        s9pk: &S9pk<S>,
+        path: &Path,
+    ) -> Result<Option<Self>, Error> {
+        let mut encoding = req
+            .headers
+            .get_all(ACCEPT_ENCODING)
+            .into_iter()
+            .filter_map(|h| h.to_str().ok())
+            .flat_map(|s| s.split(","))
+            .filter_map(|s| s.split(";").next())
+            .map(|s| s.trim())
+            .any(|e| e == "gzip")
+            .then_some("gzip");
+
+        let Some(file) = s9pk.as_archive().contents().get_path(path) else {
+            return Ok(None);
+        };
+        let Some(contents) = file.as_file() else {
+            return Ok(None);
+        };
+        let (digest, len) = if let Some((hash, len)) = file.hash() {
+            (Some(("blake3", hash.as_bytes().to_vec())), len)
+        } else {
+            (None, contents.size().await?)
+        };
+
+        let content_range = req
+            .headers
+            .get(RANGE)
+            .map(|r| parse_range(r, len))
+            .transpose()?;
+
+        let (len, data) = if let Some((start, end, _)) = content_range {
+            let len = end + 1 - start;
+            Self::encode(&mut encoding, contents.slice(start, len).await?, len)
+        } else {
+            Self::encode(&mut encoding, contents.reader().await?.take(len), len)
+        };
+
+        Ok(Some(Self {
+            data: if req.method == Method::HEAD {
+                Body::empty()
+            } else {
+                data
+            },
+            len,
+            content_range,
+            encoding,
+            e_tag: None,
+            mime: MimeGuess::from_path(path)
+                .first()
+                .map(|m| m.essence_str().into()),
+            digest,
+        }))
     }
 
     fn into_response(self, req: &RequestParts) -> Result<Response, Error> {
         let mut builder = Response::builder();
         if let Some(mime) = self.mime {
-            builder = builder.header(http::header::CONTENT_TYPE, &*mime);
+            builder = builder.header(CONTENT_TYPE, &*mime);
         }
         if let Some(e_tag) = &self.e_tag {
-            builder = builder.header(http::header::ETAG, &**e_tag);
+            builder = builder
+                .header(ETAG, &**e_tag)
+                .header(CACHE_CONTROL, "public, max-age=21000000, immutable");
+        }
+
+        builder = builder.header(ACCEPT_RANGES, "bytes");
+        if let Some((start, end, size)) = self.content_range {
+            builder = builder
+                .header(CONTENT_RANGE, format!("bytes {start}-{end}/{size}"))
+                .status(StatusCode::PARTIAL_CONTENT);
+        }
+
+        if let Some((algorithm, digest)) = self.digest {
+            builder = builder.header(
+                "Repr-Digest",
+                format!("{algorithm}=:{}:", Base64Display::new(&digest, &BASE64)),
+            );
         }
-        builder = builder.header(
-            http::header::CACHE_CONTROL,
-            "public, max-age=21000000, immutable",
-        );
 
         if req
             .headers
-            .get_all(http::header::CONNECTION)
+            .get_all(CONNECTION)
             .iter()
             .flat_map(|s| s.to_str().ok())
             .flat_map(|s| s.split(","))
             .any(|s| s.trim() == "keep-alive")
         {
-            builder = builder.header(http::header::CONNECTION, "keep-alive");
+            builder = builder.header(CONNECTION, "keep-alive");
         }
 
         if self.e_tag.is_some()
@@ -411,14 +727,13 @@ impl FileData {
                 .and_then(|h| h.to_str().ok())
                 == self.e_tag.as_deref()
         {
-            builder = builder.status(StatusCode::NOT_MODIFIED);
-            builder.body(Body::empty())
+            builder.status(StatusCode::NOT_MODIFIED).body(Body::empty())
         } else {
             if let Some(len) = self.len {
-                builder = builder.header(http::header::CONTENT_LENGTH, len);
+                builder = builder.header(CONTENT_LENGTH, len);
             }
             if let Some(encoding) = self.encoding {
-                builder = builder.header(http::header::CONTENT_ENCODING, encoding);
+                builder = builder.header(CONTENT_ENCODING, encoding);
             }
 
             builder.body(self.data)
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index cd795e5cd..8125580a4 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -46,7 +46,7 @@ fn signers_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("admin", Value::Bool(true))
                 .no_cli(),
         )
-        .subcommand("add", from_fn_async(cli_add_signer).no_display())
+        .subcommand("add", from_fn_async(cli_add_signer))
 }
 
 impl Model<BTreeMap<Guid, SignerInfo>> {
@@ -71,7 +71,7 @@ impl Model<BTreeMap<Guid, SignerInfo>> {
             .ok_or_else(|| Error::new(eyre!("unknown signer"), ErrorKind::Authorization))
     }
 
-    pub fn add_signer(&mut self, signer: &SignerInfo) -> Result<(), Error> {
+    pub fn add_signer(&mut self, signer: &SignerInfo) -> Result<Guid, Error> {
         if let Some((guid, s)) = self
             .as_entries()?
             .into_iter()
@@ -89,7 +89,9 @@ impl Model<BTreeMap<Guid, SignerInfo>> {
                 ErrorKind::InvalidRequest,
             ));
         }
-        self.insert(&Guid::new(), signer)
+        let id = Guid::new();
+        self.insert(&id, signer)?;
+        Ok(id)
     }
 }
 
@@ -122,7 +124,7 @@ pub fn display_signers<T>(params: WithIoFormat<T>, signers: BTreeMap<Guid, Signe
     table.print_tty(false).unwrap();
 }
 
-pub async fn add_signer(ctx: RegistryContext, signer: SignerInfo) -> Result<(), Error> {
+pub async fn add_signer(ctx: RegistryContext, signer: SignerInfo) -> Result<Guid, Error> {
     ctx.db
         .mutate(|db| db.as_index_mut().as_signers_mut().add_signer(&signer))
         .await
@@ -155,7 +157,7 @@ pub async fn cli_add_signer(
             },
         ..
     }: HandlerArgs<CliContext, CliAddSignerParams>,
-) -> Result<(), Error> {
+) -> Result<Guid, Error> {
     let signer = SignerInfo {
         name,
         contact,
@@ -165,15 +167,16 @@ pub async fn cli_add_signer(
         TypedPatchDb::<RegistryDatabase>::load(PatchDb::open(database).await?)
             .await?
             .mutate(|db| db.as_index_mut().as_signers_mut().add_signer(&signer))
-            .await?;
+            .await
     } else {
-        ctx.call_remote::<RegistryContext>(
-            &parent_method.into_iter().chain(method).join("."),
-            to_value(&signer)?,
+        from_value(
+            ctx.call_remote::<RegistryContext>(
+                &parent_method.into_iter().chain(method).join("."),
+                to_value(&signer)?,
+            )
+            .await?,
         )
-        .await?;
     }
-    Ok(())
 }
 
 #[derive(Debug, Deserialize, Serialize, TS)]
diff --git a/core/startos/src/registry/asset.rs b/core/startos/src/registry/asset.rs
index ab251d2aa..7697a0c99 100644
--- a/core/startos/src/registry/asset.rs
+++ b/core/startos/src/registry/asset.rs
@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
+use chrono::{DateTime, Utc};
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWrite;
@@ -20,6 +21,8 @@ use crate::s9pk::S9pk;
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct RegistryAsset<Commitment> {
+    #[ts(type = "string")]
+    pub published_at: DateTime<Utc>,
     #[ts(type = "string")]
     pub url: Url,
     pub commitment: Commitment,
diff --git a/core/startos/src/registry/auth.rs b/core/startos/src/registry/auth.rs
index 27655c4a8..4707bf809 100644
--- a/core/startos/src/registry/auth.rs
+++ b/core/startos/src/registry/auth.rs
@@ -27,7 +27,6 @@ use crate::util::serde::Base64;
 pub const AUTH_SIG_HEADER: &str = "X-StartOS-Registry-Auth-Sig";
 
 #[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
 pub struct Metadata {
     #[serde(default)]
     admin: bool,
@@ -75,9 +74,7 @@ pub struct RegistryAdminLogRecord {
     pub key: AnyVerifyingKey,
 }
 
-#[derive(Serialize, Deserialize)]
 pub struct SignatureHeader {
-    #[serde(flatten)]
     pub commitment: RequestCommitment,
     pub signer: AnyVerifyingKey,
     pub signature: AnySignature,
@@ -93,14 +90,9 @@ impl SignatureHeader {
         HeaderValue::from_str(url.query().unwrap_or_default()).unwrap()
     }
     pub fn from_header(header: &HeaderValue) -> Result<Self, Error> {
-        let url: Url = format!(
-            "http://localhost/?{}",
-            header.to_str().with_kind(ErrorKind::Utf8)?
-        )
-        .parse()?;
-        let query: BTreeMap<_, _> = url.query_pairs().collect();
+        let query: BTreeMap<_, _> = form_urlencoded::parse(header.as_bytes()).collect();
         Ok(Self {
-            commitment: RequestCommitment::from_query(&url)?,
+            commitment: RequestCommitment::from_query(&header)?,
             signer: query.get("signer").or_not_found("signer")?.parse()?,
             signature: query.get("signature").or_not_found("signature")?.parse()?,
         })
diff --git a/core/startos/src/registry/context.rs b/core/startos/src/registry/context.rs
index 64a157073..d3eaf3691 100644
--- a/core/startos/src/registry/context.rs
+++ b/core/startos/src/registry/context.rs
@@ -200,6 +200,19 @@ impl CallRemote<RegistryContext> for CliContext {
             .send()
             .await?;
 
+        if !res.status().is_success() {
+            let status = res.status();
+            let txt = res.text().await?;
+            let mut res = Err(Error::new(
+                eyre!("{}", status.canonical_reason().unwrap_or(status.as_str())),
+                ErrorKind::Network,
+            ));
+            if !txt.is_empty() {
+                res = res.with_ctx(|_| (ErrorKind::Network, txt));
+            }
+            return res.map_err(From::from);
+        }
+
         match res
             .headers()
             .get(CONTENT_TYPE)
@@ -210,7 +223,7 @@ impl CallRemote<RegistryContext> for CliContext {
                     .with_kind(ErrorKind::Deserialization)?
                     .result
             }
-            _ => Err(Error::new(eyre!("missing content type"), ErrorKind::Network).into()),
+            _ => Err(Error::new(eyre!("unknown content type"), ErrorKind::Network).into()),
         }
     }
 }
@@ -247,6 +260,19 @@ impl CallRemote<RegistryContext, RegistryUrlParams> for RpcContext {
             .send()
             .await?;
 
+        if !res.status().is_success() {
+            let status = res.status();
+            let txt = res.text().await?;
+            let mut res = Err(Error::new(
+                eyre!("{}", status.canonical_reason().unwrap_or(status.as_str())),
+                ErrorKind::Network,
+            ));
+            if !txt.is_empty() {
+                res = res.with_ctx(|_| (ErrorKind::Network, txt));
+            }
+            return res.map_err(From::from);
+        }
+
         match res
             .headers()
             .get(CONTENT_TYPE)
@@ -257,7 +283,7 @@ impl CallRemote<RegistryContext, RegistryUrlParams> for RpcContext {
                     .with_kind(ErrorKind::Deserialization)?
                     .result
             }
-            _ => Err(Error::new(eyre!("missing content type"), ErrorKind::Network).into()),
+            _ => Err(Error::new(eyre!("unknown content type"), ErrorKind::Network).into()),
         }
     }
 }
diff --git a/core/startos/src/registry/device_info.rs b/core/startos/src/registry/device_info.rs
index 9a357358a..172348a10 100644
--- a/core/startos/src/registry/device_info.rs
+++ b/core/startos/src/registry/device_info.rs
@@ -54,12 +54,7 @@ impl DeviceInfo {
         HeaderValue::from_str(url.query().unwrap_or_default()).unwrap()
     }
     pub fn from_header_value(header: &HeaderValue) -> Result<Self, Error> {
-        let url: Url = format!(
-            "http://localhost/?{}",
-            header.to_str().with_kind(ErrorKind::ParseUrl)?
-        )
-        .parse()?;
-        let query: BTreeMap<_, _> = url.query_pairs().collect();
+        let query: BTreeMap<_, _> = form_urlencoded::parse(header.as_bytes()).collect();
         Ok(Self {
             os: OsInfo {
                 version: query
@@ -151,7 +146,6 @@ impl From<&RpcContext> for HardwareInfo {
 }
 
 #[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
 pub struct Metadata {
     #[serde(default)]
     get_device_info: bool,
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index 1039264df..d34ebb841 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -2,6 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use axum::Router;
 use futures::future::ready;
+use imbl_value::InternedString;
 use models::DataUrl;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler, Server};
 use serde::{Deserialize, Serialize};
@@ -16,7 +17,7 @@ use crate::registry::auth::Auth;
 use crate::registry::context::RegistryContext;
 use crate::registry::device_info::DeviceInfoMiddleware;
 use crate::registry::os::index::OsIndex;
-use crate::registry::package::index::PackageIndex;
+use crate::registry::package::index::{Category, PackageIndex};
 use crate::registry::signer::SignerInfo;
 use crate::rpc_continuations::Guid;
 use crate::util::serde::HandlerExtSerde;
@@ -45,6 +46,7 @@ impl RegistryDatabase {}
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct FullIndex {
+    pub name: Option<String>,
     pub icon: Option<DataUrl<'static>>,
     pub package: PackageIndex,
     pub os: OsIndex,
@@ -55,6 +57,25 @@ pub async fn get_full_index(ctx: RegistryContext) -> Result<FullIndex, Error> {
     ctx.db.peek().await.into_index().de()
 }
 
+#[derive(Debug, Default, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct RegistryInfo {
+    pub name: Option<String>,
+    pub icon: Option<DataUrl<'static>>,
+    #[ts(as = "BTreeMap::<String, Category>")]
+    pub categories: BTreeMap<InternedString, Category>,
+}
+
+pub async fn get_info(ctx: RegistryContext) -> Result<RegistryInfo, Error> {
+    let peek = ctx.db.peek().await.into_index();
+    Ok(RegistryInfo {
+        name: peek.as_name().de()?,
+        icon: peek.as_icon().de()?,
+        categories: peek.as_package().as_categories().de()?,
+    })
+}
+
 pub fn registry_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
@@ -63,6 +84,12 @@ pub fn registry_api<C: Context>() -> ParentHandler<C> {
                 .with_display_serializable()
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "info",
+            from_fn_async(get_info)
+                .with_display_serializable()
+                .with_call_remote::<CliContext>(),
+        )
         .subcommand("os", os::os_api::<C>())
         .subcommand("package", package::package_api::<C>())
         .subcommand("admin", admin::admin_api::<C>())
diff --git a/core/startos/src/registry/os/asset/add.rs b/core/startos/src/registry/os/asset/add.rs
index 6108dd5bc..c18d05b8f 100644
--- a/core/startos/src/registry/os/asset/add.rs
+++ b/core/startos/src/registry/os/asset/add.rs
@@ -2,6 +2,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::panic::UnwindSafe;
 use std::path::PathBuf;
 
+use chrono::Utc;
 use clap::Parser;
 use imbl_value::InternedString;
 use itertools::Itertools;
@@ -12,7 +13,7 @@ use url::Url;
 
 use crate::context::CliContext;
 use crate::prelude::*;
-use crate::progress::{FullProgressTracker};
+use crate::progress::FullProgressTracker;
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
@@ -33,19 +34,19 @@ pub fn add_api<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "iso",
             from_fn_async(add_iso)
-                .with_metadata("getSigner", Value::Bool(true))
+                .with_metadata("get_signer", Value::Bool(true))
                 .no_cli(),
         )
         .subcommand(
             "img",
             from_fn_async(add_img)
-                .with_metadata("getSigner", Value::Bool(true))
+                .with_metadata("get_signer", Value::Bool(true))
                 .no_cli(),
         )
         .subcommand(
             "squashfs",
             from_fn_async(add_squashfs)
-                .with_metadata("getSigner", Value::Bool(true))
+                .with_metadata("get_signer", Value::Bool(true))
                 .no_cli(),
         )
 }
@@ -107,6 +108,7 @@ async fn add_asset(
                 )
                 .upsert(&platform, || {
                     Ok(RegistryAsset {
+                        published_at: Utc::now(),
                         url,
                         commitment: commitment.clone(),
                         signatures: HashMap::new(),
diff --git a/core/startos/src/registry/os/asset/sign.rs b/core/startos/src/registry/os/asset/sign.rs
index 8bf1cfeb5..12903d8a1 100644
--- a/core/startos/src/registry/os/asset/sign.rs
+++ b/core/startos/src/registry/os/asset/sign.rs
@@ -30,19 +30,19 @@ pub fn sign_api<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "iso",
             from_fn_async(sign_iso)
-                .with_metadata("getSigner", Value::Bool(true))
+                .with_metadata("get_signer", Value::Bool(true))
                 .no_cli(),
         )
         .subcommand(
             "img",
             from_fn_async(sign_img)
-                .with_metadata("getSigner", Value::Bool(true))
+                .with_metadata("get_signer", Value::Bool(true))
                 .no_cli(),
         )
         .subcommand(
             "squashfs",
             from_fn_async(sign_squashfs)
-                .with_metadata("getSigner", Value::Bool(true))
+                .with_metadata("get_signer", Value::Bool(true))
                 .no_cli(),
         )
 }
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index 9ebe8a696..242ae28a7 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -25,7 +25,7 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(add_version)
                 .with_metadata("admin", Value::Bool(true))
-                .with_metadata("getSigner", Value::Bool(true))
+                .with_metadata("get_signer", Value::Bool(true))
                 .no_display()
                 .with_call_remote::<CliContext>(),
         )
@@ -121,7 +121,7 @@ pub async fn remove_version(
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
-pub struct GetVersionParams {
+pub struct GetOsVersionParams {
     #[ts(type = "string | null")]
     #[arg(long = "src")]
     pub source: Option<VersionString>,
@@ -138,12 +138,12 @@ pub struct GetVersionParams {
 
 pub async fn get_version(
     ctx: RegistryContext,
-    GetVersionParams {
+    GetOsVersionParams {
         source,
         target,
         server_id,
         arch,
-    }: GetVersionParams,
+    }: GetOsVersionParams,
 ) -> Result<BTreeMap<VersionString, OsVersionInfo>, Error> {
     if let (Some(pool), Some(server_id), Some(arch)) = (&ctx.pool, server_id, arch) {
         let created_at = Utc::now();
diff --git a/core/startos/src/registry/package/add.rs b/core/startos/src/registry/package/add.rs
index 9bc772f78..c52f06ac0 100644
--- a/core/startos/src/registry/package/add.rs
+++ b/core/startos/src/registry/package/add.rs
@@ -11,13 +11,14 @@ use url::Url;
 
 use crate::context::CliContext;
 use crate::prelude::*;
-use crate::progress::FullProgressTracker;
+use crate::progress::{FullProgressTracker, ProgressTrackerWriter};
 use crate::registry::context::RegistryContext;
 use crate::registry::package::index::PackageVersionInfo;
 use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
 use crate::registry::signer::sign::ed25519::Ed25519;
 use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
 use crate::s9pk::merkle_archive::source::http::HttpSource;
+use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::s9pk::v2::SIG_CONTEXT;
 use crate::s9pk::S9pk;
 use crate::util::io::TrackingIO;
@@ -126,13 +127,16 @@ pub async fn cli_add_package(
     sign_phase.complete();
 
     verify_phase.start();
-    let mut src = S9pk::deserialize(
-        &Arc::new(HttpSource::new(ctx.client.clone(), url.clone()).await?),
-        Some(&commitment),
-    )
-    .await?;
-    src.serialize(&mut TrackingIO::new(0, tokio::io::sink()), true)
+    let source = HttpSource::new(ctx.client.clone(), url.clone()).await?;
+    let len = source.size().await;
+    let mut src = S9pk::deserialize(&Arc::new(source), Some(&commitment)).await?;
+    if let Some(len) = len {
+        verify_phase.set_total(len);
+    }
+    let mut verify_writer = ProgressTrackerWriter::new(tokio::io::sink(), verify_phase);
+    src.serialize(&mut TrackingIO::new(0, &mut verify_writer), true)
         .await?;
+    let (_, mut verify_phase) = verify_writer.into_inner();
     verify_phase.complete();
 
     index_phase.start();
@@ -140,7 +144,7 @@ pub async fn cli_add_package(
         &parent_method.into_iter().chain(method).join("."),
         imbl_value::json!({
             "url": &url,
-            "signature": signature,
+            "signature": AnySignature::Ed25519(signature),
             "commitment": commitment,
         }),
     )
diff --git a/core/startos/src/registry/package/get.rs b/core/startos/src/registry/package/get.rs
index fb63be1bc..cae1289a9 100644
--- a/core/startos/src/registry/package/get.rs
+++ b/core/startos/src/registry/package/get.rs
@@ -21,6 +21,7 @@ use crate::util::VersionString;
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub enum PackageDetailLevel {
+    None,
     Short,
     Full,
 }
@@ -50,7 +51,9 @@ pub struct GetPackageParams {
     #[arg(skip)]
     #[serde(rename = "__device_info")]
     pub device_info: Option<DeviceInfo>,
-    pub other_versions: Option<PackageDetailLevel>,
+    #[serde(default)]
+    #[arg(default_value = "none")]
+    pub other_versions: PackageDetailLevel,
 }
 
 #[derive(Debug, Deserialize, Serialize, TS)]
@@ -126,7 +129,6 @@ fn get_matching_models<'a>(
     db: &'a Model<PackageIndex>,
     GetPackageParams {
         id,
-        version,
         source_version,
         device_info,
         ..
@@ -148,22 +150,18 @@ fn get_matching_models<'a>(
             .into_iter()
             .map(|(v, info)| {
                 Ok::<_, Error>(
-                    if version
+                    if source_version.as_ref().map_or(Ok(true), |source_version| {
+                        Ok::<_, Error>(
+                            source_version.satisfies(
+                                &info
+                                    .as_source_version()
+                                    .de()?
+                                    .unwrap_or(VersionRange::any()),
+                            ),
+                        )
+                    })? && device_info
                         .as_ref()
-                        .map_or(true, |version| v.satisfies(version))
-                        && source_version.as_ref().map_or(Ok(true), |source_version| {
-                            Ok::<_, Error>(
-                                source_version.satisfies(
-                                    &info
-                                        .as_source_version()
-                                        .de()?
-                                        .unwrap_or(VersionRange::any()),
-                                ),
-                            )
-                        })?
-                        && device_info
-                            .as_ref()
-                            .map_or(Ok(true), |device_info| info.works_for_device(device_info))?
+                        .map_or(Ok(true), |device_info| info.works_for_device(device_info))?
                     {
                         Some((k.clone(), ExtendedVersion::from(v), info))
                     } else {
@@ -187,24 +185,27 @@ pub async fn get_package(ctx: RegistryContext, params: GetPackageParams) -> Resu
     let mut other: BTreeMap<PackageId, BTreeMap<VersionString, &Model<PackageVersionInfo>>> =
         Default::default();
     for (id, version, info) in get_matching_models(&peek.as_index().as_package(), &params)? {
-        let mut package_best = best.remove(&id).unwrap_or_default();
-        let mut package_other = other.remove(&id).unwrap_or_default();
-        for worse_version in package_best
-            .keys()
-            .filter(|k| ***k < version)
-            .cloned()
-            .collect_vec()
+        let package_best = best.entry(id.clone()).or_default();
+        let package_other = other.entry(id.clone()).or_default();
+        if params
+            .version
+            .as_ref()
+            .map_or(true, |v| version.satisfies(v))
+            && package_best.keys().all(|k| !(**k > version))
         {
-            if let Some(info) = package_best.remove(&worse_version) {
-                package_other.insert(worse_version, info);
+            for worse_version in package_best
+                .keys()
+                .filter(|k| ***k < version)
+                .cloned()
+                .collect_vec()
+            {
+                if let Some(info) = package_best.remove(&worse_version) {
+                    package_other.insert(worse_version, info);
+                }
             }
-        }
-        if package_best.keys().all(|k| !(**k > version)) {
             package_best.insert(version.into(), info);
-        }
-        best.insert(id.clone(), package_best);
-        if params.other_versions.is_some() {
-            other.insert(id.clone(), package_other);
+        } else {
+            package_other.insert(version.into(), info);
         }
     }
     if let Some(id) = params.id {
@@ -224,12 +225,12 @@ pub async fn get_package(ctx: RegistryContext, params: GetPackageParams) -> Resu
             .try_collect()?;
         let other = other.remove(&id).unwrap_or_default();
         match params.other_versions {
-            None => to_value(&GetPackageResponse {
+            PackageDetailLevel::None => to_value(&GetPackageResponse {
                 categories,
                 best,
                 other_versions: None,
             }),
-            Some(PackageDetailLevel::Short) => to_value(&GetPackageResponse {
+            PackageDetailLevel::Short => to_value(&GetPackageResponse {
                 categories,
                 best,
                 other_versions: Some(
@@ -239,7 +240,7 @@ pub async fn get_package(ctx: RegistryContext, params: GetPackageParams) -> Resu
                         .try_collect()?,
                 ),
             }),
-            Some(PackageDetailLevel::Full) => to_value(&GetPackageResponseFull {
+            PackageDetailLevel::Full => to_value(&GetPackageResponseFull {
                 categories,
                 best,
                 other_versions: other
@@ -250,7 +251,7 @@ pub async fn get_package(ctx: RegistryContext, params: GetPackageParams) -> Resu
         }
     } else {
         match params.other_versions {
-            None => to_value(
+            PackageDetailLevel::None => to_value(
                 &best
                     .into_iter()
                     .map(|(id, best)| {
@@ -276,7 +277,7 @@ pub async fn get_package(ctx: RegistryContext, params: GetPackageParams) -> Resu
                     })
                     .try_collect::<_, GetPackagesResponse, _>()?,
             ),
-            Some(PackageDetailLevel::Short) => to_value(
+            PackageDetailLevel::Short => to_value(
                 &best
                     .into_iter()
                     .map(|(id, best)| {
@@ -310,7 +311,7 @@ pub async fn get_package(ctx: RegistryContext, params: GetPackageParams) -> Resu
                     })
                     .try_collect::<_, GetPackagesResponse, _>()?,
             ),
-            Some(PackageDetailLevel::Full) => to_value(
+            PackageDetailLevel::Full => to_value(
                 &best
                     .into_iter()
                     .map(|(id, best)| {
@@ -354,7 +355,7 @@ pub fn display_package_info(
     }
 
     if let Some(_) = params.rest.id {
-        if params.rest.other_versions == Some(PackageDetailLevel::Full) {
+        if params.rest.other_versions == PackageDetailLevel::Full {
             for table in from_value::<GetPackageResponseFull>(info)?.tables() {
                 table.print_tty(false)?;
                 println!();
@@ -366,7 +367,7 @@ pub fn display_package_info(
             }
         }
     } else {
-        if params.rest.other_versions == Some(PackageDetailLevel::Full) {
+        if params.rest.other_versions == PackageDetailLevel::Full {
             for (_, package) in from_value::<GetPackagesResponseFull>(info)? {
                 for table in package.tables() {
                     table.print_tty(false)?;
diff --git a/core/startos/src/registry/package/index.rs b/core/startos/src/registry/package/index.rs
index 80055f06d..12a17f634 100644
--- a/core/startos/src/registry/package/index.rs
+++ b/core/startos/src/registry/package/index.rs
@@ -1,5 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet};
 
+use chrono::Utc;
 use exver::{Version, VersionRange};
 use imbl_value::InternedString;
 use models::{DataUrl, PackageId, VersionString};
@@ -15,7 +16,7 @@ use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment
 use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey};
 use crate::rpc_continuations::Guid;
 use crate::s9pk::git_hash::GitHash;
-use crate::s9pk::manifest::{Description, HardwareRequirements};
+use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
 
@@ -49,12 +50,25 @@ pub struct Category {
     pub description: Description,
 }
 
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct DependencyMetadata {
+    #[ts(type = "string | null")]
+    pub title: Option<InternedString>,
+    pub icon: Option<DataUrl<'static>>,
+    pub description: Option<String>,
+    pub optional: bool,
+}
+
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct PackageVersionInfo {
-    pub title: String,
+    #[ts(type = "string")]
+    pub title: InternedString,
     pub icon: DataUrl<'static>,
     pub description: Description,
     pub release_notes: String,
@@ -70,6 +84,10 @@ pub struct PackageVersionInfo {
     pub support_site: Url,
     #[ts(type = "string")]
     pub marketing_site: Url,
+    #[ts(type = "string | null")]
+    pub donation_url: Option<Url>,
+    pub alerts: Alerts,
+    pub dependency_metadata: BTreeMap<PackageId, DependencyMetadata>,
     #[ts(type = "string")]
     pub os_version: Version,
     pub hardware_requirements: HardwareRequirements,
@@ -80,6 +98,19 @@ pub struct PackageVersionInfo {
 impl PackageVersionInfo {
     pub async fn from_s9pk<S: FileSource + Clone>(s9pk: &S9pk<S>, url: Url) -> Result<Self, Error> {
         let manifest = s9pk.as_manifest();
+        let mut dependency_metadata = BTreeMap::new();
+        for (id, info) in &manifest.dependencies.0 {
+            let metadata = s9pk.dependency_metadata(id).await?;
+            dependency_metadata.insert(
+                id.clone(),
+                DependencyMetadata {
+                    title: metadata.map(|m| m.title),
+                    icon: s9pk.dependency_icon_data_url(id).await?,
+                    description: info.description.clone(),
+                    optional: info.optional,
+                },
+            );
+        }
         Ok(Self {
             title: manifest.title.clone(),
             icon: s9pk.icon_data_url().await?,
@@ -91,10 +122,14 @@ impl PackageVersionInfo {
             upstream_repo: manifest.upstream_repo.clone(),
             support_site: manifest.support_site.clone(),
             marketing_site: manifest.marketing_site.clone(),
+            donation_url: manifest.donation_url.clone(),
+            alerts: manifest.alerts.clone(),
+            dependency_metadata,
             os_version: manifest.os_version.clone(),
             hardware_requirements: manifest.hardware_requirements.clone(),
             source_version: None, // TODO
             s9pk: RegistryAsset {
+                published_at: Utc::now(),
                 url,
                 commitment: s9pk.as_archive().commitment().await?,
                 signatures: [(
@@ -114,8 +149,11 @@ impl PackageVersionInfo {
         table.add_row(row![bc => &self.title]);
         table.add_row(row![br -> "VERSION", AsRef::<str>::as_ref(version)]);
         table.add_row(row![br -> "RELEASE NOTES", &self.release_notes]);
-        table.add_row(row![br -> "ABOUT", &self.description.short]);
-        table.add_row(row![br -> "DESCRIPTION", &self.description.long]);
+        table.add_row(row![br -> "ABOUT", &textwrap::wrap(&self.description.short, 80).join("\n")]);
+        table.add_row(row![
+            br -> "DESCRIPTION",
+            &textwrap::wrap(&self.description.long, 80).join("\n")
+        ]);
         table.add_row(row![br -> "GIT HASH", AsRef::<str>::as_ref(&self.git_hash)]);
         table.add_row(row![br -> "LICENSE", &self.license]);
         table.add_row(row![br -> "PACKAGE REPO", &self.wrapper_repo.to_string()]);
diff --git a/core/startos/src/registry/package/mod.rs b/core/startos/src/registry/package/mod.rs
index ac09afbb1..cb2d317f9 100644
--- a/core/startos/src/registry/package/mod.rs
+++ b/core/startos/src/registry/package/mod.rs
@@ -16,14 +16,21 @@ pub fn package_api<C: Context>() -> ParentHandler<C> {
                 .with_display_serializable()
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("add", from_fn_async(add::add_package).no_cli())
+        .subcommand(
+            "add",
+            from_fn_async(add::add_package)
+                .with_metadata("get_signer", Value::Bool(true))
+                .no_cli(),
+        )
         .subcommand("add", from_fn_async(add::cli_add_package).no_display())
         .subcommand(
             "get",
             from_fn_async(get::get_package)
+                .with_metadata("get_device_info", Value::Bool(true))
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| {
                     get::display_package_info(handle.params, result)
-                }),
+                })
+                .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/registry/signer/commitment/merkle_archive.rs b/core/startos/src/registry/signer/commitment/merkle_archive.rs
index 0b61734b4..1b9d7d1e0 100644
--- a/core/startos/src/registry/signer/commitment/merkle_archive.rs
+++ b/core/startos/src/registry/signer/commitment/merkle_archive.rs
@@ -20,6 +20,35 @@ pub struct MerkleArchiveCommitment {
     #[ts(type = "number")]
     pub root_maxsize: u64,
 }
+impl MerkleArchiveCommitment {
+    pub fn from_query(query: &str) -> Result<Option<Self>, Error> {
+        let mut root_sighash = None;
+        let mut root_maxsize = None;
+        for (k, v) in form_urlencoded::parse(dbg!(query).as_bytes()) {
+            match &*k {
+                "rootSighash" => {
+                    root_sighash = Some(dbg!(v).parse()?);
+                }
+                "rootMaxsize" => {
+                    root_maxsize = Some(v.parse()?);
+                }
+                _ => (),
+            }
+        }
+        if root_sighash.is_some() || root_maxsize.is_some() {
+            Ok(Some(Self {
+                root_sighash: root_sighash
+                    .or_not_found("rootSighash required if rootMaxsize specified")
+                    .with_kind(ErrorKind::InvalidRequest)?,
+                root_maxsize: root_maxsize
+                    .or_not_found("rootMaxsize required if rootSighash specified")
+                    .with_kind(ErrorKind::InvalidRequest)?,
+            }))
+        } else {
+            Ok(None)
+        }
+    }
+}
 impl Digestable for MerkleArchiveCommitment {
     fn update<D: Update>(&self, digest: &mut D) {
         digest.update(&*self.root_sighash);
diff --git a/core/startos/src/registry/signer/commitment/request.rs b/core/startos/src/registry/signer/commitment/request.rs
index ce60b7f88..e5bb776bf 100644
--- a/core/startos/src/registry/signer/commitment/request.rs
+++ b/core/startos/src/registry/signer/commitment/request.rs
@@ -5,6 +5,7 @@ use axum::body::Body;
 use axum::extract::Request;
 use digest::Update;
 use futures::TryStreamExt;
+use http::HeaderValue;
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWrite;
 use tokio_util::io::StreamReader;
@@ -37,8 +38,8 @@ impl RequestCommitment {
             .append_pair("size", &self.size.to_string())
             .append_pair("blake3", &self.blake3.to_string());
     }
-    pub fn from_query(url: &Url) -> Result<Self, Error> {
-        let query: BTreeMap<_, _> = url.query_pairs().collect();
+    pub fn from_query(query: &HeaderValue) -> Result<Self, Error> {
+        let query: BTreeMap<_, _> = form_urlencoded::parse(query.as_bytes()).collect();
         Ok(Self {
             timestamp: query.get("timestamp").or_not_found("timestamp")?.parse()?,
             nonce: query.get("nonce").or_not_found("nonce")?.parse()?,
diff --git a/core/startos/src/s9pk/merkle_archive/expected.rs b/core/startos/src/s9pk/merkle_archive/expected.rs
index a0f095b7a..c9a2fd31b 100644
--- a/core/startos/src/s9pk/merkle_archive/expected.rs
+++ b/core/startos/src/s9pk/merkle_archive/expected.rs
@@ -1,4 +1,3 @@
-
 use std::ffi::OsStr;
 use std::path::Path;
 
@@ -7,16 +6,16 @@ use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::merkle_archive::Entry;
 
-/// An object for tracking the files expected to be in an s9pk 
+/// An object for tracking the files expected to be in an s9pk
 pub struct Expected<'a, T> {
     keep: DirectoryContents<()>,
     dir: &'a DirectoryContents<T>,
 }
 impl<'a, T> Expected<'a, T> {
-    pub fn new(dir: &'a DirectoryContents<T>,) -> Self {
+    pub fn new(dir: &'a DirectoryContents<T>) -> Self {
         Self {
             keep: DirectoryContents::new(),
-            dir
+            dir,
         }
     }
 }
@@ -42,22 +41,23 @@ impl<'a, T: Clone> Expected<'a, T> {
         path: impl AsRef<Path>,
         mut valid_extension: impl FnMut(Option<&OsStr>) -> bool,
     ) -> Result<(), Error> {
-        let (dir, stem) = if let Some(parent) = path.as_ref().parent().filter(|p| *p != Path::new("")) {
-            (
-                self.dir
-                    .get_path(parent)
-                    .and_then(|e| e.as_directory())
-                    .ok_or_else(|| {
-                        Error::new(
-                            eyre!("directory {} missing from archive", parent.display()),
-                            ErrorKind::ParseS9pk,
-                        )
-                    })?,
-                path.as_ref().strip_prefix(parent).unwrap(),
-            )
-        } else {
-            (self.dir, path.as_ref())
-        };
+        let (dir, stem) =
+            if let Some(parent) = path.as_ref().parent().filter(|p| *p != Path::new("")) {
+                (
+                    self.dir
+                        .get_path(parent)
+                        .and_then(|e| e.as_directory())
+                        .ok_or_else(|| {
+                            Error::new(
+                                eyre!("directory {} missing from archive", parent.display()),
+                                ErrorKind::ParseS9pk,
+                            )
+                        })?,
+                    path.as_ref().strip_prefix(parent).unwrap(),
+                )
+            } else {
+                (self.dir, path.as_ref())
+            };
         let name = dir
             .with_stem(&stem.as_os_str().to_string_lossy())
             .filter(|(_, e)| e.as_file().is_some())
@@ -69,7 +69,7 @@ impl<'a, T: Clone> Expected<'a, T> {
                     ),
                     ErrorKind::ParseS9pk,
                 )),
-                |acc, (name, _)| 
+                |acc, (name, _)|
                     if valid_extension(Path::new(&*name).extension()) {
                         match acc {
                             Ok(_) => Err(Error::new(
@@ -96,8 +96,10 @@ impl<'a, T: Clone> Expected<'a, T> {
 
 pub struct Filter(DirectoryContents<()>);
 impl Filter {
-    pub fn keep_checked<T: FileSource + Clone>(&self, dir: &mut DirectoryContents<T>) -> Result<(), Error> {
+    pub fn keep_checked<T: FileSource + Clone>(
+        &self,
+        dir: &mut DirectoryContents<T>,
+    ) -> Result<(), Error> {
         dir.filter(|path| self.0.get_path(path).is_some())
     }
 }
-
diff --git a/core/startos/src/s9pk/merkle_archive/mod.rs b/core/startos/src/s9pk/merkle_archive/mod.rs
index 977e5ebb2..3f30a4ce1 100644
--- a/core/startos/src/s9pk/merkle_archive/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/mod.rs
@@ -233,6 +233,10 @@ impl<S> Entry<S> {
             _ => None,
         }
     }
+    pub fn expect_file(&self) -> Result<&FileContents<S>, Error> {
+        self.as_file()
+            .ok_or_else(|| Error::new(eyre!("not a file"), ErrorKind::ParseS9pk))
+    }
     pub fn as_directory(&self) -> Option<&DirectoryContents<S>> {
         match self.as_contents() {
             EntryContents::Directory(d) => Some(d),
diff --git a/core/startos/src/s9pk/merkle_archive/source/mod.rs b/core/startos/src/s9pk/merkle_archive/source/mod.rs
index 6b7459787..cc9623ab6 100644
--- a/core/startos/src/s9pk/merkle_archive/source/mod.rs
+++ b/core/startos/src/s9pk/merkle_archive/source/mod.rs
@@ -1,3 +1,5 @@
+use std::cmp::min;
+use std::io::SeekFrom;
 use std::ops::Deref;
 use std::path::PathBuf;
 use std::sync::Arc;
@@ -6,7 +8,7 @@ use blake3::Hash;
 use futures::future::BoxFuture;
 use futures::{Future, FutureExt};
 use tokio::fs::File;
-use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeekExt, AsyncWrite, Take};
 
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::hash::VerifyingWriter;
@@ -17,8 +19,14 @@ pub mod multi_cursor_file;
 
 pub trait FileSource: Send + Sync + Sized + 'static {
     type Reader: AsyncRead + Unpin + Send;
+    type SliceReader: AsyncRead + Unpin + Send;
     fn size(&self) -> impl Future<Output = Result<u64, Error>> + Send;
     fn reader(&self) -> impl Future<Output = Result<Self::Reader, Error>> + Send;
+    fn slice(
+        &self,
+        position: u64,
+        size: u64,
+    ) -> impl Future<Output = Result<Self::SliceReader, Error>> + Send;
     fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         w: &mut W,
@@ -65,12 +73,16 @@ pub trait FileSource: Send + Sync + Sized + 'static {
 
 impl<T: FileSource> FileSource for Arc<T> {
     type Reader = T::Reader;
+    type SliceReader = T::SliceReader;
     async fn size(&self) -> Result<u64, Error> {
         self.deref().size().await
     }
     async fn reader(&self) -> Result<Self::Reader, Error> {
         self.deref().reader().await
     }
+    async fn slice(&self, position: u64, size: u64) -> Result<Self::SliceReader, Error> {
+        self.deref().slice(position, size).await
+    }
     async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(&self, w: &mut W) -> Result<(), Error> {
         self.deref().copy(w).await
     }
@@ -95,12 +107,16 @@ impl DynFileSource {
 }
 impl FileSource for DynFileSource {
     type Reader = Box<dyn AsyncRead + Unpin + Send>;
+    type SliceReader = Box<dyn AsyncRead + Unpin + Send>;
     async fn size(&self) -> Result<u64, Error> {
         self.0.size().await
     }
     async fn reader(&self) -> Result<Self::Reader, Error> {
         self.0.reader().await
     }
+    async fn slice(&self, position: u64, size: u64) -> Result<Self::SliceReader, Error> {
+        self.0.slice(position, size).await
+    }
     async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         mut w: &mut W,
@@ -123,6 +139,11 @@ impl FileSource for DynFileSource {
 trait DynableFileSource: Send + Sync + 'static {
     async fn size(&self) -> Result<u64, Error>;
     async fn reader(&self) -> Result<Box<dyn AsyncRead + Unpin + Send>, Error>;
+    async fn slice(
+        &self,
+        position: u64,
+        size: u64,
+    ) -> Result<Box<dyn AsyncRead + Unpin + Send>, Error>;
     async fn copy(&self, w: &mut (dyn AsyncWrite + Unpin + Send)) -> Result<(), Error>;
     async fn copy_verify(
         &self,
@@ -139,6 +160,13 @@ impl<T: FileSource> DynableFileSource for T {
     async fn reader(&self) -> Result<Box<dyn AsyncRead + Unpin + Send>, Error> {
         Ok(Box::new(FileSource::reader(self).await?))
     }
+    async fn slice(
+        &self,
+        position: u64,
+        size: u64,
+    ) -> Result<Box<dyn AsyncRead + Unpin + Send>, Error> {
+        Ok(Box::new(FileSource::slice(self, position, size).await?))
+    }
     async fn copy(&self, w: &mut (dyn AsyncWrite + Unpin + Send)) -> Result<(), Error> {
         FileSource::copy(self, w).await
     }
@@ -156,22 +184,34 @@ impl<T: FileSource> DynableFileSource for T {
 
 impl FileSource for PathBuf {
     type Reader = File;
+    type SliceReader = Take<Self::Reader>;
     async fn size(&self) -> Result<u64, Error> {
         Ok(tokio::fs::metadata(self).await?.len())
     }
     async fn reader(&self) -> Result<Self::Reader, Error> {
         Ok(open_file(self).await?)
     }
+    async fn slice(&self, position: u64, size: u64) -> Result<Self::SliceReader, Error> {
+        let mut r = FileSource::reader(self).await?;
+        r.seek(SeekFrom::Start(position)).await?;
+        Ok(r.take(size))
+    }
 }
 
 impl FileSource for Arc<[u8]> {
     type Reader = std::io::Cursor<Self>;
+    type SliceReader = Take<Self::Reader>;
     async fn size(&self) -> Result<u64, Error> {
         Ok(self.len() as u64)
     }
     async fn reader(&self) -> Result<Self::Reader, Error> {
         Ok(std::io::Cursor::new(self.clone()))
     }
+    async fn slice(&self, position: u64, size: u64) -> Result<Self::SliceReader, Error> {
+        let mut r = FileSource::reader(self).await?;
+        r.seek(SeekFrom::Start(position)).await?;
+        Ok(r.take(size))
+    }
     async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(&self, w: &mut W) -> Result<(), Error> {
         use tokio::io::AsyncWriteExt;
 
@@ -272,12 +312,18 @@ pub struct Section<S> {
 }
 impl<S: ArchiveSource> FileSource for Section<S> {
     type Reader = S::FetchReader;
+    type SliceReader = S::FetchReader;
     async fn size(&self) -> Result<u64, Error> {
         Ok(self.size)
     }
     async fn reader(&self) -> Result<Self::Reader, Error> {
         self.source.fetch(self.position, self.size).await
     }
+    async fn slice(&self, position: u64, size: u64) -> Result<Self::SliceReader, Error> {
+        self.source
+            .fetch(self.position + position, min(size, self.size))
+            .await
+    }
     async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(&self, w: &mut W) -> Result<(), Error> {
         self.source.copy_to(self.position, self.size, w).await
     }
@@ -342,12 +388,16 @@ impl<S: FileSource> From<TmpSource<S>> for DynFileSource {
 
 impl<S: FileSource> FileSource for TmpSource<S> {
     type Reader = <S as FileSource>::Reader;
+    type SliceReader = <S as FileSource>::SliceReader;
     async fn size(&self) -> Result<u64, Error> {
         self.source.size().await
     }
     async fn reader(&self) -> Result<Self::Reader, Error> {
         self.source.reader().await
     }
+    async fn slice(&self, position: u64, size: u64) -> Result<Self::SliceReader, Error> {
+        self.source.slice(position, size).await
+    }
     async fn copy<W: AsyncWrite + Unpin + Send + ?Sized>(
         &self,
         mut w: &mut W,
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index 83b78dad7..92f952077 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -15,14 +15,36 @@ use crate::s9pk::v2::pack::ImageConfig;
 use crate::s9pk::v2::SIG_CONTEXT;
 use crate::util::io::{create_file, open_file, TmpDir};
 use crate::util::serde::{apply_expr, HandlerExtSerde};
+use crate::util::Apply;
 
 pub const SKIP_ENV: &[&str] = &["TERM", "container", "HOME", "HOSTNAME"];
 
 pub fn s9pk() -> ParentHandler<CliContext> {
     ParentHandler::new()
         .subcommand("pack", from_fn_async(super::v2::pack::pack).no_display())
+        .subcommand(
+            "list-ingredients",
+            from_fn_async(super::v2::pack::list_ingredients).with_custom_display_fn(
+                |_, ingredients| {
+                    ingredients
+                        .into_iter()
+                        .map(Some)
+                        .apply(|i| itertools::intersperse(i, None))
+                        .for_each(|i| {
+                            if let Some(p) = i {
+                                print!("{}", p.display())
+                            } else {
+                                print!(" ")
+                            }
+                        });
+                    println!();
+                    Ok(())
+                },
+            ),
+        )
         .subcommand("edit", edit())
         .subcommand("inspect", inspect())
+        .subcommand("convert", from_fn_async(convert).no_display())
 }
 
 #[derive(Deserialize, Serialize, Parser)]
@@ -193,3 +215,17 @@ async fn inspect_manifest(
     .await?;
     Ok(s9pk.as_manifest().clone())
 }
+
+async fn convert(ctx: CliContext, S9pkPath { s9pk: s9pk_path }: S9pkPath) -> Result<(), Error> {
+    let mut s9pk = super::load(
+        MultiCursorFile::from(open_file(&s9pk_path).await?),
+        || ctx.developer_key().cloned(),
+        None,
+    )
+    .await?;
+    let tmp_path = s9pk_path.with_extension("s9pk.tmp");
+    s9pk.serialize(&mut create_file(&tmp_path).await?, true)
+        .await?;
+    tokio::fs::rename(tmp_path, s9pk_path).await?;
+    Ok(())
+}
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 914d2e5aa..22250419a 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 use std::path::Path;
 use std::sync::Arc;
 
@@ -199,8 +199,9 @@ impl From<ManifestV1> for Manifest {
         let default_url = value.upstream_repo.clone();
         Self {
             id: value.id,
-            title: value.title,
+            title: value.title.into(),
             version: ExtendedVersion::from(value.version).into(),
+            satisfies: BTreeSet::new(),
             release_notes: value.release_notes,
             license: value.license.into(),
             wrapper_repo: value.wrapper_repo,
@@ -233,6 +234,7 @@ impl From<ManifestV1> for Manifest {
                             DepInfo {
                                 description: value.description,
                                 optional: !value.requirement.required(),
+                                s9pk: None,
                             },
                         )
                     })
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index 9607bb654..a10a65ddb 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -31,8 +31,10 @@ fn current_version() -> Version {
 #[ts(export)]
 pub struct Manifest {
     pub id: PackageId,
-    pub title: String,
+    #[ts(type = "string")]
+    pub title: InternedString,
     pub version: VersionString,
+    pub satisfies: BTreeSet<VersionString>,
     pub release_notes: String,
     #[ts(type = "string")]
     pub license: InternedString, // type of license
@@ -81,6 +83,15 @@ impl Manifest {
         expected.check_file("LICENSE.md")?;
         expected.check_file("instructions.md")?;
         expected.check_file("javascript.squashfs")?;
+        for (dependency, _) in &self.dependencies.0 {
+            let dep_path = Path::new("dependencies").join(dependency);
+            let _ = expected.check_file(dep_path.join("metadata.json"));
+            let _ = expected.check_stem(dep_path.join("icon"), |ext| {
+                ext.and_then(|e| e.to_str())
+                    .and_then(mime)
+                    .map_or(false, |mime| mime.starts_with("image/"))
+            });
+        }
         for assets in &self.assets {
             expected.check_file(Path::new("assets").join(assets).with_extension("squashfs"))?;
         }
@@ -148,7 +159,7 @@ impl Manifest {
 #[ts(export)]
 pub struct HardwareRequirements {
     #[serde(default)]
-    #[ts(type = "{ [key: string]: string }")] // TODO more specific key
+    #[ts(type = "{ device?: string, processor?: string }")]
     pub device: BTreeMap<String, Regex>,
     #[ts(type = "number | null")]
     pub ram: Option<u64>,
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index 2477e63a0..e012480af 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -6,10 +6,10 @@ use imbl_value::InternedString;
 use models::{mime, DataUrl, PackageId};
 use tokio::fs::File;
 
+use crate::dependencies::DependencyMetadata;
 use crate::prelude::*;
 use crate::registry::signer::commitment::merkle_archive::MerkleArchiveCommitment;
 use crate::s9pk::manifest::Manifest;
-use crate::s9pk::merkle_archive::file_contents::FileContents;
 use crate::s9pk::merkle_archive::sink::Sink;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::{
@@ -18,6 +18,7 @@ use crate::s9pk::merkle_archive::source::{
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
 use crate::s9pk::v2::pack::{ImageSource, PackSource};
 use crate::util::io::{open_file, TmpDir};
+use crate::util::serde::IoFormat;
 
 const MAGIC_AND_VERSION: &[u8] = &[0x3b, 0x3b, 0x02];
 
@@ -33,6 +34,10 @@ pub mod pack;
     ├── icon.<ext>
     ├── LICENSE.md
     ├── instructions.md
+    ├── dependencies
+    │   └── <id>
+    │       ├── metadata.json
+    │       └── icon.<ext>
     ├── javascript.squashfs
     ├── assets
     │   └── <id>.squashfs (xN)
@@ -52,9 +57,10 @@ fn priority(s: &str) -> Option<usize> {
         a if Path::new(a).file_stem() == Some(OsStr::new("icon")) => Some(1),
         "LICENSE.md" => Some(2),
         "instructions.md" => Some(3),
-        "javascript.squashfs" => Some(4),
-        "assets" => Some(5),
-        "images" => Some(6),
+        "dependencies" => Some(4),
+        "javascript.squashfs" => Some(5),
+        "assets" => Some(6),
+        "images" => Some(7),
         _ => None,
     }
 }
@@ -101,22 +107,16 @@ impl<S: FileSource + Clone> S9pk<S> {
         filter.keep_checked(self.archive.contents_mut())
     }
 
-    pub async fn icon(&self) -> Result<(InternedString, FileContents<S>), Error> {
+    pub async fn icon(&self) -> Result<(InternedString, Entry<S>), Error> {
         let mut best_icon = None;
-        for (path, icon) in self
-            .archive
-            .contents()
-            .with_stem("icon")
-            .filter(|(p, _)| {
-                Path::new(&*p)
-                    .extension()
-                    .and_then(|e| e.to_str())
-                    .and_then(mime)
-                    .map_or(false, |e| e.starts_with("image/"))
-            })
-            .filter_map(|(k, v)| v.into_file().map(|f| (k, f)))
-        {
-            let size = icon.size().await?;
+        for (path, icon) in self.archive.contents().with_stem("icon").filter(|(p, v)| {
+            Path::new(&*p)
+                .extension()
+                .and_then(|e| e.to_str())
+                .and_then(mime)
+                .map_or(false, |e| e.starts_with("image/") && v.as_file().is_some())
+        }) {
+            let size = icon.expect_file()?.size().await?;
             best_icon = match best_icon {
                 Some((s, a)) if s >= size => Some((s, a)),
                 _ => Some((size, (path, icon))),
@@ -134,7 +134,75 @@ impl<S: FileSource + Clone> S9pk<S> {
             .and_then(|e| e.to_str())
             .and_then(mime)
             .unwrap_or("image/png");
-        DataUrl::from_reader(mime, contents.reader().await?, Some(contents.size().await?)).await
+        Ok(DataUrl::from_vec(
+            mime,
+            contents.expect_file()?.to_vec(contents.hash()).await?,
+        ))
+    }
+
+    pub async fn dependency_icon(
+        &self,
+        id: &PackageId,
+    ) -> Result<Option<(InternedString, Entry<S>)>, Error> {
+        let mut best_icon = None;
+        for (path, icon) in self
+            .archive
+            .contents()
+            .get_path(Path::new("dependencies").join(id))
+            .and_then(|p| p.as_directory())
+            .into_iter()
+            .flat_map(|d| {
+                d.with_stem("icon").filter(|(p, v)| {
+                    Path::new(&*p)
+                        .extension()
+                        .and_then(|e| e.to_str())
+                        .and_then(mime)
+                        .map_or(false, |e| e.starts_with("image/") && v.as_file().is_some())
+                })
+            })
+        {
+            let size = icon.expect_file()?.size().await?;
+            best_icon = match best_icon {
+                Some((s, a)) if s >= size => Some((s, a)),
+                _ => Some((size, (path, icon))),
+            };
+        }
+        Ok(best_icon.map(|(_, a)| a))
+    }
+
+    pub async fn dependency_icon_data_url(
+        &self,
+        id: &PackageId,
+    ) -> Result<Option<DataUrl<'static>>, Error> {
+        let Some((name, contents)) = self.dependency_icon(id).await? else {
+            return Ok(None);
+        };
+        let mime = Path::new(&*name)
+            .extension()
+            .and_then(|e| e.to_str())
+            .and_then(mime)
+            .unwrap_or("image/png");
+        Ok(Some(DataUrl::from_vec(
+            mime,
+            contents.expect_file()?.to_vec(contents.hash()).await?,
+        )))
+    }
+
+    pub async fn dependency_metadata(
+        &self,
+        id: &PackageId,
+    ) -> Result<Option<DependencyMetadata>, Error> {
+        if let Some(entry) = self
+            .archive
+            .contents()
+            .get_path(Path::new("dependencies").join(id).join("metadata.json"))
+        {
+            Ok(Some(IoFormat::Json.from_slice(
+                &entry.expect_file()?.to_vec(entry.hash()).await?,
+            )?))
+        } else {
+            Ok(None)
+        }
     }
 
     pub async fn serialize<W: Sink>(&mut self, w: &mut W, verify: bool) -> Result<(), Error> {
diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index ae6807c23..06a47b9d0 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -1,6 +1,4 @@
 use std::collections::BTreeSet;
-use std::ffi::OsStr;
-use std::io::Cursor;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
@@ -10,25 +8,29 @@ use futures::{FutureExt, TryStreamExt};
 use imbl_value::InternedString;
 use models::{ImageId, PackageId, VersionString};
 use serde::{Deserialize, Serialize};
-use tokio::io::AsyncRead;
 use tokio::process::Command;
 use tokio::sync::OnceCell;
 use tokio_stream::wrappers::ReadDirStream;
+use tracing::{debug, warn};
 use ts_rs::TS;
 
 use crate::context::CliContext;
+use crate::dependencies::DependencyMetadata;
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
+use crate::s9pk::manifest::Manifest;
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
+use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::{
-    into_dyn_read, ArchiveSource, DynFileSource, FileSource, TmpSource,
+    into_dyn_read, ArchiveSource, DynFileSource, DynRead, FileSource, TmpSource,
 };
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
 use crate::s9pk::v2::SIG_CONTEXT;
 use crate::s9pk::S9pk;
 use crate::util::io::{create_file, open_file, TmpDir};
-use crate::util::Invoke;
+use crate::util::serde::IoFormat;
+use crate::util::{new_guid, Invoke, PathOrUrl};
 
 #[cfg(not(feature = "docker"))]
 pub const CONTAINER_TOOL: &str = "podman";
@@ -83,7 +85,8 @@ pub enum PackSource {
     Squashfs(Arc<SqfsDir>),
 }
 impl FileSource for PackSource {
-    type Reader = Box<dyn AsyncRead + Unpin + Send + Sync + 'static>;
+    type Reader = DynRead;
+    type SliceReader = DynRead;
     async fn size(&self) -> Result<u64, Error> {
         match self {
             Self::Buffered(a) => Ok(a.len() as u64),
@@ -102,11 +105,23 @@ impl FileSource for PackSource {
     }
     async fn reader(&self) -> Result<Self::Reader, Error> {
         match self {
-            Self::Buffered(a) => Ok(into_dyn_read(Cursor::new(a.clone()))),
-            Self::File(f) => Ok(into_dyn_read(open_file(f).await?)),
+            Self::Buffered(a) => Ok(into_dyn_read(FileSource::reader(a).await?)),
+            Self::File(f) => Ok(into_dyn_read(FileSource::reader(f).await?)),
             Self::Squashfs(dir) => dir.file().await?.fetch_all().await.map(into_dyn_read),
         }
     }
+    async fn slice(&self, position: u64, size: u64) -> Result<Self::SliceReader, Error> {
+        match self {
+            Self::Buffered(a) => Ok(into_dyn_read(FileSource::slice(a, position, size).await?)),
+            Self::File(f) => Ok(into_dyn_read(FileSource::slice(f, position, size).await?)),
+            Self::Squashfs(dir) => dir
+                .file()
+                .await?
+                .fetch(position, size)
+                .await
+                .map(into_dyn_read),
+        }
+    }
 }
 impl From<PackSource> for DynFileSource {
     fn from(value: PackSource) -> Self {
@@ -150,24 +165,71 @@ impl PackParams {
         if let Some(icon) = &self.icon {
             Ok(icon.clone())
         } else {
-            ReadDirStream::new(tokio::fs::read_dir(self.path()).await?).try_filter(|x| ready(x.path().file_stem() == Some(OsStr::new("icon")))).map_err(Error::from).try_fold(Err(Error::new(eyre!("icon not found"), ErrorKind::NotFound)), |acc, x| async move { match acc {
-                Ok(_) => Err(Error::new(eyre!("multiple icons found in working directory, please specify which to use with `--icon`"), ErrorKind::InvalidRequest)),
-                Err(e) => Ok({
-                    let path = x.path();
-                    if path.file_stem().and_then(|s| s.to_str()) == Some("icon") {
-                    Ok(path)
-                    } else {
-                        Err(e)
-                    }
+            ReadDirStream::new(tokio::fs::read_dir(self.path()).await?)
+                .try_filter(|x| {
+                    ready(
+                        x.path()
+                            .file_stem()
+                            .map_or(false, |s| s.eq_ignore_ascii_case("icon")),
+                    )
                 })
-            }}).await?
+                .map_err(Error::from)
+                .try_fold(
+                    Err(Error::new(eyre!("icon not found"), ErrorKind::NotFound)),
+                    |acc, x| async move {
+                        match acc {
+                            Ok(_) => Err(Error::new(eyre!("multiple icons found in working directory, please specify which to use with `--icon`"), ErrorKind::InvalidRequest)),
+                            Err(e) => Ok({
+                                let path = x.path();
+                                if path
+                                    .file_stem()
+                                    .map_or(false, |s| s.eq_ignore_ascii_case("icon"))
+                                {
+                                    Ok(path)
+                                } else {
+                                    Err(e)
+                                }
+                            }),
+                        }
+                    },
+                )
+                .await?
         }
     }
-    fn license(&self) -> PathBuf {
-        self.license
-            .as_ref()
-            .cloned()
-            .unwrap_or_else(|| self.path().join("LICENSE.md"))
+    async fn license(&self) -> Result<PathBuf, Error> {
+        if let Some(license) = &self.license {
+            Ok(license.clone())
+        } else {
+            ReadDirStream::new(tokio::fs::read_dir(self.path()).await?)
+                .try_filter(|x| {
+                    ready(
+                        x.path()
+                            .file_stem()
+                            .map_or(false, |s| s.eq_ignore_ascii_case("license")),
+                    )
+                })
+                .map_err(Error::from)
+                .try_fold(
+                    Err(Error::new(eyre!("icon not found"), ErrorKind::NotFound)),
+                    |acc, x| async move {
+                        match acc {
+                            Ok(_) => Err(Error::new(eyre!("multiple licenses found in working directory, please specify which to use with `--license`"), ErrorKind::InvalidRequest)),
+                            Err(e) => Ok({
+                                let path = x.path();
+                                if path
+                                    .file_stem()
+                                    .map_or(false, |s| s.eq_ignore_ascii_case("license"))
+                                {
+                                    Ok(path)
+                                } else {
+                                    Err(e)
+                                }
+                            }),
+                        }
+                    },
+                )
+                .await?
+        }
     }
     fn instructions(&self) -> PathBuf {
         self.instructions
@@ -282,6 +344,15 @@ pub enum ImageSource {
     DockerTag(String),
 }
 impl ImageSource {
+    pub fn ingredients(&self) -> Vec<PathBuf> {
+        match self {
+            Self::Packed => Vec::new(),
+            Self::DockerBuild { dockerfile, .. } => {
+                vec![dockerfile.clone().unwrap_or_else(|| "Dockerfile".into())]
+            }
+            Self::DockerTag(_) => Vec::new(),
+        }
+    }
     #[instrument(skip_all)]
     pub fn load<'a, S: From<TmpSource<PackSource>> + FileSource + Clone>(
         &'a self,
@@ -320,7 +391,7 @@ impl ImageSource {
                         format!("--platform=linux/{arch}")
                     };
                     // docker buildx build ${path} -o type=image,name=start9/${id}
-                    let tag = format!("start9/{id}/{image_id}:{version}");
+                    let tag = format!("start9/{id}/{image_id}:{}", new_guid());
                     Command::new(CONTAINER_TOOL)
                         .arg("build")
                         .arg(workdir)
@@ -501,7 +572,7 @@ pub async fn pack(ctx: CliContext, params: PackParams) -> Result<(), Error> {
         "LICENSE.md".into(),
         Entry::file(TmpSource::new(
             tmp_dir.clone(),
-            PackSource::File(params.license()),
+            PackSource::File(params.license().await?),
         )),
     );
     files.insert(
@@ -541,6 +612,54 @@ pub async fn pack(ctx: CliContext, params: PackParams) -> Result<(), Error> {
 
     s9pk.load_images(tmp_dir.clone()).await?;
 
+    let mut to_insert = Vec::new();
+    for (id, dependency) in &mut s9pk.as_manifest_mut().dependencies.0 {
+        if let Some(s9pk) = dependency.s9pk.take() {
+            let s9pk = match s9pk {
+                PathOrUrl::Path(path) => {
+                    S9pk::deserialize(&MultiCursorFile::from(open_file(path).await?), None)
+                        .await?
+                        .into_dyn()
+                }
+                PathOrUrl::Url(url) => {
+                    if url.scheme() == "http" || url.scheme() == "https" {
+                        S9pk::deserialize(
+                            &Arc::new(HttpSource::new(ctx.client.clone(), url).await?),
+                            None,
+                        )
+                        .await?
+                        .into_dyn()
+                    } else {
+                        return Err(Error::new(
+                            eyre!("unknown scheme: {}", url.scheme()),
+                            ErrorKind::InvalidRequest,
+                        ));
+                    }
+                }
+            };
+            let dep_path = Path::new("dependencies").join(id);
+            to_insert.push((
+                dep_path.join("metadata.json"),
+                Entry::file(PackSource::Buffered(
+                    IoFormat::Json
+                        .to_vec(&DependencyMetadata {
+                            title: s9pk.as_manifest().title.clone(),
+                        })?
+                        .into(),
+                )),
+            ));
+            let icon = s9pk.icon().await?;
+            to_insert.push((
+                dep_path.join(&*icon.0),
+                Entry::file(PackSource::Buffered(
+                    icon.1.expect_file()?.to_vec(icon.1.hash()).await?.into(),
+                )),
+            ));
+        } else {
+            warn!("no s9pk specified for {id}, leaving metadata empty");
+        }
+    }
+
     s9pk.validate_and_filter(None)?;
 
     s9pk.serialize(
@@ -555,3 +674,58 @@ pub async fn pack(ctx: CliContext, params: PackParams) -> Result<(), Error> {
 
     Ok(())
 }
+
+#[instrument(skip_all)]
+pub async fn list_ingredients(_: CliContext, params: PackParams) -> Result<Vec<PathBuf>, Error> {
+    let js_path = params.javascript().join("index.js");
+    let manifest: Manifest = match async {
+        serde_json::from_slice(
+            &Command::new("node")
+                .arg("-e")
+                .arg(format!(
+                    "console.log(JSON.stringify(require('{}').manifest))",
+                    js_path.display()
+                ))
+                .invoke(ErrorKind::Javascript)
+                .await?,
+        )
+        .with_kind(ErrorKind::Deserialization)
+    }
+    .await
+    {
+        Ok(m) => m,
+        Err(e) => {
+            warn!("failed to load manifest: {e}");
+            debug!("{e:?}");
+            return Ok(vec![
+                js_path,
+                params.icon().await?,
+                params.license().await?,
+                params.instructions(),
+            ]);
+        }
+    };
+    let mut ingredients = vec![
+        js_path,
+        params.icon().await?,
+        params.license().await?,
+        params.instructions(),
+    ];
+
+    for (_, dependency) in manifest.dependencies.0 {
+        if let Some(PathOrUrl::Path(p)) = dependency.s9pk {
+            ingredients.push(p);
+        }
+    }
+
+    let assets_dir = params.assets();
+    for assets in manifest.assets {
+        ingredients.push(assets_dir.join(assets));
+    }
+
+    for image in manifest.images.values() {
+        ingredients.extend(image.source.ingredients());
+    }
+
+    Ok(ingredients)
+}
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
index 7547584e0..79ca4dc42 100644
--- a/core/startos/src/service/service_effect_handler.rs
+++ b/core/startos/src/service/service_effect_handler.rs
@@ -1147,18 +1147,14 @@ enum DependencyRequirement {
         #[ts(type = "string[]")]
         health_checks: BTreeSet<HealthCheckId>,
         #[ts(type = "string")]
-        version_spec: VersionRange,
-        #[ts(type = "string")]
-        registry_url: Url,
+        version_range: VersionRange,
     },
     #[serde(rename_all = "camelCase")]
     Exists {
         #[ts(type = "string")]
         id: PackageId,
         #[ts(type = "string")]
-        version_spec: VersionRange,
-        #[ts(type = "string")]
-        registry_url: Url,
+        version_range: VersionRange,
     },
 }
 // filebrowser:exists,bitcoind:running:foo+bar+baz
@@ -1168,8 +1164,7 @@ impl FromStr for DependencyRequirement {
         match s.split_once(':') {
             Some((id, "e")) | Some((id, "exists")) => Ok(Self::Exists {
                 id: id.parse()?,
-                registry_url: "".parse()?,  // TODO
-                version_spec: "*".parse()?, // TODO
+                version_range: "*".parse()?, // TODO
             }),
             Some((id, rest)) => {
                 let health_checks = match rest.split_once(':') {
@@ -1192,15 +1187,13 @@ impl FromStr for DependencyRequirement {
                 Ok(Self::Running {
                     id: id.parse()?,
                     health_checks,
-                    registry_url: "".parse()?,  // TODO
-                    version_spec: "*".parse()?, // TODO
+                    version_range: "*".parse()?, // TODO
                 })
             }
             None => Ok(Self::Running {
                 id: s.parse()?,
                 health_checks: BTreeSet::new(),
-                registry_url: "".parse()?,  // TODO
-                version_spec: "*".parse()?, // TODO
+                version_range: "*".parse()?, // TODO
             }),
         }
     }
@@ -1234,59 +1227,20 @@ async fn set_dependencies(
 
     let mut deps = BTreeMap::new();
     for dependency in dependencies {
-        let (dep_id, kind, registry_url, version_spec) = match dependency {
-            DependencyRequirement::Exists {
-                id,
-                registry_url,
-                version_spec,
-            } => (
-                id,
-                CurrentDependencyKind::Exists,
-                registry_url,
-                version_spec,
-            ),
+        let (dep_id, kind, version_range) = match dependency {
+            DependencyRequirement::Exists { id, version_range } => {
+                (id, CurrentDependencyKind::Exists, version_range)
+            }
             DependencyRequirement::Running {
                 id,
                 health_checks,
-                registry_url,
-                version_spec,
+                version_range,
             } => (
                 id,
                 CurrentDependencyKind::Running { health_checks },
-                registry_url,
-                version_spec,
+                version_range,
             ),
         };
-        let (icon, title) = match async {
-            let remote_s9pk = S9pk::deserialize(
-                &Arc::new(
-                    HttpSource::new(
-                        context.seed.ctx.client.clone(),
-                        registry_url
-                            .join(&format!("package/v2/{}.s9pk?spec={}", dep_id, version_spec))?,
-                    )
-                    .await?,
-                ),
-                None, // TODO
-            )
-            .await?;
-
-            let icon = remote_s9pk.icon_data_url().await?;
-
-            Ok::<_, Error>((icon, remote_s9pk.as_manifest().title.clone()))
-        }
-        .await
-        {
-            Ok(a) => a,
-            Err(e) => {
-                tracing::error!("Error fetching remote s9pk: {e}");
-                tracing::debug!("{e:?}");
-                (
-                    DataUrl::from_slice("image/png", include_bytes!("../install/package-icon.png")),
-                    dep_id.to_string(),
-                )
-            }
-        };
         let config_satisfied =
             if let Some(dep_service) = &*context.seed.ctx.services.get(&dep_id).await {
                 context
@@ -1300,17 +1254,25 @@ async fn set_dependencies(
             } else {
                 true
             };
-        deps.insert(
-            dep_id,
-            CurrentDependencyInfo {
-                kind,
-                registry_url,
-                version_spec,
-                icon,
-                title,
-                config_satisfied,
-            },
-        );
+        let info = CurrentDependencyInfo {
+            title: context
+                .seed
+                .persistent_container
+                .s9pk
+                .dependency_metadata(&dep_id)
+                .await?
+                .map(|m| m.title),
+            icon: context
+                .seed
+                .persistent_container
+                .s9pk
+                .dependency_icon_data_url(&dep_id)
+                .await?,
+            kind,
+            version_range,
+            config_satisfied,
+        };
+        deps.insert(dep_id, info);
     }
     context
         .seed
@@ -1343,23 +1305,19 @@ async fn get_dependencies(context: EffectContext) -> Result<Vec<DependencyRequir
         .into_iter()
         .map(|(id, current_dependency_info)| {
             let CurrentDependencyInfo {
-                registry_url,
-                version_spec,
+                version_range,
                 kind,
                 ..
             } = current_dependency_info;
             Ok::<_, Error>(match kind {
-                CurrentDependencyKind::Exists => DependencyRequirement::Exists {
-                    id,
-                    registry_url,
-                    version_spec,
-                },
+                CurrentDependencyKind::Exists => {
+                    DependencyRequirement::Exists { id, version_range }
+                }
                 CurrentDependencyKind::Running { health_checks } => {
                     DependencyRequirement::Running {
                         id,
                         health_checks,
-                        version_spec,
-                        registry_url,
+                        version_range,
                     }
                 }
             })
@@ -1381,7 +1339,8 @@ struct CheckDependenciesResult {
     package_id: PackageId,
     is_installed: bool,
     is_running: bool,
-    health_checks: Vec<HealthCheckResult>,
+    config_satisfied: bool,
+    health_checks: BTreeMap<HealthCheckId, HealthCheckResult>,
     #[ts(type = "string | null")]
     version: Option<exver::ExtendedVersion>,
 }
@@ -1415,24 +1374,27 @@ async fn check_dependencies(
                 package_id,
                 is_installed: false,
                 is_running: false,
-                health_checks: vec![],
+                config_satisfied: false,
+                health_checks: Default::default(),
                 version: None,
             });
             continue;
         };
-        let installed_version = package
-            .as_state_info()
-            .as_manifest(ManifestPreference::New)
-            .as_version()
-            .de()?
-            .into_version();
+        let manifest = package.as_state_info().as_manifest(ManifestPreference::New);
+        let installed_version = manifest.as_version().de()?.into_version();
+        let satisfies = manifest.as_satisfies().de()?;
         let version = Some(installed_version.clone());
-        if !installed_version.satisfies(&dependency_info.version_spec) {
+        if ![installed_version]
+            .into_iter()
+            .chain(satisfies.into_iter().map(|v| v.into_version()))
+            .any(|v| v.satisfies(&dependency_info.version_range))
+        {
             results.push(CheckDependenciesResult {
                 package_id,
                 is_installed: false,
                 is_running: false,
-                health_checks: vec![],
+                config_satisfied: false,
+                health_checks: Default::default(),
                 version,
             });
             continue;
@@ -1444,17 +1406,23 @@ async fn check_dependencies(
         } else {
             false
         };
-        let health_checks = status
-            .health()
-            .cloned()
-            .unwrap_or_default()
-            .into_iter()
-            .map(|(_, val)| val)
-            .collect();
+        let health_checks =
+            if let CurrentDependencyKind::Running { health_checks } = &dependency_info.kind {
+                status
+                    .health()
+                    .cloned()
+                    .unwrap_or_default()
+                    .into_iter()
+                    .filter(|(id, _)| health_checks.contains(id))
+                    .collect()
+            } else {
+                Default::default()
+            };
         results.push(CheckDependenciesResult {
             package_id,
             is_installed,
             is_running,
+            config_satisfied: dependency_info.config_satisfied,
             health_checks,
             version,
         });
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index f591eaaf3..3b66d7507 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -1,13 +1,16 @@
 use std::collections::{BTreeMap, VecDeque};
+use std::fmt;
 use std::future::Future;
 use std::marker::PhantomData;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
 use std::process::Stdio;
+use std::str::FromStr;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 use std::time::Duration;
 
+use ::serde::{Deserialize, Serialize};
 use async_trait::async_trait;
 use color_eyre::eyre::{self, eyre};
 use fd_lock_rs::FdLock;
@@ -24,9 +27,12 @@ use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncReadExt, BufReader};
 use tokio::sync::{oneshot, Mutex, OwnedMutexGuard, RwLock};
 use tracing::instrument;
+use ts_rs::TS;
+use url::Url;
 
 use crate::shutdown::Shutdown;
 use crate::util::io::create_file;
+use crate::util::serde::{deserialize_from_str, serialize_display};
 use crate::{Error, ErrorKind, ResultExt as _};
 pub mod actor;
 pub mod clap;
@@ -648,3 +654,48 @@ pub fn new_guid() -> InternedString {
         &buf,
     ))
 }
+
+#[derive(Debug, Clone, TS)]
+#[ts(type = "string")]
+pub enum PathOrUrl {
+    Path(PathBuf),
+    Url(Url),
+}
+impl FromStr for PathOrUrl {
+    type Err = <PathBuf as FromStr>::Err;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if let Ok(url) = s.parse::<Url>() {
+            if url.scheme() == "file" {
+                Ok(Self::Path(url.path().parse()?))
+            } else {
+                Ok(Self::Url(url))
+            }
+        } else {
+            Ok(Self::Path(s.parse()?))
+        }
+    }
+}
+impl fmt::Display for PathOrUrl {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Path(p) => write!(f, "file://{}", p.display()),
+            Self::Url(u) => write!(f, "{u}"),
+        }
+    }
+}
+impl<'de> Deserialize<'de> for PathOrUrl {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: ::serde::Deserializer<'de>,
+    {
+        deserialize_from_str(deserializer)
+    }
+}
+impl Serialize for PathOrUrl {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: ::serde::Serializer,
+    {
+        serialize_display(self, serializer)
+    }
+}
diff --git a/core/startos/src/util/net.rs b/core/startos/src/util/net.rs
index 93131f16e..9e1beeaba 100644
--- a/core/startos/src/util/net.rs
+++ b/core/startos/src/util/net.rs
@@ -1,19 +1,25 @@
+use core::fmt;
 use std::borrow::Cow;
+use std::sync::Mutex;
 
 use axum::extract::ws::{self, CloseFrame};
-use futures::Future;
+use futures::{Future, Stream, StreamExt};
 
 use crate::prelude::*;
 
 pub trait WebSocketExt {
     fn normal_close(
         self,
-        msg: impl Into<Cow<'static, str>>,
-    ) -> impl Future<Output = Result<(), Error>>;
+        msg: impl Into<Cow<'static, str>> + Send,
+    ) -> impl Future<Output = Result<(), Error>> + Send;
+    fn close_result(
+        self,
+        result: Result<impl Into<Cow<'static, str>> + Send, impl fmt::Display + Send>,
+    ) -> impl Future<Output = Result<(), Error>> + Send;
 }
 
 impl WebSocketExt for ws::WebSocket {
-    async fn normal_close(mut self, msg: impl Into<Cow<'static, str>>) -> Result<(), Error> {
+    async fn normal_close(mut self, msg: impl Into<Cow<'static, str>> + Send) -> Result<(), Error> {
         self.send(ws::Message::Close(Some(CloseFrame {
             code: 1000,
             reason: msg.into(),
@@ -21,4 +27,41 @@ impl WebSocketExt for ws::WebSocket {
         .await
         .with_kind(ErrorKind::Network)
     }
+    async fn close_result(
+        mut self,
+        result: Result<impl Into<Cow<'static, str>> + Send, impl fmt::Display + Send>,
+    ) -> Result<(), Error> {
+        match result {
+            Ok(msg) => self
+                .send(ws::Message::Close(Some(CloseFrame {
+                    code: 1000,
+                    reason: msg.into(),
+                })))
+                .await
+                .with_kind(ErrorKind::Network),
+            Err(e) => self
+                .send(ws::Message::Close(Some(CloseFrame {
+                    code: 1011,
+                    reason: e.to_string().into(),
+                })))
+                .await
+                .with_kind(ErrorKind::Network),
+        }
+    }
+}
+
+pub struct SyncBody(Mutex<axum::body::BodyDataStream>);
+impl From<axum::body::Body> for SyncBody {
+    fn from(value: axum::body::Body) -> Self {
+        SyncBody(Mutex::new(value.into_data_stream()))
+    }
+}
+impl Stream for SyncBody {
+    type Item = <axum::body::BodyDataStream as Stream>::Item;
+    fn poll_next(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Option<Self::Item>> {
+        self.0.lock().unwrap().poll_next_unpin(cx)
+    }
 }
diff --git a/core/startos/src/util/rpc.rs b/core/startos/src/util/rpc.rs
index 54664833b..80d6d9251 100644
--- a/core/startos/src/util/rpc.rs
+++ b/core/startos/src/util/rpc.rs
@@ -12,7 +12,7 @@ use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::{open_file, ParallelBlake3Writer};
 use crate::util::serde::Base16;
-use crate::util::Apply;
+use crate::util::{Apply, PathOrUrl};
 use crate::CAP_10_MiB;
 
 pub fn util<C: Context>() -> ParentHandler<C> {
@@ -45,21 +45,20 @@ pub async fn b3sum(
         }
         b3sum_source(file).await
     }
-    if let Ok(url) = file.parse::<Url>() {
-        if url.scheme() == "file" {
-            b3sum_file(url.path(), allow_mmap).await
-        } else if url.scheme() == "http" || url.scheme() == "https" {
-            HttpSource::new(ctx.client.clone(), url)
-                .await?
-                .apply(b3sum_source)
-                .await
-        } else {
-            return Err(Error::new(
-                eyre!("unknown scheme: {}", url.scheme()),
-                ErrorKind::InvalidRequest,
-            ));
+    match file.parse::<PathOrUrl>()? {
+        PathOrUrl::Path(path) => b3sum_file(path, allow_mmap).await,
+        PathOrUrl::Url(url) => {
+            if url.scheme() == "http" || url.scheme() == "https" {
+                HttpSource::new(ctx.client.clone(), url)
+                    .await?
+                    .apply(b3sum_source)
+                    .await
+            } else {
+                Err(Error::new(
+                    eyre!("unknown scheme: {}", url.scheme()),
+                    ErrorKind::InvalidRequest,
+                ))
+            }
         }
-    } else {
-        b3sum_file(file, allow_mmap).await
     }
 }
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 44a69165e..bac2c524a 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -1,8 +1,10 @@
+use std::any::Any;
 use std::collections::VecDeque;
 use std::marker::PhantomData;
 use std::ops::Deref;
 use std::str::FromStr;
 
+use base64::Engine;
 use clap::builder::ValueParserFactory;
 use clap::{ArgMatches, CommandFactory, FromArgMatches};
 use color_eyre::eyre::eyre;
@@ -37,7 +39,11 @@ pub fn deserialize_from_str<
     {
         type Value = T;
         fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(formatter, "a parsable string")
+            write!(
+                formatter,
+                "a string that can be parsed as a {}",
+                std::any::type_name::<T>()
+            )
         }
         fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
         where
@@ -988,18 +994,24 @@ impl<T: AsRef<[u8]>> Serialize for Base32<T> {
     }
 }
 
+pub const BASE64: base64::engine::GeneralPurpose = base64::engine::GeneralPurpose::new(
+    &base64::alphabet::STANDARD,
+    base64::engine::GeneralPurposeConfig::new(),
+);
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, TS)]
 #[ts(type = "string", concrete(T = Vec<u8>))]
 pub struct Base64<T>(pub T);
 impl<T: AsRef<[u8]>> std::fmt::Display for Base64<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&base64::encode(self.0.as_ref()))
+        f.write_str(&BASE64.encode(self.0.as_ref()))
     }
 }
 impl<T: TryFrom<Vec<u8>>> FromStr for Base64<T> {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        base64::decode(&s)
+        BASE64
+            .decode(&s)
             .with_kind(ErrorKind::Deserialization)?
             .apply(TryFrom::try_from)
             .map(Self)
diff --git a/debian/postinst b/debian/postinst
index 96e392fc8..cafa691e0 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -49,9 +49,9 @@ managed=true
 EOF
 $SYSTEMCTL enable startd.service
 $SYSTEMCTL enable systemd-resolved.service
-$SYSTEMCTL enable systemd-networkd-wait-online.service
 $SYSTEMCTL enable ssh.service
 $SYSTEMCTL disable wpa_supplicant.service
+$SYSTEMCTL mask systemd-networkd-wait-online.service # currently use `NetworkManager-wait-online.service`
 
 $SYSTEMCTL disable docker.service
 $SYSTEMCTL disable postgresql.service
diff --git a/sdk/.prettierignore b/sdk/.prettierignore
new file mode 100644
index 000000000..19b24bbe8
--- /dev/null
+++ b/sdk/.prettierignore
@@ -0,0 +1 @@
+/lib/exver/exver.ts
\ No newline at end of file
diff --git a/sdk/Makefile b/sdk/Makefile
index 4d01fa3d7..ef1c886f5 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -17,6 +17,9 @@ lib/test/output.ts: node_modules lib/test/makeOutput.ts scripts/oldSpecToBuilder
 bundle: dist | test fmt
 	touch dist
 
+lib/exver/exver.ts: node_modules lib/exver/exver.pegjs
+	npx peggy --allowed-start-rules '*' --plugin ./node_modules/ts-pegjs/dist/tspegjs -o lib/exver/exver.ts lib/exver/exver.pegjs
+
 dist: $(TS_FILES) package.json node_modules README.md LICENSE
 	npx tsc
 	npx tsc --project tsconfig-cjs.json
@@ -31,7 +34,7 @@ check:
 	npm run check
 
 fmt: node_modules
-	npx prettier --write "**/*.ts"
+	npx prettier . "**/*.ts" --write
 
 node_modules: package.json
 	npm ci
diff --git a/sdk/jest.config.js b/sdk/jest.config.js
index c6aed8f3d..c38fa5062 100644
--- a/sdk/jest.config.js
+++ b/sdk/jest.config.js
@@ -5,4 +5,4 @@ module.exports = {
   testEnvironment: "node",
   rootDir: "./lib/",
   modulePathIgnorePatterns: ["./dist/"],
-};
+}
diff --git a/sdk/lib/Dependency.ts b/sdk/lib/Dependency.ts
index 1e70629da..067ed653e 100644
--- a/sdk/lib/Dependency.ts
+++ b/sdk/lib/Dependency.ts
@@ -1,17 +1,17 @@
-import { Checker } from "./emverLite/mod"
+import { VersionRange } from "./exver"
 
 export class Dependency {
   constructor(
     readonly data:
       | {
           type: "running"
-          versionSpec: Checker
+          versionRange: VersionRange
           registryUrl: string
           healthChecks: string[]
         }
       | {
           type: "exists"
-          versionSpec: Checker
+          versionRange: VersionRange
           registryUrl: string
         },
   ) {}
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index fac78a4af..f09d83750 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -1,4 +1,3 @@
-import { ManifestVersion, SDKManifest } from "./manifest/ManifestTypes"
 import { RequiredDefault, Value } from "./config/builder/value"
 import { Config, ExtractConfigType, LazyBuild } from "./config/builder/config"
 import {
@@ -21,7 +20,6 @@ import {
   MaybePromise,
   ServiceInterfaceId,
   PackageId,
-  ValidIfNoStupidEscape,
 } from "./types"
 import * as patterns from "./util/patterns"
 import { DependencyConfig, Update } from "./dependencies/DependencyConfig"
@@ -74,12 +72,14 @@ import { splitCommand } from "./util/splitCommand"
 import { Mounts } from "./mainFn/Mounts"
 import { Dependency } from "./Dependency"
 import * as T from "./types"
-import { Checker, EmVer } from "./emverLite/mod"
+import { testTypeVersion, ValidateExVer } from "./exver"
 import { ExposedStorePaths } from "./store/setupExposeStore"
 import { PathBuilder, extractJsonPath, pathBuilder } from "./store/PathBuilder"
 import { checkAllDependencies } from "./dependencies/dependencies"
 import { health } from "."
 
+export const SDKVersion = testTypeVersion("0.3.6")
+
 // prettier-ignore
 type AnyNeverCond<T extends any[], Then, Else> = 
     T extends [] ? Else :
@@ -98,12 +98,12 @@ function removeConstType<E>() {
   return <T>(t: T) => t as T & (E extends MainEffects ? {} : { const: never })
 }
 
-export class StartSdk<Manifest extends SDKManifest, Store> {
+export class StartSdk<Manifest extends T.Manifest, Store> {
   private constructor(readonly manifest: Manifest) {}
   static of() {
     return new StartSdk<never, never>(null as never)
   }
-  withManifest<Manifest extends SDKManifest = never>(manifest: Manifest) {
+  withManifest<Manifest extends T.Manifest = never>(manifest: Manifest) {
     return new StartSdk<Manifest, Store>(manifest)
   }
   withStore<Store extends Record<string, any>>() {
@@ -191,7 +191,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           id: keyof Manifest["images"] & T.ImageId
           sharedRun?: boolean
         },
-        command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+        command: T.CommandType,
         options: CommandOptions & {
           mounts?: { path: string; options: MountOptions }[]
         },
@@ -335,7 +335,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
               ([
                 id,
                 {
-                  data: { versionSpec, ...x },
+                  data: { versionRange, ...x },
                 },
               ]) => ({
                 id,
@@ -348,7 +348,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
                   : {
                       kind: "exists",
                     }),
-                versionSpec: versionSpec.range,
+                versionRange: versionRange.toString(),
               }),
             ),
           })
@@ -432,9 +432,6 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           spec: Spec,
         ) => Config.of<Spec, Store>(spec),
       },
-      Checker: {
-        parse: Checker.parse,
-      },
       Daemons: {
         of(config: {
           effects: Effects
@@ -474,10 +471,6 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
           >(dependencyConfig, update)
         },
       },
-      EmVer: {
-        from: EmVer.from,
-        parse: EmVer.parse,
-      },
       List: {
         text: List.text,
         obj: <Type extends Record<string, any>>(
@@ -524,8 +517,8 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
         ) => List.dynamicText<Store>(getA),
       },
       Migration: {
-        of: <Version extends ManifestVersion>(options: {
-          version: Version
+        of: <Version extends string>(options: {
+          version: Version & ValidateExVer<Version>
           up: (opts: { effects: Effects }) => Promise<void>
           down: (opts: { effects: Effects }) => Promise<void>
         }) => Migration.of<Manifest, Store, Version>(options),
@@ -720,7 +713,7 @@ export class StartSdk<Manifest extends SDKManifest, Store> {
   }
 }
 
-export async function runCommand<Manifest extends SDKManifest>(
+export async function runCommand<Manifest extends T.Manifest>(
   effects: Effects,
   image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean },
   command: string | [string, ...string[]],
diff --git a/sdk/lib/actions/createAction.ts b/sdk/lib/actions/createAction.ts
index 2fe4dfa74..4fa858d56 100644
--- a/sdk/lib/actions/createAction.ts
+++ b/sdk/lib/actions/createAction.ts
@@ -1,12 +1,13 @@
+import * as T from "../types"
 import { Config, ExtractConfigType } from "../config/builder/config"
-import { SDKManifest } from "../manifest/ManifestTypes"
+
 import { ActionMetadata, ActionResult, Effects, ExportedAction } from "../types"
 
-export type MaybeFn<Manifest extends SDKManifest, Store, Value> =
+export type MaybeFn<Manifest extends T.Manifest, Store, Value> =
   | Value
   | ((options: { effects: Effects }) => Promise<Value> | Value)
 export class CreatedAction<
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Store,
   ConfigType extends
     | Record<string, any>
@@ -30,7 +31,7 @@ export class CreatedAction<
   ) {}
 
   static of<
-    Manifest extends SDKManifest,
+    Manifest extends T.Manifest,
     Store,
     ConfigType extends
       | Record<string, any>
diff --git a/sdk/lib/actions/setupActions.ts b/sdk/lib/actions/setupActions.ts
index 9dd9937b4..07b4e2606 100644
--- a/sdk/lib/actions/setupActions.ts
+++ b/sdk/lib/actions/setupActions.ts
@@ -1,8 +1,8 @@
-import { SDKManifest } from "../manifest/ManifestTypes"
+import * as T from "../types"
 import { Effects, ExpectedExports } from "../types"
 import { CreatedAction } from "./createAction"
 
-export function setupActions<Manifest extends SDKManifest, Store>(
+export function setupActions<Manifest extends T.Manifest, Store>(
   ...createdActions: CreatedAction<Manifest, Store, any>[]
 ) {
   const myActions = async (options: { effects: Effects }) => {
diff --git a/sdk/lib/backup/Backups.ts b/sdk/lib/backup/Backups.ts
index 6ffe74b70..6751b1910 100644
--- a/sdk/lib/backup/Backups.ts
+++ b/sdk/lib/backup/Backups.ts
@@ -1,5 +1,3 @@
-import { recursive } from "ts-matches"
-import { SDKManifest } from "../manifest/ManifestTypes"
 import * as T from "../types"
 
 import * as child_process from "child_process"
@@ -41,14 +39,14 @@ export type BackupSet<Volumes extends string> = {
  * ).build()q
  * ```
  */
-export class Backups<M extends SDKManifest> {
+export class Backups<M extends T.Manifest> {
   static BACKUP: BACKUP = "BACKUP"
 
   private constructor(
     private options = DEFAULT_OPTIONS,
     private backupSet = [] as BackupSet<M["volumes"][number]>[],
   ) {}
-  static volumes<M extends SDKManifest = never>(
+  static volumes<M extends T.Manifest = never>(
     ...volumeNames: Array<M["volumes"][0]>
   ): Backups<M> {
     return new Backups<M>().addSets(
@@ -60,12 +58,12 @@ export class Backups<M extends SDKManifest> {
       })),
     )
   }
-  static addSets<M extends SDKManifest = never>(
+  static addSets<M extends T.Manifest = never>(
     ...options: BackupSet<M["volumes"][0]>[]
   ) {
     return new Backups().addSets(...options)
   }
-  static with_options<M extends SDKManifest = never>(
+  static with_options<M extends T.Manifest = never>(
     options?: Partial<T.BackupOptions>,
   ) {
     return new Backups({ ...DEFAULT_OPTIONS, ...options })
diff --git a/sdk/lib/backup/setupBackups.ts b/sdk/lib/backup/setupBackups.ts
index 69d1bf7df..40be01829 100644
--- a/sdk/lib/backup/setupBackups.ts
+++ b/sdk/lib/backup/setupBackups.ts
@@ -1,13 +1,13 @@
 import { Backups } from "./Backups"
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { ExpectedExports, PathMaker } from "../types"
+
+import * as T from "../types"
 import { _ } from "../util"
 
-export type SetupBackupsParams<M extends SDKManifest> = Array<
+export type SetupBackupsParams<M extends T.Manifest> = Array<
   M["volumes"][number] | Backups<M>
 >
 
-export function setupBackups<M extends SDKManifest>(
+export function setupBackups<M extends T.Manifest>(
   ...args: _<SetupBackupsParams<M>>
 ) {
   const backups = Array<Backups<M>>()
@@ -21,22 +21,22 @@ export function setupBackups<M extends SDKManifest>(
   }
   backups.push(Backups.volumes(...volumes))
   const answer: {
-    createBackup: ExpectedExports.createBackup
-    restoreBackup: ExpectedExports.restoreBackup
+    createBackup: T.ExpectedExports.createBackup
+    restoreBackup: T.ExpectedExports.restoreBackup
   } = {
     get createBackup() {
       return (async (options) => {
         for (const backup of backups) {
           await backup.build(options.pathMaker).createBackup(options)
         }
-      }) as ExpectedExports.createBackup
+      }) as T.ExpectedExports.createBackup
     },
     get restoreBackup() {
       return (async (options) => {
         for (const backup of backups) {
           await backup.build(options.pathMaker).restoreBackup(options)
         }
-      }) as ExpectedExports.restoreBackup
+      }) as T.ExpectedExports.restoreBackup
     },
   }
   return answer
diff --git a/sdk/lib/config/configDependencies.ts b/sdk/lib/config/configDependencies.ts
index 2ab091e18..d9865f25c 100644
--- a/sdk/lib/config/configDependencies.ts
+++ b/sdk/lib/config/configDependencies.ts
@@ -1,22 +1,21 @@
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Dependencies } from "../types"
+import * as T from "../types"
 
-export type ConfigDependencies<T extends SDKManifest> = {
-  exists(id: keyof T["dependencies"]): Dependencies[number]
+export type ConfigDependencies<T extends T.Manifest> = {
+  exists(id: keyof T["dependencies"]): T.Dependencies[number]
   running(
     id: keyof T["dependencies"],
     healthChecks: string[],
-  ): Dependencies[number]
+  ): T.Dependencies[number]
 }
 
 export const configDependenciesSet = <
-  T extends SDKManifest,
+  T extends T.Manifest,
 >(): ConfigDependencies<T> => ({
   exists(id: keyof T["dependencies"]) {
     return {
       id,
       kind: "exists",
-    } as Dependencies[number]
+    } as T.Dependencies[number]
   },
 
   running(id: keyof T["dependencies"], healthChecks: string[]) {
@@ -24,6 +23,6 @@ export const configDependenciesSet = <
       id,
       kind: "running",
       healthChecks,
-    } as Dependencies[number]
+    } as T.Dependencies[number]
   },
 })
diff --git a/sdk/lib/config/setupConfig.ts b/sdk/lib/config/setupConfig.ts
index ba82dbad6..8a1550d57 100644
--- a/sdk/lib/config/setupConfig.ts
+++ b/sdk/lib/config/setupConfig.ts
@@ -1,5 +1,5 @@
-import { Effects, ExpectedExports } from "../types"
-import { SDKManifest } from "../manifest/ManifestTypes"
+import * as T from "../types"
+
 import * as D from "./configDependencies"
 import { Config, ExtractConfigType } from "./builder/config"
 import nullIfEmpty from "../util/nullIfEmpty"
@@ -16,7 +16,7 @@ export type Save<
     | Config<Record<string, any>, any>
     | Config<Record<string, never>, never>,
 > = (options: {
-  effects: Effects
+  effects: T.Effects
   input: ExtractConfigType<A> & Record<string, any>
 }) => Promise<{
   dependenciesReceipt: DependenciesReceipt
@@ -24,14 +24,14 @@ export type Save<
   restart: boolean
 }>
 export type Read<
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Store,
   A extends
     | Record<string, any>
     | Config<Record<string, any>, any>
     | Config<Record<string, any>, never>,
 > = (options: {
-  effects: Effects
+  effects: T.Effects
 }) => Promise<void | (ExtractConfigType<A> & Record<string, any>)>
 /**
  * We want to setup a config export with a get and set, this
@@ -46,7 +46,7 @@ export function setupConfig<
     | Record<string, any>
     | Config<any, any>
     | Config<any, never>,
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Type extends Record<string, any> = ExtractConfigType<ConfigType>,
 >(
   spec: Config<Type, Store> | Config<Type, never>,
@@ -69,7 +69,7 @@ export function setupConfig<
       if (restart) {
         await effects.restart()
       }
-    }) as ExpectedExports.setConfig,
+    }) as T.ExpectedExports.setConfig,
     getConfig: (async ({ effects }) => {
       const configValue = nullIfEmpty((await read({ effects })) || null)
       return {
@@ -78,7 +78,7 @@ export function setupConfig<
         }),
         config: configValue,
       }
-    }) as ExpectedExports.getConfig,
+    }) as T.ExpectedExports.getConfig,
   }
 }
 
diff --git a/sdk/lib/dependencies/DependencyConfig.ts b/sdk/lib/dependencies/DependencyConfig.ts
index d7ce435ad..b48bf56d3 100644
--- a/sdk/lib/dependencies/DependencyConfig.ts
+++ b/sdk/lib/dependencies/DependencyConfig.ts
@@ -1,11 +1,6 @@
-import {
-  DependencyConfig as DependencyConfigType,
-  DeepPartial,
-  Effects,
-} from "../types"
+import * as T from "../types"
 import { deepEqual } from "../util/deepEqual"
 import { deepMerge } from "../util/deepMerge"
-import { SDKManifest } from "../manifest/ManifestTypes"
 
 export type Update<QueryResults, RemoteConfig> = (options: {
   remoteConfig: RemoteConfig
@@ -13,7 +8,7 @@ export type Update<QueryResults, RemoteConfig> = (options: {
 }) => Promise<RemoteConfig>
 
 export class DependencyConfig<
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Store,
   Input extends Record<string, any>,
   RemoteConfig extends Record<string, any>,
@@ -26,16 +21,16 @@ export class DependencyConfig<
   }
   constructor(
     readonly dependencyConfig: (options: {
-      effects: Effects
+      effects: T.Effects
       localConfig: Input
-    }) => Promise<void | DeepPartial<RemoteConfig>>,
+    }) => Promise<void | T.DeepPartial<RemoteConfig>>,
     readonly update: Update<
-      void | DeepPartial<RemoteConfig>,
+      void | T.DeepPartial<RemoteConfig>,
       RemoteConfig
     > = DependencyConfig.defaultUpdate as any,
   ) {}
 
-  async query(options: { effects: Effects; localConfig: unknown }) {
+  async query(options: { effects: T.Effects; localConfig: unknown }) {
     return this.dependencyConfig({
       localConfig: options.localConfig as Input,
       effects: options.effects,
diff --git a/sdk/lib/dependencies/dependencies.ts b/sdk/lib/dependencies/dependencies.ts
index c074d2ad7..28b04a07b 100644
--- a/sdk/lib/dependencies/dependencies.ts
+++ b/sdk/lib/dependencies/dependencies.ts
@@ -3,20 +3,23 @@ import {
   PackageId,
   DependencyRequirement,
   SetHealth,
-  CheckDependencyResult,
+  CheckDependenciesResult,
 } from "../types"
 
 export type CheckAllDependencies = {
-  notRunning: () => Promise<CheckDependencyResult[]>
+  notInstalled: () => Promise<CheckDependenciesResult[]>
+  notRunning: () => Promise<CheckDependenciesResult[]>
+  configNotSatisfied: () => Promise<CheckDependenciesResult[]>
+  healthErrors: () => Promise<{ [id: string]: SetHealth[] }>
 
-  notInstalled: () => Promise<CheckDependencyResult[]>
+  isValid: () => Promise<boolean>
 
-  healthErrors: () => Promise<{ [id: string]: SetHealth[] }>
   throwIfNotRunning: () => Promise<void>
-  throwIfNotValid: () => Promise<undefined>
   throwIfNotInstalled: () => Promise<void>
-  throwIfError: () => Promise<void>
-  isValid: () => Promise<boolean>
+  throwIfConfigNotSatisfied: () => Promise<void>
+  throwIfHealthError: () => Promise<void>
+
+  throwIfNotValid: () => Promise<void>
 }
 export function checkAllDependencies(effects: Effects): CheckAllDependencies {
   const dependenciesPromise = effects.getDependencies()
@@ -45,14 +48,16 @@ export function checkAllDependencies(effects: Effects): CheckAllDependencies {
       if (!dependency) continue
       if (dependency.kind !== "running") continue
 
-      const healthChecks = result.healthChecks
-        .filter((x) => dependency.healthChecks.includes(x.id))
+      const healthChecks = Object.entries(result.healthChecks)
+        .map(([id, hc]) => ({ ...hc, id }))
         .filter((x) => !!x.message)
       if (healthChecks.length === 0) continue
       answer[result.packageId] = healthChecks
     }
     return answer
   }
+  const configNotSatisfied = () =>
+    resultsPromise.then((x) => x.filter((x) => !x.configSatisfied))
   const notInstalled = () =>
     resultsPromise.then((x) => x.filter((x) => !x.isInstalled))
   const notRunning = async () => {
@@ -68,7 +73,7 @@ export function checkAllDependencies(effects: Effects): CheckAllDependencies {
   const entries = <B>(x: { [k: string]: B }) => Object.entries(x)
   const first = <A>(x: A[]): A | undefined => x[0]
   const sinkVoid = <A>(x: A) => void 0
-  const throwIfError = () =>
+  const throwIfHealthError = () =>
     healthErrors()
       .then(entries)
       .then(first)
@@ -78,6 +83,14 @@ export function checkAllDependencies(effects: Effects): CheckAllDependencies {
         if (healthChecks.length > 0)
           throw `Package ${id} has the following errors: ${healthChecks.map((x) => x.message).join(", ")}`
       })
+
+  const throwIfConfigNotSatisfied = () =>
+    configNotSatisfied().then((results) => {
+      throw new Error(
+        `Package ${results[0].packageId} does not have a valid configuration`,
+      )
+    })
+
   const throwIfNotRunning = () =>
     notRunning().then((results) => {
       if (results[0])
@@ -93,7 +106,8 @@ export function checkAllDependencies(effects: Effects): CheckAllDependencies {
     Promise.all([
       throwIfNotRunning(),
       throwIfNotInstalled(),
-      throwIfError(),
+      throwIfConfigNotSatisfied(),
+      throwIfHealthError(),
     ]).then(sinkVoid)
 
   const isValid = () =>
@@ -105,11 +119,13 @@ export function checkAllDependencies(effects: Effects): CheckAllDependencies {
   return {
     notRunning,
     notInstalled,
+    configNotSatisfied,
     healthErrors,
     throwIfNotRunning,
+    throwIfConfigNotSatisfied,
     throwIfNotValid,
     throwIfNotInstalled,
-    throwIfError,
+    throwIfHealthError,
     isValid,
   }
 }
diff --git a/sdk/lib/dependencies/setupDependencyConfig.ts b/sdk/lib/dependencies/setupDependencyConfig.ts
index c67c46a44..2fde4bce5 100644
--- a/sdk/lib/dependencies/setupDependencyConfig.ts
+++ b/sdk/lib/dependencies/setupDependencyConfig.ts
@@ -1,12 +1,12 @@
 import { Config } from "../config/builder/config"
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { ExpectedExports } from "../types"
+
+import * as T from "../types"
 import { DependencyConfig } from "./DependencyConfig"
 
 export function setupDependencyConfig<
   Store,
   Input extends Record<string, any>,
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
 >(
   _config: Config<Input, Store> | Config<Input, never>,
   autoConfigs: {
@@ -17,6 +17,6 @@ export function setupDependencyConfig<
       any
     > | null
   },
-): ExpectedExports.dependencyConfig {
+): T.ExpectedExports.dependencyConfig {
   return autoConfigs
 }
diff --git a/sdk/lib/emverLite/mod.ts b/sdk/lib/emverLite/mod.ts
deleted file mode 100644
index 52fb4e347..000000000
--- a/sdk/lib/emverLite/mod.ts
+++ /dev/null
@@ -1,323 +0,0 @@
-import * as matches from "ts-matches"
-
-const starSub = /((\d+\.)*\d+)\.\*/
-// prettier-ignore
-export type ValidEmVer = string;
-// prettier-ignore
-export type ValidEmVerRange = string;
-
-function incrementLastNumber(list: number[]) {
-  const newList = [...list]
-  newList[newList.length - 1]++
-  return newList
-}
-/**
- * Will take in a range, like `>1.2` or `<1.2.3.4` or `=1.2` or `1.*`
- * and return a checker, that has the check function for checking that a version is in the valid
- * @param range
- * @returns
- */
-export function rangeOf(range: string | Checker): Checker {
-  return Checker.parse(range)
-}
-
-/**
- * Used to create a checker that will `and` all the ranges passed in
- * @param ranges
- * @returns
- */
-export function rangeAnd(...ranges: (string | Checker)[]): Checker {
-  if (ranges.length === 0) {
-    throw new Error("No ranges given")
-  }
-  const [firstCheck, ...rest] = ranges
-  return Checker.parse(firstCheck).and(...rest)
-}
-
-/**
- * Used to create a checker that will `or` all the ranges passed in
- * @param ranges
- * @returns
- */
-export function rangeOr(...ranges: (string | Checker)[]): Checker {
-  if (ranges.length === 0) {
-    throw new Error("No ranges given")
-  }
-  const [firstCheck, ...rest] = ranges
-  return Checker.parse(firstCheck).or(...rest)
-}
-
-/**
- * This will negate the checker, so given a checker that checks for >= 1.0.0, it will check for < 1.0.0
- * @param range
- * @returns
- */
-export function notRange(range: string | Checker): Checker {
-  return rangeOf(range).not()
-}
-
-/**
- * EmVer is a set of versioning of any pattern like 1 or 1.2 or 1.2.3 or 1.2.3.4 or ..
- */
-export class EmVer {
-  /**
-   * Convert the range, should be 1.2.* or * into a emver
-   * Or an already made emver
-   * IsUnsafe
-   */
-  static from(range: string | EmVer): EmVer {
-    if (range instanceof EmVer) {
-      return range
-    }
-    return EmVer.parse(range)
-  }
-  /**
-   * Convert the range, should be 1.2.* or * into a emver
-   * IsUnsafe
-   */
-  static parse(rangeExtra: string): EmVer {
-    const [range, extra] = rangeExtra.split("-")
-    const values = range.split(".").map((x) => parseInt(x))
-    for (const value of values) {
-      if (isNaN(value)) {
-        throw new Error(`Couldn't parse range: ${range}`)
-      }
-    }
-    return new EmVer(values, extra)
-  }
-  private constructor(
-    public readonly values: number[],
-    readonly extra: string | null,
-  ) {}
-
-  /**
-   * Used when we need a new emver that has the last number incremented, used in the 1.* like things
-   */
-  public withLastIncremented() {
-    return new EmVer(incrementLastNumber(this.values), null)
-  }
-
-  public greaterThan(other: EmVer): boolean {
-    for (const i in this.values) {
-      if (other.values[i] == null) {
-        return true
-      }
-      if (this.values[i] > other.values[i]) {
-        return true
-      }
-
-      if (this.values[i] < other.values[i]) {
-        return false
-      }
-    }
-    return false
-  }
-
-  public equals(other: EmVer): boolean {
-    if (other.values.length !== this.values.length) {
-      return false
-    }
-    for (const i in this.values) {
-      if (this.values[i] !== other.values[i]) {
-        return false
-      }
-    }
-    return true
-  }
-  public greaterThanOrEqual(other: EmVer): boolean {
-    return this.greaterThan(other) || this.equals(other)
-  }
-  public lessThanOrEqual(other: EmVer): boolean {
-    return !this.greaterThan(other)
-  }
-  public lessThan(other: EmVer): boolean {
-    return !this.greaterThanOrEqual(other)
-  }
-  /**
-   * Return a enum string that describes (used for switching/iffs)
-   * to know comparison
-   * @param other
-   * @returns
-   */
-  public compare(other: EmVer) {
-    if (this.equals(other)) {
-      return "equal" as const
-    } else if (this.greaterThan(other)) {
-      return "greater" as const
-    } else {
-      return "less" as const
-    }
-  }
-  /**
-   * Used when sorting emver's in a list using the sort method
-   * @param other
-   * @returns
-   */
-  public compareForSort(other: EmVer) {
-    return matches
-      .matches(this.compare(other))
-      .when("equal", () => 0 as const)
-      .when("greater", () => 1 as const)
-      .when("less", () => -1 as const)
-      .unwrap()
-  }
-
-  toString() {
-    return `${this.values.join(".")}${this.extra ? `-${this.extra}` : ""}` as ValidEmVer
-  }
-}
-
-/**
- * A checker is a function that takes a version and returns true if the version matches the checker.
- * Used when we are doing range checking, like saying ">=1.0.0".check("1.2.3") will be true
- */
-export class Checker {
-  /**
-   * Will take in a range, like `>1.2` or `<1.2.3.4` or `=1.2` or `1.*`
-   * and return a checker, that has the check function for checking that a version is in the valid
-   * @param range
-   * @returns
-   */
-  static parse(range: string | Checker): Checker {
-    if (range instanceof Checker) {
-      return range
-    }
-    range = range.trim()
-    if (range.indexOf("||") !== -1) {
-      return rangeOr(...range.split("||").map((x) => Checker.parse(x)))
-    }
-    if (range.indexOf("&&") !== -1) {
-      return rangeAnd(...range.split("&&").map((x) => Checker.parse(x)))
-    }
-    if (range === "*") {
-      return new Checker((version) => {
-        EmVer.from(version)
-        return true
-      }, range)
-    }
-    if (range.startsWith("!!")) return Checker.parse(range.substring(2))
-    if (range.startsWith("!")) {
-      const tempValue = Checker.parse(range.substring(1))
-      return new Checker((x) => !tempValue.check(x), range)
-    }
-    const starSubMatches = starSub.exec(range)
-    if (starSubMatches != null) {
-      const emVarLower = EmVer.parse(starSubMatches[1])
-      const emVarUpper = emVarLower.withLastIncremented()
-
-      return new Checker((version) => {
-        const v = EmVer.from(version)
-        return (
-          (v.greaterThan(emVarLower) || v.equals(emVarLower)) &&
-          !v.greaterThan(emVarUpper) &&
-          !v.equals(emVarUpper)
-        )
-      }, range)
-    }
-
-    switch (range.substring(0, 2)) {
-      case ">=": {
-        const emVar = EmVer.parse(range.substring(2))
-        return new Checker((version) => {
-          const v = EmVer.from(version)
-          return v.greaterThanOrEqual(emVar)
-        }, range)
-      }
-      case "<=": {
-        const emVar = EmVer.parse(range.substring(2))
-        return new Checker((version) => {
-          const v = EmVer.from(version)
-          return v.lessThanOrEqual(emVar)
-        }, range)
-      }
-    }
-
-    switch (range.substring(0, 1)) {
-      case ">": {
-        const emVar = EmVer.parse(range.substring(1))
-        return new Checker((version) => {
-          const v = EmVer.from(version)
-          return v.greaterThan(emVar)
-        }, range)
-      }
-      case "<": {
-        const emVar = EmVer.parse(range.substring(1))
-        return new Checker((version) => {
-          const v = EmVer.from(version)
-          return v.lessThan(emVar)
-        }, range)
-      }
-      case "=": {
-        const emVar = EmVer.parse(range.substring(1))
-        return new Checker((version) => {
-          const v = EmVer.from(version)
-          return v.equals(emVar)
-        }, `=${emVar.toString()}`)
-      }
-    }
-    throw new Error("Couldn't parse range: " + range)
-  }
-  constructor(
-    /**
-     * Check is the function that will be given a emver or unparsed emver and should give if it follows
-     * a pattern
-     */
-    public readonly check: (value: ValidEmVer | EmVer) => boolean,
-    private readonly _range: string,
-  ) {}
-
-  get range() {
-    return this._range as ValidEmVerRange
-  }
-
-  /**
-   * Used when we want the `and` condition with another checker
-   */
-  public and(...others: (Checker | string)[]): Checker {
-    const othersCheck = others.map(Checker.parse)
-    return new Checker(
-      (value) => {
-        if (!this.check(value)) {
-          return false
-        }
-        for (const other of othersCheck) {
-          if (!other.check(value)) {
-            return false
-          }
-        }
-        return true
-      },
-      othersCheck.map((x) => x._range).join(" && "),
-    )
-  }
-
-  /**
-   * Used when we want the `or` condition with another checker
-   */
-  public or(...others: (Checker | string)[]): Checker {
-    const othersCheck = others.map(Checker.parse)
-    return new Checker(
-      (value) => {
-        if (this.check(value)) {
-          return true
-        }
-        for (const other of othersCheck) {
-          if (other.check(value)) {
-            return true
-          }
-        }
-        return false
-      },
-      othersCheck.map((x) => x._range).join(" || "),
-    )
-  }
-
-  /**
-   * A useful example is making sure we don't match an exact version, like !=1.2.3
-   * @returns
-   */
-  public not(): Checker {
-    let newRange = `!${this._range}`
-    return Checker.parse(newRange)
-  }
-}
diff --git a/sdk/lib/exver/exver.pegjs b/sdk/lib/exver/exver.pegjs
new file mode 100644
index 000000000..3045b9224
--- /dev/null
+++ b/sdk/lib/exver/exver.pegjs
@@ -0,0 +1,99 @@
+// #flavor:0.1.2-beta.1:0
+// !( >=1:1 && <= 2:2)
+
+VersionRange
+  = first:VersionRangeAtom rest:(_ ((Or / And) _)? VersionRangeAtom)*
+
+Or = "||"
+
+And = "&&"
+
+VersionRangeAtom
+  = Parens
+  / Anchor
+  / Not
+  / Any
+  / None
+
+Parens
+  = "(" _ expr:VersionRange _ ")" { return { type: "Parens", expr } }
+
+Anchor
+  = operator:CmpOp? _ version:VersionSpec { return { type: "Anchor", operator, version } }
+
+VersionSpec
+  = flavor:Flavor? upstream:Version downstream:( ":" Version )? { return { flavor: flavor || null, upstream, downstream: downstream ? downstream[1] : { number: [0], prerelease: [] } } }
+
+Not = "!" _ value:VersionRangeAtom { return { type: "Not", value: value }}
+
+Any = "*" { return { type: "Any" } }
+
+None = "!" { return { type: "None" } }
+
+CmpOp 
+  = ">=" { return ">="; }
+  / "<=" { return "<="; }
+  / ">" { return ">"; }
+  / "<" { return "<"; }
+  / "=" { return "="; }
+  / "!=" { return "!="; }
+  / "^" { return "^"; }
+  / "~" { return "~"; }
+
+ExtendedVersion
+  = flavor:Flavor? upstream:Version ":" downstream:Version {
+    return { flavor: flavor || null, upstream, downstream }
+  }
+
+EmVer
+  = major:Digit "." minor:Digit "." patch:Digit ("." revision:Digit)? {
+    return {
+      flavor: null,
+      upstream: {
+        number: [major, minor, patch],
+        prerelease: [],
+      },
+      downstream: {
+        number: [revision || 0],
+        prerelease: [],
+      },
+    }
+  }
+
+Flavor
+  = "#" flavor:Lowercase ":" { return flavor }
+
+Lowercase
+  = [a-z]+ { return text() }
+
+String
+  = [a-zA-Z]+ { return text(); }
+
+Version
+  = number:VersionNumber prerelease: PreRelease? {
+    return { 
+      number,
+      prerelease: prerelease || []
+    };
+  }
+
+PreRelease
+  = "-" first:PreReleaseSegment rest:("." PreReleaseSegment)* {
+    return [first].concat(rest.map(r => r[1]));
+  }
+
+PreReleaseSegment
+  = "."? segment:(Digit / String) {
+    return segment;
+  }
+
+VersionNumber
+  = first:Digit rest:("." Digit)* { 
+    return [first].concat(rest.map(r => r[1]));
+  }
+
+Digit
+  = [0-9]+ { return parseInt(text(), 10); }
+
+_ "whitespace"
+  = [ \t\n\r]*
\ No newline at end of file
diff --git a/sdk/lib/exver/exver.ts b/sdk/lib/exver/exver.ts
new file mode 100644
index 000000000..be9ea3e0e
--- /dev/null
+++ b/sdk/lib/exver/exver.ts
@@ -0,0 +1,2507 @@
+/* eslint-disable */
+
+
+
+const peggyParser: {parse: any, SyntaxError: any, DefaultTracer?: any} = // Generated by Peggy 3.0.2.
+//
+// https://peggyjs.org/
+// @ts-ignore
+(function() {
+// @ts-ignore
+  "use strict";
+
+// @ts-ignore
+function peg$subclass(child, parent) {
+// @ts-ignore
+  function C() { this.constructor = child; }
+// @ts-ignore
+  C.prototype = parent.prototype;
+// @ts-ignore
+  child.prototype = new C();
+}
+
+// @ts-ignore
+function peg$SyntaxError(message, expected, found, location) {
+// @ts-ignore
+  var self = Error.call(this, message);
+  // istanbul ignore next Check is a necessary evil to support older environments
+// @ts-ignore
+  if (Object.setPrototypeOf) {
+// @ts-ignore
+    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
+  }
+// @ts-ignore
+  self.expected = expected;
+// @ts-ignore
+  self.found = found;
+// @ts-ignore
+  self.location = location;
+// @ts-ignore
+  self.name = "SyntaxError";
+// @ts-ignore
+  return self;
+}
+
+// @ts-ignore
+peg$subclass(peg$SyntaxError, Error);
+
+// @ts-ignore
+function peg$padEnd(str, targetLength, padString) {
+// @ts-ignore
+  padString = padString || " ";
+// @ts-ignore
+  if (str.length > targetLength) { return str; }
+// @ts-ignore
+  targetLength -= str.length;
+// @ts-ignore
+  padString += padString.repeat(targetLength);
+// @ts-ignore
+  return str + padString.slice(0, targetLength);
+}
+
+// @ts-ignore
+peg$SyntaxError.prototype.format = function(sources) {
+// @ts-ignore
+  var str = "Error: " + this.message;
+// @ts-ignore
+  if (this.location) {
+// @ts-ignore
+    var src = null;
+// @ts-ignore
+    var k;
+// @ts-ignore
+    for (k = 0; k < sources.length; k++) {
+// @ts-ignore
+      if (sources[k].source === this.location.source) {
+// @ts-ignore
+        src = sources[k].text.split(/\r\n|\n|\r/g);
+// @ts-ignore
+        break;
+      }
+    }
+// @ts-ignore
+    var s = this.location.start;
+// @ts-ignore
+    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+// @ts-ignore
+      ? this.location.source.offset(s)
+// @ts-ignore
+      : s;
+// @ts-ignore
+    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+// @ts-ignore
+    if (src) {
+// @ts-ignore
+      var e = this.location.end;
+// @ts-ignore
+      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
+// @ts-ignore
+      var line = src[s.line - 1];
+// @ts-ignore
+      var last = s.line === e.line ? e.column : line.length + 1;
+// @ts-ignore
+      var hatLen = (last - s.column) || 1;
+// @ts-ignore
+      str += "\n --> " + loc + "\n"
+// @ts-ignore
+          + filler + " |\n"
+// @ts-ignore
+          + offset_s.line + " | " + line + "\n"
+// @ts-ignore
+          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
+// @ts-ignore
+          + peg$padEnd("", hatLen, "^");
+// @ts-ignore
+    } else {
+// @ts-ignore
+      str += "\n at " + loc;
+    }
+  }
+// @ts-ignore
+  return str;
+};
+
+// @ts-ignore
+peg$SyntaxError.buildMessage = function(expected, found) {
+// @ts-ignore
+  var DESCRIBE_EXPECTATION_FNS = {
+// @ts-ignore
+    literal: function(expectation) {
+// @ts-ignore
+      return "\"" + literalEscape(expectation.text) + "\"";
+    },
+
+// @ts-ignore
+    class: function(expectation) {
+// @ts-ignore
+      var escapedParts = expectation.parts.map(function(part) {
+// @ts-ignore
+        return Array.isArray(part)
+// @ts-ignore
+          ? classEscape(part[0]) + "-" + classEscape(part[1])
+// @ts-ignore
+          : classEscape(part);
+      });
+
+// @ts-ignore
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
+    },
+
+// @ts-ignore
+    any: function() {
+// @ts-ignore
+      return "any character";
+    },
+
+// @ts-ignore
+    end: function() {
+// @ts-ignore
+      return "end of input";
+    },
+
+// @ts-ignore
+    other: function(expectation) {
+// @ts-ignore
+      return expectation.description;
+    }
+  };
+
+// @ts-ignore
+  function hex(ch) {
+// @ts-ignore
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
+
+// @ts-ignore
+  function literalEscape(s) {
+// @ts-ignore
+    return s
+// @ts-ignore
+      .replace(/\\/g, "\\\\")
+// @ts-ignore
+      .replace(/"/g,  "\\\"")
+// @ts-ignore
+      .replace(/\0/g, "\\0")
+// @ts-ignore
+      .replace(/\t/g, "\\t")
+// @ts-ignore
+      .replace(/\n/g, "\\n")
+// @ts-ignore
+      .replace(/\r/g, "\\r")
+// @ts-ignore
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+// @ts-ignore
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
+
+// @ts-ignore
+  function classEscape(s) {
+// @ts-ignore
+    return s
+// @ts-ignore
+      .replace(/\\/g, "\\\\")
+// @ts-ignore
+      .replace(/\]/g, "\\]")
+// @ts-ignore
+      .replace(/\^/g, "\\^")
+// @ts-ignore
+      .replace(/-/g,  "\\-")
+// @ts-ignore
+      .replace(/\0/g, "\\0")
+// @ts-ignore
+      .replace(/\t/g, "\\t")
+// @ts-ignore
+      .replace(/\n/g, "\\n")
+// @ts-ignore
+      .replace(/\r/g, "\\r")
+// @ts-ignore
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+// @ts-ignore
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
+
+// @ts-ignore
+  function describeExpectation(expectation) {
+// @ts-ignore
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
+
+// @ts-ignore
+  function describeExpected(expected) {
+// @ts-ignore
+    var descriptions = expected.map(describeExpectation);
+// @ts-ignore
+    var i, j;
+
+// @ts-ignore
+    descriptions.sort();
+
+// @ts-ignore
+    if (descriptions.length > 0) {
+// @ts-ignore
+      for (i = 1, j = 1; i < descriptions.length; i++) {
+// @ts-ignore
+        if (descriptions[i - 1] !== descriptions[i]) {
+// @ts-ignore
+          descriptions[j] = descriptions[i];
+// @ts-ignore
+          j++;
+        }
+      }
+// @ts-ignore
+      descriptions.length = j;
+    }
+
+// @ts-ignore
+    switch (descriptions.length) {
+// @ts-ignore
+      case 1:
+// @ts-ignore
+        return descriptions[0];
+
+// @ts-ignore
+      case 2:
+// @ts-ignore
+        return descriptions[0] + " or " + descriptions[1];
+
+// @ts-ignore
+      default:
+// @ts-ignore
+        return descriptions.slice(0, -1).join(", ")
+// @ts-ignore
+          + ", or "
+// @ts-ignore
+          + descriptions[descriptions.length - 1];
+    }
+  }
+
+// @ts-ignore
+  function describeFound(found) {
+// @ts-ignore
+    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+  }
+
+// @ts-ignore
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
+
+// @ts-ignore
+function peg$parse(input, options) {
+// @ts-ignore
+  options = options !== undefined ? options : {};
+
+// @ts-ignore
+  var peg$FAILED = {};
+// @ts-ignore
+  var peg$source = options.grammarSource;
+
+// @ts-ignore
+  var peg$startRuleFunctions = { VersionRange: peg$parseVersionRange, Or: peg$parseOr, And: peg$parseAnd, VersionRangeAtom: peg$parseVersionRangeAtom, Parens: peg$parseParens, Anchor: peg$parseAnchor, VersionSpec: peg$parseVersionSpec, Not: peg$parseNot, Any: peg$parseAny, None: peg$parseNone, CmpOp: peg$parseCmpOp, ExtendedVersion: peg$parseExtendedVersion, EmVer: peg$parseEmVer, Flavor: peg$parseFlavor, Lowercase: peg$parseLowercase, String: peg$parseString, Version: peg$parseVersion, PreRelease: peg$parsePreRelease, PreReleaseSegment: peg$parsePreReleaseSegment, VersionNumber: peg$parseVersionNumber, Digit: peg$parseDigit, _: peg$parse_ };
+// @ts-ignore
+  var peg$startRuleFunction = peg$parseVersionRange;
+
+// @ts-ignore
+  var peg$c0 = "||";
+  var peg$c1 = "&&";
+  var peg$c2 = "(";
+  var peg$c3 = ")";
+  var peg$c4 = ":";
+  var peg$c5 = "!";
+  var peg$c6 = "*";
+  var peg$c7 = ">=";
+  var peg$c8 = "<=";
+  var peg$c9 = ">";
+  var peg$c10 = "<";
+  var peg$c11 = "=";
+  var peg$c12 = "!=";
+  var peg$c13 = "^";
+  var peg$c14 = "~";
+  var peg$c15 = ".";
+  var peg$c16 = "#";
+  var peg$c17 = "-";
+
+  var peg$r0 = /^[a-z]/;
+  var peg$r1 = /^[a-zA-Z]/;
+  var peg$r2 = /^[0-9]/;
+  var peg$r3 = /^[ \t\n\r]/;
+
+  var peg$e0 = peg$literalExpectation("||", false);
+  var peg$e1 = peg$literalExpectation("&&", false);
+  var peg$e2 = peg$literalExpectation("(", false);
+  var peg$e3 = peg$literalExpectation(")", false);
+  var peg$e4 = peg$literalExpectation(":", false);
+  var peg$e5 = peg$literalExpectation("!", false);
+  var peg$e6 = peg$literalExpectation("*", false);
+  var peg$e7 = peg$literalExpectation(">=", false);
+  var peg$e8 = peg$literalExpectation("<=", false);
+  var peg$e9 = peg$literalExpectation(">", false);
+  var peg$e10 = peg$literalExpectation("<", false);
+  var peg$e11 = peg$literalExpectation("=", false);
+  var peg$e12 = peg$literalExpectation("!=", false);
+  var peg$e13 = peg$literalExpectation("^", false);
+  var peg$e14 = peg$literalExpectation("~", false);
+  var peg$e15 = peg$literalExpectation(".", false);
+  var peg$e16 = peg$literalExpectation("#", false);
+  var peg$e17 = peg$classExpectation([["a", "z"]], false, false);
+  var peg$e18 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
+  var peg$e19 = peg$literalExpectation("-", false);
+  var peg$e20 = peg$classExpectation([["0", "9"]], false, false);
+  var peg$e21 = peg$otherExpectation("whitespace");
+  var peg$e22 = peg$classExpectation([" ", "\t", "\n", "\r"], false, false);
+// @ts-ignore
+
+  var peg$f0 = function(expr) {// @ts-ignore
+ return { type: "Parens", expr } };// @ts-ignore
+
+  var peg$f1 = function(operator, version) {// @ts-ignore
+ return { type: "Anchor", operator, version } };// @ts-ignore
+
+  var peg$f2 = function(flavor, upstream, downstream) {// @ts-ignore
+ return { flavor: flavor || null, upstream, downstream: downstream ? downstream[1] : { number: [0], prerelease: [] } } };// @ts-ignore
+
+  var peg$f3 = function(value) {// @ts-ignore
+ return { type: "Not", value: value }};// @ts-ignore
+
+  var peg$f4 = function() {// @ts-ignore
+ return { type: "Any" } };// @ts-ignore
+
+  var peg$f5 = function() {// @ts-ignore
+ return { type: "None" } };// @ts-ignore
+
+  var peg$f6 = function() {// @ts-ignore
+ return ">="; };// @ts-ignore
+
+  var peg$f7 = function() {// @ts-ignore
+ return "<="; };// @ts-ignore
+
+  var peg$f8 = function() {// @ts-ignore
+ return ">"; };// @ts-ignore
+
+  var peg$f9 = function() {// @ts-ignore
+ return "<"; };// @ts-ignore
+
+  var peg$f10 = function() {// @ts-ignore
+ return "="; };// @ts-ignore
+
+  var peg$f11 = function() {// @ts-ignore
+ return "!="; };// @ts-ignore
+
+  var peg$f12 = function() {// @ts-ignore
+ return "^"; };// @ts-ignore
+
+  var peg$f13 = function() {// @ts-ignore
+ return "~"; };// @ts-ignore
+
+  var peg$f14 = function(flavor, upstream, downstream) {
+// @ts-ignore
+    return { flavor: flavor || null, upstream, downstream }
+  };// @ts-ignore
+
+  var peg$f15 = function(major, minor, patch) {
+// @ts-ignore
+    return {
+// @ts-ignore
+      flavor: null,
+// @ts-ignore
+      upstream: {
+// @ts-ignore
+        number: [major, minor, patch],
+// @ts-ignore
+        prerelease: [],
+      },
+// @ts-ignore
+      downstream: {
+// @ts-ignore
+        number: [revision || 0],
+// @ts-ignore
+        prerelease: [],
+      },
+    }
+  };// @ts-ignore
+
+  var peg$f16 = function(flavor) {// @ts-ignore
+ return flavor };// @ts-ignore
+
+  var peg$f17 = function() {// @ts-ignore
+ return text() };// @ts-ignore
+
+  var peg$f18 = function() {// @ts-ignore
+ return text(); };// @ts-ignore
+
+  var peg$f19 = function(number, prerelease) {
+// @ts-ignore
+    return { 
+// @ts-ignore
+      number,
+// @ts-ignore
+      prerelease: prerelease || []
+    };
+  };// @ts-ignore
+
+  var peg$f20 = function(first, rest) {
+// @ts-ignore
+    return [first].concat(rest.map(r => r[1]));
+  };// @ts-ignore
+
+  var peg$f21 = function(segment) {
+// @ts-ignore
+    return segment;
+  };// @ts-ignore
+
+  var peg$f22 = function(first, rest) { 
+// @ts-ignore
+    return [first].concat(rest.map(r => r[1]));
+  };// @ts-ignore
+
+  var peg$f23 = function() {// @ts-ignore
+ return parseInt(text(), 10); };
+// @ts-ignore
+  var peg$currPos = 0;
+// @ts-ignore
+  var peg$savedPos = 0;
+// @ts-ignore
+  var peg$posDetailsCache = [{ line: 1, column: 1 }];
+// @ts-ignore
+  var peg$maxFailPos = 0;
+// @ts-ignore
+  var peg$maxFailExpected = [];
+// @ts-ignore
+  var peg$silentFails = 0;
+
+// @ts-ignore
+  var peg$result;
+
+// @ts-ignore
+  if ("startRule" in options) {
+// @ts-ignore
+    if (!(options.startRule in peg$startRuleFunctions)) {
+// @ts-ignore
+      throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
+    }
+
+// @ts-ignore
+    peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
+  }
+
+// @ts-ignore
+  function text() {
+// @ts-ignore
+    return input.substring(peg$savedPos, peg$currPos);
+  }
+
+// @ts-ignore
+  function offset() {
+// @ts-ignore
+    return peg$savedPos;
+  }
+
+// @ts-ignore
+  function range() {
+// @ts-ignore
+    return {
+// @ts-ignore
+      source: peg$source,
+// @ts-ignore
+      start: peg$savedPos,
+// @ts-ignore
+      end: peg$currPos
+    };
+  }
+
+// @ts-ignore
+  function location() {
+// @ts-ignore
+    return peg$computeLocation(peg$savedPos, peg$currPos);
+  }
+
+// @ts-ignore
+  function expected(description, location) {
+// @ts-ignore
+    location = location !== undefined
+// @ts-ignore
+      ? location
+// @ts-ignore
+      : peg$computeLocation(peg$savedPos, peg$currPos);
+
+// @ts-ignore
+    throw peg$buildStructuredError(
+// @ts-ignore
+      [peg$otherExpectation(description)],
+// @ts-ignore
+      input.substring(peg$savedPos, peg$currPos),
+// @ts-ignore
+      location
+    );
+  }
+
+// @ts-ignore
+  function error(message, location) {
+// @ts-ignore
+    location = location !== undefined
+// @ts-ignore
+      ? location
+// @ts-ignore
+      : peg$computeLocation(peg$savedPos, peg$currPos);
+
+// @ts-ignore
+    throw peg$buildSimpleError(message, location);
+  }
+
+// @ts-ignore
+  function peg$literalExpectation(text, ignoreCase) {
+// @ts-ignore
+    return { type: "literal", text: text, ignoreCase: ignoreCase };
+  }
+
+// @ts-ignore
+  function peg$classExpectation(parts, inverted, ignoreCase) {
+// @ts-ignore
+    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  }
+
+// @ts-ignore
+  function peg$anyExpectation() {
+// @ts-ignore
+    return { type: "any" };
+  }
+
+// @ts-ignore
+  function peg$endExpectation() {
+// @ts-ignore
+    return { type: "end" };
+  }
+
+// @ts-ignore
+  function peg$otherExpectation(description) {
+// @ts-ignore
+    return { type: "other", description: description };
+  }
+
+// @ts-ignore
+  function peg$computePosDetails(pos) {
+// @ts-ignore
+    var details = peg$posDetailsCache[pos];
+// @ts-ignore
+    var p;
+
+// @ts-ignore
+    if (details) {
+// @ts-ignore
+      return details;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      p = pos - 1;
+// @ts-ignore
+      while (!peg$posDetailsCache[p]) {
+// @ts-ignore
+        p--;
+      }
+
+// @ts-ignore
+      details = peg$posDetailsCache[p];
+// @ts-ignore
+      details = {
+// @ts-ignore
+        line: details.line,
+// @ts-ignore
+        column: details.column
+      };
+
+// @ts-ignore
+      while (p < pos) {
+// @ts-ignore
+        if (input.charCodeAt(p) === 10) {
+// @ts-ignore
+          details.line++;
+// @ts-ignore
+          details.column = 1;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          details.column++;
+        }
+
+// @ts-ignore
+        p++;
+      }
+
+// @ts-ignore
+      peg$posDetailsCache[pos] = details;
+
+// @ts-ignore
+      return details;
+    }
+  }
+
+// @ts-ignore
+  function peg$computeLocation(startPos, endPos, offset) {
+// @ts-ignore
+    var startPosDetails = peg$computePosDetails(startPos);
+// @ts-ignore
+    var endPosDetails = peg$computePosDetails(endPos);
+
+// @ts-ignore
+    var res = {
+// @ts-ignore
+      source: peg$source,
+// @ts-ignore
+      start: {
+// @ts-ignore
+        offset: startPos,
+// @ts-ignore
+        line: startPosDetails.line,
+// @ts-ignore
+        column: startPosDetails.column
+      },
+// @ts-ignore
+      end: {
+// @ts-ignore
+        offset: endPos,
+// @ts-ignore
+        line: endPosDetails.line,
+// @ts-ignore
+        column: endPosDetails.column
+      }
+    };
+// @ts-ignore
+    if (offset && peg$source && (typeof peg$source.offset === "function")) {
+// @ts-ignore
+      res.start = peg$source.offset(res.start);
+// @ts-ignore
+      res.end = peg$source.offset(res.end);
+    }
+// @ts-ignore
+    return res;
+  }
+
+// @ts-ignore
+  function peg$fail(expected) {
+// @ts-ignore
+    if (peg$currPos < peg$maxFailPos) { return; }
+
+// @ts-ignore
+    if (peg$currPos > peg$maxFailPos) {
+// @ts-ignore
+      peg$maxFailPos = peg$currPos;
+// @ts-ignore
+      peg$maxFailExpected = [];
+    }
+
+// @ts-ignore
+    peg$maxFailExpected.push(expected);
+  }
+
+// @ts-ignore
+  function peg$buildSimpleError(message, location) {
+// @ts-ignore
+    return new peg$SyntaxError(message, null, null, location);
+  }
+
+// @ts-ignore
+  function peg$buildStructuredError(expected, found, location) {
+// @ts-ignore
+    return new peg$SyntaxError(
+// @ts-ignore
+      peg$SyntaxError.buildMessage(expected, found),
+// @ts-ignore
+      expected,
+// @ts-ignore
+      found,
+// @ts-ignore
+      location
+    );
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseVersionRange() {
+// @ts-ignore
+    var s0, s1, s2, s3, s4, s5, s6, s7;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = peg$parseVersionRangeAtom();
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      s2 = [];
+// @ts-ignore
+      s3 = peg$currPos;
+// @ts-ignore
+      s4 = peg$parse_();
+// @ts-ignore
+      s5 = peg$currPos;
+// @ts-ignore
+      s6 = peg$parseOr();
+// @ts-ignore
+      if (s6 === peg$FAILED) {
+// @ts-ignore
+        s6 = peg$parseAnd();
+      }
+// @ts-ignore
+      if (s6 !== peg$FAILED) {
+// @ts-ignore
+        s7 = peg$parse_();
+// @ts-ignore
+        s6 = [s6, s7];
+// @ts-ignore
+        s5 = s6;
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s5;
+// @ts-ignore
+        s5 = peg$FAILED;
+      }
+// @ts-ignore
+      if (s5 === peg$FAILED) {
+// @ts-ignore
+        s5 = null;
+      }
+// @ts-ignore
+      s6 = peg$parseVersionRangeAtom();
+// @ts-ignore
+      if (s6 !== peg$FAILED) {
+// @ts-ignore
+        s4 = [s4, s5, s6];
+// @ts-ignore
+        s3 = s4;
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s3;
+// @ts-ignore
+        s3 = peg$FAILED;
+      }
+// @ts-ignore
+      while (s3 !== peg$FAILED) {
+// @ts-ignore
+        s2.push(s3);
+// @ts-ignore
+        s3 = peg$currPos;
+// @ts-ignore
+        s4 = peg$parse_();
+// @ts-ignore
+        s5 = peg$currPos;
+// @ts-ignore
+        s6 = peg$parseOr();
+// @ts-ignore
+        if (s6 === peg$FAILED) {
+// @ts-ignore
+          s6 = peg$parseAnd();
+        }
+// @ts-ignore
+        if (s6 !== peg$FAILED) {
+// @ts-ignore
+          s7 = peg$parse_();
+// @ts-ignore
+          s6 = [s6, s7];
+// @ts-ignore
+          s5 = s6;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s5;
+// @ts-ignore
+          s5 = peg$FAILED;
+        }
+// @ts-ignore
+        if (s5 === peg$FAILED) {
+// @ts-ignore
+          s5 = null;
+        }
+// @ts-ignore
+        s6 = peg$parseVersionRangeAtom();
+// @ts-ignore
+        if (s6 !== peg$FAILED) {
+// @ts-ignore
+          s4 = [s4, s5, s6];
+// @ts-ignore
+          s3 = s4;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s3;
+// @ts-ignore
+          s3 = peg$FAILED;
+        }
+      }
+// @ts-ignore
+      s1 = [s1, s2];
+// @ts-ignore
+      s0 = s1;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseOr() {
+// @ts-ignore
+    var s0;
+
+// @ts-ignore
+    if (input.substr(peg$currPos, 2) === peg$c0) {
+// @ts-ignore
+      s0 = peg$c0;
+// @ts-ignore
+      peg$currPos += 2;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s0 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseAnd() {
+// @ts-ignore
+    var s0;
+
+// @ts-ignore
+    if (input.substr(peg$currPos, 2) === peg$c1) {
+// @ts-ignore
+      s0 = peg$c1;
+// @ts-ignore
+      peg$currPos += 2;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s0 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e1); }
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseVersionRangeAtom() {
+// @ts-ignore
+    var s0;
+
+// @ts-ignore
+    s0 = peg$parseParens();
+// @ts-ignore
+    if (s0 === peg$FAILED) {
+// @ts-ignore
+      s0 = peg$parseAnchor();
+// @ts-ignore
+      if (s0 === peg$FAILED) {
+// @ts-ignore
+        s0 = peg$parseNot();
+// @ts-ignore
+        if (s0 === peg$FAILED) {
+// @ts-ignore
+          s0 = peg$parseAny();
+// @ts-ignore
+          if (s0 === peg$FAILED) {
+// @ts-ignore
+            s0 = peg$parseNone();
+          }
+        }
+      }
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseParens() {
+// @ts-ignore
+    var s0, s1, s2, s3, s4, s5;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    if (input.charCodeAt(peg$currPos) === 40) {
+// @ts-ignore
+      s1 = peg$c2;
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e2); }
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      s2 = peg$parse_();
+// @ts-ignore
+      s3 = peg$parseVersionRange();
+// @ts-ignore
+      if (s3 !== peg$FAILED) {
+// @ts-ignore
+        s4 = peg$parse_();
+// @ts-ignore
+        if (input.charCodeAt(peg$currPos) === 41) {
+// @ts-ignore
+          s5 = peg$c3;
+// @ts-ignore
+          peg$currPos++;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          s5 = peg$FAILED;
+// @ts-ignore
+          if (peg$silentFails === 0) { peg$fail(peg$e3); }
+        }
+// @ts-ignore
+        if (s5 !== peg$FAILED) {
+// @ts-ignore
+          peg$savedPos = s0;
+// @ts-ignore
+          s0 = peg$f0(s3);
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s0;
+// @ts-ignore
+          s0 = peg$FAILED;
+        }
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s0;
+// @ts-ignore
+        s0 = peg$FAILED;
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseAnchor() {
+// @ts-ignore
+    var s0, s1, s2, s3;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = peg$parseCmpOp();
+// @ts-ignore
+    if (s1 === peg$FAILED) {
+// @ts-ignore
+      s1 = null;
+    }
+// @ts-ignore
+    s2 = peg$parse_();
+// @ts-ignore
+    s3 = peg$parseVersionSpec();
+// @ts-ignore
+    if (s3 !== peg$FAILED) {
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s0 = peg$f1(s1, s3);
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseVersionSpec() {
+// @ts-ignore
+    var s0, s1, s2, s3, s4, s5;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = peg$parseFlavor();
+// @ts-ignore
+    if (s1 === peg$FAILED) {
+// @ts-ignore
+      s1 = null;
+    }
+// @ts-ignore
+    s2 = peg$parseVersion();
+// @ts-ignore
+    if (s2 !== peg$FAILED) {
+// @ts-ignore
+      s3 = peg$currPos;
+// @ts-ignore
+      if (input.charCodeAt(peg$currPos) === 58) {
+// @ts-ignore
+        s4 = peg$c4;
+// @ts-ignore
+        peg$currPos++;
+// @ts-ignore
+      } else {
+// @ts-ignore
+        s4 = peg$FAILED;
+// @ts-ignore
+        if (peg$silentFails === 0) { peg$fail(peg$e4); }
+      }
+// @ts-ignore
+      if (s4 !== peg$FAILED) {
+// @ts-ignore
+        s5 = peg$parseVersion();
+// @ts-ignore
+        if (s5 !== peg$FAILED) {
+// @ts-ignore
+          s4 = [s4, s5];
+// @ts-ignore
+          s3 = s4;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s3;
+// @ts-ignore
+          s3 = peg$FAILED;
+        }
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s3;
+// @ts-ignore
+        s3 = peg$FAILED;
+      }
+// @ts-ignore
+      if (s3 === peg$FAILED) {
+// @ts-ignore
+        s3 = null;
+      }
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s0 = peg$f2(s1, s2, s3);
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseNot() {
+// @ts-ignore
+    var s0, s1, s2, s3;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    if (input.charCodeAt(peg$currPos) === 33) {
+// @ts-ignore
+      s1 = peg$c5;
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e5); }
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      s2 = peg$parse_();
+// @ts-ignore
+      s3 = peg$parseVersionRangeAtom();
+// @ts-ignore
+      if (s3 !== peg$FAILED) {
+// @ts-ignore
+        peg$savedPos = s0;
+// @ts-ignore
+        s0 = peg$f3(s3);
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s0;
+// @ts-ignore
+        s0 = peg$FAILED;
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseAny() {
+// @ts-ignore
+    var s0, s1;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    if (input.charCodeAt(peg$currPos) === 42) {
+// @ts-ignore
+      s1 = peg$c6;
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e6); }
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s1 = peg$f4();
+    }
+// @ts-ignore
+    s0 = s1;
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseNone() {
+// @ts-ignore
+    var s0, s1;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    if (input.charCodeAt(peg$currPos) === 33) {
+// @ts-ignore
+      s1 = peg$c5;
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e5); }
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s1 = peg$f5();
+    }
+// @ts-ignore
+    s0 = s1;
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseCmpOp() {
+// @ts-ignore
+    var s0, s1;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    if (input.substr(peg$currPos, 2) === peg$c7) {
+// @ts-ignore
+      s1 = peg$c7;
+// @ts-ignore
+      peg$currPos += 2;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e7); }
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s1 = peg$f6();
+    }
+// @ts-ignore
+    s0 = s1;
+// @ts-ignore
+    if (s0 === peg$FAILED) {
+// @ts-ignore
+      s0 = peg$currPos;
+// @ts-ignore
+      if (input.substr(peg$currPos, 2) === peg$c8) {
+// @ts-ignore
+        s1 = peg$c8;
+// @ts-ignore
+        peg$currPos += 2;
+// @ts-ignore
+      } else {
+// @ts-ignore
+        s1 = peg$FAILED;
+// @ts-ignore
+        if (peg$silentFails === 0) { peg$fail(peg$e8); }
+      }
+// @ts-ignore
+      if (s1 !== peg$FAILED) {
+// @ts-ignore
+        peg$savedPos = s0;
+// @ts-ignore
+        s1 = peg$f7();
+      }
+// @ts-ignore
+      s0 = s1;
+// @ts-ignore
+      if (s0 === peg$FAILED) {
+// @ts-ignore
+        s0 = peg$currPos;
+// @ts-ignore
+        if (input.charCodeAt(peg$currPos) === 62) {
+// @ts-ignore
+          s1 = peg$c9;
+// @ts-ignore
+          peg$currPos++;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          s1 = peg$FAILED;
+// @ts-ignore
+          if (peg$silentFails === 0) { peg$fail(peg$e9); }
+        }
+// @ts-ignore
+        if (s1 !== peg$FAILED) {
+// @ts-ignore
+          peg$savedPos = s0;
+// @ts-ignore
+          s1 = peg$f8();
+        }
+// @ts-ignore
+        s0 = s1;
+// @ts-ignore
+        if (s0 === peg$FAILED) {
+// @ts-ignore
+          s0 = peg$currPos;
+// @ts-ignore
+          if (input.charCodeAt(peg$currPos) === 60) {
+// @ts-ignore
+            s1 = peg$c10;
+// @ts-ignore
+            peg$currPos++;
+// @ts-ignore
+          } else {
+// @ts-ignore
+            s1 = peg$FAILED;
+// @ts-ignore
+            if (peg$silentFails === 0) { peg$fail(peg$e10); }
+          }
+// @ts-ignore
+          if (s1 !== peg$FAILED) {
+// @ts-ignore
+            peg$savedPos = s0;
+// @ts-ignore
+            s1 = peg$f9();
+          }
+// @ts-ignore
+          s0 = s1;
+// @ts-ignore
+          if (s0 === peg$FAILED) {
+// @ts-ignore
+            s0 = peg$currPos;
+// @ts-ignore
+            if (input.charCodeAt(peg$currPos) === 61) {
+// @ts-ignore
+              s1 = peg$c11;
+// @ts-ignore
+              peg$currPos++;
+// @ts-ignore
+            } else {
+// @ts-ignore
+              s1 = peg$FAILED;
+// @ts-ignore
+              if (peg$silentFails === 0) { peg$fail(peg$e11); }
+            }
+// @ts-ignore
+            if (s1 !== peg$FAILED) {
+// @ts-ignore
+              peg$savedPos = s0;
+// @ts-ignore
+              s1 = peg$f10();
+            }
+// @ts-ignore
+            s0 = s1;
+// @ts-ignore
+            if (s0 === peg$FAILED) {
+// @ts-ignore
+              s0 = peg$currPos;
+// @ts-ignore
+              if (input.substr(peg$currPos, 2) === peg$c12) {
+// @ts-ignore
+                s1 = peg$c12;
+// @ts-ignore
+                peg$currPos += 2;
+// @ts-ignore
+              } else {
+// @ts-ignore
+                s1 = peg$FAILED;
+// @ts-ignore
+                if (peg$silentFails === 0) { peg$fail(peg$e12); }
+              }
+// @ts-ignore
+              if (s1 !== peg$FAILED) {
+// @ts-ignore
+                peg$savedPos = s0;
+// @ts-ignore
+                s1 = peg$f11();
+              }
+// @ts-ignore
+              s0 = s1;
+// @ts-ignore
+              if (s0 === peg$FAILED) {
+// @ts-ignore
+                s0 = peg$currPos;
+// @ts-ignore
+                if (input.charCodeAt(peg$currPos) === 94) {
+// @ts-ignore
+                  s1 = peg$c13;
+// @ts-ignore
+                  peg$currPos++;
+// @ts-ignore
+                } else {
+// @ts-ignore
+                  s1 = peg$FAILED;
+// @ts-ignore
+                  if (peg$silentFails === 0) { peg$fail(peg$e13); }
+                }
+// @ts-ignore
+                if (s1 !== peg$FAILED) {
+// @ts-ignore
+                  peg$savedPos = s0;
+// @ts-ignore
+                  s1 = peg$f12();
+                }
+// @ts-ignore
+                s0 = s1;
+// @ts-ignore
+                if (s0 === peg$FAILED) {
+// @ts-ignore
+                  s0 = peg$currPos;
+// @ts-ignore
+                  if (input.charCodeAt(peg$currPos) === 126) {
+// @ts-ignore
+                    s1 = peg$c14;
+// @ts-ignore
+                    peg$currPos++;
+// @ts-ignore
+                  } else {
+// @ts-ignore
+                    s1 = peg$FAILED;
+// @ts-ignore
+                    if (peg$silentFails === 0) { peg$fail(peg$e14); }
+                  }
+// @ts-ignore
+                  if (s1 !== peg$FAILED) {
+// @ts-ignore
+                    peg$savedPos = s0;
+// @ts-ignore
+                    s1 = peg$f13();
+                  }
+// @ts-ignore
+                  s0 = s1;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseExtendedVersion() {
+// @ts-ignore
+    var s0, s1, s2, s3, s4;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = peg$parseFlavor();
+// @ts-ignore
+    if (s1 === peg$FAILED) {
+// @ts-ignore
+      s1 = null;
+    }
+// @ts-ignore
+    s2 = peg$parseVersion();
+// @ts-ignore
+    if (s2 !== peg$FAILED) {
+// @ts-ignore
+      if (input.charCodeAt(peg$currPos) === 58) {
+// @ts-ignore
+        s3 = peg$c4;
+// @ts-ignore
+        peg$currPos++;
+// @ts-ignore
+      } else {
+// @ts-ignore
+        s3 = peg$FAILED;
+// @ts-ignore
+        if (peg$silentFails === 0) { peg$fail(peg$e4); }
+      }
+// @ts-ignore
+      if (s3 !== peg$FAILED) {
+// @ts-ignore
+        s4 = peg$parseVersion();
+// @ts-ignore
+        if (s4 !== peg$FAILED) {
+// @ts-ignore
+          peg$savedPos = s0;
+// @ts-ignore
+          s0 = peg$f14(s1, s2, s4);
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s0;
+// @ts-ignore
+          s0 = peg$FAILED;
+        }
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s0;
+// @ts-ignore
+        s0 = peg$FAILED;
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseEmVer() {
+// @ts-ignore
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = peg$parseDigit();
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      if (input.charCodeAt(peg$currPos) === 46) {
+// @ts-ignore
+        s2 = peg$c15;
+// @ts-ignore
+        peg$currPos++;
+// @ts-ignore
+      } else {
+// @ts-ignore
+        s2 = peg$FAILED;
+// @ts-ignore
+        if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      }
+// @ts-ignore
+      if (s2 !== peg$FAILED) {
+// @ts-ignore
+        s3 = peg$parseDigit();
+// @ts-ignore
+        if (s3 !== peg$FAILED) {
+// @ts-ignore
+          if (input.charCodeAt(peg$currPos) === 46) {
+// @ts-ignore
+            s4 = peg$c15;
+// @ts-ignore
+            peg$currPos++;
+// @ts-ignore
+          } else {
+// @ts-ignore
+            s4 = peg$FAILED;
+// @ts-ignore
+            if (peg$silentFails === 0) { peg$fail(peg$e15); }
+          }
+// @ts-ignore
+          if (s4 !== peg$FAILED) {
+// @ts-ignore
+            s5 = peg$parseDigit();
+// @ts-ignore
+            if (s5 !== peg$FAILED) {
+// @ts-ignore
+              s6 = peg$currPos;
+// @ts-ignore
+              if (input.charCodeAt(peg$currPos) === 46) {
+// @ts-ignore
+                s7 = peg$c15;
+// @ts-ignore
+                peg$currPos++;
+// @ts-ignore
+              } else {
+// @ts-ignore
+                s7 = peg$FAILED;
+// @ts-ignore
+                if (peg$silentFails === 0) { peg$fail(peg$e15); }
+              }
+// @ts-ignore
+              if (s7 !== peg$FAILED) {
+// @ts-ignore
+                s8 = peg$parseDigit();
+// @ts-ignore
+                if (s8 !== peg$FAILED) {
+// @ts-ignore
+                  s7 = [s7, s8];
+// @ts-ignore
+                  s6 = s7;
+// @ts-ignore
+                } else {
+// @ts-ignore
+                  peg$currPos = s6;
+// @ts-ignore
+                  s6 = peg$FAILED;
+                }
+// @ts-ignore
+              } else {
+// @ts-ignore
+                peg$currPos = s6;
+// @ts-ignore
+                s6 = peg$FAILED;
+              }
+// @ts-ignore
+              if (s6 === peg$FAILED) {
+// @ts-ignore
+                s6 = null;
+              }
+// @ts-ignore
+              peg$savedPos = s0;
+// @ts-ignore
+              s0 = peg$f15(s1, s3, s5);
+// @ts-ignore
+            } else {
+// @ts-ignore
+              peg$currPos = s0;
+// @ts-ignore
+              s0 = peg$FAILED;
+            }
+// @ts-ignore
+          } else {
+// @ts-ignore
+            peg$currPos = s0;
+// @ts-ignore
+            s0 = peg$FAILED;
+          }
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s0;
+// @ts-ignore
+          s0 = peg$FAILED;
+        }
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s0;
+// @ts-ignore
+        s0 = peg$FAILED;
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseFlavor() {
+// @ts-ignore
+    var s0, s1, s2, s3;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    if (input.charCodeAt(peg$currPos) === 35) {
+// @ts-ignore
+      s1 = peg$c16;
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e16); }
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      s2 = peg$parseLowercase();
+// @ts-ignore
+      if (s2 !== peg$FAILED) {
+// @ts-ignore
+        if (input.charCodeAt(peg$currPos) === 58) {
+// @ts-ignore
+          s3 = peg$c4;
+// @ts-ignore
+          peg$currPos++;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          s3 = peg$FAILED;
+// @ts-ignore
+          if (peg$silentFails === 0) { peg$fail(peg$e4); }
+        }
+// @ts-ignore
+        if (s3 !== peg$FAILED) {
+// @ts-ignore
+          peg$savedPos = s0;
+// @ts-ignore
+          s0 = peg$f16(s2);
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s0;
+// @ts-ignore
+          s0 = peg$FAILED;
+        }
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s0;
+// @ts-ignore
+        s0 = peg$FAILED;
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseLowercase() {
+// @ts-ignore
+    var s0, s1, s2;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = [];
+// @ts-ignore
+    if (peg$r0.test(input.charAt(peg$currPos))) {
+// @ts-ignore
+      s2 = input.charAt(peg$currPos);
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s2 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+    }
+// @ts-ignore
+    if (s2 !== peg$FAILED) {
+// @ts-ignore
+      while (s2 !== peg$FAILED) {
+// @ts-ignore
+        s1.push(s2);
+// @ts-ignore
+        if (peg$r0.test(input.charAt(peg$currPos))) {
+// @ts-ignore
+          s2 = input.charAt(peg$currPos);
+// @ts-ignore
+          peg$currPos++;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          s2 = peg$FAILED;
+// @ts-ignore
+          if (peg$silentFails === 0) { peg$fail(peg$e17); }
+        }
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s1 = peg$f17();
+    }
+// @ts-ignore
+    s0 = s1;
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseString() {
+// @ts-ignore
+    var s0, s1, s2;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = [];
+// @ts-ignore
+    if (peg$r1.test(input.charAt(peg$currPos))) {
+// @ts-ignore
+      s2 = input.charAt(peg$currPos);
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s2 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+    }
+// @ts-ignore
+    if (s2 !== peg$FAILED) {
+// @ts-ignore
+      while (s2 !== peg$FAILED) {
+// @ts-ignore
+        s1.push(s2);
+// @ts-ignore
+        if (peg$r1.test(input.charAt(peg$currPos))) {
+// @ts-ignore
+          s2 = input.charAt(peg$currPos);
+// @ts-ignore
+          peg$currPos++;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          s2 = peg$FAILED;
+// @ts-ignore
+          if (peg$silentFails === 0) { peg$fail(peg$e18); }
+        }
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s1 = peg$f18();
+    }
+// @ts-ignore
+    s0 = s1;
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseVersion() {
+// @ts-ignore
+    var s0, s1, s2;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = peg$parseVersionNumber();
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      s2 = peg$parsePreRelease();
+// @ts-ignore
+      if (s2 === peg$FAILED) {
+// @ts-ignore
+        s2 = null;
+      }
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s0 = peg$f19(s1, s2);
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parsePreRelease() {
+// @ts-ignore
+    var s0, s1, s2, s3, s4, s5, s6;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    if (input.charCodeAt(peg$currPos) === 45) {
+// @ts-ignore
+      s1 = peg$c17;
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      s2 = peg$parsePreReleaseSegment();
+// @ts-ignore
+      if (s2 !== peg$FAILED) {
+// @ts-ignore
+        s3 = [];
+// @ts-ignore
+        s4 = peg$currPos;
+// @ts-ignore
+        if (input.charCodeAt(peg$currPos) === 46) {
+// @ts-ignore
+          s5 = peg$c15;
+// @ts-ignore
+          peg$currPos++;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          s5 = peg$FAILED;
+// @ts-ignore
+          if (peg$silentFails === 0) { peg$fail(peg$e15); }
+        }
+// @ts-ignore
+        if (s5 !== peg$FAILED) {
+// @ts-ignore
+          s6 = peg$parsePreReleaseSegment();
+// @ts-ignore
+          if (s6 !== peg$FAILED) {
+// @ts-ignore
+            s5 = [s5, s6];
+// @ts-ignore
+            s4 = s5;
+// @ts-ignore
+          } else {
+// @ts-ignore
+            peg$currPos = s4;
+// @ts-ignore
+            s4 = peg$FAILED;
+          }
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s4;
+// @ts-ignore
+          s4 = peg$FAILED;
+        }
+// @ts-ignore
+        while (s4 !== peg$FAILED) {
+// @ts-ignore
+          s3.push(s4);
+// @ts-ignore
+          s4 = peg$currPos;
+// @ts-ignore
+          if (input.charCodeAt(peg$currPos) === 46) {
+// @ts-ignore
+            s5 = peg$c15;
+// @ts-ignore
+            peg$currPos++;
+// @ts-ignore
+          } else {
+// @ts-ignore
+            s5 = peg$FAILED;
+// @ts-ignore
+            if (peg$silentFails === 0) { peg$fail(peg$e15); }
+          }
+// @ts-ignore
+          if (s5 !== peg$FAILED) {
+// @ts-ignore
+            s6 = peg$parsePreReleaseSegment();
+// @ts-ignore
+            if (s6 !== peg$FAILED) {
+// @ts-ignore
+              s5 = [s5, s6];
+// @ts-ignore
+              s4 = s5;
+// @ts-ignore
+            } else {
+// @ts-ignore
+              peg$currPos = s4;
+// @ts-ignore
+              s4 = peg$FAILED;
+            }
+// @ts-ignore
+          } else {
+// @ts-ignore
+            peg$currPos = s4;
+// @ts-ignore
+            s4 = peg$FAILED;
+          }
+        }
+// @ts-ignore
+        peg$savedPos = s0;
+// @ts-ignore
+        s0 = peg$f20(s2, s3);
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s0;
+// @ts-ignore
+        s0 = peg$FAILED;
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parsePreReleaseSegment() {
+// @ts-ignore
+    var s0, s1, s2;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    if (input.charCodeAt(peg$currPos) === 46) {
+// @ts-ignore
+      s1 = peg$c15;
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+    }
+// @ts-ignore
+    if (s1 === peg$FAILED) {
+// @ts-ignore
+      s1 = null;
+    }
+// @ts-ignore
+    s2 = peg$parseDigit();
+// @ts-ignore
+    if (s2 === peg$FAILED) {
+// @ts-ignore
+      s2 = peg$parseString();
+    }
+// @ts-ignore
+    if (s2 !== peg$FAILED) {
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s0 = peg$f21(s2);
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseVersionNumber() {
+// @ts-ignore
+    var s0, s1, s2, s3, s4, s5;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = peg$parseDigit();
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      s2 = [];
+// @ts-ignore
+      s3 = peg$currPos;
+// @ts-ignore
+      if (input.charCodeAt(peg$currPos) === 46) {
+// @ts-ignore
+        s4 = peg$c15;
+// @ts-ignore
+        peg$currPos++;
+// @ts-ignore
+      } else {
+// @ts-ignore
+        s4 = peg$FAILED;
+// @ts-ignore
+        if (peg$silentFails === 0) { peg$fail(peg$e15); }
+      }
+// @ts-ignore
+      if (s4 !== peg$FAILED) {
+// @ts-ignore
+        s5 = peg$parseDigit();
+// @ts-ignore
+        if (s5 !== peg$FAILED) {
+// @ts-ignore
+          s4 = [s4, s5];
+// @ts-ignore
+          s3 = s4;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s3;
+// @ts-ignore
+          s3 = peg$FAILED;
+        }
+// @ts-ignore
+      } else {
+// @ts-ignore
+        peg$currPos = s3;
+// @ts-ignore
+        s3 = peg$FAILED;
+      }
+// @ts-ignore
+      while (s3 !== peg$FAILED) {
+// @ts-ignore
+        s2.push(s3);
+// @ts-ignore
+        s3 = peg$currPos;
+// @ts-ignore
+        if (input.charCodeAt(peg$currPos) === 46) {
+// @ts-ignore
+          s4 = peg$c15;
+// @ts-ignore
+          peg$currPos++;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          s4 = peg$FAILED;
+// @ts-ignore
+          if (peg$silentFails === 0) { peg$fail(peg$e15); }
+        }
+// @ts-ignore
+        if (s4 !== peg$FAILED) {
+// @ts-ignore
+          s5 = peg$parseDigit();
+// @ts-ignore
+          if (s5 !== peg$FAILED) {
+// @ts-ignore
+            s4 = [s4, s5];
+// @ts-ignore
+            s3 = s4;
+// @ts-ignore
+          } else {
+// @ts-ignore
+            peg$currPos = s3;
+// @ts-ignore
+            s3 = peg$FAILED;
+          }
+// @ts-ignore
+        } else {
+// @ts-ignore
+          peg$currPos = s3;
+// @ts-ignore
+          s3 = peg$FAILED;
+        }
+      }
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s0 = peg$f22(s1, s2);
+// @ts-ignore
+    } else {
+// @ts-ignore
+      peg$currPos = s0;
+// @ts-ignore
+      s0 = peg$FAILED;
+    }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parseDigit() {
+// @ts-ignore
+    var s0, s1, s2;
+
+// @ts-ignore
+    s0 = peg$currPos;
+// @ts-ignore
+    s1 = [];
+// @ts-ignore
+    if (peg$r2.test(input.charAt(peg$currPos))) {
+// @ts-ignore
+      s2 = input.charAt(peg$currPos);
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s2 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+    }
+// @ts-ignore
+    if (s2 !== peg$FAILED) {
+// @ts-ignore
+      while (s2 !== peg$FAILED) {
+// @ts-ignore
+        s1.push(s2);
+// @ts-ignore
+        if (peg$r2.test(input.charAt(peg$currPos))) {
+// @ts-ignore
+          s2 = input.charAt(peg$currPos);
+// @ts-ignore
+          peg$currPos++;
+// @ts-ignore
+        } else {
+// @ts-ignore
+          s2 = peg$FAILED;
+// @ts-ignore
+          if (peg$silentFails === 0) { peg$fail(peg$e20); }
+        }
+      }
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+    }
+// @ts-ignore
+    if (s1 !== peg$FAILED) {
+// @ts-ignore
+      peg$savedPos = s0;
+// @ts-ignore
+      s1 = peg$f23();
+    }
+// @ts-ignore
+    s0 = s1;
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  function // @ts-ignore
+peg$parse_() {
+// @ts-ignore
+    var s0, s1;
+
+// @ts-ignore
+    peg$silentFails++;
+// @ts-ignore
+    s0 = [];
+// @ts-ignore
+    if (peg$r3.test(input.charAt(peg$currPos))) {
+// @ts-ignore
+      s1 = input.charAt(peg$currPos);
+// @ts-ignore
+      peg$currPos++;
+// @ts-ignore
+    } else {
+// @ts-ignore
+      s1 = peg$FAILED;
+// @ts-ignore
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+    }
+// @ts-ignore
+    while (s1 !== peg$FAILED) {
+// @ts-ignore
+      s0.push(s1);
+// @ts-ignore
+      if (peg$r3.test(input.charAt(peg$currPos))) {
+// @ts-ignore
+        s1 = input.charAt(peg$currPos);
+// @ts-ignore
+        peg$currPos++;
+// @ts-ignore
+      } else {
+// @ts-ignore
+        s1 = peg$FAILED;
+// @ts-ignore
+        if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      }
+    }
+// @ts-ignore
+    peg$silentFails--;
+// @ts-ignore
+    s1 = peg$FAILED;
+// @ts-ignore
+    if (peg$silentFails === 0) { peg$fail(peg$e21); }
+
+// @ts-ignore
+    return s0;
+  }
+
+// @ts-ignore
+  peg$result = peg$startRuleFunction();
+
+// @ts-ignore
+  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
+// @ts-ignore
+    return peg$result;
+// @ts-ignore
+  } else {
+// @ts-ignore
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+// @ts-ignore
+      peg$fail(peg$endExpectation());
+    }
+
+// @ts-ignore
+    throw peg$buildStructuredError(
+// @ts-ignore
+      peg$maxFailExpected,
+// @ts-ignore
+      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+// @ts-ignore
+      peg$maxFailPos < input.length
+// @ts-ignore
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+// @ts-ignore
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
+  }
+}
+
+// @ts-ignore
+  return {
+    SyntaxError: peg$SyntaxError,
+    parse: peg$parse
+  };
+})()
+
+export interface FilePosition {
+  offset: number;
+  line: number;
+  column: number;
+}
+
+export interface FileRange {
+  start: FilePosition;
+  end: FilePosition;
+  source: string;
+}
+
+export interface LiteralExpectation {
+  type: "literal";
+  text: string;
+  ignoreCase: boolean;
+}
+
+export interface ClassParts extends Array<string | ClassParts> {}
+
+export interface ClassExpectation {
+  type: "class";
+  parts: ClassParts;
+  inverted: boolean;
+  ignoreCase: boolean;
+}
+
+export interface AnyExpectation {
+  type: "any";
+}
+
+export interface EndExpectation {
+  type: "end";
+}
+
+export interface OtherExpectation {
+  type: "other";
+  description: string;
+}
+
+export type Expectation = LiteralExpectation | ClassExpectation | AnyExpectation | EndExpectation | OtherExpectation;
+
+declare class _PeggySyntaxError extends Error {
+  public static buildMessage(expected: Expectation[], found: string | null): string;
+  public message: string;
+  public expected: Expectation[];
+  public found: string | null;
+  public location: FileRange;
+  public name: string;
+  constructor(message: string, expected: Expectation[], found: string | null, location: FileRange);
+  format(sources: {
+    source?: any;
+    text: string;
+  }[]): string;
+}
+
+export interface TraceEvent {
+    type: string;
+    rule: string;
+    result?: any;
+    location: FileRange;
+  }
+
+declare class _DefaultTracer {
+  private indentLevel: number;
+  public trace(event: TraceEvent): void;
+}
+
+peggyParser.SyntaxError.prototype.name = "PeggySyntaxError";
+
+export interface ParseOptions {
+  filename?: string;
+  startRule?: "VersionRange" | "Or" | "And" | "VersionRangeAtom" | "Parens" | "Anchor" | "VersionSpec" | "Not" | "Any" | "None" | "CmpOp" | "ExtendedVersion" | "EmVer" | "Flavor" | "Lowercase" | "String" | "Version" | "PreRelease" | "PreReleaseSegment" | "VersionNumber" | "Digit" | "_";
+  tracer?: any;
+  [key: string]: any;
+}
+export type ParseFunction = <Options extends ParseOptions>(
+    input: string,
+    options?: Options
+  ) => Options extends { startRule: infer StartRule } ?
+    StartRule extends "VersionRange" ? VersionRange :
+    StartRule extends "Or" ? Or :
+    StartRule extends "And" ? And :
+    StartRule extends "VersionRangeAtom" ? VersionRangeAtom :
+    StartRule extends "Parens" ? Parens :
+    StartRule extends "Anchor" ? Anchor :
+    StartRule extends "VersionSpec" ? VersionSpec :
+    StartRule extends "Not" ? Not :
+    StartRule extends "Any" ? Any :
+    StartRule extends "None" ? None :
+    StartRule extends "CmpOp" ? CmpOp :
+    StartRule extends "ExtendedVersion" ? ExtendedVersion :
+    StartRule extends "EmVer" ? EmVer :
+    StartRule extends "Flavor" ? Flavor :
+    StartRule extends "Lowercase" ? Lowercase_1 :
+    StartRule extends "String" ? String_1 :
+    StartRule extends "Version" ? Version :
+    StartRule extends "PreRelease" ? PreRelease :
+    StartRule extends "PreReleaseSegment" ? PreReleaseSegment :
+    StartRule extends "VersionNumber" ? VersionNumber :
+    StartRule extends "Digit" ? Digit :
+    StartRule extends "_" ? _ : VersionRange
+    : VersionRange;
+export const parse: ParseFunction = peggyParser.parse;
+
+export const PeggySyntaxError = peggyParser.SyntaxError as typeof _PeggySyntaxError;
+
+export type PeggySyntaxError = _PeggySyntaxError;
+
+// These types were autogenerated by ts-pegjs
+export type VersionRange = [
+  VersionRangeAtom,
+  [_, [Or | And, _] | null, VersionRangeAtom][]
+];
+export type Or = "||";
+export type And = "&&";
+export type VersionRangeAtom = Parens | Anchor | Not | Any | None;
+export type Parens = { type: "Parens"; expr: VersionRange };
+export type Anchor = {
+  type: "Anchor";
+  operator: CmpOp | null;
+  version: VersionSpec;
+};
+export type VersionSpec = {
+  flavor: NonNullable<Flavor | null> | null;
+  upstream: Version;
+  downstream: any;
+};
+export type Not = { type: "Not"; value: VersionRangeAtom };
+export type Any = { type: "Any" };
+export type None = { type: "None" };
+export type CmpOp = ">=" | "<=" | ">" | "<" | "=" | "!=" | "^" | "~";
+export type ExtendedVersion = {
+  flavor: NonNullable<Flavor | null> | null;
+  upstream: Version;
+  downstream: Version;
+};
+export type EmVer = {
+  flavor: null;
+  upstream: { number: [Digit, Digit, Digit]; prerelease: [] };
+  downstream: { number: [any]; prerelease: [] };
+};
+export type Flavor = Lowercase_1;
+export type Lowercase_1 = string;
+export type String_1 = string;
+export type Version = {
+  number: VersionNumber;
+  prerelease: never[] | NonNullable<PreRelease | null>;
+};
+export type PreRelease = PreReleaseSegment[];
+export type PreReleaseSegment = Digit | String_1;
+export type VersionNumber = Digit[];
+export type Digit = number;
+export type _ = string[];
diff --git a/sdk/lib/exver/index.ts b/sdk/lib/exver/index.ts
new file mode 100644
index 000000000..913194875
--- /dev/null
+++ b/sdk/lib/exver/index.ts
@@ -0,0 +1,443 @@
+import * as P from "./exver"
+
+// prettier-ignore
+export type ValidateVersion<T extends String> = 
+T extends `-${infer A}` ? never  :
+T extends `${infer A}-${infer B}` ? ValidateVersion<A> & ValidateVersion<B> :
+  T extends `${bigint}` ? unknown :
+  T extends `${bigint}.${infer A}` ? ValidateVersion<A> :
+  never
+
+// prettier-ignore
+export type ValidateExVer<T extends string> = 
+  T extends `#${string}:${infer A}:${infer B}` ? ValidateVersion<A> & ValidateVersion<B> :
+  T extends `${infer A}:${infer B}` ? ValidateVersion<A> & ValidateVersion<B> :  
+  never
+
+// prettier-ignore
+export type ValidateExVers<T> =
+  T extends [] ? unknown :
+  T extends [infer A, ...infer B] ? ValidateExVer<A & string> & ValidateExVers<B> :
+  never
+
+type Anchor = {
+  type: "Anchor"
+  operator: P.CmpOp
+  version: ExtendedVersion
+}
+
+type And = {
+  type: "And"
+  left: VersionRange
+  right: VersionRange
+}
+
+type Or = {
+  type: "Or"
+  left: VersionRange
+  right: VersionRange
+}
+
+type Not = {
+  type: "Not"
+  value: VersionRange
+}
+
+export class VersionRange {
+  private constructor(private atom: Anchor | And | Or | Not | P.Any | P.None) {}
+
+  toString(): string {
+    switch (this.atom.type) {
+      case "Anchor":
+        return `${this.atom.operator}${this.atom.version}`
+      case "And":
+        return `(${this.atom.left.toString()}) && (${this.atom.right.toString()})`
+      case "Or":
+        return `(${this.atom.left.toString()}) || (${this.atom.right.toString()})`
+      case "Not":
+        return `!(${this.atom.value.toString()})`
+      case "Any":
+        return "*"
+      case "None":
+        return "!"
+    }
+  }
+
+  /**
+   * Returns a boolean indicating whether a given version satisfies the VersionRange
+   * !( >= 1:1 <= 2:2) || <=#bitcoin:1.2.0-alpha:0
+   */
+  satisfiedBy(version: ExtendedVersion): boolean {
+    switch (this.atom.type) {
+      case "Anchor":
+        const otherVersion = this.atom.version
+        switch (this.atom.operator) {
+          case "=":
+            return version.equals(otherVersion)
+          case ">":
+            return version.greaterThan(otherVersion)
+          case "<":
+            return version.lessThan(otherVersion)
+          case ">=":
+            return version.greaterThanOrEqual(otherVersion)
+          case "<=":
+            return version.lessThanOrEqual(otherVersion)
+          case "!=":
+            return !version.equals(otherVersion)
+          case "^":
+            const nextMajor = this.atom.version.incrementMajor()
+            if (
+              version.greaterThanOrEqual(otherVersion) &&
+              version.lessThan(nextMajor)
+            ) {
+              return true
+            } else {
+              return false
+            }
+          case "~":
+            const nextMinor = this.atom.version.incrementMinor()
+            if (
+              version.greaterThanOrEqual(otherVersion) &&
+              version.lessThan(nextMinor)
+            ) {
+              return true
+            } else {
+              return false
+            }
+        }
+      case "And":
+        return (
+          this.atom.left.satisfiedBy(version) &&
+          this.atom.right.satisfiedBy(version)
+        )
+      case "Or":
+        return (
+          this.atom.left.satisfiedBy(version) ||
+          this.atom.right.satisfiedBy(version)
+        )
+      case "Not":
+        return !this.atom.value.satisfiedBy(version)
+      case "Any":
+        return true
+      case "None":
+        return false
+    }
+  }
+
+  private static parseAtom(atom: P.VersionRangeAtom): VersionRange {
+    switch (atom.type) {
+      case "Not":
+        return new VersionRange({
+          type: "Not",
+          value: VersionRange.parseAtom(atom.value),
+        })
+      case "Parens":
+        return VersionRange.parseRange(atom.expr)
+      case "Anchor":
+        return new VersionRange({
+          type: "Anchor",
+          operator: atom.operator || "^",
+          version: new ExtendedVersion(
+            atom.version.flavor,
+            new Version(
+              atom.version.upstream.number,
+              atom.version.upstream.prerelease,
+            ),
+            new Version(
+              atom.version.downstream.number,
+              atom.version.downstream.prerelease,
+            ),
+          ),
+        })
+      default:
+        return new VersionRange(atom)
+    }
+  }
+
+  private static parseRange(range: P.VersionRange): VersionRange {
+    let result = VersionRange.parseAtom(range[0])
+    for (const next of range[1]) {
+      switch (next[1]?.[0]) {
+        case "||":
+          result = new VersionRange({
+            type: "Or",
+            left: result,
+            right: VersionRange.parseAtom(next[2]),
+          })
+          break
+        case "&&":
+        default:
+          result = new VersionRange({
+            type: "And",
+            left: result,
+            right: VersionRange.parseAtom(next[2]),
+          })
+          break
+      }
+    }
+    return result
+  }
+
+  static parse(range: string): VersionRange {
+    return VersionRange.parseRange(
+      P.parse(range, { startRule: "VersionRange" }),
+    )
+  }
+
+  and(right: VersionRange) {
+    return new VersionRange({ type: "And", left: this, right })
+  }
+
+  or(right: VersionRange) {
+    return new VersionRange({ type: "Or", left: this, right })
+  }
+
+  not() {
+    return new VersionRange({ type: "Not", value: this })
+  }
+
+  static anchor(operator: P.CmpOp, version: ExtendedVersion) {
+    return new VersionRange({ type: "Anchor", operator, version })
+  }
+
+  static any() {
+    return new VersionRange({ type: "Any" })
+  }
+
+  static none() {
+    return new VersionRange({ type: "None" })
+  }
+}
+
+export class Version {
+  constructor(
+    public number: number[],
+    public prerelease: (string | number)[],
+  ) {}
+
+  toString(): string {
+    return `${this.number.join(".")}${this.prerelease.length > 0 ? `-${this.prerelease.join(".")}` : ""}`
+  }
+
+  compare(other: Version): "greater" | "equal" | "less" {
+    const numLen = Math.max(this.number.length, other.number.length)
+    for (let i = 0; i < numLen; i++) {
+      if ((this.number[i] || 0) > (other.number[i] || 0)) {
+        return "greater"
+      } else if ((this.number[i] || 0) < (other.number[i] || 0)) {
+        return "less"
+      }
+    }
+
+    if (this.prerelease.length === 0 && other.prerelease.length !== 0) {
+      return "greater"
+    } else if (this.prerelease.length !== 0 && other.prerelease.length === 0) {
+      return "less"
+    }
+
+    const prereleaseLen = Math.max(this.number.length, other.number.length)
+    for (let i = 0; i < prereleaseLen; i++) {
+      if (typeof this.prerelease[i] === typeof other.prerelease[i]) {
+        if (this.prerelease[i] > other.prerelease[i]) {
+          return "greater"
+        } else if (this.prerelease[i] < other.prerelease[i]) {
+          return "less"
+        }
+      } else {
+        switch (`${typeof this.prerelease[1]}:${typeof other.prerelease[i]}`) {
+          case "number:string":
+            return "less"
+          case "string:number":
+            return "greater"
+          case "number:undefined":
+          case "string:undefined":
+            return "greater"
+          case "undefined:number":
+          case "undefined:string":
+            return "less"
+        }
+      }
+    }
+
+    return "equal"
+  }
+
+  static parse(version: string): Version {
+    const parsed = P.parse(version, { startRule: "Version" })
+    return new Version(parsed.number, parsed.prerelease)
+  }
+}
+
+// #flavor:0.1.2-beta.1:0
+export class ExtendedVersion {
+  constructor(
+    public flavor: string | null,
+    public upstream: Version,
+    public downstream: Version,
+  ) {}
+
+  toString(): string {
+    return `${this.flavor ? `#${this.flavor}:` : ""}${this.upstream.toString()}:${this.downstream.toString()}`
+  }
+
+  compare(other: ExtendedVersion): "greater" | "equal" | "less" | null {
+    if (this.flavor !== other.flavor) {
+      return null
+    }
+    const upstreamCmp = this.upstream.compare(other.upstream)
+    if (upstreamCmp !== "equal") {
+      return upstreamCmp
+    }
+    return this.downstream.compare(other.downstream)
+  }
+
+  compareLexicographic(other: ExtendedVersion): "greater" | "equal" | "less" {
+    if ((this.flavor || "") > (other.flavor || "")) {
+      return "greater"
+    } else if ((this.flavor || "") > (other.flavor || "")) {
+      return "less"
+    } else {
+      return this.compare(other)!
+    }
+  }
+
+  compareForSort(other: ExtendedVersion): 1 | 0 | -1 {
+    switch (this.compareLexicographic(other)) {
+      case "greater":
+        return 1
+      case "equal":
+        return 0
+      case "less":
+        return -1
+    }
+  }
+
+  greaterThan(other: ExtendedVersion): boolean {
+    return this.compare(other) === "greater"
+  }
+
+  greaterThanOrEqual(other: ExtendedVersion): boolean {
+    return ["greater", "equal"].includes(this.compare(other) as string)
+  }
+
+  equals(other: ExtendedVersion): boolean {
+    return this.compare(other) === "equal"
+  }
+
+  lessThan(other: ExtendedVersion): boolean {
+    return this.compare(other) === "less"
+  }
+
+  lessThanOrEqual(other: ExtendedVersion): boolean {
+    return ["less", "equal"].includes(this.compare(other) as string)
+  }
+
+  static parse(extendedVersion: string): ExtendedVersion {
+    const parsed = P.parse(extendedVersion, { startRule: "ExtendedVersion" })
+    return new ExtendedVersion(
+      parsed.flavor,
+      new Version(parsed.upstream.number, parsed.upstream.prerelease),
+      new Version(parsed.downstream.number, parsed.downstream.prerelease),
+    )
+  }
+
+  static parseEmver(extendedVersion: string): ExtendedVersion {
+    const parsed = P.parse(extendedVersion, { startRule: "EmVer" })
+    return new ExtendedVersion(
+      parsed.flavor,
+      new Version(parsed.upstream.number, parsed.upstream.prerelease),
+      new Version(parsed.downstream.number, parsed.downstream.prerelease),
+    )
+  }
+
+  /**
+   * Returns an ExtendedVersion with the Upstream major version version incremented by 1
+   * and sets subsequent digits to zero.
+   * If no non-zero upstream digit can be found the last upstream digit will be incremented.
+   */
+  incrementMajor(): ExtendedVersion {
+    const majorIdx = this.upstream.number.findIndex((num: number) => num !== 0)
+
+    const majorNumber = this.upstream.number.map((num, idx): number => {
+      if (idx > majorIdx) {
+        return 0
+      } else if (idx === majorIdx) {
+        return num + 1
+      }
+      return num
+    })
+
+    const incrementedUpstream = new Version(majorNumber, [])
+    const updatedDownstream = new Version([0], [])
+
+    return new ExtendedVersion(
+      this.flavor,
+      incrementedUpstream,
+      updatedDownstream,
+    )
+  }
+
+  /**
+   * Returns an ExtendedVersion with the Upstream minor version version incremented by 1
+   * also sets subsequent digits to zero.
+   * If no non-zero upstream digit can be found the last digit will be incremented.
+   */
+  incrementMinor(): ExtendedVersion {
+    const majorIdx = this.upstream.number.findIndex((num: number) => num !== 0)
+    let minorIdx = majorIdx === -1 ? majorIdx : majorIdx + 1
+
+    const majorNumber = this.upstream.number.map((num, idx): number => {
+      if (idx > minorIdx) {
+        return 0
+      } else if (idx === minorIdx) {
+        return num + 1
+      }
+      return num
+    })
+
+    const incrementedUpstream = new Version(majorNumber, [])
+    const updatedDownstream = new Version([0], [])
+
+    return new ExtendedVersion(
+      this.flavor,
+      incrementedUpstream,
+      updatedDownstream,
+    )
+  }
+}
+
+export const testTypeExVer = <T extends string>(t: T & ValidateExVer<T>) => t
+
+export const testTypeVersion = <T extends string>(t: T & ValidateVersion<T>) =>
+  t
+function tests() {
+  testTypeVersion("1.2.3")
+  testTypeVersion("1")
+  testTypeVersion("12.34.56")
+  testTypeVersion("1.2-3")
+  testTypeVersion("1-3")
+  // @ts-expect-error
+  testTypeVersion("-3")
+  // @ts-expect-error
+  testTypeVersion("1.2.3:1")
+  // @ts-expect-error
+  testTypeVersion("#cat:1:1")
+
+  testTypeExVer("1.2.3:1.2.3")
+  testTypeExVer("1.2.3.4.5.6.7.8.9.0:1")
+  testTypeExVer("100:1")
+  testTypeExVer("#cat:1:1")
+  testTypeExVer("1.2.3.4.5.6.7.8.9.11.22.33:1")
+  testTypeExVer("1-0:1")
+  testTypeExVer("1-0:1")
+  // @ts-expect-error
+  testTypeExVer("1.2-3")
+  // @ts-expect-error
+  testTypeExVer("1-3")
+  // @ts-expect-error
+  testTypeExVer("1.2.3.4.5.6.7.8.9.0.10:1" as string)
+  // @ts-expect-error
+  testTypeExVer("1.-2:1")
+  // @ts-expect-error
+  testTypeExVer("1..2.3:3")
+}
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index 1ed8652bf..4b72dbf61 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -1,5 +1,4 @@
-import { InterfaceReceipt } from "../interfaces/interfaceReceipt"
-import { Daemon, Effects, SDKManifest } from "../types"
+import { Effects } from "../types"
 import { CheckResult } from "./checkFns/CheckResult"
 import { HealthReceipt } from "./HealthReceipt"
 import { Trigger } from "../trigger"
@@ -8,9 +7,9 @@ import { defaultTrigger } from "../trigger/defaultTrigger"
 import { once } from "../util/once"
 import { Overlay } from "../util/Overlay"
 import { object, unknown } from "ts-matches"
-import { T } from ".."
+import * as T from "../types"
 
-export type HealthCheckParams<Manifest extends SDKManifest> = {
+export type HealthCheckParams<Manifest extends T.Manifest> = {
   effects: Effects
   name: string
   image: {
@@ -22,7 +21,7 @@ export type HealthCheckParams<Manifest extends SDKManifest> = {
   onFirstSuccess?: () => unknown | Promise<unknown>
 }
 
-export function healthCheck<Manifest extends SDKManifest>(
+export function healthCheck<Manifest extends T.Manifest>(
   o: HealthCheckParams<Manifest>,
 ) {
   new Promise(async () => {
diff --git a/sdk/lib/index.browser.ts b/sdk/lib/index.browser.ts
index c7ab45e60..f7d645133 100644
--- a/sdk/lib/index.browser.ts
+++ b/sdk/lib/index.browser.ts
@@ -1,12 +1,10 @@
-export { EmVer } from "./emverLite/mod"
-export { setupManifest } from "./manifest/setupManifest"
-export { setupExposeStore } from "./store/setupExposeStore"
 export { S9pk } from "./s9pk"
+export { VersionRange, ExtendedVersion, Version } from "./exver"
+
 export * as config from "./config"
 export * as CB from "./config/builder"
 export * as CT from "./config/configTypes"
 export * as dependencyConfig from "./dependencies"
-export * as manifest from "./manifest"
 export * as types from "./types"
 export * as T from "./types"
 export * as yaml from "yaml"
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index c99798d72..935ffc023 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -1,5 +1,4 @@
 export { Daemons } from "./mainFn/Daemons"
-export { EmVer } from "./emverLite/mod"
 export { Overlay } from "./util/Overlay"
 export { StartSdk } from "./StartSdk"
 export { setupManifest } from "./manifest/setupManifest"
@@ -7,6 +6,7 @@ export { FileHelper } from "./util/fileHelper"
 export { setupExposeStore } from "./store/setupExposeStore"
 export { pathBuilder } from "./store/PathBuilder"
 export { S9pk } from "./s9pk"
+export { VersionRange, ExtendedVersion, Version } from "./exver"
 
 export * as actions from "./actions"
 export * as backup from "./backup"
diff --git a/sdk/lib/inits/migrations/Migration.ts b/sdk/lib/inits/migrations/Migration.ts
index 119271aea..16be93dbd 100644
--- a/sdk/lib/inits/migrations/Migration.ts
+++ b/sdk/lib/inits/migrations/Migration.ts
@@ -1,35 +1,35 @@
-import { ManifestVersion, SDKManifest } from "../../manifest/ManifestTypes"
-import { Effects } from "../../types"
+import { ValidateExVer } from "../../exver"
+import * as T from "../../types"
 
 export class Migration<
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Store,
-  Version extends ManifestVersion,
+  Version extends string,
 > {
   constructor(
     readonly options: {
-      version: Version
-      up: (opts: { effects: Effects }) => Promise<void>
-      down: (opts: { effects: Effects }) => Promise<void>
+      version: Version & ValidateExVer<Version>
+      up: (opts: { effects: T.Effects }) => Promise<void>
+      down: (opts: { effects: T.Effects }) => Promise<void>
     },
   ) {}
   static of<
-    Manifest extends SDKManifest,
+    Manifest extends T.Manifest,
     Store,
-    Version extends ManifestVersion,
+    Version extends string,
   >(options: {
-    version: Version
-    up: (opts: { effects: Effects }) => Promise<void>
-    down: (opts: { effects: Effects }) => Promise<void>
+    version: Version & ValidateExVer<Version>
+    up: (opts: { effects: T.Effects }) => Promise<void>
+    down: (opts: { effects: T.Effects }) => Promise<void>
   }) {
     return new Migration<Manifest, Store, Version>(options)
   }
 
-  async up(opts: { effects: Effects }) {
+  async up(opts: { effects: T.Effects }) {
     this.up(opts)
   }
 
-  async down(opts: { effects: Effects }) {
+  async down(opts: { effects: T.Effects }) {
     this.down(opts)
   }
 }
diff --git a/sdk/lib/inits/migrations/setupMigrations.ts b/sdk/lib/inits/migrations/setupMigrations.ts
index 288b2b9d7..6d690b239 100644
--- a/sdk/lib/inits/migrations/setupMigrations.ts
+++ b/sdk/lib/inits/migrations/setupMigrations.ts
@@ -1,27 +1,31 @@
-import { EmVer } from "../../emverLite/mod"
-import { SDKManifest } from "../../manifest/ManifestTypes"
-import { ExpectedExports } from "../../types"
+import { ExtendedVersion } from "../../exver"
+
+import * as T from "../../types"
 import { once } from "../../util/once"
 import { Migration } from "./Migration"
 
-export class Migrations<Manifest extends SDKManifest, Store> {
+export class Migrations<Manifest extends T.Manifest, Store> {
   private constructor(
-    readonly manifest: SDKManifest,
+    readonly manifest: T.Manifest,
     readonly migrations: Array<Migration<Manifest, Store, any>>,
   ) {}
   private sortedMigrations = once(() => {
     const migrationsAsVersions = (
       this.migrations as Array<Migration<Manifest, Store, any>>
-    ).map((x) => [EmVer.parse(x.options.version), x] as const)
+    )
+      .map((x) => [ExtendedVersion.parse(x.options.version), x] as const)
+      .filter(([v, _]) => v.flavor === this.currentVersion().flavor)
     migrationsAsVersions.sort((a, b) => a[0].compareForSort(b[0]))
     return migrationsAsVersions
   })
-  private currentVersion = once(() => EmVer.parse(this.manifest.version))
+  private currentVersion = once(() =>
+    ExtendedVersion.parse(this.manifest.version),
+  )
   static of<
-    Manifest extends SDKManifest,
+    Manifest extends T.Manifest,
     Store,
     Migrations extends Array<Migration<Manifest, Store, any>>,
-  >(manifest: SDKManifest, ...migrations: EnsureUniqueId<Migrations>) {
+  >(manifest: T.Manifest, ...migrations: EnsureUniqueId<Migrations>) {
     return new Migrations(
       manifest,
       migrations as Array<Migration<Manifest, Store, any>>,
@@ -30,11 +34,11 @@ export class Migrations<Manifest extends SDKManifest, Store> {
   async init({
     effects,
     previousVersion,
-  }: Parameters<ExpectedExports.init>[0]) {
+  }: Parameters<T.ExpectedExports.init>[0]) {
     if (!!previousVersion) {
-      const previousVersionEmVer = EmVer.parse(previousVersion)
+      const previousVersionExVer = ExtendedVersion.parse(previousVersion)
       for (const [_, migration] of this.sortedMigrations()
-        .filter((x) => x[0].greaterThan(previousVersionEmVer))
+        .filter((x) => x[0].greaterThan(previousVersionExVer))
         .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
         await migration.up({ effects })
       }
@@ -43,12 +47,12 @@ export class Migrations<Manifest extends SDKManifest, Store> {
   async uninit({
     effects,
     nextVersion,
-  }: Parameters<ExpectedExports.uninit>[0]) {
+  }: Parameters<T.ExpectedExports.uninit>[0]) {
     if (!!nextVersion) {
-      const nextVersionEmVer = EmVer.parse(nextVersion)
+      const nextVersionExVer = ExtendedVersion.parse(nextVersion)
       const reversed = [...this.sortedMigrations()].reverse()
       for (const [_, migration] of reversed
-        .filter((x) => x[0].greaterThan(nextVersionEmVer))
+        .filter((x) => x[0].greaterThan(nextVersionExVer))
         .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
         await migration.down({ effects })
       }
@@ -57,10 +61,10 @@ export class Migrations<Manifest extends SDKManifest, Store> {
 }
 
 export function setupMigrations<
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Store,
   Migrations extends Array<Migration<Manifest, Store, any>>,
->(manifest: SDKManifest, ...migrations: EnsureUniqueId<Migrations>) {
+>(manifest: T.Manifest, ...migrations: EnsureUniqueId<Migrations>) {
   return Migrations.of<Manifest, Store, Migrations>(manifest, ...migrations)
 }
 
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index 03a7085c5..5718caa58 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -1,25 +1,25 @@
 import { DependenciesReceipt } from "../config/setupConfig"
 import { SetInterfaces } from "../interfaces/setupInterfaces"
-import { SDKManifest } from "../manifest/ManifestTypes"
+
 import { ExposedStorePaths } from "../store/setupExposeStore"
-import { Effects, ExpectedExports } from "../types"
+import * as T from "../types"
 import { Migrations } from "./migrations/setupMigrations"
 import { Install } from "./setupInstall"
 import { Uninstall } from "./setupUninstall"
 
-export function setupInit<Manifest extends SDKManifest, Store>(
+export function setupInit<Manifest extends T.Manifest, Store>(
   migrations: Migrations<Manifest, Store>,
   install: Install<Manifest, Store>,
   uninstall: Uninstall<Manifest, Store>,
   setInterfaces: SetInterfaces<Manifest, Store, any, any>,
   setDependencies: (options: {
-    effects: Effects
+    effects: T.Effects
     input: any
   }) => Promise<DependenciesReceipt>,
   exposedStore: ExposedStorePaths,
 ): {
-  init: ExpectedExports.init
-  uninit: ExpectedExports.uninit
+  init: T.ExpectedExports.init
+  uninit: T.ExpectedExports.uninit
 } {
   return {
     init: async (opts) => {
diff --git a/sdk/lib/inits/setupInstall.ts b/sdk/lib/inits/setupInstall.ts
index 3990be0ca..7b51a22ea 100644
--- a/sdk/lib/inits/setupInstall.ts
+++ b/sdk/lib/inits/setupInstall.ts
@@ -1,12 +1,11 @@
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects, ExpectedExports } from "../types"
+import * as T from "../types"
 
-export type InstallFn<Manifest extends SDKManifest, Store> = (opts: {
-  effects: Effects
+export type InstallFn<Manifest extends T.Manifest, Store> = (opts: {
+  effects: T.Effects
 }) => Promise<void>
-export class Install<Manifest extends SDKManifest, Store> {
+export class Install<Manifest extends T.Manifest, Store> {
   private constructor(readonly fn: InstallFn<Manifest, Store>) {}
-  static of<Manifest extends SDKManifest, Store>(
+  static of<Manifest extends T.Manifest, Store>(
     fn: InstallFn<Manifest, Store>,
   ) {
     return new Install(fn)
@@ -15,7 +14,7 @@ export class Install<Manifest extends SDKManifest, Store> {
   async init({
     effects,
     previousVersion,
-  }: Parameters<ExpectedExports.init>[0]) {
+  }: Parameters<T.ExpectedExports.init>[0]) {
     if (!previousVersion)
       await this.fn({
         effects,
@@ -23,7 +22,7 @@ export class Install<Manifest extends SDKManifest, Store> {
   }
 }
 
-export function setupInstall<Manifest extends SDKManifest, Store>(
+export function setupInstall<Manifest extends T.Manifest, Store>(
   fn: InstallFn<Manifest, Store>,
 ) {
   return Install.of(fn)
diff --git a/sdk/lib/inits/setupUninstall.ts b/sdk/lib/inits/setupUninstall.ts
index 812848c8f..c8c3e490f 100644
--- a/sdk/lib/inits/setupUninstall.ts
+++ b/sdk/lib/inits/setupUninstall.ts
@@ -1,12 +1,11 @@
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects, ExpectedExports } from "../types"
+import * as T from "../types"
 
-export type UninstallFn<Manifest extends SDKManifest, Store> = (opts: {
-  effects: Effects
+export type UninstallFn<Manifest extends T.Manifest, Store> = (opts: {
+  effects: T.Effects
 }) => Promise<void>
-export class Uninstall<Manifest extends SDKManifest, Store> {
+export class Uninstall<Manifest extends T.Manifest, Store> {
   private constructor(readonly fn: UninstallFn<Manifest, Store>) {}
-  static of<Manifest extends SDKManifest, Store>(
+  static of<Manifest extends T.Manifest, Store>(
     fn: UninstallFn<Manifest, Store>,
   ) {
     return new Uninstall(fn)
@@ -15,7 +14,7 @@ export class Uninstall<Manifest extends SDKManifest, Store> {
   async uninit({
     effects,
     nextVersion,
-  }: Parameters<ExpectedExports.uninit>[0]) {
+  }: Parameters<T.ExpectedExports.uninit>[0]) {
     if (!nextVersion)
       await this.fn({
         effects,
@@ -23,7 +22,7 @@ export class Uninstall<Manifest extends SDKManifest, Store> {
   }
 }
 
-export function setupUninstall<Manifest extends SDKManifest, Store>(
+export function setupUninstall<Manifest extends T.Manifest, Store>(
   fn: UninstallFn<Manifest, Store>,
 ) {
   return Uninstall.of(fn)
diff --git a/sdk/lib/interfaces/setupInterfaces.ts b/sdk/lib/interfaces/setupInterfaces.ts
index 5ad8d8a7d..c82b69e0b 100644
--- a/sdk/lib/interfaces/setupInterfaces.ts
+++ b/sdk/lib/interfaces/setupInterfaces.ts
@@ -1,17 +1,17 @@
 import { Config } from "../config/builder/config"
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { AddressInfo, Effects } from "../types"
+
+import * as T from "../types"
 import { AddressReceipt } from "./AddressReceipt"
 
-export type InterfacesReceipt = Array<AddressInfo[] & AddressReceipt>
+export type InterfacesReceipt = Array<T.AddressInfo[] & AddressReceipt>
 export type SetInterfaces<
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Store,
   ConfigInput extends Record<string, any>,
   Output extends InterfacesReceipt,
-> = (opts: { effects: Effects; input: null | ConfigInput }) => Promise<Output>
+> = (opts: { effects: T.Effects; input: null | ConfigInput }) => Promise<Output>
 export type SetupInterfaces = <
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Store,
   ConfigInput extends Record<string, any>,
   Output extends InterfacesReceipt,
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/lib/mainFn/CommandController.ts
index 3af01e915..40f787f86 100644
--- a/sdk/lib/mainFn/CommandController.ts
+++ b/sdk/lib/mainFn/CommandController.ts
@@ -1,7 +1,7 @@
 import { DEFAULT_SIGTERM_TIMEOUT } from "."
 import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../StartSdk"
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects, ImageId, ValidIfNoStupidEscape } from "../types"
+
+import * as T from "../types"
 import { MountOptions, Overlay } from "../util/Overlay"
 import { splitCommand } from "../util/splitCommand"
 import { cpExecFile, cpExec } from "./Daemons"
@@ -13,14 +13,14 @@ export class CommandController {
     readonly pid: number | undefined,
     readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {}
-  static of<Manifest extends SDKManifest>() {
+  static of<Manifest extends T.Manifest>() {
     return async <A extends string>(
-      effects: Effects,
+      effects: T.Effects,
       imageId: {
-        id: keyof Manifest["images"] & ImageId
+        id: keyof Manifest["images"] & T.ImageId
         sharedRun?: boolean
       },
-      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+      command: T.CommandType,
       options: {
         // Defaults to the DEFAULT_SIGTERM_TIMEOUT = 30_000ms
         sigtermTimeout?: number
diff --git a/sdk/lib/mainFn/Daemon.ts b/sdk/lib/mainFn/Daemon.ts
index 90882418c..6dceda951 100644
--- a/sdk/lib/mainFn/Daemon.ts
+++ b/sdk/lib/mainFn/Daemon.ts
@@ -1,5 +1,4 @@
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects, ImageId, ValidIfNoStupidEscape } from "../types"
+import * as T from "../types"
 import { MountOptions, Overlay } from "../util/Overlay"
 import { CommandController } from "./CommandController"
 
@@ -14,14 +13,14 @@ export class Daemon {
   private commandController: CommandController | null = null
   private shouldBeRunning = false
   private constructor(private startCommand: () => Promise<CommandController>) {}
-  static of<Manifest extends SDKManifest>() {
+  static of<Manifest extends T.Manifest>() {
     return async <A extends string>(
-      effects: Effects,
+      effects: T.Effects,
       imageId: {
-        id: keyof Manifest["images"] & ImageId
+        id: keyof Manifest["images"] & T.ImageId
         sharedRun?: boolean
       },
-      command: ValidIfNoStupidEscape<A> | [string, ...string[]],
+      command: T.CommandType,
       options: {
         mounts?: { path: string; options: MountOptions }[]
         overlay?: Overlay
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index fbda547aa..c766e2f2e 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -1,16 +1,11 @@
 import { NO_TIMEOUT, SIGKILL, SIGTERM, Signals } from "../StartSdk"
 import { HealthReceipt } from "../health/HealthReceipt"
 import { CheckResult } from "../health/checkFns"
-import { SDKManifest } from "../manifest/ManifestTypes"
+
 import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
-import {
-  DaemonReturned,
-  Effects,
-  ImageId,
-  ValidIfNoStupidEscape,
-} from "../types"
+import * as T from "../types"
 import { Mounts } from "./Mounts"
 import { CommandOptions, MountOptions, Overlay } from "../util/Overlay"
 import { splitCommand } from "../util/splitCommand"
@@ -33,13 +28,13 @@ export type Ready = {
 }
 
 type DaemonsParams<
-  Manifest extends SDKManifest,
+  Manifest extends T.Manifest,
   Ids extends string,
   Command extends string,
   Id extends string,
 > = {
-  command: ValidIfNoStupidEscape<Command> | [string, ...string[]]
-  image: { id: keyof Manifest["images"] & ImageId; sharedRun?: boolean }
+  command: T.CommandType
+  image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean }
   mounts: Mounts<Manifest>
   env?: Record<string, string>
   ready: Ready
@@ -49,7 +44,7 @@ type DaemonsParams<
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
 
-export const runCommand = <Manifest extends SDKManifest>() =>
+export const runCommand = <Manifest extends T.Manifest>() =>
   CommandController.of<Manifest>()
 
 /**
@@ -75,9 +70,9 @@ Daemons.of({
 })
 ```
  */
-export class Daemons<Manifest extends SDKManifest, Ids extends string> {
+export class Daemons<Manifest extends T.Manifest, Ids extends string> {
   private constructor(
-    readonly effects: Effects,
+    readonly effects: T.Effects,
     readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>,
     readonly daemons: Promise<Daemon>[],
     readonly ids: Ids[],
@@ -93,8 +88,8 @@ export class Daemons<Manifest extends SDKManifest, Ids extends string> {
    * @param config
    * @returns
    */
-  static of<Manifest extends SDKManifest>(config: {
-    effects: Effects
+  static of<Manifest extends T.Manifest>(config: {
+    effects: T.Effects
     started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
     healthReceipts: HealthReceipt[]
   }) {
diff --git a/sdk/lib/mainFn/Mounts.ts b/sdk/lib/mainFn/Mounts.ts
index eeedc79c6..968b77b4e 100644
--- a/sdk/lib/mainFn/Mounts.ts
+++ b/sdk/lib/mainFn/Mounts.ts
@@ -1,10 +1,9 @@
-import { SDKManifest } from "../manifest/ManifestTypes"
-import { Effects } from "../types"
+import * as T from "../types"
 import { MountOptions } from "../util/Overlay"
 
 type MountArray = { path: string; options: MountOptions }[]
 
-export class Mounts<Manifest extends SDKManifest> {
+export class Mounts<Manifest extends T.Manifest> {
   private constructor(
     readonly volumes: {
       id: Manifest["volumes"][number]
@@ -26,7 +25,7 @@ export class Mounts<Manifest extends SDKManifest> {
     }[],
   ) {}
 
-  static of<Manifest extends SDKManifest>() {
+  static of<Manifest extends T.Manifest>() {
     return new Mounts<Manifest>([], [], [])
   }
 
@@ -58,7 +57,7 @@ export class Mounts<Manifest extends SDKManifest> {
     return this
   }
 
-  addDependency<DependencyManifest extends SDKManifest>(
+  addDependency<DependencyManifest extends T.Manifest>(
     dependencyId: keyof Manifest["dependencies"] & string,
     volumeId: DependencyManifest["volumes"][number],
     subpath: string | null,
diff --git a/sdk/lib/mainFn/index.ts b/sdk/lib/mainFn/index.ts
index c4f74764c..7a094a31a 100644
--- a/sdk/lib/mainFn/index.ts
+++ b/sdk/lib/mainFn/index.ts
@@ -1,10 +1,10 @@
-import { ExpectedExports } from "../types"
+import * as T from "../types"
 import { Daemons } from "./Daemons"
 import "../interfaces/ServiceInterfaceBuilder"
 import "../interfaces/Origin"
 
 import "./Daemons"
-import { SDKManifest } from "../manifest/ManifestTypes"
+
 import { MainEffects } from "../StartSdk"
 
 export const DEFAULT_SIGTERM_TIMEOUT = 30_000
@@ -18,12 +18,12 @@ export const DEFAULT_SIGTERM_TIMEOUT = 30_000
  * @param fn
  * @returns
  */
-export const setupMain = <Manifest extends SDKManifest, Store>(
+export const setupMain = <Manifest extends T.Manifest, Store>(
   fn: (o: {
     effects: MainEffects
     started(onTerm: () => PromiseLike<void>): PromiseLike<void>
   }) => Promise<Daemons<Manifest, any>>,
-): ExpectedExports.main => {
+): T.ExpectedExports.main => {
   return async (options) => {
     const result = await fn(options)
     return result
diff --git a/sdk/lib/manifest/ManifestTypes.ts b/sdk/lib/manifest/ManifestTypes.ts
index 8e6b572d3..ea349710f 100644
--- a/sdk/lib/manifest/ManifestTypes.ts
+++ b/sdk/lib/manifest/ManifestTypes.ts
@@ -1,20 +1,16 @@
-import { ValidEmVer } from "../emverLite/mod"
-import { ActionMetadata, ImageConfig, ImageId } from "../types"
+import { ValidateExVer, ValidateExVers } from "../exver"
+import {
+  ActionMetadata,
+  HardwareRequirements,
+  ImageConfig,
+  ImageId,
+  ImageSource,
+} from "../types"
 
-export type Container = {
-  /** This should be pointing to a docker container name */
-  image: string
-  /** These should match the manifest data volumes */
-  mounts: Record<string, string>
-  /** Default is 64mb */
-  shmSizeMb?: `${number}${"mb" | "gb" | "b" | "kb"}`
-  /** if more than 30s to shutdown */
-  sigtermTimeout?: `${number}${"s" | "m" | "h"}`
-}
-
-export type ManifestVersion = ValidEmVer
-
-export type SDKManifest = {
+export type SDKManifest<
+  Version extends string,
+  Satisfies extends string[] = [],
+> = {
   /**  The package identifier used by the OS. This must be unique amongst all other known packages */
   readonly id: string
   /** A human readable service title */
@@ -23,7 +19,8 @@ export type SDKManifest = {
    * - see documentation: https://github.com/Start9Labs/emver-rs. This value will change with each release of
    * the service
    */
-  readonly version: ManifestVersion
+  readonly version: Version & ValidateExVer<Version>
+  readonly satisfies?: Satisfies & ValidateExVers<Satisfies>
   /** Release notes for the update - can be a string, paragraph or URL */
   readonly releaseNotes: string
   /** The type of license for the project. Include the LICENSE in the root of the project directory. A license is required for a Start9 package.*/
@@ -50,36 +47,49 @@ export type SDKManifest = {
   }
 
   /** Defines the os images needed to run the container processes */
-  readonly images: Record<ImageId, ImageConfig>
+  readonly images: Record<ImageId, SDKImageConfig>
   /** This denotes readonly asset directories that should be available to mount to the container.
-   * Assuming that there will be three files with names along the lines:
-   * icon.* : the icon that will be this packages icon on the ui
-   * LICENSE : What the license is for this service
-   * Instructions : to be seen in the ui section of the package
-   * */
+   * These directories are expected to be found in `assets/<id>` at pack time.
+   **/
   readonly assets: string[]
   /** This denotes any data volumes that should be available to mount to the container */
   readonly volumes: string[]
 
-  readonly alerts: {
-    readonly install: string | null
-    readonly update: string | null
-    readonly uninstall: string | null
-    readonly restore: string | null
-    readonly start: string | null
-    readonly stop: string | null
+  readonly alerts?: {
+    readonly install?: string | null
+    readonly update?: string | null
+    readonly uninstall?: string | null
+    readonly restore?: string | null
+    readonly start?: string | null
+    readonly stop?: string | null
   }
+  readonly hasConfig?: boolean
   readonly dependencies: Readonly<Record<string, ManifestDependency>>
+  readonly hardwareRequirements?: {
+    readonly device?: { display?: RegExp; processor?: RegExp }
+    readonly ram?: number | null
+    readonly arch?: string[] | null
+  }
+}
+
+export type SDKImageConfig = {
+  source: Exclude<ImageSource, "packed">
+  arch?: string[]
+  emulateMissingAs?: string | null
 }
 
 export type ManifestDependency = {
   /**
    * A human readable explanation on what the dependency is used for
    */
-  description: string | null
+  readonly description: string | null
   /**
    * Determines if the dependency is optional or not. Times that optional that are good include such situations
    * such as being able to toggle other services or to use a different service for the same purpose.
    */
-  optional: boolean
+  readonly optional: boolean
+  /**
+   * A url or local path for an s9pk that satisfies this dependency
+   */
+  readonly s9pk: string
 }
diff --git a/sdk/lib/manifest/setupManifest.ts b/sdk/lib/manifest/setupManifest.ts
index 8bd39a7aa..e3b746874 100644
--- a/sdk/lib/manifest/setupManifest.ts
+++ b/sdk/lib/manifest/setupManifest.ts
@@ -1,21 +1,71 @@
+import * as T from "../types"
 import { ImageConfig, ImageId, VolumeId } from "../osBindings"
-import { SDKManifest, ManifestVersion } from "./ManifestTypes"
+import { SDKManifest, SDKImageConfig } from "./ManifestTypes"
+import { SDKVersion } from "../StartSdk"
 
 export function setupManifest<
   Id extends string,
-  Version extends ManifestVersion,
+  Version extends string,
   Dependencies extends Record<string, unknown>,
   VolumesTypes extends VolumeId,
   AssetTypes extends VolumeId,
   ImagesTypes extends ImageId,
-  Manifest extends SDKManifest & {
+  Manifest extends SDKManifest<Version, Satisfies> & {
     dependencies: Dependencies
     id: Id
-    version: Version
     assets: AssetTypes[]
-    images: Record<ImagesTypes, ImageConfig>
+    images: Record<ImagesTypes, SDKImageConfig>
     volumes: VolumesTypes[]
   },
->(manifest: Manifest): Manifest {
-  return manifest
+  Satisfies extends string[] = [],
+>(manifest: Manifest & { version: Version }): Manifest & T.Manifest {
+  const images = Object.entries(manifest.images).reduce(
+    (images, [k, v]) => {
+      v.arch = v.arch || ["aarch64", "x86_64"]
+      if (v.emulateMissingAs === undefined)
+        v.emulateMissingAs = v.arch[0] || null
+      images[k] = v as ImageConfig
+      return images
+    },
+    {} as { [k: string]: ImageConfig },
+  )
+  return {
+    ...manifest,
+    gitHash: null,
+    osVersion: SDKVersion,
+    satisfies: manifest.satisfies || [],
+    images,
+    alerts: {
+      install: manifest.alerts?.install || null,
+      update: manifest.alerts?.update || null,
+      uninstall: manifest.alerts?.uninstall || null,
+      restore: manifest.alerts?.restore || null,
+      start: manifest.alerts?.start || null,
+      stop: manifest.alerts?.stop || null,
+    },
+    hasConfig: manifest.hasConfig === undefined ? true : manifest.hasConfig,
+    hardwareRequirements: {
+      device: Object.fromEntries(
+        Object.entries(manifest.hardwareRequirements?.device || {}).map(
+          ([k, v]) => [k, v.source],
+        ),
+      ),
+      ram: manifest.hardwareRequirements?.ram || null,
+      arch:
+        manifest.hardwareRequirements?.arch === undefined
+          ? Object.values(images).reduce(
+              (arch, config) => {
+                if (config.emulateMissingAs) {
+                  return arch
+                }
+                if (arch === null) {
+                  return config.arch
+                }
+                return arch.filter((a) => config.arch.includes(a))
+              },
+              null as string[] | null,
+            )
+          : manifest.hardwareRequirements?.arch,
+    },
+  }
 }
diff --git a/sdk/lib/osBindings/CheckDependenciesResult.ts b/sdk/lib/osBindings/CheckDependenciesResult.ts
index c102c733a..d349bdf18 100644
--- a/sdk/lib/osBindings/CheckDependenciesResult.ts
+++ b/sdk/lib/osBindings/CheckDependenciesResult.ts
@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HealthCheckId } from "./HealthCheckId"
 import type { HealthCheckResult } from "./HealthCheckResult"
 import type { PackageId } from "./PackageId"
 
@@ -6,6 +7,7 @@ export type CheckDependenciesResult = {
   packageId: PackageId
   isInstalled: boolean
   isRunning: boolean
-  healthChecks: Array<HealthCheckResult>
+  configSatisfied: boolean
+  healthChecks: { [key: HealthCheckId]: HealthCheckResult }
   version: string | null
 }
diff --git a/sdk/lib/osBindings/CurrentDependencyInfo.ts b/sdk/lib/osBindings/CurrentDependencyInfo.ts
index de46e4b52..2096a0113 100644
--- a/sdk/lib/osBindings/CurrentDependencyInfo.ts
+++ b/sdk/lib/osBindings/CurrentDependencyInfo.ts
@@ -2,9 +2,8 @@
 import type { DataUrl } from "./DataUrl"
 
 export type CurrentDependencyInfo = {
-  title: string
-  icon: DataUrl
-  registryUrl: string
-  versionSpec: string
+  title: string | null
+  icon: DataUrl | null
+  versionRange: string
   configSatisfied: boolean
 } & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] })
diff --git a/sdk/lib/osBindings/DepInfo.ts b/sdk/lib/osBindings/DepInfo.ts
index 20b9eb4cd..d635cca3b 100644
--- a/sdk/lib/osBindings/DepInfo.ts
+++ b/sdk/lib/osBindings/DepInfo.ts
@@ -1,3 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PathOrUrl } from "./PathOrUrl"
 
-export type DepInfo = { description: string | null; optional: boolean }
+export type DepInfo = {
+  description: string | null
+  optional: boolean
+  s9pk: PathOrUrl | null
+}
diff --git a/sdk/lib/osBindings/DependencyMetadata.ts b/sdk/lib/osBindings/DependencyMetadata.ts
new file mode 100644
index 000000000..3d56ef052
--- /dev/null
+++ b/sdk/lib/osBindings/DependencyMetadata.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DataUrl } from "./DataUrl"
+
+export type DependencyMetadata = {
+  title: string | null
+  icon: DataUrl | null
+  description: string | null
+  optional: boolean
+}
diff --git a/sdk/lib/osBindings/DependencyRequirement.ts b/sdk/lib/osBindings/DependencyRequirement.ts
index d0415bee9..01b8e12ce 100644
--- a/sdk/lib/osBindings/DependencyRequirement.ts
+++ b/sdk/lib/osBindings/DependencyRequirement.ts
@@ -5,7 +5,6 @@ export type DependencyRequirement =
       kind: "running"
       id: string
       healthChecks: string[]
-      versionSpec: string
-      registryUrl: string
+      versionRange: string
     }
-  | { kind: "exists"; id: string; versionSpec: string; registryUrl: string }
+  | { kind: "exists"; id: string; versionRange: string }
diff --git a/sdk/lib/osBindings/FullIndex.ts b/sdk/lib/osBindings/FullIndex.ts
index 4d9914015..c7889760a 100644
--- a/sdk/lib/osBindings/FullIndex.ts
+++ b/sdk/lib/osBindings/FullIndex.ts
@@ -6,6 +6,7 @@ import type { PackageIndex } from "./PackageIndex"
 import type { SignerInfo } from "./SignerInfo"
 
 export type FullIndex = {
+  name: string | null
   icon: DataUrl | null
   package: PackageIndex
   os: OsIndex
diff --git a/sdk/lib/osBindings/GetVersionParams.ts b/sdk/lib/osBindings/GetOsVersionParams.ts
similarity index 85%
rename from sdk/lib/osBindings/GetVersionParams.ts
rename to sdk/lib/osBindings/GetOsVersionParams.ts
index 853d76022..de0458645 100644
--- a/sdk/lib/osBindings/GetVersionParams.ts
+++ b/sdk/lib/osBindings/GetOsVersionParams.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type GetVersionParams = {
+export type GetOsVersionParams = {
   source: string | null
   target: string | null
   serverId: string | null
diff --git a/sdk/lib/osBindings/GetPackageParams.ts b/sdk/lib/osBindings/GetPackageParams.ts
index 8b852c35c..3dde55b28 100644
--- a/sdk/lib/osBindings/GetPackageParams.ts
+++ b/sdk/lib/osBindings/GetPackageParams.ts
@@ -7,5 +7,5 @@ export type GetPackageParams = {
   id: PackageId | null
   version: string | null
   sourceVersion: Version | null
-  otherVersions: PackageDetailLevel | null
+  otherVersions: PackageDetailLevel
 }
diff --git a/sdk/lib/osBindings/HardwareRequirements.ts b/sdk/lib/osBindings/HardwareRequirements.ts
index 0e1da1f36..3579e9524 100644
--- a/sdk/lib/osBindings/HardwareRequirements.ts
+++ b/sdk/lib/osBindings/HardwareRequirements.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type HardwareRequirements = {
-  device: { [key: string]: string }
+  device: { device?: string; processor?: string }
   ram: number | null
   arch: string[] | null
 }
diff --git a/sdk/lib/osBindings/InstallParams.ts b/sdk/lib/osBindings/InstallParams.ts
new file mode 100644
index 000000000..2b70ad593
--- /dev/null
+++ b/sdk/lib/osBindings/InstallParams.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId"
+import type { Version } from "./Version"
+
+export type InstallParams = {
+  registry: string
+  id: PackageId
+  version: Version
+}
diff --git a/sdk/lib/osBindings/Manifest.ts b/sdk/lib/osBindings/Manifest.ts
index d808f47a2..51f14935a 100644
--- a/sdk/lib/osBindings/Manifest.ts
+++ b/sdk/lib/osBindings/Manifest.ts
@@ -13,6 +13,7 @@ export type Manifest = {
   id: PackageId
   title: string
   version: Version
+  satisfies: Array<Version>
   releaseNotes: string
   license: string
   wrapperRepo: string
diff --git a/sdk/lib/osBindings/PackageDetailLevel.ts b/sdk/lib/osBindings/PackageDetailLevel.ts
index b5e1ae42b..f2016f632 100644
--- a/sdk/lib/osBindings/PackageDetailLevel.ts
+++ b/sdk/lib/osBindings/PackageDetailLevel.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type PackageDetailLevel = "short" | "full"
+export type PackageDetailLevel = "none" | "short" | "full"
diff --git a/sdk/lib/osBindings/PackageVersionInfo.ts b/sdk/lib/osBindings/PackageVersionInfo.ts
index 364c530f2..80481acb3 100644
--- a/sdk/lib/osBindings/PackageVersionInfo.ts
+++ b/sdk/lib/osBindings/PackageVersionInfo.ts
@@ -1,8 +1,11 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Alerts } from "./Alerts"
 import type { DataUrl } from "./DataUrl"
+import type { DependencyMetadata } from "./DependencyMetadata"
 import type { Description } from "./Description"
 import type { HardwareRequirements } from "./HardwareRequirements"
 import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
+import type { PackageId } from "./PackageId"
 import type { RegistryAsset } from "./RegistryAsset"
 
 export type PackageVersionInfo = {
@@ -16,6 +19,9 @@ export type PackageVersionInfo = {
   upstreamRepo: string
   supportSite: string
   marketingSite: string
+  donationUrl: string | null
+  alerts: Alerts
+  dependencyMetadata: { [key: PackageId]: DependencyMetadata }
   osVersion: string
   hardwareRequirements: HardwareRequirements
   sourceVersion: string | null
diff --git a/sdk/lib/osBindings/PathOrUrl.ts b/sdk/lib/osBindings/PathOrUrl.ts
new file mode 100644
index 000000000..9c4ff1e28
--- /dev/null
+++ b/sdk/lib/osBindings/PathOrUrl.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type PathOrUrl = string
diff --git a/sdk/lib/osBindings/RegistryAsset.ts b/sdk/lib/osBindings/RegistryAsset.ts
index 3eb13e8a4..41f09431f 100644
--- a/sdk/lib/osBindings/RegistryAsset.ts
+++ b/sdk/lib/osBindings/RegistryAsset.ts
@@ -3,6 +3,7 @@ import type { AnySignature } from "./AnySignature"
 import type { AnyVerifyingKey } from "./AnyVerifyingKey"
 
 export type RegistryAsset<Commitment> = {
+  publishedAt: string
   url: string
   commitment: Commitment
   signatures: { [key: AnyVerifyingKey]: AnySignature }
diff --git a/sdk/lib/osBindings/RegistryInfo.ts b/sdk/lib/osBindings/RegistryInfo.ts
new file mode 100644
index 000000000..f9265fdec
--- /dev/null
+++ b/sdk/lib/osBindings/RegistryInfo.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Category } from "./Category"
+import type { DataUrl } from "./DataUrl"
+
+export type RegistryInfo = {
+  name: string | null
+  icon: DataUrl | null
+  categories: { [key: string]: Category }
+}
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 32e57956a..70ce65f29 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -37,6 +37,7 @@ export { CurrentDependencyInfo } from "./CurrentDependencyInfo"
 export { DataUrl } from "./DataUrl"
 export { Dependencies } from "./Dependencies"
 export { DependencyKind } from "./DependencyKind"
+export { DependencyMetadata } from "./DependencyMetadata"
 export { DependencyRequirement } from "./DependencyRequirement"
 export { DepInfo } from "./DepInfo"
 export { Description } from "./Description"
@@ -51,6 +52,7 @@ export { FullIndex } from "./FullIndex"
 export { FullProgress } from "./FullProgress"
 export { GetHostInfoParams } from "./GetHostInfoParams"
 export { GetOsAssetParams } from "./GetOsAssetParams"
+export { GetOsVersionParams } from "./GetOsVersionParams"
 export { GetPackageParams } from "./GetPackageParams"
 export { GetPackageResponseFull } from "./GetPackageResponseFull"
 export { GetPackageResponse } from "./GetPackageResponse"
@@ -61,7 +63,6 @@ export { GetSslCertificateParams } from "./GetSslCertificateParams"
 export { GetSslKeyParams } from "./GetSslKeyParams"
 export { GetStoreParams } from "./GetStoreParams"
 export { GetSystemSmtpParams } from "./GetSystemSmtpParams"
-export { GetVersionParams } from "./GetVersionParams"
 export { Governor } from "./Governor"
 export { Guid } from "./Guid"
 export { HardwareRequirements } from "./HardwareRequirements"
@@ -82,6 +83,7 @@ export { InstalledState } from "./InstalledState"
 export { InstalledVersionParams } from "./InstalledVersionParams"
 export { InstallingInfo } from "./InstallingInfo"
 export { InstallingState } from "./InstallingState"
+export { InstallParams } from "./InstallParams"
 export { IpHostname } from "./IpHostname"
 export { IpInfo } from "./IpInfo"
 export { LanInfo } from "./LanInfo"
@@ -109,11 +111,13 @@ export { PackageVersionInfo } from "./PackageVersionInfo"
 export { ParamsMaybePackageId } from "./ParamsMaybePackageId"
 export { ParamsPackageId } from "./ParamsPackageId"
 export { PasswordType } from "./PasswordType"
+export { PathOrUrl } from "./PathOrUrl"
 export { ProcedureId } from "./ProcedureId"
 export { Progress } from "./Progress"
 export { Public } from "./Public"
 export { RecoverySource } from "./RecoverySource"
 export { RegistryAsset } from "./RegistryAsset"
+export { RegistryInfo } from "./RegistryInfo"
 export { RemoveActionParams } from "./RemoveActionParams"
 export { RemoveAddressParams } from "./RemoveAddressParams"
 export { RemoveVersionParams } from "./RemoveVersionParams"
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
index c5003c55b..a413d76b8 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -369,7 +369,7 @@ describe("values", () => {
           setupManifest({
             id: "testOutput",
             title: "",
-            version: "1.0",
+            version: "1.0.0:0",
             releaseNotes: "",
             license: "",
             replaces: [],
@@ -395,9 +395,10 @@ describe("values", () => {
               stop: null,
             },
             dependencies: {
-              remoteTest: {
+              "remote-test": {
                 description: "",
                 optional: true,
+                s9pk: "https://example.com/remote-test.s9pk",
               },
             },
           }),
diff --git a/sdk/lib/test/emverList.test.ts b/sdk/lib/test/emverList.test.ts
deleted file mode 100644
index 07dbb5aaf..000000000
--- a/sdk/lib/test/emverList.test.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-import { EmVer, notRange, rangeAnd, rangeOf, rangeOr } from "../emverLite/mod"
-describe("EmVer", () => {
-  {
-    {
-      const checker = rangeOf("*")
-      test("rangeOf('*')", () => {
-        checker.check("1")
-        checker.check("1.2")
-        checker.check("1.2.3")
-        checker.check("1.2.3.4")
-        checker.check("1.2.3.4.5")
-        checker.check("1.2.3.4.5.6")
-        expect(checker.check("1")).toEqual(true)
-        expect(checker.check("1.2")).toEqual(true)
-        expect(checker.check("1.2.3.4")).toEqual(true)
-      })
-      test("rangeOf('*') invalid", () => {
-        expect(() => checker.check("a")).toThrow()
-        expect(() => checker.check("")).toThrow()
-        expect(() => checker.check("1..3")).toThrow()
-      })
-    }
-
-    {
-      const checker = rangeOf(">1.2.3.4")
-      test(`rangeOf(">1.2.3.4") valid`, () => {
-        expect(checker.check("2-beta123")).toEqual(true)
-        expect(checker.check("2")).toEqual(true)
-        expect(checker.check("1.2.3.5")).toEqual(true)
-        expect(checker.check("1.2.3.4.1")).toEqual(true)
-      })
-
-      test(`rangeOf(">1.2.3.4") invalid`, () => {
-        expect(checker.check("1.2.3.4")).toEqual(false)
-        expect(checker.check("1.2.3")).toEqual(false)
-        expect(checker.check("1")).toEqual(false)
-      })
-    }
-    {
-      const checker = rangeOf("=1.2.3")
-      test(`rangeOf("=1.2.3") valid`, () => {
-        expect(checker.check("1.2.3")).toEqual(true)
-      })
-
-      test(`rangeOf("=1.2.3") invalid`, () => {
-        expect(checker.check("2")).toEqual(false)
-        expect(checker.check("1.2.3.1")).toEqual(false)
-        expect(checker.check("1.2")).toEqual(false)
-      })
-    }
-    {
-      const checker = rangeOf(">=1.2.3.4")
-      test(`rangeOf(">=1.2.3.4") valid`, () => {
-        expect(checker.check("2")).toEqual(true)
-        expect(checker.check("1.2.3.5")).toEqual(true)
-        expect(checker.check("1.2.3.4.1")).toEqual(true)
-        expect(checker.check("1.2.3.4")).toEqual(true)
-      })
-
-      test(`rangeOf(">=1.2.3.4") invalid`, () => {
-        expect(checker.check("1.2.3")).toEqual(false)
-        expect(checker.check("1")).toEqual(false)
-      })
-    }
-    {
-      const checker = rangeOf("<1.2.3.4")
-      test(`rangeOf("<1.2.3.4") invalid`, () => {
-        expect(checker.check("2")).toEqual(false)
-        expect(checker.check("1.2.3.5")).toEqual(false)
-        expect(checker.check("1.2.3.4.1")).toEqual(false)
-        expect(checker.check("1.2.3.4")).toEqual(false)
-      })
-
-      test(`rangeOf("<1.2.3.4") valid`, () => {
-        expect(checker.check("1.2.3")).toEqual(true)
-        expect(checker.check("1")).toEqual(true)
-      })
-    }
-    {
-      const checker = rangeOf("<=1.2.3.4")
-      test(`rangeOf("<=1.2.3.4") invalid`, () => {
-        expect(checker.check("2")).toEqual(false)
-        expect(checker.check("1.2.3.5")).toEqual(false)
-        expect(checker.check("1.2.3.4.1")).toEqual(false)
-      })
-
-      test(`rangeOf("<=1.2.3.4") valid`, () => {
-        expect(checker.check("1.2.3")).toEqual(true)
-        expect(checker.check("1")).toEqual(true)
-        expect(checker.check("1.2.3.4")).toEqual(true)
-      })
-    }
-
-    {
-      const checkA = rangeOf(">1")
-      const checkB = rangeOf("<=2")
-
-      const checker = rangeAnd(checkA, checkB)
-      test(`simple and(checkers) valid`, () => {
-        expect(checker.check("2")).toEqual(true)
-
-        expect(checker.check("1.1")).toEqual(true)
-      })
-      test(`simple and(checkers) invalid`, () => {
-        expect(checker.check("2.1")).toEqual(false)
-        expect(checker.check("1")).toEqual(false)
-        expect(checker.check("0")).toEqual(false)
-      })
-    }
-    {
-      const checkA = rangeOf("<1")
-      const checkB = rangeOf("=2")
-
-      const checker = rangeOr(checkA, checkB)
-      test(`simple or(checkers) valid`, () => {
-        expect(checker.check("2")).toEqual(true)
-        expect(checker.check("0.1")).toEqual(true)
-      })
-      test(`simple or(checkers) invalid`, () => {
-        expect(checker.check("2.1")).toEqual(false)
-        expect(checker.check("1")).toEqual(false)
-        expect(checker.check("1.1")).toEqual(false)
-      })
-    }
-
-    {
-      const checker = rangeOf("1.2.*")
-      test(`rangeOf(1.2.*) valid`, () => {
-        expect(checker.check("1.2")).toEqual(true)
-        expect(checker.check("1.2.1")).toEqual(true)
-      })
-      test(`rangeOf(1.2.*) invalid`, () => {
-        expect(checker.check("1.3")).toEqual(false)
-        expect(checker.check("1.3.1")).toEqual(false)
-
-        expect(checker.check("1.1.1")).toEqual(false)
-        expect(checker.check("1.1")).toEqual(false)
-        expect(checker.check("1")).toEqual(false)
-
-        expect(checker.check("2")).toEqual(false)
-      })
-    }
-
-    {
-      const checker = notRange(rangeOf("1.2.*"))
-      test(`notRange(rangeOf(1.2.*)) valid`, () => {
-        expect(checker.check("1.3")).toEqual(true)
-        expect(checker.check("1.3.1")).toEqual(true)
-
-        expect(checker.check("1.1.1")).toEqual(true)
-        expect(checker.check("1.1")).toEqual(true)
-        expect(checker.check("1")).toEqual(true)
-
-        expect(checker.check("2")).toEqual(true)
-      })
-      test(`notRange(rangeOf(1.2.*)) invalid `, () => {
-        expect(checker.check("1.2")).toEqual(false)
-        expect(checker.check("1.2.1")).toEqual(false)
-      })
-    }
-    {
-      const checker = rangeOf("!1.2.*")
-      test(`!(rangeOf(1.2.*)) valid`, () => {
-        expect(checker.check("1.3")).toEqual(true)
-        expect(checker.check("1.3.1")).toEqual(true)
-
-        expect(checker.check("1.1.1")).toEqual(true)
-        expect(checker.check("1.1")).toEqual(true)
-        expect(checker.check("1")).toEqual(true)
-
-        expect(checker.check("2")).toEqual(true)
-      })
-      test(`!(rangeOf(1.2.*)) invalid `, () => {
-        expect(checker.check("1.2")).toEqual(false)
-        expect(checker.check("1.2.1")).toEqual(false)
-      })
-    }
-    {
-      test(`no and ranges`, () => {
-        expect(() => rangeAnd()).toThrow()
-      })
-      test(`no or ranges`, () => {
-        expect(() => rangeOr()).toThrow()
-      })
-    }
-    {
-      const checker = rangeOf("!>1.2.3.4")
-      test(`rangeOf("!>1.2.3.4") invalid`, () => {
-        expect(checker.check("2")).toEqual(false)
-        expect(checker.check("1.2.3.5")).toEqual(false)
-        expect(checker.check("1.2.3.4.1")).toEqual(false)
-      })
-
-      test(`rangeOf("!>1.2.3.4") valid`, () => {
-        expect(checker.check("1.2.3.4")).toEqual(true)
-        expect(checker.check("1.2.3")).toEqual(true)
-        expect(checker.check("1")).toEqual(true)
-      })
-    }
-
-    {
-      test(">1 && =1.2", () => {
-        const checker = rangeOf(">1 && =1.2")
-
-        expect(checker.check("1.2")).toEqual(true)
-        expect(checker.check("1.2.1")).toEqual(false)
-      })
-      test("=1 || =2", () => {
-        const checker = rangeOf("=1 || =2")
-
-        expect(checker.check("1")).toEqual(true)
-        expect(checker.check("2")).toEqual(true)
-        expect(checker.check("3")).toEqual(false)
-      })
-
-      test(">1 && =1.2 || =2", () => {
-        const checker = rangeOf(">1 && =1.2 || =2")
-
-        expect(checker.check("1.2")).toEqual(true)
-        expect(checker.check("1")).toEqual(false)
-        expect(checker.check("2")).toEqual(true)
-        expect(checker.check("3")).toEqual(false)
-      })
-
-      test("&& before || order of operationns:  <1.5 && >1 || >1.5 && <3", () => {
-        const checker = rangeOf("<1.5 && >1 || >1.5 && <3")
-        expect(checker.check("1.1")).toEqual(true)
-        expect(checker.check("2")).toEqual(true)
-
-        expect(checker.check("1.5")).toEqual(false)
-        expect(checker.check("1")).toEqual(false)
-        expect(checker.check("3")).toEqual(false)
-      })
-
-      test("Compare function on the emver", () => {
-        const a = EmVer.from("1.2.3")
-        const b = EmVer.from("1.2.4")
-
-        expect(a.compare(b)).toEqual("less")
-        expect(b.compare(a)).toEqual("greater")
-        expect(a.compare(a)).toEqual("equal")
-      })
-      test("Compare for sort function on the emver", () => {
-        const a = EmVer.from("1.2.3")
-        const b = EmVer.from("1.2.4")
-
-        expect(a.compareForSort(b)).toEqual(-1)
-        expect(b.compareForSort(a)).toEqual(1)
-        expect(a.compareForSort(a)).toEqual(0)
-      })
-    }
-  }
-})
diff --git a/sdk/lib/test/exverList.test.ts b/sdk/lib/test/exverList.test.ts
new file mode 100644
index 000000000..e29a9f0d1
--- /dev/null
+++ b/sdk/lib/test/exverList.test.ts
@@ -0,0 +1,355 @@
+import { VersionRange, ExtendedVersion } from "../exver"
+describe("ExVer", () => {
+  {
+    {
+      const checker = VersionRange.parse("*")
+      test("VersionRange.parse('*')", () => {
+        checker.satisfiedBy(ExtendedVersion.parse("1:0"))
+        checker.satisfiedBy(ExtendedVersion.parse("1.2:0"))
+        checker.satisfiedBy(ExtendedVersion.parse("1.2.3:0"))
+        checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4"))
+        checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4.5"))
+        checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4.5.6"))
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4"))).toEqual(
+          true,
+        )
+      })
+      test("VersionRange.parse('*') invalid", () => {
+        expect(() => checker.satisfiedBy(ExtendedVersion.parse("a"))).toThrow()
+        expect(() => checker.satisfiedBy(ExtendedVersion.parse(""))).toThrow()
+        expect(() =>
+          checker.satisfiedBy(ExtendedVersion.parse("1..3")),
+        ).toThrow()
+      })
+    }
+
+    {
+      const checker = VersionRange.parse(">1.2.3:4")
+      test(`VersionRange.parse(">1.2.3:4") valid`, () => {
+        expect(
+          checker.satisfiedBy(ExtendedVersion.parse("2-beta.123:0")),
+        ).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:5"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4.1"))).toEqual(
+          true,
+        )
+      })
+
+      test(`VersionRange.parse(">1.2.3:4") invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(false)
+      })
+    }
+    {
+      const checker = VersionRange.parse("=1.2.3")
+      test(`VersionRange.parse("=1.2.3") valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:0"))).toEqual(
+          true,
+        )
+      })
+
+      test(`VersionRange.parse("=1.2.3") invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(false)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:1"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2:0"))).toEqual(
+          false,
+        )
+      })
+    }
+    {
+      const checker = VersionRange.parse(">=1.2.3:4")
+      test(`VersionRange.parse(">=1.2.3:4") valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:5"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4.1"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4"))).toEqual(
+          true,
+        )
+      })
+
+      test(`VersionRange.parse(">=1.2.3:4") invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(false)
+      })
+    }
+    {
+      const checker = VersionRange.parse("<1.2.3:4")
+      test(`VersionRange.parse("<1.2.3:4") invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(false)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:5"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4.1"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4"))).toEqual(
+          false,
+        )
+      })
+
+      test(`VersionRange.parse("<1.2.3:4") valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(true)
+      })
+    }
+    {
+      const checker = VersionRange.parse("<=1.2.3:4")
+      test(`VersionRange.parse("<=1.2.3:4") invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(false)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:5"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4.1"))).toEqual(
+          false,
+        )
+      })
+
+      test(`VersionRange.parse("<=1.2.3:4") valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4"))).toEqual(
+          true,
+        )
+      })
+    }
+
+    {
+      const checkA = VersionRange.parse(">1")
+      const checkB = VersionRange.parse("<=2")
+
+      const checker = checkA.and(checkB)
+      test(`simple and(checkers) valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1:0"))).toEqual(
+          true,
+        )
+      })
+      test(`simple and(checkers) invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2.1:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(false)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(false)
+      })
+    }
+    {
+      const checkA = VersionRange.parse("<1")
+      const checkB = VersionRange.parse("=2")
+
+      const checker = checkA.or(checkB)
+      test(`simple or(checkers) valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("0.1:0"))).toEqual(
+          true,
+        )
+      })
+      test(`simple or(checkers) invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2.1:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(false)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1:0"))).toEqual(
+          false,
+        )
+      })
+    }
+
+    {
+      const checker = VersionRange.parse("~1.2")
+      test(`VersionRange.parse(~1.2) valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.1:0"))).toEqual(
+          true,
+        )
+      })
+      test(`VersionRange.parse(~1.2) invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.3:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.3.1:0"))).toEqual(
+          false,
+        )
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1.1:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(false)
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(false)
+      })
+    }
+
+    {
+      const checker = VersionRange.parse("~1.2").not()
+      test(`VersionRange.parse(~1.2).not() valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.3:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.3.1:0"))).toEqual(
+          true,
+        )
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1.1:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(true)
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+      })
+      test(`VersionRange.parse(~1.2).not() invalid `, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.1:0"))).toEqual(
+          false,
+        )
+      })
+    }
+    {
+      const checker = VersionRange.parse("!~1.2")
+      test(`!(VersionRange.parse(~1.2)) valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.3:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.3.1:0"))).toEqual(
+          true,
+        )
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1.1:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(true)
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+      })
+      test(`!(VersionRange.parse(~1.2)) invalid `, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.1:0"))).toEqual(
+          false,
+        )
+      })
+    }
+    {
+      const checker = VersionRange.parse("!>1.2.3:4")
+      test(`VersionRange.parse("!>1.2.3:4") invalid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(false)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:5"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4.1"))).toEqual(
+          false,
+        )
+      })
+
+      test(`VersionRange.parse("!>1.2.3:4") valid`, () => {
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:4"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.3:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(true)
+      })
+    }
+
+    {
+      test(">1 && =1.2", () => {
+        const checker = VersionRange.parse(">1 && =1.2")
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2.1:0"))).toEqual(
+          false,
+        )
+      })
+      test("=1 || =2", () => {
+        const checker = VersionRange.parse("=1 || =2")
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("3:0"))).toEqual(false)
+      })
+
+      test(">1 && =1.2 || =2", () => {
+        const checker = VersionRange.parse(">1 && =1.2 || =2")
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.2:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(false)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("3:0"))).toEqual(false)
+      })
+
+      test("&& before || order of operationns:  <1.5 && >1 || >1.5 && <3", () => {
+        const checker = VersionRange.parse("<1.5 && >1 || >1.5 && <3")
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.1:0"))).toEqual(
+          true,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("2:0"))).toEqual(true)
+
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1.5:0"))).toEqual(
+          false,
+        )
+        expect(checker.satisfiedBy(ExtendedVersion.parse("1:0"))).toEqual(false)
+        expect(checker.satisfiedBy(ExtendedVersion.parse("3:0"))).toEqual(false)
+      })
+
+      test("Compare function on the emver", () => {
+        const a = ExtendedVersion.parse("1.2.3:0")
+        const b = ExtendedVersion.parse("1.2.4:0")
+
+        expect(a.compare(b)).toEqual("less")
+        expect(b.compare(a)).toEqual("greater")
+        expect(a.compare(a)).toEqual("equal")
+      })
+      test("Compare for sort function on the emver", () => {
+        const a = ExtendedVersion.parse("1.2.3:0")
+        const b = ExtendedVersion.parse("1.2.4:0")
+
+        expect(a.compareForSort(b)).toEqual(-1)
+        expect(b.compareForSort(a)).toEqual(1)
+        expect(a.compareForSort(a)).toEqual(0)
+      })
+    }
+  }
+})
diff --git a/sdk/lib/test/output.sdk.ts b/sdk/lib/test/output.sdk.ts
index 189491be5..c56e05e60 100644
--- a/sdk/lib/test/output.sdk.ts
+++ b/sdk/lib/test/output.sdk.ts
@@ -7,7 +7,7 @@ export const sdk = StartSdk.of()
     setupManifest({
       id: "testOutput",
       title: "",
-      version: "1.0",
+      version: "1.0:0",
       releaseNotes: "",
       license: "",
       replaces: [],
@@ -33,9 +33,10 @@ export const sdk = StartSdk.of()
         stop: null,
       },
       dependencies: {
-        remoteTest: {
+        "remote-test": {
           description: "",
           optional: false,
+          s9pk: "https://example.com/remote-test.s9pk",
         },
       },
     }),
diff --git a/sdk/lib/test/setupDependencyConfig.test.ts b/sdk/lib/test/setupDependencyConfig.test.ts
index 5fa4a0ddf..622559eb6 100644
--- a/sdk/lib/test/setupDependencyConfig.test.ts
+++ b/sdk/lib/test/setupDependencyConfig.test.ts
@@ -21,7 +21,7 @@ describe("setupDependencyConfig", () => {
       dependencyConfig: async ({}) => {},
     })
     sdk.setupDependencyConfig(testConfig, {
-      remoteTest,
+      "remote-test": remoteTest,
     })
   })
 })
diff --git a/sdk/lib/test/utils.splitCommand.test.ts b/sdk/lib/test/utils.splitCommand.test.ts
deleted file mode 100644
index aafddb177..000000000
--- a/sdk/lib/test/utils.splitCommand.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { getHostname } from "../util/getServiceInterface"
-import { splitCommand } from "../util/splitCommand"
-
-describe("splitCommand ", () => {
-  const inputToExpected = [
-    ["cat", ["cat"]],
-    [["cat"], ["cat"]],
-    [
-      ["cat", "hello all my homies"],
-      ["cat", "hello all my homies"],
-    ],
-    ["cat hello world", ["cat", "hello", "world"]],
-    ["cat hello 'big world'", ["cat", "hello", "big world"]],
-    [`cat hello "big world"`, ["cat", "hello", "big world"]],
-    [
-      `cat hello "big world's are the greatest"`,
-      ["cat", "hello", "big world's are the greatest"],
-    ],
-    // Too many spaces
-    ["cat      ", ["cat"]],
-    [["cat   "], ["cat   "]],
-    [
-      ["cat   ", "hello all my homies    "],
-      ["cat   ", "hello all my homies    "],
-    ],
-    ["cat        hello   world ", ["cat", "hello", "world"]],
-    [
-      "        cat      hello     'big  world'       ",
-      ["cat", "hello", "big  world"],
-    ],
-    [
-      `     cat     hello    "big   world"       `,
-      ["cat", "hello", "big   world"],
-    ],
-  ]
-
-  for (const [input, expectValue] of inputToExpected) {
-    test(`should return ${expectValue} for ${input}`, () => {
-      expect(splitCommand(input as any)).toEqual(expectValue)
-    })
-  }
-})
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 686cb4750..e9c766448 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -12,6 +12,7 @@ import {
   LanInfo,
   BindParams,
   Manifest,
+  CheckDependenciesResult,
 } from "./osBindings"
 
 import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
@@ -154,14 +155,6 @@ export type DependencyConfig = {
   }): Promise<unknown>
 }
 
-export type ValidIfNoStupidEscape<A> = A extends
-  | `${string}'"'"'${string}`
-  | `${string}\\"${string}`
-  ? never
-  : "" extends A & ""
-    ? never
-    : A
-
 export type ConfigRes = {
   /** This should be the previous config, that way during set config we start with the previous */
   config?: null | Record<string, unknown>
@@ -188,9 +181,7 @@ export type SmtpValue = {
   password: string | null | undefined
 }
 
-export type CommandType<A extends string> =
-  | ValidIfNoStupidEscape<A>
-  | [string, ...string[]]
+export type CommandType = string | [string, ...string[]]
 
 export type DaemonReturned = {
   wait(): Promise<unknown>
@@ -470,7 +461,7 @@ export type Effects = {
    */
   checkDependencies(options: {
     packageIds: PackageId[] | null
-  }): Promise<CheckDependencyResult[]>
+  }): Promise<CheckDependenciesResult[]>
   /** Exists could be useful during the runtime to know if some service exists, option dep */
   exists(options: { packageId: PackageId }): Promise<boolean>
   /** Exists could be useful during the runtime to know if some service is running, option dep */
@@ -554,12 +545,3 @@ export type Dependencies = Array<DependencyRequirement>
 export type DeepPartial<T> = T extends {}
   ? { [P in keyof T]?: DeepPartial<T[P]> }
   : T
-
-export type CheckDependencyResult = {
-  packageId: PackageId
-  isInstalled: boolean
-  isRunning: boolean
-  healthChecks: SetHealth[]
-  version: string | null
-}
-export type CheckResults = CheckDependencyResult[]
diff --git a/sdk/lib/util/splitCommand.ts b/sdk/lib/util/splitCommand.ts
index 69f00a5a7..ac1237574 100644
--- a/sdk/lib/util/splitCommand.ts
+++ b/sdk/lib/util/splitCommand.ts
@@ -1,17 +1,8 @@
 import { arrayOf, string } from "ts-matches"
-import { ValidIfNoStupidEscape } from "../types"
 
 export const splitCommand = (
   command: string | [string, ...string[]],
 ): string[] => {
   if (arrayOf(string).test(command)) return command
-  return String(command)
-    .split('"')
-    .flatMap((x, i) =>
-      i % 2 !== 0
-        ? [x]
-        : x.split("'").flatMap((x, i) => (i % 2 !== 0 ? [x] : x.split(" "))),
-    )
-    .map((x) => x.trim())
-    .filter(Boolean)
+  return ["sh", "-c", command]
 }
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index 0a3655a7d..06d456019 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -22,9 +22,11 @@
         "@types/jest": "^29.4.0",
         "@types/lodash.merge": "^4.6.2",
         "jest": "^29.4.3",
+        "peggy": "^3.0.2",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
         "tsx": "^4.7.1",
         "typescript": "^5.0.4"
       }
@@ -1030,6 +1032,41 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/@sinclair/typebox": {
       "version": "0.25.24",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
@@ -1054,6 +1091,42 @@
         "@sinonjs/commons": "^2.0.0"
       }
     },
+    "node_modules/@ts-morph/common": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.19.0.tgz",
+      "integrity": "sha512-Unz/WHmd4pGax91rdIKWi51wnVUW11QttMEPpBiBgIewnc9UQIX7UDLxr5vRlqeByXCwhkF6VabSsI0raWcyAQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.2.12",
+        "minimatch": "^7.4.3",
+        "mkdirp": "^2.1.6",
+        "path-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/minimatch": {
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz",
+      "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
@@ -1605,6 +1678,12 @@
         "node": ">= 0.12.0"
       }
     },
+    "node_modules/code-block-writer": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
+      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
+      "dev": true
+    },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
@@ -1629,6 +1708,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1826,12 +1914,37 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
     "node_modules/fb-watchman": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
@@ -1963,6 +2076,18 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -2076,6 +2201,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-generator-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
@@ -2085,6 +2219,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -2938,6 +3084,15 @@
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/micromatch": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
@@ -2986,6 +3141,21 @@
         "node": "*"
       }
     },
+    "node_modules/mkdirp": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
+      "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3124,6 +3294,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -3157,6 +3333,22 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "node_modules/peggy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/peggy/-/peggy-3.0.2.tgz",
+      "integrity": "sha512-n7chtCbEoGYRwZZ0i/O3t1cPr6o+d9Xx4Zwy2LYfzv0vjchMBU0tO+qYYyvZloBPcgRgzYvALzGWHe609JjEpg==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^10.0.0",
+        "source-map-generator": "0.8.0"
+      },
+      "bin": {
+        "peggy": "bin/peggy.js"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -3266,6 +3458,26 @@
         }
       ]
     },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
@@ -3337,6 +3549,39 @@
         "node": ">=10"
       }
     },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -3397,6 +3642,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-generator": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/source-map-generator/-/source-map-generator-0.8.0.tgz",
+      "integrity": "sha512-psgxdGMwl5MZM9S3FWee4EgsEaIjahYV5AzGnwUvPhWeITz/j6rKpysQHlQ4USdxvINlb8lKfWGIXwfkrgtqkA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/source-map-support": {
       "version": "0.5.13",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
@@ -3631,6 +3885,16 @@
       "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
       "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
     },
+    "node_modules/ts-morph": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-18.0.0.tgz",
+      "integrity": "sha512-Kg5u0mk19PIIe4islUI/HWRvm9bC1lHejK4S0oh1zaZ77TMZAEmQC0sHQYiu2RgCQFZKXz1fMVi/7nOOeirznA==",
+      "dev": true,
+      "dependencies": {
+        "@ts-morph/common": "~0.19.0",
+        "code-block-writer": "^12.0.0"
+      }
+    },
     "node_modules/ts-node": {
       "version": "10.9.1",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
@@ -3674,6 +3938,37 @@
         }
       }
     },
+    "node_modules/ts-pegjs": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ts-pegjs/-/ts-pegjs-4.2.1.tgz",
+      "integrity": "sha512-mK/O2pu6lzWUeKpEMA/wsa0GdYblfjJI1y0s0GqH6xCTvugQDOWPJbm5rY6AHivpZICuXIriCb+a7Cflbdtc2w==",
+      "dev": true,
+      "dependencies": {
+        "prettier": "^2.8.8",
+        "ts-morph": "^18.0.0"
+      },
+      "bin": {
+        "tspegjs": "dist/cli.mjs"
+      },
+      "peerDependencies": {
+        "peggy": "^3.0.2"
+      }
+    },
+    "node_modules/ts-pegjs/node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/tsx": {
       "version": "4.7.1",
       "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.1.tgz",
diff --git a/sdk/package.json b/sdk/package.json
index 8ed984a82..e03153722 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -49,9 +49,11 @@
     "@types/jest": "^29.4.0",
     "@types/lodash.merge": "^4.6.2",
     "jest": "^29.4.3",
+    "peggy": "^3.0.2",
     "prettier": "^3.2.5",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
+    "ts-pegjs": "^4.2.1",
     "tsx": "^4.7.1",
     "typescript": "^5.0.4"
   }
diff --git a/web/angular.json b/web/angular.json
index cf6c113a4..e3153139b 100644
--- a/web/angular.json
+++ b/web/angular.json
@@ -74,7 +74,8 @@
                   "with": "projects/ui/src/environments/environment.prod.ts"
                 }
               ],
-              "outputHashing": "all"
+              "outputHashing": "all",
+              "extractLicenses": false
             },
             "development": {
               "buildOptimizer": false,
diff --git a/web/package-lock.json b/web/package-lock.json
index cf32bbc01..ac1f77a6b 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -7,6 +7,7 @@
     "": {
       "name": "startos-ui",
       "version": "0.3.6",
+      "license": "MIT",
       "dependencies": {
         "@angular/animations": "^14.1.0",
         "@angular/common": "^14.1.0",
@@ -114,6 +115,7 @@
       }
     },
     "../sdk/dist": {
+      "name": "@start9labs/start-sdk",
       "version": "0.3.6-alpha5",
       "license": "MIT",
       "dependencies": {
@@ -130,9 +132,11 @@
         "@types/jest": "^29.4.0",
         "@types/lodash.merge": "^4.6.2",
         "jest": "^29.4.3",
+        "peggy": "^3.0.2",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
         "tsx": "^4.7.1",
         "typescript": "^5.0.4"
       }
diff --git a/web/package.json b/web/package.json
index a75701333..b304d4f94 100644
--- a/web/package.json
+++ b/web/package.json
@@ -3,6 +3,7 @@
   "version": "0.3.6",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
+  "license": "MIT",
   "scripts": {
     "ng": "ng",
     "check": "npm run check:shared && npm run check:marketplace && npm run check:ui && npm run check:install-wiz && npm run check:setup && npm run check:dui",
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 7bea3ea14..6236275cd 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -1,20 +1,24 @@
 {
   "name": null,
-  "ack-welcome": "0.3.6",
+  "ackWelcome": "0.3.6",
   "marketplace": {
-    "selected-url": "https://registry.start9.com/",
-    "known-hosts": {
-      "https://registry.start9.com/": {},
-      "https://community-registry.start9.com/": {}
+    "selectedUrl": "https://registry.start9.com/",
+    "knownHosts": {
+      "https://registry.start9.com/": {
+        "name": "Start9 Registry"
+      },
+      "https://community-registry.start9.com/": {
+        "name": "Community Registry"
+      }
     }
   },
   "dev": {},
   "gaming": {
     "snake": {
-      "high-score": 0
+      "highScore": 0
     }
   },
-  "ack-instructions": {},
+  "ackInstructions": {},
   "theme": "Dark",
   "widgets": []
 }
diff --git a/web/projects/marketplace/src/pages/release-notes/release-notes.component.html b/web/projects/marketplace/src/modals/release-notes/release-notes.component.html
similarity index 63%
rename from web/projects/marketplace/src/pages/release-notes/release-notes.component.html
rename to web/projects/marketplace/src/modals/release-notes/release-notes.component.html
index 74e34c88f..74661827d 100644
--- a/web/projects/marketplace/src/pages/release-notes/release-notes.component.html
+++ b/web/projects/marketplace/src/modals/release-notes/release-notes.component.html
@@ -1,6 +1,17 @@
-<ion-content class="with-widgets">
+<ion-header>
+  <ion-toolbar>
+    <ion-title>Past Release Notes</ion-title>
+    <ion-buttons slot="end">
+      <ion-button (click)="dismiss()" class="enter-click">
+        <ion-icon name="close"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content class="ion-padding with-widgets">
   <ng-container *ngIf="notes$ | async as notes; else loading">
-    <div *ngFor="let note of notes | keyvalue: asIsOrder">
+    <div *ngFor="let note of notes | keyvalue : asIsOrder">
       <ion-button
         expand="full"
         color="light"
@@ -8,7 +19,7 @@
         [class.ion-activated]="isSelected(note.key)"
         (click)="setSelected(note.key)"
       >
-        <p class="version">{{ note.key | displayEmver }}</p>
+        <p class="version">{{ note.key }}</p>
       </ion-button>
       <ion-card
         tuiElement
diff --git a/web/projects/marketplace/src/pages/release-notes/release-notes.component.scss b/web/projects/marketplace/src/modals/release-notes/release-notes.component.scss
similarity index 91%
rename from web/projects/marketplace/src/pages/release-notes/release-notes.component.scss
rename to web/projects/marketplace/src/modals/release-notes/release-notes.component.scss
index cd74c7a04..0b5ad959d 100644
--- a/web/projects/marketplace/src/pages/release-notes/release-notes.component.scss
+++ b/web/projects/marketplace/src/modals/release-notes/release-notes.component.scss
@@ -20,4 +20,5 @@
 .version {
   position: absolute;
   left: 10px;
+  text-transform: none;
 }
diff --git a/web/projects/marketplace/src/modals/release-notes/release-notes.component.ts b/web/projects/marketplace/src/modals/release-notes/release-notes.component.ts
new file mode 100644
index 000000000..d1b838570
--- /dev/null
+++ b/web/projects/marketplace/src/modals/release-notes/release-notes.component.ts
@@ -0,0 +1,69 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  Input,
+} from '@angular/core'
+import { AbstractMarketplaceService } from '../../services/marketplace.service'
+import { MarketplacePkg } from '../../types'
+import { map } from 'rxjs'
+import { Exver } from '@start9labs/shared'
+import { ModalController } from '@ionic/angular'
+
+@Component({
+  selector: 'release-notes',
+  templateUrl: './release-notes.component.html',
+  styleUrls: ['./release-notes.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ReleaseNotesComponent {
+  @Input() pkg!: MarketplacePkg
+
+  private selected: string | null = null
+
+  readonly notes$ = this.marketplaceService.getSelectedStore$().pipe(
+    map(s => {
+      return Object.entries(this.pkg.otherVersions)
+        .filter(
+          ([v, _]) =>
+            this.exver.getFlavor(v) === this.pkg.flavor &&
+            this.exver.compareExver(this.pkg.version, v) === 1,
+        )
+        .reduce(
+          (obj, [version, info]) => ({
+            ...obj,
+            [version]: info.releaseNotes,
+          }),
+          {
+            [`${this.pkg.version} (current)`]: this.pkg.releaseNotes,
+          },
+        )
+    }),
+  )
+
+  constructor(
+    private readonly marketplaceService: AbstractMarketplaceService,
+    private readonly exver: Exver,
+    private readonly modalCtrl: ModalController,
+  ) {}
+
+  async dismiss() {
+    return this.modalCtrl.dismiss()
+  }
+
+  isSelected(key: string): boolean {
+    return this.selected === key
+  }
+
+  setSelected(selected: string) {
+    this.selected = this.isSelected(selected) ? null : selected
+  }
+
+  getDocSize(key: string, { nativeElement }: ElementRef<HTMLElement>) {
+    return this.isSelected(key) ? nativeElement.scrollHeight : 0
+  }
+
+  asIsOrder(a: any, b: any) {
+    return 0
+  }
+}
diff --git a/web/projects/marketplace/src/pages/release-notes/release-notes.module.ts b/web/projects/marketplace/src/modals/release-notes/release-notes.module.ts
similarity index 86%
rename from web/projects/marketplace/src/pages/release-notes/release-notes.module.ts
rename to web/projects/marketplace/src/modals/release-notes/release-notes.module.ts
index 583631dc4..41055a314 100644
--- a/web/projects/marketplace/src/pages/release-notes/release-notes.module.ts
+++ b/web/projects/marketplace/src/modals/release-notes/release-notes.module.ts
@@ -2,12 +2,11 @@ import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { IonicModule } from '@ionic/angular'
 import {
-  EmverPipesModule,
+  ExverPipesModule,
   MarkdownPipeModule,
   TextSpinnerComponentModule,
 } from '@start9labs/shared'
 import { TuiElementModule } from '@taiga-ui/cdk'
-
 import { ReleaseNotesComponent } from './release-notes.component'
 
 @NgModule({
@@ -15,11 +14,11 @@ import { ReleaseNotesComponent } from './release-notes.component'
     CommonModule,
     IonicModule,
     TextSpinnerComponentModule,
-    EmverPipesModule,
+    ExverPipesModule,
     MarkdownPipeModule,
     TuiElementModule,
   ],
   declarations: [ReleaseNotesComponent],
   exports: [ReleaseNotesComponent],
 })
-export class ReleaseNotesModule {}
+export class ReleaseNotesComponentModule {}
diff --git a/web/projects/marketplace/src/pages/list/categories/categories.component.html b/web/projects/marketplace/src/pages/list/categories/categories.component.html
index 4e99a21c2..29613813b 100644
--- a/web/projects/marketplace/src/pages/list/categories/categories.component.html
+++ b/web/projects/marketplace/src/pages/list/categories/categories.component.html
@@ -1,9 +1,9 @@
 <ion-button
-  *ngFor="let cat of categories"
+  *ngFor="let cat of categories | keyvalue : originalOrder"
   fill="clear"
   class="category"
-  [class.category_selected]="cat === category"
-  (click)="switchCategory(cat)"
+  [class.category_selected]="cat.key === category"
+  (click)="switchCategory(cat.key)"
 >
-  {{ cat }}
+  {{ cat.value.name }}
 </ion-button>
diff --git a/web/projects/marketplace/src/pages/list/categories/categories.component.ts b/web/projects/marketplace/src/pages/list/categories/categories.component.ts
index b34761079..349a3bd18 100644
--- a/web/projects/marketplace/src/pages/list/categories/categories.component.ts
+++ b/web/projects/marketplace/src/pages/list/categories/categories.component.ts
@@ -5,6 +5,7 @@ import {
   Input,
   Output,
 } from '@angular/core'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'marketplace-categories',
@@ -17,7 +18,7 @@ import {
 })
 export class CategoriesComponent {
   @Input()
-  categories: readonly string[] = []
+  categories!: Map<string, T.Category>
 
   @Input()
   category = ''
@@ -29,4 +30,8 @@ export class CategoriesComponent {
     this.category = category
     this.categoryChange.emit(category)
   }
+
+  originalOrder() {
+    return 0
+  }
 }
diff --git a/web/projects/marketplace/src/pages/list/item/item.component.html b/web/projects/marketplace/src/pages/list/item/item.component.html
index 9a88d0869..0a22b8699 100644
--- a/web/projects/marketplace/src/pages/list/item/item.component.html
+++ b/web/projects/marketplace/src/pages/list/item/item.component.html
@@ -1,12 +1,16 @@
-<ion-item class="service-card" [routerLink]="['/marketplace', pkg.manifest.id]">
+<ion-item
+  class="service-card"
+  [routerLink]="['/marketplace', pkg.id]"
+  [queryParams]="{ flavor: pkg.flavor, version: pkg.version }"
+>
   <ion-thumbnail slot="start">
     <img alt="" [src]="pkg.icon | trustUrl" />
   </ion-thumbnail>
   <ion-label>
     <h2 class="montserrat">
-      <strong>{{ pkg.manifest.title }}</strong>
+      <strong>{{ pkg.title }}</strong>
     </h2>
-    <h3>{{ pkg.manifest.description.short }}</h3>
+    <h3>{{ pkg.description.short }}</h3>
     <ng-content></ng-content>
   </ion-label>
 </ion-item>
diff --git a/web/projects/marketplace/src/pages/release-notes/release-notes.component.ts b/web/projects/marketplace/src/pages/release-notes/release-notes.component.ts
deleted file mode 100644
index 49da475d9..000000000
--- a/web/projects/marketplace/src/pages/release-notes/release-notes.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { ChangeDetectionStrategy, Component, ElementRef } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { getPkgId } from '@start9labs/shared'
-import { AbstractMarketplaceService } from '../../services/marketplace.service'
-
-@Component({
-  selector: 'release-notes',
-  templateUrl: './release-notes.component.html',
-  styleUrls: ['./release-notes.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ReleaseNotesComponent {
-  private readonly pkgId = getPkgId(this.route)
-
-  private selected: string | null = null
-
-  readonly notes$ = this.marketplaceService.fetchReleaseNotes$(this.pkgId)
-
-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly marketplaceService: AbstractMarketplaceService,
-  ) {}
-
-  isSelected(key: string): boolean {
-    return this.selected === key
-  }
-
-  setSelected(selected: string) {
-    this.selected = this.isSelected(selected) ? null : selected
-  }
-
-  getDocSize(key: string, { nativeElement }: ElementRef<HTMLElement>) {
-    return this.isSelected(key) ? nativeElement.scrollHeight : 0
-  }
-
-  asIsOrder(a: any, b: any) {
-    return 0
-  }
-}
diff --git a/web/projects/marketplace/src/pages/show/about/about.component.html b/web/projects/marketplace/src/pages/show/about/about.component.html
index 1126f8b54..56d363071 100644
--- a/web/projects/marketplace/src/pages/show/about/about.component.html
+++ b/web/projects/marketplace/src/pages/show/about/about.component.html
@@ -1,13 +1,11 @@
 <!-- release notes -->
-<ion-item-divider>
-  New in {{ pkg.manifest.version | displayEmver }}
-</ion-item-divider>
+<ion-item-divider>New in {{ pkg.version }}</ion-item-divider>
 <ion-item lines="none" color="transparent">
   <ion-label>
-    <div [innerHTML]="pkg.manifest.releaseNotes | markdown"></div>
+    <div [innerHTML]="pkg.releaseNotes | markdown"></div>
   </ion-label>
 </ion-item>
-<ion-button routerLink="notes" fill="clear" strong>
+<ion-button fill="clear" strong (click)="presentModalNotes()">
   Past Release Notes
   <ion-icon slot="end" name="arrow-forward"></ion-icon>
 </ion-button>
@@ -15,10 +13,10 @@
 <ion-item-divider>Description</ion-item-divider>
 <ion-item lines="none" color="transparent">
   <ion-label>
-    <h2>{{ pkg.manifest.description.long }}</h2>
+    <h2>{{ pkg.description.long }}</h2>
   </ion-label>
 </ion-item>
-<div *ngIf="pkg.manifest.marketingSite as url" style="padding: 4px 0 10px 14px">
+<div *ngIf="pkg.marketingSite as url" style="padding: 4px 0 10px 14px">
   <ion-button [href]="url" target="_blank" rel="noreferrer" color="tertiary">
     View website
     <ion-icon slot="end" name="open-outline"></ion-icon>
diff --git a/web/projects/marketplace/src/pages/show/about/about.component.ts b/web/projects/marketplace/src/pages/show/about/about.component.ts
index 6626d4fbe..e9d69ebb3 100644
--- a/web/projects/marketplace/src/pages/show/about/about.component.ts
+++ b/web/projects/marketplace/src/pages/show/about/about.component.ts
@@ -1,5 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { MarketplacePkg } from '../../../types'
+import { ModalController } from '@ionic/angular'
+import { ReleaseNotesComponent } from '../../../modals/release-notes/release-notes.component'
 
 @Component({
   selector: 'marketplace-about',
@@ -10,4 +12,15 @@ import { MarketplacePkg } from '../../../types'
 export class AboutComponent {
   @Input()
   pkg!: MarketplacePkg
+
+  constructor(private readonly modalCtrl: ModalController) {}
+
+  async presentModalNotes() {
+    const modal = await this.modalCtrl.create({
+      componentProps: { pkg: this.pkg },
+      component: ReleaseNotesComponent,
+    })
+
+    await modal.present()
+  }
 }
diff --git a/web/projects/marketplace/src/pages/show/about/about.module.ts b/web/projects/marketplace/src/pages/show/about/about.module.ts
index b48bbcbaa..a110cd300 100644
--- a/web/projects/marketplace/src/pages/show/about/about.module.ts
+++ b/web/projects/marketplace/src/pages/show/about/about.module.ts
@@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
 import { RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
-import { EmverPipesModule, MarkdownPipeModule } from '@start9labs/shared'
-
+import { ExverPipesModule, MarkdownPipeModule } from '@start9labs/shared'
 import { AboutComponent } from './about.component'
+import { ReleaseNotesComponentModule } from '../../../modals/release-notes/release-notes.module'
 
 @NgModule({
   imports: [
@@ -12,7 +12,8 @@ import { AboutComponent } from './about.component'
     RouterModule,
     IonicModule,
     MarkdownPipeModule,
-    EmverPipesModule,
+    ExverPipesModule,
+    ReleaseNotesComponentModule,
   ],
   declarations: [AboutComponent],
   exports: [AboutComponent],
diff --git a/web/projects/marketplace/src/pages/show/additional/additional.component.html b/web/projects/marketplace/src/pages/show/additional/additional.component.html
index a75daa3db..03a52cc94 100644
--- a/web/projects/marketplace/src/pages/show/additional/additional.component.html
+++ b/web/projects/marketplace/src/pages/show/additional/additional.component.html
@@ -1,10 +1,10 @@
 <ion-item-divider>Additional Info</ion-item-divider>
-<ion-grid *ngIf="pkg.manifest as manifest">
+<ion-grid *ngIf="pkg">
   <ion-row>
     <ion-col responsiveCol sizeXs="12" sizeMd="6">
       <ion-item-group>
         <ion-item
-          *ngIf="manifest.gitHash as gitHash; else noHash"
+          *ngIf="pkg.gitHash as gitHash; else noHash"
           button
           detail="false"
           (click)="copy(gitHash)"
@@ -33,7 +33,7 @@ <h2>Other Versions</h2>
         <ion-item button detail="false" (click)="presentModalMd('license')">
           <ion-label>
             <h2>License</h2>
-            <p>{{ manifest.license }}</p>
+            <p>{{ pkg.license }}</p>
           </ion-label>
           <ion-icon slot="end" name="chevron-forward"></ion-icon>
         </ion-item>
@@ -53,39 +53,39 @@ <h2>Instructions</h2>
     <ion-col responsiveCol sizeXs="12" sizeMd="6">
       <ion-item-group>
         <ion-item
-          [href]="manifest.upstreamRepo"
+          [href]="pkg.upstreamRepo"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Source Repository</h2>
-            <p>{{ manifest.upstreamRepo }}</p>
+            <p>{{ pkg.upstreamRepo }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest.wrapperRepo"
+          [href]="pkg.wrapperRepo"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Wrapper Repository</h2>
-            <p>{{ manifest.wrapperRepo }}</p>
+            <p>{{ pkg.wrapperRepo }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest.supportSite"
-          [disabled]="!manifest.supportSite"
+          [href]="pkg.supportSite"
+          [disabled]="!pkg.supportSite"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Support Site</h2>
-            <p>{{ manifest.supportSite || 'Not provided' }}</p>
+            <p>{{ pkg.supportSite || 'Not provided' }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
diff --git a/web/projects/marketplace/src/pages/show/additional/additional.component.ts b/web/projects/marketplace/src/pages/show/additional/additional.component.ts
index 778ea6c54..92ad42bff 100644
--- a/web/projects/marketplace/src/pages/show/additional/additional.component.ts
+++ b/web/projects/marketplace/src/pages/show/additional/additional.component.ts
@@ -10,15 +10,9 @@ import {
   ModalController,
   ToastController,
 } from '@ionic/angular'
-import {
-  copyToClipboard,
-  displayEmver,
-  Emver,
-  MarkdownComponent,
-} from '@start9labs/shared'
+import { copyToClipboard, Exver, MarkdownComponent } from '@start9labs/shared'
 import { MarketplacePkg } from '../../../types'
 import { AbstractMarketplaceService } from '../../../services/marketplace.service'
-import { ActivatedRoute } from '@angular/router'
 
 @Component({
   selector: 'marketplace-additional',
@@ -32,15 +26,12 @@ export class AdditionalComponent {
   @Output()
   version = new EventEmitter<string>()
 
-  readonly url = this.route.snapshot.queryParamMap.get('url') || undefined
-
   constructor(
     private readonly alertCtrl: AlertController,
     private readonly modalCtrl: ModalController,
-    private readonly emver: Emver,
+    private readonly exver: Exver,
     private readonly marketplaceService: AbstractMarketplaceService,
     private readonly toastCtrl: ToastController,
-    private readonly route: ActivatedRoute,
   ) {}
 
   async copy(address: string): Promise<void> {
@@ -58,41 +49,53 @@ export class AdditionalComponent {
   }
 
   async presentAlertVersions() {
-    const alert = await this.alertCtrl.create({
-      header: 'Versions',
-      inputs: this.pkg.versions
-        .sort((a, b) => -1 * (this.emver.compare(a, b) || 0))
-        .map(v => ({
-          name: v, // for CSS
-          type: 'radio',
-          label: displayEmver(v), // appearance on screen
-          value: v, // literal SEM version value
-          checked: this.pkg.manifest.version === v,
-        })),
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Ok',
-          handler: (version: string) => this.version.emit(version),
-        },
-      ],
-    })
+    const versions = Object.keys(this.pkg.otherVersions).filter(
+      v => this.exver.getFlavor(v) === this.pkg.flavor,
+    )
+
+    if (!versions.length) {
+      const alert = await this.alertCtrl.create({
+        header: 'Versions',
+        message: 'No other versions',
+      })
+
+      await alert.present()
+    } else {
+      const alert = await this.alertCtrl.create({
+        header: 'Versions',
+        inputs: versions
+          .sort((a, b) => -1 * (this.exver.compareExver(a, b) || 0))
+          .map(v => ({
+            name: v, // for CSS
+            type: 'radio',
+            label: v, // appearance on screen
+            value: v, // literal SEM version value
+            checked: this.pkg.version === v,
+          })),
+        buttons: [
+          {
+            text: 'Cancel',
+            role: 'cancel',
+          },
+          {
+            text: 'Ok',
+            handler: (version: string) => this.version.emit(version),
+          },
+        ],
+      })
 
-    await alert.present()
+      await alert.present()
+    }
   }
 
-  async presentModalMd(title: string) {
+  async presentModalMd(asset: 'license' | 'instructions') {
     const content = this.marketplaceService.fetchStatic$(
-      this.pkg.manifest.id,
-      title,
-      this.url,
+      this.pkg,
+      asset === 'license' ? 'LICENSE.md' : 'instructions.md',
     )
 
     const modal = await this.modalCtrl.create({
-      componentProps: { title, content },
+      componentProps: { title: asset, content },
       component: MarkdownComponent,
     })
 
diff --git a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
index 4c1bfcc65..b5d3fb4db 100644
--- a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
+++ b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.html
@@ -2,7 +2,7 @@
 <ion-grid>
   <ion-row>
     <ion-col
-      *ngFor="let dep of pkg.manifest.dependencies | keyvalue"
+      *ngFor="let dep of pkg.dependencyMetadata | keyvalue"
       responsiveCol
       sizeSm="12"
       sizeMd="6"
@@ -17,7 +17,11 @@
         </ion-thumbnail>
         <ion-label>
           <h2>
-            {{ pkg.dependencyMetadata[dep.key].title }}
+            {{
+              pkg.dependencyMetadata[dep.key].title
+                ? pkg.dependencyMetadata[dep.key].title
+                : dep.key
+            }}
             <span *ngIf="dep.value.optional; else required">(optional)</span>
             <ng-template #required>
               <span>(Required)</span>
diff --git a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
index a1fed6cca..7b7f2efe7 100644
--- a/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
+++ b/web/projects/marketplace/src/pages/show/dependencies/dependencies.component.ts
@@ -11,6 +11,7 @@ export class DependenciesComponent {
   pkg!: MarketplacePkg
 
   getImg(key: string): string {
-    return this.pkg.dependencyMetadata[key].icon
+    const icon = this.pkg.dependencyMetadata[key]?.icon
+    return icon ? icon : 'assets/img/service-icons/fallback.png'
   }
 }
diff --git a/web/projects/marketplace/src/pages/show/dependencies/dependencies.module.ts b/web/projects/marketplace/src/pages/show/dependencies/dependencies.module.ts
index abb3032e9..55b220d08 100644
--- a/web/projects/marketplace/src/pages/show/dependencies/dependencies.module.ts
+++ b/web/projects/marketplace/src/pages/show/dependencies/dependencies.module.ts
@@ -2,11 +2,7 @@ import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
 import { RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
-import {
-  EmverPipesModule,
-  ResponsiveColModule,
-  SharedPipesModule,
-} from '@start9labs/shared'
+import { ResponsiveColModule, SharedPipesModule } from '@start9labs/shared'
 
 import { DependenciesComponent } from './dependencies.component'
 
@@ -16,7 +12,6 @@ import { DependenciesComponent } from './dependencies.component'
     RouterModule,
     IonicModule,
     SharedPipesModule,
-    EmverPipesModule,
     ResponsiveColModule,
   ],
   declarations: [DependenciesComponent],
diff --git a/web/projects/marketplace/src/pages/show/flavors/flavors.component.html b/web/projects/marketplace/src/pages/show/flavors/flavors.component.html
new file mode 100644
index 000000000..7a0f64aff
--- /dev/null
+++ b/web/projects/marketplace/src/pages/show/flavors/flavors.component.html
@@ -0,0 +1,21 @@
+<ion-item-divider>Alternative Implementations</ion-item-divider>
+<ion-grid>
+  <ion-row>
+    <ion-col *ngFor="let pkg of pkgs" responsiveCol sizeSm="12" sizeMd="6">
+      <ion-item
+        [routerLink]="['/marketplace', pkg.id]"
+        [queryParams]="{ flavor: pkg.flavor }"
+      >
+        <ion-thumbnail slot="start">
+          <img alt="" style="border-radius: 100%" [src]="pkg.icon | trustUrl" />
+        </ion-thumbnail>
+        <ion-label>
+          <h2>
+            {{ pkg.title }}
+          </h2>
+          <p>{{ pkg.version }}</p>
+        </ion-label>
+      </ion-item>
+    </ion-col>
+  </ion-row>
+</ion-grid>
diff --git a/web/projects/marketplace/src/pages/show/flavors/flavors.component.ts b/web/projects/marketplace/src/pages/show/flavors/flavors.component.ts
new file mode 100644
index 000000000..4927f47a1
--- /dev/null
+++ b/web/projects/marketplace/src/pages/show/flavors/flavors.component.ts
@@ -0,0 +1,12 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { MarketplacePkg } from '../../../types'
+
+@Component({
+  selector: 'marketplace-flavors',
+  templateUrl: 'flavors.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FlavorsComponent {
+  @Input()
+  pkgs!: MarketplacePkg[]
+}
diff --git a/web/projects/marketplace/src/pages/show/flavors/flavors.module.ts b/web/projects/marketplace/src/pages/show/flavors/flavors.module.ts
new file mode 100644
index 000000000..662a914fd
--- /dev/null
+++ b/web/projects/marketplace/src/pages/show/flavors/flavors.module.ts
@@ -0,0 +1,19 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { RouterModule } from '@angular/router'
+import { IonicModule } from '@ionic/angular'
+import { ResponsiveColModule, SharedPipesModule } from '@start9labs/shared'
+import { FlavorsComponent } from './flavors.component'
+
+@NgModule({
+  imports: [
+    CommonModule,
+    RouterModule,
+    IonicModule,
+    SharedPipesModule,
+    ResponsiveColModule,
+  ],
+  declarations: [FlavorsComponent],
+  exports: [FlavorsComponent],
+})
+export class FlavorsModule {}
diff --git a/web/projects/marketplace/src/pages/show/package/package.component.html b/web/projects/marketplace/src/pages/show/package/package.component.html
index 94e7006b1..aa5fcf0d0 100644
--- a/web/projects/marketplace/src/pages/show/package/package.component.html
+++ b/web/projects/marketplace/src/pages/show/package/package.component.html
@@ -1,9 +1,11 @@
 <div class="header montserrat">
   <img class="logo" alt="" [src]="pkg.icon | trustUrl" />
   <div class="text">
-    <h1 ticker class="title">{{ pkg.manifest.title }}</h1>
-    <p class="version">{{ pkg.manifest.version | displayEmver }}</p>
-    <p class="published">Released: {{ pkg.publishedAt | date: 'medium' }}</p>
+    <h1 ticker class="title">{{ pkg.title }}</h1>
+    <p class="version">{{ pkg.version }}</p>
+    <p class="published">
+      Released: {{ pkg.s9pk.publishedAt | date : 'medium' }}
+    </p>
     <ng-content></ng-content>
   </div>
 </div>
diff --git a/web/projects/marketplace/src/pages/show/package/package.module.ts b/web/projects/marketplace/src/pages/show/package/package.module.ts
index 502ee82bb..8565a2352 100644
--- a/web/projects/marketplace/src/pages/show/package/package.module.ts
+++ b/web/projects/marketplace/src/pages/show/package/package.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
 import { IonicModule } from '@ionic/angular'
 import {
-  EmverPipesModule,
+  ExverPipesModule,
   SharedPipesModule,
   TickerModule,
 } from '@start9labs/shared'
@@ -16,7 +16,7 @@ import { PackageComponent } from './package.component'
     CommonModule,
     IonicModule,
     SharedPipesModule,
-    EmverPipesModule,
+    ExverPipesModule,
     TickerModule,
   ],
 })
diff --git a/web/projects/marketplace/src/pipes/filter-packages.pipe.ts b/web/projects/marketplace/src/pipes/filter-packages.pipe.ts
index 48313376f..ed546ada9 100644
--- a/web/projects/marketplace/src/pipes/filter-packages.pipe.ts
+++ b/web/projects/marketplace/src/pipes/filter-packages.pipe.ts
@@ -26,11 +26,11 @@ export class FilterPackagesPipe implements PipeTransform {
           distance: 16,
           keys: [
             {
-              name: 'manifest.title',
+              name: 'title',
               weight: 1,
             },
             {
-              name: 'manifest.id',
+              name: 'id',
               weight: 0.5,
             },
           ],
@@ -42,19 +42,19 @@ export class FilterPackagesPipe implements PipeTransform {
           useExtendedSearch: true,
           keys: [
             {
-              name: 'manifest.title',
+              name: 'title',
               weight: 1,
             },
             {
-              name: 'manifest.id',
+              name: 'id',
               weight: 0.5,
             },
             {
-              name: 'manifest.description.short',
+              name: 'description.short',
               weight: 0.4,
             },
             {
-              name: 'manifest.description.long',
+              name: 'description.long',
               weight: 0.1,
             },
           ],
@@ -71,7 +71,8 @@ export class FilterPackagesPipe implements PipeTransform {
       .filter(p => category === 'all' || p.categories.includes(category))
       .sort((a, b) => {
         return (
-          new Date(b.publishedAt).valueOf() - new Date(a.publishedAt).valueOf()
+          new Date(b.s9pk.publishedAt).valueOf() -
+          new Date(a.s9pk.publishedAt).valueOf()
         )
       })
   }
diff --git a/web/projects/marketplace/src/public-api.ts b/web/projects/marketplace/src/public-api.ts
index b9e8c4686..600ceabfe 100644
--- a/web/projects/marketplace/src/public-api.ts
+++ b/web/projects/marketplace/src/public-api.ts
@@ -10,8 +10,6 @@ export * from './pages/list/search/search.component'
 export * from './pages/list/search/search.module'
 export * from './pages/list/skeleton/skeleton.component'
 export * from './pages/list/skeleton/skeleton.module'
-export * from './pages/release-notes/release-notes.component'
-export * from './pages/release-notes/release-notes.module'
 export * from './pages/show/about/about.component'
 export * from './pages/show/about/about.module'
 export * from './pages/show/additional/additional.component'
@@ -20,6 +18,8 @@ export * from './pages/show/dependencies/dependencies.component'
 export * from './pages/show/dependencies/dependencies.module'
 export * from './pages/show/package/package.component'
 export * from './pages/show/package/package.module'
+export * from './pages/show/flavors/flavors.component'
+export * from './pages/show/flavors/flavors.module'
 
 export * from './pipes/filter-packages.pipe'
 
diff --git a/web/projects/marketplace/src/services/marketplace.service.ts b/web/projects/marketplace/src/services/marketplace.service.ts
index af1b473d5..3fdabc426 100644
--- a/web/projects/marketplace/src/services/marketplace.service.ts
+++ b/web/projects/marketplace/src/services/marketplace.service.ts
@@ -12,18 +12,13 @@ export abstract class AbstractMarketplaceService {
 
   abstract getPackage$(
     id: string,
-    version: string,
+    version: string | null,
+    flavor: string | null,
     url?: string,
-  ): Observable<MarketplacePkg> // could be {} so need to check in show page
-
-  abstract fetchReleaseNotes$(
-    id: string,
-    url?: string,
-  ): Observable<Record<string, string>>
+  ): Observable<MarketplacePkg>
 
   abstract fetchStatic$(
-    id: string,
-    type: string,
-    url?: string,
+    pkg: MarketplacePkg,
+    type: 'LICENSE.md' | 'instructions.md',
   ): Observable<string>
 }
diff --git a/web/projects/marketplace/src/types.ts b/web/projects/marketplace/src/types.ts
index 7b99c7b80..e25aa59eb 100644
--- a/web/projects/marketplace/src/types.ts
+++ b/web/projects/marketplace/src/types.ts
@@ -1,48 +1,40 @@
-import { Url } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 
-export type StoreURL = string
-export type StoreName = string
-
-export interface StoreIdentity {
-  url: StoreURL
-  name?: StoreName
+export type GetPackageReq = {
+  id: string
+  version: string | null
+  sourceVersion: null // @TODO what is this?
+  otherVersions: 'short'
 }
-export type Marketplace = Record<StoreURL, StoreData | null>
-
-export interface StoreData {
-  info: StoreInfo
-  packages: MarketplacePkg[]
+export type GetPackageRes = T.GetPackageResponse & {
+  otherVersions: { [version: string]: T.PackageInfoShort }
 }
 
-export interface StoreInfo {
-  name: StoreName
-  categories: string[]
+export type GetPackagesReq = {
+  id: null
+  version: null
+  sourceVersion: null
+  otherVersions: 'short'
 }
-
-export type StoreIdentityWithData = StoreData & StoreIdentity
-
-export interface MarketplacePkg {
-  icon: Url
-  license: Url
-  instructions: Url
-  manifest: T.Manifest
-  categories: string[]
-  versions: string[]
-  dependencyMetadata: {
-    [id: string]: DependencyMetadata
-  }
-  publishedAt: string
+export type GetPackagesRes = {
+  [id: T.PackageId]: GetPackageRes
 }
 
-export interface DependencyMetadata {
-  title: string
-  icon: Url
-  optional: boolean
-  hidden: boolean
+export type StoreIdentity = {
+  url: string
+  name?: string
 }
 
-export interface Dependency {
-  description: string | null
-  optional: boolean
+export type Marketplace = Record<string, StoreData | null>
+
+export type StoreData = {
+  info: T.RegistryInfo
+  packages: MarketplacePkg[]
 }
+
+export type MarketplacePkg = T.PackageVersionInfo &
+  Omit<GetPackageRes, 'best'> & {
+    id: T.PackageId
+    version: string
+    flavor: string | null
+  }
diff --git a/web/projects/shared/assets/img/service-icons/fallback.png b/web/projects/shared/assets/img/service-icons/fallback.png
new file mode 100644
index 0000000000000000000000000000000000000000..75f97cc58c1e08e82be6ae6dcff8cc7e6b3296e4
GIT binary patch
literal 30439
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

literal 0
HcmV?d00001

diff --git a/web/projects/shared/src/pipes/emver/emver.module.ts b/web/projects/shared/src/pipes/emver/emver.module.ts
deleted file mode 100644
index 87b86e8cb..000000000
--- a/web/projects/shared/src/pipes/emver/emver.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core'
-import {
-  EmverComparesPipe,
-  EmverDisplayPipe,
-  EmverSatisfiesPipe,
-} from './emver.pipe'
-
-@NgModule({
-  declarations: [EmverComparesPipe, EmverDisplayPipe, EmverSatisfiesPipe],
-  exports: [EmverComparesPipe, EmverDisplayPipe, EmverSatisfiesPipe],
-})
-export class EmverPipesModule {}
diff --git a/web/projects/shared/src/pipes/emver/emver.pipe.ts b/web/projects/shared/src/pipes/emver/emver.pipe.ts
deleted file mode 100644
index 183c4a0a8..000000000
--- a/web/projects/shared/src/pipes/emver/emver.pipe.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core'
-import { Emver } from '../../services/emver.service'
-
-@Pipe({
-  name: 'satisfiesEmver',
-})
-export class EmverSatisfiesPipe implements PipeTransform {
-  constructor(private readonly emver: Emver) {}
-
-  transform(versionUnderTest?: string, range?: string): boolean {
-    return (
-      !!versionUnderTest &&
-      !!range &&
-      this.emver.satisfies(versionUnderTest, range)
-    )
-  }
-}
-
-@Pipe({
-  name: 'compareEmver',
-})
-export class EmverComparesPipe implements PipeTransform {
-  constructor(private readonly emver: Emver) {}
-
-  transform(first: string, second: string): SemverResult {
-    try {
-      return this.emver.compare(first, second) as SemverResult
-    } catch (e) {
-      console.error(`emver comparison failed`, e, first, second)
-      return 'comparison-impossible'
-    }
-  }
-}
-// left compared to right - if 1, version on left is higher; if 0, values the same; if -1, version on left is lower
-type SemverResult = 0 | 1 | -1 | 'comparison-impossible'
-
-@Pipe({
-  name: 'displayEmver',
-})
-export class EmverDisplayPipe implements PipeTransform {
-  constructor() {}
-
-  transform(version: string): string {
-    return displayEmver(version)
-  }
-}
-
-export function displayEmver(version: string): string {
-  const vs = version.split('.')
-  if (vs.length === 4) return `${vs[0]}.${vs[1]}.${vs[2]}~${vs[3]}`
-  return version
-}
diff --git a/web/projects/shared/src/pipes/exver/exver.module.ts b/web/projects/shared/src/pipes/exver/exver.module.ts
new file mode 100644
index 000000000..8fd90e429
--- /dev/null
+++ b/web/projects/shared/src/pipes/exver/exver.module.ts
@@ -0,0 +1,8 @@
+import { NgModule } from '@angular/core'
+import { ExverComparesPipe, ExverSatisfiesPipe } from './exver.pipe'
+
+@NgModule({
+  declarations: [ExverComparesPipe, ExverSatisfiesPipe],
+  exports: [ExverComparesPipe, ExverSatisfiesPipe],
+})
+export class ExverPipesModule {}
diff --git a/web/projects/shared/src/pipes/exver/exver.pipe.ts b/web/projects/shared/src/pipes/exver/exver.pipe.ts
new file mode 100644
index 000000000..8c998aaf9
--- /dev/null
+++ b/web/projects/shared/src/pipes/exver/exver.pipe.ts
@@ -0,0 +1,35 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { Exver } from '../../services/exver.service'
+
+@Pipe({
+  name: 'satisfiesExver',
+})
+export class ExverSatisfiesPipe implements PipeTransform {
+  constructor(private readonly exver: Exver) {}
+
+  transform(versionUnderTest?: string, range?: string): boolean {
+    return (
+      !!versionUnderTest &&
+      !!range &&
+      this.exver.satisfies(versionUnderTest, range)
+    )
+  }
+}
+
+@Pipe({
+  name: 'compareExver',
+})
+export class ExverComparesPipe implements PipeTransform {
+  constructor(private readonly exver: Exver) {}
+
+  transform(first: string, second: string): SemverResult {
+    try {
+      return this.exver.compareExver(first, second) as SemverResult
+    } catch (e) {
+      console.error(`exver comparison failed`, e, first, second)
+      return 'comparison-impossible'
+    }
+  }
+}
+// left compared to right - if 1, version on left is higher; if 0, values the same; if -1, version on left is lower
+type SemverResult = 0 | 1 | -1 | 'comparison-impossible'
diff --git a/web/projects/shared/src/public-api.ts b/web/projects/shared/src/public-api.ts
index c83fef860..bb0401ef3 100644
--- a/web/projects/shared/src/public-api.ts
+++ b/web/projects/shared/src/public-api.ts
@@ -30,8 +30,8 @@ export * from './directives/safe-links/safe-links.module'
 export * from './directives/enter/enter.directive'
 export * from './directives/enter/enter.module'
 
-export * from './pipes/emver/emver.module'
-export * from './pipes/emver/emver.pipe'
+export * from './pipes/exver/exver.module'
+export * from './pipes/exver/exver.pipe'
 export * from './pipes/guid/guid.module'
 export * from './pipes/guid/guid.pipe'
 export * from './pipes/markdown/markdown.module'
@@ -44,7 +44,7 @@ export * from './pipes/unit-conversion/unit-conversion.module'
 export * from './pipes/unit-conversion/unit-conversion.pipe'
 
 export * from './services/download-html.service'
-export * from './services/emver.service'
+export * from './services/exver.service'
 export * from './services/error.service'
 export * from './services/http.service'
 
diff --git a/web/projects/shared/src/services/emver.service.ts b/web/projects/shared/src/services/emver.service.ts
deleted file mode 100644
index 8dda885ac..000000000
--- a/web/projects/shared/src/services/emver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core'
-import * as emver from '@start9labs/emver'
-
-@Injectable({
-  providedIn: 'root',
-})
-export class Emver {
-  constructor() {}
-
-  compare(lhs: string, rhs: string): number | null {
-    if (!lhs || !rhs) return null
-    return emver.compare(lhs, rhs)
-  }
-
-  satisfies(version: string, range: string): boolean {
-    return emver.satisfies(version, range)
-  }
-}
diff --git a/web/projects/shared/src/services/exver.service.ts b/web/projects/shared/src/services/exver.service.ts
new file mode 100644
index 000000000..f3a28fae2
--- /dev/null
+++ b/web/projects/shared/src/services/exver.service.ts
@@ -0,0 +1,43 @@
+import { Injectable } from '@angular/core'
+import { VersionRange, ExtendedVersion, Version } from '@start9labs/start-sdk'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class Exver {
+  constructor() {}
+
+  compareExver(lhs: string, rhs: string): number | null {
+    if (!lhs || !rhs) return null
+    try {
+      return ExtendedVersion.parse(lhs).compareForSort(
+        ExtendedVersion.parse(rhs),
+      )
+    } catch (e) {
+      return null
+    }
+  }
+
+  greaterThanOrEqual(lhs: string, rhs: string): boolean | null {
+    if (!lhs || !rhs) return null
+    try {
+      return ExtendedVersion.parse(lhs).greaterThanOrEqual(
+        ExtendedVersion.parse(rhs),
+      )
+    } catch (e) {
+      return null
+    }
+  }
+
+  compareOsVersion(current: string, other: string) {
+    return Version.parse(current).compare(Version.parse(other))
+  }
+
+  satisfies(version: string, range: string): boolean {
+    return VersionRange.parse(range).satisfiedBy(ExtendedVersion.parse(version))
+  }
+
+  getFlavor(version: string): string | null {
+    return ExtendedVersion.parse(version).flavor
+  }
+}
diff --git a/web/projects/shared/src/types/http.types.ts b/web/projects/shared/src/types/http.types.ts
index 1ae2bcc50..b704248ce 100644
--- a/web/projects/shared/src/types/http.types.ts
+++ b/web/projects/shared/src/types/http.types.ts
@@ -5,6 +5,8 @@ export enum Method {
   POST = 'POST',
 }
 
+type ParamPrimitive = string | number | boolean
+
 export interface HttpOptions {
   method: Method
   url: string
@@ -12,7 +14,7 @@ export interface HttpOptions {
     [header: string]: string | string[]
   }
   params?: {
-    [param: string]: string | string[]
+    [param: string]: ParamPrimitive | ParamPrimitive[]
   }
   responseType?: 'json' | 'text' | 'arrayBuffer'
   body?: any
@@ -28,7 +30,7 @@ export interface HttpAngularOptions {
         [header: string]: string | string[]
       }
   params?: {
-    [param: string]: string | string[]
+    [param: string]: ParamPrimitive | ParamPrimitive[]
   }
   responseType?: 'json' | 'text' | 'arrayBuffer'
 }
diff --git a/web/projects/ui/src/app/app/menu/menu.component.ts b/web/projects/ui/src/app/app/menu/menu.component.ts
index b2ab62368..b956b61ce 100644
--- a/web/projects/ui/src/app/app/menu/menu.component.ts
+++ b/web/projects/ui/src/app/app/menu/menu.component.ts
@@ -20,7 +20,7 @@ import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { SplitPaneTracker } from 'src/app/services/split-pane.service'
-import { Emver, THEME } from '@start9labs/shared'
+import { Exver, THEME } from '@start9labs/shared'
 import { ConnectionService } from 'src/app/services/connection.service'
 import { getManifest } from 'src/app/util/get-package-data'
 
@@ -99,10 +99,10 @@ export class MenuComponent {
   ]).pipe(
     map(([marketplace, local]) =>
       Object.entries(marketplace).reduce((list, [_, store]) => {
-        store?.packages.forEach(({ manifest: { id, version } }) => {
+        store?.packages.forEach(({ id, version }) => {
           if (
             local[id] &&
-            this.emver.compare(
+            this.exver.compareExver(
               version,
               getManifest(local[id]).version || '',
             ) === 1
@@ -125,7 +125,7 @@ export class MenuComponent {
     @Inject(AbstractMarketplaceService)
     private readonly marketplaceService: MarketplaceService,
     private readonly splitPane: SplitPaneTracker,
-    private readonly emver: Emver,
+    private readonly exver: Exver,
     private readonly connection$: ConnectionService,
   ) {}
 }
diff --git a/web/projects/ui/src/app/components/backup-drives/backup.service.ts b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
index 7e05178bf..837bebf9b 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup.service.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
@@ -7,7 +7,8 @@ import {
   DiskBackupTarget,
 } from 'src/app/services/api/api.types'
 import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
-import { getErrorMessage, Emver } from '@start9labs/shared'
+import { Exver, getErrorMessage } from '@start9labs/shared'
+import { Version } from '@start9labs/start-sdk'
 
 @Injectable({
   providedIn: 'root',
@@ -20,7 +21,7 @@ export class BackupService {
 
   constructor(
     private readonly embassyApi: ApiService,
-    private readonly emver: Emver,
+    private readonly exver: Exver,
   ) {}
 
   async getBackupTargets(): Promise<void> {
@@ -57,14 +58,15 @@ export class BackupService {
 
   hasAnyBackup(target: BackupTarget): boolean {
     return Object.values(target.startOs).some(
-      s => this.emver.compare(s.version, '0.3.6') !== -1,
+      s => this.exver.compareOsVersion(s.version, '0.3.6') !== 'less',
     )
   }
 
   hasThisBackup(target: BackupTarget, id: string): boolean {
     return (
       target.startOs[id] &&
-      this.emver.compare(target.startOs[id].version, '0.3.6') !== -1
+      this.exver.compareOsVersion(target.startOs[id].version, '0.3.6') !==
+        'less'
     )
   }
 }
diff --git a/web/projects/ui/src/app/components/form/form-array/form-array.component.html b/web/projects/ui/src/app/components/form/form-array/form-array.component.html
index 76c67f837..d66387fb5 100644
--- a/web/projects/ui/src/app/components/form/form-array/form-array.component.html
+++ b/web/projects/ui/src/app/components/form/form-array/form-array.component.html
@@ -28,7 +28,7 @@
     [open]="!!open.get(item)"
     (openChange)="open.set(item, $event)"
   >
-    {{ item.value | mustache: $any(spec.spec).displayAs }}
+    {{ item.value | mustache : $any(spec.spec).displayAs }}
     <ng-container *ngTemplateOutlet="remove"></ng-container>
   </form-object>
   <ng-template #control>
diff --git a/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html b/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html
index 05ffa69f3..37387a338 100644
--- a/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html
+++ b/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.html
@@ -18,8 +18,8 @@
     [disabled]="!!spec.disabled"
     [readOnly]="readOnly"
     [pseudoInvalid]="invalid"
-    [min]="spec.min ? (spec.min | tuiMapper: getLimit)[0] : min"
-    [max]="spec.max ? (spec.max | tuiMapper: getLimit)[0] : max"
+    [min]="spec.min ? (spec.min | tuiMapper : getLimit)[0] : min"
+    [max]="spec.max ? (spec.max | tuiMapper : getLimit)[0] : max"
     [(ngModel)]="value"
     (focusedChange)="onFocus($event)"
   >
@@ -32,8 +32,8 @@
     [disabled]="!!spec.disabled"
     [readOnly]="readOnly"
     [pseudoInvalid]="invalid"
-    [min]="spec.min ? (spec.min | tuiMapper: getLimit) : min"
-    [max]="spec.max ? (spec.max | tuiMapper: getLimit) : max"
+    [min]="spec.min ? (spec.min | tuiMapper : getLimit) : min"
+    [max]="spec.max ? (spec.max | tuiMapper : getLimit) : max"
     [(ngModel)]="value"
     (focusedChange)="onFocus($event)"
   >
diff --git a/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts b/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
index 50cbc5a56..8cf5ce76d 100644
--- a/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
+++ b/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { endWith, Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
-import { Emver } from '@start9labs/shared'
+import { Exver } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
 import { ConfigService } from '../../../services/config.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
@@ -9,13 +9,16 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 @Injectable({ providedIn: 'root' })
 export class RefreshAlertService extends Observable<boolean> {
   private readonly stream$ = this.patch.watch$('serverInfo', 'version').pipe(
-    map(version => !!this.emver.compare(this.config.version, version)),
+    map(
+      version =>
+        this.exver.compareOsVersion(this.config.version, version) !== 'equal',
+    ),
     endWith(false),
   )
 
   constructor(
     private readonly patch: PatchDB<DataModel>,
-    private readonly emver: Emver,
+    private readonly exver: Exver,
     private readonly config: ConfigService,
   ) {
     super(subscriber => this.stream$.subscribe(subscriber))
diff --git a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
index 8a607896e..1c2d99f53 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { Emver } from '@start9labs/shared'
+import { Exver } from '@start9labs/shared'
 import { PackageBackupInfo } from 'src/app/services/api/api.types'
 import { ConfigService } from 'src/app/services/config.service'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
@@ -19,7 +19,7 @@ export interface AppRecoverOption extends PackageBackupInfo {
 export class ToOptionsPipe implements PipeTransform {
   constructor(
     private readonly config: ConfigService,
-    private readonly emver: Emver,
+    private readonly exver: Exver,
   ) {}
 
   transform(
@@ -44,7 +44,9 @@ export class ToOptionsPipe implements PipeTransform {
   }
 
   private compare(version: string): boolean {
-    // checks to see if backup was made on a newer version of eOS
-    return this.emver.compare(version, this.config.version) === 1
+    // checks to see if backup was made on a newer version of startOS
+    return (
+      this.exver.compareOsVersion(version, this.config.version) === 'greater'
+    )
   }
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index dd4e4b36e..63c534bb6 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -150,7 +150,7 @@ export class AppActionsPage {
     try {
       await this.embassyApi.uninstallPackage({ id: this.pkgId })
       this.embassyApi
-        .setDbValue<boolean>(['ack-instructions', this.pkgId], false)
+        .setDbValue<boolean>(['ackInstructions', this.pkgId], false)
         .catch(e => console.error('Failed to mark instructions as unseen', e))
       this.navCtrl.navigateRoot('/services')
     } catch (e: any) {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
index 9173de39f..e353cf9b2 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
@@ -11,7 +11,7 @@
   </ion-thumbnail>
   <ion-label>
     <h2 ticker>{{ manifest.title }}</h2>
-    <p>{{ manifest.version | displayEmver }}</p>
+    <p>{{ manifest.version }}</p>
     <status
       [rendering]="pkg.primaryRendering"
       [installingInfo]="$any(pkg.entry.stateInfo).installingInfo"
@@ -27,7 +27,7 @@ <h2 ticker>{{ manifest.title }}</h2>
     color="primary"
     (click)="launchUi($event, pkg.entry.serviceInterfaces)"
     [disabled]="
-      !(pkg.entry.stateInfo.state | isLaunchable: pkgMainStatus.status)
+      !(pkg.entry.stateInfo.state | isLaunchable : pkgMainStatus.status)
     "
   >
     <ion-icon slot="icon-only" name="open-outline"></ion-icon>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.module.ts
index 89998c9bf..aa4c5fcd6 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list.module.ts
@@ -4,7 +4,7 @@ import { Routes, RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
 import { AppListPage } from './app-list.page'
 import {
-  EmverPipesModule,
+  ExverPipesModule,
   ResponsiveColModule,
   TextSpinnerComponentModule,
   TickerModule,
@@ -29,7 +29,7 @@ const routes: Routes = [
   imports: [
     CommonModule,
     StatusComponentModule,
-    EmverPipesModule,
+    ExverPipesModule,
     TextSpinnerComponentModule,
     LaunchablePipeModule,
     UiPipeModule,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
index 86744cc91..8db082f42 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
@@ -4,7 +4,7 @@ import { Routes, RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
 import { AppShowPage } from './app-show.page'
 import {
-  EmverPipesModule,
+  ExverPipesModule,
   ResponsiveColModule,
   SharedPipesModule,
 } from '@start9labs/shared'
@@ -49,7 +49,7 @@ const routes: Routes = [
     InstallingProgressPipeModule,
     IonicModule,
     RouterModule.forChild(routes),
-    EmverPipesModule,
+    ExverPipesModule,
     LaunchablePipeModule,
     UiPipeModule,
     ResponsiveColModule,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index 5b3123131..390c6c642 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -7,8 +7,7 @@
     <!-- ** installing, updating, restoring ** -->
     <ng-container *ngIf="showProgress(pkg); else installed">
       <app-show-progress
-        *ngIf="pkg.stateInfo.installingInfo as installingInfo"
-        [phases]="installingInfo.progress.phases"
+        [phases]="pkg.stateInfo.installingInfo.progress.phases"
       ></app-show-progress>
     </ng-container>
 
@@ -34,9 +33,7 @@
           <!-- ** menu ** -->
           <app-show-menu [buttons]="pkg | toButtons"></app-show-menu>
           <!-- ** additional ** -->
-          <app-show-additional
-            [manifest]="pkg.stateInfo.manifest"
-          ></app-show-additional>
+          <app-show-additional [pkg]="pkg"></app-show-additional>
         </ng-container>
       </ion-item-group>
     </ng-template>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index cb1f6f5f9..52855be3c 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { NavController } from '@ionic/angular'
 import { PatchDB } from 'patch-db-client'
 import {
+  AllPackageData,
   DataModel,
   InstallingState,
   PackageDataEntry,
@@ -47,17 +48,19 @@ export class AppShowPage {
   private readonly pkgId = getPkgId(this.route)
 
   readonly pkgPlus$ = combineLatest([
-    this.patch.watch$('packageData', this.pkgId),
+    this.patch.watch$('packageData'),
     this.depErrorService.getPkgDepErrors$(this.pkgId),
   ]).pipe(
-    tap(([pkg, _]) => {
+    tap(([allPkgs, _]) => {
+      const pkg = allPkgs[this.pkgId]
       // if package disappears, navigate to list page
       if (!pkg) this.navCtrl.navigateRoot('/services')
     }),
-    map(([pkg, depErrors]) => {
+    map(([allPkgs, depErrors]) => {
+      const pkg = allPkgs[this.pkgId]
       return {
         pkg,
-        dependencies: this.getDepInfo(pkg, depErrors),
+        dependencies: this.getDepInfo(pkg, allPkgs, depErrors),
         status: renderPkgStatus(pkg, depErrors),
       }
     }),
@@ -81,17 +84,45 @@ export class AppShowPage {
 
   private getDepInfo(
     pkg: PackageDataEntry,
+    allPkgs: AllPackageData,
     depErrors: PkgDependencyErrors,
   ): DependencyInfo[] {
     const manifest = getManifest(pkg)
 
     return Object.keys(pkg.currentDependencies)
       .filter(id => !!manifest.dependencies[id])
-      .map(id => this.getDepValues(pkg, manifest, id, depErrors))
+      .map(id => this.getDepValues(pkg, allPkgs, manifest, id, depErrors))
+  }
+
+  private getDepDetails(
+    pkg: PackageDataEntry,
+    allPkgs: AllPackageData,
+    depId: string,
+  ) {
+    const { title, icon, versionRange } = pkg.currentDependencies[depId]
+
+    if (
+      allPkgs[depId] &&
+      (allPkgs[depId].stateInfo.state === 'installed' ||
+        allPkgs[depId].stateInfo.state === 'updating')
+    ) {
+      return {
+        title: allPkgs[depId].stateInfo.manifest!.title,
+        icon: allPkgs[depId].icon,
+        versionRange,
+      }
+    } else {
+      return {
+        title: title ? title : depId,
+        icon: icon ? icon : 'assets/img/service-icons/fallback.png',
+        versionRange,
+      }
+    }
   }
 
   private getDepValues(
     pkg: PackageDataEntry,
+    allPkgs: AllPackageData,
     manifest: T.Manifest,
     depId: string,
     depErrors: PkgDependencyErrors,
@@ -103,11 +134,15 @@ export class AppShowPage {
       depErrors,
     )
 
-    const { title, icon, versionSpec } = pkg.currentDependencies[depId]
+    const { title, icon, versionRange } = this.getDepDetails(
+      pkg,
+      allPkgs,
+      depId,
+    )
 
     return {
       id: depId,
-      version: versionSpec,
+      version: versionRange,
       title,
       icon,
       errorText: errorText
@@ -190,7 +225,7 @@ export class AppShowPage {
     const dependentInfo: DependentInfo = {
       id: pkgManifest.id,
       title: pkgManifest.title,
-      version: pkg.currentDependencies[depId].versionSpec,
+      version: pkg.currentDependencies[depId].versionRange,
     }
     const navigationExtras: NavigationExtras = {
       state: { dependentInfo },
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
index 73fc2158b..e524e13b5 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
@@ -6,11 +6,11 @@
         <ion-item>
           <ion-label>
             <h2>Version</h2>
-            <p>{{ manifest.version | displayEmver }}</p>
+            <p>{{ pkg.stateInfo.manifest.version }}</p>
           </ion-label>
         </ion-item>
         <ion-item
-          *ngIf="manifest.gitHash as gitHash; else noHash"
+          *ngIf="pkg.stateInfo.manifest.gitHash as gitHash; else noHash"
           button
           detail="false"
           (click)="copy(gitHash)"
@@ -32,20 +32,20 @@ <h2>Git Hash</h2>
         <ion-item button detail="false" (click)="presentModalLicense()">
           <ion-label>
             <h2>License</h2>
-            <p>{{ manifest.license }}</p>
+            <p>{{ pkg.stateInfo.manifest.license }}</p>
           </ion-label>
           <ion-icon slot="end" name="chevron-forward"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest.marketingSite"
-          [disabled]="!manifest.marketingSite"
+          [href]="pkg.stateInfo.manifest.marketingSite"
+          [disabled]="!pkg.stateInfo.manifest.marketingSite"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Marketing Site</h2>
-            <p>{{ manifest.marketingSite || 'Not provided' }}</p>
+            <p>{{ pkg.stateInfo.manifest.marketingSite || 'Not provided' }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
@@ -54,52 +54,52 @@ <h2>Marketing Site</h2>
     <ion-col responsiveCol sizeXs="12" sizeMd="6">
       <ion-item-group>
         <ion-item
-          [href]="manifest.upstreamRepo"
+          [href]="pkg.stateInfo.manifest.upstreamRepo"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Source Repository</h2>
-            <p>{{ manifest.upstreamRepo }}</p>
+            <p>{{ pkg.stateInfo.manifest.upstreamRepo }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest.wrapperRepo"
+          [href]="pkg.stateInfo.manifest.wrapperRepo"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Wrapper Repository</h2>
-            <p>{{ manifest.wrapperRepo }}</p>
+            <p>{{ pkg.stateInfo.manifest.wrapperRepo }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest.supportSite"
-          [disabled]="!manifest.supportSite"
+          [href]="pkg.stateInfo.manifest.supportSite"
+          [disabled]="!pkg.stateInfo.manifest.supportSite"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Support Site</h2>
-            <p>{{ manifest.supportSite || 'Not provided' }}</p>
+            <p>{{ pkg.stateInfo.manifest.supportSite || 'Not provided' }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
         <ion-item
-          [href]="manifest.donationUrl"
-          [disabled]="!manifest.donationUrl"
+          [href]="pkg.stateInfo.manifest.donationUrl"
+          [disabled]="!pkg.stateInfo.manifest.donationUrl"
           target="_blank"
           rel="noreferrer"
           detail="false"
         >
           <ion-label>
             <h2>Donation Link</h2>
-            <p>{{ manifest.donationUrl || 'Not provided' }}</p>
+            <p>{{ pkg.stateInfo.manifest.donationUrl || 'Not provided' }}</p>
           </ion-label>
           <ion-icon slot="end" name="open-outline"></ion-icon>
         </ion-item>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
index 278fa3d88..9aa152917 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
@@ -1,9 +1,12 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { ModalController, ToastController } from '@ionic/angular'
 import { copyToClipboard, MarkdownComponent } from '@start9labs/shared'
-import { T } from '@start9labs/start-sdk'
 import { from } from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
+import {
+  InstalledState,
+  PackageDataEntry,
+} from 'src/app/services/patch-db/data-model'
 
 @Component({
   selector: 'app-show-additional',
@@ -12,7 +15,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 })
 export class AppShowAdditionalComponent {
   @Input()
-  manifest!: T.Manifest
+  pkg!: PackageDataEntry<InstalledState>
 
   constructor(
     private readonly modalCtrl: ModalController,
@@ -35,16 +38,12 @@ export class AppShowAdditionalComponent {
   }
 
   async presentModalLicense() {
-    const { id, version } = this.manifest
+    const { id } = this.pkg.stateInfo.manifest
 
     const modal = await this.modalCtrl.create({
       componentProps: {
         title: 'License',
-        content: from(
-          this.api.getStatic(
-            `/public/package-data/${id}/${version}/LICENSE.md`,
-          ),
-        ),
+        content: from(this.api.getStaticInstalled(id, 'LICENSE.md')),
       },
       component: MarkdownComponent,
     })
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
index e9f7b97d7..b184b83ff 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
@@ -15,7 +15,7 @@ <h2 class="montserrat">
       ></ion-icon>
       {{ dep.title }}
     </h2>
-    <p>{{ dep.version | displayEmver }}</p>
+    <p>{{ dep.version }}</p>
     <p>
       <ion-text [color]="dep.errorText ? 'warning' : 'success'">
         {{ dep.errorText || 'satisfied' }}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
index 06f517222..efe34b5ec 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
@@ -9,7 +9,7 @@
         <h1 class="montserrat" [class.less-large]="manifest.title.length > 20">
           {{ manifest.title }}
         </h1>
-        <h2>{{ manifest.version | displayEmver }}</h2>
+        <h2>{{ manifest.version }}</h2>
       </ion-label>
     </div>
   </ion-toolbar>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
index 9b62a6402..ea80b3003 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
@@ -7,10 +7,12 @@
   </p>
   <ion-progress-bar
     [type]="
-      phase.progress === true ||
-      (phase.progress !== false && phase.progress!== null && phase.progress.total)
-        ? 'determinate'
-        : 'indeterminate'
+      phase.progress === false ||
+      (phase.progress !== true &&
+        phase.progress !== null &&
+        !phase.progress.total)
+        ? 'indeterminate'
+        : 'determinate'
     "
     [color]="phase.progress === true ? 'success' : 'secondary'"
     [value]="phase.progress | installingProgress"
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
index b6d259553..4c0f83433 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
@@ -9,5 +9,5 @@ import { T } from '@start9labs/start-sdk'
 })
 export class AppShowProgressComponent {
   @Input()
-  phases!: T.FullProgress['phases']
+  phases!: T.NamedProgress[]
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index e2a03ecf8..87bb5423f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -10,7 +10,6 @@ import {
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { from, map, Observable } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
-import { T } from '@start9labs/start-sdk'
 import { FormDialogService } from 'src/app/services/form-dialog.service'
 import { ConfigModal, PackageConfigData } from 'src/app/modals/config.component'
 
@@ -32,6 +31,7 @@ export class ToButtonsPipe implements PipeTransform {
     private readonly navCtrl: NavController,
     private readonly modalCtrl: ModalController,
     private readonly apiService: ApiService,
+    private readonly api: ApiService,
     private readonly patch: PatchDB<DataModel>,
     private readonly formDialog: FormDialogService,
   ) {}
@@ -42,7 +42,7 @@ export class ToButtonsPipe implements PipeTransform {
     return [
       // instructions
       {
-        action: () => this.presentModalInstructions(manifest),
+        action: () => this.presentModalInstructions(pkg),
         title: 'Instructions',
         description: `Understand how to use ${manifest.title}`,
         icon: 'list-outline',
@@ -103,17 +103,20 @@ export class ToButtonsPipe implements PipeTransform {
     ]
   }
 
-  private async presentModalInstructions(manifest: T.Manifest) {
+  private async presentModalInstructions(
+    pkg: PackageDataEntry<InstalledState>,
+  ) {
     this.apiService
-      .setDbValue<boolean>(['ack-instructions', manifest.id], true)
+      .setDbValue<boolean>(['ackInstructions', pkg.stateInfo.manifest.id], true)
       .catch(e => console.error('Failed to mark instructions as seen', e))
 
     const modal = await this.modalCtrl.create({
       componentProps: {
         title: 'Instructions',
         content: from(
-          this.apiService.getStatic(
-            `/public/package-data/${manifest.id}/${manifest.version}/INSTRUCTIONS.md`,
+          this.api.getStaticInstalled(
+            pkg.stateInfo.manifest.id,
+            'instructions.md',
           ),
         ),
       },
diff --git a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html
index 49f65cc14..8f1582db1 100644
--- a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html
+++ b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html
@@ -97,7 +97,4 @@ <h1>Root CA Trusted!</h1>
   </ng-template>
 </div>
 
-<a
-  id="install-cert"
-  href="/eos/local.crt"
-></a>
+<a id="install-cert" href="/static/local-root-ca.crt"></a>
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
index c10ce42aa..b86d5df12 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
@@ -5,7 +5,7 @@ import { Routes, RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
 import {
   SharedPipesModule,
-  EmverPipesModule,
+  ExverPipesModule,
   ResponsiveColModule,
 } from '@start9labs/shared'
 import {
@@ -34,7 +34,7 @@ const routes: Routes = [
     FormsModule,
     RouterModule.forChild(routes),
     SharedPipesModule,
-    EmverPipesModule,
+    ExverPipesModule,
     FilterPackagesPipeModule,
     MarketplaceStatusModule,
     BadgeMenuComponentModule,
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
index 734cb8910..32a6120ec 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
@@ -62,9 +62,10 @@ <h1 class="montserrat">{{ details.name }}</h1>
                   >
                     <marketplace-item [pkg]="pkg">
                       <marketplace-status
+                        *ngIf="localPkgs[pkg.id] as localPkg"
                         class="status"
-                        [version]="pkg.manifest.version"
-                        [localPkg]="localPkgs[pkg.manifest.id]"
+                        [version]="pkg.version"
+                        [localPkg]="localPkg"
                       ></marketplace-status>
                     </marketplace-item>
                   </ion-col>
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
index e1f13883a..0f0fa5752 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { AbstractMarketplaceService } from '@start9labs/marketplace'
+import { T } from '@start9labs/start-sdk'
 import { TuiDialogService } from '@taiga-ui/core'
 import { PatchDB } from 'patch-db-client'
 import { map } from 'rxjs'
@@ -20,12 +21,21 @@ export class MarketplaceListPage {
 
   readonly store$ = this.marketplaceService.getSelectedStore$().pipe(
     map(({ info, packages }) => {
-      const categories = new Set<string>()
-      if (info.categories.includes('featured')) categories.add('featured')
-      info.categories.forEach(c => categories.add(c))
-      categories.add('all')
+      const categories = new Map<string, T.Category>()
+      if (info.categories['featured'])
+        categories.set('featured', info.categories['featured'])
+      Object.keys(info.categories).forEach(c =>
+        categories.set(c, info.categories[c]),
+      )
+      categories.set('all', {
+        name: 'All',
+        description: {
+          short: 'All registry packages',
+          long: 'An unfiltered list of all packages available on this registry.',
+        },
+      })
 
-      return { categories: Array.from(categories), packages }
+      return { categories, packages }
     }),
   )
 
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-routing.module.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-routing.module.ts
index d5d6304e4..cc4946dc1 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-routing.module.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-routing.module.ts
@@ -17,13 +17,6 @@ const routes: Routes = [
         m => m.MarketplaceShowPageModule,
       ),
   },
-  {
-    path: ':pkgId/notes',
-    loadChildren: () =>
-      import('./release-notes/release-notes.module').then(
-        m => m.ReleaseNotesPageModule,
-      ),
-  },
 ]
 
 @NgModule({
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
index 6995dde5e..797a2fb13 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
@@ -1,11 +1,15 @@
 <div class="action-buttons">
   <ion-button
-    *ngIf="localPkg"
+    *ngIf="localPkg && localPkg.stateInfo.state !== 'removing'"
     expand="block"
     color="primary"
-    [routerLink]="['/services', pkg.manifest.id]"
+    [routerLink]="['/services', pkg.id]"
   >
-    View Installed
+    {{
+      localPkg.stateInfo.state === 'installed'
+        ? 'View Installed'
+        : 'View Installing'
+    }}
   </ion-button>
   <ng-container *ngIf="localPkg; else install">
     <ng-container
@@ -15,7 +19,7 @@
       "
     >
       <ion-button
-        *ngIf="(manifest.version | compareEmver: pkg.manifest.version) === -1"
+        *ngIf="(manifest.version | compareExver : pkg.version) === -1"
         expand="block"
         color="success"
         (click)="tryInstall()"
@@ -23,7 +27,7 @@
         Update
       </ion-button>
       <ion-button
-        *ngIf="(manifest.version | compareEmver: pkg.manifest.version) === 1"
+        *ngIf="(manifest.version | compareExver : pkg.version) === 1"
         expand="block"
         color="warning"
         (click)="tryInstall()"
@@ -32,7 +36,7 @@
       </ion-button>
       <ng-container *ngIf="showDevTools$ | async">
         <ion-button
-          *ngIf="(manifest.version | compareEmver: pkg.manifest.version) === 0"
+          *ngIf="(manifest.version | compareExver : pkg.version) === 0"
           expand="block"
           color="success"
           (click)="tryInstall()"
@@ -44,8 +48,12 @@
   </ng-container>
 
   <ng-template #install>
-    <ion-button expand="block" color="success" (click)="tryInstall()">
-      Install
+    <ion-button
+      expand="block"
+      [color]="localFlavor ? 'warning' : 'success'"
+      (click)="tryInstall()"
+    >
+      {{ localFlavor ? 'Switch' : 'Install' }}
     </ion-button>
   </ng-template>
 </div>
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index 5c83c536f..0b76579bc 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -10,7 +10,7 @@ import {
   MarketplacePkg,
 } from '@start9labs/marketplace'
 import {
-  Emver,
+  Exver,
   ErrorService,
   isEmptyObject,
   LoadingService,
@@ -44,6 +44,9 @@ export class MarketplaceShowControlsComponent {
   @Input()
   localPkg!: PackageDataEntry | null
 
+  @Input()
+  localFlavor!: boolean
+
   readonly showDevTools$ = this.ClientStorageService.showDevTools$
 
   constructor(
@@ -52,7 +55,7 @@ export class MarketplaceShowControlsComponent {
     @Inject(AbstractMarketplaceService)
     private readonly marketplaceService: MarketplaceService,
     private readonly loader: LoadingService,
-    private readonly emver: Emver,
+    private readonly exver: Exver,
     private readonly errorService: ErrorService,
     private readonly patch: PatchDB<DataModel>,
   ) {}
@@ -79,7 +82,7 @@ export class MarketplaceShowControlsComponent {
       const localManifest = getManifest(this.localPkg)
 
       if (
-        this.emver.compare(localManifest.version, this.pkg.manifest.version) !==
+        this.exver.compareExver(localManifest.version, this.pkg.version) !==
           0 &&
         hasCurrentDeps(localManifest.id, await getAllPackages(this.patch))
       ) {
@@ -136,9 +139,9 @@ export class MarketplaceShowControlsComponent {
 
   private async dryInstall(url: string) {
     const breakages = dryUpdate(
-      this.pkg.manifest,
+      this.pkg,
       await getAllPackages(this.patch),
-      this.emver,
+      this.exver,
     )
 
     if (isEmptyObject(breakages)) {
@@ -152,7 +155,7 @@ export class MarketplaceShowControlsComponent {
   }
 
   private async alertInstall(url: string) {
-    const installAlert = this.pkg.manifest.alerts.install
+    const installAlert = this.pkg.alerts.install
 
     if (!installAlert) return this.install(url)
 
@@ -179,7 +182,7 @@ export class MarketplaceShowControlsComponent {
   private async install(url: string) {
     const loader = this.loader.open('Beginning Install...').subscribe()
 
-    const { id, version } = this.pkg.manifest
+    const { id, version } = this.pkg
 
     try {
       await this.marketplaceService.installPackage(id, version, url)
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-dependent/marketplace-show-dependent.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-dependent/marketplace-show-dependent.component.html
index a7e5f9cb6..631b45018 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-dependent/marketplace-show-dependent.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-dependent/marketplace-show-dependent.component.html
@@ -13,16 +13,16 @@ <h2 class="heading">
         <br />
         <br />
         <span
-          *ngIf="version | satisfiesEmver: dependentInfo.version"
+          *ngIf="version | satisfiesExver : dependentInfo.version"
           class="text"
         >
-          {{ title }} version {{ version | displayEmver }} is compatible.
+          {{ title }} version {{ version }} is compatible.
         </span>
         <span
-          *ngIf="!(version | satisfiesEmver: dependentInfo.version)"
+          *ngIf="!(version | satisfiesExver : dependentInfo.version)"
           class="text text_error"
         >
-          {{ title }} version {{ version | displayEmver }} is NOT compatible.
+          {{ title }} version {{ version }} is NOT compatible.
         </span>
       </ion-text>
     </p>
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-dependent/marketplace-show-dependent.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-dependent/marketplace-show-dependent.component.ts
index 76c648867..7c39714f5 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-dependent/marketplace-show-dependent.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-dependent/marketplace-show-dependent.component.ts
@@ -24,10 +24,10 @@ export class MarketplaceShowDependentComponent {
   constructor(@Inject(DOCUMENT) private readonly document: Document) {}
 
   get title(): string {
-    return this.pkg.manifest.title
+    return this.pkg.title
   }
 
   get version(): string {
-    return this.pkg.manifest.version
+    return this.pkg.version
   }
 }
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
index 058cbb158..7d0d3995b 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'
 import { RouterModule, Routes } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
 import {
-  EmverPipesModule,
+  ExverPipesModule,
   MarkdownPipeModule,
   SharedPipesModule,
   TextSpinnerComponentModule,
@@ -13,6 +13,7 @@ import {
   AdditionalModule,
   DependenciesModule,
   PackageModule,
+  FlavorsModule,
 } from '@start9labs/marketplace'
 import { MarketplaceStatusModule } from '../marketplace-status/marketplace-status.module'
 import { MarketplaceShowPage } from './marketplace-show.page'
@@ -35,13 +36,14 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     TextSpinnerComponentModule,
     SharedPipesModule,
-    EmverPipesModule,
+    ExverPipesModule,
     MarkdownPipeModule,
     MarketplaceStatusModule,
     PackageModule,
     AboutModule,
     DependenciesModule,
     AdditionalModule,
+    FlavorsModule,
     UiPipeModule,
   ],
   declarations: [
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
index f563e88d6..a0f7622ad 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
@@ -1,21 +1,14 @@
 <marketplace-show-header></marketplace-show-header>
 
 <ion-content class="ion-padding with-widgets">
-  <ng-container *ngIf="pkg$ | async as pkg else loading">
+  <ng-container *ngIf="pkg$ | async as pkg; else loading">
     <ng-container *ngIf="pkg | empty; else show">
-      <div
-        *ngIf="loadVersion$ | async as version"
-        class="ion-text-center"
-        style="padding-top: 64px"
-      >
+      <div class="ion-text-center" style="padding-top: 64px">
         <ion-icon
           name="close-circle-outline"
           style="font-size: 48px"
         ></ion-icon>
-        <h2>
-          {{ pkgId }} @{{ version === '*' ? 'latest' : version }} not found in
-          this registry
-        </h2>
+        <h2>{{ pkgId }} not found in this registry</h2>
       </div>
     </ng-container>
 
@@ -25,21 +18,26 @@ <h2>
         [url]="url"
         [pkg]="pkg"
         [localPkg]="localPkg$ | async"
+        [localFlavor]="!!(localFlavor$ | async)"
       ></marketplace-show-controls>
 
       <marketplace-show-dependent [pkg]="pkg"></marketplace-show-dependent>
 
       <ion-item-group>
         <marketplace-about [pkg]="pkg"></marketplace-about>
+        <marketplace-flavors
+          *ngIf="flavors$ | async as flavors"
+          [pkgs]="flavors"
+        ></marketplace-flavors>
         <marketplace-dependencies
-          *ngIf="!(pkg.manifest.dependencies | empty)"
+          *ngIf="!(pkg.dependencyMetadata | empty)"
           [pkg]="pkg"
         ></marketplace-dependencies>
       </ion-item-group>
 
       <marketplace-additional
         [pkg]="pkg"
-        (version)="loadVersion$.next($event)"
+        (version)="updateVersion($event)"
       ></marketplace-additional>
     </ng-template>
   </ng-container>
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
index 876e71924..018ddbb64 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
@@ -1,11 +1,15 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { getPkgId } from '@start9labs/shared'
-import { AbstractMarketplaceService } from '@start9labs/marketplace'
+import { ActivatedRoute, Router } from '@angular/router'
+import { Exver, getPkgId } from '@start9labs/shared'
+import {
+  AbstractMarketplaceService,
+  MarketplacePkg,
+} from '@start9labs/marketplace'
 import { PatchDB } from 'patch-db-client'
-import { BehaviorSubject } from 'rxjs'
-import { filter, shareReplay, switchMap } from 'rxjs/operators'
+import { combineLatest, Observable } from 'rxjs'
+import { filter, map, shareReplay, startWith, switchMap } from 'rxjs/operators'
 import { DataModel } from 'src/app/services/patch-db/data-model'
+import { getManifest } from 'src/app/util/get-package-data'
 
 @Component({
   selector: 'marketplace-show',
@@ -17,21 +21,61 @@ export class MarketplaceShowPage {
   readonly pkgId = getPkgId(this.route)
   readonly url = this.route.snapshot.queryParamMap.get('url') || undefined
 
-  readonly loadVersion$ = new BehaviorSubject<string>('*')
+  readonly localPkg$ = combineLatest([
+    this.patch.watch$('packageData', this.pkgId).pipe(filter(Boolean)),
+    this.route.queryParamMap,
+  ]).pipe(
+    map(([pkg, paramMap]) =>
+      this.exver.getFlavor(getManifest(pkg).version) === paramMap.get('flavor')
+        ? pkg
+        : null,
+    ),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  )
 
-  readonly localPkg$ = this.patch
-    .watch$('packageData', this.pkgId)
-    .pipe(filter(Boolean), shareReplay({ bufferSize: 1, refCount: true }))
+  readonly localFlavor$ = this.localPkg$.pipe(
+    map(pkg => !pkg),
+    startWith(false),
+  )
 
-  readonly pkg$ = this.loadVersion$.pipe(
-    switchMap(version =>
-      this.marketplaceService.getPackage$(this.pkgId, version, this.url),
+  readonly pkg$: Observable<MarketplacePkg> = this.route.queryParamMap.pipe(
+    switchMap(paramMap =>
+      this.marketplaceService.getPackage$(
+        this.pkgId,
+        paramMap.get('version'),
+        paramMap.get('flavor'),
+        this.url,
+      ),
+    ),
+  )
+
+  readonly flavors$ = this.route.queryParamMap.pipe(
+    switchMap(paramMap =>
+      this.marketplaceService
+        .getSelectedStore$()
+        .pipe(
+          map(s =>
+            s.packages.filter(
+              p => p.id === this.pkgId && p.flavor !== paramMap.get('flavor'),
+            ),
+          ),
+        ),
     ),
   )
 
   constructor(
     private readonly route: ActivatedRoute,
+    private readonly router: Router,
     private readonly patch: PatchDB<DataModel>,
     private readonly marketplaceService: AbstractMarketplaceService,
+    private readonly exver: Exver,
   ) {}
+
+  updateVersion(version: string) {
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: { version },
+      queryParamsHandling: 'merge',
+    })
+  }
 }
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
index 8958cdda2..173fda66d 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
@@ -1,13 +1,13 @@
-<ng-container *ngIf="localPkg">
+<ng-container *ngIf="localPkg && sameFlavor">
   <div *ngIf="isInstalled(localPkg)">
     <ion-text
-      *ngIf="(version | compareEmver: localVersion) !== 1"
+      *ngIf="(version | compareExver : localVersion) !== 1"
       color="primary"
     >
       Installed
     </ion-text>
     <ion-text
-      *ngIf="(version | compareEmver: localVersion) === 1"
+      *ngIf="(version | compareExver : localVersion) === 1"
       color="success"
     >
       Update Available
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
index 9db50dc29..6686b2842 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
@@ -8,6 +8,7 @@ import {
   isRestoring,
   getManifest,
 } from 'src/app/util/get-package-data'
+import { Exver } from '@start9labs/shared'
 
 @Component({
   selector: 'marketplace-status',
@@ -16,8 +17,7 @@ import {
 })
 export class MarketplaceStatusComponent {
   @Input() version!: string
-
-  @Input() localPkg?: PackageDataEntry
+  @Input() localPkg!: PackageDataEntry
 
   isInstalled = isInstalled
   isInstalling = isInstalling
@@ -26,6 +26,15 @@ export class MarketplaceStatusComponent {
   isRestoring = isRestoring
 
   get localVersion(): string {
-    return this.localPkg ? getManifest(this.localPkg).version : ''
+    return getManifest(this.localPkg).version
+  }
+
+  get sameFlavor(): boolean {
+    return (
+      this.exver.getFlavor(this.version) ===
+      this.exver.getFlavor(this.localVersion)
+    )
   }
+
+  constructor(private readonly exver: Exver) {}
 }
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
index c31f4fd16..d95b919a2 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
 import { IonicModule } from '@ionic/angular'
-import { EmverPipesModule } from '@start9labs/shared'
+import { ExverPipesModule } from '@start9labs/shared'
 import { InstallingProgressPipeModule } from '../../../pipes/install-progress/install-progress.module'
 import { MarketplaceStatusComponent } from './marketplace-status.component'
 
@@ -9,7 +9,7 @@ import { MarketplaceStatusComponent } from './marketplace-status.component'
   imports: [
     CommonModule,
     IonicModule,
-    EmverPipesModule,
+    ExverPipesModule,
     InstallingProgressPipeModule,
   ],
   declarations: [MarketplaceStatusComponent],
diff --git a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html
index b61412445..c6c16d28e 100644
--- a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html
@@ -35,5 +35,5 @@ <h1>Download Root CA</h1>
   </ion-item-group>
 
   <!-- hidden element for downloading cert -->
-  <a id="install-cert" href="/eos/local.crt"></a>
+  <a id="install-cert" href="/static/local-root-ca.crt"></a>
 </ion-content>
diff --git a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.module.ts b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.module.ts
index eff288eb2..503aa57ad 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.module.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'
 import { Routes, RouterModule } from '@angular/router'
 import { IonicModule } from '@ionic/angular'
 import { ServerSpecsPage } from './server-specs.page'
-import { EmverPipesModule } from '@start9labs/shared'
+import { ExverPipesModule } from '@start9labs/shared'
 import { TuiLetModule } from '@taiga-ui/cdk'
 import { QRComponentModule } from 'src/app/components/qr/qr.component.module'
 
@@ -20,7 +20,7 @@ const routes: Routes = [
     IonicModule,
     RouterModule.forChild(routes),
     QRComponentModule,
-    EmverPipesModule,
+    ExverPipesModule,
     TuiLetModule,
   ],
   declarations: [ServerSpecsPage],
diff --git a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
index f9df6eb37..03d7ef3d7 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
@@ -13,7 +13,7 @@
     <ion-item>
       <ion-label>
         <h2>Version</h2>
-        <p>{{ server.version | displayEmver }}</p>
+        <p>{{ server.version }}</p>
       </ion-label>
     </ion-item>
     <ion-item>
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts
index 863b2d127..27a3757dd 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'
 import { IonicModule } from '@ionic/angular'
 import { SideloadPage } from './sideload.page'
 import { Routes, RouterModule } from '@angular/router'
-import { EmverPipesModule, SharedPipesModule } from '@start9labs/shared'
+import { ExverPipesModule, SharedPipesModule } from '@start9labs/shared'
 import { DragNDropDirective } from './dnd.directive'
 
 const routes: Routes = [
@@ -19,7 +19,7 @@ const routes: Routes = [
     IonicModule,
     RouterModule.forChild(routes),
     SharedPipesModule,
-    EmverPipesModule,
+    ExverPipesModule,
   ],
   declarations: [SideloadPage, DragNDropDirective],
 })
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
index 6a54fe82e..0d413075e 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
@@ -77,7 +77,7 @@ <h4>
               [src]="toUpload.icon | trustUrl"
             />
             <h2>{{ toUpload.manifest.title }}</h2>
-            <p>{{ toUpload.manifest.version | displayEmver }}</p>
+            <p>{{ toUpload.manifest.version }}</p>
           </div>
         </div>
       </div>
diff --git a/web/projects/ui/src/app/pages/updates/updates.module.ts b/web/projects/ui/src/app/pages/updates/updates.module.ts
index 7b6c6594c..4930463b0 100644
--- a/web/projects/ui/src/app/pages/updates/updates.module.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.module.ts
@@ -5,7 +5,7 @@ import { RouterModule, Routes } from '@angular/router'
 import { FilterUpdatesPipe, UpdatesPage } from './updates.page'
 import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
 import {
-  EmverPipesModule,
+  ExverPipesModule,
   MarkdownPipeModule,
   SharedPipesModule,
 } from '@start9labs/shared'
@@ -34,7 +34,7 @@ const routes: Routes = [
     RoundProgressModule,
     InstallingProgressPipeModule,
     StoreIconComponentModule,
-    EmverPipesModule,
+    ExverPipesModule,
   ],
 })
 export class UpdatesPageModule {}
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.html b/web/projects/ui/src/app/pages/updates/updates.page.html
index 2bb3860c6..fd4d19133 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.html
+++ b/web/projects/ui/src/app/pages/updates/updates.page.html
@@ -30,27 +30,21 @@
         >
           <ion-accordion-group multiple="true" class="ion-padding-start">
             <div *ngFor="let pkg of updates" class="item-container">
-              <ion-accordion *ngIf="data.localPkgs[pkg.manifest.id] as local">
+              <ion-accordion *ngIf="data.localPkgs[pkg.id] as local">
                 <ion-item lines="none" slot="header">
                   <ion-avatar slot="start" style="width: 50px; height: 50px">
                     <img [src]="pkg.icon | trustUrl" />
                   </ion-avatar>
                   <ion-label>
-                    <h1 style="line-height: 1.3">{{ pkg.manifest.title }}</h1>
+                    <h1 style="line-height: 1.3">{{ pkg.title }}</h1>
                     <h2 class="inline">
-                      <span>
-                        {{ local.stateInfo.manifest.version | displayEmver }}
-                      </span>
+                      <span>{{ local.stateInfo.manifest.version }}</span>
                       &nbsp;
                       <ion-icon name="arrow-forward"></ion-icon>
                       &nbsp;
-                      <ion-text color="success">
-                        {{ pkg.manifest.version | displayEmver }}
-                      </ion-text>
+                      <ion-text color="success">{{ pkg.version }}</ion-text>
                     </h2>
-                    <p
-                      *ngIf="marketplaceService.updateErrors[pkg.manifest.id] as error"
-                    >
+                    <p *ngIf="marketplaceService.updateErrors[pkg.id] as error">
                       <ion-text color="danger">{{ error }}</ion-text>
                     </p>
                   </ion-label>
@@ -69,17 +63,17 @@ <h2 class="inline">
                     </ng-container>
                     <ng-template #notUpdating>
                       <ion-spinner
-                        *ngIf="marketplaceService.updateQueue[pkg.manifest.id] else updateBtn"
+                        *ngIf="marketplaceService.updateQueue[pkg.id] else updateBtn"
                         color="dark"
                       ></ion-spinner>
                       <ng-template #updateBtn>
                         <ion-button
-                          (click)="tryUpdate(pkg.manifest, host.url, $event)"
-                          [color]="marketplaceService.updateErrors[pkg.manifest.id] ? 'danger' : 'tertiary'"
+                          (click)="tryUpdate(pkg, host.url, $event)"
+                          [color]="marketplaceService.updateErrors[pkg.id] ? 'danger' : 'tertiary'"
                           strong
                         >
-                          {{ marketplaceService.updateErrors[pkg.manifest.id] ?
-                          'Retry' : 'Update' }}
+                          {{ marketplaceService.updateErrors[pkg.id] ? 'Retry' :
+                          'Update' }}
                         </ion-button>
                       </ng-template>
                     </ng-template>
@@ -88,12 +82,12 @@ <h2 class="inline">
                 <div class="ion-padding" slot="content">
                   <div class="notes">
                     <h5>What's new</h5>
-                    <p [innerHTML]="pkg.manifest.releaseNotes| markdown"></p>
+                    <p [innerHTML]="pkg.releaseNotes| markdown"></p>
                   </div>
                   <ion-button
                     fill="clear"
                     strong
-                    (click)="viewInMarketplace($event, host.url, pkg.manifest.id)"
+                    (click)="viewInMarketplace($event, host.url, pkg.id)"
                   >
                     View listing
                     <ion-icon slot="end" name="open-outline"></ion-icon>
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.ts b/web/projects/ui/src/app/pages/updates/updates.page.ts
index d1ffc4829..e25632bc8 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.ts
+++ b/web/projects/ui/src/app/pages/updates/updates.page.ts
@@ -13,7 +13,7 @@ import {
   MarketplacePkg,
   StoreIdentity,
 } from '@start9labs/marketplace'
-import { Emver, isEmptyObject } from '@start9labs/shared'
+import { Exver, isEmptyObject } from '@start9labs/shared'
 import { Pipe, PipeTransform } from '@angular/core'
 import { combineLatest, map, Observable } from 'rxjs'
 import { AlertController, NavController } from '@ionic/angular'
@@ -24,7 +24,6 @@ import {
   isUpdating,
 } from 'src/app/util/get-package-data'
 import { dryUpdate } from 'src/app/util/dry-update'
-import { T } from '@start9labs/start-sdk'
 
 interface UpdatesData {
   hosts: StoreIdentity[]
@@ -59,7 +58,7 @@ export class UpdatesPage {
     private readonly patch: PatchDB<DataModel>,
     private readonly navCtrl: NavController,
     private readonly alertCtrl: AlertController,
-    private readonly emver: Emver,
+    private readonly exver: Exver,
   ) {}
 
   viewInMarketplace(event: Event, url: string, id: string) {
@@ -70,29 +69,29 @@ export class UpdatesPage {
     })
   }
 
-  async tryUpdate(manifest: T.Manifest, url: string, e: Event): Promise<void> {
+  async tryUpdate(pkg: MarketplacePkg, url: string, e: Event): Promise<void> {
     e.stopPropagation()
 
-    const { id, version } = manifest
+    const { id, version } = pkg
 
     delete this.marketplaceService.updateErrors[id]
     this.marketplaceService.updateQueue[id] = true
 
-    // manifest.id OK because same as local id for update
-    if (hasCurrentDeps(manifest.id, await getAllPackages(this.patch))) {
-      this.dryInstall(manifest, url)
+    // id OK because same as local id for update
+    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
+      this.dryInstall(pkg, url)
     } else {
       this.install(id, version, url)
     }
   }
 
-  private async dryInstall(manifest: T.Manifest, url: string) {
-    const { id, version, title } = manifest
+  private async dryInstall(pkg: MarketplacePkg, url: string) {
+    const { id, version, title } = pkg
 
     const breakages = dryUpdate(
-      manifest,
+      pkg,
       await getAllPackages(this.patch),
-      this.emver,
+      this.exver,
     )
 
     if (isEmptyObject(breakages)) {
@@ -159,18 +158,19 @@ export class UpdatesPage {
   name: 'filterUpdates',
 })
 export class FilterUpdatesPipe implements PipeTransform {
-  constructor(private readonly emver: Emver) {}
+  constructor(private readonly exver: Exver) {}
 
   transform(
     pkgs: MarketplacePkg[],
     local: Record<string, PackageDataEntry<InstalledState | UpdatingState>>,
   ): MarketplacePkg[] {
-    return pkgs.filter(({ manifest }) => {
-      const localPkg = local[manifest.id]
+    return pkgs.filter(({ id, version, flavor }) => {
+      const localPkg = local[id]
       return (
         localPkg &&
-        this.emver.compare(
-          manifest.version,
+        this.exver.getFlavor(localPkg.stateInfo.manifest.version) === flavor &&
+        this.exver.compareExver(
+          version,
           localPkg.stateInfo.manifest.version,
         ) === 1
       )
diff --git a/web/projects/ui/src/app/services/api/api-icons.ts b/web/projects/ui/src/app/services/api/api-icons.ts
index 3b0b08b33..55c3172da 100644
--- a/web/projects/ui/src/app/services/api/api-icons.ts
+++ b/web/projects/ui/src/app/services/api/api-icons.ts
@@ -1,8 +1,10 @@
+const REGISTRY_ICON =
+  'data:image/png;base64,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'
 const BTC_ICON =
-  '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'
+  'data:image/png;base64,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'
 const LND_ICON =
-  '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'
+  'data:image/png;base64,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'
 const PROXY_ICON =
-  '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'
+  'data:image/png;base64,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'
 
-export { BTC_ICON, LND_ICON, PROXY_ICON }
+export { REGISTRY_ICON, BTC_ICON, LND_ICON, PROXY_ICON }
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index c1f98dcd4..4ce3f670a 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -3,11 +3,26 @@ import {
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
 import { Metric, NotificationLevel, RR, ServerNotifications } from './api.types'
-import { BTC_ICON, LND_ICON, PROXY_ICON } from './api-icons'
-import { DependencyMetadata, MarketplacePkg } from '@start9labs/marketplace'
+import { BTC_ICON, LND_ICON, PROXY_ICON, REGISTRY_ICON } from './api-icons'
 import { Log } from '@start9labs/shared'
 import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
 import { T, CB } from '@start9labs/start-sdk'
+import { GetPackagesRes } from '@start9labs/marketplace'
+
+const mockBlake3Commitment: T.Blake3Commitment = {
+  hash: 'fakehash',
+  size: 0,
+}
+
+const mockMerkleArchiveCommitment: T.MerkleArchiveCommitment = {
+  rootSighash: 'fakehash',
+  rootMaxsize: 0,
+}
+
+const mockDescription = {
+  short: 'Lorem ipsum dolor sit amet',
+  long: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+}
 
 export module Mock {
   export const ServerUpdated: T.ServerStatus = {
@@ -37,17 +52,42 @@ export module Mock {
     },
   }
 
-  export const ReleaseNotes: RR.GetReleaseNotesRes = {
-    '0.19.2':
-      'Contrary to popular belief, Lorem Ipsum is not simply random text.',
-    '0.19.1': 'release notes for Bitcoin 0.19.1',
-    '0.19.0': 'release notes for Bitcoin 0.19.0',
+  export const RegistryInfo: T.RegistryInfo = {
+    name: 'Start9 Registry',
+    icon: REGISTRY_ICON,
+    categories: {
+      bitcoin: {
+        name: 'Bitcoin',
+        description: mockDescription,
+      },
+      featured: {
+        name: 'Featured',
+        description: mockDescription,
+      },
+      lightning: {
+        name: 'Lightning',
+        description: mockDescription,
+      },
+      communications: {
+        name: 'Communications',
+        description: mockDescription,
+      },
+      data: {
+        name: 'Data',
+        description: mockDescription,
+      },
+      ai: {
+        name: 'AI',
+        description: mockDescription,
+      },
+    },
   }
 
   export const MockManifestBitcoind: T.Manifest = {
     id: 'bitcoind',
     title: 'Bitcoin Core',
-    version: '0.21.0',
+    version: '0.21.0:0',
+    satisfies: [],
     gitHash: 'abcdefgh',
     description: {
       short: 'A Bitcoin full node by Bitcoin Core.',
@@ -90,7 +130,8 @@ export module Mock {
   export const MockManifestLnd: T.Manifest = {
     id: 'lnd',
     title: 'Lightning Network Daemon',
-    version: '0.11.1',
+    version: '0.11.1:0',
+    satisfies: [],
     gitHash: 'abcdefgh',
     description: {
       short: 'A bolt spec compliant client.',
@@ -116,11 +157,13 @@ export module Mock {
       bitcoind: {
         description: 'LND needs bitcoin to live.',
         optional: true,
+        s9pk: '',
       },
       'btc-rpc-proxy': {
         description:
           'As long as Bitcoin is pruned, LND needs Bitcoin Proxy to fetch block over the P2P network.',
         optional: true,
+        s9pk: '',
       },
     },
     hasConfig: true,
@@ -143,7 +186,8 @@ export module Mock {
   export const MockManifestBitcoinProxy: T.Manifest = {
     id: 'btc-rpc-proxy',
     title: 'Bitcoin Proxy',
-    version: '0.2.2',
+    version: '0.2.2:0',
+    satisfies: [],
     gitHash: 'lmnopqrx',
     description: {
       short: 'A super charger for your Bitcoin node.',
@@ -168,6 +212,7 @@ export module Mock {
       bitcoind: {
         description: 'Bitcoin Proxy requires a Bitcoin node.',
         optional: false,
+        s9pk: '',
       },
     },
     hasConfig: false,
@@ -187,150 +232,510 @@ export module Mock {
     },
   }
 
-  export const BitcoinDep: DependencyMetadata = {
+  export const BitcoinDep: T.DependencyMetadata = {
     title: 'Bitcoin Core',
     icon: BTC_ICON,
     optional: false,
-    hidden: true,
+    description: 'Needed to run',
   }
 
-  export const ProxyDep: DependencyMetadata = {
+  export const ProxyDep: T.DependencyMetadata = {
     title: 'Bitcoin Proxy',
     icon: PROXY_ICON,
     optional: true,
-    hidden: false,
+    description: 'Needed to run',
   }
 
-  export const MarketplacePkgs: {
-    [id: string]: {
-      [version: string]: MarketplacePkg
-    }
+  export const OtherPackageVersions: {
+    [id: T.PackageId]: GetPackagesRes
   } = {
     bitcoind: {
-      '0.19.0': {
-        icon: BTC_ICON,
-        license: 'licenseUrl',
-        instructions: 'instructionsUrl',
-        manifest: {
-          ...Mock.MockManifestBitcoind,
-          version: '0.19.0',
+      '=26.1.0:0.1.0': {
+        best: {
+          '26.1.0:0.1.0': {
+            title: 'Bitcoin Core',
+            description: mockDescription,
+            hardwareRequirements: { arch: null, device: {}, ram: null },
+            license: 'mit',
+            wrapperRepo: 'https://github.com/start9labs/bitcoind-startos',
+            upstreamRepo: 'https://github.com/bitcoin/bitcoin',
+            supportSite: 'https://bitcoin.org',
+            marketingSite: 'https://bitcoin.org',
+            releaseNotes: 'Even better support for Bitcoin and wallets!',
+            osVersion: '0.3.6',
+            gitHash: 'fakehash',
+            icon: BTC_ICON,
+            sourceVersion: null,
+            dependencyMetadata: {},
+            donationUrl: null,
+            alerts: {
+              install: 'test',
+              uninstall: 'test',
+              start: 'test',
+              stop: 'test',
+              restore: 'test',
+            },
+            s9pk: {
+              url: 'https://github.com/Start9Labs/bitcoind-startos/releases/download/v26.1.0/bitcoind.s9pk',
+              commitment: mockMerkleArchiveCommitment,
+              signatures: {},
+              publishedAt: Date.now().toString(),
+            },
+          },
+          '#knots:26.1.20240325:0': {
+            title: 'Bitcoin Knots',
+            description: {
+              short: 'An alternate fully verifying implementation of Bitcoin',
+              long: 'Bitcoin Knots is a combined Bitcoin node and wallet. Not only is it easy to use, but it also ensures bitcoins you receive are both real bitcoins and really yours.',
+            },
+            hardwareRequirements: { arch: null, device: {}, ram: null },
+            license: 'mit',
+            wrapperRepo: 'https://github.com/start9labs/bitcoinknots-startos',
+            upstreamRepo: 'https://github.com/bitcoinknots/bitcoin',
+            supportSite: 'https://bitcoinknots.org',
+            marketingSite: 'https://bitcoinknots.org',
+            releaseNotes: 'Even better support for Bitcoin and wallets!',
+            osVersion: '0.3.6',
+            gitHash: 'fakehash',
+            icon: BTC_ICON,
+            sourceVersion: null,
+            dependencyMetadata: {},
+            donationUrl: null,
+            alerts: {
+              install: 'test',
+              uninstall: 'test',
+              start: 'test',
+              stop: 'test',
+              restore: 'test',
+            },
+            s9pk: {
+              url: 'https://github.com/Start9Labs/bitcoinknots-startos/releases/download/v26.1.20240513/bitcoind.s9pk',
+              commitment: mockMerkleArchiveCommitment,
+              signatures: {},
+              publishedAt: Date.now().toString(),
+            },
+          },
+        },
+        categories: ['bitcoin', 'featured'],
+        otherVersions: {
+          '27.0.0:1.0.0': {
+            releaseNotes: 'Even better support for Bitcoin and wallets!',
+          },
+          '#knots:27.1.0:0': {
+            releaseNotes: 'Even better support for Bitcoin and wallets!',
+          },
+        },
+      },
+      '=#knots:26.1.20240325:0': {
+        best: {
+          '26.1.0:0.1.0': {
+            title: 'Bitcoin Core',
+            description: mockDescription,
+            hardwareRequirements: { arch: null, device: {}, ram: null },
+            license: 'mit',
+            wrapperRepo: 'https://github.com/start9labs/bitcoind-startos',
+            upstreamRepo: 'https://github.com/bitcoin/bitcoin',
+            supportSite: 'https://bitcoin.org',
+            marketingSite: 'https://bitcoin.org',
+            releaseNotes: 'Even better support for Bitcoin and wallets!',
+            osVersion: '0.3.6',
+            gitHash: 'fakehash',
+            icon: BTC_ICON,
+            sourceVersion: null,
+            dependencyMetadata: {},
+            donationUrl: null,
+            alerts: {
+              install: 'test',
+              uninstall: 'test',
+              start: 'test',
+              stop: 'test',
+              restore: 'test',
+            },
+            s9pk: {
+              url: 'https://github.com/Start9Labs/bitcoind-startos/releases/download/v26.1.0/bitcoind.s9pk',
+              commitment: mockMerkleArchiveCommitment,
+              signatures: {},
+              publishedAt: Date.now().toString(),
+            },
+          },
+          '#knots:26.1.20240325:0': {
+            title: 'Bitcoin Knots',
+            description: {
+              short: 'An alternate fully verifying implementation of Bitcoin',
+              long: 'Bitcoin Knots is a combined Bitcoin node and wallet. Not only is it easy to use, but it also ensures bitcoins you receive are both real bitcoins and really yours.',
+            },
+            hardwareRequirements: { arch: null, device: {}, ram: null },
+            license: 'mit',
+            wrapperRepo: 'https://github.com/start9labs/bitcoinknots-startos',
+            upstreamRepo: 'https://github.com/bitcoinknots/bitcoin',
+            supportSite: 'https://bitcoinknots.org',
+            marketingSite: 'https://bitcoinknots.org',
+            releaseNotes: 'Even better support for Bitcoin and wallets!',
+            osVersion: '0.3.6',
+            gitHash: 'fakehash',
+            icon: BTC_ICON,
+            sourceVersion: null,
+            dependencyMetadata: {},
+            donationUrl: null,
+            alerts: {
+              install: 'test',
+              uninstall: 'test',
+              start: 'test',
+              stop: 'test',
+              restore: 'test',
+            },
+            s9pk: {
+              url: 'https://github.com/Start9Labs/bitcoinknots-startos/releases/download/v26.1.20240513/bitcoind.s9pk',
+              commitment: mockMerkleArchiveCommitment,
+              signatures: {},
+              publishedAt: Date.now().toString(),
+            },
+          },
+        },
+        categories: ['bitcoin', 'featured'],
+        otherVersions: {
+          '27.0.0:1.0.0': {
+            releaseNotes: 'Even better support for Bitcoin and wallets!',
+          },
+          '#knots:27.1.0:0': {
+            releaseNotes: 'Even better support for Bitcoin and wallets!',
+          },
         },
-        categories: ['bitcoin', 'cryptocurrency'],
-        versions: ['0.19.0', '0.20.0', '0.21.0'],
-        dependencyMetadata: {},
-        publishedAt: new Date().toISOString(),
       },
-      '0.20.0': {
-        icon: BTC_ICON,
-        license: 'licenseUrl',
-        instructions: 'instructionsUrl',
-        manifest: {
-          ...Mock.MockManifestBitcoind,
-          version: '0.20.0',
+    },
+    lnd: {
+      '=0.17.5:0': {
+        best: {
+          '0.17.5:0': {
+            title: 'LND',
+            description: mockDescription,
+            hardwareRequirements: { arch: null, device: {}, ram: null },
+            license: 'mit',
+            wrapperRepo: 'https://github.com/start9labs/lnd-startos',
+            upstreamRepo: 'https://github.com/lightningnetwork/lnd',
+            supportSite: 'https://lightning.engineering/slack.html',
+            marketingSite: 'https://lightning.engineering/',
+            releaseNotes: 'Upstream release to 0.17.5',
+            osVersion: '0.3.6',
+            gitHash: 'fakehash',
+            icon: LND_ICON,
+            sourceVersion: null,
+            dependencyMetadata: {
+              bitcoind: {
+                title: 'Bitcoin Core',
+                icon: BTC_ICON,
+                description: 'Used for RPC requests',
+                optional: false,
+              },
+              'btc-rpc-proxy': {
+                title: 'Bitcoin Proxy',
+                icon: PROXY_ICON,
+                description: 'Used for authorized proxying of RPC requests',
+                optional: true,
+              },
+            },
+            donationUrl: null,
+            alerts: {
+              install: 'test',
+              uninstall: 'test',
+              start: 'test',
+              stop: 'test',
+              restore: 'test',
+            },
+            s9pk: {
+              url: 'https://github.com/Start9Labs/lnd-startos/releases/download/v0.17.5/lnd.s9pk',
+              commitment: mockMerkleArchiveCommitment,
+              signatures: {},
+              publishedAt: Date.now().toString(),
+            },
+          },
+        },
+        categories: ['lightning', 'featured'],
+        otherVersions: {
+          '0.18.0:0.0.1': {
+            releaseNotes: 'Upstream release and minor fixes.',
+          },
+          '0.17.4-beta:1.0-alpha': {
+            releaseNotes: 'Upstream release to 0.17.4',
+          },
         },
-        categories: ['bitcoin', 'cryptocurrency'],
-        versions: ['0.19.0', '0.20.0', '0.21.0'],
-        dependencyMetadata: {},
-        publishedAt: new Date().toISOString(),
       },
-      '0.21.0': {
-        icon: BTC_ICON,
-        license: 'licenseUrl',
-        instructions: 'instructionsUrl',
-        manifest: {
-          ...Mock.MockManifestBitcoind,
-          version: '0.21.0',
-          releaseNotes:
-            'For a complete list of changes, please visit <a href="https://bitcoincore.org/en/releases/0.21.0/">https://bitcoincore.org/en/releases/0.21.0/</a><br /><ul><li>Taproot!</li><li>New RPCs</li><li>Experimental Descriptor Wallets</li></ul>',
+      '=0.17.4-beta:1.0-alpha': {
+        best: {
+          '0.17.4-beta:1.0-alpha': {
+            title: 'LND',
+            description: mockDescription,
+            hardwareRequirements: { arch: null, device: {}, ram: null },
+            license: 'mit',
+            wrapperRepo: 'https://github.com/start9labs/lnd-startos',
+            upstreamRepo: 'https://github.com/lightningnetwork/lnd',
+            supportSite: 'https://lightning.engineering/slack.html',
+            marketingSite: 'https://lightning.engineering/',
+            releaseNotes: 'Upstream release to 0.17.4',
+            osVersion: '0.3.6',
+            gitHash: 'fakehash',
+            icon: LND_ICON,
+            sourceVersion: null,
+            dependencyMetadata: {
+              bitcoind: {
+                title: 'Bitcoin Core',
+                icon: BTC_ICON,
+                description: 'Used for RPC requests',
+                optional: false,
+              },
+              'btc-rpc-proxy': {
+                title: 'Bitcoin Proxy',
+                icon: PROXY_ICON,
+                description: 'Used for authorized proxying of RPC requests',
+                optional: true,
+              },
+            },
+            donationUrl: null,
+            alerts: {
+              install: 'test',
+              uninstall: 'test',
+              start: 'test',
+              stop: 'test',
+              restore: 'test',
+            },
+            s9pk: {
+              url: 'https://github.com/Start9Labs/lnd-startos/releases/download/v0.17.4/lnd.s9pk',
+              commitment: mockMerkleArchiveCommitment,
+              signatures: {},
+              publishedAt: Date.now().toString(),
+            },
+          },
+        },
+        categories: ['lightning', 'featured'],
+        otherVersions: {
+          '0.18.0:0.0.1': {
+            releaseNotes: 'Upstream release and minor fixes.',
+          },
+          '0.17.5:0': {
+            releaseNotes: 'Upstream release to 0.17.5',
+          },
         },
-        categories: ['bitcoin', 'cryptocurrency'],
-        versions: ['0.19.0', '0.20.0', '0.21.0'],
-        dependencyMetadata: {},
-        publishedAt: new Date().toISOString(),
       },
-      latest: {
-        icon: BTC_ICON,
-        license: 'licenseUrl',
-        instructions: 'instructionsUrl',
-        manifest: {
-          ...Mock.MockManifestBitcoind,
-          releaseNotes:
-            'For a complete list of changes, please visit <a href="https://bitcoincore.org/en/releases/0.21.0/" target="_blank">https://bitcoincore.org/en/releases/0.21.0/</a><br />Or in [markdown](https://bitcoincore.org/en/releases/0.21.0/)<ul><li>Taproot!</li><li>New RPCs</li><li>Experimental Descriptor Wallets</li></ul>',
+    },
+    'btc-rpc-proxy': {
+      '=0.3.2.6:0': {
+        best: {
+          '0.3.2.6:0': {
+            title: 'Bitcoin Proxy',
+            description: mockDescription,
+            hardwareRequirements: { arch: null, device: {}, ram: null },
+            license: 'mit',
+            wrapperRepo: 'https://github.com/Start9Labs/btc-rpc-proxy-wrappers',
+            upstreamRepo: 'https://github.com/Kixunil/btc-rpc-proxy',
+            supportSite: 'https://github.com/Kixunil/btc-rpc-proxy/issues',
+            marketingSite: '',
+            releaseNotes: 'Upstream release and minor fixes.',
+            osVersion: '0.3.6',
+            gitHash: 'fakehash',
+            icon: PROXY_ICON,
+            sourceVersion: null,
+            dependencyMetadata: {},
+            donationUrl: null,
+            alerts: {
+              install: 'test',
+              uninstall: 'test',
+              start: 'test',
+              stop: 'test',
+              restore: 'test',
+            },
+            s9pk: {
+              url: 'https://github.com/Start9Labs/btc-rpc-proxy-startos/releases/download/v0.3.2.7.1/btc-rpc-proxy.s9pk',
+              commitment: mockMerkleArchiveCommitment,
+              signatures: {},
+              publishedAt: Date.now().toString(),
+            },
+          },
+        },
+        categories: ['bitcoin'],
+        otherVersions: {
+          '0.3.2.7:0': {
+            releaseNotes: 'Upstream release and minor fixes.',
+          },
         },
-        categories: ['bitcoin', 'cryptocurrency'],
-        versions: ['0.19.0', '0.20.0', '0.21.0'],
-        dependencyMetadata: {},
-        publishedAt: new Date().toISOString(),
       },
     },
-    lnd: {
-      '0.11.0': {
-        icon: LND_ICON,
-        license: 'licenseUrl',
-        instructions: 'instructionsUrl',
-        manifest: {
-          ...Mock.MockManifestLnd,
-          version: '0.11.0',
-          releaseNotes: 'release notes for LND 0.11.0',
+  }
+
+  export const RegistryPackages: GetPackagesRes = {
+    bitcoind: {
+      best: {
+        '27.0.0:1.0.0': {
+          title: 'Bitcoin Core',
+          description: mockDescription,
+          hardwareRequirements: { arch: null, device: {}, ram: null },
+          license: 'mit',
+          wrapperRepo: 'https://github.com/start9labs/bitcoind-startos',
+          upstreamRepo: 'https://github.com/bitcoin/bitcoin',
+          supportSite: 'https://bitcoin.org',
+          marketingSite: 'https://bitcoin.org',
+          releaseNotes: 'Even better support for Bitcoin and wallets!',
+          osVersion: '0.3.6',
+          gitHash: 'fakehash',
+          icon: BTC_ICON,
+          sourceVersion: null,
+          dependencyMetadata: {},
+          donationUrl: null,
+          alerts: {
+            install: 'test',
+            uninstall: 'test',
+            start: 'test',
+            stop: 'test',
+            restore: 'test',
+          },
+          s9pk: {
+            url: 'https://github.com/Start9Labs/bitcoind-startos/releases/download/v27.0.0/bitcoind.s9pk',
+            commitment: mockMerkleArchiveCommitment,
+            signatures: {},
+            publishedAt: Date.now().toString(),
+          },
         },
-        categories: ['bitcoin', 'lightning', 'cryptocurrency'],
-        versions: ['0.11.0', '0.11.1'],
-        dependencyMetadata: {
-          bitcoind: BitcoinDep,
-          'btc-rpc-proxy': ProxyDep,
+        '#knots:27.1.0:0': {
+          title: 'Bitcoin Knots',
+          description: {
+            short: 'An alternate fully verifying implementation of Bitcoin',
+            long: 'Bitcoin Knots is a combined Bitcoin node and wallet. Not only is it easy to use, but it also ensures bitcoins you receive are both real bitcoins and really yours.',
+          },
+          hardwareRequirements: { arch: null, device: {}, ram: null },
+          license: 'mit',
+          wrapperRepo: 'https://github.com/start9labs/bitcoinknots-startos',
+          upstreamRepo: 'https://github.com/bitcoinknots/bitcoin',
+          supportSite: 'https://bitcoinknots.org',
+          marketingSite: 'https://bitcoinknots.org',
+          releaseNotes: 'Even better support for Bitcoin and wallets!',
+          osVersion: '0.3.6',
+          gitHash: 'fakehash',
+          icon: BTC_ICON,
+          sourceVersion: null,
+          dependencyMetadata: {},
+          donationUrl: null,
+          alerts: {
+            install: 'test',
+            uninstall: 'test',
+            start: 'test',
+            stop: 'test',
+            restore: 'test',
+          },
+          s9pk: {
+            url: 'https://github.com/Start9Labs/bitcoinknots-startos/releases/download/v26.1.20240513/bitcoind.s9pk',
+            commitment: mockMerkleArchiveCommitment,
+            signatures: {},
+            publishedAt: Date.now().toString(),
+          },
         },
-        publishedAt: new Date().toISOString(),
       },
-      '0.11.1': {
-        icon: LND_ICON,
-        license: 'licenseUrl',
-        instructions: 'instructionsUrl',
-        manifest: {
-          ...Mock.MockManifestLnd,
-          version: '0.11.1',
-          releaseNotes: 'release notes for LND 0.11.1',
+      categories: ['bitcoin', 'featured'],
+      otherVersions: {
+        '26.1.0:0.1.0': {
+          releaseNotes: 'Even better support for Bitcoin and wallets!',
         },
-        categories: ['bitcoin', 'lightning', 'cryptocurrency'],
-        versions: ['0.11.0', '0.11.1'],
-        dependencyMetadata: {
-          bitcoind: BitcoinDep,
-          'btc-rpc-proxy': ProxyDep,
+        '#knots:26.1.20240325:0': {
+          releaseNotes: 'Even better Knots support for Bitcoin and wallets!',
+        },
+      },
+    },
+    lnd: {
+      best: {
+        '0.18.0:0.0.1': {
+          title: 'LND',
+          description: mockDescription,
+          hardwareRequirements: { arch: null, device: {}, ram: null },
+          license: 'mit',
+          wrapperRepo: 'https://github.com/start9labs/lnd-startos',
+          upstreamRepo: 'https://github.com/lightningnetwork/lnd',
+          supportSite: 'https://lightning.engineering/slack.html',
+          marketingSite: 'https://lightning.engineering/',
+          releaseNotes: 'Upstream release and minor fixes.',
+          osVersion: '0.3.6',
+          gitHash: 'fakehash',
+          icon: LND_ICON,
+          sourceVersion: null,
+          dependencyMetadata: {
+            bitcoind: {
+              title: 'Bitcoin Core',
+              icon: BTC_ICON,
+              description: 'Used for RPC requests',
+              optional: false,
+            },
+            'btc-rpc-proxy': {
+              title: 'Bitcoin Proxy',
+              icon: null,
+              description: 'Used for authorized RPC requests',
+              optional: true,
+            },
+          },
+          donationUrl: null,
+          alerts: {
+            install: 'test',
+            uninstall: 'test',
+            start: 'test',
+            stop: 'test',
+            restore: 'test',
+          },
+          s9pk: {
+            url: 'https://github.com/Start9Labs/lnd-startos/releases/download/v0.18.0.1/lnd.s9pk',
+            commitment: mockMerkleArchiveCommitment,
+            signatures: {},
+            publishedAt: Date.now().toString(),
+          },
         },
-        publishedAt: new Date().toISOString(),
       },
-      latest: {
-        icon: LND_ICON,
-        license: 'licenseUrl',
-        instructions: 'instructionsUrl',
-        manifest: Mock.MockManifestLnd,
-        categories: ['bitcoin', 'lightning', 'cryptocurrency'],
-        versions: ['0.11.0', '0.11.1'],
-        dependencyMetadata: {
-          bitcoind: BitcoinDep,
-          'btc-rpc-proxy': ProxyDep,
+      categories: ['lightning', 'featured'],
+      otherVersions: {
+        '0.17.5:0': {
+          releaseNotes: 'Upstream release to 0.17.5',
+        },
+        '0.17.4-beta:1.0-alpha': {
+          releaseNotes: 'Upstream release to 0.17.4',
         },
-        publishedAt: new Date(new Date().valueOf() + 10).toISOString(),
       },
     },
     'btc-rpc-proxy': {
-      latest: {
-        icon: PROXY_ICON,
-        license: 'licenseUrl',
-        instructions: 'instructionsUrl',
-        manifest: Mock.MockManifestBitcoinProxy,
-        categories: ['bitcoin'],
-        versions: ['0.2.2'],
-        dependencyMetadata: {
-          bitcoind: BitcoinDep,
+      best: {
+        '0.3.2.7:0': {
+          title: 'Bitcoin Proxy',
+          description: mockDescription,
+          hardwareRequirements: { arch: null, device: {}, ram: null },
+          license: 'mit',
+          wrapperRepo: 'https://github.com/Start9Labs/btc-rpc-proxy-wrappers',
+          upstreamRepo: 'https://github.com/Kixunil/btc-rpc-proxy',
+          supportSite: 'https://github.com/Kixunil/btc-rpc-proxy/issues',
+          marketingSite: '',
+          releaseNotes: 'Upstream release and minor fixes.',
+          osVersion: '0.3.6',
+          gitHash: 'fakehash',
+          icon: PROXY_ICON,
+          sourceVersion: null,
+          dependencyMetadata: {},
+          donationUrl: null,
+          alerts: {
+            install: 'test',
+            uninstall: 'test',
+            start: 'test',
+            stop: 'test',
+            restore: 'test',
+          },
+          s9pk: {
+            url: 'https://github.com/Start9Labs/btc-rpc-proxy-startos/releases/download/v0.3.2.7/btc-rpc-proxy.s9pk',
+            commitment: mockMerkleArchiveCommitment,
+            signatures: {},
+            publishedAt: Date.now().toString(),
+          },
+        },
+      },
+      categories: ['bitcoin'],
+      otherVersions: {
+        '0.3.2.6:0': {
+          releaseNotes: 'Upstream release and minor fixes.',
         },
-        publishedAt: new Date().toISOString(),
       },
     },
   }
 
-  export const MarketplacePkgsList: RR.GetMarketplacePackagesRes =
-    Object.values(Mock.MarketplacePkgs).map(service => service['latest'])
-
   export const Notifications: ServerNotifications = [
     {
       id: 1,
@@ -658,13 +1063,13 @@ export module Mock {
     packageBackups: {
       bitcoind: {
         title: 'Bitcoin Core',
-        version: '0.21.0',
+        version: '0.21.0:0',
         osVersion: '0.3.6',
         timestamp: new Date().toISOString(),
       },
       'btc-rpc-proxy': {
         title: 'Bitcoin Proxy',
-        version: '0.2.2',
+        version: '0.2.2:0',
         osVersion: '0.3.6',
         timestamp: new Date().toISOString(),
       },
@@ -1489,8 +1894,7 @@ export module Mock {
         title: Mock.MockManifestBitcoind.title,
         icon: 'assets/img/service-icons/bitcoind.svg',
         kind: 'running',
-        registryUrl: '',
-        versionSpec: '>=26.0.0',
+        versionRange: '>=26.0.0',
         healthChecks: [],
         configSatisfied: true,
       },
@@ -1576,8 +1980,7 @@ export module Mock {
         title: Mock.MockManifestBitcoind.title,
         icon: 'assets/img/service-icons/bitcoind.svg',
         kind: 'running',
-        registryUrl: 'https://registry.start9.com',
-        versionSpec: '>=26.0.0',
+        versionRange: '>=26.0.0',
         healthChecks: [],
         configSatisfied: true,
       },
@@ -1585,8 +1988,7 @@ export module Mock {
         title: Mock.MockManifestBitcoinProxy.title,
         icon: 'assets/img/service-icons/btc-rpc-proxy.png',
         kind: 'exists',
-        registryUrl: 'https://community-registry.start9.com',
-        versionSpec: '>2.0.0',
+        versionRange: '>2.0.0',
         configSatisfied: false,
       },
     },
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 5ada03cad..770792328 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -1,5 +1,4 @@
 import { Dump } from 'patch-db-client'
-import { MarketplacePkg, StoreInfo } from '@start9labs/marketplace'
 import { PackagePropertiesVersioned } from 'src/app/util/properties.util'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
@@ -223,12 +222,7 @@ export module RR {
   export type GetPackageMetricsReq = { id: string } // package.metrics
   export type GetPackageMetricsRes = Metric
 
-  export type InstallPackageReq = {
-    id: string
-    versionSpec?: string
-    versionPriority?: 'min' | 'max'
-    registry: string
-  } // package.install
+  export type InstallPackageReq = T.InstallParams
   export type InstallPackageRes = null
 
   export type GetPackageConfigReq = { id: string } // package.config.get
@@ -287,26 +281,13 @@ export module RR {
     progress: string // guid
   }
 
-  // marketplace
+  // registry
 
-  export type GetMarketplaceInfoReq = { serverId: string }
-  export type GetMarketplaceInfoRes = StoreInfo
+  /** these are returned in ASCENDING order. the newest available version will be the LAST in the object */
+  export type GetRegistryOsUpdateRes = { [version: string]: T.OsVersionInfo }
 
   export type CheckOSUpdateReq = { serverId: string }
   export type CheckOSUpdateRes = OSUpdate
-
-  export type GetMarketplacePackagesReq = {
-    ids?: { id: string; version: string }[]
-    // iff !ids
-    category?: string
-    query?: string
-    page?: number
-    perPage?: number
-  }
-  export type GetMarketplacePackagesRes = MarketplacePkg[]
-
-  export type GetReleaseNotesReq = { id: string }
-  export type GetReleaseNotesRes = { [version: string]: string }
 }
 
 export interface OSUpdate {
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index a5bce8c62..579292300 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -1,17 +1,32 @@
 import { Observable } from 'rxjs'
 import { RR } from './api.types'
+import { RPCOptions } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
+import {
+  GetPackageRes,
+  GetPackagesRes,
+  MarketplacePkg,
+} from '@start9labs/marketplace'
 
 export abstract class ApiService {
   // http
 
-  // for getting static files: ex icons, instructions, licenses
-  abstract getStatic(url: string): Promise<string>
-
   // for sideloading packages
   abstract uploadPackage(guid: string, body: Blob): Promise<string>
 
   abstract uploadFile(body: Blob): Promise<string>
 
+  // for getting static files: ex icons, instructions, licenses
+  abstract getStaticProxy(
+    pkg: MarketplacePkg,
+    path: 'LICENSE.md' | 'instructions.md',
+  ): Promise<string>
+
+  abstract getStaticInstalled(
+    id: T.PackageId,
+    path: 'LICENSE.md' | 'instructions.md',
+  ): Promise<string>
+
   // websocket
 
   abstract openWebsocket$<T>(
@@ -120,14 +135,23 @@ export abstract class ApiService {
 
   // marketplace URLs
 
-  abstract marketplaceProxy<T>(
-    path: string,
-    params: Record<string, unknown>,
-    url: string,
+  abstract registryRequest<T>(
+    registryUrl: string,
+    options: RPCOptions,
   ): Promise<T>
 
   abstract checkOSUpdate(qp: RR.CheckOSUpdateReq): Promise<RR.CheckOSUpdateRes>
 
+  abstract getRegistryInfo(registryUrl: string): Promise<T.RegistryInfo>
+
+  abstract getRegistryPackage(
+    url: string,
+    id: string,
+    versionRange: string | null,
+  ): Promise<GetPackageRes>
+
+  abstract getRegistryPackages(registryUrl: string): Promise<GetPackagesRes>
+
   // notification
 
   abstract getNotifications(
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index cef2c13ff..87be49e36 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -18,6 +18,15 @@ import { AuthService } from '../auth.service'
 import { DOCUMENT } from '@angular/common'
 import { DataModel } from '../patch-db/data-model'
 import { Dump, pathFromArray } from 'patch-db-client'
+import { T } from '@start9labs/start-sdk'
+import {
+  GetPackageReq,
+  GetPackageRes,
+  GetPackagesReq,
+  GetPackagesRes,
+  MarketplacePkg,
+} from '@start9labs/marketplace'
+import { blake3 } from '@noble/hashes/blake3'
 
 @Injectable()
 export class LiveApiService extends ApiService {
@@ -29,17 +38,7 @@ export class LiveApiService extends ApiService {
     @Inject(PATCH_CACHE) private readonly cache$: Observable<Dump<DataModel>>,
   ) {
     super()
-    ; (window as any).rpcClient = this
-  }
-
-  // for getting static files: ex icons, instructions, licenses
-
-  async getStatic(url: string): Promise<string> {
-    return this.httpRequest({
-      method: Method.GET,
-      url,
-      responseType: 'text',
-    })
+    ;(window as any).rpcClient = this
   }
 
   // for sideloading packages
@@ -62,6 +61,36 @@ export class LiveApiService extends ApiService {
     })
   }
 
+  // for getting static files: ex. instructions, licenses
+
+  async getStaticProxy(
+    pkg: MarketplacePkg,
+    path: 'LICENSE.md' | 'instructions.md',
+  ): Promise<string> {
+    const encodedUrl = encodeURIComponent(pkg.s9pk.url)
+
+    return this.httpRequest({
+      method: Method.GET,
+      url: `/s9pk/proxy/${encodedUrl}/${path}`,
+      params: {
+        rootSighash: pkg.s9pk.commitment.rootSighash,
+        rootMaxsize: pkg.s9pk.commitment.rootMaxsize,
+      },
+      responseType: 'text',
+    })
+  }
+
+  async getStaticInstalled(
+    id: T.PackageId,
+    path: 'LICENSE.md' | 'instructions.md',
+  ): Promise<string> {
+    return this.httpRequest({
+      method: Method.GET,
+      url: `/s9pk/installed/${id}.s9pk/${path}`,
+      responseType: 'text',
+    })
+  }
+
   // websocket
 
   openWebsocket$<T>(
@@ -257,24 +286,63 @@ export class LiveApiService extends ApiService {
 
   // marketplace URLs
 
-  async marketplaceProxy<T>(
-    path: string,
-    qp: Record<string, string>,
-    baseUrl: string,
+  async registryRequest<T>(
+    registryUrl: string,
+    options: RPCOptions,
   ): Promise<T> {
-    const fullUrl = `${baseUrl}${path}?${new URLSearchParams(qp).toString()}`
     return this.rpcRequest({
-      method: 'marketplace.get',
-      params: { url: fullUrl },
+      ...options,
+      method: `registry.${options.method}`,
+      params: { registry: registryUrl, ...options.params },
     })
   }
 
   async checkOSUpdate(qp: RR.CheckOSUpdateReq): Promise<RR.CheckOSUpdateRes> {
-    return this.marketplaceProxy(
-      '/eos/v0/latest',
-      qp,
-      this.config.marketplace.start9,
-    )
+    const { serverId } = qp
+
+    return this.registryRequest(this.config.marketplace.start9, {
+      method: 'os.version.get',
+      params: { serverId },
+    })
+  }
+
+  async getRegistryInfo(registryUrl: string): Promise<T.RegistryInfo> {
+    return this.registryRequest(registryUrl, {
+      method: 'info',
+      params: {},
+    })
+  }
+
+  async getRegistryPackage(
+    registryUrl: string,
+    id: string,
+    versionRange: string | null,
+  ): Promise<GetPackageRes> {
+    const params: GetPackageReq = {
+      id,
+      version: versionRange,
+      sourceVersion: null,
+      otherVersions: 'short',
+    }
+
+    return this.registryRequest<GetPackageRes>(registryUrl, {
+      method: 'package.get',
+      params,
+    })
+  }
+
+  async getRegistryPackages(registryUrl: string): Promise<GetPackagesRes> {
+    const params: GetPackagesReq = {
+      id: null,
+      version: null,
+      sourceVersion: null,
+      otherVersions: 'short',
+    }
+
+    return this.registryRequest<GetPackagesRes>(registryUrl, {
+      method: 'package.get',
+      params,
+    })
   }
 
   // notification
@@ -504,6 +572,29 @@ export class LiveApiService extends ApiService {
 
   private async httpRequest<T>(opts: HttpOptions): Promise<T> {
     const res = await this.http.httpRequest<T>(opts)
+    if (res.headers.get('Repr-Digest')) {
+      // verify
+      const digest = res.headers.get('Repr-Digest')!
+      let data: Uint8Array
+      if (opts.responseType === 'arrayBuffer') {
+        data = Buffer.from(res.body as ArrayBuffer)
+      } else if (opts.responseType === 'text') {
+        data = Buffer.from(res.body as string)
+      } else if ((opts.responseType as string) === 'blob') {
+        data = Buffer.from(await (res.body as Blob).arrayBuffer())
+      } else {
+        console.warn(
+          `could not verify Repr-Digest for responseType ${
+            opts.responseType || 'json'
+          }`,
+        )
+        return res.body
+      }
+      const computedDigest = Buffer.from(blake3(data)).toString('base64')
+      if (`blake3=:${computedDigest}:` === digest) return res.body
+      console.debug(computedDigest, digest)
+      throw new Error('File digest mismatch.')
+    }
     return res.body
   }
 }
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 21491dc52..e063fb6e4 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { Log, RPCErrorDetails, pauseFor } from '@start9labs/shared'
+import { Log, RPCErrorDetails, RPCOptions, pauseFor } from '@start9labs/shared'
 import { ApiService } from './embassy-api.service'
 import {
   Operation,
@@ -30,8 +30,12 @@ import {
 } from 'rxjs'
 import { mockPatchData } from './mock-patch'
 import { AuthService } from '../auth.service'
-import { StoreInfo } from '@start9labs/marketplace'
 import { T } from '@start9labs/start-sdk'
+import {
+  GetPackageRes,
+  GetPackagesRes,
+  MarketplacePkg,
+} from '@start9labs/marketplace'
 
 const PROGRESS: T.FullProgress = {
   overall: {
@@ -48,10 +52,7 @@ const PROGRESS: T.FullProgress = {
     },
     {
       name: 'Validating',
-      progress: {
-        done: 0,
-        total: 40,
-      },
+      progress: null,
     },
     {
       name: 'Installing',
@@ -80,14 +81,25 @@ export class MockApiService extends ApiService {
       .subscribe()
   }
 
-  async getStatic(url: string): Promise<string> {
+  async uploadPackage(guid: string, body: Blob): Promise<string> {
+    await pauseFor(2000)
+    return 'success'
+  }
+
+  async getStaticProxy(
+    pkg: MarketplacePkg,
+    path: 'LICENSE.md' | 'instructions.md',
+  ): Promise<string> {
     await pauseFor(2000)
     return markdown
   }
 
-  async uploadPackage(guid: string, body: Blob): Promise<string> {
+  async getStaticInstalled(
+    id: T.PackageId,
+    path: 'LICENSE.md' | 'instructions.md',
+  ): Promise<string> {
     await pauseFor(2000)
-    return 'success'
+    return markdown
   }
 
   // websocket
@@ -136,7 +148,7 @@ export class MockApiService extends ApiService {
 
     this.stateIndex++
 
-    return this.stateIndex === 1 ? 'initializing' : 'running'
+    return this.stateIndex === 1 ? 'running' : 'running'
   }
 
   // db
@@ -448,34 +460,13 @@ export class MockApiService extends ApiService {
 
   // marketplace URLs
 
-  async marketplaceProxy(
-    path: string,
-    params: Record<string, string>,
-    url: string,
+  async registryRequest(
+    registryUrl: string,
+    options: RPCOptions,
   ): Promise<any> {
     await pauseFor(2000)
 
-    if (path === '/package/v0/info') {
-      const info: StoreInfo = {
-        name: 'Start9 Registry',
-        categories: [
-          'bitcoin',
-          'lightning',
-          'data',
-          'featured',
-          'messaging',
-          'social',
-          'alt coin',
-        ],
-      }
-      return info
-    } else if (path === '/package/v0/index') {
-      return Mock.MarketplacePkgsList
-    } else if (path.startsWith('/package/v0/release-notes')) {
-      return Mock.ReleaseNotes
-    } else if (path.includes('instructions') || path.includes('license')) {
-      return markdown
-    }
+    return Error('do not call directly')
   }
 
   async checkOSUpdate(qp: RR.CheckOSUpdateReq): Promise<RR.CheckOSUpdateRes> {
@@ -483,6 +474,29 @@ export class MockApiService extends ApiService {
     return Mock.MarketplaceEos
   }
 
+  async getRegistryInfo(registryUrl: string): Promise<T.RegistryInfo> {
+    await pauseFor(2000)
+    return Mock.RegistryInfo
+  }
+
+  async getRegistryPackage(
+    url: string,
+    id: string,
+    versionRange: string,
+  ): Promise<GetPackageRes> {
+    await pauseFor(2000)
+    if (!versionRange) {
+      return Mock.RegistryPackages[id]
+    } else {
+      return Mock.OtherPackageVersions[id][versionRange]
+    }
+  }
+
+  async getRegistryPackages(registryUrl: string): Promise<GetPackagesRes> {
+    await pauseFor(2000)
+    return Mock.RegistryPackages
+  }
+
   // notification
 
   async getNotifications(
@@ -742,11 +756,11 @@ export class MockApiService extends ApiService {
           ...Mock.LocalPkgs[params.id],
           stateInfo: {
             // if installing
-            // state: PackageState.Installing,
+            state: 'installing',
 
             // if updating
-            state: 'updating',
-            manifest: mockPatchData.packageData[params.id].stateInfo.manifest!,
+            // state: 'updating',
+            // manifest: mockPatchData.packageData[params.id].stateInfo.manifest!,
 
             // both
             installingInfo: {
@@ -1129,11 +1143,7 @@ export class MockApiService extends ApiService {
     const progress = JSON.parse(JSON.stringify(PROGRESS))
 
     for (let [i, phase] of progress.phases.entries()) {
-      if (
-        !phase.progress ||
-        typeof phase.progress !== 'object' ||
-        !phase.progress.total
-      ) {
+      if (!phase.progress || phase.progress === true || !phase.progress.total) {
         await pauseFor(2000)
 
         const patches: Operation<any>[] = [
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 8411b7b7c..7b0d6b1df 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -88,7 +88,7 @@ export const mockPatchData: DataModel = {
         state: 'installed',
         manifest: {
           ...Mock.MockManifestBitcoind,
-          version: '0.20.0',
+          version: '0.20.0:0',
         },
       },
       icon: '/assets/img/service-icons/bitcoind.svg',
@@ -295,7 +295,7 @@ export const mockPatchData: DataModel = {
         state: 'installed',
         manifest: {
           ...Mock.MockManifestLnd,
-          version: '0.11.0',
+          version: '0.11.0:0.0.1',
         },
       },
       icon: '/assets/img/service-icons/lnd.png',
@@ -368,8 +368,7 @@ export const mockPatchData: DataModel = {
           title: 'Bitcoin Core',
           icon: 'assets/img/service-icons/bitcoind.svg',
           kind: 'running',
-          registryUrl: 'https://registry.start9.com',
-          versionSpec: '>=26.0.0',
+          versionRange: '>=26.0.0',
           healthChecks: [],
           configSatisfied: true,
         },
@@ -377,8 +376,7 @@ export const mockPatchData: DataModel = {
           title: 'Bitcoin Proxy',
           icon: 'assets/img/service-icons/btc-rpc-proxy.png',
           kind: 'running',
-          registryUrl: 'https://community-registry.start9.com',
-          versionSpec: '>2.0.0',
+          versionRange: '>2.0.0',
           healthChecks: [],
           configSatisfied: false,
         },
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index 5abee0d6b..a46a5123e 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { Emver } from '@start9labs/shared'
+import { Exver } from '@start9labs/shared'
 import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
 import {
@@ -39,7 +39,7 @@ export class DepErrorService {
   )
 
   constructor(
-    private readonly emver: Emver,
+    private readonly exver: Exver,
     private readonly patch: PatchDB<DataModel>,
   ) {}
 
@@ -87,11 +87,17 @@ export class DepErrorService {
     const depManifest = dep.stateInfo.manifest
 
     // incorrect version
-    if (!this.emver.satisfies(depManifest.version, currentDep.versionSpec)) {
-      return {
-        type: 'incorrectVersion',
-        expected: currentDep.versionSpec,
-        received: depManifest.version,
+    if (!this.exver.satisfies(depManifest.version, currentDep.versionRange)) {
+      if (
+        depManifest.satisfies.some(
+          v => !this.exver.satisfies(v, currentDep.versionRange),
+        )
+      ) {
+        return {
+          type: 'incorrectVersion',
+          expected: currentDep.versionRange,
+          received: depManifest.version,
+        }
       }
     }
 
diff --git a/web/projects/ui/src/app/services/eos.service.ts b/web/projects/ui/src/app/services/eos.service.ts
index 81b97bf11..c61c667e3 100644
--- a/web/projects/ui/src/app/services/eos.service.ts
+++ b/web/projects/ui/src/app/services/eos.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core'
-import { Emver } from '@start9labs/shared'
 import { BehaviorSubject, combineLatest } from 'rxjs'
 import { distinctUntilChanged, map } from 'rxjs/operators'
 import { OSUpdate } from 'src/app/services/api/api.types'
@@ -7,6 +6,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { PatchDB } from 'patch-db-client'
 import { getServerInfo } from 'src/app/util/get-server-info'
 import { DataModel } from './patch-db/data-model'
+import { Exver } from '@start9labs/shared'
 
 @Injectable({
   providedIn: 'root',
@@ -47,15 +47,15 @@ export class EOSService {
 
   constructor(
     private readonly api: ApiService,
-    private readonly emver: Emver,
     private readonly patch: PatchDB<DataModel>,
+    private readonly exver: Exver,
   ) {}
 
   async loadEos(): Promise<void> {
     const { version, id } = await getServerInfo(this.patch)
     this.osUpdate = await this.api.checkOSUpdate({ serverId: id })
     const updateAvailable =
-      this.emver.compare(this.osUpdate.version, version) === 1
+      this.exver.compareOsVersion(this.osUpdate.version, version) === 'greater'
     this.updateAvailable$.next(updateAvailable)
   }
 }
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index 40d2247e7..6ce3b136f 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -1,11 +1,11 @@
-import { Injectable } from '@angular/core'
+import { Inject, Injectable } from '@angular/core'
 import {
-  MarketplacePkg,
   AbstractMarketplaceService,
   StoreData,
   Marketplace,
-  StoreInfo,
   StoreIdentity,
+  MarketplacePkg,
+  GetPackageRes,
 } from '@start9labs/marketplace'
 import {
   BehaviorSubject,
@@ -37,8 +37,9 @@ import {
   tap,
 } from 'rxjs/operators'
 import { ConfigService } from './config.service'
-import { sameUrl } from '@start9labs/shared'
+import { Exver, sameUrl } from '@start9labs/shared'
 import { ClientStorageService } from './client-storage.service'
+import { ExtendedVersion, T } from '@start9labs/start-sdk'
 
 @Injectable()
 export class MarketplaceService implements AbstractMarketplaceService {
@@ -93,11 +94,9 @@ export class MarketplaceService implements AbstractMarketplaceService {
     mergeMap(({ url, name }) =>
       this.fetchStore$(url).pipe(
         tap(data => {
-          if (data?.info) this.updateStoreName(url, name, data.info.name)
-        }),
-        map<StoreData | null, [string, StoreData | null]>(data => {
-          return [url, data]
+          if (data?.info.name) this.updateStoreName(url, name, data.info.name)
         }),
+        map<StoreData | null, [string, StoreData | null]>(data => [url, data]),
         startWith<[string, StoreData | null]>([url, null]),
       ),
     ),
@@ -148,6 +147,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
     private readonly patch: PatchDB<DataModel>,
     private readonly config: ConfigService,
     private readonly clientStorageService: ClientStorageService,
+    private readonly exver: Exver,
   ) {}
 
   getKnownHosts$(filtered = false): Observable<StoreIdentity[]> {
@@ -170,28 +170,29 @@ export class MarketplaceService implements AbstractMarketplaceService {
 
   getPackage$(
     id: string,
-    version: string,
-    optionalUrl?: string,
+    version: string | null,
+    flavor: string | null,
+    registryUrl?: string,
   ): Observable<MarketplacePkg> {
-    return this.patch.watch$('ui', 'marketplace').pipe(
-      switchMap(uiMarketplace => {
-        const url = optionalUrl || uiMarketplace.selectedUrl
+    return this.selectedHost$.pipe(
+      switchMap(selected =>
+        this.marketplace$.pipe(
+          switchMap(m => {
+            const url = registryUrl || selected.url
 
-        if (version !== '*' || !uiMarketplace.knownHosts[url]) {
-          return this.fetchPackage$(id, version, url)
-        }
+            const pkg = m[url]?.packages.find(
+              p =>
+                p.id === id &&
+                p.flavor === flavor &&
+                (!version || this.exver.compareExver(p.version, version) === 0),
+            )
 
-        return this.marketplace$.pipe(
-          map(m => m[url]),
-          filter(Boolean),
-          take(1),
-          map(
-            store =>
-              store.packages.find(p => p.manifest.id === id) ||
-              ({} as MarketplacePkg),
-          ),
-        )
-      }),
+            return !!pkg
+              ? of(pkg)
+              : this.fetchPackage$(url, id, version, flavor)
+          }),
+        ),
+      ),
     )
   }
 
@@ -210,56 +211,22 @@ export class MarketplaceService implements AbstractMarketplaceService {
   ): Promise<void> {
     const params: RR.InstallPackageReq = {
       id,
-      versionSpec: `=${version}`,
+      version,
       registry: url,
     }
 
     await this.api.installPackage(params)
   }
 
-  fetchInfo$(url: string): Observable<StoreInfo> {
-    return this.patch.watch$('serverInfo').pipe(
-      take(1),
-      switchMap(serverInfo => {
-        const qp: RR.GetMarketplaceInfoReq = { serverId: serverInfo.id }
-        return this.api.marketplaceProxy<RR.GetMarketplaceInfoRes>(
-          '/package/v0/info',
-          qp,
-          url,
-        )
-      }),
-    )
-  }
-
-  fetchReleaseNotes$(
-    id: string,
-    url?: string,
-  ): Observable<Record<string, string>> {
-    return this.selectedHost$.pipe(
-      switchMap(m => {
-        return from(
-          this.api.marketplaceProxy<Record<string, string>>(
-            `/package/v0/release-notes/${id}`,
-            {},
-            url || m.url,
-          ),
-        )
-      }),
-    )
+  fetchInfo$(url: string): Observable<T.RegistryInfo> {
+    return from(this.api.getRegistryInfo(url))
   }
 
-  fetchStatic$(id: string, type: string, url?: string): Observable<string> {
-    return this.selectedHost$.pipe(
-      switchMap(m => {
-        return from(
-          this.api.marketplaceProxy<string>(
-            `/package/v0/${type}/${id}`,
-            {},
-            url || m.url,
-          ),
-        )
-      }),
-    )
+  fetchStatic$(
+    pkg: MarketplacePkg,
+    type: 'LICENSE.md' | 'instructions.md',
+  ): Observable<string> {
+    return from(this.api.getStaticProxy(pkg, type))
   }
 
   private fetchStore$(url: string): Observable<StoreData | null> {
@@ -273,33 +240,57 @@ export class MarketplaceService implements AbstractMarketplaceService {
     )
   }
 
-  private fetchPackages$(
-    url: string,
-    params: Omit<RR.GetMarketplacePackagesReq, 'page' | 'per-page'> = {},
-  ): Observable<MarketplacePkg[]> {
-    const qp: RR.GetMarketplacePackagesReq = {
-      ...params,
-      page: 1,
-      perPage: 100,
-    }
-    if (qp.ids) qp.ids = JSON.stringify(qp.ids)
-
-    return from(
-      this.api.marketplaceProxy<RR.GetMarketplacePackagesRes>(
-        '/package/v0/index',
-        qp,
-        url,
-      ),
+  private fetchPackages$(url: string): Observable<MarketplacePkg[]> {
+    return from(this.api.getRegistryPackages(url)).pipe(
+      map(packages => {
+        return Object.entries(packages).flatMap(([id, pkgInfo]) =>
+          Object.keys(pkgInfo.best).map(version =>
+            this.convertToMarketplacePkg(
+              id,
+              version,
+              this.exver.getFlavor(version),
+              pkgInfo,
+            ),
+          ),
+        )
+      }),
     )
   }
 
-  private fetchPackage$(
+  convertToMarketplacePkg(
     id: string,
-    version: string,
+    version: string | null,
+    flavor: string | null,
+    pkgInfo: GetPackageRes,
+  ): MarketplacePkg {
+    version =
+      version ||
+      Object.keys(pkgInfo.best).find(v => this.exver.getFlavor(v) === flavor) ||
+      null
+
+    return !version || !pkgInfo.best[version]
+      ? ({} as MarketplacePkg)
+      : {
+          id,
+          version,
+          flavor,
+          ...pkgInfo,
+          ...pkgInfo.best[version],
+        }
+  }
+
+  private fetchPackage$(
     url: string,
+    id: string,
+    version: string | null,
+    flavor: string | null,
   ): Observable<MarketplacePkg> {
-    return this.fetchPackages$(url, { ids: [{ id, version }] }).pipe(
-      map(pkgs => pkgs[0] || {}),
+    return from(
+      this.api.getRegistryPackage(url, id, version ? `=${version}` : null),
+    ).pipe(
+      map(pkgInfo =>
+        this.convertToMarketplacePkg(id, version, flavor, pkgInfo),
+      ),
     )
   }
 
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index 33daecda7..d7deb31df 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -50,6 +50,10 @@ export type PackageDataEntry<T extends StateInfo = StateInfo> =
     stateInfo: T
   }
 
+export type AllPackageData = NonNullable<
+  T.AllPackageData & Record<string, PackageDataEntry<StateInfo>>
+>
+
 export type StateInfo = InstalledState | InstallingState | UpdatingState
 
 export type InstalledState = {
diff --git a/web/projects/ui/src/app/util/dry-update.ts b/web/projects/ui/src/app/util/dry-update.ts
index 2d4d1aa10..e9386df3c 100644
--- a/web/projects/ui/src/app/util/dry-update.ts
+++ b/web/projects/ui/src/app/util/dry-update.ts
@@ -1,18 +1,19 @@
-import { Emver } from '@start9labs/shared'
+import { Exver } from '@start9labs/shared'
 import { DataModel } from '../services/patch-db/data-model'
 import { getManifest } from './get-package-data'
 
 export function dryUpdate(
   { id, version }: { id: string; version: string },
   pkgs: DataModel['packageData'],
-  emver: Emver,
+  exver: Exver,
 ): string[] {
   return Object.values(pkgs)
     .filter(
       pkg =>
         Object.keys(pkg.currentDependencies || {}).some(
           pkgId => pkgId === id,
-        ) && !emver.satisfies(version, pkg.currentDependencies[id].versionSpec),
+        ) &&
+        !exver.satisfies(version, pkg.currentDependencies[id].versionRange),
     )
     .map(pkg => getManifest(pkg).title)
 }
diff --git a/web/projects/ui/src/manifest.webmanifest b/web/projects/ui/src/manifest.webmanifest
index fee3469fc..cecc31bfe 100644
--- a/web/projects/ui/src/manifest.webmanifest
+++ b/web/projects/ui/src/manifest.webmanifest
@@ -5,8 +5,8 @@
   "background_color": "#1e1e1e",
   "display": "standalone",
   "scope": ".",
-  "start_url": "/?version=0351",
-  "id": "/?version=0351",
+  "start_url": "/?version=036",
+  "id": "/?version=036",
   "icons": [
     {
       "src": "assets/img/icon.png",
diff --git a/web/projects/ui/src/polyfills.ts b/web/projects/ui/src/polyfills.ts
index 67caa24e8..813796e34 100644
--- a/web/projects/ui/src/polyfills.ts
+++ b/web/projects/ui/src/polyfills.ts
@@ -52,8 +52,8 @@
  *
  */
 
-;(window as any).global = window
-;(window as any).process = { env: { DEBUG: undefined }, browser: true }
+(window as any).global = window
+; (window as any).process = { env: { DEBUG: undefined }, browser: true }
 
 import { Buffer } from 'buffer'
 window.Buffer = Buffer

From 019142efc958abf373fee2f39c0b93179fdf2bcf Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 23 Jul 2024 12:18:17 -0600
Subject: [PATCH 192/341] v0.3.6-alpha.0 (#2680)

* v0.3.6-alpha.0

* show welcome on fresh install
---
 core/Cargo.lock                               |  2 +-
 core/startos/Cargo.toml                       |  2 +-
 core/startos/src/db/model/public.rs           |  2 +-
 core/startos/src/os_install/mod.rs            | 17 +++++++++++++
 core/startos/src/version/mod.rs               | 24 +++++++++++++++----
 .../version/{v0_3_6.rs => v0_3_6_alpha_0.rs}  | 13 ++++++----
 sdk/lib/osBindings/Public.ts                  |  2 +-
 web/package.json                              |  2 +-
 web/patchdb-ui-seed.json                      |  2 +-
 .../modals/os-welcome/os-welcome.page.html    | 22 +++--------------
 10 files changed, 53 insertions(+), 35 deletions(-)
 rename core/startos/src/version/{v0_3_6.rs => v0_3_6_alpha_0.rs} (66%)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index e3576a8d8..a3464c7dc 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -4949,7 +4949,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.5-rev.2"
+version = "0.3.6-alpha.0"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index a531477b2..ae4382bc2 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.5-rev.2"
+version = "0.3.6-alpha.0"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index 5f8dc029a..725475602 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -31,7 +31,7 @@ use crate::{ARCH, PLATFORM};
 pub struct Public {
     pub server_info: ServerInfo,
     pub package_data: AllPackageData,
-    #[ts(type = "any")]
+    #[ts(type = "unknown")]
     pub ui: Value,
 }
 impl Public {
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 28fd2a3be..3d80f6cbd 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -147,6 +147,23 @@ pub async fn execute<C: Context>(
 
     overwrite |= disk.guid.is_none() && disk.partitions.iter().all(|p| p.guid.is_none());
 
+    if !overwrite
+        && (disk
+            .guid
+            .as_ref()
+            .map_or(false, |g| g.starts_with("EMBASSY_"))
+            || disk
+                .partitions
+                .iter()
+                .flat_map(|p| p.guid.as_ref())
+                .any(|g| g.starts_with("EMBASSY_")))
+    {
+        return Err(Error::new(
+            eyre!("installing over versions before 0.3.6 is unsupported"),
+            ErrorKind::InvalidRequest,
+        ));
+    }
+
     let part_info = partition(&mut disk, overwrite).await?;
 
     if let Some(efi) = &part_info.efi {
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 003a44326..9ad571759 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -13,18 +13,19 @@ use crate::Error;
 mod v0_3_5;
 mod v0_3_5_1;
 mod v0_3_5_2;
-mod v0_3_6;
+mod v0_3_6_alpha_0;
 
-pub type Current = v0_3_6::Version;
+pub type Current = v0_3_6_alpha_0::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
+#[allow(non_camel_case_types)]
 enum Version {
     LT0_3_5(LTWrapper<v0_3_5::Version>),
     V0_3_5(Wrapper<v0_3_5::Version>),
     V0_3_5_1(Wrapper<v0_3_5_1::Version>),
     V0_3_5_2(Wrapper<v0_3_5_2::Version>),
-    V0_3_6(Wrapper<v0_3_6::Version>),
+    V0_3_6_alpha_0(Wrapper<v0_3_6_alpha_0::Version>),
     Other(exver::Version),
 }
 
@@ -44,7 +45,7 @@ impl Version {
             Version::V0_3_5(Wrapper(x)) => x.semver(),
             Version::V0_3_5_1(Wrapper(x)) => x.semver(),
             Version::V0_3_5_2(Wrapper(x)) => x.semver(),
-            Version::V0_3_6(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_0(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -212,6 +213,19 @@ pub async fn init(
     mut progress: PhaseProgressTrackerHandle,
 ) -> Result<(), Error> {
     progress.start();
+    db.mutate(|db| {
+        db.as_public_mut()
+            .as_server_info_mut()
+            .as_version_mut()
+            .map_mutate(|v| {
+                Ok(if v == exver::Version::new([0, 3, 6], []) {
+                    v0_3_6_alpha_0::Version::new().semver()
+                } else {
+                    v
+                })
+            })
+    })
+    .await?; // TODO: remove before releasing 0.3.6
     let version = Version::from_exver_version(
         db.peek()
             .await
@@ -231,7 +245,7 @@ pub async fn init(
         Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6_alpha_0(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
diff --git a/core/startos/src/version/v0_3_6.rs b/core/startos/src/version/v0_3_6_alpha_0.rs
similarity index 66%
rename from core/startos/src/version/v0_3_6.rs
rename to core/startos/src/version/v0_3_6_alpha_0.rs
index 9564a7376..1da34f708 100644
--- a/core/startos/src/version/v0_3_6.rs
+++ b/core/startos/src/version/v0_3_6_alpha_0.rs
@@ -1,24 +1,27 @@
-use exver::VersionRange;
+use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
-use super::{v0_3_5_1, VersionT};
+use super::{v0_3_5_2, VersionT};
 use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
-    static ref V0_3_6: exver::Version = exver::Version::new([0, 3, 6], []);
+    static ref V0_3_6_alpha_0: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 0.into()]
+    );
 }
 
 #[derive(Clone, Debug)]
 pub struct Version;
 
 impl VersionT for Version {
-    type Previous = v0_3_5_1::Version;
+    type Previous = v0_3_5_2::Version;
     fn new() -> Self {
         Version
     }
     fn semver(&self) -> exver::Version {
-        V0_3_6.clone()
+        V0_3_6_alpha_0.clone()
     }
     fn compat(&self) -> &'static VersionRange {
         &V0_3_0_COMPAT
diff --git a/sdk/lib/osBindings/Public.ts b/sdk/lib/osBindings/Public.ts
index c77ae05e3..4fb186607 100644
--- a/sdk/lib/osBindings/Public.ts
+++ b/sdk/lib/osBindings/Public.ts
@@ -5,5 +5,5 @@ import type { ServerInfo } from "./ServerInfo"
 export type Public = {
   serverInfo: ServerInfo
   packageData: AllPackageData
-  ui: any
+  ui: unknown
 }
diff --git a/web/package.json b/web/package.json
index b304d4f94..6f72a68ec 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6",
+  "version": "0.3.6-alpha.0",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 6236275cd..9626d2558 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -1,6 +1,6 @@
 {
   "name": null,
-  "ackWelcome": "0.3.6",
+  "ackWelcome": "0.0.0",
   "marketplace": {
     "selectedUrl": "https://registry.start9.com/",
     "knownHosts": {
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 9603d454a..3def4478b 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,25 +12,9 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6</h4>
-  <p class="note-padding">
-    View the complete
-    <a
-      href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.5"
-      target="_blank"
-      noreferrer
-    >
-      release notes
-    </a>
-    for more details.
-  </p>
-  <h6>Highlights</h6>
-  <ul class="spaced-list">
-    <li>Ditch Podman, replace with LXC</li>
-    <li></li>
-    <li></li>
-    <li></li>
-  </ul>
+  <h4>0.3.6-alpha.0</h4>
+  <h6>This is an ALPHA release! DO NOT use for production data!</h6>
+  <h6>Expect that any data you create or store on this version of the OS can be LOST FOREVER!</h6>
 
   <div class="ion-text-center ion-padding">
     <ion-button

From c6f19db1ecc0ddffba82f88879780661797e2af7 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 23 Jul 2024 12:35:38 -0600
Subject: [PATCH 193/341] Bugfix/wsl build (#2681)

* explicitly declare squashfs as loop device

* Update update-image.sh
---
 container-runtime/update-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container-runtime/update-image.sh b/container-runtime/update-image.sh
index 1c571408a..3a8813518 100755
--- a/container-runtime/update-image.sh
+++ b/container-runtime/update-image.sh
@@ -8,7 +8,7 @@ if mountpoint tmp/combined; then sudo umount -R tmp/combined; fi
 if mountpoint tmp/lower; then sudo umount tmp/lower; fi
 sudo rm -rf tmp
 mkdir -p tmp/lower tmp/upper tmp/work tmp/combined
-sudo mount debian.${ARCH}.squashfs tmp/lower
+sudo mount -o loop -t squashfs debian.${ARCH}.squashfs tmp/lower
 sudo mount -t overlay -olowerdir=tmp/lower,upperdir=tmp/upper,workdir=tmp/work overlay tmp/combined
 
 QEMU=

From ab465a755eb9ec02626008ea3fe832aebcb697c4 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Wed, 24 Jul 2024 22:40:13 -0600
Subject: [PATCH 194/341] default to all category and fix rounding for progress
 (#2682)

* default to all category and fix rounding for progress

* Update install-progress.pipe.ts
---
 .../app-show-progress.component.html                 |  4 ++--
 .../marketplace-list/marketplace-list.page.ts        | 12 ++++++------
 .../ui/src/app/pages/updates/updates.page.html       |  2 +-
 .../pipes/install-progress/install-progress.pipe.ts  |  8 ++++----
 web/projects/ui/src/app/services/api/api.fixures.ts  |  6 +++---
 .../ui/src/app/services/marketplace.service.ts       | 10 +++-------
 6 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
index ea80b3003..1b1714f64 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
@@ -2,7 +2,7 @@
   <p>
     {{ phase.name }}
     <span *ngIf="phase.progress | installingProgress as progress">
-      : {{ progress * 100 }}%
+      : {{ progress }}%
     </span>
   </p>
   <ion-progress-bar
@@ -15,6 +15,6 @@
         : 'determinate'
     "
     [color]="phase.progress === true ? 'success' : 'secondary'"
-    [value]="phase.progress | installingProgress"
+    [value]="(phase.progress | installingProgress) / 100"
   ></ion-progress-bar>
 </ng-container>
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
index 0f0fa5752..c08f00703 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
@@ -22,11 +22,7 @@ export class MarketplaceListPage {
   readonly store$ = this.marketplaceService.getSelectedStore$().pipe(
     map(({ info, packages }) => {
       const categories = new Map<string, T.Category>()
-      if (info.categories['featured'])
-        categories.set('featured', info.categories['featured'])
-      Object.keys(info.categories).forEach(c =>
-        categories.set(c, info.categories[c]),
-      )
+
       categories.set('all', {
         name: 'All',
         description: {
@@ -35,6 +31,10 @@ export class MarketplaceListPage {
         },
       })
 
+      Object.keys(info.categories).forEach(c =>
+        categories.set(c, info.categories[c]),
+      )
+
       return { categories, packages }
     }),
   )
@@ -88,7 +88,7 @@ export class MarketplaceListPage {
     private readonly route: ActivatedRoute,
   ) {}
 
-  category = 'featured'
+  category = 'all'
   query = ''
 
   async presentModalMarketplaceSettings() {
diff --git a/web/projects/ui/src/app/pages/updates/updates.page.html b/web/projects/ui/src/app/pages/updates/updates.page.html
index fd4d19133..31c712d98 100644
--- a/web/projects/ui/src/app/pages/updates/updates.page.html
+++ b/web/projects/ui/src/app/pages/updates/updates.page.html
@@ -53,7 +53,7 @@ <h2 class="inline">
                       *ngIf="local.stateInfo.state === 'updating' else notUpdating"
                     >
                       <round-progress
-                        [current]="(local.stateInfo.installingInfo.progress.overall | installingProgress) || 0"
+                        [current]="(local.stateInfo.installingInfo.progress.overall | installingProgress) / 100"
                         [max]="1"
                         [radius]="13"
                         [stroke]="3"
diff --git a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
index 157afed4e..c6ae05a9c 100644
--- a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
+++ b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts
@@ -19,9 +19,9 @@ export class InstallingProgressDisplayPipe implements PipeTransform {
   name: 'installingProgress',
 })
 export class InstallingProgressPipe implements PipeTransform {
-  transform(progress: T.Progress): number | null {
-    if (progress === true) return 1
-    if (progress === false || progress === null || !progress.total) return null
-    return Number((progress.done / progress.total).toFixed(2))
+  transform(progress: T.Progress): number {
+    if (progress === true) return 100
+    if (progress === false || progress === null || !progress.total) return 0
+    return Math.floor((100 * progress.done) / progress.total)
   }
 }
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 4ce3f670a..23545d6b3 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -450,7 +450,7 @@ export module Mock {
             },
           },
         },
-        categories: ['lightning', 'featured'],
+        categories: ['lightning'],
         otherVersions: {
           '0.18.0:0.0.1': {
             releaseNotes: 'Upstream release and minor fixes.',
@@ -506,7 +506,7 @@ export module Mock {
             },
           },
         },
-        categories: ['lightning', 'featured'],
+        categories: ['lightning'],
         otherVersions: {
           '0.18.0:0.0.1': {
             releaseNotes: 'Upstream release and minor fixes.',
@@ -684,7 +684,7 @@ export module Mock {
           },
         },
       },
-      categories: ['lightning', 'featured'],
+      categories: ['lightning'],
       otherVersions: {
         '0.17.5:0': {
           releaseNotes: 'Upstream release to 0.17.5',
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index 6ce3b136f..bef380aea 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -19,11 +19,7 @@ import {
 } from 'rxjs'
 import { RR } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import {
-  DataModel,
-  UIMarketplaceData,
-  UIStore,
-} from 'src/app/services/patch-db/data-model'
+import { DataModel, UIStore } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import {
   catchError,
@@ -39,14 +35,14 @@ import {
 import { ConfigService } from './config.service'
 import { Exver, sameUrl } from '@start9labs/shared'
 import { ClientStorageService } from './client-storage.service'
-import { ExtendedVersion, T } from '@start9labs/start-sdk'
+import { T } from '@start9labs/start-sdk'
 
 @Injectable()
 export class MarketplaceService implements AbstractMarketplaceService {
   private readonly knownHosts$: Observable<StoreIdentity[]> = this.patch
     .watch$('ui', 'marketplace', 'knownHosts')
     .pipe(
-      map((hosts: UIMarketplaceData['knownHosts']) => {
+      map(hosts => {
         const { start9, community } = this.config.marketplace
         let arr = [
           toStoreIdentity(start9, hosts[start9]),

From b36b62c68eed6e2b80b5febe165099e4e3212b18 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 25 Jul 2024 11:44:51 -0600
Subject: [PATCH 195/341] Feature/callbacks (#2678)

* wip

* initialize callbacks

* wip

* smtp

* list_service_interfaces

* wip

* wip

* fix domains

* fix hostname handling in NetService

* misc fixes

* getInstalledPackages

* misc fixes

* publish v6 lib

* refactor service effects

* fix import

* fix container runtime

* fix tests

* apply suggestions from review
---
 Makefile                                      |   17 +-
 .../src/Adapters/EffectCreator.ts             |  301 ++++
 .../src/Adapters/HostSystemStartOs.ts         |  303 ----
 container-runtime/src/Adapters/RpcListener.ts |  245 +--
 .../DockerProcedureContainer.ts               |   24 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |   40 +-
 .../Systems/SystemForEmbassy/index.ts         |  109 +-
 .../SystemForEmbassy/polyfillEffects.ts       |    1 +
 .../src/Adapters/Systems/SystemForStartOs.ts  |  145 +-
 .../src/Interfaces/AllGetDependencies.ts      |    5 +-
 .../src/Interfaces/HostSystem.ts              |    8 -
 .../src/Interfaces/MakeEffects.ts             |    4 +
 container-runtime/src/Interfaces/System.ts    |   57 +-
 .../src/Models/CallbackHolder.ts              |    6 +-
 container-runtime/src/Models/JsonPath.ts      |    2 -
 container-runtime/src/index.ts                |    5 +-
 ...-startos-bins.sh => build-containerbox.sh} |    3 -
 core/build-startbox.sh                        |   42 +
 core/models/src/id/package.rs                 |    5 +
 core/models/src/procedure_name.rs             |    4 -
 core/startos/src/auth.rs                      |    1 +
 core/startos/src/backup/os.rs                 |    5 +-
 core/startos/src/bins/container_cli.rs        |    2 +-
 core/startos/src/context/rpc.rs               |    3 +
 core/startos/src/context/setup.rs             |    4 +-
 core/startos/src/db/model/public.rs           |    6 +-
 core/startos/src/hostname.rs                  |   25 +-
 core/startos/src/lib.rs                       |   12 +
 core/startos/src/net/dns.rs                   |    2 +-
 core/startos/src/net/host/address.rs          |   34 +
 core/startos/src/net/host/mod.rs              |    4 +
 core/startos/src/net/net_controller.rs        |  238 +--
 core/startos/src/net/ssl.rs                   |   59 +-
 core/startos/src/net/vhost.rs                 |   18 +-
 core/startos/src/registry/os/asset/add.rs     |   16 +-
 core/startos/src/registry/os/asset/get.rs     |    7 +-
 core/startos/src/registry/os/asset/sign.rs    |   13 +-
 core/startos/src/registry/os/index.rs         |   20 +-
 core/startos/src/registry/os/version/mod.rs   |   20 +-
 .../startos/src/registry/os/version/signer.rs |    8 +-
 core/startos/src/service/cli.rs               |    2 +-
 core/startos/src/service/effects/action.rs    |  101 ++
 core/startos/src/service/effects/callbacks.rs |  311 ++++
 core/startos/src/service/effects/config.rs    |   53 +
 core/startos/src/service/effects/context.rs   |   27 +
 core/startos/src/service/effects/control.rs   |   66 +
 .../startos/src/service/effects/dependency.rs |  371 +++++
 core/startos/src/service/effects/health.rs    |   46 +
 core/startos/src/service/effects/image.rs     |  163 ++
 core/startos/src/service/effects/mod.rs       |  174 ++
 core/startos/src/service/effects/net/bind.rs  |   56 +
 core/startos/src/service/effects/net/host.rs  |   73 +
 core/startos/src/service/effects/net/info.rs  |    9 +
 .../src/service/effects/net/interface.rs      |  188 +++
 core/startos/src/service/effects/net/mod.rs   |    5 +
 core/startos/src/service/effects/net/ssl.rs   |  169 ++
 core/startos/src/service/effects/prelude.rs   |   16 +
 core/startos/src/service/effects/store.rs     |   93 ++
 core/startos/src/service/effects/system.rs    |   39 +
 core/startos/src/service/mod.rs               |    5 +-
 .../src/service/persistent_container.rs       |   48 +-
 core/startos/src/service/rpc.rs               |  112 ++
 .../src/service/service_effect_handler.rs     | 1431 -----------------
 core/startos/src/system.rs                    |   46 +
 core/startos/src/util/collections/eq_map.rs   | 1213 ++++++++++++++
 core/startos/src/util/collections/mod.rs      |    3 +
 core/startos/src/util/mod.rs                  |    2 +
 core/startos/src/util/rpc_client.rs           |   57 +
 sdk/Makefile                                  |    2 +
 sdk/lib/StartSdk.ts                           |   55 +-
 sdk/lib/osBindings/AddAssetParams.ts          |    3 +-
 sdk/lib/osBindings/AddVersionParams.ts        |    3 +-
 .../osBindings/{Callback.ts => CallbackId.ts} |    2 +-
 sdk/lib/osBindings/CheckDependenciesParam.ts  |    2 +-
 sdk/lib/osBindings/ChrootParams.ts            |   10 -
 sdk/lib/osBindings/DependencyRequirement.ts   |    8 +-
 sdk/lib/osBindings/ExecuteAction.ts           |    8 +-
 sdk/lib/osBindings/ExportActionParams.ts      |    8 +-
 ...amsPackageId.ts => GetConfiguredParams.ts} |    3 +-
 sdk/lib/osBindings/GetHostInfoParams.ts       |    7 +-
 sdk/lib/osBindings/GetOsAssetParams.ts        |    3 +-
 sdk/lib/osBindings/GetPrimaryUrlParams.ts     |   11 +-
 .../osBindings/GetServiceInterfaceParams.ts   |    7 +-
 .../osBindings/GetServicePortForwardParams.ts |    5 +-
 sdk/lib/osBindings/GetSslCertificateParams.ts |    7 +-
 sdk/lib/osBindings/GetSslKeyParams.ts         |    6 +-
 sdk/lib/osBindings/GetStoreParams.ts          |    8 +-
 sdk/lib/osBindings/GetSystemSmtpParams.ts     |    4 +-
 sdk/lib/osBindings/HostAddress.ts             |    4 +-
 .../osBindings/ListServiceInterfacesParams.ts |    7 +-
 .../osBindings/ListVersionSignersParams.ts    |    3 +-
 sdk/lib/osBindings/MountTarget.ts             |    6 +-
 sdk/lib/osBindings/OsIndex.ts                 |    5 +-
 sdk/lib/osBindings/OsVersionInfoMap.ts        |    4 +
 sdk/lib/osBindings/ParamsMaybePackageId.ts    |    3 -
 sdk/lib/osBindings/RemoveActionParams.ts      |    3 -
 sdk/lib/osBindings/RemoveAddressParams.ts     |    4 -
 sdk/lib/osBindings/RemoveVersionParams.ts     |    3 +-
 sdk/lib/osBindings/ServerInfo.ts              |    3 +-
 sdk/lib/osBindings/SetSystemSmtpParams.ts     |    3 -
 sdk/lib/osBindings/SignAssetParams.ts         |    3 +-
 sdk/lib/osBindings/SmtpValue.ts               |    9 +
 sdk/lib/osBindings/VersionSignerParams.ts     |    3 +-
 sdk/lib/osBindings/index.ts                   |   11 +-
 sdk/lib/store/getStore.ts                     |    1 -
 sdk/lib/test/startosTypeValidation.test.ts    |   29 +-
 sdk/lib/types.ts                              |  289 ++--
 sdk/lib/util/GetSslCertificate.ts             |   47 +
 sdk/lib/util/GetSystemSmtp.ts                 |    4 +-
 sdk/lib/util/getServiceInterface.ts           |   37 +-
 sdk/lib/util/getServiceInterfaces.ts          |   15 +-
 sdk/package.json                              |    2 +-
 .../ui/src/app/services/api/mock-patch.ts     |    2 +-
 113 files changed, 4850 insertions(+), 2514 deletions(-)
 create mode 100644 container-runtime/src/Adapters/EffectCreator.ts
 delete mode 100644 container-runtime/src/Adapters/HostSystemStartOs.ts
 delete mode 100644 container-runtime/src/Interfaces/HostSystem.ts
 create mode 100644 container-runtime/src/Interfaces/MakeEffects.ts
 rename core/{build-startos-bins.sh => build-containerbox.sh} (83%)
 create mode 100755 core/build-startbox.sh
 create mode 100644 core/startos/src/service/effects/action.rs
 create mode 100644 core/startos/src/service/effects/callbacks.rs
 create mode 100644 core/startos/src/service/effects/config.rs
 create mode 100644 core/startos/src/service/effects/context.rs
 create mode 100644 core/startos/src/service/effects/control.rs
 create mode 100644 core/startos/src/service/effects/dependency.rs
 create mode 100644 core/startos/src/service/effects/health.rs
 create mode 100644 core/startos/src/service/effects/image.rs
 create mode 100644 core/startos/src/service/effects/mod.rs
 create mode 100644 core/startos/src/service/effects/net/bind.rs
 create mode 100644 core/startos/src/service/effects/net/host.rs
 create mode 100644 core/startos/src/service/effects/net/info.rs
 create mode 100644 core/startos/src/service/effects/net/interface.rs
 create mode 100644 core/startos/src/service/effects/net/mod.rs
 create mode 100644 core/startos/src/service/effects/net/ssl.rs
 create mode 100644 core/startos/src/service/effects/prelude.rs
 create mode 100644 core/startos/src/service/effects/store.rs
 create mode 100644 core/startos/src/service/effects/system.rs
 delete mode 100644 core/startos/src/service/service_effect_handler.rs
 create mode 100644 core/startos/src/util/collections/eq_map.rs
 create mode 100644 core/startos/src/util/collections/mod.rs
 rename sdk/lib/osBindings/{Callback.ts => CallbackId.ts} (76%)
 delete mode 100644 sdk/lib/osBindings/ChrootParams.ts
 rename sdk/lib/osBindings/{ParamsPackageId.ts => GetConfiguredParams.ts} (51%)
 create mode 100644 sdk/lib/osBindings/OsVersionInfoMap.ts
 delete mode 100644 sdk/lib/osBindings/ParamsMaybePackageId.ts
 delete mode 100644 sdk/lib/osBindings/RemoveActionParams.ts
 delete mode 100644 sdk/lib/osBindings/RemoveAddressParams.ts
 delete mode 100644 sdk/lib/osBindings/SetSystemSmtpParams.ts
 create mode 100644 sdk/lib/osBindings/SmtpValue.ts
 create mode 100644 sdk/lib/util/GetSslCertificate.ts

diff --git a/Makefile b/Makefile
index c0492ba55..4fb5033d0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ BASENAME := $(shell ./basename.sh)
 PLATFORM := $(shell if [ -f ./PLATFORM.txt ]; then cat ./PLATFORM.txt; else echo unknown; fi)
 ARCH := $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo aarch64; else echo $(PLATFORM) | sed 's/-nonfree$$//g'; fi)
 IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo iso; fi)
-BINS := core/target/$(ARCH)-unknown-linux-musl/release/startbox core/target/$(ARCH)-unknown-linux-musl/release/containerbox
 WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/install-wizard
 FIRMWARE_ROMS := ./firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json)
 BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts $(FIRMWARE_ROMS)
@@ -16,7 +15,7 @@ STARTD_SRC := core/startos/startd.service $(BUILD_SRC)
 COMPAT_SRC := $(shell git ls-files system-images/compat/)
 UTILS_SRC := $(shell git ls-files system-images/utils/)
 BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
-CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE)
+CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) $(GIT_HASH_FILE)
 WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist web/patchdb-ui-seed.json sdk/dist
 WEB_UI_SRC := $(shell git ls-files web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
@@ -24,7 +23,7 @@ WEB_INSTALL_WIZARD_SRC := $(shell git ls-files web/projects/install-wizard)
 PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client)
 GZIP_BIN := $(shell which pigz || which gzip)
 TAR_BIN := $(shell which gtar || which tar)
-COMPILED_TARGETS := $(BINS) system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar container-runtime/rootfs.$(ARCH).squashfs
+COMPILED_TARGETS := core/target/$(ARCH)-unknown-linux-musl/release/startbox core/target/$(ARCH)-unknown-linux-musl/release/containerbox system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar container-runtime/rootfs.$(ARCH).squashfs
 ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) cargo-deps/$(ARCH)-unknown-linux-musl/release/startos-backup-fs $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) 
 
 ifeq ($(REMOTE),)
@@ -91,7 +90,7 @@ format:
 	cd core && cargo +nightly fmt
 
 test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
-	(cd core && cargo build && cargo test)
+	(cd core && cargo build  --features=test && cargo test --features=test)
 	(cd sdk && make test)
 
 cli:
@@ -257,9 +256,13 @@ system-images/utils/docker-images/$(ARCH).tar: $(UTILS_SRC)
 system-images/binfmt/docker-images/$(ARCH).tar: $(BINFMT_SRC)
 	cd system-images/binfmt && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
 
-$(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE)
-	cd core && ARCH=$(ARCH) ./build-startos-bins.sh
-	touch $(BINS)
+core/target/$(ARCH)-unknown-linux-musl/release/startbox: $(CORE_SRC) web/dist/static web/patchdb-ui-seed.json $(ENVIRONMENT_FILE)
+	ARCH=$(ARCH) ./core/build-startbox.sh
+	touch core/target/$(ARCH)-unknown-linux-musl/release/startbox
+
+core/target/$(ARCH)-unknown-linux-musl/release/containerbox: $(CORE_SRC) $(ENVIRONMENT_FILE)
+	ARCH=$(ARCH) ./core/build-containerbox.sh
+	touch core/target/$(ARCH)-unknown-linux-musl/release/containerbox
 
 web/node_modules/.package-lock.json: web/package.json sdk/dist
 	npm --prefix web ci
diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
new file mode 100644
index 000000000..0ef299151
--- /dev/null
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -0,0 +1,301 @@
+import { types as T } from "@start9labs/start-sdk"
+import * as net from "net"
+import { object, string, number, literals, some, unknown } from "ts-matches"
+import { Effects } from "../Models/Effects"
+
+import { CallbackHolder } from "../Models/CallbackHolder"
+import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+const matchRpcError = object({
+  error: object(
+    {
+      code: number,
+      message: string,
+      data: some(
+        string,
+        object(
+          {
+            details: string,
+            debug: string,
+          },
+          ["debug"],
+        ),
+      ),
+    },
+    ["data"],
+  ),
+})
+const testRpcError = matchRpcError.test
+const testRpcResult = object({
+  result: unknown,
+}).test
+type RpcError = typeof matchRpcError._TYPE
+
+const SOCKET_PATH = "/media/startos/rpc/host.sock"
+let hostSystemId = 0
+
+export type EffectContext = {
+  procedureId: string | null
+  callbacks: CallbackHolder | null
+}
+
+const rpcRoundFor =
+  (procedureId: string | null) =>
+  <K extends keyof Effects | "getStore" | "setStore" | "clearCallbacks">(
+    method: K,
+    params: Record<string, unknown>,
+  ) => {
+    const id = hostSystemId++
+    const client = net.createConnection({ path: SOCKET_PATH }, () => {
+      client.write(
+        JSON.stringify({
+          id,
+          method,
+          params: { ...params, procedureId },
+        }) + "\n",
+      )
+    })
+    let bufs: Buffer[] = []
+    return new Promise((resolve, reject) => {
+      client.on("data", (data) => {
+        try {
+          bufs.push(data)
+          if (data.reduce((acc, x) => acc || x == 10, false)) {
+            const res: unknown = JSON.parse(
+              Buffer.concat(bufs).toString().split("\n")[0],
+            )
+            if (testRpcError(res)) {
+              let message = res.error.message
+              console.error("Error in host RPC:", { method, params })
+              if (string.test(res.error.data)) {
+                message += ": " + res.error.data
+                console.error(`Details: ${res.error.data}`)
+              } else {
+                if (res.error.data?.details) {
+                  message += ": " + res.error.data.details
+                  console.error(`Details: ${res.error.data.details}`)
+                }
+                if (res.error.data?.debug) {
+                  message += "\n" + res.error.data.debug
+                  console.error(`Debug: ${res.error.data.debug}`)
+                }
+              }
+              reject(new Error(`${message}@${method}`))
+            } else if (testRpcResult(res)) {
+              resolve(res.result)
+            } else {
+              reject(new Error(`malformed response ${JSON.stringify(res)}`))
+            }
+          }
+        } catch (error) {
+          reject(error)
+        }
+        client.end()
+      })
+      client.on("error", (error) => {
+        reject(error)
+      })
+    })
+  }
+
+function makeEffects(context: EffectContext): Effects {
+  const rpcRound = rpcRoundFor(context.procedureId)
+  const self: Effects = {
+    bind(...[options]: Parameters<T.Effects["bind"]>) {
+      return rpcRound("bind", {
+        ...options,
+        stack: new Error().stack,
+      }) as ReturnType<T.Effects["bind"]>
+    },
+    clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
+      return rpcRound("clearBindings", {}) as ReturnType<
+        T.Effects["clearBindings"]
+      >
+    },
+    clearServiceInterfaces(
+      ...[]: Parameters<T.Effects["clearServiceInterfaces"]>
+    ) {
+      return rpcRound("clearServiceInterfaces", {}) as ReturnType<
+        T.Effects["clearServiceInterfaces"]
+      >
+    },
+    getInstalledPackages(...[]: Parameters<T.Effects["getInstalledPackages"]>) {
+      return rpcRound("getInstalledPackages", {}) as ReturnType<
+        T.Effects["getInstalledPackages"]
+      >
+    },
+    createOverlayedImage(options: {
+      imageId: string
+    }): Promise<[string, string]> {
+      return rpcRound("createOverlayedImage", options) as ReturnType<
+        T.Effects["createOverlayedImage"]
+      >
+    },
+    destroyOverlayedImage(options: { guid: string }): Promise<void> {
+      return rpcRound("destroyOverlayedImage", options) as ReturnType<
+        T.Effects["destroyOverlayedImage"]
+      >
+    },
+    executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
+      return rpcRound("executeAction", options) as ReturnType<
+        T.Effects["executeAction"]
+      >
+    },
+    exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
+      return rpcRound("exportAction", options) as ReturnType<
+        T.Effects["exportAction"]
+      >
+    },
+    exportServiceInterface: ((
+      ...[options]: Parameters<Effects["exportServiceInterface"]>
+    ) => {
+      return rpcRound("exportServiceInterface", options) as ReturnType<
+        T.Effects["exportServiceInterface"]
+      >
+    }) as Effects["exportServiceInterface"],
+    exposeForDependents(
+      ...[options]: Parameters<T.Effects["exposeForDependents"]>
+    ) {
+      return rpcRound("exposeForDependents", options) as ReturnType<
+        T.Effects["exposeForDependents"]
+      >
+    },
+    getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
+      return rpcRound("getConfigured", {}) as ReturnType<
+        T.Effects["getConfigured"]
+      >
+    },
+    getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
+      return rpcRound("getContainerIp", {}) as ReturnType<
+        T.Effects["getContainerIp"]
+      >
+    },
+    getHostInfo: ((...[allOptions]: Parameters<T.Effects["getHostInfo"]>) => {
+      const options = {
+        ...allOptions,
+        callback: context.callbacks?.addCallback(allOptions.callback) || null,
+      }
+      return rpcRound("getHostInfo", options) as ReturnType<
+        T.Effects["getHostInfo"]
+      > as any
+    }) as Effects["getHostInfo"],
+    getServiceInterface(
+      ...[options]: Parameters<T.Effects["getServiceInterface"]>
+    ) {
+      return rpcRound("getServiceInterface", {
+        ...options,
+        callback: context.callbacks?.addCallback(options.callback) || null,
+      }) as ReturnType<T.Effects["getServiceInterface"]>
+    },
+
+    getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
+      return rpcRound("getPrimaryUrl", {
+        ...options,
+        callback: context.callbacks?.addCallback(options.callback) || null,
+      }) as ReturnType<T.Effects["getPrimaryUrl"]>
+    },
+    getServicePortForward(
+      ...[options]: Parameters<T.Effects["getServicePortForward"]>
+    ) {
+      return rpcRound("getServicePortForward", options) as ReturnType<
+        T.Effects["getServicePortForward"]
+      >
+    },
+    getSslCertificate(options: Parameters<T.Effects["getSslCertificate"]>[0]) {
+      return rpcRound("getSslCertificate", options) as ReturnType<
+        T.Effects["getSslCertificate"]
+      >
+    },
+    getSslKey(options: Parameters<T.Effects["getSslKey"]>[0]) {
+      return rpcRound("getSslKey", options) as ReturnType<
+        T.Effects["getSslKey"]
+      >
+    },
+    getSystemSmtp(...[options]: Parameters<T.Effects["getSystemSmtp"]>) {
+      return rpcRound("getSystemSmtp", {
+        ...options,
+        callback: context.callbacks?.addCallback(options.callback) || null,
+      }) as ReturnType<T.Effects["getSystemSmtp"]>
+    },
+    listServiceInterfaces(
+      ...[options]: Parameters<T.Effects["listServiceInterfaces"]>
+    ) {
+      return rpcRound("listServiceInterfaces", {
+        ...options,
+        callback: context.callbacks?.addCallback(options.callback) || null,
+      }) as ReturnType<T.Effects["listServiceInterfaces"]>
+    },
+    mount(...[options]: Parameters<T.Effects["mount"]>) {
+      return rpcRound("mount", options) as ReturnType<T.Effects["mount"]>
+    },
+    clearActions(...[]: Parameters<T.Effects["clearActions"]>) {
+      return rpcRound("clearActions", {}) as ReturnType<
+        T.Effects["clearActions"]
+      >
+    },
+    restart(...[]: Parameters<T.Effects["restart"]>) {
+      return rpcRound("restart", {}) as ReturnType<T.Effects["restart"]>
+    },
+    setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
+      return rpcRound("setConfigured", { configured }) as ReturnType<
+        T.Effects["setConfigured"]
+      >
+    },
+    setDependencies(
+      dependencies: Parameters<T.Effects["setDependencies"]>[0],
+    ): ReturnType<T.Effects["setDependencies"]> {
+      return rpcRound("setDependencies", dependencies) as ReturnType<
+        T.Effects["setDependencies"]
+      >
+    },
+    checkDependencies(
+      options: Parameters<T.Effects["checkDependencies"]>[0],
+    ): ReturnType<T.Effects["checkDependencies"]> {
+      return rpcRound("checkDependencies", options) as ReturnType<
+        T.Effects["checkDependencies"]
+      >
+    },
+    getDependencies(): ReturnType<T.Effects["getDependencies"]> {
+      return rpcRound("getDependencies", {}) as ReturnType<
+        T.Effects["getDependencies"]
+      >
+    },
+    setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
+      return rpcRound("setHealth", options) as ReturnType<
+        T.Effects["setHealth"]
+      >
+    },
+
+    setMainStatus(o: { status: "running" | "stopped" }): Promise<void> {
+      return rpcRound("setMainStatus", o) as ReturnType<T.Effects["setHealth"]>
+    },
+
+    shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
+      return rpcRound("shutdown", {}) as ReturnType<T.Effects["shutdown"]>
+    },
+    store: {
+      get: async (options: any) =>
+        rpcRound("getStore", {
+          ...options,
+          callback: context.callbacks?.addCallback(options.callback) || null,
+        }) as any,
+      set: async (options: any) =>
+        rpcRound("setStore", options) as ReturnType<T.Effects["store"]["set"]>,
+    } as T.Effects["store"],
+  }
+  return self
+}
+
+export function makeProcedureEffects(procedureId: string): Effects {
+  return makeEffects({ procedureId, callbacks: null })
+}
+
+export function makeMainEffects(): MainEffects {
+  const rpcRound = rpcRoundFor(null)
+  return {
+    _type: "main",
+    clearCallbacks: () => {
+      return rpcRound("clearCallbacks", {}) as Promise<void>
+    },
+    ...makeEffects({ procedureId: null, callbacks: new CallbackHolder() }),
+  }
+}
diff --git a/container-runtime/src/Adapters/HostSystemStartOs.ts b/container-runtime/src/Adapters/HostSystemStartOs.ts
deleted file mode 100644
index 1996af0fd..000000000
--- a/container-runtime/src/Adapters/HostSystemStartOs.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-import { types as T } from "@start9labs/start-sdk"
-import * as net from "net"
-import { object, string, number, literals, some, unknown } from "ts-matches"
-import { Effects } from "../Models/Effects"
-
-import { CallbackHolder } from "../Models/CallbackHolder"
-const matchRpcError = object({
-  error: object(
-    {
-      code: number,
-      message: string,
-      data: some(
-        string,
-        object(
-          {
-            details: string,
-            debug: string,
-          },
-          ["debug"],
-        ),
-      ),
-    },
-    ["data"],
-  ),
-})
-const testRpcError = matchRpcError.test
-const testRpcResult = object({
-  result: unknown,
-}).test
-type RpcError = typeof matchRpcError._TYPE
-
-const SOCKET_PATH = "/media/startos/rpc/host.sock"
-const MAIN = "/main" as const
-let hostSystemId = 0
-export const hostSystemStartOs =
-  (callbackHolder: CallbackHolder) =>
-  (procedureId: null | string): Effects => {
-    const rpcRound = <K extends keyof Effects | "getStore" | "setStore">(
-      method: K,
-      params: Record<string, unknown>,
-    ) => {
-      const id = hostSystemId++
-      const client = net.createConnection({ path: SOCKET_PATH }, () => {
-        client.write(
-          JSON.stringify({
-            id,
-            method,
-            params: { ...params, procedureId: procedureId },
-          }) + "\n",
-        )
-      })
-      let bufs: Buffer[] = []
-      return new Promise((resolve, reject) => {
-        client.on("data", (data) => {
-          try {
-            bufs.push(data)
-            if (data.reduce((acc, x) => acc || x == 10, false)) {
-              const res: unknown = JSON.parse(
-                Buffer.concat(bufs).toString().split("\n")[0],
-              )
-              if (testRpcError(res)) {
-                let message = res.error.message
-                console.error({ method, params, hostSystemStartOs: true })
-                if (string.test(res.error.data)) {
-                  message += ": " + res.error.data
-                  console.error(res.error.data)
-                } else {
-                  if (res.error.data?.details) {
-                    message += ": " + res.error.data.details
-                    console.error(res.error.data.details)
-                  }
-                  if (res.error.data?.debug) {
-                    message += "\n" + res.error.data.debug
-                    console.error("Debug: " + res.error.data.debug)
-                  }
-                }
-                reject(new Error(`${message}@${method}`))
-              } else if (testRpcResult(res)) {
-                resolve(res.result)
-              } else {
-                reject(new Error(`malformed response ${JSON.stringify(res)}`))
-              }
-            }
-          } catch (error) {
-            reject(error)
-          }
-          client.end()
-        })
-        client.on("error", (error) => {
-          reject(error)
-        })
-      })
-    }
-    const self: Effects = {
-      bind(...[options]: Parameters<T.Effects["bind"]>) {
-        return rpcRound("bind", {
-          ...options,
-          stack: new Error().stack,
-        }) as ReturnType<T.Effects["bind"]>
-      },
-      clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
-        return rpcRound("clearBindings", {}) as ReturnType<
-          T.Effects["clearBindings"]
-        >
-      },
-      clearServiceInterfaces(
-        ...[]: Parameters<T.Effects["clearServiceInterfaces"]>
-      ) {
-        return rpcRound("clearServiceInterfaces", {}) as ReturnType<
-          T.Effects["clearServiceInterfaces"]
-        >
-      },
-      createOverlayedImage(options: {
-        imageId: string
-      }): Promise<[string, string]> {
-        return rpcRound("createOverlayedImage", options) as ReturnType<
-          T.Effects["createOverlayedImage"]
-        >
-      },
-      destroyOverlayedImage(options: { guid: string }): Promise<void> {
-        return rpcRound("destroyOverlayedImage", options) as ReturnType<
-          T.Effects["destroyOverlayedImage"]
-        >
-      },
-      executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
-        return rpcRound("executeAction", options) as ReturnType<
-          T.Effects["executeAction"]
-        >
-      },
-      exists(...[packageId]: Parameters<T.Effects["exists"]>) {
-        return rpcRound("exists", packageId) as ReturnType<T.Effects["exists"]>
-      },
-      exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
-        return rpcRound("exportAction", options) as ReturnType<
-          T.Effects["exportAction"]
-        >
-      },
-      exportServiceInterface: ((
-        ...[options]: Parameters<Effects["exportServiceInterface"]>
-      ) => {
-        return rpcRound("exportServiceInterface", options) as ReturnType<
-          T.Effects["exportServiceInterface"]
-        >
-      }) as Effects["exportServiceInterface"],
-      exposeForDependents(
-        ...[options]: Parameters<T.Effects["exposeForDependents"]>
-      ) {
-        return rpcRound("exposeForDependents", options) as ReturnType<
-          T.Effects["exposeForDependents"]
-        >
-      },
-      getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
-        return rpcRound("getConfigured", {}) as ReturnType<
-          T.Effects["getConfigured"]
-        >
-      },
-      getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
-        return rpcRound("getContainerIp", {}) as ReturnType<
-          T.Effects["getContainerIp"]
-        >
-      },
-      getHostInfo: ((...[allOptions]: any[]) => {
-        const options = {
-          ...allOptions,
-          callback: callbackHolder.addCallback(allOptions.callback),
-        }
-        return rpcRound("getHostInfo", options) as ReturnType<
-          T.Effects["getHostInfo"]
-        > as any
-      }) as Effects["getHostInfo"],
-      getServiceInterface(
-        ...[options]: Parameters<T.Effects["getServiceInterface"]>
-      ) {
-        return rpcRound("getServiceInterface", {
-          ...options,
-          callback: callbackHolder.addCallback(options.callback),
-        }) as ReturnType<T.Effects["getServiceInterface"]>
-      },
-
-      getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
-        return rpcRound("getPrimaryUrl", {
-          ...options,
-          callback: callbackHolder.addCallback(options.callback),
-        }) as ReturnType<T.Effects["getPrimaryUrl"]>
-      },
-      getServicePortForward(
-        ...[options]: Parameters<T.Effects["getServicePortForward"]>
-      ) {
-        return rpcRound("getServicePortForward", options) as ReturnType<
-          T.Effects["getServicePortForward"]
-        >
-      },
-      getSslCertificate(
-        options: Parameters<T.Effects["getSslCertificate"]>[0],
-      ) {
-        return rpcRound("getSslCertificate", options) as ReturnType<
-          T.Effects["getSslCertificate"]
-        >
-      },
-      getSslKey(options: Parameters<T.Effects["getSslKey"]>[0]) {
-        return rpcRound("getSslKey", options) as ReturnType<
-          T.Effects["getSslKey"]
-        >
-      },
-      getSystemSmtp(...[options]: Parameters<T.Effects["getSystemSmtp"]>) {
-        return rpcRound("getSystemSmtp", {
-          ...options,
-          callback: callbackHolder.addCallback(options.callback),
-        }) as ReturnType<T.Effects["getSystemSmtp"]>
-      },
-      listServiceInterfaces(
-        ...[options]: Parameters<T.Effects["listServiceInterfaces"]>
-      ) {
-        return rpcRound("listServiceInterfaces", {
-          ...options,
-          callback: callbackHolder.addCallback(options.callback),
-        }) as ReturnType<T.Effects["listServiceInterfaces"]>
-      },
-      mount(...[options]: Parameters<T.Effects["mount"]>) {
-        return rpcRound("mount", options) as ReturnType<T.Effects["mount"]>
-      },
-      removeAction(...[options]: Parameters<T.Effects["removeAction"]>) {
-        return rpcRound("removeAction", options) as ReturnType<
-          T.Effects["removeAction"]
-        >
-      },
-      removeAddress(...[options]: Parameters<T.Effects["removeAddress"]>) {
-        return rpcRound("removeAddress", options) as ReturnType<
-          T.Effects["removeAddress"]
-        >
-      },
-      restart(...[]: Parameters<T.Effects["restart"]>) {
-        return rpcRound("restart", {}) as ReturnType<T.Effects["restart"]>
-      },
-      running(...[packageId]: Parameters<T.Effects["running"]>) {
-        return rpcRound("running", { packageId }) as ReturnType<
-          T.Effects["running"]
-        >
-      },
-      // runRsync(...[options]: Parameters<T.Effects[""]>) {
-      //
-      // return rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
-      //
-      // return rpcRound('executeAction', options) as ReturnType<T.Effects["executeAction"]>
-      // }
-      setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
-        return rpcRound("setConfigured", { configured }) as ReturnType<
-          T.Effects["setConfigured"]
-        >
-      },
-      setDependencies(
-        dependencies: Parameters<T.Effects["setDependencies"]>[0],
-      ): ReturnType<T.Effects["setDependencies"]> {
-        return rpcRound("setDependencies", dependencies) as ReturnType<
-          T.Effects["setDependencies"]
-        >
-      },
-      checkDependencies(
-        options: Parameters<T.Effects["checkDependencies"]>[0],
-      ): ReturnType<T.Effects["checkDependencies"]> {
-        return rpcRound("checkDependencies", options) as ReturnType<
-          T.Effects["checkDependencies"]
-        >
-      },
-      getDependencies(): ReturnType<T.Effects["getDependencies"]> {
-        return rpcRound("getDependencies", {}) as ReturnType<
-          T.Effects["getDependencies"]
-        >
-      },
-      setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
-        return rpcRound("setHealth", options) as ReturnType<
-          T.Effects["setHealth"]
-        >
-      },
-
-      setMainStatus(o: { status: "running" | "stopped" }): Promise<void> {
-        return rpcRound("setMainStatus", o) as ReturnType<
-          T.Effects["setHealth"]
-        >
-      },
-
-      shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
-        return rpcRound("shutdown", {}) as ReturnType<T.Effects["shutdown"]>
-      },
-      stopped(...[packageId]: Parameters<T.Effects["stopped"]>) {
-        return rpcRound("stopped", { packageId }) as ReturnType<
-          T.Effects["stopped"]
-        >
-      },
-      store: {
-        get: async (options: any) =>
-          rpcRound("getStore", {
-            ...options,
-            callback: callbackHolder.addCallback(options.callback),
-          }) as any,
-        set: async (options: any) =>
-          rpcRound("setStore", options) as ReturnType<
-            T.Effects["store"]["set"]
-          >,
-      } as T.Effects["store"],
-    }
-    return self
-  }
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 04e9bc40f..6e8e7aac8 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -15,15 +15,16 @@ import {
 } from "ts-matches"
 
 import { types as T } from "@start9labs/start-sdk"
-import * as CP from "child_process"
-import * as Mod from "module"
 import * as fs from "fs"
 
 import { CallbackHolder } from "../Models/CallbackHolder"
 import { AllGetDependencies } from "../Interfaces/AllGetDependencies"
-import { HostSystem } from "../Interfaces/HostSystem"
 import { jsonPath } from "../Models/JsonPath"
-import { System } from "../Interfaces/System"
+import { RunningMain, System } from "../Interfaces/System"
+import {
+  MakeMainEffects,
+  MakeProcedureEffects,
+} from "../Interfaces/MakeEffects"
 type MaybePromise<T> = T | Promise<T>
 export const matchRpcResult = anyOf(
   object({ result: any }),
@@ -45,7 +46,7 @@ export const matchRpcResult = anyOf(
   }),
 )
 export type RpcResult = typeof matchRpcResult._TYPE
-type SocketResponse = { jsonrpc: "2.0"; id: IdType } & RpcResult
+type SocketResponse = ({ jsonrpc: "2.0"; id: IdType } & RpcResult) | null
 
 const SOCKET_PARENT = "/media/startos/rpc"
 const SOCKET_PATH = "/media/startos/rpc/service.sock"
@@ -80,7 +81,6 @@ const sandboxRunType = object({
   ),
 })
 const callbackType = object({
-  id: idType,
   method: literal("callback"),
   params: object({
     callback: number,
@@ -91,6 +91,14 @@ const initType = object({
   id: idType,
   method: literal("init"),
 })
+const startType = object({
+  id: idType,
+  method: literal("start"),
+})
+const stopType = object({
+  id: idType,
+  method: literal("stop"),
+})
 const exitType = object({
   id: idType,
   method: literal("exit"),
@@ -104,33 +112,40 @@ const evalType = object({
 })
 
 const jsonParse = (x: string) => JSON.parse(x)
-function reduceMethod(
-  methodArgs: object,
-  effects: HostSystem,
-): (previousValue: any, currentValue: string) => any {
-  return (x: any, method: string) =>
-    Promise.resolve(x)
-      .then((x) => x[method])
-      .then((x) =>
-        typeof x !== "function"
-          ? x
-          : x({
-              ...methodArgs,
-              effects,
-            }),
+
+const handleRpc = (id: IdType, result: Promise<RpcResult>) =>
+  result
+    .then((result) => ({
+      jsonrpc,
+      id,
+      ...result,
+    }))
+    .then((x) => {
+      if (
+        ("result" in x && x.result === undefined) ||
+        !("error" in x || "result" in x)
       )
-}
+        (x as any).result = null
+      return x
+    })
+    .catch((error) => ({
+      jsonrpc,
+      id,
+      error: {
+        code: 0,
+        message: typeof error,
+        data: { details: "" + error, debug: error?.stack },
+      },
+    }))
 
 const hasId = object({ id: idType }).test
 export class RpcListener {
   unixSocketServer = net.createServer(async (server) => {})
   private _system: System | undefined
-  private _effects: HostSystem | undefined
+  private _makeProcedureEffects: MakeProcedureEffects | undefined
+  private _makeMainEffects: MakeMainEffects | undefined
 
-  constructor(
-    readonly getDependencies: AllGetDependencies,
-    private callbacks = new CallbackHolder(),
-  ) {
+  constructor(readonly getDependencies: AllGetDependencies) {
     if (!fs.existsSync(SOCKET_PARENT)) {
       fs.mkdirSync(SOCKET_PARENT, { recursive: true })
     }
@@ -165,8 +180,13 @@ export class RpcListener {
           code: 1,
         },
       })
-      const writeDataToSocket = (x: SocketResponse) =>
-        new Promise((resolve) => s.write(JSON.stringify(x) + "\n", resolve))
+      const writeDataToSocket = (x: SocketResponse) => {
+        if (x != null) {
+          return new Promise((resolve) =>
+            s.write(JSON.stringify(x) + "\n", resolve),
+          )
+        }
+      }
       s.on("data", (a) =>
         Promise.resolve(a)
           .then((b) => b.toString())
@@ -181,107 +201,116 @@ export class RpcListener {
     })
   }
 
-  private get effects() {
-    return this.getDependencies.hostSystem()(this.callbacks)
-  }
-
   private get system() {
     if (!this._system) throw new Error("System not initialized")
     return this._system
   }
 
+  private get makeProcedureEffects() {
+    if (!this._makeProcedureEffects) {
+      this._makeProcedureEffects = this.getDependencies.makeProcedureEffects()
+    }
+    return this._makeProcedureEffects
+  }
+
+  private get makeMainEffects() {
+    if (!this._makeMainEffects) {
+      this._makeMainEffects = this.getDependencies.makeMainEffects()
+    }
+    return this._makeMainEffects
+  }
+
   private dealWithInput(input: unknown): MaybePromise<SocketResponse> {
     return matches(input)
-      .when(some(runType, sandboxRunType), async ({ id, params }) => {
+      .when(runType, async ({ id, params }) => {
         const system = this.system
         const procedure = jsonPath.unsafeCast(params.procedure)
-        return system
-          .execute(this.effects, {
-            id: params.id,
+        const effects = this.getDependencies.makeProcedureEffects()(params.id)
+        return handleRpc(
+          id,
+          system.execute(effects, {
             procedure,
             input: params.input,
             timeout: params.timeout,
-          })
-          .then((result) => ({
-            jsonrpc,
-            id,
-            ...result,
-          }))
-          .then((x) => {
-            if (
-              ("result" in x && x.result === undefined) ||
-              !("error" in x || "result" in x)
-            )
-              (x as any).result = null
-            return x
-          })
-          .catch((error) => ({
-            jsonrpc,
-            id,
-            error: {
-              code: 0,
-              message: typeof error,
-              data: { details: "" + error, debug: error?.stack },
-            },
-          }))
+          }),
+        )
+      })
+      .when(sandboxRunType, async ({ id, params }) => {
+        const system = this.system
+        const procedure = jsonPath.unsafeCast(params.procedure)
+        const effects = this.makeProcedureEffects(params.id)
+        return handleRpc(
+          id,
+          system.sandbox(effects, {
+            procedure,
+            input: params.input,
+            timeout: params.timeout,
+          }),
+        )
+      })
+      .when(callbackType, async ({ params: { callback, args } }) => {
+        this.system.callCallback(callback, args)
+        return null
+      })
+      .when(startType, async ({ id }) => {
+        return handleRpc(
+          id,
+          this.system
+            .start(this.makeMainEffects())
+            .then((result) => ({ result })),
+        )
+      })
+      .when(stopType, async ({ id }) => {
+        return handleRpc(
+          id,
+          this.system.stop().then((result) => ({ result })),
+        )
       })
-      .when(callbackType, async ({ id, params: { callback, args } }) =>
-        Promise.resolve(this.callbacks.callCallback(callback, args))
-          .then((result) => ({
-            jsonrpc,
-            id,
-            result,
-          }))
-          .catch((error) => ({
-            jsonrpc,
-            id,
-
-            error: {
-              code: 0,
-              message: typeof error,
-              data: {
-                details: error?.message ?? String(error),
-                debug: error?.stack,
-              },
-            },
-          })),
-      )
       .when(exitType, async ({ id }) => {
-        if (this._system) await this._system.exit(this.effects(null))
-        delete this._system
-        delete this._effects
-
-        return {
-          jsonrpc,
+        return handleRpc(
           id,
-          result: null,
-        }
+          (async () => {
+            if (this._system) await this._system.exit()
+          })().then((result) => ({ result })),
+        )
       })
       .when(initType, async ({ id }) => {
-        this._system = await this.getDependencies.system()
-
-        return {
-          jsonrpc,
+        return handleRpc(
           id,
-          result: null,
-        }
+          (async () => {
+            if (!this._system) {
+              const system = await this.getDependencies.system()
+              await system.init()
+              this._system = system
+            }
+          })().then((result) => ({ result })),
+        )
       })
       .when(evalType, async ({ id, params }) => {
-        const result = await new Function(
-          `return (async () => { return (${params.script}) }).call(this)`,
-        ).call({
-          listener: this,
-          require: require,
-        })
-        return {
-          jsonrpc,
+        return handleRpc(
           id,
-          result: !["string", "number", "boolean", "null", "object"].includes(
-            typeof result,
-          )
-            ? null
-            : result,
-        }
+          (async () => {
+            const result = await new Function(
+              `return (async () => { return (${params.script}) }).call(this)`,
+            ).call({
+              listener: this,
+              require: require,
+            })
+            return {
+              jsonrpc,
+              id,
+              result: ![
+                "string",
+                "number",
+                "boolean",
+                "null",
+                "object",
+              ].includes(typeof result)
+                ? null
+                : result,
+            }
+          })(),
+        )
       })
       .when(shape({ id: idType, method: string }), ({ id, method }) => ({
         jsonrpc,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index c06395a17..5db0b6245 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -14,6 +14,7 @@ export class DockerProcedureContainer {
   // }
   static async of(
     effects: T.Effects,
+    packageId: string,
     data: DockerProcedure,
     volumes: { [id: VolumeId]: Volume },
   ) {
@@ -38,16 +39,25 @@ export class DockerProcedureContainer {
             mounts[mount],
           )
         } else if (volumeMount.type === "certificate") {
-          volumeMount
+          const hostnames = [
+            `${packageId}.embassy`,
+            ...new Set(
+              Object.values(
+                (
+                  await effects.getHostInfo({
+                    hostId: volumeMount["interface-id"],
+                  })
+                )?.hostnameInfo || {},
+              )
+                .flatMap((h) => h)
+                .flatMap((h) => (h.kind === "onion" ? [h.hostname.value] : [])),
+            ).values(),
+          ]
           const certChain = await effects.getSslCertificate({
-            packageId: null,
-            hostId: volumeMount["interface-id"],
-            algorithm: null,
+            hostnames,
           })
           const key = await effects.getSslKey({
-            packageId: null,
-            hostId: volumeMount["interface-id"],
-            algorithm: null,
+            hostnames,
           })
           await fs.writeFile(
             `${path}/${volumeMount["interface-id"]}.cert.pem`,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index f6e7614ed..f8f0a2d6e 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -1,10 +1,10 @@
 import { polyfillEffects } from "./polyfillEffects"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { SystemForEmbassy } from "."
-import { hostSystemStartOs } from "../../HostSystemStartOs"
-import { Daemons, T, daemons, utils } from "@start9labs/start-sdk"
+import { T, utils } from "@start9labs/start-sdk"
 import { Daemon } from "@start9labs/start-sdk/cjs/lib/mainFn/Daemon"
 import { Effects } from "../../../Models/Effects"
+import { off } from "node:process"
 
 const EMBASSY_HEALTH_INTERVAL = 15 * 1000
 const EMBASSY_PROPERTIES_LOOP = 30 * 1000
@@ -14,24 +14,28 @@ const EMBASSY_PROPERTIES_LOOP = 30 * 1000
  * Also, this has an ability to clean itself up too if need be.
  */
 export class MainLoop {
-  private healthLoops:
-    | {
-        name: string
-        interval: NodeJS.Timeout
-      }[]
-    | undefined
+  private healthLoops?: {
+    name: string
+    interval: NodeJS.Timeout
+  }[]
 
-  private mainEvent:
-    | Promise<{
-        daemon: Daemon
-      }>
-    | undefined
-  constructor(
+  private mainEvent?: {
+    daemon: Daemon
+  }
+
+  private constructor(
     readonly system: SystemForEmbassy,
     readonly effects: Effects,
-  ) {
-    this.healthLoops = this.constructHealthLoops()
-    this.mainEvent = this.constructMainEvent()
+  ) {}
+
+  static async of(
+    system: SystemForEmbassy,
+    effects: Effects,
+  ): Promise<MainLoop> {
+    const res = new MainLoop(system, effects)
+    res.healthLoops = res.constructHealthLoops()
+    res.mainEvent = await res.constructMainEvent()
+    return res
   }
 
   private async constructMainEvent() {
@@ -46,6 +50,7 @@ export class MainLoop {
     const jsMain = (this.system.moduleCode as any)?.jsMain
     const dockerProcedureContainer = await DockerProcedureContainer.of(
       effects,
+      this.system.manifest.id,
       this.system.manifest.main,
       this.system.manifest.volumes,
     )
@@ -135,6 +140,7 @@ export class MainLoop {
           if (actionProcedure.type === "docker") {
             const container = await DockerProcedureContainer.of(
               effects,
+              manifest.id,
               actionProcedure,
               manifest.volumes,
             )
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index be8a4d163..2e0836bb0 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -3,8 +3,8 @@ import * as fs from "fs/promises"
 
 import { polyfillEffects } from "./polyfillEffects"
 import { Duration, duration, fromDuration } from "../../../Models/Duration"
-import { System } from "../../../Interfaces/System"
-import { matchManifest, Manifest, Procedure } from "./matchManifest"
+import { System, Procedure } from "../../../Interfaces/System"
+import { matchManifest, Manifest } from "./matchManifest"
 import * as childProcess from "node:child_process"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { promisify } from "node:util"
@@ -27,7 +27,6 @@ import {
   Parser,
   array,
 } from "ts-matches"
-import { hostSystemStartOs } from "../../HostSystemStartOs"
 import { JsonPath, unNestPath } from "../../../Models/JsonPath"
 import { RpcResult, matchRpcResult } from "../../RpcListener"
 import { CT } from "@start9labs/start-sdk"
@@ -48,6 +47,7 @@ import {
   transformConfigSpec,
   transformOldConfigToNew,
 } from "./transformConfigSpec"
+import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -203,16 +203,39 @@ export class SystemForEmbassy implements System {
     readonly manifest: Manifest,
     readonly moduleCode: Partial<U.ExpectedExports>,
   ) {}
+
+  async init(): Promise<void> {}
+
+  async exit(): Promise<void> {
+    if (this.currentRunning) await this.currentRunning.clean()
+    delete this.currentRunning
+  }
+
+  async start(effects: MainEffects): Promise<void> {
+    if (!!this.currentRunning) return
+
+    this.currentRunning = await MainLoop.of(this, effects)
+  }
+  callCallback(_callback: number, _args: any[]): void {}
+  async stop(): Promise<void> {
+    const { currentRunning } = this
+    this.currentRunning?.clean()
+    delete this.currentRunning
+    if (currentRunning) {
+      await currentRunning.clean({
+        timeout: fromDuration(this.manifest.main["sigterm-timeout"] || "30s"),
+      })
+    }
+  }
+
   async execute(
-    effectCreator: ReturnType<typeof hostSystemStartOs>,
+    effects: Effects,
     options: {
-      id: string
       procedure: JsonPath
       input: unknown
       timeout?: number | undefined
     },
   ): Promise<RpcResult> {
-    const effects = effectCreator(options.id)
     return this._execute(effects, options)
       .then((x) =>
         matches(x)
@@ -267,10 +290,6 @@ export class SystemForEmbassy implements System {
         }
       })
   }
-  async exit(): Promise<void> {
-    if (this.currentRunning) await this.currentRunning.clean()
-    delete this.currentRunning
-  }
   async _execute(
     effects: Effects,
     options: {
@@ -294,7 +313,7 @@ export class SystemForEmbassy implements System {
       case "/actions/metadata":
         return todo()
       case "/init":
-        return this.init(
+        return this.initProcedure(
           effects,
           string.optional().unsafeCast(input),
           options.timeout || null,
@@ -305,10 +324,6 @@ export class SystemForEmbassy implements System {
           string.optional().unsafeCast(input),
           options.timeout || null,
         )
-      case "/main/start":
-        return this.mainStart(effects, options.timeout || null)
-      case "/main/stop":
-        return this.mainStop(effects, options.timeout || null)
       default:
         const procedures = unNestPath(options.procedure)
         switch (true) {
@@ -345,7 +360,14 @@ export class SystemForEmbassy implements System {
     }
     throw new Error(`Could not find the path for ${options.procedure}`)
   }
-  private async init(
+  async sandbox(
+    effects: Effects,
+    options: { procedure: Procedure; input: unknown; timeout?: number },
+  ): Promise<RpcResult> {
+    return this.execute(effects, options)
+  }
+
+  private async initProcedure(
     effects: Effects,
     previousVersion: Optional<string>,
     timeoutMs: number | null,
@@ -470,42 +492,22 @@ export class SystemForEmbassy implements System {
     // TODO Do a migration down if the version exists
     await effects.setMainStatus({ status: "stopped" })
   }
-  private async mainStart(
-    effects: Effects,
-    timeoutMs: number | null,
-  ): Promise<void> {
-    if (!!this.currentRunning) return
 
-    this.currentRunning = new MainLoop(this, effects)
-  }
-  private async mainStop(
-    effects: Effects,
-    timeoutMs: number | null,
-  ): Promise<void> {
-    try {
-      const { currentRunning } = this
-      this.currentRunning?.clean()
-      delete this.currentRunning
-      if (currentRunning) {
-        await currentRunning.clean({
-          timeout: utils.inMs(this.manifest.main["sigterm-timeout"]),
-        })
-      }
-      return
-    } finally {
-      await effects.setMainStatus({ status: "stopped" })
-    }
-  }
   private async createBackup(
     effects: Effects,
     timeoutMs: number | null,
   ): Promise<void> {
     const backup = this.manifest.backup.create
     if (backup.type === "docker") {
-      const container = await DockerProcedureContainer.of(effects, backup, {
-        ...this.manifest.volumes,
-        BACKUP: { type: "backup", readonly: false },
-      })
+      const container = await DockerProcedureContainer.of(
+        effects,
+        this.manifest.id,
+        backup,
+        {
+          ...this.manifest.volumes,
+          BACKUP: { type: "backup", readonly: false },
+        },
+      )
       await container.execFail([backup.entrypoint, ...backup.args], timeoutMs)
     } else {
       const moduleCode = await this.moduleCode
@@ -520,6 +522,7 @@ export class SystemForEmbassy implements System {
     if (restoreBackup.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
+        this.manifest.id,
         restoreBackup,
         {
           ...this.manifest.volumes,
@@ -552,6 +555,7 @@ export class SystemForEmbassy implements System {
     if (config.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
+        this.manifest.id,
         config,
         this.manifest.volumes,
       )
@@ -594,6 +598,7 @@ export class SystemForEmbassy implements System {
     if (setConfigValue.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
+        this.manifest.id,
         setConfigValue,
         this.manifest.volumes,
       )
@@ -702,6 +707,7 @@ export class SystemForEmbassy implements System {
       if (procedure.type === "docker") {
         const container = await DockerProcedureContainer.of(
           effects,
+          this.manifest.id,
           procedure,
           this.manifest.volumes,
         )
@@ -744,6 +750,7 @@ export class SystemForEmbassy implements System {
     if (setConfigValue.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
+        this.manifest.id,
         setConfigValue,
         this.manifest.volumes,
       )
@@ -785,6 +792,7 @@ export class SystemForEmbassy implements System {
     if (actionProcedure.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
+        this.manifest.id,
         actionProcedure,
         this.manifest.volumes,
       )
@@ -825,6 +833,7 @@ export class SystemForEmbassy implements System {
     if (actionProcedure.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
+        this.manifest.id,
         actionProcedure,
         this.manifest.volumes,
       )
@@ -1039,15 +1048,15 @@ async function updateConfig(
         }
       }
       const url: string =
-        filled === null
+        filled === null || filled.addressInfo === null
           ? ""
           : catchFn(() =>
               utils.hostnameInfoToAddress(
                 specValue.target === "lan-address"
-                  ? filled.addressInfo.localHostnames[0] ||
-                      filled.addressInfo.onionHostnames[0]
-                  : filled.addressInfo.onionHostnames[0] ||
-                      filled.addressInfo.localHostnames[0],
+                  ? filled.addressInfo!.localHostnames[0] ||
+                      filled.addressInfo!.onionHostnames[0]
+                  : filled.addressInfo!.onionHostnames[0] ||
+                      filled.addressInfo!.localHostnames[0],
               ),
             ) || ""
       mutConfigValue[key] = url
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 2b7363cbf..6481a7a56 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -126,6 +126,7 @@ export const polyfillEffects = (
     } {
       const dockerProcedureContainer = DockerProcedureContainer.of(
         effects,
+        manifest.id,
         manifest.main,
         manifest.volumes,
       )
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 2c455dc42..78c21b7c7 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -1,43 +1,84 @@
-import { ExecuteResult, System } from "../../Interfaces/System"
+import { ExecuteResult, Procedure, System } from "../../Interfaces/System"
 import { unNestPath } from "../../Models/JsonPath"
 import matches, { any, number, object, string, tuple } from "ts-matches"
-import { hostSystemStartOs } from "../HostSystemStartOs"
 import { Effects } from "../../Models/Effects"
 import { RpcResult, matchRpcResult } from "../RpcListener"
 import { duration } from "../../Models/Duration"
 import { T } from "@start9labs/start-sdk"
-import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
 import { Volume } from "../../Models/Volume"
+import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+import { CallbackHolder } from "../../Models/CallbackHolder"
+
 export const STARTOS_JS_LOCATION = "/usr/lib/startos/package/index.js"
+
+type RunningMain = {
+  effects: MainEffects
+  stop: () => Promise<void>
+  callbacks: CallbackHolder
+}
+
 export class SystemForStartOs implements System {
-  private onTerm: (() => Promise<void>) | undefined
+  private runningMain: RunningMain | undefined
+
   static of() {
     return new SystemForStartOs(require(STARTOS_JS_LOCATION))
   }
+
   constructor(readonly abi: T.ABI) {}
+
+  async init(): Promise<void> {}
+
+  async exit(): Promise<void> {}
+
+  async start(effects: MainEffects): Promise<void> {
+    if (this.runningMain) await this.stop()
+    let mainOnTerm: () => Promise<void> | undefined
+    const started = async (onTerm: () => Promise<void>) => {
+      await effects.setMainStatus({ status: "running" })
+      mainOnTerm = onTerm
+    }
+    const daemons = await (
+      await this.abi.main({
+        effects: effects as MainEffects,
+        started,
+      })
+    ).build()
+    this.runningMain = {
+      effects,
+      stop: async () => {
+        if (mainOnTerm) await mainOnTerm()
+        await daemons.term()
+      },
+      callbacks: new CallbackHolder(),
+    }
+  }
+
+  callCallback(callback: number, args: any[]): void {
+    if (this.runningMain) {
+      this.runningMain.callbacks
+        .callCallback(callback, args)
+        .catch((error) => console.error(`callback ${callback} failed`, error))
+    } else {
+      console.warn(`callback ${callback} ignored because system is not running`)
+    }
+  }
+
+  async stop(): Promise<void> {
+    if (this.runningMain) {
+      await this.runningMain.stop()
+      await this.runningMain.effects.clearCallbacks()
+      this.runningMain = undefined
+    }
+  }
+
   async execute(
-    effectCreator: ReturnType<typeof hostSystemStartOs>,
+    effects: Effects,
     options: {
-      id: string
-      procedure:
-        | "/init"
-        | "/uninit"
-        | "/main/start"
-        | "/main/stop"
-        | "/config/set"
-        | "/config/get"
-        | "/backup/create"
-        | "/backup/restore"
-        | "/actions/metadata"
-        | `/actions/${string}/get`
-        | `/actions/${string}/run`
-        | `/dependencies/${string}/query`
-        | `/dependencies/${string}/update`
+      procedure: Procedure
       input: unknown
       timeout?: number | undefined
     },
   ): Promise<RpcResult> {
-    const effects = effectCreator(options.id)
     return this._execute(effects, options)
       .then((x) =>
         matches(x)
@@ -93,22 +134,9 @@ export class SystemForStartOs implements System {
       })
   }
   async _execute(
-    effects: Effects,
+    effects: Effects | MainEffects,
     options: {
-      procedure:
-        | "/init"
-        | "/uninit"
-        | "/main/start"
-        | "/main/stop"
-        | "/config/set"
-        | "/config/get"
-        | "/backup/create"
-        | "/backup/restore"
-        | "/actions/metadata"
-        | `/actions/${string}/get`
-        | `/actions/${string}/run`
-        | `/dependencies/${string}/query`
-        | `/dependencies/${string}/update`
+      procedure: Procedure
       input: unknown
       timeout?: number | undefined
     },
@@ -123,30 +151,15 @@ export class SystemForStartOs implements System {
         const nextVersion = string.optional().unsafeCast(options.input) || null
         return this.abi.uninit({ effects, nextVersion })
       }
-      case "/main/start": {
-        if (this.onTerm) await this.onTerm()
-        const started = async (onTerm: () => Promise<void>) => {
-          await effects.setMainStatus({ status: "running" })
-          this.onTerm = onTerm
-        }
-        const daemons = await (
-          await this.abi.main({
-            effects: { ...effects, _type: "main" },
-            started,
-          })
-        ).build()
-        this.onTerm = daemons.term
-        return
-      }
-      case "/main/stop": {
-        try {
-          if (this.onTerm) await this.onTerm()
-          delete this.onTerm
-          return
-        } finally {
-          await effects.setMainStatus({ status: "stopped" })
-        }
-      }
+      // case "/main/start": {
+      //
+      // }
+      // case "/main/stop": {
+      //   if (this.onTerm) await this.onTerm()
+      //   await effects.setMainStatus({ status: "stopped" })
+      //   delete this.onTerm
+      //   return duration(30, "s")
+      // }
       case "/config/set": {
         const input = options.input as any // TODO
         return this.abi.setConfig({ effects, input })
@@ -169,6 +182,9 @@ export class SystemForStartOs implements System {
       case "/actions/metadata": {
         return this.abi.actionsMetadata({ effects })
       }
+      case "/properties": {
+        throw new Error("TODO")
+      }
       default:
         const procedures = unNestPath(options.procedure)
         const id = procedures[2]
@@ -199,9 +215,12 @@ export class SystemForStartOs implements System {
         }
         return
     }
-    throw new Error(`Method ${options.procedure} not implemented.`)
   }
-  async exit(effects: Effects): Promise<void> {
-    return void null
+
+  async sandbox(
+    effects: Effects,
+    options: { procedure: Procedure; input: unknown; timeout?: number },
+  ): Promise<RpcResult> {
+    return this.execute(effects, options)
   }
 }
diff --git a/container-runtime/src/Interfaces/AllGetDependencies.ts b/container-runtime/src/Interfaces/AllGetDependencies.ts
index 88a200900..ca5c43585 100644
--- a/container-runtime/src/Interfaces/AllGetDependencies.ts
+++ b/container-runtime/src/Interfaces/AllGetDependencies.ts
@@ -1,6 +1,7 @@
 import { GetDependency } from "./GetDependency"
 import { System } from "./System"
-import { GetHostSystem, HostSystem } from "./HostSystem"
+import { MakeMainEffects, MakeProcedureEffects } from "./MakeEffects"
 
 export type AllGetDependencies = GetDependency<"system", Promise<System>> &
-  GetDependency<"hostSystem", GetHostSystem>
+  GetDependency<"makeProcedureEffects", MakeProcedureEffects> &
+  GetDependency<"makeMainEffects", MakeMainEffects>
diff --git a/container-runtime/src/Interfaces/HostSystem.ts b/container-runtime/src/Interfaces/HostSystem.ts
deleted file mode 100644
index 4ba986e3b..000000000
--- a/container-runtime/src/Interfaces/HostSystem.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { types as T } from "@start9labs/start-sdk"
-
-import { CallbackHolder } from "../Models/CallbackHolder"
-import { Effects } from "../Models/Effects"
-export type HostSystem = Effects
-export type GetHostSystem = (
-  callbackHolder: CallbackHolder,
-) => (procedureId: null | string) => Effects
diff --git a/container-runtime/src/Interfaces/MakeEffects.ts b/container-runtime/src/Interfaces/MakeEffects.ts
new file mode 100644
index 000000000..3b25f8180
--- /dev/null
+++ b/container-runtime/src/Interfaces/MakeEffects.ts
@@ -0,0 +1,4 @@
+import { Effects } from "../Models/Effects"
+import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+export type MakeProcedureEffects = (procedureId: string) => Effects
+export type MakeMainEffects = () => MainEffects
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
index 58e045356..01fd3c5ff 100644
--- a/container-runtime/src/Interfaces/System.ts
+++ b/container-runtime/src/Interfaces/System.ts
@@ -1,33 +1,54 @@
 import { types as T } from "@start9labs/start-sdk"
-import { JsonPath } from "../Models/JsonPath"
 import { RpcResult } from "../Adapters/RpcListener"
-import { hostSystemStartOs } from "../Adapters/HostSystemStartOs"
+import { Effects } from "../Models/Effects"
+import { CallbackHolder } from "../Models/CallbackHolder"
+import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+
+export type Procedure =
+  | "/init"
+  | "/uninit"
+  | "/config/set"
+  | "/config/get"
+  | "/backup/create"
+  | "/backup/restore"
+  | "/actions/metadata"
+  | "/properties"
+  | `/actions/${string}/get`
+  | `/actions/${string}/run`
+  | `/dependencies/${string}/query`
+  | `/dependencies/${string}/update`
+
 export type ExecuteResult =
   | { ok: unknown }
   | { err: { code: number; message: string } }
 export type System = {
-  // init(effects: Effects): Promise<void>
-  // exit(effects: Effects): Promise<void>
-  // start(effects: Effects): Promise<void>
-  // stop(effects: Effects, options: { timeout: number, signal?: number }): Promise<void>
+  init(): Promise<void>
+
+  start(effects: MainEffects): Promise<void>
+  callCallback(callback: number, args: any[]): void
+  stop(): Promise<void>
 
   execute(
-    effectCreator: ReturnType<typeof hostSystemStartOs>,
+    effects: Effects,
+    options: {
+      procedure: Procedure
+      input: unknown
+      timeout?: number
+    },
+  ): Promise<RpcResult>
+  sandbox(
+    effects: Effects,
     options: {
-      id: string
-      procedure: JsonPath
+      procedure: Procedure
       input: unknown
       timeout?: number
     },
   ): Promise<RpcResult>
-  // sandbox(
-  //   effects: Effects,
-  //   options: {
-  //     procedure: JsonPath
-  //     input: unknown
-  //     timeout?: number
-  //   },
-  // ): Promise<unknown>
 
-  exit(effects: T.Effects): Promise<void>
+  exit(): Promise<void>
+}
+
+export type RunningMain = {
+  callbacks: CallbackHolder
+  stop(): Promise<void>
 }
diff --git a/container-runtime/src/Models/CallbackHolder.ts b/container-runtime/src/Models/CallbackHolder.ts
index 6539dda88..b51af0bee 100644
--- a/container-runtime/src/Models/CallbackHolder.ts
+++ b/container-runtime/src/Models/CallbackHolder.ts
@@ -1,12 +1,14 @@
 export class CallbackHolder {
   constructor() {}
-  private root = (Math.random() + 1).toString(36).substring(7)
   private inc = 0
   private callbacks = new Map<number, Function>()
   private newId() {
     return this.inc++
   }
-  addCallback(callback: Function) {
+  addCallback(callback?: Function) {
+    if (!callback) {
+      return
+    }
     const id = this.newId()
     this.callbacks.set(id, callback)
     return id
diff --git a/container-runtime/src/Models/JsonPath.ts b/container-runtime/src/Models/JsonPath.ts
index 314019154..95a2b3a00 100644
--- a/container-runtime/src/Models/JsonPath.ts
+++ b/container-runtime/src/Models/JsonPath.ts
@@ -28,8 +28,6 @@ export const jsonPath = some(
   literals(
     "/init",
     "/uninit",
-    "/main/start",
-    "/main/stop",
     "/config/set",
     "/config/get",
     "/backup/create",
diff --git a/container-runtime/src/index.ts b/container-runtime/src/index.ts
index 74be5b73a..5454bee3d 100644
--- a/container-runtime/src/index.ts
+++ b/container-runtime/src/index.ts
@@ -1,12 +1,13 @@
 import { RpcListener } from "./Adapters/RpcListener"
 import { SystemForEmbassy } from "./Adapters/Systems/SystemForEmbassy"
-import { hostSystemStartOs } from "./Adapters/HostSystemStartOs"
+import { makeMainEffects, makeProcedureEffects } from "./Adapters/EffectCreator"
 import { AllGetDependencies } from "./Interfaces/AllGetDependencies"
 import { getSystem } from "./Adapters/Systems"
 
 const getDependencies: AllGetDependencies = {
   system: getSystem,
-  hostSystem: () => hostSystemStartOs,
+  makeProcedureEffects: () => makeProcedureEffects,
+  makeMainEffects: () => makeMainEffects,
 }
 
 new RpcListener(getDependencies)
diff --git a/core/build-startos-bins.sh b/core/build-containerbox.sh
similarity index 83%
rename from core/build-startos-bins.sh
rename to core/build-containerbox.sh
index f81ddb093..f988d2de3 100755
--- a/core/build-startos-bins.sh
+++ b/core/build-containerbox.sh
@@ -28,9 +28,6 @@ set +e
 fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl)"; then 
-	fail=true
-fi
 if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl)"; then 
 	fail=true
 fi
diff --git a/core/build-startbox.sh b/core/build-startbox.sh
new file mode 100755
index 000000000..0604ba5da
--- /dev/null
+++ b/core/build-startbox.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -e
+shopt -s expand_aliases
+
+if [ -z "$ARCH" ]; then
+	ARCH=$(uname -m)
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+cd ..
+FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
+RUSTFLAGS=""
+
+if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
+	RUSTFLAGS="--cfg tokio_unstable"
+fi
+
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+
+set +e
+fail=
+echo "FEATURES=\"$FEATURES\""
+echo "RUSTFLAGS=\"$RUSTFLAGS\""
+if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl)"; then 
+	fail=true
+fi
+set -e
+cd core
+
+sudo chown -R $USER target
+sudo chown -R $USER ~/.cargo
+
+if [ -n "$fail" ]; then
+	exit 1
+fi
diff --git a/core/models/src/id/package.rs b/core/models/src/id/package.rs
index d2665e59a..6e22b9d51 100644
--- a/core/models/src/id/package.rs
+++ b/core/models/src/id/package.rs
@@ -61,6 +61,11 @@ impl Borrow<str> for PackageId {
         self.0.as_ref()
     }
 }
+impl<'a> Borrow<str> for &'a PackageId {
+    fn borrow(&self) -> &str {
+        self.0.as_ref()
+    }
+}
 impl AsRef<Path> for PackageId {
     fn as_ref(&self) -> &Path {
         self.0.as_ref().as_ref()
diff --git a/core/models/src/procedure_name.rs b/core/models/src/procedure_name.rs
index c8ae8c3a8..466835818 100644
--- a/core/models/src/procedure_name.rs
+++ b/core/models/src/procedure_name.rs
@@ -4,8 +4,6 @@ use crate::{ActionId, PackageId};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ProcedureName {
-    StartMain,
-    StopMain,
     GetConfig,
     SetConfig,
     CreateBackup,
@@ -25,8 +23,6 @@ impl ProcedureName {
         match self {
             ProcedureName::Init => "/init".to_string(),
             ProcedureName::Uninit => "/uninit".to_string(),
-            ProcedureName::StartMain => "/main/start".to_string(),
-            ProcedureName::StopMain => "/main/stop".to_string(),
             ProcedureName::SetConfig => "/config/set".to_string(),
             ProcedureName::GetConfig => "/config/get".to_string(),
             ProcedureName::CreateBackup => "/backup/create".to_string(),
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index d33320b78..03005998f 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -319,6 +319,7 @@ fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) {
 pub struct ListParams {
     #[arg(skip)]
     #[ts(skip)]
+    #[serde(rename = "__auth_session")] // from Auth middleware
     session: InternedString,
 }
 
diff --git a/core/startos/src/backup/os.rs b/core/startos/src/backup/os.rs
index 7c8119e79..6f08c5f43 100644
--- a/core/startos/src/backup/os.rs
+++ b/core/startos/src/backup/os.rs
@@ -1,3 +1,4 @@
+use imbl_value::InternedString;
 use openssl::pkey::{PKey, Private};
 use openssl::x509::X509;
 use patch_db::Value;
@@ -97,7 +98,7 @@ impl OsBackupV0 {
 #[serde(rename = "kebab-case")]
 struct OsBackupV1 {
     server_id: String,               // uuidv4
-    hostname: String,                // embassy-<adjective>-<noun>
+    hostname: InternedString,        // embassy-<adjective>-<noun>
     net_key: Base64<[u8; 32]>,       // Ed25519 Secret Key
     root_ca_key: Pem<PKey<Private>>, // PEM Encoded OpenSSL Key
     root_ca_cert: Pem<X509>,         // PEM Encoded OpenSSL X509 Certificate
@@ -127,7 +128,7 @@ impl OsBackupV1 {
 
 struct OsBackupV2 {
     server_id: String,                               // uuidv4
-    hostname: String,                                // <adjective>-<noun>
+    hostname: InternedString,                        // <adjective>-<noun>
     root_ca_key: Pem<PKey<Private>>,                 // PEM Encoded OpenSSL Key
     root_ca_cert: Pem<X509>,                         // PEM Encoded OpenSSL X509 Certificate
     ssh_key: Pem<ssh_key::PrivateKey>,               // PEM Encoded OpenSSH Key
diff --git a/core/startos/src/bins/container_cli.rs b/core/startos/src/bins/container_cli.rs
index a33a99131..db7cbd36a 100644
--- a/core/startos/src/bins/container_cli.rs
+++ b/core/startos/src/bins/container_cli.rs
@@ -15,7 +15,7 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
     EmbassyLogger::init();
     if let Err(e) = CliApp::new(
         |cfg: ContainerClientConfig| Ok(ContainerCliContext::init(cfg)),
-        crate::service::service_effect_handler::service_effect_handler(),
+        crate::service::effects::handler(),
     )
     .run(args)
     {
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 4920a6223..ba1ab3fbb 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -29,6 +29,7 @@ use crate::net::wifi::WpaCli;
 use crate::prelude::*;
 use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle};
 use crate::rpc_continuations::{OpenAuthedContinuations, RpcContinuations};
+use crate::service::effects::callbacks::ServiceCallbacks;
 use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
 use crate::system::get_mem_info;
@@ -52,6 +53,7 @@ pub struct RpcContextSeed {
     pub lxc_manager: Arc<LxcManager>,
     pub open_authed_continuations: OpenAuthedContinuations<InternedString>,
     pub rpc_continuations: RpcContinuations,
+    pub callbacks: ServiceCallbacks,
     pub wifi_manager: Option<Arc<RwLock<WpaCli>>>,
     pub current_secret: Arc<Jwk>,
     pub client: Client,
@@ -225,6 +227,7 @@ impl RpcContext {
             lxc_manager: Arc::new(LxcManager::new()),
             open_authed_continuations: OpenAuthedContinuations::new(),
             rpc_continuations: RpcContinuations::new(),
+            callbacks: Default::default(),
             wifi_manager: wifi_interface
                 .clone()
                 .map(|i| Arc::new(RwLock::new(WpaCli::init(i)))),
diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index 6041f49b9..de8dced07 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -5,6 +5,7 @@ use std::time::Duration;
 
 use futures::{Future, StreamExt};
 use helpers::NonDetachingJoinHandle;
+use imbl_value::InternedString;
 use josekit::jwk::Jwk;
 use patch_db::PatchDb;
 use rpc_toolkit::Context;
@@ -40,7 +41,8 @@ lazy_static::lazy_static! {
 #[ts(export)]
 pub struct SetupResult {
     pub tor_address: String,
-    pub lan_address: String,
+    #[ts(type = "string")]
+    pub lan_address: InternedString,
     pub root_ca: String,
 }
 impl TryFrom<&AccountInfo> for SetupResult {
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index 725475602..b20693a90 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -20,6 +20,7 @@ use crate::db::model::package::AllPackageData;
 use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
 use crate::prelude::*;
 use crate::progress::FullProgress;
+use crate::system::SmtpValue;
 use crate::util::cpupower::Governor;
 use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
@@ -107,7 +108,8 @@ pub struct ServerInfo {
     #[ts(type = "string")]
     pub platform: InternedString,
     pub id: String,
-    pub hostname: String,
+    #[ts(type = "string")]
+    pub hostname: InternedString,
     #[ts(type = "string")]
     pub version: Version,
     #[ts(type = "string | null")]
@@ -135,7 +137,7 @@ pub struct ServerInfo {
     #[serde(default)]
     pub zram: bool,
     pub governor: Option<Governor>,
-    pub smtp: Option<String>,
+    pub smtp: Option<SmtpValue>,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
diff --git a/core/startos/src/hostname.rs b/core/startos/src/hostname.rs
index c4332354c..36bb5d8a4 100644
--- a/core/startos/src/hostname.rs
+++ b/core/startos/src/hostname.rs
@@ -1,3 +1,5 @@
+use imbl_value::InternedString;
+use lazy_format::lazy_format;
 use rand::{thread_rng, Rng};
 use tokio::process::Command;
 use tracing::instrument;
@@ -5,7 +7,7 @@ use tracing::instrument;
 use crate::util::Invoke;
 use crate::{Error, ErrorKind};
 #[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
-pub struct Hostname(pub String);
+pub struct Hostname(pub InternedString);
 
 lazy_static::lazy_static! {
     static ref ADJECTIVES: Vec<String> = include_str!("./assets/adjectives.txt").lines().map(|x| x.to_string()).collect();
@@ -18,15 +20,16 @@ impl AsRef<str> for Hostname {
 }
 
 impl Hostname {
-    pub fn lan_address(&self) -> String {
-        format!("https://{}.local", self.0)
+    pub fn lan_address(&self) -> InternedString {
+        InternedString::from_display(&lazy_format!("https://{}.local", self.0))
     }
 
-    pub fn local_domain_name(&self) -> String {
-        format!("{}.local", self.0)
+    pub fn local_domain_name(&self) -> InternedString {
+        InternedString::from_display(&lazy_format!("{}.local", self.0))
     }
-    pub fn no_dot_host_name(&self) -> String {
-        self.0.to_owned()
+
+    pub fn no_dot_host_name(&self) -> InternedString {
+        self.0.clone()
     }
 }
 
@@ -34,7 +37,9 @@ pub fn generate_hostname() -> Hostname {
     let mut rng = thread_rng();
     let adjective = &ADJECTIVES[rng.gen_range(0..ADJECTIVES.len())];
     let noun = &NOUNS[rng.gen_range(0..NOUNS.len())];
-    Hostname(format!("{adjective}-{noun}"))
+    Hostname(InternedString::from_display(&lazy_format!(
+        "{adjective}-{noun}"
+    )))
 }
 
 pub fn generate_id() -> String {
@@ -48,12 +53,12 @@ pub async fn get_current_hostname() -> Result<Hostname, Error> {
         .invoke(ErrorKind::ParseSysInfo)
         .await?;
     let out_string = String::from_utf8(out)?;
-    Ok(Hostname(out_string.trim().to_owned()))
+    Ok(Hostname(out_string.trim().into()))
 }
 
 #[instrument(skip_all)]
 pub async fn set_hostname(hostname: &Hostname) -> Result<(), Error> {
-    let hostname: &String = &hostname.0;
+    let hostname = &*hostname.0;
     Command::new("hostnamectl")
         .arg("--static")
         .arg("set-hostname")
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 4882d998e..feeb5a647 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -224,6 +224,18 @@ pub fn server<C: Context>() -> ParentHandler<C> {
             })
             .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "set-smtp",
+            from_fn_async(system::set_system_smtp)
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "clear-smtp",
+            from_fn_async(system::clear_system_smtp)
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
 }
 
 pub fn package<C: Context>() -> ParentHandler<C> {
diff --git a/core/startos/src/net/dns.rs b/core/startos/src/net/dns.rs
index ba69b6c16..090e845b0 100644
--- a/core/startos/src/net/dns.rs
+++ b/core/startos/src/net/dns.rs
@@ -34,7 +34,7 @@ struct Resolver {
 impl Resolver {
     async fn resolve(&self, name: &Name) -> Option<Vec<Ipv4Addr>> {
         match name.iter().next_back() {
-            Some(b"embassy") => {
+            Some(b"embassy") | Some(b"startos") => {
                 if let Some(pkg) = name.iter().rev().skip(1).next() {
                     if let Some(ip) = self.services.read().await.get(&Some(
                         std::str::from_utf8(pkg)
diff --git a/core/startos/src/net/host/address.rs b/core/startos/src/net/host/address.rs
index d9e2f4206..9b16441ce 100644
--- a/core/startos/src/net/host/address.rs
+++ b/core/startos/src/net/host/address.rs
@@ -1,7 +1,13 @@
+use std::fmt;
+use std::str::FromStr;
+
+use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
 use ts_rs::TS;
 
+use crate::prelude::*;
+
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "kind")]
@@ -11,4 +17,32 @@ pub enum HostAddress {
         #[ts(type = "string")]
         address: OnionAddressV3,
     },
+    Domain {
+        #[ts(type = "string")]
+        address: InternedString,
+    },
+}
+
+impl FromStr for HostAddress {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if let Some(addr) = s.strip_suffix(".onion") {
+            Ok(HostAddress::Onion {
+                address: addr
+                    .parse::<OnionAddressV3>()
+                    .with_kind(ErrorKind::ParseUrl)?,
+            })
+        } else {
+            Ok(HostAddress::Domain { address: s.into() })
+        }
+    }
+}
+
+impl fmt::Display for HostAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Onion { address } => write!(f, "{address}"),
+            Self::Domain { address } => write!(f, "{address}"),
+        }
+    }
 }
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
index 6cbb2dfd5..175fe3e83 100644
--- a/core/startos/src/net/host/mod.rs
+++ b/core/startos/src/net/host/mod.rs
@@ -40,6 +40,10 @@ impl Host {
             hostname_info: BTreeMap::new(),
         }
     }
+    pub fn addresses(&self) -> impl Iterator<Item = &HostAddress> {
+        // TODO: handle primary
+        self.addresses.iter()
+    }
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index 270c7ca09..521888665 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -4,6 +4,7 @@ use std::sync::{Arc, Weak};
 
 use color_eyre::eyre::eyre;
 use imbl::OrdMap;
+use imbl_value::InternedString;
 use models::{HostId, OptionExt, PackageId};
 use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
@@ -67,6 +68,14 @@ impl PreInitNetController {
                 alpn.clone(),
             )
             .await?;
+        self.vhost
+            .add(
+                Some("startos".into()),
+                443,
+                ([127, 0, 0, 1], 80).into(),
+                alpn.clone(),
+            )
+            .await?;
 
         // LAN IP
         self.os_bindings.push(
@@ -113,7 +122,9 @@ impl PreInitNetController {
         self.os_bindings.push(
             self.vhost
                 .add(
-                    Some(tor_key.public().get_onion_address().to_string()),
+                    Some(InternedString::from_display(
+                        &tor_key.public().get_onion_address(),
+                    )),
                     443,
                     ([127, 0, 0, 1], 80).into(),
                     alpn.clone(),
@@ -189,7 +200,15 @@ impl NetController {
 
 #[derive(Default, Debug)]
 struct HostBinds {
-    lan: BTreeMap<u16, (LanInfo, Option<AddSslOptions>, Vec<Arc<()>>)>,
+    lan: BTreeMap<
+        u16,
+        (
+            LanInfo,
+            Option<AddSslOptions>,
+            BTreeSet<InternedString>,
+            Vec<Arc<()>>,
+        ),
+    >,
     tor: BTreeMap<OnionAddressV3, (OrdMap<u16, SocketAddr>, Vec<Arc<()>>)>,
 }
 
@@ -234,20 +253,35 @@ impl NetService {
             .await?;
         self.update(id, host).await
     }
+
     pub async fn clear_bindings(&mut self) -> Result<(), Error> {
-        // TODO BLUJ
-        Ok(())
+        let ctrl = self.net_controller()?;
+        let mut errors = ErrorCollection::new();
+        for (_, binds) in std::mem::take(&mut self.binds) {
+            for (_, (lan, _, _, rc)) in binds.lan {
+                drop(rc);
+                if let Some(external) = lan.assigned_ssl_port {
+                    ctrl.vhost.gc(None, external).await?;
+                }
+                if let Some(external) = lan.assigned_port {
+                    ctrl.forward.gc(external).await?;
+                }
+            }
+            for (addr, (_, rcs)) in binds.tor {
+                drop(rcs);
+                errors.handle(ctrl.tor.gc(Some(addr), None).await);
+            }
+        }
+        std::mem::take(&mut self.dns);
+        errors.handle(ctrl.dns.gc(Some(self.id.clone()), self.ip).await);
+        errors.into_result()
     }
 
     async fn update(&mut self, id: HostId, host: Host) -> Result<(), Error> {
         let ctrl = self.net_controller()?;
         let mut hostname_info = BTreeMap::new();
-        let binds = {
-            if !self.binds.contains_key(&id) {
-                self.binds.insert(id.clone(), Default::default());
-            }
-            self.binds.get_mut(&id).unwrap()
-        };
+        let binds = self.binds.entry(id.clone()).or_default();
+
         let peek = ctrl.db.peek().await;
 
         // LAN
@@ -256,37 +290,71 @@ impl NetService {
         let hostname = server_info.as_hostname().de()?;
         for (port, bind) in &host.bindings {
             let old_lan_bind = binds.lan.remove(port);
-            let old_lan_port = old_lan_bind.as_ref().map(|(external, _, _)| *external);
             let lan_bind = old_lan_bind
-                .filter(|(external, ssl, _)| ssl == &bind.options.add_ssl && bind.lan == *external); // only keep existing binding if relevant details match
+                .as_ref()
+                .filter(|(external, ssl, _, _)| {
+                    ssl == &bind.options.add_ssl && bind.lan == *external
+                })
+                .cloned(); // only keep existing binding if relevant details match
             if bind.lan.assigned_port.is_some() || bind.lan.assigned_ssl_port.is_some() {
                 let new_lan_bind = if let Some(b) = lan_bind {
                     b
                 } else {
-                    let mut rcs = Vec::with_capacity(2);
+                    let mut rcs = Vec::with_capacity(2 + host.addresses.len());
+                    let mut hostnames = BTreeSet::new();
                     if let Some(ssl) = &bind.options.add_ssl {
                         let external = bind
                             .lan
                             .assigned_ssl_port
                             .or_not_found("assigned ssl port")?;
+                        let target = (self.ip, *port).into();
+                        let connect_ssl = if let Some(alpn) = ssl.alpn.clone() {
+                            Err(alpn)
+                        } else {
+                            if bind.options.secure.as_ref().map_or(false, |s| s.ssl) {
+                                Ok(())
+                            } else {
+                                Err(AlpnInfo::Reflect)
+                            }
+                        };
                         rcs.push(
                             ctrl.vhost
-                                .add(
-                                    None,
-                                    external,
-                                    (self.ip, *port).into(),
-                                    if let Some(alpn) = ssl.alpn.clone() {
-                                        Err(alpn)
-                                    } else {
-                                        if bind.options.secure.as_ref().map_or(false, |s| s.ssl) {
-                                            Ok(())
-                                        } else {
-                                            Err(AlpnInfo::Reflect)
-                                        }
-                                    },
-                                )
+                                .add(None, external, target, connect_ssl.clone())
                                 .await?,
                         );
+                        for address in host.addresses() {
+                            match address {
+                                HostAddress::Onion { address } => {
+                                    let hostname = InternedString::from_display(address);
+                                    if hostnames.insert(hostname.clone()) {
+                                        rcs.push(
+                                            ctrl.vhost
+                                                .add(
+                                                    Some(hostname),
+                                                    external,
+                                                    target,
+                                                    connect_ssl.clone(),
+                                                )
+                                                .await?,
+                                        );
+                                    }
+                                }
+                                HostAddress::Domain { address } => {
+                                    if hostnames.insert(address.clone()) {
+                                        rcs.push(
+                                            ctrl.vhost
+                                                .add(
+                                                    Some(address.clone()),
+                                                    external,
+                                                    target,
+                                                    connect_ssl.clone(),
+                                                )
+                                                .await?,
+                                        );
+                                    }
+                                }
+                            }
+                        }
                     }
                     if let Some(security) = bind.options.secure {
                         if bind.options.add_ssl.is_some() && security.ssl {
@@ -297,7 +365,7 @@ impl NetService {
                             rcs.push(ctrl.forward.add(external, (self.ip, *port).into()).await?);
                         }
                     }
-                    (bind.lan, bind.options.add_ssl.clone(), rcs)
+                    (bind.lan, bind.options.add_ssl.clone(), hostnames, rcs)
                 };
                 let mut bind_hostname_info: Vec<HostnameInfo> =
                     hostname_info.remove(port).unwrap_or_default();
@@ -337,9 +405,12 @@ impl NetService {
                 hostname_info.insert(*port, bind_hostname_info);
                 binds.lan.insert(*port, new_lan_bind);
             }
-            if let Some(lan) = old_lan_port {
+            if let Some((lan, _, hostnames, _)) = old_lan_bind {
                 if let Some(external) = lan.assigned_ssl_port {
                     ctrl.vhost.gc(None, external).await?;
+                    for hostname in hostnames {
+                        ctrl.vhost.gc(Some(hostname), external).await?;
+                    }
                 }
                 if let Some(external) = lan.assigned_port {
                     ctrl.forward.gc(external).await?;
@@ -347,18 +418,21 @@ impl NetService {
             }
         }
         let mut removed = BTreeSet::new();
-        binds.lan.retain(|internal, (external, _, _)| {
+        binds.lan.retain(|internal, (external, _, hostnames, _)| {
             if host.bindings.contains_key(internal) {
                 true
             } else {
-                removed.insert(*external);
+                removed.insert((*external, std::mem::take(hostnames)));
 
                 false
             }
         });
-        for lan in removed {
+        for (lan, hostnames) in removed {
             if let Some(external) = lan.assigned_ssl_port {
                 ctrl.vhost.gc(None, external).await?;
+                for hostname in hostnames {
+                    ctrl.vhost.gc(Some(hostname), external).await?;
+                }
             }
             if let Some(external) = lan.assigned_port {
                 ctrl.forward.gc(external).await?;
@@ -401,48 +475,44 @@ impl NetService {
                 );
             }
         }
+
         let mut keep_tor_addrs = BTreeSet::new();
-        for addr in match host.kind {
-            HostKind::Multi => {
-                // itertools::Either::Left(
-                host.addresses.iter()
-                // )
-            } // HostKind::Single | HostKind::Static => itertools::Either::Right(&host.primary),
-        } {
-            match addr {
-                HostAddress::Onion { address } => {
-                    keep_tor_addrs.insert(address);
-                    let old_tor_bind = binds.tor.remove(address);
-                    let tor_bind = old_tor_bind.filter(|(ports, _)| ports == &tor_binds);
-                    let new_tor_bind = if let Some(tor_bind) = tor_bind {
-                        tor_bind
-                    } else {
-                        let key = peek
-                            .as_private()
-                            .as_key_store()
-                            .as_onion()
-                            .get_key(address)?;
-                        let rcs = ctrl
-                            .tor
-                            .add(key, tor_binds.clone().into_iter().collect())
-                            .await?;
-                        (tor_binds.clone(), rcs)
-                    };
-                    for (internal, ports) in &tor_hostname_ports {
-                        let mut bind_hostname_info =
-                            hostname_info.remove(internal).unwrap_or_default();
-                        bind_hostname_info.push(HostnameInfo::Onion {
-                            hostname: OnionHostname {
-                                value: address.to_string(),
-                                port: ports.non_ssl,
-                                ssl_port: ports.ssl,
-                            },
-                        });
-                        hostname_info.insert(*internal, bind_hostname_info);
-                    }
-                    binds.tor.insert(address.clone(), new_tor_bind);
-                }
+        for tor_addr in host.addresses().filter_map(|a| {
+            if let HostAddress::Onion { address } = a {
+                Some(address)
+            } else {
+                None
             }
+        }) {
+            keep_tor_addrs.insert(tor_addr);
+            let old_tor_bind = binds.tor.remove(tor_addr);
+            let tor_bind = old_tor_bind.filter(|(ports, _)| ports == &tor_binds);
+            let new_tor_bind = if let Some(tor_bind) = tor_bind {
+                tor_bind
+            } else {
+                let key = peek
+                    .as_private()
+                    .as_key_store()
+                    .as_onion()
+                    .get_key(tor_addr)?;
+                let rcs = ctrl
+                    .tor
+                    .add(key, tor_binds.clone().into_iter().collect())
+                    .await?;
+                (tor_binds.clone(), rcs)
+            };
+            for (internal, ports) in &tor_hostname_ports {
+                let mut bind_hostname_info = hostname_info.remove(internal).unwrap_or_default();
+                bind_hostname_info.push(HostnameInfo::Onion {
+                    hostname: OnionHostname {
+                        value: tor_addr.to_string(),
+                        port: ports.non_ssl,
+                        ssl_port: ports.ssl,
+                    },
+                });
+                hostname_info.insert(*internal, bind_hostname_info);
+            }
+            binds.tor.insert(tor_addr.clone(), new_tor_bind);
         }
         for addr in binds.tor.keys() {
             if !keep_tor_addrs.contains(addr) {
@@ -462,26 +532,8 @@ impl NetService {
 
     pub async fn remove_all(mut self) -> Result<(), Error> {
         self.shutdown = true;
-        let mut errors = ErrorCollection::new();
         if let Some(ctrl) = Weak::upgrade(&self.controller) {
-            for (_, binds) in std::mem::take(&mut self.binds) {
-                for (_, (lan, _, rc)) in binds.lan {
-                    drop(rc);
-                    if let Some(external) = lan.assigned_ssl_port {
-                        ctrl.vhost.gc(None, external).await?;
-                    }
-                    if let Some(external) = lan.assigned_port {
-                        ctrl.forward.gc(external).await?;
-                    }
-                }
-                for (addr, (_, rcs)) in binds.tor {
-                    drop(rcs);
-                    errors.handle(ctrl.tor.gc(Some(addr), None).await);
-                }
-            }
-            std::mem::take(&mut self.dns);
-            errors.handle(ctrl.dns.gc(Some(self.id.clone()), self.ip).await);
-            errors.into_result()
+            self.clear_bindings().await
         } else {
             tracing::warn!("NetService dropped after NetController is shutdown");
             Err(Error::new(
@@ -495,11 +547,11 @@ impl NetService {
         self.ip
     }
 
-    pub fn get_ext_port(&self, host_id: HostId, internal_port: u16) -> Result<LanInfo, Error> {
+    pub fn get_lan_port(&self, host_id: HostId, internal_port: u16) -> Result<LanInfo, Error> {
         let host_id_binds = self.binds.get_key_value(&host_id);
         match host_id_binds {
             Some((_, binds)) => {
-                if let Some((lan, _, _)) = binds.lan.get(&internal_port) {
+                if let Some((lan, _, _, _)) = binds.lan.get(&internal_port) {
                     Ok(*lan)
                 } else {
                     Err(Error::new(
diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index 382006072..29bcd9652 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -1,13 +1,13 @@
-use std::cmp::Ordering;
+use std::cmp::{min, Ordering};
 use std::collections::{BTreeMap, BTreeSet};
 use std::net::IpAddr;
 use std::path::Path;
-use std::time::{SystemTime, UNIX_EPOCH};
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use futures::FutureExt;
 use imbl_value::InternedString;
 use libc::time_t;
-use openssl::asn1::{Asn1Integer, Asn1Time};
+use openssl::asn1::{Asn1Integer, Asn1Time, Asn1TimeRef};
 use openssl::bn::{BigNum, MsbOption};
 use openssl::ec::{EcGroup, EcKey};
 use openssl::hash::MessageDigest;
@@ -17,6 +17,7 @@ use openssl::x509::{X509Builder, X509Extension, X509NameBuilder, X509};
 use openssl::*;
 use patch_db::HasModel;
 use serde::{Deserialize, Serialize};
+use tokio::time::Instant;
 use tracing::instrument;
 
 use crate::account::AccountInfo;
@@ -126,12 +127,18 @@ impl Model<CertStore> {
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
 pub struct CertData {
     pub keys: PKeyPair,
     pub certs: CertPair,
 }
+impl CertData {
+    pub fn expiration(&self) -> Result<SystemTime, Error> {
+        self.certs.expiration()
+    }
+}
 
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct FullchainCertData {
     pub root: X509,
     pub int: X509,
@@ -144,6 +151,16 @@ impl FullchainCertData {
     pub fn fullchain_nistp256(&self) -> Vec<&X509> {
         vec![&self.leaf.certs.nistp256, &self.int, &self.root]
     }
+    pub fn expiration(&self) -> Result<SystemTime, Error> {
+        [
+            asn1_time_to_system_time(self.root.not_after())?,
+            asn1_time_to_system_time(self.int.not_after())?,
+            self.leaf.expiration()?,
+        ]
+        .into_iter()
+        .min()
+        .ok_or_else(|| Error::new(eyre!("unreachable"), ErrorKind::Unknown))
+    }
 }
 
 static CERTIFICATE_VERSION: i32 = 2; // X509 version 3 is actually encoded as '2' in the cert because fuck you.
@@ -155,6 +172,26 @@ fn unix_time(time: SystemTime) -> time_t {
         .unwrap_or_default()
 }
 
+lazy_static::lazy_static! {
+    static ref ASN1_UNIX_EPOCH: Asn1Time = Asn1Time::from_unix(0).unwrap();
+}
+
+fn asn1_time_to_system_time(time: &Asn1TimeRef) -> Result<SystemTime, Error> {
+    let diff = time.diff(&**ASN1_UNIX_EPOCH)?;
+    let mut res = UNIX_EPOCH;
+    if diff.days >= 0 {
+        res += Duration::from_secs(diff.days as u64 * 86400);
+    } else {
+        res -= Duration::from_secs((-1 * diff.days) as u64 * 86400);
+    }
+    if diff.secs >= 0 {
+        res += Duration::from_secs(diff.secs as u64);
+    } else {
+        res -= Duration::from_secs((-1 * diff.secs) as u64);
+    }
+    Ok(res)
+}
+
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct PKeyPair {
     #[serde(with = "crate::util::serde::pem")]
@@ -162,6 +199,12 @@ pub struct PKeyPair {
     #[serde(with = "crate::util::serde::pem")]
     pub nistp256: PKey<Private>,
 }
+impl PartialEq for PKeyPair {
+    fn eq(&self, other: &Self) -> bool {
+        self.ed25519.public_eq(&other.ed25519) && self.nistp256.public_eq(&other.nistp256)
+    }
+}
+impl Eq for PKeyPair {}
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize)]
 pub struct CertPair {
@@ -170,6 +213,14 @@ pub struct CertPair {
     #[serde(with = "crate::util::serde::pem")]
     pub nistp256: X509,
 }
+impl CertPair {
+    pub fn expiration(&self) -> Result<SystemTime, Error> {
+        Ok(min(
+            asn1_time_to_system_time(self.ed25519.not_after())?,
+            asn1_time_to_system_time(self.nistp256.not_after())?,
+        ))
+    }
+}
 
 pub async fn root_ca_start_time() -> Result<SystemTime, Error> {
     Ok(if check_time_is_synchronized().await? {
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index e6a9d5b21..cdd752709 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -46,7 +46,7 @@ impl VHostController {
     #[instrument(skip_all)]
     pub async fn add(
         &self,
-        hostname: Option<String>,
+        hostname: Option<InternedString>,
         external: u16,
         target: SocketAddr,
         connect_ssl: Result<(), AlpnInfo>, // Ok: yes, connect using ssl, pass through alpn; Err: connect tcp, use provided strategy for alpn
@@ -70,7 +70,7 @@ impl VHostController {
         Ok(rc?)
     }
     #[instrument(skip_all)]
-    pub async fn gc(&self, hostname: Option<String>, external: u16) -> Result<(), Error> {
+    pub async fn gc(&self, hostname: Option<InternedString>, external: u16) -> Result<(), Error> {
         let mut writable = self.servers.lock().await;
         if let Some(server) = writable.remove(&external) {
             server.gc(hostname).await?;
@@ -102,7 +102,7 @@ impl Default for AlpnInfo {
 }
 
 struct VHostServer {
-    mapping: Weak<RwLock<BTreeMap<Option<String>, BTreeMap<TargetInfo, Weak<()>>>>>,
+    mapping: Weak<RwLock<BTreeMap<Option<InternedString>, BTreeMap<TargetInfo, Weak<()>>>>>,
     _thread: NonDetachingJoinHandle<()>,
 }
 impl VHostServer {
@@ -179,7 +179,7 @@ impl VHostServer {
                                         }
                                     };
                                     let target_name =
-                                        mid.client_hello().server_name().map(|s| s.to_owned());
+                                        mid.client_hello().server_name().map(|s| s.into());
                                     let target = {
                                         let mapping = mapping.read().await;
                                         mapping
@@ -208,9 +208,7 @@ impl VHostServer {
                                         let mut tcp_stream =
                                             TcpStream::connect(target.addr).await?;
                                         let hostnames = target_name
-                                            .as_ref()
                                             .into_iter()
-                                            .map(InternedString::intern)
                                             .chain(
                                                 db.peek()
                                                     .await
@@ -405,7 +403,11 @@ impl VHostServer {
             .into(),
         })
     }
-    async fn add(&self, hostname: Option<String>, target: TargetInfo) -> Result<Arc<()>, Error> {
+    async fn add(
+        &self,
+        hostname: Option<InternedString>,
+        target: TargetInfo,
+    ) -> Result<Arc<()>, Error> {
         if let Some(mapping) = Weak::upgrade(&self.mapping) {
             let mut writable = mapping.write().await;
             let mut targets = writable.remove(&hostname).unwrap_or_default();
@@ -424,7 +426,7 @@ impl VHostServer {
             ))
         }
     }
-    async fn gc(&self, hostname: Option<String>) -> Result<(), Error> {
+    async fn gc(&self, hostname: Option<InternedString>) -> Result<(), Error> {
         if let Some(mapping) = Weak::upgrade(&self.mapping) {
             let mut writable = mapping.write().await;
             let mut targets = writable.remove(&hostname).unwrap_or_default();
diff --git a/core/startos/src/registry/os/asset/add.rs b/core/startos/src/registry/os/asset/add.rs
index c18d05b8f..d609063ea 100644
--- a/core/startos/src/registry/os/asset/add.rs
+++ b/core/startos/src/registry/os/asset/add.rs
@@ -4,6 +4,7 @@ use std::path::PathBuf;
 
 use chrono::Utc;
 use clap::Parser;
+use exver::Version;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
@@ -27,7 +28,6 @@ use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::open_file;
 use crate::util::serde::Base64;
-use crate::util::VersionString;
 
 pub fn add_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -55,7 +55,8 @@ pub fn add_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddAssetParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     #[ts(type = "string")]
     pub platform: InternedString,
     #[ts(type = "string")]
@@ -154,7 +155,7 @@ pub struct CliAddAssetParams {
     #[arg(short = 'p', long = "platform")]
     pub platform: InternedString,
     #[arg(short = 'v', long = "version")]
-    pub version: VersionString,
+    pub version: Version,
     pub file: PathBuf,
     pub url: Url,
 }
@@ -209,11 +210,18 @@ pub async fn cli_add_asset(
         hash: Base64(*blake3.as_bytes()),
         size,
     };
-    let signature = Ed25519.sign_commitment(ctx.developer_key()?, &commitment, SIG_CONTEXT)?;
+    let signature = AnySignature::Ed25519(Ed25519.sign_commitment(
+        ctx.developer_key()?,
+        &commitment,
+        SIG_CONTEXT,
+    )?);
     sign_phase.complete();
 
     verify_phase.start();
     let src = HttpSource::new(ctx.client.clone(), url.clone()).await?;
+    if let Some(size) = src.size().await {
+        verify_phase.set_total(size);
+    }
     let mut writer = verify_phase.writer(VerifyingWriter::new(
         tokio::io::sink(),
         Some((blake3::Hash::from_bytes(*commitment.hash), commitment.size)),
diff --git a/core/startos/src/registry/os/asset/get.rs b/core/startos/src/registry/os/asset/get.rs
index b185cf6a4..ad0010dca 100644
--- a/core/startos/src/registry/os/asset/get.rs
+++ b/core/startos/src/registry/os/asset/get.rs
@@ -3,6 +3,7 @@ use std::panic::UnwindSafe;
 use std::path::{Path, PathBuf};
 
 use clap::Parser;
+use exver::Version;
 use helpers::AtomicFile;
 use imbl_value::{json, InternedString};
 use itertools::Itertools;
@@ -21,7 +22,6 @@ use crate::registry::signer::commitment::blake3::Blake3Commitment;
 use crate::registry::signer::commitment::Commitment;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::util::io::open_file;
-use crate::util::VersionString;
 
 pub fn get_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -37,7 +37,8 @@ pub fn get_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct GetOsAssetParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     #[ts(type = "string")]
     pub platform: InternedString,
 }
@@ -91,7 +92,7 @@ pub async fn get_squashfs(
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliGetOsAssetParams {
-    pub version: VersionString,
+    pub version: Version,
     pub platform: InternedString,
     #[arg(long = "download", short = 'd')]
     pub download: Option<PathBuf>,
diff --git a/core/startos/src/registry/os/asset/sign.rs b/core/startos/src/registry/os/asset/sign.rs
index 12903d8a1..18b603daf 100644
--- a/core/startos/src/registry/os/asset/sign.rs
+++ b/core/startos/src/registry/os/asset/sign.rs
@@ -3,6 +3,7 @@ use std::panic::UnwindSafe;
 use std::path::PathBuf;
 
 use clap::Parser;
+use exver::Version;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
@@ -23,7 +24,6 @@ use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::open_file;
 use crate::util::serde::Base64;
-use crate::util::VersionString;
 
 pub fn sign_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -51,7 +51,8 @@ pub fn sign_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SignAssetParams {
-    version: VersionString,
+    #[ts(type = "string")]
+    version: Version,
     #[ts(type = "string")]
     platform: InternedString,
     #[ts(skip)]
@@ -137,7 +138,7 @@ pub struct CliSignAssetParams {
     #[arg(short = 'p', long = "platform")]
     pub platform: InternedString,
     #[arg(short = 'v', long = "version")]
-    pub version: VersionString,
+    pub version: Version,
     pub file: PathBuf,
 }
 
@@ -189,7 +190,11 @@ pub async fn cli_sign_asset(
         hash: Base64(*blake3.as_bytes()),
         size,
     };
-    let signature = Ed25519.sign_commitment(ctx.developer_key()?, &commitment, SIG_CONTEXT)?;
+    let signature = AnySignature::Ed25519(Ed25519.sign_commitment(
+        ctx.developer_key()?,
+        &commitment,
+        SIG_CONTEXT,
+    )?);
     sign_phase.complete();
 
     index_phase.start();
diff --git a/core/startos/src/registry/os/index.rs b/core/startos/src/registry/os/index.rs
index 0b1ca5b89..b61cb8f96 100644
--- a/core/startos/src/registry/os/index.rs
+++ b/core/startos/src/registry/os/index.rs
@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use exver::VersionRange;
+use exver::{Version, VersionRange};
 use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
@@ -10,14 +10,28 @@ use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::signer::commitment::blake3::Blake3Commitment;
 use crate::rpc_continuations::Guid;
-use crate::util::VersionString;
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct OsIndex {
-    pub versions: BTreeMap<VersionString, OsVersionInfo>,
+    pub versions: OsVersionInfoMap,
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, TS)]
+pub struct OsVersionInfoMap(
+    #[ts(as = "BTreeMap::<String, OsVersionInfo>")] pub BTreeMap<Version, OsVersionInfo>,
+);
+impl Map for OsVersionInfoMap {
+    type Key = Version;
+    type Value = OsVersionInfo;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(InternedString::from_display(key))
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(InternedString::from_display(key))
+    }
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index 242ae28a7..4c0568a80 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 
 use chrono::Utc;
 use clap::Parser;
-use exver::VersionRange;
+use exver::{Version, VersionRange};
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -15,7 +15,6 @@ use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
 use crate::registry::signer::sign::AnyVerifyingKey;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
-use crate::util::VersionString;
 
 pub mod signer;
 
@@ -53,7 +52,8 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddVersionParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     pub headline: String,
     pub release_notes: String,
     #[ts(type = "string")]
@@ -99,7 +99,8 @@ pub async fn add_version(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct RemoveVersionParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
 }
 
 pub async fn remove_version(
@@ -124,7 +125,7 @@ pub async fn remove_version(
 pub struct GetOsVersionParams {
     #[ts(type = "string | null")]
     #[arg(long = "src")]
-    pub source: Option<VersionString>,
+    pub source: Option<Version>,
     #[ts(type = "string | null")]
     #[arg(long = "target")]
     pub target: Option<VersionRange>,
@@ -144,7 +145,7 @@ pub async fn get_version(
         server_id,
         arch,
     }: GetOsVersionParams,
-) -> Result<BTreeMap<VersionString, OsVersionInfo>, Error> {
+) -> Result<BTreeMap<Version, OsVersionInfo>, Error> {
     if let (Some(pool), Some(server_id), Some(arch)) = (&ctx.pool, server_id, arch) {
         let created_at = Utc::now();
 
@@ -176,10 +177,7 @@ pub async fn get_version(
         .collect()
 }
 
-pub fn display_version_info<T>(
-    params: WithIoFormat<T>,
-    info: BTreeMap<VersionString, OsVersionInfo>,
-) {
+pub fn display_version_info<T>(params: WithIoFormat<T>, info: BTreeMap<Version, OsVersionInfo>) {
     use prettytable::*;
 
     if let Some(format) = params.format {
@@ -197,7 +195,7 @@ pub fn display_version_info<T>(
     ]);
     for (version, info) in &info {
         table.add_row(row![
-            version.as_str(),
+            &version.to_string(),
             &info.headline,
             &info.release_notes,
             &info.iso.keys().into_iter().join(", "),
diff --git a/core/startos/src/registry/os/version/signer.rs b/core/startos/src/registry/os/version/signer.rs
index bb15860aa..51f7c6719 100644
--- a/core/startos/src/registry/os/version/signer.rs
+++ b/core/startos/src/registry/os/version/signer.rs
@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 
 use clap::Parser;
+use exver::Version;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
@@ -12,7 +13,6 @@ use crate::registry::context::RegistryContext;
 use crate::registry::signer::SignerInfo;
 use crate::rpc_continuations::Guid;
 use crate::util::serde::HandlerExtSerde;
-use crate::util::VersionString;
 
 pub fn signer_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -44,7 +44,8 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct VersionSignerParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     pub signer: Guid,
 }
 
@@ -104,7 +105,8 @@ pub async fn remove_version_signer(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct ListVersionSignersParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
 }
 
 pub async fn list_version_signers(
diff --git a/core/startos/src/service/cli.rs b/core/startos/src/service/cli.rs
index f5e04999c..95add37fb 100644
--- a/core/startos/src/service/cli.rs
+++ b/core/startos/src/service/cli.rs
@@ -9,7 +9,7 @@ use rpc_toolkit::{call_remote_socket, yajrc, CallRemote, Context, Empty};
 use tokio::runtime::Runtime;
 
 use crate::lxc::HOST_RPC_SERVER_SOCKET;
-use crate::service::service_effect_handler::EffectContext;
+use crate::service::effects::context::EffectContext;
 
 #[derive(Debug, Default, Parser)]
 pub struct ContainerClientConfig {
diff --git a/core/startos/src/service/effects/action.rs b/core/startos/src/service/effects/action.rs
new file mode 100644
index 000000000..4719c6d3d
--- /dev/null
+++ b/core/startos/src/service/effects/action.rs
@@ -0,0 +1,101 @@
+use std::collections::BTreeMap;
+
+use models::{ActionId, PackageId};
+
+use crate::action::ActionResult;
+use crate::db::model::package::ActionMetadata;
+use crate::rpc_continuations::Guid;
+use crate::service::effects::prelude::*;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ExportActionParams {
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    id: ActionId,
+    metadata: ActionMetadata,
+}
+pub async fn export_action(context: EffectContext, data: ExportActionParams) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.seed.id.clone();
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            let model = db
+                .as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_actions_mut();
+            let mut value = model.de()?;
+            value
+                .insert(data.id, data.metadata)
+                .map(|_| ())
+                .unwrap_or_default();
+            model.ser(&value)
+        })
+        .await?;
+    Ok(())
+}
+
+pub async fn clear_actions(context: EffectContext) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.seed.id.clone();
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_actions_mut()
+                .ser(&BTreeMap::new())
+        })
+        .await?;
+    Ok(())
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct ExecuteAction {
+    #[serde(default)]
+    #[ts(skip)]
+    procedure_id: Guid,
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    action_id: ActionId,
+    #[ts(type = "any")]
+    input: Value,
+}
+pub async fn execute_action(
+    context: EffectContext,
+    ExecuteAction {
+        procedure_id,
+        package_id,
+        action_id,
+        input,
+    }: ExecuteAction,
+) -> Result<ActionResult, Error> {
+    let context = context.deref()?;
+
+    if let Some(package_id) = package_id {
+        context
+            .seed
+            .ctx
+            .services
+            .get(&package_id)
+            .await
+            .as_ref()
+            .or_not_found(&package_id)?
+            .action(procedure_id, action_id, input)
+            .await
+    } else {
+        context.action(procedure_id, action_id, input).await
+    }
+}
diff --git a/core/startos/src/service/effects/callbacks.rs b/core/startos/src/service/effects/callbacks.rs
new file mode 100644
index 000000000..1a9250aa8
--- /dev/null
+++ b/core/startos/src/service/effects/callbacks.rs
@@ -0,0 +1,311 @@
+use std::cmp::min;
+use std::collections::{BTreeMap, BTreeSet};
+use std::sync::{Arc, Mutex, Weak};
+use std::time::{Duration, SystemTime};
+
+use futures::future::join_all;
+use helpers::NonDetachingJoinHandle;
+use imbl::{vector, Vector};
+use imbl_value::InternedString;
+use models::{HostId, PackageId, ServiceInterfaceId};
+use patch_db::json_ptr::JsonPointer;
+use tracing::warn;
+
+use crate::net::ssl::FullchainCertData;
+use crate::prelude::*;
+use crate::service::effects::context::EffectContext;
+use crate::service::effects::net::ssl::Algorithm;
+use crate::service::rpc::CallbackHandle;
+use crate::service::{Service, ServiceActorSeed};
+use crate::util::collections::EqMap;
+
+#[derive(Default)]
+pub struct ServiceCallbacks(Mutex<ServiceCallbackMap>);
+
+#[derive(Default)]
+struct ServiceCallbackMap {
+    get_service_interface: BTreeMap<(PackageId, ServiceInterfaceId), Vec<CallbackHandler>>,
+    list_service_interfaces: BTreeMap<PackageId, Vec<CallbackHandler>>,
+    get_system_smtp: Vec<CallbackHandler>,
+    get_host_info: BTreeMap<(PackageId, HostId), Vec<CallbackHandler>>,
+    get_ssl_certificate: EqMap<
+        (BTreeSet<InternedString>, FullchainCertData, Algorithm),
+        (NonDetachingJoinHandle<()>, Vec<CallbackHandler>),
+    >,
+    get_store: BTreeMap<PackageId, BTreeMap<JsonPointer, Vec<CallbackHandler>>>,
+}
+
+impl ServiceCallbacks {
+    fn mutate<T>(&self, f: impl FnOnce(&mut ServiceCallbackMap) -> T) -> T {
+        let mut this = self.0.lock().unwrap();
+        f(&mut *this)
+    }
+
+    pub fn gc(&self) {
+        self.mutate(|this| {
+            this.get_service_interface.retain(|_, v| {
+                v.retain(|h| h.handle.is_active() && h.seed.strong_count() > 0);
+                !v.is_empty()
+            });
+            this.list_service_interfaces.retain(|_, v| {
+                v.retain(|h| h.handle.is_active() && h.seed.strong_count() > 0);
+                !v.is_empty()
+            });
+            this.get_system_smtp
+                .retain(|h| h.handle.is_active() && h.seed.strong_count() > 0);
+            this.get_host_info.retain(|_, v| {
+                v.retain(|h| h.handle.is_active() && h.seed.strong_count() > 0);
+                !v.is_empty()
+            });
+            this.get_ssl_certificate.retain(|_, (_, v)| {
+                v.retain(|h| h.handle.is_active() && h.seed.strong_count() > 0);
+                !v.is_empty()
+            });
+            this.get_store.retain(|_, v| {
+                v.retain(|_, v| {
+                    v.retain(|h| h.handle.is_active() && h.seed.strong_count() > 0);
+                    !v.is_empty()
+                });
+                !v.is_empty()
+            });
+        })
+    }
+
+    pub(super) fn add_get_service_interface(
+        &self,
+        package_id: PackageId,
+        service_interface_id: ServiceInterfaceId,
+        handler: CallbackHandler,
+    ) {
+        self.mutate(|this| {
+            this.get_service_interface
+                .entry((package_id, service_interface_id))
+                .or_default()
+                .push(handler);
+        })
+    }
+
+    #[must_use]
+    pub fn get_service_interface(
+        &self,
+        id: &(PackageId, ServiceInterfaceId),
+    ) -> Option<CallbackHandlers> {
+        self.mutate(|this| {
+            Some(CallbackHandlers(
+                this.get_service_interface.remove(id).unwrap_or_default(),
+            ))
+            .filter(|cb| !cb.0.is_empty())
+        })
+    }
+
+    pub(super) fn add_list_service_interfaces(
+        &self,
+        package_id: PackageId,
+        handler: CallbackHandler,
+    ) {
+        self.mutate(|this| {
+            this.list_service_interfaces
+                .entry(package_id)
+                .or_default()
+                .push(handler);
+        })
+    }
+
+    #[must_use]
+    pub fn list_service_interfaces(&self, id: &PackageId) -> Option<CallbackHandlers> {
+        self.mutate(|this| {
+            Some(CallbackHandlers(
+                this.list_service_interfaces.remove(id).unwrap_or_default(),
+            ))
+            .filter(|cb| !cb.0.is_empty())
+        })
+    }
+
+    pub(super) fn add_get_system_smtp(&self, handler: CallbackHandler) {
+        self.mutate(|this| {
+            this.get_system_smtp.push(handler);
+        })
+    }
+
+    #[must_use]
+    pub fn get_system_smtp(&self) -> Option<CallbackHandlers> {
+        self.mutate(|this| {
+            Some(CallbackHandlers(std::mem::take(&mut this.get_system_smtp)))
+                .filter(|cb| !cb.0.is_empty())
+        })
+    }
+
+    pub(super) fn add_get_host_info(
+        &self,
+        package_id: PackageId,
+        host_id: HostId,
+        handler: CallbackHandler,
+    ) {
+        self.mutate(|this| {
+            this.get_host_info
+                .entry((package_id, host_id))
+                .or_default()
+                .push(handler);
+        })
+    }
+
+    #[must_use]
+    pub fn get_host_info(&self, id: &(PackageId, HostId)) -> Option<CallbackHandlers> {
+        self.mutate(|this| {
+            Some(CallbackHandlers(
+                this.get_host_info.remove(id).unwrap_or_default(),
+            ))
+            .filter(|cb| !cb.0.is_empty())
+        })
+    }
+
+    pub(super) fn add_get_ssl_certificate(
+        &self,
+        ctx: EffectContext,
+        hostnames: BTreeSet<InternedString>,
+        cert: FullchainCertData,
+        algorithm: Algorithm,
+        handler: CallbackHandler,
+    ) {
+        self.mutate(|this| {
+            this.get_ssl_certificate
+                .entry((hostnames.clone(), cert.clone(), algorithm))
+                .or_insert_with(|| {
+                    (
+                        tokio::spawn(async move {
+                            if let Err(e) = async {
+                                loop {
+                                    match cert
+                                        .expiration()
+                                        .ok()
+                                        .and_then(|e| e.duration_since(SystemTime::now()).ok())
+                                    {
+                                        Some(d) => {
+                                            tokio::time::sleep(min(Duration::from_secs(86400), d))
+                                                .await
+                                        }
+                                        _ => break,
+                                    }
+                                }
+                                let Ok(ctx) = ctx.deref() else {
+                                    return Ok(());
+                                };
+
+                                if let Some((_, callbacks)) =
+                                    ctx.seed.ctx.callbacks.mutate(|this| {
+                                        this.get_ssl_certificate
+                                            .remove(&(hostnames, cert, algorithm))
+                                    })
+                                {
+                                    CallbackHandlers(callbacks).call(vector![]).await?;
+                                }
+                                Ok::<_, Error>(())
+                            }
+                            .await
+                            {
+                                tracing::error!(
+                                    "Error in callback handler for getSslCertificate: {e}"
+                                );
+                                tracing::debug!("{e:?}");
+                            }
+                        })
+                        .into(),
+                        Vec::new(),
+                    )
+                })
+                .1
+                .push(handler);
+        })
+    }
+
+    pub(super) fn add_get_store(
+        &self,
+        package_id: PackageId,
+        path: JsonPointer,
+        handler: CallbackHandler,
+    ) {
+        self.mutate(|this| {
+            this.get_store
+                .entry(package_id)
+                .or_default()
+                .entry(path)
+                .or_default()
+                .push(handler)
+        })
+    }
+
+    #[must_use]
+    pub fn get_store(
+        &self,
+        package_id: &PackageId,
+        path: &JsonPointer,
+    ) -> Option<CallbackHandlers> {
+        self.mutate(|this| {
+            if let Some(watched) = this.get_store.get_mut(package_id) {
+                let mut res = Vec::new();
+                watched.retain(|ptr, cbs| {
+                    if ptr.starts_with(path) || path.starts_with(ptr) {
+                        res.append(cbs);
+                        false
+                    } else {
+                        true
+                    }
+                });
+                Some(CallbackHandlers(res))
+            } else {
+                None
+            }
+            .filter(|cb| !cb.0.is_empty())
+        })
+    }
+}
+
+pub struct CallbackHandler {
+    handle: CallbackHandle,
+    seed: Weak<ServiceActorSeed>,
+}
+impl CallbackHandler {
+    pub fn new(service: &Service, handle: CallbackHandle) -> Self {
+        Self {
+            handle,
+            seed: Arc::downgrade(&service.seed),
+        }
+    }
+    pub async fn call(mut self, args: Vector<Value>) -> Result<(), Error> {
+        if let Some(seed) = self.seed.upgrade() {
+            seed.persistent_container
+                .callback(self.handle.take(), args)
+                .await?;
+        }
+        Ok(())
+    }
+}
+impl Drop for CallbackHandler {
+    fn drop(&mut self) {
+        if self.handle.is_active() {
+            warn!("Callback handler dropped while still active!");
+        }
+    }
+}
+
+pub struct CallbackHandlers(Vec<CallbackHandler>);
+impl CallbackHandlers {
+    pub async fn call(self, args: Vector<Value>) -> Result<(), Error> {
+        let mut err = ErrorCollection::new();
+        for res in join_all(self.0.into_iter().map(|cb| cb.call(args.clone()))).await {
+            err.handle(res);
+        }
+        err.into_result()
+    }
+}
+
+pub(super) fn clear_callbacks(context: EffectContext) -> Result<(), Error> {
+    let context = context.deref()?;
+    context
+        .seed
+        .persistent_container
+        .state
+        .send_if_modified(|s| !std::mem::take(&mut s.callbacks).is_empty());
+    context.seed.ctx.callbacks.gc();
+    Ok(())
+}
diff --git a/core/startos/src/service/effects/config.rs b/core/startos/src/service/effects/config.rs
new file mode 100644
index 000000000..647d3e272
--- /dev/null
+++ b/core/startos/src/service/effects/config.rs
@@ -0,0 +1,53 @@
+use models::PackageId;
+
+use crate::service::effects::prelude::*;
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetConfiguredParams {
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+}
+pub async fn get_configured(context: EffectContext) -> Result<bool, Error> {
+    let context = context.deref()?;
+    let peeked = context.seed.ctx.db.peek().await;
+    let package_id = &context.seed.id;
+    peeked
+        .as_public()
+        .as_package_data()
+        .as_idx(package_id)
+        .or_not_found(package_id)?
+        .as_status()
+        .as_configured()
+        .de()
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetConfigured {
+    configured: bool,
+}
+pub async fn set_configured(
+    context: EffectContext,
+    SetConfigured { configured }: SetConfigured,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = &context.seed.id;
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(package_id)
+                .or_not_found(package_id)?
+                .as_status_mut()
+                .as_configured_mut()
+                .ser(&configured)
+        })
+        .await?;
+    Ok(())
+}
diff --git a/core/startos/src/service/effects/context.rs b/core/startos/src/service/effects/context.rs
new file mode 100644
index 000000000..b97499332
--- /dev/null
+++ b/core/startos/src/service/effects/context.rs
@@ -0,0 +1,27 @@
+use std::sync::{Arc, Weak};
+
+use rpc_toolkit::Context;
+
+use crate::prelude::*;
+use crate::service::Service;
+
+#[derive(Clone)]
+pub(in crate::service) struct EffectContext(Weak<Service>);
+impl EffectContext {
+    pub fn new(service: Weak<Service>) -> Self {
+        Self(service)
+    }
+}
+impl Context for EffectContext {}
+impl EffectContext {
+    pub(super) fn deref(&self) -> Result<Arc<Service>, Error> {
+        if let Some(seed) = Weak::upgrade(&self.0) {
+            Ok(seed)
+        } else {
+            Err(Error::new(
+                eyre!("Service has already been destroyed"),
+                ErrorKind::InvalidRequest,
+            ))
+        }
+    }
+}
diff --git a/core/startos/src/service/effects/control.rs b/core/startos/src/service/effects/control.rs
new file mode 100644
index 000000000..6b3c6f8a0
--- /dev/null
+++ b/core/startos/src/service/effects/control.rs
@@ -0,0 +1,66 @@
+use std::str::FromStr;
+
+use clap::builder::ValueParserFactory;
+
+use crate::service::effects::prelude::*;
+use crate::util::clap::FromStrParser;
+
+pub async fn restart(
+    context: EffectContext,
+    ProcedureId { procedure_id }: ProcedureId,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    context.restart(procedure_id).await?;
+    Ok(())
+}
+
+pub async fn shutdown(
+    context: EffectContext,
+    ProcedureId { procedure_id }: ProcedureId,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    context.stop(procedure_id).await?;
+    Ok(())
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum SetMainStatusStatus {
+    Running,
+    Stopped,
+}
+impl FromStr for SetMainStatusStatus {
+    type Err = color_eyre::eyre::Report;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "running" => Ok(Self::Running),
+            "stopped" => Ok(Self::Stopped),
+            _ => Err(eyre!("unknown status {s}")),
+        }
+    }
+}
+impl ValueParserFactory for SetMainStatusStatus {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetMainStatus {
+    status: SetMainStatusStatus,
+}
+pub async fn set_main_status(
+    context: EffectContext,
+    SetMainStatus { status }: SetMainStatus,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    match status {
+        SetMainStatusStatus::Running => context.seed.started(),
+        SetMainStatusStatus::Stopped => context.seed.stopped(),
+    }
+    Ok(())
+}
diff --git a/core/startos/src/service/effects/dependency.rs b/core/startos/src/service/effects/dependency.rs
new file mode 100644
index 000000000..dfc8795f0
--- /dev/null
+++ b/core/startos/src/service/effects/dependency.rs
@@ -0,0 +1,371 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::path::PathBuf;
+use std::str::FromStr;
+
+use clap::builder::ValueParserFactory;
+use exver::VersionRange;
+use itertools::Itertools;
+use models::{HealthCheckId, PackageId, VolumeId};
+use patch_db::json_ptr::JsonPointer;
+
+use crate::db::model::package::{
+    CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind, ManifestPreference,
+};
+use crate::rpc_continuations::Guid;
+use crate::service::effects::prelude::*;
+use crate::status::health_check::HealthCheckResult;
+use crate::util::clap::FromStrParser;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct MountTarget {
+    package_id: PackageId,
+    volume_id: VolumeId,
+    subpath: Option<PathBuf>,
+    readonly: bool,
+}
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct MountParams {
+    location: String,
+    target: MountTarget,
+}
+pub async fn mount(
+    context: EffectContext,
+    MountParams {
+        location,
+        target:
+            MountTarget {
+                package_id,
+                volume_id,
+                subpath,
+                readonly,
+            },
+    }: MountParams,
+) -> Result<(), Error> {
+    // TODO
+    todo!()
+}
+
+pub async fn get_installed_packages(context: EffectContext) -> Result<Vec<PackageId>, Error> {
+    context
+        .deref()?
+        .seed
+        .ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_package_data()
+        .keys()
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct ExposeForDependentsParams {
+    #[ts(type = "string[]")]
+    paths: Vec<JsonPointer>,
+}
+pub async fn expose_for_dependents(
+    context: EffectContext,
+    ExposeForDependentsParams { paths }: ExposeForDependentsParams,
+) -> Result<(), Error> {
+    Ok(())
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum DependencyKind {
+    Exists,
+    Running,
+}
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase", tag = "kind")]
+#[serde(rename_all_fields = "camelCase")]
+#[ts(export)]
+pub enum DependencyRequirement {
+    Running {
+        id: PackageId,
+        health_checks: BTreeSet<HealthCheckId>,
+        #[ts(type = "string")]
+        version_range: VersionRange,
+    },
+    Exists {
+        id: PackageId,
+        #[ts(type = "string")]
+        version_range: VersionRange,
+    },
+}
+// filebrowser:exists,bitcoind:running:foo+bar+baz
+impl FromStr for DependencyRequirement {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.split_once(':') {
+            Some((id, "e")) | Some((id, "exists")) => Ok(Self::Exists {
+                id: id.parse()?,
+                version_range: "*".parse()?, // TODO
+            }),
+            Some((id, rest)) => {
+                let health_checks = match rest.split_once(':') {
+                    Some(("r", rest)) | Some(("running", rest)) => rest
+                        .split('+')
+                        .map(|id| id.parse().map_err(Error::from))
+                        .collect(),
+                    Some((kind, _)) => Err(Error::new(
+                        eyre!("unknown dependency kind {kind}"),
+                        ErrorKind::InvalidRequest,
+                    )),
+                    None => match rest {
+                        "r" | "running" => Ok(BTreeSet::new()),
+                        kind => Err(Error::new(
+                            eyre!("unknown dependency kind {kind}"),
+                            ErrorKind::InvalidRequest,
+                        )),
+                    },
+                }?;
+                Ok(Self::Running {
+                    id: id.parse()?,
+                    health_checks,
+                    version_range: "*".parse()?, // TODO
+                })
+            }
+            None => Ok(Self::Running {
+                id: s.parse()?,
+                health_checks: BTreeSet::new(),
+                version_range: "*".parse()?, // TODO
+            }),
+        }
+    }
+}
+impl ValueParserFactory for DependencyRequirement {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetDependenciesParams {
+    #[serde(default)]
+    procedure_id: Guid,
+    dependencies: Vec<DependencyRequirement>,
+}
+pub async fn set_dependencies(
+    context: EffectContext,
+    SetDependenciesParams {
+        procedure_id,
+        dependencies,
+    }: SetDependenciesParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let id = &context.seed.id;
+
+    let mut deps = BTreeMap::new();
+    for dependency in dependencies {
+        let (dep_id, kind, version_range) = match dependency {
+            DependencyRequirement::Exists { id, version_range } => {
+                (id, CurrentDependencyKind::Exists, version_range)
+            }
+            DependencyRequirement::Running {
+                id,
+                health_checks,
+                version_range,
+            } => (
+                id,
+                CurrentDependencyKind::Running { health_checks },
+                version_range,
+            ),
+        };
+        let config_satisfied =
+            if let Some(dep_service) = &*context.seed.ctx.services.get(&dep_id).await {
+                context
+                    .dependency_config(
+                        procedure_id.clone(),
+                        dep_id.clone(),
+                        dep_service.get_config(procedure_id.clone()).await?.config,
+                    )
+                    .await?
+                    .is_none()
+            } else {
+                true
+            };
+        let info = CurrentDependencyInfo {
+            title: context
+                .seed
+                .persistent_container
+                .s9pk
+                .dependency_metadata(&dep_id)
+                .await?
+                .map(|m| m.title),
+            icon: context
+                .seed
+                .persistent_container
+                .s9pk
+                .dependency_icon_data_url(&dep_id)
+                .await?,
+            kind,
+            version_range,
+            config_satisfied,
+        };
+        deps.insert(dep_id, info);
+    }
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(id)
+                .or_not_found(id)?
+                .as_current_dependencies_mut()
+                .ser(&CurrentDependencies(deps))
+        })
+        .await
+}
+
+pub async fn get_dependencies(context: EffectContext) -> Result<Vec<DependencyRequirement>, Error> {
+    let context = context.deref()?;
+    let id = &context.seed.id;
+    let db = context.seed.ctx.db.peek().await;
+    let data = db
+        .as_public()
+        .as_package_data()
+        .as_idx(id)
+        .or_not_found(id)?
+        .as_current_dependencies()
+        .de()?;
+
+    data.0
+        .into_iter()
+        .map(|(id, current_dependency_info)| {
+            let CurrentDependencyInfo {
+                version_range,
+                kind,
+                ..
+            } = current_dependency_info;
+            Ok::<_, Error>(match kind {
+                CurrentDependencyKind::Exists => {
+                    DependencyRequirement::Exists { id, version_range }
+                }
+                CurrentDependencyKind::Running { health_checks } => {
+                    DependencyRequirement::Running {
+                        id,
+                        health_checks,
+                        version_range,
+                    }
+                }
+            })
+        })
+        .try_collect()
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct CheckDependenciesParam {
+    #[ts(optional)]
+    package_ids: Option<Vec<PackageId>>,
+}
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct CheckDependenciesResult {
+    package_id: PackageId,
+    is_installed: bool,
+    is_running: bool,
+    config_satisfied: bool,
+    health_checks: BTreeMap<HealthCheckId, HealthCheckResult>,
+    #[ts(type = "string | null")]
+    version: Option<exver::ExtendedVersion>,
+}
+pub async fn check_dependencies(
+    context: EffectContext,
+    CheckDependenciesParam { package_ids }: CheckDependenciesParam,
+) -> Result<Vec<CheckDependenciesResult>, Error> {
+    let context = context.deref()?;
+    let db = context.seed.ctx.db.peek().await;
+    let current_dependencies = db
+        .as_public()
+        .as_package_data()
+        .as_idx(&context.seed.id)
+        .or_not_found(&context.seed.id)?
+        .as_current_dependencies()
+        .de()?;
+    let package_ids: Vec<_> = package_ids
+        .unwrap_or_else(|| current_dependencies.0.keys().cloned().collect())
+        .into_iter()
+        .filter_map(|x| {
+            let info = current_dependencies.0.get(&x)?;
+            Some((x, info))
+        })
+        .collect();
+    let mut results = Vec::with_capacity(package_ids.len());
+
+    for (package_id, dependency_info) in package_ids {
+        let Some(package) = db.as_public().as_package_data().as_idx(&package_id) else {
+            results.push(CheckDependenciesResult {
+                package_id,
+                is_installed: false,
+                is_running: false,
+                config_satisfied: false,
+                health_checks: Default::default(),
+                version: None,
+            });
+            continue;
+        };
+        let manifest = package.as_state_info().as_manifest(ManifestPreference::New);
+        let installed_version = manifest.as_version().de()?.into_version();
+        let satisfies = manifest.as_satisfies().de()?;
+        let version = Some(installed_version.clone());
+        if ![installed_version]
+            .into_iter()
+            .chain(satisfies.into_iter().map(|v| v.into_version()))
+            .any(|v| v.satisfies(&dependency_info.version_range))
+        {
+            results.push(CheckDependenciesResult {
+                package_id,
+                is_installed: false,
+                is_running: false,
+                config_satisfied: false,
+                health_checks: Default::default(),
+                version,
+            });
+            continue;
+        }
+        let is_installed = true;
+        let status = package.as_status().as_main().de()?;
+        let is_running = if is_installed {
+            status.running()
+        } else {
+            false
+        };
+        let health_checks =
+            if let CurrentDependencyKind::Running { health_checks } = &dependency_info.kind {
+                status
+                    .health()
+                    .cloned()
+                    .unwrap_or_default()
+                    .into_iter()
+                    .filter(|(id, _)| health_checks.contains(id))
+                    .collect()
+            } else {
+                Default::default()
+            };
+        results.push(CheckDependenciesResult {
+            package_id,
+            is_installed,
+            is_running,
+            config_satisfied: dependency_info.config_satisfied,
+            health_checks,
+            version,
+        });
+    }
+    Ok(results)
+}
diff --git a/core/startos/src/service/effects/health.rs b/core/startos/src/service/effects/health.rs
new file mode 100644
index 000000000..c8ef8fc4e
--- /dev/null
+++ b/core/startos/src/service/effects/health.rs
@@ -0,0 +1,46 @@
+use models::HealthCheckId;
+
+use crate::service::effects::prelude::*;
+use crate::status::health_check::HealthCheckResult;
+use crate::status::MainStatus;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetHealth {
+    id: HealthCheckId,
+    #[serde(flatten)]
+    result: HealthCheckResult,
+}
+pub async fn set_health(
+    context: EffectContext,
+    SetHealth { id, result }: SetHealth,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+
+    let package_id = &context.seed.id;
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(move |db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(package_id)
+                .or_not_found(package_id)?
+                .as_status_mut()
+                .as_main_mut()
+                .mutate(|main| {
+                    match main {
+                        &mut MainStatus::Running { ref mut health, .. }
+                        | &mut MainStatus::BackingUp { ref mut health, .. } => {
+                            health.insert(id, result);
+                        }
+                        _ => (),
+                    }
+                    Ok(())
+                })
+        })
+        .await?;
+    Ok(())
+}
diff --git a/core/startos/src/service/effects/image.rs b/core/startos/src/service/effects/image.rs
new file mode 100644
index 000000000..69c516ce5
--- /dev/null
+++ b/core/startos/src/service/effects/image.rs
@@ -0,0 +1,163 @@
+use std::ffi::OsString;
+use std::os::unix::process::CommandExt;
+use std::path::{Path, PathBuf};
+
+use models::ImageId;
+use rpc_toolkit::Context;
+use tokio::process::Command;
+
+use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
+use crate::rpc_continuations::Guid;
+use crate::service::effects::prelude::*;
+use crate::util::Invoke;
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser)]
+pub struct ChrootParams {
+    #[arg(short = 'e', long = "env")]
+    env: Option<PathBuf>,
+    #[arg(short = 'w', long = "workdir")]
+    workdir: Option<PathBuf>,
+    #[arg(short = 'u', long = "user")]
+    user: Option<String>,
+    path: PathBuf,
+    command: OsString,
+    args: Vec<OsString>,
+}
+pub fn chroot<C: Context>(
+    _: C,
+    ChrootParams {
+        env,
+        workdir,
+        user,
+        path,
+        command,
+        args,
+    }: ChrootParams,
+) -> Result<(), Error> {
+    let mut cmd = std::process::Command::new(command);
+    if let Some(env) = env {
+        for (k, v) in std::fs::read_to_string(env)?
+            .lines()
+            .map(|l| l.trim())
+            .filter_map(|l| l.split_once("="))
+        {
+            cmd.env(k, v);
+        }
+    }
+    nix::unistd::setsid().ok(); // https://stackoverflow.com/questions/25701333/os-setsid-operation-not-permitted
+    std::os::unix::fs::chroot(path)?;
+    if let Some(uid) = user.as_deref().and_then(|u| u.parse::<u32>().ok()) {
+        cmd.uid(uid);
+    } else if let Some(user) = user {
+        let (uid, gid) = std::fs::read_to_string("/etc/passwd")?
+            .lines()
+            .find_map(|l| {
+                let mut split = l.trim().split(":");
+                if user != split.next()? {
+                    return None;
+                }
+                split.next(); // throw away x
+                Some((split.next()?.parse().ok()?, split.next()?.parse().ok()?))
+                // uid gid
+            })
+            .or_not_found(lazy_format!("{user} in /etc/passwd"))?;
+        cmd.uid(uid);
+        cmd.gid(gid);
+    };
+    if let Some(workdir) = workdir {
+        cmd.current_dir(workdir);
+    }
+    cmd.args(args);
+    Err(cmd.exec().into())
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct DestroyOverlayedImageParams {
+    guid: Guid,
+}
+#[instrument(skip_all)]
+pub async fn destroy_overlayed_image(
+    context: EffectContext,
+    DestroyOverlayedImageParams { guid }: DestroyOverlayedImageParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    if context
+        .seed
+        .persistent_container
+        .overlays
+        .lock()
+        .await
+        .remove(&guid)
+        .is_none()
+    {
+        tracing::warn!("Could not find a guard to remove on the destroy overlayed image; assumming that it already is removed and will be skipping");
+    }
+    Ok(())
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct CreateOverlayedImageParams {
+    image_id: ImageId,
+}
+#[instrument(skip_all)]
+pub async fn create_overlayed_image(
+    context: EffectContext,
+    CreateOverlayedImageParams { image_id }: CreateOverlayedImageParams,
+) -> Result<(PathBuf, Guid), Error> {
+    let context = context.deref()?;
+    if let Some(image) = context
+        .seed
+        .persistent_container
+        .images
+        .get(&image_id)
+        .cloned()
+    {
+        let guid = Guid::new();
+        let rootfs_dir = context
+            .seed
+            .persistent_container
+            .lxc_container
+            .get()
+            .ok_or_else(|| {
+                Error::new(
+                    eyre!("PersistentContainer has been destroyed"),
+                    ErrorKind::Incoherent,
+                )
+            })?
+            .rootfs_dir();
+        let mountpoint = rootfs_dir
+            .join("media/startos/overlays")
+            .join(guid.as_ref());
+        tokio::fs::create_dir_all(&mountpoint).await?;
+        let container_mountpoint = Path::new("/").join(
+            mountpoint
+                .strip_prefix(rootfs_dir)
+                .with_kind(ErrorKind::Incoherent)?,
+        );
+        tracing::info!("Mounting overlay {guid} for {image_id}");
+        let guard = OverlayGuard::mount(image, &mountpoint).await?;
+        Command::new("chown")
+            .arg("100000:100000")
+            .arg(&mountpoint)
+            .invoke(ErrorKind::Filesystem)
+            .await?;
+        tracing::info!("Mounted overlay {guid} for {image_id}");
+        context
+            .seed
+            .persistent_container
+            .overlays
+            .lock()
+            .await
+            .insert(guid.clone(), guard);
+        Ok((container_mountpoint, guid))
+    } else {
+        Err(Error::new(
+            eyre!("image {image_id} not found in s9pk"),
+            ErrorKind::NotFound,
+        ))
+    }
+}
diff --git a/core/startos/src/service/effects/mod.rs b/core/startos/src/service/effects/mod.rs
new file mode 100644
index 000000000..91a12a4d1
--- /dev/null
+++ b/core/startos/src/service/effects/mod.rs
@@ -0,0 +1,174 @@
+use rpc_toolkit::{from_fn, from_fn_async, Context, HandlerExt, ParentHandler};
+
+use crate::echo;
+use crate::prelude::*;
+use crate::service::cli::ContainerCliContext;
+use crate::service::effects::context::EffectContext;
+
+mod action;
+pub mod callbacks;
+mod config;
+pub mod context;
+mod control;
+mod dependency;
+mod health;
+mod image;
+mod net;
+mod prelude;
+mod store;
+mod system;
+
+pub fn handler<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("gitInfo", from_fn(|_: C| crate::version::git_info()))
+        .subcommand(
+            "echo",
+            from_fn(echo::<EffectContext>).with_call_remote::<ContainerCliContext>(),
+        )
+        // action
+        .subcommand(
+            "executeAction",
+            from_fn_async(action::execute_action).no_cli(),
+        )
+        .subcommand(
+            "exportAction",
+            from_fn_async(action::export_action).no_cli(),
+        )
+        .subcommand(
+            "clearActions",
+            from_fn_async(action::clear_actions).no_cli(),
+        )
+        // callbacks
+        .subcommand(
+            "clearCallbacks",
+            from_fn(callbacks::clear_callbacks).no_cli(),
+        )
+        // config
+        .subcommand(
+            "getConfigured",
+            from_fn_async(config::get_configured).no_cli(),
+        )
+        .subcommand(
+            "setConfigured",
+            from_fn_async(config::set_configured)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        // control
+        .subcommand(
+            "restart",
+            from_fn_async(control::restart)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "shutdown",
+            from_fn_async(control::shutdown)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "setMainStatus",
+            from_fn_async(control::set_main_status)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        // dependency
+        .subcommand(
+            "setDependencies",
+            from_fn_async(dependency::set_dependencies)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "getDependencies",
+            from_fn_async(dependency::get_dependencies)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "checkDependencies",
+            from_fn_async(dependency::check_dependencies)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand("mount", from_fn_async(dependency::mount).no_cli())
+        .subcommand(
+            "getInstalledPackages",
+            from_fn_async(dependency::get_installed_packages).no_cli(),
+        )
+        .subcommand(
+            "exposeForDependents",
+            from_fn_async(dependency::expose_for_dependents).no_cli(),
+        )
+        // health
+        .subcommand("setHealth", from_fn_async(health::set_health).no_cli())
+        // image
+        .subcommand(
+            "chroot",
+            from_fn(image::chroot::<ContainerCliContext>).no_display(),
+        )
+        .subcommand(
+            "createOverlayedImage",
+            from_fn_async(image::create_overlayed_image)
+                .with_custom_display_fn(|_, (path, _)| Ok(println!("{}", path.display())))
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "destroyOverlayedImage",
+            from_fn_async(image::destroy_overlayed_image).no_cli(),
+        )
+        // net
+        .subcommand("bind", from_fn_async(net::bind::bind).no_cli())
+        .subcommand(
+            "getServicePortForward",
+            from_fn_async(net::bind::get_service_port_forward).no_cli(),
+        )
+        .subcommand(
+            "clearBindings",
+            from_fn_async(net::bind::clear_bindings).no_cli(),
+        )
+        .subcommand(
+            "getHostInfo",
+            from_fn_async(net::host::get_host_info).no_cli(),
+        )
+        .subcommand(
+            "getPrimaryUrl",
+            from_fn_async(net::host::get_primary_url).no_cli(),
+        )
+        .subcommand(
+            "getContainerIp",
+            from_fn_async(net::info::get_container_ip).no_cli(),
+        )
+        .subcommand(
+            "exportServiceInterface",
+            from_fn_async(net::interface::export_service_interface).no_cli(),
+        )
+        .subcommand(
+            "getServiceInterface",
+            from_fn_async(net::interface::get_service_interface).no_cli(),
+        )
+        .subcommand(
+            "listServiceInterfaces",
+            from_fn_async(net::interface::list_service_interfaces).no_cli(),
+        )
+        .subcommand(
+            "clearServiceInterfaces",
+            from_fn_async(net::interface::clear_service_interfaces).no_cli(),
+        )
+        .subcommand(
+            "getSslCertificate",
+            from_fn_async(net::ssl::get_ssl_certificate).no_cli(),
+        )
+        .subcommand("getSslKey", from_fn_async(net::ssl::get_ssl_key).no_cli())
+        // store
+        .subcommand("getStore", from_fn_async(store::get_store).no_cli())
+        .subcommand("setStore", from_fn_async(store::set_store).no_cli())
+        // system
+        .subcommand(
+            "getSystemSmtp",
+            from_fn_async(system::get_system_smtp).no_cli(),
+        )
+
+    // TODO Callbacks
+}
diff --git a/core/startos/src/service/effects/net/bind.rs b/core/startos/src/service/effects/net/bind.rs
new file mode 100644
index 000000000..ba273323a
--- /dev/null
+++ b/core/startos/src/service/effects/net/bind.rs
@@ -0,0 +1,56 @@
+use models::{HostId, PackageId};
+
+use crate::net::host::binding::{BindOptions, LanInfo};
+use crate::net::host::HostKind;
+use crate::service::effects::prelude::*;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct BindParams {
+    kind: HostKind,
+    id: HostId,
+    internal_port: u16,
+    #[serde(flatten)]
+    options: BindOptions,
+}
+pub async fn bind(
+    context: EffectContext,
+    BindParams {
+        kind,
+        id,
+        internal_port,
+        options,
+    }: BindParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let mut svc = context.seed.persistent_container.net_service.lock().await;
+    svc.bind(kind, id, internal_port, options).await
+}
+
+pub async fn clear_bindings(context: EffectContext) -> Result<(), Error> {
+    let context = context.deref()?;
+    let mut svc = context.seed.persistent_container.net_service.lock().await;
+    svc.clear_bindings().await?;
+    Ok(())
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct GetServicePortForwardParams {
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    host_id: HostId,
+    internal_port: u32,
+}
+pub async fn get_service_port_forward(
+    context: EffectContext,
+    data: GetServicePortForwardParams,
+) -> Result<LanInfo, Error> {
+    let internal_port = data.internal_port as u16;
+
+    let context = context.deref()?;
+    let net_service = context.seed.persistent_container.net_service.lock().await;
+    net_service.get_lan_port(data.host_id, internal_port)
+}
diff --git a/core/startos/src/service/effects/net/host.rs b/core/startos/src/service/effects/net/host.rs
new file mode 100644
index 000000000..d320e7fe9
--- /dev/null
+++ b/core/startos/src/service/effects/net/host.rs
@@ -0,0 +1,73 @@
+use models::{HostId, PackageId};
+
+use crate::net::host::address::HostAddress;
+use crate::net::host::Host;
+use crate::service::effects::callbacks::CallbackHandler;
+use crate::service::effects::prelude::*;
+use crate::service::rpc::CallbackId;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct GetPrimaryUrlParams {
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    host_id: HostId,
+    #[ts(optional)]
+    callback: Option<CallbackId>,
+}
+pub async fn get_primary_url(
+    context: EffectContext,
+    GetPrimaryUrlParams {
+        package_id,
+        host_id,
+        callback,
+    }: GetPrimaryUrlParams,
+) -> Result<Option<HostAddress>, Error> {
+    let context = context.deref()?;
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
+
+    Ok(None) // TODO
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetHostInfoParams {
+    host_id: HostId,
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    #[ts(optional)]
+    callback: Option<CallbackId>,
+}
+pub async fn get_host_info(
+    context: EffectContext,
+    GetHostInfoParams {
+        host_id,
+        package_id,
+        callback,
+    }: GetHostInfoParams,
+) -> Result<Option<Host>, Error> {
+    let context = context.deref()?;
+    let db = context.seed.ctx.db.peek().await;
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
+
+    let res = db
+        .as_public()
+        .as_package_data()
+        .as_idx(&package_id)
+        .and_then(|m| m.as_hosts().as_idx(&host_id))
+        .map(|m| m.de())
+        .transpose()?;
+
+    if let Some(callback) = callback {
+        let callback = callback.register(&context.seed.persistent_container);
+        context.seed.ctx.callbacks.add_get_host_info(
+            package_id,
+            host_id,
+            CallbackHandler::new(&context, callback),
+        );
+    }
+
+    Ok(res)
+}
diff --git a/core/startos/src/service/effects/net/info.rs b/core/startos/src/service/effects/net/info.rs
new file mode 100644
index 000000000..c33a1a81e
--- /dev/null
+++ b/core/startos/src/service/effects/net/info.rs
@@ -0,0 +1,9 @@
+use std::net::Ipv4Addr;
+
+use crate::service::effects::prelude::*;
+
+pub async fn get_container_ip(context: EffectContext) -> Result<Ipv4Addr, Error> {
+    let context = context.deref()?;
+    let net_service = context.seed.persistent_container.net_service.lock().await;
+    Ok(net_service.get_ip())
+}
diff --git a/core/startos/src/service/effects/net/interface.rs b/core/startos/src/service/effects/net/interface.rs
new file mode 100644
index 000000000..e636e9b57
--- /dev/null
+++ b/core/startos/src/service/effects/net/interface.rs
@@ -0,0 +1,188 @@
+use std::collections::BTreeMap;
+
+use imbl::vector;
+use models::{PackageId, ServiceInterfaceId};
+
+use crate::net::service_interface::{AddressInfo, ServiceInterface, ServiceInterfaceType};
+use crate::service::effects::callbacks::CallbackHandler;
+use crate::service::effects::prelude::*;
+use crate::service::rpc::CallbackId;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ExportServiceInterfaceParams {
+    id: ServiceInterfaceId,
+    name: String,
+    description: String,
+    has_primary: bool,
+    disabled: bool,
+    masked: bool,
+    address_info: AddressInfo,
+    r#type: ServiceInterfaceType,
+}
+pub async fn export_service_interface(
+    context: EffectContext,
+    ExportServiceInterfaceParams {
+        id,
+        name,
+        description,
+        has_primary,
+        disabled,
+        masked,
+        address_info,
+        r#type,
+    }: ExportServiceInterfaceParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.seed.id.clone();
+
+    let service_interface = ServiceInterface {
+        id: id.clone(),
+        name,
+        description,
+        has_primary,
+        disabled,
+        masked,
+        address_info,
+        interface_type: r#type,
+    };
+
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_service_interfaces_mut()
+                .insert(&id, &service_interface)?;
+            Ok(())
+        })
+        .await?;
+    if let Some(callbacks) = context
+        .seed
+        .ctx
+        .callbacks
+        .get_service_interface(&(package_id.clone(), id))
+    {
+        callbacks.call(vector![]).await?;
+    }
+    if let Some(callbacks) = context
+        .seed
+        .ctx
+        .callbacks
+        .list_service_interfaces(&package_id)
+    {
+        callbacks.call(vector![]).await?;
+    }
+
+    Ok(())
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetServiceInterfaceParams {
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    service_interface_id: ServiceInterfaceId,
+    #[ts(optional)]
+    callback: Option<CallbackId>,
+}
+pub async fn get_service_interface(
+    context: EffectContext,
+    GetServiceInterfaceParams {
+        package_id,
+        service_interface_id,
+        callback,
+    }: GetServiceInterfaceParams,
+) -> Result<Option<ServiceInterface>, Error> {
+    let context = context.deref()?;
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
+    let db = context.seed.ctx.db.peek().await;
+
+    let interface = db
+        .as_public()
+        .as_package_data()
+        .as_idx(&package_id)
+        .and_then(|m| m.as_service_interfaces().as_idx(&service_interface_id))
+        .map(|m| m.de())
+        .transpose()?;
+
+    if let Some(callback) = callback {
+        let callback = callback.register(&context.seed.persistent_container);
+        context.seed.ctx.callbacks.add_get_service_interface(
+            package_id,
+            service_interface_id,
+            CallbackHandler::new(&context, callback),
+        );
+    }
+
+    Ok(interface)
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ListServiceInterfacesParams {
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    #[ts(optional)]
+    callback: Option<CallbackId>,
+}
+pub async fn list_service_interfaces(
+    context: EffectContext,
+    ListServiceInterfacesParams {
+        package_id,
+        callback,
+    }: ListServiceInterfacesParams,
+) -> Result<BTreeMap<ServiceInterfaceId, ServiceInterface>, Error> {
+    let context = context.deref()?;
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
+
+    let res = context
+        .seed
+        .ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_package_data()
+        .into_idx(&package_id)
+        .map(|m| m.into_service_interfaces().de())
+        .transpose()?
+        .unwrap_or_default();
+
+    if let Some(callback) = callback {
+        let callback = callback.register(&context.seed.persistent_container);
+        context
+            .seed
+            .ctx
+            .callbacks
+            .add_list_service_interfaces(package_id, CallbackHandler::new(&context, callback));
+    }
+
+    Ok(res)
+}
+
+pub async fn clear_service_interfaces(context: EffectContext) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.seed.id.clone();
+
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_service_interfaces_mut()
+                .ser(&Default::default())
+        })
+        .await
+}
diff --git a/core/startos/src/service/effects/net/mod.rs b/core/startos/src/service/effects/net/mod.rs
new file mode 100644
index 000000000..cf13451a6
--- /dev/null
+++ b/core/startos/src/service/effects/net/mod.rs
@@ -0,0 +1,5 @@
+pub mod bind;
+pub mod host;
+pub mod info;
+pub mod interface;
+pub mod ssl;
diff --git a/core/startos/src/service/effects/net/ssl.rs b/core/startos/src/service/effects/net/ssl.rs
new file mode 100644
index 000000000..d37a2d241
--- /dev/null
+++ b/core/startos/src/service/effects/net/ssl.rs
@@ -0,0 +1,169 @@
+use std::collections::BTreeSet;
+
+use imbl_value::InternedString;
+use itertools::Itertools;
+use openssl::pkey::{PKey, Private};
+
+use crate::service::effects::callbacks::CallbackHandler;
+use crate::service::effects::prelude::*;
+use crate::service::rpc::CallbackId;
+use crate::util::serde::Pem;
+
+#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, TS, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub enum Algorithm {
+    Ecdsa,
+    Ed25519,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetSslCertificateParams {
+    #[ts(type = "string[]")]
+    hostnames: BTreeSet<InternedString>,
+    #[ts(optional)]
+    algorithm: Option<Algorithm>, //"ecdsa" | "ed25519"
+    #[ts(optional)]
+    callback: Option<CallbackId>,
+}
+pub async fn get_ssl_certificate(
+    ctx: EffectContext,
+    GetSslCertificateParams {
+        hostnames,
+        algorithm,
+        callback,
+    }: GetSslCertificateParams,
+) -> Result<Vec<String>, Error> {
+    let context = ctx.deref()?;
+    let algorithm = algorithm.unwrap_or(Algorithm::Ecdsa);
+
+    let cert = context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            let errfn = |h: &str| Error::new(eyre!("unknown hostname: {h}"), ErrorKind::NotFound);
+            let entries = db.as_public().as_package_data().as_entries()?;
+            let packages = entries.iter().map(|(k, _)| k).collect::<BTreeSet<_>>();
+            let allowed_hostnames = entries
+                .iter()
+                .map(|(_, m)| m.as_hosts().as_entries())
+                .flatten_ok()
+                .map_ok(|(_, m)| m.as_addresses().de())
+                .map(|a| a.and_then(|a| a))
+                .flatten_ok()
+                .map_ok(|a| InternedString::from_display(&a))
+                .try_collect::<_, BTreeSet<_>, _>()?;
+            for hostname in &hostnames {
+                if let Some(internal) = hostname
+                    .strip_suffix(".embassy")
+                    .or_else(|| hostname.strip_suffix(".startos"))
+                {
+                    if !packages.contains(internal) {
+                        return Err(errfn(&*hostname));
+                    }
+                } else {
+                    if !allowed_hostnames.contains(hostname) {
+                        return Err(errfn(&*hostname));
+                    }
+                }
+            }
+            db.as_private_mut()
+                .as_key_store_mut()
+                .as_local_certs_mut()
+                .cert_for(&hostnames)
+        })
+        .await?;
+    let fullchain = match algorithm {
+        Algorithm::Ecdsa => cert.fullchain_nistp256(),
+        Algorithm::Ed25519 => cert.fullchain_ed25519(),
+    };
+
+    let res = fullchain
+        .into_iter()
+        .map(|c| c.to_pem())
+        .map_ok(String::from_utf8)
+        .map(|a| Ok::<_, Error>(a??))
+        .try_collect()?;
+
+    if let Some(callback) = callback {
+        let callback = callback.register(&context.seed.persistent_container);
+        context.seed.ctx.callbacks.add_get_ssl_certificate(
+            ctx,
+            hostnames,
+            cert,
+            algorithm,
+            CallbackHandler::new(&context, callback),
+        );
+    }
+
+    Ok(res)
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetSslKeyParams {
+    #[ts(type = "string[]")]
+    hostnames: BTreeSet<InternedString>,
+    #[ts(optional)]
+    algorithm: Option<Algorithm>, //"ecdsa" | "ed25519"
+}
+pub async fn get_ssl_key(
+    context: EffectContext,
+    GetSslKeyParams {
+        hostnames,
+        algorithm,
+    }: GetSslKeyParams,
+) -> Result<Pem<PKey<Private>>, Error> {
+    let context = context.deref()?;
+    let package_id = &context.seed.id;
+    let algorithm = algorithm.unwrap_or(Algorithm::Ecdsa);
+
+    let cert = context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            let errfn = |h: &str| Error::new(eyre!("unknown hostname: {h}"), ErrorKind::NotFound);
+            let allowed_hostnames = db
+                .as_public()
+                .as_package_data()
+                .as_idx(package_id)
+                .into_iter()
+                .map(|m| m.as_hosts().as_entries())
+                .flatten_ok()
+                .map_ok(|(_, m)| m.as_addresses().de())
+                .map(|a| a.and_then(|a| a))
+                .flatten_ok()
+                .map_ok(|a| InternedString::from_display(&a))
+                .try_collect::<_, BTreeSet<_>, _>()?;
+            for hostname in &hostnames {
+                if let Some(internal) = hostname
+                    .strip_suffix(".embassy")
+                    .or_else(|| hostname.strip_suffix(".startos"))
+                {
+                    if internal != &**package_id {
+                        return Err(errfn(&*hostname));
+                    }
+                } else {
+                    if !allowed_hostnames.contains(hostname) {
+                        return Err(errfn(&*hostname));
+                    }
+                }
+            }
+            db.as_private_mut()
+                .as_key_store_mut()
+                .as_local_certs_mut()
+                .cert_for(&hostnames)
+        })
+        .await?;
+    let key = match algorithm {
+        Algorithm::Ecdsa => cert.leaf.keys.nistp256,
+        Algorithm::Ed25519 => cert.leaf.keys.ed25519,
+    };
+
+    Ok(Pem(key))
+}
diff --git a/core/startos/src/service/effects/prelude.rs b/core/startos/src/service/effects/prelude.rs
new file mode 100644
index 000000000..2dc848c0c
--- /dev/null
+++ b/core/startos/src/service/effects/prelude.rs
@@ -0,0 +1,16 @@
+pub use clap::Parser;
+pub use serde::{Deserialize, Serialize};
+pub use ts_rs::TS;
+
+pub use crate::prelude::*;
+use crate::rpc_continuations::Guid;
+pub(super) use crate::service::effects::context::EffectContext;
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct ProcedureId {
+    #[serde(default)]
+    #[arg(default_value_t, long)]
+    pub procedure_id: Guid,
+}
diff --git a/core/startos/src/service/effects/store.rs b/core/startos/src/service/effects/store.rs
new file mode 100644
index 000000000..ab4484ab6
--- /dev/null
+++ b/core/startos/src/service/effects/store.rs
@@ -0,0 +1,93 @@
+use imbl::vector;
+use imbl_value::json;
+use models::PackageId;
+use patch_db::json_ptr::JsonPointer;
+
+use crate::service::effects::callbacks::CallbackHandler;
+use crate::service::effects::prelude::*;
+use crate::service::rpc::CallbackId;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetStoreParams {
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    #[ts(type = "string")]
+    path: JsonPointer,
+    #[ts(optional)]
+    callback: Option<CallbackId>,
+}
+pub async fn get_store(
+    context: EffectContext,
+    GetStoreParams {
+        package_id,
+        path,
+        callback,
+    }: GetStoreParams,
+) -> Result<Value, Error> {
+    let context = context.deref()?;
+    let peeked = context.seed.ctx.db.peek().await;
+    let package_id = package_id.unwrap_or(context.seed.id.clone());
+    let value = peeked
+        .as_private()
+        .as_package_stores()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?
+        .de()?;
+
+    if let Some(callback) = callback {
+        let callback = callback.register(&context.seed.persistent_container);
+        context.seed.ctx.callbacks.add_get_store(
+            package_id,
+            path.clone(),
+            CallbackHandler::new(&context, callback),
+        );
+    }
+
+    Ok(path
+        .get(&value)
+        .ok_or_else(|| Error::new(eyre!("Did not find value at path"), ErrorKind::NotFound))?
+        .clone())
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetStoreParams {
+    #[ts(type = "any")]
+    value: Value,
+    #[ts(type = "string")]
+    path: JsonPointer,
+}
+pub async fn set_store(
+    context: EffectContext,
+    SetStoreParams { value, path }: SetStoreParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = &context.seed.id;
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            let model = db
+                .as_private_mut()
+                .as_package_stores_mut()
+                .upsert(package_id, || Ok(json!({})))?;
+            let mut model_value = model.de()?;
+            if model_value.is_null() {
+                model_value = json!({});
+            }
+            path.set(&mut model_value, value, true)
+                .with_kind(ErrorKind::ParseDbField)?;
+            model.ser(&model_value)
+        })
+        .await?;
+
+    if let Some(callbacks) = context.seed.ctx.callbacks.get_store(package_id, &path) {
+        callbacks.call(vector![]).await?;
+    }
+
+    Ok(())
+}
diff --git a/core/startos/src/service/effects/system.rs b/core/startos/src/service/effects/system.rs
new file mode 100644
index 000000000..abf0a33c6
--- /dev/null
+++ b/core/startos/src/service/effects/system.rs
@@ -0,0 +1,39 @@
+use crate::service::effects::callbacks::CallbackHandler;
+use crate::service::effects::prelude::*;
+use crate::service::rpc::CallbackId;
+use crate::system::SmtpValue;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct GetSystemSmtpParams {
+    #[arg(skip)]
+    callback: Option<CallbackId>,
+}
+pub async fn get_system_smtp(
+    context: EffectContext,
+    GetSystemSmtpParams { callback }: GetSystemSmtpParams,
+) -> Result<Option<SmtpValue>, Error> {
+    let context = context.deref()?;
+    let res = context
+        .seed
+        .ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_server_info()
+        .into_smtp()
+        .de()?;
+
+    if let Some(callback) = callback {
+        let callback = callback.register(&context.seed.persistent_container);
+        context
+            .seed
+            .ctx
+            .callbacks
+            .add_get_system_smtp(CallbackHandler::new(&context, callback));
+    }
+
+    Ok(res)
+}
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 9103b70a1..efaa28d4e 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -27,10 +27,7 @@ use crate::progress::{NamedProgress, Progress};
 use crate::rpc_continuations::Guid;
 use crate::s9pk::S9pk;
 use crate::service::service_map::InstallProgressHandles;
-use crate::service::transition::TransitionKind;
 use crate::status::health_check::HealthCheckResult;
-use crate::status::MainStatus;
-use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::concurrent::ConcurrentActor;
 use crate::util::actor::Actor;
 use crate::util::io::create_file;
@@ -43,11 +40,11 @@ pub mod cli;
 mod config;
 mod control;
 mod dependencies;
+pub mod effects;
 pub mod persistent_container;
 mod properties;
 mod rpc;
 mod service_actor;
-pub mod service_effect_handler;
 pub mod service_map;
 mod start_stop;
 mod transition;
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index e8c504a92..62d3b0975 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 use std::path::Path;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
@@ -6,6 +6,7 @@ use std::time::Duration;
 use futures::future::ready;
 use futures::{Future, FutureExt};
 use helpers::NonDetachingJoinHandle;
+use imbl::Vector;
 use models::{ImageId, ProcedureName, VolumeId};
 use rpc_toolkit::{Empty, Server, ShutdownHandle};
 use serde::de::DeserializeOwned;
@@ -13,8 +14,6 @@ use tokio::process::Command;
 use tokio::sync::{oneshot, watch, Mutex, OnceCell};
 use tracing::instrument;
 
-use super::service_effect_handler::{service_effect_handler, EffectContext};
-use super::transition::{TransitionKind, TransitionState};
 use crate::context::RpcContext;
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
@@ -28,7 +27,11 @@ use crate::prelude::*;
 use crate::rpc_continuations::Guid;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
+use crate::service::effects::context::EffectContext;
+use crate::service::effects::handler;
+use crate::service::rpc::{CallbackHandle, CallbackId, CallbackParams};
 use crate::service::start_stop::StartStop;
+use crate::service::transition::{TransitionKind, TransitionState};
 use crate::service::{rpc, RunningStatus, Service};
 use crate::util::io::create_file;
 use crate::util::rpc_client::UnixRpcClient;
@@ -42,6 +45,8 @@ const RPC_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
 pub struct ServiceState {
     // This contains the start time and health check information for when the service is running. Note: Will be overwritting to the db,
     pub(super) running_status: Option<RunningStatus>,
+    // This tracks references to callbacks registered by the running service:
+    pub(super) callbacks: BTreeSet<Arc<CallbackId>>,
     /// Setting this value causes the service actor to try to bring the service to the specified state. This is done in the background job created in ServiceActor::init
     pub(super) desired_state: StartStop,
     /// Override the current desired state for the service during a transition (this is protected by a guard that sets this value to null on drop)
@@ -61,6 +66,7 @@ impl ServiceState {
     pub fn new(desired_state: StartStop) -> Self {
         Self {
             running_status: Default::default(),
+            callbacks: Default::default(),
             temp_desired_state: Default::default(),
             transition_state: Default::default(),
             desired_state,
@@ -308,10 +314,7 @@ impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn init(&self, seed: Weak<Service>) -> Result<(), Error> {
         let socket_server_context = EffectContext::new(seed);
-        let server = Server::new(
-            move || ready(Ok(socket_server_context.clone())),
-            service_effect_handler(),
-        );
+        let server = Server::new(move || ready(Ok(socket_server_context.clone())), handler());
         let path = self
             .lxc_container
             .get()
@@ -430,21 +433,13 @@ impl PersistentContainer {
 
     #[instrument(skip_all)]
     pub async fn start(&self) -> Result<(), Error> {
-        self.execute(
-            Guid::new(),
-            ProcedureName::StartMain,
-            Value::Null,
-            Some(Duration::from_secs(5)), // TODO
-        )
-        .await?;
+        self.rpc_client.request(rpc::Start, Empty {}).await?;
         Ok(())
     }
 
     #[instrument(skip_all)]
     pub async fn stop(&self) -> Result<(), Error> {
-        let timeout: Option<crate::util::serde::Duration> = self
-            .execute(Guid::new(), ProcedureName::StopMain, Value::Null, None)
-            .await?;
+        self.rpc_client.request(rpc::Stop, Empty {}).await?;
         Ok(())
     }
 
@@ -480,6 +475,19 @@ impl PersistentContainer {
             .and_then(from_value)
     }
 
+    #[instrument(skip_all)]
+    pub async fn callback(&self, handle: CallbackHandle, args: Vector<Value>) -> Result<(), Error> {
+        let mut params = None;
+        self.state.send_if_modified(|s| {
+            params = handle.params(&mut s.callbacks, args);
+            params.is_some()
+        });
+        if let Some(params) = params {
+            self._callback(params).await?;
+        }
+        Ok(())
+    }
+
     #[instrument(skip_all)]
     async fn _execute(
         &self,
@@ -523,6 +531,12 @@ impl PersistentContainer {
             fut.await?
         })
     }
+
+    #[instrument(skip_all)]
+    async fn _callback(&self, params: CallbackParams) -> Result<(), Error> {
+        self.rpc_client.notify(rpc::Callback, params).await?;
+        Ok(())
+    }
 }
 
 impl Drop for PersistentContainer {
diff --git a/core/startos/src/service/rpc.rs b/core/startos/src/service/rpc.rs
index eff44b2cf..25d8fb067 100644
--- a/core/startos/src/service/rpc.rs
+++ b/core/startos/src/service/rpc.rs
@@ -1,5 +1,8 @@
+use std::collections::BTreeSet;
+use std::sync::{Arc, Weak};
 use std::time::Duration;
 
+use imbl::Vector;
 use imbl_value::Value;
 use models::ProcedureName;
 use rpc_toolkit::yajrc::RpcMethod;
@@ -8,6 +11,8 @@ use ts_rs::TS;
 
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
+use crate::service::persistent_container::PersistentContainer;
+use crate::util::Never;
 
 #[derive(Clone)]
 pub struct Init;
@@ -27,6 +32,42 @@ impl serde::Serialize for Init {
     }
 }
 
+#[derive(Clone)]
+pub struct Start;
+impl RpcMethod for Start {
+    type Params = Empty;
+    type Response = ();
+    fn as_str<'a>(&'a self) -> &'a str {
+        "start"
+    }
+}
+impl serde::Serialize for Start {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
+
+#[derive(Clone)]
+pub struct Stop;
+impl RpcMethod for Stop {
+    type Params = Empty;
+    type Response = ();
+    fn as_str<'a>(&'a self) -> &'a str {
+        "stop"
+    }
+}
+impl serde::Serialize for Stop {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
+
 #[derive(Clone)]
 pub struct Exit;
 impl RpcMethod for Exit {
@@ -104,3 +145,74 @@ impl serde::Serialize for Sandbox {
         serializer.serialize_str(self.as_str())
     }
 }
+
+#[derive(
+    Clone, Copy, Debug, serde::Deserialize, serde::Serialize, TS, PartialEq, Eq, PartialOrd, Ord,
+)]
+#[ts(type = "number")]
+pub struct CallbackId(u64);
+impl CallbackId {
+    pub fn register(self, container: &PersistentContainer) -> CallbackHandle {
+        let this = Arc::new(self);
+        let res = Arc::downgrade(&this);
+        container
+            .state
+            .send_if_modified(|s| s.callbacks.insert(this));
+        CallbackHandle(res)
+    }
+}
+
+pub struct CallbackHandle(Weak<CallbackId>);
+impl CallbackHandle {
+    pub fn is_active(&self) -> bool {
+        self.0.strong_count() > 0
+    }
+    pub fn params(
+        self,
+        registered: &mut BTreeSet<Arc<CallbackId>>,
+        args: Vector<Value>,
+    ) -> Option<CallbackParams> {
+        if let Some(id) = self.0.upgrade() {
+            if let Some(strong) = registered.get(&id) {
+                if Arc::ptr_eq(strong, &id) {
+                    registered.remove(&id);
+                    return Some(CallbackParams::new(&*id, args));
+                }
+            }
+        }
+        None
+    }
+    pub fn take(&mut self) -> Self {
+        Self(std::mem::take(&mut self.0))
+    }
+}
+
+#[derive(Clone, serde::Deserialize, serde::Serialize, TS)]
+pub struct CallbackParams {
+    id: u64,
+    #[ts(type = "any[]")]
+    args: Vector<Value>,
+}
+impl CallbackParams {
+    fn new(id: &CallbackId, args: Vector<Value>) -> Self {
+        Self { id: id.0, args }
+    }
+}
+
+#[derive(Clone)]
+pub struct Callback;
+impl RpcMethod for Callback {
+    type Params = CallbackParams;
+    type Response = Never;
+    fn as_str<'a>(&'a self) -> &'a str {
+        "callback"
+    }
+}
+impl serde::Serialize for Callback {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs
deleted file mode 100644
index 79ca4dc42..000000000
--- a/core/startos/src/service/service_effect_handler.rs
+++ /dev/null
@@ -1,1431 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::ffi::OsString;
-use std::net::Ipv4Addr;
-use std::os::unix::process::CommandExt;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-use std::sync::{Arc, Weak};
-
-use clap::builder::ValueParserFactory;
-use clap::Parser;
-use exver::VersionRange;
-use imbl_value::json;
-use itertools::Itertools;
-use models::{
-    ActionId, DataUrl, HealthCheckId, HostId, ImageId, PackageId, ServiceInterfaceId, VolumeId,
-};
-use patch_db::json_ptr::JsonPointer;
-use rpc_toolkit::{from_fn, from_fn_async, Context, Empty, HandlerExt, ParentHandler};
-use serde::{Deserialize, Serialize};
-use tokio::process::Command;
-use ts_rs::TS;
-use url::Url;
-
-use crate::db::model::package::{
-    ActionMetadata, CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind,
-    ManifestPreference,
-};
-use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
-use crate::echo;
-use crate::net::host::address::HostAddress;
-use crate::net::host::binding::{BindOptions, LanInfo};
-use crate::net::host::{Host, HostKind};
-use crate::net::service_interface::{AddressInfo, ServiceInterface, ServiceInterfaceType};
-use crate::prelude::*;
-use crate::rpc_continuations::Guid;
-use crate::s9pk::merkle_archive::source::http::HttpSource;
-use crate::s9pk::rpc::SKIP_ENV;
-use crate::s9pk::S9pk;
-use crate::service::cli::ContainerCliContext;
-use crate::service::Service;
-use crate::status::health_check::HealthCheckResult;
-use crate::status::MainStatus;
-use crate::util::clap::FromStrParser;
-use crate::util::Invoke;
-
-#[derive(Clone)]
-pub(super) struct EffectContext(Weak<Service>);
-impl EffectContext {
-    pub fn new(service: Weak<Service>) -> Self {
-        Self(service)
-    }
-}
-impl Context for EffectContext {}
-impl EffectContext {
-    fn deref(&self) -> Result<Arc<Service>, Error> {
-        if let Some(seed) = Weak::upgrade(&self.0) {
-            Ok(seed)
-        } else {
-            Err(Error::new(
-                eyre!("Service has already been destroyed"),
-                ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-}
-
-pub fn service_effect_handler<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new()
-        .subcommand("gitInfo", from_fn(|_: C| crate::version::git_info()))
-        .subcommand(
-            "echo",
-            from_fn(echo::<EffectContext>).with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "chroot",
-            from_fn(chroot::<ContainerCliContext>).no_display(),
-        )
-        .subcommand("exists", from_fn_async(exists).no_cli())
-        .subcommand("executeAction", from_fn_async(execute_action).no_cli())
-        .subcommand("getConfigured", from_fn_async(get_configured).no_cli())
-        .subcommand(
-            "stopped",
-            from_fn_async(stopped)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "running",
-            from_fn_async(running)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "restart",
-            from_fn_async(restart)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "shutdown",
-            from_fn_async(shutdown)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "setConfigured",
-            from_fn_async(set_configured)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "setMainStatus",
-            from_fn_async(set_main_status).with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand("setHealth", from_fn_async(set_health).no_cli())
-        .subcommand("getStore", from_fn_async(get_store).no_cli())
-        .subcommand("setStore", from_fn_async(set_store).no_cli())
-        .subcommand(
-            "exposeForDependents",
-            from_fn_async(expose_for_dependents).no_cli(),
-        )
-        .subcommand(
-            "createOverlayedImage",
-            from_fn_async(create_overlayed_image)
-                .with_custom_display_fn(|_, (path, _)| Ok(println!("{}", path.display())))
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "destroyOverlayedImage",
-            from_fn_async(destroy_overlayed_image).no_cli(),
-        )
-        .subcommand(
-            "getSslCertificate",
-            from_fn_async(get_ssl_certificate).no_cli(),
-        )
-        .subcommand("getSslKey", from_fn_async(get_ssl_key).no_cli())
-        .subcommand(
-            "getServiceInterface",
-            from_fn_async(get_service_interface).no_cli(),
-        )
-        .subcommand("clearBindings", from_fn_async(clear_bindings).no_cli())
-        .subcommand("bind", from_fn_async(bind).no_cli())
-        .subcommand("getHostInfo", from_fn_async(get_host_info).no_cli())
-        .subcommand(
-            "setDependencies",
-            from_fn_async(set_dependencies)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "getDependencies",
-            from_fn_async(get_dependencies)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "checkDependencies",
-            from_fn_async(check_dependencies)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand("setSystemSmtp", from_fn_async(set_system_smtp).no_cli())
-        .subcommand("getSystemSmtp", from_fn_async(get_system_smtp).no_cli())
-        .subcommand("getContainerIp", from_fn_async(get_container_ip).no_cli())
-        .subcommand(
-            "getServicePortForward",
-            from_fn_async(get_service_port_forward).no_cli(),
-        )
-        .subcommand(
-            "clearServiceInterfaces",
-            from_fn_async(clear_network_interfaces).no_cli(),
-        )
-        .subcommand(
-            "exportServiceInterface",
-            from_fn_async(export_service_interface).no_cli(),
-        )
-        .subcommand("getPrimaryUrl", from_fn_async(get_primary_url).no_cli())
-        .subcommand(
-            "listServiceInterfaces",
-            from_fn_async(list_service_interfaces).no_cli(),
-        )
-        .subcommand("removeAddress", from_fn_async(remove_address).no_cli())
-        .subcommand("exportAction", from_fn_async(export_action).no_cli())
-        .subcommand("removeAction", from_fn_async(remove_action).no_cli())
-        .subcommand("mount", from_fn_async(mount).no_cli())
-
-    // TODO Callbacks
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct GetSystemSmtpParams {
-    callback: Callback,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct SetSystemSmtpParams {
-    smtp: String,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct GetServicePortForwardParams {
-    #[ts(type = "string | null")]
-    package_id: Option<PackageId>,
-    internal_port: u32,
-    host_id: HostId,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ExportServiceInterfaceParams {
-    id: ServiceInterfaceId,
-    name: String,
-    description: String,
-    has_primary: bool,
-    disabled: bool,
-    masked: bool,
-    address_info: AddressInfo,
-    r#type: ServiceInterfaceType,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct GetPrimaryUrlParams {
-    #[ts(type = "string | null")]
-    package_id: Option<PackageId>,
-    service_interface_id: ServiceInterfaceId,
-    callback: Callback,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ListServiceInterfacesParams {
-    #[ts(type = "string | null")]
-    package_id: Option<PackageId>,
-    callback: Callback,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct RemoveAddressParams {
-    id: ServiceInterfaceId,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ExportActionParams {
-    #[ts(type = "string")]
-    id: ActionId,
-    metadata: ActionMetadata,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct RemoveActionParams {
-    #[ts(type = "string")]
-    id: ActionId,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct MountTarget {
-    #[ts(type = "string")]
-    package_id: PackageId,
-    #[ts(type = "string")]
-    volume_id: VolumeId,
-    subpath: Option<PathBuf>,
-    readonly: bool,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct MountParams {
-    location: String,
-    target: MountTarget,
-}
-async fn set_system_smtp(context: EffectContext, data: SetSystemSmtpParams) -> Result<(), Error> {
-    let context = context.deref()?;
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            let model = db.as_public_mut().as_server_info_mut().as_smtp_mut();
-            model.ser(&mut Some(data.smtp))
-        })
-        .await
-}
-async fn get_system_smtp(
-    context: EffectContext,
-    data: GetSystemSmtpParams,
-) -> Result<String, Error> {
-    let context = context.deref()?;
-    let res = context
-        .seed
-        .ctx
-        .db
-        .peek()
-        .await
-        .into_public()
-        .into_server_info()
-        .into_smtp()
-        .de()?;
-
-    match res {
-        Some(smtp) => Ok(smtp),
-        None => Err(Error::new(
-            eyre!("SMTP not found"),
-            crate::ErrorKind::NotFound,
-        )),
-    }
-}
-async fn get_container_ip(context: EffectContext, _: Empty) -> Result<Ipv4Addr, Error> {
-    let context = context.deref()?;
-    let net_service = context.seed.persistent_container.net_service.lock().await;
-    Ok(net_service.get_ip())
-}
-async fn get_service_port_forward(
-    context: EffectContext,
-    data: GetServicePortForwardParams,
-) -> Result<LanInfo, Error> {
-    let internal_port = data.internal_port as u16;
-
-    let context = context.deref()?;
-    let net_service = context.seed.persistent_container.net_service.lock().await;
-    net_service.get_ext_port(data.host_id, internal_port)
-}
-async fn clear_network_interfaces(context: EffectContext, _: Empty) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = context.seed.id.clone();
-
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            let model = db
-                .as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package_id)
-                .or_not_found(&package_id)?
-                .as_service_interfaces_mut();
-            let mut new_map = BTreeMap::new();
-            model.ser(&mut new_map)
-        })
-        .await
-}
-async fn export_service_interface(
-    context: EffectContext,
-    ExportServiceInterfaceParams {
-        id,
-        name,
-        description,
-        has_primary,
-        disabled,
-        masked,
-        address_info,
-        r#type,
-    }: ExportServiceInterfaceParams,
-) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = context.seed.id.clone();
-
-    let service_interface = ServiceInterface {
-        id: id.clone(),
-        name,
-        description,
-        has_primary,
-        disabled,
-        masked,
-        address_info,
-        interface_type: r#type,
-    };
-    let svc_interface_with_host_info = service_interface;
-
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package_id)
-                .or_not_found(&package_id)?
-                .as_service_interfaces_mut()
-                .insert(&id, &svc_interface_with_host_info)?;
-            Ok(())
-        })
-        .await?;
-    Ok(())
-}
-async fn get_primary_url(
-    context: EffectContext,
-    GetPrimaryUrlParams {
-        package_id,
-        service_interface_id,
-        callback,
-    }: GetPrimaryUrlParams,
-) -> Result<Option<HostAddress>, Error> {
-    let context = context.deref()?;
-    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
-
-    Ok(None) // TODO
-}
-async fn list_service_interfaces(
-    context: EffectContext,
-    ListServiceInterfacesParams {
-        package_id,
-        callback,
-    }: ListServiceInterfacesParams,
-) -> Result<BTreeMap<ServiceInterfaceId, ServiceInterface>, Error> {
-    let context = context.deref()?;
-    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
-
-    context
-        .seed
-        .ctx
-        .db
-        .peek()
-        .await
-        .into_public()
-        .into_package_data()
-        .into_idx(&package_id)
-        .or_not_found(&package_id)?
-        .into_service_interfaces()
-        .de()
-}
-async fn remove_address(context: EffectContext, data: RemoveAddressParams) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = context.seed.id.clone();
-
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            let model = db
-                .as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package_id)
-                .or_not_found(&package_id)?
-                .as_service_interfaces_mut();
-            model.remove(&data.id)
-        })
-        .await?;
-    Ok(())
-}
-async fn export_action(context: EffectContext, data: ExportActionParams) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = context.seed.id.clone();
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            let model = db
-                .as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package_id)
-                .or_not_found(&package_id)?
-                .as_actions_mut();
-            let mut value = model.de()?;
-            value
-                .insert(data.id, data.metadata)
-                .map(|_| ())
-                .unwrap_or_default();
-            model.ser(&value)
-        })
-        .await?;
-    Ok(())
-}
-async fn remove_action(context: EffectContext, data: RemoveActionParams) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = context.seed.id.clone();
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            let model = db
-                .as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package_id)
-                .or_not_found(&package_id)?
-                .as_actions_mut();
-            let mut value = model.de()?;
-            value.remove(&data.id).map(|_| ()).unwrap_or_default();
-            model.ser(&value)
-        })
-        .await?;
-    Ok(())
-}
-async fn mount(context: EffectContext, data: MountParams) -> Result<Value, Error> {
-    // TODO
-    todo!()
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[ts(export)]
-struct Callback(#[ts(type = "() => void")] i64);
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct GetHostInfoParams {
-    host_id: HostId,
-    #[ts(type = "string | null")]
-    package_id: Option<PackageId>,
-    callback: Callback,
-}
-async fn get_host_info(
-    context: EffectContext,
-    GetHostInfoParams {
-        callback,
-        package_id,
-        host_id,
-    }: GetHostInfoParams,
-) -> Result<Host, Error> {
-    let context = context.deref()?;
-    let db = context.seed.ctx.db.peek().await;
-    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
-
-    db.as_public()
-        .as_package_data()
-        .as_idx(&package_id)
-        .or_not_found(&package_id)?
-        .as_hosts()
-        .as_idx(&host_id)
-        .or_not_found(&host_id)?
-        .de()
-}
-
-async fn clear_bindings(context: EffectContext, _: Empty) -> Result<(), Error> {
-    let context = context.deref()?;
-    let mut svc = context.seed.persistent_container.net_service.lock().await;
-    svc.clear_bindings().await?;
-    Ok(())
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct BindParams {
-    kind: HostKind,
-    id: HostId,
-    internal_port: u16,
-    #[serde(flatten)]
-    options: BindOptions,
-}
-async fn bind(context: EffectContext, bind_params: Value) -> Result<(), Error> {
-    let BindParams {
-        kind,
-        id,
-        internal_port,
-        options,
-    } = from_value(bind_params)?;
-    let context = context.deref()?;
-    let mut svc = context.seed.persistent_container.net_service.lock().await;
-    svc.bind(kind, id, internal_port, options).await
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct GetServiceInterfaceParams {
-    #[ts(type = "string | null")]
-    package_id: Option<PackageId>,
-    service_interface_id: ServiceInterfaceId,
-    callback: Callback,
-}
-
-async fn get_service_interface(
-    context: EffectContext,
-    GetServiceInterfaceParams {
-        callback,
-        package_id,
-        service_interface_id,
-    }: GetServiceInterfaceParams,
-) -> Result<ServiceInterface, Error> {
-    let context = context.deref()?;
-    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
-    let db = context.seed.ctx.db.peek().await;
-
-    let interface = db
-        .as_public()
-        .as_package_data()
-        .as_idx(&package_id)
-        .or_not_found(&package_id)?
-        .as_service_interfaces()
-        .as_idx(&service_interface_id)
-        .or_not_found(&service_interface_id)?
-        .de()?;
-    Ok(interface)
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct ChrootParams {
-    #[arg(short = 'e', long = "env")]
-    env: Option<PathBuf>,
-    #[arg(short = 'w', long = "workdir")]
-    workdir: Option<PathBuf>,
-    #[arg(short = 'u', long = "user")]
-    user: Option<String>,
-    path: PathBuf,
-    #[ts(type = "string")]
-    command: OsString,
-    #[ts(type = "string[]")]
-    args: Vec<OsString>,
-}
-fn chroot<C: Context>(
-    _: C,
-    ChrootParams {
-        env,
-        workdir,
-        user,
-        path,
-        command,
-        args,
-    }: ChrootParams,
-) -> Result<(), Error> {
-    let mut cmd = std::process::Command::new(command);
-    if let Some(env) = env {
-        for (k, v) in std::fs::read_to_string(env)?
-            .lines()
-            .map(|l| l.trim())
-            .filter_map(|l| l.split_once("="))
-            .filter(|(k, _)| !SKIP_ENV.contains(&k))
-        {
-            cmd.env(k, v);
-        }
-    }
-    nix::unistd::setsid().ok(); // https://stackoverflow.com/questions/25701333/os-setsid-operation-not-permitted
-    std::os::unix::fs::chroot(path)?;
-    if let Some(uid) = user.as_deref().and_then(|u| u.parse::<u32>().ok()) {
-        cmd.uid(uid);
-    } else if let Some(user) = user {
-        let (uid, gid) = std::fs::read_to_string("/etc/passwd")?
-            .lines()
-            .find_map(|l| {
-                let mut split = l.trim().split(":");
-                if user != split.next()? {
-                    return None;
-                }
-                split.next(); // throw away x
-                Some((split.next()?.parse().ok()?, split.next()?.parse().ok()?))
-                // uid gid
-            })
-            .or_not_found(lazy_format!("{user} in /etc/passwd"))?;
-        cmd.uid(uid);
-        cmd.gid(gid);
-    };
-    if let Some(workdir) = workdir {
-        cmd.current_dir(workdir);
-    }
-    cmd.args(args);
-    Err(cmd.exec().into())
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-enum Algorithm {
-    Ecdsa,
-    Ed25519,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct GetSslCertificateParams {
-    package_id: Option<String>,
-    host_id: String,
-    algorithm: Option<Algorithm>, //"ecdsa" | "ed25519"
-}
-
-async fn get_ssl_certificate(
-    context: EffectContext,
-    GetSslCertificateParams {
-        package_id,
-        algorithm,
-        host_id,
-    }: GetSslCertificateParams,
-) -> Result<Value, Error> {
-    // TODO
-    let fake = include_str!("./fake.cert.pem");
-    Ok(json!([fake, fake, fake]))
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct GetSslKeyParams {
-    package_id: Option<String>,
-    host_id: String,
-    algorithm: Option<Algorithm>,
-}
-
-async fn get_ssl_key(
-    context: EffectContext,
-    GetSslKeyParams {
-        package_id,
-        host_id,
-        algorithm,
-    }: GetSslKeyParams,
-) -> Result<Value, Error> {
-    // TODO
-    let fake = include_str!("./fake.cert.key");
-    Ok(json!(fake))
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct GetStoreParams {
-    #[ts(type = "string | null")]
-    package_id: Option<PackageId>,
-    #[ts(type = "string")]
-    path: JsonPointer,
-}
-
-async fn get_store(
-    context: EffectContext,
-    GetStoreParams { package_id, path }: GetStoreParams,
-) -> Result<Value, Error> {
-    let context = context.deref()?;
-    let peeked = context.seed.ctx.db.peek().await;
-    let package_id = package_id.unwrap_or(context.seed.id.clone());
-    let value = peeked
-        .as_private()
-        .as_package_stores()
-        .as_idx(&package_id)
-        .or_not_found(&package_id)?
-        .de()?;
-
-    Ok(path
-        .get(&value)
-        .ok_or_else(|| Error::new(eyre!("Did not find value at path"), ErrorKind::NotFound))?
-        .clone())
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct SetStoreParams {
-    #[ts(type = "any")]
-    value: Value,
-    #[ts(type = "string")]
-    path: JsonPointer,
-}
-
-async fn set_store(
-    context: EffectContext,
-    SetStoreParams { value, path }: SetStoreParams,
-) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = context.seed.id.clone();
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            let model = db
-                .as_private_mut()
-                .as_package_stores_mut()
-                .upsert(&package_id, || Ok(json!({})))?;
-            let mut model_value = model.de()?;
-            if model_value.is_null() {
-                model_value = json!({});
-            }
-            path.set(&mut model_value, value, true)
-                .with_kind(ErrorKind::ParseDbField)?;
-            model.ser(&model_value)
-        })
-        .await?;
-    Ok(())
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct ExposeForDependentsParams {
-    #[ts(type = "string[]")]
-    paths: Vec<JsonPointer>,
-}
-
-async fn expose_for_dependents(
-    context: EffectContext,
-    ExposeForDependentsParams { paths }: ExposeForDependentsParams,
-) -> Result<(), Error> {
-    Ok(())
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-struct ParamsPackageId {
-    #[ts(type = "string")]
-    package_id: PackageId,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "camelCase")]
-#[ts(export)]
-struct ParamsMaybePackageId {
-    #[ts(type = "string | null")]
-    package_id: Option<PackageId>,
-}
-
-async fn exists(context: EffectContext, params: ParamsPackageId) -> Result<Value, Error> {
-    let context = context.deref()?;
-    let peeked = context.seed.ctx.db.peek().await;
-    let package = peeked
-        .as_public()
-        .as_package_data()
-        .as_idx(&params.package_id)
-        .is_some();
-    Ok(json!(package))
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct ExecuteAction {
-    #[serde(default)]
-    procedure_id: Guid,
-    #[ts(type = "string | null")]
-    service_id: Option<PackageId>,
-    #[ts(type = "string")]
-    action_id: ActionId,
-    #[ts(type = "any")]
-    input: Value,
-}
-async fn execute_action(
-    context: EffectContext,
-    ExecuteAction {
-        procedure_id,
-        service_id,
-        action_id,
-        input,
-    }: ExecuteAction,
-) -> Result<Value, Error> {
-    let context = context.deref()?;
-    let package_id = service_id
-        .clone()
-        .unwrap_or_else(|| context.seed.id.clone());
-
-    Ok(json!(context.action(procedure_id, action_id, input).await?))
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct FromService {}
-async fn get_configured(context: EffectContext, _: Empty) -> Result<Value, Error> {
-    let context = context.deref()?;
-    let peeked = context.seed.ctx.db.peek().await;
-    let package_id = &context.seed.id;
-    let package = peeked
-        .as_public()
-        .as_package_data()
-        .as_idx(package_id)
-        .or_not_found(package_id)?
-        .as_status()
-        .as_configured()
-        .de()?;
-    Ok(json!(package))
-}
-
-async fn stopped(context: EffectContext, params: ParamsMaybePackageId) -> Result<Value, Error> {
-    let context = context.deref()?;
-    let peeked = context.seed.ctx.db.peek().await;
-    let package_id = params.package_id.unwrap_or_else(|| context.seed.id.clone());
-    let package = peeked
-        .as_public()
-        .as_package_data()
-        .as_idx(&package_id)
-        .or_not_found(&package_id)?
-        .as_status()
-        .as_main()
-        .de()?;
-    Ok(json!(matches!(package, MainStatus::Stopped)))
-}
-async fn running(context: EffectContext, params: ParamsPackageId) -> Result<Value, Error> {
-    let context = context.deref()?;
-    let peeked = context.seed.ctx.db.peek().await;
-    let package_id = params.package_id;
-    let package = peeked
-        .as_public()
-        .as_package_data()
-        .as_idx(&package_id)
-        .or_not_found(&package_id)?
-        .as_status()
-        .as_main()
-        .de()?;
-    Ok(json!(matches!(package, MainStatus::Running { .. })))
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct ProcedureId {
-    #[serde(default)]
-    #[arg(default_value_t, long)]
-    procedure_id: Guid,
-}
-
-async fn restart(
-    context: EffectContext,
-    ProcedureId { procedure_id }: ProcedureId,
-) -> Result<(), Error> {
-    let context = context.deref()?;
-    context.restart(procedure_id).await?;
-    Ok(())
-}
-
-async fn shutdown(
-    context: EffectContext,
-    ProcedureId { procedure_id }: ProcedureId,
-) -> Result<(), Error> {
-    let context = context.deref()?;
-    context.stop(procedure_id).await?;
-    Ok(())
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "camelCase")]
-#[ts(export)]
-struct SetConfigured {
-    configured: bool,
-}
-async fn set_configured(context: EffectContext, params: SetConfigured) -> Result<Value, Error> {
-    let context = context.deref()?;
-    let package_id = &context.seed.id;
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(package_id)
-                .or_not_found(package_id)?
-                .as_status_mut()
-                .as_configured_mut()
-                .ser(&params.configured)
-        })
-        .await?;
-    Ok(json!(()))
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-enum SetMainStatusStatus {
-    Running,
-    Stopped,
-}
-impl FromStr for SetMainStatusStatus {
-    type Err = color_eyre::eyre::Report;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "running" => Ok(Self::Running),
-            "stopped" => Ok(Self::Stopped),
-            _ => Err(eyre!("unknown status {s}")),
-        }
-    }
-}
-impl ValueParserFactory for SetMainStatusStatus {
-    type Parser = FromStrParser<Self>;
-    fn value_parser() -> Self::Parser {
-        FromStrParser::new()
-    }
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "camelCase")]
-#[ts(export)]
-struct SetMainStatus {
-    status: SetMainStatusStatus,
-}
-async fn set_main_status(context: EffectContext, params: SetMainStatus) -> Result<Value, Error> {
-    let context = context.deref()?;
-    match params.status {
-        SetMainStatusStatus::Running => context.seed.started(),
-        SetMainStatusStatus::Stopped => context.seed.stopped(),
-    }
-    Ok(Value::Null)
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct SetHealth {
-    id: HealthCheckId,
-    #[serde(flatten)]
-    result: HealthCheckResult,
-}
-
-async fn set_health(
-    context: EffectContext,
-    SetHealth { id, result }: SetHealth,
-) -> Result<Value, Error> {
-    let context = context.deref()?;
-
-    let package_id = &context.seed.id;
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(move |db| {
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(package_id)
-                .or_not_found(package_id)?
-                .as_status_mut()
-                .as_main_mut()
-                .mutate(|main| {
-                    match main {
-                        &mut MainStatus::Running { ref mut health, .. }
-                        | &mut MainStatus::BackingUp { ref mut health, .. } => {
-                            health.insert(id, result);
-                        }
-                        _ => (),
-                    }
-                    Ok(())
-                })
-        })
-        .await?;
-    Ok(json!(()))
-}
-#[derive(serde::Deserialize, serde::Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "camelCase")]
-#[ts(export)]
-pub struct DestroyOverlayedImageParams {
-    guid: Guid,
-}
-
-#[instrument(skip_all)]
-pub async fn destroy_overlayed_image(
-    context: EffectContext,
-    DestroyOverlayedImageParams { guid }: DestroyOverlayedImageParams,
-) -> Result<(), Error> {
-    let context = context.deref()?;
-    if context
-        .seed
-        .persistent_container
-        .overlays
-        .lock()
-        .await
-        .remove(&guid)
-        .is_none()
-    {
-        tracing::warn!("Could not find a guard to remove on the destroy overlayed image; assumming that it already is removed and will be skipping");
-    }
-    Ok(())
-}
-#[derive(serde::Deserialize, serde::Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "camelCase")]
-#[ts(export)]
-pub struct CreateOverlayedImageParams {
-    image_id: ImageId,
-}
-
-#[instrument(skip_all)]
-pub async fn create_overlayed_image(
-    context: EffectContext,
-    CreateOverlayedImageParams { image_id }: CreateOverlayedImageParams,
-) -> Result<(PathBuf, Guid), Error> {
-    let context = context.deref()?;
-    if let Some(image) = context
-        .seed
-        .persistent_container
-        .images
-        .get(&image_id)
-        .cloned()
-    {
-        let guid = Guid::new();
-        let rootfs_dir = context
-            .seed
-            .persistent_container
-            .lxc_container
-            .get()
-            .ok_or_else(|| {
-                Error::new(
-                    eyre!("PersistentContainer has been destroyed"),
-                    ErrorKind::Incoherent,
-                )
-            })?
-            .rootfs_dir();
-        let mountpoint = rootfs_dir
-            .join("media/startos/overlays")
-            .join(guid.as_ref());
-        tokio::fs::create_dir_all(&mountpoint).await?;
-        let container_mountpoint = Path::new("/").join(
-            mountpoint
-                .strip_prefix(rootfs_dir)
-                .with_kind(ErrorKind::Incoherent)?,
-        );
-        tracing::info!("Mounting overlay {guid} for {image_id}");
-        let guard = OverlayGuard::mount(image, &mountpoint).await?;
-        Command::new("chown")
-            .arg("100000:100000")
-            .arg(&mountpoint)
-            .invoke(ErrorKind::Filesystem)
-            .await?;
-        tracing::info!("Mounted overlay {guid} for {image_id}");
-        context
-            .seed
-            .persistent_container
-            .overlays
-            .lock()
-            .await
-            .insert(guid.clone(), guard);
-        Ok((container_mountpoint, guid))
-    } else {
-        Err(Error::new(
-            eyre!("image {image_id} not found in s9pk"),
-            ErrorKind::NotFound,
-        ))
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-enum DependencyKind {
-    Exists,
-    Running,
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase", tag = "kind")]
-#[ts(export)]
-enum DependencyRequirement {
-    #[serde(rename_all = "camelCase")]
-    Running {
-        #[ts(type = "string")]
-        id: PackageId,
-        #[ts(type = "string[]")]
-        health_checks: BTreeSet<HealthCheckId>,
-        #[ts(type = "string")]
-        version_range: VersionRange,
-    },
-    #[serde(rename_all = "camelCase")]
-    Exists {
-        #[ts(type = "string")]
-        id: PackageId,
-        #[ts(type = "string")]
-        version_range: VersionRange,
-    },
-}
-// filebrowser:exists,bitcoind:running:foo+bar+baz
-impl FromStr for DependencyRequirement {
-    type Err = Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.split_once(':') {
-            Some((id, "e")) | Some((id, "exists")) => Ok(Self::Exists {
-                id: id.parse()?,
-                version_range: "*".parse()?, // TODO
-            }),
-            Some((id, rest)) => {
-                let health_checks = match rest.split_once(':') {
-                    Some(("r", rest)) | Some(("running", rest)) => rest
-                        .split('+')
-                        .map(|id| id.parse().map_err(Error::from))
-                        .collect(),
-                    Some((kind, _)) => Err(Error::new(
-                        eyre!("unknown dependency kind {kind}"),
-                        ErrorKind::InvalidRequest,
-                    )),
-                    None => match rest {
-                        "r" | "running" => Ok(BTreeSet::new()),
-                        kind => Err(Error::new(
-                            eyre!("unknown dependency kind {kind}"),
-                            ErrorKind::InvalidRequest,
-                        )),
-                    },
-                }?;
-                Ok(Self::Running {
-                    id: id.parse()?,
-                    health_checks,
-                    version_range: "*".parse()?, // TODO
-                })
-            }
-            None => Ok(Self::Running {
-                id: s.parse()?,
-                health_checks: BTreeSet::new(),
-                version_range: "*".parse()?, // TODO
-            }),
-        }
-    }
-}
-impl ValueParserFactory for DependencyRequirement {
-    type Parser = FromStrParser<Self>;
-    fn value_parser() -> Self::Parser {
-        FromStrParser::new()
-    }
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "camelCase")]
-#[ts(export)]
-struct SetDependenciesParams {
-    #[serde(default)]
-    procedure_id: Guid,
-    dependencies: Vec<DependencyRequirement>,
-}
-
-async fn set_dependencies(
-    context: EffectContext,
-    SetDependenciesParams {
-        procedure_id,
-        dependencies,
-    }: SetDependenciesParams,
-) -> Result<(), Error> {
-    let context = context.deref()?;
-    let id = &context.seed.id;
-
-    let mut deps = BTreeMap::new();
-    for dependency in dependencies {
-        let (dep_id, kind, version_range) = match dependency {
-            DependencyRequirement::Exists { id, version_range } => {
-                (id, CurrentDependencyKind::Exists, version_range)
-            }
-            DependencyRequirement::Running {
-                id,
-                health_checks,
-                version_range,
-            } => (
-                id,
-                CurrentDependencyKind::Running { health_checks },
-                version_range,
-            ),
-        };
-        let config_satisfied =
-            if let Some(dep_service) = &*context.seed.ctx.services.get(&dep_id).await {
-                context
-                    .dependency_config(
-                        procedure_id.clone(),
-                        dep_id.clone(),
-                        dep_service.get_config(procedure_id.clone()).await?.config,
-                    )
-                    .await?
-                    .is_none()
-            } else {
-                true
-            };
-        let info = CurrentDependencyInfo {
-            title: context
-                .seed
-                .persistent_container
-                .s9pk
-                .dependency_metadata(&dep_id)
-                .await?
-                .map(|m| m.title),
-            icon: context
-                .seed
-                .persistent_container
-                .s9pk
-                .dependency_icon_data_url(&dep_id)
-                .await?,
-            kind,
-            version_range,
-            config_satisfied,
-        };
-        deps.insert(dep_id, info);
-    }
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(id)
-                .or_not_found(id)?
-                .as_current_dependencies_mut()
-                .ser(&CurrentDependencies(deps))
-        })
-        .await
-}
-
-async fn get_dependencies(context: EffectContext) -> Result<Vec<DependencyRequirement>, Error> {
-    let context = context.deref()?;
-    let id = &context.seed.id;
-    let db = context.seed.ctx.db.peek().await;
-    let data = db
-        .as_public()
-        .as_package_data()
-        .as_idx(id)
-        .or_not_found(id)?
-        .as_current_dependencies()
-        .de()?;
-
-    data.0
-        .into_iter()
-        .map(|(id, current_dependency_info)| {
-            let CurrentDependencyInfo {
-                version_range,
-                kind,
-                ..
-            } = current_dependency_info;
-            Ok::<_, Error>(match kind {
-                CurrentDependencyKind::Exists => {
-                    DependencyRequirement::Exists { id, version_range }
-                }
-                CurrentDependencyKind::Running { health_checks } => {
-                    DependencyRequirement::Running {
-                        id,
-                        health_checks,
-                        version_range,
-                    }
-                }
-            })
-        })
-        .try_collect()
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "camelCase")]
-#[ts(export)]
-struct CheckDependenciesParam {
-    package_ids: Option<Vec<PackageId>>,
-}
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-struct CheckDependenciesResult {
-    package_id: PackageId,
-    is_installed: bool,
-    is_running: bool,
-    config_satisfied: bool,
-    health_checks: BTreeMap<HealthCheckId, HealthCheckResult>,
-    #[ts(type = "string | null")]
-    version: Option<exver::ExtendedVersion>,
-}
-
-async fn check_dependencies(
-    context: EffectContext,
-    CheckDependenciesParam { package_ids }: CheckDependenciesParam,
-) -> Result<Vec<CheckDependenciesResult>, Error> {
-    let context = context.deref()?;
-    let db = context.seed.ctx.db.peek().await;
-    let current_dependencies = db
-        .as_public()
-        .as_package_data()
-        .as_idx(&context.seed.id)
-        .or_not_found(&context.seed.id)?
-        .as_current_dependencies()
-        .de()?;
-    let package_ids: Vec<_> = package_ids
-        .unwrap_or_else(|| current_dependencies.0.keys().cloned().collect())
-        .into_iter()
-        .filter_map(|x| {
-            let info = current_dependencies.0.get(&x)?;
-            Some((x, info))
-        })
-        .collect();
-    let mut results = Vec::with_capacity(package_ids.len());
-
-    for (package_id, dependency_info) in package_ids {
-        let Some(package) = db.as_public().as_package_data().as_idx(&package_id) else {
-            results.push(CheckDependenciesResult {
-                package_id,
-                is_installed: false,
-                is_running: false,
-                config_satisfied: false,
-                health_checks: Default::default(),
-                version: None,
-            });
-            continue;
-        };
-        let manifest = package.as_state_info().as_manifest(ManifestPreference::New);
-        let installed_version = manifest.as_version().de()?.into_version();
-        let satisfies = manifest.as_satisfies().de()?;
-        let version = Some(installed_version.clone());
-        if ![installed_version]
-            .into_iter()
-            .chain(satisfies.into_iter().map(|v| v.into_version()))
-            .any(|v| v.satisfies(&dependency_info.version_range))
-        {
-            results.push(CheckDependenciesResult {
-                package_id,
-                is_installed: false,
-                is_running: false,
-                config_satisfied: false,
-                health_checks: Default::default(),
-                version,
-            });
-            continue;
-        }
-        let is_installed = true;
-        let status = package.as_status().as_main().de()?;
-        let is_running = if is_installed {
-            status.running()
-        } else {
-            false
-        };
-        let health_checks =
-            if let CurrentDependencyKind::Running { health_checks } = &dependency_info.kind {
-                status
-                    .health()
-                    .cloned()
-                    .unwrap_or_default()
-                    .into_iter()
-                    .filter(|(id, _)| health_checks.contains(id))
-                    .collect()
-            } else {
-                Default::default()
-            };
-        results.push(CheckDependenciesResult {
-            package_id,
-            is_installed,
-            is_running,
-            config_satisfied: dependency_info.config_satisfied,
-            health_checks,
-            version,
-        });
-    }
-    Ok(results)
-}
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index 7a8cb9afe..7af94588b 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -5,6 +5,7 @@ use chrono::Utc;
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::FutureExt;
+use imbl::vector;
 use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use tokio::process::Command;
@@ -824,6 +825,51 @@ async fn get_disk_info() -> Result<MetricsDisk, Error> {
     })
 }
 
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct SmtpValue {
+    #[arg(long)]
+    pub server: String,
+    #[arg(long)]
+    pub port: u16,
+    #[arg(long)]
+    pub from: String,
+    #[arg(long)]
+    pub login: String,
+    #[arg(long)]
+    pub password: Option<String>,
+}
+pub async fn set_system_smtp(ctx: RpcContext, smtp: SmtpValue) -> Result<(), Error> {
+    let smtp = Some(smtp);
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_server_info_mut()
+                .as_smtp_mut()
+                .ser(&smtp)
+        })
+        .await?;
+    if let Some(callbacks) = ctx.callbacks.get_system_smtp() {
+        callbacks.call(vector![to_value(&smtp)?]).await?;
+    }
+    Ok(())
+}
+pub async fn clear_system_smtp(ctx: RpcContext) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_server_info_mut()
+                .as_smtp_mut()
+                .ser(&None)
+        })
+        .await?;
+    if let Some(callbacks) = ctx.callbacks.get_system_smtp() {
+        callbacks.call(vector![Value::Null]).await?;
+    }
+    Ok(())
+}
+
 #[tokio::test]
 #[ignore]
 pub async fn test_get_temp() {
diff --git a/core/startos/src/util/collections/eq_map.rs b/core/startos/src/util/collections/eq_map.rs
new file mode 100644
index 000000000..5078866a5
--- /dev/null
+++ b/core/startos/src/util/collections/eq_map.rs
@@ -0,0 +1,1213 @@
+use std::borrow::Borrow;
+use std::fmt;
+use std::ops::{Index, IndexMut};
+
+pub struct EqMap<K: Eq, V>(Vec<(K, V)>);
+impl<K: Eq, V> Default for EqMap<K, V> {
+    fn default() -> Self {
+        Self(Default::default())
+    }
+}
+impl<K: Eq, V> EqMap<K, V> {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn clear(&mut self) {
+        self.0.clear()
+    }
+
+    /// Returns the key-value pair corresponding to the supplied key as a borrowed tuple.
+    ///
+    /// The supplied key may be any borrowed form of the map's key type, but the equality
+    /// on the borrowed form *must* match the equality on the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.get_key_value(&1), Some((&1, &"a")));
+    /// assert_eq!(map.get_key_value(&2), None);
+    /// ```
+    pub fn get_key_value_ref<Q: ?Sized>(&self, key: &Q) -> Option<&(K, V)>
+    where
+        K: Borrow<Q> + Eq,
+        Q: Eq,
+    {
+        self.0.iter().find(|(k, _)| k.borrow() == key)
+    }
+
+    /// Returns the key-value pair corresponding to the supplied key as a mutably borrowed tuple.
+    ///
+    /// The supplied key may be any borrowed form of the map's key type, but the equality
+    /// on the borrowed form *must* match the equality on the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.get_key_value(&1), Some((&1, &"a")));
+    /// assert_eq!(map.get_key_value(&2), None);
+    /// ```
+    pub fn get_key_value_mut<Q: ?Sized>(&mut self, key: &Q) -> Option<&mut (K, V)>
+    where
+        K: Borrow<Q> + Eq,
+        Q: Eq,
+    {
+        self.0.iter_mut().find(|(k, _)| k.borrow() == key)
+    }
+
+    /// Returns a reference to the value corresponding to the key.
+    ///
+    /// The key may be any borrowed form of the map's key type, but the equality
+    /// on the borrowed form *must* match the equality on the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.get(&1), Some(&"a"));
+    /// assert_eq!(map.get(&2), None);
+    /// ```
+    pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
+    where
+        K: Borrow<Q> + Eq,
+        Q: Eq,
+    {
+        self.get_key_value_ref(key).map(|(_, v)| v)
+    }
+
+    /// Returns the key-value pair corresponding to the supplied key.
+    ///
+    /// The supplied key may be any borrowed form of the map's key type, but the equality
+    /// on the borrowed form *must* match the equality on the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.get_key_value(&1), Some((&1, &"a")));
+    /// assert_eq!(map.get_key_value(&2), None);
+    /// ```
+    pub fn get_key_value<Q: ?Sized>(&self, key: &Q) -> Option<(&K, &V)>
+    where
+        K: Borrow<Q> + Eq,
+        Q: Eq,
+    {
+        self.get_key_value_ref(key).map(|(k, v)| (k, v))
+    }
+
+    /// Removes and returns an element in the map.
+    /// There is no guarantee about which element this might be
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// map.insert(2, "b");
+    /// while let Some((_key, _val)) = map.pop() { }
+    /// assert!(map.is_empty());
+    /// ```
+    pub fn pop(&mut self) -> Option<(K, V)>
+    where
+        K: Eq,
+    {
+        self.0.pop()
+    }
+
+    /// Returns `true` if the map contains a value for the specified key.
+    ///
+    /// The key may be any borrowed form of the map's key type, but the equality
+    /// on the borrowed form *must* match the equality on the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.contains_key(&1), true);
+    /// assert_eq!(map.contains_key(&2), false);
+    /// ```
+    pub fn contains_key<Q: ?Sized>(&self, key: &Q) -> bool
+    where
+        K: Borrow<Q> + Eq,
+        Q: Eq,
+    {
+        self.get(key).is_some()
+    }
+
+    /// Returns a mutable reference to the value corresponding to the key.
+    ///
+    /// The key may be any borrowed form of the map's key type, but the equality
+    /// on the borrowed form *must* match the equality on the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// if let Some(x) = map.get_mut(&1) {
+    ///     *x = "b";
+    /// }
+    /// assert_eq!(map[&1], "b");
+    /// ```
+    // See `get` for implementation notes, this is basically a copy-paste with mut's added
+    pub fn get_mut<Q: ?Sized>(&mut self, key: &Q) -> Option<&mut V>
+    where
+        K: Borrow<Q> + Eq,
+        Q: Eq,
+    {
+        self.get_key_value_mut(key).map(|(_, v)| v)
+    }
+
+    /// Inserts a key-value pair into the map.
+    ///
+    /// If the map did not have this key present, `None` is returned.
+    ///
+    /// If the map did have this key present, the value is updated, and the old
+    /// value is returned. The key is not updated, though; this matters for
+    /// types that can be `==` without being identical.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// assert_eq!(map.insert(37, "a"), None);
+    /// assert_eq!(map.is_empty(), false);
+    ///
+    /// map.insert(37, "b");
+    /// assert_eq!(map.insert(37, "c"), Some("b"));
+    /// assert_eq!(map[&37], "c");
+    /// ```
+    pub fn insert(&mut self, key: K, value: V) -> Option<V>
+    where
+        K: Eq,
+    {
+        match self.entry(key) {
+            Occupied(mut entry) => Some(entry.insert(value)),
+            Vacant(entry) => {
+                entry.insert(value);
+                None
+            }
+        }
+    }
+
+    /// Tries to insert a key-value pair into the map, and returns
+    /// a mutable reference to the value in the entry.
+    ///
+    /// If the map already had this key present, nothing is updated, and
+    /// an error containing the occupied entry and the value is returned.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// assert_eq!(map.try_insert(37, "a").unwrap(), &"a");
+    ///
+    /// let err = map.try_insert(37, "b").unwrap_err();
+    /// assert_eq!(err.entry.key(), &37);
+    /// assert_eq!(err.entry.get(), &"a");
+    /// assert_eq!(err.value, "b");
+    /// ```
+    pub fn try_insert(&mut self, key: K, value: V) -> Result<&mut V, OccupiedError<'_, K, V>>
+    where
+        K: Eq,
+    {
+        match self.entry(key) {
+            Occupied(entry) => Err(OccupiedError { entry, value }),
+            Vacant(entry) => Ok(entry.insert(value)),
+        }
+    }
+
+    /// Removes a key from the map, returning the value at the key if the key
+    /// was previously in the map.
+    ///
+    /// The key may be any borrowed form of the map's key type, but the equality
+    /// on the borrowed form *must* match the equality on the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.remove(&1), Some("a"));
+    /// assert_eq!(map.remove(&1), None);
+    /// ```
+    pub fn remove<Q: ?Sized>(&mut self, key: &Q) -> Option<V>
+    where
+        K: Borrow<Q> + Eq,
+        Q: Eq,
+    {
+        self.remove_entry(key).map(|(_, v)| v)
+    }
+
+    /// Removes a key from the map, returning the stored key and value if the key
+    /// was previously in the map.
+    ///
+    /// The key may be any borrowed form of the map's key type, but the equality
+    /// on the borrowed form *must* match the equality on the key type.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.remove_entry(&1), Some((1, "a")));
+    /// assert_eq!(map.remove_entry(&1), None);
+    /// ```
+    pub fn remove_entry<Q: ?Sized>(&mut self, key: &Q) -> Option<(K, V)>
+    where
+        K: Borrow<Q> + Eq,
+        Q: Eq,
+    {
+        self.0
+            .iter()
+            .enumerate()
+            .find(|(_, (k, _))| k.borrow() == key)
+            .map(|(idx, _)| idx)
+            .map(|idx| self.0.swap_remove(idx))
+    }
+
+    /// Retains only the elements specified by the predicate.
+    ///
+    /// In other words, remove all pairs `(k, v)` for which `f(&k, &mut v)` returns `false`.
+    /// The elements are visited in ascending key order.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<i32, i32> = (0..8).map(|x| (x, x*10)).collect();
+    /// // Keep only the elements with even-numbered keys.
+    /// map.retain(|&k, _| k % 2 == 0);
+    /// assert!(map.into_iter().eq(vec![(0, 0), (2, 20), (4, 40), (6, 60)]));
+    /// ```
+    #[inline]
+    pub fn retain<F>(&mut self, mut f: F)
+    where
+        K: Eq,
+        F: FnMut(&K, &mut V) -> bool,
+    {
+        self.0.retain_mut(|(k, v)| f(k, v))
+    }
+
+    /// Moves all elements from `other` into `self`, leaving `other` empty.
+    ///
+    /// If a key from `other` is already present in `self`, the respective
+    /// value from `self` will be overwritten with the respective value from `other`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut a = EqMap::new();
+    /// a.insert(1, "a");
+    /// a.insert(2, "b");
+    /// a.insert(3, "c"); // Note: Key (3) also present in b.
+    ///
+    /// let mut b = EqMap::new();
+    /// b.insert(3, "d"); // Note: Key (3) also present in a.
+    /// b.insert(4, "e");
+    /// b.insert(5, "f");
+    ///
+    /// a.append(&mut b);
+    ///
+    /// assert_eq!(a.len(), 5);
+    /// assert_eq!(b.len(), 0);
+    ///
+    /// assert_eq!(a[&1], "a");
+    /// assert_eq!(a[&2], "b");
+    /// assert_eq!(a[&3], "d"); // Note: "c" has been overwritten.
+    /// assert_eq!(a[&4], "e");
+    /// assert_eq!(a[&5], "f");
+    /// ```
+    pub fn append(&mut self, other: &mut Self)
+    where
+        K: Eq,
+    {
+        for k in other.keys() {
+            self.remove(k);
+        }
+        self.0.append(&mut other.0)
+    }
+
+    /// Gets the given key's corresponding entry in the map for in-place manipulation.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut count: EqMap<&str, usize> = EqMap::new();
+    ///
+    /// // count the number of occurrences of letters in the vec
+    /// for x in ["a", "b", "a", "c", "a", "b"] {
+    ///     count.entry(x).and_modify(|curr| *curr += 1).or_insert(1);
+    /// }
+    ///
+    /// assert_eq!(count["a"], 3);
+    /// assert_eq!(count["b"], 2);
+    /// assert_eq!(count["c"], 1);
+    /// ```
+    pub fn entry(&mut self, key: K) -> Entry<'_, K, V>
+    where
+        K: Eq,
+    {
+        match self.0.iter().enumerate().find(|(_, (k, _))| k == &key) {
+            Some((idx, _)) => Occupied(OccupiedEntry { map: self, idx }),
+            None => Vacant(VacantEntry { key, map: self }),
+        }
+    }
+
+    // /// Creates an iterator that visits all elements (key-value pairs) and
+    // /// uses a closure to determine if an element should be removed. If the
+    // /// closure returns `true`, the element is removed from the map and yielded.
+    // /// If the closure returns `false`, or panics, the element remains in the map
+    // /// and will not be yielded.
+    // ///
+    // /// The iterator also lets you mutate the value of each element in the
+    // /// closure, regardless of whether you choose to keep or remove it.
+    // ///
+    // /// If the returned `ExtractIf` is not exhausted, e.g. because it is dropped without iterating
+    // /// or the iteration short-circuits, then the remaining elements will be retained.
+    // /// Use [`retain`] with a negated predicate if you do not need the returned iterator.
+    // ///
+    // /// [`retain`]: EqMap::retain
+    // ///
+    // /// # Examples
+    // ///
+    // /// Splitting a map into even and odd keys, reusing the original map:
+    // ///
+    // /// ```
+    // /// use startos::util::collections::EqMap;
+    // ///
+    // /// let mut map: EqMap<i32, i32> = (0..8).map(|x| (x, x)).collect();
+    // /// let evens: EqMap<_, _> = map.extract_if(|k, _v| k % 2 == 0).collect();
+    // /// let odds = map;
+    // /// assert_eq!(evens.keys().copied().collect::<Vec<_>>(), [0, 2, 4, 6]);
+    // /// assert_eq!(odds.keys().copied().collect::<Vec<_>>(), [1, 3, 5, 7]);
+    // /// ```
+    // pub fn extract_if<F>(&mut self, pred: F) -> ExtractIf<'_, K, V, F>
+    // where
+    //     K: Eq,
+    //     F: FnMut(&K, &mut V) -> bool,
+    // {
+    //     let (inner, alloc) = self.extract_if_inner();
+    //     ExtractIf { pred, inner, alloc }
+    // }
+
+    /// Creates a consuming iterator visiting all the keys.
+    /// The map cannot be used after calling this.
+    /// The iterator element type is `K`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut a = EqMap::new();
+    /// a.insert(2, "b");
+    /// a.insert(1, "a");
+    ///
+    /// let keys: Vec<i32> = a.into_keys().collect();
+    /// assert_eq!(keys, [2, 1]);
+    /// ```
+    #[inline]
+    pub fn into_keys(self) -> IntoKeys<K, V> {
+        IntoKeys(self.0.into_iter())
+    }
+
+    /// Creates a consuming iterator visiting all the values.
+    /// The map cannot be used after calling this.
+    /// The iterator element type is `V`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut a = EqMap::new();
+    /// a.insert(1, "hello");
+    /// a.insert(2, "goodbye");
+    ///
+    /// let values: Vec<&str> = a.into_values().collect();
+    /// assert_eq!(values, ["hello", "goodbye"]);
+    /// ```
+    #[inline]
+    pub fn into_values(self) -> IntoValues<K, V> {
+        IntoValues(self.0.into_iter())
+    }
+
+    pub fn iter_ref(&self) -> std::slice::Iter<'_, (K, V)> {
+        self.0.iter()
+    }
+
+    /// Gets an iterator over the entries of the map, in no particular order.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::new();
+    /// map.insert(3, "c");
+    /// map.insert(2, "b");
+    /// map.insert(1, "a");
+    ///
+    /// for (key, value) in map.iter() {
+    ///     println!("{key}: {value}");
+    /// }
+    ///
+    /// let (first_key, first_value) = map.iter().next().unwrap();
+    /// assert_eq!((*first_key, *first_value), (3, "c"));
+    /// ```
+    pub fn iter(&self) -> std::iter::Map<std::slice::Iter<'_, (K, V)>, fn(&(K, V)) -> (&K, &V)> {
+        self.0.iter().map(|(k, v)| (k, v))
+    }
+
+    /// Gets a mutable iterator over the entries of the map, in no particular order.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map = EqMap::from([
+    ///    ("a", 1),
+    ///    ("b", 2),
+    ///    ("c", 3),
+    /// ]);
+    ///
+    /// // add 10 to the value if the key isn't "a"
+    /// for (key, value) in map.iter_mut() {
+    ///     if key != &"a" {
+    ///         *value += 10;
+    ///     }
+    /// }
+    /// ```
+    pub fn iter_mut(
+        &mut self,
+    ) -> std::iter::Map<std::slice::IterMut<'_, (K, V)>, fn(&mut (K, V)) -> (&K, &mut V)> {
+        self.0.iter_mut().map(|(k, v)| (&*k, v))
+    }
+
+    /// Gets an iterator over the keys of the map.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut a = EqMap::new();
+    /// a.insert(2, "b");
+    /// a.insert(1, "a");
+    ///
+    /// let keys: Vec<_> = a.keys().cloned().collect();
+    /// assert_eq!(keys, [2, 1]);
+    /// ```
+    pub fn keys(&self) -> std::iter::Map<std::slice::Iter<'_, (K, V)>, fn(&(K, V)) -> &K> {
+        self.0.iter().map(|(k, _)| k)
+    }
+
+    /// Gets an iterator over the values of the map.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut a = EqMap::new();
+    /// a.insert(1, "hello");
+    /// a.insert(2, "goodbye");
+    ///
+    /// let values: Vec<&str> = a.values().cloned().collect();
+    /// assert_eq!(values, ["hello", "goodbye"]);
+    /// ```
+    pub fn values(&self) -> std::iter::Map<std::slice::Iter<'_, (K, V)>, fn(&(K, V)) -> &V> {
+        self.0.iter().map(|(_, v)| v)
+    }
+
+    /// Gets a mutable iterator over the values of the map.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut a = EqMap::new();
+    /// a.insert(1, String::from("hello"));
+    /// a.insert(2, String::from("goodbye"));
+    ///
+    /// for value in a.values_mut() {
+    ///     value.push_str("!");
+    /// }
+    ///
+    /// let values: Vec<String> = a.values().cloned().collect();
+    /// assert_eq!(values, [String::from("hello!"),
+    ///                     String::from("goodbye!")]);
+    /// ```
+    pub fn values_mut(
+        &mut self,
+    ) -> std::iter::Map<std::slice::IterMut<'_, (K, V)>, fn(&mut (K, V)) -> &mut V> {
+        self.0.iter_mut().map(|(_, v)| v)
+    }
+
+    /// Returns the number of elements in the map.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut a = EqMap::new();
+    /// assert_eq!(a.len(), 0);
+    /// a.insert(1, "a");
+    /// assert_eq!(a.len(), 1);
+    /// ```
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    /// Returns `true` if the map contains no elements.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut a = EqMap::new();
+    /// assert!(a.is_empty());
+    /// a.insert(1, "a");
+    /// assert!(!a.is_empty());
+    /// ```
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+}
+
+impl<K: fmt::Debug + Eq, V: fmt::Debug> fmt::Debug for EqMap<K, V> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_map().entries(self.iter()).finish()
+    }
+}
+
+impl<K, Q: ?Sized, V> Index<&Q> for EqMap<K, V>
+where
+    K: Borrow<Q> + Eq,
+    Q: Eq,
+{
+    type Output = V;
+
+    /// Returns a reference to the value corresponding to the supplied key.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the key is not present in the `BTreeMap`.
+    #[inline]
+    fn index(&self, key: &Q) -> &V {
+        self.get(key).expect("no entry found for key")
+    }
+}
+
+impl<K, Q: ?Sized, V> IndexMut<&Q> for EqMap<K, V>
+where
+    K: Borrow<Q> + Eq,
+    Q: Eq,
+{
+    /// Returns a reference to the value corresponding to the supplied key.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the key is not present in the `BTreeMap`.
+    #[inline]
+    fn index_mut(&mut self, key: &Q) -> &mut V {
+        self.get_mut(key).expect("no entry found for key")
+    }
+}
+
+impl<K: Eq, V> IntoIterator for EqMap<K, V> {
+    type IntoIter = std::vec::IntoIter<(K, V)>;
+    type Item = (K, V);
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl<K: Eq, V> Extend<(K, V)> for EqMap<K, V> {
+    fn extend<T: IntoIterator<Item = (K, V)>>(&mut self, iter: T) {
+        self.0.extend(iter)
+    }
+}
+
+impl<K: Eq, V> FromIterator<(K, V)> for EqMap<K, V> {
+    fn from_iter<T: IntoIterator<Item = (K, V)>>(iter: T) -> Self {
+        Self(Vec::from_iter(iter))
+    }
+}
+
+impl<K: Eq, V, const N: usize> From<[(K, V); N]> for EqMap<K, V> {
+    /// Converts a `[(K, V); N]` into a `EqMap<(K, V)>`.
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let map1 = EqMap::from([(1, 2), (3, 4)]);
+    /// let map2: EqMap<_, _> = [(1, 2), (3, 4)].into();
+    /// assert_eq!(map1, map2);
+    /// ```
+    fn from(arr: [(K, V); N]) -> Self {
+        EqMap(Vec::from(arr))
+    }
+}
+
+impl<K: Eq, V: PartialEq> PartialEq for EqMap<K, V> {
+    fn eq(&self, other: &Self) -> bool {
+        self.len() == other.len() && self.iter().all(|(k, v)| other.get(k) == Some(v))
+    }
+}
+impl<K: Eq, V: Eq> Eq for EqMap<K, V> {}
+
+use Entry::*;
+
+/// A view into a single entry in a map, which may either be vacant or occupied.
+///
+/// This `enum` is constructed from the [`entry`] method on [`EqMap`].
+///
+/// [`entry`]: EqMap::entry
+pub enum Entry<'a, K: Eq + 'a, V: 'a> {
+    Vacant(VacantEntry<'a, K, V>),
+
+    /// An occupied entry.
+    Occupied(OccupiedEntry<'a, K, V>),
+}
+
+impl<K: fmt::Debug + Eq, V: fmt::Debug> fmt::Debug for Entry<'_, K, V> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            Vacant(ref v) => f.debug_tuple("Entry").field(v).finish(),
+            Occupied(ref o) => f.debug_tuple("Entry").field(o).finish(),
+        }
+    }
+}
+
+/// A view into a vacant entry in a `EqMap`.
+/// It is part of the [`Entry`] enum.
+pub struct VacantEntry<'a, K: Eq, V> {
+    key: K,
+    map: &'a mut EqMap<K, V>,
+}
+
+impl<K: fmt::Debug + Eq, V> fmt::Debug for VacantEntry<'_, K, V> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_tuple("VacantEntry").field(self.key()).finish()
+    }
+}
+
+/// A view into an occupied entry in a `EqMap`.
+/// It is part of the [`Entry`] enum.
+pub struct OccupiedEntry<'a, K: Eq, V> {
+    map: &'a mut EqMap<K, V>,
+    idx: usize,
+}
+
+impl<K: fmt::Debug + Eq, V: fmt::Debug> fmt::Debug for OccupiedEntry<'_, K, V> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("OccupiedEntry")
+            .field("key", self.key())
+            .field("value", self.get())
+            .finish()
+    }
+}
+
+/// The error returned by [`try_insert`](EqMap::try_insert) when the key already exists.
+///
+/// Contains the occupied entry, and the value that was not inserted.
+pub struct OccupiedError<'a, K: Eq + 'a, V: 'a> {
+    /// The entry in the map that was already occupied.
+    pub entry: OccupiedEntry<'a, K, V>,
+    /// The value which was not inserted, because the entry was already occupied.
+    pub value: V,
+}
+
+impl<K: fmt::Debug + Eq, V: fmt::Debug> fmt::Debug for OccupiedError<'_, K, V> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("OccupiedError")
+            .field("key", self.entry.key())
+            .field("old_value", self.entry.get())
+            .field("new_value", &self.value)
+            .finish()
+    }
+}
+
+impl<'a, K: fmt::Debug + Eq, V: fmt::Debug> fmt::Display for OccupiedError<'a, K, V> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "failed to insert {:?}, key {:?} already exists with value {:?}",
+            self.value,
+            self.entry.key(),
+            self.entry.get(),
+        )
+    }
+}
+
+impl<'a, K: fmt::Debug + Eq, V: fmt::Debug> std::error::Error for OccupiedError<'a, K, V> {
+    fn description(&self) -> &str {
+        "key already exists"
+    }
+}
+
+impl<'a, K: Eq, V> Entry<'a, K, V> {
+    /// Ensures a value is in the entry by inserting the default if empty, and returns
+    /// a mutable reference to the value in the entry.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// map.entry("poneyland").or_insert(12);
+    ///
+    /// assert_eq!(map["poneyland"], 12);
+    /// ```
+    pub fn or_insert(self, default: V) -> &'a mut V {
+        match self {
+            Occupied(entry) => entry.into_mut(),
+            Vacant(entry) => entry.insert(default),
+        }
+    }
+
+    /// Ensures a value is in the entry by inserting the result of the default function if empty,
+    /// and returns a mutable reference to the value in the entry.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<&str, String> = EqMap::new();
+    /// let s = "hoho".to_string();
+    ///
+    /// map.entry("poneyland").or_insert_with(|| s);
+    ///
+    /// assert_eq!(map["poneyland"], "hoho".to_string());
+    /// ```
+    pub fn or_insert_with<F: FnOnce() -> V>(self, default: F) -> &'a mut V {
+        match self {
+            Occupied(entry) => entry.into_mut(),
+            Vacant(entry) => entry.insert(default()),
+        }
+    }
+
+    /// Ensures a value is in the entry by inserting, if empty, the result of the default function.
+    /// This method allows for generating key-derived values for insertion by providing the default
+    /// function a reference to the key that was moved during the `.entry(key)` method call.
+    ///
+    /// The reference to the moved key is provided so that cloning or copying the key is
+    /// unnecessary, unlike with `.or_insert_with(|| ... )`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    ///
+    /// map.entry("poneyland").or_insert_with_key(|key| key.chars().count());
+    ///
+    /// assert_eq!(map["poneyland"], 9);
+    /// ```
+    #[inline]
+    pub fn or_insert_with_key<F: FnOnce(&K) -> V>(self, default: F) -> &'a mut V {
+        match self {
+            Occupied(entry) => entry.into_mut(),
+            Vacant(entry) => {
+                let value = default(entry.key());
+                entry.insert(value)
+            }
+        }
+    }
+
+    /// Returns a reference to this entry's key.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// assert_eq!(map.entry("poneyland").key(), &"poneyland");
+    /// ```
+    pub fn key(&self) -> &K {
+        match *self {
+            Occupied(ref entry) => entry.key(),
+            Vacant(ref entry) => entry.key(),
+        }
+    }
+
+    /// Provides in-place mutable access to an occupied entry before any
+    /// potential inserts into the map.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    ///
+    /// map.entry("poneyland")
+    ///    .and_modify(|e| { *e += 1 })
+    ///    .or_insert(42);
+    /// assert_eq!(map["poneyland"], 42);
+    ///
+    /// map.entry("poneyland")
+    ///    .and_modify(|e| { *e += 1 })
+    ///    .or_insert(42);
+    /// assert_eq!(map["poneyland"], 43);
+    /// ```
+    pub fn and_modify<F>(self, f: F) -> Self
+    where
+        F: FnOnce(&mut V),
+    {
+        match self {
+            Occupied(mut entry) => {
+                f(entry.get_mut());
+                Occupied(entry)
+            }
+            Vacant(entry) => Vacant(entry),
+        }
+    }
+}
+
+impl<'a, K: Eq, V: Default> Entry<'a, K, V> {
+    /// Ensures a value is in the entry by inserting the default value if empty,
+    /// and returns a mutable reference to the value in the entry.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<&str, Option<usize>> = EqMap::new();
+    /// map.entry("poneyland").or_default();
+    ///
+    /// assert_eq!(map["poneyland"], None);
+    /// ```
+    pub fn or_default(self) -> &'a mut V {
+        match self {
+            Occupied(entry) => entry.into_mut(),
+            Vacant(entry) => entry.insert(Default::default()),
+        }
+    }
+}
+
+impl<'a, K: Eq, V> VacantEntry<'a, K, V> {
+    /// Gets a reference to the key that would be used when inserting a value
+    /// through the VacantEntry.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// assert_eq!(map.entry("poneyland").key(), &"poneyland");
+    /// ```
+    pub fn key(&self) -> &K {
+        &self.key
+    }
+
+    /// Take ownership of the key.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    /// use startos::util::collections::eq_map::Entry;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    ///
+    /// if let Entry::Vacant(v) = map.entry("poneyland") {
+    ///     v.into_key();
+    /// }
+    /// ```
+    pub fn into_key(self) -> K {
+        self.key
+    }
+
+    /// Sets the value of the entry with the `VacantEntry`'s key,
+    /// and returns a mutable reference to it.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    /// use startos::util::collections::eq_map::Entry;
+    ///
+    /// let mut map: EqMap<&str, u32> = EqMap::new();
+    ///
+    /// if let Entry::Vacant(o) = map.entry("poneyland") {
+    ///     o.insert(37);
+    /// }
+    /// assert_eq!(map["poneyland"], 37);
+    /// ```
+    pub fn insert(self, value: V) -> &'a mut V {
+        self.map.0.push((self.key, value));
+        self.map.0.last_mut().map(|(_, v)| v).unwrap()
+    }
+}
+
+impl<'a, K: Eq, V> OccupiedEntry<'a, K, V> {
+    /// Gets a reference to the key in the entry.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// map.entry("poneyland").or_insert(12);
+    /// assert_eq!(map.entry("poneyland").key(), &"poneyland");
+    /// ```
+    #[must_use]
+    pub fn key(&self) -> &K {
+        &self.map.0[self.idx].0
+    }
+
+    /// Take ownership of the key and value from the map.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    /// use startos::util::collections::eq_map::Entry;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// map.entry("poneyland").or_insert(12);
+    ///
+    /// if let Entry::Occupied(o) = map.entry("poneyland") {
+    ///     // We delete the entry from the map.
+    ///     o.remove_entry();
+    /// }
+    ///
+    /// // If now try to get the value, it will panic:
+    /// // println!("{}", map["poneyland"]);
+    /// ```
+    pub fn remove_entry(self) -> (K, V) {
+        self.map.0.swap_remove(self.idx)
+    }
+
+    /// Gets a reference to the value in the entry.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    /// use startos::util::collections::eq_map::Entry;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// map.entry("poneyland").or_insert(12);
+    ///
+    /// if let Entry::Occupied(o) = map.entry("poneyland") {
+    ///     assert_eq!(o.get(), &12);
+    /// }
+    /// ```
+    #[must_use]
+    pub fn get(&self) -> &V {
+        &self.map.0[self.idx].1
+    }
+
+    /// Gets a mutable reference to the value in the entry.
+    ///
+    /// If you need a reference to the `OccupiedEntry` that may outlive the
+    /// destruction of the `Entry` value, see [`into_mut`].
+    ///
+    /// [`into_mut`]: OccupiedEntry::into_mut
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    /// use startos::util::collections::eq_map::Entry;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// map.entry("poneyland").or_insert(12);
+    ///
+    /// assert_eq!(map["poneyland"], 12);
+    /// if let Entry::Occupied(mut o) = map.entry("poneyland") {
+    ///     *o.get_mut() += 10;
+    ///     assert_eq!(*o.get(), 22);
+    ///
+    ///     // We can use the same Entry multiple times.
+    ///     *o.get_mut() += 2;
+    /// }
+    /// assert_eq!(map["poneyland"], 24);
+    /// ```
+    pub fn get_mut(&mut self) -> &mut V {
+        &mut self.map.0[self.idx].1
+    }
+
+    /// Converts the entry into a mutable reference to its value.
+    ///
+    /// If you need multiple references to the `OccupiedEntry`, see [`get_mut`].
+    ///
+    /// [`get_mut`]: OccupiedEntry::get_mut
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    /// use startos::util::collections::eq_map::Entry;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// map.entry("poneyland").or_insert(12);
+    ///
+    /// assert_eq!(map["poneyland"], 12);
+    /// if let Entry::Occupied(o) = map.entry("poneyland") {
+    ///     *o.into_mut() += 10;
+    /// }
+    /// assert_eq!(map["poneyland"], 22);
+    /// ```
+    #[must_use = "`self` will be dropped if the result is not used"]
+    pub fn into_mut(self) -> &'a mut V {
+        &mut self.map.0[self.idx].1
+    }
+
+    /// Sets the value of the entry with the `OccupiedEntry`'s key,
+    /// and returns the entry's old value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    /// use startos::util::collections::eq_map::Entry;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// map.entry("poneyland").or_insert(12);
+    ///
+    /// if let Entry::Occupied(mut o) = map.entry("poneyland") {
+    ///     assert_eq!(o.insert(15), 12);
+    /// }
+    /// assert_eq!(map["poneyland"], 15);
+    /// ```
+    pub fn insert(&mut self, value: V) -> V {
+        std::mem::replace(self.get_mut(), value)
+    }
+
+    /// Takes the value of the entry out of the map, and returns it.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use startos::util::collections::EqMap;
+    /// use startos::util::collections::eq_map::Entry;
+    ///
+    /// let mut map: EqMap<&str, usize> = EqMap::new();
+    /// map.entry("poneyland").or_insert(12);
+    ///
+    /// if let Entry::Occupied(o) = map.entry("poneyland") {
+    ///     assert_eq!(o.remove(), 12);
+    /// }
+    /// // If we try to get "poneyland"'s value, it'll panic:
+    /// // println!("{}", map["poneyland"]);
+    /// ```
+    pub fn remove(self) -> V {
+        self.remove_entry().1
+    }
+}
+
+pub struct IntoValues<K: Eq, V>(std::vec::IntoIter<(K, V)>);
+impl<'a, K: Eq, V> From<IntoValues<K, V>> for std::vec::IntoIter<(K, V)> {
+    fn from(value: IntoValues<K, V>) -> Self {
+        value.0
+    }
+}
+impl<K: Eq, V> Iterator for IntoValues<K, V> {
+    type Item = V;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next().map(|(_, v)| v)
+    }
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+    fn count(self) -> usize
+    where
+        Self: Sized,
+    {
+        self.0.count()
+    }
+}
+impl<K: Eq, V> DoubleEndedIterator for IntoValues<K, V> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.0.next_back().map(|(_, v)| v)
+    }
+}
+impl<K: Eq, V> ExactSizeIterator for IntoValues<K, V> {
+    fn len(&self) -> usize {
+        self.0.len()
+    }
+}
+
+pub struct IntoKeys<K: Eq, V>(std::vec::IntoIter<(K, V)>);
+impl<'a, K: Eq, V> From<IntoKeys<K, V>> for std::vec::IntoIter<(K, V)> {
+    fn from(value: IntoKeys<K, V>) -> Self {
+        value.0
+    }
+}
+impl<K: Eq, V> Iterator for IntoKeys<K, V> {
+    type Item = K;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next().map(|(k, _)| k)
+    }
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
+    fn count(self) -> usize
+    where
+        Self: Sized,
+    {
+        self.0.count()
+    }
+}
+impl<K: Eq, V> DoubleEndedIterator for IntoKeys<K, V> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.0.next_back().map(|(k, _)| k)
+    }
+}
+impl<K: Eq, V> ExactSizeIterator for IntoKeys<K, V> {
+    fn len(&self) -> usize {
+        self.0.len()
+    }
+}
diff --git a/core/startos/src/util/collections/mod.rs b/core/startos/src/util/collections/mod.rs
new file mode 100644
index 000000000..aa6e3ddb5
--- /dev/null
+++ b/core/startos/src/util/collections/mod.rs
@@ -0,0 +1,3 @@
+pub mod eq_map;
+
+pub use eq_map::EqMap;
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 3b66d7507..1641e4496 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -34,8 +34,10 @@ use crate::shutdown::Shutdown;
 use crate::util::io::create_file;
 use crate::util::serde::{deserialize_from_str, serialize_display};
 use crate::{Error, ErrorKind, ResultExt as _};
+
 pub mod actor;
 pub mod clap;
+pub mod collections;
 pub mod cpupower;
 pub mod crypto;
 pub mod future;
diff --git a/core/startos/src/util/rpc_client.rs b/core/startos/src/util/rpc_client.rs
index 36fe0031a..fc93e4c64 100644
--- a/core/startos/src/util/rpc_client.rs
+++ b/core/startos/src/util/rpc_client.rs
@@ -138,6 +138,31 @@ impl RpcClient {
         err.data = Some(json!("RpcClient thread has terminated"));
         Err(err)
     }
+
+    pub async fn notify<T: RpcMethod>(
+        &mut self,
+        method: T,
+        params: T::Params,
+    ) -> Result<(), RpcError>
+    where
+        T: Serialize,
+        T::Params: Serialize,
+    {
+        let request = RpcRequest {
+            id: None,
+            method,
+            params,
+        };
+        self.writer
+            .write_all((dbg!(serde_json::to_string(&request))? + "\n").as_bytes())
+            .await
+            .map_err(|e| {
+                let mut err = rpc_toolkit::yajrc::INTERNAL_ERROR.clone();
+                err.data = Some(json!(e.to_string()));
+                err
+            })?;
+        Ok(())
+    }
 }
 
 #[derive(Clone)]
@@ -224,4 +249,36 @@ impl UnixRpcClient {
         };
         res
     }
+
+    pub async fn notify<T: RpcMethod>(&self, method: T, params: T::Params) -> Result<(), RpcError>
+    where
+        T: Serialize + Clone,
+        T::Params: Serialize + Clone,
+    {
+        let mut tries = 0;
+        let res = loop {
+            let mut client = self.pool.clone().get().await?;
+            if client.handler.is_finished() {
+                client.destroy();
+                continue;
+            }
+            let res = client.notify(method.clone(), params.clone()).await;
+            match &res {
+                Err(e) if e.code == rpc_toolkit::yajrc::INTERNAL_ERROR.code => {
+                    let mut e = Error::from(e.clone());
+                    e.kind = ErrorKind::Filesystem;
+                    tracing::error!("{e}");
+                    tracing::debug!("{e:?}");
+                    client.destroy();
+                }
+                _ => break res,
+            }
+            tries += 1;
+            if tries > MAX_TRIES {
+                tracing::warn!("Max Tries exceeded");
+                break res;
+            }
+        };
+        res
+    }
 }
diff --git a/sdk/Makefile b/sdk/Makefile
index ef1c886f5..660a476c4 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -3,6 +3,8 @@ version = $(shell git tag --sort=committerdate | tail -1)
 
 .PHONY: test clean bundle fmt buildOutput check
 
+all: bundle
+
 test: $(TS_FILES) lib/test/output.ts
 	npm test
 
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index f09d83750..7cdedff90 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -77,6 +77,7 @@ import { ExposedStorePaths } from "./store/setupExposeStore"
 import { PathBuilder, extractJsonPath, pathBuilder } from "./store/PathBuilder"
 import { checkAllDependencies } from "./dependencies/dependencies"
 import { health } from "."
+import { GetSslCertificate } from "./util/GetSslCertificate"
 
 export const SDKVersion = testTypeVersion("0.3.6")
 
@@ -88,14 +89,29 @@ type AnyNeverCond<T extends any[], Then, Else> =
     never
 
 export type ServiceInterfaceType = "ui" | "p2p" | "api"
-export type MainEffects = Effects & { _type: "main" }
+export type MainEffects = Effects & {
+  _type: "main"
+  clearCallbacks: () => Promise<void>
+}
 export type Signals = NodeJS.Signals
 export const SIGTERM: Signals = "SIGTERM"
 export const SIGKILL: Signals = "SIGKILL"
 export const NO_TIMEOUT = -1
 
-function removeConstType<E>() {
-  return <T>(t: T) => t as T & (E extends MainEffects ? {} : { const: never })
+function removeCallbackTypes<E extends Effects>(effects: E) {
+  return <T extends object>(t: T) => {
+    if ("_type" in effects && effects._type === "main") {
+      return t as E extends MainEffects ? T : Omit<T, "const" | "watch">
+    } else {
+      if ("const" in t) {
+        delete t.const
+      }
+      if ("watch" in t) {
+        delete t.watch
+      }
+      return t as E extends MainEffects ? T : Omit<T, "const" | "watch">
+    }
+  }
 }
 
 export class StartSdk<Manifest extends T.Manifest, Store> {
@@ -129,26 +145,23 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
       checkAllDependencies,
       serviceInterface: {
         getOwn: <E extends Effects>(effects: E, id: ServiceInterfaceId) =>
-          removeConstType<E>()(
+          removeCallbackTypes<E>(effects)(
             getServiceInterface(effects, {
               id,
-              packageId: null,
             }),
           ),
         get: <E extends Effects>(
           effects: E,
           opts: { id: ServiceInterfaceId; packageId: PackageId },
-        ) => removeConstType<E>()(getServiceInterface(effects, opts)),
+        ) =>
+          removeCallbackTypes<E>(effects)(getServiceInterface(effects, opts)),
         getAllOwn: <E extends Effects>(effects: E) =>
-          removeConstType<E>()(
-            getServiceInterfaces(effects, {
-              packageId: null,
-            }),
-          ),
+          removeCallbackTypes<E>(effects)(getServiceInterfaces(effects, {})),
         getAll: <E extends Effects>(
           effects: E,
           opts: { packageId: PackageId },
-        ) => removeConstType<E>()(getServiceInterfaces(effects, opts)),
+        ) =>
+          removeCallbackTypes<E>(effects)(getServiceInterfaces(effects, opts)),
       },
 
       store: {
@@ -157,7 +170,7 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
           packageId: string,
           path: PathBuilder<Store, StoreValue>,
         ) =>
-          removeConstType<E>()(
+          removeCallbackTypes<E>(effects)(
             getStore<Store, StoreValue>(effects, path, {
               packageId,
             }),
@@ -165,7 +178,10 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
         getOwn: <E extends Effects, StoreValue = unknown>(
           effects: E,
           path: PathBuilder<Store, StoreValue>,
-        ) => removeConstType<E>()(getStore<Store, StoreValue>(effects, path)),
+        ) =>
+          removeCallbackTypes<E>(effects)(
+            getStore<Store, StoreValue>(effects, path),
+          ),
         setOwn: <E extends Effects, Path extends PathBuilder<Store, unknown>>(
           effects: E,
           path: Path,
@@ -241,7 +257,16 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
         },
       ) => new ServiceInterfaceBuilder({ ...options, effects }),
       getSystemSmtp: <E extends Effects>(effects: E) =>
-        removeConstType<E>()(new GetSystemSmtp(effects)),
+        removeCallbackTypes<E>(effects)(new GetSystemSmtp(effects)),
+
+      getSslCerificate: <E extends Effects>(
+        effects: E,
+        hostnames: string[],
+        algorithm?: T.Algorithm,
+      ) =>
+        removeCallbackTypes<E>(effects)(
+          new GetSslCertificate(effects, hostnames, algorithm),
+        ),
 
       createDynamicAction: <
         ConfigType extends
diff --git a/sdk/lib/osBindings/AddAssetParams.ts b/sdk/lib/osBindings/AddAssetParams.ts
index ffd7db675..7522a1cb4 100644
--- a/sdk/lib/osBindings/AddAssetParams.ts
+++ b/sdk/lib/osBindings/AddAssetParams.ts
@@ -1,10 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AnySignature } from "./AnySignature"
 import type { Blake3Commitment } from "./Blake3Commitment"
-import type { Version } from "./Version"
 
 export type AddAssetParams = {
-  version: Version
+  version: string
   platform: string
   url: string
   signature: AnySignature
diff --git a/sdk/lib/osBindings/AddVersionParams.ts b/sdk/lib/osBindings/AddVersionParams.ts
index 4ecbb7dcc..9fc281a6f 100644
--- a/sdk/lib/osBindings/AddVersionParams.ts
+++ b/sdk/lib/osBindings/AddVersionParams.ts
@@ -1,8 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Version } from "./Version"
 
 export type AddVersionParams = {
-  version: Version
+  version: string
   headline: string
   releaseNotes: string
   sourceVersion: string
diff --git a/sdk/lib/osBindings/Callback.ts b/sdk/lib/osBindings/CallbackId.ts
similarity index 76%
rename from sdk/lib/osBindings/Callback.ts
rename to sdk/lib/osBindings/CallbackId.ts
index 1e5cb1af5..0ac5d7ce2 100644
--- a/sdk/lib/osBindings/Callback.ts
+++ b/sdk/lib/osBindings/CallbackId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Callback = () => void
+export type CallbackId = number
diff --git a/sdk/lib/osBindings/CheckDependenciesParam.ts b/sdk/lib/osBindings/CheckDependenciesParam.ts
index 54580a7ff..3a00faf4f 100644
--- a/sdk/lib/osBindings/CheckDependenciesParam.ts
+++ b/sdk/lib/osBindings/CheckDependenciesParam.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { PackageId } from "./PackageId"
 
-export type CheckDependenciesParam = { packageIds: Array<PackageId> | null }
+export type CheckDependenciesParam = { packageIds?: Array<PackageId> }
diff --git a/sdk/lib/osBindings/ChrootParams.ts b/sdk/lib/osBindings/ChrootParams.ts
deleted file mode 100644
index 19131b224..000000000
--- a/sdk/lib/osBindings/ChrootParams.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ChrootParams = {
-  env: string | null
-  workdir: string | null
-  user: string | null
-  path: string
-  command: string
-  args: string[]
-}
diff --git a/sdk/lib/osBindings/DependencyRequirement.ts b/sdk/lib/osBindings/DependencyRequirement.ts
index 01b8e12ce..3b857c476 100644
--- a/sdk/lib/osBindings/DependencyRequirement.ts
+++ b/sdk/lib/osBindings/DependencyRequirement.ts
@@ -1,10 +1,12 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HealthCheckId } from "./HealthCheckId"
+import type { PackageId } from "./PackageId"
 
 export type DependencyRequirement =
   | {
       kind: "running"
-      id: string
-      healthChecks: string[]
+      id: PackageId
+      healthChecks: Array<HealthCheckId>
       versionRange: string
     }
-  | { kind: "exists"; id: string; versionRange: string }
+  | { kind: "exists"; id: PackageId; versionRange: string }
diff --git a/sdk/lib/osBindings/ExecuteAction.ts b/sdk/lib/osBindings/ExecuteAction.ts
index b4eb60949..6e3c44f79 100644
--- a/sdk/lib/osBindings/ExecuteAction.ts
+++ b/sdk/lib/osBindings/ExecuteAction.ts
@@ -1,9 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Guid } from "./Guid"
+import type { ActionId } from "./ActionId"
+import type { PackageId } from "./PackageId"
 
 export type ExecuteAction = {
-  procedureId: Guid
-  serviceId: string | null
-  actionId: string
+  packageId?: PackageId
+  actionId: ActionId
   input: any
 }
diff --git a/sdk/lib/osBindings/ExportActionParams.ts b/sdk/lib/osBindings/ExportActionParams.ts
index 5eee8fc63..8bcfbc349 100644
--- a/sdk/lib/osBindings/ExportActionParams.ts
+++ b/sdk/lib/osBindings/ExportActionParams.ts
@@ -1,4 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId"
 import type { ActionMetadata } from "./ActionMetadata"
+import type { PackageId } from "./PackageId"
 
-export type ExportActionParams = { id: string; metadata: ActionMetadata }
+export type ExportActionParams = {
+  packageId?: PackageId
+  id: ActionId
+  metadata: ActionMetadata
+}
diff --git a/sdk/lib/osBindings/ParamsPackageId.ts b/sdk/lib/osBindings/GetConfiguredParams.ts
similarity index 51%
rename from sdk/lib/osBindings/ParamsPackageId.ts
rename to sdk/lib/osBindings/GetConfiguredParams.ts
index f4dd1c1eb..66fb6e320 100644
--- a/sdk/lib/osBindings/ParamsPackageId.ts
+++ b/sdk/lib/osBindings/GetConfiguredParams.ts
@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId"
 
-export type ParamsPackageId = { packageId: string }
+export type GetConfiguredParams = { packageId?: PackageId }
diff --git a/sdk/lib/osBindings/GetHostInfoParams.ts b/sdk/lib/osBindings/GetHostInfoParams.ts
index 120b4cfe1..ff6d9d709 100644
--- a/sdk/lib/osBindings/GetHostInfoParams.ts
+++ b/sdk/lib/osBindings/GetHostInfoParams.ts
@@ -1,9 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback"
+import type { CallbackId } from "./CallbackId"
 import type { HostId } from "./HostId"
+import type { PackageId } from "./PackageId"
 
 export type GetHostInfoParams = {
   hostId: HostId
-  packageId: string | null
-  callback: Callback
+  packageId?: PackageId
+  callback?: CallbackId
 }
diff --git a/sdk/lib/osBindings/GetOsAssetParams.ts b/sdk/lib/osBindings/GetOsAssetParams.ts
index 9872d0b59..100f711c7 100644
--- a/sdk/lib/osBindings/GetOsAssetParams.ts
+++ b/sdk/lib/osBindings/GetOsAssetParams.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Version } from "./Version"
 
-export type GetOsAssetParams = { version: Version; platform: string }
+export type GetOsAssetParams = { version: string; platform: string }
diff --git a/sdk/lib/osBindings/GetPrimaryUrlParams.ts b/sdk/lib/osBindings/GetPrimaryUrlParams.ts
index dbafa4152..06bf73976 100644
--- a/sdk/lib/osBindings/GetPrimaryUrlParams.ts
+++ b/sdk/lib/osBindings/GetPrimaryUrlParams.ts
@@ -1,9 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback"
-import type { ServiceInterfaceId } from "./ServiceInterfaceId"
+import type { CallbackId } from "./CallbackId"
+import type { HostId } from "./HostId"
+import type { PackageId } from "./PackageId"
 
 export type GetPrimaryUrlParams = {
-  packageId: string | null
-  serviceInterfaceId: ServiceInterfaceId
-  callback: Callback
+  packageId?: PackageId
+  hostId: HostId
+  callback?: CallbackId
 }
diff --git a/sdk/lib/osBindings/GetServiceInterfaceParams.ts b/sdk/lib/osBindings/GetServiceInterfaceParams.ts
index 0a8bdfcb2..b71591e17 100644
--- a/sdk/lib/osBindings/GetServiceInterfaceParams.ts
+++ b/sdk/lib/osBindings/GetServiceInterfaceParams.ts
@@ -1,9 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback"
+import type { CallbackId } from "./CallbackId"
+import type { PackageId } from "./PackageId"
 import type { ServiceInterfaceId } from "./ServiceInterfaceId"
 
 export type GetServiceInterfaceParams = {
-  packageId: string | null
+  packageId?: PackageId
   serviceInterfaceId: ServiceInterfaceId
-  callback: Callback
+  callback?: CallbackId
 }
diff --git a/sdk/lib/osBindings/GetServicePortForwardParams.ts b/sdk/lib/osBindings/GetServicePortForwardParams.ts
index beb423d9a..63236328e 100644
--- a/sdk/lib/osBindings/GetServicePortForwardParams.ts
+++ b/sdk/lib/osBindings/GetServicePortForwardParams.ts
@@ -1,8 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { HostId } from "./HostId"
+import type { PackageId } from "./PackageId"
 
 export type GetServicePortForwardParams = {
-  packageId: string | null
-  internalPort: number
+  packageId?: PackageId
   hostId: HostId
+  internalPort: number
 }
diff --git a/sdk/lib/osBindings/GetSslCertificateParams.ts b/sdk/lib/osBindings/GetSslCertificateParams.ts
index a33eff540..85c677540 100644
--- a/sdk/lib/osBindings/GetSslCertificateParams.ts
+++ b/sdk/lib/osBindings/GetSslCertificateParams.ts
@@ -1,8 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Algorithm } from "./Algorithm"
+import type { CallbackId } from "./CallbackId"
 
 export type GetSslCertificateParams = {
-  packageId: string | null
-  hostId: string
-  algorithm: Algorithm | null
+  hostnames: string[]
+  algorithm?: Algorithm
+  callback?: CallbackId
 }
diff --git a/sdk/lib/osBindings/GetSslKeyParams.ts b/sdk/lib/osBindings/GetSslKeyParams.ts
index 0438c345a..2ca3076c8 100644
--- a/sdk/lib/osBindings/GetSslKeyParams.ts
+++ b/sdk/lib/osBindings/GetSslKeyParams.ts
@@ -1,8 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Algorithm } from "./Algorithm"
 
-export type GetSslKeyParams = {
-  packageId: string | null
-  hostId: string
-  algorithm: Algorithm | null
-}
+export type GetSslKeyParams = { hostnames: string[]; algorithm?: Algorithm }
diff --git a/sdk/lib/osBindings/GetStoreParams.ts b/sdk/lib/osBindings/GetStoreParams.ts
index dc3d4e211..e134cd4a6 100644
--- a/sdk/lib/osBindings/GetStoreParams.ts
+++ b/sdk/lib/osBindings/GetStoreParams.ts
@@ -1,3 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CallbackId } from "./CallbackId"
+import type { PackageId } from "./PackageId"
 
-export type GetStoreParams = { packageId: string | null; path: string }
+export type GetStoreParams = {
+  packageId?: PackageId
+  path: string
+  callback?: CallbackId
+}
diff --git a/sdk/lib/osBindings/GetSystemSmtpParams.ts b/sdk/lib/osBindings/GetSystemSmtpParams.ts
index 650d59c49..73b91057c 100644
--- a/sdk/lib/osBindings/GetSystemSmtpParams.ts
+++ b/sdk/lib/osBindings/GetSystemSmtpParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback"
+import type { CallbackId } from "./CallbackId"
 
-export type GetSystemSmtpParams = { callback: Callback }
+export type GetSystemSmtpParams = { callback: CallbackId | null }
diff --git a/sdk/lib/osBindings/HostAddress.ts b/sdk/lib/osBindings/HostAddress.ts
index 0388e49c7..73b46d8e5 100644
--- a/sdk/lib/osBindings/HostAddress.ts
+++ b/sdk/lib/osBindings/HostAddress.ts
@@ -1,3 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HostAddress = { kind: "onion"; address: string }
+export type HostAddress =
+  | { kind: "onion"; address: string }
+  | { kind: "domain"; address: string }
diff --git a/sdk/lib/osBindings/ListServiceInterfacesParams.ts b/sdk/lib/osBindings/ListServiceInterfacesParams.ts
index 4140831d0..fd27ace2b 100644
--- a/sdk/lib/osBindings/ListServiceInterfacesParams.ts
+++ b/sdk/lib/osBindings/ListServiceInterfacesParams.ts
@@ -1,7 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Callback } from "./Callback"
+import type { CallbackId } from "./CallbackId"
+import type { PackageId } from "./PackageId"
 
 export type ListServiceInterfacesParams = {
-  packageId: string | null
-  callback: Callback
+  packageId?: PackageId
+  callback?: CallbackId
 }
diff --git a/sdk/lib/osBindings/ListVersionSignersParams.ts b/sdk/lib/osBindings/ListVersionSignersParams.ts
index d066fbeb4..baf516bf2 100644
--- a/sdk/lib/osBindings/ListVersionSignersParams.ts
+++ b/sdk/lib/osBindings/ListVersionSignersParams.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Version } from "./Version"
 
-export type ListVersionSignersParams = { version: Version }
+export type ListVersionSignersParams = { version: string }
diff --git a/sdk/lib/osBindings/MountTarget.ts b/sdk/lib/osBindings/MountTarget.ts
index e4888d075..bbee5453b 100644
--- a/sdk/lib/osBindings/MountTarget.ts
+++ b/sdk/lib/osBindings/MountTarget.ts
@@ -1,8 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId"
+import type { VolumeId } from "./VolumeId"
 
 export type MountTarget = {
-  packageId: string
-  volumeId: string
+  packageId: PackageId
+  volumeId: VolumeId
   subpath: string | null
   readonly: boolean
 }
diff --git a/sdk/lib/osBindings/OsIndex.ts b/sdk/lib/osBindings/OsIndex.ts
index 9fb795402..fe9a4e395 100644
--- a/sdk/lib/osBindings/OsIndex.ts
+++ b/sdk/lib/osBindings/OsIndex.ts
@@ -1,5 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { OsVersionInfo } from "./OsVersionInfo"
-import type { Version } from "./Version"
+import type { OsVersionInfoMap } from "./OsVersionInfoMap"
 
-export type OsIndex = { versions: { [key: Version]: OsVersionInfo } }
+export type OsIndex = { versions: OsVersionInfoMap }
diff --git a/sdk/lib/osBindings/OsVersionInfoMap.ts b/sdk/lib/osBindings/OsVersionInfoMap.ts
new file mode 100644
index 000000000..6f333f1fb
--- /dev/null
+++ b/sdk/lib/osBindings/OsVersionInfoMap.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { OsVersionInfo } from "./OsVersionInfo"
+
+export type OsVersionInfoMap = { [key: string]: OsVersionInfo }
diff --git a/sdk/lib/osBindings/ParamsMaybePackageId.ts b/sdk/lib/osBindings/ParamsMaybePackageId.ts
deleted file mode 100644
index a20bb9aa5..000000000
--- a/sdk/lib/osBindings/ParamsMaybePackageId.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ParamsMaybePackageId = { packageId: string | null }
diff --git a/sdk/lib/osBindings/RemoveActionParams.ts b/sdk/lib/osBindings/RemoveActionParams.ts
deleted file mode 100644
index c343620b8..000000000
--- a/sdk/lib/osBindings/RemoveActionParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type RemoveActionParams = { id: string }
diff --git a/sdk/lib/osBindings/RemoveAddressParams.ts b/sdk/lib/osBindings/RemoveAddressParams.ts
deleted file mode 100644
index 14099ebbc..000000000
--- a/sdk/lib/osBindings/RemoveAddressParams.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ServiceInterfaceId } from "./ServiceInterfaceId"
-
-export type RemoveAddressParams = { id: ServiceInterfaceId }
diff --git a/sdk/lib/osBindings/RemoveVersionParams.ts b/sdk/lib/osBindings/RemoveVersionParams.ts
index d00a6ee9e..2c974de56 100644
--- a/sdk/lib/osBindings/RemoveVersionParams.ts
+++ b/sdk/lib/osBindings/RemoveVersionParams.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Version } from "./Version"
 
-export type RemoveVersionParams = { version: Version }
+export type RemoveVersionParams = { version: string }
diff --git a/sdk/lib/osBindings/ServerInfo.ts b/sdk/lib/osBindings/ServerInfo.ts
index 935e3a99f..76840cfc4 100644
--- a/sdk/lib/osBindings/ServerInfo.ts
+++ b/sdk/lib/osBindings/ServerInfo.ts
@@ -2,6 +2,7 @@
 import type { Governor } from "./Governor"
 import type { IpInfo } from "./IpInfo"
 import type { ServerStatus } from "./ServerStatus"
+import type { SmtpValue } from "./SmtpValue"
 import type { WifiInfo } from "./WifiInfo"
 
 export type ServerInfo = {
@@ -28,5 +29,5 @@ export type ServerInfo = {
   ntpSynced: boolean
   zram: boolean
   governor: Governor | null
-  smtp: string | null
+  smtp: SmtpValue | null
 }
diff --git a/sdk/lib/osBindings/SetSystemSmtpParams.ts b/sdk/lib/osBindings/SetSystemSmtpParams.ts
deleted file mode 100644
index 49c66e86c..000000000
--- a/sdk/lib/osBindings/SetSystemSmtpParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type SetSystemSmtpParams = { smtp: string }
diff --git a/sdk/lib/osBindings/SignAssetParams.ts b/sdk/lib/osBindings/SignAssetParams.ts
index d55a061a7..39f54ad69 100644
--- a/sdk/lib/osBindings/SignAssetParams.ts
+++ b/sdk/lib/osBindings/SignAssetParams.ts
@@ -1,9 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AnySignature } from "./AnySignature"
-import type { Version } from "./Version"
 
 export type SignAssetParams = {
-  version: Version
+  version: string
   platform: string
   signature: AnySignature
 }
diff --git a/sdk/lib/osBindings/SmtpValue.ts b/sdk/lib/osBindings/SmtpValue.ts
new file mode 100644
index 000000000..5291d6602
--- /dev/null
+++ b/sdk/lib/osBindings/SmtpValue.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SmtpValue = {
+  server: string
+  port: number
+  from: string
+  login: string
+  password: string | null
+}
diff --git a/sdk/lib/osBindings/VersionSignerParams.ts b/sdk/lib/osBindings/VersionSignerParams.ts
index 102eecefd..781e2a4df 100644
--- a/sdk/lib/osBindings/VersionSignerParams.ts
+++ b/sdk/lib/osBindings/VersionSignerParams.ts
@@ -1,5 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Guid } from "./Guid"
-import type { Version } from "./Version"
 
-export type VersionSignerParams = { version: Version; signer: Guid }
+export type VersionSignerParams = { version: string; signer: Guid }
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 70ce65f29..2bf2bf69c 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -24,11 +24,10 @@ export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
 export { Blake3Commitment } from "./Blake3Commitment"
 export { BlockDev } from "./BlockDev"
-export { Callback } from "./Callback"
+export { CallbackId } from "./CallbackId"
 export { Category } from "./Category"
 export { CheckDependenciesParam } from "./CheckDependenciesParam"
 export { CheckDependenciesResult } from "./CheckDependenciesResult"
-export { ChrootParams } from "./ChrootParams"
 export { Cifs } from "./Cifs"
 export { ContactInfo } from "./ContactInfo"
 export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams"
@@ -50,6 +49,7 @@ export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams"
 export { ExposeForDependentsParams } from "./ExposeForDependentsParams"
 export { FullIndex } from "./FullIndex"
 export { FullProgress } from "./FullProgress"
+export { GetConfiguredParams } from "./GetConfiguredParams"
 export { GetHostInfoParams } from "./GetHostInfoParams"
 export { GetOsAssetParams } from "./GetOsAssetParams"
 export { GetOsVersionParams } from "./GetOsVersionParams"
@@ -99,6 +99,7 @@ export { MountTarget } from "./MountTarget"
 export { NamedProgress } from "./NamedProgress"
 export { OnionHostname } from "./OnionHostname"
 export { OsIndex } from "./OsIndex"
+export { OsVersionInfoMap } from "./OsVersionInfoMap"
 export { OsVersionInfo } from "./OsVersionInfo"
 export { PackageDataEntry } from "./PackageDataEntry"
 export { PackageDetailLevel } from "./PackageDetailLevel"
@@ -108,8 +109,6 @@ export { PackageInfoShort } from "./PackageInfoShort"
 export { PackageInfo } from "./PackageInfo"
 export { PackageState } from "./PackageState"
 export { PackageVersionInfo } from "./PackageVersionInfo"
-export { ParamsMaybePackageId } from "./ParamsMaybePackageId"
-export { ParamsPackageId } from "./ParamsPackageId"
 export { PasswordType } from "./PasswordType"
 export { PathOrUrl } from "./PathOrUrl"
 export { ProcedureId } from "./ProcedureId"
@@ -118,8 +117,6 @@ export { Public } from "./Public"
 export { RecoverySource } from "./RecoverySource"
 export { RegistryAsset } from "./RegistryAsset"
 export { RegistryInfo } from "./RegistryInfo"
-export { RemoveActionParams } from "./RemoveActionParams"
-export { RemoveAddressParams } from "./RemoveAddressParams"
 export { RemoveVersionParams } from "./RemoveVersionParams"
 export { RequestCommitment } from "./RequestCommitment"
 export { Security } from "./Security"
@@ -138,13 +135,13 @@ export { SetHealth } from "./SetHealth"
 export { SetMainStatusStatus } from "./SetMainStatusStatus"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetStoreParams } from "./SetStoreParams"
-export { SetSystemSmtpParams } from "./SetSystemSmtpParams"
 export { SetupExecuteParams } from "./SetupExecuteParams"
 export { SetupProgress } from "./SetupProgress"
 export { SetupResult } from "./SetupResult"
 export { SetupStatusRes } from "./SetupStatusRes"
 export { SignAssetParams } from "./SignAssetParams"
 export { SignerInfo } from "./SignerInfo"
+export { SmtpValue } from "./SmtpValue"
 export { Status } from "./Status"
 export { UpdatingState } from "./UpdatingState"
 export { VerifyCifsParams } from "./VerifyCifsParams"
diff --git a/sdk/lib/store/getStore.ts b/sdk/lib/store/getStore.ts
index 38265c7fd..5250a02a1 100644
--- a/sdk/lib/store/getStore.ts
+++ b/sdk/lib/store/getStore.ts
@@ -28,7 +28,6 @@ export class GetStore<Store, StoreValue> {
     return this.effects.store.get<Store, StoreValue>({
       ...this.options,
       path: extractJsonPath(this.path),
-      callback: () => {},
     })
   }
 
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index 79ec62106..846967c31 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -2,14 +2,13 @@ import { Effects } from "../types"
 import {
   CheckDependenciesParam,
   ExecuteAction,
+  GetConfiguredParams,
   SetMainStatus,
 } from ".././osBindings"
 import { CreateOverlayedImageParams } from ".././osBindings"
 import { DestroyOverlayedImageParams } from ".././osBindings"
 import { BindParams } from ".././osBindings"
 import { GetHostInfoParams } from ".././osBindings"
-import { ParamsPackageId } from ".././osBindings"
-import { ParamsMaybePackageId } from ".././osBindings"
 import { SetConfigured } from ".././osBindings"
 import { SetHealth } from ".././osBindings"
 import { ExposeForDependentsParams } from ".././osBindings"
@@ -22,11 +21,12 @@ import { GetServicePortForwardParams } from ".././osBindings"
 import { ExportServiceInterfaceParams } from ".././osBindings"
 import { GetPrimaryUrlParams } from ".././osBindings"
 import { ListServiceInterfacesParams } from ".././osBindings"
-import { RemoveAddressParams } from ".././osBindings"
 import { ExportActionParams } from ".././osBindings"
-import { RemoveActionParams } from ".././osBindings"
 import { MountParams } from ".././osBindings"
 function typeEquality<ExpectedType>(_a: ExpectedType) {}
+
+type WithCallback<T> = Omit<T, "callback"> & { callback: () => void }
+
 describe("startosTypeValidation ", () => {
   test(`checking the params match`, () => {
     const testInput: any = {}
@@ -39,32 +39,29 @@ describe("startosTypeValidation ", () => {
       createOverlayedImage: {} as CreateOverlayedImageParams,
       destroyOverlayedImage: {} as DestroyOverlayedImageParams,
       clearBindings: undefined,
+      getInstalledPackages: undefined,
       bind: {} as BindParams,
-      getHostInfo: {} as GetHostInfoParams,
-      exists: {} as ParamsPackageId,
-      getConfigured: undefined,
-      stopped: {} as ParamsMaybePackageId,
-      running: {} as ParamsPackageId,
+      getHostInfo: {} as WithCallback<GetHostInfoParams>,
+      getConfigured: {} as GetConfiguredParams,
       restart: undefined,
       shutdown: undefined,
       setConfigured: {} as SetConfigured,
       setHealth: {} as SetHealth,
       exposeForDependents: {} as ExposeForDependentsParams,
-      getSslCertificate: {} as GetSslCertificateParams,
+      getSslCertificate: {} as WithCallback<GetSslCertificateParams>,
       getSslKey: {} as GetSslKeyParams,
-      getServiceInterface: {} as GetServiceInterfaceParams,
+      getServiceInterface: {} as WithCallback<GetServiceInterfaceParams>,
       setDependencies: {} as SetDependenciesParams,
       store: {} as never,
-      getSystemSmtp: {} as GetSystemSmtpParams,
+      getSystemSmtp: {} as WithCallback<GetSystemSmtpParams>,
       getContainerIp: undefined,
       getServicePortForward: {} as GetServicePortForwardParams,
       clearServiceInterfaces: undefined,
       exportServiceInterface: {} as ExportServiceInterfaceParams,
-      getPrimaryUrl: {} as GetPrimaryUrlParams,
-      listServiceInterfaces: {} as ListServiceInterfacesParams,
-      removeAddress: {} as RemoveAddressParams,
+      getPrimaryUrl: {} as WithCallback<GetPrimaryUrlParams>,
+      listServiceInterfaces: {} as WithCallback<ListServiceInterfacesParams>,
       exportAction: {} as ExportActionParams,
-      removeAction: {} as RemoveActionParams,
+      clearActions: undefined,
       mount: {} as MountParams,
       checkDependencies: {} as CheckDependenciesParam,
       getDependencies: undefined,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index e9c766448..9a3157ed3 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -13,6 +13,8 @@ import {
   BindParams,
   Manifest,
   CheckDependenciesResult,
+  ActionId,
+  HostId,
 } from "./osBindings"
 
 import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
@@ -289,50 +291,135 @@ export type PropertiesReturn = {
 
 /** Used to reach out from the pure js runtime */
 export type Effects = {
+  // action
+
+  /** Run an action exported by a service */
   executeAction<Input>(opts: {
-    serviceId: string | null
+    packageId?: PackageId
+    actionId: ActionId
     input: Input
   }): Promise<unknown>
+  /** Define an action that can be invoked by a user or service */
+  exportAction(options: {
+    id: ActionId
+    metadata: ActionMetadata
+  }): Promise<void>
+  /** Remove all exported actions */
+  clearActions(): Promise<void>
+
+  // config
+
+  /** Returns whether or not the package has been configured */
+  getConfigured(options: { packageId?: PackageId }): Promise<boolean>
+  /** Indicates that this package has been configured. Called during setConfig or init */
+  setConfigured(options: { configured: boolean }): Promise<void>
 
-  /** A low level api used by makeOverlay */
-  createOverlayedImage(options: { imageId: string }): Promise<[string, string]>
+  // control
+
+  /** restart this service's main function */
+  restart(): Promise<void>
+  /** stop this service's main function */
+  shutdown(): Promise<void>
+  /** indicate to the host os what runstate the service is in */
+  setMainStatus(options: SetMainStatus): Promise<void>
 
-  /** A low level api used by destroyOverlay + makeOverlay:destroy */
+  // dependency
+
+  /** Set the dependencies of what the service needs, usually run during the set config as a best practice */
+  setDependencies(options: {
+    dependencies: Dependencies
+  }): Promise<DependenciesReceipt>
+  /** Get the list of the dependencies, both the dynamic set by the effect of setDependencies and the end result any required in the manifest  */
+  getDependencies(): Promise<DependencyRequirement[]>
+  /** Test whether current dependency requirements are satisfied */
+  checkDependencies(options: {
+    packageIds?: PackageId[]
+  }): Promise<CheckDependenciesResult[]>
+  /** mount a volume of a dependency */
+  mount(options: {
+    location: string
+    target: {
+      packageId: string
+      volumeId: string
+      subpath: string | null
+      readonly: boolean
+    }
+  }): Promise<string>
+  /** Returns a list of the ids of all installed packages */
+  getInstalledPackages(): Promise<string[]>
+  /** grants access to certain paths in the store to dependents */
+  exposeForDependents(options: { paths: string[] }): Promise<void>
+
+  // health
+
+  /** sets the result of a health check */
+  setHealth(o: SetHealth): Promise<void>
+
+  // image
+
+  /** A low level api used by Overlay */
+  createOverlayedImage(options: { imageId: string }): Promise<[string, string]>
+  /** A low level api used by Overlay */
   destroyOverlayedImage(options: { guid: string }): Promise<void>
 
-  /** Removes all network bindings */
-  clearBindings(): Promise<void>
+  // net
+
+  // bind
   /** Creates a host connected to the specified port with the provided options */
   bind(options: BindParams): Promise<void>
-  /** Retrieves the current hostname(s) associated with a host id */
-  // getHostInfo(options: {
-  //   kind: "static" | "single"
-  //   serviceInterfaceId: string
-  //   packageId: string | null
-  //   callback: () => void
-  // }): Promise<SingleHost>
+  /** Get the port address for a service */
+  getServicePortForward(options: {
+    packageId?: PackageId
+    hostId: HostId
+    internalPort: number
+  }): Promise<LanInfo>
+  /** Removes all network bindings */
+  clearBindings(): Promise<void>
+  // host
+  /** Returns information about the specified host, if it exists */
   getHostInfo(options: {
-    hostId: string
-    packageId: string | null
-    callback: () => void
-  }): Promise<Host>
-
-  // /**
-  //  * Run rsync between two volumes. This is used to backup data between volumes.
-  //  * This is a long running process, and a structure that we can either wait for, or get the progress of.
-  //  */
-  // runRsync(options: {
-  //   srcVolume: string
-  //   dstVolume: string
-  //   srcPath: string
-  //   dstPath: string
-  //   // rsync options: https://linux.die.net/man/1/rsync
-  //   options: BackupOptions
-  // }): {
-  //   id: () => Promise<string>
-  //   wait: () => Promise<null>
-  //   progress: () => Promise<number>
-  // }
+    packageId?: PackageId
+    hostId: HostId
+    callback?: () => void
+  }): Promise<Host | null>
+  /** Returns the primary url that a user has selected for a host, if it exists */
+  getPrimaryUrl(options: {
+    packageId?: PackageId
+    hostId: HostId
+    callback?: () => void
+  }): Promise<UrlString | null>
+  /** Returns the IP address of the container */
+  getContainerIp(): Promise<string>
+  // interface
+  /** Creates an interface bound to a specific host and port to show to the user */
+  exportServiceInterface(options: ExportServiceInterfaceParams): Promise<void>
+  /** Returns an exported service interface */
+  getServiceInterface(options: {
+    packageId?: PackageId
+    serviceInterfaceId: ServiceInterfaceId
+    callback?: () => void
+  }): Promise<ServiceInterface | null>
+  /** Returns all exported service interfaces for a package */
+  listServiceInterfaces(options: {
+    packageId?: PackageId
+    callback?: () => void
+  }): Promise<Record<ServiceInterfaceId, ServiceInterface>>
+  /** Removes all service interfaces */
+  clearServiceInterfaces(): Promise<void>
+  // ssl
+  /** Returns a PEM encoded fullchain for the hostnames specified */
+  getSslCertificate: (options: {
+    hostnames: string[]
+    algorithm?: "ecdsa" | "ed25519"
+    callback?: () => void
+  }) => Promise<[string, string, string]>
+  /** Returns a PEM encoded private key corresponding to the certificate for the hostnames specified */
+  getSslKey: (options: {
+    hostnames: string[]
+    algorithm?: "ecdsa" | "ed25519"
+  }) => Promise<string>
+
+  // store
 
   store: {
     /** Get a value in a json like data, can be observed and subscribed */
@@ -341,7 +428,7 @@ export type Effects = {
       packageId?: string
       /** The path defaults to root level, using the [JsonPath](https://jsonpath.com/) */
       path: StorePath
-      callback: (config: unknown, previousConfig: unknown) => void
+      callback?: () => void
     }): Promise<ExtractStore>
     /** Used to store values that can be accessed and subscribed to */
     set<Store = never, ExtractStore = unknown>(options: {
@@ -351,136 +438,10 @@ export type Effects = {
     }): Promise<void>
   }
 
-  setMainStatus(o: SetMainStatus): Promise<void>
-
-  getSystemSmtp(input: {
-    callback: (config: unknown, previousConfig: unknown) => void
-  }): Promise<SmtpValue>
-
-  /** Get the IP address of the container */
-  getContainerIp(): Promise<string>
-  /**
-   * Get the port address for another service
-   */
-  getServicePortForward(options: {
-    internalPort: number
-    packageId: string | null
-  }): Promise<LanInfo>
-
-  /** Removes all network interfaces */
-  clearServiceInterfaces(): Promise<void>
-  /** When we want to create a link in the front end interfaces, and example is
-   * exposing a url to view a web service
-   */
-  exportServiceInterface(options: ExportServiceInterfaceParams): Promise<string>
-
-  exposeForDependents(options: { paths: string[] }): Promise<void>
-
-  /**
-   * There are times that we want to see the addresses that where exported
-   * @param options.addressId If we want to filter the address id
-   *
-   * Note: any auth should be filtered out already
-   */
-  getServiceInterface(options: {
-    packageId: PackageId | null
-    serviceInterfaceId: ServiceInterfaceId
-    callback: () => void
-  }): Promise<ServiceInterface>
-
-  /**
-   * The user sets the primary url for a interface
-   * @param options
-   */
-  getPrimaryUrl(options: GetPrimaryUrlParams): Promise<UrlString | null>
-
-  /**
-   * There are times that we want to see the addresses that where exported
-   * @param options.addressId If we want to filter the address id
-   *
-   * Note: any auth should be filtered out already
-   */
-  listServiceInterfaces(options: {
-    packageId: PackageId | null
-    callback: () => void
-  }): Promise<Record<ServiceInterfaceId, ServiceInterface>>
-
-  /**
-   *Remove an address that was exported. Used problably during main or during setConfig.
-   * @param options
-   */
-  removeAddress(options: { id: string }): Promise<void>
-
-  /**
-   *
-   * @param options
-   */
-  exportAction(options: { id: string; metadata: ActionMetadata }): Promise<void>
-  /**
-   * Remove an action that was exported. Used problably during main or during setConfig.
-   */
-  removeAction(options: { id: string }): Promise<void>
-
-  getConfigured(): Promise<boolean>
-  /**
-   * This called after a valid set config as well as during init.
-   * @param configured
-   */
-  setConfigured(options: { configured: boolean }): Promise<void>
-
-  /**
-   *
-   * @returns  PEM encoded fullchain (ecdsa)
-   */
-  getSslCertificate: (options: {
-    packageId: string | null
-    hostId: string
-    algorithm: "ecdsa" | "ed25519" | null
-  }) => Promise<[string, string, string]>
-  /**
-   * @returns PEM encoded ssl key (ecdsa)
-   */
-  getSslKey: (options: {
-    packageId: string | null
-    hostId: string
-    algorithm: "ecdsa" | "ed25519" | null
-  }) => Promise<string>
-
-  setHealth(o: SetHealth): Promise<void>
-
-  /** Set the dependencies of what the service needs, usually ran during the set config as a best practice */
-  setDependencies(options: {
-    dependencies: Dependencies
-  }): Promise<DependenciesReceipt>
-
-  /** Get the list of the dependencies, both the dynamic set by the effect of setDependencies and the end result any required in the manifest  */
-  getDependencies(): Promise<DependencyRequirement[]>
-
-  /** When one wants to checks the status of several services during the checking of dependencies. The result will include things like the status
-   * of the service and what the current health checks are.
-   */
-  checkDependencies(options: {
-    packageIds: PackageId[] | null
-  }): Promise<CheckDependenciesResult[]>
-  /** Exists could be useful during the runtime to know if some service exists, option dep */
-  exists(options: { packageId: PackageId }): Promise<boolean>
-  /** Exists could be useful during the runtime to know if some service is running, option dep */
-  running(options: { packageId: PackageId }): Promise<boolean>
-
-  restart(): Promise<void>
-  shutdown(): Promise<void>
-
-  mount(options: {
-    location: string
-    target: {
-      packageId: string
-      volumeId: string
-      subpath: string | null
-      readonly: boolean
-    }
-  }): Promise<string>
+  // system
 
-  stopped(options: { packageId: string | null }): Promise<boolean>
+  /** Returns globally configured SMTP settings, if they exist */
+  getSystemSmtp(options: { callback?: () => void }): Promise<SmtpValue | null>
 }
 
 /** rsync options: https://linux.die.net/man/1/rsync
diff --git a/sdk/lib/util/GetSslCertificate.ts b/sdk/lib/util/GetSslCertificate.ts
new file mode 100644
index 000000000..df19607d4
--- /dev/null
+++ b/sdk/lib/util/GetSslCertificate.ts
@@ -0,0 +1,47 @@
+import { T } from ".."
+import { Effects } from "../types"
+
+export class GetSslCertificate {
+  constructor(
+    readonly effects: Effects,
+    readonly hostnames: string[],
+    readonly algorithm?: T.Algorithm,
+  ) {}
+
+  /**
+   * Returns the system SMTP credentials. Restarts the service if the credentials change
+   */
+  const() {
+    return this.effects.getSslCertificate({
+      hostnames: this.hostnames,
+      algorithm: this.algorithm,
+      callback: this.effects.restart,
+    })
+  }
+  /**
+   * Returns the system SMTP credentials. Does nothing if the credentials change
+   */
+  once() {
+    return this.effects.getSslCertificate({
+      hostnames: this.hostnames,
+      algorithm: this.algorithm,
+    })
+  }
+  /**
+   * Watches the system SMTP credentials. Takes a custom callback function to run whenever the credentials change
+   */
+  async *watch() {
+    while (true) {
+      let callback: () => void
+      const waitForNext = new Promise<void>((resolve) => {
+        callback = resolve
+      })
+      yield await this.effects.getSslCertificate({
+        hostnames: this.hostnames,
+        algorithm: this.algorithm,
+        callback: () => callback(),
+      })
+      await waitForNext
+    }
+  }
+}
diff --git a/sdk/lib/util/GetSystemSmtp.ts b/sdk/lib/util/GetSystemSmtp.ts
index 1853afd78..498a2d8b2 100644
--- a/sdk/lib/util/GetSystemSmtp.ts
+++ b/sdk/lib/util/GetSystemSmtp.ts
@@ -15,9 +15,7 @@ export class GetSystemSmtp {
    * Returns the system SMTP credentials. Does nothing if the credentials change
    */
   once() {
-    return this.effects.getSystemSmtp({
-      callback: () => {},
-    })
+    return this.effects.getSystemSmtp({})
   }
   /**
    * Watches the system SMTP credentials. Takes a custom callback function to run whenever the credentials change
diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index a2f17be10..b41d8a15f 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -55,9 +55,9 @@ export type ServiceInterfaceFilled = {
   /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
   masked: boolean
   /** Information about the host for this binding */
-  host: Host
+  host: Host | null
   /** URI information */
-  addressInfo: FilledAddressInfo
+  addressInfo: FilledAddressInfo | null
   /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
   type: ServiceInterfaceType
   /** The primary hostname for the service, as chosen by the user */
@@ -183,33 +183,36 @@ const makeInterfaceFilled = async ({
 }: {
   effects: Effects
   id: string
-  packageId: string | null
-  callback: () => void
+  packageId?: string
+  callback?: () => void
 }) => {
   const serviceInterfaceValue = await effects.getServiceInterface({
     serviceInterfaceId: id,
     packageId,
     callback,
   })
+  if (!serviceInterfaceValue) {
+    return null
+  }
   const hostId = serviceInterfaceValue.addressInfo.hostId
   const host = await effects.getHostInfo({
     packageId,
     hostId,
     callback,
   })
-  const primaryUrl = await effects
-    .getPrimaryUrl({
-      serviceInterfaceId: id,
-      packageId,
-      callback,
-    })
-    .catch((e) => null)
+  const primaryUrl = await effects.getPrimaryUrl({
+    hostId,
+    packageId,
+    callback,
+  })
 
   const interfaceFilled: ServiceInterfaceFilled = {
     ...serviceInterfaceValue,
     primaryUrl: primaryUrl,
     host,
-    addressInfo: filledAddress(host, serviceInterfaceValue.addressInfo),
+    addressInfo: host
+      ? filledAddress(host, serviceInterfaceValue.addressInfo)
+      : null,
     get primaryHostname() {
       if (primaryUrl == null) return null
       return getHostname(primaryUrl)
@@ -221,7 +224,7 @@ const makeInterfaceFilled = async ({
 export class GetServiceInterface {
   constructor(
     readonly effects: Effects,
-    readonly opts: { id: string; packageId: string | null },
+    readonly opts: { id: string; packageId?: string },
   ) {}
 
   /**
@@ -230,7 +233,7 @@ export class GetServiceInterface {
   async const() {
     const { id, packageId } = this.opts
     const callback = this.effects.restart
-    const interfaceFilled: ServiceInterfaceFilled = await makeInterfaceFilled({
+    const interfaceFilled = await makeInterfaceFilled({
       effects: this.effects,
       id,
       packageId,
@@ -244,12 +247,10 @@ export class GetServiceInterface {
    */
   async once() {
     const { id, packageId } = this.opts
-    const callback = () => {}
-    const interfaceFilled: ServiceInterfaceFilled = await makeInterfaceFilled({
+    const interfaceFilled = await makeInterfaceFilled({
       effects: this.effects,
       id,
       packageId,
-      callback,
     })
 
     return interfaceFilled
@@ -277,7 +278,7 @@ export class GetServiceInterface {
 }
 export function getServiceInterface(
   effects: Effects,
-  opts: { id: string; packageId: string | null },
+  opts: { id: string; packageId?: string },
 ) {
   return new GetServiceInterface(effects, opts)
 }
diff --git a/sdk/lib/util/getServiceInterfaces.ts b/sdk/lib/util/getServiceInterfaces.ts
index c4cdc6b59..9f0e242b8 100644
--- a/sdk/lib/util/getServiceInterfaces.ts
+++ b/sdk/lib/util/getServiceInterfaces.ts
@@ -11,8 +11,8 @@ const makeManyInterfaceFilled = async ({
   callback,
 }: {
   effects: Effects
-  packageId: string | null
-  callback: () => void
+  packageId?: string
+  callback?: () => void
 }) => {
   const serviceInterfaceValues = await effects.listServiceInterfaces({
     packageId,
@@ -27,9 +27,12 @@ const makeManyInterfaceFilled = async ({
         hostId,
         callback,
       })
+      if (!host) {
+        throw new Error(`host ${hostId} not found!`)
+      }
       const primaryUrl = await effects
         .getPrimaryUrl({
-          serviceInterfaceId: serviceInterfaceValue.id,
+          hostId,
           packageId,
           callback,
         })
@@ -52,7 +55,7 @@ const makeManyInterfaceFilled = async ({
 export class GetServiceInterfaces {
   constructor(
     readonly effects: Effects,
-    readonly opts: { packageId: string | null },
+    readonly opts: { packageId?: string },
   ) {}
 
   /**
@@ -75,12 +78,10 @@ export class GetServiceInterfaces {
    */
   async once() {
     const { packageId } = this.opts
-    const callback = () => {}
     const interfaceFilled: ServiceInterfaceFilled[] =
       await makeManyInterfaceFilled({
         effects: this.effects,
         packageId,
-        callback,
       })
 
     return interfaceFilled
@@ -107,7 +108,7 @@ export class GetServiceInterfaces {
 }
 export function getServiceInterfaces(
   effects: Effects,
-  opts: { packageId: string | null },
+  opts: { packageId?: string },
 ) {
   return new GetServiceInterfaces(effects, opts)
 }
diff --git a/sdk/package.json b/sdk/package.json
index e03153722..1f9090b14 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha5",
+  "version": "0.3.6-alpha6",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./cjs/lib/index.js",
   "types": "./cjs/lib/index.d.ts",
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 7b0d6b1df..8b4c28d1e 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -74,7 +74,7 @@ export const mockPatchData: DataModel = {
     platform: 'x86_64-nonfree',
     zram: true,
     governor: 'performance',
-    smtp: 'todo',
+    smtp: null,
     wifi: {
       interface: 'wlan0',
       ssids: [],

From e04b93a51a212987a21b2e6a8f760a91caea8573 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 12:17:13 -0600
Subject: [PATCH 196/341] fix builds on platforms without kernel support for
 `squashfs`

---
 .github/workflows/startos-iso.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index c51eafc5c..010c79594 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -83,7 +83,7 @@ jobs:
         uses: docker/setup-qemu-action@v3
 
       - name: Set up system dependencies
-        run: sudo apt-get update && sudo apt-get install -y qemu-user-static systemd-container
+        run: sudo apt-get update && sudo apt-get install -y qemu-user-static systemd-container squashfuse
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

From c3d17bf8476bf312c08f7a7808526a0be93b3cc4 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 12:26:49 -0600
Subject: [PATCH 197/341] fix sync_db middleware

---
 core/startos/src/context/rpc.rs   |  4 ++-
 core/startos/src/db/mod.rs        | 48 +++++++++++++++++++++++++++++--
 core/startos/src/middleware/db.rs |  9 +++---
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index ba1ab3fbb..cea2059d3 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -11,7 +11,7 @@ use josekit::jwk::Jwk;
 use reqwest::{Client, Proxy};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{CallRemote, Context, Empty};
-use tokio::sync::{broadcast, Mutex, RwLock};
+use tokio::sync::{broadcast, watch, Mutex, RwLock};
 use tokio::time::Instant;
 use tracing::instrument;
 
@@ -43,6 +43,7 @@ pub struct RpcContextSeed {
     pub datadir: PathBuf,
     pub disk_guid: Arc<String>,
     pub db: TypedPatchDb<Database>,
+    pub sync_db: watch::Sender<u64>,
     pub account: RwLock<AccountInfo>,
     pub net_controller: Arc<NetController>,
     pub s9pk_arch: Option<&'static str>,
@@ -212,6 +213,7 @@ impl RpcContext {
                 find_eth_iface().await?
             },
             disk_guid,
+            sync_db: watch::Sender::new(db.sequence().await),
             db,
             account: RwLock::new(account),
             net_controller,
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index e59161e9b..ef35bd30d 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -10,10 +10,12 @@ use clap::Parser;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use patch_db::json_ptr::{JsonPointer, ROOT};
-use patch_db::{Dump, Revision};
+use patch_db::{DiffPatch, Dump, Revision};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
+use tokio::sync::mpsc::{self, UnboundedReceiver};
+use tokio::sync::watch;
 use tracing::instrument;
 use ts_rs::TS;
 
@@ -124,14 +126,56 @@ pub struct SubscribeRes {
     pub guid: Guid,
 }
 
+struct DbSubscriber {
+    rev: u64,
+    sub: UnboundedReceiver<Revision>,
+    sync_db: watch::Receiver<u64>,
+}
+impl DbSubscriber {
+    async fn recv(&mut self) -> Option<Revision> {
+        loop {
+            tokio::select! {
+                rev = self.sub.recv() => {
+                    if let Some(rev) = rev.as_ref() {
+                        self.rev = rev.id;
+                    }
+                    return rev
+                }
+                _ = self.sync_db.changed() => {
+                    let id = *self.sync_db.borrow();
+                    if id > self.rev {
+                        match self.sub.try_recv() {
+                            Ok(rev) => {
+                                self.rev = rev.id;
+                                return Some(rev)
+                            }
+                            Err(mpsc::error::TryRecvError::Disconnected) => {
+                                return None
+                            }
+                            Err(mpsc::error::TryRecvError::Empty) => {
+                                return Some(Revision { id, patch: DiffPatch::default() })
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
 pub async fn subscribe(
     ctx: RpcContext,
     SubscribeParams { pointer, session }: SubscribeParams,
 ) -> Result<SubscribeRes, Error> {
-    let (dump, mut sub) = ctx
+    let (dump, sub) = ctx
         .db
         .dump_and_sub(pointer.unwrap_or_else(|| PUBLIC.clone()))
         .await;
+    let mut sub = DbSubscriber {
+        rev: dump.id,
+        sub,
+        sync_db: ctx.sync_db.subscribe(),
+    };
     let guid = Guid::new();
     ctx.rpc_continuations
         .add(
diff --git a/core/startos/src/middleware/db.rs b/core/startos/src/middleware/db.rs
index e8b4f8887..4e5f0e037 100644
--- a/core/startos/src/middleware/db.rs
+++ b/core/startos/src/middleware/db.rs
@@ -36,10 +36,11 @@ impl Middleware<RpcContext> for SyncDb {
     async fn process_http_response(&mut self, context: &RpcContext, response: &mut Response) {
         if let Err(e) = async {
             if self.sync_db {
-                response.headers_mut().append(
-                    "X-Patch-Sequence",
-                    HeaderValue::from_str(&context.db.sequence().await.to_string())?,
-                );
+                let id = context.db.sequence().await;
+                response
+                    .headers_mut()
+                    .append("X-Patch-Sequence", HeaderValue::from_str(&id.to_string())?);
+                context.sync_db.send_replace(id);
             }
             Ok::<_, InvalidHeaderValue>(())
         }

From 099b77cf9bbcbb0dbc9d435f238a5e5185104212 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 12:30:05 -0600
Subject: [PATCH 198/341] fix .local service resolution

---
 core/startos/src/net/net_controller.rs | 114 ++++++++++---------------
 1 file changed, 47 insertions(+), 67 deletions(-)

diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index 521888665..b7a8022b4 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -29,6 +29,7 @@ pub struct PreInitNetController {
     tor: TorController,
     vhost: VHostController,
     os_bindings: Vec<Arc<()>>,
+    server_hostnames: Vec<Option<InternedString>>,
 }
 impl PreInitNetController {
     #[instrument(skip_all)]
@@ -44,6 +45,7 @@ impl PreInitNetController {
             tor: TorController::new(tor_control, tor_socks),
             vhost: VHostController::new(db),
             os_bindings: Vec::new(),
+            server_hostnames: Vec::new(),
         };
         res.add_os_bindings(hostname, os_tor_key).await?;
         Ok(res)
@@ -59,64 +61,26 @@ impl PreInitNetController {
             MaybeUtf8String("h2".into()),
         ]));
 
-        // Internal DNS
-        self.vhost
-            .add(
-                Some("embassy".into()),
-                443,
-                ([127, 0, 0, 1], 80).into(),
-                alpn.clone(),
-            )
-            .await?;
-        self.vhost
-            .add(
-                Some("startos".into()),
-                443,
-                ([127, 0, 0, 1], 80).into(),
-                alpn.clone(),
-            )
-            .await?;
-
-        // LAN IP
-        self.os_bindings.push(
-            self.vhost
-                .add(None, 443, ([127, 0, 0, 1], 80).into(), alpn.clone())
-                .await?,
-        );
-
-        // localhost
-        self.os_bindings.push(
-            self.vhost
-                .add(
-                    Some("localhost".into()),
-                    443,
-                    ([127, 0, 0, 1], 80).into(),
-                    alpn.clone(),
-                )
-                .await?,
-        );
-        self.os_bindings.push(
-            self.vhost
-                .add(
-                    Some(hostname.no_dot_host_name()),
-                    443,
-                    ([127, 0, 0, 1], 80).into(),
-                    alpn.clone(),
-                )
-                .await?,
-        );
+        self.server_hostnames = vec![
+            // LAN IP
+            None,
+            // Internal DNS
+            Some("embassy".into()),
+            Some("startos".into()),
+            // localhost
+            Some("localhost".into()),
+            Some(hostname.no_dot_host_name()),
+            // LAN mDNS
+            Some(hostname.local_domain_name()),
+        ];
 
-        // LAN mDNS
-        self.os_bindings.push(
-            self.vhost
-                .add(
-                    Some(hostname.local_domain_name()),
-                    443,
-                    ([127, 0, 0, 1], 80).into(),
-                    alpn.clone(),
-                )
-                .await?,
-        );
+        for hostname in self.server_hostnames.iter().cloned() {
+            self.os_bindings.push(
+                self.vhost
+                    .add(hostname, 443, ([127, 0, 0, 1], 80).into(), alpn.clone())
+                    .await?,
+            );
+        }
 
         // Tor
         self.os_bindings.push(
@@ -154,6 +118,7 @@ pub struct NetController {
     pub(super) dns: DnsController,
     pub(super) forward: LanPortForwardController,
     pub(super) os_bindings: Vec<Arc<()>>,
+    pub(super) server_hostnames: Vec<Option<InternedString>>,
 }
 
 impl NetController {
@@ -163,6 +128,7 @@ impl NetController {
             tor,
             vhost,
             os_bindings,
+            server_hostnames,
         }: PreInitNetController,
         dns_bind: &[SocketAddr],
     ) -> Result<Self, Error> {
@@ -173,6 +139,7 @@ impl NetController {
             dns: DnsController::init(dns_bind).await?,
             forward: LanPortForwardController::new(),
             os_bindings,
+            server_hostnames,
         };
         res.os_bindings
             .push(res.dns.add(None, HOST_IP.into()).await?);
@@ -258,10 +225,15 @@ impl NetService {
         let ctrl = self.net_controller()?;
         let mut errors = ErrorCollection::new();
         for (_, binds) in std::mem::take(&mut self.binds) {
-            for (_, (lan, _, _, rc)) in binds.lan {
+            for (_, (lan, _, hostnames, rc)) in binds.lan {
                 drop(rc);
                 if let Some(external) = lan.assigned_ssl_port {
-                    ctrl.vhost.gc(None, external).await?;
+                    for hostname in ctrl.server_hostnames.iter().cloned() {
+                        ctrl.vhost.gc(hostname, external).await?;
+                    }
+                    for hostname in hostnames {
+                        ctrl.vhost.gc(Some(hostname), external).await?;
+                    }
                 }
                 if let Some(external) = lan.assigned_port {
                     ctrl.forward.gc(external).await?;
@@ -317,11 +289,13 @@ impl NetService {
                                 Err(AlpnInfo::Reflect)
                             }
                         };
-                        rcs.push(
-                            ctrl.vhost
-                                .add(None, external, target, connect_ssl.clone())
-                                .await?,
-                        );
+                        for hostname in ctrl.server_hostnames.iter().cloned() {
+                            rcs.push(
+                                ctrl.vhost
+                                    .add(hostname, external, target, connect_ssl.clone())
+                                    .await?,
+                            );
+                        }
                         for address in host.addresses() {
                             match address {
                                 HostAddress::Onion { address } => {
@@ -407,7 +381,9 @@ impl NetService {
             }
             if let Some((lan, _, hostnames, _)) = old_lan_bind {
                 if let Some(external) = lan.assigned_ssl_port {
-                    ctrl.vhost.gc(None, external).await?;
+                    for hostname in ctrl.server_hostnames.iter().cloned() {
+                        ctrl.vhost.gc(hostname, external).await?;
+                    }
                     for hostname in hostnames {
                         ctrl.vhost.gc(Some(hostname), external).await?;
                     }
@@ -429,7 +405,9 @@ impl NetService {
         });
         for (lan, hostnames) in removed {
             if let Some(external) = lan.assigned_ssl_port {
-                ctrl.vhost.gc(None, external).await?;
+                for hostname in ctrl.server_hostnames.iter().cloned() {
+                    ctrl.vhost.gc(hostname, external).await?;
+                }
                 for hostname in hostnames {
                     ctrl.vhost.gc(Some(hostname), external).await?;
                 }
@@ -533,7 +511,9 @@ impl NetService {
     pub async fn remove_all(mut self) -> Result<(), Error> {
         self.shutdown = true;
         if let Some(ctrl) = Weak::upgrade(&self.controller) {
-            self.clear_bindings().await
+            self.clear_bindings().await?;
+            drop(ctrl);
+            Ok(())
         } else {
             tracing::warn!("NetService dropped after NetController is shutdown");
             Err(Error::new(

From 1a0536d2123bbe96730fa252ff3986fb7b883703 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Thu, 25 Jul 2024 13:25:18 -0600
Subject: [PATCH 199/341] fix: Optional input

---
 container-runtime/src/Adapters/RpcListener.ts |  4 ++--
 .../Systems/SystemForEmbassy/index.ts         |  4 ++--
 .../src/Adapters/Systems/SystemForStartOs.ts  |  6 +++---
 core/startos/src/action.rs                    |  1 +
 core/startos/src/util/serde.rs                |  8 +++++++
 .../app-actions/app-actions.page.ts           | 21 +++++++++++++++++--
 6 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 6e8e7aac8..28f578149 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -64,7 +64,7 @@ const runType = object({
       input: any,
       timeout: number,
     },
-    ["timeout"],
+    ["timeout", "input"],
   ),
 })
 const sandboxRunType = object({
@@ -77,7 +77,7 @@ const sandboxRunType = object({
       input: any,
       timeout: number,
     },
-    ["timeout"],
+    ["timeout", "input"],
   ),
 })
 const callbackType = object({
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 2e0836bb0..e5d2e096b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -232,7 +232,7 @@ export class SystemForEmbassy implements System {
     effects: Effects,
     options: {
       procedure: JsonPath
-      input: unknown
+      input?: unknown
       timeout?: number | undefined
     },
   ): Promise<RpcResult> {
@@ -294,7 +294,7 @@ export class SystemForEmbassy implements System {
     effects: Effects,
     options: {
       procedure: JsonPath
-      input: unknown
+      input?: unknown
       timeout?: number | undefined
     },
   ): Promise<unknown> {
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 78c21b7c7..029b504c0 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -75,7 +75,7 @@ export class SystemForStartOs implements System {
     effects: Effects,
     options: {
       procedure: Procedure
-      input: unknown
+      input?: unknown
       timeout?: number | undefined
     },
   ): Promise<RpcResult> {
@@ -137,7 +137,7 @@ export class SystemForStartOs implements System {
     effects: Effects | MainEffects,
     options: {
       procedure: Procedure
-      input: unknown
+      input?: unknown
       timeout?: number | undefined
     },
   ): Promise<unknown> {
@@ -219,7 +219,7 @@ export class SystemForStartOs implements System {
 
   async sandbox(
     effects: Effects,
-    options: { procedure: Procedure; input: unknown; timeout?: number },
+    options: { procedure: Procedure; input?: unknown; timeout?: number },
   ): Promise<RpcResult> {
     return this.execute(effects, options)
   }
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index e93af4a4d..7c4492adc 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -58,6 +58,7 @@ pub struct ActionParams {
     pub action_id: ActionId,
     #[command(flatten)]
     #[ts(type = "{ [key: string]: any } | null")]
+    #[serde(default)]
     pub input: StdinDeserializable<Option<Config>>,
 }
 // impl C
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index bac2c524a..88d7bfc11 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -568,6 +568,14 @@ where
 
 #[derive(Deserialize, Serialize, TS)]
 pub struct StdinDeserializable<T>(pub T);
+impl<T> Default for StdinDeserializable<T>
+where
+    T: Default,
+{
+    fn default() -> Self {
+        Self(T::default())
+    }
+}
 impl<T> FromArgMatches for StdinDeserializable<T>
 where
     T: DeserializeOwned,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index 63c534bb6..99bd70e48 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -20,6 +20,20 @@ import {
 import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 
+const allowedStatuses = {
+  onlyRunning: new Set(['running']),
+  onlyStopped: new Set(['stopped']),
+  any: new Set([
+    'running',
+    'stopped',
+    'restarting',
+    'restoring',
+    'stopping',
+    'starting',
+    'backingUp',
+  ]),
+}
+
 @Component({
   selector: 'app-actions',
   templateUrl: './app-actions.page.html',
@@ -46,7 +60,10 @@ export class AppActionsPage {
     status: T.Status,
     action: { key: string; value: T.ActionMetadata },
   ) {
-    if (status && action.value.allowedStatuses.includes(status.main.status)) {
+    if (
+      status &&
+      allowedStatuses[action.value.allowedStatuses].has(status.main.status)
+    ) {
       if (!isEmptyObject(action.value.input || {})) {
         this.formDialog.open(FormComponent, {
           label: action.value.name,
@@ -84,7 +101,7 @@ export class AppActionsPage {
         await alert.present()
       }
     } else {
-      const statuses = [...action.value.allowedStatuses]
+      const statuses = [...allowedStatuses[action.value.allowedStatuses]]
       const last = statuses.pop()
       let statusesStr = statuses.join(', ')
       let error = ''

From a9373d9779ceb240a2f800eaa9dea3dc76f8cb59 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 14:34:03 -0600
Subject: [PATCH 200/341] don't show "Bytes" for overall progress

---
 core/startos/src/progress.rs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/core/startos/src/progress.rs b/core/startos/src/progress.rs
index 5a2e5ef27..cc3257132 100644
--- a/core/startos/src/progress.rs
+++ b/core/startos/src/progress.rs
@@ -18,7 +18,9 @@ use crate::prelude::*;
 
 lazy_static::lazy_static! {
     static ref SPINNER: ProgressStyle = ProgressStyle::with_template("{spinner} {msg}...").unwrap();
-    static ref PERCENTAGE: ProgressStyle = ProgressStyle::with_template("{msg} {percent}% {wide_bar} [{bytes}/{total_bytes}] [{binary_bytes_per_sec} {eta}]").unwrap();
+    static ref PERCENTAGE: ProgressStyle = ProgressStyle::with_template("{msg} {percent}% {wide_bar} [{human_pos}/{human_len}] [{per_sec} {eta}]").unwrap();
+    static ref PERCENTAGE_BYTES: ProgressStyle = ProgressStyle::with_template("{msg} {percent}% {wide_bar} [{binary_bytes}/{binary_total_bytes}] [{binary_bytes_per_sec} {eta}]").unwrap();
+    static ref STEPS: ProgressStyle = ProgressStyle::with_template("{spinner} {wide_msg} [{human_pos}/?] [{per_sec} {elapsed}]").unwrap();
     static ref BYTES: ProgressStyle = ProgressStyle::with_template("{spinner} {wide_msg} [{bytes}/?] [{binary_bytes_per_sec} {elapsed}]").unwrap();
 }
 
@@ -38,7 +40,7 @@ impl Progress {
     pub fn new() -> Self {
         Progress::NotStarted(())
     }
-    pub fn update_bar(self, bar: &ProgressBar) {
+    pub fn update_bar(self, bar: &ProgressBar, bytes: bool) {
         match self {
             Self::NotStarted(()) => {
                 bar.set_style(SPINNER.clone());
@@ -51,7 +53,11 @@ impl Progress {
                 bar.finish();
             }
             Self::Progress { done, total: None } => {
-                bar.set_style(BYTES.clone());
+                if bytes {
+                    bar.set_style(BYTES.clone());
+                } else {
+                    bar.set_style(STEPS.clone());
+                }
                 bar.set_position(done);
                 bar.tick();
             }
@@ -59,7 +65,11 @@ impl Progress {
                 done,
                 total: Some(total),
             } => {
-                bar.set_style(PERCENTAGE.clone());
+                if bytes {
+                    bar.set_style(PERCENTAGE_BYTES.clone());
+                } else {
+                    bar.set_style(PERCENTAGE.clone());
+                }
                 bar.set_position(done);
                 bar.set_length(total);
                 bar.tick();
@@ -490,7 +500,7 @@ impl PhasedProgressBar {
                 );
             }
         }
-        progress.overall.update_bar(&self.overall);
+        progress.overall.update_bar(&self.overall, false);
         for (name, bar) in self.phases.iter() {
             if let Some(progress) = progress.phases.iter().find_map(|p| {
                 if &p.name == name {
@@ -499,7 +509,7 @@ impl PhasedProgressBar {
                     None
                 }
             }) {
-                progress.update_bar(bar);
+                progress.update_bar(bar, true);
             }
         }
     }

From 419e3f7f2b15b9fdfc58d4ab900b5760762ec884 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 14:34:30 -0600
Subject: [PATCH 201/341] fix https redirect

---
 core/startos/Cargo.toml       |   7 +-
 core/startos/src/net/vhost.rs |  28 ++++---
 core/startos/src/util/io.rs   | 144 ++++++++++++++++++++++------------
 3 files changed, 119 insertions(+), 60 deletions(-)

diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index ae4382bc2..2e6df1e3d 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -98,7 +98,12 @@ hex = "0.4.3"
 hmac = "0.12.1"
 http = "1.0.0"
 http-body-util = "0.1"
-hyper-util = { version = "0.1.5", features = ["tokio", "service"] }
+hyper-util = { version = "0.1.5", features = [
+  "tokio",
+  "service",
+  "http1",
+  "http2",
+] }
 id-pool = { version = "0.2.2", default-features = false, features = [
   "serde",
   "u16",
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index cdd752709..9fc7c8384 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -13,6 +13,7 @@ use http::Uri;
 use imbl_value::InternedString;
 use models::ResultExt;
 use serde::{Deserialize, Serialize};
+use tokio::io::AsyncWriteExt;
 use tokio::net::{TcpListener, TcpStream};
 use tokio::sync::{Mutex, RwLock};
 use tokio_rustls::rustls::pki_types::{
@@ -27,7 +28,7 @@ use ts_rs::TS;
 use crate::db::model::Database;
 use crate::net::static_server::server_error;
 use crate::prelude::*;
-use crate::util::io::BackTrackingReader;
+use crate::util::io::BackTrackingIO;
 use crate::util::serde::MaybeUtf8String;
 
 // not allowed: <=1024, >=32768, 5355, 5432, 9050, 6010, 9051, 5353
@@ -129,8 +130,7 @@ impl VHostServer {
                                 tracing::debug!("{e:?}");
                             }
 
-                            let mut stream = BackTrackingReader::new(stream);
-                            stream.start_buffering();
+                            let mut stream = BackTrackingIO::new(stream);
                             let mapping = mapping.clone();
                             let db = db.clone();
                             tokio::spawn(async move {
@@ -156,6 +156,7 @@ impl VHostServer {
                                                                     .and_then(|host| host.to_str().ok());
                                                                 let uri = Uri::from_parts({
                                                                     let mut parts = req.uri().to_owned().into_parts();
+                                                                    parts.scheme = Some("https".parse()?);
                                                                     parts.authority = host.map(FromStr::from_str).transpose()?;
                                                                     parts
                                                                 })?;
@@ -313,8 +314,12 @@ impl VHostServer {
                                                         )
                                                         .await
                                                         .with_kind(crate::ErrorKind::OpenSsl)?;
+                                                let mut accept = mid.into_stream(Arc::new(cfg));
+                                                let io = accept.get_mut().unwrap();
+                                                let buffered = io.stop_buffering();
+                                                io.write_all(&buffered).await?;
                                                 let mut tls_stream =
-                                                    match mid.into_stream(Arc::new(cfg)).await {
+                                                    match accept.await {
                                                         Ok(a) => a,
                                                         Err(e) => {
                                                             tracing::trace!( "VHostController: failed to accept TLS connection on port {port}: {e}");
@@ -322,7 +327,6 @@ impl VHostServer {
                                                             return Ok(())
                                                         }
                                                     };
-                                                tls_stream.get_mut().0.stop_buffering();
                                                 tokio::io::copy_bidirectional(
                                                     &mut tls_stream,
                                                     &mut target_stream,
@@ -335,8 +339,12 @@ impl VHostServer {
                                                 {
                                                     cfg.alpn_protocols.push(proto.into());
                                                 }
+                                                let mut accept = mid.into_stream(Arc::new(cfg));
+                                                let io = accept.get_mut().unwrap();
+                                                let buffered = io.stop_buffering();
+                                                io.write_all(&buffered).await?;
                                                 let mut tls_stream =
-                                                    match mid.into_stream(Arc::new(cfg)).await {
+                                                    match accept.await {
                                                         Ok(a) => a,
                                                         Err(e) => {
                                                             tracing::trace!( "VHostController: failed to accept TLS connection on port {port}: {e}");
@@ -344,7 +352,6 @@ impl VHostServer {
                                                             return Ok(())
                                                         }
                                                     };
-                                                tls_stream.get_mut().0.stop_buffering();
                                                 tokio::io::copy_bidirectional(
                                                     &mut tls_stream,
                                                     &mut tcp_stream,
@@ -353,8 +360,12 @@ impl VHostServer {
                                             }
                                             Err(AlpnInfo::Specified(alpn)) => {
                                                 cfg.alpn_protocols = alpn.into_iter().map(|a| a.0).collect();
+                                                let mut accept = mid.into_stream(Arc::new(cfg));
+                                                let io = accept.get_mut().unwrap();
+                                                let buffered = io.stop_buffering();
+                                                io.write_all(&buffered).await?;
                                                 let mut tls_stream =
-                                                    match mid.into_stream(Arc::new(cfg)).await {
+                                                    match accept.await {
                                                         Ok(a) => a,
                                                         Err(e) => {
                                                             tracing::trace!( "VHostController: failed to accept TLS connection on port {port}: {e}");
@@ -362,7 +373,6 @@ impl VHostServer {
                                                             return Ok(())
                                                         }
                                                     };
-                                                tls_stream.get_mut().0.stop_buffering();
                                                 tokio::io::copy_bidirectional(
                                                     &mut tls_stream,
                                                     &mut tcp_stream,
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index bba45fa69..6d9c8a4ff 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -411,107 +411,151 @@ impl<T: AsRef<[u8]>> CursorExt for Cursor<T> {
     }
 }
 
+#[derive(Debug)]
+enum BTBuffer {
+    NotBuffering,
+    Buffering { read: Vec<u8>, write: Vec<u8> },
+    Rewound { read: Cursor<Vec<u8>> },
+}
+impl Default for BTBuffer {
+    fn default() -> Self {
+        BTBuffer::NotBuffering
+    }
+}
+
 #[pin_project::pin_project]
 #[derive(Debug)]
-pub struct BackTrackingReader<T> {
+pub struct BackTrackingIO<T> {
     #[pin]
-    reader: T,
-    buffer: Cursor<Vec<u8>>,
-    buffering: bool,
+    io: T,
+    buffer: BTBuffer,
 }
-impl<T> BackTrackingReader<T> {
-    pub fn new(reader: T) -> Self {
+impl<T> BackTrackingIO<T> {
+    pub fn new(io: T) -> Self {
         Self {
-            reader,
-            buffer: Cursor::new(Vec::new()),
-            buffering: false,
+            io,
+            buffer: BTBuffer::Buffering {
+                read: Vec::new(),
+                write: Vec::new(),
+            },
         }
     }
-    pub fn start_buffering(&mut self) {
-        self.buffer.set_position(0);
-        self.buffer.get_mut().truncate(0);
-        self.buffering = true;
-    }
-    pub fn stop_buffering(&mut self) {
-        self.buffer.set_position(0);
-        self.buffer.get_mut().truncate(0);
-        self.buffering = false;
+    #[must_use]
+    pub fn stop_buffering(&mut self) -> Vec<u8> {
+        match std::mem::take(&mut self.buffer) {
+            BTBuffer::Buffering { write, .. } => write,
+            BTBuffer::NotBuffering => Vec::new(),
+            BTBuffer::Rewound { read } => {
+                self.buffer = BTBuffer::Rewound { read };
+                Vec::new()
+            }
+        }
     }
-    pub fn rewind(&mut self) {
-        self.buffering = false;
+    pub fn rewind(&mut self) -> Vec<u8> {
+        match std::mem::take(&mut self.buffer) {
+            BTBuffer::Buffering { read, write } => {
+                self.buffer = BTBuffer::Rewound {
+                    read: Cursor::new(read),
+                };
+                write
+            }
+            BTBuffer::NotBuffering => Vec::new(),
+            BTBuffer::Rewound { read } => {
+                self.buffer = BTBuffer::Rewound { read };
+                Vec::new()
+            }
+        }
     }
     pub fn unwrap(self) -> T {
-        self.reader
+        self.io
     }
 }
 
-impl<T: AsyncRead> AsyncRead for BackTrackingReader<T> {
+impl<T: AsyncRead> AsyncRead for BackTrackingIO<T> {
     fn poll_read(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
         buf: &mut ReadBuf<'_>,
     ) -> Poll<std::io::Result<()>> {
         let this = self.project();
-        if *this.buffering {
-            let filled = buf.filled().len();
-            let res = this.reader.poll_read(cx, buf);
-            this.buffer
-                .get_mut()
-                .extend_from_slice(&buf.filled()[filled..]);
-            res
-        } else {
-            let mut ready = false;
-            if (this.buffer.position() as usize) < this.buffer.get_ref().len() {
-                this.buffer.pure_read(buf);
-                ready = true;
+        match this.buffer {
+            BTBuffer::Buffering { read, .. } => {
+                let filled = buf.filled().len();
+                let res = this.io.poll_read(cx, buf);
+                read.extend_from_slice(&buf.filled()[filled..]);
+                res
             }
-            if buf.remaining() > 0 {
-                match this.reader.poll_read(cx, buf) {
-                    Poll::Pending => {
-                        if ready {
-                            Poll::Ready(Ok(()))
-                        } else {
-                            Poll::Pending
+            BTBuffer::NotBuffering => this.io.poll_read(cx, buf),
+            BTBuffer::Rewound { read } => {
+                let mut ready = false;
+                if (read.position() as usize) < read.get_ref().len() {
+                    read.pure_read(buf);
+                    ready = true;
+                }
+                if buf.remaining() > 0 {
+                    match this.io.poll_read(cx, buf) {
+                        Poll::Pending => {
+                            if ready {
+                                Poll::Ready(Ok(()))
+                            } else {
+                                Poll::Pending
+                            }
                         }
+                        a => a,
                     }
-                    a => a,
+                } else {
+                    Poll::Ready(Ok(()))
                 }
-            } else {
-                Poll::Ready(Ok(()))
             }
         }
     }
 }
 
-impl<T: AsyncWrite> AsyncWrite for BackTrackingReader<T> {
+impl<T: AsyncWrite> AsyncWrite for BackTrackingIO<T> {
     fn is_write_vectored(&self) -> bool {
-        self.reader.is_write_vectored()
+        self.io.is_write_vectored()
     }
     fn poll_flush(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> Poll<Result<(), std::io::Error>> {
-        self.project().reader.poll_flush(cx)
+        self.project().io.poll_flush(cx)
     }
     fn poll_shutdown(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
     ) -> Poll<Result<(), std::io::Error>> {
-        self.project().reader.poll_shutdown(cx)
+        self.project().io.poll_shutdown(cx)
     }
     fn poll_write(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
         buf: &[u8],
     ) -> Poll<Result<usize, std::io::Error>> {
-        self.project().reader.poll_write(cx, buf)
+        let this = self.project();
+        if let BTBuffer::Buffering { write, .. } = this.buffer {
+            write.extend_from_slice(buf);
+            Poll::Ready(Ok(buf.len()))
+        } else {
+            this.io.poll_write(cx, buf)
+        }
     }
     fn poll_write_vectored(
         self: std::pin::Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
         bufs: &[std::io::IoSlice<'_>],
     ) -> Poll<Result<usize, std::io::Error>> {
-        self.project().reader.poll_write_vectored(cx, bufs)
+        let this = self.project();
+        if let BTBuffer::Buffering { write, .. } = this.buffer {
+            let len = bufs.iter().map(|b| b.len()).sum();
+            write.reserve(len);
+            for buf in bufs {
+                write.extend_from_slice(buf);
+            }
+            Poll::Ready(Ok(len))
+        } else {
+            this.io.poll_write_vectored(cx, bufs)
+        }
     }
 }
 

From 69baa44a3abac81e6eabb50f076e30d72ce697a0 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 15:44:40 -0600
Subject: [PATCH 202/341] use squashfuse if available

---
 container-runtime/update-image.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/container-runtime/update-image.sh b/container-runtime/update-image.sh
index 3a8813518..61429821c 100755
--- a/container-runtime/update-image.sh
+++ b/container-runtime/update-image.sh
@@ -8,7 +8,11 @@ if mountpoint tmp/combined; then sudo umount -R tmp/combined; fi
 if mountpoint tmp/lower; then sudo umount tmp/lower; fi
 sudo rm -rf tmp
 mkdir -p tmp/lower tmp/upper tmp/work tmp/combined
-sudo mount -o loop -t squashfs debian.${ARCH}.squashfs tmp/lower
+if which squashfuse > /dev/null; then
+    sudo squashfuse debian.${ARCH}.squashfs tmp/lower
+else
+    sudo mount debian.${ARCH}.squashfs tmp/lower
+fi
 sudo mount -t overlay -olowerdir=tmp/lower,upperdir=tmp/upper,workdir=tmp/work overlay tmp/combined
 
 QEMU=

From 854044229c726f57aa73a3b81e36eca65d940ec3 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 15:44:51 -0600
Subject: [PATCH 203/341] reduce reliance on sudo

---
 core/build-containerbox.sh | 5 +----
 core/build-registrybox.sh  | 5 +----
 core/build-startbox.sh     | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/core/build-containerbox.sh b/core/build-containerbox.sh
index f988d2de3..e4a8f6e7a 100755
--- a/core/build-containerbox.sh
+++ b/core/build-containerbox.sh
@@ -28,15 +28,12 @@ set +e
 fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl)"; then 
+if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then 
 	fail=true
 fi
 set -e
 cd core
 
-sudo chown -R $USER target
-sudo chown -R $USER ~/.cargo
-
 if [ -n "$fail" ]; then
 	exit 1
 fi
diff --git a/core/build-registrybox.sh b/core/build-registrybox.sh
index 9928b6714..9db57dd80 100755
--- a/core/build-registrybox.sh
+++ b/core/build-registrybox.sh
@@ -28,15 +28,12 @@ set +e
 fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl)"; then 
+if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then 
 	fail=true
 fi
 set -e
 cd core
 
-sudo chown -R $USER target
-sudo chown -R $USER ~/.cargo
-
 if [ -n "$fail" ]; then
 	exit 1
 fi
diff --git a/core/build-startbox.sh b/core/build-startbox.sh
index 0604ba5da..55a455f09 100755
--- a/core/build-startbox.sh
+++ b/core/build-startbox.sh
@@ -28,15 +28,12 @@ set +e
 fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "(cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl)"; then 
+if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then 
 	fail=true
 fi
 set -e
 cd core
 
-sudo chown -R $USER target
-sudo chown -R $USER ~/.cargo
-
 if [ -n "$fail" ]; then
 	exit 1
 fi

From 370c38ec76d6d5429f894a27c9c282bc7f7d478f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 16:14:04 -0600
Subject: [PATCH 204/341] fix launchUI button

---
 .../Systems/SystemForEmbassy/index.ts         |  6 +-
 .../app-list-pkg/app-list-pkg.component.html  |  2 +-
 .../app-list-pkg/app-list-pkg.component.ts    |  8 ++-
 .../app-show-status.component.html            |  4 +-
 .../app-show-status.component.ts              | 11 +++-
 .../ui/src/app/services/config.service.ts     | 62 +++++++++----------
 .../src/app/services/ui-launcher.service.ts   |  9 +--
 7 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 2e0836bb0..eabe1401d 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -444,7 +444,11 @@ export class SystemForEmbassy implements System {
               description: interfaceValue.description,
               hasPrimary: false,
               disabled: false,
-              type: "api",
+              type:
+                interfaceValue.ui &&
+                (origin.scheme === "http" || origin.sslScheme === "https")
+                  ? "ui"
+                  : "api",
               masked: false,
               path: "",
               schemeOverride: null,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
index e353cf9b2..8225d7e53 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
@@ -25,7 +25,7 @@ <h2 ticker>{{ manifest.title }}</h2>
     slot="end"
     fill="clear"
     color="primary"
-    (click)="launchUi($event, pkg.entry.serviceInterfaces)"
+    (click)="launchUi($event, pkg.entry.serviceInterfaces, pkg.entry.hosts)"
     [disabled]="
       !(pkg.entry.stateInfo.state | isLaunchable : pkgMainStatus.status)
     "
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index 4df818956..1464ac8a2 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -27,9 +27,13 @@ export class AppListPkgComponent {
     return this.pkgMainStatus.status === 'stopping' ? '30s' : null // @dr-bonez TODO
   }
 
-  launchUi(e: Event, interfaces: PackageDataEntry['serviceInterfaces']): void {
+  launchUi(
+    e: Event,
+    interfaces: PackageDataEntry['serviceInterfaces'],
+    hosts: PackageDataEntry['hosts'],
+  ): void {
     e.stopPropagation()
     e.preventDefault()
-    this.launcherService.launch(interfaces)
+    this.launcherService.launch(interfaces, hosts)
   }
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index be7bc1c30..c5d18907c 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -56,13 +56,13 @@
         </ion-button>
 
         <ion-button
-          *ngIf="pkgStatus && interfaces && (interfaces | hasUi)"
+          *ngIf="pkgStatus && interfaces && (interfaces | hasUi) && hosts"
           class="action-button"
           color="primary"
           [disabled]="
             !(pkg.stateInfo.state | isLaunchable: pkgStatus.main.status)
           "
-          (click)="launchUi(interfaces)"
+          (click)="launchUi(interfaces, hosts)"
         >
           <ion-icon slot="start" name="open-outline"></ion-icon>
           Launch UI
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 186bbe39a..308db67be 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -55,6 +55,10 @@ export class AppShowStatusComponent {
     return this.pkg.serviceInterfaces
   }
 
+  get hosts(): PackageDataEntry['hosts'] {
+    return this.pkg.hosts
+  }
+
   get pkgStatus(): T.Status {
     return this.pkg.status
   }
@@ -79,8 +83,11 @@ export class AppShowStatusComponent {
     return this.pkgStatus?.main.status === 'stopping' ? '30s' : null // @dr-bonez TODO
   }
 
-  launchUi(interfaces: PackageDataEntry['serviceInterfaces']): void {
-    this.launcherService.launch(interfaces)
+  launchUi(
+    interfaces: PackageDataEntry['serviceInterfaces'],
+    hosts: PackageDataEntry['hosts'],
+  ): void {
+    this.launcherService.launch(interfaces, hosts)
   }
 
   async presentModalConfig(): Promise<void> {
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index 42116bdd8..a148112f0 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -59,50 +59,50 @@ export class ConfigService {
   /** ${scheme}://${username}@${host}:${externalPort}${suffix} */
   launchableAddress(
     interfaces: PackageDataEntry['serviceInterfaces'],
-    host: T.Host,
+    hosts: PackageDataEntry['hosts'],
   ): string {
-    const ui = Object.values(interfaces).find(i => i.type === 'ui')
+    const ui = Object.values(interfaces).find(
+      i =>
+        i.type === 'ui' &&
+        (i.addressInfo.scheme === 'http' ||
+          i.addressInfo.sslScheme === 'https'),
+    ) // TODO: select if multiple
 
     if (!ui) return ''
 
+    const hostnameInfo =
+      hosts[ui.addressInfo.hostId]?.hostnameInfo[ui.addressInfo.internalPort]
+
+    console.debug(hostnameInfo)
+
+    if (!hostnameInfo) return ''
+
     const addressInfo = ui.addressInfo
-    const scheme = this.isHttps() ? 'https' : 'http'
+    const scheme = this.isHttps()
+      ? ui.addressInfo.sslScheme === 'https'
+        ? 'https'
+        : 'http'
+      : ui.addressInfo.scheme === 'http'
+      ? 'http'
+      : 'https'
     const username = addressInfo.username ? addressInfo.username + '@' : ''
     const suffix = addressInfo.suffix || ''
     const url = new URL(`${scheme}://${username}placeholder${suffix}`)
 
-    if (host.kind === 'multi') {
-      const onionHostname = host.addresses.find(h => h.kind === 'onion')
-        ?.address as T.OnionHostname | undefined
-
-      if (!onionHostname)
-        throw new Error('Expecting that there is an onion hostname')
-
-      if (this.isTor() && onionHostname) {
-        url.hostname = onionHostname.value
-      }
-      // TODO Handle single
-      //  else {
-      //   const ipHostname = host.addresses.find(h => h.kind === 'ip')
-      //     ?.hostname as T.ExportedIpHostname
-
-      //   if (!ipHostname) return ''
+    const onionHostname = hostnameInfo.find(h => h.kind === 'onion')
+      ?.hostname as T.OnionHostname | undefined
 
-      //   url.hostname = this.hostname
-      //   url.port = String(ipHostname.sslPort || ipHostname.port)
-      // }
+    if (this.isTor() && onionHostname) {
+      url.hostname = onionHostname.value
     } else {
-      throw new Error('unimplemented')
-      // const hostname = {} as T.ExportedHostnameInfo // host.hostname
+      const ipHostname = hostnameInfo.find(h => h.kind === 'ip')?.hostname as
+        | T.IpHostname
+        | undefined
 
-      // if (!hostname) return ''
+      if (!ipHostname) return ''
 
-      // if (this.isTor() && hostname.kind === 'onion') {
-      //   url.hostname = (hostname.hostname as T.ExportedOnionHostname).value
-      // } else {
-      //   url.hostname = this.hostname
-      //   url.port = String(hostname.hostname.sslPort || hostname.hostname.port)
-      // }
+      url.hostname = this.hostname
+      url.port = String(ipHostname.sslPort || ipHostname.port)
     }
 
     return url.href
diff --git a/web/projects/ui/src/app/services/ui-launcher.service.ts b/web/projects/ui/src/app/services/ui-launcher.service.ts
index 9c36036f3..7c3475fc0 100644
--- a/web/projects/ui/src/app/services/ui-launcher.service.ts
+++ b/web/projects/ui/src/app/services/ui-launcher.service.ts
@@ -13,11 +13,12 @@ export class UiLauncherService {
     private readonly config: ConfigService,
   ) {}
 
-  launch(interfaces: PackageDataEntry['serviceInterfaces']): void {
-    // TODO @Matt
-    const host = {} as any
+  launch(
+    interfaces: PackageDataEntry['serviceInterfaces'],
+    hosts: PackageDataEntry['hosts'],
+  ): void {
     this.windowRef.open(
-      this.config.launchableAddress(interfaces, host),
+      this.config.launchableAddress(interfaces, hosts),
       '_blank',
       'noreferrer',
     )

From 2a1fd16849a50132a42fee2b644d3af7f9779136 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 17:07:30 -0600
Subject: [PATCH 205/341] curl fail and show error

---
 container-runtime/download-base-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container-runtime/download-base-image.sh b/container-runtime/download-base-image.sh
index f7dc4c844..7650fccb1 100755
--- a/container-runtime/download-base-image.sh
+++ b/container-runtime/download-base-image.sh
@@ -16,4 +16,4 @@ elif [ "$_ARCH" = "aarch64" ]; then
     _ARCH=arm64
 fi
 
-curl https://images.linuxcontainers.org/$(curl --silent https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$_ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs --output debian.${ARCH}.squashfs
\ No newline at end of file
+curl -fsS https://images.linuxcontainers.org/$(curl -fsS https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$_ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs --output debian.${ARCH}.squashfs
\ No newline at end of file

From 64315df85f55f9963bffe78fcb87e176759bed5f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 25 Jul 2024 17:34:48 -0600
Subject: [PATCH 206/341] log url for download

---
 container-runtime/download-base-image.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/container-runtime/download-base-image.sh b/container-runtime/download-base-image.sh
index 7650fccb1..7fb134f31 100755
--- a/container-runtime/download-base-image.sh
+++ b/container-runtime/download-base-image.sh
@@ -16,4 +16,8 @@ elif [ "$_ARCH" = "aarch64" ]; then
     _ARCH=arm64
 fi
 
-curl -fsS https://images.linuxcontainers.org/$(curl -fsS https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$_ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs --output debian.${ARCH}.squashfs
\ No newline at end of file
+URL="https://images.linuxcontainers.org/$(curl -fsSL https://images.linuxcontainers.org/meta/1.0/index-system | grep "^$DISTRO;$VERSION;$_ARCH;$FLAVOR;" | head -n1 | sed 's/^.*;//g')/rootfs.squashfs"
+
+echo "Downloading $URL to debian.${ARCH}.squashfs"
+
+curl -fsSL "$URL" > debian.${ARCH}.squashfs
\ No newline at end of file

From e4782dee68bb724d6a6b84c532a0fabd84fe7626 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 01:41:11 -0600
Subject: [PATCH 207/341] fix ca cert issue

---
 build/lib/scripts/enable-kiosk | 21 ++++++++++-----------
 core/startos/src/init.rs       | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/build/lib/scripts/enable-kiosk b/build/lib/scripts/enable-kiosk
index ad7cd4bf3..45bed5fe9 100755
--- a/build/lib/scripts/enable-kiosk
+++ b/build/lib/scripts/enable-kiosk
@@ -14,14 +14,8 @@ if ! id kiosk; then
     useradd -s /bin/bash --create-home kiosk
 fi
 
-# create kiosk script
-cat > /home/kiosk/kiosk.sh << 'EOF'
-#!/bin/sh
-PROFILE=$(mktemp -d)
-if [ -f /usr/local/share/ca-certificates/startos-root-ca.crt ]; then
-    certutil -A -n "StartOS Local Root CA" -t "TCu,Cuw,Tuw" -i /usr/local/share/ca-certificates/startos-root-ca.crt -d $PROFILE
-fi
-cat >> $PROFILE/prefs.js << EOT
+mkdir /home/kiosk/fx-profile
+cat >> /home/kiosk/fx-profile/prefs.js << EOF
 user_pref("app.normandy.api_url", "");
 user_pref("app.normandy.enabled", false);
 user_pref("app.shield.optoutstudies.enabled", false);
@@ -87,7 +81,11 @@ user_pref("toolkit.telemetry.shutdownPingSender.enabled", false);
 user_pref("toolkit.telemetry.unified", false);
 user_pref("toolkit.telemetry.updatePing.enabled", false);
 user_pref("toolkit.telemetry.cachedClientID", "");
-EOT
+EOF
+
+# create kiosk script
+cat > /home/kiosk/kiosk.sh << 'EOF'
+#!/bin/sh
 while ! curl "http://localhost" > /dev/null; do
     sleep 1
 done
@@ -101,8 +99,7 @@ done
     killall firefox-esr
 ) &
 matchbox-window-manager -use_titlebar no &
-firefox-esr http://localhost --profile $PROFILE
-rm -rf $PROFILE
+firefox-esr http://localhost --profile /home/kiosk/fx-profile
 EOF
 chmod +x /home/kiosk/kiosk.sh
 
@@ -116,6 +113,8 @@ fi
 EOF
 fi
 
+chown -R kiosk:kiosk /home/kiosk
+
 # enable autologin
 mkdir -p /etc/systemd/system/getty@tty1.service.d
 cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << 'EOF'
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 735ca85a5..5e0fa932f 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -398,6 +398,20 @@ pub async fn init(
     Command::new("update-ca-certificates")
         .invoke(crate::ErrorKind::OpenSsl)
         .await?;
+    if tokio::fs::metadata("/home/kiosk/profile").await.is_ok() {
+        Command::new("certutil")
+            .arg("-A")
+            .arg("-n")
+            .arg("StartOS Local Root CA")
+            .arg("-t")
+            .arg("TCu,Cuw,Tuw")
+            .arg("-i")
+            .arg("/usr/local/share/ca-certificates/startos-root-ca.crt")
+            .arg("-d")
+            .arg("/home/kiosk/fx-profile")
+            .invoke(ErrorKind::OpenSsl)
+            .await?;
+    }
     load_ca_cert.complete();
 
     load_wifi.start();
@@ -422,6 +436,12 @@ pub async fn init(
         tokio::fs::remove_dir_all(&tmp_var).await?;
     }
     crate::disk::mount::util::bind(&tmp_var, "/var/tmp", false).await?;
+    let downloading = cfg
+        .datadir()
+        .join(format!("package-data/archive/downloading"));
+    if tokio::fs::metadata(&downloading).await.is_ok() {
+        tokio::fs::remove_dir_all(&downloading).await?;
+    }
     let tmp_docker = cfg
         .datadir()
         .join(format!("package-data/tmp/{CONTAINER_TOOL}"));

From a743785faf26eb6144847240be6752914b72f2cb Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 01:42:10 -0600
Subject: [PATCH 208/341] cleanup on uninstall

---
 core/startos/src/db/model/package.rs | 12 +++++
 core/startos/src/service/mod.rs      | 70 +++++++++++++++++++++++-----
 2 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index e3b6e613b..cb537a2b5 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -63,6 +63,18 @@ impl PackageState {
             )),
         }
     }
+    pub fn expect_removing(&self) -> Result<&InstalledState, Error> {
+        match self {
+            Self::Removing(a) => Ok(a),
+            _ => Err(Error::new(
+                eyre!(
+                    "Package {} is not in removing state",
+                    self.as_manifest(ManifestPreference::Old).id
+                ),
+                ErrorKind::InvalidRequest,
+            )),
+        }
+    }
     pub fn into_installing_info(self) -> Option<InstallingInfo> {
         match self {
             Self::Installing(InstallingState { installing_info })
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index efaa28d4e..2beb5c9fa 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -29,9 +29,8 @@ use crate::s9pk::S9pk;
 use crate::service::service_map::InstallProgressHandles;
 use crate::status::health_check::HealthCheckResult;
 use crate::util::actor::concurrent::ConcurrentActor;
-use crate::util::actor::Actor;
 use crate::util::io::create_file;
-use crate::util::serde::Pem;
+use crate::util::serde::{NoOutput, Pem};
 use crate::util::Never;
 use crate::volume::data_dir;
 
@@ -80,7 +79,7 @@ impl ServiceRef {
     ) -> Result<(), Error> {
         self.seed
             .persistent_container
-            .execute(
+            .execute::<NoOutput>(
                 Guid::new(),
                 ProcedureName::Uninit,
                 to_value(&target_version)?,
@@ -90,10 +89,60 @@ impl ServiceRef {
         let id = self.seed.persistent_container.s9pk.as_manifest().id.clone();
         let ctx = self.seed.ctx.clone();
         self.shutdown().await?;
+
         if target_version.is_none() {
-            ctx.db
-                .mutate(|d| d.as_public_mut().as_package_data_mut().remove(&id))
-                .await?;
+            if let Some(pde) = ctx
+                .db
+                .mutate(|d| {
+                    if let Some(pde) = d
+                        .as_public_mut()
+                        .as_package_data_mut()
+                        .remove(&id)?
+                        .map(|d| d.de())
+                        .transpose()?
+                    {
+                        d.as_private_mut().as_available_ports_mut().mutate(|p| {
+                            p.free(
+                                pde.hosts
+                                    .0
+                                    .values()
+                                    .flat_map(|h| h.bindings.values())
+                                    .flat_map(|b| {
+                                        b.lan
+                                            .assigned_port
+                                            .into_iter()
+                                            .chain(b.lan.assigned_ssl_port)
+                                    }),
+                            );
+                            Ok(())
+                        })?;
+                        Ok(Some(pde))
+                    } else {
+                        Ok(None)
+                    }
+                })
+                .await?
+            {
+                let state = pde.state_info.expect_removing()?;
+                for volume_id in &state.manifest.volumes {
+                    let path = data_dir(&ctx.datadir, &state.manifest.id, volume_id);
+                    if tokio::fs::metadata(&path).await.is_ok() {
+                        tokio::fs::remove_dir_all(&path).await?;
+                    }
+                }
+                let logs_dir = ctx.datadir.join("logs").join(&state.manifest.id);
+                if tokio::fs::metadata(&logs_dir).await.is_ok() {
+                    tokio::fs::remove_dir_all(&logs_dir).await?;
+                }
+                let archive_path = ctx
+                    .datadir
+                    .join("archive")
+                    .join("installed")
+                    .join(&state.manifest.id);
+                if tokio::fs::metadata(&archive_path).await.is_ok() {
+                    tokio::fs::remove_file(&archive_path).await?;
+                }
+            }
         }
         Ok(())
     }
@@ -187,10 +236,9 @@ impl Service {
             let ctx = ctx.clone();
             move |s9pk: S9pk, i: Model<PackageDataEntry>| async move {
                 for volume_id in &s9pk.as_manifest().volumes {
-                    let tmp_path =
-                        data_dir(&ctx.datadir, &s9pk.as_manifest().id.clone(), volume_id);
-                    if tokio::fs::metadata(&tmp_path).await.is_err() {
-                        tokio::fs::create_dir_all(&tmp_path).await?;
+                    let path = data_dir(&ctx.datadir, &s9pk.as_manifest().id, volume_id);
+                    if tokio::fs::metadata(&path).await.is_err() {
+                        tokio::fs::create_dir_all(&path).await?;
                     }
                 }
                 let start_stop = if i.as_status().as_main().de()?.running() {
@@ -368,7 +416,7 @@ impl Service {
         service
             .seed
             .persistent_container
-            .execute(
+            .execute::<NoOutput>(
                 Guid::new(),
                 ProcedureName::Init,
                 to_value(&src_version)?,

From dfb7658c3ef74cfd936477e94e21f42365cca3b7 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 01:43:46 -0600
Subject: [PATCH 209/341] implement mount for dependencies

---
 .../startos/src/service/effects/dependency.rs | 47 +++++++++++++++++--
 core/startos/src/service/effects/image.rs     |  5 +-
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/core/startos/src/service/effects/dependency.rs b/core/startos/src/service/effects/dependency.rs
index dfc8795f0..34619ebd4 100644
--- a/core/startos/src/service/effects/dependency.rs
+++ b/core/startos/src/service/effects/dependency.rs
@@ -7,14 +7,20 @@ use exver::VersionRange;
 use itertools::Itertools;
 use models::{HealthCheckId, PackageId, VolumeId};
 use patch_db::json_ptr::JsonPointer;
+use tokio::process::Command;
 
 use crate::db::model::package::{
     CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind, ManifestPreference,
 };
+use crate::disk::mount::filesystem::bind::Bind;
+use crate::disk::mount::filesystem::idmapped::IdMapped;
+use crate::disk::mount::filesystem::{FileSystem, MountType};
 use crate::rpc_continuations::Guid;
 use crate::service::effects::prelude::*;
 use crate::status::health_check::HealthCheckResult;
 use crate::util::clap::FromStrParser;
+use crate::util::Invoke;
+use crate::volume::data_dir;
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[ts(export)]
@@ -29,7 +35,7 @@ pub struct MountTarget {
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct MountParams {
-    location: String,
+    location: PathBuf,
     target: MountTarget,
 }
 pub async fn mount(
@@ -45,8 +51,43 @@ pub async fn mount(
             },
     }: MountParams,
 ) -> Result<(), Error> {
-    // TODO
-    todo!()
+    let context = context.deref()?;
+    let subpath = subpath.unwrap_or_default();
+    let subpath = subpath.strip_prefix("/").unwrap_or(&subpath);
+    let source = data_dir(&context.seed.ctx.datadir, &package_id, &volume_id).join(subpath);
+    if readonly && tokio::fs::metadata(&source).await.is_err() {
+        return Err(Error::new(
+            eyre!("{volume_id}/{} does not exist", subpath.display()),
+            ErrorKind::NotFound,
+        ));
+    }
+    let location = location.strip_prefix("/").unwrap_or(&location);
+    let mountpoint = context
+        .seed
+        .persistent_container
+        .lxc_container
+        .get()
+        .or_not_found("lxc container")?
+        .rootfs_dir()
+        .join(location);
+    tokio::fs::create_dir_all(&mountpoint).await?;
+    Command::new("chown")
+        .arg("100000:100000")
+        .arg(&mountpoint)
+        .invoke(crate::ErrorKind::Filesystem)
+        .await?;
+    IdMapped::new(Bind::new(source), 0, 100000, 65536)
+        .mount(
+            mountpoint,
+            if readonly {
+                MountType::ReadOnly
+            } else {
+                MountType::ReadWrite
+            },
+        )
+        .await?;
+
+    Ok(())
 }
 
 pub async fn get_installed_packages(context: EffectContext) -> Result<Vec<PackageId>, Error> {
diff --git a/core/startos/src/service/effects/image.rs b/core/startos/src/service/effects/image.rs
index 69c516ce5..af62047ed 100644
--- a/core/startos/src/service/effects/image.rs
+++ b/core/startos/src/service/effects/image.rs
@@ -83,15 +83,16 @@ pub async fn destroy_overlayed_image(
     DestroyOverlayedImageParams { guid }: DestroyOverlayedImageParams,
 ) -> Result<(), Error> {
     let context = context.deref()?;
-    if context
+    if let Some(overlay) = context
         .seed
         .persistent_container
         .overlays
         .lock()
         .await
         .remove(&guid)
-        .is_none()
     {
+        overlay.unmount(true).await?;
+    } else {
         tracing::warn!("Could not find a guard to remove on the destroy overlayed image; assumming that it already is removed and will be skipping");
     }
     Ok(())

From 2754302fb710de8fb41fad2a15982a0b0812daad Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 02:02:58 -0600
Subject: [PATCH 210/341] standardize result type for sideload progress

---
 core/startos/src/install/mod.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 394136024..8d4f65312 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -12,7 +12,7 @@ use itertools::Itertools;
 use models::VersionString;
 use reqwest::header::{HeaderMap, CONTENT_LENGTH};
 use reqwest::Url;
-use rpc_toolkit::yajrc::RpcError;
+use rpc_toolkit::yajrc::{GenericRpcMethod, RpcError};
 use rpc_toolkit::HandlerArgs;
 use rustyline_async::ReadlineEvent;
 use serde::{Deserialize, Serialize};
@@ -202,11 +202,12 @@ pub async fn sideload(
                     use axum::extract::ws::Message;
                     async move {
                         if let Err(e) = async {
+                            type RpcResponse = rpc_toolkit::yajrc::RpcResponse::<GenericRpcMethod<&'static str, (), FullProgress>>;
                             tokio::select! {
                                 res = async {
                                     while let Some(progress) = progress_listener.next().await {
                                         ws.send(Message::Text(
-                                            serde_json::to_string(&Ok::<_, ()>(progress))
+                                            serde_json::to_string(&RpcResponse::from_result::<RpcError>(Ok(progress)))
                                                 .with_kind(ErrorKind::Serialization)?,
                                         ))
                                         .await
@@ -217,7 +218,7 @@ pub async fn sideload(
                                 err = err_recv => {
                                     if let Ok(e) = err {
                                         ws.send(Message::Text(
-                                            serde_json::to_string(&Err::<(), _>(e))
+                                            serde_json::to_string(&RpcResponse::from_result::<RpcError>(Err(e)))
                                             .with_kind(ErrorKind::Serialization)?,
                                         ))
                                         .await
@@ -406,14 +407,18 @@ pub async fn cli_install(
 
                 let mut progress = FullProgress::new();
 
+                type RpcResponse = rpc_toolkit::yajrc::RpcResponse<
+                    GenericRpcMethod<&'static str, (), FullProgress>,
+                >;
+
                 loop {
                     tokio::select! {
                         msg = ws.next() => {
                             if let Some(msg) = msg {
                                 if let Message::Text(t) = msg.with_kind(ErrorKind::Network)? {
                                     progress =
-                                        serde_json::from_str::<Result<_, RpcError>>(&t)
-                                            .with_kind(ErrorKind::Deserialization)??;
+                                        serde_json::from_str::<RpcResponse>(&t)
+                                            .with_kind(ErrorKind::Deserialization)?.result?;
                                     bar.update(&progress);
                                 }
                             } else {

From 078bf4102923587989b53c38036cd07fb96f33b6 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 02:07:39 -0600
Subject: [PATCH 211/341] bump version

---
 core/Cargo.lock                               | 251 +++++++++---------
 core/startos/Cargo.toml                       |   2 +-
 core/startos/src/version/mod.rs               |   3 +-
 core/startos/src/version/v0_3_6_alpha_1.rs    |  35 +++
 web/package.json                              |   2 +-
 web/patchdb-ui-seed.json                      |   3 +-
 .../modals/os-welcome/os-welcome.page.html    |   2 +-
 7 files changed, 173 insertions(+), 125 deletions(-)
 create mode 100644 core/startos/src/version/v0_3_6_alpha_1.rs

diff --git a/core/Cargo.lock b/core/Cargo.lock
index a3464c7dc..69d23b92c 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -122,33 +122,33 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -162,9 +162,9 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
 
 [[package]]
 name = "arrayvec"
@@ -200,9 +200,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
+checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
 dependencies = [
  "brotli",
  "flate2",
@@ -231,7 +231,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -242,7 +242,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -268,9 +268,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a47f2fb521b70c11ce7369a6c5fa4bd6af7e5d62ec06303875bafe7c6ba245"
+checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77"
 dependencies = [
  "aws-lc-sys",
  "mirai-annotations",
@@ -280,9 +280,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2927c7af777b460b7ccd95f8b67acd7b4c04ec8896bf0c8e80ba30523cffc057"
+checksum = "2e89b6941c2d1a7045538884d6e760ccfffdf8e1ffc2613d8efa74305e1f3752"
 dependencies = [
  "bindgen",
  "cc",
@@ -532,7 +532,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.71",
+ "syn 2.0.72",
  "which",
 ]
 
@@ -687,9 +687,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052"
+checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
 dependencies = [
  "jobserver",
  "libc",
@@ -799,9 +799,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.9"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462"
+checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -809,9 +809,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.9"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942"
+checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
 dependencies = [
  "anstream",
  "anstyle",
@@ -821,21 +821,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.8"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
+checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "cmake"
@@ -875,9 +875,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
 name = "concurrent-queue"
@@ -956,18 +956,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const_format"
-version = "0.2.32"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1125,7 +1125,7 @@ dependencies = [
  "crossterm_winapi",
  "futures-core",
  "libc",
- "mio",
+ "mio 0.8.11",
  "parking_lot",
  "signal-hook",
  "signal-hook-mio",
@@ -1236,7 +1236,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1260,7 +1260,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1271,7 +1271,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1302,7 +1302,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1325,7 +1325,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1348,7 +1348,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1570,7 +1570,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1828,7 +1828,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2236,7 +2236,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "hyper-util",
- "rustls 0.23.11",
+ "rustls 0.23.12",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -2515,9 +2515,9 @@ dependencies = [
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "isocountry"
@@ -2620,21 +2620,21 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "josekit"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0953340cf63354cec4a385f1fbcb3f409a5823778cae236078892f6030ed4565"
+checksum = "54b85e2125819afc4fd2ae57416207e792c7e12797858e5db2a6c6f24a166829"
 dependencies = [
  "anyhow",
- "base64 0.21.7",
+ "base64 0.22.1",
  "flate2",
  "once_cell",
  "openssl",
@@ -2777,9 +2777,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.6",
@@ -2955,6 +2955,18 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "mirai-annotations"
 version = "1.12.0"
@@ -3229,7 +3241,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3274,9 +3286,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -3295,7 +3307,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3315,9 +3327,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",
@@ -3502,7 +3514,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3558,7 +3570,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3602,9 +3614,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 
 [[package]]
 name = "powerfmt"
@@ -3631,7 +3643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3703,7 +3715,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3726,7 +3738,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4181,15 +4193,15 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.11"
+version = "0.23.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
  "rustls-pki-types",
- "rustls-webpki 0.102.5",
+ "rustls-webpki 0.102.6",
  "subtle",
  "zeroize",
 ]
@@ -4231,9 +4243,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.5"
+version = "0.102.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -4395,7 +4407,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4422,9 +4434,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -4468,7 +4480,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4571,7 +4583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
  "signal-hook",
 ]
 
@@ -4880,9 +4892,9 @@ dependencies = [
 
 [[package]]
 name = "sscanf"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c713ebd15ce561dd4a13ed62bc2a0368e16806fc30dcaf66ecf1256b2a3fdde6"
+checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d"
 dependencies = [
  "const_format",
  "lazy_static",
@@ -4892,16 +4904,16 @@ dependencies = [
 
 [[package]]
 name = "sscanf_macro"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84955aa74a157e5834d58a07be11af7f0ab923f0194a0bb2ea6b3db8b5d1611d"
+checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc"
 dependencies = [
  "convert_case 0.6.0",
  "proc-macro2",
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.71",
+ "syn 2.0.72",
  "unicode-width",
 ]
 
@@ -4949,7 +4961,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.0"
+version = "0.3.6-alpha.1"
 dependencies = [
  "aes",
  "async-compression",
@@ -5060,7 +5072,7 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite 0.23.1",
  "tokio-util",
- "toml 0.8.15",
+ "toml 0.8.16",
  "torut",
  "tower-service",
  "tracing",
@@ -5138,9 +5150,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.71"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5267,7 +5279,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5348,22 +5360,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.1"
+version = "1.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
+checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
- "num_cpus",
+ "mio 1.0.1",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5378,13 +5389,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5403,7 +5414,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.11",
+ "rustls 0.23.12",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5499,21 +5510,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.15"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
+checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.16",
+ "toml_edit 0.22.17",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db"
 dependencies = [
  "serde",
 ]
@@ -5544,15 +5555,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.16"
+version = "0.22.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
+checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.13",
+ "winnow 0.6.16",
 ]
 
 [[package]]
@@ -5653,7 +5664,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5805,7 +5816,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
  "termcolor",
 ]
 
@@ -5865,7 +5876,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5936,9 +5947,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
 
 [[package]]
 name = "unicode-xid"
@@ -6011,9 +6022,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "wait-timeout"
@@ -6082,7 +6093,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
  "wasm-bindgen-shared",
 ]
 
@@ -6116,7 +6127,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6368,9 +6379,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.13"
+version = "0.6.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c"
 dependencies = [
  "memchr",
 ]
@@ -6470,7 +6481,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -6490,7 +6501,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.72",
 ]
 
 [[package]]
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 2e6df1e3d..5e84aac5e 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.0"
+version = "0.3.6-alpha.1"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 9ad571759..09d438344 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -14,8 +14,9 @@ mod v0_3_5;
 mod v0_3_5_1;
 mod v0_3_5_2;
 mod v0_3_6_alpha_0;
+mod v0_3_6_alpha_1;
 
-pub type Current = v0_3_6_alpha_0::Version;
+pub type Current = v0_3_6_alpha_1::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
diff --git a/core/startos/src/version/v0_3_6_alpha_1.rs b/core/startos/src/version/v0_3_6_alpha_1.rs
new file mode 100644
index 000000000..8f40c3fde
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_1.rs
@@ -0,0 +1,35 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_0, VersionT};
+use crate::db::model::Database;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_1: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 1.into()]
+    );
+}
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_0::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> exver::Version {
+        V0_3_6_alpha_1.clone()
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/web/package.json b/web/package.json
index 6f72a68ec..f20272d99 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.0",
+  "version": "0.3.6-alpha.1",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 9626d2558..15e020cb3 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -20,5 +20,6 @@
   },
   "ackInstructions": {},
   "theme": "Dark",
-  "widgets": []
+  "widgets": [],
+  "ack-welcome": "0.3.6-alpha.1"
 }
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 3def4478b..d53a0746d 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,7 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6-alpha.0</h4>
+  <h4>0.3.6-alpha.1</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
   <h6>Expect that any data you create or store on this version of the OS can be LOST FOREVER!</h6>
 

From 8aecec0b9a86a37ad9e6f0dc5ab46ac79abaa005 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 11:09:46 -0600
Subject: [PATCH 212/341] fix canonicalization

---
 core/helpers/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/helpers/src/lib.rs b/core/helpers/src/lib.rs
index d913aefee..80631fea2 100644
--- a/core/helpers/src/lib.rs
+++ b/core/helpers/src/lib.rs
@@ -50,7 +50,8 @@ pub async fn canonicalize(
     }
     let path = path.as_ref();
     if tokio::fs::metadata(path).await.is_err() {
-        if let (Some(parent), Some(file_name)) = (path.parent(), path.file_name()) {
+        let parent = path.parent().unwrap_or(Path::new("."));
+        if let Some(file_name) = path.file_name() {
             if create_parent && tokio::fs::metadata(parent).await.is_err() {
                 return Ok(create_canonical_folder(parent).await?.join(file_name));
             } else {

From e0b47feb8bb13b35ab4bccdf5dfb99fa4651f016 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:19:16 -0600
Subject: [PATCH 213/341] Fixing: Some getConfigs where breaking in new system
 (#2685)

---
 Makefile                                      |    1 +
 container-runtime/jest.config.js              |    8 +
 container-runtime/package-lock.json           | 8624 ++++++++++++++---
 container-runtime/package.json                |   10 +-
 .../__fixtures__/embasyPagesConfig.ts         |  127 +
 .../SystemForEmbassy/__fixtures__/searNXG.ts  |   39 +
 .../transformConfigSpec.test.ts.snap          |  253 +
 .../transformConfigSpec.test.ts               |   23 +
 .../SystemForEmbassy/transformConfigSpec.ts   |    9 +-
 container-runtime/tsconfig.json               |    5 +-
 10 files changed, 7560 insertions(+), 1539 deletions(-)
 create mode 100644 container-runtime/jest.config.js
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/embasyPagesConfig.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/searNXG.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts

diff --git a/Makefile b/Makefile
index 4fb5033d0..90c00ae2d 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,7 @@ format:
 test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
 	(cd core && cargo build  --features=test && cargo test --features=test)
 	(cd sdk && make test)
+	(cd container-runtime && npm test)
 
 cli:
 	cd core && ./install-cli.sh
diff --git a/container-runtime/jest.config.js b/container-runtime/jest.config.js
new file mode 100644
index 000000000..f499f03f9
--- /dev/null
+++ b/container-runtime/jest.config.js
@@ -0,0 +1,8 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: "ts-jest",
+  automock: false,
+  testEnvironment: "node",
+  rootDir: "./src/",
+  modulePathIgnorePatterns: ["./dist/"],
+}
diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index e63bec6a1..eb7778c83 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -15,6 +15,7 @@
         "esbuild-plugin-resolve": "^2.0.0",
         "filebrowser": "^1.0.0",
         "isomorphic-fetch": "^3.0.0",
+        "jest": "^29.7.0",
         "lodash.merge": "^4.6.2",
         "node-fetch": "^3.1.0",
         "ts-matches": "^5.5.1",
@@ -25,14 +26,16 @@
       "devDependencies": {
         "@swc/cli": "^0.1.62",
         "@swc/core": "^1.3.65",
+        "@types/jest": "^29.5.12",
         "@types/node": "^20.11.13",
         "prettier": "^3.2.5",
+        "ts-jest": "^29.2.3",
         "typescript": ">5.2"
       }
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha5",
+      "version": "0.3.6-alpha6",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
@@ -48,1186 +51,1373 @@
         "@types/jest": "^29.4.0",
         "@types/lodash.merge": "^4.6.2",
         "jest": "^29.4.3",
+        "peggy": "^3.0.2",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
         "tsx": "^4.7.1",
         "typescript": "^5.0.4"
       }
     },
-    "node_modules/@iarna/toml": {
-      "version": "2.2.5",
-      "license": "ISC"
-    },
-    "node_modules/@mole-inc/bin-wrapper": {
-      "version": "8.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dependencies": {
-        "bin-check": "^4.1.0",
-        "bin-version-check": "^5.0.0",
-        "content-disposition": "^0.5.4",
-        "ext-name": "^5.0.0",
-        "file-type": "^17.1.6",
-        "filenamify": "^5.0.2",
-        "got": "^11.8.5",
-        "os-filter-obj": "^2.0.0"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@noble/curves": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
-      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+    "node_modules/@babel/code-frame": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dependencies": {
-        "@noble/hashes": "1.4.0"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+    "node_modules/@babel/compat-data": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz",
+      "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==",
       "engines": {
-        "node": ">= 16"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
+      "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.9",
+        "@babel/helper-compilation-targets": "^7.24.8",
+        "@babel/helper-module-transforms": "^7.24.9",
+        "@babel/helpers": "^7.24.8",
+        "@babel/parser": "^7.24.8",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.8",
+        "@babel/types": "^7.24.9",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/core/node_modules/debug": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
+    "node_modules/@babel/core/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/generator": {
+      "version": "7.24.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz",
+      "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "@babel/types": "^7.24.9",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^2.5.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@sindresorhus/is": {
-      "version": "4.6.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
+      "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==",
+      "dependencies": {
+        "@babel/compat-data": "^7.24.8",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@start9labs/start-sdk": {
-      "resolved": "../sdk/dist",
-      "link": true
-    },
-    "node_modules/@swc/cli": {
-      "version": "0.1.65",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dependencies": {
-        "@mole-inc/bin-wrapper": "^8.0.1",
-        "commander": "^7.1.0",
-        "fast-glob": "^3.2.5",
-        "minimatch": "^9.0.3",
-        "semver": "^7.3.8",
-        "slash": "3.0.0",
-        "source-map": "^0.7.3"
-      },
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "bin": {
-        "spack": "bin/spack.js",
-        "swc": "bin/swc.js",
-        "swcx": "bin/swcx.js"
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
       },
       "engines": {
-        "node": ">= 12.13"
-      },
-      "peerDependencies": {
-        "@swc/core": "^1.2.66",
-        "chokidar": "^3.5.1"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
+      "dependencies": {
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@swc/core": {
-      "version": "1.5.28",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "Apache-2.0",
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
       "dependencies": {
-        "@swc/counter": "^0.1.3",
-        "@swc/types": "^0.1.8"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/swc"
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz",
+      "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
       },
-      "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.5.28",
-        "@swc/core-darwin-x64": "1.5.28",
-        "@swc/core-linux-arm-gnueabihf": "1.5.28",
-        "@swc/core-linux-arm64-gnu": "1.5.28",
-        "@swc/core-linux-arm64-musl": "1.5.28",
-        "@swc/core-linux-x64-gnu": "1.5.28",
-        "@swc/core-linux-x64-musl": "1.5.28",
-        "@swc/core-win32-arm64-msvc": "1.5.28",
-        "@swc/core-win32-ia32-msvc": "1.5.28",
-        "@swc/core-win32-x64-msvc": "1.5.28"
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@swc/helpers": "*"
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
-      "peerDependenciesMeta": {
-        "@swc/helpers": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.5.28",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.5.28",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@swc/counter": {
-      "version": "0.1.3",
-      "dev": true,
-      "license": "Apache-2.0"
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@swc/types": {
-      "version": "0.1.8",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@swc/counter": "^0.1.3"
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/helpers": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz",
+      "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==",
       "dependencies": {
-        "defer-to-connect": "^2.0.0"
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.8"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@tokenizer/token": {
-      "version": "0.3.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/highlight": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "^3.1.4",
-        "@types/node": "*",
-        "@types/responselike": "^1.0.0"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/keyv": {
-      "version": "3.1.4",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
-        "@types/node": "*"
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@types/node": {
-      "version": "20.14.2",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@types/responselike": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dependencies": {
-        "@types/node": "*"
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "license": "MIT",
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/arch": {
-      "version": "2.2.0",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "license": "MIT"
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/bin-check": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "execa": "^0.7.0",
-        "executable": "^4.1.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/bin-version": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "execa": "^5.0.0",
-        "find-versions": "^5.0.0"
+    "node_modules/@babel/parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz",
+      "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==",
+      "bin": {
+        "parser": "bin/babel-parser.js"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/bin-version-check": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dependencies": {
-        "bin-version": "^6.0.0",
-        "semver": "^7.5.3",
-        "semver-truncate": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">= 8"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/execa": {
-      "version": "5.1.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/get-stream": {
-      "version": "6.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/is-stream": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
       "dependencies": {
-        "path-key": "^3.0.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/path-key": {
-      "version": "3.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dependencies": {
-        "shebang-regex": "^3.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bin-version/node_modules/which": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">= 8"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/body-parser": {
-      "version": "1.20.2",
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.2",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "license": "MIT",
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
+      "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/template": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
       "engines": {
-        "node": ">=10.6.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/cacheable-request": {
-      "version": "7.0.4",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/traverse": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz",
+      "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==",
       "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.8",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.8",
+        "@babel/types": "^7.24.8",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@babel/traverse/node_modules/debug": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dependencies": {
-        "pump": "^3.0.0"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "license": "MIT",
+    "node_modules/@babel/traverse/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/@babel/types": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz",
+      "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==",
       "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "to-fast-properties": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
+    },
+    "node_modules/@iarna/toml": {
+      "version": "2.2.5",
+      "license": "ISC"
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dependencies": {
-        "mimic-response": "^1.0.0"
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "engines": {
-        "node": ">= 10"
+        "node": ">=8"
       }
     },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "license": "MIT",
+    "node_modules/@jest/console": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dependencies": {
-        "safe-buffer": "5.2.1"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+    "node_modules/@jest/core": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/cookie": {
-      "version": "0.6.0",
-      "license": "MIT",
+    "node_modules/@jest/environment": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "dependencies": {
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "license": "MIT"
-    },
-    "node_modules/cross-spawn": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dependencies": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/data-uri-to-buffer": {
-      "version": "4.0.1",
-      "license": "MIT",
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dependencies": {
+        "jest-get-type": "^29.6.3"
+      },
       "engines": {
-        "node": ">= 12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "license": "MIT",
+    "node_modules/@jest/fake-timers": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dependencies": {
-        "ms": "2.0.0"
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/decompress-response": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@jest/globals": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dependencies": {
-        "mimic-response": "^3.1.0"
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/decompress-response/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
+    "node_modules/@jest/reporters": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
       "engines": {
-        "node": ">=10"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "license": "MIT",
+    "node_modules/@jest/source-map": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "license": "MIT",
+    "node_modules/@jest/test-result": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "license": "MIT",
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "license": "MIT"
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "license": "MIT",
+    "node_modules/@jest/transform": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dependencies": {
-        "once": "^1.4.0"
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "license": "MIT",
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/esbuild-plugin-resolve": {
-      "version": "2.0.0",
-      "license": "MIT"
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "license": "MIT"
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "5.0.0",
+    "node_modules/@mole-inc/bin-wrapper": {
+      "version": "8.0.1",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "bin-check": "^4.1.0",
+        "bin-version-check": "^5.0.0",
+        "content-disposition": "^0.5.4",
+        "ext-name": "^5.0.0",
+        "file-type": "^17.1.6",
+        "filenamify": "^5.0.2",
+        "got": "^11.8.5",
+        "os-filter-obj": "^2.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/@noble/curves": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
+      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "license": "MIT",
+    "node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/execa": {
-      "version": "0.7.0",
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 8"
       }
     },
-    "node_modules/executable": {
-      "version": "4.1.1",
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "pify": "^2.2.0"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">= 8"
       }
     },
-    "node_modules/express": {
-      "version": "4.19.2",
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.6.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/ext-list": {
-      "version": "2.2.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "^1.28.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
     },
-    "node_modules/ext-name": {
-      "version": "5.0.0",
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ext-list": "^2.0.0",
-        "sort-keys-length": "^1.0.0"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
+        "type-detect": "4.0.8"
       }
     },
-    "node_modules/fastq": {
-      "version": "1.17.1",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
       "dependencies": {
-        "reusify": "^1.0.4"
+        "@sinonjs/commons": "^3.0.0"
       }
     },
-    "node_modules/fetch-blob": {
-      "version": "3.2.0",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
+    "node_modules/@start9labs/start-sdk": {
+      "resolved": "../sdk/dist",
+      "link": true
+    },
+    "node_modules/@swc/cli": {
+      "version": "0.1.65",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "node-domexception": "^1.0.0",
-        "web-streams-polyfill": "^3.0.3"
+        "@mole-inc/bin-wrapper": "^8.0.1",
+        "commander": "^7.1.0",
+        "fast-glob": "^3.2.5",
+        "minimatch": "^9.0.3",
+        "semver": "^7.3.8",
+        "slash": "3.0.0",
+        "source-map": "^0.7.3"
+      },
+      "bin": {
+        "spack": "bin/spack.js",
+        "swc": "bin/swc.js",
+        "swcx": "bin/swcx.js"
       },
       "engines": {
-        "node": "^12.20 || >= 14.13"
+        "node": ">= 12.13"
+      },
+      "peerDependencies": {
+        "@swc/core": "^1.2.66",
+        "chokidar": "^3.5.1"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "node_modules/file-type": {
-      "version": "17.1.6",
+    "node_modules/@swc/core": {
+      "version": "1.5.28",
       "dev": true,
-      "license": "MIT",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "readable-web-to-node-stream": "^3.0.2",
-        "strtok3": "^7.0.0-alpha.9",
-        "token-types": "^5.0.0-alpha.2"
+        "@swc/counter": "^0.1.3",
+        "@swc/types": "^0.1.8"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/file-type?sponsor=1"
-      }
-    },
-    "node_modules/filebrowser": {
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "commander": "^2.9.0",
-        "content-disposition": "^0.5.1",
-        "express": "^4.14.0"
+        "type": "opencollective",
+        "url": "https://opencollective.com/swc"
+      },
+      "optionalDependencies": {
+        "@swc/core-darwin-arm64": "1.5.28",
+        "@swc/core-darwin-x64": "1.5.28",
+        "@swc/core-linux-arm-gnueabihf": "1.5.28",
+        "@swc/core-linux-arm64-gnu": "1.5.28",
+        "@swc/core-linux-arm64-musl": "1.5.28",
+        "@swc/core-linux-x64-gnu": "1.5.28",
+        "@swc/core-linux-x64-musl": "1.5.28",
+        "@swc/core-win32-arm64-msvc": "1.5.28",
+        "@swc/core-win32-ia32-msvc": "1.5.28",
+        "@swc/core-win32-x64-msvc": "1.5.28"
+      },
+      "peerDependencies": {
+        "@swc/helpers": "*"
+      },
+      "peerDependenciesMeta": {
+        "@swc/helpers": {
+          "optional": true
+        }
       }
     },
-    "node_modules/filebrowser/node_modules/commander": {
-      "version": "2.20.3",
-      "license": "MIT"
-    },
-    "node_modules/filename-reserved-regex": {
-      "version": "3.0.0",
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.5.28",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=10"
       }
     },
-    "node_modules/filenamify": {
-      "version": "5.1.1",
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.5.28",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "filename-reserved-regex": "^3.0.0",
-        "strip-outer": "^2.0.0",
-        "trim-repeated": "^2.0.0"
-      },
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=10"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
+    "node_modules/@swc/counter": {
+      "version": "0.1.3",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0"
+    },
+    "node_modules/@swc/types": {
+      "version": "0.1.8",
+      "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "@swc/counter": "^0.1.3"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
+        "defer-to-connect": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=10"
       }
     },
-    "node_modules/find-versions": {
-      "version": "5.1.0",
+    "node_modules/@tokenizer/token": {
+      "version": "0.3.0",
       "dev": true,
-      "license": "MIT",
+      "license": "MIT"
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dependencies": {
-        "semver-regex": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
       }
     },
-    "node_modules/formdata-polyfill": {
-      "version": "4.0.10",
-      "license": "MIT",
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
       "dependencies": {
-        "fetch-blob": "^3.1.2"
-      },
-      "engines": {
-        "node": ">=12.20.0"
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "dependencies": {
+        "@babel/types": "^7.20.7"
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
+      "dev": true,
       "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "license": "MIT",
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
       "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@types/node": "*"
       }
     },
-    "node_modules/get-stream": {
-      "version": "3.0.0",
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.4",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
+      "license": "MIT"
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+        "@types/istanbul-lib-coverage": "*"
       }
     },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "license": "MIT",
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
       "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/got": {
-      "version": "11.8.6",
+    "node_modules/@types/jest": {
+      "version": "29.5.12",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
+      "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.2",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
+    "node_modules/@types/keyv": {
+      "version": "3.1.4",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@types/node": "*"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
+    "node_modules/@types/node": {
+      "version": "20.14.2",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/has-symbols": {
+    "node_modules/@types/responselike": {
       "version": "1.0.3",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "license": "MIT",
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "dev": true,
-      "license": "BSD-2-Clause"
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
     },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
+    "node_modules/accepts": {
+      "version": "1.3.8",
       "license": "MIT",
       "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
+        "type-fest": "^0.21.3"
       },
       "engines": {
-        "node": ">=10.19.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
-        "node": ">=10.17.0"
+        "node": ">=8"
       }
     },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "license": "MIT",
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arch": {
+      "version": "2.2.0",
       "dev": true,
       "funding": [
         {
@@ -1243,1008 +1433,4735 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "license": "ISC"
+      "license": "MIT"
     },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.10"
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "license": "MIT"
+    },
+    "node_modules/async": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+      "dev": true
+    },
+    "node_modules/babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dependencies": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">=8"
       }
     },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/babel-plugin-istanbul/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/is-stream": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/isomorphic-fetch": {
-      "version": "3.0.0",
-      "license": "MIT",
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dependencies": {
-        "node-fetch": "^2.6.1",
-        "whatwg-fetch": "^3.4.1"
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
-      "version": "2.7.0",
-      "license": "MIT",
+    "node_modules/babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "dev": true,
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
       "license": "MIT"
     },
-    "node_modules/keyv": {
-      "version": "4.5.4",
+    "node_modules/bin-check": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "json-buffer": "3.0.1"
+        "execa": "^0.7.0",
+        "executable": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "node_modules/lowercase-keys": {
-      "version": "2.0.0",
+    "node_modules/bin-version": {
+      "version": "6.0.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "execa": "^5.0.0",
+        "find-versions": "^5.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "4.1.5",
+    "node_modules/bin-version-check": {
+      "version": "5.1.0",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "bin-version": "^6.0.0",
+        "semver": "^7.5.3",
+        "semver-truncate": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
+    "node_modules/bin-version/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 8"
       }
     },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
+    "node_modules/bin-version/node_modules/execa": {
+      "version": "5.1.1",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
+    "node_modules/bin-version/node_modules/get-stream": {
+      "version": "6.0.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.7",
+    "node_modules/bin-version/node_modules/is-stream": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mime": {
-      "version": "1.6.0",
+    "node_modules/bin-version/node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "dev": true,
       "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
+      "dependencies": {
+        "path-key": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
+    "node_modules/bin-version/node_modules/path-key": {
+      "version": "3.1.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
+    "node_modules/bin-version/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mime-db": "1.52.0"
+        "shebang-regex": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
+    "node_modules/bin-version/node_modules/shebang-regex": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
+    "node_modules/bin-version/node_modules/which": {
+      "version": "2.0.2",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">= 8"
       }
     },
-    "node_modules/minimatch": {
-      "version": "9.0.4",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/body-parser": {
+      "version": "1.20.2",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "license": "MIT"
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
     },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
+    "node_modules/braces": {
+      "version": "3.0.3",
       "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/node-domexception": {
-      "version": "1.0.0",
+    "node_modules/browserslist": {
+      "version": "4.23.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
+      "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
       "funding": [
         {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
         },
         {
           "type": "github",
-          "url": "https://paypal.me/jimmywarting"
+          "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.5.0"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "3.3.2",
-      "license": "MIT",
       "dependencies": {
-        "data-uri-to-buffer": "^4.0.0",
-        "fetch-blob": "^3.1.4",
-        "formdata-polyfill": "^4.0.10"
+        "caniuse-lite": "^1.0.30001640",
+        "electron-to-chromium": "^1.4.820",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.1.0"
       },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      "bin": {
+        "browserslist": "cli.js"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/node-fetch"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "2.0.2",
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "path-key": "^2.0.0"
+        "fast-json-stable-stringify": "2.x"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 6"
       }
     },
-    "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dependencies": {
+        "node-int64": "^0.4.0"
       }
     },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
       "license": "MIT",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.6.0"
       }
     },
-    "node_modules/onetime": {
-      "version": "5.1.2",
+    "node_modules/cacheable-request": {
+      "version": "7.0.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mimic-fn": "^2.1.0"
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/os-filter-obj": {
-      "version": "2.0.0",
+    "node_modules/cacheable-request/node_modules/get-stream": {
+      "version": "5.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "arch": "^2.1.0"
+        "pump": "^3.0.0"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "dev": true,
+    "node_modules/call-bind": {
+      "version": "1.0.7",
       "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "license": "MIT",
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=6"
       }
     },
-    "node_modules/path-key": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "license": "MIT"
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001643",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
+      "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
     },
-    "node_modules/peek-readable": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">=14.16"
+        "node": ">=10"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "node": ">=10"
       }
     },
-    "node_modules/pify": {
-      "version": "2.3.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/prettier": {
-      "version": "3.3.2",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin/prettier.cjs"
+    "node_modules/cjs-module-lexer": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
+      "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q=="
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
+        "node": ">=12"
       }
     },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
+    "node_modules/clone-response": {
+      "version": "1.0.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
+        "mimic-response": "^1.0.0"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "engines": {
-        "node": ">= 0.10"
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
       }
     },
-    "node_modules/pseudomap": {
+    "node_modules/collect-v8-coverage": {
       "version": "1.0.2",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
     },
-    "node_modules/qs": {
-      "version": "6.11.0",
-      "license": "BSD-3-Clause",
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
+    "node_modules/commander": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">= 10"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
+    "node_modules/content-type": {
+      "version": "1.0.5",
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/raw-body": {
-      "version": "2.5.2",
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
+    "node_modules/cookie": {
+      "version": "0.6.0",
       "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "license": "MIT"
+    },
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
       "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
+    "node_modules/cross-spawn": {
+      "version": "5.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">= 12"
       }
     },
-    "node_modules/readable-web-to-node-stream": {
-      "version": "3.0.2",
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readable-stream": "^3.6.0"
+        "mimic-response": "^3.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/resolve-alpn": {
-      "version": "1.2.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/responselike": {
-      "version": "2.0.1",
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
+    "node_modules/dedent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
         }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "license": "MIT"
-    },
-    "node_modules/semver": {
-      "version": "7.6.2",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/semver-regex": {
-      "version": "4.0.5",
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=10"
       }
     },
-    "node_modules/semver-truncate": {
-      "version": "3.0.0",
-      "dev": true,
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
       "license": "MIT",
       "dependencies": {
-        "semver": "^7.3.5"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/send": {
-      "version": "0.18.0",
+    "node_modules/depd": {
+      "version": "2.0.0",
       "license": "MIT",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "license": "MIT"
-    },
-    "node_modules/serve-static": {
-      "version": "1.15.0",
+    "node_modules/destroy": {
+      "version": "1.2.0",
       "license": "MIT",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "license": "ISC"
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/shebang-command": {
-      "version": "1.2.0",
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "license": "MIT"
+    },
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz",
+      "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ=="
     },
-    "node_modules/side-channel": {
-      "version": "1.0.6",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "dev": true,
-      "license": "ISC"
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "dev": true,
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/sort-keys": {
-      "version": "1.1.2",
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-plain-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "once": "^1.4.0"
       }
     },
-    "node_modules/sort-keys-length": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dependencies": {
-        "sort-keys": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.7.4",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 8"
+        "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/statuses": {
-      "version": "2.0.1",
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
       "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/string_decoder": {
+    "node_modules/es-errors": {
       "version": "1.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/strip-eof": {
-      "version": "1.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/strip-final-newline": {
+    "node_modules/esbuild-plugin-resolve": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
+      "license": "MIT"
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/strip-outer": {
-      "version": "2.0.0",
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "license": "MIT"
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/strtok3": {
-      "version": "7.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@tokenizer/token": "^0.3.0",
-        "peek-readable": "^5.0.0"
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
       },
       "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
+        "node": ">=4"
       }
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/execa": {
+      "version": "0.7.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-number": "^7.0.0"
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       },
       "engines": {
-        "node": ">=8.0"
+        "node": ">=4"
       }
     },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
+    "node_modules/executable": {
+      "version": "4.1.1",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "pify": "^2.2.0"
+      },
       "engines": {
-        "node": ">=0.6"
+        "node": ">=4"
       }
     },
-    "node_modules/token-types": {
-      "version": "5.0.1",
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "dependencies": {
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.19.2",
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.2",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.6.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/ext-list": {
+      "version": "2.2.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tokenizer/token": "^0.3.0",
-        "ieee754": "^1.2.1"
+        "mime-db": "^1.28.0"
       },
       "engines": {
-        "node": ">=14.16"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ext-name": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ext-list": "^2.0.0",
+        "sort-keys-length": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
+    "node_modules/file-type": {
+      "version": "17.1.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-web-to-node-stream": "^3.0.2",
+        "strtok3": "^7.0.0-alpha.9",
+        "token-types": "^5.0.0-alpha.2"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
+        "url": "https://github.com/sindresorhus/file-type?sponsor=1"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
+    "node_modules/filebrowser": {
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "commander": "^2.9.0",
+        "content-disposition": "^0.5.1",
+        "express": "^4.14.0"
+      }
+    },
+    "node_modules/filebrowser/node_modules/commander": {
+      "version": "2.20.3",
       "license": "MIT"
     },
-    "node_modules/trim-repeated": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "escape-string-regexp": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/filename-reserved-regex": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/filenamify": {
+      "version": "5.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "filename-reserved-regex": "^3.0.0",
+        "strip-outer": "^2.0.0",
+        "trim-repeated": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-versions": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver-regex": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "license": "MIT",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/got": {
+      "version": "11.8.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "license": "ISC"
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "node_modules/is-core-module": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
+      "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "license": "ISC"
+    },
+    "node_modules/isomorphic-fetch": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      }
+    },
+    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
+      "version": "2.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "dependencies": {
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jake": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "dev": true,
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/jake/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dependencies": {
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "dependencies": {
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "dependencies": {
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "4.1.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "license": "MIT"
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.7",
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.4",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "3.3.2",
+      "license": "MIT",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.1",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/os-filter-obj": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arch": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "license": "MIT"
+    },
+    "node_modules/peek-readable": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.3.2",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "license": "MIT",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/pseudomap": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ]
+    },
+    "node_modules/qs": {
+      "version": "6.11.0",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.2",
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readable-web-to-node-stream": {
+      "version": "3.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/responselike": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "license": "MIT"
+    },
+    "node_modules/semver": {
+      "version": "7.6.2",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-regex": {
+      "version": "4.0.5",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semver-truncate": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "license": "MIT"
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "license": "ISC"
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.6",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "license": "ISC"
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sort-keys": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sort-keys-length": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sort-keys": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.4",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/strip-outer": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/strtok3": {
+      "version": "7.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0",
+        "peek-readable": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/token-types": {
+      "version": "5.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0",
+        "ieee754": "^1.2.1"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "license": "MIT"
+    },
+    "node_modules/trim-repeated": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/ts-jest": {
+      "version": "29.2.3",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.3.tgz",
+      "integrity": "sha512-yCcfVdiBFngVz9/keHin9EnsrQtQtEu3nRykNy9RVp+FiPFFbPJ3Sg6Qg4+TkmH0vMP5qsTKgXSsk80HRwvdgQ==",
+      "dev": true,
+      "dependencies": {
+        "bs-logger": "0.x",
+        "ejs": "^3.1.10",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^29.0.0",
+        "json5": "^2.2.3",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "semver": "^7.5.3",
+        "yargs-parser": "^21.0.1"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/transform": "^29.0.0",
+        "@jest/types": "^29.0.0",
+        "babel-jest": "^29.0.0",
+        "jest": "^29.0.0",
+        "typescript": ">=4.3 <6"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@jest/transform": {
+          "optional": true
+        },
+        "@jest/types": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-matches": {
+      "version": "5.5.1",
+      "license": "MIT"
+    },
+    "node_modules/tslib": {
+      "version": "2.6.3",
+      "license": "0BSD"
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "license": "MIT",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.4.5",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "license": "MIT"
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/whatwg-fetch": {
+      "version": "3.6.20",
+      "license": "MIT"
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "license": "ISC"
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yaml": {
+      "version": "2.4.5",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
+  "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "requires": {
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz",
+      "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng=="
+    },
+    "@babel/core": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
+      "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
+      "requires": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.9",
+        "@babel/helper-compilation-targets": "^7.24.8",
+        "@babel/helper-module-transforms": "^7.24.9",
+        "@babel/helpers": "^7.24.8",
+        "@babel/parser": "^7.24.8",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.8",
+        "@babel/types": "^7.24.9",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+          "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.24.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz",
+      "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==",
+      "requires": {
+        "@babel/types": "^7.24.9",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^2.5.1"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
+      "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==",
+      "requires": {
+        "@babel/compat-data": "^7.24.8",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+        }
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
+      "requires": {
+        "@babel/types": "^7.24.7"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
+      "requires": {
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
+      "requires": {
+        "@babel/types": "^7.24.7"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "requires": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz",
+      "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg=="
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "requires": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "requires": {
+        "@babel/types": "^7.24.7"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ=="
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q=="
+    },
+    "@babel/helpers": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz",
+      "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==",
+      "requires": {
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.8"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz",
+      "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w=="
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-jsx": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-typescript": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
+      "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      }
+    },
+    "@babel/template": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "requires": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz",
+      "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==",
+      "requires": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.8",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.8",
+        "@babel/types": "^7.24.8",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+          "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.24.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz",
+      "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==",
+      "requires": {
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/ts-matches": {
-      "version": "5.5.1",
-      "license": "MIT"
+    "@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
     },
-    "node_modules/tslib": {
-      "version": "2.6.3",
-      "license": "0BSD"
+    "@iarna/toml": {
+      "version": "2.2.5"
     },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "license": "MIT",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
       }
     },
-    "node_modules/typescript": {
-      "version": "5.4.5",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
+    },
+    "@jest/console": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0"
       }
     },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "dev": true,
-      "license": "MIT"
+    "@jest/core": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "requires": {
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "@jest/environment": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "requires": {
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0"
+      }
     },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
+    "@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "requires": {
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
+    "@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "requires": {
+        "jest-get-type": "^29.6.3"
+      }
     },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4.0"
+    "@jest/fake-timers": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       }
     },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
+    "@jest/globals": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "requires": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
       }
     },
-    "node_modules/web-streams-polyfill": {
-      "version": "3.3.3",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
+    "@jest/reporters": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "requires": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      }
+    },
+    "@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "requires": {
+        "@sinclair/typebox": "^0.27.8"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "license": "BSD-2-Clause"
+    "@jest/source-map": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+      "requires": {
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      }
     },
-    "node_modules/whatwg-fetch": {
-      "version": "3.6.20",
-      "license": "MIT"
+    "@jest/test-result": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "requires": {
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      }
     },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+    "@jest/test-sequencer": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "requires": {
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
       }
     },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
+    "@jest/transform": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "requires": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      }
+    },
+    "@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "requires": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "ISC"
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "requires": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
     },
-    "node_modules/yallist": {
-      "version": "2.1.2",
-      "dev": true,
-      "license": "ISC"
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="
     },
-    "node_modules/yaml": {
-      "version": "2.4.5",
-      "license": "ISC",
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
+    "@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
-    }
-  },
-  "dependencies": {
-    "@iarna/toml": {
-      "version": "2.2.5"
     },
     "@mole-inc/bin-wrapper": {
       "version": "8.0.1",
@@ -2293,10 +6210,31 @@
         "fastq": "^1.6.0"
       }
     },
+    "@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
+    },
     "@sindresorhus/is": {
       "version": "4.6.0",
       "dev": true
     },
+    "@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "requires": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "requires": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
     "@start9labs/start-sdk": {
       "version": "file:../sdk/dist",
       "requires": {
@@ -2309,10 +6247,12 @@
         "jest": "^29.4.3",
         "lodash.merge": "^4.6.2",
         "mime": "^4.0.3",
+        "peggy": "^3.0.2",
         "prettier": "^3.2.5",
         "ts-jest": "^29.0.5",
         "ts-matches": "^5.5.1",
         "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
         "tsx": "^4.7.1",
         "typescript": "^5.0.4",
         "yaml": "^2.2.2"
@@ -2381,6 +6321,43 @@
       "version": "0.3.0",
       "dev": true
     },
+    "@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "requires": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__traverse": {
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "requires": {
+        "@babel/types": "^7.20.7"
+      }
+    },
     "@types/cacheable-request": {
       "version": "6.0.3",
       "dev": true,
@@ -2391,10 +6368,49 @@
         "@types/responselike": "^1.0.0"
       }
     },
+    "@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/http-cache-semantics": {
       "version": "4.0.4",
       "dev": true
     },
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+    },
+    "@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "requires": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "requires": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "@types/jest": {
+      "version": "29.5.12",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
+      "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+      "dev": true,
+      "requires": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
     "@types/keyv": {
       "version": "3.1.4",
       "dev": true,
@@ -2404,7 +6420,6 @@
     },
     "@types/node": {
       "version": "20.14.2",
-      "dev": true,
       "requires": {
         "undici-types": "~5.26.4"
       }
@@ -2416,6 +6431,24 @@
         "@types/node": "*"
       }
     },
+    "@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+    },
+    "@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "requires": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+    },
     "accepts": {
       "version": "1.3.8",
       "requires": {
@@ -2423,17 +6456,144 @@
         "negotiator": "0.6.3"
       }
     },
+    "ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "requires": {
+        "type-fest": "^0.21.3"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
     "arch": {
       "version": "2.2.0",
       "dev": true
     },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
     "array-flatten": {
       "version": "1.1.1"
     },
-    "balanced-match": {
-      "version": "1.0.2",
+    "async": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
       "dev": true
     },
+    "babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "requires": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-instrument": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+          "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "requires": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      }
+    },
+    "babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "requires": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      }
+    },
+    "babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "requires": {
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2"
+    },
     "bin-check": {
       "version": "4.1.0",
       "dev": true,
@@ -2548,11 +6708,43 @@
     },
     "braces": {
       "version": "3.0.3",
-      "dev": true,
       "requires": {
         "fill-range": "^7.1.1"
       }
     },
+    "browserslist": {
+      "version": "4.23.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
+      "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
+      "requires": {
+        "caniuse-lite": "^1.0.30001640",
+        "electron-to-chromium": "^1.4.820",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.1.0"
+      }
+    },
+    "bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "requires": {
+        "fast-json-stable-stringify": "2.x"
+      }
+    },
+    "bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
     "bytes": {
       "version": "3.1.2"
     },
@@ -2592,6 +6784,55 @@
         "set-function-length": "^1.2.1"
       }
     },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001643",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
+      "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg=="
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
+    },
+    "ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ=="
+    },
+    "cjs-module-lexer": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
+      "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q=="
+    },
+    "cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
     "clone-response": {
       "version": "1.0.3",
       "dev": true,
@@ -2599,10 +6840,38 @@
         "mimic-response": "^1.0.0"
       }
     },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
+    },
+    "collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
     "commander": {
       "version": "7.2.0",
       "dev": true
     },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
     "content-disposition": {
       "version": "0.5.4",
       "requires": {
@@ -2612,12 +6881,31 @@
     "content-type": {
       "version": "1.0.5"
     },
+    "convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
     "cookie": {
       "version": "0.6.0"
     },
     "cookie-signature": {
       "version": "1.0.6"
     },
+    "create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      }
+    },
     "cross-spawn": {
       "version": "5.1.0",
       "dev": true,
@@ -2649,6 +6937,17 @@
         }
       }
     },
+    "dedent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "requires": {}
+    },
+    "deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
+    },
     "defer-to-connect": {
       "version": "2.0.1",
       "dev": true
@@ -2667,9 +6966,43 @@
     "destroy": {
       "version": "1.2.0"
     },
+    "detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
+    },
+    "diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q=="
+    },
     "ee-first": {
       "version": "1.1.1"
     },
+    "ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "dev": true,
+      "requires": {
+        "jake": "^10.8.5"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz",
+      "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ=="
+    },
+    "emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ=="
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
     "encodeurl": {
       "version": "1.0.2"
     },
@@ -2680,6 +7013,14 @@
         "once": "^1.4.0"
       }
     },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
     "es-define-property": {
       "version": "1.0.0",
       "requires": {
@@ -2692,6 +7033,11 @@
     "esbuild-plugin-resolve": {
       "version": "2.0.0"
     },
+    "escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA=="
+    },
     "escape-html": {
       "version": "1.0.3"
     },
@@ -2699,6 +7045,11 @@
       "version": "5.0.0",
       "dev": true
     },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    },
     "etag": {
       "version": "1.8.1"
     },
@@ -2722,6 +7073,23 @@
         "pify": "^2.2.0"
       }
     },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
+    },
+    "expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "requires": {
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      }
+    },
     "express": {
       "version": "4.19.2",
       "requires": {
@@ -2784,6 +7152,11 @@
         "micromatch": "^4.0.4"
       }
     },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
     "fastq": {
       "version": "1.17.1",
       "dev": true,
@@ -2791,6 +7164,14 @@
         "reusify": "^1.0.4"
       }
     },
+    "fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "requires": {
+        "bser": "2.1.1"
+      }
+    },
     "fetch-blob": {
       "version": "3.2.0",
       "requires": {
@@ -2820,6 +7201,26 @@
         }
       }
     },
+    "filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dev": true,
+      "requires": {
+        "minimatch": "^5.0.1"
+      },
+      "dependencies": {
+        "minimatch": {
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
+      }
+    },
     "filename-reserved-regex": {
       "version": "3.0.0",
       "dev": true
@@ -2835,7 +7236,6 @@
     },
     "fill-range": {
       "version": "7.1.1",
-      "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -2852,6 +7252,15 @@
         "unpipe": "~1.0.0"
       }
     },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
     "find-versions": {
       "version": "5.1.0",
       "dev": true,
@@ -2871,9 +7280,30 @@
     "fresh": {
       "version": "0.5.2"
     },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "optional": true
+    },
     "function-bind": {
       "version": "1.1.2"
     },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+    },
     "get-intrinsic": {
       "version": "1.2.4",
       "requires": {
@@ -2884,10 +7314,47 @@
         "hasown": "^2.0.0"
       }
     },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
+    },
     "get-stream": {
       "version": "3.0.0",
       "dev": true
     },
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "1.1.11",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        }
+      }
+    },
     "glob-parent": {
       "version": "5.1.2",
       "dev": true,
@@ -2895,6 +7362,11 @@
         "is-glob": "^4.0.1"
       }
     },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
     "gopd": {
       "version": "1.0.1",
       "requires": {
@@ -2918,6 +7390,16 @@
         "responselike": "^2.0.0"
       }
     },
+    "graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+    },
     "has-property-descriptors": {
       "version": "1.0.2",
       "requires": {
@@ -2936,6 +7418,11 @@
         "function-bind": "^1.1.2"
       }
     },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+    },
     "http-cache-semantics": {
       "version": "4.1.1",
       "dev": true
@@ -2959,8 +7446,7 @@
       }
     },
     "human-signals": {
-      "version": "2.1.0",
-      "dev": true
+      "version": "2.1.0"
     },
     "iconv-lite": {
       "version": "0.4.24",
@@ -2972,58 +7458,700 @@
       "version": "1.2.1",
       "dev": true
     },
-    "inherits": {
-      "version": "2.0.4"
+    "import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "requires": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4"
+    },
+    "ipaddr.js": {
+      "version": "1.9.1"
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "is-core-module": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
+      "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+      "requires": {
+        "hasown": "^2.0.2"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+    },
+    "is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0"
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0"
+    },
+    "isomorphic-fetch": {
+      "version": "3.0.0",
+      "requires": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.7.0",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="
+    },
+    "istanbul-lib-instrument": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "requires": {
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+          "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "jake": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "dev": true,
+      "requires": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "1.1.11",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        }
+      }
+    },
+    "jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "requires": {
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
+      }
+    },
+    "jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "requires": {
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+        },
+        "is-stream": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
+        },
+        "npm-run-path": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "requires": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      }
+    },
+    "jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "requires": {
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      }
+    },
+    "jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "requires": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "requires": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      }
+    },
+    "jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "requires": {
+        "detect-newline": "^3.0.0"
+      }
+    },
+    "jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
+      }
+    },
+    "jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "requires": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      }
+    },
+    "jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw=="
     },
-    "ipaddr.js": {
-      "version": "1.9.1"
+    "jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^2.3.2",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      }
+    },
+    "jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "requires": {
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      }
     },
-    "is-extglob": {
-      "version": "2.1.1",
-      "dev": true
+    "jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "requires": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      }
     },
-    "is-glob": {
-      "version": "4.0.3",
-      "dev": true,
+    "jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "requires": {
-        "is-extglob": "^2.1.1"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      }
+    },
+    "jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
       }
     },
-    "is-number": {
-      "version": "7.0.0",
-      "dev": true
+    "jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "requires": {}
+    },
+    "jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg=="
+    },
+    "jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "requires": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      }
+    },
+    "jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "requires": {
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
+      }
     },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "dev": true
+    "jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "requires": {
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      }
+    },
+    "jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "requires": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      }
+    },
+    "jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+      "requires": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
+      }
+    },
+    "jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      }
     },
-    "is-stream": {
-      "version": "1.1.0",
-      "dev": true
+    "jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
+        }
+      }
     },
-    "isexe": {
-      "version": "2.0.0",
-      "dev": true
+    "jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "requires": {
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
+      }
     },
-    "isomorphic-fetch": {
-      "version": "3.0.0",
+    "jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "requires": {
-        "node-fetch": "^2.6.1",
-        "whatwg-fetch": "^3.4.1"
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
       "dependencies": {
-        "node-fetch": {
-          "version": "2.7.0",
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
           "requires": {
-            "whatwg-url": "^5.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+    },
     "json-buffer": {
       "version": "3.0.1",
       "dev": true
     },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+    },
     "keyv": {
       "version": "4.5.4",
       "dev": true,
@@ -3031,6 +8159,35 @@
         "json-buffer": "3.0.1"
       }
     },
+    "kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
+    },
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
+    },
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -3048,6 +8205,28 @@
         "yallist": "^2.1.2"
       }
     },
+    "make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "requires": {
+        "semver": "^7.5.3"
+      }
+    },
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "requires": {
+        "tmpl": "1.0.5"
+      }
+    },
     "media-typer": {
       "version": "0.3.0"
     },
@@ -3055,8 +8234,7 @@
       "version": "1.0.1"
     },
     "merge-stream": {
-      "version": "2.0.0",
-      "dev": true
+      "version": "2.0.0"
     },
     "merge2": {
       "version": "1.4.1",
@@ -3067,7 +8245,6 @@
     },
     "micromatch": {
       "version": "4.0.7",
-      "dev": true,
       "requires": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -3086,8 +8263,7 @@
       }
     },
     "mimic-fn": {
-      "version": "2.1.0",
-      "dev": true
+      "version": "2.1.0"
     },
     "mimic-response": {
       "version": "1.0.1",
@@ -3103,6 +8279,11 @@
     "ms": {
       "version": "2.0.0"
     },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
     "negotiator": {
       "version": "0.6.3"
     },
@@ -3117,6 +8298,21 @@
         "formdata-polyfill": "^4.0.10"
       }
     },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
+    },
+    "node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+    },
     "normalize-url": {
       "version": "6.1.0",
       "dev": true
@@ -3139,14 +8335,12 @@
     },
     "once": {
       "version": "1.4.0",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
     },
     "onetime": {
       "version": "5.1.2",
-      "dev": true,
       "requires": {
         "mimic-fn": "^2.1.0"
       }
@@ -3166,13 +8360,70 @@
       "version": "1.0.0",
       "dev": true
     },
+    "p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "requires": {
+        "yocto-queue": "^0.1.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "requires": {
+        "p-limit": "^2.2.0"
+      },
+      "dependencies": {
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        }
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
     "parseurl": {
       "version": "1.3.3"
     },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+    },
     "path-key": {
       "version": "2.0.1",
       "dev": true
     },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
     "path-to-regexp": {
       "version": "0.1.7"
     },
@@ -3180,18 +8431,61 @@
       "version": "5.0.0",
       "dev": true
     },
+    "picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+    },
     "picomatch": {
-      "version": "2.3.1",
-      "dev": true
+      "version": "2.3.1"
     },
     "pify": {
       "version": "2.3.0",
       "dev": true
     },
+    "pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg=="
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
     "prettier": {
       "version": "3.3.2",
       "dev": true
     },
+    "pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "requires": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+        }
+      }
+    },
+    "prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "requires": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      }
+    },
     "proxy-addr": {
       "version": "2.0.7",
       "requires": {
@@ -3211,6 +8505,11 @@
         "once": "^1.3.1"
       }
     },
+    "pure-rand": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA=="
+    },
     "qs": {
       "version": "6.11.0",
       "requires": {
@@ -3237,6 +8536,11 @@
         "unpipe": "1.0.0"
       }
     },
+    "react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+    },
     "readable-stream": {
       "version": "3.6.2",
       "dev": true,
@@ -3253,10 +8557,43 @@
         "readable-stream": "^3.6.0"
       }
     },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+    },
+    "resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "requires": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
     "resolve-alpn": {
       "version": "1.2.1",
       "dev": true
     },
+    "resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "requires": {
+        "resolve-from": "^5.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
+    },
+    "resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg=="
+    },
     "responselike": {
       "version": "2.0.1",
       "dev": true,
@@ -3282,8 +8619,7 @@
       "version": "2.1.2"
     },
     "semver": {
-      "version": "7.6.2",
-      "dev": true
+      "version": "7.6.2"
     },
     "semver-regex": {
       "version": "4.0.5",
@@ -3363,12 +8699,15 @@
       }
     },
     "signal-exit": {
-      "version": "3.0.7",
-      "dev": true
+      "version": "3.0.7"
+    },
+    "sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
     },
     "slash": {
-      "version": "3.0.0",
-      "dev": true
+      "version": "3.0.0"
     },
     "sort-keys": {
       "version": "1.1.2",
@@ -3388,6 +8727,42 @@
       "version": "0.7.4",
       "dev": true
     },
+    "source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+    },
+    "stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
+        }
+      }
+    },
     "statuses": {
       "version": "2.0.1"
     },
@@ -3398,13 +8773,49 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "requires": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="
+    },
     "strip-eof": {
       "version": "1.0.0",
       "dev": true
     },
     "strip-final-newline": {
-      "version": "2.0.0",
-      "dev": true
+      "version": "2.0.0"
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "strip-outer": {
       "version": "2.0.0",
@@ -3418,9 +8829,60 @@
         "peek-readable": "^5.0.0"
       }
     },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "1.1.11",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        }
+      }
+    },
+    "tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+    },
     "to-regex-range": {
       "version": "5.0.1",
-      "dev": true,
       "requires": {
         "is-number": "^7.0.0"
       }
@@ -3446,12 +8908,39 @@
         "escape-string-regexp": "^5.0.0"
       }
     },
+    "ts-jest": {
+      "version": "29.2.3",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.3.tgz",
+      "integrity": "sha512-yCcfVdiBFngVz9/keHin9EnsrQtQtEu3nRykNy9RVp+FiPFFbPJ3Sg6Qg4+TkmH0vMP5qsTKgXSsk80HRwvdgQ==",
+      "dev": true,
+      "requires": {
+        "bs-logger": "0.x",
+        "ejs": "^3.1.10",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^29.0.0",
+        "json5": "^2.2.3",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "semver": "^7.5.3",
+        "yargs-parser": "^21.0.1"
+      }
+    },
     "ts-matches": {
       "version": "5.5.1"
     },
     "tslib": {
       "version": "2.6.3"
     },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
+    },
+    "type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
+    },
     "type-is": {
       "version": "1.6.18",
       "requires": {
@@ -3464,12 +8953,20 @@
       "dev": true
     },
     "undici-types": {
-      "version": "5.26.5",
-      "dev": true
+      "version": "5.26.5"
     },
     "unpipe": {
       "version": "1.0.0"
     },
+    "update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "requires": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "dev": true
@@ -3477,9 +8974,27 @@
     "utils-merge": {
       "version": "1.0.1"
     },
+    "v8-to-istanbul": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+      "requires": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^2.0.0"
+      }
+    },
     "vary": {
       "version": "1.1.2"
     },
+    "walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "requires": {
+        "makeerror": "1.0.12"
+      }
+    },
     "web-streams-polyfill": {
       "version": "3.3.3"
     },
@@ -3503,9 +9018,32 @@
         "isexe": "^2.0.0"
       }
     },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
     "wrappy": {
-      "version": "1.0.2",
-      "dev": true
+      "version": "1.0.2"
+    },
+    "write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      }
+    },
+    "y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
     "yallist": {
       "version": "2.1.2",
@@ -3513,6 +9051,30 @@
     },
     "yaml": {
       "version": "2.4.5"
+    },
+    "yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "requires": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      }
+    },
+    "yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     }
   }
 }
diff --git a/container-runtime/package.json b/container-runtime/package.json
index 515f50ee7..24e6a6fe6 100644
--- a/container-runtime/package.json
+++ b/container-runtime/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "check": "tsc --noEmit",
     "build": "prettier . '!tmp/**' --write && rm -rf dist && tsc",
-    "tsc": "rm -rf dist; tsc"
+    "tsc": "rm -rf dist; tsc",
+    "test": "jest -c ./jest.config.js"
   },
   "author": "",
   "prettier": {
@@ -17,12 +18,13 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@start9labs/start-sdk": "file:../sdk/dist",
-    "@noble/hashes": "^1.4.0",
     "@noble/curves": "^1.4.0",
+    "@noble/hashes": "^1.4.0",
+    "@start9labs/start-sdk": "file:../sdk/dist",
     "esbuild-plugin-resolve": "^2.0.0",
     "filebrowser": "^1.0.0",
     "isomorphic-fetch": "^3.0.0",
+    "jest": "^29.7.0",
     "lodash.merge": "^4.6.2",
     "node-fetch": "^3.1.0",
     "ts-matches": "^5.5.1",
@@ -33,8 +35,10 @@
   "devDependencies": {
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.65",
+    "@types/jest": "^29.5.12",
     "@types/node": "^20.11.13",
     "prettier": "^3.2.5",
+    "ts-jest": "^29.2.3",
     "typescript": ">5.2"
   }
 }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/embasyPagesConfig.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/embasyPagesConfig.ts
new file mode 100644
index 000000000..cb70bd123
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/embasyPagesConfig.ts
@@ -0,0 +1,127 @@
+export default {
+  homepage: {
+    name: "Homepage",
+    description:
+      "The page that will be displayed when your Start9 Pages .onion address is visited. Since this page is technically publicly accessible, you can choose to which type of page to display.",
+    type: "union",
+    default: "welcome",
+    tag: {
+      id: "type",
+      name: "Type",
+      "variant-names": {
+        welcome: "Welcome",
+        index: "Table of Contents",
+        "web-page": "Web Page",
+        redirect: "Redirect",
+      },
+    },
+    variants: {
+      welcome: {},
+      index: {},
+      "web-page": {
+        source: {
+          name: "Folder Location",
+          description: "The service that contains your website files.",
+          type: "enum",
+          values: ["filebrowser", "nextcloud"],
+          "value-names": {},
+          default: "nextcloud",
+        },
+        folder: {
+          type: "string",
+          name: "Folder Path",
+          placeholder: "e.g. websites/resume",
+          description:
+            'The path to the folder that contains the static files of your website. For example, a value of "projects/resume" would tell Start9 Pages to look for that folder path in the selected service.',
+          pattern:
+            "^(\\.|[a-zA-Z0-9_ -][a-zA-Z0-9_ .-]*|([a-zA-Z0-9_ .-][a-zA-Z0-9_ -]+\\.*)+)(/[a-zA-Z0-9_ -][a-zA-Z0-9_ .-]*|/([a-zA-Z0-9_ .-][a-zA-Z0-9_ -]+\\.*)+)*/?$",
+          "pattern-description": "Must be a valid relative file path",
+          nullable: false,
+        },
+      },
+      redirect: {
+        target: {
+          type: "string",
+          name: "Target Subdomain",
+          description:
+            "The name of the subdomain to redirect users to. This must be a valid subdomain site within your Start9 Pages.",
+          pattern: "^[a-z-]+$",
+          "pattern-description":
+            "May contain only lowercase characters and hyphens.",
+          nullable: false,
+        },
+      },
+    },
+  },
+  subdomains: {
+    type: "list",
+    name: "Subdomains",
+    description: "The websites you want to serve.",
+    default: [],
+    range: "[0, *)",
+    subtype: "object",
+    spec: {
+      "unique-by": "name",
+      "display-as": "{{name}}",
+      spec: {
+        name: {
+          type: "string",
+          nullable: false,
+          name: "Subdomain name",
+          description:
+            'The subdomain of your Start9 Pages .onion address to host the website on. For example, a value of "me" would produce a website hosted at http://me.xxxxxx.onion.',
+          pattern: "^[a-z-]+$",
+          "pattern-description":
+            "May contain only lowercase characters and hyphens",
+        },
+        settings: {
+          type: "union",
+          name: "Settings",
+          description:
+            "The desired behavior you want to occur when the subdomain is visited. You can either redirect to another subdomain, or load a stored web page.",
+          default: "web-page",
+          tag: {
+            id: "type",
+            name: "Type",
+            "variant-names": { "web-page": "Web Page", redirect: "Redirect" },
+          },
+          variants: {
+            "web-page": {
+              source: {
+                name: "Folder Location",
+                description: "The service that contains your website files.",
+                type: "enum",
+                values: ["filebrowser", "nextcloud"],
+                "value-names": {},
+                default: "nextcloud",
+              },
+              folder: {
+                type: "string",
+                name: "Folder Path",
+                placeholder: "e.g. websites/resume",
+                description:
+                  'The path to the folder that contains the website files. For example, a value of "projects/resume" would tell Start9 Pages to look for that folder path in the selected service.',
+                pattern:
+                  "^(\\.|[a-zA-Z0-9_ -][a-zA-Z0-9_ .-]*|([a-zA-Z0-9_ .-][a-zA-Z0-9_ -]+\\.*)+)(/[a-zA-Z0-9_ -][a-zA-Z0-9_ .-]*|/([a-zA-Z0-9_ .-][a-zA-Z0-9_ -]+\\.*)+)*/?$",
+                "pattern-description": "Must be a valid relative file path",
+                nullable: false,
+              },
+            },
+            redirect: {
+              target: {
+                type: "string",
+                name: "Target Subdomain",
+                description:
+                  "The subdomain of your Start9 Pages .onion address to redirect to. This should be the name of another subdomain on Start9 Pages. Leave empty to redirect to the homepage.",
+                pattern: "^[a-z-]+$",
+                "pattern-description":
+                  "May contain only lowercase characters and hyphens.",
+                nullable: false,
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/searNXG.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/searNXG.ts
new file mode 100644
index 000000000..51eb06b9a
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/searNXG.ts
@@ -0,0 +1,39 @@
+export default {
+  "instance-name": {
+    type: "string",
+    name: "SearXNG Instance Name",
+    description:
+      "Enter a name for your SearXNG instance. This is the name that will be listed if you want to share your SearXNG engine publicly.",
+    nullable: false,
+    default: "My SearXNG Engine",
+    placeholder: "Uncle Jim SearXNG Engine",
+  },
+  "tor-url": {
+    name: "Enable Tor address as the base URL",
+    description:
+      "Activates the utilization of a .onion address as the primary URL, particularly beneficial for publicly hosted instances over the Tor network.",
+    type: "boolean",
+    default: false,
+  },
+  "enable-metrics": {
+    name: "Enable Stats",
+    description:
+      "Your SearXNG instance will collect anonymous stats about its own usage and performance. You can view these metrics by appending `/stats` or `/stats/errors` to your SearXNG URL.",
+    type: "boolean",
+    default: true,
+  }, //,
+  // "email-address": {
+  //   "type": "string",
+  //   "name": "Email Address",
+  //   "description": "Your Email address - required to create an SSL certificate.",
+  //   "nullable": false,
+  //   "default": "youremail@domain.com",
+  // },
+  // "public-host": {
+  //   "type": "string",
+  //   "name": "Public Domain Name",
+  //   "description": "Enter a domain name here if you want to share your SearXNG engine publicly. You will also need to modify your domain name's DNS settings to point to your Start9 server.",
+  //   "nullable": true,
+  //   "placeholder": "https://search.mydomain.com"
+  // }
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
new file mode 100644
index 000000000..1d434c78d
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
@@ -0,0 +1,253 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
+{
+  "homepage": {
+    "default": "welcome",
+    "description": null,
+    "disabled": false,
+    "immutable": false,
+    "name": "Type",
+    "required": true,
+    "type": "union",
+    "variants": {
+      "index": {
+        "name": "Table of Contents",
+        "spec": {},
+      },
+      "redirect": {
+        "name": "Redirect",
+        "spec": {
+          "target": {
+            "default": null,
+            "description": "The name of the subdomain to redirect users to. This must be a valid subdomain site within your Start9 Pages.",
+            "disabled": false,
+            "generate": null,
+            "immutable": false,
+            "inputmode": "text",
+            "masked": false,
+            "maxLength": null,
+            "minLength": null,
+            "name": "Target Subdomain",
+            "patterns": [
+              {
+                "description": "May contain only lowercase characters and hyphens.",
+                "regex": "^[a-z-]+$",
+              },
+            ],
+            "placeholder": null,
+            "required": true,
+            "type": "text",
+            "warning": null,
+          },
+        },
+      },
+      "web-page": {
+        "name": "Web Page",
+        "spec": {
+          "folder": {
+            "default": null,
+            "description": "The path to the folder that contains the static files of your website. For example, a value of "projects/resume" would tell Start9 Pages to look for that folder path in the selected service.",
+            "disabled": false,
+            "generate": null,
+            "immutable": false,
+            "inputmode": "text",
+            "masked": false,
+            "maxLength": null,
+            "minLength": null,
+            "name": "Folder Path",
+            "patterns": [
+              {
+                "description": "Must be a valid relative file path",
+                "regex": "^(\\.|[a-zA-Z0-9_ -][a-zA-Z0-9_ .-]*|([a-zA-Z0-9_ .-][a-zA-Z0-9_ -]+\\.*)+)(/[a-zA-Z0-9_ -][a-zA-Z0-9_ .-]*|/([a-zA-Z0-9_ .-][a-zA-Z0-9_ -]+\\.*)+)*/?$",
+              },
+            ],
+            "placeholder": "e.g. websites/resume",
+            "required": true,
+            "type": "text",
+            "warning": null,
+          },
+          "source": {
+            "default": "nextcloud",
+            "description": "The service that contains your website files.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Folder Location",
+            "required": false,
+            "type": "select",
+            "values": {
+              "filebrowser": undefined,
+              "nextcloud": undefined,
+            },
+            "warning": null,
+          },
+        },
+      },
+      "welcome": {
+        "name": "Welcome",
+        "spec": {},
+      },
+    },
+    "warning": null,
+  },
+  "subdomains": {
+    "default": [],
+    "description": "The websites you want to serve.",
+    "disabled": false,
+    "maxLength": null,
+    "minLength": null,
+    "name": "Subdomains",
+    "spec": {
+      "displayAs": "{{name}}",
+      "spec": {
+        "name": {
+          "default": null,
+          "description": "The subdomain of your Start9 Pages .onion address to host the website on. For example, a value of "me" would produce a website hosted at http://me.xxxxxx.onion.",
+          "disabled": false,
+          "generate": null,
+          "immutable": false,
+          "inputmode": "text",
+          "masked": false,
+          "maxLength": null,
+          "minLength": null,
+          "name": "Subdomain name",
+          "patterns": [
+            {
+              "description": "May contain only lowercase characters and hyphens",
+              "regex": "^[a-z-]+$",
+            },
+          ],
+          "placeholder": null,
+          "required": true,
+          "type": "text",
+          "warning": null,
+        },
+        "settings": {
+          "default": "web-page",
+          "description": null,
+          "disabled": false,
+          "immutable": false,
+          "name": "Type",
+          "required": true,
+          "type": "union",
+          "variants": {
+            "redirect": {
+              "name": "Redirect",
+              "spec": {
+                "target": {
+                  "default": null,
+                  "description": "The subdomain of your Start9 Pages .onion address to redirect to. This should be the name of another subdomain on Start9 Pages. Leave empty to redirect to the homepage.",
+                  "disabled": false,
+                  "generate": null,
+                  "immutable": false,
+                  "inputmode": "text",
+                  "masked": false,
+                  "maxLength": null,
+                  "minLength": null,
+                  "name": "Target Subdomain",
+                  "patterns": [
+                    {
+                      "description": "May contain only lowercase characters and hyphens.",
+                      "regex": "^[a-z-]+$",
+                    },
+                  ],
+                  "placeholder": null,
+                  "required": true,
+                  "type": "text",
+                  "warning": null,
+                },
+              },
+            },
+            "web-page": {
+              "name": "Web Page",
+              "spec": {
+                "folder": {
+                  "default": null,
+                  "description": "The path to the folder that contains the website files. For example, a value of "projects/resume" would tell Start9 Pages to look for that folder path in the selected service.",
+                  "disabled": false,
+                  "generate": null,
+                  "immutable": false,
+                  "inputmode": "text",
+                  "masked": false,
+                  "maxLength": null,
+                  "minLength": null,
+                  "name": "Folder Path",
+                  "patterns": [
+                    {
+                      "description": "Must be a valid relative file path",
+                      "regex": "^(\\.|[a-zA-Z0-9_ -][a-zA-Z0-9_ .-]*|([a-zA-Z0-9_ .-][a-zA-Z0-9_ -]+\\.*)+)(/[a-zA-Z0-9_ -][a-zA-Z0-9_ .-]*|/([a-zA-Z0-9_ .-][a-zA-Z0-9_ -]+\\.*)+)*/?$",
+                    },
+                  ],
+                  "placeholder": "e.g. websites/resume",
+                  "required": true,
+                  "type": "text",
+                  "warning": null,
+                },
+                "source": {
+                  "default": "nextcloud",
+                  "description": "The service that contains your website files.",
+                  "disabled": false,
+                  "immutable": false,
+                  "name": "Folder Location",
+                  "required": false,
+                  "type": "select",
+                  "values": {
+                    "filebrowser": undefined,
+                    "nextcloud": undefined,
+                  },
+                  "warning": null,
+                },
+              },
+            },
+          },
+          "warning": null,
+        },
+      },
+      "type": "object",
+      "uniqueBy": "name",
+    },
+    "type": "list",
+    "warning": null,
+  },
+}
+`;
+
+exports[`transformConfigSpec transformConfigSpec(searNXG) 1`] = `
+{
+  "enable-metrics": {
+    "default": true,
+    "description": "Your SearXNG instance will collect anonymous stats about its own usage and performance. You can view these metrics by appending \`/stats\` or \`/stats/errors\` to your SearXNG URL.",
+    "disabled": false,
+    "immutable": false,
+    "name": "Enable Stats",
+    "type": "toggle",
+    "warning": null,
+  },
+  "instance-name": {
+    "default": "My SearXNG Engine",
+    "description": "Enter a name for your SearXNG instance. This is the name that will be listed if you want to share your SearXNG engine publicly.",
+    "disabled": false,
+    "generate": null,
+    "immutable": false,
+    "inputmode": "text",
+    "masked": false,
+    "maxLength": null,
+    "minLength": null,
+    "name": "SearXNG Instance Name",
+    "patterns": [],
+    "placeholder": "Uncle Jim SearXNG Engine",
+    "required": true,
+    "type": "text",
+    "warning": null,
+  },
+  "tor-url": {
+    "default": false,
+    "description": "Activates the utilization of a .onion address as the primary URL, particularly beneficial for publicly hosted instances over the Tor network.",
+    "disabled": false,
+    "immutable": false,
+    "name": "Enable Tor address as the base URL",
+    "type": "toggle",
+    "warning": null,
+  },
+}
+`;
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
new file mode 100644
index 000000000..e3f463d03
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
@@ -0,0 +1,23 @@
+import { matchOldConfigSpec, transformConfigSpec } from "./transformConfigSpec"
+import fixtureEmbasyPagesConfig from "./__fixtures__/embasyPagesConfig"
+import searNXG from "./__fixtures__/searNXG"
+
+describe("transformConfigSpec", () => {
+  test("matchOldConfigSpec(embassyPages.homepage.variants[web-page])", () => {
+    matchOldConfigSpec.unsafeCast(
+      fixtureEmbasyPagesConfig.homepage.variants["web-page"],
+    )
+  })
+  test("matchOldConfigSpec(embassyPages)", () => {
+    matchOldConfigSpec.unsafeCast(fixtureEmbasyPagesConfig)
+  })
+  test("transformConfigSpec(embassyPages)", () => {
+    const spec = matchOldConfigSpec.unsafeCast(fixtureEmbasyPagesConfig)
+    expect(transformConfigSpec(spec)).toMatchSnapshot()
+  })
+
+  test("transformConfigSpec(searNXG)", () => {
+    const spec = matchOldConfigSpec.unsafeCast(searNXG)
+    expect(transformConfigSpec(spec)).toMatchSnapshot()
+  })
+})
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
index cb7809903..be3aa89b3 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -104,7 +104,7 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
             : [],
         minLength: null,
         maxLength: null,
-        masked: oldVal.masked,
+        masked: oldVal.masked || false,
         generate: null,
         inputmode: "text",
         placeholder: oldVal.placeholder || null,
@@ -347,11 +347,11 @@ type OldDefaultString = typeof matchOldDefaultString._TYPE
 
 export const matchOldValueSpecString = object(
   {
+    type: literals("string"),
+    name: string,
     masked: boolean,
     copyable: boolean,
-    type: literals("string"),
     nullable: boolean,
-    name: string,
     placeholder: string,
     pattern: string,
     "pattern-description": string,
@@ -361,6 +361,9 @@ export const matchOldValueSpecString = object(
     warning: string,
   },
   [
+    "masked",
+    "copyable",
+    "nullable",
     "placeholder",
     "pattern",
     "pattern-description",
diff --git a/container-runtime/tsconfig.json b/container-runtime/tsconfig.json
index 0b2fe6e32..6981133d6 100644
--- a/container-runtime/tsconfig.json
+++ b/container-runtime/tsconfig.json
@@ -13,9 +13,10 @@
     "declaration": true,
     "noImplicitAny": true,
     "esModuleInterop": true,
-    "types": ["node"],
+    "types": ["node", "jest"],
     "moduleResolution": "Node16",
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "resolveJsonModule": true
   },
   "ts-node": {
     "compilerOptions": {

From a3b94816f9fb1b56435b4400d99d6e17dcc3645d Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 12:29:59 -0600
Subject: [PATCH 214/341] ephemeral logins

---
 core/startos/src/auth.rs                      | 52 ++++++++++++++-----
 core/startos/src/context/rpc.rs               |  4 ++
 core/startos/src/middleware/auth.rs           | 42 ++++++++++-----
 core/startos/src/util/mod.rs                  |  1 +
 core/startos/src/util/sync.rs                 |  9 ++++
 sdk/lib/osBindings/LoginParams.ts             |  6 ++-
 .../ui/src/app/pages/login/login.page.ts      |  1 +
 .../ui/src/app/services/api/api.types.ts      |  1 +
 .../ui/src/app/services/config.service.ts     |  2 -
 9 files changed, 88 insertions(+), 30 deletions(-)
 create mode 100644 core/startos/src/util/sync.rs

diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 03005998f..68e16c244 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -185,6 +185,8 @@ pub struct LoginParams {
     #[serde(rename = "__auth_userAgent")] // from Auth middleware
     user_agent: Option<String>,
     #[serde(default)]
+    ephemeral: bool,
+    #[serde(default)]
     #[ts(type = "any")]
     metadata: Value,
 }
@@ -195,28 +197,46 @@ pub async fn login_impl(
     LoginParams {
         password,
         user_agent,
+        ephemeral,
         metadata,
     }: LoginParams,
 ) -> Result<LoginRes, Error> {
     let password = password.unwrap_or_default().decrypt(&ctx)?;
 
-    ctx.db
-        .mutate(|db| {
-            check_password_against_db(db, &password)?;
-            let hash_token = HashSessionToken::new();
-            db.as_private_mut().as_sessions_mut().insert(
-                hash_token.hashed(),
-                &Session {
+    if ephemeral {
+        check_password_against_db(&ctx.db.peek().await, &password)?;
+        let hash_token = HashSessionToken::new();
+        ctx.ephemeral_sessions.mutate(|s| {
+            s.0.insert(
+                hash_token.hashed().clone(),
+                Session {
                     logged_in: Utc::now(),
                     last_active: Utc::now(),
                     user_agent,
                     metadata,
                 },
-            )?;
-
-            Ok(hash_token.to_login_res())
-        })
-        .await
+            )
+        });
+        Ok(hash_token.to_login_res())
+    } else {
+        ctx.db
+            .mutate(|db| {
+                check_password_against_db(db, &password)?;
+                let hash_token = HashSessionToken::new();
+                db.as_private_mut().as_sessions_mut().insert(
+                    hash_token.hashed(),
+                    &Session {
+                        logged_in: Utc::now(),
+                        last_active: Utc::now(),
+                        user_agent,
+                        metadata,
+                    },
+                )?;
+
+                Ok(hash_token.to_login_res())
+            })
+            .await
+    }
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
@@ -329,9 +349,15 @@ pub async fn list(
     ctx: RpcContext,
     ListParams { session, .. }: ListParams,
 ) -> Result<SessionList, Error> {
+    let mut sessions = ctx.db.peek().await.into_private().into_sessions().de()?;
+    ctx.ephemeral_sessions.mutate(|s| {
+        sessions
+            .0
+            .extend(s.0.iter().map(|(k, v)| (k.clone(), v.clone())))
+    });
     Ok(SessionList {
         current: HashSessionToken::from_token(session).hashed().clone(),
-        sessions: ctx.db.peek().await.into_private().into_sessions().de()?,
+        sessions,
     })
 }
 
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index cea2059d3..0d00abb3a 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -17,6 +17,7 @@ use tracing::instrument;
 
 use super::setup::CURRENT_SECRET;
 use crate::account::AccountInfo;
+use crate::auth::Sessions;
 use crate::context::config::ServerConfig;
 use crate::db::model::Database;
 use crate::dependencies::compute_dependency_config_errs;
@@ -34,6 +35,7 @@ use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
 use crate::system::get_mem_info;
 use crate::util::lshw::{lshw, LshwDevice};
+use crate::util::sync::SyncMutex;
 
 pub struct RpcContextSeed {
     is_closed: AtomicBool,
@@ -42,6 +44,7 @@ pub struct RpcContextSeed {
     pub ethernet_interface: String,
     pub datadir: PathBuf,
     pub disk_guid: Arc<String>,
+    pub ephemeral_sessions: SyncMutex<Sessions>,
     pub db: TypedPatchDb<Database>,
     pub sync_db: watch::Sender<u64>,
     pub account: RwLock<AccountInfo>,
@@ -213,6 +216,7 @@ impl RpcContext {
                 find_eth_iface().await?
             },
             disk_guid,
+            ephemeral_sessions: SyncMutex::new(Sessions::new()),
             sync_db: watch::Sender::new(db.sequence().await),
             db,
             account: RwLock::new(account),
diff --git a/core/startos/src/middleware/auth.rs b/core/startos/src/middleware/auth.rs
index fd60894db..9b04afb38 100644
--- a/core/startos/src/middleware/auth.rs
+++ b/core/startos/src/middleware/auth.rs
@@ -51,6 +51,11 @@ impl HasLoggedOutSessions {
         for sid in &to_log_out {
             ctx.open_authed_continuations.kill(sid)
         }
+        ctx.ephemeral_sessions.mutate(|s| {
+            for sid in &to_log_out {
+                s.0.remove(sid);
+            }
+        });
         ctx.db
             .mutate(|db| {
                 let sessions = db.as_private_mut().as_sessions_mut();
@@ -110,20 +115,29 @@ impl HasValidSession {
         ctx: &RpcContext,
     ) -> Result<Self, Error> {
         let session_hash = session_token.hashed();
-        ctx.db
-            .mutate(|db| {
-                db.as_private_mut()
-                    .as_sessions_mut()
-                    .as_idx_mut(session_hash)
-                    .ok_or_else(|| {
-                        Error::new(eyre!("UNAUTHORIZED"), crate::ErrorKind::Authorization)
-                    })?
-                    .mutate(|s| {
-                        s.last_active = Utc::now();
-                        Ok(())
-                    })
-            })
-            .await?;
+        if !ctx.ephemeral_sessions.mutate(|s| {
+            if let Some(session) = s.0.get_mut(session_hash) {
+                session.last_active = Utc::now();
+                true
+            } else {
+                false
+            }
+        }) {
+            ctx.db
+                .mutate(|db| {
+                    db.as_private_mut()
+                        .as_sessions_mut()
+                        .as_idx_mut(session_hash)
+                        .ok_or_else(|| {
+                            Error::new(eyre!("UNAUTHORIZED"), crate::ErrorKind::Authorization)
+                        })?
+                        .mutate(|s| {
+                            s.last_active = Utc::now();
+                            Ok(())
+                        })
+                })
+                .await?;
+        }
         Ok(Self(SessionType::Session(session_token)))
     }
 
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 1641e4496..fab0b127d 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -49,6 +49,7 @@ pub mod net;
 pub mod rpc;
 pub mod rpc_client;
 pub mod serde;
+pub mod sync;
 
 #[derive(Clone, Copy, Debug, ::serde::Deserialize, ::serde::Serialize)]
 pub enum Never {}
diff --git a/core/startos/src/util/sync.rs b/core/startos/src/util/sync.rs
new file mode 100644
index 000000000..f8ec425e0
--- /dev/null
+++ b/core/startos/src/util/sync.rs
@@ -0,0 +1,9 @@
+pub struct SyncMutex<T>(std::sync::Mutex<T>);
+impl<T> SyncMutex<T> {
+    pub fn new(t: T) -> Self {
+        Self(std::sync::Mutex::new(t))
+    }
+    pub fn mutate<F: FnOnce(&mut T) -> U, U>(&self, f: F) -> U {
+        f(&mut *self.0.lock().unwrap())
+    }
+}
diff --git a/sdk/lib/osBindings/LoginParams.ts b/sdk/lib/osBindings/LoginParams.ts
index 272f7ed07..acaf5b8a1 100644
--- a/sdk/lib/osBindings/LoginParams.ts
+++ b/sdk/lib/osBindings/LoginParams.ts
@@ -1,4 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { PasswordType } from "./PasswordType"
 
-export type LoginParams = { password: PasswordType | null; metadata: any }
+export type LoginParams = {
+  password: PasswordType | null
+  ephemeral: boolean
+  metadata: any
+}
diff --git a/web/projects/ui/src/app/pages/login/login.page.ts b/web/projects/ui/src/app/pages/login/login.page.ts
index 065a4cc7f..29d4321f8 100644
--- a/web/projects/ui/src/app/pages/login/login.page.ts
+++ b/web/projects/ui/src/app/pages/login/login.page.ts
@@ -40,6 +40,7 @@ export class LoginPage {
       await this.api.login({
         password: this.password,
         metadata: { platforms: getPlatforms() },
+        ephemeral: window.location.host === 'localhost',
       })
 
       this.password = ''
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 770792328..eac7cd7f4 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -33,6 +33,7 @@ export module RR {
   export type LoginReq = {
     password: string
     metadata: SessionMetadata
+    ephemeral?: boolean
   } // auth.login - unauthed
   export type loginRes = null
 
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index a148112f0..69fafe815 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -73,8 +73,6 @@ export class ConfigService {
     const hostnameInfo =
       hosts[ui.addressInfo.hostId]?.hostnameInfo[ui.addressInfo.internalPort]
 
-    console.debug(hostnameInfo)
-
     if (!hostnameInfo) return ''
 
     const addressInfo = ui.addressInfo

From 6d42ae26298edc3a925dd0ae06f821d406f396ec Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 12:30:26 -0600
Subject: [PATCH 215/341] brackets for ipv6

---
 sdk/lib/util/getServiceInterface.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index b41d8a15f..9148c8f9a 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -90,6 +90,8 @@ export const addressHostToUrl = (
     } else if (host.kind === "ip") {
       if (host.hostname.kind === "domain") {
         hostname = `${host.hostname.subdomain ? `${host.hostname.subdomain}.` : ""}${host.hostname.domain}`
+      } else if (host.hostname.kind === "ipv6") {
+        hostname = `[${host.hostname.value}]`
       } else {
         hostname = host.hostname.value
       }

From 5cef6874f6ce8c7ea6e08b0f403e8042cb50bc51 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 12:33:22 -0600
Subject: [PATCH 216/341] install before test

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 90c00ae2d..f8afaf29c 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ format:
 test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
 	(cd core && cargo build  --features=test && cargo test --features=test)
 	(cd sdk && make test)
-	(cd container-runtime && npm test)
+	(cd container-runtime && npm i && npm test)
 
 cli:
 	cd core && ./install-cli.sh

From 698bdd619f8c3368bf7facc9327b7e7500e5cbd9 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 13:26:23 -0600
Subject: [PATCH 217/341] fix version mapping

---
 core/startos/src/version/mod.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 09d438344..ebd178e37 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -27,6 +27,7 @@ enum Version {
     V0_3_5_1(Wrapper<v0_3_5_1::Version>),
     V0_3_5_2(Wrapper<v0_3_5_2::Version>),
     V0_3_6_alpha_0(Wrapper<v0_3_6_alpha_0::Version>),
+    V0_3_6_alpha_1(Wrapper<v0_3_6_alpha_1::Version>),
     Other(exver::Version),
 }
 
@@ -47,6 +48,7 @@ impl Version {
             Version::V0_3_5_1(Wrapper(x)) => x.semver(),
             Version::V0_3_5_2(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_0(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_1(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -247,6 +249,7 @@ pub async fn init(
         Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::V0_3_6_alpha_0(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6_alpha_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -291,6 +294,12 @@ mod tests {
             Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))),
             Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))),
             Just(Version::V0_3_5_2(Wrapper(v0_3_5_2::Version::new()))),
+            Just(Version::V0_3_6_alpha_0(Wrapper(
+                v0_3_6_alpha_0::Version::new()
+            ))),
+            Just(Version::V0_3_6_alpha_1(Wrapper(
+                v0_3_6_alpha_1::Version::new()
+            ))),
             em_version().prop_map(Version::Other),
         ]
     }

From 10ede0d21c145e42a0cc63d2f4202361220bbca7 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 14:47:43 -0600
Subject: [PATCH 218/341] delegate pointer removal to config transformer

---
 .../Systems/SystemForEmbassy/index.ts         | 58 ++++++-------------
 .../SystemForEmbassy/transformConfigSpec.ts   | 44 ++++++++++++--
 2 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index df67dd962..5f8000f25 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -45,6 +45,7 @@ import {
   OldConfigSpec,
   matchOldConfigSpec,
   transformConfigSpec,
+  transformNewConfigToOld,
   transformOldConfigToNew,
 } from "./transformConfigSpec"
 import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
@@ -101,6 +102,11 @@ const matchSetResult = object(
   ["depends-on", "dependsOn"],
 )
 
+type OldGetConfigRes = {
+  config?: null | Record<string, unknown>
+  spec: OldConfigSpec
+}
+
 export type PackagePropertiesV2 = {
   [name: string]: PackagePropertyObject | PackagePropertyString
 }
@@ -546,14 +552,12 @@ export class SystemForEmbassy implements System {
     effects: Effects,
     timeoutMs: number | null,
   ): Promise<T.ConfigRes> {
-    return this.getConfigUncleaned(effects, timeoutMs)
-      .then(removePointers)
-      .then(convertToNewConfig)
+    return this.getConfigUncleaned(effects, timeoutMs).then(convertToNewConfig)
   }
   private async getConfigUncleaned(
     effects: Effects,
     timeoutMs: number | null,
-  ): Promise<T.ConfigRes> {
+  ): Promise<OldGetConfigRes> {
     const config = this.manifest.config?.get
     if (!config) return { spec: {} }
     if (config.type === "docker") {
@@ -590,13 +594,14 @@ export class SystemForEmbassy implements System {
     newConfigWithoutPointers: unknown,
     timeoutMs: number | null,
   ): Promise<void> {
-    const newConfig = structuredClone(newConfigWithoutPointers)
-    await updateConfig(
-      effects,
-      this.manifest,
-      await this.getConfigUncleaned(effects, timeoutMs).then((x) => x.spec),
-      newConfig,
+    const spec = await this.getConfigUncleaned(effects, timeoutMs).then(
+      (x) => x.spec,
     )
+    const newConfig = transformNewConfigToOld(
+      spec,
+      structuredClone(newConfigWithoutPointers as Record<string, unknown>),
+    )
+    await updateConfig(effects, this.manifest, spec, newConfig)
     const setConfigValue = this.manifest.config?.set
     if (!setConfigValue) return
     if (setConfigValue.type === "docker") {
@@ -895,14 +900,6 @@ export class SystemForEmbassy implements System {
     })) as any
   }
 }
-async function removePointers(value: T.ConfigRes): Promise<T.ConfigRes> {
-  const startingSpec = structuredClone(value.spec)
-  const config =
-    value.config && cleanConfigFromPointers(value.config, startingSpec)
-  const spec = cleanSpecOfPointers(startingSpec)
-
-  return { config, spec }
-}
 
 const matchPointer = object({
   type: literal("pointer"),
@@ -962,27 +959,6 @@ type CleanConfigFromPointers<C, S> =
   } :
   null
 
-function cleanConfigFromPointers<C, S>(
-  config: C,
-  spec: S,
-): CleanConfigFromPointers<C, S> {
-  const newConfig = {} as CleanConfigFromPointers<C, S>
-
-  if (!(object.test(config) && object.test(spec)) || newConfig == null)
-    return null as CleanConfigFromPointers<C, S>
-
-  for (const key of Object.keys(spec)) {
-    if (!isKeyOf(key, spec)) continue
-    if (!isKeyOf(key, config)) continue
-    const partSpec = spec[key]
-    if (matchPointer.test(partSpec)) continue
-    ;(newConfig as any)[key] = matchSpec.test(partSpec)
-      ? cleanConfigFromPointers(config[key], partSpec.spec)
-      : config[key]
-  }
-  return newConfig as CleanConfigFromPointers<C, S>
-}
-
 async function updateConfig(
   effects: Effects,
   manifest: Manifest,
@@ -1081,7 +1057,9 @@ function extractServiceInterfaceId(manifest: Manifest, specInterface: string) {
   const serviceInterfaceId = `${specInterface}-${internalPort}`
   return serviceInterfaceId
 }
-async function convertToNewConfig(value: T.ConfigRes): Promise<T.ConfigRes> {
+async function convertToNewConfig(
+  value: OldGetConfigRes,
+): Promise<T.ConfigRes> {
   const valueSpec: OldConfigSpec = matchOldConfigSpec.unsafeCast(value.spec)
   const spec = transformConfigSpec(valueSpec)
   if (!value.config) return { spec, config: null }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
index be3aa89b3..9a82d5c16 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -12,6 +12,7 @@ import {
   deferred,
   every,
   nill,
+  literal,
 } from "ts-matches"
 
 export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
@@ -38,7 +39,7 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
         values: oldVal.values.reduce(
           (obj, curr) => ({
             ...obj,
-            [curr]: oldVal["value-names"][curr],
+            [curr]: oldVal["value-names"][curr] || curr,
           }),
           {},
         ),
@@ -109,7 +110,7 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
         inputmode: "text",
         placeholder: oldVal.placeholder || null,
       }
-    } else {
+    } else if (oldVal.type === "union") {
       newVal = {
         type: "union",
         name: oldVal.tag.name,
@@ -119,7 +120,7 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
           (obj, [id, spec]) => ({
             ...obj,
             [id]: {
-              name: oldVal.tag["variant-names"][id],
+              name: oldVal.tag["variant-names"][id] || id,
               spec: transformConfigSpec(matchOldConfigSpec.unsafeCast(spec)),
             },
           }),
@@ -130,6 +131,10 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
         default: oldVal.default,
         immutable: false,
       }
+    } else if (oldVal.type === "pointer") {
+      return inputSpec
+    } else {
+      throw new Error(`unknown spec ${JSON.stringify(oldVal)}`)
     }
 
     return {
@@ -175,6 +180,10 @@ export function transformOldConfigToNew(
       )
     }
 
+    if (isPointer(val)) {
+      return obj
+    }
+
     return {
       ...obj,
       [key]: newVal,
@@ -201,7 +210,7 @@ export function transformNewConfigToOld(
         [val.tag.id]: config[key].selection,
         ...transformNewConfigToOld(
           matchOldConfigSpec.unsafeCast(val.variants[config[key].selection]),
-          config[key].unionSelectValue,
+          config[key].value,
         ),
       }
     }
@@ -313,6 +322,10 @@ function isList(val: OldValueSpec): val is OldValueSpecList {
   return val.type === "list"
 }
 
+function isPointer(val: OldValueSpec): val is OldValueSpecPointer {
+  return val.type === "pointer"
+}
+
 function isEnumList(
   val: OldValueSpecList,
 ): val is OldValueSpecList & { subtype: "enum" } {
@@ -522,6 +535,28 @@ const matchOldValueSpecList = every(
 )
 type OldValueSpecList = typeof matchOldValueSpecList._TYPE
 
+const matchOldValueSpecPointer = every(
+  object({
+    type: literal("pointer"),
+  }),
+  anyOf(
+    object({
+      subtype: literal("package"),
+      target: literals("tor-key", "tor-address", "lan-address"),
+      "package-id": string,
+      interface: string,
+    }),
+    object({
+      subtype: literal("package"),
+      target: literals("config"),
+      "package-id": string,
+      selector: string,
+      multi: boolean,
+    }),
+  ),
+)
+type OldValueSpecPointer = typeof matchOldValueSpecPointer._TYPE
+
 export const matchOldValueSpec = anyOf(
   matchOldValueSpecString,
   matchOldValueSpecNumber,
@@ -530,6 +565,7 @@ export const matchOldValueSpec = anyOf(
   matchOldValueSpecEnum,
   matchOldValueSpecList,
   matchOldValueSpecUnion,
+  matchOldValueSpecPointer,
 )
 type OldValueSpec = typeof matchOldValueSpec._TYPE
 

From 25b33fb0317c3b8cdd441b05cb542b7c48fd773d Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 14:47:55 -0600
Subject: [PATCH 219/341] use ci for test

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f8afaf29c..8f6bd0203 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ format:
 test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
 	(cd core && cargo build  --features=test && cargo test --features=test)
 	(cd sdk && make test)
-	(cd container-runtime && npm i && npm test)
+	(cd container-runtime && npm ci && npm test)
 
 cli:
 	cd core && ./install-cli.sh

From 948075831096ff69209385ecbb286140723f91b8 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 15:05:25 -0600
Subject: [PATCH 220/341] decrease lxc-net init weight

---
 core/startos/src/init.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 5e0fa932f..7b944ebe3 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -235,7 +235,7 @@ impl InitPhases {
             sync_clock: handle.add_phase("Synchronizing system clock".into(), Some(10)),
             enable_zram: handle.add_phase("Enabling ZRAM".into(), Some(1)),
             update_server_info: handle.add_phase("Updating server info".into(), Some(1)),
-            launch_service_network: handle.add_phase("Launching service intranet".into(), Some(10)),
+            launch_service_network: handle.add_phase("Launching service intranet".into(), Some(1)),
             run_migrations: handle.add_phase("Running migrations".into(), Some(10)),
             validate_db: handle.add_phase("Validating database".into(), Some(1)),
             postinit: if Path::new("/media/startos/config/postinit.sh").exists() {

From bf55367f4d04f6645d0b318655c48314def6eab4 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Fri, 26 Jul 2024 15:12:22 -0600
Subject: [PATCH 221/341] chore: remove the need for the method in the
 autoconfig

---
 .../src/Adapters/Systems/SystemForEmbassy/index.ts           | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 5f8000f25..30b221d4d 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -886,10 +886,7 @@ export class SystemForEmbassy implements System {
     // TODO: docker
     const moduleCode = await this.moduleCode
     const method = moduleCode.dependencies?.[id]?.autoConfigure
-    if (!method)
-      throw new Error(
-        `Expecting that the method dependency autoConfigure ${id} exists`,
-      )
+    if (!method) return
     return (await method(
       polyfillEffects(effects, this.manifest),
       oldConfig as any,

From 6abdc39fe5d7a5ffbb525f743a55c0f45ccd5d20 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 17:44:16 -0600
Subject: [PATCH 222/341] ignore error on dependent mounts in polyfill

---
 .../DockerProcedureContainer.ts               | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 5db0b6245..012a70eee 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -68,15 +68,17 @@ export class DockerProcedureContainer {
             key,
           )
         } else if (volumeMount.type === "pointer") {
-          await effects.mount({
-            location: path,
-            target: {
-              packageId: volumeMount["package-id"],
-              subpath: volumeMount.path,
-              readonly: volumeMount.readonly,
-              volumeId: volumeMount["volume-id"],
-            },
-          })
+          await effects
+            .mount({
+              location: path,
+              target: {
+                packageId: volumeMount["package-id"],
+                subpath: volumeMount.path,
+                readonly: volumeMount.readonly,
+                volumeId: volumeMount["volume-id"],
+              },
+            })
+            .catch(console.warn)
         } else if (volumeMount.type === "backup") {
           await overlay.mount({ type: "backup", subpath: null }, mounts[mount])
         }

From bfe3029d31c1c3dd9e2e981896c4dbbc4d369194 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 17:49:44 -0600
Subject: [PATCH 223/341] fix dependency autoconfig

---
 .../Adapters/Systems/SystemForEmbassy/index.ts | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 30b221d4d..ff5a6ee74 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -348,12 +348,7 @@ export class SystemForEmbassy implements System {
               options.timeout || null,
             )
           case procedures[1] === "dependencies" && procedures[3] === "query":
-            return this.dependenciesAutoconfig(
-              effects,
-              procedures[2],
-              input,
-              options.timeout || null,
-            )
+            return null
 
           case procedures[1] === "dependencies" && procedures[3] === "update":
             return this.dependenciesAutoconfig(
@@ -836,9 +831,9 @@ export class SystemForEmbassy implements System {
     id: string,
     oldConfig: unknown,
     timeoutMs: number | null,
-  ): Promise<object> {
+  ): Promise<any> {
     const actionProcedure = this.manifest.dependencies?.[id]?.config?.check
-    if (!actionProcedure) return { message: "Action not found", value: null }
+    if (!actionProcedure) return null
     if (actionProcedure.type === "docker") {
       const container = await DockerProcedureContainer.of(
         effects,
@@ -880,16 +875,19 @@ export class SystemForEmbassy implements System {
   private async dependenciesAutoconfig(
     effects: Effects,
     id: string,
-    oldConfig: unknown,
+    input: unknown,
     timeoutMs: number | null,
   ): Promise<void> {
+    const oldConfig = object({ remoteConfig: any }).unsafeCast(
+      input,
+    ).remoteConfig
     // TODO: docker
     const moduleCode = await this.moduleCode
     const method = moduleCode.dependencies?.[id]?.autoConfigure
     if (!method) return
     return (await method(
       polyfillEffects(effects, this.manifest),
-      oldConfig as any,
+      oldConfig,
     ).then((x) => {
       if ("result" in x) return x.result
       if ("error" in x) throw new Error("Error getting config: " + x.error)

From be217b5354d5cbe997bbb3c0ab715e1a77530048 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 19:06:11 -0600
Subject: [PATCH 224/341] update-grub on update

---
 core/startos/src/update/mod.rs | 84 ++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index 79d852754..51d8d77ae 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -18,6 +18,12 @@ use tracing::instrument;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
+use crate::disk::mount::filesystem::bind::Bind;
+use crate::disk::mount::filesystem::block_dev::BlockDev;
+use crate::disk::mount::filesystem::efivarfs::{self, EfiVarFs};
+use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
+use crate::disk::mount::filesystem::MountType;
+use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::notifications::{notify, NotificationLevel};
 use crate::prelude::*;
 use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle, PhasedProgressBar};
@@ -247,6 +253,7 @@ async fn maybe_do_update(
     asset.validate(SIG_CONTEXT, asset.all_signers())?;
 
     let progress = FullProgressTracker::new();
+    let prune_phase = progress.add_phase("Pruning Old OS Images".into(), Some(2));
     let mut download_phase = progress.add_phase("Downloading File".into(), Some(100));
     download_phase.set_total(asset.commitment.size);
     let reverify_phase = progress.add_phase("Reverifying File".into(), Some(10));
@@ -300,6 +307,7 @@ async fn maybe_do_update(
             asset,
             UpdateProgressHandles {
                 progress,
+                prune_phase,
                 download_phase,
                 reverify_phase,
                 sync_boot_phase,
@@ -369,6 +377,7 @@ async fn maybe_do_update(
 
 struct UpdateProgressHandles {
     progress: FullProgressTracker,
+    prune_phase: PhaseProgressTrackerHandle,
     download_phase: PhaseProgressTrackerHandle,
     reverify_phase: PhaseProgressTrackerHandle,
     sync_boot_phase: PhaseProgressTrackerHandle,
@@ -381,12 +390,20 @@ async fn do_update(
     asset: RegistryAsset<Blake3Commitment>,
     UpdateProgressHandles {
         progress,
+        mut prune_phase,
         mut download_phase,
         mut reverify_phase,
         mut sync_boot_phase,
         mut finalize_phase,
     }: UpdateProgressHandles,
 ) -> Result<(), Error> {
+    prune_phase.start();
+    Command::new("/usr/lib/startos/scripts/prune-images")
+        .arg(asset.commitment.size.to_string())
+        .invoke(ErrorKind::Filesystem)
+        .await?;
+    prune_phase.complete();
+
     download_phase.start();
     let path = Path::new("/media/startos/images")
         .join(hex::encode(&asset.commitment.hash[..16]))
@@ -420,6 +437,72 @@ async fn do_update(
         .arg("boot")
         .invoke(crate::ErrorKind::Filesystem)
         .await?;
+    if &*PLATFORM != "raspberrypi" {
+        let mountpoint = "/media/startos/next";
+        let root_guard = OverlayGuard::mount(
+            TmpMountGuard::mount(&BlockDev::new(&path), MountType::ReadOnly).await?,
+            mountpoint,
+        )
+        .await?;
+        let startos = MountGuard::mount(
+            &Bind::new("/media/startos/root"),
+            root_guard.path().join("media/startos/root"),
+            MountType::ReadOnly,
+        )
+        .await?;
+        let boot_guard = MountGuard::mount(
+            &Bind::new("/boot"),
+            root_guard.path().join("boot"),
+            MountType::ReadWrite,
+        )
+        .await?;
+        let dev = MountGuard::mount(
+            &Bind::new("/dev"),
+            root_guard.path().join("dev"),
+            MountType::ReadWrite,
+        )
+        .await?;
+        let proc = MountGuard::mount(
+            &Bind::new("/proc"),
+            root_guard.path().join("proc"),
+            MountType::ReadWrite,
+        )
+        .await?;
+        let sys = MountGuard::mount(
+            &Bind::new("/sys"),
+            root_guard.path().join("sys"),
+            MountType::ReadWrite,
+        )
+        .await?;
+        let efivarfs = if tokio::fs::metadata("/sys/firmware/efi").await.is_ok() {
+            Some(
+                MountGuard::mount(
+                    &EfiVarFs,
+                    root_guard.path().join("sys/firmware/efi/efivars"),
+                    MountType::ReadWrite,
+                )
+                .await?,
+            )
+        } else {
+            None
+        };
+
+        Command::new("chroot")
+            .arg(root_guard.path())
+            .arg("update-grub2")
+            .invoke(ErrorKind::Grub)
+            .await?;
+
+        if let Some(efivarfs) = efivarfs {
+            efivarfs.unmount(false).await?;
+        }
+        sys.unmount(false).await?;
+        proc.unmount(false).await?;
+        dev.unmount(false).await?;
+        boot_guard.unmount(false).await?;
+        startos.unmount(false).await?;
+        root_guard.unmount(false).await?;
+    }
     sync_boot_phase.complete();
 
     finalize_phase.start();
@@ -429,6 +512,7 @@ async fn do_update(
         .arg("/media/startos/config/current.rootfs")
         .invoke(crate::ErrorKind::Filesystem)
         .await?;
+    Command::new("sync").invoke(ErrorKind::Filesystem).await?;
     finalize_phase.complete();
 
     progress.complete();

From e65c0a0d1d08a0571ec451601369614be91ca508 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 19:19:19 -0600
Subject: [PATCH 225/341] fix tests

---
 Makefile                                         | 16 +++++++++++-----
 .../transformConfigSpec.test.ts.snap             |  8 ++++----
 sdk/lib/osBindings/ApiState.ts                   |  3 +++
 sdk/lib/osBindings/EchoParams.ts                 |  3 +++
 sdk/lib/osBindings/index.ts                      |  2 ++
 5 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 sdk/lib/osBindings/ApiState.ts
 create mode 100644 sdk/lib/osBindings/EchoParams.ts

diff --git a/Makefile b/Makefile
index 8f6bd0203..b17d91b7a 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ endif
 
 .DELETE_ON_ERROR:
 
-.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole wormhole-deb test
+.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole wormhole-deb test test-core test-sdk test-container-runtime
 
 all: $(ALL_TARGETS)
 
@@ -89,10 +89,16 @@ clean:
 format:
 	cd core && cargo +nightly fmt
 
-test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
-	(cd core && cargo build  --features=test && cargo test --features=test)
-	(cd sdk && make test)
-	(cd container-runtime && npm ci && npm test)
+test: | test-core test-sdk test-container-runtime
+
+test-core: $(CORE_SRC) $(ENVIRONMENT_FILE) 
+	cd core && cargo build --features=test && cargo test --features=test
+
+test-sdk: $(shell git ls-files sdk) sdk/lib/osBindings
+	cd sdk && make test
+
+test-container-runtime: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
+	cd container-runtime && npm test
 
 cli:
 	cd core && ./install-cli.sh
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
index 1d434c78d..369e8fa4b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
@@ -76,8 +76,8 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
             "required": false,
             "type": "select",
             "values": {
-              "filebrowser": undefined,
-              "nextcloud": undefined,
+              "filebrowser": "filebrowser",
+              "nextcloud": "nextcloud",
             },
             "warning": null,
           },
@@ -192,8 +192,8 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
                   "required": false,
                   "type": "select",
                   "values": {
-                    "filebrowser": undefined,
-                    "nextcloud": undefined,
+                    "filebrowser": "filebrowser",
+                    "nextcloud": "nextcloud",
                   },
                   "warning": null,
                 },
diff --git a/sdk/lib/osBindings/ApiState.ts b/sdk/lib/osBindings/ApiState.ts
new file mode 100644
index 000000000..c3a43828a
--- /dev/null
+++ b/sdk/lib/osBindings/ApiState.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ApiState = "error" | "initializing" | "running"
diff --git a/sdk/lib/osBindings/EchoParams.ts b/sdk/lib/osBindings/EchoParams.ts
new file mode 100644
index 000000000..232dfb8ab
--- /dev/null
+++ b/sdk/lib/osBindings/EchoParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EchoParams = { message: string }
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 2bf2bf69c..2708aef8c 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -15,6 +15,7 @@ export { AlpnInfo } from "./AlpnInfo"
 export { AnySignature } from "./AnySignature"
 export { AnySigningKey } from "./AnySigningKey"
 export { AnyVerifyingKey } from "./AnyVerifyingKey"
+export { ApiState } from "./ApiState"
 export { AttachParams } from "./AttachParams"
 export { BackupProgress } from "./BackupProgress"
 export { BackupTargetFS } from "./BackupTargetFS"
@@ -42,6 +43,7 @@ export { DepInfo } from "./DepInfo"
 export { Description } from "./Description"
 export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams"
 export { Duration } from "./Duration"
+export { EchoParams } from "./EchoParams"
 export { EncryptedWire } from "./EncryptedWire"
 export { ExecuteAction } from "./ExecuteAction"
 export { ExportActionParams } from "./ExportActionParams"

From 6f07ec259767f7b7686e2b935db1fb30fc95470e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 19:29:24 -0600
Subject: [PATCH 226/341] fix bindings

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b17d91b7a..adcbc6bf1 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,7 @@ sdk/lib/osBindings: core/startos/bindings
 
 core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE)
 	rm -rf core/startos/bindings
-	(cd core/ && cargo test --features=test '::export_bindings_')
+	(cd core/ && cargo test --features=test 'export_bindings_')
 	touch core/startos/bindings
 
 sdk/dist: $(shell git ls-files sdk) sdk/lib/osBindings

From 3e7578d6704719129fa9a01d4e06b2c3df247236 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Jul 2024 20:31:09 -0600
Subject: [PATCH 227/341] bump version

---
 core/Cargo.lock                               |  2 +-
 core/startos/Cargo.toml                       |  2 +-
 core/startos/src/version/mod.rs               |  9 ++++-
 core/startos/src/version/v0_3_6_alpha_2.rs    | 35 +++++++++++++++++++
 web/package.json                              |  2 +-
 web/patchdb-ui-seed.json                      |  2 +-
 .../modals/os-welcome/os-welcome.page.html    |  2 +-
 7 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 core/startos/src/version/v0_3_6_alpha_2.rs

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 69d23b92c..9c7b79c0d 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -4961,7 +4961,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.1"
+version = "0.3.6-alpha.2"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 5e84aac5e..6969b5301 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.1"
+version = "0.3.6-alpha.2"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index ebd178e37..39e6eae72 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -15,8 +15,9 @@ mod v0_3_5_1;
 mod v0_3_5_2;
 mod v0_3_6_alpha_0;
 mod v0_3_6_alpha_1;
+mod v0_3_6_alpha_2;
 
-pub type Current = v0_3_6_alpha_1::Version;
+pub type Current = v0_3_6_alpha_2::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
@@ -28,6 +29,7 @@ enum Version {
     V0_3_5_2(Wrapper<v0_3_5_2::Version>),
     V0_3_6_alpha_0(Wrapper<v0_3_6_alpha_0::Version>),
     V0_3_6_alpha_1(Wrapper<v0_3_6_alpha_1::Version>),
+    V0_3_6_alpha_2(Wrapper<v0_3_6_alpha_2::Version>),
     Other(exver::Version),
 }
 
@@ -49,6 +51,7 @@ impl Version {
             Version::V0_3_5_2(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_0(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_1(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_2(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -250,6 +253,7 @@ pub async fn init(
         Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::V0_3_6_alpha_0(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::V0_3_6_alpha_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6_alpha_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -300,6 +304,9 @@ mod tests {
             Just(Version::V0_3_6_alpha_1(Wrapper(
                 v0_3_6_alpha_1::Version::new()
             ))),
+            Just(Version::V0_3_6_alpha_2(Wrapper(
+                v0_3_6_alpha_2::Version::new()
+            ))),
             em_version().prop_map(Version::Other),
         ]
     }
diff --git a/core/startos/src/version/v0_3_6_alpha_2.rs b/core/startos/src/version/v0_3_6_alpha_2.rs
new file mode 100644
index 000000000..4b26a05dd
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_2.rs
@@ -0,0 +1,35 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_1, VersionT};
+use crate::db::model::Database;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_2: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 2.into()]
+    );
+}
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_1::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> exver::Version {
+        V0_3_6_alpha_2.clone()
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/web/package.json b/web/package.json
index f20272d99..4a7047041 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.1",
+  "version": "0.3.6-alpha.2",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 15e020cb3..f15a8d09b 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -21,5 +21,5 @@
   "ackInstructions": {},
   "theme": "Dark",
   "widgets": [],
-  "ack-welcome": "0.3.6-alpha.1"
+  "ack-welcome": "0.3.6-alpha.2"
 }
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index d53a0746d..258c92f83 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,7 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6-alpha.1</h4>
+  <h4>0.3.6-alpha.2</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
   <h6>Expect that any data you create or store on this version of the OS can be LOST FOREVER!</h6>
 

From 63e26b6050382f7d9c86f4a496193063023324db Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 10:15:46 -0600
Subject: [PATCH 228/341] fix race condition

---
 core/startos/src/service/persistent_container.rs |  5 +++++
 core/startos/src/service/service_actor.rs        | 13 +++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 62d3b0975..e1324b307 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -43,6 +43,8 @@ const RPC_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
 
 #[derive(Debug)]
 pub struct ServiceState {
+    // indicates whether the service container runtime has been initialized yet
+    pub(super) rt_initialized: bool,
     // This contains the start time and health check information for when the service is running. Note: Will be overwritting to the db,
     pub(super) running_status: Option<RunningStatus>,
     // This tracks references to callbacks registered by the running service:
@@ -65,6 +67,7 @@ pub struct ServiceStateKinds {
 impl ServiceState {
     pub fn new(desired_state: StartStop) -> Self {
         Self {
+            rt_initialized: false,
             running_status: Default::default(),
             callbacks: Default::default(),
             temp_desired_state: Default::default(),
@@ -369,6 +372,8 @@ impl PersistentContainer {
 
         self.rpc_client.request(rpc::Init, Empty {}).await?;
 
+        self.state.send_modify(|s| s.rt_initialized = true);
+
         Ok(())
     }
 
diff --git a/core/startos/src/service/service_actor.rs b/core/startos/src/service/service_actor.rs
index e6e1c4ede..e6578264c 100644
--- a/core/startos/src/service/service_actor.rs
+++ b/core/startos/src/service/service_actor.rs
@@ -2,10 +2,9 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use imbl::OrdMap;
-use models::PackageId;
 
 use super::start_stop::StartStop;
-
+use super::ServiceActorSeed;
 use crate::prelude::*;
 use crate::service::transition::TransitionKind;
 use crate::service::SYNC_RETRY_COOLDOWN_SECONDS;
@@ -13,8 +12,6 @@ use crate::status::MainStatus;
 use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::Actor;
 
-use super::ServiceActorSeed;
-
 #[derive(Clone)]
 pub(super) struct ServiceActor(pub(super) Arc<ServiceActorSeed>);
 
@@ -26,12 +23,12 @@ enum ServiceActorLoopNext {
 impl Actor for ServiceActor {
     fn init(&mut self, jobs: &BackgroundJobQueue) {
         let seed = self.0.clone();
+        let mut current = seed.persistent_container.state.subscribe();
         jobs.add_job(async move {
-            let id = seed.id.clone();
-            let mut current = seed.persistent_container.state.subscribe();
+            let _ = current.wait_for(|s| s.rt_initialized).await;
 
             loop {
-                match service_actor_loop(&current, &seed, &id).await {
+                match service_actor_loop(&current, &seed).await {
                     ServiceActorLoopNext::Wait => tokio::select! {
                         _ = current.changed() => (),
                     },
@@ -45,8 +42,8 @@ impl Actor for ServiceActor {
 async fn service_actor_loop(
     current: &tokio::sync::watch::Receiver<super::persistent_container::ServiceState>,
     seed: &Arc<ServiceActorSeed>,
-    id: &PackageId,
 ) -> ServiceActorLoopNext {
+    let id = &seed.id;
     let kinds = current.borrow().kinds();
     if let Err(e) = async {
         let main_status = match (

From 0ed6eb70296ffe65b3b91c1a9da7c28744d62533 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Mon, 29 Jul 2024 11:13:35 -0600
Subject: [PATCH 229/341] Fix sessions (#2689)

* add loggedIn key to sessions

* show loggedIn timestamp in list

* don't double hash active session

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/src/auth.rs                      |  4 ++--
 core/startos/src/util/sync.rs                 |  3 +++
 .../server-routes/sessions/sessions.page.html | 22 +++++++++++++++----
 .../server-routes/sessions/sessions.page.ts   | 20 +++++------------
 .../ui/src/app/services/api/api.fixures.ts    |  2 ++
 .../ui/src/app/services/api/api.types.ts      |  1 +
 6 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 68e16c244..d998e9897 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -350,13 +350,13 @@ pub async fn list(
     ListParams { session, .. }: ListParams,
 ) -> Result<SessionList, Error> {
     let mut sessions = ctx.db.peek().await.into_private().into_sessions().de()?;
-    ctx.ephemeral_sessions.mutate(|s| {
+    ctx.ephemeral_sessions.peek(|s| {
         sessions
             .0
             .extend(s.0.iter().map(|(k, v)| (k.clone(), v.clone())))
     });
     Ok(SessionList {
-        current: HashSessionToken::from_token(session).hashed().clone(),
+        current: session,
         sessions,
     })
 }
diff --git a/core/startos/src/util/sync.rs b/core/startos/src/util/sync.rs
index f8ec425e0..1edd21ce1 100644
--- a/core/startos/src/util/sync.rs
+++ b/core/startos/src/util/sync.rs
@@ -6,4 +6,7 @@ impl<T> SyncMutex<T> {
     pub fn mutate<F: FnOnce(&mut T) -> U, U>(&self, f: F) -> U {
         f(&mut *self.0.lock().unwrap())
     }
+    pub fn peek<F: FnOnce(&T) -> U, U>(&self, f: F) -> U {
+        f(&*self.0.lock().unwrap())
+    }
 }
diff --git a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
index 3e349b49b..2473e6041 100644
--- a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
@@ -52,8 +52,15 @@
         ></ion-icon>
         <ion-label>
           <h1>{{ getPlatformName(currentSession.metadata.platforms) }}</h1>
-          <h2>Last Active: {{ currentSession.lastActive| date : 'medium' }}</h2>
-          <p>{{ currentSession.userAgent }}</p>
+          <h2 *ngIf="currentSession.userAgent as agent">{{ agent }}</h2>
+          <p>
+            <b>First Seen</b>
+            : {{ currentSession.loggedIn| date : 'medium' }}
+          </p>
+          <p>
+            <b>Last Active</b>
+            : {{ currentSession.lastActive| date : 'medium' }}
+          </p>
         </ion-label>
       </ion-item>
 
@@ -78,8 +85,15 @@ <h2>Last Active: {{ currentSession.lastActive| date : 'medium' }}</h2>
           ></ion-icon>
           <ion-label>
             <h1>{{ getPlatformName(session.metadata.platforms) }}</h1>
-            <h2>Last Active: {{ session.lastActive | date : 'medium' }}</h2>
-            <p>{{ session.userAgent }}</p>
+            <h2 *ngIf="currentSession.userAgent as agent">{{ agent }}</h2>
+            <p>
+              <b>First Seen</b>
+              : {{ currentSession.loggedIn| date : 'medium' }}
+            </p>
+            <p>
+              <b>Last Active</b>
+              : {{ currentSession.lastActive| date : 'medium' }}
+            </p>
           </ion-label>
           <ion-button
             slot="end"
diff --git a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
index 9dfdccb66..114eb63ef 100644
--- a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
@@ -27,17 +27,11 @@ export class SessionsPage {
       this.currentSession = sessionInfo.sessions[sessionInfo.current]
       delete sessionInfo.sessions[sessionInfo.current]
       this.otherSessions = Object.entries(sessionInfo.sessions)
-        .map(([id, session]) => {
-          return {
-            id,
-            ...session,
-          }
-        })
-        .sort((a, b) => {
-          return (
-            new Date(b.lastActive).valueOf() - new Date(a.lastActive).valueOf()
-          )
-        })
+        .map(([id, session]) => ({ id, ...session }))
+        .sort(
+          (a, b) =>
+            new Date(b.lastActive).valueOf() - new Date(a.lastActive).valueOf(),
+        )
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
@@ -108,10 +102,6 @@ export class SessionsPage {
       return 'Unknown Device'
     }
   }
-
-  asIsOrder(a: any, b: any) {
-    return 0
-  }
 }
 
 interface SessionWithId extends Session {
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 23545d6b3..d1ce9c47c 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -924,6 +924,7 @@ export module Mock {
     current: 'b7b1a9cef4284f00af9e9dda6e676177',
     sessions: {
       '9513226517c54ddd8107d6d7b9d8aed7': {
+        loggedIn: '2021-07-14T20:49:17.774Z',
         lastActive: '2021-07-14T20:49:17.774Z',
         userAgent: 'AppleWebKit/{WebKit Rev} (KHTML, like Gecko)',
         metadata: {
@@ -931,6 +932,7 @@ export module Mock {
         },
       },
       b7b1a9cef4284f00af9e9dda6e676177: {
+        loggedIn: '2021-07-14T20:49:17.774Z',
         lastActive: '2021-06-14T20:49:17.774Z',
         userAgent:
           'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0',
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index eac7cd7f4..faa4a072e 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -354,6 +354,7 @@ export interface Metric {
 }
 
 export interface Session {
+  loggedIn: string
   lastActive: string
   userAgent: string
   metadata: SessionMetadata

From 75e5250509cbdafbe474b71051b8646e21868ac1 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 29 Jul 2024 11:24:10 -0600
Subject: [PATCH 230/341] fixed: Transforming for bitcoind and nostr (#2688)

---
 .../SystemForEmbassy/__fixtures__/bitcoind.ts | 387 +++++++++++++
 .../SystemForEmbassy/__fixtures__/nostr.ts    |  28 +
 .../transformConfigSpec.test.ts.snap          | 538 ++++++++++++++++++
 .../transformConfigSpec.test.ts               |  10 +
 .../SystemForEmbassy/transformConfigSpec.ts   |   8 +-
 5 files changed, 967 insertions(+), 4 deletions(-)
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostr.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
new file mode 100644
index 000000000..9a643b39d
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
@@ -0,0 +1,387 @@
+export default {
+  "peer-tor-address": {
+    name: "Peer Tor Address",
+    description: "The Tor address of the peer interface",
+    type: "pointer",
+    subtype: "package",
+    "package-id": "bitcoind",
+    target: "tor-address",
+    interface: "peer",
+  },
+  "rpc-tor-address": {
+    name: "RPC Tor Address",
+    description: "The Tor address of the RPC interface",
+    type: "pointer",
+    subtype: "package",
+    "package-id": "bitcoind",
+    target: "tor-address",
+    interface: "rpc",
+  },
+  rpc: {
+    type: "object",
+    name: "RPC Settings",
+    description: "RPC configuration options.",
+    spec: {
+      enable: {
+        type: "boolean",
+        name: "Enable",
+        description: "Allow remote RPC requests.",
+        default: true,
+      },
+      username: {
+        type: "string",
+        nullable: false,
+        name: "Username",
+        description: "The username for connecting to Bitcoin over RPC.",
+        warning:
+          "You will need to restart all services that depend on Bitcoin.",
+        default: "bitcoin",
+        masked: true,
+        pattern: "^[a-zA-Z0-9_]+$",
+        "pattern-description": "Must be alphanumeric (can contain underscore).",
+      },
+      password: {
+        type: "string",
+        nullable: false,
+        name: "RPC Password",
+        description: "The password for connecting to Bitcoin over RPC.",
+        warning:
+          "You will need to restart all services that depend on Bitcoin.",
+        default: {
+          charset: "a-z,2-7",
+          len: 20,
+        },
+        pattern: "^[a-zA-Z0-9_]+$",
+        "pattern-description": "Must be alphanumeric (can contain underscore).",
+        copyable: true,
+        masked: true,
+      },
+      advanced: {
+        type: "object",
+        name: "Advanced",
+        description: "Advanced RPC Settings",
+        spec: {
+          auth: {
+            name: "Authorization",
+            description:
+              "Username and hashed password for JSON-RPC connections. RPC clients connect using the usual http basic authentication.",
+            type: "list",
+            subtype: "string",
+            default: [],
+            spec: {
+              pattern: "^[a-zA-Z0-9_-]+:([0-9a-fA-F]{2})+\\$([0-9a-fA-F]{2})+$",
+              "pattern-description":
+                'Each item must be of the form "<USERNAME>:<SALT>$<HASH>".',
+            },
+            range: "[0,*)",
+          },
+          servertimeout: {
+            name: "Rpc Server Timeout",
+            description:
+              "Number of seconds after which an uncompleted RPC call will time out.",
+            type: "number",
+            nullable: false,
+            range: "[5,300]",
+            integral: true,
+            units: "seconds",
+            default: 30,
+          },
+          threads: {
+            name: "Threads",
+            description:
+              "Set the number of threads for handling RPC calls. You may wish to increase this if you are making lots of calls via an integration.",
+            type: "number",
+            nullable: false,
+            default: 16,
+            range: "[1,64]",
+            integral: true,
+            units: undefined,
+          },
+          workqueue: {
+            name: "Work Queue",
+            description:
+              "Set the depth of the work queue to service RPC calls. Determines how long the backlog of RPC requests can get before it just rejects new ones.",
+            type: "number",
+            nullable: false,
+            default: 128,
+            range: "[8,256]",
+            integral: true,
+            units: "requests",
+          },
+        },
+      },
+    },
+  },
+  "zmq-enabled": {
+    type: "boolean",
+    name: "ZeroMQ Enabled",
+    description:
+      "The ZeroMQ interface is useful for some applications which might require data related to block and transaction events from Bitcoin Core. For example, LND requires ZeroMQ be enabled for LND to get the latest block data",
+    default: true,
+  },
+  txindex: {
+    type: "boolean",
+    name: "Transaction Index",
+    description:
+      "By enabling Transaction Index (txindex) Bitcoin Core will build a complete transaction index. This allows Bitcoin Core to access any transaction with commands like `gettransaction`.",
+    default: true,
+  },
+  coinstatsindex: {
+    type: "boolean",
+    name: "Coinstats Index",
+    description:
+      "Enabling Coinstats Index reduces the time for the gettxoutsetinfo RPC to complete at the cost of using additional disk space",
+    default: false,
+  },
+  wallet: {
+    type: "object",
+    name: "Wallet",
+    description: "Wallet Settings",
+    spec: {
+      enable: {
+        name: "Enable Wallet",
+        description: "Load the wallet and enable wallet RPC calls.",
+        type: "boolean",
+        default: true,
+      },
+      avoidpartialspends: {
+        name: "Avoid Partial Spends",
+        description:
+          "Group outputs by address, selecting all or none, instead of selecting on a per-output basis. This improves privacy at the expense of higher transaction fees.",
+        type: "boolean",
+        default: true,
+      },
+      discardfee: {
+        name: "Discard Change Tolerance",
+        description:
+          "The fee rate (in BTC/kB) that indicates your tolerance for discarding change by adding it to the fee.",
+        type: "number",
+        nullable: false,
+        default: 0.0001,
+        range: "[0,.01]",
+        integral: false,
+        units: "BTC/kB",
+      },
+    },
+  },
+  advanced: {
+    type: "object",
+    name: "Advanced",
+    description: "Advanced Settings",
+    spec: {
+      mempool: {
+        type: "object",
+        name: "Mempool",
+        description: "Mempool Settings",
+        spec: {
+          persistmempool: {
+            type: "boolean",
+            name: "Persist Mempool",
+            description: "Save the mempool on shutdown and load on restart.",
+            default: true,
+          },
+          maxmempool: {
+            type: "number",
+            nullable: false,
+            name: "Max Mempool Size",
+            description:
+              "Keep the transaction memory pool below <n> megabytes.",
+            range: "[1,*)",
+            integral: true,
+            units: "MiB",
+            default: 300,
+          },
+          mempoolexpiry: {
+            type: "number",
+            nullable: false,
+            name: "Mempool Expiration",
+            description:
+              "Do not keep transactions in the mempool longer than <n> hours.",
+            range: "[1,*)",
+            integral: true,
+            units: "Hr",
+            default: 336,
+          },
+          mempoolfullrbf: {
+            name: "Enable Full RBF",
+            description:
+              "Policy for your node to use for relaying and mining unconfirmed transactions.  For details, see https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-24.0.1.md#notice-of-new-option-for-transaction-replacement-policies",
+            type: "boolean",
+            default: true,
+          },
+          permitbaremultisig: {
+            type: "boolean",
+            name: "Permit Bare Multisig",
+            description: "Relay non-P2SH multisig transactions",
+            default: true,
+          },
+          datacarrier: {
+            type: "boolean",
+            name: "Relay OP_RETURN Transactions",
+            description: "Relay transactions with OP_RETURN outputs",
+            default: true,
+          },
+          datacarriersize: {
+            type: "number",
+            nullable: false,
+            name: "Max OP_RETURN Size",
+            description: "Maximum size of data in OP_RETURN outputs to relay",
+            range: "[0,10000]",
+            integral: true,
+            units: "bytes",
+            default: 83,
+          },
+        },
+      },
+      peers: {
+        type: "object",
+        name: "Peers",
+        description: "Peer Connection Settings",
+        spec: {
+          listen: {
+            type: "boolean",
+            name: "Make Public",
+            description:
+              "Allow other nodes to find your server on the network.",
+            default: true,
+          },
+          onlyconnect: {
+            type: "boolean",
+            name: "Disable Peer Discovery",
+            description: "Only connect to specified peers.",
+            default: false,
+          },
+          onlyonion: {
+            type: "boolean",
+            name: "Disable Clearnet",
+            description: "Only connect to peers over Tor.",
+            default: false,
+          },
+          v2transport: {
+            type: "boolean",
+            name: "Use V2 P2P Transport Protocol",
+            description:
+              "Enable or disable the use of BIP324 V2 P2P transport protocol.",
+            default: false,
+          },
+          addnode: {
+            name: "Add Nodes",
+            description: "Add addresses of nodes to connect to.",
+            type: "list",
+            subtype: "object",
+            range: "[0,*)",
+            default: [],
+            spec: {
+              spec: {
+                hostname: {
+                  type: "string",
+                  nullable: false,
+                  name: "Hostname",
+                  description: "Domain or IP address of bitcoin peer",
+                  pattern:
+                    "(^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$)|((^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$)|(^[a-z2-7]{16}\\.onion$)|(^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$))",
+                  "pattern-description":
+                    "Must be either a domain name, or an IPv4 or IPv6 address. Do not include protocol scheme (eg 'http://') or port.",
+                },
+                port: {
+                  type: "number",
+                  nullable: true,
+                  name: "Port",
+                  description:
+                    "Port that peer is listening on for inbound p2p connections",
+                  range: "[0,65535]",
+                  integral: true,
+                },
+              },
+            },
+          },
+        },
+      },
+      pruning: {
+        type: "union",
+        name: "Pruning Settings",
+        description:
+          "Blockchain Pruning Options\nReduce the blockchain size on disk\n",
+        warning:
+          "Disabling pruning will convert your node into a full archival node. This requires a resync of the entire blockchain, a process that may take several days.\n",
+        tag: {
+          id: "mode",
+          name: "Pruning Mode",
+          description:
+            "- Disabled: Disable pruning\n- Automatic: Limit blockchain size on disk to a certain number of megabytes\n",
+          "variant-names": {
+            disabled: "Disabled",
+            automatic: "Automatic",
+          },
+        },
+        variants: {
+          disabled: {},
+          automatic: {
+            size: {
+              type: "number",
+              nullable: false,
+              name: "Max Chain Size",
+              description: "Limit of blockchain size on disk.",
+              warning:
+                "Increasing this value will require re-syncing your node.",
+              default: 550,
+              range: "[550,1000000)",
+              integral: true,
+              units: "MiB",
+            },
+          },
+        },
+        default: "disabled",
+      },
+      dbcache: {
+        type: "number",
+        nullable: true,
+        name: "Database Cache",
+        description:
+          "How much RAM to allocate for caching the TXO set. Higher values improve syncing performance, but increase your chance of using up all your system's memory or corrupting your database in the event of an ungraceful shutdown. Set this high but comfortably below your system's total RAM during IBD, then turn down to 450 (or leave blank) once the sync completes.",
+        warning:
+          "WARNING: Increasing this value results in a higher chance of ungraceful shutdowns, which can leave your node unusable if it happens during the initial block download. Use this setting with caution. Be sure to set this back to the default (450 or leave blank) once your node is synced. DO NOT press the STOP button if your dbcache is large. Instead, set this number back to the default, hit save, and wait for bitcoind to restart on its own.",
+        range: "(0,*)",
+        integral: true,
+        units: "MiB",
+      },
+      blockfilters: {
+        type: "object",
+        name: "Block Filters",
+        description: "Settings for storing and serving compact block filters",
+        spec: {
+          blockfilterindex: {
+            type: "boolean",
+            name: "Compute Compact Block Filters (BIP158)",
+            description:
+              "Generate Compact Block Filters during initial sync (IBD) to enable 'getblockfilter' RPC. This is useful if dependent services need block filters to efficiently scan for addresses/transactions etc.",
+            default: true,
+          },
+          peerblockfilters: {
+            type: "boolean",
+            name: "Serve Compact Block Filters to Peers (BIP157)",
+            description:
+              "Serve Compact Block Filters as a peer service to other nodes on the network. This is useful if you wish to connect an SPV client to your node to make it efficient to scan transactions without having to download all block data.  'Compute Compact Block Filters (BIP158)' is required.",
+            default: false,
+          },
+        },
+      },
+      bloomfilters: {
+        type: "object",
+        name: "Bloom Filters (BIP37)",
+        description: "Setting for serving Bloom Filters",
+        spec: {
+          peerbloomfilters: {
+            type: "boolean",
+            name: "Serve Bloom Filters to Peers",
+            description:
+              "Peers have the option of setting filters on each connection they make after the version handshake has completed. Bloom filters are for clients implementing SPV (Simplified Payment Verification) that want to check that block headers  connect together correctly, without needing to verify the full blockchain.  The client must trust that the transactions in the chain are in fact valid.  It is highly recommended AGAINST using for anything except Bisq integration.",
+            warning:
+              "This is ONLY for use with Bisq integration, please use Block Filters for all other applications.",
+            default: false,
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostr.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostr.ts
new file mode 100644
index 000000000..f5a93a918
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostr.ts
@@ -0,0 +1,28 @@
+export default {
+  "tor-address": {
+    name: "Tor Address",
+    description: "The Tor address of the network interface",
+    type: "pointer",
+    subtype: "package",
+    "package-id": "nostr-wallet-connect",
+    target: "tor-address",
+    interface: "main",
+  },
+  "lan-address": {
+    name: "LAN Address",
+    description: "The LAN address of the network interface",
+    type: "pointer",
+    subtype: "package",
+    "package-id": "nostr-wallet-connect",
+    target: "lan-address",
+    interface: "main",
+  },
+  "nostr-relay": {
+    type: "string",
+    name: "Nostr Relay",
+    default: "wss://relay.getalby.com/v1",
+    description: "The Nostr Relay to use for Nostr Wallet Connect connections",
+    copyable: true,
+    nullable: false,
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
index 369e8fa4b..9eb6e97cf 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
@@ -1,5 +1,521 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`transformConfigSpec transformConfigSpec(bitcoind) 1`] = `
+{
+  "advanced": {
+    "description": "Advanced Settings",
+    "name": "Advanced",
+    "spec": {
+      "blockfilters": {
+        "description": "Settings for storing and serving compact block filters",
+        "name": "Block Filters",
+        "spec": {
+          "blockfilterindex": {
+            "default": true,
+            "description": "Generate Compact Block Filters during initial sync (IBD) to enable 'getblockfilter' RPC. This is useful if dependent services need block filters to efficiently scan for addresses/transactions etc.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Compute Compact Block Filters (BIP158)",
+            "type": "toggle",
+            "warning": null,
+          },
+          "peerblockfilters": {
+            "default": false,
+            "description": "Serve Compact Block Filters as a peer service to other nodes on the network. This is useful if you wish to connect an SPV client to your node to make it efficient to scan transactions without having to download all block data.  'Compute Compact Block Filters (BIP158)' is required.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Serve Compact Block Filters to Peers (BIP157)",
+            "type": "toggle",
+            "warning": null,
+          },
+        },
+        "type": "object",
+        "warning": null,
+      },
+      "bloomfilters": {
+        "description": "Setting for serving Bloom Filters",
+        "name": "Bloom Filters (BIP37)",
+        "spec": {
+          "peerbloomfilters": {
+            "default": false,
+            "description": "Peers have the option of setting filters on each connection they make after the version handshake has completed. Bloom filters are for clients implementing SPV (Simplified Payment Verification) that want to check that block headers  connect together correctly, without needing to verify the full blockchain.  The client must trust that the transactions in the chain are in fact valid.  It is highly recommended AGAINST using for anything except Bisq integration.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Serve Bloom Filters to Peers",
+            "type": "toggle",
+            "warning": "This is ONLY for use with Bisq integration, please use Block Filters for all other applications.",
+          },
+        },
+        "type": "object",
+        "warning": null,
+      },
+      "dbcache": {
+        "default": null,
+        "description": "How much RAM to allocate for caching the TXO set. Higher values improve syncing performance, but increase your chance of using up all your system's memory or corrupting your database in the event of an ungraceful shutdown. Set this high but comfortably below your system's total RAM during IBD, then turn down to 450 (or leave blank) once the sync completes.",
+        "disabled": false,
+        "immutable": false,
+        "integer": true,
+        "max": null,
+        "min": null,
+        "name": "Database Cache",
+        "placeholder": null,
+        "required": false,
+        "step": null,
+        "type": "number",
+        "units": "MiB",
+        "warning": "WARNING: Increasing this value results in a higher chance of ungraceful shutdowns, which can leave your node unusable if it happens during the initial block download. Use this setting with caution. Be sure to set this back to the default (450 or leave blank) once your node is synced. DO NOT press the STOP button if your dbcache is large. Instead, set this number back to the default, hit save, and wait for bitcoind to restart on its own.",
+      },
+      "mempool": {
+        "description": "Mempool Settings",
+        "name": "Mempool",
+        "spec": {
+          "datacarrier": {
+            "default": true,
+            "description": "Relay transactions with OP_RETURN outputs",
+            "disabled": false,
+            "immutable": false,
+            "name": "Relay OP_RETURN Transactions",
+            "type": "toggle",
+            "warning": null,
+          },
+          "datacarriersize": {
+            "default": 83,
+            "description": "Maximum size of data in OP_RETURN outputs to relay",
+            "disabled": false,
+            "immutable": false,
+            "integer": true,
+            "max": 10000,
+            "min": null,
+            "name": "Max OP_RETURN Size",
+            "placeholder": null,
+            "required": true,
+            "step": null,
+            "type": "number",
+            "units": "bytes",
+            "warning": null,
+          },
+          "maxmempool": {
+            "default": 300,
+            "description": "Keep the transaction memory pool below <n> megabytes.",
+            "disabled": false,
+            "immutable": false,
+            "integer": true,
+            "max": null,
+            "min": 1,
+            "name": "Max Mempool Size",
+            "placeholder": null,
+            "required": true,
+            "step": null,
+            "type": "number",
+            "units": "MiB",
+            "warning": null,
+          },
+          "mempoolexpiry": {
+            "default": 336,
+            "description": "Do not keep transactions in the mempool longer than <n> hours.",
+            "disabled": false,
+            "immutable": false,
+            "integer": true,
+            "max": null,
+            "min": 1,
+            "name": "Mempool Expiration",
+            "placeholder": null,
+            "required": true,
+            "step": null,
+            "type": "number",
+            "units": "Hr",
+            "warning": null,
+          },
+          "mempoolfullrbf": {
+            "default": true,
+            "description": "Policy for your node to use for relaying and mining unconfirmed transactions.  For details, see https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-24.0.1.md#notice-of-new-option-for-transaction-replacement-policies",
+            "disabled": false,
+            "immutable": false,
+            "name": "Enable Full RBF",
+            "type": "toggle",
+            "warning": null,
+          },
+          "permitbaremultisig": {
+            "default": true,
+            "description": "Relay non-P2SH multisig transactions",
+            "disabled": false,
+            "immutable": false,
+            "name": "Permit Bare Multisig",
+            "type": "toggle",
+            "warning": null,
+          },
+          "persistmempool": {
+            "default": true,
+            "description": "Save the mempool on shutdown and load on restart.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Persist Mempool",
+            "type": "toggle",
+            "warning": null,
+          },
+        },
+        "type": "object",
+        "warning": null,
+      },
+      "peers": {
+        "description": "Peer Connection Settings",
+        "name": "Peers",
+        "spec": {
+          "addnode": {
+            "default": [],
+            "description": "Add addresses of nodes to connect to.",
+            "disabled": false,
+            "maxLength": null,
+            "minLength": null,
+            "name": "Add Nodes",
+            "spec": {
+              "displayAs": null,
+              "spec": {
+                "hostname": {
+                  "default": null,
+                  "description": "Domain or IP address of bitcoin peer",
+                  "disabled": false,
+                  "generate": null,
+                  "immutable": false,
+                  "inputmode": "text",
+                  "masked": false,
+                  "maxLength": null,
+                  "minLength": null,
+                  "name": "Hostname",
+                  "patterns": [
+                    {
+                      "description": "Must be either a domain name, or an IPv4 or IPv6 address. Do not include protocol scheme (eg 'http://') or port.",
+                      "regex": "(^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$)|((^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$)|(^[a-z2-7]{16}\\.onion$)|(^([a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?\\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$))",
+                    },
+                  ],
+                  "placeholder": null,
+                  "required": true,
+                  "type": "text",
+                  "warning": null,
+                },
+                "port": {
+                  "default": null,
+                  "description": "Port that peer is listening on for inbound p2p connections",
+                  "disabled": false,
+                  "immutable": false,
+                  "integer": true,
+                  "max": 65535,
+                  "min": null,
+                  "name": "Port",
+                  "placeholder": null,
+                  "required": false,
+                  "step": null,
+                  "type": "number",
+                  "units": null,
+                  "warning": null,
+                },
+              },
+              "type": "object",
+              "uniqueBy": null,
+            },
+            "type": "list",
+            "warning": null,
+          },
+          "listen": {
+            "default": true,
+            "description": "Allow other nodes to find your server on the network.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Make Public",
+            "type": "toggle",
+            "warning": null,
+          },
+          "onlyconnect": {
+            "default": false,
+            "description": "Only connect to specified peers.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Disable Peer Discovery",
+            "type": "toggle",
+            "warning": null,
+          },
+          "onlyonion": {
+            "default": false,
+            "description": "Only connect to peers over Tor.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Disable Clearnet",
+            "type": "toggle",
+            "warning": null,
+          },
+          "v2transport": {
+            "default": false,
+            "description": "Enable or disable the use of BIP324 V2 P2P transport protocol.",
+            "disabled": false,
+            "immutable": false,
+            "name": "Use V2 P2P Transport Protocol",
+            "type": "toggle",
+            "warning": null,
+          },
+        },
+        "type": "object",
+        "warning": null,
+      },
+      "pruning": {
+        "default": "disabled",
+        "description": "- Disabled: Disable pruning
+- Automatic: Limit blockchain size on disk to a certain number of megabytes
+",
+        "disabled": false,
+        "immutable": false,
+        "name": "Pruning Mode",
+        "required": true,
+        "type": "union",
+        "variants": {
+          "automatic": {
+            "name": "Automatic",
+            "spec": {
+              "size": {
+                "default": 550,
+                "description": "Limit of blockchain size on disk.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": 999999,
+                "min": 550,
+                "name": "Max Chain Size",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "MiB",
+                "warning": "Increasing this value will require re-syncing your node.",
+              },
+            },
+          },
+          "disabled": {
+            "name": "Disabled",
+            "spec": {},
+          },
+        },
+        "warning": null,
+      },
+    },
+    "type": "object",
+    "warning": null,
+  },
+  "coinstatsindex": {
+    "default": false,
+    "description": "Enabling Coinstats Index reduces the time for the gettxoutsetinfo RPC to complete at the cost of using additional disk space",
+    "disabled": false,
+    "immutable": false,
+    "name": "Coinstats Index",
+    "type": "toggle",
+    "warning": null,
+  },
+  "rpc": {
+    "description": "RPC configuration options.",
+    "name": "RPC Settings",
+    "spec": {
+      "advanced": {
+        "description": "Advanced RPC Settings",
+        "name": "Advanced",
+        "spec": {
+          "auth": {
+            "default": [],
+            "description": "Username and hashed password for JSON-RPC connections. RPC clients connect using the usual http basic authentication.",
+            "disabled": false,
+            "maxLength": null,
+            "minLength": null,
+            "name": "Authorization",
+            "spec": {
+              "generate": null,
+              "inputmode": "text",
+              "masked": false,
+              "maxLength": null,
+              "minLength": null,
+              "patterns": [
+                {
+                  "description": "Each item must be of the form "<USERNAME>:<SALT>$<HASH>".",
+                  "regex": "^[a-zA-Z0-9_-]+:([0-9a-fA-F]{2})+\\$([0-9a-fA-F]{2})+$",
+                },
+              ],
+              "placeholder": null,
+              "type": "text",
+            },
+            "type": "list",
+            "warning": null,
+          },
+          "servertimeout": {
+            "default": 30,
+            "description": "Number of seconds after which an uncompleted RPC call will time out.",
+            "disabled": false,
+            "immutable": false,
+            "integer": true,
+            "max": 300,
+            "min": 5,
+            "name": "Rpc Server Timeout",
+            "placeholder": null,
+            "required": true,
+            "step": null,
+            "type": "number",
+            "units": "seconds",
+            "warning": null,
+          },
+          "threads": {
+            "default": 16,
+            "description": "Set the number of threads for handling RPC calls. You may wish to increase this if you are making lots of calls via an integration.",
+            "disabled": false,
+            "immutable": false,
+            "integer": true,
+            "max": 64,
+            "min": 1,
+            "name": "Threads",
+            "placeholder": null,
+            "required": true,
+            "step": null,
+            "type": "number",
+            "units": null,
+            "warning": null,
+          },
+          "workqueue": {
+            "default": 128,
+            "description": "Set the depth of the work queue to service RPC calls. Determines how long the backlog of RPC requests can get before it just rejects new ones.",
+            "disabled": false,
+            "immutable": false,
+            "integer": true,
+            "max": 256,
+            "min": 8,
+            "name": "Work Queue",
+            "placeholder": null,
+            "required": true,
+            "step": null,
+            "type": "number",
+            "units": "requests",
+            "warning": null,
+          },
+        },
+        "type": "object",
+        "warning": null,
+      },
+      "enable": {
+        "default": true,
+        "description": "Allow remote RPC requests.",
+        "disabled": false,
+        "immutable": false,
+        "name": "Enable",
+        "type": "toggle",
+        "warning": null,
+      },
+      "password": {
+        "default": {
+          "charset": "a-z,2-7",
+          "len": 20,
+        },
+        "description": "The password for connecting to Bitcoin over RPC.",
+        "disabled": false,
+        "generate": null,
+        "immutable": false,
+        "inputmode": "text",
+        "masked": true,
+        "maxLength": null,
+        "minLength": null,
+        "name": "RPC Password",
+        "patterns": [
+          {
+            "description": "Must be alphanumeric (can contain underscore).",
+            "regex": "^[a-zA-Z0-9_]+$",
+          },
+        ],
+        "placeholder": null,
+        "required": true,
+        "type": "text",
+        "warning": "You will need to restart all services that depend on Bitcoin.",
+      },
+      "username": {
+        "default": "bitcoin",
+        "description": "The username for connecting to Bitcoin over RPC.",
+        "disabled": false,
+        "generate": null,
+        "immutable": false,
+        "inputmode": "text",
+        "masked": true,
+        "maxLength": null,
+        "minLength": null,
+        "name": "Username",
+        "patterns": [
+          {
+            "description": "Must be alphanumeric (can contain underscore).",
+            "regex": "^[a-zA-Z0-9_]+$",
+          },
+        ],
+        "placeholder": null,
+        "required": true,
+        "type": "text",
+        "warning": "You will need to restart all services that depend on Bitcoin.",
+      },
+    },
+    "type": "object",
+    "warning": null,
+  },
+  "txindex": {
+    "default": true,
+    "description": "By enabling Transaction Index (txindex) Bitcoin Core will build a complete transaction index. This allows Bitcoin Core to access any transaction with commands like \`gettransaction\`.",
+    "disabled": false,
+    "immutable": false,
+    "name": "Transaction Index",
+    "type": "toggle",
+    "warning": null,
+  },
+  "wallet": {
+    "description": "Wallet Settings",
+    "name": "Wallet",
+    "spec": {
+      "avoidpartialspends": {
+        "default": true,
+        "description": "Group outputs by address, selecting all or none, instead of selecting on a per-output basis. This improves privacy at the expense of higher transaction fees.",
+        "disabled": false,
+        "immutable": false,
+        "name": "Avoid Partial Spends",
+        "type": "toggle",
+        "warning": null,
+      },
+      "discardfee": {
+        "default": 0.0001,
+        "description": "The fee rate (in BTC/kB) that indicates your tolerance for discarding change by adding it to the fee.",
+        "disabled": false,
+        "immutable": false,
+        "integer": false,
+        "max": 0.01,
+        "min": null,
+        "name": "Discard Change Tolerance",
+        "placeholder": null,
+        "required": true,
+        "step": null,
+        "type": "number",
+        "units": "BTC/kB",
+        "warning": null,
+      },
+      "enable": {
+        "default": true,
+        "description": "Load the wallet and enable wallet RPC calls.",
+        "disabled": false,
+        "immutable": false,
+        "name": "Enable Wallet",
+        "type": "toggle",
+        "warning": null,
+      },
+    },
+    "type": "object",
+    "warning": null,
+  },
+  "zmq-enabled": {
+    "default": true,
+    "description": "The ZeroMQ interface is useful for some applications which might require data related to block and transaction events from Bitcoin Core. For example, LND requires ZeroMQ be enabled for LND to get the latest block data",
+    "disabled": false,
+    "immutable": false,
+    "name": "ZeroMQ Enabled",
+    "type": "toggle",
+    "warning": null,
+  },
+}
+`;
+
 exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
 {
   "homepage": {
@@ -212,6 +728,28 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
 }
 `;
 
+exports[`transformConfigSpec transformConfigSpec(nostr) 1`] = `
+{
+  "nostr-relay": {
+    "default": "wss://relay.getalby.com/v1",
+    "description": "The Nostr Relay to use for Nostr Wallet Connect connections",
+    "disabled": false,
+    "generate": null,
+    "immutable": false,
+    "inputmode": "text",
+    "masked": false,
+    "maxLength": null,
+    "minLength": null,
+    "name": "Nostr Relay",
+    "patterns": [],
+    "placeholder": null,
+    "required": true,
+    "type": "text",
+    "warning": null,
+  },
+}
+`;
+
 exports[`transformConfigSpec transformConfigSpec(searNXG) 1`] = `
 {
   "enable-metrics": {
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
index e3f463d03..79caef377 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
@@ -1,6 +1,8 @@
 import { matchOldConfigSpec, transformConfigSpec } from "./transformConfigSpec"
 import fixtureEmbasyPagesConfig from "./__fixtures__/embasyPagesConfig"
 import searNXG from "./__fixtures__/searNXG"
+import bitcoind from "./__fixtures__/bitcoind"
+import nostr from "./__fixtures__/nostr"
 
 describe("transformConfigSpec", () => {
   test("matchOldConfigSpec(embassyPages.homepage.variants[web-page])", () => {
@@ -20,4 +22,12 @@ describe("transformConfigSpec", () => {
     const spec = matchOldConfigSpec.unsafeCast(searNXG)
     expect(transformConfigSpec(spec)).toMatchSnapshot()
   })
+  test("transformConfigSpec(bitcoind)", () => {
+    const spec = matchOldConfigSpec.unsafeCast(bitcoind)
+    expect(transformConfigSpec(spec)).toMatchSnapshot()
+  })
+  test("transformConfigSpec(nostr)", () => {
+    const spec = matchOldConfigSpec.unsafeCast(nostr)
+    expect(transformConfigSpec(spec)).toMatchSnapshot()
+  })
 })
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
index 9a82d5c16..706e0b941 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -285,7 +285,7 @@ function getListSpec(
             : [],
         minLength: null,
         maxLength: null,
-        masked: oldVal.spec.masked,
+        masked: oldVal.spec.masked || false,
         generate: null,
         inputmode: "text",
         placeholder: oldVal.spec.placeholder || null,
@@ -301,7 +301,7 @@ function getListSpec(
         spec: transformConfigSpec(
           matchOldConfigSpec.unsafeCast(oldVal.spec.spec),
         ),
-        uniqueBy: oldVal.spec["unique-by"],
+        uniqueBy: oldVal.spec["unique-by"] || null,
         displayAs: oldVal.spec["display-as"] || null,
       },
     }
@@ -482,7 +482,7 @@ const matchOldListValueSpecObject = object(
     "unique-by": matchOldUniqueBy, // indicates whether duplicates can be permitted in the list
     "display-as": string, // this should be a handlebars template which can make use of the entire config which corresponds to 'spec'
   },
-  ["display-as"],
+  ["display-as", "unique-by"],
 )
 const matchOldListValueSpecString = object(
   {
@@ -492,7 +492,7 @@ const matchOldListValueSpecString = object(
     "pattern-description": string,
     placeholder: string,
   },
-  ["pattern", "pattern-description", "placeholder"],
+  ["pattern", "pattern-description", "placeholder", "copyable", "masked"],
 )
 
 const matchOldListValueSpecEnum = object({

From dafa6385588f793429f3b6d4072509709e535931 Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Mon, 29 Jul 2024 19:25:01 +0200
Subject: [PATCH 231/341] fix SSH Key message (#2686)

* fix SSH Key message

* Update web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
---
 .../ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts b/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts
index 5e474db0f..6cef44cba 100644
--- a/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts
@@ -80,7 +80,7 @@ const ADD_OPTIONS: Partial<TuiDialogOptions<{ message: string }>> = {
   label: 'SSH Key',
   data: {
     message:
-      'Enter the SSH public key you would like to authorize for root access to your Embassy.',
+      'Enter the SSH public key you would like to authorize for root access to your StartOS Server.',
   },
 }
 

From 08003c59b678180d95463097c3998e4da87e290b Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 11:15:25 -0600
Subject: [PATCH 232/341] don't lazily unmount unless on error

---
 core/startos/src/context/setup.rs    | 12 ------------
 core/startos/src/disk/main.rs        |  2 +-
 core/startos/src/disk/mount/guard.rs |  4 ++--
 core/startos/src/disk/mount/util.rs  | 13 ++++++++-----
 core/startos/src/init.rs             |  2 +-
 core/startos/src/lxc/mod.rs          |  6 +++++-
 6 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index de8dced07..999154977 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -100,18 +100,6 @@ impl SetupContext {
             .with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?;
         Ok(db)
     }
-    #[instrument(skip_all)]
-    pub async fn secret_store(&self) -> Result<PgPool, Error> {
-        init_postgres(&self.datadir).await?;
-        let secret_store =
-            PgPool::connect_with(PgConnectOptions::new().database("secrets").username("root"))
-                .await?;
-        sqlx::migrate!()
-            .run(&secret_store)
-            .await
-            .with_kind(crate::ErrorKind::Database)?;
-        Ok(secret_store)
-    }
 
     pub fn run_setup<F, Fut>(&self, f: F) -> Result<(), Error>
     where
diff --git a/core/startos/src/disk/main.rs b/core/startos/src/disk/main.rs
index 3a13c5dca..73aca4010 100644
--- a/core/startos/src/disk/main.rs
+++ b/core/startos/src/disk/main.rs
@@ -168,7 +168,7 @@ pub async fn create_all_fs<P: AsRef<Path>>(
 
 #[instrument(skip_all)]
 pub async fn unmount_fs<P: AsRef<Path>>(guid: &str, datadir: P, name: &str) -> Result<(), Error> {
-    unmount(datadir.as_ref().join(name)).await?;
+    unmount(datadir.as_ref().join(name), false).await?;
     if !guid.ends_with("_UNENC") {
         Command::new("cryptsetup")
             .arg("-q")
diff --git a/core/startos/src/disk/mount/guard.rs b/core/startos/src/disk/mount/guard.rs
index d6e7e3da1..a2d577226 100644
--- a/core/startos/src/disk/mount/guard.rs
+++ b/core/startos/src/disk/mount/guard.rs
@@ -74,7 +74,7 @@ impl MountGuard {
     }
     pub async fn unmount(mut self, delete_mountpoint: bool) -> Result<(), Error> {
         if self.mounted {
-            unmount(&self.mountpoint).await?;
+            unmount(&self.mountpoint, false).await?;
             if delete_mountpoint {
                 match tokio::fs::remove_dir(&self.mountpoint).await {
                     Err(e) if e.raw_os_error() == Some(39) => Ok(()), // directory not empty
@@ -96,7 +96,7 @@ impl Drop for MountGuard {
     fn drop(&mut self) {
         if self.mounted {
             let mountpoint = std::mem::take(&mut self.mountpoint);
-            tokio::spawn(async move { unmount(mountpoint).await.unwrap() });
+            tokio::spawn(async move { unmount(mountpoint, true).await.unwrap() });
         }
     }
 }
diff --git a/core/startos/src/disk/mount/util.rs b/core/startos/src/disk/mount/util.rs
index e93ceb7dd..674f33304 100644
--- a/core/startos/src/disk/mount/util.rs
+++ b/core/startos/src/disk/mount/util.rs
@@ -23,7 +23,7 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
         .status()
         .await?;
     if is_mountpoint.success() {
-        unmount(dst.as_ref()).await?;
+        unmount(dst.as_ref(), true).await?;
     }
     tokio::fs::create_dir_all(&src).await?;
     tokio::fs::create_dir_all(&dst).await?;
@@ -41,11 +41,14 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
 }
 
 #[instrument(skip_all)]
-pub async fn unmount<P: AsRef<Path>>(mountpoint: P) -> Result<(), Error> {
+pub async fn unmount<P: AsRef<Path>>(mountpoint: P, lazy: bool) -> Result<(), Error> {
     tracing::debug!("Unmounting {}.", mountpoint.as_ref().display());
-    tokio::process::Command::new("umount")
-        .arg("-Rl")
-        .arg(mountpoint.as_ref())
+    let mut cmd = tokio::process::Command::new("umount");
+    cmd.arg("-R");
+    if lazy {
+        cmd.arg("-l");
+    }
+    cmd.arg(mountpoint.as_ref())
         .invoke(crate::ErrorKind::Filesystem)
         .await?;
     Ok(())
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 7b944ebe3..e6b7be598 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -65,7 +65,7 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
         .await?
         .success()
     {
-        unmount("/var/lib/postgresql").await?;
+        unmount("/var/lib/postgresql", true).await?;
     }
     let exists = tokio::fs::metadata(&db_dir).await.is_ok();
     if !exists {
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 99f019d5a..8b8cab9a0 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -123,7 +123,11 @@ impl LxcManager {
             if !expected.contains(&ContainerId::try_from(container)?) {
                 let rootfs_path = Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs");
                 if tokio::fs::metadata(&rootfs_path).await.is_ok() {
-                    unmount(Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs")).await?;
+                    unmount(
+                        Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs"),
+                        true,
+                    )
+                    .await?;
                     if tokio_stream::wrappers::ReadDirStream::new(
                         tokio::fs::read_dir(&rootfs_path).await?,
                     )

From ccbb68aa0cdb7f88b2b50f16db336954293f56f2 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 11:34:59 -0600
Subject: [PATCH 233/341] fix instructions on installed packages

---
 core/startos/src/net/static_server.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index cd93a9d65..f1da91851 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -272,9 +272,8 @@ fn s9pk_router(ctx: RpcContext) -> Router {
         .route("/installed/:s9pk/*path", {
             let ctx = ctx.clone();
             any(
-                |x::Path(s9pk): x::Path<String>,
-                 x::Path(path): x::Path<PathBuf>,
-                 x::Query(commitment): x::Query<Option<MerkleArchiveCommitment>>,
+                |x::Path((s9pk, path)): x::Path<(String, PathBuf)>,
+                 x::RawQuery(query): x::RawQuery,
                  request: Request| async move {
                     if_authorized(&ctx, request, |request| async {
                         let s9pk = S9pk::deserialize(
@@ -287,7 +286,12 @@ fn s9pk_router(ctx: RpcContext) -> Router {
                                 )
                                 .await?,
                             ),
-                            commitment.as_ref(),
+                            query
+                                .as_deref()
+                                .map(MerkleArchiveCommitment::from_query)
+                                .and_then(|a| a.transpose())
+                                .transpose()?
+                                .as_ref(),
                         )
                         .await?;
                         let (parts, _) = request.into_parts();

From 36cc9cc1ec14db6ebfd645cb33d70c7d6fdbfc42 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 12:20:13 -0600
Subject: [PATCH 234/341] fix firmware checker

---
 core/startos/src/firmware.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/startos/src/firmware.rs b/core/startos/src/firmware.rs
index 7e7b9d70f..a70cf9e47 100644
--- a/core/startos/src/firmware.rs
+++ b/core/startos/src/firmware.rs
@@ -13,8 +13,8 @@ use crate::util::Invoke;
 use crate::PLATFORM;
 
 /// Part of the Firmware, look there for more about
-#[derive(Clone, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
 pub struct VersionMatcher {
     /// Strip this prefix on the version matcher
     semver_prefix: Option<String>,
@@ -27,8 +27,8 @@ pub struct VersionMatcher {
 /// Inside a file that is firmware.json, we
 /// wanted a structure that could help decide what to do
 /// for each of the firmware versions
-#[derive(Clone, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
 pub struct Firmware {
     id: String,
     /// This is the platform(s) the firmware was built for
@@ -49,6 +49,7 @@ pub fn display_firmware_update_result(result: RequiresReboot) {
     }
 }
 
+#[instrument]
 pub async fn check_for_firmware_update() -> Result<Option<Firmware>, Error> {
     let system_product_name = String::from_utf8(
         Command::new("dmidecode")
@@ -118,6 +119,7 @@ pub async fn check_for_firmware_update() -> Result<Option<Firmware>, Error> {
 /// that the firmware was the correct and updated for
 /// systems like the Pure System that a new firmware
 /// was released and the updates where pushed through the pure os.
+#[instrument]
 pub async fn update_firmware(firmware: Firmware) -> Result<(), Error> {
     let id = &firmware.id;
     let firmware_dir = Path::new("/usr/lib/startos/firmware");

From 0bc6f972b234d7c8a5ed079cc7a34d9b37338f75 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 13:00:48 -0600
Subject: [PATCH 235/341] reserialize getConfig response for backwards
 compatibility

---
 .../Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts  | 2 +-
 .../src/Adapters/Systems/SystemForEmbassy/index.ts              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
index 9a643b39d..1134d198a 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
@@ -315,7 +315,7 @@ export default {
           },
         },
         variants: {
-          disabled: {},
+          disabled: undefined,
           automatic: {
             size: {
               type: "number",
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index ff5a6ee74..a7a30c34a 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -577,7 +577,7 @@ export class SystemForEmbassy implements System {
       if (!method) throw new Error("Expecting that the method getConfig exists")
       return (await method(polyfillEffects(effects, this.manifest)).then(
         (x) => {
-          if ("result" in x) return x.result
+          if ("result" in x) return JSON.parse(JSON.stringify(x.result))
           if ("error" in x) throw new Error("Error getting config: " + x.error)
           throw new Error("Error getting config: " + x["error-code"][1])
         },

From bca75a3ea4dbf04efdbf2035bed3ff48fd01c963 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 13:18:04 -0600
Subject: [PATCH 236/341] stop container before unmounting logs

---
 core/startos/src/lxc/mod.rs                   |  5 ++
 .../src/service/persistent_container.rs       | 56 ++++++++-----------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 8b8cab9a0..b8ce9c703 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -288,6 +288,11 @@ impl LxcContainer {
 
     #[instrument(skip_all)]
     pub async fn exit(mut self) -> Result<(), Error> {
+        Command::new("lxc-stop")
+            .arg("--name")
+            .arg(&**self.guid)
+            .invoke(ErrorKind::Lxc)
+            .await?;
         self.rpc_bind.take().unmount().await?;
         if let Some(log_mount) = self.log_mount.take() {
             log_mount.unmount(true).await?;
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index e1324b307..23f01605e 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -391,39 +391,31 @@ impl PersistentContainer {
         let overlays = self.overlays.clone();
         let lxc_container = self.lxc_container.take();
         self.destroyed = true;
-        Some(
-            async move {
-                dbg!(
-                    async move {
-                        let mut errs = ErrorCollection::new();
-                        if let Some((hdl, shutdown)) = rpc_server {
-                            errs.handle(rpc_client.request(rpc::Exit, Empty {}).await);
-                            shutdown.shutdown();
-                            errs.handle(hdl.await.with_kind(ErrorKind::Cancelled));
-                        }
-                        for (_, volume) in volumes {
-                            errs.handle(volume.unmount(true).await);
-                        }
-                        for (_, assets) in assets {
-                            errs.handle(assets.unmount(true).await);
-                        }
-                        for (_, overlay) in std::mem::take(&mut *overlays.lock().await) {
-                            errs.handle(overlay.unmount(true).await);
-                        }
-                        for (_, images) in images {
-                            errs.handle(images.unmount().await);
-                        }
-                        errs.handle(js_mount.unmount(true).await);
-                        if let Some(lxc_container) = lxc_container {
-                            errs.handle(lxc_container.exit().await);
-                        }
-                        dbg!(errs.into_result())
-                    }
-                    .await
-                )
+        Some(async move {
+            let mut errs = ErrorCollection::new();
+            if let Some((hdl, shutdown)) = rpc_server {
+                errs.handle(rpc_client.request(rpc::Exit, Empty {}).await);
+                shutdown.shutdown();
+                errs.handle(hdl.await.with_kind(ErrorKind::Cancelled));
             }
-            .map(|a| dbg!(a)),
-        )
+            for (_, volume) in volumes {
+                errs.handle(volume.unmount(true).await);
+            }
+            for (_, assets) in assets {
+                errs.handle(assets.unmount(true).await);
+            }
+            for (_, overlay) in std::mem::take(&mut *overlays.lock().await) {
+                errs.handle(overlay.unmount(true).await);
+            }
+            for (_, images) in images {
+                errs.handle(images.unmount().await);
+            }
+            errs.handle(js_mount.unmount(true).await);
+            if let Some(lxc_container) = lxc_container {
+                errs.handle(lxc_container.exit().await);
+            }
+            errs.into_result()
+        })
     }
 
     #[instrument(skip_all)]

From 5c153c9e2121b810d5da562d722f318edd192941 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 18:44:56 -0600
Subject: [PATCH 237/341] improve install performance

---
 core/models/src/errors.rs          | 24 ++++++++
 core/startos/src/install/mod.rs    |  2 +-
 core/startos/src/registry/asset.rs | 42 +++++++++++++-
 core/startos/src/upload.rs         | 92 +++++++++++++++---------------
 4 files changed, 111 insertions(+), 49 deletions(-)

diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index 8bbc705ee..ee6b0ae12 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -490,6 +490,7 @@ where
 {
     fn with_kind(self, kind: ErrorKind) -> Result<T, Error>;
     fn with_ctx<F: FnOnce(&E) -> (ErrorKind, D), D: Display>(self, f: F) -> Result<T, Error>;
+    fn log_err(self) -> Option<T>;
 }
 impl<T, E> ResultExt<T, E> for Result<T, E>
 where
@@ -516,6 +517,18 @@ where
             }
         })
     }
+
+    fn log_err(self) -> Option<T> {
+        match self {
+            Ok(a) => Some(a),
+            Err(e) => {
+                let e: color_eyre::eyre::Error = e.into();
+                tracing::error!("{e}");
+                tracing::debug!("{e:?}");
+                None
+            }
+        }
+    }
 }
 impl<T> ResultExt<T, Error> for Result<T, Error> {
     fn with_kind(self, kind: ErrorKind) -> Result<T, Error> {
@@ -539,6 +552,17 @@ impl<T> ResultExt<T, Error> for Result<T, Error> {
             }
         })
     }
+
+    fn log_err(self) -> Option<T> {
+        match self {
+            Ok(a) => Some(a),
+            Err(e) => {
+                tracing::error!("{e}");
+                tracing::debug!("{e:?}");
+                None
+            }
+        }
+    }
 }
 
 pub trait OptionExt<T>
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 8d4f65312..7a545a3aa 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -157,7 +157,7 @@ pub async fn install(
         .services
         .install(
             ctx.clone(),
-            || asset.deserialize_s9pk(ctx.client.clone()),
+            || asset.deserialize_s9pk_buffered(ctx.client.clone()),
             None::<Never>,
             None,
         )
diff --git a/core/startos/src/registry/asset.rs b/core/startos/src/registry/asset.rs
index 7697a0c99..fb6dd59fc 100644
--- a/core/startos/src/registry/asset.rs
+++ b/core/startos/src/registry/asset.rs
@@ -2,6 +2,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use chrono::{DateTime, Utc};
+use helpers::NonDetachingJoinHandle;
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWrite;
@@ -14,8 +15,9 @@ use crate::registry::signer::commitment::{Commitment, Digestable};
 use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey};
 use crate::registry::signer::AcceptSigners;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
-use crate::s9pk::merkle_archive::source::Section;
+use crate::s9pk::merkle_archive::source::{ArchiveSource, Section};
 use crate::s9pk::S9pk;
+use crate::upload::UploadingFile;
 
 #[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
@@ -70,4 +72,42 @@ impl RegistryAsset<MerkleArchiveCommitment> {
         )
         .await
     }
+    pub async fn deserialize_s9pk_buffered(
+        &self,
+        client: Client,
+    ) -> Result<S9pk<Section<Arc<BufferedHttpSource>>>, Error> {
+        S9pk::deserialize(
+            &Arc::new(BufferedHttpSource::new(client, self.url.clone()).await?),
+            Some(&self.commitment),
+        )
+        .await
+    }
+}
+
+pub struct BufferedHttpSource {
+    _download: NonDetachingJoinHandle<()>,
+    file: UploadingFile,
+}
+impl BufferedHttpSource {
+    pub async fn new(client: Client, url: Url) -> Result<Self, Error> {
+        let (mut handle, file) = UploadingFile::new().await?;
+        let response = client.get(url).send().await?;
+        Ok(Self {
+            _download: tokio::spawn(async move { handle.download(response).await }).into(),
+            file,
+        })
+    }
+}
+impl ArchiveSource for BufferedHttpSource {
+    type FetchReader = <UploadingFile as ArchiveSource>::FetchReader;
+    type FetchAllReader = <UploadingFile as ArchiveSource>::FetchAllReader;
+    async fn size(&self) -> Option<u64> {
+        self.file.size().await
+    }
+    async fn fetch_all(&self) -> Result<Self::FetchAllReader, Error> {
+        self.file.fetch_all().await
+    }
+    async fn fetch(&self, position: u64, size: u64) -> Result<Self::FetchReader, Error> {
+        self.file.fetch(position, size).await
+    }
 }
diff --git a/core/startos/src/upload.rs b/core/startos/src/upload.rs
index 4735a63fb..20f294400 100644
--- a/core/startos/src/upload.rs
+++ b/core/startos/src/upload.rs
@@ -5,10 +5,12 @@ use std::task::Poll;
 use std::time::Duration;
 
 use axum::body::Body;
+use axum::extract::Request;
 use axum::response::Response;
-use futures::{ready, FutureExt, StreamExt};
+use bytes::Bytes;
+use futures::{ready, FutureExt, Stream, StreamExt};
 use http::header::CONTENT_LENGTH;
-use http::StatusCode;
+use http::{HeaderMap, StatusCode};
 use imbl_value::InternedString;
 use tokio::fs::File;
 use tokio::io::{AsyncRead, AsyncSeek, AsyncSeekExt, AsyncWrite, AsyncWriteExt};
@@ -34,51 +36,7 @@ pub async fn upload(
                 ctx,
                 session,
                 |request| async move {
-                    let headers = request.headers();
-                    let content_length = match headers.get(CONTENT_LENGTH).map(|a| a.to_str()) {
-                        None => {
-                            return Response::builder()
-                                .status(StatusCode::BAD_REQUEST)
-                                .body(Body::from("Content-Length is required"))
-                                .with_kind(ErrorKind::Network)
-                        }
-                        Some(Err(_)) => {
-                            return Response::builder()
-                                .status(StatusCode::BAD_REQUEST)
-                                .body(Body::from("Invalid Content-Length"))
-                                .with_kind(ErrorKind::Network)
-                        }
-                        Some(Ok(a)) => match a.parse::<u64>() {
-                            Err(_) => {
-                                return Response::builder()
-                                    .status(StatusCode::BAD_REQUEST)
-                                    .body(Body::from("Invalid Content-Length"))
-                                    .with_kind(ErrorKind::Network)
-                            }
-                            Ok(a) => a,
-                        },
-                    };
-
-                    handle
-                        .progress
-                        .send_modify(|p| p.expected_size = Some(content_length));
-
-                    let mut body = request.into_body().into_data_stream();
-                    while let Some(next) = body.next().await {
-                        if let Err(e) = async {
-                            handle
-                                .write_all(&next.map_err(|e| {
-                                    std::io::Error::new(std::io::ErrorKind::Other, e)
-                                })?)
-                                .await?;
-                            Ok(())
-                        }
-                        .await
-                        {
-                            handle.progress.send_if_modified(|p| p.handle_error(&e));
-                            break;
-                        }
-                    }
+                    handle.upload(request).await;
 
                     Response::builder()
                         .status(StatusCode::NO_CONTENT)
@@ -364,6 +322,46 @@ pub struct UploadHandle {
     file: File,
     progress: watch::Sender<Progress>,
 }
+impl UploadHandle {
+    pub async fn upload(&mut self, request: Request) {
+        self.process_headers(request.headers());
+        self.process_body(request.into_body().into_data_stream())
+            .await;
+    }
+    pub async fn download(&mut self, response: reqwest::Response) {
+        self.process_headers(response.headers());
+        self.process_body(response.bytes_stream()).await;
+    }
+    fn process_headers(&mut self, headers: &HeaderMap) {
+        if let Some(content_length) = headers
+            .get(CONTENT_LENGTH)
+            .and_then(|a| a.to_str().log_err())
+            .and_then(|a| a.parse::<u64>().log_err())
+        {
+            self.progress
+                .send_modify(|p| p.expected_size = Some(content_length));
+        }
+    }
+    async fn process_body<E: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>>(
+        &mut self,
+        mut body: impl Stream<Item = Result<Bytes, E>> + Unpin,
+    ) {
+        while let Some(next) = body.next().await {
+            if let Err(e) = async {
+                self.write_all(
+                    &next.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
+                )
+                .await?;
+                Ok(())
+            }
+            .await
+            {
+                self.progress.send_if_modified(|p| p.handle_error(&e));
+                break;
+            }
+        }
+    }
+}
 #[pin_project::pinned_drop]
 impl PinnedDrop for UploadHandle {
     fn drop(self: Pin<&mut Self>) {

From 46b3f83ce2486d6dbdd2d85494ce93fa74426328 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 18:45:18 -0600
Subject: [PATCH 238/341] don't trim logs

---
 core/startos/src/logs.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 751dd243a..9cf234f5f 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -184,7 +184,13 @@ fn deserialize_log_message<'de, D: serde::de::Deserializer<'de>>(
         where
             E: serde::de::Error,
         {
-            Ok(v.trim().to_owned())
+            Ok(v.to_owned())
+        }
+        fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+        where
+            E: de::Error,
+        {
+            Ok(v)
         }
         fn visit_unit<E>(self) -> Result<Self::Value, E>
         where
@@ -202,7 +208,7 @@ fn deserialize_log_message<'de, D: serde::de::Deserializer<'de>>(
                     .flatten()
                     .collect::<Result<Vec<u8>, _>>()?,
             )
-            .map(|s| s.trim().to_owned())
+            .map(|s| s.to_owned())
             .map_err(serde::de::Error::custom)
         }
     }

From 1dd21f1f764e41c12a38d6ff3228f3883b86ea54 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 29 Jul 2024 18:45:49 -0600
Subject: [PATCH 239/341] fix config pointers

---
 container-runtime/package-lock.json           | 1176 ++++++++++++++---
 container-runtime/package.json                |    4 +-
 .../Systems/SystemForEmbassy/index.ts         |  193 ++-
 3 files changed, 1096 insertions(+), 277 deletions(-)

diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index eb7778c83..244ade9f4 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -15,7 +15,7 @@
         "esbuild-plugin-resolve": "^2.0.0",
         "filebrowser": "^1.0.0",
         "isomorphic-fetch": "^3.0.0",
-        "jest": "^29.7.0",
+        "jsonpath": "^1.1.1",
         "lodash.merge": "^4.6.2",
         "node-fetch": "^3.1.0",
         "ts-matches": "^5.5.1",
@@ -27,7 +27,9 @@
         "@swc/cli": "^0.1.62",
         "@swc/core": "^1.3.65",
         "@types/jest": "^29.5.12",
+        "@types/jsonpath": "^0.2.4",
         "@types/node": "^20.11.13",
+        "jest": "^29.7.0",
         "prettier": "^3.2.5",
         "ts-jest": "^29.2.3",
         "typescript": ">5.2"
@@ -64,6 +66,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -76,6 +79,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
       "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "dev": true,
       "dependencies": {
         "@babel/highlight": "^7.24.7",
         "picocolors": "^1.0.0"
@@ -88,6 +92,7 @@
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz",
       "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -96,6 +101,7 @@
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
       "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
+      "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.24.7",
@@ -125,6 +131,7 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
       "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -140,12 +147,14 @@
     "node_modules/@babel/core/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -154,6 +163,7 @@
       "version": "7.24.10",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz",
       "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==",
+      "dev": true,
       "dependencies": {
         "@babel/types": "^7.24.9",
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -168,6 +178,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
       "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==",
+      "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.24.8",
         "@babel/helper-validator-option": "^7.24.8",
@@ -183,6 +194,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -191,6 +203,7 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -198,12 +211,14 @@
     "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
     },
     "node_modules/@babel/helper-environment-visitor": {
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
       "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
+      "dev": true,
       "dependencies": {
         "@babel/types": "^7.24.7"
       },
@@ -215,6 +230,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
       "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
+      "dev": true,
       "dependencies": {
         "@babel/template": "^7.24.7",
         "@babel/types": "^7.24.7"
@@ -227,6 +243,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
       "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
+      "dev": true,
       "dependencies": {
         "@babel/types": "^7.24.7"
       },
@@ -238,6 +255,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
       "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "dev": true,
       "dependencies": {
         "@babel/traverse": "^7.24.7",
         "@babel/types": "^7.24.7"
@@ -250,6 +268,7 @@
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz",
       "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.24.7",
         "@babel/helper-module-imports": "^7.24.7",
@@ -268,6 +287,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
       "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -276,6 +296,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
       "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "dev": true,
       "dependencies": {
         "@babel/traverse": "^7.24.7",
         "@babel/types": "^7.24.7"
@@ -288,6 +309,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
       "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dev": true,
       "dependencies": {
         "@babel/types": "^7.24.7"
       },
@@ -299,6 +321,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
       "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -307,6 +330,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
       "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -315,6 +339,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
       "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -323,6 +348,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz",
       "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==",
+      "dev": true,
       "dependencies": {
         "@babel/template": "^7.24.7",
         "@babel/types": "^7.24.8"
@@ -335,6 +361,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
       "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.24.7",
         "chalk": "^2.4.2",
@@ -349,6 +376,7 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -360,6 +388,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -373,6 +402,7 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -380,12 +410,14 @@
     "node_modules/@babel/highlight/node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
     },
     "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -394,6 +426,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -402,6 +435,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -413,6 +447,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz",
       "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==",
+      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -424,6 +459,7 @@
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -435,6 +471,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -446,6 +483,7 @@
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -457,6 +495,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -468,6 +507,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -479,6 +519,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
       "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -493,6 +534,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -504,6 +546,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -515,6 +558,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -526,6 +570,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -537,6 +582,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -548,6 +594,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -559,6 +606,7 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -573,6 +621,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
       "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -587,6 +636,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
       "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.24.7",
         "@babel/parser": "^7.24.7",
@@ -600,6 +650,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz",
       "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.24.7",
         "@babel/generator": "^7.24.8",
@@ -620,6 +671,7 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
       "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -635,12 +687,14 @@
     "node_modules/@babel/traverse/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/@babel/types": {
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz",
       "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.24.8",
         "@babel/helper-validator-identifier": "^7.24.7",
@@ -653,7 +707,8 @@
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
     },
     "node_modules/@iarna/toml": {
       "version": "2.2.5",
@@ -663,6 +718,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -678,6 +734,7 @@
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -686,6 +743,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -702,6 +760,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
       "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/reporters": "^29.7.0",
@@ -748,6 +807,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
       "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "dev": true,
       "dependencies": {
         "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -762,6 +822,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "dev": true,
       "dependencies": {
         "expect": "^29.7.0",
         "jest-snapshot": "^29.7.0"
@@ -774,6 +835,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
       "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3"
       },
@@ -785,6 +847,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
       "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
@@ -801,6 +864,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -815,6 +879,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^29.7.0",
@@ -857,6 +922,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
       "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -868,6 +934,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
@@ -881,6 +948,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -895,6 +963,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "dev": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -909,6 +978,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
       "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/types": "^29.6.3",
@@ -934,6 +1004,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
       "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -950,6 +1021,7 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
       "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -963,6 +1035,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -971,6 +1044,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -978,12 +1052,14 @@
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -1064,7 +1140,8 @@
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
     },
     "node_modules/@sindresorhus/is": {
       "version": "4.6.0",
@@ -1081,6 +1158,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
       "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
       "dependencies": {
         "type-detect": "4.0.8"
       }
@@ -1089,6 +1167,7 @@
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
       "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
       }
@@ -1228,6 +1307,7 @@
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -1240,6 +1320,7 @@
       "version": "7.6.8",
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
       "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dev": true,
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
@@ -1248,6 +1329,7 @@
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
@@ -1257,6 +1339,7 @@
       "version": "7.20.6",
       "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
       "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "dev": true,
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
@@ -1276,6 +1359,7 @@
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -1288,12 +1372,14 @@
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -1302,6 +1388,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
@@ -1316,6 +1403,13 @@
         "pretty-format": "^29.0.0"
       }
     },
+    "node_modules/@types/jsonpath": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@types/jsonpath/-/jsonpath-0.2.4.tgz",
+      "integrity": "sha512-K3hxB8Blw0qgW6ExKgMbXQv2UPZBoE2GqLpVY+yr7nMD2Pq86lsuIzyAaiQ7eMqFL5B6di6pxSkogLJEyEHoGA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
       "dev": true,
@@ -1326,6 +1420,7 @@
     },
     "node_modules/@types/node": {
       "version": "20.14.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -1342,12 +1437,14 @@
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true
     },
     "node_modules/@types/yargs": {
       "version": "17.0.32",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
       "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -1355,7 +1452,8 @@
     "node_modules/@types/yargs-parser": {
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -1372,6 +1470,7 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -1386,6 +1485,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1394,6 +1494,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1408,6 +1509,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -1439,6 +1541,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -1457,6 +1560,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
       "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dev": true,
       "dependencies": {
         "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
@@ -1477,6 +1581,7 @@
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -1492,6 +1597,7 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
       "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -1507,6 +1613,7 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -1515,6 +1622,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
       "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "dev": true,
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -1529,6 +1637,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
       "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
@@ -1551,6 +1660,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
       "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "dev": true,
       "dependencies": {
         "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
@@ -1564,6 +1674,7 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/bin-check": {
@@ -1750,6 +1861,7 @@
     },
     "node_modules/braces": {
       "version": "3.0.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
@@ -1762,6 +1874,7 @@
       "version": "4.23.2",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
       "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -1805,6 +1918,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
       "dependencies": {
         "node-int64": "^0.4.0"
       }
@@ -1812,7 +1926,8 @@
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
     "node_modules/bytes": {
       "version": "3.1.2",
@@ -1881,6 +1996,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -1889,6 +2005,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -1897,6 +2014,7 @@
       "version": "1.0.30001643",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
       "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -1916,6 +2034,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -1931,6 +2050,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -1939,6 +2059,7 @@
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
       "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -1952,12 +2073,14 @@
     "node_modules/cjs-module-lexer": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
-      "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q=="
+      "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
+      "dev": true
     },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -1982,6 +2105,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -1990,12 +2114,14 @@
     "node_modules/collect-v8-coverage": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+      "dev": true
     },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -2006,7 +2132,8 @@
     "node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/commander": {
       "version": "7.2.0",
@@ -2019,7 +2146,8 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
@@ -2041,7 +2169,8 @@
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
     },
     "node_modules/cookie": {
       "version": "0.6.0",
@@ -2058,6 +2187,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
       "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -2127,6 +2257,7 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
       "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "dev": true,
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
       },
@@ -2136,10 +2267,17 @@
         }
       }
     },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "license": "MIT"
+    },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2186,6 +2324,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2194,6 +2333,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
       "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -2220,12 +2360,14 @@
     "node_modules/electron-to-chromium": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz",
-      "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ=="
+      "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==",
+      "dev": true
     },
     "node_modules/emittery": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
       "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -2236,7 +2378,8 @@
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
@@ -2257,6 +2400,7 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
@@ -2286,6 +2430,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
       "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -2305,6 +2450,38 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -2317,6 +2494,24 @@
         "node": ">=4"
       }
     },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/etag": {
       "version": "1.8.1",
       "license": "MIT",
@@ -2356,6 +2551,7 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -2364,6 +2560,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "dev": true,
       "dependencies": {
         "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
@@ -2456,7 +2653,14 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "license": "MIT"
     },
     "node_modules/fastq": {
       "version": "1.17.1",
@@ -2470,6 +2674,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
       "dependencies": {
         "bser": "2.1.1"
       }
@@ -2574,6 +2779,7 @@
     },
     "node_modules/fill-range": {
       "version": "7.1.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -2602,6 +2808,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -2651,12 +2858,14 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -2677,6 +2886,7 @@
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -2685,6 +2895,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -2710,6 +2921,7 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
       "engines": {
         "node": ">=8.0.0"
       }
@@ -2727,6 +2939,7 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -2757,6 +2970,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2766,6 +2980,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -2777,6 +2992,7 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -2818,12 +3034,14 @@
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
     },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2871,7 +3089,8 @@
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
     },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
@@ -2906,6 +3125,7 @@
     },
     "node_modules/human-signals": {
       "version": "2.1.0",
+      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
@@ -2944,6 +3164,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
       "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dev": true,
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -2962,6 +3183,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -2971,6 +3193,7 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -2990,12 +3213,14 @@
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
     },
     "node_modules/is-core-module": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
       "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+      "dev": true,
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -3018,6 +3243,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3026,6 +3252,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -3043,6 +3270,7 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
@@ -3066,6 +3294,7 @@
     },
     "node_modules/isexe": {
       "version": "2.0.0",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/isomorphic-fetch": {
@@ -3098,6 +3327,7 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3106,6 +3336,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
       "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.23.9",
         "@babel/parser": "^7.23.9",
@@ -3121,6 +3352,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -3134,6 +3366,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -3147,6 +3380,7 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
       "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -3162,12 +3396,14 @@
     "node_modules/istanbul-lib-source-maps/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3176,6 +3412,7 @@
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -3228,6 +3465,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
       "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dev": true,
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -3253,6 +3491,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
       "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dev": true,
       "dependencies": {
         "execa": "^5.0.0",
         "jest-util": "^29.7.0",
@@ -3266,6 +3505,7 @@
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -3279,6 +3519,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -3301,6 +3542,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -3312,6 +3554,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -3323,6 +3566,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -3334,6 +3578,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3342,6 +3587,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -3353,6 +3599,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3361,6 +3608,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -3375,6 +3623,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -3405,6 +3654,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
       "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dev": true,
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/test-result": "^29.7.0",
@@ -3437,6 +3687,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/test-sequencer": "^29.7.0",
@@ -3481,6 +3732,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
       "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.6.3",
@@ -3495,6 +3747,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
       "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "dev": true,
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
@@ -3506,6 +3759,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
       "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -3521,6 +3775,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
       "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -3537,6 +3792,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
       "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -3545,6 +3801,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
       "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
@@ -3569,6 +3826,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.7.0"
@@ -3581,6 +3839,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
       "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "jest-diff": "^29.7.0",
@@ -3595,6 +3854,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
       "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^29.6.3",
@@ -3614,6 +3874,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
       "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -3627,6 +3888,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       },
@@ -3643,6 +3905,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
       "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -3651,6 +3914,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
       "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
@@ -3670,6 +3934,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
       "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "dev": true,
       "dependencies": {
         "jest-regex-util": "^29.6.3",
         "jest-snapshot": "^29.7.0"
@@ -3682,6 +3947,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/environment": "^29.7.0",
@@ -3713,6 +3979,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -3745,6 +4012,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
@@ -3775,6 +4043,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
       "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -3791,6 +4060,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
       "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
@@ -3807,6 +4077,7 @@
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -3818,6 +4089,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "dev": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -3836,6 +4108,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "dev": true,
       "dependencies": {
         "@types/node": "*",
         "jest-util": "^29.7.0",
@@ -3850,6 +4123,7 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -3863,12 +4137,14 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
     },
     "node_modules/js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -3881,6 +4157,7 @@
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -3896,12 +4173,14 @@
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
     },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -3909,19 +4188,43 @@
         "node": ">=6"
       }
     },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "dev": true,
+    "node_modules/jsonpath": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz",
+      "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==",
       "license": "MIT",
       "dependencies": {
-        "json-buffer": "3.0.1"
+        "esprima": "1.2.2",
+        "static-eval": "2.0.2",
+        "underscore": "1.12.1"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "engines": {
+    "node_modules/jsonpath/node_modules/esprima": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz",
+      "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
         "node": ">=6"
       }
     },
@@ -3929,19 +4232,35 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -3981,6 +4300,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -4001,6 +4321,7 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
       "dependencies": {
         "tmpl": "1.0.5"
       }
@@ -4018,6 +4339,7 @@
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/merge2": {
@@ -4037,6 +4359,7 @@
     },
     "node_modules/micromatch": {
       "version": "4.0.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -4075,6 +4398,7 @@
     },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -4109,7 +4433,8 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
@@ -4154,17 +4479,20 @@
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true
     },
     "node_modules/node-releases": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4210,6 +4538,7 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -4217,6 +4546,7 @@
     },
     "node_modules/onetime": {
       "version": "5.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
@@ -4228,6 +4558,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "license": "MIT",
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/os-filter-obj": {
       "version": "2.0.0",
       "dev": true,
@@ -4259,6 +4606,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -4273,6 +4621,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -4284,6 +4633,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -4298,6 +4648,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -4306,6 +4657,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -4330,6 +4682,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -4338,6 +4691,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4353,7 +4707,8 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
@@ -4374,10 +4729,12 @@
     "node_modules/picocolors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -4398,6 +4755,7 @@
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
       "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true,
       "engines": {
         "node": ">= 6"
       }
@@ -4406,6 +4764,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -4413,6 +4772,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/prettier": {
       "version": "3.3.2",
       "dev": true,
@@ -4431,6 +4798,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -4444,6 +4812,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -4455,6 +4824,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -4492,6 +4862,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
       "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -4569,7 +4940,8 @@
     "node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true
     },
     "node_modules/readable-stream": {
       "version": "3.6.2",
@@ -4603,6 +4975,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4611,6 +4984,7 @@
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -4632,6 +5006,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
       "dependencies": {
         "resolve-from": "^5.0.0"
       },
@@ -4643,6 +5018,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -4651,6 +5027,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
       "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -4721,6 +5098,7 @@
     },
     "node_modules/semver": {
       "version": "7.6.2",
+      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -4849,15 +5227,18 @@
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
     },
     "node_modules/slash": {
       "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -4897,6 +5278,7 @@
       "version": "0.5.13",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -4906,6 +5288,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4913,12 +5296,14 @@
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
     },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -4930,10 +5315,20 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/static-eval": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+      "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+      "license": "MIT",
+      "dependencies": {
+        "escodegen": "^1.8.1"
+      }
+    },
     "node_modules/statuses": {
       "version": "2.0.1",
       "license": "MIT",
@@ -4953,6 +5348,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -4965,6 +5361,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -4978,6 +5375,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -4989,6 +5387,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -5003,6 +5402,7 @@
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -5012,6 +5412,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -5050,6 +5451,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -5061,6 +5463,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -5072,6 +5475,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -5085,6 +5489,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -5094,6 +5499,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -5104,18 +5510,21 @@
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -5218,10 +5627,23 @@
       "version": "2.6.3",
       "license": "0BSD"
     },
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -5230,6 +5652,7 @@
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -5260,8 +5683,15 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==",
+      "license": "MIT"
+    },
     "node_modules/undici-types": {
       "version": "5.26.5",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/unpipe": {
@@ -5275,6 +5705,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
       "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -5316,6 +5747,7 @@
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
       "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+      "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -5336,6 +5768,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
       "dependencies": {
         "makeerror": "1.0.12"
       }
@@ -5374,10 +5807,20 @@
         "which": "bin/which"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -5392,12 +5835,14 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/write-file-atomic": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
       "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
@@ -5410,6 +5855,7 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -5433,6 +5879,7 @@
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -5450,6 +5897,7 @@
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       }
@@ -5458,6 +5906,7 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -5471,6 +5920,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -5480,6 +5930,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
       "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "dev": true,
       "requires": {
         "@babel/highlight": "^7.24.7",
         "picocolors": "^1.0.0"
@@ -5488,12 +5939,14 @@
     "@babel/compat-data": {
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz",
-      "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng=="
+      "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==",
+      "dev": true
     },
     "@babel/core": {
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
       "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
+      "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.24.7",
@@ -5516,6 +5969,7 @@
           "version": "4.3.5",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
           "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -5523,12 +5977,14 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         },
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "dev": true
         }
       }
     },
@@ -5536,6 +5992,7 @@
       "version": "7.24.10",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz",
       "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.24.9",
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -5547,6 +6004,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
       "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==",
+      "dev": true,
       "requires": {
         "@babel/compat-data": "^7.24.8",
         "@babel/helper-validator-option": "^7.24.8",
@@ -5559,6 +6017,7 @@
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
           "requires": {
             "yallist": "^3.0.2"
           }
@@ -5566,12 +6025,14 @@
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "dev": true
         },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
@@ -5579,6 +6040,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
       "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.24.7"
       }
@@ -5587,6 +6049,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
       "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
+      "dev": true,
       "requires": {
         "@babel/template": "^7.24.7",
         "@babel/types": "^7.24.7"
@@ -5596,6 +6059,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
       "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.24.7"
       }
@@ -5604,6 +6068,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
       "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "dev": true,
       "requires": {
         "@babel/traverse": "^7.24.7",
         "@babel/types": "^7.24.7"
@@ -5613,6 +6078,7 @@
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz",
       "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==",
+      "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.24.7",
         "@babel/helper-module-imports": "^7.24.7",
@@ -5624,12 +6090,14 @@
     "@babel/helper-plugin-utils": {
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg=="
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+      "dev": true
     },
     "@babel/helper-simple-access": {
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
       "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "dev": true,
       "requires": {
         "@babel/traverse": "^7.24.7",
         "@babel/types": "^7.24.7"
@@ -5639,6 +6107,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
       "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.24.7"
       }
@@ -5646,22 +6115,26 @@
     "@babel/helper-string-parser": {
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ=="
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "dev": true
     },
     "@babel/helper-validator-identifier": {
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "dev": true
     },
     "@babel/helper-validator-option": {
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q=="
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "dev": true
     },
     "@babel/helpers": {
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz",
       "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==",
+      "dev": true,
       "requires": {
         "@babel/template": "^7.24.7",
         "@babel/types": "^7.24.8"
@@ -5671,6 +6144,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
       "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.24.7",
         "chalk": "^2.4.2",
@@ -5682,6 +6156,7 @@
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
           "requires": {
             "color-convert": "^1.9.0"
           }
@@ -5690,6 +6165,7 @@
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
           "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
           "requires": {
             "ansi-styles": "^3.2.1",
             "escape-string-regexp": "^1.0.5",
@@ -5700,6 +6176,7 @@
           "version": "1.9.3",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
           "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
           "requires": {
             "color-name": "1.1.3"
           }
@@ -5707,22 +6184,26 @@
         "color-name": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+          "dev": true
         },
         "escape-string-regexp": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+          "dev": true
         },
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+          "dev": true
         },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
           "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
@@ -5732,12 +6213,14 @@
     "@babel/parser": {
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz",
-      "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w=="
+      "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==",
+      "dev": true
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -5746,6 +6229,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -5754,6 +6238,7 @@
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.12.13"
       }
@@ -5762,6 +6247,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
@@ -5770,6 +6256,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -5778,6 +6265,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
       "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.24.7"
       }
@@ -5786,6 +6274,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
@@ -5794,6 +6283,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -5802,6 +6292,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
@@ -5810,6 +6301,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -5818,6 +6310,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -5826,6 +6319,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -5834,6 +6328,7 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5"
       }
@@ -5842,6 +6337,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
       "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.24.7"
       }
@@ -5850,6 +6346,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
       "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.24.7",
         "@babel/parser": "^7.24.7",
@@ -5860,6 +6357,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz",
       "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.24.7",
         "@babel/generator": "^7.24.8",
@@ -5877,6 +6375,7 @@
           "version": "4.3.5",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
           "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -5884,7 +6383,8 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -5892,6 +6392,7 @@
       "version": "7.24.9",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz",
       "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==",
+      "dev": true,
       "requires": {
         "@babel/helper-string-parser": "^7.24.8",
         "@babel/helper-validator-identifier": "^7.24.7",
@@ -5901,7 +6402,8 @@
     "@bcoe/v8-coverage": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
     },
     "@iarna/toml": {
       "version": "2.2.5"
@@ -5910,6 +6412,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
       "requires": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -5921,12 +6424,14 @@
     "@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
     },
     "@jest/console": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -5940,6 +6445,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
       "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "dev": true,
       "requires": {
         "@jest/console": "^29.7.0",
         "@jest/reporters": "^29.7.0",
@@ -5975,6 +6481,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
       "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "dev": true,
       "requires": {
         "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -5986,6 +6493,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "dev": true,
       "requires": {
         "expect": "^29.7.0",
         "jest-snapshot": "^29.7.0"
@@ -5995,6 +6503,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
       "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "dev": true,
       "requires": {
         "jest-get-type": "^29.6.3"
       }
@@ -6003,6 +6512,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
       "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
@@ -6016,6 +6526,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "dev": true,
       "requires": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -6027,6 +6538,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^29.7.0",
@@ -6058,6 +6570,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
       "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
       "requires": {
         "@sinclair/typebox": "^0.27.8"
       }
@@ -6066,6 +6579,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+      "dev": true,
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
@@ -6076,6 +6590,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "dev": true,
       "requires": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -6087,6 +6602,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "dev": true,
       "requires": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -6098,6 +6614,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
       "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
         "@jest/types": "^29.6.3",
@@ -6120,6 +6637,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
       "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dev": true,
       "requires": {
         "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -6133,6 +6651,7 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
       "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
       "requires": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -6142,22 +6661,26 @@
     "@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true
     },
     "@jridgewell/set-array": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true
     },
     "@jridgewell/sourcemap-codec": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
     },
     "@jridgewell/trace-mapping": {
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
       "requires": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -6213,7 +6736,8 @@
     "@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
     },
     "@sindresorhus/is": {
       "version": "4.6.0",
@@ -6223,6 +6747,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
       "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
       "requires": {
         "type-detect": "4.0.8"
       }
@@ -6231,6 +6756,7 @@
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
       "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
       "requires": {
         "@sinonjs/commons": "^3.0.0"
       }
@@ -6325,6 +6851,7 @@
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
       "requires": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -6337,6 +6864,7 @@
       "version": "7.6.8",
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
       "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
@@ -6345,6 +6873,7 @@
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
@@ -6354,6 +6883,7 @@
       "version": "7.20.6",
       "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
       "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.20.7"
       }
@@ -6372,6 +6902,7 @@
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
       "requires": {
         "@types/node": "*"
       }
@@ -6383,12 +6914,14 @@
     "@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true
     },
     "@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -6397,6 +6930,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
       "requires": {
         "@types/istanbul-lib-report": "*"
       }
@@ -6411,6 +6945,12 @@
         "pretty-format": "^29.0.0"
       }
     },
+    "@types/jsonpath": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@types/jsonpath/-/jsonpath-0.2.4.tgz",
+      "integrity": "sha512-K3hxB8Blw0qgW6ExKgMbXQv2UPZBoE2GqLpVY+yr7nMD2Pq86lsuIzyAaiQ7eMqFL5B6di6pxSkogLJEyEHoGA==",
+      "dev": true
+    },
     "@types/keyv": {
       "version": "3.1.4",
       "dev": true,
@@ -6420,6 +6960,7 @@
     },
     "@types/node": {
       "version": "20.14.2",
+      "dev": true,
       "requires": {
         "undici-types": "~5.26.4"
       }
@@ -6434,12 +6975,14 @@
     "@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true
     },
     "@types/yargs": {
       "version": "17.0.32",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
       "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
@@ -6447,7 +6990,8 @@
     "@types/yargs-parser": {
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true
     },
     "accepts": {
       "version": "1.3.8",
@@ -6460,6 +7004,7 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
       "requires": {
         "type-fest": "^0.21.3"
       }
@@ -6467,12 +7012,14 @@
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
     },
     "ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "requires": {
         "color-convert": "^2.0.1"
       }
@@ -6481,6 +7028,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -6494,6 +7042,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -6511,6 +7060,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
       "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dev": true,
       "requires": {
         "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
@@ -6525,6 +7075,7 @@
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -6537,6 +7088,7 @@
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
           "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+          "dev": true,
           "requires": {
             "@babel/core": "^7.12.3",
             "@babel/parser": "^7.14.7",
@@ -6548,7 +7100,8 @@
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "dev": true
         }
       }
     },
@@ -6556,6 +7109,7 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
       "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -6567,6 +7121,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
       "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
       "requires": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
@@ -6586,13 +7141,15 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
       "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "dev": true,
       "requires": {
         "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
     "balanced-match": {
-      "version": "1.0.2"
+      "version": "1.0.2",
+      "dev": true
     },
     "bin-check": {
       "version": "4.1.0",
@@ -6708,6 +7265,7 @@
     },
     "braces": {
       "version": "3.0.3",
+      "dev": true,
       "requires": {
         "fill-range": "^7.1.1"
       }
@@ -6716,6 +7274,7 @@
       "version": "4.23.2",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz",
       "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==",
+      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001640",
         "electron-to-chromium": "^1.4.820",
@@ -6736,6 +7295,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
       "requires": {
         "node-int64": "^0.4.0"
       }
@@ -6743,7 +7303,8 @@
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
     "bytes": {
       "version": "3.1.2"
@@ -6787,22 +7348,26 @@
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
     },
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
     "caniuse-lite": {
       "version": "1.0.30001643",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
-      "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg=="
+      "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
+      "dev": true
     },
     "chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "requires": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -6811,22 +7376,26 @@
     "char-regex": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true
     },
     "ci-info": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ=="
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true
     },
     "cjs-module-lexer": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
-      "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q=="
+      "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
+      "dev": true
     },
     "cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
       "requires": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -6843,17 +7412,20 @@
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true
     },
     "collect-v8-coverage": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+      "dev": true
     },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "requires": {
         "color-name": "~1.1.4"
       }
@@ -6861,7 +7433,8 @@
     "color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "commander": {
       "version": "7.2.0",
@@ -6870,7 +7443,8 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "content-disposition": {
       "version": "0.5.4",
@@ -6884,7 +7458,8 @@
     "convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
     },
     "cookie": {
       "version": "0.6.0"
@@ -6896,6 +7471,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
       "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -6941,12 +7517,19 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
       "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "dev": true,
       "requires": {}
     },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+    },
     "deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true
     },
     "defer-to-connect": {
       "version": "2.0.1",
@@ -6969,12 +7552,14 @@
     "detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true
     },
     "diff-sequences": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q=="
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "dev": true
     },
     "ee-first": {
       "version": "1.1.1"
@@ -6991,17 +7576,20 @@
     "electron-to-chromium": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz",
-      "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ=="
+      "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==",
+      "dev": true
     },
     "emittery": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ=="
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true
     },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "encodeurl": {
       "version": "1.0.2"
@@ -7017,6 +7605,7 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
       "requires": {
         "is-arrayish": "^0.2.1"
       }
@@ -7036,7 +7625,8 @@
     "escalade": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA=="
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "dev": true
     },
     "escape-html": {
       "version": "1.0.3"
@@ -7045,11 +7635,41 @@
       "version": "5.0.0",
       "dev": true
     },
+    "escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "optional": true
+        }
+      }
+    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
     "etag": {
       "version": "1.8.1"
     },
@@ -7076,12 +7696,14 @@
     "exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true
     },
     "expect": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "dev": true,
       "requires": {
         "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
@@ -7155,7 +7777,13 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "fastq": {
       "version": "1.17.1",
@@ -7168,6 +7796,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
       "requires": {
         "bser": "2.1.1"
       }
@@ -7236,6 +7865,7 @@
     },
     "fill-range": {
       "version": "7.1.1",
+      "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -7256,6 +7886,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
       "requires": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -7283,12 +7914,14 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -7297,12 +7930,14 @@
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
     },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
     },
     "get-intrinsic": {
       "version": "1.2.4",
@@ -7317,7 +7952,8 @@
     "get-package-type": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
     },
     "get-stream": {
       "version": "3.0.0",
@@ -7327,6 +7963,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -7340,6 +7977,7 @@
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "dev": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7349,6 +7987,7 @@
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
           "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -7365,7 +8004,8 @@
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
     },
     "gopd": {
       "version": "1.0.1",
@@ -7393,12 +8033,14 @@
     "graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
     },
     "has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
     },
     "has-property-descriptors": {
       "version": "1.0.2",
@@ -7421,7 +8063,8 @@
     "html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
     },
     "http-cache-semantics": {
       "version": "4.1.1",
@@ -7446,7 +8089,8 @@
       }
     },
     "human-signals": {
-      "version": "2.1.0"
+      "version": "2.1.0",
+      "dev": true
     },
     "iconv-lite": {
       "version": "0.4.24",
@@ -7462,6 +8106,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
       "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dev": true,
       "requires": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -7470,12 +8115,14 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -7490,12 +8137,14 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
     },
     "is-core-module": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
       "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+      "dev": true,
       "requires": {
         "hasown": "^2.0.2"
       }
@@ -7507,12 +8156,14 @@
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
     },
     "is-generator-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true
     },
     "is-glob": {
       "version": "4.0.3",
@@ -7522,7 +8173,8 @@
       }
     },
     "is-number": {
-      "version": "7.0.0"
+      "version": "7.0.0",
+      "dev": true
     },
     "is-plain-obj": {
       "version": "1.1.0",
@@ -7533,7 +8185,8 @@
       "dev": true
     },
     "isexe": {
-      "version": "2.0.0"
+      "version": "2.0.0",
+      "dev": true
     },
     "isomorphic-fetch": {
       "version": "3.0.0",
@@ -7553,12 +8206,14 @@
     "istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true
     },
     "istanbul-lib-instrument": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
       "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.23.9",
         "@babel/parser": "^7.23.9",
@@ -7571,6 +8226,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
       "requires": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -7581,6 +8237,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
       "requires": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -7591,6 +8248,7 @@
           "version": "4.3.5",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
           "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -7598,12 +8256,14 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
@@ -7611,6 +8271,7 @@
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -7653,6 +8314,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
       "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dev": true,
       "requires": {
         "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -7664,6 +8326,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
       "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dev": true,
       "requires": {
         "execa": "^5.0.0",
         "jest-util": "^29.7.0",
@@ -7674,6 +8337,7 @@
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
           "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
           "requires": {
             "path-key": "^3.1.0",
             "shebang-command": "^2.0.0",
@@ -7684,6 +8348,7 @@
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
           "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+          "dev": true,
           "requires": {
             "cross-spawn": "^7.0.3",
             "get-stream": "^6.0.0",
@@ -7699,17 +8364,20 @@
         "get-stream": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
         },
         "is-stream": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
+          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+          "dev": true
         },
         "npm-run-path": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
           "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "dev": true,
           "requires": {
             "path-key": "^3.0.0"
           }
@@ -7717,12 +8385,14 @@
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
         },
         "shebang-command": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
           "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
           "requires": {
             "shebang-regex": "^3.0.0"
           }
@@ -7730,12 +8400,14 @@
         "shebang-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
         },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
           "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
           "requires": {
             "isexe": "^2.0.0"
           }
@@ -7746,6 +8418,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dev": true,
       "requires": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -7773,6 +8446,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
       "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dev": true,
       "requires": {
         "@jest/core": "^29.7.0",
         "@jest/test-result": "^29.7.0",
@@ -7791,6 +8465,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
         "@jest/test-sequencer": "^29.7.0",
@@ -7820,6 +8495,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
       "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.6.3",
@@ -7831,6 +8507,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
       "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "dev": true,
       "requires": {
         "detect-newline": "^3.0.0"
       }
@@ -7839,6 +8516,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
       "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -7851,6 +8529,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
       "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "dev": true,
       "requires": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -7863,12 +8542,14 @@
     "jest-get-type": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw=="
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "dev": true
     },
     "jest-haste-map": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
       "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
@@ -7888,6 +8569,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "dev": true,
       "requires": {
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.7.0"
@@ -7897,6 +8579,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
       "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "jest-diff": "^29.7.0",
@@ -7908,6 +8591,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
       "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^29.6.3",
@@ -7924,6 +8608,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
       "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -7934,17 +8619,20 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "dev": true,
       "requires": {}
     },
     "jest-regex-util": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg=="
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "dev": true
     },
     "jest-resolve": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
       "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
@@ -7961,6 +8649,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
       "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "dev": true,
       "requires": {
         "jest-regex-util": "^29.6.3",
         "jest-snapshot": "^29.7.0"
@@ -7970,6 +8659,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "dev": true,
       "requires": {
         "@jest/console": "^29.7.0",
         "@jest/environment": "^29.7.0",
@@ -7998,6 +8688,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dev": true,
       "requires": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -8027,6 +8718,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
@@ -8054,6 +8746,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
       "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -8067,6 +8760,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
       "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "dev": true,
       "requires": {
         "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
@@ -8079,7 +8773,8 @@
         "camelcase": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+          "dev": true
         }
       }
     },
@@ -8087,6 +8782,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "dev": true,
       "requires": {
         "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -8102,6 +8798,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "dev": true,
       "requires": {
         "@types/node": "*",
         "jest-util": "^29.7.0",
@@ -8113,6 +8810,7 @@
           "version": "8.1.1",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
           "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -8122,12 +8820,14 @@
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
     },
     "js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -8136,7 +8836,8 @@
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
     },
     "json-buffer": {
       "version": "3.0.1",
@@ -8145,12 +8846,31 @@
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
     },
     "json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
+    },
+    "jsonpath": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz",
+      "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==",
+      "requires": {
+        "esprima": "1.2.2",
+        "static-eval": "2.0.2",
+        "underscore": "1.12.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz",
+          "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A=="
+        }
+      }
     },
     "keyv": {
       "version": "4.5.4",
@@ -8162,22 +8882,35 @@
     "kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true
     },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
     },
     "lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
     "locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
       "requires": {
         "p-locate": "^4.1.0"
       }
@@ -8209,6 +8942,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
       "requires": {
         "semver": "^7.5.3"
       }
@@ -8223,6 +8957,7 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
       "requires": {
         "tmpl": "1.0.5"
       }
@@ -8234,7 +8969,8 @@
       "version": "1.0.1"
     },
     "merge-stream": {
-      "version": "2.0.0"
+      "version": "2.0.0",
+      "dev": true
     },
     "merge2": {
       "version": "1.4.1",
@@ -8245,6 +8981,7 @@
     },
     "micromatch": {
       "version": "4.0.7",
+      "dev": true,
       "requires": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -8263,7 +9000,8 @@
       }
     },
     "mimic-fn": {
-      "version": "2.1.0"
+      "version": "2.1.0",
+      "dev": true
     },
     "mimic-response": {
       "version": "1.0.1",
@@ -8282,7 +9020,8 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
     },
     "negotiator": {
       "version": "0.6.3"
@@ -8301,17 +9040,20 @@
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true
     },
     "node-releases": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true
     },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "normalize-url": {
       "version": "6.1.0",
@@ -8335,16 +9077,31 @@
     },
     "once": {
       "version": "1.4.0",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
     },
     "onetime": {
       "version": "5.1.2",
+      "dev": true,
       "requires": {
         "mimic-fn": "^2.1.0"
       }
     },
+    "optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      }
+    },
     "os-filter-obj": {
       "version": "2.0.0",
       "dev": true,
@@ -8364,6 +9121,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
       "requires": {
         "yocto-queue": "^0.1.0"
       }
@@ -8372,6 +9130,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
       "requires": {
         "p-limit": "^2.2.0"
       },
@@ -8380,6 +9139,7 @@
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
           "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
           "requires": {
             "p-try": "^2.0.0"
           }
@@ -8389,12 +9149,14 @@
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
     },
     "parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -8408,12 +9170,14 @@
     "path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true
     },
     "path-key": {
       "version": "2.0.1",
@@ -8422,7 +9186,8 @@
     "path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
     },
     "path-to-regexp": {
       "version": "0.1.7"
@@ -8434,10 +9199,12 @@
     "picocolors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
     },
     "picomatch": {
-      "version": "2.3.1"
+      "version": "2.3.1",
+      "dev": true
     },
     "pify": {
       "version": "2.3.0",
@@ -8446,16 +9213,23 @@
     "pirates": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg=="
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "dev": true
     },
     "pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
       "requires": {
         "find-up": "^4.0.0"
       }
     },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
+    },
     "prettier": {
       "version": "3.3.2",
       "dev": true
@@ -8464,6 +9238,7 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dev": true,
       "requires": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -8473,7 +9248,8 @@
         "ansi-styles": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
         }
       }
     },
@@ -8481,6 +9257,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
       "requires": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -8508,7 +9285,8 @@
     "pure-rand": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA=="
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "dev": true
     },
     "qs": {
       "version": "6.11.0",
@@ -8539,7 +9317,8 @@
     "react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true
     },
     "readable-stream": {
       "version": "3.6.2",
@@ -8560,12 +9339,14 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true
     },
     "resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
       "requires": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -8580,6 +9361,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
       "requires": {
         "resolve-from": "^5.0.0"
       }
@@ -8587,12 +9369,14 @@
     "resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true
     },
     "resolve.exports": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg=="
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true
     },
     "responselike": {
       "version": "2.0.1",
@@ -8619,7 +9403,8 @@
       "version": "2.1.2"
     },
     "semver": {
-      "version": "7.6.2"
+      "version": "7.6.2",
+      "dev": true
     },
     "semver-regex": {
       "version": "4.0.5",
@@ -8699,15 +9484,18 @@
       }
     },
     "signal-exit": {
-      "version": "3.0.7"
+      "version": "3.0.7",
+      "dev": true
     },
     "sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
     },
     "slash": {
-      "version": "3.0.0"
+      "version": "3.0.0",
+      "dev": true
     },
     "sort-keys": {
       "version": "1.1.2",
@@ -8731,6 +9519,7 @@
       "version": "0.5.13",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -8739,19 +9528,22 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
     },
     "stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -8759,10 +9551,19 @@
         "escape-string-regexp": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
         }
       }
     },
+    "static-eval": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+      "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+      "requires": {
+        "escodegen": "^1.8.1"
+      }
+    },
     "statuses": {
       "version": "2.0.1"
     },
@@ -8777,6 +9578,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
       "requires": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -8786,6 +9588,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -8796,6 +9599,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.1"
       }
@@ -8803,19 +9607,22 @@
     "strip-bom": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true
     },
     "strip-eof": {
       "version": "1.0.0",
       "dev": true
     },
     "strip-final-newline": {
-      "version": "2.0.0"
+      "version": "2.0.0",
+      "dev": true
     },
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
     },
     "strip-outer": {
       "version": "2.0.0",
@@ -8833,6 +9640,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "requires": {
         "has-flag": "^4.0.0"
       }
@@ -8840,12 +9648,14 @@
     "supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
     },
     "test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
       "requires": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -8856,6 +9666,7 @@
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "dev": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -8865,6 +9676,7 @@
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
           "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -8874,15 +9686,18 @@
     "tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true
     },
     "to-regex-range": {
       "version": "5.0.1",
+      "dev": true,
       "requires": {
         "is-number": "^7.0.0"
       }
@@ -8931,15 +9746,25 @@
     "tslib": {
       "version": "2.6.3"
     },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
     "type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
     },
     "type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true
     },
     "type-is": {
       "version": "1.6.18",
@@ -8952,8 +9777,14 @@
       "version": "5.4.5",
       "dev": true
     },
+    "underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+    },
     "undici-types": {
-      "version": "5.26.5"
+      "version": "5.26.5",
+      "dev": true
     },
     "unpipe": {
       "version": "1.0.0"
@@ -8962,6 +9793,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
       "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "dev": true,
       "requires": {
         "escalade": "^3.1.2",
         "picocolors": "^1.0.1"
@@ -8978,6 +9810,7 @@
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
       "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+      "dev": true,
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -8991,6 +9824,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
       "requires": {
         "makeerror": "1.0.12"
       }
@@ -9018,10 +9852,16 @@
         "isexe": "^2.0.0"
       }
     },
+    "word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
+    },
     "wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -9029,12 +9869,14 @@
       }
     },
     "wrappy": {
-      "version": "1.0.2"
+      "version": "1.0.2",
+      "dev": true
     },
     "write-file-atomic": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
       "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
@@ -9043,7 +9885,8 @@
     "y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true
     },
     "yallist": {
       "version": "2.1.2",
@@ -9056,6 +9899,7 @@
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
       "requires": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -9069,12 +9913,14 @@
     "yargs-parser": {
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true
     },
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
     }
   }
 }
diff --git a/container-runtime/package.json b/container-runtime/package.json
index 24e6a6fe6..0a8e4afa8 100644
--- a/container-runtime/package.json
+++ b/container-runtime/package.json
@@ -24,7 +24,7 @@
     "esbuild-plugin-resolve": "^2.0.0",
     "filebrowser": "^1.0.0",
     "isomorphic-fetch": "^3.0.0",
-    "jest": "^29.7.0",
+    "jsonpath": "^1.1.1",
     "lodash.merge": "^4.6.2",
     "node-fetch": "^3.1.0",
     "ts-matches": "^5.5.1",
@@ -36,7 +36,9 @@
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.65",
     "@types/jest": "^29.5.12",
+    "@types/jsonpath": "^0.2.4",
     "@types/node": "^20.11.13",
+    "jest": "^29.7.0",
     "prettier": "^3.2.5",
     "ts-jest": "^29.2.3",
     "typescript": ">5.2"
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index a7a30c34a..ffdb02988 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -49,6 +49,7 @@ import {
   transformOldConfigToNew,
 } from "./transformConfigSpec"
 import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+import { StorePath } from "@start9labs/start-sdk/cjs/lib/store/PathBuilder"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
@@ -58,7 +59,7 @@ const execFile = promisify(childProcess.execFile)
 
 const MANIFEST_LOCATION = "/usr/lib/startos/package/embassyManifest.json"
 export const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
-const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig"
+const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig" as StorePath
 
 const matchSetResult = object(
   {
@@ -597,6 +598,10 @@ export class SystemForEmbassy implements System {
       structuredClone(newConfigWithoutPointers as Record<string, unknown>),
     )
     await updateConfig(effects, this.manifest, spec, newConfig)
+    await effects.store.set({
+      path: EMBASSY_POINTER_PATH_PREFIX,
+      value: newConfig,
+    })
     const setConfigValue = this.manifest.config?.set
     if (!setConfigValue) return
     if (setConfigValue.type === "docker") {
@@ -826,52 +831,6 @@ export class SystemForEmbassy implements System {
       })) as any
     }
   }
-  private async dependenciesCheck(
-    effects: Effects,
-    id: string,
-    oldConfig: unknown,
-    timeoutMs: number | null,
-  ): Promise<any> {
-    const actionProcedure = this.manifest.dependencies?.[id]?.config?.check
-    if (!actionProcedure) return null
-    if (actionProcedure.type === "docker") {
-      const container = await DockerProcedureContainer.of(
-        effects,
-        this.manifest.id,
-        actionProcedure,
-        this.manifest.volumes,
-      )
-      return JSON.parse(
-        (
-          await container.execFail(
-            [
-              actionProcedure.entrypoint,
-              ...actionProcedure.args,
-              JSON.stringify(oldConfig),
-            ],
-            timeoutMs,
-          )
-        ).stdout.toString(),
-      )
-    } else if (actionProcedure.type === "script") {
-      const moduleCode = await this.moduleCode
-      const method = moduleCode.dependencies?.[id]?.check
-      if (!method)
-        throw new Error(
-          `Expecting that the method dependency check ${id} exists`,
-        )
-      return (await method(
-        polyfillEffects(effects, this.manifest),
-        oldConfig as any,
-      ).then((x) => {
-        if ("result" in x) return x.result
-        if ("error" in x) throw new Error("Error getting config: " + x.error)
-        throw new Error("Error getting config: " + x["error-code"][1])
-      })) as any
-    } else {
-      return {}
-    }
-  }
   private async dependenciesAutoconfig(
     effects: Effects,
     id: string,
@@ -957,84 +916,96 @@ type CleanConfigFromPointers<C, S> =
 async function updateConfig(
   effects: Effects,
   manifest: Manifest,
-  spec: unknown,
-  mutConfigValue: unknown,
+  spec: OldConfigSpec,
+  mutConfigValue: Record<string, unknown>,
 ) {
-  if (!dictionary([string, unknown]).test(spec)) return
-  if (!dictionary([string, unknown]).test(mutConfigValue)) return
   for (const key in spec) {
     const specValue = spec[key]
 
-    const newConfigValue = mutConfigValue[key]
-    if (matchSpec.test(specValue)) {
-      const updateObject = { spec: newConfigValue }
+    if (specValue.type === "object") {
       await updateConfig(
         effects,
         manifest,
-        { spec: specValue.spec },
-        updateObject,
+        specValue.spec as OldConfigSpec,
+        mutConfigValue[key] as Record<string, unknown>,
       )
-      mutConfigValue[key] = updateObject.spec
-    }
-    if (
-      matchVariants.test(specValue) &&
-      object({ tag: object({ id: string }) }).test(newConfigValue) &&
-      newConfigValue.tag.id in specValue.variants
-    ) {
-      // Not going to do anything on the variants...
-    }
-    if (!matchPointer.test(specValue)) continue
-    if (matchPointerConfig.test(specValue)) {
-      const configValue = (await effects.store.get({
-        packageId: specValue["package-id"],
-        callback() {},
-        path: `${EMBASSY_POINTER_PATH_PREFIX}${specValue.selector}` as any,
-      })) as any
-      mutConfigValue[key] = configValue
-    }
-    if (matchPointerPackage.test(specValue)) {
-      if (specValue.target === "tor-key")
-        throw new Error("This service uses an unsupported target TorKey")
-
-      const specInterface = specValue.interface
-      const serviceInterfaceId = extractServiceInterfaceId(
+    } else if (specValue.type === "list" && specValue.subtype === "object") {
+      const list = mutConfigValue[key] as unknown[]
+      for (let val of list) {
+        await updateConfig(
+          effects,
+          manifest,
+          { ...(specValue.spec as any), type: "object" as const },
+          val as Record<string, unknown>,
+        )
+      }
+    } else if (specValue.type === "union") {
+      const union = mutConfigValue[key] as Record<string, unknown>
+      await updateConfig(
+        effects,
         manifest,
-        specInterface,
+        specValue.variants[union[specValue.tag.id] as string] as OldConfigSpec,
+        mutConfigValue[key] as Record<string, unknown>,
       )
-      if (!serviceInterfaceId) {
-        mutConfigValue[key] = ""
-        return
-      }
-      const filled = await utils
-        .getServiceInterface(effects, {
+    } else if (
+      specValue.type === "pointer" &&
+      specValue.subtype === "package"
+    ) {
+      if (specValue.target === "config") {
+        const jp = require("jsonpath")
+        const remoteConfig = await effects.store.get({
           packageId: specValue["package-id"],
-          id: serviceInterfaceId,
+          callback: () => effects.restart(),
+          path: EMBASSY_POINTER_PATH_PREFIX,
         })
-        .once()
-        .catch((x) => {
-          console.error("Could not get the service interface", x)
-          return null
-        })
-      const catchFn = <X>(fn: () => X) => {
-        try {
-          return fn()
-        } catch (e) {
-          return undefined
+        console.debug(remoteConfig)
+        const configValue = specValue.multi
+          ? jp.query(remoteConfig, specValue.selector)
+          : jp.query(remoteConfig, specValue.selector, 1)[0]
+        mutConfigValue[key] = configValue === undefined ? null : configValue
+      } else if (specValue.target === "tor-key") {
+        throw new Error("This service uses an unsupported target TorKey")
+      } else {
+        const specInterface = specValue.interface
+        const serviceInterfaceId = extractServiceInterfaceId(
+          manifest,
+          specInterface,
+        )
+        if (!serviceInterfaceId) {
+          mutConfigValue[key] = ""
+          return
+        }
+        const filled = await utils
+          .getServiceInterface(effects, {
+            packageId: specValue["package-id"],
+            id: serviceInterfaceId,
+          })
+          .once()
+          .catch((x) => {
+            console.error("Could not get the service interface", x)
+            return null
+          })
+        const catchFn = <X>(fn: () => X) => {
+          try {
+            return fn()
+          } catch (e) {
+            return undefined
+          }
         }
+        const url: string =
+          filled === null || filled.addressInfo === null
+            ? ""
+            : catchFn(() =>
+                utils.hostnameInfoToAddress(
+                  specValue.target === "lan-address"
+                    ? filled.addressInfo!.localHostnames[0] ||
+                        filled.addressInfo!.onionHostnames[0]
+                    : filled.addressInfo!.onionHostnames[0] ||
+                        filled.addressInfo!.localHostnames[0],
+                ),
+              ) || ""
+        mutConfigValue[key] = url
       }
-      const url: string =
-        filled === null || filled.addressInfo === null
-          ? ""
-          : catchFn(() =>
-              utils.hostnameInfoToAddress(
-                specValue.target === "lan-address"
-                  ? filled.addressInfo!.localHostnames[0] ||
-                      filled.addressInfo!.onionHostnames[0]
-                  : filled.addressInfo!.onionHostnames[0] ||
-                      filled.addressInfo!.localHostnames[0],
-              ),
-            ) || ""
-      mutConfigValue[key] = url
     }
   }
 }

From 290a15bbd9ac17665bbe95b708a4acc05b2989c1 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Mon, 29 Jul 2024 22:42:17 -0600
Subject: [PATCH 240/341] remove sourceVersion and minor cleanup

---
 web/projects/marketplace/src/types.ts                 |  3 +--
 web/projects/ui/src/app/pages/init/init.service.ts    |  4 +---
 .../app/pages/server-routes/sideload/sideload.page.ts | 11 +++++------
 .../src/app/services/api/embassy-live-api.service.ts  |  4 +---
 .../ui/src/app/services/patch-db/patch-db-source.ts   |  2 +-
 web/projects/ui/src/app/services/state.service.ts     |  2 +-
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/web/projects/marketplace/src/types.ts b/web/projects/marketplace/src/types.ts
index e25aa59eb..9853cddbb 100644
--- a/web/projects/marketplace/src/types.ts
+++ b/web/projects/marketplace/src/types.ts
@@ -3,7 +3,6 @@ import { T } from '@start9labs/start-sdk'
 export type GetPackageReq = {
   id: string
   version: string | null
-  sourceVersion: null // @TODO what is this?
   otherVersions: 'short'
 }
 export type GetPackageRes = T.GetPackageResponse & {
@@ -13,9 +12,9 @@ export type GetPackageRes = T.GetPackageResponse & {
 export type GetPackagesReq = {
   id: null
   version: null
-  sourceVersion: null
   otherVersions: 'short'
 }
+
 export type GetPackagesRes = {
   [id: T.PackageId]: GetPackageRes
 }
diff --git a/web/projects/ui/src/app/pages/init/init.service.ts b/web/projects/ui/src/app/pages/init/init.service.ts
index 96bf656d3..c98c0b11c 100644
--- a/web/projects/ui/src/app/pages/init/init.service.ts
+++ b/web/projects/ui/src/app/pages/init/init.service.ts
@@ -58,9 +58,7 @@ export class InitService extends Observable<MappedProgress> {
       }
     }),
     catchError(e => {
-      // @TODO Alex this toast is presenting when we navigate away from init page. It seems other websockets exhibit the same behavior, but we never noticed because the error were not being caught and presented in this manner. It seems odd that unsubscribing from a websocket subject would be treated as an error.
-      // this.errorService.handleError(e)
-
+      console.error(e)
       return EMPTY
     }),
   )
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index a0da8609d..9e09aca62 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -138,8 +138,8 @@ export class SideloadPage {
     ).getUint32(0, false)
     await getPositions(start, end, file, positions, tocLength as any)
 
-    await this.getManifest(positions, file)
-    await this.getIcon(positions, file)
+    await this.getManifestV1(positions, file)
+    await this.getIconV1(positions, file)
   }
 
   async parseS9pkV2(file: File) {
@@ -148,7 +148,7 @@ export class SideloadPage {
     this.toUpload.icon = await s9pk.icon()
   }
 
-  async getManifest(positions: Positions, file: Blob) {
+  private async getManifestV1(positions: Positions, file: Blob) {
     const data = await blobToBuffer(
       file.slice(
         Number(positions['manifest'][0]),
@@ -158,12 +158,11 @@ export class SideloadPage {
     this.toUpload.manifest = await cbor.decode(data, true)
   }
 
-  async getIcon(positions: Positions, file: Blob) {
-    const contentType = '' // @TODO
+  private async getIconV1(positions: Positions, file: Blob) {
     const data = file.slice(
       Number(positions['icon'][0]),
       Number(positions['icon'][0]) + Number(positions['icon'][1]),
-      contentType,
+      '',
     )
     this.toUpload.icon = await blobToDataURL(data)
   }
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 87be49e36..7780670c0 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -38,7 +38,7 @@ export class LiveApiService extends ApiService {
     @Inject(PATCH_CACHE) private readonly cache$: Observable<Dump<DataModel>>,
   ) {
     super()
-    ;(window as any).rpcClient = this
+    ; (window as any).rpcClient = this
   }
 
   // for sideloading packages
@@ -321,7 +321,6 @@ export class LiveApiService extends ApiService {
     const params: GetPackageReq = {
       id,
       version: versionRange,
-      sourceVersion: null,
       otherVersions: 'short',
     }
 
@@ -335,7 +334,6 @@ export class LiveApiService extends ApiService {
     const params: GetPackagesReq = {
       id: null,
       version: null,
-      sourceVersion: null,
       otherVersions: 'short',
     }
 
diff --git a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
index 0b80370d0..d5ef3364e 100644
--- a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
+++ b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
@@ -41,7 +41,7 @@ export class PatchDbSource extends Observable<Update<DataModel>[]> {
     catchError((_, original$) => {
       this.state.retrigger()
 
-      // @TODO this is returning right away, but we need to wait until state emits again from the retrigger() above.
+      // @TODO Alex this is returning right away and crashing the browser, but we need to wait until state emits again from the retrigger() above.
       return this.state.pipe(
         filter(current => current === 'running'),
         take(1),
diff --git a/web/projects/ui/src/app/services/state.service.ts b/web/projects/ui/src/app/services/state.service.ts
index 33569a751..d1dd3b383 100644
--- a/web/projects/ui/src/app/services/state.service.ts
+++ b/web/projects/ui/src/app/services/state.service.ts
@@ -111,7 +111,7 @@ export class StateService extends Observable<RR.ServerState | null> {
         ),
       ),
     )
-    .subscribe() // @TODO shouldn't this be subscribed in app component with the others? Do we ever need to unsubscribe?
+    .subscribe() // @TODO Alex shouldn't this be subscribed in app component with the others? Do we ever need to unsubscribe?
 
   constructor() {
     super(subscriber => this.stream$.subscribe(subscriber))

From 89e327383ee5745dbabc13efc365fd8bcc31b08d Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Tue, 30 Jul 2024 09:09:35 -0600
Subject: [PATCH 241/341] remove file uploads from config

---
 .../form-control/form-control.component.html  |  1 -
 .../form/form-file/form-file.component.html   | 31 -------------
 .../form/form-file/form-file.component.scss   | 46 -------------------
 .../form/form-file/form-file.component.ts     | 11 -----
 .../ui/src/app/components/form/form.module.ts |  2 -
 .../ui/src/app/modals/config.component.ts     | 20 --------
 .../app/services/api/embassy-api.service.ts   |  2 -
 .../services/api/embassy-live-api.service.ts  |  9 ----
 .../services/api/embassy-mock-api.service.ts  |  5 --
 .../ui/src/app/services/form.service.ts       | 15 ------
 10 files changed, 142 deletions(-)
 delete mode 100644 web/projects/ui/src/app/components/form/form-file/form-file.component.html
 delete mode 100644 web/projects/ui/src/app/components/form/form-file/form-file.component.scss
 delete mode 100644 web/projects/ui/src/app/components/form/form-file/form-file.component.ts

diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.component.html b/web/projects/ui/src/app/components/form/form-control/form-control.component.html
index 614aae05c..731d64a63 100644
--- a/web/projects/ui/src/app/components/form/form-control/form-control.component.html
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.component.html
@@ -1,7 +1,6 @@
 <ng-container [ngSwitch]="spec.type">
   <form-color *ngSwitchCase="'color'"></form-color>
   <form-datetime *ngSwitchCase="'datetime'"></form-datetime>
-  <form-file *ngSwitchCase="'file'"></form-file>
   <form-multiselect *ngSwitchCase="'multiselect'"></form-multiselect>
   <form-number *ngSwitchCase="'number'"></form-number>
   <form-select *ngSwitchCase="'select'"></form-select>
diff --git a/web/projects/ui/src/app/components/form/form-file/form-file.component.html b/web/projects/ui/src/app/components/form/form-file/form-file.component.html
deleted file mode 100644
index 9e9c16613..000000000
--- a/web/projects/ui/src/app/components/form/form-file/form-file.component.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<tui-input-files
-  [pseudoInvalid]="invalid"
-  [(ngModel)]="value"
-  (focusedChange)="onFocus($event)"
->
-  <input tuiInputFiles [accept]="spec.extensions.join(',')" />
-  <ng-template let-drop>
-    <div class="template" [class.template_hidden]="drop">
-      <div class="label">
-        {{ spec.name }}
-        <span *ngIf="spec.required">*</span>
-        <tui-tooltip
-          *ngIf="spec.description"
-          [content]="spec.description"
-        ></tui-tooltip>
-      </div>
-      <tui-tag
-        *ngIf="value; else label"
-        class="file"
-        size="l"
-        [value]="value.name"
-        [removable]="true"
-        (edited)="value = null"
-      ></tui-tag>
-      <ng-template #label>
-        <small>Click or drop file here</small>
-      </ng-template>
-    </div>
-    <div class="drop" [class.drop_hidden]="!drop">Drop file here</div>
-  </ng-template>
-</tui-input-files>
diff --git a/web/projects/ui/src/app/components/form/form-file/form-file.component.scss b/web/projects/ui/src/app/components/form/form-file/form-file.component.scss
deleted file mode 100644
index 2e314972d..000000000
--- a/web/projects/ui/src/app/components/form/form-file/form-file.component.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@import '@taiga-ui/core/styles/taiga-ui-local';
-
-.template {
-  @include transition(opacity);
-
-  width: 100%;
-  display: flex;
-  align-items: center;
-  padding: 0 0.5rem;
-  font: var(--tui-font-text-m);
-  font-weight: bold;
-
-  &_hidden {
-    opacity: 0;
-  }
-}
-
-.drop {
-  @include fullsize();
-  @include transition(opacity);
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-
-  &_hidden {
-    opacity: 0;
-  }
-}
-
-.label {
-  display: flex;
-  align-items: center;
-  max-width: 50%;
-}
-
-small {
-  max-width: 50%;
-  font-weight: normal;
-  color: var(--tui-text-02);
-  margin-left: auto;
-}
-
-tui-tag {
-  z-index: 1;
-  margin: -0.25rem -0.25rem -0.25rem auto;
-}
diff --git a/web/projects/ui/src/app/components/form/form-file/form-file.component.ts b/web/projects/ui/src/app/components/form/form-file/form-file.component.ts
deleted file mode 100644
index 52d340fa6..000000000
--- a/web/projects/ui/src/app/components/form/form-file/form-file.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from '@angular/core'
-import { TuiFileLike } from '@taiga-ui/kit'
-import { CT } from '@start9labs/start-sdk'
-import { Control } from '../control'
-
-@Component({
-  selector: 'form-file',
-  templateUrl: './form-file.component.html',
-  styleUrls: ['./form-file.component.scss'],
-})
-export class FormFileComponent extends Control<CT.ValueSpecFile, TuiFileLike> {}
diff --git a/web/projects/ui/src/app/components/form/form.module.ts b/web/projects/ui/src/app/components/form/form.module.ts
index b7a36cd1f..5417309a9 100644
--- a/web/projects/ui/src/app/components/form/form.module.ts
+++ b/web/projects/ui/src/app/components/form/form.module.ts
@@ -40,7 +40,6 @@ import { FormToggleComponent } from './form-toggle/form-toggle.component'
 import { FormTextareaComponent } from './form-textarea/form-textarea.component'
 import { FormNumberComponent } from './form-number/form-number.component'
 import { FormSelectComponent } from './form-select/form-select.component'
-import { FormFileComponent } from './form-file/form-file.component'
 import { FormMultiselectComponent } from './form-multiselect/form-multiselect.component'
 import { FormUnionComponent } from './form-union/form-union.component'
 import { FormObjectComponent } from './form-object/form-object.component'
@@ -96,7 +95,6 @@ import { HintPipe } from './hint.pipe'
     FormNumberComponent,
     FormSelectComponent,
     FormMultiselectComponent,
-    FormFileComponent,
     FormUnionComponent,
     FormObjectComponent,
     FormArrayComponent,
diff --git a/web/projects/ui/src/app/modals/config.component.ts b/web/projects/ui/src/app/modals/config.component.ts
index 194302f5f..60cef3141 100644
--- a/web/projects/ui/src/app/modals/config.component.ts
+++ b/web/projects/ui/src/app/modals/config.component.ts
@@ -203,8 +203,6 @@ export class ConfigModal {
     const loader = new Subscription()
 
     try {
-      await this.uploadFiles(config, loader)
-
       if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patchDb))) {
         await this.configureDeps(config, loader)
       } else {
@@ -217,24 +215,6 @@ export class ConfigModal {
     }
   }
 
-  private async uploadFiles(config: Record<string, any>, loader: Subscription) {
-    loader.unsubscribe()
-    loader.closed = false
-
-    // TODO: Could be nested files
-    const keys = Object.keys(config).filter(key => config[key] instanceof File)
-    const message = `Uploading File${keys.length > 1 ? 's' : ''}...`
-
-    if (!keys.length) return
-
-    loader.add(this.loader.open(message).subscribe())
-
-    const hashes = await Promise.all(
-      keys.map(key => this.embassyApi.uploadFile(config[key])),
-    )
-    keys.forEach((key, i) => (config[key] = hashes[i]))
-  }
-
   private async configureDeps(
     config: Record<string, any>,
     loader: Subscription,
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 579292300..acd6780d1 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -14,8 +14,6 @@ export abstract class ApiService {
   // for sideloading packages
   abstract uploadPackage(guid: string, body: Blob): Promise<string>
 
-  abstract uploadFile(body: Blob): Promise<string>
-
   // for getting static files: ex icons, instructions, licenses
   abstract getStaticProxy(
     pkg: MarketplacePkg,
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 7780670c0..324936e8d 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -52,15 +52,6 @@ export class LiveApiService extends ApiService {
     })
   }
 
-  async uploadFile(body: Blob): Promise<string> {
-    return this.httpRequest({
-      method: Method.POST,
-      body,
-      url: `/rest/upload`,
-      responseType: 'text',
-    })
-  }
-
   // for getting static files: ex. instructions, licenses
 
   async getStaticProxy(
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index e063fb6e4..f716a1863 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -1084,11 +1084,6 @@ export class MockApiService extends ApiService {
     }
   }
 
-  async uploadFile(body: Blob): Promise<string> {
-    await pauseFor(2000)
-    return 'returnedhash'
-  }
-
   private async initProgress(): Promise<T.FullProgress> {
     const progress = JSON.parse(JSON.stringify(PROGRESS))
 
diff --git a/web/projects/ui/src/app/services/form.service.ts b/web/projects/ui/src/app/services/form.service.ts
index 3cd0ee591..779fb1f53 100644
--- a/web/projects/ui/src/app/services/form.service.ts
+++ b/web/projects/ui/src/app/services/form.service.ts
@@ -122,11 +122,6 @@ export class FormService {
           return this.getListItem(spec, entry)
         })
         return this.formBuilder.array(mapped, listValidators(spec))
-      case 'file':
-        return this.formBuilder.control(
-          currentValue || null,
-          fileValidators(spec),
-        )
       case 'union':
         const currentSelection = currentValue?.selection
         const isValid = !!spec.variants[currentSelection]
@@ -259,16 +254,6 @@ function listValidators(spec: CT.ValueSpecList): ValidatorFn[] {
   return validators
 }
 
-function fileValidators(spec: CT.ValueSpecFile): ValidatorFn[] {
-  const validators: ValidatorFn[] = []
-
-  if (spec.required) {
-    validators.push(Validators.required)
-  }
-
-  return validators
-}
-
 export function numberInRange(
   min: number | null,
   max: number | null,

From 7cd3f285ad8b747c7053ab1ce63f1051cdcf2316 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 30 Jul 2024 12:08:20 -0600
Subject: [PATCH 242/341] fix dependency autoconfig

---
 core/startos/src/dependencies.rs         | 34 +++++++++++++++++++-----
 core/startos/src/service/dependencies.rs |  2 +-
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 54e38f299..013648980 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -9,13 +9,13 @@ use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
-use url::Url;
 
 use crate::config::{Config, ConfigSpec, ConfigureContext};
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::db::model::package::CurrentDependencies;
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
+use crate::util::serde::HandlerExtSerde;
 use crate::util::PathOrUrl;
 use crate::Error;
 
@@ -65,11 +65,20 @@ pub struct ConfigureParams {
     dependency_id: PackageId,
 }
 pub fn configure<C: Context>() -> ParentHandler<C, ConfigureParams> {
-    ParentHandler::new().root_handler(
-        from_fn_async(configure_impl)
-            .with_inherited(|params, _| params)
-            .no_cli(),
-    )
+    ParentHandler::new()
+        .root_handler(
+            from_fn_async(configure_impl)
+                .with_inherited(|params, _| params)
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "dry",
+            from_fn_async(configure_dry)
+                .with_inherited(|params, _| params)
+                .with_display_serializable()
+                .with_call_remote::<CliContext>(),
+        )
 }
 
 pub async fn configure_impl(
@@ -105,6 +114,17 @@ pub async fn configure_impl(
     Ok(())
 }
 
+pub async fn configure_dry(
+    ctx: RpcContext,
+    _: Empty,
+    ConfigureParams {
+        dependent_id,
+        dependency_id,
+    }: ConfigureParams,
+) -> Result<ConfigDryRes, Error> {
+    configure_logic(ctx.clone(), (dependent_id, dependency_id.clone())).await
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ConfigDryRes {
diff --git a/core/startos/src/service/dependencies.rs b/core/startos/src/service/dependencies.rs
index 60fd76ad6..e8c6f07c4 100644
--- a/core/startos/src/service/dependencies.rs
+++ b/core/startos/src/service/dependencies.rs
@@ -38,7 +38,7 @@ impl ServiceActorSeed {
             )
             .await
             .with_kind(ErrorKind::Dependency)
-            .map(|res| res.filter(|c| !c.is_empty()))
+            .map(|res| res.filter(|c| !c.is_empty() && Some(c) != remote_config.as_ref()))
     }
 }
 

From 972ee8e42e6864fbd758f57c9f736c0792fa168e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Wed, 31 Jul 2024 00:06:44 -0600
Subject: [PATCH 243/341] premake 5 versions

---
 core/startos/src/version/mod.rs            | 22 +++++++++++++-
 core/startos/src/version/v0_3_6_alpha_3.rs | 35 ++++++++++++++++++++++
 core/startos/src/version/v0_3_6_alpha_4.rs | 35 ++++++++++++++++++++++
 core/startos/src/version/v0_3_6_alpha_5.rs | 35 ++++++++++++++++++++++
 core/startos/src/version/v0_3_6_alpha_6.rs | 35 ++++++++++++++++++++++
 core/startos/src/version/v0_3_6_alpha_7.rs | 35 ++++++++++++++++++++++
 6 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 core/startos/src/version/v0_3_6_alpha_3.rs
 create mode 100644 core/startos/src/version/v0_3_6_alpha_4.rs
 create mode 100644 core/startos/src/version/v0_3_6_alpha_5.rs
 create mode 100644 core/startos/src/version/v0_3_6_alpha_6.rs
 create mode 100644 core/startos/src/version/v0_3_6_alpha_7.rs

diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 39e6eae72..63c42314a 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -16,8 +16,13 @@ mod v0_3_5_2;
 mod v0_3_6_alpha_0;
 mod v0_3_6_alpha_1;
 mod v0_3_6_alpha_2;
+mod v0_3_6_alpha_3;
+mod v0_3_6_alpha_4;
+mod v0_3_6_alpha_5;
+mod v0_3_6_alpha_6;
+mod v0_3_6_alpha_7;
 
-pub type Current = v0_3_6_alpha_2::Version;
+pub type Current = v0_3_6_alpha_2::Version; // VERSION_BUMP
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
@@ -30,6 +35,11 @@ enum Version {
     V0_3_6_alpha_0(Wrapper<v0_3_6_alpha_0::Version>),
     V0_3_6_alpha_1(Wrapper<v0_3_6_alpha_1::Version>),
     V0_3_6_alpha_2(Wrapper<v0_3_6_alpha_2::Version>),
+    V0_3_6_alpha_3(Wrapper<v0_3_6_alpha_3::Version>),
+    V0_3_6_alpha_4(Wrapper<v0_3_6_alpha_4::Version>),
+    V0_3_6_alpha_5(Wrapper<v0_3_6_alpha_5::Version>),
+    V0_3_6_alpha_6(Wrapper<v0_3_6_alpha_6::Version>),
+    V0_3_6_alpha_7(Wrapper<v0_3_6_alpha_7::Version>),
     Other(exver::Version),
 }
 
@@ -52,6 +62,11 @@ impl Version {
             Version::V0_3_6_alpha_0(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_1(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_2(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_3(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_4(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_5(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_6(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_7(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -254,6 +269,11 @@ pub async fn init(
         Version::V0_3_6_alpha_0(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::V0_3_6_alpha_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::V0_3_6_alpha_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6_alpha_3(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6_alpha_4(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6_alpha_5(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6_alpha_6(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
+        Version::V0_3_6_alpha_7(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
diff --git a/core/startos/src/version/v0_3_6_alpha_3.rs b/core/startos/src/version/v0_3_6_alpha_3.rs
new file mode 100644
index 000000000..3f244a2a0
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_3.rs
@@ -0,0 +1,35 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_2, VersionT};
+use crate::db::model::Database;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_3: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 3.into()]
+    );
+}
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_2::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> exver::Version {
+        V0_3_6_alpha_3.clone()
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/core/startos/src/version/v0_3_6_alpha_4.rs b/core/startos/src/version/v0_3_6_alpha_4.rs
new file mode 100644
index 000000000..0a60764e0
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_4.rs
@@ -0,0 +1,35 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_3, VersionT};
+use crate::db::model::Database;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_4: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 4.into()]
+    );
+}
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_3::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> exver::Version {
+        V0_3_6_alpha_4.clone()
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/core/startos/src/version/v0_3_6_alpha_5.rs b/core/startos/src/version/v0_3_6_alpha_5.rs
new file mode 100644
index 000000000..1b921d78b
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_5.rs
@@ -0,0 +1,35 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_4, VersionT};
+use crate::db::model::Database;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_5: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 5.into()]
+    );
+}
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_4::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> exver::Version {
+        V0_3_6_alpha_5.clone()
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/core/startos/src/version/v0_3_6_alpha_6.rs b/core/startos/src/version/v0_3_6_alpha_6.rs
new file mode 100644
index 000000000..df91246ae
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_6.rs
@@ -0,0 +1,35 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_5, VersionT};
+use crate::db::model::Database;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_6: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 6.into()]
+    );
+}
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_5::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> exver::Version {
+        V0_3_6_alpha_6.clone()
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/core/startos/src/version/v0_3_6_alpha_7.rs b/core/startos/src/version/v0_3_6_alpha_7.rs
new file mode 100644
index 000000000..7aa63fb2e
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_7.rs
@@ -0,0 +1,35 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_6, VersionT};
+use crate::db::model::Database;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_7: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 7.into()]
+    );
+}
+
+#[derive(Clone, Debug)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_6::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> exver::Version {
+        V0_3_6_alpha_7.clone()
+    }
+    fn compat(&self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+        Ok(())
+    }
+}

From 82ba5dad1b0efdd10d5729cdd47d699589efb336 Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Wed, 31 Jul 2024 09:11:37 +0200
Subject: [PATCH 244/341] version bump

---
 core/Cargo.lock                                                | 2 +-
 core/startos/Cargo.toml                                        | 2 +-
 core/startos/src/version/mod.rs                                | 2 +-
 web/package.json                                               | 2 +-
 web/patchdb-ui-seed.json                                       | 2 +-
 web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 9c7b79c0d..2108ac851 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -4961,7 +4961,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.2"
+version = "0.3.6-alpha.3"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 6969b5301..1e1cd4737 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.2"
+version = "0.3.6-alpha.3"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 63c42314a..be5c8d9a5 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -22,7 +22,7 @@ mod v0_3_6_alpha_5;
 mod v0_3_6_alpha_6;
 mod v0_3_6_alpha_7;
 
-pub type Current = v0_3_6_alpha_2::Version; // VERSION_BUMP
+pub type Current = v0_3_6_alpha_3::Version; // VERSION_BUMP
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
diff --git a/web/package.json b/web/package.json
index 4a7047041..1697f1343 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.2",
+  "version": "0.3.6-alpha.3",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index f15a8d09b..0e15cd2cf 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -21,5 +21,5 @@
   "ackInstructions": {},
   "theme": "Dark",
   "widgets": [],
-  "ack-welcome": "0.3.6-alpha.2"
+  "ack-welcome": "0.3.6-alpha.3"
 }
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 258c92f83..79fe3f8da 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,7 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6-alpha.2</h4>
+  <h4>0.3.6-alpha.3</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
   <h6>Expect that any data you create or store on this version of the OS can be LOST FOREVER!</h6>
 

From 6168a006f436bb93701cae93d00ebea5dcb6f796 Mon Sep 17 00:00:00 2001
From: waterplea <alexander@inkin.ru>
Date: Wed, 31 Jul 2024 11:57:56 +0400
Subject: [PATCH 245/341] fix: address TODOs and close dialogs upon state
 change

---
 web/projects/ui/src/app/app.providers.ts        | 17 +++++++++++++++--
 .../app/services/patch-db/patch-db-source.ts    |  3 ++-
 .../ui/src/app/services/state.service.ts        |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/web/projects/ui/src/app/app.providers.ts b/web/projects/ui/src/app/app.providers.ts
index 00ff64690..101d402b3 100644
--- a/web/projects/ui/src/app/app.providers.ts
+++ b/web/projects/ui/src/app/app.providers.ts
@@ -1,14 +1,16 @@
-import { APP_INITIALIZER, Provider } from '@angular/core'
+import { APP_INITIALIZER, inject, Provider } from '@angular/core'
 import { UntypedFormBuilder } from '@angular/forms'
 import { Router, RouteReuseStrategy } from '@angular/router'
 import { IonicRouteStrategy, IonNav } from '@ionic/angular'
 import { RELATIVE_URL, THEME, WorkspaceConfig } from '@start9labs/shared'
-import { TUI_ICONS_PATH } from '@taiga-ui/core'
+import { TUI_DIALOGS_CLOSE, TUI_ICONS_PATH } from '@taiga-ui/core'
 import { PatchDB } from 'patch-db-client'
+import { filter, pairwise } from 'rxjs'
 import {
   PATCH_CACHE,
   PatchDbSource,
 } from 'src/app/services/patch-db/patch-db-source'
+import { StateService } from 'src/app/services/state.service'
 import { ApiService } from './services/api/embassy-api.service'
 import { MockApiService } from './services/api/embassy-mock-api.service'
 import { LiveApiService } from './services/api/embassy-live-api.service'
@@ -58,6 +60,17 @@ export const APP_PROVIDERS: Provider[] = [
     provide: TUI_ICONS_PATH,
     useValue: (name: string) => `/assets/taiga-ui/icons/${name}.svg#${name}`,
   },
+  {
+    provide: TUI_DIALOGS_CLOSE,
+    useFactory: () =>
+      inject(StateService).pipe(
+        pairwise(),
+        filter(
+          ([prev, curr]) =>
+            prev === 'running' && (curr === 'error' || curr === 'initializing'),
+        ),
+      ),
+  },
 ]
 
 export function appInitializer(
diff --git a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
index d5ef3364e..00ab3d43e 100644
--- a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
+++ b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
@@ -5,6 +5,7 @@ import {
   bufferTime,
   catchError,
   filter,
+  skip,
   startWith,
   switchMap,
   take,
@@ -41,8 +42,8 @@ export class PatchDbSource extends Observable<Update<DataModel>[]> {
     catchError((_, original$) => {
       this.state.retrigger()
 
-      // @TODO Alex this is returning right away and crashing the browser, but we need to wait until state emits again from the retrigger() above.
       return this.state.pipe(
+        skip(1), // skipping previous value stored due to shareReplay
         filter(current => current === 'running'),
         take(1),
         switchMap(() => original$),
diff --git a/web/projects/ui/src/app/services/state.service.ts b/web/projects/ui/src/app/services/state.service.ts
index d1dd3b383..9eb8caf0a 100644
--- a/web/projects/ui/src/app/services/state.service.ts
+++ b/web/projects/ui/src/app/services/state.service.ts
@@ -111,7 +111,7 @@ export class StateService extends Observable<RR.ServerState | null> {
         ),
       ),
     )
-    .subscribe() // @TODO Alex shouldn't this be subscribed in app component with the others? Do we ever need to unsubscribe?
+    .subscribe()
 
   constructor() {
     super(subscriber => this.stream$.subscribe(subscriber))

From 0cfc43c4447aa9a2f5aaa4f156efe9017c2a00ed Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Thu, 1 Aug 2024 21:39:16 -0600
Subject: [PATCH 246/341] don't deprecate wifi

---
 .../server-routes/server-routing.module.ts    |   2 +-
 .../server-show/server-show.page.html         |   3 +-
 .../server-show/server-show.page.ts           |  10 +-
 .../pages/server-routes/wifi/wifi.page.html   | 242 +++++++++---------
 .../app/pages/server-routes/wifi/wifi.page.ts |   6 +
 5 files changed, 128 insertions(+), 135 deletions(-)

diff --git a/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts b/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
index e7eb43aad..945f1b1c9 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
@@ -76,7 +76,7 @@ const routes: Routes = [
       import('./ssh-keys/ssh-keys.module').then(m => m.SSHKeysPageModule),
   },
   {
-    path: 'wifi',
+    path: 'wireless',
     loadChildren: () =>
       import('./wifi/wifi.module').then(m => m.WifiPageModule),
   },
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
index 01ecf897e..d6adc15d1 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -50,8 +50,7 @@ <h2 style="font-weight: bold">Clock sync failure</h2>
       <ion-item
         *ngFor="let button of cat.value"
         button
-        [style.display]="((button.title === 'Repair Disk' && !(showDiskRepair$ | async))) || (button.title === 'WiFi' && !(wifiConnected$ | async)) ? 'none' : 'block'"
-        [color]="button.title === 'WiFi' ? 'warning' : ''"
+        [style.display]="((button.title === 'Repair Disk' && !(showDiskRepair$ | async))) ? 'none' : 'block'"
         [detail]="button.detail"
         [disabled]="button.disabled$ | async"
         (click)="button.action()"
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 5ade9c666..8ddc1c8ca 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -40,7 +40,6 @@ export class ServerShowPage {
   readonly server$ = this.patch.watch$('serverInfo')
   readonly showUpdate$ = this.eosService.showUpdate$
   readonly showDiskRepair$ = this.ClientStorageService.showDiskRepair$
-  readonly wifiConnected$ = this.patch.watch$('serverInfo', 'wifi', 'selected')
 
   constructor(
     private readonly alertCtrl: AlertController,
@@ -475,11 +474,14 @@ export class ServerShowPage {
         disabled$: of(false),
       },
       {
-        title: 'WiFi',
-        description: 'WiFi is deprecated. Click to learn more.',
+        title: 'Wireless',
+        description:
+          'Connect your server to WiFi instead of Ethernet (not recommended)',
         icon: 'wifi',
         action: () =>
-          this.navCtrl.navigateForward(['wifi'], { relativeTo: this.route }),
+          this.navCtrl.navigateForward(['wireless'], {
+            relativeTo: this.route,
+          }),
         detail: true,
         disabled$: of(false),
       },
diff --git a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
index 08387fcbc..1ddb44225 100644
--- a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -3,8 +3,8 @@
     <ion-buttons slot="start">
       <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
-    <ion-title>WiFi Settings</ion-title>
-    <ion-buttons slot="end">
+    <ion-title>Wireless Settings</ion-title>
+    <ion-buttons slot="end" *ngIf="hasWifi$ | async">
       <ion-button (click)="getWifi()">
         Refresh
         <ion-icon slot="end" name="refresh"></ion-icon>
@@ -13,163 +13,149 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content class="ion-padding-top with-widgets">
-  <ion-item-group>
-    <!-- always -->
-    <ion-item color="warning" class="ion-margin">
-      <ion-icon slot="start" name="warning-outline"></ion-icon>
-      <ion-label>
-        <h2 style="font-weight: bold">WiFi is deprecated</h2>
-        <p style="font-weight: 600">
-          WiFi will be eliminated from StartOS in version v0.4.0, expected soon.
-          Before then, we highly recommend switching your server to a direct,
-          Ethernet connection, which is faster and more reliable. If using
-          Ethernet is not possible for you, we recommend using a WiFi extender
-          instead.
-        </p>
-      </ion-label>
-      <ion-button slot="end" color="light" (click)="openDocs()">
-        Learn More
-        <ion-icon slot="end" name="open-outline"></ion-icon>
-      </ion-button>
-    </ion-item>
-
-    <ion-item-divider>Country</ion-item-divider>
-
-    <!-- not loading -->
-    <ion-item
-      button
-      detail="false"
-      (click)="presentAlertCountry()"
-      [disabled]="loading"
-    >
-      <ion-icon slot="start" name="earth-outline" size="large"></ion-icon>
-      <ion-label *ngIf="wifi.country">
-        {{ wifi.country }} - {{ this.countries[wifi.country] }}
-      </ion-label>
-      <ion-label *ngIf="!wifi.country">Select Country</ion-label>
-    </ion-item>
-
-    <!-- loading  -->
-    <ng-container *ngIf="loading">
-      <ion-item-divider>Saved Networks</ion-item-divider>
-      <ion-item *ngFor="let entry of ['', '']" class="skeleton-parts">
-        <ion-button slot="start" fill="clear">
-          <ion-skeleton-text
-            animated
-            style="width: 30px; height: 30px; border-radius: 0"
-          ></ion-skeleton-text>
-        </ion-button>
-        <ion-label>
-          <ion-skeleton-text animated style="width: 18%"></ion-skeleton-text>
-        </ion-label>
-      </ion-item>
+<ion-content class="ion-padding with-widgets">
+  <ng-container *ngIf="connection$ | async">
+    <ion-item-group *ngIf="hasWifi$ | async; else noWifi">
+      <ion-item-divider>Country</ion-item-divider>
 
-      <ion-item-divider>Available Networks</ion-item-divider>
-      <ion-item *ngFor="let entry of ['', '']" class="skeleton-parts">
-        <ion-button slot="start" fill="clear">
-          <ion-skeleton-text
-            animated
-            style="width: 30px; height: 30px; border-radius: 0"
-          ></ion-skeleton-text>
-        </ion-button>
-        <ion-label>
-          <ion-skeleton-text animated style="width: 18%"></ion-skeleton-text>
-        </ion-label>
-      </ion-item>
-    </ng-container>
-
-    <!-- not loading -->
-    <ng-container *ngIf="!loading && wifi.country">
-      <ion-item-divider *ngIf="!(wifi.ssids | empty)">
-        Saved Networks
-      </ion-item-divider>
+      <!-- not loading -->
       <ion-item
         button
         detail="false"
-        *ngFor="let ssid of wifi.ssids | keyvalue"
-        (click)="presentAction(ssid.key)"
+        (click)="presentAlertCountry()"
+        [disabled]="loading"
       >
-        <div
-          *ngIf="ssid.key !== wifi.connected"
-          slot="start"
-          style="padding-right: 32px"
-        ></div>
-        <ion-icon
-          *ngIf="ssid.key === wifi.connected"
-          slot="start"
-          size="large"
-          name="checkmark"
-          color="success"
-        ></ion-icon>
-        <ion-label>{{ ssid.key }}</ion-label>
-        <img
-          *ngIf="ssid.value > 0 && ssid.value < 5"
-          slot="end"
-          src="assets/img/icons/wifi-1.png"
-          style="max-width: 32px"
-        />
-        <img
-          *ngIf="ssid.value >= 5 && ssid.value < 50"
-          slot="end"
-          src="assets/img/icons/wifi-1.png"
-          style="max-width: 32px"
-        />
-        <img
-          *ngIf="ssid.value >= 50 && ssid.value < 90"
-          slot="end"
-          src="assets/img/icons/wifi-2.png"
-          style="max-width: 32px"
-        />
-        <img
-          *ngIf="ssid.value >= 90"
-          slot="end"
-          src="assets/img/icons/wifi-3.png"
-          style="max-width: 32px"
-        />
+        <ion-icon slot="start" name="earth-outline" size="large"></ion-icon>
+        <ion-label *ngIf="wifi.country">
+          {{ wifi.country }} - {{ this.countries[wifi.country] }}
+        </ion-label>
+        <ion-label *ngIf="!wifi.country">Select Country</ion-label>
       </ion-item>
 
-      <ion-item-divider>Available Networks</ion-item-divider>
-      <ng-container *ngFor="let avWifi of wifi.availableWifi">
+      <!-- loading  -->
+      <ng-container *ngIf="loading">
+        <ion-item-divider>Saved Networks</ion-item-divider>
+        <ion-item *ngFor="let entry of ['', '']" class="skeleton-parts">
+          <ion-button slot="start" fill="clear">
+            <ion-skeleton-text
+              animated
+              style="width: 30px; height: 30px; border-radius: 0"
+            ></ion-skeleton-text>
+          </ion-button>
+          <ion-label>
+            <ion-skeleton-text animated style="width: 18%"></ion-skeleton-text>
+          </ion-label>
+        </ion-item>
+
+        <ion-item-divider>Available Networks</ion-item-divider>
+        <ion-item *ngFor="let entry of ['', '']" class="skeleton-parts">
+          <ion-button slot="start" fill="clear">
+            <ion-skeleton-text
+              animated
+              style="width: 30px; height: 30px; border-radius: 0"
+            ></ion-skeleton-text>
+          </ion-button>
+          <ion-label>
+            <ion-skeleton-text animated style="width: 18%"></ion-skeleton-text>
+          </ion-label>
+        </ion-item>
+      </ng-container>
+
+      <!-- not loading -->
+      <ng-container *ngIf="!loading && wifi.country">
+        <ion-item-divider *ngIf="!(wifi.ssids | empty)">
+          Saved Networks
+        </ion-item-divider>
         <ion-item
           button
           detail="false"
-          (click)="presentModalAdd(avWifi.ssid, !!avWifi.security.length)"
-          *ngIf="avWifi.ssid"
+          *ngFor="let ssid of wifi.ssids | keyvalue"
+          (click)="presentAction(ssid.key)"
         >
-          <ion-label>{{ avWifi.ssid }}</ion-label>
+          <div
+            *ngIf="ssid.key !== wifi.connected"
+            slot="start"
+            style="padding-right: 32px"
+          ></div>
+          <ion-icon
+            *ngIf="ssid.key === wifi.connected"
+            slot="start"
+            size="large"
+            name="checkmark"
+            color="success"
+          ></ion-icon>
+          <ion-label>{{ ssid.key }}</ion-label>
           <img
-            *ngIf="avWifi.strength < 5"
+            *ngIf="ssid.value > 0 && ssid.value < 5"
             slot="end"
             src="assets/img/icons/wifi-1.png"
             style="max-width: 32px"
           />
           <img
-            *ngIf="avWifi.strength >= 5 && avWifi.strength < 50"
+            *ngIf="ssid.value >= 5 && ssid.value < 50"
             slot="end"
             src="assets/img/icons/wifi-1.png"
             style="max-width: 32px"
           />
           <img
-            *ngIf="avWifi.strength >= 50 && avWifi.strength < 90"
+            *ngIf="ssid.value >= 50 && ssid.value < 90"
             slot="end"
             src="assets/img/icons/wifi-2.png"
             style="max-width: 32px"
           />
           <img
-            *ngIf="avWifi.strength >= 90"
+            *ngIf="ssid.value >= 90"
             slot="end"
             src="assets/img/icons/wifi-3.png"
             style="max-width: 32px"
           />
         </ion-item>
+
+        <ion-item-divider>Available Networks</ion-item-divider>
+        <ng-container *ngFor="let avWifi of wifi.availableWifi">
+          <ion-item
+            button
+            detail="false"
+            (click)="presentModalAdd(avWifi.ssid, !!avWifi.security.length)"
+            *ngIf="avWifi.ssid"
+          >
+            <ion-label>{{ avWifi.ssid }}</ion-label>
+            <img
+              *ngIf="avWifi.strength < 5"
+              slot="end"
+              src="assets/img/icons/wifi-1.png"
+              style="max-width: 32px"
+            />
+            <img
+              *ngIf="avWifi.strength >= 5 && avWifi.strength < 50"
+              slot="end"
+              src="assets/img/icons/wifi-1.png"
+              style="max-width: 32px"
+            />
+            <img
+              *ngIf="avWifi.strength >= 50 && avWifi.strength < 90"
+              slot="end"
+              src="assets/img/icons/wifi-2.png"
+              style="max-width: 32px"
+            />
+            <img
+              *ngIf="avWifi.strength >= 90"
+              slot="end"
+              src="assets/img/icons/wifi-3.png"
+              style="max-width: 32px"
+            />
+          </ion-item>
+        </ng-container>
+        <ion-item button detail="false" (click)="presentModalAdd()">
+          <ion-icon slot="start" name="add" color="dark"></ion-icon>
+          <ion-label>
+            <b>Join Another Network</b>
+          </ion-label>
+        </ion-item>
       </ng-container>
-      <ion-item button detail="false" (click)="presentModalAdd()">
-        <ion-icon slot="start" name="add" color="dark"></ion-icon>
-        <ion-label>
-          <b>Join Another Network</b>
-        </ion-label>
-      </ion-item>
-    </ng-container>
-  </ion-item-group>
+    </ion-item-group>
+    <ng-template #noWifi>
+      <p>No wireless interface detected.</p>
+    </ng-template>
+  </ng-container>
 </ion-content>
diff --git a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
index 0a1f6a7d9..5d722b482 100644
--- a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
@@ -9,11 +9,14 @@ import { WINDOW } from '@ng-web-apis/common'
 import { ErrorService, LoadingService, pauseFor } from '@start9labs/shared'
 import { CT } from '@start9labs/start-sdk'
 import { TuiDialogOptions } from '@taiga-ui/core'
+import { PatchDB } from 'patch-db-client'
 import { FormComponent, FormContext } from 'src/app/components/form.component'
 import { RR } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
+import { ConnectionService } from 'src/app/services/connection.service'
 import { FormDialogService } from 'src/app/services/form-dialog.service'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 
 export interface WiFiForm {
   ssid: string
@@ -31,6 +34,7 @@ export class WifiPage {
   countries = require('../../../util/countries.json') as {
     [key: string]: string
   }
+  readonly hasWifi$ = this.patch.watch$('serverInfo', 'wifi', 'interface')
 
   constructor(
     private readonly api: ApiService,
@@ -41,6 +45,8 @@ export class WifiPage {
     private readonly errorService: ErrorService,
     private readonly actionCtrl: ActionSheetController,
     private readonly config: ConfigService,
+    private readonly patch: PatchDB<DataModel>,
+    readonly connection$: ConnectionService,
     @Inject(WINDOW) private readonly windowRef: Window,
   ) {}
 

From 512ed71fc36d3c74ef6b59118745d980d7e5dab5 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Mon, 5 Aug 2024 13:11:55 -0600
Subject: [PATCH 247/341] fixes: The case on the readonly that the path before
 doesn't exist, just let it

---
 core/startos/src/service/effects/dependency.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/startos/src/service/effects/dependency.rs b/core/startos/src/service/effects/dependency.rs
index 34619ebd4..ad5ec2e9b 100644
--- a/core/startos/src/service/effects/dependency.rs
+++ b/core/startos/src/service/effects/dependency.rs
@@ -55,11 +55,8 @@ pub async fn mount(
     let subpath = subpath.unwrap_or_default();
     let subpath = subpath.strip_prefix("/").unwrap_or(&subpath);
     let source = data_dir(&context.seed.ctx.datadir, &package_id, &volume_id).join(subpath);
-    if readonly && tokio::fs::metadata(&source).await.is_err() {
-        return Err(Error::new(
-            eyre!("{volume_id}/{} does not exist", subpath.display()),
-            ErrorKind::NotFound,
-        ));
+    if tokio::fs::metadata(&source).await.is_err() {
+        tokio::fs::create_dir_all(&source).await?;
     }
     let location = location.strip_prefix("/").unwrap_or(&location);
     let mountpoint = context

From 93640bb08e1b67e94efd23ef57bc10b96866e647 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 6 Aug 2024 13:20:59 -0600
Subject: [PATCH 248/341] don't bail on error in dep config on startup

---
 core/startos/src/context/rpc.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 0d00abb3a..0db681d3b 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -297,7 +297,9 @@ impl RpcContext {
         for (package_id, package) in peek.as_public().as_package_data().as_entries()?.into_iter() {
             let package = package.clone();
             let mut current_dependencies = package.as_current_dependencies().de()?;
-            compute_dependency_config_errs(self, &package_id, &mut current_dependencies).await?;
+            compute_dependency_config_errs(self, &package_id, &mut current_dependencies)
+                .await
+                .log_err();
             updated_current_dependents.insert(package_id.clone(), current_dependencies);
         }
         self.db

From 4427aeac54476088931fb8c6cf18298320cdff72 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 6 Aug 2024 13:21:12 -0600
Subject: [PATCH 249/341] fix asset mounts

---
 core/startos/src/service/persistent_container.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 23f01605e..c81322719 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -170,17 +170,17 @@ impl PersistentContainer {
                 .arg(&mountpoint)
                 .invoke(crate::ErrorKind::Filesystem)
                 .await?;
+            let s9pk_asset_path = Path::new("assets").join(asset).with_extension("squashfs");
+            let sqfs = s9pk
+                .as_archive()
+                .contents()
+                .get_path(&s9pk_asset_path)
+                .and_then(|e| e.as_file())
+                .or_not_found(s9pk_asset_path.display())?;
             assets.insert(
                 asset.clone(),
                 MountGuard::mount(
-                    &Bind::new(
-                        asset_dir(
-                            &ctx.datadir,
-                            &s9pk.as_manifest().id,
-                            &s9pk.as_manifest().version,
-                        )
-                        .join(asset),
-                    ),
+                    &IdMapped::new(LoopDev::from(&**sqfs), 0, 100000, 65536),
                     mountpoint,
                     MountType::ReadWrite,
                 )

From 0e8530172c46919749113cf40742234ef5b748fa Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 6 Aug 2024 13:59:14 -0600
Subject: [PATCH 250/341] fix config set dry

---
 core/startos/src/config/mod.rs                | 70 +++++++++++++++++--
 .../ui/src/app/modals/config.component.ts     |  6 +-
 .../ui/src/app/services/api/api.types.ts      |  2 +-
 .../services/api/embassy-mock-api.service.ts  |  2 +-
 4 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
index 01309a16f..22edd98f7 100644
--- a/core/startos/src/config/mod.rs
+++ b/core/startos/src/config/mod.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeSet;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -178,13 +179,68 @@ pub struct SetParams {
 // )]
 #[instrument(skip_all)]
 pub fn set<C: Context>() -> ParentHandler<C, SetParams, PackageId> {
-    ParentHandler::new().root_handler(
-        from_fn_async(set_impl)
-            .with_metadata("sync_db", Value::Bool(true))
-            .with_inherited(|set_params, id| (id, set_params))
-            .no_display()
-            .with_call_remote::<CliContext>(),
-    )
+    ParentHandler::new()
+        .root_handler(
+            from_fn_async(set_impl)
+                .with_metadata("sync_db", Value::Bool(true))
+                .with_inherited(|set_params, id| (id, set_params))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "dry",
+            from_fn_async(set_dry)
+                .with_inherited(|set_params, id| (id, set_params))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+pub async fn set_dry(
+    ctx: RpcContext,
+    _: Empty,
+    (
+        id,
+        SetParams {
+            timeout,
+            config: StdinDeserializable(config),
+        },
+    ): (PackageId, SetParams),
+) -> Result<BTreeSet<PackageId>, Error> {
+    let mut breakages = BTreeSet::new();
+
+    let procedure_id = Guid::new();
+
+    let db = ctx.db.peek().await;
+    for dep in db
+        .as_public()
+        .as_package_data()
+        .as_entries()?
+        .into_iter()
+        .filter_map(
+            |(k, v)| match v.as_current_dependencies().contains_key(&id) {
+                Ok(true) => Some(Ok(k)),
+                Ok(false) => None,
+                Err(e) => Some(Err(e)),
+            },
+        )
+    {
+        let dep_id = dep?;
+
+        let Some(dependent) = &*ctx.services.get(&dep_id).await else {
+            continue;
+        };
+
+        if dependent
+            .dependency_config(procedure_id.clone(), id.clone(), config.clone())
+            .await?
+            .is_some()
+        {
+            breakages.insert(dep_id);
+        }
+    }
+
+    Ok(breakages)
 }
 
 #[derive(Default)]
diff --git a/web/projects/ui/src/app/modals/config.component.ts b/web/projects/ui/src/app/modals/config.component.ts
index 60cef3141..d0e8afa4d 100644
--- a/web/projects/ui/src/app/modals/config.component.ts
+++ b/web/projects/ui/src/app/modals/config.component.ts
@@ -6,7 +6,7 @@ import {
   isEmptyObject,
   LoadingService,
 } from '@start9labs/shared'
-import { CT } from '@start9labs/start-sdk'
+import { CT, T } from '@start9labs/start-sdk'
 import { TuiButtonModule } from '@taiga-ui/experimental'
 import {
   TuiDialogContext,
@@ -245,11 +245,11 @@ export class ConfigModal {
     this.context.$implicit.complete()
   }
 
-  private async approveBreakages(breakages: Breakages): Promise<boolean> {
+  private async approveBreakages(breakages: T.PackageId[]): Promise<boolean> {
     const packages = await getAllPackages(this.patchDb)
     const message =
       'As a result of this change, the following services will no longer work properly and may crash:<ul>'
-    const content = `${message}${Object.keys(breakages).map(
+    const content = `${message}${breakages.map(
       id => `<li><b>${getManifest(packages[id]).title}</b></li>`,
     )}</ul>`
     const data: TuiPromptData = { content, yes: 'Continue', no: 'Cancel' }
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index faa4a072e..5742ba67f 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -230,7 +230,7 @@ export module RR {
   export type GetPackageConfigRes = { spec: CT.InputSpec; config: object }
 
   export type DrySetPackageConfigReq = { id: string; config: object } // package.config.set.dry
-  export type DrySetPackageConfigRes = Breakages
+  export type DrySetPackageConfigRes = T.PackageId[]
 
   export type SetPackageConfigReq = DrySetPackageConfigReq // package.config.set
   export type SetPackageConfigRes = null
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index f716a1863..d44ef809a 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -790,7 +790,7 @@ export class MockApiService extends ApiService {
     params: RR.DrySetPackageConfigReq,
   ): Promise<RR.DrySetPackageConfigRes> {
     await pauseFor(2000)
-    return {}
+    return []
   }
 
   async setPackageConfig(

From d0c2dc53fe36b3a704bfd19f04a468560165bf3b Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 6 Aug 2024 14:27:05 -0600
Subject: [PATCH 251/341] fix dns in the overlay

---
 sdk/lib/util/Overlay.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 4d6d36b34..93cb44238 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -26,6 +26,8 @@ export class Overlay {
       shared.push("run")
     }
 
+    fs.copyFile("/etc/resolv.conf", `${rootfs}/etc/resolv.conf`)
+
     for (const dirPart of shared) {
       const from = `/${dirPart}`
       const to = `${rootfs}/${dirPart}`

From 7c32404b6976f761a0001a4f2e9ab9e6900c4fb3 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 6 Aug 2024 14:40:49 -0600
Subject: [PATCH 252/341] fix test

---
 .../Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
index 1134d198a..9a643b39d 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/bitcoind.ts
@@ -315,7 +315,7 @@ export default {
           },
         },
         variants: {
-          disabled: undefined,
+          disabled: {},
           automatic: {
             size: {
               type: "number",

From a3e7e7c6c99dc7897132f6f1100885067a00b621 Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Wed, 7 Aug 2024 08:51:15 +0200
Subject: [PATCH 253/341] version bump

---
 core/Cargo.lock                                                | 2 +-
 core/startos/Cargo.toml                                        | 2 +-
 core/startos/src/version/mod.rs                                | 2 +-
 web/package.json                                               | 2 +-
 web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 2108ac851..f31bc21b1 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -4961,7 +4961,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.3"
+version = "0.3.6-alpha.4"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 1e1cd4737..3bab5c6f3 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.3"
+version = "0.3.6-alpha.4"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index be5c8d9a5..8e114334d 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -22,7 +22,7 @@ mod v0_3_6_alpha_5;
 mod v0_3_6_alpha_6;
 mod v0_3_6_alpha_7;
 
-pub type Current = v0_3_6_alpha_3::Version; // VERSION_BUMP
+pub type Current = v0_3_6_alpha_4::Version; // VERSION_BUMP
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
diff --git a/web/package.json b/web/package.json
index 1697f1343..c46090544 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.3",
+  "version": "0.3.6-alpha.4",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 79fe3f8da..6c259a6d0 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,7 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6-alpha.3</h4>
+  <h4>0.3.6-alpha.4</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
   <h6>Expect that any data you create or store on this version of the OS can be LOST FOREVER!</h6>
 

From 9f1a9a7d9cd3277072fa5f4da17ac9568de4a38e Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Wed, 7 Aug 2024 10:40:25 +0200
Subject: [PATCH 254/341] fix CI build * update nodejs * set up python

---
 .github/workflows/startos-iso.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 010c79594..bc0fb626e 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -45,7 +45,7 @@ on:
       - next/*
 
 env:
-  NODEJS_VERSION: "18.15.0"
+  NODEJS_VERSION: "20.16.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
 
 jobs:
@@ -75,6 +75,11 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODEJS_VERSION }}
@@ -148,6 +153,11 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
       - name: Install dependencies
         run: |
           sudo apt-get update

From 419d4986f65d0acb6fd8ba5b1016aab78c0d226c Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 7 Aug 2024 06:19:04 -0600
Subject: [PATCH 255/341] fix: Inject for actions and health

---
 .../DockerProcedureContainer.ts               | 12 ++++---
 .../Systems/SystemForEmbassy/MainLoop.ts      | 34 +++++++++++++------
 .../Systems/SystemForEmbassy/index.ts         | 18 ++++++----
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 012a70eee..40a152bab 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -88,15 +88,19 @@ export class DockerProcedureContainer {
     return new DockerProcedureContainer(overlay)
   }
 
-  async exec(commands: string[]) {
+  async exec(commands: string[], { destroy = true } = {}) {
     try {
       return await this.overlay.exec(commands)
     } finally {
-      await this.overlay.destroy()
+      if (destroy) await this.overlay.destroy()
     }
   }
 
-  async execFail(commands: string[], timeoutMs: number | null) {
+  async execFail(
+    commands: string[],
+    timeoutMs: number | null,
+    { destroy = true } = {},
+  ) {
     try {
       const res = await this.overlay.exec(commands, {}, timeoutMs)
       if (res.exitCode !== 0) {
@@ -110,7 +114,7 @@ export class DockerProcedureContainer {
       }
       return res
     } finally {
-      await this.overlay.destroy()
+      if (destroy) await this.overlay.destroy()
     }
   }
 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index f8f0a2d6e..e29170543 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -14,6 +14,10 @@ const EMBASSY_PROPERTIES_LOOP = 30 * 1000
  * Also, this has an ability to clean itself up too if need be.
  */
 export class MainLoop {
+  private _mainDockerContainer?: DockerProcedureContainer
+  get mainDockerContainer() {
+    return this._mainDockerContainer
+  }
   private healthLoops?: {
     name: string
     interval: NodeJS.Timeout
@@ -54,6 +58,7 @@ export class MainLoop {
       this.system.manifest.main,
       this.system.manifest.volumes,
     )
+    this._mainDockerContainer = dockerProcedureContainer
     if (jsMain) {
       throw new Error("Unreachable")
     }
@@ -126,6 +131,7 @@ export class MainLoop {
     await main?.daemon.stop().catch((e) => console.error(e))
     this.effects.setMainStatus({ status: "stopped" })
     if (healthLoops) healthLoops.forEach((x) => clearInterval(x.interval))
+    delete this._mainDockerContainer
   }
 
   private constructHealthLoops() {
@@ -138,17 +144,25 @@ export class MainLoop {
           const actionProcedure = value
           const timeChanged = Date.now() - start
           if (actionProcedure.type === "docker") {
-            const container = await DockerProcedureContainer.of(
-              effects,
-              manifest.id,
-              actionProcedure,
-              manifest.volumes,
+            // prettier-ignore
+            const container = 
+              actionProcedure.inject && this._mainDockerContainer ?
+              this._mainDockerContainer :
+              await DockerProcedureContainer.of(
+                effects,
+                manifest.id,
+                actionProcedure,
+                manifest.volumes,
+              )
+            const shouldDestroy = container !== this._mainDockerContainer
+            const executed = await container.exec(
+              [
+                actionProcedure.entrypoint,
+                ...actionProcedure.args,
+                JSON.stringify(timeChanged),
+              ],
+              { destroy: shouldDestroy },
             )
-            const executed = await container.exec([
-              actionProcedure.entrypoint,
-              ...actionProcedure.args,
-              JSON.stringify(timeChanged),
-            ])
             if (executed.exitCode === 0) {
               await effects.setHealth({
                 id: healthId,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index ffdb02988..f639d00cd 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -799,12 +799,17 @@ export class SystemForEmbassy implements System {
     const actionProcedure = this.manifest.actions?.[actionId]?.implementation
     if (!actionProcedure) return { message: "Action not found", value: null }
     if (actionProcedure.type === "docker") {
-      const container = await DockerProcedureContainer.of(
-        effects,
-        this.manifest.id,
-        actionProcedure,
-        this.manifest.volumes,
-      )
+      const container =
+        actionProcedure.inject && this.currentRunning?.mainDockerContainer
+          ? this.currentRunning?.mainDockerContainer
+          : await DockerProcedureContainer.of(
+              effects,
+              this.manifest.id,
+              actionProcedure,
+              this.manifest.volumes,
+            )
+      const shouldDestroy =
+        container !== this.currentRunning?.mainDockerContainer
       return JSON.parse(
         (
           await container.execFail(
@@ -814,6 +819,7 @@ export class SystemForEmbassy implements System {
               JSON.stringify(formData),
             ],
             timeoutMs,
+            { destroy: shouldDestroy },
           )
         ).stdout.toString(),
       )

From bd7adafee06f53b9c9391059487c1149801d7396 Mon Sep 17 00:00:00 2001
From: J H <dragondef@gmail.com>
Date: Wed, 7 Aug 2024 16:38:35 -0600
Subject: [PATCH 256/341] Fix: sdk setupManifest pass through docs

---
 sdk/lib/manifest/setupManifest.ts | 10 ++++++++--
 web/patchdb-ui-seed.json          |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sdk/lib/manifest/setupManifest.ts b/sdk/lib/manifest/setupManifest.ts
index e3b746874..a0d0e18b3 100644
--- a/sdk/lib/manifest/setupManifest.ts
+++ b/sdk/lib/manifest/setupManifest.ts
@@ -3,6 +3,11 @@ import { ImageConfig, ImageId, VolumeId } from "../osBindings"
 import { SDKManifest, SDKImageConfig } from "./ManifestTypes"
 import { SDKVersion } from "../StartSdk"
 
+/**
+ * This is an example of a function that takes a manifest and returns a new manifest with additional properties
+ * @param manifest Manifests are the description of the package
+ * @returns The manifest with additional properties
+ */
 export function setupManifest<
   Id extends string,
   Version extends string,
@@ -10,15 +15,16 @@ export function setupManifest<
   VolumesTypes extends VolumeId,
   AssetTypes extends VolumeId,
   ImagesTypes extends ImageId,
-  Manifest extends SDKManifest<Version, Satisfies> & {
+  Manifest extends {
     dependencies: Dependencies
     id: Id
     assets: AssetTypes[]
     images: Record<ImagesTypes, SDKImageConfig>
     volumes: VolumesTypes[]
+    version: Version
   },
   Satisfies extends string[] = [],
->(manifest: Manifest & { version: Version }): Manifest & T.Manifest {
+>(manifest: SDKManifest<Version, Satisfies> & Manifest): Manifest & T.Manifest {
   const images = Object.entries(manifest.images).reduce(
     (images, [k, v]) => {
       v.arch = v.arch || ["aarch64", "x86_64"]
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 0e15cd2cf..807483c3a 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -21,5 +21,5 @@
   "ackInstructions": {},
   "theme": "Dark",
   "widgets": [],
-  "ack-welcome": "0.3.6-alpha.3"
+  "ack-welcome": "0.3.6-alpha.4"
 }

From 058bfe0737dd0055e18a27d63aba36fc16611219 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 8 Aug 2024 11:10:02 -0600
Subject: [PATCH 257/341] sdk updates

---
 .../Systems/SystemForEmbassy/index.ts         |  1 -
 core/startos/src/net/service_interface.rs     |  1 -
 .../startos/src/service/effects/dependency.rs |  4 +-
 core/startos/src/service/effects/health.rs    |  4 +-
 .../src/service/effects/net/interface.rs      |  3 -
 core/startos/src/service/mod.rs               |  4 +-
 core/startos/src/status/health_check.rs       | 36 ++++----
 core/startos/src/status/mod.rs                | 18 ++--
 sdk/lib/StartSdk.ts                           |  4 +-
 sdk/lib/health/HealthCheck.ts                 | 92 ++++++++-----------
 sdk/lib/health/checkFns/CheckResult.ts        |  6 --
 sdk/lib/health/checkFns/HealthCheckResult.ts  |  3 +
 sdk/lib/health/checkFns/checkPortListening.ts | 12 +--
 sdk/lib/health/checkFns/checkWebUrl.ts        |  8 +-
 sdk/lib/health/checkFns/index.ts              |  2 +-
 sdk/lib/health/checkFns/runHealthScript.ts    | 11 +--
 sdk/lib/interfaces/Origin.ts                  |  2 -
 sdk/lib/interfaces/ServiceInterfaceBuilder.ts |  1 -
 sdk/lib/mainFn/Daemons.ts                     |  4 +-
 sdk/lib/mainFn/HealthDaemon.ts                | 51 ++++------
 sdk/lib/osBindings/CheckDependenciesResult.ts |  4 +-
 .../ExportServiceInterfaceParams.ts           |  1 -
 sdk/lib/osBindings/MainStatus.ts              |  6 +-
 ...eckResult.ts => NamedHealthCheckResult.ts} |  2 +-
 sdk/lib/osBindings/ServiceInterface.ts        |  1 -
 sdk/lib/osBindings/index.ts                   |  2 +-
 sdk/lib/test/host.test.ts                     |  1 -
 sdk/lib/trigger/TriggerInput.ts               |  1 -
 sdk/lib/trigger/changeOnFirstSuccess.ts       |  8 +-
 sdk/lib/trigger/defaultTrigger.ts             |  6 +-
 sdk/lib/trigger/lastStatus.ts                 | 33 +++++++
 sdk/lib/trigger/successFailure.ts             | 31 +------
 sdk/lib/types.ts                              |  4 +-
 sdk/lib/util/Overlay.ts                       | 17 ++++
 sdk/lib/util/getServiceInterface.ts           |  2 -
 .../app-show-health-checks.component.ts       |  6 +-
 .../app-show/pipes/health-color.pipe.ts       |  2 +-
 .../app-show/pipes/to-health-checks.pipe.ts   |  2 +-
 .../ui/src/app/services/api/api.fixures.ts    |  7 --
 .../ui/src/app/services/api/api.types.ts      |  2 +-
 .../ui/src/app/services/api/mock-patch.ts     |  6 --
 41 files changed, 190 insertions(+), 221 deletions(-)
 delete mode 100644 sdk/lib/health/checkFns/CheckResult.ts
 create mode 100644 sdk/lib/health/checkFns/HealthCheckResult.ts
 rename sdk/lib/osBindings/{HealthCheckResult.ts => NamedHealthCheckResult.ts} (85%)
 create mode 100644 sdk/lib/trigger/lastStatus.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index f639d00cd..8b74a7217 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -445,7 +445,6 @@ export class SystemForEmbassy implements System {
               id: `${id}-${internal}`,
               description: interfaceValue.description,
               hasPrimary: false,
-              disabled: false,
               type:
                 interfaceValue.ui &&
                 (origin.scheme === "http" || origin.sslScheme === "https")
diff --git a/core/startos/src/net/service_interface.rs b/core/startos/src/net/service_interface.rs
index dbe228ef2..b1824140b 100644
--- a/core/startos/src/net/service_interface.rs
+++ b/core/startos/src/net/service_interface.rs
@@ -67,7 +67,6 @@ pub struct ServiceInterface {
     pub name: String,
     pub description: String,
     pub has_primary: bool,
-    pub disabled: bool,
     pub masked: bool,
     pub address_info: AddressInfo,
     #[serde(rename = "type")]
diff --git a/core/startos/src/service/effects/dependency.rs b/core/startos/src/service/effects/dependency.rs
index ad5ec2e9b..fbd02800c 100644
--- a/core/startos/src/service/effects/dependency.rs
+++ b/core/startos/src/service/effects/dependency.rs
@@ -17,7 +17,7 @@ use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::{FileSystem, MountType};
 use crate::rpc_continuations::Guid;
 use crate::service::effects::prelude::*;
-use crate::status::health_check::HealthCheckResult;
+use crate::status::health_check::NamedHealthCheckResult;
 use crate::util::clap::FromStrParser;
 use crate::util::Invoke;
 use crate::volume::data_dir;
@@ -319,7 +319,7 @@ pub struct CheckDependenciesResult {
     is_installed: bool,
     is_running: bool,
     config_satisfied: bool,
-    health_checks: BTreeMap<HealthCheckId, HealthCheckResult>,
+    health_checks: BTreeMap<HealthCheckId, NamedHealthCheckResult>,
     #[ts(type = "string | null")]
     version: Option<exver::ExtendedVersion>,
 }
diff --git a/core/startos/src/service/effects/health.rs b/core/startos/src/service/effects/health.rs
index c8ef8fc4e..aad06a004 100644
--- a/core/startos/src/service/effects/health.rs
+++ b/core/startos/src/service/effects/health.rs
@@ -1,7 +1,7 @@
 use models::HealthCheckId;
 
 use crate::service::effects::prelude::*;
-use crate::status::health_check::HealthCheckResult;
+use crate::status::health_check::NamedHealthCheckResult;
 use crate::status::MainStatus;
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
@@ -10,7 +10,7 @@ use crate::status::MainStatus;
 pub struct SetHealth {
     id: HealthCheckId,
     #[serde(flatten)]
-    result: HealthCheckResult,
+    result: NamedHealthCheckResult,
 }
 pub async fn set_health(
     context: EffectContext,
diff --git a/core/startos/src/service/effects/net/interface.rs b/core/startos/src/service/effects/net/interface.rs
index e636e9b57..6cd4cd4c9 100644
--- a/core/startos/src/service/effects/net/interface.rs
+++ b/core/startos/src/service/effects/net/interface.rs
@@ -16,7 +16,6 @@ pub struct ExportServiceInterfaceParams {
     name: String,
     description: String,
     has_primary: bool,
-    disabled: bool,
     masked: bool,
     address_info: AddressInfo,
     r#type: ServiceInterfaceType,
@@ -28,7 +27,6 @@ pub async fn export_service_interface(
         name,
         description,
         has_primary,
-        disabled,
         masked,
         address_info,
         r#type,
@@ -42,7 +40,6 @@ pub async fn export_service_interface(
         name,
         description,
         has_primary,
-        disabled,
         masked,
         address_info,
         interface_type: r#type,
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 2beb5c9fa..6a99841d6 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -27,7 +27,7 @@ use crate::progress::{NamedProgress, Progress};
 use crate::rpc_continuations::Guid;
 use crate::s9pk::S9pk;
 use crate::service::service_map::InstallProgressHandles;
-use crate::status::health_check::HealthCheckResult;
+use crate::status::health_check::NamedHealthCheckResult;
 use crate::util::actor::concurrent::ConcurrentActor;
 use crate::util::io::create_file;
 use crate::util::serde::{NoOutput, Pem};
@@ -493,7 +493,7 @@ impl Service {
 
 #[derive(Debug, Clone)]
 pub struct RunningStatus {
-    health: OrdMap<HealthCheckId, HealthCheckResult>,
+    health: OrdMap<HealthCheckId, NamedHealthCheckResult>,
     started: DateTime<Utc>,
 }
 
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index 90b20f8c5..1b1e2a7b6 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -9,25 +9,25 @@ use crate::util::clap::FromStrParser;
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
-pub struct HealthCheckResult {
+pub struct NamedHealthCheckResult {
     pub name: String,
     #[serde(flatten)]
-    pub kind: HealthCheckResultKind,
+    pub kind: NamedHealthCheckResultKind,
 }
 // healthCheckName:kind:message OR healthCheckName:kind
-impl FromStr for HealthCheckResult {
+impl FromStr for NamedHealthCheckResult {
     type Err = color_eyre::eyre::Report;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let from_parts = |name: &str, kind: &str, message: Option<&str>| {
             let message = message.map(|x| x.to_string());
             let kind = match kind {
-                "success" => HealthCheckResultKind::Success { message },
-                "disabled" => HealthCheckResultKind::Disabled { message },
-                "starting" => HealthCheckResultKind::Starting { message },
-                "loading" => HealthCheckResultKind::Loading {
+                "success" => NamedHealthCheckResultKind::Success { message },
+                "disabled" => NamedHealthCheckResultKind::Disabled { message },
+                "starting" => NamedHealthCheckResultKind::Starting { message },
+                "loading" => NamedHealthCheckResultKind::Loading {
                     message: message.unwrap_or_default(),
                 },
-                "failure" => HealthCheckResultKind::Failure {
+                "failure" => NamedHealthCheckResultKind::Failure {
                     message: message.unwrap_or_default(),
                 },
                 _ => return Err(color_eyre::eyre::eyre!("Invalid health check kind")),
@@ -47,7 +47,7 @@ impl FromStr for HealthCheckResult {
         }
     }
 }
-impl ValueParserFactory for HealthCheckResult {
+impl ValueParserFactory for NamedHealthCheckResult {
     type Parser = FromStrParser<Self>;
     fn value_parser() -> Self::Parser {
         FromStrParser::new()
@@ -57,40 +57,44 @@ impl ValueParserFactory for HealthCheckResult {
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "result")]
-pub enum HealthCheckResultKind {
+pub enum NamedHealthCheckResultKind {
     Success { message: Option<String> },
     Disabled { message: Option<String> },
     Starting { message: Option<String> },
     Loading { message: String },
     Failure { message: String },
 }
-impl std::fmt::Display for HealthCheckResult {
+impl std::fmt::Display for NamedHealthCheckResult {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let name = &self.name;
         match &self.kind {
-            HealthCheckResultKind::Success { message } => {
+            NamedHealthCheckResultKind::Success { message } => {
                 if let Some(message) = message {
                     write!(f, "{name}: Succeeded ({message})")
                 } else {
                     write!(f, "{name}: Succeeded")
                 }
             }
-            HealthCheckResultKind::Disabled { message } => {
+            NamedHealthCheckResultKind::Disabled { message } => {
                 if let Some(message) = message {
                     write!(f, "{name}: Disabled ({message})")
                 } else {
                     write!(f, "{name}: Disabled")
                 }
             }
-            HealthCheckResultKind::Starting { message } => {
+            NamedHealthCheckResultKind::Starting { message } => {
                 if let Some(message) = message {
                     write!(f, "{name}: Starting ({message})")
                 } else {
                     write!(f, "{name}: Starting")
                 }
             }
-            HealthCheckResultKind::Loading { message } => write!(f, "{name}: Loading ({message})"),
-            HealthCheckResultKind::Failure { message } => write!(f, "{name}: Failed ({message})"),
+            NamedHealthCheckResultKind::Loading { message } => {
+                write!(f, "{name}: Loading ({message})")
+            }
+            NamedHealthCheckResultKind::Failure { message } => {
+                write!(f, "{name}: Failed ({message})")
+            }
         }
     }
 }
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index c1d3a36ad..1701a965e 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -1,4 +1,5 @@
-use std::{collections::BTreeMap, sync::Arc};
+use std::collections::BTreeMap;
+use std::sync::Arc;
 
 use chrono::{DateTime, Utc};
 use imbl::OrdMap;
@@ -6,8 +7,9 @@ use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
 use self::health_check::HealthCheckId;
-use crate::status::health_check::HealthCheckResult;
-use crate::{prelude::*, util::GeneralGuard};
+use crate::prelude::*;
+use crate::status::health_check::NamedHealthCheckResult;
+use crate::util::GeneralGuard;
 
 pub mod health_check;
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
@@ -32,15 +34,15 @@ pub enum MainStatus {
     Running {
         #[ts(type = "string")]
         started: DateTime<Utc>,
-        #[ts(as = "BTreeMap<HealthCheckId, HealthCheckResult>")]
-        health: OrdMap<HealthCheckId, HealthCheckResult>,
+        #[ts(as = "BTreeMap<HealthCheckId, NamedHealthCheckResult>")]
+        health: OrdMap<HealthCheckId, NamedHealthCheckResult>,
     },
     #[serde(rename_all = "camelCase")]
     BackingUp {
         #[ts(type = "string | null")]
         started: Option<DateTime<Utc>>,
-        #[ts(as = "BTreeMap<HealthCheckId, HealthCheckResult>")]
-        health: OrdMap<HealthCheckId, HealthCheckResult>,
+        #[ts(as = "BTreeMap<HealthCheckId, NamedHealthCheckResult>")]
+        health: OrdMap<HealthCheckId, NamedHealthCheckResult>,
     },
 }
 impl MainStatus {
@@ -93,7 +95,7 @@ impl MainStatus {
         MainStatus::BackingUp { started, health }
     }
 
-    pub fn health(&self) -> Option<&OrdMap<HealthCheckId, HealthCheckResult>> {
+    pub fn health(&self) -> Option<&OrdMap<HealthCheckId, NamedHealthCheckResult>> {
         match self {
             MainStatus::Running { health, .. } => Some(health),
             MainStatus::BackingUp { health, .. } => Some(health),
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 7cdedff90..484817b76 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -293,8 +293,8 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
         )
       },
       HealthCheck: {
-        of(o: HealthCheckParams<Manifest>) {
-          return healthCheck<Manifest>(o)
+        of(o: HealthCheckParams) {
+          return healthCheck(o)
         },
       },
       Dependency: {
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index 4b72dbf61..adb00e296 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -1,5 +1,5 @@
 import { Effects } from "../types"
-import { CheckResult } from "./checkFns/CheckResult"
+import { HealthCheckResult } from "./checkFns/HealthCheckResult"
 import { HealthReceipt } from "./HealthReceipt"
 import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
@@ -9,66 +9,52 @@ import { Overlay } from "../util/Overlay"
 import { object, unknown } from "ts-matches"
 import * as T from "../types"
 
-export type HealthCheckParams<Manifest extends T.Manifest> = {
+export type HealthCheckParams = {
   effects: Effects
   name: string
-  image: {
-    id: keyof Manifest["images"] & T.ImageId
-    sharedRun?: boolean
-  }
   trigger?: Trigger
-  fn(overlay: Overlay): Promise<CheckResult> | CheckResult
+  fn(): Promise<HealthCheckResult> | HealthCheckResult
   onFirstSuccess?: () => unknown | Promise<unknown>
 }
 
-export function healthCheck<Manifest extends T.Manifest>(
-  o: HealthCheckParams<Manifest>,
-) {
+export function healthCheck(o: HealthCheckParams) {
   new Promise(async () => {
-    const overlay = await Overlay.of(o.effects, o.image)
-    try {
-      let currentValue: TriggerInput = {
-        hadSuccess: false,
+    let currentValue: TriggerInput = {}
+    const getCurrentValue = () => currentValue
+    const trigger = (o.trigger ?? defaultTrigger)(getCurrentValue)
+    const triggerFirstSuccess = once(() =>
+      Promise.resolve(
+        "onFirstSuccess" in o && o.onFirstSuccess
+          ? o.onFirstSuccess()
+          : undefined,
+      ),
+    )
+    for (
+      let res = await trigger.next();
+      !res.done;
+      res = await trigger.next()
+    ) {
+      try {
+        const { result, message } = await o.fn()
+        await o.effects.setHealth({
+          name: o.name,
+          id: o.name,
+          result,
+          message: message || "",
+        })
+        currentValue.lastResult = result
+        await triggerFirstSuccess().catch((err) => {
+          console.error(err)
+        })
+      } catch (e) {
+        await o.effects.setHealth({
+          name: o.name,
+          id: o.name,
+          result: "failure",
+          message: asMessage(e) || "",
+        })
+        currentValue.lastResult = "failure"
       }
-      const getCurrentValue = () => currentValue
-      const trigger = (o.trigger ?? defaultTrigger)(getCurrentValue)
-      const triggerFirstSuccess = once(() =>
-        Promise.resolve(
-          "onFirstSuccess" in o && o.onFirstSuccess
-            ? o.onFirstSuccess()
-            : undefined,
-        ),
-      )
-      for (
-        let res = await trigger.next();
-        !res.done;
-        res = await trigger.next()
-      ) {
-        try {
-          const { status, message } = await o.fn(overlay)
-          await o.effects.setHealth({
-            name: o.name,
-            id: o.name,
-            result: status,
-            message: message || "",
-          })
-          currentValue.hadSuccess = true
-          currentValue.lastResult = "success"
-          await triggerFirstSuccess().catch((err) => {
-            console.error(err)
-          })
-        } catch (e) {
-          await o.effects.setHealth({
-            name: o.name,
-            id: o.name,
-            result: "failure",
-            message: asMessage(e) || "",
-          })
-          currentValue.lastResult = "failure"
-        }
-      }
-    } finally {
-      await overlay.destroy()
     }
   })
   return {} as HealthReceipt
diff --git a/sdk/lib/health/checkFns/CheckResult.ts b/sdk/lib/health/checkFns/CheckResult.ts
deleted file mode 100644
index 8b46ee5c4..000000000
--- a/sdk/lib/health/checkFns/CheckResult.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { HealthStatus } from "../../types"
-
-export type CheckResult = {
-  status: HealthStatus
-  message: string | null
-}
diff --git a/sdk/lib/health/checkFns/HealthCheckResult.ts b/sdk/lib/health/checkFns/HealthCheckResult.ts
new file mode 100644
index 000000000..ba2468488
--- /dev/null
+++ b/sdk/lib/health/checkFns/HealthCheckResult.ts
@@ -0,0 +1,3 @@
+import { T } from "../.."
+
+export type HealthCheckResult = Omit<T.NamedHealthCheckResult, "name">
diff --git a/sdk/lib/health/checkFns/checkPortListening.ts b/sdk/lib/health/checkFns/checkPortListening.ts
index 4cc0738da..94d0becc0 100644
--- a/sdk/lib/health/checkFns/checkPortListening.ts
+++ b/sdk/lib/health/checkFns/checkPortListening.ts
@@ -1,6 +1,6 @@
 import { Effects } from "../../types"
 import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
-import { CheckResult } from "./CheckResult"
+import { HealthCheckResult } from "./HealthCheckResult"
 
 import { promisify } from "node:util"
 import * as CP from "node:child_process"
@@ -32,8 +32,8 @@ export async function checkPortListening(
     timeoutMessage?: string
     timeout?: number
   },
-): Promise<CheckResult> {
-  return Promise.race<CheckResult>([
+): Promise<HealthCheckResult> {
+  return Promise.race<HealthCheckResult>([
     Promise.resolve().then(async () => {
       const hasAddress =
         containsAddress(
@@ -45,10 +45,10 @@ export async function checkPortListening(
           port,
         )
       if (hasAddress) {
-        return { status: "success", message: options.successMessage }
+        return { result: "success", message: options.successMessage }
       }
       return {
-        status: "failure",
+        result: "failure",
         message: options.errorMessage,
       }
     }),
@@ -56,7 +56,7 @@ export async function checkPortListening(
       setTimeout(
         () =>
           resolve({
-            status: "failure",
+            result: "failure",
             message:
               options.timeoutMessage || `Timeout trying to check port ${port}`,
           }),
diff --git a/sdk/lib/health/checkFns/checkWebUrl.ts b/sdk/lib/health/checkFns/checkWebUrl.ts
index 8f61ae2ef..b25c792e1 100644
--- a/sdk/lib/health/checkFns/checkWebUrl.ts
+++ b/sdk/lib/health/checkFns/checkWebUrl.ts
@@ -1,5 +1,5 @@
 import { Effects } from "../../types"
-import { CheckResult } from "./CheckResult"
+import { HealthCheckResult } from "./HealthCheckResult"
 import { timeoutPromise } from "./index"
 import "isomorphic-fetch"
 
@@ -17,12 +17,12 @@ export const checkWebUrl = async (
     successMessage = `Reached ${url}`,
     errorMessage = `Error while fetching URL: ${url}`,
   } = {},
-): Promise<CheckResult> => {
+): Promise<HealthCheckResult> => {
   return Promise.race([fetch(url), timeoutPromise(timeout)])
     .then(
       (x) =>
         ({
-          status: "success",
+          result: "success",
           message: successMessage,
         }) as const,
     )
@@ -30,6 +30,6 @@ export const checkWebUrl = async (
       console.warn(`Error while fetching URL: ${url}`)
       console.error(JSON.stringify(e))
       console.error(e.toString())
-      return { status: "failure" as const, message: errorMessage }
+      return { result: "failure" as const, message: errorMessage }
     })
 }
diff --git a/sdk/lib/health/checkFns/index.ts b/sdk/lib/health/checkFns/index.ts
index d33d5ad0d..2de37e38c 100644
--- a/sdk/lib/health/checkFns/index.ts
+++ b/sdk/lib/health/checkFns/index.ts
@@ -1,6 +1,6 @@
 import { runHealthScript } from "./runHealthScript"
 export { checkPortListening } from "./checkPortListening"
-export { CheckResult } from "./CheckResult"
+export { HealthCheckResult } from "./HealthCheckResult"
 export { checkWebUrl } from "./checkWebUrl"
 
 export function timeoutPromise(ms: number, { message = "Timed out" } = {}) {
diff --git a/sdk/lib/health/checkFns/runHealthScript.ts b/sdk/lib/health/checkFns/runHealthScript.ts
index f0f41ee91..87fc6c69c 100644
--- a/sdk/lib/health/checkFns/runHealthScript.ts
+++ b/sdk/lib/health/checkFns/runHealthScript.ts
@@ -1,7 +1,7 @@
 import { Effects } from "../../types"
 import { Overlay } from "../../util/Overlay"
 import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
-import { CheckResult } from "./CheckResult"
+import { HealthCheckResult } from "./HealthCheckResult"
 import { timeoutPromise } from "./index"
 
 /**
@@ -12,7 +12,6 @@ import { timeoutPromise } from "./index"
  * @returns
  */
 export const runHealthScript = async (
-  effects: Effects,
   runCommand: string[],
   overlay: Overlay,
   {
@@ -21,7 +20,7 @@ export const runHealthScript = async (
     message = (res: string) =>
       `Have ran script ${runCommand} and the result: ${res}`,
   } = {},
-): Promise<CheckResult> => {
+): Promise<HealthCheckResult> => {
   const res = await Promise.race([
     overlay.exec(runCommand),
     timeoutPromise(timeout),
@@ -29,10 +28,10 @@ export const runHealthScript = async (
     console.warn(errorMessage)
     console.warn(JSON.stringify(e))
     console.warn(e.toString())
-    throw { status: "failure", message: errorMessage } as CheckResult
+    throw { result: "failure", message: errorMessage } as HealthCheckResult
   })
   return {
-    status: "success",
+    result: "success",
     message: message(res.stdout.toString()),
-  } as CheckResult
+  } as HealthCheckResult
 }
diff --git a/sdk/lib/interfaces/Origin.ts b/sdk/lib/interfaces/Origin.ts
index 52afe1ed3..cc84728ec 100644
--- a/sdk/lib/interfaces/Origin.ts
+++ b/sdk/lib/interfaces/Origin.ts
@@ -47,7 +47,6 @@ export class Origin<T extends Host> {
         name,
         description,
         hasPrimary,
-        disabled,
         id,
         type,
         username,
@@ -69,7 +68,6 @@ export class Origin<T extends Host> {
         name,
         description,
         hasPrimary,
-        disabled,
         addressInfo,
         type,
         masked,
diff --git a/sdk/lib/interfaces/ServiceInterfaceBuilder.ts b/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
index 14eaee1d3..49d8020d6 100644
--- a/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
+++ b/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
@@ -21,7 +21,6 @@ export class ServiceInterfaceBuilder {
       id: string
       description: string
       hasPrimary: boolean
-      disabled: boolean
       type: ServiceInterfaceType
       username: string | null
       path: string
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index c766e2f2e..3134d0459 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -1,6 +1,6 @@
 import { NO_TIMEOUT, SIGKILL, SIGTERM, Signals } from "../StartSdk"
 import { HealthReceipt } from "../health/HealthReceipt"
-import { CheckResult } from "../health/checkFns"
+import { HealthCheckResult } from "../health/checkFns"
 
 import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
@@ -23,7 +23,7 @@ export const cpExec = promisify(CP.exec)
 export const cpExecFile = promisify(CP.execFile)
 export type Ready = {
   display: string | null
-  fn: () => Promise<CheckResult> | CheckResult
+  fn: () => Promise<HealthCheckResult> | HealthCheckResult
   trigger?: Trigger
 }
 
diff --git a/sdk/lib/mainFn/HealthDaemon.ts b/sdk/lib/mainFn/HealthDaemon.ts
index 84865e59b..7cb15cd42 100644
--- a/sdk/lib/mainFn/HealthDaemon.ts
+++ b/sdk/lib/mainFn/HealthDaemon.ts
@@ -1,8 +1,8 @@
-import { CheckResult } from "../health/checkFns"
+import { HealthCheckResult } from "../health/checkFns"
 import { defaultTrigger } from "../trigger/defaultTrigger"
 import { Ready } from "./Daemons"
 import { Daemon } from "./Daemon"
-import { Effects } from "../types"
+import { Effects, SetHealth } from "../types"
 import { DEFAULT_SIGTERM_TIMEOUT } from "."
 
 const oncePromise = <T>() => {
@@ -21,10 +21,9 @@ const oncePromise = <T>() => {
  *
  */
 export class HealthDaemon {
-  #health: CheckResult = { status: "starting", message: null }
+  #health: HealthCheckResult = { result: "starting", message: null }
   #healthWatchers: Array<() => unknown> = []
   #running = false
-  #hadSuccess = false
   constructor(
     readonly daemon: Promise<Daemon>,
     readonly daemonIndex: number,
@@ -77,7 +76,7 @@ export class HealthDaemon {
       ;(await this.daemon).stop()
       this.turnOffHealthCheck()
 
-      this.setHealth({ status: "starting", message: null })
+      this.setHealth({ result: "starting", message: null })
     }
   }
 
@@ -88,8 +87,7 @@ export class HealthDaemon {
   private async setupHealthCheck() {
     if (this.#healthCheckCleanup) return
     const trigger = (this.ready.trigger ?? defaultTrigger)(() => ({
-      hadSuccess: this.#hadSuccess,
-      lastResult: this.#health.status,
+      lastResult: this.#health.result,
     }))
 
     const { promise: status, resolve: setStatus } = oncePromise<{
@@ -101,19 +99,16 @@ export class HealthDaemon {
         !res.done;
         res = await Promise.race([status, trigger.next()])
       ) {
-        const response: CheckResult = await Promise.resolve(
+        const response: HealthCheckResult = await Promise.resolve(
           this.ready.fn(),
         ).catch((err) => {
           console.error(err)
           return {
-            status: "failure",
+            result: "failure",
             message: "message" in err ? err.message : String(err),
           }
         })
-        this.setHealth(response)
-        if (response.status === "success") {
-          this.#hadSuccess = true
-        }
+        await this.setHealth(response)
       }
     }).catch((err) => console.error(`Daemon ${this.id} failed: ${err}`))
 
@@ -123,37 +118,23 @@ export class HealthDaemon {
     }
   }
 
-  private setHealth(health: CheckResult) {
+  private async setHealth(health: HealthCheckResult) {
     this.#health = health
     this.#healthWatchers.forEach((watcher) => watcher())
     const display = this.ready.display
-    const status = health.status
+    const result = health.result
     if (!display) {
       return
     }
-    if (
-      status === "success" ||
-      status === "disabled" ||
-      status === "starting"
-    ) {
-      this.effects.setHealth({
-        result: status,
-        message: health.message,
-        id: this.id,
-        name: display,
-      })
-    } else {
-      this.effects.setHealth({
-        result: health.status,
-        message: health.message || "",
-        id: this.id,
-        name: display,
-      })
-    }
+    await this.effects.setHealth({
+      ...health,
+      id: this.id,
+      name: display,
+    } as SetHealth)
   }
 
   private async updateStatus() {
     const healths = this.dependencies.map((d) => d.#health)
-    this.changeRunning(healths.every((x) => x.status === "success"))
+    this.changeRunning(healths.every((x) => x.result === "success"))
   }
 }
diff --git a/sdk/lib/osBindings/CheckDependenciesResult.ts b/sdk/lib/osBindings/CheckDependenciesResult.ts
index d349bdf18..de58264bc 100644
--- a/sdk/lib/osBindings/CheckDependenciesResult.ts
+++ b/sdk/lib/osBindings/CheckDependenciesResult.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { HealthCheckId } from "./HealthCheckId"
-import type { HealthCheckResult } from "./HealthCheckResult"
+import type { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 import type { PackageId } from "./PackageId"
 
 export type CheckDependenciesResult = {
@@ -8,6 +8,6 @@ export type CheckDependenciesResult = {
   isInstalled: boolean
   isRunning: boolean
   configSatisfied: boolean
-  healthChecks: { [key: HealthCheckId]: HealthCheckResult }
+  healthChecks: { [key: HealthCheckId]: NamedHealthCheckResult }
   version: string | null
 }
diff --git a/sdk/lib/osBindings/ExportServiceInterfaceParams.ts b/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
index b93e83f7c..28ac89916 100644
--- a/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
+++ b/sdk/lib/osBindings/ExportServiceInterfaceParams.ts
@@ -8,7 +8,6 @@ export type ExportServiceInterfaceParams = {
   name: string
   description: string
   hasPrimary: boolean
-  disabled: boolean
   masked: boolean
   addressInfo: AddressInfo
   type: ServiceInterfaceType
diff --git a/sdk/lib/osBindings/MainStatus.ts b/sdk/lib/osBindings/MainStatus.ts
index 6acdce14a..a528aa187 100644
--- a/sdk/lib/osBindings/MainStatus.ts
+++ b/sdk/lib/osBindings/MainStatus.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { HealthCheckId } from "./HealthCheckId"
-import type { HealthCheckResult } from "./HealthCheckResult"
+import type { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 
 export type MainStatus =
   | { status: "stopped" }
@@ -11,10 +11,10 @@ export type MainStatus =
   | {
       status: "running"
       started: string
-      health: { [key: HealthCheckId]: HealthCheckResult }
+      health: { [key: HealthCheckId]: NamedHealthCheckResult }
     }
   | {
       status: "backingUp"
       started: string | null
-      health: { [key: HealthCheckId]: HealthCheckResult }
+      health: { [key: HealthCheckId]: NamedHealthCheckResult }
     }
diff --git a/sdk/lib/osBindings/HealthCheckResult.ts b/sdk/lib/osBindings/NamedHealthCheckResult.ts
similarity index 85%
rename from sdk/lib/osBindings/HealthCheckResult.ts
rename to sdk/lib/osBindings/NamedHealthCheckResult.ts
index 6fa3d3f8c..c967e9b34 100644
--- a/sdk/lib/osBindings/HealthCheckResult.ts
+++ b/sdk/lib/osBindings/NamedHealthCheckResult.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HealthCheckResult = { name: string } & (
+export type NamedHealthCheckResult = { name: string } & (
   | { result: "success"; message: string | null }
   | { result: "disabled"; message: string | null }
   | { result: "starting"; message: string | null }
diff --git a/sdk/lib/osBindings/ServiceInterface.ts b/sdk/lib/osBindings/ServiceInterface.ts
index 91ac77515..9bcec0056 100644
--- a/sdk/lib/osBindings/ServiceInterface.ts
+++ b/sdk/lib/osBindings/ServiceInterface.ts
@@ -8,7 +8,6 @@ export type ServiceInterface = {
   name: string
   description: string
   hasPrimary: boolean
-  disabled: boolean
   masked: boolean
   addressInfo: AddressInfo
   type: ServiceInterfaceType
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 2708aef8c..74baabfd9 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -69,7 +69,6 @@ export { Governor } from "./Governor"
 export { Guid } from "./Guid"
 export { HardwareRequirements } from "./HardwareRequirements"
 export { HealthCheckId } from "./HealthCheckId"
-export { HealthCheckResult } from "./HealthCheckResult"
 export { HostAddress } from "./HostAddress"
 export { HostId } from "./HostId"
 export { HostKind } from "./HostKind"
@@ -98,6 +97,7 @@ export { MaybeUtf8String } from "./MaybeUtf8String"
 export { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
 export { MountParams } from "./MountParams"
 export { MountTarget } from "./MountTarget"
+export { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 export { NamedProgress } from "./NamedProgress"
 export { OnionHostname } from "./OnionHostname"
 export { OsIndex } from "./OsIndex"
diff --git a/sdk/lib/test/host.test.ts b/sdk/lib/test/host.test.ts
index a8ae317ed..64d486a94 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/lib/test/host.test.ts
@@ -16,7 +16,6 @@ describe("host", () => {
         id: "foo",
         description: "A Foo",
         hasPrimary: false,
-        disabled: false,
         type: "ui",
         username: "bar",
         path: "/baz",
diff --git a/sdk/lib/trigger/TriggerInput.ts b/sdk/lib/trigger/TriggerInput.ts
index 9a52d8ca5..82fe79e07 100644
--- a/sdk/lib/trigger/TriggerInput.ts
+++ b/sdk/lib/trigger/TriggerInput.ts
@@ -2,5 +2,4 @@ import { HealthStatus } from "../types"
 
 export type TriggerInput = {
   lastResult?: HealthStatus
-  hadSuccess?: boolean
 }
diff --git a/sdk/lib/trigger/changeOnFirstSuccess.ts b/sdk/lib/trigger/changeOnFirstSuccess.ts
index 4c45afe31..3da7284df 100644
--- a/sdk/lib/trigger/changeOnFirstSuccess.ts
+++ b/sdk/lib/trigger/changeOnFirstSuccess.ts
@@ -5,10 +5,12 @@ export function changeOnFirstSuccess(o: {
   afterFirstSuccess: Trigger
 }): Trigger {
   return async function* (getInput) {
-    const beforeFirstSuccess = o.beforeFirstSuccess(getInput)
-    yield
     let currentValue = getInput()
-    beforeFirstSuccess.next()
+    while (!currentValue.lastResult) {
+      yield
+      currentValue = getInput()
+    }
+    const beforeFirstSuccess = o.beforeFirstSuccess(getInput)
     for (
       let res = await beforeFirstSuccess.next();
       currentValue?.lastResult !== "success" && !res.done;
diff --git a/sdk/lib/trigger/defaultTrigger.ts b/sdk/lib/trigger/defaultTrigger.ts
index bd52dc7cc..69cac2773 100644
--- a/sdk/lib/trigger/defaultTrigger.ts
+++ b/sdk/lib/trigger/defaultTrigger.ts
@@ -2,7 +2,7 @@ import { cooldownTrigger } from "./cooldownTrigger"
 import { changeOnFirstSuccess } from "./changeOnFirstSuccess"
 import { successFailure } from "./successFailure"
 
-export const defaultTrigger = successFailure({
-  duringSuccess: cooldownTrigger(0),
-  duringError: cooldownTrigger(30000),
+export const defaultTrigger = changeOnFirstSuccess({
+  beforeFirstSuccess: cooldownTrigger(1000),
+  afterFirstSuccess: cooldownTrigger(30000),
 })
diff --git a/sdk/lib/trigger/lastStatus.ts b/sdk/lib/trigger/lastStatus.ts
new file mode 100644
index 000000000..90b8c9851
--- /dev/null
+++ b/sdk/lib/trigger/lastStatus.ts
@@ -0,0 +1,33 @@
+import { Trigger } from "."
+import { HealthStatus } from "../types"
+
+export type LastStatusTriggerParams = { [k in HealthStatus]?: Trigger } & {
+  default: Trigger
+}
+
+export function lastStatus(o: LastStatusTriggerParams): Trigger {
+  return async function* (getInput) {
+    let trigger = o.default(getInput)
+    const triggers: {
+      [k in HealthStatus]?: AsyncIterator<unknown, unknown, never>
+    } & { default: AsyncIterator<unknown, unknown, never> } = {
+      default: trigger,
+    }
+    while (true) {
+      let currentValue = getInput()
+      let prev: HealthStatus | "default" | undefined = currentValue.lastResult
+      if (!prev) {
+        yield
+        continue
+      }
+      if (!(prev in o)) {
+        prev = "default"
+      }
+      if (!triggers[prev]) {
+        triggers[prev] = o[prev]!(getInput)
+      }
+      await triggers[prev]?.next()
+      yield
+    }
+  }
+}
diff --git a/sdk/lib/trigger/successFailure.ts b/sdk/lib/trigger/successFailure.ts
index 1bab27289..7febcd356 100644
--- a/sdk/lib/trigger/successFailure.ts
+++ b/sdk/lib/trigger/successFailure.ts
@@ -1,32 +1,7 @@
 import { Trigger } from "."
+import { lastStatus } from "./lastStatus"
 
-export function successFailure(o: {
+export const successFailure = (o: {
   duringSuccess: Trigger
   duringError: Trigger
-}): Trigger {
-  return async function* (getInput) {
-    while (true) {
-      const beforeSuccess = o.duringSuccess(getInput)
-      yield
-      let currentValue = getInput()
-      beforeSuccess.next()
-      for (
-        let res = await beforeSuccess.next();
-        currentValue?.lastResult !== "success" && !res.done;
-        res = await beforeSuccess.next()
-      ) {
-        yield
-        currentValue = getInput()
-      }
-      const duringError = o.duringError(getInput)
-      for (
-        let res = await duringError.next();
-        currentValue?.lastResult === "success" && !res.done;
-        res = await duringError.next()
-      ) {
-        yield
-        currentValue = getInput()
-      }
-    }
-  }
-}
+}) => lastStatus({ success: o.duringSuccess, default: o.duringError })
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 9a3157ed3..1fdbcc66d 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -3,7 +3,7 @@ export * as configTypes from "./config/configTypes"
 import {
   DependencyRequirement,
   SetHealth,
-  HealthCheckResult,
+  NamedHealthCheckResult,
   SetMainStatus,
   ServiceInterface,
   Host,
@@ -174,7 +174,7 @@ export type Daemon = {
   [DaemonProof]: never
 }
 
-export type HealthStatus = HealthCheckResult["result"]
+export type HealthStatus = NamedHealthCheckResult["result"]
 export type SmtpValue = {
   server: string
   port: number
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 93cb44238..29ddadfb1 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -39,6 +39,23 @@ export class Overlay {
     return new Overlay(effects, id, rootfs, guid)
   }
 
+  static async with<T>(
+    effects: T.Effects,
+    image: { id: T.ImageId; sharedRun?: boolean },
+    mounts: { options: MountOptions; path: string }[],
+    fn: (overlay: Overlay) => Promise<T>,
+  ): Promise<T> {
+    const overlay = await Overlay.of(effects, image)
+    try {
+      for (let mount of mounts) {
+        await overlay.mount(mount.options, mount.path)
+      }
+      return await fn(overlay)
+    } finally {
+      await overlay.destroy()
+    }
+  }
+
   async mount(options: MountOptions, path: string): Promise<Overlay> {
     path = path.startsWith("/")
       ? `${this.rootfs}${path}`
diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/lib/util/getServiceInterface.ts
index 9148c8f9a..fd0fef779 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/lib/util/getServiceInterface.ts
@@ -50,8 +50,6 @@ export type ServiceInterfaceFilled = {
   description: string
   /** Whether or not the interface has a primary URL */
   hasPrimary: boolean
-  /** Whether or not the interface disabled */
-  disabled: boolean
   /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
   masked: boolean
   /** Information about the host for this binding */
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
index fef84a5ba..f470bc43a 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
@@ -10,15 +10,15 @@ import { ConnectionService } from 'src/app/services/connection.service'
 })
 export class AppShowHealthChecksComponent {
   @Input()
-  healthChecks!: Record<string, T.HealthCheckResult>
+  healthChecks!: Record<string, T.NamedHealthCheckResult>
 
   constructor(readonly connection$: ConnectionService) {}
 
-  isLoading(result: T.HealthCheckResult['result']): boolean {
+  isLoading(result: T.NamedHealthCheckResult['result']): boolean {
     return result === 'starting' || result === 'loading'
   }
 
-  isReady(result: T.HealthCheckResult['result']): boolean {
+  isReady(result: T.NamedHealthCheckResult['result']): boolean {
     return result !== 'failure' && result !== 'loading'
   }
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
index 30d71d427..1f27b5e46 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
@@ -5,7 +5,7 @@ import { T } from '@start9labs/start-sdk'
   name: 'healthColor',
 })
 export class HealthColorPipe implements PipeTransform {
-  transform(val: T.HealthCheckResult['result']): string {
+  transform(val: T.NamedHealthCheckResult['result']): string {
     switch (val) {
       case 'success':
         return 'success'
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
index f66773f2c..24153caf9 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
@@ -14,7 +14,7 @@ export class ToHealthChecksPipe implements PipeTransform {
 
   transform(
     manifest: T.Manifest,
-  ): Observable<Record<string, T.HealthCheckResult | null> | null> {
+  ): Observable<Record<string, T.NamedHealthCheckResult | null> | null> {
     return this.patch.watch$('packageData', manifest.id, 'status', 'main').pipe(
       map(main => {
         return main.status === 'running' && !isEmptyObject(main.health)
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index d1ce9c47c..a7ae06193 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1699,7 +1699,6 @@ export module Mock {
       ui: {
         id: 'ui',
         hasPrimary: false,
-        disabled: false,
         masked: false,
         name: 'Web UI',
         description:
@@ -1717,7 +1716,6 @@ export module Mock {
       rpc: {
         id: 'rpc',
         hasPrimary: false,
-        disabled: false,
         masked: false,
         name: 'RPC',
         description:
@@ -1735,7 +1733,6 @@ export module Mock {
       p2p: {
         id: 'p2p',
         hasPrimary: true,
-        disabled: false,
         masked: false,
         name: 'P2P',
         description:
@@ -1876,7 +1873,6 @@ export module Mock {
       ui: {
         id: 'ui',
         hasPrimary: false,
-        disabled: false,
         masked: false,
         name: 'Web UI',
         description: 'A launchable web app for Bitcoin Proxy',
@@ -1925,7 +1921,6 @@ export module Mock {
       grpc: {
         id: 'grpc',
         hasPrimary: false,
-        disabled: false,
         masked: false,
         name: 'GRPC',
         description:
@@ -1943,7 +1938,6 @@ export module Mock {
       lndconnect: {
         id: 'lndconnect',
         hasPrimary: false,
-        disabled: false,
         masked: true,
         name: 'LND Connect',
         description:
@@ -1961,7 +1955,6 @@ export module Mock {
       p2p: {
         id: 'p2p',
         hasPrimary: true,
-        disabled: false,
         masked: false,
         name: 'P2P',
         description:
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 5742ba67f..ef0e80d20 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -535,7 +535,7 @@ export interface DependencyErrorConfigUnsatisfied {
 
 export interface DependencyErrorHealthChecksFailed {
   type: 'healthChecksFailed'
-  check: T.HealthCheckResult
+  check: T.NamedHealthCheckResult
 }
 
 export interface DependencyErrorTransitive {
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 8b4c28d1e..5a6c7b815 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -132,7 +132,6 @@ export const mockPatchData: DataModel = {
         ui: {
           id: 'ui',
           hasPrimary: false,
-          disabled: false,
           masked: false,
           name: 'Web UI',
           description:
@@ -150,7 +149,6 @@ export const mockPatchData: DataModel = {
         rpc: {
           id: 'rpc',
           hasPrimary: false,
-          disabled: false,
           masked: false,
           name: 'RPC',
           description:
@@ -168,7 +166,6 @@ export const mockPatchData: DataModel = {
         p2p: {
           id: 'p2p',
           hasPrimary: true,
-          disabled: false,
           masked: false,
           name: 'P2P',
           description:
@@ -311,7 +308,6 @@ export const mockPatchData: DataModel = {
         grpc: {
           id: 'grpc',
           hasPrimary: false,
-          disabled: false,
           masked: false,
           name: 'GRPC',
           description:
@@ -329,7 +325,6 @@ export const mockPatchData: DataModel = {
         lndconnect: {
           id: 'lndconnect',
           hasPrimary: false,
-          disabled: false,
           masked: true,
           name: 'LND Connect',
           description:
@@ -347,7 +342,6 @@ export const mockPatchData: DataModel = {
         p2p: {
           id: 'p2p',
           hasPrimary: true,
-          disabled: false,
           masked: false,
           name: 'P2P',
           description:

From 0e598660b431683fd35ab95fbf45da8a557d8807 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 8 Aug 2024 15:54:46 -0600
Subject: [PATCH 258/341] redesign checkDependencies api

---
 sdk/lib/StartSdk.ts                           |  13 +-
 sdk/lib/dependencies/dependencies.ts          | 287 +++++++++++-------
 sdk/lib/exver/index.ts                        | 134 ++++----
 sdk/lib/osBindings/CheckDependenciesResult.ts |   5 +-
 4 files changed, 267 insertions(+), 172 deletions(-)

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 484817b76..c31218208 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -75,7 +75,10 @@ import * as T from "./types"
 import { testTypeVersion, ValidateExVer } from "./exver"
 import { ExposedStorePaths } from "./store/setupExposeStore"
 import { PathBuilder, extractJsonPath, pathBuilder } from "./store/PathBuilder"
-import { checkAllDependencies } from "./dependencies/dependencies"
+import {
+  CheckDependencies,
+  checkDependencies,
+} from "./dependencies/dependencies"
 import { health } from "."
 import { GetSslCertificate } from "./util/GetSslCertificate"
 
@@ -142,7 +145,13 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
     }
 
     return {
-      checkAllDependencies,
+      checkDependencies: checkDependencies as <
+        DependencyId extends keyof Manifest["dependencies"] &
+          PackageId = keyof Manifest["dependencies"] & PackageId,
+      >(
+        effects: Effects,
+        packageIds?: DependencyId[],
+      ) => Promise<CheckDependencies<DependencyId>>,
       serviceInterface: {
         getOwn: <E extends Effects>(effects: E, id: ServiceInterfaceId) =>
           removeCallbackTypes<E>(effects)(
diff --git a/sdk/lib/dependencies/dependencies.ts b/sdk/lib/dependencies/dependencies.ts
index 28b04a07b..287f63b06 100644
--- a/sdk/lib/dependencies/dependencies.ts
+++ b/sdk/lib/dependencies/dependencies.ts
@@ -1,131 +1,206 @@
+import { ExtendedVersion, VersionRange } from "../exver"
 import {
   Effects,
   PackageId,
   DependencyRequirement,
   SetHealth,
   CheckDependenciesResult,
+  HealthCheckId,
 } from "../types"
 
-export type CheckAllDependencies = {
-  notInstalled: () => Promise<CheckDependenciesResult[]>
-  notRunning: () => Promise<CheckDependenciesResult[]>
-  configNotSatisfied: () => Promise<CheckDependenciesResult[]>
-  healthErrors: () => Promise<{ [id: string]: SetHealth[] }>
+export type CheckDependencies<DependencyId extends PackageId = PackageId> = {
+  installedSatisfied: (packageId: DependencyId) => boolean
+  installedVersionSatisfied: (packageId: DependencyId) => boolean
+  runningSatisfied: (packageId: DependencyId) => boolean
+  configSatisfied: (packageId: DependencyId) => boolean
+  healthCheckSatisfied: (
+    packageId: DependencyId,
+    healthCheckId: HealthCheckId,
+  ) => boolean
+  satisfied: () => boolean
 
-  isValid: () => Promise<boolean>
-
-  throwIfNotRunning: () => Promise<void>
-  throwIfNotInstalled: () => Promise<void>
-  throwIfConfigNotSatisfied: () => Promise<void>
-  throwIfHealthError: () => Promise<void>
-
-  throwIfNotValid: () => Promise<void>
+  throwIfInstalledNotSatisfied: (packageId: DependencyId) => void
+  throwIfInstalledVersionNotSatisfied: (packageId: DependencyId) => void
+  throwIfRunningNotSatisfied: (packageId: DependencyId) => void
+  throwIfConfigNotSatisfied: (packageId: DependencyId) => void
+  throwIfHealthNotSatisfied: (
+    packageId: DependencyId,
+    healthCheckId?: HealthCheckId,
+  ) => void
+  throwIfNotSatisfied: (packageId?: DependencyId) => void
 }
-export function checkAllDependencies(effects: Effects): CheckAllDependencies {
-  const dependenciesPromise = effects.getDependencies()
-  const resultsPromise = dependenciesPromise.then((dependencies) =>
+export async function checkDependencies<
+  DependencyId extends PackageId = PackageId,
+>(
+  effects: Effects,
+  packageIds?: DependencyId[],
+): Promise<CheckDependencies<DependencyId>> {
+  let [dependencies, results] = await Promise.all([
+    effects.getDependencies(),
     effects.checkDependencies({
-      packageIds: dependencies.map((dep) => dep.id),
+      packageIds,
     }),
-  )
+  ])
+  if (packageIds) {
+    dependencies = dependencies.filter((d) =>
+      (packageIds as PackageId[]).includes(d.id),
+    )
+  }
 
-  const dependenciesByIdPromise = dependenciesPromise.then((d) =>
-    d.reduce(
-      (acc, dep) => {
-        acc[dep.id] = dep
-        return acc
-      },
-      {} as { [id: PackageId]: DependencyRequirement },
-    ),
-  )
+  const find = (packageId: DependencyId) => {
+    const dependencyRequirement = dependencies.find((d) => d.id === packageId)
+    const dependencyResult = results.find((d) => d.packageId === packageId)
+    if (!dependencyRequirement || !dependencyResult) {
+      throw new Error(`Unknown DependencyId ${packageId}`)
+    }
+    return { requirement: dependencyRequirement, result: dependencyResult }
+  }
 
-  const healthErrors = async () => {
-    const results = await resultsPromise
-    const dependenciesById = await dependenciesByIdPromise
-    const answer: { [id: PackageId]: SetHealth[] } = {}
-    for (const result of results) {
-      const dependency = dependenciesById[result.packageId]
-      if (!dependency) continue
-      if (dependency.kind !== "running") continue
+  const installedSatisfied = (packageId: DependencyId) =>
+    !!find(packageId).result.installedVersion
+  const installedVersionSatisfied = (packageId: DependencyId) => {
+    const dep = find(packageId)
+    return (
+      !!dep.result.installedVersion &&
+      ExtendedVersion.parse(dep.result.installedVersion).satisfies(
+        VersionRange.parse(dep.requirement.versionRange),
+      )
+    )
+  }
+  const runningSatisfied = (packageId: DependencyId) => {
+    const dep = find(packageId)
+    return dep.requirement.kind !== "running" || dep.result.isRunning
+  }
+  const configSatisfied = (packageId: DependencyId) =>
+    find(packageId).result.configSatisfied
+  const healthCheckSatisfied = (
+    packageId: DependencyId,
+    healthCheckId?: HealthCheckId,
+  ) => {
+    const dep = find(packageId)
+    if (
+      healthCheckId &&
+      (dep.requirement.kind !== "running" ||
+        !dep.requirement.healthChecks.includes(healthCheckId))
+    ) {
+      throw new Error(`Unknown HealthCheckId ${healthCheckId}`)
+    }
+    const errors = Object.entries(dep.result.healthChecks)
+      .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
+      .filter(([_, res]) => res.result !== "success")
+    return errors.length === 0
+  }
+  const pkgSatisfied = (packageId: DependencyId) =>
+    installedSatisfied(packageId) &&
+    installedVersionSatisfied(packageId) &&
+    runningSatisfied(packageId) &&
+    configSatisfied(packageId) &&
+    healthCheckSatisfied(packageId)
+  const satisfied = (packageId?: DependencyId) =>
+    packageId
+      ? pkgSatisfied(packageId)
+      : dependencies.every((d) => pkgSatisfied(d.id as DependencyId))
 
-      const healthChecks = Object.entries(result.healthChecks)
-        .map(([id, hc]) => ({ ...hc, id }))
-        .filter((x) => !!x.message)
-      if (healthChecks.length === 0) continue
-      answer[result.packageId] = healthChecks
+  const throwIfInstalledNotSatisfied = (packageId: DependencyId) => {
+    const dep = find(packageId)
+    if (!dep.result.installedVersion) {
+      throw new Error(`${dep.result.title || packageId} is not installed`)
+    }
+  }
+  const throwIfInstalledVersionNotSatisfied = (packageId: DependencyId) => {
+    const dep = find(packageId)
+    if (!dep.result.installedVersion) {
+      throw new Error(`${dep.result.title || packageId} is not installed`)
+    }
+    if (
+      ![dep.result.installedVersion, ...dep.result.satisfies].find((v) =>
+        ExtendedVersion.parse(v).satisfies(
+          VersionRange.parse(dep.requirement.versionRange),
+        ),
+      )
+    ) {
+      throw new Error(
+        `Installed version ${dep.result.installedVersion} of ${dep.result.title || packageId} does not match expected version range ${dep.requirement.versionRange}`,
+      )
     }
-    return answer
   }
-  const configNotSatisfied = () =>
-    resultsPromise.then((x) => x.filter((x) => !x.configSatisfied))
-  const notInstalled = () =>
-    resultsPromise.then((x) => x.filter((x) => !x.isInstalled))
-  const notRunning = async () => {
-    const results = await resultsPromise
-    const dependenciesById = await dependenciesByIdPromise
-    return results.filter((x) => {
-      const dependency = dependenciesById[x.packageId]
-      if (!dependency) return false
-      if (dependency.kind !== "running") return false
-      return !x.isRunning
-    })
+  const throwIfRunningNotSatisfied = (packageId: DependencyId) => {
+    const dep = find(packageId)
+    if (dep.requirement.kind === "running" && !dep.result.isRunning) {
+      throw new Error(`${dep.result.title || packageId} is not running`)
+    }
   }
-  const entries = <B>(x: { [k: string]: B }) => Object.entries(x)
-  const first = <A>(x: A[]): A | undefined => x[0]
-  const sinkVoid = <A>(x: A) => void 0
-  const throwIfHealthError = () =>
-    healthErrors()
-      .then(entries)
-      .then(first)
-      .then((x) => {
-        if (!x) return
-        const [id, healthChecks] = x
-        if (healthChecks.length > 0)
-          throw `Package ${id} has the following errors: ${healthChecks.map((x) => x.message).join(", ")}`
-      })
-
-  const throwIfConfigNotSatisfied = () =>
-    configNotSatisfied().then((results) => {
+  const throwIfConfigNotSatisfied = (packageId: DependencyId) => {
+    const dep = find(packageId)
+    if (!dep.result.configSatisfied) {
       throw new Error(
-        `Package ${results[0].packageId} does not have a valid configuration`,
+        `${dep.result.title || packageId}'s configuration does not satisfy requirements`,
       )
-    })
-
-  const throwIfNotRunning = () =>
-    notRunning().then((results) => {
-      if (results[0])
-        throw new Error(`Package ${results[0].packageId} is not running`)
-    })
-
-  const throwIfNotInstalled = () =>
-    notInstalled().then((results) => {
-      if (results[0])
-        throw new Error(`Package ${results[0].packageId} is not installed`)
-    })
-  const throwIfNotValid = async () =>
-    Promise.all([
-      throwIfNotRunning(),
-      throwIfNotInstalled(),
-      throwIfConfigNotSatisfied(),
-      throwIfHealthError(),
-    ]).then(sinkVoid)
-
-  const isValid = () =>
-    throwIfNotValid().then(
-      () => true,
-      () => false,
-    )
+    }
+  }
+  const throwIfHealthNotSatisfied = (
+    packageId: DependencyId,
+    healthCheckId?: HealthCheckId,
+  ) => {
+    const dep = find(packageId)
+    if (
+      healthCheckId &&
+      (dep.requirement.kind !== "running" ||
+        !dep.requirement.healthChecks.includes(healthCheckId))
+    ) {
+      throw new Error(`Unknown HealthCheckId ${healthCheckId}`)
+    }
+    const errors = Object.entries(dep.result.healthChecks)
+      .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
+      .filter(([_, res]) => res.result !== "success")
+    if (errors.length) {
+      throw new Error(
+        errors
+          .map(
+            ([_, e]) =>
+              `Health Check ${e.name} of ${dep.result.title || packageId} failed with status ${e.result}${e.message ? `: ${e.message}` : ""}`,
+          )
+          .join("; "),
+      )
+    }
+  }
+  const throwIfPkgNotSatisfied = (packageId: DependencyId) => {
+    throwIfInstalledNotSatisfied(packageId)
+    throwIfInstalledVersionNotSatisfied(packageId)
+    throwIfRunningNotSatisfied(packageId)
+    throwIfConfigNotSatisfied(packageId)
+    throwIfHealthNotSatisfied(packageId)
+  }
+  const throwIfNotSatisfied = (packageId?: DependencyId) =>
+    packageId
+      ? throwIfPkgNotSatisfied(packageId)
+      : (() => {
+          const err = dependencies.flatMap((d) => {
+            try {
+              throwIfPkgNotSatisfied(d.id as DependencyId)
+            } catch (e) {
+              if (e instanceof Error) return [e.message]
+              throw e
+            }
+            return []
+          })
+          if (err.length) {
+            throw new Error(err.join("; "))
+          }
+        })()
 
   return {
-    notRunning,
-    notInstalled,
-    configNotSatisfied,
-    healthErrors,
-    throwIfNotRunning,
+    installedSatisfied,
+    installedVersionSatisfied,
+    runningSatisfied,
+    configSatisfied,
+    healthCheckSatisfied,
+    satisfied,
+    throwIfInstalledNotSatisfied,
+    throwIfInstalledVersionNotSatisfied,
+    throwIfRunningNotSatisfied,
     throwIfConfigNotSatisfied,
-    throwIfNotValid,
-    throwIfNotInstalled,
-    throwIfHealthError,
-    isValid,
+    throwIfHealthNotSatisfied,
+    throwIfNotSatisfied,
   }
 }
diff --git a/sdk/lib/exver/index.ts b/sdk/lib/exver/index.ts
index 913194875..012cb532e 100644
--- a/sdk/lib/exver/index.ts
+++ b/sdk/lib/exver/index.ts
@@ -44,7 +44,7 @@ type Not = {
 }
 
 export class VersionRange {
-  private constructor(private atom: Anchor | And | Or | Not | P.Any | P.None) {}
+  private constructor(public atom: Anchor | And | Or | Not | P.Any | P.None) {}
 
   toString(): string {
     switch (this.atom.type) {
@@ -63,67 +63,6 @@ export class VersionRange {
     }
   }
 
-  /**
-   * Returns a boolean indicating whether a given version satisfies the VersionRange
-   * !( >= 1:1 <= 2:2) || <=#bitcoin:1.2.0-alpha:0
-   */
-  satisfiedBy(version: ExtendedVersion): boolean {
-    switch (this.atom.type) {
-      case "Anchor":
-        const otherVersion = this.atom.version
-        switch (this.atom.operator) {
-          case "=":
-            return version.equals(otherVersion)
-          case ">":
-            return version.greaterThan(otherVersion)
-          case "<":
-            return version.lessThan(otherVersion)
-          case ">=":
-            return version.greaterThanOrEqual(otherVersion)
-          case "<=":
-            return version.lessThanOrEqual(otherVersion)
-          case "!=":
-            return !version.equals(otherVersion)
-          case "^":
-            const nextMajor = this.atom.version.incrementMajor()
-            if (
-              version.greaterThanOrEqual(otherVersion) &&
-              version.lessThan(nextMajor)
-            ) {
-              return true
-            } else {
-              return false
-            }
-          case "~":
-            const nextMinor = this.atom.version.incrementMinor()
-            if (
-              version.greaterThanOrEqual(otherVersion) &&
-              version.lessThan(nextMinor)
-            ) {
-              return true
-            } else {
-              return false
-            }
-        }
-      case "And":
-        return (
-          this.atom.left.satisfiedBy(version) &&
-          this.atom.right.satisfiedBy(version)
-        )
-      case "Or":
-        return (
-          this.atom.left.satisfiedBy(version) ||
-          this.atom.right.satisfiedBy(version)
-        )
-      case "Not":
-        return !this.atom.value.satisfiedBy(version)
-      case "Any":
-        return true
-      case "None":
-        return false
-    }
-  }
-
   private static parseAtom(atom: P.VersionRangeAtom): VersionRange {
     switch (atom.type) {
       case "Not":
@@ -207,6 +146,10 @@ export class VersionRange {
   static none() {
     return new VersionRange({ type: "None" })
   }
+
+  satisfiedBy(version: Version | ExtendedVersion) {
+    return version.satisfies(this)
+  }
 }
 
 export class Version {
@@ -266,6 +209,12 @@ export class Version {
     const parsed = P.parse(version, { startRule: "Version" })
     return new Version(parsed.number, parsed.prerelease)
   }
+
+  satisfies(versionRange: VersionRange): boolean {
+    return new ExtendedVersion(null, this, new Version([0], [])).satisfies(
+      versionRange,
+    )
+  }
 }
 
 // #flavor:0.1.2-beta.1:0
@@ -404,6 +353,67 @@ export class ExtendedVersion {
       updatedDownstream,
     )
   }
+
+  /**
+   * Returns a boolean indicating whether a given version satisfies the VersionRange
+   * !( >= 1:1 <= 2:2) || <=#bitcoin:1.2.0-alpha:0
+   */
+  satisfies(versionRange: VersionRange): boolean {
+    switch (versionRange.atom.type) {
+      case "Anchor":
+        const otherVersion = versionRange.atom.version
+        switch (versionRange.atom.operator) {
+          case "=":
+            return this.equals(otherVersion)
+          case ">":
+            return this.greaterThan(otherVersion)
+          case "<":
+            return this.lessThan(otherVersion)
+          case ">=":
+            return this.greaterThanOrEqual(otherVersion)
+          case "<=":
+            return this.lessThanOrEqual(otherVersion)
+          case "!=":
+            return !this.equals(otherVersion)
+          case "^":
+            const nextMajor = versionRange.atom.version.incrementMajor()
+            if (
+              this.greaterThanOrEqual(otherVersion) &&
+              this.lessThan(nextMajor)
+            ) {
+              return true
+            } else {
+              return false
+            }
+          case "~":
+            const nextMinor = versionRange.atom.version.incrementMinor()
+            if (
+              this.greaterThanOrEqual(otherVersion) &&
+              this.lessThan(nextMinor)
+            ) {
+              return true
+            } else {
+              return false
+            }
+        }
+      case "And":
+        return (
+          this.satisfies(versionRange.atom.left) &&
+          this.satisfies(versionRange.atom.right)
+        )
+      case "Or":
+        return (
+          this.satisfies(versionRange.atom.left) ||
+          this.satisfies(versionRange.atom.right)
+        )
+      case "Not":
+        return !this.satisfies(versionRange.atom.value)
+      case "Any":
+        return true
+      case "None":
+        return false
+    }
+  }
 }
 
 export const testTypeExVer = <T extends string>(t: T & ValidateExVer<T>) => t
diff --git a/sdk/lib/osBindings/CheckDependenciesResult.ts b/sdk/lib/osBindings/CheckDependenciesResult.ts
index de58264bc..a435ff87f 100644
--- a/sdk/lib/osBindings/CheckDependenciesResult.ts
+++ b/sdk/lib/osBindings/CheckDependenciesResult.ts
@@ -5,9 +5,10 @@ import type { PackageId } from "./PackageId"
 
 export type CheckDependenciesResult = {
   packageId: PackageId
-  isInstalled: boolean
+  title: string | null
+  installedVersion: string | null
+  satisfies: string[]
   isRunning: boolean
   configSatisfied: boolean
   healthChecks: { [key: HealthCheckId]: NamedHealthCheckResult }
-  version: string | null
 }

From 806196f572102ba9def84d8675c1ce7d2b884b37 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:00:13 -0600
Subject: [PATCH 259/341] fix: Gitea/ Synapse/ Nostr types for manifest +
 config (#2704)

---
 .../Systems/SystemForEmbassy/MainLoop.ts      |   2 +-
 .../__fixtures__/giteaManifest.ts             | 123 ++++++++
 .../__fixtures__/nostrConfig2.ts              | 187 ++++++++++++
 .../__fixtures__/synapseManifest.ts           | 191 ++++++++++++
 .../transformConfigSpec.test.ts.snap          | 277 ++++++++++++++++++
 .../SystemForEmbassy/matchManifest.test.ts    |  12 +
 .../Systems/SystemForEmbassy/matchManifest.ts |  11 +-
 .../transformConfigSpec.test.ts               |   5 +
 .../SystemForEmbassy/transformConfigSpec.ts   |  49 +++-
 9 files changed, 849 insertions(+), 8 deletions(-)
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/giteaManifest.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostrConfig2.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/synapseManifest.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.test.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index f8f0a2d6e..706c0d20f 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -154,7 +154,7 @@ export class MainLoop {
                 id: healthId,
                 name: value.name,
                 result: "success",
-                message: actionProcedure["success-message"],
+                message: actionProcedure["success-message"] ?? null,
               })
               return
             }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/giteaManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/giteaManifest.ts
new file mode 100644
index 000000000..1b3a8ba94
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/giteaManifest.ts
@@ -0,0 +1,123 @@
+export default {
+  "eos-version": "0.3.5.1",
+  id: "gitea",
+  "git-hash": "91fada3edf30357a2e75c281d32f8888c87fcc2d\n",
+  title: "Gitea",
+  version: "1.22.0",
+  description: {
+    short: "A painless self-hosted Git service.",
+    long: "Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.\n",
+  },
+  assets: {
+    license: "LICENSE",
+    instructions: "instructions.md",
+    icon: "icon.png",
+    "docker-images": null,
+    assets: null,
+    scripts: null,
+  },
+  build: ["make"],
+  "release-notes":
+    "* Upstream code update\n* Fix deprecated config options\n* Full list of upstream changes available [here](https://github.com/go-gitea/gitea/compare/v1.21.8...v1.22.0)\n",
+  license: "MIT",
+  "wrapper-repo": "https://github.com/Start9Labs/gitea-startos",
+  "upstream-repo": "https://github.com/go-gitea/gitea",
+  "support-site": "https://docs.gitea.io/en-us/",
+  "marketing-site": "https://gitea.io/en-us/",
+  "donation-url": null,
+  alerts: {
+    install: null,
+    uninstall: null,
+    restore: null,
+    start: null,
+    stop: null,
+  },
+  main: {
+    type: "docker",
+    image: "main",
+    system: false,
+    entrypoint: "/usr/local/bin/docker_entrypoint.sh",
+    args: [],
+    inject: false,
+    mounts: { main: "/data" },
+    "io-format": null,
+    "sigterm-timeout": null,
+    "shm-size-mb": null,
+    "gpu-acceleration": false,
+  },
+  "health-checks": {
+    "user-signups-off": {
+      name: "User Signups Off",
+      "success-message": null,
+      type: "script",
+      args: [],
+      timeout: null,
+    },
+    web: {
+      name: "Web & Git HTTP Tor Interfaces",
+      "success-message":
+        "Gitea is ready to be visited in a web browser and git can be used with SSH over TOR.",
+      type: "script",
+      args: [],
+      timeout: null,
+    },
+  },
+  config: {
+    get: { type: "script", args: [] },
+    set: { type: "script", args: [] },
+  },
+  properties: { type: "script", args: [] },
+  volumes: { main: { type: "data" } },
+  interfaces: {
+    main: {
+      name: "Web UI / Git HTTPS/SSH",
+      description:
+        "Port 80: Browser Interface and HTTP Git Interface / Port 22: Git SSH Interface",
+      "tor-config": { "port-mapping": { "22": "22", "80": "3000" } },
+      "lan-config": { "443": { ssl: true, internal: 3000 } },
+      ui: true,
+      protocols: ["tcp", "http", "ssh", "git"],
+    },
+  },
+  backup: {
+    create: {
+      type: "docker",
+      image: "compat",
+      system: true,
+      entrypoint: "compat",
+      args: ["duplicity", "create", "/mnt/backup", "/root/data"],
+      inject: false,
+      mounts: { BACKUP: "/mnt/backup", main: "/root/data" },
+      "io-format": "yaml",
+      "sigterm-timeout": null,
+      "shm-size-mb": null,
+      "gpu-acceleration": false,
+    },
+    restore: {
+      type: "docker",
+      image: "compat",
+      system: true,
+      entrypoint: "compat",
+      args: ["duplicity", "restore", "/mnt/backup", "/root/data"],
+      inject: false,
+      mounts: { BACKUP: "/mnt/backup", main: "/root/data" },
+      "io-format": "yaml",
+      "sigterm-timeout": null,
+      "shm-size-mb": null,
+      "gpu-acceleration": false,
+    },
+  },
+  migrations: {
+    from: { "*": { type: "script", args: ["from"] } },
+    to: { "*": { type: "script", args: ["to"] } },
+  },
+  actions: {},
+  dependencies: {},
+  containers: null,
+  replaces: [],
+  "hardware-requirements": {
+    device: {},
+    ram: null,
+    arch: ["x86_64", "aarch64"],
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostrConfig2.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostrConfig2.ts
new file mode 100644
index 000000000..0cea482c7
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostrConfig2.ts
@@ -0,0 +1,187 @@
+export default {
+  "tor-address": {
+    name: "Tor Address",
+    description: "The Tor address for the websocket server.",
+    type: "pointer",
+    subtype: "package",
+    "package-id": "nostr",
+    target: "tor-address",
+    interface: "websocket",
+  },
+  "lan-address": {
+    name: "Tor Address",
+    description: "The LAN address for the websocket server.",
+    type: "pointer",
+    subtype: "package",
+    "package-id": "nostr",
+    target: "lan-address",
+    interface: "websocket",
+  },
+  "relay-type": {
+    type: "union",
+    name: "Relay Type",
+    warning:
+      "Running a public relay carries risk. Your relay can be spammed, resulting in large amounts of disk usage.",
+    tag: {
+      id: "type",
+      name: "Relay Type",
+      description:
+        "Private or public. A private relay (highly recommended) restricts write access to specific pubkeys. Anyone can write to a public relay.",
+      "variant-names": { private: "Private", public: "Public" },
+    },
+    default: "private",
+    variants: {
+      private: {
+        pubkey_whitelist: {
+          name: "Pubkey Whitelist (hex)",
+          description:
+            "A list of pubkeys that are permitted to publish through your relay. A minimum, you need to enter your own Nostr hex (not npub) pubkey. Go to https://damus.io/key/ to convert from npub to hex.",
+          type: "list",
+          range: "[1,*)",
+          subtype: "string",
+          spec: {
+            placeholder: "hex (not npub) pubkey",
+            pattern: "[0-9a-fA-F]{64}",
+            "pattern-description":
+              "Must be a valid 64-digit hexadecimal value (ie a Nostr hex pubkey, not an npub). Go to https://damus.io/key/ to convert npub to hex.",
+          },
+          default: [],
+        },
+      },
+      public: {
+        info: {
+          name: "Relay Info",
+          description: "General public info about your relay",
+          type: "object",
+          spec: {
+            name: {
+              name: "Relay Name",
+              description: "Your relay's human-readable identifier",
+              type: "string",
+              nullable: true,
+              placeholder: "Bob's Public Relay",
+              pattern: ".{3,32}",
+              "pattern-description":
+                "Must be at least 3 character and no more than 32 characters",
+              masked: false,
+            },
+            description: {
+              name: "Relay Description",
+              description: "A more detailed description for your relay",
+              type: "string",
+              nullable: true,
+              placeholder: "The best relay in town",
+              pattern: ".{6,256}",
+              "pattern-description":
+                "Must be at least 6 character and no more than 256 characters",
+              masked: false,
+            },
+            pubkey: {
+              name: "Admin contact pubkey (hex)",
+              description:
+                "The Nostr hex (not npub) pubkey of the relay administrator",
+              type: "string",
+              nullable: true,
+              placeholder: "hex (not npub) pubkey",
+              pattern: "[0-9a-fA-F]{64}",
+              "pattern-description":
+                "Must be a valid 64-digit hexadecimal value (ie a Nostr hex pubkey, not an npub). Go to https://damus.io/key/ to convert npub to hex.",
+              masked: false,
+            },
+            contact: {
+              name: "Admin contact email",
+              description: "The email address of the relay administrator",
+              type: "string",
+              nullable: true,
+              pattern: "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+",
+              "pattern-description": "Must be a valid email address.",
+              masked: false,
+            },
+          },
+        },
+        limits: {
+          name: "Limits",
+          description:
+            "Data limits to protect your relay from using too many resources",
+          type: "object",
+          spec: {
+            messages_per_sec: {
+              name: "Messages Per Second Limit",
+              description:
+                "Limit events created per second, averaged over one minute. Note: this is for the server as a whole, not per connection.",
+              type: "number",
+              nullable: false,
+              range: "[1,*)",
+              integral: true,
+              default: 2,
+              units: "messages/sec",
+            },
+            subscriptions_per_min: {
+              name: "Subscriptions Per Minute Limit",
+              description:
+                "Limit client subscriptions created per second, averaged over one minute. Strongly recommended to set this to a low value such as 10 to ensure fair service.",
+              type: "number",
+              nullable: false,
+              range: "[1,*)",
+              integral: true,
+              default: 10,
+              units: "subscriptions",
+            },
+            max_blocking_threads: {
+              name: "Max Blocking Threads",
+              description:
+                "Maximum number of blocking threads used for database connections.",
+              type: "number",
+              nullable: false,
+              range: "[0,*)",
+              integral: true,
+              units: "threads",
+              default: 16,
+            },
+            max_event_bytes: {
+              name: "Max Event Size",
+              description:
+                "Limit the maximum size of an EVENT message. Set to 0 for unlimited",
+              type: "number",
+              nullable: false,
+              range: "[0,*)",
+              integral: true,
+              units: "bytes",
+              default: 131072,
+            },
+            max_ws_message_bytes: {
+              name: "Max Websocket Message Size",
+              description: "Maximum WebSocket message in bytes.",
+              type: "number",
+              nullable: false,
+              range: "[0,*)",
+              integral: true,
+              units: "bytes",
+              default: 131072,
+            },
+            max_ws_frame_bytes: {
+              name: "Max Websocket Frame Size",
+              description: "Maximum WebSocket frame size in bytes.",
+              type: "number",
+              nullable: false,
+              range: "[0,*)",
+              integral: true,
+              units: "bytes",
+              default: 131072,
+            },
+            event_kind_blacklist: {
+              name: "Event Kind Blacklist",
+              description:
+                "Events with these kinds will be discarded. For a list of event kinds, see here: https://github.com/nostr-protocol/nips#event-kinds",
+              type: "list",
+              range: "[0,*)",
+              subtype: "number",
+              spec: { integral: true, placeholder: 30023, range: "(0,100000]" },
+              default: [],
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/synapseManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/synapseManifest.ts
new file mode 100644
index 000000000..18b520097
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/synapseManifest.ts
@@ -0,0 +1,191 @@
+export default {
+  id: "synapse",
+  title: "Synapse",
+  version: "1.98.0",
+  "release-notes":
+    "* Upstream code update\n* Synapse Admin updated to the latest version - ([full changelog](https://github.com/Awesome-Technologies/synapse-admin/compare/0.8.7...0.9.1))\n* Instructions update\n* Updated package and upstream repositories links\n* Full list of upstream changes available [here](https://github.com/element-hq/synapse/compare/v1.95.1...v1.98.0)\n",
+  license: "Apache-2.0",
+  "wrapper-repo": "https://github.com/Start9Labs/synapse-startos",
+  "upstream-repo": "https://github.com/element-hq/synapse",
+  "support-site": "https://github.com/element-hq/synapse/issues",
+  "marketing-site": "https://matrix.org/",
+  build: ["make"],
+  description: {
+    short:
+      "Synapse is a battle-tested implementation of the Matrix protocol, the killer of all messaging apps.",
+    long: "Synapse is the battle-tested, reference implementation of the Matrix protocol. Matrix is a next-generation, federated, full-featured, encrypted, independent messaging system. There are no trusted third parties involved. (see matrix.org for details).",
+  },
+  assets: {
+    license: "LICENSE",
+    icon: "icon.png",
+    instructions: "instructions.md",
+  },
+  main: {
+    type: "docker",
+    image: "main",
+    entrypoint: "docker_entrypoint.sh",
+    args: [],
+    mounts: {
+      main: "/data",
+      cert: "/mnt/cert",
+      "admin-cert": "/mnt/admin-cert",
+    },
+  },
+  "health-checks": {
+    federation: {
+      name: "Federation",
+      type: "docker",
+      image: "main",
+      system: false,
+      entrypoint: "check-federation.sh",
+      args: [],
+      mounts: {},
+      "io-format": "json",
+      inject: true,
+    },
+    "synapse-admin": {
+      name: "Admin interface",
+      "success-message":
+        "Synapse Admin is ready to be visited in a web browser.",
+      type: "docker",
+      image: "main",
+      system: false,
+      entrypoint: "check-ui.sh",
+      args: [],
+      mounts: {},
+      "io-format": "yaml",
+      inject: true,
+    },
+    "user-signups-off": {
+      name: "User Signups Off",
+      type: "docker",
+      image: "main",
+      system: false,
+      entrypoint: "user-signups-off.sh",
+      args: [],
+      mounts: {},
+      "io-format": "yaml",
+      inject: true,
+    },
+  },
+  config: {
+    get: {
+      type: "script",
+    },
+    set: {
+      type: "script",
+    },
+  },
+  properties: {
+    type: "script",
+  },
+  volumes: {
+    main: {
+      type: "data",
+    },
+    cert: {
+      type: "certificate",
+      "interface-id": "main",
+    },
+    "admin-cert": {
+      type: "certificate",
+      "interface-id": "admin",
+    },
+  },
+  alerts: {
+    start:
+      "After your first run, Synapse needs a little time to establish a stable TOR connection over federation. We kindly ask for your patience during this process. Remember, great things take time! 🕒",
+  },
+  interfaces: {
+    main: {
+      name: "Homeserver Address",
+      description:
+        "Used by clients and other servers to connect with your homeserver",
+      "tor-config": {
+        "port-mapping": {
+          "80": "80",
+          "443": "443",
+          "8448": "8448",
+        },
+      },
+      ui: false,
+      protocols: ["tcp", "http", "matrix"],
+    },
+    admin: {
+      name: "Admin Portal",
+      description: "A web application for administering your Synapse server",
+      "tor-config": {
+        "port-mapping": {
+          "80": "8080",
+          "443": "4433",
+        },
+      },
+      "lan-config": {
+        "443": {
+          ssl: true,
+          internal: 8080,
+        },
+      },
+      ui: true,
+      protocols: ["tcp", "http"],
+    },
+  },
+  dependencies: {},
+  backup: {
+    create: {
+      type: "docker",
+      image: "compat",
+      system: true,
+      entrypoint: "compat",
+      args: ["duplicity", "create", "/mnt/backup", "/data"],
+      mounts: {
+        BACKUP: "/mnt/backup",
+        main: "/data",
+      },
+    },
+    restore: {
+      type: "docker",
+      image: "compat",
+      system: true,
+      entrypoint: "compat",
+      args: ["duplicity", "restore", "/mnt/backup", "/data"],
+      mounts: {
+        BACKUP: "/mnt/backup",
+        main: "/data",
+      },
+    },
+  },
+  actions: {
+    "reset-first-user": {
+      name: "Reset First User",
+      description:
+        "This action will reset the password of the first user in your database to a random value.",
+      "allowed-statuses": ["stopped"],
+      implementation: {
+        type: "docker",
+        image: "main",
+        system: false,
+        entrypoint: "docker_entrypoint.sh",
+        args: ["reset-first-user"],
+        mounts: {
+          main: "/data",
+        },
+        "io-format": "json",
+      },
+    },
+  },
+  migrations: {
+    from: {
+      "*": {
+        type: "script",
+        args: ["from"],
+      },
+    },
+    to: {
+      "*": {
+        type: "script",
+        args: ["to"],
+      },
+    },
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
index 9eb6e97cf..01e2d0763 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
@@ -750,6 +750,283 @@ exports[`transformConfigSpec transformConfigSpec(nostr) 1`] = `
 }
 `;
 
+exports[`transformConfigSpec transformConfigSpec(nostr2) 1`] = `
+{
+  "relay-type": {
+    "default": "private",
+    "description": "Private or public. A private relay (highly recommended) restricts write access to specific pubkeys. Anyone can write to a public relay.",
+    "disabled": false,
+    "immutable": false,
+    "name": "Relay Type",
+    "required": true,
+    "type": "union",
+    "variants": {
+      "private": {
+        "name": "Private",
+        "spec": {
+          "pubkey_whitelist": {
+            "default": [],
+            "description": "A list of pubkeys that are permitted to publish through your relay. A minimum, you need to enter your own Nostr hex (not npub) pubkey. Go to https://damus.io/key/ to convert from npub to hex.",
+            "disabled": false,
+            "maxLength": null,
+            "minLength": 1,
+            "name": "Pubkey Whitelist (hex)",
+            "spec": {
+              "generate": null,
+              "inputmode": "text",
+              "masked": false,
+              "maxLength": null,
+              "minLength": null,
+              "patterns": [
+                {
+                  "description": "Must be a valid 64-digit hexadecimal value (ie a Nostr hex pubkey, not an npub). Go to https://damus.io/key/ to convert npub to hex.",
+                  "regex": "[0-9a-fA-F]{64}",
+                },
+              ],
+              "placeholder": "hex (not npub) pubkey",
+              "type": "text",
+            },
+            "type": "list",
+            "warning": null,
+          },
+        },
+      },
+      "public": {
+        "name": "Public",
+        "spec": {
+          "info": {
+            "description": "General public info about your relay",
+            "name": "Relay Info",
+            "spec": {
+              "contact": {
+                "default": null,
+                "description": "The email address of the relay administrator",
+                "disabled": false,
+                "generate": null,
+                "immutable": false,
+                "inputmode": "text",
+                "masked": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Admin contact email",
+                "patterns": [
+                  {
+                    "description": "Must be a valid email address.",
+                    "regex": "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+",
+                  },
+                ],
+                "placeholder": null,
+                "required": false,
+                "type": "text",
+                "warning": null,
+              },
+              "description": {
+                "default": null,
+                "description": "A more detailed description for your relay",
+                "disabled": false,
+                "generate": null,
+                "immutable": false,
+                "inputmode": "text",
+                "masked": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Relay Description",
+                "patterns": [
+                  {
+                    "description": "Must be at least 6 character and no more than 256 characters",
+                    "regex": ".{6,256}",
+                  },
+                ],
+                "placeholder": "The best relay in town",
+                "required": false,
+                "type": "text",
+                "warning": null,
+              },
+              "name": {
+                "default": null,
+                "description": "Your relay's human-readable identifier",
+                "disabled": false,
+                "generate": null,
+                "immutable": false,
+                "inputmode": "text",
+                "masked": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Relay Name",
+                "patterns": [
+                  {
+                    "description": "Must be at least 3 character and no more than 32 characters",
+                    "regex": ".{3,32}",
+                  },
+                ],
+                "placeholder": "Bob's Public Relay",
+                "required": false,
+                "type": "text",
+                "warning": null,
+              },
+              "pubkey": {
+                "default": null,
+                "description": "The Nostr hex (not npub) pubkey of the relay administrator",
+                "disabled": false,
+                "generate": null,
+                "immutable": false,
+                "inputmode": "text",
+                "masked": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Admin contact pubkey (hex)",
+                "patterns": [
+                  {
+                    "description": "Must be a valid 64-digit hexadecimal value (ie a Nostr hex pubkey, not an npub). Go to https://damus.io/key/ to convert npub to hex.",
+                    "regex": "[0-9a-fA-F]{64}",
+                  },
+                ],
+                "placeholder": "hex (not npub) pubkey",
+                "required": false,
+                "type": "text",
+                "warning": null,
+              },
+            },
+            "type": "object",
+            "warning": null,
+          },
+          "limits": {
+            "description": "Data limits to protect your relay from using too many resources",
+            "name": "Limits",
+            "spec": {
+              "event_kind_blacklist": {
+                "default": [],
+                "description": "Events with these kinds will be discarded. For a list of event kinds, see here: https://github.com/nostr-protocol/nips#event-kinds",
+                "disabled": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Event Kind Blacklist",
+                "spec": {
+                  "generate": null,
+                  "inputmode": "text",
+                  "masked": false,
+                  "maxLength": null,
+                  "minLength": null,
+                  "patterns": [
+                    {
+                      "description": "Integral number type",
+                      "regex": "[0-9]+",
+                    },
+                  ],
+                  "placeholder": "30023",
+                  "type": "text",
+                },
+                "type": "list",
+                "warning": null,
+              },
+              "max_blocking_threads": {
+                "default": 16,
+                "description": "Maximum number of blocking threads used for database connections.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": null,
+                "name": "Max Blocking Threads",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "threads",
+                "warning": null,
+              },
+              "max_event_bytes": {
+                "default": 131072,
+                "description": "Limit the maximum size of an EVENT message. Set to 0 for unlimited",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": null,
+                "name": "Max Event Size",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "bytes",
+                "warning": null,
+              },
+              "max_ws_frame_bytes": {
+                "default": 131072,
+                "description": "Maximum WebSocket frame size in bytes.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": null,
+                "name": "Max Websocket Frame Size",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "bytes",
+                "warning": null,
+              },
+              "max_ws_message_bytes": {
+                "default": 131072,
+                "description": "Maximum WebSocket message in bytes.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": null,
+                "name": "Max Websocket Message Size",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "bytes",
+                "warning": null,
+              },
+              "messages_per_sec": {
+                "default": 2,
+                "description": "Limit events created per second, averaged over one minute. Note: this is for the server as a whole, not per connection.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": 1,
+                "name": "Messages Per Second Limit",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "messages/sec",
+                "warning": null,
+              },
+              "subscriptions_per_min": {
+                "default": 10,
+                "description": "Limit client subscriptions created per second, averaged over one minute. Strongly recommended to set this to a low value such as 10 to ensure fair service.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": 1,
+                "name": "Subscriptions Per Minute Limit",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "subscriptions",
+                "warning": null,
+              },
+            },
+            "type": "object",
+            "warning": null,
+          },
+        },
+      },
+    },
+    "warning": null,
+  },
+}
+`;
+
 exports[`transformConfigSpec transformConfigSpec(searNXG) 1`] = `
 {
   "enable-metrics": {
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.test.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.test.ts
new file mode 100644
index 000000000..3730dd3b6
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.test.ts
@@ -0,0 +1,12 @@
+import { matchManifest } from "./matchManifest"
+import giteaManifest from "./__fixtures__/giteaManifest"
+import synapseManifest from "./__fixtures__/synapseManifest"
+
+describe("matchManifest", () => {
+  test("gittea", () => {
+    matchManifest.unsafeCast(giteaManifest)
+  })
+  test("synapse", () => {
+    matchManifest.unsafeCast(synapseManifest)
+  })
+})
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
index 8ce6cabbc..bd8856b42 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
@@ -55,10 +55,13 @@ export const matchManifest = object(
       string,
       every(
         matchProcedure,
-        object({
-          name: string,
-          ["success-message"]: string,
-        }),
+        object(
+          {
+            name: string,
+            ["success-message"]: string,
+          },
+          ["success-message"],
+        ),
       ),
     ]),
     config: object({
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
index 79caef377..93b43910b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
@@ -3,6 +3,7 @@ import fixtureEmbasyPagesConfig from "./__fixtures__/embasyPagesConfig"
 import searNXG from "./__fixtures__/searNXG"
 import bitcoind from "./__fixtures__/bitcoind"
 import nostr from "./__fixtures__/nostr"
+import nostrConfig2 from "./__fixtures__/nostrConfig2"
 
 describe("transformConfigSpec", () => {
   test("matchOldConfigSpec(embassyPages.homepage.variants[web-page])", () => {
@@ -30,4 +31,8 @@ describe("transformConfigSpec", () => {
     const spec = matchOldConfigSpec.unsafeCast(nostr)
     expect(transformConfigSpec(spec)).toMatchSnapshot()
   })
+  test("transformConfigSpec(nostr2)", () => {
+    const spec = matchOldConfigSpec.unsafeCast(nostrConfig2)
+    expect(transformConfigSpec(spec)).toMatchSnapshot()
+  })
 })
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
index 706e0b941..5ce601c57 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -74,7 +74,7 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
         integer: oldVal.integral,
         step: null,
         units: oldVal.units || null,
-        placeholder: oldVal.placeholder || null,
+        placeholder: oldVal.placeholder ? String(oldVal.placeholder) : null,
       }
     } else if (oldVal.type === "object") {
       newVal = {
@@ -267,6 +267,31 @@ function getListSpec(
         {},
       ),
     }
+  } else if (isNumberList(oldVal)) {
+    return {
+      ...partial,
+      type: "list",
+      default: oldVal.default.map(String) as string[],
+      spec: {
+        type: "text",
+        patterns: oldVal.spec.integral
+          ? [{ regex: "[0-9]+", description: "Integral number type" }]
+          : [
+              {
+                regex: "[-+]?[0-9]*\\.?[0-9]+",
+                description: "Number type",
+              },
+            ],
+        minLength: null,
+        maxLength: null,
+        masked: false,
+        generate: null,
+        inputmode: "text",
+        placeholder: oldVal.spec.placeholder
+          ? String(oldVal.spec.placeholder)
+          : null,
+      },
+    }
   } else if (isStringList(oldVal)) {
     return {
       ...partial,
@@ -337,11 +362,16 @@ function isStringList(
 ): val is OldValueSpecList & { subtype: "string" } {
   return val.subtype === "string"
 }
+function isNumberList(
+  val: OldValueSpecList,
+): val is OldValueSpecList & { subtype: "number" } {
+  return val.subtype === "number"
+}
 
 function isObjectList(
   val: OldValueSpecList,
 ): val is OldValueSpecList & { subtype: "object" } {
-  if (["number", "union"].includes(val.subtype)) {
+  if (["union"].includes(val.subtype)) {
     throw new Error("Invalid list subtype. enum, string, and object permitted.")
   }
   return val.subtype === "object"
@@ -398,7 +428,7 @@ export const matchOldValueSpecNumber = object(
     description: string,
     warning: string,
     units: string,
-    placeholder: string,
+    placeholder: anyOf(number, string),
   },
   ["default", "description", "warning", "units", "placeholder"],
 )
@@ -499,6 +529,15 @@ const matchOldListValueSpecEnum = object({
   values: array(string),
   "value-names": dictionary([string, string]),
 })
+const matchOldListValueSpecNumber = object(
+  {
+    range: string,
+    integral: boolean,
+    units: string,
+    placeholder: anyOf(number, string),
+  },
+  ["units", "placeholder"],
+)
 
 // represents a spec for a list
 const matchOldValueSpecList = every(
@@ -531,6 +570,10 @@ const matchOldValueSpecList = every(
       subtype: literals("object"),
       spec: matchOldListValueSpecObject,
     }),
+    object({
+      subtype: literals("number"),
+      spec: matchOldListValueSpecNumber,
+    }),
   ),
 )
 type OldValueSpecList = typeof matchOldValueSpecList._TYPE

From c289629a285d9a5e1e5e6a91ba11812935f4952c Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 8 Aug 2024 20:05:30 -0600
Subject: [PATCH 260/341] bump sdk version

---
 .../startos/src/service/effects/dependency.rs | 57 +++++++------------
 sdk/package-lock.json                         |  4 +-
 sdk/package.json                              |  2 +-
 3 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/core/startos/src/service/effects/dependency.rs b/core/startos/src/service/effects/dependency.rs
index fbd02800c..26582d061 100644
--- a/core/startos/src/service/effects/dependency.rs
+++ b/core/startos/src/service/effects/dependency.rs
@@ -4,8 +4,10 @@ use std::str::FromStr;
 
 use clap::builder::ValueParserFactory;
 use exver::VersionRange;
+use imbl::OrdMap;
+use imbl_value::InternedString;
 use itertools::Itertools;
-use models::{HealthCheckId, PackageId, VolumeId};
+use models::{HealthCheckId, PackageId, VersionString, VolumeId};
 use patch_db::json_ptr::JsonPointer;
 use tokio::process::Command;
 
@@ -316,12 +318,16 @@ pub struct CheckDependenciesParam {
 #[ts(export)]
 pub struct CheckDependenciesResult {
     package_id: PackageId,
-    is_installed: bool,
+    #[ts(type = "string | null")]
+    title: Option<InternedString>,
+    #[ts(type = "string | null")]
+    installed_version: Option<exver::ExtendedVersion>,
+    #[ts(type = "string[]")]
+    satisfies: BTreeSet<VersionString>,
     is_running: bool,
     config_satisfied: bool,
-    health_checks: BTreeMap<HealthCheckId, NamedHealthCheckResult>,
-    #[ts(type = "string | null")]
-    version: Option<exver::ExtendedVersion>,
+    #[ts(as = "BTreeMap::<HealthCheckId, NamedHealthCheckResult>")]
+    health_checks: OrdMap<HealthCheckId, NamedHealthCheckResult>,
 }
 pub async fn check_dependencies(
     context: EffectContext,
@@ -347,36 +353,23 @@ pub async fn check_dependencies(
     let mut results = Vec::with_capacity(package_ids.len());
 
     for (package_id, dependency_info) in package_ids {
+        let title = dependency_info.title.clone();
         let Some(package) = db.as_public().as_package_data().as_idx(&package_id) else {
             results.push(CheckDependenciesResult {
                 package_id,
-                is_installed: false,
+                title,
+                installed_version: None,
+                satisfies: BTreeSet::new(),
                 is_running: false,
                 config_satisfied: false,
                 health_checks: Default::default(),
-                version: None,
             });
             continue;
         };
         let manifest = package.as_state_info().as_manifest(ManifestPreference::New);
         let installed_version = manifest.as_version().de()?.into_version();
         let satisfies = manifest.as_satisfies().de()?;
-        let version = Some(installed_version.clone());
-        if ![installed_version]
-            .into_iter()
-            .chain(satisfies.into_iter().map(|v| v.into_version()))
-            .any(|v| v.satisfies(&dependency_info.version_range))
-        {
-            results.push(CheckDependenciesResult {
-                package_id,
-                is_installed: false,
-                is_running: false,
-                config_satisfied: false,
-                health_checks: Default::default(),
-                version,
-            });
-            continue;
-        }
+        let installed_version = Some(installed_version.clone());
         let is_installed = true;
         let status = package.as_status().as_main().de()?;
         let is_running = if is_installed {
@@ -384,25 +377,15 @@ pub async fn check_dependencies(
         } else {
             false
         };
-        let health_checks =
-            if let CurrentDependencyKind::Running { health_checks } = &dependency_info.kind {
-                status
-                    .health()
-                    .cloned()
-                    .unwrap_or_default()
-                    .into_iter()
-                    .filter(|(id, _)| health_checks.contains(id))
-                    .collect()
-            } else {
-                Default::default()
-            };
+        let health_checks = status.health().cloned().unwrap_or_default();
         results.push(CheckDependenciesResult {
             package_id,
-            is_installed,
+            title,
+            installed_version,
+            satisfies,
             is_running,
             config_satisfied: dependency_info.config_satisfied,
             health_checks,
-            version,
         });
     }
     Ok(results)
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index 06d456019..0e2bbf7cb 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha5",
+  "version": "0.3.6-alpha7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha5",
+      "version": "0.3.6-alpha7",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/sdk/package.json b/sdk/package.json
index 1f9090b14..b2b2ceb44 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha6",
+  "version": "0.3.6-alpha7",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./cjs/lib/index.js",
   "types": "./cjs/lib/index.d.ts",

From 9237984782cd629ef79de09298ab0d4184408229 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Thu, 8 Aug 2024 22:26:42 -0600
Subject: [PATCH 261/341] remove disabled from createInterface

---
 sdk/lib/StartSdk.ts |  1 -
 sdk/lib/types.ts    | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index c31218208..9989604cf 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -256,7 +256,6 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
           id: string
           description: string
           hasPrimary: boolean
-          disabled: boolean
           type: ServiceInterfaceType
           username: null | string
           path: string
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 1fdbcc66d..6c5ed0ab8 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -249,15 +249,15 @@ export type SdkPropertiesValue =
     }
   | {
       type: "string"
-      /** Value  */
+      /** The value to display to the user */
       value: string
       /** A human readable description or explanation of the value */
       description?: string
-      /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
+      /** Whether or not to mask the value, for example, when displaying a password */
       masked: boolean
-      /** (string/number only) Whether or not to include a button for copying the value to clipboard */
+      /** Whether or not to include a button for copying the value to clipboard */
       copyable?: boolean
-      /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
+      /** Whether or not to include a button for displaying the value as a QR code */
       qr?: boolean
     }
 
@@ -273,15 +273,15 @@ export type PropertiesValue =
     }
   | {
       type: "string"
-      /** Value  */
+      /** The value to display to the user */
       value: string
       /** A human readable description or explanation of the value */
       description: string | null
-      /** (string/number only) Whether or not to mask the value, for example, when displaying a password */
+      /** Whether or not to mask the value, for example, when displaying a password */
       masked: boolean
-      /** (string/number only) Whether or not to include a button for copying the value to clipboard */
+      /** Whether or not to include a button for copying the value to clipboard */
       copyable: boolean | null
-      /** (string/number only) Whether or not to include a button for displaying the value as a QR code */
+      /** Whether or not to include a button for displaying the value as a QR code */
       qr: boolean | null
     }
 

From 30885cee01592aa674b0cd8bc0a05d391b48a6a7 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:00:13 -0600
Subject: [PATCH 262/341] fix: Gitea/ Synapse/ Nostr types for manifest +
 config (#2704)

---
 .../Systems/SystemForEmbassy/MainLoop.ts      |   2 +-
 .../__fixtures__/giteaManifest.ts             | 123 ++++++++
 .../__fixtures__/nostrConfig2.ts              | 187 ++++++++++++
 .../__fixtures__/synapseManifest.ts           | 191 ++++++++++++
 .../transformConfigSpec.test.ts.snap          | 277 ++++++++++++++++++
 .../SystemForEmbassy/matchManifest.test.ts    |  12 +
 .../Systems/SystemForEmbassy/matchManifest.ts |  11 +-
 .../transformConfigSpec.test.ts               |   5 +
 .../SystemForEmbassy/transformConfigSpec.ts   |  49 +++-
 9 files changed, 849 insertions(+), 8 deletions(-)
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/giteaManifest.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostrConfig2.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/synapseManifest.ts
 create mode 100644 container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.test.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index e29170543..7f778c151 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -168,7 +168,7 @@ export class MainLoop {
                 id: healthId,
                 name: value.name,
                 result: "success",
-                message: actionProcedure["success-message"],
+                message: actionProcedure["success-message"] ?? null,
               })
               return
             }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/giteaManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/giteaManifest.ts
new file mode 100644
index 000000000..1b3a8ba94
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/giteaManifest.ts
@@ -0,0 +1,123 @@
+export default {
+  "eos-version": "0.3.5.1",
+  id: "gitea",
+  "git-hash": "91fada3edf30357a2e75c281d32f8888c87fcc2d\n",
+  title: "Gitea",
+  version: "1.22.0",
+  description: {
+    short: "A painless self-hosted Git service.",
+    long: "Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.\n",
+  },
+  assets: {
+    license: "LICENSE",
+    instructions: "instructions.md",
+    icon: "icon.png",
+    "docker-images": null,
+    assets: null,
+    scripts: null,
+  },
+  build: ["make"],
+  "release-notes":
+    "* Upstream code update\n* Fix deprecated config options\n* Full list of upstream changes available [here](https://github.com/go-gitea/gitea/compare/v1.21.8...v1.22.0)\n",
+  license: "MIT",
+  "wrapper-repo": "https://github.com/Start9Labs/gitea-startos",
+  "upstream-repo": "https://github.com/go-gitea/gitea",
+  "support-site": "https://docs.gitea.io/en-us/",
+  "marketing-site": "https://gitea.io/en-us/",
+  "donation-url": null,
+  alerts: {
+    install: null,
+    uninstall: null,
+    restore: null,
+    start: null,
+    stop: null,
+  },
+  main: {
+    type: "docker",
+    image: "main",
+    system: false,
+    entrypoint: "/usr/local/bin/docker_entrypoint.sh",
+    args: [],
+    inject: false,
+    mounts: { main: "/data" },
+    "io-format": null,
+    "sigterm-timeout": null,
+    "shm-size-mb": null,
+    "gpu-acceleration": false,
+  },
+  "health-checks": {
+    "user-signups-off": {
+      name: "User Signups Off",
+      "success-message": null,
+      type: "script",
+      args: [],
+      timeout: null,
+    },
+    web: {
+      name: "Web & Git HTTP Tor Interfaces",
+      "success-message":
+        "Gitea is ready to be visited in a web browser and git can be used with SSH over TOR.",
+      type: "script",
+      args: [],
+      timeout: null,
+    },
+  },
+  config: {
+    get: { type: "script", args: [] },
+    set: { type: "script", args: [] },
+  },
+  properties: { type: "script", args: [] },
+  volumes: { main: { type: "data" } },
+  interfaces: {
+    main: {
+      name: "Web UI / Git HTTPS/SSH",
+      description:
+        "Port 80: Browser Interface and HTTP Git Interface / Port 22: Git SSH Interface",
+      "tor-config": { "port-mapping": { "22": "22", "80": "3000" } },
+      "lan-config": { "443": { ssl: true, internal: 3000 } },
+      ui: true,
+      protocols: ["tcp", "http", "ssh", "git"],
+    },
+  },
+  backup: {
+    create: {
+      type: "docker",
+      image: "compat",
+      system: true,
+      entrypoint: "compat",
+      args: ["duplicity", "create", "/mnt/backup", "/root/data"],
+      inject: false,
+      mounts: { BACKUP: "/mnt/backup", main: "/root/data" },
+      "io-format": "yaml",
+      "sigterm-timeout": null,
+      "shm-size-mb": null,
+      "gpu-acceleration": false,
+    },
+    restore: {
+      type: "docker",
+      image: "compat",
+      system: true,
+      entrypoint: "compat",
+      args: ["duplicity", "restore", "/mnt/backup", "/root/data"],
+      inject: false,
+      mounts: { BACKUP: "/mnt/backup", main: "/root/data" },
+      "io-format": "yaml",
+      "sigterm-timeout": null,
+      "shm-size-mb": null,
+      "gpu-acceleration": false,
+    },
+  },
+  migrations: {
+    from: { "*": { type: "script", args: ["from"] } },
+    to: { "*": { type: "script", args: ["to"] } },
+  },
+  actions: {},
+  dependencies: {},
+  containers: null,
+  replaces: [],
+  "hardware-requirements": {
+    device: {},
+    ram: null,
+    arch: ["x86_64", "aarch64"],
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostrConfig2.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostrConfig2.ts
new file mode 100644
index 000000000..0cea482c7
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/nostrConfig2.ts
@@ -0,0 +1,187 @@
+export default {
+  "tor-address": {
+    name: "Tor Address",
+    description: "The Tor address for the websocket server.",
+    type: "pointer",
+    subtype: "package",
+    "package-id": "nostr",
+    target: "tor-address",
+    interface: "websocket",
+  },
+  "lan-address": {
+    name: "Tor Address",
+    description: "The LAN address for the websocket server.",
+    type: "pointer",
+    subtype: "package",
+    "package-id": "nostr",
+    target: "lan-address",
+    interface: "websocket",
+  },
+  "relay-type": {
+    type: "union",
+    name: "Relay Type",
+    warning:
+      "Running a public relay carries risk. Your relay can be spammed, resulting in large amounts of disk usage.",
+    tag: {
+      id: "type",
+      name: "Relay Type",
+      description:
+        "Private or public. A private relay (highly recommended) restricts write access to specific pubkeys. Anyone can write to a public relay.",
+      "variant-names": { private: "Private", public: "Public" },
+    },
+    default: "private",
+    variants: {
+      private: {
+        pubkey_whitelist: {
+          name: "Pubkey Whitelist (hex)",
+          description:
+            "A list of pubkeys that are permitted to publish through your relay. A minimum, you need to enter your own Nostr hex (not npub) pubkey. Go to https://damus.io/key/ to convert from npub to hex.",
+          type: "list",
+          range: "[1,*)",
+          subtype: "string",
+          spec: {
+            placeholder: "hex (not npub) pubkey",
+            pattern: "[0-9a-fA-F]{64}",
+            "pattern-description":
+              "Must be a valid 64-digit hexadecimal value (ie a Nostr hex pubkey, not an npub). Go to https://damus.io/key/ to convert npub to hex.",
+          },
+          default: [],
+        },
+      },
+      public: {
+        info: {
+          name: "Relay Info",
+          description: "General public info about your relay",
+          type: "object",
+          spec: {
+            name: {
+              name: "Relay Name",
+              description: "Your relay's human-readable identifier",
+              type: "string",
+              nullable: true,
+              placeholder: "Bob's Public Relay",
+              pattern: ".{3,32}",
+              "pattern-description":
+                "Must be at least 3 character and no more than 32 characters",
+              masked: false,
+            },
+            description: {
+              name: "Relay Description",
+              description: "A more detailed description for your relay",
+              type: "string",
+              nullable: true,
+              placeholder: "The best relay in town",
+              pattern: ".{6,256}",
+              "pattern-description":
+                "Must be at least 6 character and no more than 256 characters",
+              masked: false,
+            },
+            pubkey: {
+              name: "Admin contact pubkey (hex)",
+              description:
+                "The Nostr hex (not npub) pubkey of the relay administrator",
+              type: "string",
+              nullable: true,
+              placeholder: "hex (not npub) pubkey",
+              pattern: "[0-9a-fA-F]{64}",
+              "pattern-description":
+                "Must be a valid 64-digit hexadecimal value (ie a Nostr hex pubkey, not an npub). Go to https://damus.io/key/ to convert npub to hex.",
+              masked: false,
+            },
+            contact: {
+              name: "Admin contact email",
+              description: "The email address of the relay administrator",
+              type: "string",
+              nullable: true,
+              pattern: "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+",
+              "pattern-description": "Must be a valid email address.",
+              masked: false,
+            },
+          },
+        },
+        limits: {
+          name: "Limits",
+          description:
+            "Data limits to protect your relay from using too many resources",
+          type: "object",
+          spec: {
+            messages_per_sec: {
+              name: "Messages Per Second Limit",
+              description:
+                "Limit events created per second, averaged over one minute. Note: this is for the server as a whole, not per connection.",
+              type: "number",
+              nullable: false,
+              range: "[1,*)",
+              integral: true,
+              default: 2,
+              units: "messages/sec",
+            },
+            subscriptions_per_min: {
+              name: "Subscriptions Per Minute Limit",
+              description:
+                "Limit client subscriptions created per second, averaged over one minute. Strongly recommended to set this to a low value such as 10 to ensure fair service.",
+              type: "number",
+              nullable: false,
+              range: "[1,*)",
+              integral: true,
+              default: 10,
+              units: "subscriptions",
+            },
+            max_blocking_threads: {
+              name: "Max Blocking Threads",
+              description:
+                "Maximum number of blocking threads used for database connections.",
+              type: "number",
+              nullable: false,
+              range: "[0,*)",
+              integral: true,
+              units: "threads",
+              default: 16,
+            },
+            max_event_bytes: {
+              name: "Max Event Size",
+              description:
+                "Limit the maximum size of an EVENT message. Set to 0 for unlimited",
+              type: "number",
+              nullable: false,
+              range: "[0,*)",
+              integral: true,
+              units: "bytes",
+              default: 131072,
+            },
+            max_ws_message_bytes: {
+              name: "Max Websocket Message Size",
+              description: "Maximum WebSocket message in bytes.",
+              type: "number",
+              nullable: false,
+              range: "[0,*)",
+              integral: true,
+              units: "bytes",
+              default: 131072,
+            },
+            max_ws_frame_bytes: {
+              name: "Max Websocket Frame Size",
+              description: "Maximum WebSocket frame size in bytes.",
+              type: "number",
+              nullable: false,
+              range: "[0,*)",
+              integral: true,
+              units: "bytes",
+              default: 131072,
+            },
+            event_kind_blacklist: {
+              name: "Event Kind Blacklist",
+              description:
+                "Events with these kinds will be discarded. For a list of event kinds, see here: https://github.com/nostr-protocol/nips#event-kinds",
+              type: "list",
+              range: "[0,*)",
+              subtype: "number",
+              spec: { integral: true, placeholder: 30023, range: "(0,100000]" },
+              default: [],
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/synapseManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/synapseManifest.ts
new file mode 100644
index 000000000..18b520097
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__fixtures__/synapseManifest.ts
@@ -0,0 +1,191 @@
+export default {
+  id: "synapse",
+  title: "Synapse",
+  version: "1.98.0",
+  "release-notes":
+    "* Upstream code update\n* Synapse Admin updated to the latest version - ([full changelog](https://github.com/Awesome-Technologies/synapse-admin/compare/0.8.7...0.9.1))\n* Instructions update\n* Updated package and upstream repositories links\n* Full list of upstream changes available [here](https://github.com/element-hq/synapse/compare/v1.95.1...v1.98.0)\n",
+  license: "Apache-2.0",
+  "wrapper-repo": "https://github.com/Start9Labs/synapse-startos",
+  "upstream-repo": "https://github.com/element-hq/synapse",
+  "support-site": "https://github.com/element-hq/synapse/issues",
+  "marketing-site": "https://matrix.org/",
+  build: ["make"],
+  description: {
+    short:
+      "Synapse is a battle-tested implementation of the Matrix protocol, the killer of all messaging apps.",
+    long: "Synapse is the battle-tested, reference implementation of the Matrix protocol. Matrix is a next-generation, federated, full-featured, encrypted, independent messaging system. There are no trusted third parties involved. (see matrix.org for details).",
+  },
+  assets: {
+    license: "LICENSE",
+    icon: "icon.png",
+    instructions: "instructions.md",
+  },
+  main: {
+    type: "docker",
+    image: "main",
+    entrypoint: "docker_entrypoint.sh",
+    args: [],
+    mounts: {
+      main: "/data",
+      cert: "/mnt/cert",
+      "admin-cert": "/mnt/admin-cert",
+    },
+  },
+  "health-checks": {
+    federation: {
+      name: "Federation",
+      type: "docker",
+      image: "main",
+      system: false,
+      entrypoint: "check-federation.sh",
+      args: [],
+      mounts: {},
+      "io-format": "json",
+      inject: true,
+    },
+    "synapse-admin": {
+      name: "Admin interface",
+      "success-message":
+        "Synapse Admin is ready to be visited in a web browser.",
+      type: "docker",
+      image: "main",
+      system: false,
+      entrypoint: "check-ui.sh",
+      args: [],
+      mounts: {},
+      "io-format": "yaml",
+      inject: true,
+    },
+    "user-signups-off": {
+      name: "User Signups Off",
+      type: "docker",
+      image: "main",
+      system: false,
+      entrypoint: "user-signups-off.sh",
+      args: [],
+      mounts: {},
+      "io-format": "yaml",
+      inject: true,
+    },
+  },
+  config: {
+    get: {
+      type: "script",
+    },
+    set: {
+      type: "script",
+    },
+  },
+  properties: {
+    type: "script",
+  },
+  volumes: {
+    main: {
+      type: "data",
+    },
+    cert: {
+      type: "certificate",
+      "interface-id": "main",
+    },
+    "admin-cert": {
+      type: "certificate",
+      "interface-id": "admin",
+    },
+  },
+  alerts: {
+    start:
+      "After your first run, Synapse needs a little time to establish a stable TOR connection over federation. We kindly ask for your patience during this process. Remember, great things take time! 🕒",
+  },
+  interfaces: {
+    main: {
+      name: "Homeserver Address",
+      description:
+        "Used by clients and other servers to connect with your homeserver",
+      "tor-config": {
+        "port-mapping": {
+          "80": "80",
+          "443": "443",
+          "8448": "8448",
+        },
+      },
+      ui: false,
+      protocols: ["tcp", "http", "matrix"],
+    },
+    admin: {
+      name: "Admin Portal",
+      description: "A web application for administering your Synapse server",
+      "tor-config": {
+        "port-mapping": {
+          "80": "8080",
+          "443": "4433",
+        },
+      },
+      "lan-config": {
+        "443": {
+          ssl: true,
+          internal: 8080,
+        },
+      },
+      ui: true,
+      protocols: ["tcp", "http"],
+    },
+  },
+  dependencies: {},
+  backup: {
+    create: {
+      type: "docker",
+      image: "compat",
+      system: true,
+      entrypoint: "compat",
+      args: ["duplicity", "create", "/mnt/backup", "/data"],
+      mounts: {
+        BACKUP: "/mnt/backup",
+        main: "/data",
+      },
+    },
+    restore: {
+      type: "docker",
+      image: "compat",
+      system: true,
+      entrypoint: "compat",
+      args: ["duplicity", "restore", "/mnt/backup", "/data"],
+      mounts: {
+        BACKUP: "/mnt/backup",
+        main: "/data",
+      },
+    },
+  },
+  actions: {
+    "reset-first-user": {
+      name: "Reset First User",
+      description:
+        "This action will reset the password of the first user in your database to a random value.",
+      "allowed-statuses": ["stopped"],
+      implementation: {
+        type: "docker",
+        image: "main",
+        system: false,
+        entrypoint: "docker_entrypoint.sh",
+        args: ["reset-first-user"],
+        mounts: {
+          main: "/data",
+        },
+        "io-format": "json",
+      },
+    },
+  },
+  migrations: {
+    from: {
+      "*": {
+        type: "script",
+        args: ["from"],
+      },
+    },
+    to: {
+      "*": {
+        type: "script",
+        args: ["to"],
+      },
+    },
+  },
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
index 9eb6e97cf..01e2d0763 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
@@ -750,6 +750,283 @@ exports[`transformConfigSpec transformConfigSpec(nostr) 1`] = `
 }
 `;
 
+exports[`transformConfigSpec transformConfigSpec(nostr2) 1`] = `
+{
+  "relay-type": {
+    "default": "private",
+    "description": "Private or public. A private relay (highly recommended) restricts write access to specific pubkeys. Anyone can write to a public relay.",
+    "disabled": false,
+    "immutable": false,
+    "name": "Relay Type",
+    "required": true,
+    "type": "union",
+    "variants": {
+      "private": {
+        "name": "Private",
+        "spec": {
+          "pubkey_whitelist": {
+            "default": [],
+            "description": "A list of pubkeys that are permitted to publish through your relay. A minimum, you need to enter your own Nostr hex (not npub) pubkey. Go to https://damus.io/key/ to convert from npub to hex.",
+            "disabled": false,
+            "maxLength": null,
+            "minLength": 1,
+            "name": "Pubkey Whitelist (hex)",
+            "spec": {
+              "generate": null,
+              "inputmode": "text",
+              "masked": false,
+              "maxLength": null,
+              "minLength": null,
+              "patterns": [
+                {
+                  "description": "Must be a valid 64-digit hexadecimal value (ie a Nostr hex pubkey, not an npub). Go to https://damus.io/key/ to convert npub to hex.",
+                  "regex": "[0-9a-fA-F]{64}",
+                },
+              ],
+              "placeholder": "hex (not npub) pubkey",
+              "type": "text",
+            },
+            "type": "list",
+            "warning": null,
+          },
+        },
+      },
+      "public": {
+        "name": "Public",
+        "spec": {
+          "info": {
+            "description": "General public info about your relay",
+            "name": "Relay Info",
+            "spec": {
+              "contact": {
+                "default": null,
+                "description": "The email address of the relay administrator",
+                "disabled": false,
+                "generate": null,
+                "immutable": false,
+                "inputmode": "text",
+                "masked": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Admin contact email",
+                "patterns": [
+                  {
+                    "description": "Must be a valid email address.",
+                    "regex": "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+",
+                  },
+                ],
+                "placeholder": null,
+                "required": false,
+                "type": "text",
+                "warning": null,
+              },
+              "description": {
+                "default": null,
+                "description": "A more detailed description for your relay",
+                "disabled": false,
+                "generate": null,
+                "immutable": false,
+                "inputmode": "text",
+                "masked": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Relay Description",
+                "patterns": [
+                  {
+                    "description": "Must be at least 6 character and no more than 256 characters",
+                    "regex": ".{6,256}",
+                  },
+                ],
+                "placeholder": "The best relay in town",
+                "required": false,
+                "type": "text",
+                "warning": null,
+              },
+              "name": {
+                "default": null,
+                "description": "Your relay's human-readable identifier",
+                "disabled": false,
+                "generate": null,
+                "immutable": false,
+                "inputmode": "text",
+                "masked": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Relay Name",
+                "patterns": [
+                  {
+                    "description": "Must be at least 3 character and no more than 32 characters",
+                    "regex": ".{3,32}",
+                  },
+                ],
+                "placeholder": "Bob's Public Relay",
+                "required": false,
+                "type": "text",
+                "warning": null,
+              },
+              "pubkey": {
+                "default": null,
+                "description": "The Nostr hex (not npub) pubkey of the relay administrator",
+                "disabled": false,
+                "generate": null,
+                "immutable": false,
+                "inputmode": "text",
+                "masked": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Admin contact pubkey (hex)",
+                "patterns": [
+                  {
+                    "description": "Must be a valid 64-digit hexadecimal value (ie a Nostr hex pubkey, not an npub). Go to https://damus.io/key/ to convert npub to hex.",
+                    "regex": "[0-9a-fA-F]{64}",
+                  },
+                ],
+                "placeholder": "hex (not npub) pubkey",
+                "required": false,
+                "type": "text",
+                "warning": null,
+              },
+            },
+            "type": "object",
+            "warning": null,
+          },
+          "limits": {
+            "description": "Data limits to protect your relay from using too many resources",
+            "name": "Limits",
+            "spec": {
+              "event_kind_blacklist": {
+                "default": [],
+                "description": "Events with these kinds will be discarded. For a list of event kinds, see here: https://github.com/nostr-protocol/nips#event-kinds",
+                "disabled": false,
+                "maxLength": null,
+                "minLength": null,
+                "name": "Event Kind Blacklist",
+                "spec": {
+                  "generate": null,
+                  "inputmode": "text",
+                  "masked": false,
+                  "maxLength": null,
+                  "minLength": null,
+                  "patterns": [
+                    {
+                      "description": "Integral number type",
+                      "regex": "[0-9]+",
+                    },
+                  ],
+                  "placeholder": "30023",
+                  "type": "text",
+                },
+                "type": "list",
+                "warning": null,
+              },
+              "max_blocking_threads": {
+                "default": 16,
+                "description": "Maximum number of blocking threads used for database connections.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": null,
+                "name": "Max Blocking Threads",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "threads",
+                "warning": null,
+              },
+              "max_event_bytes": {
+                "default": 131072,
+                "description": "Limit the maximum size of an EVENT message. Set to 0 for unlimited",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": null,
+                "name": "Max Event Size",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "bytes",
+                "warning": null,
+              },
+              "max_ws_frame_bytes": {
+                "default": 131072,
+                "description": "Maximum WebSocket frame size in bytes.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": null,
+                "name": "Max Websocket Frame Size",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "bytes",
+                "warning": null,
+              },
+              "max_ws_message_bytes": {
+                "default": 131072,
+                "description": "Maximum WebSocket message in bytes.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": null,
+                "name": "Max Websocket Message Size",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "bytes",
+                "warning": null,
+              },
+              "messages_per_sec": {
+                "default": 2,
+                "description": "Limit events created per second, averaged over one minute. Note: this is for the server as a whole, not per connection.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": 1,
+                "name": "Messages Per Second Limit",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "messages/sec",
+                "warning": null,
+              },
+              "subscriptions_per_min": {
+                "default": 10,
+                "description": "Limit client subscriptions created per second, averaged over one minute. Strongly recommended to set this to a low value such as 10 to ensure fair service.",
+                "disabled": false,
+                "immutable": false,
+                "integer": true,
+                "max": null,
+                "min": 1,
+                "name": "Subscriptions Per Minute Limit",
+                "placeholder": null,
+                "required": true,
+                "step": null,
+                "type": "number",
+                "units": "subscriptions",
+                "warning": null,
+              },
+            },
+            "type": "object",
+            "warning": null,
+          },
+        },
+      },
+    },
+    "warning": null,
+  },
+}
+`;
+
 exports[`transformConfigSpec transformConfigSpec(searNXG) 1`] = `
 {
   "enable-metrics": {
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.test.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.test.ts
new file mode 100644
index 000000000..3730dd3b6
--- /dev/null
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.test.ts
@@ -0,0 +1,12 @@
+import { matchManifest } from "./matchManifest"
+import giteaManifest from "./__fixtures__/giteaManifest"
+import synapseManifest from "./__fixtures__/synapseManifest"
+
+describe("matchManifest", () => {
+  test("gittea", () => {
+    matchManifest.unsafeCast(giteaManifest)
+  })
+  test("synapse", () => {
+    matchManifest.unsafeCast(synapseManifest)
+  })
+})
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
index 8ce6cabbc..bd8856b42 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
@@ -55,10 +55,13 @@ export const matchManifest = object(
       string,
       every(
         matchProcedure,
-        object({
-          name: string,
-          ["success-message"]: string,
-        }),
+        object(
+          {
+            name: string,
+            ["success-message"]: string,
+          },
+          ["success-message"],
+        ),
       ),
     ]),
     config: object({
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
index 79caef377..93b43910b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.test.ts
@@ -3,6 +3,7 @@ import fixtureEmbasyPagesConfig from "./__fixtures__/embasyPagesConfig"
 import searNXG from "./__fixtures__/searNXG"
 import bitcoind from "./__fixtures__/bitcoind"
 import nostr from "./__fixtures__/nostr"
+import nostrConfig2 from "./__fixtures__/nostrConfig2"
 
 describe("transformConfigSpec", () => {
   test("matchOldConfigSpec(embassyPages.homepage.variants[web-page])", () => {
@@ -30,4 +31,8 @@ describe("transformConfigSpec", () => {
     const spec = matchOldConfigSpec.unsafeCast(nostr)
     expect(transformConfigSpec(spec)).toMatchSnapshot()
   })
+  test("transformConfigSpec(nostr2)", () => {
+    const spec = matchOldConfigSpec.unsafeCast(nostrConfig2)
+    expect(transformConfigSpec(spec)).toMatchSnapshot()
+  })
 })
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
index 706e0b941..5ce601c57 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -74,7 +74,7 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
         integer: oldVal.integral,
         step: null,
         units: oldVal.units || null,
-        placeholder: oldVal.placeholder || null,
+        placeholder: oldVal.placeholder ? String(oldVal.placeholder) : null,
       }
     } else if (oldVal.type === "object") {
       newVal = {
@@ -267,6 +267,31 @@ function getListSpec(
         {},
       ),
     }
+  } else if (isNumberList(oldVal)) {
+    return {
+      ...partial,
+      type: "list",
+      default: oldVal.default.map(String) as string[],
+      spec: {
+        type: "text",
+        patterns: oldVal.spec.integral
+          ? [{ regex: "[0-9]+", description: "Integral number type" }]
+          : [
+              {
+                regex: "[-+]?[0-9]*\\.?[0-9]+",
+                description: "Number type",
+              },
+            ],
+        minLength: null,
+        maxLength: null,
+        masked: false,
+        generate: null,
+        inputmode: "text",
+        placeholder: oldVal.spec.placeholder
+          ? String(oldVal.spec.placeholder)
+          : null,
+      },
+    }
   } else if (isStringList(oldVal)) {
     return {
       ...partial,
@@ -337,11 +362,16 @@ function isStringList(
 ): val is OldValueSpecList & { subtype: "string" } {
   return val.subtype === "string"
 }
+function isNumberList(
+  val: OldValueSpecList,
+): val is OldValueSpecList & { subtype: "number" } {
+  return val.subtype === "number"
+}
 
 function isObjectList(
   val: OldValueSpecList,
 ): val is OldValueSpecList & { subtype: "object" } {
-  if (["number", "union"].includes(val.subtype)) {
+  if (["union"].includes(val.subtype)) {
     throw new Error("Invalid list subtype. enum, string, and object permitted.")
   }
   return val.subtype === "object"
@@ -398,7 +428,7 @@ export const matchOldValueSpecNumber = object(
     description: string,
     warning: string,
     units: string,
-    placeholder: string,
+    placeholder: anyOf(number, string),
   },
   ["default", "description", "warning", "units", "placeholder"],
 )
@@ -499,6 +529,15 @@ const matchOldListValueSpecEnum = object({
   values: array(string),
   "value-names": dictionary([string, string]),
 })
+const matchOldListValueSpecNumber = object(
+  {
+    range: string,
+    integral: boolean,
+    units: string,
+    placeholder: anyOf(number, string),
+  },
+  ["units", "placeholder"],
+)
 
 // represents a spec for a list
 const matchOldValueSpecList = every(
@@ -531,6 +570,10 @@ const matchOldValueSpecList = every(
       subtype: literals("object"),
       spec: matchOldListValueSpecObject,
     }),
+    object({
+      subtype: literals("number"),
+      spec: matchOldListValueSpecNumber,
+    }),
   ),
 )
 type OldValueSpecList = typeof matchOldValueSpecList._TYPE

From 46a893a8b663f49d683cd2c1d5e6d729b9866120 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Sat, 10 Aug 2024 05:46:54 -0600
Subject: [PATCH 263/341] fix bug with setup wiz recovery

---
 .../setup-wizard/src/app/pages/recover/recover.page.ts    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
index dd1dae9ce..a3b03049e 100644
--- a/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/recover/recover.page.ts
@@ -4,7 +4,7 @@ import { ErrorService } from '@start9labs/shared'
 import { CifsModal } from 'src/app/modals/cifs-modal/cifs-modal.page'
 import {
   ApiService,
-  StartOSDiskInfoWithId,
+  StartOSDiskInfoFull,
 } from 'src/app/services/api/api.service'
 import { StateService } from 'src/app/services/state.service'
 import { PasswordPage } from '../../modals/password/password.page'
@@ -16,7 +16,7 @@ import { PasswordPage } from '../../modals/password/password.page'
 })
 export class RecoverPage {
   loading = true
-  servers: StartOSDiskInfoWithId[] = []
+  servers: StartOSDiskInfoFull[] = []
 
   constructor(
     private readonly apiService: ApiService,
@@ -78,7 +78,7 @@ export class RecoverPage {
     await modal.present()
   }
 
-  async select(server: StartOSDiskInfoWithId) {
+  async select(server: StartOSDiskInfoFull) {
     const modal = await this.modalController.create({
       component: PasswordPage,
       componentProps: { passwordHash: server.passwordHash },
@@ -90,7 +90,7 @@ export class RecoverPage {
           type: 'backup',
           target: {
             type: 'disk',
-            logicalname: res.data.logicalname,
+            logicalname: server.partition.logicalname,
           },
           serverId: server.id,
           password: res.data.password,

From c704626a39d9b34443e36c8e50b0200590bf22c6 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:16:23 -0600
Subject: [PATCH 264/341] Fix/overlay destroy (#2707)

* feature: Make all errors in console.error be including an error for that stack tract

* feature: Make all errors in console.error be including an error for that stack tract

* fix: Add the tinisubreaper for the subreapers to know they are not the reaper

* fix: overlay always destroyed

* chore: Move the style of destroy to just private
---
 container-runtime/package-lock.json           | 17 ++++
 .../src/Adapters/EffectCreator.ts             |  7 +-
 .../DockerProcedureContainer.ts               | 39 +++++---
 .../Systems/SystemForEmbassy/MainLoop.ts      | 64 +++++++------
 .../Systems/SystemForEmbassy/index.ts         | 31 ++++---
 .../SystemForEmbassy/polyfillEffects.ts       | 18 ++--
 .../src/Adapters/Systems/SystemForStartOs.ts  |  6 +-
 core/startos/src/service/effects/image.rs     |  2 +-
 sdk/lib/backup/Backups.ts                     |  3 +-
 sdk/lib/config/setupConfig.ts                 |  4 +-
 sdk/lib/health/HealthCheck.ts                 |  3 +-
 sdk/lib/health/checkFns/checkWebUrl.ts        |  3 +-
 sdk/lib/mainFn/CommandController.ts           | 36 +++++---
 sdk/lib/mainFn/Daemon.ts                      | 15 +--
 sdk/lib/mainFn/HealthDaemon.ts                | 47 +++++-----
 sdk/lib/s9pk/merkleArchive/varint.ts          |  4 +-
 sdk/lib/util/Overlay.ts                       | 92 ++++++++++++++-----
 sdk/lib/util/asError.ts                       |  6 ++
 sdk/lib/util/index.ts                         |  1 +
 19 files changed, 261 insertions(+), 137 deletions(-)
 create mode 100644 sdk/lib/util/asError.ts

diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index 244ade9f4..2fddf23f2 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -20,6 +20,7 @@
         "node-fetch": "^3.1.0",
         "ts-matches": "^5.5.1",
         "tslib": "^2.5.3",
+        "tslog": "^4.9.3",
         "typescript": "^5.1.3",
         "yaml": "^2.3.1"
       },
@@ -5627,6 +5628,17 @@
       "version": "2.6.3",
       "license": "0BSD"
     },
+    "node_modules/tslog": {
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/tslog/-/tslog-4.9.3.tgz",
+      "integrity": "sha512-oDWuGVONxhVEBtschLf2cs/Jy8i7h1T+CpdkTNWQgdAF7DhRo2G8vMCgILKe7ojdEkLhICWgI1LYSSKaJsRgcw==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/fullstack-build/tslog?sponsor=1"
+      }
+    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -9746,6 +9758,11 @@
     "tslib": {
       "version": "2.6.3"
     },
+    "tslog": {
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/tslog/-/tslog-4.9.3.tgz",
+      "integrity": "sha512-oDWuGVONxhVEBtschLf2cs/Jy8i7h1T+CpdkTNWQgdAF7DhRo2G8vMCgILKe7ojdEkLhICWgI1LYSSKaJsRgcw=="
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index 0ef299151..607e18b02 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -1,4 +1,4 @@
-import { types as T } from "@start9labs/start-sdk"
+import { types as T, utils } from "@start9labs/start-sdk"
 import * as net from "net"
 import { object, string, number, literals, some, unknown } from "ts-matches"
 import { Effects } from "../Models/Effects"
@@ -65,7 +65,10 @@ const rpcRoundFor =
             )
             if (testRpcError(res)) {
               let message = res.error.message
-              console.error("Error in host RPC:", { method, params })
+              console.error(
+                "Error in host RPC:",
+                utils.asError({ method, params }),
+              )
               if (string.test(res.error.data)) {
                 message += ": " + res.error.data
                 console.error(`Details: ${res.error.data}`)
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 40a152bab..47325170d 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -4,19 +4,35 @@ import { Overlay, types as T } from "@start9labs/start-sdk"
 import { promisify } from "util"
 import { DockerProcedure, VolumeId } from "../../../Models/DockerProcedure"
 import { Volume } from "./matchVolume"
+import { ExecSpawnable } from "@start9labs/start-sdk/cjs/lib/util/Overlay"
 export const exec = promisify(cp.exec)
 export const execFile = promisify(cp.execFile)
 
 export class DockerProcedureContainer {
-  private constructor(readonly overlay: Overlay) {}
-  // static async readonlyOf(data: DockerProcedure) {
-  //   return DockerProcedureContainer.of(data, ["-o", "ro"])
-  // }
+  private constructor(private readonly overlay: ExecSpawnable) {}
+
   static async of(
     effects: T.Effects,
     packageId: string,
     data: DockerProcedure,
     volumes: { [id: VolumeId]: Volume },
+    options: { overlay?: ExecSpawnable } = {},
+  ) {
+    const overlay =
+      options?.overlay ??
+      (await DockerProcedureContainer.createOverlay(
+        effects,
+        packageId,
+        data,
+        volumes,
+      ))
+    return new DockerProcedureContainer(overlay)
+  }
+  static async createOverlay(
+    effects: T.Effects,
+    packageId: string,
+    data: DockerProcedure,
+    volumes: { [id: VolumeId]: Volume },
   ) {
     const overlay = await Overlay.of(effects, { id: data.image })
 
@@ -84,23 +100,18 @@ export class DockerProcedureContainer {
         }
       }
     }
-
-    return new DockerProcedureContainer(overlay)
+    return overlay
   }
 
-  async exec(commands: string[], { destroy = true } = {}) {
+  async exec(commands: string[], {} = {}) {
     try {
       return await this.overlay.exec(commands)
     } finally {
-      if (destroy) await this.overlay.destroy()
+      await this.overlay.destroy?.()
     }
   }
 
-  async execFail(
-    commands: string[],
-    timeoutMs: number | null,
-    { destroy = true } = {},
-  ) {
+  async execFail(commands: string[], timeoutMs: number | null, {} = {}) {
     try {
       const res = await this.overlay.exec(commands, {}, timeoutMs)
       if (res.exitCode !== 0) {
@@ -114,7 +125,7 @@ export class DockerProcedureContainer {
       }
       return res
     } finally {
-      if (destroy) await this.overlay.destroy()
+      await this.overlay.destroy?.()
     }
   }
 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 7f778c151..79f197091 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -5,6 +5,7 @@ import { T, utils } from "@start9labs/start-sdk"
 import { Daemon } from "@start9labs/start-sdk/cjs/lib/mainFn/Daemon"
 import { Effects } from "../../../Models/Effects"
 import { off } from "node:process"
+import { CommandController } from "@start9labs/start-sdk/cjs/lib/mainFn/CommandController"
 
 const EMBASSY_HEALTH_INTERVAL = 15 * 1000
 const EMBASSY_PROPERTIES_LOOP = 30 * 1000
@@ -14,9 +15,8 @@ const EMBASSY_PROPERTIES_LOOP = 30 * 1000
  * Also, this has an ability to clean itself up too if need be.
  */
 export class MainLoop {
-  private _mainDockerContainer?: DockerProcedureContainer
-  get mainDockerContainer() {
-    return this._mainDockerContainer
+  get mainOverlay() {
+    return this.mainEvent?.daemon?.overlay
   }
   private healthLoops?: {
     name: string
@@ -52,27 +52,33 @@ export class MainLoop {
     await this.setupInterfaces(effects)
     await effects.setMainStatus({ status: "running" })
     const jsMain = (this.system.moduleCode as any)?.jsMain
-    const dockerProcedureContainer = await DockerProcedureContainer.of(
-      effects,
-      this.system.manifest.id,
-      this.system.manifest.main,
-      this.system.manifest.volumes,
-    )
-    this._mainDockerContainer = dockerProcedureContainer
     if (jsMain) {
       throw new Error("Unreachable")
     }
-    const daemon = await Daemon.of()(
-      this.effects,
-      { id: this.system.manifest.main.image },
-      currentCommand,
-      {
-        overlay: dockerProcedureContainer.overlay,
-        sigtermTimeout: utils.inMs(
-          this.system.manifest.main["sigterm-timeout"],
-        ),
-      },
-    )
+    const daemon = new Daemon(async () => {
+      const overlay = await DockerProcedureContainer.createOverlay(
+        effects,
+        this.system.manifest.id,
+        this.system.manifest.main,
+        this.system.manifest.volumes,
+      )
+      return CommandController.of()(
+        this.effects,
+
+        { id: this.system.manifest.main.image },
+        currentCommand,
+        {
+          overlay,
+          env: {
+            TINI_SUBREAPER: "true",
+          },
+          sigtermTimeout: utils.inMs(
+            this.system.manifest.main["sigterm-timeout"],
+          ),
+        },
+      )
+    })
+
     daemon.start()
     return {
       daemon,
@@ -128,10 +134,11 @@ export class MainLoop {
     const main = await mainEvent
     delete this.mainEvent
     delete this.healthLoops
-    await main?.daemon.stop().catch((e) => console.error(e))
+    await main?.daemon
+      .stop()
+      .catch((e) => console.error(`Main loop error`, utils.asError(e)))
     this.effects.setMainStatus({ status: "stopped" })
     if (healthLoops) healthLoops.forEach((x) => clearInterval(x.interval))
-    delete this._mainDockerContainer
   }
 
   private constructHealthLoops() {
@@ -144,24 +151,27 @@ export class MainLoop {
           const actionProcedure = value
           const timeChanged = Date.now() - start
           if (actionProcedure.type === "docker") {
+            const overlay = actionProcedure.inject
+              ? this.mainOverlay
+              : undefined
             // prettier-ignore
             const container = 
-              actionProcedure.inject && this._mainDockerContainer ?
-              this._mainDockerContainer :
               await DockerProcedureContainer.of(
                 effects,
                 manifest.id,
                 actionProcedure,
                 manifest.volumes,
+                {
+                  overlay,
+                }
               )
-            const shouldDestroy = container !== this._mainDockerContainer
             const executed = await container.exec(
               [
                 actionProcedure.entrypoint,
                 ...actionProcedure.args,
                 JSON.stringify(timeChanged),
               ],
-              { destroy: shouldDestroy },
+              {},
             )
             if (executed.exitCode === 0) {
               await effects.setHealth({
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 8b74a7217..131d912e1 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -194,7 +194,7 @@ export class SystemForEmbassy implements System {
     const moduleCode = await import(EMBASSY_JS_LOCATION)
       .catch((_) => require(EMBASSY_JS_LOCATION))
       .catch(async (_) => {
-        console.error("Could not load the js")
+        console.error(utils.asError("Could not load the js"))
         console.error({
           exists: await fs.stat(EMBASSY_JS_LOCATION),
         })
@@ -798,17 +798,18 @@ export class SystemForEmbassy implements System {
     const actionProcedure = this.manifest.actions?.[actionId]?.implementation
     if (!actionProcedure) return { message: "Action not found", value: null }
     if (actionProcedure.type === "docker") {
-      const container =
-        actionProcedure.inject && this.currentRunning?.mainDockerContainer
-          ? this.currentRunning?.mainDockerContainer
-          : await DockerProcedureContainer.of(
-              effects,
-              this.manifest.id,
-              actionProcedure,
-              this.manifest.volumes,
-            )
-      const shouldDestroy =
-        container !== this.currentRunning?.mainDockerContainer
+      const overlay = actionProcedure.inject
+        ? this.currentRunning?.mainOverlay
+        : undefined
+      const container = await DockerProcedureContainer.of(
+        effects,
+        this.manifest.id,
+        actionProcedure,
+        this.manifest.volumes,
+        {
+          overlay,
+        },
+      )
       return JSON.parse(
         (
           await container.execFail(
@@ -818,7 +819,6 @@ export class SystemForEmbassy implements System {
               JSON.stringify(formData),
             ],
             timeoutMs,
-            { destroy: shouldDestroy },
           )
         ).stdout.toString(),
       )
@@ -987,7 +987,10 @@ async function updateConfig(
           })
           .once()
           .catch((x) => {
-            console.error("Could not get the service interface", x)
+            console.error(
+              "Could not get the service interface",
+              utils.asError(x),
+            )
             return null
           })
         const catchFn = <X>(fn: () => X) => {
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 6481a7a56..03af30c90 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -3,7 +3,7 @@ import * as oet from "./oldEmbassyTypes"
 import { Volume } from "../../../Models/Volume"
 import * as child_process from "child_process"
 import { promisify } from "util"
-import { daemons, startSdk, T } from "@start9labs/start-sdk"
+import { daemons, startSdk, T, utils } from "@start9labs/start-sdk"
 import "isomorphic-fetch"
 import { Manifest } from "./matchManifest"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
@@ -124,19 +124,19 @@ export const polyfillEffects = (
       wait(): Promise<oet.ResultType<string>>
       term(): Promise<void>
     } {
-      const dockerProcedureContainer = DockerProcedureContainer.of(
+      const promiseOverlay = DockerProcedureContainer.createOverlay(
         effects,
         manifest.id,
         manifest.main,
         manifest.volumes,
       )
-      const daemon = dockerProcedureContainer.then((dockerProcedureContainer) =>
+      const daemon = promiseOverlay.then((overlay) =>
         daemons.runCommand()(
           effects,
           { id: manifest.main.image },
           [input.command, ...(input.args || [])],
           {
-            overlay: dockerProcedureContainer.overlay,
+            overlay,
           },
         ),
       )
@@ -224,16 +224,16 @@ export const polyfillEffects = (
       return new Promise((resolve) => setTimeout(resolve, timeMs))
     },
     trace(whatToPrint: string): void {
-      console.trace(whatToPrint)
+      console.trace(utils.asError(whatToPrint))
     },
     warn(whatToPrint: string): void {
-      console.warn(whatToPrint)
+      console.warn(utils.asError(whatToPrint))
     },
     error(whatToPrint: string): void {
-      console.error(whatToPrint)
+      console.error(utils.asError(whatToPrint))
     },
     debug(whatToPrint: string): void {
-      console.debug(whatToPrint)
+      console.debug(utils.asError(whatToPrint))
     },
     info(whatToPrint: string): void {
       console.log(false)
@@ -357,7 +357,7 @@ export const polyfillEffects = (
       })
 
       spawned.stderr.on("data", (data: unknown) => {
-        console.error(String(data))
+        console.error(`polyfill.runAsync`, utils.asError(data))
       })
 
       const id = async () => {
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 029b504c0..1dd0a9744 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -4,7 +4,7 @@ import matches, { any, number, object, string, tuple } from "ts-matches"
 import { Effects } from "../../Models/Effects"
 import { RpcResult, matchRpcResult } from "../RpcListener"
 import { duration } from "../../Models/Duration"
-import { T } from "@start9labs/start-sdk"
+import { T, utils } from "@start9labs/start-sdk"
 import { Volume } from "../../Models/Volume"
 import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
 import { CallbackHolder } from "../../Models/CallbackHolder"
@@ -57,7 +57,9 @@ export class SystemForStartOs implements System {
     if (this.runningMain) {
       this.runningMain.callbacks
         .callCallback(callback, args)
-        .catch((error) => console.error(`callback ${callback} failed`, error))
+        .catch((error) =>
+          console.error(`callback ${callback} failed`, utils.asError(error)),
+        )
     } else {
       console.warn(`callback ${callback} ignored because system is not running`)
     }
diff --git a/core/startos/src/service/effects/image.rs b/core/startos/src/service/effects/image.rs
index af62047ed..4b5293506 100644
--- a/core/startos/src/service/effects/image.rs
+++ b/core/startos/src/service/effects/image.rs
@@ -34,7 +34,7 @@ pub fn chroot<C: Context>(
         args,
     }: ChrootParams,
 ) -> Result<(), Error> {
-    let mut cmd = std::process::Command::new(command);
+    let mut cmd: std::process::Command = std::process::Command::new(command);
     if let Some(env) = env {
         for (k, v) in std::fs::read_to_string(env)?
             .lines()
diff --git a/sdk/lib/backup/Backups.ts b/sdk/lib/backup/Backups.ts
index 6751b1910..031ac4e4c 100644
--- a/sdk/lib/backup/Backups.ts
+++ b/sdk/lib/backup/Backups.ts
@@ -2,6 +2,7 @@ import * as T from "../types"
 
 import * as child_process from "child_process"
 import { promises as fsPromises } from "fs"
+import { asError } from "../util"
 
 export type BACKUP = "BACKUP"
 export const DEFAULT_OPTIONS: T.BackupOptions = {
@@ -183,7 +184,7 @@ async function runRsync(
   })
 
   spawned.stderr.on("data", (data: unknown) => {
-    console.error(String(data))
+    console.error(`Backups.runAsync`, asError(data))
   })
 
   const id = async () => {
diff --git a/sdk/lib/config/setupConfig.ts b/sdk/lib/config/setupConfig.ts
index 8a1550d57..f354c81ed 100644
--- a/sdk/lib/config/setupConfig.ts
+++ b/sdk/lib/config/setupConfig.ts
@@ -57,7 +57,9 @@ export function setupConfig<
   return {
     setConfig: (async ({ effects, input }) => {
       if (!validator.test(input)) {
-        await console.error(String(validator.errorMessage(input)))
+        await console.error(
+          new Error(validator.errorMessage(input)?.toString()),
+        )
         return { error: "Set config type error for config" }
       }
       await effects.clearBindings()
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index adb00e296..8186a3cce 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -8,6 +8,7 @@ import { once } from "../util/once"
 import { Overlay } from "../util/Overlay"
 import { object, unknown } from "ts-matches"
 import * as T from "../types"
+import { asError } from "../util/asError"
 
 export type HealthCheckParams = {
   effects: Effects
@@ -44,7 +45,7 @@ export function healthCheck(o: HealthCheckParams) {
         })
         currentValue.lastResult = result
         await triggerFirstSuccess().catch((err) => {
-          console.error(err)
+          console.error(asError(err))
         })
       } catch (e) {
         await o.effects.setHealth({
diff --git a/sdk/lib/health/checkFns/checkWebUrl.ts b/sdk/lib/health/checkFns/checkWebUrl.ts
index b25c792e1..042115211 100644
--- a/sdk/lib/health/checkFns/checkWebUrl.ts
+++ b/sdk/lib/health/checkFns/checkWebUrl.ts
@@ -1,4 +1,5 @@
 import { Effects } from "../../types"
+import { asError } from "../../util/asError"
 import { HealthCheckResult } from "./HealthCheckResult"
 import { timeoutPromise } from "./index"
 import "isomorphic-fetch"
@@ -29,7 +30,7 @@ export const checkWebUrl = async (
     .catch((e) => {
       console.warn(`Error while fetching URL: ${url}`)
       console.error(JSON.stringify(e))
-      console.error(e.toString())
+      console.error(asError(e))
       return { result: "failure" as const, message: errorMessage }
     })
 }
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/lib/mainFn/CommandController.ts
index 40f787f86..8635f76e6 100644
--- a/sdk/lib/mainFn/CommandController.ts
+++ b/sdk/lib/mainFn/CommandController.ts
@@ -2,14 +2,20 @@ import { DEFAULT_SIGTERM_TIMEOUT } from "."
 import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../StartSdk"
 
 import * as T from "../types"
-import { MountOptions, Overlay } from "../util/Overlay"
+import { asError } from "../util/asError"
+import {
+  ExecSpawnable,
+  MountOptions,
+  NonDestroyableOverlay,
+  Overlay,
+} from "../util/Overlay"
 import { splitCommand } from "../util/splitCommand"
 import { cpExecFile, cpExec } from "./Daemons"
 
 export class CommandController {
   private constructor(
     readonly runningAnswer: Promise<unknown>,
-    readonly overlay: Overlay,
+    private readonly overlay: ExecSpawnable,
     readonly pid: number | undefined,
     readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {}
@@ -25,7 +31,7 @@ export class CommandController {
         // Defaults to the DEFAULT_SIGTERM_TIMEOUT = 30_000ms
         sigtermTimeout?: number
         mounts?: { path: string; options: MountOptions }[]
-        overlay?: Overlay
+        overlay?: ExecSpawnable
         env?:
           | {
               [variable: string]: string
@@ -38,10 +44,15 @@ export class CommandController {
       },
     ) => {
       const commands = splitCommand(command)
-      const overlay = options.overlay || (await Overlay.of(effects, imageId))
-      for (let mount of options.mounts || []) {
-        await overlay.mount(mount.options, mount.path)
-      }
+      const overlay =
+        options.overlay ||
+        (await (async () => {
+          const overlay = await Overlay.of(effects, imageId)
+          for (let mount of options.mounts || []) {
+            await overlay.mount(mount.options, mount.path)
+          }
+          return overlay
+        })())
       const childProcess = await overlay.spawn(commands, {
         env: options.env,
       })
@@ -57,7 +68,7 @@ export class CommandController {
           "data",
           options.onStderr ??
             ((data: any) => {
-              console.error(data.toString())
+              console.error(asError(data))
             }),
         )
 
@@ -74,7 +85,10 @@ export class CommandController {
       return new CommandController(answer, overlay, pid, options.sigtermTimeout)
     }
   }
-  async wait(timeout: number = NO_TIMEOUT) {
+  get nonDestroyableOverlay() {
+    return new NonDestroyableOverlay(this.overlay)
+  }
+  async wait({ timeout = NO_TIMEOUT } = {}) {
     if (timeout > 0)
       setTimeout(() => {
         this.term()
@@ -87,7 +101,7 @@ export class CommandController {
           (_) => {},
         )
       }
-      await this.overlay.destroy().catch((_) => {})
+      await this.overlay.destroy?.().catch((_) => {})
     }
   }
   async term({ signal = SIGTERM, timeout = this.sigtermTimeout } = {}) {
@@ -106,7 +120,7 @@ export class CommandController {
         )
       }
     } finally {
-      await this.overlay.destroy()
+      await this.overlay.destroy?.()
     }
   }
 }
diff --git a/sdk/lib/mainFn/Daemon.ts b/sdk/lib/mainFn/Daemon.ts
index 6dceda951..20a067ff6 100644
--- a/sdk/lib/mainFn/Daemon.ts
+++ b/sdk/lib/mainFn/Daemon.ts
@@ -1,5 +1,6 @@
 import * as T from "../types"
-import { MountOptions, Overlay } from "../util/Overlay"
+import { asError } from "../util/asError"
+import { ExecSpawnable, MountOptions, Overlay } from "../util/Overlay"
 import { CommandController } from "./CommandController"
 
 const TIMEOUT_INCREMENT_MS = 1000
@@ -12,7 +13,10 @@ const MAX_TIMEOUT_MS = 30000
 export class Daemon {
   private commandController: CommandController | null = null
   private shouldBeRunning = false
-  private constructor(private startCommand: () => Promise<CommandController>) {}
+  constructor(private startCommand: () => Promise<CommandController>) {}
+  get overlay(): undefined | ExecSpawnable {
+    return this.commandController?.nonDestroyableOverlay
+  }
   static of<Manifest extends T.Manifest>() {
     return async <A extends string>(
       effects: T.Effects,
@@ -41,7 +45,6 @@ export class Daemon {
       return new Daemon(startCommand)
     }
   }
-
   async start() {
     if (this.commandController) {
       return
@@ -57,7 +60,7 @@ export class Daemon {
         timeoutCounter = Math.max(MAX_TIMEOUT_MS, timeoutCounter)
       }
     }).catch((err) => {
-      console.error(err)
+      console.error(asError(err))
     })
   }
   async term(termOptions?: {
@@ -72,8 +75,8 @@ export class Daemon {
   }) {
     this.shouldBeRunning = false
     await this.commandController
-      ?.term(termOptions)
-      .catch((e) => console.error(e))
+      ?.term({ ...termOptions })
+      .catch((e) => console.error(asError(e)))
     this.commandController = null
   }
 }
diff --git a/sdk/lib/mainFn/HealthDaemon.ts b/sdk/lib/mainFn/HealthDaemon.ts
index 7cb15cd42..1a036532f 100644
--- a/sdk/lib/mainFn/HealthDaemon.ts
+++ b/sdk/lib/mainFn/HealthDaemon.ts
@@ -4,6 +4,7 @@ import { Ready } from "./Daemons"
 import { Daemon } from "./Daemon"
 import { Effects, SetHealth } from "../types"
 import { DEFAULT_SIGTERM_TIMEOUT } from "."
+import { asError } from "../util/asError"
 
 const oncePromise = <T>() => {
   let resolve: (value: T) => void
@@ -21,13 +22,13 @@ const oncePromise = <T>() => {
  *
  */
 export class HealthDaemon {
-  #health: HealthCheckResult = { result: "starting", message: null }
-  #healthWatchers: Array<() => unknown> = []
-  #running = false
+  private _health: HealthCheckResult = { result: "starting", message: null }
+  private healthWatchers: Array<() => unknown> = []
+  private running = false
   constructor(
-    readonly daemon: Promise<Daemon>,
+    private readonly daemon: Promise<Daemon>,
     readonly daemonIndex: number,
-    readonly dependencies: HealthDaemon[],
+    private readonly dependencies: HealthDaemon[],
     readonly id: string,
     readonly ids: string[],
     readonly ready: Ready,
@@ -43,12 +44,12 @@ export class HealthDaemon {
     signal?: NodeJS.Signals | undefined
     timeout?: number | undefined
   }) {
-    this.#healthWatchers = []
-    this.#running = false
-    this.#healthCheckCleanup?.()
+    this.healthWatchers = []
+    this.running = false
+    this.healthCheckCleanup?.()
 
     await this.daemon.then((d) =>
-      d.stop({
+      d.term({
         timeout: this.sigtermTimeout,
         ...termOptions,
       }),
@@ -57,17 +58,17 @@ export class HealthDaemon {
 
   /** Want to add another notifier that the health might have changed */
   addWatcher(watcher: () => unknown) {
-    this.#healthWatchers.push(watcher)
+    this.healthWatchers.push(watcher)
   }
 
   get health() {
-    return Object.freeze(this.#health)
+    return Object.freeze(this._health)
   }
 
   private async changeRunning(newStatus: boolean) {
-    if (this.#running === newStatus) return
+    if (this.running === newStatus) return
 
-    this.#running = newStatus
+    this.running = newStatus
 
     if (newStatus) {
       ;(await this.daemon).start()
@@ -80,14 +81,14 @@ export class HealthDaemon {
     }
   }
 
-  #healthCheckCleanup: (() => void) | null = null
+  private healthCheckCleanup: (() => void) | null = null
   private turnOffHealthCheck() {
-    this.#healthCheckCleanup?.()
+    this.healthCheckCleanup?.()
   }
   private async setupHealthCheck() {
-    if (this.#healthCheckCleanup) return
+    if (this.healthCheckCleanup) return
     const trigger = (this.ready.trigger ?? defaultTrigger)(() => ({
-      lastResult: this.#health.result,
+      lastResult: this._health.result,
     }))
 
     const { promise: status, resolve: setStatus } = oncePromise<{
@@ -102,7 +103,7 @@ export class HealthDaemon {
         const response: HealthCheckResult = await Promise.resolve(
           this.ready.fn(),
         ).catch((err) => {
-          console.error(err)
+          console.error(asError(err))
           return {
             result: "failure",
             message: "message" in err ? err.message : String(err),
@@ -112,15 +113,15 @@ export class HealthDaemon {
       }
     }).catch((err) => console.error(`Daemon ${this.id} failed: ${err}`))
 
-    this.#healthCheckCleanup = () => {
+    this.healthCheckCleanup = () => {
       setStatus({ done: true })
-      this.#healthCheckCleanup = null
+      this.healthCheckCleanup = null
     }
   }
 
   private async setHealth(health: HealthCheckResult) {
-    this.#health = health
-    this.#healthWatchers.forEach((watcher) => watcher())
+    this._health = health
+    this.healthWatchers.forEach((watcher) => watcher())
     const display = this.ready.display
     const result = health.result
     if (!display) {
@@ -134,7 +135,7 @@ export class HealthDaemon {
   }
 
   private async updateStatus() {
-    const healths = this.dependencies.map((d) => d.#health)
+    const healths = this.dependencies.map((d) => d._health)
     this.changeRunning(healths.every((x) => x.result === "success"))
   }
 }
diff --git a/sdk/lib/s9pk/merkleArchive/varint.ts b/sdk/lib/s9pk/merkleArchive/varint.ts
index 2bf4793b1..016505307 100644
--- a/sdk/lib/s9pk/merkleArchive/varint.ts
+++ b/sdk/lib/s9pk/merkleArchive/varint.ts
@@ -1,3 +1,5 @@
+import { asError } from "../../util/asError"
+
 const msb = 0x80
 const dropMsb = 0x7f
 const maxSize = Math.floor((8 * 8 + 7) / 7)
@@ -38,7 +40,7 @@ export class VarIntProcessor {
     if (success) {
       return result
     } else {
-      console.error(this.buf)
+      console.error(asError(this.buf))
       return null
     }
   }
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 29ddadfb1..526c489e0 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -5,7 +5,40 @@ import { promisify } from "util"
 import { Buffer } from "node:buffer"
 export const execFile = promisify(cp.execFile)
 const WORKDIR = (imageId: string) => `/media/startos/images/${imageId}/`
-export class Overlay {
+
+type ExecResults = {
+  exitCode: number | null
+  exitSignal: NodeJS.Signals | null
+  stdout: string | Buffer
+  stderr: string | Buffer
+}
+
+/**
+ * This is the type that is going to describe what an overlay could do. The main point of the
+ * overlay is to have commands that run in a chrooted environment. This is useful for running
+ * commands in a containerized environment. But, I wanted the destroy to sometimes be doable, for example the
+ * case where the overlay isn't owned by the process, the overlay shouldn't be destroyed.
+ */
+export interface ExecSpawnable {
+  get destroy(): undefined | (() => Promise<void>)
+  exec(
+    command: string[],
+    options?: CommandOptions,
+    timeoutMs?: number | null,
+  ): Promise<ExecResults>
+  spawn(
+    command: string[],
+    options?: CommandOptions,
+  ): Promise<cp.ChildProcessWithoutNullStreams>
+}
+/**
+ * Want to limit what we can do in a container, so we want to launch a container with a specific image and the mounts.
+ *
+ * Implements:
+ * @see {@link ExecSpawnable}
+ */
+export class Overlay implements ExecSpawnable {
+  private destroyed = false
   private constructor(
     readonly effects: T.Effects,
     readonly imageId: T.ImageId,
@@ -39,23 +72,6 @@ export class Overlay {
     return new Overlay(effects, id, rootfs, guid)
   }
 
-  static async with<T>(
-    effects: T.Effects,
-    image: { id: T.ImageId; sharedRun?: boolean },
-    mounts: { options: MountOptions; path: string }[],
-    fn: (overlay: Overlay) => Promise<T>,
-  ): Promise<T> {
-    const overlay = await Overlay.of(effects, image)
-    try {
-      for (let mount of mounts) {
-        await overlay.mount(mount.options, mount.path)
-      }
-      return await fn(overlay)
-    } finally {
-      await overlay.destroy()
-    }
-  }
-
   async mount(options: MountOptions, path: string): Promise<Overlay> {
     path = path.startsWith("/")
       ? `${this.rootfs}${path}`
@@ -70,7 +86,7 @@ export class Overlay {
 
       await fs.mkdir(from, { recursive: true })
       await fs.mkdir(path, { recursive: true })
-      await await execFile("mount", ["--bind", from, path])
+      await execFile("mount", ["--bind", from, path])
     } else if (options.type === "assets") {
       const subpath = options.subpath
         ? options.subpath.startsWith("/")
@@ -101,10 +117,14 @@ export class Overlay {
     return this
   }
 
-  async destroy() {
-    const imageId = this.imageId
-    const guid = this.guid
-    await this.effects.destroyOverlayedImage({ guid })
+  get destroy() {
+    return async () => {
+      if (this.destroyed) return
+      this.destroyed = true
+      const imageId = this.imageId
+      const guid = this.guid
+      await this.effects.destroyOverlayedImage({ guid })
+    }
   }
 
   async exec(
@@ -218,6 +238,32 @@ export class Overlay {
   }
 }
 
+/**
+ * Take an overlay but remove the ability to add the mounts and the destroy function.
+ * Lets other functions, like health checks, to not destroy the parents.
+ *
+ */
+export class NonDestroyableOverlay implements ExecSpawnable {
+  constructor(private overlay: ExecSpawnable) {}
+  get destroy() {
+    return undefined
+  }
+
+  exec(
+    command: string[],
+    options?: CommandOptions,
+    timeoutMs?: number | null,
+  ): Promise<ExecResults> {
+    return this.overlay.exec(command, options, timeoutMs)
+  }
+  spawn(
+    command: string[],
+    options?: CommandOptions,
+  ): Promise<cp.ChildProcessWithoutNullStreams> {
+    return this.overlay.spawn(command, options)
+  }
+}
+
 export type CommandOptions = {
   env?: { [variable: string]: string }
   cwd?: string
diff --git a/sdk/lib/util/asError.ts b/sdk/lib/util/asError.ts
new file mode 100644
index 000000000..6e98afb6a
--- /dev/null
+++ b/sdk/lib/util/asError.ts
@@ -0,0 +1,6 @@
+export const asError = (e: unknown) => {
+  if (e instanceof Error) {
+    return new Error(e as any)
+  }
+  return new Error(`${e}`)
+}
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index d4427adb0..d7606d5d0 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -7,6 +7,7 @@ import "./Overlay"
 import "./once"
 
 export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
+export { asError } from "./asError"
 export { getServiceInterfaces } from "./getServiceInterfaces"
 export { addressHostToUrl } from "./getServiceInterface"
 export { hostnameInfoToAddress } from "./Hostname"

From c174b654652eedf14dee0bfe46ce6311a27346ff Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 15 Aug 2024 20:58:53 +0000
Subject: [PATCH 265/341] create version graph to handle migrations (#2708)

* create version graph to handle migrations

* Fix some version alpha test

* connect dataVersion api

* rename init fns

* improve types and add tests

* set data version after backup restore

* chore: Add some types tests for version info

* wip: More changes to versionInfo tests

* wip: fix my stupid

* update mocks

* update runtime

* chore: Fix the loop

---------

Co-authored-by: Jade <2364004+Blu-J@users.noreply.github.com>
Co-authored-by: J H <dragondef@gmail.com>
---
 .../src/Adapters/EffectCreator.ts             |  10 +
 .../src/Adapters/Systems/SystemForStartOs.ts  |   4 +-
 core/startos/src/db/model/package.rs          |   5 +-
 core/startos/src/s9pk/v2/compat.rs            |   4 +-
 core/startos/src/s9pk/v2/manifest.rs          |  10 +-
 core/startos/src/service/effects/mod.rs       |  19 ++
 core/startos/src/service/effects/store.rs     |  49 +++-
 core/startos/src/service/service_map.rs       |   1 +
 sdk/lib/StartSdk.ts                           |  49 ++--
 sdk/lib/backup/setupBackups.ts                |   2 +
 sdk/lib/exver/index.ts                        |   7 +-
 sdk/lib/inits/migrations/Migration.ts         |  35 ---
 sdk/lib/inits/migrations/setupMigrations.ts   |  77 ------
 sdk/lib/inits/setupInit.ts                    |  34 ++-
 sdk/lib/inits/setupInstall.ts                 |  12 +-
 sdk/lib/inits/setupUninstall.ts               |   2 +-
 sdk/lib/manifest/ManifestTypes.ts             |  13 +-
 sdk/lib/manifest/setupManifest.ts             |  13 +-
 sdk/lib/osBindings/HardwareRequirements.ts    |   2 +-
 sdk/lib/osBindings/Manifest.ts                |   2 +
 sdk/lib/osBindings/PackageDataEntry.ts        |   2 +
 sdk/lib/osBindings/SetDataVersionParams.ts    |   3 +
 sdk/lib/osBindings/index.ts                   |   1 +
 sdk/lib/test/configBuilder.test.ts            |  76 +++---
 sdk/lib/test/graph.test.ts                    | 148 +++++++++++
 sdk/lib/test/output.sdk.ts                    |  79 +++---
 sdk/lib/test/startosTypeValidation.test.ts    |   3 +
 sdk/lib/types.ts                              |   9 +-
 sdk/lib/util/Overlay.ts                       |  17 ++
 sdk/lib/util/graph.ts                         | 244 ++++++++++++++++++
 sdk/lib/versionInfo/VersionInfo.ts            |  78 ++++++
 sdk/lib/versionInfo/setupVersionGraph.ts      | 210 +++++++++++++++
 .../ui/src/app/services/api/api.fixures.ts    |   9 +
 .../ui/src/app/services/api/mock-patch.ts     |   2 +
 34 files changed, 974 insertions(+), 257 deletions(-)
 delete mode 100644 sdk/lib/inits/migrations/Migration.ts
 delete mode 100644 sdk/lib/inits/migrations/setupMigrations.ts
 create mode 100644 sdk/lib/osBindings/SetDataVersionParams.ts
 create mode 100644 sdk/lib/test/graph.test.ts
 create mode 100644 sdk/lib/util/graph.ts
 create mode 100644 sdk/lib/versionInfo/VersionInfo.ts
 create mode 100644 sdk/lib/versionInfo/setupVersionGraph.ts

diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index 607e18b02..1c2954cb2 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -284,6 +284,16 @@ function makeEffects(context: EffectContext): Effects {
       set: async (options: any) =>
         rpcRound("setStore", options) as ReturnType<T.Effects["store"]["set"]>,
     } as T.Effects["store"],
+    getDataVersion() {
+      return rpcRound("getDataVersion", {}) as ReturnType<
+        T.Effects["getDataVersion"]
+      >
+    },
+    setDataVersion(...[options]: Parameters<T.Effects["setDataVersion"]>) {
+      return rpcRound("setDataVersion", options) as ReturnType<
+        T.Effects["setDataVersion"]
+      >
+    },
   }
   return self
 }
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 1dd0a9744..be7b0fc84 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -145,9 +145,7 @@ export class SystemForStartOs implements System {
   ): Promise<unknown> {
     switch (options.procedure) {
       case "/init": {
-        const previousVersion =
-          string.optional().unsafeCast(options.input) || null
-        return this.abi.init({ effects, previousVersion })
+        return this.abi.init({ effects })
       }
       case "/uninit": {
         const nextVersion = string.optional().unsafeCast(options.input) || null
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index cb537a2b5..957e42c54 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -3,7 +3,9 @@ use std::collections::{BTreeMap, BTreeSet};
 use chrono::{DateTime, Utc};
 use exver::VersionRange;
 use imbl_value::InternedString;
-use models::{ActionId, DataUrl, HealthCheckId, HostId, PackageId, ServiceInterfaceId};
+use models::{
+    ActionId, DataUrl, HealthCheckId, HostId, PackageId, ServiceInterfaceId, VersionString,
+};
 use patch_db::json_ptr::JsonPointer;
 use patch_db::HasModel;
 use reqwest::Url;
@@ -335,6 +337,7 @@ pub struct ActionMetadata {
 #[ts(export)]
 pub struct PackageDataEntry {
     pub state_info: PackageState,
+    pub data_version: Option<VersionString>,
     pub status: Status,
     #[ts(type = "string | null")]
     pub registry: Option<Url>,
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 22250419a..970cefb0c 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::path::Path;
 use std::sync::Arc;
 
-use exver::ExtendedVersion;
+use exver::{ExtendedVersion, VersionRange};
 use models::ImageId;
 use tokio::io::{AsyncRead, AsyncSeek, AsyncWriteExt};
 use tokio::process::Command;
@@ -203,6 +203,8 @@ impl From<ManifestV1> for Manifest {
             version: ExtendedVersion::from(value.version).into(),
             satisfies: BTreeSet::new(),
             release_notes: value.release_notes,
+            can_migrate_from: VersionRange::any(),
+            can_migrate_to: VersionRange::none(),
             license: value.license.into(),
             wrapper_repo: value.wrapper_repo,
             upstream_repo: value.upstream_repo,
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index a10a65ddb..1f24a0b73 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::path::Path;
 
 use color_eyre::eyre::eyre;
-use exver::Version;
+use exver::{Version, VersionRange};
 use helpers::const_true;
 use imbl_value::InternedString;
 pub use models::PackageId;
@@ -37,6 +37,10 @@ pub struct Manifest {
     pub satisfies: BTreeSet<VersionString>,
     pub release_notes: String,
     #[ts(type = "string")]
+    pub can_migrate_to: VersionRange,
+    #[ts(type = "string")]
+    pub can_migrate_from: VersionRange,
+    #[ts(type = "string")]
     pub license: InternedString, // type of license
     #[ts(type = "string")]
     pub wrapper_repo: Url,
@@ -159,8 +163,8 @@ impl Manifest {
 #[ts(export)]
 pub struct HardwareRequirements {
     #[serde(default)]
-    #[ts(type = "{ device?: string, processor?: string }")]
-    pub device: BTreeMap<String, Regex>,
+    #[ts(type = "{ display?: string, processor?: string }")]
+    pub device: BTreeMap<String, Regex>, // TODO: array
     #[ts(type = "number | null")]
     pub ram: Option<u64>,
     #[ts(type = "string[] | null")]
diff --git a/core/startos/src/service/effects/mod.rs b/core/startos/src/service/effects/mod.rs
index 91a12a4d1..a7ee6fb4d 100644
--- a/core/startos/src/service/effects/mod.rs
+++ b/core/startos/src/service/effects/mod.rs
@@ -164,6 +164,25 @@ pub fn handler<C: Context>() -> ParentHandler<C> {
         // store
         .subcommand("getStore", from_fn_async(store::get_store).no_cli())
         .subcommand("setStore", from_fn_async(store::set_store).no_cli())
+        .subcommand(
+            "setDataVersion",
+            from_fn_async(store::set_data_version)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "getDataVersion",
+            from_fn_async(store::get_data_version)
+                .with_custom_display_fn(|_, v| {
+                    if let Some(v) = v {
+                        println!("{v}")
+                    } else {
+                        println!("N/A")
+                    }
+                    Ok(())
+                })
+                .with_call_remote::<ContainerCliContext>(),
+        )
         // system
         .subcommand(
             "getSystemSmtp",
diff --git a/core/startos/src/service/effects/store.rs b/core/startos/src/service/effects/store.rs
index ab4484ab6..6c12b425e 100644
--- a/core/startos/src/service/effects/store.rs
+++ b/core/startos/src/service/effects/store.rs
@@ -1,6 +1,6 @@
 use imbl::vector;
 use imbl_value::json;
-use models::PackageId;
+use models::{PackageId, VersionString};
 use patch_db::json_ptr::JsonPointer;
 
 use crate::service::effects::callbacks::CallbackHandler;
@@ -91,3 +91,50 @@ pub async fn set_store(
 
     Ok(())
 }
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetDataVersionParams {
+    #[ts(type = "string")]
+    version: VersionString,
+}
+pub async fn set_data_version(
+    context: EffectContext,
+    SetDataVersionParams { version }: SetDataVersionParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = &context.seed.id;
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(package_id)
+                .or_not_found(package_id)?
+                .as_data_version_mut()
+                .ser(&Some(version))
+        })
+        .await?;
+
+    Ok(())
+}
+
+pub async fn get_data_version(context: EffectContext) -> Result<Option<VersionString>, Error> {
+    let context = context.deref()?;
+    let package_id = &context.seed.id;
+    context
+        .seed
+        .ctx
+        .db
+        .peek()
+        .await
+        .as_public()
+        .as_package_data()
+        .as_idx(package_id)
+        .or_not_found(package_id)?
+        .as_data_version()
+        .de()
+}
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 90223216c..0e6a959ae 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -173,6 +173,7 @@ impl ServiceMap {
                                 } else {
                                     PackageState::Installing(installing)
                                 },
+                                data_version: None,
                                 status: Status {
                                     configured: false,
                                     main: MainStatus::Stopped,
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 9989604cf..0b38d90af 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -30,7 +30,7 @@ import { healthCheck, HealthCheckParams } from "./health/HealthCheck"
 import { checkPortListening } from "./health/checkFns/checkPortListening"
 import { checkWebUrl, runHealthScript } from "./health/checkFns"
 import { List } from "./config/builder/list"
-import { Migration } from "./inits/migrations/Migration"
+import { VersionInfo, VersionOptions } from "./versionInfo/VersionInfo"
 import { Install, InstallFn } from "./inits/setupInstall"
 import { setupActions } from "./actions/setupActions"
 import { setupDependencyConfig } from "./dependencies/setupDependencyConfig"
@@ -38,9 +38,9 @@ import { SetupBackupsParams, setupBackups } from "./backup/setupBackups"
 import { setupInit } from "./inits/setupInit"
 import {
   EnsureUniqueId,
-  Migrations,
-  setupMigrations,
-} from "./inits/migrations/setupMigrations"
+  VersionGraph,
+  setupVersionGraph,
+} from "./versionInfo/setupVersionGraph"
 import { Uninstall, UninstallFn, setupUninstall } from "./inits/setupUninstall"
 import { setupMain } from "./mainFn"
 import { defaultTrigger } from "./trigger/defaultTrigger"
@@ -319,7 +319,7 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
       setupActions: (...createdActions: CreatedAction<any, any, any>[]) =>
         setupActions<Manifest, Store>(...createdActions),
       setupBackups: (...args: SetupBackupsParams<Manifest>) =>
-        setupBackups<Manifest>(...args),
+        setupBackups<Manifest>(this.manifest, ...args),
       setupConfig: <
         ConfigType extends Config<any, Store> | Config<any, never>,
         Type extends Record<string, any> = ExtractConfigType<ConfigType>,
@@ -388,7 +388,7 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
         }
       },
       setupInit: (
-        migrations: Migrations<Manifest, Store>,
+        versions: VersionGraph<Manifest["version"]>,
         install: Install<Manifest, Store>,
         uninstall: Uninstall<Manifest, Store>,
         setInterfaces: SetInterfaces<Manifest, Store, any, any>,
@@ -399,7 +399,7 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
         exposedStore: ExposedStorePaths,
       ) =>
         setupInit<Manifest, Store>(
-          migrations,
+          versions,
           install,
           uninstall,
           setInterfaces,
@@ -420,15 +420,13 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
           started(onTerm: () => PromiseLike<void>): PromiseLike<void>
         }) => Promise<Daemons<Manifest, any>>,
       ) => setupMain<Manifest, Store>(fn),
-      setupMigrations: <
-        Migrations extends Array<Migration<Manifest, Store, any>>,
+      setupVersionGraph: <
+        CurrentVersion extends string,
+        OtherVersions extends Array<VersionInfo<any>>,
       >(
-        ...migrations: EnsureUniqueId<Migrations>
-      ) =>
-        setupMigrations<Manifest, Store, Migrations>(
-          this.manifest,
-          ...migrations,
-        ),
+        current: VersionInfo<CurrentVersion>,
+        ...other: EnsureUniqueId<OtherVersions, OtherVersions, CurrentVersion>
+      ) => setupVersionGraph<CurrentVersion, OtherVersions>(current, ...other),
       setupProperties:
         (
           fn: (options: { effects: Effects }) => Promise<T.SdkPropertiesReturn>,
@@ -549,12 +547,9 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
           >,
         ) => List.dynamicText<Store>(getA),
       },
-      Migration: {
-        of: <Version extends string>(options: {
-          version: Version & ValidateExVer<Version>
-          up: (opts: { effects: Effects }) => Promise<void>
-          down: (opts: { effects: Effects }) => Promise<void>
-        }) => Migration.of<Manifest, Store, Version>(options),
+      VersionInfo: {
+        of: <Version extends string>(options: VersionOptions<Version>) =>
+          VersionInfo.of<Version>(options),
       },
       StorePath: pathBuilder<Store>(),
       Value: {
@@ -755,15 +750,9 @@ export async function runCommand<Manifest extends T.Manifest>(
   },
 ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
   const commands = splitCommand(command)
-  const overlay = await Overlay.of(effects, image)
-  try {
-    for (let mount of options.mounts || []) {
-      await overlay.mount(mount.options, mount.path)
-    }
-    return await overlay.exec(commands)
-  } finally {
-    await overlay.destroy()
-  }
+  return Overlay.with(effects, image, options.mounts || [], (overlay) =>
+    overlay.exec(commands),
+  )
 }
 function nullifyProperties(value: T.SdkPropertiesReturn): T.PropertiesReturn {
   return Object.fromEntries(
diff --git a/sdk/lib/backup/setupBackups.ts b/sdk/lib/backup/setupBackups.ts
index 40be01829..c12f1d2ed 100644
--- a/sdk/lib/backup/setupBackups.ts
+++ b/sdk/lib/backup/setupBackups.ts
@@ -8,6 +8,7 @@ export type SetupBackupsParams<M extends T.Manifest> = Array<
 >
 
 export function setupBackups<M extends T.Manifest>(
+  manifest: M,
   ...args: _<SetupBackupsParams<M>>
 ) {
   const backups = Array<Backups<M>>()
@@ -36,6 +37,7 @@ export function setupBackups<M extends T.Manifest>(
         for (const backup of backups) {
           await backup.build(options.pathMaker).restoreBackup(options)
         }
+        await options.effects.setDataVersion({ version: manifest.version })
       }) as T.ExpectedExports.restoreBackup
     },
   }
diff --git a/sdk/lib/exver/index.ts b/sdk/lib/exver/index.ts
index 012cb532e..331271c1a 100644
--- a/sdk/lib/exver/index.ts
+++ b/sdk/lib/exver/index.ts
@@ -3,7 +3,7 @@ import * as P from "./exver"
 // prettier-ignore
 export type ValidateVersion<T extends String> = 
 T extends `-${infer A}` ? never  :
-T extends `${infer A}-${infer B}` ? ValidateVersion<A> & ValidateVersion<B> :
+T extends `${infer A}-${string}` ? ValidateVersion<A> :
   T extends `${bigint}` ? unknown :
   T extends `${bigint}.${infer A}` ? ValidateVersion<A> :
   never
@@ -16,9 +16,9 @@ export type ValidateExVer<T extends string> =
 
 // prettier-ignore
 export type ValidateExVers<T> =
-  T extends [] ? unknown :
+  T extends [] ? unknown[] :
   T extends [infer A, ...infer B] ? ValidateExVer<A & string> & ValidateExVers<B> :
-  never
+  never[]
 
 type Anchor = {
   type: "Anchor"
@@ -426,6 +426,7 @@ function tests() {
   testTypeVersion("12.34.56")
   testTypeVersion("1.2-3")
   testTypeVersion("1-3")
+  testTypeVersion("1-alpha")
   // @ts-expect-error
   testTypeVersion("-3")
   // @ts-expect-error
diff --git a/sdk/lib/inits/migrations/Migration.ts b/sdk/lib/inits/migrations/Migration.ts
deleted file mode 100644
index 16be93dbd..000000000
--- a/sdk/lib/inits/migrations/Migration.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { ValidateExVer } from "../../exver"
-import * as T from "../../types"
-
-export class Migration<
-  Manifest extends T.Manifest,
-  Store,
-  Version extends string,
-> {
-  constructor(
-    readonly options: {
-      version: Version & ValidateExVer<Version>
-      up: (opts: { effects: T.Effects }) => Promise<void>
-      down: (opts: { effects: T.Effects }) => Promise<void>
-    },
-  ) {}
-  static of<
-    Manifest extends T.Manifest,
-    Store,
-    Version extends string,
-  >(options: {
-    version: Version & ValidateExVer<Version>
-    up: (opts: { effects: T.Effects }) => Promise<void>
-    down: (opts: { effects: T.Effects }) => Promise<void>
-  }) {
-    return new Migration<Manifest, Store, Version>(options)
-  }
-
-  async up(opts: { effects: T.Effects }) {
-    this.up(opts)
-  }
-
-  async down(opts: { effects: T.Effects }) {
-    this.down(opts)
-  }
-}
diff --git a/sdk/lib/inits/migrations/setupMigrations.ts b/sdk/lib/inits/migrations/setupMigrations.ts
deleted file mode 100644
index 6d690b239..000000000
--- a/sdk/lib/inits/migrations/setupMigrations.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ExtendedVersion } from "../../exver"
-
-import * as T from "../../types"
-import { once } from "../../util/once"
-import { Migration } from "./Migration"
-
-export class Migrations<Manifest extends T.Manifest, Store> {
-  private constructor(
-    readonly manifest: T.Manifest,
-    readonly migrations: Array<Migration<Manifest, Store, any>>,
-  ) {}
-  private sortedMigrations = once(() => {
-    const migrationsAsVersions = (
-      this.migrations as Array<Migration<Manifest, Store, any>>
-    )
-      .map((x) => [ExtendedVersion.parse(x.options.version), x] as const)
-      .filter(([v, _]) => v.flavor === this.currentVersion().flavor)
-    migrationsAsVersions.sort((a, b) => a[0].compareForSort(b[0]))
-    return migrationsAsVersions
-  })
-  private currentVersion = once(() =>
-    ExtendedVersion.parse(this.manifest.version),
-  )
-  static of<
-    Manifest extends T.Manifest,
-    Store,
-    Migrations extends Array<Migration<Manifest, Store, any>>,
-  >(manifest: T.Manifest, ...migrations: EnsureUniqueId<Migrations>) {
-    return new Migrations(
-      manifest,
-      migrations as Array<Migration<Manifest, Store, any>>,
-    )
-  }
-  async init({
-    effects,
-    previousVersion,
-  }: Parameters<T.ExpectedExports.init>[0]) {
-    if (!!previousVersion) {
-      const previousVersionExVer = ExtendedVersion.parse(previousVersion)
-      for (const [_, migration] of this.sortedMigrations()
-        .filter((x) => x[0].greaterThan(previousVersionExVer))
-        .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
-        await migration.up({ effects })
-      }
-    }
-  }
-  async uninit({
-    effects,
-    nextVersion,
-  }: Parameters<T.ExpectedExports.uninit>[0]) {
-    if (!!nextVersion) {
-      const nextVersionExVer = ExtendedVersion.parse(nextVersion)
-      const reversed = [...this.sortedMigrations()].reverse()
-      for (const [_, migration] of reversed
-        .filter((x) => x[0].greaterThan(nextVersionExVer))
-        .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
-        await migration.down({ effects })
-      }
-    }
-  }
-}
-
-export function setupMigrations<
-  Manifest extends T.Manifest,
-  Store,
-  Migrations extends Array<Migration<Manifest, Store, any>>,
->(manifest: T.Manifest, ...migrations: EnsureUniqueId<Migrations>) {
-  return Migrations.of<Manifest, Store, Migrations>(manifest, ...migrations)
-}
-
-// prettier-ignore
-export type EnsureUniqueId<A, B = A, ids = never> =
-  B extends [] ? A : 
-  B extends [Migration<any, any, infer id>, ...infer Rest] ? (
-    id extends ids ? "One of the ids are not unique"[] :
-    EnsureUniqueId<A, Rest, id | ids>
-  ) : "There exists a migration that is not a Migration"[]
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index 5718caa58..35971d3d3 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -1,14 +1,15 @@
 import { DependenciesReceipt } from "../config/setupConfig"
+import { ExtendedVersion, VersionRange } from "../exver"
 import { SetInterfaces } from "../interfaces/setupInterfaces"
 
 import { ExposedStorePaths } from "../store/setupExposeStore"
 import * as T from "../types"
-import { Migrations } from "./migrations/setupMigrations"
+import { VersionGraph } from "../versionInfo/setupVersionGraph"
 import { Install } from "./setupInstall"
 import { Uninstall } from "./setupUninstall"
 
 export function setupInit<Manifest extends T.Manifest, Store>(
-  migrations: Migrations<Manifest, Store>,
+  versions: VersionGraph<Manifest["version"]>,
   install: Install<Manifest, Store>,
   uninstall: Uninstall<Manifest, Store>,
   setInterfaces: SetInterfaces<Manifest, Store, any, any>,
@@ -23,8 +24,19 @@ export function setupInit<Manifest extends T.Manifest, Store>(
 } {
   return {
     init: async (opts) => {
-      await migrations.init(opts)
-      await install.init(opts)
+      const prev = await opts.effects.getDataVersion()
+      if (prev) {
+        await versions.migrate({
+          effects: opts.effects,
+          from: ExtendedVersion.parse(prev),
+          to: versions.currentVersion(),
+        })
+      } else {
+        await install.install(opts)
+        await opts.effects.setDataVersion({
+          version: versions.current.options.version,
+        })
+      }
       await setInterfaces({
         ...opts,
         input: null,
@@ -33,8 +45,18 @@ export function setupInit<Manifest extends T.Manifest, Store>(
       await setDependencies({ effects: opts.effects, input: null })
     },
     uninit: async (opts) => {
-      await migrations.uninit(opts)
-      await uninstall.uninit(opts)
+      if (opts.nextVersion) {
+        const prev = await opts.effects.getDataVersion()
+        if (prev) {
+          await versions.migrate({
+            effects: opts.effects,
+            from: ExtendedVersion.parse(prev),
+            to: ExtendedVersion.parse(opts.nextVersion),
+          })
+        }
+      } else {
+        await uninstall.uninstall(opts)
+      }
     },
   }
 }
diff --git a/sdk/lib/inits/setupInstall.ts b/sdk/lib/inits/setupInstall.ts
index 7b51a22ea..ab21380a0 100644
--- a/sdk/lib/inits/setupInstall.ts
+++ b/sdk/lib/inits/setupInstall.ts
@@ -11,14 +11,10 @@ export class Install<Manifest extends T.Manifest, Store> {
     return new Install(fn)
   }
 
-  async init({
-    effects,
-    previousVersion,
-  }: Parameters<T.ExpectedExports.init>[0]) {
-    if (!previousVersion)
-      await this.fn({
-        effects,
-      })
+  async install({ effects }: Parameters<T.ExpectedExports.init>[0]) {
+    await this.fn({
+      effects,
+    })
   }
 }
 
diff --git a/sdk/lib/inits/setupUninstall.ts b/sdk/lib/inits/setupUninstall.ts
index c8c3e490f..918f417e5 100644
--- a/sdk/lib/inits/setupUninstall.ts
+++ b/sdk/lib/inits/setupUninstall.ts
@@ -11,7 +11,7 @@ export class Uninstall<Manifest extends T.Manifest, Store> {
     return new Uninstall(fn)
   }
 
-  async uninit({
+  async uninstall({
     effects,
     nextVersion,
   }: Parameters<T.ExpectedExports.uninit>[0]) {
diff --git a/sdk/lib/manifest/ManifestTypes.ts b/sdk/lib/manifest/ManifestTypes.ts
index ea349710f..cc564de2d 100644
--- a/sdk/lib/manifest/ManifestTypes.ts
+++ b/sdk/lib/manifest/ManifestTypes.ts
@@ -7,22 +7,11 @@ import {
   ImageSource,
 } from "../types"
 
-export type SDKManifest<
-  Version extends string,
-  Satisfies extends string[] = [],
-> = {
+export type SDKManifest = {
   /**  The package identifier used by the OS. This must be unique amongst all other known packages */
   readonly id: string
   /** A human readable service title */
   readonly title: string
-  /** Service version - accepts up to four digits, where the last confirms to revisions necessary for StartOs
-   * - see documentation: https://github.com/Start9Labs/emver-rs. This value will change with each release of
-   * the service
-   */
-  readonly version: Version & ValidateExVer<Version>
-  readonly satisfies?: Satisfies & ValidateExVers<Satisfies>
-  /** Release notes for the update - can be a string, paragraph or URL */
-  readonly releaseNotes: string
   /** The type of license for the project. Include the LICENSE in the root of the project directory. A license is required for a Start9 package.*/
   readonly license: string // name of license
   /** The Start9 wrapper repository URL for the package. This repo contains the manifest file (this),
diff --git a/sdk/lib/manifest/setupManifest.ts b/sdk/lib/manifest/setupManifest.ts
index a0d0e18b3..2f836d05e 100644
--- a/sdk/lib/manifest/setupManifest.ts
+++ b/sdk/lib/manifest/setupManifest.ts
@@ -2,6 +2,7 @@ import * as T from "../types"
 import { ImageConfig, ImageId, VolumeId } from "../osBindings"
 import { SDKManifest, SDKImageConfig } from "./ManifestTypes"
 import { SDKVersion } from "../StartSdk"
+import { VersionGraph } from "../versionInfo/setupVersionGraph"
 
 /**
  * This is an example of a function that takes a manifest and returns a new manifest with additional properties
@@ -21,10 +22,12 @@ export function setupManifest<
     assets: AssetTypes[]
     images: Record<ImagesTypes, SDKImageConfig>
     volumes: VolumesTypes[]
-    version: Version
   },
   Satisfies extends string[] = [],
->(manifest: SDKManifest<Version, Satisfies> & Manifest): Manifest & T.Manifest {
+>(
+  manifest: SDKManifest & Manifest,
+  versions: VersionGraph<Version>,
+): Manifest & T.Manifest {
   const images = Object.entries(manifest.images).reduce(
     (images, [k, v]) => {
       v.arch = v.arch || ["aarch64", "x86_64"]
@@ -39,7 +42,11 @@ export function setupManifest<
     ...manifest,
     gitHash: null,
     osVersion: SDKVersion,
-    satisfies: manifest.satisfies || [],
+    version: versions.current.options.version,
+    releaseNotes: versions.current.options.releaseNotes,
+    satisfies: versions.current.options.satisfies || [],
+    canMigrateTo: versions.canMigrateTo().toString(),
+    canMigrateFrom: versions.canMigrateFrom().toString(),
     images,
     alerts: {
       install: manifest.alerts?.install || null,
diff --git a/sdk/lib/osBindings/HardwareRequirements.ts b/sdk/lib/osBindings/HardwareRequirements.ts
index 3579e9524..e17568eec 100644
--- a/sdk/lib/osBindings/HardwareRequirements.ts
+++ b/sdk/lib/osBindings/HardwareRequirements.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type HardwareRequirements = {
-  device: { device?: string; processor?: string }
+  device: { display?: string; processor?: string }
   ram: number | null
   arch: string[] | null
 }
diff --git a/sdk/lib/osBindings/Manifest.ts b/sdk/lib/osBindings/Manifest.ts
index 51f14935a..d40223236 100644
--- a/sdk/lib/osBindings/Manifest.ts
+++ b/sdk/lib/osBindings/Manifest.ts
@@ -15,6 +15,8 @@ export type Manifest = {
   version: Version
   satisfies: Array<Version>
   releaseNotes: string
+  canMigrateTo: string
+  canMigrateFrom: string
   license: string
   wrapperRepo: string
   upstreamRepo: string
diff --git a/sdk/lib/osBindings/PackageDataEntry.ts b/sdk/lib/osBindings/PackageDataEntry.ts
index ef805741b..41bd98bba 100644
--- a/sdk/lib/osBindings/PackageDataEntry.ts
+++ b/sdk/lib/osBindings/PackageDataEntry.ts
@@ -8,9 +8,11 @@ import type { PackageState } from "./PackageState"
 import type { ServiceInterface } from "./ServiceInterface"
 import type { ServiceInterfaceId } from "./ServiceInterfaceId"
 import type { Status } from "./Status"
+import type { Version } from "./Version"
 
 export type PackageDataEntry = {
   stateInfo: PackageState
+  dataVersion: Version | null
   status: Status
   registry: string | null
   developerKey: string
diff --git a/sdk/lib/osBindings/SetDataVersionParams.ts b/sdk/lib/osBindings/SetDataVersionParams.ts
new file mode 100644
index 000000000..3b577d2b1
--- /dev/null
+++ b/sdk/lib/osBindings/SetDataVersionParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetDataVersionParams = { version: string }
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 74baabfd9..59cbb7b13 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -132,6 +132,7 @@ export { SessionList } from "./SessionList"
 export { Sessions } from "./Sessions"
 export { Session } from "./Session"
 export { SetConfigured } from "./SetConfigured"
+export { SetDataVersionParams } from "./SetDataVersionParams"
 export { SetDependenciesParams } from "./SetDependenciesParams"
 export { SetHealth } from "./SetHealth"
 export { SetMainStatusStatus } from "./SetMainStatusStatus"
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
index a413d76b8..bd0ddeab1 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -6,6 +6,8 @@ import { Variants } from "../config/builder/variants"
 import { ValueSpec } from "../config/configTypes"
 import { setupManifest } from "../manifest/setupManifest"
 import { StartSdk } from "../StartSdk"
+import { VersionGraph } from "../versionInfo/setupVersionGraph"
+import { VersionInfo } from "../versionInfo/VersionInfo"
 
 describe("builder tests", () => {
   test("text", async () => {
@@ -366,42 +368,48 @@ describe("values", () => {
     test("datetime", async () => {
       const sdk = StartSdk.of()
         .withManifest(
-          setupManifest({
-            id: "testOutput",
-            title: "",
-            version: "1.0.0:0",
-            releaseNotes: "",
-            license: "",
-            replaces: [],
-            wrapperRepo: "",
-            upstreamRepo: "",
-            supportSite: "",
-            marketingSite: "",
-            donationUrl: null,
-            description: {
-              short: "",
-              long: "",
-            },
-            containers: {},
-            images: {},
-            volumes: [],
-            assets: [],
-            alerts: {
-              install: null,
-              update: null,
-              uninstall: null,
-              restore: null,
-              start: null,
-              stop: null,
-            },
-            dependencies: {
-              "remote-test": {
-                description: "",
-                optional: true,
-                s9pk: "https://example.com/remote-test.s9pk",
+          setupManifest(
+            {
+              id: "testOutput",
+              title: "",
+              license: "",
+              wrapperRepo: "",
+              upstreamRepo: "",
+              supportSite: "",
+              marketingSite: "",
+              donationUrl: null,
+              description: {
+                short: "",
+                long: "",
+              },
+              containers: {},
+              images: {},
+              volumes: [],
+              assets: [],
+              alerts: {
+                install: null,
+                update: null,
+                uninstall: null,
+                restore: null,
+                start: null,
+                stop: null,
+              },
+              dependencies: {
+                "remote-test": {
+                  description: "",
+                  optional: true,
+                  s9pk: "https://example.com/remote-test.s9pk",
+                },
               },
             },
-          }),
+            VersionGraph.of(
+              VersionInfo.of({
+                version: "1.0.0:0",
+                releaseNotes: "",
+                migrations: {},
+              }),
+            ),
+          ),
         )
         .withStore<{ test: "a" }>()
         .build(true)
diff --git a/sdk/lib/test/graph.test.ts b/sdk/lib/test/graph.test.ts
new file mode 100644
index 000000000..7f02adc2e
--- /dev/null
+++ b/sdk/lib/test/graph.test.ts
@@ -0,0 +1,148 @@
+import { Graph } from "../util/graph"
+
+describe("graph", () => {
+  {
+    {
+      test("findVertex", () => {
+        const graph = new Graph<string, string>()
+        const foo = graph.addVertex("foo", [], [])
+        const bar = graph.addVertex(
+          "bar",
+          [{ from: foo, metadata: "foo-bar" }],
+          [],
+        )
+        const baz = graph.addVertex(
+          "baz",
+          [{ from: bar, metadata: "bar-baz" }],
+          [],
+        )
+        const qux = graph.addVertex(
+          "qux",
+          [{ from: baz, metadata: "baz-qux" }],
+          [],
+        )
+        const match = Array.from(graph.findVertex((v) => v.metadata === "qux"))
+        expect(match).toHaveLength(1)
+        expect(match[0]).toBe(qux)
+      })
+      test("shortestPathA", () => {
+        const graph = new Graph<string, string>()
+        const foo = graph.addVertex("foo", [], [])
+        const bar = graph.addVertex(
+          "bar",
+          [{ from: foo, metadata: "foo-bar" }],
+          [],
+        )
+        const baz = graph.addVertex(
+          "baz",
+          [{ from: bar, metadata: "bar-baz" }],
+          [],
+        )
+        const qux = graph.addVertex(
+          "qux",
+          [{ from: baz, metadata: "baz-qux" }],
+          [],
+        )
+        graph.addEdge("foo-qux", foo, qux)
+        expect(graph.shortestPath(foo, qux) || []).toHaveLength(1)
+      })
+      test("shortestPathB", () => {
+        const graph = new Graph<string, string>()
+        const foo = graph.addVertex("foo", [], [])
+        const bar = graph.addVertex(
+          "bar",
+          [{ from: foo, metadata: "foo-bar" }],
+          [],
+        )
+        const baz = graph.addVertex(
+          "baz",
+          [{ from: bar, metadata: "bar-baz" }],
+          [],
+        )
+        const qux = graph.addVertex(
+          "qux",
+          [{ from: baz, metadata: "baz-qux" }],
+          [],
+        )
+        graph.addEdge("bar-qux", bar, qux)
+        expect(graph.shortestPath(foo, qux) || []).toHaveLength(2)
+      })
+      test("shortestPathC", () => {
+        const graph = new Graph<string, string>()
+        const foo = graph.addVertex("foo", [], [])
+        const bar = graph.addVertex(
+          "bar",
+          [{ from: foo, metadata: "foo-bar" }],
+          [],
+        )
+        const baz = graph.addVertex(
+          "baz",
+          [{ from: bar, metadata: "bar-baz" }],
+          [],
+        )
+        const qux = graph.addVertex(
+          "qux",
+          [{ from: baz, metadata: "baz-qux" }],
+          [{ to: foo, metadata: "qux-foo" }],
+        )
+        expect(graph.shortestPath(foo, qux) || []).toHaveLength(3)
+      })
+      test("bfs", () => {
+        const graph = new Graph<string, string>()
+        const foo = graph.addVertex("foo", [], [])
+        const bar = graph.addVertex(
+          "bar",
+          [{ from: foo, metadata: "foo-bar" }],
+          [],
+        )
+        const baz = graph.addVertex(
+          "baz",
+          [{ from: bar, metadata: "bar-baz" }],
+          [],
+        )
+        const qux = graph.addVertex(
+          "qux",
+          [
+            { from: foo, metadata: "foo-qux" },
+            { from: baz, metadata: "baz-qux" },
+          ],
+          [],
+        )
+        const bfs = Array.from(graph.breadthFirstSearch(foo))
+        expect(bfs).toHaveLength(4)
+        expect(bfs[0]).toBe(foo)
+        expect(bfs[1]).toBe(bar)
+        expect(bfs[2]).toBe(qux)
+        expect(bfs[3]).toBe(baz)
+      })
+      test("reverseBfs", () => {
+        const graph = new Graph<string, string>()
+        const foo = graph.addVertex("foo", [], [])
+        const bar = graph.addVertex(
+          "bar",
+          [{ from: foo, metadata: "foo-bar" }],
+          [],
+        )
+        const baz = graph.addVertex(
+          "baz",
+          [{ from: bar, metadata: "bar-baz" }],
+          [],
+        )
+        const qux = graph.addVertex(
+          "qux",
+          [
+            { from: foo, metadata: "foo-qux" },
+            { from: baz, metadata: "baz-qux" },
+          ],
+          [],
+        )
+        const bfs = Array.from(graph.reverseBreadthFirstSearch(qux))
+        expect(bfs).toHaveLength(4)
+        expect(bfs[0]).toBe(qux)
+        expect(bfs[1]).toBe(foo)
+        expect(bfs[2]).toBe(baz)
+        expect(bfs[3]).toBe(bar)
+      })
+    }
+  }
+})
diff --git a/sdk/lib/test/output.sdk.ts b/sdk/lib/test/output.sdk.ts
index c56e05e60..3d8058bfa 100644
--- a/sdk/lib/test/output.sdk.ts
+++ b/sdk/lib/test/output.sdk.ts
@@ -1,45 +1,56 @@
 import { StartSdk } from "../StartSdk"
 import { setupManifest } from "../manifest/setupManifest"
+import { VersionInfo } from "../versionInfo/VersionInfo"
+import { VersionGraph } from "../versionInfo/setupVersionGraph"
 
 export type Manifest = any
 export const sdk = StartSdk.of()
   .withManifest(
-    setupManifest({
-      id: "testOutput",
-      title: "",
-      version: "1.0:0",
-      releaseNotes: "",
-      license: "",
-      replaces: [],
-      wrapperRepo: "",
-      upstreamRepo: "",
-      supportSite: "",
-      marketingSite: "",
-      donationUrl: null,
-      description: {
-        short: "",
-        long: "",
-      },
-      containers: {},
-      images: {},
-      volumes: [],
-      assets: [],
-      alerts: {
-        install: null,
-        update: null,
-        uninstall: null,
-        restore: null,
-        start: null,
-        stop: null,
-      },
-      dependencies: {
-        "remote-test": {
-          description: "",
-          optional: false,
-          s9pk: "https://example.com/remote-test.s9pk",
+    setupManifest(
+      {
+        id: "testOutput",
+        title: "",
+        license: "",
+        replaces: [],
+        wrapperRepo: "",
+        upstreamRepo: "",
+        supportSite: "",
+        marketingSite: "",
+        donationUrl: null,
+        description: {
+          short: "",
+          long: "",
+        },
+        containers: {},
+        images: {},
+        volumes: [],
+        assets: [],
+        alerts: {
+          install: null,
+          update: null,
+          uninstall: null,
+          restore: null,
+          start: null,
+          stop: null,
+        },
+        dependencies: {
+          "remote-test": {
+            description: "",
+            optional: false,
+            s9pk: "https://example.com/remote-test.s9pk",
+          },
         },
       },
-    }),
+      VersionGraph.of(
+        VersionInfo.of({
+          version: "1.0.0:0",
+          releaseNotes: "",
+          migrations: {},
+        })
+          .satisfies("#other:1.0.0:0")
+          .satisfies("#other:2.0.0:0"),
+      ),
+    ),
   )
   .withStore<{ storeRoot: { storeLeaf: "value" } }>()
   .build(true)
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index 846967c31..661f21079 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -3,6 +3,7 @@ import {
   CheckDependenciesParam,
   ExecuteAction,
   GetConfiguredParams,
+  SetDataVersionParams,
   SetMainStatus,
 } from ".././osBindings"
 import { CreateOverlayedImageParams } from ".././osBindings"
@@ -46,6 +47,8 @@ describe("startosTypeValidation ", () => {
       restart: undefined,
       shutdown: undefined,
       setConfigured: {} as SetConfigured,
+      setDataVersion: {} as SetDataVersionParams,
+      getDataVersion: undefined,
       setHealth: {} as SetHealth,
       exposeForDependents: {} as ExposeForDependentsParams,
       getSslCertificate: {} as WithCallback<GetSslCertificateParams>,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 6c5ed0ab8..2611a0b84 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -102,10 +102,7 @@ export namespace ExpectedExports {
    * Every time a package completes an install, this function is called before the main.
    * Can be used to do migration like things.
    */
-  export type init = (options: {
-    effects: Effects
-    previousVersion: null | string
-  }) => Promise<unknown>
+  export type init = (options: { effects: Effects }) => Promise<unknown>
   /** This will be ran during any time a package is uninstalled, for example during a update
    * this will be called.
    */
@@ -437,6 +434,10 @@ export type Effects = {
       value: ExtractStore
     }): Promise<void>
   }
+  /** sets the version that this service's data has been migrated to */
+  setDataVersion(options: { version: string }): Promise<void>
+  /** returns the version that this service's data has been migrated to */
+  getDataVersion(): Promise<string | null>
 
   // system
 
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts
index 526c489e0..14908b90f 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/Overlay.ts
@@ -72,6 +72,23 @@ export class Overlay implements ExecSpawnable {
     return new Overlay(effects, id, rootfs, guid)
   }
 
+  static async with<T>(
+    effects: T.Effects,
+    image: { id: T.ImageId; sharedRun?: boolean },
+    mounts: { options: MountOptions; path: string }[],
+    fn: (overlay: Overlay) => Promise<T>,
+  ): Promise<T> {
+    const overlay = await Overlay.of(effects, image)
+    try {
+      for (let mount of mounts) {
+        await overlay.mount(mount.options, mount.path)
+      }
+      return await fn(overlay)
+    } finally {
+      await overlay.destroy()
+    }
+  }
+
   async mount(options: MountOptions, path: string): Promise<Overlay> {
     path = path.startsWith("/")
       ? `${this.rootfs}${path}`
diff --git a/sdk/lib/util/graph.ts b/sdk/lib/util/graph.ts
new file mode 100644
index 000000000..5ad71a04d
--- /dev/null
+++ b/sdk/lib/util/graph.ts
@@ -0,0 +1,244 @@
+import { boolean } from "ts-matches"
+
+export type Vertex<VMetadata = void, EMetadata = void> = {
+  metadata: VMetadata
+  edges: Array<Edge<EMetadata, VMetadata>>
+}
+
+export type Edge<EMetadata = void, VMetadata = void> = {
+  metadata: EMetadata
+  from: Vertex<VMetadata, EMetadata>
+  to: Vertex<VMetadata, EMetadata>
+}
+
+export class Graph<VMetadata = void, EMetadata = void> {
+  private readonly vertices: Array<Vertex<VMetadata, EMetadata>> = []
+  constructor() {}
+  addVertex(
+    metadata: VMetadata,
+    fromEdges: Array<Omit<Edge<EMetadata, VMetadata>, "to">>,
+    toEdges: Array<Omit<Edge<EMetadata, VMetadata>, "from">>,
+  ): Vertex<VMetadata, EMetadata> {
+    const vertex: Vertex<VMetadata, EMetadata> = {
+      metadata,
+      edges: [],
+    }
+    for (let edge of fromEdges) {
+      const vEdge = {
+        metadata: edge.metadata,
+        from: edge.from,
+        to: vertex,
+      }
+      edge.from.edges.push(vEdge)
+      vertex.edges.push(vEdge)
+    }
+    for (let edge of toEdges) {
+      const vEdge = {
+        metadata: edge.metadata,
+        from: vertex,
+        to: edge.to,
+      }
+      edge.to.edges.push(vEdge)
+      vertex.edges.push(vEdge)
+    }
+    this.vertices.push(vertex)
+    return vertex
+  }
+  findVertex(
+    predicate: (vertex: Vertex<VMetadata, EMetadata>) => boolean,
+  ): Generator<Vertex<VMetadata, EMetadata>, void> {
+    const veritces = this.vertices
+    function* gen() {
+      for (let vertex of veritces) {
+        if (predicate(vertex)) {
+          yield vertex
+        }
+      }
+    }
+    return gen()
+  }
+  addEdge(
+    metadata: EMetadata,
+    from: Vertex<VMetadata, EMetadata>,
+    to: Vertex<VMetadata, EMetadata>,
+  ): Edge<EMetadata, VMetadata> {
+    const edge = {
+      metadata,
+      from,
+      to,
+    }
+    edge.from.edges.push(edge)
+    edge.to.edges.push(edge)
+    return edge
+  }
+  breadthFirstSearch(
+    from:
+      | Vertex<VMetadata, EMetadata>
+      | ((vertex: Vertex<VMetadata, EMetadata>) => boolean),
+  ): Generator<Vertex<VMetadata, EMetadata>, void> {
+    const visited: Array<Vertex<VMetadata, EMetadata>> = []
+    function* rec(
+      vertex: Vertex<VMetadata, EMetadata>,
+    ): Generator<Vertex<VMetadata, EMetadata>, void> {
+      if (visited.includes(vertex)) {
+        return
+      }
+      visited.push(vertex)
+      yield vertex
+      let generators = vertex.edges
+        .filter((e) => e.from === vertex)
+        .map((e) => rec(e.to))
+      while (generators.length) {
+        let prev = generators
+        generators = []
+        for (let gen of prev) {
+          const next = gen.next()
+          if (!next.done) {
+            generators.push(gen)
+            yield next.value
+          }
+        }
+      }
+    }
+
+    if (from instanceof Function) {
+      let generators = this.vertices.filter(from).map(rec)
+      return (function* () {
+        while (generators.length) {
+          let prev = generators
+          generators = []
+          for (let gen of prev) {
+            const next = gen.next()
+            if (!next.done) {
+              generators.push(gen)
+              yield next.value
+            }
+          }
+        }
+      })()
+    } else {
+      return rec(from)
+    }
+  }
+  reverseBreadthFirstSearch(
+    to:
+      | Vertex<VMetadata, EMetadata>
+      | ((vertex: Vertex<VMetadata, EMetadata>) => boolean),
+  ): Generator<Vertex<VMetadata, EMetadata>, void> {
+    const visited: Array<Vertex<VMetadata, EMetadata>> = []
+    function* rec(
+      vertex: Vertex<VMetadata, EMetadata>,
+    ): Generator<Vertex<VMetadata, EMetadata>, void> {
+      if (visited.includes(vertex)) {
+        return
+      }
+      visited.push(vertex)
+      yield vertex
+      let generators = vertex.edges
+        .filter((e) => e.to === vertex)
+        .map((e) => rec(e.from))
+      while (generators.length) {
+        let prev = generators
+        generators = []
+        for (let gen of prev) {
+          const next = gen.next()
+          if (!next.done) {
+            generators.push(gen)
+            yield next.value
+          }
+        }
+      }
+    }
+
+    if (to instanceof Function) {
+      let generators = this.vertices.filter(to).map(rec)
+      return (function* () {
+        while (generators.length) {
+          let prev = generators
+          generators = []
+          for (let gen of prev) {
+            const next = gen.next()
+            if (!next.done) {
+              generators.push(gen)
+              yield next.value
+            }
+          }
+        }
+      })()
+    } else {
+      return rec(to)
+    }
+  }
+  shortestPath(
+    from:
+      | Vertex<VMetadata, EMetadata>
+      | ((vertex: Vertex<VMetadata, EMetadata>) => boolean),
+    to:
+      | Vertex<VMetadata, EMetadata>
+      | ((vertex: Vertex<VMetadata, EMetadata>) => boolean),
+  ): Array<Edge<EMetadata, VMetadata>> | void {
+    const isDone =
+      to instanceof Function
+        ? to
+        : (v: Vertex<VMetadata, EMetadata>) => v === to
+    const path: Array<Edge<EMetadata, VMetadata>> = []
+    const visited: Array<Vertex<VMetadata, EMetadata>> = []
+    function* check(
+      vertex: Vertex<VMetadata, EMetadata>,
+      path: Array<Edge<EMetadata, VMetadata>>,
+    ): Generator<undefined, Array<Edge<EMetadata, VMetadata>> | undefined> {
+      if (isDone(vertex)) {
+        return path
+      }
+      if (visited.includes(vertex)) {
+        return
+      }
+      visited.push(vertex)
+      yield
+      let generators = vertex.edges
+        .filter((e) => e.from === vertex)
+        .map((e) => check(e.to, [...path, e]))
+      while (generators.length) {
+        let prev = generators
+        generators = []
+        for (let gen of prev) {
+          const next = gen.next()
+          if (next.done === true) {
+            if (next.value) {
+              return next.value
+            }
+          } else {
+            generators.push(gen)
+            yield
+          }
+        }
+      }
+    }
+
+    if (from instanceof Function) {
+      let generators = this.vertices.filter(from).map((v) => check(v, []))
+      while (generators.length) {
+        let prev = generators
+        generators = []
+        for (let gen of prev) {
+          const next = gen.next()
+          if (next.done === true) {
+            if (next.value) {
+              return next.value
+            }
+          } else {
+            generators.push(gen)
+          }
+        }
+      }
+    } else {
+      const gen = check(from, [])
+      while (true) {
+        const next = gen.next()
+        if (next.done) {
+          return next.value
+        }
+      }
+    }
+  }
+}
diff --git a/sdk/lib/versionInfo/VersionInfo.ts b/sdk/lib/versionInfo/VersionInfo.ts
new file mode 100644
index 000000000..beea16019
--- /dev/null
+++ b/sdk/lib/versionInfo/VersionInfo.ts
@@ -0,0 +1,78 @@
+import { ValidateExVer } from "../exver"
+import * as T from "../types"
+
+export const IMPOSSIBLE = Symbol("IMPOSSIBLE")
+
+export type VersionOptions<Version extends string> = {
+  /** The version being described */
+  version: Version & ValidateExVer<Version>
+  /** The release notes for this version */
+  releaseNotes: string
+  /** Data migrations for this version */
+  migrations: {
+    /**
+     * A migration from the previous version
+     *    Leave blank to indicate no migration is necessary
+     *    Set to `IMPOSSIBLE` to indicate migrating from the previous version is not possible
+     */
+    up?: ((opts: { effects: T.Effects }) => Promise<void>) | typeof IMPOSSIBLE
+    /**
+     * A migration to the previous version
+     *    Leave blank to indicate no migration is necessary
+     *    Set to `IMPOSSIBLE` to indicate downgrades are prohibited
+     */
+    down?: ((opts: { effects: T.Effects }) => Promise<void>) | typeof IMPOSSIBLE
+    /**
+     * Additional migrations, such as fast-forward migrations, or migrations from other flavors
+     */
+    other?: Record<string, (opts: { effects: T.Effects }) => Promise<void>>
+  }
+}
+
+export class VersionInfo<Version extends string> {
+  private _version: null | Version = null
+  private constructor(
+    readonly options: VersionOptions<Version> & { satisfies: string[] },
+  ) {}
+  static of<Version extends string>(options: VersionOptions<Version>) {
+    return new VersionInfo<Version>({ ...options, satisfies: [] })
+  }
+  /** Specify a version that this version is 100% backwards compatible to */
+  satisfies<V extends string>(
+    version: V & ValidateExVer<V>,
+  ): VersionInfo<Version> {
+    return new VersionInfo({
+      ...this.options,
+      satisfies: [...this.options.satisfies, version],
+    })
+  }
+}
+
+function __type_tests() {
+  const version: VersionInfo<"1.0.0:0"> = VersionInfo.of({
+    version: "1.0.0:0",
+    releaseNotes: "",
+    migrations: {},
+  })
+    .satisfies("#other:1.0.0:0")
+    .satisfies("#other:2.0.0:0")
+    // @ts-expect-error
+    .satisfies("#other:2.f.0:0")
+
+  let a: VersionInfo<"1.0.0:0"> = version
+  // @ts-expect-error
+  let b: VersionInfo<"1.0.0:3"> = version
+
+  VersionInfo.of({
+    // @ts-expect-error
+    version: "test",
+    releaseNotes: "",
+    migrations: {},
+  })
+  VersionInfo.of({
+    // @ts-expect-error
+    version: "test" as string,
+    releaseNotes: "",
+    migrations: {},
+  })
+}
diff --git a/sdk/lib/versionInfo/setupVersionGraph.ts b/sdk/lib/versionInfo/setupVersionGraph.ts
new file mode 100644
index 000000000..5f89a7e35
--- /dev/null
+++ b/sdk/lib/versionInfo/setupVersionGraph.ts
@@ -0,0 +1,210 @@
+import { ExtendedVersion, VersionRange } from "../exver"
+
+import * as T from "../types"
+import { Graph, Vertex } from "../util/graph"
+import { once } from "../util/once"
+import { IMPOSSIBLE, VersionInfo } from "./VersionInfo"
+
+export class VersionGraph<CurrentVersion extends string> {
+  private readonly graph: () => Graph<
+    ExtendedVersion | VersionRange,
+    ((opts: { effects: T.Effects }) => Promise<void>) | undefined
+  >
+  private constructor(
+    readonly current: VersionInfo<CurrentVersion>,
+    versions: Array<VersionInfo<any>>,
+  ) {
+    this.graph = once(() => {
+      const graph = new Graph<
+        ExtendedVersion | VersionRange,
+        ((opts: { effects: T.Effects }) => Promise<void>) | undefined
+      >()
+      const flavorMap: Record<
+        string,
+        [
+          ExtendedVersion,
+          VersionInfo<any>,
+          Vertex<
+            ExtendedVersion | VersionRange,
+            ((opts: { effects: T.Effects }) => Promise<void>) | undefined
+          >,
+        ][]
+      > = {}
+      for (let version of [current, ...versions]) {
+        const v = ExtendedVersion.parse(version.options.version)
+        const vertex = graph.addVertex(v, [], [])
+        const flavor = v.flavor || ""
+        if (!flavorMap[flavor]) {
+          flavorMap[flavor] = []
+        }
+        flavorMap[flavor].push([v, version, vertex])
+      }
+      for (let flavor in flavorMap) {
+        flavorMap[flavor].sort((a, b) => a[0].compareForSort(b[0]))
+        let prev:
+          | [
+              ExtendedVersion,
+              VersionInfo<any>,
+              Vertex<
+                ExtendedVersion | VersionRange,
+                (opts: { effects: T.Effects }) => Promise<void>
+              >,
+            ]
+          | undefined = undefined
+        for (let [v, version, vertex] of flavorMap[flavor]) {
+          if (version.options.migrations.up !== IMPOSSIBLE) {
+            let range
+            if (prev) {
+              graph.addEdge(version.options.migrations.up, prev[2], vertex)
+              range = VersionRange.anchor(">=", prev[0]).and(
+                VersionRange.anchor("<", v),
+              )
+            } else {
+              range = VersionRange.anchor("<", v)
+            }
+            const vRange = graph.addVertex(range, [], [])
+            graph.addEdge(version.options.migrations.up, vRange, vertex)
+          }
+
+          if (version.options.migrations.down !== IMPOSSIBLE) {
+            let range
+            if (prev) {
+              graph.addEdge(version.options.migrations.down, vertex, prev[2])
+              range = VersionRange.anchor(">=", prev[0]).and(
+                VersionRange.anchor("<", v),
+              )
+            } else {
+              range = VersionRange.anchor("<", v)
+            }
+            const vRange = graph.addVertex(range, [], [])
+            graph.addEdge(version.options.migrations.down, vertex, vRange)
+          }
+
+          if (version.options.migrations.other) {
+            for (let rangeStr in version.options.migrations.other) {
+              const range = VersionRange.parse(rangeStr)
+              const vRange = graph.addVertex(range, [], [])
+              graph.addEdge(
+                version.options.migrations.other[rangeStr],
+                vRange,
+                vertex,
+              )
+              for (let matching of graph.findVertex(
+                (v) =>
+                  v.metadata instanceof ExtendedVersion &&
+                  v.metadata.satisfies(range),
+              )) {
+                graph.addEdge(
+                  version.options.migrations.other[rangeStr],
+                  matching,
+                  vertex,
+                )
+              }
+            }
+          }
+        }
+      }
+      return graph
+    })
+  }
+  currentVersion = once(() =>
+    ExtendedVersion.parse(this.current.options.version),
+  )
+  static of<
+    CurrentVersion extends string,
+    OtherVersions extends Array<VersionInfo<any>>,
+  >(
+    currentVersion: VersionInfo<CurrentVersion>,
+    ...other: EnsureUniqueId<OtherVersions, OtherVersions, CurrentVersion>
+  ) {
+    return new VersionGraph(currentVersion, other as Array<VersionInfo<any>>)
+  }
+  async migrate({
+    effects,
+    from,
+    to,
+  }: {
+    effects: T.Effects
+    from: ExtendedVersion
+    to: ExtendedVersion
+  }) {
+    const graph = this.graph()
+    if (from && to) {
+      const path = graph.shortestPath(
+        (v) =>
+          (v.metadata instanceof VersionRange &&
+            v.metadata.satisfiedBy(from)) ||
+          (v.metadata instanceof ExtendedVersion && v.metadata.equals(from)),
+        (v) =>
+          (v.metadata instanceof VersionRange && v.metadata.satisfiedBy(to)) ||
+          (v.metadata instanceof ExtendedVersion && v.metadata.equals(to)),
+      )
+      if (path) {
+        for (let edge of path) {
+          if (edge.metadata) {
+            await edge.metadata({ effects })
+          }
+          await effects.setDataVersion({ version: edge.to.metadata.toString() })
+        }
+        return
+      }
+    }
+    throw new Error()
+  }
+  canMigrateFrom = once(() =>
+    Array.from(
+      this.graph().reverseBreadthFirstSearch(
+        (v) =>
+          (v.metadata instanceof VersionRange &&
+            v.metadata.satisfiedBy(this.currentVersion())) ||
+          (v.metadata instanceof ExtendedVersion &&
+            v.metadata.equals(this.currentVersion())),
+      ),
+    ).reduce(
+      (acc, x) =>
+        acc.or(
+          x.metadata instanceof VersionRange
+            ? x.metadata
+            : VersionRange.anchor("=", x.metadata),
+        ),
+      VersionRange.none(),
+    ),
+  )
+  canMigrateTo = once(() =>
+    Array.from(
+      this.graph().breadthFirstSearch(
+        (v) =>
+          (v.metadata instanceof VersionRange &&
+            v.metadata.satisfiedBy(this.currentVersion())) ||
+          (v.metadata instanceof ExtendedVersion &&
+            v.metadata.equals(this.currentVersion())),
+      ),
+    ).reduce(
+      (acc, x) =>
+        acc.or(
+          x.metadata instanceof VersionRange
+            ? x.metadata
+            : VersionRange.anchor("=", x.metadata),
+        ),
+      VersionRange.none(),
+    ),
+  )
+}
+
+export function setupVersionGraph<
+  CurrentVersion extends string,
+  OtherVersions extends Array<VersionInfo<any>>,
+>(
+  current: VersionInfo<CurrentVersion>,
+  ...other: EnsureUniqueId<OtherVersions, OtherVersions, CurrentVersion>
+) {
+  return VersionGraph.of<CurrentVersion, OtherVersions>(current, ...other)
+}
+
+// prettier-ignore
+export type EnsureUniqueId<A, B = A, OtherVersions = never> =
+  B extends [] ? A : 
+  B extends [VersionInfo<infer Version>, ...infer Rest] ? (
+    Version extends OtherVersions ?  "One or more versions are not unique"[] :
+    EnsureUniqueId<A, Rest, Version | OtherVersions>
+  ) : "There exists a migration that is not a Migration"[]
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index a7ae06193..b093ad29e 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -88,6 +88,8 @@ export module Mock {
     title: 'Bitcoin Core',
     version: '0.21.0:0',
     satisfies: [],
+    canMigrateTo: '!',
+    canMigrateFrom: '*',
     gitHash: 'abcdefgh',
     description: {
       short: 'A Bitcoin full node by Bitcoin Core.',
@@ -132,6 +134,8 @@ export module Mock {
     title: 'Lightning Network Daemon',
     version: '0.11.1:0',
     satisfies: [],
+    canMigrateTo: '!',
+    canMigrateFrom: '*',
     gitHash: 'abcdefgh',
     description: {
       short: 'A bolt spec compliant client.',
@@ -188,6 +192,8 @@ export module Mock {
     title: 'Bitcoin Proxy',
     version: '0.2.2:0',
     satisfies: [],
+    canMigrateTo: '!',
+    canMigrateFrom: '*',
     gitHash: 'lmnopqrx',
     description: {
       short: 'A super charger for your Bitcoin node.',
@@ -1684,6 +1690,7 @@ export module Mock {
       state: 'installed',
       manifest: MockManifestBitcoind,
     },
+    dataVersion: MockManifestBitcoind.version,
     icon: '/assets/img/service-icons/bitcoind.svg',
     lastBackup: null,
     status: {
@@ -1860,6 +1867,7 @@ export module Mock {
       state: 'installed',
       manifest: MockManifestBitcoinProxy,
     },
+    dataVersion: MockManifestBitcoinProxy.version,
     icon: '/assets/img/service-icons/btc-rpc-proxy.png',
     lastBackup: null,
     status: {
@@ -1908,6 +1916,7 @@ export module Mock {
       state: 'installed',
       manifest: MockManifestLnd,
     },
+    dataVersion: MockManifestLnd.version,
     icon: '/assets/img/service-icons/lnd.png',
     lastBackup: null,
     status: {
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 5a6c7b815..ba2966b7f 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -91,6 +91,7 @@ export const mockPatchData: DataModel = {
           version: '0.20.0:0',
         },
       },
+      dataVersion: '0.20.0:0',
       icon: '/assets/img/service-icons/bitcoind.svg',
       lastBackup: null,
       status: {
@@ -295,6 +296,7 @@ export const mockPatchData: DataModel = {
           version: '0.11.0:0.0.1',
         },
       },
+      dataVersion: '0.11.0:0.0.1',
       icon: '/assets/img/service-icons/lnd.png',
       lastBackup: null,
       status: {

From f692ebbbb981ee84bc14879d614fc9441a88eef9 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 15 Aug 2024 23:41:14 +0000
Subject: [PATCH 266/341] fix runtime lockup (#2711)

---
 core/Cargo.lock | 359 +++++++++++++++++++++++++-----------------------
 1 file changed, 186 insertions(+), 173 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index f31bc21b1..951e31916 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -231,7 +231,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -242,7 +242,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -280,9 +280,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e89b6941c2d1a7045538884d6e760ccfffdf8e1ffc2613d8efa74305e1f3752"
+checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703"
 dependencies = [
  "bindgen",
  "cc",
@@ -532,7 +532,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.72",
+ "syn 2.0.74",
  "which",
 ]
 
@@ -675,9 +675,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "cache-padded"
@@ -687,12 +687,13 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.1.6"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
+checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -799,9 +800,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.11"
+version = "4.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -809,9 +810,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.11"
+version = "4.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -821,14 +822,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -839,9 +840,9 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "cmake"
-version = "0.1.50"
+version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
+checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
 dependencies = [
  "cc",
 ]
@@ -1035,15 +1036,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
 dependencies = [
  "libc",
 ]
@@ -1117,16 +1118,16 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crossterm"
-version = "0.27.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
+checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
  "bitflags 2.6.0",
  "crossterm_winapi",
  "futures-core",
- "libc",
- "mio 0.8.11",
+ "mio",
  "parking_lot",
+ "rustix",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -1236,7 +1237,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1260,7 +1261,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1271,7 +1272,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1302,7 +1303,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1325,7 +1326,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1348,7 +1349,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1416,9 +1417,9 @@ dependencies = [
 
 [[package]]
 name = "dunce"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "dyn-clone"
@@ -1570,7 +1571,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1667,14 +1668,14 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1685,9 +1686,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1828,7 +1829,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1941,7 +1942,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1960,7 +1961,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2068,6 +2069,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -2076,9 +2083,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hifijson"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18ae468bcb4dfecf0e4949ee28abbc99076b6a0077f51ddbc94dbfff8e6a870c"
+checksum = "9958ab3ce3170c061a27679916bd9b969eceeb5e8b120438e6751d0987655c42"
 
 [[package]]
 name = "hkdf"
@@ -2273,9 +2280,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2432,9 +2439,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -2475,9 +2482,9 @@ dependencies = [
 
 [[package]]
 name = "integer-encoding"
-version = "4.0.0"
+version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "924df4f0e24e2e7f9cdd90babb0b96f93b20f3ecfa949ea9e6613756b8c8e1bf"
+checksum = "0d762194228a2f1c11063e46e32e5acb96e66e906382b9eb5441f2e0504bbd5a"
 dependencies = [
  "async-trait",
  "tokio",
@@ -2504,11 +2511,11 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.4.0",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -2647,9 +2654,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2799,6 +2806,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
+ "redox_syscall 0.5.3",
 ]
 
 [[package]]
@@ -2945,25 +2953,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi 0.3.9",
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
-dependencies = [
- "hermit-abi",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -3029,9 +3026,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "new_mime_guess"
-version = "4.0.1"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d684d1b59e0dc07b37e2203ef576987473288f530082512aff850585c61b1f"
+checksum = "02a2dfb3559d53e90b709376af1c379462f7fb3085a0177deb73e6ea0d99eff4"
 dependencies = [
  "mime",
  "unicase",
@@ -3219,29 +3216,29 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3307,7 +3304,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3514,7 +3511,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3535,7 +3532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
 ]
 
 [[package]]
@@ -3570,7 +3567,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3626,9 +3623,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "precomputed-hash"
@@ -3643,7 +3643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3715,7 +3715,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3738,7 +3738,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3938,9 +3938,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4009,7 +4009,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile 2.1.2",
+ "rustls-pemfile 2.1.3",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -4079,7 +4079,7 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#f608480034942f1f521ab95949ab33fbc51d99a9"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#60a974a29c5e6380f7bbfbc1b4716f6d2b20b189"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -4217,9 +4217,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
 dependencies = [
  "base64 0.22.1",
  "rustls-pki-types",
@@ -4227,9 +4227,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
 
 [[package]]
 name = "rustls-webpki"
@@ -4273,9 +4273,9 @@ dependencies = [
 
 [[package]]
 name = "rustyline-async"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6eb06391513b2184f0a5405c11a4a0a5302e8be442f4c5c35267187c2b37d5"
+checksum = "bc9396d834c31f9fddd716e7c279e7cb70207092a1e59767918610f5c560c6eb"
 dependencies = [
  "crossterm",
  "futures-channel",
@@ -4375,9 +4375,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
 dependencies = [
  "serde_derive",
 ]
@@ -4401,23 +4401,24 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -4463,7 +4464,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4480,7 +4481,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -4489,7 +4490,7 @@ version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ce6afeda22f0b55dde2c34897bce76a629587348480384231205c14b59a01f"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "itoa",
  "libyml",
  "log",
@@ -4578,12 +4579,12 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio 0.8.11",
+ "mio",
  "signal-hook",
 ]
 
@@ -4724,7 +4725,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "log",
  "memchr",
  "once_cell",
@@ -4913,7 +4914,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.72",
+ "syn 2.0.74",
  "unicode-width",
 ]
 
@@ -5006,7 +5007,7 @@ dependencies = [
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "indicatif",
  "integer-encoding",
  "ipnet",
@@ -5072,7 +5073,7 @@ dependencies = [
  "tokio-tar",
  "tokio-tungstenite 0.23.1",
  "tokio-util",
- "toml 0.8.16",
+ "toml 0.8.19",
  "torut",
  "tower-service",
  "tracing",
@@ -5150,9 +5151,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5211,14 +5212,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5279,7 +5281,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -5360,14 +5362,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.1"
+version = "1.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a"
+checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio 1.0.1",
+ "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
@@ -5395,7 +5397,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -5421,9 +5423,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-socks"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
+checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
 dependencies = [
  "either",
  "futures-util",
@@ -5510,21 +5512,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.17",
+ "toml_edit 0.22.20",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
@@ -5535,7 +5537,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5548,22 +5550,22 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "toml_datetime",
  "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.17"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.16",
+ "winnow 0.6.18",
 ]
 
 [[package]]
@@ -5634,15 +5636,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -5664,7 +5666,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -5816,7 +5818,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
  "termcolor",
 ]
 
@@ -5876,7 +5878,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -6074,34 +6076,35 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6111,9 +6114,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6121,22 +6124,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-streams"
@@ -6153,9 +6156,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6207,11 +6210,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6247,6 +6250,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -6379,9 +6391,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.16"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
@@ -6470,6 +6482,7 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
@@ -6481,7 +6494,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -6501,7 +6514,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -6515,18 +6528,18 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.0"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.12+zstd.1.5.6"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "cc",
  "pkg-config",

From 6a8d8babce9d1d42374dce74ff0cc4b9975aff46 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 16 Aug 2024 13:40:10 -0600
Subject: [PATCH 267/341] fix uid mapping in squashfs's made from tarballs
 (#2710)

---
 build/dpkg-deps/depends          |  1 +
 core/startos/src/s9pk/v2/pack.rs | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index 3ccaee4d6..cd29714b2 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -47,6 +47,7 @@ smartmontools
 socat
 sqlite3
 squashfs-tools
+squashfs-tools-ng
 sudo
 systemd
 systemd-resolved
diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index 06a47b9d0..aa0fd39f2 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -60,14 +60,20 @@ impl SqfsDir {
             .get_or_try_init(|| async move {
                 let guid = Guid::new();
                 let path = self.tmpdir.join(guid.as_ref()).with_extension("squashfs");
-                let mut cmd = Command::new("mksquashfs");
                 if self.path.extension().and_then(|s| s.to_str()) == Some("tar") {
-                    cmd.arg("-tar");
+                    Command::new("tar2sqfs")
+                        .arg(&path)
+                        .input(Some(&mut open_file(&self.path).await?))
+                        .invoke(ErrorKind::Filesystem)
+                        .await?;
+                } else {
+                    Command::new("mksquashfs")
+                        .arg(&self.path)
+                        .arg(&path)
+                        .invoke(ErrorKind::Filesystem)
+                        .await?;
                 }
-                cmd.arg(&self.path)
-                    .arg(&path)
-                    .invoke(ErrorKind::Filesystem)
-                    .await?;
+
                 Ok(MultiCursorFile::from(
                     open_file(&path)
                         .await
@@ -507,7 +513,7 @@ impl ImageSource {
                     Command::new(CONTAINER_TOOL)
                         .arg("export")
                         .arg(container.trim())
-                        .pipe(Command::new("mksquashfs").arg("-").arg(&dest).arg("-tar"))
+                        .pipe(Command::new("tar2sqfs").arg(&dest))
                         .capture(false)
                         .invoke(ErrorKind::Docker)
                         .await?;

From a083f25b6c9fe1a7bf16348ad29dc5ded829a00d Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:44:57 -0600
Subject: [PATCH 268/341] better ergonomics for versions (#2717)

---
 sdk/lib/StartSdk.ts                           | 18 +--------------
 sdk/lib/index.ts                              |  1 +
 sdk/lib/inits/setupInit.ts                    |  2 +-
 sdk/lib/manifest/setupManifest.ts             |  4 ++--
 sdk/lib/test/configBuilder.test.ts            | 18 +++++++--------
 sdk/lib/test/output.sdk.ts                    | 22 +++++++++----------
 .../VersionGraph.ts}                          | 10 ---------
 .../{versionInfo => version}/VersionInfo.ts   |  0
 sdk/lib/version/index.ts                      |  2 ++
 .../server-routes/sideload/sideload.page.ts   |  2 +-
 10 files changed, 28 insertions(+), 51 deletions(-)
 rename sdk/lib/{versionInfo/setupVersionGraph.ts => version/VersionGraph.ts} (95%)
 rename sdk/lib/{versionInfo => version}/VersionInfo.ts (100%)
 create mode 100644 sdk/lib/version/index.ts

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 0b38d90af..569d83b16 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -30,17 +30,11 @@ import { healthCheck, HealthCheckParams } from "./health/HealthCheck"
 import { checkPortListening } from "./health/checkFns/checkPortListening"
 import { checkWebUrl, runHealthScript } from "./health/checkFns"
 import { List } from "./config/builder/list"
-import { VersionInfo, VersionOptions } from "./versionInfo/VersionInfo"
 import { Install, InstallFn } from "./inits/setupInstall"
 import { setupActions } from "./actions/setupActions"
 import { setupDependencyConfig } from "./dependencies/setupDependencyConfig"
 import { SetupBackupsParams, setupBackups } from "./backup/setupBackups"
 import { setupInit } from "./inits/setupInit"
-import {
-  EnsureUniqueId,
-  VersionGraph,
-  setupVersionGraph,
-} from "./versionInfo/setupVersionGraph"
 import { Uninstall, UninstallFn, setupUninstall } from "./inits/setupUninstall"
 import { setupMain } from "./mainFn"
 import { defaultTrigger } from "./trigger/defaultTrigger"
@@ -81,6 +75,7 @@ import {
 } from "./dependencies/dependencies"
 import { health } from "."
 import { GetSslCertificate } from "./util/GetSslCertificate"
+import { VersionGraph } from "./version"
 
 export const SDKVersion = testTypeVersion("0.3.6")
 
@@ -420,13 +415,6 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
           started(onTerm: () => PromiseLike<void>): PromiseLike<void>
         }) => Promise<Daemons<Manifest, any>>,
       ) => setupMain<Manifest, Store>(fn),
-      setupVersionGraph: <
-        CurrentVersion extends string,
-        OtherVersions extends Array<VersionInfo<any>>,
-      >(
-        current: VersionInfo<CurrentVersion>,
-        ...other: EnsureUniqueId<OtherVersions, OtherVersions, CurrentVersion>
-      ) => setupVersionGraph<CurrentVersion, OtherVersions>(current, ...other),
       setupProperties:
         (
           fn: (options: { effects: Effects }) => Promise<T.SdkPropertiesReturn>,
@@ -547,10 +535,6 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
           >,
         ) => List.dynamicText<Store>(getA),
       },
-      VersionInfo: {
-        of: <Version extends string>(options: VersionOptions<Version>) =>
-          VersionInfo.of<Version>(options),
-      },
       StorePath: pathBuilder<Store>(),
       Value: {
         toggle: Value.toggle,
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index 935ffc023..a023c4e81 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -29,3 +29,4 @@ export * as utils from "./util"
 export * as matches from "ts-matches"
 export * as YAML from "yaml"
 export * as TOML from "@iarna/toml"
+export * from "./version"
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/lib/inits/setupInit.ts
index 35971d3d3..5fd1c481c 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/lib/inits/setupInit.ts
@@ -4,7 +4,7 @@ import { SetInterfaces } from "../interfaces/setupInterfaces"
 
 import { ExposedStorePaths } from "../store/setupExposeStore"
 import * as T from "../types"
-import { VersionGraph } from "../versionInfo/setupVersionGraph"
+import { VersionGraph } from "../version/VersionGraph"
 import { Install } from "./setupInstall"
 import { Uninstall } from "./setupUninstall"
 
diff --git a/sdk/lib/manifest/setupManifest.ts b/sdk/lib/manifest/setupManifest.ts
index 2f836d05e..10aaa03db 100644
--- a/sdk/lib/manifest/setupManifest.ts
+++ b/sdk/lib/manifest/setupManifest.ts
@@ -2,7 +2,7 @@ import * as T from "../types"
 import { ImageConfig, ImageId, VolumeId } from "../osBindings"
 import { SDKManifest, SDKImageConfig } from "./ManifestTypes"
 import { SDKVersion } from "../StartSdk"
-import { VersionGraph } from "../versionInfo/setupVersionGraph"
+import { VersionGraph } from "../version/VersionGraph"
 
 /**
  * This is an example of a function that takes a manifest and returns a new manifest with additional properties
@@ -25,8 +25,8 @@ export function setupManifest<
   },
   Satisfies extends string[] = [],
 >(
-  manifest: SDKManifest & Manifest,
   versions: VersionGraph<Version>,
+  manifest: SDKManifest & Manifest,
 ): Manifest & T.Manifest {
   const images = Object.entries(manifest.images).reduce(
     (images, [k, v]) => {
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/lib/test/configBuilder.test.ts
index bd0ddeab1..5c65271a8 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/lib/test/configBuilder.test.ts
@@ -6,8 +6,8 @@ import { Variants } from "../config/builder/variants"
 import { ValueSpec } from "../config/configTypes"
 import { setupManifest } from "../manifest/setupManifest"
 import { StartSdk } from "../StartSdk"
-import { VersionGraph } from "../versionInfo/setupVersionGraph"
-import { VersionInfo } from "../versionInfo/VersionInfo"
+import { VersionGraph } from "../version/VersionGraph"
+import { VersionInfo } from "../version/VersionInfo"
 
 describe("builder tests", () => {
   test("text", async () => {
@@ -369,6 +369,13 @@ describe("values", () => {
       const sdk = StartSdk.of()
         .withManifest(
           setupManifest(
+            VersionGraph.of(
+              VersionInfo.of({
+                version: "1.0.0:0",
+                releaseNotes: "",
+                migrations: {},
+              }),
+            ),
             {
               id: "testOutput",
               title: "",
@@ -402,13 +409,6 @@ describe("values", () => {
                 },
               },
             },
-            VersionGraph.of(
-              VersionInfo.of({
-                version: "1.0.0:0",
-                releaseNotes: "",
-                migrations: {},
-              }),
-            ),
           ),
         )
         .withStore<{ test: "a" }>()
diff --git a/sdk/lib/test/output.sdk.ts b/sdk/lib/test/output.sdk.ts
index 3d8058bfa..4cdf85111 100644
--- a/sdk/lib/test/output.sdk.ts
+++ b/sdk/lib/test/output.sdk.ts
@@ -1,12 +1,21 @@
 import { StartSdk } from "../StartSdk"
 import { setupManifest } from "../manifest/setupManifest"
-import { VersionInfo } from "../versionInfo/VersionInfo"
-import { VersionGraph } from "../versionInfo/setupVersionGraph"
+import { VersionInfo } from "../version/VersionInfo"
+import { VersionGraph } from "../version/VersionGraph"
 
 export type Manifest = any
 export const sdk = StartSdk.of()
   .withManifest(
     setupManifest(
+      VersionGraph.of(
+        VersionInfo.of({
+          version: "1.0.0:0",
+          releaseNotes: "",
+          migrations: {},
+        })
+          .satisfies("#other:1.0.0:0")
+          .satisfies("#other:2.0.0:0"),
+      ),
       {
         id: "testOutput",
         title: "",
@@ -41,15 +50,6 @@ export const sdk = StartSdk.of()
           },
         },
       },
-      VersionGraph.of(
-        VersionInfo.of({
-          version: "1.0.0:0",
-          releaseNotes: "",
-          migrations: {},
-        })
-          .satisfies("#other:1.0.0:0")
-          .satisfies("#other:2.0.0:0"),
-      ),
     ),
   )
   .withStore<{ storeRoot: { storeLeaf: "value" } }>()
diff --git a/sdk/lib/versionInfo/setupVersionGraph.ts b/sdk/lib/version/VersionGraph.ts
similarity index 95%
rename from sdk/lib/versionInfo/setupVersionGraph.ts
rename to sdk/lib/version/VersionGraph.ts
index 5f89a7e35..1b6b49bb9 100644
--- a/sdk/lib/versionInfo/setupVersionGraph.ts
+++ b/sdk/lib/version/VersionGraph.ts
@@ -191,16 +191,6 @@ export class VersionGraph<CurrentVersion extends string> {
   )
 }
 
-export function setupVersionGraph<
-  CurrentVersion extends string,
-  OtherVersions extends Array<VersionInfo<any>>,
->(
-  current: VersionInfo<CurrentVersion>,
-  ...other: EnsureUniqueId<OtherVersions, OtherVersions, CurrentVersion>
-) {
-  return VersionGraph.of<CurrentVersion, OtherVersions>(current, ...other)
-}
-
 // prettier-ignore
 export type EnsureUniqueId<A, B = A, OtherVersions = never> =
   B extends [] ? A : 
diff --git a/sdk/lib/versionInfo/VersionInfo.ts b/sdk/lib/version/VersionInfo.ts
similarity index 100%
rename from sdk/lib/versionInfo/VersionInfo.ts
rename to sdk/lib/version/VersionInfo.ts
diff --git a/sdk/lib/version/index.ts b/sdk/lib/version/index.ts
new file mode 100644
index 000000000..c7a47fc38
--- /dev/null
+++ b/sdk/lib/version/index.ts
@@ -0,0 +1,2 @@
+export * from "./VersionGraph"
+export * from "./VersionInfo"
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index 9e09aca62..b95c4599f 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -22,7 +22,7 @@ const VERSION_2 = new Uint8Array([2])
 export class SideloadPage {
   isMobile = isPlatform(window, 'ios') || isPlatform(window, 'android')
   toUpload: {
-    manifest: T.Manifest | null
+    manifest: { title: string; version: string } | null
     icon: string | null
     file: File | null
   } = {

From 4d7694de24cc0f6a5fe7c40a48d0894e01d896ac Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 19 Aug 2024 21:38:05 -0600
Subject: [PATCH 269/341] chore: reimplement refactor for the changes (#2716)

* chore: reimplement refactor for the changes

* chore: Make it so even more cases are caught on the transformation

* Update container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts

* chore: Update the types of the action result because it wasnt matching what was in the action.rs
---
 container-runtime/src/Adapters/RpcListener.ts | 132 ++++++--
 .../Systems/SystemForEmbassy/index.ts         | 313 +++++++++---------
 .../src/Adapters/Systems/SystemForStartOs.ts  | 253 ++++++--------
 container-runtime/src/Interfaces/System.ts    |  67 +++-
 sdk/lib/types.ts                              |   9 +-
 5 files changed, 420 insertions(+), 354 deletions(-)

diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 28f578149..860f1c066 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -19,7 +19,7 @@ import * as fs from "fs"
 
 import { CallbackHolder } from "../Models/CallbackHolder"
 import { AllGetDependencies } from "../Interfaces/AllGetDependencies"
-import { jsonPath } from "../Models/JsonPath"
+import { jsonPath, unNestPath } from "../Models/JsonPath"
 import { RunningMain, System } from "../Interfaces/System"
 import {
   MakeMainEffects,
@@ -52,6 +52,8 @@ const SOCKET_PARENT = "/media/startos/rpc"
 const SOCKET_PATH = "/media/startos/rpc/service.sock"
 const jsonrpc = "2.0" as const
 
+const isResult = object({ result: any }).test
+
 const idType = some(string, number, literal(null))
 type IdType = null | string | number
 const runType = object({
@@ -64,7 +66,7 @@ const runType = object({
       input: any,
       timeout: number,
     },
-    ["timeout", "input"],
+    ["timeout"],
   ),
 })
 const sandboxRunType = object({
@@ -77,7 +79,7 @@ const sandboxRunType = object({
       input: any,
       timeout: number,
     },
-    ["timeout", "input"],
+    ["timeout"],
   ),
 })
 const callbackType = object({
@@ -226,27 +228,25 @@ export class RpcListener {
         const system = this.system
         const procedure = jsonPath.unsafeCast(params.procedure)
         const effects = this.getDependencies.makeProcedureEffects()(params.id)
-        return handleRpc(
-          id,
-          system.execute(effects, {
-            procedure,
-            input: params.input,
-            timeout: params.timeout,
-          }),
-        )
+        const input = params.input
+        const timeout = params.timeout
+        const result = getResult(procedure, system, effects, timeout, input)
+
+        return handleRpc(id, result)
       })
       .when(sandboxRunType, async ({ id, params }) => {
         const system = this.system
         const procedure = jsonPath.unsafeCast(params.procedure)
         const effects = this.makeProcedureEffects(params.id)
-        return handleRpc(
-          id,
-          system.sandbox(effects, {
-            procedure,
-            input: params.input,
-            timeout: params.timeout,
-          }),
+        const result = getResult(
+          procedure,
+          system,
+          effects,
+          params.input,
+          params.input,
         )
+
+        return handleRpc(id, result)
       })
       .when(callbackType, async ({ params: { callback, args } }) => {
         this.system.callCallback(callback, args)
@@ -280,7 +280,7 @@ export class RpcListener {
           (async () => {
             if (!this._system) {
               const system = await this.getDependencies.system()
-              await system.init()
+              await system.containerInit()
               this._system = system
             }
           })().then((result) => ({ result })),
@@ -342,3 +342,97 @@ export class RpcListener {
       })
   }
 }
+function getResult(
+  procedure: typeof jsonPath._TYPE,
+  system: System,
+  effects: T.Effects,
+  timeout: number | undefined,
+  input: any,
+) {
+  const ensureResultTypeShape = (
+    result:
+      | void
+      | T.ConfigRes
+      | T.PropertiesReturn
+      | T.ActionMetadata[]
+      | T.ActionResult,
+  ): { result: any } => {
+    if (isResult(result)) return result
+    return { result }
+  }
+  return (async () => {
+    switch (procedure) {
+      case "/backup/create":
+        return system.createBackup(effects, timeout || null)
+      case "/backup/restore":
+        return system.restoreBackup(effects, timeout || null)
+      case "/config/get":
+        return system.getConfig(effects, timeout || null)
+      case "/config/set":
+        return system.setConfig(effects, input, timeout || null)
+      case "/properties":
+        return system.properties(effects, timeout || null)
+      case "/actions/metadata":
+        return system.actionsMetadata(effects)
+      case "/init":
+        return system.packageInit(
+          effects,
+          string.optional().unsafeCast(input),
+          timeout || null,
+        )
+      case "/uninit":
+        return system.packageUninit(
+          effects,
+          string.optional().unsafeCast(input),
+          timeout || null,
+        )
+      default:
+        const procedures = unNestPath(procedure)
+        switch (true) {
+          case procedures[1] === "actions" && procedures[3] === "get":
+            return system.action(effects, procedures[2], input, timeout || null)
+          case procedures[1] === "actions" && procedures[3] === "run":
+            return system.action(effects, procedures[2], input, timeout || null)
+          case procedures[1] === "dependencies" && procedures[3] === "query":
+            return system.dependenciesAutoconfig(
+              effects,
+              procedures[2],
+              input,
+              timeout || null,
+            )
+
+          case procedures[1] === "dependencies" && procedures[3] === "update":
+            return system.dependenciesAutoconfig(
+              effects,
+              procedures[2],
+              input,
+              timeout || null,
+            )
+        }
+    }
+  })().then(ensureResultTypeShape, (error) =>
+    matches(error)
+      .when(
+        object(
+          {
+            error: string,
+            code: number,
+          },
+          ["code"],
+          { code: 0 },
+        ),
+        (error) => ({
+          error: {
+            code: error.code,
+            message: error.error,
+          },
+        }),
+      )
+      .defaultToLazy(() => ({
+        error: {
+          code: 0,
+          message: String(error),
+        },
+      })),
+  )
+}
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 131d912e1..cee873c21 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -61,6 +61,42 @@ const MANIFEST_LOCATION = "/usr/lib/startos/package/embassyManifest.json"
 export const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
 const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig" as StorePath
 
+const matchResult = object({
+  result: any,
+})
+const matchError = object({
+  error: string,
+})
+const matchErrorCode = object<{
+  "error-code": [number, string] | readonly [number, string]
+}>({
+  "error-code": tuple(number, string),
+})
+
+const assertNever = (
+  x: never,
+  message = "Not expecting to get here: ",
+): never => {
+  throw new Error(message + JSON.stringify(x))
+}
+/**
+  Should be changing the type for specific properties, and this is mostly a transformation for the old return types to the newer one.
+*/
+const fromReturnType = <A>(a: U.ResultType<A>): A => {
+  if (matchResult.test(a)) {
+    return a.result
+  }
+  if (matchError.test(a)) {
+    console.info({ passedErrorStack: new Error().stack, error: a.error })
+    throw { error: a.error }
+  }
+  if (matchErrorCode.test(a)) {
+    const [code, message] = a["error-code"]
+    throw { error: message, code }
+  }
+  return assertNever(a)
+}
+
 const matchSetResult = object(
   {
     "depends-on": dictionary([string, array(string)]),
@@ -206,12 +242,49 @@ export class SystemForEmbassy implements System {
       moduleCode,
     )
   }
+
   constructor(
     readonly manifest: Manifest,
     readonly moduleCode: Partial<U.ExpectedExports>,
   ) {}
 
-  async init(): Promise<void> {}
+  async actionsMetadata(effects: T.Effects): Promise<T.ActionMetadata[]> {
+    const actions = Object.entries(this.manifest.actions ?? {})
+    return Promise.all(
+      actions.map(async ([actionId, action]): Promise<T.ActionMetadata> => {
+        const name = action.name ?? actionId
+        const description = action.description
+        const warning = action.warning ?? null
+        const disabled = false
+        const input = (await convertToNewConfig(action["input-spec"] as any))
+          .spec
+        const hasRunning = !!action["allowed-statuses"].find(
+          (x) => x === "running",
+        )
+        const hasStopped = !!action["allowed-statuses"].find(
+          (x) => x === "stopped",
+        )
+        // prettier-ignore
+        const allowedStatuses = 
+        hasRunning && hasStopped ? "any":
+        hasRunning ? "onlyRunning" :
+        "onlyStopped"
+
+        const group = null
+        return {
+          name,
+          description,
+          warning,
+          disabled,
+          allowedStatuses,
+          group,
+          input,
+        }
+      }),
+    )
+  }
+
+  async containerInit(): Promise<void> {}
 
   async exit(): Promise<void> {
     if (this.currentRunning) await this.currentRunning.clean()
@@ -235,141 +308,7 @@ export class SystemForEmbassy implements System {
     }
   }
 
-  async execute(
-    effects: Effects,
-    options: {
-      procedure: JsonPath
-      input?: unknown
-      timeout?: number | undefined
-    },
-  ): Promise<RpcResult> {
-    return this._execute(effects, options)
-      .then((x) =>
-        matches(x)
-          .when(
-            object({
-              result: any,
-            }),
-            (x) => x,
-          )
-          .when(
-            object({
-              error: string,
-            }),
-            (x) => ({
-              error: {
-                code: 0,
-                message: x.error,
-              },
-            }),
-          )
-          .when(
-            object({
-              "error-code": tuple(number, string),
-            }),
-            ({ "error-code": [code, message] }) => ({
-              error: {
-                code,
-                message,
-              },
-            }),
-          )
-          .defaultTo({ result: x }),
-      )
-      .catch((error: unknown) => {
-        if (error instanceof Error)
-          return {
-            error: {
-              code: 0,
-              message: error.name,
-              data: {
-                details: error.message,
-                debug: `${error?.cause ?? "[noCause]"}:${error?.stack ?? "[noStack]"}`,
-              },
-            },
-          }
-        if (matchRpcResult.test(error)) return error
-        return {
-          error: {
-            code: 0,
-            message: String(error),
-          },
-        }
-      })
-  }
-  async _execute(
-    effects: Effects,
-    options: {
-      procedure: JsonPath
-      input?: unknown
-      timeout?: number | undefined
-    },
-  ): Promise<unknown> {
-    const input = options.input
-    switch (options.procedure) {
-      case "/backup/create":
-        return this.createBackup(effects, options.timeout || null)
-      case "/backup/restore":
-        return this.restoreBackup(effects, options.timeout || null)
-      case "/config/get":
-        return this.getConfig(effects, options.timeout || null)
-      case "/config/set":
-        return this.setConfig(effects, input, options.timeout || null)
-      case "/properties":
-        return this.properties(effects, options.timeout || null)
-      case "/actions/metadata":
-        return todo()
-      case "/init":
-        return this.initProcedure(
-          effects,
-          string.optional().unsafeCast(input),
-          options.timeout || null,
-        )
-      case "/uninit":
-        return this.uninit(
-          effects,
-          string.optional().unsafeCast(input),
-          options.timeout || null,
-        )
-      default:
-        const procedures = unNestPath(options.procedure)
-        switch (true) {
-          case procedures[1] === "actions" && procedures[3] === "get":
-            return this.action(
-              effects,
-              procedures[2],
-              input,
-              options.timeout || null,
-            )
-          case procedures[1] === "actions" && procedures[3] === "run":
-            return this.action(
-              effects,
-              procedures[2],
-              input,
-              options.timeout || null,
-            )
-          case procedures[1] === "dependencies" && procedures[3] === "query":
-            return null
-
-          case procedures[1] === "dependencies" && procedures[3] === "update":
-            return this.dependenciesAutoconfig(
-              effects,
-              procedures[2],
-              input,
-              options.timeout || null,
-            )
-        }
-    }
-    throw new Error(`Could not find the path for ${options.procedure}`)
-  }
-  async sandbox(
-    effects: Effects,
-    options: { procedure: Procedure; input: unknown; timeout?: number },
-  ): Promise<RpcResult> {
-    return this.execute(effects, options)
-  }
-
-  private async initProcedure(
+  async packageInit(
     effects: Effects,
     previousVersion: Optional<string>,
     timeoutMs: number | null,
@@ -489,7 +428,7 @@ export class SystemForEmbassy implements System {
       })
     }
   }
-  private async uninit(
+  async packageUninit(
     effects: Effects,
     nextVersion: Optional<string>,
     timeoutMs: number | null,
@@ -498,7 +437,7 @@ export class SystemForEmbassy implements System {
     await effects.setMainStatus({ status: "stopped" })
   }
 
-  private async createBackup(
+  async createBackup(
     effects: Effects,
     timeoutMs: number | null,
   ): Promise<void> {
@@ -519,7 +458,7 @@ export class SystemForEmbassy implements System {
       await moduleCode.createBackup?.(polyfillEffects(effects, this.manifest))
     }
   }
-  private async restoreBackup(
+  async restoreBackup(
     effects: Effects,
     timeoutMs: number | null,
   ): Promise<void> {
@@ -543,7 +482,7 @@ export class SystemForEmbassy implements System {
       await moduleCode.restoreBackup?.(polyfillEffects(effects, this.manifest))
     }
   }
-  private async getConfig(
+  async getConfig(
     effects: Effects,
     timeoutMs: number | null,
   ): Promise<T.ConfigRes> {
@@ -584,7 +523,7 @@ export class SystemForEmbassy implements System {
       )) as any
     }
   }
-  private async setConfig(
+  async setConfig(
     effects: Effects,
     newConfigWithoutPointers: unknown,
     timeoutMs: number | null,
@@ -676,7 +615,7 @@ export class SystemForEmbassy implements System {
     })
   }
 
-  private async migration(
+  async migration(
     effects: Effects,
     fromVersion: string,
     timeoutMs: number | null,
@@ -748,10 +687,10 @@ export class SystemForEmbassy implements System {
     }
     return { configured: true }
   }
-  private async properties(
+  async properties(
     effects: Effects,
     timeoutMs: number | null,
-  ): Promise<ReturnType<T.ExpectedExports.properties>> {
+  ): Promise<T.PropertiesReturn> {
     // TODO BLU-J set the properties ever so often
     const setConfigValue = this.manifest.properties
     if (!setConfigValue) throw new Error("There is no properties")
@@ -779,36 +718,81 @@ export class SystemForEmbassy implements System {
       if (!method)
         throw new Error("Expecting that the method properties exists")
       const properties = matchProperties.unsafeCast(
-        await method(polyfillEffects(effects, this.manifest)).then((x) => {
-          if ("result" in x) return x.result
-          if ("error" in x) throw new Error("Error getting config: " + x.error)
-          throw new Error("Error getting config: " + x["error-code"][1])
-        }),
+        await method(polyfillEffects(effects, this.manifest)).then(
+          fromReturnType,
+        ),
       )
       return asProperty(properties.data)
     }
     throw new Error(`Unknown type in the fetch properties: ${setConfigValue}`)
   }
-  private async action(
+  async action(
     effects: Effects,
     actionId: string,
     formData: unknown,
     timeoutMs: number | null,
   ): Promise<T.ActionResult> {
     const actionProcedure = this.manifest.actions?.[actionId]?.implementation
+    const toActionResult = ({
+      message,
+      value = "",
+      copyable,
+      qr,
+    }: U.ActionResult): T.ActionResult => ({
+      version: "0",
+      message,
+      value,
+      copyable,
+      qr,
+    })
+    if (!actionProcedure) throw Error("Action not found")
+    if (actionProcedure.type === "docker") {
+      const container = await DockerProcedureContainer.of(
+        effects,
+        this.manifest.id,
+        actionProcedure,
+        this.manifest.volumes,
+      )
+      return toActionResult(
+        JSON.parse(
+          (
+            await container.execFail(
+              [
+                actionProcedure.entrypoint,
+                ...actionProcedure.args,
+                JSON.stringify(formData),
+              ],
+              timeoutMs,
+            )
+          ).stdout.toString(),
+        ),
+      )
+    } else {
+      const moduleCode = await this.moduleCode
+      const method = moduleCode.action?.[actionId]
+      if (!method) throw new Error("Expecting that the method action exists")
+      return await method(
+        polyfillEffects(effects, this.manifest),
+        formData as any,
+      )
+        .then(fromReturnType)
+        .then(toActionResult)
+    }
+  }
+  async dependenciesCheck(
+    effects: Effects,
+    id: string,
+    oldConfig: unknown,
+    timeoutMs: number | null,
+  ): Promise<object> {
+    const actionProcedure = this.manifest.dependencies?.[id]?.config?.check
     if (!actionProcedure) return { message: "Action not found", value: null }
     if (actionProcedure.type === "docker") {
-      const overlay = actionProcedure.inject
-        ? this.currentRunning?.mainOverlay
-        : undefined
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
         actionProcedure,
         this.manifest.volumes,
-        {
-          overlay,
-        },
       )
       return JSON.parse(
         (
@@ -816,27 +800,32 @@ export class SystemForEmbassy implements System {
             [
               actionProcedure.entrypoint,
               ...actionProcedure.args,
-              JSON.stringify(formData),
+              JSON.stringify(oldConfig),
             ],
             timeoutMs,
           )
         ).stdout.toString(),
       )
-    } else {
+    } else if (actionProcedure.type === "script") {
       const moduleCode = await this.moduleCode
-      const method = moduleCode.action?.[actionId]
-      if (!method) throw new Error("Expecting that the method action exists")
+      const method = moduleCode.dependencies?.[id]?.check
+      if (!method)
+        throw new Error(
+          `Expecting that the method dependency check ${id} exists`,
+        )
       return (await method(
         polyfillEffects(effects, this.manifest),
-        formData as any,
+        oldConfig as any,
       ).then((x) => {
         if ("result" in x) return x.result
         if ("error" in x) throw new Error("Error getting config: " + x.error)
         throw new Error("Error getting config: " + x["error-code"][1])
       })) as any
+    } else {
+      return {}
     }
   }
-  private async dependenciesAutoconfig(
+  async dependenciesAutoconfig(
     effects: Effects,
     id: string,
     input: unknown,
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index be7b0fc84..51d91abb5 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -8,6 +8,7 @@ import { T, utils } from "@start9labs/start-sdk"
 import { Volume } from "../../Models/Volume"
 import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
 import { CallbackHolder } from "../../Models/CallbackHolder"
+import { Optional } from "ts-matches/lib/parsers/interfaces"
 
 export const STARTOS_JS_LOCATION = "/usr/lib/startos/package/index.js"
 
@@ -25,6 +26,107 @@ export class SystemForStartOs implements System {
   }
 
   constructor(readonly abi: T.ABI) {}
+  containerInit(): Promise<void> {
+    throw new Error("Method not implemented.")
+  }
+  async packageInit(
+    effects: Effects,
+    previousVersion: Optional<string> = null,
+    timeoutMs: number | null = null,
+  ): Promise<void> {
+    return void (await this.abi.init({ effects }))
+  }
+  async packageUninit(
+    effects: Effects,
+    nextVersion: Optional<string> = null,
+    timeoutMs: number | null = null,
+  ): Promise<void> {
+    return void (await this.abi.uninit({ effects, nextVersion }))
+  }
+  async createBackup(
+    effects: T.Effects,
+    timeoutMs: number | null,
+  ): Promise<void> {
+    return void (await this.abi.createBackup({
+      effects,
+      pathMaker: ((options) =>
+        new Volume(options.volume, options.path).path) as T.PathMaker,
+    }))
+  }
+  async restoreBackup(
+    effects: T.Effects,
+    timeoutMs: number | null,
+  ): Promise<void> {
+    return void (await this.abi.restoreBackup({
+      effects,
+      pathMaker: ((options) =>
+        new Volume(options.volume, options.path).path) as T.PathMaker,
+    }))
+  }
+  getConfig(
+    effects: T.Effects,
+    timeoutMs: number | null,
+  ): Promise<T.ConfigRes> {
+    return this.abi.getConfig({ effects })
+  }
+  async setConfig(
+    effects: Effects,
+    input: { effects: Effects; input: Record<string, unknown> },
+    timeoutMs: number | null,
+  ): Promise<void> {
+    const _: unknown = await this.abi.setConfig({ effects, input })
+    return
+  }
+  migration(
+    effects: Effects,
+    fromVersion: string,
+    timeoutMs: number | null,
+  ): Promise<T.MigrationRes> {
+    throw new Error("Method not implemented.")
+  }
+  properties(
+    effects: Effects,
+    timeoutMs: number | null,
+  ): Promise<T.PropertiesReturn> {
+    throw new Error("Method not implemented.")
+  }
+  async action(
+    effects: Effects,
+    id: string,
+    formData: unknown,
+    timeoutMs: number | null,
+  ): Promise<T.ActionResult> {
+    const action = (await this.abi.actions({ effects }))[id]
+    if (!action) throw new Error(`Action ${id} not found`)
+    return action.run({ effects })
+  }
+  dependenciesCheck(
+    effects: Effects,
+    id: string,
+    oldConfig: unknown,
+    timeoutMs: number | null,
+  ): Promise<any> {
+    const dependencyConfig = this.abi.dependencyConfig[id]
+    if (!dependencyConfig) throw new Error(`dependencyConfig ${id} not found`)
+    return dependencyConfig.query({ effects })
+  }
+  async dependenciesAutoconfig(
+    effects: Effects,
+    id: string,
+    remoteConfig: unknown,
+    timeoutMs: number | null,
+  ): Promise<void> {
+    const dependencyConfig = this.abi.dependencyConfig[id]
+    if (!dependencyConfig) throw new Error(`dependencyConfig ${id} not found`)
+    const queryResults = await this.getConfig(effects, timeoutMs)
+    return void (await dependencyConfig.update({
+      queryResults,
+      remoteConfig,
+    })) // TODO
+  }
+  async actionsMetadata(effects: T.Effects): Promise<T.ActionMetadata[]> {
+    return this.abi.actionsMetadata({ effects })
+  }
 
   async init(): Promise<void> {}
 
@@ -72,155 +174,4 @@ export class SystemForStartOs implements System {
       this.runningMain = undefined
     }
   }
-
-  async execute(
-    effects: Effects,
-    options: {
-      procedure: Procedure
-      input?: unknown
-      timeout?: number | undefined
-    },
-  ): Promise<RpcResult> {
-    return this._execute(effects, options)
-      .then((x) =>
-        matches(x)
-          .when(
-            object({
-              result: any,
-            }),
-            (x) => x,
-          )
-          .when(
-            object({
-              error: string,
-            }),
-            (x) => ({
-              error: {
-                code: 0,
-                message: x.error,
-              },
-            }),
-          )
-          .when(
-            object({
-              "error-code": tuple(number, string),
-            }),
-            ({ "error-code": [code, message] }) => ({
-              error: {
-                code,
-                message,
-              },
-            }),
-          )
-          .defaultTo({ result: x }),
-      )
-      .catch((error: unknown) => {
-        if (error instanceof Error)
-          return {
-            error: {
-              code: 0,
-              message: error.name,
-              data: {
-                details: error.message,
-                debug: `${error?.cause ?? "[noCause]"}:${error?.stack ?? "[noStack]"}`,
-              },
-            },
-          }
-        if (matchRpcResult.test(error)) return error
-        return {
-          error: {
-            code: 0,
-            message: String(error),
-          },
-        }
-      })
-  }
-  async _execute(
-    effects: Effects | MainEffects,
-    options: {
-      procedure: Procedure
-      input?: unknown
-      timeout?: number | undefined
-    },
-  ): Promise<unknown> {
-    switch (options.procedure) {
-      case "/init": {
-        return this.abi.init({ effects })
-      }
-      case "/uninit": {
-        const nextVersion = string.optional().unsafeCast(options.input) || null
-        return this.abi.uninit({ effects, nextVersion })
-      }
-      // case "/main/start": {
-      //
-      // }
-      // case "/main/stop": {
-      //   if (this.onTerm) await this.onTerm()
-      //   await effects.setMainStatus({ status: "stopped" })
-      //   delete this.onTerm
-      //   return duration(30, "s")
-      // }
-      case "/config/set": {
-        const input = options.input as any // TODO
-        return this.abi.setConfig({ effects, input })
-      }
-      case "/config/get": {
-        return this.abi.getConfig({ effects })
-      }
-      case "/backup/create":
-        return this.abi.createBackup({
-          effects,
-          pathMaker: ((options) =>
-            new Volume(options.volume, options.path).path) as T.PathMaker,
-        })
-      case "/backup/restore":
-        return this.abi.restoreBackup({
-          effects,
-          pathMaker: ((options) =>
-            new Volume(options.volume, options.path).path) as T.PathMaker,
-        })
-      case "/actions/metadata": {
-        return this.abi.actionsMetadata({ effects })
-      }
-      case "/properties": {
-        throw new Error("TODO")
-      }
-      default:
-        const procedures = unNestPath(options.procedure)
-        const id = procedures[2]
-        switch (true) {
-          case procedures[1] === "actions" && procedures[3] === "get": {
-            const action = (await this.abi.actions({ effects }))[id]
-            if (!action) throw new Error(`Action ${id} not found`)
-            return action.getConfig({ effects })
-          }
-          case procedures[1] === "actions" && procedures[3] === "run": {
-            const action = (await this.abi.actions({ effects }))[id]
-            if (!action) throw new Error(`Action ${id} not found`)
-            return action.run({ effects, input: options.input as any }) // TODO
-          }
-          case procedures[1] === "dependencies" && procedures[3] === "query": {
-            const dependencyConfig = this.abi.dependencyConfig[id]
-            if (!dependencyConfig)
-              throw new Error(`dependencyConfig ${id} not found`)
-            const localConfig = options.input
-            return dependencyConfig.query({ effects })
-          }
-          case procedures[1] === "dependencies" && procedures[3] === "update": {
-            const dependencyConfig = this.abi.dependencyConfig[id]
-            if (!dependencyConfig)
-              throw new Error(`dependencyConfig ${id} not found`)
-            return dependencyConfig.update(options.input as any) // TODO
-          }
-        }
-        return
-    }
-  }
-
-  async sandbox(
-    effects: Effects,
-    options: { procedure: Procedure; input?: unknown; timeout?: number },
-  ): Promise<RpcResult> {
-    return this.execute(effects, options)
-  }
 }
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
index 01fd3c5ff..1348b79e9 100644
--- a/container-runtime/src/Interfaces/System.ts
+++ b/container-runtime/src/Interfaces/System.ts
@@ -3,6 +3,7 @@ import { RpcResult } from "../Adapters/RpcListener"
 import { Effects } from "../Models/Effects"
 import { CallbackHolder } from "../Models/CallbackHolder"
 import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+import { Optional } from "ts-matches/lib/parsers/interfaces"
 
 export type Procedure =
   | "/init"
@@ -22,28 +23,60 @@ export type ExecuteResult =
   | { ok: unknown }
   | { err: { code: number; message: string } }
 export type System = {
-  init(): Promise<void>
+  containerInit(): Promise<void>
 
   start(effects: MainEffects): Promise<void>
   callCallback(callback: number, args: any[]): void
   stop(): Promise<void>
 
-  execute(
-    effects: Effects,
-    options: {
-      procedure: Procedure
-      input: unknown
-      timeout?: number
-    },
-  ): Promise<RpcResult>
-  sandbox(
-    effects: Effects,
-    options: {
-      procedure: Procedure
-      input: unknown
-      timeout?: number
-    },
-  ): Promise<RpcResult>
+  packageInit(
+    effects: Effects,
+    previousVersion: Optional<string>,
+    timeoutMs: number | null,
+  ): Promise<void>
+  packageUninit(
+    effects: Effects,
+    nextVersion: Optional<string>,
+    timeoutMs: number | null,
+  ): Promise<void>
+
+  createBackup(effects: T.Effects, timeoutMs: number | null): Promise<void>
+  restoreBackup(effects: T.Effects, timeoutMs: number | null): Promise<void>
+  getConfig(effects: T.Effects, timeoutMs: number | null): Promise<T.ConfigRes>
+  setConfig(
+    effects: Effects,
+    input: { effects: Effects; input: Record<string, unknown> },
+    timeoutMs: number | null,
+  ): Promise<void>
+  migration(
+    effects: Effects,
+    fromVersion: string,
+    timeoutMs: number | null,
+  ): Promise<T.MigrationRes>
+  properties(
+    effects: Effects,
+    timeoutMs: number | null,
+  ): Promise<T.PropertiesReturn>
+  action(
+    effects: Effects,
+    actionId: string,
+    formData: unknown,
+    timeoutMs: number | null,
+  ): Promise<T.ActionResult>
+
+  dependenciesCheck(
+    effects: Effects,
+    id: string,
+    oldConfig: unknown,
+    timeoutMs: number | null,
+  ): Promise<any>
+  dependenciesAutoconfig(
+    effects: Effects,
+    id: string,
+    oldConfig: unknown,
+    timeoutMs: number | null,
+  ): Promise<void>
+  actionsMetadata(effects: T.Effects): Promise<T.ActionMetadata[]>
 
   exit(): Promise<void>
 }
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 2611a0b84..d448b2255 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -476,12 +476,11 @@ export type MigrationRes = {
 }
 
 export type ActionResult = {
+  version: "0"
   message: string
-  value: null | {
-    value: string
-    copyable: boolean
-    qr: boolean
-  }
+  value: string | null
+  copyable: boolean
+  qr: boolean
 }
 export type SetResult = {
   dependsOn: DependsOn

From c6ee65b65414f97d33cb41dcbc21f539d9c41b37 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 19 Aug 2024 21:39:38 -0600
Subject: [PATCH 270/341] bump sdk version

---
 sdk/package-lock.json | 4 ++--
 sdk/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index 0e2bbf7cb..59f7ab718 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha7",
+  "version": "0.3.6-alpha8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha7",
+      "version": "0.3.6-alpha8",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/sdk/package.json b/sdk/package.json
index b2b2ceb44..f3af7ff1b 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha7",
+  "version": "0.3.6-alpha8",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./cjs/lib/index.js",
   "types": "./cjs/lib/index.d.ts",

From 4defec194f974005a1a10a0da1d57b3bbcf878b1 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 22 Aug 2024 21:45:54 -0600
Subject: [PATCH 271/341] Feature/subcontainers (#2720)

* wip: subcontainers

* wip: subcontainer infra

* rename NonDestroyableOverlay to SubContainerHandle

* chore: Changes to the container and other things

* wip:

* wip: fixes

* fix launch & exec

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* tweak apis

* misc fixes

* don't treat sigterm as error

* handle health check set during starting

---------

Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: Jade <Blu-J@users.noreply.github.com>
---
 .../src/Adapters/EffectCreator.ts             |  82 ++--
 .../DockerProcedureContainer.ts               |  61 +--
 .../Systems/SystemForEmbassy/MainLoop.ts      |  34 +-
 .../Systems/SystemForEmbassy/index.ts         |   6 +
 .../SystemForEmbassy/polyfillEffects.ts       |  10 +-
 core/Cargo.lock                               | 106 ++++-
 core/startos/Cargo.toml                       |  14 +-
 core/startos/src/lxc/mod.rs                   |   7 +-
 core/startos/src/service/effects/health.rs    |   4 +-
 core/startos/src/service/effects/mod.rs       | 115 +++---
 .../effects/{image.rs => subcontainer/mod.rs} |  85 +---
 .../src/service/effects/subcontainer/sync.rs  | 389 ++++++++++++++++++
 core/startos/src/service/mod.rs               |   4 +-
 .../src/service/persistent_container.rs       |   8 +-
 core/startos/src/service/service_actor.rs     | 142 +++----
 core/startos/src/service/start_stop.rs        |  42 +-
 core/startos/src/status/mod.rs                |  71 ++--
 sdk/lib/StartSdk.ts                           |   9 +-
 sdk/lib/health/HealthCheck.ts                 |   2 +-
 sdk/lib/health/checkFns/runHealthScript.ts    |   6 +-
 sdk/lib/index.ts                              |   2 +-
 sdk/lib/mainFn/CommandController.ts           | 183 ++++----
 sdk/lib/mainFn/Daemon.ts                      |  24 +-
 sdk/lib/mainFn/Daemons.ts                     |  11 +-
 sdk/lib/mainFn/HealthDaemon.ts                |  27 +-
 sdk/lib/mainFn/Mounts.ts                      |   2 +-
 ...arams.ts => CreateSubcontainerFsParams.ts} |   2 +-
 ...rams.ts => DestroySubcontainerFsParams.ts} |   2 +-
 sdk/lib/osBindings/MainStatus.ts              |  10 +-
 sdk/lib/osBindings/StartStop.ts               |   3 +
 sdk/lib/osBindings/index.ts                   |   5 +-
 sdk/lib/test/startosTypeValidation.test.ts    |  32 +-
 sdk/lib/trigger/index.ts                      |   1 +
 sdk/lib/types.ts                              |  24 +-
 sdk/lib/util/{Overlay.ts => SubContainer.ts}  | 156 +++++--
 sdk/lib/util/index.ts                         |   2 +-
 sdk/lib/util/typeHelpers.ts                   |  93 +++++
 37 files changed, 1211 insertions(+), 565 deletions(-)
 rename core/startos/src/service/effects/{image.rs => subcontainer/mod.rs} (50%)
 create mode 100644 core/startos/src/service/effects/subcontainer/sync.rs
 rename sdk/lib/osBindings/{CreateOverlayedImageParams.ts => CreateSubcontainerFsParams.ts} (70%)
 rename sdk/lib/osBindings/{DestroyOverlayedImageParams.ts => DestroySubcontainerFsParams.ts} (71%)
 create mode 100644 sdk/lib/osBindings/StartStop.ts
 rename sdk/lib/util/{Overlay.ts => SubContainer.ts} (66%)

diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index 1c2954cb2..e0390b1e1 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -40,7 +40,7 @@ export type EffectContext = {
 
 const rpcRoundFor =
   (procedureId: string | null) =>
-  <K extends keyof Effects | "getStore" | "setStore" | "clearCallbacks">(
+  <K extends T.EffectMethod | "clearCallbacks">(
     method: K,
     params: Record<string, unknown>,
   ) => {
@@ -110,65 +110,65 @@ function makeEffects(context: EffectContext): Effects {
       }) as ReturnType<T.Effects["bind"]>
     },
     clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
-      return rpcRound("clearBindings", {}) as ReturnType<
+      return rpcRound("clear-bindings", {}) as ReturnType<
         T.Effects["clearBindings"]
       >
     },
     clearServiceInterfaces(
       ...[]: Parameters<T.Effects["clearServiceInterfaces"]>
     ) {
-      return rpcRound("clearServiceInterfaces", {}) as ReturnType<
+      return rpcRound("clear-service-interfaces", {}) as ReturnType<
         T.Effects["clearServiceInterfaces"]
       >
     },
     getInstalledPackages(...[]: Parameters<T.Effects["getInstalledPackages"]>) {
-      return rpcRound("getInstalledPackages", {}) as ReturnType<
+      return rpcRound("get-installed-packages", {}) as ReturnType<
         T.Effects["getInstalledPackages"]
       >
     },
-    createOverlayedImage(options: {
-      imageId: string
-    }): Promise<[string, string]> {
-      return rpcRound("createOverlayedImage", options) as ReturnType<
-        T.Effects["createOverlayedImage"]
-      >
-    },
-    destroyOverlayedImage(options: { guid: string }): Promise<void> {
-      return rpcRound("destroyOverlayedImage", options) as ReturnType<
-        T.Effects["destroyOverlayedImage"]
-      >
+    subcontainer: {
+      createFs(options: { imageId: string }) {
+        return rpcRound("subcontainer.create-fs", options) as ReturnType<
+          T.Effects["subcontainer"]["createFs"]
+        >
+      },
+      destroyFs(options: { guid: string }): Promise<void> {
+        return rpcRound("subcontainer.destroy-fs", options) as ReturnType<
+          T.Effects["subcontainer"]["destroyFs"]
+        >
+      },
     },
     executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
-      return rpcRound("executeAction", options) as ReturnType<
+      return rpcRound("execute-action", options) as ReturnType<
         T.Effects["executeAction"]
       >
     },
     exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
-      return rpcRound("exportAction", options) as ReturnType<
+      return rpcRound("export-action", options) as ReturnType<
         T.Effects["exportAction"]
       >
     },
     exportServiceInterface: ((
       ...[options]: Parameters<Effects["exportServiceInterface"]>
     ) => {
-      return rpcRound("exportServiceInterface", options) as ReturnType<
+      return rpcRound("export-service-interface", options) as ReturnType<
         T.Effects["exportServiceInterface"]
       >
     }) as Effects["exportServiceInterface"],
     exposeForDependents(
       ...[options]: Parameters<T.Effects["exposeForDependents"]>
     ) {
-      return rpcRound("exposeForDependents", options) as ReturnType<
+      return rpcRound("expose-for-dependents", options) as ReturnType<
         T.Effects["exposeForDependents"]
       >
     },
     getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
-      return rpcRound("getConfigured", {}) as ReturnType<
+      return rpcRound("get-configured", {}) as ReturnType<
         T.Effects["getConfigured"]
       >
     },
     getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
-      return rpcRound("getContainerIp", {}) as ReturnType<
+      return rpcRound("get-container-ip", {}) as ReturnType<
         T.Effects["getContainerIp"]
       >
     },
@@ -177,21 +177,21 @@ function makeEffects(context: EffectContext): Effects {
         ...allOptions,
         callback: context.callbacks?.addCallback(allOptions.callback) || null,
       }
-      return rpcRound("getHostInfo", options) as ReturnType<
+      return rpcRound("get-host-info", options) as ReturnType<
         T.Effects["getHostInfo"]
       > as any
     }) as Effects["getHostInfo"],
     getServiceInterface(
       ...[options]: Parameters<T.Effects["getServiceInterface"]>
     ) {
-      return rpcRound("getServiceInterface", {
+      return rpcRound("get-service-interface", {
         ...options,
         callback: context.callbacks?.addCallback(options.callback) || null,
       }) as ReturnType<T.Effects["getServiceInterface"]>
     },
 
     getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
-      return rpcRound("getPrimaryUrl", {
+      return rpcRound("get-primary-url", {
         ...options,
         callback: context.callbacks?.addCallback(options.callback) || null,
       }) as ReturnType<T.Effects["getPrimaryUrl"]>
@@ -199,22 +199,22 @@ function makeEffects(context: EffectContext): Effects {
     getServicePortForward(
       ...[options]: Parameters<T.Effects["getServicePortForward"]>
     ) {
-      return rpcRound("getServicePortForward", options) as ReturnType<
+      return rpcRound("get-service-port-forward", options) as ReturnType<
         T.Effects["getServicePortForward"]
       >
     },
     getSslCertificate(options: Parameters<T.Effects["getSslCertificate"]>[0]) {
-      return rpcRound("getSslCertificate", options) as ReturnType<
+      return rpcRound("get-ssl-certificate", options) as ReturnType<
         T.Effects["getSslCertificate"]
       >
     },
     getSslKey(options: Parameters<T.Effects["getSslKey"]>[0]) {
-      return rpcRound("getSslKey", options) as ReturnType<
+      return rpcRound("get-ssl-key", options) as ReturnType<
         T.Effects["getSslKey"]
       >
     },
     getSystemSmtp(...[options]: Parameters<T.Effects["getSystemSmtp"]>) {
-      return rpcRound("getSystemSmtp", {
+      return rpcRound("get-system-smtp", {
         ...options,
         callback: context.callbacks?.addCallback(options.callback) || null,
       }) as ReturnType<T.Effects["getSystemSmtp"]>
@@ -222,7 +222,7 @@ function makeEffects(context: EffectContext): Effects {
     listServiceInterfaces(
       ...[options]: Parameters<T.Effects["listServiceInterfaces"]>
     ) {
-      return rpcRound("listServiceInterfaces", {
+      return rpcRound("list-service-interfaces", {
         ...options,
         callback: context.callbacks?.addCallback(options.callback) || null,
       }) as ReturnType<T.Effects["listServiceInterfaces"]>
@@ -231,7 +231,7 @@ function makeEffects(context: EffectContext): Effects {
       return rpcRound("mount", options) as ReturnType<T.Effects["mount"]>
     },
     clearActions(...[]: Parameters<T.Effects["clearActions"]>) {
-      return rpcRound("clearActions", {}) as ReturnType<
+      return rpcRound("clear-actions", {}) as ReturnType<
         T.Effects["clearActions"]
       >
     },
@@ -239,37 +239,39 @@ function makeEffects(context: EffectContext): Effects {
       return rpcRound("restart", {}) as ReturnType<T.Effects["restart"]>
     },
     setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
-      return rpcRound("setConfigured", { configured }) as ReturnType<
+      return rpcRound("set-configured", { configured }) as ReturnType<
         T.Effects["setConfigured"]
       >
     },
     setDependencies(
       dependencies: Parameters<T.Effects["setDependencies"]>[0],
     ): ReturnType<T.Effects["setDependencies"]> {
-      return rpcRound("setDependencies", dependencies) as ReturnType<
+      return rpcRound("set-dependencies", dependencies) as ReturnType<
         T.Effects["setDependencies"]
       >
     },
     checkDependencies(
       options: Parameters<T.Effects["checkDependencies"]>[0],
     ): ReturnType<T.Effects["checkDependencies"]> {
-      return rpcRound("checkDependencies", options) as ReturnType<
+      return rpcRound("check-dependencies", options) as ReturnType<
         T.Effects["checkDependencies"]
       >
     },
     getDependencies(): ReturnType<T.Effects["getDependencies"]> {
-      return rpcRound("getDependencies", {}) as ReturnType<
+      return rpcRound("get-dependencies", {}) as ReturnType<
         T.Effects["getDependencies"]
       >
     },
     setHealth(...[options]: Parameters<T.Effects["setHealth"]>) {
-      return rpcRound("setHealth", options) as ReturnType<
+      return rpcRound("set-health", options) as ReturnType<
         T.Effects["setHealth"]
       >
     },
 
     setMainStatus(o: { status: "running" | "stopped" }): Promise<void> {
-      return rpcRound("setMainStatus", o) as ReturnType<T.Effects["setHealth"]>
+      return rpcRound("set-main-status", o) as ReturnType<
+        T.Effects["setHealth"]
+      >
     },
 
     shutdown(...[]: Parameters<T.Effects["shutdown"]>) {
@@ -277,20 +279,20 @@ function makeEffects(context: EffectContext): Effects {
     },
     store: {
       get: async (options: any) =>
-        rpcRound("getStore", {
+        rpcRound("store.get", {
           ...options,
           callback: context.callbacks?.addCallback(options.callback) || null,
         }) as any,
       set: async (options: any) =>
-        rpcRound("setStore", options) as ReturnType<T.Effects["store"]["set"]>,
+        rpcRound("store.set", options) as ReturnType<T.Effects["store"]["set"]>,
     } as T.Effects["store"],
     getDataVersion() {
-      return rpcRound("getDataVersion", {}) as ReturnType<
+      return rpcRound("get-data-version", {}) as ReturnType<
         T.Effects["getDataVersion"]
       >
     },
     setDataVersion(...[options]: Parameters<T.Effects["setDataVersion"]>) {
-      return rpcRound("setDataVersion", options) as ReturnType<
+      return rpcRound("set-data-version", options) as ReturnType<
         T.Effects["setDataVersion"]
       >
     },
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 47325170d..805f9b531 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -1,56 +1,60 @@
 import * as fs from "fs/promises"
 import * as cp from "child_process"
-import { Overlay, types as T } from "@start9labs/start-sdk"
+import { SubContainer, types as T } from "@start9labs/start-sdk"
 import { promisify } from "util"
 import { DockerProcedure, VolumeId } from "../../../Models/DockerProcedure"
 import { Volume } from "./matchVolume"
-import { ExecSpawnable } from "@start9labs/start-sdk/cjs/lib/util/Overlay"
+import {
+  CommandOptions,
+  ExecOptions,
+  ExecSpawnable,
+} from "@start9labs/start-sdk/cjs/lib/util/SubContainer"
 export const exec = promisify(cp.exec)
 export const execFile = promisify(cp.execFile)
 
 export class DockerProcedureContainer {
-  private constructor(private readonly overlay: ExecSpawnable) {}
+  private constructor(private readonly subcontainer: ExecSpawnable) {}
 
   static async of(
     effects: T.Effects,
     packageId: string,
     data: DockerProcedure,
     volumes: { [id: VolumeId]: Volume },
-    options: { overlay?: ExecSpawnable } = {},
+    options: { subcontainer?: ExecSpawnable } = {},
   ) {
-    const overlay =
-      options?.overlay ??
-      (await DockerProcedureContainer.createOverlay(
+    const subcontainer =
+      options?.subcontainer ??
+      (await DockerProcedureContainer.createSubContainer(
         effects,
         packageId,
         data,
         volumes,
       ))
-    return new DockerProcedureContainer(overlay)
+    return new DockerProcedureContainer(subcontainer)
   }
-  static async createOverlay(
+  static async createSubContainer(
     effects: T.Effects,
     packageId: string,
     data: DockerProcedure,
     volumes: { [id: VolumeId]: Volume },
   ) {
-    const overlay = await Overlay.of(effects, { id: data.image })
+    const subcontainer = await SubContainer.of(effects, { id: data.image })
 
     if (data.mounts) {
       const mounts = data.mounts
       for (const mount in mounts) {
         const path = mounts[mount].startsWith("/")
-          ? `${overlay.rootfs}${mounts[mount]}`
-          : `${overlay.rootfs}/${mounts[mount]}`
+          ? `${subcontainer.rootfs}${mounts[mount]}`
+          : `${subcontainer.rootfs}/${mounts[mount]}`
         await fs.mkdir(path, { recursive: true })
         const volumeMount = volumes[mount]
         if (volumeMount.type === "data") {
-          await overlay.mount(
+          await subcontainer.mount(
             { type: "volume", id: mount, subpath: null, readonly: false },
             mounts[mount],
           )
         } else if (volumeMount.type === "assets") {
-          await overlay.mount(
+          await subcontainer.mount(
             { type: "assets", id: mount, subpath: null },
             mounts[mount],
           )
@@ -96,24 +100,35 @@ export class DockerProcedureContainer {
             })
             .catch(console.warn)
         } else if (volumeMount.type === "backup") {
-          await overlay.mount({ type: "backup", subpath: null }, mounts[mount])
+          await subcontainer.mount(
+            { type: "backup", subpath: null },
+            mounts[mount],
+          )
         }
       }
     }
-    return overlay
+    return subcontainer
   }
 
-  async exec(commands: string[], {} = {}) {
+  async exec(
+    commands: string[],
+    options?: CommandOptions & ExecOptions,
+    timeoutMs?: number | null,
+  ) {
     try {
-      return await this.overlay.exec(commands)
+      return await this.subcontainer.exec(commands, options, timeoutMs)
     } finally {
-      await this.overlay.destroy?.()
+      await this.subcontainer.destroy?.()
     }
   }
 
-  async execFail(commands: string[], timeoutMs: number | null, {} = {}) {
+  async execFail(
+    commands: string[],
+    timeoutMs: number | null,
+    options?: CommandOptions & ExecOptions,
+  ) {
     try {
-      const res = await this.overlay.exec(commands, {}, timeoutMs)
+      const res = await this.subcontainer.exec(commands, options, timeoutMs)
       if (res.exitCode !== 0) {
         const codeOrSignal =
           res.exitCode !== null
@@ -125,11 +140,11 @@ export class DockerProcedureContainer {
       }
       return res
     } finally {
-      await this.overlay.destroy?.()
+      await this.subcontainer.destroy?.()
     }
   }
 
   async spawn(commands: string[]): Promise<cp.ChildProcessWithoutNullStreams> {
-    return await this.overlay.spawn(commands)
+    return await this.subcontainer.spawn(commands)
   }
 }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 79f197091..e5aaacfdb 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -6,6 +6,7 @@ import { Daemon } from "@start9labs/start-sdk/cjs/lib/mainFn/Daemon"
 import { Effects } from "../../../Models/Effects"
 import { off } from "node:process"
 import { CommandController } from "@start9labs/start-sdk/cjs/lib/mainFn/CommandController"
+import { asError } from "@start9labs/start-sdk/cjs/lib/util"
 
 const EMBASSY_HEALTH_INTERVAL = 15 * 1000
 const EMBASSY_PROPERTIES_LOOP = 30 * 1000
@@ -15,8 +16,8 @@ const EMBASSY_PROPERTIES_LOOP = 30 * 1000
  * Also, this has an ability to clean itself up too if need be.
  */
 export class MainLoop {
-  get mainOverlay() {
-    return this.mainEvent?.daemon?.overlay
+  get mainSubContainerHandle() {
+    return this.mainEvent?.daemon?.subContainerHandle
   }
   private healthLoops?: {
     name: string
@@ -56,7 +57,7 @@ export class MainLoop {
       throw new Error("Unreachable")
     }
     const daemon = new Daemon(async () => {
-      const overlay = await DockerProcedureContainer.createOverlay(
+      const subcontainer = await DockerProcedureContainer.createSubContainer(
         effects,
         this.system.manifest.id,
         this.system.manifest.main,
@@ -64,11 +65,10 @@ export class MainLoop {
       )
       return CommandController.of()(
         this.effects,
-
-        { id: this.system.manifest.main.image },
+        subcontainer,
         currentCommand,
         {
-          overlay,
+          runAsInit: true,
           env: {
             TINI_SUBREAPER: "true",
           },
@@ -147,12 +147,20 @@ export class MainLoop {
     const start = Date.now()
     return Object.entries(manifest["health-checks"]).map(
       ([healthId, value]) => {
+        effects
+          .setHealth({
+            id: healthId,
+            name: value.name,
+            result: "starting",
+            message: null,
+          })
+          .catch((e) => console.error(asError(e)))
         const interval = setInterval(async () => {
           const actionProcedure = value
           const timeChanged = Date.now() - start
           if (actionProcedure.type === "docker") {
-            const overlay = actionProcedure.inject
-              ? this.mainOverlay
+            const subcontainer = actionProcedure.inject
+              ? this.mainSubContainerHandle
               : undefined
             // prettier-ignore
             const container = 
@@ -162,16 +170,12 @@ export class MainLoop {
                 actionProcedure,
                 manifest.volumes,
                 {
-                  overlay,
+                  subcontainer,
                 }
               )
             const executed = await container.exec(
-              [
-                actionProcedure.entrypoint,
-                ...actionProcedure.args,
-                JSON.stringify(timeChanged),
-              ],
-              {},
+              [actionProcedure.entrypoint, ...actionProcedure.args],
+              { input: JSON.stringify(timeChanged) },
             )
             if (executed.exitCode === 0) {
               await effects.setHealth({
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index cee873c21..1e0c34189 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -747,11 +747,17 @@ export class SystemForEmbassy implements System {
     })
     if (!actionProcedure) throw Error("Action not found")
     if (actionProcedure.type === "docker") {
+      const subcontainer = actionProcedure.inject
+        ? this.currentRunning?.mainSubContainerHandle
+        : undefined
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
         actionProcedure,
         this.manifest.volumes,
+        {
+          subcontainer,
+        },
       )
       return toActionResult(
         JSON.parse(
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 03af30c90..c212722e6 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -124,20 +124,18 @@ export const polyfillEffects = (
       wait(): Promise<oet.ResultType<string>>
       term(): Promise<void>
     } {
-      const promiseOverlay = DockerProcedureContainer.createOverlay(
+      const promiseSubcontainer = DockerProcedureContainer.createSubContainer(
         effects,
         manifest.id,
         manifest.main,
         manifest.volumes,
       )
-      const daemon = promiseOverlay.then((overlay) =>
+      const daemon = promiseSubcontainer.then((subcontainer) =>
         daemons.runCommand()(
           effects,
-          { id: manifest.main.image },
+          subcontainer,
           [input.command, ...(input.args || [])],
-          {
-            overlay,
-          },
+          {},
         ),
       )
       return {
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 951e31916..f81170753 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -533,7 +533,7 @@ dependencies = [
  "rustc-hash",
  "shlex",
  "syn 2.0.74",
- "which",
+ "which 4.4.2",
 ]
 
 [[package]]
@@ -1580,6 +1580,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "errno"
 version = "0.3.9"
@@ -1590,6 +1601,16 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "etcetera"
 version = "0.8.0"
@@ -3034,6 +3055,18 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "nix"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
+dependencies = [
+ "bitflags 1.3.2",
+ "cc",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "nix"
 version = "0.24.3"
@@ -3687,6 +3720,32 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "procfs"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
+dependencies = [
+ "bitflags 2.6.0",
+ "chrono",
+ "flate2",
+ "hex",
+ "lazy_static",
+ "procfs-core",
+ "rustix",
+]
+
+[[package]]
+name = "procfs-core"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+dependencies = [
+ "bitflags 2.6.0",
+ "chrono",
+ "hex",
+]
+
 [[package]]
 name = "proptest"
 version = "1.5.0"
@@ -4174,7 +4233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
  "bitflags 2.6.0",
- "errno",
+ "errno 0.3.9",
  "libc",
  "linux-raw-sys",
  "windows-sys 0.52.0",
@@ -5040,6 +5099,7 @@ dependencies = [
  "pin-project",
  "pkcs8",
  "prettytable-rs",
+ "procfs",
  "proptest",
  "proptest-derive",
  "rand 0.8.5",
@@ -5058,6 +5118,7 @@ dependencies = [
  "serde_yml",
  "sha2 0.10.8",
  "shell-words",
+ "signal-hook",
  "simple-logging",
  "socket2",
  "sqlx",
@@ -5084,9 +5145,12 @@ dependencies = [
  "trust-dns-server",
  "ts-rs",
  "typed-builder",
+ "unix-named-pipe",
+ "unshare",
  "url",
  "urlencoding",
  "uuid",
+ "which 6.0.3",
  "zeroize",
 ]
 
@@ -5965,6 +6029,26 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
+[[package]]
+name = "unix-named-pipe"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ad653da8f36ac5825ba06642b5a3cce14a4e52c6a5fab4a8928d53f4426dae2"
+dependencies = [
+ "errno 0.2.8",
+ "libc",
+]
+
+[[package]]
+name = "unshare"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ceda295552a1eda89f8a748237654ad76b9c87e383fc07af5c4e423eb8e7b9b"
+dependencies = [
+ "libc",
+ "nix 0.20.0",
+]
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -6182,6 +6266,18 @@ dependencies = [
  "rustix",
 ]
 
+[[package]]
+name = "which"
+version = "6.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+dependencies = [
+ "either",
+ "home",
+ "rustix",
+ "winsafe",
+]
+
 [[package]]
 name = "whoami"
 version = "1.5.1"
@@ -6408,6 +6504,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winsafe"
+version = "0.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
+
 [[package]]
 name = "wyz"
 version = "0.2.0"
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 3bab5c6f3..41effd672 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -130,7 +130,14 @@ log = "0.4.20"
 mbrman = "0.5.2"
 models = { version = "*", path = "../models" }
 new_mime_guess = "4"
-nix = { version = "0.29.0", features = ["user", "process", "signal", "fs"] }
+nix = { version = "0.29.0", features = [
+  "fs",
+  "mount",
+  "process",
+  "sched",
+  "signal",
+  "user",
+] }
 nom = "7.1.3"
 num = "0.4.1"
 num_enum = "0.7.0"
@@ -146,6 +153,7 @@ pbkdf2 = "0.12.2"
 pin-project = "1.1.3"
 pkcs8 = { version = "0.10.2", features = ["std"] }
 prettytable-rs = "0.10.0"
+procfs = "0.16.0"
 proptest = "1.3.1"
 proptest-derive = "0.5.0"
 rand = { version = "0.8.5", features = ["std"] }
@@ -166,6 +174,7 @@ serde_with = { version = "3.4.0", features = ["macros", "json"] }
 serde_yaml = { package = "serde_yml", version = "0.0.10" }
 sha2 = "0.10.2"
 shell-words = "1"
+signal-hook = "0.3.17"
 simple-logging = "2.0.2"
 socket2 = "0.5.7"
 sqlx = { version = "0.7.2", features = [
@@ -197,6 +206,9 @@ tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 trust-dns-server = "0.23.1"
 ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-as" } # "8.1.0"
 typed-builder = "0.18.0"
+which = "6.0.3"
+unix-named-pipe = "0.2.0"
+unshare = "0.7.0"
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.4.1", features = ["v4"] }
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index b8ce9c703..480f7a24c 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -268,9 +268,10 @@ impl LxcContainer {
                     .invoke(ErrorKind::Docker)
                     .await?,
             )?;
-            let out_str = output.trim();
-            if !out_str.is_empty() {
-                return Ok(out_str.parse()?);
+            for line in output.lines() {
+                if let Ok(ip) = line.trim().parse() {
+                    return Ok(ip);
+                }
             }
             if start.elapsed() > CONTAINER_DHCP_TIMEOUT {
                 return Err(Error::new(
diff --git a/core/startos/src/service/effects/health.rs b/core/startos/src/service/effects/health.rs
index aad06a004..9bf756d60 100644
--- a/core/startos/src/service/effects/health.rs
+++ b/core/startos/src/service/effects/health.rs
@@ -32,8 +32,8 @@ pub async fn set_health(
                 .as_main_mut()
                 .mutate(|main| {
                     match main {
-                        &mut MainStatus::Running { ref mut health, .. }
-                        | &mut MainStatus::BackingUp { ref mut health, .. } => {
+                        MainStatus::Running { ref mut health, .. }
+                        | MainStatus::Starting { ref mut health } => {
                             health.insert(id, result);
                         }
                         _ => (),
diff --git a/core/startos/src/service/effects/mod.rs b/core/startos/src/service/effects/mod.rs
index a7ee6fb4d..3ec77ef21 100644
--- a/core/startos/src/service/effects/mod.rs
+++ b/core/startos/src/service/effects/mod.rs
@@ -1,4 +1,4 @@
-use rpc_toolkit::{from_fn, from_fn_async, Context, HandlerExt, ParentHandler};
+use rpc_toolkit::{from_fn, from_fn_async, from_fn_blocking, Context, HandlerExt, ParentHandler};
 
 use crate::echo;
 use crate::prelude::*;
@@ -12,44 +12,44 @@ pub mod context;
 mod control;
 mod dependency;
 mod health;
-mod image;
 mod net;
 mod prelude;
 mod store;
+mod subcontainer;
 mod system;
 
 pub fn handler<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("gitInfo", from_fn(|_: C| crate::version::git_info()))
+        .subcommand("git-info", from_fn(|_: C| crate::version::git_info()))
         .subcommand(
             "echo",
             from_fn(echo::<EffectContext>).with_call_remote::<ContainerCliContext>(),
         )
         // action
         .subcommand(
-            "executeAction",
+            "execute-action",
             from_fn_async(action::execute_action).no_cli(),
         )
         .subcommand(
-            "exportAction",
+            "export-action",
             from_fn_async(action::export_action).no_cli(),
         )
         .subcommand(
-            "clearActions",
+            "clear-actions",
             from_fn_async(action::clear_actions).no_cli(),
         )
         // callbacks
         .subcommand(
-            "clearCallbacks",
+            "clear-callbacks",
             from_fn(callbacks::clear_callbacks).no_cli(),
         )
         // config
         .subcommand(
-            "getConfigured",
+            "get-configured",
             from_fn_async(config::get_configured).no_cli(),
         )
         .subcommand(
-            "setConfigured",
+            "set-configured",
             from_fn_async(config::set_configured)
                 .no_display()
                 .with_call_remote::<ContainerCliContext>(),
@@ -68,110 +68,133 @@ pub fn handler<C: Context>() -> ParentHandler<C> {
                 .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
-            "setMainStatus",
+            "set-main-status",
             from_fn_async(control::set_main_status)
                 .no_display()
                 .with_call_remote::<ContainerCliContext>(),
         )
         // dependency
         .subcommand(
-            "setDependencies",
+            "set-dependencies",
             from_fn_async(dependency::set_dependencies)
                 .no_display()
                 .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
-            "getDependencies",
+            "get-dependencies",
             from_fn_async(dependency::get_dependencies)
                 .no_display()
                 .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
-            "checkDependencies",
+            "check-dependencies",
             from_fn_async(dependency::check_dependencies)
                 .no_display()
                 .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand("mount", from_fn_async(dependency::mount).no_cli())
         .subcommand(
-            "getInstalledPackages",
+            "get-installed-packages",
             from_fn_async(dependency::get_installed_packages).no_cli(),
         )
         .subcommand(
-            "exposeForDependents",
+            "expose-for-dependents",
             from_fn_async(dependency::expose_for_dependents).no_cli(),
         )
         // health
-        .subcommand("setHealth", from_fn_async(health::set_health).no_cli())
-        // image
-        .subcommand(
-            "chroot",
-            from_fn(image::chroot::<ContainerCliContext>).no_display(),
-        )
-        .subcommand(
-            "createOverlayedImage",
-            from_fn_async(image::create_overlayed_image)
-                .with_custom_display_fn(|_, (path, _)| Ok(println!("{}", path.display())))
-                .with_call_remote::<ContainerCliContext>(),
-        )
-        .subcommand(
-            "destroyOverlayedImage",
-            from_fn_async(image::destroy_overlayed_image).no_cli(),
+        .subcommand("set-health", from_fn_async(health::set_health).no_cli())
+        // subcontainer
+        .subcommand(
+            "subcontainer",
+            ParentHandler::<C>::new()
+                .subcommand(
+                    "launch",
+                    from_fn_blocking(subcontainer::launch::<ContainerCliContext>).no_display(),
+                )
+                .subcommand(
+                    "launch-init",
+                    from_fn_blocking(subcontainer::launch_init::<ContainerCliContext>).no_display(),
+                )
+                .subcommand(
+                    "exec",
+                    from_fn_blocking(subcontainer::exec::<ContainerCliContext>).no_display(),
+                )
+                .subcommand(
+                    "exec-command",
+                    from_fn_blocking(subcontainer::exec_command::<ContainerCliContext>)
+                        .no_display(),
+                )
+                .subcommand(
+                    "create-fs",
+                    from_fn_async(subcontainer::create_subcontainer_fs)
+                        .with_custom_display_fn(|_, (path, _)| Ok(println!("{}", path.display())))
+                        .with_call_remote::<ContainerCliContext>(),
+                )
+                .subcommand(
+                    "destroy-fs",
+                    from_fn_async(subcontainer::destroy_subcontainer_fs)
+                        .no_display()
+                        .with_call_remote::<ContainerCliContext>(),
+                ),
         )
         // net
         .subcommand("bind", from_fn_async(net::bind::bind).no_cli())
         .subcommand(
-            "getServicePortForward",
+            "get-service-port-forward",
             from_fn_async(net::bind::get_service_port_forward).no_cli(),
         )
         .subcommand(
-            "clearBindings",
+            "clear-bindings",
             from_fn_async(net::bind::clear_bindings).no_cli(),
         )
         .subcommand(
-            "getHostInfo",
+            "get-host-info",
             from_fn_async(net::host::get_host_info).no_cli(),
         )
         .subcommand(
-            "getPrimaryUrl",
+            "get-primary-url",
             from_fn_async(net::host::get_primary_url).no_cli(),
         )
         .subcommand(
-            "getContainerIp",
+            "get-container-ip",
             from_fn_async(net::info::get_container_ip).no_cli(),
         )
         .subcommand(
-            "exportServiceInterface",
+            "export-service-interface",
             from_fn_async(net::interface::export_service_interface).no_cli(),
         )
         .subcommand(
-            "getServiceInterface",
+            "get-service-interface",
             from_fn_async(net::interface::get_service_interface).no_cli(),
         )
         .subcommand(
-            "listServiceInterfaces",
+            "list-service-interfaces",
             from_fn_async(net::interface::list_service_interfaces).no_cli(),
         )
         .subcommand(
-            "clearServiceInterfaces",
+            "clear-service-interfaces",
             from_fn_async(net::interface::clear_service_interfaces).no_cli(),
         )
         .subcommand(
-            "getSslCertificate",
+            "get-ssl-certificate",
             from_fn_async(net::ssl::get_ssl_certificate).no_cli(),
         )
-        .subcommand("getSslKey", from_fn_async(net::ssl::get_ssl_key).no_cli())
+        .subcommand("get-ssl-key", from_fn_async(net::ssl::get_ssl_key).no_cli())
         // store
-        .subcommand("getStore", from_fn_async(store::get_store).no_cli())
-        .subcommand("setStore", from_fn_async(store::set_store).no_cli())
         .subcommand(
-            "setDataVersion",
+            "store",
+            ParentHandler::<C>::new()
+                .subcommand("get", from_fn_async(store::get_store).no_cli())
+                .subcommand("set", from_fn_async(store::set_store).no_cli()),
+        )
+        .subcommand(
+            "set-data-version",
             from_fn_async(store::set_data_version)
                 .no_display()
                 .with_call_remote::<ContainerCliContext>(),
         )
         .subcommand(
-            "getDataVersion",
+            "get-data-version",
             from_fn_async(store::get_data_version)
                 .with_custom_display_fn(|_, v| {
                     if let Some(v) = v {
@@ -185,7 +208,7 @@ pub fn handler<C: Context>() -> ParentHandler<C> {
         )
         // system
         .subcommand(
-            "getSystemSmtp",
+            "get-system-smtp",
             from_fn_async(system::get_system_smtp).no_cli(),
         )
 
diff --git a/core/startos/src/service/effects/image.rs b/core/startos/src/service/effects/subcontainer/mod.rs
similarity index 50%
rename from core/startos/src/service/effects/image.rs
rename to core/startos/src/service/effects/subcontainer/mod.rs
index 4b5293506..86e77e196 100644
--- a/core/startos/src/service/effects/image.rs
+++ b/core/startos/src/service/effects/subcontainer/mod.rs
@@ -1,9 +1,6 @@
-use std::ffi::OsString;
-use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
 
 use models::ImageId;
-use rpc_toolkit::Context;
 use tokio::process::Command;
 
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
@@ -11,89 +8,33 @@ use crate::rpc_continuations::Guid;
 use crate::service::effects::prelude::*;
 use crate::util::Invoke;
 
-#[derive(Debug, Clone, Serialize, Deserialize, Parser)]
-pub struct ChrootParams {
-    #[arg(short = 'e', long = "env")]
-    env: Option<PathBuf>,
-    #[arg(short = 'w', long = "workdir")]
-    workdir: Option<PathBuf>,
-    #[arg(short = 'u', long = "user")]
-    user: Option<String>,
-    path: PathBuf,
-    command: OsString,
-    args: Vec<OsString>,
-}
-pub fn chroot<C: Context>(
-    _: C,
-    ChrootParams {
-        env,
-        workdir,
-        user,
-        path,
-        command,
-        args,
-    }: ChrootParams,
-) -> Result<(), Error> {
-    let mut cmd: std::process::Command = std::process::Command::new(command);
-    if let Some(env) = env {
-        for (k, v) in std::fs::read_to_string(env)?
-            .lines()
-            .map(|l| l.trim())
-            .filter_map(|l| l.split_once("="))
-        {
-            cmd.env(k, v);
-        }
-    }
-    nix::unistd::setsid().ok(); // https://stackoverflow.com/questions/25701333/os-setsid-operation-not-permitted
-    std::os::unix::fs::chroot(path)?;
-    if let Some(uid) = user.as_deref().and_then(|u| u.parse::<u32>().ok()) {
-        cmd.uid(uid);
-    } else if let Some(user) = user {
-        let (uid, gid) = std::fs::read_to_string("/etc/passwd")?
-            .lines()
-            .find_map(|l| {
-                let mut split = l.trim().split(":");
-                if user != split.next()? {
-                    return None;
-                }
-                split.next(); // throw away x
-                Some((split.next()?.parse().ok()?, split.next()?.parse().ok()?))
-                // uid gid
-            })
-            .or_not_found(lazy_format!("{user} in /etc/passwd"))?;
-        cmd.uid(uid);
-        cmd.gid(gid);
-    };
-    if let Some(workdir) = workdir {
-        cmd.current_dir(workdir);
-    }
-    cmd.args(args);
-    Err(cmd.exec().into())
-}
+mod sync;
+
+pub use sync::*;
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
-pub struct DestroyOverlayedImageParams {
+pub struct DestroySubcontainerFsParams {
     guid: Guid,
 }
 #[instrument(skip_all)]
-pub async fn destroy_overlayed_image(
+pub async fn destroy_subcontainer_fs(
     context: EffectContext,
-    DestroyOverlayedImageParams { guid }: DestroyOverlayedImageParams,
+    DestroySubcontainerFsParams { guid }: DestroySubcontainerFsParams,
 ) -> Result<(), Error> {
     let context = context.deref()?;
     if let Some(overlay) = context
         .seed
         .persistent_container
-        .overlays
+        .subcontainers
         .lock()
         .await
         .remove(&guid)
     {
         overlay.unmount(true).await?;
     } else {
-        tracing::warn!("Could not find a guard to remove on the destroy overlayed image; assumming that it already is removed and will be skipping");
+        tracing::warn!("Could not find a subcontainer fs to destroy; assumming that it already is destroyed and will be skipping");
     }
     Ok(())
 }
@@ -101,13 +42,13 @@ pub async fn destroy_overlayed_image(
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
-pub struct CreateOverlayedImageParams {
+pub struct CreateSubcontainerFsParams {
     image_id: ImageId,
 }
 #[instrument(skip_all)]
-pub async fn create_overlayed_image(
+pub async fn create_subcontainer_fs(
     context: EffectContext,
-    CreateOverlayedImageParams { image_id }: CreateOverlayedImageParams,
+    CreateSubcontainerFsParams { image_id }: CreateSubcontainerFsParams,
 ) -> Result<(PathBuf, Guid), Error> {
     let context = context.deref()?;
     if let Some(image) = context
@@ -131,7 +72,7 @@ pub async fn create_overlayed_image(
             })?
             .rootfs_dir();
         let mountpoint = rootfs_dir
-            .join("media/startos/overlays")
+            .join("media/startos/subcontainers")
             .join(guid.as_ref());
         tokio::fs::create_dir_all(&mountpoint).await?;
         let container_mountpoint = Path::new("/").join(
@@ -150,7 +91,7 @@ pub async fn create_overlayed_image(
         context
             .seed
             .persistent_container
-            .overlays
+            .subcontainers
             .lock()
             .await
             .insert(guid.clone(), guard);
diff --git a/core/startos/src/service/effects/subcontainer/sync.rs b/core/startos/src/service/effects/subcontainer/sync.rs
new file mode 100644
index 000000000..513d0b1e5
--- /dev/null
+++ b/core/startos/src/service/effects/subcontainer/sync.rs
@@ -0,0 +1,389 @@
+use std::borrow::Cow;
+use std::collections::BTreeMap;
+use std::ffi::{c_int, OsStr, OsString};
+use std::fs::File;
+use std::os::unix::process::CommandExt;
+use std::path::{Path, PathBuf};
+use std::process::{Command as StdCommand, Stdio};
+
+use nix::sched::CloneFlags;
+use nix::unistd::Pid;
+use rpc_toolkit::Context;
+use signal_hook::consts::signal::*;
+use tokio::sync::oneshot;
+use unshare::Command as NSCommand;
+
+use crate::service::effects::prelude::*;
+
+const FWD_SIGNALS: &[c_int] = &[
+    SIGABRT, SIGALRM, SIGCONT, SIGHUP, SIGINT, SIGIO, SIGPIPE, SIGPROF, SIGQUIT, SIGTERM, SIGTRAP,
+    SIGTSTP, SIGTTIN, SIGTTOU, SIGURG, SIGUSR1, SIGUSR2, SIGVTALRM,
+];
+
+struct NSPid(Vec<i32>);
+impl procfs::FromBufRead for NSPid {
+    fn from_buf_read<R: std::io::BufRead>(r: R) -> procfs::ProcResult<Self> {
+        for line in r.lines() {
+            let line = line?;
+            if let Some(row) = line.trim().strip_prefix("NSpid") {
+                return Ok(Self(
+                    row.split_ascii_whitespace()
+                        .map(|pid| pid.parse::<i32>())
+                        .collect::<Result<Vec<_>, _>>()?,
+                ));
+            }
+        }
+        Err(procfs::ProcError::Incomplete(None))
+    }
+}
+
+fn open_file_read(path: impl AsRef<Path>) -> Result<File, Error> {
+    File::open(&path).with_ctx(|_| {
+        (
+            ErrorKind::Filesystem,
+            lazy_format!("open r {}", path.as_ref().display()),
+        )
+    })
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser)]
+pub struct ExecParams {
+    #[arg(short = 'e', long = "env")]
+    env: Option<PathBuf>,
+    #[arg(short = 'w', long = "workdir")]
+    workdir: Option<PathBuf>,
+    #[arg(short = 'u', long = "user")]
+    user: Option<String>,
+    chroot: PathBuf,
+    #[arg(trailing_var_arg = true)]
+    command: Vec<OsString>,
+}
+impl ExecParams {
+    fn exec(&self) -> Result<(), Error> {
+        let ExecParams {
+            env,
+            workdir,
+            user,
+            chroot,
+            command,
+        } = self;
+        let Some(([command], args)) = command.split_at_checked(1) else {
+            return Err(Error::new(
+                eyre!("command cannot be empty"),
+                ErrorKind::InvalidRequest,
+            ));
+        };
+        let env_string = if let Some(env) = &env {
+            std::fs::read_to_string(env)
+                .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("read {env:?}")))?
+        } else {
+            Default::default()
+        };
+        let env = env_string
+            .lines()
+            .map(|l| l.trim())
+            .filter_map(|l| l.split_once("="))
+            .collect::<BTreeMap<_, _>>();
+        std::os::unix::fs::chroot(chroot)
+            .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("chroot {chroot:?}")))?;
+        let command = which::which_in(
+            command,
+            env.get("PATH")
+                .copied()
+                .map(Cow::Borrowed)
+                .or_else(|| std::env::var("PATH").ok().map(Cow::Owned))
+                .as_deref(),
+            workdir.as_deref().unwrap_or(Path::new("/")),
+        )
+        .with_kind(ErrorKind::Filesystem)?;
+        let mut cmd = StdCommand::new(command);
+        cmd.args(args);
+        for (k, v) in env {
+            cmd.env(k, v);
+        }
+
+        if let Some(uid) = user.as_deref().and_then(|u| u.parse::<u32>().ok()) {
+            cmd.uid(uid);
+        } else if let Some(user) = user {
+            let (uid, gid) = std::fs::read_to_string("/etc/passwd")
+                .with_ctx(|_| (ErrorKind::Filesystem, "read /etc/passwd"))?
+                .lines()
+                .find_map(|l| {
+                    let mut split = l.trim().split(":");
+                    if user != split.next()? {
+                        return None;
+                    }
+                    split.next(); // throw away x
+                    Some((split.next()?.parse().ok()?, split.next()?.parse().ok()?))
+                    // uid gid
+                })
+                .or_not_found(lazy_format!("{user} in /etc/passwd"))?;
+            cmd.uid(uid);
+            cmd.gid(gid);
+        };
+        if let Some(workdir) = workdir {
+            cmd.current_dir(workdir);
+        } else {
+            cmd.current_dir("/");
+        }
+        Err(cmd.exec().into())
+    }
+}
+
+pub fn launch<C: Context>(
+    _: C,
+    ExecParams {
+        env,
+        workdir,
+        user,
+        chroot,
+        command,
+    }: ExecParams,
+) -> Result<(), Error> {
+    use unshare::{Namespace, Stdio};
+    let mut sig = signal_hook::iterator::Signals::new(FWD_SIGNALS)?;
+    let mut cmd = NSCommand::new("/usr/bin/start-cli");
+    cmd.arg("subcontainer").arg("launch-init");
+    if let Some(env) = env {
+        cmd.arg("--env").arg(env);
+    }
+    if let Some(workdir) = workdir {
+        cmd.arg("--workdir").arg(workdir);
+    }
+    if let Some(user) = user {
+        cmd.arg("--user").arg(user);
+    }
+    cmd.arg(&chroot);
+    cmd.args(&command);
+    cmd.unshare(&[Namespace::Pid, Namespace::Cgroup, Namespace::Ipc]);
+    cmd.stdin(Stdio::piped());
+    cmd.stdout(Stdio::piped());
+    cmd.stderr(Stdio::piped());
+    let (stdin_send, stdin_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stdin) = stdin_recv.blocking_recv() {
+            std::io::copy(&mut std::io::stdin(), &mut stdin).unwrap();
+        }
+    });
+    let (stdout_send, stdout_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stdout) = stdout_recv.blocking_recv() {
+            std::io::copy(&mut stdout, &mut std::io::stdout()).unwrap();
+        }
+    });
+    let (stderr_send, stderr_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stderr) = stderr_recv.blocking_recv() {
+            std::io::copy(&mut stderr, &mut std::io::stderr()).unwrap();
+        }
+    });
+    if chroot.join("proc/1").exists() {
+        let ns_id = procfs::process::Process::new_with_root(chroot.join("proc"))
+            .with_ctx(|_| (ErrorKind::Filesystem, "open subcontainer procfs"))?
+            .namespaces()
+            .with_ctx(|_| (ErrorKind::Filesystem, "read subcontainer pid 1 ns"))?
+            .0
+            .get(OsStr::new("pid"))
+            .or_not_found("pid namespace")?
+            .identifier;
+        for proc in
+            procfs::process::all_processes().with_ctx(|_| (ErrorKind::Filesystem, "open procfs"))?
+        {
+            let proc = proc.with_ctx(|_| (ErrorKind::Filesystem, "read single process details"))?;
+            let pid = proc.pid();
+            if proc
+                .namespaces()
+                .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("read pid {} ns", pid)))?
+                .0
+                .get(OsStr::new("pid"))
+                .map_or(false, |ns| ns.identifier == ns_id)
+            {
+                let pids = proc.read::<NSPid>("status").with_ctx(|_| {
+                    (
+                        ErrorKind::Filesystem,
+                        lazy_format!("read pid {} NSpid", pid),
+                    )
+                })?;
+                if pids.0.len() == 2 && pids.0[1] == 1 {
+                    nix::sys::signal::kill(Pid::from_raw(pid), nix::sys::signal::SIGKILL)
+                        .with_ctx(|_| {
+                            (
+                                ErrorKind::Filesystem,
+                                lazy_format!(
+                                    "kill pid {} (determined to be pid 1 in subcontainer)",
+                                    pid
+                                ),
+                            )
+                        })?;
+                }
+            }
+        }
+        nix::mount::umount(&chroot.join("proc"))
+            .with_ctx(|_| (ErrorKind::Filesystem, "unmounting subcontainer procfs"))?;
+    }
+    let mut child = cmd
+        .spawn()
+        .map_err(color_eyre::eyre::Report::msg)
+        .with_ctx(|_| (ErrorKind::Filesystem, "spawning child process"))?;
+    let pid = child.pid();
+    std::thread::spawn(move || {
+        for sig in sig.forever() {
+            nix::sys::signal::kill(
+                Pid::from_raw(pid),
+                Some(nix::sys::signal::Signal::try_from(sig).unwrap()),
+            )
+            .unwrap();
+        }
+    });
+    stdin_send
+        .send(child.stdin.take().unwrap())
+        .unwrap_or_default();
+    stdout_send
+        .send(child.stdout.take().unwrap())
+        .unwrap_or_default();
+    stderr_send
+        .send(child.stderr.take().unwrap())
+        .unwrap_or_default();
+    // TODO: subreaping, signal handling
+    let exit = child
+        .wait()
+        .with_ctx(|_| (ErrorKind::Filesystem, "waiting on child process"))?;
+    if let Some(code) = exit.code() {
+        std::process::exit(code);
+    } else {
+        if exit.success() {
+            Ok(())
+        } else {
+            Err(Error::new(
+                color_eyre::eyre::Report::msg(exit),
+                ErrorKind::Unknown,
+            ))
+        }
+    }
+}
+
+pub fn launch_init<C: Context>(_: C, params: ExecParams) -> Result<(), Error> {
+    nix::mount::mount(
+        Some("proc"),
+        &params.chroot.join("proc"),
+        Some("proc"),
+        nix::mount::MsFlags::empty(),
+        None::<&str>,
+    )
+    .with_ctx(|_| (ErrorKind::Filesystem, "mount procfs"))?;
+    if params.command.is_empty() {
+        signal_hook::iterator::Signals::new(signal_hook::consts::TERM_SIGNALS)?
+            .forever()
+            .next();
+        std::process::exit(0)
+    } else {
+        params.exec()
+    }
+}
+
+pub fn exec<C: Context>(
+    _: C,
+    ExecParams {
+        env,
+        workdir,
+        user,
+        chroot,
+        command,
+    }: ExecParams,
+) -> Result<(), Error> {
+    let mut sig = signal_hook::iterator::Signals::new(FWD_SIGNALS)?;
+    let (send_pid, recv_pid) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(pid) = recv_pid.blocking_recv() {
+            for sig in sig.forever() {
+                nix::sys::signal::kill(
+                    Pid::from_raw(pid),
+                    Some(nix::sys::signal::Signal::try_from(sig).unwrap()),
+                )
+                .unwrap();
+            }
+        }
+    });
+    let mut cmd = StdCommand::new("/usr/bin/start-cli");
+    cmd.arg("subcontainer").arg("exec-command");
+    if let Some(env) = env {
+        cmd.arg("--env").arg(env);
+    }
+    if let Some(workdir) = workdir {
+        cmd.arg("--workdir").arg(workdir);
+    }
+    if let Some(user) = user {
+        cmd.arg("--user").arg(user);
+    }
+    cmd.arg(&chroot);
+    cmd.args(&command);
+    cmd.stdin(Stdio::piped());
+    cmd.stdout(Stdio::piped());
+    cmd.stderr(Stdio::piped());
+    let (stdin_send, stdin_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stdin) = stdin_recv.blocking_recv() {
+            std::io::copy(&mut std::io::stdin(), &mut stdin).unwrap();
+        }
+    });
+    let (stdout_send, stdout_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stdout) = stdout_recv.blocking_recv() {
+            std::io::copy(&mut stdout, &mut std::io::stdout()).unwrap();
+        }
+    });
+    let (stderr_send, stderr_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stderr) = stderr_recv.blocking_recv() {
+            std::io::copy(&mut stderr, &mut std::io::stderr()).unwrap();
+        }
+    });
+    nix::sched::setns(
+        open_file_read(chroot.join("proc/1/ns/pid"))?,
+        CloneFlags::CLONE_NEWPID,
+    )
+    .with_ctx(|_| (ErrorKind::Filesystem, "set pid ns"))?;
+    nix::sched::setns(
+        open_file_read(chroot.join("proc/1/ns/cgroup"))?,
+        CloneFlags::CLONE_NEWCGROUP,
+    )
+    .with_ctx(|_| (ErrorKind::Filesystem, "set cgroup ns"))?;
+    nix::sched::setns(
+        open_file_read(chroot.join("proc/1/ns/ipc"))?,
+        CloneFlags::CLONE_NEWIPC,
+    )
+    .with_ctx(|_| (ErrorKind::Filesystem, "set ipc ns"))?;
+    let mut child = cmd
+        .spawn()
+        .map_err(color_eyre::eyre::Report::msg)
+        .with_ctx(|_| (ErrorKind::Filesystem, "spawning child process"))?;
+    send_pid.send(child.id() as i32).unwrap_or_default();
+    stdin_send
+        .send(child.stdin.take().unwrap())
+        .unwrap_or_default();
+    stdout_send
+        .send(child.stdout.take().unwrap())
+        .unwrap_or_default();
+    stderr_send
+        .send(child.stderr.take().unwrap())
+        .unwrap_or_default();
+    let exit = child
+        .wait()
+        .with_ctx(|_| (ErrorKind::Filesystem, "waiting on child process"))?;
+    if let Some(code) = exit.code() {
+        std::process::exit(code);
+    } else {
+        if exit.success() {
+            Ok(())
+        } else {
+            Err(Error::new(
+                color_eyre::eyre::Report::msg(exit),
+                ErrorKind::Unknown,
+            ))
+        }
+    }
+}
+
+pub fn exec_command<C: Context>(_: C, params: ExecParams) -> Result<(), Error> {
+    params.exec()
+}
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 6a99841d6..5eae62756 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -45,7 +45,7 @@ mod properties;
 mod rpc;
 mod service_actor;
 pub mod service_map;
-mod start_stop;
+pub mod start_stop;
 mod transition;
 mod util;
 
@@ -493,7 +493,6 @@ impl Service {
 
 #[derive(Debug, Clone)]
 pub struct RunningStatus {
-    health: OrdMap<HealthCheckId, NamedHealthCheckResult>,
     started: DateTime<Utc>,
 }
 
@@ -516,7 +515,6 @@ impl ServiceActorSeed {
                         .running_status
                         .take()
                         .unwrap_or_else(|| RunningStatus {
-                            health: Default::default(),
                             started: Utc::now(),
                         }),
                 );
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index c81322719..dd7b5766d 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -98,7 +98,7 @@ pub struct PersistentContainer {
     volumes: BTreeMap<VolumeId, MountGuard>,
     assets: BTreeMap<VolumeId, MountGuard>,
     pub(super) images: BTreeMap<ImageId, Arc<MountGuard>>,
-    pub(super) overlays: Arc<Mutex<BTreeMap<Guid, OverlayGuard<Arc<MountGuard>>>>>,
+    pub(super) subcontainers: Arc<Mutex<BTreeMap<Guid, OverlayGuard<Arc<MountGuard>>>>>,
     pub(super) state: Arc<watch::Sender<ServiceState>>,
     pub(super) net_service: Mutex<NetService>,
     destroyed: bool,
@@ -273,7 +273,7 @@ impl PersistentContainer {
             volumes,
             assets,
             images,
-            overlays: Arc::new(Mutex::new(BTreeMap::new())),
+            subcontainers: Arc::new(Mutex::new(BTreeMap::new())),
             state: Arc::new(watch::channel(ServiceState::new(start)).0),
             net_service: Mutex::new(net_service),
             destroyed: false,
@@ -388,7 +388,7 @@ impl PersistentContainer {
         let volumes = std::mem::take(&mut self.volumes);
         let assets = std::mem::take(&mut self.assets);
         let images = std::mem::take(&mut self.images);
-        let overlays = self.overlays.clone();
+        let subcontainers = self.subcontainers.clone();
         let lxc_container = self.lxc_container.take();
         self.destroyed = true;
         Some(async move {
@@ -404,7 +404,7 @@ impl PersistentContainer {
             for (_, assets) in assets {
                 errs.handle(assets.unmount(true).await);
             }
-            for (_, overlay) in std::mem::take(&mut *overlays.lock().await) {
+            for (_, overlay) in std::mem::take(&mut *subcontainers.lock().await) {
                 errs.handle(overlay.unmount(true).await);
             }
             for (_, images) in images {
diff --git a/core/startos/src/service/service_actor.rs b/core/startos/src/service/service_actor.rs
index e6578264c..0839afc0b 100644
--- a/core/startos/src/service/service_actor.rs
+++ b/core/startos/src/service/service_actor.rs
@@ -1,11 +1,10 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use imbl::OrdMap;
-
 use super::start_stop::StartStop;
 use super::ServiceActorSeed;
 use crate::prelude::*;
+use crate::service::persistent_container::ServiceStateKinds;
 use crate::service::transition::TransitionKind;
 use crate::service::SYNC_RETRY_COOLDOWN_SECONDS;
 use crate::status::MainStatus;
@@ -46,96 +45,77 @@ async fn service_actor_loop(
     let id = &seed.id;
     let kinds = current.borrow().kinds();
     if let Err(e) = async {
-        let main_status = match (
-            kinds.transition_state,
-            kinds.desired_state,
-            kinds.running_status,
-        ) {
-            (Some(TransitionKind::Restarting), StartStop::Stop, Some(_)) => {
-                seed.persistent_container.stop().await?;
-                MainStatus::Restarting
-            }
-            (Some(TransitionKind::Restarting), StartStop::Start, _) => {
-                seed.persistent_container.start().await?;
-                MainStatus::Restarting
-            }
-            (Some(TransitionKind::Restarting), _, _) => MainStatus::Restarting,
-            (Some(TransitionKind::Restoring), _, _) => MainStatus::Restoring,
-            (Some(TransitionKind::BackingUp), StartStop::Stop, Some(status)) => {
-                seed.persistent_container.stop().await?;
-                MainStatus::BackingUp {
-                    started: Some(status.started),
-                    health: status.health.clone(),
-                }
-            }
-            (Some(TransitionKind::BackingUp), StartStop::Start, _) => {
-                seed.persistent_container.start().await?;
-                MainStatus::BackingUp {
-                    started: None,
-                    health: OrdMap::new(),
-                }
-            }
-            (Some(TransitionKind::BackingUp), _, _) => MainStatus::BackingUp {
-                started: None,
-                health: OrdMap::new(),
-            },
-            (None, StartStop::Stop, None) => MainStatus::Stopped,
-            (None, StartStop::Stop, Some(_)) => {
-                let task_seed = seed.clone();
-                seed.ctx
-                    .db
-                    .mutate(|d| {
-                        if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id) {
-                            i.as_status_mut().as_main_mut().ser(&MainStatus::Stopping)?;
-                        }
-                        Ok(())
-                    })
-                    .await?;
-                task_seed.persistent_container.stop().await?;
-                MainStatus::Stopped
-            }
-            (None, StartStop::Start, Some(status)) => MainStatus::Running {
-                started: status.started,
-                health: status.health.clone(),
-            },
-            (None, StartStop::Start, None) => {
-                seed.persistent_container.start().await?;
-                MainStatus::Starting
-            }
-        };
         seed.ctx
             .db
             .mutate(|d| {
                 if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id) {
                     let previous = i.as_status().as_main().de()?;
-                    let previous_health = previous.health();
-                    let previous_started = previous.started();
-                    let mut main_status = main_status;
-                    match &mut main_status {
-                        &mut MainStatus::Running { ref mut health, .. }
-                        | &mut MainStatus::BackingUp { ref mut health, .. } => {
-                            *health = previous_health.unwrap_or(health).clone();
-                        }
-                        _ => (),
-                    };
-                    match &mut main_status {
-                        MainStatus::Running {
-                            ref mut started, ..
-                        } => {
-                            *started = previous_started.unwrap_or(*started);
-                        }
-                        MainStatus::BackingUp {
-                            ref mut started, ..
-                        } => {
-                            *started = previous_started.map(Some).unwrap_or(*started);
-                        }
-                        _ => (),
+                    let main_status = match &kinds {
+                        ServiceStateKinds {
+                            transition_state: Some(TransitionKind::Restarting),
+                            ..
+                        } => MainStatus::Restarting,
+                        ServiceStateKinds {
+                            transition_state: Some(TransitionKind::Restoring),
+                            ..
+                        } => MainStatus::Restoring,
+                        ServiceStateKinds {
+                            transition_state: Some(TransitionKind::BackingUp),
+                            ..
+                        } => previous.backing_up(),
+                        ServiceStateKinds {
+                            running_status: Some(status),
+                            desired_state: StartStop::Start,
+                            ..
+                        } => MainStatus::Running {
+                            started: status.started,
+                            health: previous.health().cloned().unwrap_or_default(),
+                        },
+                        ServiceStateKinds {
+                            running_status: None,
+                            desired_state: StartStop::Start,
+                            ..
+                        } => MainStatus::Starting {
+                            health: previous.health().cloned().unwrap_or_default(),
+                        },
+                        ServiceStateKinds {
+                            running_status: Some(_),
+                            desired_state: StartStop::Stop,
+                            ..
+                        } => MainStatus::Stopping,
+                        ServiceStateKinds {
+                            running_status: None,
+                            desired_state: StartStop::Stop,
+                            ..
+                        } => MainStatus::Stopped,
                     };
                     i.as_status_mut().as_main_mut().ser(&main_status)?;
                 }
                 Ok(())
             })
             .await?;
+        seed.synchronized.notify_waiters();
+
+        match kinds {
+            ServiceStateKinds {
+                running_status: None,
+                desired_state: StartStop::Start,
+                ..
+            } => {
+                seed.persistent_container.start().await?;
+            }
+            ServiceStateKinds {
+                running_status: Some(_),
+                desired_state: StartStop::Stop,
+                ..
+            } => {
+                seed.persistent_container.stop().await?;
+                seed.persistent_container
+                    .state
+                    .send_if_modified(|s| s.running_status.take().is_some());
+            }
+            _ => (),
+        };
 
         Ok::<_, Error>(())
     }
diff --git a/core/startos/src/service/start_stop.rs b/core/startos/src/service/start_stop.rs
index 178176023..64d4022d6 100644
--- a/core/startos/src/service/start_stop.rs
+++ b/core/startos/src/service/start_stop.rs
@@ -1,6 +1,10 @@
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
 use crate::status::MainStatus;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
 pub enum StartStop {
     Start,
     Stop,
@@ -11,23 +15,19 @@ impl StartStop {
         matches!(self, StartStop::Start)
     }
 }
-impl From<MainStatus> for StartStop {
-    fn from(value: MainStatus) -> Self {
-        match value {
-            MainStatus::Stopped => StartStop::Stop,
-            MainStatus::Restoring => StartStop::Stop,
-            MainStatus::Restarting => StartStop::Start,
-            MainStatus::Stopping { .. } => StartStop::Stop,
-            MainStatus::Starting => StartStop::Start,
-            MainStatus::Running {
-                started: _,
-                health: _,
-            } => StartStop::Start,
-            MainStatus::BackingUp { started, health: _ } if started.is_some() => StartStop::Start,
-            MainStatus::BackingUp {
-                started: _,
-                health: _,
-            } => StartStop::Stop,
-        }
-    }
-}
+// impl From<MainStatus> for StartStop {
+//     fn from(value: MainStatus) -> Self {
+//         match value {
+//             MainStatus::Stopped => StartStop::Stop,
+//             MainStatus::Restoring => StartStop::Stop,
+//             MainStatus::Restarting => StartStop::Start,
+//             MainStatus::Stopping { .. } => StartStop::Stop,
+//             MainStatus::Starting => StartStop::Start,
+//             MainStatus::Running {
+//                 started: _,
+//                 health: _,
+//             } => StartStop::Start,
+//             MainStatus::BackingUp { on_complete } => on_complete,
+//         }
+//     }
+// }
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 1701a965e..c10a7b89f 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -1,5 +1,4 @@
 use std::collections::BTreeMap;
-use std::sync::Arc;
 
 use chrono::{DateTime, Utc};
 use imbl::OrdMap;
@@ -8,8 +7,8 @@ use ts_rs::TS;
 
 use self::health_check::HealthCheckId;
 use crate::prelude::*;
+use crate::service::start_stop::StartStop;
 use crate::status::health_check::NamedHealthCheckResult;
-use crate::util::GeneralGuard;
 
 pub mod health_check;
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
@@ -24,25 +23,24 @@ pub struct Status {
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(tag = "status")]
 #[serde(rename_all = "camelCase")]
+#[serde(rename_all_fields = "camelCase")]
 pub enum MainStatus {
     Stopped,
     Restarting,
     Restoring,
     Stopping,
-    Starting,
-    #[serde(rename_all = "camelCase")]
+    Starting {
+        #[ts(as = "BTreeMap<HealthCheckId, NamedHealthCheckResult>")]
+        health: OrdMap<HealthCheckId, NamedHealthCheckResult>,
+    },
     Running {
         #[ts(type = "string")]
         started: DateTime<Utc>,
         #[ts(as = "BTreeMap<HealthCheckId, NamedHealthCheckResult>")]
         health: OrdMap<HealthCheckId, NamedHealthCheckResult>,
     },
-    #[serde(rename_all = "camelCase")]
     BackingUp {
-        #[ts(type = "string | null")]
-        started: Option<DateTime<Utc>>,
-        #[ts(as = "BTreeMap<HealthCheckId, NamedHealthCheckResult>")]
-        health: OrdMap<HealthCheckId, NamedHealthCheckResult>,
+        on_complete: StartStop,
     },
 }
 impl MainStatus {
@@ -50,60 +48,37 @@ impl MainStatus {
         match self {
             MainStatus::Starting { .. }
             | MainStatus::Running { .. }
+            | MainStatus::Restarting
             | MainStatus::BackingUp {
-                started: Some(_), ..
+                on_complete: StartStop::Start,
             } => true,
             MainStatus::Stopped
             | MainStatus::Restoring
             | MainStatus::Stopping { .. }
-            | MainStatus::Restarting
-            | MainStatus::BackingUp { started: None, .. } => false,
+            | MainStatus::BackingUp {
+                on_complete: StartStop::Stop,
+            } => false,
         }
     }
-    // pub fn stop(&mut self) {
-    //     match self {
-    //         MainStatus::Starting { .. } | MainStatus::Running { .. } => {
-    //             *self = MainStatus::Stopping;
-    //         }
-    //         MainStatus::BackingUp { started, .. } => {
-    //             *started = None;
-    //         }
-    //         MainStatus::Stopped | MainStatus::Stopping | MainStatus::Restarting => (),
-    //     }
-    // }
-    pub fn started(&self) -> Option<DateTime<Utc>> {
-        match self {
-            MainStatus::Running { started, .. } => Some(*started),
-            MainStatus::BackingUp { started, .. } => *started,
-            MainStatus::Stopped => None,
-            MainStatus::Restoring => None,
-            MainStatus::Restarting => None,
-            MainStatus::Stopping { .. } => None,
-            MainStatus::Starting { .. } => None,
+
+    pub fn backing_up(self) -> Self {
+        MainStatus::BackingUp {
+            on_complete: if self.running() {
+                StartStop::Start
+            } else {
+                StartStop::Stop
+            },
         }
     }
-    pub fn backing_up(&self) -> Self {
-        let (started, health) = match self {
-            MainStatus::Starting { .. } => (Some(Utc::now()), Default::default()),
-            MainStatus::Running { started, health } => (Some(started.clone()), health.clone()),
-            MainStatus::Stopped
-            | MainStatus::Stopping { .. }
-            | MainStatus::Restoring
-            | MainStatus::Restarting => (None, Default::default()),
-            MainStatus::BackingUp { .. } => return self.clone(),
-        };
-        MainStatus::BackingUp { started, health }
-    }
 
     pub fn health(&self) -> Option<&OrdMap<HealthCheckId, NamedHealthCheckResult>> {
         match self {
-            MainStatus::Running { health, .. } => Some(health),
-            MainStatus::BackingUp { health, .. } => Some(health),
-            MainStatus::Stopped
+            MainStatus::Running { health, .. } | MainStatus::Starting { health } => Some(health),
+            MainStatus::BackingUp { .. }
+            | MainStatus::Stopped
             | MainStatus::Restoring
             | MainStatus::Stopping { .. }
             | MainStatus::Restarting => None,
-            MainStatus::Starting { .. } => None,
         }
     }
 }
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 569d83b16..390e8e87f 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -61,7 +61,7 @@ import {
 } from "./util/getServiceInterface"
 import { getServiceInterfaces } from "./util/getServiceInterfaces"
 import { getStore } from "./store/getStore"
-import { CommandOptions, MountOptions, Overlay } from "./util/Overlay"
+import { CommandOptions, MountOptions, SubContainer } from "./util/SubContainer"
 import { splitCommand } from "./util/splitCommand"
 import { Mounts } from "./mainFn/Mounts"
 import { Dependency } from "./Dependency"
@@ -734,8 +734,11 @@ export async function runCommand<Manifest extends T.Manifest>(
   },
 ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
   const commands = splitCommand(command)
-  return Overlay.with(effects, image, options.mounts || [], (overlay) =>
-    overlay.exec(commands),
+  return SubContainer.with(
+    effects,
+    image,
+    options.mounts || [],
+    (subcontainer) => subcontainer.exec(commands),
   )
 }
 function nullifyProperties(value: T.SdkPropertiesReturn): T.PropertiesReturn {
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts
index 8186a3cce..e007c4ea2 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/lib/health/HealthCheck.ts
@@ -5,7 +5,7 @@ import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
 import { once } from "../util/once"
-import { Overlay } from "../util/Overlay"
+import { SubContainer } from "../util/SubContainer"
 import { object, unknown } from "ts-matches"
 import * as T from "../types"
 import { asError } from "../util/asError"
diff --git a/sdk/lib/health/checkFns/runHealthScript.ts b/sdk/lib/health/checkFns/runHealthScript.ts
index 87fc6c69c..4bac211a9 100644
--- a/sdk/lib/health/checkFns/runHealthScript.ts
+++ b/sdk/lib/health/checkFns/runHealthScript.ts
@@ -1,5 +1,5 @@
 import { Effects } from "../../types"
-import { Overlay } from "../../util/Overlay"
+import { SubContainer } from "../../util/SubContainer"
 import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
 import { HealthCheckResult } from "./HealthCheckResult"
 import { timeoutPromise } from "./index"
@@ -13,7 +13,7 @@ import { timeoutPromise } from "./index"
  */
 export const runHealthScript = async (
   runCommand: string[],
-  overlay: Overlay,
+  subcontainer: SubContainer,
   {
     timeout = 30000,
     errorMessage = `Error while running command: ${runCommand}`,
@@ -22,7 +22,7 @@ export const runHealthScript = async (
   } = {},
 ): Promise<HealthCheckResult> => {
   const res = await Promise.race([
-    overlay.exec(runCommand),
+    subcontainer.exec(runCommand),
     timeoutPromise(timeout),
   ]).catch((e) => {
     console.warn(errorMessage)
diff --git a/sdk/lib/index.ts b/sdk/lib/index.ts
index a023c4e81..a4caf9c01 100644
--- a/sdk/lib/index.ts
+++ b/sdk/lib/index.ts
@@ -1,5 +1,5 @@
 export { Daemons } from "./mainFn/Daemons"
-export { Overlay } from "./util/Overlay"
+export { SubContainer } from "./util/SubContainer"
 export { StartSdk } from "./StartSdk"
 export { setupManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/lib/mainFn/CommandController.ts
index 8635f76e6..8a0505f68 100644
--- a/sdk/lib/mainFn/CommandController.ts
+++ b/sdk/lib/mainFn/CommandController.ts
@@ -6,32 +6,35 @@ import { asError } from "../util/asError"
 import {
   ExecSpawnable,
   MountOptions,
-  NonDestroyableOverlay,
-  Overlay,
-} from "../util/Overlay"
+  SubContainerHandle,
+  SubContainer,
+} from "../util/SubContainer"
 import { splitCommand } from "../util/splitCommand"
-import { cpExecFile, cpExec } from "./Daemons"
+import * as cp from "child_process"
 
 export class CommandController {
   private constructor(
     readonly runningAnswer: Promise<unknown>,
-    private readonly overlay: ExecSpawnable,
-    readonly pid: number | undefined,
+    private state: { exited: boolean },
+    private readonly subcontainer: SubContainer,
+    private process: cp.ChildProcessWithoutNullStreams,
     readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {}
   static of<Manifest extends T.Manifest>() {
     return async <A extends string>(
       effects: T.Effects,
-      imageId: {
-        id: keyof Manifest["images"] & T.ImageId
-        sharedRun?: boolean
-      },
+      subcontainer:
+        | {
+            id: keyof Manifest["images"] & T.ImageId
+            sharedRun?: boolean
+          }
+        | SubContainer,
       command: T.CommandType,
       options: {
         // Defaults to the DEFAULT_SIGTERM_TIMEOUT = 30_000ms
         sigtermTimeout?: number
         mounts?: { path: string; options: MountOptions }[]
-        overlay?: ExecSpawnable
+        runAsInit?: boolean
         env?:
           | {
               [variable: string]: string
@@ -44,49 +47,60 @@ export class CommandController {
       },
     ) => {
       const commands = splitCommand(command)
-      const overlay =
-        options.overlay ||
-        (await (async () => {
-          const overlay = await Overlay.of(effects, imageId)
-          for (let mount of options.mounts || []) {
-            await overlay.mount(mount.options, mount.path)
-          }
-          return overlay
-        })())
-      const childProcess = await overlay.spawn(commands, {
-        env: options.env,
-      })
+      const subc =
+        subcontainer instanceof SubContainer
+          ? subcontainer
+          : await (async () => {
+              const subc = await SubContainer.of(effects, subcontainer)
+              for (let mount of options.mounts || []) {
+                await subc.mount(mount.options, mount.path)
+              }
+              return subc
+            })()
+      let childProcess: cp.ChildProcessWithoutNullStreams
+      if (options.runAsInit) {
+        childProcess = await subc.launch(commands, {
+          env: options.env,
+        })
+      } else {
+        childProcess = await subc.spawn(commands, {
+          env: options.env,
+        })
+      }
+      const state = { exited: false }
       const answer = new Promise<null>((resolve, reject) => {
-        childProcess.stdout.on(
-          "data",
-          options.onStdout ??
-            ((data: any) => {
-              console.log(data.toString())
-            }),
-        )
-        childProcess.stderr.on(
-          "data",
-          options.onStderr ??
-            ((data: any) => {
-              console.error(asError(data))
-            }),
-        )
-
-        childProcess.on("exit", (code: any) => {
-          if (code === 0) {
+        childProcess.on("exit", (code) => {
+          state.exited = true
+          if (
+            code === 0 ||
+            code === 143 ||
+            (code === null && childProcess.signalCode == "SIGTERM")
+          ) {
             return resolve(null)
           }
-          return reject(new Error(`${commands[0]} exited with code ${code}`))
+          if (code) {
+            return reject(new Error(`${commands[0]} exited with code ${code}`))
+          } else {
+            return reject(
+              new Error(
+                `${commands[0]} exited with signal ${childProcess.signalCode}`,
+              ),
+            )
+          }
         })
       })
 
-      const pid = childProcess.pid
-
-      return new CommandController(answer, overlay, pid, options.sigtermTimeout)
+      return new CommandController(
+        answer,
+        state,
+        subc,
+        childProcess,
+        options.sigtermTimeout,
+      )
     }
   }
-  get nonDestroyableOverlay() {
-    return new NonDestroyableOverlay(this.overlay)
+  get subContainerHandle() {
+    return new SubContainerHandle(this.subcontainer)
   }
   async wait({ timeout = NO_TIMEOUT } = {}) {
     if (timeout > 0)
@@ -96,75 +110,30 @@ export class CommandController {
     try {
       return await this.runningAnswer
     } finally {
-      if (this.pid !== undefined) {
-        await cpExecFile("pkill", ["-9", "-s", String(this.pid)]).catch(
-          (_) => {},
-        )
+      if (!this.state.exited) {
+        this.process.kill("SIGKILL")
       }
-      await this.overlay.destroy?.().catch((_) => {})
+      await this.subcontainer.destroy?.().catch((_) => {})
     }
   }
   async term({ signal = SIGTERM, timeout = this.sigtermTimeout } = {}) {
-    if (this.pid === undefined) return
     try {
-      await cpExecFile("pkill", [
-        `-${signal.replace("SIG", "")}`,
-        "-s",
-        String(this.pid),
-      ])
+      if (!this.state.exited) {
+        if (!this.process.kill(signal)) {
+          console.error(
+            `failed to send signal ${signal} to pid ${this.process.pid}`,
+          )
+        }
+      }
 
-      const didTimeout = await waitSession(this.pid, timeout)
-      if (didTimeout) {
-        await cpExecFile("pkill", [`-9`, "-s", String(this.pid)]).catch(
-          (_) => {},
-        )
+      if (signal !== "SIGKILL") {
+        setTimeout(() => {
+          this.process.kill("SIGKILL")
+        }, timeout)
       }
+      await this.runningAnswer
     } finally {
-      await this.overlay.destroy?.()
+      await this.subcontainer.destroy?.()
     }
   }
 }
-
-function waitSession(
-  sid: number,
-  timeout = NO_TIMEOUT,
-  interval = 100,
-): Promise<boolean> {
-  let nextInterval = interval * 2
-  if (timeout >= 0 && timeout < nextInterval) {
-    nextInterval = timeout
-  }
-  let nextTimeout = timeout
-  if (timeout > 0) {
-    if (timeout >= interval) {
-      nextTimeout -= interval
-    } else {
-      nextTimeout = 0
-    }
-  }
-  return new Promise((resolve, reject) => {
-    let next: NodeJS.Timeout | null = null
-    if (timeout !== 0) {
-      next = setTimeout(() => {
-        waitSession(sid, nextTimeout, nextInterval).then(resolve, reject)
-      }, interval)
-    }
-    cpExecFile("ps", [`--sid=${sid}`, "-o", "--pid="]).then(
-      (_) => {
-        if (timeout === 0) {
-          resolve(true)
-        }
-      },
-      (e) => {
-        if (next) {
-          clearTimeout(next)
-        }
-        if (typeof e === "object" && e && "code" in e && e.code) {
-          resolve(false)
-        } else {
-          reject(e)
-        }
-      },
-    )
-  })
-}
diff --git a/sdk/lib/mainFn/Daemon.ts b/sdk/lib/mainFn/Daemon.ts
index 20a067ff6..87a7d705d 100644
--- a/sdk/lib/mainFn/Daemon.ts
+++ b/sdk/lib/mainFn/Daemon.ts
@@ -1,6 +1,6 @@
 import * as T from "../types"
 import { asError } from "../util/asError"
-import { ExecSpawnable, MountOptions, Overlay } from "../util/Overlay"
+import { ExecSpawnable, MountOptions, SubContainer } from "../util/SubContainer"
 import { CommandController } from "./CommandController"
 
 const TIMEOUT_INCREMENT_MS = 1000
@@ -14,20 +14,21 @@ export class Daemon {
   private commandController: CommandController | null = null
   private shouldBeRunning = false
   constructor(private startCommand: () => Promise<CommandController>) {}
-  get overlay(): undefined | ExecSpawnable {
-    return this.commandController?.nonDestroyableOverlay
+  get subContainerHandle(): undefined | ExecSpawnable {
+    return this.commandController?.subContainerHandle
   }
   static of<Manifest extends T.Manifest>() {
     return async <A extends string>(
       effects: T.Effects,
-      imageId: {
-        id: keyof Manifest["images"] & T.ImageId
-        sharedRun?: boolean
-      },
+      subcontainer:
+        | {
+            id: keyof Manifest["images"] & T.ImageId
+            sharedRun?: boolean
+          }
+        | SubContainer,
       command: T.CommandType,
       options: {
         mounts?: { path: string; options: MountOptions }[]
-        overlay?: Overlay
         env?:
           | {
               [variable: string]: string
@@ -41,7 +42,12 @@ export class Daemon {
       },
     ) => {
       const startCommand = () =>
-        CommandController.of<Manifest>()(effects, imageId, command, options)
+        CommandController.of<Manifest>()(
+          effects,
+          subcontainer,
+          command,
+          options,
+        )
       return new Daemon(startCommand)
     }
   }
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 3134d0459..1ecec28d3 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -7,7 +7,12 @@ import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
 import * as T from "../types"
 import { Mounts } from "./Mounts"
-import { CommandOptions, MountOptions, Overlay } from "../util/Overlay"
+import {
+  CommandOptions,
+  ExecSpawnable,
+  MountOptions,
+  SubContainer,
+} from "../util/SubContainer"
 import { splitCommand } from "../util/splitCommand"
 
 import { promisify } from "node:util"
@@ -23,7 +28,9 @@ export const cpExec = promisify(CP.exec)
 export const cpExecFile = promisify(CP.execFile)
 export type Ready = {
   display: string | null
-  fn: () => Promise<HealthCheckResult> | HealthCheckResult
+  fn: (
+    spawnable: ExecSpawnable,
+  ) => Promise<HealthCheckResult> | HealthCheckResult
   trigger?: Trigger
 }
 
diff --git a/sdk/lib/mainFn/HealthDaemon.ts b/sdk/lib/mainFn/HealthDaemon.ts
index 1a036532f..7ace3ed7b 100644
--- a/sdk/lib/mainFn/HealthDaemon.ts
+++ b/sdk/lib/mainFn/HealthDaemon.ts
@@ -100,16 +100,25 @@ export class HealthDaemon {
         !res.done;
         res = await Promise.race([status, trigger.next()])
       ) {
-        const response: HealthCheckResult = await Promise.resolve(
-          this.ready.fn(),
-        ).catch((err) => {
-          console.error(asError(err))
-          return {
+        const handle = (await this.daemon).subContainerHandle
+
+        if (handle) {
+          const response: HealthCheckResult = await Promise.resolve(
+            this.ready.fn(handle),
+          ).catch((err) => {
+            console.error(asError(err))
+            return {
+              result: "failure",
+              message: "message" in err ? err.message : String(err),
+            }
+          })
+          await this.setHealth(response)
+        } else {
+          await this.setHealth({
             result: "failure",
-            message: "message" in err ? err.message : String(err),
-          }
-        })
-        await this.setHealth(response)
+            message: "Daemon not running",
+          })
+        }
       }
     }).catch((err) => console.error(`Daemon ${this.id} failed: ${err}`))
 
diff --git a/sdk/lib/mainFn/Mounts.ts b/sdk/lib/mainFn/Mounts.ts
index 968b77b4e..bd947b759 100644
--- a/sdk/lib/mainFn/Mounts.ts
+++ b/sdk/lib/mainFn/Mounts.ts
@@ -1,5 +1,5 @@
 import * as T from "../types"
-import { MountOptions } from "../util/Overlay"
+import { MountOptions } from "../util/SubContainer"
 
 type MountArray = { path: string; options: MountOptions }[]
 
diff --git a/sdk/lib/osBindings/CreateOverlayedImageParams.ts b/sdk/lib/osBindings/CreateSubcontainerFsParams.ts
similarity index 70%
rename from sdk/lib/osBindings/CreateOverlayedImageParams.ts
rename to sdk/lib/osBindings/CreateSubcontainerFsParams.ts
index aad94f01f..729ad4240 100644
--- a/sdk/lib/osBindings/CreateOverlayedImageParams.ts
+++ b/sdk/lib/osBindings/CreateSubcontainerFsParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ImageId } from "./ImageId"
 
-export type CreateOverlayedImageParams = { imageId: ImageId }
+export type CreateSubcontainerFsParams = { imageId: ImageId }
diff --git a/sdk/lib/osBindings/DestroyOverlayedImageParams.ts b/sdk/lib/osBindings/DestroySubcontainerFsParams.ts
similarity index 71%
rename from sdk/lib/osBindings/DestroyOverlayedImageParams.ts
rename to sdk/lib/osBindings/DestroySubcontainerFsParams.ts
index b5b7484a2..3f85d2217 100644
--- a/sdk/lib/osBindings/DestroyOverlayedImageParams.ts
+++ b/sdk/lib/osBindings/DestroySubcontainerFsParams.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Guid } from "./Guid"
 
-export type DestroyOverlayedImageParams = { guid: Guid }
+export type DestroySubcontainerFsParams = { guid: Guid }
diff --git a/sdk/lib/osBindings/MainStatus.ts b/sdk/lib/osBindings/MainStatus.ts
index a528aa187..1f6b3babe 100644
--- a/sdk/lib/osBindings/MainStatus.ts
+++ b/sdk/lib/osBindings/MainStatus.ts
@@ -1,20 +1,20 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { HealthCheckId } from "./HealthCheckId"
 import type { NamedHealthCheckResult } from "./NamedHealthCheckResult"
+import type { StartStop } from "./StartStop"
 
 export type MainStatus =
   | { status: "stopped" }
   | { status: "restarting" }
   | { status: "restoring" }
   | { status: "stopping" }
-  | { status: "starting" }
   | {
-      status: "running"
-      started: string
+      status: "starting"
       health: { [key: HealthCheckId]: NamedHealthCheckResult }
     }
   | {
-      status: "backingUp"
-      started: string | null
+      status: "running"
+      started: string
       health: { [key: HealthCheckId]: NamedHealthCheckResult }
     }
+  | { status: "backingUp"; onComplete: StartStop }
diff --git a/sdk/lib/osBindings/StartStop.ts b/sdk/lib/osBindings/StartStop.ts
new file mode 100644
index 000000000..c8be35fb7
--- /dev/null
+++ b/sdk/lib/osBindings/StartStop.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type StartStop = "start" | "stop"
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 59cbb7b13..9492fe796 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -31,7 +31,7 @@ export { CheckDependenciesParam } from "./CheckDependenciesParam"
 export { CheckDependenciesResult } from "./CheckDependenciesResult"
 export { Cifs } from "./Cifs"
 export { ContactInfo } from "./ContactInfo"
-export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams"
+export { CreateSubcontainerFsParams } from "./CreateSubcontainerFsParams"
 export { CurrentDependencies } from "./CurrentDependencies"
 export { CurrentDependencyInfo } from "./CurrentDependencyInfo"
 export { DataUrl } from "./DataUrl"
@@ -41,7 +41,7 @@ export { DependencyMetadata } from "./DependencyMetadata"
 export { DependencyRequirement } from "./DependencyRequirement"
 export { DepInfo } from "./DepInfo"
 export { Description } from "./Description"
-export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams"
+export { DestroySubcontainerFsParams } from "./DestroySubcontainerFsParams"
 export { Duration } from "./Duration"
 export { EchoParams } from "./EchoParams"
 export { EncryptedWire } from "./EncryptedWire"
@@ -145,6 +145,7 @@ export { SetupStatusRes } from "./SetupStatusRes"
 export { SignAssetParams } from "./SignAssetParams"
 export { SignerInfo } from "./SignerInfo"
 export { SmtpValue } from "./SmtpValue"
+export { StartStop } from "./StartStop"
 export { Status } from "./Status"
 export { UpdatingState } from "./UpdatingState"
 export { VerifyCifsParams } from "./VerifyCifsParams"
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/lib/test/startosTypeValidation.test.ts
index 661f21079..bcbc4b6ec 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/lib/test/startosTypeValidation.test.ts
@@ -3,11 +3,13 @@ import {
   CheckDependenciesParam,
   ExecuteAction,
   GetConfiguredParams,
+  GetStoreParams,
   SetDataVersionParams,
   SetMainStatus,
+  SetStoreParams,
 } from ".././osBindings"
-import { CreateOverlayedImageParams } from ".././osBindings"
-import { DestroyOverlayedImageParams } from ".././osBindings"
+import { CreateSubcontainerFsParams } from ".././osBindings"
+import { DestroySubcontainerFsParams } from ".././osBindings"
 import { BindParams } from ".././osBindings"
 import { GetHostInfoParams } from ".././osBindings"
 import { SetConfigured } from ".././osBindings"
@@ -24,21 +26,28 @@ import { GetPrimaryUrlParams } from ".././osBindings"
 import { ListServiceInterfacesParams } from ".././osBindings"
 import { ExportActionParams } from ".././osBindings"
 import { MountParams } from ".././osBindings"
+import { StringObject } from "../util"
 function typeEquality<ExpectedType>(_a: ExpectedType) {}
 
 type WithCallback<T> = Omit<T, "callback"> & { callback: () => void }
 
+type EffectsTypeChecker<T extends StringObject = Effects> = {
+  [K in keyof T]: T[K] extends (args: infer A) => any
+    ? A
+    : T[K] extends StringObject
+      ? EffectsTypeChecker<T[K]>
+      : never
+}
+
 describe("startosTypeValidation ", () => {
   test(`checking the params match`, () => {
     const testInput: any = {}
-    typeEquality<{
-      [K in keyof Effects]: Effects[K] extends (args: infer A) => any
-        ? A
-        : never
-    }>({
+    typeEquality<EffectsTypeChecker>({
       executeAction: {} as ExecuteAction,
-      createOverlayedImage: {} as CreateOverlayedImageParams,
-      destroyOverlayedImage: {} as DestroyOverlayedImageParams,
+      subcontainer: {
+        createFs: {} as CreateSubcontainerFsParams,
+        destroyFs: {} as DestroySubcontainerFsParams,
+      },
       clearBindings: undefined,
       getInstalledPackages: undefined,
       bind: {} as BindParams,
@@ -55,7 +64,10 @@ describe("startosTypeValidation ", () => {
       getSslKey: {} as GetSslKeyParams,
       getServiceInterface: {} as WithCallback<GetServiceInterfaceParams>,
       setDependencies: {} as SetDependenciesParams,
-      store: {} as never,
+      store: {
+        get: {} as any, // as GetStoreParams,
+        set: {} as any, // as SetStoreParams,
+      },
       getSystemSmtp: {} as WithCallback<GetSystemSmtpParams>,
       getContainerIp: undefined,
       getServicePortForward: {} as GetServicePortForwardParams,
diff --git a/sdk/lib/trigger/index.ts b/sdk/lib/trigger/index.ts
index 6da034262..eb058437f 100644
--- a/sdk/lib/trigger/index.ts
+++ b/sdk/lib/trigger/index.ts
@@ -1,3 +1,4 @@
+import { ExecSpawnable } from "../util/SubContainer"
 import { TriggerInput } from "./TriggerInput"
 export { changeOnFirstSuccess } from "./changeOnFirstSuccess"
 export { cooldownTrigger } from "./cooldownTrigger"
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index d448b2255..772609ea0 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -25,6 +25,7 @@ import { Daemons } from "./mainFn/Daemons"
 import { StorePath } from "./store/PathBuilder"
 import { ExposedStorePaths } from "./store/setupExposeStore"
 import { UrlString } from "./util/getServiceInterface"
+import { StringObject, ToKebab } from "./util"
 export * from "./osBindings"
 export { SDKManifest } from "./manifest/ManifestTypes"
 export { HealthReceipt } from "./health/HealthReceipt"
@@ -286,6 +287,16 @@ export type PropertiesReturn = {
   [key: string]: PropertiesValue
 }
 
+export type EffectMethod<T extends StringObject = Effects> = {
+  [K in keyof T]-?: K extends string
+    ? T[K] extends Function
+      ? ToKebab<K>
+      : T[K] extends StringObject
+        ? `${ToKebab<K>}.${EffectMethod<T[K]>}`
+        : never
+    : never
+}[keyof T]
+
 /** Used to reach out from the pure js runtime */
 export type Effects = {
   // action
@@ -352,12 +363,13 @@ export type Effects = {
   /** sets the result of a health check */
   setHealth(o: SetHealth): Promise<void>
 
-  // image
-
-  /** A low level api used by Overlay */
-  createOverlayedImage(options: { imageId: string }): Promise<[string, string]>
-  /** A low level api used by Overlay */
-  destroyOverlayedImage(options: { guid: string }): Promise<void>
+  // subcontainer
+  subcontainer: {
+    /** A low level api used by SubContainer */
+    createFs(options: { imageId: string }): Promise<[string, string]>
+    /** A low level api used by SubContainer */
+    destroyFs(options: { guid: string }): Promise<void>
+  }
 
   // net
 
diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/SubContainer.ts
similarity index 66%
rename from sdk/lib/util/Overlay.ts
rename to sdk/lib/util/SubContainer.ts
index 14908b90f..1cf9484bc 100644
--- a/sdk/lib/util/Overlay.ts
+++ b/sdk/lib/util/SubContainer.ts
@@ -13,17 +13,21 @@ type ExecResults = {
   stderr: string | Buffer
 }
 
+export type ExecOptions = {
+  input?: string | Buffer
+}
+
 /**
- * This is the type that is going to describe what an overlay could do. The main point of the
- * overlay is to have commands that run in a chrooted environment. This is useful for running
+ * This is the type that is going to describe what an subcontainer could do. The main point of the
+ * subcontainer is to have commands that run in a chrooted environment. This is useful for running
  * commands in a containerized environment. But, I wanted the destroy to sometimes be doable, for example the
- * case where the overlay isn't owned by the process, the overlay shouldn't be destroyed.
+ * case where the subcontainer isn't owned by the process, the subcontainer shouldn't be destroyed.
  */
 export interface ExecSpawnable {
   get destroy(): undefined | (() => Promise<void>)
   exec(
     command: string[],
-    options?: CommandOptions,
+    options?: CommandOptions & ExecOptions,
     timeoutMs?: number | null,
   ): Promise<ExecResults>
   spawn(
@@ -37,24 +41,34 @@ export interface ExecSpawnable {
  * Implements:
  * @see {@link ExecSpawnable}
  */
-export class Overlay implements ExecSpawnable {
-  private destroyed = false
+export class SubContainer implements ExecSpawnable {
+  private leader: cp.ChildProcess
+  private leaderExited: boolean = false
   private constructor(
     readonly effects: T.Effects,
     readonly imageId: T.ImageId,
     readonly rootfs: string,
     readonly guid: T.Guid,
-  ) {}
+  ) {
+    this.leaderExited = false
+    this.leader = cp.spawn("start-cli", ["subcontainer", "launch", rootfs], {
+      killSignal: "SIGKILL",
+      stdio: "ignore",
+    })
+    this.leader.on("exit", () => {
+      this.leaderExited = true
+    })
+  }
   static async of(
     effects: T.Effects,
     image: { id: T.ImageId; sharedRun?: boolean },
   ) {
     const { id, sharedRun } = image
-    const [rootfs, guid] = await effects.createOverlayedImage({
+    const [rootfs, guid] = await effects.subcontainer.createFs({
       imageId: id as string,
     })
 
-    const shared = ["dev", "sys", "proc"]
+    const shared = ["dev", "sys"]
     if (!!sharedRun) {
       shared.push("run")
     }
@@ -69,27 +83,27 @@ export class Overlay implements ExecSpawnable {
       await execFile("mount", ["--rbind", from, to])
     }
 
-    return new Overlay(effects, id, rootfs, guid)
+    return new SubContainer(effects, id, rootfs, guid)
   }
 
   static async with<T>(
     effects: T.Effects,
     image: { id: T.ImageId; sharedRun?: boolean },
     mounts: { options: MountOptions; path: string }[],
-    fn: (overlay: Overlay) => Promise<T>,
+    fn: (subContainer: SubContainer) => Promise<T>,
   ): Promise<T> {
-    const overlay = await Overlay.of(effects, image)
+    const subContainer = await SubContainer.of(effects, image)
     try {
       for (let mount of mounts) {
-        await overlay.mount(mount.options, mount.path)
+        await subContainer.mount(mount.options, mount.path)
       }
-      return await fn(overlay)
+      return await fn(subContainer)
     } finally {
-      await overlay.destroy()
+      await subContainer.destroy()
     }
   }
 
-  async mount(options: MountOptions, path: string): Promise<Overlay> {
+  async mount(options: MountOptions, path: string): Promise<SubContainer> {
     path = path.startsWith("/")
       ? `${this.rootfs}${path}`
       : `${this.rootfs}/${path}`
@@ -134,19 +148,35 @@ export class Overlay implements ExecSpawnable {
     return this
   }
 
+  private async killLeader() {
+    if (this.leaderExited) {
+      return
+    }
+    return new Promise<void>((resolve, reject) => {
+      try {
+        this.leader.on("exit", () => {
+          resolve()
+        })
+        if (!this.leader.kill("SIGKILL")) {
+          reject(new Error("kill(2) failed"))
+        }
+      } catch (e) {
+        reject(e)
+      }
+    })
+  }
+
   get destroy() {
     return async () => {
-      if (this.destroyed) return
-      this.destroyed = true
-      const imageId = this.imageId
       const guid = this.guid
-      await this.effects.destroyOverlayedImage({ guid })
+      await this.killLeader()
+      await this.effects.subcontainer.destroyFs({ guid })
     }
   }
 
   async exec(
     command: string[],
-    options?: CommandOptions,
+    options?: CommandOptions & ExecOptions,
     timeoutMs: number | null = 30000,
   ): Promise<{
     exitCode: number | null
@@ -173,7 +203,8 @@ export class Overlay implements ExecSpawnable {
     const child = cp.spawn(
       "start-cli",
       [
-        "chroot",
+        "subcontainer",
+        "exec",
         `--env=/media/startos/images/${this.imageId}.env`,
         `--workdir=${workdir}`,
         ...extra,
@@ -182,6 +213,18 @@ export class Overlay implements ExecSpawnable {
       ],
       options || {},
     )
+    if (options?.input) {
+      await new Promise<void>((resolve, reject) =>
+        child.stdin.write(options.input, (e) => {
+          if (e) {
+            reject(e)
+          } else {
+            resolve()
+          }
+        }),
+      )
+      await new Promise<void>((resolve) => child.stdin.end(resolve))
+    }
     const pid = child.pid
     const stdout = { data: "" as string | Buffer }
     const stderr = { data: "" as string | Buffer }
@@ -201,23 +244,63 @@ export class Overlay implements ExecSpawnable {
       }
     return new Promise((resolve, reject) => {
       child.on("error", reject)
-      if (timeoutMs !== null && pid) {
-        setTimeout(
-          () => execFile("pkill", ["-9", "-s", String(pid)]).catch((_) => {}),
-          timeoutMs,
-        )
+      let killTimeout: NodeJS.Timeout | undefined
+      if (timeoutMs !== null && child.pid) {
+        killTimeout = setTimeout(() => child.kill("SIGKILL"), timeoutMs)
       }
       child.stdout.on("data", appendData(stdout))
       child.stderr.on("data", appendData(stderr))
-      child.on("exit", (code, signal) =>
+      child.on("exit", (code, signal) => {
+        clearTimeout(killTimeout)
         resolve({
           exitCode: code,
           exitSignal: signal,
           stdout: stdout.data,
           stderr: stderr.data,
-        }),
-      )
+        })
+      })
+    })
+  }
+
+  async launch(
+    command: string[],
+    options?: CommandOptions,
+  ): Promise<cp.ChildProcessWithoutNullStreams> {
+    const imageMeta: any = await fs
+      .readFile(`/media/startos/images/${this.imageId}.json`, {
+        encoding: "utf8",
+      })
+      .catch(() => "{}")
+      .then(JSON.parse)
+    let extra: string[] = []
+    if (options?.user) {
+      extra.push(`--user=${options.user}`)
+      delete options.user
+    }
+    let workdir = imageMeta.workdir || "/"
+    if (options?.cwd) {
+      workdir = options.cwd
+      delete options.cwd
+    }
+    await this.killLeader()
+    this.leaderExited = false
+    this.leader = cp.spawn(
+      "start-cli",
+      [
+        "subcontainer",
+        "launch",
+        `--env=/media/startos/images/${this.imageId}.env`,
+        `--workdir=${workdir}`,
+        ...extra,
+        this.rootfs,
+        ...command,
+      ],
+      { ...options, stdio: "inherit" },
+    )
+    this.leader.on("exit", () => {
+      this.leaderExited = true
     })
+    return this.leader as cp.ChildProcessWithoutNullStreams
   }
 
   async spawn(
@@ -243,7 +326,8 @@ export class Overlay implements ExecSpawnable {
     return cp.spawn(
       "start-cli",
       [
-        "chroot",
+        "subcontainer",
+        "exec",
         `--env=/media/startos/images/${this.imageId}.env`,
         `--workdir=${workdir}`,
         ...extra,
@@ -256,12 +340,12 @@ export class Overlay implements ExecSpawnable {
 }
 
 /**
- * Take an overlay but remove the ability to add the mounts and the destroy function.
+ * Take an subcontainer but remove the ability to add the mounts and the destroy function.
  * Lets other functions, like health checks, to not destroy the parents.
  *
  */
-export class NonDestroyableOverlay implements ExecSpawnable {
-  constructor(private overlay: ExecSpawnable) {}
+export class SubContainerHandle implements ExecSpawnable {
+  constructor(private subContainer: ExecSpawnable) {}
   get destroy() {
     return undefined
   }
@@ -271,13 +355,13 @@ export class NonDestroyableOverlay implements ExecSpawnable {
     options?: CommandOptions,
     timeoutMs?: number | null,
   ): Promise<ExecResults> {
-    return this.overlay.exec(command, options, timeoutMs)
+    return this.subContainer.exec(command, options, timeoutMs)
   }
   spawn(
     command: string[],
     options?: CommandOptions,
   ): Promise<cp.ChildProcessWithoutNullStreams> {
-    return this.overlay.spawn(command, options)
+    return this.subContainer.spawn(command, options)
   }
 }
 
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
index d7606d5d0..9246cf791 100644
--- a/sdk/lib/util/index.ts
+++ b/sdk/lib/util/index.ts
@@ -3,7 +3,7 @@ import "./fileHelper"
 import "../store/getStore"
 import "./deepEqual"
 import "./deepMerge"
-import "./Overlay"
+import "./SubContainer"
 import "./once"
 
 export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
diff --git a/sdk/lib/util/typeHelpers.ts b/sdk/lib/util/typeHelpers.ts
index f45a46f1e..d29d5c986 100644
--- a/sdk/lib/util/typeHelpers.ts
+++ b/sdk/lib/util/typeHelpers.ts
@@ -21,3 +21,96 @@ export type NoAny<A> = NeverPossible extends A
     ? never
     : A
   : A
+
+type CapitalLetters =
+  | "A"
+  | "B"
+  | "C"
+  | "D"
+  | "E"
+  | "F"
+  | "G"
+  | "H"
+  | "I"
+  | "J"
+  | "K"
+  | "L"
+  | "M"
+  | "N"
+  | "O"
+  | "P"
+  | "Q"
+  | "R"
+  | "S"
+  | "T"
+  | "U"
+  | "V"
+  | "W"
+  | "X"
+  | "Y"
+  | "Z"
+
+type Numbers = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
+
+type CapitalChars = CapitalLetters | Numbers
+
+export type ToKebab<S extends string> = S extends string
+  ? S extends `${infer Head}${CapitalChars}${infer Tail}` // string has a capital char somewhere
+    ? Head extends "" // there is a capital char in the first position
+      ? Tail extends ""
+        ? Lowercase<S> /*  'A' */
+        : S extends `${infer Caps}${Tail}` // tail exists, has capital characters
+          ? Caps extends CapitalChars
+            ? Tail extends CapitalLetters
+              ? `${Lowercase<Caps>}-${Lowercase<Tail>}` /* 'AB' */
+              : Tail extends `${CapitalLetters}${string}`
+                ? `${ToKebab<Caps>}-${ToKebab<Tail>}` /* first tail char is upper? 'ABcd' */
+                : `${ToKebab<Caps>}${ToKebab<Tail>}` /* 'AbCD','AbcD',  */ /* TODO: if tail is only numbers, append without underscore */
+            : never /* never reached, used for inference of caps */
+          : never
+      : Tail extends "" /* 'aB' 'abCD' 'ABCD' 'AB' */
+        ? S extends `${Head}${infer Caps}`
+          ? Caps extends CapitalChars
+            ? Head extends Lowercase<Head> /* 'abcD' */
+              ? Caps extends Numbers
+                ? // Head exists and is lowercase, tail does not, Caps is a number, we may be in a sub-select
+                  // if head ends with number, don't split head an Caps, keep contiguous numbers together
+                  Head extends `${string}${Numbers}`
+                  ? never
+                  : // head does not end in number, safe to split. 'abc2' -> 'abc-2'
+                    `${ToKebab<Head>}-${Caps}`
+                : `${ToKebab<Head>}-${ToKebab<Caps>}` /* 'abcD' 'abc25' */
+              : never /* stop union type forming */
+            : never
+          : never /* never reached, used for inference of caps */
+        : S extends `${Head}${infer Caps}${Tail}` /* 'abCd' 'ABCD' 'AbCd' 'ABcD' */
+          ? Caps extends CapitalChars
+            ? Head extends Lowercase<Head> /* is 'abCd' 'abCD' ? */
+              ? Tail extends CapitalLetters /* is 'abCD' where Caps = 'C' */
+                ? `${ToKebab<Head>}-${ToKebab<Caps>}-${Lowercase<Tail>}` /* aBCD Tail = 'D', Head = 'aB' */
+                : Tail extends `${CapitalLetters}${string}` /* is 'aBCd' where Caps = 'B' */
+                  ? Head extends Numbers
+                    ? never /* stop union type forming */
+                    : Head extends `${string}${Numbers}`
+                      ? never /* stop union type forming */
+                      : `${Head}-${ToKebab<Caps>}-${ToKebab<Tail>}` /* 'aBCd' => `${'a'}-${Lowercase<'B'>}-${ToSnake<'Cd'>}` */
+                  : `${ToKebab<Head>}-${Lowercase<Caps>}${ToKebab<Tail>}` /* 'aBcD' where Caps = 'B' tail starts as lowercase */
+              : never
+            : never
+          : never
+    : S /* 'abc'  */
+  : never
+
+export type StringObject = Record<string, unknown>
+
+function test() {
+  // prettier-ignore
+  const t = <A, B>(a: (
+    A extends B ? (
+      B extends A ? null : never
+    ) : never
+  )) =>{ }
+  t<"foo-bar", ToKebab<"FooBar">>(null)
+  // @ts-expect-error
+  t<"foo-3ar", ToKebab<"FooBar">>(null)
+}

From f373abdd14ac1a4e3c5007f854042a9c7746a534 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:19:49 -0600
Subject: [PATCH 272/341] fix: Container runtime actions (#2723)

Actions where running in a race condition that they sometimes didn't wait for the container to be started and the issue was the exec that was then run after would have an issue.
---
 sdk/lib/util/SubContainer.ts | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/sdk/lib/util/SubContainer.ts b/sdk/lib/util/SubContainer.ts
index 1cf9484bc..0d5982886 100644
--- a/sdk/lib/util/SubContainer.ts
+++ b/sdk/lib/util/SubContainer.ts
@@ -3,9 +3,10 @@ import * as T from "../types"
 import * as cp from "child_process"
 import { promisify } from "util"
 import { Buffer } from "node:buffer"
+import { once } from "./once"
 export const execFile = promisify(cp.execFile)
 const WORKDIR = (imageId: string) => `/media/startos/images/${imageId}/`
-
+const False = () => false
 type ExecResults = {
   exitCode: number | null
   exitSignal: NodeJS.Signals | null
@@ -17,6 +18,8 @@ export type ExecOptions = {
   input?: string | Buffer
 }
 
+const TIMES_TO_WAIT_FOR_PROC = 100
+
 /**
  * This is the type that is going to describe what an subcontainer could do. The main point of the
  * subcontainer is to have commands that run in a chrooted environment. This is useful for running
@@ -44,6 +47,7 @@ export interface ExecSpawnable {
 export class SubContainer implements ExecSpawnable {
   private leader: cp.ChildProcess
   private leaderExited: boolean = false
+  private waitProc: () => Promise<void>
   private constructor(
     readonly effects: T.Effects,
     readonly imageId: T.ImageId,
@@ -58,6 +62,26 @@ export class SubContainer implements ExecSpawnable {
     this.leader.on("exit", () => {
       this.leaderExited = true
     })
+    this.waitProc = once(
+      () =>
+        new Promise(async (resolve, reject) => {
+          let count = 0
+          while (
+            !(await fs.stat(`${this.rootfs}/proc/1`).then((x) => !!x, False))
+          ) {
+            if (count++ > TIMES_TO_WAIT_FOR_PROC) {
+              console.debug("Failed to start subcontainer", {
+                guid: this.guid,
+                imageId: this.imageId,
+                rootfs: this.rootfs,
+              })
+              reject(new Error(`Failed to start subcontainer ${this.imageId}`))
+            }
+            await wait(1)
+          }
+          resolve()
+        }),
+    )
   }
   static async of(
     effects: T.Effects,
@@ -184,6 +208,7 @@ export class SubContainer implements ExecSpawnable {
     stdout: string | Buffer
     stderr: string | Buffer
   }> {
+    await this.waitProc()
     const imageMeta: T.ImageMetadata = await fs
       .readFile(`/media/startos/images/${this.imageId}.json`, {
         encoding: "utf8",
@@ -266,6 +291,7 @@ export class SubContainer implements ExecSpawnable {
     command: string[],
     options?: CommandOptions,
   ): Promise<cp.ChildProcessWithoutNullStreams> {
+    await this.waitProc()
     const imageMeta: any = await fs
       .readFile(`/media/startos/images/${this.imageId}.json`, {
         encoding: "utf8",
@@ -307,6 +333,7 @@ export class SubContainer implements ExecSpawnable {
     command: string[],
     options?: CommandOptions,
   ): Promise<cp.ChildProcessWithoutNullStreams> {
+    await this.waitProc()
     const imageMeta: any = await fs
       .readFile(`/media/startos/images/${this.imageId}.json`, {
         encoding: "utf8",
@@ -402,3 +429,6 @@ export type MountOptionsBackup = {
   type: "backup"
   subpath: string | null
 }
+function wait(time: number) {
+  return new Promise((resolve) => setTimeout(resolve, time))
+}

From ece5577f260a67b7cfd832ae99c24e9cfa4dc060 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:20:18 -0600
Subject: [PATCH 273/341] feat: Adding in the effects to the startSdk (#2722)

Currently the start sdk that we expose calls some of the effects. And
there are others that need to be called via the effects object. The
idea is that all the effects that could and should be called are from
the startsdk side
---
 sdk/lib/StartSdk.ts | 44 ++++++++++++++++++++++++++++++++++++++++++++
 sdk/lib/types.ts    |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 390e8e87f..658597bc2 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -139,7 +139,51 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
       }]?: Dependency
     }
 
+    type NestedEffects = "subcontainer" | "store"
+    type InterfaceEffects =
+      | "getServiceInterface"
+      | "listServiceInterfaces"
+      | "exportServiceInterface"
+      | "clearServiceInterfaces"
+      | "bind"
+      | "getHostInfo"
+      | "getPrimaryUrl"
+    type MainUsedEffects = "setMainStatus" | "setHealth"
+    type AlreadyExposed = "getSslCertificate" | "getSystemSmtp"
+
+    // prettier-ignore
+    type StartSdkEffectWrapper = {
+      [K in keyof Omit<Effects, NestedEffects | InterfaceEffects | MainUsedEffects| AlreadyExposed>]: (effects: Effects, ...args: Parameters<Effects[K]>) => ReturnType<Effects[K]>
+    }
+    const startSdkEffectWrapper: StartSdkEffectWrapper = {
+      executeAction: (effects, ...args) => effects.executeAction(...args),
+      exportAction: (effects, ...args) => effects.exportAction(...args),
+      clearActions: (effects, ...args) => effects.clearActions(...args),
+      getConfigured: (effects, ...args) => effects.getConfigured(...args),
+      setConfigured: (effects, ...args) => effects.setConfigured(...args),
+      restart: (effects, ...args) => effects.restart(...args),
+      setDependencies: (effects, ...args) => effects.setDependencies(...args),
+      checkDependencies: (effects, ...args) =>
+        effects.checkDependencies(...args),
+      mount: (effects, ...args) => effects.mount(...args),
+      getInstalledPackages: (effects, ...args) =>
+        effects.getInstalledPackages(...args),
+      exposeForDependents: (effects, ...args) =>
+        effects.exposeForDependents(...args),
+      getServicePortForward: (effects, ...args) =>
+        effects.getServicePortForward(...args),
+      clearBindings: (effects, ...args) => effects.clearBindings(...args),
+      getContainerIp: (effects, ...args) => effects.getContainerIp(...args),
+      getSslKey: (effects, ...args) => effects.getSslKey(...args),
+      setDataVersion: (effects, ...args) => effects.setDataVersion(...args),
+      getDataVersion: (effects, ...args) => effects.getDataVersion(...args),
+      shutdown: (effects, ...args) => effects.shutdown(...args),
+      getDependencies: (effects, ...args) => effects.getDependencies(...args),
+    }
+
     return {
+      ...startSdkEffectWrapper,
+
       checkDependencies: checkDependencies as <
         DependencyId extends keyof Manifest["dependencies"] &
           PackageId = keyof Manifest["dependencies"] & PackageId,
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 772609ea0..4820f419d 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -382,7 +382,7 @@ export type Effects = {
     hostId: HostId
     internalPort: number
   }): Promise<LanInfo>
-  /** Removes all network bindings */
+  /** Removes all network bindings, called in the setupConfig */
   clearBindings(): Promise<void>
   // host
   /** Returns information about the specified host, if it exists */

From e423678995c4e5aab0c27d0db38c9fe384cfc460 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:52:41 -0600
Subject: [PATCH 274/341] chore: Bump the version to 5 (#2724)

---
 core/Cargo.lock                                                | 2 +-
 core/startos/Cargo.toml                                        | 2 +-
 core/startos/src/version/mod.rs                                | 2 +-
 web/package.json                                               | 2 +-
 web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index f81170753..1fccce36d 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5021,7 +5021,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.4"
+version = "0.3.6-alpha.5"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 41effd672..b5c81c56c 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.4"
+version = "0.3.6-alpha.5"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 8e114334d..18ff0e5b2 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -22,7 +22,7 @@ mod v0_3_6_alpha_5;
 mod v0_3_6_alpha_6;
 mod v0_3_6_alpha_7;
 
-pub type Current = v0_3_6_alpha_4::Version; // VERSION_BUMP
+pub type Current = v0_3_6_alpha_5::Version; // VERSION_BUMP
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
diff --git a/web/package.json b/web/package.json
index c46090544..945dde7cf 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.4",
+  "version": "0.3.6-alpha.5",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 6c259a6d0..ee938240a 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,7 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6-alpha.4</h4>
+  <h4>0.3.6-alpha.5</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
   <h6>Expect that any data you create or store on this version of the OS can be LOST FOREVER!</h6>
 

From 9059855f2b983d9c0f2d3bb58396a6a2378c1b92 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 23 Aug 2024 16:54:31 -0600
Subject: [PATCH 275/341] run tests in docker (#2725)

---
 Makefile                   |  4 ++--
 core/build-containerbox.sh | 12 +-----------
 core/build-registrybox.sh  | 12 +-----------
 core/build-startbox.sh     | 12 +-----------
 core/build-ts.sh           | 29 +++++++++++++++++++++++++++++
 core/run-tests.sh          | 29 +++++++++++++++++++++++++++++
 6 files changed, 63 insertions(+), 35 deletions(-)
 create mode 100755 core/build-ts.sh
 create mode 100755 core/run-tests.sh

diff --git a/Makefile b/Makefile
index adcbc6bf1..a714cd389 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ format:
 test: | test-core test-sdk test-container-runtime
 
 test-core: $(CORE_SRC) $(ENVIRONMENT_FILE) 
-	cd core && cargo build --features=test && cargo test --features=test
+	./core/run-tests.sh
 
 test-sdk: $(shell git ls-files sdk) sdk/lib/osBindings
 	cd sdk && make test
@@ -231,7 +231,7 @@ sdk/lib/osBindings: core/startos/bindings
 
 core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE)
 	rm -rf core/startos/bindings
-	(cd core/ && cargo test --features=test 'export_bindings_')
+	./core/build-ts.sh
 	touch core/startos/bindings
 
 sdk/dist: $(shell git ls-files sdk) sdk/lib/osBindings
diff --git a/core/build-containerbox.sh b/core/build-containerbox.sh
index e4a8f6e7a..850edf7be 100755
--- a/core/build-containerbox.sh
+++ b/core/build-containerbox.sh
@@ -24,16 +24,6 @@ fi
 
 alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
 
-set +e
-fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then 
-	fail=true
-fi
-set -e
-cd core
-
-if [ -n "$fail" ]; then
-	exit 1
-fi
+rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
\ No newline at end of file
diff --git a/core/build-registrybox.sh b/core/build-registrybox.sh
index 9db57dd80..70445af62 100755
--- a/core/build-registrybox.sh
+++ b/core/build-registrybox.sh
@@ -24,16 +24,6 @@ fi
 
 alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
 
-set +e
-fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then 
-	fail=true
-fi
-set -e
-cd core
-
-if [ -n "$fail" ]; then
-	exit 1
-fi
+rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
diff --git a/core/build-startbox.sh b/core/build-startbox.sh
index 55a455f09..872a2613e 100755
--- a/core/build-startbox.sh
+++ b/core/build-startbox.sh
@@ -24,16 +24,6 @@ fi
 
 alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
 
-set +e
-fail=
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-if ! rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"; then 
-	fail=true
-fi
-set -e
-cd core
-
-if [ -n "$fail" ]; then
-	exit 1
-fi
+rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
\ No newline at end of file
diff --git a/core/build-ts.sh b/core/build-ts.sh
new file mode 100755
index 000000000..ddcf343ec
--- /dev/null
+++ b/core/build-ts.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -e
+shopt -s expand_aliases
+
+if [ -z "$ARCH" ]; then
+	ARCH=$(uname -m)
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+cd ..
+FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
+RUSTFLAGS=""
+
+if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
+	RUSTFLAGS="--cfg tokio_unstable"
+fi
+
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+
+echo "FEATURES=\"$FEATURES\""
+echo "RUSTFLAGS=\"$RUSTFLAGS\""
+rust-musl-builder sh -c "cd core && cargo test --release --features=test,$FEATURES 'export_bindings_' && chown -R $UID:$UID startos/bindings && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
\ No newline at end of file
diff --git a/core/run-tests.sh b/core/run-tests.sh
new file mode 100755
index 000000000..8bfe02b77
--- /dev/null
+++ b/core/run-tests.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -e
+shopt -s expand_aliases
+
+if [ -z "$ARCH" ]; then
+	ARCH=$(uname -m)
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+cd ..
+FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
+RUSTFLAGS=""
+
+if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
+	RUSTFLAGS="--cfg tokio_unstable"
+fi
+
+alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/rust-musl-cross:$ARCH-musl'
+
+echo "FEATURES=\"$FEATURES\""
+echo "RUSTFLAGS=\"$RUSTFLAGS\""
+rust-musl-builder sh -c "apt-get update && apt-get install -y rsync && cd core && cargo test --release --features=test,$FEATURES --workspace --locked --target=$ARCH-unknown-linux-musl -- --skip export_bindings_ && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
\ No newline at end of file

From 571db5c0ee8578354d5357910e67e7003588b183 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 26 Aug 2024 16:52:23 -0600
Subject: [PATCH 276/341] Bugfix/mac build (#2726)

* fix mac build

* additional fixes

* handle arm64 from uname -m

* handle arm64 from uname -m in all builds

* gracefully handle rootless docker

* use cross-platform method of determining file uid
---
 build-cargo-dep.sh                            |  2 +-
 core/build-containerbox.sh                    | 11 +++++--
 core/build-registrybox.sh                     | 11 +++++--
 core/build-startbox.sh                        | 11 +++++--
 core/build-ts.sh                              | 11 +++++--
 core/install-cli.sh                           |  8 +++--
 core/run-tests.sh                             | 11 +++++--
 core/startos/Cargo.toml                       |  6 ++--
 core/startos/src/s9pk/v1/manifest.rs          |  2 +-
 core/startos/src/s9pk/v2/compat.rs            | 22 ++++++++------
 core/startos/src/service/effects/mod.rs       | 12 +++-----
 .../src/service/effects/subcontainer/mod.rs   |  6 ++++
 .../src/service/effects/subcontainer/sync.rs  | 15 ++++++----
 .../effects/subcontainer/sync_dummy.rs        | 30 +++++++++++++++++++
 web/patchdb-ui-seed.json                      |  2 +-
 15 files changed, 119 insertions(+), 41 deletions(-)
 create mode 100644 core/startos/src/service/effects/subcontainer/sync_dummy.rs

diff --git a/build-cargo-dep.sh b/build-cargo-dep.sh
index c32e4f8ae..922dfbdf9 100755
--- a/build-cargo-dep.sh
+++ b/build-cargo-dep.sh
@@ -18,7 +18,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 DOCKER_PLATFORM="linux/${ARCH}"
-if [ "$ARCH" = aarch64 ]; then
+if [ "$ARCH" = aarch64 ] || [ "$ARCH" = arm64 ]; then
 	DOCKER_PLATFORM="linux/arm64"
 elif [ "$ARCH" = x86_64 ]; then
 	DOCKER_PLATFORM="linux/amd64"
diff --git a/core/build-containerbox.sh b/core/build-containerbox.sh
index 850edf7be..e81efcc97 100755
--- a/core/build-containerbox.sh
+++ b/core/build-containerbox.sh
@@ -2,13 +2,17 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-set -e
+set -ea
 shopt -s expand_aliases
 
 if [ -z "$ARCH" ]; then
 	ARCH=$(uname -m)
 fi
 
+if [ "$ARCH" = "arm64" ]; then
+  ARCH="aarch64"
+fi
+
 USE_TTY=
 if tty -s; then
 	USE_TTY="-it"
@@ -26,4 +30,7 @@ alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v
 
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
\ No newline at end of file
+rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features container-runtime,$FEATURES --locked --bin containerbox --target=$ARCH-unknown-linux-musl"
+if [ "$(ls -nd core/target/$ARCH-unknown-linux-musl/release/containerbox | awk '{ print $3 }')" != "$UID" ]; then
+	rust-musl-builder sh -c "cd core && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
+fi
\ No newline at end of file
diff --git a/core/build-registrybox.sh b/core/build-registrybox.sh
index 70445af62..3659b372a 100755
--- a/core/build-registrybox.sh
+++ b/core/build-registrybox.sh
@@ -2,13 +2,17 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-set -e
+set -ea
 shopt -s expand_aliases
 
 if [ -z "$ARCH" ]; then
 	ARCH=$(uname -m)
 fi
 
+if [ "$ARCH" = "arm64" ]; then
+  ARCH="aarch64"
+fi
+
 USE_TTY=
 if tty -s; then
 	USE_TTY="-it"
@@ -26,4 +30,7 @@ alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v
 
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
+rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,registry,$FEATURES --locked --bin registrybox --target=$ARCH-unknown-linux-musl"
+if [ "$(ls -nd core/target/$ARCH-unknown-linux-musl/release/registrybox | awk '{ print $3 }')" != "$UID" ]; then
+	rust-musl-builder sh -c "cd core && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
+fi
diff --git a/core/build-startbox.sh b/core/build-startbox.sh
index 872a2613e..9fad6fa3d 100755
--- a/core/build-startbox.sh
+++ b/core/build-startbox.sh
@@ -2,13 +2,17 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-set -e
+set -ea
 shopt -s expand_aliases
 
 if [ -z "$ARCH" ]; then
 	ARCH=$(uname -m)
 fi
 
+if [ "$ARCH" = "arm64" ]; then
+  ARCH="aarch64"
+fi
+
 USE_TTY=
 if tty -s; then
 	USE_TTY="-it"
@@ -26,4 +30,7 @@ alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v
 
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
\ No newline at end of file
+rust-musl-builder sh -c "cd core && cargo build --release --no-default-features --features cli,daemon,$FEATURES --locked --bin startbox --target=$ARCH-unknown-linux-musl"
+if [ "$(ls -nd core/target/$ARCH-unknown-linux-musl/release/startbox | awk '{ print $3 }')" != "$UID" ]; then
+	rust-musl-builder sh -c "cd core && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
+fi
\ No newline at end of file
diff --git a/core/build-ts.sh b/core/build-ts.sh
index ddcf343ec..c9890bfe7 100755
--- a/core/build-ts.sh
+++ b/core/build-ts.sh
@@ -2,13 +2,17 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-set -e
+set -ea
 shopt -s expand_aliases
 
 if [ -z "$ARCH" ]; then
 	ARCH=$(uname -m)
 fi
 
+if [ "$ARCH" = "arm64" ]; then
+  ARCH="aarch64"
+fi
+
 USE_TTY=
 if tty -s; then
 	USE_TTY="-it"
@@ -26,4 +30,7 @@ alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v
 
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-rust-musl-builder sh -c "cd core && cargo test --release --features=test,$FEATURES 'export_bindings_' && chown -R $UID:$UID startos/bindings && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
\ No newline at end of file
+rust-musl-builder sh -c "cd core && cargo test --release --features=test,$FEATURES 'export_bindings_' && chown \$UID:\$UID startos/bindings"
+if [ "$(ls -nd core/startos/bindings | awk '{ print $3 }')" != "$UID" ]; then
+	rust-musl-builder sh -c "cd core && chown -R $UID:$UID startos/bindings && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
+fi
\ No newline at end of file
diff --git a/core/install-cli.sh b/core/install-cli.sh
index 620600d92..b278947a3 100755
--- a/core/install-cli.sh
+++ b/core/install-cli.sh
@@ -2,14 +2,18 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-set -e
+set -ea
 shopt -s expand_aliases
 
 web="../web/dist/static"
 [ -d "$web" ] || mkdir -p "$web"
 
 if [ -z "$PLATFORM" ]; then
-  export PLATFORM=$(uname -m)
+  PLATFORM=$(uname -m)
+fi
+
+if [ "$PLATFORM" = "arm64" ]; then
+  PLATFORM="aarch64"
 fi
 
 cargo install --path=./startos --no-default-features --features=cli,docker,registry --bin start-cli --locked
diff --git a/core/run-tests.sh b/core/run-tests.sh
index 8bfe02b77..02ec34d55 100755
--- a/core/run-tests.sh
+++ b/core/run-tests.sh
@@ -2,13 +2,17 @@
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-set -e
+set -ea
 shopt -s expand_aliases
 
 if [ -z "$ARCH" ]; then
 	ARCH=$(uname -m)
 fi
 
+if [ "$ARCH" = "arm64" ]; then
+  ARCH="aarch64"
+fi
+
 USE_TTY=
 if tty -s; then
 	USE_TTY="-it"
@@ -26,4 +30,7 @@ alias 'rust-musl-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v
 
 echo "FEATURES=\"$FEATURES\""
 echo "RUSTFLAGS=\"$RUSTFLAGS\""
-rust-musl-builder sh -c "apt-get update && apt-get install -y rsync && cd core && cargo test --release --features=test,$FEATURES --workspace --locked --target=$ARCH-unknown-linux-musl -- --skip export_bindings_ && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
\ No newline at end of file
+rust-musl-builder sh -c "apt-get update && apt-get install -y rsync && cd core && cargo test --release --features=test,$FEATURES --workspace --locked --target=$ARCH-unknown-linux-musl -- --skip export_bindings_ && chown \$UID:\$UID target"
+if [ "$(ls -nd core/target | awk '{ print $3 }')" != "$UID" ]; then
+	rust-musl-builder sh -c "cd core && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
+fi
\ No newline at end of file
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index b5c81c56c..d0228ba31 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -39,7 +39,7 @@ path = "src/main.rs"
 
 [features]
 cli = []
-container-runtime = []
+container-runtime = ["procfs", "unshare"]
 daemon = []
 registry = []
 default = ["cli", "daemon"]
@@ -153,7 +153,7 @@ pbkdf2 = "0.12.2"
 pin-project = "1.1.3"
 pkcs8 = { version = "0.10.2", features = ["std"] }
 prettytable-rs = "0.10.0"
-procfs = "0.16.0"
+procfs = { version = "0.16.0", optional = true }
 proptest = "1.3.1"
 proptest-derive = "0.5.0"
 rand = { version = "0.8.5", features = ["std"] }
@@ -208,7 +208,7 @@ ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-l
 typed-builder = "0.18.0"
 which = "6.0.3"
 unix-named-pipe = "0.2.0"
-unshare = "0.7.0"
+unshare = { version = "0.7.0", optional = true }
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.4.1", features = ["v4"] }
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index 4a9956f9f..9b3eb9895 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -21,7 +21,7 @@ pub struct Manifest {
     #[serde(default)]
     pub git_hash: Option<GitHash>,
     pub title: String,
-    pub version: exver::emver::Version,
+    pub version: String,
     pub description: Description,
     #[serde(default)]
     pub assets: Assets,
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 970cefb0c..8e62c69d0 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -1,5 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::path::Path;
+use std::str::FromStr;
 use std::sync::Arc;
 
 use exver::{ExtendedVersion, VersionRange};
@@ -44,9 +45,9 @@ impl S9pk<TmpSource<PackSource>> {
         // manifest.json
         let manifest_raw = reader.manifest().await?;
         let manifest = from_value::<ManifestV1>(manifest_raw.clone())?;
-        let mut new_manifest = Manifest::from(manifest.clone());
+        let mut new_manifest = Manifest::try_from(manifest.clone())?;
 
-        let images: BTreeMap<ImageId, bool> = manifest
+        let images: BTreeSet<(ImageId, bool)> = manifest
             .package_procedures()
             .filter_map(|p| {
                 if let PackageProcedure::Docker(p) = p {
@@ -89,8 +90,6 @@ impl S9pk<TmpSource<PackSource>> {
 
         // images
         for arch in reader.docker_arches().await? {
-            let images_dir = tmp_dir.join("images").join(&arch);
-            tokio::fs::create_dir_all(&images_dir).await?;
             Command::new(CONTAINER_TOOL)
                 .arg("load")
                 .input(Some(&mut reader.docker_images(&arch).await?))
@@ -194,13 +193,18 @@ impl S9pk<TmpSource<PackSource>> {
     }
 }
 
-impl From<ManifestV1> for Manifest {
-    fn from(value: ManifestV1) -> Self {
+impl TryFrom<ManifestV1> for Manifest {
+    type Error = Error;
+    fn try_from(value: ManifestV1) -> Result<Self, Self::Error> {
         let default_url = value.upstream_repo.clone();
-        Self {
+        Ok(Self {
             id: value.id,
             title: value.title.into(),
-            version: ExtendedVersion::from(value.version).into(),
+            version: ExtendedVersion::from(
+                exver::emver::Version::from_str(&value.version)
+                    .with_kind(ErrorKind::Deserialization)?,
+            )
+            .into(),
             satisfies: BTreeSet::new(),
             release_notes: value.release_notes,
             can_migrate_from: VersionRange::any(),
@@ -246,6 +250,6 @@ impl From<ManifestV1> for Manifest {
             git_hash: value.git_hash,
             os_version: value.eos_version,
             has_config: value.config.is_some(),
-        }
+        })
     }
 }
diff --git a/core/startos/src/service/effects/mod.rs b/core/startos/src/service/effects/mod.rs
index 3ec77ef21..e85481e96 100644
--- a/core/startos/src/service/effects/mod.rs
+++ b/core/startos/src/service/effects/mod.rs
@@ -109,20 +109,16 @@ pub fn handler<C: Context>() -> ParentHandler<C> {
             ParentHandler::<C>::new()
                 .subcommand(
                     "launch",
-                    from_fn_blocking(subcontainer::launch::<ContainerCliContext>).no_display(),
+                    from_fn_blocking(subcontainer::launch).no_display(),
                 )
                 .subcommand(
                     "launch-init",
-                    from_fn_blocking(subcontainer::launch_init::<ContainerCliContext>).no_display(),
-                )
-                .subcommand(
-                    "exec",
-                    from_fn_blocking(subcontainer::exec::<ContainerCliContext>).no_display(),
+                    from_fn_blocking(subcontainer::launch_init).no_display(),
                 )
+                .subcommand("exec", from_fn_blocking(subcontainer::exec).no_display())
                 .subcommand(
                     "exec-command",
-                    from_fn_blocking(subcontainer::exec_command::<ContainerCliContext>)
-                        .no_display(),
+                    from_fn_blocking(subcontainer::exec_command).no_display(),
                 )
                 .subcommand(
                     "create-fs",
diff --git a/core/startos/src/service/effects/subcontainer/mod.rs b/core/startos/src/service/effects/subcontainer/mod.rs
index 86e77e196..0375ef6c2 100644
--- a/core/startos/src/service/effects/subcontainer/mod.rs
+++ b/core/startos/src/service/effects/subcontainer/mod.rs
@@ -8,9 +8,15 @@ use crate::rpc_continuations::Guid;
 use crate::service::effects::prelude::*;
 use crate::util::Invoke;
 
+#[cfg(feature = "container-runtime")]
 mod sync;
 
+#[cfg(not(feature = "container-runtime"))]
+mod sync_dummy;
+
 pub use sync::*;
+#[cfg(not(feature = "container-runtime"))]
+use sync_dummy as sync;
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
diff --git a/core/startos/src/service/effects/subcontainer/sync.rs b/core/startos/src/service/effects/subcontainer/sync.rs
index 513d0b1e5..e18586a54 100644
--- a/core/startos/src/service/effects/subcontainer/sync.rs
+++ b/core/startos/src/service/effects/subcontainer/sync.rs
@@ -14,6 +14,7 @@ use tokio::sync::oneshot;
 use unshare::Command as NSCommand;
 
 use crate::service::effects::prelude::*;
+use crate::service::effects::ContainerCliContext;
 
 const FWD_SIGNALS: &[c_int] = &[
     SIGABRT, SIGALRM, SIGCONT, SIGHUP, SIGINT, SIGIO, SIGPIPE, SIGPROF, SIGQUIT, SIGTERM, SIGTRAP,
@@ -130,8 +131,8 @@ impl ExecParams {
     }
 }
 
-pub fn launch<C: Context>(
-    _: C,
+pub fn launch(
+    _: ContainerCliContext,
     ExecParams {
         env,
         workdir,
@@ -141,6 +142,8 @@ pub fn launch<C: Context>(
     }: ExecParams,
 ) -> Result<(), Error> {
     use unshare::{Namespace, Stdio};
+
+    use crate::service::cli::ContainerCliContext;
     let mut sig = signal_hook::iterator::Signals::new(FWD_SIGNALS)?;
     let mut cmd = NSCommand::new("/usr/bin/start-cli");
     cmd.arg("subcontainer").arg("launch-init");
@@ -262,7 +265,7 @@ pub fn launch<C: Context>(
     }
 }
 
-pub fn launch_init<C: Context>(_: C, params: ExecParams) -> Result<(), Error> {
+pub fn launch_init(_: ContainerCliContext, params: ExecParams) -> Result<(), Error> {
     nix::mount::mount(
         Some("proc"),
         &params.chroot.join("proc"),
@@ -281,8 +284,8 @@ pub fn launch_init<C: Context>(_: C, params: ExecParams) -> Result<(), Error> {
     }
 }
 
-pub fn exec<C: Context>(
-    _: C,
+pub fn exec(
+    _: ContainerCliContext,
     ExecParams {
         env,
         workdir,
@@ -384,6 +387,6 @@ pub fn exec<C: Context>(
     }
 }
 
-pub fn exec_command<C: Context>(_: C, params: ExecParams) -> Result<(), Error> {
+pub fn exec_command(_: ContainerCliContext, params: ExecParams) -> Result<(), Error> {
     params.exec()
 }
diff --git a/core/startos/src/service/effects/subcontainer/sync_dummy.rs b/core/startos/src/service/effects/subcontainer/sync_dummy.rs
new file mode 100644
index 000000000..285bdcbc1
--- /dev/null
+++ b/core/startos/src/service/effects/subcontainer/sync_dummy.rs
@@ -0,0 +1,30 @@
+use crate::service::effects::prelude::*;
+use crate::service::effects::ContainerCliContext;
+
+pub fn launch(_: ContainerCliContext) -> Result<(), Error> {
+    Err(Error::new(
+        eyre!("requires feature container-runtime"),
+        ErrorKind::InvalidRequest,
+    ))
+}
+
+pub fn launch_init(_: ContainerCliContext) -> Result<(), Error> {
+    Err(Error::new(
+        eyre!("requires feature container-runtime"),
+        ErrorKind::InvalidRequest,
+    ))
+}
+
+pub fn exec(_: ContainerCliContext) -> Result<(), Error> {
+    Err(Error::new(
+        eyre!("requires feature container-runtime"),
+        ErrorKind::InvalidRequest,
+    ))
+}
+
+pub fn exec_command(_: ContainerCliContext) -> Result<(), Error> {
+    Err(Error::new(
+        eyre!("requires feature container-runtime"),
+        ErrorKind::InvalidRequest,
+    ))
+}
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 807483c3a..221b80a3b 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -21,5 +21,5 @@
   "ackInstructions": {},
   "theme": "Dark",
   "widgets": [],
-  "ack-welcome": "0.3.6-alpha.4"
+  "ack-welcome": "0.3.6-alpha.5"
 }

From 4006dba9f15ba10d70378490f3a23072a8a4b039 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:48:11 -0600
Subject: [PATCH 277/341] fixes #2702 (#2728)

---
 debian/postinst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/postinst b/debian/postinst
index cafa691e0..bbf61f344 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -79,6 +79,7 @@ sed -i '/\(^\|#\)SystemMaxUse=/c\SystemMaxUse=1G' /etc/systemd/journald.conf
 sed -i '/\(^\|#\)ForwardToSyslog=/c\ForwardToSyslog=no' /etc/systemd/journald.conf
 sed -i '/^\s*#\?\s*issue_discards\s*=\s*/c\issue_discards = 1' /etc/lvm/lvm.conf
 sed -i '/\(^\|#\)\s*unqualified-search-registries\s*=\s*/c\unqualified-search-registries = ["docker.io"]' /etc/containers/registries.conf
+sed -i 's/\(#\|\^\)\s*\([^=]\+\)=\(suspend\|hibernate\)\s*$/\2=ignore/g' /etc/systemd/logind.conf
 
 mkdir -p /etc/nginx/ssl
 

From c552fdfc0f9d98cc47b39b9d7d22d9a585a88980 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:11:37 -0600
Subject: [PATCH 278/341] fixes #2651 (#2729)

---
 core/startos/src/context/rpc.rs | 103 ++++++++++++++++++++++++++++----
 1 file changed, 90 insertions(+), 13 deletions(-)

diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 0db681d3b..5330c58bc 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -1,4 +1,5 @@
 use std::collections::BTreeMap;
+use std::future::Future;
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 use std::ops::Deref;
 use std::path::PathBuf;
@@ -6,6 +7,8 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
+use chrono::{TimeDelta, Utc};
+use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use josekit::jwk::Jwk;
 use reqwest::{Client, Proxy};
@@ -29,7 +32,7 @@ use crate::net::utils::{find_eth_iface, find_wifi_iface};
 use crate::net::wifi::WpaCli;
 use crate::prelude::*;
 use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle};
-use crate::rpc_continuations::{OpenAuthedContinuations, RpcContinuations};
+use crate::rpc_continuations::{Guid, OpenAuthedContinuations, RpcContinuations};
 use crate::service::effects::callbacks::ServiceCallbacks;
 use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
@@ -63,6 +66,7 @@ pub struct RpcContextSeed {
     pub client: Client,
     pub hardware: Hardware,
     pub start_time: Instant,
+    pub crons: SyncMutex<BTreeMap<Guid, NonDetachingJoinHandle<()>>>,
     #[cfg(feature = "dev")]
     pub dev: Dev,
 }
@@ -94,12 +98,14 @@ impl InitRpcContextPhases {
 }
 
 pub struct CleanupInitPhases {
+    cleanup_sessions: PhaseProgressTrackerHandle,
     init_services: PhaseProgressTrackerHandle,
     check_dependencies: PhaseProgressTrackerHandle,
 }
 impl CleanupInitPhases {
     pub fn new(handle: &FullProgressTracker) -> Self {
         Self {
+            cleanup_sessions: handle.add_phase("Cleaning up sessions".into(), Some(1)),
             init_services: handle.add_phase("Initializing services".into(), Some(10)),
             check_dependencies: handle.add_phase("Checking dependencies".into(), Some(1)),
         }
@@ -174,6 +180,8 @@ impl RpcContext {
         let ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024;
         read_device_info.complete();
 
+        let crons = SyncMutex::new(BTreeMap::new());
+
         if !db
             .peek()
             .await
@@ -183,18 +191,24 @@ impl RpcContext {
             .de()?
         {
             let db = db.clone();
-            tokio::spawn(async move {
-                while !check_time_is_synchronized().await.unwrap() {
-                    tokio::time::sleep(Duration::from_secs(30)).await;
-                }
-                db.mutate(|v| {
-                    v.as_public_mut()
-                        .as_server_info_mut()
-                        .as_ntp_synced_mut()
-                        .ser(&true)
-                })
-                .await
-                .unwrap()
+            crons.mutate(|c| {
+                c.insert(
+                    Guid::new(),
+                    tokio::spawn(async move {
+                        while !check_time_is_synchronized().await.unwrap() {
+                            tokio::time::sleep(Duration::from_secs(30)).await;
+                        }
+                        db.mutate(|v| {
+                            v.as_public_mut()
+                                .as_server_info_mut()
+                                .as_ntp_synced_mut()
+                                .ser(&true)
+                        })
+                        .await
+                        .unwrap()
+                    })
+                    .into(),
+                )
             });
         }
 
@@ -259,6 +273,7 @@ impl RpcContext {
                 .with_kind(crate::ErrorKind::ParseUrl)?,
             hardware: Hardware { devices, ram },
             start_time: Instant::now(),
+            crons,
             #[cfg(feature = "dev")]
             dev: Dev {
                 lxc: Mutex::new(BTreeMap::new()),
@@ -273,6 +288,7 @@ impl RpcContext {
 
     #[instrument(skip_all)]
     pub async fn shutdown(self) -> Result<(), Error> {
+        self.crons.mutate(|c| std::mem::take(c));
         self.services.shutdown_all().await?;
         self.is_closed.store(true, Ordering::SeqCst);
         tracing::info!("RPC Context is shutdown");
@@ -280,14 +296,75 @@ impl RpcContext {
         Ok(())
     }
 
+    pub fn add_cron<F: Future<Output = ()> + Send + 'static>(&self, fut: F) -> Guid {
+        let guid = Guid::new();
+        self.crons
+            .mutate(|c| c.insert(guid.clone(), tokio::spawn(fut).into()));
+        guid
+    }
+
     #[instrument(skip_all)]
     pub async fn cleanup_and_initialize(
         &self,
         CleanupInitPhases {
+            mut cleanup_sessions,
             init_services,
             mut check_dependencies,
         }: CleanupInitPhases,
     ) -> Result<(), Error> {
+        cleanup_sessions.start();
+        self.db
+            .mutate(|db| {
+                if db.as_public().as_server_info().as_ntp_synced().de()? {
+                    for id in db.as_private().as_sessions().keys()? {
+                        if Utc::now()
+                            - db.as_private()
+                                .as_sessions()
+                                .as_idx(&id)
+                                .unwrap()
+                                .de()?
+                                .last_active
+                            > TimeDelta::days(30)
+                        {
+                            db.as_private_mut().as_sessions_mut().remove(&id)?;
+                        }
+                    }
+                }
+                Ok(())
+            })
+            .await?;
+        let db = self.db.clone();
+        self.add_cron(async move {
+            loop {
+                tokio::time::sleep(Duration::from_secs(86400)).await;
+                if let Err(e) = db
+                    .mutate(|db| {
+                        if db.as_public().as_server_info().as_ntp_synced().de()? {
+                            for id in db.as_private().as_sessions().keys()? {
+                                if Utc::now()
+                                    - db.as_private()
+                                        .as_sessions()
+                                        .as_idx(&id)
+                                        .unwrap()
+                                        .de()?
+                                        .last_active
+                                    > TimeDelta::days(30)
+                                {
+                                    db.as_private_mut().as_sessions_mut().remove(&id)?;
+                                }
+                            }
+                        }
+                        Ok(())
+                    })
+                    .await
+                {
+                    tracing::error!("Error in session cleanup cron: {e}");
+                    tracing::debug!("{e:?}");
+                }
+            }
+        });
+        cleanup_sessions.complete();
+
         self.services.init(&self, init_services).await?;
         tracing::info!("Initialized Package Managers");
 

From ed1bc6c215c355ce7222f3add4273fe55b9021eb Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:36:57 -0600
Subject: [PATCH 279/341] fix: session display (#2730)

* fixes #2651

* fix display

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>
---
 .../src/app/pages/server-routes/sessions/sessions.page.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
index 2473e6041..f1e7dda6b 100644
--- a/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
@@ -85,14 +85,14 @@ <h2 *ngIf="currentSession.userAgent as agent">{{ agent }}</h2>
           ></ion-icon>
           <ion-label>
             <h1>{{ getPlatformName(session.metadata.platforms) }}</h1>
-            <h2 *ngIf="currentSession.userAgent as agent">{{ agent }}</h2>
+            <h2 *ngIf="session.userAgent as agent">{{ agent }}</h2>
             <p>
               <b>First Seen</b>
-              : {{ currentSession.loggedIn| date : 'medium' }}
+              : {{ session.loggedIn| date : 'medium' }}
             </p>
             <p>
               <b>Last Active</b>
-              : {{ currentSession.lastActive| date : 'medium' }}
+              : {{ session.lastActive| date : 'medium' }}
             </p>
           </ion-label>
           <ion-button

From 66b018a355d218ba5fb1b492920313743b6f0d1f Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Fri, 30 Aug 2024 00:29:27 -0600
Subject: [PATCH 280/341] Fix/health check error (#2731)

* fix: No error's with an error code

* fix dns query

* await resolv.conf copy

* use tty in subcontainer exec if parent is tty

* Fix: Home=root for inject services

* fix: Add the action inject too

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 .../Systems/SystemForEmbassy/MainLoop.ts      | 20 ++++++++++-
 .../Systems/SystemForEmbassy/index.ts         |  7 ++++
 core/Cargo.lock                               | 12 +++++++
 core/startos/Cargo.toml                       |  5 +--
 core/startos/src/net/dns.rs                   | 12 ++-----
 .../src/service/effects/subcontainer/sync.rs  | 34 ++++++++++++++++++-
 sdk/lib/util/SubContainer.ts                  |  3 +-
 7 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index e5aaacfdb..cae3405b9 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -173,10 +173,16 @@ export class MainLoop {
                   subcontainer,
                 }
               )
+            const env: Record<string, string> = actionProcedure.inject
+              ? {
+                  HOME: "/root",
+                }
+              : {}
             const executed = await container.exec(
               [actionProcedure.entrypoint, ...actionProcedure.args],
-              { input: JSON.stringify(timeChanged) },
+              { input: JSON.stringify(timeChanged), env },
             )
+
             if (executed.exitCode === 0) {
               await effects.setHealth({
                 id: healthId,
@@ -227,6 +233,18 @@ export class MainLoop {
               })
               return
             }
+            if (executed.exitCode && executed.exitCode > 0) {
+              await effects.setHealth({
+                id: healthId,
+                name: value.name,
+                result: "failure",
+                message:
+                  executed.stderr.toString() ||
+                  executed.stdout.toString() ||
+                  `Program exited with code ${executed.exitCode}:`,
+              })
+              return
+            }
             await effects.setHealth({
               id: healthId,
               name: value.name,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 1e0c34189..9e6382ca7 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -750,6 +750,12 @@ export class SystemForEmbassy implements System {
       const subcontainer = actionProcedure.inject
         ? this.currentRunning?.mainSubContainerHandle
         : undefined
+
+      const env: Record<string, string> = actionProcedure.inject
+        ? {
+            HOME: "/root",
+          }
+        : {}
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
@@ -769,6 +775,7 @@ export class SystemForEmbassy implements System {
                 JSON.stringify(formData),
               ],
               timeoutMs,
+              { env },
             )
           ).stdout.toString(),
         ),
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 1fccce36d..e9b9330e3 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5144,6 +5144,7 @@ dependencies = [
  "tracing-subscriber",
  "trust-dns-server",
  "ts-rs",
+ "tty-spawn",
  "typed-builder",
  "unix-named-pipe",
  "unshare",
@@ -5886,6 +5887,17 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "tty-spawn"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb91489cf2611235ae8d755d66ab028437980ee573e2230c05af41b136236ad1"
+dependencies = [
+ "anyhow",
+ "nix 0.29.0",
+ "signal-hook",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.21.0"
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index d0228ba31..9b3e7a048 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -39,10 +39,10 @@ path = "src/main.rs"
 
 [features]
 cli = []
-container-runtime = ["procfs", "unshare"]
+container-runtime = ["procfs", "unshare", "tty-spawn"]
 daemon = []
 registry = []
-default = ["cli", "daemon"]
+default = ["cli", "daemon", "registry", "container-runtime"]
 dev = []
 unstable = ["console-subscriber", "tokio/tracing"]
 docker = []
@@ -205,6 +205,7 @@ tracing-journald = "0.3.0"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 trust-dns-server = "0.23.1"
 ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-as" } # "8.1.0"
+tty-spawn = { version = "0.4.0", optional = true }
 typed-builder = "0.18.0"
 which = "6.0.3"
 unix-named-pipe = "0.2.0"
diff --git a/core/startos/src/net/dns.rs b/core/startos/src/net/dns.rs
index 090e845b0..016e5de9f 100644
--- a/core/startos/src/net/dns.rs
+++ b/core/startos/src/net/dns.rs
@@ -98,16 +98,8 @@ impl RequestHandler for Resolver {
                         )
                         .await
                 }
-                a => {
-                    if a != RecordType::AAAA {
-                        tracing::warn!(
-                            "Non A-Record requested for {}: {:?}",
-                            query.name(),
-                            query.query_type()
-                        );
-                    }
-                    let mut res = Header::response_from_request(request.header());
-                    res.set_response_code(ResponseCode::NXDomain);
+                _ => {
+                    let res = Header::response_from_request(request.header());
                     response_handle
                         .send_response(
                             MessageResponseBuilder::from_message_request(&*request).build(
diff --git a/core/startos/src/service/effects/subcontainer/sync.rs b/core/startos/src/service/effects/subcontainer/sync.rs
index e18586a54..f31eb8f62 100644
--- a/core/startos/src/service/effects/subcontainer/sync.rs
+++ b/core/startos/src/service/effects/subcontainer/sync.rs
@@ -2,15 +2,16 @@ use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::ffi::{c_int, OsStr, OsString};
 use std::fs::File;
+use std::io::IsTerminal;
 use std::os::unix::process::CommandExt;
 use std::path::{Path, PathBuf};
 use std::process::{Command as StdCommand, Stdio};
 
 use nix::sched::CloneFlags;
 use nix::unistd::Pid;
-use rpc_toolkit::Context;
 use signal_hook::consts::signal::*;
 use tokio::sync::oneshot;
+use tty_spawn::TtySpawn;
 use unshare::Command as NSCommand;
 
 use crate::service::effects::prelude::*;
@@ -294,6 +295,37 @@ pub fn exec(
         command,
     }: ExecParams,
 ) -> Result<(), Error> {
+    if std::io::stdin().is_terminal() {
+        let mut cmd = TtySpawn::new("/usr/bin/start-cli");
+        cmd.arg("subcontainer").arg("exec-command");
+        if let Some(env) = env {
+            cmd.arg("--env").arg(env);
+        }
+        if let Some(workdir) = workdir {
+            cmd.arg("--workdir").arg(workdir);
+        }
+        if let Some(user) = user {
+            cmd.arg("--user").arg(user);
+        }
+        cmd.arg(&chroot);
+        cmd.args(command.iter());
+        nix::sched::setns(
+            open_file_read(chroot.join("proc/1/ns/pid"))?,
+            CloneFlags::CLONE_NEWPID,
+        )
+        .with_ctx(|_| (ErrorKind::Filesystem, "set pid ns"))?;
+        nix::sched::setns(
+            open_file_read(chroot.join("proc/1/ns/cgroup"))?,
+            CloneFlags::CLONE_NEWCGROUP,
+        )
+        .with_ctx(|_| (ErrorKind::Filesystem, "set cgroup ns"))?;
+        nix::sched::setns(
+            open_file_read(chroot.join("proc/1/ns/ipc"))?,
+            CloneFlags::CLONE_NEWIPC,
+        )
+        .with_ctx(|_| (ErrorKind::Filesystem, "set ipc ns"))?;
+        std::process::exit(cmd.spawn().with_kind(ErrorKind::Filesystem)?);
+    }
     let mut sig = signal_hook::iterator::Signals::new(FWD_SIGNALS)?;
     let (send_pid, recv_pid) = oneshot::channel();
     std::thread::spawn(move || {
diff --git a/sdk/lib/util/SubContainer.ts b/sdk/lib/util/SubContainer.ts
index 0d5982886..bbc5c5f64 100644
--- a/sdk/lib/util/SubContainer.ts
+++ b/sdk/lib/util/SubContainer.ts
@@ -97,7 +97,8 @@ export class SubContainer implements ExecSpawnable {
       shared.push("run")
     }
 
-    fs.copyFile("/etc/resolv.conf", `${rootfs}/etc/resolv.conf`)
+    await fs.mkdir(`${rootfs}/etc`, { recursive: true })
+    await fs.copyFile("/etc/resolv.conf", `${rootfs}/etc/resolv.conf`)
 
     for (const dirPart of shared) {
       const from = `/${dirPart}`

From 9981ee76017ae533d552e606a631fe1a4d42f481 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Tue, 3 Sep 2024 09:23:47 -0600
Subject: [PATCH 281/341] follow sideload progress (#2718)

* follow sideload progress

* small bugfix

* shareReplay with no refcount false

* don't wrap sideload progress in RPCResult

* dont present toast

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/src/install/mod.rs               |  39 ++--
 .../apps-routes/app-show/app-show.module.ts   |   1 +
 .../ui/src/app/pages/init/init.service.ts     |   4 +-
 .../src/app/pages/init/logs/logs.service.ts   |   2 +-
 .../server-routes/sideload/sideload.module.ts |   2 +
 .../server-routes/sideload/sideload.page.html | 195 ++++++++++--------
 .../server-routes/sideload/sideload.page.ts   |  16 +-
 .../sideload/sideload.service.ts              |  32 +++
 .../app/services/api/embassy-api.service.ts   |   4 +-
 .../services/api/embassy-live-api.service.ts  |   7 +-
 .../services/api/embassy-mock-api.service.ts  |  14 +-
 .../src/app/services/marketplace.service.ts   |   7 +-
 .../app/services/patch-db/patch-db-source.ts  |   2 +-
 13 files changed, 200 insertions(+), 125 deletions(-)
 create mode 100644 web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts

diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 7a545a3aa..eefd6eb66 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -17,6 +17,7 @@ use rpc_toolkit::HandlerArgs;
 use rustyline_async::ReadlineEvent;
 use serde::{Deserialize, Serialize};
 use tokio::sync::oneshot;
+use tokio_tungstenite::tungstenite::protocol::frame::coding::CloseCode;
 use tracing::instrument;
 use ts_rs::TS;
 
@@ -188,7 +189,7 @@ pub async fn sideload(
     SideloadParams { session }: SideloadParams,
 ) -> Result<SideloadResponse, Error> {
     let (upload, file) = upload(&ctx, session.clone()).await?;
-    let (err_send, err_recv) = oneshot::channel();
+    let (err_send, err_recv) = oneshot::channel::<Error>();
     let progress = Guid::new();
     let progress_tracker = FullProgressTracker::new();
     let mut progress_listener = progress_tracker.stream(Some(Duration::from_millis(200)));
@@ -202,12 +203,14 @@ pub async fn sideload(
                     use axum::extract::ws::Message;
                     async move {
                         if let Err(e) = async {
-                            type RpcResponse = rpc_toolkit::yajrc::RpcResponse::<GenericRpcMethod<&'static str, (), FullProgress>>;
+                            type RpcResponse = rpc_toolkit::yajrc::RpcResponse<
+                                GenericRpcMethod<&'static str, (), FullProgress>,
+                            >;
                             tokio::select! {
                                 res = async {
                                     while let Some(progress) = progress_listener.next().await {
                                         ws.send(Message::Text(
-                                            serde_json::to_string(&RpcResponse::from_result::<RpcError>(Ok(progress)))
+                                            serde_json::to_string(&progress)
                                                 .with_kind(ErrorKind::Serialization)?,
                                         ))
                                         .await
@@ -217,12 +220,8 @@ pub async fn sideload(
                                 } => res?,
                                 err = err_recv => {
                                     if let Ok(e) = err {
-                                        ws.send(Message::Text(
-                                            serde_json::to_string(&RpcResponse::from_result::<RpcError>(Err(e)))
-                                            .with_kind(ErrorKind::Serialization)?,
-                                        ))
-                                        .await
-                                        .with_kind(ErrorKind::Network)?;
+                                        ws.close_result(Err::<&str, _>(e.clone_output())).await?;
+                                        return Err(e)
                                     }
                                 }
                             }
@@ -260,7 +259,7 @@ pub async fn sideload(
         }
         .await
         {
-            let _ = err_send.send(RpcError::from(e.clone_output()));
+            let _ = err_send.send(e.clone_output());
             tracing::error!("Error sideloading package: {e}");
             tracing::debug!("{e:?}");
         }
@@ -407,19 +406,21 @@ pub async fn cli_install(
 
                 let mut progress = FullProgress::new();
 
-                type RpcResponse = rpc_toolkit::yajrc::RpcResponse<
-                    GenericRpcMethod<&'static str, (), FullProgress>,
-                >;
-
                 loop {
                     tokio::select! {
                         msg = ws.next() => {
                             if let Some(msg) = msg {
-                                if let Message::Text(t) = msg.with_kind(ErrorKind::Network)? {
-                                    progress =
-                                        serde_json::from_str::<RpcResponse>(&t)
-                                            .with_kind(ErrorKind::Deserialization)?.result?;
-                                    bar.update(&progress);
+                                match msg.with_kind(ErrorKind::Network)? {
+                                    Message::Text(t) => {
+                                        progress =
+                                            serde_json::from_str::<FullProgress>(&t)
+                                                .with_kind(ErrorKind::Deserialization)?;
+                                        bar.update(&progress);
+                                    }
+                                    Message::Close(Some(c)) if c.code != CloseCode::Normal => {
+                                        return Err(Error::new(eyre!("{}", c.reason), ErrorKind::Network))
+                                    }
+                                    _ => (),
                                 }
                             } else {
                                 break;
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
index 8db082f42..a3c6cc584 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
@@ -56,5 +56,6 @@ const routes: Routes = [
     StatusComponentModule,
     SharedPipesModule,
   ],
+  exports: [AppShowProgressComponent],
 })
 export class AppShowPageModule {}
diff --git a/web/projects/ui/src/app/pages/init/init.service.ts b/web/projects/ui/src/app/pages/init/init.service.ts
index c98c0b11c..c58e7777e 100644
--- a/web/projects/ui/src/app/pages/init/init.service.ts
+++ b/web/projects/ui/src/app/pages/init/init.service.ts
@@ -29,9 +29,7 @@ export class InitService extends Observable<MappedProgress> {
     from(this.api.initGetProgress()),
   ).pipe(
     switchMap(({ guid, progress }) =>
-      this.api
-        .openWebsocket$<T.FullProgress>(guid, {})
-        .pipe(startWith(progress)),
+      this.api.openWebsocket$<T.FullProgress>(guid).pipe(startWith(progress)),
     ),
     map(({ phases, overall }) => {
       return {
diff --git a/web/projects/ui/src/app/pages/init/logs/logs.service.ts b/web/projects/ui/src/app/pages/init/logs/logs.service.ts
index 2553e9872..7ff3cecd1 100644
--- a/web/projects/ui/src/app/pages/init/logs/logs.service.ts
+++ b/web/projects/ui/src/app/pages/init/logs/logs.service.ts
@@ -38,7 +38,7 @@ export class LogsService extends Observable<readonly string[]> {
   private readonly log$ = defer(() =>
     this.api.initFollowLogs({ boot: 0 }),
   ).pipe(
-    switchMap(({ guid }) => this.api.openWebsocket$<Log>(guid, {})),
+    switchMap(({ guid }) => this.api.openWebsocket$<Log>(guid)),
     bufferTime(500),
     filter(logs => !!logs.length),
     map(convertAnsi),
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts
index 27a3757dd..27574da83 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts
@@ -5,6 +5,7 @@ import { SideloadPage } from './sideload.page'
 import { Routes, RouterModule } from '@angular/router'
 import { ExverPipesModule, SharedPipesModule } from '@start9labs/shared'
 import { DragNDropDirective } from './dnd.directive'
+import { InstallingProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
 
 const routes: Routes = [
   {
@@ -20,6 +21,7 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     SharedPipesModule,
     ExverPipesModule,
+    InstallingProgressPipeModule,
   ],
   declarations: [SideloadPage, DragNDropDirective],
 })
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
index 0d413075e..abbb9128a 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
@@ -7,92 +7,121 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content class="ion-text-center with-widgets">
+<ion-content class="ion-text-center ion-padding with-widgets">
+  <ng-container *ngIf="progress$ | async as progress; else noProgress">
+    <ng-container *ngFor="let phase of progress.phases">
+      <p>
+        {{ phase.name }}
+        <span *ngIf="phase.progress | installingProgress as progress">
+          : {{ progress }}%
+        </span>
+      </p>
+      <ion-progress-bar
+        [type]="
+          phase.progress === false ||
+          (phase.progress !== true &&
+            phase.progress !== null &&
+            !phase.progress.total)
+            ? 'indeterminate'
+            : 'determinate'
+        "
+        [color]="phase.progress === true ? 'success' : 'secondary'"
+        [value]="(phase.progress | installingProgress) / 100"
+      ></ion-progress-bar>
+    </ng-container>
+  </ng-container>
+
   <!-- file upload -->
-  <div
-    *ngIf="!toUpload.file; else fileUploaded"
-    class="drop-area"
-    [class.drop-area_mobile]="isMobile"
-    appDnd
-    (onFileDropped)="handleFileDrop($event)"
-  >
-    <ion-icon
-      name="cloud-upload-outline"
-      color="dark"
-      style="font-size: 42px"
-    ></ion-icon>
-    <h4>Upload .s9pk package file</h4>
-    <p *ngIf="onTor">
-      <ion-text color="success">
-        Tip: switch to LAN for faster uploads.
-      </ion-text>
-    </p>
-    <ion-button color="primary" type="file" class="ion-margin-top">
-      <label for="upload-photo">Browse</label>
-      <input
-        type="file"
-        style="position: absolute; opacity: 0; height: 100%"
-        id="upload-photo"
-        (change)="handleFileInput($event)"
-      />
-    </ion-button>
-  </div>
-  <!-- file uploaded -->
-  <ng-template #fileUploaded>
-    <div class="drop-area_filled">
-      <h4>
-        <ion-icon
-          *ngIf="uploadState?.invalid"
-          name="close-circle-outline"
-          color="danger"
-          class="inline"
-        ></ion-icon>
-        <ion-icon
-          *ngIf="!uploadState?.invalid"
-          class="inline"
-          name="checkmark-circle-outline"
-          color="success"
-        ></ion-icon>
-        {{ uploadState?.message }}
-      </h4>
-      <div class="box" *ngIf="toUpload.icon && toUpload.manifest">
-        <div class="card">
-          <div class="row row_end">
-            <ion-button
-              style="
-                --background-hover: transparent;
-                --padding-end: 0px;
-                --padding-start: 0px;
-              "
-              fill="clear"
-              size="small"
-              (click)="clearToUpload()"
-            >
-              <ion-icon slot="icon-only" name="close" color="danger"></ion-icon>
-            </ion-button>
-          </div>
-          <div class="row">
-            <img
-              [alt]="toUpload.manifest.title + ' Icon'"
-              [src]="toUpload.icon | trustUrl"
-            />
-            <h2>{{ toUpload.manifest.title }}</h2>
-            <p>{{ toUpload.manifest.version }}</p>
+  <ng-template #noProgress>
+    <div
+      *ngIf="!toUpload.file; else fileReady"
+      class="drop-area"
+      [class.drop-area_mobile]="isMobile"
+      appDnd
+      (onFileDropped)="handleFileDrop($event)"
+    >
+      <ion-icon
+        name="cloud-upload-outline"
+        color="dark"
+        style="font-size: 42px"
+      ></ion-icon>
+      <h4>Upload .s9pk package file</h4>
+      <p *ngIf="onTor">
+        <ion-text color="success">
+          Tip: switch to LAN for faster uploads.
+        </ion-text>
+      </p>
+      <ion-button color="primary" type="file" class="ion-margin-top">
+        <label for="upload-photo">Browse</label>
+        <input
+          type="file"
+          style="position: absolute; opacity: 0; height: 100%"
+          id="upload-photo"
+          (change)="handleFileInput($event)"
+        />
+      </ion-button>
+    </div>
+    <!-- file uploaded -->
+    <ng-template #fileReady>
+      <div class="drop-area_filled">
+        <h4>
+          <ion-icon
+            *ngIf="uploadState?.invalid"
+            name="close-circle-outline"
+            color="danger"
+            class="inline"
+          ></ion-icon>
+          <ion-icon
+            *ngIf="!uploadState?.invalid"
+            class="inline"
+            name="checkmark-circle-outline"
+            color="success"
+          ></ion-icon>
+          {{ uploadState?.message }}
+        </h4>
+        <div class="box" *ngIf="toUpload.icon && toUpload.manifest">
+          <div class="card">
+            <div class="row row_end">
+              <ion-button
+                style="
+                  --background-hover: transparent;
+                  --padding-end: 0px;
+                  --padding-start: 0px;
+                "
+                fill="clear"
+                size="small"
+                (click)="clearToUpload()"
+              >
+                <ion-icon
+                  slot="icon-only"
+                  name="close"
+                  color="danger"
+                ></ion-icon>
+              </ion-button>
+            </div>
+            <div class="row">
+              <img
+                [alt]="toUpload.manifest.title + ' Icon'"
+                [src]="toUpload.icon | trustUrl"
+              />
+              <h2>{{ toUpload.manifest.title }}</h2>
+              <p>{{ toUpload.manifest.version }}</p>
+            </div>
           </div>
         </div>
-      </div>
-      <ion-button
-        *ngIf="!toUpload.icon && !toUpload.manifest; else uploadButton"
-        color="primary"
-        (click)="clearToUpload()"
-      >
-        Try again
-      </ion-button>
-      <ng-template #uploadButton>
-        <ion-button color="primary" (click)="handleUpload()">
-          Upload & Install
+        <ion-button
+          *ngIf="!toUpload.icon && !toUpload.manifest; else uploadButton"
+          color="primary"
+          (click)="clearToUpload()"
+        >
+          Try again
         </ion-button>
-      </ng-template>
-    </div>
+        <ng-template #uploadButton>
+          <ion-button color="primary" (click)="handleUpload()">
+            Upload & Install
+          </ion-button>
+        </ng-template>
+      </div>
+    </ng-template>
   </ng-template>
 </ion-content>
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index b95c4599f..b5f684103 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -1,10 +1,12 @@
 import { Component } from '@angular/core'
-import { isPlatform, NavController } from '@ionic/angular'
+import { isPlatform } from '@ionic/angular'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { S9pk, T } from '@start9labs/start-sdk'
+import { S9pk } from '@start9labs/start-sdk'
 import cbor from 'cbor'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
+import { SideloadService } from './sideload.service'
+import { firstValueFrom } from 'rxjs'
 
 interface Positions {
   [key: string]: [bigint, bigint] // [position, length]
@@ -36,12 +38,14 @@ export class SideloadPage {
     message: string
   }
 
+  readonly progress$ = this.sideloadService.progress$
+
   constructor(
     private readonly loader: LoadingService,
     private readonly api: ApiService,
-    private readonly navCtrl: NavController,
     private readonly errorService: ErrorService,
     private readonly config: ConfigService,
+    private readonly sideloadService: SideloadService,
   ) {}
 
   handleFileDrop(e: any) {
@@ -111,15 +115,15 @@ export class SideloadPage {
   }
 
   async handleUpload() {
-    const loader = this.loader.open('Uploading package').subscribe()
+    const loader = this.loader.open('Starting upload').subscribe()
 
     try {
       const res = await this.api.sideloadPackage()
+      this.sideloadService.followProgress(res.progress)
       this.api
         .uploadPackage(res.upload, this.toUpload.file!)
         .catch(e => console.error(e))
-
-      this.navCtrl.navigateRoot('/services')
+      await firstValueFrom(this.sideloadService.websocketConnected$)
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
new file mode 100644
index 000000000..79f871bba
--- /dev/null
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core'
+import { T } from '@start9labs/start-sdk'
+import { endWith, ReplaySubject, shareReplay, Subject, switchMap } from 'rxjs'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SideloadService {
+  private readonly guid$ = new Subject<string>()
+
+  readonly websocketConnected$ = new ReplaySubject()
+
+  readonly progress$ = this.guid$.pipe(
+    switchMap(guid =>
+      this.api
+        .openWebsocket$<T.FullProgress>(guid, {
+          openObserver: {
+            next: () => this.websocketConnected$.next(''),
+          },
+        })
+        .pipe(endWith(null)),
+    ),
+    shareReplay(1),
+  )
+
+  constructor(private readonly api: ApiService) {}
+
+  followProgress(guid: string) {
+    this.guid$.next(guid)
+  }
+}
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index acd6780d1..31e3ac86e 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -12,7 +12,7 @@ export abstract class ApiService {
   // http
 
   // for sideloading packages
-  abstract uploadPackage(guid: string, body: Blob): Promise<string>
+  abstract uploadPackage(guid: string, body: Blob): Promise<void>
 
   // for getting static files: ex icons, instructions, licenses
   abstract getStaticProxy(
@@ -29,7 +29,7 @@ export abstract class ApiService {
 
   abstract openWebsocket$<T>(
     guid: string,
-    config: RR.WebsocketConfig<T>,
+    config?: RR.WebsocketConfig<T>,
   ): Observable<T>
 
   // state
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 324936e8d..48cf6edd3 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -43,12 +43,11 @@ export class LiveApiService extends ApiService {
 
   // for sideloading packages
 
-  async uploadPackage(guid: string, body: Blob): Promise<string> {
-    return this.httpRequest({
+  async uploadPackage(guid: string, body: Blob): Promise<void> {
+    await this.httpRequest({
       method: Method.POST,
       body,
       url: `/rest/rpc/${guid}`,
-      responseType: 'text',
     })
   }
 
@@ -86,7 +85,7 @@ export class LiveApiService extends ApiService {
 
   openWebsocket$<T>(
     guid: string,
-    config: RR.WebsocketConfig<T>,
+    config: RR.WebsocketConfig<T> = {},
   ): Observable<T> {
     const { location } = this.document.defaultView!
     const protocol = location.protocol === 'http:' ? 'ws' : 'wss'
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index d44ef809a..a40f29a0a 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -81,9 +81,8 @@ export class MockApiService extends ApiService {
       .subscribe()
   }
 
-  async uploadPackage(guid: string, body: Blob): Promise<string> {
+  async uploadPackage(guid: string, body: Blob): Promise<void> {
     await pauseFor(2000)
-    return 'success'
   }
 
   async getStaticProxy(
@@ -106,7 +105,7 @@ export class MockApiService extends ApiService {
 
   openWebsocket$<T>(
     guid: string,
-    config: RR.WebsocketConfig<T>,
+    config: RR.WebsocketConfig<T> = {},
   ): Observable<T> {
     if (guid === 'db-guid') {
       return this.mockWsSource$.pipe<any>(
@@ -125,6 +124,11 @@ export class MockApiService extends ApiService {
       return from(this.initProgress()).pipe(
         startWith(PROGRESS),
       ) as Observable<T>
+    } else if (guid === 'sideload-progress-guid') {
+      config.openObserver?.next(new Event(''))
+      return from(this.initProgress()).pipe(
+        startWith(PROGRESS),
+      ) as Observable<T>
     } else {
       throw new Error('invalid guid type')
     }
@@ -1079,8 +1083,8 @@ export class MockApiService extends ApiService {
   async sideloadPackage(): Promise<RR.SideloadPackageRes> {
     await pauseFor(2000)
     return {
-      upload: '4120e092-05ab-4de2-9fbd-c3f1f4b1df9e', // no significance, randomly generated
-      progress: '5120e092-05ab-4de2-9fbd-c3f1f4b1df9e', // no significance, randomly generated
+      upload: 'sideload-upload-guid', // no significance, randomly generated
+      progress: 'sideload-progress-guid', // no significance, randomly generated
     }
   }
 
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index bef380aea..bc2dcc7ab 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -285,7 +285,12 @@ export class MarketplaceService implements AbstractMarketplaceService {
       this.api.getRegistryPackage(url, id, version ? `=${version}` : null),
     ).pipe(
       map(pkgInfo =>
-        this.convertToMarketplacePkg(id, version, flavor, pkgInfo),
+        this.convertToMarketplacePkg(
+          id,
+          version === '*' ? null : version,
+          flavor,
+          pkgInfo,
+        ),
       ),
     )
   }
diff --git a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
index 00ab3d43e..5d1f1ed51 100644
--- a/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
+++ b/web/projects/ui/src/app/services/patch-db/patch-db-source.ts
@@ -33,7 +33,7 @@ export class PatchDbSource extends Observable<Update<DataModel>[]> {
   private readonly stream$ = inject(AuthService).isVerified$.pipe(
     switchMap(verified => (verified ? this.api.subscribeToPatchDB({}) : EMPTY)),
     switchMap(({ dump, guid }) =>
-      this.api.openWebsocket$<Revision>(guid, {}).pipe(
+      this.api.openWebsocket$<Revision>(guid).pipe(
         bufferTime(250),
         filter(revisions => !!revisions.length),
         startWith([dump]),

From ae88f7d181a3dd4a4ff333e6a87c06bc5737cbf8 Mon Sep 17 00:00:00 2001
From: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Date: Thu, 12 Sep 2024 11:51:19 -0400
Subject: [PATCH 282/341] add types

---
 .../src/app/services/marketplace.service.ts   | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index bc2dcc7ab..4c8ab98a6 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -42,7 +42,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
   private readonly knownHosts$: Observable<StoreIdentity[]> = this.patch
     .watch$('ui', 'marketplace', 'knownHosts')
     .pipe(
-      map(hosts => {
+      map((hosts: { [url: string]: UIStore }) => {
         const { start9, community } = this.config.marketplace
         let arr = [
           toStoreIdentity(start9, hosts[start9]),
@@ -81,31 +81,35 @@ export class MarketplaceService implements AbstractMarketplaceService {
       shareReplay({ bufferSize: 1, refCount: true }),
     )
 
-  private readonly marketplace$ = this.knownHosts$.pipe(
-    startWith<StoreIdentity[]>([]),
-    pairwise(),
-    mergeMap(([prev, curr]) =>
-      curr.filter(c => !prev.find(p => sameUrl(c.url, p.url))),
-    ),
-    mergeMap(({ url, name }) =>
-      this.fetchStore$(url).pipe(
-        tap(data => {
-          if (data?.info.name) this.updateStoreName(url, name, data.info.name)
-        }),
-        map<StoreData | null, [string, StoreData | null]>(data => [url, data]),
-        startWith<[string, StoreData | null]>([url, null]),
+  private readonly marketplace$: Observable<Marketplace> =
+    this.knownHosts$.pipe(
+      startWith<StoreIdentity[]>([]),
+      pairwise(),
+      mergeMap(([prev, curr]) =>
+        curr.filter(c => !prev.find(p => sameUrl(c.url, p.url))),
       ),
-    ),
-    scan<[string, StoreData | null], Record<string, StoreData | null>>(
-      (requests, [url, store]) => {
-        requests[url] = store
+      mergeMap(({ url, name }) =>
+        this.fetchStore$(url).pipe(
+          tap(data => {
+            if (data?.info.name) this.updateStoreName(url, name, data.info.name)
+          }),
+          map<StoreData | null, [string, StoreData | null]>(data => [
+            url,
+            data,
+          ]),
+          startWith<[string, StoreData | null]>([url, null]),
+        ),
+      ),
+      scan<[string, StoreData | null], Record<string, StoreData | null>>(
+        (requests, [url, store]) => {
+          requests[url] = store
 
-        return requests
-      },
-      {},
-    ),
-    shareReplay({ bufferSize: 1, refCount: true }),
-  )
+          return requests
+        },
+        {},
+      ),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    )
 
   private readonly filteredMarketplace$ = combineLatest([
     this.clientStorageService.showDevTools$,

From 21dd08544b3454f65675d49a4bc5a7a3787f8e4f Mon Sep 17 00:00:00 2001
From: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Date: Thu, 12 Sep 2024 11:55:10 -0400
Subject: [PATCH 283/341] update version to clear refresh alert

---
 web/projects/ui/src/app/services/api/mock-patch.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index ba2966b7f..34804fbc6 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -1,6 +1,7 @@
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { Mock } from './api.fixures'
 import { BUILT_IN_WIDGETS } from '../../pages/widgets/built-in/widgets'
+const version = require('../../../../../../package.json').version
 
 export const mockPatchData: DataModel = {
   ui: {
@@ -37,7 +38,7 @@ export const mockPatchData: DataModel = {
     arch: 'x86_64',
     onionAddress: 'myveryownspecialtoraddress',
     id: 'abcdefgh',
-    version: '0.3.6',
+    version,
     lastBackup: new Date(new Date().valueOf() - 604800001).toISOString(),
     lanAddress: 'https://adjective-noun.local',
     torAddress: 'https://myveryownspecialtoraddress.onion',

From 27416efb6df06c44e22ccf668a6ccc01f80e969c Mon Sep 17 00:00:00 2001
From: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Date: Thu, 12 Sep 2024 11:55:54 -0400
Subject: [PATCH 284/341] only display alt implementations if no flavors

---
 .../marketplace-show/marketplace-show.page.ts       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
index 018ddbb64..d2af27efc 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
@@ -51,15 +51,14 @@ export class MarketplaceShowPage {
 
   readonly flavors$ = this.route.queryParamMap.pipe(
     switchMap(paramMap =>
-      this.marketplaceService
-        .getSelectedStore$()
-        .pipe(
-          map(s =>
-            s.packages.filter(
-              p => p.id === this.pkgId && p.flavor !== paramMap.get('flavor'),
-            ),
+      this.marketplaceService.getSelectedStore$().pipe(
+        map(s =>
+          s.packages.filter(
+            p => p.id === this.pkgId && p.flavor !== paramMap.get('flavor'),
           ),
         ),
+        filter(p => p.length > 0),
+      ),
     ),
   )
 

From dbbc42c5fdab7f729b6454f628206a0949483d20 Mon Sep 17 00:00:00 2001
From: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:03:01 -0400
Subject: [PATCH 285/341] update packages

---
 web/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index ac1f77a6b..7ceeb4399 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6",
+  "version": "0.3.6-alpha.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "startos-ui",
-      "version": "0.3.6",
+      "version": "0.3.6-alpha.5",
       "license": "MIT",
       "dependencies": {
         "@angular/animations": "^14.1.0",
@@ -116,7 +116,7 @@
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha5",
+      "version": "0.3.6-alpha8",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",

From 47855dc78bc68856bce8caa52a8110bebaca75ee Mon Sep 17 00:00:00 2001
From: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:46:09 -0400
Subject: [PATCH 286/341] remove explicit type

---
 web/projects/ui/src/app/services/marketplace.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index 4c8ab98a6..a080f051d 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -42,7 +42,7 @@ export class MarketplaceService implements AbstractMarketplaceService {
   private readonly knownHosts$: Observable<StoreIdentity[]> = this.patch
     .watch$('ui', 'marketplace', 'knownHosts')
     .pipe(
-      map((hosts: { [url: string]: UIStore }) => {
+      map(hosts => {
         const { start9, community } = this.config.marketplace
         let arr = [
           toStoreIdentity(start9, hosts[start9]),

From eec5cf6b65649006698b8e15b696d12e14624218 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 20 Sep 2024 15:38:16 -0600
Subject: [PATCH 287/341] add support for remote attaching to container (#2732)

* add support for remote attaching to container

* feature: Add in the subcontainer searching

* feat: Add in the name/ imageId filtering

* Feat: Fix the env and the workdir

* chore: Make the sigkill first?

* add some extra guard on term

* fix: Health during error doesnt return what we need

* chore: Cleanup for pr

* fix build

* fix build

* Update startos-iso.yaml

* Update startos-iso.yaml

* Update startos-iso.yaml

* Update startos-iso.yaml

* Update startos-iso.yaml

* Update startos-iso.yaml

* Update startos-iso.yaml

* check status during build

---------

Co-authored-by: J H <dragondef@gmail.com>
---
 .github/workflows/startos-iso.yaml            |  21 +-
 Makefile                                      |  67 +--
 build/dpkg-deps/depends                       |   1 +
 .../src/Adapters/EffectCreator.ts             |   2 +-
 container-runtime/src/Adapters/RpcListener.ts |   6 +-
 .../DockerProcedureContainer.ts               |   9 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |  34 +-
 .../Systems/SystemForEmbassy/index.ts         |  81 ++-
 .../SystemForEmbassy/polyfillEffects.ts       |   1 +
 core/Cargo.lock                               |  44 +-
 core/startos/Cargo.toml                       |   4 +-
 core/startos/src/auth.rs                      |   8 +-
 core/startos/src/context/rpc.rs               |   6 +-
 core/startos/src/db/mod.rs                    |   2 +-
 core/startos/src/install/mod.rs               |   2 +-
 core/startos/src/lib.rs                       |   7 +
 core/startos/src/middleware/auth.rs           |   2 +-
 .../src/service/effects/subcontainer/mod.rs   |  21 +-
 .../src/service/effects/subcontainer/sync.rs  | 192 ++++---
 core/startos/src/service/mod.rs               | 517 +++++++++++++++++-
 .../src/service/persistent_container.rs       |  17 +-
 core/startos/src/upload.rs                    |   2 +-
 core/startos/src/util/io.rs                   |  34 +-
 sdk/lib/StartSdk.ts                           |   1 +
 sdk/lib/mainFn/CommandController.ts           |  17 +-
 sdk/lib/mainFn/Daemon.ts                      |   1 +
 sdk/lib/mainFn/Daemons.ts                     |   1 +
 .../osBindings/CreateSubcontainerFsParams.ts  |   5 +-
 sdk/lib/osBindings/SessionList.ts             |   2 +-
 sdk/lib/types.ts                              |   5 +-
 sdk/lib/util/SubContainer.ts                  |   9 +-
 31 files changed, 852 insertions(+), 269 deletions(-)

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index bc0fb626e..3497624e7 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -78,7 +78,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: "3.x"
 
       - uses: actions/setup-node@v4
         with:
@@ -156,7 +156,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: "3.x"
 
       - name: Install dependencies
         run: |
@@ -187,11 +187,24 @@ jobs:
         run: |
           mkdir -p web/node_modules
           mkdir -p web/dist/raw
-          touch core/startos/bindings
-          touch sdk/lib/osBindings
+          mkdir -p container-runtime/node_modules
           mkdir -p container-runtime/dist
+          mkdir -p container-runtime/dist/node_modules
+          mkdir -p core/startos/bindings
+          mkdir -p sdk/dist
+          mkdir -p patch-db/client/node_modules
+          mkdir -p patch-db/client/dist
+          mkdir -p web/.angular
+          mkdir -p web/dist/raw/ui
+          mkdir -p web/dist/raw/install-wizard
+          mkdir -p web/dist/raw/setup-wizard
+          mkdir -p web/dist/static/ui
+          mkdir -p web/dist/static/install-wizard
+          mkdir -p web/dist/static/setup-wizard
           PLATFORM=${{ matrix.platform }} make -t compiled-${{ env.ARCH }}.tar
 
+      - run: git status
+
       - name: Run iso build
         run: PLATFORM=${{ matrix.platform }} make iso
         if: ${{ matrix.platform != 'raspberrypi' }}
diff --git a/Makefile b/Makefile
index a714cd389..d085117b2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ BASENAME := $(shell ./basename.sh)
 PLATFORM := $(shell if [ -f ./PLATFORM.txt ]; then cat ./PLATFORM.txt; else echo unknown; fi)
 ARCH := $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo aarch64; else echo $(PLATFORM) | sed 's/-nonfree$$//g'; fi)
 IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo iso; fi)
-WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/install-wizard
+WEB_UIS := web/dist/raw/ui/index.html web/dist/raw/setup-wizard/index.html web/dist/raw/install-wizard/index.html
+COMPRESSED_WEB_UIS := web/dist/static/ui/index.html web/dist/static/setup-wizard/index.html web/dist/static/install-wizard/index.html
 FIRMWARE_ROMS := ./firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json)
 BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts $(FIRMWARE_ROMS)
 DEBIAN_SRC := $(shell git ls-files debian/)
@@ -16,7 +17,7 @@ COMPAT_SRC := $(shell git ls-files system-images/compat/)
 UTILS_SRC := $(shell git ls-files system-images/utils/)
 BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
 CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) $(GIT_HASH_FILE)
-WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist web/patchdb-ui-seed.json sdk/dist
+WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist/index.js web/patchdb-ui-seed.json sdk/dist/package.json
 WEB_UI_SRC := $(shell git ls-files web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
 WEB_INSTALL_WIZARD_SRC := $(shell git ls-files web/projects/install-wizard)
@@ -57,7 +58,7 @@ touch:
 metadata: $(VERSION_FILE) $(PLATFORM_FILE) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE)
 
 sudo:
-	sudo true
+	sudo -v
 
 clean:
 	rm -f system-images/**/*.tar
@@ -94,10 +95,10 @@ test: | test-core test-sdk test-container-runtime
 test-core: $(CORE_SRC) $(ENVIRONMENT_FILE) 
 	./core/run-tests.sh
 
-test-sdk: $(shell git ls-files sdk) sdk/lib/osBindings
+test-sdk: $(shell git ls-files sdk) sdk/lib/osBindings/index.ts
 	cd sdk && make test
 
-test-container-runtime: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
+test-container-runtime: container-runtime/node_modules/.package-lock.json $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
 	cd container-runtime && npm test
 
 cli:
@@ -218,34 +219,34 @@ upload-ota: results/$(BASENAME).squashfs
 container-runtime/debian.$(ARCH).squashfs:
 	ARCH=$(ARCH) ./container-runtime/download-base-image.sh
 
-container-runtime/node_modules: container-runtime/package.json container-runtime/package-lock.json sdk/dist
+container-runtime/node_modules/.package-lock.json: container-runtime/package.json container-runtime/package-lock.json sdk/dist/package.json
 	npm --prefix container-runtime ci
-	touch container-runtime/node_modules
+	touch container-runtime/node_modules/.package-lock.json
 
-sdk/lib/osBindings: core/startos/bindings
-	mkdir -p sdk/lib/osBindings
-	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1";/g' > core/startos/bindings/index.ts
-	npm --prefix sdk exec -- prettier --config ./sdk/package.json -w ./core/startos/bindings/*.ts
+sdk/lib/osBindings/index.ts: core/startos/bindings/index.ts
 	rsync -ac --delete core/startos/bindings/ sdk/lib/osBindings/
-	touch sdk/lib/osBindings
+	touch sdk/lib/osBindings/index.ts
 
-core/startos/bindings: $(shell git ls-files core) $(ENVIRONMENT_FILE)
+core/startos/bindings/index.ts: $(shell git ls-files core) $(ENVIRONMENT_FILE)
 	rm -rf core/startos/bindings
 	./core/build-ts.sh
-	touch core/startos/bindings
+	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1";/g' > core/startos/bindings/index.ts
+	npm --prefix sdk exec -- prettier --config ./sdk/package.json -w ./core/startos/bindings/*.ts
+	touch core/startos/bindings/index.ts
 
-sdk/dist: $(shell git ls-files sdk) sdk/lib/osBindings
+sdk/dist/package.json: $(shell git ls-files sdk) sdk/lib/osBindings/index.ts
 	(cd sdk && make bundle)
+	touch sdk/dist/package.json
 
 # TODO: make container-runtime its own makefile?
-container-runtime/dist/index.js: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
+container-runtime/dist/index.js: container-runtime/node_modules/.package-lock.json $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
 	npm --prefix container-runtime run build
 
-container-runtime/dist/node_modules container-runtime/dist/package.json container-runtime/dist/package-lock.json: container-runtime/package.json container-runtime/package-lock.json sdk/dist container-runtime/install-dist-deps.sh
+container-runtime/dist/node_modules/.package-lock.json container-runtime/dist/package.json container-runtime/dist/package-lock.json: container-runtime/package.json container-runtime/package-lock.json sdk/dist/package.json container-runtime/install-dist-deps.sh
 	./container-runtime/install-dist-deps.sh
-	touch container-runtime/dist/node_modules
+	touch container-runtime/dist/node_modules/.package-lock.json
 
-container-runtime/rootfs.$(ARCH).squashfs: container-runtime/debian.$(ARCH).squashfs container-runtime/container-runtime.service container-runtime/update-image.sh container-runtime/deb-install.sh container-runtime/dist/index.js container-runtime/dist/node_modules core/target/$(ARCH)-unknown-linux-musl/release/containerbox | sudo
+container-runtime/rootfs.$(ARCH).squashfs: container-runtime/debian.$(ARCH).squashfs container-runtime/container-runtime.service container-runtime/update-image.sh container-runtime/deb-install.sh container-runtime/dist/index.js container-runtime/dist/node_modules/.package-lock.json core/target/$(ARCH)-unknown-linux-musl/release/containerbox | sudo
 	ARCH=$(ARCH) ./container-runtime/update-image.sh
 
 build/lib/depends build/lib/conflicts: build/dpkg-deps/*
@@ -263,7 +264,7 @@ system-images/utils/docker-images/$(ARCH).tar: $(UTILS_SRC)
 system-images/binfmt/docker-images/$(ARCH).tar: $(BINFMT_SRC)
 	cd system-images/binfmt && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar
 
-core/target/$(ARCH)-unknown-linux-musl/release/startbox: $(CORE_SRC) web/dist/static web/patchdb-ui-seed.json $(ENVIRONMENT_FILE)
+core/target/$(ARCH)-unknown-linux-musl/release/startbox: $(CORE_SRC) $(COMPRESSED_WEB_UIS) web/patchdb-ui-seed.json $(ENVIRONMENT_FILE)
 	ARCH=$(ARCH) ./core/build-startbox.sh
 	touch core/target/$(ARCH)-unknown-linux-musl/release/startbox
 
@@ -271,27 +272,28 @@ core/target/$(ARCH)-unknown-linux-musl/release/containerbox: $(CORE_SRC) $(ENVIR
 	ARCH=$(ARCH) ./core/build-containerbox.sh
 	touch core/target/$(ARCH)-unknown-linux-musl/release/containerbox
 
-web/node_modules/.package-lock.json: web/package.json sdk/dist
+web/node_modules/.package-lock.json: web/package.json sdk/dist/package.json
 	npm --prefix web ci
 	touch web/node_modules/.package-lock.json
 
-web/.angular: patch-db/client/dist sdk/dist web/node_modules/.package-lock.json
+web/.angular/.updated: patch-db/client/dist/index.js sdk/dist/package.json web/node_modules/.package-lock.json
 	rm -rf web/.angular
 	mkdir -p web/.angular
+	touch web/.angular/.updated
 
-web/dist/raw/ui: $(WEB_UI_SRC) $(WEB_SHARED_SRC) web/.angular
+web/dist/raw/ui/index.html: $(WEB_UI_SRC) $(WEB_SHARED_SRC) web/.angular/.updated
 	npm --prefix web run build:ui
-	touch web/dist/raw/ui
+	touch web/dist/raw/ui/index.html
 
-web/dist/raw/setup-wizard: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular
+web/dist/raw/setup-wizard/index.html: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular/.updated
 	npm --prefix web run build:setup
-	touch web/dist/raw/setup-wizard
+	touch web/dist/raw/setup-wizard/index.html
 
-web/dist/raw/install-wizard: $(WEB_INSTALL_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular
+web/dist/raw/install-wizard/index.html: $(WEB_INSTALL_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular/.updated
 	npm --prefix web run build:install-wiz
-	touch web/dist/raw/install-wizard
+	touch web/dist/raw/install-wizard/index.html
 
-web/dist/static: $(WEB_UIS) $(ENVIRONMENT_FILE)
+$(COMPRESSED_WEB_UIS): $(WEB_UIS) $(ENVIRONMENT_FILE)
 	./compress-uis.sh
 
 web/config.json: $(GIT_HASH_FILE) web/config-sample.json
@@ -301,13 +303,14 @@ web/patchdb-ui-seed.json: web/package.json
 	jq '."ack-welcome" = $(shell jq '.version' web/package.json)' web/patchdb-ui-seed.json > ui-seed.tmp
 	mv ui-seed.tmp web/patchdb-ui-seed.json
 
-patch-db/client/node_modules: patch-db/client/package.json
+patch-db/client/node_modules/.package-lock.json: patch-db/client/package.json
 	npm --prefix patch-db/client ci
-	touch patch-db/client/node_modules
+	touch patch-db/client/node_modules/.package-lock.json
 
-patch-db/client/dist: $(PATCH_DB_CLIENT_SRC) patch-db/client/node_modules
+patch-db/client/dist/index.js: $(PATCH_DB_CLIENT_SRC) patch-db/client/node_modules/.package-lock.json
 	rm -rf patch-db/client/dist
 	npm --prefix patch-db/client run build
+	touch patch-db/client/dist/index.js
 
 # used by github actions
 compiled-$(ARCH).tar: $(COMPILED_TARGETS) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE)
diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index cd29714b2..f495df85d 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -9,6 +9,7 @@ ca-certificates
 cifs-utils
 cryptsetup
 curl
+dnsutils
 dmidecode
 dosfstools
 e2fsprogs
diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index e0390b1e1..3338560c9 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -127,7 +127,7 @@ function makeEffects(context: EffectContext): Effects {
       >
     },
     subcontainer: {
-      createFs(options: { imageId: string }) {
+      createFs(options: { imageId: string; name: string }) {
         return rpcRound("subcontainer.create-fs", options) as ReturnType<
           T.Effects["subcontainer"]["createFs"]
         >
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 860f1c066..458b1af0f 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -198,7 +198,11 @@ export class RpcListener {
           .then((x) => this.dealWithInput(x))
           .catch(mapError)
           .then(logData("response"))
-          .then(writeDataToSocket),
+          .then(writeDataToSocket)
+          .catch((e) => {
+            console.error(`Major error in socket handling: ${e}`)
+            console.debug(`Data in: ${a.toString()}`)
+          }),
       )
     })
   }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 805f9b531..0c1f9d07a 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -20,6 +20,7 @@ export class DockerProcedureContainer {
     packageId: string,
     data: DockerProcedure,
     volumes: { [id: VolumeId]: Volume },
+    name: string,
     options: { subcontainer?: ExecSpawnable } = {},
   ) {
     const subcontainer =
@@ -29,6 +30,7 @@ export class DockerProcedureContainer {
         packageId,
         data,
         volumes,
+        name,
       ))
     return new DockerProcedureContainer(subcontainer)
   }
@@ -37,8 +39,13 @@ export class DockerProcedureContainer {
     packageId: string,
     data: DockerProcedure,
     volumes: { [id: VolumeId]: Volume },
+    name: string,
   ) {
-    const subcontainer = await SubContainer.of(effects, { id: data.image })
+    const subcontainer = await SubContainer.of(
+      effects,
+      { id: data.image },
+      name,
+    )
 
     if (data.mounts) {
       const mounts = data.mounts
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index cae3405b9..91b0177eb 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -62,6 +62,7 @@ export class MainLoop {
         this.system.manifest.id,
         this.system.manifest.main,
         this.system.manifest.volumes,
+        `Main - ${currentCommand.join(" ")}`,
       )
       return CommandController.of()(
         this.effects,
@@ -162,26 +163,29 @@ export class MainLoop {
             const subcontainer = actionProcedure.inject
               ? this.mainSubContainerHandle
               : undefined
-            // prettier-ignore
-            const container = 
-              await DockerProcedureContainer.of(
-                effects,
-                manifest.id,
-                actionProcedure,
-                manifest.volumes,
-                {
-                  subcontainer,
-                }
-              )
+            const commands = [
+              actionProcedure.entrypoint,
+              ...actionProcedure.args,
+            ]
+            const container = await DockerProcedureContainer.of(
+              effects,
+              manifest.id,
+              actionProcedure,
+              manifest.volumes,
+              `Health Check - ${commands.join(" ")}`,
+              {
+                subcontainer,
+              },
+            )
             const env: Record<string, string> = actionProcedure.inject
               ? {
                   HOME: "/root",
                 }
               : {}
-            const executed = await container.exec(
-              [actionProcedure.entrypoint, ...actionProcedure.args],
-              { input: JSON.stringify(timeChanged), env },
-            )
+            const executed = await container.exec(commands, {
+              input: JSON.stringify(timeChanged),
+              env,
+            })
 
             if (executed.exitCode === 0) {
               await effects.setHealth({
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 9e6382ca7..5b0380a1b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -443,6 +443,7 @@ export class SystemForEmbassy implements System {
   ): Promise<void> {
     const backup = this.manifest.backup.create
     if (backup.type === "docker") {
+      const commands = [backup.entrypoint, ...backup.args]
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
@@ -451,8 +452,9 @@ export class SystemForEmbassy implements System {
           ...this.manifest.volumes,
           BACKUP: { type: "backup", readonly: false },
         },
+        `Backup - ${commands.join(" ")}`,
       )
-      await container.execFail([backup.entrypoint, ...backup.args], timeoutMs)
+      await container.execFail(commands, timeoutMs)
     } else {
       const moduleCode = await this.moduleCode
       await moduleCode.createBackup?.(polyfillEffects(effects, this.manifest))
@@ -464,6 +466,7 @@ export class SystemForEmbassy implements System {
   ): Promise<void> {
     const restoreBackup = this.manifest.backup.restore
     if (restoreBackup.type === "docker") {
+      const commands = [restoreBackup.entrypoint, ...restoreBackup.args]
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
@@ -472,11 +475,9 @@ export class SystemForEmbassy implements System {
           ...this.manifest.volumes,
           BACKUP: { type: "backup", readonly: true },
         },
+        `Restore Backup - ${commands.join(" ")}`,
       )
-      await container.execFail(
-        [restoreBackup.entrypoint, ...restoreBackup.args],
-        timeoutMs,
-      )
+      await container.execFail(commands, timeoutMs)
     } else {
       const moduleCode = await this.moduleCode
       await moduleCode.restoreBackup?.(polyfillEffects(effects, this.manifest))
@@ -495,20 +496,17 @@ export class SystemForEmbassy implements System {
     const config = this.manifest.config?.get
     if (!config) return { spec: {} }
     if (config.type === "docker") {
+      const commands = [config.entrypoint, ...config.args]
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
         config,
         this.manifest.volumes,
+        `Get Config - ${commands.join(" ")}`,
       )
       // TODO: yaml
       return JSON.parse(
-        (
-          await container.execFail(
-            [config.entrypoint, ...config.args],
-            timeoutMs,
-          )
-        ).stdout.toString(),
+        (await container.execFail(commands, timeoutMs)).stdout.toString(),
       )
     } else {
       const moduleCode = await this.moduleCode
@@ -543,24 +541,21 @@ export class SystemForEmbassy implements System {
     const setConfigValue = this.manifest.config?.set
     if (!setConfigValue) return
     if (setConfigValue.type === "docker") {
+      const commands = [
+        setConfigValue.entrypoint,
+        ...setConfigValue.args,
+        JSON.stringify(newConfig),
+      ]
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
         setConfigValue,
         this.manifest.volumes,
+        `Set Config - ${commands.join(" ")}`,
       )
       const answer = matchSetResult.unsafeCast(
         JSON.parse(
-          (
-            await container.execFail(
-              [
-                setConfigValue.entrypoint,
-                ...setConfigValue.args,
-                JSON.stringify(newConfig),
-              ],
-              timeoutMs,
-            )
-          ).stdout.toString(),
+          (await container.execFail(commands, timeoutMs)).stdout.toString(),
         ),
       )
       const dependsOn = answer["depends-on"] ?? answer.dependsOn ?? {}
@@ -652,23 +647,20 @@ export class SystemForEmbassy implements System {
     if (migration) {
       const [version, procedure] = migration
       if (procedure.type === "docker") {
+        const commands = [
+          procedure.entrypoint,
+          ...procedure.args,
+          JSON.stringify(fromVersion),
+        ]
         const container = await DockerProcedureContainer.of(
           effects,
           this.manifest.id,
           procedure,
           this.manifest.volumes,
+          `Migration - ${commands.join(" ")}`,
         )
         return JSON.parse(
-          (
-            await container.execFail(
-              [
-                procedure.entrypoint,
-                ...procedure.args,
-                JSON.stringify(fromVersion),
-              ],
-              timeoutMs,
-            )
-          ).stdout.toString(),
+          (await container.execFail(commands, timeoutMs)).stdout.toString(),
         )
       } else if (procedure.type === "script") {
         const moduleCode = await this.moduleCode
@@ -695,20 +687,17 @@ export class SystemForEmbassy implements System {
     const setConfigValue = this.manifest.properties
     if (!setConfigValue) throw new Error("There is no properties")
     if (setConfigValue.type === "docker") {
+      const commands = [setConfigValue.entrypoint, ...setConfigValue.args]
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
         setConfigValue,
         this.manifest.volumes,
+        `Properties - ${commands.join(" ")}`,
       )
       const properties = matchProperties.unsafeCast(
         JSON.parse(
-          (
-            await container.execFail(
-              [setConfigValue.entrypoint, ...setConfigValue.args],
-              timeoutMs,
-            )
-          ).stdout.toString(),
+          (await container.execFail(commands, timeoutMs)).stdout.toString(),
         ),
       )
       return asProperty(properties.data)
@@ -761,6 +750,7 @@ export class SystemForEmbassy implements System {
         this.manifest.id,
         actionProcedure,
         this.manifest.volumes,
+        `Action ${actionId}`,
         {
           subcontainer,
         },
@@ -801,23 +791,20 @@ export class SystemForEmbassy implements System {
     const actionProcedure = this.manifest.dependencies?.[id]?.config?.check
     if (!actionProcedure) return { message: "Action not found", value: null }
     if (actionProcedure.type === "docker") {
+      const commands = [
+        actionProcedure.entrypoint,
+        ...actionProcedure.args,
+        JSON.stringify(oldConfig),
+      ]
       const container = await DockerProcedureContainer.of(
         effects,
         this.manifest.id,
         actionProcedure,
         this.manifest.volumes,
+        `Dependencies Check - ${commands.join(" ")}`,
       )
       return JSON.parse(
-        (
-          await container.execFail(
-            [
-              actionProcedure.entrypoint,
-              ...actionProcedure.args,
-              JSON.stringify(oldConfig),
-            ],
-            timeoutMs,
-          )
-        ).stdout.toString(),
+        (await container.execFail(commands, timeoutMs)).stdout.toString(),
       )
     } else if (actionProcedure.type === "script") {
       const moduleCode = await this.moduleCode
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index c212722e6..675cb2e9a 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -129,6 +129,7 @@ export const polyfillEffects = (
         manifest.id,
         manifest.main,
         manifest.volumes,
+        [input.command, ...(input.args || [])].join(" "),
       )
       const daemon = promiseSubcontainer.then((subcontainer) =>
         daemons.runCommand()(
diff --git a/core/Cargo.lock b/core/Cargo.lock
index e9b9330e3..ebbcf6b5d 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -533,7 +533,7 @@ dependencies = [
  "rustc-hash",
  "shlex",
  "syn 2.0.74",
- "which 4.4.2",
+ "which",
 ]
 
 [[package]]
@@ -3055,18 +3055,6 @@ dependencies = [
  "unicase",
 ]
 
-[[package]]
-name = "nix"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.24.3"
@@ -5147,11 +5135,9 @@ dependencies = [
  "tty-spawn",
  "typed-builder",
  "unix-named-pipe",
- "unshare",
  "url",
  "urlencoding",
  "uuid",
- "which 6.0.3",
  "zeroize",
 ]
 
@@ -6051,16 +6037,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "unshare"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ceda295552a1eda89f8a748237654ad76b9c87e383fc07af5c4e423eb8e7b9b"
-dependencies = [
- "libc",
- "nix 0.20.0",
-]
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -6278,18 +6254,6 @@ dependencies = [
  "rustix",
 ]
 
-[[package]]
-name = "which"
-version = "6.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
-dependencies = [
- "either",
- "home",
- "rustix",
- "winsafe",
-]
-
 [[package]]
 name = "whoami"
 version = "1.5.1"
@@ -6516,12 +6480,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winsafe"
-version = "0.0.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
-
 [[package]]
 name = "wyz"
 version = "0.2.0"
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 9b3e7a048..f2b780b7b 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -39,7 +39,7 @@ path = "src/main.rs"
 
 [features]
 cli = []
-container-runtime = ["procfs", "unshare", "tty-spawn"]
+container-runtime = ["procfs", "tty-spawn"]
 daemon = []
 registry = []
 default = ["cli", "daemon", "registry", "container-runtime"]
@@ -207,9 +207,7 @@ trust-dns-server = "0.23.1"
 ts-rs = { git = "https://github.com/dr-bonez/ts-rs.git", branch = "feature/top-level-as" } # "8.1.0"
 tty-spawn = { version = "0.4.0", optional = true }
 typed-builder = "0.18.0"
-which = "6.0.3"
 unix-named-pipe = "0.2.0"
-unshare = { version = "0.7.0", optional = true }
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.4.1", features = ["v4"] }
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index d998e9897..9a881d0e6 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -275,8 +275,8 @@ pub struct Session {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SessionList {
-    #[ts(type = "string")]
-    current: InternedString,
+    #[ts(type = "string | null")]
+    current: Option<InternedString>,
     sessions: Sessions,
 }
 
@@ -323,7 +323,7 @@ fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) {
             session.user_agent.as_deref().unwrap_or("N/A"),
             &format!("{}", session.metadata),
         ];
-        if id == arg.current {
+        if Some(id) == arg.current {
             row.iter_mut()
                 .map(|c| c.style(Attr::ForegroundColor(color::GREEN)))
                 .collect::<()>()
@@ -340,7 +340,7 @@ pub struct ListParams {
     #[arg(skip)]
     #[ts(skip)]
     #[serde(rename = "__auth_session")] // from Auth middleware
-    session: InternedString,
+    session: Option<InternedString>,
 }
 
 // #[command(display(display_sessions))]
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 5330c58bc..c78f118ea 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -58,7 +58,7 @@ pub struct RpcContextSeed {
     pub shutdown: broadcast::Sender<Option<Shutdown>>,
     pub tor_socks: SocketAddr,
     pub lxc_manager: Arc<LxcManager>,
-    pub open_authed_continuations: OpenAuthedContinuations<InternedString>,
+    pub open_authed_continuations: OpenAuthedContinuations<Option<InternedString>>,
     pub rpc_continuations: RpcContinuations,
     pub callbacks: ServiceCallbacks,
     pub wifi_manager: Option<Arc<RwLock<WpaCli>>>,
@@ -431,8 +431,8 @@ impl AsRef<RpcContinuations> for RpcContext {
         &self.rpc_continuations
     }
 }
-impl AsRef<OpenAuthedContinuations<InternedString>> for RpcContext {
-    fn as_ref(&self) -> &OpenAuthedContinuations<InternedString> {
+impl AsRef<OpenAuthedContinuations<Option<InternedString>>> for RpcContext {
+    fn as_ref(&self) -> &OpenAuthedContinuations<Option<InternedString>> {
         &self.open_authed_continuations
     }
 }
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index ef35bd30d..ff42d6a5c 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -115,7 +115,7 @@ pub struct SubscribeParams {
     pointer: Option<JsonPointer>,
     #[ts(skip)]
     #[serde(rename = "__auth_session")]
-    session: InternedString,
+    session: Option<InternedString>,
 }
 
 #[derive(Deserialize, Serialize, TS)]
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index eefd6eb66..32b0f6ce4 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -173,7 +173,7 @@ pub async fn install(
 pub struct SideloadParams {
     #[ts(skip)]
     #[serde(rename = "__auth_session")]
-    session: InternedString,
+    session: Option<InternedString>,
 }
 
 #[derive(Deserialize, Serialize, TS)]
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index feeb5a647..b5629aa04 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -323,6 +323,13 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             "connect",
             from_fn_async(service::connect_rpc_cli).no_display(),
         )
+        .subcommand(
+            "attach",
+            from_fn_async(service::attach)
+                .with_metadata("get_session", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand("attach", from_fn_async(service::cli_attach).no_display())
 }
 
 pub fn diagnostic_api() -> ParentHandler<DiagnosticContext> {
diff --git a/core/startos/src/middleware/auth.rs b/core/startos/src/middleware/auth.rs
index 9b04afb38..7c5eaa4c2 100644
--- a/core/startos/src/middleware/auth.rs
+++ b/core/startos/src/middleware/auth.rs
@@ -49,7 +49,7 @@ impl HasLoggedOutSessions {
             .map(|s| s.as_logout_session_id())
             .collect();
         for sid in &to_log_out {
-            ctx.open_authed_continuations.kill(sid)
+            ctx.open_authed_continuations.kill(&Some(sid.clone()))
         }
         ctx.ephemeral_sessions.mutate(|s| {
             for sid in &to_log_out {
diff --git a/core/startos/src/service/effects/subcontainer/mod.rs b/core/startos/src/service/effects/subcontainer/mod.rs
index 0375ef6c2..65fcbd387 100644
--- a/core/startos/src/service/effects/subcontainer/mod.rs
+++ b/core/startos/src/service/effects/subcontainer/mod.rs
@@ -1,12 +1,15 @@
 use std::path::{Path, PathBuf};
 
+use imbl_value::InternedString;
 use models::ImageId;
 use tokio::process::Command;
 
-use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::rpc_continuations::Guid;
 use crate::service::effects::prelude::*;
 use crate::util::Invoke;
+use crate::{
+    disk::mount::filesystem::overlayfs::OverlayGuard, service::persistent_container::Subcontainer,
+};
 
 #[cfg(feature = "container-runtime")]
 mod sync;
@@ -38,7 +41,7 @@ pub async fn destroy_subcontainer_fs(
         .await
         .remove(&guid)
     {
-        overlay.unmount(true).await?;
+        overlay.overlay.unmount(true).await?;
     } else {
         tracing::warn!("Could not find a subcontainer fs to destroy; assumming that it already is destroyed and will be skipping");
     }
@@ -50,11 +53,13 @@ pub async fn destroy_subcontainer_fs(
 #[ts(export)]
 pub struct CreateSubcontainerFsParams {
     image_id: ImageId,
+    #[ts(type = "string | null")]
+    name: Option<InternedString>,
 }
 #[instrument(skip_all)]
 pub async fn create_subcontainer_fs(
     context: EffectContext,
-    CreateSubcontainerFsParams { image_id }: CreateSubcontainerFsParams,
+    CreateSubcontainerFsParams { image_id, name }: CreateSubcontainerFsParams,
 ) -> Result<(PathBuf, Guid), Error> {
     let context = context.deref()?;
     if let Some(image) = context
@@ -87,7 +92,13 @@ pub async fn create_subcontainer_fs(
                 .with_kind(ErrorKind::Incoherent)?,
         );
         tracing::info!("Mounting overlay {guid} for {image_id}");
-        let guard = OverlayGuard::mount(image, &mountpoint).await?;
+        let subcontainer_wrapper = Subcontainer {
+            overlay: OverlayGuard::mount(image, &mountpoint).await?,
+            name: name
+                .unwrap_or_else(|| InternedString::intern(format!("subcontainer-{}", image_id))),
+            image_id: image_id.clone(),
+        };
+
         Command::new("chown")
             .arg("100000:100000")
             .arg(&mountpoint)
@@ -100,7 +111,7 @@ pub async fn create_subcontainer_fs(
             .subcontainers
             .lock()
             .await
-            .insert(guid.clone(), guard);
+            .insert(guid.clone(), subcontainer_wrapper);
         Ok((container_mountpoint, guid))
     } else {
         Err(Error::new(
diff --git a/core/startos/src/service/effects/subcontainer/sync.rs b/core/startos/src/service/effects/subcontainer/sync.rs
index f31eb8f62..702f34bbe 100644
--- a/core/startos/src/service/effects/subcontainer/sync.rs
+++ b/core/startos/src/service/effects/subcontainer/sync.rs
@@ -1,4 +1,3 @@
-use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::ffi::{c_int, OsStr, OsString};
 use std::fs::File;
@@ -12,7 +11,6 @@ use nix::unistd::Pid;
 use signal_hook::consts::signal::*;
 use tokio::sync::oneshot;
 use tty_spawn::TtySpawn;
-use unshare::Command as NSCommand;
 
 use crate::service::effects::prelude::*;
 use crate::service::effects::ContainerCliContext;
@@ -50,11 +48,13 @@ fn open_file_read(path: impl AsRef<Path>) -> Result<File, Error> {
 
 #[derive(Debug, Clone, Serialize, Deserialize, Parser)]
 pub struct ExecParams {
-    #[arg(short = 'e', long = "env")]
+    #[arg(long)]
+    force_tty: bool,
+    #[arg(short, long)]
     env: Option<PathBuf>,
-    #[arg(short = 'w', long = "workdir")]
+    #[arg(short, long)]
     workdir: Option<PathBuf>,
-    #[arg(short = 'u', long = "user")]
+    #[arg(short, long)]
     user: Option<String>,
     chroot: PathBuf,
     #[arg(trailing_var_arg = true)]
@@ -68,6 +68,7 @@ impl ExecParams {
             user,
             chroot,
             command,
+            ..
         } = self;
         let Some(([command], args)) = command.split_at_checked(1) else {
             return Err(Error::new(
@@ -88,16 +89,6 @@ impl ExecParams {
             .collect::<BTreeMap<_, _>>();
         std::os::unix::fs::chroot(chroot)
             .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("chroot {chroot:?}")))?;
-        let command = which::which_in(
-            command,
-            env.get("PATH")
-                .copied()
-                .map(Cow::Borrowed)
-                .or_else(|| std::env::var("PATH").ok().map(Cow::Owned))
-                .as_deref(),
-            workdir.as_deref().unwrap_or(Path::new("/")),
-        )
-        .with_kind(ErrorKind::Filesystem)?;
         let mut cmd = StdCommand::new(command);
         cmd.args(args);
         for (k, v) in env {
@@ -135,6 +126,7 @@ impl ExecParams {
 pub fn launch(
     _: ContainerCliContext,
     ExecParams {
+        force_tty,
         env,
         workdir,
         user,
@@ -142,47 +134,8 @@ pub fn launch(
         command,
     }: ExecParams,
 ) -> Result<(), Error> {
-    use unshare::{Namespace, Stdio};
-
-    use crate::service::cli::ContainerCliContext;
-    let mut sig = signal_hook::iterator::Signals::new(FWD_SIGNALS)?;
-    let mut cmd = NSCommand::new("/usr/bin/start-cli");
-    cmd.arg("subcontainer").arg("launch-init");
-    if let Some(env) = env {
-        cmd.arg("--env").arg(env);
-    }
-    if let Some(workdir) = workdir {
-        cmd.arg("--workdir").arg(workdir);
-    }
-    if let Some(user) = user {
-        cmd.arg("--user").arg(user);
-    }
-    cmd.arg(&chroot);
-    cmd.args(&command);
-    cmd.unshare(&[Namespace::Pid, Namespace::Cgroup, Namespace::Ipc]);
-    cmd.stdin(Stdio::piped());
-    cmd.stdout(Stdio::piped());
-    cmd.stderr(Stdio::piped());
-    let (stdin_send, stdin_recv) = oneshot::channel();
-    std::thread::spawn(move || {
-        if let Ok(mut stdin) = stdin_recv.blocking_recv() {
-            std::io::copy(&mut std::io::stdin(), &mut stdin).unwrap();
-        }
-    });
-    let (stdout_send, stdout_recv) = oneshot::channel();
-    std::thread::spawn(move || {
-        if let Ok(mut stdout) = stdout_recv.blocking_recv() {
-            std::io::copy(&mut stdout, &mut std::io::stdout()).unwrap();
-        }
-    });
-    let (stderr_send, stderr_recv) = oneshot::channel();
-    std::thread::spawn(move || {
-        if let Ok(mut stderr) = stderr_recv.blocking_recv() {
-            std::io::copy(&mut stderr, &mut std::io::stderr()).unwrap();
-        }
-    });
     if chroot.join("proc/1").exists() {
-        let ns_id = procfs::process::Process::new_with_root(chroot.join("proc"))
+        let ns_id = procfs::process::Process::new_with_root(chroot.join("proc/1"))
             .with_ctx(|_| (ErrorKind::Filesystem, "open subcontainer procfs"))?
             .namespaces()
             .with_ctx(|_| (ErrorKind::Filesystem, "read subcontainer pid 1 ns"))?
@@ -225,20 +178,92 @@ pub fn launch(
         nix::mount::umount(&chroot.join("proc"))
             .with_ctx(|_| (ErrorKind::Filesystem, "unmounting subcontainer procfs"))?;
     }
+
+    if (std::io::stdin().is_terminal()
+        && std::io::stdout().is_terminal()
+        && std::io::stderr().is_terminal())
+        || force_tty
+    {
+        let mut cmd = TtySpawn::new("/usr/bin/start-cli");
+        cmd.arg("subcontainer").arg("launch-init");
+        if let Some(env) = env {
+            cmd.arg("--env").arg(env);
+        }
+        if let Some(workdir) = workdir {
+            cmd.arg("--workdir").arg(workdir);
+        }
+        if let Some(user) = user {
+            cmd.arg("--user").arg(user);
+        }
+        cmd.arg(&chroot);
+        cmd.args(command.iter());
+        nix::sched::unshare(CloneFlags::CLONE_NEWPID)
+            .with_ctx(|_| (ErrorKind::Filesystem, "unshare pid ns"))?;
+        nix::sched::unshare(CloneFlags::CLONE_NEWCGROUP)
+            .with_ctx(|_| (ErrorKind::Filesystem, "unshare cgroup ns"))?;
+        nix::sched::unshare(CloneFlags::CLONE_NEWIPC)
+            .with_ctx(|_| (ErrorKind::Filesystem, "unshare ipc ns"))?;
+        std::process::exit(cmd.spawn().with_kind(ErrorKind::Filesystem)?);
+    }
+
+    let mut sig = signal_hook::iterator::Signals::new(FWD_SIGNALS)?;
+    let (send_pid, recv_pid) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(pid) = recv_pid.blocking_recv() {
+            for sig in sig.forever() {
+                nix::sys::signal::kill(
+                    Pid::from_raw(pid),
+                    Some(nix::sys::signal::Signal::try_from(sig).unwrap()),
+                )
+                .unwrap();
+            }
+        }
+    });
+    let mut cmd = StdCommand::new("/usr/bin/start-cli");
+    cmd.arg("subcontainer").arg("launch-init");
+    if let Some(env) = env {
+        cmd.arg("--env").arg(env);
+    }
+    if let Some(workdir) = workdir {
+        cmd.arg("--workdir").arg(workdir);
+    }
+    if let Some(user) = user {
+        cmd.arg("--user").arg(user);
+    }
+    cmd.arg(&chroot);
+    cmd.args(&command);
+    cmd.stdin(Stdio::piped());
+    cmd.stdout(Stdio::piped());
+    cmd.stderr(Stdio::piped());
+    let (stdin_send, stdin_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stdin) = stdin_recv.blocking_recv() {
+            std::io::copy(&mut std::io::stdin(), &mut stdin).unwrap();
+        }
+    });
+    let (stdout_send, stdout_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stdout) = stdout_recv.blocking_recv() {
+            std::io::copy(&mut stdout, &mut std::io::stdout()).unwrap();
+        }
+    });
+    let (stderr_send, stderr_recv) = oneshot::channel();
+    std::thread::spawn(move || {
+        if let Ok(mut stderr) = stderr_recv.blocking_recv() {
+            std::io::copy(&mut stderr, &mut std::io::stderr()).unwrap();
+        }
+    });
+    nix::sched::unshare(CloneFlags::CLONE_NEWPID)
+        .with_ctx(|_| (ErrorKind::Filesystem, "unshare pid ns"))?;
+    nix::sched::unshare(CloneFlags::CLONE_NEWCGROUP)
+        .with_ctx(|_| (ErrorKind::Filesystem, "unshare cgroup ns"))?;
+    nix::sched::unshare(CloneFlags::CLONE_NEWIPC)
+        .with_ctx(|_| (ErrorKind::Filesystem, "unshare ipc ns"))?;
     let mut child = cmd
         .spawn()
         .map_err(color_eyre::eyre::Report::msg)
         .with_ctx(|_| (ErrorKind::Filesystem, "spawning child process"))?;
-    let pid = child.pid();
-    std::thread::spawn(move || {
-        for sig in sig.forever() {
-            nix::sys::signal::kill(
-                Pid::from_raw(pid),
-                Some(nix::sys::signal::Signal::try_from(sig).unwrap()),
-            )
-            .unwrap();
-        }
-    });
+    send_pid.send(child.id() as i32).unwrap_or_default();
     stdin_send
         .send(child.stdin.take().unwrap())
         .unwrap_or_default();
@@ -253,16 +278,16 @@ pub fn launch(
         .wait()
         .with_ctx(|_| (ErrorKind::Filesystem, "waiting on child process"))?;
     if let Some(code) = exit.code() {
+        nix::mount::umount(&chroot.join("proc"))
+            .with_ctx(|_| (ErrorKind::Filesystem, "umount procfs"))?;
         std::process::exit(code);
+    } else if exit.success() {
+        Ok(())
     } else {
-        if exit.success() {
-            Ok(())
-        } else {
-            Err(Error::new(
-                color_eyre::eyre::Report::msg(exit),
-                ErrorKind::Unknown,
-            ))
-        }
+        Err(Error::new(
+            color_eyre::eyre::Report::msg(exit),
+            ErrorKind::Unknown,
+        ))
     }
 }
 
@@ -288,6 +313,7 @@ pub fn launch_init(_: ContainerCliContext, params: ExecParams) -> Result<(), Err
 pub fn exec(
     _: ContainerCliContext,
     ExecParams {
+        force_tty,
         env,
         workdir,
         user,
@@ -295,7 +321,11 @@ pub fn exec(
         command,
     }: ExecParams,
 ) -> Result<(), Error> {
-    if std::io::stdin().is_terminal() {
+    if (std::io::stdin().is_terminal()
+        && std::io::stdout().is_terminal()
+        && std::io::stderr().is_terminal())
+        || force_tty
+    {
         let mut cmd = TtySpawn::new("/usr/bin/start-cli");
         cmd.arg("subcontainer").arg("exec-command");
         if let Some(env) = env {
@@ -407,15 +437,13 @@ pub fn exec(
         .with_ctx(|_| (ErrorKind::Filesystem, "waiting on child process"))?;
     if let Some(code) = exit.code() {
         std::process::exit(code);
+    } else if exit.success() {
+        Ok(())
     } else {
-        if exit.success() {
-            Ok(())
-        } else {
-            Err(Error::new(
-                color_eyre::eyre::Report::msg(exit),
-                ErrorKind::Unknown,
-            ))
-        }
+        Err(Error::new(
+            color_eyre::eyre::Report::msg(exit),
+            ErrorKind::Unknown,
+        ))
     }
 }
 
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 5eae62756..55f76fd14 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -1,18 +1,31 @@
+use std::io::IsTerminal;
 use std::ops::Deref;
+use std::os::unix::process::ExitStatusExt;
+use std::path::Path;
+use std::process::Stdio;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
+use std::{ffi::OsString, path::PathBuf};
 
+use axum::extract::ws::WebSocket;
 use chrono::{DateTime, Utc};
 use clap::Parser;
 use futures::future::BoxFuture;
-use imbl::OrdMap;
-use models::{HealthCheckId, PackageId, ProcedureName};
-use persistent_container::PersistentContainer;
+use futures::stream::FusedStream;
+use futures::{SinkExt, StreamExt, TryStreamExt};
+use imbl_value::{json, InternedString};
+use itertools::Itertools;
+use models::{ImageId, PackageId, ProcedureName};
+use nix::sys::signal::Signal;
+use persistent_container::{PersistentContainer, Subcontainer};
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
 use serde::{Deserialize, Serialize};
 use service_actor::ServiceActor;
 use start_stop::StartStop;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::process::Command;
 use tokio::sync::Notify;
+use tokio_tungstenite::tungstenite::protocol::frame::coding::CloseCode;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
@@ -24,15 +37,16 @@ use crate::install::PKG_ARCHIVE_DIR;
 use crate::lxc::ContainerId;
 use crate::prelude::*;
 use crate::progress::{NamedProgress, Progress};
-use crate::rpc_continuations::Guid;
+use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::s9pk::S9pk;
 use crate::service::service_map::InstallProgressHandles;
-use crate::status::health_check::NamedHealthCheckResult;
 use crate::util::actor::concurrent::ConcurrentActor;
-use crate::util::io::create_file;
+use crate::util::io::{create_file, AsyncReadStream};
+use crate::util::net::WebSocketExt;
 use crate::util::serde::{NoOutput, Pem};
 use crate::util::Never;
 use crate::volume::data_dir;
+use crate::CAP_1_KiB;
 
 mod action;
 pub mod cli;
@@ -68,6 +82,8 @@ pub enum LoadDisposition {
     Undo,
 }
 
+struct RootCommand(pub String);
+
 pub struct ServiceRef(Arc<Service>);
 impl ServiceRef {
     pub fn weak(&self) -> Weak<Service> {
@@ -183,7 +199,7 @@ impl ServiceRef {
 impl Deref for ServiceRef {
     type Target = Service;
     fn deref(&self) -> &Self::Target {
-        &*self.0
+        &self.0
     }
 }
 impl From<Service> for ServiceRef {
@@ -354,7 +370,7 @@ impl Service {
                             tracing::debug!("{e:?}")
                         })
                     {
-                        match ServiceRef::from(service).uninstall(None).await {
+                        match service.uninstall(None).await {
                             Err(e) => {
                                 tracing::error!("Error uninstalling service: {e}");
                                 tracing::debug!("{e:?}")
@@ -578,3 +594,488 @@ pub async fn connect_rpc_cli(
 
     crate::lxc::connect_cli(&ctx, guid).await
 }
+
+#[derive(Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct AttachParams {
+    pub id: PackageId,
+    #[ts(type = "string[]")]
+    pub command: Vec<OsString>,
+    pub tty: bool,
+    #[ts(skip)]
+    #[serde(rename = "__auth_session")]
+    session: Option<InternedString>,
+    #[ts(type = "string | null")]
+    subcontainer: Option<InternedString>,
+    #[ts(type = "string | null")]
+    name: Option<InternedString>,
+    #[ts(type = "string | null")]
+    image_id: Option<ImageId>,
+}
+pub async fn attach(
+    ctx: RpcContext,
+    AttachParams {
+        id,
+        command,
+        tty,
+        session,
+        subcontainer,
+        image_id,
+        name,
+    }: AttachParams,
+) -> Result<Guid, Error> {
+    let (container_id, subcontainer_id, image_id, workdir, root_command) = {
+        let id = &id;
+
+        let service = ctx.services.get(id).await;
+
+        let service_ref = service.as_ref().or_not_found(id)?;
+
+        let container = &service_ref.seed.persistent_container;
+        let root_dir = container
+            .lxc_container
+            .get()
+            .map(|x| x.rootfs_dir().to_owned())
+            .or_not_found(format!("container for {id}"))?;
+
+        let subcontainer = subcontainer.map(|x| AsRef::<str>::as_ref(&x).to_uppercase());
+        let name = name.map(|x| AsRef::<str>::as_ref(&x).to_uppercase());
+        let image_id = image_id.map(|x| AsRef::<Path>::as_ref(&x).to_string_lossy().to_uppercase());
+
+        let subcontainers = container.subcontainers.lock().await;
+        let subcontainer_ids: Vec<_> = subcontainers
+            .iter()
+            .filter(|(x, wrapper)| {
+                if let Some(subcontainer) = subcontainer.as_ref() {
+                    AsRef::<str>::as_ref(x).contains(AsRef::<str>::as_ref(subcontainer))
+                } else if let Some(name) = name.as_ref() {
+                    AsRef::<str>::as_ref(&wrapper.name)
+                        .to_uppercase()
+                        .contains(AsRef::<str>::as_ref(name))
+                } else if let Some(image_id) = image_id.as_ref() {
+                    let Some(wrapper_image_id) = AsRef::<Path>::as_ref(&wrapper.image_id).to_str()
+                    else {
+                        return false;
+                    };
+                    wrapper_image_id
+                        .to_uppercase()
+                        .contains(AsRef::<str>::as_ref(&image_id))
+                } else {
+                    true
+                }
+            })
+            .collect();
+        let format_subcontainer_pair = |(guid, wrapper): (&Guid, &Subcontainer)| {
+            format!(
+                "{guid} imageId: {image_id} name: \"{name}\"",
+                name = &wrapper.name,
+                image_id = &wrapper.image_id
+            )
+        };
+        let Some((subcontainer_id, image_id)) = subcontainer_ids
+            .first()
+            .map::<(Guid, ImageId), _>(|&x| (x.0.clone(), x.1.image_id.clone()))
+        else {
+            drop(subcontainers);
+            let subcontainers = container
+                .subcontainers
+                .lock()
+                .await
+                .iter()
+                .map(format_subcontainer_pair)
+                .join("\n");
+            return Err(Error::new(
+                eyre!("no matching subcontainers are running for {id}; some possible choices are:\n{subcontainers}"),
+                ErrorKind::NotFound,
+            ));
+        };
+
+        let passwd = root_dir
+            .join("media/startos/subcontainers")
+            .join(subcontainer_id.as_ref())
+            .join("etc")
+            .join("passwd");
+
+        let root_command = get_passwd_root_command(passwd).await;
+
+        let workdir = attach_workdir(&image_id, &root_dir).await?;
+
+        if subcontainer_ids.len() > 1 {
+            let subcontainer_ids = subcontainer_ids
+                .into_iter()
+                .map(format_subcontainer_pair)
+                .join("\n");
+            return Err(Error::new(
+                eyre!("multiple subcontainers found for {id}: \n{subcontainer_ids}"),
+                ErrorKind::InvalidRequest,
+            ));
+        }
+
+        (
+            service_ref.container_id()?,
+            subcontainer_id,
+            image_id,
+            workdir,
+            root_command,
+        )
+    };
+
+    let guid = Guid::new();
+    async fn handler(
+        ws: &mut WebSocket,
+        container_id: ContainerId,
+        subcontainer_id: Guid,
+        command: Vec<OsString>,
+        tty: bool,
+        image_id: ImageId,
+        workdir: Option<String>,
+        root_command: &RootCommand,
+    ) -> Result<(), Error> {
+        use axum::extract::ws::Message;
+
+        let mut ws = ws.fuse();
+
+        let mut cmd = Command::new("lxc-attach");
+        let root_path = Path::new("/media/startos/subcontainers").join(subcontainer_id.as_ref());
+        cmd.kill_on_drop(true);
+
+        cmd.arg(&*container_id)
+            .arg("--")
+            .arg("start-cli")
+            .arg("subcontainer")
+            .arg("exec")
+            .arg("--env")
+            .arg(
+                Path::new("/media/startos/images")
+                    .join(image_id)
+                    .with_extension("env"),
+            );
+
+        if let Some(workdir) = workdir {
+            cmd.arg("--workdir").arg(workdir);
+        }
+
+        if tty {
+            cmd.arg("--force-tty");
+        }
+
+        cmd.arg(&root_path).arg("--");
+
+        if command.is_empty() {
+            cmd.arg(&root_command.0);
+        } else {
+            cmd.args(&command);
+        }
+
+        let mut child = cmd
+            .stdin(Stdio::piped())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped())
+            .spawn()?;
+
+        let pid = nix::unistd::Pid::from_raw(child.id().or_not_found("child pid")? as i32);
+
+        let mut stdin = child.stdin.take().or_not_found("child stdin")?;
+
+        let mut current_in = "stdin".to_owned();
+        let mut current_out = "stdout";
+        ws.send(Message::Text(current_out.into()))
+            .await
+            .with_kind(ErrorKind::Network)?;
+        let mut stdout = AsyncReadStream::new(
+            child.stdout.take().or_not_found("child stdout")?,
+            4 * CAP_1_KiB,
+        )
+        .fuse();
+        let mut stderr = AsyncReadStream::new(
+            child.stderr.take().or_not_found("child stderr")?,
+            4 * CAP_1_KiB,
+        )
+        .fuse();
+
+        loop {
+            futures::select_biased! {
+                out = stdout.try_next() => {
+                    if let Some(out) = out? {
+                        if current_out != "stdout" {
+                            ws.send(Message::Text("stdout".into()))
+                                .await
+                                .with_kind(ErrorKind::Network)?;
+                            current_out = "stdout";
+                        }
+                        dbg!(&current_out);
+                        ws.send(Message::Binary(out))
+                            .await
+                            .with_kind(ErrorKind::Network)?;
+                    }
+                }
+                err = stderr.try_next() => {
+                    if let Some(err) = err? {
+                        if current_out != "stderr" {
+                            ws.send(Message::Text("stderr".into()))
+                                .await
+                                .with_kind(ErrorKind::Network)?;
+                            current_out = "stderr";
+                        }
+                        dbg!(&current_out);
+                        ws.send(Message::Binary(err))
+                            .await
+                            .with_kind(ErrorKind::Network)?;
+                    }
+                }
+                msg = ws.try_next() => {
+                    if let Some(msg) = msg.with_kind(ErrorKind::Network)? {
+                        match msg {
+                            Message::Text(in_ty) => {
+                                current_in = in_ty;
+                            }
+                            Message::Binary(data) => {
+                                match &*current_in {
+                                    "stdin" => {
+                                        stdin.write_all(&data).await?;
+                                    }
+                                    "signal" => {
+                                        if data.len() != 4 {
+                                            return Err(Error::new(
+                                                eyre!("invalid byte length for signal: {}", data.len()),
+                                                ErrorKind::InvalidRequest
+                                            ));
+                                        }
+                                        let mut sig_buf = [0u8; 4];
+                                        sig_buf.clone_from_slice(&data);
+                                        nix::sys::signal::kill(
+                                            pid,
+                                            Signal::try_from(i32::from_be_bytes(sig_buf))
+                                                .with_kind(ErrorKind::InvalidRequest)?
+                                        ).with_kind(ErrorKind::Filesystem)?;
+                                    }
+                                    _ => (),
+                                }
+                            }
+                            _ => ()
+                        }
+                    } else {
+                        return Ok(())
+                    }
+                }
+            }
+            if stdout.is_terminated() && stderr.is_terminated() {
+                break;
+            }
+        }
+
+        let exit = child.wait().await?;
+        ws.send(Message::Text("exit".into()))
+            .await
+            .with_kind(ErrorKind::Network)?;
+        ws.send(Message::Binary(i32::to_be_bytes(exit.into_raw()).to_vec()))
+            .await
+            .with_kind(ErrorKind::Network)?;
+
+        Ok(())
+    }
+    ctx.rpc_continuations
+        .add(
+            guid.clone(),
+            RpcContinuation::ws_authed(
+                &ctx,
+                session,
+                move |mut ws| async move {
+                    if let Err(e) = handler(
+                        &mut ws,
+                        container_id,
+                        subcontainer_id,
+                        command,
+                        tty,
+                        image_id,
+                        workdir,
+                        &root_command,
+                    )
+                    .await
+                    {
+                        tracing::error!("Error in attach websocket: {e}");
+                        tracing::debug!("{e:?}");
+                        ws.close_result(Err::<&str, _>(e)).await.log_err();
+                    } else {
+                        ws.normal_close("exit").await.log_err();
+                    }
+                },
+                Duration::from_secs(30),
+            ),
+        )
+        .await;
+
+    Ok(guid)
+}
+
+async fn attach_workdir(image_id: &ImageId, root_dir: &Path) -> Result<Option<String>, Error> {
+    let path_str = root_dir.join("media/startos/images/");
+
+    let mut subcontainer_json =
+        tokio::fs::File::open(path_str.join(image_id).with_extension("json")).await?;
+    let mut contents = vec![];
+    subcontainer_json.read_to_end(&mut contents).await?;
+    let subcontainer_json: serde_json::Value =
+        serde_json::from_slice(&contents).with_kind(ErrorKind::Filesystem)?;
+    Ok(subcontainer_json["workdir"].as_str().map(|x| x.to_string()))
+}
+
+async fn get_passwd_root_command(etc_passwd_path: PathBuf) -> RootCommand {
+    async {
+        let mut file = tokio::fs::File::open(etc_passwd_path).await?;
+
+        let mut contents = vec![];
+        file.read_to_end(&mut contents).await?;
+
+        let contents = String::from_utf8_lossy(&contents);
+
+        for line in contents.split('\n') {
+            let line_information = line.split(':').collect::<Vec<_>>();
+            if let (Some(&"root"), Some(shell)) =
+                (line_information.first(), line_information.last())
+            {
+                return Ok(shell.to_string());
+            }
+        }
+        Err(Error::new(
+            eyre!("Could not parse /etc/passwd for shell: {}", contents),
+            ErrorKind::Filesystem,
+        ))
+    }
+    .await
+    .map(RootCommand)
+    .unwrap_or_else(|e| {
+        tracing::error!("Could not get the /etc/passwd: {e}");
+        tracing::debug!("{e:?}");
+        RootCommand("/bin/sh".to_string())
+    })
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct CliAttachParams {
+    pub id: PackageId,
+    #[arg(long)]
+    pub force_tty: bool,
+    #[arg(trailing_var_arg = true)]
+    pub command: Vec<OsString>,
+    #[arg(long, short)]
+    subcontainer: Option<InternedString>,
+    #[arg(long, short)]
+    name: Option<InternedString>,
+    #[arg(long, short)]
+    image_id: Option<ImageId>,
+}
+pub async fn cli_attach(
+    HandlerArgs {
+        context,
+        parent_method,
+        method,
+        params,
+        ..
+    }: HandlerArgs<CliContext, CliAttachParams>,
+) -> Result<(), Error> {
+    use tokio_tungstenite::tungstenite::Message;
+
+    let guid: Guid = from_value(
+        context
+            .call_remote::<RpcContext>(
+                &parent_method.into_iter().chain(method).join("."),
+                json!({
+                    "id": params.id,
+                    "command": params.command,
+                    "tty": (std::io::stdin().is_terminal()
+                        && std::io::stdout().is_terminal()
+                        && std::io::stderr().is_terminal())
+                        || params.force_tty,
+                    "subcontainer": params.subcontainer,
+                    "imageId": params.image_id,
+                    "name": params.name,
+                }),
+            )
+            .await?,
+    )?;
+    let mut ws = context.ws_continuation(guid).await?;
+
+    let mut current_in = "stdin";
+    let mut current_out = "stdout".to_owned();
+    ws.send(Message::Text(current_in.into()))
+        .await
+        .with_kind(ErrorKind::Network)?;
+    let mut stdin = AsyncReadStream::new(tokio::io::stdin(), 4 * CAP_1_KiB).fuse();
+    let mut stdout = tokio::io::stdout();
+    let mut stderr = tokio::io::stderr();
+    loop {
+        futures::select_biased! {
+            // signal = tokio:: => {
+            //     let exit = exit?;
+            //     if current_out != "exit" {
+            //         ws.send(Message::Text("exit".into()))
+            //             .await
+            //             .with_kind(ErrorKind::Network)?;
+            //         current_out = "exit";
+            //     }
+            //     ws.send(Message::Binary(
+            //         i32::to_be_bytes(exit.into_raw()).to_vec()
+            //     )).await.with_kind(ErrorKind::Network)?;
+            // }
+            input = stdin.try_next() => {
+                if let Some(input) = input? {
+                    if current_in != "stdin" {
+                        ws.send(Message::Text("stdin".into()))
+                            .await
+                            .with_kind(ErrorKind::Network)?;
+                        current_in = "stdin";
+                    }
+                    ws.send(Message::Binary(input))
+                        .await
+                        .with_kind(ErrorKind::Network)?;
+                }
+            }
+            msg = ws.try_next() => {
+                if let Some(msg) = msg.with_kind(ErrorKind::Network)? {
+                    match msg {
+                        Message::Text(out_ty) => {
+                            current_out = out_ty;
+                        }
+                        Message::Binary(data) => {
+                            match &*current_out {
+                                "stdout" => {
+                                    stdout.write_all(&data).await?;
+                                    stdout.flush().await?;
+                                }
+                                "stderr" => {
+                                    stderr.write_all(&data).await?;
+                                    stderr.flush().await?;
+                                }
+                                "exit" => {
+                                    if data.len() != 4 {
+                                        return Err(Error::new(
+                                            eyre!("invalid byte length for exit code: {}", data.len()),
+                                            ErrorKind::InvalidRequest
+                                        ));
+                                    }
+                                    let mut exit_buf = [0u8; 4];
+                                    exit_buf.clone_from_slice(&data);
+                                    let code = i32::from_be_bytes(exit_buf);
+                                    std::process::exit(code);
+                                }
+                                _ => (),
+                            }
+                        }
+                        Message::Close(Some(close)) => {
+                            if close.code != CloseCode::Normal {
+                                return Err(Error::new(
+                                    color_eyre::eyre::Report::msg(close.reason),
+                                    ErrorKind::Network
+                                ));
+                            }
+                        }
+                        _ => ()
+                    }
+                } else {
+                    return Ok(())
+                }
+            }
+        }
+    }
+}
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index dd7b5766d..ff9d74009 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -4,9 +4,10 @@ use std::sync::{Arc, Weak};
 use std::time::Duration;
 
 use futures::future::ready;
-use futures::{Future, FutureExt};
+use futures::Future;
 use helpers::NonDetachingJoinHandle;
 use imbl::Vector;
+use imbl_value::InternedString;
 use models::{ImageId, ProcedureName, VolumeId};
 use rpc_toolkit::{Empty, Server, ShutdownHandle};
 use serde::de::DeserializeOwned;
@@ -36,7 +37,7 @@ use crate::service::{rpc, RunningStatus, Service};
 use crate::util::io::create_file;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::Invoke;
-use crate::volume::{asset_dir, data_dir};
+use crate::volume::data_dir;
 use crate::ARCH;
 
 const RPC_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
@@ -84,6 +85,14 @@ impl ServiceState {
     }
 }
 
+/// Want to have a wrapper for uses like the inject where we are going to be finding the subcontainer and doing some filtering on it.
+/// As well, the imageName is also used for things like env.
+pub struct Subcontainer {
+    pub(super) name: InternedString,
+    pub(super) image_id: ImageId,
+    pub(super) overlay: OverlayGuard<Arc<MountGuard>>,
+}
+
 // @DRB On top of this we need to also have  the procedures to have the effects and get the results back for them, maybe lock them to the running instance?
 /// This contains the LXC container running the javascript init system
 /// that can be used via a JSON RPC Client connected to a unix domain
@@ -98,7 +107,7 @@ pub struct PersistentContainer {
     volumes: BTreeMap<VolumeId, MountGuard>,
     assets: BTreeMap<VolumeId, MountGuard>,
     pub(super) images: BTreeMap<ImageId, Arc<MountGuard>>,
-    pub(super) subcontainers: Arc<Mutex<BTreeMap<Guid, OverlayGuard<Arc<MountGuard>>>>>,
+    pub(super) subcontainers: Arc<Mutex<BTreeMap<Guid, Subcontainer>>>,
     pub(super) state: Arc<watch::Sender<ServiceState>>,
     pub(super) net_service: Mutex<NetService>,
     destroyed: bool,
@@ -405,7 +414,7 @@ impl PersistentContainer {
                 errs.handle(assets.unmount(true).await);
             }
             for (_, overlay) in std::mem::take(&mut *subcontainers.lock().await) {
-                errs.handle(overlay.unmount(true).await);
+                errs.handle(overlay.overlay.unmount(true).await);
             }
             for (_, images) in images {
                 errs.handle(images.unmount().await);
diff --git a/core/startos/src/upload.rs b/core/startos/src/upload.rs
index 20f294400..73519c603 100644
--- a/core/startos/src/upload.rs
+++ b/core/startos/src/upload.rs
@@ -25,7 +25,7 @@ use crate::util::io::{create_file, TmpDir};
 
 pub async fn upload(
     ctx: &RpcContext,
-    session: InternedString,
+    session: Option<InternedString>,
 ) -> Result<(Guid, UploadingFile), Error> {
     let guid = Guid::new();
     let (mut handle, file) = UploadingFile::new().await?;
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index 6d9c8a4ff..e3059c862 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -1,6 +1,7 @@
 use std::collections::VecDeque;
 use std::future::Future;
 use std::io::Cursor;
+use std::mem::MaybeUninit;
 use std::os::unix::prelude::MetadataExt;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
@@ -11,7 +12,7 @@ use std::time::Duration;
 
 use bytes::{Buf, BytesMut};
 use futures::future::{BoxFuture, Fuse};
-use futures::{AsyncSeek, FutureExt, TryStreamExt};
+use futures::{AsyncSeek, FutureExt, Stream, TryStreamExt};
 use helpers::NonDetachingJoinHandle;
 use nix::unistd::{Gid, Uid};
 use tokio::fs::File;
@@ -23,6 +24,7 @@ use tokio::sync::{Notify, OwnedMutexGuard};
 use tokio::time::{Instant, Sleep};
 
 use crate::prelude::*;
+use crate::{CAP_1_KiB, CAP_1_MiB};
 
 pub trait AsyncReadSeek: AsyncRead + AsyncSeek {}
 impl<T: AsyncRead + AsyncSeek> AsyncReadSeek for T {}
@@ -1267,3 +1269,33 @@ impl<W: AsyncWrite + Unpin> AsyncWrite for MutexIO<W> {
         Pin::new(&mut *self.get_mut().0).poll_shutdown(cx)
     }
 }
+
+#[pin_project::pin_project]
+pub struct AsyncReadStream<T> {
+    buffer: Vec<MaybeUninit<u8>>,
+    #[pin]
+    pub io: T,
+}
+impl<T> AsyncReadStream<T> {
+    pub fn new(io: T, buffer_size: usize) -> Self {
+        Self {
+            buffer: vec![MaybeUninit::uninit(); buffer_size],
+            io,
+        }
+    }
+}
+impl<T: AsyncRead> Stream for AsyncReadStream<T> {
+    type Item = Result<Vec<u8>, Error>;
+    fn poll_next(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Option<Self::Item>> {
+        let this = self.project();
+        let mut buf = ReadBuf::uninit(this.buffer);
+        match futures::ready!(this.io.poll_read(cx, &mut buf)) {
+            Ok(()) if buf.filled().is_empty() => Poll::Ready(None),
+            Ok(()) => Poll::Ready(Some(Ok(buf.filled().to_vec()))),
+            Err(e) => Poll::Ready(Some(Err(e.into()))),
+        }
+    }
+}
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
index 658597bc2..87c4e14ce 100644
--- a/sdk/lib/StartSdk.ts
+++ b/sdk/lib/StartSdk.ts
@@ -782,6 +782,7 @@ export async function runCommand<Manifest extends T.Manifest>(
     effects,
     image,
     options.mounts || [],
+    commands.join(" "),
     (subcontainer) => subcontainer.exec(commands),
   )
 }
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/lib/mainFn/CommandController.ts
index 8a0505f68..9c206803a 100644
--- a/sdk/lib/mainFn/CommandController.ts
+++ b/sdk/lib/mainFn/CommandController.ts
@@ -31,6 +31,7 @@ export class CommandController {
         | SubContainer,
       command: T.CommandType,
       options: {
+        subcontainerName?: string
         // Defaults to the DEFAULT_SIGTERM_TIMEOUT = 30_000ms
         sigtermTimeout?: number
         mounts?: { path: string; options: MountOptions }[]
@@ -51,7 +52,11 @@ export class CommandController {
         subcontainer instanceof SubContainer
           ? subcontainer
           : await (async () => {
-              const subc = await SubContainer.of(effects, subcontainer)
+              const subc = await SubContainer.of(
+                effects,
+                subcontainer,
+                options?.subcontainerName || commands.join(" "),
+              )
               for (let mount of options.mounts || []) {
                 await subc.mount(mount.options, mount.path)
               }
@@ -119,6 +124,11 @@ export class CommandController {
   async term({ signal = SIGTERM, timeout = this.sigtermTimeout } = {}) {
     try {
       if (!this.state.exited) {
+        if (signal !== "SIGKILL") {
+          setTimeout(() => {
+            if (!this.state.exited) this.process.kill("SIGKILL")
+          }, timeout)
+        }
         if (!this.process.kill(signal)) {
           console.error(
             `failed to send signal ${signal} to pid ${this.process.pid}`,
@@ -126,11 +136,6 @@ export class CommandController {
         }
       }
 
-      if (signal !== "SIGKILL") {
-        setTimeout(() => {
-          this.process.kill("SIGKILL")
-        }, timeout)
-      }
       await this.runningAnswer
     } finally {
       await this.subcontainer.destroy?.()
diff --git a/sdk/lib/mainFn/Daemon.ts b/sdk/lib/mainFn/Daemon.ts
index 87a7d705d..6fa1d1085 100644
--- a/sdk/lib/mainFn/Daemon.ts
+++ b/sdk/lib/mainFn/Daemon.ts
@@ -28,6 +28,7 @@ export class Daemon {
         | SubContainer,
       command: T.CommandType,
       options: {
+        subcontainerName?: string
         mounts?: { path: string; options: MountOptions }[]
         env?:
           | {
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts
index 1ecec28d3..b17f3a1a1 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/lib/mainFn/Daemons.ts
@@ -127,6 +127,7 @@ export class Daemons<Manifest extends T.Manifest, Ids extends string> {
     const daemon = Daemon.of()(this.effects, options.image, options.command, {
       ...options,
       mounts: options.mounts.build(),
+      subcontainerName: id,
     })
     const healthDaemon = new HealthDaemon(
       daemon,
diff --git a/sdk/lib/osBindings/CreateSubcontainerFsParams.ts b/sdk/lib/osBindings/CreateSubcontainerFsParams.ts
index 729ad4240..32d301e4a 100644
--- a/sdk/lib/osBindings/CreateSubcontainerFsParams.ts
+++ b/sdk/lib/osBindings/CreateSubcontainerFsParams.ts
@@ -1,4 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ImageId } from "./ImageId"
 
-export type CreateSubcontainerFsParams = { imageId: ImageId }
+export type CreateSubcontainerFsParams = {
+  imageId: ImageId
+  name: string | null
+}
diff --git a/sdk/lib/osBindings/SessionList.ts b/sdk/lib/osBindings/SessionList.ts
index a85a42dee..af36aaa8a 100644
--- a/sdk/lib/osBindings/SessionList.ts
+++ b/sdk/lib/osBindings/SessionList.ts
@@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Sessions } from "./Sessions"
 
-export type SessionList = { current: string; sessions: Sessions }
+export type SessionList = { current: string | null; sessions: Sessions }
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
index 4820f419d..68bd7b588 100644
--- a/sdk/lib/types.ts
+++ b/sdk/lib/types.ts
@@ -366,7 +366,10 @@ export type Effects = {
   // subcontainer
   subcontainer: {
     /** A low level api used by SubContainer */
-    createFs(options: { imageId: string }): Promise<[string, string]>
+    createFs(options: {
+      imageId: string
+      name: string | null
+    }): Promise<[string, string]>
     /** A low level api used by SubContainer */
     destroyFs(options: { guid: string }): Promise<void>
   }
diff --git a/sdk/lib/util/SubContainer.ts b/sdk/lib/util/SubContainer.ts
index bbc5c5f64..82c1ae1b3 100644
--- a/sdk/lib/util/SubContainer.ts
+++ b/sdk/lib/util/SubContainer.ts
@@ -86,10 +86,12 @@ export class SubContainer implements ExecSpawnable {
   static async of(
     effects: T.Effects,
     image: { id: T.ImageId; sharedRun?: boolean },
+    name: string,
   ) {
     const { id, sharedRun } = image
     const [rootfs, guid] = await effects.subcontainer.createFs({
       imageId: id as string,
+      name,
     })
 
     const shared = ["dev", "sys"]
@@ -115,9 +117,10 @@ export class SubContainer implements ExecSpawnable {
     effects: T.Effects,
     image: { id: T.ImageId; sharedRun?: boolean },
     mounts: { options: MountOptions; path: string }[],
+    name: string,
     fn: (subContainer: SubContainer) => Promise<T>,
   ): Promise<T> {
-    const subContainer = await SubContainer.of(effects, image)
+    const subContainer = await SubContainer.of(effects, image, name)
     try {
       for (let mount of mounts) {
         await subContainer.mount(mount.options, mount.path)
@@ -179,10 +182,12 @@ export class SubContainer implements ExecSpawnable {
     }
     return new Promise<void>((resolve, reject) => {
       try {
+        let timeout = setTimeout(() => this.leader.kill("SIGKILL"), 30000)
         this.leader.on("exit", () => {
+          clearTimeout(timeout)
           resolve()
         })
-        if (!this.leader.kill("SIGKILL")) {
+        if (!this.leader.kill("SIGTERM")) {
           reject(new Error("kill(2) failed"))
         }
       } catch (e) {

From db0695126ffa69c13f07410119e2996a41a65f03 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:12:52 -0600
Subject: [PATCH 288/341] Refactor/actions (#2733)

* store, properties, manifest

* interfaces

* init and backups

* fix init and backups

* file models

* more versions

* dependencies

* config except dynamic types

* clean up config

* remove disabled from non-dynamic vaues

* actions

* standardize example code block formats

* wip: actions refactor

Co-authored-by: Jade <Blu-J@users.noreply.github.com>

* commit types

* fix types

* update types

* update action request type

* update apis

* add description to actionrequest

* clean up imports

* revert package json

* chore: Remove the recursive to the index

* chore: Remove the other thing I was testing

* flatten action requests

* update container runtime with new config paradigm

* new actions strategy

* seems to be working

* misc backend fixes

* fix fe bugs

* only show breakages if breakages

* only show success modal if result

* don't panic on failed removal

* hide config from actions page

* polyfill autoconfig

* use metadata strategy for actions instead of prev

* misc fixes

* chore: split the sdk into 2 libs (#2736)

* follow sideload progress (#2718)

* follow sideload progress

* small bugfix

* shareReplay with no refcount false

* don't wrap sideload progress in RPCResult

* dont present toast

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>

* chore: Add the initial of the creation of the two sdk

* chore: Add in the baseDist

* chore: Add in the baseDist

* chore: Get the web and the runtime-container running

* chore: Remove the empty file

* chore: Fix it so the container-runtime works

---------

Co-authored-by: Matt Hill <MattDHill@users.noreply.github.com>
Co-authored-by: Aiden McClelland <me@drbonez.dev>

* misc fixes

* update todos

* minor clean up

* fix link script

* update node version in CI test

* fix node version syntax in ci build

* wip: fixing callbacks

* fix sdk makefile dependencies

* add support for const outside of main

* update apis

* don't panic!

* Chore: Capture weird case on rpc, and log that

* fix procedure id issue

* pass input value for dep auto config

* handle disabled and warning for actions

* chore: Fix for link not having node_modules

* sdk fixes

* fix build

* fix build

* fix build

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>
Co-authored-by: Jade <Blu-J@users.noreply.github.com>
Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: Jade <2364004+Blu-J@users.noreply.github.com>
Co-authored-by: Matt Hill <MattDHill@users.noreply.github.com>
---
 .github/workflows/startos-iso.yaml            |    3 +
 .github/workflows/test.yaml                   |    2 +-
 DEVELOPMENT.md                                |    1 +
 Makefile                                      |   29 +-
 container-runtime/package-lock.json           |   46 +-
 container-runtime/readme.md                   |   86 -
 .../src/Adapters/EffectCreator.ts             |   91 +-
 container-runtime/src/Adapters/RpcListener.ts |  405 +-
 .../DockerProcedureContainer.ts               |    2 +-
 .../Systems/SystemForEmbassy/MainLoop.ts      |    9 +-
 .../Systems/SystemForEmbassy/index.ts         |  192 +-
 .../Systems/SystemForEmbassy/matchManifest.ts |    1 +
 .../SystemForEmbassy/polyfillEffects.ts       |   22 +-
 .../SystemForEmbassy/transformConfigSpec.ts   |   14 +-
 .../src/Adapters/Systems/SystemForStartOs.ts  |  101 +-
 .../src/Interfaces/AllGetDependencies.ts      |    5 +-
 .../src/Interfaces/MakeEffects.ts             |    4 -
 container-runtime/src/Interfaces/System.ts    |   56 +-
 .../src/Models/CallbackHolder.ts              |   51 +-
 container-runtime/src/Models/JsonPath.ts      |   17 +-
 container-runtime/src/index.ts                |    3 -
 core/Cargo.lock                               |   33 +
 core/helpers/src/lib.rs                       |    3 +-
 core/{startos/src/util => models/src}/clap.rs |    5 +-
 core/models/src/id/mod.rs                     |    2 +
 core/models/src/id/replay.rs                  |   45 +
 core/models/src/id/service_interface.rs       |   16 +-
 core/models/src/lib.rs                        |    2 +
 core/models/src/procedure_name.rs             |   20 +-
 core/startos/Cargo.toml                       |    1 +
 core/startos/src/action.rs                    |  194 +-
 core/startos/src/backup/backup_bulk.rs        |    2 +-
 core/startos/src/backup/target/mod.rs         |    3 +-
 core/startos/src/config/action.rs             |   22 -
 core/startos/src/config/mod.rs                |  281 -
 core/startos/src/config/util.rs               |  406 --
 core/startos/src/context/rpc.rs               |   86 +-
 core/startos/src/db/model/package.rs          |  102 +-
 core/startos/src/dependencies.rs              |  140 -
 core/startos/src/disk/mount/backup.rs         |    4 +-
 .../src/disk/mount/filesystem/overlayfs.rs    |    6 +-
 core/startos/src/disk/mount/guard.rs          |    2 +-
 core/startos/src/install/mod.rs               |    3 +-
 core/startos/src/lib.rs                       |   14 +-
 core/startos/src/logs.rs                      |   42 +-
 core/startos/src/lxc/mod.rs                   |    5 +-
 core/startos/src/net/host/binding.rs          |   41 +-
 core/startos/src/net/net_controller.rs        |   78 +-
 core/startos/src/net/tor.rs                   |    2 +-
 core/startos/src/notifications.rs             |    3 +-
 core/startos/src/registry/signer/mod.rs       |    2 +-
 core/startos/src/registry/signer/sign/mod.rs  |    2 +-
 core/startos/src/rpc_continuations.rs         |    2 +-
 core/startos/src/s9pk/v2/compat.rs            |    1 -
 core/startos/src/s9pk/v2/manifest.rs          |    2 -
 core/startos/src/service/action.rs            |  161 +-
 core/startos/src/service/config.rs            |   78 -
 core/startos/src/service/control.rs           |   11 +-
 core/startos/src/service/dependencies.rs      |   86 -
 core/startos/src/service/effects/action.rs    |  258 +-
 core/startos/src/service/effects/callbacks.rs |   34 +-
 core/startos/src/service/effects/config.rs    |   53 -
 core/startos/src/service/effects/control.rs   |    2 +-
 .../startos/src/service/effects/dependency.rs |   76 +-
 core/startos/src/service/effects/health.rs    |    1 -
 core/startos/src/service/effects/mod.rs       |   25 +-
 core/startos/src/service/effects/net/bind.rs  |   16 +-
 .../src/service/effects/net/interface.rs      |   14 +-
 core/startos/src/service/effects/store.rs     |   11 +-
 core/startos/src/service/mod.rs               |   75 +-
 .../src/service/persistent_container.rs       |    8 +-
 core/startos/src/service/rpc.rs               |   21 +-
 core/startos/src/service/service_actor.rs     |    4 +-
 core/startos/src/service/service_map.rs       |    8 +-
 core/startos/src/service/transition/backup.rs |    7 +-
 .../startos/src/service/transition/restart.rs |    7 +-
 core/startos/src/ssh.rs                       |    2 +-
 core/startos/src/status/health_check.rs       |    3 +-
 core/startos/src/status/mod.rs                |   10 +-
 core/startos/src/util/io.rs                   |   31 +-
 core/startos/src/util/mod.rs                  |    3 +-
 core/startos/src/util/serde.rs                |   24 +-
 sdk/.gitignore                                |    9 +-
 sdk/.prettierignore                           |    2 +-
 sdk/Makefile                                  |   71 +-
 sdk/base/.gitignore                           |    5 +
 sdk/{ => base}/LICENSE                        |    0
 sdk/base/README.md                            |    1 +
 sdk/{ => base}/jest.config.js                 |    0
 sdk/base/lib/Effects.ts                       |  191 +
 sdk/base/lib/actions/index.ts                 |   65 +
 .../lib/actions/input}/builder/index.ts       |    4 +-
 .../lib/actions/input/builder/inputSpec.ts}   |   42 +-
 .../lib/actions/input}/builder/list.ts        |   68 +-
 .../lib/actions/input}/builder/value.ts       |  283 +-
 .../lib/actions/input}/builder/variants.ts    |   25 +-
 sdk/base/lib/actions/input/index.ts           |    3 +
 .../lib/actions/input/inputSpecConstants.ts}  |   21 +-
 .../lib/actions/input/inputSpecTypes.ts}      |   37 +-
 sdk/base/lib/actions/setupActions.ts          |  152 +
 sdk/base/lib/backup/Backups.ts                |  208 +
 sdk/base/lib/backup/setupBackups.ts           |   39 +
 sdk/base/lib/dependencies/Dependency.ts       |   21 +
 .../lib/dependencies/dependencies.ts          |   33 +-
 sdk/{ => base}/lib/dependencies/index.ts      |    3 -
 .../lib/dependencies/setupDependencies.ts     |   56 +
 sdk/{ => base}/lib/exver/exver.pegjs          |    0
 sdk/{ => base}/lib/exver/exver.ts             |    0
 sdk/{ => base}/lib/exver/index.ts             |    0
 .../index.browser.ts => base/lib/index.ts}    |    9 +-
 .../lib/interfaces/AddressReceipt.ts          |    0
 sdk/{ => base}/lib/interfaces/Host.ts         |   28 +-
 sdk/{ => base}/lib/interfaces/Origin.ts       |    6 +-
 .../lib/interfaces/ServiceInterfaceBuilder.ts |    4 +-
 .../lib/interfaces/interfaceReceipt.ts        |    0
 sdk/base/lib/interfaces/setupInterfaces.ts    |   54 +
 .../lib/osBindings/AcceptSigners.ts           |    0
 sdk/{ => base}/lib/osBindings/ActionId.ts     |    0
 .../lib/osBindings/ActionInput.ts}            |    6 +-
 .../lib/osBindings/ActionMetadata.ts          |    5 +-
 sdk/base/lib/osBindings/ActionRequest.ts      |   13 +
 .../lib/osBindings/ActionRequestCondition.ts} |    2 +-
 sdk/base/lib/osBindings/ActionRequestEntry.ts |    4 +
 sdk/base/lib/osBindings/ActionRequestInput.ts |    6 +
 .../lib/osBindings/ActionRequestTrigger.ts    |    7 +
 sdk/base/lib/osBindings/ActionVisibility.ts   |    6 +
 .../lib/osBindings/AddAdminParams.ts          |    0
 .../lib/osBindings/AddAssetParams.ts          |    0
 .../lib/osBindings/AddPackageParams.ts        |    0
 .../lib/osBindings/AddSslOptions.ts           |    0
 .../lib/osBindings/AddVersionParams.ts        |    0
 sdk/{ => base}/lib/osBindings/AddressInfo.ts  |    0
 sdk/{ => base}/lib/osBindings/Alerts.ts       |    0
 sdk/{ => base}/lib/osBindings/Algorithm.ts    |    0
 .../lib/osBindings/AllPackageData.ts          |    0
 sdk/base/lib/osBindings/AllowedStatuses.ts    |    3 +
 sdk/{ => base}/lib/osBindings/AlpnInfo.ts     |    0
 sdk/{ => base}/lib/osBindings/AnySignature.ts |    0
 .../lib/osBindings/AnySigningKey.ts           |    0
 .../lib/osBindings/AnyVerifyingKey.ts         |    0
 sdk/{ => base}/lib/osBindings/ApiState.ts     |    0
 sdk/{ => base}/lib/osBindings/AttachParams.ts |    0
 .../lib/osBindings/BackupProgress.ts          |    0
 .../lib/osBindings/BackupTargetFS.ts          |    0
 sdk/{ => base}/lib/osBindings/Base64.ts       |    0
 sdk/base/lib/osBindings/BindId.ts             |    4 +
 sdk/{ => base}/lib/osBindings/BindInfo.ts     |    2 +-
 sdk/{ => base}/lib/osBindings/BindOptions.ts  |    0
 sdk/{ => base}/lib/osBindings/BindParams.ts   |    0
 .../lib/osBindings/Blake3Commitment.ts        |    0
 sdk/{ => base}/lib/osBindings/BlockDev.ts     |    0
 sdk/{ => base}/lib/osBindings/CallbackId.ts   |    0
 sdk/{ => base}/lib/osBindings/Category.ts     |    0
 .../lib/osBindings/CheckDependenciesParam.ts  |    0
 .../lib/osBindings/CheckDependenciesResult.ts |    9 +-
 sdk/{ => base}/lib/osBindings/Cifs.ts         |    0
 .../osBindings/ClearActionRequestsParams.ts   |    5 +
 sdk/base/lib/osBindings/ClearActionsParams.ts |    4 +
 .../lib/osBindings/ClearBindingsParams.ts     |    4 +
 .../lib/osBindings/ClearCallbacksParams.ts    |    3 +
 .../ClearServiceInterfacesParams.ts           |    4 +
 sdk/{ => base}/lib/osBindings/ContactInfo.ts  |    0
 .../osBindings/CreateSubcontainerFsParams.ts  |    0
 .../lib/osBindings/CurrentDependencies.ts     |    0
 .../lib/osBindings/CurrentDependencyInfo.ts   |    1 -
 sdk/{ => base}/lib/osBindings/DataUrl.ts      |    0
 sdk/{ => base}/lib/osBindings/DepInfo.ts      |    0
 sdk/{ => base}/lib/osBindings/Dependencies.ts |    0
 .../lib/osBindings/DependencyKind.ts          |    0
 .../lib/osBindings/DependencyMetadata.ts      |    0
 .../lib/osBindings/DependencyRequirement.ts   |    0
 sdk/{ => base}/lib/osBindings/Description.ts  |    0
 .../osBindings/DestroySubcontainerFsParams.ts |    0
 sdk/{ => base}/lib/osBindings/Duration.ts     |    0
 sdk/{ => base}/lib/osBindings/EchoParams.ts   |    0
 .../lib/osBindings/EncryptedWire.ts           |    0
 .../lib/osBindings/ExportActionParams.ts      |    7 +-
 .../ExportServiceInterfaceParams.ts           |    0
 .../osBindings/ExposeForDependentsParams.ts   |    0
 sdk/{ => base}/lib/osBindings/FullIndex.ts    |    0
 sdk/{ => base}/lib/osBindings/FullProgress.ts |    0
 .../lib/osBindings/GetActionInputParams.ts}   |    3 +-
 .../lib/osBindings/GetHostInfoParams.ts       |    0
 .../lib/osBindings/GetOsAssetParams.ts        |    0
 .../lib/osBindings/GetOsVersionParams.ts      |    0
 .../lib/osBindings/GetPackageParams.ts        |    0
 .../lib/osBindings/GetPackageResponse.ts      |    0
 .../lib/osBindings/GetPackageResponseFull.ts  |    0
 .../lib/osBindings/GetPrimaryUrlParams.ts     |    0
 .../osBindings/GetServiceInterfaceParams.ts   |    0
 .../osBindings/GetServicePortForwardParams.ts |    0
 .../lib/osBindings/GetSslCertificateParams.ts |    0
 .../lib/osBindings/GetSslKeyParams.ts         |    0
 .../lib/osBindings/GetStoreParams.ts          |    0
 .../lib/osBindings/GetSystemSmtpParams.ts     |    0
 sdk/{ => base}/lib/osBindings/Governor.ts     |    0
 sdk/{ => base}/lib/osBindings/Guid.ts         |    0
 .../lib/osBindings/HardwareRequirements.ts    |    0
 .../lib/osBindings/HealthCheckId.ts           |    0
 sdk/{ => base}/lib/osBindings/Host.ts         |    0
 sdk/{ => base}/lib/osBindings/HostAddress.ts  |    0
 sdk/{ => base}/lib/osBindings/HostId.ts       |    0
 sdk/{ => base}/lib/osBindings/HostKind.ts     |    0
 sdk/{ => base}/lib/osBindings/HostnameInfo.ts |    0
 sdk/{ => base}/lib/osBindings/Hosts.ts        |    0
 sdk/{ => base}/lib/osBindings/ImageConfig.ts  |    0
 sdk/{ => base}/lib/osBindings/ImageId.ts      |    0
 .../lib/osBindings/ImageMetadata.ts           |    0
 sdk/{ => base}/lib/osBindings/ImageSource.ts  |    0
 .../lib/osBindings/InitProgressRes.ts         |    0
 .../lib/osBindings/InstallParams.ts           |    0
 .../lib/osBindings/InstalledState.ts          |    0
 .../lib/osBindings/InstalledVersionParams.ts  |    0
 .../lib/osBindings/InstallingInfo.ts          |    0
 .../lib/osBindings/InstallingState.ts         |    0
 sdk/{ => base}/lib/osBindings/IpHostname.ts   |    0
 sdk/{ => base}/lib/osBindings/IpInfo.ts       |    0
 sdk/{ => base}/lib/osBindings/LanInfo.ts      |    0
 .../osBindings/ListServiceInterfacesParams.ts |    0
 .../osBindings/ListVersionSignersParams.ts    |    0
 sdk/{ => base}/lib/osBindings/LoginParams.ts  |    0
 sdk/{ => base}/lib/osBindings/MainStatus.ts   |   14 +-
 sdk/{ => base}/lib/osBindings/Manifest.ts     |    1 -
 .../lib/osBindings/MaybeUtf8String.ts         |    0
 .../lib/osBindings/MerkleArchiveCommitment.ts |    0
 sdk/{ => base}/lib/osBindings/MountParams.ts  |    0
 sdk/{ => base}/lib/osBindings/MountTarget.ts  |    0
 .../lib/osBindings/NamedHealthCheckResult.ts  |    0
 .../lib/osBindings/NamedProgress.ts           |    0
 .../lib/osBindings/OnionHostname.ts           |    0
 sdk/{ => base}/lib/osBindings/OsIndex.ts      |    0
 .../lib/osBindings/OsVersionInfo.ts           |    0
 .../lib/osBindings/OsVersionInfoMap.ts        |    0
 .../lib/osBindings/PackageDataEntry.ts        |    6 +-
 .../lib/osBindings/PackageDetailLevel.ts      |    0
 sdk/{ => base}/lib/osBindings/PackageId.ts    |    0
 sdk/{ => base}/lib/osBindings/PackageIndex.ts |    0
 sdk/{ => base}/lib/osBindings/PackageInfo.ts  |    0
 .../lib/osBindings/PackageInfoShort.ts        |    0
 sdk/{ => base}/lib/osBindings/PackageState.ts |    0
 .../lib/osBindings/PackageVersionInfo.ts      |    0
 sdk/{ => base}/lib/osBindings/PasswordType.ts |    0
 sdk/{ => base}/lib/osBindings/PathOrUrl.ts    |    0
 sdk/{ => base}/lib/osBindings/ProcedureId.ts  |    0
 sdk/{ => base}/lib/osBindings/Progress.ts     |    0
 sdk/{ => base}/lib/osBindings/Public.ts       |    0
 .../lib/osBindings/RecoverySource.ts          |    0
 .../lib/osBindings/RegistryAsset.ts           |    0
 sdk/{ => base}/lib/osBindings/RegistryInfo.ts |    0
 .../lib/osBindings/RemoveVersionParams.ts     |    0
 .../lib/osBindings/ReplayId.ts}               |    2 +-
 .../lib/osBindings/RequestActionParams.ts     |   15 +
 .../lib/osBindings/RequestCommitment.ts       |    0
 .../lib/osBindings/RunActionParams.ts}        |    2 +-
 sdk/{ => base}/lib/osBindings/Security.ts     |    0
 sdk/{ => base}/lib/osBindings/ServerInfo.ts   |    0
 sdk/{ => base}/lib/osBindings/ServerSpecs.ts  |    0
 sdk/{ => base}/lib/osBindings/ServerStatus.ts |    0
 .../lib/osBindings/ServiceInterface.ts        |    0
 .../lib/osBindings/ServiceInterfaceId.ts      |    0
 .../lib/osBindings/ServiceInterfaceType.ts    |    0
 sdk/{ => base}/lib/osBindings/Session.ts      |    0
 sdk/{ => base}/lib/osBindings/SessionList.ts  |    0
 sdk/{ => base}/lib/osBindings/Sessions.ts     |    0
 .../lib/osBindings/SetDataVersionParams.ts    |    0
 .../lib/osBindings/SetDependenciesParams.ts   |    2 -
 sdk/{ => base}/lib/osBindings/SetHealth.ts    |    0
 .../lib/osBindings/SetMainStatus.ts           |    0
 .../lib/osBindings/SetMainStatusStatus.ts     |    0
 .../lib/osBindings/SetStoreParams.ts          |    0
 .../lib/osBindings/SetupExecuteParams.ts      |    0
 .../lib/osBindings/SetupProgress.ts           |    0
 sdk/{ => base}/lib/osBindings/SetupResult.ts  |    0
 .../lib/osBindings/SetupStatusRes.ts          |    0
 .../lib/osBindings/SignAssetParams.ts         |    0
 sdk/{ => base}/lib/osBindings/SignerInfo.ts   |    0
 sdk/{ => base}/lib/osBindings/SmtpValue.ts    |    0
 sdk/{ => base}/lib/osBindings/StartStop.ts    |    0
 .../lib/osBindings/UpdatingState.ts           |    0
 .../lib/osBindings/VerifyCifsParams.ts        |    0
 sdk/{ => base}/lib/osBindings/Version.ts      |    0
 .../lib/osBindings/VersionSignerParams.ts     |    0
 sdk/{ => base}/lib/osBindings/VolumeId.ts     |    0
 sdk/{ => base}/lib/osBindings/WifiInfo.ts     |    0
 sdk/{ => base}/lib/osBindings/index.ts        |   21 +-
 sdk/{ => base}/lib/s9pk/index.ts              |    0
 .../s9pk/merkleArchive/directoryContents.ts   |    0
 .../lib/s9pk/merkleArchive/fileContents.ts    |    0
 .../lib/s9pk/merkleArchive/index.ts           |    0
 .../lib/s9pk/merkleArchive/varint.ts          |    2 +-
 sdk/{ => base}/lib/test/exverList.test.ts     |    0
 sdk/{ => base}/lib/test/graph.test.ts         |    2 +-
 .../lib/test/inputSpecTypes.test.ts}          |   15 +-
 .../lib/test/startosTypeValidation.test.ts    |   34 +-
 .../lib/test/util.deepMerge.test.ts           |   12 +-
 .../lib/test/util.getNetworkInterface.test.ts |    0
 sdk/base/lib/types.ts                         |  297 ++
 sdk/base/lib/types/ManifestTypes.ts           |  159 +
 sdk/{ => base}/lib/util/GetSystemSmtp.ts      |    4 +-
 sdk/{ => base}/lib/util/Hostname.ts           |    0
 .../store => base/lib/util}/PathBuilder.ts    |    0
 sdk/base/lib/util/asError.ts                  |    9 +
 sdk/{ => base}/lib/util/deepEqual.ts          |    0
 sdk/base/lib/util/deepMerge.ts                |   86 +
 sdk/{ => base}/lib/util/getDefaultString.ts   |    2 +-
 sdk/{ => base}/lib/util/getRandomCharInSet.ts |    0
 sdk/{ => base}/lib/util/getRandomString.ts    |    2 +-
 .../lib/util/getServiceInterface.ts           |    6 +-
 .../lib/util/getServiceInterfaces.ts          |    4 +-
 sdk/{ => base}/lib/util/graph.ts              |    0
 sdk/{ => base}/lib/util/inMs.test.ts          |    0
 sdk/{ => base}/lib/util/inMs.ts               |    2 -
 sdk/base/lib/util/index.ts                    |   22 +
 sdk/base/lib/util/nullIfEmpty.ts              |   10 +
 sdk/{ => base}/lib/util/once.ts               |    0
 sdk/{ => base}/lib/util/patterns.ts           |    2 +-
 sdk/{ => base}/lib/util/regexes.ts            |    0
 sdk/{ => base}/lib/util/splitCommand.ts       |    0
 .../lib/util/stringFromStdErrOut.ts           |    0
 sdk/{ => base}/lib/util/typeHelpers.ts        |    0
 sdk/base/package-lock.json                    | 4677 ++++++++++++++++
 sdk/base/package.json                         |   51 +
 .../tsconfig.json}                            |    8 +-
 sdk/lib/Dependency.ts                         |   18 -
 sdk/lib/StartSdk.ts                           |  805 ---
 sdk/lib/actions/createAction.ts               |   89 -
 sdk/lib/actions/index.ts                      |    3 -
 sdk/lib/actions/setupActions.ts               |   29 -
 sdk/lib/backup/Backups.ts                     |  209 -
 sdk/lib/backup/setupBackups.ts                |   45 -
 sdk/lib/config/configDependencies.ts          |   28 -
 sdk/lib/config/index.ts                       |    3 -
 sdk/lib/config/setupConfig.ts                 |   87 -
 sdk/lib/dependencies/DependencyConfig.ts      |   39 -
 sdk/lib/dependencies/setupDependencyConfig.ts |   22 -
 sdk/lib/health/HealthReceipt.ts               |    4 -
 sdk/lib/health/index.ts                       |    3 -
 sdk/lib/interfaces/setupInterfaces.ts         |   23 -
 sdk/lib/manifest/ManifestTypes.ts             |   84 -
 sdk/lib/manifest/index.ts                     |    2 -
 sdk/lib/store/setupExposeStore.ts             |   12 -
 sdk/lib/test/setupDependencyConfig.test.ts    |   27 -
 sdk/lib/types.ts                              |  523 --
 sdk/lib/util/asError.ts                       |    6 -
 sdk/lib/util/deepMerge.ts                     |   17 -
 sdk/lib/util/fileHelper.ts                    |  150 -
 sdk/lib/util/index.browser.ts                 |   10 -
 sdk/lib/util/index.ts                         |   16 -
 sdk/lib/util/nullIfEmpty.ts                   |   12 -
 sdk/package-lock.json                         | 4674 +---------------
 sdk/package/.gitignore                        |    5 +
 sdk/package/.npmignore                        |    1 +
 sdk/package/.prettierignore                   |    1 +
 sdk/package/LICENSE                           |   21 +
 sdk/{ => package}/README.md                   |    0
 sdk/package/jest.config.js                    |    8 +
 sdk/package/lib/StartSdk.ts                   | 1410 +++++
 sdk/package/lib/backup/Backups.ts             |  208 +
 sdk/{ => package}/lib/backup/index.ts         |    1 -
 sdk/package/lib/backup/setupBackups.ts        |   39 +
 sdk/{ => package}/lib/health/HealthCheck.ts   |    8 +-
 .../lib/health/checkFns/HealthCheckResult.ts  |    2 +-
 .../lib/health/checkFns/checkPortListening.ts |    4 +-
 .../lib/health/checkFns/checkWebUrl.ts        |    4 +-
 .../lib/health/checkFns/index.ts              |    0
 .../lib/health/checkFns/runHealthScript.ts    |    4 +-
 sdk/package/lib/health/index.ts               |    1 +
 sdk/{ => package}/lib/index.ts                |   42 +-
 sdk/{ => package}/lib/inits/index.ts          |    0
 sdk/{ => package}/lib/inits/setupInit.ts      |   42 +-
 sdk/{ => package}/lib/inits/setupInstall.ts   |    4 +-
 sdk/{ => package}/lib/inits/setupUninstall.ts |    4 +-
 .../lib/mainFn/CommandController.ts           |    8 +-
 sdk/{ => package}/lib/mainFn/Daemon.ts        |    4 +-
 sdk/{ => package}/lib/mainFn/Daemons.ts       |   30 +-
 sdk/{ => package}/lib/mainFn/HealthDaemon.ts  |    4 +-
 sdk/{ => package}/lib/mainFn/Mounts.ts        |    2 +-
 sdk/{ => package}/lib/mainFn/index.ts         |   12 +-
 .../lib/manifest/setupManifest.ts             |   27 +-
 sdk/{ => package}/lib/store/getStore.ts       |    6 +-
 sdk/package/lib/store/setupExposeStore.ts     |   28 +
 .../lib/test/health.readyCheck.test.ts        |    0
 sdk/{ => package}/lib/test/host.test.ts       |    6 +-
 .../lib/test/inputSpecBuilder.test.ts}        |   52 +-
 sdk/{ => package}/lib/test/makeOutput.ts      |    2 +-
 sdk/{ => package}/lib/test/output.sdk.ts      |    0
 sdk/{ => package}/lib/test/output.test.ts     |   43 +-
 sdk/{ => package}/lib/test/store.test.ts      |   65 +-
 sdk/{ => package}/lib/trigger/TriggerInput.ts |    2 +-
 .../lib/trigger/changeOnFirstSuccess.ts       |    0
 .../lib/trigger/cooldownTrigger.ts            |    0
 .../lib/trigger/defaultTrigger.ts             |    0
 sdk/{ => package}/lib/trigger/index.ts        |    1 -
 sdk/{ => package}/lib/trigger/lastStatus.ts   |    2 +-
 .../lib/trigger/successFailure.ts             |    0
 .../lib/util/GetSslCertificate.ts             |    4 +-
 sdk/{ => package}/lib/util/SubContainer.ts    |    8 +-
 sdk/package/lib/util/fileHelper.ts            |  214 +
 sdk/package/lib/util/index.ts                 |    4 +
 sdk/{ => package}/lib/version/VersionGraph.ts |   13 +-
 sdk/{ => package}/lib/version/VersionInfo.ts  |   25 +-
 sdk/{ => package}/lib/version/index.ts        |    0
 sdk/package/package-lock.json                 | 4706 +++++++++++++++++
 sdk/{ => package}/package.json                |   14 +-
 sdk/{ => package}/scripts/oldSpecToBuilder.ts |   30 +-
 sdk/package/tsconfig.json                     |   19 +
 sdk/tsconfig-cjs.json                         |    8 -
 sdk/tsconfig.json                             |    8 -
 web/README.md                                 |   16 +-
 web/package-lock.json                         |   31 +-
 web/package.json                              |    2 +-
 .../src/app/pages/loading/loading.page.html   |    2 +-
 .../backup-drives/backup-drives.component.ts  |   12 +-
 .../ui/src/app/components/form.component.ts   |   15 +-
 .../ui/src/app/components/form/control.ts     |    4 +-
 .../app/components/form/filter-hidden.pipe.ts |   15 +
 .../form/form-array/form-array.component.ts   |    4 +-
 .../form/form-color/form-color.component.ts   |    4 +-
 .../form-control/form-control.component.html  |    2 +-
 .../form-control/form-control.component.ts    |    4 +-
 .../form-control/form-control.providers.ts    |    4 +-
 .../form-datetime/form-datetime.component.ts  |    4 +-
 .../form/form-group/form-group.component.html |    2 +-
 .../form/form-group/form-group.component.ts   |    4 +-
 .../form-multiselect.component.ts             |    4 +-
 .../form/form-number/form-number.component.ts |    4 +-
 .../form/form-object/form-object.component.ts |    4 +-
 .../form/form-select/form-select.component.ts |    4 +-
 .../form/form-text/form-text.component.ts     |    4 +-
 .../form-textarea/form-textarea.component.ts  |    4 +-
 .../form/form-toggle/form-toggle.component.ts |    7 +-
 .../form/form-union/form-union.component.ts   |    6 +-
 .../ui/src/app/components/form/form.module.ts |    2 +
 .../ui/src/app/components/form/hint.pipe.ts   |    4 +-
 ...p.component.ts => action-dep.component.ts} |   29 +-
 .../src/app/modals/action-input.component.ts  |  208 +
 .../action-success/action-success.page.ts     |    4 +-
 .../ui/src/app/modals/config.component.ts     |  261 -
 .../marketplace-settings.page.ts              |    4 +-
 .../modals/os-welcome/os-welcome.page.html    |    5 +-
 .../app-actions-item.component.html           |    7 +-
 .../app-actions/app-actions.page.html         |   50 +-
 .../app-actions/app-actions.page.ts           |  196 +-
 .../app-list-pkg/app-list-pkg.component.html  |    4 +-
 .../app-list-pkg/app-list-pkg.component.ts    |   10 +-
 .../app-properties/app-properties.page.ts     |    2 +-
 .../apps-routes/app-show/app-show.page.html   |    4 +-
 .../apps-routes/app-show/app-show.page.ts     |   48 +-
 .../app-show-status.component.html            |    8 +-
 .../app-show-status.component.ts              |   29 +-
 .../app-show/pipes/to-buttons.pipe.ts         |   35 +-
 .../app-show/pipes/to-health-checks.pipe.ts   |    8 +-
 .../backing-up/backing-up.component.ts        |    4 +-
 .../server-show/server-show.page.ts           |   10 +-
 .../app/pages/server-routes/wifi/wifi.page.ts |    4 +-
 .../app/pipes/launchable/launchable.pipe.ts   |    2 +-
 .../ui/src/app/services/action.service.ts     |  159 +
 .../ui/src/app/services/api/api.fixures.ts    |  215 +-
 .../ui/src/app/services/api/api.types.ts      |   52 +-
 .../app/services/api/embassy-api.service.ts   |   22 +-
 .../services/api/embassy-live-api.service.ts  |   35 +-
 .../services/api/embassy-mock-api.service.ts  |   50 +-
 .../ui/src/app/services/api/mock-patch.ts     |   78 +-
 .../ui/src/app/services/config.service.ts     |    2 +-
 .../ui/src/app/services/dep-error.service.ts  |   13 +-
 .../ui/src/app/services/form.service.ts       |   90 +-
 .../services/pkg-status-rendering.service.ts  |   15 +-
 .../ui/src/app/util/configBuilderToSpec.ts    |    6 +-
 .../ui/src/app/util/get-package-data.ts       |   12 +
 469 files changed, 16213 insertions(+), 10480 deletions(-)
 delete mode 100644 container-runtime/readme.md
 delete mode 100644 container-runtime/src/Interfaces/MakeEffects.ts
 rename core/{startos/src/util => models/src}/clap.rs (91%)
 create mode 100644 core/models/src/id/replay.rs
 delete mode 100644 core/startos/src/config/action.rs
 delete mode 100644 core/startos/src/config/mod.rs
 delete mode 100644 core/startos/src/config/util.rs
 delete mode 100644 core/startos/src/service/config.rs
 delete mode 100644 core/startos/src/service/dependencies.rs
 delete mode 100644 core/startos/src/service/effects/config.rs
 create mode 100644 sdk/base/.gitignore
 rename sdk/{ => base}/LICENSE (100%)
 create mode 100644 sdk/base/README.md
 rename sdk/{ => base}/jest.config.js (100%)
 create mode 100644 sdk/base/lib/Effects.ts
 create mode 100644 sdk/base/lib/actions/index.ts
 rename sdk/{lib/config => base/lib/actions/input}/builder/index.ts (51%)
 rename sdk/{lib/config/builder/config.ts => base/lib/actions/input/builder/inputSpec.ts} (73%)
 rename sdk/{lib/config => base/lib/actions/input}/builder/list.ts (74%)
 rename sdk/{lib/config => base/lib/actions/input}/builder/value.ts (72%)
 rename sdk/{lib/config => base/lib/actions/input}/builder/variants.ts (80%)
 create mode 100644 sdk/base/lib/actions/input/index.ts
 rename sdk/{lib/config/configConstants.ts => base/lib/actions/input/inputSpecConstants.ts} (72%)
 rename sdk/{lib/config/configTypes.ts => base/lib/actions/input/inputSpecTypes.ts} (74%)
 create mode 100644 sdk/base/lib/actions/setupActions.ts
 create mode 100644 sdk/base/lib/backup/Backups.ts
 create mode 100644 sdk/base/lib/backup/setupBackups.ts
 create mode 100644 sdk/base/lib/dependencies/Dependency.ts
 rename sdk/{ => base}/lib/dependencies/dependencies.ts (89%)
 rename sdk/{ => base}/lib/dependencies/index.ts (78%)
 create mode 100644 sdk/base/lib/dependencies/setupDependencies.ts
 rename sdk/{ => base}/lib/exver/exver.pegjs (100%)
 rename sdk/{ => base}/lib/exver/exver.ts (100%)
 rename sdk/{ => base}/lib/exver/index.ts (100%)
 rename sdk/{lib/index.browser.ts => base/lib/index.ts} (51%)
 rename sdk/{ => base}/lib/interfaces/AddressReceipt.ts (100%)
 rename sdk/{ => base}/lib/interfaces/Host.ts (82%)
 rename sdk/{ => base}/lib/interfaces/Origin.ts (89%)
 rename sdk/{ => base}/lib/interfaces/ServiceInterfaceBuilder.ts (90%)
 rename sdk/{ => base}/lib/interfaces/interfaceReceipt.ts (100%)
 create mode 100644 sdk/base/lib/interfaces/setupInterfaces.ts
 rename sdk/{ => base}/lib/osBindings/AcceptSigners.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ActionId.ts (100%)
 rename sdk/{lib/osBindings/Status.ts => base/lib/osBindings/ActionInput.ts} (50%)
 rename sdk/{ => base}/lib/osBindings/ActionMetadata.ts (74%)
 create mode 100644 sdk/base/lib/osBindings/ActionRequest.ts
 rename sdk/{lib/osBindings/AllowedStatuses.ts => base/lib/osBindings/ActionRequestCondition.ts} (61%)
 create mode 100644 sdk/base/lib/osBindings/ActionRequestEntry.ts
 create mode 100644 sdk/base/lib/osBindings/ActionRequestInput.ts
 create mode 100644 sdk/base/lib/osBindings/ActionRequestTrigger.ts
 create mode 100644 sdk/base/lib/osBindings/ActionVisibility.ts
 rename sdk/{ => base}/lib/osBindings/AddAdminParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AddAssetParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AddPackageParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AddSslOptions.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AddVersionParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AddressInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Alerts.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Algorithm.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AllPackageData.ts (100%)
 create mode 100644 sdk/base/lib/osBindings/AllowedStatuses.ts
 rename sdk/{ => base}/lib/osBindings/AlpnInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AnySignature.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AnySigningKey.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AnyVerifyingKey.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ApiState.ts (100%)
 rename sdk/{ => base}/lib/osBindings/AttachParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/BackupProgress.ts (100%)
 rename sdk/{ => base}/lib/osBindings/BackupTargetFS.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Base64.ts (100%)
 create mode 100644 sdk/base/lib/osBindings/BindId.ts
 rename sdk/{ => base}/lib/osBindings/BindInfo.ts (71%)
 rename sdk/{ => base}/lib/osBindings/BindOptions.ts (100%)
 rename sdk/{ => base}/lib/osBindings/BindParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Blake3Commitment.ts (100%)
 rename sdk/{ => base}/lib/osBindings/BlockDev.ts (100%)
 rename sdk/{ => base}/lib/osBindings/CallbackId.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Category.ts (100%)
 rename sdk/{ => base}/lib/osBindings/CheckDependenciesParam.ts (100%)
 rename sdk/{ => base}/lib/osBindings/CheckDependenciesResult.ts (62%)
 rename sdk/{ => base}/lib/osBindings/Cifs.ts (100%)
 create mode 100644 sdk/base/lib/osBindings/ClearActionRequestsParams.ts
 create mode 100644 sdk/base/lib/osBindings/ClearActionsParams.ts
 create mode 100644 sdk/base/lib/osBindings/ClearBindingsParams.ts
 create mode 100644 sdk/base/lib/osBindings/ClearCallbacksParams.ts
 create mode 100644 sdk/base/lib/osBindings/ClearServiceInterfacesParams.ts
 rename sdk/{ => base}/lib/osBindings/ContactInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/CreateSubcontainerFsParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/CurrentDependencies.ts (100%)
 rename sdk/{ => base}/lib/osBindings/CurrentDependencyInfo.ts (92%)
 rename sdk/{ => base}/lib/osBindings/DataUrl.ts (100%)
 rename sdk/{ => base}/lib/osBindings/DepInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Dependencies.ts (100%)
 rename sdk/{ => base}/lib/osBindings/DependencyKind.ts (100%)
 rename sdk/{ => base}/lib/osBindings/DependencyMetadata.ts (100%)
 rename sdk/{ => base}/lib/osBindings/DependencyRequirement.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Description.ts (100%)
 rename sdk/{ => base}/lib/osBindings/DestroySubcontainerFsParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Duration.ts (100%)
 rename sdk/{ => base}/lib/osBindings/EchoParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/EncryptedWire.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ExportActionParams.ts (58%)
 rename sdk/{ => base}/lib/osBindings/ExportServiceInterfaceParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ExposeForDependentsParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/FullIndex.ts (100%)
 rename sdk/{ => base}/lib/osBindings/FullProgress.ts (100%)
 rename sdk/{lib/osBindings/GetConfiguredParams.ts => base/lib/osBindings/GetActionInputParams.ts} (55%)
 rename sdk/{ => base}/lib/osBindings/GetHostInfoParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetOsAssetParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetOsVersionParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetPackageParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetPackageResponse.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetPackageResponseFull.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetPrimaryUrlParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetServiceInterfaceParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetServicePortForwardParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetSslCertificateParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetSslKeyParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetStoreParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/GetSystemSmtpParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Governor.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Guid.ts (100%)
 rename sdk/{ => base}/lib/osBindings/HardwareRequirements.ts (100%)
 rename sdk/{ => base}/lib/osBindings/HealthCheckId.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Host.ts (100%)
 rename sdk/{ => base}/lib/osBindings/HostAddress.ts (100%)
 rename sdk/{ => base}/lib/osBindings/HostId.ts (100%)
 rename sdk/{ => base}/lib/osBindings/HostKind.ts (100%)
 rename sdk/{ => base}/lib/osBindings/HostnameInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Hosts.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ImageConfig.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ImageId.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ImageMetadata.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ImageSource.ts (100%)
 rename sdk/{ => base}/lib/osBindings/InitProgressRes.ts (100%)
 rename sdk/{ => base}/lib/osBindings/InstallParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/InstalledState.ts (100%)
 rename sdk/{ => base}/lib/osBindings/InstalledVersionParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/InstallingInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/InstallingState.ts (100%)
 rename sdk/{ => base}/lib/osBindings/IpHostname.ts (100%)
 rename sdk/{ => base}/lib/osBindings/IpInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/LanInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ListServiceInterfacesParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ListVersionSignersParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/LoginParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/MainStatus.ts (69%)
 rename sdk/{ => base}/lib/osBindings/Manifest.ts (98%)
 rename sdk/{ => base}/lib/osBindings/MaybeUtf8String.ts (100%)
 rename sdk/{ => base}/lib/osBindings/MerkleArchiveCommitment.ts (100%)
 rename sdk/{ => base}/lib/osBindings/MountParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/MountTarget.ts (100%)
 rename sdk/{ => base}/lib/osBindings/NamedHealthCheckResult.ts (100%)
 rename sdk/{ => base}/lib/osBindings/NamedProgress.ts (100%)
 rename sdk/{ => base}/lib/osBindings/OnionHostname.ts (100%)
 rename sdk/{ => base}/lib/osBindings/OsIndex.ts (100%)
 rename sdk/{ => base}/lib/osBindings/OsVersionInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/OsVersionInfoMap.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PackageDataEntry.ts (83%)
 rename sdk/{ => base}/lib/osBindings/PackageDetailLevel.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PackageId.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PackageIndex.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PackageInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PackageInfoShort.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PackageState.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PackageVersionInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PasswordType.ts (100%)
 rename sdk/{ => base}/lib/osBindings/PathOrUrl.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ProcedureId.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Progress.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Public.ts (100%)
 rename sdk/{ => base}/lib/osBindings/RecoverySource.ts (100%)
 rename sdk/{ => base}/lib/osBindings/RegistryAsset.ts (100%)
 rename sdk/{ => base}/lib/osBindings/RegistryInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/RemoveVersionParams.ts (100%)
 rename sdk/{lib/osBindings/SetConfigured.ts => base/lib/osBindings/ReplayId.ts} (67%)
 create mode 100644 sdk/base/lib/osBindings/RequestActionParams.ts
 rename sdk/{ => base}/lib/osBindings/RequestCommitment.ts (100%)
 rename sdk/{lib/osBindings/ExecuteAction.ts => base/lib/osBindings/RunActionParams.ts} (88%)
 rename sdk/{ => base}/lib/osBindings/Security.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ServerInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ServerSpecs.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ServerStatus.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ServiceInterface.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ServiceInterfaceId.ts (100%)
 rename sdk/{ => base}/lib/osBindings/ServiceInterfaceType.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Session.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SessionList.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Sessions.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetDataVersionParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetDependenciesParams.ts (82%)
 rename sdk/{ => base}/lib/osBindings/SetHealth.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetMainStatus.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetMainStatusStatus.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetStoreParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetupExecuteParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetupProgress.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetupResult.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SetupStatusRes.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SignAssetParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SignerInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/SmtpValue.ts (100%)
 rename sdk/{ => base}/lib/osBindings/StartStop.ts (100%)
 rename sdk/{ => base}/lib/osBindings/UpdatingState.ts (100%)
 rename sdk/{ => base}/lib/osBindings/VerifyCifsParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/Version.ts (100%)
 rename sdk/{ => base}/lib/osBindings/VersionSignerParams.ts (100%)
 rename sdk/{ => base}/lib/osBindings/VolumeId.ts (100%)
 rename sdk/{ => base}/lib/osBindings/WifiInfo.ts (100%)
 rename sdk/{ => base}/lib/osBindings/index.ts (88%)
 rename sdk/{ => base}/lib/s9pk/index.ts (100%)
 rename sdk/{ => base}/lib/s9pk/merkleArchive/directoryContents.ts (100%)
 rename sdk/{ => base}/lib/s9pk/merkleArchive/fileContents.ts (100%)
 rename sdk/{ => base}/lib/s9pk/merkleArchive/index.ts (100%)
 rename sdk/{ => base}/lib/s9pk/merkleArchive/varint.ts (96%)
 rename sdk/{ => base}/lib/test/exverList.test.ts (100%)
 rename sdk/{ => base}/lib/test/graph.test.ts (99%)
 rename sdk/{lib/test/configTypes.test.ts => base/lib/test/inputSpecTypes.test.ts} (64%)
 rename sdk/{ => base}/lib/test/startosTypeValidation.test.ts (81%)
 rename sdk/{ => base}/lib/test/util.deepMerge.test.ts (70%)
 rename sdk/{ => base}/lib/test/util.getNetworkInterface.test.ts (100%)
 create mode 100644 sdk/base/lib/types.ts
 create mode 100644 sdk/base/lib/types/ManifestTypes.ts
 rename sdk/{ => base}/lib/util/GetSystemSmtp.ts (90%)
 rename sdk/{ => base}/lib/util/Hostname.ts (100%)
 rename sdk/{lib/store => base/lib/util}/PathBuilder.ts (100%)
 create mode 100644 sdk/base/lib/util/asError.ts
 rename sdk/{ => base}/lib/util/deepEqual.ts (100%)
 create mode 100644 sdk/base/lib/util/deepMerge.ts
 rename sdk/{ => base}/lib/util/getDefaultString.ts (79%)
 rename sdk/{ => base}/lib/util/getRandomCharInSet.ts (100%)
 rename sdk/{ => base}/lib/util/getRandomString.ts (79%)
 rename sdk/{ => base}/lib/util/getServiceInterface.ts (98%)
 rename sdk/{ => base}/lib/util/getServiceInterfaces.ts (96%)
 rename sdk/{ => base}/lib/util/graph.ts (100%)
 rename sdk/{ => base}/lib/util/inMs.test.ts (100%)
 rename sdk/{ => base}/lib/util/inMs.ts (95%)
 create mode 100644 sdk/base/lib/util/index.ts
 create mode 100644 sdk/base/lib/util/nullIfEmpty.ts
 rename sdk/{ => base}/lib/util/once.ts (100%)
 rename sdk/{ => base}/lib/util/patterns.ts (96%)
 rename sdk/{ => base}/lib/util/regexes.ts (100%)
 rename sdk/{ => base}/lib/util/splitCommand.ts (100%)
 rename sdk/{ => base}/lib/util/stringFromStdErrOut.ts (100%)
 rename sdk/{ => base}/lib/util/typeHelpers.ts (100%)
 create mode 100644 sdk/base/package-lock.json
 create mode 100644 sdk/base/package.json
 rename sdk/{tsconfig-base.json => base/tsconfig.json} (78%)
 delete mode 100644 sdk/lib/Dependency.ts
 delete mode 100644 sdk/lib/StartSdk.ts
 delete mode 100644 sdk/lib/actions/createAction.ts
 delete mode 100644 sdk/lib/actions/index.ts
 delete mode 100644 sdk/lib/actions/setupActions.ts
 delete mode 100644 sdk/lib/backup/Backups.ts
 delete mode 100644 sdk/lib/backup/setupBackups.ts
 delete mode 100644 sdk/lib/config/configDependencies.ts
 delete mode 100644 sdk/lib/config/index.ts
 delete mode 100644 sdk/lib/config/setupConfig.ts
 delete mode 100644 sdk/lib/dependencies/DependencyConfig.ts
 delete mode 100644 sdk/lib/dependencies/setupDependencyConfig.ts
 delete mode 100644 sdk/lib/health/HealthReceipt.ts
 delete mode 100644 sdk/lib/health/index.ts
 delete mode 100644 sdk/lib/interfaces/setupInterfaces.ts
 delete mode 100644 sdk/lib/manifest/ManifestTypes.ts
 delete mode 100644 sdk/lib/manifest/index.ts
 delete mode 100644 sdk/lib/store/setupExposeStore.ts
 delete mode 100644 sdk/lib/test/setupDependencyConfig.test.ts
 delete mode 100644 sdk/lib/types.ts
 delete mode 100644 sdk/lib/util/asError.ts
 delete mode 100644 sdk/lib/util/deepMerge.ts
 delete mode 100644 sdk/lib/util/fileHelper.ts
 delete mode 100644 sdk/lib/util/index.browser.ts
 delete mode 100644 sdk/lib/util/index.ts
 delete mode 100644 sdk/lib/util/nullIfEmpty.ts
 create mode 100644 sdk/package/.gitignore
 create mode 100644 sdk/package/.npmignore
 create mode 100644 sdk/package/.prettierignore
 create mode 100644 sdk/package/LICENSE
 rename sdk/{ => package}/README.md (100%)
 create mode 100644 sdk/package/jest.config.js
 create mode 100644 sdk/package/lib/StartSdk.ts
 create mode 100644 sdk/package/lib/backup/Backups.ts
 rename sdk/{ => package}/lib/backup/index.ts (97%)
 create mode 100644 sdk/package/lib/backup/setupBackups.ts
 rename sdk/{ => package}/lib/health/HealthCheck.ts (88%)
 rename sdk/{ => package}/lib/health/checkFns/HealthCheckResult.ts (63%)
 rename sdk/{ => package}/lib/health/checkFns/checkPortListening.ts (94%)
 rename sdk/{ => package}/lib/health/checkFns/checkWebUrl.ts (90%)
 rename sdk/{ => package}/lib/health/checkFns/index.ts (100%)
 rename sdk/{ => package}/lib/health/checkFns/runHealthScript.ts (91%)
 create mode 100644 sdk/package/lib/health/index.ts
 rename sdk/{ => package}/lib/index.ts (58%)
 rename sdk/{ => package}/lib/inits/index.ts (100%)
 rename sdk/{ => package}/lib/inits/setupInit.ts (59%)
 rename sdk/{ => package}/lib/inits/setupInstall.ts (81%)
 rename sdk/{ => package}/lib/inits/setupUninstall.ts (86%)
 rename sdk/{ => package}/lib/mainFn/CommandController.ts (94%)
 rename sdk/{ => package}/lib/mainFn/Daemon.ts (96%)
 rename sdk/{ => package}/lib/mainFn/Daemons.ts (87%)
 rename sdk/{ => package}/lib/mainFn/HealthDaemon.ts (97%)
 rename sdk/{ => package}/lib/mainFn/Mounts.ts (98%)
 rename sdk/{ => package}/lib/mainFn/index.ts (77%)
 rename sdk/{ => package}/lib/manifest/setupManifest.ts (75%)
 rename sdk/{ => package}/lib/store/getStore.ts (90%)
 create mode 100644 sdk/package/lib/store/setupExposeStore.ts
 rename sdk/{ => package}/lib/test/health.readyCheck.test.ts (100%)
 rename sdk/{ => package}/lib/test/host.test.ts (78%)
 rename sdk/{lib/test/configBuilder.test.ts => package/lib/test/inputSpecBuilder.test.ts} (94%)
 rename sdk/{ => package}/lib/test/makeOutput.ts (99%)
 rename sdk/{ => package}/lib/test/output.sdk.ts (100%)
 rename sdk/{ => package}/lib/test/output.test.ts (72%)
 rename sdk/{ => package}/lib/test/store.test.ts (52%)
 rename sdk/{ => package}/lib/trigger/TriggerInput.ts (52%)
 rename sdk/{ => package}/lib/trigger/changeOnFirstSuccess.ts (100%)
 rename sdk/{ => package}/lib/trigger/cooldownTrigger.ts (100%)
 rename sdk/{ => package}/lib/trigger/defaultTrigger.ts (100%)
 rename sdk/{ => package}/lib/trigger/index.ts (83%)
 rename sdk/{ => package}/lib/trigger/lastStatus.ts (93%)
 rename sdk/{ => package}/lib/trigger/successFailure.ts (100%)
 rename sdk/{ => package}/lib/util/GetSslCertificate.ts (91%)
 rename sdk/{ => package}/lib/util/SubContainer.ts (98%)
 create mode 100644 sdk/package/lib/util/fileHelper.ts
 create mode 100644 sdk/package/lib/util/index.ts
 rename sdk/{ => package}/lib/version/VersionGraph.ts (94%)
 rename sdk/{ => package}/lib/version/VersionInfo.ts (68%)
 rename sdk/{ => package}/lib/version/index.ts (100%)
 create mode 100644 sdk/package/package-lock.json
 rename sdk/{ => package}/package.json (80%)
 rename sdk/{ => package}/scripts/oldSpecToBuilder.ts (94%)
 create mode 100644 sdk/package/tsconfig.json
 delete mode 100644 sdk/tsconfig-cjs.json
 delete mode 100644 sdk/tsconfig.json
 create mode 100644 web/projects/ui/src/app/components/form/filter-hidden.pipe.ts
 rename web/projects/ui/src/app/modals/{config-dep.component.ts => action-dep.component.ts} (78%)
 create mode 100644 web/projects/ui/src/app/modals/action-input.component.ts
 delete mode 100644 web/projects/ui/src/app/modals/config.component.ts
 create mode 100644 web/projects/ui/src/app/services/action.service.ts

diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 3497624e7..3490936b4 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -187,11 +187,14 @@ jobs:
         run: |
           mkdir -p web/node_modules
           mkdir -p web/dist/raw
+          mkdir -p core/startos/bindings
+          mkdir -p sdk/base/lib/osBindings
           mkdir -p container-runtime/node_modules
           mkdir -p container-runtime/dist
           mkdir -p container-runtime/dist/node_modules
           mkdir -p core/startos/bindings
           mkdir -p sdk/dist
+          mkdir -p sdk/baseDist
           mkdir -p patch-db/client/node_modules
           mkdir -p patch-db/client/dist
           mkdir -p web/.angular
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0a5eb38e9..3f47a65a4 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -11,7 +11,7 @@ on:
       - next/*
 
 env:
-  NODEJS_VERSION: "18.15.0"
+  NODEJS_VERSION: "20.16.0"
   ENVIRONMENT: dev-unstable
 
 jobs:
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index cb9385f41..c3c555a05 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -27,6 +27,7 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
 source ~/.bashrc
 nvm install 20
 nvm use 20
+nvm alias default 20 # this prevents your machine from reverting back to another version
 ```
 
 ## Cloning the repository
diff --git a/Makefile b/Makefile
index d085117b2..d7ff9ec6c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ COMPAT_SRC := $(shell git ls-files system-images/compat/)
 UTILS_SRC := $(shell git ls-files system-images/utils/)
 BINFMT_SRC := $(shell git ls-files system-images/binfmt/)
 CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) $(GIT_HASH_FILE)
-WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist/index.js web/patchdb-ui-seed.json sdk/dist/package.json
+WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules/.package-lock.json web/config.json patch-db/client/dist/index.js sdk/baseDist/package.json web/patchdb-ui-seed.json sdk/dist/package.json
 WEB_UI_SRC := $(shell git ls-files web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard)
 WEB_INSTALL_WIZARD_SRC := $(shell git ls-files web/projects/install-wizard)
@@ -48,7 +48,7 @@ endif
 
 .DELETE_ON_ERROR:
 
-.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole wormhole-deb test test-core test-sdk test-container-runtime
+.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole wormhole-deb test test-core test-sdk test-container-runtime registry
 
 all: $(ALL_TARGETS)
 
@@ -95,7 +95,7 @@ test: | test-core test-sdk test-container-runtime
 test-core: $(CORE_SRC) $(ENVIRONMENT_FILE) 
 	./core/run-tests.sh
 
-test-sdk: $(shell git ls-files sdk) sdk/lib/osBindings/index.ts
+test-sdk: $(shell git ls-files sdk) sdk/base/lib/osBindings/index.ts
 	cd sdk && make test
 
 test-container-runtime: container-runtime/node_modules/.package-lock.json $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
@@ -104,6 +104,9 @@ test-container-runtime: container-runtime/node_modules/.package-lock.json $(shel
 cli:
 	cd core && ./install-cli.sh
 
+registry:
+	cd core && ./build-registrybox.sh
+
 deb: results/$(BASENAME).deb
 
 debian/control: build/lib/depends build/lib/conflicts
@@ -223,20 +226,22 @@ container-runtime/node_modules/.package-lock.json: container-runtime/package.jso
 	npm --prefix container-runtime ci
 	touch container-runtime/node_modules/.package-lock.json
 
-sdk/lib/osBindings/index.ts: core/startos/bindings/index.ts
-	rsync -ac --delete core/startos/bindings/ sdk/lib/osBindings/
-	touch sdk/lib/osBindings/index.ts
+sdk/base/lib/osBindings/index.ts: core/startos/bindings/index.ts
+	mkdir -p sdk/base/lib/osBindings
+	rsync -ac --delete core/startos/bindings/ sdk/base/lib/osBindings/
+	touch sdk/base/lib/osBindings/index.ts
 
 core/startos/bindings/index.ts: $(shell git ls-files core) $(ENVIRONMENT_FILE)
 	rm -rf core/startos/bindings
 	./core/build-ts.sh
-	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1";/g' > core/startos/bindings/index.ts
-	npm --prefix sdk exec -- prettier --config ./sdk/package.json -w ./core/startos/bindings/*.ts
+	ls core/startos/bindings/*.ts | sed 's/core\/startos\/bindings\/\([^.]*\)\.ts/export { \1 } from ".\/\1";/g' | grep -v '"./index"' | tee core/startos/bindings/index.ts
+	npm --prefix sdk exec -- prettier --config ./sdk/base/package.json -w ./core/startos/bindings/*.ts
 	touch core/startos/bindings/index.ts
 
-sdk/dist/package.json: $(shell git ls-files sdk) sdk/lib/osBindings/index.ts
+sdk/dist/package.json sdk/baseDist/package.json: $(shell git ls-files sdk) sdk/base/lib/osBindings/index.ts
 	(cd sdk && make bundle)
 	touch sdk/dist/package.json
+	touch sdk/baseDist/package.json
 
 # TODO: make container-runtime its own makefile?
 container-runtime/dist/index.js: container-runtime/node_modules/.package-lock.json $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
@@ -272,11 +277,11 @@ core/target/$(ARCH)-unknown-linux-musl/release/containerbox: $(CORE_SRC) $(ENVIR
 	ARCH=$(ARCH) ./core/build-containerbox.sh
 	touch core/target/$(ARCH)-unknown-linux-musl/release/containerbox
 
-web/node_modules/.package-lock.json: web/package.json sdk/dist/package.json
+web/node_modules/.package-lock.json: web/package.json sdk/baseDist/package.json
 	npm --prefix web ci
 	touch web/node_modules/.package-lock.json
 
-web/.angular/.updated: patch-db/client/dist/index.js sdk/dist/package.json web/node_modules/.package-lock.json
+web/.angular/.updated: patch-db/client/dist/index.js sdk/baseDist/package.json web/node_modules/.package-lock.json
 	rm -rf web/.angular
 	mkdir -p web/.angular
 	touch web/.angular/.updated
@@ -329,4 +334,4 @@ cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console:
 	ARCH=$(ARCH) PREINSTALL="apk add musl-dev pkgconfig" ./build-cargo-dep.sh tokio-console
 
 cargo-deps/$(ARCH)-unknown-linux-musl/release/startos-backup-fs:
-	ARCH=$(ARCH) PREINSTALL="apk add fuse3 fuse3-dev fuse3-static musl-dev pkgconfig" ./build-cargo-dep.sh --git https://github.com/Start9Labs/start-fs.git startos-backup-fs
\ No newline at end of file
+	ARCH=$(ARCH) PREINSTALL="apk add fuse3 fuse3-dev fuse3-static musl-dev pkgconfig" ./build-cargo-dep.sh --git https://github.com/Start9Labs/start-fs.git startos-backup-fs
diff --git a/container-runtime/package-lock.json b/container-runtime/package-lock.json
index 2fddf23f2..2ff4bb8c6 100644
--- a/container-runtime/package-lock.json
+++ b/container-runtime/package-lock.json
@@ -20,7 +20,6 @@
         "node-fetch": "^3.1.0",
         "ts-matches": "^5.5.1",
         "tslib": "^2.5.3",
-        "tslog": "^4.9.3",
         "typescript": "^5.1.3",
         "yaml": "^2.3.1"
       },
@@ -36,9 +35,36 @@
         "typescript": ">5.2"
       }
     },
+    "../sdk/baseDist": {
+      "name": "@start9labs/start-sdk-base",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
+        "isomorphic-fetch": "^3.0.0",
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
+        "ts-matches": "^5.5.1",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "@types/lodash.merge": "^4.6.2",
+        "jest": "^29.4.3",
+        "peggy": "^3.0.2",
+        "prettier": "^3.2.5",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
+      }
+    },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha6",
+      "version": "0.3.6-alpha8",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
@@ -5628,17 +5654,6 @@
       "version": "2.6.3",
       "license": "0BSD"
     },
-    "node_modules/tslog": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/tslog/-/tslog-4.9.3.tgz",
-      "integrity": "sha512-oDWuGVONxhVEBtschLf2cs/Jy8i7h1T+CpdkTNWQgdAF7DhRo2G8vMCgILKe7ojdEkLhICWgI1LYSSKaJsRgcw==",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/fullstack-build/tslog?sponsor=1"
-      }
-    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -9758,11 +9773,6 @@
     "tslib": {
       "version": "2.6.3"
     },
-    "tslog": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/tslog/-/tslog-4.9.3.tgz",
-      "integrity": "sha512-oDWuGVONxhVEBtschLf2cs/Jy8i7h1T+CpdkTNWQgdAF7DhRo2G8vMCgILKe7ojdEkLhICWgI1LYSSKaJsRgcw=="
-    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
diff --git a/container-runtime/readme.md b/container-runtime/readme.md
deleted file mode 100644
index 023091463..000000000
--- a/container-runtime/readme.md
+++ /dev/null
@@ -1,86 +0,0 @@
-## Testing
-
-So, we are going to
-
-1. create a fake server
-2. pretend socket server os (while the fake server is running)
-3. Run a fake effects system (while 1/2 are running)
-
-In order to simulate that we created a server like the start-os and
-a fake server (in this case I am using syncthing-wrapper)
-
-### TODO
-
-Undo the packing that I have done earlier, and hijack the embassy.js to use the bundle service + code
-
-Converting embassy.js -> service.js
-
-```sequence {theme="hand"}
-startOs ->> startInit.js: Rpc Call
-startInit.js ->> service.js: Rpc Converted into js code
-```
-
-### Create a fake server
-
-```bash
-run_test () {
-    (
-        set -e
-        libs=/home/jh/Projects/start-os/libs/start_init
-        sockets=/tmp/start9
-        service=/home/jh/Projects/syncthing-wrapper
-
-        docker run  \
-            -v $libs:/libs \
-            -v $service:/service \
-            -w /libs \
-            --rm node:18-alpine \
-            sh -c "
-                npm i &&
-                npm run bundle:esbuild  &&
-                npm run bundle:service
-            "
-
-
-
-        docker run  \
-            -v ./libs/start_init/:/libs \
-            -w /libs \
-            --rm node:18-alpine \
-            sh -c "
-                npm i &&
-                npm run bundle:esbuild
-            "
-
-
-
-        rm -rf $sockets  || true
-        mkdir -p $sockets/sockets
-        cd $service
-        docker run \
-            -v $libs:/start-init \
-            -v $sockets:/start9 \
-            --rm -it $(docker build -q .) sh -c "
-                apk add nodejs &&
-                node /start-init/bundleEs.js
-            "
-    )
-}
-run_test
-```
-
-### Pretend Socket Server OS
-
-First we are going to create our fake server client with the bash then send it the json possible data
-
-```bash
-sudo socat - unix-client:/tmp/start9/sockets/rpc.sock
-```
-
-<!-- prettier-ignore -->
-```json
-{"id":"a","method":"run","params":{"methodName":"/dependencyMounts","methodArgs":[]}}
-{"id":"a","method":"run","params":{"methodName":"/actions/test","methodArgs":{"input":{"id": 1}}}}
-{"id":"b","method":"run","params":{"methodName":"/actions/test","methodArgs":{"id": 1}}}
-
-```
diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index 3338560c9..022d697ab 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -4,7 +4,7 @@ import { object, string, number, literals, some, unknown } from "ts-matches"
 import { Effects } from "../Models/Effects"
 
 import { CallbackHolder } from "../Models/CallbackHolder"
-import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
+import { asError } from "@start9labs/start-sdk/base/lib/util"
 const matchRpcError = object({
   error: object(
     {
@@ -35,7 +35,8 @@ let hostSystemId = 0
 
 export type EffectContext = {
   procedureId: string | null
-  callbacks: CallbackHolder | null
+  callbacks?: CallbackHolder
+  constRetry: () => void
 }
 
 const rpcRoundFor =
@@ -50,7 +51,7 @@ const rpcRoundFor =
         JSON.stringify({
           id,
           method,
-          params: { ...params, procedureId },
+          params: { ...params, procedureId: procedureId || undefined },
         }) + "\n",
       )
     })
@@ -67,7 +68,7 @@ const rpcRoundFor =
               let message = res.error.message
               console.error(
                 "Error in host RPC:",
-                utils.asError({ method, params }),
+                utils.asError({ method, params, error: res.error }),
               )
               if (string.test(res.error.data)) {
                 message += ": " + res.error.data
@@ -100,9 +101,49 @@ const rpcRoundFor =
     })
   }
 
-function makeEffects(context: EffectContext): Effects {
+export function makeEffects(context: EffectContext): Effects {
   const rpcRound = rpcRoundFor(context.procedureId)
   const self: Effects = {
+    constRetry: context.constRetry,
+    clearCallbacks(...[options]: Parameters<T.Effects["clearCallbacks"]>) {
+      return rpcRound("clear-callbacks", {
+        ...options,
+      }) as ReturnType<T.Effects["clearCallbacks"]>
+    },
+    action: {
+      clear(...[options]: Parameters<T.Effects["action"]["clear"]>) {
+        return rpcRound("action.clear", {
+          ...options,
+        }) as ReturnType<T.Effects["action"]["clear"]>
+      },
+      export(...[options]: Parameters<T.Effects["action"]["export"]>) {
+        return rpcRound("action.export", {
+          ...options,
+        }) as ReturnType<T.Effects["action"]["export"]>
+      },
+      getInput(...[options]: Parameters<T.Effects["action"]["getInput"]>) {
+        return rpcRound("action.get-input", {
+          ...options,
+        }) as ReturnType<T.Effects["action"]["getInput"]>
+      },
+      request(...[options]: Parameters<T.Effects["action"]["request"]>) {
+        return rpcRound("action.request", {
+          ...options,
+        }) as ReturnType<T.Effects["action"]["request"]>
+      },
+      run(...[options]: Parameters<T.Effects["action"]["run"]>) {
+        return rpcRound("action.run", {
+          ...options,
+        }) as ReturnType<T.Effects["action"]["run"]>
+      },
+      clearRequests(
+        ...[options]: Parameters<T.Effects["action"]["clearRequests"]>
+      ) {
+        return rpcRound("action.clear-requests", {
+          ...options,
+        }) as ReturnType<T.Effects["action"]["clearRequests"]>
+      },
+    },
     bind(...[options]: Parameters<T.Effects["bind"]>) {
       return rpcRound("bind", {
         ...options,
@@ -138,16 +179,6 @@ function makeEffects(context: EffectContext): Effects {
         >
       },
     },
-    executeAction(...[options]: Parameters<T.Effects["executeAction"]>) {
-      return rpcRound("execute-action", options) as ReturnType<
-        T.Effects["executeAction"]
-      >
-    },
-    exportAction(...[options]: Parameters<T.Effects["exportAction"]>) {
-      return rpcRound("export-action", options) as ReturnType<
-        T.Effects["exportAction"]
-      >
-    },
     exportServiceInterface: ((
       ...[options]: Parameters<Effects["exportServiceInterface"]>
     ) => {
@@ -162,11 +193,6 @@ function makeEffects(context: EffectContext): Effects {
         T.Effects["exposeForDependents"]
       >
     },
-    getConfigured(...[]: Parameters<T.Effects["getConfigured"]>) {
-      return rpcRound("get-configured", {}) as ReturnType<
-        T.Effects["getConfigured"]
-      >
-    },
     getContainerIp(...[]: Parameters<T.Effects["getContainerIp"]>) {
       return rpcRound("get-container-ip", {}) as ReturnType<
         T.Effects["getContainerIp"]
@@ -230,19 +256,9 @@ function makeEffects(context: EffectContext): Effects {
     mount(...[options]: Parameters<T.Effects["mount"]>) {
       return rpcRound("mount", options) as ReturnType<T.Effects["mount"]>
     },
-    clearActions(...[]: Parameters<T.Effects["clearActions"]>) {
-      return rpcRound("clear-actions", {}) as ReturnType<
-        T.Effects["clearActions"]
-      >
-    },
     restart(...[]: Parameters<T.Effects["restart"]>) {
       return rpcRound("restart", {}) as ReturnType<T.Effects["restart"]>
     },
-    setConfigured(...[configured]: Parameters<T.Effects["setConfigured"]>) {
-      return rpcRound("set-configured", { configured }) as ReturnType<
-        T.Effects["setConfigured"]
-      >
-    },
     setDependencies(
       dependencies: Parameters<T.Effects["setDependencies"]>[0],
     ): ReturnType<T.Effects["setDependencies"]> {
@@ -299,18 +315,3 @@ function makeEffects(context: EffectContext): Effects {
   }
   return self
 }
-
-export function makeProcedureEffects(procedureId: string): Effects {
-  return makeEffects({ procedureId, callbacks: null })
-}
-
-export function makeMainEffects(): MainEffects {
-  const rpcRound = rpcRoundFor(null)
-  return {
-    _type: "main",
-    clearCallbacks: () => {
-      return rpcRound("clearCallbacks", {}) as Promise<void>
-    },
-    ...makeEffects({ procedureId: null, callbacks: new CallbackHolder() }),
-  }
-}
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 458b1af0f..de2bb7f1a 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -14,17 +14,14 @@ import {
   anyOf,
 } from "ts-matches"
 
-import { types as T } from "@start9labs/start-sdk"
+import { types as T, utils } from "@start9labs/start-sdk"
 import * as fs from "fs"
 
 import { CallbackHolder } from "../Models/CallbackHolder"
 import { AllGetDependencies } from "../Interfaces/AllGetDependencies"
 import { jsonPath, unNestPath } from "../Models/JsonPath"
-import { RunningMain, System } from "../Interfaces/System"
-import {
-  MakeMainEffects,
-  MakeProcedureEffects,
-} from "../Interfaces/MakeEffects"
+import { System } from "../Interfaces/System"
+import { makeEffects } from "./EffectCreator"
 type MaybePromise<T> = T | Promise<T>
 export const matchRpcResult = anyOf(
   object({ result: any }),
@@ -55,33 +52,39 @@ const jsonrpc = "2.0" as const
 const isResult = object({ result: any }).test
 
 const idType = some(string, number, literal(null))
-type IdType = null | string | number
-const runType = object({
-  id: idType,
-  method: literal("execute"),
-  params: object(
-    {
-      id: string,
-      procedure: string,
-      input: any,
-      timeout: number,
-    },
-    ["timeout"],
-  ),
-})
-const sandboxRunType = object({
-  id: idType,
-  method: literal("sandbox"),
-  params: object(
-    {
-      id: string,
-      procedure: string,
-      input: any,
-      timeout: number,
-    },
-    ["timeout"],
-  ),
-})
+type IdType = null | string | number | undefined
+const runType = object(
+  {
+    id: idType,
+    method: literal("execute"),
+    params: object(
+      {
+        id: string,
+        procedure: string,
+        input: any,
+        timeout: number,
+      },
+      ["timeout"],
+    ),
+  },
+  ["id"],
+)
+const sandboxRunType = object(
+  {
+    id: idType,
+    method: literal("sandbox"),
+    params: object(
+      {
+        id: string,
+        procedure: string,
+        input: any,
+        timeout: number,
+      },
+      ["timeout"],
+    ),
+  },
+  ["id"],
+)
 const callbackType = object({
   method: literal("callback"),
   params: object({
@@ -89,29 +92,44 @@ const callbackType = object({
     args: array,
   }),
 })
-const initType = object({
-  id: idType,
-  method: literal("init"),
-})
-const startType = object({
-  id: idType,
-  method: literal("start"),
-})
-const stopType = object({
-  id: idType,
-  method: literal("stop"),
-})
-const exitType = object({
-  id: idType,
-  method: literal("exit"),
-})
-const evalType = object({
-  id: idType,
-  method: literal("eval"),
-  params: object({
-    script: string,
-  }),
-})
+const initType = object(
+  {
+    id: idType,
+    method: literal("init"),
+  },
+  ["id"],
+)
+const startType = object(
+  {
+    id: idType,
+    method: literal("start"),
+  },
+  ["id"],
+)
+const stopType = object(
+  {
+    id: idType,
+    method: literal("stop"),
+  },
+  ["id"],
+)
+const exitType = object(
+  {
+    id: idType,
+    method: literal("exit"),
+  },
+  ["id"],
+)
+const evalType = object(
+  {
+    id: idType,
+    method: literal("eval"),
+    params: object({
+      script: string,
+    }),
+  },
+  ["id"],
+)
 
 const jsonParse = (x: string) => JSON.parse(x)
 
@@ -144,8 +162,7 @@ const hasId = object({ id: idType }).test
 export class RpcListener {
   unixSocketServer = net.createServer(async (server) => {})
   private _system: System | undefined
-  private _makeProcedureEffects: MakeProcedureEffects | undefined
-  private _makeMainEffects: MakeMainEffects | undefined
+  private callbacks: CallbackHolder | undefined
 
   constructor(readonly getDependencies: AllGetDependencies) {
     if (!fs.existsSync(SOCKET_PARENT)) {
@@ -212,18 +229,33 @@ export class RpcListener {
     return this._system
   }
 
-  private get makeProcedureEffects() {
-    if (!this._makeProcedureEffects) {
-      this._makeProcedureEffects = this.getDependencies.makeProcedureEffects()
+  private callbackHolders: Map<string, CallbackHolder> = new Map()
+  private removeCallbackHolderFor(procedure: string) {
+    const prev = this.callbackHolders.get(procedure)
+    if (prev) {
+      this.callbackHolders.delete(procedure)
+      this.callbacks?.removeChild(prev)
     }
-    return this._makeProcedureEffects
+  }
+  private callbackHolderFor(procedure: string): CallbackHolder {
+    this.removeCallbackHolderFor(procedure)
+    const callbackHolder = this.callbacks!.child()
+    this.callbackHolders.set(procedure, callbackHolder)
+    return callbackHolder
   }
 
-  private get makeMainEffects() {
-    if (!this._makeMainEffects) {
-      this._makeMainEffects = this.getDependencies.makeMainEffects()
+  callCallback(callback: number, args: any[]): void {
+    if (this.callbacks) {
+      this.callbacks
+        .callCallback(callback, args)
+        .catch((error) =>
+          console.error(`callback ${callback} failed`, utils.asError(error)),
+        )
+    } else {
+      console.warn(
+        `callback ${callback} ignored because system is not initialized`,
+      )
     }
-    return this._makeMainEffects
   }
 
   private dealWithInput(input: unknown): MaybePromise<SocketResponse> {
@@ -231,40 +263,49 @@ export class RpcListener {
       .when(runType, async ({ id, params }) => {
         const system = this.system
         const procedure = jsonPath.unsafeCast(params.procedure)
-        const effects = this.getDependencies.makeProcedureEffects()(params.id)
-        const input = params.input
-        const timeout = params.timeout
-        const result = getResult(procedure, system, effects, timeout, input)
+        const { input, timeout, id: procedureId } = params
+        const result = this.getResult(
+          procedure,
+          system,
+          procedureId,
+          timeout,
+          input,
+        )
 
         return handleRpc(id, result)
       })
       .when(sandboxRunType, async ({ id, params }) => {
         const system = this.system
         const procedure = jsonPath.unsafeCast(params.procedure)
-        const effects = this.makeProcedureEffects(params.id)
-        const result = getResult(
+        const { input, timeout, id: procedureId } = params
+        const result = this.getResult(
           procedure,
           system,
-          effects,
-          params.input,
-          params.input,
+          procedureId,
+          timeout,
+          input,
         )
 
         return handleRpc(id, result)
       })
       .when(callbackType, async ({ params: { callback, args } }) => {
-        this.system.callCallback(callback, args)
+        this.callCallback(callback, args)
         return null
       })
       .when(startType, async ({ id }) => {
+        const callbacks = this.callbackHolderFor("main")
+        const effects = makeEffects({
+          procedureId: null,
+          callbacks,
+          constRetry: () => {},
+        })
         return handleRpc(
           id,
-          this.system
-            .start(this.makeMainEffects())
-            .then((result) => ({ result })),
+          this.system.start(effects).then((result) => ({ result })),
         )
       })
       .when(stopType, async ({ id }) => {
+        this.removeCallbackHolderFor("main")
         return handleRpc(
           id,
           this.system.stop().then((result) => ({ result })),
@@ -284,7 +325,20 @@ export class RpcListener {
           (async () => {
             if (!this._system) {
               const system = await this.getDependencies.system()
-              await system.containerInit()
+              this.callbacks = new CallbackHolder(
+                makeEffects({
+                  procedureId: null,
+                  constRetry: () => {},
+                }),
+              )
+              const callbacks = this.callbackHolderFor("containerInit")
+              await system.containerInit(
+                makeEffects({
+                  procedureId: null,
+                  callbacks,
+                  constRetry: () => {},
+                }),
+              )
               this._system = system
             }
           })().then((result) => ({ result })),
@@ -316,17 +370,20 @@ export class RpcListener {
           })(),
         )
       })
-      .when(shape({ id: idType, method: string }), ({ id, method }) => ({
-        jsonrpc,
-        id,
-        error: {
-          code: -32601,
-          message: `Method not found`,
-          data: {
-            details: method,
+      .when(
+        shape({ id: idType, method: string }, ["id"]),
+        ({ id, method }) => ({
+          jsonrpc,
+          id,
+          error: {
+            code: -32601,
+            message: `Method not found`,
+            data: {
+              details: method,
+            },
           },
-        },
-      }))
+        }),
+      )
 
       .defaultToLazy(() => {
         console.warn(
@@ -345,98 +402,84 @@ export class RpcListener {
         }
       })
   }
-}
-function getResult(
-  procedure: typeof jsonPath._TYPE,
-  system: System,
-  effects: T.Effects,
-  timeout: number | undefined,
-  input: any,
-) {
-  const ensureResultTypeShape = (
-    result:
-      | void
-      | T.ConfigRes
-      | T.PropertiesReturn
-      | T.ActionMetadata[]
-      | T.ActionResult,
-  ): { result: any } => {
-    if (isResult(result)) return result
-    return { result }
-  }
-  return (async () => {
-    switch (procedure) {
-      case "/backup/create":
-        return system.createBackup(effects, timeout || null)
-      case "/backup/restore":
-        return system.restoreBackup(effects, timeout || null)
-      case "/config/get":
-        return system.getConfig(effects, timeout || null)
-      case "/config/set":
-        return system.setConfig(effects, input, timeout || null)
-      case "/properties":
-        return system.properties(effects, timeout || null)
-      case "/actions/metadata":
-        return system.actionsMetadata(effects)
-      case "/init":
-        return system.packageInit(
-          effects,
-          string.optional().unsafeCast(input),
-          timeout || null,
-        )
-      case "/uninit":
-        return system.packageUninit(
-          effects,
-          string.optional().unsafeCast(input),
-          timeout || null,
-        )
-      default:
-        const procedures = unNestPath(procedure)
-        switch (true) {
-          case procedures[1] === "actions" && procedures[3] === "get":
-            return system.action(effects, procedures[2], input, timeout || null)
-          case procedures[1] === "actions" && procedures[3] === "run":
-            return system.action(effects, procedures[2], input, timeout || null)
-          case procedures[1] === "dependencies" && procedures[3] === "query":
-            return system.dependenciesAutoconfig(
-              effects,
-              procedures[2],
-              input,
-              timeout || null,
-            )
-
-          case procedures[1] === "dependencies" && procedures[3] === "update":
-            return system.dependenciesAutoconfig(
-              effects,
-              procedures[2],
-              input,
-              timeout || null,
-            )
-        }
+  private getResult(
+    procedure: typeof jsonPath._TYPE,
+    system: System,
+    procedureId: string,
+    timeout: number | undefined,
+    input: any,
+  ) {
+    const ensureResultTypeShape = (
+      result: void | T.ActionInput | T.PropertiesReturn | T.ActionResult | null,
+    ): { result: any } => {
+      if (isResult(result)) return result
+      return { result }
     }
-  })().then(ensureResultTypeShape, (error) =>
-    matches(error)
-      .when(
-        object(
-          {
-            error: string,
-            code: number,
-          },
-          ["code"],
-          { code: 0 },
-        ),
-        (error) => ({
+    const callbacks = this.callbackHolderFor(procedure)
+    const effects = makeEffects({
+      procedureId,
+      callbacks,
+      constRetry: () => {},
+    })
+
+    return (async () => {
+      switch (procedure) {
+        case "/backup/create":
+          return system.createBackup(effects, timeout || null)
+        case "/backup/restore":
+          return system.restoreBackup(effects, timeout || null)
+        case "/properties":
+          return system.properties(effects, timeout || null)
+        case "/packageInit":
+          return system.packageInit(effects, timeout || null)
+        case "/packageUninit":
+          return system.packageUninit(
+            effects,
+            string.optional().unsafeCast(input),
+            timeout || null,
+          )
+        default:
+          const procedures = unNestPath(procedure)
+          switch (true) {
+            case procedures[1] === "actions" && procedures[3] === "getInput":
+              return system.getActionInput(
+                effects,
+                procedures[2],
+                timeout || null,
+              )
+            case procedures[1] === "actions" && procedures[3] === "run":
+              return system.runAction(
+                effects,
+                procedures[2],
+                input.input,
+                timeout || null,
+              )
+          }
+      }
+    })().then(ensureResultTypeShape, (error) =>
+      matches(error)
+        .when(
+          object(
+            {
+              error: string,
+              code: number,
+            },
+            ["code"],
+            { code: 0 },
+          ),
+          (error) => ({
+            error: {
+              code: error.code,
+              message: error.error,
+            },
+          }),
+        )
+        .defaultToLazy(() => ({
           error: {
-            code: error.code,
-            message: error.error,
+            code: 0,
+            message: String(error),
           },
-        }),
-      )
-      .defaultToLazy(() => ({
-        error: {
-          code: 0,
-          message: String(error),
-        },
-      })),
-  )
+        })),
+    )
+  }
 }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 0c1f9d07a..26e184cef 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -8,7 +8,7 @@ import {
   CommandOptions,
   ExecOptions,
   ExecSpawnable,
-} from "@start9labs/start-sdk/cjs/lib/util/SubContainer"
+} from "@start9labs/start-sdk/package/lib/util/SubContainer"
 export const exec = promisify(cp.exec)
 export const execFile = promisify(cp.execFile)
 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
index 91b0177eb..b6fe39854 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/MainLoop.ts
@@ -2,11 +2,10 @@ import { polyfillEffects } from "./polyfillEffects"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
 import { SystemForEmbassy } from "."
 import { T, utils } from "@start9labs/start-sdk"
-import { Daemon } from "@start9labs/start-sdk/cjs/lib/mainFn/Daemon"
+import { Daemon } from "@start9labs/start-sdk/package/lib/mainFn/Daemon"
 import { Effects } from "../../../Models/Effects"
 import { off } from "node:process"
-import { CommandController } from "@start9labs/start-sdk/cjs/lib/mainFn/CommandController"
-import { asError } from "@start9labs/start-sdk/cjs/lib/util"
+import { CommandController } from "@start9labs/start-sdk/package/lib/mainFn/CommandController"
 
 const EMBASSY_HEALTH_INTERVAL = 15 * 1000
 const EMBASSY_PROPERTIES_LOOP = 30 * 1000
@@ -137,7 +136,7 @@ export class MainLoop {
     delete this.healthLoops
     await main?.daemon
       .stop()
-      .catch((e) => console.error(`Main loop error`, utils.asError(e)))
+      .catch((e: unknown) => console.error(`Main loop error`, utils.asError(e)))
     this.effects.setMainStatus({ status: "stopped" })
     if (healthLoops) healthLoops.forEach((x) => clearInterval(x.interval))
   }
@@ -155,7 +154,7 @@ export class MainLoop {
             result: "starting",
             message: null,
           })
-          .catch((e) => console.error(asError(e)))
+          .catch((e) => console.error(utils.asError(e)))
         const interval = setInterval(async () => {
           const actionProcedure = value
           const timeChanged = Date.now() - start
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 5b0380a1b..bed30b11a 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -2,8 +2,8 @@ import { ExtendedVersion, types as T, utils } from "@start9labs/start-sdk"
 import * as fs from "fs/promises"
 
 import { polyfillEffects } from "./polyfillEffects"
-import { Duration, duration, fromDuration } from "../../../Models/Duration"
-import { System, Procedure } from "../../../Interfaces/System"
+import { fromDuration } from "../../../Models/Duration"
+import { System } from "../../../Interfaces/System"
 import { matchManifest, Manifest } from "./matchManifest"
 import * as childProcess from "node:child_process"
 import { DockerProcedureContainer } from "./DockerProcedureContainer"
@@ -27,19 +27,12 @@ import {
   Parser,
   array,
 } from "ts-matches"
-import { JsonPath, unNestPath } from "../../../Models/JsonPath"
-import { RpcResult, matchRpcResult } from "../../RpcListener"
-import { CT } from "@start9labs/start-sdk"
-import {
-  AddSslOptions,
-  BindOptions,
-} from "@start9labs/start-sdk/cjs/lib/osBindings"
+import { AddSslOptions } from "@start9labs/start-sdk/base/lib/osBindings"
 import {
   BindOptionsByProtocol,
-  Host,
   MultiHost,
-} from "@start9labs/start-sdk/cjs/lib/interfaces/Host"
-import { ServiceInterfaceBuilder } from "@start9labs/start-sdk/cjs/lib/interfaces/ServiceInterfaceBuilder"
+} from "@start9labs/start-sdk/base/lib/interfaces/Host"
+import { ServiceInterfaceBuilder } from "@start9labs/start-sdk/base/lib/interfaces/ServiceInterfaceBuilder"
 import { Effects } from "../../../Models/Effects"
 import {
   OldConfigSpec,
@@ -48,18 +41,16 @@ import {
   transformNewConfigToOld,
   transformOldConfigToNew,
 } from "./transformConfigSpec"
-import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
-import { StorePath } from "@start9labs/start-sdk/cjs/lib/store/PathBuilder"
+import { partialDiff } from "@start9labs/start-sdk/base/lib/util"
 
 type Optional<A> = A | undefined | null
 function todo(): never {
   throw new Error("Not implemented")
 }
-const execFile = promisify(childProcess.execFile)
 
 const MANIFEST_LOCATION = "/usr/lib/startos/package/embassyManifest.json"
 export const EMBASSY_JS_LOCATION = "/usr/lib/startos/package/embassy.js"
-const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig" as StorePath
+const EMBASSY_POINTER_PATH_PREFIX = "/embassyConfig" as utils.StorePath
 
 const matchResult = object({
   result: any,
@@ -248,50 +239,21 @@ export class SystemForEmbassy implements System {
     readonly moduleCode: Partial<U.ExpectedExports>,
   ) {}
 
-  async actionsMetadata(effects: T.Effects): Promise<T.ActionMetadata[]> {
-    const actions = Object.entries(this.manifest.actions ?? {})
-    return Promise.all(
-      actions.map(async ([actionId, action]): Promise<T.ActionMetadata> => {
-        const name = action.name ?? actionId
-        const description = action.description
-        const warning = action.warning ?? null
-        const disabled = false
-        const input = (await convertToNewConfig(action["input-spec"] as any))
-          .spec
-        const hasRunning = !!action["allowed-statuses"].find(
-          (x) => x === "running",
-        )
-        const hasStopped = !!action["allowed-statuses"].find(
-          (x) => x === "stopped",
-        )
-        // prettier-ignore
-        const allowedStatuses = 
-        hasRunning && hasStopped ? "any":
-        hasRunning ? "onlyRunning" :
-        "onlyStopped"
-
-        const group = null
-        return {
-          name,
-          description,
-          warning,
-          disabled,
-          allowedStatuses,
-          group,
-          input,
-        }
-      }),
-    )
+  async containerInit(effects: Effects): Promise<void> {
+    for (let depId in this.manifest.dependencies) {
+      if (this.manifest.dependencies[depId].config) {
+        await this.dependenciesAutoconfig(effects, depId, null)
+      }
+    }
   }
 
-  async containerInit(): Promise<void> {}
-
   async exit(): Promise<void> {
     if (this.currentRunning) await this.currentRunning.clean()
     delete this.currentRunning
   }
 
-  async start(effects: MainEffects): Promise<void> {
+  async start(effects: T.Effects): Promise<void> {
+    effects.constRetry = utils.once(() => effects.restart())
     if (!!this.currentRunning) return
 
     this.currentRunning = await MainLoop.of(this, effects)
@@ -308,13 +270,18 @@ export class SystemForEmbassy implements System {
     }
   }
 
-  async packageInit(
-    effects: Effects,
-    previousVersion: Optional<string>,
-    timeoutMs: number | null,
-  ): Promise<void> {
-    if (previousVersion)
-      await this.migration(effects, previousVersion, timeoutMs)
+  async packageInit(effects: Effects, timeoutMs: number | null): Promise<void> {
+    const previousVersion = await effects.getDataVersion()
+    if (previousVersion) {
+      if (
+        (await this.migration(effects, previousVersion, timeoutMs)).configured
+      ) {
+        await effects.action.clearRequests({ only: ["needs-config"] })
+      }
+      await effects.setDataVersion({
+        version: ExtendedVersion.parseEmver(this.manifest.version).toString(),
+      })
+    }
     await effects.setMainStatus({ status: "stopped" })
     await this.exportActions(effects)
     await this.exportNetwork(effects)
@@ -400,10 +367,57 @@ export class SystemForEmbassy implements System {
       )
     }
   }
+  async getActionInput(
+    effects: Effects,
+    actionId: string,
+    timeoutMs: number | null,
+  ): Promise<T.ActionInput | null> {
+    if (actionId === "config") {
+      const config = await this.getConfig(effects, timeoutMs)
+      return { spec: config.spec, value: config.config }
+    } else {
+      const oldSpec = this.manifest.actions?.[actionId]?.["input-spec"]
+      if (!oldSpec) return null
+      return {
+        spec: transformConfigSpec(oldSpec as OldConfigSpec),
+        value: null,
+      }
+    }
+  }
+  async runAction(
+    effects: Effects,
+    actionId: string,
+    input: unknown,
+    timeoutMs: number | null,
+  ): Promise<T.ActionResult | null> {
+    if (actionId === "config") {
+      await this.setConfig(effects, input, timeoutMs)
+      return null
+    } else {
+      return this.action(effects, actionId, input, timeoutMs)
+    }
+  }
   async exportActions(effects: Effects) {
     const manifest = this.manifest
-    if (!manifest.actions) return
-    for (const [actionId, action] of Object.entries(manifest.actions)) {
+    const actions = {
+      ...manifest.actions,
+    }
+    if (manifest.config) {
+      actions.config = {
+        name: "Configure",
+        description: "Edit the configuration of this service",
+        "allowed-statuses": ["running", "stopped"],
+        "input-spec": {},
+        implementation: { type: "script", args: [] },
+      }
+      await effects.action.request({
+        packageId: this.manifest.id,
+        actionId: "config",
+        replayId: "needs-config",
+        description: "This service must be configured before it can be run",
+      })
+    }
+    for (const [actionId, action] of Object.entries(actions)) {
       const hasRunning = !!action["allowed-statuses"].find(
         (x) => x === "running",
       )
@@ -412,21 +426,22 @@ export class SystemForEmbassy implements System {
       )
       // prettier-ignore
       const allowedStatuses = hasRunning && hasStopped ? "any":
-        hasRunning ? "onlyRunning" :
-         "onlyStopped"
-      await effects.exportAction({
+        hasRunning ? "only-running" :
+         "only-stopped"
+      await effects.action.export({
         id: actionId,
         metadata: {
           name: action.name,
           description: action.description,
           warning: action.warning || null,
-          input: action["input-spec"] as CT.InputSpec,
-          disabled: false,
+          visibility: "enabled",
           allowedStatuses,
+          hasInput: !!action["input-spec"],
           group: null,
         },
       })
     }
+    await effects.action.clear({ except: Object.keys(actions) })
   }
   async packageUninit(
     effects: Effects,
@@ -483,10 +498,7 @@ export class SystemForEmbassy implements System {
       await moduleCode.restoreBackup?.(polyfillEffects(effects, this.manifest))
     }
   }
-  async getConfig(
-    effects: Effects,
-    timeoutMs: number | null,
-  ): Promise<T.ConfigRes> {
+  async getConfig(effects: Effects, timeoutMs: number | null) {
     return this.getConfigUncleaned(effects, timeoutMs).then(convertToNewConfig)
   }
   private async getConfigUncleaned(
@@ -614,7 +626,7 @@ export class SystemForEmbassy implements System {
     effects: Effects,
     fromVersion: string,
     timeoutMs: number | null,
-  ): Promise<T.MigrationRes> {
+  ): Promise<{ configured: boolean }> {
     const fromEmver = ExtendedVersion.parseEmver(fromVersion)
     const currentEmver = ExtendedVersion.parseEmver(this.manifest.version)
     if (!this.manifest.migrations) return { configured: true }
@@ -828,24 +840,44 @@ export class SystemForEmbassy implements System {
   async dependenciesAutoconfig(
     effects: Effects,
     id: string,
-    input: unknown,
     timeoutMs: number | null,
   ): Promise<void> {
-    const oldConfig = object({ remoteConfig: any }).unsafeCast(
-      input,
-    ).remoteConfig
     // TODO: docker
+    const oldConfig = (await effects.store.get({
+      packageId: id,
+      path: EMBASSY_POINTER_PATH_PREFIX,
+      callback: () => {
+        this.dependenciesAutoconfig(effects, id, timeoutMs)
+      },
+    })) as U.Config
     const moduleCode = await this.moduleCode
     const method = moduleCode.dependencies?.[id]?.autoConfigure
     if (!method) return
-    return (await method(
+    const newConfig = (await method(
       polyfillEffects(effects, this.manifest),
-      oldConfig,
+      JSON.parse(JSON.stringify(oldConfig)),
     ).then((x) => {
       if ("result" in x) return x.result
       if ("error" in x) throw new Error("Error getting config: " + x.error)
       throw new Error("Error getting config: " + x["error-code"][1])
     })) as any
+    const diff = partialDiff(oldConfig, newConfig)
+    if (diff) {
+      await effects.action.request({
+        actionId: "config",
+        packageId: id,
+        replayId: `${id}/config`,
+        description: `Configure this dependency for the needs of ${this.manifest.title}`,
+        input: {
+          kind: "partial",
+          value: diff.diff,
+        },
+        when: {
+          condition: "input-not-matches",
+          once: false,
+        },
+      })
+    }
   }
 }
 
@@ -1020,9 +1052,7 @@ function extractServiceInterfaceId(manifest: Manifest, specInterface: string) {
   const serviceInterfaceId = `${specInterface}-${internalPort}`
   return serviceInterfaceId
 }
-async function convertToNewConfig(
-  value: OldGetConfigRes,
-): Promise<T.ConfigRes> {
+async function convertToNewConfig(value: OldGetConfigRes) {
   const valueSpec: OldConfigSpec = matchOldConfigSpec.unsafeCast(value.spec)
   const spec = transformConfigSpec(valueSpec)
   if (!value.config) return { spec, config: null }
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
index bd8856b42..5bda20de0 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/matchManifest.ts
@@ -42,6 +42,7 @@ const matchAction = object(
 export const matchManifest = object(
   {
     id: string,
+    title: string,
     version: string,
     main: matchDockerProcedure,
     assets: object(
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 675cb2e9a..7438070ea 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -105,12 +105,14 @@ export const polyfillEffects = (
       args?: string[] | undefined
       timeoutMillis?: number | undefined
     }): Promise<oet.ResultType<string>> {
+      const commands: [string, ...string[]] = [command, ...(args || [])]
       return startSdk
         .runCommand(
           effects,
           { id: manifest.main.image },
-          [command, ...(args || [])],
+          commands,
           {},
+          commands.join(" "),
         )
         .then((x: any) => ({
           stderr: x.stderr.toString(),
@@ -154,11 +156,17 @@ export const polyfillEffects = (
       path: string
       uid: string
     }): Promise<null> {
+      const commands: [string, ...string[]] = [
+        "chown",
+        "--recursive",
+        input.uid,
+        `/drive/${input.path}`,
+      ]
       await startSdk
         .runCommand(
           effects,
           { id: manifest.main.image },
-          ["chown", "--recursive", input.uid, `/drive/${input.path}`],
+          commands,
           {
             mounts: [
               {
@@ -172,6 +180,7 @@ export const polyfillEffects = (
               },
             ],
           },
+          commands.join(" "),
         )
         .then((x: any) => ({
           stderr: x.stderr.toString(),
@@ -189,11 +198,17 @@ export const polyfillEffects = (
       path: string
       mode: string
     }): Promise<null> {
+      const commands: [string, ...string[]] = [
+        "chmod",
+        "--recursive",
+        input.mode,
+        `/drive/${input.path}`,
+      ]
       await startSdk
         .runCommand(
           effects,
           { id: manifest.main.image },
-          ["chmod", "--recursive", input.mode, `/drive/${input.path}`],
+          commands,
           {
             mounts: [
               {
@@ -207,6 +222,7 @@ export const polyfillEffects = (
               },
             ],
           },
+          commands.join(" "),
         )
         .then((x: any) => ({
           stderr: x.stderr.toString(),
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
index 5ce601c57..4c074a1bd 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -1,4 +1,4 @@
-import { CT } from "@start9labs/start-sdk"
+import { IST } from "@start9labs/start-sdk"
 import {
   dictionary,
   object,
@@ -15,9 +15,9 @@ import {
   literal,
 } from "ts-matches"
 
-export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
+export function transformConfigSpec(oldSpec: OldConfigSpec): IST.InputSpec {
   return Object.entries(oldSpec).reduce((inputSpec, [key, oldVal]) => {
-    let newVal: CT.ValueSpec
+    let newVal: IST.ValueSpec
 
     if (oldVal.type === "boolean") {
       newVal = {
@@ -124,7 +124,7 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
               spec: transformConfigSpec(matchOldConfigSpec.unsafeCast(spec)),
             },
           }),
-          {} as Record<string, { name: string; spec: CT.InputSpec }>,
+          {} as Record<string, { name: string; spec: IST.InputSpec }>,
         ),
         disabled: false,
         required: true,
@@ -141,7 +141,7 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): CT.InputSpec {
       ...inputSpec,
       [key]: newVal,
     }
-  }, {} as CT.InputSpec)
+  }, {} as IST.InputSpec)
 }
 
 export function transformOldConfigToNew(
@@ -233,10 +233,10 @@ export function transformNewConfigToOld(
 
 function getListSpec(
   oldVal: OldValueSpecList,
-): CT.ValueSpecMultiselect | CT.ValueSpecList {
+): IST.ValueSpecMultiselect | IST.ValueSpecList {
   const range = Range.from(oldVal.range)
 
-  let partial: Omit<CT.ValueSpecList, "type" | "spec" | "default"> = {
+  let partial: Omit<IST.ValueSpecList, "type" | "spec" | "default"> = {
     name: oldVal.name,
     description: oldVal.description || null,
     warning: oldVal.warning || null,
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 51d91abb5..43096f0f0 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -6,16 +6,13 @@ import { RpcResult, matchRpcResult } from "../RpcListener"
 import { duration } from "../../Models/Duration"
 import { T, utils } from "@start9labs/start-sdk"
 import { Volume } from "../../Models/Volume"
-import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
 import { CallbackHolder } from "../../Models/CallbackHolder"
 import { Optional } from "ts-matches/lib/parsers/interfaces"
 
 export const STARTOS_JS_LOCATION = "/usr/lib/startos/package/index.js"
 
 type RunningMain = {
-  effects: MainEffects
   stop: () => Promise<void>
-  callbacks: CallbackHolder
 }
 
 export class SystemForStartOs implements System {
@@ -25,23 +22,24 @@ export class SystemForStartOs implements System {
     return new SystemForStartOs(require(STARTOS_JS_LOCATION))
   }
 
-  constructor(readonly abi: T.ABI) {}
-  containerInit(): Promise<void> {
-    throw new Error("Method not implemented.")
+  constructor(readonly abi: T.ABI) {
+    this
+  }
+  async containerInit(effects: Effects): Promise<void> {
+    return void (await this.abi.containerInit({ effects }))
   }
   async packageInit(
     effects: Effects,
-    previousVersion: Optional<string> = null,
     timeoutMs: number | null = null,
   ): Promise<void> {
-    return void (await this.abi.init({ effects }))
+    return void (await this.abi.packageInit({ effects }))
   }
   async packageUninit(
     effects: Effects,
     nextVersion: Optional<string> = null,
     timeoutMs: number | null = null,
   ): Promise<void> {
-    return void (await this.abi.uninit({ effects, nextVersion }))
+    return void (await this.abi.packageUninit({ effects, nextVersion }))
   }
   async createBackup(
     effects: T.Effects,
@@ -49,8 +47,6 @@ export class SystemForStartOs implements System {
   ): Promise<void> {
     return void (await this.abi.createBackup({
       effects,
-      pathMaker: ((options) =>
-        new Volume(options.volume, options.path).path) as T.PathMaker,
     }))
   }
   async restoreBackup(
@@ -59,80 +55,38 @@ export class SystemForStartOs implements System {
   ): Promise<void> {
     return void (await this.abi.restoreBackup({
       effects,
-      pathMaker: ((options) =>
-        new Volume(options.volume, options.path).path) as T.PathMaker,
     }))
   }
-  getConfig(
-    effects: T.Effects,
-    timeoutMs: number | null,
-  ): Promise<T.ConfigRes> {
-    return this.abi.getConfig({ effects })
-  }
-  async setConfig(
-    effects: Effects,
-    input: { effects: Effects; input: Record<string, unknown> },
-    timeoutMs: number | null,
-  ): Promise<void> {
-    const _: unknown = await this.abi.setConfig({ effects, input })
-    return
-  }
-  migration(
-    effects: Effects,
-    fromVersion: string,
-    timeoutMs: number | null,
-  ): Promise<T.MigrationRes> {
-    throw new Error("Method not implemented.")
-  }
   properties(
     effects: Effects,
     timeoutMs: number | null,
   ): Promise<T.PropertiesReturn> {
     throw new Error("Method not implemented.")
   }
-  async action(
+  getActionInput(
     effects: Effects,
     id: string,
-    formData: unknown,
     timeoutMs: number | null,
-  ): Promise<T.ActionResult> {
-    const action = (await this.abi.actions({ effects }))[id]
+  ): Promise<T.ActionInput | null> {
+    const action = this.abi.actions.get(id)
     if (!action) throw new Error(`Action ${id} not found`)
-    return action.run({ effects })
+    return action.getInput({ effects })
   }
-  dependenciesCheck(
+  runAction(
     effects: Effects,
     id: string,
-    oldConfig: unknown,
+    input: unknown,
     timeoutMs: number | null,
-  ): Promise<any> {
-    const dependencyConfig = this.abi.dependencyConfig[id]
-    if (!dependencyConfig) throw new Error(`dependencyConfig ${id} not found`)
-    return dependencyConfig.query({ effects })
-  }
-  async dependenciesAutoconfig(
-    effects: Effects,
-    id: string,
-    remoteConfig: unknown,
-    timeoutMs: number | null,
-  ): Promise<void> {
-    const dependencyConfig = this.abi.dependencyConfig[id]
-    if (!dependencyConfig) throw new Error(`dependencyConfig ${id} not found`)
-    const queryResults = await this.getConfig(effects, timeoutMs)
-    return void (await dependencyConfig.update({
-      queryResults,
-      remoteConfig,
-    })) // TODO
-  }
-  async actionsMetadata(effects: T.Effects): Promise<T.ActionMetadata[]> {
-    return this.abi.actionsMetadata({ effects })
+  ): Promise<T.ActionResult | null> {
+    const action = this.abi.actions.get(id)
+    if (!action) throw new Error(`Action ${id} not found`)
+    return action.run({ effects, input })
   }
 
-  async init(): Promise<void> {}
-
   async exit(): Promise<void> {}
 
-  async start(effects: MainEffects): Promise<void> {
+  async start(effects: Effects): Promise<void> {
+    effects.constRetry = utils.once(() => effects.restart())
     if (this.runningMain) await this.stop()
     let mainOnTerm: () => Promise<void> | undefined
     const started = async (onTerm: () => Promise<void>) => {
@@ -141,36 +95,21 @@ export class SystemForStartOs implements System {
     }
     const daemons = await (
       await this.abi.main({
-        effects: effects as MainEffects,
+        effects,
         started,
       })
     ).build()
     this.runningMain = {
-      effects,
       stop: async () => {
         if (mainOnTerm) await mainOnTerm()
         await daemons.term()
       },
-      callbacks: new CallbackHolder(),
-    }
-  }
-
-  callCallback(callback: number, args: any[]): void {
-    if (this.runningMain) {
-      this.runningMain.callbacks
-        .callCallback(callback, args)
-        .catch((error) =>
-          console.error(`callback ${callback} failed`, utils.asError(error)),
-        )
-    } else {
-      console.warn(`callback ${callback} ignored because system is not running`)
     }
   }
 
   async stop(): Promise<void> {
     if (this.runningMain) {
       await this.runningMain.stop()
-      await this.runningMain.effects.clearCallbacks()
       this.runningMain = undefined
     }
   }
diff --git a/container-runtime/src/Interfaces/AllGetDependencies.ts b/container-runtime/src/Interfaces/AllGetDependencies.ts
index ca5c43585..24b68acc5 100644
--- a/container-runtime/src/Interfaces/AllGetDependencies.ts
+++ b/container-runtime/src/Interfaces/AllGetDependencies.ts
@@ -1,7 +1,4 @@
 import { GetDependency } from "./GetDependency"
 import { System } from "./System"
-import { MakeMainEffects, MakeProcedureEffects } from "./MakeEffects"
 
-export type AllGetDependencies = GetDependency<"system", Promise<System>> &
-  GetDependency<"makeProcedureEffects", MakeProcedureEffects> &
-  GetDependency<"makeMainEffects", MakeMainEffects>
+export type AllGetDependencies = GetDependency<"system", Promise<System>>
diff --git a/container-runtime/src/Interfaces/MakeEffects.ts b/container-runtime/src/Interfaces/MakeEffects.ts
deleted file mode 100644
index 3b25f8180..000000000
--- a/container-runtime/src/Interfaces/MakeEffects.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Effects } from "../Models/Effects"
-import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
-export type MakeProcedureEffects = (procedureId: string) => Effects
-export type MakeMainEffects = () => MainEffects
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
index 1348b79e9..14ca002ca 100644
--- a/container-runtime/src/Interfaces/System.ts
+++ b/container-runtime/src/Interfaces/System.ts
@@ -1,39 +1,27 @@
 import { types as T } from "@start9labs/start-sdk"
-import { RpcResult } from "../Adapters/RpcListener"
 import { Effects } from "../Models/Effects"
 import { CallbackHolder } from "../Models/CallbackHolder"
-import { MainEffects } from "@start9labs/start-sdk/cjs/lib/StartSdk"
 import { Optional } from "ts-matches/lib/parsers/interfaces"
 
 export type Procedure =
-  | "/init"
-  | "/uninit"
-  | "/config/set"
-  | "/config/get"
+  | "/packageInit"
+  | "/packageUninit"
   | "/backup/create"
   | "/backup/restore"
-  | "/actions/metadata"
   | "/properties"
-  | `/actions/${string}/get`
+  | `/actions/${string}/getInput`
   | `/actions/${string}/run`
-  | `/dependencies/${string}/query`
-  | `/dependencies/${string}/update`
 
 export type ExecuteResult =
   | { ok: unknown }
   | { err: { code: number; message: string } }
 export type System = {
-  containerInit(): Promise<void>
+  containerInit(effects: T.Effects): Promise<void>
 
-  start(effects: MainEffects): Promise<void>
-  callCallback(callback: number, args: any[]): void
+  start(effects: T.Effects): Promise<void>
   stop(): Promise<void>
 
-  packageInit(
-    effects: Effects,
-    previousVersion: Optional<string>,
-    timeoutMs: number | null,
-  ): Promise<void>
+  packageInit(effects: Effects, timeoutMs: number | null): Promise<void>
   packageUninit(
     effects: Effects,
     nextVersion: Optional<string>,
@@ -42,41 +30,21 @@ export type System = {
 
   createBackup(effects: T.Effects, timeoutMs: number | null): Promise<void>
   restoreBackup(effects: T.Effects, timeoutMs: number | null): Promise<void>
-  getConfig(effects: T.Effects, timeoutMs: number | null): Promise<T.ConfigRes>
-  setConfig(
-    effects: Effects,
-    input: { effects: Effects; input: Record<string, unknown> },
-    timeoutMs: number | null,
-  ): Promise<void>
-  migration(
-    effects: Effects,
-    fromVersion: string,
-    timeoutMs: number | null,
-  ): Promise<T.MigrationRes>
   properties(
     effects: Effects,
     timeoutMs: number | null,
   ): Promise<T.PropertiesReturn>
-  action(
+  runAction(
     effects: Effects,
     actionId: string,
-    formData: unknown,
-    timeoutMs: number | null,
-  ): Promise<T.ActionResult>
-
-  dependenciesCheck(
-    effects: Effects,
-    id: string,
-    oldConfig: unknown,
+    input: unknown,
     timeoutMs: number | null,
-  ): Promise<any>
-  dependenciesAutoconfig(
+  ): Promise<T.ActionResult | null>
+  getActionInput(
     effects: Effects,
-    id: string,
-    oldConfig: unknown,
+    actionId: string,
     timeoutMs: number | null,
-  ): Promise<void>
-  actionsMetadata(effects: T.Effects): Promise<T.ActionMetadata[]>
+  ): Promise<T.ActionInput | null>
 
   exit(): Promise<void>
 }
diff --git a/container-runtime/src/Models/CallbackHolder.ts b/container-runtime/src/Models/CallbackHolder.ts
index b51af0bee..e1034b473 100644
--- a/container-runtime/src/Models/CallbackHolder.ts
+++ b/container-runtime/src/Models/CallbackHolder.ts
@@ -1,9 +1,22 @@
+import { T } from "@start9labs/start-sdk"
+
+const CallbackIdCell = { inc: 0 }
+
+const callbackRegistry = new FinalizationRegistry(
+  async (options: { cbs: Map<number, Function>; effects: T.Effects }) => {
+    await options.effects.clearCallbacks({
+      only: Array.from(options.cbs.keys()),
+    })
+  },
+)
+
 export class CallbackHolder {
-  constructor() {}
-  private inc = 0
+  constructor(private effects?: T.Effects) {}
+
   private callbacks = new Map<number, Function>()
+  private children: WeakRef<CallbackHolder>[] = []
   private newId() {
-    return this.inc++
+    return CallbackIdCell.inc++
   }
   addCallback(callback?: Function) {
     if (!callback) {
@@ -11,12 +24,38 @@ export class CallbackHolder {
     }
     const id = this.newId()
     this.callbacks.set(id, callback)
+    if (this.effects)
+      callbackRegistry.register(this, {
+        cbs: this.callbacks,
+        effects: this.effects,
+      })
     return id
   }
+  child(): CallbackHolder {
+    const child = new CallbackHolder()
+    this.children.push(new WeakRef(child))
+    return child
+  }
+  removeChild(child: CallbackHolder) {
+    this.children = this.children.filter((c) => {
+      const ref = c.deref()
+      return ref && ref !== child
+    })
+  }
+  private getCallback(index: number): Function | undefined {
+    let callback = this.callbacks.get(index)
+    if (callback) this.callbacks.delete(index)
+    else {
+      for (let i = 0; i < this.children.length; i++) {
+        callback = this.children[i].deref()?.getCallback(index)
+        if (callback) return callback
+      }
+    }
+    return callback
+  }
   callCallback(index: number, args: any[]): Promise<unknown> {
-    const callback = this.callbacks.get(index)
-    if (!callback) throw new Error(`Callback ${index} does not exist`)
-    this.callbacks.delete(index)
+    const callback = this.getCallback(index)
+    if (!callback) return Promise.resolve()
     return Promise.resolve().then(() => callback(...args))
   }
 }
diff --git a/container-runtime/src/Models/JsonPath.ts b/container-runtime/src/Models/JsonPath.ts
index 95a2b3a00..a231adba7 100644
--- a/container-runtime/src/Models/JsonPath.ts
+++ b/container-runtime/src/Models/JsonPath.ts
@@ -1,9 +1,7 @@
 import { literals, some, string } from "ts-matches"
 
 type NestedPath<A extends string, B extends string> = `/${A}/${string}/${B}`
-type NestedPaths =
-  | NestedPath<"actions", "run" | "get">
-  | NestedPath<"dependencies", "query" | "update">
+type NestedPaths = NestedPath<"actions", "run" | "getInput">
 // prettier-ignore
 type UnNestPaths<A> = 
   A extends `${infer A}/${infer B}` ? [...UnNestPaths<A>, ... UnNestPaths<B>] : 
@@ -15,21 +13,14 @@ export function unNestPath<A extends string>(a: A): UnNestPaths<A> {
 function isNestedPath(path: string): path is NestedPaths {
   const paths = path.split("/")
   if (paths.length !== 4) return false
-  if (paths[1] === "actions" && (paths[3] === "run" || paths[3] === "get"))
-    return true
-  if (
-    paths[1] === "dependencies" &&
-    (paths[3] === "query" || paths[3] === "update")
-  )
+  if (paths[1] === "actions" && (paths[3] === "run" || paths[3] === "getInput"))
     return true
   return false
 }
 export const jsonPath = some(
   literals(
-    "/init",
-    "/uninit",
-    "/config/set",
-    "/config/get",
+    "/packageInit",
+    "/packageUninit",
     "/backup/create",
     "/backup/restore",
     "/actions/metadata",
diff --git a/container-runtime/src/index.ts b/container-runtime/src/index.ts
index 5454bee3d..ec6a998f4 100644
--- a/container-runtime/src/index.ts
+++ b/container-runtime/src/index.ts
@@ -1,13 +1,10 @@
 import { RpcListener } from "./Adapters/RpcListener"
 import { SystemForEmbassy } from "./Adapters/Systems/SystemForEmbassy"
-import { makeMainEffects, makeProcedureEffects } from "./Adapters/EffectCreator"
 import { AllGetDependencies } from "./Interfaces/AllGetDependencies"
 import { getSystem } from "./Adapters/Systems"
 
 const getDependencies: AllGetDependencies = {
   system: getSystem,
-  makeProcedureEffects: () => makeProcedureEffects,
-  makeMainEffects: () => makeMainEffects,
 }
 
 new RpcListener(getDependencies)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index ebbcf6b5d..c7eccf706 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -667,12 +667,24 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
+[[package]]
+name = "bytemuck"
+version = "1.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
 version = "1.7.1"
@@ -2387,6 +2399,17 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "image"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "num-traits",
+]
+
 [[package]]
 name = "imbl"
 version = "2.0.3"
@@ -3813,6 +3836,15 @@ dependencies = [
  "psl-types",
 ]
 
+[[package]]
+name = "qrcode"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec"
+dependencies = [
+ "image",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -5090,6 +5122,7 @@ dependencies = [
  "procfs",
  "proptest",
  "proptest-derive",
+ "qrcode",
  "rand 0.8.5",
  "regex",
  "reqwest",
diff --git a/core/helpers/src/lib.rs b/core/helpers/src/lib.rs
index 80631fea2..a9df58ece 100644
--- a/core/helpers/src/lib.rs
+++ b/core/helpers/src/lib.rs
@@ -6,6 +6,7 @@ use std::time::Duration;
 use color_eyre::eyre::{eyre, Context, Error};
 use futures::future::BoxFuture;
 use futures::FutureExt;
+use models::ResultExt;
 use tokio::fs::File;
 use tokio::sync::oneshot;
 use tokio::task::{JoinError, JoinHandle, LocalSet};
@@ -176,7 +177,7 @@ impl Drop for AtomicFile {
         if let Some(file) = self.file.take() {
             drop(file);
             let path = std::mem::take(&mut self.tmp_path);
-            tokio::spawn(async move { tokio::fs::remove_file(path).await.unwrap() });
+            tokio::spawn(async move { tokio::fs::remove_file(path).await.log_err() });
         }
     }
 }
diff --git a/core/startos/src/util/clap.rs b/core/models/src/clap.rs
similarity index 91%
rename from core/startos/src/util/clap.rs
rename to core/models/src/clap.rs
index 7c3b5a0bc..122e8cf9d 100644
--- a/core/startos/src/util/clap.rs
+++ b/core/models/src/clap.rs
@@ -1,9 +1,8 @@
 use std::marker::PhantomData;
 use std::str::FromStr;
 
-use clap::builder::TypedValueParser;
-
-use crate::prelude::*;
+use rpc_toolkit::clap;
+use rpc_toolkit::clap::builder::TypedValueParser;
 
 pub struct FromStrParser<T>(PhantomData<T>);
 impl<T> FromStrParser<T> {
diff --git a/core/models/src/id/mod.rs b/core/models/src/id/mod.rs
index 85c9d8255..90dbc978c 100644
--- a/core/models/src/id/mod.rs
+++ b/core/models/src/id/mod.rs
@@ -11,6 +11,7 @@ mod host;
 mod image;
 mod invalid_id;
 mod package;
+mod replay;
 mod service_interface;
 mod volume;
 
@@ -20,6 +21,7 @@ pub use host::HostId;
 pub use image::ImageId;
 pub use invalid_id::InvalidId;
 pub use package::{PackageId, SYSTEM_PACKAGE_ID};
+pub use replay::ReplayId;
 pub use service_interface::ServiceInterfaceId;
 pub use volume::VolumeId;
 
diff --git a/core/models/src/id/replay.rs b/core/models/src/id/replay.rs
new file mode 100644
index 000000000..299b6160a
--- /dev/null
+++ b/core/models/src/id/replay.rs
@@ -0,0 +1,45 @@
+use std::convert::Infallible;
+use std::path::Path;
+use std::str::FromStr;
+
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+use yasi::InternedString;
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TS)]
+#[ts(type = "string")]
+pub struct ReplayId(InternedString);
+impl FromStr for ReplayId {
+    type Err = Infallible;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(ReplayId(InternedString::intern(s)))
+    }
+}
+impl AsRef<ReplayId> for ReplayId {
+    fn as_ref(&self) -> &ReplayId {
+        self
+    }
+}
+impl std::fmt::Display for ReplayId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", &self.0)
+    }
+}
+impl AsRef<str> for ReplayId {
+    fn as_ref(&self) -> &str {
+        self.0.as_ref()
+    }
+}
+impl AsRef<Path> for ReplayId {
+    fn as_ref(&self) -> &Path {
+        self.0.as_ref()
+    }
+}
+impl<'de> Deserialize<'de> for ReplayId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::de::Deserializer<'de>,
+    {
+        Ok(ReplayId(serde::Deserialize::deserialize(deserializer)?))
+    }
+}
diff --git a/core/models/src/id/service_interface.rs b/core/models/src/id/service_interface.rs
index 25aec0aba..f08d89cd5 100644
--- a/core/models/src/id/service_interface.rs
+++ b/core/models/src/id/service_interface.rs
@@ -1,9 +1,11 @@
 use std::path::Path;
+use std::str::FromStr;
 
+use rpc_toolkit::clap::builder::ValueParserFactory;
 use serde::{Deserialize, Deserializer, Serialize};
 use ts_rs::TS;
 
-use crate::Id;
+use crate::{FromStrParser, Id};
 
 #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TS)]
 #[ts(export, type = "string")]
@@ -59,3 +61,15 @@ impl sqlx::Type<sqlx::Postgres> for ServiceInterfaceId {
         <&str as sqlx::Type<sqlx::Postgres>>::compatible(ty)
     }
 }
+impl FromStr for ServiceInterfaceId {
+    type Err = <Id as FromStr>::Err;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Id::from_str(s).map(Self)
+    }
+}
+impl ValueParserFactory for ServiceInterfaceId {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
diff --git a/core/models/src/lib.rs b/core/models/src/lib.rs
index ad9055f24..304ac87c5 100644
--- a/core/models/src/lib.rs
+++ b/core/models/src/lib.rs
@@ -1,3 +1,4 @@
+mod clap;
 mod data_url;
 mod errors;
 mod id;
@@ -5,6 +6,7 @@ mod mime;
 mod procedure_name;
 mod version;
 
+pub use clap::*;
 pub use data_url::*;
 pub use errors::*;
 pub use id::*;
diff --git a/core/models/src/procedure_name.rs b/core/models/src/procedure_name.rs
index 466835818..9f8a6c0dd 100644
--- a/core/models/src/procedure_name.rs
+++ b/core/models/src/procedure_name.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{ActionId, PackageId};
+use crate::ActionId;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ProcedureName {
@@ -9,30 +9,24 @@ pub enum ProcedureName {
     CreateBackup,
     Properties,
     RestoreBackup,
-    ActionMetadata,
+    GetActionInput(ActionId),
     RunAction(ActionId),
-    GetAction(ActionId),
-    QueryDependency(PackageId),
-    UpdateDependency(PackageId),
-    Init,
-    Uninit,
+    PackageInit,
+    PackageUninit,
 }
 
 impl ProcedureName {
     pub fn js_function_name(&self) -> String {
         match self {
-            ProcedureName::Init => "/init".to_string(),
-            ProcedureName::Uninit => "/uninit".to_string(),
+            ProcedureName::PackageInit => "/packageInit".to_string(),
+            ProcedureName::PackageUninit => "/packageUninit".to_string(),
             ProcedureName::SetConfig => "/config/set".to_string(),
             ProcedureName::GetConfig => "/config/get".to_string(),
             ProcedureName::CreateBackup => "/backup/create".to_string(),
             ProcedureName::Properties => "/properties".to_string(),
             ProcedureName::RestoreBackup => "/backup/restore".to_string(),
-            ProcedureName::ActionMetadata => "/actions/metadata".to_string(),
             ProcedureName::RunAction(id) => format!("/actions/{}/run", id),
-            ProcedureName::GetAction(id) => format!("/actions/{}/get", id),
-            ProcedureName::QueryDependency(id) => format!("/dependencies/{}/query", id),
-            ProcedureName::UpdateDependency(id) => format!("/dependencies/{}/update", id),
+            ProcedureName::GetActionInput(id) => format!("/actions/{}/getInput", id),
         }
     }
 }
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index f2b780b7b..19d0df244 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -156,6 +156,7 @@ prettytable-rs = "0.10.0"
 procfs = { version = "0.16.0", optional = true }
 proptest = "1.3.1"
 proptest-derive = "0.5.0"
+qrcode = "0.14.1"
 rand = { version = "0.8.5", features = ["std"] }
 regex = "1.10.2"
 reqwest = { version = "0.12.4", features = ["stream", "json", "socks"] }
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index 7c4492adc..f7e17f564 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -1,15 +1,76 @@
-use clap::Parser;
+use std::fmt;
+
+use clap::{CommandFactory, FromArgMatches, Parser};
 pub use models::ActionId;
 use models::PackageId;
+use qrcode::QrCode;
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
 
-use crate::config::Config;
-use crate::context::RpcContext;
+use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
-use crate::util::serde::{display_serializable, StdinDeserializable, WithIoFormat};
+use crate::util::serde::{
+    display_serializable, HandlerExtSerde, StdinDeserializable, WithIoFormat,
+};
+
+pub fn action_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "get-input",
+            from_fn_async(get_action_input)
+                .with_display_serializable()
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "run",
+            from_fn_async(run_action)
+                .with_display_serializable()
+                .with_custom_display_fn(|_, res| {
+                    if let Some(res) = res {
+                        println!("{res}")
+                    }
+                    Ok(())
+                })
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ActionInput {
+    #[ts(type = "Record<string, unknown>")]
+    pub spec: Value,
+    #[ts(type = "Record<string, unknown> | null")]
+    pub value: Option<Value>,
+}
+
+#[derive(Deserialize, Serialize, TS, Parser)]
+#[serde(rename_all = "camelCase")]
+pub struct GetActionInputParams {
+    pub package_id: PackageId,
+    pub action_id: ActionId,
+}
+
+#[instrument(skip_all)]
+pub async fn get_action_input(
+    ctx: RpcContext,
+    GetActionInputParams {
+        package_id,
+        action_id,
+    }: GetActionInputParams,
+) -> Result<Option<ActionInput>, Error> {
+    ctx.services
+        .get(&package_id)
+        .await
+        .as_ref()
+        .or_not_found(lazy_format!("Manager for {}", package_id))?
+        .get_action_input(Guid::new(), action_id)
+        .await
+}
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "version")]
@@ -17,6 +78,13 @@ pub enum ActionResult {
     #[serde(rename = "0")]
     V0(ActionResultV0),
 }
+impl fmt::Display for ActionResult {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::V0(res) => res.fmt(f),
+        }
+    }
+}
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ActionResultV0 {
@@ -25,63 +93,111 @@ pub struct ActionResultV0 {
     pub copyable: bool,
     pub qr: bool,
 }
-
-#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub enum DockerStatus {
-    Running,
-    Stopped,
+impl fmt::Display for ActionResultV0 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.message)?;
+        if let Some(value) = &self.value {
+            write!(f, ":\n{value}")?;
+            if self.qr {
+                use qrcode::render::unicode;
+                write!(
+                    f,
+                    "\n{}",
+                    QrCode::new(value.as_bytes())
+                        .unwrap()
+                        .render::<unicode::Dense1x2>()
+                        .build()
+                )?;
+            }
+        }
+        Ok(())
+    }
 }
 
-pub fn display_action_result(params: WithIoFormat<ActionParams>, result: ActionResult) {
+pub fn display_action_result<T: Serialize>(params: WithIoFormat<T>, result: Option<ActionResult>) {
+    let Some(result) = result else {
+        return;
+    };
     if let Some(format) = params.format {
         return display_serializable(format, result);
     }
-    match result {
-        ActionResult::V0(ar) => {
-            println!(
-                "{}: {}",
-                ar.message,
-                serde_json::to_string(&ar.value).unwrap()
-            );
-        }
-    }
+    println!("{result}")
 }
 
-#[derive(Deserialize, Serialize, Parser, TS)]
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct ActionParams {
-    #[arg(id = "id")]
-    #[serde(rename = "id")]
+pub struct RunActionParams {
+    pub package_id: PackageId,
+    pub action_id: ActionId,
+    #[ts(optional, type = "any")]
+    pub input: Option<Value>,
+}
+
+#[derive(Parser)]
+struct CliRunActionParams {
     pub package_id: PackageId,
     pub action_id: ActionId,
     #[command(flatten)]
-    #[ts(type = "{ [key: string]: any } | null")]
-    #[serde(default)]
-    pub input: StdinDeserializable<Option<Config>>,
+    pub input: StdinDeserializable<Option<Value>>,
+}
+impl From<CliRunActionParams> for RunActionParams {
+    fn from(
+        CliRunActionParams {
+            package_id,
+            action_id,
+            input,
+        }: CliRunActionParams,
+    ) -> Self {
+        Self {
+            package_id,
+            action_id,
+            input: input.0,
+        }
+    }
+}
+impl CommandFactory for RunActionParams {
+    fn command() -> clap::Command {
+        CliRunActionParams::command()
+    }
+    fn command_for_update() -> clap::Command {
+        CliRunActionParams::command_for_update()
+    }
+}
+impl FromArgMatches for RunActionParams {
+    fn from_arg_matches(matches: &clap::ArgMatches) -> Result<Self, clap::Error> {
+        CliRunActionParams::from_arg_matches(matches).map(Self::from)
+    }
+    fn from_arg_matches_mut(matches: &mut clap::ArgMatches) -> Result<Self, clap::Error> {
+        CliRunActionParams::from_arg_matches_mut(matches).map(Self::from)
+    }
+    fn update_from_arg_matches(&mut self, matches: &clap::ArgMatches) -> Result<(), clap::Error> {
+        *self = CliRunActionParams::from_arg_matches(matches).map(Self::from)?;
+        Ok(())
+    }
+    fn update_from_arg_matches_mut(
+        &mut self,
+        matches: &mut clap::ArgMatches,
+    ) -> Result<(), clap::Error> {
+        *self = CliRunActionParams::from_arg_matches_mut(matches).map(Self::from)?;
+        Ok(())
+    }
 }
-// impl C
 
 // #[command(about = "Executes an action", display(display_action_result))]
 #[instrument(skip_all)]
-pub async fn action(
+pub async fn run_action(
     ctx: RpcContext,
-    ActionParams {
+    RunActionParams {
         package_id,
         action_id,
-        input: StdinDeserializable(input),
-    }: ActionParams,
-) -> Result<ActionResult, Error> {
+        input,
+    }: RunActionParams,
+) -> Result<Option<ActionResult>, Error> {
     ctx.services
         .get(&package_id)
         .await
         .as_ref()
         .or_not_found(lazy_format!("Manager for {}", package_id))?
-        .action(
-            Guid::new(),
-            action_id,
-            input.map(|c| to_value(&c)).transpose()?.unwrap_or_default(),
-        )
+        .run_action(Guid::new(), action_id, input.unwrap_or_default())
         .await
 }
diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index b4419e88e..5defebe5d 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -141,7 +141,7 @@ impl Drop for BackupStatusGuard {
                         .ser(&None)
                 })
                 .await
-                .unwrap()
+                .log_err()
             });
         }
     }
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index 032f70848..fcb291005 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -9,7 +9,7 @@ use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
 use exver::Version;
 use imbl_value::InternedString;
-use models::PackageId;
+use models::{FromStrParser, PackageId};
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
@@ -27,7 +27,6 @@ use crate::disk::mount::filesystem::{FileSystem, MountType, ReadWrite};
 use crate::disk::mount::guard::{GenericMountGuard, TmpMountGuard};
 use crate::disk::util::PartitionInfo;
 use crate::prelude::*;
-use crate::util::clap::FromStrParser;
 use crate::util::serde::{
     deserialize_from_str, display_serializable, serialize_display, HandlerExtSerde, WithIoFormat,
 };
diff --git a/core/startos/src/config/action.rs b/core/startos/src/config/action.rs
deleted file mode 100644
index ef26571a7..000000000
--- a/core/startos/src/config/action.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-
-use models::PackageId;
-use serde::{Deserialize, Serialize};
-
-use super::{Config, ConfigSpec};
-#[allow(unused_imports)]
-use crate::prelude::*;
-use crate::status::health_check::HealthCheckId;
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ConfigRes {
-    pub config: Option<Config>,
-    pub spec: ConfigSpec,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SetResult {
-    pub depends_on: BTreeMap<PackageId, BTreeSet<HealthCheckId>>,
-}
diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs
deleted file mode 100644
index 22edd98f7..000000000
--- a/core/startos/src/config/mod.rs
+++ /dev/null
@@ -1,281 +0,0 @@
-use std::collections::BTreeSet;
-use std::sync::Arc;
-use std::time::Duration;
-
-use clap::Parser;
-use color_eyre::eyre::eyre;
-use indexmap::{IndexMap, IndexSet};
-use itertools::Itertools;
-use models::{ErrorKind, OptionExt, PackageId};
-use patch_db::value::InternedString;
-use patch_db::Value;
-use regex::Regex;
-use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
-use serde::{Deserialize, Serialize};
-use tracing::instrument;
-use ts_rs::TS;
-
-use crate::context::{CliContext, RpcContext};
-use crate::prelude::*;
-use crate::rpc_continuations::Guid;
-use crate::util::serde::{HandlerExtSerde, StdinDeserializable};
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-pub struct ConfigSpec(pub IndexMap<InternedString, Value>);
-
-pub mod action;
-pub mod util;
-
-use util::NumRange;
-
-use self::action::ConfigRes;
-
-pub type Config = patch_db::value::InOMap<InternedString, Value>;
-pub trait TypeOf {
-    fn type_of(&self) -> &'static str;
-}
-impl TypeOf for Value {
-    fn type_of(&self) -> &'static str {
-        match self {
-            Value::Array(_) => "list",
-            Value::Bool(_) => "boolean",
-            Value::Null => "null",
-            Value::Number(_) => "number",
-            Value::Object(_) => "object",
-            Value::String(_) => "string",
-        }
-    }
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum ConfigurationError {
-    #[error("Timeout Error")]
-    TimeoutError(#[from] TimeoutError),
-    #[error("No Match: {0}")]
-    NoMatch(#[from] NoMatchWithPath),
-    #[error("System Error: {0}")]
-    SystemError(Error),
-}
-impl From<ConfigurationError> for Error {
-    fn from(err: ConfigurationError) -> Self {
-        let kind = match &err {
-            ConfigurationError::SystemError(e) => e.kind,
-            _ => crate::ErrorKind::ConfigGen,
-        };
-        crate::Error::new(err, kind)
-    }
-}
-
-#[derive(Clone, Copy, Debug, thiserror::Error)]
-#[error("Timeout Error")]
-pub struct TimeoutError;
-
-#[derive(Clone, Debug, thiserror::Error)]
-pub struct NoMatchWithPath {
-    pub path: Vec<InternedString>,
-    pub error: MatchError,
-}
-impl NoMatchWithPath {
-    pub fn new(error: MatchError) -> Self {
-        NoMatchWithPath {
-            path: Vec::new(),
-            error,
-        }
-    }
-    pub fn prepend(mut self, seg: InternedString) -> Self {
-        self.path.push(seg);
-        self
-    }
-}
-impl std::fmt::Display for NoMatchWithPath {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}: {}", self.path.iter().rev().join("."), self.error)
-    }
-}
-impl From<NoMatchWithPath> for Error {
-    fn from(e: NoMatchWithPath) -> Self {
-        ConfigurationError::from(e).into()
-    }
-}
-
-#[derive(Clone, Debug, thiserror::Error)]
-pub enum MatchError {
-    #[error("String {0:?} Does Not Match Pattern {1}")]
-    Pattern(Arc<String>, Regex),
-    #[error("String {0:?} Is Not In Enum {1:?}")]
-    Enum(Arc<String>, IndexSet<String>),
-    #[error("Field Is Not Nullable")]
-    NotNullable,
-    #[error("Length Mismatch: expected {0}, actual: {1}")]
-    LengthMismatch(NumRange<usize>, usize),
-    #[error("Invalid Type: expected {0}, actual: {1}")]
-    InvalidType(&'static str, &'static str),
-    #[error("Number Out Of Range: expected {0}, actual: {1}")]
-    OutOfRange(NumRange<f64>, f64),
-    #[error("Number Is Not Integral: {0}")]
-    NonIntegral(f64),
-    #[error("Variant {0:?} Is Not In Union {1:?}")]
-    Union(Arc<String>, IndexSet<String>),
-    #[error("Variant Is Missing Tag {0:?}")]
-    MissingTag(InternedString),
-    #[error("Property {0:?} Of Variant {1:?} Conflicts With Union Tag")]
-    PropertyMatchesUnionTag(InternedString, String),
-    #[error("Name of Property {0:?} Conflicts With Map Tag Name")]
-    PropertyNameMatchesMapTag(String),
-    #[error("Object Key Is Invalid: {0}")]
-    InvalidKey(String),
-    #[error("Value In List Is Not Unique")]
-    ListUniquenessViolation,
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct ConfigParams {
-    pub id: PackageId,
-}
-
-// #[command(subcommands(get, set))]
-pub fn config<C: Context>() -> ParentHandler<C, ConfigParams> {
-    ParentHandler::new()
-        .subcommand(
-            "get",
-            from_fn_async(get)
-                .with_inherited(|ConfigParams { id }, _| id)
-                .with_display_serializable()
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "set",
-            set::<C>().with_inherited(|ConfigParams { id }, _| id),
-        )
-}
-
-#[instrument(skip_all)]
-pub async fn get(ctx: RpcContext, _: Empty, id: PackageId) -> Result<ConfigRes, Error> {
-    ctx.services
-        .get(&id)
-        .await
-        .as_ref()
-        .or_not_found(lazy_format!("Manager for {id}"))?
-        .get_config(Guid::new())
-        .await
-}
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-pub struct SetParams {
-    #[arg(long = "timeout")]
-    pub timeout: Option<crate::util::serde::Duration>,
-    #[command(flatten)]
-    #[ts(type = "{ [key: string]: any } | null")]
-    pub config: StdinDeserializable<Option<Config>>,
-}
-
-// #[command(
-//     subcommands(self(set_impl(async, context(RpcContext))), set_dry),
-//     display(display_none),
-//     metadata(sync_db = true)
-// )]
-#[instrument(skip_all)]
-pub fn set<C: Context>() -> ParentHandler<C, SetParams, PackageId> {
-    ParentHandler::new()
-        .root_handler(
-            from_fn_async(set_impl)
-                .with_metadata("sync_db", Value::Bool(true))
-                .with_inherited(|set_params, id| (id, set_params))
-                .no_display()
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "dry",
-            from_fn_async(set_dry)
-                .with_inherited(|set_params, id| (id, set_params))
-                .no_display()
-                .with_call_remote::<CliContext>(),
-        )
-}
-
-pub async fn set_dry(
-    ctx: RpcContext,
-    _: Empty,
-    (
-        id,
-        SetParams {
-            timeout,
-            config: StdinDeserializable(config),
-        },
-    ): (PackageId, SetParams),
-) -> Result<BTreeSet<PackageId>, Error> {
-    let mut breakages = BTreeSet::new();
-
-    let procedure_id = Guid::new();
-
-    let db = ctx.db.peek().await;
-    for dep in db
-        .as_public()
-        .as_package_data()
-        .as_entries()?
-        .into_iter()
-        .filter_map(
-            |(k, v)| match v.as_current_dependencies().contains_key(&id) {
-                Ok(true) => Some(Ok(k)),
-                Ok(false) => None,
-                Err(e) => Some(Err(e)),
-            },
-        )
-    {
-        let dep_id = dep?;
-
-        let Some(dependent) = &*ctx.services.get(&dep_id).await else {
-            continue;
-        };
-
-        if dependent
-            .dependency_config(procedure_id.clone(), id.clone(), config.clone())
-            .await?
-            .is_some()
-        {
-            breakages.insert(dep_id);
-        }
-    }
-
-    Ok(breakages)
-}
-
-#[derive(Default)]
-pub struct ConfigureContext {
-    pub timeout: Option<Duration>,
-    pub config: Option<Config>,
-}
-
-#[instrument(skip_all)]
-pub async fn set_impl(
-    ctx: RpcContext,
-    _: Empty,
-    (
-        id,
-        SetParams {
-            timeout,
-            config: StdinDeserializable(config),
-        },
-    ): (PackageId, SetParams),
-) -> Result<(), Error> {
-    let configure_context = ConfigureContext {
-        timeout: timeout.map(|t| *t),
-        config,
-    };
-    ctx.services
-        .get(&id)
-        .await
-        .as_ref()
-        .ok_or_else(|| {
-            Error::new(
-                eyre!("There is no manager running for {id}"),
-                ErrorKind::Unknown,
-            )
-        })?
-        .configure(Guid::new(), configure_context)
-        .await?;
-    Ok(())
-}
diff --git a/core/startos/src/config/util.rs b/core/startos/src/config/util.rs
deleted file mode 100644
index 359c24476..000000000
--- a/core/startos/src/config/util.rs
+++ /dev/null
@@ -1,406 +0,0 @@
-use std::borrow::Cow;
-use std::ops::{Bound, RangeBounds, RangeInclusive};
-
-use patch_db::Value;
-use rand::distributions::Distribution;
-use rand::Rng;
-
-use super::Config;
-
-pub const STATIC_NULL: Value = Value::Null;
-
-#[derive(Clone, Debug)]
-pub struct CharSet(pub Vec<(RangeInclusive<char>, usize)>, usize);
-impl CharSet {
-    pub fn contains(&self, c: &char) -> bool {
-        self.0.iter().any(|r| r.0.contains(c))
-    }
-    pub fn gen<R: Rng>(&self, rng: &mut R) -> char {
-        let mut idx = rng.gen_range(0..self.1);
-        for r in &self.0 {
-            if idx < r.1 {
-                return std::convert::TryFrom::try_from(
-                    rand::distributions::Uniform::new_inclusive(
-                        u32::from(*r.0.start()),
-                        u32::from(*r.0.end()),
-                    )
-                    .sample(rng),
-                )
-                .unwrap();
-            } else {
-                idx -= r.1;
-            }
-        }
-        unreachable!()
-    }
-}
-impl Default for CharSet {
-    fn default() -> Self {
-        CharSet(vec![('!'..='~', 94)], 94)
-    }
-}
-impl<'de> serde::de::Deserialize<'de> for CharSet {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::de::Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        let mut res = Vec::new();
-        let mut len = 0;
-        let mut a: Option<char> = None;
-        let mut b: Option<char> = None;
-        let mut in_range = false;
-        for c in s.chars() {
-            match c {
-                ',' => match (a, b, in_range) {
-                    (Some(start), Some(end), _) => {
-                        if !end.is_ascii() {
-                            return Err(serde::de::Error::custom("Invalid Character"));
-                        }
-                        if start >= end {
-                            return Err(serde::de::Error::custom("Invalid Bounds"));
-                        }
-                        let l = u32::from(end) - u32::from(start) + 1;
-                        res.push((start..=end, l as usize));
-                        len += l as usize;
-                        a = None;
-                        b = None;
-                        in_range = false;
-                    }
-                    (Some(start), None, false) => {
-                        len += 1;
-                        res.push((start..=start, 1));
-                        a = None;
-                    }
-                    (Some(_), None, true) => {
-                        b = Some(',');
-                    }
-                    (None, None, false) => {
-                        a = Some(',');
-                    }
-                    _ => {
-                        return Err(serde::de::Error::custom("Syntax Error"));
-                    }
-                },
-                '-' => {
-                    if a.is_none() {
-                        a = Some('-');
-                    } else if !in_range {
-                        in_range = true;
-                    } else if b.is_none() {
-                        b = Some('-')
-                    } else {
-                        return Err(serde::de::Error::custom("Syntax Error"));
-                    }
-                }
-                _ => {
-                    if a.is_none() {
-                        a = Some(c);
-                    } else if in_range && b.is_none() {
-                        b = Some(c);
-                    } else {
-                        return Err(serde::de::Error::custom("Syntax Error"));
-                    }
-                }
-            }
-        }
-        match (a, b) {
-            (Some(start), Some(end)) => {
-                if !end.is_ascii() {
-                    return Err(serde::de::Error::custom("Invalid Character"));
-                }
-                if start >= end {
-                    return Err(serde::de::Error::custom("Invalid Bounds"));
-                }
-                let l = u32::from(end) - u32::from(start) + 1;
-                res.push((start..=end, l as usize));
-                len += l as usize;
-            }
-            (Some(c), None) => {
-                len += 1;
-                res.push((c..=c, 1));
-            }
-            _ => (),
-        }
-
-        Ok(CharSet(res, len))
-    }
-}
-impl serde::ser::Serialize for CharSet {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::ser::Serializer,
-    {
-        <&str>::serialize(
-            &self
-                .0
-                .iter()
-                .map(|r| match r.1 {
-                    1 => format!("{}", r.0.start()),
-                    _ => format!("{}-{}", r.0.start(), r.0.end()),
-                })
-                .collect::<Vec<_>>()
-                .join(",")
-                .as_str(),
-            serializer,
-        )
-    }
-}
-
-pub trait MergeWith {
-    fn merge_with(&mut self, other: &serde_json::Value);
-}
-
-impl MergeWith for serde_json::Value {
-    fn merge_with(&mut self, other: &serde_json::Value) {
-        use serde_json::Value::Object;
-        if let (Object(orig), Object(ref other)) = (self, other) {
-            for (key, val) in other.into_iter() {
-                match (orig.get_mut(key), val) {
-                    (Some(new_orig @ Object(_)), other @ Object(_)) => {
-                        new_orig.merge_with(other);
-                    }
-                    (None, _) => {
-                        orig.insert(key.clone(), val.clone());
-                    }
-                    _ => (),
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn merge_with_tests() {
-    use serde_json::json;
-
-    let mut a = json!(
-        {"a": 1, "c": {"d": "123"}, "i": [1,2,3], "j": {}, "k":[1,2,3], "l": "test"}
-    );
-    a.merge_with(
-        &json!({"a":"a", "b": "b", "c":{"d":"d", "e":"e"}, "f":{"g":"g"}, "h": [1,2,3], "i":"i", "j":[1,2,3], "k":{}}),
-    );
-    assert_eq!(
-        a,
-        json!({"a": 1, "c": {"d": "123", "e":"e"}, "b":"b", "f": {"g":"g"}, "h":[1,2,3], "i":[1,2,3], "j": {}, "k":[1,2,3], "l": "test"})
-    )
-}
-pub mod serde_regex {
-    use regex::Regex;
-    use serde::*;
-
-    pub fn serialize<S>(regex: &Regex, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        <&str>::serialize(&regex.as_str(), serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Regex, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        Regex::new(&s).map_err(|e| de::Error::custom(e))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct NumRange<T: std::str::FromStr + std::fmt::Display + std::cmp::PartialOrd>(
-    pub (Bound<T>, Bound<T>),
-);
-impl<T> std::ops::Deref for NumRange<T>
-where
-    T: std::str::FromStr + std::fmt::Display + std::cmp::PartialOrd,
-{
-    type Target = (Bound<T>, Bound<T>);
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl<'de, T> serde::de::Deserialize<'de> for NumRange<T>
-where
-    T: std::str::FromStr + std::fmt::Display + std::cmp::PartialOrd,
-    <T as std::str::FromStr>::Err: std::fmt::Display,
-{
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::de::Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        let mut split = s.split(",");
-        let start = split
-            .next()
-            .map(|s| match s.get(..1) {
-                Some("(") => match s.get(1..2) {
-                    Some("*") => Ok(Bound::Unbounded),
-                    _ => s[1..]
-                        .trim()
-                        .parse()
-                        .map(Bound::Excluded)
-                        .map_err(|e| serde::de::Error::custom(e)),
-                },
-                Some("[") => s[1..]
-                    .trim()
-                    .parse()
-                    .map(Bound::Included)
-                    .map_err(|e| serde::de::Error::custom(e)),
-                _ => Err(serde::de::Error::custom(format!(
-                    "Could not parse left bound: {}",
-                    s
-                ))),
-            })
-            .transpose()?
-            .unwrap();
-        let end = split
-            .next()
-            .map(|s| match s.get(s.len() - 1..) {
-                Some(")") => match s.get(s.len() - 2..s.len() - 1) {
-                    Some("*") => Ok(Bound::Unbounded),
-                    _ => s[..s.len() - 1]
-                        .trim()
-                        .parse()
-                        .map(Bound::Excluded)
-                        .map_err(|e| serde::de::Error::custom(e)),
-                },
-                Some("]") => s[..s.len() - 1]
-                    .trim()
-                    .parse()
-                    .map(Bound::Included)
-                    .map_err(|e| serde::de::Error::custom(e)),
-                _ => Err(serde::de::Error::custom(format!(
-                    "Could not parse right bound: {}",
-                    s
-                ))),
-            })
-            .transpose()?
-            .unwrap_or(Bound::Unbounded);
-
-        Ok(NumRange((start, end)))
-    }
-}
-impl<T> std::fmt::Display for NumRange<T>
-where
-    T: std::str::FromStr + std::fmt::Display + std::cmp::PartialOrd,
-{
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self.start_bound() {
-            Bound::Excluded(n) => write!(f, "({},", n)?,
-            Bound::Included(n) => write!(f, "[{},", n)?,
-            Bound::Unbounded => write!(f, "(*,")?,
-        };
-        match self.end_bound() {
-            Bound::Excluded(n) => write!(f, "{})", n),
-            Bound::Included(n) => write!(f, "{}]", n),
-            Bound::Unbounded => write!(f, "*)"),
-        }
-    }
-}
-impl<T> serde::ser::Serialize for NumRange<T>
-where
-    T: std::str::FromStr + std::fmt::Display + std::cmp::PartialOrd,
-{
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::ser::Serializer,
-    {
-        <&str>::serialize(&format!("{}", self).as_str(), serializer)
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum UniqueBy {
-    Any(Vec<UniqueBy>),
-    All(Vec<UniqueBy>),
-    Exactly(String),
-    NotUnique,
-}
-impl UniqueBy {
-    pub fn eq(&self, lhs: &Config, rhs: &Config) -> bool {
-        match self {
-            UniqueBy::Any(any) => any.iter().any(|u| u.eq(lhs, rhs)),
-            UniqueBy::All(all) => all.iter().all(|u| u.eq(lhs, rhs)),
-            UniqueBy::Exactly(key) => lhs.get(&**key) == rhs.get(&**key),
-            UniqueBy::NotUnique => false,
-        }
-    }
-}
-impl Default for UniqueBy {
-    fn default() -> Self {
-        UniqueBy::NotUnique
-    }
-}
-impl<'de> serde::de::Deserialize<'de> for UniqueBy {
-    fn deserialize<D: serde::de::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        struct Visitor;
-        impl<'de> serde::de::Visitor<'de> for Visitor {
-            type Value = UniqueBy;
-            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-                write!(formatter, "a key, an \"any\" object, or an \"all\" object")
-            }
-            fn visit_str<E: serde::de::Error>(self, v: &str) -> Result<Self::Value, E> {
-                Ok(UniqueBy::Exactly(v.to_owned()))
-            }
-            fn visit_string<E: serde::de::Error>(self, v: String) -> Result<Self::Value, E> {
-                Ok(UniqueBy::Exactly(v))
-            }
-            fn visit_map<A: serde::de::MapAccess<'de>>(
-                self,
-                mut map: A,
-            ) -> Result<Self::Value, A::Error> {
-                let mut variant = None;
-                while let Some(key) = map.next_key::<Cow<str>>()? {
-                    match key.as_ref() {
-                        "any" => {
-                            return Ok(UniqueBy::Any(map.next_value()?));
-                        }
-                        "all" => {
-                            return Ok(UniqueBy::All(map.next_value()?));
-                        }
-                        _ => {
-                            variant = Some(key);
-                        }
-                    }
-                }
-                Err(serde::de::Error::unknown_variant(
-                    variant.unwrap_or_default().as_ref(),
-                    &["any", "all"],
-                ))
-            }
-            fn visit_unit<E: serde::de::Error>(self) -> Result<Self::Value, E> {
-                Ok(UniqueBy::NotUnique)
-            }
-            fn visit_none<E: serde::de::Error>(self) -> Result<Self::Value, E> {
-                Ok(UniqueBy::NotUnique)
-            }
-        }
-        deserializer.deserialize_any(Visitor)
-    }
-}
-
-impl serde::ser::Serialize for UniqueBy {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::ser::Serializer,
-    {
-        use serde::ser::SerializeMap;
-
-        match self {
-            UniqueBy::Any(any) => {
-                let mut map = serializer.serialize_map(Some(1))?;
-                map.serialize_key("any")?;
-                map.serialize_value(any)?;
-                map.end()
-            }
-            UniqueBy::All(all) => {
-                let mut map = serializer.serialize_map(Some(1))?;
-                map.serialize_key("all")?;
-                map.serialize_value(all)?;
-                map.end()
-            }
-            UniqueBy::Exactly(key) => serializer.serialize_str(key),
-            UniqueBy::NotUnique => serializer.serialize_unit(),
-        }
-    }
-}
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index c78f118ea..6ada12301 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 use std::future::Future;
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 use std::ops::Deref;
@@ -9,8 +9,11 @@ use std::time::Duration;
 
 use chrono::{TimeDelta, Utc};
 use helpers::NonDetachingJoinHandle;
+use imbl::OrdMap;
 use imbl_value::InternedString;
+use itertools::Itertools;
 use josekit::jwk::Jwk;
+use models::{ActionId, PackageId};
 use reqwest::{Client, Proxy};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{CallRemote, Context, Empty};
@@ -23,7 +26,6 @@ use crate::account::AccountInfo;
 use crate::auth::Sessions;
 use crate::context::config::ServerConfig;
 use crate::db::model::Database;
-use crate::dependencies::compute_dependency_config_errs;
 use crate::disk::OsPartitionInfo;
 use crate::init::check_time_is_synchronized;
 use crate::lxc::{ContainerId, LxcContainer, LxcManager};
@@ -33,6 +35,7 @@ use crate::net::wifi::WpaCli;
 use crate::prelude::*;
 use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle};
 use crate::rpc_continuations::{Guid, OpenAuthedContinuations, RpcContinuations};
+use crate::service::action::update_requested_actions;
 use crate::service::effects::callbacks::ServiceCallbacks;
 use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
@@ -100,14 +103,14 @@ impl InitRpcContextPhases {
 pub struct CleanupInitPhases {
     cleanup_sessions: PhaseProgressTrackerHandle,
     init_services: PhaseProgressTrackerHandle,
-    check_dependencies: PhaseProgressTrackerHandle,
+    check_requested_actions: PhaseProgressTrackerHandle,
 }
 impl CleanupInitPhases {
     pub fn new(handle: &FullProgressTracker) -> Self {
         Self {
             cleanup_sessions: handle.add_phase("Cleaning up sessions".into(), Some(1)),
             init_services: handle.add_phase("Initializing services".into(), Some(10)),
-            check_dependencies: handle.add_phase("Checking dependencies".into(), Some(1)),
+            check_requested_actions: handle.add_phase("Checking action requests".into(), Some(1)),
         }
     }
 }
@@ -309,7 +312,7 @@ impl RpcContext {
         CleanupInitPhases {
             mut cleanup_sessions,
             init_services,
-            mut check_dependencies,
+            mut check_requested_actions,
         }: CleanupInitPhases,
     ) -> Result<(), Error> {
         cleanup_sessions.start();
@@ -366,35 +369,68 @@ impl RpcContext {
         cleanup_sessions.complete();
 
         self.services.init(&self, init_services).await?;
-        tracing::info!("Initialized Package Managers");
+        tracing::info!("Initialized Services");
 
-        check_dependencies.start();
-        let mut updated_current_dependents = BTreeMap::new();
+        // TODO
+        check_requested_actions.start();
         let peek = self.db.peek().await;
-        for (package_id, package) in peek.as_public().as_package_data().as_entries()?.into_iter() {
-            let package = package.clone();
-            let mut current_dependencies = package.as_current_dependencies().de()?;
-            compute_dependency_config_errs(self, &package_id, &mut current_dependencies)
-                .await
-                .log_err();
-            updated_current_dependents.insert(package_id.clone(), current_dependencies);
+        let mut action_input: OrdMap<PackageId, BTreeMap<ActionId, Value>> = OrdMap::new();
+        let requested_actions: BTreeSet<_> = peek
+            .as_public()
+            .as_package_data()
+            .as_entries()?
+            .into_iter()
+            .map(|(_, pde)| {
+                Ok(pde
+                    .as_requested_actions()
+                    .as_entries()?
+                    .into_iter()
+                    .map(|(_, r)| {
+                        Ok::<_, Error>((
+                            r.as_request().as_package_id().de()?,
+                            r.as_request().as_action_id().de()?,
+                        ))
+                    }))
+            })
+            .flatten_ok()
+            .map(|a| a.and_then(|a| a))
+            .try_collect()?;
+        let procedure_id = Guid::new();
+        for (package_id, action_id) in requested_actions {
+            if let Some(service) = self.services.get(&package_id).await.as_ref() {
+                if let Some(input) = service
+                    .get_action_input(procedure_id.clone(), action_id.clone())
+                    .await?
+                    .and_then(|i| i.value)
+                {
+                    action_input
+                        .entry(package_id)
+                        .or_default()
+                        .insert(action_id, input);
+                }
+            }
         }
         self.db
-            .mutate(|v| {
-                for (package_id, deps) in updated_current_dependents {
-                    if let Some(model) = v
-                        .as_public_mut()
-                        .as_package_data_mut()
-                        .as_idx_mut(&package_id)
-                        .map(|i| i.as_current_dependencies_mut())
-                    {
-                        model.ser(&deps)?;
+            .mutate(|db| {
+                for (package_id, action_input) in &action_input {
+                    for (action_id, input) in action_input {
+                        for (_, pde) in db.as_public_mut().as_package_data_mut().as_entries_mut()? {
+                            pde.as_requested_actions_mut().mutate(|requested_actions| {
+                                Ok(update_requested_actions(
+                                    requested_actions,
+                                    package_id,
+                                    action_id,
+                                    input,
+                                    false,
+                                ))
+                            })?;
+                        }
                     }
                 }
                 Ok(())
             })
             .await?;
-        check_dependencies.complete();
+        check_requested_actions.complete();
 
         Ok(())
     }
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 957e42c54..5fb6b9655 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -4,7 +4,8 @@ use chrono::{DateTime, Utc};
 use exver::VersionRange;
 use imbl_value::InternedString;
 use models::{
-    ActionId, DataUrl, HealthCheckId, HostId, PackageId, ServiceInterfaceId, VersionString,
+    ActionId, DataUrl, HealthCheckId, HostId, PackageId, ReplayId, ServiceInterfaceId,
+    VersionString,
 };
 use patch_db::json_ptr::JsonPointer;
 use patch_db::HasModel;
@@ -17,8 +18,8 @@ use crate::net::service_interface::ServiceInterface;
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::s9pk::manifest::Manifest;
-use crate::status::Status;
-use crate::util::serde::Pem;
+use crate::status::MainStatus;
+use crate::util::serde::{is_partial_of, Pem};
 
 #[derive(Debug, Default, Deserialize, Serialize, TS)]
 #[ts(export)]
@@ -310,9 +311,9 @@ pub struct InstallingInfo {
 }
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[ts(export)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 pub enum AllowedStatuses {
-    OnlyRunning, // onlyRunning
+    OnlyRunning,
     OnlyStopped,
     Any,
 }
@@ -324,13 +325,28 @@ pub struct ActionMetadata {
     pub name: String,
     pub description: String,
     pub warning: Option<String>,
-    #[ts(type = "any")]
-    pub input: Value,
-    pub disabled: bool,
+    #[serde(default)]
+    pub visibility: ActionVisibility,
     pub allowed_statuses: AllowedStatuses,
+    pub has_input: bool,
     pub group: Option<String>,
 }
 
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "kebab-case")]
+#[serde(rename_all_fields = "camelCase")]
+pub enum ActionVisibility {
+    Hidden,
+    Disabled { reason: String },
+    Enabled,
+}
+impl Default for ActionVisibility {
+    fn default() -> Self {
+        Self::Enabled
+    }
+}
+
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
@@ -338,7 +354,7 @@ pub struct ActionMetadata {
 pub struct PackageDataEntry {
     pub state_info: PackageState,
     pub data_version: Option<VersionString>,
-    pub status: Status,
+    pub status: MainStatus,
     #[ts(type = "string | null")]
     pub registry: Option<Url>,
     #[ts(type = "string")]
@@ -348,6 +364,8 @@ pub struct PackageDataEntry {
     pub last_backup: Option<DateTime<Utc>>,
     pub current_dependencies: CurrentDependencies,
     pub actions: BTreeMap<ActionId, ActionMetadata>,
+    #[ts(as = "BTreeMap::<String, ActionRequestEntry>")]
+    pub requested_actions: BTreeMap<ReplayId, ActionRequestEntry>,
     pub service_interfaces: BTreeMap<ServiceInterfaceId, ServiceInterface>,
     pub hosts: Hosts,
     #[ts(type = "string[]")]
@@ -384,8 +402,9 @@ impl Map for CurrentDependencies {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS, HasModel)]
 #[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
 pub struct CurrentDependencyInfo {
     #[ts(type = "string | null")]
     pub title: Option<InternedString>,
@@ -394,11 +413,10 @@ pub struct CurrentDependencyInfo {
     pub kind: CurrentDependencyKind,
     #[ts(type = "string")]
     pub version_range: VersionRange,
-    pub config_satisfied: bool,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "kebab-case")]
 #[serde(tag = "kind")]
 pub enum CurrentDependencyKind {
     Exists,
@@ -410,6 +428,66 @@ pub enum CurrentDependencyKind {
     },
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize, TS, HasModel)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+#[model = "Model<Self>"]
+pub struct ActionRequestEntry {
+    pub request: ActionRequest,
+    pub active: bool,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS, HasModel)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+#[model = "Model<Self>"]
+pub struct ActionRequest {
+    pub package_id: PackageId,
+    pub action_id: ActionId,
+    #[ts(optional)]
+    pub description: Option<String>,
+    #[ts(optional)]
+    pub when: Option<ActionRequestTrigger>,
+    #[ts(optional)]
+    pub input: Option<ActionRequestInput>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct ActionRequestTrigger {
+    #[serde(default)]
+    pub once: bool,
+    pub condition: ActionRequestCondition,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "kebab-case")]
+#[ts(export)]
+pub enum ActionRequestCondition {
+    InputNotMatches,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "kebab-case")]
+#[serde(tag = "kind")]
+pub enum ActionRequestInput {
+    Partial {
+        #[ts(type = "Record<string, unknown>")]
+        value: Value,
+    },
+}
+impl ActionRequestInput {
+    pub fn matches(&self, input: Option<&Value>) -> bool {
+        match self {
+            Self::Partial { value } => match input {
+                None => false,
+                Some(full) => is_partial_of(value, full),
+            },
+        }
+    }
+}
+
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct InterfaceAddressMap(pub BTreeMap<HostId, InterfaceAddresses>);
 impl Map for InterfaceAddressMap {
diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs
index 013648980..3b55c8fc3 100644
--- a/core/startos/src/dependencies.rs
+++ b/core/startos/src/dependencies.rs
@@ -1,28 +1,14 @@
 use std::collections::BTreeMap;
-use std::time::Duration;
 
-use clap::Parser;
 use imbl_value::InternedString;
 use models::PackageId;
-use patch_db::json_patch::merge;
-use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use tracing::instrument;
 use ts_rs::TS;
 
-use crate::config::{Config, ConfigSpec, ConfigureContext};
-use crate::context::{CliContext, RpcContext};
-use crate::db::model::package::CurrentDependencies;
 use crate::prelude::*;
-use crate::rpc_continuations::Guid;
-use crate::util::serde::HandlerExtSerde;
 use crate::util::PathOrUrl;
 use crate::Error;
 
-pub fn dependency<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new().subcommand("configure", configure::<C>())
-}
-
 #[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[model = "Model<Self>"]
 #[ts(export)]
@@ -56,129 +42,3 @@ pub struct DependencyMetadata {
     #[ts(type = "string")]
     pub title: InternedString,
 }
-
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct ConfigureParams {
-    dependent_id: PackageId,
-    dependency_id: PackageId,
-}
-pub fn configure<C: Context>() -> ParentHandler<C, ConfigureParams> {
-    ParentHandler::new()
-        .root_handler(
-            from_fn_async(configure_impl)
-                .with_inherited(|params, _| params)
-                .no_display()
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "dry",
-            from_fn_async(configure_dry)
-                .with_inherited(|params, _| params)
-                .with_display_serializable()
-                .with_call_remote::<CliContext>(),
-        )
-}
-
-pub async fn configure_impl(
-    ctx: RpcContext,
-    _: Empty,
-    ConfigureParams {
-        dependent_id,
-        dependency_id,
-    }: ConfigureParams,
-) -> Result<(), Error> {
-    let ConfigDryRes {
-        old_config: _,
-        new_config,
-        spec: _,
-    } = configure_logic(ctx.clone(), (dependent_id, dependency_id.clone())).await?;
-
-    let configure_context = ConfigureContext {
-        timeout: Some(Duration::from_secs(3).into()),
-        config: Some(new_config),
-    };
-    ctx.services
-        .get(&dependency_id)
-        .await
-        .as_ref()
-        .ok_or_else(|| {
-            Error::new(
-                eyre!("There is no manager running for {dependency_id}"),
-                ErrorKind::Unknown,
-            )
-        })?
-        .configure(Guid::new(), configure_context)
-        .await?;
-    Ok(())
-}
-
-pub async fn configure_dry(
-    ctx: RpcContext,
-    _: Empty,
-    ConfigureParams {
-        dependent_id,
-        dependency_id,
-    }: ConfigureParams,
-) -> Result<ConfigDryRes, Error> {
-    configure_logic(ctx.clone(), (dependent_id, dependency_id.clone())).await
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ConfigDryRes {
-    pub old_config: Config,
-    pub new_config: Config,
-    pub spec: ConfigSpec,
-}
-
-pub async fn configure_logic(
-    ctx: RpcContext,
-    (dependent_id, dependency_id): (PackageId, PackageId),
-) -> Result<ConfigDryRes, Error> {
-    let procedure_id = Guid::new();
-    let dependency_guard = ctx.services.get(&dependency_id).await;
-    let dependency = dependency_guard.as_ref().or_not_found(&dependency_id)?;
-    let dependent_guard = ctx.services.get(&dependent_id).await;
-    let dependent = dependent_guard.as_ref().or_not_found(&dependent_id)?;
-    let config_res = dependency.get_config(procedure_id.clone()).await?;
-    let diff = Value::Object(
-        dependent
-            .dependency_config(procedure_id, dependency_id, config_res.config.clone())
-            .await?
-            .unwrap_or_default(),
-    );
-    let mut new_config = Value::Object(config_res.config.clone().unwrap_or_default());
-    merge(&mut new_config, &diff);
-    Ok(ConfigDryRes {
-        old_config: config_res.config.unwrap_or_default(),
-        new_config: new_config.as_object().cloned().unwrap_or_default(),
-        spec: config_res.spec,
-    })
-}
-
-#[instrument(skip_all)]
-pub async fn compute_dependency_config_errs(
-    ctx: &RpcContext,
-    id: &PackageId,
-    current_dependencies: &mut CurrentDependencies,
-) -> Result<(), Error> {
-    let procedure_id = Guid::new();
-    let service_guard = ctx.services.get(id).await;
-    let service = service_guard.as_ref().or_not_found(id)?;
-    for (dep_id, dep_info) in current_dependencies.0.iter_mut() {
-        // check if config passes dependency check
-        let Some(dependency) = &*ctx.services.get(dep_id).await else {
-            continue;
-        };
-
-        let dep_config = dependency.get_config(procedure_id.clone()).await?.config;
-
-        dep_info.config_satisfied = service
-            .dependency_config(procedure_id.clone(), dep_id.clone(), dep_config)
-            .await?
-            .is_none();
-    }
-    Ok(())
-}
diff --git a/core/startos/src/disk/mount/backup.rs b/core/startos/src/disk/mount/backup.rs
index 8f45b0d4f..2c322c284 100644
--- a/core/startos/src/disk/mount/backup.rs
+++ b/core/startos/src/disk/mount/backup.rs
@@ -219,10 +219,10 @@ impl<G: GenericMountGuard> Drop for BackupMountGuard<G> {
         let second = self.backup_disk_mount_guard.take();
         tokio::spawn(async move {
             if let Some(guard) = first {
-                guard.unmount().await.unwrap();
+                guard.unmount().await.log_err();
             }
             if let Some(guard) = second {
-                guard.unmount().await.unwrap();
+                guard.unmount().await.log_err();
             }
         });
     }
diff --git a/core/startos/src/disk/mount/filesystem/overlayfs.rs b/core/startos/src/disk/mount/filesystem/overlayfs.rs
index 5e40a21a1..e8d1f0b34 100644
--- a/core/startos/src/disk/mount/filesystem/overlayfs.rs
+++ b/core/startos/src/disk/mount/filesystem/overlayfs.rs
@@ -151,12 +151,12 @@ impl<G: GenericMountGuard> Drop for OverlayGuard<G> {
         let guard = self.inner_guard.take();
         if lower.is_some() || upper.is_some() || guard.mounted {
             tokio::spawn(async move {
-                guard.unmount(false).await.unwrap();
+                guard.unmount(false).await.log_err();
                 if let Some(lower) = lower {
-                    lower.unmount().await.unwrap();
+                    lower.unmount().await.log_err();
                 }
                 if let Some(upper) = upper {
-                    upper.delete().await.unwrap();
+                    upper.delete().await.log_err();
                 }
             });
         }
diff --git a/core/startos/src/disk/mount/guard.rs b/core/startos/src/disk/mount/guard.rs
index a2d577226..6e1cdc35e 100644
--- a/core/startos/src/disk/mount/guard.rs
+++ b/core/startos/src/disk/mount/guard.rs
@@ -96,7 +96,7 @@ impl Drop for MountGuard {
     fn drop(&mut self) {
         if self.mounted {
             let mountpoint = std::mem::take(&mut self.mountpoint);
-            tokio::spawn(async move { unmount(mountpoint, true).await.unwrap() });
+            tokio::spawn(async move { unmount(mountpoint, true).await.log_err() });
         }
     }
 }
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index 32b0f6ce4..f153c88ad 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -9,7 +9,7 @@ use exver::VersionRange;
 use futures::{AsyncWriteExt, StreamExt};
 use imbl_value::{json, InternedString};
 use itertools::Itertools;
-use models::VersionString;
+use models::{FromStrParser, VersionString};
 use reqwest::header::{HeaderMap, CONTENT_LENGTH};
 use reqwest::Url;
 use rpc_toolkit::yajrc::{GenericRpcMethod, RpcError};
@@ -30,7 +30,6 @@ use crate::registry::package::get::GetPackageResponse;
 use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::s9pk::manifest::PackageId;
 use crate::upload::upload;
-use crate::util::clap::FromStrParser;
 use crate::util::io::open_file;
 use crate::util::net::WebSocketExt;
 use crate::util::Never;
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index b5629aa04..8d4f831bf 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -29,7 +29,6 @@ pub mod action;
 pub mod auth;
 pub mod backup;
 pub mod bins;
-pub mod config;
 pub mod context;
 pub mod control;
 pub mod db;
@@ -70,7 +69,6 @@ pub mod volume;
 use std::time::SystemTime;
 
 use clap::Parser;
-pub use config::Config;
 pub use error::{Error, ErrorKind, ResultExt};
 use imbl_value::Value;
 use rpc_toolkit::yajrc::RpcError;
@@ -240,15 +238,7 @@ pub fn server<C: Context>() -> ParentHandler<C> {
 
 pub fn package<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand(
-            "action",
-            from_fn_async(action::action)
-                .with_display_serializable()
-                .with_custom_display_fn(|handle, result| {
-                    Ok(action::display_action_result(handle.params, result))
-                })
-                .with_call_remote::<CliContext>(),
-        )
+        .subcommand("action", action::action_api::<C>())
         .subcommand(
             "install",
             from_fn_async(install::install)
@@ -281,7 +271,6 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .with_display_serializable()
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("config", config::config::<C>())
         .subcommand(
             "start",
             from_fn_async(control::start)
@@ -316,7 +305,6 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 })
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("dependency", dependencies::dependency::<C>())
         .subcommand("backup", backup::package_backup::<C>())
         .subcommand("connect", from_fn_async(service::connect_rpc).no_cli())
         .subcommand(
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 9cf234f5f..7ff1d7d08 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -12,7 +12,7 @@ use color_eyre::eyre::eyre;
 use futures::stream::BoxStream;
 use futures::{Future, FutureExt, Stream, StreamExt, TryStreamExt};
 use itertools::Itertools;
-use models::PackageId;
+use models::{FromStrParser, PackageId};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{
     from_fn_async, CallRemote, Context, Empty, HandlerArgs, HandlerExt, HandlerFor, ParentHandler,
@@ -30,7 +30,6 @@ use crate::error::ResultExt;
 use crate::lxc::ContainerId;
 use crate::prelude::*;
 use crate::rpc_continuations::{Guid, RpcContinuation, RpcContinuations};
-use crate::util::clap::FromStrParser;
 use crate::util::serde::Reversible;
 use crate::util::Invoke;
 
@@ -487,14 +486,18 @@ fn logs_follow<
                   context,
                   inherited_params:
                       LogsParams {
-                          extra, limit, boot, ..
+                          extra,
+                          cursor,
+                          limit,
+                          boot,
+                          ..
                       },
                   ..
               }: HandlerArgs<C, Empty, LogsParams<Extra>>| {
             let f = f.clone();
             async move {
                 let src = f.call(&context, extra).await?;
-                follow_logs(context, src, limit, boot.map(String::from)).await
+                follow_logs(context, src, cursor, limit, boot.map(String::from)).await
             }
         },
     )
@@ -525,7 +528,7 @@ pub fn package_logs() -> ParentHandler<RpcContext, LogsParams<PackageIdParams>>
 
 pub async fn journalctl(
     id: LogSource,
-    limit: usize,
+    limit: Option<usize>,
     cursor: Option<&str>,
     boot: Option<&str>,
     before: bool,
@@ -533,11 +536,12 @@ pub async fn journalctl(
 ) -> Result<LogStream, Error> {
     let mut cmd = gen_journalctl_command(&id);
 
-    cmd.arg(format!("--lines={}", limit));
+    if let Some(limit) = limit {
+        cmd.arg(format!("--lines={}", limit));
+    }
 
-    let cursor_formatted = format!("--after-cursor={}", cursor.unwrap_or(""));
-    if cursor.is_some() {
-        cmd.arg(&cursor_formatted);
+    if let Some(cursor) = cursor {
+        cmd.arg(&format!("--after-cursor={}", cursor));
         if before {
             cmd.arg("--reverse");
         }
@@ -638,8 +642,15 @@ pub async fn fetch_logs(
     before: bool,
 ) -> Result<LogResponse, Error> {
     let limit = limit.unwrap_or(50);
-    let mut stream =
-        journalctl(id, limit, cursor.as_deref(), boot.as_deref(), before, false).await?;
+    let mut stream = journalctl(
+        id,
+        Some(limit),
+        cursor.as_deref(),
+        boot.as_deref(),
+        before,
+        false,
+    )
+    .await?;
 
     let mut entries = Vec::with_capacity(limit);
     let mut start_cursor = None;
@@ -682,11 +693,16 @@ pub async fn fetch_logs(
 pub async fn follow_logs<Context: AsRef<RpcContinuations>>(
     ctx: Context,
     id: LogSource,
+    cursor: Option<String>,
     limit: Option<usize>,
     boot: Option<String>,
 ) -> Result<LogFollowResponse, Error> {
-    let limit = limit.unwrap_or(50);
-    let mut stream = journalctl(id, limit, None, boot.as_deref(), false, true).await?;
+    let limit = if cursor.is_some() {
+        None
+    } else {
+        Some(limit.unwrap_or(50))
+    };
+    let mut stream = journalctl(id, limit, cursor.as_deref(), boot.as_deref(), false, true).await?;
 
     let mut start_cursor = None;
     let mut first_entry = None;
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 480f7a24c..ee08801df 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -7,7 +7,7 @@ use std::time::Duration;
 use clap::builder::ValueParserFactory;
 use futures::{AsyncWriteExt, StreamExt};
 use imbl_value::{InOMap, InternedString};
-use models::InvalidId;
+use models::{FromStrParser, InvalidId};
 use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{GenericRpcMethod, RpcRequest, RpcResponse};
 use rustyline_async::{ReadlineEvent, SharedWriter};
@@ -28,7 +28,6 @@ use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
 use crate::disk::mount::util::unmount;
 use crate::prelude::*;
 use crate::rpc_continuations::{Guid, RpcContinuation};
-use crate::util::clap::FromStrParser;
 use crate::util::io::open_file;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::{new_guid, Invoke};
@@ -365,7 +364,7 @@ impl Drop for LxcContainer {
                         tracing::error!("Error reading logs from crashed container: {e}");
                         tracing::debug!("{e:?}")
                     }
-                    rootfs.unmount(true).await.unwrap();
+                    rootfs.unmount(true).await.log_err();
                     drop(guid);
                     if let Err(e) = manager.gc().await {
                         tracing::error!("Error cleaning up dangling LXC containers: {e}");
diff --git a/core/startos/src/net/host/binding.rs b/core/startos/src/net/host/binding.rs
index 76dd04059..174f0330f 100644
--- a/core/startos/src/net/host/binding.rs
+++ b/core/startos/src/net/host/binding.rs
@@ -1,3 +1,7 @@
+use std::str::FromStr;
+
+use clap::builder::ValueParserFactory;
+use models::{FromStrParser, HostId};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
@@ -5,10 +9,37 @@ use crate::net::forward::AvailablePorts;
 use crate::net::vhost::AlpnInfo;
 use crate::prelude::*;
 
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct BindId {
+    pub id: HostId,
+    pub internal_port: u16,
+}
+impl ValueParserFactory for BindId {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
+impl FromStr for BindId {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let (id, port) = s
+            .split_once(":")
+            .ok_or_else(|| Error::new(eyre!("expected <id>:<port>"), ErrorKind::ParseUrl))?;
+        Ok(Self {
+            id: id.parse()?,
+            internal_port: port.parse()?,
+        })
+    }
+}
+
 #[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct BindInfo {
+    pub enabled: bool,
     pub options: BindOptions,
     pub lan: LanInfo,
 }
@@ -30,6 +61,7 @@ impl BindInfo {
             assigned_ssl_port = Some(available_ports.alloc()?);
         }
         Ok(Self {
+            enabled: true,
             options,
             lan: LanInfo {
                 assigned_port,
@@ -69,7 +101,14 @@ impl BindInfo {
                 available_ports.free([port]);
             }
         }
-        Ok(Self { options, lan })
+        Ok(Self {
+            enabled: true,
+            options,
+            lan,
+        })
+    }
+    pub fn disable(&mut self) {
+        self.enabled = false;
     }
 }
 
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index b7a8022b4..a94c7a7d0 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -15,8 +15,8 @@ use crate::hostname::Hostname;
 use crate::net::dns::DnsController;
 use crate::net::forward::LanPortForwardController;
 use crate::net::host::address::HostAddress;
-use crate::net::host::binding::{AddSslOptions, BindOptions, LanInfo};
-use crate::net::host::{host_for, Host, HostKind};
+use crate::net::host::binding::{AddSslOptions, BindId, BindOptions, LanInfo};
+use crate::net::host::{host_for, Host, HostKind, Hosts};
 use crate::net::service_interface::{HostnameInfo, IpHostname, OnionHostname};
 use crate::net::tor::TorController;
 use crate::net::vhost::{AlpnInfo, VHostController};
@@ -154,14 +154,16 @@ impl NetController {
     ) -> Result<NetService, Error> {
         let dns = self.dns.add(Some(package.clone()), ip).await?;
 
-        Ok(NetService {
+        let mut res = NetService {
             shutdown: false,
             id: package,
             ip,
             dns,
             controller: Arc::downgrade(self),
             binds: BTreeMap::new(),
-        })
+        };
+        res.clear_bindings(Default::default()).await?;
+        Ok(res)
     }
 }
 
@@ -221,31 +223,41 @@ impl NetService {
         self.update(id, host).await
     }
 
-    pub async fn clear_bindings(&mut self) -> Result<(), Error> {
-        let ctrl = self.net_controller()?;
-        let mut errors = ErrorCollection::new();
-        for (_, binds) in std::mem::take(&mut self.binds) {
-            for (_, (lan, _, hostnames, rc)) in binds.lan {
-                drop(rc);
-                if let Some(external) = lan.assigned_ssl_port {
-                    for hostname in ctrl.server_hostnames.iter().cloned() {
-                        ctrl.vhost.gc(hostname, external).await?;
-                    }
-                    for hostname in hostnames {
-                        ctrl.vhost.gc(Some(hostname), external).await?;
-                    }
-                }
-                if let Some(external) = lan.assigned_port {
-                    ctrl.forward.gc(external).await?;
+    pub async fn clear_bindings(&mut self, except: BTreeSet<BindId>) -> Result<(), Error> {
+        let pkg_id = &self.id;
+        let hosts = self
+            .net_controller()?
+            .db
+            .mutate(|db| {
+                let mut res = Hosts::default();
+                for (host_id, host) in db
+                    .as_public_mut()
+                    .as_package_data_mut()
+                    .as_idx_mut(pkg_id)
+                    .or_not_found(pkg_id)?
+                    .as_hosts_mut()
+                    .as_entries_mut()?
+                {
+                    host.as_bindings_mut().mutate(|b| {
+                        for (internal_port, info) in b {
+                            if !except.contains(&BindId {
+                                id: host_id.clone(),
+                                internal_port: *internal_port,
+                            }) {
+                                info.disable();
+                            }
+                        }
+                        Ok(())
+                    })?;
+                    res.0.insert(host_id, host.de()?);
                 }
-            }
-            for (addr, (_, rcs)) in binds.tor {
-                drop(rcs);
-                errors.handle(ctrl.tor.gc(Some(addr), None).await);
-            }
+                Ok(res)
+            })
+            .await?;
+        let mut errors = ErrorCollection::new();
+        for (id, host) in hosts.0 {
+            errors.handle(self.update(id, host).await);
         }
-        std::mem::take(&mut self.dns);
-        errors.handle(ctrl.dns.gc(Some(self.id.clone()), self.ip).await);
         errors.into_result()
     }
 
@@ -261,6 +273,9 @@ impl NetService {
         let ip_info = server_info.as_ip_info().de()?;
         let hostname = server_info.as_hostname().de()?;
         for (port, bind) in &host.bindings {
+            if !bind.enabled {
+                continue;
+            }
             let old_lan_bind = binds.lan.remove(port);
             let lan_bind = old_lan_bind
                 .as_ref()
@@ -395,7 +410,7 @@ impl NetService {
         }
         let mut removed = BTreeSet::new();
         binds.lan.retain(|internal, (external, _, hostnames, _)| {
-            if host.bindings.contains_key(internal) {
+            if host.bindings.get(internal).map_or(false, |b| b.enabled) {
                 true
             } else {
                 removed.insert((*external, std::mem::take(hostnames)));
@@ -424,6 +439,9 @@ impl NetService {
         let mut tor_hostname_ports = BTreeMap::<u16, TorHostnamePorts>::new();
         let mut tor_binds = OrdMap::<u16, SocketAddr>::new();
         for (internal, info) in &host.bindings {
+            if !info.enabled {
+                continue;
+            }
             tor_binds.insert(
                 info.options.preferred_external_port,
                 SocketAddr::from((self.ip, *internal)),
@@ -511,7 +529,7 @@ impl NetService {
     pub async fn remove_all(mut self) -> Result<(), Error> {
         self.shutdown = true;
         if let Some(ctrl) = Weak::upgrade(&self.controller) {
-            self.clear_bindings().await?;
+            self.clear_bindings(Default::default()).await?;
             drop(ctrl);
             Ok(())
         } else {
@@ -566,7 +584,7 @@ impl Drop for NetService {
                     binds: BTreeMap::new(),
                 },
             );
-            tokio::spawn(async move { svc.remove_all().await.unwrap() });
+            tokio::spawn(async move { svc.remove_all().await.log_err() });
         }
     }
 }
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 24b8ddb02..16705776f 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -307,7 +307,7 @@ async fn torctl(
 
         let logs = journalctl(
             LogSource::Unit(SYSTEMD_UNIT),
-            0,
+            Some(0),
             None,
             Some("0"),
             false,
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index c99ffb356..c8e1725f4 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -7,7 +7,7 @@ use clap::builder::ValueParserFactory;
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use imbl_value::InternedString;
-use models::PackageId;
+use models::{FromStrParser, PackageId};
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
@@ -17,7 +17,6 @@ use crate::backup::BackupReport;
 use crate::context::{CliContext, RpcContext};
 use crate::db::model::DatabaseModel;
 use crate::prelude::*;
-use crate::util::clap::FromStrParser;
 use crate::util::serde::HandlerExtSerde;
 
 // #[command(subcommands(list, delete, delete_before, create))]
diff --git a/core/startos/src/registry/signer/mod.rs b/core/startos/src/registry/signer/mod.rs
index 99b23b88e..c203f0dad 100644
--- a/core/startos/src/registry/signer/mod.rs
+++ b/core/startos/src/registry/signer/mod.rs
@@ -3,6 +3,7 @@ use std::str::FromStr;
 
 use clap::builder::ValueParserFactory;
 use itertools::Itertools;
+use models::FromStrParser;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 use url::Url;
@@ -10,7 +11,6 @@ use url::Url;
 use crate::prelude::*;
 use crate::registry::signer::commitment::Digestable;
 use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
-use crate::util::clap::FromStrParser;
 
 pub mod commitment;
 pub mod sign;
diff --git a/core/startos/src/registry/signer/sign/mod.rs b/core/startos/src/registry/signer/sign/mod.rs
index a29109864..6a95a2490 100644
--- a/core/startos/src/registry/signer/sign/mod.rs
+++ b/core/startos/src/registry/signer/sign/mod.rs
@@ -4,6 +4,7 @@ use std::str::FromStr;
 use ::ed25519::pkcs8::BitStringRef;
 use clap::builder::ValueParserFactory;
 use der::referenced::OwnedToRef;
+use models::FromStrParser;
 use pkcs8::der::AnyRef;
 use pkcs8::{PrivateKeyInfo, SubjectPublicKeyInfo};
 use serde::{Deserialize, Serialize};
@@ -13,7 +14,6 @@ use ts_rs::TS;
 use crate::prelude::*;
 use crate::registry::signer::commitment::Digestable;
 use crate::registry::signer::sign::ed25519::Ed25519;
-use crate::util::clap::FromStrParser;
 use crate::util::serde::{deserialize_from_str, serialize_display};
 
 pub mod ed25519;
diff --git a/core/startos/src/rpc_continuations.rs b/core/startos/src/rpc_continuations.rs
index 043130b69..4614f8fa6 100644
--- a/core/startos/src/rpc_continuations.rs
+++ b/core/startos/src/rpc_continuations.rs
@@ -13,12 +13,12 @@ use futures::future::BoxFuture;
 use futures::{Future, FutureExt};
 use helpers::TimedResource;
 use imbl_value::InternedString;
+use models::FromStrParser;
 use tokio::sync::{broadcast, Mutex as AsyncMutex};
 use ts_rs::TS;
 
 #[allow(unused_imports)]
 use crate::prelude::*;
-use crate::util::clap::FromStrParser;
 use crate::util::new_guid;
 
 #[derive(
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index 8e62c69d0..e3f54d3a2 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -249,7 +249,6 @@ impl TryFrom<ManifestV1> for Manifest {
             hardware_requirements: value.hardware_requirements,
             git_hash: value.git_hash,
             os_version: value.eos_version,
-            has_config: value.config.is_some(),
         })
     }
 }
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index 1f24a0b73..f8102c736 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -68,8 +68,6 @@ pub struct Manifest {
     #[serde(default = "current_version")]
     #[ts(type = "string")]
     pub os_version: Version,
-    #[serde(default = "const_true")]
-    pub has_config: bool,
 }
 impl Manifest {
     pub fn validate_for<'a, T: Clone>(
diff --git a/core/startos/src/service/action.rs b/core/startos/src/service/action.rs
index 6c5ac4eab..4068d5ad8 100644
--- a/core/startos/src/service/action.rs
+++ b/core/startos/src/service/action.rs
@@ -1,60 +1,179 @@
+use std::collections::BTreeMap;
 use std::time::Duration;
 
-use models::{ActionId, ProcedureName};
+use imbl_value::json;
+use models::{ActionId, PackageId, ProcedureName, ReplayId};
 
-use crate::action::ActionResult;
+use crate::action::{ActionInput, ActionResult};
+use crate::db::model::package::{ActionRequestCondition, ActionRequestEntry, ActionRequestInput};
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
-use crate::service::config::GetConfig;
-use crate::service::dependencies::DependencyConfig;
 use crate::service::{Service, ServiceActor};
 use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::{ConflictBuilder, Handler};
+use crate::util::serde::is_partial_of;
 
-pub(super) struct Action {
+pub(super) struct GetActionInput {
+    id: ActionId,
+}
+impl Handler<GetActionInput> for ServiceActor {
+    type Response = Result<Option<ActionInput>, Error>;
+    fn conflicts_with(_: &GetActionInput) -> ConflictBuilder<Self> {
+        ConflictBuilder::nothing()
+    }
+    async fn handle(
+        &mut self,
+        id: Guid,
+        GetActionInput { id: action_id }: GetActionInput,
+        _: &BackgroundJobQueue,
+    ) -> Self::Response {
+        let container = &self.0.persistent_container;
+        container
+            .execute::<Option<ActionInput>>(
+                id,
+                ProcedureName::GetActionInput(action_id),
+                Value::Null,
+                Some(Duration::from_secs(30)),
+            )
+            .await
+            .with_kind(ErrorKind::Action)
+    }
+}
+
+impl Service {
+    pub async fn get_action_input(
+        &self,
+        id: Guid,
+        action_id: ActionId,
+    ) -> Result<Option<ActionInput>, Error> {
+        if !self
+            .seed
+            .ctx
+            .db
+            .peek()
+            .await
+            .as_public()
+            .as_package_data()
+            .as_idx(&self.seed.id)
+            .or_not_found(&self.seed.id)?
+            .as_actions()
+            .as_idx(&action_id)
+            .or_not_found(&action_id)?
+            .as_has_input()
+            .de()?
+        {
+            return Ok(None);
+        }
+        self.actor
+            .send(id, GetActionInput { id: action_id })
+            .await?
+    }
+}
+
+pub fn update_requested_actions(
+    requested_actions: &mut BTreeMap<ReplayId, ActionRequestEntry>,
+    package_id: &PackageId,
+    action_id: &ActionId,
+    input: &Value,
+    was_run: bool,
+) {
+    requested_actions.retain(|_, v| {
+        if &v.request.package_id != package_id || &v.request.action_id != action_id {
+            return true;
+        }
+        if let Some(when) = &v.request.when {
+            match &when.condition {
+                ActionRequestCondition::InputNotMatches => match &v.request.input {
+                    Some(ActionRequestInput::Partial { value }) => {
+                        if is_partial_of(value, input) {
+                            if when.once {
+                                return !was_run;
+                            } else {
+                                v.active = false;
+                            }
+                        } else {
+                            v.active = true;
+                        }
+                    }
+                    None => {
+                        tracing::error!(
+                            "action request exists in an invalid state {:?}",
+                            v.request
+                        );
+                    }
+                },
+            }
+            true
+        } else {
+            !was_run
+        }
+    })
+}
+
+pub(super) struct RunAction {
     id: ActionId,
     input: Value,
 }
-impl Handler<Action> for ServiceActor {
-    type Response = Result<ActionResult, Error>;
-    fn conflicts_with(_: &Action) -> ConflictBuilder<Self> {
-        ConflictBuilder::everything()
-            .except::<GetConfig>()
-            .except::<DependencyConfig>()
+impl Handler<RunAction> for ServiceActor {
+    type Response = Result<Option<ActionResult>, Error>;
+    fn conflicts_with(_: &RunAction) -> ConflictBuilder<Self> {
+        ConflictBuilder::everything().except::<GetActionInput>()
     }
     async fn handle(
         &mut self,
         id: Guid,
-        Action {
+        RunAction {
             id: action_id,
             input,
-        }: Action,
+        }: RunAction,
         _: &BackgroundJobQueue,
     ) -> Self::Response {
         let container = &self.0.persistent_container;
-        container
-            .execute::<ActionResult>(
+        let result = container
+            .execute::<Option<ActionResult>>(
                 id,
-                ProcedureName::RunAction(action_id),
-                input,
+                ProcedureName::RunAction(action_id.clone()),
+                json!({
+                    "input": input,
+                }),
                 Some(Duration::from_secs(30)),
             )
             .await
-            .with_kind(ErrorKind::Action)
+            .with_kind(ErrorKind::Action)?;
+        let package_id = &self.0.id;
+        self.0
+            .ctx
+            .db
+            .mutate(|db| {
+                for (_, pde) in db.as_public_mut().as_package_data_mut().as_entries_mut()? {
+                    pde.as_requested_actions_mut().mutate(|requested_actions| {
+                        Ok(update_requested_actions(
+                            requested_actions,
+                            package_id,
+                            &action_id,
+                            &input,
+                            true,
+                        ))
+                    })?;
+                }
+                Ok(())
+            })
+            .await?;
+        Ok(result)
     }
 }
 
 impl Service {
-    pub async fn action(
+    pub async fn run_action(
         &self,
         id: Guid,
         action_id: ActionId,
         input: Value,
-    ) -> Result<ActionResult, Error> {
+    ) -> Result<Option<ActionResult>, Error> {
         self.actor
             .send(
                 id,
-                Action {
+                RunAction {
                     id: action_id,
                     input,
                 },
diff --git a/core/startos/src/service/config.rs b/core/startos/src/service/config.rs
deleted file mode 100644
index faa70fc41..000000000
--- a/core/startos/src/service/config.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use std::time::Duration;
-
-use models::ProcedureName;
-
-use crate::config::action::ConfigRes;
-use crate::config::ConfigureContext;
-use crate::prelude::*;
-use crate::rpc_continuations::Guid;
-use crate::service::dependencies::DependencyConfig;
-use crate::service::{Service, ServiceActor};
-use crate::util::actor::background::BackgroundJobQueue;
-use crate::util::actor::{ConflictBuilder, Handler};
-use crate::util::serde::NoOutput;
-
-pub(super) struct Configure(ConfigureContext);
-impl Handler<Configure> for ServiceActor {
-    type Response = Result<(), Error>;
-    fn conflicts_with(_: &Configure) -> ConflictBuilder<Self> {
-        ConflictBuilder::everything().except::<DependencyConfig>()
-    }
-    async fn handle(
-        &mut self,
-        id: Guid,
-        Configure(ConfigureContext { timeout, config }): Configure,
-        _: &BackgroundJobQueue,
-    ) -> Self::Response {
-        let container = &self.0.persistent_container;
-        let package_id = &self.0.id;
-
-        container
-            .execute::<NoOutput>(id, ProcedureName::SetConfig, to_value(&config)?, timeout)
-            .await
-            .with_kind(ErrorKind::ConfigRulesViolation)?;
-        self.0
-            .ctx
-            .db
-            .mutate(move |db| {
-                db.as_public_mut()
-                    .as_package_data_mut()
-                    .as_idx_mut(package_id)
-                    .or_not_found(package_id)?
-                    .as_status_mut()
-                    .as_configured_mut()
-                    .ser(&true)
-            })
-            .await?;
-        Ok(())
-    }
-}
-
-pub(super) struct GetConfig;
-impl Handler<GetConfig> for ServiceActor {
-    type Response = Result<ConfigRes, Error>;
-    fn conflicts_with(_: &GetConfig) -> ConflictBuilder<Self> {
-        ConflictBuilder::nothing().except::<Configure>()
-    }
-    async fn handle(&mut self, id: Guid, _: GetConfig, _: &BackgroundJobQueue) -> Self::Response {
-        let container = &self.0.persistent_container;
-        container
-            .execute::<ConfigRes>(
-                id,
-                ProcedureName::GetConfig,
-                Value::Null,
-                Some(Duration::from_secs(30)), // TODO timeout
-            )
-            .await
-            .with_kind(ErrorKind::ConfigRulesViolation)
-    }
-}
-
-impl Service {
-    pub async fn configure(&self, id: Guid, ctx: ConfigureContext) -> Result<(), Error> {
-        self.actor.send(id, Configure(ctx)).await?
-    }
-    pub async fn get_config(&self, id: Guid) -> Result<ConfigRes, Error> {
-        self.actor.send(id, GetConfig).await?
-    }
-}
diff --git a/core/startos/src/service/control.rs b/core/startos/src/service/control.rs
index 7c4bdf815..8b920bb32 100644
--- a/core/startos/src/service/control.rs
+++ b/core/startos/src/service/control.rs
@@ -1,7 +1,6 @@
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
-use crate::service::config::GetConfig;
-use crate::service::dependencies::DependencyConfig;
+use crate::service::action::RunAction;
 use crate::service::start_stop::StartStop;
 use crate::service::transition::TransitionKind;
 use crate::service::{Service, ServiceActor};
@@ -12,9 +11,7 @@ pub(super) struct Start;
 impl Handler<Start> for ServiceActor {
     type Response = ();
     fn conflicts_with(_: &Start) -> ConflictBuilder<Self> {
-        ConflictBuilder::everything()
-            .except::<GetConfig>()
-            .except::<DependencyConfig>()
+        ConflictBuilder::everything().except::<RunAction>()
     }
     async fn handle(&mut self, _: Guid, _: Start, _: &BackgroundJobQueue) -> Self::Response {
         self.0.persistent_container.state.send_modify(|x| {
@@ -33,9 +30,7 @@ struct Stop;
 impl Handler<Stop> for ServiceActor {
     type Response = ();
     fn conflicts_with(_: &Stop) -> ConflictBuilder<Self> {
-        ConflictBuilder::everything()
-            .except::<GetConfig>()
-            .except::<DependencyConfig>()
+        ConflictBuilder::everything().except::<RunAction>()
     }
     async fn handle(&mut self, _: Guid, _: Stop, _: &BackgroundJobQueue) -> Self::Response {
         let mut transition_state = None;
diff --git a/core/startos/src/service/dependencies.rs b/core/startos/src/service/dependencies.rs
deleted file mode 100644
index e8c6f07c4..000000000
--- a/core/startos/src/service/dependencies.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use std::time::Duration;
-
-use imbl_value::json;
-use models::{PackageId, ProcedureName};
-
-use crate::prelude::*;
-use crate::rpc_continuations::Guid;
-use crate::service::{Service, ServiceActor, ServiceActorSeed};
-use crate::util::actor::background::BackgroundJobQueue;
-use crate::util::actor::{ConflictBuilder, Handler};
-use crate::Config;
-
-impl ServiceActorSeed {
-    async fn dependency_config(
-        &self,
-        id: Guid,
-        dependency_id: PackageId,
-        remote_config: Option<Config>,
-    ) -> Result<Option<Config>, Error> {
-        let container = &self.persistent_container;
-        container
-            .sanboxed::<Option<Config>>(
-                id.clone(),
-                ProcedureName::UpdateDependency(dependency_id.clone()),
-                json!({
-                    "queryResults": container
-                        .execute::<Value>(
-                            id,
-                            ProcedureName::QueryDependency(dependency_id),
-                            Value::Null,
-                            Some(Duration::from_secs(30)),
-                        )
-                        .await
-                        .with_kind(ErrorKind::Dependency)?,
-                    "remoteConfig": remote_config,
-                }),
-                Some(Duration::from_secs(30)),
-            )
-            .await
-            .with_kind(ErrorKind::Dependency)
-            .map(|res| res.filter(|c| !c.is_empty() && Some(c) != remote_config.as_ref()))
-    }
-}
-
-pub(super) struct DependencyConfig {
-    dependency_id: PackageId,
-    remote_config: Option<Config>,
-}
-impl Handler<DependencyConfig> for ServiceActor {
-    type Response = Result<Option<Config>, Error>;
-    fn conflicts_with(_: &DependencyConfig) -> ConflictBuilder<Self> {
-        ConflictBuilder::nothing()
-    }
-    async fn handle(
-        &mut self,
-        id: Guid,
-        DependencyConfig {
-            dependency_id,
-            remote_config,
-        }: DependencyConfig,
-        _: &BackgroundJobQueue,
-    ) -> Self::Response {
-        self.0
-            .dependency_config(id, dependency_id, remote_config)
-            .await
-    }
-}
-
-impl Service {
-    pub async fn dependency_config(
-        &self,
-        id: Guid,
-        dependency_id: PackageId,
-        remote_config: Option<Config>,
-    ) -> Result<Option<Config>, Error> {
-        self.actor
-            .send(
-                id,
-                DependencyConfig {
-                    dependency_id,
-                    remote_config,
-                },
-            )
-            .await?
-    }
-}
diff --git a/core/startos/src/service/effects/action.rs b/core/startos/src/service/effects/action.rs
index 4719c6d3d..5e3605679 100644
--- a/core/startos/src/service/effects/action.rs
+++ b/core/startos/src/service/effects/action.rs
@@ -1,22 +1,59 @@
-use std::collections::BTreeMap;
+use std::collections::BTreeSet;
 
-use models::{ActionId, PackageId};
+use models::{ActionId, PackageId, ReplayId};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 
-use crate::action::ActionResult;
-use crate::db::model::package::ActionMetadata;
+use crate::action::{display_action_result, ActionInput, ActionResult};
+use crate::db::model::package::{
+    ActionMetadata, ActionRequest, ActionRequestCondition, ActionRequestEntry, ActionRequestTrigger,
+};
 use crate::rpc_continuations::Guid;
+use crate::service::cli::ContainerCliContext;
 use crate::service::effects::prelude::*;
+use crate::util::serde::HandlerExtSerde;
+
+pub fn action_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand("export", from_fn_async(export_action).no_cli())
+        .subcommand(
+            "clear",
+            from_fn_async(clear_actions)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "get-input",
+            from_fn_async(get_action_input)
+                .with_display_serializable()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand(
+            "run",
+            from_fn_async(run_action)
+                .with_display_serializable()
+                .with_custom_display_fn(|args, res| Ok(display_action_result(args.params, res)))
+                .with_call_remote::<ContainerCliContext>(),
+        )
+        .subcommand("request", from_fn_async(request_action).no_cli())
+        .subcommand(
+            "clear-requests",
+            from_fn_async(clear_action_requests)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct ExportActionParams {
-    #[ts(optional)]
-    package_id: Option<PackageId>,
     id: ActionId,
     metadata: ActionMetadata,
 }
-pub async fn export_action(context: EffectContext, data: ExportActionParams) -> Result<(), Error> {
+pub async fn export_action(
+    context: EffectContext,
+    ExportActionParams { id, metadata }: ExportActionParams,
+) -> Result<(), Error> {
     let context = context.deref()?;
     let package_id = context.seed.id.clone();
     context
@@ -31,17 +68,26 @@ pub async fn export_action(context: EffectContext, data: ExportActionParams) ->
                 .or_not_found(&package_id)?
                 .as_actions_mut();
             let mut value = model.de()?;
-            value
-                .insert(data.id, data.metadata)
-                .map(|_| ())
-                .unwrap_or_default();
+            value.insert(id, metadata);
             model.ser(&value)
         })
         .await?;
     Ok(())
 }
 
-pub async fn clear_actions(context: EffectContext) -> Result<(), Error> {
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ClearActionsParams {
+    #[arg(long)]
+    pub except: Vec<ActionId>,
+}
+
+async fn clear_actions(
+    context: EffectContext,
+    ClearActionsParams { except }: ClearActionsParams,
+) -> Result<(), Error> {
+    let except: BTreeSet<_> = except.into_iter().collect();
     let context = context.deref()?;
     let package_id = context.seed.id.clone();
     context
@@ -54,18 +100,57 @@ pub async fn clear_actions(context: EffectContext) -> Result<(), Error> {
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
                 .as_actions_mut()
-                .ser(&BTreeMap::new())
+                .mutate(|a| Ok(a.retain(|e, _| except.contains(e))))
         })
         .await?;
     Ok(())
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetActionInputParams {
+    #[serde(default)]
+    #[ts(skip)]
+    #[arg(skip)]
+    procedure_id: Guid,
+    #[ts(optional)]
+    package_id: Option<PackageId>,
+    action_id: ActionId,
+}
+async fn get_action_input(
+    context: EffectContext,
+    GetActionInputParams {
+        procedure_id,
+        package_id,
+        action_id,
+    }: GetActionInputParams,
+) -> Result<Option<ActionInput>, Error> {
+    let context = context.deref()?;
+
+    if let Some(package_id) = package_id {
+        context
+            .seed
+            .ctx
+            .services
+            .get(&package_id)
+            .await
+            .as_ref()
+            .or_not_found(&package_id)?
+            .get_action_input(procedure_id, action_id)
+            .await
+    } else {
+        context.get_action_input(procedure_id, action_id).await
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
-pub struct ExecuteAction {
+pub struct RunActionParams {
     #[serde(default)]
     #[ts(skip)]
+    #[arg(skip)]
     procedure_id: Guid,
     #[ts(optional)]
     package_id: Option<PackageId>,
@@ -73,18 +158,24 @@ pub struct ExecuteAction {
     #[ts(type = "any")]
     input: Value,
 }
-pub async fn execute_action(
+async fn run_action(
     context: EffectContext,
-    ExecuteAction {
+    RunActionParams {
         procedure_id,
         package_id,
         action_id,
         input,
-    }: ExecuteAction,
-) -> Result<ActionResult, Error> {
+    }: RunActionParams,
+) -> Result<Option<ActionResult>, Error> {
     let context = context.deref()?;
 
-    if let Some(package_id) = package_id {
+    let package_id = package_id.as_ref().unwrap_or(&context.seed.id);
+
+    if package_id != &context.seed.id {
+        return Err(Error::new(
+            eyre!("calling actions on other packages is unsupported at this time"),
+            ErrorKind::InvalidRequest,
+        ));
         context
             .seed
             .ctx
@@ -93,9 +184,132 @@ pub async fn execute_action(
             .await
             .as_ref()
             .or_not_found(&package_id)?
-            .action(procedure_id, action_id, input)
+            .run_action(procedure_id, action_id, input)
             .await
     } else {
-        context.action(procedure_id, action_id, input).await
+        context.run_action(procedure_id, action_id, input).await
     }
 }
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct RequestActionParams {
+    #[serde(default)]
+    #[ts(skip)]
+    procedure_id: Guid,
+    replay_id: ReplayId,
+    #[serde(flatten)]
+    request: ActionRequest,
+}
+async fn request_action(
+    context: EffectContext,
+    RequestActionParams {
+        procedure_id,
+        replay_id,
+        request,
+    }: RequestActionParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+
+    let src_id = &context.seed.id;
+    let active = match &request.when {
+        Some(ActionRequestTrigger { once, condition }) => match condition {
+            ActionRequestCondition::InputNotMatches => {
+                let Some(input) = request.input.as_ref() else {
+                    return Err(Error::new(
+                        eyre!("input-not-matches trigger requires input to be specified"),
+                        ErrorKind::InvalidRequest,
+                    ));
+                };
+                if let Some(service) = context
+                    .seed
+                    .ctx
+                    .services
+                    .get(&request.package_id)
+                    .await
+                    .as_ref()
+                {
+                    let Some(prev) = service
+                        .get_action_input(procedure_id, request.action_id.clone())
+                        .await?
+                    else {
+                        return Err(Error::new(
+                            eyre!(
+                                "action {} of {} has no input",
+                                request.action_id,
+                                request.package_id
+                            ),
+                            ErrorKind::InvalidRequest,
+                        ));
+                    };
+                    if input.matches(prev.value.as_ref()) {
+                        if *once {
+                            return Ok(());
+                        } else {
+                            false
+                        }
+                    } else {
+                        true
+                    }
+                } else {
+                    true // update when service is installed
+                }
+            }
+        },
+        None => true,
+    };
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(src_id)
+                .or_not_found(src_id)?
+                .as_requested_actions_mut()
+                .insert(&replay_id, &ActionRequestEntry { active, request })
+        })
+        .await?;
+    Ok(())
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[ts(type = "{ only: string[] } | { except: string[] }")]
+#[ts(export)]
+pub struct ClearActionRequestsParams {
+    #[arg(long, conflicts_with = "except")]
+    pub only: Option<Vec<ReplayId>>,
+    #[arg(long, conflicts_with = "only")]
+    pub except: Option<Vec<ReplayId>>,
+}
+
+async fn clear_action_requests(
+    context: EffectContext,
+    ClearActionRequestsParams { only, except }: ClearActionRequestsParams,
+) -> Result<(), Error> {
+    let context = context.deref()?;
+    let package_id = context.seed.id.clone();
+    let only = only.map(|only| only.into_iter().collect::<BTreeSet<_>>());
+    let except = except.map(|except| except.into_iter().collect::<BTreeSet<_>>());
+    context
+        .seed
+        .ctx
+        .db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package_id)
+                .or_not_found(&package_id)?
+                .as_requested_actions_mut()
+                .mutate(|a| {
+                    Ok(a.retain(|e, _| {
+                        only.as_ref().map_or(true, |only| !only.contains(e))
+                            && except.as_ref().map_or(true, |except| except.contains(e))
+                    }))
+                })
+        })
+        .await?;
+    Ok(())
+}
diff --git a/core/startos/src/service/effects/callbacks.rs b/core/startos/src/service/effects/callbacks.rs
index 1a9250aa8..05f36cb4b 100644
--- a/core/startos/src/service/effects/callbacks.rs
+++ b/core/startos/src/service/effects/callbacks.rs
@@ -3,19 +3,22 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::sync::{Arc, Mutex, Weak};
 use std::time::{Duration, SystemTime};
 
+use clap::Parser;
 use futures::future::join_all;
 use helpers::NonDetachingJoinHandle;
 use imbl::{vector, Vector};
 use imbl_value::InternedString;
 use models::{HostId, PackageId, ServiceInterfaceId};
 use patch_db::json_ptr::JsonPointer;
+use serde::{Deserialize, Serialize};
 use tracing::warn;
+use ts_rs::TS;
 
 use crate::net::ssl::FullchainCertData;
 use crate::prelude::*;
 use crate::service::effects::context::EffectContext;
 use crate::service::effects::net::ssl::Algorithm;
-use crate::service::rpc::CallbackHandle;
+use crate::service::rpc::{CallbackHandle, CallbackId};
 use crate::service::{Service, ServiceActorSeed};
 use crate::util::collections::EqMap;
 
@@ -272,6 +275,7 @@ impl CallbackHandler {
         }
     }
     pub async fn call(mut self, args: Vector<Value>) -> Result<(), Error> {
+        dbg!(eyre!("callback fired: {}", self.handle.is_active()));
         if let Some(seed) = self.seed.upgrade() {
             seed.persistent_container
                 .callback(self.handle.take(), args)
@@ -299,13 +303,29 @@ impl CallbackHandlers {
     }
 }
 
-pub(super) fn clear_callbacks(context: EffectContext) -> Result<(), Error> {
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[ts(type = "{ only: number[] } | { except: number[] }")]
+#[ts(export)]
+pub struct ClearCallbacksParams {
+    #[arg(long, conflicts_with = "except")]
+    pub only: Option<Vec<CallbackId>>,
+    #[arg(long, conflicts_with = "only")]
+    pub except: Option<Vec<CallbackId>>,
+}
+
+pub(super) fn clear_callbacks(
+    context: EffectContext,
+    ClearCallbacksParams { only, except }: ClearCallbacksParams,
+) -> Result<(), Error> {
     let context = context.deref()?;
-    context
-        .seed
-        .persistent_container
-        .state
-        .send_if_modified(|s| !std::mem::take(&mut s.callbacks).is_empty());
+    let only = only.map(|only| only.into_iter().collect::<BTreeSet<_>>());
+    let except = except.map(|except| except.into_iter().collect::<BTreeSet<_>>());
+    context.seed.persistent_container.state.send_modify(|s| {
+        s.callbacks.retain(|cb| {
+            only.as_ref().map_or(true, |only| !only.contains(cb))
+                && except.as_ref().map_or(true, |except| except.contains(cb))
+        })
+    });
     context.seed.ctx.callbacks.gc();
     Ok(())
 }
diff --git a/core/startos/src/service/effects/config.rs b/core/startos/src/service/effects/config.rs
deleted file mode 100644
index 647d3e272..000000000
--- a/core/startos/src/service/effects/config.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use models::PackageId;
-
-use crate::service::effects::prelude::*;
-
-#[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-pub struct GetConfiguredParams {
-    #[ts(optional)]
-    package_id: Option<PackageId>,
-}
-pub async fn get_configured(context: EffectContext) -> Result<bool, Error> {
-    let context = context.deref()?;
-    let peeked = context.seed.ctx.db.peek().await;
-    let package_id = &context.seed.id;
-    peeked
-        .as_public()
-        .as_package_data()
-        .as_idx(package_id)
-        .or_not_found(package_id)?
-        .as_status()
-        .as_configured()
-        .de()
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-pub struct SetConfigured {
-    configured: bool,
-}
-pub async fn set_configured(
-    context: EffectContext,
-    SetConfigured { configured }: SetConfigured,
-) -> Result<(), Error> {
-    let context = context.deref()?;
-    let package_id = &context.seed.id;
-    context
-        .seed
-        .ctx
-        .db
-        .mutate(|db| {
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(package_id)
-                .or_not_found(package_id)?
-                .as_status_mut()
-                .as_configured_mut()
-                .ser(&configured)
-        })
-        .await?;
-    Ok(())
-}
diff --git a/core/startos/src/service/effects/control.rs b/core/startos/src/service/effects/control.rs
index 6b3c6f8a0..4eb897c37 100644
--- a/core/startos/src/service/effects/control.rs
+++ b/core/startos/src/service/effects/control.rs
@@ -1,9 +1,9 @@
 use std::str::FromStr;
 
 use clap::builder::ValueParserFactory;
+use models::FromStrParser;
 
 use crate::service::effects::prelude::*;
-use crate::util::clap::FromStrParser;
 
 pub async fn restart(
     context: EffectContext,
diff --git a/core/startos/src/service/effects/dependency.rs b/core/startos/src/service/effects/dependency.rs
index 26582d061..ed43b7a9c 100644
--- a/core/startos/src/service/effects/dependency.rs
+++ b/core/startos/src/service/effects/dependency.rs
@@ -6,13 +6,13 @@ use clap::builder::ValueParserFactory;
 use exver::VersionRange;
 use imbl::OrdMap;
 use imbl_value::InternedString;
-use itertools::Itertools;
-use models::{HealthCheckId, PackageId, VersionString, VolumeId};
+use models::{FromStrParser, HealthCheckId, PackageId, ReplayId, VersionString, VolumeId};
 use patch_db::json_ptr::JsonPointer;
 use tokio::process::Command;
 
 use crate::db::model::package::{
-    CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind, ManifestPreference,
+    ActionRequestEntry, CurrentDependencies, CurrentDependencyInfo, CurrentDependencyKind,
+    ManifestPreference,
 };
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
@@ -20,7 +20,6 @@ use crate::disk::mount::filesystem::{FileSystem, MountType};
 use crate::rpc_continuations::Guid;
 use crate::service::effects::prelude::*;
 use crate::status::health_check::NamedHealthCheckResult;
-use crate::util::clap::FromStrParser;
 use crate::util::Invoke;
 use crate::volume::data_dir;
 
@@ -113,6 +112,7 @@ pub async fn expose_for_dependents(
     context: EffectContext,
     ExposeForDependentsParams { paths }: ExposeForDependentsParams,
 ) -> Result<(), Error> {
+    // TODO
     Ok(())
 }
 
@@ -192,16 +192,11 @@ impl ValueParserFactory for DependencyRequirement {
 #[command(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SetDependenciesParams {
-    #[serde(default)]
-    procedure_id: Guid,
     dependencies: Vec<DependencyRequirement>,
 }
 pub async fn set_dependencies(
     context: EffectContext,
-    SetDependenciesParams {
-        procedure_id,
-        dependencies,
-    }: SetDependenciesParams,
+    SetDependenciesParams { dependencies }: SetDependenciesParams,
 ) -> Result<(), Error> {
     let context = context.deref()?;
     let id = &context.seed.id;
@@ -222,19 +217,6 @@ pub async fn set_dependencies(
                 version_range,
             ),
         };
-        let config_satisfied =
-            if let Some(dep_service) = &*context.seed.ctx.services.get(&dep_id).await {
-                context
-                    .dependency_config(
-                        procedure_id.clone(),
-                        dep_id.clone(),
-                        dep_service.get_config(procedure_id.clone()).await?.config,
-                    )
-                    .await?
-                    .is_none()
-            } else {
-                true
-            };
         let info = CurrentDependencyInfo {
             title: context
                 .seed
@@ -251,7 +233,6 @@ pub async fn set_dependencies(
                 .await?,
             kind,
             version_range,
-            config_satisfied,
         };
         deps.insert(dep_id, info);
     }
@@ -282,7 +263,8 @@ pub async fn get_dependencies(context: EffectContext) -> Result<Vec<DependencyRe
         .as_current_dependencies()
         .de()?;
 
-    data.0
+    Ok(data
+        .0
         .into_iter()
         .map(|(id, current_dependency_info)| {
             let CurrentDependencyInfo {
@@ -290,7 +272,7 @@ pub async fn get_dependencies(context: EffectContext) -> Result<Vec<DependencyRe
                 kind,
                 ..
             } = current_dependency_info;
-            Ok::<_, Error>(match kind {
+            match kind {
                 CurrentDependencyKind::Exists => {
                     DependencyRequirement::Exists { id, version_range }
                 }
@@ -301,9 +283,9 @@ pub async fn get_dependencies(context: EffectContext) -> Result<Vec<DependencyRe
                         version_range,
                     }
                 }
-            })
+            }
         })
-        .try_collect()
+        .collect())
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
@@ -320,12 +302,10 @@ pub struct CheckDependenciesResult {
     package_id: PackageId,
     #[ts(type = "string | null")]
     title: Option<InternedString>,
-    #[ts(type = "string | null")]
-    installed_version: Option<exver::ExtendedVersion>,
-    #[ts(type = "string[]")]
+    installed_version: Option<VersionString>,
     satisfies: BTreeSet<VersionString>,
     is_running: bool,
-    config_satisfied: bool,
+    requested_actions: BTreeMap<ReplayId, ActionRequestEntry>,
     #[ts(as = "BTreeMap::<HealthCheckId, NamedHealthCheckResult>")]
     health_checks: OrdMap<HealthCheckId, NamedHealthCheckResult>,
 }
@@ -335,14 +315,14 @@ pub async fn check_dependencies(
 ) -> Result<Vec<CheckDependenciesResult>, Error> {
     let context = context.deref()?;
     let db = context.seed.ctx.db.peek().await;
-    let current_dependencies = db
+    let pde = db
         .as_public()
         .as_package_data()
         .as_idx(&context.seed.id)
-        .or_not_found(&context.seed.id)?
-        .as_current_dependencies()
-        .de()?;
-    let package_ids: Vec<_> = package_ids
+        .or_not_found(&context.seed.id)?;
+    let current_dependencies = pde.as_current_dependencies().de()?;
+    let requested_actions = pde.as_requested_actions().de()?;
+    let package_dependency_info: Vec<_> = package_ids
         .unwrap_or_else(|| current_dependencies.0.keys().cloned().collect())
         .into_iter()
         .filter_map(|x| {
@@ -350,18 +330,23 @@ pub async fn check_dependencies(
             Some((x, info))
         })
         .collect();
-    let mut results = Vec::with_capacity(package_ids.len());
+    let mut results = Vec::with_capacity(package_dependency_info.len());
 
-    for (package_id, dependency_info) in package_ids {
+    for (package_id, dependency_info) in package_dependency_info {
         let title = dependency_info.title.clone();
         let Some(package) = db.as_public().as_package_data().as_idx(&package_id) else {
+            let requested_actions = requested_actions
+                .iter()
+                .filter(|(_, v)| v.request.package_id == package_id)
+                .map(|(k, v)| (k.clone(), v.clone()))
+                .collect();
             results.push(CheckDependenciesResult {
                 package_id,
                 title,
                 installed_version: None,
                 satisfies: BTreeSet::new(),
                 is_running: false,
-                config_satisfied: false,
+                requested_actions,
                 health_checks: Default::default(),
             });
             continue;
@@ -369,22 +354,27 @@ pub async fn check_dependencies(
         let manifest = package.as_state_info().as_manifest(ManifestPreference::New);
         let installed_version = manifest.as_version().de()?.into_version();
         let satisfies = manifest.as_satisfies().de()?;
-        let installed_version = Some(installed_version.clone());
+        let installed_version = Some(installed_version.clone().into());
         let is_installed = true;
-        let status = package.as_status().as_main().de()?;
+        let status = package.as_status().de()?;
         let is_running = if is_installed {
             status.running()
         } else {
             false
         };
         let health_checks = status.health().cloned().unwrap_or_default();
+        let requested_actions = requested_actions
+            .iter()
+            .filter(|(_, v)| v.request.package_id == package_id)
+            .map(|(k, v)| (k.clone(), v.clone()))
+            .collect();
         results.push(CheckDependenciesResult {
             package_id,
             title,
             installed_version,
             satisfies,
             is_running,
-            config_satisfied: dependency_info.config_satisfied,
+            requested_actions,
             health_checks,
         });
     }
diff --git a/core/startos/src/service/effects/health.rs b/core/startos/src/service/effects/health.rs
index 9bf756d60..c95dea946 100644
--- a/core/startos/src/service/effects/health.rs
+++ b/core/startos/src/service/effects/health.rs
@@ -29,7 +29,6 @@ pub async fn set_health(
                 .as_idx_mut(package_id)
                 .or_not_found(package_id)?
                 .as_status_mut()
-                .as_main_mut()
                 .mutate(|main| {
                     match main {
                         MainStatus::Running { ref mut health, .. }
diff --git a/core/startos/src/service/effects/mod.rs b/core/startos/src/service/effects/mod.rs
index e85481e96..844f5646b 100644
--- a/core/startos/src/service/effects/mod.rs
+++ b/core/startos/src/service/effects/mod.rs
@@ -7,7 +7,6 @@ use crate::service::effects::context::EffectContext;
 
 mod action;
 pub mod callbacks;
-mod config;
 pub mod context;
 mod control;
 mod dependency;
@@ -26,34 +25,12 @@ pub fn handler<C: Context>() -> ParentHandler<C> {
             from_fn(echo::<EffectContext>).with_call_remote::<ContainerCliContext>(),
         )
         // action
-        .subcommand(
-            "execute-action",
-            from_fn_async(action::execute_action).no_cli(),
-        )
-        .subcommand(
-            "export-action",
-            from_fn_async(action::export_action).no_cli(),
-        )
-        .subcommand(
-            "clear-actions",
-            from_fn_async(action::clear_actions).no_cli(),
-        )
+        .subcommand("action", action::action_api::<C>())
         // callbacks
         .subcommand(
             "clear-callbacks",
             from_fn(callbacks::clear_callbacks).no_cli(),
         )
-        // config
-        .subcommand(
-            "get-configured",
-            from_fn_async(config::get_configured).no_cli(),
-        )
-        .subcommand(
-            "set-configured",
-            from_fn_async(config::set_configured)
-                .no_display()
-                .with_call_remote::<ContainerCliContext>(),
-        )
         // control
         .subcommand(
             "restart",
diff --git a/core/startos/src/service/effects/net/bind.rs b/core/startos/src/service/effects/net/bind.rs
index ba273323a..40bc550cb 100644
--- a/core/startos/src/service/effects/net/bind.rs
+++ b/core/startos/src/service/effects/net/bind.rs
@@ -1,6 +1,6 @@
 use models::{HostId, PackageId};
 
-use crate::net::host::binding::{BindOptions, LanInfo};
+use crate::net::host::binding::{BindId, BindOptions, LanInfo};
 use crate::net::host::HostKind;
 use crate::service::effects::prelude::*;
 
@@ -28,10 +28,20 @@ pub async fn bind(
     svc.bind(kind, id, internal_port, options).await
 }
 
-pub async fn clear_bindings(context: EffectContext) -> Result<(), Error> {
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ClearBindingsParams {
+    pub except: Vec<BindId>,
+}
+
+pub async fn clear_bindings(
+    context: EffectContext,
+    ClearBindingsParams { except }: ClearBindingsParams,
+) -> Result<(), Error> {
     let context = context.deref()?;
     let mut svc = context.seed.persistent_container.net_service.lock().await;
-    svc.clear_bindings().await?;
+    svc.clear_bindings(except.into_iter().collect()).await?;
     Ok(())
 }
 
diff --git a/core/startos/src/service/effects/net/interface.rs b/core/startos/src/service/effects/net/interface.rs
index 6cd4cd4c9..44258c36a 100644
--- a/core/startos/src/service/effects/net/interface.rs
+++ b/core/startos/src/service/effects/net/interface.rs
@@ -165,7 +165,17 @@ pub async fn list_service_interfaces(
     Ok(res)
 }
 
-pub async fn clear_service_interfaces(context: EffectContext) -> Result<(), Error> {
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ClearServiceInterfacesParams {
+    pub except: Vec<ServiceInterfaceId>,
+}
+
+pub async fn clear_service_interfaces(
+    context: EffectContext,
+    ClearServiceInterfacesParams { except }: ClearServiceInterfacesParams,
+) -> Result<(), Error> {
     let context = context.deref()?;
     let package_id = context.seed.id.clone();
 
@@ -179,7 +189,7 @@ pub async fn clear_service_interfaces(context: EffectContext) -> Result<(), Erro
                 .as_idx_mut(&package_id)
                 .or_not_found(&package_id)?
                 .as_service_interfaces_mut()
-                .ser(&Default::default())
+                .mutate(|s| Ok(s.retain(|id, _| except.contains(id))))
         })
         .await
 }
diff --git a/core/startos/src/service/effects/store.rs b/core/startos/src/service/effects/store.rs
index 6c12b425e..1d4a07086 100644
--- a/core/startos/src/service/effects/store.rs
+++ b/core/startos/src/service/effects/store.rs
@@ -26,6 +26,7 @@ pub async fn get_store(
         callback,
     }: GetStoreParams,
 ) -> Result<Value, Error> {
+    dbg!(&callback);
     let context = context.deref()?;
     let peeked = context.seed.ctx.db.peek().await;
     let package_id = package_id.unwrap_or(context.seed.id.clone());
@@ -33,8 +34,9 @@ pub async fn get_store(
         .as_private()
         .as_package_stores()
         .as_idx(&package_id)
-        .or_not_found(&package_id)?
-        .de()?;
+        .map(|s| s.de())
+        .transpose()?
+        .unwrap_or_default();
 
     if let Some(callback) = callback {
         let callback = callback.register(&context.seed.persistent_container);
@@ -45,10 +47,7 @@ pub async fn get_store(
         );
     }
 
-    Ok(path
-        .get(&value)
-        .ok_or_else(|| Error::new(eyre!("Did not find value at path"), ErrorKind::NotFound))?
-        .clone())
+    Ok(path.get(&value).cloned().unwrap_or_default())
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 55f76fd14..1e61b1191 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -1,11 +1,12 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::ffi::OsString;
 use std::io::IsTerminal;
 use std::ops::Deref;
 use std::os::unix::process::ExitStatusExt;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::process::Stdio;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
-use std::{ffi::OsString, path::PathBuf};
 
 use axum::extract::ws::WebSocket;
 use chrono::{DateTime, Utc};
@@ -15,7 +16,7 @@ use futures::stream::FusedStream;
 use futures::{SinkExt, StreamExt, TryStreamExt};
 use imbl_value::{json, InternedString};
 use itertools::Itertools;
-use models::{ImageId, PackageId, ProcedureName};
+use models::{ActionId, ImageId, PackageId, ProcedureName};
 use nix::sys::signal::Signal;
 use persistent_container::{PersistentContainer, Subcontainer};
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
@@ -39,6 +40,7 @@ use crate::prelude::*;
 use crate::progress::{NamedProgress, Progress};
 use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::s9pk::S9pk;
+use crate::service::action::update_requested_actions;
 use crate::service::service_map::InstallProgressHandles;
 use crate::util::actor::concurrent::ConcurrentActor;
 use crate::util::io::{create_file, AsyncReadStream};
@@ -48,11 +50,9 @@ use crate::util::Never;
 use crate::volume::data_dir;
 use crate::CAP_1_KiB;
 
-mod action;
+pub mod action;
 pub mod cli;
-mod config;
 mod control;
-mod dependencies;
 pub mod effects;
 pub mod persistent_container;
 mod properties;
@@ -97,7 +97,7 @@ impl ServiceRef {
             .persistent_container
             .execute::<NoOutput>(
                 Guid::new(),
-                ProcedureName::Uninit,
+                ProcedureName::PackageUninit,
                 to_value(&target_version)?,
                 None,
             ) // TODO timeout
@@ -257,7 +257,7 @@ impl Service {
                         tokio::fs::create_dir_all(&path).await?;
                     }
                 }
-                let start_stop = if i.as_status().as_main().de()?.running() {
+                let start_stop = if i.as_status().de()?.running() {
                     StartStop::Start
                 } else {
                     StartStop::Stop
@@ -429,12 +429,13 @@ impl Service {
                     .clone(),
             );
         }
+        let procedure_id = Guid::new();
         service
             .seed
             .persistent_container
             .execute::<NoOutput>(
-                Guid::new(),
-                ProcedureName::Init,
+                procedure_id.clone(),
+                ProcedureName::PackageInit,
                 to_value(&src_version)?,
                 None,
             ) // TODO timeout
@@ -445,16 +446,60 @@ impl Service {
             progress.progress.complete();
             tokio::task::yield_now().await;
         }
+
+        let peek = ctx.db.peek().await;
+        let mut action_input: BTreeMap<ActionId, Value> = BTreeMap::new();
+        let requested_actions: BTreeSet<_> = peek
+            .as_public()
+            .as_package_data()
+            .as_entries()?
+            .into_iter()
+            .map(|(_, pde)| {
+                Ok(pde
+                    .as_requested_actions()
+                    .as_entries()?
+                    .into_iter()
+                    .map(|(_, r)| {
+                        Ok::<_, Error>(if r.as_request().as_package_id().de()? == manifest.id {
+                            Some(r.as_request().as_action_id().de()?)
+                        } else {
+                            None
+                        })
+                    })
+                    .filter_map_ok(|a| a))
+            })
+            .flatten_ok()
+            .map(|a| a.and_then(|a| a))
+            .try_collect()?;
+        for action_id in requested_actions {
+            if let Some(input) = service
+                .get_action_input(procedure_id.clone(), action_id.clone())
+                .await?
+                .and_then(|i| i.value)
+            {
+                action_input.insert(action_id, input);
+            }
+        }
         ctx.db
-            .mutate(|d| {
-                let entry = d
+            .mutate(|db| {
+                for (action_id, input) in &action_input {
+                    for (_, pde) in db.as_public_mut().as_package_data_mut().as_entries_mut()? {
+                        pde.as_requested_actions_mut().mutate(|requested_actions| {
+                            Ok(update_requested_actions(
+                                requested_actions,
+                                &manifest.id,
+                                action_id,
+                                input,
+                                false,
+                            ))
+                        })?;
+                    }
+                }
+                let entry = db
                     .as_public_mut()
                     .as_package_data_mut()
                     .as_idx_mut(&manifest.id)
                     .or_not_found(&manifest.id)?;
-                if !manifest.has_config {
-                    entry.as_status_mut().as_configured_mut().ser(&true)?;
-                }
                 entry
                     .as_state_info_mut()
                     .ser(&PackageState::Installed(InstalledState { manifest }))?;
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index ff9d74009..3f85a95d5 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -379,7 +379,11 @@ impl PersistentContainer {
             ));
         }
 
-        self.rpc_client.request(rpc::Init, Empty {}).await?;
+        self.rpc_client
+            .request(rpc::Init, Empty {})
+            .await
+            .map_err(Error::from)
+            .log_err();
 
         self.state.send_modify(|s| s.rt_initialized = true);
 
@@ -548,7 +552,7 @@ impl PersistentContainer {
 impl Drop for PersistentContainer {
     fn drop(&mut self) {
         if let Some(destroy) = self.destroy() {
-            tokio::spawn(async move { destroy.await.unwrap() });
+            tokio::spawn(async move { destroy.await.log_err() });
         }
     }
 }
diff --git a/core/startos/src/service/rpc.rs b/core/startos/src/service/rpc.rs
index 25d8fb067..f008de5c7 100644
--- a/core/startos/src/service/rpc.rs
+++ b/core/startos/src/service/rpc.rs
@@ -1,10 +1,12 @@
 use std::collections::BTreeSet;
+use std::str::FromStr;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
+use clap::builder::ValueParserFactory;
 use imbl::Vector;
 use imbl_value::Value;
-use models::ProcedureName;
+use models::{FromStrParser, ProcedureName};
 use rpc_toolkit::yajrc::RpcMethod;
 use rpc_toolkit::Empty;
 use ts_rs::TS;
@@ -153,6 +155,11 @@ impl serde::Serialize for Sandbox {
 pub struct CallbackId(u64);
 impl CallbackId {
     pub fn register(self, container: &PersistentContainer) -> CallbackHandle {
+        dbg!(eyre!(
+            "callback {} registered for {}",
+            self.0,
+            container.s9pk.as_manifest().id
+        ));
         let this = Arc::new(self);
         let res = Arc::downgrade(&this);
         container
@@ -161,6 +168,18 @@ impl CallbackId {
         CallbackHandle(res)
     }
 }
+impl FromStr for CallbackId {
+    type Err = Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        u64::from_str(s).map_err(Error::from).map(Self)
+    }
+}
+impl ValueParserFactory for CallbackId {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        FromStrParser::new()
+    }
+}
 
 pub struct CallbackHandle(Weak<CallbackId>);
 impl CallbackHandle {
diff --git a/core/startos/src/service/service_actor.rs b/core/startos/src/service/service_actor.rs
index 0839afc0b..b343e513e 100644
--- a/core/startos/src/service/service_actor.rs
+++ b/core/startos/src/service/service_actor.rs
@@ -49,7 +49,7 @@ async fn service_actor_loop(
             .db
             .mutate(|d| {
                 if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id) {
-                    let previous = i.as_status().as_main().de()?;
+                    let previous = i.as_status().de()?;
                     let main_status = match &kinds {
                         ServiceStateKinds {
                             transition_state: Some(TransitionKind::Restarting),
@@ -89,7 +89,7 @@ async fn service_actor_loop(
                             ..
                         } => MainStatus::Stopped,
                     };
-                    i.as_status_mut().as_main_mut().ser(&main_status)?;
+                    i.as_status_mut().ser(&main_status)?;
                 }
                 Ok(())
             })
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 0e6a959ae..ebe45fcc5 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -23,7 +23,7 @@ use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
 use crate::service::{LoadDisposition, Service, ServiceRef};
-use crate::status::{MainStatus, Status};
+use crate::status::MainStatus;
 use crate::util::serde::Pem;
 
 pub type DownloadInstallFuture = BoxFuture<'static, Result<InstallFuture, Error>>;
@@ -174,16 +174,14 @@ impl ServiceMap {
                                     PackageState::Installing(installing)
                                 },
                                 data_version: None,
-                                status: Status {
-                                    configured: false,
-                                    main: MainStatus::Stopped,
-                                },
+                                status: MainStatus::Stopped,
                                 registry: None,
                                 developer_key: Pem::new(developer_key),
                                 icon,
                                 last_backup: None,
                                 current_dependencies: Default::default(),
                                 actions: Default::default(),
+                                requested_actions: Default::default(),
                                 service_interfaces: Default::default(),
                                 hosts: Default::default(),
                                 store_exposed_dependents: Default::default(),
diff --git a/core/startos/src/service/transition/backup.rs b/core/startos/src/service/transition/backup.rs
index d8606f534..0d4116078 100644
--- a/core/startos/src/service/transition/backup.rs
+++ b/core/startos/src/service/transition/backup.rs
@@ -9,8 +9,7 @@ use super::TempDesiredRestore;
 use crate::disk::mount::filesystem::ReadWrite;
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
-use crate::service::config::GetConfig;
-use crate::service::dependencies::DependencyConfig;
+use crate::service::action::GetActionInput;
 use crate::service::transition::{TransitionKind, TransitionState};
 use crate::service::ServiceActor;
 use crate::util::actor::background::BackgroundJobQueue;
@@ -23,9 +22,7 @@ pub(in crate::service) struct Backup {
 impl Handler<Backup> for ServiceActor {
     type Response = Result<BoxFuture<'static, Result<(), Error>>, Error>;
     fn conflicts_with(_: &Backup) -> ConflictBuilder<Self> {
-        ConflictBuilder::everything()
-            .except::<GetConfig>()
-            .except::<DependencyConfig>()
+        ConflictBuilder::everything().except::<GetActionInput>()
     }
     async fn handle(
         &mut self,
diff --git a/core/startos/src/service/transition/restart.rs b/core/startos/src/service/transition/restart.rs
index 108e232ad..27bef0b91 100644
--- a/core/startos/src/service/transition/restart.rs
+++ b/core/startos/src/service/transition/restart.rs
@@ -3,8 +3,7 @@ use futures::FutureExt;
 use super::TempDesiredRestore;
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
-use crate::service::config::GetConfig;
-use crate::service::dependencies::DependencyConfig;
+use crate::service::action::GetActionInput;
 use crate::service::transition::{TransitionKind, TransitionState};
 use crate::service::{Service, ServiceActor};
 use crate::util::actor::background::BackgroundJobQueue;
@@ -15,9 +14,7 @@ pub(super) struct Restart;
 impl Handler<Restart> for ServiceActor {
     type Response = ();
     fn conflicts_with(_: &Restart) -> ConflictBuilder<Self> {
-        ConflictBuilder::everything()
-            .except::<GetConfig>()
-            .except::<DependencyConfig>()
+        ConflictBuilder::everything().except::<GetActionInput>()
     }
     async fn handle(&mut self, _: Guid, _: Restart, jobs: &BackgroundJobQueue) -> Self::Response {
         // So Need a handle to just a single field in the state
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index b97fba3e4..728fd6480 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -5,6 +5,7 @@ use clap::builder::ValueParserFactory;
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use imbl_value::InternedString;
+use models::FromStrParser;
 use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
@@ -12,7 +13,6 @@ use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
-use crate::util::clap::FromStrParser;
 use crate::util::io::create_file;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 
diff --git a/core/startos/src/status/health_check.rs b/core/startos/src/status/health_check.rs
index 1b1e2a7b6..861954d29 100644
--- a/core/startos/src/status/health_check.rs
+++ b/core/startos/src/status/health_check.rs
@@ -1,12 +1,11 @@
 use std::str::FromStr;
 
 use clap::builder::ValueParserFactory;
+use models::FromStrParser;
 pub use models::HealthCheckId;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::util::clap::FromStrParser;
-
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
 pub struct NamedHealthCheckResult {
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index c10a7b89f..e45085826 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -11,17 +11,9 @@ use crate::service::start_stop::StartStop;
 use crate::status::health_check::NamedHealthCheckResult;
 
 pub mod health_check;
-#[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
-#[serde(rename_all = "camelCase")]
-#[model = "Model<Self>"]
-#[ts(export)]
-pub struct Status {
-    pub configured: bool,
-    pub main: MainStatus,
-}
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TS)]
-#[serde(tag = "status")]
+#[serde(tag = "main")]
 #[serde(rename_all = "camelCase")]
 #[serde(rename_all_fields = "camelCase")]
 pub enum MainStatus {
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index e3059c862..c3bf83d00 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -442,6 +442,13 @@ impl<T> BackTrackingIO<T> {
             },
         }
     }
+    pub fn read_buffer(&self) -> &[u8] {
+        match &self.buffer {
+            BTBuffer::NotBuffering => &[],
+            BTBuffer::Buffering { read, .. } => read,
+            BTBuffer::Rewound { read } => read.remaining_slice(),
+        }
+    }
     #[must_use]
     pub fn stop_buffering(&mut self) -> Vec<u8> {
         match std::mem::take(&mut self.buffer) {
@@ -512,6 +519,28 @@ impl<T: AsyncRead> AsyncRead for BackTrackingIO<T> {
         }
     }
 }
+impl<T: std::io::Read> std::io::Read for BackTrackingIO<T> {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        match &mut self.buffer {
+            BTBuffer::Buffering { read, .. } => {
+                let n = self.io.read(buf)?;
+                read.extend_from_slice(&buf[..n]);
+                Ok(n)
+            }
+            BTBuffer::NotBuffering => self.io.read(buf),
+            BTBuffer::Rewound { read } => {
+                let mut ready = false;
+                if (read.position() as usize) < read.get_ref().len() {
+                    let n = std::io::Read::read(read, buf)?;
+                    if n != 0 {
+                        return Ok(n);
+                    }
+                }
+                self.io.read(buf)
+            }
+        }
+    }
+}
 
 impl<T: AsyncWrite> AsyncWrite for BackTrackingIO<T> {
     fn is_write_vectored(&self) -> bool {
@@ -869,7 +898,7 @@ impl Drop for TmpDir {
         if self.path.exists() {
             let path = std::mem::take(&mut self.path);
             tokio::spawn(async move {
-                tokio::fs::remove_dir_all(&path).await.unwrap();
+                tokio::fs::remove_dir_all(&path).await.log_err();
             });
         }
     }
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index fab0b127d..f26bfa6b5 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -36,7 +36,6 @@ use crate::util::serde::{deserialize_from_str, serialize_display};
 use crate::{Error, ErrorKind, ResultExt as _};
 
 pub mod actor;
-pub mod clap;
 pub mod collections;
 pub mod cpupower;
 pub mod crypto;
@@ -568,7 +567,7 @@ pub struct FileLock(#[allow(unused)] OwnedMutexGuard<()>, Option<FdLock<File>>);
 impl Drop for FileLock {
     fn drop(&mut self) {
         if let Some(fd_lock) = self.1.take() {
-            tokio::task::spawn_blocking(|| fd_lock.unlock(true).map_err(|(_, e)| e).unwrap());
+            tokio::task::spawn_blocking(|| fd_lock.unlock(true).map_err(|(_, e)| e).log_err());
         }
     }
 }
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 88d7bfc11..8f4bf4c15 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -1,4 +1,3 @@
-use std::any::Any;
 use std::collections::VecDeque;
 use std::marker::PhantomData;
 use std::ops::Deref;
@@ -9,6 +8,7 @@ use clap::builder::ValueParserFactory;
 use clap::{ArgMatches, CommandFactory, FromArgMatches};
 use color_eyre::eyre::eyre;
 use imbl::OrdMap;
+use models::FromStrParser;
 use openssl::pkey::{PKey, Private};
 use openssl::x509::X509;
 use rpc_toolkit::{
@@ -17,12 +17,10 @@ use rpc_toolkit::{
 use serde::de::DeserializeOwned;
 use serde::ser::{SerializeMap, SerializeSeq};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use serde_json::Value;
 use ts_rs::TS;
 
 use super::IntoDoubleEndedIterator;
 use crate::prelude::*;
-use crate::util::clap::FromStrParser;
 use crate::util::Apply;
 
 pub fn deserialize_from_str<
@@ -272,7 +270,7 @@ impl std::fmt::Display for IoFormat {
 impl std::str::FromStr for IoFormat {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        serde_json::from_value(Value::String(s.to_owned()))
+        serde_json::from_value(serde_json::Value::String(s.to_owned()))
             .with_kind(crate::ErrorKind::Deserialization)
     }
 }
@@ -566,7 +564,7 @@ where
     }
 }
 
-#[derive(Deserialize, Serialize, TS)]
+#[derive(Deserialize, Serialize, TS, Clone)]
 pub struct StdinDeserializable<T>(pub T);
 impl<T> Default for StdinDeserializable<T>
 where
@@ -1358,3 +1356,19 @@ impl Serialize for MaybeUtf8String {
         }
     }
 }
+
+pub fn is_partial_of(partial: &Value, full: &Value) -> bool {
+    match (partial, full) {
+        (Value::Object(partial), Value::Object(full)) => partial.iter().all(|(k, v)| {
+            if let Some(v_full) = full.get(k) {
+                is_partial_of(v, v_full)
+            } else {
+                false
+            }
+        }),
+        (Value::Array(partial), Value::Array(full)) => partial
+            .iter()
+            .all(|v| full.iter().any(|v_full| is_partial_of(v, v_full))),
+        (_, _) => partial == full,
+    }
+}
diff --git a/sdk/.gitignore b/sdk/.gitignore
index a7ca92b2d..1ac0f02e6 100644
--- a/sdk/.gitignore
+++ b/sdk/.gitignore
@@ -1,5 +1,6 @@
-.vscode
 dist/
-node_modules/
-lib/coverage
-lib/test/output.ts
\ No newline at end of file
+baseDist/
+base/lib/coverage
+base/lib/node_modules
+package/lib/coverage
+package/lib/node_modules
\ No newline at end of file
diff --git a/sdk/.prettierignore b/sdk/.prettierignore
index 19b24bbe8..149281301 100644
--- a/sdk/.prettierignore
+++ b/sdk/.prettierignore
@@ -1 +1 @@
-/lib/exver/exver.ts
\ No newline at end of file
+/base/lib/exver/exver.ts
\ No newline at end of file
diff --git a/sdk/Makefile b/sdk/Makefile
index 660a476c4..bc025709d 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -1,48 +1,75 @@
-TS_FILES := $(shell git ls-files lib) lib/test/output.ts
+PACKAGE_TS_FILES := $(shell git ls-files package/lib) package/lib/test/output.ts
+BASE_TS_FILES := $(shell git ls-files base/lib) package/lib/test/output.ts
 version = $(shell git tag --sort=committerdate | tail -1)
 
-.PHONY: test clean bundle fmt buildOutput check
+.PHONY: test base/test package/test clean bundle fmt buildOutput check
 
 all: bundle
 
-test: $(TS_FILES) lib/test/output.ts
-	npm test
+package/test: $(PACKAGE_TS_FILES) package/lib/test/output.ts package/node_modules base/node_modules
+	cd package && npm test
+
+base/test: $(BASE_TS_FILES) base/node_modules
+	cd base && npm test
+
+test: base/test package/test
 
 clean:
+	rm -rf base/node_modules
 	rm -rf dist
-	rm -f lib/test/output.ts
-	rm -rf node_modules
+	rm -rf baseDist
+	rm -f package/lib/test/output.ts
+	rm -rf package/node_modules
 	
-lib/test/output.ts: node_modules lib/test/makeOutput.ts scripts/oldSpecToBuilder.ts
-	npm run buildOutput
+package/lib/test/output.ts: package/node_modules package/lib/test/makeOutput.ts package/scripts/oldSpecToBuilder.ts
+	cd package && npm run buildOutput
 
-bundle: dist | test fmt
+bundle: dist baseDist | test fmt
 	touch dist
 
-lib/exver/exver.ts: node_modules lib/exver/exver.pegjs
-	npx peggy --allowed-start-rules '*' --plugin ./node_modules/ts-pegjs/dist/tspegjs -o lib/exver/exver.ts lib/exver/exver.pegjs
+base/lib/exver/exver.ts: base/node_modules base/lib/exver/exver.pegjs
+	cd base && npm run peggy
 
-dist: $(TS_FILES) package.json node_modules README.md LICENSE
-	npx tsc
-	npx tsc --project tsconfig-cjs.json
-	cp package.json dist/package.json
-	cp README.md dist/README.md
-	cp LICENSE dist/LICENSE
+baseDist: $(PACKAGE_TS_FILES) $(BASE_TS_FILES) base/package.json base/node_modules base/README.md base/LICENSE	
+	(cd base && npm run tsc)
+	rsync -ac base/node_modules baseDist/
+	cp base/package.json baseDist/package.json
+	cp base/README.md baseDist/README.md
+	cp base/LICENSE baseDist/LICENSE
+	touch baseDist
+
+dist: $(PACKAGE_TS_FILES) $(BASE_TS_FILES) package/package.json package/.npmignore package/node_modules package/README.md package/LICENSE	
+	(cd package && npm run tsc)
+	rsync -ac package/node_modules dist/
+	cp package/.npmignore dist/.npmignore
+	cp package/package.json dist/package.json
+	cp package/README.md dist/README.md
+	cp package/LICENSE dist/LICENSE
 	touch dist
 
 full-bundle: bundle
 
 check:
+	cd package
+	npm run check
+	cd ../base
 	npm run check
 
-fmt: node_modules
+fmt: package/node_modules base/node_modules
 	npx prettier . "**/*.ts" --write
 
-node_modules: package.json
-	npm ci
 
-publish: bundle package.json README.md LICENSE
-	cd dist && npm publish --access=public
+package/node_modules: package/package.json
+	cd package && npm ci
+
+base/node_modules: base/package.json
+	cd base && npm ci
+
+node_modules: package/node_modules base/node_modules
+
+publish: bundle package/package.json README.md LICENSE
+	cd dist
+	npm publish --access=public
 
 link: bundle
 	cd dist && npm link
diff --git a/sdk/base/.gitignore b/sdk/base/.gitignore
new file mode 100644
index 000000000..a7ca92b2d
--- /dev/null
+++ b/sdk/base/.gitignore
@@ -0,0 +1,5 @@
+.vscode
+dist/
+node_modules/
+lib/coverage
+lib/test/output.ts
\ No newline at end of file
diff --git a/sdk/LICENSE b/sdk/base/LICENSE
similarity index 100%
rename from sdk/LICENSE
rename to sdk/base/LICENSE
diff --git a/sdk/base/README.md b/sdk/base/README.md
new file mode 100644
index 000000000..33bf5ff9d
--- /dev/null
+++ b/sdk/base/README.md
@@ -0,0 +1 @@
+# See ../package/README.md
diff --git a/sdk/jest.config.js b/sdk/base/jest.config.js
similarity index 100%
rename from sdk/jest.config.js
rename to sdk/base/jest.config.js
diff --git a/sdk/base/lib/Effects.ts b/sdk/base/lib/Effects.ts
new file mode 100644
index 000000000..3dab037c0
--- /dev/null
+++ b/sdk/base/lib/Effects.ts
@@ -0,0 +1,191 @@
+import {
+  ActionId,
+  ActionInput,
+  ActionMetadata,
+  SetMainStatus,
+  DependencyRequirement,
+  CheckDependenciesResult,
+  SetHealth,
+  BindParams,
+  HostId,
+  LanInfo,
+  Host,
+  ExportServiceInterfaceParams,
+  ServiceInterface,
+  ActionRequest,
+  RequestActionParams,
+} from "./osBindings"
+import { StorePath } from "./util/PathBuilder"
+import {
+  PackageId,
+  Dependencies,
+  ServiceInterfaceId,
+  SmtpValue,
+  ActionResult,
+} from "./types"
+import { UrlString } from "./util/getServiceInterface"
+
+/** Used to reach out from the pure js runtime */
+
+export type Effects = {
+  constRetry: () => void
+  clearCallbacks: (
+    options: { only: number[] } | { except: number[] },
+  ) => Promise<void>
+
+  // action
+  action: {
+    /** Define an action that can be invoked by a user or service */
+    export(options: { id: ActionId; metadata: ActionMetadata }): Promise<void>
+    /** Remove all exported actions */
+    clear(options: { except: ActionId[] }): Promise<void>
+    getInput(options: {
+      packageId?: PackageId
+      actionId: ActionId
+    }): Promise<ActionInput | null>
+    run<Input extends Record<string, unknown>>(options: {
+      packageId?: PackageId
+      actionId: ActionId
+      input?: Input
+    }): Promise<ActionResult | null>
+    request<Input extends Record<string, unknown>>(
+      options: RequestActionParams,
+    ): Promise<void>
+    clearRequests(
+      options: { only: ActionId[] } | { except: ActionId[] },
+    ): Promise<void>
+  }
+
+  // control
+  /** restart this service's main function */
+  restart(): Promise<void>
+  /** stop this service's main function */
+  shutdown(): Promise<void>
+  /** indicate to the host os what runstate the service is in */
+  setMainStatus(options: SetMainStatus): Promise<void>
+
+  // dependency
+  /** Set the dependencies of what the service needs, usually run during the inputSpec action as a best practice */
+  setDependencies(options: { dependencies: Dependencies }): Promise<void>
+  /** Get the list of the dependencies, both the dynamic set by the effect of setDependencies and the end result any required in the manifest  */
+  getDependencies(): Promise<DependencyRequirement[]>
+  /** Test whether current dependency requirements are satisfied */
+  checkDependencies(options: {
+    packageIds?: PackageId[]
+  }): Promise<CheckDependenciesResult[]>
+  /** mount a volume of a dependency */
+  mount(options: {
+    location: string
+    target: {
+      packageId: string
+      volumeId: string
+      subpath: string | null
+      readonly: boolean
+    }
+  }): Promise<string>
+  /** Returns a list of the ids of all installed packages */
+  getInstalledPackages(): Promise<string[]>
+  /** grants access to certain paths in the store to dependents */
+  exposeForDependents(options: { paths: string[] }): Promise<void>
+
+  // health
+  /** sets the result of a health check */
+  setHealth(o: SetHealth): Promise<void>
+
+  // subcontainer
+  subcontainer: {
+    /** A low level api used by SubContainer */
+    createFs(options: {
+      imageId: string
+      name: string | null
+    }): Promise<[string, string]>
+    /** A low level api used by SubContainer */
+    destroyFs(options: { guid: string }): Promise<void>
+  }
+
+  // net
+  // bind
+  /** Creates a host connected to the specified port with the provided options */
+  bind(options: BindParams): Promise<void>
+  /** Get the port address for a service */
+  getServicePortForward(options: {
+    packageId?: PackageId
+    hostId: HostId
+    internalPort: number
+  }): Promise<LanInfo>
+  /** Removes all network bindings, called in the setupInputSpec */
+  clearBindings(options: {
+    except: { id: HostId; internalPort: number }[]
+  }): Promise<void>
+  // host
+  /** Returns information about the specified host, if it exists */
+  getHostInfo(options: {
+    packageId?: PackageId
+    hostId: HostId
+    callback?: () => void
+  }): Promise<Host | null>
+  /** Returns the primary url that a user has selected for a host, if it exists */
+  getPrimaryUrl(options: {
+    packageId?: PackageId
+    hostId: HostId
+    callback?: () => void
+  }): Promise<UrlString | null>
+  /** Returns the IP address of the container */
+  getContainerIp(): Promise<string>
+  // interface
+  /** Creates an interface bound to a specific host and port to show to the user */
+  exportServiceInterface(options: ExportServiceInterfaceParams): Promise<void>
+  /** Returns an exported service interface */
+  getServiceInterface(options: {
+    packageId?: PackageId
+    serviceInterfaceId: ServiceInterfaceId
+    callback?: () => void
+  }): Promise<ServiceInterface | null>
+  /** Returns all exported service interfaces for a package */
+  listServiceInterfaces(options: {
+    packageId?: PackageId
+    callback?: () => void
+  }): Promise<Record<ServiceInterfaceId, ServiceInterface>>
+  /** Removes all service interfaces */
+  clearServiceInterfaces(options: {
+    except: ServiceInterfaceId[]
+  }): Promise<void>
+  // ssl
+  /** Returns a PEM encoded fullchain for the hostnames specified */
+  getSslCertificate: (options: {
+    hostnames: string[]
+    algorithm?: "ecdsa" | "ed25519"
+    callback?: () => void
+  }) => Promise<[string, string, string]>
+  /** Returns a PEM encoded private key corresponding to the certificate for the hostnames specified */
+  getSslKey: (options: {
+    hostnames: string[]
+    algorithm?: "ecdsa" | "ed25519"
+  }) => Promise<string>
+
+  // store
+  store: {
+    /** Get a value in a json like data, can be observed and subscribed */
+    get<Store = never, ExtractStore = unknown>(options: {
+      /** If there is no packageId it is assumed the current package */
+      packageId?: string
+      /** The path defaults to root level, using the [JsonPath](https://jsonpath.com/) */
+      path: StorePath
+      callback?: () => void
+    }): Promise<ExtractStore>
+    /** Used to store values that can be accessed and subscribed to */
+    set<Store = never, ExtractStore = unknown>(options: {
+      /** Sets the value for the wrapper at the path, it will override, using the [JsonPath](https://jsonpath.com/)  */
+      path: StorePath
+      value: ExtractStore
+    }): Promise<void>
+  }
+  /** sets the version that this service's data has been migrated to */
+  setDataVersion(options: { version: string }): Promise<void>
+  /** returns the version that this service's data has been migrated to */
+  getDataVersion(): Promise<string | null>
+
+  // system
+  /** Returns globally configured SMTP settings, if they exist */
+  getSystemSmtp(options: { callback?: () => void }): Promise<SmtpValue | null>
+}
diff --git a/sdk/base/lib/actions/index.ts b/sdk/base/lib/actions/index.ts
new file mode 100644
index 000000000..cebb03ee1
--- /dev/null
+++ b/sdk/base/lib/actions/index.ts
@@ -0,0 +1,65 @@
+import * as T from "../types"
+import * as IST from "../actions/input/inputSpecTypes"
+
+export type RunActionInput<Input> =
+  | Input
+  | ((prev?: { spec: IST.InputSpec; value: Input | null }) => Input)
+
+export const runAction = async <
+  Input extends Record<string, unknown>,
+>(options: {
+  effects: T.Effects
+  //   packageId?: T.PackageId
+  actionId: T.ActionId
+  input?: RunActionInput<Input>
+}) => {
+  if (options.input) {
+    if (options.input instanceof Function) {
+      const prev = await options.effects.action.getInput({
+        // packageId: options.packageId,
+        actionId: options.actionId,
+      })
+      const input = options.input(
+        prev
+          ? { spec: prev.spec as IST.InputSpec, value: prev.value as Input }
+          : undefined,
+      )
+      return options.effects.action.run({
+        // packageId: options.packageId,
+        actionId: options.actionId,
+        input,
+      })
+    } else {
+      return options.effects.action.run({
+        // packageId: options.packageId,
+        actionId: options.actionId,
+        input: options.input,
+      })
+    }
+  } else {
+    return options.effects.action.run({
+      //   packageId: options.packageId,
+      actionId: options.actionId,
+    })
+  }
+}
+
+// prettier-ignore
+export type ActionRequest<T extends Omit<T.ActionRequest, "packageId">> =
+  T extends { when: { condition: "input-not-matches" } }
+    ? (T extends { input: T.ActionRequestInput } ? T : "input is required for condition 'input-not-matches'")
+    : T
+
+export const requestAction = <
+  T extends Omit<T.ActionRequest, "packageId">,
+>(options: {
+  effects: T.Effects
+  request: ActionRequest<T> & { replayId?: string; packageId: T.PackageId }
+}) => {
+  const request = options.request
+  const req = {
+    ...request,
+    replayId: request.replayId || `${request.packageId}:${request.actionId}`,
+  }
+  return options.effects.action.request(req)
+}
diff --git a/sdk/lib/config/builder/index.ts b/sdk/base/lib/actions/input/builder/index.ts
similarity index 51%
rename from sdk/lib/config/builder/index.ts
rename to sdk/base/lib/actions/input/builder/index.ts
index 6b6ddc730..618c4856f 100644
--- a/sdk/lib/config/builder/index.ts
+++ b/sdk/base/lib/actions/input/builder/index.ts
@@ -1,6 +1,6 @@
-import { Config } from "./config"
+import { InputSpec } from "./inputSpec"
 import { List } from "./list"
 import { Value } from "./value"
 import { Variants } from "./variants"
 
-export { Config, List, Value, Variants }
+export { InputSpec as InputSpec, List, Value, Variants }
diff --git a/sdk/lib/config/builder/config.ts b/sdk/base/lib/actions/input/builder/inputSpec.ts
similarity index 73%
rename from sdk/lib/config/builder/config.ts
rename to sdk/base/lib/actions/input/builder/inputSpec.ts
index c30f37890..288ce8b3e 100644
--- a/sdk/lib/config/builder/config.ts
+++ b/sdk/base/lib/actions/input/builder/inputSpec.ts
@@ -1,7 +1,7 @@
-import { ValueSpec } from "../configTypes"
+import { ValueSpec } from "../inputSpecTypes"
 import { Value } from "./value"
-import { _ } from "../../util"
-import { Effects } from "../../types"
+import { _ } from "../../../util"
+import { Effects } from "../../../Effects"
 import { Parser, object } from "ts-matches"
 
 export type LazyBuildOptions<Store> = {
@@ -12,20 +12,20 @@ export type LazyBuild<Store, ExpectedOut> = (
 ) => Promise<ExpectedOut> | ExpectedOut
 
 // prettier-ignore
-export type ExtractConfigType<A extends Record<string, any> | Config<Record<string, any>, any> | Config<Record<string, any>, never>> = 
-  A extends Config<infer B, any> | Config<infer B, never> ? B :
+export type ExtractInputSpecType<A extends Record<string, any> | InputSpec<Record<string, any>, any> | InputSpec<Record<string, any>, never>> = 
+  A extends InputSpec<infer B, any> | InputSpec<infer B, never> ? B :
   A
 
-export type ConfigSpecOf<A extends Record<string, any>, Store = never> = {
+export type InputSpecOf<A extends Record<string, any>, Store = never> = {
   [K in keyof A]: Value<A[K], Store>
 }
 
 export type MaybeLazyValues<A> = LazyBuild<any, A> | A
 /**
- * Configs are the specs that are used by the os configuration form for this service.
- * Here is an example of a simple configuration
+ * InputSpecs are the specs that are used by the os input specification form for this service.
+ * Here is an example of a simple input specification
   ```ts
-    const smallConfig = Config.of({
+    const smallInputSpec = InputSpec.of({
       test: Value.boolean({
         name: "Test",
         description: "This is the description for the test",
@@ -35,17 +35,17 @@ export type MaybeLazyValues<A> = LazyBuild<any, A> | A
     });
   ```
 
-  The idea of a config is that now the form is going to ask for
+  The idea of an inputSpec is that now the form is going to ask for
   Test: [ ] and the value is going to be checked as a boolean.
   There are more complex values like selects, lists, and objects. See {@link Value}
 
-  Also, there is the ability to get a validator/parser from this config spec.
+  Also, there is the ability to get a validator/parser from this inputSpec spec.
   ```ts
-  const matchSmallConfig = smallConfig.validator();
-  type SmallConfig = typeof matchSmallConfig._TYPE;
+  const matchSmallInputSpec = smallInputSpec.validator();
+  type SmallInputSpec = typeof matchSmallInputSpec._TYPE;
   ```
 
-  Here is an example of a more complex configuration which came from a configuration for a service
+  Here is an example of a more complex input specification which came from an input specification for a service
   that works with bitcoin, like c-lightning.
   ```ts
 
@@ -73,11 +73,11 @@ export const port = Value.number({
   units: null,
   placeholder: null,
 });
-export const addNodesSpec = Config.of({ hostname: hostname, port: port });
+export const addNodesSpec = InputSpec.of({ hostname: hostname, port: port });
 
   ```
  */
-export class Config<Type extends Record<string, any>, Store = never> {
+export class InputSpec<Type extends Record<string, any>, Store = never> {
   private constructor(
     private readonly spec: {
       [K in keyof Type]: Value<Type[K], Store> | Value<Type[K], never>
@@ -105,7 +105,7 @@ export class Config<Type extends Record<string, any>, Store = never> {
       validatorObj[key] = spec[key].validator
     }
     const validator = object(validatorObj)
-    return new Config<
+    return new InputSpec<
       {
         [K in keyof Spec]: Spec[K] extends
           | Value<infer T, Store>
@@ -119,19 +119,19 @@ export class Config<Type extends Record<string, any>, Store = never> {
 
   /**
    * Use this during the times that the input needs a more specific type.
-   * Used in types that the value/ variant/ list/ config is constructed somewhere else.
+   * Used in types that the value/ variant/ list/ inputSpec is constructed somewhere else.
   ```ts
-  const a = Config.text({
+  const a = InputSpec.text({
     name: "a",
     required: false,
   })
 
-  return Config.of<Store>()({
+  return InputSpec.of<Store>()({
     myValue: a.withStore(),
   })
   ```
    */
   withStore<NewStore extends Store extends never ? any : Store>() {
-    return this as any as Config<Type, NewStore>
+    return this as any as InputSpec<Type, NewStore>
   }
 }
diff --git a/sdk/lib/config/builder/list.ts b/sdk/base/lib/actions/input/builder/list.ts
similarity index 74%
rename from sdk/lib/config/builder/list.ts
rename to sdk/base/lib/actions/input/builder/list.ts
index f230b8608..726dc961e 100644
--- a/sdk/lib/config/builder/list.ts
+++ b/sdk/base/lib/actions/input/builder/list.ts
@@ -1,4 +1,4 @@
-import { Config, LazyBuild } from "./config"
+import { InputSpec, LazyBuild } from "./inputSpec"
 import {
   ListValueSpecText,
   Pattern,
@@ -6,45 +6,55 @@ import {
   UniqueBy,
   ValueSpecList,
   ValueSpecListOf,
-} from "../configTypes"
-import { Parser, arrayOf, number, string } from "ts-matches"
-/**
- * Used as a subtype of Value.list
-```ts
-export const authorizationList = List.string({
-  "name": "Authorization",
-  "range": "[0,*)",
-  "default": [],
-  "description": "Username and hashed password for JSON-RPC connections. RPC clients connect using the usual http basic authentication.",
-  "warning": null
-}, {"masked":false,"placeholder":null,"pattern":"^[a-zA-Z0-9_-]+:([0-9a-fA-F]{2})+\\$([0-9a-fA-F]{2})+$","patternDescription":"Each item must be of the form \"<USERNAME>:<SALT>$<HASH>\"."});
-export const auth = Value.list(authorizationList);
-```
-*/
+} from "../inputSpecTypes"
+import { Parser, arrayOf, string } from "ts-matches"
+
 export class List<Type, Store> {
   private constructor(
     public build: LazyBuild<Store, ValueSpecList>,
     public validator: Parser<unknown, Type>,
   ) {}
+
   static text(
     a: {
       name: string
       description?: string | null
       warning?: string | null
-      /** Default = [] */
       default?: string[]
       minLength?: number | null
       maxLength?: number | null
     },
     aSpec: {
-      /** Default = false */
+      /**
+       * @description Mask (aka camouflage) text input with dots: ● ● ●
+       * @default false
+       */
       masked?: boolean
       placeholder?: string | null
       minLength?: number | null
       maxLength?: number | null
-      patterns: Pattern[]
-      /** Default = "text" */
+      /**
+       * @description A list of regular expressions to which the text must conform to pass validation. A human readable description is provided in case the validation fails.
+       * @default []
+       * @example
+       * ```
+        [
+          {
+            regex: "[a-z]",
+            description: "May only contain lower case letters from the English alphabet."
+          }
+        ]
+       * ```
+       */
+      patterns?: Pattern[]
+      /**
+       * @description Informs the browser how to behave and which keyboard to display on mobile
+       * @default "text"
+       */
       inputmode?: ListValueSpecText["inputmode"]
+      /**
+       * @description Displays a button that will generate a random string according to the provided charset and len attributes.
+       */
       generate?: null | RandomString
     },
   ) {
@@ -57,6 +67,7 @@ export class List<Type, Store> {
         masked: false,
         inputmode: "text" as const,
         generate: null,
+        patterns: aSpec.patterns || [],
         ...aSpec,
       }
       const built: ValueSpecListOf<"text"> = {
@@ -73,6 +84,7 @@ export class List<Type, Store> {
       return built
     }, arrayOf(string))
   }
+
   static dynamicText<Store = never>(
     getA: LazyBuild<
       Store,
@@ -80,20 +92,17 @@ export class List<Type, Store> {
         name: string
         description?: string | null
         warning?: string | null
-        /** Default = [] */
         default?: string[]
         minLength?: number | null
         maxLength?: number | null
         disabled?: false | string
         generate?: null | RandomString
         spec: {
-          /** Default = false */
           masked?: boolean
           placeholder?: string | null
           minLength?: number | null
           maxLength?: number | null
-          patterns: Pattern[]
-          /** Default = "text" */
+          patterns?: Pattern[]
           inputmode?: ListValueSpecText["inputmode"]
         }
       }
@@ -109,6 +118,7 @@ export class List<Type, Store> {
         masked: false,
         inputmode: "text" as const,
         generate: null,
+        patterns: aSpec.patterns || [],
         ...aSpec,
       }
       const built: ValueSpecListOf<"text"> = {
@@ -125,18 +135,18 @@ export class List<Type, Store> {
       return built
     }, arrayOf(string))
   }
+
   static obj<Type extends Record<string, any>, Store>(
     a: {
       name: string
       description?: string | null
       warning?: string | null
-      /** Default [] */
       default?: []
       minLength?: number | null
       maxLength?: number | null
     },
     aSpec: {
-      spec: Config<Type, Store>
+      spec: InputSpec<Type, Store>
       displayAs?: null | string
       uniqueBy?: null | UniqueBy
     },
@@ -170,14 +180,14 @@ export class List<Type, Store> {
 
   /**
    * Use this during the times that the input needs a more specific type.
-   * Used in types that the value/ variant/ list/ config is constructed somewhere else.
+   * Used in types that the value/ variant/ list/ inputSpec is constructed somewhere else.
   ```ts
-  const a = Config.text({
+  const a = InputSpec.text({
     name: "a",
     required: false,
   })
 
-  return Config.of<Store>()({
+  return InputSpec.of<Store>()({
     myValue: a.withStore(),
   })
   ```
diff --git a/sdk/lib/config/builder/value.ts b/sdk/base/lib/actions/input/builder/value.ts
similarity index 72%
rename from sdk/lib/config/builder/value.ts
rename to sdk/base/lib/actions/input/builder/value.ts
index 01673a6df..ad30f1376 100644
--- a/sdk/lib/config/builder/value.ts
+++ b/sdk/base/lib/actions/input/builder/value.ts
@@ -1,4 +1,4 @@
-import { Config, LazyBuild, LazyBuildOptions } from "./config"
+import { InputSpec, LazyBuild } from "./inputSpec"
 import { List } from "./list"
 import { Variants } from "./variants"
 import {
@@ -7,13 +7,15 @@ import {
   RandomString,
   ValueSpec,
   ValueSpecDatetime,
+  ValueSpecHidden,
   ValueSpecText,
   ValueSpecTextarea,
-} from "../configTypes"
-import { DefaultString } from "../configTypes"
-import { _ } from "../../util"
+} from "../inputSpecTypes"
+import { DefaultString } from "../inputSpecTypes"
+import { _, once } from "../../../util"
 import {
   Parser,
+  any,
   anyOf,
   arrayOf,
   boolean,
@@ -24,7 +26,6 @@ import {
   string,
   unknown,
 } from "ts-matches"
-import { once } from "../../util/once"
 
 export type RequiredDefault<A> =
   | false
@@ -54,11 +55,6 @@ type AsRequired<Type, MaybeRequiredType> = MaybeRequiredType extends
   ? Type
   : Type | null | undefined
 
-type InputAsRequired<A, Type> = A extends
-  | { required: { default: any } | never }
-  | never
-  ? Type
-  : Type | null | undefined
 const testForAsRequiredParser = once(
   () => object({ required: object({ default: unknown }) }).test,
 )
@@ -73,28 +69,6 @@ function asRequiredParser<
   return parser.optional() as any
 }
 
-/**
- * A value is going to be part of the form in the FE of the OS.
- * Something like a boolean, a string, a number, etc.
- * in the fe it will ask for the name of value, and use the rest of the value to determine how to render it.
- * While writing with a value, you will start with `Value.` then let the IDE suggest the rest.
- * for things like string, the options are going to be in {}.
- * Keep an eye out for another config builder types as params.
- * Note, usually this is going to be used in a `Config` {@link Config} builder.
- ```ts
-const username = Value.string({
-  name: "Username",
-  default: "bitcoin",
-  description: "The username for connecting to Bitcoin over RPC.",
-  warning: null,
-  required: true,
-  masked: true,
-  placeholder: null,
-  pattern: "^[a-zA-Z0-9_]+$",
-  patternDescription: "Must be alphanumeric (can contain underscore).",
-});
- ```
- */
 export class Value<Type, Store> {
   protected constructor(
     public build: LazyBuild<Store, ValueSpec>,
@@ -103,10 +77,13 @@ export class Value<Type, Store> {
   static toggle(a: {
     name: string
     description?: string | null
+    /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
     default: boolean
-    /**  Immutable means it can only be configed at the first config then never again 
-    Default is false */
+    /**
+     * @description Once set, the value can never be changed.
+     * @default false
+     */
     immutable?: boolean
   }) {
     return new Value<boolean, never>(
@@ -148,22 +125,53 @@ export class Value<Type, Store> {
   static text<Required extends RequiredDefault<DefaultString>>(a: {
     name: string
     description?: string | null
+    /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
+    /**
+     * @description Determines if the field is required. If so, optionally provide a default value.
+     * @type { false | { default: string | RandomString | null } }
+     * @example required: false
+     * @example required: { default: null }
+     * @example required: { default: 'World' }
+     * @example required: { default: { charset: 'abcdefg', len: 16 } }
+     */
     required: Required
-
-    /** Default = false */
+    /**
+     * @description Mask (aka camouflage) text input with dots: ● ● ●
+     * @default false
+     */
     masked?: boolean
     placeholder?: string | null
     minLength?: number | null
     maxLength?: number | null
+    /**
+     * @description A list of regular expressions to which the text must conform to pass validation. A human readable description is provided in case the validation fails.
+     * @default []
+     * @example
+     * ```
+      [
+        {
+          regex: "[a-z]",
+          description: "May only contain lower case letters from the English alphabet."
+        }
+      ]
+     * ```
+     */
     patterns?: Pattern[]
-    /** Default = 'text' */
+    /**
+     * @description Informs the browser how to behave and which keyboard to display on mobile
+     * @default "text"
+     */
     inputmode?: ValueSpecText["inputmode"]
-    /**  Immutable means it can only be configured at the first config then never again
-     * Default is false
+    /**
+     * @description Once set, the value can never be changed.
+     * @default false
      */
     immutable?: boolean
-    generate?: null | RandomString
+    /**
+     * @description Displays a button that will generate a random string according to the provided charset and len attributes.
+     */
+    generate?: RandomString | null
   }) {
     return new Value<AsRequired<string, Required>, never>(
       async () => ({
@@ -193,19 +201,13 @@ export class Value<Type, Store> {
         description?: string | null
         warning?: string | null
         required: RequiredDefault<DefaultString>
-
-        /** Default = false */
         masked?: boolean
         placeholder?: string | null
         minLength?: number | null
         maxLength?: number | null
         patterns?: Pattern[]
-        /** Default = 'text' */
         inputmode?: ValueSpecText["inputmode"]
         disabled?: string | false
-        /**  Immutable means it can only be configured at the first config then never again
-         * Default is false
-         */
         generate?: null | RandomString
       }
     >,
@@ -233,13 +235,19 @@ export class Value<Type, Store> {
   static textarea(a: {
     name: string
     description?: string | null
+    /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
+    /**
+     * @description Unlike other "required" fields, for textarea this is a simple boolean.
+     */
     required: boolean
     minLength?: number | null
     maxLength?: number | null
     placeholder?: string | null
-    /**  Immutable means it can only be configed at the first config then never again 
-    Default is false */
+    /**
+     * @description Once set, the value can never be changed.
+     * @default false
+     */
     immutable?: boolean
   }) {
     return new Value<string, never>(async () => {
@@ -290,17 +298,36 @@ export class Value<Type, Store> {
   static number<Required extends RequiredDefault<number>>(a: {
     name: string
     description?: string | null
+    /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
+    /**
+     * @description Determines if the field is required. If so, optionally provide a default value.
+     * @type { false | { default: number | null } }
+     * @example required: false
+     * @example required: { default: null }
+     * @example required: { default: 7 }
+     */
     required: Required
     min?: number | null
     max?: number | null
-    /** Default = '1' */
+    /**
+     * @description How much does the number increase/decrease when using the arrows provided by the browser.
+     * @default 1
+     */
     step?: number | null
+    /**
+     * @description Requires the number to be an integer.
+     */
     integer: boolean
+    /**
+     * @description Optionally display units to the right of the input box.
+     */
     units?: string | null
     placeholder?: string | null
-    /**  Immutable means it can only be configed at the first config then never again 
-    Default is false */
+    /**
+     * @description Once set, the value can never be changed.
+     * @default false
+     */
     immutable?: boolean
   }) {
     return new Value<AsRequired<number, Required>, never>(
@@ -331,7 +358,6 @@ export class Value<Type, Store> {
         required: RequiredDefault<number>
         min?: number | null
         max?: number | null
-        /** Default = '1' */
         step?: number | null
         integer: boolean
         units?: string | null
@@ -361,10 +387,20 @@ export class Value<Type, Store> {
   static color<Required extends RequiredDefault<string>>(a: {
     name: string
     description?: string | null
+    /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
+    /**
+     * @description Determines if the field is required. If so, optionally provide a default value.
+     * @type { false | { default: string | null } }
+     * @example required: false
+     * @example required: { default: null }
+     * @example required: { default: 'ffffff' }
+     */
     required: Required
-    /**  Immutable means it can only be configed at the first config then never again 
-    Default is false */
+    /**
+     * @description Once set, the value can never be changed.
+     * @default false
+     */
     immutable?: boolean
   }) {
     return new Value<AsRequired<string, Required>, never>(
@@ -410,14 +446,27 @@ export class Value<Type, Store> {
   static datetime<Required extends RequiredDefault<string>>(a: {
     name: string
     description?: string | null
+    /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
+    /**
+     * @description Determines if the field is required. If so, optionally provide a default value.
+     * @type { false | { default: string | null } }
+     * @example required: false
+     * @example required: { default: null }
+     * @example required: { default: '1985-12-16 18:00:00.000' }
+     */
     required: Required
-    /** Default = 'datetime-local' */
+    /**
+     * @description Informs the browser how to behave and which date/time component to display.
+     * @default "datetime-local"
+     */
     inputmode?: ValueSpecDatetime["inputmode"]
     min?: string | null
     max?: string | null
-    /**  Immutable means it can only be configed at the first config then never again 
-    Default is false */
+    /**
+     * @description Once set, the value can never be changed.
+     * @default false
+     */
     immutable?: boolean
   }) {
     return new Value<AsRequired<string, Required>, never>(
@@ -445,7 +494,6 @@ export class Value<Type, Store> {
         description?: string | null
         warning?: string | null
         required: RequiredDefault<string>
-        /** Default = 'datetime-local' */
         inputmode?: ValueSpecDatetime["inputmode"]
         min?: string | null
         max?: string | null
@@ -471,24 +519,39 @@ export class Value<Type, Store> {
   }
   static select<
     Required extends RequiredDefault<string>,
-    B extends Record<string, string>,
+    Values extends Record<string, string>,
   >(a: {
     name: string
     description?: string | null
+    /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
+    /**
+     * @description Determines if the field is required. If so, optionally provide a default value from the list of values.
+     * @type { false | { default: string | null } }
+     * @example required: false
+     * @example required: { default: null }
+     * @example required: { default: 'radio1' }
+     */
     required: Required
-    values: B
     /**
-     * Disabled:  false means that there is nothing disabled, good to modify
-     *           string means that this is the message displayed and the whole thing is disabled
-     *           string[] means that the options are disabled
+     * @description A mapping of unique radio options to their human readable display format.
+     * @example
+     * ```
+      {
+        radio1: "Radio 1"
+        radio2: "Radio 2"
+        radio3: "Radio 3"
+      }
+     * ```
+     */
+    values: Values
+    /**
+     * @description Once set, the value can never be changed.
+     * @default false
      */
-    disabled?: false | string | (string & keyof B)[]
-    /**  Immutable means it can only be configed at the first config then never again 
-    Default is false */
     immutable?: boolean
   }) {
-    return new Value<AsRequired<keyof B, Required>, never>(
+    return new Value<AsRequired<keyof Values, Required>, never>(
       () => ({
         description: null,
         warning: null,
@@ -500,7 +563,9 @@ export class Value<Type, Store> {
       }),
       asRequiredParser(
         anyOf(
-          ...Object.keys(a.values).map((x: keyof B & string) => literal(x)),
+          ...Object.keys(a.values).map((x: keyof Values & string) =>
+            literal(x),
+          ),
         ),
         a,
       ) as any,
@@ -515,11 +580,6 @@ export class Value<Type, Store> {
         warning?: string | null
         required: RequiredDefault<string>
         values: Record<string, string>
-        /**
-         * Disabled:  false means that there is nothing disabled, good to modify
-         *           string means that this is the message displayed and the whole thing is disabled
-         *           string[] means that the options are disabled
-         */
         disabled?: false | string | string[]
       }
     >,
@@ -540,20 +600,31 @@ export class Value<Type, Store> {
   static multiselect<Values extends Record<string, string>>(a: {
     name: string
     description?: string | null
+    /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
+    /**
+     * @description A simple list of which options should be checked by default.
+     */
     default: string[]
+    /**
+     * @description A mapping of checkbox options to their human readable display format.
+     * @example
+     * ```
+      {
+        option1: "Option 1"
+        option2: "Option 2"
+        option3: "Option 3"
+      }
+     * ```
+     */
     values: Values
     minLength?: number | null
     maxLength?: number | null
-    /**  Immutable means it can only be configed at the first config then never again 
-    Default is false */
-    immutable?: boolean
     /**
-     * Disabled:  false means that there is nothing disabled, good to modify
-     *           string means that this is the message displayed and the whole thing is disabled
-     *           string[] means that the options are disabled
+     * @description Once set, the value can never be changed.
+     * @default false
      */
-    disabled?: false | string | (string & keyof Values)[]
+    immutable?: boolean
   }) {
     return new Value<(keyof Values)[], never>(
       () => ({
@@ -582,11 +653,6 @@ export class Value<Type, Store> {
         values: Record<string, string>
         minLength?: number | null
         maxLength?: number | null
-        /**
-         * Disabled:  false means that there is nothing disabled, good to modify
-         *           string means that this is the message displayed and the whole thing is disabled
-         *           string[] means that the options are disabled
-         */
         disabled?: false | string | string[]
       }
     >,
@@ -609,9 +675,8 @@ export class Value<Type, Store> {
     a: {
       name: string
       description?: string | null
-      warning?: string | null
     },
-    spec: Config<Type, Store>,
+    spec: InputSpec<Type, Store>,
   ) {
     return new Value<Type, Store>(async (options) => {
       const built = await spec.build(options as any)
@@ -624,12 +689,11 @@ export class Value<Type, Store> {
       }
     }, spec.validator)
   }
-  static file<Required extends RequiredDefault<string>, Store>(a: {
+  static file<Store>(a: {
     name: string
     description?: string | null
-    warning?: string | null
     extensions: string[]
-    required: Required
+    required: boolean
   }) {
     const buildValue = {
       type: "file" as const,
@@ -637,11 +701,9 @@ export class Value<Type, Store> {
       warning: null,
       ...a,
     }
-    return new Value<AsRequired<FilePath, Required>, Store>(
+    return new Value<FilePath, Store>(
       () => ({
         ...buildValue,
-
-        ...requiredLikeToAbove(a.required),
       }),
       asRequiredParser(object({ filePath: string }), a),
     )
@@ -672,17 +734,21 @@ export class Value<Type, Store> {
     a: {
       name: string
       description?: string | null
+      /** Presents a warning prompt before permitting the value to change. */
       warning?: string | null
+      /**
+       * @description Determines if the field is required. If so, optionally provide a default value from the list of variants.
+       * @type { false | { default: string | null } }
+       * @example required: false
+       * @example required: { default: null }
+       * @example required: { default: 'variant1' }
+       */
       required: Required
-      /**  Immutable means it can only be configed at the first config then never again 
-      Default is false */
-      immutable?: boolean
       /**
-       * Disabled:  false means that there is nothing disabled, good to modify
-       *           string means that this is the message displayed and the whole thing is disabled
-       *           string[] means that the options are disabled
+       * @description Once set, the value can never be changed.
+       * @default false
        */
-      disabled?: false | string | string[]
+      immutable?: boolean
     },
     aVariants: Variants<Type, Store>,
   ) {
@@ -736,11 +802,11 @@ export class Value<Type, Store> {
     getA: LazyBuild<
       Store,
       {
-        disabled: string[] | false | string
         name: string
         description?: string | null
         warning?: string | null
         required: Required
+        disabled: string[] | false | string
       }
     >,
     aVariants: Variants<Type, Store> | Variants<Type, never>,
@@ -763,16 +829,25 @@ export class Value<Type, Store> {
     return new Value<Type, Store>((options) => a.build(options), a.validator)
   }
 
+  static hidden<T>(parser: Parser<unknown, T> = any) {
+    return new Value<T, never>(async () => {
+      const built: ValueSpecHidden = {
+        type: "hidden" as const,
+      }
+      return built
+    }, parser)
+  }
+
   /**
    * Use this during the times that the input needs a more specific type.
-   * Used in types that the value/ variant/ list/ config is constructed somewhere else.
+   * Used in types that the value/ variant/ list/ inputSpec is constructed somewhere else.
   ```ts
-  const a = Config.text({
+  const a = InputSpec.text({
     name: "a",
     required: false,
   })
 
-  return Config.of<Store>()({
+  return InputSpec.of<Store>()({
     myValue: a.withStore(),
   })
   ```
diff --git a/sdk/lib/config/builder/variants.ts b/sdk/base/lib/actions/input/builder/variants.ts
similarity index 80%
rename from sdk/lib/config/builder/variants.ts
rename to sdk/base/lib/actions/input/builder/variants.ts
index 352f16828..6c0f83905 100644
--- a/sdk/lib/config/builder/variants.ts
+++ b/sdk/base/lib/actions/input/builder/variants.ts
@@ -1,5 +1,5 @@
-import { InputSpec, ValueSpecUnion } from "../configTypes"
-import { LazyBuild, Config } from "./config"
+import { ValueSpec, ValueSpecUnion } from "../inputSpecTypes"
+import { LazyBuild, InputSpec } from "./inputSpec"
 import { Parser, anyOf, literals, object } from "ts-matches"
 
 /**
@@ -8,7 +8,7 @@ import { Parser, anyOf, literals, object } from "ts-matches"
  * key to the tag.id in the Value.select
 ```ts
  
-export const disabled = Config.of({});
+export const disabled = InputSpec.of({});
 export const size = Value.number({
   name: "Max Chain Size",
   default: 550,
@@ -20,7 +20,7 @@ export const size = Value.number({
   units: "MiB",
   placeholder: null,
 });
-export const automatic = Config.of({ size: size });
+export const automatic = InputSpec.of({ size: size });
 export const size1 = Value.number({
   name: "Failsafe Chain Size",
   default: 65536,
@@ -32,7 +32,7 @@ export const size1 = Value.number({
   units: "MiB",
   placeholder: null,
 });
-export const manual = Config.of({ size: size1 });
+export const manual = InputSpec.of({ size: size1 });
 export const pruningSettingsVariants = Variants.of({
   disabled: { name: "Disabled", spec: disabled },
   automatic: { name: "Automatic", spec: automatic },
@@ -61,7 +61,7 @@ export class Variants<Type, Store> {
     VariantValues extends {
       [K in string]: {
         name: string
-        spec: Config<any, Store> | Config<any, never>
+        spec: InputSpec<any, Store> | InputSpec<any, never>
       }
     },
     Store = never,
@@ -81,14 +81,17 @@ export class Variants<Type, Store> {
           selection: K
           // prettier-ignore
           value: 
-            VariantValues[K]["spec"] extends (Config<infer B, Store> | Config<infer B, never>) ? B :
+            VariantValues[K]["spec"] extends (InputSpec<infer B, Store> | InputSpec<infer B, never>) ? B :
             never
         }
       }[keyof VariantValues],
       Store
     >(async (options) => {
       const variants = {} as {
-        [K in keyof VariantValues]: { name: string; spec: InputSpec }
+        [K in keyof VariantValues]: {
+          name: string
+          spec: Record<string, ValueSpec>
+        }
       }
       for (const key in a) {
         const value = a[key]
@@ -102,14 +105,14 @@ export class Variants<Type, Store> {
   }
   /**
    * Use this during the times that the input needs a more specific type.
-   * Used in types that the value/ variant/ list/ config is constructed somewhere else.
+   * Used in types that the value/ variant/ list/ inputSpec is constructed somewhere else.
   ```ts
-  const a = Config.text({
+  const a = InputSpec.text({
     name: "a",
     required: false,
   })
 
-  return Config.of<Store>()({
+  return InputSpec.of<Store>()({
     myValue: a.withStore(),
   })
   ```
diff --git a/sdk/base/lib/actions/input/index.ts b/sdk/base/lib/actions/input/index.ts
new file mode 100644
index 000000000..3fc16f585
--- /dev/null
+++ b/sdk/base/lib/actions/input/index.ts
@@ -0,0 +1,3 @@
+export * as constants from "./inputSpecConstants"
+export * as types from "./inputSpecTypes"
+export * as builder from "./builder"
diff --git a/sdk/lib/config/configConstants.ts b/sdk/base/lib/actions/input/inputSpecConstants.ts
similarity index 72%
rename from sdk/lib/config/configConstants.ts
rename to sdk/base/lib/actions/input/inputSpecConstants.ts
index aa0e024c9..3beaefd51 100644
--- a/sdk/lib/config/configConstants.ts
+++ b/sdk/base/lib/actions/input/inputSpecConstants.ts
@@ -1,14 +1,13 @@
-import { SmtpValue } from "../types"
-import { GetSystemSmtp } from "../util/GetSystemSmtp"
-import { email } from "../util/patterns"
-import { Config, ConfigSpecOf } from "./builder/config"
+import { SmtpValue } from "../../types"
+import { GetSystemSmtp, Patterns } from "../../util"
+import { InputSpec, InputSpecOf } from "./builder/inputSpec"
 import { Value } from "./builder/value"
 import { Variants } from "./builder/variants"
 
 /**
  * Base SMTP settings, to be used by StartOS for system wide SMTP
  */
-export const customSmtp = Config.of<ConfigSpecOf<SmtpValue>, never>({
+export const customSmtp = InputSpec.of<InputSpecOf<SmtpValue>, never>({
   server: Value.text({
     name: "SMTP Server",
     required: {
@@ -29,7 +28,7 @@ export const customSmtp = Config.of<ConfigSpecOf<SmtpValue>, never>({
     },
     placeholder: "<name>test@example.com",
     inputmode: "email",
-    patterns: [email],
+    patterns: [Patterns.email],
   }),
   login: Value.text({
     name: "Login",
@@ -45,9 +44,9 @@ export const customSmtp = Config.of<ConfigSpecOf<SmtpValue>, never>({
 })
 
 /**
- * For service config. Gives users 3 options for SMTP: (1) disabled, (2) use system SMTP settings, (3) use custom SMTP settings
+ * For service inputSpec. Gives users 3 options for SMTP: (1) disabled, (2) use system SMTP settings, (3) use custom SMTP settings
  */
-export const smtpConfig = Value.filteredUnion(
+export const smtpInputSpec = Value.filteredUnion(
   async ({ effects }) => {
     const smtp = await new GetSystemSmtp(effects).once()
     return smtp ? [] : ["system"]
@@ -58,10 +57,10 @@ export const smtpConfig = Value.filteredUnion(
     required: { default: "disabled" },
   },
   Variants.of({
-    disabled: { name: "Disabled", spec: Config.of({}) },
+    disabled: { name: "Disabled", spec: InputSpec.of({}) },
     system: {
       name: "System Credentials",
-      spec: Config.of({
+      spec: InputSpec.of({
         customFrom: Value.text({
           name: "Custom From Address",
           description:
@@ -69,7 +68,7 @@ export const smtpConfig = Value.filteredUnion(
           required: false,
           placeholder: "<name>test@example.com",
           inputmode: "email",
-          patterns: [email],
+          patterns: [Patterns.email],
         }),
       }),
     },
diff --git a/sdk/lib/config/configTypes.ts b/sdk/base/lib/actions/input/inputSpecTypes.ts
similarity index 74%
rename from sdk/lib/config/configTypes.ts
rename to sdk/base/lib/actions/input/inputSpecTypes.ts
index 0179e531e..ee9189ae3 100644
--- a/sdk/lib/config/configTypes.ts
+++ b/sdk/base/lib/actions/input/inputSpecTypes.ts
@@ -12,6 +12,7 @@ export type ValueType =
   | "object"
   | "file"
   | "union"
+  | "hidden"
 export type ValueSpec = ValueSpecOf<ValueType>
 /** core spec types. These types provide the metadata for performing validations */
 // prettier-ignore
@@ -28,6 +29,7 @@ export type ValueSpecOf<T extends ValueType> =
   T extends "object" ? ValueSpecObject : 
   T extends "file" ? ValueSpecFile : 
   T extends "union" ? ValueSpecUnion : 
+  T extends "hidden" ? ValueSpecHidden :
   never
 
 export type ValueSpecText = {
@@ -48,7 +50,6 @@ export type ValueSpecText = {
   default: DefaultString | null
   disabled: false | string
   generate: null | RandomString
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 export type ValueSpecTextarea = {
@@ -62,7 +63,6 @@ export type ValueSpecTextarea = {
   maxLength: number | null
   required: boolean
   disabled: false | string
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 
@@ -83,7 +83,6 @@ export type ValueSpecNumber = {
   required: boolean
   default: number | null
   disabled: false | string
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 export type ValueSpecColor = {
@@ -95,7 +94,6 @@ export type ValueSpecColor = {
   required: boolean
   default: string | null
   disabled: false | string
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 export type ValueSpecDatetime = {
@@ -109,7 +107,6 @@ export type ValueSpecDatetime = {
   max: string | null
   default: string | null
   disabled: false | string
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 export type ValueSpecSelect = {
@@ -120,13 +117,7 @@ export type ValueSpecSelect = {
   type: "select"
   required: boolean
   default: string | null
-  /**
-   * Disabled:  false means that there is nothing disabled, good to modify
-   *           string means that this is the message displayed and the whole thing is disabled
-   *           string[] means that the options are disabled
-   */
   disabled: false | string | string[]
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 export type ValueSpecMultiselect = {
@@ -139,14 +130,8 @@ export type ValueSpecMultiselect = {
   type: "multiselect"
   minLength: number | null
   maxLength: number | null
-  /**
-   * Disabled:  false means that there is nothing disabled, good to modify
-   *           string means that this is the message displayed and the whole thing is disabled
-   *           string[] means that the options are disabled
-   */
   disabled: false | string | string[]
   default: string[]
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 export type ValueSpecToggle = {
@@ -157,7 +142,6 @@ export type ValueSpecToggle = {
   type: "toggle"
   default: boolean | null
   disabled: false | string
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 export type ValueSpecUnion = {
@@ -173,15 +157,9 @@ export type ValueSpecUnion = {
       spec: InputSpec
     }
   >
-  /**
-   * Disabled:  false means that there is nothing disabled, good to modify
-   *           string means that this is the message displayed and the whole thing is disabled
-   *           string[] means that the options are disabled
-   */
   disabled: false | string | string[]
   required: boolean
   default: string | null
-  /** Immutable means it can only be configured at the first config then never again */
   immutable: boolean
 }
 export type ValueSpecFile = {
@@ -199,14 +177,15 @@ export type ValueSpecObject = {
   type: "object"
   spec: InputSpec
 }
+export type ValueSpecHidden = {
+  type: "hidden"
+}
 export type ListValueSpecType = "text" | "object"
-/** represents a spec for the values of a list */
 // prettier-ignore
 export type ListValueSpecOf<T extends ListValueSpecType> = 
   T extends "text" ? ListValueSpecText :
   T extends "object" ? ListValueSpecObject :
   never
-/** represents a spec for a list */
 export type ValueSpecList = ValueSpecListOf<ListValueSpecType>
 export type ValueSpecListOf<T extends ListValueSpecType> = {
   name: string
@@ -242,13 +221,13 @@ export type ListValueSpecText = {
 }
 export type ListValueSpecObject = {
   type: "object"
-  /** this is a mapped type of the config object at this level, replacing the object's values with specs on those values */
   spec: InputSpec
-  /** indicates whether duplicates can be permitted in the list */
   uniqueBy: UniqueBy
-  /** this should be a handlebars template which can make use of the entire config which corresponds to 'spec' */
   displayAs: string | null
 }
+// TODO Aiden do we really want this expressivity? Why not the below. Also what's with the "readonly" portion?
+// export type UniqueBy = null | string | { any: string[] } | { all: string[] }
+
 export type UniqueBy =
   | null
   | string
diff --git a/sdk/base/lib/actions/setupActions.ts b/sdk/base/lib/actions/setupActions.ts
new file mode 100644
index 000000000..f78da1f0a
--- /dev/null
+++ b/sdk/base/lib/actions/setupActions.ts
@@ -0,0 +1,152 @@
+import { InputSpec } from "./input/builder"
+import { ExtractInputSpecType } from "./input/builder/inputSpec"
+import * as T from "../types"
+
+export type Run<
+  A extends
+    | Record<string, any>
+    | InputSpec<Record<string, any>, any>
+    | InputSpec<Record<string, never>, never>,
+> = (options: {
+  effects: T.Effects
+  input: ExtractInputSpecType<A> & Record<string, any>
+}) => Promise<T.ActionResult | null>
+export type GetInput<
+  A extends
+    | Record<string, any>
+    | InputSpec<Record<string, any>, any>
+    | InputSpec<Record<string, any>, never>,
+> = (options: {
+  effects: T.Effects
+}) => Promise<null | (ExtractInputSpecType<A> & Record<string, any>)>
+
+export type MaybeFn<T> = T | ((options: { effects: T.Effects }) => Promise<T>)
+function callMaybeFn<T>(
+  maybeFn: MaybeFn<T>,
+  options: { effects: T.Effects },
+): Promise<T> {
+  if (maybeFn instanceof Function) {
+    return maybeFn(options)
+  } else {
+    return Promise.resolve(maybeFn)
+  }
+}
+function mapMaybeFn<T, U>(
+  maybeFn: MaybeFn<T>,
+  map: (value: T) => U,
+): MaybeFn<U> {
+  if (maybeFn instanceof Function) {
+    return async (...args) => map(await maybeFn(...args))
+  } else {
+    return map(maybeFn)
+  }
+}
+
+export class Action<
+  Id extends T.ActionId,
+  Store,
+  InputSpecType extends
+    | Record<string, any>
+    | InputSpec<any, Store>
+    | InputSpec<any, never>,
+  Type extends
+    ExtractInputSpecType<InputSpecType> = ExtractInputSpecType<InputSpecType>,
+> {
+  private constructor(
+    readonly id: Id,
+    private readonly metadataFn: MaybeFn<T.ActionMetadata>,
+    private readonly inputSpec: InputSpecType,
+    private readonly getInputFn: GetInput<Type>,
+    private readonly runFn: Run<Type>,
+  ) {}
+  static withInput<
+    Id extends T.ActionId,
+    Store,
+    InputSpecType extends
+      | Record<string, any>
+      | InputSpec<any, Store>
+      | InputSpec<any, never>,
+    Type extends
+      ExtractInputSpecType<InputSpecType> = ExtractInputSpecType<InputSpecType>,
+  >(
+    id: Id,
+    metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
+    inputSpec: InputSpecType,
+    getInput: GetInput<Type>,
+    run: Run<Type>,
+  ): Action<Id, Store, InputSpecType, Type> {
+    return new Action(
+      id,
+      mapMaybeFn(metadata, (m) => ({ ...m, hasInput: true })),
+      inputSpec,
+      getInput,
+      run,
+    )
+  }
+  static withoutInput<Id extends T.ActionId, Store>(
+    id: Id,
+    metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
+    run: Run<{}>,
+  ): Action<Id, Store, {}, {}> {
+    return new Action(
+      id,
+      mapMaybeFn(metadata, (m) => ({ ...m, hasInput: true })),
+      {},
+      async () => null,
+      run,
+    )
+  }
+  async exportMetadata(options: {
+    effects: T.Effects
+  }): Promise<T.ActionMetadata> {
+    const metadata = await callMaybeFn(this.metadataFn, options)
+    await options.effects.action.export({ id: this.id, metadata })
+    return metadata
+  }
+  async getInput(options: { effects: T.Effects }): Promise<T.ActionInput> {
+    return {
+      spec: await this.inputSpec.build(options),
+      value: (await this.getInputFn(options)) || null,
+    }
+  }
+  async run(options: {
+    effects: T.Effects
+    input: Type
+  }): Promise<T.ActionResult | null> {
+    return this.runFn(options)
+  }
+}
+
+export class Actions<
+  Store,
+  AllActions extends Record<T.ActionId, Action<T.ActionId, Store, any, any>>,
+> {
+  private constructor(private readonly actions: AllActions) {}
+  static of<Store>(): Actions<Store, {}> {
+    return new Actions({})
+  }
+  addAction<A extends Action<T.ActionId, Store, any, any>>(
+    action: A,
+  ): Actions<Store, AllActions & { [id in A["id"]]: A }> {
+    return new Actions({ ...this.actions, [action.id]: action })
+  }
+  update(options: { effects: T.Effects }): Promise<void> {
+    const updater = async (options: { effects: T.Effects }) => {
+      for (let action of Object.values(this.actions)) {
+        await action.exportMetadata(options)
+      }
+      await options.effects.action.clear({ except: Object.keys(this.actions) })
+    }
+    const updaterCtx = { options }
+    updaterCtx.options = {
+      effects: {
+        ...options.effects,
+        constRetry: () => updater(updaterCtx.options),
+      },
+    }
+    return updater(updaterCtx.options)
+  }
+  get<Id extends T.ActionId>(actionId: Id): AllActions[Id] {
+    return this.actions[actionId]
+  }
+}
diff --git a/sdk/base/lib/backup/Backups.ts b/sdk/base/lib/backup/Backups.ts
new file mode 100644
index 000000000..3e644014a
--- /dev/null
+++ b/sdk/base/lib/backup/Backups.ts
@@ -0,0 +1,208 @@
+import * as T from "../types"
+import * as child_process from "child_process"
+import { asError } from "../util"
+
+export const DEFAULT_OPTIONS: T.SyncOptions = {
+  delete: true,
+  exclude: [],
+}
+export type BackupSync<Volumes extends string> = {
+  dataPath: `/media/startos/volumes/${Volumes}/${string}`
+  backupPath: `/media/startos/backup/${string}`
+  options?: Partial<T.SyncOptions>
+  backupOptions?: Partial<T.SyncOptions>
+  restoreOptions?: Partial<T.SyncOptions>
+}
+/**
+ * This utility simplifies the volume backup process.
+ * ```ts
+ * export const { createBackup, restoreBackup } = Backups.volumes("main").build();
+ * ```
+ *
+ * Changing the options of the rsync, (ie excludes) use either
+ * ```ts
+ *  Backups.volumes("main").set_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
+ * // or
+ *  Backups.with_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
+ * ```
+ *
+ * Using the more fine control, using the addSets for more control
+ * ```ts
+ * Backups.addSets({
+ * srcVolume: 'main', srcPath:'smallData/', dstPath: 'main/smallData/', dstVolume: : Backups.BACKUP
+ * }, {
+ * srcVolume: 'main', srcPath:'bigData/', dstPath: 'main/bigData/', dstVolume: : Backups.BACKUP, options: {exclude:['bigData/excludeThis']}}
+ * ).build()q
+ * ```
+ */
+export class Backups<M extends T.Manifest> {
+  private constructor(
+    private options = DEFAULT_OPTIONS,
+    private restoreOptions: Partial<T.SyncOptions> = {},
+    private backupOptions: Partial<T.SyncOptions> = {},
+    private backupSet = [] as BackupSync<M["volumes"][number]>[],
+  ) {}
+
+  static withVolumes<M extends T.Manifest = never>(
+    ...volumeNames: Array<M["volumes"][number]>
+  ): Backups<M> {
+    return Backups.withSyncs(
+      ...volumeNames.map((srcVolume) => ({
+        dataPath: `/media/startos/volumes/${srcVolume}/` as const,
+        backupPath: `/media/startos/backup/${srcVolume}/` as const,
+      })),
+    )
+  }
+
+  static withSyncs<M extends T.Manifest = never>(
+    ...syncs: BackupSync<M["volumes"][number]>[]
+  ) {
+    return syncs.reduce((acc, x) => acc.addSync(x), new Backups<M>())
+  }
+
+  static withOptions<M extends T.Manifest = never>(
+    options?: Partial<T.SyncOptions>,
+  ) {
+    return new Backups<M>({ ...DEFAULT_OPTIONS, ...options })
+  }
+
+  setOptions(options?: Partial<T.SyncOptions>) {
+    this.options = {
+      ...this.options,
+      ...options,
+    }
+    return this
+  }
+
+  setBackupOptions(options?: Partial<T.SyncOptions>) {
+    this.backupOptions = {
+      ...this.backupOptions,
+      ...options,
+    }
+    return this
+  }
+
+  setRestoreOptions(options?: Partial<T.SyncOptions>) {
+    this.restoreOptions = {
+      ...this.restoreOptions,
+      ...options,
+    }
+    return this
+  }
+
+  addVolume(
+    volume: M["volumes"][number],
+    options?: Partial<{
+      options: T.SyncOptions
+      backupOptions: T.SyncOptions
+      restoreOptions: T.SyncOptions
+    }>,
+  ) {
+    return this.addSync({
+      dataPath: `/media/startos/volumes/${volume}/` as const,
+      backupPath: `/media/startos/backup/${volume}/` as const,
+      ...options,
+    })
+  }
+  addSync(sync: BackupSync<M["volumes"][0]>) {
+    this.backupSet.push({
+      ...sync,
+      options: { ...this.options, ...sync.options },
+    })
+    return this
+  }
+
+  async createBackup() {
+    for (const item of this.backupSet) {
+      const rsyncResults = await runRsync({
+        srcPath: item.dataPath,
+        dstPath: item.backupPath,
+        options: {
+          ...this.options,
+          ...this.backupOptions,
+          ...item.options,
+          ...item.backupOptions,
+        },
+      })
+      await rsyncResults.wait()
+    }
+    return
+  }
+
+  async restoreBackup() {
+    for (const item of this.backupSet) {
+      const rsyncResults = await runRsync({
+        srcPath: item.backupPath,
+        dstPath: item.dataPath,
+        options: {
+          ...this.options,
+          ...this.backupOptions,
+          ...item.options,
+          ...item.backupOptions,
+        },
+      })
+      await rsyncResults.wait()
+    }
+    return
+  }
+}
+
+async function runRsync(rsyncOptions: {
+  srcPath: string
+  dstPath: string
+  options: T.SyncOptions
+}): Promise<{
+  id: () => Promise<string>
+  wait: () => Promise<null>
+  progress: () => Promise<number>
+}> {
+  const { srcPath, dstPath, options } = rsyncOptions
+
+  const command = "rsync"
+  const args: string[] = []
+  if (options.delete) {
+    args.push("--delete")
+  }
+  for (const exclude of options.exclude) {
+    args.push(`--exclude=${exclude}`)
+  }
+  args.push("-actAXH")
+  args.push("--info=progress2")
+  args.push("--no-inc-recursive")
+  args.push(srcPath)
+  args.push(dstPath)
+  const spawned = child_process.spawn(command, args, { detached: true })
+  let percentage = 0.0
+  spawned.stdout.on("data", (data: unknown) => {
+    const lines = String(data).replace("\r", "\n").split("\n")
+    for (const line of lines) {
+      const parsed = /$([0-9.]+)%/.exec(line)?.[1]
+      if (!parsed) continue
+      percentage = Number.parseFloat(parsed)
+    }
+  })
+
+  spawned.stderr.on("data", (data: unknown) => {
+    console.error(`Backups.runAsync`, asError(data))
+  })
+
+  const id = async () => {
+    const pid = spawned.pid
+    if (pid === undefined) {
+      throw new Error("rsync process has no pid")
+    }
+    return String(pid)
+  }
+  const waitPromise = new Promise<null>((resolve, reject) => {
+    spawned.on("exit", (code: any) => {
+      if (code === 0) {
+        resolve(null)
+      } else {
+        reject(new Error(`rsync exited with code ${code}`))
+      }
+    })
+  })
+  const wait = () => waitPromise
+  const progress = () => Promise.resolve(percentage)
+  return { id, wait, progress }
+}
diff --git a/sdk/base/lib/backup/setupBackups.ts b/sdk/base/lib/backup/setupBackups.ts
new file mode 100644
index 000000000..b41a61f42
--- /dev/null
+++ b/sdk/base/lib/backup/setupBackups.ts
@@ -0,0 +1,39 @@
+import { Backups } from "./Backups"
+import * as T from "../types"
+import { _ } from "../util"
+
+export type SetupBackupsParams<M extends T.Manifest> =
+  | M["volumes"][number][]
+  | ((_: { effects: T.Effects }) => Promise<Backups<M>>)
+
+type SetupBackupsRes = {
+  createBackup: T.ExpectedExports.createBackup
+  restoreBackup: T.ExpectedExports.restoreBackup
+}
+
+export function setupBackups<M extends T.Manifest>(
+  options: SetupBackupsParams<M>,
+) {
+  let backupsFactory: (_: { effects: T.Effects }) => Promise<Backups<M>>
+  if (options instanceof Function) {
+    backupsFactory = options
+  } else {
+    backupsFactory = async () => Backups.withVolumes(...options)
+  }
+  const answer: {
+    createBackup: T.ExpectedExports.createBackup
+    restoreBackup: T.ExpectedExports.restoreBackup
+  } = {
+    get createBackup() {
+      return (async (options) => {
+        return (await backupsFactory(options)).createBackup()
+      }) as T.ExpectedExports.createBackup
+    },
+    get restoreBackup() {
+      return (async (options) => {
+        return (await backupsFactory(options)).restoreBackup()
+      }) as T.ExpectedExports.restoreBackup
+    },
+  }
+  return answer
+}
diff --git a/sdk/base/lib/dependencies/Dependency.ts b/sdk/base/lib/dependencies/Dependency.ts
new file mode 100644
index 000000000..8a1a862c7
--- /dev/null
+++ b/sdk/base/lib/dependencies/Dependency.ts
@@ -0,0 +1,21 @@
+import { VersionRange } from "../exver"
+
+export class Dependency {
+  constructor(
+    readonly data:
+      | {
+          /** Either "running" or "exists". Does the dependency need to be running, or does it only need to exist? */
+          type: "running"
+          /** The acceptable version range of the dependency. */
+          versionRange: VersionRange
+          /** A list of the dependency's health check IDs that must be passing for the service to be satisfied. */
+          healthChecks: string[]
+        }
+      | {
+          /** Either "running" or "exists". Does the dependency need to be running, or does it only need to exist? */
+          type: "exists"
+          /** The acceptable version range of the dependency. */
+          versionRange: VersionRange
+        },
+  ) {}
+}
diff --git a/sdk/lib/dependencies/dependencies.ts b/sdk/base/lib/dependencies/dependencies.ts
similarity index 89%
rename from sdk/lib/dependencies/dependencies.ts
rename to sdk/base/lib/dependencies/dependencies.ts
index 287f63b06..fd3c6bb69 100644
--- a/sdk/lib/dependencies/dependencies.ts
+++ b/sdk/base/lib/dependencies/dependencies.ts
@@ -1,18 +1,12 @@
 import { ExtendedVersion, VersionRange } from "../exver"
-import {
-  Effects,
-  PackageId,
-  DependencyRequirement,
-  SetHealth,
-  CheckDependenciesResult,
-  HealthCheckId,
-} from "../types"
+import { PackageId, HealthCheckId } from "../types"
+import { Effects } from "../Effects"
 
 export type CheckDependencies<DependencyId extends PackageId = PackageId> = {
   installedSatisfied: (packageId: DependencyId) => boolean
   installedVersionSatisfied: (packageId: DependencyId) => boolean
   runningSatisfied: (packageId: DependencyId) => boolean
-  configSatisfied: (packageId: DependencyId) => boolean
+  actionsSatisfied: (packageId: DependencyId) => boolean
   healthCheckSatisfied: (
     packageId: DependencyId,
     healthCheckId: HealthCheckId,
@@ -22,7 +16,7 @@ export type CheckDependencies<DependencyId extends PackageId = PackageId> = {
   throwIfInstalledNotSatisfied: (packageId: DependencyId) => void
   throwIfInstalledVersionNotSatisfied: (packageId: DependencyId) => void
   throwIfRunningNotSatisfied: (packageId: DependencyId) => void
-  throwIfConfigNotSatisfied: (packageId: DependencyId) => void
+  throwIfActionsNotSatisfied: (packageId: DependencyId) => void
   throwIfHealthNotSatisfied: (
     packageId: DependencyId,
     healthCheckId?: HealthCheckId,
@@ -71,8 +65,8 @@ export async function checkDependencies<
     const dep = find(packageId)
     return dep.requirement.kind !== "running" || dep.result.isRunning
   }
-  const configSatisfied = (packageId: DependencyId) =>
-    find(packageId).result.configSatisfied
+  const actionsSatisfied = (packageId: DependencyId) =>
+    Object.keys(find(packageId).result.requestedActions).length === 0
   const healthCheckSatisfied = (
     packageId: DependencyId,
     healthCheckId?: HealthCheckId,
@@ -94,7 +88,7 @@ export async function checkDependencies<
     installedSatisfied(packageId) &&
     installedVersionSatisfied(packageId) &&
     runningSatisfied(packageId) &&
-    configSatisfied(packageId) &&
+    actionsSatisfied(packageId) &&
     healthCheckSatisfied(packageId)
   const satisfied = (packageId?: DependencyId) =>
     packageId
@@ -130,11 +124,12 @@ export async function checkDependencies<
       throw new Error(`${dep.result.title || packageId} is not running`)
     }
   }
-  const throwIfConfigNotSatisfied = (packageId: DependencyId) => {
+  const throwIfActionsNotSatisfied = (packageId: DependencyId) => {
     const dep = find(packageId)
-    if (!dep.result.configSatisfied) {
+    const reqs = Object.keys(dep.result.requestedActions)
+    if (reqs.length) {
       throw new Error(
-        `${dep.result.title || packageId}'s configuration does not satisfy requirements`,
+        `The following action requests have not been fulfilled: ${reqs.join(", ")}`,
       )
     }
   }
@@ -168,7 +163,7 @@ export async function checkDependencies<
     throwIfInstalledNotSatisfied(packageId)
     throwIfInstalledVersionNotSatisfied(packageId)
     throwIfRunningNotSatisfied(packageId)
-    throwIfConfigNotSatisfied(packageId)
+    throwIfActionsNotSatisfied(packageId)
     throwIfHealthNotSatisfied(packageId)
   }
   const throwIfNotSatisfied = (packageId?: DependencyId) =>
@@ -193,13 +188,13 @@ export async function checkDependencies<
     installedSatisfied,
     installedVersionSatisfied,
     runningSatisfied,
-    configSatisfied,
+    actionsSatisfied,
     healthCheckSatisfied,
     satisfied,
     throwIfInstalledNotSatisfied,
     throwIfInstalledVersionNotSatisfied,
     throwIfRunningNotSatisfied,
-    throwIfConfigNotSatisfied,
+    throwIfActionsNotSatisfied,
     throwIfHealthNotSatisfied,
     throwIfNotSatisfied,
   }
diff --git a/sdk/lib/dependencies/index.ts b/sdk/base/lib/dependencies/index.ts
similarity index 78%
rename from sdk/lib/dependencies/index.ts
rename to sdk/base/lib/dependencies/index.ts
index 3fe78b4f3..09e2b33ad 100644
--- a/sdk/lib/dependencies/index.ts
+++ b/sdk/base/lib/dependencies/index.ts
@@ -4,6 +4,3 @@ export type ReadonlyDeep<A> =
     A extends {} ? { readonly [K in keyof A]: ReadonlyDeep<A[K]> } : A;
 export type MaybePromise<A> = Promise<A> | A
 export type Message = string
-
-import "./DependencyConfig"
-import "./setupDependencyConfig"
diff --git a/sdk/base/lib/dependencies/setupDependencies.ts b/sdk/base/lib/dependencies/setupDependencies.ts
new file mode 100644
index 000000000..0f9bd6da8
--- /dev/null
+++ b/sdk/base/lib/dependencies/setupDependencies.ts
@@ -0,0 +1,56 @@
+import * as T from "../types"
+import { Dependency } from "./Dependency"
+
+type DependencyType<Manifest extends T.Manifest> = {
+  [K in keyof {
+    [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false
+      ? K
+      : never
+  }]: Dependency
+} & {
+  [K in keyof {
+    [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends true
+      ? K
+      : never
+  }]?: Dependency
+}
+
+export function setupDependencies<Manifest extends T.Manifest>(
+  fn: (options: { effects: T.Effects }) => Promise<DependencyType<Manifest>>,
+): (options: { effects: T.Effects }) => Promise<void> {
+  return (options: { effects: T.Effects }) => {
+    const updater = async (options: { effects: T.Effects }) => {
+      const dependencyType = await fn(options)
+      return await options.effects.setDependencies({
+        dependencies: Object.entries(dependencyType).map(
+          ([
+            id,
+            {
+              data: { versionRange, ...x },
+            },
+          ]) => ({
+            id,
+            ...x,
+            ...(x.type === "running"
+              ? {
+                  kind: "running",
+                  healthChecks: x.healthChecks,
+                }
+              : {
+                  kind: "exists",
+                }),
+            versionRange: versionRange.toString(),
+          }),
+        ),
+      })
+    }
+    const updaterCtx = { options }
+    updaterCtx.options = {
+      effects: {
+        ...options.effects,
+        constRetry: () => updater(updaterCtx.options),
+      },
+    }
+    return updater(updaterCtx.options)
+  }
+}
diff --git a/sdk/lib/exver/exver.pegjs b/sdk/base/lib/exver/exver.pegjs
similarity index 100%
rename from sdk/lib/exver/exver.pegjs
rename to sdk/base/lib/exver/exver.pegjs
diff --git a/sdk/lib/exver/exver.ts b/sdk/base/lib/exver/exver.ts
similarity index 100%
rename from sdk/lib/exver/exver.ts
rename to sdk/base/lib/exver/exver.ts
diff --git a/sdk/lib/exver/index.ts b/sdk/base/lib/exver/index.ts
similarity index 100%
rename from sdk/lib/exver/index.ts
rename to sdk/base/lib/exver/index.ts
diff --git a/sdk/lib/index.browser.ts b/sdk/base/lib/index.ts
similarity index 51%
rename from sdk/lib/index.browser.ts
rename to sdk/base/lib/index.ts
index f7d645133..0aa8e4758 100644
--- a/sdk/lib/index.browser.ts
+++ b/sdk/base/lib/index.ts
@@ -1,13 +1,12 @@
 export { S9pk } from "./s9pk"
 export { VersionRange, ExtendedVersion, Version } from "./exver"
 
-export * as config from "./config"
-export * as CB from "./config/builder"
-export * as CT from "./config/configTypes"
-export * as dependencyConfig from "./dependencies"
+export * as inputSpec from "./actions/input"
+export * as ISB from "./actions/input/builder"
+export * as IST from "./actions/input/inputSpecTypes"
 export * as types from "./types"
 export * as T from "./types"
 export * as yaml from "yaml"
 export * as matches from "ts-matches"
 
-export * as utils from "./util/index.browser"
+export * as utils from "./util"
diff --git a/sdk/lib/interfaces/AddressReceipt.ts b/sdk/base/lib/interfaces/AddressReceipt.ts
similarity index 100%
rename from sdk/lib/interfaces/AddressReceipt.ts
rename to sdk/base/lib/interfaces/AddressReceipt.ts
diff --git a/sdk/lib/interfaces/Host.ts b/sdk/base/lib/interfaces/Host.ts
similarity index 82%
rename from sdk/lib/interfaces/Host.ts
rename to sdk/base/lib/interfaces/Host.ts
index aa27a289c..b90dc1c60 100644
--- a/sdk/lib/interfaces/Host.ts
+++ b/sdk/base/lib/interfaces/Host.ts
@@ -1,10 +1,10 @@
-import { number, object, string } from "ts-matches"
-import { Effects } from "../types"
+import { object, string } from "ts-matches"
+import { Effects } from "../Effects"
 import { Origin } from "./Origin"
-import { AddSslOptions, BindParams } from ".././osBindings"
-import { Security } from ".././osBindings"
-import { BindOptions } from ".././osBindings"
-import { AlpnInfo } from ".././osBindings"
+import { AddSslOptions, BindParams } from "../osBindings"
+import { Security } from "../osBindings"
+import { BindOptions } from "../osBindings"
+import { AlpnInfo } from "../osBindings"
 
 export { AddSslOptions, Security, BindOptions }
 
@@ -94,6 +94,22 @@ export class Host {
     },
   ) {}
 
+  /**
+   * @description Use this function to bind the host to an internal port and configured options for protocol, security, and external port.
+   *
+   * @param internalPort - The internal port to be bound.
+   * @param options - The protocol options for this binding.
+   * @returns A multi-origin that is capable of exporting one or more service interfaces.
+   * @example
+   * In this example, we bind a previously created multi-host to port 80, then select the http protocol and request an external port of 8332.
+   *
+   * ```
+    const uiMultiOrigin = await uiMulti.bindPort(80, {
+      protocol: 'http',
+      preferredExternalPort: 8332,
+    })
+   * ```
+   */
   async bindPort(
     internalPort: number,
     options: BindOptionsByProtocol,
diff --git a/sdk/lib/interfaces/Origin.ts b/sdk/base/lib/interfaces/Origin.ts
similarity index 89%
rename from sdk/lib/interfaces/Origin.ts
rename to sdk/base/lib/interfaces/Origin.ts
index cc84728ec..5e12713e6 100644
--- a/sdk/lib/interfaces/Origin.ts
+++ b/sdk/base/lib/interfaces/Origin.ts
@@ -1,6 +1,6 @@
 import { AddressInfo } from "../types"
 import { AddressReceipt } from "./AddressReceipt"
-import { Host, BindOptions, Scheme } from "./Host"
+import { Host, Scheme } from "./Host"
 import { ServiceInterfaceBuilder } from "./ServiceInterfaceBuilder"
 
 export class Origin<T extends Host> {
@@ -31,9 +31,9 @@ export class Origin<T extends Host> {
   }
 
   /**
-   * A function to register a group of origins (<PROTOCOL> :// <HOSTNAME> : <PORT>) with StartOS
+   * @description A function to register a group of origins (<PROTOCOL> :// <HOSTNAME> : <PORT>) with StartOS
    *
-   * The returned addressReceipt serves as proof that the addresses were registered
+   *   The returned addressReceipt serves as proof that the addresses were registered
    *
    * @param addressInfo
    * @returns
diff --git a/sdk/lib/interfaces/ServiceInterfaceBuilder.ts b/sdk/base/lib/interfaces/ServiceInterfaceBuilder.ts
similarity index 90%
rename from sdk/lib/interfaces/ServiceInterfaceBuilder.ts
rename to sdk/base/lib/interfaces/ServiceInterfaceBuilder.ts
index 49d8020d6..4ef294b4f 100644
--- a/sdk/lib/interfaces/ServiceInterfaceBuilder.ts
+++ b/sdk/base/lib/interfaces/ServiceInterfaceBuilder.ts
@@ -1,5 +1,5 @@
-import { ServiceInterfaceType } from "../StartSdk"
-import { Effects } from "../types"
+import { ServiceInterfaceType } from "../types"
+import { Effects } from "../Effects"
 import { Scheme } from "./Host"
 
 /**
diff --git a/sdk/lib/interfaces/interfaceReceipt.ts b/sdk/base/lib/interfaces/interfaceReceipt.ts
similarity index 100%
rename from sdk/lib/interfaces/interfaceReceipt.ts
rename to sdk/base/lib/interfaces/interfaceReceipt.ts
diff --git a/sdk/base/lib/interfaces/setupInterfaces.ts b/sdk/base/lib/interfaces/setupInterfaces.ts
new file mode 100644
index 000000000..474841aa3
--- /dev/null
+++ b/sdk/base/lib/interfaces/setupInterfaces.ts
@@ -0,0 +1,54 @@
+import * as T from "../types"
+import { AddressReceipt } from "./AddressReceipt"
+
+declare const UpdateServiceInterfacesProof: unique symbol
+export type UpdateServiceInterfacesReceipt = {
+  [UpdateServiceInterfacesProof]: never
+}
+
+export type ServiceInterfacesReceipt = Array<T.AddressInfo[] & AddressReceipt>
+export type SetServiceInterfaces<Output extends ServiceInterfacesReceipt> =
+  (opts: { effects: T.Effects }) => Promise<Output>
+export type UpdateServiceInterfaces<Output extends ServiceInterfacesReceipt> =
+  (opts: {
+    effects: T.Effects
+  }) => Promise<Output & UpdateServiceInterfacesReceipt>
+export type SetupServiceInterfaces = <Output extends ServiceInterfacesReceipt>(
+  fn: SetServiceInterfaces<Output>,
+) => UpdateServiceInterfaces<Output>
+export const NO_INTERFACE_CHANGES = {} as UpdateServiceInterfacesReceipt
+export const setupServiceInterfaces: SetupServiceInterfaces = <
+  Output extends ServiceInterfacesReceipt,
+>(
+  fn: SetServiceInterfaces<Output>,
+) =>
+  ((options: { effects: T.Effects }) => {
+    const updater = async (options: { effects: T.Effects }) => {
+      const bindings: T.BindId[] = []
+      const interfaces: T.ServiceInterfaceId[] = []
+      const res = await fn({
+        effects: {
+          ...options.effects,
+          bind: (params: T.BindParams) => {
+            bindings.push({ id: params.id, internalPort: params.internalPort })
+            return options.effects.bind(params)
+          },
+          exportServiceInterface: (params: T.ExportServiceInterfaceParams) => {
+            interfaces.push(params.id)
+            return options.effects.exportServiceInterface(params)
+          },
+        },
+      })
+      await options.effects.clearBindings({ except: bindings })
+      await options.effects.clearServiceInterfaces({ except: interfaces })
+      return res
+    }
+    const updaterCtx = { options }
+    updaterCtx.options = {
+      effects: {
+        ...options.effects,
+        constRetry: () => updater(updaterCtx.options),
+      },
+    }
+    return updater(updaterCtx.options)
+  }) as UpdateServiceInterfaces<Output>
diff --git a/sdk/lib/osBindings/AcceptSigners.ts b/sdk/base/lib/osBindings/AcceptSigners.ts
similarity index 100%
rename from sdk/lib/osBindings/AcceptSigners.ts
rename to sdk/base/lib/osBindings/AcceptSigners.ts
diff --git a/sdk/lib/osBindings/ActionId.ts b/sdk/base/lib/osBindings/ActionId.ts
similarity index 100%
rename from sdk/lib/osBindings/ActionId.ts
rename to sdk/base/lib/osBindings/ActionId.ts
diff --git a/sdk/lib/osBindings/Status.ts b/sdk/base/lib/osBindings/ActionInput.ts
similarity index 50%
rename from sdk/lib/osBindings/Status.ts
rename to sdk/base/lib/osBindings/ActionInput.ts
index b784f4d6a..a19a5f1a4 100644
--- a/sdk/lib/osBindings/Status.ts
+++ b/sdk/base/lib/osBindings/ActionInput.ts
@@ -1,4 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { MainStatus } from "./MainStatus"
 
-export type Status = { configured: boolean; main: MainStatus }
+export type ActionInput = {
+  spec: Record<string, unknown>
+  value: Record<string, unknown> | null
+}
diff --git a/sdk/lib/osBindings/ActionMetadata.ts b/sdk/base/lib/osBindings/ActionMetadata.ts
similarity index 74%
rename from sdk/lib/osBindings/ActionMetadata.ts
rename to sdk/base/lib/osBindings/ActionMetadata.ts
index b103b82b0..ade129fd4 100644
--- a/sdk/lib/osBindings/ActionMetadata.ts
+++ b/sdk/base/lib/osBindings/ActionMetadata.ts
@@ -1,12 +1,13 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionVisibility } from "./ActionVisibility"
 import type { AllowedStatuses } from "./AllowedStatuses"
 
 export type ActionMetadata = {
   name: string
   description: string
   warning: string | null
-  input: any
-  disabled: boolean
+  visibility: ActionVisibility
   allowedStatuses: AllowedStatuses
+  hasInput: boolean
   group: string | null
 }
diff --git a/sdk/base/lib/osBindings/ActionRequest.ts b/sdk/base/lib/osBindings/ActionRequest.ts
new file mode 100644
index 000000000..63b5607d8
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionRequest.ts
@@ -0,0 +1,13 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId"
+import type { ActionRequestInput } from "./ActionRequestInput"
+import type { ActionRequestTrigger } from "./ActionRequestTrigger"
+import type { PackageId } from "./PackageId"
+
+export type ActionRequest = {
+  packageId: PackageId
+  actionId: ActionId
+  description?: string
+  when?: ActionRequestTrigger
+  input?: ActionRequestInput
+}
diff --git a/sdk/lib/osBindings/AllowedStatuses.ts b/sdk/base/lib/osBindings/ActionRequestCondition.ts
similarity index 61%
rename from sdk/lib/osBindings/AllowedStatuses.ts
rename to sdk/base/lib/osBindings/ActionRequestCondition.ts
index 960187fd9..0f06caf3c 100644
--- a/sdk/lib/osBindings/AllowedStatuses.ts
+++ b/sdk/base/lib/osBindings/ActionRequestCondition.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AllowedStatuses = "onlyRunning" | "onlyStopped" | "any"
+export type ActionRequestCondition = "input-not-matches"
diff --git a/sdk/base/lib/osBindings/ActionRequestEntry.ts b/sdk/base/lib/osBindings/ActionRequestEntry.ts
new file mode 100644
index 000000000..0e716abe4
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionRequestEntry.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionRequest } from "./ActionRequest"
+
+export type ActionRequestEntry = { request: ActionRequest; active: boolean }
diff --git a/sdk/base/lib/osBindings/ActionRequestInput.ts b/sdk/base/lib/osBindings/ActionRequestInput.ts
new file mode 100644
index 000000000..a1cde7789
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionRequestInput.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ActionRequestInput = {
+  kind: "partial"
+  value: Record<string, unknown>
+}
diff --git a/sdk/base/lib/osBindings/ActionRequestTrigger.ts b/sdk/base/lib/osBindings/ActionRequestTrigger.ts
new file mode 100644
index 000000000..ebd0963e5
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionRequestTrigger.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionRequestCondition } from "./ActionRequestCondition"
+
+export type ActionRequestTrigger = {
+  once: boolean
+  condition: ActionRequestCondition
+}
diff --git a/sdk/base/lib/osBindings/ActionVisibility.ts b/sdk/base/lib/osBindings/ActionVisibility.ts
new file mode 100644
index 000000000..f7d5a2a2a
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionVisibility.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ActionVisibility =
+  | "hidden"
+  | { disabled: { reason: string } }
+  | "enabled"
diff --git a/sdk/lib/osBindings/AddAdminParams.ts b/sdk/base/lib/osBindings/AddAdminParams.ts
similarity index 100%
rename from sdk/lib/osBindings/AddAdminParams.ts
rename to sdk/base/lib/osBindings/AddAdminParams.ts
diff --git a/sdk/lib/osBindings/AddAssetParams.ts b/sdk/base/lib/osBindings/AddAssetParams.ts
similarity index 100%
rename from sdk/lib/osBindings/AddAssetParams.ts
rename to sdk/base/lib/osBindings/AddAssetParams.ts
diff --git a/sdk/lib/osBindings/AddPackageParams.ts b/sdk/base/lib/osBindings/AddPackageParams.ts
similarity index 100%
rename from sdk/lib/osBindings/AddPackageParams.ts
rename to sdk/base/lib/osBindings/AddPackageParams.ts
diff --git a/sdk/lib/osBindings/AddSslOptions.ts b/sdk/base/lib/osBindings/AddSslOptions.ts
similarity index 100%
rename from sdk/lib/osBindings/AddSslOptions.ts
rename to sdk/base/lib/osBindings/AddSslOptions.ts
diff --git a/sdk/lib/osBindings/AddVersionParams.ts b/sdk/base/lib/osBindings/AddVersionParams.ts
similarity index 100%
rename from sdk/lib/osBindings/AddVersionParams.ts
rename to sdk/base/lib/osBindings/AddVersionParams.ts
diff --git a/sdk/lib/osBindings/AddressInfo.ts b/sdk/base/lib/osBindings/AddressInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/AddressInfo.ts
rename to sdk/base/lib/osBindings/AddressInfo.ts
diff --git a/sdk/lib/osBindings/Alerts.ts b/sdk/base/lib/osBindings/Alerts.ts
similarity index 100%
rename from sdk/lib/osBindings/Alerts.ts
rename to sdk/base/lib/osBindings/Alerts.ts
diff --git a/sdk/lib/osBindings/Algorithm.ts b/sdk/base/lib/osBindings/Algorithm.ts
similarity index 100%
rename from sdk/lib/osBindings/Algorithm.ts
rename to sdk/base/lib/osBindings/Algorithm.ts
diff --git a/sdk/lib/osBindings/AllPackageData.ts b/sdk/base/lib/osBindings/AllPackageData.ts
similarity index 100%
rename from sdk/lib/osBindings/AllPackageData.ts
rename to sdk/base/lib/osBindings/AllPackageData.ts
diff --git a/sdk/base/lib/osBindings/AllowedStatuses.ts b/sdk/base/lib/osBindings/AllowedStatuses.ts
new file mode 100644
index 000000000..ed5851495
--- /dev/null
+++ b/sdk/base/lib/osBindings/AllowedStatuses.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AllowedStatuses = "only-running" | "only-stopped" | "any"
diff --git a/sdk/lib/osBindings/AlpnInfo.ts b/sdk/base/lib/osBindings/AlpnInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/AlpnInfo.ts
rename to sdk/base/lib/osBindings/AlpnInfo.ts
diff --git a/sdk/lib/osBindings/AnySignature.ts b/sdk/base/lib/osBindings/AnySignature.ts
similarity index 100%
rename from sdk/lib/osBindings/AnySignature.ts
rename to sdk/base/lib/osBindings/AnySignature.ts
diff --git a/sdk/lib/osBindings/AnySigningKey.ts b/sdk/base/lib/osBindings/AnySigningKey.ts
similarity index 100%
rename from sdk/lib/osBindings/AnySigningKey.ts
rename to sdk/base/lib/osBindings/AnySigningKey.ts
diff --git a/sdk/lib/osBindings/AnyVerifyingKey.ts b/sdk/base/lib/osBindings/AnyVerifyingKey.ts
similarity index 100%
rename from sdk/lib/osBindings/AnyVerifyingKey.ts
rename to sdk/base/lib/osBindings/AnyVerifyingKey.ts
diff --git a/sdk/lib/osBindings/ApiState.ts b/sdk/base/lib/osBindings/ApiState.ts
similarity index 100%
rename from sdk/lib/osBindings/ApiState.ts
rename to sdk/base/lib/osBindings/ApiState.ts
diff --git a/sdk/lib/osBindings/AttachParams.ts b/sdk/base/lib/osBindings/AttachParams.ts
similarity index 100%
rename from sdk/lib/osBindings/AttachParams.ts
rename to sdk/base/lib/osBindings/AttachParams.ts
diff --git a/sdk/lib/osBindings/BackupProgress.ts b/sdk/base/lib/osBindings/BackupProgress.ts
similarity index 100%
rename from sdk/lib/osBindings/BackupProgress.ts
rename to sdk/base/lib/osBindings/BackupProgress.ts
diff --git a/sdk/lib/osBindings/BackupTargetFS.ts b/sdk/base/lib/osBindings/BackupTargetFS.ts
similarity index 100%
rename from sdk/lib/osBindings/BackupTargetFS.ts
rename to sdk/base/lib/osBindings/BackupTargetFS.ts
diff --git a/sdk/lib/osBindings/Base64.ts b/sdk/base/lib/osBindings/Base64.ts
similarity index 100%
rename from sdk/lib/osBindings/Base64.ts
rename to sdk/base/lib/osBindings/Base64.ts
diff --git a/sdk/base/lib/osBindings/BindId.ts b/sdk/base/lib/osBindings/BindId.ts
new file mode 100644
index 000000000..778d95346
--- /dev/null
+++ b/sdk/base/lib/osBindings/BindId.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HostId } from "./HostId"
+
+export type BindId = { id: HostId; internalPort: number }
diff --git a/sdk/lib/osBindings/BindInfo.ts b/sdk/base/lib/osBindings/BindInfo.ts
similarity index 71%
rename from sdk/lib/osBindings/BindInfo.ts
rename to sdk/base/lib/osBindings/BindInfo.ts
index 221b1c37c..85fc38e94 100644
--- a/sdk/lib/osBindings/BindInfo.ts
+++ b/sdk/base/lib/osBindings/BindInfo.ts
@@ -2,4 +2,4 @@
 import type { BindOptions } from "./BindOptions"
 import type { LanInfo } from "./LanInfo"
 
-export type BindInfo = { options: BindOptions; lan: LanInfo }
+export type BindInfo = { enabled: boolean; options: BindOptions; lan: LanInfo }
diff --git a/sdk/lib/osBindings/BindOptions.ts b/sdk/base/lib/osBindings/BindOptions.ts
similarity index 100%
rename from sdk/lib/osBindings/BindOptions.ts
rename to sdk/base/lib/osBindings/BindOptions.ts
diff --git a/sdk/lib/osBindings/BindParams.ts b/sdk/base/lib/osBindings/BindParams.ts
similarity index 100%
rename from sdk/lib/osBindings/BindParams.ts
rename to sdk/base/lib/osBindings/BindParams.ts
diff --git a/sdk/lib/osBindings/Blake3Commitment.ts b/sdk/base/lib/osBindings/Blake3Commitment.ts
similarity index 100%
rename from sdk/lib/osBindings/Blake3Commitment.ts
rename to sdk/base/lib/osBindings/Blake3Commitment.ts
diff --git a/sdk/lib/osBindings/BlockDev.ts b/sdk/base/lib/osBindings/BlockDev.ts
similarity index 100%
rename from sdk/lib/osBindings/BlockDev.ts
rename to sdk/base/lib/osBindings/BlockDev.ts
diff --git a/sdk/lib/osBindings/CallbackId.ts b/sdk/base/lib/osBindings/CallbackId.ts
similarity index 100%
rename from sdk/lib/osBindings/CallbackId.ts
rename to sdk/base/lib/osBindings/CallbackId.ts
diff --git a/sdk/lib/osBindings/Category.ts b/sdk/base/lib/osBindings/Category.ts
similarity index 100%
rename from sdk/lib/osBindings/Category.ts
rename to sdk/base/lib/osBindings/Category.ts
diff --git a/sdk/lib/osBindings/CheckDependenciesParam.ts b/sdk/base/lib/osBindings/CheckDependenciesParam.ts
similarity index 100%
rename from sdk/lib/osBindings/CheckDependenciesParam.ts
rename to sdk/base/lib/osBindings/CheckDependenciesParam.ts
diff --git a/sdk/lib/osBindings/CheckDependenciesResult.ts b/sdk/base/lib/osBindings/CheckDependenciesResult.ts
similarity index 62%
rename from sdk/lib/osBindings/CheckDependenciesResult.ts
rename to sdk/base/lib/osBindings/CheckDependenciesResult.ts
index a435ff87f..3fa34b600 100644
--- a/sdk/lib/osBindings/CheckDependenciesResult.ts
+++ b/sdk/base/lib/osBindings/CheckDependenciesResult.ts
@@ -1,14 +1,17 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionRequestEntry } from "./ActionRequestEntry"
 import type { HealthCheckId } from "./HealthCheckId"
 import type { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 import type { PackageId } from "./PackageId"
+import type { ReplayId } from "./ReplayId"
+import type { Version } from "./Version"
 
 export type CheckDependenciesResult = {
   packageId: PackageId
   title: string | null
-  installedVersion: string | null
-  satisfies: string[]
+  installedVersion: Version | null
+  satisfies: Array<Version>
   isRunning: boolean
-  configSatisfied: boolean
+  requestedActions: { [key: ReplayId]: ActionRequestEntry }
   healthChecks: { [key: HealthCheckId]: NamedHealthCheckResult }
 }
diff --git a/sdk/lib/osBindings/Cifs.ts b/sdk/base/lib/osBindings/Cifs.ts
similarity index 100%
rename from sdk/lib/osBindings/Cifs.ts
rename to sdk/base/lib/osBindings/Cifs.ts
diff --git a/sdk/base/lib/osBindings/ClearActionRequestsParams.ts b/sdk/base/lib/osBindings/ClearActionRequestsParams.ts
new file mode 100644
index 000000000..856a13de4
--- /dev/null
+++ b/sdk/base/lib/osBindings/ClearActionRequestsParams.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ClearActionRequestsParams =
+  | { only: string[] }
+  | { except: string[] }
diff --git a/sdk/base/lib/osBindings/ClearActionsParams.ts b/sdk/base/lib/osBindings/ClearActionsParams.ts
new file mode 100644
index 000000000..68cff676a
--- /dev/null
+++ b/sdk/base/lib/osBindings/ClearActionsParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId"
+
+export type ClearActionsParams = { except: Array<ActionId> }
diff --git a/sdk/base/lib/osBindings/ClearBindingsParams.ts b/sdk/base/lib/osBindings/ClearBindingsParams.ts
new file mode 100644
index 000000000..41f1d5741
--- /dev/null
+++ b/sdk/base/lib/osBindings/ClearBindingsParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BindId } from "./BindId"
+
+export type ClearBindingsParams = { except: Array<BindId> }
diff --git a/sdk/base/lib/osBindings/ClearCallbacksParams.ts b/sdk/base/lib/osBindings/ClearCallbacksParams.ts
new file mode 100644
index 000000000..095a27f5e
--- /dev/null
+++ b/sdk/base/lib/osBindings/ClearCallbacksParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ClearCallbacksParams = { only: number[] } | { except: number[] }
diff --git a/sdk/base/lib/osBindings/ClearServiceInterfacesParams.ts b/sdk/base/lib/osBindings/ClearServiceInterfacesParams.ts
new file mode 100644
index 000000000..02c177978
--- /dev/null
+++ b/sdk/base/lib/osBindings/ClearServiceInterfacesParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ServiceInterfaceId } from "./ServiceInterfaceId"
+
+export type ClearServiceInterfacesParams = { except: Array<ServiceInterfaceId> }
diff --git a/sdk/lib/osBindings/ContactInfo.ts b/sdk/base/lib/osBindings/ContactInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/ContactInfo.ts
rename to sdk/base/lib/osBindings/ContactInfo.ts
diff --git a/sdk/lib/osBindings/CreateSubcontainerFsParams.ts b/sdk/base/lib/osBindings/CreateSubcontainerFsParams.ts
similarity index 100%
rename from sdk/lib/osBindings/CreateSubcontainerFsParams.ts
rename to sdk/base/lib/osBindings/CreateSubcontainerFsParams.ts
diff --git a/sdk/lib/osBindings/CurrentDependencies.ts b/sdk/base/lib/osBindings/CurrentDependencies.ts
similarity index 100%
rename from sdk/lib/osBindings/CurrentDependencies.ts
rename to sdk/base/lib/osBindings/CurrentDependencies.ts
diff --git a/sdk/lib/osBindings/CurrentDependencyInfo.ts b/sdk/base/lib/osBindings/CurrentDependencyInfo.ts
similarity index 92%
rename from sdk/lib/osBindings/CurrentDependencyInfo.ts
rename to sdk/base/lib/osBindings/CurrentDependencyInfo.ts
index 2096a0113..e56e2be7a 100644
--- a/sdk/lib/osBindings/CurrentDependencyInfo.ts
+++ b/sdk/base/lib/osBindings/CurrentDependencyInfo.ts
@@ -5,5 +5,4 @@ export type CurrentDependencyInfo = {
   title: string | null
   icon: DataUrl | null
   versionRange: string
-  configSatisfied: boolean
 } & ({ kind: "exists" } | { kind: "running"; healthChecks: string[] })
diff --git a/sdk/lib/osBindings/DataUrl.ts b/sdk/base/lib/osBindings/DataUrl.ts
similarity index 100%
rename from sdk/lib/osBindings/DataUrl.ts
rename to sdk/base/lib/osBindings/DataUrl.ts
diff --git a/sdk/lib/osBindings/DepInfo.ts b/sdk/base/lib/osBindings/DepInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/DepInfo.ts
rename to sdk/base/lib/osBindings/DepInfo.ts
diff --git a/sdk/lib/osBindings/Dependencies.ts b/sdk/base/lib/osBindings/Dependencies.ts
similarity index 100%
rename from sdk/lib/osBindings/Dependencies.ts
rename to sdk/base/lib/osBindings/Dependencies.ts
diff --git a/sdk/lib/osBindings/DependencyKind.ts b/sdk/base/lib/osBindings/DependencyKind.ts
similarity index 100%
rename from sdk/lib/osBindings/DependencyKind.ts
rename to sdk/base/lib/osBindings/DependencyKind.ts
diff --git a/sdk/lib/osBindings/DependencyMetadata.ts b/sdk/base/lib/osBindings/DependencyMetadata.ts
similarity index 100%
rename from sdk/lib/osBindings/DependencyMetadata.ts
rename to sdk/base/lib/osBindings/DependencyMetadata.ts
diff --git a/sdk/lib/osBindings/DependencyRequirement.ts b/sdk/base/lib/osBindings/DependencyRequirement.ts
similarity index 100%
rename from sdk/lib/osBindings/DependencyRequirement.ts
rename to sdk/base/lib/osBindings/DependencyRequirement.ts
diff --git a/sdk/lib/osBindings/Description.ts b/sdk/base/lib/osBindings/Description.ts
similarity index 100%
rename from sdk/lib/osBindings/Description.ts
rename to sdk/base/lib/osBindings/Description.ts
diff --git a/sdk/lib/osBindings/DestroySubcontainerFsParams.ts b/sdk/base/lib/osBindings/DestroySubcontainerFsParams.ts
similarity index 100%
rename from sdk/lib/osBindings/DestroySubcontainerFsParams.ts
rename to sdk/base/lib/osBindings/DestroySubcontainerFsParams.ts
diff --git a/sdk/lib/osBindings/Duration.ts b/sdk/base/lib/osBindings/Duration.ts
similarity index 100%
rename from sdk/lib/osBindings/Duration.ts
rename to sdk/base/lib/osBindings/Duration.ts
diff --git a/sdk/lib/osBindings/EchoParams.ts b/sdk/base/lib/osBindings/EchoParams.ts
similarity index 100%
rename from sdk/lib/osBindings/EchoParams.ts
rename to sdk/base/lib/osBindings/EchoParams.ts
diff --git a/sdk/lib/osBindings/EncryptedWire.ts b/sdk/base/lib/osBindings/EncryptedWire.ts
similarity index 100%
rename from sdk/lib/osBindings/EncryptedWire.ts
rename to sdk/base/lib/osBindings/EncryptedWire.ts
diff --git a/sdk/lib/osBindings/ExportActionParams.ts b/sdk/base/lib/osBindings/ExportActionParams.ts
similarity index 58%
rename from sdk/lib/osBindings/ExportActionParams.ts
rename to sdk/base/lib/osBindings/ExportActionParams.ts
index 8bcfbc349..d4aa33102 100644
--- a/sdk/lib/osBindings/ExportActionParams.ts
+++ b/sdk/base/lib/osBindings/ExportActionParams.ts
@@ -1,10 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ActionId } from "./ActionId"
 import type { ActionMetadata } from "./ActionMetadata"
-import type { PackageId } from "./PackageId"
 
-export type ExportActionParams = {
-  packageId?: PackageId
-  id: ActionId
-  metadata: ActionMetadata
-}
+export type ExportActionParams = { id: ActionId; metadata: ActionMetadata }
diff --git a/sdk/lib/osBindings/ExportServiceInterfaceParams.ts b/sdk/base/lib/osBindings/ExportServiceInterfaceParams.ts
similarity index 100%
rename from sdk/lib/osBindings/ExportServiceInterfaceParams.ts
rename to sdk/base/lib/osBindings/ExportServiceInterfaceParams.ts
diff --git a/sdk/lib/osBindings/ExposeForDependentsParams.ts b/sdk/base/lib/osBindings/ExposeForDependentsParams.ts
similarity index 100%
rename from sdk/lib/osBindings/ExposeForDependentsParams.ts
rename to sdk/base/lib/osBindings/ExposeForDependentsParams.ts
diff --git a/sdk/lib/osBindings/FullIndex.ts b/sdk/base/lib/osBindings/FullIndex.ts
similarity index 100%
rename from sdk/lib/osBindings/FullIndex.ts
rename to sdk/base/lib/osBindings/FullIndex.ts
diff --git a/sdk/lib/osBindings/FullProgress.ts b/sdk/base/lib/osBindings/FullProgress.ts
similarity index 100%
rename from sdk/lib/osBindings/FullProgress.ts
rename to sdk/base/lib/osBindings/FullProgress.ts
diff --git a/sdk/lib/osBindings/GetConfiguredParams.ts b/sdk/base/lib/osBindings/GetActionInputParams.ts
similarity index 55%
rename from sdk/lib/osBindings/GetConfiguredParams.ts
rename to sdk/base/lib/osBindings/GetActionInputParams.ts
index 66fb6e320..568ceb907 100644
--- a/sdk/lib/osBindings/GetConfiguredParams.ts
+++ b/sdk/base/lib/osBindings/GetActionInputParams.ts
@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId"
 import type { PackageId } from "./PackageId"
 
-export type GetConfiguredParams = { packageId?: PackageId }
+export type GetActionInputParams = { packageId?: PackageId; actionId: ActionId }
diff --git a/sdk/lib/osBindings/GetHostInfoParams.ts b/sdk/base/lib/osBindings/GetHostInfoParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetHostInfoParams.ts
rename to sdk/base/lib/osBindings/GetHostInfoParams.ts
diff --git a/sdk/lib/osBindings/GetOsAssetParams.ts b/sdk/base/lib/osBindings/GetOsAssetParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetOsAssetParams.ts
rename to sdk/base/lib/osBindings/GetOsAssetParams.ts
diff --git a/sdk/lib/osBindings/GetOsVersionParams.ts b/sdk/base/lib/osBindings/GetOsVersionParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetOsVersionParams.ts
rename to sdk/base/lib/osBindings/GetOsVersionParams.ts
diff --git a/sdk/lib/osBindings/GetPackageParams.ts b/sdk/base/lib/osBindings/GetPackageParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetPackageParams.ts
rename to sdk/base/lib/osBindings/GetPackageParams.ts
diff --git a/sdk/lib/osBindings/GetPackageResponse.ts b/sdk/base/lib/osBindings/GetPackageResponse.ts
similarity index 100%
rename from sdk/lib/osBindings/GetPackageResponse.ts
rename to sdk/base/lib/osBindings/GetPackageResponse.ts
diff --git a/sdk/lib/osBindings/GetPackageResponseFull.ts b/sdk/base/lib/osBindings/GetPackageResponseFull.ts
similarity index 100%
rename from sdk/lib/osBindings/GetPackageResponseFull.ts
rename to sdk/base/lib/osBindings/GetPackageResponseFull.ts
diff --git a/sdk/lib/osBindings/GetPrimaryUrlParams.ts b/sdk/base/lib/osBindings/GetPrimaryUrlParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetPrimaryUrlParams.ts
rename to sdk/base/lib/osBindings/GetPrimaryUrlParams.ts
diff --git a/sdk/lib/osBindings/GetServiceInterfaceParams.ts b/sdk/base/lib/osBindings/GetServiceInterfaceParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetServiceInterfaceParams.ts
rename to sdk/base/lib/osBindings/GetServiceInterfaceParams.ts
diff --git a/sdk/lib/osBindings/GetServicePortForwardParams.ts b/sdk/base/lib/osBindings/GetServicePortForwardParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetServicePortForwardParams.ts
rename to sdk/base/lib/osBindings/GetServicePortForwardParams.ts
diff --git a/sdk/lib/osBindings/GetSslCertificateParams.ts b/sdk/base/lib/osBindings/GetSslCertificateParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetSslCertificateParams.ts
rename to sdk/base/lib/osBindings/GetSslCertificateParams.ts
diff --git a/sdk/lib/osBindings/GetSslKeyParams.ts b/sdk/base/lib/osBindings/GetSslKeyParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetSslKeyParams.ts
rename to sdk/base/lib/osBindings/GetSslKeyParams.ts
diff --git a/sdk/lib/osBindings/GetStoreParams.ts b/sdk/base/lib/osBindings/GetStoreParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetStoreParams.ts
rename to sdk/base/lib/osBindings/GetStoreParams.ts
diff --git a/sdk/lib/osBindings/GetSystemSmtpParams.ts b/sdk/base/lib/osBindings/GetSystemSmtpParams.ts
similarity index 100%
rename from sdk/lib/osBindings/GetSystemSmtpParams.ts
rename to sdk/base/lib/osBindings/GetSystemSmtpParams.ts
diff --git a/sdk/lib/osBindings/Governor.ts b/sdk/base/lib/osBindings/Governor.ts
similarity index 100%
rename from sdk/lib/osBindings/Governor.ts
rename to sdk/base/lib/osBindings/Governor.ts
diff --git a/sdk/lib/osBindings/Guid.ts b/sdk/base/lib/osBindings/Guid.ts
similarity index 100%
rename from sdk/lib/osBindings/Guid.ts
rename to sdk/base/lib/osBindings/Guid.ts
diff --git a/sdk/lib/osBindings/HardwareRequirements.ts b/sdk/base/lib/osBindings/HardwareRequirements.ts
similarity index 100%
rename from sdk/lib/osBindings/HardwareRequirements.ts
rename to sdk/base/lib/osBindings/HardwareRequirements.ts
diff --git a/sdk/lib/osBindings/HealthCheckId.ts b/sdk/base/lib/osBindings/HealthCheckId.ts
similarity index 100%
rename from sdk/lib/osBindings/HealthCheckId.ts
rename to sdk/base/lib/osBindings/HealthCheckId.ts
diff --git a/sdk/lib/osBindings/Host.ts b/sdk/base/lib/osBindings/Host.ts
similarity index 100%
rename from sdk/lib/osBindings/Host.ts
rename to sdk/base/lib/osBindings/Host.ts
diff --git a/sdk/lib/osBindings/HostAddress.ts b/sdk/base/lib/osBindings/HostAddress.ts
similarity index 100%
rename from sdk/lib/osBindings/HostAddress.ts
rename to sdk/base/lib/osBindings/HostAddress.ts
diff --git a/sdk/lib/osBindings/HostId.ts b/sdk/base/lib/osBindings/HostId.ts
similarity index 100%
rename from sdk/lib/osBindings/HostId.ts
rename to sdk/base/lib/osBindings/HostId.ts
diff --git a/sdk/lib/osBindings/HostKind.ts b/sdk/base/lib/osBindings/HostKind.ts
similarity index 100%
rename from sdk/lib/osBindings/HostKind.ts
rename to sdk/base/lib/osBindings/HostKind.ts
diff --git a/sdk/lib/osBindings/HostnameInfo.ts b/sdk/base/lib/osBindings/HostnameInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/HostnameInfo.ts
rename to sdk/base/lib/osBindings/HostnameInfo.ts
diff --git a/sdk/lib/osBindings/Hosts.ts b/sdk/base/lib/osBindings/Hosts.ts
similarity index 100%
rename from sdk/lib/osBindings/Hosts.ts
rename to sdk/base/lib/osBindings/Hosts.ts
diff --git a/sdk/lib/osBindings/ImageConfig.ts b/sdk/base/lib/osBindings/ImageConfig.ts
similarity index 100%
rename from sdk/lib/osBindings/ImageConfig.ts
rename to sdk/base/lib/osBindings/ImageConfig.ts
diff --git a/sdk/lib/osBindings/ImageId.ts b/sdk/base/lib/osBindings/ImageId.ts
similarity index 100%
rename from sdk/lib/osBindings/ImageId.ts
rename to sdk/base/lib/osBindings/ImageId.ts
diff --git a/sdk/lib/osBindings/ImageMetadata.ts b/sdk/base/lib/osBindings/ImageMetadata.ts
similarity index 100%
rename from sdk/lib/osBindings/ImageMetadata.ts
rename to sdk/base/lib/osBindings/ImageMetadata.ts
diff --git a/sdk/lib/osBindings/ImageSource.ts b/sdk/base/lib/osBindings/ImageSource.ts
similarity index 100%
rename from sdk/lib/osBindings/ImageSource.ts
rename to sdk/base/lib/osBindings/ImageSource.ts
diff --git a/sdk/lib/osBindings/InitProgressRes.ts b/sdk/base/lib/osBindings/InitProgressRes.ts
similarity index 100%
rename from sdk/lib/osBindings/InitProgressRes.ts
rename to sdk/base/lib/osBindings/InitProgressRes.ts
diff --git a/sdk/lib/osBindings/InstallParams.ts b/sdk/base/lib/osBindings/InstallParams.ts
similarity index 100%
rename from sdk/lib/osBindings/InstallParams.ts
rename to sdk/base/lib/osBindings/InstallParams.ts
diff --git a/sdk/lib/osBindings/InstalledState.ts b/sdk/base/lib/osBindings/InstalledState.ts
similarity index 100%
rename from sdk/lib/osBindings/InstalledState.ts
rename to sdk/base/lib/osBindings/InstalledState.ts
diff --git a/sdk/lib/osBindings/InstalledVersionParams.ts b/sdk/base/lib/osBindings/InstalledVersionParams.ts
similarity index 100%
rename from sdk/lib/osBindings/InstalledVersionParams.ts
rename to sdk/base/lib/osBindings/InstalledVersionParams.ts
diff --git a/sdk/lib/osBindings/InstallingInfo.ts b/sdk/base/lib/osBindings/InstallingInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/InstallingInfo.ts
rename to sdk/base/lib/osBindings/InstallingInfo.ts
diff --git a/sdk/lib/osBindings/InstallingState.ts b/sdk/base/lib/osBindings/InstallingState.ts
similarity index 100%
rename from sdk/lib/osBindings/InstallingState.ts
rename to sdk/base/lib/osBindings/InstallingState.ts
diff --git a/sdk/lib/osBindings/IpHostname.ts b/sdk/base/lib/osBindings/IpHostname.ts
similarity index 100%
rename from sdk/lib/osBindings/IpHostname.ts
rename to sdk/base/lib/osBindings/IpHostname.ts
diff --git a/sdk/lib/osBindings/IpInfo.ts b/sdk/base/lib/osBindings/IpInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/IpInfo.ts
rename to sdk/base/lib/osBindings/IpInfo.ts
diff --git a/sdk/lib/osBindings/LanInfo.ts b/sdk/base/lib/osBindings/LanInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/LanInfo.ts
rename to sdk/base/lib/osBindings/LanInfo.ts
diff --git a/sdk/lib/osBindings/ListServiceInterfacesParams.ts b/sdk/base/lib/osBindings/ListServiceInterfacesParams.ts
similarity index 100%
rename from sdk/lib/osBindings/ListServiceInterfacesParams.ts
rename to sdk/base/lib/osBindings/ListServiceInterfacesParams.ts
diff --git a/sdk/lib/osBindings/ListVersionSignersParams.ts b/sdk/base/lib/osBindings/ListVersionSignersParams.ts
similarity index 100%
rename from sdk/lib/osBindings/ListVersionSignersParams.ts
rename to sdk/base/lib/osBindings/ListVersionSignersParams.ts
diff --git a/sdk/lib/osBindings/LoginParams.ts b/sdk/base/lib/osBindings/LoginParams.ts
similarity index 100%
rename from sdk/lib/osBindings/LoginParams.ts
rename to sdk/base/lib/osBindings/LoginParams.ts
diff --git a/sdk/lib/osBindings/MainStatus.ts b/sdk/base/lib/osBindings/MainStatus.ts
similarity index 69%
rename from sdk/lib/osBindings/MainStatus.ts
rename to sdk/base/lib/osBindings/MainStatus.ts
index 1f6b3babe..dbd9a8fcc 100644
--- a/sdk/lib/osBindings/MainStatus.ts
+++ b/sdk/base/lib/osBindings/MainStatus.ts
@@ -4,17 +4,17 @@ import type { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 import type { StartStop } from "./StartStop"
 
 export type MainStatus =
-  | { status: "stopped" }
-  | { status: "restarting" }
-  | { status: "restoring" }
-  | { status: "stopping" }
+  | { main: "stopped" }
+  | { main: "restarting" }
+  | { main: "restoring" }
+  | { main: "stopping" }
   | {
-      status: "starting"
+      main: "starting"
       health: { [key: HealthCheckId]: NamedHealthCheckResult }
     }
   | {
-      status: "running"
+      main: "running"
       started: string
       health: { [key: HealthCheckId]: NamedHealthCheckResult }
     }
-  | { status: "backingUp"; onComplete: StartStop }
+  | { main: "backingUp"; onComplete: StartStop }
diff --git a/sdk/lib/osBindings/Manifest.ts b/sdk/base/lib/osBindings/Manifest.ts
similarity index 98%
rename from sdk/lib/osBindings/Manifest.ts
rename to sdk/base/lib/osBindings/Manifest.ts
index d40223236..8007b565b 100644
--- a/sdk/lib/osBindings/Manifest.ts
+++ b/sdk/base/lib/osBindings/Manifest.ts
@@ -32,5 +32,4 @@ export type Manifest = {
   hardwareRequirements: HardwareRequirements
   gitHash: string | null
   osVersion: string
-  hasConfig: boolean
 }
diff --git a/sdk/lib/osBindings/MaybeUtf8String.ts b/sdk/base/lib/osBindings/MaybeUtf8String.ts
similarity index 100%
rename from sdk/lib/osBindings/MaybeUtf8String.ts
rename to sdk/base/lib/osBindings/MaybeUtf8String.ts
diff --git a/sdk/lib/osBindings/MerkleArchiveCommitment.ts b/sdk/base/lib/osBindings/MerkleArchiveCommitment.ts
similarity index 100%
rename from sdk/lib/osBindings/MerkleArchiveCommitment.ts
rename to sdk/base/lib/osBindings/MerkleArchiveCommitment.ts
diff --git a/sdk/lib/osBindings/MountParams.ts b/sdk/base/lib/osBindings/MountParams.ts
similarity index 100%
rename from sdk/lib/osBindings/MountParams.ts
rename to sdk/base/lib/osBindings/MountParams.ts
diff --git a/sdk/lib/osBindings/MountTarget.ts b/sdk/base/lib/osBindings/MountTarget.ts
similarity index 100%
rename from sdk/lib/osBindings/MountTarget.ts
rename to sdk/base/lib/osBindings/MountTarget.ts
diff --git a/sdk/lib/osBindings/NamedHealthCheckResult.ts b/sdk/base/lib/osBindings/NamedHealthCheckResult.ts
similarity index 100%
rename from sdk/lib/osBindings/NamedHealthCheckResult.ts
rename to sdk/base/lib/osBindings/NamedHealthCheckResult.ts
diff --git a/sdk/lib/osBindings/NamedProgress.ts b/sdk/base/lib/osBindings/NamedProgress.ts
similarity index 100%
rename from sdk/lib/osBindings/NamedProgress.ts
rename to sdk/base/lib/osBindings/NamedProgress.ts
diff --git a/sdk/lib/osBindings/OnionHostname.ts b/sdk/base/lib/osBindings/OnionHostname.ts
similarity index 100%
rename from sdk/lib/osBindings/OnionHostname.ts
rename to sdk/base/lib/osBindings/OnionHostname.ts
diff --git a/sdk/lib/osBindings/OsIndex.ts b/sdk/base/lib/osBindings/OsIndex.ts
similarity index 100%
rename from sdk/lib/osBindings/OsIndex.ts
rename to sdk/base/lib/osBindings/OsIndex.ts
diff --git a/sdk/lib/osBindings/OsVersionInfo.ts b/sdk/base/lib/osBindings/OsVersionInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/OsVersionInfo.ts
rename to sdk/base/lib/osBindings/OsVersionInfo.ts
diff --git a/sdk/lib/osBindings/OsVersionInfoMap.ts b/sdk/base/lib/osBindings/OsVersionInfoMap.ts
similarity index 100%
rename from sdk/lib/osBindings/OsVersionInfoMap.ts
rename to sdk/base/lib/osBindings/OsVersionInfoMap.ts
diff --git a/sdk/lib/osBindings/PackageDataEntry.ts b/sdk/base/lib/osBindings/PackageDataEntry.ts
similarity index 83%
rename from sdk/lib/osBindings/PackageDataEntry.ts
rename to sdk/base/lib/osBindings/PackageDataEntry.ts
index 41bd98bba..86df7b767 100644
--- a/sdk/lib/osBindings/PackageDataEntry.ts
+++ b/sdk/base/lib/osBindings/PackageDataEntry.ts
@@ -1,25 +1,27 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ActionId } from "./ActionId"
 import type { ActionMetadata } from "./ActionMetadata"
+import type { ActionRequestEntry } from "./ActionRequestEntry"
 import type { CurrentDependencies } from "./CurrentDependencies"
 import type { DataUrl } from "./DataUrl"
 import type { Hosts } from "./Hosts"
+import type { MainStatus } from "./MainStatus"
 import type { PackageState } from "./PackageState"
 import type { ServiceInterface } from "./ServiceInterface"
 import type { ServiceInterfaceId } from "./ServiceInterfaceId"
-import type { Status } from "./Status"
 import type { Version } from "./Version"
 
 export type PackageDataEntry = {
   stateInfo: PackageState
   dataVersion: Version | null
-  status: Status
+  status: MainStatus
   registry: string | null
   developerKey: string
   icon: DataUrl
   lastBackup: string | null
   currentDependencies: CurrentDependencies
   actions: { [key: ActionId]: ActionMetadata }
+  requestedActions: { [key: string]: ActionRequestEntry }
   serviceInterfaces: { [key: ServiceInterfaceId]: ServiceInterface }
   hosts: Hosts
   storeExposedDependents: string[]
diff --git a/sdk/lib/osBindings/PackageDetailLevel.ts b/sdk/base/lib/osBindings/PackageDetailLevel.ts
similarity index 100%
rename from sdk/lib/osBindings/PackageDetailLevel.ts
rename to sdk/base/lib/osBindings/PackageDetailLevel.ts
diff --git a/sdk/lib/osBindings/PackageId.ts b/sdk/base/lib/osBindings/PackageId.ts
similarity index 100%
rename from sdk/lib/osBindings/PackageId.ts
rename to sdk/base/lib/osBindings/PackageId.ts
diff --git a/sdk/lib/osBindings/PackageIndex.ts b/sdk/base/lib/osBindings/PackageIndex.ts
similarity index 100%
rename from sdk/lib/osBindings/PackageIndex.ts
rename to sdk/base/lib/osBindings/PackageIndex.ts
diff --git a/sdk/lib/osBindings/PackageInfo.ts b/sdk/base/lib/osBindings/PackageInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/PackageInfo.ts
rename to sdk/base/lib/osBindings/PackageInfo.ts
diff --git a/sdk/lib/osBindings/PackageInfoShort.ts b/sdk/base/lib/osBindings/PackageInfoShort.ts
similarity index 100%
rename from sdk/lib/osBindings/PackageInfoShort.ts
rename to sdk/base/lib/osBindings/PackageInfoShort.ts
diff --git a/sdk/lib/osBindings/PackageState.ts b/sdk/base/lib/osBindings/PackageState.ts
similarity index 100%
rename from sdk/lib/osBindings/PackageState.ts
rename to sdk/base/lib/osBindings/PackageState.ts
diff --git a/sdk/lib/osBindings/PackageVersionInfo.ts b/sdk/base/lib/osBindings/PackageVersionInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/PackageVersionInfo.ts
rename to sdk/base/lib/osBindings/PackageVersionInfo.ts
diff --git a/sdk/lib/osBindings/PasswordType.ts b/sdk/base/lib/osBindings/PasswordType.ts
similarity index 100%
rename from sdk/lib/osBindings/PasswordType.ts
rename to sdk/base/lib/osBindings/PasswordType.ts
diff --git a/sdk/lib/osBindings/PathOrUrl.ts b/sdk/base/lib/osBindings/PathOrUrl.ts
similarity index 100%
rename from sdk/lib/osBindings/PathOrUrl.ts
rename to sdk/base/lib/osBindings/PathOrUrl.ts
diff --git a/sdk/lib/osBindings/ProcedureId.ts b/sdk/base/lib/osBindings/ProcedureId.ts
similarity index 100%
rename from sdk/lib/osBindings/ProcedureId.ts
rename to sdk/base/lib/osBindings/ProcedureId.ts
diff --git a/sdk/lib/osBindings/Progress.ts b/sdk/base/lib/osBindings/Progress.ts
similarity index 100%
rename from sdk/lib/osBindings/Progress.ts
rename to sdk/base/lib/osBindings/Progress.ts
diff --git a/sdk/lib/osBindings/Public.ts b/sdk/base/lib/osBindings/Public.ts
similarity index 100%
rename from sdk/lib/osBindings/Public.ts
rename to sdk/base/lib/osBindings/Public.ts
diff --git a/sdk/lib/osBindings/RecoverySource.ts b/sdk/base/lib/osBindings/RecoverySource.ts
similarity index 100%
rename from sdk/lib/osBindings/RecoverySource.ts
rename to sdk/base/lib/osBindings/RecoverySource.ts
diff --git a/sdk/lib/osBindings/RegistryAsset.ts b/sdk/base/lib/osBindings/RegistryAsset.ts
similarity index 100%
rename from sdk/lib/osBindings/RegistryAsset.ts
rename to sdk/base/lib/osBindings/RegistryAsset.ts
diff --git a/sdk/lib/osBindings/RegistryInfo.ts b/sdk/base/lib/osBindings/RegistryInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/RegistryInfo.ts
rename to sdk/base/lib/osBindings/RegistryInfo.ts
diff --git a/sdk/lib/osBindings/RemoveVersionParams.ts b/sdk/base/lib/osBindings/RemoveVersionParams.ts
similarity index 100%
rename from sdk/lib/osBindings/RemoveVersionParams.ts
rename to sdk/base/lib/osBindings/RemoveVersionParams.ts
diff --git a/sdk/lib/osBindings/SetConfigured.ts b/sdk/base/lib/osBindings/ReplayId.ts
similarity index 67%
rename from sdk/lib/osBindings/SetConfigured.ts
rename to sdk/base/lib/osBindings/ReplayId.ts
index e1478422a..048ef183a 100644
--- a/sdk/lib/osBindings/SetConfigured.ts
+++ b/sdk/base/lib/osBindings/ReplayId.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type SetConfigured = { configured: boolean }
+export type ReplayId = string
diff --git a/sdk/base/lib/osBindings/RequestActionParams.ts b/sdk/base/lib/osBindings/RequestActionParams.ts
new file mode 100644
index 000000000..db83be595
--- /dev/null
+++ b/sdk/base/lib/osBindings/RequestActionParams.ts
@@ -0,0 +1,15 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionId } from "./ActionId"
+import type { ActionRequestInput } from "./ActionRequestInput"
+import type { ActionRequestTrigger } from "./ActionRequestTrigger"
+import type { PackageId } from "./PackageId"
+import type { ReplayId } from "./ReplayId"
+
+export type RequestActionParams = {
+  replayId: ReplayId
+  packageId: PackageId
+  actionId: ActionId
+  description?: string
+  when?: ActionRequestTrigger
+  input?: ActionRequestInput
+}
diff --git a/sdk/lib/osBindings/RequestCommitment.ts b/sdk/base/lib/osBindings/RequestCommitment.ts
similarity index 100%
rename from sdk/lib/osBindings/RequestCommitment.ts
rename to sdk/base/lib/osBindings/RequestCommitment.ts
diff --git a/sdk/lib/osBindings/ExecuteAction.ts b/sdk/base/lib/osBindings/RunActionParams.ts
similarity index 88%
rename from sdk/lib/osBindings/ExecuteAction.ts
rename to sdk/base/lib/osBindings/RunActionParams.ts
index 6e3c44f79..33864d1e6 100644
--- a/sdk/lib/osBindings/ExecuteAction.ts
+++ b/sdk/base/lib/osBindings/RunActionParams.ts
@@ -2,7 +2,7 @@
 import type { ActionId } from "./ActionId"
 import type { PackageId } from "./PackageId"
 
-export type ExecuteAction = {
+export type RunActionParams = {
   packageId?: PackageId
   actionId: ActionId
   input: any
diff --git a/sdk/lib/osBindings/Security.ts b/sdk/base/lib/osBindings/Security.ts
similarity index 100%
rename from sdk/lib/osBindings/Security.ts
rename to sdk/base/lib/osBindings/Security.ts
diff --git a/sdk/lib/osBindings/ServerInfo.ts b/sdk/base/lib/osBindings/ServerInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/ServerInfo.ts
rename to sdk/base/lib/osBindings/ServerInfo.ts
diff --git a/sdk/lib/osBindings/ServerSpecs.ts b/sdk/base/lib/osBindings/ServerSpecs.ts
similarity index 100%
rename from sdk/lib/osBindings/ServerSpecs.ts
rename to sdk/base/lib/osBindings/ServerSpecs.ts
diff --git a/sdk/lib/osBindings/ServerStatus.ts b/sdk/base/lib/osBindings/ServerStatus.ts
similarity index 100%
rename from sdk/lib/osBindings/ServerStatus.ts
rename to sdk/base/lib/osBindings/ServerStatus.ts
diff --git a/sdk/lib/osBindings/ServiceInterface.ts b/sdk/base/lib/osBindings/ServiceInterface.ts
similarity index 100%
rename from sdk/lib/osBindings/ServiceInterface.ts
rename to sdk/base/lib/osBindings/ServiceInterface.ts
diff --git a/sdk/lib/osBindings/ServiceInterfaceId.ts b/sdk/base/lib/osBindings/ServiceInterfaceId.ts
similarity index 100%
rename from sdk/lib/osBindings/ServiceInterfaceId.ts
rename to sdk/base/lib/osBindings/ServiceInterfaceId.ts
diff --git a/sdk/lib/osBindings/ServiceInterfaceType.ts b/sdk/base/lib/osBindings/ServiceInterfaceType.ts
similarity index 100%
rename from sdk/lib/osBindings/ServiceInterfaceType.ts
rename to sdk/base/lib/osBindings/ServiceInterfaceType.ts
diff --git a/sdk/lib/osBindings/Session.ts b/sdk/base/lib/osBindings/Session.ts
similarity index 100%
rename from sdk/lib/osBindings/Session.ts
rename to sdk/base/lib/osBindings/Session.ts
diff --git a/sdk/lib/osBindings/SessionList.ts b/sdk/base/lib/osBindings/SessionList.ts
similarity index 100%
rename from sdk/lib/osBindings/SessionList.ts
rename to sdk/base/lib/osBindings/SessionList.ts
diff --git a/sdk/lib/osBindings/Sessions.ts b/sdk/base/lib/osBindings/Sessions.ts
similarity index 100%
rename from sdk/lib/osBindings/Sessions.ts
rename to sdk/base/lib/osBindings/Sessions.ts
diff --git a/sdk/lib/osBindings/SetDataVersionParams.ts b/sdk/base/lib/osBindings/SetDataVersionParams.ts
similarity index 100%
rename from sdk/lib/osBindings/SetDataVersionParams.ts
rename to sdk/base/lib/osBindings/SetDataVersionParams.ts
diff --git a/sdk/lib/osBindings/SetDependenciesParams.ts b/sdk/base/lib/osBindings/SetDependenciesParams.ts
similarity index 82%
rename from sdk/lib/osBindings/SetDependenciesParams.ts
rename to sdk/base/lib/osBindings/SetDependenciesParams.ts
index bbc9b325f..7b34b50c9 100644
--- a/sdk/lib/osBindings/SetDependenciesParams.ts
+++ b/sdk/base/lib/osBindings/SetDependenciesParams.ts
@@ -1,8 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DependencyRequirement } from "./DependencyRequirement"
-import type { Guid } from "./Guid"
 
 export type SetDependenciesParams = {
-  procedureId: Guid
   dependencies: Array<DependencyRequirement>
 }
diff --git a/sdk/lib/osBindings/SetHealth.ts b/sdk/base/lib/osBindings/SetHealth.ts
similarity index 100%
rename from sdk/lib/osBindings/SetHealth.ts
rename to sdk/base/lib/osBindings/SetHealth.ts
diff --git a/sdk/lib/osBindings/SetMainStatus.ts b/sdk/base/lib/osBindings/SetMainStatus.ts
similarity index 100%
rename from sdk/lib/osBindings/SetMainStatus.ts
rename to sdk/base/lib/osBindings/SetMainStatus.ts
diff --git a/sdk/lib/osBindings/SetMainStatusStatus.ts b/sdk/base/lib/osBindings/SetMainStatusStatus.ts
similarity index 100%
rename from sdk/lib/osBindings/SetMainStatusStatus.ts
rename to sdk/base/lib/osBindings/SetMainStatusStatus.ts
diff --git a/sdk/lib/osBindings/SetStoreParams.ts b/sdk/base/lib/osBindings/SetStoreParams.ts
similarity index 100%
rename from sdk/lib/osBindings/SetStoreParams.ts
rename to sdk/base/lib/osBindings/SetStoreParams.ts
diff --git a/sdk/lib/osBindings/SetupExecuteParams.ts b/sdk/base/lib/osBindings/SetupExecuteParams.ts
similarity index 100%
rename from sdk/lib/osBindings/SetupExecuteParams.ts
rename to sdk/base/lib/osBindings/SetupExecuteParams.ts
diff --git a/sdk/lib/osBindings/SetupProgress.ts b/sdk/base/lib/osBindings/SetupProgress.ts
similarity index 100%
rename from sdk/lib/osBindings/SetupProgress.ts
rename to sdk/base/lib/osBindings/SetupProgress.ts
diff --git a/sdk/lib/osBindings/SetupResult.ts b/sdk/base/lib/osBindings/SetupResult.ts
similarity index 100%
rename from sdk/lib/osBindings/SetupResult.ts
rename to sdk/base/lib/osBindings/SetupResult.ts
diff --git a/sdk/lib/osBindings/SetupStatusRes.ts b/sdk/base/lib/osBindings/SetupStatusRes.ts
similarity index 100%
rename from sdk/lib/osBindings/SetupStatusRes.ts
rename to sdk/base/lib/osBindings/SetupStatusRes.ts
diff --git a/sdk/lib/osBindings/SignAssetParams.ts b/sdk/base/lib/osBindings/SignAssetParams.ts
similarity index 100%
rename from sdk/lib/osBindings/SignAssetParams.ts
rename to sdk/base/lib/osBindings/SignAssetParams.ts
diff --git a/sdk/lib/osBindings/SignerInfo.ts b/sdk/base/lib/osBindings/SignerInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/SignerInfo.ts
rename to sdk/base/lib/osBindings/SignerInfo.ts
diff --git a/sdk/lib/osBindings/SmtpValue.ts b/sdk/base/lib/osBindings/SmtpValue.ts
similarity index 100%
rename from sdk/lib/osBindings/SmtpValue.ts
rename to sdk/base/lib/osBindings/SmtpValue.ts
diff --git a/sdk/lib/osBindings/StartStop.ts b/sdk/base/lib/osBindings/StartStop.ts
similarity index 100%
rename from sdk/lib/osBindings/StartStop.ts
rename to sdk/base/lib/osBindings/StartStop.ts
diff --git a/sdk/lib/osBindings/UpdatingState.ts b/sdk/base/lib/osBindings/UpdatingState.ts
similarity index 100%
rename from sdk/lib/osBindings/UpdatingState.ts
rename to sdk/base/lib/osBindings/UpdatingState.ts
diff --git a/sdk/lib/osBindings/VerifyCifsParams.ts b/sdk/base/lib/osBindings/VerifyCifsParams.ts
similarity index 100%
rename from sdk/lib/osBindings/VerifyCifsParams.ts
rename to sdk/base/lib/osBindings/VerifyCifsParams.ts
diff --git a/sdk/lib/osBindings/Version.ts b/sdk/base/lib/osBindings/Version.ts
similarity index 100%
rename from sdk/lib/osBindings/Version.ts
rename to sdk/base/lib/osBindings/Version.ts
diff --git a/sdk/lib/osBindings/VersionSignerParams.ts b/sdk/base/lib/osBindings/VersionSignerParams.ts
similarity index 100%
rename from sdk/lib/osBindings/VersionSignerParams.ts
rename to sdk/base/lib/osBindings/VersionSignerParams.ts
diff --git a/sdk/lib/osBindings/VolumeId.ts b/sdk/base/lib/osBindings/VolumeId.ts
similarity index 100%
rename from sdk/lib/osBindings/VolumeId.ts
rename to sdk/base/lib/osBindings/VolumeId.ts
diff --git a/sdk/lib/osBindings/WifiInfo.ts b/sdk/base/lib/osBindings/WifiInfo.ts
similarity index 100%
rename from sdk/lib/osBindings/WifiInfo.ts
rename to sdk/base/lib/osBindings/WifiInfo.ts
diff --git a/sdk/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
similarity index 88%
rename from sdk/lib/osBindings/index.ts
rename to sdk/base/lib/osBindings/index.ts
index 9492fe796..4b6af0ae1 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -1,6 +1,13 @@
 export { AcceptSigners } from "./AcceptSigners"
 export { ActionId } from "./ActionId"
+export { ActionInput } from "./ActionInput"
 export { ActionMetadata } from "./ActionMetadata"
+export { ActionRequestCondition } from "./ActionRequestCondition"
+export { ActionRequestEntry } from "./ActionRequestEntry"
+export { ActionRequestInput } from "./ActionRequestInput"
+export { ActionRequestTrigger } from "./ActionRequestTrigger"
+export { ActionRequest } from "./ActionRequest"
+export { ActionVisibility } from "./ActionVisibility"
 export { AddAdminParams } from "./AddAdminParams"
 export { AddAssetParams } from "./AddAssetParams"
 export { AddPackageParams } from "./AddPackageParams"
@@ -20,6 +27,7 @@ export { AttachParams } from "./AttachParams"
 export { BackupProgress } from "./BackupProgress"
 export { BackupTargetFS } from "./BackupTargetFS"
 export { Base64 } from "./Base64"
+export { BindId } from "./BindId"
 export { BindInfo } from "./BindInfo"
 export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
@@ -30,6 +38,11 @@ export { Category } from "./Category"
 export { CheckDependenciesParam } from "./CheckDependenciesParam"
 export { CheckDependenciesResult } from "./CheckDependenciesResult"
 export { Cifs } from "./Cifs"
+export { ClearActionRequestsParams } from "./ClearActionRequestsParams"
+export { ClearActionsParams } from "./ClearActionsParams"
+export { ClearBindingsParams } from "./ClearBindingsParams"
+export { ClearCallbacksParams } from "./ClearCallbacksParams"
+export { ClearServiceInterfacesParams } from "./ClearServiceInterfacesParams"
 export { ContactInfo } from "./ContactInfo"
 export { CreateSubcontainerFsParams } from "./CreateSubcontainerFsParams"
 export { CurrentDependencies } from "./CurrentDependencies"
@@ -45,13 +58,12 @@ export { DestroySubcontainerFsParams } from "./DestroySubcontainerFsParams"
 export { Duration } from "./Duration"
 export { EchoParams } from "./EchoParams"
 export { EncryptedWire } from "./EncryptedWire"
-export { ExecuteAction } from "./ExecuteAction"
 export { ExportActionParams } from "./ExportActionParams"
 export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams"
 export { ExposeForDependentsParams } from "./ExposeForDependentsParams"
 export { FullIndex } from "./FullIndex"
 export { FullProgress } from "./FullProgress"
-export { GetConfiguredParams } from "./GetConfiguredParams"
+export { GetActionInputParams } from "./GetActionInputParams"
 export { GetHostInfoParams } from "./GetHostInfoParams"
 export { GetOsAssetParams } from "./GetOsAssetParams"
 export { GetOsVersionParams } from "./GetOsVersionParams"
@@ -120,7 +132,10 @@ export { RecoverySource } from "./RecoverySource"
 export { RegistryAsset } from "./RegistryAsset"
 export { RegistryInfo } from "./RegistryInfo"
 export { RemoveVersionParams } from "./RemoveVersionParams"
+export { ReplayId } from "./ReplayId"
+export { RequestActionParams } from "./RequestActionParams"
 export { RequestCommitment } from "./RequestCommitment"
+export { RunActionParams } from "./RunActionParams"
 export { Security } from "./Security"
 export { ServerInfo } from "./ServerInfo"
 export { ServerSpecs } from "./ServerSpecs"
@@ -131,7 +146,6 @@ export { ServiceInterfaceType } from "./ServiceInterfaceType"
 export { SessionList } from "./SessionList"
 export { Sessions } from "./Sessions"
 export { Session } from "./Session"
-export { SetConfigured } from "./SetConfigured"
 export { SetDataVersionParams } from "./SetDataVersionParams"
 export { SetDependenciesParams } from "./SetDependenciesParams"
 export { SetHealth } from "./SetHealth"
@@ -146,7 +160,6 @@ export { SignAssetParams } from "./SignAssetParams"
 export { SignerInfo } from "./SignerInfo"
 export { SmtpValue } from "./SmtpValue"
 export { StartStop } from "./StartStop"
-export { Status } from "./Status"
 export { UpdatingState } from "./UpdatingState"
 export { VerifyCifsParams } from "./VerifyCifsParams"
 export { VersionSignerParams } from "./VersionSignerParams"
diff --git a/sdk/lib/s9pk/index.ts b/sdk/base/lib/s9pk/index.ts
similarity index 100%
rename from sdk/lib/s9pk/index.ts
rename to sdk/base/lib/s9pk/index.ts
diff --git a/sdk/lib/s9pk/merkleArchive/directoryContents.ts b/sdk/base/lib/s9pk/merkleArchive/directoryContents.ts
similarity index 100%
rename from sdk/lib/s9pk/merkleArchive/directoryContents.ts
rename to sdk/base/lib/s9pk/merkleArchive/directoryContents.ts
diff --git a/sdk/lib/s9pk/merkleArchive/fileContents.ts b/sdk/base/lib/s9pk/merkleArchive/fileContents.ts
similarity index 100%
rename from sdk/lib/s9pk/merkleArchive/fileContents.ts
rename to sdk/base/lib/s9pk/merkleArchive/fileContents.ts
diff --git a/sdk/lib/s9pk/merkleArchive/index.ts b/sdk/base/lib/s9pk/merkleArchive/index.ts
similarity index 100%
rename from sdk/lib/s9pk/merkleArchive/index.ts
rename to sdk/base/lib/s9pk/merkleArchive/index.ts
diff --git a/sdk/lib/s9pk/merkleArchive/varint.ts b/sdk/base/lib/s9pk/merkleArchive/varint.ts
similarity index 96%
rename from sdk/lib/s9pk/merkleArchive/varint.ts
rename to sdk/base/lib/s9pk/merkleArchive/varint.ts
index 016505307..a6a425289 100644
--- a/sdk/lib/s9pk/merkleArchive/varint.ts
+++ b/sdk/base/lib/s9pk/merkleArchive/varint.ts
@@ -1,4 +1,4 @@
-import { asError } from "../../util/asError"
+import { asError } from "../../util"
 
 const msb = 0x80
 const dropMsb = 0x7f
diff --git a/sdk/lib/test/exverList.test.ts b/sdk/base/lib/test/exverList.test.ts
similarity index 100%
rename from sdk/lib/test/exverList.test.ts
rename to sdk/base/lib/test/exverList.test.ts
diff --git a/sdk/lib/test/graph.test.ts b/sdk/base/lib/test/graph.test.ts
similarity index 99%
rename from sdk/lib/test/graph.test.ts
rename to sdk/base/lib/test/graph.test.ts
index 7f02adc2e..a738123d6 100644
--- a/sdk/lib/test/graph.test.ts
+++ b/sdk/base/lib/test/graph.test.ts
@@ -1,4 +1,4 @@
-import { Graph } from "../util/graph"
+import { Graph } from "../util"
 
 describe("graph", () => {
   {
diff --git a/sdk/lib/test/configTypes.test.ts b/sdk/base/lib/test/inputSpecTypes.test.ts
similarity index 64%
rename from sdk/lib/test/configTypes.test.ts
rename to sdk/base/lib/test/inputSpecTypes.test.ts
index 6d0b9a3d8..6767faf20 100644
--- a/sdk/lib/test/configTypes.test.ts
+++ b/sdk/base/lib/test/inputSpecTypes.test.ts
@@ -1,15 +1,18 @@
-import { ListValueSpecOf, isValueSpecListOf } from "../config/configTypes"
-import { Config } from "../config/builder/config"
-import { List } from "../config/builder/list"
-import { Value } from "../config/builder/value"
+import {
+  ListValueSpecOf,
+  isValueSpecListOf,
+} from "../actions/input/inputSpecTypes"
+import { InputSpec } from "../actions/input/builder/inputSpec"
+import { List } from "../actions/input/builder/list"
+import { Value } from "../actions/input/builder/value"
 
-describe("Config Types", () => {
+describe("InputSpec Types", () => {
   test("isValueSpecListOf", async () => {
     const options = [List.obj, List.text]
     for (const option of options) {
       const test = (option as any)(
         {} as any,
-        { spec: Config.of({}) } as any,
+        { spec: InputSpec.of({}) } as any,
       ) as any
       const someList = await Value.list(test).build({} as any)
       if (isValueSpecListOf(someList, "text")) {
diff --git a/sdk/lib/test/startosTypeValidation.test.ts b/sdk/base/lib/test/startosTypeValidation.test.ts
similarity index 81%
rename from sdk/lib/test/startosTypeValidation.test.ts
rename to sdk/base/lib/test/startosTypeValidation.test.ts
index bcbc4b6ec..7686328bd 100644
--- a/sdk/lib/test/startosTypeValidation.test.ts
+++ b/sdk/base/lib/test/startosTypeValidation.test.ts
@@ -1,9 +1,15 @@
 import { Effects } from "../types"
 import {
   CheckDependenciesParam,
-  ExecuteAction,
-  GetConfiguredParams,
+  ClearActionRequestsParams,
+  ClearActionsParams,
+  ClearBindingsParams,
+  ClearCallbacksParams,
+  ClearServiceInterfacesParams,
+  GetActionInputParams,
   GetStoreParams,
+  RequestActionParams,
+  RunActionParams,
   SetDataVersionParams,
   SetMainStatus,
   SetStoreParams,
@@ -12,7 +18,6 @@ import { CreateSubcontainerFsParams } from ".././osBindings"
 import { DestroySubcontainerFsParams } from ".././osBindings"
 import { BindParams } from ".././osBindings"
 import { GetHostInfoParams } from ".././osBindings"
-import { SetConfigured } from ".././osBindings"
 import { SetHealth } from ".././osBindings"
 import { ExposeForDependentsParams } from ".././osBindings"
 import { GetSslCertificateParams } from ".././osBindings"
@@ -41,21 +46,27 @@ type EffectsTypeChecker<T extends StringObject = Effects> = {
 
 describe("startosTypeValidation ", () => {
   test(`checking the params match`, () => {
-    const testInput: any = {}
     typeEquality<EffectsTypeChecker>({
-      executeAction: {} as ExecuteAction,
+      constRetry: {},
+      clearCallbacks: {} as ClearCallbacksParams,
+      action: {
+        clear: {} as ClearActionsParams,
+        export: {} as ExportActionParams,
+        getInput: {} as GetActionInputParams,
+        run: {} as RunActionParams,
+        request: {} as RequestActionParams,
+        clearRequests: {} as ClearActionRequestsParams,
+      },
       subcontainer: {
         createFs: {} as CreateSubcontainerFsParams,
         destroyFs: {} as DestroySubcontainerFsParams,
       },
-      clearBindings: undefined,
+      clearBindings: {} as ClearBindingsParams,
       getInstalledPackages: undefined,
       bind: {} as BindParams,
       getHostInfo: {} as WithCallback<GetHostInfoParams>,
-      getConfigured: {} as GetConfiguredParams,
       restart: undefined,
       shutdown: undefined,
-      setConfigured: {} as SetConfigured,
       setDataVersion: {} as SetDataVersionParams,
       getDataVersion: undefined,
       setHealth: {} as SetHealth,
@@ -71,19 +82,14 @@ describe("startosTypeValidation ", () => {
       getSystemSmtp: {} as WithCallback<GetSystemSmtpParams>,
       getContainerIp: undefined,
       getServicePortForward: {} as GetServicePortForwardParams,
-      clearServiceInterfaces: undefined,
+      clearServiceInterfaces: {} as ClearServiceInterfacesParams,
       exportServiceInterface: {} as ExportServiceInterfaceParams,
       getPrimaryUrl: {} as WithCallback<GetPrimaryUrlParams>,
       listServiceInterfaces: {} as WithCallback<ListServiceInterfacesParams>,
-      exportAction: {} as ExportActionParams,
-      clearActions: undefined,
       mount: {} as MountParams,
       checkDependencies: {} as CheckDependenciesParam,
       getDependencies: undefined,
       setMainStatus: {} as SetMainStatus,
     })
-    typeEquality<Parameters<Effects["executeAction"]>[0]>(
-      testInput as ExecuteAction,
-    )
   })
 })
diff --git a/sdk/lib/test/util.deepMerge.test.ts b/sdk/base/lib/test/util.deepMerge.test.ts
similarity index 70%
rename from sdk/lib/test/util.deepMerge.test.ts
rename to sdk/base/lib/test/util.deepMerge.test.ts
index 25a4a7d22..74ff92c26 100644
--- a/sdk/lib/test/util.deepMerge.test.ts
+++ b/sdk/base/lib/test/util.deepMerge.test.ts
@@ -1,5 +1,5 @@
-import { deepEqual } from "../util/deepEqual"
-import { deepMerge } from "../util/deepMerge"
+import { deepEqual } from "../util"
+import { deepMerge } from "../util"
 
 describe("deepMerge", () => {
   test("deepMerge({}, {a: 1}, {b: 2}) should return {a: 1, b: 2}", () => {
@@ -20,7 +20,11 @@ describe("deepMerge", () => {
       }),
     ).toBeTruthy()
   })
-  test("deepMerge([1,2,3], [2,3,4]) should equal [2,3,4]", () => {
-    expect(deepMerge([1, 2, 3], [2, 3, 4])).toEqual([2, 3, 4])
+  test("Test that merging lists has Set semantics", () => {
+    const merge = deepMerge(["a", "b"], ["b", "c"])
+    expect(merge).toHaveLength(3)
+    expect(merge).toContain("a")
+    expect(merge).toContain("b")
+    expect(merge).toContain("c")
   })
 })
diff --git a/sdk/lib/test/util.getNetworkInterface.test.ts b/sdk/base/lib/test/util.getNetworkInterface.test.ts
similarity index 100%
rename from sdk/lib/test/util.getNetworkInterface.test.ts
rename to sdk/base/lib/test/util.getNetworkInterface.test.ts
diff --git a/sdk/base/lib/types.ts b/sdk/base/lib/types.ts
new file mode 100644
index 000000000..56e310efe
--- /dev/null
+++ b/sdk/base/lib/types.ts
@@ -0,0 +1,297 @@
+export * as inputSpecTypes from "./actions/input/inputSpecTypes"
+
+import {
+  DependencyRequirement,
+  NamedHealthCheckResult,
+  Manifest,
+  ServiceInterface,
+  ActionId,
+} from "./osBindings"
+import { Affine, StringObject, ToKebab } from "./util"
+import { Action, Actions } from "./actions/setupActions"
+import { Effects } from "./Effects"
+export { Effects }
+export * from "./osBindings"
+export { SDKManifest } from "./types/ManifestTypes"
+
+export type ExposedStorePaths = string[] & Affine<"ExposedStorePaths">
+declare const HealthProof: unique symbol
+export type HealthReceipt = {
+  [HealthProof]: never
+}
+
+export type DaemonBuildable = {
+  build(): Promise<{
+    term(): Promise<void>
+  }>
+}
+
+export type ServiceInterfaceType = "ui" | "p2p" | "api"
+export type Signals = NodeJS.Signals
+export const SIGTERM: Signals = "SIGTERM"
+export const SIGKILL: Signals = "SIGKILL"
+export const NO_TIMEOUT = -1
+
+export type PathMaker = (options: { volume: string; path: string }) => string
+export type ExportedAction = (options: {
+  effects: Effects
+  input?: Record<string, unknown>
+}) => Promise<ActionResult>
+export type MaybePromise<A> = Promise<A> | A
+export namespace ExpectedExports {
+  version: 1
+
+  /** For backing up service data though the startOS UI */
+  export type createBackup = (options: { effects: Effects }) => Promise<unknown>
+  /** For restoring service data that was previously backed up using the startOS UI create backup flow. Backup restores are also triggered via the startOS UI, or doing a system restore flow during setup. */
+  export type restoreBackup = (options: {
+    effects: Effects
+  }) => Promise<unknown>
+
+  /**
+   * This is the entrypoint for the main container. Used to start up something like the service that the
+   * package represents, like running a bitcoind in a bitcoind-wrapper.
+   */
+  export type main = (options: {
+    effects: Effects
+    started(onTerm: () => PromiseLike<void>): PromiseLike<void>
+  }) => Promise<DaemonBuildable>
+
+  /**
+   * After a shutdown, if we wanted to do any operations to clean up things, like
+   * set the action as unavailable or something.
+   */
+  export type afterShutdown = (options: {
+    effects: Effects
+  }) => Promise<unknown>
+
+  /**
+   * Every time a service launches (both on startup, and on install) this function is called before packageInit
+   * Can be used to register callbacks
+   */
+  export type containerInit = (options: {
+    effects: Effects
+  }) => Promise<unknown>
+
+  /**
+   * Every time a package completes an install, this function is called before the main.
+   * Can be used to do migration like things.
+   */
+  export type packageInit = (options: { effects: Effects }) => Promise<unknown>
+  /** This will be ran during any time a package is uninstalled, for example during a update
+   * this will be called.
+   */
+  export type packageUninit = (options: {
+    effects: Effects
+    nextVersion: null | string
+  }) => Promise<unknown>
+
+  export type properties = (options: {
+    effects: Effects
+  }) => Promise<PropertiesReturn>
+
+  export type manifest = Manifest
+
+  export type actions = Actions<
+    any,
+    Record<ActionId, Action<ActionId, any, any, any>>
+  >
+}
+export type ABI = {
+  createBackup: ExpectedExports.createBackup
+  restoreBackup: ExpectedExports.restoreBackup
+  main: ExpectedExports.main
+  afterShutdown: ExpectedExports.afterShutdown
+  containerInit: ExpectedExports.containerInit
+  packageInit: ExpectedExports.packageInit
+  packageUninit: ExpectedExports.packageUninit
+  properties: ExpectedExports.properties
+  manifest: ExpectedExports.manifest
+  actions: ExpectedExports.actions
+}
+export type TimeMs = number
+export type VersionString = string
+
+declare const DaemonProof: unique symbol
+export type DaemonReceipt = {
+  [DaemonProof]: never
+}
+export type Daemon = {
+  wait(): Promise<string>
+  term(): Promise<void>
+  [DaemonProof]: never
+}
+
+export type HealthStatus = NamedHealthCheckResult["result"]
+export type SmtpValue = {
+  server: string
+  port: number
+  from: string
+  login: string
+  password: string | null | undefined
+}
+
+export type CommandType = string | [string, ...string[]]
+
+export type DaemonReturned = {
+  wait(): Promise<unknown>
+  term(options?: { signal?: Signals; timeout?: number }): Promise<void>
+}
+
+export declare const hostName: unique symbol
+// asdflkjadsf.onion | 1.2.3.4
+export type Hostname = string & { [hostName]: never }
+
+export type HostnameInfoIp = {
+  kind: "ip"
+  networkInterfaceId: string
+  public: boolean
+  hostname:
+    | {
+        kind: "ipv4" | "ipv6" | "local"
+        value: string
+        port: number | null
+        sslPort: number | null
+      }
+    | {
+        kind: "domain"
+        domain: string
+        subdomain: string | null
+        port: number | null
+        sslPort: number | null
+      }
+}
+
+export type HostnameInfoOnion = {
+  kind: "onion"
+  hostname: { value: string; port: number | null; sslPort: number | null }
+}
+
+export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion
+
+export type ServiceInterfaceId = string
+
+export { ServiceInterface }
+export type ExposeServicePaths<Store = never> = {
+  /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
+  paths: ExposedStorePaths
+}
+
+export type SdkPropertiesValue =
+  | {
+      type: "object"
+      value: { [k: string]: SdkPropertiesValue }
+      description?: string
+    }
+  | {
+      type: "string"
+      /** The value to display to the user */
+      value: string
+      /** A human readable description or explanation of the value */
+      description?: string
+      /** Whether or not to mask the value, for example, when displaying a password */
+      masked?: boolean
+      /** Whether or not to include a button for copying the value to clipboard */
+      copyable?: boolean
+      /** Whether or not to include a button for displaying the value as a QR code */
+      qr?: boolean
+    }
+
+export type SdkPropertiesReturn = {
+  [key: string]: SdkPropertiesValue
+}
+
+export type PropertiesValue =
+  | {
+      /** The type of this value, either "string" or "object" */
+      type: "object"
+      /** A nested mapping of values. The user will experience this as a nested page with back button */
+      value: { [k: string]: PropertiesValue }
+      /** (optional) A human readable description of the new set of values */
+      description: string | null
+    }
+  | {
+      /** The type of this value, either "string" or "object" */
+      type: "string"
+      /** The value to display to the user */
+      value: string
+      /** A human readable description of the value */
+      description: string | null
+      /** Whether or not to mask the value, for example, when displaying a password */
+      masked: boolean | null
+      /** Whether or not to include a button for copying the value to clipboard */
+      copyable: boolean | null
+      /** Whether or not to include a button for displaying the value as a QR code */
+      qr: boolean | null
+    }
+
+export type PropertiesReturn = {
+  [key: string]: PropertiesValue
+}
+
+export type EffectMethod<T extends StringObject = Effects> = {
+  [K in keyof T]-?: K extends string
+    ? T[K] extends Function
+      ? ToKebab<K>
+      : T[K] extends StringObject
+        ? `${ToKebab<K>}.${EffectMethod<T[K]>}`
+        : never
+    : never
+}[keyof T]
+
+export type SyncOptions = {
+  /** delete files that exist in the target directory, but not in the source directory */
+  delete: boolean
+  /** do not sync files with paths that match these patterns */
+  exclude: string[]
+}
+
+/**
+ * This is the metadata that is returned from the metadata call.
+ */
+export type Metadata = {
+  fileType: string
+  isDir: boolean
+  isFile: boolean
+  isSymlink: boolean
+  len: number
+  modified?: Date
+  accessed?: Date
+  created?: Date
+  readonly: boolean
+  uid: number
+  gid: number
+  mode: number
+}
+
+export type ActionResult = {
+  version: "0"
+  message: string
+  value: string | null
+  copyable: boolean
+  qr: boolean
+}
+export type SetResult = {
+  dependsOn: DependsOn
+  signal: Signals
+}
+
+export type PackageId = string
+export type Message = string
+export type DependencyKind = "running" | "exists"
+
+export type DependsOn = {
+  [packageId: string]: string[] | readonly string[]
+}
+
+export type KnownError =
+  | { error: string }
+  | {
+      errorCode: [number, string] | readonly [number, string]
+    }
+
+export type Dependencies = Array<DependencyRequirement>
+
+export type DeepPartial<T> = T extends {}
+  ? { [P in keyof T]?: DeepPartial<T[P]> }
+  : T
diff --git a/sdk/base/lib/types/ManifestTypes.ts b/sdk/base/lib/types/ManifestTypes.ts
new file mode 100644
index 000000000..c416588b3
--- /dev/null
+++ b/sdk/base/lib/types/ManifestTypes.ts
@@ -0,0 +1,159 @@
+import { T } from ".."
+import { ImageId, ImageSource } from "../types"
+
+export type SDKManifest = {
+  /**
+   * The package identifier used by StartOS. This must be unique amongst all other known packages.
+   * @example nextcloud
+   * */
+  readonly id: string
+  /**
+   * The human readable name of your service
+   * @example Nextcloud
+   * */
+  readonly title: string
+  /**
+   * The name of the software license for this project. The license itself should be included in the root of the project directory.
+   * @example MIT
+   */
+  readonly license: string
+  /**
+   * URL of the StartOS package repository
+   * @example `https://github.com/Start9Labs/nextcloud-startos`
+   */
+  readonly wrapperRepo: string
+  /**
+   * URL of the upstream service repository
+   * @example `https://github.com/nextcloud/docker`
+   */
+  readonly upstreamRepo: string
+  /**
+   * URL where users can get help using the upstream service
+   * @example `https://github.com/nextcloud/docker/issues`
+   */
+  readonly supportSite: string
+  /**
+   * URL where users can learn more about the upstream service
+   * @example `https://nextcloud.com`
+   */
+  readonly marketingSite: string
+  /**
+   * (optional) URL where users can donate to the upstream project
+   * @example `https://nextcloud.com/contribute/`
+   */
+  readonly donationUrl: string | null
+  readonly description: {
+    /** Short description to display on the marketplace list page. Max length 80 chars. */
+    readonly short: string
+    /** Long description to display on the marketplace details page for this service. Max length 500 chars. */
+    readonly long: string
+  }
+  /**
+   * @description A mapping of OS images needed to run the container processes. Each image ID is a unique key.
+   * @example
+   * Using dockerTag...
+   *
+   * ```
+    images: {
+      main: {
+        source: {
+          dockerTag: 'start9/hello-world',
+        },
+      },
+    },
+   * ```
+   * @example
+   * Using dockerBuild...
+   *
+   * ```
+    images: {
+      main: {
+        source: {
+          dockerBuild: {
+            dockerFile: '../Dockerfile',
+            workdir: '.',
+          },
+        },
+      },
+    },
+   * ```
+   */
+  readonly images: Record<ImageId, SDKImageInputSpec>
+  /**
+   * @description A list of readonly asset directories that will mount to the container. Each item here must
+   *   correspond to a directory in the /assets directory of this project.
+   *
+   *   Most projects will not make use of this.
+   * @example []
+   */
+  readonly assets: string[]
+  /**
+   * @description A list of data volumes that will mount to the container. Must contain at least one volume.
+   * @example ['main']
+   */
+  readonly volumes: string[]
+
+  readonly alerts?: {
+    /** An warning alert requiring user confirmation before proceeding with initial installation of this service. */
+    readonly install?: string | null
+    /** An warning alert requiring user confirmation before updating this service. */
+    readonly update?: string | null
+    /** An warning alert requiring user confirmation before uninstalling this service. */
+    readonly uninstall?: string | null
+    /** An warning alert requiring user confirmation before restoring this service from backup. */
+    readonly restore?: string | null
+    /** An warning alert requiring user confirmation before starting this service. */
+    readonly start?: string | null
+    /** An warning alert requiring user confirmation before stopping this service. */
+    readonly stop?: string | null
+  }
+  /**
+   * @description A mapping of service dependencies to be displayed to users when viewing the Marketplace
+   * @property {string} description - An explanation of why this service is a dependency.
+   * @property {boolean} optional - Whether or not this dependency is required or contingent on user configuration.
+   * @property {string} s9pk - A path or url to an s9pk of the dependency to extract metadata at build time
+   * @example
+   * ```
+    dependencies: {
+      'hello-world': {
+        description: 'A moon needs a world',
+        optional: false,
+        s9pk: '',
+      },
+    },
+   * ```
+   */
+  readonly dependencies: Record<string, ManifestDependency>
+  /**
+   * @description (optional) A set of hardware requirements for this service. If the user's machine
+   *   does not meet these requirements, they will not be able to install this service.
+   * @property {object[]} devices - TODO Aiden confirm type on the left. List of required devices (displays or processors).
+   * @property {number} ram - Minimum RAM requirement (in megabytes MB)
+   * @property {string[]} arch - List of supported arches
+   * @example
+   * ```
+    TODO Aiden verify below and provide examples for devices
+    hardwareRequirements: {
+      devices: [
+        { class: 'display', value: '' },
+        { class: 'processor', value: '' },
+      ],
+      ram: 8192,
+      arch: ['x86-64'],
+    },
+   * ```
+   */
+  readonly hardwareRequirements?: {
+    readonly device?: { display?: RegExp; processor?: RegExp }
+    readonly ram?: number | null
+    readonly arch?: string[] | null
+  }
+}
+
+export type SDKImageInputSpec = {
+  source: Exclude<ImageSource, "packed">
+  arch?: string[]
+  emulateMissingAs?: string | null
+}
+
+export type ManifestDependency = T.Manifest["dependencies"][string]
diff --git a/sdk/lib/util/GetSystemSmtp.ts b/sdk/base/lib/util/GetSystemSmtp.ts
similarity index 90%
rename from sdk/lib/util/GetSystemSmtp.ts
rename to sdk/base/lib/util/GetSystemSmtp.ts
index 498a2d8b2..cd87a9db6 100644
--- a/sdk/lib/util/GetSystemSmtp.ts
+++ b/sdk/base/lib/util/GetSystemSmtp.ts
@@ -1,4 +1,4 @@
-import { Effects } from "../types"
+import { Effects } from "../Effects"
 
 export class GetSystemSmtp {
   constructor(readonly effects: Effects) {}
@@ -8,7 +8,7 @@ export class GetSystemSmtp {
    */
   const() {
     return this.effects.getSystemSmtp({
-      callback: this.effects.restart,
+      callback: () => this.effects.constRetry(),
     })
   }
   /**
diff --git a/sdk/lib/util/Hostname.ts b/sdk/base/lib/util/Hostname.ts
similarity index 100%
rename from sdk/lib/util/Hostname.ts
rename to sdk/base/lib/util/Hostname.ts
diff --git a/sdk/lib/store/PathBuilder.ts b/sdk/base/lib/util/PathBuilder.ts
similarity index 100%
rename from sdk/lib/store/PathBuilder.ts
rename to sdk/base/lib/util/PathBuilder.ts
diff --git a/sdk/base/lib/util/asError.ts b/sdk/base/lib/util/asError.ts
new file mode 100644
index 000000000..c3454e0e4
--- /dev/null
+++ b/sdk/base/lib/util/asError.ts
@@ -0,0 +1,9 @@
+export const asError = (e: unknown) => {
+  if (e instanceof Error) {
+    return new Error(e as any)
+  }
+  if (typeof e === "string") {
+    return new Error(`${e}`)
+  }
+  return new Error(`${JSON.stringify(e)}`)
+}
diff --git a/sdk/lib/util/deepEqual.ts b/sdk/base/lib/util/deepEqual.ts
similarity index 100%
rename from sdk/lib/util/deepEqual.ts
rename to sdk/base/lib/util/deepEqual.ts
diff --git a/sdk/base/lib/util/deepMerge.ts b/sdk/base/lib/util/deepMerge.ts
new file mode 100644
index 000000000..72392a887
--- /dev/null
+++ b/sdk/base/lib/util/deepMerge.ts
@@ -0,0 +1,86 @@
+export function partialDiff<T>(
+  prev: T,
+  next: T,
+): { diff: Partial<T> } | undefined {
+  if (prev === next) {
+    return
+  } else if (Array.isArray(prev) && Array.isArray(next)) {
+    const res = { diff: [] as any[] }
+    for (let newItem of next) {
+      let anyEq = false
+      for (let oldItem of prev) {
+        if (!partialDiff(oldItem, newItem)) {
+          anyEq = true
+          break
+        }
+      }
+      if (!anyEq) {
+        res.diff.push(newItem)
+      }
+    }
+    if (res.diff.length) {
+      return res as any
+    } else {
+      return
+    }
+  } else if (typeof prev === "object" && typeof next === "object") {
+    if (prev === null) {
+      return { diff: next }
+    }
+    if (next === null) return
+    const res = { diff: {} as Record<keyof T, any> }
+    for (let key in next) {
+      const diff = partialDiff(prev[key], next[key])
+      if (diff) {
+        res.diff[key] = diff.diff
+      }
+    }
+    if (Object.keys(res.diff).length) {
+      return res
+    } else {
+      return
+    }
+  } else {
+    return { diff: next }
+  }
+}
+
+export function deepMerge(...args: unknown[]): unknown {
+  const lastItem = (args as any)[args.length - 1]
+  if (typeof lastItem !== "object" || !lastItem) return lastItem
+  if (Array.isArray(lastItem))
+    return deepMergeList(
+      ...(args.filter((x) => Array.isArray(x)) as unknown[][]),
+    )
+  return deepMergeObject(
+    ...(args.filter(
+      (x) => typeof x === "object" && x && !Array.isArray(x),
+    ) as object[]),
+  )
+}
+
+function deepMergeList(...args: unknown[][]): unknown[] {
+  const res: unknown[] = []
+  for (let arg of args) {
+    for (let item of arg) {
+      if (!res.some((x) => !partialDiff(x, item))) {
+        res.push(item)
+      }
+    }
+  }
+  return res
+}
+
+function deepMergeObject(...args: object[]): object {
+  const lastItem = (args as any)[args.length - 1]
+  if (args.length === 0) return lastItem as any
+  if (args.length === 1) args.unshift({})
+  const allKeys = new Set(args.flatMap((x) => Object.keys(x)))
+  for (const key of allKeys) {
+    const filteredValues = args.flatMap((x) =>
+      key in x ? [(x as any)[key]] : [],
+    )
+    ;(args as any)[0][key] = deepMerge(...filteredValues)
+  }
+  return args[0] as any
+}
diff --git a/sdk/lib/util/getDefaultString.ts b/sdk/base/lib/util/getDefaultString.ts
similarity index 79%
rename from sdk/lib/util/getDefaultString.ts
rename to sdk/base/lib/util/getDefaultString.ts
index fa35b4e66..2bbf8d279 100644
--- a/sdk/lib/util/getDefaultString.ts
+++ b/sdk/base/lib/util/getDefaultString.ts
@@ -1,4 +1,4 @@
-import { DefaultString } from "../config/configTypes"
+import { DefaultString } from "../actions/input/inputSpecTypes"
 import { getRandomString } from "./getRandomString"
 
 export function getDefaultString(defaultSpec: DefaultString): string {
diff --git a/sdk/lib/util/getRandomCharInSet.ts b/sdk/base/lib/util/getRandomCharInSet.ts
similarity index 100%
rename from sdk/lib/util/getRandomCharInSet.ts
rename to sdk/base/lib/util/getRandomCharInSet.ts
diff --git a/sdk/lib/util/getRandomString.ts b/sdk/base/lib/util/getRandomString.ts
similarity index 79%
rename from sdk/lib/util/getRandomString.ts
rename to sdk/base/lib/util/getRandomString.ts
index ea0989bcd..7b52041d8 100644
--- a/sdk/lib/util/getRandomString.ts
+++ b/sdk/base/lib/util/getRandomString.ts
@@ -1,4 +1,4 @@
-import { RandomString } from "../config/configTypes"
+import { RandomString } from "../actions/input/inputSpecTypes"
 import { getRandomCharInSet } from "./getRandomCharInSet"
 
 export function getRandomString(generator: RandomString): string {
diff --git a/sdk/lib/util/getServiceInterface.ts b/sdk/base/lib/util/getServiceInterface.ts
similarity index 98%
rename from sdk/lib/util/getServiceInterface.ts
rename to sdk/base/lib/util/getServiceInterface.ts
index fd0fef779..cbbb345cb 100644
--- a/sdk/lib/util/getServiceInterface.ts
+++ b/sdk/base/lib/util/getServiceInterface.ts
@@ -1,8 +1,7 @@
-import { ServiceInterfaceType } from "../StartSdk"
+import { ServiceInterfaceType } from "../types"
 import { knownProtocols } from "../interfaces/Host"
 import {
   AddressInfo,
-  Effects,
   Host,
   HostAddress,
   Hostname,
@@ -11,6 +10,7 @@ import {
   HostnameInfoOnion,
   IpInfo,
 } from "../types"
+import { Effects } from "../Effects"
 
 export type UrlString = string
 export type HostId = string
@@ -232,7 +232,7 @@ export class GetServiceInterface {
    */
   async const() {
     const { id, packageId } = this.opts
-    const callback = this.effects.restart
+    const callback = () => this.effects.constRetry()
     const interfaceFilled = await makeInterfaceFilled({
       effects: this.effects,
       id,
diff --git a/sdk/lib/util/getServiceInterfaces.ts b/sdk/base/lib/util/getServiceInterfaces.ts
similarity index 96%
rename from sdk/lib/util/getServiceInterfaces.ts
rename to sdk/base/lib/util/getServiceInterfaces.ts
index 9f0e242b8..1d83684d6 100644
--- a/sdk/lib/util/getServiceInterfaces.ts
+++ b/sdk/base/lib/util/getServiceInterfaces.ts
@@ -1,4 +1,4 @@
-import { Effects } from "../types"
+import { Effects } from "../Effects"
 import {
   ServiceInterfaceFilled,
   filledAddress,
@@ -63,7 +63,7 @@ export class GetServiceInterfaces {
    */
   async const() {
     const { packageId } = this.opts
-    const callback = this.effects.restart
+    const callback = () => this.effects.constRetry()
     const interfaceFilled: ServiceInterfaceFilled[] =
       await makeManyInterfaceFilled({
         effects: this.effects,
diff --git a/sdk/lib/util/graph.ts b/sdk/base/lib/util/graph.ts
similarity index 100%
rename from sdk/lib/util/graph.ts
rename to sdk/base/lib/util/graph.ts
diff --git a/sdk/lib/util/inMs.test.ts b/sdk/base/lib/util/inMs.test.ts
similarity index 100%
rename from sdk/lib/util/inMs.test.ts
rename to sdk/base/lib/util/inMs.test.ts
diff --git a/sdk/lib/util/inMs.ts b/sdk/base/lib/util/inMs.ts
similarity index 95%
rename from sdk/lib/util/inMs.ts
rename to sdk/base/lib/util/inMs.ts
index 547fb8bea..548eb14bf 100644
--- a/sdk/lib/util/inMs.ts
+++ b/sdk/base/lib/util/inMs.ts
@@ -1,5 +1,3 @@
-import { DEFAULT_SIGTERM_TIMEOUT } from "../mainFn"
-
 const matchTimeRegex = /^\s*(\d+)?(\.\d+)?\s*(ms|s|m|h|d)/
 
 const unitMultiplier = (unit?: string) => {
diff --git a/sdk/base/lib/util/index.ts b/sdk/base/lib/util/index.ts
new file mode 100644
index 000000000..4c9e803bb
--- /dev/null
+++ b/sdk/base/lib/util/index.ts
@@ -0,0 +1,22 @@
+/// Currently being used
+export { addressHostToUrl } from "./getServiceInterface"
+export { getDefaultString } from "./getDefaultString"
+
+/// Not being used, but known to be browser compatible
+export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
+export { getServiceInterfaces } from "./getServiceInterfaces"
+export { once } from "./once"
+export { asError } from "./asError"
+export * as Patterns from "./patterns"
+export * from "./typeHelpers"
+export { GetSystemSmtp } from "./GetSystemSmtp"
+export { Graph, Vertex } from "./graph"
+export { inMs } from "./inMs"
+export { splitCommand } from "./splitCommand"
+export { nullIfEmpty } from "./nullIfEmpty"
+export { deepMerge, partialDiff } from "./deepMerge"
+export { deepEqual } from "./deepEqual"
+export { hostnameInfoToAddress } from "./Hostname"
+export { PathBuilder, extractJsonPath, StorePath } from "./PathBuilder"
+export * as regexes from "./regexes"
+export { stringFromStdErrOut } from "./stringFromStdErrOut"
diff --git a/sdk/base/lib/util/nullIfEmpty.ts b/sdk/base/lib/util/nullIfEmpty.ts
new file mode 100644
index 000000000..b24907b7d
--- /dev/null
+++ b/sdk/base/lib/util/nullIfEmpty.ts
@@ -0,0 +1,10 @@
+/**
+ * A useful tool when doing a getInputSpec.
+ * Look into the inputSpec {@link FileHelper} for an example of the use.
+ * @param s
+ * @returns
+ */
+export function nullIfEmpty<A extends Record<string, any>>(s: null | A) {
+  if (s === null) return null
+  return Object.keys(s).length === 0 ? null : s
+}
diff --git a/sdk/lib/util/once.ts b/sdk/base/lib/util/once.ts
similarity index 100%
rename from sdk/lib/util/once.ts
rename to sdk/base/lib/util/once.ts
diff --git a/sdk/lib/util/patterns.ts b/sdk/base/lib/util/patterns.ts
similarity index 96%
rename from sdk/lib/util/patterns.ts
rename to sdk/base/lib/util/patterns.ts
index ac281b081..2c9c7010d 100644
--- a/sdk/lib/util/patterns.ts
+++ b/sdk/base/lib/util/patterns.ts
@@ -1,4 +1,4 @@
-import { Pattern } from "../config/configTypes"
+import { Pattern } from "../actions/input/inputSpecTypes"
 import * as regexes from "./regexes"
 
 export const ipv6: Pattern = {
diff --git a/sdk/lib/util/regexes.ts b/sdk/base/lib/util/regexes.ts
similarity index 100%
rename from sdk/lib/util/regexes.ts
rename to sdk/base/lib/util/regexes.ts
diff --git a/sdk/lib/util/splitCommand.ts b/sdk/base/lib/util/splitCommand.ts
similarity index 100%
rename from sdk/lib/util/splitCommand.ts
rename to sdk/base/lib/util/splitCommand.ts
diff --git a/sdk/lib/util/stringFromStdErrOut.ts b/sdk/base/lib/util/stringFromStdErrOut.ts
similarity index 100%
rename from sdk/lib/util/stringFromStdErrOut.ts
rename to sdk/base/lib/util/stringFromStdErrOut.ts
diff --git a/sdk/lib/util/typeHelpers.ts b/sdk/base/lib/util/typeHelpers.ts
similarity index 100%
rename from sdk/lib/util/typeHelpers.ts
rename to sdk/base/lib/util/typeHelpers.ts
diff --git a/sdk/base/package-lock.json b/sdk/base/package-lock.json
new file mode 100644
index 000000000..3a8e40c0c
--- /dev/null
+++ b/sdk/base/package-lock.json
@@ -0,0 +1,4677 @@
+{
+  "name": "@start9labs/start-sdk-base",
+  "version": "0.3.6-alpha8",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@start9labs/start-sdk-base",
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
+        "isomorphic-fetch": "^3.0.0",
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
+        "ts-matches": "^5.5.1",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "@types/lodash.merge": "^4.6.2",
+        "jest": "^29.4.3",
+        "peggy": "^3.0.2",
+        "prettier": "^3.2.5",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
+      "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.21.3",
+        "@babel/helper-compilation-targets": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.21.2",
+        "@babel/helpers": "^7.21.0",
+        "@babel/parser": "^7.21.3",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.3",
+        "@babel/types": "^7.21.3",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.2",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
+      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.21.3",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
+      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.20.2",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.2",
+        "@babel/types": "^7.21.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
+      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
+      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
+      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
+      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
+      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
+      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.21.3",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.21.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.21.3",
+        "@babel/types": "^7.21.3",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
+      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@iarna/toml": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
+      "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
+      "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/reporters": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.5.0",
+        "jest-config": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-resolve-dependencies": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "jest-watcher": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
+      "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-mock": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.5.0",
+        "jest-snapshot": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
+      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^29.4.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
+      "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
+      "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "jest-mock": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
+      "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
+      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
+      "dev": true,
+      "dependencies": {
+        "@sinclair/typebox": "^0.25.16"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
+      "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
+      "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
+      "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^29.5.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
+      "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.5.0",
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.4.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@noble/curves": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
+      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.25.24",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
+      "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==",
+      "dev": true
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
+      "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz",
+      "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^2.0.0"
+      }
+    },
+    "node_modules/@ts-morph/common": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.19.0.tgz",
+      "integrity": "sha512-Unz/WHmd4pGax91rdIKWi51wnVUW11QttMEPpBiBgIewnc9UQIX7UDLxr5vRlqeByXCwhkF6VabSsI0raWcyAQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.2.12",
+        "minimatch": "^7.4.3",
+        "mkdirp": "^2.1.6",
+        "path-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/minimatch": {
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz",
+      "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
+      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
+      "dev": true
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
+      "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
+      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
+      "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+      "dev": true
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.0.tgz",
+      "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.5",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz",
+      "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==",
+      "dev": true
+    },
+    "node_modules/@types/lodash.merge": {
+      "version": "4.6.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz",
+      "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "18.15.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz",
+      "integrity": "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==",
+      "dev": true
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz",
+      "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==",
+      "dev": true
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+      "dev": true
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
+      "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^29.5.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.5.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.5.0",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.21.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
+      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001449",
+        "electron-to-chromium": "^1.4.284",
+        "node-releases": "^2.0.8",
+        "update-browserslist-db": "^1.0.10"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001470",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001470.tgz",
+      "integrity": "sha512-065uNwY6QtHCBOExzbV6m236DDhYCCtPmQUCoQtwkVqzud8v5QPidoMr6CoMkC2nfp6nksjttqWQRRh75LqUmA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "dev": true
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/code-block-writer": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
+      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
+      "dev": true
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.341",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.341.tgz",
+      "integrity": "sha512-R4A8VfUBQY9WmAhuqY5tjHRf5fH2AAf6vqitBOE0y6u2PgHgqHSrhZmu78dIX3fVZtjqlwJNX1i2zwC3VpHtQQ==",
+      "dev": true
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/expect-utils": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-tsconfig": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
+      "dev": true,
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isomorphic-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+      "dependencies": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      }
+    },
+    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
+      "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.5.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0",
+        "p-limit": "^3.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
+      "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.5.0",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.5.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
+      "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "prompts": "^2.0.1",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
+      "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "babel-jest": "^29.5.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.5.0",
+        "jest-environment-node": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
+      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
+      "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
+      "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
+      "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
+      "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
+      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
+      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.5.0",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
+      "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
+      "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
+      "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
+      "dev": true,
+      "dependencies": {
+        "jest-regex-util": "^29.4.3",
+        "jest-snapshot": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
+      "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/environment": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.4.3",
+        "jest-environment-node": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-leak-detector": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-resolve": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-watcher": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
+      "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/globals": "^29.5.0",
+        "@jest/source-map": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
+      "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/babel__traverse": "^7.0.6",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.5.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.5.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/jest-util": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
+      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
+      "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
+      "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.5.0",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
+      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.5.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
+      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
+      "bin": {
+        "mime": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
+      "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
+      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+      "dev": true
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/peggy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/peggy/-/peggy-3.0.2.tgz",
+      "integrity": "sha512-n7chtCbEoGYRwZZ0i/O3t1cPr6o+d9Xx4Zwy2LYfzv0vjchMBU0tO+qYYyvZloBPcgRgzYvALzGWHe609JjEpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^10.0.0",
+        "source-map-generator": "0.8.0"
+      },
+      "bin": {
+        "peggy": "bin/peggy.js"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
+      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.4.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz",
+      "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ]
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "dev": true
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-generator": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/source-map-generator/-/source-map-generator-0.8.0.tgz",
+      "integrity": "sha512-psgxdGMwl5MZM9S3FWee4EgsEaIjahYV5AzGnwUvPhWeITz/j6rKpysQHlQ4USdxvINlb8lKfWGIXwfkrgtqkA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/ts-jest": {
+      "version": "29.0.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.0.5.tgz",
+      "integrity": "sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==",
+      "dev": true,
+      "dependencies": {
+        "bs-logger": "0.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^29.0.0",
+        "json5": "^2.2.3",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "^21.0.1"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/types": "^29.0.0",
+        "babel-jest": "^29.0.0",
+        "jest": "^29.0.0",
+        "typescript": ">=4.3"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@jest/types": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-jest/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/ts-matches": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
+      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
+    },
+    "node_modules/ts-morph": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-18.0.0.tgz",
+      "integrity": "sha512-Kg5u0mk19PIIe4islUI/HWRvm9bC1lHejK4S0oh1zaZ77TMZAEmQC0sHQYiu2RgCQFZKXz1fMVi/7nOOeirznA==",
+      "dev": true,
+      "dependencies": {
+        "@ts-morph/common": "~0.19.0",
+        "code-block-writer": "^12.0.0"
+      }
+    },
+    "node_modules/ts-node": {
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-pegjs": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ts-pegjs/-/ts-pegjs-4.2.1.tgz",
+      "integrity": "sha512-mK/O2pu6lzWUeKpEMA/wsa0GdYblfjJI1y0s0GqH6xCTvugQDOWPJbm5rY6AHivpZICuXIriCb+a7Cflbdtc2w==",
+      "dev": true,
+      "dependencies": {
+        "prettier": "^2.8.8",
+        "ts-morph": "^18.0.0"
+      },
+      "bin": {
+        "tspegjs": "dist/cli.mjs"
+      },
+      "peerDependencies": {
+        "peggy": "^3.0.2"
+      }
+    },
+    "node_modules/ts-pegjs/node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/tsx": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.1.tgz",
+      "integrity": "sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "~0.19.10",
+        "get-tsconfig": "^4.7.2"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/esbuild": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
+      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.19.12",
+        "@esbuild/android-arm": "0.19.12",
+        "@esbuild/android-arm64": "0.19.12",
+        "@esbuild/android-x64": "0.19.12",
+        "@esbuild/darwin-arm64": "0.19.12",
+        "@esbuild/darwin-x64": "0.19.12",
+        "@esbuild/freebsd-arm64": "0.19.12",
+        "@esbuild/freebsd-x64": "0.19.12",
+        "@esbuild/linux-arm": "0.19.12",
+        "@esbuild/linux-arm64": "0.19.12",
+        "@esbuild/linux-ia32": "0.19.12",
+        "@esbuild/linux-loong64": "0.19.12",
+        "@esbuild/linux-mips64el": "0.19.12",
+        "@esbuild/linux-ppc64": "0.19.12",
+        "@esbuild/linux-riscv64": "0.19.12",
+        "@esbuild/linux-s390x": "0.19.12",
+        "@esbuild/linux-x64": "0.19.12",
+        "@esbuild/netbsd-x64": "0.19.12",
+        "@esbuild/openbsd-x64": "0.19.12",
+        "@esbuild/sunos-x64": "0.19.12",
+        "@esbuild/win32-arm64": "0.19.12",
+        "@esbuild/win32-ia32": "0.19.12",
+        "@esbuild/win32-x64": "0.19.12"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist-lint": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-fetch": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz",
+      "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/sdk/base/package.json b/sdk/base/package.json
new file mode 100644
index 000000000..a290d2a75
--- /dev/null
+++ b/sdk/base/package.json
@@ -0,0 +1,51 @@
+{
+  "name": "@start9labs/start-sdk-base",
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "sideEffects": true,
+  "scripts": {
+    "peggy": "peggy --allowed-start-rules '*' --plugin ./node_modules/ts-pegjs/dist/tspegjs -o lib/exver/exver.ts lib/exver/exver.pegjs",
+    "test": "jest -c ./jest.config.js --coverage",
+    "buildOutput": "npx prettier --write '**/*.ts'",
+    "check": "tsc --noEmit",
+    "tsc": "tsc"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Start9Labs/start-sdk.git"
+  },
+  "author": "Start9 Labs",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/Start9Labs/start-sdk/issues"
+  },
+  "homepage": "https://github.com/Start9Labs/start-sdk#readme",
+  "dependencies": {
+    "isomorphic-fetch": "^3.0.0",
+    "lodash.merge": "^4.6.2",
+    "mime": "^4.0.3",
+    "ts-matches": "^5.5.1",
+    "yaml": "^2.2.2",
+    "@iarna/toml": "^2.2.5",
+    "@noble/curves": "^1.4.0",
+    "@noble/hashes": "^1.4.0"
+  },
+  "prettier": {
+    "trailingComma": "all",
+    "tabWidth": 2,
+    "semi": false,
+    "singleQuote": false
+  },
+  "devDependencies": {
+    "@types/jest": "^29.4.0",
+    "@types/lodash.merge": "^4.6.2",
+    "jest": "^29.4.3",
+    "peggy": "^3.0.2",
+    "prettier": "^3.2.5",
+    "ts-jest": "^29.0.5",
+    "ts-node": "^10.9.1",
+    "ts-pegjs": "^4.2.1",
+    "tsx": "^4.7.1",
+    "typescript": "^5.0.4"
+  }
+}
diff --git a/sdk/tsconfig-base.json b/sdk/base/tsconfig.json
similarity index 78%
rename from sdk/tsconfig-base.json
rename to sdk/base/tsconfig.json
index cc14a817c..cd73f3164 100644
--- a/sdk/tsconfig-base.json
+++ b/sdk/base/tsconfig.json
@@ -1,18 +1,18 @@
 {
   "compilerOptions": {
-    "module": "esnext",
     "strict": true,
-    "outDir": "dist",
     "preserveConstEnums": true,
     "sourceMap": true,
-    "target": "es2017",
     "pretty": true,
     "declaration": true,
     "noImplicitAny": true,
     "esModuleInterop": true,
     "types": ["node", "jest"],
     "moduleResolution": "node",
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "module": "commonjs",
+    "outDir": "../baseDist",
+    "target": "es2018"
   },
   "include": ["lib/**/*"],
   "exclude": ["lib/**/*.spec.ts", "lib/**/*.gen.ts", "list", "node_modules"]
diff --git a/sdk/lib/Dependency.ts b/sdk/lib/Dependency.ts
deleted file mode 100644
index 067ed653e..000000000
--- a/sdk/lib/Dependency.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { VersionRange } from "./exver"
-
-export class Dependency {
-  constructor(
-    readonly data:
-      | {
-          type: "running"
-          versionRange: VersionRange
-          registryUrl: string
-          healthChecks: string[]
-        }
-      | {
-          type: "exists"
-          versionRange: VersionRange
-          registryUrl: string
-        },
-  ) {}
-}
diff --git a/sdk/lib/StartSdk.ts b/sdk/lib/StartSdk.ts
deleted file mode 100644
index 87c4e14ce..000000000
--- a/sdk/lib/StartSdk.ts
+++ /dev/null
@@ -1,805 +0,0 @@
-import { RequiredDefault, Value } from "./config/builder/value"
-import { Config, ExtractConfigType, LazyBuild } from "./config/builder/config"
-import {
-  DefaultString,
-  ListValueSpecText,
-  Pattern,
-  RandomString,
-  UniqueBy,
-  ValueSpecDatetime,
-  ValueSpecText,
-} from "./config/configTypes"
-import { Variants } from "./config/builder/variants"
-import { CreatedAction, createAction } from "./actions/createAction"
-import {
-  ActionMetadata,
-  Effects,
-  ActionResult,
-  BackupOptions,
-  DeepPartial,
-  MaybePromise,
-  ServiceInterfaceId,
-  PackageId,
-} from "./types"
-import * as patterns from "./util/patterns"
-import { DependencyConfig, Update } from "./dependencies/DependencyConfig"
-import { BackupSet, Backups } from "./backup/Backups"
-import { smtpConfig } from "./config/configConstants"
-import { Daemons } from "./mainFn/Daemons"
-import { healthCheck, HealthCheckParams } from "./health/HealthCheck"
-import { checkPortListening } from "./health/checkFns/checkPortListening"
-import { checkWebUrl, runHealthScript } from "./health/checkFns"
-import { List } from "./config/builder/list"
-import { Install, InstallFn } from "./inits/setupInstall"
-import { setupActions } from "./actions/setupActions"
-import { setupDependencyConfig } from "./dependencies/setupDependencyConfig"
-import { SetupBackupsParams, setupBackups } from "./backup/setupBackups"
-import { setupInit } from "./inits/setupInit"
-import { Uninstall, UninstallFn, setupUninstall } from "./inits/setupUninstall"
-import { setupMain } from "./mainFn"
-import { defaultTrigger } from "./trigger/defaultTrigger"
-import { changeOnFirstSuccess, cooldownTrigger } from "./trigger"
-import setupConfig, {
-  DependenciesReceipt,
-  Read,
-  Save,
-} from "./config/setupConfig"
-import {
-  InterfacesReceipt,
-  SetInterfaces,
-  setupInterfaces,
-} from "./interfaces/setupInterfaces"
-import { successFailure } from "./trigger/successFailure"
-import { HealthReceipt } from "./health/HealthReceipt"
-import { MultiHost, Scheme } from "./interfaces/Host"
-import { ServiceInterfaceBuilder } from "./interfaces/ServiceInterfaceBuilder"
-import { GetSystemSmtp } from "./util/GetSystemSmtp"
-import nullIfEmpty from "./util/nullIfEmpty"
-import {
-  GetServiceInterface,
-  getServiceInterface,
-} from "./util/getServiceInterface"
-import { getServiceInterfaces } from "./util/getServiceInterfaces"
-import { getStore } from "./store/getStore"
-import { CommandOptions, MountOptions, SubContainer } from "./util/SubContainer"
-import { splitCommand } from "./util/splitCommand"
-import { Mounts } from "./mainFn/Mounts"
-import { Dependency } from "./Dependency"
-import * as T from "./types"
-import { testTypeVersion, ValidateExVer } from "./exver"
-import { ExposedStorePaths } from "./store/setupExposeStore"
-import { PathBuilder, extractJsonPath, pathBuilder } from "./store/PathBuilder"
-import {
-  CheckDependencies,
-  checkDependencies,
-} from "./dependencies/dependencies"
-import { health } from "."
-import { GetSslCertificate } from "./util/GetSslCertificate"
-import { VersionGraph } from "./version"
-
-export const SDKVersion = testTypeVersion("0.3.6")
-
-// prettier-ignore
-type AnyNeverCond<T extends any[], Then, Else> = 
-    T extends [] ? Else :
-    T extends [never, ...Array<any>] ? Then :
-    T extends [any, ...infer U] ? AnyNeverCond<U,Then, Else> :
-    never
-
-export type ServiceInterfaceType = "ui" | "p2p" | "api"
-export type MainEffects = Effects & {
-  _type: "main"
-  clearCallbacks: () => Promise<void>
-}
-export type Signals = NodeJS.Signals
-export const SIGTERM: Signals = "SIGTERM"
-export const SIGKILL: Signals = "SIGKILL"
-export const NO_TIMEOUT = -1
-
-function removeCallbackTypes<E extends Effects>(effects: E) {
-  return <T extends object>(t: T) => {
-    if ("_type" in effects && effects._type === "main") {
-      return t as E extends MainEffects ? T : Omit<T, "const" | "watch">
-    } else {
-      if ("const" in t) {
-        delete t.const
-      }
-      if ("watch" in t) {
-        delete t.watch
-      }
-      return t as E extends MainEffects ? T : Omit<T, "const" | "watch">
-    }
-  }
-}
-
-export class StartSdk<Manifest extends T.Manifest, Store> {
-  private constructor(readonly manifest: Manifest) {}
-  static of() {
-    return new StartSdk<never, never>(null as never)
-  }
-  withManifest<Manifest extends T.Manifest = never>(manifest: Manifest) {
-    return new StartSdk<Manifest, Store>(manifest)
-  }
-  withStore<Store extends Record<string, any>>() {
-    return new StartSdk<Manifest, Store>(this.manifest)
-  }
-
-  build(isReady: AnyNeverCond<[Manifest, Store], "Build not ready", true>) {
-    type DependencyType = {
-      [K in keyof {
-        [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false
-          ? K
-          : never
-      }]: Dependency
-    } & {
-      [K in keyof {
-        [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends true
-          ? K
-          : never
-      }]?: Dependency
-    }
-
-    type NestedEffects = "subcontainer" | "store"
-    type InterfaceEffects =
-      | "getServiceInterface"
-      | "listServiceInterfaces"
-      | "exportServiceInterface"
-      | "clearServiceInterfaces"
-      | "bind"
-      | "getHostInfo"
-      | "getPrimaryUrl"
-    type MainUsedEffects = "setMainStatus" | "setHealth"
-    type AlreadyExposed = "getSslCertificate" | "getSystemSmtp"
-
-    // prettier-ignore
-    type StartSdkEffectWrapper = {
-      [K in keyof Omit<Effects, NestedEffects | InterfaceEffects | MainUsedEffects| AlreadyExposed>]: (effects: Effects, ...args: Parameters<Effects[K]>) => ReturnType<Effects[K]>
-    }
-    const startSdkEffectWrapper: StartSdkEffectWrapper = {
-      executeAction: (effects, ...args) => effects.executeAction(...args),
-      exportAction: (effects, ...args) => effects.exportAction(...args),
-      clearActions: (effects, ...args) => effects.clearActions(...args),
-      getConfigured: (effects, ...args) => effects.getConfigured(...args),
-      setConfigured: (effects, ...args) => effects.setConfigured(...args),
-      restart: (effects, ...args) => effects.restart(...args),
-      setDependencies: (effects, ...args) => effects.setDependencies(...args),
-      checkDependencies: (effects, ...args) =>
-        effects.checkDependencies(...args),
-      mount: (effects, ...args) => effects.mount(...args),
-      getInstalledPackages: (effects, ...args) =>
-        effects.getInstalledPackages(...args),
-      exposeForDependents: (effects, ...args) =>
-        effects.exposeForDependents(...args),
-      getServicePortForward: (effects, ...args) =>
-        effects.getServicePortForward(...args),
-      clearBindings: (effects, ...args) => effects.clearBindings(...args),
-      getContainerIp: (effects, ...args) => effects.getContainerIp(...args),
-      getSslKey: (effects, ...args) => effects.getSslKey(...args),
-      setDataVersion: (effects, ...args) => effects.setDataVersion(...args),
-      getDataVersion: (effects, ...args) => effects.getDataVersion(...args),
-      shutdown: (effects, ...args) => effects.shutdown(...args),
-      getDependencies: (effects, ...args) => effects.getDependencies(...args),
-    }
-
-    return {
-      ...startSdkEffectWrapper,
-
-      checkDependencies: checkDependencies as <
-        DependencyId extends keyof Manifest["dependencies"] &
-          PackageId = keyof Manifest["dependencies"] & PackageId,
-      >(
-        effects: Effects,
-        packageIds?: DependencyId[],
-      ) => Promise<CheckDependencies<DependencyId>>,
-      serviceInterface: {
-        getOwn: <E extends Effects>(effects: E, id: ServiceInterfaceId) =>
-          removeCallbackTypes<E>(effects)(
-            getServiceInterface(effects, {
-              id,
-            }),
-          ),
-        get: <E extends Effects>(
-          effects: E,
-          opts: { id: ServiceInterfaceId; packageId: PackageId },
-        ) =>
-          removeCallbackTypes<E>(effects)(getServiceInterface(effects, opts)),
-        getAllOwn: <E extends Effects>(effects: E) =>
-          removeCallbackTypes<E>(effects)(getServiceInterfaces(effects, {})),
-        getAll: <E extends Effects>(
-          effects: E,
-          opts: { packageId: PackageId },
-        ) =>
-          removeCallbackTypes<E>(effects)(getServiceInterfaces(effects, opts)),
-      },
-
-      store: {
-        get: <E extends Effects, StoreValue = unknown>(
-          effects: E,
-          packageId: string,
-          path: PathBuilder<Store, StoreValue>,
-        ) =>
-          removeCallbackTypes<E>(effects)(
-            getStore<Store, StoreValue>(effects, path, {
-              packageId,
-            }),
-          ),
-        getOwn: <E extends Effects, StoreValue = unknown>(
-          effects: E,
-          path: PathBuilder<Store, StoreValue>,
-        ) =>
-          removeCallbackTypes<E>(effects)(
-            getStore<Store, StoreValue>(effects, path),
-          ),
-        setOwn: <E extends Effects, Path extends PathBuilder<Store, unknown>>(
-          effects: E,
-          path: Path,
-          value: Path extends PathBuilder<Store, infer Value> ? Value : never,
-        ) =>
-          effects.store.set<Store>({
-            value,
-            path: extractJsonPath(path),
-          }),
-      },
-
-      host: {
-        // static: (effects: Effects, id: string) =>
-        //   new StaticHost({ id, effects }),
-        // single: (effects: Effects, id: string) =>
-        //   new SingleHost({ id, effects }),
-        multi: (effects: Effects, id: string) => new MultiHost({ id, effects }),
-      },
-      nullIfEmpty,
-      runCommand: async <A extends string>(
-        effects: Effects,
-        image: {
-          id: keyof Manifest["images"] & T.ImageId
-          sharedRun?: boolean
-        },
-        command: T.CommandType,
-        options: CommandOptions & {
-          mounts?: { path: string; options: MountOptions }[]
-        },
-      ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
-        return runCommand<Manifest>(effects, image, command, options)
-      },
-
-      createAction: <
-        ConfigType extends
-          | Record<string, any>
-          | Config<any, any>
-          | Config<any, never>,
-        Type extends Record<string, any> = ExtractConfigType<ConfigType>,
-      >(
-        id: string,
-        metaData: Omit<ActionMetadata, "input"> & {
-          input: Config<Type, Store> | Config<Type, never>
-        },
-        fn: (options: {
-          effects: Effects
-          input: Type
-        }) => Promise<ActionResult>,
-      ) => {
-        const { input, ...rest } = metaData
-        return createAction<Manifest, Store, ConfigType, Type>(
-          id,
-          rest,
-          fn,
-          input,
-        )
-      },
-      configConstants: { smtpConfig },
-      createInterface: (
-        effects: Effects,
-        options: {
-          name: string
-          id: string
-          description: string
-          hasPrimary: boolean
-          type: ServiceInterfaceType
-          username: null | string
-          path: string
-          search: Record<string, string>
-          schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
-          masked: boolean
-        },
-      ) => new ServiceInterfaceBuilder({ ...options, effects }),
-      getSystemSmtp: <E extends Effects>(effects: E) =>
-        removeCallbackTypes<E>(effects)(new GetSystemSmtp(effects)),
-
-      getSslCerificate: <E extends Effects>(
-        effects: E,
-        hostnames: string[],
-        algorithm?: T.Algorithm,
-      ) =>
-        removeCallbackTypes<E>(effects)(
-          new GetSslCertificate(effects, hostnames, algorithm),
-        ),
-
-      createDynamicAction: <
-        ConfigType extends
-          | Record<string, any>
-          | Config<any, any>
-          | Config<any, never>,
-        Type extends Record<string, any> = ExtractConfigType<ConfigType>,
-      >(
-        id: string,
-        metaData: (options: {
-          effects: Effects
-        }) => MaybePromise<Omit<ActionMetadata, "input">>,
-        fn: (options: {
-          effects: Effects
-          input: Type
-        }) => Promise<ActionResult>,
-        input: Config<Type, Store> | Config<Type, never>,
-      ) => {
-        return createAction<Manifest, Store, ConfigType, Type>(
-          id,
-          metaData,
-          fn,
-          input,
-        )
-      },
-      HealthCheck: {
-        of(o: HealthCheckParams) {
-          return healthCheck(o)
-        },
-      },
-      Dependency: {
-        of(data: Dependency["data"]) {
-          return new Dependency({ ...data })
-        },
-      },
-      healthCheck: {
-        checkPortListening,
-        checkWebUrl,
-        runHealthScript,
-      },
-      patterns,
-      setupActions: (...createdActions: CreatedAction<any, any, any>[]) =>
-        setupActions<Manifest, Store>(...createdActions),
-      setupBackups: (...args: SetupBackupsParams<Manifest>) =>
-        setupBackups<Manifest>(this.manifest, ...args),
-      setupConfig: <
-        ConfigType extends Config<any, Store> | Config<any, never>,
-        Type extends Record<string, any> = ExtractConfigType<ConfigType>,
-      >(
-        spec: ConfigType,
-        write: Save<Type>,
-        read: Read<Manifest, Store, Type>,
-      ) => setupConfig<Store, ConfigType, Manifest, Type>(spec, write, read),
-      setupConfigRead: <
-        ConfigSpec extends
-          | Config<Record<string, any>, any>
-          | Config<Record<string, never>, never>,
-      >(
-        _configSpec: ConfigSpec,
-        fn: Read<Manifest, Store, ConfigSpec>,
-      ) => fn,
-      setupConfigSave: <
-        ConfigSpec extends
-          | Config<Record<string, any>, any>
-          | Config<Record<string, never>, never>,
-      >(
-        _configSpec: ConfigSpec,
-        fn: Save<ConfigSpec>,
-      ) => fn,
-      setupDependencyConfig: <Input extends Record<string, any>>(
-        config: Config<Input, Store> | Config<Input, never>,
-        autoConfigs: {
-          [K in keyof Manifest["dependencies"]]: DependencyConfig<
-            Manifest,
-            Store,
-            Input,
-            any
-          > | null
-        },
-      ) => setupDependencyConfig<Store, Input, Manifest>(config, autoConfigs),
-      setupDependencies: <Input extends Record<string, any>>(
-        fn: (options: {
-          effects: Effects
-          input: Input | null
-        }) => Promise<DependencyType>,
-      ) => {
-        return async (options: { effects: Effects; input: Input }) => {
-          const dependencyType = await fn(options)
-          return await options.effects.setDependencies({
-            dependencies: Object.entries(dependencyType).map(
-              ([
-                id,
-                {
-                  data: { versionRange, ...x },
-                },
-              ]) => ({
-                id,
-                ...x,
-                ...(x.type === "running"
-                  ? {
-                      kind: "running",
-                      healthChecks: x.healthChecks,
-                    }
-                  : {
-                      kind: "exists",
-                    }),
-                versionRange: versionRange.toString(),
-              }),
-            ),
-          })
-        }
-      },
-      setupInit: (
-        versions: VersionGraph<Manifest["version"]>,
-        install: Install<Manifest, Store>,
-        uninstall: Uninstall<Manifest, Store>,
-        setInterfaces: SetInterfaces<Manifest, Store, any, any>,
-        setDependencies: (options: {
-          effects: Effects
-          input: any
-        }) => Promise<DependenciesReceipt>,
-        exposedStore: ExposedStorePaths,
-      ) =>
-        setupInit<Manifest, Store>(
-          versions,
-          install,
-          uninstall,
-          setInterfaces,
-          setDependencies,
-          exposedStore,
-        ),
-      setupInstall: (fn: InstallFn<Manifest, Store>) => Install.of(fn),
-      setupInterfaces: <
-        ConfigInput extends Record<string, any>,
-        Output extends InterfacesReceipt,
-      >(
-        config: Config<ConfigInput, Store>,
-        fn: SetInterfaces<Manifest, Store, ConfigInput, Output>,
-      ) => setupInterfaces(config, fn),
-      setupMain: (
-        fn: (o: {
-          effects: MainEffects
-          started(onTerm: () => PromiseLike<void>): PromiseLike<void>
-        }) => Promise<Daemons<Manifest, any>>,
-      ) => setupMain<Manifest, Store>(fn),
-      setupProperties:
-        (
-          fn: (options: { effects: Effects }) => Promise<T.SdkPropertiesReturn>,
-        ): T.ExpectedExports.properties =>
-        (options) =>
-          fn(options).then(nullifyProperties),
-      setupUninstall: (fn: UninstallFn<Manifest, Store>) =>
-        setupUninstall<Manifest, Store>(fn),
-      trigger: {
-        defaultTrigger,
-        cooldownTrigger,
-        changeOnFirstSuccess,
-        successFailure,
-      },
-      Mounts: {
-        of() {
-          return Mounts.of<Manifest>()
-        },
-      },
-      Backups: {
-        volumes: (
-          ...volumeNames: Array<Manifest["volumes"][number] & string>
-        ) => Backups.volumes<Manifest>(...volumeNames),
-        addSets: (
-          ...options: BackupSet<Manifest["volumes"][number] & string>[]
-        ) => Backups.addSets<Manifest>(...options),
-        withOptions: (options?: Partial<BackupOptions>) =>
-          Backups.with_options<Manifest>(options),
-      },
-      Config: {
-        of: <
-          Spec extends Record<string, Value<any, Store> | Value<any, never>>,
-        >(
-          spec: Spec,
-        ) => Config.of<Spec, Store>(spec),
-      },
-      Daemons: {
-        of(config: {
-          effects: Effects
-          started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
-          healthReceipts: HealthReceipt[]
-        }) {
-          return Daemons.of<Manifest>(config)
-        },
-      },
-      DependencyConfig: {
-        of<
-          LocalConfig extends Record<string, any>,
-          RemoteConfig extends Record<string, any>,
-        >({
-          localConfigSpec,
-          remoteConfigSpec,
-          dependencyConfig,
-          update,
-        }: {
-          localConfigSpec:
-            | Config<LocalConfig, Store>
-            | Config<LocalConfig, never>
-          remoteConfigSpec:
-            | Config<RemoteConfig, any>
-            | Config<RemoteConfig, never>
-          dependencyConfig: (options: {
-            effects: Effects
-            localConfig: LocalConfig
-          }) => Promise<void | DeepPartial<RemoteConfig>>
-          update?: Update<void | DeepPartial<RemoteConfig>, RemoteConfig>
-        }) {
-          return new DependencyConfig<
-            Manifest,
-            Store,
-            LocalConfig,
-            RemoteConfig
-          >(dependencyConfig, update)
-        },
-      },
-      List: {
-        text: List.text,
-        obj: <Type extends Record<string, any>>(
-          a: {
-            name: string
-            description?: string | null
-            warning?: string | null
-            /** Default [] */
-            default?: []
-            minLength?: number | null
-            maxLength?: number | null
-          },
-          aSpec: {
-            spec: Config<Type, Store>
-            displayAs?: null | string
-            uniqueBy?: null | UniqueBy
-          },
-        ) => List.obj<Type, Store>(a, aSpec),
-        dynamicText: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              /** Default = [] */
-              default?: string[]
-              minLength?: number | null
-              maxLength?: number | null
-              disabled?: false | string
-              generate?: null | RandomString
-              spec: {
-                /** Default = false */
-                masked?: boolean
-                placeholder?: string | null
-                minLength?: number | null
-                maxLength?: number | null
-                patterns: Pattern[]
-                /** Default = "text" */
-                inputmode?: ListValueSpecText["inputmode"]
-              }
-            }
-          >,
-        ) => List.dynamicText<Store>(getA),
-      },
-      StorePath: pathBuilder<Store>(),
-      Value: {
-        toggle: Value.toggle,
-        text: Value.text,
-        textarea: Value.textarea,
-        number: Value.number,
-        color: Value.color,
-        datetime: Value.datetime,
-        select: Value.select,
-        multiselect: Value.multiselect,
-        object: Value.object,
-        union: Value.union,
-        list: Value.list,
-        dynamicToggle: (
-          a: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              default: boolean
-              disabled?: false | string
-            }
-          >,
-        ) => Value.dynamicToggle<Store>(a),
-        dynamicText: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              required: RequiredDefault<DefaultString>
-
-              /** Default = false */
-              masked?: boolean
-              placeholder?: string | null
-              minLength?: number | null
-              maxLength?: number | null
-              patterns?: Pattern[]
-              /** Default = 'text' */
-              inputmode?: ValueSpecText["inputmode"]
-              generate?: null | RandomString
-            }
-          >,
-        ) => Value.dynamicText<Store>(getA),
-        dynamicTextarea: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              required: boolean
-              minLength?: number | null
-              maxLength?: number | null
-              placeholder?: string | null
-              disabled?: false | string
-              generate?: null | RandomString
-            }
-          >,
-        ) => Value.dynamicTextarea<Store>(getA),
-        dynamicNumber: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              required: RequiredDefault<number>
-              min?: number | null
-              max?: number | null
-              /** Default = '1' */
-              step?: number | null
-              integer: boolean
-              units?: string | null
-              placeholder?: string | null
-              disabled?: false | string
-            }
-          >,
-        ) => Value.dynamicNumber<Store>(getA),
-        dynamicColor: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              required: RequiredDefault<string>
-
-              disabled?: false | string
-            }
-          >,
-        ) => Value.dynamicColor<Store>(getA),
-        dynamicDatetime: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              required: RequiredDefault<string>
-              /** Default = 'datetime-local' */
-              inputmode?: ValueSpecDatetime["inputmode"]
-              min?: string | null
-              max?: string | null
-              disabled?: false | string
-            }
-          >,
-        ) => Value.dynamicDatetime<Store>(getA),
-        dynamicSelect: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              required: RequiredDefault<string>
-              values: Record<string, string>
-              disabled?: false | string
-            }
-          >,
-        ) => Value.dynamicSelect<Store>(getA),
-        dynamicMultiselect: (
-          getA: LazyBuild<
-            Store,
-            {
-              name: string
-              description?: string | null
-              warning?: string | null
-              default: string[]
-              values: Record<string, string>
-              minLength?: number | null
-              maxLength?: number | null
-              disabled?: false | string
-            }
-          >,
-        ) => Value.dynamicMultiselect<Store>(getA),
-        filteredUnion: <
-          Required extends RequiredDefault<string>,
-          Type extends Record<string, any>,
-        >(
-          getDisabledFn: LazyBuild<Store, string[]>,
-          a: {
-            name: string
-            description?: string | null
-            warning?: string | null
-            required: Required
-          },
-          aVariants: Variants<Type, Store> | Variants<Type, never>,
-        ) =>
-          Value.filteredUnion<Required, Type, Store>(
-            getDisabledFn,
-            a,
-            aVariants,
-          ),
-
-        dynamicUnion: <
-          Required extends RequiredDefault<string>,
-          Type extends Record<string, any>,
-        >(
-          getA: LazyBuild<
-            Store,
-            {
-              disabled: string[] | false | string
-              name: string
-              description?: string | null
-              warning?: string | null
-              required: Required
-            }
-          >,
-          aVariants: Variants<Type, Store> | Variants<Type, never>,
-        ) => Value.dynamicUnion<Required, Type, Store>(getA, aVariants),
-      },
-      Variants: {
-        of: <
-          VariantValues extends {
-            [K in string]: {
-              name: string
-              spec: Config<any, Store>
-            }
-          },
-        >(
-          a: VariantValues,
-        ) => Variants.of<VariantValues, Store>(a),
-      },
-    }
-  }
-}
-
-export async function runCommand<Manifest extends T.Manifest>(
-  effects: Effects,
-  image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean },
-  command: string | [string, ...string[]],
-  options: CommandOptions & {
-    mounts?: { path: string; options: MountOptions }[]
-  },
-): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
-  const commands = splitCommand(command)
-  return SubContainer.with(
-    effects,
-    image,
-    options.mounts || [],
-    commands.join(" "),
-    (subcontainer) => subcontainer.exec(commands),
-  )
-}
-function nullifyProperties(value: T.SdkPropertiesReturn): T.PropertiesReturn {
-  return Object.fromEntries(
-    Object.entries(value).map(([k, v]) => [k, nullifyProperties_(v)]),
-  )
-}
-function nullifyProperties_(value: T.SdkPropertiesValue): T.PropertiesValue {
-  if (value.type === "string") {
-    return { description: null, copyable: null, qr: null, ...value }
-  }
-  return {
-    description: null,
-    ...value,
-    value: Object.fromEntries(
-      Object.entries(value.value).map(([k, v]) => [k, nullifyProperties_(v)]),
-    ),
-  }
-}
diff --git a/sdk/lib/actions/createAction.ts b/sdk/lib/actions/createAction.ts
deleted file mode 100644
index 4fa858d56..000000000
--- a/sdk/lib/actions/createAction.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import * as T from "../types"
-import { Config, ExtractConfigType } from "../config/builder/config"
-
-import { ActionMetadata, ActionResult, Effects, ExportedAction } from "../types"
-
-export type MaybeFn<Manifest extends T.Manifest, Store, Value> =
-  | Value
-  | ((options: { effects: Effects }) => Promise<Value> | Value)
-export class CreatedAction<
-  Manifest extends T.Manifest,
-  Store,
-  ConfigType extends
-    | Record<string, any>
-    | Config<any, Store>
-    | Config<any, never>,
-  Type extends Record<string, any> = ExtractConfigType<ConfigType>,
-> {
-  private constructor(
-    public readonly id: string,
-    public readonly myMetadata: MaybeFn<
-      Manifest,
-      Store,
-      Omit<ActionMetadata, "input">
-    >,
-    readonly fn: (options: {
-      effects: Effects
-      input: Type
-    }) => Promise<ActionResult>,
-    readonly input: Config<Type, Store>,
-    public validator = input.validator,
-  ) {}
-
-  static of<
-    Manifest extends T.Manifest,
-    Store,
-    ConfigType extends
-      | Record<string, any>
-      | Config<any, any>
-      | Config<any, never>,
-    Type extends Record<string, any> = ExtractConfigType<ConfigType>,
-  >(
-    id: string,
-    metadata: MaybeFn<Manifest, Store, Omit<ActionMetadata, "input">>,
-    fn: (options: { effects: Effects; input: Type }) => Promise<ActionResult>,
-    inputConfig: Config<Type, Store> | Config<Type, never>,
-  ) {
-    return new CreatedAction<Manifest, Store, ConfigType, Type>(
-      id,
-      metadata,
-      fn,
-      inputConfig as Config<Type, Store>,
-    )
-  }
-
-  exportedAction: ExportedAction = ({ effects, input }) => {
-    return this.fn({
-      effects,
-      input: this.validator.unsafeCast(input),
-    })
-  }
-
-  run = async ({ effects, input }: { effects: Effects; input?: Type }) => {
-    return this.fn({
-      effects,
-      input: this.validator.unsafeCast(input),
-    })
-  }
-
-  async metadata(options: { effects: Effects }) {
-    if (this.myMetadata instanceof Function)
-      return await this.myMetadata(options)
-    return this.myMetadata
-  }
-
-  async ActionMetadata(options: { effects: Effects }): Promise<ActionMetadata> {
-    return {
-      ...(await this.metadata(options)),
-      input: await this.input.build(options),
-    }
-  }
-
-  async getConfig({ effects }: { effects: Effects }) {
-    return this.input.build({
-      effects,
-    })
-  }
-}
-
-export const createAction = CreatedAction.of
diff --git a/sdk/lib/actions/index.ts b/sdk/lib/actions/index.ts
deleted file mode 100644
index 603684b67..000000000
--- a/sdk/lib/actions/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import "./createAction"
-
-import "./setupActions"
diff --git a/sdk/lib/actions/setupActions.ts b/sdk/lib/actions/setupActions.ts
deleted file mode 100644
index 07b4e2606..000000000
--- a/sdk/lib/actions/setupActions.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import * as T from "../types"
-import { Effects, ExpectedExports } from "../types"
-import { CreatedAction } from "./createAction"
-
-export function setupActions<Manifest extends T.Manifest, Store>(
-  ...createdActions: CreatedAction<Manifest, Store, any>[]
-) {
-  const myActions = async (options: { effects: Effects }) => {
-    const actions: Record<string, CreatedAction<Manifest, Store, any>> = {}
-    for (const action of createdActions) {
-      actions[action.id] = action
-    }
-    return actions
-  }
-  const answer: {
-    actions: ExpectedExports.actions
-    actionsMetadata: ExpectedExports.actionsMetadata
-  } = {
-    actions(options: { effects: Effects }) {
-      return myActions(options)
-    },
-    async actionsMetadata({ effects }: { effects: Effects }) {
-      return Promise.all(
-        createdActions.map((x) => x.ActionMetadata({ effects })),
-      )
-    },
-  }
-  return answer
-}
diff --git a/sdk/lib/backup/Backups.ts b/sdk/lib/backup/Backups.ts
deleted file mode 100644
index 031ac4e4c..000000000
--- a/sdk/lib/backup/Backups.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import * as T from "../types"
-
-import * as child_process from "child_process"
-import { promises as fsPromises } from "fs"
-import { asError } from "../util"
-
-export type BACKUP = "BACKUP"
-export const DEFAULT_OPTIONS: T.BackupOptions = {
-  delete: true,
-  force: true,
-  ignoreExisting: false,
-  exclude: [],
-}
-export type BackupSet<Volumes extends string> = {
-  srcPath: string
-  srcVolume: Volumes | BACKUP
-  dstPath: string
-  dstVolume: Volumes | BACKUP
-  options?: Partial<T.BackupOptions>
-}
-/**
- * This utility simplifies the volume backup process.
- * ```ts
- * export const { createBackup, restoreBackup } = Backups.volumes("main").build();
- * ```
- *
- * Changing the options of the rsync, (ie exludes) use either
- * ```ts
- *  Backups.volumes("main").set_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
- * // or
- *  Backups.with_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
- * ```
- *
- * Using the more fine control, using the addSets for more control
- * ```ts
- * Backups.addSets({
- * srcVolume: 'main', srcPath:'smallData/', dstPath: 'main/smallData/', dstVolume: : Backups.BACKUP
- * }, {
- * srcVolume: 'main', srcPath:'bigData/', dstPath: 'main/bigData/', dstVolume: : Backups.BACKUP, options: {exclude:['bigData/excludeThis']}}
- * ).build()q
- * ```
- */
-export class Backups<M extends T.Manifest> {
-  static BACKUP: BACKUP = "BACKUP"
-
-  private constructor(
-    private options = DEFAULT_OPTIONS,
-    private backupSet = [] as BackupSet<M["volumes"][number]>[],
-  ) {}
-  static volumes<M extends T.Manifest = never>(
-    ...volumeNames: Array<M["volumes"][0]>
-  ): Backups<M> {
-    return new Backups<M>().addSets(
-      ...volumeNames.map((srcVolume) => ({
-        srcVolume,
-        srcPath: "./",
-        dstPath: `./${srcVolume}/`,
-        dstVolume: Backups.BACKUP,
-      })),
-    )
-  }
-  static addSets<M extends T.Manifest = never>(
-    ...options: BackupSet<M["volumes"][0]>[]
-  ) {
-    return new Backups().addSets(...options)
-  }
-  static with_options<M extends T.Manifest = never>(
-    options?: Partial<T.BackupOptions>,
-  ) {
-    return new Backups({ ...DEFAULT_OPTIONS, ...options })
-  }
-
-  static withOptions = Backups.with_options
-  setOptions(options?: Partial<T.BackupOptions>) {
-    this.options = {
-      ...this.options,
-      ...options,
-    }
-    return this
-  }
-  volumes(...volumeNames: Array<M["volumes"][0]>) {
-    return this.addSets(
-      ...volumeNames.map((srcVolume) => ({
-        srcVolume,
-        srcPath: "./",
-        dstPath: `./${srcVolume}/`,
-        dstVolume: Backups.BACKUP,
-      })),
-    )
-  }
-  addSets(...options: BackupSet<M["volumes"][0]>[]) {
-    options.forEach((x) =>
-      this.backupSet.push({ ...x, options: { ...this.options, ...x.options } }),
-    )
-    return this
-  }
-  build(pathMaker: T.PathMaker) {
-    const createBackup: T.ExpectedExports.createBackup = async ({
-      effects,
-    }) => {
-      for (const item of this.backupSet) {
-        const rsyncResults = await runRsync(
-          {
-            dstPath: item.dstPath,
-            dstVolume: item.dstVolume,
-            options: { ...this.options, ...item.options },
-            srcPath: item.srcPath,
-            srcVolume: item.srcVolume,
-          },
-          pathMaker,
-        )
-        await rsyncResults.wait()
-      }
-      return
-    }
-    const restoreBackup: T.ExpectedExports.restoreBackup = async ({
-      effects,
-    }) => {
-      for (const item of this.backupSet) {
-        const rsyncResults = await runRsync(
-          {
-            dstPath: item.dstPath,
-            dstVolume: item.dstVolume,
-            options: { ...this.options, ...item.options },
-            srcPath: item.srcPath,
-            srcVolume: item.srcVolume,
-          },
-          pathMaker,
-        )
-        await rsyncResults.wait()
-      }
-      return
-    }
-    return { createBackup, restoreBackup }
-  }
-}
-function notEmptyPath(file: string) {
-  return ["", ".", "./"].indexOf(file) === -1
-}
-async function runRsync(
-  rsyncOptions: {
-    srcVolume: string
-    dstVolume: string
-    srcPath: string
-    dstPath: string
-    options: T.BackupOptions
-  },
-  pathMaker: T.PathMaker,
-): Promise<{
-  id: () => Promise<string>
-  wait: () => Promise<null>
-  progress: () => Promise<number>
-}> {
-  const { srcVolume, dstVolume, srcPath, dstPath, options } = rsyncOptions
-
-  const command = "rsync"
-  const args: string[] = []
-  if (options.delete) {
-    args.push("--delete")
-  }
-  if (options.force) {
-    args.push("--force")
-  }
-  if (options.ignoreExisting) {
-    args.push("--ignore-existing")
-  }
-  for (const exclude of options.exclude) {
-    args.push(`--exclude=${exclude}`)
-  }
-  args.push("-actAXH")
-  args.push("--info=progress2")
-  args.push("--no-inc-recursive")
-  args.push(pathMaker({ volume: srcVolume, path: srcPath }))
-  args.push(pathMaker({ volume: dstVolume, path: dstPath }))
-  const spawned = child_process.spawn(command, args, { detached: true })
-  let percentage = 0.0
-  spawned.stdout.on("data", (data: unknown) => {
-    const lines = String(data).replace("\r", "\n").split("\n")
-    for (const line of lines) {
-      const parsed = /$([0-9.]+)%/.exec(line)?.[1]
-      if (!parsed) continue
-      percentage = Number.parseFloat(parsed)
-    }
-  })
-
-  spawned.stderr.on("data", (data: unknown) => {
-    console.error(`Backups.runAsync`, asError(data))
-  })
-
-  const id = async () => {
-    const pid = spawned.pid
-    if (pid === undefined) {
-      throw new Error("rsync process has no pid")
-    }
-    return String(pid)
-  }
-  const waitPromise = new Promise<null>((resolve, reject) => {
-    spawned.on("exit", (code: any) => {
-      if (code === 0) {
-        resolve(null)
-      } else {
-        reject(new Error(`rsync exited with code ${code}`))
-      }
-    })
-  })
-  const wait = () => waitPromise
-  const progress = () => Promise.resolve(percentage)
-  return { id, wait, progress }
-}
diff --git a/sdk/lib/backup/setupBackups.ts b/sdk/lib/backup/setupBackups.ts
deleted file mode 100644
index c12f1d2ed..000000000
--- a/sdk/lib/backup/setupBackups.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Backups } from "./Backups"
-
-import * as T from "../types"
-import { _ } from "../util"
-
-export type SetupBackupsParams<M extends T.Manifest> = Array<
-  M["volumes"][number] | Backups<M>
->
-
-export function setupBackups<M extends T.Manifest>(
-  manifest: M,
-  ...args: _<SetupBackupsParams<M>>
-) {
-  const backups = Array<Backups<M>>()
-  const volumes = new Set<M["volumes"][0]>()
-  for (const arg of args) {
-    if (arg instanceof Backups) {
-      backups.push(arg)
-    } else {
-      volumes.add(arg)
-    }
-  }
-  backups.push(Backups.volumes(...volumes))
-  const answer: {
-    createBackup: T.ExpectedExports.createBackup
-    restoreBackup: T.ExpectedExports.restoreBackup
-  } = {
-    get createBackup() {
-      return (async (options) => {
-        for (const backup of backups) {
-          await backup.build(options.pathMaker).createBackup(options)
-        }
-      }) as T.ExpectedExports.createBackup
-    },
-    get restoreBackup() {
-      return (async (options) => {
-        for (const backup of backups) {
-          await backup.build(options.pathMaker).restoreBackup(options)
-        }
-        await options.effects.setDataVersion({ version: manifest.version })
-      }) as T.ExpectedExports.restoreBackup
-    },
-  }
-  return answer
-}
diff --git a/sdk/lib/config/configDependencies.ts b/sdk/lib/config/configDependencies.ts
deleted file mode 100644
index d9865f25c..000000000
--- a/sdk/lib/config/configDependencies.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import * as T from "../types"
-
-export type ConfigDependencies<T extends T.Manifest> = {
-  exists(id: keyof T["dependencies"]): T.Dependencies[number]
-  running(
-    id: keyof T["dependencies"],
-    healthChecks: string[],
-  ): T.Dependencies[number]
-}
-
-export const configDependenciesSet = <
-  T extends T.Manifest,
->(): ConfigDependencies<T> => ({
-  exists(id: keyof T["dependencies"]) {
-    return {
-      id,
-      kind: "exists",
-    } as T.Dependencies[number]
-  },
-
-  running(id: keyof T["dependencies"], healthChecks: string[]) {
-    return {
-      id,
-      kind: "running",
-      healthChecks,
-    } as T.Dependencies[number]
-  },
-})
diff --git a/sdk/lib/config/index.ts b/sdk/lib/config/index.ts
deleted file mode 100644
index 35c3e274e..000000000
--- a/sdk/lib/config/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * as constants from "./configConstants"
-export * as types from "./configTypes"
-export * as builder from "./builder"
diff --git a/sdk/lib/config/setupConfig.ts b/sdk/lib/config/setupConfig.ts
deleted file mode 100644
index f354c81ed..000000000
--- a/sdk/lib/config/setupConfig.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import * as T from "../types"
-
-import * as D from "./configDependencies"
-import { Config, ExtractConfigType } from "./builder/config"
-import nullIfEmpty from "../util/nullIfEmpty"
-import { InterfacesReceipt as InterfacesReceipt } from "../interfaces/setupInterfaces"
-
-declare const dependencyProof: unique symbol
-export type DependenciesReceipt = void & {
-  [dependencyProof]: never
-}
-
-export type Save<
-  A extends
-    | Record<string, any>
-    | Config<Record<string, any>, any>
-    | Config<Record<string, never>, never>,
-> = (options: {
-  effects: T.Effects
-  input: ExtractConfigType<A> & Record<string, any>
-}) => Promise<{
-  dependenciesReceipt: DependenciesReceipt
-  interfacesReceipt: InterfacesReceipt
-  restart: boolean
-}>
-export type Read<
-  Manifest extends T.Manifest,
-  Store,
-  A extends
-    | Record<string, any>
-    | Config<Record<string, any>, any>
-    | Config<Record<string, any>, never>,
-> = (options: {
-  effects: T.Effects
-}) => Promise<void | (ExtractConfigType<A> & Record<string, any>)>
-/**
- * We want to setup a config export with a get and set, this
- * is going to be the default helper to setup config, because it will help
- * enforce that we have a spec, write, and reading.
- * @param options
- * @returns
- */
-export function setupConfig<
-  Store,
-  ConfigType extends
-    | Record<string, any>
-    | Config<any, any>
-    | Config<any, never>,
-  Manifest extends T.Manifest,
-  Type extends Record<string, any> = ExtractConfigType<ConfigType>,
->(
-  spec: Config<Type, Store> | Config<Type, never>,
-  write: Save<Type>,
-  read: Read<Manifest, Store, Type>,
-) {
-  const validator = spec.validator
-  return {
-    setConfig: (async ({ effects, input }) => {
-      if (!validator.test(input)) {
-        await console.error(
-          new Error(validator.errorMessage(input)?.toString()),
-        )
-        return { error: "Set config type error for config" }
-      }
-      await effects.clearBindings()
-      await effects.clearServiceInterfaces()
-      const { restart } = await write({
-        input: JSON.parse(JSON.stringify(input)) as any,
-        effects,
-      })
-      if (restart) {
-        await effects.restart()
-      }
-    }) as T.ExpectedExports.setConfig,
-    getConfig: (async ({ effects }) => {
-      const configValue = nullIfEmpty((await read({ effects })) || null)
-      return {
-        spec: await spec.build({
-          effects,
-        }),
-        config: configValue,
-      }
-    }) as T.ExpectedExports.getConfig,
-  }
-}
-
-export default setupConfig
diff --git a/sdk/lib/dependencies/DependencyConfig.ts b/sdk/lib/dependencies/DependencyConfig.ts
deleted file mode 100644
index b48bf56d3..000000000
--- a/sdk/lib/dependencies/DependencyConfig.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import * as T from "../types"
-import { deepEqual } from "../util/deepEqual"
-import { deepMerge } from "../util/deepMerge"
-
-export type Update<QueryResults, RemoteConfig> = (options: {
-  remoteConfig: RemoteConfig
-  queryResults: QueryResults
-}) => Promise<RemoteConfig>
-
-export class DependencyConfig<
-  Manifest extends T.Manifest,
-  Store,
-  Input extends Record<string, any>,
-  RemoteConfig extends Record<string, any>,
-> {
-  static defaultUpdate = async (options: {
-    queryResults: unknown
-    remoteConfig: unknown
-  }): Promise<unknown> => {
-    return deepMerge({}, options.remoteConfig, options.queryResults || {})
-  }
-  constructor(
-    readonly dependencyConfig: (options: {
-      effects: T.Effects
-      localConfig: Input
-    }) => Promise<void | T.DeepPartial<RemoteConfig>>,
-    readonly update: Update<
-      void | T.DeepPartial<RemoteConfig>,
-      RemoteConfig
-    > = DependencyConfig.defaultUpdate as any,
-  ) {}
-
-  async query(options: { effects: T.Effects; localConfig: unknown }) {
-    return this.dependencyConfig({
-      localConfig: options.localConfig as Input,
-      effects: options.effects,
-    })
-  }
-}
diff --git a/sdk/lib/dependencies/setupDependencyConfig.ts b/sdk/lib/dependencies/setupDependencyConfig.ts
deleted file mode 100644
index 2fde4bce5..000000000
--- a/sdk/lib/dependencies/setupDependencyConfig.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Config } from "../config/builder/config"
-
-import * as T from "../types"
-import { DependencyConfig } from "./DependencyConfig"
-
-export function setupDependencyConfig<
-  Store,
-  Input extends Record<string, any>,
-  Manifest extends T.Manifest,
->(
-  _config: Config<Input, Store> | Config<Input, never>,
-  autoConfigs: {
-    [key in keyof Manifest["dependencies"] & string]: DependencyConfig<
-      Manifest,
-      Store,
-      Input,
-      any
-    > | null
-  },
-): T.ExpectedExports.dependencyConfig {
-  return autoConfigs
-}
diff --git a/sdk/lib/health/HealthReceipt.ts b/sdk/lib/health/HealthReceipt.ts
deleted file mode 100644
index a0995ba0a..000000000
--- a/sdk/lib/health/HealthReceipt.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const HealthProof: unique symbol
-export type HealthReceipt = {
-  [HealthProof]: never
-}
diff --git a/sdk/lib/health/index.ts b/sdk/lib/health/index.ts
deleted file mode 100644
index b6e1d26f5..000000000
--- a/sdk/lib/health/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import "./checkFns"
-
-import "./HealthReceipt"
diff --git a/sdk/lib/interfaces/setupInterfaces.ts b/sdk/lib/interfaces/setupInterfaces.ts
deleted file mode 100644
index c82b69e0b..000000000
--- a/sdk/lib/interfaces/setupInterfaces.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Config } from "../config/builder/config"
-
-import * as T from "../types"
-import { AddressReceipt } from "./AddressReceipt"
-
-export type InterfacesReceipt = Array<T.AddressInfo[] & AddressReceipt>
-export type SetInterfaces<
-  Manifest extends T.Manifest,
-  Store,
-  ConfigInput extends Record<string, any>,
-  Output extends InterfacesReceipt,
-> = (opts: { effects: T.Effects; input: null | ConfigInput }) => Promise<Output>
-export type SetupInterfaces = <
-  Manifest extends T.Manifest,
-  Store,
-  ConfigInput extends Record<string, any>,
-  Output extends InterfacesReceipt,
->(
-  config: Config<ConfigInput, Store>,
-  fn: SetInterfaces<Manifest, Store, ConfigInput, Output>,
-) => SetInterfaces<Manifest, Store, ConfigInput, Output>
-export const NO_INTERFACE_CHANGES = [] as InterfacesReceipt
-export const setupInterfaces: SetupInterfaces = (_config, fn) => fn
diff --git a/sdk/lib/manifest/ManifestTypes.ts b/sdk/lib/manifest/ManifestTypes.ts
deleted file mode 100644
index cc564de2d..000000000
--- a/sdk/lib/manifest/ManifestTypes.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { ValidateExVer, ValidateExVers } from "../exver"
-import {
-  ActionMetadata,
-  HardwareRequirements,
-  ImageConfig,
-  ImageId,
-  ImageSource,
-} from "../types"
-
-export type SDKManifest = {
-  /**  The package identifier used by the OS. This must be unique amongst all other known packages */
-  readonly id: string
-  /** A human readable service title */
-  readonly title: string
-  /** The type of license for the project. Include the LICENSE in the root of the project directory. A license is required for a Start9 package.*/
-  readonly license: string // name of license
-  /** The Start9 wrapper repository URL for the package. This repo contains the manifest file (this),
-   * any scripts necessary for configuration, backups, actions, or health checks (more below). This key
-   * must exist. But could be embedded into the source repository
-   */
-  readonly wrapperRepo: string
-  /** The original project repository URL. There is no upstream repo in this example */
-  readonly upstreamRepo: string
-  /**  URL to the support site / channel for the project. This key can be omitted if none exists, or it can link to the original project repository issues */
-  readonly supportSite: string
-  /** URL to the marketing site for the project. If there is no marketing site, it can link to the original project repository */
-  readonly marketingSite: string
-  /** URL where users can donate to the upstream project */
-  readonly donationUrl: string | null
-  /**Human readable descriptions for the service. These are used throughout the StartOS user interface, primarily in the marketplace. */
-  readonly description: {
-    /**This is the first description visible to the user in the marketplace */
-    readonly short: string
-    /** This description will display with additional details in the service's individual marketplace page */
-    readonly long: string
-  }
-
-  /** Defines the os images needed to run the container processes */
-  readonly images: Record<ImageId, SDKImageConfig>
-  /** This denotes readonly asset directories that should be available to mount to the container.
-   * These directories are expected to be found in `assets/<id>` at pack time.
-   **/
-  readonly assets: string[]
-  /** This denotes any data volumes that should be available to mount to the container */
-  readonly volumes: string[]
-
-  readonly alerts?: {
-    readonly install?: string | null
-    readonly update?: string | null
-    readonly uninstall?: string | null
-    readonly restore?: string | null
-    readonly start?: string | null
-    readonly stop?: string | null
-  }
-  readonly hasConfig?: boolean
-  readonly dependencies: Readonly<Record<string, ManifestDependency>>
-  readonly hardwareRequirements?: {
-    readonly device?: { display?: RegExp; processor?: RegExp }
-    readonly ram?: number | null
-    readonly arch?: string[] | null
-  }
-}
-
-export type SDKImageConfig = {
-  source: Exclude<ImageSource, "packed">
-  arch?: string[]
-  emulateMissingAs?: string | null
-}
-
-export type ManifestDependency = {
-  /**
-   * A human readable explanation on what the dependency is used for
-   */
-  readonly description: string | null
-  /**
-   * Determines if the dependency is optional or not. Times that optional that are good include such situations
-   * such as being able to toggle other services or to use a different service for the same purpose.
-   */
-  readonly optional: boolean
-  /**
-   * A url or local path for an s9pk that satisfies this dependency
-   */
-  readonly s9pk: string
-}
diff --git a/sdk/lib/manifest/index.ts b/sdk/lib/manifest/index.ts
deleted file mode 100644
index 806ef5e61..000000000
--- a/sdk/lib/manifest/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import "./setupManifest"
-import "./ManifestTypes"
diff --git a/sdk/lib/store/setupExposeStore.ts b/sdk/lib/store/setupExposeStore.ts
deleted file mode 100644
index 9272a9a6b..000000000
--- a/sdk/lib/store/setupExposeStore.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Affine, _ } from "../util"
-import { PathBuilder, extractJsonPath, pathBuilder } from "./PathBuilder"
-
-export type ExposedStorePaths = string[] & Affine<"ExposedStorePaths">
-
-export const setupExposeStore = <Store extends Record<string, any>>(
-  fn: (pathBuilder: PathBuilder<Store>) => PathBuilder<Store, any>[],
-) => {
-  return fn(pathBuilder<Store>()).map(
-    (x) => extractJsonPath(x) as string,
-  ) as ExposedStorePaths
-}
diff --git a/sdk/lib/test/setupDependencyConfig.test.ts b/sdk/lib/test/setupDependencyConfig.test.ts
deleted file mode 100644
index 622559eb6..000000000
--- a/sdk/lib/test/setupDependencyConfig.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { sdk } from "./output.sdk"
-
-describe("setupDependencyConfig", () => {
-  test("test", () => {
-    const testConfig = sdk.Config.of({
-      test: sdk.Value.text({
-        name: "testValue",
-        required: false,
-      }),
-    })
-
-    const testConfig2 = sdk.Config.of({
-      test2: sdk.Value.text({
-        name: "testValue2",
-        required: false,
-      }),
-    })
-    const remoteTest = sdk.DependencyConfig.of({
-      localConfigSpec: testConfig,
-      remoteConfigSpec: testConfig2,
-      dependencyConfig: async ({}) => {},
-    })
-    sdk.setupDependencyConfig(testConfig, {
-      "remote-test": remoteTest,
-    })
-  })
-})
diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts
deleted file mode 100644
index 68bd7b588..000000000
--- a/sdk/lib/types.ts
+++ /dev/null
@@ -1,523 +0,0 @@
-export * as configTypes from "./config/configTypes"
-
-import {
-  DependencyRequirement,
-  SetHealth,
-  NamedHealthCheckResult,
-  SetMainStatus,
-  ServiceInterface,
-  Host,
-  ExportServiceInterfaceParams,
-  GetPrimaryUrlParams,
-  LanInfo,
-  BindParams,
-  Manifest,
-  CheckDependenciesResult,
-  ActionId,
-  HostId,
-} from "./osBindings"
-
-import { MainEffects, ServiceInterfaceType, Signals } from "./StartSdk"
-import { InputSpec } from "./config/configTypes"
-import { DependenciesReceipt } from "./config/setupConfig"
-import { BindOptions, Scheme } from "./interfaces/Host"
-import { Daemons } from "./mainFn/Daemons"
-import { StorePath } from "./store/PathBuilder"
-import { ExposedStorePaths } from "./store/setupExposeStore"
-import { UrlString } from "./util/getServiceInterface"
-import { StringObject, ToKebab } from "./util"
-export * from "./osBindings"
-export { SDKManifest } from "./manifest/ManifestTypes"
-export { HealthReceipt } from "./health/HealthReceipt"
-
-export type PathMaker = (options: { volume: string; path: string }) => string
-export type ExportedAction = (options: {
-  effects: Effects
-  input?: Record<string, unknown>
-}) => Promise<ActionResult>
-export type MaybePromise<A> = Promise<A> | A
-export namespace ExpectedExports {
-  version: 1
-  /** Set configuration is called after we have modified and saved the configuration in the start9 ui. Use this to make a file for the docker to read from for configuration.  */
-  export type setConfig = (options: {
-    effects: Effects
-    input: Record<string, unknown>
-  }) => Promise<void>
-  /** Get configuration returns a shape that describes the format that the start9 ui will generate, and later send to the set config  */
-  export type getConfig = (options: { effects: Effects }) => Promise<ConfigRes>
-  // /** These are how we make sure the our dependency configurations are valid and if not how to fix them. */
-  // export type dependencies = Dependencies;
-  /** For backing up service data though the startOS UI */
-  export type createBackup = (options: {
-    effects: Effects
-    pathMaker: PathMaker
-  }) => Promise<unknown>
-  /** For restoring service data that was previously backed up using the startOS UI create backup flow. Backup restores are also triggered via the startOS UI, or doing a system restore flow during setup. */
-  export type restoreBackup = (options: {
-    effects: Effects
-    pathMaker: PathMaker
-  }) => Promise<unknown>
-
-  // /** Health checks are used to determine if the service is working properly after starting
-  //  * A good use case is if we are using a web server, seeing if we can get to the web server.
-  //  */
-  // export type health = {
-  //   /** Should be the health check id */
-  //   [id: string]: (options: { effects: Effects; input: TimeMs }) => Promise<unknown>;
-  // };
-
-  /**
-   * Actions are used so we can effect the service, like deleting a directory.
-   * One old use case is to add a action where we add a file, that will then be run during the
-   * service starting, and that file would indicate that it would rescan all the data.
-   */
-  export type actions = (options: { effects: Effects }) => MaybePromise<{
-    [id: string]: {
-      run: ExportedAction
-      getConfig: (options: { effects: Effects }) => Promise<InputSpec>
-    }
-  }>
-
-  export type actionsMetadata = (options: {
-    effects: Effects
-  }) => Promise<Array<ActionMetadata>>
-
-  /**
-   * This is the entrypoint for the main container. Used to start up something like the service that the
-   * package represents, like running a bitcoind in a bitcoind-wrapper.
-   */
-  export type main = (options: {
-    effects: MainEffects
-    started(onTerm: () => PromiseLike<void>): PromiseLike<void>
-  }) => Promise<Daemons<any, any>>
-
-  /**
-   * After a shutdown, if we wanted to do any operations to clean up things, like
-   * set the action as unavailable or something.
-   */
-  export type afterShutdown = (options: {
-    effects: Effects
-  }) => Promise<unknown>
-
-  /**
-   * Every time a package completes an install, this function is called before the main.
-   * Can be used to do migration like things.
-   */
-  export type init = (options: { effects: Effects }) => Promise<unknown>
-  /** This will be ran during any time a package is uninstalled, for example during a update
-   * this will be called.
-   */
-  export type uninit = (options: {
-    effects: Effects
-    nextVersion: null | string
-  }) => Promise<unknown>
-
-  /** Auto configure is used to make sure that other dependencies have the values t
-   * that this service could use.
-   */
-  export type dependencyConfig = Record<PackageId, DependencyConfig | null>
-
-  export type properties = (options: {
-    effects: Effects
-  }) => Promise<PropertiesReturn>
-
-  export type manifest = Manifest
-}
-export type ABI = {
-  setConfig: ExpectedExports.setConfig
-  getConfig: ExpectedExports.getConfig
-  createBackup: ExpectedExports.createBackup
-  restoreBackup: ExpectedExports.restoreBackup
-  actions: ExpectedExports.actions
-  actionsMetadata: ExpectedExports.actionsMetadata
-  main: ExpectedExports.main
-  afterShutdown: ExpectedExports.afterShutdown
-  init: ExpectedExports.init
-  uninit: ExpectedExports.uninit
-  dependencyConfig: ExpectedExports.dependencyConfig
-  properties: ExpectedExports.properties
-  manifest: ExpectedExports.manifest
-}
-export type TimeMs = number
-export type VersionString = string
-
-/**
- * AutoConfigure is used as the value to the key of package id,
- * this is used to make sure that other dependencies have the values that this service could use.
- */
-export type DependencyConfig = {
-  /** During autoconfigure, we have access to effects and local data. We are going to figure out all the data that we need and send it to update. For the sdk it is the desired delta */
-  query(options: { effects: Effects }): Promise<unknown>
-  /** This is the second part. Given the query results off the previous function, we will determine what to change the remote config to. In our sdk normall we are going to use the previous as a deep merge. */
-  update(options: {
-    queryResults: unknown
-    remoteConfig: unknown
-  }): Promise<unknown>
-}
-
-export type ConfigRes = {
-  /** This should be the previous config, that way during set config we start with the previous */
-  config?: null | Record<string, unknown>
-  /** Shape that is describing the form in the ui */
-  spec: InputSpec
-}
-
-declare const DaemonProof: unique symbol
-export type DaemonReceipt = {
-  [DaemonProof]: never
-}
-export type Daemon = {
-  wait(): Promise<string>
-  term(): Promise<void>
-  [DaemonProof]: never
-}
-
-export type HealthStatus = NamedHealthCheckResult["result"]
-export type SmtpValue = {
-  server: string
-  port: number
-  from: string
-  login: string
-  password: string | null | undefined
-}
-
-export type CommandType = string | [string, ...string[]]
-
-export type DaemonReturned = {
-  wait(): Promise<unknown>
-  term(options?: { signal?: Signals; timeout?: number }): Promise<void>
-}
-
-export type ActionMetadata = {
-  name: string
-  description: string
-  warning: string | null
-  input: InputSpec
-  disabled: boolean
-  allowedStatuses: "onlyRunning" | "onlyStopped" | "any"
-  /**
-   * So the ordering of the actions is by alphabetical order of the group, then followed by the alphabetical of the actions
-   */
-  group: string | null
-}
-export declare const hostName: unique symbol
-// asdflkjadsf.onion | 1.2.3.4
-export type Hostname = string & { [hostName]: never }
-
-export type HostnameInfoIp = {
-  kind: "ip"
-  networkInterfaceId: string
-  public: boolean
-  hostname:
-    | {
-        kind: "ipv4" | "ipv6" | "local"
-        value: string
-        port: number | null
-        sslPort: number | null
-      }
-    | {
-        kind: "domain"
-        domain: string
-        subdomain: string | null
-        port: number | null
-        sslPort: number | null
-      }
-}
-
-export type HostnameInfoOnion = {
-  kind: "onion"
-  hostname: { value: string; port: number | null; sslPort: number | null }
-}
-
-export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion
-
-export type ServiceInterfaceId = string
-
-export { ServiceInterface }
-export type ExposeServicePaths<Store = never> = {
-  /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
-  paths: ExposedStorePaths
-}
-
-export type SdkPropertiesValue =
-  | {
-      type: "object"
-      value: { [k: string]: SdkPropertiesValue }
-      description?: string
-    }
-  | {
-      type: "string"
-      /** The value to display to the user */
-      value: string
-      /** A human readable description or explanation of the value */
-      description?: string
-      /** Whether or not to mask the value, for example, when displaying a password */
-      masked: boolean
-      /** Whether or not to include a button for copying the value to clipboard */
-      copyable?: boolean
-      /** Whether or not to include a button for displaying the value as a QR code */
-      qr?: boolean
-    }
-
-export type SdkPropertiesReturn = {
-  [key: string]: SdkPropertiesValue
-}
-
-export type PropertiesValue =
-  | {
-      type: "object"
-      value: { [k: string]: PropertiesValue }
-      description: string | null
-    }
-  | {
-      type: "string"
-      /** The value to display to the user */
-      value: string
-      /** A human readable description or explanation of the value */
-      description: string | null
-      /** Whether or not to mask the value, for example, when displaying a password */
-      masked: boolean
-      /** Whether or not to include a button for copying the value to clipboard */
-      copyable: boolean | null
-      /** Whether or not to include a button for displaying the value as a QR code */
-      qr: boolean | null
-    }
-
-export type PropertiesReturn = {
-  [key: string]: PropertiesValue
-}
-
-export type EffectMethod<T extends StringObject = Effects> = {
-  [K in keyof T]-?: K extends string
-    ? T[K] extends Function
-      ? ToKebab<K>
-      : T[K] extends StringObject
-        ? `${ToKebab<K>}.${EffectMethod<T[K]>}`
-        : never
-    : never
-}[keyof T]
-
-/** Used to reach out from the pure js runtime */
-export type Effects = {
-  // action
-
-  /** Run an action exported by a service */
-  executeAction<Input>(opts: {
-    packageId?: PackageId
-    actionId: ActionId
-    input: Input
-  }): Promise<unknown>
-  /** Define an action that can be invoked by a user or service */
-  exportAction(options: {
-    id: ActionId
-    metadata: ActionMetadata
-  }): Promise<void>
-  /** Remove all exported actions */
-  clearActions(): Promise<void>
-
-  // config
-
-  /** Returns whether or not the package has been configured */
-  getConfigured(options: { packageId?: PackageId }): Promise<boolean>
-  /** Indicates that this package has been configured. Called during setConfig or init */
-  setConfigured(options: { configured: boolean }): Promise<void>
-
-  // control
-
-  /** restart this service's main function */
-  restart(): Promise<void>
-  /** stop this service's main function */
-  shutdown(): Promise<void>
-  /** indicate to the host os what runstate the service is in */
-  setMainStatus(options: SetMainStatus): Promise<void>
-
-  // dependency
-
-  /** Set the dependencies of what the service needs, usually run during the set config as a best practice */
-  setDependencies(options: {
-    dependencies: Dependencies
-  }): Promise<DependenciesReceipt>
-  /** Get the list of the dependencies, both the dynamic set by the effect of setDependencies and the end result any required in the manifest  */
-  getDependencies(): Promise<DependencyRequirement[]>
-  /** Test whether current dependency requirements are satisfied */
-  checkDependencies(options: {
-    packageIds?: PackageId[]
-  }): Promise<CheckDependenciesResult[]>
-  /** mount a volume of a dependency */
-  mount(options: {
-    location: string
-    target: {
-      packageId: string
-      volumeId: string
-      subpath: string | null
-      readonly: boolean
-    }
-  }): Promise<string>
-  /** Returns a list of the ids of all installed packages */
-  getInstalledPackages(): Promise<string[]>
-  /** grants access to certain paths in the store to dependents */
-  exposeForDependents(options: { paths: string[] }): Promise<void>
-
-  // health
-
-  /** sets the result of a health check */
-  setHealth(o: SetHealth): Promise<void>
-
-  // subcontainer
-  subcontainer: {
-    /** A low level api used by SubContainer */
-    createFs(options: {
-      imageId: string
-      name: string | null
-    }): Promise<[string, string]>
-    /** A low level api used by SubContainer */
-    destroyFs(options: { guid: string }): Promise<void>
-  }
-
-  // net
-
-  // bind
-  /** Creates a host connected to the specified port with the provided options */
-  bind(options: BindParams): Promise<void>
-  /** Get the port address for a service */
-  getServicePortForward(options: {
-    packageId?: PackageId
-    hostId: HostId
-    internalPort: number
-  }): Promise<LanInfo>
-  /** Removes all network bindings, called in the setupConfig */
-  clearBindings(): Promise<void>
-  // host
-  /** Returns information about the specified host, if it exists */
-  getHostInfo(options: {
-    packageId?: PackageId
-    hostId: HostId
-    callback?: () => void
-  }): Promise<Host | null>
-  /** Returns the primary url that a user has selected for a host, if it exists */
-  getPrimaryUrl(options: {
-    packageId?: PackageId
-    hostId: HostId
-    callback?: () => void
-  }): Promise<UrlString | null>
-  /** Returns the IP address of the container */
-  getContainerIp(): Promise<string>
-  // interface
-  /** Creates an interface bound to a specific host and port to show to the user */
-  exportServiceInterface(options: ExportServiceInterfaceParams): Promise<void>
-  /** Returns an exported service interface */
-  getServiceInterface(options: {
-    packageId?: PackageId
-    serviceInterfaceId: ServiceInterfaceId
-    callback?: () => void
-  }): Promise<ServiceInterface | null>
-  /** Returns all exported service interfaces for a package */
-  listServiceInterfaces(options: {
-    packageId?: PackageId
-    callback?: () => void
-  }): Promise<Record<ServiceInterfaceId, ServiceInterface>>
-  /** Removes all service interfaces */
-  clearServiceInterfaces(): Promise<void>
-  // ssl
-  /** Returns a PEM encoded fullchain for the hostnames specified */
-  getSslCertificate: (options: {
-    hostnames: string[]
-    algorithm?: "ecdsa" | "ed25519"
-    callback?: () => void
-  }) => Promise<[string, string, string]>
-  /** Returns a PEM encoded private key corresponding to the certificate for the hostnames specified */
-  getSslKey: (options: {
-    hostnames: string[]
-    algorithm?: "ecdsa" | "ed25519"
-  }) => Promise<string>
-
-  // store
-
-  store: {
-    /** Get a value in a json like data, can be observed and subscribed */
-    get<Store = never, ExtractStore = unknown>(options: {
-      /** If there is no packageId it is assumed the current package */
-      packageId?: string
-      /** The path defaults to root level, using the [JsonPath](https://jsonpath.com/) */
-      path: StorePath
-      callback?: () => void
-    }): Promise<ExtractStore>
-    /** Used to store values that can be accessed and subscribed to */
-    set<Store = never, ExtractStore = unknown>(options: {
-      /** Sets the value for the wrapper at the path, it will override, using the [JsonPath](https://jsonpath.com/)  */
-      path: StorePath
-      value: ExtractStore
-    }): Promise<void>
-  }
-  /** sets the version that this service's data has been migrated to */
-  setDataVersion(options: { version: string }): Promise<void>
-  /** returns the version that this service's data has been migrated to */
-  getDataVersion(): Promise<string | null>
-
-  // system
-
-  /** Returns globally configured SMTP settings, if they exist */
-  getSystemSmtp(options: { callback?: () => void }): Promise<SmtpValue | null>
-}
-
-/** rsync options: https://linux.die.net/man/1/rsync
- */
-export type BackupOptions = {
-  delete: boolean
-  force: boolean
-  ignoreExisting: boolean
-  exclude: string[]
-}
-/**
- * This is the metadata that is returned from the metadata call.
- */
-export type Metadata = {
-  fileType: string
-  isDir: boolean
-  isFile: boolean
-  isSymlink: boolean
-  len: number
-  modified?: Date
-  accessed?: Date
-  created?: Date
-  readonly: boolean
-  uid: number
-  gid: number
-  mode: number
-}
-
-export type MigrationRes = {
-  configured: boolean
-}
-
-export type ActionResult = {
-  version: "0"
-  message: string
-  value: string | null
-  copyable: boolean
-  qr: boolean
-}
-export type SetResult = {
-  dependsOn: DependsOn
-  signal: Signals
-}
-
-export type PackageId = string
-export type Message = string
-export type DependencyKind = "running" | "exists"
-
-export type DependsOn = {
-  [packageId: string]: string[] | readonly string[]
-}
-
-export type KnownError =
-  | { error: string }
-  | {
-      errorCode: [number, string] | readonly [number, string]
-    }
-
-export type Dependencies = Array<DependencyRequirement>
-
-export type DeepPartial<T> = T extends {}
-  ? { [P in keyof T]?: DeepPartial<T[P]> }
-  : T
diff --git a/sdk/lib/util/asError.ts b/sdk/lib/util/asError.ts
deleted file mode 100644
index 6e98afb6a..000000000
--- a/sdk/lib/util/asError.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const asError = (e: unknown) => {
-  if (e instanceof Error) {
-    return new Error(e as any)
-  }
-  return new Error(`${e}`)
-}
diff --git a/sdk/lib/util/deepMerge.ts b/sdk/lib/util/deepMerge.ts
deleted file mode 100644
index ae68c242f..000000000
--- a/sdk/lib/util/deepMerge.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { object } from "ts-matches"
-
-export function deepMerge(...args: unknown[]): unknown {
-  const lastItem = (args as any)[args.length - 1]
-  if (!object.test(lastItem)) return lastItem
-  const objects = args.filter(object.test).filter((x) => !Array.isArray(x))
-  if (objects.length === 0) return lastItem as any
-  if (objects.length === 1) objects.unshift({})
-  const allKeys = new Set(objects.flatMap((x) => Object.keys(x)))
-  for (const key of allKeys) {
-    const filteredValues = objects.flatMap((x) =>
-      key in x ? [(x as any)[key]] : [],
-    )
-    ;(objects as any)[0][key] = deepMerge(...filteredValues)
-  }
-  return objects[0] as any
-}
diff --git a/sdk/lib/util/fileHelper.ts b/sdk/lib/util/fileHelper.ts
deleted file mode 100644
index 383b4fd31..000000000
--- a/sdk/lib/util/fileHelper.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import * as matches from "ts-matches"
-import * as YAML from "yaml"
-import * as TOML from "@iarna/toml"
-import merge from "lodash.merge"
-import * as T from "../types"
-import * as fs from "node:fs/promises"
-
-const previousPath = /(.+?)\/([^/]*)$/
-
-/**
- * Used in the get config and the set config exported functions.
- * The idea is that we are going to be reading/ writing to a file, or multiple files. And then we use this tool
- * to keep the same path on the read and write, and have methods for helping with structured data.
- * And if we are not using a structured data, we can use the raw method which forces the construction of a BiMap
- * ```ts
-        import {InputSpec} from './InputSpec.ts'
-        import {matches, T} from '../deps.ts';
-        const { object, string, number, boolean, arrayOf, array, anyOf, allOf } = matches
-        const someValidator = object({
-        data: string
-        })
-        const jsonFile = FileHelper.json({
-        path: 'data.json',
-        validator: someValidator,
-        volume: 'main'
-        })
-        const  tomlFile = FileHelper.toml({
-        path: 'data.toml',
-        validator: someValidator,
-        volume: 'main'
-        })
-        const rawFile = FileHelper.raw({
-        path: 'data.amazingSettings',
-        volume: 'main'
-        fromData(dataIn: Data): string {
-            return `myDatais ///- ${dataIn.data}`
-        },
-        toData(rawData: string): Data {
-        const [,data] = /myDatais \/\/\/- (.*)/.match(rawData)
-        return {data}
-        }
-        })
-
-        export const setConfig : T.ExpectedExports.setConfig= async (effects, config) => {
-        await  jsonFile.write({ data: 'here lies data'}, effects)
-        }
-
-        export const getConfig: T.ExpectedExports.getConfig = async (effects, config) => ({
-        spec: InputSpec,
-        config: nullIfEmpty({
-            ...jsonFile.get(effects)
-        })
-    ```
- */
-export class FileHelper<A> {
-  protected constructor(
-    readonly path: string,
-    readonly writeData: (dataIn: A) => string,
-    readonly readData: (stringValue: string) => A,
-  ) {}
-  async write(data: A, effects: T.Effects) {
-    const parent = previousPath.exec(this.path)
-    if (parent) {
-      await fs.mkdir(parent[1], { recursive: true })
-    }
-
-    await fs.writeFile(this.path, this.writeData(data))
-  }
-  async read(effects: T.Effects) {
-    if (
-      !(await fs.access(this.path).then(
-        () => true,
-        () => false,
-      ))
-    ) {
-      return null
-    }
-    return this.readData(
-      await fs.readFile(this.path).then((data) => data.toString("utf-8")),
-    )
-  }
-
-  async merge(data: A, effects: T.Effects) {
-    const fileData = (await this.read(effects).catch(() => ({}))) || {}
-    const mergeData = merge({}, fileData, data)
-    return await this.write(mergeData, effects)
-  }
-  /**
-   * Create a File Helper for an arbitrary file type.
-   *
-   * Provide custom functions for translating data to the file format and visa versa.
-   */
-  static raw<A>(
-    path: string,
-    toFile: (dataIn: A) => string,
-    fromFile: (rawData: string) => A,
-  ) {
-    return new FileHelper<A>(path, toFile, fromFile)
-  }
-  /**
-   * Create a File Helper for a .json file
-   */
-  static json<A>(path: string, shape: matches.Validator<unknown, A>) {
-    return new FileHelper<A>(
-      path,
-      (inData) => {
-        return JSON.stringify(inData, null, 2)
-      },
-      (inString) => {
-        return shape.unsafeCast(JSON.parse(inString))
-      },
-    )
-  }
-  /**
-   * Create a File Helper for a .toml file
-   */
-  static toml<A extends Record<string, unknown>>(
-    path: string,
-    shape: matches.Validator<unknown, A>,
-  ) {
-    return new FileHelper<A>(
-      path,
-      (inData) => {
-        return TOML.stringify(inData as any)
-      },
-      (inString) => {
-        return shape.unsafeCast(TOML.parse(inString))
-      },
-    )
-  }
-  /**
-   * Create a File Helper for a .yaml file
-   */
-  static yaml<A extends Record<string, unknown>>(
-    path: string,
-    shape: matches.Validator<unknown, A>,
-  ) {
-    return new FileHelper<A>(
-      path,
-      (inData) => {
-        return YAML.stringify(inData, null, 2)
-      },
-      (inString) => {
-        return shape.unsafeCast(YAML.parse(inString))
-      },
-    )
-  }
-}
-
-export default FileHelper
diff --git a/sdk/lib/util/index.browser.ts b/sdk/lib/util/index.browser.ts
deleted file mode 100644
index 94339e7f7..000000000
--- a/sdk/lib/util/index.browser.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import * as T from "../types"
-
-/// Currently being used
-export { addressHostToUrl } from "./getServiceInterface"
-export { getDefaultString } from "./getDefaultString"
-
-/// Not being used, but known to be browser compatible
-export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
-export { getServiceInterfaces } from "./getServiceInterfaces"
-export * from "./typeHelpers"
diff --git a/sdk/lib/util/index.ts b/sdk/lib/util/index.ts
deleted file mode 100644
index 9246cf791..000000000
--- a/sdk/lib/util/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import "./nullIfEmpty"
-import "./fileHelper"
-import "../store/getStore"
-import "./deepEqual"
-import "./deepMerge"
-import "./SubContainer"
-import "./once"
-
-export { GetServiceInterface, getServiceInterface } from "./getServiceInterface"
-export { asError } from "./asError"
-export { getServiceInterfaces } from "./getServiceInterfaces"
-export { addressHostToUrl } from "./getServiceInterface"
-export { hostnameInfoToAddress } from "./Hostname"
-export * from "./typeHelpers"
-export { getDefaultString } from "./getDefaultString"
-export { inMs } from "./inMs"
diff --git a/sdk/lib/util/nullIfEmpty.ts b/sdk/lib/util/nullIfEmpty.ts
deleted file mode 100644
index 337b9098f..000000000
--- a/sdk/lib/util/nullIfEmpty.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * A useful tool when doing a getConfig.
- * Look into the config {@link FileHelper} for an example of the use.
- * @param s
- * @returns
- */
-export default function nullIfEmpty<A extends Record<string, any>>(
-  s: null | A,
-) {
-  if (s === null) return null
-  return Object.keys(s).length === 0 ? null : s
-}
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index 59f7ab718..9699e0851 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -1,4676 +1,6 @@
 {
-  "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha8",
+  "name": "sdk",
   "lockfileVersion": 3,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha8",
-      "license": "MIT",
-      "dependencies": {
-        "@iarna/toml": "^2.2.5",
-        "@noble/curves": "^1.4.0",
-        "@noble/hashes": "^1.4.0",
-        "isomorphic-fetch": "^3.0.0",
-        "lodash.merge": "^4.6.2",
-        "mime": "^4.0.3",
-        "ts-matches": "^5.5.1",
-        "yaml": "^2.2.2"
-      },
-      "devDependencies": {
-        "@types/jest": "^29.4.0",
-        "@types/lodash.merge": "^4.6.2",
-        "jest": "^29.4.3",
-        "peggy": "^3.0.2",
-        "prettier": "^3.2.5",
-        "ts-jest": "^29.0.5",
-        "ts-node": "^10.9.1",
-        "ts-pegjs": "^4.2.1",
-        "tsx": "^4.7.1",
-        "typescript": "^5.0.4"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
-      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
-      "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.3",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.21.2",
-        "@babel/helpers": "^7.21.0",
-        "@babel/parser": "^7.21.3",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.3",
-        "@babel/types": "^7.21.3",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
-      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.21.3",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
-      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
-      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.2",
-        "@babel/types": "^7.21.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.20.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
-      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
-      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.0",
-        "@babel/types": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
-      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
-      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
-      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.3",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.3",
-        "@babel/types": "^7.21.3",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
-      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
-    },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@iarna/toml": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
-      "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/core": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
-      "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^29.5.0",
-        "@jest/reporters": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.5.0",
-        "jest-config": "^29.5.0",
-        "jest-haste-map": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-resolve-dependencies": "^29.5.0",
-        "jest-runner": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
-        "jest-watcher": "^29.5.0",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.5.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/environment": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
-      "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "jest-mock": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/expect": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
-      "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
-      "dev": true,
-      "dependencies": {
-        "expect": "^29.5.0",
-        "jest-snapshot": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/expect-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
-      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^29.4.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
-      "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.5.0",
-        "@sinonjs/fake-timers": "^10.0.2",
-        "@types/node": "*",
-        "jest-message-util": "^29.5.0",
-        "jest-mock": "^29.5.0",
-        "jest-util": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/globals": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
-      "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/expect": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "jest-mock": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/reporters": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
-      "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
-      "dev": true,
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@jridgewell/trace-mapping": "^0.3.15",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-worker": "^29.5.0",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "v8-to-istanbul": "^9.0.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/schemas": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
-      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
-      "dev": true,
-      "dependencies": {
-        "@sinclair/typebox": "^0.25.16"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/source-map": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
-      "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.15",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/test-result": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
-      "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/test-sequencer": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
-      "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^29.5.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/transform": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
-      "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^29.5.0",
-        "@jridgewell/trace-mapping": "^0.3.15",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^2.0.0",
-        "fast-json-stable-stringify": "^2.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
-        "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.5.0",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.2"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
-      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.4.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
-    },
-    "node_modules/@noble/curves": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
-      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
-      "dependencies": {
-        "@noble/hashes": "1.4.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.25.24",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
-      "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==",
-      "dev": true
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
-      "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz",
-      "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^2.0.0"
-      }
-    },
-    "node_modules/@ts-morph/common": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.19.0.tgz",
-      "integrity": "sha512-Unz/WHmd4pGax91rdIKWi51wnVUW11QttMEPpBiBgIewnc9UQIX7UDLxr5vRlqeByXCwhkF6VabSsI0raWcyAQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-glob": "^3.2.12",
-        "minimatch": "^7.4.3",
-        "mkdirp": "^2.1.6",
-        "path-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/@ts-morph/common/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@ts-morph/common/node_modules/minimatch": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz",
-      "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "dev": true
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
-      "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
-      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
-      "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
-      "dev": true
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.0.tgz",
-      "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==",
-      "dev": true,
-      "dependencies": {
-        "expect": "^29.0.0",
-        "pretty-format": "^29.0.0"
-      }
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==",
-      "dev": true
-    },
-    "node_modules/@types/lodash.merge": {
-      "version": "4.6.9",
-      "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz",
-      "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "18.15.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz",
-      "integrity": "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==",
-      "dev": true
-    },
-    "node_modules/@types/prettier": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz",
-      "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==",
-      "dev": true
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-      "dev": true
-    },
-    "node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/babel-jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
-      "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
-      "dev": true,
-      "dependencies": {
-        "@jest/transform": "^29.5.0",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.5.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
-      }
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
-      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
-      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
-      "dev": true,
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^29.5.0",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.21.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001449",
-        "electron-to-chromium": "^1.4.284",
-        "node-releases": "^2.0.8",
-        "update-browserslist-db": "^1.0.10"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "dev": true,
-      "dependencies": {
-        "fast-json-stable-stringify": "2.x"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
-      "dependencies": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001470",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001470.tgz",
-      "integrity": "sha512-065uNwY6QtHCBOExzbV6m236DDhYCCtPmQUCoQtwkVqzud8v5QPidoMr6CoMkC2nfp6nksjttqWQRRh75LqUmA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ci-info": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
-      "dev": true
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/code-block-writer": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
-      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
-      "dev": true
-    },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-      "dev": true
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/commander": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diff-sequences": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
-      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.341",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.341.tgz",
-      "integrity": "sha512-R4A8VfUBQY9WmAhuqY5tjHRf5fH2AAf6vqitBOE0y6u2PgHgqHSrhZmu78dIX3fVZtjqlwJNX1i2zwC3VpHtQQ==",
-      "dev": true
-    },
-    "node_modules/emittery": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/expect": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
-      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/expect-utils": "^29.5.0",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "dev": true,
-      "dependencies": {
-        "bser": "2.1.1"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-tsconfig": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
-      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
-      "dev": true,
-      "dependencies": {
-        "resolve-pkg-maps": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/isomorphic-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
-      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
-      "dependencies": {
-        "node-fetch": "^2.6.1",
-        "whatwg-fetch": "^3.4.1"
-      }
-    },
-    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "dev": true,
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
-      "dev": true,
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
-      "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.5.0"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
-      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^5.0.0",
-        "p-limit": "^3.1.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-circus": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
-      "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/expect": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.5.0",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "p-limit": "^3.1.0",
-        "pretty-format": "^29.5.0",
-        "pure-rand": "^6.0.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-cli": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
-      "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
-        "prompts": "^2.0.1",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
-      "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "babel-jest": "^29.5.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.5.0",
-        "jest-environment-node": "^29.5.0",
-        "jest-get-type": "^29.4.3",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-runner": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^29.5.0",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-diff": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
-      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.4.3",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-docblock": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
-      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
-      "dev": true,
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
-      "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.5.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.4.3",
-        "jest-util": "^29.5.0",
-        "pretty-format": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
-      "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "jest-mock": "^29.5.0",
-        "jest-util": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
-      "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.5.0",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.5.0",
-        "jest-worker": "^29.5.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
-      "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
-      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.5.0",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-message-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
-      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.5.0",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.5.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-mock": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
-      "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "jest-util": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
-      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
-      "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.5.0",
-        "jest-validate": "^29.5.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
-      "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
-      "dev": true,
-      "dependencies": {
-        "jest-regex-util": "^29.4.3",
-        "jest-snapshot": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
-      "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^29.5.0",
-        "@jest/environment": "^29.5.0",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.4.3",
-        "jest-environment-node": "^29.5.0",
-        "jest-haste-map": "^29.5.0",
-        "jest-leak-detector": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-resolve": "^29.5.0",
-        "jest-runtime": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "jest-watcher": "^29.5.0",
-        "jest-worker": "^29.5.0",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runtime": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
-      "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/fake-timers": "^29.5.0",
-        "@jest/globals": "^29.5.0",
-        "@jest/source-map": "^29.4.3",
-        "@jest/test-result": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-mock": "^29.5.0",
-        "jest-regex-util": "^29.4.3",
-        "jest-resolve": "^29.5.0",
-        "jest-snapshot": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
-      "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-jsx": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.5.0",
-        "@jest/transform": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/babel__traverse": "^7.0.6",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^29.5.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.5.0",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^29.5.0",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/jest-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
-      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-validate": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
-      "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.5.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.4.3",
-        "leven": "^3.1.0",
-        "pretty-format": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watcher": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
-      "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "jest-util": "^29.5.0",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
-      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.5.0",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
-      "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/mime": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
-      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
-      "funding": [
-        "https://github.com/sponsors/broofa"
-      ],
-      "bin": {
-        "mime": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
-      "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
-      "dev": true
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-locate/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/peggy": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/peggy/-/peggy-3.0.2.tgz",
-      "integrity": "sha512-n7chtCbEoGYRwZZ0i/O3t1cPr6o+d9Xx4Zwy2LYfzv0vjchMBU0tO+qYYyvZloBPcgRgzYvALzGWHe609JjEpg==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^10.0.0",
-        "source-map-generator": "0.8.0"
-      },
-      "bin": {
-        "peggy": "bin/peggy.js"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
-      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.4.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pure-rand": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz",
-      "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/dubzzz"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fast-check"
-        }
-      ]
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-pkg-maps": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
-      }
-    },
-    "node_modules/resolve.exports": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-generator": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/source-map-generator/-/source-map-generator-0.8.0.tgz",
-      "integrity": "sha512-psgxdGMwl5MZM9S3FWee4EgsEaIjahYV5AzGnwUvPhWeITz/j6rKpysQHlQ4USdxvINlb8lKfWGIXwfkrgtqkA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dev": true,
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "node_modules/ts-jest": {
-      "version": "29.0.5",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.0.5.tgz",
-      "integrity": "sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==",
-      "dev": true,
-      "dependencies": {
-        "bs-logger": "0.x",
-        "fast-json-stable-stringify": "2.x",
-        "jest-util": "^29.0.0",
-        "json5": "^2.2.3",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "7.x",
-        "yargs-parser": "^21.0.1"
-      },
-      "bin": {
-        "ts-jest": "cli.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.0.0-beta.0 <8",
-        "@jest/types": "^29.0.0",
-        "babel-jest": "^29.0.0",
-        "jest": "^29.0.0",
-        "typescript": ">=4.3"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "@jest/types": {
-          "optional": true
-        },
-        "babel-jest": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-jest/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-jest/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/ts-matches": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
-      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
-    },
-    "node_modules/ts-morph": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-18.0.0.tgz",
-      "integrity": "sha512-Kg5u0mk19PIIe4islUI/HWRvm9bC1lHejK4S0oh1zaZ77TMZAEmQC0sHQYiu2RgCQFZKXz1fMVi/7nOOeirznA==",
-      "dev": true,
-      "dependencies": {
-        "@ts-morph/common": "~0.19.0",
-        "code-block-writer": "^12.0.0"
-      }
-    },
-    "node_modules/ts-node": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-      "dev": true,
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-pegjs": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ts-pegjs/-/ts-pegjs-4.2.1.tgz",
-      "integrity": "sha512-mK/O2pu6lzWUeKpEMA/wsa0GdYblfjJI1y0s0GqH6xCTvugQDOWPJbm5rY6AHivpZICuXIriCb+a7Cflbdtc2w==",
-      "dev": true,
-      "dependencies": {
-        "prettier": "^2.8.8",
-        "ts-morph": "^18.0.0"
-      },
-      "bin": {
-        "tspegjs": "dist/cli.mjs"
-      },
-      "peerDependencies": {
-        "peggy": "^3.0.2"
-      }
-    },
-    "node_modules/ts-pegjs/node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/tsx": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.1.tgz",
-      "integrity": "sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "~0.19.10",
-        "get-tsconfig": "^4.7.2"
-      },
-      "bin": {
-        "tsx": "dist/cli.mjs"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/android-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/android-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/android-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/linux-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/@esbuild/win32-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tsx/node_modules/esbuild": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
-      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.19.12",
-        "@esbuild/android-arm": "0.19.12",
-        "@esbuild/android-arm64": "0.19.12",
-        "@esbuild/android-x64": "0.19.12",
-        "@esbuild/darwin-arm64": "0.19.12",
-        "@esbuild/darwin-x64": "0.19.12",
-        "@esbuild/freebsd-arm64": "0.19.12",
-        "@esbuild/freebsd-x64": "0.19.12",
-        "@esbuild/linux-arm": "0.19.12",
-        "@esbuild/linux-arm64": "0.19.12",
-        "@esbuild/linux-ia32": "0.19.12",
-        "@esbuild/linux-loong64": "0.19.12",
-        "@esbuild/linux-mips64el": "0.19.12",
-        "@esbuild/linux-ppc64": "0.19.12",
-        "@esbuild/linux-riscv64": "0.19.12",
-        "@esbuild/linux-s390x": "0.19.12",
-        "@esbuild/linux-x64": "0.19.12",
-        "@esbuild/netbsd-x64": "0.19.12",
-        "@esbuild/openbsd-x64": "0.19.12",
-        "@esbuild/sunos-x64": "0.19.12",
-        "@esbuild/win32-arm64": "0.19.12",
-        "@esbuild/win32-ia32": "0.19.12",
-        "@esbuild/win32-x64": "0.19.12"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=12.20"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist-lint": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
-      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.12",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
-    },
-    "node_modules/walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dev": true,
-      "dependencies": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-fetch": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yaml": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz",
-      "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  }
+  "packages": {}
 }
diff --git a/sdk/package/.gitignore b/sdk/package/.gitignore
new file mode 100644
index 000000000..a7ca92b2d
--- /dev/null
+++ b/sdk/package/.gitignore
@@ -0,0 +1,5 @@
+.vscode
+dist/
+node_modules/
+lib/coverage
+lib/test/output.ts
\ No newline at end of file
diff --git a/sdk/package/.npmignore b/sdk/package/.npmignore
new file mode 100644
index 000000000..40b878db5
--- /dev/null
+++ b/sdk/package/.npmignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/sdk/package/.prettierignore b/sdk/package/.prettierignore
new file mode 100644
index 000000000..19b24bbe8
--- /dev/null
+++ b/sdk/package/.prettierignore
@@ -0,0 +1 @@
+/lib/exver/exver.ts
\ No newline at end of file
diff --git a/sdk/package/LICENSE b/sdk/package/LICENSE
new file mode 100644
index 000000000..793257b96
--- /dev/null
+++ b/sdk/package/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Start9 Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/sdk/README.md b/sdk/package/README.md
similarity index 100%
rename from sdk/README.md
rename to sdk/package/README.md
diff --git a/sdk/package/jest.config.js b/sdk/package/jest.config.js
new file mode 100644
index 000000000..c38fa5062
--- /dev/null
+++ b/sdk/package/jest.config.js
@@ -0,0 +1,8 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: "ts-jest",
+  automock: false,
+  testEnvironment: "node",
+  rootDir: "./lib/",
+  modulePathIgnorePatterns: ["./dist/"],
+}
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
new file mode 100644
index 000000000..05cc003cb
--- /dev/null
+++ b/sdk/package/lib/StartSdk.ts
@@ -0,0 +1,1410 @@
+import {
+  RequiredDefault,
+  Value,
+} from "../../base/lib/actions/input/builder/value"
+import {
+  InputSpec,
+  ExtractInputSpecType,
+  LazyBuild,
+} from "../../base/lib/actions/input/builder/inputSpec"
+import {
+  DefaultString,
+  ListValueSpecText,
+  Pattern,
+  RandomString,
+  UniqueBy,
+  ValueSpecDatetime,
+  ValueSpecText,
+} from "../../base/lib/actions/input/inputSpecTypes"
+import { Variants } from "../../base/lib/actions/input/builder/variants"
+import { Action, Actions } from "../../base/lib/actions/setupActions"
+import {
+  SyncOptions,
+  ServiceInterfaceId,
+  PackageId,
+  HealthReceipt,
+  ServiceInterfaceType,
+  Effects,
+} from "../../base/lib/types"
+import * as patterns from "../../base/lib/util/patterns"
+import { BackupSync, Backups } from "./backup/Backups"
+import { smtpInputSpec } from "../../base/lib/actions/input/inputSpecConstants"
+import { Daemons } from "./mainFn/Daemons"
+import { healthCheck, HealthCheckParams } from "./health/HealthCheck"
+import { checkPortListening } from "./health/checkFns/checkPortListening"
+import { checkWebUrl, runHealthScript } from "./health/checkFns"
+import { List } from "../../base/lib/actions/input/builder/list"
+import { Install, InstallFn } from "./inits/setupInstall"
+import { SetupBackupsParams, setupBackups } from "./backup/setupBackups"
+import { Uninstall, UninstallFn, setupUninstall } from "./inits/setupUninstall"
+import { setupMain } from "./mainFn"
+import { defaultTrigger } from "./trigger/defaultTrigger"
+import { changeOnFirstSuccess, cooldownTrigger } from "./trigger"
+import {
+  ServiceInterfacesReceipt,
+  UpdateServiceInterfaces,
+  setupServiceInterfaces,
+} from "../../base/lib/interfaces/setupInterfaces"
+import { successFailure } from "./trigger/successFailure"
+import { MultiHost, Scheme } from "../../base/lib/interfaces/Host"
+import { ServiceInterfaceBuilder } from "../../base/lib/interfaces/ServiceInterfaceBuilder"
+import { GetSystemSmtp } from "./util"
+import { nullIfEmpty } from "./util"
+import { getServiceInterface, getServiceInterfaces } from "./util"
+import { getStore } from "./store/getStore"
+import { CommandOptions, MountOptions, SubContainer } from "./util/SubContainer"
+import { splitCommand } from "./util"
+import { Mounts } from "./mainFn/Mounts"
+import { Dependency } from "../../base/lib/dependencies/Dependency"
+import { setupDependencies } from "../../base/lib/dependencies/setupDependencies"
+import * as T from "../../base/lib/types"
+import { testTypeVersion } from "../../base/lib/exver"
+import { ExposedStorePaths } from "./store/setupExposeStore"
+import {
+  PathBuilder,
+  extractJsonPath,
+  pathBuilder,
+} from "../../base/lib/util/PathBuilder"
+import {
+  CheckDependencies,
+  checkDependencies,
+} from "../../base/lib/dependencies/dependencies"
+import { GetSslCertificate } from "./util"
+import { VersionGraph } from "./version"
+import { MaybeFn } from "../../base/lib/actions/setupActions"
+import { GetInput } from "../../base/lib/actions/setupActions"
+import { Run } from "../../base/lib/actions/setupActions"
+import * as actions from "../../base/lib/actions"
+import { setupInit } from "./inits/setupInit"
+
+export const SDKVersion = testTypeVersion("0.3.6")
+
+// prettier-ignore
+type AnyNeverCond<T extends any[], Then, Else> = 
+    T extends [] ? Else :
+    T extends [never, ...Array<any>] ? Then :
+    T extends [any, ...infer U] ? AnyNeverCond<U,Then, Else> :
+    never
+
+export class StartSdk<Manifest extends T.Manifest, Store> {
+  private constructor(readonly manifest: Manifest) {}
+  static of() {
+    return new StartSdk<never, never>(null as never)
+  }
+  withManifest<Manifest extends T.Manifest = never>(manifest: Manifest) {
+    return new StartSdk<Manifest, Store>(manifest)
+  }
+  withStore<Store extends Record<string, any>>() {
+    return new StartSdk<Manifest, Store>(this.manifest)
+  }
+
+  build(isReady: AnyNeverCond<[Manifest, Store], "Build not ready", true>) {
+    type NestedEffects = "subcontainer" | "store" | "action"
+    type InterfaceEffects =
+      | "getServiceInterface"
+      | "listServiceInterfaces"
+      | "exportServiceInterface"
+      | "clearServiceInterfaces"
+      | "bind"
+      | "getHostInfo"
+      | "getPrimaryUrl"
+    type MainUsedEffects = "setMainStatus" | "setHealth"
+    type CallbackEffects = "constRetry" | "clearCallbacks"
+    type AlreadyExposed = "getSslCertificate" | "getSystemSmtp"
+
+    // prettier-ignore
+    type StartSdkEffectWrapper = {
+      [K in keyof Omit<Effects, NestedEffects | InterfaceEffects | MainUsedEffects | CallbackEffects | AlreadyExposed>]: (effects: Effects, ...args: Parameters<Effects[K]>) => ReturnType<Effects[K]>
+    }
+    const startSdkEffectWrapper: StartSdkEffectWrapper = {
+      restart: (effects, ...args) => effects.restart(...args),
+      setDependencies: (effects, ...args) => effects.setDependencies(...args),
+      checkDependencies: (effects, ...args) =>
+        effects.checkDependencies(...args),
+      mount: (effects, ...args) => effects.mount(...args),
+      getInstalledPackages: (effects, ...args) =>
+        effects.getInstalledPackages(...args),
+      exposeForDependents: (effects, ...args) =>
+        effects.exposeForDependents(...args),
+      getServicePortForward: (effects, ...args) =>
+        effects.getServicePortForward(...args),
+      clearBindings: (effects, ...args) => effects.clearBindings(...args),
+      getContainerIp: (effects, ...args) => effects.getContainerIp(...args),
+      getSslKey: (effects, ...args) => effects.getSslKey(...args),
+      setDataVersion: (effects, ...args) => effects.setDataVersion(...args),
+      getDataVersion: (effects, ...args) => effects.getDataVersion(...args),
+      shutdown: (effects, ...args) => effects.shutdown(...args),
+      getDependencies: (effects, ...args) => effects.getDependencies(...args),
+    }
+
+    return {
+      ...startSdkEffectWrapper,
+      action: {
+        run: actions.runAction,
+        request: actions.requestAction,
+        requestOwn: <T extends Omit<T.ActionRequest, "packageId">>(
+          effects: T.Effects,
+          request: actions.ActionRequest<T> & {
+            replayId?: string
+          },
+        ) =>
+          actions.requestAction({
+            effects,
+            request: { ...request, packageId: this.manifest.id },
+          }),
+      },
+      checkDependencies: checkDependencies as <
+        DependencyId extends keyof Manifest["dependencies"] &
+          PackageId = keyof Manifest["dependencies"] & PackageId,
+      >(
+        effects: Effects,
+        packageIds?: DependencyId[],
+      ) => Promise<CheckDependencies<DependencyId>>,
+      serviceInterface: {
+        getOwn: <E extends Effects>(effects: E, id: ServiceInterfaceId) =>
+          getServiceInterface(effects, {
+            id,
+          }),
+        get: <E extends Effects>(
+          effects: E,
+          opts: { id: ServiceInterfaceId; packageId: PackageId },
+        ) => getServiceInterface(effects, opts),
+        getAllOwn: <E extends Effects>(effects: E) =>
+          getServiceInterfaces(effects, {}),
+        getAll: <E extends Effects>(
+          effects: E,
+          opts: { packageId: PackageId },
+        ) => getServiceInterfaces(effects, opts),
+      },
+
+      store: {
+        get: <E extends Effects, StoreValue = unknown>(
+          effects: E,
+          packageId: string,
+          path: PathBuilder<Store, StoreValue>,
+        ) =>
+          getStore<Store, StoreValue>(effects, path, {
+            packageId,
+          }),
+        getOwn: <E extends Effects, StoreValue = unknown>(
+          effects: E,
+          path: PathBuilder<Store, StoreValue>,
+        ) => getStore<Store, StoreValue>(effects, path),
+        setOwn: <E extends Effects, Path extends PathBuilder<Store, unknown>>(
+          effects: E,
+          path: Path,
+          value: Path extends PathBuilder<Store, infer Value> ? Value : never,
+        ) =>
+          effects.store.set<Store>({
+            value,
+            path: extractJsonPath(path),
+          }),
+      },
+
+      host: {
+        // static: (effects: Effects, id: string) =>
+        //   new StaticHost({ id, effects }),
+        // single: (effects: Effects, id: string) =>
+        //   new SingleHost({ id, effects }),
+        multi: (effects: Effects, id: string) => new MultiHost({ id, effects }),
+      },
+      nullIfEmpty,
+      runCommand: async <A extends string>(
+        effects: Effects,
+        image: {
+          id: keyof Manifest["images"] & T.ImageId
+          sharedRun?: boolean
+        },
+        command: T.CommandType,
+        options: CommandOptions & {
+          mounts?: { path: string; options: MountOptions }[]
+        },
+        name: string,
+      ): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> => {
+        return runCommand<Manifest>(effects, image, command, options, name)
+      },
+      /**
+       * TODO: rewrite this
+       * @description Use this function to create a static Action, including optional form input.
+       *
+       *   By convention, each Action should receive its own file.
+       *
+       * @param id
+       * @param metaData
+       * @param fn
+       * @returns
+       * @example
+       * In this example, we create an Action that prints a name to the console. We present a user
+       * with a form for optionally entering a temp name. If no temp name is provided, we use the name
+       * from the underlying `inputSpec.yaml` file. If no name is there, we use "Unknown". Then, we return
+       * a message to the user informing them what happened.
+       * 
+       * ```
+        import { sdk } from '../sdk'
+        const { InputSpec, Value } = sdk
+        import { yamlFile } from '../file-models/inputSpec.yml'
+
+        const input = InputSpec.of({
+          nameToPrint: Value.text({
+            name: 'Temp Name',
+            description: 'If no name is provided, the name from inputSpec will be used',
+            required: false,
+          }),
+        })
+
+        export const nameToLog = sdk.createAction(
+          // id
+          'nameToLogs',
+
+          // metadata
+          {
+            name: 'Name to Logs',
+            description: 'Prints "Hello [Name]" to the service logs.',
+            warning: null,
+            disabled: false,
+            input,
+            allowedStatuses: 'onlyRunning',
+            group: null,
+          },
+
+          // the execution function
+          async ({ effects, input }) => {
+            const name =
+              input.nameToPrint || (await yamlFile.read(effects))?.name || 'Unknown'
+
+            console.info(`Hello ${name}`)
+
+            return {
+              version: '0',
+              message: `"Hello ${name}" has been written to the service logs. Open your logs to view it.`,
+              value: name,
+              copyable: true,
+              qr: false,
+            }
+          },
+        )
+       * ```
+       */
+      Action: {
+        withInput: <
+          Id extends T.ActionId,
+          InputSpecType extends
+            | Record<string, any>
+            | InputSpec<any, any>
+            | InputSpec<any, never>,
+          Type extends
+            ExtractInputSpecType<InputSpecType> = ExtractInputSpecType<InputSpecType>,
+        >(
+          id: Id,
+          metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
+          inputSpec: InputSpecType,
+          getInput: GetInput<Type>,
+          run: Run<Type>,
+        ) => Action.withInput(id, metadata, inputSpec, getInput, run),
+        withoutInput: <Id extends T.ActionId>(
+          id: Id,
+          metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
+          run: Run<{}>,
+        ) => Action.withoutInput(id, metadata, run),
+      },
+      inputSpecConstants: { smtpInputSpec },
+      /**
+       * @description Use this function to create a service interface.
+       * @param effects
+       * @param options
+       * @example
+       * In this example, we create a standard web UI
+       *
+       * ```
+        const ui = sdk.createInterface(effects, {
+          name: 'Web UI',
+          id: 'ui',
+          description: 'The primary web app for this service.',
+          type: 'ui',
+          hasPrimary: false,
+          masked: false,
+          schemeOverride: null,
+          username: null,
+          path: '',
+          search: {},
+        })
+       * ```
+       */
+      createInterface: (
+        effects: Effects,
+        options: {
+          /** The human readable name of this service interface. */
+          name: string
+          /** A unique ID for this service interface. */
+          id: string
+          /** The human readable description. */
+          description: string
+          /** Not available until StartOS v0.4.0. If true, forces the user to select one URL (i.e. .onion, .local, or IP address) as the primary URL. This is needed by some services to function properly. */
+          hasPrimary: boolean
+          /** Affects how the interface appears to the user. One of: 'ui', 'api', 'p2p'. */
+          type: ServiceInterfaceType
+          /** (optional) prepends the provided username to all URLs. */
+          username: null | string
+          /** (optional) appends the provided path to all URLs. */
+          path: string
+          /** (optional) appends the provided query params to all URLs. */
+          search: Record<string, string>
+          /** (optional) overrides the protocol prefix provided by the bind function.
+           *
+           * @example `ftp://`
+           */
+          schemeOverride: { ssl: Scheme; noSsl: Scheme } | null
+          /** TODO Aiden how would someone include a password in the URL? Whether or not to mask the URLs on the screen, for example, when they contain a password */
+          masked: boolean
+        },
+      ) => new ServiceInterfaceBuilder({ ...options, effects }),
+      getSystemSmtp: <E extends Effects>(effects: E) =>
+        new GetSystemSmtp(effects),
+      getSslCerificate: <E extends Effects>(
+        effects: E,
+        hostnames: string[],
+        algorithm?: T.Algorithm,
+      ) => new GetSslCertificate(effects, hostnames, algorithm),
+      HealthCheck: {
+        of(o: HealthCheckParams) {
+          return healthCheck(o)
+        },
+      },
+      Dependency: {
+        /**
+         * @description Use this function to create a dependency for the service.
+         * @property {DependencyType} type
+         * @property {VersionRange} versionRange
+         * @property {string[]} healthChecks
+         */
+        of(data: Dependency["data"]) {
+          return new Dependency({ ...data })
+        },
+      },
+      healthCheck: {
+        checkPortListening,
+        checkWebUrl,
+        runHealthScript,
+      },
+      patterns,
+      /**
+       * @description Use this function to list every Action offered by the service. Actions will be displayed in the provided order.
+       *
+       *   By convention, each Action should receive its own file in the "actions" directory.
+       * @example
+       * 
+       * ```
+        import { sdk } from '../sdk'
+        import { config } from './config'
+        import { nameToLogs } from './nameToLogs'
+
+        export const actions = sdk.Actions.of().addAction(config).addAction(nameToLogs)
+       * ```
+       */
+      Actions: Actions<Store, {}>,
+      /**
+       * @description Use this function to determine which volumes are backed up when a user creates a backup, including advanced options.
+       * @example
+       * In this example, we back up the entire "main" volume and nothing else.
+       *
+       * ```
+        export const { createBackup, restoreBackup } = sdk.setupBackups(sdk.Backups.addVolume('main'))
+       * ```
+       * @example
+       * In this example, we back up the "main" and the "other" volume, but exclude hypothetical directory "excludedDir" from the "other".
+       *
+       * ```
+        export const { createBackup, restoreBackup } = sdk.setupBackups(sdk.Backups
+          .addVolume('main')
+          .addVolume('other', { exclude: ['path/to/excludedDir'] })
+        )
+       * ```
+       */
+      setupBackups: (options: SetupBackupsParams<Manifest>) =>
+        setupBackups<Manifest>(options),
+      /**
+       * @description Use this function to set dependency information.
+       *
+       *   The function executes on service install, update, and inputSpec save. "input" will be of type `Input` for inputSpec save. It will be `null` for install and update.
+       * @example
+       * In this example, we create a static dependency on Hello World >=1.0.0:0, where Hello World must be running and passing its "webui" health check.
+       *
+       * ```
+        export const setDependencies = sdk.setupDependencies(
+          async ({ effects, input }) => {
+            return {
+              'hello-world': sdk.Dependency.of({
+                type: 'running',
+                versionRange: VersionRange.parse('>=1.0.0:0'),
+                healthChecks: ['webui'],
+              }),
+            }
+          },
+        )
+       * ```
+       * @example
+       * In this example, we create a conditional dependency on Hello World based on a hypothetical "needsWorld" boolean in the store.
+       *
+       * ```
+        export const setDependencies = sdk.setupDependencies(
+          async ({ effects }) => {
+            if (sdk.store.getOwn(sdk.StorePath.needsWorld).const()) {
+              return {
+                'hello-world': sdk.Dependency.of({
+                  type: 'running',
+                  versionRange: VersionRange.parse('>=1.0.0:0'),
+                  healthChecks: ['webui'],
+                }),
+              }
+            }
+            return {}
+          },
+        )
+       * ```
+       */
+      setupDependencies: setupDependencies<Manifest>,
+      setupInit: setupInit<Manifest, Store>,
+      /**
+       * @description Use this function to execute arbitrary logic *once*, on initial install only.
+       * @example
+       * In the this example, we bootstrap our Store with a random, 16-char admin password.
+       *
+       * ```
+        const install = sdk.setupInstall(async ({ effects }) => {
+          await sdk.store.setOwn(
+            effects,
+            sdk.StorePath.adminPassword,
+            utils.getDefaultString({
+              charset: 'a-z,A-Z,1-9,!,@,$,%,&,',
+              len: 16,
+            }),
+          )
+        })
+       * ```
+       */
+      setupInstall: (fn: InstallFn<Manifest, Store>) => Install.of(fn),
+      /**
+       * @description Use this function to determine how this service will be hosted and served. The function executes on service install, service update, and inputSpec save.
+       *
+       *   "input" will be of type `Input` for inputSpec save. It will be `null` for install and update.
+       *
+       *   To learn about creating multi-hosts and interfaces, check out the {@link https://docs.start9.com/packaging-guide/learn/interfaces documentation}.
+       * @param inputSpec - The inputSpec spec of this service as exported from /inputSpec/spec.
+       * @param fn - an async function that returns an array of interface receipts. The function always has access to `effects`; it has access to `input` only after inputSpec save, otherwise `input` will be null.
+       * @example
+       * In this example, we create two UIs from one multi-host, and one API from another multi-host.
+       *
+       * ```
+        export const setInterfaces = sdk.setupInterfaces(
+          inputSpecSpec,
+          async ({ effects, input }) => {
+            // ** UI multi-host **
+            const uiMulti = sdk.host.multi(effects, 'ui-multi')
+            const uiMultiOrigin = await uiMulti.bindPort(80, {
+              protocol: 'http',
+            })
+            // Primary UI
+            const primaryUi = sdk.createInterface(effects, {
+              name: 'Primary UI',
+              id: 'primary-ui',
+              description: 'The primary web app for this service.',
+              type: 'ui',
+              hasPrimary: false,
+              masked: false,
+              schemeOverride: null,
+              username: null,
+              path: '',
+              search: {},
+            })
+            // Admin UI
+            const adminUi = sdk.createInterface(effects, {
+              name: 'Admin UI',
+              id: 'admin-ui',
+              description: 'The admin web app for this service.',
+              type: 'ui',
+              hasPrimary: false,
+              masked: false,
+              schemeOverride: null,
+              username: null,
+              path: '/admin',
+              search: {},
+            })
+            // UI receipt
+            const uiReceipt = await uiMultiOrigin.export([primaryUi, adminUi])
+       
+            // ** API multi-host **
+            const apiMulti = sdk.host.multi(effects, 'api-multi')
+            const apiMultiOrigin = await apiMulti.bindPort(5959, {
+              protocol: 'http',
+            })
+            // API
+            const api = sdk.createInterface(effects, {
+              name: 'Admin API',
+              id: 'api',
+              description: 'The advanced API for this service.',
+              type: 'api',
+              hasPrimary: false,
+              masked: false,
+              schemeOverride: null,
+              username: null,
+              path: '',
+              search: {},
+            })
+            // API receipt
+            const apiReceipt = await apiMultiOrigin.export([api])
+       
+            // ** Return receipts **
+            return [uiReceipt, apiReceipt]
+          },
+        )
+       * ```
+       */
+      setupInterfaces: setupServiceInterfaces,
+      setupMain: (
+        fn: (o: {
+          effects: Effects
+          started(onTerm: () => PromiseLike<void>): PromiseLike<void>
+        }) => Promise<Daemons<Manifest, any>>,
+      ) => setupMain<Manifest, Store>(fn),
+      /**
+       * @description Use this function to determine which information to expose to the UI in the "Properties" section.
+       *
+       *   Values can be obtained from anywhere: the Store, the upstream service, or another service.
+       * @example
+       * In this example, we retrieve the admin password from the Store and expose it, masked and copyable, to
+       * the UI as "Admin Password".
+       *
+       * ```
+        export const properties = sdk.setupProperties(async ({ effects }) => {
+          const store = await sdk.store.getOwn(effects, sdk.StorePath).once()
+       
+          return {
+            'Admin Password': {
+              type: 'string',
+              value: store.adminPassword,
+              description: 'Used for logging into the admin UI',
+              copyable: true,
+              masked: true,
+              qr: false,
+            },
+          }
+        })
+       * ```
+       */
+      setupProperties:
+        (
+          fn: (options: { effects: Effects }) => Promise<T.SdkPropertiesReturn>,
+        ): T.ExpectedExports.properties =>
+        (options) =>
+          fn(options).then(nullifyProperties),
+      /**
+       * Use this function to execute arbitrary logic *once*, on uninstall only. Most services will not use this.
+       */
+      setupUninstall: (fn: UninstallFn<Manifest, Store>) =>
+        setupUninstall<Manifest, Store>(fn),
+      trigger: {
+        defaultTrigger,
+        cooldownTrigger,
+        changeOnFirstSuccess,
+        successFailure,
+      },
+      Mounts: {
+        of() {
+          return Mounts.of<Manifest>()
+        },
+      },
+      Backups: {
+        volumes: (
+          ...volumeNames: Array<Manifest["volumes"][number] & string>
+        ) => Backups.withVolumes<Manifest>(...volumeNames),
+        addSets: (
+          ...options: BackupSync<Manifest["volumes"][number] & string>[]
+        ) => Backups.withSyncs<Manifest>(...options),
+        withOptions: (options?: Partial<SyncOptions>) =>
+          Backups.withOptions<Manifest>(options),
+      },
+      InputSpec: {
+        /**
+         * @description Use this function to define the inputSpec specification that will ultimately present to the user as validated form inputs.
+         *
+         *   Most form controls are supported, including text, textarea, number, toggle, select, multiselect, list, color, datetime, object (sub form), and union (conditional sub form).
+         * @example
+         * In this example, we define a inputSpec form with two value: name and makePublic.
+         *
+         * ```
+          import { sdk } from '../sdk'
+          const { InputSpec, Value } = sdk
+         
+          export const inputSpecSpec = InputSpec.of({
+            name: Value.text({
+              name: 'Name',
+              description:
+                'When you launch the Hello World UI, it will display "Hello [Name]"',
+              required: { default: 'World' },
+            }),
+            makePublic: Value.toggle({
+              name: 'Make Public',
+              description: 'Whether or not to expose the service to the network',
+              default: false,
+            }),
+          })
+         * ```
+         */
+        of: <
+          Spec extends Record<string, Value<any, Store> | Value<any, never>>,
+        >(
+          spec: Spec,
+        ) => InputSpec.of<Spec, Store>(spec),
+      },
+      Daemons: {
+        of(inputSpec: {
+          effects: Effects
+          started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
+          healthReceipts: HealthReceipt[]
+        }) {
+          return Daemons.of<Manifest>(inputSpec)
+        },
+      },
+      List: {
+        /**
+         * @description Create a list of text inputs.
+         * @param a - attributes of the list itself.
+         * @param aSpec - attributes describing each member of the list.
+         */
+        text: List.text,
+        /**
+         * @description Create a list of objects.
+         * @param a - attributes of the list itself.
+         * @param aSpec - attributes describing each member of the list.
+         */
+        obj: <Type extends Record<string, any>>(
+          a: {
+            name: string
+            description?: string | null
+            /** Presents a warning before adding/removing/editing a list item. */
+            warning?: string | null
+            default?: []
+            minLength?: number | null
+            maxLength?: number | null
+          },
+          aSpec: {
+            spec: InputSpec<Type, Store>
+            /**
+             * @description The ID of a required field on the inner object whose value will be used to display items in the list.
+             * @example
+             * In this example, we use the value of the `label` field to display members of the list.
+             *
+             * ```
+              spec: InputSpec.of({
+                label: Value.text({
+                  name: 'Label',
+                  required: false,
+                })
+              })
+              displayAs: 'label',
+              uniqueBy: null,
+             * ```
+             *
+             */
+            displayAs?: null | string
+            /**
+             * @description The ID(s) of required fields on the inner object whose value(s) will be used to enforce uniqueness in the list.
+             * @example
+             * In this example, we use the `label` field to enforce uniqueness, meaning the label field must be unique from other entries.
+             *
+             * ```
+              spec: InputSpec.of({
+                label: Value.text({
+                  name: 'Label',
+                  required: { default: null },
+                })
+                pubkey: Value.text({
+                  name: 'Pubkey',
+                  required: { default: null },
+                })
+              })
+              displayAs: 'label',
+              uniqueBy: 'label',
+             * ```
+             * @example
+             * In this example, we use the `label` field AND the `pubkey` field to enforce uniqueness, meaning both these fields must be unique from other entries.
+             *
+             * ```
+              spec: InputSpec.of({
+                label: Value.text({
+                  name: 'Label',
+                  required: { default: null },
+                })
+                pubkey: Value.text({
+                  name: 'Pubkey',
+                  required: { default: null },
+                })
+              })
+              displayAs: 'label',
+              uniqueBy: { all: ['label', 'pubkey'] },
+             * ```
+             */
+            uniqueBy?: null | UniqueBy
+          },
+        ) => List.obj<Type, Store>(a, aSpec),
+        /**
+         * @description Create a list of dynamic text inputs.
+         * @param a - attributes of the list itself.
+         * @param aSpec - attributes describing each member of the list.
+         */
+        dynamicText: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              warning?: string | null
+              default?: string[]
+              minLength?: number | null
+              maxLength?: number | null
+              disabled?: false | string
+              generate?: null | RandomString
+              spec: {
+                masked?: boolean
+                placeholder?: string | null
+                minLength?: number | null
+                maxLength?: number | null
+                patterns: Pattern[]
+                inputmode?: ListValueSpecText["inputmode"]
+              }
+            }
+          >,
+        ) => List.dynamicText<Store>(getA),
+      },
+      StorePath: pathBuilder<Store>(),
+      Value: {
+        /**
+         * @description Displays a boolean toggle to enable/disable
+         * @example
+         * ```
+          toggleExample: Value.toggle({
+            // required
+            name: 'Toggle Example',
+            default: true,
+         
+            // optional
+            description: null,
+            warning: null,
+            immutable: false,
+          }),
+         * ```
+         */
+        toggle: Value.toggle,
+        /**
+         * @description Displays a text input field
+         * @example
+         * ```
+          textExample: Value.text({
+            // required
+            name: 'Text Example',
+            required: false,
+         
+            // optional
+            description: null,
+            placeholder: null,
+            warning: null,
+            generate: null,
+            inputmode: 'text',
+            masked: false,
+            minLength: null,
+            maxLength: null,
+            patterns: [],
+            immutable: false,
+          }),
+         * ```
+         */
+        text: Value.text,
+        /**
+         * @description Displays a large textarea field for long form entry.
+         * @example
+         * ```
+          textareaExample: Value.textarea({
+            // required
+            name: 'Textarea Example',
+            required: false,
+         
+            // optional
+            description: null,
+            placeholder: null,
+            warning: null,
+            minLength: null,
+            maxLength: null,
+            immutable: false,
+          }),
+         * ```
+         */
+        textarea: Value.textarea,
+        /**
+         * @description Displays a number input field
+         * @example
+         * ```
+          numberExample: Value.number({
+            // required
+            name: 'Number Example',
+            required: false,
+            integer: true,
+         
+            // optional
+            description: null,
+            placeholder: null,
+            warning: null,
+            min: null,
+            max: null,
+            immutable: false,
+            step: null,
+            units: null,
+          }),
+         * ```
+         */
+        number: Value.number,
+        /**
+         * @description Displays a browser-native color selector.
+         * @example
+         * ```
+          colorExample: Value.color({
+            // required
+            name: 'Color Example',
+            required: false,
+         
+            // optional
+            description: null,
+            warning: null,
+            immutable: false,
+          }),
+         * ```
+         */
+        color: Value.color,
+        /**
+         * @description Displays a browser-native date/time selector.
+         * @example
+         * ```
+          datetimeExample: Value.datetime({
+            // required
+            name: 'Datetime Example',
+            required: false,
+         
+            // optional
+            description: null,
+            warning: null,
+            immutable: false,
+            inputmode: 'datetime-local',
+            min: null,
+            max: null,
+          }),
+         * ```
+         */
+        datetime: Value.datetime,
+        /**
+         * @description Displays a select modal with radio buttons, allowing for a single selection.
+         * @example
+         * ```
+          selectExample: Value.select({
+            // required
+            name: 'Select Example',
+            required: false,
+            values: {
+              radio1: 'Radio 1',
+              radio2: 'Radio 2',
+            },
+         
+            // optional
+            description: null,
+            warning: null,
+            immutable: false,
+            disabled: false,
+          }),
+         * ```
+         */
+        select: Value.select,
+        /**
+         * @description Displays a select modal with checkboxes, allowing for multiple selections.
+         * @example
+         * ```
+          multiselectExample: Value.multiselect({
+            // required
+            name: 'Multiselect Example',
+            values: {
+              option1: 'Option 1',
+              option2: 'Option 2',
+            },
+            default: [],
+         
+            // optional
+            description: null,
+            warning: null,
+            immutable: false,
+            disabled: false,
+            minlength: null,
+            maxLength: null,
+          }),
+         * ```
+         */
+        multiselect: Value.multiselect,
+        /**
+         * @description Display a collapsable grouping of additional fields, a "sub form". The second value is the inputSpec spec for the sub form.
+         * @example
+         * ```
+          objectExample: Value.object(
+            {
+              // required
+              name: 'Object Example',
+         
+              // optional
+              description: null,
+              warning: null,
+            },
+            InputSpec.of({}),
+          ),
+         * ```
+         */
+        object: Value.object,
+        /**
+         * @description Displays a dropdown, allowing for a single selection. Depending on the selection, a different object ("sub form") is presented.
+         * @example
+         * ```
+          unionExample: Value.union(
+            {
+              // required
+              name: 'Union Example',
+              required: false,
+         
+              // optional
+              description: null,
+              warning: null,
+              disabled: false,
+              immutable: false,
+            },
+            Variants.of({
+              option1: {
+                name: 'Option 1',
+                spec: InputSpec.of({}),
+              },
+              option2: {
+                name: 'Option 2',
+                spec: InputSpec.of({}),
+              },
+            }),
+          ),
+         * ```
+         */
+        union: Value.union,
+        /**
+         * @description Presents an interface to add/remove/edit items in a list.
+         * @example
+         * In this example, we create a list of text inputs.
+         * 
+         * ```
+          listExampleText: Value.list(
+            List.text(
+              {
+                // required
+                name: 'Text List',
+
+                // optional
+                description: null,
+                warning: null,
+                default: [],
+                minLength: null,
+                maxLength: null,
+              },
+              {
+                // required
+                patterns: [],
+
+                // optional
+                placeholder: null,
+                generate: null,
+                inputmode: 'url',
+                masked: false,
+                minLength: null,
+                maxLength: null,
+              },
+            ),
+          ),
+         * ```
+         * @example
+         * In this example, we create a list of objects.
+         * 
+         * ```
+          listExampleObject: Value.list(
+            List.obj(
+              {
+                // required
+                name: 'Object List',
+
+                // optional
+                description: null,
+                warning: null,
+                default: [],
+                minLength: null,
+                maxLength: null,
+              },
+              {
+                // required
+                spec: InputSpec.of({}),
+
+                // optional
+                displayAs: null,
+                uniqueBy: null,
+              },
+            ),
+          ),
+         * ```
+         */
+        list: Value.list,
+        dynamicToggle: (
+          a: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              default: boolean
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicToggle<Store>(a),
+        dynamicText: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              /**
+               * @description Determines if the field is required. If so, optionally provide a default value.
+               * @type { false | { default: string | RandomString | null } }
+               * @example required: false
+               * @example required: { default: null }
+               * @example required: { default: 'World' }
+               * @example required: { default: { charset: 'abcdefg', len: 16 } }
+               */
+              required: RequiredDefault<DefaultString>
+              /**
+               * @description Mask (aka camouflage) text input with dots: ● ● ●
+               * @default false
+               */
+              masked?: boolean
+              placeholder?: string | null
+              minLength?: number | null
+              maxLength?: number | null
+              /**
+               * @description A list of regular expressions to which the text must conform to pass validation. A human readable description is provided in case the validation fails.
+               * @default []
+               * @example
+               * ```
+                [
+                  {
+                    regex: "[a-z]",
+                    description: "May only contain lower case letters from the English alphabet."
+                  }
+                ]
+               * ```
+               */
+              patterns?: Pattern[]
+              /**
+               * @description Informs the browser how to behave and which keyboard to display on mobile
+               * @default "text"
+               */
+              inputmode?: ValueSpecText["inputmode"]
+              /**
+               * @description Displays a button that will generate a random string according to the provided charset and len attributes.
+               */
+              generate?: null | RandomString
+            }
+          >,
+        ) => Value.dynamicText<Store>(getA),
+        dynamicTextarea: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              /**
+               * @description Unlike other "required" fields, for textarea this is a simple boolean.
+               */
+              required: boolean
+              minLength?: number | null
+              maxLength?: number | null
+              placeholder?: string | null
+              disabled?: false | string
+              generate?: null | RandomString
+            }
+          >,
+        ) => Value.dynamicTextarea<Store>(getA),
+        dynamicNumber: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              /**
+               * @description Determines if the field is required. If so, optionally provide a default value.
+               * @type { false | { default: number | null } }
+               * @example required: false
+               * @example required: { default: null }
+               * @example required: { default: 7 }
+               */
+              required: RequiredDefault<number>
+              min?: number | null
+              max?: number | null
+              /**
+               * @description How much does the number increase/decrease when using the arrows provided by the browser.
+               * @default 1
+               */
+              step?: number | null
+              /**
+               * @description Requires the number to be an integer.
+               */
+              integer: boolean
+              /**
+               * @description Optionally display units to the right of the input box.
+               */
+              units?: string | null
+              placeholder?: string | null
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicNumber<Store>(getA),
+        dynamicColor: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              /**
+               * @description Determines if the field is required. If so, optionally provide a default value.
+               * @type { false | { default: string | null } }
+               * @example required: false
+               * @example required: { default: null }
+               * @example required: { default: 'ffffff' }
+               */
+              required: RequiredDefault<string>
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicColor<Store>(getA),
+        dynamicDatetime: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              /**
+               * @description Determines if the field is required. If so, optionally provide a default value.
+               * @type { false | { default: string | null } }
+               * @example required: false
+               * @example required: { default: null }
+               * @example required: { default: '1985-12-16 18:00:00.000' }
+               */
+              required: RequiredDefault<string>
+              /**
+               * @description Informs the browser how to behave and which date/time component to display.
+               * @default "datetime-local"
+               */
+              inputmode?: ValueSpecDatetime["inputmode"]
+              min?: string | null
+              max?: string | null
+              disabled?: false | string
+            }
+          >,
+        ) => Value.dynamicDatetime<Store>(getA),
+        dynamicSelect: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              /**
+               * @description Determines if the field is required. If so, optionally provide a default value from the list of values.
+               * @type { false | { default: string | null } }
+               * @example required: false
+               * @example required: { default: null }
+               * @example required: { default: 'radio1' }
+               */
+              required: RequiredDefault<string>
+              /**
+               * @description A mapping of unique radio options to their human readable display format.
+               * @example
+               * ```
+                {
+                  radio1: "Radio 1"
+                  radio2: "Radio 2"
+                  radio3: "Radio 3"
+                }
+               * ```
+               */
+              values: Record<string, string>
+              /**
+               * @options
+               *   - false - The field can be modified.
+               *   - string - The field cannot be modified. The provided text explains why.
+               *   - string[] - The field can be modified, but the values contained in the array cannot be selected.
+               * @default false
+               */
+              disabled?: false | string | string[]
+            }
+          >,
+        ) => Value.dynamicSelect<Store>(getA),
+        dynamicMultiselect: (
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              /**
+               * @description A simple list of which options should be checked by default.
+               */
+              default: string[]
+              /**
+               * @description A mapping of checkbox options to their human readable display format.
+               * @example
+               * ```
+                {
+                  option1: "Option 1"
+                  option2: "Option 2"
+                  option3: "Option 3"
+                }
+               * ```
+               */
+              values: Record<string, string>
+              minLength?: number | null
+              maxLength?: number | null
+              /**
+               * @options
+               *   - false - The field can be modified.
+               *   - string - The field cannot be modified. The provided text explains why.
+               *   - string[] - The field can be modified, but the values contained in the array cannot be selected.
+               * @default false
+               */
+              disabled?: false | string | string[]
+            }
+          >,
+        ) => Value.dynamicMultiselect<Store>(getA),
+        filteredUnion: <
+          Required extends RequiredDefault<string>,
+          Type extends Record<string, any>,
+        >(
+          getDisabledFn: LazyBuild<Store, string[]>,
+          a: {
+            name: string
+            description?: string | null
+            warning?: string | null
+            required: Required
+          },
+          aVariants: Variants<Type, Store> | Variants<Type, never>,
+        ) =>
+          Value.filteredUnion<Required, Type, Store>(
+            getDisabledFn,
+            a,
+            aVariants,
+          ),
+
+        dynamicUnion: <
+          Required extends RequiredDefault<string>,
+          Type extends Record<string, any>,
+        >(
+          getA: LazyBuild<
+            Store,
+            {
+              name: string
+              description?: string | null
+              /** Presents a warning prompt before permitting the value to change. */
+              warning?: string | null
+              /**
+               * @description Determines if the field is required. If so, optionally provide a default value from the list of variants.
+               * @type { false | { default: string | null } }
+               * @example required: false
+               * @example required: { default: null }
+               * @example required: { default: 'variant1' }
+               */
+              required: Required
+              /**
+               * @options
+               *   - false - The field can be modified.
+               *   - string - The field cannot be modified. The provided text explains why.
+               *   - string[] - The field can be modified, but the values contained in the array cannot be selected.
+               * @default false
+               */
+              disabled: false | string | string[]
+            }
+          >,
+          aVariants: Variants<Type, Store> | Variants<Type, never>,
+        ) => Value.dynamicUnion<Required, Type, Store>(getA, aVariants),
+      },
+      Variants: {
+        of: <
+          VariantValues extends {
+            [K in string]: {
+              name: string
+              spec: InputSpec<any, Store>
+            }
+          },
+        >(
+          a: VariantValues,
+        ) => Variants.of<VariantValues, Store>(a),
+      },
+    }
+  }
+}
+
+export async function runCommand<Manifest extends T.Manifest>(
+  effects: Effects,
+  image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean },
+  command: string | [string, ...string[]],
+  options: CommandOptions & {
+    mounts?: { path: string; options: MountOptions }[]
+  },
+  name: string,
+): Promise<{ stdout: string | Buffer; stderr: string | Buffer }> {
+  const commands = splitCommand(command)
+  return SubContainer.with(
+    effects,
+    image,
+    options.mounts || [],
+    name,
+    (subcontainer) => subcontainer.exec(commands),
+  )
+}
+function nullifyProperties(value: T.SdkPropertiesReturn): T.PropertiesReturn {
+  return Object.fromEntries(
+    Object.entries(value).map(([k, v]) => [k, nullifyProperties_(v)]),
+  )
+}
+function nullifyProperties_(value: T.SdkPropertiesValue): T.PropertiesValue {
+  if (value.type === "string") {
+    return {
+      description: null,
+      copyable: null,
+      masked: null,
+      qr: null,
+      ...value,
+    }
+  }
+  return {
+    description: null,
+    ...value,
+    value: Object.fromEntries(
+      Object.entries(value.value).map(([k, v]) => [k, nullifyProperties_(v)]),
+    ),
+  }
+}
diff --git a/sdk/package/lib/backup/Backups.ts b/sdk/package/lib/backup/Backups.ts
new file mode 100644
index 000000000..8d8f03295
--- /dev/null
+++ b/sdk/package/lib/backup/Backups.ts
@@ -0,0 +1,208 @@
+import * as T from "../../../base/lib/types"
+import * as child_process from "child_process"
+import { asError } from "../util"
+
+export const DEFAULT_OPTIONS: T.SyncOptions = {
+  delete: true,
+  exclude: [],
+}
+export type BackupSync<Volumes extends string> = {
+  dataPath: `/media/startos/volumes/${Volumes}/${string}`
+  backupPath: `/media/startos/backup/${string}`
+  options?: Partial<T.SyncOptions>
+  backupOptions?: Partial<T.SyncOptions>
+  restoreOptions?: Partial<T.SyncOptions>
+}
+/**
+ * This utility simplifies the volume backup process.
+ * ```ts
+ * export const { createBackup, restoreBackup } = Backups.volumes("main").build();
+ * ```
+ *
+ * Changing the options of the rsync, (ie excludes) use either
+ * ```ts
+ *  Backups.volumes("main").set_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
+ * // or
+ *  Backups.with_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
+ * ```
+ *
+ * Using the more fine control, using the addSets for more control
+ * ```ts
+ * Backups.addSets({
+ * srcVolume: 'main', srcPath:'smallData/', dstPath: 'main/smallData/', dstVolume: : Backups.BACKUP
+ * }, {
+ * srcVolume: 'main', srcPath:'bigData/', dstPath: 'main/bigData/', dstVolume: : Backups.BACKUP, options: {exclude:['bigData/excludeThis']}}
+ * ).build()q
+ * ```
+ */
+export class Backups<M extends T.Manifest> {
+  private constructor(
+    private options = DEFAULT_OPTIONS,
+    private restoreOptions: Partial<T.SyncOptions> = {},
+    private backupOptions: Partial<T.SyncOptions> = {},
+    private backupSet = [] as BackupSync<M["volumes"][number]>[],
+  ) {}
+
+  static withVolumes<M extends T.Manifest = never>(
+    ...volumeNames: Array<M["volumes"][number]>
+  ): Backups<M> {
+    return Backups.withSyncs(
+      ...volumeNames.map((srcVolume) => ({
+        dataPath: `/media/startos/volumes/${srcVolume}/` as const,
+        backupPath: `/media/startos/backup/${srcVolume}/` as const,
+      })),
+    )
+  }
+
+  static withSyncs<M extends T.Manifest = never>(
+    ...syncs: BackupSync<M["volumes"][number]>[]
+  ) {
+    return syncs.reduce((acc, x) => acc.addSync(x), new Backups<M>())
+  }
+
+  static withOptions<M extends T.Manifest = never>(
+    options?: Partial<T.SyncOptions>,
+  ) {
+    return new Backups<M>({ ...DEFAULT_OPTIONS, ...options })
+  }
+
+  setOptions(options?: Partial<T.SyncOptions>) {
+    this.options = {
+      ...this.options,
+      ...options,
+    }
+    return this
+  }
+
+  setBackupOptions(options?: Partial<T.SyncOptions>) {
+    this.backupOptions = {
+      ...this.backupOptions,
+      ...options,
+    }
+    return this
+  }
+
+  setRestoreOptions(options?: Partial<T.SyncOptions>) {
+    this.restoreOptions = {
+      ...this.restoreOptions,
+      ...options,
+    }
+    return this
+  }
+
+  addVolume(
+    volume: M["volumes"][number],
+    options?: Partial<{
+      options: T.SyncOptions
+      backupOptions: T.SyncOptions
+      restoreOptions: T.SyncOptions
+    }>,
+  ) {
+    return this.addSync({
+      dataPath: `/media/startos/volumes/${volume}/` as const,
+      backupPath: `/media/startos/backup/${volume}/` as const,
+      ...options,
+    })
+  }
+  addSync(sync: BackupSync<M["volumes"][0]>) {
+    this.backupSet.push({
+      ...sync,
+      options: { ...this.options, ...sync.options },
+    })
+    return this
+  }
+
+  async createBackup() {
+    for (const item of this.backupSet) {
+      const rsyncResults = await runRsync({
+        srcPath: item.dataPath,
+        dstPath: item.backupPath,
+        options: {
+          ...this.options,
+          ...this.backupOptions,
+          ...item.options,
+          ...item.backupOptions,
+        },
+      })
+      await rsyncResults.wait()
+    }
+    return
+  }
+
+  async restoreBackup() {
+    for (const item of this.backupSet) {
+      const rsyncResults = await runRsync({
+        srcPath: item.backupPath,
+        dstPath: item.dataPath,
+        options: {
+          ...this.options,
+          ...this.backupOptions,
+          ...item.options,
+          ...item.backupOptions,
+        },
+      })
+      await rsyncResults.wait()
+    }
+    return
+  }
+}
+
+async function runRsync(rsyncOptions: {
+  srcPath: string
+  dstPath: string
+  options: T.SyncOptions
+}): Promise<{
+  id: () => Promise<string>
+  wait: () => Promise<null>
+  progress: () => Promise<number>
+}> {
+  const { srcPath, dstPath, options } = rsyncOptions
+
+  const command = "rsync"
+  const args: string[] = []
+  if (options.delete) {
+    args.push("--delete")
+  }
+  for (const exclude of options.exclude) {
+    args.push(`--exclude=${exclude}`)
+  }
+  args.push("-actAXH")
+  args.push("--info=progress2")
+  args.push("--no-inc-recursive")
+  args.push(srcPath)
+  args.push(dstPath)
+  const spawned = child_process.spawn(command, args, { detached: true })
+  let percentage = 0.0
+  spawned.stdout.on("data", (data: unknown) => {
+    const lines = String(data).replace("\r", "\n").split("\n")
+    for (const line of lines) {
+      const parsed = /$([0-9.]+)%/.exec(line)?.[1]
+      if (!parsed) continue
+      percentage = Number.parseFloat(parsed)
+    }
+  })
+
+  spawned.stderr.on("data", (data: unknown) => {
+    console.error(`Backups.runAsync`, asError(data))
+  })
+
+  const id = async () => {
+    const pid = spawned.pid
+    if (pid === undefined) {
+      throw new Error("rsync process has no pid")
+    }
+    return String(pid)
+  }
+  const waitPromise = new Promise<null>((resolve, reject) => {
+    spawned.on("exit", (code: any) => {
+      if (code === 0) {
+        resolve(null)
+      } else {
+        reject(new Error(`rsync exited with code ${code}`))
+      }
+    })
+  })
+  const wait = () => waitPromise
+  const progress = () => Promise.resolve(percentage)
+  return { id, wait, progress }
+}
diff --git a/sdk/lib/backup/index.ts b/sdk/package/lib/backup/index.ts
similarity index 97%
rename from sdk/lib/backup/index.ts
rename to sdk/package/lib/backup/index.ts
index fe9cd8569..1e7995252 100644
--- a/sdk/lib/backup/index.ts
+++ b/sdk/package/lib/backup/index.ts
@@ -1,3 +1,2 @@
 import "./Backups"
-
 import "./setupBackups"
diff --git a/sdk/package/lib/backup/setupBackups.ts b/sdk/package/lib/backup/setupBackups.ts
new file mode 100644
index 000000000..b9654824b
--- /dev/null
+++ b/sdk/package/lib/backup/setupBackups.ts
@@ -0,0 +1,39 @@
+import { Backups } from "./Backups"
+import * as T from "../../../base/lib/types"
+import { _ } from "../util"
+
+export type SetupBackupsParams<M extends T.Manifest> =
+  | M["volumes"][number][]
+  | ((_: { effects: T.Effects }) => Promise<Backups<M>>)
+
+type SetupBackupsRes = {
+  createBackup: T.ExpectedExports.createBackup
+  restoreBackup: T.ExpectedExports.restoreBackup
+}
+
+export function setupBackups<M extends T.Manifest>(
+  options: SetupBackupsParams<M>,
+) {
+  let backupsFactory: (_: { effects: T.Effects }) => Promise<Backups<M>>
+  if (options instanceof Function) {
+    backupsFactory = options
+  } else {
+    backupsFactory = async () => Backups.withVolumes(...options)
+  }
+  const answer: {
+    createBackup: T.ExpectedExports.createBackup
+    restoreBackup: T.ExpectedExports.restoreBackup
+  } = {
+    get createBackup() {
+      return (async (options) => {
+        return (await backupsFactory(options)).createBackup()
+      }) as T.ExpectedExports.createBackup
+    },
+    get restoreBackup() {
+      return (async (options) => {
+        return (await backupsFactory(options)).restoreBackup()
+      }) as T.ExpectedExports.restoreBackup
+    },
+  }
+  return answer
+}
diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/package/lib/health/HealthCheck.ts
similarity index 88%
rename from sdk/lib/health/HealthCheck.ts
rename to sdk/package/lib/health/HealthCheck.ts
index e007c4ea2..05c1a214a 100644
--- a/sdk/lib/health/HealthCheck.ts
+++ b/sdk/package/lib/health/HealthCheck.ts
@@ -1,14 +1,10 @@
-import { Effects } from "../types"
+import { Effects, HealthReceipt } from "../../../base/lib/types"
 import { HealthCheckResult } from "./checkFns/HealthCheckResult"
-import { HealthReceipt } from "./HealthReceipt"
 import { Trigger } from "../trigger"
 import { TriggerInput } from "../trigger/TriggerInput"
 import { defaultTrigger } from "../trigger/defaultTrigger"
-import { once } from "../util/once"
-import { SubContainer } from "../util/SubContainer"
+import { once, asError } from "../util"
 import { object, unknown } from "ts-matches"
-import * as T from "../types"
-import { asError } from "../util/asError"
 
 export type HealthCheckParams = {
   effects: Effects
diff --git a/sdk/lib/health/checkFns/HealthCheckResult.ts b/sdk/package/lib/health/checkFns/HealthCheckResult.ts
similarity index 63%
rename from sdk/lib/health/checkFns/HealthCheckResult.ts
rename to sdk/package/lib/health/checkFns/HealthCheckResult.ts
index ba2468488..92d4afddf 100644
--- a/sdk/lib/health/checkFns/HealthCheckResult.ts
+++ b/sdk/package/lib/health/checkFns/HealthCheckResult.ts
@@ -1,3 +1,3 @@
-import { T } from "../.."
+import { T } from "../../../../base/lib"
 
 export type HealthCheckResult = Omit<T.NamedHealthCheckResult, "name">
diff --git a/sdk/lib/health/checkFns/checkPortListening.ts b/sdk/package/lib/health/checkFns/checkPortListening.ts
similarity index 94%
rename from sdk/lib/health/checkFns/checkPortListening.ts
rename to sdk/package/lib/health/checkFns/checkPortListening.ts
index 94d0becc0..e745bce4f 100644
--- a/sdk/lib/health/checkFns/checkPortListening.ts
+++ b/sdk/package/lib/health/checkFns/checkPortListening.ts
@@ -1,5 +1,5 @@
-import { Effects } from "../../types"
-import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
+import { Effects } from "../../../../base/lib/types"
+import { stringFromStdErrOut } from "../../util"
 import { HealthCheckResult } from "./HealthCheckResult"
 
 import { promisify } from "node:util"
diff --git a/sdk/lib/health/checkFns/checkWebUrl.ts b/sdk/package/lib/health/checkFns/checkWebUrl.ts
similarity index 90%
rename from sdk/lib/health/checkFns/checkWebUrl.ts
rename to sdk/package/lib/health/checkFns/checkWebUrl.ts
index 042115211..e04ee7531 100644
--- a/sdk/lib/health/checkFns/checkWebUrl.ts
+++ b/sdk/package/lib/health/checkFns/checkWebUrl.ts
@@ -1,5 +1,5 @@
-import { Effects } from "../../types"
-import { asError } from "../../util/asError"
+import { Effects } from "../../../../base/lib/types"
+import { asError } from "../../util"
 import { HealthCheckResult } from "./HealthCheckResult"
 import { timeoutPromise } from "./index"
 import "isomorphic-fetch"
diff --git a/sdk/lib/health/checkFns/index.ts b/sdk/package/lib/health/checkFns/index.ts
similarity index 100%
rename from sdk/lib/health/checkFns/index.ts
rename to sdk/package/lib/health/checkFns/index.ts
diff --git a/sdk/lib/health/checkFns/runHealthScript.ts b/sdk/package/lib/health/checkFns/runHealthScript.ts
similarity index 91%
rename from sdk/lib/health/checkFns/runHealthScript.ts
rename to sdk/package/lib/health/checkFns/runHealthScript.ts
index 4bac211a9..7ecd1ad75 100644
--- a/sdk/lib/health/checkFns/runHealthScript.ts
+++ b/sdk/package/lib/health/checkFns/runHealthScript.ts
@@ -1,8 +1,6 @@
-import { Effects } from "../../types"
-import { SubContainer } from "../../util/SubContainer"
-import { stringFromStdErrOut } from "../../util/stringFromStdErrOut"
 import { HealthCheckResult } from "./HealthCheckResult"
 import { timeoutPromise } from "./index"
+import { SubContainer } from "../../util/SubContainer"
 
 /**
  * Running a health script, is used when we want to have a simple
diff --git a/sdk/package/lib/health/index.ts b/sdk/package/lib/health/index.ts
new file mode 100644
index 000000000..b969037a5
--- /dev/null
+++ b/sdk/package/lib/health/index.ts
@@ -0,0 +1 @@
+import "./checkFns"
diff --git a/sdk/lib/index.ts b/sdk/package/lib/index.ts
similarity index 58%
rename from sdk/lib/index.ts
rename to sdk/package/lib/index.ts
index a4caf9c01..a83e35745 100644
--- a/sdk/lib/index.ts
+++ b/sdk/package/lib/index.ts
@@ -1,32 +1,48 @@
+import {
+  S9pk,
+  Version,
+  VersionRange,
+  ExtendedVersion,
+  inputSpec,
+  ISB,
+  IST,
+  types,
+  T,
+  matches,
+  utils,
+} from "../../base/lib"
+
+export {
+  S9pk,
+  Version,
+  VersionRange,
+  ExtendedVersion,
+  inputSpec,
+  ISB,
+  IST,
+  types,
+  T,
+  matches,
+  utils,
+}
 export { Daemons } from "./mainFn/Daemons"
 export { SubContainer } from "./util/SubContainer"
 export { StartSdk } from "./StartSdk"
 export { setupManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
 export { setupExposeStore } from "./store/setupExposeStore"
-export { pathBuilder } from "./store/PathBuilder"
-export { S9pk } from "./s9pk"
-export { VersionRange, ExtendedVersion, Version } from "./exver"
+export { pathBuilder } from "../../base/lib/util/PathBuilder"
 
-export * as actions from "./actions"
+export * as actions from "../../base/lib/actions"
 export * as backup from "./backup"
-export * as config from "./config"
-export * as CB from "./config/builder"
-export * as CT from "./config/configTypes"
-export * as dependencyConfig from "./dependencies"
 export * as daemons from "./mainFn/Daemons"
 export * as health from "./health"
 export * as healthFns from "./health/checkFns"
 export * as inits from "./inits"
 export * as mainFn from "./mainFn"
-export * as manifest from "./manifest"
 export * as toml from "@iarna/toml"
-export * as types from "./types"
-export * as T from "./types"
 export * as yaml from "yaml"
 export * as startSdk from "./StartSdk"
-export * as utils from "./util"
-export * as matches from "ts-matches"
 export * as YAML from "yaml"
 export * as TOML from "@iarna/toml"
 export * from "./version"
diff --git a/sdk/lib/inits/index.ts b/sdk/package/lib/inits/index.ts
similarity index 100%
rename from sdk/lib/inits/index.ts
rename to sdk/package/lib/inits/index.ts
diff --git a/sdk/lib/inits/setupInit.ts b/sdk/package/lib/inits/setupInit.ts
similarity index 59%
rename from sdk/lib/inits/setupInit.ts
rename to sdk/package/lib/inits/setupInit.ts
index 5fd1c481c..c9ab4f171 100644
--- a/sdk/lib/inits/setupInit.ts
+++ b/sdk/package/lib/inits/setupInit.ts
@@ -1,9 +1,8 @@
-import { DependenciesReceipt } from "../config/setupConfig"
-import { ExtendedVersion, VersionRange } from "../exver"
-import { SetInterfaces } from "../interfaces/setupInterfaces"
-
-import { ExposedStorePaths } from "../store/setupExposeStore"
-import * as T from "../types"
+import { Actions } from "../../../base/lib/actions/setupActions"
+import { ExtendedVersion } from "../../../base/lib/exver"
+import { UpdateServiceInterfaces } from "../../../base/lib/interfaces/setupInterfaces"
+import { ExposedStorePaths } from "../../../base/lib/types"
+import * as T from "../../../base/lib/types"
 import { VersionGraph } from "../version/VersionGraph"
 import { Install } from "./setupInstall"
 import { Uninstall } from "./setupUninstall"
@@ -12,18 +11,17 @@ export function setupInit<Manifest extends T.Manifest, Store>(
   versions: VersionGraph<Manifest["version"]>,
   install: Install<Manifest, Store>,
   uninstall: Uninstall<Manifest, Store>,
-  setInterfaces: SetInterfaces<Manifest, Store, any, any>,
-  setDependencies: (options: {
-    effects: T.Effects
-    input: any
-  }) => Promise<DependenciesReceipt>,
+  setServiceInterfaces: UpdateServiceInterfaces<any>,
+  setDependencies: (options: { effects: T.Effects }) => Promise<void>,
+  actions: Actions<Store, any>,
   exposedStore: ExposedStorePaths,
 ): {
-  init: T.ExpectedExports.init
-  uninit: T.ExpectedExports.uninit
+  packageInit: T.ExpectedExports.packageInit
+  packageUninit: T.ExpectedExports.packageUninit
+  containerInit: T.ExpectedExports.containerInit
 } {
   return {
-    init: async (opts) => {
+    packageInit: async (opts) => {
       const prev = await opts.effects.getDataVersion()
       if (prev) {
         await versions.migrate({
@@ -37,14 +35,8 @@ export function setupInit<Manifest extends T.Manifest, Store>(
           version: versions.current.options.version,
         })
       }
-      await setInterfaces({
-        ...opts,
-        input: null,
-      })
-      await opts.effects.exposeForDependents({ paths: exposedStore })
-      await setDependencies({ effects: opts.effects, input: null })
     },
-    uninit: async (opts) => {
+    packageUninit: async (opts) => {
       if (opts.nextVersion) {
         const prev = await opts.effects.getDataVersion()
         if (prev) {
@@ -58,5 +50,13 @@ export function setupInit<Manifest extends T.Manifest, Store>(
         await uninstall.uninstall(opts)
       }
     },
+    containerInit: async (opts) => {
+      await setServiceInterfaces({
+        ...opts,
+      })
+      await actions.update({ effects: opts.effects })
+      await opts.effects.exposeForDependents({ paths: exposedStore })
+      await setDependencies({ effects: opts.effects })
+    },
   }
 }
diff --git a/sdk/lib/inits/setupInstall.ts b/sdk/package/lib/inits/setupInstall.ts
similarity index 81%
rename from sdk/lib/inits/setupInstall.ts
rename to sdk/package/lib/inits/setupInstall.ts
index ab21380a0..d9f694021 100644
--- a/sdk/lib/inits/setupInstall.ts
+++ b/sdk/package/lib/inits/setupInstall.ts
@@ -1,4 +1,4 @@
-import * as T from "../types"
+import * as T from "../../../base/lib/types"
 
 export type InstallFn<Manifest extends T.Manifest, Store> = (opts: {
   effects: T.Effects
@@ -11,7 +11,7 @@ export class Install<Manifest extends T.Manifest, Store> {
     return new Install(fn)
   }
 
-  async install({ effects }: Parameters<T.ExpectedExports.init>[0]) {
+  async install({ effects }: Parameters<T.ExpectedExports.packageInit>[0]) {
     await this.fn({
       effects,
     })
diff --git a/sdk/lib/inits/setupUninstall.ts b/sdk/package/lib/inits/setupUninstall.ts
similarity index 86%
rename from sdk/lib/inits/setupUninstall.ts
rename to sdk/package/lib/inits/setupUninstall.ts
index 918f417e5..c863e1ad7 100644
--- a/sdk/lib/inits/setupUninstall.ts
+++ b/sdk/package/lib/inits/setupUninstall.ts
@@ -1,4 +1,4 @@
-import * as T from "../types"
+import * as T from "../../../base/lib/types"
 
 export type UninstallFn<Manifest extends T.Manifest, Store> = (opts: {
   effects: T.Effects
@@ -14,7 +14,7 @@ export class Uninstall<Manifest extends T.Manifest, Store> {
   async uninstall({
     effects,
     nextVersion,
-  }: Parameters<T.ExpectedExports.uninit>[0]) {
+  }: Parameters<T.ExpectedExports.packageUninit>[0]) {
     if (!nextVersion)
       await this.fn({
         effects,
diff --git a/sdk/lib/mainFn/CommandController.ts b/sdk/package/lib/mainFn/CommandController.ts
similarity index 94%
rename from sdk/lib/mainFn/CommandController.ts
rename to sdk/package/lib/mainFn/CommandController.ts
index 9c206803a..78d888b95 100644
--- a/sdk/lib/mainFn/CommandController.ts
+++ b/sdk/package/lib/mainFn/CommandController.ts
@@ -1,15 +1,15 @@
 import { DEFAULT_SIGTERM_TIMEOUT } from "."
-import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../StartSdk"
+import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../../../base/lib/types"
 
-import * as T from "../types"
-import { asError } from "../util/asError"
+import * as T from "../../../base/lib/types"
+import { asError } from "../../../base/lib/util/asError"
 import {
   ExecSpawnable,
   MountOptions,
   SubContainerHandle,
   SubContainer,
 } from "../util/SubContainer"
-import { splitCommand } from "../util/splitCommand"
+import { splitCommand } from "../util"
 import * as cp from "child_process"
 
 export class CommandController {
diff --git a/sdk/lib/mainFn/Daemon.ts b/sdk/package/lib/mainFn/Daemon.ts
similarity index 96%
rename from sdk/lib/mainFn/Daemon.ts
rename to sdk/package/lib/mainFn/Daemon.ts
index 6fa1d1085..45f252dac 100644
--- a/sdk/lib/mainFn/Daemon.ts
+++ b/sdk/package/lib/mainFn/Daemon.ts
@@ -1,5 +1,5 @@
-import * as T from "../types"
-import { asError } from "../util/asError"
+import * as T from "../../../base/lib/types"
+import { asError } from "../../../base/lib/util/asError"
 import { ExecSpawnable, MountOptions, SubContainer } from "../util/SubContainer"
 import { CommandController } from "./CommandController"
 
diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/package/lib/mainFn/Daemons.ts
similarity index 87%
rename from sdk/lib/mainFn/Daemons.ts
rename to sdk/package/lib/mainFn/Daemons.ts
index b17f3a1a1..0e05214f7 100644
--- a/sdk/lib/mainFn/Daemons.ts
+++ b/sdk/package/lib/mainFn/Daemons.ts
@@ -1,19 +1,11 @@
-import { NO_TIMEOUT, SIGKILL, SIGTERM, Signals } from "../StartSdk"
-import { HealthReceipt } from "../health/HealthReceipt"
+import { HealthReceipt, Signals } from "../../../base/lib/types"
+
 import { HealthCheckResult } from "../health/checkFns"
 
 import { Trigger } from "../trigger"
-import { TriggerInput } from "../trigger/TriggerInput"
-import { defaultTrigger } from "../trigger/defaultTrigger"
-import * as T from "../types"
+import * as T from "../../../base/lib/types"
 import { Mounts } from "./Mounts"
-import {
-  CommandOptions,
-  ExecSpawnable,
-  MountOptions,
-  SubContainer,
-} from "../util/SubContainer"
-import { splitCommand } from "../util/splitCommand"
+import { ExecSpawnable, MountOptions } from "../util/SubContainer"
 
 import { promisify } from "node:util"
 import * as CP from "node:child_process"
@@ -77,7 +69,9 @@ Daemons.of({
 })
 ```
  */
-export class Daemons<Manifest extends T.Manifest, Ids extends string> {
+export class Daemons<Manifest extends T.Manifest, Ids extends string>
+  implements T.DaemonBuildable
+{
   private constructor(
     readonly effects: T.Effects,
     readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>,
@@ -86,23 +80,23 @@ export class Daemons<Manifest extends T.Manifest, Ids extends string> {
     readonly healthDaemons: HealthDaemon[],
   ) {}
   /**
-   * Returns an empty new Daemons class with the provided config.
+   * Returns an empty new Daemons class with the provided inputSpec.
    *
    * Call .addDaemon() on the returned class to add a daemon.
    *
    * Daemons run in the order they are defined, with latter daemons being capable of
    * depending on prior daemons
-   * @param config
+   * @param inputSpec
    * @returns
    */
-  static of<Manifest extends T.Manifest>(config: {
+  static of<Manifest extends T.Manifest>(inputSpec: {
     effects: T.Effects
     started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
     healthReceipts: HealthReceipt[]
   }) {
     return new Daemons<Manifest, never>(
-      config.effects,
-      config.started,
+      inputSpec.effects,
+      inputSpec.started,
       [],
       [],
       [],
diff --git a/sdk/lib/mainFn/HealthDaemon.ts b/sdk/package/lib/mainFn/HealthDaemon.ts
similarity index 97%
rename from sdk/lib/mainFn/HealthDaemon.ts
rename to sdk/package/lib/mainFn/HealthDaemon.ts
index 7ace3ed7b..71ba83b3f 100644
--- a/sdk/lib/mainFn/HealthDaemon.ts
+++ b/sdk/package/lib/mainFn/HealthDaemon.ts
@@ -2,9 +2,9 @@ import { HealthCheckResult } from "../health/checkFns"
 import { defaultTrigger } from "../trigger/defaultTrigger"
 import { Ready } from "./Daemons"
 import { Daemon } from "./Daemon"
-import { Effects, SetHealth } from "../types"
+import { SetHealth, Effects } from "../../../base/lib/types"
 import { DEFAULT_SIGTERM_TIMEOUT } from "."
-import { asError } from "../util/asError"
+import { asError } from "../../../base/lib/util/asError"
 
 const oncePromise = <T>() => {
   let resolve: (value: T) => void
diff --git a/sdk/lib/mainFn/Mounts.ts b/sdk/package/lib/mainFn/Mounts.ts
similarity index 98%
rename from sdk/lib/mainFn/Mounts.ts
rename to sdk/package/lib/mainFn/Mounts.ts
index bd947b759..42d6d66ab 100644
--- a/sdk/lib/mainFn/Mounts.ts
+++ b/sdk/package/lib/mainFn/Mounts.ts
@@ -1,4 +1,4 @@
-import * as T from "../types"
+import * as T from "../../../base/lib/types"
 import { MountOptions } from "../util/SubContainer"
 
 type MountArray = { path: string; options: MountOptions }[]
diff --git a/sdk/lib/mainFn/index.ts b/sdk/package/lib/mainFn/index.ts
similarity index 77%
rename from sdk/lib/mainFn/index.ts
rename to sdk/package/lib/mainFn/index.ts
index 7a094a31a..ee0481630 100644
--- a/sdk/lib/mainFn/index.ts
+++ b/sdk/package/lib/mainFn/index.ts
@@ -1,11 +1,7 @@
-import * as T from "../types"
+import * as T from "../../../base/lib/types"
 import { Daemons } from "./Daemons"
-import "../interfaces/ServiceInterfaceBuilder"
-import "../interfaces/Origin"
-
-import "./Daemons"
-
-import { MainEffects } from "../StartSdk"
+import "../../../base/lib/interfaces/ServiceInterfaceBuilder"
+import "../../../base/lib/interfaces/Origin"
 
 export const DEFAULT_SIGTERM_TIMEOUT = 30_000
 /**
@@ -20,7 +16,7 @@ export const DEFAULT_SIGTERM_TIMEOUT = 30_000
  */
 export const setupMain = <Manifest extends T.Manifest, Store>(
   fn: (o: {
-    effects: MainEffects
+    effects: T.Effects
     started(onTerm: () => PromiseLike<void>): PromiseLike<void>
   }) => Promise<Daemons<Manifest, any>>,
 ): T.ExpectedExports.main => {
diff --git a/sdk/lib/manifest/setupManifest.ts b/sdk/package/lib/manifest/setupManifest.ts
similarity index 75%
rename from sdk/lib/manifest/setupManifest.ts
rename to sdk/package/lib/manifest/setupManifest.ts
index 10aaa03db..088575c1a 100644
--- a/sdk/lib/manifest/setupManifest.ts
+++ b/sdk/package/lib/manifest/setupManifest.ts
@@ -1,13 +1,17 @@
-import * as T from "../types"
-import { ImageConfig, ImageId, VolumeId } from "../osBindings"
-import { SDKManifest, SDKImageConfig } from "./ManifestTypes"
+import * as T from "../../../base/lib/types"
+import { ImageConfig, ImageId, VolumeId } from "../../../base/lib/types"
+import {
+  SDKManifest,
+  SDKImageInputSpec,
+} from "../../../base/lib/types/ManifestTypes"
 import { SDKVersion } from "../StartSdk"
 import { VersionGraph } from "../version/VersionGraph"
 
 /**
- * This is an example of a function that takes a manifest and returns a new manifest with additional properties
- * @param manifest Manifests are the description of the package
- * @returns The manifest with additional properties
+ * @description Use this function to define critical information about your package
+ *
+ * @param versions Every version of the package, imported from ./versions
+ * @param manifest Static properties of the package
  */
 export function setupManifest<
   Id extends string,
@@ -20,7 +24,7 @@ export function setupManifest<
     dependencies: Dependencies
     id: Id
     assets: AssetTypes[]
-    images: Record<ImagesTypes, SDKImageConfig>
+    images: Record<ImagesTypes, SDKImageInputSpec>
     volumes: VolumesTypes[]
   },
   Satisfies extends string[] = [],
@@ -56,7 +60,6 @@ export function setupManifest<
       start: manifest.alerts?.start || null,
       stop: manifest.alerts?.stop || null,
     },
-    hasConfig: manifest.hasConfig === undefined ? true : manifest.hasConfig,
     hardwareRequirements: {
       device: Object.fromEntries(
         Object.entries(manifest.hardwareRequirements?.device || {}).map(
@@ -67,14 +70,14 @@ export function setupManifest<
       arch:
         manifest.hardwareRequirements?.arch === undefined
           ? Object.values(images).reduce(
-              (arch, config) => {
-                if (config.emulateMissingAs) {
+              (arch, inputSpec) => {
+                if (inputSpec.emulateMissingAs) {
                   return arch
                 }
                 if (arch === null) {
-                  return config.arch
+                  return inputSpec.arch
                 }
-                return arch.filter((a) => config.arch.includes(a))
+                return arch.filter((a) => inputSpec.arch.includes(a))
               },
               null as string[] | null,
             )
diff --git a/sdk/lib/store/getStore.ts b/sdk/package/lib/store/getStore.ts
similarity index 90%
rename from sdk/lib/store/getStore.ts
rename to sdk/package/lib/store/getStore.ts
index 5250a02a1..3bde46a25 100644
--- a/sdk/lib/store/getStore.ts
+++ b/sdk/package/lib/store/getStore.ts
@@ -1,5 +1,5 @@
-import { Effects } from "../types"
-import { PathBuilder, extractJsonPath } from "./PathBuilder"
+import { Effects } from "../../../base/lib/Effects"
+import { PathBuilder, extractJsonPath } from "../util"
 
 export class GetStore<Store, StoreValue> {
   constructor(
@@ -18,7 +18,7 @@ export class GetStore<Store, StoreValue> {
     return this.effects.store.get<Store, StoreValue>({
       ...this.options,
       path: extractJsonPath(this.path),
-      callback: this.effects.restart,
+      callback: () => this.effects.constRetry(),
     })
   }
   /**
diff --git a/sdk/package/lib/store/setupExposeStore.ts b/sdk/package/lib/store/setupExposeStore.ts
new file mode 100644
index 000000000..1ae0bf13f
--- /dev/null
+++ b/sdk/package/lib/store/setupExposeStore.ts
@@ -0,0 +1,28 @@
+import { ExposedStorePaths } from "../../../base/lib/types"
+import { Affine, _ } from "../util"
+import {
+  PathBuilder,
+  extractJsonPath,
+  pathBuilder,
+} from "../../../base/lib/util/PathBuilder"
+
+/**
+ * @description Use this function to determine which Store values to expose and make available to other services running on StartOS. Store values not exposed here will be kept private. Use the type safe pathBuilder to traverse your Store's structure.
+ * @example
+ * In this example, we expose the hypothetical Store values "adminPassword" and "nameLastUpdatedAt".
+ *
+ * ```
+  export const exposedStore = setupExposeStore<Store>((pathBuilder) => [
+    pathBuilder.adminPassword
+    pathBuilder.nameLastUpdatedAt,
+  ])
+ * ```
+ */
+export const setupExposeStore = <Store extends Record<string, any>>(
+  fn: (pathBuilder: PathBuilder<Store>) => PathBuilder<Store, any>[],
+) => {
+  return fn(pathBuilder<Store>()).map(
+    (x) => extractJsonPath(x) as string,
+  ) as ExposedStorePaths
+}
+export { ExposedStorePaths }
diff --git a/sdk/lib/test/health.readyCheck.test.ts b/sdk/package/lib/test/health.readyCheck.test.ts
similarity index 100%
rename from sdk/lib/test/health.readyCheck.test.ts
rename to sdk/package/lib/test/health.readyCheck.test.ts
diff --git a/sdk/lib/test/host.test.ts b/sdk/package/lib/test/host.test.ts
similarity index 78%
rename from sdk/lib/test/host.test.ts
rename to sdk/package/lib/test/host.test.ts
index 64d486a94..87f22b8bd 100644
--- a/sdk/lib/test/host.test.ts
+++ b/sdk/package/lib/test/host.test.ts
@@ -1,6 +1,6 @@
-import { ServiceInterfaceBuilder } from "../interfaces/ServiceInterfaceBuilder"
-import { Effects } from "../types"
-import { sdk } from "./output.sdk"
+import { ServiceInterfaceBuilder } from "../../../base/lib/interfaces/ServiceInterfaceBuilder"
+import { Effects } from "../../../base/lib/Effects"
+import { sdk } from "../test/output.sdk"
 
 describe("host", () => {
   test("Testing that the types work", () => {
diff --git a/sdk/lib/test/configBuilder.test.ts b/sdk/package/lib/test/inputSpecBuilder.test.ts
similarity index 94%
rename from sdk/lib/test/configBuilder.test.ts
rename to sdk/package/lib/test/inputSpecBuilder.test.ts
index 5c65271a8..bb5a8e25d 100644
--- a/sdk/lib/test/configBuilder.test.ts
+++ b/sdk/package/lib/test/inputSpecBuilder.test.ts
@@ -1,9 +1,9 @@
 import { testOutput } from "./output.test"
-import { Config } from "../config/builder/config"
-import { List } from "../config/builder/list"
-import { Value } from "../config/builder/value"
-import { Variants } from "../config/builder/variants"
-import { ValueSpec } from "../config/configTypes"
+import { InputSpec } from "../../../base/lib/actions/input/builder/inputSpec"
+import { List } from "../../../base/lib/actions/input/builder/list"
+import { Value } from "../../../base/lib/actions/input/builder/value"
+import { Variants } from "../../../base/lib/actions/input/builder/variants"
+import { ValueSpec } from "../../../base/lib/actions/input/inputSpecTypes"
 import { setupManifest } from "../manifest/setupManifest"
 import { StartSdk } from "../StartSdk"
 import { VersionGraph } from "../version/VersionGraph"
@@ -13,7 +13,7 @@ describe("builder tests", () => {
   test("text", async () => {
     const bitcoinPropertiesBuilt: {
       "peer-tor-address": ValueSpec
-    } = await Config.of({
+    } = await InputSpec.of({
       "peer-tor-address": Value.text({
         name: "Peer tor address",
         description: "The Tor address of the peer interface",
@@ -232,9 +232,8 @@ describe("values", () => {
       {
         name: "Testing",
         description: null,
-        warning: null,
       },
-      Config.of({
+      InputSpec.of({
         a: Value.toggle({
           name: "test",
           description: null,
@@ -258,7 +257,7 @@ describe("values", () => {
       Variants.of({
         a: {
           name: "a",
-          spec: Config.of({
+          spec: InputSpec.of({
             b: Value.toggle({
               name: "b",
               description: null,
@@ -277,7 +276,7 @@ describe("values", () => {
 
   describe("dynamic", () => {
     const fakeOptions = {
-      config: "config",
+      inputSpec: "inputSpec",
       effects: "effects",
       utils: "utils",
     } as any
@@ -546,7 +545,7 @@ describe("values", () => {
         Variants.of({
           a: {
             name: "a",
-            spec: Config.of({
+            spec: InputSpec.of({
               b: Value.toggle({
                 name: "b",
                 description: null,
@@ -557,7 +556,7 @@ describe("values", () => {
           },
           b: {
             name: "b",
-            spec: Config.of({
+            spec: InputSpec.of({
               b: Value.toggle({
                 name: "b",
                 description: null,
@@ -613,7 +612,7 @@ describe("values", () => {
       Variants.of({
         a: {
           name: "a",
-          spec: Config.of({
+          spec: InputSpec.of({
             b: Value.toggle({
               name: "b",
               description: null,
@@ -624,7 +623,7 @@ describe("values", () => {
         },
         b: {
           name: "b",
-          spec: Config.of({
+          spec: InputSpec.of({
             b: Value.toggle({
               name: "b",
               description: null,
@@ -679,7 +678,7 @@ describe("Builder List", () => {
           name: "test",
         },
         {
-          spec: Config.of({
+          spec: InputSpec.of({
             test: Value.toggle({
               name: "test",
               description: null,
@@ -732,11 +731,11 @@ describe("Builder List", () => {
 
 describe("Nested nullable values", () => {
   test("Testing text", async () => {
-    const value = Config.of({
+    const value = InputSpec.of({
       a: Value.text({
         name: "Temp Name",
         description:
-          "If no name is provided, the name from config will be used",
+          "If no name is provided, the name from inputSpec will be used",
         required: false,
       }),
     })
@@ -747,11 +746,11 @@ describe("Nested nullable values", () => {
     testOutput<typeof validator._TYPE, { a: string | null | undefined }>()(null)
   })
   test("Testing number", async () => {
-    const value = Config.of({
+    const value = InputSpec.of({
       a: Value.number({
         name: "Temp Name",
         description:
-          "If no name is provided, the name from config will be used",
+          "If no name is provided, the name from inputSpec will be used",
         required: false,
         warning: null,
         placeholder: null,
@@ -769,11 +768,11 @@ describe("Nested nullable values", () => {
     testOutput<typeof validator._TYPE, { a: number | null | undefined }>()(null)
   })
   test("Testing color", async () => {
-    const value = Config.of({
+    const value = InputSpec.of({
       a: Value.color({
         name: "Temp Name",
         description:
-          "If no name is provided, the name from config will be used",
+          "If no name is provided, the name from inputSpec will be used",
         required: false,
         warning: null,
       }),
@@ -785,11 +784,11 @@ describe("Nested nullable values", () => {
     testOutput<typeof validator._TYPE, { a: string | null | undefined }>()(null)
   })
   test("Testing select", async () => {
-    const value = Config.of({
+    const value = InputSpec.of({
       a: Value.select({
         name: "Temp Name",
         description:
-          "If no name is provided, the name from config will be used",
+          "If no name is provided, the name from inputSpec will be used",
         required: false,
         warning: null,
         values: {
@@ -799,7 +798,8 @@ describe("Nested nullable values", () => {
     })
     const higher = await Value.select({
       name: "Temp Name",
-      description: "If no name is provided, the name from config will be used",
+      description:
+        "If no name is provided, the name from inputSpec will be used",
       required: false,
       warning: null,
       values: {
@@ -814,11 +814,11 @@ describe("Nested nullable values", () => {
     testOutput<typeof validator._TYPE, { a: "a" | null | undefined }>()(null)
   })
   test("Testing multiselect", async () => {
-    const value = Config.of({
+    const value = InputSpec.of({
       a: Value.multiselect({
         name: "Temp Name",
         description:
-          "If no name is provided, the name from config will be used",
+          "If no name is provided, the name from inputSpec will be used",
 
         warning: null,
         default: [],
diff --git a/sdk/lib/test/makeOutput.ts b/sdk/package/lib/test/makeOutput.ts
similarity index 99%
rename from sdk/lib/test/makeOutput.ts
rename to sdk/package/lib/test/makeOutput.ts
index cef17a7e8..434484be9 100644
--- a/sdk/lib/test/makeOutput.ts
+++ b/sdk/package/lib/test/makeOutput.ts
@@ -3,7 +3,7 @@ import { oldSpecToBuilder } from "../../scripts/oldSpecToBuilder"
 oldSpecToBuilder(
   // Make the location
   "./lib/test/output.ts",
-  // Put the config here
+  // Put the inputSpec here
   {
     mediasources: {
       type: "list",
diff --git a/sdk/lib/test/output.sdk.ts b/sdk/package/lib/test/output.sdk.ts
similarity index 100%
rename from sdk/lib/test/output.sdk.ts
rename to sdk/package/lib/test/output.sdk.ts
diff --git a/sdk/lib/test/output.test.ts b/sdk/package/lib/test/output.test.ts
similarity index 72%
rename from sdk/lib/test/output.test.ts
rename to sdk/package/lib/test/output.test.ts
index 1df84f3af..37636e52f 100644
--- a/sdk/lib/test/output.test.ts
+++ b/sdk/package/lib/test/output.test.ts
@@ -1,7 +1,7 @@
-import { ConfigSpec, matchConfigSpec } from "./output"
+import { InputSpecSpec, matchInputSpecSpec } from "./output"
 import * as _I from "../index"
 import { camelCase } from "../../scripts/oldSpecToBuilder"
-import { deepMerge } from "../util/deepMerge"
+import { deepMerge } from "../../../base/lib/util"
 
 export type IfEquals<T, U, Y = unknown, N = never> =
   (<G>() => G extends T ? 1 : 2) extends <G>() => G extends U ? 1 : 2 ? Y : N
@@ -10,37 +10,40 @@ export function testOutput<A, B>(): (c: IfEquals<A, B>) => null {
 }
 
 /// Testing the types of the input spec
-testOutput<ConfigSpec["rpc"]["enable"], boolean>()(null)
-testOutput<ConfigSpec["rpc"]["username"], string>()(null)
-testOutput<ConfigSpec["rpc"]["username"], string>()(null)
+testOutput<InputSpecSpec["rpc"]["enable"], boolean>()(null)
+testOutput<InputSpecSpec["rpc"]["username"], string>()(null)
+testOutput<InputSpecSpec["rpc"]["username"], string>()(null)
 
-testOutput<ConfigSpec["rpc"]["advanced"]["auth"], string[]>()(null)
+testOutput<InputSpecSpec["rpc"]["advanced"]["auth"], string[]>()(null)
 testOutput<
-  ConfigSpec["rpc"]["advanced"]["serialversion"],
+  InputSpecSpec["rpc"]["advanced"]["serialversion"],
   "segwit" | "non-segwit"
 >()(null)
-testOutput<ConfigSpec["rpc"]["advanced"]["servertimeout"], number>()(null)
+testOutput<InputSpecSpec["rpc"]["advanced"]["servertimeout"], number>()(null)
 testOutput<
-  ConfigSpec["advanced"]["peers"]["addnode"][0]["hostname"],
+  InputSpecSpec["advanced"]["peers"]["addnode"][0]["hostname"],
   string | null | undefined
 >()(null)
-testOutput<ConfigSpec["testListUnion"][0]["union"]["value"]["name"], string>()(
+testOutput<
+  InputSpecSpec["testListUnion"][0]["union"]["value"]["name"],
+  string
+>()(null)
+testOutput<InputSpecSpec["testListUnion"][0]["union"]["selection"], "lnd">()(
   null,
 )
-testOutput<ConfigSpec["testListUnion"][0]["union"]["selection"], "lnd">()(null)
-testOutput<ConfigSpec["mediasources"], Array<"filebrowser" | "nextcloud">>()(
+testOutput<InputSpecSpec["mediasources"], Array<"filebrowser" | "nextcloud">>()(
   null,
 )
 
 // @ts-expect-error Because enable should be a boolean
-testOutput<ConfigSpec["rpc"]["enable"], string>()(null)
+testOutput<InputSpecSpec["rpc"]["enable"], string>()(null)
 // prettier-ignore
 // @ts-expect-error Expect that the string is the one above
-testOutput<ConfigSpec["testListUnion"][0]['selection']['selection'], "selection">()(null);
+testOutput<InputSpecSpec["testListUnion"][0]['selection']['selection'], "selection">()(null);
 
-/// Here we test the output of the matchConfigSpec function
+/// Here we test the output of the matchInputSpecSpec function
 describe("Inputs", () => {
-  const validInput: ConfigSpec = {
+  const validInput: InputSpecSpec = {
     mediasources: ["filebrowser"],
     testListUnion: [
       {
@@ -95,24 +98,24 @@ describe("Inputs", () => {
   }
 
   test("test valid input", () => {
-    const output = matchConfigSpec.unsafeCast(validInput)
+    const output = matchInputSpecSpec.unsafeCast(validInput)
     expect(output).toEqual(validInput)
   })
   test("test no longer care about the conversion of min/max and validating", () => {
-    matchConfigSpec.unsafeCast(
+    matchInputSpecSpec.unsafeCast(
       deepMerge({}, validInput, { rpc: { advanced: { threads: 0 } } }),
     )
   })
   test("test errors should throw for number in string", () => {
     expect(() =>
-      matchConfigSpec.unsafeCast(
+      matchInputSpecSpec.unsafeCast(
         deepMerge({}, validInput, { rpc: { enable: 2 } }),
       ),
     ).toThrowError()
   })
   test("Test that we set serialversion to something not segwit or non-segwit", () => {
     expect(() =>
-      matchConfigSpec.unsafeCast(
+      matchInputSpecSpec.unsafeCast(
         deepMerge({}, validInput, {
           rpc: { advanced: { serialversion: "testing" } },
         }),
diff --git a/sdk/lib/test/store.test.ts b/sdk/package/lib/test/store.test.ts
similarity index 52%
rename from sdk/lib/test/store.test.ts
rename to sdk/package/lib/test/store.test.ts
index fa7bc4a4c..f876e76d8 100644
--- a/sdk/lib/test/store.test.ts
+++ b/sdk/package/lib/test/store.test.ts
@@ -1,9 +1,9 @@
-import { MainEffects, StartSdk } from "../StartSdk"
-import { extractJsonPath } from "../store/PathBuilder"
-import { Effects } from "../types"
+import { Effects } from "../../../base/lib/types"
+import { extractJsonPath } from "../../../base/lib/util/PathBuilder"
+import { StartSdk } from "../StartSdk"
 
 type Store = {
-  config: {
+  inputSpec: {
     someValue: "a" | "b"
   }
 }
@@ -23,16 +23,16 @@ const storePath = sdk.StorePath
 describe("Store", () => {
   test("types", async () => {
     ;async () => {
-      sdk.store.setOwn(todo<Effects>(), storePath.config, {
+      sdk.store.setOwn(todo<Effects>(), storePath.inputSpec, {
         someValue: "a",
       })
-      sdk.store.setOwn(todo<Effects>(), storePath.config.someValue, "b")
+      sdk.store.setOwn(todo<Effects>(), storePath.inputSpec.someValue, "b")
       sdk.store.setOwn(todo<Effects>(), storePath, {
-        config: { someValue: "b" },
+        inputSpec: { someValue: "b" },
       })
       sdk.store.setOwn(
         todo<Effects>(),
-        storePath.config.someValue,
+        storePath.inputSpec.someValue,
 
         // @ts-expect-error Type is wrong for the setting value
         5,
@@ -40,73 +40,70 @@ describe("Store", () => {
       sdk.store.setOwn(
         todo<Effects>(),
         // @ts-expect-error Path is wrong
-        "/config/someVae3lue",
+        "/inputSpec/someVae3lue",
         "someValue",
       )
 
       todo<Effects>().store.set<Store>({
-        path: extractJsonPath(storePath.config.someValue),
+        path: extractJsonPath(storePath.inputSpec.someValue),
         value: "b",
       })
-      todo<Effects>().store.set<Store, "/config/some2Value">({
-        path: extractJsonPath(storePath.config.someValue),
+      todo<Effects>().store.set<Store, "/inputSpec/some2Value">({
+        path: extractJsonPath(storePath.inputSpec.someValue),
         //@ts-expect-error Path is wrong
         value: "someValueIn",
       })
       ;(await sdk.store
-        .getOwn(todo<MainEffects>(), storePath.config.someValue)
+        .getOwn(todo<Effects>(), storePath.inputSpec.someValue)
         .const()) satisfies string
       ;(await sdk.store
-        .getOwn(todo<MainEffects>(), storePath.config)
-        .const()) satisfies Store["config"]
+        .getOwn(todo<Effects>(), storePath.inputSpec)
+        .const()) satisfies Store["inputSpec"]
       await sdk.store // @ts-expect-error Path is wrong
-        .getOwn(todo<MainEffects>(), "/config/somdsfeValue")
+        .getOwn(todo<Effects>(), "/inputSpec/somdsfeValue")
         .const()
       ///  ----------------- ERRORS -----------------
 
-      sdk.store.setOwn(todo<MainEffects>(), storePath, {
+      sdk.store.setOwn(todo<Effects>(), storePath, {
         // @ts-expect-error Type is wrong for the setting value
-        config: { someValue: "notInAOrB" },
+        inputSpec: { someValue: "notInAOrB" },
       })
       sdk.store.setOwn(
-        todo<MainEffects>(),
-        sdk.StorePath.config.someValue,
+        todo<Effects>(),
+        sdk.StorePath.inputSpec.someValue,
         // @ts-expect-error Type is wrong for the setting value
         "notInAOrB",
       )
       ;(await sdk.store
-        .getOwn(todo<Effects>(), storePath.config.someValue)
-        // @ts-expect-error Const should normally not be callable
+        .getOwn(todo<Effects>(), storePath.inputSpec.someValue)
         .const()) satisfies string
       ;(await sdk.store
-        .getOwn(todo<Effects>(), storePath.config)
-        // @ts-expect-error Const should normally not be callable
-        .const()) satisfies Store["config"]
+        .getOwn(todo<Effects>(), storePath.inputSpec)
+        .const()) satisfies Store["inputSpec"]
       await sdk.store // @ts-expect-error Path is wrong
-        .getOwn("/config/somdsfeValue")
-        // @ts-expect-error Const should normally not be callable
+        .getOwn("/inputSpec/somdsfeValue")
         .const()
 
       ///
       ;(await sdk.store
-        .getOwn(todo<MainEffects>(), storePath.config.someValue)
+        .getOwn(todo<Effects>(), storePath.inputSpec.someValue)
         // @ts-expect-error satisfies type is wrong
         .const()) satisfies number
       await sdk.store // @ts-expect-error Path is wrong
-        .getOwn(todo<MainEffects>(), extractJsonPath(storePath.config))
+        .getOwn(todo<Effects>(), extractJsonPath(storePath.inputSpec))
         .const()
       ;(await todo<Effects>().store.get({
-        path: extractJsonPath(storePath.config.someValue),
+        path: extractJsonPath(storePath.inputSpec.someValue),
         callback: noop,
       })) satisfies string
-      await todo<Effects>().store.get<Store, "/config/someValue">({
+      await todo<Effects>().store.get<Store, "/inputSpec/someValue">({
         // @ts-expect-error Path is wrong as in it doesn't match above
-        path: "/config/someV2alue",
+        path: "/inputSpec/someV2alue",
         callback: noop,
       })
-      await todo<Effects>().store.get<Store, "/config/someV2alue">({
+      await todo<Effects>().store.get<Store, "/inputSpec/someV2alue">({
         // @ts-expect-error Path is wrong as in it doesn't exists in wrapper type
-        path: "/config/someV2alue",
+        path: "/inputSpec/someV2alue",
         callback: noop,
       })
     }
diff --git a/sdk/lib/trigger/TriggerInput.ts b/sdk/package/lib/trigger/TriggerInput.ts
similarity index 52%
rename from sdk/lib/trigger/TriggerInput.ts
rename to sdk/package/lib/trigger/TriggerInput.ts
index 82fe79e07..e15cca9b7 100644
--- a/sdk/lib/trigger/TriggerInput.ts
+++ b/sdk/package/lib/trigger/TriggerInput.ts
@@ -1,4 +1,4 @@
-import { HealthStatus } from "../types"
+import { HealthStatus } from "../../../base/lib/types"
 
 export type TriggerInput = {
   lastResult?: HealthStatus
diff --git a/sdk/lib/trigger/changeOnFirstSuccess.ts b/sdk/package/lib/trigger/changeOnFirstSuccess.ts
similarity index 100%
rename from sdk/lib/trigger/changeOnFirstSuccess.ts
rename to sdk/package/lib/trigger/changeOnFirstSuccess.ts
diff --git a/sdk/lib/trigger/cooldownTrigger.ts b/sdk/package/lib/trigger/cooldownTrigger.ts
similarity index 100%
rename from sdk/lib/trigger/cooldownTrigger.ts
rename to sdk/package/lib/trigger/cooldownTrigger.ts
diff --git a/sdk/lib/trigger/defaultTrigger.ts b/sdk/package/lib/trigger/defaultTrigger.ts
similarity index 100%
rename from sdk/lib/trigger/defaultTrigger.ts
rename to sdk/package/lib/trigger/defaultTrigger.ts
diff --git a/sdk/lib/trigger/index.ts b/sdk/package/lib/trigger/index.ts
similarity index 83%
rename from sdk/lib/trigger/index.ts
rename to sdk/package/lib/trigger/index.ts
index eb058437f..6da034262 100644
--- a/sdk/lib/trigger/index.ts
+++ b/sdk/package/lib/trigger/index.ts
@@ -1,4 +1,3 @@
-import { ExecSpawnable } from "../util/SubContainer"
 import { TriggerInput } from "./TriggerInput"
 export { changeOnFirstSuccess } from "./changeOnFirstSuccess"
 export { cooldownTrigger } from "./cooldownTrigger"
diff --git a/sdk/lib/trigger/lastStatus.ts b/sdk/package/lib/trigger/lastStatus.ts
similarity index 93%
rename from sdk/lib/trigger/lastStatus.ts
rename to sdk/package/lib/trigger/lastStatus.ts
index 90b8c9851..01e737314 100644
--- a/sdk/lib/trigger/lastStatus.ts
+++ b/sdk/package/lib/trigger/lastStatus.ts
@@ -1,5 +1,5 @@
 import { Trigger } from "."
-import { HealthStatus } from "../types"
+import { HealthStatus } from "../../../base/lib/types"
 
 export type LastStatusTriggerParams = { [k in HealthStatus]?: Trigger } & {
   default: Trigger
diff --git a/sdk/lib/trigger/successFailure.ts b/sdk/package/lib/trigger/successFailure.ts
similarity index 100%
rename from sdk/lib/trigger/successFailure.ts
rename to sdk/package/lib/trigger/successFailure.ts
diff --git a/sdk/lib/util/GetSslCertificate.ts b/sdk/package/lib/util/GetSslCertificate.ts
similarity index 91%
rename from sdk/lib/util/GetSslCertificate.ts
rename to sdk/package/lib/util/GetSslCertificate.ts
index df19607d4..72bf9e22d 100644
--- a/sdk/lib/util/GetSslCertificate.ts
+++ b/sdk/package/lib/util/GetSslCertificate.ts
@@ -1,5 +1,5 @@
 import { T } from ".."
-import { Effects } from "../types"
+import { Effects } from "../../../base/lib/Effects"
 
 export class GetSslCertificate {
   constructor(
@@ -15,7 +15,7 @@ export class GetSslCertificate {
     return this.effects.getSslCertificate({
       hostnames: this.hostnames,
       algorithm: this.algorithm,
-      callback: this.effects.restart,
+      callback: () => this.effects.constRetry(),
     })
   }
   /**
diff --git a/sdk/lib/util/SubContainer.ts b/sdk/package/lib/util/SubContainer.ts
similarity index 98%
rename from sdk/lib/util/SubContainer.ts
rename to sdk/package/lib/util/SubContainer.ts
index 82c1ae1b3..b6a7492a7 100644
--- a/sdk/lib/util/SubContainer.ts
+++ b/sdk/package/lib/util/SubContainer.ts
@@ -1,9 +1,9 @@
 import * as fs from "fs/promises"
-import * as T from "../types"
+import * as T from "../../../base/lib/types"
 import * as cp from "child_process"
 import { promisify } from "util"
 import { Buffer } from "node:buffer"
-import { once } from "./once"
+import { once } from "../../../base/lib/util/once"
 export const execFile = promisify(cp.execFile)
 const WORKDIR = (imageId: string) => `/media/startos/images/${imageId}/`
 const False = () => false
@@ -266,8 +266,8 @@ export class SubContainer implements ExecSpawnable {
           appendTo.data += chunk
         } else if (typeof chunk === "string" || chunk instanceof Buffer) {
           appendTo.data = Buffer.concat([
-            Buffer.from(appendTo.data),
-            Buffer.from(chunk),
+            new Uint8Array(Buffer.from(appendTo.data).buffer),
+            new Uint8Array(Buffer.from(chunk).buffer),
           ])
         } else {
           console.error("received unexpected chunk", chunk)
diff --git a/sdk/package/lib/util/fileHelper.ts b/sdk/package/lib/util/fileHelper.ts
new file mode 100644
index 000000000..bb7190fe1
--- /dev/null
+++ b/sdk/package/lib/util/fileHelper.ts
@@ -0,0 +1,214 @@
+import * as matches from "ts-matches"
+import * as YAML from "yaml"
+import * as TOML from "@iarna/toml"
+import merge from "lodash.merge"
+import * as T from "../../../base/lib/types"
+import * as fs from "node:fs/promises"
+import { asError } from "../../../base/lib/util"
+
+const previousPath = /(.+?)\/([^/]*)$/
+
+const exists = (path: string) =>
+  fs.access(path).then(
+    () => true,
+    () => false,
+  )
+
+async function onCreated(path: string) {
+  if (path === "/") return
+  if (!path.startsWith("/")) path = `${process.cwd()}/${path}`
+  if (await exists(path)) {
+    return
+  }
+  const split = path.split("/")
+  const filename = split.pop()
+  const parent = split.join("/")
+  await onCreated(parent)
+  const ctrl = new AbortController()
+  const watch = fs.watch(parent, { persistent: false, signal: ctrl.signal })
+  if (
+    await fs.access(path).then(
+      () => true,
+      () => false,
+    )
+  ) {
+    ctrl.abort("finished")
+    return
+  }
+  for await (let event of watch) {
+    if (event.filename === filename) {
+      ctrl.abort("finished")
+      return
+    }
+  }
+}
+
+/**
+ * @description Use this class to read/write an underlying configuration file belonging to the upstream service.
+ *
+ * Using the static functions, choose between officially supported file formats (json, yaml, toml), or a custom format (raw).
+ * @example
+ * Below are a few examples
+ *
+ * ```
+ * import { matches, FileHelper } from '@start9labs/start-sdk'
+ * const { arrayOf, boolean, literal, literals, object, oneOf, natural, string } = matches
+ *
+ * export const jsonFile = FileHelper.json('./inputSpec.json', object({
+ *   passwords: arrayOf(string)
+ *   type: oneOf(literals('private', 'public'))
+ * }))
+ *
+ * export const tomlFile = FileHelper.toml('./inputSpec.toml', object({
+ *   url: literal('https://start9.com')
+ *   public: boolean
+ * }))
+ *
+ * export const yamlFile = FileHelper.yaml('./inputSpec.yml', object({
+ *   name: string
+ *   age: natural
+ * }))
+ *
+ * export const bitcoinConfFile = FileHelper.raw(
+ *   './service.conf',
+ *   (obj: CustomType) => customConvertObjToFormattedString(obj),
+ *   (str) => customParseStringToTypedObj(str),
+ * )
+ * ```
+ */
+export class FileHelper<A> {
+  protected constructor(
+    readonly path: string,
+    readonly writeData: (dataIn: A) => string,
+    readonly readData: (stringValue: string) => A,
+  ) {}
+
+  /**
+   * Accepts structured data and overwrites the existing file on disk.
+   */
+  async write(data: A) {
+    const parent = previousPath.exec(this.path)
+    if (parent) {
+      await fs.mkdir(parent[1], { recursive: true })
+    }
+
+    await fs.writeFile(this.path, this.writeData(data))
+  }
+
+  /**
+   * Reads the file from disk and converts it to structured data.
+   */
+  async read() {
+    if (!(await exists(this.path))) {
+      return null
+    }
+    return this.readData(
+      await fs.readFile(this.path).then((data) => data.toString("utf-8")),
+    )
+  }
+
+  async const(effects: T.Effects) {
+    const watch = this.watch()
+    const res = await watch.next()
+    watch.next().then(effects.constRetry)
+    return res.value
+  }
+
+  async *watch() {
+    let res
+    while (true) {
+      if (await exists(this.path)) {
+        const ctrl = new AbortController()
+        const watch = fs.watch(this.path, {
+          persistent: false,
+          signal: ctrl.signal,
+        })
+        res = await this.read()
+        const listen = Promise.resolve()
+          .then(async () => {
+            for await (const _ of watch) {
+              ctrl.abort("finished")
+              return
+            }
+          })
+          .catch((e) => console.error(asError(e)))
+        yield res
+        await listen
+      } else {
+        yield null
+        await onCreated(this.path).catch((e) => console.error(asError(e)))
+      }
+    }
+  }
+
+  /**
+   * Accepts structured data and performs a merge with the existing file on disk.
+   */
+  async merge(data: A) {
+    const fileData = (await this.read().catch(() => ({}))) || {}
+    const mergeData = merge({}, fileData, data)
+    return await this.write(mergeData)
+  }
+  /**
+   * Create a File Helper for an arbitrary file type.
+   *
+   * Provide custom functions for translating data to/from the file format.
+   */
+  static raw<A>(
+    path: string,
+    toFile: (dataIn: A) => string,
+    fromFile: (rawData: string) => A,
+  ) {
+    return new FileHelper<A>(path, toFile, fromFile)
+  }
+  /**
+   * Create a File Helper for a .json file.
+   */
+  static json<A>(path: string, shape: matches.Validator<unknown, A>) {
+    return new FileHelper<A>(
+      path,
+      (inData) => {
+        return JSON.stringify(inData, null, 2)
+      },
+      (inString) => {
+        return shape.unsafeCast(JSON.parse(inString))
+      },
+    )
+  }
+  /**
+   * Create a File Helper for a .toml file
+   */
+  static toml<A extends Record<string, unknown>>(
+    path: string,
+    shape: matches.Validator<unknown, A>,
+  ) {
+    return new FileHelper<A>(
+      path,
+      (inData) => {
+        return TOML.stringify(inData as any)
+      },
+      (inString) => {
+        return shape.unsafeCast(TOML.parse(inString))
+      },
+    )
+  }
+  /**
+   * Create a File Helper for a .yaml file
+   */
+  static yaml<A extends Record<string, unknown>>(
+    path: string,
+    shape: matches.Validator<unknown, A>,
+  ) {
+    return new FileHelper<A>(
+      path,
+      (inData) => {
+        return YAML.stringify(inData, null, 2)
+      },
+      (inString) => {
+        return shape.unsafeCast(YAML.parse(inString))
+      },
+    )
+  }
+}
+
+export default FileHelper
diff --git a/sdk/package/lib/util/index.ts b/sdk/package/lib/util/index.ts
new file mode 100644
index 000000000..66c73503e
--- /dev/null
+++ b/sdk/package/lib/util/index.ts
@@ -0,0 +1,4 @@
+export * from "../../../base/lib/util"
+export { GetSslCertificate } from "./GetSslCertificate"
+
+export { hostnameInfoToAddress } from "../../../base/lib/util/Hostname"
diff --git a/sdk/lib/version/VersionGraph.ts b/sdk/package/lib/version/VersionGraph.ts
similarity index 94%
rename from sdk/lib/version/VersionGraph.ts
rename to sdk/package/lib/version/VersionGraph.ts
index 1b6b49bb9..91c7a0cc0 100644
--- a/sdk/lib/version/VersionGraph.ts
+++ b/sdk/package/lib/version/VersionGraph.ts
@@ -1,8 +1,6 @@
-import { ExtendedVersion, VersionRange } from "../exver"
-
-import * as T from "../types"
-import { Graph, Vertex } from "../util/graph"
-import { once } from "../util/once"
+import { ExtendedVersion, VersionRange } from "../../../base/lib/exver"
+import * as T from "../../../base/lib/types"
+import { Graph, Vertex, once } from "../util"
 import { IMPOSSIBLE, VersionInfo } from "./VersionInfo"
 
 export class VersionGraph<CurrentVersion extends string> {
@@ -110,6 +108,11 @@ export class VersionGraph<CurrentVersion extends string> {
   currentVersion = once(() =>
     ExtendedVersion.parse(this.current.options.version),
   )
+  /**
+   * Each exported `VersionInfo.of()` should be imported and provided as an argument to this function.
+   *
+   * ** The current version must be the FIRST argument. **
+   */
   static of<
     CurrentVersion extends string,
     OtherVersions extends Array<VersionInfo<any>>,
diff --git a/sdk/lib/version/VersionInfo.ts b/sdk/package/lib/version/VersionInfo.ts
similarity index 68%
rename from sdk/lib/version/VersionInfo.ts
rename to sdk/package/lib/version/VersionInfo.ts
index beea16019..952ae5352 100644
--- a/sdk/lib/version/VersionInfo.ts
+++ b/sdk/package/lib/version/VersionInfo.ts
@@ -1,29 +1,27 @@
-import { ValidateExVer } from "../exver"
-import * as T from "../types"
+import { ValidateExVer } from "../../../base/lib/exver"
+import * as T from "../../../base/lib/types"
 
 export const IMPOSSIBLE = Symbol("IMPOSSIBLE")
 
 export type VersionOptions<Version extends string> = {
-  /** The version being described */
+  /** The exver-compliant version number */
   version: Version & ValidateExVer<Version>
   /** The release notes for this version */
   releaseNotes: string
   /** Data migrations for this version */
   migrations: {
     /**
-     * A migration from the previous version
-     *    Leave blank to indicate no migration is necessary
-     *    Set to `IMPOSSIBLE` to indicate migrating from the previous version is not possible
+     * A migration from the previous version. Leave empty to indicate no migration is necessary.
+     * Set to `IMPOSSIBLE` to indicate migrating from the previous version is not possible.
      */
     up?: ((opts: { effects: T.Effects }) => Promise<void>) | typeof IMPOSSIBLE
     /**
-     * A migration to the previous version
-     *    Leave blank to indicate no migration is necessary
-     *    Set to `IMPOSSIBLE` to indicate downgrades are prohibited
+     * A migration to the previous version. Leave blank to indicate no migration is necessary.
+     * Set to `IMPOSSIBLE` to indicate downgrades are prohibited
      */
     down?: ((opts: { effects: T.Effects }) => Promise<void>) | typeof IMPOSSIBLE
     /**
-     * Additional migrations, such as fast-forward migrations, or migrations from other flavors
+     * Additional migrations, such as fast-forward migrations, or migrations from other flavors.
      */
     other?: Record<string, (opts: { effects: T.Effects }) => Promise<void>>
   }
@@ -34,6 +32,13 @@ export class VersionInfo<Version extends string> {
   private constructor(
     readonly options: VersionOptions<Version> & { satisfies: string[] },
   ) {}
+  /**
+   * @description Use this function to define a new version of the service. By convention, each version should receive its own file.
+   * @property {string} version
+   * @property {string} releaseNotes
+   * @property {object} migrations
+   * @returns A VersionInfo class instance that is exported, then imported into versions/index.ts.
+   */
   static of<Version extends string>(options: VersionOptions<Version>) {
     return new VersionInfo<Version>({ ...options, satisfies: [] })
   }
diff --git a/sdk/lib/version/index.ts b/sdk/package/lib/version/index.ts
similarity index 100%
rename from sdk/lib/version/index.ts
rename to sdk/package/lib/version/index.ts
diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
new file mode 100644
index 000000000..b5c0fba5d
--- /dev/null
+++ b/sdk/package/package-lock.json
@@ -0,0 +1,4706 @@
+{
+  "name": "@start9labs/start-sdk",
+  "version": "0.3.6-alpha8",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@start9labs/start-sdk",
+      "version": "0.3.6-alpha8",
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
+        "isomorphic-fetch": "^3.0.0",
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
+        "ts-matches": "^5.5.1",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "@types/lodash.merge": "^4.6.2",
+        "jest": "^29.4.3",
+        "peggy": "^3.0.2",
+        "prettier": "^3.2.5",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
+      }
+    },
+    "../base": {
+      "name": "@start9labs/start-sdk-base",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
+        "isomorphic-fetch": "^3.0.0",
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
+        "ts-matches": "^5.5.1",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "@types/lodash.merge": "^4.6.2",
+        "jest": "^29.4.3",
+        "peggy": "^3.0.2",
+        "prettier": "^3.2.5",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
+      }
+    },
+    "../base/dist": {
+      "extraneous": true
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz",
+      "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.21.3",
+        "@babel/helper-compilation-targets": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.21.2",
+        "@babel/helpers": "^7.21.0",
+        "@babel/parser": "^7.21.3",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.3",
+        "@babel/types": "^7.21.3",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.2",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
+      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.21.3",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
+      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.20.2",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.2",
+        "@babel/types": "^7.21.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
+      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
+      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
+      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
+      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
+      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
+      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.21.3",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.21.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.21.3",
+        "@babel/types": "^7.21.3",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
+      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@iarna/toml": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.5.0.tgz",
+      "integrity": "sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.5.0.tgz",
+      "integrity": "sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/reporters": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.5.0",
+        "jest-config": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-resolve-dependencies": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "jest-watcher": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.5.0.tgz",
+      "integrity": "sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-mock": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.5.0",
+        "jest-snapshot": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
+      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^29.4.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.5.0.tgz",
+      "integrity": "sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.5.0.tgz",
+      "integrity": "sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "jest-mock": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.5.0.tgz",
+      "integrity": "sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
+      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
+      "dev": true,
+      "dependencies": {
+        "@sinclair/typebox": "^0.25.16"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.4.3.tgz",
+      "integrity": "sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.5.0.tgz",
+      "integrity": "sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz",
+      "integrity": "sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^29.5.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.5.0.tgz",
+      "integrity": "sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.5.0",
+        "@jridgewell/trace-mapping": "^0.3.15",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
+      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.4.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@noble/curves": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz",
+      "integrity": "sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.25.24",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
+      "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==",
+      "dev": true
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
+      "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz",
+      "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^2.0.0"
+      }
+    },
+    "node_modules/@ts-morph/common": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.19.0.tgz",
+      "integrity": "sha512-Unz/WHmd4pGax91rdIKWi51wnVUW11QttMEPpBiBgIewnc9UQIX7UDLxr5vRlqeByXCwhkF6VabSsI0raWcyAQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.2.12",
+        "minimatch": "^7.4.3",
+        "mkdirp": "^2.1.6",
+        "path-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/minimatch": {
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz",
+      "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
+      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
+      "dev": true
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
+      "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
+      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
+      "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+      "dev": true
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.0.tgz",
+      "integrity": "sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.5",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz",
+      "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==",
+      "dev": true
+    },
+    "node_modules/@types/lodash.merge": {
+      "version": "4.6.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz",
+      "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "18.15.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz",
+      "integrity": "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==",
+      "dev": true
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz",
+      "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==",
+      "dev": true
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+      "dev": true
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz",
+      "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^29.5.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.5.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.5.0",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.21.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
+      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001449",
+        "electron-to-chromium": "^1.4.284",
+        "node-releases": "^2.0.8",
+        "update-browserslist-db": "^1.0.10"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001470",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001470.tgz",
+      "integrity": "sha512-065uNwY6QtHCBOExzbV6m236DDhYCCtPmQUCoQtwkVqzud8v5QPidoMr6CoMkC2nfp6nksjttqWQRRh75LqUmA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+      "dev": true
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/code-block-writer": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
+      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
+      "dev": true
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.341",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.341.tgz",
+      "integrity": "sha512-R4A8VfUBQY9WmAhuqY5tjHRf5fH2AAf6vqitBOE0y6u2PgHgqHSrhZmu78dIX3fVZtjqlwJNX1i2zwC3VpHtQQ==",
+      "dev": true
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
+      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/expect-utils": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-tsconfig": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
+      "dev": true,
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isomorphic-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+      "dependencies": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      }
+    },
+    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.5.0.tgz",
+      "integrity": "sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.5.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0",
+        "p-limit": "^3.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.5.0.tgz",
+      "integrity": "sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/expect": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.5.0",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.5.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.5.0.tgz",
+      "integrity": "sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "prompts": "^2.0.1",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.5.0.tgz",
+      "integrity": "sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "babel-jest": "^29.5.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.5.0",
+        "jest-environment-node": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-runner": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
+      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.5.0.tgz",
+      "integrity": "sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",
+      "integrity": "sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-mock": "^29.5.0",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.5.0.tgz",
+      "integrity": "sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz",
+      "integrity": "sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
+      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
+      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.5.0",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.5.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.5.0.tgz",
+      "integrity": "sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "jest-util": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.5.0.tgz",
+      "integrity": "sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.5.0",
+        "jest-validate": "^29.5.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz",
+      "integrity": "sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==",
+      "dev": true,
+      "dependencies": {
+        "jest-regex-util": "^29.4.3",
+        "jest-snapshot": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.5.0.tgz",
+      "integrity": "sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^29.5.0",
+        "@jest/environment": "^29.5.0",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.4.3",
+        "jest-environment-node": "^29.5.0",
+        "jest-haste-map": "^29.5.0",
+        "jest-leak-detector": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-resolve": "^29.5.0",
+        "jest-runtime": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "jest-watcher": "^29.5.0",
+        "jest-worker": "^29.5.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.5.0.tgz",
+      "integrity": "sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^29.5.0",
+        "@jest/fake-timers": "^29.5.0",
+        "@jest/globals": "^29.5.0",
+        "@jest/source-map": "^29.4.3",
+        "@jest/test-result": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-mock": "^29.5.0",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.5.0",
+        "jest-snapshot": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.5.0.tgz",
+      "integrity": "sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.5.0",
+        "@jest/transform": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/babel__traverse": "^7.0.6",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.5.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.5.0",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.5.0",
+        "jest-message-util": "^29.5.0",
+        "jest-util": "^29.5.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.5.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/jest-util": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
+      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.5.0.tgz",
+      "integrity": "sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.5.0",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.5.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.5.0.tgz",
+      "integrity": "sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^29.5.0",
+        "@jest/types": "^29.5.0",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.5.0",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.5.0.tgz",
+      "integrity": "sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.5.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
+      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
+      "bin": {
+        "mime": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
+      "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
+      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+      "dev": true
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/peggy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/peggy/-/peggy-3.0.2.tgz",
+      "integrity": "sha512-n7chtCbEoGYRwZZ0i/O3t1cPr6o+d9Xx4Zwy2LYfzv0vjchMBU0tO+qYYyvZloBPcgRgzYvALzGWHe609JjEpg==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^10.0.0",
+        "source-map-generator": "0.8.0"
+      },
+      "bin": {
+        "peggy": "bin/peggy.js"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
+      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.4.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.1.tgz",
+      "integrity": "sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ]
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "dev": true
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-generator": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/source-map-generator/-/source-map-generator-0.8.0.tgz",
+      "integrity": "sha512-psgxdGMwl5MZM9S3FWee4EgsEaIjahYV5AzGnwUvPhWeITz/j6rKpysQHlQ4USdxvINlb8lKfWGIXwfkrgtqkA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/ts-jest": {
+      "version": "29.0.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.0.5.tgz",
+      "integrity": "sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==",
+      "dev": true,
+      "dependencies": {
+        "bs-logger": "0.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^29.0.0",
+        "json5": "^2.2.3",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "^21.0.1"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/types": "^29.0.0",
+        "babel-jest": "^29.0.0",
+        "jest": "^29.0.0",
+        "typescript": ">=4.3"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@jest/types": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-jest/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/ts-matches": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
+      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
+    },
+    "node_modules/ts-morph": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-18.0.0.tgz",
+      "integrity": "sha512-Kg5u0mk19PIIe4islUI/HWRvm9bC1lHejK4S0oh1zaZ77TMZAEmQC0sHQYiu2RgCQFZKXz1fMVi/7nOOeirznA==",
+      "dev": true,
+      "dependencies": {
+        "@ts-morph/common": "~0.19.0",
+        "code-block-writer": "^12.0.0"
+      }
+    },
+    "node_modules/ts-node": {
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-pegjs": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ts-pegjs/-/ts-pegjs-4.2.1.tgz",
+      "integrity": "sha512-mK/O2pu6lzWUeKpEMA/wsa0GdYblfjJI1y0s0GqH6xCTvugQDOWPJbm5rY6AHivpZICuXIriCb+a7Cflbdtc2w==",
+      "dev": true,
+      "dependencies": {
+        "prettier": "^2.8.8",
+        "ts-morph": "^18.0.0"
+      },
+      "bin": {
+        "tspegjs": "dist/cli.mjs"
+      },
+      "peerDependencies": {
+        "peggy": "^3.0.2"
+      }
+    },
+    "node_modules/ts-pegjs/node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/tsx": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.1.tgz",
+      "integrity": "sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "~0.19.10",
+        "get-tsconfig": "^4.7.2"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tsx/node_modules/esbuild": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
+      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.19.12",
+        "@esbuild/android-arm": "0.19.12",
+        "@esbuild/android-arm64": "0.19.12",
+        "@esbuild/android-x64": "0.19.12",
+        "@esbuild/darwin-arm64": "0.19.12",
+        "@esbuild/darwin-x64": "0.19.12",
+        "@esbuild/freebsd-arm64": "0.19.12",
+        "@esbuild/freebsd-x64": "0.19.12",
+        "@esbuild/linux-arm": "0.19.12",
+        "@esbuild/linux-arm64": "0.19.12",
+        "@esbuild/linux-ia32": "0.19.12",
+        "@esbuild/linux-loong64": "0.19.12",
+        "@esbuild/linux-mips64el": "0.19.12",
+        "@esbuild/linux-ppc64": "0.19.12",
+        "@esbuild/linux-riscv64": "0.19.12",
+        "@esbuild/linux-s390x": "0.19.12",
+        "@esbuild/linux-x64": "0.19.12",
+        "@esbuild/netbsd-x64": "0.19.12",
+        "@esbuild/openbsd-x64": "0.19.12",
+        "@esbuild/sunos-x64": "0.19.12",
+        "@esbuild/win32-arm64": "0.19.12",
+        "@esbuild/win32-ia32": "0.19.12",
+        "@esbuild/win32-x64": "0.19.12"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist-lint": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-fetch": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz",
+      "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/sdk/package.json b/sdk/package/package.json
similarity index 80%
rename from sdk/package.json
rename to sdk/package/package.json
index f3af7ff1b..530a22053 100644
--- a/sdk/package.json
+++ b/sdk/package/package.json
@@ -2,22 +2,22 @@
   "name": "@start9labs/start-sdk",
   "version": "0.3.6-alpha8",
   "description": "Software development kit to facilitate packaging services for StartOS",
-  "main": "./cjs/lib/index.js",
-  "types": "./cjs/lib/index.d.ts",
-  "module": "./mjs/lib/index.js",
-  "browser": "./mjs/lib/index.browser.js",
+  "main": "./package/lib/index.js",
+  "types": "./package/lib/index.d.ts",
   "sideEffects": true,
   "typesVersion": {
     ">=3.1": {
       "*": [
-        "cjs/lib/*"
+        "package/lib/*",
+        "base/lib/*"
       ]
     }
   },
   "scripts": {
     "test": "jest -c ./jest.config.js --coverage",
-    "buildOutput": "ts-node --project ./tsconfig-cjs.json  ./lib/test/makeOutput.ts && npx prettier --write '**/*.ts'",
-    "check": "tsc --noEmit"
+    "buildOutput": "ts-node ./lib/test/makeOutput.ts && npx prettier --write '**/*.ts'",
+    "check": "tsc --noEmit",
+    "tsc": "tsc"
   },
   "repository": {
     "type": "git",
diff --git a/sdk/scripts/oldSpecToBuilder.ts b/sdk/package/scripts/oldSpecToBuilder.ts
similarity index 94%
rename from sdk/scripts/oldSpecToBuilder.ts
rename to sdk/package/scripts/oldSpecToBuilder.ts
index 6dd726e1b..04128f2bd 100644
--- a/sdk/scripts/oldSpecToBuilder.ts
+++ b/sdk/package/scripts/oldSpecToBuilder.ts
@@ -33,18 +33,18 @@ export default async function makeFileContentFromOld(
   const outputLines: string[] = []
   outputLines.push(`
 import { sdk } from "${StartSdk}"
-const {Config, List, Value, Variants} = sdk
+const {InputSpec, List, Value, Variants} = sdk
 `)
   const data = await inputData
 
-  const namedConsts = new Set(["Config", "Value", "List"])
-  const configName = newConst("configSpec", convertInputSpec(data))
-  const configMatcherName = newConst(
-    "matchConfigSpec",
-    `${configName}.validator`,
+  const namedConsts = new Set(["InputSpec", "Value", "List"])
+  const inputSpecName = newConst("inputSpecSpec", convertInputSpec(data))
+  const inputSpecMatcherName = newConst(
+    "matchInputSpecSpec",
+    `${inputSpecName}.validator`,
   )
   outputLines.push(
-    `export type ConfigSpec = typeof ${configMatcherName}._TYPE;`,
+    `export type InputSpecSpec = typeof ${inputSpecMatcherName}._TYPE;`,
   )
 
   return outputLines.join("\n")
@@ -71,7 +71,7 @@ const {Config, List, Value, Variants} = sdk
   }
 
   function convertInputSpec(data: any) {
-    return `Config.of(${convertInputSpecInner(data)})`
+    return `InputSpec.of(${convertInputSpecInner(data)})`
   }
   function convertValueSpec(value: any): string {
     switch (value.type) {
@@ -195,7 +195,6 @@ const {Config, List, Value, Variants} = sdk
         return `Value.object({
         name: ${JSON.stringify(value.name || null)},
         description: ${JSON.stringify(value.description || null)},
-        warning: ${JSON.stringify(value.warning || null)},
       }, ${specName})`
       }
       case "union": {
@@ -319,7 +318,6 @@ const {Config, List, Value, Variants} = sdk
           maxLength: ${JSON.stringify(null)},
           default: ${JSON.stringify(value.default || null)},
           description: ${JSON.stringify(value.description || null)},
-          warning: ${JSON.stringify(value.warning || null)},
         }, {
           spec: ${specName},
           displayAs: ${JSON.stringify(value?.spec?.["display-as"] || null)},
@@ -352,10 +350,10 @@ const {Config, List, Value, Variants} = sdk
           }, ${variants})
         `,
         )
-        const listConfig = maybeNewConst(
-          value.name + "_list_config",
+        const listInputSpec = maybeNewConst(
+          value.name + "_list_inputSpec",
           `
-          Config.of({
+          InputSpec.of({
             "union": ${unionValueName}
           })
         `,
@@ -368,7 +366,7 @@ const {Config, List, Value, Variants} = sdk
           description: ${JSON.stringify(value.description || null)},
           warning: ${JSON.stringify(value.warning || null)},
         }, {
-          spec: ${listConfig},
+          spec: ${listInputSpec},
           displayAs: ${JSON.stringify(value?.spec?.["display-as"] || null)},
           uniqueBy: ${JSON.stringify(value?.spec?.["unique-by"] || null)},
         })`
@@ -407,7 +405,7 @@ function rangeToTodoComment(range: string | undefined) {
 }
 
 // oldSpecToBuilder(
-//   "./config.ts",
-//   // Put config here
+//   "./inputSpec.ts",
+//   // Put inputSpec here
 //   {},
 // )
diff --git a/sdk/package/tsconfig.json b/sdk/package/tsconfig.json
new file mode 100644
index 000000000..7b4d4f7d8
--- /dev/null
+++ b/sdk/package/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    "preserveConstEnums": true,
+    "sourceMap": true,
+    "pretty": true,
+    "declaration": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "types": ["node", "jest"],
+    "moduleResolution": "node",
+    "skipLibCheck": true,
+    "module": "commonjs",
+    "outDir": "../dist",
+    "target": "es2018"
+  },
+  "include": ["lib/**/*", "../base/lib/util/Hostname.ts"],
+  "exclude": ["lib/**/*.spec.ts", "lib/**/*.gen.ts", "list", "node_modules"]
+}
diff --git a/sdk/tsconfig-cjs.json b/sdk/tsconfig-cjs.json
deleted file mode 100644
index 8413cf248..000000000
--- a/sdk/tsconfig-cjs.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig-base.json",
-  "compilerOptions": {
-    "module": "commonjs",
-    "outDir": "dist/cjs",
-    "target": "es2018"
-  }
-}
diff --git a/sdk/tsconfig.json b/sdk/tsconfig.json
deleted file mode 100644
index 8ae7d62a8..000000000
--- a/sdk/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig-base.json",
-  "compilerOptions": {
-    "module": "esnext",
-    "outDir": "dist/mjs",
-    "target": "esnext"
-  }
-}
diff --git a/web/README.md b/web/README.md
index 213113775..7665a26a6 100644
--- a/web/README.md
+++ b/web/README.md
@@ -3,33 +3,37 @@
 StartOS web UIs are written in [Angular/Typescript](https://angular.io/docs) and leverage the [Ionic Framework](https://ionicframework.com/) component library.
 
 StartOS conditionally serves one of four Web UIs, depending on the state of the system and user choice.
+
 - **install-wizard** - UI for installing StartOS, served on localhost.
 - **setup-wizard** - UI for setting up StartOS, served on start.local.
-- **diagnostic-ui** - UI to display any error during server initialization, served on start.local.
 - **ui** - primary UI for administering StartOS, served on various hosts unique to the instance.
 
 Additionally, there are two libraries for shared code:
+
 - **marketplace** - library code shared between the StartOS UI and Start9's [brochure marketplace](https://github.com/Start9Labs/brochure-marketplace).
 - **shared** - library code shared between the various web UIs and marketplace lib.
 
 ## Environment Setup
 
 #### Install NodeJS and NPM
+
 - [Install nodejs](https://nodejs.org/en/)
 - [Install npm](https://www.npmjs.com/get-npm)
 
 #### Check that your versions match the ones below
+
 ```sh
 node --version
-v18.15.0
+v20.17.0
 
 npm --version
-v8.0.0
+v10.8.2
 ```
 
 #### Install and enable the Prettier extension for your text editor
 
 #### Clone StartOS and load the PatchDB submodule if you have not already
+
 ```sh
 git clone https://github.com/Start9Labs/start-os.git
 cd start-os
@@ -37,6 +41,7 @@ git submodule update --init --recursive
 ```
 
 #### Move to web directory and install dependencies
+
 ```sh
 cd web
 npm i
@@ -44,6 +49,7 @@ npm run build:deps
 ```
 
 #### Copy `config-sample.json` to a new file `config.json`.
+
 ```sh
 cp config-sample.json config.json
 ```
@@ -59,10 +65,10 @@ You can develop using mocks (recommended to start) or against a live server. Eit
 ### Using mocks
 
 #### Start the standard development server
+
 ```sh
 npm run start:install-wiz
 npm run start:setup
-npm run start:dui
 npm run start:ui
 ```
 
@@ -71,6 +77,7 @@ npm run start:ui
 #### In `config.json`, set "useMocks" to `false`
 
 #### Copy `proxy.conf-sample.json` to a new file `proxy.conf.json`
+
 ```sh
 cp proxy.conf-sample.json proxy.conf.json
 ```
@@ -78,6 +85,7 @@ cp proxy.conf-sample.json proxy.conf.json
 #### Replace every instance of "\<CHANGEME>\" with the hostname of your remote server
 
 #### Start the proxy development server
+
 ```sh
 npm run start:ui:proxy
 ```
diff --git a/web/package-lock.json b/web/package-lock.json
index 7ceeb4399..2f05ddab3 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -28,7 +28,7 @@
         "@noble/hashes": "^1.4.0",
         "@start9labs/argon2": "^0.2.2",
         "@start9labs/emver": "^0.1.5",
-        "@start9labs/start-sdk": "file:../sdk/dist",
+        "@start9labs/start-sdk": "file:../sdk/baseDist",
         "@taiga-ui/addon-charts": "3.86.0",
         "@taiga-ui/cdk": "3.86.0",
         "@taiga-ui/core": "3.86.0",
@@ -114,9 +114,36 @@
         "rxjs": ">=7.0.0"
       }
     },
+    "../sdk/baseDist": {
+      "name": "@start9labs/start-sdk-base",
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
+        "isomorphic-fetch": "^3.0.0",
+        "lodash.merge": "^4.6.2",
+        "mime": "^4.0.3",
+        "ts-matches": "^5.5.1",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "@types/lodash.merge": "^4.6.2",
+        "jest": "^29.4.3",
+        "peggy": "^3.0.2",
+        "prettier": "^3.2.5",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
+      }
+    },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
       "version": "0.3.6-alpha8",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
@@ -4116,7 +4143,7 @@
       "integrity": "sha512-1dhiG03VkfEwSLx/JPKVms6srAbYFQgwfSGhwpUKMDliMXuAHGVaueStmqzVxn3JpH/HEVz0QW8w/PXHqjdiIg=="
     },
     "node_modules/@start9labs/start-sdk": {
-      "resolved": "../sdk/dist",
+      "resolved": "../sdk/baseDist",
       "link": true
     },
     "node_modules/@stencil/core": {
diff --git a/web/package.json b/web/package.json
index 945dde7cf..c73d93859 100644
--- a/web/package.json
+++ b/web/package.json
@@ -51,7 +51,7 @@
     "@noble/hashes": "^1.4.0",
     "@start9labs/argon2": "^0.2.2",
     "@start9labs/emver": "^0.1.5",
-    "@start9labs/start-sdk": "file:../sdk/dist",
+    "@start9labs/start-sdk": "file:../sdk/baseDist",
     "@taiga-ui/addon-charts": "3.86.0",
     "@taiga-ui/cdk": "3.86.0",
     "@taiga-ui/core": "3.86.0",
diff --git a/web/projects/setup-wizard/src/app/pages/loading/loading.page.html b/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
index 94a666223..942d667a3 100644
--- a/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
+++ b/web/projects/setup-wizard/src/app/pages/loading/loading.page.html
@@ -15,7 +15,7 @@ <h1 [style.font-size.rem]="2" [style.margin-bottom.rem]="2">
             [style.margin]="'1rem auto'"
             [attr.value]="progress.total"
           ></progress>
-          <p>{{ progress.message }}</p>
+          <p><ion-text color="light">{{ progress.message }}</ion-text></p>
         </section>
       </ion-col>
     </ion-row>
diff --git a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
index a4b272c46..743d3546b 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core'
 import { ActionSheetController, AlertController } from '@ionic/angular'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { CB } from '@start9labs/start-sdk'
+import { ISB } from '@start9labs/start-sdk'
 import {
   CifsBackupTarget,
   DiskBackupTarget,
@@ -261,8 +261,8 @@ export class BackupDrivesStatusComponent {
   @Input() hasAnyBackup!: boolean
 }
 
-const cifsSpec = CB.Config.of({
-  hostname: CB.Value.text({
+const cifsSpec = ISB.InputSpec.of({
+  hostname: ISB.Value.text({
     name: 'Hostname',
     description:
       'The hostname of your target device on the Local Area Network.',
@@ -271,19 +271,19 @@ const cifsSpec = CB.Config.of({
     required: { default: null },
     patterns: [],
   }),
-  path: CB.Value.text({
+  path: ISB.Value.text({
     name: 'Path',
     description: `On Windows, this is the fully qualified path to the shared folder, (e.g. /Desktop/my-folder).\n\n On Linux and Mac, this is the literal name of the shared folder (e.g. my-shared-folder).`,
     placeholder: 'e.g. my-shared-folder or /Desktop/my-folder',
     required: { default: null },
   }),
-  username: CB.Value.text({
+  username: ISB.Value.text({
     name: 'Username',
     description: `On Linux, this is the samba username you created when sharing the folder.\n\n On Mac and Windows, this is the username of the user who is sharing the folder.`,
     required: { default: null },
     placeholder: 'My Network Folder',
   }),
-  password: CB.Value.text({
+  password: ISB.Value.text({
     name: 'Password',
     description: `On Linux, this is the samba password you created when sharing the folder.\n\n On Mac and Windows, this is the password of the user who is sharing the folder.`,
     required: false,
diff --git a/web/projects/ui/src/app/components/form.component.ts b/web/projects/ui/src/app/components/form.component.ts
index 830e8de1e..386bd5f8e 100644
--- a/web/projects/ui/src/app/components/form.component.ts
+++ b/web/projects/ui/src/app/components/form.component.ts
@@ -8,8 +8,7 @@ import {
 } from '@angular/core'
 import { FormGroup, ReactiveFormsModule } from '@angular/forms'
 import { RouterModule } from '@angular/router'
-import { CT } from '@start9labs/start-sdk'
-
+import { IST } from '@start9labs/start-sdk'
 import {
   tuiMarkControlAsTouchedAndValidate,
   TuiValueChangesModule,
@@ -30,10 +29,10 @@ export interface ActionButton<T> {
 }
 
 export interface FormContext<T> {
-  spec: CT.InputSpec
+  spec: IST.InputSpec
   buttons: ActionButton<T>[]
   value?: T
-  patch?: Operation[]
+  operations?: Operation[]
 }
 
 @Component({
@@ -112,7 +111,7 @@ export class FormComponent<T extends Record<string, any>> implements OnInit {
 
   @Input() spec = this.context?.data.spec || {}
   @Input() buttons = this.context?.data.buttons || []
-  @Input() patch = this.context?.data.patch || []
+  @Input() operations = this.context?.data.operations || []
   @Input() value?: T = this.context?.data.value
 
   form = new FormGroup({})
@@ -120,7 +119,7 @@ export class FormComponent<T extends Record<string, any>> implements OnInit {
   ngOnInit() {
     this.dialogFormService.markAsPristine()
     this.form = this.formService.createForm(this.spec, this.value)
-    this.process(this.patch)
+    this.process(this.operations)
   }
 
   onReset() {
@@ -149,8 +148,8 @@ export class FormComponent<T extends Record<string, any>> implements OnInit {
     this.context?.$implicit.complete()
   }
 
-  private process(patch: Operation[]) {
-    patch.forEach(({ op, path }) => {
+  private process(operations: Operation[]) {
+    operations.forEach(({ op, path }) => {
       const control = this.form.get(path.substring(1).split('/'))
 
       if (!control || !control.parent) return
diff --git a/web/projects/ui/src/app/components/form/control.ts b/web/projects/ui/src/app/components/form/control.ts
index 476826194..c77c76ecf 100644
--- a/web/projects/ui/src/app/components/form/control.ts
+++ b/web/projects/ui/src/app/components/form/control.ts
@@ -1,8 +1,8 @@
 import { inject } from '@angular/core'
 import { FormControlComponent } from './form-control/form-control.component'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 
-export abstract class Control<Spec extends CT.ValueSpec, Value> {
+export abstract class Control<Spec extends Exclude<IST.ValueSpec, IST.ValueSpecHidden>, Value> {
   private readonly control: FormControlComponent<Spec, Value> =
     inject(FormControlComponent)
 
diff --git a/web/projects/ui/src/app/components/form/filter-hidden.pipe.ts b/web/projects/ui/src/app/components/form/filter-hidden.pipe.ts
new file mode 100644
index 000000000..84666a2c9
--- /dev/null
+++ b/web/projects/ui/src/app/components/form/filter-hidden.pipe.ts
@@ -0,0 +1,15 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { IST } from '@start9labs/start-sdk'
+import { KeyValue } from '@angular/common'
+
+@Pipe({
+  name: 'filterHidden',
+})
+export class FilterHiddenPipe implements PipeTransform {
+  transform(value: KeyValue<string, IST.ValueSpec>[]) {
+    return value.filter(x => x.value.type !== 'hidden') as KeyValue<
+      string,
+      Exclude<IST.ValueSpec, IST.ValueSpecHidden>
+    >[]
+  }
+}
diff --git a/web/projects/ui/src/app/components/form/form-array/form-array.component.ts b/web/projects/ui/src/app/components/form/form-array/form-array.component.ts
index 11495d510..25242f826 100644
--- a/web/projects/ui/src/app/components/form/form-array/form-array.component.ts
+++ b/web/projects/ui/src/app/components/form/form-array/form-array.component.ts
@@ -8,7 +8,7 @@ import {
   tuiHeightCollapse,
 } from '@taiga-ui/core'
 import { TUI_PROMPT } from '@taiga-ui/kit'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { filter, takeUntil } from 'rxjs'
 import { FormService } from 'src/app/services/form.service'
 import { ERRORS } from '../form-group/form-group.component'
@@ -22,7 +22,7 @@ import { ERRORS } from '../form-group/form-group.component'
 })
 export class FormArrayComponent {
   @Input()
-  spec!: CT.ValueSpecList
+  spec!: IST.ValueSpecList
 
   @HostBinding('@tuiParentAnimation')
   readonly animation = { value: '', ...inject(TUI_ANIMATION_OPTIONS) }
diff --git a/web/projects/ui/src/app/components/form/form-color/form-color.component.ts b/web/projects/ui/src/app/components/form/form-color/form-color.component.ts
index 32a7c1c04..0f65f06ce 100644
--- a/web/projects/ui/src/app/components/form/form-color/form-color.component.ts
+++ b/web/projects/ui/src/app/components/form/form-color/form-color.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { Control } from '../control'
 import { MaskitoOptions } from '@maskito/core'
 
@@ -8,7 +8,7 @@ import { MaskitoOptions } from '@maskito/core'
   templateUrl: './form-color.component.html',
   styleUrls: ['./form-color.component.scss'],
 })
-export class FormColorComponent extends Control<CT.ValueSpecColor, string> {
+export class FormColorComponent extends Control<IST.ValueSpecColor, string> {
   readonly mask: MaskitoOptions = {
     mask: ['#', ...Array(6).fill(/[0-9a-f]/i)],
   }
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.component.html b/web/projects/ui/src/app/components/form/form-control/form-control.component.html
index 731d64a63..dd3cf2b89 100644
--- a/web/projects/ui/src/app/components/form/form-control/form-control.component.html
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.component.html
@@ -36,4 +36,4 @@
       Accept
     </button>
   </div>
-</ng-template>
+</ng-template>
\ No newline at end of file
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.component.ts b/web/projects/ui/src/app/components/form/form-control/form-control.component.ts
index ec49bd084..9544188a6 100644
--- a/web/projects/ui/src/app/components/form/form-control/form-control.component.ts
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.component.ts
@@ -13,7 +13,7 @@ import {
   TuiNotification,
 } from '@taiga-ui/core'
 import { filter, takeUntil } from 'rxjs'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { ERRORS } from '../form-group/form-group.component'
 import { FORM_CONTROL_PROVIDERS } from './form-control.providers'
 
@@ -25,7 +25,7 @@ import { FORM_CONTROL_PROVIDERS } from './form-control.providers'
   providers: FORM_CONTROL_PROVIDERS,
 })
 export class FormControlComponent<
-  T extends CT.ValueSpec,
+  T extends Exclude<IST.ValueSpec, IST.ValueSpecHidden>,
   V,
 > extends AbstractTuiNullableControl<V> {
   @Input()
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts b/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
index f065f86cb..62e1ff6aa 100644
--- a/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
@@ -1,6 +1,6 @@
 import { forwardRef, Provider } from '@angular/core'
 import { TUI_VALIDATION_ERRORS } from '@taiga-ui/kit'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { FormControlComponent } from './form-control.component'
 
 interface ValidatorsPatternError {
@@ -12,7 +12,7 @@ export const FORM_CONTROL_PROVIDERS: Provider[] = [
   {
     provide: TUI_VALIDATION_ERRORS,
     deps: [forwardRef(() => FormControlComponent)],
-    useFactory: (control: FormControlComponent<CT.ValueSpec, string>) => ({
+    useFactory: (control: FormControlComponent<Exclude<IST.ValueSpec, IST.ValueSpecHidden>, string>) => ({
       required: 'Required',
       pattern: ({ requiredPattern }: ValidatorsPatternError) =>
         ('patterns' in control.spec &&
diff --git a/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts b/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts
index e09b22d24..fc3acecd0 100644
--- a/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts
+++ b/web/projects/ui/src/app/components/form/form-datetime/form-datetime.component.ts
@@ -6,7 +6,7 @@ import {
   tuiPure,
   TuiTime,
 } from '@taiga-ui/cdk'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { Control } from '../control'
 
 @Component({
@@ -14,7 +14,7 @@ import { Control } from '../control'
   templateUrl: './form-datetime.component.html',
 })
 export class FormDatetimeComponent extends Control<
-  CT.ValueSpecDatetime,
+  IST.ValueSpecDatetime,
   string
 > {
   readonly min = TUI_FIRST_DAY
diff --git a/web/projects/ui/src/app/components/form/form-group/form-group.component.html b/web/projects/ui/src/app/components/form/form-group/form-group.component.html
index 1c4f8301a..65975e970 100644
--- a/web/projects/ui/src/app/components/form/form-group/form-group.component.html
+++ b/web/projects/ui/src/app/components/form/form-group/form-group.component.html
@@ -1,5 +1,5 @@
 <ng-container
-  *ngFor="let entry of spec | keyvalue : asIsOrder"
+  *ngFor="let entry of spec | keyvalue : asIsOrder | filterHidden"
   tuiMode="onDark"
   [ngSwitch]="entry.value.type"
   [tuiTextfieldCleaner]="true"
diff --git a/web/projects/ui/src/app/components/form/form-group/form-group.component.ts b/web/projects/ui/src/app/components/form/form-group/form-group.component.ts
index d9d28c8df..456ab1383 100644
--- a/web/projects/ui/src/app/components/form/form-group/form-group.component.ts
+++ b/web/projects/ui/src/app/components/form/form-group/form-group.component.ts
@@ -4,7 +4,7 @@ import {
   Input,
   ViewEncapsulation,
 } from '@angular/core'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { FORM_GROUP_PROVIDERS } from './form-group.providers'
 
 export const ERRORS = [
@@ -27,7 +27,7 @@ export const ERRORS = [
   viewProviders: [FORM_GROUP_PROVIDERS],
 })
 export class FormGroupComponent {
-  @Input() spec: CT.InputSpec = {}
+  @Input() spec: IST.InputSpec = {}
 
   asIsOrder() {
     return 0
diff --git a/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts b/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts
index 7134eb1f6..9056e1e0f 100644
--- a/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts
+++ b/web/projects/ui/src/app/components/form/form-multiselect/form-multiselect.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { Control } from '../control'
 import { tuiPure } from '@taiga-ui/cdk'
 import { invert } from '@start9labs/shared'
@@ -9,7 +9,7 @@ import { invert } from '@start9labs/shared'
   templateUrl: './form-multiselect.component.html',
 })
 export class FormMultiselectComponent extends Control<
-  CT.ValueSpecMultiselect,
+  IST.ValueSpecMultiselect,
   readonly string[]
 > {
   private readonly inverted = invert(this.spec.values)
diff --git a/web/projects/ui/src/app/components/form/form-number/form-number.component.ts b/web/projects/ui/src/app/components/form/form-number/form-number.component.ts
index a930b1614..b07858207 100644
--- a/web/projects/ui/src/app/components/form/form-number/form-number.component.ts
+++ b/web/projects/ui/src/app/components/form/form-number/form-number.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { Control } from '../control'
 
 @Component({
   selector: 'form-number',
   templateUrl: './form-number.component.html',
 })
-export class FormNumberComponent extends Control<CT.ValueSpecNumber, number> {
+export class FormNumberComponent extends Control<IST.ValueSpecNumber, number> {
   protected readonly Infinity = Infinity
 }
diff --git a/web/projects/ui/src/app/components/form/form-object/form-object.component.ts b/web/projects/ui/src/app/components/form/form-object/form-object.component.ts
index b1aa507cf..a036c1e43 100644
--- a/web/projects/ui/src/app/components/form/form-object/form-object.component.ts
+++ b/web/projects/ui/src/app/components/form/form-object/form-object.component.ts
@@ -7,7 +7,7 @@ import {
   Output,
 } from '@angular/core'
 import { ControlContainer } from '@angular/forms'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'form-object',
@@ -17,7 +17,7 @@ import { CT } from '@start9labs/start-sdk'
 })
 export class FormObjectComponent {
   @Input()
-  spec!: CT.ValueSpecObject
+  spec!: IST.ValueSpecObject
 
   @Input()
   open = false
diff --git a/web/projects/ui/src/app/components/form/form-select/form-select.component.ts b/web/projects/ui/src/app/components/form/form-select/form-select.component.ts
index ccbbccae8..ac478a4d1 100644
--- a/web/projects/ui/src/app/components/form/form-select/form-select.component.ts
+++ b/web/projects/ui/src/app/components/form/form-select/form-select.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { invert } from '@start9labs/shared'
 import { Control } from '../control'
 
@@ -7,7 +7,7 @@ import { Control } from '../control'
   selector: 'form-select',
   templateUrl: './form-select.component.html',
 })
-export class FormSelectComponent extends Control<CT.ValueSpecSelect, string> {
+export class FormSelectComponent extends Control<IST.ValueSpecSelect, string> {
   private readonly inverted = invert(this.spec.values)
 
   readonly items = Object.values(this.spec.values)
diff --git a/web/projects/ui/src/app/components/form/form-text/form-text.component.ts b/web/projects/ui/src/app/components/form/form-text/form-text.component.ts
index 8a5ac86f0..703570dbc 100644
--- a/web/projects/ui/src/app/components/form/form-text/form-text.component.ts
+++ b/web/projects/ui/src/app/components/form/form-text/form-text.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { CT, utils } from '@start9labs/start-sdk'
+import { IST, utils } from '@start9labs/start-sdk'
 import { Control } from '../control'
 
 @Component({
@@ -7,7 +7,7 @@ import { Control } from '../control'
   templateUrl: './form-text.component.html',
   styleUrls: ['./form-text.component.scss'],
 })
-export class FormTextComponent extends Control<CT.ValueSpecText, string> {
+export class FormTextComponent extends Control<IST.ValueSpecText, string> {
   masked = true
 
   generate() {
diff --git a/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts b/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts
index b32685c21..0c2bd054d 100644
--- a/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts
+++ b/web/projects/ui/src/app/components/form/form-textarea/form-textarea.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { Control } from '../control'
 
 @Component({
@@ -7,6 +7,6 @@ import { Control } from '../control'
   templateUrl: './form-textarea.component.html',
 })
 export class FormTextareaComponent extends Control<
-  CT.ValueSpecTextarea,
+  IST.ValueSpecTextarea,
   string
 > {}
diff --git a/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts b/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts
index 6a3c0196f..fd4f18218 100644
--- a/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts
+++ b/web/projects/ui/src/app/components/form/form-toggle/form-toggle.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { Control } from '../control'
 
 @Component({
@@ -7,4 +7,7 @@ import { Control } from '../control'
   templateUrl: './form-toggle.component.html',
   host: { class: 'g-toggle' },
 })
-export class FormToggleComponent extends Control<CT.ValueSpecToggle, boolean> {}
+export class FormToggleComponent extends Control<
+  IST.ValueSpecToggle,
+  boolean
+> {}
diff --git a/web/projects/ui/src/app/components/form/form-union/form-union.component.ts b/web/projects/ui/src/app/components/form/form-union/form-union.component.ts
index 2c164be48..83c69bd6d 100644
--- a/web/projects/ui/src/app/components/form/form-union/form-union.component.ts
+++ b/web/projects/ui/src/app/components/form/form-union/form-union.component.ts
@@ -6,7 +6,7 @@ import {
   OnChanges,
 } from '@angular/core'
 import { ControlContainer, FormGroupName } from '@angular/forms'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { FormService } from 'src/app/services/form.service'
 import { tuiPure } from '@taiga-ui/cdk'
 
@@ -24,9 +24,9 @@ import { tuiPure } from '@taiga-ui/cdk'
 })
 export class FormUnionComponent implements OnChanges {
   @Input()
-  spec!: CT.ValueSpecUnion
+  spec!: IST.ValueSpecUnion
 
-  selectSpec!: CT.ValueSpecSelect
+  selectSpec!: IST.ValueSpecSelect
 
   private readonly form = inject(FormGroupName)
   private readonly formService = inject(FormService)
diff --git a/web/projects/ui/src/app/components/form/form.module.ts b/web/projects/ui/src/app/components/form/form.module.ts
index 5417309a9..f57f6ef46 100644
--- a/web/projects/ui/src/app/components/form/form.module.ts
+++ b/web/projects/ui/src/app/components/form/form.module.ts
@@ -50,6 +50,7 @@ import { ControlDirective } from './control.directive'
 import { FormColorComponent } from './form-color/form-color.component'
 import { FormDatetimeComponent } from './form-datetime/form-datetime.component'
 import { HintPipe } from './hint.pipe'
+import { FilterHiddenPipe } from './filter-hidden.pipe'
 
 @NgModule({
   imports: [
@@ -101,6 +102,7 @@ import { HintPipe } from './hint.pipe'
     MustachePipe,
     HintPipe,
     ControlDirective,
+    FilterHiddenPipe,
   ],
   exports: [FormGroupComponent],
 })
diff --git a/web/projects/ui/src/app/components/form/hint.pipe.ts b/web/projects/ui/src/app/components/form/hint.pipe.ts
index b5a730661..f03d9577f 100644
--- a/web/projects/ui/src/app/components/form/hint.pipe.ts
+++ b/web/projects/ui/src/app/components/form/hint.pipe.ts
@@ -1,11 +1,11 @@
 import { Pipe, PipeTransform } from '@angular/core'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 
 @Pipe({
   name: 'hint',
 })
 export class HintPipe implements PipeTransform {
-  transform(spec: CT.ValueSpec): string {
+  transform(spec: Exclude<IST.ValueSpec, IST.ValueSpecHidden>): string {
     const hint = []
 
     if (spec.description) {
diff --git a/web/projects/ui/src/app/modals/config-dep.component.ts b/web/projects/ui/src/app/modals/action-dep.component.ts
similarity index 78%
rename from web/projects/ui/src/app/modals/config-dep.component.ts
rename to web/projects/ui/src/app/modals/action-dep.component.ts
index 14becf2e8..8eeb9faa8 100644
--- a/web/projects/ui/src/app/modals/config-dep.component.ts
+++ b/web/projects/ui/src/app/modals/action-dep.component.ts
@@ -2,50 +2,49 @@ import {
   ChangeDetectionStrategy,
   Component,
   Input,
-  OnChanges,
+  OnInit,
 } from '@angular/core'
-import { compare, getValueByPointer, Operation } from 'fast-json-patch'
+import { getValueByPointer, Operation } from 'fast-json-patch'
 import { isObject } from '@start9labs/shared'
 import { tuiIsNumber } from '@taiga-ui/cdk'
 import { CommonModule } from '@angular/common'
 import { TuiNotificationModule } from '@taiga-ui/core'
 
 @Component({
-  selector: 'config-dep',
+  selector: 'action-dep',
   template: `
     <tui-notification>
       <h3 style="margin: 0 0 0.5rem; font-size: 1.25rem;">
-        {{ package }}
+        {{ pkgTitle }}
       </h3>
-      The following modifications have been made to {{ package }} to satisfy
-      {{ dep }}:
+      The following modifications have been made to {{ pkgTitle }} to satisfy
+      {{ depTitle }}:
       <ul>
         <li *ngFor="let d of diff" [innerHTML]="d"></li>
       </ul>
-      To accept these modifications, click "Save".
     </tui-notification>
   `,
   standalone: true,
   imports: [CommonModule, TuiNotificationModule],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ConfigDepComponent implements OnChanges {
+export class ActionDepComponent implements OnInit {
   @Input()
-  package = ''
+  pkgTitle = ''
 
   @Input()
-  dep = ''
+  depTitle = ''
 
   @Input()
-  original: object = {}
+  originalValue: object = {}
 
   @Input()
-  value: object = {}
+  operations: Operation[] = []
 
   diff: string[] = []
 
-  ngOnChanges() {
-    this.diff = compare(this.original, this.value).map(
+  ngOnInit() {
+    this.diff = this.operations.map(
       op => `${this.getPath(op)}: ${this.getMessage(op)}`,
     )
   }
@@ -82,7 +81,7 @@ export class ConfigDepComponent implements OnChanges {
   }
 
   private getOldValue(path: any): string {
-    const val = getValueByPointer(this.original, path)
+    const val = getValueByPointer(this.originalValue, path)
     if (['string', 'number', 'boolean'].includes(typeof val)) {
       return val
     } else if (isObject(val)) {
diff --git a/web/projects/ui/src/app/modals/action-input.component.ts b/web/projects/ui/src/app/modals/action-input.component.ts
new file mode 100644
index 000000000..494dfcdda
--- /dev/null
+++ b/web/projects/ui/src/app/modals/action-input.component.ts
@@ -0,0 +1,208 @@
+import { CommonModule } from '@angular/common'
+import { Component, Inject } from '@angular/core'
+import { getErrorMessage } from '@start9labs/shared'
+import { T, utils } from '@start9labs/start-sdk'
+import { TuiButtonModule } from '@taiga-ui/experimental'
+import {
+  TuiDialogContext,
+  TuiDialogService,
+  TuiLoaderModule,
+  TuiModeModule,
+  TuiNotificationModule,
+} from '@taiga-ui/core'
+import { TUI_PROMPT, TuiPromptData } from '@taiga-ui/kit'
+import { POLYMORPHEUS_CONTEXT } from '@tinkoff/ng-polymorpheus'
+import { compare } from 'fast-json-patch'
+import { PatchDB } from 'patch-db-client'
+import { catchError, defer, EMPTY, endWith, firstValueFrom, map } from 'rxjs'
+import { InvalidService } from 'src/app/components/form/invalid.service'
+import { ActionDepComponent } from 'src/app/modals/action-dep.component'
+import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { DataModel } from 'src/app/services/patch-db/data-model'
+import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
+import * as json from 'fast-json-patch'
+import { ActionService } from '../services/action.service'
+import { ActionButton, FormComponent } from '../components/form.component'
+
+export interface PackageActionData {
+  readonly pkgInfo: {
+    id: string
+    title: string
+  }
+  readonly actionInfo: {
+    id: string
+    warning: string | null
+  }
+  readonly dependentInfo?: {
+    title: string
+    request: T.ActionRequest
+  }
+}
+
+@Component({
+  template: `
+    <ng-container *ngIf="res$ | async as res; else loading">
+      <tui-notification *ngIf="error" status="error">
+        <div [innerHTML]="error"></div>
+      </tui-notification>
+
+      <ng-container *ngIf="res">
+        <tui-notification *ngIf="warning" status="warning">
+          <div [innerHTML]="warning"></div>
+        </tui-notification>
+
+        <action-dep
+          *ngIf="dependentInfo"
+          [pkgTitle]="pkgInfo.title"
+          [depTitle]="dependentInfo.title"
+          [originalValue]="res.originalValue || {}"
+          [operations]="res.operations || []"
+        ></action-dep>
+
+        <app-form
+          tuiMode="onDark"
+          [spec]="res.spec"
+          [value]="res.originalValue || {}"
+          [buttons]="buttons"
+          [operations]="res.operations || []"
+        >
+          <button
+            tuiButton
+            appearance="flat"
+            type="reset"
+            [style.margin-right]="'auto'"
+          >
+            Reset Defaults
+          </button>
+        </app-form>
+      </ng-container>
+    </ng-container>
+
+    <ng-template #loading>
+      <tui-loader size="l" textContent="loading"></tui-loader>
+    </ng-template>
+  `,
+  styles: [
+    `
+      tui-notification {
+        font-size: 1rem;
+        margin-bottom: 1rem;
+      }
+    `,
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    TuiLoaderModule,
+    TuiNotificationModule,
+    TuiButtonModule,
+    TuiModeModule,
+    ActionDepComponent,
+    UiPipeModule,
+    FormComponent,
+  ],
+  providers: [InvalidService],
+})
+export class ActionInputModal {
+  readonly actionId = this.context.data.actionInfo.id
+  readonly warning = this.context.data.actionInfo.warning
+  readonly pkgInfo = this.context.data.pkgInfo
+  readonly dependentInfo = this.context.data.dependentInfo
+
+  buttons: ActionButton<any>[] = [
+    {
+      text: 'Submit',
+      handler: value => this.execute(value),
+    },
+  ]
+
+  error = ''
+
+  res$ = defer(() =>
+    this.api.getActionInput({
+      packageId: this.pkgInfo.id,
+      actionId: this.actionId,
+    }),
+  ).pipe(
+    map(res => {
+      const originalValue = res.value || {}
+
+      return {
+        spec: res.spec,
+        originalValue,
+        operations: this.dependentInfo?.request.input
+          ? compare(
+              originalValue,
+              utils.deepMerge(
+                originalValue,
+                this.dependentInfo.request.input.value,
+              ) as object,
+            )
+          : null,
+      }
+    }),
+    catchError(e => {
+      this.error = String(getErrorMessage(e))
+      return EMPTY
+    }),
+  )
+
+  constructor(
+    @Inject(POLYMORPHEUS_CONTEXT)
+    private readonly context: TuiDialogContext<void, PackageActionData>,
+    private readonly dialogs: TuiDialogService,
+    private readonly api: ApiService,
+    private readonly patch: PatchDB<DataModel>,
+    private readonly actionService: ActionService,
+  ) {}
+
+  async execute(input: object) {
+    if (await this.checkConflicts(input)) {
+      const res = await firstValueFrom(this.res$)
+
+      return this.actionService.execute(this.pkgInfo.id, this.actionId, {
+        prev: {
+          spec: res.spec,
+          value: res.originalValue,
+        },
+        curr: input,
+      })
+    }
+  }
+
+  private async checkConflicts(input: object): Promise<boolean> {
+    const packages = await getAllPackages(this.patch)
+
+    const breakages = Object.keys(packages)
+      .filter(
+        id =>
+          id !== this.pkgInfo.id &&
+          Object.values(packages[id].requestedActions).some(
+            ({ request, active }) =>
+              !active &&
+              request.packageId === this.pkgInfo.id &&
+              request.actionId === this.actionId &&
+              request.when?.condition === 'input-not-matches' &&
+              request.input &&
+              json
+                .compare(input, request.input)
+                .some(op => op.op === 'add' || op.op === 'replace'),
+          ),
+      )
+      .map(id => id)
+
+    if (!breakages.length) return true
+
+    const message =
+      'As a result of this change, the following services will no longer work properly and may crash:<ul>'
+    const content = `${message}${breakages.map(
+      id => `<li><b>${getManifest(packages[id]).title}</b></li>`,
+    )}</ul>`
+    const data: TuiPromptData = { content, yes: 'Continue', no: 'Cancel' }
+
+    return firstValueFrom(
+      this.dialogs.open<boolean>(TUI_PROMPT, { data }).pipe(endWith(false)),
+    )
+  }
+}
diff --git a/web/projects/ui/src/app/modals/action-success/action-success.page.ts b/web/projects/ui/src/app/modals/action-success/action-success.page.ts
index 30c5c02cd..8912ed6ba 100644
--- a/web/projects/ui/src/app/modals/action-success/action-success.page.ts
+++ b/web/projects/ui/src/app/modals/action-success/action-success.page.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core'
 import { ModalController, ToastController } from '@ionic/angular'
-import { ActionResponse } from 'src/app/services/api/api.types'
 import { copyToClipboard } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'action-success',
@@ -10,7 +10,7 @@ import { copyToClipboard } from '@start9labs/shared'
 })
 export class ActionSuccessPage {
   @Input()
-  actionRes!: ActionResponse
+  actionRes!: T.ActionResult
 
   constructor(
     private readonly modalCtrl: ModalController,
diff --git a/web/projects/ui/src/app/modals/config.component.ts b/web/projects/ui/src/app/modals/config.component.ts
deleted file mode 100644
index d0e8afa4d..000000000
--- a/web/projects/ui/src/app/modals/config.component.ts
+++ /dev/null
@@ -1,261 +0,0 @@
-import { CommonModule } from '@angular/common'
-import { Component, Inject, ViewChild } from '@angular/core'
-import {
-  ErrorService,
-  getErrorMessage,
-  isEmptyObject,
-  LoadingService,
-} from '@start9labs/shared'
-import { CT, T } from '@start9labs/start-sdk'
-import { TuiButtonModule } from '@taiga-ui/experimental'
-import {
-  TuiDialogContext,
-  TuiDialogService,
-  TuiLoaderModule,
-  TuiModeModule,
-  TuiNotificationModule,
-} from '@taiga-ui/core'
-import { TUI_PROMPT, TuiPromptData } from '@taiga-ui/kit'
-import { POLYMORPHEUS_CONTEXT } from '@tinkoff/ng-polymorpheus'
-import { compare, Operation } from 'fast-json-patch'
-import { PatchDB } from 'patch-db-client'
-import { endWith, firstValueFrom, Subscription } from 'rxjs'
-import { ActionButton, FormComponent } from 'src/app/components/form.component'
-import { InvalidService } from 'src/app/components/form/invalid.service'
-import { ConfigDepComponent } from 'src/app/modals/config-dep.component'
-import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import {
-  DataModel,
-  PackageDataEntry,
-} from 'src/app/services/patch-db/data-model'
-import {
-  getAllPackages,
-  getManifest,
-  getPackage,
-} from 'src/app/util/get-package-data'
-import { hasCurrentDeps } from 'src/app/util/has-deps'
-import { Breakages } from 'src/app/services/api/api.types'
-import { DependentInfo } from 'src/app/types/dependent-info'
-
-export interface PackageConfigData {
-  readonly pkgId: string
-  readonly dependentInfo?: DependentInfo
-}
-
-@Component({
-  template: `
-    <tui-loader
-      *ngIf="loadingText"
-      size="l"
-      [textContent]="loadingText"
-    ></tui-loader>
-
-    <tui-notification
-      *ngIf="!loadingText && (loadingError || !pkg)"
-      status="error"
-    >
-      <div [innerHTML]="loadingError"></div>
-    </tui-notification>
-
-    <ng-container
-      *ngIf="
-        !loadingText && !loadingError && pkg && (pkg | toManifest) as manifest
-      "
-    >
-      <tui-notification *ngIf="success" status="success">
-        {{ manifest.title }} has been automatically configured with recommended
-        defaults. Make whatever changes you want, then click "Save".
-      </tui-notification>
-
-      <config-dep
-        *ngIf="dependentInfo && value && original"
-        [package]="manifest.title"
-        [dep]="dependentInfo.title"
-        [original]="original"
-        [value]="value"
-      ></config-dep>
-
-      <tui-notification *ngIf="!manifest.hasConfig" status="warning">
-        No config options for {{ manifest.title }} {{ manifest.version }}.
-      </tui-notification>
-
-      <app-form
-        tuiMode="onDark"
-        [spec]="spec"
-        [value]="value || {}"
-        [buttons]="buttons"
-        [patch]="patch"
-      >
-        <button
-          tuiButton
-          appearance="flat"
-          type="reset"
-          [style.margin-right]="'auto'"
-        >
-          Reset Defaults
-        </button>
-      </app-form>
-    </ng-container>
-  `,
-  styles: [
-    `
-      tui-notification {
-        font-size: 1rem;
-        margin-bottom: 1rem;
-      }
-    `,
-  ],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormComponent,
-    TuiLoaderModule,
-    TuiNotificationModule,
-    TuiButtonModule,
-    TuiModeModule,
-    ConfigDepComponent,
-    UiPipeModule,
-  ],
-  providers: [InvalidService],
-})
-export class ConfigModal {
-  @ViewChild(FormComponent)
-  private readonly form?: FormComponent<Record<string, any>>
-
-  readonly pkgId = this.context.data.pkgId
-  readonly dependentInfo = this.context.data.dependentInfo
-
-  loadingError = ''
-  loadingText = this.dependentInfo
-    ? `Setting properties to accommodate ${this.dependentInfo.title}`
-    : 'Loading Config'
-
-  pkg?: PackageDataEntry
-  spec: CT.InputSpec = {}
-  patch: Operation[] = []
-  buttons: ActionButton<any>[] = [
-    {
-      text: 'Save',
-      handler: value => this.save(value),
-    },
-  ]
-
-  original: object | null = null
-  value: object | null = null
-
-  constructor(
-    @Inject(POLYMORPHEUS_CONTEXT)
-    private readonly context: TuiDialogContext<void, PackageConfigData>,
-    private readonly dialogs: TuiDialogService,
-    private readonly errorService: ErrorService,
-    private readonly loader: LoadingService,
-    private readonly embassyApi: ApiService,
-    private readonly patchDb: PatchDB<DataModel>,
-  ) {}
-
-  get success(): boolean {
-    return (
-      !!this.form &&
-      !this.form.form.dirty &&
-      !this.original &&
-      !this.pkg?.status?.configured
-    )
-  }
-
-  async ngOnInit() {
-    try {
-      this.pkg = await getPackage(this.patchDb, this.pkgId)
-
-      if (!this.pkg) {
-        this.loadingError = 'This service does not exist'
-
-        return
-      }
-
-      if (this.dependentInfo) {
-        const depConfig = await this.embassyApi.dryConfigureDependency({
-          dependencyId: this.pkgId,
-          dependentId: this.dependentInfo.id,
-        })
-
-        this.original = depConfig.oldConfig
-        this.value = depConfig.newConfig || this.original
-        this.spec = depConfig.spec
-        this.patch = compare(this.original, this.value)
-      } else {
-        const { config, spec } = await this.embassyApi.getPackageConfig({
-          id: this.pkgId,
-        })
-
-        this.original = config
-        this.value = config
-        this.spec = spec
-      }
-    } catch (e: any) {
-      this.loadingError = String(getErrorMessage(e))
-    } finally {
-      this.loadingText = ''
-    }
-  }
-
-  private async save(config: any) {
-    const loader = new Subscription()
-
-    try {
-      if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patchDb))) {
-        await this.configureDeps(config, loader)
-      } else {
-        await this.configure(config, loader)
-      }
-    } catch (e: any) {
-      this.errorService.handleError(e)
-    } finally {
-      loader.unsubscribe()
-    }
-  }
-
-  private async configureDeps(
-    config: Record<string, any>,
-    loader: Subscription,
-  ) {
-    loader.unsubscribe()
-    loader.closed = false
-    loader.add(this.loader.open('Checking dependent services...').subscribe())
-
-    const breakages = await this.embassyApi.drySetPackageConfig({
-      id: this.pkgId,
-      config,
-    })
-
-    loader.unsubscribe()
-    loader.closed = false
-
-    if (isEmptyObject(breakages) || (await this.approveBreakages(breakages))) {
-      await this.configure(config, loader)
-    }
-  }
-
-  private async configure(config: Record<string, any>, loader: Subscription) {
-    loader.unsubscribe()
-    loader.closed = false
-    loader.add(this.loader.open('Saving...').subscribe())
-
-    await this.embassyApi.setPackageConfig({ id: this.pkgId, config })
-    this.context.$implicit.complete()
-  }
-
-  private async approveBreakages(breakages: T.PackageId[]): Promise<boolean> {
-    const packages = await getAllPackages(this.patchDb)
-    const message =
-      'As a result of this change, the following services will no longer work properly and may crash:<ul>'
-    const content = `${message}${breakages.map(
-      id => `<li><b>${getManifest(packages[id]).title}</b></li>`,
-    )}</ul>`
-    const data: TuiPromptData = { content, yes: 'Continue', no: 'Cancel' }
-
-    return firstValueFrom(
-      this.dialogs.open<boolean>(TUI_PROMPT, { data }).pipe(endWith(false)),
-    )
-  }
-}
diff --git a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
index dd8fe73eb..4c70d2837 100644
--- a/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
+++ b/web/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
@@ -7,7 +7,7 @@ import {
   sameUrl,
   toUrl,
 } from '@start9labs/shared'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { TuiDialogOptions, TuiDialogService } from '@taiga-ui/core'
 import {
   TuiButtonModule,
@@ -182,7 +182,7 @@ export const MARKETPLACE_REGISTRY = new PolymorpheusComponent(
   MarketplaceSettingsPage,
 )
 
-function getMarketplaceValueSpec(): CT.ValueSpecObject {
+function getMarketplaceValueSpec(): IST.ValueSpecObject {
   return {
     type: 'object',
     name: 'Add Custom Registry',
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index ee938240a..a0f4f46db 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -14,7 +14,10 @@ <h2>This Release</h2>
 
   <h4>0.3.6-alpha.5</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
-  <h6>Expect that any data you create or store on this version of the OS can be LOST FOREVER!</h6>
+  <h6>
+    Expect that any data you create or store on this version of the OS can be
+    LOST FOREVER!
+  </h6>
 
   <div class="ion-text-center ion-padding">
     <ion-button
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html
index 71bcc6e40..79d7af03f 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html
@@ -1,7 +1,10 @@
-<ion-item button>
-  <ion-icon slot="start" [name]="action.icon" size="large"></ion-icon>
+<ion-item button [disabled]="disabledText">
+  <ion-icon slot="start" [name]="icon" size="large"></ion-icon>
   <ion-label>
     <h1>{{ action.name }}</h1>
     <p>{{ action.description }}</p>
+    <p *ngIf="disabledText">
+      <ion-text color="warning">{{ disabledText }}</ion-text>
+    </p>
   </ion-label>
 </ion-item>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
index ec425f8bb..6b72c38a8 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
@@ -8,32 +8,28 @@
 </ion-header>
 
 <ion-content class="ion-padding-top with-widgets">
-  <ng-container *ngIf="pkg$ | async as pkg">
-    <ion-item-group *ngIf="pkg.stateInfo.state === 'installed'">
-      <!-- ** standard actions ** -->
-      <ion-item-divider>Standard Actions</ion-item-divider>
-      <app-actions-item
-        [action]="{
-          name: 'Uninstall',
-          description: 'This will uninstall the service from StartOS and delete all data permanently.',
-          icon: 'trash-outline'
-        }"
-        (click)="tryUninstall(pkg)"
-      ></app-actions-item>
+  <ion-item-group *ngIf="pkg$ | async as pkg">
+    <!-- ** standard actions ** -->
+    <ion-item-divider>Standard Actions</ion-item-divider>
+    <app-actions-item
+      [action]="{
+        name: 'Uninstall',
+        description: 'This will uninstall the service from StartOS and delete all data permanently.',
+        visibility: 'enabled'
+      }"
+      icon="trash-outline"
+      (click)="tryUninstall(pkg.manifest)"
+    ></app-actions-item>
 
-      <!-- ** specific actions ** -->
-      <ion-item-divider *ngIf="!(pkg.actions | empty)">
-        Actions for {{ pkg.stateInfo.manifest.title }}
-      </ion-item-divider>
-      <app-actions-item
-        *ngFor="let action of pkg.actions | keyvalue: asIsOrder"
-        [action]="{
-          name: action.value.name,
-          description: action.value.description,
-          icon: 'play-circle-outline'
-        }"
-        (click)="handleAction(pkg.status, action)"
-      ></app-actions-item>
-    </ion-item-group>
-  </ng-container>
+    <!-- ** specific actions ** -->
+    <ion-item-divider *ngIf="pkg.actions.length">
+      Actions for {{ pkg.manifest.title }}
+    </ion-item-divider>
+    <app-actions-item
+      *ngFor="let action of pkg.actions"
+      [action]="action"
+      icon="play-circle-outline"
+      (click)="handleAction(pkg.mainStatus, pkg.manifest, action)"
+    ></app-actions-item>
+  </ion-item-group>
 </ion-content>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index 99bd70e48..f52cd604d 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -1,38 +1,15 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { AlertController, ModalController, NavController } from '@ionic/angular'
-import {
-  ErrorService,
-  getPkgId,
-  isEmptyObject,
-  LoadingService,
-} from '@start9labs/shared'
+import { AlertController, NavController } from '@ionic/angular'
+import { ErrorService, getPkgId, LoadingService } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import { PatchDB } from 'patch-db-client'
-import { FormComponent } from 'src/app/components/form.component'
-import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { FormDialogService } from 'src/app/services/form-dialog.service'
-import {
-  DataModel,
-  PackageDataEntry,
-} from 'src/app/services/patch-db/data-model'
+import { ActionService } from 'src/app/services/action.service'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
-
-const allowedStatuses = {
-  onlyRunning: new Set(['running']),
-  onlyStopped: new Set(['stopped']),
-  any: new Set([
-    'running',
-    'stopped',
-    'restarting',
-    'restoring',
-    'stopping',
-    'starting',
-    'backingUp',
-  ]),
-}
+import { filter, map } from 'rxjs'
 
 @Component({
   selector: 'app-actions',
@@ -42,101 +19,49 @@ const allowedStatuses = {
 })
 export class AppActionsPage {
   readonly pkgId = getPkgId(this.route)
-  readonly pkg$ = this.patch.watch$('packageData', this.pkgId)
+  readonly pkg$ = this.patch.watch$('packageData', this.pkgId).pipe(
+    filter(pkg => pkg.stateInfo.state === 'installed'),
+    map(pkg => ({
+      mainStatus: pkg.status.main,
+      manifest: getManifest(pkg),
+      actions: Object.keys(pkg.actions)
+        .filter(id => id !== 'config')
+        .map(id => ({
+          id,
+          ...pkg.actions[id],
+        })),
+    })),
+  )
 
   constructor(
     private readonly route: ActivatedRoute,
-    private readonly embassyApi: ApiService,
-    private readonly modalCtrl: ModalController,
+    private readonly api: ApiService,
     private readonly alertCtrl: AlertController,
     private readonly errorService: ErrorService,
     private readonly loader: LoadingService,
     private readonly navCtrl: NavController,
     private readonly patch: PatchDB<DataModel>,
-    private readonly formDialog: FormDialogService,
+    private readonly actionService: ActionService,
   ) {}
 
   async handleAction(
-    status: T.Status,
-    action: { key: string; value: T.ActionMetadata },
+    mainStatus: T.MainStatus['main'],
+    manifest: T.Manifest,
+    action: T.ActionMetadata & { id: string },
   ) {
-    if (
-      status &&
-      allowedStatuses[action.value.allowedStatuses].has(status.main.status)
-    ) {
-      if (!isEmptyObject(action.value.input || {})) {
-        this.formDialog.open(FormComponent, {
-          label: action.value.name,
-          data: {
-            spec: action.value.input,
-            buttons: [
-              {
-                text: 'Execute',
-                handler: async (value: any) =>
-                  this.executeAction(action.key, value),
-              },
-            ],
-          },
-        })
-      } else {
-        const alert = await this.alertCtrl.create({
-          header: 'Confirm',
-          message: `Are you sure you want to execute action "${
-            action.value.name
-          }"? ${action.value.warning || ''}`,
-          buttons: [
-            {
-              text: 'Cancel',
-              role: 'cancel',
-            },
-            {
-              text: 'Execute',
-              handler: () => {
-                this.executeAction(action.key)
-              },
-              cssClass: 'enter-click',
-            },
-          ],
-        })
-        await alert.present()
-      }
-    } else {
-      const statuses = [...allowedStatuses[action.value.allowedStatuses]]
-      const last = statuses.pop()
-      let statusesStr = statuses.join(', ')
-      let error = ''
-      if (statuses.length) {
-        if (statuses.length > 1) {
-          // oxford comma
-          statusesStr += ','
-        }
-        statusesStr += ` or ${last}`
-      } else if (last) {
-        statusesStr = `${last}`
-      } else {
-        error = `There is no status for which this action may be run. This is a bug. Please file an issue with the service maintainer.`
-      }
-      const alert = await this.alertCtrl.create({
-        header: 'Forbidden',
-        message:
-          error ||
-          `Action "${action.value.name}" can only be executed when service is ${statusesStr}`,
-        buttons: ['OK'],
-        cssClass: 'alert-error-message enter-click',
-      })
-      await alert.present()
-    }
+    this.actionService.present(
+      { id: manifest.id, title: manifest.title, mainStatus },
+      { id: action.id, metadata: action },
+    )
   }
 
-  async tryUninstall(pkg: PackageDataEntry): Promise<void> {
-    const { title, alerts } = getManifest(pkg)
-
+  async tryUninstall(manifest: T.Manifest): Promise<void> {
     let message =
-      alerts.uninstall ||
-      `Uninstalling ${title} will permanently delete its data`
+      manifest.alerts.uninstall ||
+      `Uninstalling ${manifest.title} will permanently delete its data`
 
     if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patch))) {
-      message = `${message}. Services that depend on ${title} will no longer work properly and may crash`
+      message = `${message}. Services that depend on ${manifest.title} will no longer work properly and may crash`
     }
 
     const alert = await this.alertCtrl.create({
@@ -165,8 +90,8 @@ export class AppActionsPage {
     const loader = this.loader.open(`Beginning uninstall...`).subscribe()
 
     try {
-      await this.embassyApi.uninstallPackage({ id: this.pkgId })
-      this.embassyApi
+      await this.api.uninstallPackage({ id: this.pkgId })
+      this.api
         .setDbValue<boolean>(['ackInstructions', this.pkgId], false)
         .catch(e => console.error('Failed to mark instructions as unseen', e))
       this.navCtrl.navigateRoot('/services')
@@ -176,46 +101,6 @@ export class AppActionsPage {
       loader.unsubscribe()
     }
   }
-
-  private async executeAction(
-    actionId: string,
-    input?: object,
-  ): Promise<boolean> {
-    const loader = this.loader.open('Executing action...').subscribe()
-
-    try {
-      const res = await this.embassyApi.executePackageAction({
-        id: this.pkgId,
-        actionId,
-        input,
-      })
-
-      const successModal = await this.modalCtrl.create({
-        component: ActionSuccessPage,
-        componentProps: {
-          actionRes: res,
-        },
-      })
-
-      setTimeout(() => successModal.present(), 500)
-      return true // needed to dismiss original modal/alert
-    } catch (e: any) {
-      this.errorService.handleError(e)
-      return false // don't dismiss original modal/alert
-    } finally {
-      loader.unsubscribe()
-    }
-  }
-
-  asIsOrder() {
-    return 0
-  }
-}
-
-interface LocalAction {
-  name: string
-  description: string
-  icon: string
 }
 
 @Component({
@@ -225,5 +110,18 @@ interface LocalAction {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AppActionsItemComponent {
-  @Input() action!: LocalAction
+  @Input() action!: {
+    name: string
+    description: string
+    visibility: T.ActionVisibility
+  }
+
+  @Input() icon!: string
+
+  get disabledText() {
+    return (
+      typeof this.action.visibility === 'object' &&
+      this.action.visibility.disabled.reason
+    )
+  }
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
index 8225d7e53..d4238bfbf 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
@@ -26,9 +26,7 @@ <h2 ticker>{{ manifest.title }}</h2>
     fill="clear"
     color="primary"
     (click)="launchUi($event, pkg.entry.serviceInterfaces, pkg.entry.hosts)"
-    [disabled]="
-      !(pkg.entry.stateInfo.state | isLaunchable : pkgMainStatus.status)
-    "
+    [disabled]="!(pkg.entry.stateInfo.state | isLaunchable : pkgMainStatus)"
   >
     <ion-icon slot="icon-only" name="open-outline"></ion-icon>
   </ion-button>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
index 1464ac8a2..fdc0a3b2a 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
@@ -15,16 +15,12 @@ export class AppListPkgComponent {
 
   constructor(private readonly launcherService: UiLauncherService) {}
 
-  get pkgMainStatus(): T.MainStatus {
-    return (
-      this.pkg.entry.status.main || {
-        status: 'stopped',
-      }
-    )
+  get pkgMainStatus(): T.MainStatus['main'] {
+    return this.pkg.entry.status.main
   }
 
   get sigtermTimeout(): string | null {
-    return this.pkgMainStatus.status === 'stopping' ? '30s' : null // @dr-bonez TODO
+    return this.pkgMainStatus === 'stopping' ? '30s' : null // @dr-bonez TODO
   }
 
   launchUi(
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
index af659c32b..521542c10 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
@@ -34,7 +34,7 @@ export class AppPropertiesPage {
   unmasked: { [key: string]: boolean } = {}
 
   stopped$ = this.patch
-    .watch$('packageData', this.pkgId, 'status', 'main', 'status')
+    .watch$('packageData', this.pkgId, 'status', 'main')
     .pipe(map(status => status === 'stopped'))
 
   @ViewChild(IonBackButtonDelegate, { static: false })
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index 390c6c642..7ea0b86fd 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -22,8 +22,8 @@
         >
           <!-- ** health checks ** -->
           <app-show-health-checks
-            *ngIf="pkg.status.main.status === 'running'"
-            [healthChecks]="pkg.status.main.health"
+            *ngIf="pkg.status.main === 'running'"
+            [healthChecks]="pkg.status.health"
           ></app-show-health-checks>
           <!-- ** dependencies ** -->
           <app-show-dependencies
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 52855be3c..1743a86ec 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -20,14 +20,14 @@ import {
 import { combineLatest } from 'rxjs'
 import {
   getManifest,
+  getPackage,
   isInstalled,
   isInstalling,
   isRestoring,
   isUpdating,
 } from 'src/app/util/get-package-data'
 import { T } from '@start9labs/start-sdk'
-import { FormDialogService } from 'src/app/services/form-dialog.service'
-import { ConfigModal, PackageConfigData } from 'src/app/modals/config.component'
+import { ActionService } from 'src/app/services/action.service'
 
 export interface DependencyInfo {
   id: string
@@ -73,7 +73,7 @@ export class AppShowPage {
     private readonly navCtrl: NavController,
     private readonly patch: PatchDB<DataModel>,
     private readonly depErrorService: DepErrorService,
-    private readonly formDialog: FormDialogService,
+    private readonly actionService: ActionService,
   ) {}
 
   showProgress(
@@ -89,9 +89,9 @@ export class AppShowPage {
   ): DependencyInfo[] {
     const manifest = getManifest(pkg)
 
-    return Object.keys(pkg.currentDependencies)
-      .filter(id => !!manifest.dependencies[id])
-      .map(id => this.getDepValues(pkg, allPkgs, manifest, id, depErrors))
+    return Object.keys(pkg.currentDependencies).map(id =>
+      this.getDepValues(pkg, allPkgs, manifest, id, depErrors),
+    )
   }
 
   private getDepDetails(
@@ -113,8 +113,8 @@ export class AppShowPage {
       }
     } else {
       return {
-        title: title ? title : depId,
-        icon: icon ? icon : 'assets/img/service-icons/fallback.png',
+        title: title || depId,
+        icon: icon || 'assets/img/service-icons/fallback.png',
         versionRange,
       }
     }
@@ -200,20 +200,34 @@ export class AppShowPage {
     pkg: PackageDataEntry,
     pkgManifest: T.Manifest,
     action: 'install' | 'update' | 'configure',
-    id: string,
-  ): Promise<void> {
+    depId: string,
+  ) {
     switch (action) {
       case 'install':
       case 'update':
-        return this.installDep(pkg, pkgManifest, id)
+        return this.installDep(pkg, pkgManifest, depId)
       case 'configure':
-        return this.formDialog.open<PackageConfigData>(ConfigModal, {
-          label: `${pkgManifest.title} config`,
-          data: {
-            pkgId: id,
-            dependentInfo: pkgManifest,
+        const depPkg = await getPackage(this.patch, depId)
+        if (!depPkg) return
+
+        const depManifest = getManifest(depPkg)
+        return this.actionService.present(
+          {
+            id: depId,
+            title: depManifest.title,
+            mainStatus: depPkg.status.main,
+          },
+          { id: 'config', metadata: pkg.actions['config'] },
+          {
+            title: pkgManifest.title,
+            request: Object.values(pkg.requestedActions).find(
+              r =>
+                r.active &&
+                r.request.packageId === depId &&
+                r.request.actionId === 'config',
+            )!.request,
           },
-        })
+        )
     }
   }
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index c5d18907c..5dc5faf67 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -36,7 +36,7 @@
         </ng-container>
 
         <ion-button
-          *ngIf="isStopped && pkgStatus?.configured"
+          *ngIf="canStart"
           class="action-button"
           color="success"
           (click)="tryStart()"
@@ -46,7 +46,7 @@
         </ion-button>
 
         <ion-button
-          *ngIf="!pkgStatus?.configured"
+          *ngIf="needsConfig(manifest.id, pkg.requestedActions)"
           class="action-button"
           color="warning"
           (click)="presentModalConfig()"
@@ -59,9 +59,7 @@
           *ngIf="pkgStatus && interfaces && (interfaces | hasUi) && hosts"
           class="action-button"
           color="primary"
-          [disabled]="
-            !(pkg.stateInfo.state | isLaunchable: pkgStatus.main.status)
-          "
+          [disabled]="!(pkg.stateInfo.state | isLaunchable : pkgStatus.main)"
           (click)="launchUi(interfaces, hosts)"
         >
           <ion-icon slot="start" name="open-outline"></ion-icon>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 308db67be..c355bd008 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -3,10 +3,9 @@ import { AlertController } from '@ionic/angular'
 import { ErrorService, LoadingService } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import { PatchDB } from 'patch-db-client'
-import { ConfigModal, PackageConfigData } from 'src/app/modals/config.component'
+import { ActionService } from 'src/app/services/action.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConnectionService } from 'src/app/services/connection.service'
-import { FormDialogService } from 'src/app/services/form-dialog.service'
 import {
   DataModel,
   PackageDataEntry,
@@ -20,6 +19,7 @@ import {
   getAllPackages,
   getManifest,
   isInstalled,
+  needsConfig,
 } from 'src/app/util/get-package-data'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 
@@ -39,6 +39,7 @@ export class AppShowStatusComponent {
   PR = PrimaryRendering
 
   isInstalled = isInstalled
+  needsConfig = needsConfig
 
   constructor(
     private readonly alertCtrl: AlertController,
@@ -46,9 +47,9 @@ export class AppShowStatusComponent {
     private readonly loader: LoadingService,
     private readonly embassyApi: ApiService,
     private readonly launcherService: UiLauncherService,
-    private readonly formDialog: FormDialogService,
     readonly connection$: ConnectionService,
     private readonly patch: PatchDB<DataModel>,
+    private readonly actionService: ActionService,
   ) {}
 
   get interfaces(): PackageDataEntry['serviceInterfaces'] {
@@ -59,7 +60,7 @@ export class AppShowStatusComponent {
     return this.pkg.hosts
   }
 
-  get pkgStatus(): T.Status {
+  get pkgStatus(): T.MainStatus {
     return this.pkg.status
   }
 
@@ -75,12 +76,15 @@ export class AppShowStatusComponent {
     return ['running', 'starting', 'restarting'].includes(this.status.primary)
   }
 
-  get isStopped(): boolean {
-    return this.status.primary === 'stopped'
+  get canStart(): boolean {
+    return (
+      this.status.primary === 'stopped' &&
+      !Object.keys(this.pkg.requestedActions).length
+    )
   }
 
   get sigtermTimeout(): string | null {
-    return this.pkgStatus?.main.status === 'stopping' ? '30s' : null // @dr-bonez TODO
+    return this.pkgStatus?.main === 'stopping' ? '30s' : null // @dr-bonez TODO
   }
 
   launchUi(
@@ -91,9 +95,14 @@ export class AppShowStatusComponent {
   }
 
   async presentModalConfig(): Promise<void> {
-    return this.formDialog.open<PackageConfigData>(ConfigModal, {
-      data: { pkgId: this.manifest.id },
-    })
+    return this.actionService.present(
+      {
+        id: this.manifest.id,
+        title: this.manifest.title,
+        mainStatus: this.pkg.status.main,
+      },
+      { id: 'config', metadata: this.pkg.actions['config'] },
+    )
   }
 
   async tryStart(): Promise<void> {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index 87bb5423f..c9bb73bfe 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ModalController, NavController } from '@ionic/angular'
+import { AlertController, ModalController, NavController } from '@ionic/angular'
 import { MarkdownComponent } from '@start9labs/shared'
 import {
   DataModel,
@@ -8,10 +8,10 @@ import {
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { from, map, Observable } from 'rxjs'
+import { from, map, Observable, of } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
-import { FormDialogService } from 'src/app/services/form-dialog.service'
-import { ConfigModal, PackageConfigData } from 'src/app/modals/config.component'
+import { ActionService } from 'src/app/services/action.service'
+import { needsConfig } from 'src/app/util/get-package-data'
 
 export interface Button {
   title: string
@@ -33,7 +33,8 @@ export class ToButtonsPipe implements PipeTransform {
     private readonly apiService: ApiService,
     private readonly api: ApiService,
     private readonly patch: PatchDB<DataModel>,
-    private readonly formDialog: FormDialogService,
+    private readonly actionService: ActionService,
+    private readonly alertCtrl: AlertController,
   ) {}
 
   transform(pkg: PackageDataEntry<InstalledState>): Button[] {
@@ -53,13 +54,29 @@ export class ToButtonsPipe implements PipeTransform {
       // config
       {
         action: async () =>
-          this.formDialog.open<PackageConfigData>(ConfigModal, {
-            label: `${manifest.title} configuration`,
-            data: { pkgId: manifest.id },
-          }),
+          pkg.actions['config']
+            ? this.actionService.present(
+                {
+                  id: manifest.id,
+                  title: manifest.title,
+                  mainStatus: pkg.status.main,
+                },
+                {
+                  id: 'config',
+                  metadata: pkg.actions['config'],
+                },
+              )
+            : this.alertCtrl
+                .create({
+                  header: 'No Config',
+                  message: `No config options for ${manifest.title} v${manifest.version}`,
+                  buttons: ['OK'],
+                })
+                .then(a => a.present()),
         title: 'Config',
         description: `Customize ${manifest.title}`,
         icon: 'options-outline',
+        highlighted$: of(needsConfig(manifest.id, pkg.requestedActions)),
       },
       // properties
       {
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
index 24153caf9..12d731010 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts
@@ -15,10 +15,10 @@ export class ToHealthChecksPipe implements PipeTransform {
   transform(
     manifest: T.Manifest,
   ): Observable<Record<string, T.NamedHealthCheckResult | null> | null> {
-    return this.patch.watch$('packageData', manifest.id, 'status', 'main').pipe(
-      map(main => {
-        return main.status === 'running' && !isEmptyObject(main.health)
-          ? main.health
+    return this.patch.watch$('packageData', manifest.id, 'status').pipe(
+      map(status => {
+        return status.main === 'running' && !isEmptyObject(status.health)
+          ? status.health
           : null
       }),
       startWith(null),
diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
index d88ab8838..7c7f381a1 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts
@@ -30,8 +30,8 @@ export class BackingUpComponent {
   name: 'pkgMainStatus',
 })
 export class PkgMainStatusPipe implements PipeTransform {
-  transform(pkgId: string): Observable<T.MainStatus['status']> {
-    return this.patch.watch$('packageData', pkgId, 'status', 'main', 'status')
+  transform(pkgId: string): Observable<T.MainStatus['main']> {
+    return this.patch.watch$('packageData', pkgId, 'status', 'main')
   }
 
   constructor(private readonly patch: PatchDB<DataModel>) {}
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 8ddc1c8ca..12ecd4e61 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -9,7 +9,7 @@ import {
 import { WINDOW } from '@ng-web-apis/common'
 import * as argon2 from '@start9labs/argon2'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { CB } from '@start9labs/start-sdk'
+import { ISB } from '@start9labs/start-sdk'
 import { TuiAlertService, TuiDialogService } from '@taiga-ui/core'
 import { TUI_PROMPT } from '@taiga-ui/kit'
 import { PatchDB } from 'patch-db-client'
@@ -694,22 +694,22 @@ interface SettingBtn {
   disabled$: Observable<boolean>
 }
 
-const passwordSpec = CB.Config.of({
-  currentPassword: CB.Value.text({
+const passwordSpec = ISB.InputSpec.of({
+  currentPassword: ISB.Value.text({
     name: 'Current Password',
     required: {
       default: null,
     },
     masked: true,
   }),
-  newPassword1: CB.Value.text({
+  newPassword1: ISB.Value.text({
     name: 'New Password',
     required: {
       default: null,
     },
     masked: true,
   }),
-  newPassword2: CB.Value.text({
+  newPassword2: ISB.Value.text({
     name: 'Retype New Password',
     required: {
       default: null,
diff --git a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
index 5d722b482..7d59a4d30 100644
--- a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
@@ -7,7 +7,7 @@ import {
 import { ActionSheetButton, AlertInput } from '@ionic/core'
 import { WINDOW } from '@ng-web-apis/common'
 import { ErrorService, LoadingService, pauseFor } from '@start9labs/shared'
-import { CT } from '@start9labs/start-sdk'
+import { IST } from '@start9labs/start-sdk'
 import { TuiDialogOptions } from '@taiga-ui/core'
 import { PatchDB } from 'patch-db-client'
 import { FormComponent, FormContext } from 'src/app/components/form.component'
@@ -343,7 +343,7 @@ export class WifiPage {
 function getWifiValueSpec(
   ssid: string | null = null,
   needsPW: boolean = true,
-): CT.ValueSpecObject {
+): IST.ValueSpecObject {
   return {
     warning: null,
     type: 'object',
diff --git a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
index 9077c5215..405d61019 100644
--- a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
+++ b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts
@@ -10,7 +10,7 @@ export class LaunchablePipe implements PipeTransform {
 
   transform(
     state: T.PackageState['state'],
-    status: T.MainStatus['status'],
+    status: T.MainStatus['main'],
   ): boolean {
     return this.configService.isLaunchable(state, status)
   }
diff --git a/web/projects/ui/src/app/services/action.service.ts b/web/projects/ui/src/app/services/action.service.ts
new file mode 100644
index 000000000..74df5ffc6
--- /dev/null
+++ b/web/projects/ui/src/app/services/action.service.ts
@@ -0,0 +1,159 @@
+import { Injectable } from '@angular/core'
+import { AlertController, ModalController } from '@ionic/angular'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
+import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page'
+import { RR } from 'src/app/services/api/api.types'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
+import {
+  ActionInputModal,
+  PackageActionData,
+} from '../modals/action-input.component'
+
+const allowedStatuses = {
+  'only-running': new Set(['running']),
+  'only-stopped': new Set(['stopped']),
+  any: new Set([
+    'running',
+    'stopped',
+    'restarting',
+    'restoring',
+    'stopping',
+    'starting',
+    'backingUp',
+  ]),
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ActionService {
+  constructor(
+    private readonly api: ApiService,
+    private readonly modalCtrl: ModalController,
+    private readonly alertCtrl: AlertController,
+    private readonly errorService: ErrorService,
+    private readonly loader: LoadingService,
+    private readonly formDialog: FormDialogService,
+  ) {}
+
+  async present(
+    pkgInfo: {
+      id: string
+      title: string
+      mainStatus: T.MainStatus['main']
+    },
+    actionInfo: {
+      id: string
+      metadata: T.ActionMetadata
+    },
+    dependentInfo?: {
+      title: string
+      request: T.ActionRequest
+    },
+  ) {
+    if (
+      allowedStatuses[actionInfo.metadata.allowedStatuses].has(
+        pkgInfo.mainStatus,
+      )
+    ) {
+      if (actionInfo.metadata.hasInput) {
+        this.formDialog.open<PackageActionData>(ActionInputModal, {
+          label: actionInfo.metadata.name,
+          data: {
+            pkgInfo,
+            actionInfo: {
+              id: actionInfo.id,
+              warning: actionInfo.metadata.warning,
+            },
+            dependentInfo,
+          },
+        })
+      } else {
+        const alert = await this.alertCtrl.create({
+          header: 'Confirm',
+          message: `Are you sure you want to execute action "${
+            actionInfo.metadata.name
+          }"? ${actionInfo.metadata.warning || ''}`,
+          buttons: [
+            {
+              text: 'Cancel',
+              role: 'cancel',
+            },
+            {
+              text: 'Execute',
+              handler: () => {
+                this.execute(pkgInfo.id, actionInfo.id)
+              },
+              cssClass: 'enter-click',
+            },
+          ],
+        })
+        await alert.present()
+      }
+    } else {
+      const statuses = [...allowedStatuses[actionInfo.metadata.allowedStatuses]]
+      const last = statuses.pop()
+      let statusesStr = statuses.join(', ')
+      let error = ''
+      if (statuses.length) {
+        if (statuses.length > 1) {
+          // oxford comma
+          statusesStr += ','
+        }
+        statusesStr += ` or ${last}`
+      } else if (last) {
+        statusesStr = `${last}`
+      } else {
+        error = `There is no status for which this action may be run. This is a bug. Please file an issue with the service maintainer.`
+      }
+      const alert = await this.alertCtrl.create({
+        header: 'Forbidden',
+        message:
+          error ||
+          `Action "${actionInfo.metadata.name}" can only be executed when service is ${statusesStr}`,
+        buttons: ['OK'],
+        cssClass: 'alert-error-message enter-click',
+      })
+      await alert.present()
+    }
+  }
+
+  async execute(
+    packageId: string,
+    actionId: string,
+    inputs?: {
+      prev: RR.GetActionInputRes
+      curr: object
+    },
+  ): Promise<boolean> {
+    const loader = this.loader.open('Executing action...').subscribe()
+
+    try {
+      const res = await this.api.runAction({
+        packageId,
+        actionId,
+        prev: inputs?.prev || null,
+        input: inputs?.curr || null,
+      })
+
+      if (res) {
+        const successModal = await this.modalCtrl.create({
+          component: ActionSuccessPage,
+          componentProps: {
+            actionRes: res,
+          },
+        })
+
+        setTimeout(() => successModal.present(), 500)
+      }
+      return true // needed to dismiss original modal/alert
+    } catch (e: any) {
+      this.errorService.handleError(e)
+      return false // don't dismiss original modal/alert
+    } finally {
+      loader.unsubscribe()
+    }
+  }
+}
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index b093ad29e..e3aa63ee3 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -6,7 +6,7 @@ import { Metric, NotificationLevel, RR, ServerNotifications } from './api.types'
 import { BTC_ICON, LND_ICON, PROXY_ICON, REGISTRY_ICON } from './api-icons'
 import { Log } from '@start9labs/shared'
 import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
-import { T, CB } from '@start9labs/start-sdk'
+import { T, ISB, IST } from '@start9labs/start-sdk'
 import { GetPackagesRes } from '@start9labs/marketplace'
 
 const mockBlake3Commitment: T.Blake3Commitment = {
@@ -112,7 +112,6 @@ export module Mock {
     },
     osVersion: '0.2.12',
     dependencies: {},
-    hasConfig: true,
     images: {
       main: {
         source: 'packed',
@@ -170,7 +169,6 @@ export module Mock {
         s9pk: '',
       },
     },
-    hasConfig: true,
     images: {
       main: {
         source: 'packed',
@@ -221,7 +219,6 @@ export module Mock {
         s9pk: '',
       },
     },
-    hasConfig: false,
     images: {
       main: {
         source: 'packed',
@@ -949,7 +946,8 @@ export module Mock {
     },
   }
 
-  export const ActionResponse: RR.ExecutePackageActionRes = {
+  export const ActionResponse: T.ActionResult = {
+    version: '0',
     message:
       'Password changed successfully. If you lose your new password, you will be lost forever.',
     value: 'NewPassword1234!',
@@ -1137,31 +1135,29 @@ export module Mock {
     },
   }
 
-  export const getInputSpec = async (): Promise<
-    RR.GetPackageConfigRes['spec']
-  > =>
+  export const getActionInputSpec = async (): Promise<IST.InputSpec> =>
     configBuilderToSpec(
-      CB.Config.of({
-        bitcoin: CB.Value.object(
+      ISB.InputSpec.of({
+        bitcoin: ISB.Value.object(
           {
             name: 'Bitcoin Settings',
             description:
               'RPC and P2P interface configuration options for Bitcoin Core',
           },
-          CB.Config.of({
-            'bitcoind-p2p': CB.Value.union(
+          ISB.InputSpec.of({
+            'bitcoind-p2p': ISB.Value.union(
               {
                 name: 'P2P Settings',
                 description:
                   '<p>The Bitcoin Core node to connect to over the peer-to-peer (P2P) interface:</p><ul><li><strong>Bitcoin Core</strong>: The Bitcoin Core service installed on this device</li><li><strong>External Node</strong>: A Bitcoin node running on a different device</li></ul>',
                 required: { default: 'internal' },
               },
-              CB.Variants.of({
-                internal: { name: 'Bitcoin Core', spec: CB.Config.of({}) },
+              ISB.Variants.of({
+                internal: { name: 'Bitcoin Core', spec: ISB.InputSpec.of({}) },
                 external: {
                   name: 'External Node',
-                  spec: CB.Config.of({
-                    'p2p-host': CB.Value.text({
+                  spec: ISB.InputSpec.of({
+                    'p2p-host': ISB.Value.text({
                       name: 'Public Address',
                       required: {
                         default: null,
@@ -1169,7 +1165,7 @@ export module Mock {
                       description:
                         'The public address of your Bitcoin Core server',
                     }),
-                    'p2p-port': CB.Value.number({
+                    'p2p-port': ISB.Value.number({
                       name: 'P2P Port',
                       description:
                         'The port that your Bitcoin Core P2P server is bound to',
@@ -1186,24 +1182,23 @@ export module Mock {
             ),
           }),
         ),
-        color: CB.Value.color({
+        color: ISB.Value.color({
           name: 'Color',
           required: false,
         }),
-        datetime: CB.Value.datetime({
+        datetime: ISB.Value.datetime({
           name: 'Datetime',
           required: false,
         }),
-        file: CB.Value.file({
+        file: ISB.Value.file({
           name: 'File',
           required: false,
           extensions: ['png', 'pdf'],
         }),
-        users: CB.Value.multiselect({
+        users: ISB.Value.multiselect({
           name: 'Users',
           default: [],
           maxLength: 2,
-          disabled: ['matt'],
           values: {
             matt: 'Matt Hill',
             alex: 'Alex Inkin',
@@ -1211,21 +1206,19 @@ export module Mock {
             lucy: 'Lucy',
           },
         }),
-        advanced: CB.Value.object(
+        advanced: ISB.Value.object(
           {
             name: 'Advanced',
             description: 'Advanced settings',
           },
-          CB.Config.of({
-            rpcsettings: CB.Value.object(
+          ISB.InputSpec.of({
+            rpcsettings: ISB.Value.object(
               {
                 name: 'RPC Settings',
                 description: 'rpc username and password',
-                warning:
-                  'Adding RPC users gives them special permissions on your node.',
               },
-              CB.Config.of({
-                rpcuser2: CB.Value.text({
+              ISB.InputSpec.of({
+                rpcuser2: ISB.Value.text({
                   name: 'RPC Username',
                   required: {
                     default: 'defaultrpcusername',
@@ -1238,7 +1231,7 @@ export module Mock {
                     },
                   ],
                 }),
-                rpcuser: CB.Value.text({
+                rpcuser: ISB.Value.text({
                   name: 'RPC Username',
                   required: {
                     default: 'defaultrpcusername',
@@ -1251,7 +1244,7 @@ export module Mock {
                     },
                   ],
                 }),
-                rpcpass: CB.Value.text({
+                rpcpass: ISB.Value.text({
                   name: 'RPC User Password',
                   required: {
                     default: {
@@ -1261,7 +1254,7 @@ export module Mock {
                   },
                   description: 'rpc password',
                 }),
-                rpcpass2: CB.Value.text({
+                rpcpass2: ISB.Value.text({
                   name: 'RPC User Password',
                   required: {
                     default: {
@@ -1275,15 +1268,15 @@ export module Mock {
             ),
           }),
         ),
-        testnet: CB.Value.toggle({
+        testnet: ISB.Value.toggle({
           name: 'Testnet',
           default: true,
           description:
             '<ul><li>determines whether your node is running on testnet or mainnet</li></ul><script src="fake"></script>',
           warning: 'Chain will have to resync!',
         }),
-        'object-list': CB.Value.list(
-          CB.List.obj(
+        'object-list': ISB.Value.list(
+          ISB.List.obj(
             {
               name: 'Object List',
               minLength: 0,
@@ -1295,13 +1288,13 @@ export module Mock {
               description: 'This is a list of objects, like users or something',
             },
             {
-              spec: CB.Config.of({
-                'first-name': CB.Value.text({
+              spec: ISB.InputSpec.of({
+                'first-name': ISB.Value.text({
                   name: 'First Name',
                   required: false,
                   description: 'User first name',
                 }),
-                'last-name': CB.Value.text({
+                'last-name': ISB.Value.text({
                   name: 'Last Name',
                   required: {
                     default: {
@@ -1317,7 +1310,7 @@ export module Mock {
                     },
                   ],
                 }),
-                age: CB.Value.number({
+                age: ISB.Value.number({
                   name: 'Age',
                   description: 'The age of the user',
                   warning: 'User must be at least 18.',
@@ -1331,8 +1324,8 @@ export module Mock {
             },
           ),
         ),
-        'union-list': CB.Value.list(
-          CB.List.obj(
+        'union-list': ISB.Value.list(
+          ISB.List.obj(
             {
               name: 'Union List',
               minLength: 0,
@@ -1342,27 +1335,27 @@ export module Mock {
               warning: 'If you change this, things may work.',
             },
             {
-              spec: CB.Config.of({
+              spec: ISB.InputSpec.of({
                 /* TODO: Convert range for this value ([0, 2])*/
-                union: CB.Value.union(
+                union: ISB.Value.union(
                   {
                     name: 'Preference',
                     description: null,
                     warning: null,
                     required: { default: 'summer' },
                   },
-                  CB.Variants.of({
+                  ISB.Variants.of({
                     summer: {
                       name: 'summer',
-                      spec: CB.Config.of({
-                        'favorite-tree': CB.Value.text({
+                      spec: ISB.InputSpec.of({
+                        'favorite-tree': ISB.Value.text({
                           name: 'Favorite Tree',
                           required: {
                             default: 'Maple',
                           },
                           description: 'What is your favorite tree?',
                         }),
-                        'favorite-flower': CB.Value.select({
+                        'favorite-flower': ISB.Value.select({
                           name: 'Favorite Flower',
                           description: 'Select your favorite flower',
                           required: {
@@ -1379,8 +1372,8 @@ export module Mock {
                     },
                     winter: {
                       name: 'winter',
-                      spec: CB.Config.of({
-                        'like-snow': CB.Value.toggle({
+                      spec: ISB.InputSpec.of({
+                        'like-snow': ISB.Value.toggle({
                           name: 'Like Snow?',
                           default: true,
                           description: 'Do you like snow or not?',
@@ -1394,7 +1387,7 @@ export module Mock {
             },
           ),
         ),
-        'random-select': CB.Value.select({
+        'random-select': ISB.Value.dynamicSelect(() => ({
           name: 'Random select',
           description: 'This is not even real.',
           warning: 'Be careful changing this!',
@@ -1407,47 +1400,47 @@ export module Mock {
             option3: 'option3',
           },
           disabled: ['option2'],
-        }),
+        })),
         'favorite-number':
-          /* TODO: Convert range for this value ((-100,100])*/ CB.Value.number({
-            name: 'Favorite Number',
-            description: 'Your favorite number of all time',
-            warning:
-              'Once you set this number, it can never be changed without severe consequences.',
-            required: {
-              default: 7,
+          /* TODO: Convert range for this value ((-100,100])*/ ISB.Value.number(
+            {
+              name: 'Favorite Number',
+              description: 'Your favorite number of all time',
+              warning:
+                'Once you set this number, it can never be changed without severe consequences.',
+              required: {
+                default: 7,
+              },
+              integer: false,
+              units: 'BTC',
             },
-            integer: false,
-            units: 'BTC',
-          }),
-        rpcsettings: CB.Value.object(
+          ),
+        rpcsettings: ISB.Value.object(
           {
             name: 'RPC Settings',
             description: 'rpc username and password',
-            warning:
-              'Adding RPC users gives them special permissions on your node.',
           },
-          CB.Config.of({
-            laws: CB.Value.object(
+          ISB.InputSpec.of({
+            laws: ISB.Value.object(
               {
                 name: 'Laws',
                 description: 'the law of the realm',
               },
-              CB.Config.of({
-                law1: CB.Value.text({
+              ISB.InputSpec.of({
+                law1: ISB.Value.text({
                   name: 'First Law',
                   required: false,
                   description: 'the first law',
                 }),
-                law2: CB.Value.text({
+                law2: ISB.Value.text({
                   name: 'Second Law',
                   required: false,
                   description: 'the second law',
                 }),
               }),
             ),
-            rulemakers: CB.Value.list(
-              CB.List.obj(
+            rulemakers: ISB.Value.list(
+              ISB.List.obj(
                 {
                   name: 'Rule Makers',
                   minLength: 0,
@@ -1455,8 +1448,8 @@ export module Mock {
                   description: 'the people who make the rules',
                 },
                 {
-                  spec: CB.Config.of({
-                    rulemakername: CB.Value.text({
+                  spec: ISB.InputSpec.of({
+                    rulemakername: ISB.Value.text({
                       name: 'Rulemaker Name',
                       required: {
                         default: {
@@ -1466,7 +1459,7 @@ export module Mock {
                       },
                       description: 'the name of the rule maker',
                     }),
-                    rulemakerip: CB.Value.text({
+                    rulemakerip: ISB.Value.text({
                       name: 'Rulemaker IP',
                       required: {
                         default: '192.168.1.0',
@@ -1484,7 +1477,7 @@ export module Mock {
                 },
               ),
             ),
-            rpcuser: CB.Value.text({
+            rpcuser: ISB.Value.text({
               name: 'RPC Username',
               required: {
                 default: 'defaultrpcusername',
@@ -1497,7 +1490,7 @@ export module Mock {
                 },
               ],
             }),
-            rpcpass: CB.Value.text({
+            rpcpass: ISB.Value.text({
               name: 'RPC User Password',
               required: {
                 default: {
@@ -1510,33 +1503,32 @@ export module Mock {
             }),
           }),
         ),
-        'bitcoin-node': CB.Value.union(
+        'bitcoin-node': ISB.Value.union(
           {
             name: 'Bitcoin Node',
             description: 'Options<ul><li>Item 1</li><li>Item 2</li></ul>',
             warning: 'Careful changing this',
             required: { default: 'internal' },
-            disabled: ['fake'],
           },
-          CB.Variants.of({
+          ISB.Variants.of({
             fake: {
               name: 'Fake',
-              spec: CB.Config.of({}),
+              spec: ISB.InputSpec.of({}),
             },
             internal: {
               name: 'Internal',
-              spec: CB.Config.of({}),
+              spec: ISB.InputSpec.of({}),
             },
             external: {
               name: 'External',
-              spec: CB.Config.of({
-                'emergency-contact': CB.Value.object(
+              spec: ISB.InputSpec.of({
+                'emergency-contact': ISB.Value.object(
                   {
                     name: 'Emergency Contact',
                     description: 'The person to contact in case of emergency.',
                   },
-                  CB.Config.of({
-                    name: CB.Value.text({
+                  ISB.InputSpec.of({
+                    name: ISB.Value.text({
                       name: 'Name',
                       required: {
                         default: null,
@@ -1548,7 +1540,7 @@ export module Mock {
                         },
                       ],
                     }),
-                    email: CB.Value.text({
+                    email: ISB.Value.text({
                       name: 'Email',
                       inputmode: 'email',
                       required: {
@@ -1557,7 +1549,7 @@ export module Mock {
                     }),
                   }),
                 ),
-                'public-domain': CB.Value.text({
+                'public-domain': ISB.Value.text({
                   name: 'Public Domain',
                   required: {
                     default: 'bitcoinnode.com',
@@ -1570,7 +1562,7 @@ export module Mock {
                     },
                   ],
                 }),
-                'private-domain': CB.Value.text({
+                'private-domain': ISB.Value.text({
                   name: 'Private Domain',
                   required: {
                     default: null,
@@ -1583,7 +1575,7 @@ export module Mock {
             },
           }),
         ),
-        port: CB.Value.number({
+        port: ISB.Value.number({
           name: 'Port',
           description:
             'the default port for your Bitcoin node. default: 8333, testnet: 18333, regtest: 18444',
@@ -1595,7 +1587,7 @@ export module Mock {
           step: 1,
           integer: true,
         }),
-        'favorite-slogan': CB.Value.text({
+        'favorite-slogan': ISB.Value.text({
           name: 'Favorite Slogan',
           generate: {
             charset: 'a-z,A-Z,2-9',
@@ -1606,8 +1598,8 @@ export module Mock {
             'You most favorite slogan in the whole world, used for paying you.',
           masked: true,
         }),
-        rpcallowip: CB.Value.list(
-          CB.List.text(
+        rpcallowip: ISB.Value.list(
+          ISB.List.text(
             {
               name: 'RPC Allowed IPs',
               minLength: 1,
@@ -1629,8 +1621,8 @@ export module Mock {
             },
           ),
         ),
-        rpcauth: CB.Value.list(
-          CB.List.text(
+        rpcauth: ISB.Value.list(
+          ISB.List.text(
             {
               name: 'RPC Auth',
               description:
@@ -1694,14 +1686,21 @@ export module Mock {
     icon: '/assets/img/service-icons/bitcoind.svg',
     lastBackup: null,
     status: {
-      configured: true,
-      main: {
-        status: 'running',
-        started: new Date().toISOString(),
-        health: {},
+      main: 'running',
+      started: new Date().toISOString(),
+      health: {},
+    },
+    actions: {
+      config: {
+        name: 'Bitcoin Config',
+        description: 'edit bitcoin.conf',
+        warning: null,
+        visibility: 'enabled',
+        allowedStatuses: 'any',
+        hasInput: true,
+        group: null,
       },
     },
-    actions: {},
     serviceInterfaces: {
       ui: {
         id: 'ui',
@@ -1860,6 +1859,7 @@ export module Mock {
     storeExposedDependents: [],
     registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
+    requestedActions: {},
   }
 
   export const bitcoinProxy: PackageDataEntry<InstalledState> = {
@@ -1871,10 +1871,7 @@ export module Mock {
     icon: '/assets/img/service-icons/btc-rpc-proxy.png',
     lastBackup: null,
     status: {
-      configured: false,
-      main: {
-        status: 'stopped',
-      },
+      main: 'stopped',
     },
     actions: {},
     serviceInterfaces: {
@@ -1902,13 +1899,13 @@ export module Mock {
         kind: 'running',
         versionRange: '>=26.0.0',
         healthChecks: [],
-        configSatisfied: true,
       },
     },
     hosts: {},
     storeExposedDependents: [],
     registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
+    requestedActions: {},
   }
 
   export const lnd: PackageDataEntry<InstalledState> = {
@@ -1920,10 +1917,7 @@ export module Mock {
     icon: '/assets/img/service-icons/lnd.png',
     lastBackup: null,
     status: {
-      configured: true,
-      main: {
-        status: 'stopped',
-      },
+      main: 'stopped',
     },
     actions: {},
     serviceInterfaces: {
@@ -1986,20 +1980,19 @@ export module Mock {
         kind: 'running',
         versionRange: '>=26.0.0',
         healthChecks: [],
-        configSatisfied: true,
       },
       'btc-rpc-proxy': {
         title: Mock.MockManifestBitcoinProxy.title,
         icon: 'assets/img/service-icons/btc-rpc-proxy.png',
         kind: 'exists',
         versionRange: '>2.0.0',
-        configSatisfied: false,
       },
     },
     hosts: {},
     storeExposedDependents: [],
     registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
+    requestedActions: {},
   }
 
   export const LocalPkgs: { [key: string]: PackageDataEntry<InstalledState> } =
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index ef0e80d20..e428456f6 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -2,7 +2,7 @@ import { Dump } from 'patch-db-client'
 import { PackagePropertiesVersioned } from 'src/app/util/properties.util'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
-import { CT, T } from '@start9labs/start-sdk'
+import { IST, T } from '@start9labs/start-sdk'
 import { WebSocketSubjectConfig } from 'rxjs/webSocket'
 
 export module RR {
@@ -72,11 +72,10 @@ export module RR {
   export type GetServerLogsReq = ServerLogsReq // server.logs & server.kernel-logs
   export type GetServerLogsRes = LogsRes
 
-  // @param limit: BE default is 50
-  // @param boot: number is offset (0: current, -1 prev, +1 first), string is a specific boot id, and null is all
   export type FollowServerLogsReq = {
-    limit?: number
-    boot?: number | string | null
+    limit?: number // (optional) default is 50. Ignored if cursor provided
+    boot?: number | string | null // (optional) number is offset (0: current, -1 prev, +1 first), string is a specific boot id, null is all. Default is undefined
+    cursor?: string // the last known log. Websocket will return all logs since this log
   } // server.logs.follow & server.kernel-logs.follow
   export type FollowServerLogsRes = {
     startCursor: string
@@ -226,14 +225,19 @@ export module RR {
   export type InstallPackageReq = T.InstallParams
   export type InstallPackageRes = null
 
-  export type GetPackageConfigReq = { id: string } // package.config.get
-  export type GetPackageConfigRes = { spec: CT.InputSpec; config: object }
-
-  export type DrySetPackageConfigReq = { id: string; config: object } // package.config.set.dry
-  export type DrySetPackageConfigRes = T.PackageId[]
+  export type GetActionInputReq = { packageId: string; actionId: string } // package.action.get-input
+  export type GetActionInputRes = {
+    spec: IST.InputSpec
+    value: object | null
+  }
 
-  export type SetPackageConfigReq = DrySetPackageConfigReq // package.config.set
-  export type SetPackageConfigRes = null
+  export type RunActionReq = {
+    packageId: string
+    actionId: string
+    prev: GetActionInputRes | null
+    input: object | null
+  } // package.action.run
+  export type RunActionRes = T.ActionResult | null
 
   export type RestorePackagesReq = {
     // package.backup.restore
@@ -244,13 +248,6 @@ export module RR {
   }
   export type RestorePackagesRes = null
 
-  export type ExecutePackageActionReq = {
-    id: string
-    actionId: string
-    input?: object
-  } // package.action
-  export type ExecutePackageActionRes = ActionResponse
-
   export type StartPackageReq = { id: string } // package.start
   export type StartPackageRes = null
 
@@ -263,16 +260,6 @@ export module RR {
   export type UninstallPackageReq = { id: string } // package.uninstall
   export type UninstallPackageRes = null
 
-  export type DryConfigureDependencyReq = {
-    dependencyId: string
-    dependentId: string
-  } // package.dependency.configure.dry
-  export type DryConfigureDependencyRes = {
-    oldConfig: object
-    newConfig: object
-    spec: CT.InputSpec
-  }
-
   export type SideloadPackageReq = {
     manifest: T.Manifest
     icon: string // base64
@@ -306,13 +293,6 @@ export interface TaggedDependencyError {
   error: DependencyError
 }
 
-export interface ActionResponse {
-  message: string
-  value: string | null
-  copyable: boolean
-  qr: boolean
-}
-
 interface MetricData {
   value: string
   unit: string
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 31e3ac86e..1a5c1c57c 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -231,26 +231,16 @@ export abstract class ApiService {
     params: RR.InstallPackageReq,
   ): Promise<RR.InstallPackageRes>
 
-  abstract getPackageConfig(
-    params: RR.GetPackageConfigReq,
-  ): Promise<RR.GetPackageConfigRes>
+  abstract getActionInput(
+    params: RR.GetActionInputReq,
+  ): Promise<RR.GetActionInputRes>
 
-  abstract drySetPackageConfig(
-    params: RR.DrySetPackageConfigReq,
-  ): Promise<RR.DrySetPackageConfigRes>
-
-  abstract setPackageConfig(
-    params: RR.SetPackageConfigReq,
-  ): Promise<RR.SetPackageConfigRes>
+  abstract runAction(params: RR.RunActionReq): Promise<RR.RunActionRes>
 
   abstract restorePackages(
     params: RR.RestorePackagesReq,
   ): Promise<RR.RestorePackagesRes>
 
-  abstract executePackageAction(
-    params: RR.ExecutePackageActionReq,
-  ): Promise<RR.ExecutePackageActionRes>
-
   abstract startPackage(params: RR.StartPackageReq): Promise<RR.StartPackageRes>
 
   abstract restartPackage(
@@ -263,9 +253,5 @@ export abstract class ApiService {
     params: RR.UninstallPackageReq,
   ): Promise<RR.UninstallPackageRes>
 
-  abstract dryConfigureDependency(
-    params: RR.DryConfigureDependencyReq,
-  ): Promise<RR.DryConfigureDependencyRes>
-
   abstract sideloadPackage(): Promise<RR.SideloadPackageRes>
 }
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 48cf6edd3..742076ec8 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -468,22 +468,14 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'package.install', params })
   }
 
-  async getPackageConfig(
-    params: RR.GetPackageConfigReq,
-  ): Promise<RR.GetPackageConfigRes> {
-    return this.rpcRequest({ method: 'package.config.get', params })
+  async getActionInput(
+    params: RR.GetActionInputReq,
+  ): Promise<RR.GetActionInputRes> {
+    return this.rpcRequest({ method: 'package.action.get-input', params })
   }
 
-  async drySetPackageConfig(
-    params: RR.DrySetPackageConfigReq,
-  ): Promise<RR.DrySetPackageConfigRes> {
-    return this.rpcRequest({ method: 'package.config.set.dry', params })
-  }
-
-  async setPackageConfig(
-    params: RR.SetPackageConfigReq,
-  ): Promise<RR.SetPackageConfigRes> {
-    return this.rpcRequest({ method: 'package.config.set', params })
+  async runAction(params: RR.RunActionReq): Promise<RR.RunActionRes> {
+    return this.rpcRequest({ method: 'package.action.run', params })
   }
 
   async restorePackages(
@@ -492,12 +484,6 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'package.backup.restore', params })
   }
 
-  async executePackageAction(
-    params: RR.ExecutePackageActionReq,
-  ): Promise<RR.ExecutePackageActionRes> {
-    return this.rpcRequest({ method: 'package.action', params })
-  }
-
   async startPackage(params: RR.StartPackageReq): Promise<RR.StartPackageRes> {
     return this.rpcRequest({ method: 'package.start', params })
   }
@@ -518,15 +504,6 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'package.uninstall', params })
   }
 
-  async dryConfigureDependency(
-    params: RR.DryConfigureDependencyReq,
-  ): Promise<RR.DryConfigureDependencyRes> {
-    return this.rpcRequest({
-      method: 'package.dependency.configure.dry',
-      params,
-    })
-  }
-
   async sideloadPackage(): Promise<RR.SideloadPackageRes> {
     return this.rpcRequest({
       method: 'package.sideload',
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index a40f29a0a..6c55bb9db 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -780,37 +780,19 @@ export class MockApiService extends ApiService {
     return null
   }
 
-  async getPackageConfig(
-    params: RR.GetPackageConfigReq,
-  ): Promise<RR.GetPackageConfigRes> {
+  async getActionInput(
+    params: RR.GetActionInputReq,
+  ): Promise<RR.GetActionInputRes> {
     await pauseFor(2000)
     return {
-      config: Mock.MockConfig,
-      spec: await Mock.getInputSpec(),
+      value: Mock.MockConfig,
+      spec: await Mock.getActionInputSpec(),
     }
   }
 
-  async drySetPackageConfig(
-    params: RR.DrySetPackageConfigReq,
-  ): Promise<RR.DrySetPackageConfigRes> {
+  async runAction(params: RR.RunActionReq): Promise<RR.RunActionRes> {
     await pauseFor(2000)
-    return []
-  }
-
-  async setPackageConfig(
-    params: RR.SetPackageConfigReq,
-  ): Promise<RR.SetPackageConfigRes> {
-    await pauseFor(2000)
-    const patch = [
-      {
-        op: PatchOp.REPLACE,
-        path: `/packageData/${params.id}/status/configured`,
-        value: true,
-      },
-    ]
-    this.mockRevision(patch)
-
-    return null
+    return Mock.ActionResponse
   }
 
   async restorePackages(
@@ -843,13 +825,6 @@ export class MockApiService extends ApiService {
     return null
   }
 
-  async executePackageAction(
-    params: RR.ExecutePackageActionReq,
-  ): Promise<RR.ExecutePackageActionRes> {
-    await pauseFor(2000)
-    return Mock.ActionResponse
-  }
-
   async startPackage(params: RR.StartPackageReq): Promise<RR.StartPackageRes> {
     const path = `/packageData/${params.id}/status/main`
 
@@ -1069,17 +1044,6 @@ export class MockApiService extends ApiService {
     return null
   }
 
-  async dryConfigureDependency(
-    params: RR.DryConfigureDependencyReq,
-  ): Promise<RR.DryConfigureDependencyRes> {
-    await pauseFor(2000)
-    return {
-      oldConfig: Mock.MockConfig,
-      newConfig: Mock.MockDependencyConfig,
-      spec: await Mock.getInputSpec(),
-    }
-  }
-
   async sideloadPackage(): Promise<RR.SideloadPackageRes> {
     await pauseFor(2000)
     return {
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 34804fbc6..cdc8f7173 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -96,40 +96,47 @@ export const mockPatchData: DataModel = {
       icon: '/assets/img/service-icons/bitcoind.svg',
       lastBackup: null,
       status: {
-        configured: true,
-        main: {
-          status: 'running',
-          started: '2021-06-14T20:49:17.774Z',
-          health: {
-            'ephemeral-health-check': {
-              name: 'Ephemeral Health Check',
-              result: 'starting',
-              message: null,
-            },
-            'chain-state': {
-              name: 'Chain State',
-              result: 'loading',
-              message: 'Bitcoin is syncing from genesis',
-            },
-            'p2p-interface': {
-              name: 'P2P',
-              result: 'success',
-              message: 'Health check successful',
-            },
-            'rpc-interface': {
-              name: 'RPC',
-              result: 'failure',
-              message: 'RPC interface unreachable.',
-            },
-            'unnecessary-health-check': {
-              name: 'Unnecessary Health Check',
-              result: 'disabled',
-              message: null,
-            },
+        main: 'running',
+        started: '2021-06-14T20:49:17.774Z',
+        health: {
+          'ephemeral-health-check': {
+            name: 'Ephemeral Health Check',
+            result: 'starting',
+            message: null,
+          },
+          'chain-state': {
+            name: 'Chain State',
+            result: 'loading',
+            message: 'Bitcoin is syncing from genesis',
+          },
+          'p2p-interface': {
+            name: 'P2P',
+            result: 'success',
+            message: 'Health check successful',
+          },
+          'rpc-interface': {
+            name: 'RPC',
+            result: 'failure',
+            message: 'RPC interface unreachable.',
+          },
+          'unnecessary-health-check': {
+            name: 'Unnecessary Health Check',
+            result: 'disabled',
+            message: null,
           },
         },
       },
-      actions: {},
+      actions: {
+        config: {
+          name: 'Bitcoin Config',
+          description: 'edit bitcoin.conf',
+          warning: null,
+          visibility: 'enabled',
+          allowedStatuses: 'any',
+          hasInput: true,
+          group: null,
+        },
+      },
       serviceInterfaces: {
         ui: {
           id: 'ui',
@@ -288,6 +295,7 @@ export const mockPatchData: DataModel = {
       storeExposedDependents: [],
       registry: 'https://registry.start9.com/',
       developerKey: 'developer-key',
+      requestedActions: {},
     },
     lnd: {
       stateInfo: {
@@ -301,10 +309,7 @@ export const mockPatchData: DataModel = {
       icon: '/assets/img/service-icons/lnd.png',
       lastBackup: null,
       status: {
-        configured: true,
-        main: {
-          status: 'stopped',
-        },
+        main: 'stopped',
       },
       actions: {},
       serviceInterfaces: {
@@ -367,7 +372,6 @@ export const mockPatchData: DataModel = {
           kind: 'running',
           versionRange: '>=26.0.0',
           healthChecks: [],
-          configSatisfied: true,
         },
         'btc-rpc-proxy': {
           title: 'Bitcoin Proxy',
@@ -375,13 +379,13 @@ export const mockPatchData: DataModel = {
           kind: 'running',
           versionRange: '>2.0.0',
           healthChecks: [],
-          configSatisfied: false,
         },
       },
       hosts: {},
       storeExposedDependents: [],
       registry: 'https://registry.start9.com/',
       developerKey: 'developer-key',
+      requestedActions: {},
     },
   },
 }
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index 69fafe815..c6d089dbd 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -51,7 +51,7 @@ export class ConfigService {
 
   isLaunchable(
     state: T.PackageState['state'],
-    status: T.MainStatus['status'],
+    status: T.MainStatus['main'],
   ): boolean {
     return state === 'installed' && status === 'running'
   }
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index a46a5123e..c4de94609 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -102,13 +102,20 @@ export class DepErrorService {
     }
 
     // invalid config
-    if (!currentDep.configSatisfied) {
+    if (
+      Object.values(pkg.requestedActions).some(
+        a =>
+          a.active &&
+          a.request.packageId === depId &&
+          a.request.actionId === 'config',
+      )
+    ) {
       return {
         type: 'configUnsatisfied',
       }
     }
 
-    const depStatus = dep.status.main.status
+    const depStatus = dep.status.main
 
     // not running
     if (depStatus !== 'running' && depStatus !== 'starting') {
@@ -120,7 +127,7 @@ export class DepErrorService {
     // health check failure
     if (depStatus === 'running' && currentDep.kind === 'running') {
       for (let id of currentDep.healthChecks) {
-        const check = dep.status.main.health[id]
+        const check = dep.status.health[id]
         if (check?.result !== 'success') {
           return {
             type: 'healthChecksFailed',
diff --git a/web/projects/ui/src/app/services/form.service.ts b/web/projects/ui/src/app/services/form.service.ts
index 779fb1f53..33fa29016 100644
--- a/web/projects/ui/src/app/services/form.service.ts
+++ b/web/projects/ui/src/app/services/form.service.ts
@@ -7,7 +7,7 @@ import {
   ValidatorFn,
   Validators,
 } from '@angular/forms'
-import { CT, utils } from '@start9labs/start-sdk'
+import { IST, utils } from '@start9labs/start-sdk'
 const Mustache = require('mustache')
 
 @Injectable({
@@ -17,16 +17,16 @@ export class FormService {
   constructor(private readonly formBuilder: UntypedFormBuilder) {}
 
   createForm(
-    spec: CT.InputSpec,
+    spec: IST.InputSpec,
     current: Record<string, any> = {},
   ): UntypedFormGroup {
     return this.getFormGroup(spec, [], current)
   }
 
   getUnionSelectSpec(
-    spec: CT.ValueSpecUnion,
+    spec: IST.ValueSpecUnion,
     selection: string | null,
-  ): CT.ValueSpecSelect {
+  ): IST.ValueSpecSelect {
     return {
       ...spec,
       type: 'select',
@@ -38,7 +38,7 @@ export class FormService {
   }
 
   getUnionObject(
-    spec: CT.ValueSpecUnion,
+    spec: IST.ValueSpecUnion,
     selected: string | null,
   ): UntypedFormGroup {
     const group = this.getFormGroup({
@@ -53,16 +53,16 @@ export class FormService {
     return group
   }
 
-  getListItem(spec: CT.ValueSpecList, entry?: any) {
-    if (CT.isValueSpecListOf(spec, 'text')) {
+  getListItem(spec: IST.ValueSpecList, entry?: any) {
+    if (IST.isValueSpecListOf(spec, 'text')) {
       return this.formBuilder.control(entry, stringValidators(spec.spec))
-    } else if (CT.isValueSpecListOf(spec, 'object')) {
+    } else if (IST.isValueSpecListOf(spec, 'object')) {
       return this.getFormGroup(spec.spec.spec, [], entry)
     }
   }
 
   getFormGroup(
-    config: CT.InputSpec,
+    config: IST.InputSpec,
     validators: ValidatorFn[] = [],
     current?: Record<string, any> | null,
   ): UntypedFormGroup {
@@ -77,7 +77,7 @@ export class FormService {
   }
 
   private getFormEntry(
-    spec: CT.ValueSpec,
+    spec: IST.ValueSpec,
     currentValue?: any,
   ): UntypedFormGroup | UntypedFormArray | UntypedFormControl {
     let value: any
@@ -145,18 +145,18 @@ export class FormService {
   }
 }
 
-// function getListItemValidators(spec: CT.ValueSpecList) {
-//   if (CT.isValueSpecListOf(spec, 'text')) {
+// function getListItemValidators(spec: IST.ValueSpecList) {
+//   if (IST.isValueSpecListOf(spec, 'text')) {
 //     return stringValidators(spec.spec)
 //   }
 // }
 
 function stringValidators(
-  spec: CT.ValueSpecText | CT.ListValueSpecText,
+  spec: IST.ValueSpecText | IST.ListValueSpecText,
 ): ValidatorFn[] {
   const validators: ValidatorFn[] = []
 
-  if ((spec as CT.ValueSpecText).required) {
+  if ((spec as IST.ValueSpecText).required) {
     validators.push(Validators.required)
   }
 
@@ -169,7 +169,7 @@ function stringValidators(
   return validators
 }
 
-function textareaValidators(spec: CT.ValueSpecTextarea): ValidatorFn[] {
+function textareaValidators(spec: IST.ValueSpecTextarea): ValidatorFn[] {
   const validators: ValidatorFn[] = []
 
   if (spec.required) {
@@ -181,7 +181,7 @@ function textareaValidators(spec: CT.ValueSpecTextarea): ValidatorFn[] {
   return validators
 }
 
-function colorValidators({ required }: CT.ValueSpecColor): ValidatorFn[] {
+function colorValidators({ required }: IST.ValueSpecColor): ValidatorFn[] {
   const validators: ValidatorFn[] = [Validators.pattern(/^#[0-9a-f]{6}$/i)]
 
   if (required) {
@@ -195,7 +195,7 @@ function datetimeValidators({
   required,
   min,
   max,
-}: CT.ValueSpecDatetime): ValidatorFn[] {
+}: IST.ValueSpecDatetime): ValidatorFn[] {
   const validators: ValidatorFn[] = []
 
   if (required) {
@@ -213,12 +213,12 @@ function datetimeValidators({
   return validators
 }
 
-function numberValidators(spec: CT.ValueSpecNumber): ValidatorFn[] {
+function numberValidators(spec: IST.ValueSpecNumber): ValidatorFn[] {
   const validators: ValidatorFn[] = []
 
   validators.push(isNumber())
 
-  if ((spec as CT.ValueSpecNumber).required) {
+  if ((spec as IST.ValueSpecNumber).required) {
     validators.push(Validators.required)
   }
 
@@ -231,7 +231,7 @@ function numberValidators(spec: CT.ValueSpecNumber): ValidatorFn[] {
   return validators
 }
 
-function selectValidators(spec: CT.ValueSpecSelect): ValidatorFn[] {
+function selectValidators(spec: IST.ValueSpecSelect): ValidatorFn[] {
   const validators: ValidatorFn[] = []
 
   if (spec.required) {
@@ -241,13 +241,13 @@ function selectValidators(spec: CT.ValueSpecSelect): ValidatorFn[] {
   return validators
 }
 
-function multiselectValidators(spec: CT.ValueSpecMultiselect): ValidatorFn[] {
+function multiselectValidators(spec: IST.ValueSpecMultiselect): ValidatorFn[] {
   const validators: ValidatorFn[] = []
   validators.push(listInRange(spec.minLength, spec.maxLength))
   return validators
 }
 
-function listValidators(spec: CT.ValueSpecList): ValidatorFn[] {
+function listValidators(spec: IST.ValueSpecList): ValidatorFn[] {
   const validators: ValidatorFn[] = []
   validators.push(listInRange(spec.minLength, spec.maxLength))
   validators.push(listItemIssue())
@@ -352,7 +352,7 @@ export function listItemIssue(): ValidatorFn {
   }
 }
 
-export function listUnique(spec: CT.ValueSpecList): ValidatorFn {
+export function listUnique(spec: IST.ValueSpecList): ValidatorFn {
   return control => {
     const list = control.value
     for (let idx = 0; idx < list.length; idx++) {
@@ -389,7 +389,11 @@ export function listUnique(spec: CT.ValueSpecList): ValidatorFn {
   }
 }
 
-function listItemEquals(spec: CT.ValueSpecList, val1: any, val2: any): boolean {
+function listItemEquals(
+  spec: IST.ValueSpecList,
+  val1: any,
+  val2: any,
+): boolean {
   // TODO: fix types
   switch (spec.spec.type) {
     case 'text':
@@ -402,7 +406,7 @@ function listItemEquals(spec: CT.ValueSpecList, val1: any, val2: any): boolean {
   }
 }
 
-function itemEquals(spec: CT.ValueSpec, val1: any, val2: any): boolean {
+function itemEquals(spec: IST.ValueSpec, val1: any, val2: any): boolean {
   switch (spec.type) {
     case 'text':
     case 'textarea':
@@ -414,15 +418,15 @@ function itemEquals(spec: CT.ValueSpec, val1: any, val2: any): boolean {
       // TODO: 'unique-by' does not exist on ValueSpecObject, fix types
       return objEquals(
         (spec as any)['unique-by'],
-        spec as CT.ValueSpecObject,
+        spec as IST.ValueSpecObject,
         val1,
         val2,
       )
     case 'union':
-      // TODO: 'unique-by' does not exist on CT.ValueSpecUnion, fix types
+      // TODO: 'unique-by' does not exist onIST.ValueSpecUnion, fix types
       return unionEquals(
         (spec as any)['unique-by'],
-        spec as CT.ValueSpecUnion,
+        spec as IST.ValueSpecUnion,
         val1,
         val2,
       )
@@ -442,8 +446,8 @@ function itemEquals(spec: CT.ValueSpec, val1: any, val2: any): boolean {
 }
 
 function listObjEquals(
-  uniqueBy: CT.UniqueBy,
-  spec: CT.ListValueSpecObject,
+  uniqueBy: IST.UniqueBy,
+  spec: IST.ListValueSpecObject,
   val1: any,
   val2: any,
 ): boolean {
@@ -470,8 +474,8 @@ function listObjEquals(
 }
 
 function objEquals(
-  uniqueBy: CT.UniqueBy,
-  spec: CT.ValueSpecObject,
+  uniqueBy: IST.UniqueBy,
+  spec: IST.ValueSpecObject,
   val1: any,
   val2: any,
 ): boolean {
@@ -499,8 +503,8 @@ function objEquals(
 }
 
 function unionEquals(
-  uniqueBy: CT.UniqueBy,
-  spec: CT.ValueSpecUnion,
+  uniqueBy: IST.UniqueBy,
+  spec: IST.ValueSpecUnion,
   val1: any,
   val2: any,
 ): boolean {
@@ -532,8 +536,8 @@ function unionEquals(
 }
 
 function uniqueByMessageWrapper(
-  uniqueBy: CT.UniqueBy,
-  spec: CT.ListValueSpecObject,
+  uniqueBy: IST.UniqueBy,
+  spec: IST.ListValueSpecObject,
 ) {
   let configSpec = spec.spec
 
@@ -544,8 +548,8 @@ function uniqueByMessageWrapper(
 }
 
 function uniqueByMessage(
-  uniqueBy: CT.UniqueBy,
-  configSpec: CT.InputSpec,
+  uniqueBy: IST.UniqueBy,
+  configSpec: IST.InputSpec,
   outermost = true,
 ): string {
   let joinFunc
@@ -554,7 +558,7 @@ function uniqueByMessage(
     return ''
   } else if (typeof uniqueBy === 'string') {
     return configSpec[uniqueBy]
-      ? (configSpec[uniqueBy] as CT.ValueSpecObject).name
+      ? (configSpec[uniqueBy] as IST.ValueSpecObject).name
       : uniqueBy
   } else if ('any' in uniqueBy) {
     joinFunc = ' OR '
@@ -574,14 +578,14 @@ function uniqueByMessage(
 }
 
 function isObject(
-  spec: CT.ListValueSpecOf<any>,
-): spec is CT.ListValueSpecObject {
+  spec: IST.ListValueSpecOf<any>,
+): spec is IST.ListValueSpecObject {
   // only lists of objects have uniqueBy
   return 'uniqueBy' in spec
 }
 
 export function convertValuesRecursive(
-  configSpec: CT.InputSpec,
+  configSpec: IST.InputSpec,
   group: UntypedFormGroup,
 ) {
   Object.entries(configSpec).forEach(([key, valueSpec]) => {
@@ -611,7 +615,7 @@ export function convertValuesRecursive(
         })
       } else if (valueSpec.spec.type === 'object') {
         controls.forEach(formGroup => {
-          const objectSpec = valueSpec.spec as CT.ListValueSpecObject
+          const objectSpec = valueSpec.spec as IST.ListValueSpecObject
           convertValuesRecursive(objectSpec.spec, formGroup as UntypedFormGroup)
         })
       }
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index d73a9afe1..f987f6b2c 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -1,6 +1,7 @@
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { PkgDependencyErrors } from './dep-error.service'
 import { T } from '@start9labs/start-sdk'
+import { getManifest, needsConfig } from '../util/get-package-data'
 
 export interface PackageStatus {
   primary: PrimaryStatus
@@ -17,7 +18,7 @@ export function renderPkgStatus(
   let health: T.HealthStatus | null = null
 
   if (pkg.stateInfo.state === 'installed') {
-    primary = getInstalledPrimaryStatus(pkg.status)
+    primary = getInstalledPrimaryStatus(pkg)
     dependency = getDependencyStatus(depErrors)
     health = getHealthStatus(pkg.status)
   } else {
@@ -27,11 +28,11 @@ export function renderPkgStatus(
   return { primary, dependency, health }
 }
 
-function getInstalledPrimaryStatus(status: T.Status): PrimaryStatus {
-  if (!status.configured) {
+function getInstalledPrimaryStatus(pkg: T.PackageDataEntry): PrimaryStatus {
+  if (needsConfig(getManifest(pkg).id, pkg.requestedActions)) {
     return 'needsConfig'
   } else {
-    return status.main.status as any as PrimaryStatus
+    return pkg.status.main
   }
 }
 
@@ -39,12 +40,12 @@ function getDependencyStatus(depErrors: PkgDependencyErrors): DependencyStatus {
   return Object.values(depErrors).some(err => !!err) ? 'warning' : 'satisfied'
 }
 
-function getHealthStatus(status: T.Status): T.HealthStatus | null {
-  if (status.main.status !== 'running' || !status.main.health) {
+function getHealthStatus(status: T.MainStatus): T.HealthStatus | null {
+  if (status.main !== 'running' || !status.main) {
     return null
   }
 
-  const values = Object.values(status.main.health)
+  const values = Object.values(status.health)
 
   if (values.some(h => h.result === 'failure')) {
     return 'failure'
diff --git a/web/projects/ui/src/app/util/configBuilderToSpec.ts b/web/projects/ui/src/app/util/configBuilderToSpec.ts
index 1f75329c5..108bf9468 100644
--- a/web/projects/ui/src/app/util/configBuilderToSpec.ts
+++ b/web/projects/ui/src/app/util/configBuilderToSpec.ts
@@ -1,9 +1,9 @@
-import { CB } from '@start9labs/start-sdk'
+import { ISB } from '@start9labs/start-sdk'
 
 export async function configBuilderToSpec(
   builder:
-    | CB.Config<Record<string, unknown>, unknown>
-    | CB.Config<Record<string, unknown>, never>,
+    | ISB.InputSpec<Record<string, unknown>, unknown>
+    | ISB.InputSpec<Record<string, unknown>, never>,
 ) {
   return builder.build({} as any)
 }
diff --git a/web/projects/ui/src/app/util/get-package-data.ts b/web/projects/ui/src/app/util/get-package-data.ts
index c4d0cc046..7ba7377fc 100644
--- a/web/projects/ui/src/app/util/get-package-data.ts
+++ b/web/projects/ui/src/app/util/get-package-data.ts
@@ -28,6 +28,18 @@ export function getManifest(pkg: PackageDataEntry): T.Manifest {
   return (pkg.stateInfo as InstallingState).installingInfo.newManifest
 }
 
+export function needsConfig(
+  pkgId: string,
+  requestedActions: PackageDataEntry['requestedActions'],
+): boolean {
+  return Object.values(requestedActions).some(
+    r =>
+      r.active &&
+      r.request.packageId === pkgId &&
+      r.request.actionId === 'config',
+  )
+}
+
 export function isInstalled(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstalledState> {

From e7fa94c3d32a151361d97049861b904bc24786fd Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:19:06 -0600
Subject: [PATCH 289/341] add error status (#2746)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add error status

* update types

* ṗ̶̰̙̓͒̈́ͅü̵̢̙̫̣ŗ̷̪̺̺͛g̴̲͉͎̬̒̇e̵̪̎̅͌ ̶̡̜̘͐͛t̶͎͍̣̿̍̐h̴͕̩͗̈́̎̑e̵͚͒̂͝ ̸̛͙̦͈͝v̶̱͙̬̽̔ọ̶̧̡̒̓i̸̬̲͍̋̈́d̴͉̀

* fix some extra voids

* add `package.rebuild`

* introduce error status and pkg rebuild and fix mocks

* minor fixes

* fix build

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>
---
 .../src/Adapters/EffectCreator.ts             |   4 +-
 .../src/Adapters/Systems/SystemForStartOs.ts  |   1 +
 core/models/src/errors.rs                     |   8 +
 core/startos/src/disk/mount/util.rs           |  18 +-
 core/startos/src/lib.rs                       |   7 +
 core/startos/src/lxc/mod.rs                   |   3 +-
 core/startos/src/service/mod.rs               |   9 +
 core/startos/src/service/service_map.rs       |  28 +-
 core/startos/src/status/mod.rs                |  16 +-
 sdk/base/lib/Effects.ts                       |  36 +--
 sdk/base/lib/actions/setupActions.ts          |  25 +-
 sdk/base/lib/dependencies/dependencies.ts     |  19 +-
 .../lib/dependencies/setupDependencies.ts     |  67 +++--
 sdk/base/lib/interfaces/setupInterfaces.ts    |  55 ++--
 sdk/base/lib/osBindings/MainStatus.ts         |   6 +
 sdk/base/lib/s9pk/index.ts                    |   7 +-
 sdk/base/lib/types.ts                         |   6 +-
 sdk/base/lib/util/graph.ts                    |  33 ++-
 sdk/base/package-lock.json                    |  37 ++-
 sdk/base/package.json                         |  11 +-
 sdk/package/lib/StartSdk.ts                   |   8 +-
 sdk/package/lib/inits/setupInit.ts            |   2 +-
 sdk/package/lib/inits/setupInstall.ts         |   2 +-
 sdk/package/lib/inits/setupUninstall.ts       |   2 +-
 sdk/package/lib/mainFn/CommandController.ts   |   4 +-
 sdk/package/lib/mainFn/Daemon.ts              |   4 +-
 sdk/package/lib/mainFn/Daemons.ts             |  12 +-
 sdk/package/lib/mainFn/HealthDaemon.ts        |   3 +-
 sdk/package/lib/mainFn/index.ts               |   2 +-
 sdk/package/lib/util/SubContainer.ts          |  17 +-
 web/package-lock.json                         |   6 +-
 web/package.json                              |   1 +
 .../app-actions/app-actions.page.html         |  11 +-
 .../app-actions/app-actions.page.ts           |  61 +---
 .../apps-routes/app-show/app-show.module.ts   |   2 +
 .../apps-routes/app-show/app-show.page.html   |   9 +-
 .../apps-routes/app-show/app-show.page.ts     |   9 +-
 .../app-show-error.component.html             |  31 +++
 .../app-show-error.component.ts               |  45 +++
 .../app-show-status.component.html            |   9 +-
 .../ui/src/app/services/api/api.types.ts      |   3 +
 .../app/services/api/embassy-api.service.ts   |   4 +
 .../services/api/embassy-live-api.service.ts  |   6 +
 .../services/api/embassy-mock-api.service.ts  | 262 ++++++++----------
 .../ui/src/app/services/api/mock-patch.ts     |  36 +--
 .../services/pkg-status-rendering.service.ts  |   6 +
 .../app/services/standard-actions.service.ts  |  85 ++++++
 web/projects/ui/src/styles.scss               |   6 +
 web/tsconfig.json                             |   3 +-
 49 files changed, 638 insertions(+), 409 deletions(-)
 create mode 100644 web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-error/app-show-error.component.html
 create mode 100644 web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-error/app-show-error.component.ts
 create mode 100644 web/projects/ui/src/app/services/standard-actions.service.ts

diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index 022d697ab..db176536f 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -173,7 +173,7 @@ export function makeEffects(context: EffectContext): Effects {
           T.Effects["subcontainer"]["createFs"]
         >
       },
-      destroyFs(options: { guid: string }): Promise<void> {
+      destroyFs(options: { guid: string }): Promise<null> {
         return rpcRound("subcontainer.destroy-fs", options) as ReturnType<
           T.Effects["subcontainer"]["destroyFs"]
         >
@@ -284,7 +284,7 @@ export function makeEffects(context: EffectContext): Effects {
       >
     },
 
-    setMainStatus(o: { status: "running" | "stopped" }): Promise<void> {
+    setMainStatus(o: { status: "running" | "stopped" }): Promise<null> {
       return rpcRound("set-main-status", o) as ReturnType<
         T.Effects["setHealth"]
       >
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 43096f0f0..c000b391b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -92,6 +92,7 @@ export class SystemForStartOs implements System {
     const started = async (onTerm: () => Promise<void>) => {
       await effects.setMainStatus({ status: "running" })
       mainOnTerm = onTerm
+      return null
     }
     const daemons = await (
       await this.abi.main({
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index ee6b0ae12..708b57861 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -351,6 +351,14 @@ impl Debug for ErrorData {
     }
 }
 impl std::error::Error for ErrorData {}
+impl From<Error> for ErrorData {
+    fn from(value: Error) -> Self {
+        Self {
+            details: value.to_string(),
+            debug: format!("{:?}", value),
+        }
+    }
+}
 impl From<&RpcError> for ErrorData {
     fn from(value: &RpcError) -> Self {
         Self {
diff --git a/core/startos/src/disk/mount/util.rs b/core/startos/src/disk/mount/util.rs
index 674f33304..61368e67a 100644
--- a/core/startos/src/disk/mount/util.rs
+++ b/core/startos/src/disk/mount/util.rs
@@ -5,6 +5,16 @@ use tracing::instrument;
 use crate::util::Invoke;
 use crate::Error;
 
+pub async fn is_mountpoint(path: impl AsRef<Path>) -> Result<bool, Error> {
+    let is_mountpoint = tokio::process::Command::new("mountpoint")
+        .arg(path.as_ref())
+        .stdout(std::process::Stdio::null())
+        .stderr(std::process::Stdio::null())
+        .status()
+        .await?;
+    Ok(is_mountpoint.success())
+}
+
 #[instrument(skip_all)]
 pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
     src: P0,
@@ -16,13 +26,7 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
         src.as_ref().display(),
         dst.as_ref().display()
     );
-    let is_mountpoint = tokio::process::Command::new("mountpoint")
-        .arg(dst.as_ref())
-        .stdout(std::process::Stdio::null())
-        .stderr(std::process::Stdio::null())
-        .status()
-        .await?;
-    if is_mountpoint.success() {
+    if is_mountpoint(&dst).await? {
         unmount(dst.as_ref(), true).await?;
     }
     tokio::fs::create_dir_all(&src).await?;
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 8d4f831bf..997a7199f 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -292,6 +292,13 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .no_display()
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "rebuild",
+            from_fn_async(service::rebuild)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
         .subcommand("logs", logs::package_logs())
         .subcommand(
             "logs",
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index ee08801df..3979263f0 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -126,7 +126,8 @@ impl LxcManager {
                         Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs"),
                         true,
                     )
-                    .await?;
+                    .await
+                    .log_err();
                     if tokio_stream::wrappers::ReadDirStream::new(
                         tokio::fs::read_dir(&rootfs_path).await?,
                     )
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 1e61b1191..37579c03b 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -589,6 +589,15 @@ impl ServiceActorSeed {
     }
 }
 
+#[derive(Deserialize, Serialize, Parser, TS)]
+pub struct RebuildParams {
+    pub id: PackageId,
+}
+pub async fn rebuild(ctx: RpcContext, RebuildParams { id }: RebuildParams) -> Result<(), Error> {
+    ctx.services.load(&ctx, &id, LoadDisposition::Retry).await?;
+    Ok(())
+}
+
 #[derive(Deserialize, Serialize, Parser, TS)]
 pub struct ConnectParams {
     pub id: PackageId,
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index ebe45fcc5..68a5f2a5f 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -7,6 +7,7 @@ use futures::{Future, FutureExt};
 use helpers::NonDetachingJoinHandle;
 use imbl::OrdMap;
 use imbl_value::InternedString;
+use models::ErrorData;
 use tokio::sync::{Mutex, OwnedRwLockReadGuard, OwnedRwLockWriteGuard, RwLock};
 use tracing::instrument;
 
@@ -22,6 +23,7 @@ use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle, ProgressT
 use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
+use crate::service::start_stop::StartStop;
 use crate::service::{LoadDisposition, Service, ServiceRef};
 use crate::status::MainStatus;
 use crate::util::serde::Pem;
@@ -87,8 +89,30 @@ impl ServiceMap {
         if let Some(service) = service.take() {
             shutdown_err = service.shutdown().await;
         }
-        // TODO: retry on error?
-        *service = Service::load(ctx, id, disposition).await?.map(From::from);
+        match Service::load(ctx, id, disposition).await {
+            Ok(s) => *service = s.into(),
+            Err(e) => {
+                let e = ErrorData::from(e);
+                ctx.db
+                    .mutate(|db| {
+                        if let Some(pde) = db.as_public_mut().as_package_data_mut().as_idx_mut(id) {
+                            pde.as_status_mut().map_mutate(|s| {
+                                Ok(MainStatus::Error {
+                                    on_rebuild: if s.running() {
+                                        StartStop::Start
+                                    } else {
+                                        StartStop::Stop
+                                    },
+                                    message: e.details,
+                                    debug: Some(e.debug),
+                                })
+                            })?;
+                        }
+                        Ok(())
+                    })
+                    .await?;
+            }
+        }
         shutdown_err?;
         Ok(())
     }
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index e45085826..14442bce6 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -17,6 +17,11 @@ pub mod health_check;
 #[serde(rename_all = "camelCase")]
 #[serde(rename_all_fields = "camelCase")]
 pub enum MainStatus {
+    Error {
+        on_rebuild: StartStop,
+        message: String,
+        debug: Option<String>,
+    },
     Stopped,
     Restarting,
     Restoring,
@@ -43,12 +48,20 @@ impl MainStatus {
             | MainStatus::Restarting
             | MainStatus::BackingUp {
                 on_complete: StartStop::Start,
+            }
+            | MainStatus::Error {
+                on_rebuild: StartStop::Start,
+                ..
             } => true,
             MainStatus::Stopped
             | MainStatus::Restoring
             | MainStatus::Stopping { .. }
             | MainStatus::BackingUp {
                 on_complete: StartStop::Stop,
+            }
+            | MainStatus::Error {
+                on_rebuild: StartStop::Stop,
+                ..
             } => false,
         }
     }
@@ -70,7 +83,8 @@ impl MainStatus {
             | MainStatus::Stopped
             | MainStatus::Restoring
             | MainStatus::Stopping { .. }
-            | MainStatus::Restarting => None,
+            | MainStatus::Restarting
+            | MainStatus::Error { .. } => None,
         }
     }
 }
diff --git a/sdk/base/lib/Effects.ts b/sdk/base/lib/Effects.ts
index 3dab037c0..16d82464d 100644
--- a/sdk/base/lib/Effects.ts
+++ b/sdk/base/lib/Effects.ts
@@ -31,14 +31,14 @@ export type Effects = {
   constRetry: () => void
   clearCallbacks: (
     options: { only: number[] } | { except: number[] },
-  ) => Promise<void>
+  ) => Promise<null>
 
   // action
   action: {
     /** Define an action that can be invoked by a user or service */
-    export(options: { id: ActionId; metadata: ActionMetadata }): Promise<void>
+    export(options: { id: ActionId; metadata: ActionMetadata }): Promise<null>
     /** Remove all exported actions */
-    clear(options: { except: ActionId[] }): Promise<void>
+    clear(options: { except: ActionId[] }): Promise<null>
     getInput(options: {
       packageId?: PackageId
       actionId: ActionId
@@ -50,23 +50,23 @@ export type Effects = {
     }): Promise<ActionResult | null>
     request<Input extends Record<string, unknown>>(
       options: RequestActionParams,
-    ): Promise<void>
+    ): Promise<null>
     clearRequests(
       options: { only: ActionId[] } | { except: ActionId[] },
-    ): Promise<void>
+    ): Promise<null>
   }
 
   // control
   /** restart this service's main function */
-  restart(): Promise<void>
+  restart(): Promise<null>
   /** stop this service's main function */
-  shutdown(): Promise<void>
+  shutdown(): Promise<null>
   /** indicate to the host os what runstate the service is in */
-  setMainStatus(options: SetMainStatus): Promise<void>
+  setMainStatus(options: SetMainStatus): Promise<null>
 
   // dependency
   /** Set the dependencies of what the service needs, usually run during the inputSpec action as a best practice */
-  setDependencies(options: { dependencies: Dependencies }): Promise<void>
+  setDependencies(options: { dependencies: Dependencies }): Promise<null>
   /** Get the list of the dependencies, both the dynamic set by the effect of setDependencies and the end result any required in the manifest  */
   getDependencies(): Promise<DependencyRequirement[]>
   /** Test whether current dependency requirements are satisfied */
@@ -86,11 +86,11 @@ export type Effects = {
   /** Returns a list of the ids of all installed packages */
   getInstalledPackages(): Promise<string[]>
   /** grants access to certain paths in the store to dependents */
-  exposeForDependents(options: { paths: string[] }): Promise<void>
+  exposeForDependents(options: { paths: string[] }): Promise<null>
 
   // health
   /** sets the result of a health check */
-  setHealth(o: SetHealth): Promise<void>
+  setHealth(o: SetHealth): Promise<null>
 
   // subcontainer
   subcontainer: {
@@ -100,13 +100,13 @@ export type Effects = {
       name: string | null
     }): Promise<[string, string]>
     /** A low level api used by SubContainer */
-    destroyFs(options: { guid: string }): Promise<void>
+    destroyFs(options: { guid: string }): Promise<null>
   }
 
   // net
   // bind
   /** Creates a host connected to the specified port with the provided options */
-  bind(options: BindParams): Promise<void>
+  bind(options: BindParams): Promise<null>
   /** Get the port address for a service */
   getServicePortForward(options: {
     packageId?: PackageId
@@ -116,7 +116,7 @@ export type Effects = {
   /** Removes all network bindings, called in the setupInputSpec */
   clearBindings(options: {
     except: { id: HostId; internalPort: number }[]
-  }): Promise<void>
+  }): Promise<null>
   // host
   /** Returns information about the specified host, if it exists */
   getHostInfo(options: {
@@ -134,7 +134,7 @@ export type Effects = {
   getContainerIp(): Promise<string>
   // interface
   /** Creates an interface bound to a specific host and port to show to the user */
-  exportServiceInterface(options: ExportServiceInterfaceParams): Promise<void>
+  exportServiceInterface(options: ExportServiceInterfaceParams): Promise<null>
   /** Returns an exported service interface */
   getServiceInterface(options: {
     packageId?: PackageId
@@ -149,7 +149,7 @@ export type Effects = {
   /** Removes all service interfaces */
   clearServiceInterfaces(options: {
     except: ServiceInterfaceId[]
-  }): Promise<void>
+  }): Promise<null>
   // ssl
   /** Returns a PEM encoded fullchain for the hostnames specified */
   getSslCertificate: (options: {
@@ -178,10 +178,10 @@ export type Effects = {
       /** Sets the value for the wrapper at the path, it will override, using the [JsonPath](https://jsonpath.com/)  */
       path: StorePath
       value: ExtractStore
-    }): Promise<void>
+    }): Promise<null>
   }
   /** sets the version that this service's data has been migrated to */
-  setDataVersion(options: { version: string }): Promise<void>
+  setDataVersion(options: { version: string }): Promise<null>
   /** returns the version that this service's data has been migrated to */
   getDataVersion(): Promise<string | null>
 
diff --git a/sdk/base/lib/actions/setupActions.ts b/sdk/base/lib/actions/setupActions.ts
index f78da1f0a..8c6b7734a 100644
--- a/sdk/base/lib/actions/setupActions.ts
+++ b/sdk/base/lib/actions/setupActions.ts
@@ -1,6 +1,7 @@
 import { InputSpec } from "./input/builder"
 import { ExtractInputSpecType } from "./input/builder/inputSpec"
 import * as T from "../types"
+import { once } from "../util"
 
 export type Run<
   A extends
@@ -130,21 +131,19 @@ export class Actions<
   ): Actions<Store, AllActions & { [id in A["id"]]: A }> {
     return new Actions({ ...this.actions, [action.id]: action })
   }
-  update(options: { effects: T.Effects }): Promise<void> {
-    const updater = async (options: { effects: T.Effects }) => {
-      for (let action of Object.values(this.actions)) {
-        await action.exportMetadata(options)
-      }
-      await options.effects.action.clear({ except: Object.keys(this.actions) })
+  async update(options: { effects: T.Effects }): Promise<null> {
+    options.effects = {
+      ...options.effects,
+      constRetry: once(() => {
+        this.update(options) // yes, this reuses the options object, but the const retry function will be overwritten each time, so the once-ness is not a problem
+      }),
     }
-    const updaterCtx = { options }
-    updaterCtx.options = {
-      effects: {
-        ...options.effects,
-        constRetry: () => updater(updaterCtx.options),
-      },
+    for (let action of Object.values(this.actions)) {
+      await action.exportMetadata(options)
     }
-    return updater(updaterCtx.options)
+    await options.effects.action.clear({ except: Object.keys(this.actions) })
+
+    return null
   }
   get<Id extends T.ActionId>(actionId: Id): AllActions[Id] {
     return this.actions[actionId]
diff --git a/sdk/base/lib/dependencies/dependencies.ts b/sdk/base/lib/dependencies/dependencies.ts
index fd3c6bb69..20049b5e8 100644
--- a/sdk/base/lib/dependencies/dependencies.ts
+++ b/sdk/base/lib/dependencies/dependencies.ts
@@ -13,15 +13,15 @@ export type CheckDependencies<DependencyId extends PackageId = PackageId> = {
   ) => boolean
   satisfied: () => boolean
 
-  throwIfInstalledNotSatisfied: (packageId: DependencyId) => void
-  throwIfInstalledVersionNotSatisfied: (packageId: DependencyId) => void
-  throwIfRunningNotSatisfied: (packageId: DependencyId) => void
-  throwIfActionsNotSatisfied: (packageId: DependencyId) => void
+  throwIfInstalledNotSatisfied: (packageId: DependencyId) => null
+  throwIfInstalledVersionNotSatisfied: (packageId: DependencyId) => null
+  throwIfRunningNotSatisfied: (packageId: DependencyId) => null
+  throwIfActionsNotSatisfied: (packageId: DependencyId) => null
   throwIfHealthNotSatisfied: (
     packageId: DependencyId,
     healthCheckId?: HealthCheckId,
-  ) => void
-  throwIfNotSatisfied: (packageId?: DependencyId) => void
+  ) => null
+  throwIfNotSatisfied: (packageId?: DependencyId) => null
 }
 export async function checkDependencies<
   DependencyId extends PackageId = PackageId,
@@ -100,6 +100,7 @@ export async function checkDependencies<
     if (!dep.result.installedVersion) {
       throw new Error(`${dep.result.title || packageId} is not installed`)
     }
+    return null
   }
   const throwIfInstalledVersionNotSatisfied = (packageId: DependencyId) => {
     const dep = find(packageId)
@@ -117,12 +118,14 @@ export async function checkDependencies<
         `Installed version ${dep.result.installedVersion} of ${dep.result.title || packageId} does not match expected version range ${dep.requirement.versionRange}`,
       )
     }
+    return null
   }
   const throwIfRunningNotSatisfied = (packageId: DependencyId) => {
     const dep = find(packageId)
     if (dep.requirement.kind === "running" && !dep.result.isRunning) {
       throw new Error(`${dep.result.title || packageId} is not running`)
     }
+    return null
   }
   const throwIfActionsNotSatisfied = (packageId: DependencyId) => {
     const dep = find(packageId)
@@ -132,6 +135,7 @@ export async function checkDependencies<
         `The following action requests have not been fulfilled: ${reqs.join(", ")}`,
       )
     }
+    return null
   }
   const throwIfHealthNotSatisfied = (
     packageId: DependencyId,
@@ -158,6 +162,7 @@ export async function checkDependencies<
           .join("; "),
       )
     }
+    return null
   }
   const throwIfPkgNotSatisfied = (packageId: DependencyId) => {
     throwIfInstalledNotSatisfied(packageId)
@@ -165,6 +170,7 @@ export async function checkDependencies<
     throwIfRunningNotSatisfied(packageId)
     throwIfActionsNotSatisfied(packageId)
     throwIfHealthNotSatisfied(packageId)
+    return null
   }
   const throwIfNotSatisfied = (packageId?: DependencyId) =>
     packageId
@@ -182,6 +188,7 @@ export async function checkDependencies<
           if (err.length) {
             throw new Error(err.join("; "))
           }
+          return null
         })()
 
   return {
diff --git a/sdk/base/lib/dependencies/setupDependencies.ts b/sdk/base/lib/dependencies/setupDependencies.ts
index 0f9bd6da8..9d613ff74 100644
--- a/sdk/base/lib/dependencies/setupDependencies.ts
+++ b/sdk/base/lib/dependencies/setupDependencies.ts
@@ -1,4 +1,5 @@
 import * as T from "../types"
+import { once } from "../util"
 import { Dependency } from "./Dependency"
 
 type DependencyType<Manifest extends T.Manifest> = {
@@ -17,40 +18,38 @@ type DependencyType<Manifest extends T.Manifest> = {
 
 export function setupDependencies<Manifest extends T.Manifest>(
   fn: (options: { effects: T.Effects }) => Promise<DependencyType<Manifest>>,
-): (options: { effects: T.Effects }) => Promise<void> {
-  return (options: { effects: T.Effects }) => {
-    const updater = async (options: { effects: T.Effects }) => {
-      const dependencyType = await fn(options)
-      return await options.effects.setDependencies({
-        dependencies: Object.entries(dependencyType).map(
-          ([
-            id,
-            {
-              data: { versionRange, ...x },
-            },
-          ]) => ({
-            id,
-            ...x,
-            ...(x.type === "running"
-              ? {
-                  kind: "running",
-                  healthChecks: x.healthChecks,
-                }
-              : {
-                  kind: "exists",
-                }),
-            versionRange: versionRange.toString(),
-          }),
-        ),
-      })
+): (options: { effects: T.Effects }) => Promise<null> {
+  const cell = { updater: async (_: { effects: T.Effects }) => null }
+  cell.updater = async (options: { effects: T.Effects }) => {
+    options.effects = {
+      ...options.effects,
+      constRetry: once(() => {
+        cell.updater(options)
+      }),
     }
-    const updaterCtx = { options }
-    updaterCtx.options = {
-      effects: {
-        ...options.effects,
-        constRetry: () => updater(updaterCtx.options),
-      },
-    }
-    return updater(updaterCtx.options)
+    const dependencyType = await fn(options)
+    return await options.effects.setDependencies({
+      dependencies: Object.entries(dependencyType).map(
+        ([
+          id,
+          {
+            data: { versionRange, ...x },
+          },
+        ]) => ({
+          id,
+          ...x,
+          ...(x.type === "running"
+            ? {
+                kind: "running",
+                healthChecks: x.healthChecks,
+              }
+            : {
+                kind: "exists",
+              }),
+          versionRange: versionRange.toString(),
+        }),
+      ),
+    })
   }
+  return cell.updater
 }
diff --git a/sdk/base/lib/interfaces/setupInterfaces.ts b/sdk/base/lib/interfaces/setupInterfaces.ts
index 474841aa3..ba284bcb3 100644
--- a/sdk/base/lib/interfaces/setupInterfaces.ts
+++ b/sdk/base/lib/interfaces/setupInterfaces.ts
@@ -1,4 +1,5 @@
 import * as T from "../types"
+import { once } from "../util"
 import { AddressReceipt } from "./AddressReceipt"
 
 declare const UpdateServiceInterfacesProof: unique symbol
@@ -21,34 +22,36 @@ export const setupServiceInterfaces: SetupServiceInterfaces = <
   Output extends ServiceInterfacesReceipt,
 >(
   fn: SetServiceInterfaces<Output>,
-) =>
-  ((options: { effects: T.Effects }) => {
-    const updater = async (options: { effects: T.Effects }) => {
-      const bindings: T.BindId[] = []
-      const interfaces: T.ServiceInterfaceId[] = []
-      const res = await fn({
-        effects: {
-          ...options.effects,
-          bind: (params: T.BindParams) => {
-            bindings.push({ id: params.id, internalPort: params.internalPort })
-            return options.effects.bind(params)
-          },
-          exportServiceInterface: (params: T.ExportServiceInterfaceParams) => {
-            interfaces.push(params.id)
-            return options.effects.exportServiceInterface(params)
-          },
-        },
-      })
-      await options.effects.clearBindings({ except: bindings })
-      await options.effects.clearServiceInterfaces({ except: interfaces })
-      return res
+) => {
+  const cell = {
+    updater: (async (options: { effects: T.Effects }) =>
+      [] as any as Output) as UpdateServiceInterfaces<Output>,
+  }
+  cell.updater = (async (options: { effects: T.Effects }) => {
+    options.effects = {
+      ...options.effects,
+      constRetry: once(() => {
+        cell.updater(options)
+      }),
     }
-    const updaterCtx = { options }
-    updaterCtx.options = {
+    const bindings: T.BindId[] = []
+    const interfaces: T.ServiceInterfaceId[] = []
+    const res = await fn({
       effects: {
         ...options.effects,
-        constRetry: () => updater(updaterCtx.options),
+        bind: (params: T.BindParams) => {
+          bindings.push({ id: params.id, internalPort: params.internalPort })
+          return options.effects.bind(params)
+        },
+        exportServiceInterface: (params: T.ExportServiceInterfaceParams) => {
+          interfaces.push(params.id)
+          return options.effects.exportServiceInterface(params)
+        },
       },
-    }
-    return updater(updaterCtx.options)
+    })
+    await options.effects.clearBindings({ except: bindings })
+    await options.effects.clearServiceInterfaces({ except: interfaces })
+    return res
   }) as UpdateServiceInterfaces<Output>
+  return cell.updater
+}
diff --git a/sdk/base/lib/osBindings/MainStatus.ts b/sdk/base/lib/osBindings/MainStatus.ts
index dbd9a8fcc..64e081ab9 100644
--- a/sdk/base/lib/osBindings/MainStatus.ts
+++ b/sdk/base/lib/osBindings/MainStatus.ts
@@ -4,6 +4,12 @@ import type { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 import type { StartStop } from "./StartStop"
 
 export type MainStatus =
+  | {
+      main: "error"
+      onRebuild: StartStop
+      message: string
+      debug: string | null
+    }
   | { main: "stopped" }
   | { main: "restarting" }
   | { main: "restoring" }
diff --git a/sdk/base/lib/s9pk/index.ts b/sdk/base/lib/s9pk/index.ts
index eba8ed3f8..84a1ec644 100644
--- a/sdk/base/lib/s9pk/index.ts
+++ b/sdk/base/lib/s9pk/index.ts
@@ -1,6 +1,6 @@
 import { DataUrl, Manifest, MerkleArchiveCommitment } from "../osBindings"
 import { ArrayBufferReader, MerkleArchive } from "./merkleArchive"
-import mime from "mime"
+import mime from "mime-types"
 
 const magicAndVersion = new Uint8Array([59, 59, 2])
 
@@ -52,13 +52,14 @@ export class S9pk {
   async icon(): Promise<DataUrl> {
     const iconName = Object.keys(this.archive.contents.contents).find(
       (name) =>
-        name.startsWith("icon.") && mime.getType(name)?.startsWith("image/"),
+        name.startsWith("icon.") &&
+        (mime.contentType(name) || null)?.startsWith("image/"),
     )
     if (!iconName) {
       throw new Error("no icon found in archive")
     }
     return (
-      `data:${mime.getType(iconName)};base64,` +
+      `data:${mime.contentType(iconName)};base64,` +
       Buffer.from(
         await this.archive.contents.getPath([iconName])!.verifiedFileContents(),
       ).toString("base64")
diff --git a/sdk/base/lib/types.ts b/sdk/base/lib/types.ts
index 56e310efe..071647961 100644
--- a/sdk/base/lib/types.ts
+++ b/sdk/base/lib/types.ts
@@ -54,7 +54,7 @@ export namespace ExpectedExports {
    */
   export type main = (options: {
     effects: Effects
-    started(onTerm: () => PromiseLike<void>): PromiseLike<void>
+    started(onTerm: () => PromiseLike<void>): PromiseLike<null>
   }) => Promise<DaemonBuildable>
 
   /**
@@ -118,7 +118,7 @@ export type DaemonReceipt = {
 }
 export type Daemon = {
   wait(): Promise<string>
-  term(): Promise<void>
+  term(): Promise<null>
   [DaemonProof]: never
 }
 
@@ -135,7 +135,7 @@ export type CommandType = string | [string, ...string[]]
 
 export type DaemonReturned = {
   wait(): Promise<unknown>
-  term(options?: { signal?: Signals; timeout?: number }): Promise<void>
+  term(options?: { signal?: Signals; timeout?: number }): Promise<null>
 }
 
 export declare const hostName: unique symbol
diff --git a/sdk/base/lib/util/graph.ts b/sdk/base/lib/util/graph.ts
index 5ad71a04d..682ccf63e 100644
--- a/sdk/base/lib/util/graph.ts
+++ b/sdk/base/lib/util/graph.ts
@@ -1,17 +1,17 @@
 import { boolean } from "ts-matches"
 
-export type Vertex<VMetadata = void, EMetadata = void> = {
+export type Vertex<VMetadata = null, EMetadata = null> = {
   metadata: VMetadata
   edges: Array<Edge<EMetadata, VMetadata>>
 }
 
-export type Edge<EMetadata = void, VMetadata = void> = {
+export type Edge<EMetadata = null, VMetadata = null> = {
   metadata: EMetadata
   from: Vertex<VMetadata, EMetadata>
   to: Vertex<VMetadata, EMetadata>
 }
 
-export class Graph<VMetadata = void, EMetadata = void> {
+export class Graph<VMetadata = null, EMetadata = null> {
   private readonly vertices: Array<Vertex<VMetadata, EMetadata>> = []
   constructor() {}
   addVertex(
@@ -46,7 +46,7 @@ export class Graph<VMetadata = void, EMetadata = void> {
   }
   findVertex(
     predicate: (vertex: Vertex<VMetadata, EMetadata>) => boolean,
-  ): Generator<Vertex<VMetadata, EMetadata>, void> {
+  ): Generator<Vertex<VMetadata, EMetadata>, null> {
     const veritces = this.vertices
     function* gen() {
       for (let vertex of veritces) {
@@ -54,6 +54,7 @@ export class Graph<VMetadata = void, EMetadata = void> {
           yield vertex
         }
       }
+      return null
     }
     return gen()
   }
@@ -75,13 +76,13 @@ export class Graph<VMetadata = void, EMetadata = void> {
     from:
       | Vertex<VMetadata, EMetadata>
       | ((vertex: Vertex<VMetadata, EMetadata>) => boolean),
-  ): Generator<Vertex<VMetadata, EMetadata>, void> {
+  ): Generator<Vertex<VMetadata, EMetadata>, null> {
     const visited: Array<Vertex<VMetadata, EMetadata>> = []
     function* rec(
       vertex: Vertex<VMetadata, EMetadata>,
-    ): Generator<Vertex<VMetadata, EMetadata>, void> {
+    ): Generator<Vertex<VMetadata, EMetadata>, null> {
       if (visited.includes(vertex)) {
-        return
+        return null
       }
       visited.push(vertex)
       yield vertex
@@ -99,6 +100,7 @@ export class Graph<VMetadata = void, EMetadata = void> {
           }
         }
       }
+      return null
     }
 
     if (from instanceof Function) {
@@ -115,6 +117,7 @@ export class Graph<VMetadata = void, EMetadata = void> {
             }
           }
         }
+        return null
       })()
     } else {
       return rec(from)
@@ -124,13 +127,13 @@ export class Graph<VMetadata = void, EMetadata = void> {
     to:
       | Vertex<VMetadata, EMetadata>
       | ((vertex: Vertex<VMetadata, EMetadata>) => boolean),
-  ): Generator<Vertex<VMetadata, EMetadata>, void> {
+  ): Generator<Vertex<VMetadata, EMetadata>, null> {
     const visited: Array<Vertex<VMetadata, EMetadata>> = []
     function* rec(
       vertex: Vertex<VMetadata, EMetadata>,
-    ): Generator<Vertex<VMetadata, EMetadata>, void> {
+    ): Generator<Vertex<VMetadata, EMetadata>, null> {
       if (visited.includes(vertex)) {
-        return
+        return null
       }
       visited.push(vertex)
       yield vertex
@@ -148,6 +151,7 @@ export class Graph<VMetadata = void, EMetadata = void> {
           }
         }
       }
+      return null
     }
 
     if (to instanceof Function) {
@@ -164,6 +168,7 @@ export class Graph<VMetadata = void, EMetadata = void> {
             }
           }
         }
+        return null
       })()
     } else {
       return rec(to)
@@ -176,7 +181,7 @@ export class Graph<VMetadata = void, EMetadata = void> {
     to:
       | Vertex<VMetadata, EMetadata>
       | ((vertex: Vertex<VMetadata, EMetadata>) => boolean),
-  ): Array<Edge<EMetadata, VMetadata>> | void {
+  ): Array<Edge<EMetadata, VMetadata>> | null {
     const isDone =
       to instanceof Function
         ? to
@@ -186,12 +191,12 @@ export class Graph<VMetadata = void, EMetadata = void> {
     function* check(
       vertex: Vertex<VMetadata, EMetadata>,
       path: Array<Edge<EMetadata, VMetadata>>,
-    ): Generator<undefined, Array<Edge<EMetadata, VMetadata>> | undefined> {
+    ): Generator<undefined, Array<Edge<EMetadata, VMetadata>> | null> {
       if (isDone(vertex)) {
         return path
       }
       if (visited.includes(vertex)) {
-        return
+        return null
       }
       visited.push(vertex)
       yield
@@ -213,6 +218,7 @@ export class Graph<VMetadata = void, EMetadata = void> {
           }
         }
       }
+      return null
     }
 
     if (from instanceof Function) {
@@ -240,5 +246,6 @@ export class Graph<VMetadata = void, EMetadata = void> {
         }
       }
     }
+    return null
   }
 }
diff --git a/sdk/base/package-lock.json b/sdk/base/package-lock.json
index 3a8e40c0c..91c470676 100644
--- a/sdk/base/package-lock.json
+++ b/sdk/base/package-lock.json
@@ -13,13 +13,14 @@
         "@noble/hashes": "^1.4.0",
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
-        "mime": "^4.0.3",
+        "mime-types": "^2.1.35",
         "ts-matches": "^5.5.1",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
         "@types/jest": "^29.4.0",
         "@types/lodash.merge": "^4.6.2",
+        "@types/mime-types": "^2.1.4",
         "jest": "^29.4.3",
         "peggy": "^3.0.2",
         "prettier": "^3.2.5",
@@ -1249,6 +1250,13 @@
         "@types/lodash": "*"
       }
     },
+    "node_modules/@types/mime-types": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.4.tgz",
+      "integrity": "sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/node": {
       "version": "18.15.10",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz",
@@ -3106,18 +3114,25 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/mime": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
-      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
-      "funding": [
-        "https://github.com/sponsors/broofa"
-      ],
-      "bin": {
-        "mime": "bin/cli.js"
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">= 0.6"
       }
     },
     "node_modules/mimic-fn": {
diff --git a/sdk/base/package.json b/sdk/base/package.json
index a290d2a75..3d1d4b62e 100644
--- a/sdk/base/package.json
+++ b/sdk/base/package.json
@@ -21,14 +21,14 @@
   },
   "homepage": "https://github.com/Start9Labs/start-sdk#readme",
   "dependencies": {
+    "@iarna/toml": "^2.2.5",
+    "@noble/curves": "^1.4.0",
+    "@noble/hashes": "^1.4.0",
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
-    "mime": "^4.0.3",
+    "mime-types": "^2.1.35",
     "ts-matches": "^5.5.1",
-    "yaml": "^2.2.2",
-    "@iarna/toml": "^2.2.5",
-    "@noble/curves": "^1.4.0",
-    "@noble/hashes": "^1.4.0"
+    "yaml": "^2.2.2"
   },
   "prettier": {
     "trailingComma": "all",
@@ -39,6 +39,7 @@
   "devDependencies": {
     "@types/jest": "^29.4.0",
     "@types/lodash.merge": "^4.6.2",
+    "@types/mime-types": "^2.1.4",
     "jest": "^29.4.3",
     "peggy": "^3.0.2",
     "prettier": "^3.2.5",
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index 05cc003cb..412dafe52 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -563,7 +563,7 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
       setupMain: (
         fn: (o: {
           effects: Effects
-          started(onTerm: () => PromiseLike<void>): PromiseLike<void>
+          started(onTerm: () => PromiseLike<void>): PromiseLike<null>
         }) => Promise<Daemons<Manifest, any>>,
       ) => setupMain<Manifest, Store>(fn),
       /**
@@ -657,12 +657,12 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
         ) => InputSpec.of<Spec, Store>(spec),
       },
       Daemons: {
-        of(inputSpec: {
+        of(options: {
           effects: Effects
-          started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
+          started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>
           healthReceipts: HealthReceipt[]
         }) {
-          return Daemons.of<Manifest>(inputSpec)
+          return Daemons.of<Manifest>(options)
         },
       },
       List: {
diff --git a/sdk/package/lib/inits/setupInit.ts b/sdk/package/lib/inits/setupInit.ts
index c9ab4f171..af2503dad 100644
--- a/sdk/package/lib/inits/setupInit.ts
+++ b/sdk/package/lib/inits/setupInit.ts
@@ -12,7 +12,7 @@ export function setupInit<Manifest extends T.Manifest, Store>(
   install: Install<Manifest, Store>,
   uninstall: Uninstall<Manifest, Store>,
   setServiceInterfaces: UpdateServiceInterfaces<any>,
-  setDependencies: (options: { effects: T.Effects }) => Promise<void>,
+  setDependencies: (options: { effects: T.Effects }) => Promise<null>,
   actions: Actions<Store, any>,
   exposedStore: ExposedStorePaths,
 ): {
diff --git a/sdk/package/lib/inits/setupInstall.ts b/sdk/package/lib/inits/setupInstall.ts
index d9f694021..9b5e92afe 100644
--- a/sdk/package/lib/inits/setupInstall.ts
+++ b/sdk/package/lib/inits/setupInstall.ts
@@ -2,7 +2,7 @@ import * as T from "../../../base/lib/types"
 
 export type InstallFn<Manifest extends T.Manifest, Store> = (opts: {
   effects: T.Effects
-}) => Promise<void>
+}) => Promise<null>
 export class Install<Manifest extends T.Manifest, Store> {
   private constructor(readonly fn: InstallFn<Manifest, Store>) {}
   static of<Manifest extends T.Manifest, Store>(
diff --git a/sdk/package/lib/inits/setupUninstall.ts b/sdk/package/lib/inits/setupUninstall.ts
index c863e1ad7..c169457ec 100644
--- a/sdk/package/lib/inits/setupUninstall.ts
+++ b/sdk/package/lib/inits/setupUninstall.ts
@@ -2,7 +2,7 @@ import * as T from "../../../base/lib/types"
 
 export type UninstallFn<Manifest extends T.Manifest, Store> = (opts: {
   effects: T.Effects
-}) => Promise<void>
+}) => Promise<null>
 export class Uninstall<Manifest extends T.Manifest, Store> {
   private constructor(readonly fn: UninstallFn<Manifest, Store>) {}
   static of<Manifest extends T.Manifest, Store>(
diff --git a/sdk/package/lib/mainFn/CommandController.ts b/sdk/package/lib/mainFn/CommandController.ts
index 78d888b95..601b759e6 100644
--- a/sdk/package/lib/mainFn/CommandController.ts
+++ b/sdk/package/lib/mainFn/CommandController.ts
@@ -43,8 +43,8 @@ export class CommandController {
           | undefined
         cwd?: string | undefined
         user?: string | undefined
-        onStdout?: (x: Buffer) => void
-        onStderr?: (x: Buffer) => void
+        onStdout?: (x: Buffer) => null
+        onStderr?: (x: Buffer) => null
       },
     ) => {
       const commands = splitCommand(command)
diff --git a/sdk/package/lib/mainFn/Daemon.ts b/sdk/package/lib/mainFn/Daemon.ts
index 45f252dac..bde4654ee 100644
--- a/sdk/package/lib/mainFn/Daemon.ts
+++ b/sdk/package/lib/mainFn/Daemon.ts
@@ -37,8 +37,8 @@ export class Daemon {
           | undefined
         cwd?: string | undefined
         user?: string | undefined
-        onStdout?: (x: Buffer) => void
-        onStderr?: (x: Buffer) => void
+        onStdout?: (x: Buffer) => null
+        onStderr?: (x: Buffer) => null
         sigtermTimeout?: number
       },
     ) => {
diff --git a/sdk/package/lib/mainFn/Daemons.ts b/sdk/package/lib/mainFn/Daemons.ts
index 0e05214f7..4c2506d1d 100644
--- a/sdk/package/lib/mainFn/Daemons.ts
+++ b/sdk/package/lib/mainFn/Daemons.ts
@@ -74,7 +74,7 @@ export class Daemons<Manifest extends T.Manifest, Ids extends string>
 {
   private constructor(
     readonly effects: T.Effects,
-    readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>,
+    readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>,
     readonly daemons: Promise<Daemon>[],
     readonly ids: Ids[],
     readonly healthDaemons: HealthDaemon[],
@@ -86,17 +86,17 @@ export class Daemons<Manifest extends T.Manifest, Ids extends string>
    *
    * Daemons run in the order they are defined, with latter daemons being capable of
    * depending on prior daemons
-   * @param inputSpec
+   * @param options
    * @returns
    */
-  static of<Manifest extends T.Manifest>(inputSpec: {
+  static of<Manifest extends T.Manifest>(options: {
     effects: T.Effects
-    started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>
+    started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>
     healthReceipts: HealthReceipt[]
   }) {
     return new Daemons<Manifest, never>(
-      inputSpec.effects,
-      inputSpec.started,
+      options.effects,
+      options.started,
       [],
       [],
       [],
diff --git a/sdk/package/lib/mainFn/HealthDaemon.ts b/sdk/package/lib/mainFn/HealthDaemon.ts
index 71ba83b3f..b66e3e406 100644
--- a/sdk/package/lib/mainFn/HealthDaemon.ts
+++ b/sdk/package/lib/mainFn/HealthDaemon.ts
@@ -81,7 +81,7 @@ export class HealthDaemon {
     }
   }
 
-  private healthCheckCleanup: (() => void) | null = null
+  private healthCheckCleanup: (() => null) | null = null
   private turnOffHealthCheck() {
     this.healthCheckCleanup?.()
   }
@@ -125,6 +125,7 @@ export class HealthDaemon {
     this.healthCheckCleanup = () => {
       setStatus({ done: true })
       this.healthCheckCleanup = null
+      return null
     }
   }
 
diff --git a/sdk/package/lib/mainFn/index.ts b/sdk/package/lib/mainFn/index.ts
index ee0481630..f1373c44e 100644
--- a/sdk/package/lib/mainFn/index.ts
+++ b/sdk/package/lib/mainFn/index.ts
@@ -17,7 +17,7 @@ export const DEFAULT_SIGTERM_TIMEOUT = 30_000
 export const setupMain = <Manifest extends T.Manifest, Store>(
   fn: (o: {
     effects: T.Effects
-    started(onTerm: () => PromiseLike<void>): PromiseLike<void>
+    started(onTerm: () => PromiseLike<void>): PromiseLike<null>
   }) => Promise<Daemons<Manifest, any>>,
 ): T.ExpectedExports.main => {
   return async (options) => {
diff --git a/sdk/package/lib/util/SubContainer.ts b/sdk/package/lib/util/SubContainer.ts
index b6a7492a7..16476f564 100644
--- a/sdk/package/lib/util/SubContainer.ts
+++ b/sdk/package/lib/util/SubContainer.ts
@@ -27,7 +27,7 @@ const TIMES_TO_WAIT_FOR_PROC = 100
  * case where the subcontainer isn't owned by the process, the subcontainer shouldn't be destroyed.
  */
 export interface ExecSpawnable {
-  get destroy(): undefined | (() => Promise<void>)
+  get destroy(): undefined | (() => Promise<null>)
   exec(
     command: string[],
     options?: CommandOptions & ExecOptions,
@@ -47,7 +47,7 @@ export interface ExecSpawnable {
 export class SubContainer implements ExecSpawnable {
   private leader: cp.ChildProcess
   private leaderExited: boolean = false
-  private waitProc: () => Promise<void>
+  private waitProc: () => Promise<null>
   private constructor(
     readonly effects: T.Effects,
     readonly imageId: T.ImageId,
@@ -79,7 +79,7 @@ export class SubContainer implements ExecSpawnable {
             }
             await wait(1)
           }
-          resolve()
+          resolve(null)
         }),
     )
   }
@@ -180,12 +180,12 @@ export class SubContainer implements ExecSpawnable {
     if (this.leaderExited) {
       return
     }
-    return new Promise<void>((resolve, reject) => {
+    return new Promise<null>((resolve, reject) => {
       try {
         let timeout = setTimeout(() => this.leader.kill("SIGKILL"), 30000)
         this.leader.on("exit", () => {
           clearTimeout(timeout)
-          resolve()
+          resolve(null)
         })
         if (!this.leader.kill("SIGTERM")) {
           reject(new Error("kill(2) failed"))
@@ -201,6 +201,7 @@ export class SubContainer implements ExecSpawnable {
       const guid = this.guid
       await this.killLeader()
       await this.effects.subcontainer.destroyFs({ guid })
+      return null
     }
   }
 
@@ -245,16 +246,16 @@ export class SubContainer implements ExecSpawnable {
       options || {},
     )
     if (options?.input) {
-      await new Promise<void>((resolve, reject) =>
+      await new Promise<null>((resolve, reject) =>
         child.stdin.write(options.input, (e) => {
           if (e) {
             reject(e)
           } else {
-            resolve()
+            resolve(null)
           }
         }),
       )
-      await new Promise<void>((resolve) => child.stdin.end(resolve))
+      await new Promise<null>((resolve) => child.stdin.end(resolve))
     }
     const pid = child.pid
     const stdout = { data: "" as string | Buffer }
diff --git a/web/package-lock.json b/web/package-lock.json
index 2f05ddab3..1cc096b38 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -57,6 +57,7 @@
         "ng-qrcode": "^7.0.0",
         "node-jose": "^2.2.0",
         "patch-db-client": "file:../patch-db/client",
+        "path-browserify": "^1.0.1",
         "pbkdf2": "^3.1.2",
         "rxjs": "^7.8.1",
         "swiper": "^8.2.4",
@@ -123,13 +124,14 @@
         "@noble/hashes": "^1.4.0",
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
-        "mime": "^4.0.3",
+        "mime-types": "^2.1.35",
         "ts-matches": "^5.5.1",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
         "@types/jest": "^29.4.0",
         "@types/lodash.merge": "^4.6.2",
+        "@types/mime-types": "^2.1.4",
         "jest": "^29.4.3",
         "peggy": "^3.0.2",
         "prettier": "^3.2.5",
@@ -11731,7 +11733,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
       "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
diff --git a/web/package.json b/web/package.json
index c73d93859..5d241c2f3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -80,6 +80,7 @@
     "ng-qrcode": "^7.0.0",
     "node-jose": "^2.2.0",
     "patch-db-client": "file:../patch-db/client",
+    "path-browserify": "^1.0.1",
     "pbkdf2": "^3.1.2",
     "rxjs": "^7.8.1",
     "swiper": "^8.2.4",
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
index 6b72c38a8..c9ecc8ed5 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
@@ -11,10 +11,19 @@
   <ion-item-group *ngIf="pkg$ | async as pkg">
     <!-- ** standard actions ** -->
     <ion-item-divider>Standard Actions</ion-item-divider>
+    <app-actions-item
+      [action]="{
+        name: 'Rebuild Service',
+        description: 'Rebuilds the service container. It is harmless and only takes a few seconds to complete, but it should only be necessary if a StartOS bug is preventing dependencies, interfaces, or actions from synchronizing.',
+        visibility: 'enabled'
+      }"
+      icon="construct-outline"
+      (click)="rebuild(pkg.manifest.id)"
+    ></app-actions-item>
     <app-actions-item
       [action]="{
         name: 'Uninstall',
-        description: 'This will uninstall the service from StartOS and delete all data permanently.',
+        description: 'Uninstalls this service from StartOS and delete all data permanently.',
         visibility: 'enabled'
       }"
       icon="trash-outline"
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index f52cd604d..95be585ba 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -1,14 +1,12 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { AlertController, NavController } from '@ionic/angular'
-import { ErrorService, getPkgId, LoadingService } from '@start9labs/shared'
+import { getPkgId } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import { PatchDB } from 'patch-db-client'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ActionService } from 'src/app/services/action.service'
+import { StandardActionsService } from 'src/app/services/standard-actions.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
-import { getAllPackages, getManifest } from 'src/app/util/get-package-data'
-import { hasCurrentDeps } from 'src/app/util/has-deps'
+import { getManifest } from 'src/app/util/get-package-data'
 import { filter, map } from 'rxjs'
 
 @Component({
@@ -35,13 +33,9 @@ export class AppActionsPage {
 
   constructor(
     private readonly route: ActivatedRoute,
-    private readonly api: ApiService,
-    private readonly alertCtrl: AlertController,
-    private readonly errorService: ErrorService,
-    private readonly loader: LoadingService,
-    private readonly navCtrl: NavController,
     private readonly patch: PatchDB<DataModel>,
     private readonly actionService: ActionService,
+    private readonly standardActionsService: StandardActionsService,
   ) {}
 
   async handleAction(
@@ -55,51 +49,12 @@ export class AppActionsPage {
     )
   }
 
-  async tryUninstall(manifest: T.Manifest): Promise<void> {
-    let message =
-      manifest.alerts.uninstall ||
-      `Uninstalling ${manifest.title} will permanently delete its data`
-
-    if (hasCurrentDeps(this.pkgId, await getAllPackages(this.patch))) {
-      message = `${message}. Services that depend on ${manifest.title} will no longer work properly and may crash`
-    }
-
-    const alert = await this.alertCtrl.create({
-      header: 'Warning',
-      message,
-      buttons: [
-        {
-          text: 'Cancel',
-          role: 'cancel',
-        },
-        {
-          text: 'Uninstall',
-          handler: () => {
-            this.uninstall()
-          },
-          cssClass: 'enter-click',
-        },
-      ],
-      cssClass: 'alert-warning-message',
-    })
-
-    await alert.present()
+  async rebuild(id: string) {
+    return this.standardActionsService.rebuild(id)
   }
 
-  private async uninstall() {
-    const loader = this.loader.open(`Beginning uninstall...`).subscribe()
-
-    try {
-      await this.api.uninstallPackage({ id: this.pkgId })
-      this.api
-        .setDbValue<boolean>(['ackInstructions', this.pkgId], false)
-        .catch(e => console.error('Failed to mark instructions as unseen', e))
-      this.navCtrl.navigateRoot('/services')
-    } catch (e: any) {
-      this.errorService.handleError(e)
-    } finally {
-      loader.unsubscribe()
-    }
+  async tryUninstall(manifest: T.Manifest) {
+    return this.standardActionsService.tryUninstall(manifest)
   }
 }
 
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
index a3c6cc584..7d51a6fc8 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
@@ -18,6 +18,7 @@ import { AppShowDependenciesComponent } from './components/app-show-dependencies
 import { AppShowMenuComponent } from './components/app-show-menu/app-show-menu.component'
 import { AppShowHealthChecksComponent } from './components/app-show-health-checks/app-show-health-checks.component'
 import { AppShowAdditionalComponent } from './components/app-show-additional/app-show-additional.component'
+import { AppShowErrorComponent } from './components/app-show-error/app-show-error.component'
 import { HealthColorPipe } from './pipes/health-color.pipe'
 import { ToHealthChecksPipe } from './pipes/to-health-checks.pipe'
 import { ToButtonsPipe } from './pipes/to-buttons.pipe'
@@ -43,6 +44,7 @@ const routes: Routes = [
     AppShowMenuComponent,
     AppShowHealthChecksComponent,
     AppShowAdditionalComponent,
+    AppShowErrorComponent,
   ],
   imports: [
     CommonModule,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index 7ea0b86fd..ec59b1042 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -16,9 +16,9 @@
       <ion-item-group *ngIf="pkgPlus.status as status">
         <!-- ** status ** -->
         <app-show-status [pkg]="pkg" [status]="status"></app-show-status>
-        <!-- ** installed && !backingUp ** -->
+        <!-- ** installed && !backingUp && !error ** -->
         <ng-container
-          *ngIf="isInstalled(pkg) && status.primary !== 'backingUp'"
+          *ngIf="isInstalled(pkg) && status.primary !== 'backingUp' && status.primary !== 'error'"
         >
           <!-- ** health checks ** -->
           <app-show-health-checks
@@ -35,6 +35,11 @@
           <!-- ** additional ** -->
           <app-show-additional [pkg]="pkg"></app-show-additional>
         </ng-container>
+        <app-show-error
+          *ngIf="pkg.status.main === 'error'"
+          [manifest]="pkgPlus.manifest"
+          [error]="pkg.status"
+        ></app-show-error>
       </ion-item-group>
     </ng-template>
   </ion-content>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 1743a86ec..c1574e476 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -45,7 +45,7 @@ export interface DependencyInfo {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AppShowPage {
-  private readonly pkgId = getPkgId(this.route)
+  readonly pkgId = getPkgId(this.route)
 
   readonly pkgPlus$ = combineLatest([
     this.patch.watch$('packageData'),
@@ -58,9 +58,11 @@ export class AppShowPage {
     }),
     map(([allPkgs, depErrors]) => {
       const pkg = allPkgs[this.pkgId]
+      const manifest = getManifest(pkg)
       return {
         pkg,
-        dependencies: this.getDepInfo(pkg, allPkgs, depErrors),
+        manifest,
+        dependencies: this.getDepInfo(pkg, manifest, allPkgs, depErrors),
         status: renderPkgStatus(pkg, depErrors),
       }
     }),
@@ -84,11 +86,10 @@ export class AppShowPage {
 
   private getDepInfo(
     pkg: PackageDataEntry,
+    manifest: T.Manifest,
     allPkgs: AllPackageData,
     depErrors: PkgDependencyErrors,
   ): DependencyInfo[] {
-    const manifest = getManifest(pkg)
-
     return Object.keys(pkg.currentDependencies).map(id =>
       this.getDepValues(pkg, allPkgs, manifest, id, depErrors),
     )
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-error/app-show-error.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-error/app-show-error.component.html
new file mode 100644
index 000000000..c056f2977
--- /dev/null
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-error/app-show-error.component.html
@@ -0,0 +1,31 @@
+<ion-item-divider>Message</ion-item-divider>
+<div class="code-block ion-margin">
+  <code>
+    <ion-text color="warning">{{ error.message }}</ion-text>
+  </code>
+</div>
+
+<ion-item-divider>Actions</ion-item-divider>
+<div class="ion-margin">
+  <p>
+    <b>Rebuild Container</b>
+    is harmless action that and only takes a few seconds to complete. It will
+    likely resolve this issue.
+    <b>Uninstall Service</b>
+    is a dangerous action that will remove the service from StartOS and wipe all
+    its data.
+  </p>
+  <ion-button class="ion-margin-end" (click)="rebuild()">
+    Rebuild Container
+  </ion-button>
+  <ion-button (click)="tryUninstall()" color="danger">
+    Uninstall Service
+  </ion-button>
+</div>
+
+<ng-container *ngIf="error.debug">
+  <ion-item-divider>Full Stack Trace</ion-item-divider>
+  <div class="code-block ion-margin">
+    <code>{{ error.message }}</code>
+  </div>
+</ng-container>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-error/app-show-error.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-error/app-show-error.component.ts
new file mode 100644
index 000000000..ef689f178
--- /dev/null
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-error/app-show-error.component.ts
@@ -0,0 +1,45 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { ToastController } from '@ionic/angular'
+import { copyToClipboard } from '@start9labs/shared'
+import { T } from '@start9labs/start-sdk'
+import { StandardActionsService } from 'src/app/services/standard-actions.service'
+
+@Component({
+  selector: 'app-show-error',
+  templateUrl: 'app-show-error.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AppShowErrorComponent {
+  @Input()
+  manifest!: T.Manifest
+
+  @Input()
+  error!: T.MainStatus & { main: 'error' }
+
+  constructor(
+    private readonly toastCtrl: ToastController,
+    private readonly standardActionsService: StandardActionsService,
+  ) {}
+
+  async copy(text: string): Promise<void> {
+    const success = await copyToClipboard(text)
+    const message = success
+      ? 'Copied to clipboard!'
+      : 'Failed to copy to clipboard.'
+
+    const toast = await this.toastCtrl.create({
+      header: message,
+      position: 'bottom',
+      duration: 1000,
+    })
+    await toast.present()
+  }
+
+  async rebuild() {
+    return this.standardActionsService.rebuild(this.manifest.id)
+  }
+
+  async tryUninstall() {
+    return this.standardActionsService.tryUninstall(this.manifest)
+  }
+}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index 5dc5faf67..e31d4cd24 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -11,7 +11,14 @@
   </ion-label>
 </ion-item>
 
-<ng-container *ngIf="isInstalled(pkg) && (connection$ | async)">
+<ng-container
+  *ngIf="
+    isInstalled(pkg) &&
+    pkg.status.main !== 'backingUp' &&
+    pkg.status.main !== 'error' &&
+    (connection$ | async)
+  "
+>
   <ion-grid>
     <ion-row style="padding-left: 12px">
       <ion-col>
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index e428456f6..65997c49d 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -257,6 +257,9 @@ export module RR {
   export type StopPackageReq = { id: string } // package.stop
   export type StopPackageRes = null
 
+  export type RebuildPackageReq = { id: string } // package.rebuild
+  export type RebuildPackageRes = null
+
   export type UninstallPackageReq = { id: string } // package.uninstall
   export type UninstallPackageRes = null
 
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 1a5c1c57c..49571d97f 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -249,6 +249,10 @@ export abstract class ApiService {
 
   abstract stopPackage(params: RR.StopPackageReq): Promise<RR.StopPackageRes>
 
+  abstract rebuildPackage(
+    params: RR.RebuildPackageReq,
+  ): Promise<RR.RebuildPackageRes>
+
   abstract uninstallPackage(
     params: RR.UninstallPackageReq,
   ): Promise<RR.UninstallPackageRes>
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 742076ec8..73f3e67c6 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -498,6 +498,12 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'package.stop', params })
   }
 
+  async rebuildPackage(
+    params: RR.RebuildPackageReq,
+  ): Promise<RR.RebuildPackageRes> {
+    return this.rpcRequest({ method: 'package.rebuild', params })
+  }
+
   async uninstallPackage(
     params: RR.UninstallPackageReq,
   ): Promise<RR.UninstallPackageRes> {
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 6c55bb9db..c4834c99e 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -2,10 +2,12 @@ import { Injectable } from '@angular/core'
 import { Log, RPCErrorDetails, RPCOptions, pauseFor } from '@start9labs/shared'
 import { ApiService } from './embassy-api.service'
 import {
+  AddOperation,
   Operation,
   PatchOp,
   pathFromArray,
   RemoveOperation,
+  ReplaceOperation,
   Revision,
 } from 'patch-db-client'
 import {
@@ -636,14 +638,14 @@ export class MockApiService extends ApiService {
 
   async createBackup(params: RR.CreateBackupReq): Promise<RR.CreateBackupRes> {
     await pauseFor(2000)
-    const path = '/serverInfo/statusInfo/backupProgress'
+    const serverPath = '/serverInfo/statusInfo/backupProgress'
     const ids = params.packageIds
 
     setTimeout(async () => {
       for (let i = 0; i < ids.length; i++) {
         const id = ids[i]
-        const appPath = `/packageData/${id}/status/main/status`
-        const appPatch = [
+        const appPath = `/packageData/${id}/status/main/`
+        const appPatch: ReplaceOperation<T.MainStatus['main']>[] = [
           {
             op: PatchOp.REPLACE,
             path: appPath,
@@ -660,40 +662,43 @@ export class MockApiService extends ApiService {
             value: 'stopped',
           },
         ])
-        this.mockRevision([
+
+        const serverPatch: ReplaceOperation<T.BackupProgress['complete']>[] = [
           {
             op: PatchOp.REPLACE,
-            path: `${path}/${id}/complete`,
+            path: `${serverPath}/${id}/complete`,
             value: true,
           },
-        ])
+        ]
+        this.mockRevision(serverPatch)
       }
 
       await pauseFor(1000)
 
-      // set server back to running
-      const lastPatch = [
+      // remove backupProgress
+      const lastPatch: ReplaceOperation<T.ServerStatus['backupProgress']>[] = [
         {
           op: PatchOp.REPLACE,
-          path,
+          path: serverPath,
           value: null,
         },
       ]
       this.mockRevision(lastPatch)
     }, 500)
 
-    const originalPatch = [
-      {
-        op: PatchOp.REPLACE,
-        path,
-        value: ids.reduce((acc, val) => {
-          return {
-            ...acc,
-            [val]: { complete: false },
-          }
-        }, {}),
-      },
-    ]
+    const originalPatch: ReplaceOperation<T.ServerStatus['backupProgress']>[] =
+      [
+        {
+          op: PatchOp.REPLACE,
+          path: serverPath,
+          value: ids.reduce((acc, val) => {
+            return {
+              ...acc,
+              [val]: { complete: false },
+            }
+          }, {}),
+        },
+      ]
 
     this.mockRevision(originalPatch)
 
@@ -750,7 +755,7 @@ export class MockApiService extends ApiService {
       this.installProgress(params.id)
     }, 1000)
 
-    const patch: Operation<
+    const patch: AddOperation<
       PackageDataEntry<InstallingState | UpdatingState>
     >[] = [
       {
@@ -799,7 +804,7 @@ export class MockApiService extends ApiService {
     params: RR.RestorePackagesReq,
   ): Promise<RR.RestorePackagesRes> {
     await pauseFor(2000)
-    const patch: Operation<PackageDataEntry>[] = params.ids.map(id => {
+    const patch: AddOperation<PackageDataEntry>[] = params.ids.map(id => {
       setTimeout(async () => {
         this.installProgress(id)
       }, 2000)
@@ -826,76 +831,61 @@ export class MockApiService extends ApiService {
   }
 
   async startPackage(params: RR.StartPackageReq): Promise<RR.StartPackageRes> {
-    const path = `/packageData/${params.id}/status/main`
+    const path = `/packageData/${params.id}/status`
 
     await pauseFor(2000)
 
     setTimeout(async () => {
-      const patch2 = [
-        {
-          op: PatchOp.REPLACE,
-          path: path + '/status',
-          value: 'running',
-        },
-        {
-          op: PatchOp.REPLACE,
-          path: path + '/started',
-          value: new Date().toISOString(),
-        },
-      ]
-      this.mockRevision(patch2)
-
-      const patch3 = [
-        {
-          op: PatchOp.REPLACE,
-          path: path + '/health',
-          value: {
-            'ephemeral-health-check': {
-              result: 'starting',
-            },
-            'unnecessary-health-check': {
-              result: 'disabled',
-            },
-          },
-        },
-      ]
-      this.mockRevision(patch3)
-
-      await pauseFor(2000)
-
-      const patch4 = [
+      const patch2: ReplaceOperation<T.MainStatus & { main: 'running' }>[] = [
         {
           op: PatchOp.REPLACE,
-          path: path + '/health',
+          path,
           value: {
-            'ephemeral-health-check': {
-              result: 'starting',
-            },
-            'unnecessary-health-check': {
-              result: 'disabled',
-            },
-            'chain-state': {
-              result: 'loading',
-              message: 'Bitcoin is syncing from genesis',
-            },
-            'p2p-interface': {
-              result: 'success',
-            },
-            'rpc-interface': {
-              result: 'failure',
-              error: 'RPC interface unreachable.',
+            main: 'running',
+            started: new Date().toISOString(),
+            health: {
+              'ephemeral-health-check': {
+                name: 'Ephemeral Health Check',
+                result: 'starting',
+                message: null,
+              },
+              'unnecessary-health-check': {
+                name: 'Unnecessary Health Check',
+                result: 'disabled',
+                message: 'Custom disabled message',
+              },
+              'chain-state': {
+                name: 'Chain State',
+                result: 'loading',
+                message: 'Bitcoin is syncing from genesis',
+              },
+              'p2p-interface': {
+                name: 'P2P Interface',
+                result: 'success',
+                message: null,
+              },
+              'rpc-interface': {
+                name: 'RPC Interface',
+                result: 'failure',
+                message: 'Custom failure message',
+              },
             },
           },
         },
       ]
-      this.mockRevision(patch4)
+      this.mockRevision(patch2)
     }, 2000)
 
-    const originalPatch = [
+    const originalPatch: ReplaceOperation<
+      T.MainStatus & { main: 'starting' }
+    >[] = [
       {
         op: PatchOp.REPLACE,
-        path: path + '/status',
-        value: 'starting',
+        path,
+        value: {
+          main: 'starting',
+          health: {},
+        },
       },
     ]
 
@@ -907,74 +897,57 @@ export class MockApiService extends ApiService {
   async restartPackage(
     params: RR.RestartPackageReq,
   ): Promise<RR.RestartPackageRes> {
-    // first enact stop
     await pauseFor(2000)
-    const path = `/packageData/${params.id}/status/main`
+    const path = `/packageData/${params.id}/status`
 
     setTimeout(async () => {
-      const patch2: Operation<any>[] = [
+      const patch2: ReplaceOperation<T.MainStatus & { main: 'running' }>[] = [
         {
           op: PatchOp.REPLACE,
-          path: path + '/status',
-          value: 'starting',
-        },
-        {
-          op: PatchOp.ADD,
-          path: path + '/restarting',
-          value: true,
-        },
-      ]
-      this.mockRevision(patch2)
-
-      await pauseFor(2000)
-
-      const patch3: Operation<any>[] = [
-        {
-          op: PatchOp.REPLACE,
-          path: path + '/status',
-          value: 'running',
-        },
-        {
-          op: PatchOp.REMOVE,
-          path: path + '/restarting',
-        },
-        {
-          op: PatchOp.REPLACE,
-          path: path + '/health',
+          path,
           value: {
-            'ephemeral-health-check': {
-              result: 'starting',
-            },
-            'unnecessary-health-check': {
-              result: 'disabled',
-            },
-            'chain-state': {
-              result: 'loading',
-              message: 'Bitcoin is syncing from genesis',
-            },
-            'p2p-interface': {
-              result: 'success',
-            },
-            'rpc-interface': {
-              result: 'failure',
-              error: 'RPC interface unreachable.',
+            main: 'running',
+            started: new Date().toISOString(),
+            health: {
+              'ephemeral-health-check': {
+                name: 'Ephemeral Health Check',
+                result: 'starting',
+                message: null,
+              },
+              'unnecessary-health-check': {
+                name: 'Unnecessary Health Check',
+                result: 'disabled',
+                message: 'Custom disabled message',
+              },
+              'chain-state': {
+                name: 'Chain State',
+                result: 'loading',
+                message: 'Bitcoin is syncing from genesis',
+              },
+              'p2p-interface': {
+                name: 'P2P Interface',
+                result: 'success',
+                message: null,
+              },
+              'rpc-interface': {
+                name: 'RPC Interface',
+                result: 'failure',
+                message: 'Custom failure message',
+              },
             },
           },
-        } as any,
+        },
       ]
-      this.mockRevision(patch3)
+      this.mockRevision(patch2)
     }, this.revertTime)
 
-    const patch = [
-      {
-        op: PatchOp.REPLACE,
-        path: path + '/status',
-        value: 'restarting',
-      },
+    const patch: ReplaceOperation<T.MainStatus & { main: 'restarting' }>[] = [
       {
         op: PatchOp.REPLACE,
-        path: path + '/health',
-        value: {},
+        path,
+        value: {
+          main: 'restarting',
+        },
       },
     ]
 
@@ -985,29 +958,24 @@ export class MockApiService extends ApiService {
 
   async stopPackage(params: RR.StopPackageReq): Promise<RR.StopPackageRes> {
     await pauseFor(2000)
-    const path = `/packageData/${params.id}/status/main`
+    const path = `/packageData/${params.id}/status`
 
     setTimeout(() => {
-      const patch2 = [
+      const patch2: ReplaceOperation<T.MainStatus & { main: 'stopped' }>[] = [
         {
           op: PatchOp.REPLACE,
           path: path,
-          value: {
-            status: 'stopped',
-          },
+          value: { main: 'stopped' },
         },
       ]
       this.mockRevision(patch2)
     }, this.revertTime)
 
-    const patch = [
+    const patch: ReplaceOperation<T.MainStatus & { main: 'stopping' }>[] = [
       {
         op: PatchOp.REPLACE,
         path: path,
-        value: {
-          status: 'stopping',
-          timeout: '35s',
-        },
+        value: { main: 'stopping' },
       },
     ]
 
@@ -1016,6 +984,12 @@ export class MockApiService extends ApiService {
     return null
   }
 
+  async rebuildPackage(
+    params: RR.RebuildPackageReq,
+  ): Promise<RR.RebuildPackageRes> {
+    return this.restartPackage(params)
+  }
+
   async uninstallPackage(
     params: RR.UninstallPackageReq,
   ): Promise<RR.UninstallPackageRes> {
@@ -1031,7 +1005,7 @@ export class MockApiService extends ApiService {
       this.mockRevision(patch2)
     }, this.revertTime)
 
-    const patch = [
+    const patch: ReplaceOperation<T.PackageState['state']>[] = [
       {
         op: PatchOp.REPLACE,
         path: `/packageData/${params.id}/stateInfo/state`,
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index cdc8f7173..d89b5e87f 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -96,36 +96,14 @@ export const mockPatchData: DataModel = {
       icon: '/assets/img/service-icons/bitcoind.svg',
       lastBackup: null,
       status: {
-        main: 'running',
-        started: '2021-06-14T20:49:17.774Z',
-        health: {
-          'ephemeral-health-check': {
-            name: 'Ephemeral Health Check',
-            result: 'starting',
-            message: null,
-          },
-          'chain-state': {
-            name: 'Chain State',
-            result: 'loading',
-            message: 'Bitcoin is syncing from genesis',
-          },
-          'p2p-interface': {
-            name: 'P2P',
-            result: 'success',
-            message: 'Health check successful',
-          },
-          'rpc-interface': {
-            name: 'RPC',
-            result: 'failure',
-            message: 'RPC interface unreachable.',
-          },
-          'unnecessary-health-check': {
-            name: 'Unnecessary Health Check',
-            result: 'disabled',
-            message: null,
-          },
-        },
+        main: 'stopped',
       },
+      // status: {
+      //   main: 'error',
+      //   message: 'Bitcoin is erroring out',
+      //   debug: 'This is a complete stack trace for bitcoin',
+      //   onRebuild: 'start',
+      // },
       actions: {
         config: {
           name: 'Bitcoin Config',
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index f987f6b2c..3f2a7b917 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -80,6 +80,7 @@ export type PrimaryStatus =
   | 'stopped'
   | 'backingUp'
   | 'needsConfig'
+  | 'error'
 
 export type DependencyStatus = 'warning' | 'satisfied'
 
@@ -139,6 +140,11 @@ export const PrimaryRendering: Record<PrimaryStatus, StatusRendering> = {
     color: 'warning',
     showDots: false,
   },
+  error: {
+    display: 'Service Launch Error',
+    color: 'danger',
+    showDots: false,
+  },
 }
 
 export const DependencyRendering: Record<DependencyStatus, StatusRendering> = {
diff --git a/web/projects/ui/src/app/services/standard-actions.service.ts b/web/projects/ui/src/app/services/standard-actions.service.ts
new file mode 100644
index 000000000..664db822c
--- /dev/null
+++ b/web/projects/ui/src/app/services/standard-actions.service.ts
@@ -0,0 +1,85 @@
+import { Injectable } from '@angular/core'
+import { T } from '@start9labs/start-sdk'
+import { hasCurrentDeps } from '../util/has-deps'
+import { getAllPackages } from '../util/get-package-data'
+import { PatchDB } from 'patch-db-client'
+import { DataModel } from './patch-db/data-model'
+import { AlertController, NavController } from '@ionic/angular'
+import { ApiService } from './api/embassy-api.service'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class StandardActionsService {
+  constructor(
+    private readonly patch: PatchDB<DataModel>,
+    private readonly api: ApiService,
+    private readonly alertCtrl: AlertController,
+    private readonly errorService: ErrorService,
+    private readonly loader: LoadingService,
+    private readonly navCtrl: NavController,
+  ) {}
+
+  async rebuild(id: string) {
+    const loader = this.loader.open(`Rebuilding Container...`).subscribe()
+
+    try {
+      await this.api.rebuildPackage({ id })
+      this.navCtrl.navigateBack('/services/' + id)
+    } catch (e: any) {
+      this.errorService.handleError(e)
+    } finally {
+      loader.unsubscribe()
+    }
+  }
+
+  async tryUninstall(manifest: T.Manifest): Promise<void> {
+    const { id, title, alerts } = manifest
+
+    let message =
+      alerts.uninstall ||
+      `Uninstalling ${title} will permanently delete its data`
+
+    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
+      message = `${message}. Services that depend on ${title} will no longer work properly and may crash`
+    }
+
+    const alert = await this.alertCtrl.create({
+      header: 'Warning',
+      message,
+      buttons: [
+        {
+          text: 'Cancel',
+          role: 'cancel',
+        },
+        {
+          text: 'Uninstall',
+          handler: () => {
+            this.uninstall(id)
+          },
+          cssClass: 'enter-click',
+        },
+      ],
+      cssClass: 'alert-warning-message',
+    })
+
+    await alert.present()
+  }
+
+  private async uninstall(id: string) {
+    const loader = this.loader.open(`Beginning uninstall...`).subscribe()
+
+    try {
+      await this.api.uninstallPackage({ id })
+      this.api
+        .setDbValue<boolean>(['ackInstructions', id], false)
+        .catch(e => console.error('Failed to mark instructions as unseen', e))
+      this.navCtrl.navigateRoot('/services')
+    } catch (e: any) {
+      this.errorService.handleError(e)
+    } finally {
+      loader.unsubscribe()
+    }
+  }
+}
diff --git a/web/projects/ui/src/styles.scss b/web/projects/ui/src/styles.scss
index fa4a6598e..34c76848b 100644
--- a/web/projects/ui/src/styles.scss
+++ b/web/projects/ui/src/styles.scss
@@ -110,6 +110,12 @@ $subheader-height: 48px;
   }
 }
 
+.code-block {
+  background-color: rgb(69, 69, 69);
+  padding: 12px;
+  margin-bottom: 32px;
+}
+
 .center {
   display: block;
   margin: auto;
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 89f8e9548..6663ac431 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -22,7 +22,8 @@
     "paths": {
       /* These paths are relative to each app base folder */
       "@start9labs/marketplace": ["../marketplace/src/public-api"],
-      "@start9labs/shared": ["../shared/src/public-api"]
+      "@start9labs/shared": ["../shared/src/public-api"],
+      "path": ["../../node_modules/path-browserify"]
     },
     "typeRoots": ["node_modules/@types"],
     "types": ["node"]

From 51466891588af89e8ecc4c0c40f87e7adbfec711 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:38:28 -0600
Subject: [PATCH 290/341] v0.3.6-alpha.6 (#2748)

---
 core/Cargo.lock                                               | 2 +-
 core/startos/Cargo.toml                                       | 2 +-
 core/startos/src/version/mod.rs                               | 2 +-
 web/package-lock.json                                         | 4 ++--
 web/package.json                                              | 2 +-
 .../ui/src/app/modals/os-welcome/os-welcome.page.html         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index c7eccf706..e1c237917 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5041,7 +5041,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.5"
+version = "0.3.6-alpha.6"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 19d0df244..99384345d 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.5"
+version = "0.3.6-alpha.6"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 18ff0e5b2..1dc190d53 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -22,7 +22,7 @@ mod v0_3_6_alpha_5;
 mod v0_3_6_alpha_6;
 mod v0_3_6_alpha_7;
 
-pub type Current = v0_3_6_alpha_5::Version; // VERSION_BUMP
+pub type Current = v0_3_6_alpha_6::Version; // VERSION_BUMP
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
diff --git a/web/package-lock.json b/web/package-lock.json
index 1cc096b38..55925e77f 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.5",
+  "version": "0.3.6-alpha.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "startos-ui",
-      "version": "0.3.6-alpha.5",
+      "version": "0.3.6-alpha.6",
       "license": "MIT",
       "dependencies": {
         "@angular/animations": "^14.1.0",
diff --git a/web/package.json b/web/package.json
index 5d241c2f3..0de550c62 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.5",
+  "version": "0.3.6-alpha.6",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index a0f4f46db..2a43292ad 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,7 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6-alpha.5</h4>
+  <h4>0.3.6-alpha.6</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
   <h6>
     Expect that any data you create or store on this version of the OS can be

From 0c04802560f16c3b11b545f7f538c28e413870f1 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 1 Oct 2024 11:44:24 -0600
Subject: [PATCH 291/341] fix cors (#2749)

---
 core/startos/src/net/static_server.rs | 2 +-
 core/startos/src/registry/mod.rs      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index f1da91851..c070d7920 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -84,7 +84,7 @@ pub fn rpc_router<C: Context + Clone + AsRef<RpcContinuations>>(
     server: HttpServer<C>,
 ) -> Router {
     Router::new()
-        .route("/rpc/*path", post(server))
+        .route("/rpc/*path", any(server))
         .route(
             "/ws/rpc/:guid",
             get({
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index d34ebb841..529cb5082 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -98,11 +98,11 @@ pub fn registry_api<C: Context>() -> ParentHandler<C> {
 
 pub fn registry_router(ctx: RegistryContext) -> Router {
     use axum::extract as x;
-    use axum::routing::{any, get, post};
+    use axum::routing::{any, get};
     Router::new()
         .route("/rpc/*path", {
             let ctx = ctx.clone();
-            post(
+            any(
                 Server::new(move || ready(Ok(ctx.clone())), registry_api())
                     .middleware(Cors::new())
                     .middleware(Auth::new())

From 9fc082d1e62e875f9e1e92d9dd647d13a8c41e1d Mon Sep 17 00:00:00 2001
From: Dominion5254 <musashidisciple@proton.me>
Date: Wed, 16 Oct 2024 09:11:32 -0600
Subject: [PATCH 292/341] add with_about for CLI commands (#2741)

* add with_about for echo, server, and auth

* update for feedback

* finish (most) remaining command documentation

* update comments after additional clarification

* add expanded_api descriptions

* add comments for action_api

* add comments for remaining apis

* add comment for package-rebuild

* fix build errors

* missed one with_about

* add context to git-info subcommands

* remove context from git-info subcommands

* Make git-info from_fns generic over context

* make version::git_info generic over the context

* try removing generics from subcommand and version::git_info

* try adding a closure with context

* Updates for reviewer feedback
---
 core/Cargo.lock                               | 448 +++++++++---------
 core/startos/src/action.rs                    |   6 +-
 core/startos/src/auth.rs                      |  20 +-
 core/startos/src/backup/mod.rs                |   7 +-
 core/startos/src/backup/target/cifs.rs        |   3 +
 core/startos/src/backup/target/mod.rs         |  12 +-
 core/startos/src/db/mod.rs                    |  20 +-
 core/startos/src/diagnostic.rs                |  32 +-
 core/startos/src/disk/mod.rs                  |   5 +-
 core/startos/src/init.rs                      |  25 +-
 core/startos/src/lib.rs                       | 254 +++++++---
 core/startos/src/lxc/dev.rs                   |  13 +-
 core/startos/src/net/dhcp.rs                  |   1 +
 core/startos/src/net/mod.rs                   |  12 +-
 core/startos/src/net/tor.rs                   |   8 +-
 core/startos/src/net/wifi.rs                  |  16 +-
 core/startos/src/notifications.rs             |   4 +
 core/startos/src/os_install/mod.rs            |   5 +-
 core/startos/src/registry/admin.rs            |  19 +-
 core/startos/src/registry/db.rs               |  14 +-
 core/startos/src/registry/mod.rs              |  22 +-
 core/startos/src/registry/os/asset/get.rs     |  16 +-
 core/startos/src/registry/os/asset/mod.rs     |  19 +-
 core/startos/src/registry/os/mod.rs           |  12 +-
 core/startos/src/registry/os/version/mod.rs   |   8 +-
 .../startos/src/registry/os/version/signer.rs |   3 +
 core/startos/src/registry/package/mod.rs      |   9 +-
 core/startos/src/s9pk/rpc.rs                  |  49 +-
 core/startos/src/ssh.rs                       |   3 +
 core/startos/src/system.rs                    |   2 +
 core/startos/src/util/rpc.rs                  |   7 +-
 31 files changed, 738 insertions(+), 336 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index e1c237917..5f59c8bb4 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -23,6 +23,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "aes"
 version = "0.7.5"
@@ -156,15 +162,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -174,9 +180,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "ascii-canvas"
@@ -231,18 +237,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -268,9 +274,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77"
+checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070"
 dependencies = [
  "aws-lc-sys",
  "mirai-annotations",
@@ -280,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.20.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703"
+checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62"
 dependencies = [
  "bindgen",
  "cc",
@@ -301,7 +307,7 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
  "axum-core 0.3.4",
- "bitflags 1.3.2",
+ "bitflags 1.2.1",
  "bytes",
  "futures-util",
  "http 0.2.12",
@@ -441,7 +447,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
 ]
@@ -532,7 +538,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.74",
+ "syn 2.0.77",
  "which",
 ]
 
@@ -553,9 +559,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "bitflags"
@@ -603,18 +609,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "constant_time_eq",
 ]
 
 [[package]]
 name = "blake3"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "cc",
  "cfg-if",
  "constant_time_eq",
@@ -687,9 +693,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "cache-padded"
@@ -699,9 +705,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.1.12"
+version = "1.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7"
+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
 dependencies = [
  "jobserver",
  "libc",
@@ -812,9 +818,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.15"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -822,9 +828,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
  "anstream",
  "anstyle",
@@ -841,7 +847,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -989,9 +995,9 @@ dependencies = [
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "convert_case"
@@ -1054,9 +1060,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
 dependencies = [
  "libc",
 ]
@@ -1249,7 +1255,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1273,7 +1279,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1284,7 +1290,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1315,7 +1321,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1338,7 +1344,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1361,7 +1367,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1576,14 +1582,14 @@ dependencies = [
 
 [[package]]
 name = "enum-as-inner"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1670,9 +1676,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "fd-lock-rs"
@@ -1701,9 +1707,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "filetime"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1719,12 +1725,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.31"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -1862,7 +1868,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1975,7 +1981,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1984,9 +1990,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1994,7 +2000,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2254,7 +2260,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
  "http 1.1.0",
  "http-body 1.0.1",
  "httparse",
@@ -2268,15 +2274,15 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http 1.1.0",
  "hyper 1.4.1",
  "hyper-util",
- "rustls 0.23.12",
+ "rustls 0.23.13",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -2313,9 +2319,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2333,9 +2339,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2483,9 +2489,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -2536,9 +2542,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
 dependencies = [
  "serde",
 ]
@@ -2814,7 +2820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
 dependencies = [
  "arrayvec 0.5.2",
- "bitflags 1.3.2",
+ "bitflags 1.2.1",
  "cfg-if",
  "ryu",
  "static_assertions",
@@ -2822,9 +2828,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libloading"
@@ -2850,7 +2856,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.4",
 ]
 
 [[package]]
@@ -2949,9 +2955,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
 ]
@@ -2995,6 +3001,15 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
 version = "1.0.2"
@@ -3084,7 +3099,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 1.2.1",
  "cfg-if",
  "libc",
  "memoffset 0.6.5",
@@ -3096,7 +3111,7 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 1.2.1",
  "cfg-if",
  "libc",
  "memoffset 0.7.1",
@@ -3282,7 +3297,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3348,7 +3363,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3359,9 +3374,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.3.1+3.3.1"
+version = "300.3.2+3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
+checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b"
 dependencies = [
  "cc",
 ]
@@ -3447,7 +3462,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.4",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -3526,9 +3541,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.11"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
+checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
 dependencies = [
  "memchr",
  "thiserror",
@@ -3537,9 +3552,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.11"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
+checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3547,22 +3562,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.11"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
+checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.11"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
+checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
 dependencies = [
  "once_cell",
  "pest",
@@ -3576,7 +3591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
 ]
 
 [[package]]
@@ -3611,7 +3626,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3655,9 +3670,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce"
 
 [[package]]
 name = "powerfmt"
@@ -3682,12 +3697,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.20"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
 dependencies = [
  "proc-macro2",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3715,11 +3730,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit 0.22.21",
 ]
 
 [[package]]
@@ -3785,7 +3800,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3808,7 +3823,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3853,9 +3868,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -3983,32 +3998,23 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 1.2.1",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
 dependencies = [
  "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom 0.2.15",
  "libredox",
@@ -4061,9 +4067,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.12.5"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4072,7 +4078,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
@@ -4104,7 +4110,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "winreg",
+ "windows-registry",
 ]
 
 [[package]]
@@ -4158,7 +4164,7 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#60a974a29c5e6380f7bbfbc1b4716f6d2b20b189"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#39a872a1294c7d864faca63f072092ce300ffbe5"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -4239,18 +4245,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
  "bitflags 2.6.0",
  "errno 0.3.9",
@@ -4272,15 +4278,15 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
  "rustls-pki-types",
- "rustls-webpki 0.102.6",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
@@ -4322,9 +4328,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -4383,11 +4389,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4454,9 +4460,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.208"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
@@ -4480,22 +4486,22 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.208"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.125"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "itoa",
  "memchr",
  "ryu",
@@ -4543,7 +4549,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4560,7 +4566,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4569,7 +4575,7 @@ version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ce6afeda22f0b55dde2c34897bce76a629587348480384231205c14b59a01f"
 dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "itoa",
  "libyml",
  "log",
@@ -4761,9 +4767,9 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f"
+checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
 dependencies = [
  "nom 7.1.3",
  "unicode_categories",
@@ -4804,7 +4810,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "log",
  "memchr",
  "once_cell",
@@ -4993,7 +4999,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.74",
+ "syn 2.0.77",
  "unicode-width",
 ]
 
@@ -5086,7 +5092,7 @@ dependencies = [
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "indicatif",
  "integer-encoding",
  "ipnet",
@@ -5235,9 +5241,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.74"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5255,23 +5261,26 @@ name = "sync_wrapper"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "system-configuration"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5365,7 +5374,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5446,9 +5455,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.2"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5481,7 +5490,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5500,7 +5509,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.12",
+ "rustls 0.23.13",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5519,9 +5528,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5571,9 +5580,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -5603,7 +5612,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit 0.22.21",
 ]
 
 [[package]]
@@ -5621,7 +5630,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5630,22 +5639,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap 2.4.0",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
+version = "0.22.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
 dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5750,7 +5748,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5902,7 +5900,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
  "termcolor",
 ]
 
@@ -5973,7 +5971,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -6011,9 +6009,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-linebreak"
@@ -6023,24 +6021,24 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
@@ -6050,9 +6048,9 @@ checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "unicode_categories"
@@ -6201,7 +6199,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
  "wasm-bindgen-shared",
 ]
 
@@ -6235,7 +6233,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6289,11 +6287,11 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.4",
  "wasite",
 ]
 
@@ -6337,6 +6335,36 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -6503,16 +6531,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "wyz"
 version = "0.2.0"
@@ -6599,7 +6617,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -6619,7 +6637,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.74",
+ "syn 2.0.77",
 ]
 
 [[package]]
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index f7e17f564..a18173add 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -22,7 +22,8 @@ pub fn action_api<C: Context>() -> ParentHandler<C> {
             "get-input",
             from_fn_async(get_action_input)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>(),
+                .with_about("Get action input spec")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "run",
@@ -34,7 +35,8 @@ pub fn action_api<C: Context>() -> ParentHandler<C> {
                     }
                     Ok(())
                 })
-                .with_call_remote::<CliContext>(),
+                .with_about("Run service action")
+                .with_call_remote::<CliContext>()
         )
 }
 
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index 9a881d0e6..a6b624b70 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -91,28 +91,40 @@ pub fn auth<C: Context>() -> ParentHandler<C> {
                 .with_metadata("login", Value::Bool(true))
                 .no_cli(),
         )
-        .subcommand("login", from_fn_async(cli_login).no_display())
+        .subcommand(
+            "login",
+            from_fn_async(cli_login)
+                .no_display()
+                .with_about("Log in to StartOS server"),
+        )
         .subcommand(
             "logout",
             from_fn_async(logout)
                 .with_metadata("get_session", Value::Bool(true))
                 .no_display()
+                .with_about("Log out of StartOS server")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("session", session::<C>())
+        .subcommand(
+            "session",
+            session::<C>().with_about("List or kill StartOS sessions"),
+        )
         .subcommand(
             "reset-password",
             from_fn_async(reset_password_impl).no_cli(),
         )
         .subcommand(
             "reset-password",
-            from_fn_async(cli_reset_password).no_display(),
+            from_fn_async(cli_reset_password)
+                .no_display()
+                .with_about("Reset StartOS password"),
         )
         .subcommand(
             "get-pubkey",
             from_fn_async(get_pubkey)
                 .with_metadata("authenticated", Value::Bool(false))
                 .no_display()
+                .with_about("Get public key derived from server private key")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -290,12 +302,14 @@ pub fn session<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_sessions(handle.params, result))
                 })
+                .with_about("Display all server sessions")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "kill",
             from_fn_async(kill)
                 .no_display()
+                .with_about("Terminate existing server session(s)")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/backup/mod.rs b/core/startos/src/backup/mod.rs
index 8afafaa33..110a918b6 100644
--- a/core/startos/src/backup/mod.rs
+++ b/core/startos/src/backup/mod.rs
@@ -40,9 +40,13 @@ pub fn backup<C: Context>() -> ParentHandler<C> {
             "create",
             from_fn_async(backup_bulk::backup_all)
                 .no_display()
+                .with_about("Create backup for all packages")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("target", target::target::<C>())
+        .subcommand(
+            "target",
+            target::target::<C>().with_about("Commands related to a backup target"),
+        )
 }
 
 pub fn package_backup<C: Context>() -> ParentHandler<C> {
@@ -50,6 +54,7 @@ pub fn package_backup<C: Context>() -> ParentHandler<C> {
         "restore",
         from_fn_async(restore::restore_packages_rpc)
             .no_display()
+            .with_about("Restore package(s) from backup")
             .with_call_remote::<CliContext>(),
     )
 }
diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs
index e83f4e981..71cbe267e 100644
--- a/core/startos/src/backup/target/cifs.rs
+++ b/core/startos/src/backup/target/cifs.rs
@@ -52,18 +52,21 @@ pub fn cifs<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(add)
                 .no_display()
+                .with_about("Add a new backup target")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "update",
             from_fn_async(update)
                 .no_display()
+                .with_about("Update an existing backup target")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
+                .with_about("Remove an existing backup target")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs
index fcb291005..eb3fc29bc 100644
--- a/core/startos/src/backup/target/mod.rs
+++ b/core/startos/src/backup/target/mod.rs
@@ -141,11 +141,15 @@ impl FileSystem for BackupTargetFS {
 // #[command(subcommands(cifs::cifs, list, info, mount, umount))]
 pub fn target<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("cifs", cifs::cifs::<C>())
+        .subcommand(
+            "cifs",
+            cifs::cifs::<C>().with_about("Add, remove, or update a backup target"),
+        )
         .subcommand(
             "list",
             from_fn_async(list)
                 .with_display_serializable()
+                .with_about("List existing backup targets")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -155,16 +159,20 @@ pub fn target<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn::<CliContext, _>(|params, info| {
                     Ok(display_backup_info(params.params, info))
                 })
+                .with_about("Display package backup information")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "mount",
-            from_fn_async(mount).with_call_remote::<CliContext>(),
+            from_fn_async(mount)
+                .with_about("Mount backup target")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "umount",
             from_fn_async(umount)
                 .no_display()
+                .with_about("Unmount backup target")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index ff42d6a5c..1ed7e9ab9 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -31,7 +31,12 @@ lazy_static::lazy_static! {
 
 pub fn db<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("dump", from_fn_async(cli_dump).with_display_serializable())
+        .subcommand(
+            "dump",
+            from_fn_async(cli_dump)
+                .with_display_serializable()
+                .with_about("Filter/query db to display tables and records"),
+        )
         .subcommand("dump", from_fn_async(dump).no_cli())
         .subcommand(
             "subscribe",
@@ -39,8 +44,16 @@ pub fn db<C: Context>() -> ParentHandler<C> {
                 .with_metadata("get_session", Value::Bool(true))
                 .no_cli(),
         )
-        .subcommand("put", put::<C>())
-        .subcommand("apply", from_fn_async(cli_apply).no_display())
+        .subcommand(
+            "put",
+            put::<C>().with_about("Command for adding UI record to db"),
+        )
+        .subcommand(
+            "apply",
+            from_fn_async(cli_apply)
+                .no_display()
+                .with_about("Update a db record"),
+        )
         .subcommand("apply", from_fn_async(apply).no_cli())
 }
 
@@ -299,6 +312,7 @@ pub fn put<C: Context>() -> ParentHandler<C> {
         "ui",
         from_fn_async(ui)
             .with_display_serializable()
+            .with_about("Add path and value to db")
             .with_call_remote::<CliContext>(),
     )
 }
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index 5e99580e9..3eab3b16b 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -13,31 +13,48 @@ use crate::Error;
 
 pub fn diagnostic<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("error", from_fn(error).with_call_remote::<CliContext>())
-        .subcommand("logs", crate::system::logs::<DiagnosticContext>())
+        .subcommand(
+            "error",
+            from_fn(error)
+                .with_about("Display diagnostic error")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "logs",
+            crate::system::logs::<DiagnosticContext>().with_about("Display OS logs"),
+        )
         .subcommand(
             "logs",
-            from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>).no_display(),
+            from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>)
+                .no_display()
+                .with_about("Display OS logs"),
         )
         .subcommand(
             "kernel-logs",
-            crate::system::kernel_logs::<DiagnosticContext>(),
+            crate::system::kernel_logs::<DiagnosticContext>().with_about("Display kernel logs"),
         )
         .subcommand(
             "kernel-logs",
-            from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>).no_display(),
+            from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>)
+                .no_display()
+                .with_about("Display kernal logs"),
         )
         .subcommand(
             "restart",
             from_fn(restart)
                 .no_display()
+                .with_about("Restart the server")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("disk", disk::<C>())
+        .subcommand(
+            "disk",
+            disk::<C>().with_about("Command to remove disk from filesystem"),
+        )
         .subcommand(
             "rebuild",
             from_fn_async(rebuild)
                 .no_display()
+                .with_about("Teardown and rebuild service containers")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -72,7 +89,8 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
             CallRemoteHandler::<CliContext, _, _>::new(
                 from_fn_async(forget_disk::<RpcContext>).no_display(),
             )
-            .no_display(),
+            .no_display()
+            .with_about("Remove disk from filesystem"),
         )
 }
 
diff --git a/core/startos/src/disk/mod.rs b/core/startos/src/disk/mod.rs
index c0a701fc9..d1fbe282f 100644
--- a/core/startos/src/disk/mod.rs
+++ b/core/startos/src/disk/mod.rs
@@ -51,13 +51,16 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_disk_info(handle.params, result))
                 })
+                .with_about("List disk info")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand("repair", from_fn_async(|_: C| repair()).no_cli())
         .subcommand(
             "repair",
             CallRemoteHandler::<CliContext, _, _>::new(
-                from_fn_async(|_: RpcContext| repair()).no_display(),
+                from_fn_async(|_: RpcContext| repair())
+                    .no_display()
+                    .with_about("Repair disk in the event of corruption"),
             ),
         )
 }
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index e6b7be598..7ca4576b1 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -549,18 +549,33 @@ pub async fn init(
 
 pub fn init_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("logs", crate::system::logs::<InitContext>())
         .subcommand(
             "logs",
-            from_fn_async(crate::logs::cli_logs::<InitContext, Empty>).no_display(),
+            crate::system::logs::<InitContext>().with_about("Disply OS logs"),
+        )
+        .subcommand(
+            "logs",
+            from_fn_async(crate::logs::cli_logs::<InitContext, Empty>)
+                .no_display()
+                .with_about("Display OS logs"),
+        )
+        .subcommand(
+            "kernel-logs",
+            crate::system::kernel_logs::<InitContext>().with_about("Display kernel logs"),
         )
-        .subcommand("kernel-logs", crate::system::kernel_logs::<InitContext>())
         .subcommand(
             "kernel-logs",
-            from_fn_async(crate::logs::cli_logs::<InitContext, Empty>).no_display(),
+            from_fn_async(crate::logs::cli_logs::<InitContext, Empty>)
+                .no_display()
+                .with_about("Display kernel logs"),
         )
         .subcommand("subscribe", from_fn_async(init_progress).no_cli())
-        .subcommand("subscribe", from_fn_async(cli_init_progress).no_display())
+        .subcommand(
+            "subscribe",
+            from_fn_async(cli_init_progress)
+                .no_display()
+                .with_about("Get initialization progress"),
+        )
 }
 
 #[derive(Debug, Deserialize, Serialize, TS)]
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 997a7199f..754362bc9 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -114,29 +114,71 @@ impl std::fmt::Display for ApiState {
 
 pub fn main_api<C: Context>() -> ParentHandler<C> {
     let api = ParentHandler::new()
-        .subcommand::<C, _>("git-info", from_fn(version::git_info))
+        .subcommand(
+            "git-info",
+            from_fn(|_: RpcContext| version::git_info())
+                .with_about("Display the githash of StartOS CLI"),
+        )
         .subcommand(
             "echo",
             from_fn(echo::<RpcContext>)
                 .with_metadata("authenticated", Value::Bool(false))
+                .with_about("Echo a message")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "state",
             from_fn(|_: RpcContext| Ok::<_, Error>(ApiState::Running))
                 .with_metadata("authenticated", Value::Bool(false))
+                .with_about("Display the API that is currently serving")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("server", server::<C>())
-        .subcommand("package", package::<C>())
-        .subcommand("net", net::net::<C>())
-        .subcommand("auth", auth::auth::<C>())
-        .subcommand("db", db::db::<C>())
-        .subcommand("ssh", ssh::ssh::<C>())
-        .subcommand("wifi", net::wifi::wifi::<C>())
-        .subcommand("disk", disk::disk::<C>())
-        .subcommand("notification", notifications::notification::<C>())
-        .subcommand("backup", backup::backup::<C>())
+        .subcommand(
+            "server",
+            server::<C>()
+                .with_about("Commands related to the server i.e. restart, update, and shutdown"),
+        )
+        .subcommand(
+            "package",
+            package::<C>().with_about("Commands related to packages"),
+        )
+        .subcommand(
+            "net",
+            net::net::<C>().with_about("Network commands related to tor and dhcp"),
+        )
+        .subcommand(
+            "auth",
+            auth::auth::<C>().with_about(
+                "Commands related to Authentication i.e. login, logout, reset-password",
+            ),
+        )
+        .subcommand(
+            "db",
+            db::db::<C>().with_about("Commands to interact with the db i.e. dump, put, apply"),
+        )
+        .subcommand(
+            "ssh",
+            ssh::ssh::<C>()
+                .with_about("Commands for interacting with ssh keys i.e. add, delete, list"),
+        )
+        .subcommand(
+            "wifi",
+            net::wifi::wifi::<C>()
+                .with_about("Commands related to wifi networks i.e. add, connect, delete"),
+        )
+        .subcommand(
+            "disk",
+            disk::disk::<C>().with_about("Commands for listing disk info and repairing"),
+        )
+        .subcommand(
+            "notification",
+            notifications::notification::<C>().with_about("Create, delete, or list notifications"),
+        )
+        .subcommand(
+            "backup",
+            backup::backup::<C>()
+                .with_about("Commands related to backup creation and backup targets"),
+        )
         .subcommand(
             "registry",
             CallRemoteHandler::<RpcContext, _, _, RegistryUrlParams>::new(
@@ -144,10 +186,20 @@ pub fn main_api<C: Context>() -> ParentHandler<C> {
             )
             .no_cli(),
         )
-        .subcommand("s9pk", s9pk::rpc::s9pk())
-        .subcommand("util", util::rpc::util::<C>());
+        .subcommand(
+            "s9pk",
+            s9pk::rpc::s9pk().with_about("Commands for interacting with s9pk files"),
+        )
+        .subcommand(
+            "util",
+            util::rpc::util::<C>().with_about("Command for calculating the blake3 hash of a file"),
+        );
     #[cfg(feature = "dev")]
-    let api = api.subcommand("lxc", lxc::dev::lxc::<C>());
+    let api = api.subcommand(
+        "lxc",
+        lxc::dev::lxc::<C>()
+            .with_about("Commands related to lxc containers i.e. create, list, remove, connect"),
+    );
     api
 }
 
@@ -160,42 +212,57 @@ pub fn server<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(system::display_time(handle.params, result))
                 })
-                .with_call_remote::<CliContext>(),
+                .with_about("Display current time and server uptime")
+                .with_call_remote::<CliContext>()
+        )
+        .subcommand(
+            "experimental",
+            system::experimental::<C>()
+                .with_about("Commands related to configuring experimental options such as zram and cpu governor"),
         )
-        .subcommand("experimental", system::experimental::<C>())
-        .subcommand("logs", system::logs::<RpcContext>())
         .subcommand(
             "logs",
-            from_fn_async(logs::cli_logs::<RpcContext, Empty>).no_display(),
+            system::logs::<RpcContext>().with_about("Display OS logs"),
+        )
+        .subcommand(
+            "logs",
+            from_fn_async(logs::cli_logs::<RpcContext, Empty>).no_display().with_about("Display OS logs"),
         )
-        .subcommand("kernel-logs", system::kernel_logs::<RpcContext>())
         .subcommand(
             "kernel-logs",
-            from_fn_async(logs::cli_logs::<RpcContext, Empty>).no_display(),
+            system::kernel_logs::<RpcContext>().with_about("Display Kernel logs"),
+        )
+        .subcommand(
+            "kernel-logs",
+            from_fn_async(logs::cli_logs::<RpcContext, Empty>).no_display().with_about("Display Kernel logs"),
         )
         .subcommand(
             "metrics",
             from_fn_async(system::metrics)
                 .with_display_serializable()
-                .with_call_remote::<CliContext>(),
+                .with_about("Display information about the server i.e. temperature, RAM, CPU, and disk usage")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "shutdown",
             from_fn_async(shutdown::shutdown)
                 .no_display()
-                .with_call_remote::<CliContext>(),
+                .with_about("Shutdown the server")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "restart",
             from_fn_async(shutdown::restart)
                 .no_display()
-                .with_call_remote::<CliContext>(),
+                .with_about("Restart the server")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "rebuild",
             from_fn_async(shutdown::rebuild)
                 .no_display()
-                .with_call_remote::<CliContext>(),
+                .with_about("Teardown and rebuild service containers")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "update",
@@ -205,7 +272,7 @@ pub fn server<C: Context>() -> ParentHandler<C> {
         )
         .subcommand(
             "update",
-            from_fn_async(update::cli_update_system).no_display(),
+            from_fn_async(update::cli_update_system).no_display().with_about("Check a given registry for StartOS updates and update if available"),
         )
         .subcommand(
             "update-firmware",
@@ -220,25 +287,31 @@ pub fn server<C: Context>() -> ParentHandler<C> {
             .with_custom_display_fn(|_handle, result| {
                 Ok(firmware::display_firmware_update_result(result))
             })
-            .with_call_remote::<CliContext>(),
+            .with_about("Update the mainboard's firmware to the latest firmware available in this version of StartOS if available. Note: This command does not reach out to the Internet")
+            .with_call_remote::<CliContext>()
         )
         .subcommand(
             "set-smtp",
             from_fn_async(system::set_system_smtp)
                 .no_display()
-                .with_call_remote::<CliContext>(),
+                .with_about("Set system smtp server and credentials")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "clear-smtp",
             from_fn_async(system::clear_system_smtp)
                 .no_display()
-                .with_call_remote::<CliContext>(),
+                .with_about("Remove system smtp server and credentials")
+                .with_call_remote::<CliContext>()
         )
 }
 
 pub fn package<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("action", action::action_api::<C>())
+        .subcommand(
+            "action",
+            action::action_api::<C>().with_about("Commands to get action input or run an action"),
+        )
         .subcommand(
             "install",
             from_fn_async(install::install)
@@ -251,24 +324,32 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .with_metadata("get_session", Value::Bool(true))
                 .no_cli(),
         )
-        .subcommand("install", from_fn_async(install::cli_install).no_display())
+        .subcommand(
+            "install",
+            from_fn_async(install::cli_install)
+                .no_display()
+                .with_about("Install a package from a marketplace or via sideloading"),
+        )
         .subcommand(
             "uninstall",
             from_fn_async(install::uninstall)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
+                .with_about("Remove a package")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
             from_fn_async(install::list)
                 .with_display_serializable()
+                .with_about("List installed packages")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "installed-version",
             from_fn_async(install::installed_version)
                 .with_display_serializable()
+                .with_about("Display installed version for a PackageId")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -276,6 +357,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::start)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
+                .with_about("Start a package container")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -283,6 +365,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::stop)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
+                .with_about("Stop a package container")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -290,6 +373,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::restart)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
+                .with_about("Restart a package container")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -297,12 +381,19 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(service::rebuild)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
+                .with_about("Rebuild service container")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand("logs", logs::package_logs())
         .subcommand(
             "logs",
-            from_fn_async(logs::cli_logs::<RpcContext, logs::PackageIdParams>).no_display(),
+            logs::package_logs().with_about("Display package logs"),
+        )
+        .subcommand(
+            "logs",
+            from_fn_async(logs::cli_logs::<RpcContext, logs::PackageIdParams>)
+                .no_display()
+                .with_about("Display package logs"),
         )
         .subcommand(
             "properties",
@@ -310,13 +401,20 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|_handle, result| {
                     Ok(properties::display_properties(result))
                 })
+                .with_about("Display package Properties")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("backup", backup::package_backup::<C>())
+        .subcommand(
+            "backup",
+            backup::package_backup::<C>()
+                .with_about("Commands for restoring package(s) from backup"),
+        )
         .subcommand("connect", from_fn_async(service::connect_rpc).no_cli())
         .subcommand(
             "connect",
-            from_fn_async(service::connect_rpc_cli).no_display(),
+            from_fn_async(service::connect_rpc_cli)
+                .no_display()
+                .with_about("Connect to a LXC container"),
         )
         .subcommand(
             "attach",
@@ -329,74 +427,124 @@ pub fn package<C: Context>() -> ParentHandler<C> {
 
 pub fn diagnostic_api() -> ParentHandler<DiagnosticContext> {
     ParentHandler::new()
-        .subcommand::<DiagnosticContext, _>(
+        .subcommand(
             "git-info",
-            from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
+            from_fn(|_: DiagnosticContext| version::git_info())
+                .with_metadata("authenticated", Value::Bool(false))
+                .with_about("Display the githash of StartOS CLI"),
         )
         .subcommand(
             "echo",
-            from_fn(echo::<DiagnosticContext>).with_call_remote::<CliContext>(),
+            from_fn(echo::<DiagnosticContext>)
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "state",
             from_fn(|_: DiagnosticContext| Ok::<_, Error>(ApiState::Error))
                 .with_metadata("authenticated", Value::Bool(false))
+                .with_about("Display the API that is currently serving")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("diagnostic", diagnostic::diagnostic::<DiagnosticContext>())
+        .subcommand(
+            "diagnostic",
+            diagnostic::diagnostic::<DiagnosticContext>()
+                .with_about("Diagnostic commands i.e. logs, restart, rebuild"),
+        )
 }
 
 pub fn init_api() -> ParentHandler<InitContext> {
     ParentHandler::new()
-        .subcommand::<InitContext, _>(
+        .subcommand(
             "git-info",
-            from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
+            from_fn(|_: InitContext| version::git_info())
+                .with_metadata("authenticated", Value::Bool(false))
+                .with_about("Display the githash of StartOS CLI"),
         )
         .subcommand(
             "echo",
-            from_fn(echo::<InitContext>).with_call_remote::<CliContext>(),
+            from_fn(echo::<InitContext>)
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "state",
             from_fn(|_: InitContext| Ok::<_, Error>(ApiState::Initializing))
                 .with_metadata("authenticated", Value::Bool(false))
+                .with_about("Display the API that is currently serving")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("init", init::init_api::<InitContext>())
+        .subcommand(
+            "init",
+            init::init_api::<InitContext>()
+                .with_about("Commands to get logs or initialization progress"),
+        )
 }
 
 pub fn setup_api() -> ParentHandler<SetupContext> {
     ParentHandler::new()
-        .subcommand::<SetupContext, _>(
+        .subcommand(
             "git-info",
-            from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
+            from_fn(|_: SetupContext| version::git_info())
+                .with_metadata("authenticated", Value::Bool(false))
+                .with_about("Display the githash of StartOS CLI"),
         )
         .subcommand(
             "echo",
-            from_fn(echo::<SetupContext>).with_call_remote::<CliContext>(),
+            from_fn(echo::<SetupContext>)
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand("setup", setup::setup::<SetupContext>())
 }
 
 pub fn install_api() -> ParentHandler<InstallContext> {
     ParentHandler::new()
-        .subcommand::<InstallContext, _>(
+        .subcommand(
             "git-info",
-            from_fn(version::git_info).with_metadata("authenticated", Value::Bool(false)),
+            from_fn(|_: InstallContext| version::git_info())
+                .with_metadata("authenticated", Value::Bool(false))
+                .with_about("Display the githash of StartOS CLI"),
         )
         .subcommand(
             "echo",
-            from_fn(echo::<InstallContext>).with_call_remote::<CliContext>(),
+            from_fn(echo::<InstallContext>)
+                .with_about("Echo a message")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "install",
+            os_install::install::<InstallContext>()
+                .with_about("Commands to list disk info, install StartOS, and reboot"),
         )
-        .subcommand("install", os_install::install::<InstallContext>())
 }
 
 pub fn expanded_api() -> ParentHandler<CliContext> {
     main_api()
-        .subcommand("init", from_fn_blocking(developer::init).no_display())
-        .subcommand("pubkey", from_fn_blocking(developer::pubkey))
-        .subcommand("diagnostic", diagnostic::diagnostic::<CliContext>())
+        .subcommand(
+            "init",
+            from_fn_blocking(developer::init)
+                .no_display()
+                .with_about("Create developer key if it doesn't exist"),
+        )
+        .subcommand(
+            "pubkey",
+            from_fn_blocking(developer::pubkey)
+                .with_about("Get public key for developer private key"),
+        )
+        .subcommand(
+            "diagnostic",
+            diagnostic::diagnostic::<CliContext>()
+                .with_about("Commands to display logs, restart the server, etc"),
+        )
         .subcommand("setup", setup::setup::<CliContext>())
-        .subcommand("install", os_install::install::<CliContext>())
-        .subcommand("registry", registry::registry_api::<CliContext>())
+        .subcommand(
+            "install",
+            os_install::install::<CliContext>()
+                .with_about("Commands to list disk info, install StartOS, and reboot"),
+        )
+        .subcommand(
+            "registry",
+            registry::registry_api::<CliContext>().with_about("Commands related to the registry"),
+        )
 }
diff --git a/core/startos/src/lxc/dev.rs b/core/startos/src/lxc/dev.rs
index 61dd8e598..506cb2e9b 100644
--- a/core/startos/src/lxc/dev.rs
+++ b/core/startos/src/lxc/dev.rs
@@ -17,7 +17,9 @@ pub fn lxc<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "create",
-            from_fn_async(create).with_call_remote::<CliContext>(),
+            from_fn_async(create)
+                .with_about("Create lxc container")
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
@@ -31,16 +33,23 @@ pub fn lxc<C: Context>() -> ParentHandler<C> {
                     table.printstd();
                     Ok(())
                 })
+                .with_about("List lxc containers")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
+                .with_about("Remove lxc container")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand("connect", from_fn_async(connect_rpc).no_cli())
-        .subcommand("connect", from_fn_async(connect_rpc_cli).no_display())
+        .subcommand(
+            "connect",
+            from_fn_async(connect_rpc_cli)
+                .no_display()
+                .with_about("Connect to a lxc container"),
+        )
 }
 
 pub async fn create(ctx: RpcContext) -> Result<ContainerId, Error> {
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
index ffcb9774b..e323ba371 100644
--- a/core/startos/src/net/dhcp.rs
+++ b/core/startos/src/net/dhcp.rs
@@ -58,6 +58,7 @@ pub fn dhcp<C: Context>() -> ParentHandler<C> {
         "update",
         from_fn_async::<_, _, (), Error, (RpcContext, UpdateParams)>(update)
             .no_display()
+            .with_about("Update IP assigned by dhcp")
             .with_call_remote::<CliContext>(),
     )
 }
diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs
index e55da4206..2735454e7 100644
--- a/core/startos/src/net/mod.rs
+++ b/core/startos/src/net/mod.rs
@@ -1,4 +1,4 @@
-use rpc_toolkit::{Context, ParentHandler};
+use rpc_toolkit::{Context, HandlerExt, ParentHandler};
 
 pub mod dhcp;
 pub mod dns;
@@ -20,6 +20,12 @@ pub const PACKAGE_CERT_PATH: &str = "/var/lib/embassy/ssl";
 
 pub fn net<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("tor", tor::tor::<C>())
-        .subcommand("dhcp", dhcp::dhcp::<C>())
+        .subcommand(
+            "tor",
+            tor::tor::<C>().with_about("Tor commands such as list-services, logs, and reset"),
+        )
+        .subcommand(
+            "dhcp",
+            dhcp::dhcp::<C>().with_about("Command to update IP assigned from dhcp"),
+        )
 }
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index 16705776f..d93ce9302 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -91,17 +91,21 @@ pub fn tor<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_services(handle.params, result))
                 })
+                .with_about("Display Tor V3 Onion Addresses")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("logs", logs())
+        .subcommand("logs", logs().with_about("Display Tor logs"))
         .subcommand(
             "logs",
-            from_fn_async(crate::logs::cli_logs::<RpcContext, Empty>).no_display(),
+            from_fn_async(crate::logs::cli_logs::<RpcContext, Empty>)
+                .no_display()
+                .with_about("Display Tor logs"),
         )
         .subcommand(
             "reset",
             from_fn_async(reset)
                 .no_display()
+                .with_about("Reset Tor daemon")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index 298fad71f..056a403de 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -43,18 +43,21 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(add)
                 .no_display()
+                .with_about("Add wifi ssid and password")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "connect",
             from_fn_async(connect)
                 .no_display()
+                .with_about("Connect to wifi network")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
+                .with_about("Remove a wifi network")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -64,10 +67,17 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_wifi_info(handle.params, result))
                 })
+                .with_about("List wifi info")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("country", country::<C>())
-        .subcommand("available", available::<C>())
+        .subcommand(
+            "country",
+            country::<C>().with_about("Command to set country"),
+        )
+        .subcommand(
+            "available",
+            available::<C>().with_about("Command to list available wifi networks"),
+        )
 }
 
 pub fn available<C: Context>() -> ParentHandler<C> {
@@ -76,6 +86,7 @@ pub fn available<C: Context>() -> ParentHandler<C> {
         from_fn_async(get_available)
             .with_display_serializable()
             .with_custom_display_fn(|handle, result| Ok(display_wifi_list(handle.params, result)))
+            .with_about("List available wifi networks")
             .with_call_remote::<CliContext>(),
     )
 }
@@ -85,6 +96,7 @@ pub fn country<C: Context>() -> ParentHandler<C> {
         "set",
         from_fn_async(set_country)
             .no_display()
+            .with_about("Set Country")
             .with_call_remote::<CliContext>(),
     )
 }
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index c8e1725f4..aff69ab23 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -26,24 +26,28 @@ pub fn notification<C: Context>() -> ParentHandler<C> {
             "list",
             from_fn_async(list)
                 .with_display_serializable()
+                .with_about("List notifications")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
+                .with_about("Delete notification for a given id")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete-before",
             from_fn_async(delete_before)
                 .no_display()
+                .with_about("Delete notifications preceding a given id")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "create",
             from_fn_async(create)
                 .no_display()
+                .with_about("Persist a newly created notification")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 3d80f6cbd..46ed4ae8c 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -31,17 +31,19 @@ mod mbr;
 
 pub fn install<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("disk", disk::<C>())
+        .subcommand("disk", disk::<C>().with_about("Command to list disk info"))
         .subcommand(
             "execute",
             from_fn_async(execute::<InstallContext>)
                 .no_display()
+                .with_about("Install StartOS over existing version")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "reboot",
             from_fn_async(reboot)
                 .no_display()
+                .with_about("Restart the server")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -51,6 +53,7 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
         "list",
         from_fn_async(list)
             .no_display()
+            .with_about("List disk info")
             .with_call_remote::<CliContext>(),
     )
 }
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 8125580a4..a327a9587 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -18,14 +18,23 @@ use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 
 pub fn admin_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("signer", signers_api::<C>())
+        .subcommand(
+            "signer",
+            signers_api::<C>().with_about("Commands to add or list signers"),
+        )
         .subcommand("add", from_fn_async(add_admin).no_cli())
-        .subcommand("add", from_fn_async(cli_add_admin).no_display())
+        .subcommand(
+            "add",
+            from_fn_async(cli_add_admin)
+                .no_display()
+                .with_about("Add admin signer"),
+        )
         .subcommand(
             "list",
             from_fn_async(list_admins)
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
+                .with_about("List admin signers")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -38,6 +47,7 @@ fn signers_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("admin", Value::Bool(true))
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
+                .with_about("List signers")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -46,7 +56,10 @@ fn signers_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("admin", Value::Bool(true))
                 .no_cli(),
         )
-        .subcommand("add", from_fn_async(cli_add_signer))
+        .subcommand(
+            "add",
+            from_fn_async(cli_add_signer).with_about("Add signer"),
+        )
 }
 
 impl Model<BTreeMap<Guid, SignerInfo>> {
diff --git a/core/startos/src/registry/db.rs b/core/startos/src/registry/db.rs
index df39604f1..8de9f8743 100644
--- a/core/startos/src/registry/db.rs
+++ b/core/startos/src/registry/db.rs
@@ -18,14 +18,24 @@ use crate::util::serde::{apply_expr, HandlerExtSerde};
 
 pub fn db_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("dump", from_fn_async(cli_dump).with_display_serializable())
+        .subcommand(
+            "dump",
+            from_fn_async(cli_dump)
+                .with_display_serializable()
+                .with_about("Filter/query db to display tables and records"),
+        )
         .subcommand(
             "dump",
             from_fn_async(dump)
                 .with_metadata("admin", Value::Bool(true))
                 .no_cli(),
         )
-        .subcommand("apply", from_fn_async(cli_apply).no_display())
+        .subcommand(
+            "apply",
+            from_fn_async(cli_apply)
+                .no_display()
+                .with_about("Update a db record"),
+        )
         .subcommand(
             "apply",
             from_fn_async(apply)
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index 529cb5082..6a90ab640 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -82,18 +82,32 @@ pub fn registry_api<C: Context>() -> ParentHandler<C> {
             "index",
             from_fn_async(get_full_index)
                 .with_display_serializable()
+                .with_about("List info including registry name and packages")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "info",
             from_fn_async(get_info)
                 .with_display_serializable()
+                .with_about("Display registry name, icon, and package categories")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("os", os::os_api::<C>())
-        .subcommand("package", package::package_api::<C>())
-        .subcommand("admin", admin::admin_api::<C>())
-        .subcommand("db", db::db_api::<C>())
+        .subcommand(
+            "os",
+            os::os_api::<C>().with_about("Commands related to OS assets and versions"),
+        )
+        .subcommand(
+            "package",
+            package::package_api::<C>().with_about("Commands to index, add, or get packages"),
+        )
+        .subcommand(
+            "admin",
+            admin::admin_api::<C>().with_about("Commands to add or list admins or signers"),
+        )
+        .subcommand(
+            "db",
+            db::db_api::<C>().with_about("Commands to interact with the db i.e. dump and apply"),
+        )
 }
 
 pub fn registry_router(ctx: RegistryContext) -> Router {
diff --git a/core/startos/src/registry/os/asset/get.rs b/core/startos/src/registry/os/asset/get.rs
index ad0010dca..6c0479964 100644
--- a/core/startos/src/registry/os/asset/get.rs
+++ b/core/startos/src/registry/os/asset/get.rs
@@ -26,11 +26,21 @@ use crate::util::io::open_file;
 pub fn get_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand("iso", from_fn_async(get_iso).no_cli())
-        .subcommand("iso", from_fn_async(cli_get_os_asset).no_display())
+        .subcommand(
+            "iso",
+            from_fn_async(cli_get_os_asset)
+                .no_display()
+                .with_about("Download iso"),
+        )
         .subcommand("img", from_fn_async(get_img).no_cli())
-        .subcommand("img", from_fn_async(cli_get_os_asset).no_display())
+        .subcommand(
+            "img",
+            from_fn_async(cli_get_os_asset)
+                .no_display()
+                .with_about("Download img"),
+        )
         .subcommand("squashfs", from_fn_async(get_squashfs).no_cli())
-        .subcommand("squashfs", from_fn_async(cli_get_os_asset).no_display())
+        .subcommand("squashfs", from_fn_async(cli_get_os_asset).no_display().with_about("Download squashfs"))
 }
 
 #[derive(Debug, Deserialize, Serialize, TS)]
diff --git a/core/startos/src/registry/os/asset/mod.rs b/core/startos/src/registry/os/asset/mod.rs
index ec9d6cae7..52c12341a 100644
--- a/core/startos/src/registry/os/asset/mod.rs
+++ b/core/startos/src/registry/os/asset/mod.rs
@@ -7,8 +7,21 @@ pub mod sign;
 pub fn asset_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand("add", add::add_api::<C>())
-        .subcommand("add", from_fn_async(add::cli_add_asset).no_display())
+        .subcommand(
+            "add",
+            from_fn_async(add::cli_add_asset)
+                .no_display()
+                .with_about("Add asset to registry"),
+        )
         .subcommand("sign", sign::sign_api::<C>())
-        .subcommand("sign", from_fn_async(sign::cli_sign_asset).no_display())
-        .subcommand("get", get::get_api::<C>())
+        .subcommand(
+            "sign",
+            from_fn_async(sign::cli_sign_asset)
+                .no_display()
+                .with_about("Sign file and add to registry index"),
+        )
+        .subcommand(
+            "get",
+            get::get_api::<C>().with_about("Commands to download image, iso, or squashfs files"),
+        )
 }
diff --git a/core/startos/src/registry/os/mod.rs b/core/startos/src/registry/os/mod.rs
index 64ce44eaf..a1d18cb03 100644
--- a/core/startos/src/registry/os/mod.rs
+++ b/core/startos/src/registry/os/mod.rs
@@ -15,8 +15,16 @@ pub fn os_api<C: Context>() -> ParentHandler<C> {
             "index",
             from_fn_async(index::get_os_index)
                 .with_display_serializable()
+                .with_about("List index of OS versions")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("asset", asset::asset_api::<C>())
-        .subcommand("version", version::version_api::<C>())
+        .subcommand(
+            "asset",
+            asset::asset_api::<C>().with_about("Commands to add, sign, or get registry assets"),
+        )
+        .subcommand(
+            "version",
+            version::version_api::<C>()
+                .with_about("Commands to add, remove, or list versions or version signers"),
+        )
 }
diff --git a/core/startos/src/registry/os/version/mod.rs b/core/startos/src/registry/os/version/mod.rs
index 4c0568a80..8e4349ed9 100644
--- a/core/startos/src/registry/os/version/mod.rs
+++ b/core/startos/src/registry/os/version/mod.rs
@@ -26,6 +26,7 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("admin", Value::Bool(true))
                 .with_metadata("get_signer", Value::Bool(true))
                 .no_display()
+                .with_about("Add OS version")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -33,9 +34,13 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(remove_version)
                 .with_metadata("admin", Value::Bool(true))
                 .no_display()
+                .with_about("Remove OS version")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("signer", signer::signer_api::<C>())
+        .subcommand(
+            "signer",
+            signer::signer_api::<C>().with_about("Add, remove, and list version signers"),
+        )
         .subcommand(
             "get",
             from_fn_async(get_version)
@@ -43,6 +48,7 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_version_info(handle.params, result))
                 })
+                .with_about("Get OS versions and related version info")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/registry/os/version/signer.rs b/core/startos/src/registry/os/version/signer.rs
index 51f7c6719..c72bb5ef4 100644
--- a/core/startos/src/registry/os/version/signer.rs
+++ b/core/startos/src/registry/os/version/signer.rs
@@ -21,6 +21,7 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(add_version_signer)
                 .with_metadata("admin", Value::Bool(true))
                 .no_display()
+                .with_about("Add version signer")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -28,6 +29,7 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(remove_version_signer)
                 .with_metadata("admin", Value::Bool(true))
                 .no_display()
+                .with_about("Remove version signer")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -35,6 +37,7 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(list_version_signers)
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
+                .with_about("List version signers and related signer info")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/registry/package/mod.rs b/core/startos/src/registry/package/mod.rs
index cb2d317f9..ef312dc28 100644
--- a/core/startos/src/registry/package/mod.rs
+++ b/core/startos/src/registry/package/mod.rs
@@ -14,6 +14,7 @@ pub fn package_api<C: Context>() -> ParentHandler<C> {
             "index",
             from_fn_async(index::get_package_index)
                 .with_display_serializable()
+                .with_about("List packages and categories")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -22,7 +23,12 @@ pub fn package_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("get_signer", Value::Bool(true))
                 .no_cli(),
         )
-        .subcommand("add", from_fn_async(add::cli_add_package).no_display())
+        .subcommand(
+            "add",
+            from_fn_async(add::cli_add_package)
+                .no_display()
+                .with_about("Add package to registry index"),
+        )
         .subcommand(
             "get",
             from_fn_async(get::get_package)
@@ -31,6 +37,7 @@ pub fn package_api<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     get::display_package_info(handle.params, result)
                 })
+                .with_about("List installation candidate package(s)")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs
index 92f952077..98b46ac77 100644
--- a/core/startos/src/s9pk/rpc.rs
+++ b/core/startos/src/s9pk/rpc.rs
@@ -21,11 +21,16 @@ pub const SKIP_ENV: &[&str] = &["TERM", "container", "HOME", "HOSTNAME"];
 
 pub fn s9pk() -> ParentHandler<CliContext> {
     ParentHandler::new()
-        .subcommand("pack", from_fn_async(super::v2::pack::pack).no_display())
+        .subcommand(
+            "pack",
+            from_fn_async(super::v2::pack::pack)
+                .no_display()
+                .with_about("Package s9pk input files into valid s9pk"),
+        )
         .subcommand(
             "list-ingredients",
-            from_fn_async(super::v2::pack::list_ingredients).with_custom_display_fn(
-                |_, ingredients| {
+            from_fn_async(super::v2::pack::list_ingredients)
+                .with_custom_display_fn(|_, ingredients| {
                     ingredients
                         .into_iter()
                         .map(Some)
@@ -39,12 +44,23 @@ pub fn s9pk() -> ParentHandler<CliContext> {
                         });
                     println!();
                     Ok(())
-                },
-            ),
+                })
+                .with_about("List paths of package ingredients"),
+        )
+        .subcommand(
+            "edit",
+            edit().with_about("Commands to add an image to an s9pk or edit the manifest"),
+        )
+        .subcommand(
+            "inspect",
+            inspect().with_about("Commands to display file paths, file contents, or manifest"),
+        )
+        .subcommand(
+            "convert",
+            from_fn_async(convert)
+                .no_display()
+                .with_about("Convert s9pk from v1 to v2"),
         )
-        .subcommand("edit", edit())
-        .subcommand("inspect", inspect())
-        .subcommand("convert", from_fn_async(convert).no_display())
 }
 
 #[derive(Deserialize, Serialize, Parser)]
@@ -59,13 +75,15 @@ fn edit() -> ParentHandler<CliContext, S9pkPath> {
             "add-image",
             from_fn_async(add_image)
                 .with_inherited(only_parent)
-                .no_display(),
+                .no_display()
+                .with_about("Add image to s9pk"),
         )
         .subcommand(
             "manifest",
             from_fn_async(edit_manifest)
                 .with_inherited(only_parent)
-                .with_display_serializable(),
+                .with_display_serializable()
+                .with_about("Edit s9pk manifest"),
         )
 }
 
@@ -76,17 +94,22 @@ fn inspect() -> ParentHandler<CliContext, S9pkPath> {
             "file-tree",
             from_fn_async(file_tree)
                 .with_inherited(only_parent)
-                .with_display_serializable(),
+                .with_display_serializable()
+                .with_about("Display list of paths"),
         )
         .subcommand(
             "cat",
-            from_fn_async(cat).with_inherited(only_parent).no_display(),
+            from_fn_async(cat)
+                .with_inherited(only_parent)
+                .no_display()
+                .with_about("Display file contents"),
         )
         .subcommand(
             "manifest",
             from_fn_async(inspect_manifest)
                 .with_inherited(only_parent)
-                .with_display_serializable(),
+                .with_display_serializable()
+                .with_about("Display s9pk manifest"),
         )
 }
 
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index 728fd6480..99c2ae66c 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -86,12 +86,14 @@ pub fn ssh<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(add)
                 .no_display()
+                .with_about("Add ssh key")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "delete",
             from_fn_async(delete)
                 .no_display()
+                .with_about("Remove ssh key")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -101,6 +103,7 @@ pub fn ssh<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_all_ssh_keys(handle.params, result))
                 })
+                .with_about("List ssh keys")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index 7af94588b..e64f30e98 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -31,6 +31,7 @@ pub fn experimental<C: Context>() -> ParentHandler<C> {
             "zram",
             from_fn_async(zram)
                 .no_display()
+                .with_about("Enable zram")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -40,6 +41,7 @@ pub fn experimental<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     Ok(display_governor_info(handle.params, result))
                 })
+                .with_about("Show current and available CPU governors")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/startos/src/util/rpc.rs b/core/startos/src/util/rpc.rs
index 80d6d9251..b2dea340e 100644
--- a/core/startos/src/util/rpc.rs
+++ b/core/startos/src/util/rpc.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use clap::Parser;
-use rpc_toolkit::{from_fn_async, Context, ParentHandler};
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -16,7 +16,10 @@ use crate::util::{Apply, PathOrUrl};
 use crate::CAP_10_MiB;
 
 pub fn util<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new().subcommand("b3sum", from_fn_async(b3sum))
+    ParentHandler::new().subcommand(
+        "b3sum",
+        from_fn_async(b3sum).with_about("Calculate blake3 hash for a file"),
+    )
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]

From fb074c8c321bee7708b8ccfc2aa1984ce7779f40 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:09:30 -0600
Subject: [PATCH 293/341] 036 migration (#2750)

* chore: convert to use a value, cause why not

* wip: Add the up for this going up

* wip: trait changes

* wip: Add in some more of the private transformations

* chore(wip): Adding the ssh_keys todo

* wip: Add cifs

* fix migration structure

* chore: Fix the trait for the version

* wip(feat): Notifications are in the system

* fix marker trait hell

* handle key todos

* wip: Testing the migration in a system.

* fix pubkey parser

* fix: migration works

* wip: Trying to get the migration stuff?

* fix: Can now install the packages that we wanted, yay!"

* Merge branch 'next/minor' of github.com:Start9Labs/start-os into feat/migration

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/src/backup/backup_bulk.rs        |   4 +-
 core/startos/src/bins/container_cli.rs        |   2 +-
 core/startos/src/bins/start_cli.rs            |   2 +-
 core/startos/src/context/rpc.rs               |   2 +
 core/startos/src/db/model/private.rs          |   2 +-
 core/startos/src/db/model/public.rs           |  11 +-
 core/startos/src/init.rs                      |   6 +-
 core/startos/src/notifications.rs             |  14 +-
 core/startos/src/os_install/mod.rs            |  17 -
 core/startos/src/registry/device_info.rs      |   4 +-
 core/startos/src/s9pk/v2/manifest.rs          |   2 +-
 core/startos/src/service/mod.rs               |   3 +
 core/startos/src/service/service_map.rs       |   1 -
 core/startos/src/ssh.rs                       |   8 +-
 core/startos/src/version/mod.rs               | 488 ++++++++++-----
 core/startos/src/version/v0_3_5.rs            |  19 +-
 core/startos/src/version/v0_3_5_1.rs          |  17 +-
 core/startos/src/version/v0_3_5_2.rs          |  17 +-
 core/startos/src/version/v0_3_6_alpha_0.rs    | 569 +++++++++++++++++-
 core/startos/src/version/v0_3_6_alpha_1.rs    |  17 +-
 core/startos/src/version/v0_3_6_alpha_2.rs    |  17 +-
 core/startos/src/version/v0_3_6_alpha_3.rs    |  17 +-
 core/startos/src/version/v0_3_6_alpha_4.rs    |  17 +-
 core/startos/src/version/v0_3_6_alpha_5.rs    |  17 +-
 core/startos/src/version/v0_3_6_alpha_6.rs    |  17 +-
 core/startos/src/version/v0_3_6_alpha_7.rs    |  35 --
 sdk/base/lib/osBindings/ServerInfo.ts         |   3 +-
 web/patchdb-ui-seed.json                      |   2 +-
 .../server-routes/sideload/sideload.page.ts   |   3 +-
 .../ui/src/app/services/api/mock-patch.ts     |   3 +-
 30 files changed, 1011 insertions(+), 325 deletions(-)
 delete mode 100644 core/startos/src/version/v0_3_6_alpha_7.rs

diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs
index 5defebe5d..136595b67 100644
--- a/core/startos/src/backup/backup_bulk.rs
+++ b/core/startos/src/backup/backup_bulk.rs
@@ -332,10 +332,10 @@ async fn perform_backup(
 
     let timestamp = Utc::now();
 
-    backup_guard.unencrypted_metadata.version = crate::version::Current::new().semver().into();
+    backup_guard.unencrypted_metadata.version = crate::version::Current::default().semver().into();
     backup_guard.unencrypted_metadata.hostname = ctx.account.read().await.hostname.clone();
     backup_guard.unencrypted_metadata.timestamp = timestamp.clone();
-    backup_guard.metadata.version = crate::version::Current::new().semver().into();
+    backup_guard.metadata.version = crate::version::Current::default().semver().into();
     backup_guard.metadata.timestamp = Some(timestamp);
     backup_guard.metadata.package_backups = package_backups;
 
diff --git a/core/startos/src/bins/container_cli.rs b/core/startos/src/bins/container_cli.rs
index db7cbd36a..b0da1cb00 100644
--- a/core/startos/src/bins/container_cli.rs
+++ b/core/startos/src/bins/container_cli.rs
@@ -8,7 +8,7 @@ use crate::util::logger::EmbassyLogger;
 use crate::version::{Current, VersionT};
 
 lazy_static::lazy_static! {
-    static ref VERSION_STRING: String = Current::new().semver().to_string();
+    static ref VERSION_STRING: String = Current::default().semver().to_string();
 }
 
 pub fn main(args: impl IntoIterator<Item = OsString>) {
diff --git a/core/startos/src/bins/start_cli.rs b/core/startos/src/bins/start_cli.rs
index 17cc095a3..2e92e0cc0 100644
--- a/core/startos/src/bins/start_cli.rs
+++ b/core/startos/src/bins/start_cli.rs
@@ -9,7 +9,7 @@ use crate::util::logger::EmbassyLogger;
 use crate::version::{Current, VersionT};
 
 lazy_static::lazy_static! {
-    static ref VERSION_STRING: String = Current::new().semver().to_string();
+    static ref VERSION_STRING: String = Current::default().semver().to_string();
 }
 
 pub fn main(args: impl IntoIterator<Item = OsString>) {
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 6ada12301..cb5ce83c5 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -88,6 +88,7 @@ pub struct InitRpcContextPhases {
     init_net_ctrl: PhaseProgressTrackerHandle,
     read_device_info: PhaseProgressTrackerHandle,
     cleanup_init: CleanupInitPhases,
+    // TODO: migrations
 }
 impl InitRpcContextPhases {
     pub fn new(handle: &FullProgressTracker) -> Self {
@@ -286,6 +287,7 @@ impl RpcContext {
         let res = Self(seed.clone());
         res.cleanup_and_initialize(cleanup_init).await?;
         tracing::info!("Cleaned up transient states");
+        crate::version::post_init(&res).await?;
         Ok(res)
     }
 
diff --git a/core/startos/src/db/model/private.rs b/core/startos/src/db/model/private.rs
index c57364fc3..2675b36d0 100644
--- a/core/startos/src/db/model/private.rs
+++ b/core/startos/src/db/model/private.rs
@@ -31,6 +31,6 @@ pub struct Private {
     pub package_stores: BTreeMap<PackageId, Value>,
 }
 
-fn generate_compat_key() -> Pem<ed25519_dalek::SigningKey> {
+pub fn generate_compat_key() -> Pem<ed25519_dalek::SigningKey> {
     Pem(ed25519_dalek::SigningKey::generate(&mut rand::thread_rng()))
 }
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index b20693a90..7e5e96cde 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -43,10 +43,11 @@ impl Public {
                 arch: get_arch(),
                 platform: get_platform(),
                 id: account.server_id.clone(),
-                version: Current::new().semver(),
+                version: Current::default().semver(),
                 hostname: account.hostname.no_dot_host_name(),
                 last_backup: None,
-                eos_version_compat: Current::new().compat().clone(),
+                version_compat: Current::default().compat().clone(),
+                post_init_migration_todos: BTreeSet::new(),
                 lan_address,
                 onion_address: account.tor_key.public().get_onion_address(),
                 tor_address: format!("https://{}", account.tor_key.public().get_onion_address())
@@ -112,11 +113,13 @@ pub struct ServerInfo {
     pub hostname: InternedString,
     #[ts(type = "string")]
     pub version: Version,
+    #[ts(type = "string")]
+    pub version_compat: VersionRange,
+    #[ts(type = "string[]")]
+    pub post_init_migration_todos: BTreeSet<Version>,
     #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
     #[ts(type = "string")]
-    pub eos_version_compat: VersionRange,
-    #[ts(type = "string")]
     pub lan_address: Url,
     #[ts(type = "string")]
     pub onion_address: OnionAddressV3,
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 7ca4576b1..206f1c8e0 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -323,7 +323,9 @@ pub async fn init(
     local_auth.complete();
 
     load_database.start();
-    let db = TypedPatchDb::<Database>::load_unchecked(cfg.db().await?);
+    let db = cfg.db().await?;
+    crate::version::Current::default().pre_init(&db).await?;
+    let db = TypedPatchDb::<Database>::load_unchecked(db);
     let peek = db.peek().await;
     load_database.complete();
     tracing::info!("Opened PatchDB");
@@ -528,8 +530,6 @@ pub async fn init(
         .await?;
     launch_service_network.complete();
 
-    crate::version::init(&db, run_migrations).await?;
-
     validate_db.start();
     db.mutate(|d| {
         let model = d.de()?;
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index aff69ab23..b310220b5 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -256,13 +256,13 @@ impl Map for Notifications {
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Notification {
-    package_id: Option<PackageId>,
-    created_at: DateTime<Utc>,
-    code: u32,
-    level: NotificationLevel,
-    title: String,
-    message: String,
-    data: Value,
+    pub package_id: Option<PackageId>,
+    pub created_at: DateTime<Utc>,
+    pub code: u32,
+    pub level: NotificationLevel,
+    pub title: String,
+    pub message: String,
+    pub data: Value,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index 46ed4ae8c..a87a71209 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -150,23 +150,6 @@ pub async fn execute<C: Context>(
 
     overwrite |= disk.guid.is_none() && disk.partitions.iter().all(|p| p.guid.is_none());
 
-    if !overwrite
-        && (disk
-            .guid
-            .as_ref()
-            .map_or(false, |g| g.starts_with("EMBASSY_"))
-            || disk
-                .partitions
-                .iter()
-                .flat_map(|p| p.guid.as_ref())
-                .any(|g| g.starts_with("EMBASSY_")))
-    {
-        return Err(Error::new(
-            eyre!("installing over versions before 0.3.6 is unsupported"),
-            ErrorKind::InvalidRequest,
-        ));
-    }
-
     let part_info = partition(&mut disk, overwrite).await?;
 
     if let Some(efi) = &part_info.efi {
diff --git a/core/startos/src/registry/device_info.rs b/core/startos/src/registry/device_info.rs
index 172348a10..04a38a223 100644
--- a/core/startos/src/registry/device_info.rs
+++ b/core/startos/src/registry/device_info.rs
@@ -108,8 +108,8 @@ pub struct OsInfo {
 impl From<&RpcContext> for OsInfo {
     fn from(_: &RpcContext) -> Self {
         Self {
-            version: crate::version::Current::new().semver(),
-            compat: crate::version::Current::new().compat().clone(),
+            version: crate::version::Current::default().semver(),
+            compat: crate::version::Current::default().compat().clone(),
             platform: InternedString::intern(&*crate::PLATFORM),
         }
     }
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index f8102c736..9b9455999 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -22,7 +22,7 @@ use crate::util::VersionString;
 use crate::version::{Current, VersionT};
 
 fn current_version() -> Version {
-    Current::new().semver()
+    Current::default().semver()
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS)]
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 37579c03b..d7b91df7b 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -408,6 +408,7 @@ impl Service {
         let developer_key = s9pk.as_archive().signer();
         let icon = s9pk.icon_data_url().await?;
         let service = Self::new(ctx.clone(), s9pk, StartStop::Stop).await?;
+
         if let Some(recovery_source) = recovery_source {
             service
                 .actor
@@ -429,6 +430,7 @@ impl Service {
                     .clone(),
             );
         }
+
         let procedure_id = Guid::new();
         service
             .seed
@@ -441,6 +443,7 @@ impl Service {
             ) // TODO timeout
             .await
             .with_kind(ErrorKind::MigrationFailed)?; // TODO: handle cancellation
+
         if let Some(mut progress) = progress {
             progress.finalization_progress.complete();
             progress.progress.complete();
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 68a5f2a5f..0faab8dd5 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -307,7 +307,6 @@ impl ServiceMap {
                     sync_progress_task.await.map_err(|_| {
                         Error::new(eyre!("progress sync task panicked"), ErrorKind::Unknown)
                     })??;
-
                     Ok(())
                 })
                 .boxed())
diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs
index 99c2ae66c..afc5a5bf1 100644
--- a/core/startos/src/ssh.rs
+++ b/core/startos/src/ssh.rs
@@ -25,6 +25,12 @@ impl SshKeys {
         Self(BTreeMap::new())
     }
 }
+
+impl From<BTreeMap<InternedString, WithTimeData<SshPubKey>>> for SshKeys {
+    fn from(map: BTreeMap<InternedString, WithTimeData<SshPubKey>>) -> Self {
+        Self(map)
+    }
+}
 impl Map for SshKeys {
     type Key = InternedString;
     type Value = WithTimeData<SshPubKey>;
@@ -41,7 +47,7 @@ impl Map for SshKeys {
 pub struct SshPubKey(
     #[serde(serialize_with = "crate::util::serde::serialize_display")]
     #[serde(deserialize_with = "crate::util::serde::deserialize_from_str")]
-    openssh_keys::PublicKey,
+    pub openssh_keys::PublicKey,
 );
 impl ValueParserFactory for SshPubKey {
     type Parser = FromStrParser<Self>;
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 1dc190d53..76cc7a574 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -1,10 +1,15 @@
+use std::any::Any;
 use std::cmp::Ordering;
+use std::panic::{RefUnwindSafe, UnwindSafe};
 
 use color_eyre::eyre::eyre;
 use futures::future::BoxFuture;
 use futures::{Future, FutureExt};
-use imbl_value::InternedString;
+use imbl::Vector;
+use imbl_value::{to_value, InternedString};
+use patch_db::json_ptr::{JsonPointer, ROOT};
 
+use crate::context::RpcContext;
 use crate::db::model::Database;
 use crate::prelude::*;
 use crate::progress::PhaseProgressTrackerHandle;
@@ -20,10 +25,68 @@ mod v0_3_6_alpha_3;
 mod v0_3_6_alpha_4;
 mod v0_3_6_alpha_5;
 mod v0_3_6_alpha_6;
-mod v0_3_6_alpha_7;
 
 pub type Current = v0_3_6_alpha_6::Version; // VERSION_BUMP
 
+impl Current {
+    #[instrument(skip(self, db))]
+    pub async fn pre_init(self, db: &PatchDb) -> Result<(), Error> {
+        let from = from_value::<Version>(
+            version_accessor(&mut db.dump(&ROOT).await.value)
+                .or_not_found("`version` in db")?
+                .clone(),
+        )?
+        .as_version_t()?;
+        match from.semver().cmp(&self.semver()) {
+            Ordering::Greater => {
+                db.apply_function(|mut db| {
+                    rollback_to_unchecked(&from, &self, &mut db)?;
+                    Ok::<_, Error>((db, ()))
+                })
+                .await?;
+            }
+            Ordering::Less => {
+                let pre_ups = PreUps::load(&from, &self).await?;
+                db.apply_function(|mut db| {
+                    migrate_from_unchecked(&from, &self, pre_ups, &mut db)?;
+                    Ok::<_, Error>((db, ()))
+                })
+                .await?;
+            }
+            Ordering::Equal => (),
+        }
+        Ok(())
+    }
+}
+
+pub async fn post_init(ctx: &RpcContext) -> Result<(), Error> {
+    let mut peek;
+    while let Some(version) = {
+        peek = ctx.db.peek().await;
+        peek.as_public()
+            .as_server_info()
+            .as_post_init_migration_todos()
+            .de()?
+            .first()
+            .cloned()
+            .map(Version::from_exver_version)
+            .as_ref()
+            .map(Version::as_version_t)
+            .transpose()?
+    } {
+        version.0.post_up(ctx).await?;
+        ctx.db
+            .mutate(|db| {
+                db.as_public_mut()
+                    .as_server_info_mut()
+                    .as_post_init_migration_todos_mut()
+                    .mutate(|m| Ok(m.remove(&version.0.semver())))
+            })
+            .await?;
+    }
+    Ok(())
+}
+
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
 #[allow(non_camel_case_types)]
@@ -39,7 +102,6 @@ enum Version {
     V0_3_6_alpha_4(Wrapper<v0_3_6_alpha_4::Version>),
     V0_3_6_alpha_5(Wrapper<v0_3_6_alpha_5::Version>),
     V0_3_6_alpha_6(Wrapper<v0_3_6_alpha_6::Version>),
-    V0_3_6_alpha_7(Wrapper<v0_3_6_alpha_7::Version>),
     Other(exver::Version),
 }
 
@@ -52,6 +114,32 @@ impl Version {
                 Version::Other(version)
             })
     }
+    fn as_version_t(&self) -> Result<DynVersion, Error> {
+        Ok(match self {
+            Self::LT0_3_5(_) => {
+                return Err(Error::new(
+                    eyre!("cannot migrate from versions before 0.3.5"),
+                    ErrorKind::MigrationFailed,
+                ))
+            }
+            Self::V0_3_5(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_5_1(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_5_2(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_0(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_1(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_2(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_3(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_4(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_5(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_6(v) => DynVersion(Box::new(v.0)),
+            Self::Other(v) => {
+                return Err(Error::new(
+                    eyre!("unknown version {v}"),
+                    ErrorKind::MigrationFailed,
+                ))
+            }
+        })
+    }
     #[cfg(test)]
     fn as_exver(&self) -> exver::Version {
         match self {
@@ -66,116 +154,246 @@ impl Version {
             Version::V0_3_6_alpha_4(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_5(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_6(Wrapper(x)) => x.semver(),
-            Version::V0_3_6_alpha_7(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
 }
 
+fn version_accessor(db: &mut Value) -> Option<&mut Value> {
+    if db.get("public").is_some() {
+        db.get_mut("public")?
+            .get_mut("serverInfo")?
+            .get_mut("version")
+    } else {
+        db.get_mut("server-info")?.get_mut("version")
+    }
+}
+
+fn version_compat_accessor(db: &mut Value) -> Option<&mut Value> {
+    if db.get("public").is_some() {
+        db.get_mut("public")?
+            .get_mut("serverInfo")?
+            .get_mut("versionCompat")
+    } else {
+        db.get_mut("server-info")?.get_mut("eos-version-compat")
+    }
+}
+
+fn post_init_migration_todos_accessor(db: &mut Value) -> Option<&mut Value> {
+    let server_info = if db.get("public").is_some() {
+        db.get_mut("public")?.get_mut("serverInfo")?
+    } else {
+        db.get_mut("server-info")?
+    };
+    if server_info.get("postInitMigrationTodos").is_none() {
+        server_info
+            .as_object_mut()?
+            .insert("postInitMigrationTodos".into(), Value::Array(Vector::new()));
+    }
+    server_info.get_mut("postInitMigrationTodos")
+}
+
+struct PreUps {
+    prev: Option<Box<PreUps>>,
+    value: Box<dyn Any + UnwindSafe + Send + 'static>,
+}
+impl PreUps {
+    #[instrument(skip(from, to))]
+    fn load<'a, VFrom: DynVersionT + ?Sized, VTo: DynVersionT + ?Sized>(
+        from: &'a VFrom,
+        to: &'a VTo,
+    ) -> BoxFuture<'a, Result<Self, Error>> {
+        async {
+            let previous = to.previous();
+            let prev = match from.semver().cmp(&previous.semver()) {
+                Ordering::Less => Some(Box::new(PreUps::load(from, &previous).await?)),
+                Ordering::Greater => {
+                    return Err(Error::new(
+                        eyre!(
+                            "NO PATH FROM {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
+                            from.semver()
+                        ),
+                        crate::ErrorKind::MigrationFailed,
+                    ))
+                }
+                Ordering::Equal => None,
+            };
+            Ok(Self {
+                prev,
+                value: to.pre_up().await?,
+            })
+        }
+        .boxed()
+    }
+}
+
+fn migrate_from_unchecked<VFrom: DynVersionT + ?Sized, VTo: DynVersionT + ?Sized>(
+    from: &VFrom,
+    to: &VTo,
+    pre_ups: PreUps,
+    db: &mut Value,
+) -> Result<(), Error> {
+    let previous = to.previous();
+    match pre_ups.prev {
+        Some(prev) if from.semver() < previous.semver() => {
+            migrate_from_unchecked(from, &previous, *prev, db)?
+        }
+        _ if from.semver() > previous.semver() => {
+            return Err(Error::new(
+                eyre!(
+                    "NO PATH FROM {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
+                    from.semver()
+                ),
+                crate::ErrorKind::MigrationFailed,
+            ));
+        }
+        _ => (),
+    };
+    to.up(db, pre_ups.value)?;
+    to.commit(db)?;
+    Ok(())
+}
+
+fn rollback_to_unchecked<VFrom: DynVersionT + ?Sized, VTo: DynVersionT + ?Sized>(
+    from: &VFrom,
+    to: &VTo,
+    db: &mut Value,
+) -> Result<(), Error> {
+    let previous = from.previous();
+    from.down(db)?;
+    previous.commit(db)?;
+    if to.semver() < previous.semver() {
+        rollback_to_unchecked(&previous, to, db)?
+    } else if to.semver() > previous.semver() {
+        return Err(Error::new(
+            eyre!(
+                "NO PATH TO {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
+                to.semver()
+            ),
+            crate::ErrorKind::MigrationFailed,
+        ));
+    }
+    Ok(())
+}
+
 pub trait VersionT
 where
-    Self: Sized + Send + Sync,
+    Self: Default + Copy + Sized + RefUnwindSafe + Send + Sync + 'static,
 {
     type Previous: VersionT;
-    fn new() -> Self;
+    type PreUpRes: Send + UnwindSafe;
+    fn semver(self) -> exver::Version;
+    fn compat(self) -> &'static exver::VersionRange;
+    /// MUST NOT change system state. Intended for async I/O reads
+    fn pre_up(self) -> impl Future<Output = Result<Self::PreUpRes, Error>> + Send + 'static;
+    fn up(self, db: &mut Value, input: Self::PreUpRes) -> Result<(), Error> {
+        Ok(())
+    }
+    /// MUST be idempotent, and is run after *all* db migrations
+    fn post_up(self, ctx: &RpcContext) -> impl Future<Output = Result<(), Error>> + Send + 'static {
+        async { Ok(()) }
+    }
+    fn down(self, db: &mut Value) -> Result<(), Error> {
+        Err(Error::new(
+            eyre!("downgrades prohibited"),
+            ErrorKind::InvalidRequest,
+        ))
+    }
+    fn commit(self, db: &mut Value) -> Result<(), Error> {
+        *version_accessor(db).or_not_found("`version` in db")? = to_value(&self.semver())?;
+        *version_compat_accessor(db).or_not_found("`versionCompat` in db")? =
+            to_value(self.compat())?;
+        post_init_migration_todos_accessor(db)
+            .or_not_found("`serverInfo` in db")?
+            .as_array_mut()
+            .ok_or_else(|| {
+                Error::new(
+                    eyre!("postInitMigrationTodos is not an array"),
+                    ErrorKind::Database,
+                )
+            })?
+            .push_back(to_value(&self.semver())?);
+        Ok(())
+    }
+}
+
+struct DynVersion(Box<dyn DynVersionT>);
+unsafe impl Send for DynVersion {}
+
+trait DynVersionT: RefUnwindSafe + Send + Sync {
+    fn previous(&self) -> DynVersion;
     fn semver(&self) -> exver::Version;
     fn compat(&self) -> &'static exver::VersionRange;
-    fn up(&self, db: &TypedPatchDb<Database>) -> impl Future<Output = Result<(), Error>> + Send;
-    fn down(&self, db: &TypedPatchDb<Database>) -> impl Future<Output = Result<(), Error>> + Send;
-    fn commit(
-        &self,
-        db: &TypedPatchDb<Database>,
-    ) -> impl Future<Output = Result<(), Error>> + Send {
-        async {
-            let semver = self.semver().into();
-            let compat = self.compat().clone();
-            db.mutate(|d| {
-                d.as_public_mut()
-                    .as_server_info_mut()
-                    .as_version_mut()
-                    .ser(&semver)?;
-                d.as_public_mut()
-                    .as_server_info_mut()
-                    .as_eos_version_compat_mut()
-                    .ser(&compat)?;
-                Ok(())
-            })
-            .await?;
-            Ok(())
-        }
+    fn pre_up(&self) -> BoxFuture<'static, Result<Box<dyn Any + UnwindSafe + Send>, Error>>;
+    fn up(&self, db: &mut Value, input: Box<dyn Any + Send>) -> Result<(), Error>;
+    fn post_up<'a>(&self, ctx: &'a RpcContext) -> BoxFuture<'a, Result<(), Error>>;
+    fn down(&self, db: &mut Value) -> Result<(), Error>;
+    fn commit(&self, db: &mut Value) -> Result<(), Error>;
+}
+impl<T> DynVersionT for T
+where
+    T: VersionT,
+{
+    fn previous(&self) -> DynVersion {
+        DynVersion(Box::new(<Self as VersionT>::Previous::default()))
     }
-    fn migrate_to<V: VersionT>(
-        &self,
-        version: &V,
-        db: &TypedPatchDb<Database>,
-        progress: &mut PhaseProgressTrackerHandle,
-    ) -> impl Future<Output = Result<(), Error>> + Send {
-        async {
-            match self.semver().cmp(&version.semver()) {
-                Ordering::Greater => self.rollback_to_unchecked(version, db, progress).await,
-                Ordering::Less => version.migrate_from_unchecked(self, db, progress).await,
-                Ordering::Equal => Ok(()),
-            }
-        }
+    fn semver(&self) -> exver::Version {
+        VersionT::semver(*self)
     }
-    fn migrate_from_unchecked<'a, V: VersionT>(
-        &'a self,
-        version: &'a V,
-        db: &'a TypedPatchDb<Database>,
-        progress: &'a mut PhaseProgressTrackerHandle,
-    ) -> BoxFuture<'a, Result<(), Error>> {
-        progress.add_total(1);
-        async {
-            let previous = Self::Previous::new();
-            if version.semver() < previous.semver() {
-                previous
-                    .migrate_from_unchecked(version, db, progress)
-                    .await?;
-            } else if version.semver() > previous.semver() {
-                return Err(Error::new(
-                    eyre!(
-                        "NO PATH FROM {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
-                        version.semver()
-                    ),
-                    crate::ErrorKind::MigrationFailed,
-                ));
-            }
-            tracing::info!("{} -> {}", previous.semver(), self.semver(),);
-            self.up(db).await?;
-            self.commit(db).await?;
-            *progress += 1;
-            Ok(())
-        }
-        .boxed()
+    fn compat(&self) -> &'static exver::VersionRange {
+        VersionT::compat(*self)
     }
-    fn rollback_to_unchecked<'a, V: VersionT>(
-        &'a self,
-        version: &'a V,
-        db: &'a TypedPatchDb<Database>,
-        progress: &'a mut PhaseProgressTrackerHandle,
-    ) -> BoxFuture<'a, Result<(), Error>> {
-        async {
-            let previous = Self::Previous::new();
-            tracing::info!("{} -> {}", self.semver(), previous.semver(),);
-            self.down(db).await?;
-            previous.commit(db).await?;
-            *progress += 1;
-            if version.semver() < previous.semver() {
-                previous
-                    .rollback_to_unchecked(version, db, progress)
-                    .await?;
-            } else if version.semver() > previous.semver() {
-                return Err(Error::new(
-                    eyre!(
-                        "NO PATH TO {}, THIS IS LIKELY A MISTAKE IN THE VERSION DEFINITION",
-                        version.semver()
-                    ),
-                    crate::ErrorKind::MigrationFailed,
-                ));
-            }
-            Ok(())
-        }
-        .boxed()
+    fn pre_up(&self) -> BoxFuture<'static, Result<Box<dyn Any + UnwindSafe + Send>, Error>> {
+        let v = *self;
+        async move { Ok(Box::new(VersionT::pre_up(v).await?) as Box<dyn Any + UnwindSafe + Send>) }
+            .boxed()
+    }
+    fn up(&self, db: &mut Value, input: Box<dyn Any + Send>) -> Result<(), Error> {
+        VersionT::up(
+            *self,
+            db,
+            *input.downcast().map_err(|_| {
+                Error::new(
+                    eyre!("pre_up returned unexpected type"),
+                    ErrorKind::Incoherent,
+                )
+            })?,
+        )
+    }
+    fn post_up<'a>(&self, ctx: &'a RpcContext) -> BoxFuture<'a, Result<(), Error>> {
+        VersionT::post_up(*self, ctx).boxed()
+    }
+    fn down(&self, db: &mut Value) -> Result<(), Error> {
+        VersionT::down(*self, db)
+    }
+    fn commit(&self, db: &mut Value) -> Result<(), Error> {
+        VersionT::commit(*self, db)
+    }
+}
+impl DynVersionT for DynVersion {
+    fn previous(&self) -> DynVersion {
+        self.0.previous()
+    }
+    fn semver(&self) -> exver::Version {
+        self.0.semver()
+    }
+    fn compat(&self) -> &'static exver::VersionRange {
+        self.0.compat()
+    }
+    fn pre_up(&self) -> BoxFuture<'static, Result<Box<dyn Any + UnwindSafe + Send>, Error>> {
+        self.0.pre_up()
+    }
+    fn up(&self, db: &mut Value, input: Box<dyn Any + Send>) -> Result<(), Error> {
+        self.0.up(db, input)
+    }
+    fn post_up<'a>(&self, ctx: &'a RpcContext) -> BoxFuture<'a, Result<(), Error>> {
+        self.0.post_up(ctx)
+    }
+    fn down(&self, db: &mut Value) -> Result<(), Error> {
+        self.0.down(db)
+    }
+    fn commit(&self, db: &mut Value) -> Result<(), Error> {
+        self.0.commit(db)
     }
 }
 
@@ -195,7 +413,7 @@ where
 {
     fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
         let v = exver::Version::deserialize(deserializer)?;
-        let version = T::new();
+        let version = T::default();
         if v < version.semver() {
             Ok(Self(version, v))
         } else {
@@ -220,7 +438,7 @@ where
 {
     fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
         let v = exver::Version::deserialize(deserializer)?;
-        let version = T::new();
+        let version = T::default();
         if v == version.semver() {
             Ok(Wrapper(version))
         } else {
@@ -229,62 +447,6 @@ where
     }
 }
 
-pub async fn init(
-    db: &TypedPatchDb<Database>,
-    mut progress: PhaseProgressTrackerHandle,
-) -> Result<(), Error> {
-    progress.start();
-    db.mutate(|db| {
-        db.as_public_mut()
-            .as_server_info_mut()
-            .as_version_mut()
-            .map_mutate(|v| {
-                Ok(if v == exver::Version::new([0, 3, 6], []) {
-                    v0_3_6_alpha_0::Version::new().semver()
-                } else {
-                    v
-                })
-            })
-    })
-    .await?; // TODO: remove before releasing 0.3.6
-    let version = Version::from_exver_version(
-        db.peek()
-            .await
-            .as_public()
-            .as_server_info()
-            .as_version()
-            .de()?,
-    );
-
-    match version {
-        Version::LT0_3_5(_) => {
-            return Err(Error::new(
-                eyre!("Cannot migrate from pre-0.3.5. Please update to v0.3.5 first."),
-                ErrorKind::MigrationFailed,
-            ));
-        }
-        Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_5_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6_alpha_0(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6_alpha_1(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6_alpha_2(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6_alpha_3(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6_alpha_4(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6_alpha_5(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6_alpha_6(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::V0_3_6_alpha_7(v) => v.0.migrate_to(&Current::new(), &db, &mut progress).await?,
-        Version::Other(_) => {
-            return Err(Error::new(
-                eyre!("Cannot downgrade"),
-                crate::ErrorKind::InvalidRequest,
-            ))
-        }
-    }
-    progress.complete();
-    Ok(())
-}
-
 pub const COMMIT_HASH: &str =
     include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../GIT_HASH.txt"));
 
@@ -315,17 +477,17 @@ mod tests {
 
     fn versions() -> impl Strategy<Value = Version> {
         prop_oneof![
-            Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))),
-            Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))),
-            Just(Version::V0_3_5_2(Wrapper(v0_3_5_2::Version::new()))),
+            Just(Version::V0_3_5(Wrapper(v0_3_5::Version::default()))),
+            Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::default()))),
+            Just(Version::V0_3_5_2(Wrapper(v0_3_5_2::Version::default()))),
             Just(Version::V0_3_6_alpha_0(Wrapper(
-                v0_3_6_alpha_0::Version::new()
+                v0_3_6_alpha_0::Version::default()
             ))),
             Just(Version::V0_3_6_alpha_1(Wrapper(
-                v0_3_6_alpha_1::Version::new()
+                v0_3_6_alpha_1::Version::default()
             ))),
             Just(Version::V0_3_6_alpha_2(Wrapper(
-                v0_3_6_alpha_2::Version::new()
+                v0_3_6_alpha_2::Version::default()
             ))),
             em_version().prop_map(Version::Other),
         ]
diff --git a/core/startos/src/version/v0_3_5.rs b/core/startos/src/version/v0_3_5.rs
index 167132784..0217b6738 100644
--- a/core/startos/src/version/v0_3_5.rs
+++ b/core/startos/src/version/v0_3_5.rs
@@ -1,7 +1,6 @@
 use exver::{ExtendedVersion, VersionRange};
 
 use super::VersionT;
-use crate::db::model::Database;
 use crate::prelude::*;
 use crate::version::Current;
 
@@ -17,7 +16,7 @@ lazy_static::lazy_static! {
         VersionRange::anchor(
             exver::LTE,
             ExtendedVersion::new(
-                Current::new().semver(),
+                Current::default().semver(),
                 exver::Version::default(),
             )
         ),
@@ -25,24 +24,26 @@ lazy_static::lazy_static! {
     static ref V0_3_5: exver::Version = exver::Version::new([0, 3, 5], []);
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = Self;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_5.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_5_1.rs b/core/startos/src/version/v0_3_5_1.rs
index c6c328f6d..5334cc2a4 100644
--- a/core/startos/src/version/v0_3_5_1.rs
+++ b/core/startos/src/version/v0_3_5_1.rs
@@ -2,31 +2,32 @@ use exver::VersionRange;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5, VersionT};
-use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
     static ref V0_3_5_1: exver::Version = exver::Version::new([0, 3, 5, 1], []);
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_5::Version;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_5_1.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_5_2.rs b/core/startos/src/version/v0_3_5_2.rs
index 00143f8cd..780731d09 100644
--- a/core/startos/src/version/v0_3_5_2.rs
+++ b/core/startos/src/version/v0_3_5_2.rs
@@ -2,31 +2,32 @@ use exver::VersionRange;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5_1, VersionT};
-use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
     static ref V0_3_5_2: exver::Version = exver::Version::new([0, 3, 5, 2], []);
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_5_1::Version;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_5_2.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6_alpha_0.rs b/core/startos/src/version/v0_3_6_alpha_0.rs
index 1da34f708..2f4b141b4 100644
--- a/core/startos/src/version/v0_3_6_alpha_0.rs
+++ b/core/startos/src/version/v0_3_6_alpha_0.rs
@@ -1,9 +1,44 @@
+use std::collections::BTreeMap;
+use std::future::Future;
+use std::path::Path;
+
+use chrono::{DateTime, Utc};
+use ed25519_dalek::SigningKey;
 use exver::{PreReleaseSegment, VersionRange};
+use imbl_value::{json, InternedString};
+use itertools::Itertools;
+use models::PackageId;
+use openssl::pkey::{PKey, Private};
+use openssl::x509::X509;
+use patch_db::ModelExt;
+use sqlx::postgres::PgConnectOptions;
+use sqlx::{PgPool, Row};
+use ssh_key::Fingerprint;
+use tokio::process::Command;
+use torut::onion::TorSecretKeyV3;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5_2, VersionT};
 use crate::db::model::Database;
+use crate::disk::mount::filesystem::cifs::Cifs;
+use crate::disk::mount::util::unmount;
+use crate::hostname::Hostname;
+use crate::net::forward::AvailablePorts;
+use crate::net::keys::KeyStore;
+use crate::net::ssl::CertStore;
+use crate::net::tor::OnionStore;
+use crate::notifications::{Notification, Notifications};
 use crate::prelude::*;
+use crate::ssh::{SshKeys, SshPubKey};
+use crate::util::crypto::ed25519_expand_key;
+use crate::util::serde::{Pem, PemEncoding};
+use crate::util::Invoke;
+use crate::{account::AccountInfo, net::tor};
+use crate::{auth::Sessions, context::RpcContext};
+use crate::{
+    backup::target::cifs::CifsTargets,
+    s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile,
+};
 
 lazy_static::lazy_static! {
     static ref V0_3_6_alpha_0: exver::Version = exver::Version::new(
@@ -12,24 +47,540 @@ lazy_static::lazy_static! {
     );
 }
 
-#[derive(Clone, Debug)]
+#[tracing::instrument(skip_all)]
+async fn init_postgres(datadir: impl AsRef<Path>) -> Result<PgPool, Error> {
+    let db_dir = datadir.as_ref().join("main/postgresql");
+    if tokio::process::Command::new("mountpoint")
+        .arg("/var/lib/postgresql")
+        .stdout(std::process::Stdio::null())
+        .stderr(std::process::Stdio::null())
+        .status()
+        .await?
+        .success()
+    {
+        unmount("/var/lib/postgresql", true).await?;
+    }
+    let exists = tokio::fs::metadata(&db_dir).await.is_ok();
+    if !exists {
+        Command::new("cp")
+            .arg("-ra")
+            .arg("/var/lib/postgresql")
+            .arg(&db_dir)
+            .invoke(crate::ErrorKind::Filesystem)
+            .await?;
+    }
+    Command::new("chown")
+        .arg("-R")
+        .arg("postgres:postgres")
+        .arg(&db_dir)
+        .invoke(crate::ErrorKind::Database)
+        .await?;
+
+    let mut pg_paths = tokio::fs::read_dir("/usr/lib/postgresql").await?;
+    let mut pg_version = None;
+    while let Some(pg_path) = pg_paths.next_entry().await? {
+        let pg_path_version = pg_path
+            .file_name()
+            .to_str()
+            .map(|v| v.parse())
+            .transpose()?
+            .unwrap_or(0);
+        if pg_path_version > pg_version.unwrap_or(0) {
+            pg_version = Some(pg_path_version)
+        }
+    }
+    let pg_version = pg_version.ok_or_else(|| {
+        Error::new(
+            eyre!("could not determine postgresql version"),
+            crate::ErrorKind::Database,
+        )
+    })?;
+
+    crate::disk::mount::util::bind(&db_dir, "/var/lib/postgresql", false).await?;
+
+    let pg_version_string = pg_version.to_string();
+    let pg_version_path = db_dir.join(&pg_version_string);
+    if exists
+    // maybe migrate
+    {
+        let incomplete_path = db_dir.join(format!("{pg_version}.migration.incomplete"));
+        if tokio::fs::metadata(&incomplete_path).await.is_ok() // previous migration was incomplete
+        && tokio::fs::metadata(&pg_version_path).await.is_ok()
+        {
+            tokio::fs::remove_dir_all(&pg_version_path).await?;
+        }
+        if tokio::fs::metadata(&pg_version_path).await.is_err()
+        // need to migrate
+        {
+            let conf_dir = Path::new("/etc/postgresql").join(pg_version.to_string());
+            let conf_dir_tmp = {
+                let mut tmp = conf_dir.clone();
+                tmp.set_extension("tmp");
+                tmp
+            };
+            if tokio::fs::metadata(&conf_dir).await.is_ok() {
+                Command::new("mv")
+                    .arg(&conf_dir)
+                    .arg(&conf_dir_tmp)
+                    .invoke(ErrorKind::Filesystem)
+                    .await?;
+            }
+            let mut old_version = pg_version;
+            while old_version > 13
+            /* oldest pg version included in startos */
+            {
+                old_version -= 1;
+                let old_datadir = db_dir.join(old_version.to_string());
+                if tokio::fs::metadata(&old_datadir).await.is_ok() {
+                    tokio::fs::File::create(&incomplete_path)
+                        .await?
+                        .sync_all()
+                        .await?;
+                    Command::new("pg_upgradecluster")
+                        .arg(old_version.to_string())
+                        .arg("main")
+                        .invoke(crate::ErrorKind::Database)
+                        .await?;
+                    break;
+                }
+            }
+            if tokio::fs::metadata(&conf_dir).await.is_ok() {
+                if tokio::fs::metadata(&conf_dir).await.is_ok() {
+                    tokio::fs::remove_dir_all(&conf_dir).await?;
+                }
+                Command::new("mv")
+                    .arg(&conf_dir_tmp)
+                    .arg(&conf_dir)
+                    .invoke(ErrorKind::Filesystem)
+                    .await?;
+            }
+            tokio::fs::remove_file(&incomplete_path).await?;
+        }
+        if tokio::fs::metadata(&incomplete_path).await.is_ok() {
+            unreachable!() // paranoia
+        }
+    }
+
+    Command::new("systemctl")
+        .arg("start")
+        .arg(format!("postgresql@{pg_version}-main.service"))
+        .invoke(crate::ErrorKind::Database)
+        .await?;
+    if !exists {
+        Command::new("sudo")
+            .arg("-u")
+            .arg("postgres")
+            .arg("createuser")
+            .arg("root")
+            .invoke(crate::ErrorKind::Database)
+            .await?;
+        Command::new("sudo")
+            .arg("-u")
+            .arg("postgres")
+            .arg("createdb")
+            .arg("secrets")
+            .arg("-O")
+            .arg("root")
+            .invoke(crate::ErrorKind::Database)
+            .await?;
+    }
+
+    let secret_store =
+        PgPool::connect_with(PgConnectOptions::new().database("secrets").username("root")).await?;
+    sqlx::migrate!()
+        .run(&secret_store)
+        .await
+        .with_kind(crate::ErrorKind::Database)?;
+    dbg!("Init Postgres Done");
+    Ok(secret_store)
+}
+
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_5_2::Version;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> exver::Version {
+    type PreUpRes = (AccountInfo, SshKeys, CifsTargets, Notifications);
+    fn semver(self) -> exver::Version {
         V0_3_6_alpha_0.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
-        Err(Error::new(eyre!("unimplemented"), ErrorKind::Unknown))
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        let pg = init_postgres("/embassy-data").await?;
+        let account = previous_account_info(&pg).await?;
+
+        let ssh_keys = previous_ssh_keys(&pg).await?;
+
+        let cifs = previous_cifs(&pg).await?;
+
+        let notifications = previous_notifications(pg).await?;
+
+        Ok((account, ssh_keys, cifs, notifications))
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(
+        self,
+        db: &mut Value,
+        (account, ssh_keys, cifs, notifications): Self::PreUpRes,
+    ) -> Result<(), Error> {
+        let wifi = json!({
+            "infterface": db["server-info"]["wifi"]["interface"],
+            "ssids": db["server-info"]["wifi"]["ssids"],
+            "selected": db["server-info"]["wifi"]["selected"],
+            "last_region": db["server-info"]["wifi"]["last-region"],
+        });
+
+        let ip_info = {
+            let mut ip_info = json!({});
+            let empty = Default::default();
+            for (k, v) in db["server-info"]["ip-info"].as_object().unwrap_or(&empty) {
+                let k: &str = k.as_ref();
+                ip_info[k] = json!({
+                    "ipv4Range": v["ipv4-range"],
+                    "ipv6Range": v["ipv6-range"],
+                    "ipv4": v["ipv4"],
+                    "ipv6": v["ipv6"],
+                });
+            }
+            ip_info
+        };
+
+        let status_info = json!({
+            "backupProgress": db["server-info"]["status-info"]["backup-progress"],
+            "updated": db["server-info"]["status-info"]["updated"],
+            "updateProgress": db["server-info"]["status-info"]["update-progress"],
+            "shuttingDown": db["server-info"]["status-info"]["shutting-down"],
+            "restarting": db["server-info"]["status-info"]["restarting"],
+        });
+        let server_info = {
+            let mut server_info = json!({
+                "arch": db["server-info"]["arch"],
+                "platform": db["server-info"]["platform"],
+                "id": db["server-info"]["id"],
+                "hostname": db["server-info"]["hostname"],
+                "version": db["server-info"]["version"],
+                "versionCompat": db["server-info"]["eos-version-compat"],
+                "lastBackup": db["server-info"]["last-backup"],
+                "lanAddress": db["server-info"]["lan-address"],
+            });
+
+            server_info["postInitMigrationTodos"] = json!([]);
+            let tor_address: String = from_value(db["server-info"]["tor-address"].clone())?;
+            // Maybe we do this like the Public::init does
+            server_info["torAddress"] = json!(tor_address);
+            server_info["onionAddress"] = json!(tor_address
+                .replace("https://", "")
+                .replace("http://", "")
+                .replace(".onion/", ""));
+            server_info["ipInfo"] = ip_info;
+            server_info["statusInfo"] = status_info;
+            server_info["wifi"] = wifi;
+            server_info["unreadNotificationCount"] =
+                db["server-info"]["unread-notification-count"].clone();
+            server_info["passwordHash"] = db["server-info"]["password-hash"].clone();
+
+            server_info["pubkey"] = db["server-info"]["pubkey"].clone();
+            server_info["caFingerprint"] = db["server-info"]["ca-fingerprint"].clone();
+            server_info["ntpSynced"] = db["server-info"]["ntp-synced"].clone();
+            server_info["zram"] = db["server-info"]["zram"].clone();
+            server_info["governor"] = db["server-info"]["governor"].clone();
+            // This one should always be empty, doesn't exist in the previous. And the smtp is all single word key
+            server_info["smtp"] = db["server-info"]["smtp"].clone();
+            server_info
+        };
+
+        let public = json!({
+            "serverInfo": server_info,
+            "packageData": json!({}),
+            "ui": db["ui"],
+        });
+
+        let private = {
+            let mut value = json!({});
+            value["keyStore"] = to_value(&KeyStore::new(&account)?)?;
+            value["password"] = to_value(&account.password)?;
+            value["compatS9pkKey"] = to_value(&crate::db::model::private::generate_compat_key())?;
+            value["sshPrivkey"] = to_value(Pem::new_ref(&account.ssh_key))?;
+            value["sshPubkeys"] = to_value(&ssh_keys)?;
+            value["availablePorts"] = to_value(&AvailablePorts::new())?;
+            value["sessions"] = to_value(&Sessions::new())?;
+            value["notifications"] = to_value(&notifications)?;
+            value["cifs"] = to_value(&cifs)?;
+            value["packageStores"] = json!({});
+            value
+        };
+        let next: Value = json!({
+            "public": public,
+            "private": private,
+        });
+
+        dbg!("Should be done with the up");
+        *db = next;
         Ok(())
     }
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
+        Err(Error::new(
+            eyre!("downgrades prohibited"),
+            ErrorKind::InvalidRequest,
+        ))
+    }
+
+    #[instrument(skip(self, ctx))]
+    /// MUST be idempotent, and is run after *all* db migrations
+    fn post_up(self, ctx: &RpcContext) -> impl Future<Output = Result<(), Error>> + Send + 'static {
+        let ctx = ctx.clone();
+        async move {
+            let path = Path::new("/embassy-data/package-data/archive/");
+            if !path.is_dir() {
+                return Err(Error::new(
+                    eyre!(
+                        "expected path ({}) to be a directory",
+                        path.to_string_lossy()
+                    ),
+                    ErrorKind::Filesystem,
+                ));
+            }
+            // Should be the name of the package
+            let mut paths = tokio::fs::read_dir(path).await?;
+            while let Some(path) = paths.next_entry().await? {
+                let path = path.path();
+                if !path.is_dir() {
+                    continue;
+                }
+                // Should be the version of the package
+                let mut paths = tokio::fs::read_dir(path).await?;
+                while let Some(path) = paths.next_entry().await? {
+                    let path = path.path();
+                    if !path.is_dir() {
+                        continue;
+                    }
+
+                    // Should be s9pk
+                    let mut paths = tokio::fs::read_dir(path).await?;
+                    while let Some(path) = paths.next_entry().await? {
+                        let path = path.path();
+                        if path.is_dir() {
+                            continue;
+                        }
+
+                        let package_s9pk = tokio::fs::File::open(path).await?;
+                        let file = MultiCursorFile::open(&package_s9pk).await?;
+
+                        let key = ctx.db.peek().await.into_private().into_compat_s9pk_key();
+                        ctx.services
+                            .install(
+                                ctx.clone(),
+                                || crate::s9pk::load(file.clone(), || Ok(key.de()?.0), None),
+                                None::<crate::util::Never>,
+                                None,
+                            )
+                            .await?
+                            .await?
+                            .await?;
+                    }
+                }
+            }
+            Ok(())
+        }
+    }
+}
+
+async fn previous_notifications(pg: sqlx::Pool<sqlx::Postgres>) -> Result<Notifications, Error> {
+    let notification_cursor = sqlx::query(r#"SELECT * FROM notifications"#)
+        .fetch_all(&pg)
+        .await?;
+    let notifications = {
+        let mut notifications = Notifications::default();
+        for row in notification_cursor {
+            let package_id = serde_json::from_str::<PackageId>(
+                row.try_get("package_id")
+                    .with_ctx(|_| (ErrorKind::Database, "package_id"))?,
+            )
+            .ok();
+
+            let created_at = row
+                .try_get("created_at")
+                .with_ctx(|_| (ErrorKind::Database, "created_at"))?;
+            let code = row
+                .try_get::<i64, _>("code")
+                .with_ctx(|_| (ErrorKind::Database, "code"))? as u32;
+            let id = row
+                .try_get::<i64, _>("id")
+                .with_ctx(|_| (ErrorKind::Database, "id"))? as u32;
+            let level = serde_json::from_str(
+                row.try_get("level")
+                    .with_ctx(|_| (ErrorKind::Database, "level"))?,
+            )
+            .with_kind(ErrorKind::Database)
+            .with_ctx(|_| (ErrorKind::Database, "level: serde_json "))?;
+            let title = row
+                .try_get("title")
+                .with_ctx(|_| (ErrorKind::Database, "title"))?;
+            let message = row
+                .try_get("message")
+                .with_ctx(|_| (ErrorKind::Database, "message"))?;
+            let data = serde_json::from_str(
+                row.try_get("data")
+                    .with_ctx(|_| (ErrorKind::Database, "data"))?,
+            )
+            .unwrap_or_default();
+
+            notifications.0.insert(
+                id,
+                Notification {
+                    package_id,
+                    created_at,
+                    code,
+                    level,
+                    title,
+                    message,
+                    data,
+                },
+            );
+        }
+        notifications
+    };
+    Ok(notifications)
+}
+
+#[tracing::instrument(skip_all)]
+async fn previous_cifs(pg: &sqlx::Pool<sqlx::Postgres>) -> Result<CifsTargets, Error> {
+    let cifs = sqlx::query(r#"SELECT * FROM cifs_shares"#)
+        .fetch_all(pg)
+        .await?
+        .into_iter()
+        .map(|row| {
+            let id: i64 = row.try_get("id")?;
+            Ok::<_, Error>((
+                id,
+                Cifs {
+                    hostname: row
+                        .try_get("hostname")
+                        .with_ctx(|_| (ErrorKind::Database, "hostname"))?,
+                    path: serde_json::from_str(row.try_get("path")?)
+                        .with_kind(ErrorKind::Database)
+                        .with_ctx(|_| (ErrorKind::Database, "path"))?,
+                    username: row
+                        .try_get("username")
+                        .with_ctx(|_| (ErrorKind::Database, "username"))?,
+                    password: row
+                        .try_get("password")
+                        .with_ctx(|_| (ErrorKind::Database, "password"))?,
+                },
+            ))
+        })
+        .fold(Ok::<_, Error>(CifsTargets::default()), |cifs, data| {
+            let mut cifs = cifs?;
+            let (id, cif_value) = data?;
+            cifs.0.insert(id as u32, cif_value);
+            Ok(cifs)
+        })?;
+    Ok(cifs)
+}
+
+#[tracing::instrument(skip_all)]
+async fn previous_account_info(pg: &sqlx::Pool<sqlx::Postgres>) -> Result<AccountInfo, Error> {
+    let account_query = sqlx::query(r#"SELECT * FROM account"#)
+        .fetch_one(pg)
+        .await?;
+    let account = {
+        AccountInfo {
+            password: account_query
+                .try_get("password")
+                .with_ctx(|_| (ErrorKind::Database, "password"))?,
+            tor_key: TorSecretKeyV3::try_from(
+                if let Some(bytes) = account_query
+                    .try_get::<Option<Vec<u8>>, _>("tor_key")
+                    .with_ctx(|_| (ErrorKind::Database, "tor_key"))?
+                {
+                    <[u8; 64]>::try_from(bytes)
+                        .map_err(|e| {
+                            Error::new(
+                                eyre!("expected vec of len 64, got len {}", e.len()),
+                                ErrorKind::ParseDbField,
+                            )
+                        })
+                        .with_ctx(|_| (ErrorKind::Database, "password.u8 64"))?
+                } else {
+                    ed25519_expand_key(
+                        &<[u8; 32]>::try_from(account_query.try_get::<Vec<u8>, _>("network_key")?)
+                            .map_err(|e| {
+                                Error::new(
+                                    eyre!("expected vec of len 32, got len {}", e.len()),
+                                    ErrorKind::ParseDbField,
+                                )
+                            })
+                            .with_ctx(|_| (ErrorKind::Database, "password.u8 32"))?,
+                    )
+                },
+            )?,
+            server_id: account_query
+                .try_get("server_id")
+                .with_ctx(|_| (ErrorKind::Database, "server_id"))?,
+            hostname: Hostname(
+                account_query
+                    .try_get::<String, _>("hostname")
+                    .with_ctx(|_| (ErrorKind::Database, "hostname"))?
+                    .into(),
+            ),
+            root_ca_key: PKey::private_key_from_pem(
+                &account_query
+                    .try_get::<String, _>("root_ca_key_pem")
+                    .with_ctx(|_| (ErrorKind::Database, "root_ca_key_pem"))?
+                    .as_bytes(),
+            )
+            .with_ctx(|_| (ErrorKind::Database, "private_key_from_pem"))?,
+            root_ca_cert: X509::from_pem(
+                account_query
+                    .try_get::<String, _>("root_ca_cert_pem")
+                    .with_ctx(|_| (ErrorKind::Database, "root_ca_cert_pem"))?
+                    .as_bytes(),
+            )
+            .with_ctx(|_| (ErrorKind::Database, "X509::from_pem"))?,
+            compat_s9pk_key: SigningKey::generate(&mut rand::thread_rng()),
+            ssh_key: ssh_key::PrivateKey::random(
+                &mut rand::thread_rng(),
+                ssh_key::Algorithm::Ed25519,
+            )
+            .with_ctx(|_| (ErrorKind::Database, "X509::ssh_key::PrivateKey::random"))?,
+        }
+    };
+    Ok(account)
+}
+#[tracing::instrument(skip_all)]
+async fn previous_ssh_keys(pg: &sqlx::Pool<sqlx::Postgres>) -> Result<SshKeys, Error> {
+    let ssh_query = sqlx::query(r#"SELECT * FROM ssh_keys"#)
+        .fetch_all(pg)
+        .await?;
+    let ssh_keys: SshKeys = {
+        let keys = ssh_query.into_iter().fold(
+            Ok::<_, Error>(BTreeMap::<InternedString, WithTimeData<SshPubKey>>::new()),
+            |ssh_keys, row| {
+                let mut ssh_keys = ssh_keys?;
+                let time = row
+                    .try_get::<String, _>("created_at")
+                    .map_err(Error::from)
+                    .and_then(|x| x.parse::<DateTime<Utc>>().with_kind(ErrorKind::Database))
+                    .with_ctx(|_| (ErrorKind::Database, "openssh_pubkey::created_at"))?;
+                let value: SshPubKey = row
+                    .try_get::<String, _>("openssh_pubkey")
+                    .map_err(Error::from)
+                    .and_then(|x| x.parse().map(SshPubKey).with_kind(ErrorKind::Database))
+                    .with_ctx(|_| (ErrorKind::Database, "openssh_pubkey"))?;
+                let data = WithTimeData {
+                    created_at: time,
+                    updated_at: time,
+                    value,
+                };
+                let fingerprint = row
+                    .try_get::<String, _>("fingerprint")
+                    .with_ctx(|_| (ErrorKind::Database, "fingerprint"))?;
+                ssh_keys.insert(fingerprint.into(), data);
+                Ok(ssh_keys)
+            },
+        )?;
+        SshKeys::from(keys)
+    };
+    Ok(ssh_keys)
 }
diff --git a/core/startos/src/version/v0_3_6_alpha_1.rs b/core/startos/src/version/v0_3_6_alpha_1.rs
index 8f40c3fde..682486439 100644
--- a/core/startos/src/version/v0_3_6_alpha_1.rs
+++ b/core/startos/src/version/v0_3_6_alpha_1.rs
@@ -2,7 +2,6 @@ use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_0, VersionT};
-use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
@@ -12,24 +11,26 @@ lazy_static::lazy_static! {
     );
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_6_alpha_0::Version;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_6_alpha_1.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6_alpha_2.rs b/core/startos/src/version/v0_3_6_alpha_2.rs
index 4b26a05dd..cddcc44b2 100644
--- a/core/startos/src/version/v0_3_6_alpha_2.rs
+++ b/core/startos/src/version/v0_3_6_alpha_2.rs
@@ -2,7 +2,6 @@ use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_1, VersionT};
-use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
@@ -12,24 +11,26 @@ lazy_static::lazy_static! {
     );
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_6_alpha_1::Version;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_6_alpha_2.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6_alpha_3.rs b/core/startos/src/version/v0_3_6_alpha_3.rs
index 3f244a2a0..90164ad60 100644
--- a/core/startos/src/version/v0_3_6_alpha_3.rs
+++ b/core/startos/src/version/v0_3_6_alpha_3.rs
@@ -2,7 +2,6 @@ use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_2, VersionT};
-use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
@@ -12,24 +11,26 @@ lazy_static::lazy_static! {
     );
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_6_alpha_2::Version;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_6_alpha_3.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6_alpha_4.rs b/core/startos/src/version/v0_3_6_alpha_4.rs
index 0a60764e0..08ff7595e 100644
--- a/core/startos/src/version/v0_3_6_alpha_4.rs
+++ b/core/startos/src/version/v0_3_6_alpha_4.rs
@@ -2,7 +2,6 @@ use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_3, VersionT};
-use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
@@ -12,24 +11,26 @@ lazy_static::lazy_static! {
     );
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_6_alpha_3::Version;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_6_alpha_4.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6_alpha_5.rs b/core/startos/src/version/v0_3_6_alpha_5.rs
index 1b921d78b..649fe90ca 100644
--- a/core/startos/src/version/v0_3_6_alpha_5.rs
+++ b/core/startos/src/version/v0_3_6_alpha_5.rs
@@ -2,7 +2,6 @@ use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_4, VersionT};
-use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
@@ -12,24 +11,26 @@ lazy_static::lazy_static! {
     );
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_6_alpha_4::Version;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_6_alpha_5.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6_alpha_6.rs b/core/startos/src/version/v0_3_6_alpha_6.rs
index df91246ae..843e5a45b 100644
--- a/core/startos/src/version/v0_3_6_alpha_6.rs
+++ b/core/startos/src/version/v0_3_6_alpha_6.rs
@@ -2,7 +2,6 @@ use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_5, VersionT};
-use crate::db::model::Database;
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
@@ -12,24 +11,26 @@ lazy_static::lazy_static! {
     );
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_6_alpha_5::Version;
-    fn new() -> Self {
-        Version
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
     }
-    fn semver(&self) -> exver::Version {
+    fn semver(self) -> exver::Version {
         V0_3_6_alpha_6.clone()
     }
-    fn compat(&self) -> &'static VersionRange {
+    fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
 }
diff --git a/core/startos/src/version/v0_3_6_alpha_7.rs b/core/startos/src/version/v0_3_6_alpha_7.rs
deleted file mode 100644
index 7aa63fb2e..000000000
--- a/core/startos/src/version/v0_3_6_alpha_7.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use exver::{PreReleaseSegment, VersionRange};
-
-use super::v0_3_5::V0_3_0_COMPAT;
-use super::{v0_3_6_alpha_6, VersionT};
-use crate::db::model::Database;
-use crate::prelude::*;
-
-lazy_static::lazy_static! {
-    static ref V0_3_6_alpha_7: exver::Version = exver::Version::new(
-        [0, 3, 6],
-        [PreReleaseSegment::String("alpha".into()), 7.into()]
-    );
-}
-
-#[derive(Clone, Debug)]
-pub struct Version;
-
-impl VersionT for Version {
-    type Previous = v0_3_6_alpha_6::Version;
-    fn new() -> Self {
-        Version
-    }
-    fn semver(&self) -> exver::Version {
-        V0_3_6_alpha_7.clone()
-    }
-    fn compat(&self) -> &'static VersionRange {
-        &V0_3_0_COMPAT
-    }
-    async fn up(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
-        Ok(())
-    }
-    async fn down(&self, _db: &TypedPatchDb<Database>) -> Result<(), Error> {
-        Ok(())
-    }
-}
diff --git a/sdk/base/lib/osBindings/ServerInfo.ts b/sdk/base/lib/osBindings/ServerInfo.ts
index 76840cfc4..ff04d42b0 100644
--- a/sdk/base/lib/osBindings/ServerInfo.ts
+++ b/sdk/base/lib/osBindings/ServerInfo.ts
@@ -11,8 +11,9 @@ export type ServerInfo = {
   id: string
   hostname: string
   version: string
+  versionCompat: string
+  postInitMigrationTodos: string[]
   lastBackup: string | null
-  eosVersionCompat: string
   lanAddress: string
   onionAddress: string
   /**
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 221b80a3b..5862c6f83 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -21,5 +21,5 @@
   "ackInstructions": {},
   "theme": "Dark",
   "widgets": [],
-  "ack-welcome": "0.3.6-alpha.5"
+  "ack-welcome": "0.3.6-alpha.6"
 }
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index b5f684103..d9bc2dff3 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core'
 import { isPlatform } from '@ionic/angular'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { S9pk } from '@start9labs/start-sdk'
+import { S9pk, T } from '@start9labs/start-sdk'
 import cbor from 'cbor'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
 import { SideloadService } from './sideload.service'
 import { firstValueFrom } from 'rxjs'
+import mime from 'mime'
 
 interface Positions {
   [key: string]: [bigint, bigint] // [position, length]
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index d89b5e87f..55ea59a77 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -60,7 +60,7 @@ export const mockPatchData: DataModel = {
     // password is asdfasdf
     passwordHash:
       '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-    eosVersionCompat: '>=0.3.0 <=0.3.6',
+    versionCompat: '>=0.3.0 <=0.3.6',
     statusInfo: {
       backupProgress: null,
       updated: false,
@@ -82,6 +82,7 @@ export const mockPatchData: DataModel = {
       selected: null,
       lastRegion: null,
     },
+    postInitMigrationTodos: [],
   },
   packageData: {
     bitcoind: {

From 2ba56b8c59a546fae783bc28e3adb174e0def4be Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Thu, 17 Oct 2024 13:31:56 -0600
Subject: [PATCH 294/341] Convert properties to an action (#2751)

* update actions response types and partially implement in UI

* further remove diagnostic ui

* convert action response nested to array

* prepare action res modal for Alex

* ad dproperties action for Bitcoin

* feat: add action success dialog (#2753)

* feat: add action success dialog

* mocks for string action res and hide properties from actions page

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>

* return null

* remove properties from backend

* misc fixes

* make severity separate argument

* rename ActionRequest to ActionRequestOptions

* add clearRequests

* fix s9pk build

* remove config and properties, introduce action requests

* better ux, better moocks, include icons

* fix dependency types

* add variant for versionCompat

* fix dep icon display and patch operation display

* misc fixes

* misc fixes

* alpha 12

* honor provided input to set values in action

* fix: show full descriptions of action success items (#2758)

* fix type

* fix: fix build:deps command on Windows (#2752)

* fix: fix build:deps command on Windows

* fix: add escaped quotes

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>

* misc db compatibility fixes

---------

Co-authored-by: Alex Inkin <alexander@inkin.ru>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
---
 .../src/Adapters/EffectCreator.ts             |   8 +-
 container-runtime/src/Adapters/RpcListener.ts |  11 +-
 .../Systems/SystemForEmbassy/index.ts         | 107 ++++++++--
 .../src/Adapters/Systems/SystemForStartOs.ts  |   6 -
 container-runtime/src/Interfaces/System.ts    |   5 -
 .../src/Models/CallbackHolder.ts              |   3 +-
 container-runtime/src/Models/JsonPath.ts      |   2 -
 core/models/src/procedure_name.rs             |   2 -
 core/startos/src/action.rs                    |  99 +++++++++-
 core/startos/src/db/mod.rs                    |  24 ++-
 core/startos/src/db/model/package.rs          |  19 +-
 core/startos/src/lib.rs                       |  10 -
 core/startos/src/logs.rs                      |   2 +-
 core/startos/src/properties.rs                |  35 ----
 core/startos/src/service/effects/net/bind.rs  |   1 +
 core/startos/src/service/mod.rs               |   2 +-
 .../src/service/persistent_container.rs       |  34 +++-
 core/startos/src/service/properties.rs        |  23 ---
 core/startos/src/util/logger.rs               |   8 +-
 core/startos/src/version/mod.rs               |  14 +-
 sdk/Makefile                                  |   7 +-
 sdk/base/lib/Effects.ts                       |   2 +-
 sdk/base/lib/actions/index.ts                 |  58 +++++-
 sdk/base/lib/actions/setupActions.ts          |  10 +-
 sdk/base/lib/dependencies/Dependency.ts       |  21 --
 .../lib/dependencies/setupDependencies.ts     |  41 +---
 sdk/base/lib/osBindings/ActionRequest.ts      |   4 +-
 sdk/base/lib/osBindings/ActionResult.ts       |   7 +
 sdk/base/lib/osBindings/ActionResultV0.ts     |   8 +
 sdk/base/lib/osBindings/ActionResultV1.ts     |  18 ++
 sdk/base/lib/osBindings/ActionSeverity.ts     |   3 +
 sdk/base/lib/osBindings/ActionVisibility.ts   |   5 +-
 .../lib/osBindings/RequestActionParams.ts     |   4 +-
 sdk/base/lib/osBindings/index.ts              |   4 +
 sdk/base/lib/types.ts                         |  68 -------
 sdk/base/package.json                         |   4 +-
 sdk/package/lib/StartSdk.ts                   | 107 +++-------
 sdk/package/lib/backup/Backups.ts             |   8 +-
 sdk/package/lib/backup/setupBackups.ts        |   4 +-
 sdk/package/lib/index.ts                      |   2 +-
 sdk/package/lib/inits/setupInit.ts            |   8 +-
 sdk/package/lib/inits/setupInstall.ts         |  10 +-
 sdk/package/lib/inits/setupUninstall.ts       |  10 +-
 sdk/package/lib/mainFn/CommandController.ts   |   2 +-
 sdk/package/lib/mainFn/Daemon.ts              |   2 +-
 sdk/package/lib/mainFn/Daemons.ts             |   8 +-
 sdk/package/lib/mainFn/Mounts.ts              |   6 +-
 sdk/package/lib/mainFn/index.ts               |   2 +-
 sdk/package/lib/manifest/setupManifest.ts     |  18 +-
 sdk/package/lib/test/inputSpecBuilder.test.ts |  71 +++----
 sdk/package/lib/test/output.sdk.ts            |  75 +++----
 sdk/package/lib/util/fileHelper.ts            |  27 ++-
 sdk/package/package-lock.json                 |  33 ++--
 sdk/package/package.json                      |   6 +-
 web/README.md                                 |   2 +
 web/ionic.config.json                         |   6 -
 web/lint-staged.config.js                     |   1 -
 web/package.json                              |   5 +-
 .../src/app/pages/success/success.page.ts     |   2 +-
 .../shared/src/types/workspace-config.ts      |   2 +-
 .../app/app/preloader/preloader.component.ts  |   1 -
 .../ui/src/app/components/form.component.ts   |   7 +-
 .../src/app/modals/action-input.component.ts  |  67 ++++---
 ...t.ts => action-request-input.component.ts} |  33 ++--
 .../action-success-group.component.ts         |  54 +++++
 .../action-success-item.component.ts          | 184 ++++++++++++++++++
 .../action-success/action-success.module.ts   |  12 --
 .../action-success/action-success.page.html   |  35 ----
 .../action-success/action-success.page.scss   |   0
 .../action-success/action-success.page.ts     |  63 +++---
 .../app-actions/app-actions.module.ts         |   2 -
 .../app-actions/app-actions.page.html         |   4 +-
 .../app-actions/app-actions.page.ts           |  22 +--
 .../app-metrics/app-metrics.module.ts         |  26 ---
 .../app-metrics/app-metrics.page.html         |  25 ---
 .../app-metrics/app-metrics.page.scss         |   3 -
 .../app-metrics/app-metrics.page.ts           |  59 ------
 .../app-properties/app-properties.module.ts   |  32 ---
 .../app-properties/app-properties.page.html   | 119 -----------
 .../app-properties/app-properties.page.scss   |   3 -
 .../app-properties/app-properties.page.ts     | 147 --------------
 .../apps-routes/app-show/app-show.module.ts   |   2 +
 .../apps-routes/app-show/app-show.page.html   |   6 +
 .../apps-routes/app-show/app-show.page.ts     | 100 ++--------
 .../app-show-action-requests.component.html   |  45 +++++
 .../app-show-action-requests.component.scss   |  16 ++
 .../app-show-action-requests.component.ts     |  94 +++++++++
 .../app-show-dependencies.component.html      |   6 +-
 .../app-show-status.component.html            |  10 -
 .../app-show-status.component.ts              |  23 +--
 .../app-show/pipes/to-buttons.pipe.ts         |  48 +----
 .../pages/apps-routes/apps-routing.module.ts  |  14 --
 .../ui/src/app/services/action.service.ts     | 100 ++++------
 .../ui/src/app/services/api/api.fixures.ts    | 144 +++++++++-----
 .../ui/src/app/services/api/api.types.ts      |  19 +-
 .../app/services/api/embassy-api.service.ts   |  10 +-
 .../services/api/embassy-live-api.service.ts  |  17 +-
 .../services/api/embassy-mock-api.service.ts  |  33 ++--
 .../ui/src/app/services/api/mock-patch.ts     |  67 ++++++-
 .../ui/src/app/services/dep-error.service.ts  |   6 +-
 .../services/pkg-status-rendering.service.ts  |  15 +-
 web/projects/ui/src/app/util/dep-info.ts      |  30 +++
 .../ui/src/app/util/get-package-data.ts       |  12 --
 .../ui/src/app/util/get-package-info.ts       |   2 +-
 .../ui/src/app/util/properties.util.ts        | 150 --------------
 105 files changed, 1385 insertions(+), 1578 deletions(-)
 delete mode 100644 core/startos/src/properties.rs
 delete mode 100644 core/startos/src/service/properties.rs
 delete mode 100644 sdk/base/lib/dependencies/Dependency.ts
 create mode 100644 sdk/base/lib/osBindings/ActionResult.ts
 create mode 100644 sdk/base/lib/osBindings/ActionResultV0.ts
 create mode 100644 sdk/base/lib/osBindings/ActionResultV1.ts
 create mode 100644 sdk/base/lib/osBindings/ActionSeverity.ts
 rename web/projects/ui/src/app/modals/{action-dep.component.ts => action-request-input.component.ts} (77%)
 create mode 100644 web/projects/ui/src/app/modals/action-success/action-success-group.component.ts
 create mode 100644 web/projects/ui/src/app/modals/action-success/action-success-item.component.ts
 delete mode 100644 web/projects/ui/src/app/modals/action-success/action-success.module.ts
 delete mode 100644 web/projects/ui/src/app/modals/action-success/action-success.page.html
 delete mode 100644 web/projects/ui/src/app/modals/action-success/action-success.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.module.ts
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.html
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.module.ts
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.scss
 delete mode 100644 web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
 create mode 100644 web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.html
 create mode 100644 web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.scss
 create mode 100644 web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.ts
 create mode 100644 web/projects/ui/src/app/util/dep-info.ts
 delete mode 100644 web/projects/ui/src/app/util/properties.util.ts

diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index db176536f..4ec3a5b7d 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -150,15 +150,15 @@ export function makeEffects(context: EffectContext): Effects {
         stack: new Error().stack,
       }) as ReturnType<T.Effects["bind"]>
     },
-    clearBindings(...[]: Parameters<T.Effects["clearBindings"]>) {
-      return rpcRound("clear-bindings", {}) as ReturnType<
+    clearBindings(...[options]: Parameters<T.Effects["clearBindings"]>) {
+      return rpcRound("clear-bindings", { ...options }) as ReturnType<
         T.Effects["clearBindings"]
       >
     },
     clearServiceInterfaces(
-      ...[]: Parameters<T.Effects["clearServiceInterfaces"]>
+      ...[options]: Parameters<T.Effects["clearServiceInterfaces"]>
     ) {
-      return rpcRound("clear-service-interfaces", {}) as ReturnType<
+      return rpcRound("clear-service-interfaces", { ...options }) as ReturnType<
         T.Effects["clearServiceInterfaces"]
       >
     },
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index de2bb7f1a..f84f7b282 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -42,6 +42,7 @@ export const matchRpcResult = anyOf(
     ),
   }),
 )
+
 export type RpcResult = typeof matchRpcResult._TYPE
 type SocketResponse = ({ jsonrpc: "2.0"; id: IdType } & RpcResult) | null
 
@@ -88,7 +89,7 @@ const sandboxRunType = object(
 const callbackType = object({
   method: literal("callback"),
   params: object({
-    callback: number,
+    id: number,
     args: array,
   }),
 })
@@ -288,8 +289,8 @@ export class RpcListener {
 
         return handleRpc(id, result)
       })
-      .when(callbackType, async ({ params: { callback, args } }) => {
-        this.callCallback(callback, args)
+      .when(callbackType, async ({ params: { id, args } }) => {
+        this.callCallback(id, args)
         return null
       })
       .when(startType, async ({ id }) => {
@@ -410,7 +411,7 @@ export class RpcListener {
     input: any,
   ) {
     const ensureResultTypeShape = (
-      result: void | T.ActionInput | T.PropertiesReturn | T.ActionResult | null,
+      result: void | T.ActionInput | T.ActionResult | null,
     ): { result: any } => {
       if (isResult(result)) return result
       return { result }
@@ -428,8 +429,6 @@ export class RpcListener {
           return system.createBackup(effects, timeout || null)
         case "/backup/restore":
           return system.restoreBackup(effects, timeout || null)
-        case "/properties":
-          return system.properties(effects, timeout || null)
         case "/packageInit":
           return system.packageInit(effects, timeout || null)
         case "/packageUninit":
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index bed30b11a..ae55eb690 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -135,6 +135,34 @@ type OldGetConfigRes = {
   spec: OldConfigSpec
 }
 
+export type PropertiesValue =
+  | {
+      /** The type of this value, either "string" or "object" */
+      type: "object"
+      /** A nested mapping of values. The user will experience this as a nested page with back button */
+      value: { [k: string]: PropertiesValue }
+      /** (optional) A human readable description of the new set of values */
+      description: string | null
+    }
+  | {
+      /** The type of this value, either "string" or "object" */
+      type: "string"
+      /** The value to display to the user */
+      value: string
+      /** A human readable description of the value */
+      description: string | null
+      /** Whether or not to mask the value, for example, when displaying a password */
+      masked: boolean | null
+      /** Whether or not to include a button for copying the value to clipboard */
+      copyable: boolean | null
+      /** Whether or not to include a button for displaying the value as a QR code */
+      qr: boolean | null
+    }
+
+export type PropertiesReturn = {
+  [key: string]: PropertiesValue
+}
+
 export type PackagePropertiesV2 = {
   [name: string]: PackagePropertyObject | PackagePropertyString
 }
@@ -157,7 +185,7 @@ export type PackagePropertyObject = {
 
 const asProperty_ = (
   x: PackagePropertyString | PackagePropertyObject,
-): T.PropertiesValue => {
+): PropertiesValue => {
   if (x.type === "object") {
     return {
       ...x,
@@ -177,7 +205,7 @@ const asProperty_ = (
     ...x,
   }
 }
-const asProperty = (x: PackagePropertiesV2): T.PropertiesReturn =>
+const asProperty = (x: PackagePropertiesV2): PropertiesReturn =>
   Object.fromEntries(
     Object.entries(x).map(([key, value]) => [key, asProperty_(value)]),
   )
@@ -214,6 +242,31 @@ const matchProperties = object({
   data: matchPackageProperties,
 })
 
+function convertProperties(
+  name: string,
+  value: PropertiesValue,
+): T.ActionResultV1 {
+  if (value.type === "string") {
+    return {
+      type: "string",
+      name,
+      description: value.description,
+      copyable: value.copyable || false,
+      masked: value.masked || false,
+      qr: value.qr || false,
+      value: value.value,
+    }
+  }
+  return {
+    type: "object",
+    name,
+    description: value.description || undefined,
+    value: Object.entries(value.value).map(([name, value]) =>
+      convertProperties(name, value),
+    ),
+  }
+}
+
 const DEFAULT_REGISTRY = "https://registry.start9.com"
 export class SystemForEmbassy implements System {
   currentRunning: MainLoop | undefined
@@ -245,6 +298,9 @@ export class SystemForEmbassy implements System {
         await this.dependenciesAutoconfig(effects, depId, null)
       }
     }
+    await effects.setMainStatus({ status: "stopped" })
+    await this.exportActions(effects)
+    await this.exportNetwork(effects)
   }
 
   async exit(): Promise<void> {
@@ -281,10 +337,15 @@ export class SystemForEmbassy implements System {
       await effects.setDataVersion({
         version: ExtendedVersion.parseEmver(this.manifest.version).toString(),
       })
+    } else {
+      await effects.action.request({
+        packageId: this.manifest.id,
+        actionId: "config",
+        severity: "critical",
+        replayId: "needs-config",
+        reason: "This service must be configured before it can be run",
+      })
     }
-    await effects.setMainStatus({ status: "stopped" })
-    await this.exportActions(effects)
-    await this.exportNetwork(effects)
   }
   async exportNetwork(effects: Effects) {
     for (const [id, interfaceValue] of Object.entries(
@@ -375,6 +436,8 @@ export class SystemForEmbassy implements System {
     if (actionId === "config") {
       const config = await this.getConfig(effects, timeoutMs)
       return { spec: config.spec, value: config.config }
+    } else if (actionId === "properties") {
+      return null
     } else {
       const oldSpec = this.manifest.actions?.[actionId]?.["input-spec"]
       if (!oldSpec) return null
@@ -393,6 +456,17 @@ export class SystemForEmbassy implements System {
     if (actionId === "config") {
       await this.setConfig(effects, input, timeoutMs)
       return null
+    } else if (actionId === "properties") {
+      return {
+        version: "1",
+        type: "object",
+        name: "Properties",
+        description:
+          "Runtime information, credentials, and other values of interest",
+        value: Object.entries(await this.properties(effects, timeoutMs)).map(
+          ([name, value]) => convertProperties(name, value),
+        ),
+      }
     } else {
       return this.action(effects, actionId, input, timeoutMs)
     }
@@ -405,17 +479,21 @@ export class SystemForEmbassy implements System {
     if (manifest.config) {
       actions.config = {
         name: "Configure",
-        description: "Edit the configuration of this service",
+        description: `Customize ${manifest.title}`,
         "allowed-statuses": ["running", "stopped"],
         "input-spec": {},
         implementation: { type: "script", args: [] },
       }
-      await effects.action.request({
-        packageId: this.manifest.id,
-        actionId: "config",
-        replayId: "needs-config",
-        description: "This service must be configured before it can be run",
-      })
+    }
+    if (manifest.properties) {
+      actions.properties = {
+        name: "Properties",
+        description:
+          "Runtime information, credentials, and other values of interest",
+        "allowed-statuses": ["running", "stopped"],
+        "input-spec": null,
+        implementation: { type: "script", args: [] },
+      }
     }
     for (const [actionId, action] of Object.entries(actions)) {
       const hasRunning = !!action["allowed-statuses"].find(
@@ -694,7 +772,7 @@ export class SystemForEmbassy implements System {
   async properties(
     effects: Effects,
     timeoutMs: number | null,
-  ): Promise<T.PropertiesReturn> {
+  ): Promise<PropertiesReturn> {
     // TODO BLU-J set the properties ever so often
     const setConfigValue = this.manifest.properties
     if (!setConfigValue) throw new Error("There is no properties")
@@ -867,7 +945,8 @@ export class SystemForEmbassy implements System {
         actionId: "config",
         packageId: id,
         replayId: `${id}/config`,
-        description: `Configure this dependency for the needs of ${this.manifest.title}`,
+        severity: "important",
+        reason: `Configure this dependency for the needs of ${this.manifest.title}`,
         input: {
           kind: "partial",
           value: diff.diff,
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index c000b391b..51b7c24b8 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -57,12 +57,6 @@ export class SystemForStartOs implements System {
       effects,
     }))
   }
-  properties(
-    effects: Effects,
-    timeoutMs: number | null,
-  ): Promise<T.PropertiesReturn> {
-    throw new Error("Method not implemented.")
-  }
   getActionInput(
     effects: Effects,
     id: string,
diff --git a/container-runtime/src/Interfaces/System.ts b/container-runtime/src/Interfaces/System.ts
index 14ca002ca..63781cfbd 100644
--- a/container-runtime/src/Interfaces/System.ts
+++ b/container-runtime/src/Interfaces/System.ts
@@ -8,7 +8,6 @@ export type Procedure =
   | "/packageUninit"
   | "/backup/create"
   | "/backup/restore"
-  | "/properties"
   | `/actions/${string}/getInput`
   | `/actions/${string}/run`
 
@@ -30,10 +29,6 @@ export type System = {
 
   createBackup(effects: T.Effects, timeoutMs: number | null): Promise<void>
   restoreBackup(effects: T.Effects, timeoutMs: number | null): Promise<void>
-  properties(
-    effects: Effects,
-    timeoutMs: number | null,
-  ): Promise<T.PropertiesReturn>
   runAction(
     effects: Effects,
     actionId: string,
diff --git a/container-runtime/src/Models/CallbackHolder.ts b/container-runtime/src/Models/CallbackHolder.ts
index e1034b473..ce474268a 100644
--- a/container-runtime/src/Models/CallbackHolder.ts
+++ b/container-runtime/src/Models/CallbackHolder.ts
@@ -1,6 +1,6 @@
 import { T } from "@start9labs/start-sdk"
 
-const CallbackIdCell = { inc: 0 }
+const CallbackIdCell = { inc: 1 }
 
 const callbackRegistry = new FinalizationRegistry(
   async (options: { cbs: Map<number, Function>; effects: T.Effects }) => {
@@ -23,6 +23,7 @@ export class CallbackHolder {
       return
     }
     const id = this.newId()
+    console.error("adding callback", id)
     this.callbacks.set(id, callback)
     if (this.effects)
       callbackRegistry.register(this, {
diff --git a/container-runtime/src/Models/JsonPath.ts b/container-runtime/src/Models/JsonPath.ts
index a231adba7..d101836da 100644
--- a/container-runtime/src/Models/JsonPath.ts
+++ b/container-runtime/src/Models/JsonPath.ts
@@ -23,8 +23,6 @@ export const jsonPath = some(
     "/packageUninit",
     "/backup/create",
     "/backup/restore",
-    "/actions/metadata",
-    "/properties",
   ),
   string.refine(isNestedPath, "isNestedPath"),
 )
diff --git a/core/models/src/procedure_name.rs b/core/models/src/procedure_name.rs
index 9f8a6c0dd..4a4a682e6 100644
--- a/core/models/src/procedure_name.rs
+++ b/core/models/src/procedure_name.rs
@@ -7,7 +7,6 @@ pub enum ProcedureName {
     GetConfig,
     SetConfig,
     CreateBackup,
-    Properties,
     RestoreBackup,
     GetActionInput(ActionId),
     RunAction(ActionId),
@@ -23,7 +22,6 @@ impl ProcedureName {
             ProcedureName::SetConfig => "/config/set".to_string(),
             ProcedureName::GetConfig => "/config/get".to_string(),
             ProcedureName::CreateBackup => "/backup/create".to_string(),
-            ProcedureName::Properties => "/properties".to_string(),
             ProcedureName::RestoreBackup => "/backup/restore".to_string(),
             ProcedureName::RunAction(id) => format!("/actions/{}/run", id),
             ProcedureName::GetActionInput(id) => format!("/actions/{}/getInput", id),
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index a18173add..3f1912c34 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -6,6 +6,7 @@ use models::PackageId;
 use qrcode::QrCode;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
 use tracing::instrument;
 use ts_rs::TS;
 
@@ -74,21 +75,25 @@ pub async fn get_action_input(
         .await
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(tag = "version")]
+#[ts(export)]
 pub enum ActionResult {
     #[serde(rename = "0")]
     V0(ActionResultV0),
+    #[serde(rename = "1")]
+    V1(ActionResultV1),
 }
 impl fmt::Display for ActionResult {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::V0(res) => res.fmt(f),
+            Self::V1(res) => res.fmt(f),
         }
     }
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, TS)]
 pub struct ActionResultV0 {
     pub message: String,
     pub value: Option<String>,
@@ -116,6 +121,96 @@ impl fmt::Display for ActionResultV0 {
     }
 }
 
+#[derive(Debug, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[serde(rename_all_fields = "camelCase")]
+#[serde(tag = "type")]
+pub enum ActionResultV1 {
+    String {
+        name: String,
+        value: String,
+        description: Option<String>,
+        copyable: bool,
+        qr: bool,
+        masked: bool,
+    },
+    Object {
+        name: String,
+        value: Vec<ActionResultV1>,
+        #[ts(optional)]
+        description: Option<String>,
+    },
+}
+impl ActionResultV1 {
+    fn fmt_rec(&self, f: &mut fmt::Formatter<'_>, indent: usize) -> fmt::Result {
+        match self {
+            Self::String {
+                name,
+                value,
+                description,
+                qr,
+                ..
+            } => {
+                for i in 0..indent {
+                    write!(f, "  ")?;
+                }
+                write!(f, "{name}")?;
+                if let Some(description) = description {
+                    write!(f, ": {description}")?;
+                }
+                if !value.is_empty() {
+                    write!(f, ":\n")?;
+                    for i in 0..indent {
+                        write!(f, "  ")?;
+                    }
+                    write!(f, "{value}")?;
+                    if *qr {
+                        use qrcode::render::unicode;
+                        write!(f, "\n")?;
+                        for i in 0..indent {
+                            write!(f, "  ")?;
+                        }
+                        write!(
+                            f,
+                            "{}",
+                            QrCode::new(value.as_bytes())
+                                .unwrap()
+                                .render::<unicode::Dense1x2>()
+                                .build()
+                        )?;
+                    }
+                }
+            }
+            Self::Object {
+                name,
+                value,
+                description,
+            } => {
+                for i in 0..indent {
+                    write!(f, "  ")?;
+                }
+                write!(f, "{name}")?;
+                if let Some(description) = description {
+                    write!(f, ": {description}")?;
+                }
+                for value in value {
+                    write!(f, ":\n")?;
+                    for i in 0..indent {
+                        write!(f, "  ")?;
+                    }
+                    value.fmt_rec(f, indent + 1)?;
+                }
+            }
+        }
+        Ok(())
+    }
+}
+impl fmt::Display for ActionResultV1 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.fmt_rec(f, 0)
+    }
+}
+
 pub fn display_action_result<T: Serialize>(params: WithIoFormat<T>, result: Option<ActionResult>) {
     let Some(result) = result else {
         return;
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index 1ed7e9ab9..c7e38e81c 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -228,6 +228,8 @@ pub async fn subscribe(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliApplyParams {
+    #[arg(long)]
+    allow_model_mismatch: bool,
     expr: String,
     path: Option<PathBuf>,
 }
@@ -238,7 +240,12 @@ async fn cli_apply(
         context,
         parent_method,
         method,
-        params: CliApplyParams { expr, path },
+        params:
+            CliApplyParams {
+                allow_model_mismatch,
+                expr,
+                path,
+            },
         ..
     }: HandlerArgs<CliContext, CliApplyParams>,
 ) -> Result<(), RpcError> {
@@ -253,7 +260,14 @@ async fn cli_apply(
                     &expr,
                 )?;
 
-                Ok::<_, Error>((
+                let value = if allow_model_mismatch {
+                    serde_json::from_value::<Value>(res.clone().into()).with_ctx(|_| {
+                        (
+                            crate::ErrorKind::Deserialization,
+                            "result does not match database model",
+                        )
+                    })?
+                } else {
                     to_value(
                         &serde_json::from_value::<model::Database>(res.clone().into()).with_ctx(
                             |_| {
@@ -263,9 +277,9 @@ async fn cli_apply(
                                 )
                             },
                         )?,
-                    )?,
-                    (),
-                ))
+                    )?
+                };
+                Ok::<_, Error>((value, ()))
             })
             .await?;
     } else {
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index 5fb6b9655..df5773cc3 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -338,7 +338,7 @@ pub struct ActionMetadata {
 #[serde(rename_all_fields = "camelCase")]
 pub enum ActionVisibility {
     Hidden,
-    Disabled { reason: String },
+    Disabled(String),
     Enabled,
 }
 impl Default for ActionVisibility {
@@ -444,14 +444,29 @@ pub struct ActionRequestEntry {
 pub struct ActionRequest {
     pub package_id: PackageId,
     pub action_id: ActionId,
+    #[serde(default)]
+    pub severity: ActionSeverity,
     #[ts(optional)]
-    pub description: Option<String>,
+    pub reason: Option<String>,
     #[ts(optional)]
     pub when: Option<ActionRequestTrigger>,
     #[ts(optional)]
     pub input: Option<ActionRequestInput>,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "kebab-case")]
+#[ts(export)]
+pub enum ActionSeverity {
+    Critical,
+    Important,
+}
+impl Default for ActionSeverity {
+    fn default() -> Self {
+        ActionSeverity::Important
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 754362bc9..d9d626754 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -49,7 +49,6 @@ pub mod notifications;
 pub mod os_install;
 pub mod prelude;
 pub mod progress;
-pub mod properties;
 pub mod registry;
 pub mod rpc_continuations;
 pub mod s9pk;
@@ -395,15 +394,6 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .no_display()
                 .with_about("Display package logs"),
         )
-        .subcommand(
-            "properties",
-            from_fn_async(properties::properties)
-                .with_custom_display_fn(|_handle, result| {
-                    Ok(properties::display_properties(result))
-                })
-                .with_about("Display package Properties")
-                .with_call_remote::<CliContext>(),
-        )
         .subcommand(
             "backup",
             backup::package_backup::<C>()
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 7ff1d7d08..2db7e9952 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -113,7 +113,7 @@ async fn ws_handler(
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct LogResponse {
-    entries: Reversible<LogEntry>,
+    pub entries: Reversible<LogEntry>,
     start_cursor: Option<String>,
     end_cursor: Option<String>,
 }
diff --git a/core/startos/src/properties.rs b/core/startos/src/properties.rs
deleted file mode 100644
index e24b14965..000000000
--- a/core/startos/src/properties.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use clap::Parser;
-use imbl_value::{json, Value};
-use models::PackageId;
-use serde::{Deserialize, Serialize};
-
-use crate::context::RpcContext;
-use crate::prelude::*;
-use crate::Error;
-
-pub fn display_properties(response: Value) {
-    println!("{}", response);
-}
-
-#[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct PropertiesParam {
-    id: PackageId,
-}
-// #[command(display(display_properties))]
-pub async fn properties(
-    ctx: RpcContext,
-    PropertiesParam { id }: PropertiesParam,
-) -> Result<Value, Error> {
-    match &*ctx.services.get(&id).await {
-        Some(service) => Ok(json!({
-            "version": 2,
-            "data": service.properties().await?
-        })),
-        None => Err(Error::new(
-            eyre!("Could not find a service with id {id}"),
-            ErrorKind::NotFound,
-        )),
-    }
-}
diff --git a/core/startos/src/service/effects/net/bind.rs b/core/startos/src/service/effects/net/bind.rs
index 40bc550cb..5619375eb 100644
--- a/core/startos/src/service/effects/net/bind.rs
+++ b/core/startos/src/service/effects/net/bind.rs
@@ -32,6 +32,7 @@ pub async fn bind(
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct ClearBindingsParams {
+    #[serde(default)]
     pub except: Vec<BindId>,
 }
 
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index d7b91df7b..cc31efe11 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -55,7 +55,6 @@ pub mod cli;
 mod control;
 pub mod effects;
 pub mod persistent_container;
-mod properties;
 mod rpc;
 mod service_actor;
 pub mod service_map;
@@ -132,6 +131,7 @@ impl ServiceRef {
                             );
                             Ok(())
                         })?;
+                        d.as_private_mut().as_package_stores_mut().remove(&id)?;
                         Ok(Some(pde))
                     } else {
                         Ok(None)
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 3f85a95d5..13cb7688c 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -1,4 +1,5 @@
 use std::collections::{BTreeMap, BTreeSet};
+use std::ops::Deref;
 use std::path::Path;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
@@ -379,11 +380,7 @@ impl PersistentContainer {
             ));
         }
 
-        self.rpc_client
-            .request(rpc::Init, Empty {})
-            .await
-            .map_err(Error::from)
-            .log_err();
+        self.rpc_client.request(rpc::Init, Empty {}).await?;
 
         self.state.send_modify(|s| s.rt_initialized = true);
 
@@ -391,7 +388,10 @@ impl PersistentContainer {
     }
 
     #[instrument(skip_all)]
-    fn destroy(&mut self) -> Option<impl Future<Output = Result<(), Error>> + 'static> {
+    fn destroy(
+        &mut self,
+        error: bool,
+    ) -> Option<impl Future<Output = Result<(), Error>> + 'static> {
         if self.destroyed {
             return None;
         }
@@ -406,6 +406,24 @@ impl PersistentContainer {
         self.destroyed = true;
         Some(async move {
             let mut errs = ErrorCollection::new();
+            if error {
+                if let Some(lxc_container) = &lxc_container {
+                    if let Some(logs) = errs.handle(
+                        crate::logs::fetch_logs(
+                            crate::logs::LogSource::Container(lxc_container.guid.deref().clone()),
+                            Some(50),
+                            None,
+                            None,
+                            false,
+                        )
+                        .await,
+                    ) {
+                        for log in logs.entries.iter() {
+                            eprintln!("{log}");
+                        }
+                    }
+                }
+            }
             if let Some((hdl, shutdown)) = rpc_server {
                 errs.handle(rpc_client.request(rpc::Exit, Empty {}).await);
                 shutdown.shutdown();
@@ -433,7 +451,7 @@ impl PersistentContainer {
 
     #[instrument(skip_all)]
     pub async fn exit(mut self) -> Result<(), Error> {
-        if let Some(destroy) = self.destroy() {
+        if let Some(destroy) = self.destroy(false) {
             dbg!(destroy.await)?;
         }
         tracing::info!("Service for {} exited", self.s9pk.as_manifest().id);
@@ -551,7 +569,7 @@ impl PersistentContainer {
 
 impl Drop for PersistentContainer {
     fn drop(&mut self) {
-        if let Some(destroy) = self.destroy() {
+        if let Some(destroy) = self.destroy(true) {
             tokio::spawn(async move { destroy.await.log_err() });
         }
     }
diff --git a/core/startos/src/service/properties.rs b/core/startos/src/service/properties.rs
deleted file mode 100644
index 3f5201f1d..000000000
--- a/core/startos/src/service/properties.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::time::Duration;
-
-use models::ProcedureName;
-
-use crate::prelude::*;
-use crate::rpc_continuations::Guid;
-use crate::service::Service;
-
-impl Service {
-    // TODO: leave here or switch to Actor Message?
-    pub async fn properties(&self) -> Result<Value, Error> {
-        let container = &self.seed.persistent_container;
-        container
-            .execute::<Value>(
-                Guid::new(),
-                ProcedureName::Properties,
-                Value::Null,
-                Some(Duration::from_secs(30)),
-            )
-            .await
-            .with_kind(ErrorKind::Unknown)
-    }
-}
diff --git a/core/startos/src/util/logger.rs b/core/startos/src/util/logger.rs
index c7ab41ba2..c464b328d 100644
--- a/core/startos/src/util/logger.rs
+++ b/core/startos/src/util/logger.rs
@@ -1,3 +1,5 @@
+use std::io;
+
 use tracing::Subscriber;
 use tracing_subscriber::util::SubscriberInitExt;
 
@@ -21,7 +23,11 @@ impl EmbassyLogger {
         let filter_layer = filter_layer
             .add_directive("tokio=trace".parse().unwrap())
             .add_directive("runtime=trace".parse().unwrap());
-        let fmt_layer = fmt::layer().with_target(true);
+        let fmt_layer = fmt::layer()
+            .with_writer(io::stderr)
+            .with_line_number(true)
+            .with_file(true)
+            .with_target(true);
 
         let sub = tracing_subscriber::registry()
             .with(filter_layer)
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 76cc7a574..ae203f3e5 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -171,9 +171,17 @@ fn version_accessor(db: &mut Value) -> Option<&mut Value> {
 
 fn version_compat_accessor(db: &mut Value) -> Option<&mut Value> {
     if db.get("public").is_some() {
-        db.get_mut("public")?
-            .get_mut("serverInfo")?
-            .get_mut("versionCompat")
+        let server_info = db.get_mut("public")?.get_mut("serverInfo")?;
+        if server_info.get("versionCompat").is_some() {
+            server_info.get_mut("versionCompat")
+        } else {
+            if let Some(prev) = server_info.get("eosVersionCompat").cloned() {
+                server_info
+                    .as_object_mut()?
+                    .insert("versionCompat".into(), prev);
+            }
+            server_info.get_mut("versionCompat")
+        }
     } else {
         db.get_mut("server-info")?.get_mut("eos-version-compat")
     }
diff --git a/sdk/Makefile b/sdk/Makefile
index bc025709d..3f8ae533a 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -24,7 +24,7 @@ clean:
 package/lib/test/output.ts: package/node_modules package/lib/test/makeOutput.ts package/scripts/oldSpecToBuilder.ts
 	cd package && npm run buildOutput
 
-bundle: dist baseDist | test fmt
+bundle: baseDist dist | test fmt
 	touch dist
 
 base/lib/exver/exver.ts: base/node_modules base/lib/exver/exver.pegjs
@@ -67,9 +67,8 @@ base/node_modules: base/package.json
 
 node_modules: package/node_modules base/node_modules
 
-publish: bundle package/package.json README.md LICENSE
-	cd dist
-	npm publish --access=public
+publish: bundle package/package.json package/README.md package/LICENSE
+	cd dist && npm publish --access=public
 
 link: bundle
 	cd dist && npm link
diff --git a/sdk/base/lib/Effects.ts b/sdk/base/lib/Effects.ts
index 16d82464d..f985db77b 100644
--- a/sdk/base/lib/Effects.ts
+++ b/sdk/base/lib/Effects.ts
@@ -52,7 +52,7 @@ export type Effects = {
       options: RequestActionParams,
     ): Promise<null>
     clearRequests(
-      options: { only: ActionId[] } | { except: ActionId[] },
+      options: { only: string[] } | { except: string[] },
     ): Promise<null>
   }
 
diff --git a/sdk/base/lib/actions/index.ts b/sdk/base/lib/actions/index.ts
index cebb03ee1..2d052e072 100644
--- a/sdk/base/lib/actions/index.ts
+++ b/sdk/base/lib/actions/index.ts
@@ -1,5 +1,6 @@
 import * as T from "../types"
 import * as IST from "../actions/input/inputSpecTypes"
+import { Action } from "./setupActions"
 
 export type RunActionInput<Input> =
   | Input
@@ -43,23 +44,62 @@ export const runAction = async <
     })
   }
 }
+type GetActionInputType<
+  A extends Action<T.ActionId, any, any, Record<string, unknown>>,
+> = A extends Action<T.ActionId, any, any, infer I> ? I : never
 
-// prettier-ignore
-export type ActionRequest<T extends Omit<T.ActionRequest, "packageId">> =
-  T extends { when: { condition: "input-not-matches" } }
-    ? (T extends { input: T.ActionRequestInput } ? T : "input is required for condition 'input-not-matches'")
-    : T
+type ActionRequestBase = {
+  reason?: string
+  replayId?: string
+}
+type ActionRequestInput<
+  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
+> = {
+  kind: "partial"
+  value: Partial<GetActionInputType<T>>
+}
+export type ActionRequestOptions<
+  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
+> = ActionRequestBase &
+  (
+    | {
+        when?: Exclude<
+          T.ActionRequestTrigger,
+          { condition: "input-not-matches" }
+        >
+        input?: ActionRequestInput<T>
+      }
+    | {
+        when: T.ActionRequestTrigger & { condition: "input-not-matches" }
+        input: ActionRequestInput<T>
+      }
+  )
+
+const _validate: T.ActionRequest = {} as ActionRequestOptions<any> & {
+  actionId: string
+  packageId: string
+  severity: T.ActionSeverity
+}
 
 export const requestAction = <
-  T extends Omit<T.ActionRequest, "packageId">,
+  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
 >(options: {
   effects: T.Effects
-  request: ActionRequest<T> & { replayId?: string; packageId: T.PackageId }
+  packageId: T.PackageId
+  action: T
+  severity: T.ActionSeverity
+  options?: ActionRequestOptions<T>
 }) => {
-  const request = options.request
+  const request = options.options || {}
+  const actionId = options.action.id
   const req = {
     ...request,
-    replayId: request.replayId || `${request.packageId}:${request.actionId}`,
+    actionId,
+    packageId: options.packageId,
+    action: undefined,
+    severity: options.severity,
+    replayId: request.replayId || `${options.packageId}:${actionId}`,
   }
+  delete req.action
   return options.effects.action.request(req)
 }
diff --git a/sdk/base/lib/actions/setupActions.ts b/sdk/base/lib/actions/setupActions.ts
index 8c6b7734a..62d6cedd9 100644
--- a/sdk/base/lib/actions/setupActions.ts
+++ b/sdk/base/lib/actions/setupActions.ts
@@ -11,7 +11,7 @@ export type Run<
 > = (options: {
   effects: T.Effects
   input: ExtractInputSpecType<A> & Record<string, any>
-}) => Promise<T.ActionResult | null>
+}) => Promise<T.ActionResult | null | void | undefined>
 export type GetInput<
   A extends
     | Record<string, any>
@@ -19,7 +19,9 @@ export type GetInput<
     | InputSpec<Record<string, any>, never>,
 > = (options: {
   effects: T.Effects
-}) => Promise<null | (ExtractInputSpecType<A> & Record<string, any>)>
+}) => Promise<
+  null | void | undefined | (ExtractInputSpecType<A> & Record<string, any>)
+>
 
 export type MaybeFn<T> = T | ((options: { effects: T.Effects }) => Promise<T>)
 function callMaybeFn<T>(
@@ -91,7 +93,7 @@ export class Action<
   ): Action<Id, Store, {}, {}> {
     return new Action(
       id,
-      mapMaybeFn(metadata, (m) => ({ ...m, hasInput: true })),
+      mapMaybeFn(metadata, (m) => ({ ...m, hasInput: false })),
       {},
       async () => null,
       run,
@@ -114,7 +116,7 @@ export class Action<
     effects: T.Effects
     input: Type
   }): Promise<T.ActionResult | null> {
-    return this.runFn(options)
+    return (await this.runFn(options)) || null
   }
 }
 
diff --git a/sdk/base/lib/dependencies/Dependency.ts b/sdk/base/lib/dependencies/Dependency.ts
deleted file mode 100644
index 8a1a862c7..000000000
--- a/sdk/base/lib/dependencies/Dependency.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { VersionRange } from "../exver"
-
-export class Dependency {
-  constructor(
-    readonly data:
-      | {
-          /** Either "running" or "exists". Does the dependency need to be running, or does it only need to exist? */
-          type: "running"
-          /** The acceptable version range of the dependency. */
-          versionRange: VersionRange
-          /** A list of the dependency's health check IDs that must be passing for the service to be satisfied. */
-          healthChecks: string[]
-        }
-      | {
-          /** Either "running" or "exists". Does the dependency need to be running, or does it only need to exist? */
-          type: "exists"
-          /** The acceptable version range of the dependency. */
-          versionRange: VersionRange
-        },
-  ) {}
-}
diff --git a/sdk/base/lib/dependencies/setupDependencies.ts b/sdk/base/lib/dependencies/setupDependencies.ts
index 9d613ff74..f694c042c 100644
--- a/sdk/base/lib/dependencies/setupDependencies.ts
+++ b/sdk/base/lib/dependencies/setupDependencies.ts
@@ -1,22 +1,11 @@
 import * as T from "../types"
 import { once } from "../util"
-import { Dependency } from "./Dependency"
 
-type DependencyType<Manifest extends T.Manifest> = {
-  [K in keyof {
-    [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false
-      ? K
-      : never
-  }]: Dependency
-} & {
-  [K in keyof {
-    [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends true
-      ? K
-      : never
-  }]?: Dependency
+type DependencyType<Manifest extends T.SDKManifest> = {
+  [K in keyof Manifest["dependencies"]]: Omit<T.DependencyRequirement, "id">
 }
 
-export function setupDependencies<Manifest extends T.Manifest>(
+export function setupDependencies<Manifest extends T.SDKManifest>(
   fn: (options: { effects: T.Effects }) => Promise<DependencyType<Manifest>>,
 ): (options: { effects: T.Effects }) => Promise<null> {
   const cell = { updater: async (_: { effects: T.Effects }) => null }
@@ -30,24 +19,12 @@ export function setupDependencies<Manifest extends T.Manifest>(
     const dependencyType = await fn(options)
     return await options.effects.setDependencies({
       dependencies: Object.entries(dependencyType).map(
-        ([
-          id,
-          {
-            data: { versionRange, ...x },
-          },
-        ]) => ({
-          id,
-          ...x,
-          ...(x.type === "running"
-            ? {
-                kind: "running",
-                healthChecks: x.healthChecks,
-              }
-            : {
-                kind: "exists",
-              }),
-          versionRange: versionRange.toString(),
-        }),
+        ([id, { versionRange, ...x }, ,]) =>
+          ({
+            id,
+            ...x,
+            versionRange: versionRange.toString(),
+          }) as T.DependencyRequirement,
       ),
     })
   }
diff --git a/sdk/base/lib/osBindings/ActionRequest.ts b/sdk/base/lib/osBindings/ActionRequest.ts
index 63b5607d8..552f37bc6 100644
--- a/sdk/base/lib/osBindings/ActionRequest.ts
+++ b/sdk/base/lib/osBindings/ActionRequest.ts
@@ -2,12 +2,14 @@
 import type { ActionId } from "./ActionId"
 import type { ActionRequestInput } from "./ActionRequestInput"
 import type { ActionRequestTrigger } from "./ActionRequestTrigger"
+import type { ActionSeverity } from "./ActionSeverity"
 import type { PackageId } from "./PackageId"
 
 export type ActionRequest = {
   packageId: PackageId
   actionId: ActionId
-  description?: string
+  severity: ActionSeverity
+  reason?: string
   when?: ActionRequestTrigger
   input?: ActionRequestInput
 }
diff --git a/sdk/base/lib/osBindings/ActionResult.ts b/sdk/base/lib/osBindings/ActionResult.ts
new file mode 100644
index 000000000..7422dcde3
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionResult.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionResultV0 } from "./ActionResultV0"
+import type { ActionResultV1 } from "./ActionResultV1"
+
+export type ActionResult =
+  | ({ version: "0" } & ActionResultV0)
+  | ({ version: "1" } & ActionResultV1)
diff --git a/sdk/base/lib/osBindings/ActionResultV0.ts b/sdk/base/lib/osBindings/ActionResultV0.ts
new file mode 100644
index 000000000..7c6b43d45
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionResultV0.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ActionResultV0 = {
+  message: string
+  value: string | null
+  copyable: boolean
+  qr: boolean
+}
diff --git a/sdk/base/lib/osBindings/ActionResultV1.ts b/sdk/base/lib/osBindings/ActionResultV1.ts
new file mode 100644
index 000000000..cda0e5df9
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionResultV1.ts
@@ -0,0 +1,18 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ActionResultV1 =
+  | {
+      type: "string"
+      name: string
+      value: string
+      description: string | null
+      copyable: boolean
+      qr: boolean
+      masked: boolean
+    }
+  | {
+      type: "object"
+      name: string
+      value: Array<ActionResultV1>
+      description?: string
+    }
diff --git a/sdk/base/lib/osBindings/ActionSeverity.ts b/sdk/base/lib/osBindings/ActionSeverity.ts
new file mode 100644
index 000000000..ad339f951
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionSeverity.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ActionSeverity = "critical" | "important"
diff --git a/sdk/base/lib/osBindings/ActionVisibility.ts b/sdk/base/lib/osBindings/ActionVisibility.ts
index f7d5a2a2a..ab1e6e1b9 100644
--- a/sdk/base/lib/osBindings/ActionVisibility.ts
+++ b/sdk/base/lib/osBindings/ActionVisibility.ts
@@ -1,6 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ActionVisibility =
-  | "hidden"
-  | { disabled: { reason: string } }
-  | "enabled"
+export type ActionVisibility = "hidden" | { disabled: string } | "enabled"
diff --git a/sdk/base/lib/osBindings/RequestActionParams.ts b/sdk/base/lib/osBindings/RequestActionParams.ts
index db83be595..ccc8d0e61 100644
--- a/sdk/base/lib/osBindings/RequestActionParams.ts
+++ b/sdk/base/lib/osBindings/RequestActionParams.ts
@@ -2,6 +2,7 @@
 import type { ActionId } from "./ActionId"
 import type { ActionRequestInput } from "./ActionRequestInput"
 import type { ActionRequestTrigger } from "./ActionRequestTrigger"
+import type { ActionSeverity } from "./ActionSeverity"
 import type { PackageId } from "./PackageId"
 import type { ReplayId } from "./ReplayId"
 
@@ -9,7 +10,8 @@ export type RequestActionParams = {
   replayId: ReplayId
   packageId: PackageId
   actionId: ActionId
-  description?: string
+  severity: ActionSeverity
+  reason?: string
   when?: ActionRequestTrigger
   input?: ActionRequestInput
 }
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index 4b6af0ae1..5d5574acf 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -7,6 +7,10 @@ export { ActionRequestEntry } from "./ActionRequestEntry"
 export { ActionRequestInput } from "./ActionRequestInput"
 export { ActionRequestTrigger } from "./ActionRequestTrigger"
 export { ActionRequest } from "./ActionRequest"
+export { ActionResult } from "./ActionResult"
+export { ActionResultV0 } from "./ActionResultV0"
+export { ActionResultV1 } from "./ActionResultV1"
+export { ActionSeverity } from "./ActionSeverity"
 export { ActionVisibility } from "./ActionVisibility"
 export { AddAdminParams } from "./AddAdminParams"
 export { AddAssetParams } from "./AddAssetParams"
diff --git a/sdk/base/lib/types.ts b/sdk/base/lib/types.ts
index 071647961..d7ab1e51b 100644
--- a/sdk/base/lib/types.ts
+++ b/sdk/base/lib/types.ts
@@ -33,10 +33,6 @@ export const SIGKILL: Signals = "SIGKILL"
 export const NO_TIMEOUT = -1
 
 export type PathMaker = (options: { volume: string; path: string }) => string
-export type ExportedAction = (options: {
-  effects: Effects
-  input?: Record<string, unknown>
-}) => Promise<ActionResult>
 export type MaybePromise<A> = Promise<A> | A
 export namespace ExpectedExports {
   version: 1
@@ -86,10 +82,6 @@ export namespace ExpectedExports {
     nextVersion: null | string
   }) => Promise<unknown>
 
-  export type properties = (options: {
-    effects: Effects
-  }) => Promise<PropertiesReturn>
-
   export type manifest = Manifest
 
   export type actions = Actions<
@@ -105,7 +97,6 @@ export type ABI = {
   containerInit: ExpectedExports.containerInit
   packageInit: ExpectedExports.packageInit
   packageUninit: ExpectedExports.packageUninit
-  properties: ExpectedExports.properties
   manifest: ExpectedExports.manifest
   actions: ExpectedExports.actions
 }
@@ -177,58 +168,6 @@ export type ExposeServicePaths<Store = never> = {
   paths: ExposedStorePaths
 }
 
-export type SdkPropertiesValue =
-  | {
-      type: "object"
-      value: { [k: string]: SdkPropertiesValue }
-      description?: string
-    }
-  | {
-      type: "string"
-      /** The value to display to the user */
-      value: string
-      /** A human readable description or explanation of the value */
-      description?: string
-      /** Whether or not to mask the value, for example, when displaying a password */
-      masked?: boolean
-      /** Whether or not to include a button for copying the value to clipboard */
-      copyable?: boolean
-      /** Whether or not to include a button for displaying the value as a QR code */
-      qr?: boolean
-    }
-
-export type SdkPropertiesReturn = {
-  [key: string]: SdkPropertiesValue
-}
-
-export type PropertiesValue =
-  | {
-      /** The type of this value, either "string" or "object" */
-      type: "object"
-      /** A nested mapping of values. The user will experience this as a nested page with back button */
-      value: { [k: string]: PropertiesValue }
-      /** (optional) A human readable description of the new set of values */
-      description: string | null
-    }
-  | {
-      /** The type of this value, either "string" or "object" */
-      type: "string"
-      /** The value to display to the user */
-      value: string
-      /** A human readable description of the value */
-      description: string | null
-      /** Whether or not to mask the value, for example, when displaying a password */
-      masked: boolean | null
-      /** Whether or not to include a button for copying the value to clipboard */
-      copyable: boolean | null
-      /** Whether or not to include a button for displaying the value as a QR code */
-      qr: boolean | null
-    }
-
-export type PropertiesReturn = {
-  [key: string]: PropertiesValue
-}
-
 export type EffectMethod<T extends StringObject = Effects> = {
   [K in keyof T]-?: K extends string
     ? T[K] extends Function
@@ -264,13 +203,6 @@ export type Metadata = {
   mode: number
 }
 
-export type ActionResult = {
-  version: "0"
-  message: string
-  value: string | null
-  copyable: boolean
-  qr: boolean
-}
 export type SetResult = {
   dependsOn: DependsOn
   signal: Signals
diff --git a/sdk/base/package.json b/sdk/base/package.json
index 3d1d4b62e..e38cc5ac6 100644
--- a/sdk/base/package.json
+++ b/sdk/base/package.json
@@ -4,9 +4,9 @@
   "types": "./index.d.ts",
   "sideEffects": true,
   "scripts": {
-    "peggy": "peggy --allowed-start-rules '*' --plugin ./node_modules/ts-pegjs/dist/tspegjs -o lib/exver/exver.ts lib/exver/exver.pegjs",
+    "peggy": "peggy --allowed-start-rules \"*\" --plugin ./node_modules/ts-pegjs/dist/tspegjs -o lib/exver/exver.ts lib/exver/exver.pegjs",
     "test": "jest -c ./jest.config.js --coverage",
-    "buildOutput": "npx prettier --write '**/*.ts'",
+    "buildOutput": "npx prettier --write \"**/*.ts\"",
     "check": "tsc --noEmit",
     "tsc": "tsc"
   },
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index 412dafe52..12e92faf2 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -55,7 +55,6 @@ import { getStore } from "./store/getStore"
 import { CommandOptions, MountOptions, SubContainer } from "./util/SubContainer"
 import { splitCommand } from "./util"
 import { Mounts } from "./mainFn/Mounts"
-import { Dependency } from "../../base/lib/dependencies/Dependency"
 import { setupDependencies } from "../../base/lib/dependencies/setupDependencies"
 import * as T from "../../base/lib/types"
 import { testTypeVersion } from "../../base/lib/exver"
@@ -86,12 +85,12 @@ type AnyNeverCond<T extends any[], Then, Else> =
     T extends [any, ...infer U] ? AnyNeverCond<U,Then, Else> :
     never
 
-export class StartSdk<Manifest extends T.Manifest, Store> {
+export class StartSdk<Manifest extends T.SDKManifest, Store> {
   private constructor(readonly manifest: Manifest) {}
   static of() {
     return new StartSdk<never, never>(null as never)
   }
-  withManifest<Manifest extends T.Manifest = never>(manifest: Manifest) {
+  withManifest<Manifest extends T.SDKManifest = never>(manifest: Manifest) {
     return new StartSdk<Manifest, Store>(manifest)
   }
   withStore<Store extends Record<string, any>>() {
@@ -141,17 +140,39 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
       ...startSdkEffectWrapper,
       action: {
         run: actions.runAction,
-        request: actions.requestAction,
-        requestOwn: <T extends Omit<T.ActionRequest, "packageId">>(
+        request: <
+          T extends Action<T.ActionId, any, any, Record<string, unknown>>,
+        >(
           effects: T.Effects,
-          request: actions.ActionRequest<T> & {
-            replayId?: string
-          },
+          packageId: T.PackageId,
+          action: T,
+          severity: T.ActionSeverity,
+          options?: actions.ActionRequestOptions<T>,
+        ) =>
+          actions.requestAction({
+            effects,
+            packageId,
+            action,
+            severity,
+            options: options,
+          }),
+        requestOwn: <
+          T extends Action<T.ActionId, Store, any, Record<string, unknown>>,
+        >(
+          effects: T.Effects,
+          action: T,
+          severity: T.ActionSeverity,
+          options?: actions.ActionRequestOptions<T>,
         ) =>
           actions.requestAction({
             effects,
-            request: { ...request, packageId: this.manifest.id },
+            packageId: this.manifest.id,
+            action,
+            severity,
+            options: options,
           }),
+        clearRequest: (effects: T.Effects, ...replayIds: string[]) =>
+          effects.action.clearRequests({ only: replayIds }),
       },
       checkDependencies: checkDependencies as <
         DependencyId extends keyof Manifest["dependencies"] &
@@ -370,17 +391,6 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
           return healthCheck(o)
         },
       },
-      Dependency: {
-        /**
-         * @description Use this function to create a dependency for the service.
-         * @property {DependencyType} type
-         * @property {VersionRange} versionRange
-         * @property {string[]} healthChecks
-         */
-        of(data: Dependency["data"]) {
-          return new Dependency({ ...data })
-        },
-      },
       healthCheck: {
         checkPortListening,
         checkWebUrl,
@@ -566,37 +576,6 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
           started(onTerm: () => PromiseLike<void>): PromiseLike<null>
         }) => Promise<Daemons<Manifest, any>>,
       ) => setupMain<Manifest, Store>(fn),
-      /**
-       * @description Use this function to determine which information to expose to the UI in the "Properties" section.
-       *
-       *   Values can be obtained from anywhere: the Store, the upstream service, or another service.
-       * @example
-       * In this example, we retrieve the admin password from the Store and expose it, masked and copyable, to
-       * the UI as "Admin Password".
-       *
-       * ```
-        export const properties = sdk.setupProperties(async ({ effects }) => {
-          const store = await sdk.store.getOwn(effects, sdk.StorePath).once()
-       
-          return {
-            'Admin Password': {
-              type: 'string',
-              value: store.adminPassword,
-              description: 'Used for logging into the admin UI',
-              copyable: true,
-              masked: true,
-              qr: false,
-            },
-          }
-        })
-       * ```
-       */
-      setupProperties:
-        (
-          fn: (options: { effects: Effects }) => Promise<T.SdkPropertiesReturn>,
-        ): T.ExpectedExports.properties =>
-        (options) =>
-          fn(options).then(nullifyProperties),
       /**
        * Use this function to execute arbitrary logic *once*, on uninstall only. Most services will not use this.
        */
@@ -1057,6 +1036,7 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
          * ```
          */
         list: Value.list,
+        hidden: Value.hidden,
         dynamicToggle: (
           a: LazyBuild<
             Store,
@@ -1367,7 +1347,7 @@ export class StartSdk<Manifest extends T.Manifest, Store> {
   }
 }
 
-export async function runCommand<Manifest extends T.Manifest>(
+export async function runCommand<Manifest extends T.SDKManifest>(
   effects: Effects,
   image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean },
   command: string | [string, ...string[]],
@@ -1385,26 +1365,3 @@ export async function runCommand<Manifest extends T.Manifest>(
     (subcontainer) => subcontainer.exec(commands),
   )
 }
-function nullifyProperties(value: T.SdkPropertiesReturn): T.PropertiesReturn {
-  return Object.fromEntries(
-    Object.entries(value).map(([k, v]) => [k, nullifyProperties_(v)]),
-  )
-}
-function nullifyProperties_(value: T.SdkPropertiesValue): T.PropertiesValue {
-  if (value.type === "string") {
-    return {
-      description: null,
-      copyable: null,
-      masked: null,
-      qr: null,
-      ...value,
-    }
-  }
-  return {
-    description: null,
-    ...value,
-    value: Object.fromEntries(
-      Object.entries(value.value).map(([k, v]) => [k, nullifyProperties_(v)]),
-    ),
-  }
-}
diff --git a/sdk/package/lib/backup/Backups.ts b/sdk/package/lib/backup/Backups.ts
index 8d8f03295..c27f2be72 100644
--- a/sdk/package/lib/backup/Backups.ts
+++ b/sdk/package/lib/backup/Backups.ts
@@ -35,7 +35,7 @@ export type BackupSync<Volumes extends string> = {
  * ).build()q
  * ```
  */
-export class Backups<M extends T.Manifest> {
+export class Backups<M extends T.SDKManifest> {
   private constructor(
     private options = DEFAULT_OPTIONS,
     private restoreOptions: Partial<T.SyncOptions> = {},
@@ -43,7 +43,7 @@ export class Backups<M extends T.Manifest> {
     private backupSet = [] as BackupSync<M["volumes"][number]>[],
   ) {}
 
-  static withVolumes<M extends T.Manifest = never>(
+  static withVolumes<M extends T.SDKManifest = never>(
     ...volumeNames: Array<M["volumes"][number]>
   ): Backups<M> {
     return Backups.withSyncs(
@@ -54,13 +54,13 @@ export class Backups<M extends T.Manifest> {
     )
   }
 
-  static withSyncs<M extends T.Manifest = never>(
+  static withSyncs<M extends T.SDKManifest = never>(
     ...syncs: BackupSync<M["volumes"][number]>[]
   ) {
     return syncs.reduce((acc, x) => acc.addSync(x), new Backups<M>())
   }
 
-  static withOptions<M extends T.Manifest = never>(
+  static withOptions<M extends T.SDKManifest = never>(
     options?: Partial<T.SyncOptions>,
   ) {
     return new Backups<M>({ ...DEFAULT_OPTIONS, ...options })
diff --git a/sdk/package/lib/backup/setupBackups.ts b/sdk/package/lib/backup/setupBackups.ts
index b9654824b..722d245ff 100644
--- a/sdk/package/lib/backup/setupBackups.ts
+++ b/sdk/package/lib/backup/setupBackups.ts
@@ -2,7 +2,7 @@ import { Backups } from "./Backups"
 import * as T from "../../../base/lib/types"
 import { _ } from "../util"
 
-export type SetupBackupsParams<M extends T.Manifest> =
+export type SetupBackupsParams<M extends T.SDKManifest> =
   | M["volumes"][number][]
   | ((_: { effects: T.Effects }) => Promise<Backups<M>>)
 
@@ -11,7 +11,7 @@ type SetupBackupsRes = {
   restoreBackup: T.ExpectedExports.restoreBackup
 }
 
-export function setupBackups<M extends T.Manifest>(
+export function setupBackups<M extends T.SDKManifest>(
   options: SetupBackupsParams<M>,
 ) {
   let backupsFactory: (_: { effects: T.Effects }) => Promise<Backups<M>>
diff --git a/sdk/package/lib/index.ts b/sdk/package/lib/index.ts
index a83e35745..3619765e1 100644
--- a/sdk/package/lib/index.ts
+++ b/sdk/package/lib/index.ts
@@ -28,7 +28,7 @@ export {
 export { Daemons } from "./mainFn/Daemons"
 export { SubContainer } from "./util/SubContainer"
 export { StartSdk } from "./StartSdk"
-export { setupManifest } from "./manifest/setupManifest"
+export { setupManifest, buildManifest } from "./manifest/setupManifest"
 export { FileHelper } from "./util/fileHelper"
 export { setupExposeStore } from "./store/setupExposeStore"
 export { pathBuilder } from "../../base/lib/util/PathBuilder"
diff --git a/sdk/package/lib/inits/setupInit.ts b/sdk/package/lib/inits/setupInit.ts
index af2503dad..8d30f5b1f 100644
--- a/sdk/package/lib/inits/setupInit.ts
+++ b/sdk/package/lib/inits/setupInit.ts
@@ -7,12 +7,14 @@ import { VersionGraph } from "../version/VersionGraph"
 import { Install } from "./setupInstall"
 import { Uninstall } from "./setupUninstall"
 
-export function setupInit<Manifest extends T.Manifest, Store>(
-  versions: VersionGraph<Manifest["version"]>,
+export function setupInit<Manifest extends T.SDKManifest, Store>(
+  versions: VersionGraph<string>,
   install: Install<Manifest, Store>,
   uninstall: Uninstall<Manifest, Store>,
   setServiceInterfaces: UpdateServiceInterfaces<any>,
-  setDependencies: (options: { effects: T.Effects }) => Promise<null>,
+  setDependencies: (options: {
+    effects: T.Effects
+  }) => Promise<null | void | undefined>,
   actions: Actions<Store, any>,
   exposedStore: ExposedStorePaths,
 ): {
diff --git a/sdk/package/lib/inits/setupInstall.ts b/sdk/package/lib/inits/setupInstall.ts
index 9b5e92afe..38a96a00b 100644
--- a/sdk/package/lib/inits/setupInstall.ts
+++ b/sdk/package/lib/inits/setupInstall.ts
@@ -1,11 +1,11 @@
 import * as T from "../../../base/lib/types"
 
-export type InstallFn<Manifest extends T.Manifest, Store> = (opts: {
+export type InstallFn<Manifest extends T.SDKManifest, Store> = (opts: {
   effects: T.Effects
-}) => Promise<null>
-export class Install<Manifest extends T.Manifest, Store> {
+}) => Promise<null | void | undefined>
+export class Install<Manifest extends T.SDKManifest, Store> {
   private constructor(readonly fn: InstallFn<Manifest, Store>) {}
-  static of<Manifest extends T.Manifest, Store>(
+  static of<Manifest extends T.SDKManifest, Store>(
     fn: InstallFn<Manifest, Store>,
   ) {
     return new Install(fn)
@@ -18,7 +18,7 @@ export class Install<Manifest extends T.Manifest, Store> {
   }
 }
 
-export function setupInstall<Manifest extends T.Manifest, Store>(
+export function setupInstall<Manifest extends T.SDKManifest, Store>(
   fn: InstallFn<Manifest, Store>,
 ) {
   return Install.of(fn)
diff --git a/sdk/package/lib/inits/setupUninstall.ts b/sdk/package/lib/inits/setupUninstall.ts
index c169457ec..fc4a71b8e 100644
--- a/sdk/package/lib/inits/setupUninstall.ts
+++ b/sdk/package/lib/inits/setupUninstall.ts
@@ -1,11 +1,11 @@
 import * as T from "../../../base/lib/types"
 
-export type UninstallFn<Manifest extends T.Manifest, Store> = (opts: {
+export type UninstallFn<Manifest extends T.SDKManifest, Store> = (opts: {
   effects: T.Effects
-}) => Promise<null>
-export class Uninstall<Manifest extends T.Manifest, Store> {
+}) => Promise<null | void | undefined>
+export class Uninstall<Manifest extends T.SDKManifest, Store> {
   private constructor(readonly fn: UninstallFn<Manifest, Store>) {}
-  static of<Manifest extends T.Manifest, Store>(
+  static of<Manifest extends T.SDKManifest, Store>(
     fn: UninstallFn<Manifest, Store>,
   ) {
     return new Uninstall(fn)
@@ -22,7 +22,7 @@ export class Uninstall<Manifest extends T.Manifest, Store> {
   }
 }
 
-export function setupUninstall<Manifest extends T.Manifest, Store>(
+export function setupUninstall<Manifest extends T.SDKManifest, Store>(
   fn: UninstallFn<Manifest, Store>,
 ) {
   return Uninstall.of(fn)
diff --git a/sdk/package/lib/mainFn/CommandController.ts b/sdk/package/lib/mainFn/CommandController.ts
index 601b759e6..27089ea86 100644
--- a/sdk/package/lib/mainFn/CommandController.ts
+++ b/sdk/package/lib/mainFn/CommandController.ts
@@ -20,7 +20,7 @@ export class CommandController {
     private process: cp.ChildProcessWithoutNullStreams,
     readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {}
-  static of<Manifest extends T.Manifest>() {
+  static of<Manifest extends T.SDKManifest>() {
     return async <A extends string>(
       effects: T.Effects,
       subcontainer:
diff --git a/sdk/package/lib/mainFn/Daemon.ts b/sdk/package/lib/mainFn/Daemon.ts
index bde4654ee..7877dce08 100644
--- a/sdk/package/lib/mainFn/Daemon.ts
+++ b/sdk/package/lib/mainFn/Daemon.ts
@@ -17,7 +17,7 @@ export class Daemon {
   get subContainerHandle(): undefined | ExecSpawnable {
     return this.commandController?.subContainerHandle
   }
-  static of<Manifest extends T.Manifest>() {
+  static of<Manifest extends T.SDKManifest>() {
     return async <A extends string>(
       effects: T.Effects,
       subcontainer:
diff --git a/sdk/package/lib/mainFn/Daemons.ts b/sdk/package/lib/mainFn/Daemons.ts
index 4c2506d1d..4ad573b0b 100644
--- a/sdk/package/lib/mainFn/Daemons.ts
+++ b/sdk/package/lib/mainFn/Daemons.ts
@@ -27,7 +27,7 @@ export type Ready = {
 }
 
 type DaemonsParams<
-  Manifest extends T.Manifest,
+  Manifest extends T.SDKManifest,
   Ids extends string,
   Command extends string,
   Id extends string,
@@ -43,7 +43,7 @@ type DaemonsParams<
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
 
-export const runCommand = <Manifest extends T.Manifest>() =>
+export const runCommand = <Manifest extends T.SDKManifest>() =>
   CommandController.of<Manifest>()
 
 /**
@@ -69,7 +69,7 @@ Daemons.of({
 })
 ```
  */
-export class Daemons<Manifest extends T.Manifest, Ids extends string>
+export class Daemons<Manifest extends T.SDKManifest, Ids extends string>
   implements T.DaemonBuildable
 {
   private constructor(
@@ -89,7 +89,7 @@ export class Daemons<Manifest extends T.Manifest, Ids extends string>
    * @param options
    * @returns
    */
-  static of<Manifest extends T.Manifest>(options: {
+  static of<Manifest extends T.SDKManifest>(options: {
     effects: T.Effects
     started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>
     healthReceipts: HealthReceipt[]
diff --git a/sdk/package/lib/mainFn/Mounts.ts b/sdk/package/lib/mainFn/Mounts.ts
index 42d6d66ab..38b3ce2a7 100644
--- a/sdk/package/lib/mainFn/Mounts.ts
+++ b/sdk/package/lib/mainFn/Mounts.ts
@@ -3,7 +3,7 @@ import { MountOptions } from "../util/SubContainer"
 
 type MountArray = { path: string; options: MountOptions }[]
 
-export class Mounts<Manifest extends T.Manifest> {
+export class Mounts<Manifest extends T.SDKManifest> {
   private constructor(
     readonly volumes: {
       id: Manifest["volumes"][number]
@@ -25,7 +25,7 @@ export class Mounts<Manifest extends T.Manifest> {
     }[],
   ) {}
 
-  static of<Manifest extends T.Manifest>() {
+  static of<Manifest extends T.SDKManifest>() {
     return new Mounts<Manifest>([], [], [])
   }
 
@@ -57,7 +57,7 @@ export class Mounts<Manifest extends T.Manifest> {
     return this
   }
 
-  addDependency<DependencyManifest extends T.Manifest>(
+  addDependency<DependencyManifest extends T.SDKManifest>(
     dependencyId: keyof Manifest["dependencies"] & string,
     volumeId: DependencyManifest["volumes"][number],
     subpath: string | null,
diff --git a/sdk/package/lib/mainFn/index.ts b/sdk/package/lib/mainFn/index.ts
index f1373c44e..be30c652d 100644
--- a/sdk/package/lib/mainFn/index.ts
+++ b/sdk/package/lib/mainFn/index.ts
@@ -14,7 +14,7 @@ export const DEFAULT_SIGTERM_TIMEOUT = 30_000
  * @param fn
  * @returns
  */
-export const setupMain = <Manifest extends T.Manifest, Store>(
+export const setupMain = <Manifest extends T.SDKManifest, Store>(
   fn: (o: {
     effects: T.Effects
     started(onTerm: () => PromiseLike<void>): PromiseLike<null>
diff --git a/sdk/package/lib/manifest/setupManifest.ts b/sdk/package/lib/manifest/setupManifest.ts
index 088575c1a..eb83741c8 100644
--- a/sdk/package/lib/manifest/setupManifest.ts
+++ b/sdk/package/lib/manifest/setupManifest.ts
@@ -14,6 +14,23 @@ import { VersionGraph } from "../version/VersionGraph"
  * @param manifest Static properties of the package
  */
 export function setupManifest<
+  Id extends string,
+  Dependencies extends Record<string, unknown>,
+  VolumesTypes extends VolumeId,
+  AssetTypes extends VolumeId,
+  ImagesTypes extends ImageId,
+  Manifest extends {
+    dependencies: Dependencies
+    id: Id
+    assets: AssetTypes[]
+    images: Record<ImagesTypes, SDKImageInputSpec>
+    volumes: VolumesTypes[]
+  },
+>(manifest: SDKManifest & Manifest): SDKManifest & Manifest {
+  return manifest
+}
+
+export function buildManifest<
   Id extends string,
   Version extends string,
   Dependencies extends Record<string, unknown>,
@@ -27,7 +44,6 @@ export function setupManifest<
     images: Record<ImagesTypes, SDKImageInputSpec>
     volumes: VolumesTypes[]
   },
-  Satisfies extends string[] = [],
 >(
   versions: VersionGraph<Version>,
   manifest: SDKManifest & Manifest,
diff --git a/sdk/package/lib/test/inputSpecBuilder.test.ts b/sdk/package/lib/test/inputSpecBuilder.test.ts
index bb5a8e25d..f9d4321a6 100644
--- a/sdk/package/lib/test/inputSpecBuilder.test.ts
+++ b/sdk/package/lib/test/inputSpecBuilder.test.ts
@@ -367,48 +367,39 @@ describe("values", () => {
     test("datetime", async () => {
       const sdk = StartSdk.of()
         .withManifest(
-          setupManifest(
-            VersionGraph.of(
-              VersionInfo.of({
-                version: "1.0.0:0",
-                releaseNotes: "",
-                migrations: {},
-              }),
-            ),
-            {
-              id: "testOutput",
-              title: "",
-              license: "",
-              wrapperRepo: "",
-              upstreamRepo: "",
-              supportSite: "",
-              marketingSite: "",
-              donationUrl: null,
-              description: {
-                short: "",
-                long: "",
-              },
-              containers: {},
-              images: {},
-              volumes: [],
-              assets: [],
-              alerts: {
-                install: null,
-                update: null,
-                uninstall: null,
-                restore: null,
-                start: null,
-                stop: null,
-              },
-              dependencies: {
-                "remote-test": {
-                  description: "",
-                  optional: true,
-                  s9pk: "https://example.com/remote-test.s9pk",
-                },
+          setupManifest({
+            id: "testOutput",
+            title: "",
+            license: "",
+            wrapperRepo: "",
+            upstreamRepo: "",
+            supportSite: "",
+            marketingSite: "",
+            donationUrl: null,
+            description: {
+              short: "",
+              long: "",
+            },
+            containers: {},
+            images: {},
+            volumes: [],
+            assets: [],
+            alerts: {
+              install: null,
+              update: null,
+              uninstall: null,
+              restore: null,
+              start: null,
+              stop: null,
+            },
+            dependencies: {
+              "remote-test": {
+                description: "",
+                optional: true,
+                s9pk: "https://example.com/remote-test.s9pk",
               },
             },
-          ),
+          }),
         )
         .withStore<{ test: "a" }>()
         .build(true)
diff --git a/sdk/package/lib/test/output.sdk.ts b/sdk/package/lib/test/output.sdk.ts
index 4cdf85111..d87446585 100644
--- a/sdk/package/lib/test/output.sdk.ts
+++ b/sdk/package/lib/test/output.sdk.ts
@@ -6,51 +6,40 @@ import { VersionGraph } from "../version/VersionGraph"
 export type Manifest = any
 export const sdk = StartSdk.of()
   .withManifest(
-    setupManifest(
-      VersionGraph.of(
-        VersionInfo.of({
-          version: "1.0.0:0",
-          releaseNotes: "",
-          migrations: {},
-        })
-          .satisfies("#other:1.0.0:0")
-          .satisfies("#other:2.0.0:0"),
-      ),
-      {
-        id: "testOutput",
-        title: "",
-        license: "",
-        replaces: [],
-        wrapperRepo: "",
-        upstreamRepo: "",
-        supportSite: "",
-        marketingSite: "",
-        donationUrl: null,
-        description: {
-          short: "",
-          long: "",
-        },
-        containers: {},
-        images: {},
-        volumes: [],
-        assets: [],
-        alerts: {
-          install: null,
-          update: null,
-          uninstall: null,
-          restore: null,
-          start: null,
-          stop: null,
-        },
-        dependencies: {
-          "remote-test": {
-            description: "",
-            optional: false,
-            s9pk: "https://example.com/remote-test.s9pk",
-          },
+    setupManifest({
+      id: "testOutput",
+      title: "",
+      license: "",
+      replaces: [],
+      wrapperRepo: "",
+      upstreamRepo: "",
+      supportSite: "",
+      marketingSite: "",
+      donationUrl: null,
+      description: {
+        short: "",
+        long: "",
+      },
+      containers: {},
+      images: {},
+      volumes: [],
+      assets: [],
+      alerts: {
+        install: null,
+        update: null,
+        uninstall: null,
+        restore: null,
+        start: null,
+        stop: null,
+      },
+      dependencies: {
+        "remote-test": {
+          description: "",
+          optional: false,
+          s9pk: "https://example.com/remote-test.s9pk",
         },
       },
-    ),
+    }),
   )
   .withStore<{ storeRoot: { storeLeaf: "value" } }>()
   .build(true)
diff --git a/sdk/package/lib/util/fileHelper.ts b/sdk/package/lib/util/fileHelper.ts
index bb7190fe1..1a3be3e4f 100644
--- a/sdk/package/lib/util/fileHelper.ts
+++ b/sdk/package/lib/util/fileHelper.ts
@@ -86,19 +86,21 @@ export class FileHelper<A> {
   /**
    * Accepts structured data and overwrites the existing file on disk.
    */
-  async write(data: A) {
+  async write(data: A): Promise<null> {
     const parent = previousPath.exec(this.path)
     if (parent) {
       await fs.mkdir(parent[1], { recursive: true })
     }
 
     await fs.writeFile(this.path, this.writeData(data))
+
+    return null
   }
 
   /**
    * Reads the file from disk and converts it to structured data.
    */
-  async read() {
+  private async readOnce(): Promise<A | null> {
     if (!(await exists(this.path))) {
       return null
     }
@@ -107,14 +109,14 @@ export class FileHelper<A> {
     )
   }
 
-  async const(effects: T.Effects) {
-    const watch = this.watch()
+  private async readConst(effects: T.Effects): Promise<A | null> {
+    const watch = this.readWatch()
     const res = await watch.next()
     watch.next().then(effects.constRetry)
     return res.value
   }
 
-  async *watch() {
+  private async *readWatch() {
     let res
     while (true) {
       if (await exists(this.path)) {
@@ -123,12 +125,12 @@ export class FileHelper<A> {
           persistent: false,
           signal: ctrl.signal,
         })
-        res = await this.read()
+        res = await this.readOnce()
         const listen = Promise.resolve()
           .then(async () => {
             for await (const _ of watch) {
               ctrl.abort("finished")
-              return
+              return null
             }
           })
           .catch((e) => console.error(asError(e)))
@@ -139,13 +141,22 @@ export class FileHelper<A> {
         await onCreated(this.path).catch((e) => console.error(asError(e)))
       }
     }
+    return null
+  }
+
+  get read() {
+    return {
+      once: () => this.readOnce(),
+      const: (effects: T.Effects) => this.readConst(effects),
+      watch: () => this.readWatch(),
+    }
   }
 
   /**
    * Accepts structured data and performs a merge with the existing file on disk.
    */
   async merge(data: A) {
-    const fileData = (await this.read().catch(() => ({}))) || {}
+    const fileData = (await this.readOnce().catch(() => ({}))) || {}
     const mergeData = merge({}, fileData, data)
     return await this.write(mergeData)
   }
diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
index b5c0fba5d..2294d800b 100644
--- a/sdk/package/package-lock.json
+++ b/sdk/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha8",
+  "version": "0.3.6-alpha9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha8",
+      "version": "0.3.6-alpha9",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
@@ -14,7 +14,7 @@
         "@noble/hashes": "^1.4.0",
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
-        "mime": "^4.0.3",
+        "mime-types": "^2.1.35",
         "ts-matches": "^5.5.1",
         "yaml": "^2.2.2"
       },
@@ -3136,18 +3136,25 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/mime": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
-      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
-      "funding": [
-        "https://github.com/sponsors/broofa"
-      ],
-      "bin": {
-        "mime": "bin/cli.js"
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">= 0.6"
       }
     },
     "node_modules/mimic-fn": {
diff --git a/sdk/package/package.json b/sdk/package/package.json
index 530a22053..acc523594 100644
--- a/sdk/package/package.json
+++ b/sdk/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha8",
+  "version": "0.3.6-alpha.12",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "test": "jest -c ./jest.config.js --coverage",
-    "buildOutput": "ts-node ./lib/test/makeOutput.ts && npx prettier --write '**/*.ts'",
+    "buildOutput": "ts-node ./lib/test/makeOutput.ts && npx prettier --write \"**/*.ts\"",
     "check": "tsc --noEmit",
     "tsc": "tsc"
   },
@@ -32,7 +32,7 @@
   "dependencies": {
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
-    "mime": "^4.0.3",
+    "mime-types": "^2.1.35",
     "ts-matches": "^5.5.1",
     "yaml": "^2.2.2",
     "@iarna/toml": "^2.2.5",
diff --git a/web/README.md b/web/README.md
index 7665a26a6..feddf713e 100644
--- a/web/README.md
+++ b/web/README.md
@@ -48,6 +48,8 @@ npm i
 npm run build:deps
 ```
 
+> Note if you are on **Windows** you need to install `make` for these scripts to work. Easiest way to do so is to install [Chocolatey](https://chocolatey.org/install) and then run `choco install make`.
+
 #### Copy `config-sample.json` to a new file `config.json`.
 
 ```sh
diff --git a/web/ionic.config.json b/web/ionic.config.json
index ee434f78a..c5810bc10 100644
--- a/web/ionic.config.json
+++ b/web/ionic.config.json
@@ -17,12 +17,6 @@
       "integrations": {},
       "type": "angular",
       "root": "projects/setup-wizard"
-    },
-    "diagnostic-ui": {
-      "name": "diagnostic-ui",
-      "integrations": {},
-      "type": "angular",
-      "root": "projects/diagnostic-ui"
     }
   },
   "defaultProject": "ui"
diff --git a/web/lint-staged.config.js b/web/lint-staged.config.js
index 80ea7cf8b..731cc9d5e 100644
--- a/web/lint-staged.config.js
+++ b/web/lint-staged.config.js
@@ -4,7 +4,6 @@ module.exports = {
   'projects/ui/**/*.ts': () => 'npm run check:ui',
   'projects/shared/**/*.ts': () => 'npm run check:shared',
   'projects/marketplace/**/*.ts': () => 'npm run check:marketplace',
-  'projects/diagnostic-ui/**/*.ts': () => 'npm run check:dui',
   'projects/install-wizard/**/*.ts': () => 'npm run check:install-wiz',
   'projects/setup-wizard/**/*.ts': () => 'npm run check:setup',
 }
diff --git a/web/package.json b/web/package.json
index 0de550c62..5fdf2c859 100644
--- a/web/package.json
+++ b/web/package.json
@@ -6,14 +6,13 @@
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "check": "npm run check:shared && npm run check:marketplace && npm run check:ui && npm run check:install-wiz && npm run check:setup && npm run check:dui",
+    "check": "npm run check:shared && npm run check:marketplace && npm run check:ui && npm run check:install-wiz && npm run check:setup",
     "check:shared": "tsc --project projects/shared/tsconfig.json --noEmit --skipLibCheck",
     "check:marketplace": "tsc --project projects/marketplace/tsconfig.json --noEmit --skipLibCheck",
-    "check:dui": "tsc --project projects/diagnostic-ui/tsconfig.json --noEmit --skipLibCheck",
     "check:install-wiz": "tsc --project projects/install-wizard/tsconfig.json --noEmit --skipLibCheck",
     "check:setup": "tsc --project projects/setup-wizard/tsconfig.json --noEmit --skipLibCheck",
     "check:ui": "tsc --project projects/ui/tsconfig.json --noEmit --skipLibCheck",
-    "build:deps": "rm -rf .angular/cache && (cd ../patch-db/client && npm ci && npm run build) && (cd ../sdk && make bundle)",
+    "build:deps": "rimraf .angular/cache && (cd ../sdk && make bundle) && (cd ../patch-db/client && npm ci && npm run build)",
     "build:install-wiz": "ng run install-wizard:build",
     "build:setup": "ng run setup-wizard:build",
     "build:ui": "ng run ui:build",
diff --git a/web/projects/setup-wizard/src/app/pages/success/success.page.ts b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
index dab0b44a6..aa0c7fc90 100644
--- a/web/projects/setup-wizard/src/app/pages/success/success.page.ts
+++ b/web/projects/setup-wizard/src/app/pages/success/success.page.ts
@@ -83,7 +83,7 @@ export class SuccessPage {
         await this.api.exit()
       }
     } catch (e: any) {
-      await this.errorService.handleError(e)
+      this.errorService.handleError(e)
     }
   }
 
diff --git a/web/projects/shared/src/types/workspace-config.ts b/web/projects/shared/src/types/workspace-config.ts
index 57d5e2a4c..d10c4b07e 100644
--- a/web/projects/shared/src/types/workspace-config.ts
+++ b/web/projects/shared/src/types/workspace-config.ts
@@ -2,7 +2,7 @@ export type WorkspaceConfig = {
   gitHash: string
   useMocks: boolean
   enableWidgets: boolean
-  // each key corresponds to a project and values adjust settings for that project, eg: ui, install-wizard, setup-wizard, diagnostic-ui
+  // each key corresponds to a project and values adjust settings for that project, eg: ui, install-wizard, setup-wizard
   ui: {
     api: {
       url: string
diff --git a/web/projects/ui/src/app/app/preloader/preloader.component.ts b/web/projects/ui/src/app/app/preloader/preloader.component.ts
index 177362222..70c5e2995 100644
--- a/web/projects/ui/src/app/app/preloader/preloader.component.ts
+++ b/web/projects/ui/src/app/app/preloader/preloader.component.ts
@@ -65,7 +65,6 @@ const ICONS = [
   'options-outline',
   'pencil',
   'phone-portrait-outline',
-  'play-circle-outline',
   'play-outline',
   'power',
   'pricetag-outline',
diff --git a/web/projects/ui/src/app/components/form.component.ts b/web/projects/ui/src/app/components/form.component.ts
index 386bd5f8e..93f65115a 100644
--- a/web/projects/ui/src/app/components/form.component.ts
+++ b/web/projects/ui/src/app/components/form.component.ts
@@ -149,14 +149,15 @@ export class FormComponent<T extends Record<string, any>> implements OnInit {
   }
 
   private process(operations: Operation[]) {
-    operations.forEach(({ op, path }) => {
-      const control = this.form.get(path.substring(1).split('/'))
+    operations.forEach(operation => {
+      const control = this.form.get(operation.path.substring(1).split('/'))
 
       if (!control || !control.parent) return
 
-      if (op !== 'remove') {
+      if (operation.op === 'add' || operation.op === 'replace') {
         control.markAsDirty()
         control.markAsTouched()
+        control.setValue(operation.value)
       }
 
       control.parent.markAsDirty()
diff --git a/web/projects/ui/src/app/modals/action-input.component.ts b/web/projects/ui/src/app/modals/action-input.component.ts
index 494dfcdda..4543e29fd 100644
--- a/web/projects/ui/src/app/modals/action-input.component.ts
+++ b/web/projects/ui/src/app/modals/action-input.component.ts
@@ -16,7 +16,7 @@ import { compare } from 'fast-json-patch'
 import { PatchDB } from 'patch-db-client'
 import { catchError, defer, EMPTY, endWith, firstValueFrom, map } from 'rxjs'
 import { InvalidService } from 'src/app/components/form/invalid.service'
-import { ActionDepComponent } from 'src/app/modals/action-dep.component'
+import { ActionRequestInfoComponent } from 'src/app/modals/action-request-input.component'
 import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
@@ -25,23 +25,29 @@ import * as json from 'fast-json-patch'
 import { ActionService } from '../services/action.service'
 import { ActionButton, FormComponent } from '../components/form.component'
 
-export interface PackageActionData {
-  readonly pkgInfo: {
+export type PackageActionData = {
+  pkgInfo: {
     id: string
     title: string
+    icon: string
+    mainStatus: T.MainStatus['main']
   }
-  readonly actionInfo: {
+  actionInfo: {
     id: string
-    warning: string | null
+    metadata: T.ActionMetadata
   }
-  readonly dependentInfo?: {
-    title: string
+  requestInfo?: {
+    dependentId?: string
     request: T.ActionRequest
   }
 }
 
 @Component({
   template: `
+    <div class="service-title">
+      <img [src]="pkgInfo.icon" alt="" />
+      <h4>{{ pkgInfo.title }}</h4>
+    </div>
     <ng-container *ngIf="res$ | async as res; else loading">
       <tui-notification *ngIf="error" status="error">
         <div [innerHTML]="error"></div>
@@ -52,13 +58,11 @@ export interface PackageActionData {
           <div [innerHTML]="warning"></div>
         </tui-notification>
 
-        <action-dep
-          *ngIf="dependentInfo"
-          [pkgTitle]="pkgInfo.title"
-          [depTitle]="dependentInfo.title"
+        <action-request-info
+          *ngIf="requestInfo"
           [originalValue]="res.originalValue || {}"
           [operations]="res.operations || []"
-        ></action-dep>
+        ></action-request-info>
 
         <app-form
           tuiMode="onDark"
@@ -87,7 +91,19 @@ export interface PackageActionData {
     `
       tui-notification {
         font-size: 1rem;
-        margin-bottom: 1rem;
+        margin-bottom: 1.4rem;
+      }
+      .service-title {
+        display: inline-flex;
+        align-items: center;
+        margin-bottom: 1.4rem;
+        img {
+          height: 20px;
+          margin-right: 4px;
+        }
+        h4 {
+          margin: 0;
+        }
       }
     `,
   ],
@@ -98,7 +114,7 @@ export interface PackageActionData {
     TuiNotificationModule,
     TuiButtonModule,
     TuiModeModule,
-    ActionDepComponent,
+    ActionRequestInfoComponent,
     UiPipeModule,
     FormComponent,
   ],
@@ -106,9 +122,9 @@ export interface PackageActionData {
 })
 export class ActionInputModal {
   readonly actionId = this.context.data.actionInfo.id
-  readonly warning = this.context.data.actionInfo.warning
+  readonly warning = this.context.data.actionInfo.metadata.warning
   readonly pkgInfo = this.context.data.pkgInfo
-  readonly dependentInfo = this.context.data.dependentInfo
+  readonly requestInfo = this.context.data.requestInfo
 
   buttons: ActionButton<any>[] = [
     {
@@ -131,12 +147,12 @@ export class ActionInputModal {
       return {
         spec: res.spec,
         originalValue,
-        operations: this.dependentInfo?.request.input
+        operations: this.requestInfo?.request.input
           ? compare(
-              originalValue,
+              JSON.parse(JSON.stringify(originalValue)),
               utils.deepMerge(
-                originalValue,
-                this.dependentInfo.request.input.value,
+                JSON.parse(JSON.stringify(originalValue)),
+                this.requestInfo.request.input.value,
               ) as object,
             )
           : null,
@@ -159,15 +175,7 @@ export class ActionInputModal {
 
   async execute(input: object) {
     if (await this.checkConflicts(input)) {
-      const res = await firstValueFrom(this.res$)
-
-      return this.actionService.execute(this.pkgInfo.id, this.actionId, {
-        prev: {
-          spec: res.spec,
-          value: res.originalValue,
-        },
-        curr: input,
-      })
+      return this.actionService.execute(this.pkgInfo.id, this.actionId, input)
     }
   }
 
@@ -181,6 +189,7 @@ export class ActionInputModal {
           Object.values(packages[id].requestedActions).some(
             ({ request, active }) =>
               !active &&
+              request.severity === 'critical' &&
               request.packageId === this.pkgInfo.id &&
               request.actionId === this.actionId &&
               request.when?.condition === 'input-not-matches' &&
diff --git a/web/projects/ui/src/app/modals/action-dep.component.ts b/web/projects/ui/src/app/modals/action-request-input.component.ts
similarity index 77%
rename from web/projects/ui/src/app/modals/action-dep.component.ts
rename to web/projects/ui/src/app/modals/action-request-input.component.ts
index 8eeb9faa8..2451de876 100644
--- a/web/projects/ui/src/app/modals/action-dep.component.ts
+++ b/web/projects/ui/src/app/modals/action-request-input.component.ts
@@ -11,14 +11,10 @@ import { CommonModule } from '@angular/common'
 import { TuiNotificationModule } from '@taiga-ui/core'
 
 @Component({
-  selector: 'action-dep',
+  selector: 'action-request-info',
   template: `
-    <tui-notification>
-      <h3 style="margin: 0 0 0.5rem; font-size: 1.25rem;">
-        {{ pkgTitle }}
-      </h3>
-      The following modifications have been made to {{ pkgTitle }} to satisfy
-      {{ depTitle }}:
+    <tui-notification *ngIf="diff.length">
+      The following modifications were made:
       <ul>
         <li *ngFor="let d of diff" [innerHTML]="d"></li>
       </ul>
@@ -27,14 +23,15 @@ import { TuiNotificationModule } from '@taiga-ui/core'
   standalone: true,
   imports: [CommonModule, TuiNotificationModule],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  styles: [
+    `
+      tui-notification {
+        margin-bottom: 1.5rem;
+      }
+    `,
+  ],
 })
-export class ActionDepComponent implements OnInit {
-  @Input()
-  pkgTitle = ''
-
-  @Input()
-  depTitle = ''
-
+export class ActionRequestInfoComponent implements OnInit {
   @Input()
   originalValue: object = {}
 
@@ -68,15 +65,15 @@ export class ActionDepComponent implements OnInit {
   private getMessage(operation: Operation): string {
     switch (operation.op) {
       case 'add':
-        return `Added ${this.getNewValue(operation.value)}`
+        return `added ${this.getNewValue(operation.value)}`
       case 'remove':
-        return `Removed ${this.getOldValue(operation.path)}`
+        return `removed ${this.getOldValue(operation.path)}`
       case 'replace':
-        return `Changed from ${this.getOldValue(
+        return `changed from ${this.getOldValue(
           operation.path,
         )} to ${this.getNewValue(operation.value)}`
       default:
-        return `Unknown operation`
+        return `Unknown operation` // unreachable
     }
   }
 
diff --git a/web/projects/ui/src/app/modals/action-success/action-success-group.component.ts b/web/projects/ui/src/app/modals/action-success/action-success-group.component.ts
new file mode 100644
index 000000000..c02b51ee9
--- /dev/null
+++ b/web/projects/ui/src/app/modals/action-success/action-success-group.component.ts
@@ -0,0 +1,54 @@
+import { CommonModule } from '@angular/common'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { T } from '@start9labs/start-sdk'
+import { TuiFadeModule, TuiTitleModule } from '@taiga-ui/experimental'
+import { TuiAccordionModule } from '@taiga-ui/kit'
+import { ActionSuccessItemComponent } from './action-success-item.component'
+
+@Component({
+  standalone: true,
+  selector: 'app-action-success-group',
+  template: `
+    <p *ngFor="let item of value?.value">
+      <app-action-success-item
+        *ngIf="isSingle(item)"
+        [value]="item"
+      ></app-action-success-item>
+      <tui-accordion-item *ngIf="!isSingle(item)" size="s">
+        <div tuiFade>{{ item.name }}</div>
+        <ng-template tuiAccordionItemContent>
+          <app-action-success-group [value]="item"></app-action-success-group>
+        </ng-template>
+      </tui-accordion-item>
+    </p>
+  `,
+  styles: [
+    `
+      p:first-child {
+        margin-top: 0;
+      }
+
+      p:last-child {
+        margin-bottom: 0;
+      }
+    `,
+  ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    CommonModule,
+    TuiTitleModule,
+    ActionSuccessItemComponent,
+    TuiAccordionModule,
+    TuiFadeModule,
+  ],
+})
+export class ActionSuccessGroupComponent {
+  @Input()
+  value?: T.ActionResultV1 & { type: 'object' }
+
+  isSingle(
+    value: T.ActionResultV1,
+  ): value is T.ActionResultV1 & { type: 'string' } {
+    return value.type === 'string'
+  }
+}
diff --git a/web/projects/ui/src/app/modals/action-success/action-success-item.component.ts b/web/projects/ui/src/app/modals/action-success/action-success-item.component.ts
new file mode 100644
index 000000000..25054f2f6
--- /dev/null
+++ b/web/projects/ui/src/app/modals/action-success/action-success-item.component.ts
@@ -0,0 +1,184 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  inject,
+  Input,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { T } from '@start9labs/start-sdk'
+import {
+  TuiDialogService,
+  TuiLabelModule,
+  TuiTextfieldComponent,
+  TuiTextfieldControllerModule,
+} from '@taiga-ui/core'
+import { TuiButtonModule } from '@taiga-ui/experimental'
+import { TuiInputModule } from '@taiga-ui/kit'
+import { QrCodeModule } from 'ng-qrcode'
+import { ActionSuccessGroupComponent } from './action-success-group.component'
+
+@Component({
+  standalone: true,
+  selector: 'app-action-success-item',
+  template: `
+    <p *ngIf="!parent" class="qr">
+      <ng-container *ngTemplateOutlet="qr"></ng-container>
+    </p>
+    <label [tuiLabel]="value.description">
+      <tui-input
+        [readOnly]="true"
+        [ngModel]="value.value"
+        [tuiTextfieldCustomContent]="actions"
+      >
+        <input
+          tuiTextfield
+          [style.border-inline-end-width.rem]="border"
+          [type]="value.masked && masked ? 'password' : 'text'"
+        />
+      </tui-input>
+    </label>
+    <ng-template #actions>
+      <button
+        *ngIf="value.masked"
+        tuiIconButton
+        appearance="icon"
+        size="s"
+        type="button"
+        tabindex="-1"
+        [iconLeft]="masked ? 'tuiIconEye' : 'tuiIconEyeOff'"
+        [style.pointer-events]="'auto'"
+        (click)="masked = !masked"
+      >
+        Reveal/Hide
+      </button>
+      <button
+        *ngIf="value.copyable"
+        tuiIconButton
+        appearance="icon"
+        size="s"
+        type="button"
+        tabindex="-1"
+        iconLeft="tuiIconCopy"
+        [style.pointer-events]="'auto'"
+        (click)="copy()"
+      >
+        Copy
+      </button>
+      <button
+        *ngIf="value.qr && parent"
+        tuiIconButton
+        appearance="icon"
+        size="s"
+        type="button"
+        tabindex="-1"
+        iconLeft="tuiIconGrid"
+        [style.pointer-events]="'auto'"
+        (click)="show(qr)"
+      >
+        Show QR
+      </button>
+    </ng-template>
+    <ng-template #qr>
+      <qr-code
+        [value]="value.value"
+        [style.filter]="value.masked && masked ? 'blur(0.5rem)' : null"
+        size="350"
+      ></qr-code>
+      <button
+        *ngIf="value.masked && masked"
+        tuiIconButton
+        class="reveal"
+        iconLeft="tuiIconEye"
+        [style.border-radius.%]="100"
+        (click)="masked = false"
+      >
+        Reveal
+      </button>
+    </ng-template>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styles: [
+    `
+      @import '@taiga-ui/core/styles/taiga-ui-local';
+
+      .reveal {
+        @include center-all();
+      }
+
+      .qr {
+        position: relative;
+        text-align: center;
+      }
+    `,
+  ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    TuiInputModule,
+    TuiTextfieldControllerModule,
+    TuiButtonModule,
+    QrCodeModule,
+    TuiLabelModule,
+  ],
+})
+export class ActionSuccessItemComponent {
+  @ViewChild(TuiTextfieldComponent, { read: ElementRef })
+  private readonly input!: ElementRef<HTMLInputElement>
+  private readonly dialogs = inject(TuiDialogService)
+
+  readonly parent = inject(ActionSuccessGroupComponent, {
+    optional: true,
+  })
+
+  @Input()
+  value!: T.ActionResultV1 & { type: 'string' }
+
+  masked = true
+
+  get border(): number {
+    let border = 0
+
+    if (this.value.masked) {
+      border += 2
+    }
+
+    if (this.value.copyable) {
+      border += 2
+    }
+
+    if (this.value.qr && this.parent) {
+      border += 2
+    }
+
+    return border
+  }
+
+  show(template: TemplateRef<any>) {
+    const masked = this.masked
+
+    this.masked = this.value.masked
+    this.dialogs
+      .open(template, { label: 'Scan this QR', size: 's' })
+      .subscribe({
+        complete: () => (this.masked = masked),
+      })
+  }
+
+  copy() {
+    const el = this.input.nativeElement
+
+    if (!el) {
+      return
+    }
+
+    el.type = 'text'
+    el.focus()
+    el.select()
+    el.ownerDocument.execCommand('copy')
+    el.type = this.masked && this.value.masked ? 'password' : 'text'
+  }
+}
diff --git a/web/projects/ui/src/app/modals/action-success/action-success.module.ts b/web/projects/ui/src/app/modals/action-success/action-success.module.ts
deleted file mode 100644
index 23c123081..000000000
--- a/web/projects/ui/src/app/modals/action-success/action-success.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { ActionSuccessPage } from './action-success.page'
-import { QrCodeModule } from 'ng-qrcode'
-
-@NgModule({
-  declarations: [ActionSuccessPage],
-  imports: [CommonModule, IonicModule, QrCodeModule],
-  exports: [ActionSuccessPage],
-})
-export class ActionSuccessPageModule {}
diff --git a/web/projects/ui/src/app/modals/action-success/action-success.page.html b/web/projects/ui/src/app/modals/action-success/action-success.page.html
deleted file mode 100644
index da8cc7be5..000000000
--- a/web/projects/ui/src/app/modals/action-success/action-success.page.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>Execution Complete</ion-title>
-    <ion-buttons slot="end">
-      <ion-button (click)="dismiss()" class="enter-click">
-        <ion-icon name="close"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="ion-padding">
-  <h2 class="ion-padding">{{ actionRes.message }}</h2>
-
-  <div *ngIf="actionRes.value" class="ion-text-center" style="padding: 48px 0">
-    <div *ngIf="actionRes.qr" class="ion-padding-bottom">
-      <qr-code [value]="actionRes.value" size="240"></qr-code>
-    </div>
-
-    <p *ngIf="!actionRes.copyable">{{ actionRes.value }}</p>
-    <a
-      *ngIf="actionRes.copyable"
-      style="cursor: copy"
-      (click)="copy(actionRes.value)"
-    >
-      <b>{{ actionRes.value }}</b>
-      <sup>
-        <ion-icon
-          name="copy-outline"
-          style="padding-left: 6px; font-size: small"
-        ></ion-icon>
-      </sup>
-    </a>
-  </div>
-</ion-content>
diff --git a/web/projects/ui/src/app/modals/action-success/action-success.page.scss b/web/projects/ui/src/app/modals/action-success/action-success.page.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/projects/ui/src/app/modals/action-success/action-success.page.ts b/web/projects/ui/src/app/modals/action-success/action-success.page.ts
index 8912ed6ba..afcab5793 100644
--- a/web/projects/ui/src/app/modals/action-success/action-success.page.ts
+++ b/web/projects/ui/src/app/modals/action-success/action-success.page.ts
@@ -1,39 +1,36 @@
-import { Component, Input } from '@angular/core'
-import { ModalController, ToastController } from '@ionic/angular'
-import { copyToClipboard } from '@start9labs/shared'
-import { T } from '@start9labs/start-sdk'
+import { CommonModule } from '@angular/common'
+import { Component, inject } from '@angular/core'
+import { TuiDialogContext, TuiTextfieldControllerModule } from '@taiga-ui/core'
+import { POLYMORPHEUS_CONTEXT } from '@tinkoff/ng-polymorpheus'
+import { RR } from 'src/app/services/api/api.types'
+import { ActionSuccessGroupComponent } from './action-success-group.component'
+import { ActionSuccessItemComponent } from './action-success-item.component'
 
 @Component({
-  selector: 'action-success',
-  templateUrl: './action-success.page.html',
-  styleUrls: ['./action-success.page.scss'],
+  standalone: true,
+  template: `
+    <ng-container tuiTextfieldSize="m" [tuiTextfieldLabelOutside]="true">
+      <app-action-success-item
+        *ngIf="item"
+        [value]="item"
+      ></app-action-success-item>
+      <app-action-success-group
+        *ngIf="group"
+        [value]="group"
+      ></app-action-success-group>
+    </ng-container>
+  `,
+  imports: [
+    CommonModule,
+    ActionSuccessGroupComponent,
+    ActionSuccessItemComponent,
+    TuiTextfieldControllerModule,
+  ],
 })
 export class ActionSuccessPage {
-  @Input()
-  actionRes!: T.ActionResult
+  readonly data =
+    inject<TuiDialogContext<void, RR.ActionRes>>(POLYMORPHEUS_CONTEXT).data
 
-  constructor(
-    private readonly modalCtrl: ModalController,
-    private readonly toastCtrl: ToastController,
-  ) {}
-
-  async copy(address: string) {
-    let message = ''
-    await copyToClipboard(address || '').then(success => {
-      message = success
-        ? 'Copied to clipboard!'
-        : 'Failed to copy to clipboard.'
-    })
-
-    const toast = await this.toastCtrl.create({
-      header: message,
-      position: 'bottom',
-      duration: 1000,
-    })
-    await toast.present()
-  }
-
-  async dismiss() {
-    return this.modalCtrl.dismiss()
-  }
+  readonly item = this.data?.type === 'string' ? this.data : null
+  readonly group = this.data?.type === 'object' ? this.data : null
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts
index 84e52d15f..377504238 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts
@@ -5,7 +5,6 @@ import { IonicModule } from '@ionic/angular'
 import { AppActionsPage, AppActionsItemComponent } from './app-actions.page'
 import { QRComponentModule } from 'src/app/components/qr/qr.component.module'
 import { SharedPipesModule } from '@start9labs/shared'
-import { ActionSuccessPageModule } from 'src/app/modals/action-success/action-success.module'
 
 const routes: Routes = [
   {
@@ -21,7 +20,6 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     QRComponentModule,
     SharedPipesModule,
-    ActionSuccessPageModule,
   ],
   declarations: [AppActionsPage, AppActionsItemComponent],
 })
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
index c9ecc8ed5..bacbed729 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
@@ -37,8 +37,8 @@
     <app-actions-item
       *ngFor="let action of pkg.actions"
       [action]="action"
-      icon="play-circle-outline"
-      (click)="handleAction(pkg.mainStatus, pkg.manifest, action)"
+      icon="play-outline"
+      (click)="handleAction(pkg.mainStatus, pkg.icon, pkg.manifest, action)"
     ></app-actions-item>
   </ion-item-group>
 </ion-content>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index 95be585ba..feea649d1 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -21,13 +21,12 @@ export class AppActionsPage {
     filter(pkg => pkg.stateInfo.state === 'installed'),
     map(pkg => ({
       mainStatus: pkg.status.main,
+      icon: pkg.icon,
       manifest: getManifest(pkg),
-      actions: Object.keys(pkg.actions)
-        .filter(id => id !== 'config')
-        .map(id => ({
-          id,
-          ...pkg.actions[id],
-        })),
+      actions: Object.keys(pkg.actions).map(id => ({
+        id,
+        ...pkg.actions[id],
+      })),
     })),
   )
 
@@ -40,13 +39,14 @@ export class AppActionsPage {
 
   async handleAction(
     mainStatus: T.MainStatus['main'],
+    icon: string,
     manifest: T.Manifest,
     action: T.ActionMetadata & { id: string },
   ) {
-    this.actionService.present(
-      { id: manifest.id, title: manifest.title, mainStatus },
-      { id: action.id, metadata: action },
-    )
+    this.actionService.present({
+      pkgInfo: { id: manifest.id, title: manifest.title, icon, mainStatus },
+      actionInfo: { id: action.id, metadata: action },
+    })
   }
 
   async rebuild(id: string) {
@@ -76,7 +76,7 @@ export class AppActionsItemComponent {
   get disabledText() {
     return (
       typeof this.action.visibility === 'object' &&
-      this.action.visibility.disabled.reason
+      this.action.visibility.disabled
     )
   }
 }
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.module.ts
deleted file mode 100644
index 2c53d0fea..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { Routes, RouterModule } from '@angular/router'
-import { IonicModule } from '@ionic/angular'
-import { AppMetricsPage } from './app-metrics.page'
-import { SharedPipesModule } from '@start9labs/shared'
-import { SkeletonListComponentModule } from 'src/app/components/skeleton-list/skeleton-list.component.module'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AppMetricsPage,
-  },
-]
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    SharedPipesModule,
-    SkeletonListComponentModule,
-  ],
-  declarations: [AppMetricsPage],
-})
-export class AppMetricsPageModule {}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.html b/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.html
deleted file mode 100644
index cca899f46..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button [defaultHref]="'/services/' + pkgId"></ion-back-button>
-    </ion-buttons>
-    <ion-title>Monitor</ion-title>
-    <ion-title slot="end">
-      <ion-spinner name="dots" class="fader"></ion-spinner>
-    </ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="ion-padding with-widgets">
-  <skeleton-list *ngIf="loading"></skeleton-list>
-  <ion-item-group *ngIf="!loading">
-    <ion-item *ngFor="let metric of metrics | keyvalue : asIsOrder">
-      <ion-label>{{ metric.key }}</ion-label>
-      <ion-note *ngIf="metric.value" slot="end" class="metric-note">
-        <ion-text style="color: white">
-          {{ metric.value.value }} {{ metric.value.unit }}
-        </ion-text>
-      </ion-note>
-    </ion-item>
-  </ion-item-group>
-</ion-content>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.scss b/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.scss
deleted file mode 100644
index eea898305..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.metric-note {
-  font-size: 16px;
-}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts
deleted file mode 100644
index 61b17b669..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Component } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { ErrorService, getPkgId, pauseFor } from '@start9labs/shared'
-import { Metric } from 'src/app/services/api/api.types'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-
-@Component({
-  selector: 'app-metrics',
-  templateUrl: './app-metrics.page.html',
-  styleUrls: ['./app-metrics.page.scss'],
-})
-export class AppMetricsPage {
-  loading = true
-  readonly pkgId = getPkgId(this.route)
-  going = false
-  metrics?: Metric
-
-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly errorService: ErrorService,
-    private readonly embassyApi: ApiService,
-  ) {}
-
-  ngOnInit() {
-    this.startDaemon()
-  }
-
-  ngOnDestroy() {
-    this.stopDaemon()
-  }
-
-  async startDaemon(): Promise<void> {
-    this.going = true
-    while (this.going) {
-      const startTime = Date.now()
-      await this.getMetrics()
-      await pauseFor(Math.max(4000 - (Date.now() - startTime), 0))
-    }
-  }
-
-  stopDaemon() {
-    this.going = false
-  }
-
-  async getMetrics(): Promise<void> {
-    try {
-      this.metrics = await this.embassyApi.getPkgMetrics({ id: this.pkgId })
-    } catch (e: any) {
-      this.errorService.handleError(e)
-      this.stopDaemon()
-    } finally {
-      this.loading = false
-    }
-  }
-
-  asIsOrder(a: any, b: any) {
-    return 0
-  }
-}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.module.ts
deleted file mode 100644
index 2d8553017..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { Routes, RouterModule } from '@angular/router'
-import { IonicModule } from '@ionic/angular'
-import { AppPropertiesPage } from './app-properties.page'
-import { QRComponentModule } from 'src/app/components/qr/qr.component.module'
-import { MaskPipeModule } from 'src/app/pipes/mask/mask.module'
-import {
-  SharedPipesModule,
-  TextSpinnerComponentModule,
-} from '@start9labs/shared'
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AppPropertiesPage,
-  },
-]
-
-@NgModule({
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    QRComponentModule,
-    SharedPipesModule,
-    TextSpinnerComponentModule,
-    MaskPipeModule,
-  ],
-  declarations: [AppPropertiesPage],
-})
-export class AppPropertiesPageModule {}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
deleted file mode 100644
index ca3cdd3be..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-back-button [defaultHref]="'/services/' + pkgId"></ion-back-button>
-    </ion-buttons>
-    <ion-title>Properties</ion-title>
-    <ion-buttons *ngIf="!loading" slot="end">
-      <ion-button (click)="refresh()">
-        <ion-icon slot="start" name="refresh"></ion-icon>
-        Refresh
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="ion-padding-top with-widgets">
-  <text-spinner
-    *ngIf="loading; else loaded"
-    text="Loading Properties"
-  ></text-spinner>
-
-  <ng-template #loaded>
-    <!-- not running -->
-    <ion-item *ngIf="stopped$ | async" class="ion-margin-bottom">
-      <ion-label>
-        <p>
-          <ion-text color="warning">
-            Service is stopped. Information on this page could be inaccurate.
-          </ion-text>
-        </p>
-      </ion-label>
-    </ion-item>
-
-    <!-- no properties -->
-    <ion-item *ngIf="properties | empty">
-      <ion-label>
-        <p>No properties.</p>
-      </ion-label>
-    </ion-item>
-
-    <!-- properties -->
-    <ion-item-group *ngIf="!(properties | empty)">
-      <div *ngFor="let prop of node | keyvalue: asIsOrder">
-        <!-- object -->
-        <ion-item
-          button
-          detail="true"
-          *ngIf="prop.value.type === 'object'"
-          (click)="goToNested(prop.key)"
-        >
-          <ion-button
-            *ngIf="prop.value.description"
-            fill="clear"
-            slot="start"
-            (click)="presentDescription(prop, $event)"
-          >
-            <ion-icon slot="icon-only" name="help-circle-outline"></ion-icon>
-          </ion-button>
-          <ion-label>
-            <h2>{{ prop.key }}</h2>
-          </ion-label>
-        </ion-item>
-        <!-- not object -->
-        <ion-item *ngIf="prop.value.type === 'string'">
-          <ion-button
-            *ngIf="prop.value.description"
-            fill="clear"
-            slot="start"
-            (click)="presentDescription(prop, $event)"
-          >
-            <ion-icon slot="icon-only" name="help-circle-outline"></ion-icon>
-          </ion-button>
-          <ion-label>
-            <h2>{{ prop.key }}</h2>
-            <p class="courier-new">
-              {{ prop.value.masked && !unmasked[prop.key] ? (prop.value.value |
-              mask : 64) : prop.value.value }}
-            </p>
-          </ion-label>
-          <div slot="end" *ngIf="prop.value.copyable || prop.value.qr">
-            <ion-button
-              *ngIf="prop.value.masked"
-              fill="clear"
-              (click)="toggleMask(prop.key)"
-            >
-              <ion-icon
-                slot="icon-only"
-                [name]="unmasked[prop.key] ? 'eye-off-outline' : 'eye-outline'"
-                size="small"
-              ></ion-icon>
-            </ion-button>
-            <ion-button
-              *ngIf="prop.value.qr"
-              fill="clear"
-              (click)="showQR(prop.value.value)"
-            >
-              <ion-icon
-                slot="icon-only"
-                name="qr-code-outline"
-                size="small"
-              ></ion-icon>
-            </ion-button>
-            <ion-button
-              *ngIf="prop.value.copyable"
-              fill="clear"
-              (click)="copy(prop.value.value)"
-            >
-              <ion-icon
-                slot="icon-only"
-                name="copy-outline"
-                size="small"
-              ></ion-icon>
-            </ion-button>
-          </div>
-        </ion-item>
-      </div>
-    </ion-item-group>
-  </ng-template>
-</ion-content>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.scss b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.scss
deleted file mode 100644
index eea898305..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.metric-note {
-  font-size: 16px;
-}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
deleted file mode 100644
index 521542c10..000000000
--- a/web/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { Component, ViewChild } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import {
-  AlertController,
-  IonBackButtonDelegate,
-  ModalController,
-  NavController,
-  ToastController,
-} from '@ionic/angular'
-import { copyToClipboard, ErrorService, getPkgId } from '@start9labs/shared'
-import { TuiDestroyService } from '@taiga-ui/cdk'
-import { getValueByPointer } from 'fast-json-patch'
-import { PatchDB } from 'patch-db-client'
-import { map, takeUntil } from 'rxjs/operators'
-import { QRComponent } from 'src/app/components/qr/qr.component'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { DataModel } from 'src/app/services/patch-db/data-model'
-import { PackageProperties } from 'src/app/util/properties.util'
-
-@Component({
-  selector: 'app-properties',
-  templateUrl: './app-properties.page.html',
-  styleUrls: ['./app-properties.page.scss'],
-  providers: [TuiDestroyService],
-})
-export class AppPropertiesPage {
-  loading = true
-  readonly pkgId = getPkgId(this.route)
-
-  pointer = ''
-  node: PackageProperties = {}
-
-  properties: PackageProperties = {}
-  unmasked: { [key: string]: boolean } = {}
-
-  stopped$ = this.patch
-    .watch$('packageData', this.pkgId, 'status', 'main')
-    .pipe(map(status => status === 'stopped'))
-
-  @ViewChild(IonBackButtonDelegate, { static: false })
-  backButton?: IonBackButtonDelegate
-
-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly embassyApi: ApiService,
-    private readonly errorService: ErrorService,
-    private readonly alertCtrl: AlertController,
-    private readonly toastCtrl: ToastController,
-    private readonly modalCtrl: ModalController,
-    private readonly navCtrl: NavController,
-    private readonly patch: PatchDB<DataModel>,
-    private readonly destroy$: TuiDestroyService,
-  ) {}
-
-  ionViewDidEnter() {
-    if (!this.backButton) return
-    this.backButton.onClick = () => {
-      history.back()
-    }
-  }
-
-  async ngOnInit() {
-    await this.getProperties()
-
-    this.route.queryParams
-      .pipe(takeUntil(this.destroy$))
-      .subscribe(queryParams => {
-        if (queryParams['pointer'] === this.pointer) return
-        this.pointer = queryParams['pointer'] || ''
-        this.node = getValueByPointer(this.properties, this.pointer)
-      })
-  }
-
-  async refresh() {
-    await this.getProperties()
-  }
-
-  async presentDescription(
-    property: { key: string; value: PackageProperties[''] },
-    e: Event,
-  ) {
-    e.stopPropagation()
-
-    const alert = await this.alertCtrl.create({
-      header: property.key,
-      message: property.value.description || undefined,
-    })
-    await alert.present()
-  }
-
-  async goToNested(key: string): Promise<any> {
-    this.navCtrl.navigateForward(`/services/${this.pkgId}/properties`, {
-      queryParams: {
-        pointer: `${this.pointer}/${key}/value`,
-      },
-    })
-  }
-
-  async copy(text: string): Promise<void> {
-    let message = ''
-    await copyToClipboard(text).then(success => {
-      message = success
-        ? 'Copied to clipboard!'
-        : 'Failed to copy to clipboard.'
-    })
-
-    const toast = await this.toastCtrl.create({
-      header: message,
-      position: 'bottom',
-      duration: 1000,
-    })
-    await toast.present()
-  }
-
-  async showQR(text: string): Promise<void> {
-    const modal = await this.modalCtrl.create({
-      component: QRComponent,
-      componentProps: {
-        text,
-      },
-      cssClass: 'qr-modal',
-    })
-    await modal.present()
-  }
-
-  toggleMask(key: string) {
-    this.unmasked[key] = !this.unmasked[key]
-  }
-
-  private async getProperties(): Promise<void> {
-    this.loading = true
-    try {
-      this.properties = await this.embassyApi.getPackageProperties({
-        id: this.pkgId,
-      })
-      this.node = getValueByPointer(this.properties, this.pointer)
-    } catch (e: any) {
-      this.errorService.handleError(e)
-    } finally {
-      this.loading = false
-    }
-  }
-
-  asIsOrder(a: any, b: any) {
-    return 0
-  }
-}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
index 7d51a6fc8..5787948d6 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
@@ -19,6 +19,7 @@ import { AppShowMenuComponent } from './components/app-show-menu/app-show-menu.c
 import { AppShowHealthChecksComponent } from './components/app-show-health-checks/app-show-health-checks.component'
 import { AppShowAdditionalComponent } from './components/app-show-additional/app-show-additional.component'
 import { AppShowErrorComponent } from './components/app-show-error/app-show-error.component'
+import { AppShowActionRequestsComponent } from './components/app-show-action-requests/app-show-action-requests.component'
 import { HealthColorPipe } from './pipes/health-color.pipe'
 import { ToHealthChecksPipe } from './pipes/to-health-checks.pipe'
 import { ToButtonsPipe } from './pipes/to-buttons.pipe'
@@ -45,6 +46,7 @@ const routes: Routes = [
     AppShowHealthChecksComponent,
     AppShowAdditionalComponent,
     AppShowErrorComponent,
+    AppShowActionRequestsComponent,
   ],
   imports: [
     CommonModule,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index ec59b1042..286f3ef5b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -20,6 +20,12 @@
         <ng-container
           *ngIf="isInstalled(pkg) && status.primary !== 'backingUp' && status.primary !== 'error'"
         >
+          <!-- ** action requests ** -->
+          <app-show-action-requests
+            [allPkgs]="pkgPlus.allPkgs"
+            [pkg]="pkg"
+            [manifest]="pkgPlus.manifest"
+          ></app-show-action-requests>
           <!-- ** health checks ** -->
           <app-show-health-checks
             *ngIf="pkg.status.main === 'running'"
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index c1574e476..b48b49dd9 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -20,14 +20,13 @@ import {
 import { combineLatest } from 'rxjs'
 import {
   getManifest,
-  getPackage,
   isInstalled,
   isInstalling,
   isRestoring,
   isUpdating,
 } from 'src/app/util/get-package-data'
 import { T } from '@start9labs/start-sdk'
-import { ActionService } from 'src/app/services/action.service'
+import { getDepDetails } from 'src/app/util/dep-info'
 
 export interface DependencyInfo {
   id: string
@@ -35,7 +34,7 @@ export interface DependencyInfo {
   icon: string
   version: string
   errorText: string
-  actionText: string
+  actionText: string | null
   action: () => any
 }
 
@@ -60,6 +59,7 @@ export class AppShowPage {
       const pkg = allPkgs[this.pkgId]
       const manifest = getManifest(pkg)
       return {
+        allPkgs,
         pkg,
         manifest,
         dependencies: this.getDepInfo(pkg, manifest, allPkgs, depErrors),
@@ -75,7 +75,6 @@ export class AppShowPage {
     private readonly navCtrl: NavController,
     private readonly patch: PatchDB<DataModel>,
     private readonly depErrorService: DepErrorService,
-    private readonly actionService: ActionService,
   ) {}
 
   showProgress(
@@ -95,32 +94,6 @@ export class AppShowPage {
     )
   }
 
-  private getDepDetails(
-    pkg: PackageDataEntry,
-    allPkgs: AllPackageData,
-    depId: string,
-  ) {
-    const { title, icon, versionRange } = pkg.currentDependencies[depId]
-
-    if (
-      allPkgs[depId] &&
-      (allPkgs[depId].stateInfo.state === 'installed' ||
-        allPkgs[depId].stateInfo.state === 'updating')
-    ) {
-      return {
-        title: allPkgs[depId].stateInfo.manifest!.title,
-        icon: allPkgs[depId].icon,
-        versionRange,
-      }
-    } else {
-      return {
-        title: title || depId,
-        icon: icon || 'assets/img/service-icons/fallback.png',
-        versionRange,
-      }
-    }
-  }
-
   private getDepValues(
     pkg: PackageDataEntry,
     allPkgs: AllPackageData,
@@ -135,23 +108,16 @@ export class AppShowPage {
       depErrors,
     )
 
-    const { title, icon, versionRange } = this.getDepDetails(
-      pkg,
-      allPkgs,
-      depId,
-    )
+    const { title, icon, versionRange } = getDepDetails(pkg, allPkgs, depId)
 
     return {
       id: depId,
       version: versionRange,
       title,
       icon,
-      errorText: errorText
-        ? `${errorText}. ${manifest.title} will not work as expected.`
-        : '',
-      actionText: fixText || 'View',
-      action:
-        fixAction || (() => this.navCtrl.navigateForward(`/services/${depId}`)),
+      errorText: errorText ? errorText : '',
+      actionText: fixText,
+      action: fixAction,
     }
   }
 
@@ -165,28 +131,31 @@ export class AppShowPage {
 
     let errorText: string | null = null
     let fixText: string | null = null
-    let fixAction: (() => any) | null = null
+    let fixAction: () => any = () => {}
 
     if (depError) {
       if (depError.type === 'notInstalled') {
         errorText = 'Not installed'
         fixText = 'Install'
-        fixAction = () => this.fixDep(pkg, manifest, 'install', depId)
+        fixAction = () => this.installDep(pkg, manifest, depId)
       } else if (depError.type === 'incorrectVersion') {
         errorText = 'Incorrect version'
         fixText = 'Update'
-        fixAction = () => this.fixDep(pkg, manifest, 'update', depId)
-      } else if (depError.type === 'configUnsatisfied') {
-        errorText = 'Config not satisfied'
-        fixText = 'Auto config'
-        fixAction = () => this.fixDep(pkg, manifest, 'configure', depId)
+        fixAction = () => this.installDep(pkg, manifest, depId)
+      } else if (depError.type === 'actionRequired') {
+        errorText = 'Action Required (see above)'
       } else if (depError.type === 'notRunning') {
         errorText = 'Not running'
         fixText = 'Start'
+        fixAction = () => this.navCtrl.navigateForward(`/services/${depId}`)
       } else if (depError.type === 'healthChecksFailed') {
         errorText = 'Required health check not passing'
+        fixText = 'View'
+        fixAction = () => this.navCtrl.navigateForward(`/services/${depId}`)
       } else if (depError.type === 'transitive') {
         errorText = 'Dependency has a dependency issue'
+        fixText = 'View'
+        fixAction = () => this.navCtrl.navigateForward(`/services/${depId}`)
       }
     }
 
@@ -197,41 +166,6 @@ export class AppShowPage {
     }
   }
 
-  private async fixDep(
-    pkg: PackageDataEntry,
-    pkgManifest: T.Manifest,
-    action: 'install' | 'update' | 'configure',
-    depId: string,
-  ) {
-    switch (action) {
-      case 'install':
-      case 'update':
-        return this.installDep(pkg, pkgManifest, depId)
-      case 'configure':
-        const depPkg = await getPackage(this.patch, depId)
-        if (!depPkg) return
-
-        const depManifest = getManifest(depPkg)
-        return this.actionService.present(
-          {
-            id: depId,
-            title: depManifest.title,
-            mainStatus: depPkg.status.main,
-          },
-          { id: 'config', metadata: pkg.actions['config'] },
-          {
-            title: pkgManifest.title,
-            request: Object.values(pkg.requestedActions).find(
-              r =>
-                r.active &&
-                r.request.packageId === depId &&
-                r.request.actionId === 'config',
-            )!.request,
-          },
-        )
-    }
-  }
-
   private async installDep(
     pkg: PackageDataEntry,
     pkgManifest: T.Manifest,
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.html
new file mode 100644
index 000000000..2aee18f05
--- /dev/null
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.html
@@ -0,0 +1,45 @@
+<ng-container *ngIf="actionRequests.critical.length">
+  <ion-item-divider>Required Actions</ion-item-divider>
+  <ion-item
+    *ngFor="let request of actionRequests.critical"
+    button
+    (click)="handleAction(request)"
+  >
+    <ion-icon slot="start" name="warning-outline" color="warning"></ion-icon>
+    <ion-label>
+      <h2 class="highlighted">{{ request.actionName }}</h2>
+      <p *ngIf="request.dependency" class="dependency">
+        <span class="light">Service:</span>
+        <img [src]="request.dependency.icon" alt="" />
+        {{ request.dependency.title }}
+      </p>
+      <p>
+        <span class="light">Reason:</span>
+        {{ request.reason || 'no reason provided' }}
+      </p>
+    </ion-label>
+  </ion-item>
+</ng-container>
+
+<ng-container *ngIf="actionRequests.important.length">
+  <ion-item-divider>Requested Actions</ion-item-divider>
+  <ion-item
+    *ngFor="let request of actionRequests.important"
+    button
+    (click)="handleAction(request)"
+  >
+    <ion-icon slot="start" name="play-outline" color="warning"></ion-icon>
+    <ion-label>
+      <h2 class="highlighted">{{ request.actionName }}</h2>
+      <p *ngIf="request.dependency" class="dependency">
+        <span class="light">Service:</span>
+        <img [src]="request.dependency.icon" alt="" />
+        {{ request.dependency.title }}
+      </p>
+      <p>
+        <span class="light">Reason:</span>
+        {{ request.reason || 'no reason provided' }}
+      </p>
+    </ion-label>
+  </ion-item>
+</ng-container>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.scss b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.scss
new file mode 100644
index 000000000..c83e6f6a7
--- /dev/null
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.scss
@@ -0,0 +1,16 @@
+.light {
+  color: var(--ion-color-dark);
+}
+
+.highlighted {
+  color: var(--ion-color-dark);
+  font-weight: bold;
+}
+
+.dependency {
+  display: inline-flex;
+  img {
+    max-width: 16px;
+    margin: 0 2px 0 5px;
+  }
+}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.ts
new file mode 100644
index 000000000..0fefe17be
--- /dev/null
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-action-requests/app-show-action-requests.component.ts
@@ -0,0 +1,94 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { T } from '@start9labs/start-sdk'
+import { ActionService } from 'src/app/services/action.service'
+import { getDepDetails } from 'src/app/util/dep-info'
+
+@Component({
+  selector: 'app-show-action-requests',
+  templateUrl: './app-show-action-requests.component.html',
+  styleUrls: ['./app-show-action-requests.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AppShowActionRequestsComponent {
+  @Input()
+  allPkgs!: Record<string, T.PackageDataEntry>
+
+  @Input()
+  pkg!: T.PackageDataEntry
+
+  @Input()
+  manifest!: T.Manifest
+
+  get actionRequests() {
+    const critical: (T.ActionRequest & {
+      actionName: string
+      dependency: {
+        title: string
+        icon: string
+      } | null
+    })[] = []
+    const important: (T.ActionRequest & {
+      actionName: string
+      dependency: {
+        title: string
+        icon: string
+      } | null
+    })[] = []
+
+    Object.values(this.pkg.requestedActions)
+      .filter(r => r.active)
+      .forEach(r => {
+        const self = r.request.packageId === this.manifest.id
+        const toReturn = {
+          ...r.request,
+          actionName: self
+            ? this.pkg.actions[r.request.actionId].name
+            : this.allPkgs[r.request.packageId]?.actions[r.request.actionId]
+                .name || 'Unknown Action',
+          dependency: self
+            ? null
+            : getDepDetails(this.pkg, this.allPkgs, r.request.packageId),
+        }
+
+        if (r.request.severity === 'critical') {
+          critical.push(toReturn)
+        } else {
+          important.push(toReturn)
+        }
+      })
+
+    return { critical, important }
+  }
+
+  constructor(private readonly actionService: ActionService) {}
+
+  async handleAction(request: T.ActionRequest) {
+    const self = request.packageId === this.manifest.id
+    this.actionService.present({
+      pkgInfo: {
+        id: request.packageId,
+        title: self
+          ? this.manifest.title
+          : getDepDetails(this.pkg, this.allPkgs, request.packageId).title,
+        mainStatus: self
+          ? this.pkg.status.main
+          : this.allPkgs[request.packageId].status.main,
+        icon: self
+          ? this.pkg.icon
+          : getDepDetails(this.pkg, this.allPkgs, request.packageId).icon,
+      },
+      actionInfo: {
+        id: request.actionId,
+        metadata:
+          request.packageId === this.manifest.id
+            ? this.pkg.actions[request.actionId]
+            : this.allPkgs[request.packageId].actions[request.actionId],
+      },
+      requestInfo: {
+        request,
+        dependentId:
+          request.packageId === this.manifest.id ? undefined : this.manifest.id,
+      },
+    })
+  }
+}
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
index b184b83ff..059dc208b 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
@@ -1,6 +1,10 @@
 <ion-item-divider>Dependencies</ion-item-divider>
 <!-- dependencies are a subset of the pkg.manifest.dependencies that are currently required as determined by the service config -->
-<ion-item button *ngFor="let dep of dependencies" (click)="dep.action()">
+<ion-item
+  [button]="!!dep.actionText"
+  *ngFor="let dep of dependencies"
+  (click)="dep.action()"
+>
   <ion-thumbnail slot="start">
     <img [src]="dep.icon" alt="" />
   </ion-thumbnail>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index e31d4cd24..ef8f9a44e 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -52,16 +52,6 @@
           Start
         </ion-button>
 
-        <ion-button
-          *ngIf="needsConfig(manifest.id, pkg.requestedActions)"
-          class="action-button"
-          color="warning"
-          (click)="presentModalConfig()"
-        >
-          <ion-icon slot="start" name="construct-outline"></ion-icon>
-          Configure
-        </ion-button>
-
         <ion-button
           *ngIf="pkgStatus && interfaces && (interfaces | hasUi) && hosts"
           class="action-button"
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index c355bd008..70b969411 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -3,7 +3,6 @@ import { AlertController } from '@ionic/angular'
 import { ErrorService, LoadingService } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import { PatchDB } from 'patch-db-client'
-import { ActionService } from 'src/app/services/action.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConnectionService } from 'src/app/services/connection.service'
 import {
@@ -19,7 +18,6 @@ import {
   getAllPackages,
   getManifest,
   isInstalled,
-  needsConfig,
 } from 'src/app/util/get-package-data'
 import { hasCurrentDeps } from 'src/app/util/has-deps'
 
@@ -39,7 +37,6 @@ export class AppShowStatusComponent {
   PR = PrimaryRendering
 
   isInstalled = isInstalled
-  needsConfig = needsConfig
 
   constructor(
     private readonly alertCtrl: AlertController,
@@ -49,7 +46,6 @@ export class AppShowStatusComponent {
     private readonly launcherService: UiLauncherService,
     readonly connection$: ConnectionService,
     private readonly patch: PatchDB<DataModel>,
-    private readonly actionService: ActionService,
   ) {}
 
   get interfaces(): PackageDataEntry['serviceInterfaces'] {
@@ -77,14 +73,11 @@ export class AppShowStatusComponent {
   }
 
   get canStart(): boolean {
-    return (
-      this.status.primary === 'stopped' &&
-      !Object.keys(this.pkg.requestedActions).length
-    )
+    return this.status.primary === 'stopped'
   }
 
   get sigtermTimeout(): string | null {
-    return this.pkgStatus?.main === 'stopping' ? '30s' : null // @dr-bonez TODO
+    return this.pkgStatus?.main === 'stopping' ? '30s' : null // @TODO Aiden
   }
 
   launchUi(
@@ -94,17 +87,6 @@ export class AppShowStatusComponent {
     this.launcherService.launch(interfaces, hosts)
   }
 
-  async presentModalConfig(): Promise<void> {
-    return this.actionService.present(
-      {
-        id: this.manifest.id,
-        title: this.manifest.title,
-        mainStatus: this.pkg.status.main,
-      },
-      { id: 'config', metadata: this.pkg.actions['config'] },
-    )
-  }
-
   async tryStart(): Promise<void> {
     if (this.status.dependency === 'warning') {
       const depErrMsg = `${this.manifest.title} has unmet dependencies. It will not work as expected.`
@@ -221,6 +203,7 @@ export class AppShowStatusComponent {
       loader.unsubscribe()
     }
   }
+
   private async presentAlertStart(message: string): Promise<boolean> {
     return new Promise(async resolve => {
       const alert = await this.alertCtrl.create({
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
index c9bb73bfe..b2101ce29 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { AlertController, ModalController, NavController } from '@ionic/angular'
+import { ModalController, NavController } from '@ionic/angular'
 import { MarkdownComponent } from '@start9labs/shared'
 import {
   DataModel,
@@ -8,10 +8,8 @@ import {
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { from, map, Observable, of } from 'rxjs'
+import { from, map, Observable } from 'rxjs'
 import { PatchDB } from 'patch-db-client'
-import { ActionService } from 'src/app/services/action.service'
-import { needsConfig } from 'src/app/util/get-package-data'
 
 export interface Button {
   title: string
@@ -33,8 +31,6 @@ export class ToButtonsPipe implements PipeTransform {
     private readonly apiService: ApiService,
     private readonly api: ApiService,
     private readonly patch: PatchDB<DataModel>,
-    private readonly actionService: ActionService,
-    private readonly alertCtrl: AlertController,
   ) {}
 
   transform(pkg: PackageDataEntry<InstalledState>): Button[] {
@@ -51,50 +47,12 @@ export class ToButtonsPipe implements PipeTransform {
           .watch$('ui', 'ackInstructions', manifest.id)
           .pipe(map(seen => !seen)),
       },
-      // config
-      {
-        action: async () =>
-          pkg.actions['config']
-            ? this.actionService.present(
-                {
-                  id: manifest.id,
-                  title: manifest.title,
-                  mainStatus: pkg.status.main,
-                },
-                {
-                  id: 'config',
-                  metadata: pkg.actions['config'],
-                },
-              )
-            : this.alertCtrl
-                .create({
-                  header: 'No Config',
-                  message: `No config options for ${manifest.title} v${manifest.version}`,
-                  buttons: ['OK'],
-                })
-                .then(a => a.present()),
-        title: 'Config',
-        description: `Customize ${manifest.title}`,
-        icon: 'options-outline',
-        highlighted$: of(needsConfig(manifest.id, pkg.requestedActions)),
-      },
-      // properties
-      {
-        action: () =>
-          this.navCtrl.navigateForward(['properties'], {
-            relativeTo: this.route,
-          }),
-        title: 'Properties',
-        description:
-          'Runtime information, credentials, and other values of interest',
-        icon: 'briefcase-outline',
-      },
       // actions
       {
         action: () =>
           this.navCtrl.navigateForward(['actions'], { relativeTo: this.route }),
         title: 'Actions',
-        description: `Uninstall and other commands specific to ${manifest.title}`,
+        description: `All actions for ${manifest.title}`,
         icon: 'flash-outline',
       },
       // interfaces
diff --git a/web/projects/ui/src/app/pages/apps-routes/apps-routing.module.ts b/web/projects/ui/src/app/pages/apps-routes/apps-routing.module.ts
index 9dfbddcad..06f4b45fe 100644
--- a/web/projects/ui/src/app/pages/apps-routes/apps-routing.module.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/apps-routing.module.ts
@@ -36,20 +36,6 @@ const routes: Routes = [
     loadChildren: () =>
       import('./app-logs/app-logs.module').then(m => m.AppLogsPageModule),
   },
-  {
-    path: ':pkgId/metrics',
-    loadChildren: () =>
-      import('./app-metrics/app-metrics.module').then(
-        m => m.AppMetricsPageModule,
-      ),
-  },
-  {
-    path: ':pkgId/properties',
-    loadChildren: () =>
-      import('./app-properties/app-properties.module').then(
-        m => m.AppPropertiesPageModule,
-      ),
-  },
 ]
 
 @NgModule({
diff --git a/web/projects/ui/src/app/services/action.service.ts b/web/projects/ui/src/app/services/action.service.ts
index 74df5ffc6..df09daa32 100644
--- a/web/projects/ui/src/app/services/action.service.ts
+++ b/web/projects/ui/src/app/services/action.service.ts
@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core'
-import { AlertController, ModalController } from '@ionic/angular'
+import { AlertController } from '@ionic/angular'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { T } from '@start9labs/start-sdk'
+import { TuiDialogService } from '@taiga-ui/core'
+import { PolymorpheusComponent } from '@tinkoff/ng-polymorpheus'
 import { ActionSuccessPage } from 'src/app/modals/action-success/action-success.page'
-import { RR } from 'src/app/services/api/api.types'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { FormDialogService } from 'src/app/services/form-dialog.service'
 import {
@@ -31,28 +31,16 @@ const allowedStatuses = {
 export class ActionService {
   constructor(
     private readonly api: ApiService,
-    private readonly modalCtrl: ModalController,
+    private readonly dialogs: TuiDialogService,
     private readonly alertCtrl: AlertController,
     private readonly errorService: ErrorService,
     private readonly loader: LoadingService,
     private readonly formDialog: FormDialogService,
   ) {}
 
-  async present(
-    pkgInfo: {
-      id: string
-      title: string
-      mainStatus: T.MainStatus['main']
-    },
-    actionInfo: {
-      id: string
-      metadata: T.ActionMetadata
-    },
-    dependentInfo?: {
-      title: string
-      request: T.ActionRequest
-    },
-  ) {
+  async present(data: PackageActionData) {
+    const { pkgInfo, actionInfo } = data
+
     if (
       allowedStatuses[actionInfo.metadata.allowedStatuses].has(
         pkgInfo.mainStatus,
@@ -61,36 +49,32 @@ export class ActionService {
       if (actionInfo.metadata.hasInput) {
         this.formDialog.open<PackageActionData>(ActionInputModal, {
           label: actionInfo.metadata.name,
-          data: {
-            pkgInfo,
-            actionInfo: {
-              id: actionInfo.id,
-              warning: actionInfo.metadata.warning,
-            },
-            dependentInfo,
-          },
+          data,
         })
       } else {
-        const alert = await this.alertCtrl.create({
-          header: 'Confirm',
-          message: `Are you sure you want to execute action "${
-            actionInfo.metadata.name
-          }"? ${actionInfo.metadata.warning || ''}`,
-          buttons: [
-            {
-              text: 'Cancel',
-              role: 'cancel',
-            },
-            {
-              text: 'Execute',
-              handler: () => {
-                this.execute(pkgInfo.id, actionInfo.id)
+        if (actionInfo.metadata.warning) {
+          const alert = await this.alertCtrl.create({
+            header: 'Warning',
+            message: actionInfo.metadata.warning,
+            buttons: [
+              {
+                text: 'Cancel',
+                role: 'cancel',
               },
-              cssClass: 'enter-click',
-            },
-          ],
-        })
-        await alert.present()
+              {
+                text: 'Run',
+                handler: () => {
+                  this.execute(pkgInfo.id, actionInfo.id)
+                },
+                cssClass: 'enter-click',
+              },
+            ],
+            cssClass: 'alert-warning-message',
+          })
+          await alert.present()
+        } else {
+          this.execute(pkgInfo.id, actionInfo.id)
+        }
       }
     } else {
       const statuses = [...allowedStatuses[actionInfo.metadata.allowedStatuses]]
@@ -123,30 +107,24 @@ export class ActionService {
   async execute(
     packageId: string,
     actionId: string,
-    inputs?: {
-      prev: RR.GetActionInputRes
-      curr: object
-    },
+    input?: object,
   ): Promise<boolean> {
-    const loader = this.loader.open('Executing action...').subscribe()
+    const loader = this.loader.open('Loading...').subscribe()
 
     try {
       const res = await this.api.runAction({
         packageId,
         actionId,
-        prev: inputs?.prev || null,
-        input: inputs?.curr || null,
+        input: input || null,
       })
 
       if (res) {
-        const successModal = await this.modalCtrl.create({
-          component: ActionSuccessPage,
-          componentProps: {
-            actionRes: res,
-          },
-        })
-
-        setTimeout(() => successModal.present(), 500)
+        this.dialogs
+          .open(new PolymorpheusComponent(ActionSuccessPage), {
+            label: res.name,
+            data: res,
+          })
+          .subscribe()
       }
       return true // needed to dismiss original modal/alert
     } catch (e: any) {
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index e3aa63ee3..d6c27e353 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -2,18 +2,13 @@ import {
   InstalledState,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
-import { Metric, NotificationLevel, RR, ServerNotifications } from './api.types'
+import { NotificationLevel, RR, ServerNotifications } from './api.types'
 import { BTC_ICON, LND_ICON, PROXY_ICON, REGISTRY_ICON } from './api-icons'
 import { Log } from '@start9labs/shared'
 import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
 import { T, ISB, IST } from '@start9labs/start-sdk'
 import { GetPackagesRes } from '@start9labs/marketplace'
 
-const mockBlake3Commitment: T.Blake3Commitment = {
-  hash: 'fakehash',
-  size: 0,
-}
-
 const mockMerkleArchiveCommitment: T.MerkleArchiveCommitment = {
   rootSighash: 'fakehash',
   rootMaxsize: 0,
@@ -880,25 +875,6 @@ export module Mock {
     }
   }
 
-  export function getAppMetrics() {
-    const metr: Metric = {
-      Metric1: {
-        value: Math.random(),
-        unit: 'mi/b',
-      },
-      Metric2: {
-        value: Math.random(),
-        unit: '%',
-      },
-      Metric3: {
-        value: 10.1,
-        unit: '%',
-      },
-    }
-
-    return metr
-  }
-
   export const ServerLogs: Log[] = [
     {
       timestamp: '2022-07-28T03:52:54.808769Z',
@@ -946,15 +922,6 @@ export module Mock {
     },
   }
 
-  export const ActionResponse: T.ActionResult = {
-    version: '0',
-    message:
-      'Password changed successfully. If you lose your new password, you will be lost forever.',
-    value: 'NewPassword1234!',
-    copyable: true,
-    qr: true,
-  }
-
   export const SshKeys: RR.GetSSHKeysRes = [
     {
       createdAt: new Date().toISOString(),
@@ -1082,11 +1049,26 @@ export module Mock {
     },
   }
 
-  export const PackageProperties: RR.GetPackagePropertiesRes<2> = {
-    version: 2,
-    data: {
-      lndconnect: {
+  export const ActionRes: RR.ActionRes = {
+    version: '1',
+    type: 'string',
+    name: 'New Password',
+    description:
+      'Action was run successfully Action was run successfully Action was run successfully Action was run successfully Action was run successfully',
+    copyable: true,
+    qr: true,
+    masked: true,
+    value: 'iwejdoiewdhbew',
+  }
+
+  export const ActionProperties: RR.ActionRes = {
+    version: '1',
+    type: 'object',
+    name: 'Properties',
+    value: [
+      {
         type: 'string',
+        name: 'LND Connect',
         description: 'This is some information about the thing.',
         copyable: true,
         qr: true,
@@ -1094,45 +1076,50 @@ export module Mock {
         value:
           'lndconnect://udlyfq2mxa4355pt7cqlrdipnvk2tsl4jtsdw7zaeekenufwcev2wlad.onion:10009?cert=MIICJTCCAcugAwIBAgIRAOyq85fqAiA3U3xOnwhH678wCgYIKoZIzj0EAwIwODEfMB0GAkUEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMB4XDTIwMTAyNjA3MzEyN1oXDTIxMTIyMTA3MzEyN1owODEfMB0GA1UEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKqfhAMMZdY-eFnU5P4bGrQTSx0lo7m8u4V0yYkzUM6jlql_u31_mU2ovLTj56wnZApkEjoPl6fL2yasZA2wiy6OBtTCBsjAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH_BAUwAwEB_zAdBgNVHQ4EFgQUYQ9uIO6spltnVCx4rLFL5BvBF9IwWwYDVR0RBFQwUoIMNTc0OTkwMzIyYzZlgglsb2NhbGhvc3SCBHVuaXiCCnVuaXhwYWNrZXSCB2J1ZmNvbm6HBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAGHBKwSAAswCgYIKoZIzj0EAwIDSAAwRQIgVZH2Z2KlyAVY2Q2aIQl0nsvN-OEN49wreFwiBqlxNj4CIQD5_JbpuBFJuf81I5J0FQPtXY-4RppWOPZBb-y6-rkIUQ&macaroon=AgEDbG5kAusBAwoQuA8OUMeQ8Fr2h-f65OdXdRIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaFAoIbWFjYXJvb24SCGdlbmVyYXRlGhYKB21lc3NhZ2USBHJlYWQSBXdyaXRlGhcKCG9mZmNoYWluEgRyZWFkEgV3cml0ZRoWCgdvbmNoYWluEgRyZWFkEgV3cml0ZRoUCgVwZWVycxIEcmVhZBIFd3JpdGUaGAoGc2lnbmVyEghnZW5lcmF0ZRIEcmVhZAAABiCYsRUoUWuAHAiCSLbBR7b_qULDSl64R8LIU2aqNIyQfA',
       },
-      Nested: {
+      {
         type: 'object',
+        name: 'Nested Stuff',
         description: 'This is a nested thing metric',
-        value: {
-          'Last Name': {
+        value: [
+          {
             type: 'string',
+            name: 'Last Name',
             description: 'The last name of the user',
             copyable: true,
             qr: true,
             masked: false,
             value: 'Hill',
           },
-          Age: {
+          {
             type: 'string',
+            name: 'Age',
             description: 'The age of the user',
             copyable: false,
             qr: false,
             masked: false,
             value: '35',
           },
-          Password: {
+          {
             type: 'string',
+            name: 'Password',
             description: 'A secret password',
             copyable: true,
             qr: false,
             masked: true,
             value: 'password123',
           },
-        },
+        ],
       },
-      'Another Value': {
+      {
         type: 'string',
+        name: 'Another Value',
         description: 'Some more information about the service.',
         copyable: false,
         qr: true,
         masked: false,
         value: 'https://guessagain.com',
       },
-    },
+    ],
   }
 
   export const getActionInputSpec = async (): Promise<IST.InputSpec> =>
@@ -1692,7 +1679,7 @@ export module Mock {
     },
     actions: {
       config: {
-        name: 'Bitcoin Config',
+        name: 'Set Config',
         description: 'edit bitcoin.conf',
         warning: null,
         visibility: 'enabled',
@@ -1700,6 +1687,25 @@ export module Mock {
         hasInput: true,
         group: null,
       },
+      properties: {
+        name: 'View Properties',
+        description: 'view important information about Bitcoin',
+        warning: null,
+        visibility: 'enabled',
+        allowedStatuses: 'any',
+        hasInput: false,
+        group: null,
+      },
+      test: {
+        name: 'Do Another Thing',
+        description:
+          'An example of an action that shows a warning and takes no input',
+        warning: 'careful running this action',
+        visibility: 'enabled',
+        allowedStatuses: 'only-running',
+        hasInput: false,
+        group: null,
+      },
     },
     serviceInterfaces: {
       ui: {
@@ -1859,7 +1865,27 @@ export module Mock {
     storeExposedDependents: [],
     registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
-    requestedActions: {},
+    requestedActions: {
+      'bitcoind-config': {
+        request: {
+          packageId: 'bitcoind',
+          actionId: 'config',
+          severity: 'critical',
+          reason:
+            'You must run Config before starting Bitcoin for the first time',
+        },
+        active: true,
+      },
+      'bitcoind-properties': {
+        request: {
+          packageId: 'bitcoind',
+          actionId: 'properties',
+          severity: 'important',
+          reason: 'Check out all the info about your Bitcoin node',
+        },
+        active: true,
+      },
+    },
   }
 
   export const bitcoinProxy: PackageDataEntry<InstalledState> = {
@@ -1992,7 +2018,27 @@ export module Mock {
     storeExposedDependents: [],
     registry: 'https://registry.start9.com/',
     developerKey: 'developer-key',
-    requestedActions: {},
+    requestedActions: {
+      'bitcoind/config': {
+        active: true,
+        request: {
+          packageId: 'bitcoind',
+          actionId: 'config',
+          severity: 'critical',
+          reason: 'LND likes BTC a certain way',
+          input: {
+            kind: 'partial',
+            value: {
+              color: '#ffffff',
+              rpcsettings: {
+                rpcuser: 'lnd',
+              },
+              testnet: false,
+            },
+          },
+        },
+      },
+    },
   }
 
   export const LocalPkgs: { [key: string]: PackageDataEntry<InstalledState> } =
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 65997c49d..fcf375913 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -1,5 +1,4 @@
 import { Dump } from 'patch-db-client'
-import { PackagePropertiesVersioned } from 'src/app/util/properties.util'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
 import { IST, T } from '@start9labs/start-sdk'
@@ -209,19 +208,12 @@ export module RR {
 
   // package
 
-  export type GetPackagePropertiesReq = { id: string } // package.properties
-  export type GetPackagePropertiesRes<T extends number> =
-    PackagePropertiesVersioned<T>
-
   export type GetPackageLogsReq = ServerLogsReq & { id: string } // package.logs
   export type GetPackageLogsRes = LogsRes
 
   export type FollowPackageLogsReq = FollowServerLogsReq & { id: string } // package.logs.follow
   export type FollowPackageLogsRes = FollowServerLogsRes
 
-  export type GetPackageMetricsReq = { id: string } // package.metrics
-  export type GetPackageMetricsRes = Metric
-
   export type InstallPackageReq = T.InstallParams
   export type InstallPackageRes = null
 
@@ -231,13 +223,12 @@ export module RR {
     value: object | null
   }
 
-  export type RunActionReq = {
+  export type ActionReq = {
     packageId: string
     actionId: string
-    prev: GetActionInputRes | null
     input: object | null
   } // package.action.run
-  export type RunActionRes = T.ActionResult | null
+  export type ActionRes = (T.ActionResult & { version: '1' }) | null
 
   export type RestorePackagesReq = {
     // package.backup.restore
@@ -494,7 +485,7 @@ export type DependencyError =
   | DependencyErrorNotInstalled
   | DependencyErrorNotRunning
   | DependencyErrorIncorrectVersion
-  | DependencyErrorConfigUnsatisfied
+  | DependencyErrorActionRequired
   | DependencyErrorHealthChecksFailed
   | DependencyErrorTransitive
 
@@ -512,8 +503,8 @@ export interface DependencyErrorIncorrectVersion {
   received: string // version
 }
 
-export interface DependencyErrorConfigUnsatisfied {
-  type: 'configUnsatisfied'
+export interface DependencyErrorActionRequired {
+  type: 'actionRequired'
 }
 
 export interface DependencyErrorHealthChecksFailed {
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 49571d97f..280ac79f3 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -113,10 +113,6 @@ export abstract class ApiService {
     params: RR.GetServerMetricsReq,
   ): Promise<RR.GetServerMetricsRes>
 
-  abstract getPkgMetrics(
-    params: RR.GetPackageMetricsReq,
-  ): Promise<RR.GetPackageMetricsRes>
-
   abstract updateServer(url?: string): Promise<RR.UpdateServerRes>
 
   abstract restartServer(
@@ -215,10 +211,6 @@ export abstract class ApiService {
 
   // package
 
-  abstract getPackageProperties(
-    params: RR.GetPackagePropertiesReq,
-  ): Promise<RR.GetPackagePropertiesRes<2>['data']>
-
   abstract getPackageLogs(
     params: RR.GetPackageLogsReq,
   ): Promise<RR.GetPackageLogsRes>
@@ -235,7 +227,7 @@ export abstract class ApiService {
     params: RR.GetActionInputReq,
   ): Promise<RR.GetActionInputRes>
 
-  abstract runAction(params: RR.RunActionReq): Promise<RR.RunActionRes>
+  abstract runAction(params: RR.ActionReq): Promise<RR.ActionRes>
 
   abstract restorePackages(
     params: RR.RestorePackagesReq,
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 73f3e67c6..6241eaad7 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -10,7 +10,6 @@ import {
 import { PATCH_CACHE } from 'src/app/services/patch-db/patch-db-source'
 import { ApiService } from './embassy-api.service'
 import { RR } from './api.types'
-import { parsePropertiesPermissive } from 'src/app/util/properties.util'
 import { ConfigService } from '../config.service'
 import { webSocket } from 'rxjs/webSocket'
 import { Observable, filter, firstValueFrom } from 'rxjs'
@@ -436,14 +435,6 @@ export class LiveApiService extends ApiService {
 
   // package
 
-  async getPackageProperties(
-    params: RR.GetPackagePropertiesReq,
-  ): Promise<RR.GetPackagePropertiesRes<2>['data']> {
-    return this.rpcRequest({ method: 'package.properties', params }).then(
-      parsePropertiesPermissive,
-    )
-  }
-
   async getPackageLogs(
     params: RR.GetPackageLogsReq,
   ): Promise<RR.GetPackageLogsRes> {
@@ -456,12 +447,6 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'package.logs.follow', params })
   }
 
-  async getPkgMetrics(
-    params: RR.GetPackageMetricsReq,
-  ): Promise<RR.GetPackageMetricsRes> {
-    return this.rpcRequest({ method: 'package.metrics', params })
-  }
-
   async installPackage(
     params: RR.InstallPackageReq,
   ): Promise<RR.InstallPackageRes> {
@@ -474,7 +459,7 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'package.action.get-input', params })
   }
 
-  async runAction(params: RR.RunActionReq): Promise<RR.RunActionRes> {
+  async runAction(params: RR.ActionReq): Promise<RR.ActionRes> {
     return this.rpcRequest({ method: 'package.action.run', params })
   }
 
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index c4834c99e..e62094057 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -17,7 +17,6 @@ import {
   UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { CifsBackupTarget, RR } from './api.types'
-import { parsePropertiesPermissive } from 'src/app/util/properties.util'
 import { Mock } from './api.fixures'
 import markdown from 'raw-loader!../../../../../shared/assets/markdown/md-sample.md'
 import {
@@ -368,13 +367,6 @@ export class MockApiService extends ApiService {
     return Mock.getServerMetrics()
   }
 
-  async getPkgMetrics(
-    params: RR.GetServerMetricsReq,
-  ): Promise<RR.GetPackageMetricsRes> {
-    await pauseFor(2000)
-    return Mock.getAppMetrics()
-  }
-
   async updateServer(url?: string): Promise<RR.UpdateServerRes> {
     await pauseFor(2000)
     const initialProgress = {
@@ -707,13 +699,6 @@ export class MockApiService extends ApiService {
 
   // package
 
-  async getPackageProperties(
-    params: RR.GetPackagePropertiesReq,
-  ): Promise<RR.GetPackagePropertiesRes<2>['data']> {
-    await pauseFor(2000)
-    return parsePropertiesPermissive(Mock.PackageProperties)
-  }
-
   async getPackageLogs(
     params: RR.GetPackageLogsReq,
   ): Promise<RR.GetPackageLogsRes> {
@@ -795,9 +780,23 @@ export class MockApiService extends ApiService {
     }
   }
 
-  async runAction(params: RR.RunActionReq): Promise<RR.RunActionRes> {
+  async runAction(params: RR.ActionReq): Promise<RR.ActionRes> {
     await pauseFor(2000)
-    return Mock.ActionResponse
+
+    if (params.actionId === 'properties') {
+      return Mock.ActionProperties
+    } else if (params.actionId === 'config') {
+      const patch: RemoveOperation[] = [
+        {
+          op: PatchOp.REMOVE,
+          path: `/packageData/${params.packageId}/requestedActions/${params.packageId}-config`,
+        },
+      ]
+      this.mockRevision(patch)
+      return null
+    } else {
+      return Mock.ActionRes
+    }
   }
 
   async restorePackages(
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 55ea59a77..3a8560336 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -61,6 +61,7 @@ export const mockPatchData: DataModel = {
     passwordHash:
       '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
     versionCompat: '>=0.3.0 <=0.3.6',
+    postInitMigrationTodos: [],
     statusInfo: {
       backupProgress: null,
       updated: false,
@@ -82,7 +83,6 @@ export const mockPatchData: DataModel = {
       selected: null,
       lastRegion: null,
     },
-    postInitMigrationTodos: [],
   },
   packageData: {
     bitcoind: {
@@ -107,7 +107,7 @@ export const mockPatchData: DataModel = {
       // },
       actions: {
         config: {
-          name: 'Bitcoin Config',
+          name: 'Set Config',
           description: 'edit bitcoin.conf',
           warning: null,
           visibility: 'enabled',
@@ -115,6 +115,25 @@ export const mockPatchData: DataModel = {
           hasInput: true,
           group: null,
         },
+        properties: {
+          name: 'View Properties',
+          description: 'view important information about Bitcoin',
+          warning: null,
+          visibility: 'enabled',
+          allowedStatuses: 'any',
+          hasInput: false,
+          group: null,
+        },
+        test: {
+          name: 'Do Another Thing',
+          description:
+            'An example of an action that shows a warning and takes no input',
+          warning: 'careful running this action',
+          visibility: 'enabled',
+          allowedStatuses: 'only-running',
+          hasInput: false,
+          group: null,
+        },
       },
       serviceInterfaces: {
         ui: {
@@ -274,7 +293,27 @@ export const mockPatchData: DataModel = {
       storeExposedDependents: [],
       registry: 'https://registry.start9.com/',
       developerKey: 'developer-key',
-      requestedActions: {},
+      requestedActions: {
+        'bitcoind-config': {
+          request: {
+            packageId: 'bitcoind',
+            actionId: 'config',
+            severity: 'critical',
+            reason:
+              'You must run Config before starting Bitcoin for the first time',
+          },
+          active: true,
+        },
+        'bitcoind-properties': {
+          request: {
+            packageId: 'bitcoind',
+            actionId: 'properties',
+            severity: 'important',
+            reason: 'Check out all the info about your Bitcoin node',
+          },
+          active: true,
+        },
+      },
     },
     lnd: {
       stateInfo: {
@@ -364,7 +403,27 @@ export const mockPatchData: DataModel = {
       storeExposedDependents: [],
       registry: 'https://registry.start9.com/',
       developerKey: 'developer-key',
-      requestedActions: {},
+      requestedActions: {
+        'bitcoind/config': {
+          active: true,
+          request: {
+            packageId: 'bitcoind',
+            actionId: 'config',
+            severity: 'critical',
+            reason: 'LND likes BTC a certain way',
+            input: {
+              kind: 'partial',
+              value: {
+                color: '#ffffff',
+                rpcsettings: {
+                  rpcuser: 'lnd',
+                },
+                testnet: false,
+              },
+            },
+          },
+        },
+      },
     },
   },
 }
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index c4de94609..cd15ebff6 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -101,17 +101,17 @@ export class DepErrorService {
       }
     }
 
-    // invalid config
+    // action required
     if (
       Object.values(pkg.requestedActions).some(
         a =>
           a.active &&
           a.request.packageId === depId &&
-          a.request.actionId === 'config',
+          a.request.severity === 'critical',
       )
     ) {
       return {
-        type: 'configUnsatisfied',
+        type: 'actionRequired',
       }
     }
 
diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
index 3f2a7b917..44543b15c 100644
--- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -1,7 +1,6 @@
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { PkgDependencyErrors } from './dep-error.service'
 import { T } from '@start9labs/start-sdk'
-import { getManifest, needsConfig } from '../util/get-package-data'
 
 export interface PackageStatus {
   primary: PrimaryStatus
@@ -29,8 +28,12 @@ export function renderPkgStatus(
 }
 
 function getInstalledPrimaryStatus(pkg: T.PackageDataEntry): PrimaryStatus {
-  if (needsConfig(getManifest(pkg).id, pkg.requestedActions)) {
-    return 'needsConfig'
+  if (
+    Object.values(pkg.requestedActions).some(
+      r => r.active && r.request.severity === 'critical',
+    )
+  ) {
+    return 'actionRequired'
   } else {
     return pkg.status.main
   }
@@ -79,7 +82,7 @@ export type PrimaryStatus =
   | 'restarting'
   | 'stopped'
   | 'backingUp'
-  | 'needsConfig'
+  | 'actionRequired'
   | 'error'
 
 export type DependencyStatus = 'warning' | 'satisfied'
@@ -135,8 +138,8 @@ export const PrimaryRendering: Record<PrimaryStatus, StatusRendering> = {
     color: 'success',
     showDots: false,
   },
-  needsConfig: {
-    display: 'Needs Config',
+  actionRequired: {
+    display: 'Action Required',
     color: 'warning',
     showDots: false,
   },
diff --git a/web/projects/ui/src/app/util/dep-info.ts b/web/projects/ui/src/app/util/dep-info.ts
new file mode 100644
index 000000000..cd98c5d4b
--- /dev/null
+++ b/web/projects/ui/src/app/util/dep-info.ts
@@ -0,0 +1,30 @@
+import {
+  AllPackageData,
+  PackageDataEntry,
+} from 'src/app/services/patch-db/data-model'
+
+export function getDepDetails(
+  pkg: PackageDataEntry,
+  allPkgs: AllPackageData,
+  depId: string,
+) {
+  const { title, icon, versionRange } = pkg.currentDependencies[depId]
+
+  if (
+    allPkgs[depId] &&
+    (allPkgs[depId].stateInfo.state === 'installed' ||
+      allPkgs[depId].stateInfo.state === 'updating')
+  ) {
+    return {
+      title: allPkgs[depId].stateInfo.manifest!.title,
+      icon: allPkgs[depId].icon,
+      versionRange,
+    }
+  } else {
+    return {
+      title: title || depId,
+      icon: icon || 'assets/img/service-icons/fallback.png',
+      versionRange,
+    }
+  }
+}
diff --git a/web/projects/ui/src/app/util/get-package-data.ts b/web/projects/ui/src/app/util/get-package-data.ts
index 7ba7377fc..c4d0cc046 100644
--- a/web/projects/ui/src/app/util/get-package-data.ts
+++ b/web/projects/ui/src/app/util/get-package-data.ts
@@ -28,18 +28,6 @@ export function getManifest(pkg: PackageDataEntry): T.Manifest {
   return (pkg.stateInfo as InstallingState).installingInfo.newManifest
 }
 
-export function needsConfig(
-  pkgId: string,
-  requestedActions: PackageDataEntry['requestedActions'],
-): boolean {
-  return Object.values(requestedActions).some(
-    r =>
-      r.active &&
-      r.request.packageId === pkgId &&
-      r.request.actionId === 'config',
-  )
-}
-
 export function isInstalled(
   pkg: PackageDataEntry,
 ): pkg is PackageDataEntry<InstalledState> {
diff --git a/web/projects/ui/src/app/util/get-package-info.ts b/web/projects/ui/src/app/util/get-package-info.ts
index 3e506ea61..b21b42a37 100644
--- a/web/projects/ui/src/app/util/get-package-info.ts
+++ b/web/projects/ui/src/app/util/get-package-info.ts
@@ -20,7 +20,7 @@ export function getPackageInfo(
     primaryRendering,
     primaryStatus: statuses.primary,
     error: statuses.health === 'failure' || statuses.dependency === 'warning',
-    warning: statuses.primary === 'needsConfig',
+    warning: statuses.primary === 'actionRequired',
     transitioning:
       primaryRendering.showDots ||
       statuses.health === 'loading' ||
diff --git a/web/projects/ui/src/app/util/properties.util.ts b/web/projects/ui/src/app/util/properties.util.ts
deleted file mode 100644
index 5afb4bd8b..000000000
--- a/web/projects/ui/src/app/util/properties.util.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { applyOperation } from 'fast-json-patch'
-import matches, {
-  Parser,
-  shape,
-  string,
-  literal,
-  boolean,
-  deferred,
-  dictionary,
-  anyOf,
-  number,
-  arrayOf,
-} from 'ts-matches'
-
-type PropertiesV1 = typeof matchPropertiesV1._TYPE
-type PackagePropertiesV1 = PropertiesV1[]
-type PackagePropertiesV2 = {
-  [name: string]: PackagePropertyString | PackagePropertyObject
-}
-type PackagePropertiesVersionedData<T extends number> = T extends 1
-  ? PackagePropertiesV1
-  : T extends 2
-  ? PackagePropertiesV2
-  : never
-
-type PackagePropertyString = typeof matchPackagePropertyString._TYPE
-
-export type PackagePropertiesVersioned<T extends number> = {
-  version: T
-  data: PackagePropertiesVersionedData<T>
-}
-export type PackageProperties = PackagePropertiesV2
-
-const matchPropertiesV1 = shape(
-  {
-    name: string,
-    value: string,
-    description: string,
-    copyable: boolean,
-    qr: boolean,
-  },
-  ['description', 'copyable', 'qr'],
-  { copyable: false, qr: false } as const,
-)
-
-const [matchPackagePropertiesV2, setPPV2] = deferred<PackagePropertiesV2>()
-const matchPackagePropertyString = shape(
-  {
-    type: literal('string'),
-    description: string,
-    value: string,
-    copyable: boolean,
-    qr: boolean,
-    masked: boolean,
-  },
-  ['description', 'copyable', 'qr', 'masked'],
-  {
-    copyable: false,
-    qr: false,
-    masked: false,
-  } as const,
-)
-const matchPackagePropertyObject = shape(
-  {
-    type: literal('object'),
-    value: matchPackagePropertiesV2,
-    description: string,
-  },
-  ['description'],
-)
-
-const matchPropertyV2 = anyOf(
-  matchPackagePropertyString,
-  matchPackagePropertyObject,
-)
-type PackagePropertyObject = typeof matchPackagePropertyObject._TYPE
-setPPV2(dictionary([string, matchPropertyV2]))
-
-const matchPackagePropertiesVersionedV1 = shape({
-  version: number,
-  data: arrayOf(matchPropertiesV1),
-})
-const matchPackagePropertiesVersionedV2 = shape({
-  version: number,
-  data: dictionary([string, matchPropertyV2]),
-})
-
-export function parsePropertiesPermissive(
-  properties: unknown,
-  errorCallback: (err: Error) => any = console.warn,
-): PackageProperties {
-  return matches(properties)
-    .when(matchPackagePropertiesVersionedV1, prop =>
-      parsePropertiesV1Permissive(prop.data, errorCallback),
-    )
-    .when(matchPackagePropertiesVersionedV2, prop => prop.data)
-    .when(matches.nill, {})
-    .defaultToLazy(() => {
-      errorCallback(new TypeError(`value is not valid`))
-      return {}
-    })
-}
-
-function parsePropertiesV1Permissive(
-  properties: unknown,
-  errorCallback: (err: Error) => any,
-): PackageProperties {
-  if (!Array.isArray(properties)) {
-    errorCallback(new TypeError(`${properties} is not an array`))
-    return {}
-  }
-  return properties.reduce(
-    (prev: PackagePropertiesV2, cur: unknown, idx: number) => {
-      const result = matchPropertiesV1.enumParsed(cur)
-      if ('value' in result) {
-        const value = result.value
-        prev[value.name] = {
-          type: 'string',
-          value: value.value,
-          description: value.description,
-          copyable: value.copyable,
-          qr: value.qr,
-          masked: false,
-        }
-      } else {
-        const error = result.error
-        const message = Parser.validatorErrorAsString(error)
-        const dataPath = error.keys.map(removeQuotes).join('/')
-        errorCallback(new Error(`/data/${idx}: ${message}`))
-        if (dataPath) {
-          applyOperation(cur, {
-            op: 'replace',
-            path: `/${dataPath}`,
-            value: undefined,
-          })
-        }
-      }
-      return prev
-    },
-    {},
-  )
-}
-
-const removeRegex = /('|")/
-function removeQuotes(x: string) {
-  while (removeRegex.test(x)) {
-    x = x.replace(removeRegex, '')
-  }
-  return x
-}

From c9f3e1bdabea8292a970a82aadcfe2ebf11ff320 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Thu, 17 Oct 2024 21:20:46 -0600
Subject: [PATCH 295/341] fix bug allowing click on disabled actions

---
 .../app-actions/app-actions-item.component.html       |  2 +-
 .../apps-routes/app-actions/app-actions.page.html     |  6 +++---
 .../pages/apps-routes/app-actions/app-actions.page.ts | 11 +++++++++--
 web/projects/ui/src/app/services/api/api.fixures.ts   |  2 +-
 web/projects/ui/src/app/services/api/mock-patch.ts    |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html
index 79d7af03f..11faa8235 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html
@@ -1,4 +1,4 @@
-<ion-item button [disabled]="disabledText">
+<ion-item button [disabled]="disabledText" (click)="onClick.next()">
   <ion-icon slot="start" [name]="icon" size="large"></ion-icon>
   <ion-label>
     <h1>{{ action.name }}</h1>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
index bacbed729..3532fcacc 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
@@ -18,7 +18,7 @@
         visibility: 'enabled'
       }"
       icon="construct-outline"
-      (click)="rebuild(pkg.manifest.id)"
+      (onClick)="rebuild(pkg.manifest.id)"
     ></app-actions-item>
     <app-actions-item
       [action]="{
@@ -27,7 +27,7 @@
         visibility: 'enabled'
       }"
       icon="trash-outline"
-      (click)="tryUninstall(pkg.manifest)"
+      (onClick)="tryUninstall(pkg.manifest)"
     ></app-actions-item>
 
     <!-- ** specific actions ** -->
@@ -38,7 +38,7 @@
       *ngFor="let action of pkg.actions"
       [action]="action"
       icon="play-outline"
-      (click)="handleAction(pkg.mainStatus, pkg.icon, pkg.manifest, action)"
+      (onClick)="handleAction(pkg.mainStatus, pkg.icon, pkg.manifest, action)"
     ></app-actions-item>
   </ion-item-group>
 </ion-content>
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
index feea649d1..949a1adad 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
@@ -1,4 +1,10 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { getPkgId } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
@@ -70,9 +76,10 @@ export class AppActionsItemComponent {
     description: string
     visibility: T.ActionVisibility
   }
-
   @Input() icon!: string
 
+  @Output() onClick: EventEmitter<void> = new EventEmitter()
+
   get disabledText() {
     return (
       typeof this.action.visibility === 'object' &&
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index d6c27e353..828b36642 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1701,7 +1701,7 @@ export module Mock {
         description:
           'An example of an action that shows a warning and takes no input',
         warning: 'careful running this action',
-        visibility: 'enabled',
+        visibility: { disabled: 'This is temporarily disabled' },
         allowedStatuses: 'only-running',
         hasInput: false,
         group: null,
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 3a8560336..d5989affa 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -129,7 +129,7 @@ export const mockPatchData: DataModel = {
           description:
             'An example of an action that shows a warning and takes no input',
           warning: 'careful running this action',
-          visibility: 'enabled',
+          visibility: { disabled: 'This is temporarily disabled' },
           allowedStatuses: 'only-running',
           hasInput: false,
           group: null,

From 2fa0a57d2b1c3e9e08b454e94318eb73379aae19 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 18 Oct 2024 14:17:56 -0600
Subject: [PATCH 296/341] fixing raspi image (#2712)

* wip: fixing raspi image

* fix pi build
---
 image-recipe/build.sh                         | 25 ++++++++++++++-----
 image-recipe/prepare.sh                       |  3 ++-
 .../usr/lib/startos/scripts/init_resize.sh    | 11 +++-----
 .../etc/{embassy => startos}/config.yaml      |  0
 4 files changed, 25 insertions(+), 14 deletions(-)
 rename image-recipe/raspberrypi/squashfs/etc/{embassy => startos}/config.yaml (100%)

diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 5635e94f3..c183218ff 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -317,18 +317,31 @@ elif [ "${IMAGE_TYPE}" = img ]; then
 
 	TMPDIR=$(mktemp -d)
 
-	mount `partition_for ${OUTPUT_DEVICE} 2` $TMPDIR
-	mkdir $TMPDIR/boot
+	mkdir -p $TMPDIR/boot $TMPDIR/root 
+	mount `partition_for ${OUTPUT_DEVICE} 2` $TMPDIR/root
 	mount `partition_for ${OUTPUT_DEVICE} 1` $TMPDIR/boot
-	unsquashfs -f -d $TMPDIR $prep_results_dir/binary/live/filesystem.squashfs
+	unsquashfs -n -f -d $TMPDIR $prep_results_dir/binary/live/filesystem.squashfs boot
+
+	mkdir $TMPDIR/root/images $TMPDIR/root/config
+	B3SUM=$(b3sum $prep_results_dir/binary/live/filesystem.squashfs | head -c 16)
+	cp $prep_results_dir/binary/live/filesystem.squashfs $TMPDIR/root/images/$B3SUM.rootfs
+	ln -rsf $TMPDIR/root/images/$B3SUM.rootfs $TMPDIR/root/config/current.rootfs
+
+	mkdir -p $TMPDIR/next $TMPDIR/lower $TMPDIR/root/config/work $TMPDIR/root/config/overlay
+	mount $TMPDIR/root/config/current.rootfs $TMPDIR/lower
+
+	mount -t overlay -o lowerdir=$TMPDIR/lower,workdir=$TMPDIR/root/config/work,upperdir=$TMPDIR/root/config/overlay overlay $TMPDIR/next
 
 	if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
-		sed -i 's| boot=startos| init=/usr/lib/startos/scripts/init_resize\.sh|' $TMPDIR/boot/cmdline.txt
-		rsync -a $base_dir/raspberrypi/img/ $TMPDIR/
+		sed -i 's| boot=startos| boot=startos init=/usr/lib/startos/scripts/init_resize\.sh|' $TMPDIR/boot/cmdline.txt
+		rsync -a $base_dir/raspberrypi/img/ $TMPDIR/next/
 	fi
 
+	umount $TMPDIR/next
+	umount $TMPDIR/lower
+
 	umount $TMPDIR/boot
-	umount $TMPDIR
+	umount $TMPDIR/root
 
 	e2fsck -fy `partition_for ${OUTPUT_DEVICE} 2`
 	resize2fs -M `partition_for ${OUTPUT_DEVICE} 2`
diff --git a/image-recipe/prepare.sh b/image-recipe/prepare.sh
index 8962d8448..c31f6ada0 100755
--- a/image-recipe/prepare.sh
+++ b/image-recipe/prepare.sh
@@ -21,7 +21,8 @@ apt-get install -yq \
 	dosfstools \
 	e2fsprogs \
 	squashfs-tools \
-	rsync
+	rsync \
+	b3sum
 # TODO: remove when util-linux is released at v2.39.3
 apt-get install -yq \
 	git \
diff --git a/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh b/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
index cf6489f5f..9e357cd57 100755
--- a/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
+++ b/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 get_variables () {
-  ROOT_PART_DEV=$(findmnt / -o source -n)
+  ROOT_PART_DEV=$(findmnt /media/startos/root -o source -n)
   ROOT_PART_NAME=$(echo "$ROOT_PART_DEV" | cut -d "/" -f 3)
   ROOT_DEV_NAME=$(echo /sys/block/*/"${ROOT_PART_NAME}" | cut -d "/" -f 4)
   ROOT_DEV="/dev/${ROOT_DEV_NAME}"
@@ -89,12 +89,12 @@ main () {
 
   resize2fs $ROOT_PART_DEV
 
-  if ! systemd-machine-id-setup; then
+  if ! systemd-machine-id-setup --root=/media/startos/config/overlay/; then
     FAIL_REASON="systemd-machine-id-setup failed"
     return 1
   fi
 
-  if ! ssh-keygen -A; then
+  if ! mkdir -p /media/startos/config/overlay/etc/ssh && ssh-keygen -A -f /media/startos/config/overlay/; then
     FAIL_REASON="ssh host key generation failed"
     return 1
   fi
@@ -104,9 +104,6 @@ main () {
   return 0
 }
 
-mount -t proc proc /proc
-mount -t sysfs sys /sys
-mount -t tmpfs tmp /run
 mkdir -p /run/systemd
 mount /boot
 mount / -o remount,ro
@@ -114,7 +111,7 @@ mount / -o remount,ro
 beep
 
 if main; then
-  sed -i 's| init=/usr/lib/startos/scripts/init_resize\.sh| boot=startos|' /boot/cmdline.txt
+  sed -i 's| init=/usr/lib/startos/scripts/init_resize\.sh||' /boot/cmdline.txt
   echo "Resized root filesystem. Rebooting in 5 seconds..."
   sleep 5
 else
diff --git a/image-recipe/raspberrypi/squashfs/etc/embassy/config.yaml b/image-recipe/raspberrypi/squashfs/etc/startos/config.yaml
similarity index 100%
rename from image-recipe/raspberrypi/squashfs/etc/embassy/config.yaml
rename to image-recipe/raspberrypi/squashfs/etc/startos/config.yaml

From 28e39c57bd479034bc12de0026d68e77512a2be4 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Mon, 21 Oct 2024 14:47:09 -0600
Subject: [PATCH 297/341] Fix: Error Messages in HealthCheck (#2759)

* Fix: Error Messages in HealthCheck

* Update sdk/package/lib/util/SubContainer.ts

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>

* fix ts error

---------

Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 sdk/package/lib/util/SubContainer.ts | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/sdk/package/lib/util/SubContainer.ts b/sdk/package/lib/util/SubContainer.ts
index 16476f564..be1491050 100644
--- a/sdk/package/lib/util/SubContainer.ts
+++ b/sdk/package/lib/util/SubContainer.ts
@@ -258,18 +258,12 @@ export class SubContainer implements ExecSpawnable {
       await new Promise<null>((resolve) => child.stdin.end(resolve))
     }
     const pid = child.pid
-    const stdout = { data: "" as string | Buffer }
-    const stderr = { data: "" as string | Buffer }
+    const stdout = { data: "" as string }
+    const stderr = { data: "" as string }
     const appendData =
-      (appendTo: { data: string | Buffer }) =>
-      (chunk: string | Buffer | any) => {
-        if (typeof appendTo.data === "string" && typeof chunk === "string") {
-          appendTo.data += chunk
-        } else if (typeof chunk === "string" || chunk instanceof Buffer) {
-          appendTo.data = Buffer.concat([
-            new Uint8Array(Buffer.from(appendTo.data).buffer),
-            new Uint8Array(Buffer.from(chunk).buffer),
-          ])
+      (appendTo: { data: string }) => (chunk: string | Buffer | any) => {
+        if (typeof chunk === "string" || chunk instanceof Buffer) {
+          appendTo.data += chunk.toString()
         } else {
           console.error("received unexpected chunk", chunk)
         }

From 7694b68e06fffd971879ab70dc92c77aad9b8737 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:49:01 -0600
Subject: [PATCH 298/341] Feat/stats (#2761)

* Feat: Add the memory for the stats.

* Chore: Add %
---
 core/startos/src/context/rpc.rs |  4 +--
 core/startos/src/lxc/dev.rs     | 57 ++++++++++++++++++++++++++++++++-
 core/startos/src/lxc/mod.rs     | 28 ++++++++++++++--
 core/startos/src/service/mod.rs | 50 +++++++++++++++++++++++++++++
 4 files changed, 134 insertions(+), 5 deletions(-)

diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index cb5ce83c5..0e0bbb986 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -70,7 +70,7 @@ pub struct RpcContextSeed {
     pub hardware: Hardware,
     pub start_time: Instant,
     pub crons: SyncMutex<BTreeMap<Guid, NonDetachingJoinHandle<()>>>,
-    #[cfg(feature = "dev")]
+    // #[cfg(feature = "dev")]
     pub dev: Dev,
 }
 
@@ -278,7 +278,7 @@ impl RpcContext {
             hardware: Hardware { devices, ram },
             start_time: Instant::now(),
             crons,
-            #[cfg(feature = "dev")]
+            // #[cfg(feature = "dev")]
             dev: Dev {
                 lxc: Mutex::new(BTreeMap::new()),
             },
diff --git a/core/startos/src/lxc/dev.rs b/core/startos/src/lxc/dev.rs
index 506cb2e9b..248546d88 100644
--- a/core/startos/src/lxc/dev.rs
+++ b/core/startos/src/lxc/dev.rs
@@ -8,10 +8,13 @@ use rpc_toolkit::{
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::context::{CliContext, RpcContext};
 use crate::lxc::{ContainerId, LxcConfig};
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
+use crate::{
+    context::{CliContext, RpcContext},
+    service::ServiceStats,
+};
 
 pub fn lxc<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -36,6 +39,42 @@ pub fn lxc<C: Context>() -> ParentHandler<C> {
                 .with_about("List lxc containers")
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "stats",
+            from_fn_async(stats)
+                .with_custom_display_fn(|_, res| {
+                    use prettytable::*;
+                    let mut table = table!([
+                        "Container ID",
+                        "Name",
+                        "Memory Usage",
+                        "Memory Limit",
+                        "Memory %"
+                    ]);
+                    for ServiceStats {
+                        container_id,
+                        package_id,
+                        memory_usage,
+                        memory_limit,
+                    } in res
+                    {
+                        table.add_row(row![
+                            &*container_id,
+                            &*package_id,
+                            memory_usage,
+                            memory_limit,
+                            format!(
+                                "{:.2}",
+                                memory_usage.0 as f64 / memory_limit.0 as f64 * 100.0
+                            )
+                        ]);
+                    }
+                    table.printstd();
+                    Ok(())
+                })
+                .with_about("List information related to the lxc containers i.e. CPU, Memory, Disk")
+                .with_call_remote::<CliContext>(),
+        )
         .subcommand(
             "remove",
             from_fn_async(remove)
@@ -63,6 +102,22 @@ pub async fn list(ctx: RpcContext) -> Result<Vec<ContainerId>, Error> {
     Ok(ctx.dev.lxc.lock().await.keys().cloned().collect())
 }
 
+pub async fn stats(ctx: RpcContext) -> Result<Vec<ServiceStats>, Error> {
+    let ids = ctx.db.peek().await.as_public().as_package_data().keys()?;
+    let guids: Vec<_> = ctx.dev.lxc.lock().await.keys().cloned().collect();
+
+    let mut stats = Vec::with_capacity(guids.len());
+    for id in ids {
+        let service: tokio::sync::OwnedRwLockReadGuard<Option<crate::service::ServiceRef>> =
+            ctx.services.get(&id).await;
+
+        let service_ref = service.as_ref().or_not_found(&id)?;
+
+        stats.push(service_ref.stats().await?);
+    }
+    Ok(stats)
+}
+
 #[derive(Deserialize, Serialize, Parser, TS)]
 pub struct RemoveParams {
     #[ts(type = "string")]
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 3979263f0..c0fb6eaba 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -1,8 +1,8 @@
-use std::collections::BTreeSet;
 use std::net::Ipv4Addr;
 use std::path::Path;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
+use std::{collections::BTreeSet, ffi::OsString};
 
 use clap::builder::ValueParserFactory;
 use futures::{AsyncWriteExt, StreamExt};
@@ -32,7 +32,7 @@ use crate::util::io::open_file;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::{new_guid, Invoke};
 
-#[cfg(feature = "dev")]
+// #[cfg(feature = "dev")]
 pub mod dev;
 
 const LXC_CONTAINER_DIR: &str = "/var/lib/lxc";
@@ -287,6 +287,30 @@ impl LxcContainer {
         self.rpc_bind.path()
     }
 
+    pub async fn command(&self, commands: &[&str]) -> Result<String, Error> {
+        let mut cmd = Command::new("lxc-attach");
+        cmd.kill_on_drop(true);
+
+        let output = cmd
+            .arg(&**self.guid)
+            .arg("--")
+            .args(commands)
+            .output()
+            .await?;
+
+        if !output.status.success() {
+            return Err(Error::new(
+                eyre!(
+                    "Command failed with exit code: {:?} \n Message: {:?}",
+                    output.status.code(),
+                    String::from_utf8(output.stderr)
+                ),
+                ErrorKind::Docker,
+            ));
+        }
+        Ok(String::from_utf8(output.stdout)?)
+    }
+
     #[instrument(skip_all)]
     pub async fn exit(mut self) -> Result<(), Error> {
         Command::new("lxc-stop")
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index cc31efe11..078631252 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -83,6 +83,32 @@ pub enum LoadDisposition {
 
 struct RootCommand(pub String);
 
+#[derive(Clone, Debug, Serialize, Deserialize, Default, TS)]
+pub struct MiB(pub u64);
+
+impl MiB {
+    fn new(value: u64) -> Self {
+        Self(value / 1024 / 1024)
+    }
+    fn from_MiB(value: u64) -> Self {
+        Self(value)
+    }
+}
+
+impl std::fmt::Display for MiB {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{} MiB", self.0)
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Default, TS)]
+pub struct ServiceStats {
+    pub container_id: Arc<ContainerId>,
+    pub package_id: PackageId,
+    pub memory_usage: MiB,
+    pub memory_limit: MiB,
+}
+
 pub struct ServiceRef(Arc<Service>);
 impl ServiceRef {
     pub fn weak(&self) -> Weak<Service> {
@@ -553,6 +579,30 @@ impl Service {
             .clone();
         Ok(container_id)
     }
+    #[instrument(skip_all)]
+    pub async fn stats(&self) -> Result<ServiceStats, Error> {
+        let container = &self.seed.persistent_container;
+        let lxc_container = container.lxc_container.get().or_not_found("container")?;
+        let (total, used) = lxc_container
+            .command(&["free", "-m"])
+            .await?
+            .split("\n")
+            .map(|x| x.split_whitespace().collect::<Vec<_>>())
+            .skip(1)
+            .filter_map(|x| {
+                Some((
+                    x.get(1)?.parse::<u64>().ok()?,
+                    x.get(2)?.parse::<u64>().ok()?,
+                ))
+            })
+            .fold((0, 0), |acc, (total, used)| (acc.0 + total, acc.1 + used));
+        Ok(ServiceStats {
+            container_id: lxc_container.guid.clone(),
+            package_id: self.seed.id.clone(),
+            memory_limit: MiB::from_MiB(total),
+            memory_usage: MiB::from_MiB(used),
+        })
+    }
 }
 
 #[derive(Debug, Clone)]

From 42cfd69463acd1bad3648700c6d4a9eb41197c38 Mon Sep 17 00:00:00 2001
From: Remco Ros <remcoros@live.nl>
Date: Fri, 25 Oct 2024 00:29:12 +0200
Subject: [PATCH 299/341] sdk: fix piping stdio of Daemons, support
 onStdOut/onStderr (#2762)

---
 .../DockerProcedureContainer.ts               |  2 +-
 sdk/package/lib/mainFn/CommandController.ts   | 13 ++++++++----
 sdk/package/lib/mainFn/Daemon.ts              |  4 ++--
 sdk/package/lib/mainFn/Daemons.ts             |  2 ++
 sdk/package/lib/util/SubContainer.ts          | 20 +++++++++++--------
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 26e184cef..26e4dd8bf 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -151,7 +151,7 @@ export class DockerProcedureContainer {
     }
   }
 
-  async spawn(commands: string[]): Promise<cp.ChildProcessWithoutNullStreams> {
+  async spawn(commands: string[]): Promise<cp.ChildProcess> {
     return await this.subcontainer.spawn(commands)
   }
 }
diff --git a/sdk/package/lib/mainFn/CommandController.ts b/sdk/package/lib/mainFn/CommandController.ts
index 27089ea86..1aefc854f 100644
--- a/sdk/package/lib/mainFn/CommandController.ts
+++ b/sdk/package/lib/mainFn/CommandController.ts
@@ -17,7 +17,7 @@ export class CommandController {
     readonly runningAnswer: Promise<unknown>,
     private state: { exited: boolean },
     private readonly subcontainer: SubContainer,
-    private process: cp.ChildProcessWithoutNullStreams,
+    private process: cp.ChildProcess,
     readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {}
   static of<Manifest extends T.SDKManifest>() {
@@ -43,8 +43,8 @@ export class CommandController {
           | undefined
         cwd?: string | undefined
         user?: string | undefined
-        onStdout?: (x: Buffer) => null
-        onStderr?: (x: Buffer) => null
+        onStdout?: (chunk: Buffer | string | any) => void
+        onStderr?: (chunk: Buffer | string | any) => void
       },
     ) => {
       const commands = splitCommand(command)
@@ -62,7 +62,7 @@ export class CommandController {
               }
               return subc
             })()
-      let childProcess: cp.ChildProcessWithoutNullStreams
+      let childProcess: cp.ChildProcess
       if (options.runAsInit) {
         childProcess = await subc.launch(commands, {
           env: options.env,
@@ -70,8 +70,13 @@ export class CommandController {
       } else {
         childProcess = await subc.spawn(commands, {
           env: options.env,
+          stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
         })
       }
+
+      if (options.onStdout) childProcess.stdout?.on("data", options.onStdout)
+      if (options.onStderr) childProcess.stderr?.on("data", options.onStderr)
+
       const state = { exited: false }
       const answer = new Promise<null>((resolve, reject) => {
         childProcess.on("exit", (code) => {
diff --git a/sdk/package/lib/mainFn/Daemon.ts b/sdk/package/lib/mainFn/Daemon.ts
index 7877dce08..d9db89b6a 100644
--- a/sdk/package/lib/mainFn/Daemon.ts
+++ b/sdk/package/lib/mainFn/Daemon.ts
@@ -37,8 +37,8 @@ export class Daemon {
           | undefined
         cwd?: string | undefined
         user?: string | undefined
-        onStdout?: (x: Buffer) => null
-        onStderr?: (x: Buffer) => null
+        onStdout?: (chunk: Buffer | string | any) => void
+        onStderr?: (chunk: Buffer | string | any) => void
         sigtermTimeout?: number
       },
     ) => {
diff --git a/sdk/package/lib/mainFn/Daemons.ts b/sdk/package/lib/mainFn/Daemons.ts
index 4ad573b0b..cefa06698 100644
--- a/sdk/package/lib/mainFn/Daemons.ts
+++ b/sdk/package/lib/mainFn/Daemons.ts
@@ -39,6 +39,8 @@ type DaemonsParams<
   ready: Ready
   requires: Exclude<Ids, Id>[]
   sigtermTimeout?: number
+  onStdout?: (chunk: Buffer | string | any) => void
+  onStderr?: (chunk: Buffer | string | any) => void
 }
 
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`
diff --git a/sdk/package/lib/util/SubContainer.ts b/sdk/package/lib/util/SubContainer.ts
index be1491050..785c6fea0 100644
--- a/sdk/package/lib/util/SubContainer.ts
+++ b/sdk/package/lib/util/SubContainer.ts
@@ -35,8 +35,8 @@ export interface ExecSpawnable {
   ): Promise<ExecResults>
   spawn(
     command: string[],
-    options?: CommandOptions,
-  ): Promise<cp.ChildProcessWithoutNullStreams>
+    options?: CommandOptions & StdioOptions,
+  ): Promise<cp.ChildProcess>
 }
 /**
  * Want to limit what we can do in a container, so we want to launch a container with a specific image and the mounts.
@@ -332,8 +332,8 @@ export class SubContainer implements ExecSpawnable {
 
   async spawn(
     command: string[],
-    options?: CommandOptions,
-  ): Promise<cp.ChildProcessWithoutNullStreams> {
+    options: CommandOptions & StdioOptions = { stdio: "inherit" },
+  ): Promise<cp.ChildProcess> {
     await this.waitProc()
     const imageMeta: any = await fs
       .readFile(`/media/startos/images/${this.imageId}.json`, {
@@ -342,12 +342,12 @@ export class SubContainer implements ExecSpawnable {
       .catch(() => "{}")
       .then(JSON.parse)
     let extra: string[] = []
-    if (options?.user) {
+    if (options.user) {
       extra.push(`--user=${options.user}`)
       delete options.user
     }
     let workdir = imageMeta.workdir || "/"
-    if (options?.cwd) {
+    if (options.cwd) {
       workdir = options.cwd
       delete options.cwd
     }
@@ -387,8 +387,8 @@ export class SubContainerHandle implements ExecSpawnable {
   }
   spawn(
     command: string[],
-    options?: CommandOptions,
-  ): Promise<cp.ChildProcessWithoutNullStreams> {
+    options: CommandOptions & StdioOptions = { stdio: "inherit" },
+  ): Promise<cp.ChildProcess> {
     return this.subContainer.spawn(command, options)
   }
 }
@@ -399,6 +399,10 @@ export type CommandOptions = {
   user?: string
 }
 
+export type StdioOptions = {
+  stdio?: cp.IOType
+}
+
 export type MountOptions =
   | MountOptionsVolume
   | MountOptionsAssets

From 26ae0bf20710f756226f36565a7136a0bcfcb4ad Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:12:36 -0600
Subject: [PATCH 300/341] sdk tweaks (#2760)

* sdk tweaks

* update action result types

* accommodate new action response types

* fix: show action value labels

* Feature/get status effect (#2765)

* wip: get status

* feat: Add the get_status for effects

* feat: Do a callback

---------

Co-authored-by: J H <dragondef@gmail.com>

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>
Co-authored-by: waterplea <alexander@inkin.ru>
Co-authored-by: J H <dragondef@gmail.com>
---
 .../src/Adapters/EffectCreator.ts             |   3 +
 .../Systems/SystemForEmbassy/index.ts         |  27 +-
 core/startos/src/action.rs                    | 122 ++---
 core/startos/src/service/effects/callbacks.rs |  19 +
 core/startos/src/service/effects/control.rs   |  44 +-
 core/startos/src/service/effects/mod.rs       |   6 +
 core/startos/src/service/service_actor.rs     |  18 +-
 core/startos/src/status/mod.rs                |  14 +
 sdk/base/lib/Effects.ts                       |   6 +
 sdk/base/lib/osBindings/ActionResultMember.ts |  15 +
 sdk/base/lib/osBindings/ActionResultV1.ts     |  22 +-
 sdk/base/lib/osBindings/ActionResultValue.ts  |  12 +
 sdk/base/lib/osBindings/GetStatusParams.ts    |   5 +
 sdk/base/lib/osBindings/index.ts              |   3 +
 .../lib/test/startosTypeValidation.test.ts    |   2 +
 sdk/package/lib/StartSdk.ts                   |  17 +-
 sdk/package/lib/manifest/setupManifest.ts     |   8 +-
 sdk/package/lib/util/fileHelper.ts            |  24 +-
 web/package-lock.json                         | 486 +++++++++++-------
 web/package.json                              |  18 +-
 .../action-success-group.component.ts         |  30 +-
 ....ts => action-success-member.component.ts} |  77 ++-
 .../action-success-single.component.ts        | 145 ++++++
 .../action-success/action-success.page.ts     |  36 +-
 .../ui/src/app/modals/action-success/types.ts |   7 +
 .../ui/src/app/services/action.service.ts     |   8 +-
 .../ui/src/app/services/api/api.fixures.ts    | 148 +++---
 .../services/api/embassy-mock-api.service.ts  |   7 +-
 28 files changed, 872 insertions(+), 457 deletions(-)
 create mode 100644 sdk/base/lib/osBindings/ActionResultMember.ts
 create mode 100644 sdk/base/lib/osBindings/ActionResultValue.ts
 create mode 100644 sdk/base/lib/osBindings/GetStatusParams.ts
 rename web/projects/ui/src/app/modals/action-success/{action-success-item.component.ts => action-success-member.component.ts} (67%)
 create mode 100644 web/projects/ui/src/app/modals/action-success/action-success-single.component.ts
 create mode 100644 web/projects/ui/src/app/modals/action-success/types.ts

diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index 4ec3a5b7d..0123b0cbc 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -284,6 +284,9 @@ export function makeEffects(context: EffectContext): Effects {
       >
     },
 
+    getStatus(...[o]: Parameters<T.Effects["getStatus"]>) {
+      return rpcRound("get-status", o) as ReturnType<T.Effects["getStatus"]>
+    },
     setMainStatus(o: { status: "running" | "stopped" }): Promise<null> {
       return rpcRound("set-main-status", o) as ReturnType<
         T.Effects["setHealth"]
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index ae55eb690..b33e83c0f 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -245,10 +245,10 @@ const matchProperties = object({
 function convertProperties(
   name: string,
   value: PropertiesValue,
-): T.ActionResultV1 {
+): T.ActionResultMember {
   if (value.type === "string") {
     return {
-      type: "string",
+      type: "single",
       name,
       description: value.description,
       copyable: value.copyable || false,
@@ -258,9 +258,9 @@ function convertProperties(
     }
   }
   return {
-    type: "object",
+    type: "group",
     name,
-    description: value.description || undefined,
+    description: value.description,
     value: Object.entries(value.value).map(([name, value]) =>
       convertProperties(name, value),
     ),
@@ -459,13 +459,14 @@ export class SystemForEmbassy implements System {
     } else if (actionId === "properties") {
       return {
         version: "1",
-        type: "object",
-        name: "Properties",
-        description:
-          "Runtime information, credentials, and other values of interest",
-        value: Object.entries(await this.properties(effects, timeoutMs)).map(
-          ([name, value]) => convertProperties(name, value),
-        ),
+        title: "Properties",
+        message: null,
+        result: {
+          type: "group",
+          value: Object.entries(await this.properties(effects, timeoutMs)).map(
+            ([name, value]) => convertProperties(name, value),
+          ),
+        },
       }
     } else {
       return this.action(effects, actionId, input, timeoutMs)
@@ -814,13 +815,13 @@ export class SystemForEmbassy implements System {
     const actionProcedure = this.manifest.actions?.[actionId]?.implementation
     const toActionResult = ({
       message,
-      value = "",
+      value,
       copyable,
       qr,
     }: U.ActionResult): T.ActionResult => ({
       version: "0",
       message,
-      value,
+      value: value ?? null,
       copyable,
       qr,
     })
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index 3f1912c34..d0748265b 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeMap;
 use std::fmt;
 
 use clap::{CommandFactory, FromArgMatches, Parser};
@@ -6,7 +7,6 @@ use models::PackageId;
 use qrcode::QrCode;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
 use tracing::instrument;
 use ts_rs::TS;
 
@@ -24,7 +24,7 @@ pub fn action_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(get_action_input)
                 .with_display_serializable()
                 .with_about("Get action input spec")
-                .with_call_remote::<CliContext>()
+                .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "run",
@@ -37,7 +37,7 @@ pub fn action_api<C: Context>() -> ParentHandler<C> {
                     Ok(())
                 })
                 .with_about("Run service action")
-                .with_call_remote::<CliContext>()
+                .with_call_remote::<CliContext>(),
         )
 }
 
@@ -121,83 +121,78 @@ impl fmt::Display for ActionResultV0 {
     }
 }
 
+#[derive(Debug, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct ActionResultV1 {
+    pub title: String,
+    pub message: Option<String>,
+    pub result: Option<ActionResultValue>,
+}
+
+#[derive(Debug, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+pub struct ActionResultMember {
+    pub name: String,
+    pub description: Option<String>,
+    #[serde(flatten)]
+    #[ts(flatten)]
+    pub value: ActionResultValue,
+}
+
 #[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(rename_all_fields = "camelCase")]
 #[serde(tag = "type")]
-pub enum ActionResultV1 {
-    String {
-        name: String,
+pub enum ActionResultValue {
+    Single {
         value: String,
-        description: Option<String>,
         copyable: bool,
         qr: bool,
         masked: bool,
     },
-    Object {
-        name: String,
-        value: Vec<ActionResultV1>,
-        #[ts(optional)]
-        description: Option<String>,
+    Group {
+        value: Vec<ActionResultMember>,
     },
 }
-impl ActionResultV1 {
+impl ActionResultValue {
     fn fmt_rec(&self, f: &mut fmt::Formatter<'_>, indent: usize) -> fmt::Result {
         match self {
-            Self::String {
-                name,
-                value,
-                description,
-                qr,
-                ..
-            } => {
-                for i in 0..indent {
+            Self::Single { value, qr, .. } => {
+                for _ in 0..indent {
                     write!(f, "  ")?;
                 }
-                write!(f, "{name}")?;
-                if let Some(description) = description {
-                    write!(f, ": {description}")?;
-                }
-                if !value.is_empty() {
-                    write!(f, ":\n")?;
-                    for i in 0..indent {
+                write!(f, "{value}")?;
+                if *qr {
+                    use qrcode::render::unicode;
+                    writeln!(f)?;
+                    for _ in 0..indent {
                         write!(f, "  ")?;
                     }
-                    write!(f, "{value}")?;
-                    if *qr {
-                        use qrcode::render::unicode;
-                        write!(f, "\n")?;
-                        for i in 0..indent {
-                            write!(f, "  ")?;
-                        }
-                        write!(
-                            f,
-                            "{}",
-                            QrCode::new(value.as_bytes())
-                                .unwrap()
-                                .render::<unicode::Dense1x2>()
-                                .build()
-                        )?;
-                    }
+                    write!(
+                        f,
+                        "{}",
+                        QrCode::new(value.as_bytes())
+                            .unwrap()
+                            .render::<unicode::Dense1x2>()
+                            .build()
+                    )?;
                 }
             }
-            Self::Object {
-                name,
-                value,
-                description,
-            } => {
-                for i in 0..indent {
-                    write!(f, "  ")?;
-                }
-                write!(f, "{name}")?;
-                if let Some(description) = description {
-                    write!(f, ": {description}")?;
-                }
-                for value in value {
-                    write!(f, ":\n")?;
-                    for i in 0..indent {
+            Self::Group { value } => {
+                for ActionResultMember {
+                    name,
+                    description,
+                    value,
+                } in value
+                {
+                    for _ in 0..indent {
                         write!(f, "  ")?;
                     }
+                    write!(f, "{name}")?;
+                    if let Some(description) = description {
+                        write!(f, ": {description}")?;
+                    }
+                    writeln!(f, ":")?;
                     value.fmt_rec(f, indent + 1)?;
                 }
             }
@@ -207,7 +202,14 @@ impl ActionResultV1 {
 }
 impl fmt::Display for ActionResultV1 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.fmt_rec(f, 0)
+        writeln!(f, "{}:", self.title)?;
+        if let Some(message) = &self.message {
+            writeln!(f, "{message}")?;
+        }
+        if let Some(result) = &self.result {
+            result.fmt_rec(f, 1)?;
+        }
+        Ok(())
     }
 }
 
diff --git a/core/startos/src/service/effects/callbacks.rs b/core/startos/src/service/effects/callbacks.rs
index 05f36cb4b..65eb707d8 100644
--- a/core/startos/src/service/effects/callbacks.rs
+++ b/core/startos/src/service/effects/callbacks.rs
@@ -36,6 +36,7 @@ struct ServiceCallbackMap {
         (NonDetachingJoinHandle<()>, Vec<CallbackHandler>),
     >,
     get_store: BTreeMap<PackageId, BTreeMap<JsonPointer, Vec<CallbackHandler>>>,
+    get_status: BTreeMap<PackageId, Vec<CallbackHandler>>,
 }
 
 impl ServiceCallbacks {
@@ -71,6 +72,10 @@ impl ServiceCallbacks {
                 });
                 !v.is_empty()
             });
+            this.get_status.retain(|_, v| {
+                v.retain(|h| h.handle.is_active() && h.seed.strong_count() > 0);
+                !v.is_empty()
+            });
         })
     }
 
@@ -220,6 +225,20 @@ impl ServiceCallbacks {
                 .push(handler);
         })
     }
+    pub(super) fn add_get_status(&self, package_id: PackageId, handler: CallbackHandler) {
+        self.mutate(|this| this.get_status.entry(package_id).or_default().push(handler))
+    }
+    #[must_use]
+    pub fn get_status(&self, package_id: &PackageId) -> Option<CallbackHandlers> {
+        self.mutate(|this| {
+            if let Some(watched) = this.get_status.remove(package_id) {
+                Some(CallbackHandlers(watched))
+            } else {
+                None
+            }
+            .filter(|cb| !cb.0.is_empty())
+        })
+    }
 
     pub(super) fn add_get_store(
         &self,
diff --git a/core/startos/src/service/effects/control.rs b/core/startos/src/service/effects/control.rs
index 4eb897c37..4b9817b77 100644
--- a/core/startos/src/service/effects/control.rs
+++ b/core/startos/src/service/effects/control.rs
@@ -1,9 +1,11 @@
 use std::str::FromStr;
 
 use clap::builder::ValueParserFactory;
-use models::FromStrParser;
+use models::{FromStrParser, PackageId};
 
 use crate::service::effects::prelude::*;
+use crate::service::rpc::CallbackId;
+use crate::status::MainStatus;
 
 pub async fn restart(
     context: EffectContext,
@@ -23,6 +25,46 @@ pub async fn shutdown(
     Ok(())
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct GetStatusParams {
+    #[ts(optional)]
+    pub package_id: Option<PackageId>,
+    #[ts(optional)]
+    #[arg(skip)]
+    pub callback: Option<CallbackId>,
+}
+
+pub async fn get_status(
+    context: EffectContext,
+    GetStatusParams {
+        package_id,
+        callback,
+    }: GetStatusParams,
+) -> Result<MainStatus, Error> {
+    let context = context.deref()?;
+    let id = package_id.unwrap_or_else(|| context.seed.id.clone());
+    let db = context.seed.ctx.db.peek().await;
+    let status = db
+        .as_public()
+        .as_package_data()
+        .as_idx(&id)
+        .or_not_found(&id)?
+        .as_status()
+        .de()?;
+
+    if let Some(callback) = callback {
+        let callback = callback.register(&context.seed.persistent_container);
+        context.seed.ctx.callbacks.add_get_status(
+            id,
+            super::callbacks::CallbackHandler::new(&context, callback),
+        );
+    }
+
+    Ok(status)
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/core/startos/src/service/effects/mod.rs b/core/startos/src/service/effects/mod.rs
index 844f5646b..f68985268 100644
--- a/core/startos/src/service/effects/mod.rs
+++ b/core/startos/src/service/effects/mod.rs
@@ -50,6 +50,12 @@ pub fn handler<C: Context>() -> ParentHandler<C> {
                 .no_display()
                 .with_call_remote::<ContainerCliContext>(),
         )
+        .subcommand(
+            "get-status",
+            from_fn_async(control::get_status)
+                .no_display()
+                .with_call_remote::<ContainerCliContext>(),
+        )
         // dependency
         .subcommand(
             "set-dependencies",
diff --git a/core/startos/src/service/service_actor.rs b/core/startos/src/service/service_actor.rs
index b343e513e..712baaf1e 100644
--- a/core/startos/src/service/service_actor.rs
+++ b/core/startos/src/service/service_actor.rs
@@ -1,6 +1,8 @@
 use std::sync::Arc;
 use std::time::Duration;
 
+use imbl::vector;
+
 use super::start_stop::StartStop;
 use super::ServiceActorSeed;
 use crate::prelude::*;
@@ -45,7 +47,8 @@ async fn service_actor_loop(
     let id = &seed.id;
     let kinds = current.borrow().kinds();
     if let Err(e) = async {
-        seed.ctx
+        let major_changes_state = seed
+            .ctx
             .db
             .mutate(|d| {
                 if let Some(i) = d.as_public_mut().as_package_data_mut().as_idx_mut(&id) {
@@ -89,11 +92,22 @@ async fn service_actor_loop(
                             ..
                         } => MainStatus::Stopped,
                     };
+                    let previous = i.as_status().de()?;
                     i.as_status_mut().ser(&main_status)?;
+                    return Ok(previous
+                        .major_changes(&main_status)
+                        .then_some((previous, main_status)));
                 }
-                Ok(())
+                Ok(None)
             })
             .await?;
+        if let Some((previous, new_state)) = major_changes_state {
+            if let Some(callbacks) = seed.ctx.callbacks.get_status(id) {
+                callbacks
+                    .call(vector![to_value(&previous)?, to_value(&new_state)?])
+                    .await?;
+            }
+        }
         seed.synchronized.notify_waiters();
 
         match kinds {
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 14442bce6..398797a5a 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -66,6 +66,20 @@ impl MainStatus {
         }
     }
 
+    pub fn major_changes(&self, other: &Self) -> bool {
+        match (self, other) {
+            (MainStatus::Running { .. }, MainStatus::Running { .. }) => false,
+            (MainStatus::Starting { .. }, MainStatus::Starting { .. }) => false,
+            (MainStatus::Stopping, MainStatus::Stopping) => false,
+            (MainStatus::Stopped, MainStatus::Stopped) => false,
+            (MainStatus::Restarting, MainStatus::Restarting) => false,
+            (MainStatus::Restoring, MainStatus::Restoring) => false,
+            (MainStatus::BackingUp { .. }, MainStatus::BackingUp { .. }) => false,
+            (MainStatus::Error { .. }, MainStatus::Error { .. }) => false,
+            _ => true,
+        }
+    }
+
     pub fn backing_up(self) -> Self {
         MainStatus::BackingUp {
             on_complete: if self.running() {
diff --git a/sdk/base/lib/Effects.ts b/sdk/base/lib/Effects.ts
index f985db77b..00d56cfba 100644
--- a/sdk/base/lib/Effects.ts
+++ b/sdk/base/lib/Effects.ts
@@ -14,6 +14,7 @@ import {
   ServiceInterface,
   ActionRequest,
   RequestActionParams,
+  MainStatus,
 } from "./osBindings"
 import { StorePath } from "./util/PathBuilder"
 import {
@@ -61,6 +62,11 @@ export type Effects = {
   restart(): Promise<null>
   /** stop this service's main function */
   shutdown(): Promise<null>
+  /** ask the host os what the service's current status is */
+  getStatus(options: {
+    packageId?: PackageId
+    callback?: () => void
+  }): Promise<MainStatus>
   /** indicate to the host os what runstate the service is in */
   setMainStatus(options: SetMainStatus): Promise<null>
 
diff --git a/sdk/base/lib/osBindings/ActionResultMember.ts b/sdk/base/lib/osBindings/ActionResultMember.ts
new file mode 100644
index 000000000..cdc23ecaa
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionResultMember.ts
@@ -0,0 +1,15 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ActionResultMember = {
+  name: string
+  description: string | null
+} & (
+  | {
+      type: "single"
+      value: string
+      copyable: boolean
+      qr: boolean
+      masked: boolean
+    }
+  | { type: "group"; value: Array<ActionResultMember> }
+)
diff --git a/sdk/base/lib/osBindings/ActionResultV1.ts b/sdk/base/lib/osBindings/ActionResultV1.ts
index cda0e5df9..eece18477 100644
--- a/sdk/base/lib/osBindings/ActionResultV1.ts
+++ b/sdk/base/lib/osBindings/ActionResultV1.ts
@@ -1,18 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionResultValue } from "./ActionResultValue"
 
-export type ActionResultV1 =
-  | {
-      type: "string"
-      name: string
-      value: string
-      description: string | null
-      copyable: boolean
-      qr: boolean
-      masked: boolean
-    }
-  | {
-      type: "object"
-      name: string
-      value: Array<ActionResultV1>
-      description?: string
-    }
+export type ActionResultV1 = {
+  title: string
+  message: string | null
+  result: ActionResultValue | null
+}
diff --git a/sdk/base/lib/osBindings/ActionResultValue.ts b/sdk/base/lib/osBindings/ActionResultValue.ts
new file mode 100644
index 000000000..d1cb6c8c3
--- /dev/null
+++ b/sdk/base/lib/osBindings/ActionResultValue.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ActionResultMember } from "./ActionResultMember"
+
+export type ActionResultValue =
+  | {
+      type: "single"
+      value: string
+      copyable: boolean
+      qr: boolean
+      masked: boolean
+    }
+  | { type: "group"; value: Array<ActionResultMember> }
diff --git a/sdk/base/lib/osBindings/GetStatusParams.ts b/sdk/base/lib/osBindings/GetStatusParams.ts
new file mode 100644
index 000000000..a0fbe3bfc
--- /dev/null
+++ b/sdk/base/lib/osBindings/GetStatusParams.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CallbackId } from "./CallbackId"
+import type { PackageId } from "./PackageId"
+
+export type GetStatusParams = { packageId?: PackageId; callback?: CallbackId }
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index 5d5574acf..6c18fa197 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -7,9 +7,11 @@ export { ActionRequestEntry } from "./ActionRequestEntry"
 export { ActionRequestInput } from "./ActionRequestInput"
 export { ActionRequestTrigger } from "./ActionRequestTrigger"
 export { ActionRequest } from "./ActionRequest"
+export { ActionResultMember } from "./ActionResultMember"
 export { ActionResult } from "./ActionResult"
 export { ActionResultV0 } from "./ActionResultV0"
 export { ActionResultV1 } from "./ActionResultV1"
+export { ActionResultValue } from "./ActionResultValue"
 export { ActionSeverity } from "./ActionSeverity"
 export { ActionVisibility } from "./ActionVisibility"
 export { AddAdminParams } from "./AddAdminParams"
@@ -79,6 +81,7 @@ export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams"
 export { GetServicePortForwardParams } from "./GetServicePortForwardParams"
 export { GetSslCertificateParams } from "./GetSslCertificateParams"
 export { GetSslKeyParams } from "./GetSslKeyParams"
+export { GetStatusParams } from "./GetStatusParams"
 export { GetStoreParams } from "./GetStoreParams"
 export { GetSystemSmtpParams } from "./GetSystemSmtpParams"
 export { Governor } from "./Governor"
diff --git a/sdk/base/lib/test/startosTypeValidation.test.ts b/sdk/base/lib/test/startosTypeValidation.test.ts
index 7686328bd..596da3b49 100644
--- a/sdk/base/lib/test/startosTypeValidation.test.ts
+++ b/sdk/base/lib/test/startosTypeValidation.test.ts
@@ -7,6 +7,7 @@ import {
   ClearCallbacksParams,
   ClearServiceInterfacesParams,
   GetActionInputParams,
+  GetStatusParams,
   GetStoreParams,
   RequestActionParams,
   RunActionParams,
@@ -89,6 +90,7 @@ describe("startosTypeValidation ", () => {
       mount: {} as MountParams,
       checkDependencies: {} as CheckDependenciesParam,
       getDependencies: undefined,
+      getStatus: {} as WithCallback<GetStatusParams>,
       setMainStatus: {} as SetMainStatus,
     })
   })
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index 12e92faf2..f41961d16 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -134,6 +134,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
       getDataVersion: (effects, ...args) => effects.getDataVersion(...args),
       shutdown: (effects, ...args) => effects.shutdown(...args),
       getDependencies: (effects, ...args) => effects.getDependencies(...args),
+      getStatus: (effects, ...args) => effects.getStatus(...args),
     }
 
     return {
@@ -387,8 +388,8 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
         algorithm?: T.Algorithm,
       ) => new GetSslCertificate(effects, hostnames, algorithm),
       HealthCheck: {
-        of(o: HealthCheckParams) {
-          return healthCheck(o)
+        of(effects: T.Effects, o: Omit<HealthCheckParams, "effects">) {
+          return healthCheck({ effects, ...o })
         },
       },
       healthCheck: {
@@ -636,12 +637,12 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
         ) => InputSpec.of<Spec, Store>(spec),
       },
       Daemons: {
-        of(options: {
-          effects: Effects
-          started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>
-          healthReceipts: HealthReceipt[]
-        }) {
-          return Daemons.of<Manifest>(options)
+        of(
+          effects: Effects,
+          started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>,
+          healthReceipts: HealthReceipt[],
+        ) {
+          return Daemons.of<Manifest>({ effects, started, healthReceipts })
         },
       },
       List: {
diff --git a/sdk/package/lib/manifest/setupManifest.ts b/sdk/package/lib/manifest/setupManifest.ts
index eb83741c8..919412f7d 100644
--- a/sdk/package/lib/manifest/setupManifest.ts
+++ b/sdk/package/lib/manifest/setupManifest.ts
@@ -15,18 +15,14 @@ import { VersionGraph } from "../version/VersionGraph"
  */
 export function setupManifest<
   Id extends string,
-  Dependencies extends Record<string, unknown>,
   VolumesTypes extends VolumeId,
   AssetTypes extends VolumeId,
-  ImagesTypes extends ImageId,
   Manifest extends {
-    dependencies: Dependencies
     id: Id
     assets: AssetTypes[]
-    images: Record<ImagesTypes, SDKImageInputSpec>
     volumes: VolumesTypes[]
-  },
->(manifest: SDKManifest & Manifest): SDKManifest & Manifest {
+  } & SDKManifest,
+>(manifest: Manifest): Manifest {
   return manifest
 }
 
diff --git a/sdk/package/lib/util/fileHelper.ts b/sdk/package/lib/util/fileHelper.ts
index 1a3be3e4f..0420a4cbf 100644
--- a/sdk/package/lib/util/fileHelper.ts
+++ b/sdk/package/lib/util/fileHelper.ts
@@ -86,7 +86,7 @@ export class FileHelper<A> {
   /**
    * Accepts structured data and overwrites the existing file on disk.
    */
-  async write(data: A): Promise<null> {
+  private async writeFile(data: A): Promise<null> {
     const parent = previousPath.exec(this.path)
     if (parent) {
       await fs.mkdir(parent[1], { recursive: true })
@@ -153,13 +153,27 @@ export class FileHelper<A> {
   }
 
   /**
-   * Accepts structured data and performs a merge with the existing file on disk.
+   * Accepts full structured data and performs a merge with the existing file on disk if it exists.
    */
-  async merge(data: A) {
-    const fileData = (await this.readOnce().catch(() => ({}))) || {}
+  async write(data: A) {
+    const fileData = (await this.readOnce()) || {}
     const mergeData = merge({}, fileData, data)
-    return await this.write(mergeData)
+    return await this.writeFile(mergeData)
   }
+
+  /**
+   * Accepts partial structured data and performs a merge with the existing file on disk.
+   */
+  async merge(data: Partial<A>) {
+    const fileData =
+      (await this.readOnce()) ||
+      (() => {
+        throw new Error(`${this.path}: does not exist`)
+      })()
+    const mergeData = merge({}, fileData, data)
+    return await this.writeFile(mergeData)
+  }
+
   /**
    * Create a File Helper for an arbitrary file type.
    *
diff --git a/web/package-lock.json b/web/package-lock.json
index 55925e77f..826feb631 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -21,20 +21,20 @@
         "@angular/service-worker": "^14.2.2",
         "@ionic/angular": "^6.1.15",
         "@materia-ui/ngx-monaco-editor": "^6.0.0",
-        "@ng-web-apis/common": "^3.0.6",
-        "@ng-web-apis/mutation-observer": "^3.2.1",
-        "@ng-web-apis/resize-observer": "^3.2.1",
+        "@ng-web-apis/common": "^3.2.3",
+        "@ng-web-apis/mutation-observer": "^3.2.3",
+        "@ng-web-apis/resize-observer": "^3.2.3",
         "@noble/curves": "^1.4.0",
         "@noble/hashes": "^1.4.0",
         "@start9labs/argon2": "^0.2.2",
         "@start9labs/emver": "^0.1.5",
         "@start9labs/start-sdk": "file:../sdk/baseDist",
-        "@taiga-ui/addon-charts": "3.86.0",
-        "@taiga-ui/cdk": "3.86.0",
-        "@taiga-ui/core": "3.86.0",
-        "@taiga-ui/experimental": "3.86.0",
-        "@taiga-ui/icons": "3.86.0",
-        "@taiga-ui/kit": "3.86.0",
+        "@taiga-ui/addon-charts": "3.96.0",
+        "@taiga-ui/cdk": "3.96.0",
+        "@taiga-ui/core": "3.96.0",
+        "@taiga-ui/experimental": "3.96.0",
+        "@taiga-ui/icons": "3.96.0",
+        "@taiga-ui/kit": "3.96.0",
         "@tinkoff/ng-dompurify": "4.0.0",
         "@tinkoff/ng-event-plugins": "3.2.0",
         "angular-svg-round-progressbar": "^9.0.0",
@@ -3761,10 +3761,11 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
@@ -3786,6 +3787,7 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@maskito/angular/-/angular-1.9.0.tgz",
       "integrity": "sha512-Wa/9nM9Nv0oieVZ6yxQNXfDRA4obFDR15xO16o1GKF8i9W1IdQQn+tuMRjkmx6HhJDN9+x3k8OTJ1f80BIrhjA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "2.6.2"
       },
@@ -3800,17 +3802,20 @@
     "node_modules/@maskito/angular/node_modules/tslib": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "license": "0BSD"
     },
     "node_modules/@maskito/core": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@maskito/core/-/core-1.9.0.tgz",
-      "integrity": "sha512-WQIUrwkdIUg6PzAb4Apa0RjTPHB0EqZLc9/7kWCKVIixhkITRFXFg2BhiDVSRv0mIKVlAEJcOvvjHK5T3UaIig=="
+      "integrity": "sha512-WQIUrwkdIUg6PzAb4Apa0RjTPHB0EqZLc9/7kWCKVIixhkITRFXFg2BhiDVSRv0mIKVlAEJcOvvjHK5T3UaIig==",
+      "license": "Apache-2.0"
     },
     "node_modules/@maskito/kit": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@maskito/kit/-/kit-1.9.0.tgz",
       "integrity": "sha512-LNNgOJ0tAfrPoPehvoP+ZyYF9giOYL02sOMKyDC3IcqDNA8BAU0PARmS7TNsVEBpvSuJhU6xVt40nxJaONgUdw==",
+      "license": "Apache-2.0",
       "peerDependencies": {
         "@maskito/core": "^1.9.0"
       }
@@ -3828,9 +3833,10 @@
       }
     },
     "node_modules/@ng-web-apis/common": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@ng-web-apis/common/-/common-3.0.6.tgz",
-      "integrity": "sha512-ral+lzGpFS3aOCFB5DcHOI4lZhhp8GH4BnjSbngH2Xk8J0FKYdxRzvcPQVy7hS+TPUu0tW9uFVp6cC7odu3iyQ==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/common/-/common-3.2.3.tgz",
+      "integrity": "sha512-1ts2FkLRw6dE/uTuYFMf9VTbLJ9CS8dpfIXTpxFsPArs13mEuz0Yvpe0rl0tMAhfNoeN4e7V8wVSyqDNgfzgmw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -3841,9 +3847,10 @@
       }
     },
     "node_modules/@ng-web-apis/intersection-observer": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@ng-web-apis/intersection-observer/-/intersection-observer-3.2.0.tgz",
-      "integrity": "sha512-EhwqEZJFKR9pz55TWp82qyWTXdg8TZeMP6bUw26bVHz8CTkgrpzaXdtxurMTvJ/+gwuFy4JSJLjBeV9nfZ/SXA==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/intersection-observer/-/intersection-observer-3.2.3.tgz",
+      "integrity": "sha512-0yp+rr6ZEyF2vz4zYlMZ1GNtTHQziKajCurqAycZkSXVUdon7MhfiY/PiTr8xklTr40DjrF4anXV7oUAaA0szQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -3853,9 +3860,10 @@
       }
     },
     "node_modules/@ng-web-apis/mutation-observer": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@ng-web-apis/mutation-observer/-/mutation-observer-3.2.1.tgz",
-      "integrity": "sha512-a7krkMx0e9cfnutClwDylWjbTQVRHUP3oUik/nBvUdKlk/Q4anNww9aIKJ64VgiXR+1ZF8OmHGl0+XUzN6xP9Q==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/mutation-observer/-/mutation-observer-3.2.3.tgz",
+      "integrity": "sha512-iFwxut1cw94lTXnloDMBRanqNTvEjbnigWkTowlPH3QY16ysTKuC51JeonRuARW4K3bbDGbXiLUYYZWKQaDfKw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -3865,9 +3873,10 @@
       }
     },
     "node_modules/@ng-web-apis/resize-observer": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@ng-web-apis/resize-observer/-/resize-observer-3.2.1.tgz",
-      "integrity": "sha512-r1YaZUo6DIDeR+4/C/pM4Ar0eTQBxjK0FUhYYJ512EnN8RqAn8d3a0wM8ZYunucwDICwW1sx4IIV6PZ2G77xsg==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@ng-web-apis/resize-observer/-/resize-observer-3.2.3.tgz",
+      "integrity": "sha512-x3KxBZSragzdQlkbY9tiHY0lVlkOFD7Y34rzXdBJ7PTnIvlq43X/tN31Mmb3R0Np4vsarWqnhO6Y42ljudsWdA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -4161,60 +4170,63 @@
       }
     },
     "node_modules/@taiga-ui/addon-charts": {
-      "version": "3.86.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-charts/-/addon-charts-3.86.0.tgz",
-      "integrity": "sha512-Du/85qqaj8hpFSI6hPuFeIhtE93Z6WSkYZLt0gvnsaCb2qSAg8D4oHSogrtF1rsWGGoM+fvXjD7UEUw9GzFIPg==",
+      "version": "3.96.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-charts/-/addon-charts-3.96.0.tgz",
+      "integrity": "sha512-vU8fZhwdg+sWOPJNnIrEtuuVkoFjQKeMhvk4f68oHBXUa0XUESS+qNeAfstvow6xnAZJrhxYtMoDuH/cgC7kNg==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "tslib": ">=2.7.0"
       },
       "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
-        "@ng-web-apis/common": "^3.0.6",
-        "@taiga-ui/cdk": "^3.86.0",
-        "@taiga-ui/core": "^3.86.0",
-        "@tinkoff/ng-polymorpheus": "^4.3.0"
+        "@ng-web-apis/common": ">=3.2.3 <4",
+        "@taiga-ui/cdk": ">=3.96.0 <4",
+        "@taiga-ui/core": ">=3.96.0 <4",
+        "@tinkoff/ng-polymorpheus": ">=4.3.0"
       }
     },
     "node_modules/@taiga-ui/addon-commerce": {
-      "version": "3.86.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-commerce/-/addon-commerce-3.86.0.tgz",
-      "integrity": "sha512-8QSB490ckI4jnU+1sQ3x8os2GVE162hbvzPVYIZ0TruoeXl076dAz6PT2WRaFwjcaCAIGsuaQgQ4Cv02NjkiYQ==",
+      "version": "3.96.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/addon-commerce/-/addon-commerce-3.96.0.tgz",
+      "integrity": "sha512-Y1MACB6KrQVnNjgeKQrNfbz51jMXbU7j83sL28+6q8DS9LNv4DVcv/r/UvK2VZ1PhESkBU85NJAIHf5iy9GN4g==",
+      "license": "Apache-2.0",
       "peer": true,
       "dependencies": {
-        "tslib": "^2.6.2"
+        "tslib": ">=2.7.0"
       },
       "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
         "@angular/forms": ">=12.0.0",
-        "@maskito/angular": "^1.9.0",
-        "@maskito/core": "^1.9.0",
-        "@maskito/kit": "^1.9.0",
-        "@ng-web-apis/common": "^3.0.6",
-        "@taiga-ui/cdk": "^3.86.0",
-        "@taiga-ui/core": "^3.86.0",
-        "@taiga-ui/i18n": "^3.86.0",
-        "@taiga-ui/kit": "^3.86.0",
-        "@tinkoff/ng-polymorpheus": "^4.3.0",
+        "@maskito/angular": ">=1.9.0 <2",
+        "@maskito/core": ">=1.9.0 <2",
+        "@maskito/kit": ">=1.9.0 <2",
+        "@ng-web-apis/common": ">=3.2.3 <4",
+        "@taiga-ui/cdk": ">=3.96.0 <4",
+        "@taiga-ui/core": ">=3.96.0 <4",
+        "@taiga-ui/i18n": ">=3.96.0 <4",
+        "@taiga-ui/kit": ">=3.96.0 <4",
+        "@tinkoff/ng-polymorpheus": ">=4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/cdk": {
-      "version": "3.86.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/cdk/-/cdk-3.86.0.tgz",
-      "integrity": "sha512-aVbnW01Oh0Er1sHKVGHP8W05mOSKxjSzFE3Qx4iF4T6KW7Rlz9HZoNx5ADMg0TATYChtWh9Kwjo8I4LSVj2ZUw==",
-      "dependencies": {
-        "@ng-web-apis/common": "3.0.6",
-        "@ng-web-apis/mutation-observer": "3.1.0",
-        "@ng-web-apis/resize-observer": "3.0.6",
-        "@tinkoff/ng-event-plugins": "3.2.0",
-        "@tinkoff/ng-polymorpheus": "4.3.0",
-        "tslib": "2.6.2"
+      "version": "3.96.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/cdk/-/cdk-3.96.0.tgz",
+      "integrity": "sha512-y1T4+Olhys370ePT8SvZpMlOConDG6bLxjo6jOvFI6D6w0nEgqRxxFDBcdoHxgMWJZdAg7lRLEtN9dHEwKaABA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ng-web-apis/common": "^3.2.3",
+        "@ng-web-apis/mutation-observer": "^3.2.3",
+        "@ng-web-apis/resize-observer": "^3.2.3",
+        "@tinkoff/ng-event-plugins": "^3.2.0",
+        "@tinkoff/ng-polymorpheus": "^4.3.0",
+        "tslib": "^2.7.0"
       },
       "optionalDependencies": {
-        "ng-morph": "4.0.5",
-        "parse5": "6.0.1"
+        "ng-morph": "^4.8.2",
+        "parse5": "^6.0.1"
       },
       "peerDependencies": {
         "@angular/animations": ">=12.0.0",
@@ -4224,42 +4236,166 @@
         "rxjs": ">=6.0.0"
       }
     },
-    "node_modules/@taiga-ui/cdk/node_modules/@ng-web-apis/mutation-observer": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@ng-web-apis/mutation-observer/-/mutation-observer-3.1.0.tgz",
-      "integrity": "sha512-MFN0TLLBMFJJPpXkGFe9ChRCSOKvMHZRRtBq5jHWS7tv5/CtdUkqW5CU7RC9KTzZjGeMzYe0cXO4JRkjL5aZ9g==",
+    "node_modules/@taiga-ui/cdk/node_modules/@angular-devkit/core": {
+      "version": "18.2.9",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.9.tgz",
+      "integrity": "sha512-bsVt//5E0ua7FZfO0dCF/qGGY6KQD34/bNGyRu5B6HedimpdU2/0PGDptksU5v3yKEc9gNw0xC6mT0UsY/R9pA==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "tslib": "^2.2.0"
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=12.0.0",
-        "@ng-web-apis/common": ">=2.0.0"
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@taiga-ui/cdk/node_modules/@ng-web-apis/resize-observer": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@ng-web-apis/resize-observer/-/resize-observer-3.0.6.tgz",
-      "integrity": "sha512-QdGYdEdC0AzFonLfNOnyYyeCwnvK9jlskoeefvJN3Yyvds3ivBrrTjpeDOdiLsQpCPBp9/673imgq7355vkQow==",
+    "node_modules/@taiga-ui/cdk/node_modules/@angular-devkit/schematics": {
+      "version": "18.2.9",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.9.tgz",
+      "integrity": "sha512-aIY5/IomDOINGCtFYi77uo0acDpdQNNCighfBBUGEBNMQ1eE3oGNGpLAH/qWeuxJndgmxrdKsvws9DdT46kLig==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "tslib": "^2.2.0"
+        "@angular-devkit/core": "18.2.9",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.11",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@taiga-ui/cdk/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@taiga-ui/cdk/node_modules/ajv-formats": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=12.0.0",
-        "@ng-web-apis/common": ">=2.0.0"
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@taiga-ui/cdk/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    "node_modules/@taiga-ui/cdk/node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/@taiga-ui/cdk/node_modules/magic-string": {
+      "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
+    "node_modules/@taiga-ui/cdk/node_modules/minimatch": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
+      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@taiga-ui/cdk/node_modules/ng-morph": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/ng-morph/-/ng-morph-4.8.4.tgz",
+      "integrity": "sha512-XwL53wCOhyaAxvoekN74ONbWUK30huzp+GpZYyC01RfaG2AX9l7YlC1mGG/l7Rx7YXtFAk85VFnNJqn2e46K8g==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "jsonc-parser": "3.3.1",
+        "minimatch": "10.0.1",
+        "multimatch": "5.0.0",
+        "ts-morph": "23.0.0"
+      },
+      "peerDependencies": {
+        "@angular-devkit/core": ">=16.0.0",
+        "@angular-devkit/schematics": ">=16.0.0",
+        "tslib": "^2.7.0"
+      }
+    },
+    "node_modules/@taiga-ui/cdk/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
     },
     "node_modules/@taiga-ui/core": {
-      "version": "3.86.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/core/-/core-3.86.0.tgz",
-      "integrity": "sha512-diQKOnPtDDfxPOMk6wLRq8nyDVfNSPSNy+1TeyqzUgOvJ6XAjfaBXGsL3iuR7AN8+sz/b3rJmBce+vdw6FjMLQ==",
+      "version": "3.96.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/core/-/core-3.96.0.tgz",
+      "integrity": "sha512-0w2Jpesb2oM+5aMTfSKFzzYdfPDHXq0fhE6TN4Eutc9LO4Lyh6Hg0KPfoHmw8Tj6wg4KxBcdeAj/opNehWwrVw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@taiga-ui/i18n": "^3.86.0",
-        "tslib": "^2.6.2"
+        "@taiga-ui/i18n": "^3.96.0",
+        "tslib": ">=2.7.0"
       },
       "peerDependencies": {
         "@angular/animations": ">=12.0.0",
@@ -4268,81 +4404,85 @@
         "@angular/forms": ">=12.0.0",
         "@angular/platform-browser": ">=12.0.0",
         "@angular/router": ">=12.0.0",
-        "@ng-web-apis/common": "^3.0.6",
-        "@ng-web-apis/mutation-observer": "^3.1.0",
-        "@taiga-ui/cdk": "^3.86.0",
-        "@taiga-ui/i18n": "^3.86.0",
-        "@tinkoff/ng-event-plugins": "^3.2.0",
-        "@tinkoff/ng-polymorpheus": "^4.3.0",
+        "@ng-web-apis/common": ">=3.2.3 <4",
+        "@ng-web-apis/mutation-observer": ">=3.2.3 <4",
+        "@taiga-ui/cdk": ">=3.96.0 <4",
+        "@taiga-ui/i18n": ">=3.96.0 <4",
+        "@tinkoff/ng-event-plugins": ">=3.2.0 <4",
+        "@tinkoff/ng-polymorpheus": ">=4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/experimental": {
-      "version": "3.86.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/experimental/-/experimental-3.86.0.tgz",
-      "integrity": "sha512-ACjoRVeX5MgsNJsiu2ukliXLD2mfEWm8Vtmk78vqcnkyPUmy1ZWK4sG3p5ybFN8AdIMHkblVq0l+x2qAwr/+LQ==",
+      "version": "3.96.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/experimental/-/experimental-3.96.0.tgz",
+      "integrity": "sha512-AxEaYieouK3NzkGzOVTojnHBAd/eRw5D2sVAK+SQdBFdBjQiRGk/FKzZhOWpDOQOcIN+lhpDGpth3KV30+AgFQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "tslib": ">=2.7.0"
       },
       "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
-        "@taiga-ui/addon-commerce": "^3.86.0",
-        "@taiga-ui/cdk": "^3.86.0",
-        "@taiga-ui/core": "^3.86.0",
-        "@taiga-ui/kit": "^3.86.0",
-        "@tinkoff/ng-polymorpheus": "^4.3.0",
+        "@taiga-ui/addon-commerce": ">=3.96.0 <4",
+        "@taiga-ui/cdk": ">=3.96.0 <4",
+        "@taiga-ui/core": ">=3.96.0 <4",
+        "@taiga-ui/kit": ">=3.96.0 <4",
+        "@tinkoff/ng-polymorpheus": ">=4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/i18n": {
-      "version": "3.86.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/i18n/-/i18n-3.86.0.tgz",
-      "integrity": "sha512-8zkNhMo/QtxZ2Zp6EP/nxo4SOLwaIrX+P3X/Wt+1cjFNZUYWWfdvfHLLdNviKFPVl4RAOxvkhDfza/wkrwv+iQ==",
+      "version": "3.96.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/i18n/-/i18n-3.96.0.tgz",
+      "integrity": "sha512-SGO89mRhmdD3BldQJiSqDCftEjjaOKXLJFFEZWBtrhelxKX5hWJ2lL0O+WzVAMegbQqHoT60HoHrWZIlSy9tVQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "tslib": ">=2.7.0"
       },
       "peerDependencies": {
         "@angular/core": ">=12.0.0",
-        "@ng-web-apis/common": "^3.0.6",
+        "@ng-web-apis/common": ">=3.2.3 <4",
         "rxjs": ">=6.0.0"
       }
     },
     "node_modules/@taiga-ui/icons": {
-      "version": "3.86.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/icons/-/icons-3.86.0.tgz",
-      "integrity": "sha512-jVBEbvE/r9JG+knmXMTn/l/js3JjYi8nSGbrLCryJZZoS2izRnQARN2txABieUJm8H463CoF0rcdXlHKRuA4Ew==",
+      "version": "3.96.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/icons/-/icons-3.96.0.tgz",
+      "integrity": "sha512-bBuX8RGAqr2+9TRbTA4RAmq3v4pnE9ObDwoq/5CrUtE3Wr7idcl7hgfW3yeyhpdOdJJMGfbTauPBONLz2uFRCQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "tslib": ">=2.7.0"
       },
       "peerDependencies": {
-        "@taiga-ui/cdk": "^3.86.0"
+        "@taiga-ui/cdk": ">=3.96.0 <4"
       }
     },
     "node_modules/@taiga-ui/kit": {
-      "version": "3.86.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/kit/-/kit-3.86.0.tgz",
-      "integrity": "sha512-naAy4pyhCaQ9+vWxqSMjbV+9KwnMxT5ybrw+MAJgMn2evzRq0FjqzyFZFog7oiRbRvgVdoWPQfBNKaaLhJcpsw==",
+      "version": "3.96.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/kit/-/kit-3.96.0.tgz",
+      "integrity": "sha512-gHn0AZU1kiNZU2T/LnnxLGkHC3/XNroBWCGmhxupAmL/JcsmOXsl3L8aK1rZhjS4QgkmgaC5ueVWNwdXINRnXw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@maskito/angular": "1.9.0",
-        "@maskito/core": "1.9.0",
-        "@maskito/kit": "1.9.0",
-        "@ng-web-apis/intersection-observer": "3.2.0",
-        "text-mask-core": "5.1.2",
-        "tslib": "^2.6.2"
+        "@maskito/angular": "^1.9.0",
+        "@maskito/core": "^1.9.0",
+        "@maskito/kit": "^1.9.0",
+        "@ng-web-apis/intersection-observer": "^3.2.3",
+        "text-mask-core": "^5.1.2",
+        "tslib": ">=2.7.0"
       },
       "peerDependencies": {
         "@angular/common": ">=12.0.0",
         "@angular/core": ">=12.0.0",
         "@angular/forms": ">=12.0.0",
         "@angular/router": ">=12.0.0",
-        "@ng-web-apis/common": "3.0.6",
-        "@ng-web-apis/mutation-observer": "^3.1.0",
-        "@ng-web-apis/resize-observer": "^3.0.6",
-        "@taiga-ui/cdk": "^3.86.0",
-        "@taiga-ui/core": "^3.86.0",
-        "@taiga-ui/i18n": "^3.86.0",
-        "@tinkoff/ng-polymorpheus": "^4.3.0",
+        "@ng-web-apis/common": ">=3.2.3 <4",
+        "@ng-web-apis/mutation-observer": ">=3.2.3 <4",
+        "@ng-web-apis/resize-observer": ">=3.2.3 <4",
+        "@taiga-ui/cdk": ">=3.96.0 <4",
+        "@taiga-ui/core": ">=3.96.0 <4",
+        "@taiga-ui/i18n": ">=3.96.0 <4",
+        "@tinkoff/ng-polymorpheus": ">=4.3.0",
         "rxjs": ">=6.0.0"
       }
     },
@@ -4400,13 +4540,14 @@
       }
     },
     "node_modules/@ts-morph/common": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.22.0.tgz",
-      "integrity": "sha512-HqNBuV/oIlMKdkLshXd1zKBqNQCsuPEsgQOkfFQ/eUKjRlwndXW1AjN9LVkBEIukm00gGXSRmfkl0Wv5VXLnlw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.24.0.tgz",
+      "integrity": "sha512-c1xMmNHWpNselmpIqursHeOHHBTIsJLbB+NuovbTTRCNiTLEr/U9dbJ8qy0jd/O2x5pc3seWuOUN5R2IoOTp8A==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "fast-glob": "^3.3.2",
-        "minimatch": "^9.0.3",
+        "minimatch": "^9.0.4",
         "mkdirp": "^3.0.1",
         "path-browserify": "^1.0.1"
       }
@@ -4415,6 +4556,7 @@
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -4430,6 +4572,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
       "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "license": "MIT",
       "optional": true,
       "bin": {
         "mkdirp": "dist/cjs/src/bin.js"
@@ -4613,6 +4756,7 @@
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
       "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+      "license": "MIT",
       "optional": true
     },
     "node_modules/@types/mustache": {
@@ -5237,6 +5381,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
       "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=8"
@@ -5252,6 +5397,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=8"
@@ -5261,6 +5407,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
       "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=8"
@@ -6088,9 +6235,10 @@
       }
     },
     "node_modules/code-block-writer": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
-      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.3.tgz",
+      "integrity": "sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==",
+      "license": "MIT",
       "optional": true
     },
     "node_modules/color-convert": {
@@ -7868,6 +8016,14 @@
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "dev": true
     },
+    "node_modules/fast-uri": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
+      "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/fastq": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
@@ -10651,6 +10807,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
       "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "@types/minimatch": "^3.0.3",
@@ -10670,6 +10827,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -10680,6 +10838,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "license": "ISC",
       "optional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -10781,50 +10940,6 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/ng-morph": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/ng-morph/-/ng-morph-4.0.5.tgz",
-      "integrity": "sha512-5tnlb5WrGKeo2E7VRcV7ZHhScyNgliYqpbXqt103kynmfj6Ic8kzhJAhHu9iLkF1yRnKv2kyCE+O7UGZx5RraQ==",
-      "optional": true,
-      "dependencies": {
-        "jsonc-parser": "3.2.0",
-        "minimatch": "9.0.3",
-        "multimatch": "5.0.0",
-        "ts-morph": "21.0.1",
-        "tslib": "2.6.2"
-      },
-      "peerDependencies": {
-        "@angular-devkit/core": ">=11.0.0",
-        "@angular-devkit/schematics": ">=11.0.0"
-      }
-    },
-    "node_modules/ng-morph/node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "optional": true
-    },
-    "node_modules/ng-morph/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-      "optional": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/ng-morph/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
-      "optional": true
-    },
     "node_modules/ng-packagr": {
       "version": "14.2.2",
       "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-14.2.2.tgz",
@@ -14794,7 +14909,8 @@
     "node_modules/text-mask-core": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/text-mask-core/-/text-mask-core-5.1.2.tgz",
-      "integrity": "sha512-VfkCMdmRRZqXgQZFlDMiavm3hzsMzBM23CxHZsaeAYg66ZhXCNJWrFmnJwNy8KF9f74YvAUAuQenxsMCfuvhUw=="
+      "integrity": "sha512-VfkCMdmRRZqXgQZFlDMiavm3hzsMzBM23CxHZsaeAYg66ZhXCNJWrFmnJwNy8KF9f74YvAUAuQenxsMCfuvhUw==",
+      "license": "Unlicense"
     },
     "node_modules/text-table": {
       "version": "0.2.0",
@@ -14880,13 +14996,14 @@
       "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
     },
     "node_modules/ts-morph": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-21.0.1.tgz",
-      "integrity": "sha512-dbDtVdEAncKctzrVZ+Nr7kHpHkv+0JDJb2MjjpBaj8bFeCkePU9rHfMklmhuLFnpeq/EJZk2IhStY6NzqgjOkg==",
+      "version": "23.0.0",
+      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-23.0.0.tgz",
+      "integrity": "sha512-FcvFx7a9E8TUe6T3ShihXJLiJOiqyafzFKUO4aqIHDUCIvADdGNShcbc2W5PMr3LerXRv7mafvFZ9lRENxJmug==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@ts-morph/common": "~0.22.0",
-        "code-block-writer": "^12.0.0"
+        "@ts-morph/common": "~0.24.0",
+        "code-block-writer": "^13.0.1"
       }
     },
     "node_modules/ts-node": {
@@ -14933,9 +15050,10 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
+      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
+      "license": "0BSD"
     },
     "node_modules/tslint": {
       "version": "6.1.3",
diff --git a/web/package.json b/web/package.json
index 5fdf2c859..e900277c4 100644
--- a/web/package.json
+++ b/web/package.json
@@ -43,20 +43,20 @@
     "@angular/service-worker": "^14.2.2",
     "@ionic/angular": "^6.1.15",
     "@materia-ui/ngx-monaco-editor": "^6.0.0",
-    "@ng-web-apis/common": "^3.0.6",
-    "@ng-web-apis/mutation-observer": "^3.2.1",
-    "@ng-web-apis/resize-observer": "^3.2.1",
+    "@ng-web-apis/common": "^3.2.3",
+    "@ng-web-apis/mutation-observer": "^3.2.3",
+    "@ng-web-apis/resize-observer": "^3.2.3",
     "@noble/curves": "^1.4.0",
     "@noble/hashes": "^1.4.0",
     "@start9labs/argon2": "^0.2.2",
     "@start9labs/emver": "^0.1.5",
     "@start9labs/start-sdk": "file:../sdk/baseDist",
-    "@taiga-ui/addon-charts": "3.86.0",
-    "@taiga-ui/cdk": "3.86.0",
-    "@taiga-ui/core": "3.86.0",
-    "@taiga-ui/experimental": "3.86.0",
-    "@taiga-ui/icons": "3.86.0",
-    "@taiga-ui/kit": "3.86.0",
+    "@taiga-ui/addon-charts": "3.96.0",
+    "@taiga-ui/cdk": "3.96.0",
+    "@taiga-ui/core": "3.96.0",
+    "@taiga-ui/experimental": "3.96.0",
+    "@taiga-ui/icons": "3.96.0",
+    "@taiga-ui/kit": "3.96.0",
     "@tinkoff/ng-dompurify": "4.0.0",
     "@tinkoff/ng-event-plugins": "3.2.0",
     "angular-svg-round-progressbar": "^9.0.0",
diff --git a/web/projects/ui/src/app/modals/action-success/action-success-group.component.ts b/web/projects/ui/src/app/modals/action-success/action-success-group.component.ts
index c02b51ee9..480146668 100644
--- a/web/projects/ui/src/app/modals/action-success/action-success-group.component.ts
+++ b/web/projects/ui/src/app/modals/action-success/action-success-group.component.ts
@@ -1,23 +1,23 @@
 import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { T } from '@start9labs/start-sdk'
 import { TuiFadeModule, TuiTitleModule } from '@taiga-ui/experimental'
 import { TuiAccordionModule } from '@taiga-ui/kit'
-import { ActionSuccessItemComponent } from './action-success-item.component'
+import { ActionSuccessMemberComponent } from './action-success-member.component'
+import { GroupResult } from './types'
 
 @Component({
   standalone: true,
   selector: 'app-action-success-group',
   template: `
-    <p *ngFor="let item of value?.value">
-      <app-action-success-item
-        *ngIf="isSingle(item)"
-        [value]="item"
-      ></app-action-success-item>
-      <tui-accordion-item *ngIf="!isSingle(item)" size="s">
-        <div tuiFade>{{ item.name }}</div>
+    <p *ngFor="let member of group.value">
+      <app-action-success-member
+        *ngIf="member.type === 'single'"
+        [member]="member"
+      ></app-action-success-member>
+      <tui-accordion-item *ngIf="member.type === 'group'">
+        <div tuiFade>{{ member.name }}</div>
         <ng-template tuiAccordionItemContent>
-          <app-action-success-group [value]="item"></app-action-success-group>
+          <app-action-success-group [group]="member"></app-action-success-group>
         </ng-template>
       </tui-accordion-item>
     </p>
@@ -37,18 +37,12 @@ import { ActionSuccessItemComponent } from './action-success-item.component'
   imports: [
     CommonModule,
     TuiTitleModule,
-    ActionSuccessItemComponent,
+    ActionSuccessMemberComponent,
     TuiAccordionModule,
     TuiFadeModule,
   ],
 })
 export class ActionSuccessGroupComponent {
   @Input()
-  value?: T.ActionResultV1 & { type: 'object' }
-
-  isSingle(
-    value: T.ActionResultV1,
-  ): value is T.ActionResultV1 & { type: 'string' } {
-    return value.type === 'string'
-  }
+  group!: GroupResult
 }
diff --git a/web/projects/ui/src/app/modals/action-success/action-success-item.component.ts b/web/projects/ui/src/app/modals/action-success/action-success-member.component.ts
similarity index 67%
rename from web/projects/ui/src/app/modals/action-success/action-success-item.component.ts
rename to web/projects/ui/src/app/modals/action-success/action-success-member.component.ts
index 25054f2f6..55bffc7bc 100644
--- a/web/projects/ui/src/app/modals/action-success/action-success-item.component.ts
+++ b/web/projects/ui/src/app/modals/action-success/action-success-member.component.ts
@@ -9,41 +9,38 @@ import {
   ViewChild,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
-import { T } from '@start9labs/start-sdk'
 import {
   TuiDialogService,
-  TuiLabelModule,
   TuiTextfieldComponent,
   TuiTextfieldControllerModule,
 } from '@taiga-ui/core'
-import { TuiButtonModule } from '@taiga-ui/experimental'
+import { TuiButtonModule, TuiTitleModule } from '@taiga-ui/experimental'
 import { TuiInputModule } from '@taiga-ui/kit'
 import { QrCodeModule } from 'ng-qrcode'
-import { ActionSuccessGroupComponent } from './action-success-group.component'
+import { T } from '@start9labs/start-sdk'
 
 @Component({
   standalone: true,
-  selector: 'app-action-success-item',
+  selector: 'app-action-success-member',
   template: `
-    <p *ngIf="!parent" class="qr">
-      <ng-container *ngTemplateOutlet="qr"></ng-container>
-    </p>
-    <label [tuiLabel]="value.description">
-      <tui-input
-        [readOnly]="true"
-        [ngModel]="value.value"
-        [tuiTextfieldCustomContent]="actions"
-      >
-        <input
-          tuiTextfield
-          [style.border-inline-end-width.rem]="border"
-          [type]="value.masked && masked ? 'password' : 'text'"
-        />
-      </tui-input>
+    <tui-input
+      [readOnly]="true"
+      [ngModel]="member.value"
+      [tuiTextfieldCustomContent]="actions"
+    >
+      {{ member.name }}
+      <input
+        tuiTextfield
+        [style.border-inline-end-width.rem]="border"
+        [type]="member.masked && masked ? 'password' : 'text'"
+      />
+    </tui-input>
+    <label *ngIf="member.description" [style.padding-top.rem]="0.25" tuiTitle>
+      <span tuiSubtitle [style.opacity]="0.8">{{ member.description }}</span>
     </label>
     <ng-template #actions>
       <button
-        *ngIf="value.masked"
+        *ngIf="member.masked"
         tuiIconButton
         appearance="icon"
         size="s"
@@ -56,7 +53,7 @@ import { ActionSuccessGroupComponent } from './action-success-group.component'
         Reveal/Hide
       </button>
       <button
-        *ngIf="value.copyable"
+        *ngIf="member.copyable"
         tuiIconButton
         appearance="icon"
         size="s"
@@ -69,7 +66,7 @@ import { ActionSuccessGroupComponent } from './action-success-group.component'
         Copy
       </button>
       <button
-        *ngIf="value.qr && parent"
+        *ngIf="member.qr"
         tuiIconButton
         appearance="icon"
         size="s"
@@ -84,12 +81,12 @@ import { ActionSuccessGroupComponent } from './action-success-group.component'
     </ng-template>
     <ng-template #qr>
       <qr-code
-        [value]="value.value"
-        [style.filter]="value.masked && masked ? 'blur(0.5rem)' : null"
+        [value]="member.value"
+        [style.filter]="member.masked && masked ? 'blur(0.5rem)' : null"
         size="350"
       ></qr-code>
       <button
-        *ngIf="value.masked && masked"
+        *ngIf="member.masked && masked"
         tuiIconButton
         class="reveal"
         iconLeft="tuiIconEye"
@@ -122,37 +119,25 @@ import { ActionSuccessGroupComponent } from './action-success-group.component'
     TuiTextfieldControllerModule,
     TuiButtonModule,
     QrCodeModule,
-    TuiLabelModule,
+    TuiTitleModule,
   ],
 })
-export class ActionSuccessItemComponent {
+export class ActionSuccessMemberComponent {
   @ViewChild(TuiTextfieldComponent, { read: ElementRef })
   private readonly input!: ElementRef<HTMLInputElement>
   private readonly dialogs = inject(TuiDialogService)
 
-  readonly parent = inject(ActionSuccessGroupComponent, {
-    optional: true,
-  })
-
   @Input()
-  value!: T.ActionResultV1 & { type: 'string' }
+  member!: T.ActionResultMember & { type: 'single' }
 
   masked = true
 
   get border(): number {
     let border = 0
 
-    if (this.value.masked) {
-      border += 2
-    }
-
-    if (this.value.copyable) {
-      border += 2
-    }
-
-    if (this.value.qr && this.parent) {
-      border += 2
-    }
+    if (this.member.masked) border += 2
+    if (this.member.copyable) border += 2
+    if (this.member.qr) border += 2
 
     return border
   }
@@ -160,7 +145,7 @@ export class ActionSuccessItemComponent {
   show(template: TemplateRef<any>) {
     const masked = this.masked
 
-    this.masked = this.value.masked
+    this.masked = this.member.masked
     this.dialogs
       .open(template, { label: 'Scan this QR', size: 's' })
       .subscribe({
@@ -179,6 +164,6 @@ export class ActionSuccessItemComponent {
     el.focus()
     el.select()
     el.ownerDocument.execCommand('copy')
-    el.type = this.masked && this.value.masked ? 'password' : 'text'
+    el.type = this.masked && this.member.masked ? 'password' : 'text'
   }
 }
diff --git a/web/projects/ui/src/app/modals/action-success/action-success-single.component.ts b/web/projects/ui/src/app/modals/action-success/action-success-single.component.ts
new file mode 100644
index 000000000..2902c3c88
--- /dev/null
+++ b/web/projects/ui/src/app/modals/action-success/action-success-single.component.ts
@@ -0,0 +1,145 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  inject,
+  Input,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import {
+  TuiDialogService,
+  TuiLabelModule,
+  TuiTextfieldComponent,
+  TuiTextfieldControllerModule,
+} from '@taiga-ui/core'
+import { TuiButtonModule } from '@taiga-ui/experimental'
+import { TuiInputModule } from '@taiga-ui/kit'
+import { QrCodeModule } from 'ng-qrcode'
+import { SingleResult } from './types'
+
+@Component({
+  standalone: true,
+  selector: 'app-action-success-single',
+  template: `
+    <p class="qr">
+      <ng-container *ngTemplateOutlet="qr"></ng-container>
+    </p>
+    <tui-input
+      [readOnly]="true"
+      [ngModel]="single.value"
+      [tuiTextfieldLabelOutside]="true"
+      [tuiTextfieldCustomContent]="actions"
+    >
+      <input
+        tuiTextfield
+        [style.border-inline-end-width.rem]="border"
+        [type]="single.masked && masked ? 'password' : 'text'"
+      />
+    </tui-input>
+    <ng-template #actions>
+      <button
+        *ngIf="single.masked"
+        tuiIconButton
+        appearance="icon"
+        size="s"
+        type="button"
+        tabindex="-1"
+        [iconLeft]="masked ? 'tuiIconEye' : 'tuiIconEyeOff'"
+        [style.pointer-events]="'auto'"
+        (click)="masked = !masked"
+      >
+        Reveal/Hide
+      </button>
+      <button
+        *ngIf="single.copyable"
+        tuiIconButton
+        appearance="icon"
+        size="s"
+        type="button"
+        tabindex="-1"
+        iconLeft="tuiIconCopy"
+        [style.pointer-events]="'auto'"
+        (click)="copy()"
+      >
+        Copy
+      </button>
+    </ng-template>
+    <ng-template #qr>
+      <qr-code
+        [value]="single.value"
+        [style.filter]="single.masked && masked ? 'blur(0.5rem)' : null"
+        size="350"
+      ></qr-code>
+      <button
+        *ngIf="single.masked && masked"
+        tuiIconButton
+        class="reveal"
+        iconLeft="tuiIconEye"
+        [style.border-radius.%]="100"
+        (click)="masked = false"
+      >
+        Reveal
+      </button>
+    </ng-template>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  styles: [
+    `
+      @import '@taiga-ui/core/styles/taiga-ui-local';
+
+      .reveal {
+        @include center-all();
+      }
+
+      .qr {
+        position: relative;
+        text-align: center;
+      }
+    `,
+  ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    TuiInputModule,
+    TuiTextfieldControllerModule,
+    TuiButtonModule,
+    QrCodeModule,
+    TuiLabelModule,
+  ],
+})
+export class ActionSuccessSingleComponent {
+  @ViewChild(TuiTextfieldComponent, { read: ElementRef })
+  private readonly input!: ElementRef<HTMLInputElement>
+  private readonly dialogs = inject(TuiDialogService)
+
+  @Input()
+  single!: SingleResult
+
+  masked = true
+
+  get border(): number {
+    let border = 0
+
+    if (this.single.masked) border += 2
+    if (this.single.copyable) border += 2
+
+    return border
+  }
+
+  copy() {
+    const el = this.input.nativeElement
+
+    if (!el) {
+      return
+    }
+
+    el.type = 'text'
+    el.focus()
+    el.select()
+    el.ownerDocument.execCommand('copy')
+    el.type = this.masked && this.single.masked ? 'password' : 'text'
+  }
+}
diff --git a/web/projects/ui/src/app/modals/action-success/action-success.page.ts b/web/projects/ui/src/app/modals/action-success/action-success.page.ts
index afcab5793..7f390e2ab 100644
--- a/web/projects/ui/src/app/modals/action-success/action-success.page.ts
+++ b/web/projects/ui/src/app/modals/action-success/action-success.page.ts
@@ -1,36 +1,36 @@
 import { CommonModule } from '@angular/common'
 import { Component, inject } from '@angular/core'
-import { TuiDialogContext, TuiTextfieldControllerModule } from '@taiga-ui/core'
+import { TuiDialogContext } from '@taiga-ui/core'
 import { POLYMORPHEUS_CONTEXT } from '@tinkoff/ng-polymorpheus'
-import { RR } from 'src/app/services/api/api.types'
 import { ActionSuccessGroupComponent } from './action-success-group.component'
-import { ActionSuccessItemComponent } from './action-success-item.component'
+import { ActionSuccessSingleComponent } from './action-success-single.component'
+import { ActionResponseWithResult } from './types'
 
 @Component({
   standalone: true,
   template: `
-    <ng-container tuiTextfieldSize="m" [tuiTextfieldLabelOutside]="true">
-      <app-action-success-item
-        *ngIf="item"
-        [value]="item"
-      ></app-action-success-item>
-      <app-action-success-group
-        *ngIf="group"
-        [value]="group"
-      ></app-action-success-group>
-    </ng-container>
+    <p *ngIf="data.message">{{ data.message }}</p>
+    <app-action-success-single
+      *ngIf="single"
+      [single]="single"
+    ></app-action-success-single>
+    <app-action-success-group
+      *ngIf="group"
+      [group]="group"
+    ></app-action-success-group>
   `,
   imports: [
     CommonModule,
     ActionSuccessGroupComponent,
-    ActionSuccessItemComponent,
-    TuiTextfieldControllerModule,
+    ActionSuccessSingleComponent,
   ],
 })
 export class ActionSuccessPage {
   readonly data =
-    inject<TuiDialogContext<void, RR.ActionRes>>(POLYMORPHEUS_CONTEXT).data
+    inject<TuiDialogContext<void, ActionResponseWithResult>>(
+      POLYMORPHEUS_CONTEXT,
+    ).data
 
-  readonly item = this.data?.type === 'string' ? this.data : null
-  readonly group = this.data?.type === 'object' ? this.data : null
+  readonly single = this.data.result.type === 'single' ? this.data.result : null
+  readonly group = this.data.result.type === 'group' ? this.data.result : null
 }
diff --git a/web/projects/ui/src/app/modals/action-success/types.ts b/web/projects/ui/src/app/modals/action-success/types.ts
new file mode 100644
index 000000000..efc515195
--- /dev/null
+++ b/web/projects/ui/src/app/modals/action-success/types.ts
@@ -0,0 +1,7 @@
+import { RR } from 'src/app/services/api/api.types'
+
+type ActionResponse = NonNullable<RR.ActionRes>
+type ActionResult = NonNullable<ActionResponse['result']>
+export type ActionResponseWithResult = ActionResponse & { result: ActionResult }
+export type SingleResult = ActionResult & { type: 'single' }
+export type GroupResult = ActionResult & { type: 'group' }
diff --git a/web/projects/ui/src/app/services/action.service.ts b/web/projects/ui/src/app/services/action.service.ts
index df09daa32..298b9facc 100644
--- a/web/projects/ui/src/app/services/action.service.ts
+++ b/web/projects/ui/src/app/services/action.service.ts
@@ -118,13 +118,17 @@ export class ActionService {
         input: input || null,
       })
 
-      if (res) {
+      if (!res) return true
+
+      if (res.result) {
         this.dialogs
           .open(new PolymorpheusComponent(ActionSuccessPage), {
-            label: res.name,
+            label: res.title,
             data: res,
           })
           .subscribe()
+      } else if (res.message) {
+        this.dialogs.open(res.message, { label: res.title }).subscribe()
       }
       return true // needed to dismiss original modal/alert
     } catch (e: any) {
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 828b36642..7e0aa9116 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1049,77 +1049,91 @@ export module Mock {
     },
   }
 
-  export const ActionRes: RR.ActionRes = {
+  export const ActionResMessage: RR.ActionRes = {
     version: '1',
-    type: 'string',
-    name: 'New Password',
-    description:
-      'Action was run successfully Action was run successfully Action was run successfully Action was run successfully Action was run successfully',
-    copyable: true,
-    qr: true,
-    masked: true,
-    value: 'iwejdoiewdhbew',
+    title: 'New Password',
+    message:
+      'Action was run successfully and smoothly and fully and all is good on the western front.',
+    result: null,
   }
 
-  export const ActionProperties: RR.ActionRes = {
+  export const ActionResSingle: RR.ActionRes = {
     version: '1',
-    type: 'object',
-    name: 'Properties',
-    value: [
-      {
-        type: 'string',
-        name: 'LND Connect',
-        description: 'This is some information about the thing.',
-        copyable: true,
-        qr: true,
-        masked: true,
-        value:
-          'lndconnect://udlyfq2mxa4355pt7cqlrdipnvk2tsl4jtsdw7zaeekenufwcev2wlad.onion:10009?cert=MIICJTCCAcugAwIBAgIRAOyq85fqAiA3U3xOnwhH678wCgYIKoZIzj0EAwIwODEfMB0GAkUEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMB4XDTIwMTAyNjA3MzEyN1oXDTIxMTIyMTA3MzEyN1owODEfMB0GA1UEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKqfhAMMZdY-eFnU5P4bGrQTSx0lo7m8u4V0yYkzUM6jlql_u31_mU2ovLTj56wnZApkEjoPl6fL2yasZA2wiy6OBtTCBsjAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH_BAUwAwEB_zAdBgNVHQ4EFgQUYQ9uIO6spltnVCx4rLFL5BvBF9IwWwYDVR0RBFQwUoIMNTc0OTkwMzIyYzZlgglsb2NhbGhvc3SCBHVuaXiCCnVuaXhwYWNrZXSCB2J1ZmNvbm6HBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAGHBKwSAAswCgYIKoZIzj0EAwIDSAAwRQIgVZH2Z2KlyAVY2Q2aIQl0nsvN-OEN49wreFwiBqlxNj4CIQD5_JbpuBFJuf81I5J0FQPtXY-4RppWOPZBb-y6-rkIUQ&macaroon=AgEDbG5kAusBAwoQuA8OUMeQ8Fr2h-f65OdXdRIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaFAoIbWFjYXJvb24SCGdlbmVyYXRlGhYKB21lc3NhZ2USBHJlYWQSBXdyaXRlGhcKCG9mZmNoYWluEgRyZWFkEgV3cml0ZRoWCgdvbmNoYWluEgRyZWFkEgV3cml0ZRoUCgVwZWVycxIEcmVhZBIFd3JpdGUaGAoGc2lnbmVyEghnZW5lcmF0ZRIEcmVhZAAABiCYsRUoUWuAHAiCSLbBR7b_qULDSl64R8LIU2aqNIyQfA',
-      },
-      {
-        type: 'object',
-        name: 'Nested Stuff',
-        description: 'This is a nested thing metric',
-        value: [
-          {
-            type: 'string',
-            name: 'Last Name',
-            description: 'The last name of the user',
-            copyable: true,
-            qr: true,
-            masked: false,
-            value: 'Hill',
-          },
-          {
-            type: 'string',
-            name: 'Age',
-            description: 'The age of the user',
-            copyable: false,
-            qr: false,
-            masked: false,
-            value: '35',
-          },
-          {
-            type: 'string',
-            name: 'Password',
-            description: 'A secret password',
-            copyable: true,
-            qr: false,
-            masked: true,
-            value: 'password123',
-          },
-        ],
-      },
-      {
-        type: 'string',
-        name: 'Another Value',
-        description: 'Some more information about the service.',
-        copyable: false,
-        qr: true,
-        masked: false,
-        value: 'https://guessagain.com',
-      },
-    ],
+    title: 'New Password',
+    message:
+      'Action was run successfully and smoothly and fully and all is good on the western front.',
+    result: {
+      type: 'single',
+      copyable: true,
+      qr: true,
+      masked: true,
+      value: 'iwejdoiewdhbew',
+    },
+  }
+
+  export const ActionResGroup: RR.ActionRes = {
+    version: '1',
+    title: 'Properties',
+    message:
+      'Successfully retrieved properties. Here is a bunch of useful information about this service.',
+    result: {
+      type: 'group',
+      value: [
+        {
+          type: 'single',
+          name: 'LND Connect',
+          description: 'This is some information about the thing.',
+          copyable: true,
+          qr: true,
+          masked: true,
+          value:
+            'lndconnect://udlyfq2mxa4355pt7cqlrdipnvk2tsl4jtsdw7zaeekenufwcev2wlad.onion:10009?cert=MIICJTCCAcugAwIBAgIRAOyq85fqAiA3U3xOnwhH678wCgYIKoZIzj0EAwIwODEfMB0GAkUEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMB4XDTIwMTAyNjA3MzEyN1oXDTIxMTIyMTA3MzEyN1owODEfMB0GA1UEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKqfhAMMZdY-eFnU5P4bGrQTSx0lo7m8u4V0yYkzUM6jlql_u31_mU2ovLTj56wnZApkEjoPl6fL2yasZA2wiy6OBtTCBsjAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH_BAUwAwEB_zAdBgNVHQ4EFgQUYQ9uIO6spltnVCx4rLFL5BvBF9IwWwYDVR0RBFQwUoIMNTc0OTkwMzIyYzZlgglsb2NhbGhvc3SCBHVuaXiCCnVuaXhwYWNrZXSCB2J1ZmNvbm6HBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAGHBKwSAAswCgYIKoZIzj0EAwIDSAAwRQIgVZH2Z2KlyAVY2Q2aIQl0nsvN-OEN49wreFwiBqlxNj4CIQD5_JbpuBFJuf81I5J0FQPtXY-4RppWOPZBb-y6-rkIUQ&macaroon=AgEDbG5kAusBAwoQuA8OUMeQ8Fr2h-f65OdXdRIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaFAoIbWFjYXJvb24SCGdlbmVyYXRlGhYKB21lc3NhZ2USBHJlYWQSBXdyaXRlGhcKCG9mZmNoYWluEgRyZWFkEgV3cml0ZRoWCgdvbmNoYWluEgRyZWFkEgV3cml0ZRoUCgVwZWVycxIEcmVhZBIFd3JpdGUaGAoGc2lnbmVyEghnZW5lcmF0ZRIEcmVhZAAABiCYsRUoUWuAHAiCSLbBR7b_qULDSl64R8LIU2aqNIyQfA',
+        },
+        {
+          type: 'group',
+          name: 'Nested Stuff',
+          description: 'This is a nested thing metric',
+          value: [
+            {
+              type: 'single',
+              name: 'Last Name',
+              description: 'The last name of the user',
+              copyable: true,
+              qr: true,
+              masked: false,
+              value: 'Hill',
+            },
+            {
+              type: 'single',
+              name: 'Age',
+              description: 'The age of the user',
+              copyable: false,
+              qr: false,
+              masked: false,
+              value: '35',
+            },
+            {
+              type: 'single',
+              name: 'Password',
+              description: 'A secret password',
+              copyable: true,
+              qr: false,
+              masked: true,
+              value: 'password123',
+            },
+          ],
+        },
+        {
+          type: 'single',
+          name: 'Another Value',
+          description: 'Some more information about the service.',
+          copyable: false,
+          qr: true,
+          masked: false,
+          value: 'https://guessagain.com',
+        },
+      ],
+    },
   }
 
   export const getActionInputSpec = async (): Promise<IST.InputSpec> =>
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index e62094057..93925cc73 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -784,7 +784,9 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
 
     if (params.actionId === 'properties') {
-      return Mock.ActionProperties
+      // return Mock.ActionResGroup
+      return Mock.ActionResMessage
+      // return Mock.ActionResSingle
     } else if (params.actionId === 'config') {
       const patch: RemoveOperation[] = [
         {
@@ -795,7 +797,8 @@ export class MockApiService extends ApiService {
       this.mockRevision(patch)
       return null
     } else {
-      return Mock.ActionRes
+      return Mock.ActionResMessage
+      // return Mock.ActionResSingle
     }
   }
 

From b952e3183f26543d5b3b7d61a81753b1e3ca0a11 Mon Sep 17 00:00:00 2001
From: Remco Ros <remcoros@live.nl>
Date: Mon, 28 Oct 2024 23:33:26 +0100
Subject: [PATCH 301/341] sdk: allow passing docker build arguments in service
 manifest (#2764)

* start-cli s9pk pack: silence mksquashfs output

* sdk: allow passing docker build arguments in service manifest

* merge EnvVar into BuildArg
---
 core/startos/src/s9pk/v2/pack.rs       | 44 ++++++++++++++++++++++++--
 sdk/base/lib/osBindings/BuildArg.ts    |  3 ++
 sdk/base/lib/osBindings/ImageSource.ts |  9 +++++-
 sdk/base/lib/osBindings/index.ts       |  1 +
 4 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 sdk/base/lib/osBindings/BuildArg.ts

diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index aa0fd39f2..27cad6e92 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -1,3 +1,4 @@
+use std::collections::BTreeMap;
 use std::collections::BTreeSet;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -62,6 +63,7 @@ impl SqfsDir {
                 let path = self.tmpdir.join(guid.as_ref()).with_extension("squashfs");
                 if self.path.extension().and_then(|s| s.to_str()) == Some("tar") {
                     Command::new("tar2sqfs")
+                        .arg("-q")
                         .arg(&path)
                         .input(Some(&mut open_file(&self.path).await?))
                         .invoke(ErrorKind::Filesystem)
@@ -70,6 +72,7 @@ impl SqfsDir {
                     Command::new("mksquashfs")
                         .arg(&self.path)
                         .arg(&path)
+                        .arg("-quiet")
                         .invoke(ErrorKind::Filesystem)
                         .await?;
                 }
@@ -294,6 +297,7 @@ impl TryFrom<CliImageConfig> for ImageConfig {
                 ImageSource::DockerBuild {
                     dockerfile: value.dockerfile,
                     workdir: value.workdir,
+                    build_args: None
                 }
             } else if let Some(tag) = value.docker_tag {
                 ImageSource::DockerTag(tag)
@@ -337,6 +341,17 @@ impl clap::FromArgMatches for ImageConfig {
     }
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[serde(untagged)]
+#[ts(export)]
+pub enum BuildArg {
+    String(String),
+    EnvVar {
+        env: String,
+    },
+}
+
 #[derive(Debug, Clone, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -346,6 +361,9 @@ pub enum ImageSource {
     DockerBuild {
         workdir: Option<PathBuf>,
         dockerfile: Option<PathBuf>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        #[ts(optional)]
+        build_args: Option<BTreeMap<String, BuildArg>>
     },
     DockerTag(String),
 }
@@ -384,6 +402,7 @@ impl ImageSource {
                 ImageSource::DockerBuild {
                     workdir,
                     dockerfile,
+                    build_args
                 } => {
                     let workdir = workdir.as_deref().unwrap_or(Path::new("."));
                     let dockerfile = dockerfile
@@ -398,7 +417,8 @@ impl ImageSource {
                     };
                     // docker buildx build ${path} -o type=image,name=start9/${id}
                     let tag = format!("start9/{id}/{image_id}:{}", new_guid());
-                    Command::new(CONTAINER_TOOL)
+                    let mut command = Command::new(CONTAINER_TOOL);
+                    command
                         .arg("build")
                         .arg(workdir)
                         .arg("-f")
@@ -406,6 +426,26 @@ impl ImageSource {
                         .arg("-t")
                         .arg(&tag)
                         .arg(&docker_platform)
+                        .arg("--build-arg").arg(format!("ARCH={}", arch));
+
+                    // add build arguments
+                    if let Some(build_args) = build_args {
+                        for (key, value) in build_args {
+                            let build_arg_value = match value {
+                                BuildArg::String(val) => val.to_string(),
+                                BuildArg::EnvVar { env } => {
+                                    match std::env::var(&env) {
+                                        Ok(val) => val,
+                                        Err(_) => continue, // skip if env var not set or invalid
+                                    }
+                                },
+                            };
+
+                            command.arg("--build-arg").arg(format!("{}={}", key, build_arg_value));
+                        }
+                    }
+
+                    command
                         .arg("-o")
                         .arg("type=docker,dest=-")
                         .capture(false)
@@ -513,7 +553,7 @@ impl ImageSource {
                     Command::new(CONTAINER_TOOL)
                         .arg("export")
                         .arg(container.trim())
-                        .pipe(Command::new("tar2sqfs").arg(&dest))
+                        .pipe(Command::new("tar2sqfs").arg("-q").arg(&dest))
                         .capture(false)
                         .invoke(ErrorKind::Docker)
                         .await?;
diff --git a/sdk/base/lib/osBindings/BuildArg.ts b/sdk/base/lib/osBindings/BuildArg.ts
new file mode 100644
index 000000000..1157828f5
--- /dev/null
+++ b/sdk/base/lib/osBindings/BuildArg.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BuildArg = string | { env: string }
diff --git a/sdk/base/lib/osBindings/ImageSource.ts b/sdk/base/lib/osBindings/ImageSource.ts
index a71684e46..58d2c2a79 100644
--- a/sdk/base/lib/osBindings/ImageSource.ts
+++ b/sdk/base/lib/osBindings/ImageSource.ts
@@ -1,6 +1,13 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BuildArg } from "./BuildArg"
 
 export type ImageSource =
   | "packed"
-  | { dockerBuild: { workdir: string | null; dockerfile: string | null } }
+  | {
+      dockerBuild: {
+        workdir: string | null
+        dockerfile: string | null
+        buildArgs?: { [key: string]: BuildArg }
+      }
+    }
   | { dockerTag: string }
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index 6c18fa197..a4f734778 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -39,6 +39,7 @@ export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
 export { Blake3Commitment } from "./Blake3Commitment"
 export { BlockDev } from "./BlockDev"
+export { BuildArg } from "./BuildArg"
 export { CallbackId } from "./CallbackId"
 export { Category } from "./Category"
 export { CheckDependenciesParam } from "./CheckDependenciesParam"

From e1a91a7e53be9e1f55791897fe579f7b53222937 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:09:56 -0600
Subject: [PATCH 302/341] Feat: With path (#2768)

---
 sdk/package/lib/util/fileHelper.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sdk/package/lib/util/fileHelper.ts b/sdk/package/lib/util/fileHelper.ts
index 0420a4cbf..615bcfdc9 100644
--- a/sdk/package/lib/util/fileHelper.ts
+++ b/sdk/package/lib/util/fileHelper.ts
@@ -174,6 +174,14 @@ export class FileHelper<A> {
     return await this.writeFile(mergeData)
   }
 
+  /**
+   * We wanted to be able to have a fileHelper, and just modify the path later in time.
+   * Like one behaviour of another dependency or something similar.
+   */
+  withPath(path: string) {
+    return new FileHelper<A>(path, this.writeData, this.readData)
+  }
+
   /**
    * Create a File Helper for an arbitrary file type.
    *

From 1be9cdae6773b892479fe8c22406269d8802fb2a Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:48:03 -0600
Subject: [PATCH 303/341] use hardware requirements to display conflicts and
 prevent install (#2700)

* use hardware requirements to display conflicts and prevent install

* better messaging and also consider OS compatibility

* wip: backend hw requirements

* update backend components

* migration

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/Cargo.lock                               | 642 +++++++++---------
 core/startos/src/context/rpc.rs               |  13 +-
 core/startos/src/db/model/public.rs           |  10 +-
 core/startos/src/init.rs                      |   4 +
 core/startos/src/registry/context.rs          |   2 +-
 core/startos/src/registry/device_info.rs      |  73 +-
 core/startos/src/registry/package/index.rs    |   7 +-
 core/startos/src/s9pk/v1/manifest.rs          |  16 +-
 core/startos/src/s9pk/v2/compat.rs            |  20 +-
 core/startos/src/s9pk/v2/manifest.rs          |  14 +-
 core/startos/src/util/lshw.rs                 |   1 +
 core/startos/src/version/mod.rs               |  18 +-
 core/startos/src/version/v0_3_6_alpha_7.rs    |  50 ++
 sdk/base/lib/osBindings/DeviceFilter.ts       |   7 +
 .../lib/osBindings/HardwareRequirements.ts    |   3 +-
 sdk/base/lib/osBindings/LshwDevice.ts         |   7 +
 sdk/base/lib/osBindings/LshwDisplay.ts        |   3 +
 sdk/base/lib/osBindings/LshwProcessor.ts      |   3 +
 sdk/base/lib/osBindings/ServerInfo.ts         |   5 +-
 sdk/base/lib/osBindings/index.ts              |   4 +
 sdk/base/lib/types/ManifestTypes.ts           |   2 +-
 sdk/package/lib/manifest/setupManifest.ts     |   6 +-
 .../pages/show/package/package.component.scss |   4 +-
 .../unit-conversion/unit-conversion.pipe.ts   |  14 +-
 .../shared/src/services/exver.service.ts      |   8 +-
 .../backup-drives/backup.service.ts           |  14 +-
 .../refresh-alert/refresh-alert.service.ts    |   6 +-
 .../app-recover-select/to-options.pipe.ts     |  13 +-
 .../marketplace-show-controls.component.html  |  72 +-
 .../marketplace-show-controls.component.ts    |   3 +
 .../marketplace-show.page.html                |  10 +-
 .../marketplace-show/marketplace-show.page.ts |  97 ++-
 .../ui/src/app/services/api/api.fixures.ts    |  28 +-
 .../ui/src/app/services/api/mock-patch.ts     |   4 +-
 .../ui/src/app/services/eos.service.ts        |   6 +-
 35 files changed, 707 insertions(+), 482 deletions(-)
 create mode 100644 core/startos/src/version/v0_3_6_alpha_7.rs
 create mode 100644 sdk/base/lib/osBindings/DeviceFilter.ts
 create mode 100644 sdk/base/lib/osBindings/LshwDevice.ts
 create mode 100644 sdk/base/lib/osBindings/LshwDisplay.ts
 create mode 100644 sdk/base/lib/osBindings/LshwProcessor.ts

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 5f59c8bb4..cfa00f33f 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
@@ -113,9 +113,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -128,43 +128,43 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
 
 [[package]]
 name = "arrayref"
@@ -206,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.12"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
+checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
 dependencies = [
  "brotli",
  "flate2",
@@ -220,9 +220,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -231,24 +231,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -268,15 +268,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070"
+checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d"
 dependencies = [
  "aws-lc-sys",
  "mirai-annotations",
@@ -286,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.21.2"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62"
+checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972"
 dependencies = [
  "bindgen",
  "cc",
@@ -307,12 +307,12 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
  "axum-core 0.3.4",
- "bitflags 1.2.1",
+ "bitflags 1.3.2",
  "bytes",
  "futures-util",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "itoa",
  "matchit",
  "memchr",
@@ -322,26 +322,26 @@ dependencies = [
  "rustversion",
  "serde",
  "sync_wrapper 0.1.2",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "axum"
-version = "0.7.5"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
 dependencies = [
  "async-trait",
- "axum-core 0.4.3",
- "base64 0.21.7",
+ "axum-core 0.4.5",
+ "base64 0.22.1",
  "bytes",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -357,8 +357,8 @@ dependencies = [
  "sha1",
  "sync_wrapper 1.0.1",
  "tokio",
- "tokio-tungstenite 0.21.0",
- "tower",
+ "tokio-tungstenite 0.24.0",
+ "tower 0.5.1",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -383,9 +383,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
 dependencies = [
  "async-trait",
  "bytes",
@@ -396,7 +396,7 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 0.1.2",
+ "sync_wrapper 1.0.1",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -413,11 +413,11 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-util",
  "pin-project-lite",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tower-service",
 ]
 
@@ -521,9 +521,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
@@ -538,7 +538,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.77",
+ "syn 2.0.85",
  "which",
 ]
 
@@ -559,9 +559,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
@@ -648,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "6.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -675,9 +675,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.17.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 
 [[package]]
 name = "byteorder"
@@ -693,9 +693,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "cache-padded"
@@ -705,9 +705,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.1.21"
+version = "1.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
 dependencies = [
  "jobserver",
  "libc",
@@ -818,9 +818,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.17"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -828,9 +828,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.17"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstream",
  "anstyle",
@@ -840,14 +840,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -894,9 +894,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "concurrent-queue"
@@ -1255,7 +1255,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1279,7 +1279,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1321,7 +1321,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1344,7 +1344,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1367,7 +1367,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1573,9 +1573,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
@@ -1589,7 +1589,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -1725,9 +1725,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
  "miniz_oxide 0.8.0",
@@ -1735,9 +1735,9 @@ dependencies = [
 
 [[package]]
 name = "flume"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1803,9 +1803,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1818,9 +1818,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1828,15 +1828,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1856,38 +1856,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1981,7 +1981,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2000,7 +2000,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2048,6 +2048,12 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
 [[package]]
 name = "hashlink"
 version = "0.8.4"
@@ -2211,9 +2217,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -2229,9 +2235,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.30"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2253,9 +2259,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2280,9 +2286,9 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-util",
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -2295,7 +2301,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2309,7 +2315,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2319,20 +2325,19 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
@@ -2407,9 +2412,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.2"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -2442,7 +2447,7 @@ dependencies = [
 [[package]]
 name = "imbl-value"
 version = "0.1.0"
-source = "git+https://github.com/Start9Labs/imbl-value.git#48dc39a762a3b4f9300d3b9f850cbd394e777ae0"
+source = "git+https://github.com/Start9Labs/imbl-value.git#3ce01b17ae5e756fc829ee5e3513a1b19b2a03fc"
 dependencies = [
  "imbl",
  "serde",
@@ -2489,12 +2494,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "serde",
 ]
 
@@ -2542,9 +2547,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 dependencies = [
  "serde",
 ]
@@ -2704,9 +2709,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2765,7 +2770,7 @@ dependencies = [
  "petgraph",
  "pico-args",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -2779,7 +2784,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex-automata 0.4.7",
+ "regex-automata 0.4.8",
 ]
 
 [[package]]
@@ -2820,7 +2825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
 dependencies = [
  "arrayvec 0.5.2",
- "bitflags 1.2.1",
+ "bitflags 1.3.2",
  "cfg-if",
  "ryu",
  "static_assertions",
@@ -2828,9 +2833,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libloading"
@@ -2844,9 +2849,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047"
 
 [[package]]
 name = "libredox"
@@ -2856,7 +2861,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.5.4",
+ "redox_syscall 0.5.7",
 ]
 
 [[package]]
@@ -3033,7 +3038,7 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
 name = "models"
 version = "0.1.0"
 dependencies = [
- "axum 0.7.5",
+ "axum 0.7.7",
  "base64 0.21.7",
  "color-eyre",
  "ed25519-dalek 2.1.1",
@@ -3099,7 +3104,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "bitflags 1.2.1",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.6.5",
@@ -3111,7 +3116,7 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
- "bitflags 1.2.1",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.7.1",
@@ -3297,7 +3302,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3317,9 +3322,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "opaque-debug"
@@ -3342,9 +3347,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -3363,7 +3368,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3374,18 +3379,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.3.2+3.3.2"
+version = "300.4.0+3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b"
+checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -3462,7 +3467,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.4",
+ "redox_syscall 0.5.7",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -3541,9 +3546,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.13"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
+checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
 dependencies = [
  "memchr",
  "thiserror",
@@ -3552,9 +3557,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.13"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
+checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3562,22 +3567,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.13"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
+checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.13"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
+checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
 dependencies = [
  "once_cell",
  "pest",
@@ -3591,7 +3596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
@@ -3611,29 +3616,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -3664,15 +3669,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "portable-atomic"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "powerfmt"
@@ -3697,12 +3702,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3734,14 +3739,14 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.22.21",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -3786,7 +3791,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3800,7 +3805,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3823,7 +3828,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -3998,14 +4003,14 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags 1.2.1",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -4023,14 +4028,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -4044,13 +4049,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -4061,15 +4066,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4082,7 +4087,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
@@ -4094,7 +4099,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -4164,11 +4169,11 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor/no-dyn-ctx#39a872a1294c7d864faca63f072092ce300ffbe5"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor%2Fno-dyn-ctx#39a872a1294c7d864faca63f072092ce300ffbe5"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum 0.7.5",
+ "axum 0.7.7",
  "clap",
  "futures",
  "http 1.1.0",
@@ -4254,9 +4259,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
 dependencies = [
  "bitflags 2.6.0",
  "errno 0.3.9",
@@ -4278,9 +4283,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -4302,19 +4307,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
@@ -4340,9 +4344,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "rusty-fork"
@@ -4389,9 +4393,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -4441,9 +4445,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4460,9 +4464,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
@@ -4486,22 +4490,22 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itoa",
  "memchr",
  "ryu",
@@ -4520,9 +4524,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -4541,15 +4545,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4559,14 +4563,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -4575,7 +4579,7 @@ version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ce6afeda22f0b55dde2c34897bce76a629587348480384231205c14b59a01f"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itoa",
  "libyml",
  "log",
@@ -4810,7 +4814,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "log",
  "memchr",
  "once_cell",
@@ -4999,7 +5003,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.77",
+ "syn 2.0.85",
  "unicode-width",
 ]
 
@@ -5026,9 +5030,9 @@ dependencies = [
 
 [[package]]
 name = "ssh-key"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc"
+checksum = "3b86f5297f0f04d08cabaa0f6bff7cb6aec4d9c3b49d87990d63da9d9156a8c3"
 dependencies = [
  "ed25519-dalek 2.1.1",
  "p256",
@@ -5053,7 +5057,7 @@ dependencies = [
  "async-compression",
  "async-stream",
  "async-trait",
- "axum 0.7.5",
+ "axum 0.7.7",
  "axum-server",
  "backhand",
  "barrage",
@@ -5092,7 +5096,7 @@ dependencies = [
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "indicatif",
  "integer-encoding",
  "ipnet",
@@ -5241,9 +5245,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5294,9 +5298,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
 dependencies = [
  "filetime",
  "libc",
@@ -5305,9 +5309,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -5359,22 +5363,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -5455,9 +5459,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5490,7 +5494,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -5509,7 +5513,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.13",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5554,28 +5558,28 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.21.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
+checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
 dependencies = [
  "futures-util",
  "log",
+ "native-tls",
  "tokio",
- "tungstenite 0.21.0",
+ "tokio-native-tls",
+ "tungstenite 0.23.0",
 ]
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
+checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
 dependencies = [
  "futures-util",
  "log",
- "native-tls",
  "tokio",
- "tokio-native-tls",
- "tungstenite 0.23.0",
+ "tungstenite 0.24.0",
 ]
 
 [[package]]
@@ -5612,7 +5616,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.21",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -5630,7 +5634,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5639,15 +5643,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.21"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow 0.6.20",
 ]
 
 [[package]]
@@ -5664,14 +5668,14 @@ dependencies = [
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
  "prost",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -5680,7 +5684,7 @@ dependencies = [
 [[package]]
 name = "torut"
 version = "0.2.1"
-source = "git+https://github.com/Start9Labs/torut.git?branch=update/dependencies#cc7a1425a01214465e106975e6690794d8551bdb"
+source = "git+https://github.com/Start9Labs/torut.git?branch=update%2Fdependencies#cc7a1425a01214465e106975e6690794d8551bdb"
 dependencies = [
  "base32 0.4.0",
  "base64 0.21.7",
@@ -5716,6 +5720,22 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 0.1.2",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -5748,7 +5768,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -5886,7 +5906,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 [[package]]
 name = "ts-rs"
 version = "8.1.0"
-source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-as#7ae88ade90b5e724159048a663a0bdb04bed27f7"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature%2Ftop-level-as#7ae88ade90b5e724159048a663a0bdb04bed27f7"
 dependencies = [
  "thiserror",
  "ts-rs-macros",
@@ -5895,12 +5915,12 @@ dependencies = [
 [[package]]
 name = "ts-rs-macros"
 version = "8.1.0"
-source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature/top-level-as#7ae88ade90b5e724159048a663a0bdb04bed27f7"
+source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature%2Ftop-level-as#7ae88ade90b5e724159048a663a0bdb04bed27f7"
 dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
  "termcolor",
 ]
 
@@ -5917,9 +5937,9 @@ dependencies = [
 
 [[package]]
 name = "tungstenite"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
+checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
 dependencies = [
  "byteorder",
  "bytes",
@@ -5927,6 +5947,7 @@ dependencies = [
  "http 1.1.0",
  "httparse",
  "log",
+ "native-tls",
  "rand 0.8.5",
  "sha1",
  "thiserror",
@@ -5936,9 +5957,9 @@ dependencies = [
 
 [[package]]
 name = "tungstenite"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
 dependencies = [
  "byteorder",
  "bytes",
@@ -5946,11 +5967,9 @@ dependencies = [
  "http 1.1.0",
  "httparse",
  "log",
- "native-tls",
  "rand 0.8.5",
  "sha1",
  "thiserror",
- "url",
  "utf-8",
 ]
 
@@ -5971,7 +5990,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -5982,9 +6001,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "unarray"
@@ -5994,18 +6013,15 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
@@ -6030,9 +6046,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6106,9 +6122,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom 0.2.15",
 ]
@@ -6179,9 +6195,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6190,24 +6206,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6217,9 +6233,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6227,28 +6243,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -6259,9 +6275,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6291,7 +6307,7 @@ version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.5.4",
+ "redox_syscall 0.5.7",
  "wasite",
 ]
 
@@ -6524,9 +6540,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
@@ -6617,7 +6633,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
@@ -6637,7 +6653,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.85",
 ]
 
 [[package]]
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 0e0bbb986..73d103adc 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -39,8 +39,7 @@ use crate::service::action::update_requested_actions;
 use crate::service::effects::callbacks::ServiceCallbacks;
 use crate::service::ServiceMap;
 use crate::shutdown::Shutdown;
-use crate::system::get_mem_info;
-use crate::util::lshw::{lshw, LshwDevice};
+use crate::util::lshw::LshwDevice;
 use crate::util::sync::SyncMutex;
 
 pub struct RpcContextSeed {
@@ -67,7 +66,6 @@ pub struct RpcContextSeed {
     pub wifi_manager: Option<Arc<RwLock<WpaCli>>>,
     pub current_secret: Arc<Jwk>,
     pub client: Client,
-    pub hardware: Hardware,
     pub start_time: Instant,
     pub crons: SyncMutex<BTreeMap<Guid, NonDetachingJoinHandle<()>>>,
     // #[cfg(feature = "dev")]
@@ -86,7 +84,6 @@ pub struct Hardware {
 pub struct InitRpcContextPhases {
     load_db: PhaseProgressTrackerHandle,
     init_net_ctrl: PhaseProgressTrackerHandle,
-    read_device_info: PhaseProgressTrackerHandle,
     cleanup_init: CleanupInitPhases,
     // TODO: migrations
 }
@@ -95,7 +92,6 @@ impl InitRpcContextPhases {
         Self {
             load_db: handle.add_phase("Loading database".into(), Some(5)),
             init_net_ctrl: handle.add_phase("Initializing network".into(), Some(1)),
-            read_device_info: handle.add_phase("Reading device information".into(), Some(1)),
             cleanup_init: CleanupInitPhases::new(handle),
         }
     }
@@ -127,7 +123,6 @@ impl RpcContext {
         InitRpcContextPhases {
             mut load_db,
             mut init_net_ctrl,
-            mut read_device_info,
             cleanup_init,
         }: InitRpcContextPhases,
     ) -> Result<Self, Error> {
@@ -179,11 +174,6 @@ impl RpcContext {
         let metrics_cache = RwLock::<Option<crate::system::Metrics>>::new(None);
         let tor_proxy_url = format!("socks5h://{tor_proxy}");
 
-        read_device_info.start();
-        let devices = lshw().await?;
-        let ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024;
-        read_device_info.complete();
-
         let crons = SyncMutex::new(BTreeMap::new());
 
         if !db
@@ -275,7 +265,6 @@ impl RpcContext {
                 }))
                 .build()
                 .with_kind(crate::ErrorKind::ParseUrl)?,
-            hardware: Hardware { devices, ram },
             start_time: Instant::now(),
             crons,
             // #[cfg(feature = "dev")]
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index 7e5e96cde..353c1f89b 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -22,6 +22,7 @@ use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::system::SmtpValue;
 use crate::util::cpupower::Governor;
+use crate::util::lshw::LshwDevice;
 use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
 
@@ -46,7 +47,7 @@ impl Public {
                 version: Current::default().semver(),
                 hostname: account.hostname.no_dot_host_name(),
                 last_backup: None,
-                version_compat: Current::default().compat().clone(),
+                package_version_compat: Current::default().compat().clone(),
                 post_init_migration_todos: BTreeSet::new(),
                 lan_address,
                 onion_address: account.tor_key.public().get_onion_address(),
@@ -78,6 +79,8 @@ impl Public {
                 zram: true,
                 governor: None,
                 smtp: None,
+                ram: 0,
+                devices: Vec::new(),
             },
             package_data: AllPackageData::default(),
             ui: serde_json::from_str(include_str!(concat!(
@@ -114,7 +117,7 @@ pub struct ServerInfo {
     #[ts(type = "string")]
     pub version: Version,
     #[ts(type = "string")]
-    pub version_compat: VersionRange,
+    pub package_version_compat: VersionRange,
     #[ts(type = "string[]")]
     pub post_init_migration_todos: BTreeSet<Version>,
     #[ts(type = "string | null")]
@@ -141,6 +144,9 @@ pub struct ServerInfo {
     pub zram: bool,
     pub governor: Option<Governor>,
     pub smtp: Option<SmtpValue>,
+    #[ts(type = "number")]
+    pub ram: u64,
+    pub devices: Vec<LshwDevice>,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index 206f1c8e0..a81e7e336 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -32,7 +32,9 @@ use crate::progress::{
 use crate::rpc_continuations::{Guid, RpcContinuation};
 use crate::s9pk::v2::pack::{CONTAINER_DATADIR, CONTAINER_TOOL};
 use crate::ssh::SSH_AUTHORIZED_KEYS_FILE;
+use crate::system::get_mem_info;
 use crate::util::io::{create_file, IOHook};
+use crate::util::lshw::lshw;
 use crate::util::net::WebSocketExt;
 use crate::util::{cpupower, Invoke};
 use crate::Error;
@@ -508,6 +510,8 @@ pub async fn init(
 
     update_server_info.start();
     server_info.ip_info = crate::net::dhcp::init_ips().await?;
+    server_info.ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024;
+    server_info.devices = lshw().await?;
     server_info.status_info = ServerStatus {
         updated: false,
         update_progress: None,
diff --git a/core/startos/src/registry/context.rs b/core/startos/src/registry/context.rs
index d3eaf3691..16c6465ed 100644
--- a/core/startos/src/registry/context.rs
+++ b/core/startos/src/registry/context.rs
@@ -255,7 +255,7 @@ impl CallRemote<RegistryContext, RegistryUrlParams> for RpcContext {
             .header(CONTENT_TYPE, "application/json")
             .header(ACCEPT, "application/json")
             .header(CONTENT_LENGTH, body.len())
-            .header(DEVICE_INFO_HEADER, DeviceInfo::from(self).to_header_value())
+            // .header(DEVICE_INFO_HEADER, DeviceInfo::from(self).to_header_value())
             .body(body)
             .send()
             .await?;
diff --git a/core/startos/src/registry/device_info.rs b/core/startos/src/registry/device_info.rs
index 04a38a223..410e45f8f 100644
--- a/core/startos/src/registry/device_info.rs
+++ b/core/startos/src/registry/device_info.rs
@@ -15,6 +15,7 @@ use url::Url;
 use crate::context::RpcContext;
 use crate::prelude::*;
 use crate::registry::context::RegistryContext;
+use crate::util::lshw::{LshwDevice, LshwDisplay, LshwProcessor};
 use crate::util::VersionString;
 use crate::version::VersionT;
 
@@ -26,12 +27,12 @@ pub struct DeviceInfo {
     pub os: OsInfo,
     pub hardware: HardwareInfo,
 }
-impl From<&RpcContext> for DeviceInfo {
-    fn from(value: &RpcContext) -> Self {
-        Self {
-            os: OsInfo::from(value),
-            hardware: HardwareInfo::from(value),
-        }
+impl DeviceInfo {
+    pub async fn load(ctx: &RpcContext) -> Result<Self, Error> {
+        Ok(Self {
+            os: OsInfo::from(ctx),
+            hardware: HardwareInfo::load(ctx).await?,
+        })
     }
 }
 impl DeviceInfo {
@@ -44,11 +45,11 @@ impl DeviceInfo {
             .append_pair("hardware.arch", &*self.hardware.arch)
             .append_pair("hardware.ram", &self.hardware.ram.to_string());
 
-        for (class, products) in &self.hardware.devices {
-            for product in products {
-                url.query_pairs_mut()
-                    .append_pair(&format!("hardware.device.{}", class), product);
-            }
+        for device in &self.hardware.devices {
+            url.query_pairs_mut().append_pair(
+                &format!("hardware.device.{}", device.class()),
+                device.product(),
+            );
         }
 
         HeaderValue::from_str(url.query().unwrap_or_default()).unwrap()
@@ -80,16 +81,20 @@ impl DeviceInfo {
                 devices: identity(query)
                     .split_off("hardware.device.")
                     .into_iter()
-                    .filter_map(|(k, v)| {
-                        k.strip_prefix("hardware.device.")
-                            .map(|k| (k.into(), v.into_owned()))
+                    .filter_map(|(k, v)| match k.strip_prefix("hardware.device.") {
+                        Some("processor") => Some(LshwDevice::Processor(LshwProcessor {
+                            product: v.into_owned(),
+                        })),
+                        Some("display") => Some(LshwDevice::Display(LshwDisplay {
+                            product: v.into_owned(),
+                        })),
+                        Some(class) => {
+                            tracing::warn!("unknown device class: {class}");
+                            None
+                        }
+                        _ => None,
                     })
-                    .fold(BTreeMap::new(), |mut acc, (k, v)| {
-                        let mut devs = acc.remove(&k).unwrap_or_default();
-                        devs.push(v);
-                        acc.insert(k, devs);
-                        acc
-                    }),
+                    .collect(),
             },
         })
     }
@@ -122,26 +127,16 @@ pub struct HardwareInfo {
     pub arch: InternedString,
     #[ts(type = "number")]
     pub ram: u64,
-    #[ts(as = "BTreeMap::<String, Vec<String>>")]
-    pub devices: BTreeMap<InternedString, Vec<String>>,
+    pub devices: Vec<LshwDevice>,
 }
-
-impl From<&RpcContext> for HardwareInfo {
-    fn from(value: &RpcContext) -> Self {
-        Self {
-            arch: InternedString::intern(crate::ARCH),
-            ram: value.hardware.ram,
-            devices: value
-                .hardware
-                .devices
-                .iter()
-                .fold(BTreeMap::new(), |mut acc, dev| {
-                    let mut devs = acc.remove(dev.class()).unwrap_or_default();
-                    devs.push(dev.product().to_owned());
-                    acc.insert(dev.class().into(), devs);
-                    acc
-                }),
-        }
+impl HardwareInfo {
+    pub async fn load(ctx: &RpcContext) -> Result<Self, Error> {
+        let s = ctx.db.peek().await.into_public().into_server_info();
+        Ok(Self {
+            arch: s.as_arch().de()?,
+            ram: s.as_ram().de()?,
+            devices: s.as_devices().de()?,
+        })
     }
 }
 
diff --git a/core/startos/src/registry/package/index.rs b/core/startos/src/registry/package/index.rs
index 12a17f634..428200165 100644
--- a/core/startos/src/registry/package/index.rs
+++ b/core/startos/src/registry/package/index.rs
@@ -180,14 +180,13 @@ impl Model<PackageVersionInfo> {
                 return Ok(false);
             }
         }
-        for (class, regex) in hw.device {
+        for device_filter in hw.device {
             if !device_info
                 .hardware
                 .devices
-                .get(&*class)
-                .unwrap_or(&Vec::new())
                 .iter()
-                .any(|product| regex.as_ref().is_match(product))
+                .filter(|d| d.class() == &*device_filter.class)
+                .any(|d| device_filter.pattern.as_ref().is_match(d.product()))
             {
                 return Ok(false);
             }
diff --git a/core/startos/src/s9pk/v1/manifest.rs b/core/startos/src/s9pk/v1/manifest.rs
index 9b3eb9895..31821ad68 100644
--- a/core/startos/src/s9pk/v1/manifest.rs
+++ b/core/startos/src/s9pk/v1/manifest.rs
@@ -1,7 +1,8 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 use std::path::{Path, PathBuf};
 
 use exver::{Version, VersionRange};
+use imbl_value::InternedString;
 use indexmap::IndexMap;
 pub use models::PackageId;
 use models::{ActionId, HealthCheckId, ImageId, VolumeId};
@@ -10,8 +11,8 @@ use url::Url;
 
 use crate::prelude::*;
 use crate::s9pk::git_hash::GitHash;
-use crate::s9pk::manifest::{Alerts, Description, HardwareRequirements};
-use crate::util::serde::{Duration, IoFormat};
+use crate::s9pk::manifest::{Alerts, Description};
+use crate::util::serde::{Duration, IoFormat, Regex};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
@@ -192,6 +193,15 @@ impl DependencyRequirement {
     }
 }
 
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct HardwareRequirements {
+    #[serde(default)]
+    pub device: BTreeMap<InternedString, Regex>,
+    pub ram: Option<u64>,
+    pub arch: Option<BTreeSet<InternedString>>,
+}
+
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct Assets {
diff --git a/core/startos/src/s9pk/v2/compat.rs b/core/startos/src/s9pk/v2/compat.rs
index e3f54d3a2..db8cbc414 100644
--- a/core/startos/src/s9pk/v2/compat.rs
+++ b/core/startos/src/s9pk/v2/compat.rs
@@ -10,7 +10,7 @@ use tokio::process::Command;
 
 use crate::dependencies::{DepInfo, Dependencies};
 use crate::prelude::*;
-use crate::s9pk::manifest::Manifest;
+use crate::s9pk::manifest::{DeviceFilter, Manifest};
 use crate::s9pk::merkle_archive::directory_contents::DirectoryContents;
 use crate::s9pk::merkle_archive::source::TmpSource;
 use crate::s9pk::merkle_archive::{Entry, MerkleArchive};
@@ -246,7 +246,23 @@ impl TryFrom<ManifestV1> for Manifest {
                     })
                     .collect(),
             ),
-            hardware_requirements: value.hardware_requirements,
+            hardware_requirements: super::manifest::HardwareRequirements {
+                arch: value.hardware_requirements.arch,
+                ram: value.hardware_requirements.ram,
+                device: value
+                    .hardware_requirements
+                    .device
+                    .into_iter()
+                    .map(|(class, product)| DeviceFilter {
+                        pattern_description: format!(
+                            "a {class} device matching the expression {}",
+                            product.as_ref()
+                        ),
+                        class,
+                        pattern: product,
+                    })
+                    .collect(),
+            },
             git_hash: value.git_hash,
             os_version: value.eos_version,
         })
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index 9b9455999..85f3cd796 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -161,14 +161,24 @@ impl Manifest {
 #[ts(export)]
 pub struct HardwareRequirements {
     #[serde(default)]
-    #[ts(type = "{ display?: string, processor?: string }")]
-    pub device: BTreeMap<String, Regex>, // TODO: array
+    pub device: Vec<DeviceFilter>,
     #[ts(type = "number | null")]
     pub ram: Option<u64>,
     #[ts(type = "string[] | null")]
     pub arch: Option<BTreeSet<InternedString>>,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct DeviceFilter {
+    #[ts(type = "\"processor\" | \"display\"")]
+    pub class: InternedString,
+    #[ts(type = "string")]
+    pub pattern: Regex,
+    pub pattern_description: String,
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[ts(export)]
 pub struct Description {
diff --git a/core/startos/src/util/lshw.rs b/core/startos/src/util/lshw.rs
index eb5293d89..df5fff5f8 100644
--- a/core/startos/src/util/lshw.rs
+++ b/core/startos/src/util/lshw.rs
@@ -10,6 +10,7 @@ const KNOWN_CLASSES: &[&str] = &["processor", "display"];
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(tag = "class")]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub enum LshwDevice {
     Processor(LshwProcessor),
     Display(LshwDisplay),
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index ae203f3e5..bc8deea17 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -25,8 +25,9 @@ mod v0_3_6_alpha_3;
 mod v0_3_6_alpha_4;
 mod v0_3_6_alpha_5;
 mod v0_3_6_alpha_6;
+mod v0_3_6_alpha_7;
 
-pub type Current = v0_3_6_alpha_6::Version; // VERSION_BUMP
+pub type Current = v0_3_6_alpha_7::Version; // VERSION_BUMP
 
 impl Current {
     #[instrument(skip(self, db))]
@@ -102,6 +103,7 @@ enum Version {
     V0_3_6_alpha_4(Wrapper<v0_3_6_alpha_4::Version>),
     V0_3_6_alpha_5(Wrapper<v0_3_6_alpha_5::Version>),
     V0_3_6_alpha_6(Wrapper<v0_3_6_alpha_6::Version>),
+    V0_3_6_alpha_7(Wrapper<v0_3_6_alpha_7::Version>),
     Other(exver::Version),
 }
 
@@ -132,6 +134,7 @@ impl Version {
             Self::V0_3_6_alpha_4(v) => DynVersion(Box::new(v.0)),
             Self::V0_3_6_alpha_5(v) => DynVersion(Box::new(v.0)),
             Self::V0_3_6_alpha_6(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_7(v) => DynVersion(Box::new(v.0)),
             Self::Other(v) => {
                 return Err(Error::new(
                     eyre!("unknown version {v}"),
@@ -154,6 +157,7 @@ impl Version {
             Version::V0_3_6_alpha_4(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_5(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_6(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_7(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -172,15 +176,19 @@ fn version_accessor(db: &mut Value) -> Option<&mut Value> {
 fn version_compat_accessor(db: &mut Value) -> Option<&mut Value> {
     if db.get("public").is_some() {
         let server_info = db.get_mut("public")?.get_mut("serverInfo")?;
-        if server_info.get("versionCompat").is_some() {
-            server_info.get_mut("versionCompat")
+        if server_info.get("packageVersionCompat").is_some() {
+            server_info.get_mut("packageVersionCompat")
         } else {
             if let Some(prev) = server_info.get("eosVersionCompat").cloned() {
                 server_info
                     .as_object_mut()?
-                    .insert("versionCompat".into(), prev);
+                    .insert("packageVersionCompat".into(), prev);
+            } else if let Some(prev) = server_info.get("versionCompat").cloned() {
+                server_info
+                    .as_object_mut()?
+                    .insert("packageVersionCompat".into(), prev);
             }
-            server_info.get_mut("versionCompat")
+            server_info.get_mut("packageVersionCompat")
         }
     } else {
         db.get_mut("server-info")?.get_mut("eos-version-compat")
diff --git a/core/startos/src/version/v0_3_6_alpha_7.rs b/core/startos/src/version/v0_3_6_alpha_7.rs
new file mode 100644
index 000000000..75c0af72f
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_7.rs
@@ -0,0 +1,50 @@
+use exver::{PreReleaseSegment, VersionRange};
+use imbl_value::{json, InOMap};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_6, VersionT};
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_7: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 7.into()]
+    );
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_6::Version;
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
+    }
+    fn semver(self) -> exver::Version {
+        V0_3_6_alpha_7.clone()
+    }
+    fn compat(self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+        let server_info = db["public"]["serverInfo"]
+            .as_object_mut()
+            .or_not_found("public.serverInfo")?;
+        server_info.insert("ram".into(), json!(0));
+        server_info.insert("devices".into(), json!([]));
+        let package_data = db["public"]["packageData"]
+            .as_object_mut()
+            .or_not_found("public.packageData")?;
+        for (_, pde) in package_data.iter_mut() {
+            if let Some(manifest) = pde["stateInfo"].get_mut("manifest") {
+                manifest["hardwareRequirements"]["device"] = json!([]);
+            }
+        }
+        Ok(())
+    }
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/sdk/base/lib/osBindings/DeviceFilter.ts b/sdk/base/lib/osBindings/DeviceFilter.ts
new file mode 100644
index 000000000..6e6f5810c
--- /dev/null
+++ b/sdk/base/lib/osBindings/DeviceFilter.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type DeviceFilter = {
+  class: "processor" | "display"
+  pattern: string
+  patternDescription: string
+}
diff --git a/sdk/base/lib/osBindings/HardwareRequirements.ts b/sdk/base/lib/osBindings/HardwareRequirements.ts
index e17568eec..d420f846b 100644
--- a/sdk/base/lib/osBindings/HardwareRequirements.ts
+++ b/sdk/base/lib/osBindings/HardwareRequirements.ts
@@ -1,7 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DeviceFilter } from "./DeviceFilter"
 
 export type HardwareRequirements = {
-  device: { display?: string; processor?: string }
+  device: Array<DeviceFilter>
   ram: number | null
   arch: string[] | null
 }
diff --git a/sdk/base/lib/osBindings/LshwDevice.ts b/sdk/base/lib/osBindings/LshwDevice.ts
new file mode 100644
index 000000000..f2c624be7
--- /dev/null
+++ b/sdk/base/lib/osBindings/LshwDevice.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { LshwDisplay } from "./LshwDisplay"
+import type { LshwProcessor } from "./LshwProcessor"
+
+export type LshwDevice =
+  | ({ class: "processor" } & LshwProcessor)
+  | ({ class: "display" } & LshwDisplay)
diff --git a/sdk/base/lib/osBindings/LshwDisplay.ts b/sdk/base/lib/osBindings/LshwDisplay.ts
new file mode 100644
index 000000000..25d14b12f
--- /dev/null
+++ b/sdk/base/lib/osBindings/LshwDisplay.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type LshwDisplay = { product: string }
diff --git a/sdk/base/lib/osBindings/LshwProcessor.ts b/sdk/base/lib/osBindings/LshwProcessor.ts
new file mode 100644
index 000000000..17a47d477
--- /dev/null
+++ b/sdk/base/lib/osBindings/LshwProcessor.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type LshwProcessor = { product: string }
diff --git a/sdk/base/lib/osBindings/ServerInfo.ts b/sdk/base/lib/osBindings/ServerInfo.ts
index ff04d42b0..435bf874a 100644
--- a/sdk/base/lib/osBindings/ServerInfo.ts
+++ b/sdk/base/lib/osBindings/ServerInfo.ts
@@ -1,6 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Governor } from "./Governor"
 import type { IpInfo } from "./IpInfo"
+import type { LshwDevice } from "./LshwDevice"
 import type { ServerStatus } from "./ServerStatus"
 import type { SmtpValue } from "./SmtpValue"
 import type { WifiInfo } from "./WifiInfo"
@@ -11,7 +12,7 @@ export type ServerInfo = {
   id: string
   hostname: string
   version: string
-  versionCompat: string
+  packageVersionCompat: string
   postInitMigrationTodos: string[]
   lastBackup: string | null
   lanAddress: string
@@ -31,4 +32,6 @@ export type ServerInfo = {
   zram: boolean
   governor: Governor | null
   smtp: SmtpValue | null
+  ram: number
+  devices: Array<LshwDevice>
 }
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index a4f734778..10c2098bf 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -62,6 +62,7 @@ export { DependencyRequirement } from "./DependencyRequirement"
 export { DepInfo } from "./DepInfo"
 export { Description } from "./Description"
 export { DestroySubcontainerFsParams } from "./DestroySubcontainerFsParams"
+export { DeviceFilter } from "./DeviceFilter"
 export { Duration } from "./Duration"
 export { EchoParams } from "./EchoParams"
 export { EncryptedWire } from "./EncryptedWire"
@@ -111,6 +112,9 @@ export { LanInfo } from "./LanInfo"
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"
 export { ListVersionSignersParams } from "./ListVersionSignersParams"
 export { LoginParams } from "./LoginParams"
+export { LshwDevice } from "./LshwDevice"
+export { LshwDisplay } from "./LshwDisplay"
+export { LshwProcessor } from "./LshwProcessor"
 export { MainStatus } from "./MainStatus"
 export { Manifest } from "./Manifest"
 export { MaybeUtf8String } from "./MaybeUtf8String"
diff --git a/sdk/base/lib/types/ManifestTypes.ts b/sdk/base/lib/types/ManifestTypes.ts
index c416588b3..86ecf9140 100644
--- a/sdk/base/lib/types/ManifestTypes.ts
+++ b/sdk/base/lib/types/ManifestTypes.ts
@@ -144,7 +144,7 @@ export type SDKManifest = {
    * ```
    */
   readonly hardwareRequirements?: {
-    readonly device?: { display?: RegExp; processor?: RegExp }
+    readonly device?: T.DeviceFilter[]
     readonly ram?: number | null
     readonly arch?: string[] | null
   }
diff --git a/sdk/package/lib/manifest/setupManifest.ts b/sdk/package/lib/manifest/setupManifest.ts
index 919412f7d..2ae999e62 100644
--- a/sdk/package/lib/manifest/setupManifest.ts
+++ b/sdk/package/lib/manifest/setupManifest.ts
@@ -73,11 +73,7 @@ export function buildManifest<
       stop: manifest.alerts?.stop || null,
     },
     hardwareRequirements: {
-      device: Object.fromEntries(
-        Object.entries(manifest.hardwareRequirements?.device || {}).map(
-          ([k, v]) => [k, v.source],
-        ),
-      ),
+      device: manifest.hardwareRequirements?.device || [],
       ram: manifest.hardwareRequirements?.ram || null,
       arch:
         manifest.hardwareRequirements?.arch === undefined
diff --git a/web/projects/marketplace/src/pages/show/package/package.component.scss b/web/projects/marketplace/src/pages/show/package/package.component.scss
index 9e75cfd41..d5f63c9e3 100644
--- a/web/projects/marketplace/src/pages/show/package/package.component.scss
+++ b/web/projects/marketplace/src/pages/show/package/package.component.scss
@@ -27,8 +27,8 @@
 }
 
 .published {
-  margin: 0;
-  padding: 4px 0 12px 0;
+  margin: 0px;
+  padding: 8px 0 8px 0;
   font-style: italic;
 }
 
diff --git a/web/projects/shared/src/pipes/unit-conversion/unit-conversion.pipe.ts b/web/projects/shared/src/pipes/unit-conversion/unit-conversion.pipe.ts
index 266e7fe9a..afdc48c48 100644
--- a/web/projects/shared/src/pipes/unit-conversion/unit-conversion.pipe.ts
+++ b/web/projects/shared/src/pipes/unit-conversion/unit-conversion.pipe.ts
@@ -6,13 +6,17 @@ import { Pipe, PipeTransform } from '@angular/core'
 })
 export class ConvertBytesPipe implements PipeTransform {
   transform(bytes: number): string {
-    if (bytes === 0) return '0 Bytes'
+    return convertBytes(bytes)
+  }
+}
 
-    const k = 1024
-    const i = Math.floor(Math.log(bytes) / Math.log(k))
+export function convertBytes(bytes: number): string {
+  if (bytes === 0) return '0 Bytes'
 
-    return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i]
-  }
+  const k = 1024
+  const i = Math.floor(Math.log(bytes) / Math.log(k))
+
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i]
 }
 
 @Pipe({
diff --git a/web/projects/shared/src/services/exver.service.ts b/web/projects/shared/src/services/exver.service.ts
index f3a28fae2..516879333 100644
--- a/web/projects/shared/src/services/exver.service.ts
+++ b/web/projects/shared/src/services/exver.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { VersionRange, ExtendedVersion, Version } from '@start9labs/start-sdk'
+import { ExtendedVersion, VersionRange } from '@start9labs/start-sdk'
 
 @Injectable({
   providedIn: 'root',
@@ -29,12 +29,8 @@ export class Exver {
     }
   }
 
-  compareOsVersion(current: string, other: string) {
-    return Version.parse(current).compare(Version.parse(other))
-  }
-
   satisfies(version: string, range: string): boolean {
-    return VersionRange.parse(range).satisfiedBy(ExtendedVersion.parse(version))
+    return ExtendedVersion.parse(version).satisfies(VersionRange.parse(range))
   }
 
   getFlavor(version: string): string | null {
diff --git a/web/projects/ui/src/app/components/backup-drives/backup.service.ts b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
index 837bebf9b..ec42c8266 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup.service.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup.service.ts
@@ -7,7 +7,7 @@ import {
   DiskBackupTarget,
 } from 'src/app/services/api/api.types'
 import { MappedBackupTarget } from 'src/app/types/mapped-backup-target'
-import { Exver, getErrorMessage } from '@start9labs/shared'
+import { getErrorMessage } from '@start9labs/shared'
 import { Version } from '@start9labs/start-sdk'
 
 @Injectable({
@@ -19,10 +19,7 @@ export class BackupService {
   loading = true
   loadingError: string | IonicSafeString = ''
 
-  constructor(
-    private readonly embassyApi: ApiService,
-    private readonly exver: Exver,
-  ) {}
+  constructor(private readonly embassyApi: ApiService) {}
 
   async getBackupTargets(): Promise<void> {
     this.loading = true
@@ -58,15 +55,16 @@ export class BackupService {
 
   hasAnyBackup(target: BackupTarget): boolean {
     return Object.values(target.startOs).some(
-      s => this.exver.compareOsVersion(s.version, '0.3.6') !== 'less',
+      s => Version.parse(s.version).compare(Version.parse('0.3.6')) !== 'less',
     )
   }
 
   hasThisBackup(target: BackupTarget, id: string): boolean {
     return (
       target.startOs[id] &&
-      this.exver.compareOsVersion(target.startOs[id].version, '0.3.6') !==
-        'less'
+      Version.parse(target.startOs[id].version).compare(
+        Version.parse('0.3.6'),
+      ) !== 'less'
     )
   }
 }
diff --git a/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts b/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
index 8cf5ce76d..d567e5956 100644
--- a/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
+++ b/web/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
@@ -1,24 +1,24 @@
 import { Injectable } from '@angular/core'
 import { endWith, Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
-import { Exver } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
 import { ConfigService } from '../../../services/config.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
+import { Version } from '@start9labs/start-sdk'
 
 @Injectable({ providedIn: 'root' })
 export class RefreshAlertService extends Observable<boolean> {
   private readonly stream$ = this.patch.watch$('serverInfo', 'version').pipe(
     map(
       version =>
-        this.exver.compareOsVersion(this.config.version, version) !== 'equal',
+        Version.parse(this.config.version).compare(Version.parse(version)) !==
+        'equal',
     ),
     endWith(false),
   )
 
   constructor(
     private readonly patch: PatchDB<DataModel>,
-    private readonly exver: Exver,
     private readonly config: ConfigService,
   ) {
     super(subscriber => this.stream$.subscribe(subscriber))
diff --git a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
index 1c2d99f53..206e97f71 100644
--- a/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
+++ b/web/projects/ui/src/app/modals/app-recover-select/to-options.pipe.ts
@@ -5,6 +5,7 @@ import { ConfigService } from 'src/app/services/config.service'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
+import { Version } from '@start9labs/start-sdk'
 
 export interface AppRecoverOption extends PackageBackupInfo {
   id: string
@@ -34,7 +35,10 @@ export class ToOptionsPipe implements PipeTransform {
             id,
             installed: !!packageData[id],
             checked: false,
-            newerOS: this.compare(packageBackups[id].osVersion),
+            newerOS:
+              Version.parse(packageBackups[id].osVersion).compare(
+                Version.parse(this.config.version),
+              ) === 'greater',
           }))
           .sort((a, b) =>
             b.title.toLowerCase() > a.title.toLowerCase() ? -1 : 1,
@@ -42,11 +46,4 @@ export class ToOptionsPipe implements PipeTransform {
       ),
     )
   }
-
-  private compare(version: string): boolean {
-    // checks to see if backup was made on a newer version of startOS
-    return (
-      this.exver.compareOsVersion(version, this.config.version) === 'greater'
-    )
-  }
 }
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
index 797a2fb13..bdfe8e3ed 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
@@ -11,49 +11,51 @@
         : 'View Installing'
     }}
   </ion-button>
-  <ng-container *ngIf="localPkg; else install">
-    <ng-container
-      *ngIf="
-        localPkg.stateInfo.state === 'installed' &&
-        (localPkg | toManifest) as manifest
-      "
-    >
-      <ion-button
-        *ngIf="(manifest.version | compareExver : pkg.version) === -1"
-        expand="block"
-        color="success"
-        (click)="tryInstall()"
-      >
-        Update
-      </ion-button>
-      <ion-button
-        *ngIf="(manifest.version | compareExver : pkg.version) === 1"
-        expand="block"
-        color="warning"
-        (click)="tryInstall()"
+  <ng-container *ngIf="!conflict">
+    <ng-container *ngIf="localPkg; else install">
+      <ng-container
+        *ngIf="
+          localPkg.stateInfo.state === 'installed' &&
+          (localPkg | toManifest) as manifest
+        "
       >
-        Downgrade
-      </ion-button>
-      <ng-container *ngIf="showDevTools$ | async">
         <ion-button
-          *ngIf="(manifest.version | compareExver : pkg.version) === 0"
+          *ngIf="(manifest.version | compareExver : pkg.version) === -1"
           expand="block"
           color="success"
           (click)="tryInstall()"
         >
-          Reinstall
+          Update
         </ion-button>
+        <ion-button
+          *ngIf="(manifest.version | compareExver : pkg.version) === 1"
+          expand="block"
+          color="warning"
+          (click)="tryInstall()"
+        >
+          Downgrade
+        </ion-button>
+        <ng-container *ngIf="showDevTools$ | async">
+          <ion-button
+            *ngIf="(manifest.version | compareExver : pkg.version) === 0"
+            expand="block"
+            color="success"
+            (click)="tryInstall()"
+          >
+            Reinstall
+          </ion-button>
+        </ng-container>
       </ng-container>
     </ng-container>
+  
+    <ng-template #install>
+      <ion-button
+        expand="block"
+        [color]="localFlavor ? 'warning' : 'success'"
+        (click)="tryInstall()"
+      >
+        {{ localFlavor ? 'Switch' : 'Install' }}
+      </ion-button>
+    </ng-template>
   </ng-container>
-
-  <ng-template #install>
-    <ion-button
-      expand="block"
-      [color]="localFlavor ? 'warning' : 'success'"
-      (click)="tryInstall()"
-    >
-      {{ localFlavor ? 'Switch' : 'Install' }}
-    </ion-button>
-  </ng-template>
 </div>
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index 0b76579bc..40b443b27 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -47,6 +47,9 @@ export class MarketplaceShowControlsComponent {
   @Input()
   localFlavor!: boolean
 
+  @Input()
+  conflict?: string | null
+
   readonly showDevTools$ = this.ClientStorageService.showDevTools$
 
   constructor(
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
index a0f7622ad..f18a22968 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
@@ -13,12 +13,20 @@ <h2>{{ pkgId }} not found in this registry</h2>
     </ng-container>
 
     <ng-template #show>
-      <marketplace-package [pkg]="pkg"></marketplace-package>
+      <marketplace-package [pkg]="pkg">
+        <ion-item *ngIf="conflict$ | async as conflict" color="warning" class="ion-margin-top">
+          <ion-icon slot="start" name="warning"></ion-icon>
+          <ion-label>
+            <h2 style="font-weight: 600" [innerHTML]="conflict"></h2>
+          </ion-label>
+        </ion-item>
+      </marketplace-package>
       <marketplace-show-controls
         [url]="url"
         [pkg]="pkg"
         [localPkg]="localPkg$ | async"
         [localFlavor]="!!(localFlavor$ | async)"
+        [conflict]="conflict$ | async"
       ></marketplace-show-controls>
 
       <marketplace-show-dependent [pkg]="pkg"></marketplace-show-dependent>
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
index d2af27efc..9b2562395 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
@@ -1,15 +1,24 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { Exver, getPkgId } from '@start9labs/shared'
+import { convertBytes, Exver, getPkgId } from '@start9labs/shared'
 import {
   AbstractMarketplaceService,
   MarketplacePkg,
 } from '@start9labs/marketplace'
 import { PatchDB } from 'patch-db-client'
 import { combineLatest, Observable } from 'rxjs'
-import { filter, map, shareReplay, startWith, switchMap } from 'rxjs/operators'
+import {
+  filter,
+  first,
+  map,
+  pairwise,
+  shareReplay,
+  startWith,
+  switchMap,
+} from 'rxjs/operators'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { getManifest } from 'src/app/util/get-package-data'
+import { Version, VersionRange } from '@start9labs/start-sdk'
 
 @Component({
   selector: 'marketplace-show',
@@ -25,9 +34,10 @@ export class MarketplaceShowPage {
     this.patch.watch$('packageData', this.pkgId).pipe(filter(Boolean)),
     this.route.queryParamMap,
   ]).pipe(
-    map(([pkg, paramMap]) =>
-      this.exver.getFlavor(getManifest(pkg).version) === paramMap.get('flavor')
-        ? pkg
+    map(([localPkg, paramMap]) =>
+      this.exver.getFlavor(getManifest(localPkg).version) ===
+      paramMap.get('flavor')
+        ? localPkg
         : null,
     ),
     shareReplay({ bufferSize: 1, refCount: true }),
@@ -49,6 +59,83 @@ export class MarketplaceShowPage {
     ),
   )
 
+  readonly conflict$: Observable<string> = combineLatest([
+    this.pkg$,
+    this.patch.watch$('packageData', this.pkgId).pipe(
+      map(pkg => getManifest(pkg).version),
+      pairwise(),
+      filter(([prev, curr]) => prev !== curr),
+      map(([_, curr]) => curr),
+    ),
+    this.patch.watch$('serverInfo').pipe(first()),
+  ]).pipe(
+    map(([pkg, localVersion, server]) => {
+      let conflicts: string[] = []
+
+      // OS version
+      if (
+        !Version.parse(pkg.osVersion).satisfies(
+          VersionRange.parse(server.packageVersionCompat),
+        )
+      ) {
+        const compare = Version.parse(pkg.osVersion).compare(
+          Version.parse(server.version),
+        )
+        conflicts.push(
+          compare === 'greater'
+            ? `Minimum StartOS version ${pkg.osVersion}. Detected ${server.version}`
+            : `Version ${pkg.version} is outdated and cannot run newer versions of StartOS`,
+        )
+      }
+
+      // package version
+      if (
+        localVersion &&
+        pkg.sourceVersion &&
+        !this.exver.satisfies(localVersion, pkg.sourceVersion)
+      ) {
+        conflicts.push(
+          `Currently installed version ${localVersion} cannot be upgraded to version ${pkg.version}. Try installing an older version first.`,
+        )
+      }
+
+      const { arch, ram, device } = pkg.hardwareRequirements
+
+      // arch
+      if (arch && !arch.includes(server.arch)) {
+        conflicts.push(
+          `Arch ${server.arch} is not supported. Supported: ${arch.join(
+            ', ',
+          )}.`,
+        )
+      }
+
+      // ram
+      if (ram && ram > server.ram) {
+        conflicts.push(
+          `Minimum ${convertBytes(
+            ram,
+          )} of RAM required, detected ${convertBytes(server.ram)}.`,
+        )
+      }
+
+      // devices
+      conflicts.concat(
+        device
+          .filter(d =>
+            server.devices.some(
+              sd =>
+                d.class === sd.class && !new RegExp(d.pattern).test(sd.product),
+            ),
+          )
+          .map(d => d.patternDescription),
+      )
+
+      return conflicts.join(' ')
+    }),
+    shareReplay({ bufferSize: 1, refCount: true }),
+  )
+
   readonly flavors$ = this.route.queryParamMap.pipe(
     switchMap(paramMap =>
       this.marketplaceService.getSelectedStore$().pipe(
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 7e0aa9116..a2e672b20 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -117,7 +117,7 @@ export module Mock {
     assets: [],
     volumes: ['main'],
     hardwareRequirements: {
-      device: {},
+      device: [],
       arch: null,
       ram: null,
     },
@@ -174,7 +174,7 @@ export module Mock {
     assets: [],
     volumes: ['main'],
     hardwareRequirements: {
-      device: {},
+      device: [],
       arch: null,
       ram: null,
     },
@@ -224,7 +224,7 @@ export module Mock {
     assets: [],
     volumes: ['main'],
     hardwareRequirements: {
-      device: {},
+      device: [],
       arch: null,
       ram: null,
     },
@@ -253,7 +253,7 @@ export module Mock {
           '26.1.0:0.1.0': {
             title: 'Bitcoin Core',
             description: mockDescription,
-            hardwareRequirements: { arch: null, device: {}, ram: null },
+            hardwareRequirements: { arch: null, device: [], ram: null },
             license: 'mit',
             wrapperRepo: 'https://github.com/start9labs/bitcoind-startos',
             upstreamRepo: 'https://github.com/bitcoin/bitcoin',
@@ -286,7 +286,7 @@ export module Mock {
               short: 'An alternate fully verifying implementation of Bitcoin',
               long: 'Bitcoin Knots is a combined Bitcoin node and wallet. Not only is it easy to use, but it also ensures bitcoins you receive are both real bitcoins and really yours.',
             },
-            hardwareRequirements: { arch: null, device: {}, ram: null },
+            hardwareRequirements: { arch: null, device: [], ram: null },
             license: 'mit',
             wrapperRepo: 'https://github.com/start9labs/bitcoinknots-startos',
             upstreamRepo: 'https://github.com/bitcoinknots/bitcoin',
@@ -329,7 +329,7 @@ export module Mock {
           '26.1.0:0.1.0': {
             title: 'Bitcoin Core',
             description: mockDescription,
-            hardwareRequirements: { arch: null, device: {}, ram: null },
+            hardwareRequirements: { arch: null, device: [], ram: null },
             license: 'mit',
             wrapperRepo: 'https://github.com/start9labs/bitcoind-startos',
             upstreamRepo: 'https://github.com/bitcoin/bitcoin',
@@ -362,7 +362,7 @@ export module Mock {
               short: 'An alternate fully verifying implementation of Bitcoin',
               long: 'Bitcoin Knots is a combined Bitcoin node and wallet. Not only is it easy to use, but it also ensures bitcoins you receive are both real bitcoins and really yours.',
             },
-            hardwareRequirements: { arch: null, device: {}, ram: null },
+            hardwareRequirements: { arch: null, device: [], ram: null },
             license: 'mit',
             wrapperRepo: 'https://github.com/start9labs/bitcoinknots-startos',
             upstreamRepo: 'https://github.com/bitcoinknots/bitcoin',
@@ -407,7 +407,7 @@ export module Mock {
           '0.17.5:0': {
             title: 'LND',
             description: mockDescription,
-            hardwareRequirements: { arch: null, device: {}, ram: null },
+            hardwareRequirements: { arch: null, device: [], ram: null },
             license: 'mit',
             wrapperRepo: 'https://github.com/start9labs/lnd-startos',
             upstreamRepo: 'https://github.com/lightningnetwork/lnd',
@@ -463,7 +463,7 @@ export module Mock {
           '0.17.4-beta:1.0-alpha': {
             title: 'LND',
             description: mockDescription,
-            hardwareRequirements: { arch: null, device: {}, ram: null },
+            hardwareRequirements: { arch: null, device: [], ram: null },
             license: 'mit',
             wrapperRepo: 'https://github.com/start9labs/lnd-startos',
             upstreamRepo: 'https://github.com/lightningnetwork/lnd',
@@ -521,7 +521,7 @@ export module Mock {
           '0.3.2.6:0': {
             title: 'Bitcoin Proxy',
             description: mockDescription,
-            hardwareRequirements: { arch: null, device: {}, ram: null },
+            hardwareRequirements: { arch: null, device: [], ram: null },
             license: 'mit',
             wrapperRepo: 'https://github.com/Start9Labs/btc-rpc-proxy-wrappers',
             upstreamRepo: 'https://github.com/Kixunil/btc-rpc-proxy',
@@ -565,7 +565,7 @@ export module Mock {
         '27.0.0:1.0.0': {
           title: 'Bitcoin Core',
           description: mockDescription,
-          hardwareRequirements: { arch: null, device: {}, ram: null },
+          hardwareRequirements: { arch: null, device: [], ram: null },
           license: 'mit',
           wrapperRepo: 'https://github.com/start9labs/bitcoind-startos',
           upstreamRepo: 'https://github.com/bitcoin/bitcoin',
@@ -598,7 +598,7 @@ export module Mock {
             short: 'An alternate fully verifying implementation of Bitcoin',
             long: 'Bitcoin Knots is a combined Bitcoin node and wallet. Not only is it easy to use, but it also ensures bitcoins you receive are both real bitcoins and really yours.',
           },
-          hardwareRequirements: { arch: null, device: {}, ram: null },
+          hardwareRequirements: { arch: null, device: [], ram: null },
           license: 'mit',
           wrapperRepo: 'https://github.com/start9labs/bitcoinknots-startos',
           upstreamRepo: 'https://github.com/bitcoinknots/bitcoin',
@@ -641,7 +641,7 @@ export module Mock {
         '0.18.0:0.0.1': {
           title: 'LND',
           description: mockDescription,
-          hardwareRequirements: { arch: null, device: {}, ram: null },
+          hardwareRequirements: { arch: null, device: [], ram: null },
           license: 'mit',
           wrapperRepo: 'https://github.com/start9labs/lnd-startos',
           upstreamRepo: 'https://github.com/lightningnetwork/lnd',
@@ -697,7 +697,7 @@ export module Mock {
         '0.3.2.7:0': {
           title: 'Bitcoin Proxy',
           description: mockDescription,
-          hardwareRequirements: { arch: null, device: {}, ram: null },
+          hardwareRequirements: { arch: null, device: [], ram: null },
           license: 'mit',
           wrapperRepo: 'https://github.com/Start9Labs/btc-rpc-proxy-wrappers',
           upstreamRepo: 'https://github.com/Kixunil/btc-rpc-proxy',
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index d5989affa..797fde614 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -60,7 +60,7 @@ export const mockPatchData: DataModel = {
     // password is asdfasdf
     passwordHash:
       '$argon2d$v=19$m=1024,t=1,p=1$YXNkZmFzZGZhc2RmYXNkZg$Ceev1I901G6UwU+hY0sHrFZ56D+o+LNJ',
-    versionCompat: '>=0.3.0 <=0.3.6',
+    packageVersionCompat: '>=0.3.0 <=0.3.6',
     postInitMigrationTodos: [],
     statusInfo: {
       backupProgress: null,
@@ -83,6 +83,8 @@ export const mockPatchData: DataModel = {
       selected: null,
       lastRegion: null,
     },
+    ram: 8 * 1024 * 1024 * 1024,
+    devices: [],
   },
   packageData: {
     bitcoind: {
diff --git a/web/projects/ui/src/app/services/eos.service.ts b/web/projects/ui/src/app/services/eos.service.ts
index c61c667e3..5c1b2c5ee 100644
--- a/web/projects/ui/src/app/services/eos.service.ts
+++ b/web/projects/ui/src/app/services/eos.service.ts
@@ -6,7 +6,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { PatchDB } from 'patch-db-client'
 import { getServerInfo } from 'src/app/util/get-server-info'
 import { DataModel } from './patch-db/data-model'
-import { Exver } from '@start9labs/shared'
+import { Version } from '@start9labs/start-sdk'
 
 @Injectable({
   providedIn: 'root',
@@ -48,14 +48,14 @@ export class EOSService {
   constructor(
     private readonly api: ApiService,
     private readonly patch: PatchDB<DataModel>,
-    private readonly exver: Exver,
   ) {}
 
   async loadEos(): Promise<void> {
     const { version, id } = await getServerInfo(this.patch)
     this.osUpdate = await this.api.checkOSUpdate({ serverId: id })
     const updateAvailable =
-      this.exver.compareOsVersion(this.osUpdate.version, version) === 'greater'
+      Version.parse(this.osUpdate.version).compare(Version.parse(version)) ===
+      'greater'
     this.updateAvailable$.next(updateAvailable)
   }
 }

From 8e0db2705fd9cea06e1cf03405dfd00b99ac2674 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:38:24 -0600
Subject: [PATCH 304/341] Fix/mac start cli packing (#2767)

* wip

* wip: Adding more of the docker for the mac build

* fix: Running a build

* chore: Make the code a little cleaner

* optimize: reduce docker image size for mac-tar2sqfs

* feat: Update sdk-utils container usage and Dockerfile

* feat: Publish SDK Utils Container image

* clean up ...

* feat: Add manual input to control tagging Docker image as 'latest'

* fix: Update workflow input handling

* switch to different repo and clean

---------

Co-authored-by: Mariusz Kogen <k0gen@pm.me>
Co-authored-by: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
---
 core/startos/src/s9pk/v2/pack.rs | 38 ++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index 27cad6e92..1911152c4 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -62,9 +62,7 @@ impl SqfsDir {
                 let guid = Guid::new();
                 let path = self.tmpdir.join(guid.as_ref()).with_extension("squashfs");
                 if self.path.extension().and_then(|s| s.to_str()) == Some("tar") {
-                    Command::new("tar2sqfs")
-                        .arg("-q")
-                        .arg(&path)
+                    tar2sqfs(&self.path)?
                         .input(Some(&mut open_file(&self.path).await?))
                         .invoke(ErrorKind::Filesystem)
                         .await?;
@@ -553,7 +551,7 @@ impl ImageSource {
                     Command::new(CONTAINER_TOOL)
                         .arg("export")
                         .arg(container.trim())
-                        .pipe(Command::new("tar2sqfs").arg("-q").arg(&dest))
+                        .pipe(&mut tar2sqfs(&dest)?)
                         .capture(false)
                         .invoke(ErrorKind::Docker)
                         .await?;
@@ -575,6 +573,38 @@ impl ImageSource {
     }
 }
 
+fn tar2sqfs(dest: impl AsRef<Path>) -> Result<Command, Error> {
+    let dest = dest.as_ref();
+
+    Ok({
+        #[cfg(target_os = "linux")]
+        {
+            let mut command = Command::new("tar2sqfs");
+            command.arg(&dest);
+            command
+        }
+        #[cfg(target_os = "macos")]
+        {
+            let directory = dest
+                .parent()
+                .unwrap_or_else(|| Path::new("/"))
+                .to_path_buf();
+            let mut command = Command::new(CONTAINER_TOOL);
+            command
+                .arg("run")
+                .arg("-i")
+                .arg("--rm")
+                .arg("-v")
+                .arg(format!("{}:/data:rw", directory.display()))
+                .arg("ghcr.io/start9labs/sdk/utils:latest")
+                .arg("tar2sqfs")
+                .arg("-q")
+                .arg(Path::new("/data").join(&dest.file_name().unwrap_or_default()));
+            command
+        }
+    })
+}
+
 #[derive(Debug, Clone, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]

From 480f5c1a9af662ed27096c7273c375289a710613 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Wed, 30 Oct 2024 09:15:24 -0600
Subject: [PATCH 305/341] pi 5 support (#2640)

* prioritize raspi repo

* change kernel

* use newer kernel

* Update build.sh

* fix ssh keygen

* switch to .com

* use raspi-update to download firmware

* Update build.sh

* Update build.sh

* Update build.sh

* Update build.sh

* switch to boot/firmware

* fix fstab

* update-initramfs

* skip check partition

* switch back to boot

* fix initramfs

* use rpi-update kernels

* simplify kernel selection
---
 core/startos/src/util/mod.rs                  |  8 ++----
 debian/postinst                               |  1 +
 image-recipe/build.sh                         | 27 +++++++------------
 image-recipe/raspberrypi/img/etc/fstab        |  4 +--
 .../usr/lib/startos/scripts/init_resize.sh    |  2 +-
 .../raspberrypi/squashfs/boot/config.txt      |  3 ++-
 6 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index f26bfa6b5..0f3563018 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -236,11 +236,7 @@ impl<'a> Invoke<'a> for ExtendedCommand<'a> {
                     .or(Some(&res.stdout))
                     .filter(|a| !a.is_empty())
                     .and_then(|a| std::str::from_utf8(a).ok())
-                    .unwrap_or(&format!(
-                        "{} exited with code {}",
-                        self.cmd.as_std().get_program().to_string_lossy(),
-                        res.status
-                    ))
+                    .unwrap_or(&format!("{} exited with code {}", cmd_str, res.status))
             );
             Ok(res.stdout)
         } else {
@@ -267,7 +263,7 @@ impl<'a> Invoke<'a> for ExtendedCommand<'a> {
                 if prev.is_some() {
                     cmd.stdin(Stdio::piped());
                 }
-                let mut child = cmd.spawn().with_kind(error_kind)?;
+                let mut child = cmd.spawn().with_ctx(|_| (error_kind, &cmd_str))?;
                 let input = std::mem::replace(
                     &mut prev,
                     child
diff --git a/debian/postinst b/debian/postinst
index bbf61f344..6e2e1383a 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -80,6 +80,7 @@ sed -i '/\(^\|#\)ForwardToSyslog=/c\ForwardToSyslog=no' /etc/systemd/journald.co
 sed -i '/^\s*#\?\s*issue_discards\s*=\s*/c\issue_discards = 1' /etc/lvm/lvm.conf
 sed -i '/\(^\|#\)\s*unqualified-search-registries\s*=\s*/c\unqualified-search-registries = ["docker.io"]' /etc/containers/registries.conf
 sed -i 's/\(#\|\^\)\s*\([^=]\+\)=\(suspend\|hibernate\)\s*$/\2=ignore/g' /etc/systemd/logind.conf
+sed -i '/\(^\|#\)MulticastDNS=/c\MulticastDNS=no' /etc/systemd/resolved.conf
 
 mkdir -p /etc/nginx/ssl
 
diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index c183218ff..ea88824d0 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -61,14 +61,7 @@ PLATFORM_CONFIG_EXTRAS=
 if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --firmware-binary false"
 	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --firmware-chroot false"
-	# BEGIN stupid ugly hack
-	# The actual name of the package is `raspberrypi-kernel`
-	# live-build determines thte name of the package for the kernel by combining the `linux-packages` flag, with the `linux-flavours` flag
-	# the `linux-flavours` flag defaults to the architecture, so there's no way to remove the suffix.
-	# So we're doing this, cause thank the gods our package name contains a hypen. Cause if it didn't we'd be SOL
-	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --linux-packages raspberrypi"
-	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --linux-flavours kernel"
-	# END stupid ugly hack
+	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --linux-flavours rpi-v8"
 elif [ "${IB_TARGET_PLATFORM}" = "rockchip64" ]; then
 	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --linux-flavours rockchip64"
 fi
@@ -148,13 +141,13 @@ sed -i -e '2i set timeout=5' config/bootloaders/grub-pc/config.cfg
 mkdir -p config/archives
 
 if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
-	curl -fsSL https://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o config/archives/raspi.key
-	echo "deb https://archive.raspberrypi.org/debian/ bullseye main" > config/archives/raspi.list
+	curl -fsSL https://archive.raspberrypi.com/debian/raspberrypi.gpg.key | gpg --dearmor -o config/archives/raspi.key
+	echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/raspi.key.gpg] https://archive.raspberrypi.com/debian/ ${IB_SUITE} main" > config/archives/raspi.list
 fi
 
 cat > config/archives/backports.pref <<- EOF
 Package: *
-Pin: release a=stable-backports
+Pin: release n=${IB_SUITE}-backports
 Pin-Priority: 500
 EOF
 
@@ -180,7 +173,7 @@ if [ "$NON_FREE" = 1 ]; then
 fi
 
 if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
-	echo 'raspberrypi-bootloader rpi-update parted' > config/package-lists/bootloader.list.chroot
+	echo 'raspberrypi-net-mods raspberrypi-sys-mods raspi-config raspi-firmware raspi-gpio raspi-utils rpi-eeprom rpi-update rpi.gpio-common parted' > config/package-lists/bootloader.list.chroot
 else
 	echo 'grub-efi grub2-common' > config/package-lists/bootloader.list.chroot
 fi
@@ -205,17 +198,15 @@ if [ "${IB_SUITE}" = bookworm ]; then
 fi
 
 if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
+	ln -sf /usr/bin/pi-beep /usr/local/bin/beep
+	SKIP_WARNING=1 SKIP_BOOTLOADER=1 SKIP_CHECK_PARTITION=1 WANT_64BIT=1 WANT_PI4=1 WANT_PI5=1 BOOT_PART=/boot rpi-update stable
 	for f in /usr/lib/modules/*; do
     	v=\${f#/usr/lib/modules/}
 		echo "Configuring raspi kernel '\$v'"
     	extract-ikconfig "/usr/lib/modules/\$v/kernel/kernel/configs.ko.xz" > /boot/config-\$v
-		update-initramfs -c -k \$v
 	done
-	ln -sf /usr/bin/pi-beep /usr/local/bin/beep
-	wget https://archive.raspberrypi.org/debian/pool/main/w/wireless-regdb/wireless-regdb_2018.05.09-0~rpt1_all.deb
-	echo 1b7b1076257726609535b71d146a5721622d19a0843061ee7568188e836dd10f wireless-regdb_2018.05.09-0~rpt1_all.deb | sha256sum -c
-	apt-get install -y --allow-downgrades ./wireless-regdb_2018.05.09-0~rpt1_all.deb
-	rm wireless-regdb_2018.05.09-0~rpt1_all.deb
+	mkinitramfs -c gzip -o /boot/initramfs8 6.6.51-v8+
+	mkinitramfs -c gzip -o /boot/initramfs_2712 6.6.51-v8-16k+
 fi
 
 useradd --shell /bin/bash -G embassy -m start9
diff --git a/image-recipe/raspberrypi/img/etc/fstab b/image-recipe/raspberrypi/img/etc/fstab
index 816b32bcd..5f5164232 100644
--- a/image-recipe/raspberrypi/img/etc/fstab
+++ b/image-recipe/raspberrypi/img/etc/fstab
@@ -1,2 +1,2 @@
-/dev/mmcblk0p1  /boot       vfat    umask=0077  0   2
-/dev/mmcblk0p2  /           ext4    defaults    0   1
+/dev/mmcblk0p1  /boot   vfat    umask=0077  0   2
+/dev/mmcblk0p2  /       ext4    defaults    0   1
diff --git a/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh b/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
index 9e357cd57..1fdca1c83 100755
--- a/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
+++ b/image-recipe/raspberrypi/img/usr/lib/startos/scripts/init_resize.sh
@@ -94,7 +94,7 @@ main () {
     return 1
   fi
 
-  if ! mkdir -p /media/startos/config/overlay/etc/ssh && ssh-keygen -A -f /media/startos/config/overlay/; then
+  if ! (mkdir -p /media/startos/config/overlay/etc/ssh && ssh-keygen -A -f /media/startos/config/overlay/); then
     FAIL_REASON="ssh host key generation failed"
     return 1
   fi
diff --git a/image-recipe/raspberrypi/squashfs/boot/config.txt b/image-recipe/raspberrypi/squashfs/boot/config.txt
index 17bd5dc4e..4e1962a65 100644
--- a/image-recipe/raspberrypi/squashfs/boot/config.txt
+++ b/image-recipe/raspberrypi/squashfs/boot/config.txt
@@ -83,4 +83,5 @@ arm_boost=1
 [all]
 gpu_mem=16
 dtoverlay=pwm-2chan,disable-bt
-initramfs initrd.img-6.1.21-v8+
+
+auto_initramfs=1
\ No newline at end of file

From 2091abeea23dc8009b0e565cbb0920e553290d97 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Wed, 30 Oct 2024 12:55:36 -0600
Subject: [PATCH 306/341] persist hostname in config overlay (#2769)

* persist hostname

* add migration

* fix version mismatch

* remove dmesg logging from build
---
 Makefile                                      |  2 +-
 core/Cargo.lock                               |  2 +-
 core/startos/Cargo.toml                       |  2 +-
 core/startos/src/context/setup.rs             |  4 +
 core/startos/src/diagnostic.rs                |  7 +-
 core/startos/src/os_install/mod.rs            | 17 +---
 core/startos/src/setup.rs                     |  7 ++
 core/startos/src/util/io.rs                   | 14 ++++
 core/startos/src/version/mod.rs               |  5 +-
 core/startos/src/version/v0_3_6_alpha_0.rs    | 83 +++++++++----------
 core/startos/src/version/v0_3_6_alpha_7.rs    | 13 +++
 image-recipe/build.sh                         | 13 +--
 sdk/base/lib/osBindings/SetupResult.ts        |  1 +
 web/package.json                              |  2 +-
 web/patchdb-ui-seed.json                      |  2 +-
 .../src/app/services/api/mock-api.service.ts  |  2 +
 .../modals/os-welcome/os-welcome.page.html    |  2 +-
 17 files changed, 105 insertions(+), 73 deletions(-)

diff --git a/Makefile b/Makefile
index d7ff9ec6c..c13beef94 100644
--- a/Makefile
+++ b/Makefile
@@ -213,7 +213,7 @@ emulate-reflash: $(ALL_TARGETS)
 	@if [ -z "$(REMOTE)" ]; then >&2 echo "Must specify REMOTE" && false; fi
 	$(call ssh,'sudo /usr/lib/startos/scripts/chroot-and-upgrade --create')
 	$(MAKE) install REMOTE=$(REMOTE) SSHPASS=$(SSHPASS) DESTDIR=/media/startos/next PLATFORM=$(PLATFORM)
-	$(call ssh,'sudo rm -f /media/startos/config/disk.guid')
+	$(call ssh,'sudo rm -f /media/startos/config/disk.guid /media/startos/config/overlay/etc/hostname')
 	$(call ssh,'sudo /media/startos/next/usr/lib/startos/scripts/chroot-and-upgrade --no-sync "apt-get install -y $(shell cat ./build/lib/depends)"')
 
 upload-ota: results/$(BASENAME).squashfs
diff --git a/core/Cargo.lock b/core/Cargo.lock
index cfa00f33f..acd2ceb32 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5051,7 +5051,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.6"
+version = "0.3.6-alpha.7"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 99384345d..77a710df7 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.6"
+version = "0.3.6-alpha.7"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index 999154977..96ec07700 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -21,6 +21,7 @@ use crate::account::AccountInfo;
 use crate::context::config::ServerConfig;
 use crate::context::RpcContext;
 use crate::disk::OsPartitionInfo;
+use crate::hostname::Hostname;
 use crate::init::init_postgres;
 use crate::prelude::*;
 use crate::progress::FullProgressTracker;
@@ -42,6 +43,8 @@ lazy_static::lazy_static! {
 pub struct SetupResult {
     pub tor_address: String,
     #[ts(type = "string")]
+    pub hostname: Hostname,
+    #[ts(type = "string")]
     pub lan_address: InternedString,
     pub root_ca: String,
 }
@@ -50,6 +53,7 @@ impl TryFrom<&AccountInfo> for SetupResult {
     fn try_from(value: &AccountInfo) -> Result<Self, Self::Error> {
         Ok(Self {
             tor_address: format!("https://{}", value.tor_key.public().get_onion_address()),
+            hostname: value.hostname.clone(),
             lan_address: value.hostname.lan_address(),
             root_ca: String::from_utf8(value.root_ca_cert.to_pem()?)?,
         })
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index 3eab3b16b..f0c142706 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -9,6 +9,7 @@ use rpc_toolkit::{
 use crate::context::{CliContext, DiagnosticContext, RpcContext};
 use crate::init::SYSTEM_REBUILD_PATH;
 use crate::shutdown::Shutdown;
+use crate::util::io::delete_file;
 use crate::Error;
 
 pub fn diagnostic<C: Context>() -> ParentHandler<C> {
@@ -95,9 +96,7 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
 }
 
 pub async fn forget_disk<C: Context>(_: C) -> Result<(), Error> {
-    let disk_guid = Path::new("/media/startos/config/disk.guid");
-    if tokio::fs::metadata(disk_guid).await.is_ok() {
-        tokio::fs::remove_file(disk_guid).await?;
-    }
+    delete_file("/media/startos/config/overlay/etc/hostname").await?;
+    delete_file("/media/startos/config/disk.guid").await?;
     Ok(())
 }
diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs
index a87a71209..4cd8aac2d 100644
--- a/core/startos/src/os_install/mod.rs
+++ b/core/startos/src/os_install/mod.rs
@@ -21,7 +21,7 @@ use crate::disk::OsPartitionInfo;
 use crate::net::utils::find_eth_iface;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::util::io::{open_file, TmpDir};
+use crate::util::io::{delete_file, open_file, TmpDir};
 use crate::util::serde::IoFormat;
 use crate::util::Invoke;
 use crate::ARCH;
@@ -180,18 +180,9 @@ pub async fn execute<C: Context>(
         {
             if let Err(e) = async {
                 // cp -r ${guard}/config /tmp/config
-                if tokio::fs::metadata(guard.path().join("config/upgrade"))
-                    .await
-                    .is_ok()
-                {
-                    tokio::fs::remove_file(guard.path().join("config/upgrade")).await?;
-                }
-                if tokio::fs::metadata(guard.path().join("config/disk.guid"))
-                    .await
-                    .is_ok()
-                {
-                    tokio::fs::remove_file(guard.path().join("config/disk.guid")).await?;
-                }
+                delete_file(guard.path().join("config/upgrade")).await?;
+                delete_file(guard.path().join("config/overlay/etc/hostname")).await?;
+                delete_file(guard.path().join("config/disk.guid")).await?;
                 Command::new("cp")
                     .arg("-r")
                     .arg(guard.path().join("config"))
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 642dd5476..1319ffae4 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -10,6 +10,7 @@ use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWriteExt;
+use tokio::process::Command;
 use tokio::try_join;
 use tracing::instrument;
 use ts_rs::TS;
@@ -36,6 +37,7 @@ use crate::progress::{FullProgress, PhaseProgressTrackerHandle};
 use crate::rpc_continuations::Guid;
 use crate::util::crypto::EncryptedWire;
 use crate::util::io::{create_file, dir_copy, dir_size, Counter};
+use crate::util::Invoke;
 use crate::{Error, ErrorKind, ResultExt};
 
 pub fn setup<C: Context>() -> ParentHandler<C> {
@@ -336,6 +338,11 @@ pub async fn complete(ctx: SetupContext) -> Result<SetupResult, Error> {
             let mut guid_file = create_file("/media/startos/config/disk.guid").await?;
             guid_file.write_all(ctx.disk_guid.as_bytes()).await?;
             guid_file.sync_all().await?;
+            Command::new("systemd-firstboot")
+                .arg("--root=/media/startos/config/overlay/")
+                .arg(format!("--hostname={}", res.hostname.0))
+                .invoke(ErrorKind::ParseSysInfo)
+                .await?;
             Ok(res.clone())
         }
         Some(Err(e)) => Err(e.clone_output()),
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index c3bf83d00..0e7aada54 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -923,6 +923,20 @@ pub async fn create_file(path: impl AsRef<Path>) -> Result<File, Error> {
         .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("create {path:?}")))
 }
 
+pub async fn delete_file(path: impl AsRef<Path>) -> Result<(), Error> {
+    let path = path.as_ref();
+    tokio::fs::remove_file(path)
+        .await
+        .or_else(|e| {
+            if e.kind() == std::io::ErrorKind::NotFound {
+                Ok(())
+            } else {
+                Err(e)
+            }
+        })
+        .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("delete {path:?}")))
+}
+
 pub async fn rename(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> Result<(), Error> {
     let src = src.as_ref();
     let dst = dst.as_ref();
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index bc8deea17..10a02d63b 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -306,7 +306,10 @@ where
         Ok(())
     }
     /// MUST be idempotent, and is run after *all* db migrations
-    fn post_up(self, ctx: &RpcContext) -> impl Future<Output = Result<(), Error>> + Send + 'static {
+    fn post_up<'a>(
+        self,
+        ctx: &'a RpcContext,
+    ) -> impl Future<Output = Result<(), Error>> + Send + 'a {
         async { Ok(()) }
     }
     fn down(self, db: &mut Value) -> Result<(), Error> {
diff --git a/core/startos/src/version/v0_3_6_alpha_0.rs b/core/startos/src/version/v0_3_6_alpha_0.rs
index 2f4b141b4..7a6045a3a 100644
--- a/core/startos/src/version/v0_3_6_alpha_0.rs
+++ b/core/startos/src/version/v0_3_6_alpha_0.rs
@@ -19,6 +19,10 @@ use torut::onion::TorSecretKeyV3;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_5_2, VersionT};
+use crate::account::AccountInfo;
+use crate::auth::Sessions;
+use crate::backup::target::cifs::CifsTargets;
+use crate::context::RpcContext;
 use crate::db::model::Database;
 use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::util::unmount;
@@ -26,19 +30,15 @@ use crate::hostname::Hostname;
 use crate::net::forward::AvailablePorts;
 use crate::net::keys::KeyStore;
 use crate::net::ssl::CertStore;
+use crate::net::tor;
 use crate::net::tor::OnionStore;
 use crate::notifications::{Notification, Notifications};
 use crate::prelude::*;
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::ssh::{SshKeys, SshPubKey};
 use crate::util::crypto::ed25519_expand_key;
 use crate::util::serde::{Pem, PemEncoding};
 use crate::util::Invoke;
-use crate::{account::AccountInfo, net::tor};
-use crate::{auth::Sessions, context::RpcContext};
-use crate::{
-    backup::target::cifs::CifsTargets,
-    s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile,
-};
 
 lazy_static::lazy_static! {
     static ref V0_3_6_alpha_0: exver::Version = exver::Version::new(
@@ -328,61 +328,58 @@ impl VersionT for Version {
 
     #[instrument(skip(self, ctx))]
     /// MUST be idempotent, and is run after *all* db migrations
-    fn post_up(self, ctx: &RpcContext) -> impl Future<Output = Result<(), Error>> + Send + 'static {
-        let ctx = ctx.clone();
-        async move {
-            let path = Path::new("/embassy-data/package-data/archive/");
+    async fn post_up(self, ctx: &RpcContext) -> Result<(), Error> {
+        let path = Path::new("/embassy-data/package-data/archive/");
+        if !path.is_dir() {
+            return Err(Error::new(
+                eyre!(
+                    "expected path ({}) to be a directory",
+                    path.to_string_lossy()
+                ),
+                ErrorKind::Filesystem,
+            ));
+        }
+        // Should be the name of the package
+        let mut paths = tokio::fs::read_dir(path).await?;
+        while let Some(path) = paths.next_entry().await? {
+            let path = path.path();
             if !path.is_dir() {
-                return Err(Error::new(
-                    eyre!(
-                        "expected path ({}) to be a directory",
-                        path.to_string_lossy()
-                    ),
-                    ErrorKind::Filesystem,
-                ));
+                continue;
             }
-            // Should be the name of the package
+            // Should be the version of the package
             let mut paths = tokio::fs::read_dir(path).await?;
             while let Some(path) = paths.next_entry().await? {
                 let path = path.path();
                 if !path.is_dir() {
                     continue;
                 }
-                // Should be the version of the package
+
+                // Should be s9pk
                 let mut paths = tokio::fs::read_dir(path).await?;
                 while let Some(path) = paths.next_entry().await? {
                     let path = path.path();
-                    if !path.is_dir() {
+                    if path.is_dir() {
                         continue;
                     }
 
-                    // Should be s9pk
-                    let mut paths = tokio::fs::read_dir(path).await?;
-                    while let Some(path) = paths.next_entry().await? {
-                        let path = path.path();
-                        if path.is_dir() {
-                            continue;
-                        }
-
-                        let package_s9pk = tokio::fs::File::open(path).await?;
-                        let file = MultiCursorFile::open(&package_s9pk).await?;
+                    let package_s9pk = tokio::fs::File::open(path).await?;
+                    let file = MultiCursorFile::open(&package_s9pk).await?;
 
-                        let key = ctx.db.peek().await.into_private().into_compat_s9pk_key();
-                        ctx.services
-                            .install(
-                                ctx.clone(),
-                                || crate::s9pk::load(file.clone(), || Ok(key.de()?.0), None),
-                                None::<crate::util::Never>,
-                                None,
-                            )
-                            .await?
-                            .await?
-                            .await?;
-                    }
+                    let key = ctx.db.peek().await.into_private().into_compat_s9pk_key();
+                    ctx.services
+                        .install(
+                            ctx.clone(),
+                            || crate::s9pk::load(file.clone(), || Ok(key.de()?.0), None),
+                            None::<crate::util::Never>,
+                            None,
+                        )
+                        .await?
+                        .await?
+                        .await?;
                 }
             }
-            Ok(())
         }
+        Ok(())
     }
 }
 
diff --git a/core/startos/src/version/v0_3_6_alpha_7.rs b/core/startos/src/version/v0_3_6_alpha_7.rs
index 75c0af72f..bbf9468ff 100644
--- a/core/startos/src/version/v0_3_6_alpha_7.rs
+++ b/core/startos/src/version/v0_3_6_alpha_7.rs
@@ -1,9 +1,11 @@
 use exver::{PreReleaseSegment, VersionRange};
 use imbl_value::{json, InOMap};
+use tokio::process::Command;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_6, VersionT};
 use crate::prelude::*;
+use crate::util::Invoke;
 
 lazy_static::lazy_static! {
     static ref V0_3_6_alpha_7: exver::Version = exver::Version::new(
@@ -44,6 +46,17 @@ impl VersionT for Version {
         }
         Ok(())
     }
+    async fn post_up(self, ctx: &crate::context::RpcContext) -> Result<(), Error> {
+        Command::new("systemd-firstboot")
+            .arg("--root=/media/startos/config/overlay/")
+            .arg(format!(
+                "--hostname={}",
+                ctx.account.read().await.hostname.0
+            ))
+            .invoke(ErrorKind::ParseSysInfo)
+            .await?;
+        Ok(())
+    }
     fn down(self, _db: &mut Value) -> Result<(), Error> {
         Ok(())
     }
diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index ea88824d0..ae1831704 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -57,13 +57,14 @@ if [ "$NON_FREE" = 1 ]; then
 	fi
 fi
 
-PLATFORM_CONFIG_EXTRAS=
+PLATFORM_CONFIG_EXTRAS=()
 if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
-	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --firmware-binary false"
-	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --firmware-chroot false"
-	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --linux-flavours rpi-v8"
+	PLATFORM_CONFIG_EXTRAS+=( --firmware-binary false )
+	PLATFORM_CONFIG_EXTRAS+=( --firmware-chroot false )
+	PLATFORM_CONFIG_EXTRAS+=( --linux-packages linux-image-6.6.51+rpt )
+	PLATFORM_CONFIG_EXTRAS+=( --linux-flavours "rpi-v8 rpi-2712" )
 elif [ "${IB_TARGET_PLATFORM}" = "rockchip64" ]; then
-	PLATFORM_CONFIG_EXTRAS="$PLATFORM_CONFIG_EXTRAS --linux-flavours rockchip64"
+	PLATFORM_CONFIG_EXTRAS+=( --linux-flavours rockchip64 )
 fi
 
 
@@ -87,7 +88,7 @@ lb config \
 	--bootstrap-qemu-arch ${IB_TARGET_ARCH} \
 	--bootstrap-qemu-static /usr/bin/qemu-${QEMU_ARCH}-static \
 	--archive-areas "${ARCHIVE_AREAS}" \
-	$PLATFORM_CONFIG_EXTRAS
+	${PLATFORM_CONFIG_EXTRAS[@]}
 
 # Overlays
 
diff --git a/sdk/base/lib/osBindings/SetupResult.ts b/sdk/base/lib/osBindings/SetupResult.ts
index 464aeb4b7..d81c7f039 100644
--- a/sdk/base/lib/osBindings/SetupResult.ts
+++ b/sdk/base/lib/osBindings/SetupResult.ts
@@ -2,6 +2,7 @@
 
 export type SetupResult = {
   torAddress: string
+  hostname: string
   lanAddress: string
   rootCa: string
 }
diff --git a/web/package.json b/web/package.json
index e900277c4..f1146118d 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.6",
+  "version": "0.3.6-alpha.7",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 5862c6f83..3256bb87c 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -21,5 +21,5 @@
   "ackInstructions": {},
   "theme": "Dark",
   "widgets": [],
-  "ack-welcome": "0.3.6-alpha.6"
+  "ack-welcome": "0.3.6-alpha.7"
 }
diff --git a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
index a5757b010..a17f56a0c 100644
--- a/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
+++ b/web/projects/setup-wizard/src/app/services/api/mock-api.service.ts
@@ -137,6 +137,7 @@ export class MockApiService extends ApiService {
         return {
           status: 'complete',
           torAddress: 'https://asdafsadasdasasdasdfasdfasdf.onion',
+          hostname: 'adjective-noun',
           lanAddress: 'https://adjective-noun.local',
           rootCa: encodeBase64(rootCA),
         }
@@ -283,6 +284,7 @@ export class MockApiService extends ApiService {
     await pauseFor(1000)
     return {
       torAddress: 'https://asdafsadasdasasdasdfasdfasdf.onion',
+      hostname: 'adjective-noun',
       lanAddress: 'https://adjective-noun.local',
       rootCa: encodeBase64(rootCA),
     }
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 2a43292ad..3e4fe52f3 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,7 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6-alpha.6</h4>
+  <h4>0.3.6-alpha.7</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
   <h6>
     Expect that any data you create or store on this version of the OS can be

From 88320488a7cbea8385f3513eeb19d72d9cbd715b Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:41:06 -0600
Subject: [PATCH 307/341] fix: Actions like the action don't give the results
 (#2770)

---
 container-runtime/src/Adapters/RpcListener.ts       | 13 +++++++------
 .../src/Adapters/Systems/SystemForStartOs.ts        |  8 +-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index f84f7b282..3e86e60d1 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -136,11 +136,13 @@ const jsonParse = (x: string) => JSON.parse(x)
 
 const handleRpc = (id: IdType, result: Promise<RpcResult>) =>
   result
-    .then((result) => ({
-      jsonrpc,
-      id,
-      ...result,
-    }))
+    .then((result) => {
+      return {
+        jsonrpc,
+        id,
+        ...result,
+      }
+    })
     .then((x) => {
       if (
         ("result" in x && x.result === undefined) ||
@@ -413,7 +415,6 @@ export class RpcListener {
     const ensureResultTypeShape = (
       result: void | T.ActionInput | T.ActionResult | null,
     ): { result: any } => {
-      if (isResult(result)) return result
       return { result }
     }
     const callbacks = this.callbackHolderFor(procedure)
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 51b7c24b8..334764a87 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -1,12 +1,6 @@
-import { ExecuteResult, Procedure, System } from "../../Interfaces/System"
-import { unNestPath } from "../../Models/JsonPath"
-import matches, { any, number, object, string, tuple } from "ts-matches"
+import { System } from "../../Interfaces/System"
 import { Effects } from "../../Models/Effects"
-import { RpcResult, matchRpcResult } from "../RpcListener"
-import { duration } from "../../Models/Duration"
 import { T, utils } from "@start9labs/start-sdk"
-import { Volume } from "../../Models/Volume"
-import { CallbackHolder } from "../../Models/CallbackHolder"
 import { Optional } from "ts-matches/lib/parsers/interfaces"
 
 export const STARTOS_JS_LOCATION = "/usr/lib/startos/package/index.js"

From 5ab2efa0c0e768534d88a772370971b499249c00 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Tue, 5 Nov 2024 10:49:38 -0700
Subject: [PATCH 308/341] wip(fix): Working on fixing the migration. (#2771)

* wip(fix): Working on fixing the migration.

* get s9pk compat key

* wip: Change to just using the archive to not use the manifest parsing.

* fix: Fix the rebuild

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 code                                       | 690 +++++++++++++++++++++
 core/startos/src/s9pk/v2/mod.rs            |  28 +-
 core/startos/src/version/mod.rs            |   6 +-
 core/startos/src/version/v0_3_6_alpha_8.rs | 125 ++++
 4 files changed, 843 insertions(+), 6 deletions(-)
 create mode 100644 code
 create mode 100644 core/startos/src/version/v0_3_6_alpha_8.rs

diff --git a/code b/code
new file mode 100644
index 000000000..2a071fb30
--- /dev/null
+++ b/code
@@ -0,0 +1,690 @@
+{
+  "id": 4228,
+  "value": {
+    "serverInfo": {
+      "arch": "x86_64",
+      "platform": "x86_64",
+      "id": "81260ce3-b6f2-471e-a77e-0250c11fb907",
+      "hostname": "tasty-mahogany",
+      "version": "0.3.6-alpha.7",
+      "lastBackup": null,
+      "lanAddress": "https://tasty-mahogany.local/",
+      "postInitMigrationTodos": [],
+      "torAddress": "https://4iqvmnjyqlqiq2nfavk7emhyjwhq6s454oubur4givisxblfdwxfj6ad.onion/",
+      "onionAddress": "4iqvmnjyqlqiq2nfavk7emhyjwhq6s454oubur4givisxblfdwxfj6ad",
+      "ipInfo": {
+        "enp8s0": {
+          "ipv4Range": "192.168.122.86/24",
+          "ipv6Range": null,
+          "ipv4": "192.168.122.86",
+          "ipv6": null
+        }
+      },
+      "statusInfo": {
+        "backupProgress": null,
+        "updated": false,
+        "updateProgress": null,
+        "shuttingDown": false,
+        "restarting": false
+      },
+      "wifi": {
+        "ssids": [],
+        "selected": null,
+        "interface": null,
+        "lastRegion": null
+      },
+      "unreadNotificationCount": 0,
+      "passwordHash": "$argon2id$v=19$m=65536,t=3,p=1$qZNXS7Xk+qeOfi7ZO18OpA$VHr96ABySCvi/fa5p+N+SY8XJ/FyhxVp3LlBxmxQa6Y",
+      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1ThH4SGEGzCFoKlkmMw3tNXvx975xXKEn/dNnBDEGb",
+      "caFingerprint": "88:CF:91:19:FC:35:18:E8:B1:8E:B1:36:53:B2:22:6A:EA:5B:58:E6:35:7A:A5:82:1B:39:1:D5:E4:F8:57:3C",
+      "ntpSynced": true,
+      "zram": true,
+      "governor": null,
+      "smtp": null,
+      "devices": [
+        {
+          "class": "processor",
+          "product": "AMD Ryzen 9 5950X 16-Core Processor"
+        },
+        {
+          "class": "processor",
+          "product": "AMD Ryzen 9 5950X 16-Core Processor"
+        },
+        {
+          "class": "processor",
+          "product": "AMD Ryzen 9 5950X 16-Core Processor"
+        },
+        {
+          "class": "processor",
+          "product": "AMD Ryzen 9 5950X 16-Core Processor"
+        },
+        {
+          "class": "processor",
+          "product": "AMD Ryzen 9 5950X 16-Core Processor"
+        },
+        {
+          "class": "processor",
+          "product": "AMD Ryzen 9 5950X 16-Core Processor"
+        },
+        {
+          "class": "display",
+          "product": "Virtio 1.0 GPU"
+        }
+      ],
+      "packageVersionCompat": ">=0.3.0:0 <=0.3.6-alpha.7:0",
+      "ram": 10285481984
+    },
+    "packageData": {
+      "vaultwarden": {
+        "stateInfo": {
+          "state": "installed",
+          "manifest": {
+            "id": "vaultwarden",
+            "title": "Vaultwarden",
+            "version": "1.32.1:0",
+            "satisfies": [],
+            "releaseNotes": "* Updated to the latest upstream code with notable changes:\n  - Fixed syncing and login issues with native mobile clients\n* Full change log available [here](https://github.com/dani-garcia/vaultwarden/releases/tag/1.32.1)",
+            "canMigrateTo": "!",
+            "canMigrateFrom": "*",
+            "license": "AGPLv3",
+            "wrapperRepo": "https://github.com/Start9Labs/vaultwarden-startos",
+            "upstreamRepo": "https://github.com/dani-garcia/vaultwarden",
+            "supportSite": "https://vaultwarden.discourse.group/",
+            "marketingSite": "https://github.com/dani-garcia/vaultwarden/",
+            "donationUrl": "https://www.paypal.com/paypalme/DaniGG",
+            "description": {
+              "short": "Secure password management",
+              "long": "Vaultwarden is a lightweight and secure password manager for storing and auto-filling sensitive information such as usernames and passwords, credit cards, identities, and notes. It is an alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients. All data is stored in an encrypted vault on your server."
+            },
+            "images": {
+              "main": {
+                "source": "packed",
+                "arch": [
+                  "aarch64",
+                  "x86_64"
+                ],
+                "emulateMissingAs": null
+              }
+            },
+            "assets": [],
+            "volumes": [
+              "main"
+            ],
+            "alerts": {
+              "install": null,
+              "uninstall": null,
+              "restore": null,
+              "start": null,
+              "stop": null
+            },
+            "dependencies": {},
+            "hardwareRequirements": {
+              "device": [],
+              "ram": null,
+              "arch": [
+                "aarch64",
+                "x86_64"
+              ]
+            },
+            "gitHash": "74a504429097e933285782e1e4c425da5895d516\n",
+            "osVersion": "0.3.5.1"
+          }
+        },
+        "dataVersion": null,
+        "status": {
+          "main": "error",
+          "debug": "Error { source: \n   0: \u001b[91minvalid type: map, expected a sequence at line 1 column 1353\u001b[0m\n\nLocation:\n   \u001b[35m/home/rust/src/core/models/src/errors.rs\u001b[0m:\u001b[35m509\u001b[0m\n\n  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n   0: \u001b[91mstartos::s9pk::v2\u001b[0m\u001b[91m::\u001b[0m\u001b[91mdeserialize\u001b[0m\n      at \u001b[35mstartos/src/s9pk/v2/mod.rs\u001b[0m:\u001b[35m265\u001b[0m\n   1: \u001b[91mstartos::service\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/mod.rs\u001b[0m:\u001b[35m271\u001b[0m\n   2: \u001b[91mstartos::service::service_map\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/service_map.rs\u001b[0m:\u001b[35m80\u001b[0m\n\nBacktrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.\nRun with RUST_BACKTRACE=full to include source snippets., kind: Deserialization, revision: None }",
+          "message": "Deserialization Error: invalid type: map, expected a sequence at line 1 column 1353",
+          "onRebuild": "start"
+        },
+        "registry": null,
+        "developerKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAIwXjctXTc37QTXRYWxLxElY1r2NhoKJRrl604Nu/0l4=\n-----END PUBLIC KEY-----\n",
+        "icon": "data:image/png;base64,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",
+        "lastBackup": null,
+        "currentDependencies": {},
+        "actions": {
+          "config": {
+            "name": "Configure",
+            "description": "Customize Vaultwarden",
+            "warning": null,
+            "visibility": "enabled",
+            "allowedStatuses": "any",
+            "hasInput": true,
+            "group": null
+          },
+          "properties": {
+            "name": "Properties",
+            "description": "Runtime information, credentials, and other values of interest",
+            "warning": null,
+            "visibility": "enabled",
+            "allowedStatuses": "any",
+            "hasInput": false,
+            "group": null
+          }
+        },
+        "requestedActions": {},
+        "serviceInterfaces": {
+          "main-8080": {
+            "id": "main-8080",
+            "name": "Web Interface/Bitwarden Protocol",
+            "description": "Main user interface for interacting with Vaultwarden in a web browser. Also serves the bitwarden protocol.",
+            "hasPrimary": false,
+            "masked": false,
+            "addressInfo": {
+              "username": null,
+              "hostId": "main",
+              "internalPort": 8080,
+              "scheme": "http",
+              "sslScheme": "https",
+              "suffix": ""
+            },
+            "type": "ui"
+          }
+        },
+        "hosts": {
+          "main": {
+            "kind": "multi",
+            "bindings": {
+              "8080": {
+                "enabled": false,
+                "options": {
+                  "preferredExternalPort": 80,
+                  "addSsl": {
+                    "preferredExternalPort": 443,
+                    "alpn": {
+                      "specified": [
+                        "http/1.1"
+                      ]
+                    }
+                  },
+                  "secure": null
+                },
+                "lan": {
+                  "assignedPort": null,
+                  "assignedSslPort": 49152
+                }
+              },
+              "3443": {
+                "enabled": false,
+                "options": {
+                  "preferredExternalPort": 443,
+                  "addSsl": null,
+                  "secure": null
+                },
+                "lan": {
+                  "assignedPort": null,
+                  "assignedSslPort": null
+                }
+              }
+            },
+            "addresses": [
+              {
+                "kind": "onion",
+                "address": "mibog33n4dzldkve2uqm2muqkhrbnibkpu22rms6qrrhylwssuv7h2ad"
+              }
+            ],
+            "hostnameInfo": {}
+          }
+        },
+        "storeExposedDependents": []
+      },
+      "bitcoind": {
+        "stateInfo": {
+          "state": "installed",
+          "manifest": {
+            "id": "bitcoind",
+            "title": "Bitcoin Core",
+            "version": "27.1.0:0",
+            "satisfies": [],
+            "releaseNotes": "* Update Bitcoin to [v27.1](https://github.com/bitcoin/bitcoin/releases/tag/v27.1)\n* Add 'Reindex Chainstate' Action\n* Improve config descriptions and instructions\n* Notice! If Bitcoin gets stuck in \"Stopping\" status after the update, the solution is to restart your server. System -> Restart.\n",
+            "canMigrateTo": "!",
+            "canMigrateFrom": "*",
+            "license": "MIT",
+            "wrapperRepo": "https://github.com/Start9Labs/bitcoind-startos",
+            "upstreamRepo": "https://github.com/bitcoin/bitcoin",
+            "supportSite": "https://github.com/bitcoin/bitcoin/issues",
+            "marketingSite": "https://bitcoincore.org/",
+            "donationUrl": null,
+            "description": {
+              "short": "A Bitcoin Full Node by Bitcoin Core",
+              "long": "Bitcoin is an innovative payment network and a new kind of money. Bitcoin uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the issuing of bitcoins is carried out collectively by the network. Bitcoin is open-source; its design is public, nobody owns or controls Bitcoin and everyone can take part. Through many of its unique properties, Bitcoin allows exciting uses that could not be covered by any previous payment system."
+            },
+            "images": {
+              "compat": {
+                "source": "packed",
+                "arch": [
+                  "aarch64",
+                  "x86_64"
+                ],
+                "emulateMissingAs": null
+              },
+              "main": {
+                "source": "packed",
+                "arch": [
+                  "aarch64",
+                  "x86_64"
+                ],
+                "emulateMissingAs": null
+              }
+            },
+            "assets": [
+              "compat"
+            ],
+            "volumes": [
+              "main"
+            ],
+            "alerts": {
+              "install": null,
+              "uninstall": "Uninstalling Bitcoin Core will result in permanent loss of data. Without a backup, any funds stored on your node's default hot wallet will be lost forever. If you are unsure, we recommend making a backup, just to be safe.",
+              "restore": "Restoring Bitcoin Core will overwrite its current data. You will lose any transactions recorded in watch-only wallets, and any funds you have received to the hot wallet, since the last backup.",
+              "start": null,
+              "stop": null
+            },
+            "dependencies": {},
+            "hardwareRequirements": {
+              "device": [],
+              "ram": null,
+              "arch": null
+            },
+            "gitHash": "c995ed1b85f79135fde30a0c056fdb4ee465b50d\n",
+            "osVersion": "0.3.4.4"
+          }
+        },
+        "dataVersion": null,
+        "status": {
+          "main": "error",
+          "debug": "Error { source: \n   0: \u001b[91minvalid type: map, expected a sequence at line 1 column 1985\u001b[0m\n\nLocation:\n   \u001b[35m/home/rust/src/core/models/src/errors.rs\u001b[0m:\u001b[35m509\u001b[0m\n\n  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n   0: \u001b[91mstartos::s9pk::v2\u001b[0m\u001b[91m::\u001b[0m\u001b[91mdeserialize\u001b[0m\n      at \u001b[35mstartos/src/s9pk/v2/mod.rs\u001b[0m:\u001b[35m265\u001b[0m\n   1: \u001b[91mstartos::service\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/mod.rs\u001b[0m:\u001b[35m271\u001b[0m\n   2: \u001b[91mstartos::service::service_map\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/service_map.rs\u001b[0m:\u001b[35m80\u001b[0m\n\nBacktrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.\nRun with RUST_BACKTRACE=full to include source snippets., kind: Deserialization, revision: None }",
+          "message": "Deserialization Error: invalid type: map, expected a sequence at line 1 column 1985",
+          "onRebuild": "start"
+        },
+        "registry": null,
+        "developerKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAIwXjctXTc37QTXRYWxLxElY1r2NhoKJRrl604Nu/0l4=\n-----END PUBLIC KEY-----\n",
+        "icon": "data:image/png;base64,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",
+        "lastBackup": null,
+        "currentDependencies": {},
+        "actions": {
+          "delete-coinstatsindex": {
+            "name": "Delete Coinstats Index",
+            "description": "Deletes the Coinstats Index (coinstatsindex) in case it gets corrupted.",
+            "warning": "The Coinstats Index will be rebuilt once Bitcoin Core is started again, unless you deactivate it in the config settings. Please don't do this unless instructed to by Start9 support staff.",
+            "visibility": "enabled",
+            "allowedStatuses": "only-stopped",
+            "hasInput": true,
+            "group": null
+          },
+          "delete-peers": {
+            "name": "Delete Peer List",
+            "description": "Deletes the Peer List (peers.dat) in case it gets corrupted.",
+            "warning": null,
+            "visibility": "enabled",
+            "allowedStatuses": "only-stopped",
+            "hasInput": true,
+            "group": null
+          },
+          "delete-txindex": {
+            "name": "Delete Transaction Index",
+            "description": "Deletes the Transaction Index (txindex) in case it gets corrupted.",
+            "warning": "The Transaction Index will be rebuilt once Bitcoin Core is started again, unless you deactivate it in the config settings. Please don't do this unless instructed to by Start9 support staff.",
+            "visibility": "enabled",
+            "allowedStatuses": "only-stopped",
+            "hasInput": true,
+            "group": null
+          },
+          "reindex": {
+            "name": "Reindex Blockchain",
+            "description": "Rebuilds the block and chainstate databases starting from genesis. If blocks already exist on disk, these are used rather than being redownloaded. For pruned nodes, this means downloading the entire blockchain over again.",
+            "warning": "Blocks not stored on disk will be redownloaded in order to rebuild the database. If your node is pruned, this action is equivalent to syncing the node from scratch, so this process could take weeks on low-end hardware.",
+            "visibility": "enabled",
+            "allowedStatuses": "any",
+            "hasInput": true,
+            "group": null
+          },
+          "reindex-chainstate": {
+            "name": "Reindex Chainstate",
+            "description": "Rebuilds the chainstate database using existing block index data; as the block index is not rebuilt, 'reindex_chainstate' should be strictly faster than 'reindex'. This action should only be used in the case of chainstate corruption; if the blocks stored on disk are corrupted, the 'reindex' action will need to be run instead.",
+            "warning": "While faster than 'Reindex', 'Reindex Chainstate' can still take several days or more to complete. Pruned nodes do not allow 'reindex-chainstate'; if you are running a pruned node and suspect chainstate corruption the 'reindex' action (requiring redownloading the entire Blockchain) should be run instead.",
+            "visibility": "enabled",
+            "allowedStatuses": "any",
+            "hasInput": true,
+            "group": null
+          },
+          "config": {
+            "name": "Configure",
+            "description": "Customize Bitcoin Core",
+            "warning": null,
+            "visibility": "enabled",
+            "allowedStatuses": "any",
+            "hasInput": true,
+            "group": null
+          },
+          "properties": {
+            "name": "Properties",
+            "description": "Runtime information, credentials, and other values of interest",
+            "warning": null,
+            "visibility": "enabled",
+            "allowedStatuses": "any",
+            "hasInput": false,
+            "group": null
+          }
+        },
+        "requestedActions": {},
+        "serviceInterfaces": {
+          "peer-8333": {
+            "id": "peer-8333",
+            "name": "Peer Interface",
+            "description": "Listens for incoming connections from peers on the bitcoin network",
+            "hasPrimary": false,
+            "masked": false,
+            "addressInfo": {
+              "username": null,
+              "hostId": "peer",
+              "internalPort": 8333,
+              "scheme": null,
+              "sslScheme": null,
+              "suffix": ""
+            },
+            "type": "api"
+          },
+          "rpc-8332": {
+            "id": "rpc-8332",
+            "name": "RPC Interface",
+            "description": "Listens for JSON-RPC commands",
+            "hasPrimary": false,
+            "masked": false,
+            "addressInfo": {
+              "username": null,
+              "hostId": "rpc",
+              "internalPort": 8332,
+              "scheme": "http",
+              "sslScheme": "https",
+              "suffix": ""
+            },
+            "type": "api"
+          },
+          "zmq-28332": {
+            "id": "zmq-28332",
+            "name": "ZeroMQ Interface",
+            "description": "Listens for subscriptions to the ZeroMQ raw block and raw transaction event streams",
+            "hasPrimary": false,
+            "masked": false,
+            "addressInfo": {
+              "username": null,
+              "hostId": "zmq",
+              "internalPort": 28332,
+              "scheme": null,
+              "sslScheme": null,
+              "suffix": ""
+            },
+            "type": "api"
+          }
+        },
+        "hosts": {
+          "peer": {
+            "kind": "multi",
+            "bindings": {
+              "8333": {
+                "enabled": false,
+                "options": {
+                  "preferredExternalPort": 8333,
+                  "addSsl": null,
+                  "secure": null
+                },
+                "lan": {
+                  "assignedPort": null,
+                  "assignedSslPort": null
+                }
+              }
+            },
+            "addresses": [
+              {
+                "kind": "onion",
+                "address": "m27eb66v4tndzhowirshkysxt6rmt6iubmjxxc2l2leca7lphcbs7sid"
+              }
+            ],
+            "hostnameInfo": {}
+          },
+          "rpc": {
+            "kind": "multi",
+            "bindings": {
+              "8332": {
+                "enabled": false,
+                "options": {
+                  "preferredExternalPort": 8332,
+                  "addSsl": {
+                    "preferredExternalPort": 443,
+                    "alpn": {
+                      "specified": [
+                        "http/1.1"
+                      ]
+                    }
+                  },
+                  "secure": null
+                },
+                "lan": {
+                  "assignedPort": null,
+                  "assignedSslPort": 49153
+                }
+              }
+            },
+            "addresses": [
+              {
+                "kind": "onion",
+                "address": "4dc6awce5nc4ldc36b4naibuzzsj5dwgyfvp43uc3mjp2nnvprchniyd"
+              }
+            ],
+            "hostnameInfo": {}
+          },
+          "zmq": {
+            "kind": "multi",
+            "bindings": {
+              "28332": {
+                "enabled": false,
+                "options": {
+                  "preferredExternalPort": 28332,
+                  "addSsl": null,
+                  "secure": null
+                },
+                "lan": {
+                  "assignedPort": null,
+                  "assignedSslPort": null
+                }
+              },
+              "28333": {
+                "enabled": false,
+                "options": {
+                  "preferredExternalPort": 28333,
+                  "addSsl": null,
+                  "secure": null
+                },
+                "lan": {
+                  "assignedPort": null,
+                  "assignedSslPort": null
+                }
+              }
+            },
+            "addresses": [
+              {
+                "kind": "onion",
+                "address": "dmdx34vr7mpjgtmxuhj67vmec7xvh7omxaxyunqpg35dvcbs4pvdh7id"
+              }
+            ],
+            "hostnameInfo": {}
+          }
+        },
+        "storeExposedDependents": []
+      },
+      "hello-world": {
+        "stateInfo": {
+          "state": "installed",
+          "manifest": {
+            "id": "hello-world",
+            "title": "Hello World",
+            "version": "0.3.6:0",
+            "satisfies": [],
+            "releaseNotes": "Revamped for StartOS 0.3.6",
+            "canMigrateTo": "=0.3.6:0",
+            "canMigrateFrom": "=0.3.6:0 || <0.3.6:0",
+            "license": "mit",
+            "wrapperRepo": "https://github.com/Start9Labs/hello-world-wrapper",
+            "upstreamRepo": "https://github.com/Start9Labs/hello-world",
+            "supportSite": "https://docs.start9.com/",
+            "marketingSite": "https://start9.com/",
+            "donationUrl": "https://donate.start9.com/",
+            "description": {
+              "short": "Bare bones example of a StartOS service",
+              "long": "Hello World is a template service that provides examples of basic StartOS features."
+            },
+            "images": {
+              "main": {
+                "source": "packed",
+                "arch": [
+                  "aarch64",
+                  "x86_64"
+                ],
+                "emulateMissingAs": "aarch64"
+              }
+            },
+            "assets": [],
+            "volumes": [
+              "main"
+            ],
+            "alerts": {
+              "install": "Optional alert to display before installing the service",
+              "uninstall": null,
+              "restore": null,
+              "start": null,
+              "stop": null
+            },
+            "dependencies": {},
+            "hardwareRequirements": {
+              "device": [],
+              "ram": null,
+              "arch": null
+            },
+            "gitHash": null,
+            "osVersion": "0.3.6"
+          }
+        },
+        "dataVersion": "0.3.6:0",
+        "status": {
+          "main": "error",
+          "debug": "Error { source: \n   0: \u001b[91minvalid type: map, expected a sequence at line 1 column 922\u001b[0m\n\nLocation:\n   \u001b[35m/home/rust/src/core/models/src/errors.rs\u001b[0m:\u001b[35m509\u001b[0m\n\n  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n   0: \u001b[91mstartos::s9pk::v2\u001b[0m\u001b[91m::\u001b[0m\u001b[91mdeserialize\u001b[0m\n      at \u001b[35mstartos/src/s9pk/v2/mod.rs\u001b[0m:\u001b[35m265\u001b[0m\n   1: \u001b[91mstartos::service\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/mod.rs\u001b[0m:\u001b[35m271\u001b[0m\n   2: \u001b[91mstartos::service::service_map\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/service_map.rs\u001b[0m:\u001b[35m80\u001b[0m\n   3: \u001b[91mstartos::service::service_map\u001b[0m\u001b[91m::\u001b[0m\u001b[91minit\u001b[0m\n      at \u001b[35mstartos/src/service/service_map.rs\u001b[0m:\u001b[35m60\u001b[0m\n   4: \u001b[91mstartos::context::rpc\u001b[0m\u001b[91m::\u001b[0m\u001b[91mcleanup_and_initialize\u001b[0m\n      at \u001b[35mstartos/src/context/rpc.rs\u001b[0m:\u001b[35m300\u001b[0m\n   5: \u001b[91mstartos::context::rpc\u001b[0m\u001b[91m::\u001b[0m\u001b[91minit\u001b[0m\n      at \u001b[35mstartos/src/context/rpc.rs\u001b[0m:\u001b[35m118\u001b[0m\n   6: \u001b[91mstartos::bins::start_init\u001b[0m\u001b[91m::\u001b[0m\u001b[91msetup_or_init\u001b[0m\n      at \u001b[35mstartos/src/bins/start_init.rs\u001b[0m:\u001b[35m21\u001b[0m\n   7: \u001b[91mstartos::bins::start_init\u001b[0m\u001b[91m::\u001b[0m\u001b[91mmain\u001b[0m\n      at \u001b[35mstartos/src/bins/start_init.rs\u001b[0m:\u001b[35m204\u001b[0m\n   8: \u001b[91mstartos::bins::startd\u001b[0m\u001b[91m::\u001b[0m\u001b[91minner_main\u001b[0m\n      at \u001b[35mstartos/src/bins/startd.rs\u001b[0m:\u001b[35m21\u001b[0m\n\nBacktrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.\nRun with RUST_BACKTRACE=full to include source snippets., kind: Deserialization, revision: None }",
+          "message": "Deserialization Error: invalid type: map, expected a sequence at line 1 column 922",
+          "onRebuild": "start"
+        },
+        "registry": null,
+        "developerKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAhUw/T99KgSZQYh1mp1FzDaZCOLmSG9qYSMNjw5WCfP4=\n-----END PUBLIC KEY-----\n",
+        "icon": "data:image/png;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wgARCAFaAVoDASIAAhEBAxEB/8QAHAAAAwADAQEBAAAAAAAAAAAAAAECBQYHBAgD/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEAMQAAAB6CAAAAAAAAAAAAwBghskoJKCSkJUhDBAAAAAAAAAAAAAAAAAAAAMYmwTbJbBFBLYSUElBKoJVBBSJGCAAAAAAAAAAAAAAYDYm2JsE2xDZLYIbJGElBKoJVIkpEqkSqQgAAAAAAAAAAYMYMYMYMYDYhsQ2SUElBKoJVBKpEq0QrRCuSVSEAAAAAAAA2qBjChgxgxgNiYxE4oy5rf4m1GsewzZ+HoJVolUiVSJVIlUiFSJVIQAAAADGFKgYxsYMoTfkPX4+eaWdF1XCbGa2uk5o44u5/scHO6+E4vld8149u48Z859Drj3STLqkTNySqRCpEzckjQAADCkx0mNjGxhS0s93KvNsRgt93jIHi9wxNgigkoIKR+Gm7yjgnh+g+aHr6B887kdTmkSqRCpEKkTNIQANMdKgpUNqhteYwPI/Tmj3dWLGxgxibZLYSUEqkSqRKpGi8u+iecn4dI+e+xGwzckzckzckzSJAG0x0mU1Q2qHzfo/BT8u6886mNjGxgyhNsQwSoJVImbklUiI/RHDa37kx9CrD5glVJM3JM0iU0OpodTQ6TKaownFurcoOx7Rj8gYX89bwx0/B4zUTqGExmtm8bLom5mG3v5x+kCdC3/AOaj6M/TyewxWoaDvpkdt4dv5+e08X7QX8+/RHCDdt85h08maRM1IpqSU0OpodJlNUOpo0/lXYePnfvZg84c+03e/Ka9+PTNEMlrO46UbL0TjXQzk30j8+UfQPzV0fTjt/r4HnTTPoHStKM9lNV66aP0XjXWj08M7n8+m19S510UU1JKaJmpFNSOpodTRTTKqaPNwT6F48bPv/CO6n6VNDqaKc0VUUU5BoQk5EnIpqRS0YHiO66mdU2iLFLRKcimpFNSOpZVTQ6minNFa/sDPnnpWJ00+ia1vYy3LLcspyynIMSHIgQhS0LXvfxM8XRNS7WUnIk5FNSKWiU0Nyy3NFOaKc0VUUePgvX+QHUt7wWcKc0U4ZbhlEsYkNCBHmP3wWpc+PbPp7AGQciTkSciTkU1Ik0DTKc0U5ZblluWc80TOo7NceQrj/m8Zsm48zxh9C+z5uyB9AnDv2O1nEfCd217i6N70utxNH3re8kfj+jkEISEJCEhCloQAADqWVUsqoooWKONbxoHUDa+NLyB2ac2Vh8uzR8R09nIfx7IHHvZ1UOf57YQmkhpIciBCEhBLkJchLQAAADTKcsqoorH+9nAa6zrxpvYrypbhlOQskKEDEikgaSGhAhAiQQglyCEIAAAAAAbllVDLcspyynLKcMpyFOQokKJBiQxIaECECECEEuQQAAAAAAAAA3LKcspyynLKcMpyFEsokKSBiQxIaENJDSQ0kCAAAAAAAAAAAABuWU4ZTllOGU4ZRIUIGJFEgxIaENJDQgQAAAAAAAAAAAAAAAA0FEsollEsokKJCiQpIGSDSBpAAAAAAAAAAAAAAAAAAAAAAAAMQMQUSFEgxAxAAAAAAAAAAAAAAf/xAAvEAABBAIBAgQEBgMBAAAAAAAEAQIDBQAGQBMUEBESFRYzNDUgISMwMVAiMoAk/9oACAEBAAEFAv8Ap572RpJaV0eOva1M+IK7Evq1cZb1r8ingl/oyixhWl7I1MIt7CfHKrl/EPYnD4LscqYFZhF84omAWKx2CaXHuc9zWq5w1HYTZBrLMjoa1mNq65udgDjqyvdklJWPybWhlwnXjo8nhlgdlfcli5XWQxycq4t4gsKImJlhikmkr9cVcFFHFb+zLGyVh+vDyYaESG9qq11Pe+fJvrft8VVVaipmPUEMcOL92WOOWO4oXReFFbqMqfmnFv7LsoV/NaGo7vGtRreBfUyTJmtWfodxC52DDFTyEkUVd3xLURreFs9Z5eFAd3ofD20v1SxMdLJXCsDE4bkRzbgPsTqQvs7DhKqNaVMpBOpDdQvi7WN1QMpCO5rODeydKozWIelU5a2UVclVaw2ElgUwIQC+HLLtrWGud8TiZ8UCYLYRz1kezCvk8H7OK10T0kiywOGBY/aIPMPYAZ35LsQ0cokyEDTxpNC5Fa7T5POHg7Y7yq8rm+gDN0/01cscQnYLIEmr1v73u3zaeCvnX2/XccLGFRCfU+E/zAfocsynGHV2ujuEuwPbzNSJdMBeM6dsGzpiZat9FnqDv/dwdu+2r/Aa+Ymbp/pV181hJYUhQQut/e92+bT1ktkvwsVlinlVCfU+E/zAfoVTzSRqtcBK2YLcZWPsNLYvSuamcm18LlfO21H7jwdmZ66fKKTq1GbYPOQzUxSYCtjikmqKAEyK324YkiVgNozO0uMqoik1v2yxz26zzURS4Dpa2wWX26zygDOit9go5Jp2w2g2CU9gU+vFjCEtgDZLINFaH/GEP6pGnM/U4JcXXFVFRdOI84eLekdtV5q8PSq+FsY3b2dWUoZzVRzeJtZnWLGhcQRExsUXCvwu8BzVbH1N4d5YIAIqqq6mF5cXZq7oStcrXUNh34vBsDIQhzipTCakF55UbGxx8SwVjQM06L0h8C1sxwGHFzGzgizGEV4cQI3F2eXp1OUcXRqf3iJ4h47PYlXHuc91bXzny14UAMHG3GX/AChYsszURqYYVCIOfamFTBbAdBguwgS5ASPOn4ZJGRoTeV0OGbIQ/J5pp5GtVzqvX3vyKOOGPj7HL1bfXIurb4YVCIPZnzHziwSkzlgFi+MRpkWNurNue+2mOu7RcksT5McquXB4JyHBa5O/AQBQk5Hn5JPIss2nRfqGExCQWZ0x84sEpM9TXxV8GE1gBGTa0M7JNZJTHa9YpnsNnia/ZLjNaMXIdZjTB6WthxqNa3lXEnSq8pJIgKKzOlOnFglJnqa+ICD+msoFJAVFRVe5WiwSkzVVfEBD/UWdQOY5utyequAgBj/7X//EABQRAQAAAAAAAAAAAAAAAAAAAID/2gAIAQMBAT8Bcn//xAAUEQEAAAAAAAAAAAAAAAAAAACA/9oACAECAQE/AXJ//8QAQRAAAgECAQcIBgkDBAMAAAAAAQIDABEEEBIhIjFBURMjMkBSYXFyMzRikbHBFEJjc4GSodHhMFCCIICDkzVTov/aAAgBAQAGPwL/AHPXkdU8xtWtjIvwN69K58IzW2b/AK69JIPGOtGLQea4rmpo38rf2O+ImVO7fVsLAW9qTR+lacQUHBNWrsSx7/8AXzWJkA4E3FWxMCuOKaDVopgH7DaD17lJ5Ai/GimEHIp2j0v4os7FmO81mqCTwFXMQiHGQ2/SufxTHuRbVpid/M5rRgofdXqcH5BWnBQflr1fN8rEVzOIlTx1qvEY5h3GxrNmjeM+0LZArNy0fZf965prPvRtvWzFHaSfhuXxoyzyF2oRxIzudwoPjZLfZp+9ZuHhWPw2/wBLMkRXXgwvRbCtyLdk6VrNxEZXgdxoMpII2EUIccdO6X9+snDYU899Zux/NXNZ/o4N78fCsyCPN4nef6xjlQOh2g0ZsFd03x7x4ccgw+JN4Nx7H8VcaR1bk4jz77PZHGrmhiMQCINw7f8AFBVAAGwDqLYnCLaXayD6/wDOQYKdtU+jPDu6q88nRQU88p1mNXf0CdPv7qCqAANg6mcdAv3o+eTXPPR6H7+/qiYNToXWfx3UsaC7MbAUkCbtp4nqhVhcHaKaL6h1k8KRydRtV/DqZZtg0mpJ22u16fEsNEQsPE9W5cDWhN/w35IZCdYDNbxHUsQw2lc335IzvkJfJGZI3fPv0adI4pEzFvrU2IdWZQRoFJhkglVn3m1RiWKR88EjNr1af9K9Wn/Smx6o4QBjmnbopUGGn1iBuykfRp9HhSSDQGUHJnYiS19ijSTWphJSO9gKCSZ8BPb2e/I8Zw811JU7KjnVSodbgGnibY6laKnaNFYiHgwbqQHGQZMOvCNfhkwvi3yqZsRKIwyWF/GpIoMQruSuix41hvE/A1hfK1SfT8SYLWzdNr1/5Nvzj9qnghZmQROQW8Kh86/HLJ5jWH+6X4ZJZ2O06vcN1JJimkMji9lNgtckGLIwzlJpoXNzCbDwrFL9oTUMfZjUfpkxK8JTUy8Yvn1JPvR8DkhP2a/DJhfFvlTpCyKUFznU2IkkiKi3RJrDeJ+BrC+VqkEcipydukK9ah/KaxA4QN8Kh86/HLJ5jWH+6X4VamQ7QSKhljN1KCo41NzHHre+sTJuJUU08Zi5Ns293se+tGTFfeGpD9l8x1KQ9khsmGbgub7smG5CF5LFr5ovbZU5ngkjBjFs5bb6kjiRnfOXQo76w8kmFmRATcle6sMYIJJbK181b2rUwuLXwBFehx3/ANVPFMkvLESWVtteo4j8lep4r8pqVsRBNGpj0Fx305+hYjpH6lep4r8pqB5cNOiAm5YG2ymxWDALNpePv4iiiR4yK+0KGrTC0ana8milw8ewbTxPGsS6YSZlaQ2ITbUKsLERrcfhVzUkvbYmsTL3BepSw9tSKsdtTYUnSpz16tM19ZhmL4nIHO2Vi3U3YDUl1x86jn+qNDeFBlNwdIPVRhkOpDt81RwJ0nNqWNOiosOpnMHOx6yftk+gSnSPRH5dUuDzz6Ix86uTcmmx0g26sfzPVfpcK8051vZNBlJBGkEUS+iWPQ/f39SM0x8q72NNPMdJ2DgOFCMaEGl24CljQZqqLAdVnaRQyiM3ByTTdt7e7qOvrynoxjbRlna53DcKEMK3O87gONCGL/Ju0erOu+RguTDpvK5x/HT/AF+UmkWNeJNGPArb7RvkKLuxZjtJrNiFlHSc7BXJQjzMdrdXw8Hi5pIhtdgtBRsGjIZpmso/Wi/KvEn1URrWrNltiF9rb7653PgPtC499Xhnjk8rf6ryOqD2javTcqeEYvVsLEsQ7TaxrlJpGkbixoKoJJ2AUJMdeNf/AFjafHhQjiQIg2AdYl4JZKh4Jd/dkM0zWUfrXKSaFHQTctLDCuc7Vz8DqO1tHvy83ipl/wAzXrbnxANesD8gr1ojwUVr4yc/5VdiWPfkzYInkPsis7FyCIdldJrmIgDvY6WP49Zudgp5T9diaxE/ABBRmmayj9a5STQo6CdmlhhXOdqzV1pG6b8f4yXkwyX4rqmuanlj8daubxMLeIIrQIW/5K9Cn/YK6EQ/5K15oF95rnsW7eVbV6vyh4yG9ZqgKOA63iHG3Mt79GT6TObB2Ld54VykmhR0V7NLDCuc7VmrrSN034/x/Z5oBtZdHjViLEbaCliVXYL7KWGFc5zWautIem/H+08qCYpd7Df41rYpM3uWs2Iax6THaf8Aex//xAAsEAEAAQEFBwUBAAMBAAAAAAABABEQITFBUWFxgZGhsfAgMEDB0fFQgOFg/9oACAEBAAE/If8AwNP9XaQBqPdLkqNPqTB5R4T9mOb2S7twO4QHkaxNf8FslNN7cYypbeFHJK8PcujpfNv+HV6+oualzrKRRn/JMp+qV0m6UVg8fPhKfNZZaVx2AziSeBjP6jEKQlVhZbwCqwsQ/AXwNFHRdTMeHyXUnfBX3sm7ACdp4nnGVlR0IPqVHwKB/ZsbzYrnTzLzdiJQtHMkf3h8I9kUG1/BsiMDm5GgZEws6HVgGpat/H8SnRZovb3FlPZWKeNIhq+/D7JfOmDfu2PhaqKIyrPMGU+c5iVGp7D7Z6bvrgPoPFIgRVaq5wKqk3hyDPtKKwcW/fvvYaiXUYGYt7X/AFnXfY+17nx8uUQCCFRM/U+6W0k1PxOkSiKt6uLHQxdNfjjCwtQFAPYp7JJB0TaPFY1G+5jXmdHz/Vy9La+otLSLviKauRxlYBXOzQNhGpKUVasj5hDgNQC4NPhkKZp+ePOYMopWodpxd/Sx9gtLUuC98sHAv4yjf7XLKLTTXnb8NhgDUTBIodcZc3+YS4M50z4N8bG19RCHpcChqbCY0i/PSHVTzNoV52HxBPus3fRsSqXQR+RjY2voLCEIQjsKUXipYFFvRzodCEqEqC5dSmu+O+Aai++mUNOo0a3tM4iiEFoLlydkR4VhLqb5/Z/c/p/uJhUUNr2hKCKrnaa2pNK0xy8YTSEjiVK2DazgnBkBTqr9SCBcw0PKw4zGlM5jo/GMaawHlsYCDdVBxKTFBVbyOg4TxKPa1jaxtIQhCEJsH/RY3DBNyXRCef0gpxUC1dyLVKDeU2izV47UlMQNycyuI7LCi3AAq3pynitFmc8TqzyOmMaMig0cELxnGRfTC+bWbUphRi+B1dZUOF8oNoON/wBzx4BYIeFDzrKWUrch+2MY2tpCEIQtFV0kYm6Edgp0Qnn9IBrGtcK0yIgPwlRe0zLNXntSUReTUa1rpulzBqfiCfFaLfE6s8jplY1FIP8ARybS6F4wrrS8hGaJRktVOUKourvBfsmVyjhQC5LtzKMJJIroHBjGxjG0hCELSUSL+vU+7DqFWq3qkIcJ7IyCS6JgsNDSFYsVOQjgX4YOJVYhK/fuN+crGURdgtdS7GFz3dgVCyFEFp1gwYaF/WUIVO9QoX5eplDSvguiWQgA8oNq59lfeyqK3q4tjDG0XEEcQYTJoimQC9n9yVrHcgG4q/UYxjGMbSEIekWfvUuiAaBom2B0iI3PWnOFhCFhD1MbKurG1lIaOgDtWymynAOB2jGMYx9BCEIWFhLuDm7g595ftUombx/eEOAYBma2EPbbWMYwq+ZHNY8i7nCpuZ2bYI1B7sIxjH1EIWEIQhENU4lrxH1YQ5vTMz4coQtPfSGam0fQiJCKq5sYZiq6eBz9bH0HsEVcopm/T3jd3qF46xzIopYaOL4LNmwDgCZeCDDKErFeNGbAxiCyCMYxjGMfQQhCEIWEWUTgG6GEqIZbcP1+Ay+agqi9tdCZdQDB0CVRzenFIQ1c0x1GNr7RaWllNHoOtXtZXIpxJ/0tPcSDui/sPWOFK/6N7FITVVVZfSrzN7smMC34g1fz0trH1HpLahHA7A+5ggg4tJckjRuLMpdDNaG2GwxvADhi7YAIXd5X3BA8UKJRitgy/Mlbd023+HulfBn/AEMJXfKhyOsdbXR/I2NqAqsXViROc/rdDOTQdA9Da2vsHqpAaiHAv6rLxFahwXdaQmUugYvQ2ysTCA3H7ti58IabXQjbsQKvBdZg1MdZgN6EMK8kYTyf6nZY/qH0E0rO02uYVbOKSmUjw88jrKF9c0Da+yepLYRV3TEcR4tZUQdwXvYmH+AGL0NsqkwgNw/dsVPgDTa6EuwZI5DSMqZMWavyuxK07OIPqYQvk4zoyfoswx7eRMIXY/RKM7APqaygoBzHThDQ7gND5b58Dv8A+ll1jMcEGuEqcwBtw/dsUDgDTa6Eu0ZI5DT45+B9COrzqRm5FA5Mrf4rXKsaaRSOBNNroS6JkzkND/Eq0vA1N19zC3qVY2W+LcDZ/lq/7Rf/2gAMAwEAAgADAAAAEPPPPPPPNBCMMBFMPPPPPPPPPPPPIJILMLOIGCIOPPPPPPPPOEMBMCJCDOGDIBEPPPPPPOBHPDEGCMIGGDMMNOPPPPPCHIADECENODMDDDALEPPPIKPAONJEIHBPFBAFKOFNPOJBFFLGNLJEIJIACFIKKGPLIKCDOHABIJMDDACFFEEGPBJEGABFBOMDGAFIOHJIEGFAKJECBCHOGGJGFGEFCOHBPKNEKANDEGPNLAGDKENAKFFKOFIPHAKGCBIJJECFFCLFFBIOGBCJFAOIJHAOGAJJECNDEGGKBIEDCGJAAJEBJJIEFKEFFFDCCNKDAKEAFAKKKGPPIIKEGCAMCEMOJDHAKFFFPPOAKFCFDJBMJEBAIBKFAPPPPCLAMIDJIDDJJMMOAFPPPPPPONOMCIOAEJJMDDDPPPPPPPPCDMCCHMNCIMDAPPPPPPPPPPLGGGBDDECGDPPPPPPPPPPPPPPDPDDLDPPPPPPPPP/EABQRAQAAAAAAAAAAAAAAAAAAAID/2gAIAQMBAT8Qcn//xAAUEQEAAAAAAAAAAAAAAAAAAACA/9oACAECAQE/EHJ//8QAKBABAQEAAQIGAgIDAQEAAAAAAQARITFBEFFhcYGhIJEwsUDB8NFQ/9oACAEBAAE/EP8AByyyyyyyyyz/AOBllllllngyyyyyyyz/ACsggggsssssssssskskkks/xwgggsgsgssssssskkkkkkkks/xAggssggssssssssskkskkkkkkk/wQgggggsggsssssssssskkkskkkkkk/nIIIIIIIIILLLLLLLLLJJJJJJJJJJJJP5SCCCCCCCCCCyCyyyyyyySSSSSSSSSSSST+Mggggggggggggsssssssskkkkkkkkkkkkkn+IIIIIIIIIIIIIIOSeAvYH2JhRHVD+rNJi+d/sJNwT2Ua+Q/0dmBO9v6UIg6nTT/Q7IOBHySSSSSSSSSSSSSSf4AgiCIIIIIIILJxTdr2XV+ptkOD5qcj8pNdgxYeW8nyyJQ6tb50x5WPlfMc3JcHieg4T5sB0Q/tiSvTY/OOZfCSXaEeTyB4+RlDjw+Ukkkkkkkkkkn5kERBBBBBBBADXCet5LlehLFW4APmdfg19SXImvu9V5ZJv4/7YOW587ctns39gje7wJ+1fqIMx3VvxhHhxe+/7MGYZ/8AXaCxn/J0Rjmz3wvsfUX2Cf7dfccA+hv/AKx+Fcnr65PtvD8bf6ZvgEbU/wDoHT0tutTN5pOx9deuSSSSSSTJJM/kEIggggiCJoRPeeizv6efPC4cmi8eUuPQJTY823r6Hq8TxQ5gvs6Z7B97gQ2fs135GMQWWWWWSSRd5wFfhlxLkRd5f+KnpEdvz9afD7cPpDWc1G7icjCqLMuJ2AdPbx5h1hAAhojonnJJJJJMkJ/EggiIRBBBc1SdSA/s/wCueiMXKKp6qvVfOSDBa6jqrq9ej1eLCaDrD59d9uh2CCCCCCyyyySSSSMrmD/Ge/r1IGDLCfurqHl0TpIxjllH7fOe440h7iX0CaInUTvJMzJCSSfwIiIIPAER7Keznsr9eoPPXtLBdQ1HlV7u3W4qEB556geF9h3Yrzzg3QA4CCCCCCyzwZJJJJJJJnJFlBCzzA7enp7uoQBBxExG6j6P1e58z4PHRMSZnwJJ4H8DwBB4CPBkwSw89IfVIHvbuKI6Hp5IMD2nzZB425R5vVe3qSFCPJCMAdgIIIIIIILLLLJJJJJJJIow3R8c8ZPr4eaF0FEeEcRkIeSuoz6xz6HzmZnxEnxIjwEeAi4jiMei5Pk9x8pKAId1gXQnJnKcv7vTyAO0EEEEEEEEFlkkkkkkkkJIMydUYieScRXr1GDhvmtXt6zrS8943D6HwYf8SeBnwMz4H4AiILbYIdg1f0M/Spx7C8PjB8WboVTjJN+H9EHgIIIIIIILLJJJJJJmZtSmkhyuB8P6GTdHo8NyOPF5V2vuC+fEfAz4HwPAfkDMACnmX9VuNwkLht8x/ov78Bj0yzwp3RFakageA087OHEsNIZoO83pZnLmcnSIkUAgYO6PPtHhUCIhOjc1gxzno5sYjgAkF8nMnKb0YNQ82XZLpzKT+lm7E3AgOd+ZIP8At6QOuPb1cDzmmg8OH4DH7lSgDJfJT9gHrGcwzGI8c97WvIMlSz4SwVLNnTc42IAMXyb/AGgSzSfMx+y4yhXyG+wzPiM/gH8ABiHr3qH+kS0eQsR2H3g/b4gGKLHoaTg9owiyiAV0Dg8SmcfcF6lfNGZ+1gawTsXwXY5AZzxx4Pk5fdg4e54ssODq4d3yJ45heHIPkZz7q95oZ85CDqKBNXje0wkWcDarDhRE06iMoNKtd3ygD0w7WQMML0IYAhmyeoD9y46duYmcwXov/abZ6gev/qT+AZ8D/AARKKcbPkLkHq/qY/h3jACDWoArgNOdkLbUNIZidXz8Sj9Xd1KWDPRv9yiOoZ/wTsNQudcZ4f8Az92zk9/Hlgy9xbfuZMhSLqIo/ZYYQnlgInkiInpYAga3eC9eCnqTCBL80X6+y60OSxyBz0PmePIc8jy7XIma0z/SH+oTHG35/CD+AfF0fgCPA2wezwK+ld8biQP01f1DwMD2K4OG503H9R7CKC2gvVzmRXqwwVQPI5mDpHuiavTlD5lQDICXBzpuMo+A9vOm8Nv+D/1GLIi7oQ0u9oAskD/vPBXl7dhlwe7BZgZaMUWj0gGBB0yXTC7YiavHVCSdOMfeV4V7pOeTrlusXJr59r7zVoE6TeuOX7HPmWO6oOc0md17dgDtOMqkB4Rzkh+zTiRInZHiG0B6PYOX6ncd/TqPplAcveqP0P4AD+QERF0bxd7I1+8mSLO7BxP3cJREvXPH2C8A/AHiDDbLPiNhwB7Ny5ZnwH30/wCe6PbT4gDA6dCTqq4dv+tPz+YDP5gPAX6T5FtQ4Ez4tvsI1fA2x9w4eonXnLoxoPREY8QiIhttlll8DP4hyhztcC/0Pcx8Ck+p59ga/FhH7eQA/r8QZmfxB+QN3PRDnJ/5HqTp576lgLJV9f3OT5jTsS8BDKGGGG2WWWWZmZihWrzncz1N9XDzmPAW1R1V7q82JTAh7D9+mMzMz4j4HgIiIiLsRbJxx/x33ovPpo7kGhuME6B7I2EEJ5qaJ24OnZHtkMQxDDDDbbLLLLLPg4tPLJwuC/t6ByxFXlLjfoH26vW4yeOd/ofoD3egwQZr4NgH8IA+B/AAHwGgvfR3gnvkHA9c5nzJF/P/ANb+oYYYYYYbbbZZZZZZSoH4U4v3vL2G2ip0ff7Y+15b7EBBL2D9rwc3FQuRmXn+oOxxKWZTMzM+J4BjwDD4BuKQaef+i+9vd6d7iwE/Vf6D9Qw2noL7EMMMNttttsst1qwGD6HdehrMq+rn/Vv9j0JvTHfnyvK3FVwFz8v6Bz7HMLVwDHrT+hwftVmZZSz4jPieAYiPAQ3ZI56qfUQ1NADzL/aJrFE7Bh9EN0l7Dl/Q+6+urwXolAabVD5y+MLiU1nFPTmfg24b69X+X7CJJHQX/W6fqcdQ9yB2tlh3jl7T4AOTH2ITuRfb78P7gHPwIe6HH6o6Pd6z0Ow9DC0quOvyA5bimD4PBwPQ2OPNpI/9815e8ssspZfAz4H8CGHwEREOF/eQFoN19hZ/ZFdJSeZ2p919dXgmfOeiT/a793thKBLhcAdU6B3Ww7bx7lGn7ZCJo6eYxw8Q6DhPmIAR0xv0qRQCH/M0Mzb1aBYymwUOoL+szFg6vf7d8DT64jE93ofKS/WCuKeS00PBivkLkPQw9JcllllllLL4FmfxGUMMMMM2OId7A1+iY/Wp9b/a6KTz1T9X7LzaNDtT7r66vBMec9E3t6rv3ewEkFMDgHdOx1W44sL4X9B2O/V56bqXQxOz7w4XWd7m5352WSHoS/2+5Be0Bb6BN8R5kf0STmvqf+8xnrn+uM2eftM/QPuS8wDP7V9TnRg5L7s+l0U5KfwYSyyyyyyyyyzLM/kQwwxDDPEmpOyEBnB26R3BwGruX3I/bdeJfzrrvK+q793sBJmTA4B3TsdVuDKC+F/Qdjv1eegwwww2222yyyyyyyyyyyyyymZfzGGIYYbMXab6aA/IHzLI4XiTiJ2R4uS7DnduC5rvkjZeDgHdOx1W4/qL4X9D2Pl5hhhhhtttttllllllllllllllln+AhhhhhhhdDwKvNc19CPnskG85XT2UPuCdhqHLoKcB2HHu8wwwww2222222yyyyyyyyyyyyyyz/CQwwwwwwwwwwwww222+DZZZZZZZZZZZZZZZf4xhhhhhhhhhthttttttttlllllllllllll/lGGGGGGGGGG222222222WWWWWWWWWWWX+cYYYYYYYYbbbbbbbbZZZZZZZZZZZZf8EYYYYYYbbbbbbbbbbZZZZZZZZZZf8QYYYYYYbbbbbbbbZZZZZZZZZf8AG22GGG22222222222WWW2X/K2G22222222222W223/P222222222223/AO7/AP/Z",
+        "lastBackup": null,
+        "currentDependencies": {},
+        "actions": {
+          "set-name": {
+            "name": "Set Name",
+            "description": "Set your name so Hello World can say hello to you",
+            "warning": null,
+            "visibility": "enabled",
+            "allowedStatuses": "any",
+            "hasInput": true,
+            "group": null
+          },
+          "show-secret-phrase": {
+            "name": "Show Secret Phrase",
+            "description": "Reveal the secret phrase for Hello World",
+            "warning": null,
+            "visibility": "enabled",
+            "allowedStatuses": "any",
+            "hasInput": false,
+            "group": null
+          },
+          "name-to-logs": {
+            "name": "Print name to Logs",
+            "description": "Prints \"Hello [Name]\" to the service logs.",
+            "warning": null,
+            "visibility": "enabled",
+            "allowedStatuses": "only-running",
+            "hasInput": false,
+            "group": null
+          }
+        },
+        "requestedActions": {},
+        "serviceInterfaces": {
+          "ui": {
+            "id": "ui",
+            "name": "Web UI",
+            "description": "The web interface of Hello World",
+            "hasPrimary": false,
+            "masked": false,
+            "addressInfo": {
+              "username": null,
+              "hostId": "ui-multi",
+              "internalPort": 80,
+              "scheme": "http",
+              "sslScheme": "https",
+              "suffix": ""
+            },
+            "type": "ui"
+          }
+        },
+        "hosts": {
+          "ui-multi": {
+            "kind": "multi",
+            "bindings": {
+              "80": {
+                "enabled": false,
+                "options": {
+                  "preferredExternalPort": 80,
+                  "addSsl": {
+                    "preferredExternalPort": 443,
+                    "alpn": {
+                      "specified": [
+                        "http/1.1"
+                      ]
+                    }
+                  },
+                  "secure": null
+                },
+                "lan": {
+                  "assignedPort": null,
+                  "assignedSslPort": 49154
+                }
+              }
+            },
+            "addresses": [
+              {
+                "kind": "onion",
+                "address": "b5vx4e3liq2twdeuqqp5bcuvqvoh2hil3yyci7re4ioeiwz4q3qlg2qd"
+              }
+            ],
+            "hostnameInfo": {}
+          }
+        },
+        "storeExposedDependents": []
+      }
+    },
+    "ui": {
+      "name": null,
+      "ack-welcome": "0.3.5.1",
+      "marketplace": {
+        "selected-url": "https://registry.start9.com/",
+        "known-hosts": {
+          "https://registry.start9.com/": {
+            "name": "Start9 Registry"
+          },
+          "https://community-registry.start9.com/": {
+            "name": "Community Registry"
+          }
+        }
+      },
+      "dev": {},
+      "gaming": {
+        "snake": {
+          "high-score": 0
+        }
+      },
+      "ack-instructions": {},
+      "theme": "Dark",
+      "widgets": [],
+      "ackWelcome": "0.3.6-alpha.7"
+    }
+  }
+}
diff --git a/core/startos/src/s9pk/v2/mod.rs b/core/startos/src/s9pk/v2/mod.rs
index e012480af..7a94c0d79 100644
--- a/core/startos/src/s9pk/v2/mod.rs
+++ b/core/startos/src/s9pk/v2/mod.rs
@@ -102,6 +102,19 @@ impl<S: FileSource + Clone> S9pk<S> {
         })
     }
 
+    pub fn new_with_manifest(
+        archive: MerkleArchive<S>,
+        size: Option<u64>,
+        manifest: Manifest,
+    ) -> Self {
+        Self {
+            manifest,
+            manifest_dirty: true,
+            archive,
+            size,
+        }
+    }
+
     pub fn validate_and_filter(&mut self, arch: Option<&str>) -> Result<(), Error> {
         let filter = self.manifest.validate_for(arch, self.archive.contents())?;
         filter.keep_checked(self.archive.contents_mut())
@@ -263,10 +276,10 @@ impl<S: From<TmpSource<PackSource>> + FileSource + Clone> S9pk<S> {
 
 impl<S: ArchiveSource + Clone> S9pk<Section<S>> {
     #[instrument(skip_all)]
-    pub async fn deserialize(
+    pub async fn archive(
         source: &S,
         commitment: Option<&MerkleArchiveCommitment>,
-    ) -> Result<Self, Error> {
+    ) -> Result<MerkleArchive<Section<S>>, Error> {
         use tokio::io::AsyncReadExt;
 
         let mut header = source
@@ -283,9 +296,14 @@ impl<S: ArchiveSource + Clone> S9pk<Section<S>> {
             ErrorKind::ParseS9pk,
             "Invalid Magic or Unexpected Version"
         );
-
-        let mut archive =
-            MerkleArchive::deserialize(source, SIG_CONTEXT, &mut header, commitment).await?;
+        MerkleArchive::deserialize(source, SIG_CONTEXT, &mut header, commitment).await
+    }
+    #[instrument(skip_all)]
+    pub async fn deserialize(
+        source: &S,
+        commitment: Option<&MerkleArchiveCommitment>,
+    ) -> Result<Self, Error> {
+        let mut archive = Self::archive(source, commitment).await?;
 
         archive.sort_by(|a, b| match (priority(a), priority(b)) {
             (Some(a), Some(b)) => a.cmp(&b),
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 10a02d63b..f71cec8b3 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -26,8 +26,9 @@ mod v0_3_6_alpha_4;
 mod v0_3_6_alpha_5;
 mod v0_3_6_alpha_6;
 mod v0_3_6_alpha_7;
+mod v0_3_6_alpha_8;
 
-pub type Current = v0_3_6_alpha_7::Version; // VERSION_BUMP
+pub type Current = v0_3_6_alpha_8::Version; // VERSION_BUMP
 
 impl Current {
     #[instrument(skip(self, db))]
@@ -104,6 +105,7 @@ enum Version {
     V0_3_6_alpha_5(Wrapper<v0_3_6_alpha_5::Version>),
     V0_3_6_alpha_6(Wrapper<v0_3_6_alpha_6::Version>),
     V0_3_6_alpha_7(Wrapper<v0_3_6_alpha_7::Version>),
+    V0_3_6_alpha_8(Wrapper<v0_3_6_alpha_8::Version>),
     Other(exver::Version),
 }
 
@@ -135,6 +137,7 @@ impl Version {
             Self::V0_3_6_alpha_5(v) => DynVersion(Box::new(v.0)),
             Self::V0_3_6_alpha_6(v) => DynVersion(Box::new(v.0)),
             Self::V0_3_6_alpha_7(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_8(v) => DynVersion(Box::new(v.0)),
             Self::Other(v) => {
                 return Err(Error::new(
                     eyre!("unknown version {v}"),
@@ -158,6 +161,7 @@ impl Version {
             Version::V0_3_6_alpha_5(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_6(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_7(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_8(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
diff --git a/core/startos/src/version/v0_3_6_alpha_8.rs b/core/startos/src/version/v0_3_6_alpha_8.rs
new file mode 100644
index 000000000..b23c205e8
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_8.rs
@@ -0,0 +1,125 @@
+use exver::{PreReleaseSegment, VersionRange};
+use tokio::fs::File;
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_7, VersionT};
+use crate::s9pk::manifest::{DeviceFilter, Manifest};
+use crate::s9pk::merkle_archive::MerkleArchive;
+use crate::s9pk::v2::SIG_CONTEXT;
+use crate::s9pk::S9pk;
+use crate::util::io::create_file;
+use crate::{
+    install::PKG_ARCHIVE_DIR, s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile,
+};
+use crate::{prelude::*, service::LoadDisposition};
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_8: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 8.into()]
+    );
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_7::Version;
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
+    }
+    fn semver(self) -> exver::Version {
+        V0_3_6_alpha_8.clone()
+    }
+    fn compat(self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    fn up(self, _: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn post_up(self, ctx: &crate::context::RpcContext) -> Result<(), Error> {
+        let s9pk_dir = ctx.datadir.join(PKG_ARCHIVE_DIR).join("installed");
+
+        for s9pk_path in s9pk_dir.read_dir()? {
+            let s9pk_path = s9pk_path?.path();
+            let matches_s9pk = s9pk_path.extension().map(|x| x == "s9pk").unwrap_or(false);
+            if !matches_s9pk {
+                continue;
+            }
+
+            let get_archive = async {
+                let multi_cursor = MultiCursorFile::from(File::open(&s9pk_path).await?);
+                Ok::<_, Error>(S9pk::archive(&multi_cursor, None).await?)
+            };
+
+            let archive: MerkleArchive<
+                crate::s9pk::merkle_archive::source::Section<MultiCursorFile>,
+            > = match get_archive.await {
+                Ok(a) => a,
+                Err(e) => {
+                    tracing::error!("Error opening s9pk for install: {e}");
+                    tracing::debug!("{e:?}");
+                    continue;
+                }
+            };
+
+            let previous_manifest: Value = serde_json::from_slice::<serde_json::Value>(
+                &archive
+                    .contents()
+                    .get_path("manifest.json")
+                    .or_not_found("manifest.json")?
+                    .read_file_to_vec()
+                    .await?,
+            )
+            .with_kind(ErrorKind::Deserialization)?
+            .into();
+
+            let mut manifest = previous_manifest.clone();
+
+            if let Some(device) = previous_manifest["hardwareRequirements"]["device"].as_object() {
+                manifest["hardwareRequirements"]["device"] = to_value(
+                    &device
+                        .into_iter()
+                        .map(|(class, product)| {
+                            Ok::<_, Error>(DeviceFilter {
+                                pattern_description: format!(
+                                    "a {class} device matching the expression {}",
+                                    &product
+                                ),
+                                class: class.clone(),
+                                pattern: from_value(product.clone())?,
+                            })
+                        })
+                        .fold(Ok::<_, Error>(Vec::new()), |acc, value| {
+                            let mut acc = acc?;
+                            acc.push(value?);
+                            Ok(acc)
+                        })?,
+                )?;
+            }
+
+            if previous_manifest != manifest {
+                let tmp_path = s9pk_path.with_extension("s9pk.tmp");
+                let mut tmp_file = create_file(&tmp_path).await?;
+                // TODO, wouldn't this break in the later versions of the manifest that would need changes, this doesn't seem to be a good way to handle this
+                let manifest: Manifest = from_value(manifest.clone())?;
+                let id = manifest.id.clone();
+                let mut s9pk: S9pk<_> = S9pk::new_with_manifest(archive, None, manifest);
+                let s9pk_compat_key = ctx.account.read().await.compat_s9pk_key.clone();
+                s9pk.as_archive_mut()
+                    .set_signer(s9pk_compat_key, SIG_CONTEXT);
+                s9pk.serialize(&mut tmp_file, true).await?;
+                tmp_file.sync_all().await?;
+                tokio::fs::rename(&tmp_path, &s9pk_path).await?;
+                ctx.services.load(ctx, &id, LoadDisposition::Retry).await?;
+            }
+        }
+
+        Ok(())
+    }
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
+        Ok(())
+    }
+}

From 176b1c9d206732586e8f6db3b7f331aa59bdff16 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 5 Nov 2024 10:50:24 -0700
Subject: [PATCH 309/341] allow lxc-net for tor (#2774)

* allow lxc-net for tor

* /24
---
 debian/postinst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/postinst b/debian/postinst
index 6e2e1383a..0db121c56 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -88,6 +88,7 @@ cat << EOF > /etc/tor/torrc
 SocksPort 0.0.0.0:9050
 SocksPolicy accept 127.0.0.1
 SocksPolicy accept 172.18.0.0/16
+SocksPolicy accept 10.0.3.0/24
 SocksPolicy reject *
 ControlPort 9051
 CookieAuthentication 1

From 020268fe67cf996ac1fe20cd05849a53bf0df91b Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:38:30 -0700
Subject: [PATCH 310/341] don't attempt autoconfig if config is null (#2775)

* don't attempt autoconfig if config is null

* quiet

* fixes
---
 .../Systems/SystemForEmbassy/index.ts         |   1 +
 core/startos/src/s9pk/v2/pack.rs              |  24 +--
 core/startos/src/version/v0_3_6_alpha_8.rs    | 143 +++++++++---------
 3 files changed, 87 insertions(+), 81 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index b33e83c0f..b01ca2dc1 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -929,6 +929,7 @@ export class SystemForEmbassy implements System {
         this.dependenciesAutoconfig(effects, id, timeoutMs)
       },
     })) as U.Config
+    if (!oldConfig) return
     const moduleCode = await this.moduleCode
     const method = moduleCode.dependencies?.[id]?.autoConfigure
     if (!method) return
diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index 1911152c4..67be558f1 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -1,5 +1,4 @@
-use std::collections::BTreeMap;
-use std::collections::BTreeSet;
+use std::collections::{BTreeMap, BTreeSet};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
@@ -295,7 +294,7 @@ impl TryFrom<CliImageConfig> for ImageConfig {
                 ImageSource::DockerBuild {
                     dockerfile: value.dockerfile,
                     workdir: value.workdir,
-                    build_args: None
+                    build_args: None,
                 }
             } else if let Some(tag) = value.docker_tag {
                 ImageSource::DockerTag(tag)
@@ -345,9 +344,7 @@ impl clap::FromArgMatches for ImageConfig {
 #[ts(export)]
 pub enum BuildArg {
     String(String),
-    EnvVar {
-        env: String,
-    },
+    EnvVar { env: String },
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, TS)]
@@ -361,7 +358,7 @@ pub enum ImageSource {
         dockerfile: Option<PathBuf>,
         #[serde(skip_serializing_if = "Option::is_none")]
         #[ts(optional)]
-        build_args: Option<BTreeMap<String, BuildArg>>
+        build_args: Option<BTreeMap<String, BuildArg>>,
     },
     DockerTag(String),
 }
@@ -400,7 +397,7 @@ impl ImageSource {
                 ImageSource::DockerBuild {
                     workdir,
                     dockerfile,
-                    build_args
+                    build_args,
                 } => {
                     let workdir = workdir.as_deref().unwrap_or(Path::new("."));
                     let dockerfile = dockerfile
@@ -424,7 +421,8 @@ impl ImageSource {
                         .arg("-t")
                         .arg(&tag)
                         .arg(&docker_platform)
-                        .arg("--build-arg").arg(format!("ARCH={}", arch));
+                        .arg("--build-arg")
+                        .arg(format!("ARCH={}", arch));
 
                     // add build arguments
                     if let Some(build_args) = build_args {
@@ -436,10 +434,12 @@ impl ImageSource {
                                         Ok(val) => val,
                                         Err(_) => continue, // skip if env var not set or invalid
                                     }
-                                },
+                                }
                             };
 
-                            command.arg("--build-arg").arg(format!("{}={}", key, build_arg_value));
+                            command
+                                .arg("--build-arg")
+                                .arg(format!("{}={}", key, build_arg_value));
                         }
                     }
 
@@ -580,7 +580,7 @@ fn tar2sqfs(dest: impl AsRef<Path>) -> Result<Command, Error> {
         #[cfg(target_os = "linux")]
         {
             let mut command = Command::new("tar2sqfs");
-            command.arg(&dest);
+            command.arg("-q").arg(&dest);
             command
         }
         #[cfg(target_os = "macos")]
diff --git a/core/startos/src/version/v0_3_6_alpha_8.rs b/core/startos/src/version/v0_3_6_alpha_8.rs
index b23c205e8..fcef96a69 100644
--- a/core/startos/src/version/v0_3_6_alpha_8.rs
+++ b/core/startos/src/version/v0_3_6_alpha_8.rs
@@ -3,15 +3,15 @@ use tokio::fs::File;
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_7, VersionT};
+use crate::install::PKG_ARCHIVE_DIR;
+use crate::prelude::*;
 use crate::s9pk::manifest::{DeviceFilter, Manifest};
+use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::MerkleArchive;
 use crate::s9pk::v2::SIG_CONTEXT;
 use crate::s9pk::S9pk;
+use crate::service::LoadDisposition;
 use crate::util::io::create_file;
-use crate::{
-    install::PKG_ARCHIVE_DIR, s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile,
-};
-use crate::{prelude::*, service::LoadDisposition};
 
 lazy_static::lazy_static! {
     static ref V0_3_6_alpha_8: exver::Version = exver::Version::new(
@@ -42,78 +42,83 @@ impl VersionT for Version {
     async fn post_up(self, ctx: &crate::context::RpcContext) -> Result<(), Error> {
         let s9pk_dir = ctx.datadir.join(PKG_ARCHIVE_DIR).join("installed");
 
-        for s9pk_path in s9pk_dir.read_dir()? {
-            let s9pk_path = s9pk_path?.path();
-            let matches_s9pk = s9pk_path.extension().map(|x| x == "s9pk").unwrap_or(false);
-            if !matches_s9pk {
-                continue;
-            }
-
-            let get_archive = async {
-                let multi_cursor = MultiCursorFile::from(File::open(&s9pk_path).await?);
-                Ok::<_, Error>(S9pk::archive(&multi_cursor, None).await?)
-            };
-
-            let archive: MerkleArchive<
-                crate::s9pk::merkle_archive::source::Section<MultiCursorFile>,
-            > = match get_archive.await {
-                Ok(a) => a,
-                Err(e) => {
-                    tracing::error!("Error opening s9pk for install: {e}");
-                    tracing::debug!("{e:?}");
+        if tokio::fs::metadata(&s9pk_dir).await.is_ok() {
+            let mut read_dir = tokio::fs::read_dir(&s9pk_dir).await?;
+            while let Some(s9pk_ent) = read_dir.next_entry().await? {
+                let s9pk_path = s9pk_ent.path();
+                let matches_s9pk = s9pk_path.extension().map(|x| x == "s9pk").unwrap_or(false);
+                if !matches_s9pk {
                     continue;
                 }
-            };
 
-            let previous_manifest: Value = serde_json::from_slice::<serde_json::Value>(
-                &archive
-                    .contents()
-                    .get_path("manifest.json")
-                    .or_not_found("manifest.json")?
-                    .read_file_to_vec()
-                    .await?,
-            )
-            .with_kind(ErrorKind::Deserialization)?
-            .into();
+                let get_archive = async {
+                    let multi_cursor = MultiCursorFile::from(File::open(&s9pk_path).await?);
+                    Ok::<_, Error>(S9pk::archive(&multi_cursor, None).await?)
+                };
+
+                let archive: MerkleArchive<
+                    crate::s9pk::merkle_archive::source::Section<MultiCursorFile>,
+                > = match get_archive.await {
+                    Ok(a) => a,
+                    Err(e) => {
+                        tracing::error!("Error opening s9pk for install: {e}");
+                        tracing::debug!("{e:?}");
+                        continue;
+                    }
+                };
 
-            let mut manifest = previous_manifest.clone();
+                let previous_manifest: Value = serde_json::from_slice::<serde_json::Value>(
+                    &archive
+                        .contents()
+                        .get_path("manifest.json")
+                        .or_not_found("manifest.json")?
+                        .read_file_to_vec()
+                        .await?,
+                )
+                .with_kind(ErrorKind::Deserialization)?
+                .into();
 
-            if let Some(device) = previous_manifest["hardwareRequirements"]["device"].as_object() {
-                manifest["hardwareRequirements"]["device"] = to_value(
-                    &device
-                        .into_iter()
-                        .map(|(class, product)| {
-                            Ok::<_, Error>(DeviceFilter {
-                                pattern_description: format!(
-                                    "a {class} device matching the expression {}",
-                                    &product
-                                ),
-                                class: class.clone(),
-                                pattern: from_value(product.clone())?,
+                let mut manifest = previous_manifest.clone();
+
+                if let Some(device) =
+                    previous_manifest["hardwareRequirements"]["device"].as_object()
+                {
+                    manifest["hardwareRequirements"]["device"] = to_value(
+                        &device
+                            .into_iter()
+                            .map(|(class, product)| {
+                                Ok::<_, Error>(DeviceFilter {
+                                    pattern_description: format!(
+                                        "a {class} device matching the expression {}",
+                                        &product
+                                    ),
+                                    class: class.clone(),
+                                    pattern: from_value(product.clone())?,
+                                })
                             })
-                        })
-                        .fold(Ok::<_, Error>(Vec::new()), |acc, value| {
-                            let mut acc = acc?;
-                            acc.push(value?);
-                            Ok(acc)
-                        })?,
-                )?;
-            }
+                            .fold(Ok::<_, Error>(Vec::new()), |acc, value| {
+                                let mut acc = acc?;
+                                acc.push(value?);
+                                Ok(acc)
+                            })?,
+                    )?;
+                }
 
-            if previous_manifest != manifest {
-                let tmp_path = s9pk_path.with_extension("s9pk.tmp");
-                let mut tmp_file = create_file(&tmp_path).await?;
-                // TODO, wouldn't this break in the later versions of the manifest that would need changes, this doesn't seem to be a good way to handle this
-                let manifest: Manifest = from_value(manifest.clone())?;
-                let id = manifest.id.clone();
-                let mut s9pk: S9pk<_> = S9pk::new_with_manifest(archive, None, manifest);
-                let s9pk_compat_key = ctx.account.read().await.compat_s9pk_key.clone();
-                s9pk.as_archive_mut()
-                    .set_signer(s9pk_compat_key, SIG_CONTEXT);
-                s9pk.serialize(&mut tmp_file, true).await?;
-                tmp_file.sync_all().await?;
-                tokio::fs::rename(&tmp_path, &s9pk_path).await?;
-                ctx.services.load(ctx, &id, LoadDisposition::Retry).await?;
+                if previous_manifest != manifest {
+                    let tmp_path = s9pk_path.with_extension("s9pk.tmp");
+                    let mut tmp_file = create_file(&tmp_path).await?;
+                    // TODO, wouldn't this break in the later versions of the manifest that would need changes, this doesn't seem to be a good way to handle this
+                    let manifest: Manifest = from_value(manifest.clone())?;
+                    let id = manifest.id.clone();
+                    let mut s9pk: S9pk<_> = S9pk::new_with_manifest(archive, None, manifest);
+                    let s9pk_compat_key = ctx.account.read().await.compat_s9pk_key.clone();
+                    s9pk.as_archive_mut()
+                        .set_signer(s9pk_compat_key, SIG_CONTEXT);
+                    s9pk.serialize(&mut tmp_file, true).await?;
+                    tmp_file.sync_all().await?;
+                    tokio::fs::rename(&tmp_path, &s9pk_path).await?;
+                    ctx.services.load(ctx, &id, LoadDisposition::Retry).await?;
+                }
             }
         }
 

From b79c029f21862afea0649b097fa567db180f4667 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:38:52 -0700
Subject: [PATCH 311/341] Feature/registry improvements (#2772)

* add build cli script for cross-building cli

* sdk alpha.13

* registry improvements
---
 Makefile                                      |   2 +-
 core/Cargo.lock                               |  88 +++++------
 core/build-cli.sh                             |  50 ++++++
 core/startos/registry.service                 |  13 ++
 core/startos/src/bins/mod.rs                  |  10 ++
 core/startos/src/lib.rs                       |   3 +-
 core/startos/src/logs.rs                      |  12 +-
 core/startos/src/registry/admin.rs            |  65 ++++++++
 core/startos/src/registry/info.rs             | 126 +++++++++++++++
 core/startos/src/registry/mod.rs              |  29 +---
 core/startos/src/registry/os/asset/get.rs     |  13 +-
 core/startos/src/registry/package/category.rs | 147 ++++++++++++++++++
 core/startos/src/registry/package/mod.rs      |  11 ++
 core/startos/src/registry/package/signer.rs   | 133 ++++++++++++++++
 core/startos/src/registry/signer/mod.rs       |   2 +-
 core/startos/startd.service                   |   2 +-
 sdk/package/lib/manifest/setupManifest.ts     |  13 +-
 sdk/package/package-lock.json                 |   4 +-
 sdk/package/package.json                      |   2 +-
 19 files changed, 636 insertions(+), 89 deletions(-)
 create mode 100755 core/build-cli.sh
 create mode 100644 core/startos/registry.service
 create mode 100644 core/startos/src/registry/info.rs
 create mode 100644 core/startos/src/registry/package/category.rs
 create mode 100644 core/startos/src/registry/package/signer.rs

diff --git a/Makefile b/Makefile
index c13beef94..132270636 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ touch:
 metadata: $(VERSION_FILE) $(PLATFORM_FILE) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE)
 
 sudo:
-	sudo -v
+	sudo true
 
 clean:
 	rm -f system-images/**/*.tar
diff --git a/core/Cargo.lock b/core/Cargo.lock
index acd2ceb32..32f0939d8 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -128,9 +128,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
@@ -162,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.91"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
+checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
 
 [[package]]
 name = "arrayref"
@@ -237,7 +237,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -248,7 +248,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -538,7 +538,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.85",
+ "syn 2.0.86",
  "which",
 ]
 
@@ -847,7 +847,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1255,7 +1255,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1279,7 +1279,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1321,7 +1321,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1344,7 +1344,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1367,7 +1367,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1589,7 +1589,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -1868,7 +1868,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -2849,9 +2849,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libredox"
@@ -3302,7 +3302,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3368,7 +3368,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3575,7 +3575,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3631,7 +3631,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3707,7 +3707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3805,7 +3805,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -3828,7 +3828,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -4169,7 +4169,7 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor%2Fno-dyn-ctx#39a872a1294c7d864faca63f072092ce300ffbe5"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor%2Fno-dyn-ctx#021379f21c4d11c5a62c07460f4531ce9b555155"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -4496,7 +4496,7 @@ checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -4570,7 +4570,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5003,7 +5003,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.85",
+ "syn 2.0.86",
  "unicode-width",
 ]
 
@@ -5245,9 +5245,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5363,22 +5363,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.65"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.65"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5494,7 +5494,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5768,7 +5768,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -5920,7 +5920,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
  "termcolor",
 ]
 
@@ -5990,7 +5990,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -6215,7 +6215,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
  "wasm-bindgen-shared",
 ]
 
@@ -6249,7 +6249,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6633,7 +6633,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
@@ -6653,7 +6653,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.86",
 ]
 
 [[package]]
diff --git a/core/build-cli.sh b/core/build-cli.sh
new file mode 100755
index 000000000..8e069a690
--- /dev/null
+++ b/core/build-cli.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+set -ea
+shopt -s expand_aliases
+
+if [ -z "$ARCH" ]; then
+	ARCH=$(uname -m)
+fi
+if [ "$ARCH" = "arm64" ]; then
+  ARCH="aarch64"
+fi
+
+if [ -z "$KERNEL_NAME" ]; then
+	KERNEL_NAME=$(uname -s)
+fi
+
+if [ -z "$TARGET" ]; then
+	if [ "$KERNEL_NAME" = "Linux" ]; then
+		TARGET="$ARCH-unknown-linux-musl"
+	elif [ "$KERNEL_NAME" = "Darwin" ]; then
+		TARGET="$ARCH-apple-darwin"
+	else
+		>&2 echo "unknown kernel $KERNEL_NAME"
+		exit 1
+	fi
+fi
+
+USE_TTY=
+if tty -s; then
+	USE_TTY="-it"
+fi
+
+cd ..
+FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
+RUSTFLAGS=""
+
+if [[ "${ENVIRONMENT}" =~ (^|-)unstable($|-) ]]; then
+	RUSTFLAGS="--cfg tokio_unstable"
+fi
+
+alias 'rust-zig-builder'='docker run $USE_TTY --rm -e "RUSTFLAGS=$RUSTFLAGS" -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$HOME/.cargo/git":/root/.cargo/git -v "$(pwd)":/home/rust/src -w /home/rust/src -P messense/cargo-zigbuild'
+
+echo "FEATURES=\"$FEATURES\""
+echo "RUSTFLAGS=\"$RUSTFLAGS\""
+rust-zig-builder sh -c "cd core && cargo zigbuild --release --no-default-features --features cli,daemon,$FEATURES --locked --bin start-cli --target=$TARGET"
+if [ "$(ls -nd core/target/$TARGET/release/start-cli | awk '{ print $3 }')" != "$UID" ]; then
+	rust-zig-builder sh -c "cd core && chown -R $UID:$UID target && chown -R $UID:$UID /root/.cargo"
+fi
\ No newline at end of file
diff --git a/core/startos/registry.service b/core/startos/registry.service
new file mode 100644
index 000000000..63941a25e
--- /dev/null
+++ b/core/startos/registry.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=StartOS Registry
+
+[Service]
+Type=simple
+Environment=RUST_LOG=startos=debug,patch_db=warn
+ExecStart=/usr/local/bin/registry
+Restart=always
+RestartSec=3
+ManagedOOMPreference=avoid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/startos/src/bins/mod.rs b/core/startos/src/bins/mod.rs
index 4a4670a5b..6ffecfce9 100644
--- a/core/startos/src/bins/mod.rs
+++ b/core/startos/src/bins/mod.rs
@@ -28,6 +28,16 @@ fn select_executable(name: &str) -> Option<fn(VecDeque<OsString>)> {
         "embassy-sdk" => Some(|_| deprecated::renamed("embassy-sdk", "start-sdk")),
         "embassyd" => Some(|_| deprecated::renamed("embassyd", "startd")),
         "embassy-init" => Some(|_| deprecated::removed("embassy-init")),
+        "contents" => Some(|_| {
+            #[cfg(feature = "cli")]
+            println!("start-cli");
+            #[cfg(feature = "container-runtime")]
+            println!("start-cli (container)");
+            #[cfg(feature = "daemon")]
+            println!("startd");
+            #[cfg(feature = "registry")]
+            println!("registry");
+        }),
         _ => None,
     }
 }
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index d9d626754..83c4d462d 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -115,8 +115,7 @@ pub fn main_api<C: Context>() -> ParentHandler<C> {
     let api = ParentHandler::new()
         .subcommand(
             "git-info",
-            from_fn(|_: RpcContext| version::git_info())
-                .with_about("Display the githash of StartOS CLI"),
+            from_fn(|_: C| version::git_info()).with_about("Display the githash of StartOS CLI"),
         )
         .subcommand(
             "echo",
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 2db7e9952..1cb3327b6 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -360,11 +360,7 @@ pub fn logs<
     source: impl for<'a> LogSourceFn<'a, C, Extra>,
 ) -> ParentHandler<C, LogsParams<Extra>> {
     ParentHandler::new()
-        .root_handler(
-            logs_nofollow::<C, Extra>(source.clone())
-                .with_inherited(|params, _| params)
-                .no_cli(),
-        )
+        .root_handler(logs_nofollow::<C, Extra>(source.clone()).no_cli())
         .subcommand(
             "follow",
             logs_follow::<C, Extra>(source)
@@ -436,7 +432,7 @@ where
 
 fn logs_nofollow<C, Extra>(
     f: impl for<'a> LogSourceFn<'a, C, Extra>,
-) -> impl HandlerFor<C, Params = Empty, InheritedParams = LogsParams<Extra>, Ok = LogResponse, Err = Error>
+) -> impl HandlerFor<C, Params = LogsParams<Extra>, InheritedParams = Empty, Ok = LogResponse, Err = Error>
 where
     C: Context,
     Extra: FromArgMatches + Args + Send + Sync + 'static,
@@ -444,7 +440,7 @@ where
     from_fn_async(
         move |HandlerArgs {
                   context,
-                  inherited_params:
+                  params:
                       LogsParams {
                           extra,
                           limit,
@@ -453,7 +449,7 @@ where
                           before,
                       },
                   ..
-              }: HandlerArgs<C, Empty, LogsParams<Extra>>| {
+              }: HandlerArgs<C, LogsParams<Extra>>| {
             let f = f.clone();
             async move {
                 fetch_logs(
diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index a327a9587..f3cac9f7e 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -60,6 +60,13 @@ fn signers_api<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(cli_add_signer).with_about("Add signer"),
         )
+        .subcommand(
+            "edit",
+            from_fn_async(edit_signer)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
 }
 
 impl Model<BTreeMap<Guid, SignerInfo>> {
@@ -143,6 +150,64 @@ pub async fn add_signer(ctx: RegistryContext, signer: SignerInfo) -> Result<Guid
         .await
 }
 
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+#[ts(export)]
+pub struct EditSignerParams {
+    pub id: Guid,
+    #[arg(short = 'n', long)]
+    pub set_name: Option<String>,
+    #[arg(short = 'c', long)]
+    pub add_contact: Vec<ContactInfo>,
+    #[arg(short = 'k', long)]
+    pub add_key: Vec<AnyVerifyingKey>,
+    #[arg(short = 'C', long)]
+    pub remove_contact: Vec<ContactInfo>,
+    #[arg(short = 'K', long)]
+    pub remove_key: Vec<AnyVerifyingKey>,
+}
+
+pub async fn edit_signer(
+    ctx: RegistryContext,
+    EditSignerParams {
+        id,
+        set_name,
+        add_contact,
+        add_key,
+        remove_contact,
+        remove_key,
+    }: EditSignerParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_index_mut()
+                .as_signers_mut()
+                .as_idx_mut(&id)
+                .or_not_found(&id)?
+                .mutate(|s| {
+                    if let Some(name) = set_name {
+                        s.name = name;
+                    }
+                    s.contact.extend(add_contact);
+                    for rm in remove_contact {
+                        let Some((idx, _)) = s.contact.iter().enumerate().find(|(_, c)| *c == &rm)
+                        else {
+                            continue;
+                        };
+                        s.contact.remove(idx);
+                    }
+
+                    s.keys.extend(add_key);
+                    for rm in remove_key {
+                        s.keys.remove(&rm);
+                    }
+                    Ok(())
+                })
+        })
+        .await
+}
+
 #[derive(Debug, Deserialize, Serialize, Parser)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
diff --git a/core/startos/src/registry/info.rs b/core/startos/src/registry/info.rs
new file mode 100644
index 000000000..402f0891a
--- /dev/null
+++ b/core/startos/src/registry/info.rs
@@ -0,0 +1,126 @@
+use std::collections::BTreeMap;
+use std::path::PathBuf;
+
+use clap::Parser;
+use imbl_value::InternedString;
+use itertools::Itertools;
+use models::DataUrl;
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerArgs, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::registry::context::RegistryContext;
+use crate::registry::package::index::Category;
+use crate::util::serde::{HandlerExtSerde, WithIoFormat};
+
+pub fn info_api<C: Context>() -> ParentHandler<C, WithIoFormat<Empty>> {
+    ParentHandler::<C, WithIoFormat<Empty>>::new()
+        .root_handler(
+            from_fn_async(get_info)
+                .with_display_serializable()
+                .with_about("Display registry name, icon, and package categories")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "set-name",
+            from_fn_async(set_name)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_about("Set the name for the registry")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "set-icon",
+            from_fn_async(set_icon)
+                .with_metadata("admin", Value::Bool(true))
+                .no_cli(),
+        )
+        .subcommand(
+            "set-icon",
+            from_fn_async(cli_set_icon)
+                .no_display()
+                .with_about("Set the icon for the registry"),
+        )
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct RegistryInfo {
+    pub name: Option<String>,
+    pub icon: Option<DataUrl<'static>>,
+    #[ts(as = "BTreeMap::<String, Category>")]
+    pub categories: BTreeMap<InternedString, Category>,
+}
+
+pub async fn get_info(ctx: RegistryContext) -> Result<RegistryInfo, Error> {
+    let peek = ctx.db.peek().await.into_index();
+    Ok(RegistryInfo {
+        name: peek.as_name().de()?,
+        icon: peek.as_icon().de()?,
+        categories: peek.as_package().as_categories().de()?,
+    })
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetNameParams {
+    pub name: String,
+}
+
+pub async fn set_name(
+    ctx: RegistryContext,
+    SetNameParams { name }: SetNameParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| db.as_index_mut().as_name_mut().ser(&Some(name)))
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct SetIconParams {
+    pub icon: DataUrl<'static>,
+}
+
+pub async fn set_icon(
+    ctx: RegistryContext,
+    SetIconParams { icon }: SetIconParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| db.as_index_mut().as_icon_mut().ser(&Some(icon)))
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct CliSetIconParams {
+    pub icon: PathBuf,
+}
+
+pub async fn cli_set_icon(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params: CliSetIconParams { icon },
+        ..
+    }: HandlerArgs<CliContext, CliSetIconParams>,
+) -> Result<(), Error> {
+    let data_url = DataUrl::from_path(icon).await?;
+    ctx.call_remote::<RegistryContext>(
+        &parent_method.into_iter().chain(method).join("."),
+        imbl_value::json!({
+            "icon": data_url,
+        }),
+    )
+    .await?;
+    Ok(())
+}
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index 6a90ab640..0cbbce4e0 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -28,6 +28,7 @@ pub mod auth;
 pub mod context;
 pub mod db;
 pub mod device_info;
+pub mod info;
 pub mod os;
 pub mod package;
 pub mod signer;
@@ -57,25 +58,6 @@ pub async fn get_full_index(ctx: RegistryContext) -> Result<FullIndex, Error> {
     ctx.db.peek().await.into_index().de()
 }
 
-#[derive(Debug, Default, Deserialize, Serialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export)]
-pub struct RegistryInfo {
-    pub name: Option<String>,
-    pub icon: Option<DataUrl<'static>>,
-    #[ts(as = "BTreeMap::<String, Category>")]
-    pub categories: BTreeMap<InternedString, Category>,
-}
-
-pub async fn get_info(ctx: RegistryContext) -> Result<RegistryInfo, Error> {
-    let peek = ctx.db.peek().await.into_index();
-    Ok(RegistryInfo {
-        name: peek.as_name().de()?,
-        icon: peek.as_icon().de()?,
-        categories: peek.as_package().as_categories().de()?,
-    })
-}
-
 pub fn registry_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
@@ -85,13 +67,8 @@ pub fn registry_api<C: Context>() -> ParentHandler<C> {
                 .with_about("List info including registry name and packages")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand(
-            "info",
-            from_fn_async(get_info)
-                .with_display_serializable()
-                .with_about("Display registry name, icon, and package categories")
-                .with_call_remote::<CliContext>(),
-        )
+        .subcommand("info", info::info_api::<C>())
+        // set info and categories
         .subcommand(
             "os",
             os::os_api::<C>().with_about("Commands related to OS assets and versions"),
diff --git a/core/startos/src/registry/os/asset/get.rs b/core/startos/src/registry/os/asset/get.rs
index 6c0479964..0d63435f2 100644
--- a/core/startos/src/registry/os/asset/get.rs
+++ b/core/startos/src/registry/os/asset/get.rs
@@ -40,7 +40,12 @@ pub fn get_api<C: Context>() -> ParentHandler<C> {
                 .with_about("Download img"),
         )
         .subcommand("squashfs", from_fn_async(get_squashfs).no_cli())
-        .subcommand("squashfs", from_fn_async(cli_get_os_asset).no_display().with_about("Download squashfs"))
+        .subcommand(
+            "squashfs",
+            from_fn_async(cli_get_os_asset)
+                .no_display()
+                .with_about("Download squashfs"),
+        )
 }
 
 #[derive(Debug, Deserialize, Serialize, TS)]
@@ -104,7 +109,11 @@ pub async fn get_squashfs(
 pub struct CliGetOsAssetParams {
     pub version: Version,
     pub platform: InternedString,
-    #[arg(long = "download", short = 'd')]
+    #[arg(
+        long = "download",
+        short = 'd',
+        help = "The path of the directory to download to"
+    )]
     pub download: Option<PathBuf>,
     #[arg(
         long = "reverify",
diff --git a/core/startos/src/registry/package/category.rs b/core/startos/src/registry/package/category.rs
new file mode 100644
index 000000000..97b0fb227
--- /dev/null
+++ b/core/startos/src/registry/package/category.rs
@@ -0,0 +1,147 @@
+use std::collections::BTreeMap;
+
+use clap::Parser;
+use imbl_value::InternedString;
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::registry::context::RegistryContext;
+use crate::registry::package::index::Category;
+use crate::s9pk::manifest::Description;
+use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
+
+pub fn category_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "add",
+            from_fn_async(add_category)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_about("Add a category to the registry")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove_category)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_about("Remove a category from the registry")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list_categories)
+                .with_display_serializable()
+                .with_custom_display_fn(|params, categories| {
+                    Ok(display_categories(params.params, categories))
+                })
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct AddCategoryParams {
+    #[ts(type = "string")]
+    pub id: InternedString,
+    pub name: String,
+    #[arg(short, long, help = "Short description for the category")]
+    pub short: String,
+    #[arg(short, long, help = "Long description for the category")]
+    pub long: String,
+}
+
+pub async fn add_category(
+    ctx: RegistryContext,
+    AddCategoryParams {
+        id,
+        name,
+        short,
+        long,
+    }: AddCategoryParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_index_mut()
+                .as_package_mut()
+                .as_categories_mut()
+                .insert(
+                    &id,
+                    &Category {
+                        name,
+                        description: Description { short, long },
+                    },
+                )
+        })
+        .await?;
+    Ok(())
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct RemoveCategoryParams {
+    #[ts(type = "string")]
+    pub id: InternedString,
+}
+
+pub async fn remove_category(
+    ctx: RegistryContext,
+    RemoveCategoryParams { id }: RemoveCategoryParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_index_mut()
+                .as_package_mut()
+                .as_categories_mut()
+                .remove(&id)
+        })
+        .await?;
+    Ok(())
+}
+
+pub async fn list_categories(
+    ctx: RegistryContext,
+) -> Result<BTreeMap<InternedString, Category>, Error> {
+    ctx.db
+        .peek()
+        .await
+        .into_index()
+        .into_package()
+        .into_categories()
+        .de()
+}
+
+pub fn display_categories<T>(
+    params: WithIoFormat<T>,
+    categories: BTreeMap<InternedString, Category>,
+) {
+    use prettytable::*;
+
+    if let Some(format) = params.format {
+        return display_serializable(format, categories);
+    }
+
+    let mut table = Table::new();
+    table.add_row(row![bc =>
+        "ID",
+        "NAME",
+        "SHORT DESCRIPTION",
+        "LONG DESCRIPTION",
+    ]);
+    for (id, info) in categories {
+        table.add_row(row![
+            &*id,
+            &info.name,
+            &info.description.short,
+            &info.description.long,
+        ]);
+    }
+    table.print_tty(false).unwrap();
+}
diff --git a/core/startos/src/registry/package/mod.rs b/core/startos/src/registry/package/mod.rs
index ef312dc28..74d244deb 100644
--- a/core/startos/src/registry/package/mod.rs
+++ b/core/startos/src/registry/package/mod.rs
@@ -5,8 +5,10 @@ use crate::prelude::*;
 use crate::util::serde::HandlerExtSerde;
 
 pub mod add;
+pub mod category;
 pub mod get;
 pub mod index;
+pub mod signer;
 
 pub fn package_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -29,6 +31,10 @@ pub fn package_api<C: Context>() -> ParentHandler<C> {
                 .no_display()
                 .with_about("Add package to registry index"),
         )
+        .subcommand(
+            "signer",
+            signer::signer_api::<C>().with_about("Add, remove, and list package signers"),
+        )
         .subcommand(
             "get",
             from_fn_async(get::get_package)
@@ -40,4 +46,9 @@ pub fn package_api<C: Context>() -> ParentHandler<C> {
                 .with_about("List installation candidate package(s)")
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "category",
+            category::category_api::<C>()
+                .with_about("Update the categories for packages on the registry"),
+        )
 }
diff --git a/core/startos/src/registry/package/signer.rs b/core/startos/src/registry/package/signer.rs
new file mode 100644
index 000000000..56bfc9b1c
--- /dev/null
+++ b/core/startos/src/registry/package/signer.rs
@@ -0,0 +1,133 @@
+use std::collections::BTreeMap;
+
+use clap::Parser;
+use models::PackageId;
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::context::CliContext;
+use crate::prelude::*;
+use crate::registry::admin::display_signers;
+use crate::registry::context::RegistryContext;
+use crate::registry::signer::SignerInfo;
+use crate::rpc_continuations::Guid;
+use crate::util::serde::HandlerExtSerde;
+
+pub fn signer_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "add",
+            from_fn_async(add_package_signer)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_about("Add package signer")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove_package_signer)
+                .with_metadata("admin", Value::Bool(true))
+                .no_display()
+                .with_about("Remove package signer")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list_package_signers)
+                .with_display_serializable()
+                .with_custom_display_fn(|handle, result| Ok(display_signers(handle.params, result)))
+                .with_about("List package signers and related signer info")
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct PackageSignerParams {
+    pub id: PackageId,
+    pub signer: Guid,
+}
+
+pub async fn add_package_signer(
+    ctx: RegistryContext,
+    PackageSignerParams { id, signer }: PackageSignerParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            ensure_code!(
+                db.as_index().as_signers().contains_key(&signer)?,
+                ErrorKind::InvalidRequest,
+                "unknown signer {signer}"
+            );
+
+            db.as_index_mut()
+                .as_package_mut()
+                .as_packages_mut()
+                .as_idx_mut(&id)
+                .or_not_found(&id)?
+                .as_authorized_mut()
+                .mutate(|s| Ok(s.insert(signer)))?;
+
+            Ok(())
+        })
+        .await
+}
+
+pub async fn remove_package_signer(
+    ctx: RegistryContext,
+    PackageSignerParams { id, signer }: PackageSignerParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            if !db
+                .as_index_mut()
+                .as_package_mut()
+                .as_packages_mut()
+                .as_idx_mut(&id)
+                .or_not_found(&id)?
+                .as_authorized_mut()
+                .mutate(|s| Ok(s.remove(&signer)))?
+            {
+                return Err(Error::new(
+                    eyre!("signer {signer} is not authorized to sign for {id}"),
+                    ErrorKind::NotFound,
+                ));
+            }
+
+            Ok(())
+        })
+        .await
+}
+
+#[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[command(rename_all = "kebab-case")]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct ListPackageSignersParams {
+    pub id: PackageId,
+}
+
+pub async fn list_package_signers(
+    ctx: RegistryContext,
+    ListPackageSignersParams { id }: ListPackageSignersParams,
+) -> Result<BTreeMap<Guid, SignerInfo>, Error> {
+    let db = ctx.db.peek().await;
+    db.as_index()
+        .as_package()
+        .as_packages()
+        .as_idx(&id)
+        .or_not_found(&id)?
+        .as_authorized()
+        .de()?
+        .into_iter()
+        .filter_map(|guid| {
+            db.as_index()
+                .as_signers()
+                .as_idx(&guid)
+                .map(|s| s.de().map(|s| (guid, s)))
+        })
+        .collect()
+}
diff --git a/core/startos/src/registry/signer/mod.rs b/core/startos/src/registry/signer/mod.rs
index c203f0dad..137c40f0f 100644
--- a/core/startos/src/registry/signer/mod.rs
+++ b/core/startos/src/registry/signer/mod.rs
@@ -25,7 +25,7 @@ pub struct SignerInfo {
     pub keys: HashSet<AnyVerifyingKey>,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 // TODO: better types
diff --git a/core/startos/startd.service b/core/startos/startd.service
index 56cf92e22..6ce17697e 100644
--- a/core/startos/startd.service
+++ b/core/startos/startd.service
@@ -3,7 +3,7 @@ Description=StartOS Daemon
 
 [Service]
 Type=simple
-Environment=RUST_LOG=startos=debug,js_engine=debug,patch_db=warn
+Environment=RUST_LOG=startos=debug,patch_db=warn
 ExecStart=/usr/bin/startd
 Restart=always
 RestartSec=3
diff --git a/sdk/package/lib/manifest/setupManifest.ts b/sdk/package/lib/manifest/setupManifest.ts
index 2ae999e62..c529f1ab7 100644
--- a/sdk/package/lib/manifest/setupManifest.ts
+++ b/sdk/package/lib/manifest/setupManifest.ts
@@ -6,6 +6,7 @@ import {
 } from "../../../base/lib/types/ManifestTypes"
 import { SDKVersion } from "../StartSdk"
 import { VersionGraph } from "../version/VersionGraph"
+import { execSync } from "child_process"
 
 /**
  * @description Use this function to define critical information about your package
@@ -26,6 +27,16 @@ export function setupManifest<
   return manifest
 }
 
+function gitHash(): string {
+  const hash = execSync("git rev-parse HEAD").toString().trim()
+  try {
+    execSync("git diff-index --quiet HEAD --")
+    return hash
+  } catch (e) {
+    return hash + "-modified"
+  }
+}
+
 export function buildManifest<
   Id extends string,
   Version extends string,
@@ -56,7 +67,7 @@ export function buildManifest<
   )
   return {
     ...manifest,
-    gitHash: null,
+    gitHash: gitHash(),
     osVersion: SDKVersion,
     version: versions.current.options.version,
     releaseNotes: versions.current.options.releaseNotes,
diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
index 2294d800b..2cc87d374 100644
--- a/sdk/package/package-lock.json
+++ b/sdk/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha9",
+  "version": "0.3.6-alpha.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha9",
+      "version": "0.3.6-alpha.13",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/sdk/package/package.json b/sdk/package/package.json
index acc523594..661263f70 100644
--- a/sdk/package/package.json
+++ b/sdk/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha.12",
+  "version": "0.3.6-alpha.13",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",

From 6ab6502742c6dc22061bf2fe1e590fd5d7426993 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:52:38 -0700
Subject: [PATCH 312/341] alpha.8 (#2776)

---
 core/Cargo.lock                                     |  2 +-
 core/startos/Cargo.toml                             |  2 +-
 sdk/base/lib/osBindings/AddCategoryParams.ts        |  8 ++++++++
 sdk/base/lib/osBindings/CliSetIconParams.ts         |  3 +++
 sdk/base/lib/osBindings/EditSignerParams.ts         | 13 +++++++++++++
 sdk/base/lib/osBindings/ListPackageSignersParams.ts |  4 ++++
 sdk/base/lib/osBindings/PackageSignerParams.ts      |  5 +++++
 sdk/base/lib/osBindings/RemoveCategoryParams.ts     |  3 +++
 sdk/base/lib/osBindings/SetIconParams.ts            |  4 ++++
 sdk/base/lib/osBindings/SetNameParams.ts            |  3 +++
 sdk/base/lib/osBindings/index.ts                    |  8 ++++++++
 web/package.json                                    |  2 +-
 web/patchdb-ui-seed.json                            |  2 +-
 .../src/app/modals/os-welcome/os-welcome.page.html  |  2 +-
 14 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 sdk/base/lib/osBindings/AddCategoryParams.ts
 create mode 100644 sdk/base/lib/osBindings/CliSetIconParams.ts
 create mode 100644 sdk/base/lib/osBindings/EditSignerParams.ts
 create mode 100644 sdk/base/lib/osBindings/ListPackageSignersParams.ts
 create mode 100644 sdk/base/lib/osBindings/PackageSignerParams.ts
 create mode 100644 sdk/base/lib/osBindings/RemoveCategoryParams.ts
 create mode 100644 sdk/base/lib/osBindings/SetIconParams.ts
 create mode 100644 sdk/base/lib/osBindings/SetNameParams.ts

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 32f0939d8..490edf223 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5051,7 +5051,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.7"
+version = "0.3.6-alpha.8"
 dependencies = [
  "aes",
  "async-compression",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 77a710df7..3a9935373 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.7"
+version = "0.3.6-alpha.8"
 license = "MIT"
 
 [lib]
diff --git a/sdk/base/lib/osBindings/AddCategoryParams.ts b/sdk/base/lib/osBindings/AddCategoryParams.ts
new file mode 100644
index 000000000..799f2d4d2
--- /dev/null
+++ b/sdk/base/lib/osBindings/AddCategoryParams.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AddCategoryParams = {
+  id: string
+  name: string
+  short: string
+  long: string
+}
diff --git a/sdk/base/lib/osBindings/CliSetIconParams.ts b/sdk/base/lib/osBindings/CliSetIconParams.ts
new file mode 100644
index 000000000..4e47362b6
--- /dev/null
+++ b/sdk/base/lib/osBindings/CliSetIconParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type CliSetIconParams = { icon: string }
diff --git a/sdk/base/lib/osBindings/EditSignerParams.ts b/sdk/base/lib/osBindings/EditSignerParams.ts
new file mode 100644
index 000000000..9532709a6
--- /dev/null
+++ b/sdk/base/lib/osBindings/EditSignerParams.ts
@@ -0,0 +1,13 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AnyVerifyingKey } from "./AnyVerifyingKey"
+import type { ContactInfo } from "./ContactInfo"
+import type { Guid } from "./Guid"
+
+export type EditSignerParams = {
+  id: Guid
+  setName: string | null
+  addContact: Array<ContactInfo>
+  addKey: Array<AnyVerifyingKey>
+  removeContact: Array<ContactInfo>
+  removeKey: Array<AnyVerifyingKey>
+}
diff --git a/sdk/base/lib/osBindings/ListPackageSignersParams.ts b/sdk/base/lib/osBindings/ListPackageSignersParams.ts
new file mode 100644
index 000000000..73cd6a745
--- /dev/null
+++ b/sdk/base/lib/osBindings/ListPackageSignersParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { PackageId } from "./PackageId"
+
+export type ListPackageSignersParams = { id: PackageId }
diff --git a/sdk/base/lib/osBindings/PackageSignerParams.ts b/sdk/base/lib/osBindings/PackageSignerParams.ts
new file mode 100644
index 000000000..b131e3e23
--- /dev/null
+++ b/sdk/base/lib/osBindings/PackageSignerParams.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Guid } from "./Guid"
+import type { PackageId } from "./PackageId"
+
+export type PackageSignerParams = { id: PackageId; signer: Guid }
diff --git a/sdk/base/lib/osBindings/RemoveCategoryParams.ts b/sdk/base/lib/osBindings/RemoveCategoryParams.ts
new file mode 100644
index 000000000..4f468fee7
--- /dev/null
+++ b/sdk/base/lib/osBindings/RemoveCategoryParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type RemoveCategoryParams = { id: string }
diff --git a/sdk/base/lib/osBindings/SetIconParams.ts b/sdk/base/lib/osBindings/SetIconParams.ts
new file mode 100644
index 000000000..f10eaa50b
--- /dev/null
+++ b/sdk/base/lib/osBindings/SetIconParams.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DataUrl } from "./DataUrl"
+
+export type SetIconParams = { icon: DataUrl }
diff --git a/sdk/base/lib/osBindings/SetNameParams.ts b/sdk/base/lib/osBindings/SetNameParams.ts
new file mode 100644
index 000000000..df49d7be5
--- /dev/null
+++ b/sdk/base/lib/osBindings/SetNameParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetNameParams = { name: string }
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index 10c2098bf..acd555219 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -16,6 +16,7 @@ export { ActionSeverity } from "./ActionSeverity"
 export { ActionVisibility } from "./ActionVisibility"
 export { AddAdminParams } from "./AddAdminParams"
 export { AddAssetParams } from "./AddAssetParams"
+export { AddCategoryParams } from "./AddCategoryParams"
 export { AddPackageParams } from "./AddPackageParams"
 export { AddressInfo } from "./AddressInfo"
 export { AddSslOptions } from "./AddSslOptions"
@@ -50,6 +51,7 @@ export { ClearActionsParams } from "./ClearActionsParams"
 export { ClearBindingsParams } from "./ClearBindingsParams"
 export { ClearCallbacksParams } from "./ClearCallbacksParams"
 export { ClearServiceInterfacesParams } from "./ClearServiceInterfacesParams"
+export { CliSetIconParams } from "./CliSetIconParams"
 export { ContactInfo } from "./ContactInfo"
 export { CreateSubcontainerFsParams } from "./CreateSubcontainerFsParams"
 export { CurrentDependencies } from "./CurrentDependencies"
@@ -65,6 +67,7 @@ export { DestroySubcontainerFsParams } from "./DestroySubcontainerFsParams"
 export { DeviceFilter } from "./DeviceFilter"
 export { Duration } from "./Duration"
 export { EchoParams } from "./EchoParams"
+export { EditSignerParams } from "./EditSignerParams"
 export { EncryptedWire } from "./EncryptedWire"
 export { ExportActionParams } from "./ExportActionParams"
 export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams"
@@ -109,6 +112,7 @@ export { InstallParams } from "./InstallParams"
 export { IpHostname } from "./IpHostname"
 export { IpInfo } from "./IpInfo"
 export { LanInfo } from "./LanInfo"
+export { ListPackageSignersParams } from "./ListPackageSignersParams"
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"
 export { ListVersionSignersParams } from "./ListVersionSignersParams"
 export { LoginParams } from "./LoginParams"
@@ -133,6 +137,7 @@ export { PackageId } from "./PackageId"
 export { PackageIndex } from "./PackageIndex"
 export { PackageInfoShort } from "./PackageInfoShort"
 export { PackageInfo } from "./PackageInfo"
+export { PackageSignerParams } from "./PackageSignerParams"
 export { PackageState } from "./PackageState"
 export { PackageVersionInfo } from "./PackageVersionInfo"
 export { PasswordType } from "./PasswordType"
@@ -143,6 +148,7 @@ export { Public } from "./Public"
 export { RecoverySource } from "./RecoverySource"
 export { RegistryAsset } from "./RegistryAsset"
 export { RegistryInfo } from "./RegistryInfo"
+export { RemoveCategoryParams } from "./RemoveCategoryParams"
 export { RemoveVersionParams } from "./RemoveVersionParams"
 export { ReplayId } from "./ReplayId"
 export { RequestActionParams } from "./RequestActionParams"
@@ -161,8 +167,10 @@ export { Session } from "./Session"
 export { SetDataVersionParams } from "./SetDataVersionParams"
 export { SetDependenciesParams } from "./SetDependenciesParams"
 export { SetHealth } from "./SetHealth"
+export { SetIconParams } from "./SetIconParams"
 export { SetMainStatusStatus } from "./SetMainStatusStatus"
 export { SetMainStatus } from "./SetMainStatus"
+export { SetNameParams } from "./SetNameParams"
 export { SetStoreParams } from "./SetStoreParams"
 export { SetupExecuteParams } from "./SetupExecuteParams"
 export { SetupProgress } from "./SetupProgress"
diff --git a/web/package.json b/web/package.json
index f1146118d..e8aafc8c7 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.7",
+  "version": "0.3.6-alpha.8",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index 3256bb87c..c6b967e29 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -21,5 +21,5 @@
   "ackInstructions": {},
   "theme": "Dark",
   "widgets": [],
-  "ack-welcome": "0.3.6-alpha.7"
+  "ack-welcome": "0.3.6-alpha.8"
 }
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 3e4fe52f3..0b06c4a90 100644
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -12,7 +12,7 @@
 <ion-content class="ion-padding">
   <h2>This Release</h2>
 
-  <h4>0.3.6-alpha.7</h4>
+  <h4>0.3.6-alpha.8</h4>
   <h6>This is an ALPHA release! DO NOT use for production data!</h6>
   <h6>
     Expect that any data you create or store on this version of the OS can be

From 1c90303914090fb9dca42825f072c565339a2592 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Fri, 8 Nov 2024 11:57:42 -0700
Subject: [PATCH 313/341] closes #2340 and #2431, fixes bug with select all for
 backup (#2780)

* closes #2340 and #2431, fixes bug with select all for backup

* revefrt mock
---
 web/package-lock.json                         |  4 +-
 .../backup-select/backup-select.page.ts       |  4 +-
 .../diagnostic-routes/home/home.page.html     | 10 ++---
 .../pages/diagnostic-routes/home/home.page.ts |  2 +
 .../diagnostic-routes/logs/logs.page.html     | 10 +++++
 .../pages/diagnostic-routes/logs/logs.page.ts | 45 ++++++++++++++++++-
 6 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 826feb631..764694127 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.6",
+  "version": "0.3.6-alpha.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "startos-ui",
-      "version": "0.3.6-alpha.6",
+      "version": "0.3.6-alpha.8",
       "license": "MIT",
       "dependencies": {
         "@angular/animations": "^14.1.0",
diff --git a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
index 2b6934c39..32770af76 100644
--- a/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
+++ b/web/projects/ui/src/app/modals/backup-select/backup-select.page.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { ModalController } from '@ionic/angular'
-import { map, take } from 'rxjs/operators'
+import { map } from 'rxjs/operators'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { PatchDB } from 'patch-db-client'
 import { firstValueFrom } from 'rxjs'
@@ -13,7 +13,7 @@ import { getManifest } from 'src/app/util/get-package-data'
 })
 export class BackupSelectPage {
   hasSelection = false
-  selectAll = false
+  selectAll = true
   pkgs: {
     id: string
     title: string
diff --git a/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.html b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.html
index 69a58a3aa..7605d2a8e 100644
--- a/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.html
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.html
@@ -1,12 +1,10 @@
 <ion-content>
   <div style="padding: 48px">
     <ng-container *ngIf="!restarted; else refresh">
-      <h1
-        class="ion-text-center"
-        style="padding-bottom: 36px; font-size: calc(2vw + 14px)"
-      >
-        StartOS - Diagnostic Mode
-      </h1>
+      <div class="ion-text-center" style="padding-bottom: 36px">
+        <h1 style="font-size: calc(2vw + 14px)">StartOS - Diagnostic Mode</h1>
+        <p>StartOS version: {{ config.version }}</p>
+      </div>
 
       <ng-container *ngIf="error">
         <h2
diff --git a/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
index 00ee305bc..8912359a3 100644
--- a/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/home/home.page.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core'
 import { AlertController } from '@ionic/angular'
 import { LoadingService } from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { ConfigService } from 'src/app/services/config.service'
 
 @Component({
   selector: 'diagnostic-home',
@@ -22,6 +23,7 @@ export class HomePage {
     private readonly loader: LoadingService,
     private readonly api: ApiService,
     private readonly alertCtrl: AlertController,
+    readonly config: ConfigService,
   ) {}
 
   async ngOnInit() {
diff --git a/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.html b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.html
index 6abfaa929..970f9083f 100644
--- a/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.html
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.html
@@ -4,6 +4,16 @@
       <ion-back-button defaultHref="/"></ion-back-button>
     </ion-buttons>
     <ion-title>Logs</ion-title>
+    <ion-button
+      slot="end"
+      class="ion-padding-end"
+      fill="clear"
+      strong
+      (click)="download()"
+    >
+      Download
+      <ion-icon slot="end" name="download-outline"></ion-icon>
+    </ion-button>
   </ion-toolbar>
 </ion-header>
 
diff --git a/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
index 1a6cf6a4f..d8e6b2253 100644
--- a/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
+++ b/web/projects/ui/src/app/pages/diagnostic-routes/logs/logs.page.ts
@@ -1,6 +1,12 @@
 import { Component, ViewChild } from '@angular/core'
 import { IonContent } from '@ionic/angular'
-import { ErrorService, toLocalIsoString } from '@start9labs/shared'
+import {
+  DownloadHTMLService,
+  ErrorService,
+  LoadingService,
+  Log,
+  toLocalIsoString,
+} from '@start9labs/shared'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 var Convert = require('ansi-to-html')
@@ -24,6 +30,8 @@ export class LogsPage {
   constructor(
     private readonly api: ApiService,
     private readonly errorService: ErrorService,
+    private readonly loader: LoadingService,
+    private readonly downloadHtml: DownloadHTMLService,
   ) {}
 
   async ngOnInit() {
@@ -47,6 +55,30 @@ export class LogsPage {
     e.target.complete()
   }
 
+  async download() {
+    const loader = this.loader.open('Processing 10,000 logs...').subscribe()
+
+    try {
+      const { entries } = await this.api.diagnosticGetLogs({
+        before: true,
+        limit: 10000,
+      })
+
+      const styles = {
+        'background-color': '#222428',
+        color: '#e0e0e0',
+        'font-family': 'monospace',
+      }
+      const html = this.convertToAnsi(entries)
+
+      this.downloadHtml.download('diagnostic-logs.html', html, styles)
+    } catch (e: any) {
+      this.errorService.handleError(e)
+    } finally {
+      loader.unsubscribe()
+    }
+  }
+
   private async getLogs() {
     try {
       const { startCursor, entries } = await this.api.diagnosticGetLogs({
@@ -92,4 +124,15 @@ export class LogsPage {
       this.errorService.handleError(e)
     }
   }
+
+  private convertToAnsi(entries: Log[]) {
+    return entries
+      .map(
+        entry =>
+          `<span style="color: #FFF; font-weight: bold;">${toLocalIsoString(
+            new Date(entry.timestamp),
+          )}</span>&nbsp;&nbsp;${convert.toHtml(entry.message)}`,
+      )
+      .join('<br />')
+  }
 }

From 279c7324c48542265ca87b509b76bf10a6bf94f9 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:38:46 -0700
Subject: [PATCH 314/341] download to directory not filename (#2777)

---
 core/startos/src/registry/os/asset/get.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/startos/src/registry/os/asset/get.rs b/core/startos/src/registry/os/asset/get.rs
index 0d63435f2..a3da7047c 100644
--- a/core/startos/src/registry/os/asset/get.rs
+++ b/core/startos/src/registry/os/asset/get.rs
@@ -138,9 +138,15 @@ async fn cli_get_os_asset(
         ..
     }: HandlerArgs<CliContext, CliGetOsAssetParams>,
 ) -> Result<RegistryAsset<Blake3Commitment>, Error> {
+    let ext = method
+        .iter()
+        .last()
+        .or_else(|| parent_method.iter().last())
+        .unwrap_or(&"bin");
+
     let res = from_value::<RegistryAsset<Blake3Commitment>>(
         ctx.call_remote::<RegistryContext>(
-            &parent_method.into_iter().chain(method).join("."),
+            &parent_method.iter().chain(&method).join("."),
             json!({
                 "version": version,
                 "platform": platform,
@@ -152,6 +158,7 @@ async fn cli_get_os_asset(
     res.validate(SIG_CONTEXT, res.all_signers())?;
 
     if let Some(download) = download {
+        let download = download.join(format!("startos-{version}_{platform}.{ext}"));
         let mut file = AtomicFile::new(&download, None::<&Path>)
             .await
             .with_kind(ErrorKind::Filesystem)?;

From 25e38bfc98af00ddefa87bbbf759ec4612d9f297 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:39:02 -0700
Subject: [PATCH 315/341] do not mute logs of subcontainer launch dummy (#2781)

---
 sdk/package/lib/util/SubContainer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/package/lib/util/SubContainer.ts b/sdk/package/lib/util/SubContainer.ts
index 785c6fea0..7274e22d4 100644
--- a/sdk/package/lib/util/SubContainer.ts
+++ b/sdk/package/lib/util/SubContainer.ts
@@ -57,7 +57,7 @@ export class SubContainer implements ExecSpawnable {
     this.leaderExited = false
     this.leader = cp.spawn("start-cli", ["subcontainer", "launch", rootfs], {
       killSignal: "SIGKILL",
-      stdio: "ignore",
+      stdio: "inherit",
     })
     this.leader.on("exit", () => {
       this.leaderExited = true

From b1e7a717afbc7b553b54046a65c8a05cc0365739 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:39:16 -0700
Subject: [PATCH 316/341] allow updating grub from chroot-and-upgrade (#2778)

---
 build/lib/scripts/chroot-and-upgrade | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/lib/scripts/chroot-and-upgrade b/build/lib/scripts/chroot-and-upgrade
index 3af93f5ef..be2911369 100755
--- a/build/lib/scripts/chroot-and-upgrade
+++ b/build/lib/scripts/chroot-and-upgrade
@@ -43,6 +43,8 @@ if [ -z "$NO_SYNC" ]; then
     mount -t overlay \
 		  -olowerdir=/media/startos/current,upperdir=/media/startos/upper/data,workdir=/media/startos/upper/work \
 		  overlay /media/startos/next
+    mkdir -p /media/startos/next/media/startos/root
+    mount --bind /media/startos/root /media/startos/next/media/startos/root
 fi
 
 if [ -n "$ONLY_CREATE" ]; then

From aab2b8fdbc43a967432a91cd80c8c658327db9e6 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 11 Nov 2024 11:54:51 -0700
Subject: [PATCH 317/341] do not request config action if no config exists
 (#2779)

---
 .../src/Adapters/Systems/SystemForEmbassy/index.ts              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index b01ca2dc1..4bcd3d594 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -337,7 +337,7 @@ export class SystemForEmbassy implements System {
       await effects.setDataVersion({
         version: ExtendedVersion.parseEmver(this.manifest.version).toString(),
       })
-    } else {
+    } else if (this.manifest.config) {
       await effects.action.request({
         packageId: this.manifest.id,
         actionId: "config",

From c088ab7a79665deef9f06f1d25e833edab592071 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Mon, 11 Nov 2024 12:17:44 -0700
Subject: [PATCH 318/341] remove file from input spec (#2782)

---
 sdk/base/lib/actions/input/builder/value.ts   | 82 +++++++++----------
 .../lib/test/startosTypeValidation.test.ts    |  2 -
 2 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/sdk/base/lib/actions/input/builder/value.ts b/sdk/base/lib/actions/input/builder/value.ts
index ad30f1376..78318f868 100644
--- a/sdk/base/lib/actions/input/builder/value.ts
+++ b/sdk/base/lib/actions/input/builder/value.ts
@@ -689,47 +689,47 @@ export class Value<Type, Store> {
       }
     }, spec.validator)
   }
-  static file<Store>(a: {
-    name: string
-    description?: string | null
-    extensions: string[]
-    required: boolean
-  }) {
-    const buildValue = {
-      type: "file" as const,
-      description: null,
-      warning: null,
-      ...a,
-    }
-    return new Value<FilePath, Store>(
-      () => ({
-        ...buildValue,
-      }),
-      asRequiredParser(object({ filePath: string }), a),
-    )
-  }
-  static dynamicFile<Required extends boolean, Store>(
-    a: LazyBuild<
-      Store,
-      {
-        name: string
-        description?: string | null
-        warning?: string | null
-        extensions: string[]
-        required: Required
-      }
-    >,
-  ) {
-    return new Value<string | null | undefined, Store>(
-      async (options) => ({
-        type: "file" as const,
-        description: null,
-        warning: null,
-        ...(await a(options)),
-      }),
-      string.optional(),
-    )
-  }
+  // static file<Store>(a: {
+  //   name: string
+  //   description?: string | null
+  //   extensions: string[]
+  //   required: boolean
+  // }) {
+  //   const buildValue = {
+  //     type: "file" as const,
+  //     description: null,
+  //     warning: null,
+  //     ...a,
+  //   }
+  //   return new Value<FilePath, Store>(
+  //     () => ({
+  //       ...buildValue,
+  //     }),
+  //     asRequiredParser(object({ filePath: string }), a),
+  //   )
+  // }
+  // static dynamicFile<Required extends boolean, Store>(
+  //   a: LazyBuild<
+  //     Store,
+  //     {
+  //       name: string
+  //       description?: string | null
+  //       warning?: string | null
+  //       extensions: string[]
+  //       required: Required
+  //     }
+  //   >,
+  // ) {
+  //   return new Value<string | null | undefined, Store>(
+  //     async (options) => ({
+  //       type: "file" as const,
+  //       description: null,
+  //       warning: null,
+  //       ...(await a(options)),
+  //     }),
+  //     string.optional(),
+  //   )
+  // }
   static union<Required extends RequiredDefault<string>, Type, Store>(
     a: {
       name: string
diff --git a/sdk/base/lib/test/startosTypeValidation.test.ts b/sdk/base/lib/test/startosTypeValidation.test.ts
index 596da3b49..509da0894 100644
--- a/sdk/base/lib/test/startosTypeValidation.test.ts
+++ b/sdk/base/lib/test/startosTypeValidation.test.ts
@@ -8,12 +8,10 @@ import {
   ClearServiceInterfacesParams,
   GetActionInputParams,
   GetStatusParams,
-  GetStoreParams,
   RequestActionParams,
   RunActionParams,
   SetDataVersionParams,
   SetMainStatus,
-  SetStoreParams,
 } from ".././osBindings"
 import { CreateSubcontainerFsParams } from ".././osBindings"
 import { DestroySubcontainerFsParams } from ".././osBindings"

From db6fc661a6451123cbdcb0f3c32d85c1f18b9455 Mon Sep 17 00:00:00 2001
From: Jade <2364004+Blu-J@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:53:19 -0700
Subject: [PATCH 319/341] fix: Dependency (#2784)

* fix: Dependency

* fix: set deps during container init
---
 .../Systems/SystemForEmbassy/index.ts         | 83 ++++++++++++++-----
 package-lock.json                             |  2 +-
 .../ui/src/app/services/api/api.fixures.ts    | 10 +--
 3 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 4bcd3d594..531b30cd2 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -301,6 +301,20 @@ export class SystemForEmbassy implements System {
     await effects.setMainStatus({ status: "stopped" })
     await this.exportActions(effects)
     await this.exportNetwork(effects)
+    await this.containerSetDependencies(effects)
+  }
+  async containerSetDependencies(effects: T.Effects) {
+    const oldDeps: Record<string, string[]> = Object.fromEntries(
+      await effects
+        .getDependencies()
+        .then((x) =>
+          x.flatMap((x) =>
+            x.kind === "running" ? [[x.id, x?.healthChecks || []]] : [],
+          ),
+        )
+        .catch(() => []),
+    )
+    await this.setDependencies(effects, oldDeps)
   }
 
   async exit(): Promise<void> {
@@ -650,7 +664,7 @@ export class SystemForEmbassy implements System {
         ),
       )
       const dependsOn = answer["depends-on"] ?? answer.dependsOn ?? {}
-      await this.setConfigSetConfig(effects, dependsOn)
+      await this.setDependencies(effects, dependsOn)
       return
     } else if (setConfigValue.type === "script") {
       const moduleCode = await this.moduleCode
@@ -673,31 +687,60 @@ export class SystemForEmbassy implements System {
         }),
       )
       const dependsOn = answer["depends-on"] ?? answer.dependsOn ?? {}
-      await this.setConfigSetConfig(effects, dependsOn)
+      await this.setDependencies(effects, dependsOn)
       return
     }
   }
-  private async setConfigSetConfig(
+  private async setDependencies(
     effects: Effects,
-    dependsOn: { [x: string]: readonly string[] },
+    rawDepends: { [x: string]: readonly string[] },
   ) {
+    const dependsOn: Record<string, readonly string[] | null> = {
+      ...Object.fromEntries(
+        Object.entries(this.manifest.dependencies || {})?.map((x) => [
+          x[0],
+          null,
+        ]) || [],
+      ),
+      ...rawDepends,
+    }
     await effects.setDependencies({
-      dependencies: Object.entries(dependsOn).flatMap(([key, value]) => {
-        const dependency = this.manifest.dependencies?.[key]
-        if (!dependency) return []
-        const versionRange = dependency.version
-        const registryUrl = DEFAULT_REGISTRY
-        const kind = "running"
-        return [
-          {
-            id: key,
-            versionRange,
-            registryUrl,
-            kind,
-            healthChecks: [...value],
-          },
-        ]
-      }),
+      dependencies: Object.entries(dependsOn).flatMap(
+        ([key, value]): T.Dependencies => {
+          const dependency = this.manifest.dependencies?.[key]
+          if (!dependency) return []
+          if (value == null) {
+            const versionRange = dependency.version
+            if (dependency.requirement.type === "required") {
+              return [
+                {
+                  id: key,
+                  versionRange,
+                  kind: "running",
+                  healthChecks: [],
+                },
+              ]
+            }
+            return [
+              {
+                kind: "exists",
+                id: key,
+                versionRange,
+              },
+            ]
+          }
+          const versionRange = dependency.version
+          const kind = "running"
+          return [
+            {
+              id: key,
+              versionRange,
+              kind,
+              healthChecks: [...value],
+            },
+          ]
+        },
+      ),
     })
   }
 
diff --git a/package-lock.json b/package-lock.json
index 497f28c49..9a9ca8f48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "embassy-os",
+  "name": "start-os",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {}
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index a2e672b20..844094e3a 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1191,11 +1191,11 @@ export module Mock {
           name: 'Datetime',
           required: false,
         }),
-        file: ISB.Value.file({
-          name: 'File',
-          required: false,
-          extensions: ['png', 'pdf'],
-        }),
+        // file: ISB.Value.file({
+        //   name: 'File',
+        //   required: false,
+        //   extensions: ['png', 'pdf'],
+        // }),
         users: ISB.Value.multiselect({
           name: 'Users',
           default: [],

From 46179f5c83f0d7e6c274eb6c1cec606100a0434e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:31:47 -0700
Subject: [PATCH 320/341] attempt to fix webserver lockup (#2788)

---
 core/startos/Cargo.toml            |  2 +-
 core/startos/src/net/web_server.rs | 50 ++++++++++++++++++++++++------
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 3a9935373..df4ac2378 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -198,7 +198,7 @@ tokio-util = { version = "0.7.9", features = ["io"] }
 torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies", features = [
   "serialize",
 ] }
-tower-service = "0.3.2"
+tower-service = "0.3.3"
 tracing = "0.1.39"
 tracing-error = "0.2.0"
 tracing-futures = "0.2.5"
diff --git a/core/startos/src/net/web_server.rs b/core/startos/src/net/web_server.rs
index a9cfdf046..d1ad64d01 100644
--- a/core/startos/src/net/web_server.rs
+++ b/core/startos/src/net/web_server.rs
@@ -7,7 +7,7 @@ use axum::extract::Request;
 use axum::Router;
 use axum_server::Handle;
 use bytes::Bytes;
-use futures::future::ready;
+use futures::future::{ready, BoxFuture};
 use futures::FutureExt;
 use helpers::NonDetachingJoinHandle;
 use tokio::sync::{oneshot, watch};
@@ -30,8 +30,39 @@ impl SwappableRouter {
     }
 }
 
-#[derive(Clone)]
-pub struct SwappableRouterService(watch::Receiver<Router>);
+pub struct SwappableRouterService {
+    router: watch::Receiver<Router>,
+    changed: Option<BoxFuture<'static, ()>>,
+}
+impl SwappableRouterService {
+    fn router(&self) -> Router {
+        self.router.borrow().clone()
+    }
+    fn changed(&mut self, cx: &mut std::task::Context<'_>) -> Poll<()> {
+        let mut changed = if let Some(changed) = self.changed.take() {
+            changed
+        } else {
+            let mut router = self.router.clone();
+            async move {
+                router.changed().await;
+            }
+            .boxed()
+        };
+        if changed.poll_unpin(cx).is_ready() {
+            return Poll::Ready(());
+        }
+        self.changed = Some(changed);
+        Poll::Pending
+    }
+}
+impl Clone for SwappableRouterService {
+    fn clone(&self) -> Self {
+        Self {
+            router: self.router.clone(),
+            changed: None,
+        }
+    }
+}
 impl<B> tower_service::Service<Request<B>> for SwappableRouterService
 where
     B: axum::body::HttpBody<Data = Bytes> + Send + 'static,
@@ -42,15 +73,13 @@ where
     type Future = <Router as tower_service::Service<Request<B>>>::Future;
     #[inline]
     fn poll_ready(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<(), Self::Error>> {
-        let mut changed = self.0.changed().boxed();
-        if changed.poll_unpin(cx).is_ready() {
+        if self.changed(cx).is_ready() {
             return Poll::Ready(Ok(()));
         }
-        drop(changed);
-        tower_service::Service::<Request<B>>::poll_ready(&mut self.0.borrow().clone(), cx)
+        tower_service::Service::<Request<B>>::poll_ready(&mut self.router(), cx)
     }
     fn call(&mut self, req: Request<B>) -> Self::Future {
-        self.0.borrow().clone().call(req)
+        self.router().call(req)
     }
 }
 
@@ -66,7 +95,10 @@ impl<T> tower_service::Service<T> for SwappableRouter {
         Poll::Ready(Ok(()))
     }
     fn call(&mut self, _: T) -> Self::Future {
-        ready(Ok(SwappableRouterService(self.0.subscribe())))
+        ready(Ok(SwappableRouterService {
+            router: self.0.subscribe(),
+            changed: None,
+        }))
     }
 }
 

From 1771797453aa890fca14f21382b10e4cbd1098ca Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:25:43 -0700
Subject: [PATCH 321/341] sdk input spec improvements (#2785)

* sdk input spec improvements

* more sdk changes

* fe changes

* alpha.14

* fix tests

* separate validator in filehelper

* use deeppartial for getinput

* fix union type and update ts-matches

* alpha.15

* alpha.16

* alpha.17

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>
---
 .../transformConfigSpec.test.ts.snap          |   6 -
 .../SystemForEmbassy/transformConfigSpec.ts   |   2 -
 sdk/base/lib/actions/index.ts                 |  45 ++-
 .../lib/actions/input/builder/inputSpec.ts    |  13 +-
 sdk/base/lib/actions/input/builder/value.ts   | 294 +++++++++---------
 .../lib/actions/input/builder/variants.ts     |  85 +++--
 .../lib/actions/input/inputSpecConstants.ts   |  22 +-
 sdk/base/lib/actions/input/inputSpecTypes.ts  |   2 -
 sdk/base/lib/actions/setupActions.ts          |  32 +-
 sdk/base/lib/types.ts                         |   2 +-
 sdk/base/package-lock.json                    |   9 +-
 sdk/base/package.json                         |   2 +-
 sdk/package/lib/StartSdk.ts                   | 124 ++++----
 sdk/package/lib/test/inputSpecBuilder.test.ts | 130 ++++++--
 sdk/package/lib/test/output.test.ts           |   2 +-
 sdk/package/lib/util/fileHelper.ts            |  61 ++--
 sdk/package/package-lock.json                 |  13 +-
 sdk/package/package.json                      |   4 +-
 sdk/package/scripts/oldSpecToBuilder.ts       |  41 +--
 .../backup-drives/backup-drives.component.ts  |  10 +-
 .../form-select/form-select.component.html    |   5 +-
 .../server-show/server-show.page.ts           |  15 +-
 .../ui/src/app/services/api/api.fixures.ts    | 131 ++++----
 .../ui/src/app/services/form.service.ts       |  12 +-
 24 files changed, 550 insertions(+), 512 deletions(-)

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
index 01e2d0763..2c3d4b167 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
@@ -264,7 +264,6 @@ exports[`transformConfigSpec transformConfigSpec(bitcoind) 1`] = `
         "disabled": false,
         "immutable": false,
         "name": "Pruning Mode",
-        "required": true,
         "type": "union",
         "variants": {
           "automatic": {
@@ -524,7 +523,6 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
     "disabled": false,
     "immutable": false,
     "name": "Type",
-    "required": true,
     "type": "union",
     "variants": {
       "index": {
@@ -589,7 +587,6 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
             "disabled": false,
             "immutable": false,
             "name": "Folder Location",
-            "required": false,
             "type": "select",
             "values": {
               "filebrowser": "filebrowser",
@@ -644,7 +641,6 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
           "disabled": false,
           "immutable": false,
           "name": "Type",
-          "required": true,
           "type": "union",
           "variants": {
             "redirect": {
@@ -705,7 +701,6 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
                   "disabled": false,
                   "immutable": false,
                   "name": "Folder Location",
-                  "required": false,
                   "type": "select",
                   "values": {
                     "filebrowser": "filebrowser",
@@ -758,7 +753,6 @@ exports[`transformConfigSpec transformConfigSpec(nostr2) 1`] = `
     "disabled": false,
     "immutable": false,
     "name": "Relay Type",
-    "required": true,
     "type": "union",
     "variants": {
       "private": {
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
index 4c074a1bd..1eb2ea508 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -43,7 +43,6 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): IST.InputSpec {
           }),
           {},
         ),
-        required: false,
         disabled: false,
         immutable: false,
       }
@@ -127,7 +126,6 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): IST.InputSpec {
           {} as Record<string, { name: string; spec: IST.InputSpec }>,
         ),
         disabled: false,
-        required: true,
         default: oldVal.default,
         immutable: false,
       }
diff --git a/sdk/base/lib/actions/index.ts b/sdk/base/lib/actions/index.ts
index 2d052e072..4bcbec8b1 100644
--- a/sdk/base/lib/actions/index.ts
+++ b/sdk/base/lib/actions/index.ts
@@ -1,6 +1,7 @@
 import * as T from "../types"
 import * as IST from "../actions/input/inputSpecTypes"
 import { Action } from "./setupActions"
+import { ExtractInputSpecType } from "./input/builder/inputSpec"
 
 export type RunActionInput<Input> =
   | Input
@@ -44,36 +45,32 @@ export const runAction = async <
     })
   }
 }
-type GetActionInputType<
-  A extends Action<T.ActionId, any, any, Record<string, unknown>>,
-> = A extends Action<T.ActionId, any, any, infer I> ? I : never
+type GetActionInputType<A extends Action<T.ActionId, any, any>> =
+  A extends Action<T.ActionId, any, infer I> ? ExtractInputSpecType<I> : never
 
 type ActionRequestBase = {
   reason?: string
   replayId?: string
 }
-type ActionRequestInput<
-  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
-> = {
+type ActionRequestInput<T extends Action<T.ActionId, any, any>> = {
   kind: "partial"
   value: Partial<GetActionInputType<T>>
 }
-export type ActionRequestOptions<
-  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
-> = ActionRequestBase &
-  (
-    | {
-        when?: Exclude<
-          T.ActionRequestTrigger,
-          { condition: "input-not-matches" }
-        >
-        input?: ActionRequestInput<T>
-      }
-    | {
-        when: T.ActionRequestTrigger & { condition: "input-not-matches" }
-        input: ActionRequestInput<T>
-      }
-  )
+export type ActionRequestOptions<T extends Action<T.ActionId, any, any>> =
+  ActionRequestBase &
+    (
+      | {
+          when?: Exclude<
+            T.ActionRequestTrigger,
+            { condition: "input-not-matches" }
+          >
+          input?: ActionRequestInput<T>
+        }
+      | {
+          when: T.ActionRequestTrigger & { condition: "input-not-matches" }
+          input: ActionRequestInput<T>
+        }
+    )
 
 const _validate: T.ActionRequest = {} as ActionRequestOptions<any> & {
   actionId: string
@@ -81,9 +78,7 @@ const _validate: T.ActionRequest = {} as ActionRequestOptions<any> & {
   severity: T.ActionSeverity
 }
 
-export const requestAction = <
-  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
->(options: {
+export const requestAction = <T extends Action<T.ActionId, any, any>>(options: {
   effects: T.Effects
   packageId: T.PackageId
   action: T
diff --git a/sdk/base/lib/actions/input/builder/inputSpec.ts b/sdk/base/lib/actions/input/builder/inputSpec.ts
index 288ce8b3e..611ad8a48 100644
--- a/sdk/base/lib/actions/input/builder/inputSpec.ts
+++ b/sdk/base/lib/actions/input/builder/inputSpec.ts
@@ -1,5 +1,5 @@
 import { ValueSpec } from "../inputSpecTypes"
-import { Value } from "./value"
+import { PartialValue, Value } from "./value"
 import { _ } from "../../../util"
 import { Effects } from "../../../Effects"
 import { Parser, object } from "ts-matches"
@@ -16,6 +16,15 @@ export type ExtractInputSpecType<A extends Record<string, any> | InputSpec<Recor
   A extends InputSpec<infer B, any> | InputSpec<infer B, never> ? B :
   A
 
+export type ExtractPartialInputSpecType<
+  A extends
+    | Record<string, any>
+    | InputSpec<Record<string, any>, any>
+    | InputSpec<Record<string, any>, never>,
+> = A extends InputSpec<infer B, any> | InputSpec<infer B, never>
+  ? PartialValue<B>
+  : PartialValue<A>
+
 export type InputSpecOf<A extends Record<string, any>, Store = never> = {
   [K in keyof A]: Value<A[K], Store>
 }
@@ -84,6 +93,8 @@ export class InputSpec<Type extends Record<string, any>, Store = never> {
     },
     public validator: Parser<unknown, Type>,
   ) {}
+  _TYPE: Type = null as any as Type
+  _PARTIAL: PartialValue<Type> = null as any as PartialValue<Type>
   async build(options: LazyBuildOptions<Store>) {
     const answer = {} as {
       [K in keyof Type]: ValueSpec
diff --git a/sdk/base/lib/actions/input/builder/value.ts b/sdk/base/lib/actions/input/builder/value.ts
index 78318f868..053bd0596 100644
--- a/sdk/base/lib/actions/input/builder/value.ts
+++ b/sdk/base/lib/actions/input/builder/value.ts
@@ -1,6 +1,6 @@
 import { InputSpec, LazyBuild } from "./inputSpec"
 import { List } from "./list"
-import { Variants } from "./variants"
+import { PartialUnionRes, UnionRes, Variants } from "./variants"
 import {
   FilePath,
   Pattern,
@@ -26,37 +26,14 @@ import {
   string,
   unknown,
 } from "ts-matches"
+import { DeepPartial } from "../../../types"
 
-export type RequiredDefault<A> =
-  | false
-  | {
-      default: A | null
-    }
-
-function requiredLikeToAbove<Input extends RequiredDefault<A>, A>(
-  requiredLike: Input,
-) {
-  // prettier-ignore
-  return {
-    required: (typeof requiredLike === 'object' ? true : requiredLike) as (
-      Input extends { default: unknown} ? true:
-      Input extends true ? true :
-      false
-    ),
-    default:(typeof requiredLike === 'object' ? requiredLike.default : null) as (
-      Input extends { default: infer Default } ? Default :
-      null
-    )
-  };
-}
-type AsRequired<Type, MaybeRequiredType> = MaybeRequiredType extends
-  | { default: unknown }
-  | never
-  ? Type
-  : Type | null | undefined
+type AsRequired<T, Required extends boolean> = Required extends true
+  ? T
+  : T | null | undefined
 
 const testForAsRequiredParser = once(
-  () => object({ required: object({ default: unknown }) }).test,
+  () => object({ required: literal(true) }).test,
 )
 function asRequiredParser<
   Type,
@@ -69,6 +46,13 @@ function asRequiredParser<
   return parser.optional() as any
 }
 
+export type PartialValue<T> =
+  T extends UnionRes<infer A, infer B>
+    ? PartialUnionRes<A, B>
+    : T extends {}
+      ? { [P in keyof T]?: PartialValue<T[P]> }
+      : T
+
 export class Value<Type, Store> {
   protected constructor(
     public build: LazyBuild<Store, ValueSpec>,
@@ -122,19 +106,19 @@ export class Value<Type, Store> {
       boolean,
     )
   }
-  static text<Required extends RequiredDefault<DefaultString>>(a: {
+  static text<Required extends boolean>(a: {
     name: string
     description?: string | null
     /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
     /**
-     * @description Determines if the field is required. If so, optionally provide a default value.
-     * @type { false | { default: string | RandomString | null } }
-     * @example required: false
-     * @example required: { default: null }
-     * @example required: { default: 'World' }
-     * @example required: { default: { charset: 'abcdefg', len: 16 } }
+     * provide a default value.
+     * @type { string | RandomString | null }
+     * @example default: null
+     * @example default: 'World'
+     * @example default: { charset: 'abcdefg', len: 16 }
      */
+    default: string | RandomString | null
     required: Required
     /**
      * @description Mask (aka camouflage) text input with dots: ● ● ●
@@ -188,7 +172,6 @@ export class Value<Type, Store> {
         immutable: a.immutable ?? false,
         generate: a.generate ?? null,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }),
       asRequiredParser(string, a),
     )
@@ -200,7 +183,8 @@ export class Value<Type, Store> {
         name: string
         description?: string | null
         warning?: string | null
-        required: RequiredDefault<DefaultString>
+        default: DefaultString | null
+        required: boolean
         masked?: boolean
         placeholder?: string | null
         minLength?: number | null
@@ -228,19 +212,16 @@ export class Value<Type, Store> {
         immutable: false,
         generate: a.generate ?? null,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }
     }, string.optional())
   }
-  static textarea(a: {
+  static textarea<Required extends boolean>(a: {
     name: string
     description?: string | null
     /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
-    /**
-     * @description Unlike other "required" fields, for textarea this is a simple boolean.
-     */
-    required: boolean
+    default: string | null
+    required: Required
     minLength?: number | null
     maxLength?: number | null
     placeholder?: string | null
@@ -250,20 +231,23 @@ export class Value<Type, Store> {
      */
     immutable?: boolean
   }) {
-    return new Value<string, never>(async () => {
-      const built: ValueSpecTextarea = {
-        description: null,
-        warning: null,
-        minLength: null,
-        maxLength: null,
-        placeholder: null,
-        type: "textarea" as const,
-        disabled: false,
-        immutable: a.immutable ?? false,
-        ...a,
-      }
-      return built
-    }, string)
+    return new Value<AsRequired<string, Required>, never>(
+      async () => {
+        const built: ValueSpecTextarea = {
+          description: null,
+          warning: null,
+          minLength: null,
+          maxLength: null,
+          placeholder: null,
+          type: "textarea" as const,
+          disabled: false,
+          immutable: a.immutable ?? false,
+          ...a,
+        }
+        return built
+      },
+      asRequiredParser(string, a),
+    )
   }
   static dynamicTextarea<Store = never>(
     getA: LazyBuild<
@@ -272,6 +256,7 @@ export class Value<Type, Store> {
         name: string
         description?: string | null
         warning?: string | null
+        default: string | null
         required: boolean
         minLength?: number | null
         maxLength?: number | null
@@ -280,7 +265,7 @@ export class Value<Type, Store> {
       }
     >,
   ) {
-    return new Value<string, Store>(async (options) => {
+    return new Value<string | null | undefined, Store>(async (options) => {
       const a = await getA(options)
       return {
         description: null,
@@ -293,20 +278,20 @@ export class Value<Type, Store> {
         immutable: false,
         ...a,
       }
-    }, string)
+    }, string.optional())
   }
-  static number<Required extends RequiredDefault<number>>(a: {
+  static number<Required extends boolean>(a: {
     name: string
     description?: string | null
     /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
     /**
-     * @description Determines if the field is required. If so, optionally provide a default value.
-     * @type { false | { default: number | null } }
-     * @example required: false
-     * @example required: { default: null }
-     * @example required: { default: 7 }
+     * @description optionally provide a default value.
+     * @type { default: number | null }
+     * @example default: null
+     * @example default: 7
      */
+    default: number | null
     required: Required
     min?: number | null
     max?: number | null
@@ -343,7 +328,6 @@ export class Value<Type, Store> {
         disabled: false,
         immutable: a.immutable ?? false,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }),
       asRequiredParser(number, a),
     )
@@ -355,7 +339,8 @@ export class Value<Type, Store> {
         name: string
         description?: string | null
         warning?: string | null
-        required: RequiredDefault<number>
+        default: number | null
+        required: boolean
         min?: number | null
         max?: number | null
         step?: number | null
@@ -380,22 +365,21 @@ export class Value<Type, Store> {
         disabled: false,
         immutable: false,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }
     }, number.optional())
   }
-  static color<Required extends RequiredDefault<string>>(a: {
+  static color<Required extends boolean>(a: {
     name: string
     description?: string | null
     /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
     /**
-     * @description Determines if the field is required. If so, optionally provide a default value.
-     * @type { false | { default: string | null } }
-     * @example required: false
-     * @example required: { default: null }
-     * @example required: { default: 'ffffff' }
+     * @description optionally provide a default value.
+     * @type { default: string | null }
+     * @example default: null
+     * @example default: 'ffffff'
      */
+    default: string | null
     required: Required
     /**
      * @description Once set, the value can never be changed.
@@ -411,9 +395,7 @@ export class Value<Type, Store> {
         disabled: false,
         immutable: a.immutable ?? false,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }),
-
       asRequiredParser(string, a),
     )
   }
@@ -425,7 +407,8 @@ export class Value<Type, Store> {
         name: string
         description?: string | null
         warning?: string | null
-        required: RequiredDefault<string>
+        default: string | null
+        required: boolean
         disabled?: false | string
       }
     >,
@@ -439,22 +422,21 @@ export class Value<Type, Store> {
         disabled: false,
         immutable: false,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }
     }, string.optional())
   }
-  static datetime<Required extends RequiredDefault<string>>(a: {
+  static datetime<Required extends boolean>(a: {
     name: string
     description?: string | null
     /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
     /**
-     * @description Determines if the field is required. If so, optionally provide a default value.
-     * @type { false | { default: string | null } }
-     * @example required: false
-     * @example required: { default: null }
-     * @example required: { default: '1985-12-16 18:00:00.000' }
+     * @description optionally provide a default value.
+     * @type { default: string | null }
+     * @example default: null
+     * @example default: '1985-12-16 18:00:00.000'
      */
+    default: string | null
     required: Required
     /**
      * @description Informs the browser how to behave and which date/time component to display.
@@ -481,7 +463,6 @@ export class Value<Type, Store> {
         disabled: false,
         immutable: a.immutable ?? false,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }),
       asRequiredParser(string, a),
     )
@@ -493,7 +474,8 @@ export class Value<Type, Store> {
         name: string
         description?: string | null
         warning?: string | null
-        required: RequiredDefault<string>
+        default: string | null
+        required: boolean
         inputmode?: ValueSpecDatetime["inputmode"]
         min?: string | null
         max?: string | null
@@ -513,26 +495,21 @@ export class Value<Type, Store> {
         disabled: false,
         immutable: false,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }
     }, string.optional())
   }
-  static select<
-    Required extends RequiredDefault<string>,
-    Values extends Record<string, string>,
-  >(a: {
+  static select<Values extends Record<string, string>>(a: {
     name: string
     description?: string | null
     /** Presents a warning prompt before permitting the value to change. */
     warning?: string | null
     /**
      * @description Determines if the field is required. If so, optionally provide a default value from the list of values.
-     * @type { false | { default: string | null } }
-     * @example required: false
-     * @example required: { default: null }
-     * @example required: { default: 'radio1' }
+     * @type { (keyof Values & string) | null }
+     * @example default: null
+     * @example default: 'radio1'
      */
-    required: Required
+    default: keyof Values & string
     /**
      * @description A mapping of unique radio options to their human readable display format.
      * @example
@@ -551,7 +528,7 @@ export class Value<Type, Store> {
      */
     immutable?: boolean
   }) {
-    return new Value<AsRequired<keyof Values, Required>, never>(
+    return new Value<keyof Values & string, never>(
       () => ({
         description: null,
         warning: null,
@@ -559,16 +536,10 @@ export class Value<Type, Store> {
         disabled: false,
         immutable: a.immutable ?? false,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }),
-      asRequiredParser(
-        anyOf(
-          ...Object.keys(a.values).map((x: keyof Values & string) =>
-            literal(x),
-          ),
-        ),
-        a,
-      ) as any,
+      anyOf(
+        ...Object.keys(a.values).map((x: keyof Values & string) => literal(x)),
+      ),
     )
   }
   static dynamicSelect<Store = never>(
@@ -578,13 +549,13 @@ export class Value<Type, Store> {
         name: string
         description?: string | null
         warning?: string | null
-        required: RequiredDefault<string>
+        default: string
         values: Record<string, string>
         disabled?: false | string | string[]
       }
     >,
   ) {
-    return new Value<string | null | undefined, Store>(async (options) => {
+    return new Value<string, Store>(async (options) => {
       const a = await getA(options)
       return {
         description: null,
@@ -593,9 +564,8 @@ export class Value<Type, Store> {
         disabled: false,
         immutable: false,
         ...a,
-        ...requiredLikeToAbove(a.required),
       }
-    }, string.optional())
+    }, string)
   }
   static multiselect<Values extends Record<string, string>>(a: {
     name: string
@@ -605,7 +575,7 @@ export class Value<Type, Store> {
     /**
      * @description A simple list of which options should be checked by default.
      */
-    default: string[]
+    default: (keyof Values & string)[]
     /**
      * @description A mapping of checkbox options to their human readable display format.
      * @example
@@ -689,11 +659,11 @@ export class Value<Type, Store> {
       }
     }, spec.validator)
   }
-  // static file<Store>(a: {
+  // static file<Store, Required extends boolean>(a: {
   //   name: string
   //   description?: string | null
   //   extensions: string[]
-  //   required: boolean
+  //   required: Required
   // }) {
   //   const buildValue = {
   //     type: "file" as const,
@@ -701,14 +671,14 @@ export class Value<Type, Store> {
   //     warning: null,
   //     ...a,
   //   }
-  //   return new Value<FilePath, Store>(
+  //   return new Value<AsRequired<FilePath, Required>, Store>(
   //     () => ({
   //       ...buildValue,
   //     }),
   //     asRequiredParser(object({ filePath: string }), a),
   //   )
   // }
-  // static dynamicFile<Required extends boolean, Store>(
+  // static dynamicFile<Store>(
   //   a: LazyBuild<
   //     Store,
   //     {
@@ -716,43 +686,49 @@ export class Value<Type, Store> {
   //       description?: string | null
   //       warning?: string | null
   //       extensions: string[]
-  //       required: Required
+  //       required: boolean
   //     }
   //   >,
   // ) {
-  //   return new Value<string | null | undefined, Store>(
+  //   return new Value<FilePath | null | undefined, Store>(
   //     async (options) => ({
   //       type: "file" as const,
   //       description: null,
   //       warning: null,
   //       ...(await a(options)),
   //     }),
-  //     string.optional(),
+  //     object({ filePath: string }).optional(),
   //   )
   // }
-  static union<Required extends RequiredDefault<string>, Type, Store>(
+  static union<
+    VariantValues extends {
+      [K in string]: {
+        name: string
+        spec: InputSpec<any, Store> | InputSpec<any, never>
+      }
+    },
+    Store,
+  >(
     a: {
       name: string
       description?: string | null
       /** Presents a warning prompt before permitting the value to change. */
       warning?: string | null
       /**
-       * @description Determines if the field is required. If so, optionally provide a default value from the list of variants.
-       * @type { false | { default: string | null } }
-       * @example required: false
-       * @example required: { default: null }
-       * @example required: { default: 'variant1' }
+       * @description Provide a default value from the list of variants.
+       * @type { string }
+       * @example default: 'variant1'
        */
-      required: Required
+      default: keyof VariantValues & string
       /**
        * @description Once set, the value can never be changed.
        * @default false
        */
       immutable?: boolean
     },
-    aVariants: Variants<Type, Store>,
+    aVariants: Variants<VariantValues, Store>,
   ) {
-    return new Value<AsRequired<Type, Required>, Store>(
+    return new Value<typeof aVariants.validator._TYPE, Store>(
       async (options) => ({
         type: "union" as const,
         description: null,
@@ -760,44 +736,50 @@ export class Value<Type, Store> {
         disabled: false,
         ...a,
         variants: await aVariants.build(options as any),
-        ...requiredLikeToAbove(a.required),
         immutable: a.immutable ?? false,
       }),
-      asRequiredParser(aVariants.validator, a),
+      aVariants.validator,
     )
   }
   static filteredUnion<
-    Required extends RequiredDefault<string>,
-    Type extends Record<string, any>,
-    Store = never,
+    VariantValues extends {
+      [K in string]: {
+        name: string
+        spec: InputSpec<any, Store> | InputSpec<any, never>
+      }
+    },
+    Store,
   >(
     getDisabledFn: LazyBuild<Store, string[] | false | string>,
     a: {
       name: string
       description?: string | null
       warning?: string | null
-      required: Required
+      default: keyof VariantValues & string
     },
-    aVariants: Variants<Type, Store> | Variants<Type, never>,
+    aVariants: Variants<VariantValues, Store> | Variants<VariantValues, never>,
   ) {
-    return new Value<AsRequired<Type, Required>, Store>(
+    return new Value<typeof aVariants.validator._TYPE, Store>(
       async (options) => ({
         type: "union" as const,
         description: null,
         warning: null,
         ...a,
         variants: await aVariants.build(options as any),
-        ...requiredLikeToAbove(a.required),
         disabled: (await getDisabledFn(options)) || false,
         immutable: false,
       }),
-      asRequiredParser(aVariants.validator, a),
+      aVariants.validator,
     )
   }
   static dynamicUnion<
-    Required extends RequiredDefault<string>,
-    Type extends Record<string, any>,
-    Store = never,
+    VariantValues extends {
+      [K in string]: {
+        name: string
+        spec: InputSpec<any, Store> | InputSpec<any, never>
+      }
+    },
+    Store,
   >(
     getA: LazyBuild<
       Store,
@@ -805,24 +787,26 @@ export class Value<Type, Store> {
         name: string
         description?: string | null
         warning?: string | null
-        required: Required
+        default: keyof VariantValues & string
         disabled: string[] | false | string
       }
     >,
-    aVariants: Variants<Type, Store> | Variants<Type, never>,
+    aVariants: Variants<VariantValues, Store> | Variants<VariantValues, never>,
   ) {
-    return new Value<Type | null | undefined, Store>(async (options) => {
-      const newValues = await getA(options)
-      return {
-        type: "union" as const,
-        description: null,
-        warning: null,
-        ...newValues,
-        variants: await aVariants.build(options as any),
-        ...requiredLikeToAbove(newValues.required),
-        immutable: false,
-      }
-    }, aVariants.validator.optional())
+    return new Value<typeof aVariants.validator._TYPE, Store>(
+      async (options) => {
+        const newValues = await getA(options)
+        return {
+          type: "union" as const,
+          description: null,
+          warning: null,
+          ...newValues,
+          variants: await aVariants.build(options as any),
+          immutable: false,
+        }
+      },
+      aVariants.validator,
+    )
   }
 
   static list<Type, Store>(a: List<Type, Store>) {
diff --git a/sdk/base/lib/actions/input/builder/variants.ts b/sdk/base/lib/actions/input/builder/variants.ts
index 6c0f83905..05124f45a 100644
--- a/sdk/base/lib/actions/input/builder/variants.ts
+++ b/sdk/base/lib/actions/input/builder/variants.ts
@@ -1,6 +1,54 @@
+import { DeepPartial } from "../../../types"
 import { ValueSpec, ValueSpecUnion } from "../inputSpecTypes"
-import { LazyBuild, InputSpec } from "./inputSpec"
-import { Parser, anyOf, literals, object } from "ts-matches"
+import {
+  LazyBuild,
+  InputSpec,
+  ExtractInputSpecType,
+  ExtractPartialInputSpecType,
+} from "./inputSpec"
+import { Parser, anyOf, literal, object } from "ts-matches"
+
+export type UnionRes<
+  Store,
+  VariantValues extends {
+    [K in string]: {
+      name: string
+      spec: InputSpec<any, Store> | InputSpec<any, never>
+    }
+  },
+  K extends keyof VariantValues & string = keyof VariantValues & string,
+> = {
+  [key in keyof VariantValues]: {
+    selection: key
+    value: ExtractInputSpecType<VariantValues[key]["spec"]>
+    other?: {
+      [key2 in Exclude<keyof VariantValues & string, key>]?: DeepPartial<
+        ExtractInputSpecType<VariantValues[key2]["spec"]>
+      >
+    }
+  }
+}[K]
+
+export type PartialUnionRes<
+  Store,
+  VariantValues extends {
+    [K in string]: {
+      name: string
+      spec: InputSpec<any, Store> | InputSpec<any, never>
+    }
+  },
+  K extends keyof VariantValues & string = keyof VariantValues & string,
+> = {
+  [key in keyof VariantValues]: {
+    selection?: key
+    value?: ExtractPartialInputSpecType<VariantValues[key]["spec"]>
+    other?: {
+      [key2 in Exclude<keyof VariantValues & string, key>]?: DeepPartial<
+        ExtractInputSpecType<VariantValues[key2]["spec"]>
+      >
+    }
+  }
+}[K]
 
 /**
  * Used in the the Value.select { @link './value.ts' }
@@ -44,18 +92,24 @@ export const pruning = Value.union(
     description:
       '- Disabled: Disable pruning\n- Automatic: Limit blockchain size on disk to a certain number of megabytes\n- Manual: Prune blockchain with the "pruneblockchain" RPC\n',
     warning: null,
-    required: true,
     default: "disabled",
   },
   pruningSettingsVariants
 );
 ```
  */
-export class Variants<Type, Store> {
-  static text: any
+export class Variants<
+  VariantValues extends {
+    [K in string]: {
+      name: string
+      spec: InputSpec<any, Store> | InputSpec<any, never>
+    }
+  },
+  Store,
+> {
   private constructor(
     public build: LazyBuild<Store, ValueSpecUnion["variants"]>,
-    public validator: Parser<unknown, Type>,
+    public validator: Parser<unknown, UnionRes<Store, VariantValues>>,
   ) {}
   static of<
     VariantValues extends {
@@ -67,26 +121,15 @@ export class Variants<Type, Store> {
     Store = never,
   >(a: VariantValues) {
     const validator = anyOf(
-      ...Object.entries(a).map(([name, { spec }]) =>
+      ...Object.entries(a).map(([id, { spec }]) =>
         object({
-          selection: literals(name),
+          selection: literal(id),
           value: spec.validator,
         }),
       ),
     ) as Parser<unknown, any>
 
-    return new Variants<
-      {
-        [K in keyof VariantValues]: {
-          selection: K
-          // prettier-ignore
-          value: 
-            VariantValues[K]["spec"] extends (InputSpec<infer B, Store> | InputSpec<infer B, never>) ? B :
-            never
-        }
-      }[keyof VariantValues],
-      Store
-    >(async (options) => {
+    return new Variants<VariantValues, Store>(async (options) => {
       const variants = {} as {
         [K in keyof VariantValues]: {
           name: string
@@ -118,6 +161,6 @@ export class Variants<Type, Store> {
   ```
    */
   withStore<NewStore extends Store extends never ? any : Store>() {
-    return this as any as Variants<Type, NewStore>
+    return this as any as Variants<VariantValues, NewStore>
   }
 }
diff --git a/sdk/base/lib/actions/input/inputSpecConstants.ts b/sdk/base/lib/actions/input/inputSpecConstants.ts
index 3beaefd51..57bf8a79b 100644
--- a/sdk/base/lib/actions/input/inputSpecConstants.ts
+++ b/sdk/base/lib/actions/input/inputSpecConstants.ts
@@ -10,35 +10,34 @@ import { Variants } from "./builder/variants"
 export const customSmtp = InputSpec.of<InputSpecOf<SmtpValue>, never>({
   server: Value.text({
     name: "SMTP Server",
-    required: {
-      default: null,
-    },
+    required: true,
+    default: null,
   }),
   port: Value.number({
     name: "Port",
-    required: { default: 587 },
+    required: true,
+    default: 587,
     min: 1,
     max: 65535,
     integer: true,
   }),
   from: Value.text({
     name: "From Address",
-    required: {
-      default: null,
-    },
+    required: true,
+    default: null,
     placeholder: "<name>test@example.com",
     inputmode: "email",
     patterns: [Patterns.email],
   }),
   login: Value.text({
     name: "Login",
-    required: {
-      default: null,
-    },
+    required: true,
+    default: null,
   }),
   password: Value.text({
     name: "Password",
     required: false,
+    default: null,
     masked: true,
   }),
 })
@@ -54,7 +53,7 @@ export const smtpInputSpec = Value.filteredUnion(
   {
     name: "SMTP",
     description: "Optionally provide an SMTP server for sending emails",
-    required: { default: "disabled" },
+    default: "disabled",
   },
   Variants.of({
     disabled: { name: "Disabled", spec: InputSpec.of({}) },
@@ -66,6 +65,7 @@ export const smtpInputSpec = Value.filteredUnion(
           description:
             "A custom from address for this service. If not provided, the system from address will be used.",
           required: false,
+          default: null,
           placeholder: "<name>test@example.com",
           inputmode: "email",
           patterns: [Patterns.email],
diff --git a/sdk/base/lib/actions/input/inputSpecTypes.ts b/sdk/base/lib/actions/input/inputSpecTypes.ts
index ee9189ae3..362a56ea1 100644
--- a/sdk/base/lib/actions/input/inputSpecTypes.ts
+++ b/sdk/base/lib/actions/input/inputSpecTypes.ts
@@ -115,7 +115,6 @@ export type ValueSpecSelect = {
   description: string | null
   warning: string | null
   type: "select"
-  required: boolean
   default: string | null
   disabled: false | string | string[]
   immutable: boolean
@@ -158,7 +157,6 @@ export type ValueSpecUnion = {
     }
   >
   disabled: false | string | string[]
-  required: boolean
   default: string | null
   immutable: boolean
 }
diff --git a/sdk/base/lib/actions/setupActions.ts b/sdk/base/lib/actions/setupActions.ts
index 62d6cedd9..081225569 100644
--- a/sdk/base/lib/actions/setupActions.ts
+++ b/sdk/base/lib/actions/setupActions.ts
@@ -1,5 +1,8 @@
 import { InputSpec } from "./input/builder"
-import { ExtractInputSpecType } from "./input/builder/inputSpec"
+import {
+  ExtractInputSpecType,
+  ExtractPartialInputSpecType,
+} from "./input/builder/inputSpec"
 import * as T from "../types"
 import { once } from "../util"
 
@@ -20,7 +23,10 @@ export type GetInput<
 > = (options: {
   effects: T.Effects
 }) => Promise<
-  null | void | undefined | (ExtractInputSpecType<A> & Record<string, any>)
+  | null
+  | void
+  | undefined
+  | (ExtractPartialInputSpecType<A> & Record<string, any>)
 >
 
 export type MaybeFn<T> = T | ((options: { effects: T.Effects }) => Promise<T>)
@@ -52,15 +58,13 @@ export class Action<
     | Record<string, any>
     | InputSpec<any, Store>
     | InputSpec<any, never>,
-  Type extends
-    ExtractInputSpecType<InputSpecType> = ExtractInputSpecType<InputSpecType>,
 > {
   private constructor(
     readonly id: Id,
     private readonly metadataFn: MaybeFn<T.ActionMetadata>,
     private readonly inputSpec: InputSpecType,
-    private readonly getInputFn: GetInput<Type>,
-    private readonly runFn: Run<Type>,
+    private readonly getInputFn: GetInput<ExtractInputSpecType<InputSpecType>>,
+    private readonly runFn: Run<ExtractInputSpecType<InputSpecType>>,
   ) {}
   static withInput<
     Id extends T.ActionId,
@@ -69,15 +73,13 @@ export class Action<
       | Record<string, any>
       | InputSpec<any, Store>
       | InputSpec<any, never>,
-    Type extends
-      ExtractInputSpecType<InputSpecType> = ExtractInputSpecType<InputSpecType>,
   >(
     id: Id,
     metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
     inputSpec: InputSpecType,
-    getInput: GetInput<Type>,
-    run: Run<Type>,
-  ): Action<Id, Store, InputSpecType, Type> {
+    getInput: GetInput<ExtractInputSpecType<InputSpecType>>,
+    run: Run<ExtractInputSpecType<InputSpecType>>,
+  ): Action<Id, Store, InputSpecType> {
     return new Action(
       id,
       mapMaybeFn(metadata, (m) => ({ ...m, hasInput: true })),
@@ -90,7 +92,7 @@ export class Action<
     id: Id,
     metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
     run: Run<{}>,
-  ): Action<Id, Store, {}, {}> {
+  ): Action<Id, Store, {}> {
     return new Action(
       id,
       mapMaybeFn(metadata, (m) => ({ ...m, hasInput: false })),
@@ -114,7 +116,7 @@ export class Action<
   }
   async run(options: {
     effects: T.Effects
-    input: Type
+    input: ExtractInputSpecType<InputSpecType>
   }): Promise<T.ActionResult | null> {
     return (await this.runFn(options)) || null
   }
@@ -122,13 +124,13 @@ export class Action<
 
 export class Actions<
   Store,
-  AllActions extends Record<T.ActionId, Action<T.ActionId, Store, any, any>>,
+  AllActions extends Record<T.ActionId, Action<T.ActionId, Store, any>>,
 > {
   private constructor(private readonly actions: AllActions) {}
   static of<Store>(): Actions<Store, {}> {
     return new Actions({})
   }
-  addAction<A extends Action<T.ActionId, Store, any, any>>(
+  addAction<A extends Action<T.ActionId, Store, any>>(
     action: A,
   ): Actions<Store, AllActions & { [id in A["id"]]: A }> {
     return new Actions({ ...this.actions, [action.id]: action })
diff --git a/sdk/base/lib/types.ts b/sdk/base/lib/types.ts
index d7ab1e51b..ab1acaa87 100644
--- a/sdk/base/lib/types.ts
+++ b/sdk/base/lib/types.ts
@@ -86,7 +86,7 @@ export namespace ExpectedExports {
 
   export type actions = Actions<
     any,
-    Record<ActionId, Action<ActionId, any, any, any>>
+    Record<ActionId, Action<ActionId, any, any>>
   >
 }
 export type ABI = {
diff --git a/sdk/base/package-lock.json b/sdk/base/package-lock.json
index 91c470676..4c8f58364 100644
--- a/sdk/base/package-lock.json
+++ b/sdk/base/package-lock.json
@@ -14,7 +14,7 @@
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
         "mime-types": "^2.1.35",
-        "ts-matches": "^5.5.1",
+        "ts-matches": "^6.0.0",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
@@ -3897,9 +3897,10 @@
       "dev": true
     },
     "node_modules/ts-matches": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
-      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.0.0.tgz",
+      "integrity": "sha512-vR4hhz9bYMW30qIJUuLaeAWlsR54vse6ZI2riVhVLMBE6/vss43jwrOvbHheiyU7e26ssT/yWx69aJHD2REJSA==",
+      "license": "MIT"
     },
     "node_modules/ts-morph": {
       "version": "18.0.0",
diff --git a/sdk/base/package.json b/sdk/base/package.json
index e38cc5ac6..509e621de 100644
--- a/sdk/base/package.json
+++ b/sdk/base/package.json
@@ -27,7 +27,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
     "mime-types": "^2.1.35",
-    "ts-matches": "^5.5.1",
+    "ts-matches": "^6.0.0",
     "yaml": "^2.2.2"
   },
   "prettier": {
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index f41961d16..28a14e1e5 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -1,7 +1,4 @@
-import {
-  RequiredDefault,
-  Value,
-} from "../../base/lib/actions/input/builder/value"
+import { Value } from "../../base/lib/actions/input/builder/value"
 import {
   InputSpec,
   ExtractInputSpecType,
@@ -141,9 +138,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
       ...startSdkEffectWrapper,
       action: {
         run: actions.runAction,
-        request: <
-          T extends Action<T.ActionId, any, any, Record<string, unknown>>,
-        >(
+        request: <T extends Action<T.ActionId, any, any>>(
           effects: T.Effects,
           packageId: T.PackageId,
           action: T,
@@ -157,9 +152,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             severity,
             options: options,
           }),
-        requestOwn: <
-          T extends Action<T.ActionId, Store, any, Record<string, unknown>>,
-        >(
+        requestOwn: <T extends Action<T.ActionId, Store, any>>(
           effects: T.Effects,
           action: T,
           severity: T.ActionSeverity,
@@ -1060,14 +1053,14 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               /** Presents a warning prompt before permitting the value to change. */
               warning?: string | null
               /**
-               * @description Determines if the field is required. If so, optionally provide a default value.
-               * @type { false | { default: string | RandomString | null } }
-               * @example required: false
-               * @example required: { default: null }
-               * @example required: { default: 'World' }
-               * @example required: { default: { charset: 'abcdefg', len: 16 } }
+               * @description optionally provide a default value.
+               * @type { string | RandomString | null }
+               * @example default: null
+               * @example default: 'World'
+               * @example default: { charset: 'abcdefg', len: 16 }
                */
-              required: RequiredDefault<DefaultString>
+              default: DefaultString | null
+              required: boolean
               /**
                * @description Mask (aka camouflage) text input with dots: ● ● ●
                * @default false
@@ -1110,15 +1103,12 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               description?: string | null
               /** Presents a warning prompt before permitting the value to change. */
               warning?: string | null
-              /**
-               * @description Unlike other "required" fields, for textarea this is a simple boolean.
-               */
+              default: string | null
               required: boolean
               minLength?: number | null
               maxLength?: number | null
               placeholder?: string | null
               disabled?: false | string
-              generate?: null | RandomString
             }
           >,
         ) => Value.dynamicTextarea<Store>(getA),
@@ -1131,13 +1121,13 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               /** Presents a warning prompt before permitting the value to change. */
               warning?: string | null
               /**
-               * @description Determines if the field is required. If so, optionally provide a default value.
-               * @type { false | { default: number | null } }
-               * @example required: false
-               * @example required: { default: null }
-               * @example required: { default: 7 }
+               * @description optionally provide a default value.
+               * @type { number | null }
+               * @example default: null
+               * @example default: 7
                */
-              required: RequiredDefault<number>
+              default: number | null
+              required: boolean
               min?: number | null
               max?: number | null
               /**
@@ -1167,13 +1157,13 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               /** Presents a warning prompt before permitting the value to change. */
               warning?: string | null
               /**
-               * @description Determines if the field is required. If so, optionally provide a default value.
-               * @type { false | { default: string | null } }
-               * @example required: false
-               * @example required: { default: null }
-               * @example required: { default: 'ffffff' }
+               * @description optionally provide a default value.
+               * @type { string | null }
+               * @example default: null
+               * @example default: 'ffffff'
                */
-              required: RequiredDefault<string>
+              default: string | null
+              required: boolean
               disabled?: false | string
             }
           >,
@@ -1187,13 +1177,13 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               /** Presents a warning prompt before permitting the value to change. */
               warning?: string | null
               /**
-               * @description Determines if the field is required. If so, optionally provide a default value.
-               * @type { false | { default: string | null } }
-               * @example required: false
-               * @example required: { default: null }
-               * @example required: { default: '1985-12-16 18:00:00.000' }
+               * @description optionally provide a default value.
+               * @type { string | null }
+               * @example default: null
+               * @example default: '1985-12-16 18:00:00.000'
                */
-              required: RequiredDefault<string>
+              default: string
+              required: boolean
               /**
                * @description Informs the browser how to behave and which date/time component to display.
                * @default "datetime-local"
@@ -1205,7 +1195,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             }
           >,
         ) => Value.dynamicDatetime<Store>(getA),
-        dynamicSelect: (
+        dynamicSelect: <Variants extends Record<string, string>>(
           getA: LazyBuild<
             Store,
             {
@@ -1214,13 +1204,12 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               /** Presents a warning prompt before permitting the value to change. */
               warning?: string | null
               /**
-               * @description Determines if the field is required. If so, optionally provide a default value from the list of values.
-               * @type { false | { default: string | null } }
-               * @example required: false
-               * @example required: { default: null }
-               * @example required: { default: 'radio1' }
+               * @description provide a default value from the list of values.
+               * @type { default: string }
+               * @example default: 'radio1'
                */
-              required: RequiredDefault<string>
+              default: keyof Variants & string
+              required: boolean
               /**
                * @description A mapping of unique radio options to their human readable display format.
                * @example
@@ -1232,7 +1221,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
                 }
                * ```
                */
-              values: Record<string, string>
+              values: Variants
               /**
                * @options
                *   - false - The field can be modified.
@@ -1282,27 +1271,37 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           >,
         ) => Value.dynamicMultiselect<Store>(getA),
         filteredUnion: <
-          Required extends RequiredDefault<string>,
-          Type extends Record<string, any>,
+          VariantValues extends {
+            [K in string]: {
+              name: string
+              spec: InputSpec<any, Store> | InputSpec<any, never>
+            }
+          },
         >(
           getDisabledFn: LazyBuild<Store, string[]>,
           a: {
             name: string
             description?: string | null
             warning?: string | null
-            required: Required
+            default: keyof VariantValues & string
           },
-          aVariants: Variants<Type, Store> | Variants<Type, never>,
+          aVariants:
+            | Variants<VariantValues, Store>
+            | Variants<VariantValues, never>,
         ) =>
-          Value.filteredUnion<Required, Type, Store>(
+          Value.filteredUnion<VariantValues, Store>(
             getDisabledFn,
             a,
             aVariants,
           ),
 
         dynamicUnion: <
-          Required extends RequiredDefault<string>,
-          Type extends Record<string, any>,
+          VariantValues extends {
+            [K in string]: {
+              name: string
+              spec: InputSpec<any, Store> | InputSpec<any, never>
+            }
+          },
         >(
           getA: LazyBuild<
             Store,
@@ -1312,13 +1311,12 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               /** Presents a warning prompt before permitting the value to change. */
               warning?: string | null
               /**
-               * @description Determines if the field is required. If so, optionally provide a default value from the list of variants.
-               * @type { false | { default: string | null } }
-               * @example required: false
-               * @example required: { default: null }
-               * @example required: { default: 'variant1' }
+               * @description provide a default value from the list of variants.
+               * @type { string }
+               * @example default: 'variant1'
                */
-              required: Required
+              default: keyof VariantValues & string
+              required: boolean
               /**
                * @options
                *   - false - The field can be modified.
@@ -1329,8 +1327,10 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               disabled: false | string | string[]
             }
           >,
-          aVariants: Variants<Type, Store> | Variants<Type, never>,
-        ) => Value.dynamicUnion<Required, Type, Store>(getA, aVariants),
+          aVariants:
+            | Variants<VariantValues, Store>
+            | Variants<VariantValues, never>,
+        ) => Value.dynamicUnion<VariantValues, Store>(getA, aVariants),
       },
       Variants: {
         of: <
diff --git a/sdk/package/lib/test/inputSpecBuilder.test.ts b/sdk/package/lib/test/inputSpecBuilder.test.ts
index f9d4321a6..195acb40a 100644
--- a/sdk/package/lib/test/inputSpecBuilder.test.ts
+++ b/sdk/package/lib/test/inputSpecBuilder.test.ts
@@ -17,7 +17,8 @@ describe("builder tests", () => {
       "peer-tor-address": Value.text({
         name: "Peer tor address",
         description: "The Tor address of the peer interface",
-        required: { default: null },
+        required: true,
+        default: null,
       }),
     }).build({} as any)
     expect(bitcoinPropertiesBuilt).toMatchObject({
@@ -55,7 +56,8 @@ describe("values", () => {
   test("text", async () => {
     const value = Value.text({
       name: "Testing",
-      required: { default: null },
+      required: true,
+      default: null,
     })
     const validator = value.validator
     const rawIs = await value.build({} as any)
@@ -66,7 +68,8 @@ describe("values", () => {
   test("text with default", async () => {
     const value = Value.text({
       name: "Testing",
-      required: { default: "this is a default value" },
+      required: true,
+      default: "this is a default value",
     })
     const validator = value.validator
     const rawIs = await value.build({} as any)
@@ -78,6 +81,7 @@ describe("values", () => {
     const value = Value.text({
       name: "Testing",
       required: false,
+      default: null,
     })
     const validator = value.validator
     const rawIs = await value.build({} as any)
@@ -89,6 +93,7 @@ describe("values", () => {
     const value = Value.color({
       name: "Testing",
       required: false,
+      default: null,
       description: null,
       warning: null,
     })
@@ -99,7 +104,8 @@ describe("values", () => {
   test("datetime", async () => {
     const value = Value.datetime({
       name: "Testing",
-      required: { default: null },
+      required: true,
+      default: null,
       description: null,
       warning: null,
       inputmode: "date",
@@ -114,6 +120,7 @@ describe("values", () => {
     const value = Value.datetime({
       name: "Testing",
       required: false,
+      default: null,
       description: null,
       warning: null,
       inputmode: "date",
@@ -128,6 +135,7 @@ describe("values", () => {
     const value = Value.textarea({
       name: "Testing",
       required: false,
+      default: null,
       description: null,
       warning: null,
       minLength: null,
@@ -136,12 +144,13 @@ describe("values", () => {
     })
     const validator = value.validator
     validator.unsafeCast("test text")
-    testOutput<typeof validator._TYPE, string>()(null)
+    testOutput<typeof validator._TYPE, string | null | undefined>()(null)
   })
   test("number", async () => {
     const value = Value.number({
       name: "Testing",
-      required: { default: null },
+      required: true,
+      default: null,
       integer: false,
       description: null,
       warning: null,
@@ -159,6 +168,7 @@ describe("values", () => {
     const value = Value.number({
       name: "Testing",
       required: false,
+      default: null,
       integer: false,
       description: null,
       warning: null,
@@ -175,7 +185,7 @@ describe("values", () => {
   test("select", async () => {
     const value = Value.select({
       name: "Testing",
-      required: { default: null },
+      default: "a",
       values: {
         a: "A",
         b: "B",
@@ -192,7 +202,7 @@ describe("values", () => {
   test("nullable select", async () => {
     const value = Value.select({
       name: "Testing",
-      required: false,
+      default: "a",
       values: {
         a: "A",
         b: "B",
@@ -203,8 +213,7 @@ describe("values", () => {
     const validator = value.validator
     validator.unsafeCast("a")
     validator.unsafeCast("b")
-    validator.unsafeCast(null)
-    testOutput<typeof validator._TYPE, "a" | "b" | null | undefined>()(null)
+    testOutput<typeof validator._TYPE, "a" | "b">()(null)
   })
   test("multiselect", async () => {
     const value = Value.multiselect({
@@ -250,7 +259,7 @@ describe("values", () => {
     const value = Value.union(
       {
         name: "Testing",
-        required: { default: null },
+        default: "a",
         description: null,
         warning: null,
       },
@@ -271,7 +280,16 @@ describe("values", () => {
     const validator = value.validator
     validator.unsafeCast({ selection: "a", value: { b: false } })
     type Test = typeof validator._TYPE
-    testOutput<Test, { selection: "a"; value: { b: boolean } }>()(null)
+    testOutput<
+      Test,
+      {
+        selection: "a"
+        value: {
+          b: boolean
+        }
+        other?: {}
+      }
+    >()(null)
   })
 
   describe("dynamic", () => {
@@ -301,7 +319,8 @@ describe("values", () => {
     test("text", async () => {
       const value = Value.dynamicText(async () => ({
         name: "Testing",
-        required: { default: null },
+        required: true,
+        default: null,
       }))
       const validator = value.validator
       const rawIs = await value.build({} as any)
@@ -317,7 +336,8 @@ describe("values", () => {
     test("text with default", async () => {
       const value = Value.dynamicText(async () => ({
         name: "Testing",
-        required: { default: "this is a default value" },
+        required: true,
+        default: "this is a default value",
       }))
       const validator = value.validator
       validator.unsafeCast("test text")
@@ -333,6 +353,7 @@ describe("values", () => {
       const value = Value.dynamicText(async () => ({
         name: "Testing",
         required: false,
+        default: null,
       }))
       const validator = value.validator
       const rawIs = await value.build({} as any)
@@ -349,6 +370,7 @@ describe("values", () => {
       const value = Value.dynamicColor(async () => ({
         name: "Testing",
         required: false,
+        default: null,
         description: null,
         warning: null,
       }))
@@ -414,7 +436,8 @@ describe("values", () => {
 
           return {
             name: "Testing",
-            required: { default: null },
+            required: true,
+            default: null,
             inputmode: "date",
           }
         },
@@ -436,6 +459,7 @@ describe("values", () => {
       const value = Value.dynamicTextarea(async () => ({
         name: "Testing",
         required: false,
+        default: null,
         description: null,
         warning: null,
         minLength: null,
@@ -444,8 +468,7 @@ describe("values", () => {
       }))
       const validator = value.validator
       validator.unsafeCast("test text")
-      expect(() => validator.unsafeCast(null)).toThrowError()
-      testOutput<typeof validator._TYPE, string>()(null)
+      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
         required: false,
@@ -454,7 +477,8 @@ describe("values", () => {
     test("number", async () => {
       const value = Value.dynamicNumber(() => ({
         name: "Testing",
-        required: { default: null },
+        required: true,
+        default: null,
         integer: false,
         description: null,
         warning: null,
@@ -477,7 +501,7 @@ describe("values", () => {
     test("select", async () => {
       const value = Value.dynamicSelect(() => ({
         name: "Testing",
-        required: { default: null },
+        default: "a",
         values: {
           a: "A",
           b: "B",
@@ -489,11 +513,9 @@ describe("values", () => {
       validator.unsafeCast("a")
       validator.unsafeCast("b")
       validator.unsafeCast("c")
-      validator.unsafeCast(null)
-      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      testOutput<typeof validator._TYPE, string>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
-        required: true,
       })
     })
     test("multiselect", async () => {
@@ -529,7 +551,7 @@ describe("values", () => {
         () => ["a", "c"],
         {
           name: "Testing",
-          required: { default: null },
+          default: "a",
           description: null,
           warning: null,
         },
@@ -563,8 +585,28 @@ describe("values", () => {
       type Test = typeof validator._TYPE
       testOutput<
         Test,
-        | { selection: "a"; value: { b: boolean } }
-        | { selection: "b"; value: { b: boolean } }
+        | {
+            selection: "a"
+            value: {
+              b: boolean
+            }
+            other?: {
+              b?: {
+                b?: boolean
+              }
+            }
+          }
+        | {
+            selection: "b"
+            value: {
+              b: boolean
+            }
+            other?: {
+              a?: {
+                b?: boolean
+              }
+            }
+          }
       >()(null)
 
       const built = await value.build({} as any)
@@ -596,7 +638,7 @@ describe("values", () => {
       () => ({
         disabled: ["a", "c"],
         name: "Testing",
-        required: { default: null },
+        default: "b",
         description: null,
         warning: null,
       }),
@@ -630,10 +672,28 @@ describe("values", () => {
     type Test = typeof validator._TYPE
     testOutput<
       Test,
-      | { selection: "a"; value: { b: boolean } }
-      | { selection: "b"; value: { b: boolean } }
-      | null
-      | undefined
+      | {
+          selection: "a"
+          value: {
+            b: boolean
+          }
+          other?: {
+            b?: {
+              b?: boolean
+            }
+          }
+        }
+      | {
+          selection: "b"
+          value: {
+            b: boolean
+          }
+          other?: {
+            a?: {
+              b?: boolean
+            }
+          }
+        }
     >()(null)
 
     const built = await value.build({} as any)
@@ -728,6 +788,7 @@ describe("Nested nullable values", () => {
         description:
           "If no name is provided, the name from inputSpec will be used",
         required: false,
+        default: null,
       }),
     })
     const validator = value.validator
@@ -743,6 +804,7 @@ describe("Nested nullable values", () => {
         description:
           "If no name is provided, the name from inputSpec will be used",
         required: false,
+        default: null,
         warning: null,
         placeholder: null,
         integer: false,
@@ -765,6 +827,7 @@ describe("Nested nullable values", () => {
         description:
           "If no name is provided, the name from inputSpec will be used",
         required: false,
+        default: null,
         warning: null,
       }),
     })
@@ -780,7 +843,7 @@ describe("Nested nullable values", () => {
         name: "Temp Name",
         description:
           "If no name is provided, the name from inputSpec will be used",
-        required: false,
+        default: "a",
         warning: null,
         values: {
           a: "A",
@@ -791,7 +854,7 @@ describe("Nested nullable values", () => {
       name: "Temp Name",
       description:
         "If no name is provided, the name from inputSpec will be used",
-      required: false,
+      default: "a",
       warning: null,
       values: {
         a: "A",
@@ -799,10 +862,9 @@ describe("Nested nullable values", () => {
     }).build({} as any)
 
     const validator = value.validator
-    validator.unsafeCast({ a: null })
     validator.unsafeCast({ a: "a" })
     expect(() => validator.unsafeCast({ a: "4" })).toThrowError()
-    testOutput<typeof validator._TYPE, { a: "a" | null | undefined }>()(null)
+    testOutput<typeof validator._TYPE, { a: "a" }>()(null)
   })
   test("Testing multiselect", async () => {
     const value = InputSpec.of({
diff --git a/sdk/package/lib/test/output.test.ts b/sdk/package/lib/test/output.test.ts
index 37636e52f..53d006274 100644
--- a/sdk/package/lib/test/output.test.ts
+++ b/sdk/package/lib/test/output.test.ts
@@ -87,7 +87,7 @@ describe("Inputs", () => {
       dbcache: 5,
       pruning: {
         selection: "disabled",
-        value: {},
+        value: { disabled: {} },
       },
       blockfilters: {
         blockfilterindex: false,
diff --git a/sdk/package/lib/util/fileHelper.ts b/sdk/package/lib/util/fileHelper.ts
index 615bcfdc9..80e5b3564 100644
--- a/sdk/package/lib/util/fileHelper.ts
+++ b/sdk/package/lib/util/fileHelper.ts
@@ -80,7 +80,8 @@ export class FileHelper<A> {
   protected constructor(
     readonly path: string,
     readonly writeData: (dataIn: A) => string,
-    readonly readData: (stringValue: string) => A,
+    readonly readData: (stringValue: string) => unknown,
+    readonly validate: (value: unknown) => A,
   ) {}
 
   /**
@@ -97,10 +98,7 @@ export class FileHelper<A> {
     return null
   }
 
-  /**
-   * Reads the file from disk and converts it to structured data.
-   */
-  private async readOnce(): Promise<A | null> {
+  private async readFile(): Promise<unknown> {
     if (!(await exists(this.path))) {
       return null
     }
@@ -109,6 +107,15 @@ export class FileHelper<A> {
     )
   }
 
+  /**
+   * Reads the file from disk and converts it to structured data.
+   */
+  private async readOnce(): Promise<A | null> {
+    const data = await this.readFile()
+    if (!data) return null
+    return this.validate(data)
+  }
+
   private async readConst(effects: T.Effects): Promise<A | null> {
     const watch = this.readWatch()
     const res = await watch.next()
@@ -156,22 +163,22 @@ export class FileHelper<A> {
    * Accepts full structured data and performs a merge with the existing file on disk if it exists.
    */
   async write(data: A) {
-    const fileData = (await this.readOnce()) || {}
+    const fileData = (await this.readFile()) || {}
     const mergeData = merge({}, fileData, data)
-    return await this.writeFile(mergeData)
+    return await this.writeFile(this.validate(mergeData))
   }
 
   /**
    * Accepts partial structured data and performs a merge with the existing file on disk.
    */
-  async merge(data: Partial<A>) {
+  async merge(data: T.DeepPartial<A>) {
     const fileData =
-      (await this.readOnce()) ||
+      (await this.readFile()) ||
       (() => {
         throw new Error(`${this.path}: does not exist`)
       })()
     const mergeData = merge({}, fileData, data)
-    return await this.writeFile(mergeData)
+    return await this.writeFile(this.validate(mergeData))
   }
 
   /**
@@ -179,7 +186,7 @@ export class FileHelper<A> {
    * Like one behaviour of another dependency or something similar.
    */
   withPath(path: string) {
-    return new FileHelper<A>(path, this.writeData, this.readData)
+    return new FileHelper<A>(path, this.writeData, this.readData, this.validate)
   }
 
   /**
@@ -190,9 +197,10 @@ export class FileHelper<A> {
   static raw<A>(
     path: string,
     toFile: (dataIn: A) => string,
-    fromFile: (rawData: string) => A,
+    fromFile: (rawData: string) => unknown,
+    validate: (data: unknown) => A,
   ) {
-    return new FileHelper<A>(path, toFile, fromFile)
+    return new FileHelper<A>(path, toFile, fromFile, validate)
   }
   /**
    * Create a File Helper for a .json file.
@@ -200,12 +208,9 @@ export class FileHelper<A> {
   static json<A>(path: string, shape: matches.Validator<unknown, A>) {
     return new FileHelper<A>(
       path,
-      (inData) => {
-        return JSON.stringify(inData, null, 2)
-      },
-      (inString) => {
-        return shape.unsafeCast(JSON.parse(inString))
-      },
+      (inData) => JSON.stringify(inData, null, 2),
+      (inString) => JSON.parse(inString),
+      (data) => shape.unsafeCast(data),
     )
   }
   /**
@@ -217,12 +222,9 @@ export class FileHelper<A> {
   ) {
     return new FileHelper<A>(
       path,
-      (inData) => {
-        return TOML.stringify(inData as any)
-      },
-      (inString) => {
-        return shape.unsafeCast(TOML.parse(inString))
-      },
+      (inData) => TOML.stringify(inData as any),
+      (inString) => TOML.parse(inString),
+      (data) => shape.unsafeCast(data),
     )
   }
   /**
@@ -234,12 +236,9 @@ export class FileHelper<A> {
   ) {
     return new FileHelper<A>(
       path,
-      (inData) => {
-        return YAML.stringify(inData, null, 2)
-      },
-      (inString) => {
-        return shape.unsafeCast(YAML.parse(inString))
-      },
+      (inData) => YAML.stringify(inData, null, 2),
+      (inString) => YAML.parse(inString),
+      (data) => shape.unsafeCast(data),
     )
   }
 }
diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
index 2cc87d374..0b06e79db 100644
--- a/sdk/package/package-lock.json
+++ b/sdk/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha.13",
+  "version": "0.3.6-alpha.16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha.13",
+      "version": "0.3.6-alpha.16",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
@@ -15,7 +15,7 @@
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
         "mime-types": "^2.1.35",
-        "ts-matches": "^5.5.1",
+        "ts-matches": "^6.0.0",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
@@ -3918,9 +3918,10 @@
       "dev": true
     },
     "node_modules/ts-matches": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
-      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.0.0.tgz",
+      "integrity": "sha512-vR4hhz9bYMW30qIJUuLaeAWlsR54vse6ZI2riVhVLMBE6/vss43jwrOvbHheiyU7e26ssT/yWx69aJHD2REJSA==",
+      "license": "MIT"
     },
     "node_modules/ts-morph": {
       "version": "18.0.0",
diff --git a/sdk/package/package.json b/sdk/package/package.json
index 661263f70..bbcab9830 100644
--- a/sdk/package/package.json
+++ b/sdk/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha.13",
+  "version": "0.3.6-alpha.17",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",
@@ -33,7 +33,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
     "mime-types": "^2.1.35",
-    "ts-matches": "^5.5.1",
+    "ts-matches": "^6.0.0",
     "yaml": "^2.2.2",
     "@iarna/toml": "^2.2.5",
     "@noble/curves": "^1.4.0",
diff --git a/sdk/package/scripts/oldSpecToBuilder.ts b/sdk/package/scripts/oldSpecToBuilder.ts
index 04128f2bd..11ef30340 100644
--- a/sdk/package/scripts/oldSpecToBuilder.ts
+++ b/sdk/package/scripts/oldSpecToBuilder.ts
@@ -85,6 +85,7 @@ const {InputSpec, List, Value, Variants} = sdk
               description: value.description || null,
               warning: value.warning || null,
               required: !(value.nullable || false),
+              default: value.default,
               placeholder: value.placeholder || null,
               maxLength: null,
               minLength: null,
@@ -96,12 +97,8 @@ const {InputSpec, List, Value, Variants} = sdk
         return `${rangeToTodoComment(value?.range)}Value.text(${JSON.stringify(
           {
             name: value.name || null,
-            // prettier-ignore
-            required: (
-              value.default != null  ? {default: value.default} :
-              value.nullable === false ? {default: null} :
-              !value.nullable
-            ),
+            default: value.default || null,
+            required: !value.nullable,
             description: value.description || null,
             warning: value.warning || null,
             masked: value.masked || false,
@@ -130,12 +127,8 @@ const {InputSpec, List, Value, Variants} = sdk
             name: value.name || null,
             description: value.description || null,
             warning: value.warning || null,
-            // prettier-ignore
-            required: (
-              value.default != null  ? {default: value.default} :
-              value.nullable === false ? {default: null} :
-              !value.nullable
-            ),
+            default: value.default || null,
+            required: !value.nullable,
             min: null,
             max: null,
             step: null,
@@ -174,13 +167,7 @@ const {InputSpec, List, Value, Variants} = sdk
             name: value.name || null,
             description: value.description || null,
             warning: value.warning || null,
-
-            // prettier-ignore
-            required:(
-              value.default != null  ? {default: value.default} :
-              value.nullable === false ? {default: null} :
-              !value.nullable
-            ),
+            default: value.default,
             values,
           },
           null,
@@ -207,14 +194,7 @@ const {InputSpec, List, Value, Variants} = sdk
         name: ${JSON.stringify(value.name || null)},
         description: ${JSON.stringify(value.tag.description || null)},
         warning: ${JSON.stringify(value.tag.warning || null)},
-        
-        // prettier-ignore
-        required: ${JSON.stringify(
-          // prettier-ignore
-          value.default != null  ? {default: value.default} :
-          value.nullable === false ? {default: null} :
-          !value.nullable,
-        )},
+        default: ${JSON.stringify(value.default)},
       }, ${variants})`
       }
       case "list": {
@@ -341,12 +321,7 @@ const {InputSpec, List, Value, Variants} = sdk
               value?.spec?.tag?.description || null,
             )},
             warning: ${JSON.stringify(value?.spec?.tag?.warning || null)},
-            required: ${JSON.stringify(
-              // prettier-ignore
-              'default' in value?.spec ? {default: value?.spec?.default} :
-              !!value?.spec?.tag?.nullable || false ? {default: null} :
-              false,
-            )},
+            default: ${JSON.stringify(value?.spec?.default || null)},
           }, ${variants})
         `,
         )
diff --git a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
index 743d3546b..859433077 100644
--- a/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
+++ b/web/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
@@ -268,25 +268,29 @@ const cifsSpec = ISB.InputSpec.of({
       'The hostname of your target device on the Local Area Network.',
     warning: null,
     placeholder: `e.g. 'My Computer' OR 'my-computer.local'`,
-    required: { default: null },
+    required: true,
+    default: null,
     patterns: [],
   }),
   path: ISB.Value.text({
     name: 'Path',
     description: `On Windows, this is the fully qualified path to the shared folder, (e.g. /Desktop/my-folder).\n\n On Linux and Mac, this is the literal name of the shared folder (e.g. my-shared-folder).`,
     placeholder: 'e.g. my-shared-folder or /Desktop/my-folder',
-    required: { default: null },
+    required: true,
+    default: null,
   }),
   username: ISB.Value.text({
     name: 'Username',
     description: `On Linux, this is the samba username you created when sharing the folder.\n\n On Mac and Windows, this is the username of the user who is sharing the folder.`,
-    required: { default: null },
+    required: true,
+    default: null,
     placeholder: 'My Network Folder',
   }),
   password: ISB.Value.text({
     name: 'Password',
     description: `On Linux, this is the samba password you created when sharing the folder.\n\n On Mac and Windows, this is the password of the user who is sharing the folder.`,
     required: false,
+    default: null,
     masked: true,
     placeholder: 'My Network Folder',
   }),
diff --git a/web/projects/ui/src/app/components/form/form-select/form-select.component.html b/web/projects/ui/src/app/components/form/form-select/form-select.component.html
index fe2b561c7..9149e8844 100644
--- a/web/projects/ui/src/app/components/form/form-select/form-select.component.html
+++ b/web/projects/ui/src/app/components/form/form-select/form-select.component.html
@@ -2,13 +2,12 @@
   [tuiHintContent]="spec | hint"
   [disabled]="disabled"
   [readOnly]="readOnly"
-  [tuiTextfieldCleaner]="!spec.required"
+  [tuiTextfieldCleaner]="false"
   [pseudoInvalid]="invalid"
   [(ngModel)]="selected"
   (focusedChange)="onFocus($event)"
 >
-  {{ spec.name }}
-  <span *ngIf="spec.required">*</span>
+  {{ spec.name }}*
   <select
     tuiSelect
     [placeholder]="spec.name"
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 12ecd4e61..3b89deba3 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -697,23 +697,20 @@ interface SettingBtn {
 const passwordSpec = ISB.InputSpec.of({
   currentPassword: ISB.Value.text({
     name: 'Current Password',
-    required: {
-      default: null,
-    },
+    required: true,
+    default: null,
     masked: true,
   }),
   newPassword1: ISB.Value.text({
     name: 'New Password',
-    required: {
-      default: null,
-    },
+    required: true,
+    default: null,
     masked: true,
   }),
   newPassword2: ISB.Value.text({
     name: 'Retype New Password',
-    required: {
-      default: null,
-    },
+    required: true,
+    default: null,
     masked: true,
   }),
 })
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 844094e3a..2f93b3e28 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1151,7 +1151,7 @@ export module Mock {
                 name: 'P2P Settings',
                 description:
                   '<p>The Bitcoin Core node to connect to over the peer-to-peer (P2P) interface:</p><ul><li><strong>Bitcoin Core</strong>: The Bitcoin Core service installed on this device</li><li><strong>External Node</strong>: A Bitcoin node running on a different device</li></ul>',
-                required: { default: 'internal' },
+                default: 'internal',
               },
               ISB.Variants.of({
                 internal: { name: 'Bitcoin Core', spec: ISB.InputSpec.of({}) },
@@ -1160,9 +1160,8 @@ export module Mock {
                   spec: ISB.InputSpec.of({
                     'p2p-host': ISB.Value.text({
                       name: 'Public Address',
-                      required: {
-                        default: null,
-                      },
+                      required: false,
+                      default: null,
                       description:
                         'The public address of your Bitcoin Core server',
                     }),
@@ -1170,9 +1169,8 @@ export module Mock {
                       name: 'P2P Port',
                       description:
                         'The port that your Bitcoin Core P2P server is bound to',
-                      required: {
-                        default: 8333,
-                      },
+                      required: true,
+                      default: 8333,
                       min: 0,
                       max: 65535,
                       integer: true,
@@ -1186,10 +1184,12 @@ export module Mock {
         color: ISB.Value.color({
           name: 'Color',
           required: false,
+          default: null,
         }),
         datetime: ISB.Value.datetime({
           name: 'Datetime',
           required: false,
+          default: null,
         }),
         // file: ISB.Value.file({
         //   name: 'File',
@@ -1221,9 +1221,8 @@ export module Mock {
               ISB.InputSpec.of({
                 rpcuser2: ISB.Value.text({
                   name: 'RPC Username',
-                  required: {
-                    default: 'defaultrpcusername',
-                  },
+                  required: false,
+                  default: 'defaultrpcusername',
                   description: 'rpc username',
                   patterns: [
                     {
@@ -1234,9 +1233,8 @@ export module Mock {
                 }),
                 rpcuser: ISB.Value.text({
                   name: 'RPC Username',
-                  required: {
-                    default: 'defaultrpcusername',
-                  },
+                  required: true,
+                  default: 'defaultrpcusername',
                   description: 'rpc username',
                   patterns: [
                     {
@@ -1247,21 +1245,19 @@ export module Mock {
                 }),
                 rpcpass: ISB.Value.text({
                   name: 'RPC User Password',
-                  required: {
-                    default: {
-                      charset: 'a-z,A-Z,2-9',
-                      len: 20,
-                    },
+                  required: true,
+                  default: {
+                    charset: 'a-z,A-Z,2-9',
+                    len: 20,
                   },
                   description: 'rpc password',
                 }),
                 rpcpass2: ISB.Value.text({
                   name: 'RPC User Password',
-                  required: {
-                    default: {
-                      charset: 'a-z,A-Z,2-9',
-                      len: 20,
-                    },
+                  required: true,
+                  default: {
+                    charset: 'a-z,A-Z,2-9',
+                    len: 20,
                   },
                   description: 'rpc password',
                 }),
@@ -1294,14 +1290,14 @@ export module Mock {
                   name: 'First Name',
                   required: false,
                   description: 'User first name',
+                  default: 'Matt',
                 }),
                 'last-name': ISB.Value.text({
                   name: 'Last Name',
-                  required: {
-                    default: {
-                      charset: 'a-g,2-9',
-                      len: 12,
-                    },
+                  required: true,
+                  default: {
+                    charset: 'a-g,2-9',
+                    len: 12,
                   },
                   description: 'User first name',
                   patterns: [
@@ -1316,6 +1312,7 @@ export module Mock {
                   description: 'The age of the user',
                   warning: 'User must be at least 18.',
                   required: false,
+                  default: null,
                   min: 18,
                   integer: false,
                 }),
@@ -1343,7 +1340,7 @@ export module Mock {
                     name: 'Preference',
                     description: null,
                     warning: null,
-                    required: { default: 'summer' },
+                    default: 'summer',
                   },
                   ISB.Variants.of({
                     summer: {
@@ -1351,17 +1348,14 @@ export module Mock {
                       spec: ISB.InputSpec.of({
                         'favorite-tree': ISB.Value.text({
                           name: 'Favorite Tree',
-                          required: {
-                            default: 'Maple',
-                          },
+                          required: true,
+                          default: 'Maple',
                           description: 'What is your favorite tree?',
                         }),
                         'favorite-flower': ISB.Value.select({
                           name: 'Favorite Flower',
                           description: 'Select your favorite flower',
-                          required: {
-                            default: 'none',
-                          },
+                          default: 'none',
                           values: {
                             none: 'none',
                             red: 'red',
@@ -1392,9 +1386,7 @@ export module Mock {
           name: 'Random select',
           description: 'This is not even real.',
           warning: 'Be careful changing this!',
-          required: {
-            default: null,
-          },
+          default: 'option1',
           values: {
             option1: 'option1',
             option2: 'option2',
@@ -1409,9 +1401,8 @@ export module Mock {
               description: 'Your favorite number of all time',
               warning:
                 'Once you set this number, it can never be changed without severe consequences.',
-              required: {
-                default: 7,
-              },
+              required: false,
+              default: 7,
               integer: false,
               units: 'BTC',
             },
@@ -1432,11 +1423,13 @@ export module Mock {
                   name: 'First Law',
                   required: false,
                   description: 'the first law',
+                  default: null,
                 }),
                 law2: ISB.Value.text({
                   name: 'Second Law',
                   required: false,
                   description: 'the second law',
+                  default: null,
                 }),
               }),
             ),
@@ -1452,19 +1445,17 @@ export module Mock {
                   spec: ISB.InputSpec.of({
                     rulemakername: ISB.Value.text({
                       name: 'Rulemaker Name',
-                      required: {
-                        default: {
-                          charset: 'a-g,2-9',
-                          len: 12,
-                        },
+                      required: true,
+                      default: {
+                        charset: 'a-g,2-9',
+                        len: 12,
                       },
                       description: 'the name of the rule maker',
                     }),
                     rulemakerip: ISB.Value.text({
                       name: 'Rulemaker IP',
-                      required: {
-                        default: '192.168.1.0',
-                      },
+                      required: true,
+                      default: '192.168.1.0',
                       description: 'the ip of the rule maker',
                       patterns: [
                         {
@@ -1480,9 +1471,8 @@ export module Mock {
             ),
             rpcuser: ISB.Value.text({
               name: 'RPC Username',
-              required: {
-                default: 'defaultrpcusername',
-              },
+              required: true,
+              default: 'defaultrpcusername',
               description: 'rpc username',
               patterns: [
                 {
@@ -1493,11 +1483,10 @@ export module Mock {
             }),
             rpcpass: ISB.Value.text({
               name: 'RPC User Password',
-              required: {
-                default: {
-                  charset: 'a-z,A-Z,2-9',
-                  len: 20,
-                },
+              required: true,
+              default: {
+                charset: 'a-z,A-Z,2-9',
+                len: 20,
               },
               description: 'rpc password',
               masked: true,
@@ -1509,7 +1498,7 @@ export module Mock {
             name: 'Bitcoin Node',
             description: 'Options<ul><li>Item 1</li><li>Item 2</li></ul>',
             warning: 'Careful changing this',
-            required: { default: 'internal' },
+            default: 'internal',
           },
           ISB.Variants.of({
             fake: {
@@ -1531,9 +1520,8 @@ export module Mock {
                   ISB.InputSpec.of({
                     name: ISB.Value.text({
                       name: 'Name',
-                      required: {
-                        default: null,
-                      },
+                      required: false,
+                      default: null,
                       patterns: [
                         {
                           regex: '^[a-zA-Z]+$',
@@ -1544,17 +1532,15 @@ export module Mock {
                     email: ISB.Value.text({
                       name: 'Email',
                       inputmode: 'email',
-                      required: {
-                        default: null,
-                      },
+                      required: false,
+                      default: null,
                     }),
                   }),
                 ),
                 'public-domain': ISB.Value.text({
                   name: 'Public Domain',
-                  required: {
-                    default: 'bitcoinnode.com',
-                  },
+                  required: true,
+                  default: 'bitcoinnode.com',
                   description: 'the public address of the node',
                   patterns: [
                     {
@@ -1565,9 +1551,8 @@ export module Mock {
                 }),
                 'private-domain': ISB.Value.text({
                   name: 'Private Domain',
-                  required: {
-                    default: null,
-                  },
+                  required: false,
+                  default: null,
                   description: 'the private address of the node',
                   masked: true,
                   inputmode: 'url',
@@ -1580,9 +1565,8 @@ export module Mock {
           name: 'Port',
           description:
             'the default port for your Bitcoin node. default: 8333, testnet: 18333, regtest: 18444',
-          required: {
-            default: 8333,
-          },
+          required: true,
+          default: 8333,
           min: 1,
           max: 9998,
           step: 1,
@@ -1595,6 +1579,7 @@ export module Mock {
             len: 20,
           },
           required: false,
+          default: null,
           description:
             'You most favorite slogan in the whole world, used for paying you.',
           masked: true,
diff --git a/web/projects/ui/src/app/services/form.service.ts b/web/projects/ui/src/app/services/form.service.ts
index 33fa29016..7622cd05a 100644
--- a/web/projects/ui/src/app/services/form.service.ts
+++ b/web/projects/ui/src/app/services/form.service.ts
@@ -135,7 +135,7 @@ export class FormService {
         return this.formBuilder.control(value)
       case 'select':
         value = currentValue === undefined ? spec.default : currentValue
-        return this.formBuilder.control(value, selectValidators(spec))
+        return this.formBuilder.control(value)
       case 'multiselect':
         value = currentValue === undefined ? spec.default : currentValue
         return this.formBuilder.control(value, multiselectValidators(spec))
@@ -231,16 +231,6 @@ function numberValidators(spec: IST.ValueSpecNumber): ValidatorFn[] {
   return validators
 }
 
-function selectValidators(spec: IST.ValueSpecSelect): ValidatorFn[] {
-  const validators: ValidatorFn[] = []
-
-  if (spec.required) {
-    validators.push(Validators.required)
-  }
-
-  return validators
-}
-
 function multiselectValidators(spec: IST.ValueSpecMultiselect): ValidatorFn[] {
   const validators: ValidatorFn[] = []
   validators.push(listInRange(spec.minLength, spec.maxLength))

From ed8a7ee8a51b54cec91ef3edb7bd5d50e6e407ea Mon Sep 17 00:00:00 2001
From: Alex Inkin <alexander@inkin.ru>
Date: Wed, 20 Nov 2024 05:19:41 +0800
Subject: [PATCH 322/341] feat: make favicon react to theme (#2786)

Co-authored-by: Matt Hill <mattnine@protonmail.com>
---
 web/projects/shared/assets/icon/favicon.ico    | Bin 22382 -> 0 bytes
 .../shared/assets/icons/apple-touch-icon.png   | Bin 0 -> 3304 bytes
 .../shared/assets/icons/favicon-96x96.png      | Bin 0 -> 2202 bytes
 web/projects/shared/assets/icons/favicon.ico   | Bin 0 -> 15086 bytes
 web/projects/shared/assets/icons/favicon.svg   |  17 +++++++++++++++++
 .../assets/icons/web-app-manifest-192x192.png  | Bin 0 -> 3582 bytes
 .../assets/icons/web-app-manifest-512x512.png  | Bin 0 -> 22777 bytes
 web/projects/ui/src/index.html                 |  16 ++++++++++++----
 web/projects/ui/src/manifest.webmanifest       |  12 +++++++++---
 9 files changed, 38 insertions(+), 7 deletions(-)
 delete mode 100644 web/projects/shared/assets/icon/favicon.ico
 create mode 100644 web/projects/shared/assets/icons/apple-touch-icon.png
 create mode 100644 web/projects/shared/assets/icons/favicon-96x96.png
 create mode 100644 web/projects/shared/assets/icons/favicon.ico
 create mode 100644 web/projects/shared/assets/icons/favicon.svg
 create mode 100644 web/projects/shared/assets/icons/web-app-manifest-192x192.png
 create mode 100644 web/projects/shared/assets/icons/web-app-manifest-512x512.png

diff --git a/web/projects/shared/assets/icon/favicon.ico b/web/projects/shared/assets/icon/favicon.ico
deleted file mode 100644
index 01b1348a1e1c23f36629c458e9e9b4359a3310ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22382
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
UBZFW%tMK#320?cRV}$Sj01*g!O#lD@

diff --git a/web/projects/shared/assets/icons/apple-touch-icon.png b/web/projects/shared/assets/icons/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1df19c2b4ce03d5a42b7ac1630ae64ce53a6a98d
GIT binary patch
literal 3304
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

literal 0
HcmV?d00001

diff --git a/web/projects/shared/assets/icons/favicon-96x96.png b/web/projects/shared/assets/icons/favicon-96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..4df833b3e971b683a70c6c5ff86a09135acce916
GIT binary patch
literal 2202
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

literal 0
HcmV?d00001

diff --git a/web/projects/shared/assets/icons/favicon.ico b/web/projects/shared/assets/icons/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9622dd64cbb0013999cd75b10bc51e30db6e06d7
GIT binary patch
literal 15086
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

literal 0
HcmV?d00001

diff --git a/web/projects/shared/assets/icons/favicon.svg b/web/projects/shared/assets/icons/favicon.svg
new file mode 100644
index 000000000..c310c86d3
--- /dev/null
+++ b/web/projects/shared/assets/icons/favicon.svg
@@ -0,0 +1,17 @@
+<svg viewBox="0 0 450 450" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M86.556 368.287c-8.449 15.291 10.608 25.124 18.408 10.767 3.306-6.085 104.635-248.519 116.915-277.074L340.04 378.157c7.846 16.75 27.461 4.486 20.219-11.366L233.686 78.361c-6.14-13.108-18.891-13.108-24.559.468-.472.936-117.706 280.653-122.571 289.458Z" fill="var(--fill, #F0F0F0)"></path>
+    <path d="M64.343 345.046c-23.137-29.322-37.522-64.483-41.523-101.495-4.002-37.013 2.54-74.396 18.883-107.911 16.344-33.515 41.835-61.82 73.583-81.707 31.748-19.886 68.482-30.557 106.038-30.804 37.555-.246 74.429 9.943 106.44 29.411 32.01 19.469 57.876 47.438 74.666 80.736 16.789 33.297 23.829 70.592 20.321 107.654-3.507 37.061-17.422 72.407-40.165 102.03l-.39-.294c22.688-29.55 36.569-64.81 40.068-101.782 3.499-36.971-3.524-74.175-20.272-107.391-16.749-33.217-42.552-61.118-74.485-80.539-31.932-19.42-68.716-29.585-106.18-29.34-37.464.246-74.109 10.891-105.78 30.73-31.67 19.837-57.099 48.074-73.403 81.507-16.303 33.433-22.829 70.726-18.837 107.648 3.992 36.922 18.341 71.997 41.422 101.248l-.386.299Zm68.384 55.543c28.193 13.805 58.965 21.193 90.411 20.931 31.445-.263 62.392-7.256 90.347-21.529v-.598c-27.887 14.238-58.983 21.38-90.352 21.641-31.368.262-62.282-7.272-90.406-21.043v.598Z" stroke-width="20" stroke-linejoin="round" stroke="var(--fill, #F0F0F0)"></path>
+    <style>
+        @media (prefers-color-scheme: light) {
+            :root {
+                --fill: #333;
+            }
+        }
+
+        @media (prefers-color-scheme: dark) {
+            :root {
+                --fill: #F0F0F0;
+            }
+        }
+    </style>
+</svg>
diff --git a/web/projects/shared/assets/icons/web-app-manifest-192x192.png b/web/projects/shared/assets/icons/web-app-manifest-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..24d2c68ebb3ce0849e0e7c1b8abe3ecf9f2bed38
GIT binary patch
literal 3582
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
AJOBUy

literal 0
HcmV?d00001

diff --git a/web/projects/shared/assets/icons/web-app-manifest-512x512.png b/web/projects/shared/assets/icons/web-app-manifest-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d9af255a7024cc23cadd113d9d188a313285ec3
GIT binary patch
literal 22777
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

literal 0
HcmV?d00001

diff --git a/web/projects/ui/src/index.html b/web/projects/ui/src/index.html
index 9c0cc2e89..f3d8d40e3 100644
--- a/web/projects/ui/src/index.html
+++ b/web/projects/ui/src/index.html
@@ -12,13 +12,21 @@
     />
     <meta name="format-detection" content="telephone=no" />
     <meta name="msapplication-tap-highlight" content="no" />
-
-    <link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico" />
+    <link
+      rel="icon"
+      type="image/png"
+      href="/assets/icons/favicon-96x96.png"
+      sizes="96x96"
+    />
+    <link rel="icon" type="image/svg+xml" href="/assets/icons/favicon.svg" />
+    <link rel="shortcut icon" href="/assets/icons/favicon.ico" />
     <link
       rel="apple-touch-icon"
-      sizes="256x256"
-      href="assets/img/icon_apple_touch.png"
+      sizes="180x180"
+      href="/assets/icons/apple-touch-icon.png"
     />
+    <meta name="apple-mobile-web-app-title" content="StartOS" />
+
     <link rel="manifest" href="manifest.webmanifest" />
     <meta name="theme-color" content="#ff5b71" />
     <style>
diff --git a/web/projects/ui/src/manifest.webmanifest b/web/projects/ui/src/manifest.webmanifest
index cecc31bfe..984106d74 100644
--- a/web/projects/ui/src/manifest.webmanifest
+++ b/web/projects/ui/src/manifest.webmanifest
@@ -9,10 +9,16 @@
   "id": "/?version=036",
   "icons": [
     {
-      "src": "assets/img/icon.png",
-      "sizes": "256x256",
+      "src": "/assets/icons/web-app-manifest-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any"
+    },
+    {
+      "src": "/assets/icons/web-app-manifest-512x512.png",
+      "sizes": "512x512",
       "type": "image/png",
       "purpose": "any"
     }
-  ]
+  ],
 }

From fefa88fc2a10c66958341b98ef49d6d40f9eada8 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:55:59 -0700
Subject: [PATCH 323/341] Feature/cli clearnet (#2789)

* add support for ACME cert acquisition

* add support for modifying hosts for a package

* misc fixes

* more fixes

* use different port for lan clearnet than wan clearnet

* fix chroot-and-upgrade always growing

* bail on failure

* wip

* fix alpn auth

* bump async-acme

* fix cli

* add barebones documentation

* add domain to hostname info
---
 CLEARNET.md                                   |  40 +
 build/lib/scripts/chroot-and-upgrade          |   8 +-
 build/lib/scripts/prune-images                |   3 +-
 core/Cargo.lock                               | 813 ++++++++++++++----
 core/models/src/errors.rs                     |   5 +
 core/startos/Cargo.toml                       |   4 +
 core/startos/src/db/model/public.rs           |  16 +
 core/startos/src/lib.rs                       |  11 +-
 core/startos/src/net/acme.rs                  | 324 +++++++
 core/startos/src/net/host/address.rs          |   9 +
 core/startos/src/net/host/mod.rs              | 163 ++++
 core/startos/src/net/keys.rs                  |   5 +-
 core/startos/src/net/mod.rs                   |   5 +
 core/startos/src/net/net_controller.rs        |  41 +-
 core/startos/src/net/service_interface.rs     |   9 +-
 core/startos/src/net/tor.rs                   |  84 +-
 core/startos/src/net/vhost.rs                 | 186 +++-
 core/startos/src/service/mod.rs               |  26 +-
 core/startos/src/util/serde.rs                |  30 +
 sdk/base/lib/osBindings/AcmeSettings.ts       |  13 +
 sdk/base/lib/osBindings/ServerInfo.ts         |   2 +
 sdk/base/lib/osBindings/index.ts              |   1 +
 .../ui/src/app/services/api/mock-patch.ts     |   1 +
 23 files changed, 1585 insertions(+), 214 deletions(-)
 create mode 100644 CLEARNET.md
 create mode 100644 core/startos/src/net/acme.rs
 create mode 100644 sdk/base/lib/osBindings/AcmeSettings.ts

diff --git a/CLEARNET.md b/CLEARNET.md
new file mode 100644
index 000000000..457a2e4f7
--- /dev/null
+++ b/CLEARNET.md
@@ -0,0 +1,40 @@
+# Setting up clearnet for a service interface
+
+NOTE: this guide is for HTTPS only! Other configurations may require a more bespoke setup depending on the service. Please consult the service documentation or the Start9 Community for help with non-HTTPS applications
+
+## Initialize ACME certificate generation
+
+The following command will register your device with an ACME certificate provider, such as letsencrypt
+
+This only needs to be done once.
+
+```
+start-cli net acme init --provider=letsencrypt --contact="mailto:me@drbonez.dev"
+```
+
+- `provider` can be `letsencrypt`, `letsencrypt-staging` (useful if you're doing a lot of testing and want to avoid being rate limited), or the url of any provider that supports the [RFC8555](https://datatracker.ietf.org/doc/html/rfc8555) ACME api
+- `contact` can be any valid contact url, typically `mailto:` urls. it can be specified multiple times to set multiple contacts
+
+## Whitelist a domain for ACME certificate acquisition
+
+The following command will tell the OS to use ACME certificates instead of system signed ones for the provided url. In this example, `testing.drbonez.dev`
+
+This must be done for every domain you wish to host on clearnet.
+
+```
+start-cli net acme domain add "testing.drbonez.dev"
+```
+
+## Forward clearnet port
+
+Go into your router settings, and map port 443 on your router to port 5443 on your start-os device. This one port should cover most use cases
+
+## Add domain to service host
+
+The following command will tell the OS to route https requests from the WAN to the provided hostname to the specified service. In this example, we are adding `testing.drbonez.dev` to the host `ui-multi` on the package `hello-world`. To see a list of available host IDs for a given package, run `start-cli package host <PACKAGE> list`
+
+This must be done for every domain you wish to host on clearnet.
+
+```
+start-cli package host hello-world address ui-multi add testing.drbonez.dev
+```
diff --git a/build/lib/scripts/chroot-and-upgrade b/build/lib/scripts/chroot-and-upgrade
index be2911369..8c3da37b4 100755
--- a/build/lib/scripts/chroot-and-upgrade
+++ b/build/lib/scripts/chroot-and-upgrade
@@ -77,6 +77,7 @@ umount /media/startos/next/dev
 umount /media/startos/next/sys
 umount /media/startos/next/proc
 umount /media/startos/next/boot
+umount /media/startos/next/media/startos/root
 
 if [ "$CHROOT_RES" -eq 0 ]; then
 
@@ -86,7 +87,12 @@ if [ "$CHROOT_RES" -eq 0 ]; then
 
     echo 'Upgrading...'
 
-    time mksquashfs /media/startos/next /media/startos/images/next.squashfs -b 4096 -comp gzip
+    if ! time mksquashfs /media/startos/next /media/startos/images/next.squashfs -b 4096 -comp gzip; then
+      umount -R /media/startos/next
+      umount -R /media/startos/upper
+      rm -rf /media/startos/upper /media/startos/next
+      exit 1
+    fi
     hash=$(b3sum /media/startos/images/next.squashfs | head -c 32)
     mv /media/startos/images/next.squashfs /media/startos/images/${hash}.rootfs
     ln -rsf /media/startos/images/${hash}.rootfs /media/startos/config/current.rootfs
diff --git a/build/lib/scripts/prune-images b/build/lib/scripts/prune-images
index 20356a28c..1203d2377 100755
--- a/build/lib/scripts/prune-images
+++ b/build/lib/scripts/prune-images
@@ -33,10 +33,11 @@ if [ -h /media/startos/config/current.rootfs ] && [ -e /media/startos/config/cur
     echo 'Pruning...'
     current="$(readlink -f /media/startos/config/current.rootfs)"
     while [[ "$(df -B1 --output=avail --sync /media/startos/images | tail -n1)" -lt "$needed" ]]; do
-        to_prune="$(ls -t1 /media/startos/images/*.rootfs /media/startos/images/*.squashfs | grep -v "$current" | tail -n1)"
+        to_prune="$(ls -t1 /media/startos/images/*.rootfs /media/startos/images/*.squashfs 2> /dev/null | grep -v "$current" | tail -n1)"
         if [ -e "$to_prune" ]; then
             echo "  Pruning $to_prune"
             rm -rf "$to_prune"
+            sync
         else
             >&2 echo "Not enough space and nothing to prune!"
             exit 1
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 490edf223..498e5903e 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -92,9 +92,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
 
 [[package]]
 name = "android-tzdata"
@@ -113,9 +113,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.17"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -162,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.92"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "arrayref"
@@ -193,6 +193,67 @@ dependencies = [
  "term",
 ]
 
+[[package]]
+name = "asn1-rs"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
+dependencies = [
+ "asn1-rs-derive",
+ "asn1-rs-impl",
+ "displaydoc",
+ "nom 7.1.3",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "async-acme"
+version = "0.5.0"
+source = "git+https://github.com/dr-bonez/async-acme.git#b9ff31ad900adc9086c0d1437ce51661d30856d2"
+dependencies = [
+ "async-trait",
+ "base64 0.22.1",
+ "futures-util",
+ "generic-async-http-client",
+ "log",
+ "pem",
+ "rcgen",
+ "ring",
+ "rustls 0.23.17",
+ "rustls-pemfile 2.2.0",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "x509-parser",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -237,7 +298,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -248,7 +309,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -274,9 +335,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d"
+checksum = "fe7c2840b66236045acd2607d5866e274380afd87ef99d6226e961e2cb47df45"
 dependencies = [
  "aws-lc-sys",
  "mirai-annotations",
@@ -286,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972"
+checksum = "ad3a619a9de81e1d7de1f1186dcba4506ed661a0e483d84410fdef0ee87b2f96"
 dependencies = [
  "bindgen",
  "cc",
@@ -329,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.7.7"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core 0.4.5",
@@ -341,7 +402,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "hyper-util",
  "itoa",
  "matchit",
@@ -413,7 +474,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -538,7 +599,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.86",
+ "syn 2.0.87",
  "which",
 ]
 
@@ -675,9 +736,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.19.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
+checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
 
 [[package]]
 name = "byteorder"
@@ -705,9 +766,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.1.31"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
 dependencies = [
  "jobserver",
  "libc",
@@ -818,9 +879,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.20"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -828,9 +889,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstream",
  "anstyle",
@@ -847,14 +908,14 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "cmake"
@@ -925,7 +986,7 @@ dependencies = [
  "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
- "unicode-width",
+ "unicode-width 0.1.12",
  "windows-sys 0.52.0",
 ]
 
@@ -1027,12 +1088,13 @@ dependencies = [
 
 [[package]]
 name = "cookie_store"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
+checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9"
 dependencies = [
  "cookie",
- "idna 0.5.0",
+ "document-features",
+ "idna 1.0.3",
  "log",
  "publicsuffix",
  "serde",
@@ -1060,9 +1122,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
  "libc",
 ]
@@ -1190,9 +1252,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
 dependencies = [
  "csv-core",
  "itoa",
@@ -1255,7 +1317,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1279,7 +1341,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1290,7 +1352,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1321,7 +1383,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1336,6 +1398,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "der-parser"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
+dependencies = [
+ "asn1-rs",
+ "displaydoc",
+ "nom 7.1.3",
+ "num-bigint",
+ "num-traits",
+ "rusticata-macros",
+]
+
 [[package]]
 name = "der_derive"
 version = "0.7.3"
@@ -1344,7 +1420,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1367,7 +1443,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1412,12 +1488,32 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "divrem"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82"
 
+[[package]]
+name = "document-features"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
+dependencies = [
+ "litrs",
+]
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -1589,7 +1685,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1676,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "fd-lock-rs"
@@ -1725,9 +1821,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide 0.8.0",
@@ -1868,7 +1964,18 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "futures-rustls"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d8a2499f0fecc0492eb3e47eab4e92da7875e1028ad2528f214ac3346ca04e"
+dependencies = [
+ "futures-io",
+ "rustls 0.22.4",
+ "rustls-pki-types",
 ]
 
 [[package]]
@@ -1912,6 +2019,25 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "generic-async-http-client"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75cec8bb4d3d32542cfcb9517f78366b52c17931e30d7ee1682c13686c19cee7"
+dependencies = [
+ "futures",
+ "futures-rustls",
+ "hyper 1.5.1",
+ "log",
+ "serde",
+ "serde_json",
+ "serde_qs",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-rustls 0.25.0",
+ "webpki-roots 0.26.6",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -1990,9 +2116,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2050,9 +2176,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
 [[package]]
 name = "hashlink"
@@ -2259,14 +2385,14 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.6",
+ "h2 0.4.7",
  "http 1.1.0",
  "http-body 1.0.1",
  "httparse",
@@ -2286,12 +2412,12 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "hyper-util",
- "rustls 0.23.16",
+ "rustls 0.23.17",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.26.0",
  "tower-service",
 ]
 
@@ -2315,7 +2441,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2334,7 +2460,7 @@ dependencies = [
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2365,6 +2491,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "id-pool"
 version = "0.2.2"
@@ -2382,9 +2626,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -2392,29 +2636,30 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
 ]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "image"
-version = "0.25.4"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -2499,22 +2744,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
  "serde",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.8"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
 dependencies = [
  "console",
- "instant",
  "number_prefix",
  "portable-atomic",
  "tokio",
- "unicode-width",
+ "unicode-width 0.2.0",
+ "web-time",
 ]
 
 [[package]]
@@ -2526,15 +2771,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "integer-encoding"
 version = "4.0.2"
@@ -2784,7 +3020,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
 ]
 
 [[package]]
@@ -2833,9 +3069,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
 
 [[package]]
 name = "libloading"
@@ -2887,6 +3123,18 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
+[[package]]
+name = "litrs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -3038,7 +3286,7 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
 name = "models"
 version = "0.1.0"
 dependencies = [
- "axum 0.7.7",
+ "axum 0.7.9",
  "base64 0.21.7",
  "color-eyre",
  "ed25519-dalek 2.1.1",
@@ -3302,7 +3550,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3320,6 +3568,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "oid-registry"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
+dependencies = [
+ "asn1-rs",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.20.2"
@@ -3368,7 +3625,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3379,9 +3636,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.4.0+3.4.0"
+version = "300.4.1+3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6"
+checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c"
 dependencies = [
  "cc",
 ]
@@ -3529,6 +3786,16 @@ dependencies = [
  "hmac",
 ]
 
+[[package]]
+name = "pem"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
+dependencies = [
+ "base64 0.22.1",
+ "serde",
+]
+
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -3575,7 +3842,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3631,7 +3898,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3707,7 +3974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3721,7 +3988,7 @@ dependencies = [
  "is-terminal",
  "lazy_static",
  "term",
- "unicode-width",
+ "unicode-width 0.1.12",
 ]
 
 [[package]]
@@ -3805,7 +4072,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3828,7 +4095,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3848,11 +4115,11 @@ checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
 
 [[package]]
 name = "publicsuffix"
-version = "2.2.3"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
+checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf"
 dependencies = [
- "idna 0.3.0",
+ "idna 1.0.3",
  "psl-types",
 ]
 
@@ -3991,6 +4258,18 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "rcgen"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1"
+dependencies = [
+ "pem",
+ "ring",
+ "time",
+ "yasna",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.1.57"
@@ -4034,7 +4313,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -4049,9 +4328,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4083,11 +4362,11 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.6",
+ "h2 0.4.7",
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
@@ -4169,11 +4448,11 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.2.3"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor%2Fno-dyn-ctx#021379f21c4d11c5a62c07460f4531ce9b555155"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git?branch=refactor%2Fno-dyn-ctx#21e35d85fb8f5de0e046c7ab5266236c2b639a4b"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum 0.7.7",
+ "axum 0.7.9",
  "clap",
  "futures",
  "http 1.1.0",
@@ -4257,11 +4536,20 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rusticata-macros"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
+dependencies = [
+ "nom 7.1.3",
+]
+
 [[package]]
 name = "rustix"
-version = "0.38.38"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
  "bitflags 2.6.0",
  "errno 0.3.9",
@@ -4283,13 +4571,28 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.16"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
+checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
+ "ring",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle",
@@ -4373,7 +4676,7 @@ dependencies = [
  "thingbuf",
  "thiserror",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.12",
 ]
 
 [[package]]
@@ -4393,9 +4696,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -4445,9 +4748,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4464,9 +4767,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
@@ -4490,20 +4793,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "indexmap 2.6.0",
  "itoa",
@@ -4522,6 +4825,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_qs"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c"
+dependencies = [
+ "percent-encoding",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "serde_spanned"
 version = "0.6.8"
@@ -4570,7 +4884,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4832,7 +5146,7 @@ dependencies = [
  "tokio-stream",
  "tracing",
  "url",
- "webpki-roots",
+ "webpki-roots 0.25.4",
 ]
 
 [[package]]
@@ -5003,8 +5317,8 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.86",
- "unicode-width",
+ "syn 2.0.87",
+ "unicode-width 0.1.12",
 ]
 
 [[package]]
@@ -5049,15 +5363,22 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "start-os"
 version = "0.3.6-alpha.8"
 dependencies = [
  "aes",
+ "async-acme",
  "async-compression",
  "async-stream",
  "async-trait",
- "axum 0.7.7",
+ "axum 0.7.9",
  "axum-server",
  "backhand",
  "barrage",
@@ -5159,7 +5480,7 @@ dependencies = [
  "textwrap",
  "thiserror",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.26.0",
  "tokio-socks",
  "tokio-stream",
  "tokio-tar",
@@ -5245,9 +5566,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.86"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5269,6 +5590,17 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
@@ -5298,9 +5630,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
 dependencies = [
  "filetime",
  "libc",
@@ -5309,9 +5641,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -5348,7 +5680,7 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.1.12",
 ]
 
 [[package]]
@@ -5363,22 +5695,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5442,6 +5774,16 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.8.0"
@@ -5459,9 +5801,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.41.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5494,7 +5836,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5507,13 +5849,24 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+dependencies = [
+ "rustls 0.22.4",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.16",
+ "rustls 0.23.17",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5768,7 +6121,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -5920,7 +6273,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "termcolor",
 ]
 
@@ -5990,7 +6343,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -6062,6 +6415,12 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
@@ -6092,12 +6451,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna 1.0.3",
  "percent-encoding",
  "serde",
 ]
@@ -6114,6 +6473,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -6215,7 +6586,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -6249,7 +6620,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6283,12 +6654,31 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "which"
 version = "4.4.2"
@@ -6547,6 +6937,18 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.2.0"
@@ -6562,6 +6964,23 @@ dependencies = [
  "tap",
 ]
 
+[[package]]
+name = "x509-parser"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
+dependencies = [
+ "asn1-rs",
+ "data-encoding",
+ "der-parser",
+ "lazy_static",
+ "nom 7.1.3",
+ "oid-registry",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
 [[package]]
 name = "xattr"
 version = "0.2.3"
@@ -6615,6 +7034,39 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "time",
+]
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -6633,7 +7085,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
 ]
 
 [[package]]
@@ -6653,7 +7126,29 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.86",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
 ]
 
 [[package]]
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index 708b57861..2077a8bbd 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -322,6 +322,11 @@ impl From<reqwest::Error> for Error {
         Error::new(e, kind)
     }
 }
+impl From<torut::onion::OnionAddressParseError> for Error {
+    fn from(e: torut::onion::OnionAddressParseError) -> Self {
+        Error::new(e, ErrorKind::Tor)
+    }
+}
 impl From<patch_db::value::Error> for Error {
     fn from(value: patch_db::value::Error) -> Self {
         match value.kind {
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index df4ac2378..e2a20a0a1 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -50,6 +50,10 @@ test = []
 
 [dependencies]
 aes = { version = "0.7.5", features = ["ctr"] }
+async-acme = { version = "0.5.0", git = "https://github.com/dr-bonez/async-acme.git", features = [
+  "use_rustls",
+  "use_tokio",
+] }
 async-compression = { version = "0.4.4", features = [
   "gzip",
   "brotli",
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index 353c1f89b..85978134d 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -55,6 +55,7 @@ impl Public {
                     .parse()
                     .unwrap(),
                 ip_info: BTreeMap::new(),
+                acme: None,
                 status_info: ServerStatus {
                     backup_progress: None,
                     updated: false,
@@ -130,6 +131,7 @@ pub struct ServerInfo {
     #[ts(type = "string")]
     pub tor_address: Url,
     pub ip_info: BTreeMap<String, IpInfo>,
+    pub acme: Option<AcmeSettings>,
     #[serde(default)]
     pub status_info: ServerStatus,
     pub wifi: WifiInfo,
@@ -174,6 +176,20 @@ impl IpInfo {
     }
 }
 
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[serde(rename_all = "camelCase")]
+#[model = "Model<Self>"]
+#[ts(export)]
+pub struct AcmeSettings {
+    #[ts(type = "string")]
+    pub provider: Url,
+    /// email addresses for letsencrypt
+    pub contact: Vec<String>,
+    #[ts(type = "string[]")]
+    /// domains to get letsencrypt certs for
+    pub domains: BTreeSet<InternedString>,
+}
+
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[model = "Model<Self>"]
 #[ts(export)]
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 83c4d462d..3c5875e36 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -355,7 +355,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::start)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("Start a package container")
+                .with_about("Start a service")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -363,7 +363,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::stop)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("Stop a package container")
+                .with_about("Stop a service")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -371,7 +371,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::restart)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("Restart a package container")
+                .with_about("Restart a service")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -409,9 +409,14 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             "attach",
             from_fn_async(service::attach)
                 .with_metadata("get_session", Value::Bool(true))
+                .with_about("Execute commands within a service container")
                 .no_cli(),
         )
         .subcommand("attach", from_fn_async(service::cli_attach).no_display())
+        .subcommand(
+            "host",
+            net::host::host::<C>().with_about("Manage network hosts for a package"),
+        )
 }
 
 pub fn diagnostic_api() -> ParentHandler<DiagnosticContext> {
diff --git a/core/startos/src/net/acme.rs b/core/startos/src/net/acme.rs
new file mode 100644
index 000000000..95f9d4adb
--- /dev/null
+++ b/core/startos/src/net/acme.rs
@@ -0,0 +1,324 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::str::FromStr;
+
+use clap::builder::ValueParserFactory;
+use clap::Parser;
+use imbl_value::InternedString;
+use itertools::Itertools;
+use models::{ErrorData, FromStrParser};
+use openssl::pkey::{PKey, Private};
+use openssl::x509::X509;
+use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use url::Url;
+
+use crate::context::{CliContext, RpcContext};
+use crate::db::model::public::AcmeSettings;
+use crate::db::model::Database;
+use crate::prelude::*;
+use crate::util::serde::{Pem, Pkcs8Doc};
+
+#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[model = "Model<Self>"]
+pub struct AcmeCertStore {
+    pub accounts: BTreeMap<JsonKey<Vec<String>>, Pem<Pkcs8Doc>>,
+    pub certs: BTreeMap<Url, BTreeMap<JsonKey<BTreeSet<InternedString>>, AcmeCert>>,
+}
+impl AcmeCertStore {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct AcmeCert {
+    pub key: Pem<PKey<Private>>,
+    pub fullchain: Vec<Pem<X509>>,
+}
+
+pub struct AcmeCertCache<'a>(pub &'a TypedPatchDb<Database>);
+#[async_trait::async_trait]
+impl<'a> async_acme::cache::AcmeCache for AcmeCertCache<'a> {
+    type Error = ErrorData;
+
+    async fn read_account(&self, contacts: &[&str]) -> Result<Option<Vec<u8>>, Self::Error> {
+        let contacts = JsonKey::new(contacts.into_iter().map(|s| (*s).to_owned()).collect_vec());
+        let Some(account) = self
+            .0
+            .peek()
+            .await
+            .into_private()
+            .into_key_store()
+            .into_acme()
+            .into_accounts()
+            .into_idx(&contacts)
+        else {
+            return Ok(None);
+        };
+        Ok(Some(account.de()?.0.document.into_vec()))
+    }
+
+    async fn write_account(&self, contacts: &[&str], contents: &[u8]) -> Result<(), Self::Error> {
+        let contacts = JsonKey::new(contacts.into_iter().map(|s| (*s).to_owned()).collect_vec());
+        let key = Pkcs8Doc {
+            tag: "EC PRIVATE KEY".into(),
+            document: pkcs8::Document::try_from(contents).with_kind(ErrorKind::Pem)?,
+        };
+        self.0
+            .mutate(|db| {
+                db.as_private_mut()
+                    .as_key_store_mut()
+                    .as_acme_mut()
+                    .as_accounts_mut()
+                    .insert(&contacts, &Pem::new(key))
+            })
+            .await?;
+        Ok(())
+    }
+
+    async fn read_certificate(
+        &self,
+        domains: &[String],
+        directory_url: &str,
+    ) -> Result<Option<(String, String)>, Self::Error> {
+        let domains = JsonKey::new(domains.into_iter().map(InternedString::intern).collect());
+        let directory_url = directory_url
+            .parse::<Url>()
+            .with_kind(ErrorKind::ParseUrl)?;
+        let Some(cert) = self
+            .0
+            .peek()
+            .await
+            .into_private()
+            .into_key_store()
+            .into_acme()
+            .into_certs()
+            .into_idx(&directory_url)
+            .and_then(|a| a.into_idx(&domains))
+        else {
+            return Ok(None);
+        };
+        let cert = cert.de()?;
+        Ok(Some((
+            String::from_utf8(
+                cert.key
+                    .0
+                    .private_key_to_pem_pkcs8()
+                    .with_kind(ErrorKind::OpenSsl)?,
+            )
+            .with_kind(ErrorKind::Utf8)?,
+            cert.fullchain
+                .into_iter()
+                .map(|cert| {
+                    String::from_utf8(cert.0.to_pem().with_kind(ErrorKind::OpenSsl)?)
+                        .with_kind(ErrorKind::Utf8)
+                })
+                .collect::<Result<Vec<_>, _>>()?
+                .join("\n"),
+        )))
+    }
+
+    async fn write_certificate(
+        &self,
+        domains: &[String],
+        directory_url: &str,
+        key_pem: &str,
+        certificate_pem: &str,
+    ) -> Result<(), Self::Error> {
+        tracing::info!("Saving new certificate for {domains:?}");
+        let domains = JsonKey::new(domains.into_iter().map(InternedString::intern).collect());
+        let directory_url = directory_url
+            .parse::<Url>()
+            .with_kind(ErrorKind::ParseUrl)?;
+        let cert = AcmeCert {
+            key: Pem(PKey::<Private>::private_key_from_pem(key_pem.as_bytes())
+                .with_kind(ErrorKind::OpenSsl)?),
+            fullchain: X509::stack_from_pem(certificate_pem.as_bytes())
+                .with_kind(ErrorKind::OpenSsl)?
+                .into_iter()
+                .map(Pem)
+                .collect(),
+        };
+        self.0
+            .mutate(|db| {
+                db.as_private_mut()
+                    .as_key_store_mut()
+                    .as_acme_mut()
+                    .as_certs_mut()
+                    .upsert(&directory_url, || Ok(BTreeMap::new()))?
+                    .insert(&domains, &cert)
+            })
+            .await?;
+
+        Ok(())
+    }
+}
+
+pub fn acme<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "init",
+            from_fn_async(init)
+                .no_display()
+                .with_about("Setup ACME certificate acquisition")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "domain",
+            domain::<C>()
+                .with_about("Add, remove, or view domains for which to acquire ACME certificates"),
+        )
+}
+
+#[derive(Clone, Deserialize, Serialize)]
+pub struct AcmeProvider(pub Url);
+impl FromStr for AcmeProvider {
+    type Err = <Url as FromStr>::Err;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "letsencrypt" => async_acme::acme::LETS_ENCRYPT_PRODUCTION_DIRECTORY.parse(),
+            "letsencrypt-staging" => async_acme::acme::LETS_ENCRYPT_STAGING_DIRECTORY.parse(),
+            s => s.parse(),
+        }
+        .map(Self)
+    }
+}
+impl ValueParserFactory for AcmeProvider {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct InitAcmeParams {
+    #[arg(long)]
+    pub provider: AcmeProvider,
+    #[arg(long)]
+    pub contact: Vec<String>,
+}
+
+pub async fn init(
+    ctx: RpcContext,
+    InitAcmeParams {
+        provider: AcmeProvider(provider),
+        contact,
+    }: InitAcmeParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_server_info_mut()
+                .as_acme_mut()
+                .map_mutate(|acme| {
+                    Ok(Some(AcmeSettings {
+                        provider,
+                        contact,
+                        domains: acme.map(|acme| acme.domains).unwrap_or_default(),
+                    }))
+                })
+        })
+        .await?;
+    Ok(())
+}
+
+pub fn domain<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "add",
+            from_fn_async(add_domain)
+                .no_display()
+                .with_about("Add a domain for which to acquire ACME certificates")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove_domain)
+                .no_display()
+                .with_about("Remove a domain for which to acquire ACME certificates")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list_domains)
+                .with_custom_display_fn(|_, res| {
+                    for domain in res {
+                        println!("{domain}")
+                    }
+                    Ok(())
+                })
+                .with_about("List domains for which to acquire ACME certificates")
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct DomainParams {
+    pub domain: InternedString,
+}
+
+pub async fn add_domain(
+    ctx: RpcContext,
+    DomainParams { domain }: DomainParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_server_info_mut()
+                .as_acme_mut()
+                .transpose_mut()
+                .ok_or_else(|| {
+                    Error::new(
+                        eyre!("Please call `start-cli net acme init` before adding a domain"),
+                        ErrorKind::InvalidRequest,
+                    )
+                })?
+                .as_domains_mut()
+                .mutate(|domains| {
+                    domains.insert(domain);
+                    Ok(())
+                })
+        })
+        .await?;
+    Ok(())
+}
+
+pub async fn remove_domain(
+    ctx: RpcContext,
+    DomainParams { domain }: DomainParams,
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            if let Some(acme) = db
+                .as_public_mut()
+                .as_server_info_mut()
+                .as_acme_mut()
+                .transpose_mut()
+            {
+                acme.as_domains_mut().mutate(|domains| {
+                    domains.remove(&domain);
+                    Ok(())
+                })
+            } else {
+                Ok(())
+            }
+        })
+        .await?;
+    Ok(())
+}
+
+pub async fn list_domains(ctx: RpcContext) -> Result<BTreeSet<InternedString>, Error> {
+    if let Some(acme) = ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_server_info()
+        .into_acme()
+        .transpose()
+    {
+        acme.into_domains().de()
+    } else {
+        Ok(BTreeSet::new())
+    }
+}
diff --git a/core/startos/src/net/host/address.rs b/core/startos/src/net/host/address.rs
index 9b16441ce..05942ffa9 100644
--- a/core/startos/src/net/host/address.rs
+++ b/core/startos/src/net/host/address.rs
@@ -1,7 +1,9 @@
 use std::fmt;
 use std::str::FromStr;
 
+use clap::builder::ValueParserFactory;
 use imbl_value::InternedString;
+use models::FromStrParser;
 use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
 use ts_rs::TS;
@@ -46,3 +48,10 @@ impl fmt::Display for HostAddress {
         }
     }
 }
+
+impl ValueParserFactory for HostAddress {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
index 175fe3e83..be5db0f2d 100644
--- a/core/startos/src/net/host/mod.rs
+++ b/core/startos/src/net/host/mod.rs
@@ -1,10 +1,13 @@
 use std::collections::{BTreeMap, BTreeSet};
 
+use clap::Parser;
 use imbl_value::InternedString;
 use models::{HostId, PackageId};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+use crate::context::{CliContext, RpcContext};
 use crate::db::model::DatabaseModel;
 use crate::net::forward::AvailablePorts;
 use crate::net::host::address::HostAddress;
@@ -134,3 +137,163 @@ impl Model<Host> {
         })
     }
 }
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct HostParams {
+    package: PackageId,
+}
+
+pub fn host<C: Context>() -> ParentHandler<C, HostParams> {
+    ParentHandler::<C, HostParams>::new()
+        .subcommand(
+            "list",
+            from_fn_async(list_hosts)
+                .with_inherited(|HostParams { package }, _| package)
+                .with_custom_display_fn(|_, ids| {
+                    for id in ids {
+                        println!("{id}")
+                    }
+                    Ok(())
+                })
+                .with_about("List host IDs available for this service"),
+        )
+        .subcommand(
+            "address",
+            address::<C>().with_inherited(|HostParams { package }, _| package),
+        )
+}
+
+pub async fn list_hosts(
+    ctx: RpcContext,
+    _: Empty,
+    package: PackageId,
+) -> Result<Vec<HostId>, Error> {
+    ctx.db
+        .peek()
+        .await
+        .into_public()
+        .into_package_data()
+        .into_idx(&package)
+        .or_not_found(&package)?
+        .into_hosts()
+        .keys()
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct AddressApiParams {
+    host: HostId,
+}
+
+pub fn address<C: Context>() -> ParentHandler<C, AddressApiParams, PackageId> {
+    ParentHandler::<C, AddressApiParams, PackageId>::new()
+        .subcommand(
+            "add",
+            from_fn_async(add_address)
+                .with_inherited(|AddressApiParams { host }, package| (package, host))
+                .no_display()
+                .with_about("Add an address to this host")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "remove",
+            from_fn_async(remove_address)
+                .with_inherited(|AddressApiParams { host }, package| (package, host))
+                .no_display()
+                .with_about("Remove an address from this host")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list_addresses)
+                .with_inherited(|AddressApiParams { host }, package| (package, host))
+                .with_custom_display_fn(|_, res| {
+                    for address in res {
+                        println!("{address}")
+                    }
+                    Ok(())
+                })
+                .with_about("List addresses for this host")
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct AddressParams {
+    pub address: HostAddress,
+}
+
+pub async fn add_address(
+    ctx: RpcContext,
+    AddressParams { address }: AddressParams,
+    (package, host): (PackageId, HostId),
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            if let HostAddress::Onion { address } = address {
+                db.as_private()
+                    .as_key_store()
+                    .as_onion()
+                    .get_key(&address)?;
+            }
+
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package)
+                .or_not_found(&package)?
+                .as_hosts_mut()
+                .as_idx_mut(&host)
+                .or_not_found(&host)?
+                .as_addresses_mut()
+                .mutate(|a| Ok(a.insert(address)))
+        })
+        .await?;
+    let service = ctx.services.get(&package).await;
+    let service_ref = service.as_ref().or_not_found(&package)?;
+    service_ref.update_host(host).await?;
+
+    Ok(())
+}
+
+pub async fn remove_address(
+    ctx: RpcContext,
+    AddressParams { address }: AddressParams,
+    (package, host): (PackageId, HostId),
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package)
+                .or_not_found(&package)?
+                .as_hosts_mut()
+                .as_idx_mut(&host)
+                .or_not_found(&host)?
+                .as_addresses_mut()
+                .mutate(|a| Ok(a.remove(&address)))
+        })
+        .await?;
+    let service = ctx.services.get(&package).await;
+    let service_ref = service.as_ref().or_not_found(&package)?;
+    service_ref.update_host(host).await?;
+
+    Ok(())
+}
+
+pub async fn list_addresses(
+    ctx: RpcContext,
+    _: Empty,
+    (package, host): (PackageId, HostId),
+) -> Result<BTreeSet<HostAddress>, Error> {
+    ctx.db
+        .peek()
+        .await
+        .into_public()
+        .into_package_data()
+        .into_idx(&package)
+        .or_not_found(&package)?
+        .into_hosts()
+        .into_idx(&host)
+        .or_not_found(&host)?
+        .into_addresses()
+        .de()
+}
diff --git a/core/startos/src/net/keys.rs b/core/startos/src/net/keys.rs
index 02ec17329..866b2ca06 100644
--- a/core/startos/src/net/keys.rs
+++ b/core/startos/src/net/keys.rs
@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::account::AccountInfo;
+use crate::net::acme::AcmeCertStore;
 use crate::net::ssl::CertStore;
 use crate::net::tor::OnionStore;
 use crate::prelude::*;
@@ -10,13 +11,15 @@ use crate::prelude::*;
 pub struct KeyStore {
     pub onion: OnionStore,
     pub local_certs: CertStore,
-    // pub letsencrypt_certs: BTreeMap<BTreeSet<InternedString>, CertData>
+    #[serde(default)]
+    pub acme: AcmeCertStore,
 }
 impl KeyStore {
     pub fn new(account: &AccountInfo) -> Result<Self, Error> {
         let mut res = Self {
             onion: OnionStore::new(),
             local_certs: CertStore::new(account)?,
+            acme: AcmeCertStore::new(),
         };
         res.onion.insert(account.tor_key.clone());
         Ok(res)
diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs
index 2735454e7..53b94454d 100644
--- a/core/startos/src/net/mod.rs
+++ b/core/startos/src/net/mod.rs
@@ -1,5 +1,6 @@
 use rpc_toolkit::{Context, HandlerExt, ParentHandler};
 
+pub mod acme;
 pub mod dhcp;
 pub mod dns;
 pub mod forward;
@@ -28,4 +29,8 @@ pub fn net<C: Context>() -> ParentHandler<C> {
             "dhcp",
             dhcp::dhcp::<C>().with_about("Command to update IP assigned from dhcp"),
         )
+        .subcommand(
+            "acme",
+            acme::acme::<C>().with_about("Setup automatic clearnet certificate acquisition"),
+        )
 }
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index a94c7a7d0..a8beaf55f 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -261,7 +261,7 @@ impl NetService {
         errors.into_result()
     }
 
-    async fn update(&mut self, id: HostId, host: Host) -> Result<(), Error> {
+    pub async fn update(&mut self, id: HostId, host: Host) -> Result<(), Error> {
         let ctrl = self.net_controller()?;
         let mut hostname_info = BTreeMap::new();
         let binds = self.binds.entry(id.clone()).or_default();
@@ -330,16 +330,29 @@ impl NetService {
                                 }
                                 HostAddress::Domain { address } => {
                                     if hostnames.insert(address.clone()) {
+                                        let address = Some(address.clone());
                                         rcs.push(
                                             ctrl.vhost
                                                 .add(
-                                                    Some(address.clone()),
+                                                    address.clone(),
                                                     external,
                                                     target,
                                                     connect_ssl.clone(),
                                                 )
                                                 .await?,
                                         );
+                                        if ssl.preferred_external_port == 443 {
+                                            rcs.push(
+                                                ctrl.vhost
+                                                    .add(
+                                                        address.clone(),
+                                                        5443,
+                                                        target,
+                                                        connect_ssl.clone(),
+                                                    )
+                                                    .await?,
+                                            );
+                                        }
                                     }
                                 }
                             }
@@ -363,11 +376,32 @@ impl NetService {
                         network_interface_id: interface.clone(),
                         public: false,
                         hostname: IpHostname::Local {
-                            value: format!("{hostname}.local"),
+                            value: InternedString::from_display(&{
+                                let hostname = &hostname;
+                                lazy_format!("{hostname}.local")
+                            }),
                             port: new_lan_bind.0.assigned_port,
                             ssl_port: new_lan_bind.0.assigned_ssl_port,
                         },
                     });
+                    for address in host.addresses() {
+                        if let HostAddress::Domain { address } = address {
+                            if let Some(ssl) = &new_lan_bind.1 {
+                                if ssl.preferred_external_port == 443 {
+                                    bind_hostname_info.push(HostnameInfo::Ip {
+                                        network_interface_id: interface.clone(),
+                                        public: false,
+                                        hostname: IpHostname::Domain {
+                                            domain: address.clone(),
+                                            subdomain: None,
+                                            port: None,
+                                            ssl_port: Some(443),
+                                        },
+                                    });
+                                }
+                            }
+                        }
+                    }
                     if let Some(ipv4) = ip_info.ipv4 {
                         bind_hostname_info.push(HostnameInfo::Ip {
                             network_interface_id: interface.clone(),
@@ -515,6 +549,7 @@ impl NetService {
                 ctrl.tor.gc(Some(addr.clone()), None).await?;
             }
         }
+
         self.net_controller()?
             .db
             .mutate(|db| {
diff --git a/core/startos/src/net/service_interface.rs b/core/startos/src/net/service_interface.rs
index b1824140b..ade10d959 100644
--- a/core/startos/src/net/service_interface.rs
+++ b/core/startos/src/net/service_interface.rs
@@ -47,13 +47,16 @@ pub enum IpHostname {
         ssl_port: Option<u16>,
     },
     Local {
-        value: String,
+        #[ts(type = "string")]
+        value: InternedString,
         port: Option<u16>,
         ssl_port: Option<u16>,
     },
     Domain {
-        domain: String,
-        subdomain: Option<String>,
+        #[ts(type = "string")]
+        domain: InternedString,
+        #[ts(type = "string | null")]
+        subdomain: Option<InternedString>,
         port: Option<u16>,
         ssl_port: Option<u16>,
     },
diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs
index d93ce9302..bba50c371 100644
--- a/core/startos/src/net/tor.rs
+++ b/core/startos/src/net/tor.rs
@@ -26,7 +26,7 @@ use ts_rs::TS;
 use crate::context::{CliContext, RpcContext};
 use crate::logs::{journalctl, LogSource, LogsParams};
 use crate::prelude::*;
-use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
+use crate::util::serde::{display_serializable, Base64, HandlerExtSerde, WithIoFormat};
 use crate::util::Invoke;
 
 pub const SYSTEMD_UNIT: &str = "tor@default";
@@ -59,7 +59,9 @@ impl Model<OnionStore> {
         self.insert(&key.public().get_onion_address(), &key)
     }
     pub fn get_key(&self, address: &OnionAddressV3) -> Result<TorSecretKeyV3, Error> {
-        self.as_idx(address).or_not_found(address)?.de()
+        self.as_idx(address)
+            .or_not_found(lazy_format!("private key for {address}"))?
+            .de()
     }
 }
 
@@ -108,7 +110,85 @@ pub fn tor<C: Context>() -> ParentHandler<C> {
                 .with_about("Reset Tor daemon")
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "key",
+            key::<C>().with_about("Manage the onion service key store"),
+        )
+}
+
+pub fn key<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "generate",
+            from_fn_async(generate_key)
+                .with_about("Generate an onion service key and add it to the key store")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "add",
+            from_fn_async(add_key)
+                .with_about("Add an onion service key to the key store")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list_keys)
+                .with_custom_display_fn(|_, res| {
+                    for addr in res {
+                        println!("{addr}");
+                    }
+                    Ok(())
+                })
+                .with_about("List onion services with keys in the key store")
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+pub async fn generate_key(ctx: RpcContext) -> Result<OnionAddressV3, Error> {
+    ctx.db
+        .mutate(|db| {
+            Ok(db
+                .as_private_mut()
+                .as_key_store_mut()
+                .as_onion_mut()
+                .new_key()?
+                .public()
+                .get_onion_address())
+        })
+        .await
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct AddKeyParams {
+    pub key: Base64<[u8; 64]>,
 }
+
+pub async fn add_key(
+    ctx: RpcContext,
+    AddKeyParams { key }: AddKeyParams,
+) -> Result<OnionAddressV3, Error> {
+    let key = TorSecretKeyV3::from(key.0);
+    ctx.db
+        .mutate(|db| {
+            db.as_private_mut()
+                .as_key_store_mut()
+                .as_onion_mut()
+                .insert_key(&key)
+        })
+        .await?;
+    Ok(key.public().get_onion_address())
+}
+
+pub async fn list_keys(ctx: RpcContext) -> Result<Vec<OnionAddressV3>, Error> {
+    ctx.db
+        .peek()
+        .await
+        .into_private()
+        .into_key_store()
+        .into_onion()
+        .keys()
+}
+
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index 9fc7c8384..7d48b1469 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -4,6 +4,7 @@ use std::str::FromStr;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
+use async_acme::acme::ACME_TLS_ALPN_NAME;
 use axum::body::Body;
 use axum::extract::Request;
 use axum::response::Response;
@@ -15,31 +16,47 @@ use models::ResultExt;
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWriteExt;
 use tokio::net::{TcpListener, TcpStream};
-use tokio::sync::{Mutex, RwLock};
+use tokio::sync::{watch, Mutex, RwLock};
+use tokio_rustls::rustls::crypto::CryptoProvider;
 use tokio_rustls::rustls::pki_types::{
     CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer, ServerName,
 };
-use tokio_rustls::rustls::server::Acceptor;
+use tokio_rustls::rustls::server::{Acceptor, ResolvesServerCert};
+use tokio_rustls::rustls::sign::CertifiedKey;
 use tokio_rustls::rustls::{RootCertStore, ServerConfig};
 use tokio_rustls::{LazyConfigAcceptor, TlsConnector};
+use tokio_stream::wrappers::WatchStream;
+use tokio_stream::StreamExt;
 use tracing::instrument;
 use ts_rs::TS;
 
 use crate::db::model::Database;
+use crate::net::acme::AcmeCertCache;
 use crate::net::static_server::server_error;
 use crate::prelude::*;
 use crate::util::io::BackTrackingIO;
+use crate::util::sync::SyncMutex;
 use crate::util::serde::MaybeUtf8String;
 
+#[derive(Debug)]
+struct SingleCertResolver(Arc<CertifiedKey>);
+impl ResolvesServerCert for SingleCertResolver {
+    fn resolve(&self, _: tokio_rustls::rustls::server::ClientHello) -> Option<Arc<CertifiedKey>> {
+        Some(self.0.clone())
+    }
+}
+
 // not allowed: <=1024, >=32768, 5355, 5432, 9050, 6010, 9051, 5353
 
 pub struct VHostController {
+    crypto_provider: Arc<CryptoProvider>,
     db: TypedPatchDb<Database>,
     servers: Mutex<BTreeMap<u16, VHostServer>>,
 }
 impl VHostController {
     pub fn new(db: TypedPatchDb<Database>) -> Self {
         Self {
+            crypto_provider: Arc::new(tokio_rustls::rustls::crypto::ring::default_provider()),
             db,
             servers: Mutex::new(BTreeMap::new()),
         }
@@ -56,7 +73,8 @@ impl VHostController {
         let server = if let Some(server) = writable.remove(&external) {
             server
         } else {
-            VHostServer::new(external, self.db.clone()).await?
+            tracing::info!("Listening on {external}");
+            VHostServer::new(external, self.db.clone(), self.crypto_provider.clone()).await?
         };
         let rc = server
             .add(
@@ -108,7 +126,11 @@ struct VHostServer {
 }
 impl VHostServer {
     #[instrument(skip_all)]
-    async fn new(port: u16, db: TypedPatchDb<Database>) -> Result<Self, Error> {
+    async fn new(port: u16, db: TypedPatchDb<Database>, crypto_provider: Arc<CryptoProvider>) -> Result<Self, Error> {
+        let acme_tls_alpn_cache = Arc::new(SyncMutex::new(BTreeMap::<
+            InternedString,
+            watch::Receiver<Option<Arc<CertifiedKey>>>,
+        >::new()));
         // check if port allowed
         let listener = TcpListener::bind(SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), port))
             .await
@@ -133,9 +155,11 @@ impl VHostServer {
                             let mut stream = BackTrackingIO::new(stream);
                             let mapping = mapping.clone();
                             let db = db.clone();
+                            let acme_tls_alpn_cache = acme_tls_alpn_cache.clone();
+                            let crypto_provider = crypto_provider.clone();
                             tokio::spawn(async move {
                                 if let Err(e) = async {
-                                    let mid = match LazyConfigAcceptor::new(
+                                    let mid: tokio_rustls::StartHandshake<&mut BackTrackingIO<TcpStream>> = match LazyConfigAcceptor::new(
                                         Acceptor::default(),
                                         &mut stream,
                                     )
@@ -206,38 +230,102 @@ impl VHostServer {
                                             .map(|(target, _)| target.clone())
                                     };
                                     if let Some(target) = target {
-                                        let mut tcp_stream =
-                                            TcpStream::connect(target.addr).await?;
-                                        let hostnames = target_name
-                                            .into_iter()
-                                            .chain(
-                                                db.peek()
-                                                    .await
-                                                    .into_public()
-                                                    .into_server_info()
-                                                    .into_ip_info()
-                                                    .into_entries()?
-                                                    .into_iter()
-                                                    .flat_map(|(_, ips)| [
-                                                        ips.as_ipv4().de().map(|ip| ip.map(IpAddr::V4)),
-                                                        ips.as_ipv6().de().map(|ip| ip.map(IpAddr::V6))
-                                                    ])
-                                                    .filter_map(|a| a.transpose())
-                                                    .map(|a| a.map(|ip| InternedString::from_display(&ip)))
-                                                    .collect::<Result<Vec<_>, _>>()?,
-                                            )
-                                            .collect();
-                                        let key = db
-                                            .mutate(|v| {
-                                                v.as_private_mut()
-                                                    .as_key_store_mut()
-                                                    .as_local_certs_mut()
-                                                    .cert_for(&hostnames)
-                                            })
-                                            .await?;
-                                        let cfg = ServerConfig::builder()
-                                            .with_no_client_auth();
-                                        let mut cfg =
+                                        let peek = db.peek().await;
+                                        let root = peek.as_private().as_key_store().as_local_certs().as_root_cert().de()?;
+                                        let mut cfg = match async {
+                                            if let Some(acme_settings) = peek.as_public().as_server_info().as_acme().de()? {
+                                                if let Some(domain) = target_name.as_ref().filter(|target_name| acme_settings.domains.contains(*target_name)) {
+                                                    if mid
+                                                        .client_hello()
+                                                        .alpn()
+                                                        .into_iter()
+                                                        .flatten()
+                                                        .any(|alpn| alpn == ACME_TLS_ALPN_NAME)
+                                                    {
+                                                        let cert = WatchStream::new(
+                                                            acme_tls_alpn_cache.peek(|c| c.get(&**domain).cloned())
+                                                                .ok_or_else(|| {
+                                                                    Error::new(
+                                                                        eyre!("No challenge recv available for {domain}"),
+                                                                        ErrorKind::OpenSsl
+                                                                    )
+                                                                })?,
+                                                        );
+                                                        tracing::info!("Waiting for verification cert for {domain}");
+                                                        let cert = cert
+                                                            .filter(|c| c.is_some())
+                                                            .next()
+                                                            .await
+                                                            .flatten()
+                                                            .ok_or_else(|| {
+                                                                Error::new(eyre!("No challenge available for {domain}"), ErrorKind::OpenSsl)
+                                                            })?;
+                                                        tracing::info!("Verification cert received for {domain}");
+                                                        let mut cfg = ServerConfig::builder_with_provider(crypto_provider.clone())
+                                                            .with_safe_default_protocol_versions()
+                                                            .with_kind(crate::ErrorKind::OpenSsl)?
+                                                            .with_no_client_auth()
+                                                            .with_cert_resolver(Arc::new(SingleCertResolver(cert)));
+
+                                                        cfg.alpn_protocols = vec![ACME_TLS_ALPN_NAME.to_vec()];
+                                                        return Ok(Err(cfg));
+                                                    } else {
+                                                        let domains = [domain.to_string()];
+                                                        let (send, recv) = watch::channel(None);
+                                                        acme_tls_alpn_cache.mutate(|c| c.insert(domain.clone(), recv));
+                                                        let cert = 
+                                                            async_acme::rustls_helper::order(
+                                                                |_, cert| {
+                                                                    send.send_replace(Some(Arc::new(cert)));
+                                                                    Ok(())
+                                                                },
+                                                                acme_settings.provider.as_str(),
+                                                                &domains,
+                                                                Some(&AcmeCertCache(&db)),
+                                                                &acme_settings.contact,
+                                                            )
+                                                            .await
+                                                            .with_kind(ErrorKind::OpenSsl)?;
+                                                        return Ok(Ok(
+                                                                ServerConfig::builder_with_provider(crypto_provider.clone())
+                                                                    .with_safe_default_protocol_versions()
+                                                                    .with_kind(crate::ErrorKind::OpenSsl)?
+                                                                    .with_no_client_auth()
+                                                                    .with_cert_resolver(Arc::new(SingleCertResolver(Arc::new(cert))))
+                                                            ));
+                                                    }
+                                                }
+                                            }
+                                            let hostnames = target_name
+                                                .into_iter()
+                                                .chain(
+                                                    peek
+                                                        .as_public()
+                                                        .as_server_info()
+                                                        .as_ip_info()
+                                                        .as_entries()?
+                                                        .into_iter()
+                                                        .flat_map(|(_, ips)| [
+                                                            ips.as_ipv4().de().map(|ip| ip.map(IpAddr::V4)),
+                                                            ips.as_ipv6().de().map(|ip| ip.map(IpAddr::V6))
+                                                        ])
+                                                        .filter_map(|a| a.transpose())
+                                                        .map(|a| a.map(|ip| InternedString::from_display(&ip)))
+                                                        .collect::<Result<Vec<_>, _>>()?,
+                                                )
+                                                .collect();
+                                            let key = db
+                                                .mutate(|v| {
+                                                    v.as_private_mut()
+                                                        .as_key_store_mut()
+                                                        .as_local_certs_mut()
+                                                        .cert_for(&hostnames)
+                                                })
+                                                .await?;
+                                            let cfg = ServerConfig::builder_with_provider(crypto_provider.clone())
+                                                .with_safe_default_protocol_versions()
+                                                .with_kind(crate::ErrorKind::OpenSsl)?
+                                                .with_no_client_auth();
                                             if mid.client_hello().signature_schemes().contains(
                                                 &tokio_rustls::rustls::SignatureScheme::ED25519,
                                             ) {
@@ -275,16 +363,34 @@ impl VHostServer {
                                                     )),
                                                 )
                                             }
-                                            .with_kind(crate::ErrorKind::OpenSsl)?;
+                                            .with_kind(crate::ErrorKind::OpenSsl)
+                                            .map(Ok)
+                                        }.await? {
+                                            Ok(a) => a,
+                                            Err(cfg) => {
+                                                tracing::info!("performing ACME auth challenge");
+                                                let mut accept = mid.into_stream(Arc::new(cfg));
+                                                let io = accept.get_mut().unwrap();
+                                                let buffered = io.stop_buffering();
+                                                io.write_all(&buffered).await?;
+                                                accept.await?;
+                                                tracing::info!("ACME auth challenge completed");
+                                                return Ok(());
+                                            }
+                                        };
+                                        let mut tcp_stream =
+                                            TcpStream::connect(target.addr).await?;
                                         match target.connect_ssl {
                                             Ok(()) => {
                                                 let mut client_cfg =
-                                                tokio_rustls::rustls::ClientConfig::builder()
+                                                tokio_rustls::rustls::ClientConfig::builder_with_provider(crypto_provider)
+                                                        .with_safe_default_protocol_versions()
+                                                        .with_kind(crate::ErrorKind::OpenSsl)?
                                                         .with_root_certificates({
                                                             let mut store = RootCertStore::empty();
                                                             store.add(
                                                         CertificateDer::from(
-                                                            key.root.to_der()?,
+                                                            root.to_der()?,
                                                         ),
                                                     ).with_kind(crate::ErrorKind::OpenSsl)?;
                                                             store
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index 078631252..d73c51beb 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -16,7 +16,7 @@ use futures::stream::FusedStream;
 use futures::{SinkExt, StreamExt, TryStreamExt};
 use imbl_value::{json, InternedString};
 use itertools::Itertools;
-use models::{ActionId, ImageId, PackageId, ProcedureName};
+use models::{ActionId, HostId, ImageId, PackageId, ProcedureName};
 use nix::sys::signal::Signal;
 use persistent_container::{PersistentContainer, Subcontainer};
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
@@ -603,6 +603,30 @@ impl Service {
             memory_usage: MiB::from_MiB(used),
         })
     }
+
+    pub async fn update_host(&self, host_id: HostId) -> Result<(), Error> {
+        let host = self
+            .seed
+            .ctx
+            .db
+            .peek()
+            .await
+            .as_public()
+            .as_package_data()
+            .as_idx(&self.seed.id)
+            .or_not_found(&self.seed.id)?
+            .as_hosts()
+            .as_idx(&host_id)
+            .or_not_found(&host_id)?
+            .de()?;
+        self.seed
+            .persistent_container
+            .net_service
+            .lock()
+            .await
+            .update(host_id, host)
+            .await
+    }
 }
 
 #[derive(Debug, Clone)]
diff --git a/core/startos/src/util/serde.rs b/core/startos/src/util/serde.rs
index 8f4bf4c15..5b785ce9a 100644
--- a/core/startos/src/util/serde.rs
+++ b/core/startos/src/util/serde.rs
@@ -1029,6 +1029,12 @@ impl<T: TryFrom<Vec<u8>>> FromStr for Base64<T> {
             })
     }
 }
+impl<T: TryFrom<Vec<u8>>> ValueParserFactory for Base64<T> {
+    type Parser = FromStrParser<Self>;
+    fn value_parser() -> Self::Parser {
+        Self::Parser::new()
+    }
+}
 impl<'de, T: TryFrom<Vec<u8>>> Deserialize<'de> for Base64<T> {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -1215,6 +1221,30 @@ impl PemEncoding for ed25519_dalek::SigningKey {
     }
 }
 
+#[derive(Clone, Debug)]
+pub struct Pkcs8Doc {
+    pub tag: String,
+    pub document: pkcs8::Document,
+}
+
+impl PemEncoding for Pkcs8Doc {
+    fn from_pem<E: serde::de::Error>(pem: &str) -> Result<Self, E> {
+        let (tag, document) = pkcs8::Document::from_pem(pem).map_err(E::custom)?;
+        Ok(Pkcs8Doc {
+            tag: tag.into(),
+            document,
+        })
+    }
+    fn to_pem<E: serde::ser::Error>(&self) -> Result<String, E> {
+        der::pem::encode_string(
+            &self.tag,
+            pkcs8::LineEnding::default(),
+            self.document.as_bytes(),
+        )
+        .map_err(E::custom)
+    }
+}
+
 pub mod pem {
     use serde::{Deserialize, Deserializer, Serializer};
 
diff --git a/sdk/base/lib/osBindings/AcmeSettings.ts b/sdk/base/lib/osBindings/AcmeSettings.ts
new file mode 100644
index 000000000..bdf151ec7
--- /dev/null
+++ b/sdk/base/lib/osBindings/AcmeSettings.ts
@@ -0,0 +1,13 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AcmeSettings = {
+  provider: string
+  /**
+   * email addresses for letsencrypt
+   */
+  contact: Array<string>
+  /**
+   * domains to get letsencrypt certs for
+   */
+  domains: string[]
+}
diff --git a/sdk/base/lib/osBindings/ServerInfo.ts b/sdk/base/lib/osBindings/ServerInfo.ts
index 435bf874a..89d7fc1b0 100644
--- a/sdk/base/lib/osBindings/ServerInfo.ts
+++ b/sdk/base/lib/osBindings/ServerInfo.ts
@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AcmeSettings } from "./AcmeSettings"
 import type { Governor } from "./Governor"
 import type { IpInfo } from "./IpInfo"
 import type { LshwDevice } from "./LshwDevice"
@@ -22,6 +23,7 @@ export type ServerInfo = {
    */
   torAddress: string
   ipInfo: { [key: string]: IpInfo }
+  acme: AcmeSettings | null
   statusInfo: ServerStatus
   wifi: WifiInfo
   unreadNotificationCount: number
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index acd555219..f76f595c9 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -1,4 +1,5 @@
 export { AcceptSigners } from "./AcceptSigners"
+export { AcmeSettings } from "./AcmeSettings"
 export { ActionId } from "./ActionId"
 export { ActionInput } from "./ActionInput"
 export { ActionMetadata } from "./ActionMetadata"
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 797fde614..aea6b5828 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -56,6 +56,7 @@ export const mockPatchData: DataModel = {
         ipv6Range: 'FE80:CD00:0000:0CDE:1257:0000:211E:729CD/64',
       },
     },
+    acme: null,
     unreadNotificationCount: 4,
     // password is asdfasdf
     passwordHash:

From e4a2af6ae7363a2c5124397f6f3616fcf2509e79 Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Sat, 23 Nov 2024 12:32:52 +0100
Subject: [PATCH 324/341] Add serial console support for headless operation
 (#2790)

* implement serial console support
* customize local and remote login prompt
---
 debian/postinst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/postinst b/debian/postinst
index 0db121c56..d20f778a4 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -20,10 +20,15 @@ fi
 update-initramfs -u -k all
 
 if [ -f /etc/default/grub ]; then
-    sed -i '/\(^\|#\)GRUB_CMDLINE_LINUX=/c\GRUB_CMDLINE_LINUX="boot=startos"' /etc/default/grub
+    sed -i '/\(^\|#\)GRUB_CMDLINE_LINUX=/c\GRUB_CMDLINE_LINUX="boot=startos console=ttyS0,115200n8"' /etc/default/grub
     sed -i '/\(^\|#\)GRUB_DISTRIBUTOR=/c\GRUB_DISTRIBUTOR="StartOS v$(cat /usr/lib/startos/VERSION.txt)"' /etc/default/grub
+    sed -i '/\(^\|#\)GRUB_TERMINAL=/c\GRUB_TERMINAL="serial"\nGRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"' /etc/default/grub
 fi
 
+# set local and remote login prompt
+echo "StartOS v$(cat /usr/lib/startos/VERSION.txt) [\m] on \n.local (\l)" > /etc/issue
+echo "StartOS v$(cat /usr/lib/startos/VERSION.txt)" > /etc/issue.net
+
 # change timezone
 rm -f /etc/localtime
 ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime

From 504f1a8e97585b8275133ec12446548320e8dbee Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:49:11 -0700
Subject: [PATCH 325/341] sdk tweaks (#2791)

* sdk tweaks

* switch back to deeppartial
---
 core/startos/src/s9pk/v2/pack.rs              | 13 +++++-
 core/startos/src/util/mod.rs                  | 10 +++--
 .../lib/actions/input/builder/inputSpec.ts    |  9 ++--
 sdk/base/lib/actions/input/builder/value.ts   | 45 +++++++++----------
 .../lib/actions/input/builder/variants.ts     | 21 ---------
 .../lib/dependencies/setupDependencies.ts     | 40 ++++++++++++++---
 sdk/base/lib/osBindings/ImageSource.ts        |  4 +-
 sdk/base/lib/types.ts                         | 13 ++++--
 sdk/base/lib/types/ManifestTypes.ts           | 17 +++++--
 sdk/base/package-lock.json                    |  8 ++--
 sdk/base/package.json                         |  2 +-
 sdk/package/lib/StartSdk.ts                   |  1 +
 sdk/package/lib/manifest/setupManifest.ts     |  4 +-
 sdk/package/lib/test/inputSpecBuilder.test.ts | 38 ++++++++--------
 sdk/package/lib/test/output.sdk.ts            | 12 ++++-
 sdk/package/lib/test/output.test.ts           |  2 +-
 sdk/package/package-lock.json                 | 12 ++---
 sdk/package/package.json                      |  4 +-
 18 files changed, 149 insertions(+), 106 deletions(-)

diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index 67be558f1..be81d9e78 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -354,7 +354,9 @@ pub enum ImageSource {
     Packed,
     #[serde(rename_all = "camelCase")]
     DockerBuild {
+        #[ts(optional)]
         workdir: Option<PathBuf>,
+        #[ts(optional)]
         dockerfile: Option<PathBuf>,
         #[serde(skip_serializing_if = "Option::is_none")]
         #[ts(optional)]
@@ -366,8 +368,15 @@ impl ImageSource {
     pub fn ingredients(&self) -> Vec<PathBuf> {
         match self {
             Self::Packed => Vec::new(),
-            Self::DockerBuild { dockerfile, .. } => {
-                vec![dockerfile.clone().unwrap_or_else(|| "Dockerfile".into())]
+            Self::DockerBuild {
+                dockerfile,
+                workdir,
+                ..
+            } => {
+                vec![workdir
+                    .as_deref()
+                    .unwrap_or(Path::new("."))
+                    .join(dockerfile.as_deref().unwrap_or(Path::new("Dockerfile")))]
             }
             Self::DockerTag(_) => Vec::new(),
         }
diff --git a/core/startos/src/util/mod.rs b/core/startos/src/util/mod.rs
index 0f3563018..d6f426135 100644
--- a/core/startos/src/util/mod.rs
+++ b/core/startos/src/util/mod.rs
@@ -122,7 +122,8 @@ impl<'a> std::ops::DerefMut for ExtendedCommand<'a> {
 }
 
 impl<'a> Invoke<'a> for tokio::process::Command {
-    type Extended<'ext> = ExtendedCommand<'ext>
+    type Extended<'ext>
+        = ExtendedCommand<'ext>
     where
         Self: 'ext,
         'ext: 'a;
@@ -162,7 +163,8 @@ impl<'a> Invoke<'a> for tokio::process::Command {
 }
 
 impl<'a> Invoke<'a> for ExtendedCommand<'a> {
-    type Extended<'ext> = &'ext mut ExtendedCommand<'ext>
+    type Extended<'ext>
+        = &'ext mut ExtendedCommand<'ext>
     where
         Self: 'ext,
         'ext: 'a;
@@ -663,8 +665,8 @@ impl FromStr for PathOrUrl {
     type Err = <PathBuf as FromStr>::Err;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         if let Ok(url) = s.parse::<Url>() {
-            if url.scheme() == "file" {
-                Ok(Self::Path(url.path().parse()?))
+            if let Some(path) = s.strip_prefix("file://") {
+                Ok(Self::Path(path.parse()?))
             } else {
                 Ok(Self::Url(url))
             }
diff --git a/sdk/base/lib/actions/input/builder/inputSpec.ts b/sdk/base/lib/actions/input/builder/inputSpec.ts
index 611ad8a48..31e06df4f 100644
--- a/sdk/base/lib/actions/input/builder/inputSpec.ts
+++ b/sdk/base/lib/actions/input/builder/inputSpec.ts
@@ -1,8 +1,9 @@
 import { ValueSpec } from "../inputSpecTypes"
-import { PartialValue, Value } from "./value"
+import { Value } from "./value"
 import { _ } from "../../../util"
 import { Effects } from "../../../Effects"
 import { Parser, object } from "ts-matches"
+import { DeepPartial } from "../../../types"
 
 export type LazyBuildOptions<Store> = {
   effects: Effects
@@ -22,8 +23,8 @@ export type ExtractPartialInputSpecType<
     | InputSpec<Record<string, any>, any>
     | InputSpec<Record<string, any>, never>,
 > = A extends InputSpec<infer B, any> | InputSpec<infer B, never>
-  ? PartialValue<B>
-  : PartialValue<A>
+  ? DeepPartial<B>
+  : DeepPartial<A>
 
 export type InputSpecOf<A extends Record<string, any>, Store = never> = {
   [K in keyof A]: Value<A[K], Store>
@@ -94,7 +95,7 @@ export class InputSpec<Type extends Record<string, any>, Store = never> {
     public validator: Parser<unknown, Type>,
   ) {}
   _TYPE: Type = null as any as Type
-  _PARTIAL: PartialValue<Type> = null as any as PartialValue<Type>
+  _PARTIAL: DeepPartial<Type> = null as any as DeepPartial<Type>
   async build(options: LazyBuildOptions<Store>) {
     const answer = {} as {
       [K in keyof Type]: ValueSpec
diff --git a/sdk/base/lib/actions/input/builder/value.ts b/sdk/base/lib/actions/input/builder/value.ts
index 053bd0596..676c4aac1 100644
--- a/sdk/base/lib/actions/input/builder/value.ts
+++ b/sdk/base/lib/actions/input/builder/value.ts
@@ -1,6 +1,6 @@
 import { InputSpec, LazyBuild } from "./inputSpec"
 import { List } from "./list"
-import { PartialUnionRes, UnionRes, Variants } from "./variants"
+import { Variants } from "./variants"
 import {
   FilePath,
   Pattern,
@@ -30,7 +30,7 @@ import { DeepPartial } from "../../../types"
 
 type AsRequired<T, Required extends boolean> = Required extends true
   ? T
-  : T | null | undefined
+  : T | null
 
 const testForAsRequiredParser = once(
   () => object({ required: literal(true) }).test,
@@ -38,21 +38,12 @@ const testForAsRequiredParser = once(
 function asRequiredParser<
   Type,
   Input,
-  Return extends
-    | Parser<unknown, Type>
-    | Parser<unknown, Type | null | undefined>,
+  Return extends Parser<unknown, Type> | Parser<unknown, Type | null>,
 >(parser: Parser<unknown, Type>, input: Input): Return {
   if (testForAsRequiredParser()(input)) return parser as any
-  return parser.optional() as any
+  return parser.nullable() as any
 }
 
-export type PartialValue<T> =
-  T extends UnionRes<infer A, infer B>
-    ? PartialUnionRes<A, B>
-    : T extends {}
-      ? { [P in keyof T]?: PartialValue<T[P]> }
-      : T
-
 export class Value<Type, Store> {
   protected constructor(
     public build: LazyBuild<Store, ValueSpec>,
@@ -196,7 +187,7 @@ export class Value<Type, Store> {
       }
     >,
   ) {
-    return new Value<string | null | undefined, Store>(async (options) => {
+    return new Value<string | null, Store>(async (options) => {
       const a = await getA(options)
       return {
         type: "text" as const,
@@ -213,7 +204,7 @@ export class Value<Type, Store> {
         generate: a.generate ?? null,
         ...a,
       }
-    }, string.optional())
+    }, string.nullable())
   }
   static textarea<Required extends boolean>(a: {
     name: string
@@ -265,7 +256,7 @@ export class Value<Type, Store> {
       }
     >,
   ) {
-    return new Value<string | null | undefined, Store>(async (options) => {
+    return new Value<string | null, Store>(async (options) => {
       const a = await getA(options)
       return {
         description: null,
@@ -278,7 +269,7 @@ export class Value<Type, Store> {
         immutable: false,
         ...a,
       }
-    }, string.optional())
+    }, string.nullable())
   }
   static number<Required extends boolean>(a: {
     name: string
@@ -351,7 +342,7 @@ export class Value<Type, Store> {
       }
     >,
   ) {
-    return new Value<number | null | undefined, Store>(async (options) => {
+    return new Value<number | null, Store>(async (options) => {
       const a = await getA(options)
       return {
         type: "number" as const,
@@ -366,7 +357,7 @@ export class Value<Type, Store> {
         immutable: false,
         ...a,
       }
-    }, number.optional())
+    }, number.nullable())
   }
   static color<Required extends boolean>(a: {
     name: string
@@ -413,7 +404,7 @@ export class Value<Type, Store> {
       }
     >,
   ) {
-    return new Value<string | null | undefined, Store>(async (options) => {
+    return new Value<string | null, Store>(async (options) => {
       const a = await getA(options)
       return {
         type: "color" as const,
@@ -423,7 +414,7 @@ export class Value<Type, Store> {
         immutable: false,
         ...a,
       }
-    }, string.optional())
+    }, string.nullable())
   }
   static datetime<Required extends boolean>(a: {
     name: string
@@ -483,7 +474,7 @@ export class Value<Type, Store> {
       }
     >,
   ) {
-    return new Value<string | null | undefined, Store>(async (options) => {
+    return new Value<string | null, Store>(async (options) => {
       const a = await getA(options)
       return {
         type: "datetime" as const,
@@ -496,7 +487,7 @@ export class Value<Type, Store> {
         immutable: false,
         ...a,
       }
-    }, string.optional())
+    }, string.nullable())
   }
   static select<Values extends Record<string, string>>(a: {
     name: string
@@ -690,14 +681,14 @@ export class Value<Type, Store> {
   //     }
   //   >,
   // ) {
-  //   return new Value<FilePath | null | undefined, Store>(
+  //   return new Value<FilePath | null, Store>(
   //     async (options) => ({
   //       type: "file" as const,
   //       description: null,
   //       warning: null,
   //       ...(await a(options)),
   //     }),
-  //     object({ filePath: string }).optional(),
+  //     object({ filePath: string }).nullable(),
   //   )
   // }
   static union<
@@ -822,6 +813,10 @@ export class Value<Type, Store> {
     }, parser)
   }
 
+  map<U>(fn: (value: Type) => U): Value<U, Store> {
+    return new Value(this.build, this.validator.map(fn))
+  }
+
   /**
    * Use this during the times that the input needs a more specific type.
    * Used in types that the value/ variant/ list/ inputSpec is constructed somewhere else.
diff --git a/sdk/base/lib/actions/input/builder/variants.ts b/sdk/base/lib/actions/input/builder/variants.ts
index 05124f45a..93453d73c 100644
--- a/sdk/base/lib/actions/input/builder/variants.ts
+++ b/sdk/base/lib/actions/input/builder/variants.ts
@@ -29,27 +29,6 @@ export type UnionRes<
   }
 }[K]
 
-export type PartialUnionRes<
-  Store,
-  VariantValues extends {
-    [K in string]: {
-      name: string
-      spec: InputSpec<any, Store> | InputSpec<any, never>
-    }
-  },
-  K extends keyof VariantValues & string = keyof VariantValues & string,
-> = {
-  [key in keyof VariantValues]: {
-    selection?: key
-    value?: ExtractPartialInputSpecType<VariantValues[key]["spec"]>
-    other?: {
-      [key2 in Exclude<keyof VariantValues & string, key>]?: DeepPartial<
-        ExtractInputSpecType<VariantValues[key2]["spec"]>
-      >
-    }
-  }
-}[K]
-
 /**
  * Used in the the Value.select { @link './value.ts' }
  * to indicate the type of select variants that are available. The key for the record passed in will be the
diff --git a/sdk/base/lib/dependencies/setupDependencies.ts b/sdk/base/lib/dependencies/setupDependencies.ts
index f694c042c..6b15ef0d1 100644
--- a/sdk/base/lib/dependencies/setupDependencies.ts
+++ b/sdk/base/lib/dependencies/setupDependencies.ts
@@ -1,12 +1,42 @@
 import * as T from "../types"
 import { once } from "../util"
 
-type DependencyType<Manifest extends T.SDKManifest> = {
-  [K in keyof Manifest["dependencies"]]: Omit<T.DependencyRequirement, "id">
-}
+export type RequiredDependenciesOf<Manifest extends T.SDKManifest> = {
+  [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false
+    ? K
+    : never
+}[keyof Manifest["dependencies"]]
+export type OptionalDependenciesOf<Manifest extends T.SDKManifest> = Exclude<
+  keyof Manifest["dependencies"],
+  RequiredDependenciesOf<Manifest>
+>
+
+type DependencyRequirement =
+  | {
+      kind: "running"
+      healthChecks: Array<T.HealthCheckId>
+      versionRange: string
+    }
+  | {
+      kind: "exists"
+      versionRange: string
+    }
+type Matches<T, U> = T extends U ? (U extends T ? null : never) : never
+const _checkType: Matches<
+  DependencyRequirement & { id: T.PackageId },
+  T.DependencyRequirement
+> = null
+
+export type CurrentDependenciesResult<Manifest extends T.SDKManifest> = {
+  [K in RequiredDependenciesOf<Manifest>]: DependencyRequirement
+} & {
+  [K in OptionalDependenciesOf<Manifest>]?: DependencyRequirement
+} & Record<string, DependencyRequirement>
 
 export function setupDependencies<Manifest extends T.SDKManifest>(
-  fn: (options: { effects: T.Effects }) => Promise<DependencyType<Manifest>>,
+  fn: (options: {
+    effects: T.Effects
+  }) => Promise<CurrentDependenciesResult<Manifest>>,
 ): (options: { effects: T.Effects }) => Promise<null> {
   const cell = { updater: async (_: { effects: T.Effects }) => null }
   cell.updater = async (options: { effects: T.Effects }) => {
@@ -21,7 +51,7 @@ export function setupDependencies<Manifest extends T.SDKManifest>(
       dependencies: Object.entries(dependencyType).map(
         ([id, { versionRange, ...x }, ,]) =>
           ({
-            id,
+            // id,
             ...x,
             versionRange: versionRange.toString(),
           }) as T.DependencyRequirement,
diff --git a/sdk/base/lib/osBindings/ImageSource.ts b/sdk/base/lib/osBindings/ImageSource.ts
index 58d2c2a79..d8f876aef 100644
--- a/sdk/base/lib/osBindings/ImageSource.ts
+++ b/sdk/base/lib/osBindings/ImageSource.ts
@@ -5,8 +5,8 @@ export type ImageSource =
   | "packed"
   | {
       dockerBuild: {
-        workdir: string | null
-        dockerfile: string | null
+        workdir?: string
+        dockerfile?: string
         buildArgs?: { [key: string]: BuildArg }
       }
     }
diff --git a/sdk/base/lib/types.ts b/sdk/base/lib/types.ts
index ab1acaa87..36d4bd293 100644
--- a/sdk/base/lib/types.ts
+++ b/sdk/base/lib/types.ts
@@ -13,6 +13,11 @@ import { Effects } from "./Effects"
 export { Effects }
 export * from "./osBindings"
 export { SDKManifest } from "./types/ManifestTypes"
+export {
+  RequiredDependenciesOf as RequiredDependencies,
+  OptionalDependenciesOf as OptionalDependencies,
+  CurrentDependenciesResult,
+} from "./dependencies/setupDependencies"
 
 export type ExposedStorePaths = string[] & Affine<"ExposedStorePaths">
 declare const HealthProof: unique symbol
@@ -224,6 +229,8 @@ export type KnownError =
 
 export type Dependencies = Array<DependencyRequirement>
 
-export type DeepPartial<T> = T extends {}
-  ? { [P in keyof T]?: DeepPartial<T[P]> }
-  : T
+export type DeepPartial<T> = T extends unknown[]
+  ? T
+  : T extends {}
+    ? { [P in keyof T]?: DeepPartial<T[P]> }
+    : T
diff --git a/sdk/base/lib/types/ManifestTypes.ts b/sdk/base/lib/types/ManifestTypes.ts
index 86ecf9140..17defebcd 100644
--- a/sdk/base/lib/types/ManifestTypes.ts
+++ b/sdk/base/lib/types/ManifestTypes.ts
@@ -150,10 +150,19 @@ export type SDKManifest = {
   }
 }
 
-export type SDKImageInputSpec = {
-  source: Exclude<ImageSource, "packed">
-  arch?: string[]
-  emulateMissingAs?: string | null
+// this is hacky but idk a more elegant way
+type ArchOptions = {
+  0: ["x86_64", "aarch64"]
+  1: ["aarch64", "x86_64"]
+  2: ["x86_64"]
+  3: ["aarch64"]
 }
+export type SDKImageInputSpec = {
+  [A in keyof ArchOptions]: {
+    source: Exclude<ImageSource, "packed">
+    arch?: ArchOptions[A]
+    emulateMissingAs?: ArchOptions[A][number] | null
+  }
+}[keyof ArchOptions]
 
 export type ManifestDependency = T.Manifest["dependencies"][string]
diff --git a/sdk/base/package-lock.json b/sdk/base/package-lock.json
index 4c8f58364..d7b491303 100644
--- a/sdk/base/package-lock.json
+++ b/sdk/base/package-lock.json
@@ -14,7 +14,7 @@
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
         "mime-types": "^2.1.35",
-        "ts-matches": "^6.0.0",
+        "ts-matches": "^6.1.0",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
@@ -3897,9 +3897,9 @@
       "dev": true
     },
     "node_modules/ts-matches": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.0.0.tgz",
-      "integrity": "sha512-vR4hhz9bYMW30qIJUuLaeAWlsR54vse6ZI2riVhVLMBE6/vss43jwrOvbHheiyU7e26ssT/yWx69aJHD2REJSA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.1.0.tgz",
+      "integrity": "sha512-01qvbIpOiKdbzzXDH84JeHunvCwBGFdZw94jS6kOGLSN5ms+1nBZtfe8WSuYMIPb1xPA+qyAiVgznFi2VCQ6UQ==",
       "license": "MIT"
     },
     "node_modules/ts-morph": {
diff --git a/sdk/base/package.json b/sdk/base/package.json
index 509e621de..4cc2fc7ca 100644
--- a/sdk/base/package.json
+++ b/sdk/base/package.json
@@ -27,7 +27,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
     "mime-types": "^2.1.35",
-    "ts-matches": "^6.0.0",
+    "ts-matches": "^6.1.0",
     "yaml": "^2.2.2"
   },
   "prettier": {
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index 28a14e1e5..634af249d 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -135,6 +135,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
     }
 
     return {
+      manifest: this.manifest,
       ...startSdkEffectWrapper,
       action: {
         run: actions.runAction,
diff --git a/sdk/package/lib/manifest/setupManifest.ts b/sdk/package/lib/manifest/setupManifest.ts
index c529f1ab7..5dfdb2451 100644
--- a/sdk/package/lib/manifest/setupManifest.ts
+++ b/sdk/package/lib/manifest/setupManifest.ts
@@ -59,7 +59,9 @@ export function buildManifest<
     (images, [k, v]) => {
       v.arch = v.arch || ["aarch64", "x86_64"]
       if (v.emulateMissingAs === undefined)
-        v.emulateMissingAs = v.arch[0] || null
+        v.emulateMissingAs = (v.arch as string[]).includes("aarch64")
+          ? "aarch64"
+          : v.arch[0] || null
       images[k] = v as ImageConfig
       return images
     },
diff --git a/sdk/package/lib/test/inputSpecBuilder.test.ts b/sdk/package/lib/test/inputSpecBuilder.test.ts
index 195acb40a..27869067d 100644
--- a/sdk/package/lib/test/inputSpecBuilder.test.ts
+++ b/sdk/package/lib/test/inputSpecBuilder.test.ts
@@ -87,7 +87,7 @@ describe("values", () => {
     const rawIs = await value.build({} as any)
     validator.unsafeCast("test text")
     validator.unsafeCast(null)
-    testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+    testOutput<typeof validator._TYPE, string | null>()(null)
   })
   test("color", async () => {
     const value = Value.color({
@@ -99,7 +99,7 @@ describe("values", () => {
     })
     const validator = value.validator
     validator.unsafeCast("#000000")
-    testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+    testOutput<typeof validator._TYPE, string | null>()(null)
   })
   test("datetime", async () => {
     const value = Value.datetime({
@@ -129,7 +129,7 @@ describe("values", () => {
     })
     const validator = value.validator
     validator.unsafeCast("2021-01-01")
-    testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+    testOutput<typeof validator._TYPE, string | null>()(null)
   })
   test("textarea", async () => {
     const value = Value.textarea({
@@ -144,7 +144,7 @@ describe("values", () => {
     })
     const validator = value.validator
     validator.unsafeCast("test text")
-    testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+    testOutput<typeof validator._TYPE, string | null>()(null)
   })
   test("number", async () => {
     const value = Value.number({
@@ -180,7 +180,7 @@ describe("values", () => {
     })
     const validator = value.validator
     validator.unsafeCast(2)
-    testOutput<typeof validator._TYPE, number | null | undefined>()(null)
+    testOutput<typeof validator._TYPE, number | null>()(null)
   })
   test("select", async () => {
     const value = Value.select({
@@ -319,33 +319,33 @@ describe("values", () => {
     test("text", async () => {
       const value = Value.dynamicText(async () => ({
         name: "Testing",
-        required: true,
+        required: false,
         default: null,
       }))
       const validator = value.validator
       const rawIs = await value.build({} as any)
       validator.unsafeCast("test text")
       validator.unsafeCast(null)
-      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      testOutput<typeof validator._TYPE, string | null>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
-        required: true,
+        required: false,
         default: null,
       })
     })
     test("text with default", async () => {
       const value = Value.dynamicText(async () => ({
         name: "Testing",
-        required: true,
+        required: false,
         default: "this is a default value",
       }))
       const validator = value.validator
       validator.unsafeCast("test text")
       validator.unsafeCast(null)
-      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      testOutput<typeof validator._TYPE, string | null>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
-        required: true,
+        required: false,
         default: "this is a default value",
       })
     })
@@ -359,7 +359,7 @@ describe("values", () => {
       const rawIs = await value.build({} as any)
       validator.unsafeCast("test text")
       validator.unsafeCast(null)
-      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      testOutput<typeof validator._TYPE, string | null>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
         required: false,
@@ -377,7 +377,7 @@ describe("values", () => {
       const validator = value.validator
       validator.unsafeCast("#000000")
       validator.unsafeCast(null)
-      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      testOutput<typeof validator._TYPE, string | null>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
         required: false,
@@ -445,7 +445,7 @@ describe("values", () => {
       const validator = value.validator
       validator.unsafeCast("2021-01-01")
       validator.unsafeCast(null)
-      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      testOutput<typeof validator._TYPE, string | null>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
         required: true,
@@ -468,7 +468,7 @@ describe("values", () => {
       }))
       const validator = value.validator
       validator.unsafeCast("test text")
-      testOutput<typeof validator._TYPE, string | null | undefined>()(null)
+      testOutput<typeof validator._TYPE, string | null>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
         required: false,
@@ -492,7 +492,7 @@ describe("values", () => {
       validator.unsafeCast(2)
       validator.unsafeCast(null)
       expect(() => validator.unsafeCast("null")).toThrowError()
-      testOutput<typeof validator._TYPE, number | null | undefined>()(null)
+      testOutput<typeof validator._TYPE, number | null>()(null)
       expect(await value.build(fakeOptions)).toMatchObject({
         name: "Testing",
         required: true,
@@ -795,7 +795,7 @@ describe("Nested nullable values", () => {
     validator.unsafeCast({ a: null })
     validator.unsafeCast({ a: "test" })
     expect(() => validator.unsafeCast({ a: 4 })).toThrowError()
-    testOutput<typeof validator._TYPE, { a: string | null | undefined }>()(null)
+    testOutput<typeof validator._TYPE, { a: string | null }>()(null)
   })
   test("Testing number", async () => {
     const value = InputSpec.of({
@@ -818,7 +818,7 @@ describe("Nested nullable values", () => {
     validator.unsafeCast({ a: null })
     validator.unsafeCast({ a: 5 })
     expect(() => validator.unsafeCast({ a: "4" })).toThrowError()
-    testOutput<typeof validator._TYPE, { a: number | null | undefined }>()(null)
+    testOutput<typeof validator._TYPE, { a: number | null }>()(null)
   })
   test("Testing color", async () => {
     const value = InputSpec.of({
@@ -835,7 +835,7 @@ describe("Nested nullable values", () => {
     validator.unsafeCast({ a: null })
     validator.unsafeCast({ a: "5" })
     expect(() => validator.unsafeCast({ a: 4 })).toThrowError()
-    testOutput<typeof validator._TYPE, { a: string | null | undefined }>()(null)
+    testOutput<typeof validator._TYPE, { a: string | null }>()(null)
   })
   test("Testing select", async () => {
     const value = InputSpec.of({
diff --git a/sdk/package/lib/test/output.sdk.ts b/sdk/package/lib/test/output.sdk.ts
index d87446585..3f3bb5411 100644
--- a/sdk/package/lib/test/output.sdk.ts
+++ b/sdk/package/lib/test/output.sdk.ts
@@ -1,6 +1,6 @@
+import { CurrentDependenciesResult } from "../../../base/lib/dependencies/setupDependencies"
 import { StartSdk } from "../StartSdk"
 import { setupManifest } from "../manifest/setupManifest"
-import { VersionInfo } from "../version/VersionInfo"
 import { VersionGraph } from "../version/VersionGraph"
 
 export type Manifest = any
@@ -21,7 +21,15 @@ export const sdk = StartSdk.of()
         long: "",
       },
       containers: {},
-      images: {},
+      images: {
+        main: {
+          source: {
+            dockerTag: "start9/hello-world",
+          },
+          arch: ["aarch64", "x86_64"],
+          emulateMissingAs: "aarch64",
+        },
+      },
       volumes: [],
       assets: [],
       alerts: {
diff --git a/sdk/package/lib/test/output.test.ts b/sdk/package/lib/test/output.test.ts
index 53d006274..a2e9c35d5 100644
--- a/sdk/package/lib/test/output.test.ts
+++ b/sdk/package/lib/test/output.test.ts
@@ -22,7 +22,7 @@ testOutput<
 testOutput<InputSpecSpec["rpc"]["advanced"]["servertimeout"], number>()(null)
 testOutput<
   InputSpecSpec["advanced"]["peers"]["addnode"][0]["hostname"],
-  string | null | undefined
+  string | null
 >()(null)
 testOutput<
   InputSpecSpec["testListUnion"][0]["union"]["value"]["name"],
diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
index 0b06e79db..1f5715258 100644
--- a/sdk/package/package-lock.json
+++ b/sdk/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha.16",
+  "version": "0.3.6-alpha.21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha.16",
+      "version": "0.3.6-alpha.21",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
@@ -15,7 +15,7 @@
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
         "mime-types": "^2.1.35",
-        "ts-matches": "^6.0.0",
+        "ts-matches": "^6.1.0",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
@@ -3918,9 +3918,9 @@
       "dev": true
     },
     "node_modules/ts-matches": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.0.0.tgz",
-      "integrity": "sha512-vR4hhz9bYMW30qIJUuLaeAWlsR54vse6ZI2riVhVLMBE6/vss43jwrOvbHheiyU7e26ssT/yWx69aJHD2REJSA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.1.0.tgz",
+      "integrity": "sha512-01qvbIpOiKdbzzXDH84JeHunvCwBGFdZw94jS6kOGLSN5ms+1nBZtfe8WSuYMIPb1xPA+qyAiVgznFi2VCQ6UQ==",
       "license": "MIT"
     },
     "node_modules/ts-morph": {
diff --git a/sdk/package/package.json b/sdk/package/package.json
index bbcab9830..2bf4b71f5 100644
--- a/sdk/package/package.json
+++ b/sdk/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha.17",
+  "version": "0.3.6-alpha.21",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",
@@ -33,7 +33,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
     "mime-types": "^2.1.35",
-    "ts-matches": "^6.0.0",
+    "ts-matches": "^6.1.0",
     "yaml": "^2.2.2",
     "@iarna/toml": "^2.2.5",
     "@noble/curves": "^1.4.0",

From 12dec676db9d1b8ddf3986f579744cc5d07e5d73 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Tue, 26 Nov 2024 23:54:05 -0700
Subject: [PATCH 326/341] Update sdk comments (#2793)

* sdk tweaks

* switch back to deeppartial

* WIP, update comments

* reinstall chesterton's fence

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 sdk/base/lib/Effects.ts                       |   1 -
 sdk/base/lib/actions/setupActions.ts          |   2 +-
 sdk/package/lib/StartSdk.ts                   | 229 +++++++++++-------
 sdk/package/lib/backup/Backups.ts             |  23 +-
 .../lib/health/checkFns/checkPortListening.ts |   3 +-
 sdk/package/lib/mainFn/CommandController.ts   |   4 +-
 sdk/package/lib/manifest/setupManifest.ts     |   3 +-
 sdk/package/lib/store/setupExposeStore.ts     |   1 -
 sdk/package/lib/trigger/defaultTrigger.ts     |   1 -
 sdk/package/lib/util/SubContainer.ts          |   3 +-
 sdk/package/lib/util/fileHelper.ts            |  25 +-
 11 files changed, 167 insertions(+), 128 deletions(-)

diff --git a/sdk/base/lib/Effects.ts b/sdk/base/lib/Effects.ts
index 00d56cfba..e4424fafb 100644
--- a/sdk/base/lib/Effects.ts
+++ b/sdk/base/lib/Effects.ts
@@ -12,7 +12,6 @@ import {
   Host,
   ExportServiceInterfaceParams,
   ServiceInterface,
-  ActionRequest,
   RequestActionParams,
   MainStatus,
 } from "./osBindings"
diff --git a/sdk/base/lib/actions/setupActions.ts b/sdk/base/lib/actions/setupActions.ts
index 081225569..203f81a32 100644
--- a/sdk/base/lib/actions/setupActions.ts
+++ b/sdk/base/lib/actions/setupActions.ts
@@ -14,7 +14,7 @@ export type Run<
 > = (options: {
   effects: T.Effects
   input: ExtractInputSpecType<A> & Record<string, any>
-}) => Promise<T.ActionResult | null | void | undefined>
+}) => Promise<(T.ActionResult & { version: "1" }) | null | void | undefined>
 export type GetInput<
   A extends
     | Record<string, any>
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index 634af249d..e7e87f963 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -33,12 +33,11 @@ import { checkWebUrl, runHealthScript } from "./health/checkFns"
 import { List } from "../../base/lib/actions/input/builder/list"
 import { Install, InstallFn } from "./inits/setupInstall"
 import { SetupBackupsParams, setupBackups } from "./backup/setupBackups"
-import { Uninstall, UninstallFn, setupUninstall } from "./inits/setupUninstall"
+import { UninstallFn, setupUninstall } from "./inits/setupUninstall"
 import { setupMain } from "./mainFn"
 import { defaultTrigger } from "./trigger/defaultTrigger"
 import { changeOnFirstSuccess, cooldownTrigger } from "./trigger"
 import {
-  ServiceInterfacesReceipt,
   UpdateServiceInterfaces,
   setupServiceInterfaces,
 } from "../../base/lib/interfaces/setupInterfaces"
@@ -240,68 +239,67 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
         return runCommand<Manifest>(effects, image, command, options, name)
       },
       /**
-       * TODO: rewrite this
-       * @description Use this function to create a static Action, including optional form input.
+       * @description Use this class to create an Action. By convention, each Action should receive its own file.
        *
-       *   By convention, each Action should receive its own file.
-       *
-       * @param id
-       * @param metaData
-       * @param fn
-       * @returns
-       * @example
-       * In this example, we create an Action that prints a name to the console. We present a user
-       * with a form for optionally entering a temp name. If no temp name is provided, we use the name
-       * from the underlying `inputSpec.yaml` file. If no name is there, we use "Unknown". Then, we return
-       * a message to the user informing them what happened.
-       * 
-       * ```
-        import { sdk } from '../sdk'
-        const { InputSpec, Value } = sdk
-        import { yamlFile } from '../file-models/inputSpec.yml'
+       */
+      Action: {
+        /**
+         * @description Use this function to create an action that accepts form input
+         * @param id - a unique ID for this action
+         * @param metadata - information describing the action and its availability
+         * @param inputSpec - define the form input using the InputSpec and Value classes
+         * @param prefillFn - optionally fetch data from the file system to pre-fill the input form. Must returns a deep partial of the input spec
+         * @param executionFn - execute the action. Optionally return data for the user to view. Must be in the structure of an ActionResult, version "1"
+         * @example
+         * In this example, we create an action for a user to provide their name.
+         *   We prefill the input form with their existing name from the service's yaml file.
+         *   The new name is saved to the yaml file, and we return nothing to the user, which
+         *   means they will receive a generic success message.
+         * 
+         * ```
+          import { sdk } from '../sdk'
+          import { yamlFile } from '../file-models/config.yml'
 
-        const input = InputSpec.of({
-          nameToPrint: Value.text({
-            name: 'Temp Name',
-            description: 'If no name is provided, the name from inputSpec will be used',
-            required: false,
-          }),
-        })
+          const { InputSpec, Value } = sdk
 
-        export const nameToLog = sdk.createAction(
-          // id
-          'nameToLogs',
+          export const inputSpec = InputSpec.of({
+            name: Value.text({
+              name: 'Name',
+              description:
+                'When you launch the Hello World UI, it will display "Hello [Name]"',
+              required: true,
+              default: 'World',
+            }),
+          })
 
-          // metadata
-          {
-            name: 'Name to Logs',
-            description: 'Prints "Hello [Name]" to the service logs.',
-            warning: null,
-            disabled: false,
-            input,
-            allowedStatuses: 'onlyRunning',
-            group: null,
-          },
+          export const setName = sdk.Action.withInput(
+            // id
+            'set-name',
 
-          // the execution function
-          async ({ effects, input }) => {
-            const name =
-              input.nameToPrint || (await yamlFile.read(effects))?.name || 'Unknown'
+            // metadata
+            async ({ effects }) => ({
+              name: 'Set Name',
+              description: 'Set your name so Hello World can say hello to you',
+              warning: null,
+              allowedStatuses: 'any',
+              group: null,
+              visibility: 'enabled',
+            }),
 
-            console.info(`Hello ${name}`)
+            // form input specification
+            inputSpec,
 
-            return {
-              version: '0',
-              message: `"Hello ${name}" has been written to the service logs. Open your logs to view it.`,
-              value: name,
-              copyable: true,
-              qr: false,
-            }
-          },
-        )
-       * ```
-       */
-      Action: {
+            // optionally pre-fill the input form
+            async ({ effects }) => {
+              const name = await yamlFile.read.const(effects)?.name
+              return { name }
+            },
+
+            // the execution function
+            async ({ effects, input }) => yamlFile.merge(input)
+          )
+         * ```
+        */
         withInput: <
           Id extends T.ActionId,
           InputSpecType extends
@@ -317,6 +315,50 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           getInput: GetInput<Type>,
           run: Run<Type>,
         ) => Action.withInput(id, metadata, inputSpec, getInput, run),
+        /**
+         * @description Use this function to create an action that does not accept form input
+         * @param id - a unique ID for this action
+         * @param metadata - information describing the action and its availability
+         * @param executionFn - execute the action. Optionally return data for the user to view. Must be in the structure of an ActionResult, version "1"
+         * @example
+         * In this example, we create an action that returns a secret phrase for the user to see.
+         * 
+         * ```
+          import { sdk } from '../sdk'
+
+          export const showSecretPhrase = sdk.Action.withoutInput(
+            // id
+            'show-secret-phrase',
+
+            // metadata
+            async ({ effects }) => ({
+              name: 'Show Secret Phrase',
+              description: 'Reveal the secret phrase for Hello World',
+              warning: null,
+              allowedStatuses: 'any',
+              group: null,
+              visibility: 'enabled',
+            }),
+
+            // the execution function
+            async ({ effects }) => ({
+              version: '1',
+              title: 'Secret Phrase',
+              message:
+                'Below is your secret phrase. Use it to gain access to extraordinary places',
+              result: {
+                type: 'single',
+                value: await sdk.store
+                  .getOwn(effects, sdk.StorePath.secretPhrase)
+                  .const(),
+                copyable: true,
+                qr: true,
+                masked: true,
+              },
+            }),
+          )
+         * ```
+        */
         withoutInput: <Id extends T.ActionId>(
           id: Id,
           metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
@@ -355,9 +397,9 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           id: string
           /** The human readable description. */
           description: string
-          /** Not available until StartOS v0.4.0. If true, forces the user to select one URL (i.e. .onion, .local, or IP address) as the primary URL. This is needed by some services to function properly. */
+          /** No effect until StartOS v0.4.0. If true, forces the user to select one URL (i.e. .onion, .local, or IP address) as the primary URL. This is needed by some services to function properly. */
           hasPrimary: boolean
-          /** Affects how the interface appears to the user. One of: 'ui', 'api', 'p2p'. */
+          /** Affects how the interface appears to the user. One of: 'ui', 'api', 'p2p'. If 'ui', the user will see a "Launch UI" button */
           type: ServiceInterfaceType
           /** (optional) prepends the provided username to all URLs. */
           username: null | string
@@ -413,15 +455,22 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
        * In this example, we back up the entire "main" volume and nothing else.
        *
        * ```
-        export const { createBackup, restoreBackup } = sdk.setupBackups(sdk.Backups.addVolume('main'))
+        import { sdk } from './sdk'
+
+        export const { createBackup, restoreBackup } = sdk.setupBackups(
+          async ({ effects }) => sdk.Backups.volumes('main'),
+        )
        * ```
        * @example
-       * In this example, we back up the "main" and the "other" volume, but exclude hypothetical directory "excludedDir" from the "other".
+       * In this example, we back up the "main" volume, but exclude hypothetical directory "excludedDir".
        *
        * ```
-        export const { createBackup, restoreBackup } = sdk.setupBackups(sdk.Backups
-          .addVolume('main')
-          .addVolume('other', { exclude: ['path/to/excludedDir'] })
+        import { sdk } from './sdk'
+
+        export const { createBackup, restoreBackup } = sdk.setupBackups(async () =>
+          sdk.Backups.volumes('main').setOptions({
+            exclude: ['excludedDir'],
+          }),
         )
        * ```
        */
@@ -429,37 +478,36 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
         setupBackups<Manifest>(options),
       /**
        * @description Use this function to set dependency information.
-       *
-       *   The function executes on service install, update, and inputSpec save. "input" will be of type `Input` for inputSpec save. It will be `null` for install and update.
        * @example
-       * In this example, we create a static dependency on Hello World >=1.0.0:0, where Hello World must be running and passing its "webui" health check.
+       * In this example, we create a perpetual dependency on Hello World >=1.0.0:0, where Hello World must be running and passing its "primary" health check.
        *
        * ```
         export const setDependencies = sdk.setupDependencies(
           async ({ effects, input }) => {
             return {
-              'hello-world': sdk.Dependency.of({
-                type: 'running',
-                versionRange: VersionRange.parse('>=1.0.0:0'),
-                healthChecks: ['webui'],
-              }),
+              'hello-world': {
+                kind: 'running',
+                versionRange: '>=1.0.0',
+                healthChecks: ['primary'],
+              },
             }
           },
         )
        * ```
        * @example
-       * In this example, we create a conditional dependency on Hello World based on a hypothetical "needsWorld" boolean in the store.
+       * In this example, we create a conditional dependency on Hello World based on a hypothetical "needsWorld" boolean in our Store.
+       * Using .const() ensures that if the "needsWorld" boolean changes, setupDependencies will re-run.
        *
        * ```
         export const setDependencies = sdk.setupDependencies(
           async ({ effects }) => {
             if (sdk.store.getOwn(sdk.StorePath.needsWorld).const()) {
               return {
-                'hello-world': sdk.Dependency.of({
-                  type: 'running',
-                  versionRange: VersionRange.parse('>=1.0.0:0'),
-                  healthChecks: ['webui'],
-                }),
+                'hello-world': {
+                  kind: 'running',
+                  versionRange: '>=1.0.0',
+                  healthChecks: ['primary'],
+                },
               }
             }
             return {}
@@ -614,7 +662,8 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               name: 'Name',
               description:
                 'When you launch the Hello World UI, it will display "Hello [Name]"',
-              required: { default: 'World' },
+              required: true,
+              default: 'World'
             }),
             makePublic: Value.toggle({
               name: 'Make Public',
@@ -673,6 +722,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
                 label: Value.text({
                   name: 'Label',
                   required: false,
+                  default: null,
                 })
               })
               displayAs: 'label',
@@ -690,11 +740,13 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               spec: InputSpec.of({
                 label: Value.text({
                   name: 'Label',
-                  required: { default: null },
+                  required: true,
+                  default: null,
                 })
                 pubkey: Value.text({
                   name: 'Pubkey',
-                  required: { default: null },
+                  required: true,
+                  default: null,
                 })
               })
               displayAs: 'label',
@@ -707,11 +759,13 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               spec: InputSpec.of({
                 label: Value.text({
                   name: 'Label',
-                  required: { default: null },
+                  required: true,
+                  default: null,
                 })
                 pubkey: Value.text({
                   name: 'Pubkey',
-                  required: { default: null },
+                  required: true,
+                  default: null,
                 })
               })
               displayAs: 'label',
@@ -777,6 +831,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             // required
             name: 'Text Example',
             required: false,
+            default: null,
          
             // optional
             description: null,
@@ -801,6 +856,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             // required
             name: 'Textarea Example',
             required: false,
+            default: null,
          
             // optional
             description: null,
@@ -821,6 +877,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             // required
             name: 'Number Example',
             required: false,
+            default: null,
             integer: true,
          
             // optional
@@ -844,6 +901,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             // required
             name: 'Color Example',
             required: false,
+            default: null,
          
             // optional
             description: null,
@@ -861,6 +919,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             // required
             name: 'Datetime Example',
             required: false,
+            default: null,
          
             // optional
             description: null,
@@ -880,7 +939,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           selectExample: Value.select({
             // required
             name: 'Select Example',
-            required: false,
+            default: 'radio1',
             values: {
               radio1: 'Radio 1',
               radio2: 'Radio 2',
@@ -945,7 +1004,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             {
               // required
               name: 'Union Example',
-              required: false,
+              default: 'option1',
          
               // optional
               description: null,
diff --git a/sdk/package/lib/backup/Backups.ts b/sdk/package/lib/backup/Backups.ts
index c27f2be72..c7c6301f5 100644
--- a/sdk/package/lib/backup/Backups.ts
+++ b/sdk/package/lib/backup/Backups.ts
@@ -13,28 +13,7 @@ export type BackupSync<Volumes extends string> = {
   backupOptions?: Partial<T.SyncOptions>
   restoreOptions?: Partial<T.SyncOptions>
 }
-/**
- * This utility simplifies the volume backup process.
- * ```ts
- * export const { createBackup, restoreBackup } = Backups.volumes("main").build();
- * ```
- *
- * Changing the options of the rsync, (ie excludes) use either
- * ```ts
- *  Backups.volumes("main").set_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
- * // or
- *  Backups.with_options({exclude: ['bigdata/']}).volumes('excludedVolume').build()
- * ```
- *
- * Using the more fine control, using the addSets for more control
- * ```ts
- * Backups.addSets({
- * srcVolume: 'main', srcPath:'smallData/', dstPath: 'main/smallData/', dstVolume: : Backups.BACKUP
- * }, {
- * srcVolume: 'main', srcPath:'bigData/', dstPath: 'main/bigData/', dstVolume: : Backups.BACKUP, options: {exclude:['bigData/excludeThis']}}
- * ).build()q
- * ```
- */
+
 export class Backups<M extends T.SDKManifest> {
   private constructor(
     private options = DEFAULT_OPTIONS,
diff --git a/sdk/package/lib/health/checkFns/checkPortListening.ts b/sdk/package/lib/health/checkFns/checkPortListening.ts
index e745bce4f..0d6792b86 100644
--- a/sdk/package/lib/health/checkFns/checkPortListening.ts
+++ b/sdk/package/lib/health/checkFns/checkPortListening.ts
@@ -1,12 +1,11 @@
 import { Effects } from "../../../../base/lib/types"
 import { stringFromStdErrOut } from "../../util"
 import { HealthCheckResult } from "./HealthCheckResult"
-
 import { promisify } from "node:util"
 import * as CP from "node:child_process"
 
 const cpExec = promisify(CP.exec)
-const cpExecFile = promisify(CP.execFile)
+
 export function containsAddress(x: string, port: number) {
   const readPorts = x
     .split("\n")
diff --git a/sdk/package/lib/mainFn/CommandController.ts b/sdk/package/lib/mainFn/CommandController.ts
index 1aefc854f..3b2285adb 100644
--- a/sdk/package/lib/mainFn/CommandController.ts
+++ b/sdk/package/lib/mainFn/CommandController.ts
@@ -1,10 +1,8 @@
 import { DEFAULT_SIGTERM_TIMEOUT } from "."
-import { NO_TIMEOUT, SIGKILL, SIGTERM } from "../../../base/lib/types"
+import { NO_TIMEOUT, SIGTERM } from "../../../base/lib/types"
 
 import * as T from "../../../base/lib/types"
-import { asError } from "../../../base/lib/util/asError"
 import {
-  ExecSpawnable,
   MountOptions,
   SubContainerHandle,
   SubContainer,
diff --git a/sdk/package/lib/manifest/setupManifest.ts b/sdk/package/lib/manifest/setupManifest.ts
index 5dfdb2451..1a78c062c 100644
--- a/sdk/package/lib/manifest/setupManifest.ts
+++ b/sdk/package/lib/manifest/setupManifest.ts
@@ -11,7 +11,6 @@ import { execSync } from "child_process"
 /**
  * @description Use this function to define critical information about your package
  *
- * @param versions Every version of the package, imported from ./versions
  * @param manifest Static properties of the package
  */
 export function setupManifest<
@@ -23,7 +22,7 @@ export function setupManifest<
     assets: AssetTypes[]
     volumes: VolumesTypes[]
   } & SDKManifest,
->(manifest: Manifest): Manifest {
+>(manifest: Manifest & SDKManifest): Manifest {
   return manifest
 }
 
diff --git a/sdk/package/lib/store/setupExposeStore.ts b/sdk/package/lib/store/setupExposeStore.ts
index 1ae0bf13f..7f5415bd7 100644
--- a/sdk/package/lib/store/setupExposeStore.ts
+++ b/sdk/package/lib/store/setupExposeStore.ts
@@ -1,5 +1,4 @@
 import { ExposedStorePaths } from "../../../base/lib/types"
-import { Affine, _ } from "../util"
 import {
   PathBuilder,
   extractJsonPath,
diff --git a/sdk/package/lib/trigger/defaultTrigger.ts b/sdk/package/lib/trigger/defaultTrigger.ts
index 69cac2773..647695fb2 100644
--- a/sdk/package/lib/trigger/defaultTrigger.ts
+++ b/sdk/package/lib/trigger/defaultTrigger.ts
@@ -1,6 +1,5 @@
 import { cooldownTrigger } from "./cooldownTrigger"
 import { changeOnFirstSuccess } from "./changeOnFirstSuccess"
-import { successFailure } from "./successFailure"
 
 export const defaultTrigger = changeOnFirstSuccess({
   beforeFirstSuccess: cooldownTrigger(1000),
diff --git a/sdk/package/lib/util/SubContainer.ts b/sdk/package/lib/util/SubContainer.ts
index 7274e22d4..f9b5a1084 100644
--- a/sdk/package/lib/util/SubContainer.ts
+++ b/sdk/package/lib/util/SubContainer.ts
@@ -4,9 +4,10 @@ import * as cp from "child_process"
 import { promisify } from "util"
 import { Buffer } from "node:buffer"
 import { once } from "../../../base/lib/util/once"
+
 export const execFile = promisify(cp.execFile)
-const WORKDIR = (imageId: string) => `/media/startos/images/${imageId}/`
 const False = () => false
+
 type ExecResults = {
   exitCode: number | null
   exitSignal: NodeJS.Signals | null
diff --git a/sdk/package/lib/util/fileHelper.ts b/sdk/package/lib/util/fileHelper.ts
index 80e5b3564..d47af510c 100644
--- a/sdk/package/lib/util/fileHelper.ts
+++ b/sdk/package/lib/util/fileHelper.ts
@@ -46,27 +46,34 @@ async function onCreated(path: string) {
 /**
  * @description Use this class to read/write an underlying configuration file belonging to the upstream service.
  *
- * Using the static functions, choose between officially supported file formats (json, yaml, toml), or a custom format (raw).
+ *   These type definitions should reflect the underlying file as closely as possible. For example, if the service does not require a particular value, it should be marked as optional(), even if your package requires it.
+ *
+ *   It is recommended to use onMismatch() whenever possible. This provides an escape hatch in case the user edits the file manually and accidentally sets a value to an unsupported type.
+ *
+ *   Officially supported file types are json, yaml, and toml. Other files types can use "raw"
+ *
+ *   Choose between officially supported file formats (), or a custom format (raw).
+ *
  * @example
  * Below are a few examples
  *
  * ```
  * import { matches, FileHelper } from '@start9labs/start-sdk'
- * const { arrayOf, boolean, literal, literals, object, oneOf, natural, string } = matches
+ * const { arrayOf, boolean, literal, literals, object, natural, string } = matches
  *
  * export const jsonFile = FileHelper.json('./inputSpec.json', object({
- *   passwords: arrayOf(string)
- *   type: oneOf(literals('private', 'public'))
+ *   passwords: arrayOf(string).onMismatch([])
+ *   type: literals('private', 'public').optional().onMismatch(undefined)
  * }))
  *
  * export const tomlFile = FileHelper.toml('./inputSpec.toml', object({
- *   url: literal('https://start9.com')
- *   public: boolean
+ *   url: literal('https://start9.com').onMismatch('https://start9.com')
+ *   public: boolean.onMismatch(true)
  * }))
  *
  * export const yamlFile = FileHelper.yaml('./inputSpec.yml', object({
- *   name: string
- *   age: natural
+ *   name: string.optional().onMismatch(undefined)
+ *   age: natural.optional().onMismatch(undefined)
  * }))
  *
  * export const bitcoinConfFile = FileHelper.raw(
@@ -183,7 +190,7 @@ export class FileHelper<A> {
 
   /**
    * We wanted to be able to have a fileHelper, and just modify the path later in time.
-   * Like one behaviour of another dependency or something similar.
+   * Like one behavior of another dependency or something similar.
    */
   withPath(path: string) {
     return new FileHelper<A>(path, this.writeData, this.readData, this.validate)

From dd423f2e7ba26f45f7a98f15a893fc9d8f825f99 Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Mon, 2 Dec 2024 17:27:32 +0100
Subject: [PATCH 327/341] Add System Debug Information Gathering Script (#2738)

* Add gather_debug_info.sh for comprehensive StartOS diagnostics
* chore: Update the services to use the lxc instead of podman
* chore: Add symlink /usr/bin/gather-debug

---------

Co-authored-by: Jade <2364004+Blu-J@users.noreply.github.com>
---
 build/lib/scripts/gather_debug_info.sh | 105 +++++++++++++++++++++++++
 debian/postinst                        |   1 +
 2 files changed, 106 insertions(+)
 create mode 100755 build/lib/scripts/gather_debug_info.sh

diff --git a/build/lib/scripts/gather_debug_info.sh b/build/lib/scripts/gather_debug_info.sh
new file mode 100755
index 000000000..a47ca60bd
--- /dev/null
+++ b/build/lib/scripts/gather_debug_info.sh
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Define the output file
+OUTPUT_FILE="system_debug_info.txt"
+
+# Check if the script is run as root, if not, restart with sudo
+if [ "$(id -u)" -ne 0 ]; then
+    exec sudo bash "$0" "$@"
+fi
+
+# Create or clear the output file and add a header
+echo "===================================================================" > "$OUTPUT_FILE"
+echo "                     StartOS System Debug Information              " >> "$OUTPUT_FILE"
+echo "===================================================================" >> "$OUTPUT_FILE"
+echo "Generated on: $(date)" >> "$OUTPUT_FILE"
+echo "" >> "$OUTPUT_FILE"
+
+# Function to check if a command exists
+command_exists() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+# Function to run a command if it exists and append its output to the file with headers
+run_command() {
+    local CMD="$1"
+    local DESC="$2"
+    local CMD_NAME="${CMD%% *}"  # Extract the command name (first word)
+
+    if command_exists "$CMD_NAME"; then
+        echo "===================================================================" >> "$OUTPUT_FILE"
+        echo "COMMAND: $CMD" >> "$OUTPUT_FILE"
+        echo "DESCRIPTION: $DESC" >> "$OUTPUT_FILE"
+        echo "===================================================================" >> "$OUTPUT_FILE"
+        echo "" >> "$OUTPUT_FILE"
+        eval "$CMD" >> "$OUTPUT_FILE" 2>&1
+        echo "" >> "$OUTPUT_FILE"
+    else
+        echo "===================================================================" >> "$OUTPUT_FILE"
+        echo "COMMAND: $CMD" >> "$OUTPUT_FILE"
+        echo "DESCRIPTION: $DESC" >> "$OUTPUT_FILE"
+        echo "===================================================================" >> "$OUTPUT_FILE"
+        echo "SKIPPED: Command not found" >> "$OUTPUT_FILE"
+        echo "" >> "$OUTPUT_FILE"
+    fi
+}
+
+# Collecting basic system information
+run_command "start-cli --version; start-cli git-info" "StartOS CLI version and Git information"
+run_command "hostname" "Hostname of the system"
+run_command "uname -a" "Kernel version and system architecture"
+
+# Services Info
+run_command "start-cli lxc stats" "All Running Services"
+
+# Collecting CPU information
+run_command "lscpu" "CPU architecture information"
+run_command "cat /proc/cpuinfo" "Detailed CPU information"
+
+# Collecting memory information
+run_command "free -h" "Available and used memory"
+run_command "cat /proc/meminfo" "Detailed memory information"
+
+# Collecting storage information
+run_command "lsblk" "List of block devices"
+run_command "df -h" "Disk space usage"
+run_command "fdisk -l" "Detailed disk partition information"
+
+# Collecting network information
+run_command "ip a" "Network interfaces and IP addresses"
+run_command "ip route" "Routing table"
+run_command "netstat -i" "Network interface statistics"
+
+# Collecting RAID information (if applicable)
+run_command "cat /proc/mdstat" "List of RAID devices (if applicable)"
+
+# Collecting virtualization information
+run_command "egrep -c '(vmx|svm)' /proc/cpuinfo" "Check if CPU supports virtualization"
+run_command "systemd-detect-virt" "Check if the system is running inside a virtual machine"
+
+# Final message
+echo "===================================================================" >> "$OUTPUT_FILE"
+echo "                    End of StartOS System Debug Information        " >> "$OUTPUT_FILE"
+echo "===================================================================" >> "$OUTPUT_FILE"
+
+# Prompt user to send the log file to a Start9 Technician
+echo "System debug information has been collected in $OUTPUT_FILE."
+echo ""
+echo "Would you like to send this log file to a Start9 Technician? (yes/no)"
+read SEND_LOG
+
+if [[ "$SEND_LOG" == "yes" || "$SEND_LOG" == "y" ]]; then
+    if command -v wormhole >/dev/null 2>&1; then
+        echo ""
+        echo "==================================================================="
+        echo "      Running wormhole to send the file. Please follow the          "
+        echo "      instructions and provide the code to the Start9 support team. "
+        echo "==================================================================="
+        wormhole send "$OUTPUT_FILE"
+        echo "==================================================================="
+    else
+        echo "Error: wormhole command not found."
+    fi
+else
+    echo "Log file not sent. You can manually share $OUTPUT_FILE with the Start9 support team if needed."
+fi
\ No newline at end of file
diff --git a/debian/postinst b/debian/postinst
index d20f778a4..3714df8d4 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -101,6 +101,7 @@ EOF
 
 rm -rf /var/lib/tor/*
 ln -sf /usr/lib/startos/scripts/tor-check.sh /usr/bin/tor-check
+ln -sf /usr/lib/startos/scripts/gather_debug_info.sh /usr/bin/gather-debug
 
 echo "fs.inotify.max_user_watches=1048576" > /etc/sysctl.d/97-embassy.conf
 

From 22a32af7502edf67e2e16b916aa44dbf94049dde Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Mon, 2 Dec 2024 13:58:09 -0700
Subject: [PATCH 328/341] use notification system for OS updates (#2670)

* use notification system for OS updates

* feat: Include the version update notification in the update in rs

* chore: Change the location of the comment

* progress on release notes

* fill out missing sections

* fix build

* fix build

---------

Co-authored-by: J H <dragondef@gmail.com>
Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/src/notifications.rs             |  5 +-
 .../src/version/update_details/v0_3_6.md      | 83 +++++++++++++++++++
 core/startos/src/version/v0_3_6_alpha_6.rs    | 30 +++++--
 web/projects/ui/src/app/app.module.ts         |  2 -
 .../ui/src/app/components/form/control.ts     |  5 +-
 .../form-control/form-control.component.html  |  2 +-
 .../form-control/form-control.providers.ts    |  7 +-
 .../modals/os-welcome/os-welcome.module.ts    | 13 ---
 .../modals/os-welcome/os-welcome.page.html    | 32 -------
 .../modals/os-welcome/os-welcome.page.scss    | 29 -------
 .../app/modals/os-welcome/os-welcome.page.ts  | 15 ----
 .../notifications/notifications.page.html     |  9 ++
 .../pages/notifications/notifications.page.ts | 20 ++++-
 .../ui/src/app/services/api/api.fixures.ts    | 18 +++-
 .../ui/src/app/services/api/api.types.ts      |  2 +
 .../ui/src/app/services/api/mock-patch.ts     |  1 -
 .../ui/src/app/services/patch-data.service.ts | 30 +------
 .../src/app/services/patch-db/data-model.ts   |  1 -
 18 files changed, 167 insertions(+), 137 deletions(-)
 create mode 100644 core/startos/src/version/update_details/v0_3_6.md
 delete mode 100644 web/projects/ui/src/app/modals/os-welcome/os-welcome.module.ts
 delete mode 100644 web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
 delete mode 100644 web/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss
 delete mode 100644 web/projects/ui/src/app/modals/os-welcome/os-welcome.page.ts

diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index b310220b5..4b45531a4 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -13,11 +13,11 @@ use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
 
-use crate::backup::BackupReport;
 use crate::context::{CliContext, RpcContext};
 use crate::db::model::DatabaseModel;
 use crate::prelude::*;
 use crate::util::serde::HandlerExtSerde;
+use crate::{backup::BackupReport, db::model::Database};
 
 // #[command(subcommands(list, delete, delete_before, create))]
 pub fn notification<C: Context>() -> ParentHandler<C> {
@@ -285,6 +285,9 @@ impl NotificationType for () {
 impl NotificationType for BackupReport {
     const CODE: u32 = 1;
 }
+impl NotificationType for String {
+    const CODE: u32 = 2;
+}
 
 #[instrument(skip(subtype, db))]
 pub fn notify<T: NotificationType>(
diff --git a/core/startos/src/version/update_details/v0_3_6.md b/core/startos/src/version/update_details/v0_3_6.md
new file mode 100644
index 000000000..b93e8ad1a
--- /dev/null
+++ b/core/startos/src/version/update_details/v0_3_6.md
@@ -0,0 +1,83 @@
+# StartOS v0.3.6
+
+## Warning
+
+Previous backups are incompatible with v0.3.6. It is strongly recommended that you (1) immediately update all services, then (2) create a fresh backup. See the [backups](#improved-backups) section below for more details.
+
+## Summary
+
+Servers are not toys. They are a critical component of the computing paradigm, and their failure can be catastrophic, resulting in downtime or loss of data. From the beginning, Start9 has taken a "security and reliability first" approach to the development of StartOS, favoring soundness over speed and prioritizing essential features such as encrypted network connections, simple backups, and a reliable container runtime over nice-to-haves like custom theming and more apps.
+
+Start9 is paving new ground with StartOS, trying to achieve what most developers and IT professionals thought impossible; namely, giving a normal person the same independent control over their data and communications as an experienced Linux sysadmin.
+
+A consequence of our principled approach to development, combined with the difficulty of our endeavor, is that (1) mistakes will be made and (2) they must be corrected. That means a willingness to discard bad ideas and broken parts, and if absolutely necessary, to nuke everything and start over from scratch. We did this in 2020 with StartOS v0.2.0, again in 2022 with StartOS v0.3.0, and now in 2024 with StartOS v0.3.6.
+
+StartOS v0.3.6 is a complete rewrite of the OS internals (everything you don't see). Almost nothing survived. After nearly five years of building StartOS, we believe that we have finally arrived at the correct architecture and foundation, and that no additional rewrites will be necessary for StartOS to deliver on its promise.
+
+## Changelog
+
+- [Switch to lxc-based container runtime](#lxc)
+- [Update s9pk archive format](#new-s9pk-archive-format)
+- [Improve config](#better-config)
+- [Unify Actions](#unify-actions)
+- [Use squashfs images for OS updates](#squashfs-updates)
+- [Introduce Typescript package API and SDK](#typescript-package-api-and-sdk)
+- [Remove Postgresql](#remove-postgressql)
+- [Implement detailed progress reporting](#progress-reporting)
+- [Improve registry protocol](#registry-protocol)
+- [Replace unique .local URLs with unique ports](#lan-port-forwarding)
+- [Use start-fs Fuse module for improved backups](#improved-backups)
+- [Switch to Exver for versioning](#Exver)
+- [Support clearnet hosting via start-cli](#clearnet)
+
+### LXC
+
+StartOS now uses a nested container paradigm based on LXC for the outer container, and using linux namespaces for the inner lite containers. This replaces both Docker and Podman.
+
+### S9PK archive format
+
+The S9PK archive format has been overhauled to allow for signature verification of partial downloads, and allow direct mounting of container images without unpacking the s9pk.
+
+### Better config
+
+Expanded support for input types and a new UI makes configuring services easier and more powerful.
+
+### Actions
+
+Actions take arbitrary form input _and_ return arbitrary responses, thus satisfying the needs of both Config and Properties, which will be removed in a future release. This gives packages developers the ability to break up Config and Properties into smaller, more specific formats, or to exclude them entirely without polluting the UI.
+
+### Squashfs updates
+
+StartOS now uses squashfs images to represent OS updates. This allows for better update verification, and improved reliability over rsync updates.
+
+### Typescript package API and SDK
+
+StartOS now exposes a Typescript API. Package developers can take advantage in a simple, typesafe way using the new start-sdk. A barebones StartOS package (s9pk) can be produced in minutes with minimal knowledge or skill. More advanced developers can use the SDK to create highly customized user experiences with their service.
+
+### Remove PostgresSQL
+
+StartOS itself has miniscule data persistence needs. PostgresSQL was overkill and has been removed in favor of lightweight PatchDB.
+
+### Progress reporting
+
+A new progress reporting API enabled package developers to create unique phases and provide real-time progress reporting for actions such as installing, updating, or backing up a service.
+
+### Registry protocol
+
+The new registry protocol bifurcates package indexing (listing/validating) and package hosting (downloading). Registries are now simple indexes of packages that reference binaries hosted in arbitrary locations, locally or externally. For example, when someone visits the Start9 Registry, the currated list of packages comes from Start9. But when someone installs a listed service, the package binary is being downloaded from Github. The registry also valides the binary. This makes it much easier to host a custom registry, since it is just a currated list of services tat reference package binaries hosted on Github or elsewhere.
+
+### LAN port forwarding
+
+Perhaps the biggest complaint with prior version of StartOS was use of unique .local URLs for service interfaces. This has been corrected. Service interfaces are now available on unique ports, allowing for non-http traffic on the LAN as well as remote access via VPN.
+
+### Improved Backups
+
+The new start-fs fuse module unifies file system expectations for various platforms, enabling more reliable backups. The new system also defaults to using rsync differential backups instead of incremental backups, which is faster and saves on disk space by also deleting from the backup files that were deleted from the server.
+
+### Exver
+
+StartOS now uses Extended Versioning (Exver), which consists of three parts, separated by semicolons: (1) a Semver-compliant upstream version, (2) a Semver-compliant wrapper version, and (3) an optional "flavor" prefix. Flavors can be thought of as alternative implementations of services, where a user would only want one or the other installed, and data can feasibly be migrating beetween the two. Another common characteristic of flavors is that they satisfy the same API requirement of dependents, though this is not strictly necessary. A valid Exver looks something like this: `#knots:28.0.:1.0-beta.1`. This would translate to "the first beta release of StartOS wrapper version 1.0 of Bitcoin Knots version 27.0".
+
+### Clearnet
+
+It is now possible, and quite easy, to expose specific services interfaces to the public Internet on a standard domain using start-cli. This functionality will be expanded upon and moved into the StartOS UI in a future release.
diff --git a/core/startos/src/version/v0_3_6_alpha_6.rs b/core/startos/src/version/v0_3_6_alpha_6.rs
index 843e5a45b..d91caa82b 100644
--- a/core/startos/src/version/v0_3_6_alpha_6.rs
+++ b/core/startos/src/version/v0_3_6_alpha_6.rs
@@ -2,6 +2,7 @@ use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_3_6_alpha_5, VersionT};
+use crate::notifications::{notify, NotificationLevel};
 use crate::prelude::*;
 
 lazy_static::lazy_static! {
@@ -11,23 +12,40 @@ lazy_static::lazy_static! {
     );
 }
 
-#[derive(Clone, Copy, Debug, Default)]
+#[derive(Default, Clone, Copy, Debug)]
 pub struct Version;
 
 impl VersionT for Version {
     type Previous = v0_3_6_alpha_5::Version;
     type PreUpRes = ();
-
-    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
-        Ok(())
-    }
     fn semver(self) -> exver::Version {
         V0_3_6_alpha_6.clone()
     }
     fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
+    }
+    fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn post_up<'a>(self, ctx: &'a crate::context::RpcContext) -> Result<(), Error> {
+        let message_update = include_str!("update_details/v0_3_6.md").to_string();
+
+        ctx.db
+            .mutate(|db| {
+                notify(
+                    db,
+                    None,
+                    NotificationLevel::Success,
+                    "Welcome to StartOS 0.3.6!".to_string(),
+                    "Click \"View Details\" to learn all about the new version".to_string(),
+                    message_update,
+                )?;
+                Ok(())
+            })
+            .await?;
         Ok(())
     }
     fn down(self, _db: &mut Value) -> Result<(), Error> {
diff --git a/web/projects/ui/src/app/app.module.ts b/web/projects/ui/src/app/app.module.ts
index 048d81fe0..eb199d8a7 100644
--- a/web/projects/ui/src/app/app.module.ts
+++ b/web/projects/ui/src/app/app.module.ts
@@ -22,7 +22,6 @@ import {
 
 import { AppComponent } from './app.component'
 import { AppRoutingModule } from './app-routing.module'
-import { OSWelcomePageModule } from './modals/os-welcome/os-welcome.module'
 import { MarketplaceModule } from './marketplace.module'
 import { PreloaderModule } from './app/preloader/preloader.module'
 import { FooterModule } from './app/footer/footer.module'
@@ -47,7 +46,6 @@ import { environment } from '../environments/environment'
     PreloaderModule,
     FooterModule,
     EnterModule,
-    OSWelcomePageModule,
     MarkdownModule,
     LoadingModule,
     MonacoEditorModule,
diff --git a/web/projects/ui/src/app/components/form/control.ts b/web/projects/ui/src/app/components/form/control.ts
index c77c76ecf..5cf9d84ab 100644
--- a/web/projects/ui/src/app/components/form/control.ts
+++ b/web/projects/ui/src/app/components/form/control.ts
@@ -2,7 +2,10 @@ import { inject } from '@angular/core'
 import { FormControlComponent } from './form-control/form-control.component'
 import { IST } from '@start9labs/start-sdk'
 
-export abstract class Control<Spec extends Exclude<IST.ValueSpec, IST.ValueSpecHidden>, Value> {
+export abstract class Control<
+  Spec extends Exclude<IST.ValueSpec, IST.ValueSpecHidden>,
+  Value,
+> {
   private readonly control: FormControlComponent<Spec, Value> =
     inject(FormControlComponent)
 
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.component.html b/web/projects/ui/src/app/components/form/form-control/form-control.component.html
index dd3cf2b89..731d64a63 100644
--- a/web/projects/ui/src/app/components/form/form-control/form-control.component.html
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.component.html
@@ -36,4 +36,4 @@
       Accept
     </button>
   </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts b/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
index 62e1ff6aa..f61ac092d 100644
--- a/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
+++ b/web/projects/ui/src/app/components/form/form-control/form-control.providers.ts
@@ -12,7 +12,12 @@ export const FORM_CONTROL_PROVIDERS: Provider[] = [
   {
     provide: TUI_VALIDATION_ERRORS,
     deps: [forwardRef(() => FormControlComponent)],
-    useFactory: (control: FormControlComponent<Exclude<IST.ValueSpec, IST.ValueSpecHidden>, string>) => ({
+    useFactory: (
+      control: FormControlComponent<
+        Exclude<IST.ValueSpec, IST.ValueSpecHidden>,
+        string
+      >,
+    ) => ({
       required: 'Required',
       pattern: ({ requiredPattern }: ValidatorsPatternError) =>
         ('patterns' in control.spec &&
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.module.ts b/web/projects/ui/src/app/modals/os-welcome/os-welcome.module.ts
deleted file mode 100644
index 3e910403e..000000000
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { IonicModule } from '@ionic/angular'
-import { OSWelcomePage } from './os-welcome.page'
-import { SharedPipesModule } from '@start9labs/shared'
-import { FormsModule } from '@angular/forms'
-
-@NgModule({
-  declarations: [OSWelcomePage],
-  imports: [CommonModule, IonicModule, FormsModule, SharedPipesModule],
-  exports: [OSWelcomePage],
-})
-export class OSWelcomePageModule {}
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
deleted file mode 100644
index 0b06c4a90..000000000
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>Release Notes</ion-title>
-    <ion-buttons slot="end">
-      <ion-button (click)="dismiss()">
-        <ion-icon slot="icon-only" name="close"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="ion-padding">
-  <h2>This Release</h2>
-
-  <h4>0.3.6-alpha.8</h4>
-  <h6>This is an ALPHA release! DO NOT use for production data!</h6>
-  <h6>
-    Expect that any data you create or store on this version of the OS can be
-    LOST FOREVER!
-  </h6>
-
-  <div class="ion-text-center ion-padding">
-    <ion-button
-      fill="solid"
-      color="primary"
-      (click)="dismiss()"
-      class="enter-click btn-128"
-    >
-      Begin
-    </ion-button>
-  </div>
-</ion-content>
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss
deleted file mode 100644
index 0dc939f99..000000000
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-.close-button {
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  min-height: 100px;
-}
-
-.main-content {
-  color: var(--ion-color-dark);
-}
-
-.spaced-list {
-  li {
-    padding-bottom: 12px;
-  }
-}
-
-.note-padding {
-  padding-bottom: 12px;
-}
-
-h2 {
-  font-weight: bold;
-}
-
-h4 {
-  font-style: italic;
-}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.ts b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.ts
deleted file mode 100644
index f9a6ecd7b..000000000
--- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, Input } from '@angular/core'
-import { ModalController } from '@ionic/angular'
-
-@Component({
-  selector: 'os-welcome',
-  templateUrl: './os-welcome.page.html',
-  styleUrls: ['./os-welcome.page.scss'],
-})
-export class OSWelcomePage {
-  constructor(private readonly modalCtrl: ModalController) {}
-
-  async dismiss() {
-    return this.modalCtrl.dismiss()
-  }
-}
diff --git a/web/projects/ui/src/app/pages/notifications/notifications.page.html b/web/projects/ui/src/app/pages/notifications/notifications.page.html
index fb3ba0883..a00fb76cb 100644
--- a/web/projects/ui/src/app/pages/notifications/notifications.page.html
+++ b/web/projects/ui/src/app/pages/notifications/notifications.page.html
@@ -115,6 +115,15 @@ <h2 class="notification-message">{{ truncate(not.message) }}</h2>
           >
             View Report
           </ion-button>
+          <ion-button
+            *ngIf="not.code === 2"
+            slot="end"
+            fill="clear"
+            color="dark"
+            (click)="presentModalMarkdown(not)"
+          >
+            View Details
+          </ion-button>
           <ion-button
             *ngIf="not.packageId && packageData[not.packageId]"
             slot="end"
diff --git a/web/projects/ui/src/app/pages/notifications/notifications.page.ts b/web/projects/ui/src/app/pages/notifications/notifications.page.ts
index 69bad6c29..8c5945b08 100644
--- a/web/projects/ui/src/app/pages/notifications/notifications.page.ts
+++ b/web/projects/ui/src/app/pages/notifications/notifications.page.ts
@@ -1,7 +1,11 @@
 import { Component } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { AlertController, ModalController } from '@ionic/angular'
-import { ErrorService, LoadingService } from '@start9labs/shared'
+import {
+  ErrorService,
+  LoadingService,
+  MarkdownComponent,
+} from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
 import { first } from 'rxjs'
 import { BackupReportPage } from 'src/app/modals/backup-report/backup-report.page'
@@ -115,6 +119,18 @@ export class NotificationsPage {
     await modal.present()
   }
 
+  async presentModalMarkdown(not: ServerNotification<2>) {
+    const modal = await this.modalCtrl.create({
+      componentProps: {
+        title: not.title,
+        content: not.data,
+      },
+      component: MarkdownComponent,
+    })
+
+    await modal.present()
+  }
+
   async viewFullMessage(header: string, message: string) {
     const alert = await this.alertCtrl.create({
       header,
@@ -134,7 +150,7 @@ export class NotificationsPage {
   }
 
   truncate(message: string): string {
-    return message.length <= 240 ? message : '...' + message.substr(-240)
+    return message.length <= 240 ? message : message.substring(0, 160) + '...'
   }
 
   getColor({ level }: ServerNotification<number>): string {
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index 2f93b3e28..a3562caa6 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -9,6 +9,8 @@ import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
 import { T, ISB, IST } from '@start9labs/start-sdk'
 import { GetPackagesRes } from '@start9labs/marketplace'
 
+import markdown from 'raw-loader!../../../../../shared/assets/markdown/md-sample.md'
+
 const mockMerkleArchiveCommitment: T.MerkleArchiveCommitment = {
   rootSighash: 'fakehash',
   rootMaxsize: 0,
@@ -759,7 +761,7 @@ export module Mock {
       id: 2,
       packageId: null,
       createdAt: '2019-12-26T14:20:30.872Z',
-      code: 2,
+      code: 0,
       level: NotificationLevel.Warning,
       title: 'SSH Key Added',
       message: 'A new SSH key was added. If you did not do this, shit is bad.',
@@ -769,7 +771,7 @@ export module Mock {
       id: 3,
       packageId: null,
       createdAt: '2019-12-26T14:20:30.872Z',
-      code: 3,
+      code: 0,
       level: NotificationLevel.Info,
       title: 'SSH Key Removed',
       message: 'A SSH key was removed.',
@@ -779,7 +781,7 @@ export module Mock {
       id: 4,
       packageId: 'bitcoind',
       createdAt: '2019-12-26T14:20:30.872Z',
-      code: 4,
+      code: 0,
       level: NotificationLevel.Error,
       title: 'Service Crashed',
       message: new Array(40)
@@ -792,6 +794,16 @@ export module Mock {
         .join(''),
       data: null,
     },
+    {
+      id: 5,
+      packageId: null,
+      createdAt: '2019-12-26T14:20:30.872Z',
+      code: 2,
+      level: NotificationLevel.Success,
+      title: 'Welcome to StartOS 0.3.6!',
+      message: 'Click "View Details" to learn all about the new version',
+      data: markdown,
+    },
   ]
 
   export function getServerMetrics() {
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index fcf375913..9120a2df7 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -442,6 +442,8 @@ export type NotificationData<T> = T extends 0
   ? null
   : T extends 1
   ? BackupReport
+  : T extends 2
+  ? string
   : any
 
 export interface BackupReport {
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index aea6b5828..81e316b56 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -6,7 +6,6 @@ const version = require('../../../../../../package.json').version
 export const mockPatchData: DataModel = {
   ui: {
     name: `Matt's Server`,
-    ackWelcome: '1.0.0',
     theme: 'Dark',
     widgets: BUILT_IN_WIDGETS.filter(
       ({ id }) =>
diff --git a/web/projects/ui/src/app/services/patch-data.service.ts b/web/projects/ui/src/app/services/patch-data.service.ts
index 50023c1f1..35728c9ec 100644
--- a/web/projects/ui/src/app/services/patch-data.service.ts
+++ b/web/projects/ui/src/app/services/patch-data.service.ts
@@ -1,13 +1,9 @@
 import { Inject, Injectable } from '@angular/core'
-import { ModalController } from '@ionic/angular'
 import { Observable } from 'rxjs'
-import { filter, map, share, switchMap, take, tap } from 'rxjs/operators'
+import { filter, map, share, switchMap, take } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { EOSService } from 'src/app/services/eos.service'
-import { OSWelcomePage } from 'src/app/modals/os-welcome/os-welcome.page'
-import { ConfigService } from 'src/app/services/config.service'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { ConnectionService } from 'src/app/services/connection.service'
@@ -27,8 +23,6 @@ export class PatchDataService extends Observable<void> {
       if (index === 0) {
         // check for updates to StartOS and services
         this.checkForUpdates()
-        // show eos welcome message
-        this.showEosWelcome(cache.ui.ackWelcome)
       }
     }),
     share(),
@@ -37,9 +31,6 @@ export class PatchDataService extends Observable<void> {
   constructor(
     private readonly patch: PatchDB<DataModel>,
     private readonly eosService: EOSService,
-    private readonly config: ConfigService,
-    private readonly modalCtrl: ModalController,
-    private readonly embassyApi: ApiService,
     @Inject(AbstractMarketplaceService)
     private readonly marketplaceService: MarketplaceService,
     private readonly connection$: ConnectionService,
@@ -52,23 +43,4 @@ export class PatchDataService extends Observable<void> {
     this.eosService.loadEos()
     this.marketplaceService.getMarketplace$().pipe(take(1)).subscribe()
   }
-
-  private async showEosWelcome(ackVersion: string): Promise<void> {
-    if (this.config.skipStartupAlerts || ackVersion === this.config.version) {
-      return
-    }
-
-    const modal = await this.modalCtrl.create({
-      component: OSWelcomePage,
-      presentingElement: await this.modalCtrl.getTop(),
-      backdropDismiss: false,
-    })
-    modal.onWillDismiss().then(() => {
-      this.embassyApi
-        .setDbValue<string>(['ackWelcome'], this.config.version)
-        .catch()
-    })
-
-    await modal.present()
-  }
 }
diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts
index d7deb31df..01f80c3a7 100644
--- a/web/projects/ui/src/app/services/patch-db/data-model.ts
+++ b/web/projects/ui/src/app/services/patch-db/data-model.ts
@@ -7,7 +7,6 @@ export type DataModel = T.Public & {
 
 export interface UIData {
   name: string | null
-  ackWelcome: string // eOS emver
   marketplace: UIMarketplaceData
   gaming: {
     snake: {

From 7a96e944919ca3687e626c439a881f77e11b003a Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Mon, 2 Dec 2024 13:58:28 -0700
Subject: [PATCH 329/341] More SDK comments (#2796)

* sdk tweaks

* switch back to deeppartial

* WIP, update comments

* reinstall chesterton's fence

* more comments

* delete extra package.lock

* handle TODOs

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/src/action.rs                    | 10 +++++++
 core/startos/src/db/model/package.rs          | 12 ++++++++
 sdk/base/lib/osBindings/ActionMetadata.ts     | 24 +++++++++++++++
 sdk/base/lib/osBindings/ActionResultMember.ts | 26 ++++++++++++++++-
 sdk/base/lib/osBindings/ActionResultV1.ts     |  9 ++++++
 sdk/base/lib/osBindings/ActionResultValue.ts  | 20 ++++++++++++-
 sdk/package-lock.json                         |  6 ----
 sdk/package/lib/mainFn/Daemons.ts             | 29 ++++++++++++++++++-
 sdk/package/lib/mainFn/Mounts.ts              | 12 ++++++++
 sdk/package/lib/test/inputSpecBuilder.test.ts |  2 --
 10 files changed, 139 insertions(+), 11 deletions(-)
 delete mode 100644 sdk/package-lock.json

diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index d0748265b..801360a44 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -124,15 +124,20 @@ impl fmt::Display for ActionResultV0 {
 #[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 pub struct ActionResultV1 {
+    /// Primary text to display as the header of the response modal. e.g. "Success!", "Name Updated", or "Service Information", whatever makes sense
     pub title: String,
+    /// (optional) A general message for the user, just under the title
     pub message: Option<String>,
+    /// (optional) Structured data to present inside the modal
     pub result: Option<ActionResultValue>,
 }
 
 #[derive(Debug, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 pub struct ActionResultMember {
+    /// A human-readable name or title of the value, such as "Last Active" or "Login Password"
     pub name: String,
+    /// (optional) A description of the value, such as an explaining why it exists or how to use it
     pub description: Option<String>,
     #[serde(flatten)]
     #[ts(flatten)]
@@ -145,12 +150,17 @@ pub struct ActionResultMember {
 #[serde(tag = "type")]
 pub enum ActionResultValue {
     Single {
+        /// The actual string value to display
         value: String,
+        /// Whether or not to include a copy to clipboard icon to copy the value
         copyable: bool,
+        /// Whether or not to also display the value as a QR code
         qr: bool,
+        /// Whether or not to mask the value using ●●●●●●●, which is useful for password or other sensitive information
         masked: bool,
     },
     Group {
+        /// An new group of nested values, experienced by the user as an accordion dropdown
         value: Vec<ActionResultMember>,
     },
 }
diff --git a/core/startos/src/db/model/package.rs b/core/startos/src/db/model/package.rs
index df5773cc3..6f1155311 100644
--- a/core/startos/src/db/model/package.rs
+++ b/core/startos/src/db/model/package.rs
@@ -322,13 +322,25 @@ pub enum AllowedStatuses {
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct ActionMetadata {
+    /// A human-readable name
     pub name: String,
+    /// A detailed description of what the action will do
     pub description: String,
+    /// Presents as an alert prior to executing the action. Should be used sparingly but important if the action could have harmful, unintended consequences
     pub warning: Option<String>,
     #[serde(default)]
+    /// One of: "enabled", "hidden", or { disabled: "" }
+    ///   - "enabled" - the action is available be run
+    ///   - "hidden" - the action cannot be seen or run
+    ///   - { disabled: "example explanation" } means the action is visible but cannot be run. Replace "example explanation" with a reason why the action is disable to prevent user confusion.
     pub visibility: ActionVisibility,
+    /// One of: "only-stopped", "only-running", "all"
+    ///   - "only-stopped" - the action can only be run when the service is stopped
+    ///   - "only-running" - the action can only be run when the service is running
+    ///   - "any" - the action can only be run regardless of the service's status
     pub allowed_statuses: AllowedStatuses,
     pub has_input: bool,
+    /// If provided, this action will be nested under a header of this value, along with other actions of the same group
     pub group: Option<String>,
 }
 
diff --git a/sdk/base/lib/osBindings/ActionMetadata.ts b/sdk/base/lib/osBindings/ActionMetadata.ts
index ade129fd4..01809ab57 100644
--- a/sdk/base/lib/osBindings/ActionMetadata.ts
+++ b/sdk/base/lib/osBindings/ActionMetadata.ts
@@ -3,11 +3,35 @@ import type { ActionVisibility } from "./ActionVisibility"
 import type { AllowedStatuses } from "./AllowedStatuses"
 
 export type ActionMetadata = {
+  /**
+   * A human-readable name
+   */
   name: string
+  /**
+   * A detailed description of what the action will do
+   */
   description: string
+  /**
+   * Presents as an alert prior to executing the action. Should be used sparingly but important if the action could have harmful, unintended consequences
+   */
   warning: string | null
+  /**
+   * One of: "enabled", "hidden", or { disabled: "" }
+   *   - "enabled" - the action is available be run
+   *   - "hidden" - the action cannot be seen or run
+   *   - { disabled: "example explanation" } means the action is visible but cannot be run. Replace "example explanation" with a reason why the action is disable to prevent user confusion.
+   */
   visibility: ActionVisibility
+  /**
+   * One of: "only-stopped", "only-running", "all"
+   *   - "only-stopped" - the action can only be run when the service is stopped
+   *   - "only-running" - the action can only be run when the service is running
+   *   - "any" - the action can only be run regardless of the service's status
+   */
   allowedStatuses: AllowedStatuses
   hasInput: boolean
+  /**
+   * If provided, this action will be nested under a header of this value, along with other actions of the same group
+   */
   group: string | null
 }
diff --git a/sdk/base/lib/osBindings/ActionResultMember.ts b/sdk/base/lib/osBindings/ActionResultMember.ts
index cdc23ecaa..c27a6a3a9 100644
--- a/sdk/base/lib/osBindings/ActionResultMember.ts
+++ b/sdk/base/lib/osBindings/ActionResultMember.ts
@@ -1,15 +1,39 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export type ActionResultMember = {
+  /**
+   * A human-readable name or title of the value, such as "Last Active" or "Login Password"
+   */
   name: string
+  /**
+   * (optional) A description of the value, such as an explaining why it exists or how to use it
+   */
   description: string | null
 } & (
   | {
       type: "single"
+      /**
+       * The actual string value to display
+       */
       value: string
+      /**
+       * Whether or not to include a copy to clipboard icon to copy the value
+       */
       copyable: boolean
+      /**
+       * Whether or not to also display the value as a QR code
+       */
       qr: boolean
+      /**
+       * Whether or not to mask the value using ●●●●●●●, which is useful for password or other sensitive information
+       */
       masked: boolean
     }
-  | { type: "group"; value: Array<ActionResultMember> }
+  | {
+      type: "group"
+      /**
+       * An new group of nested values, experienced by the user as an accordion dropdown
+       */
+      value: Array<ActionResultMember>
+    }
 )
diff --git a/sdk/base/lib/osBindings/ActionResultV1.ts b/sdk/base/lib/osBindings/ActionResultV1.ts
index eece18477..ee06ebab9 100644
--- a/sdk/base/lib/osBindings/ActionResultV1.ts
+++ b/sdk/base/lib/osBindings/ActionResultV1.ts
@@ -2,7 +2,16 @@
 import type { ActionResultValue } from "./ActionResultValue"
 
 export type ActionResultV1 = {
+  /**
+   * Primary text to display as the header of the response modal. e.g. "Success!", "Name Updated", or "Service Information", whatever makes sense
+   */
   title: string
+  /**
+   * (optional) A general message for the user, just under the title
+   */
   message: string | null
+  /**
+   * (optional) Structured data to present inside the modal
+   */
   result: ActionResultValue | null
 }
diff --git a/sdk/base/lib/osBindings/ActionResultValue.ts b/sdk/base/lib/osBindings/ActionResultValue.ts
index d1cb6c8c3..3ffabef8b 100644
--- a/sdk/base/lib/osBindings/ActionResultValue.ts
+++ b/sdk/base/lib/osBindings/ActionResultValue.ts
@@ -4,9 +4,27 @@ import type { ActionResultMember } from "./ActionResultMember"
 export type ActionResultValue =
   | {
       type: "single"
+      /**
+       * The actual string value to display
+       */
       value: string
+      /**
+       * Whether or not to include a copy to clipboard icon to copy the value
+       */
       copyable: boolean
+      /**
+       * Whether or not to also display the value as a QR code
+       */
       qr: boolean
+      /**
+       * Whether or not to mask the value using ●●●●●●●, which is useful for password or other sensitive information
+       */
       masked: boolean
     }
-  | { type: "group"; value: Array<ActionResultMember> }
+  | {
+      type: "group"
+      /**
+       * An new group of nested values, experienced by the user as an accordion dropdown
+       */
+      value: Array<ActionResultMember>
+    }
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
deleted file mode 100644
index 9699e0851..000000000
--- a/sdk/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "sdk",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}
diff --git a/sdk/package/lib/mainFn/Daemons.ts b/sdk/package/lib/mainFn/Daemons.ts
index cefa06698..495e6c527 100644
--- a/sdk/package/lib/mainFn/Daemons.ts
+++ b/sdk/package/lib/mainFn/Daemons.ts
@@ -19,7 +19,22 @@ import { CommandController } from "./CommandController"
 export const cpExec = promisify(CP.exec)
 export const cpExecFile = promisify(CP.execFile)
 export type Ready = {
+  /** A human-readable display name for the health check. If null, the health check itself will be from the UI */
   display: string | null
+  /**
+   * @description The function to determine the health status of the daemon
+   * 
+   *   The SDK provides some built-in health checks. To see them, type sdk.healthCheck.
+   * 
+   * @example
+   * ```
+    fn: () =>
+      sdk.healthCheck.checkPortListening(effects, 80, {
+        successMessage: 'service listening on port 80',
+        errorMessage: 'service is unreachable',
+      })
+  * ```
+  */
   fn: (
     spawnable: ExecSpawnable,
   ) => Promise<HealthCheckResult> | HealthCheckResult
@@ -32,11 +47,23 @@ type DaemonsParams<
   Command extends string,
   Id extends string,
 > = {
+  /** The command line command to start the daemon */
   command: T.CommandType
-  image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean }
+  /** Information about the image in which the daemon runs */
+  image: {
+    /** The ID of the image. Must be one of the image IDs declared in the manifest */
+    id: keyof Manifest["images"] & T.ImageId
+    /**
+     * Whether or not to share the `/run` directory with the parent container.
+     * This is useful if you are trying to connect to a service that exposes a unix domain socket or auth cookie via the `/run` directory
+     */
+    sharedRun?: boolean
+  }
+  /** For mounting the necessary volumes. Syntax: sdk.Mounts.of().addVolume() */
   mounts: Mounts<Manifest>
   env?: Record<string, string>
   ready: Ready
+  /** An array of IDs of prior daemons whose successful initializations are required before this daemon will initialize */
   requires: Exclude<Ids, Id>[]
   sigtermTimeout?: number
   onStdout?: (chunk: Buffer | string | any) => void
diff --git a/sdk/package/lib/mainFn/Mounts.ts b/sdk/package/lib/mainFn/Mounts.ts
index 38b3ce2a7..799140871 100644
--- a/sdk/package/lib/mainFn/Mounts.ts
+++ b/sdk/package/lib/mainFn/Mounts.ts
@@ -30,9 +30,13 @@ export class Mounts<Manifest extends T.SDKManifest> {
   }
 
   addVolume(
+    /** The ID of the volume to mount. Must be one of the volume IDs defined in the manifest */
     id: Manifest["volumes"][number],
+    /** The path within the volume to mount. Use `null` to mount the entire volume */
     subpath: string | null,
+    /** Where to mount the volume. e.g. /data */
     mountpoint: string,
+    /** Whether or not the volume should be readonly for this daemon */
     readonly: boolean,
   ) {
     this.volumes.push({
@@ -45,8 +49,11 @@ export class Mounts<Manifest extends T.SDKManifest> {
   }
 
   addAssets(
+    /** The ID of the asset directory to mount. This is typically the same as the folder name in your assets directory */
     id: Manifest["assets"][number],
+    /** The path within the asset directory to mount. Use `null` to mount the entire volume */
     subpath: string | null,
+    /** Where to mount the asset. e.g. /asset */
     mountpoint: string,
   ) {
     this.assets.push({
@@ -58,10 +65,15 @@ export class Mounts<Manifest extends T.SDKManifest> {
   }
 
   addDependency<DependencyManifest extends T.SDKManifest>(
+    /** The ID of the dependency service */
     dependencyId: keyof Manifest["dependencies"] & string,
+    /** The ID of the volume belonging to the dependency service to mount */
     volumeId: DependencyManifest["volumes"][number],
+    /** The path within the dependency's volume to mount. Use `null` to mount the entire volume */
     subpath: string | null,
+    /** Where to mount the dependency's volume. e.g. /service-id */
     mountpoint: string,
+    /** Whether or not the volume should be readonly for this daemon */
     readonly: boolean,
   ) {
     this.dependencies.push({
diff --git a/sdk/package/lib/test/inputSpecBuilder.test.ts b/sdk/package/lib/test/inputSpecBuilder.test.ts
index 27869067d..4179a9f04 100644
--- a/sdk/package/lib/test/inputSpecBuilder.test.ts
+++ b/sdk/package/lib/test/inputSpecBuilder.test.ts
@@ -6,8 +6,6 @@ import { Variants } from "../../../base/lib/actions/input/builder/variants"
 import { ValueSpec } from "../../../base/lib/actions/input/inputSpecTypes"
 import { setupManifest } from "../manifest/setupManifest"
 import { StartSdk } from "../StartSdk"
-import { VersionGraph } from "../version/VersionGraph"
-import { VersionInfo } from "../version/VersionInfo"
 
 describe("builder tests", () => {
   test("text", async () => {

From f48750c22cd9c1a0070ef740e2d1278592b4f3b1 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:03:40 -0700
Subject: [PATCH 330/341] v0.3.6-alpha.9 (#2795)

* v0.3.6-alpha.9

* fix raspi build

* backup kernel still .51
---
 core/Cargo.lock                            |  2 +-
 core/startos/Cargo.toml                    |  2 +-
 core/startos/src/version/mod.rs            |  6 +++-
 core/startos/src/version/v0_3_6_alpha_9.rs | 36 ++++++++++++++++++++++
 image-recipe/build.sh                      |  4 +--
 web/package-lock.json                      |  4 +--
 web/package.json                           |  2 +-
 web/patchdb-ui-seed.json                   |  2 +-
 8 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 core/startos/src/version/v0_3_6_alpha_9.rs

diff --git a/core/Cargo.lock b/core/Cargo.lock
index 498e5903e..cdafe81a1 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5371,7 +5371,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.8"
+version = "0.3.6-alpha.9"
 dependencies = [
  "aes",
  "async-acme",
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index e2a20a0a1..cba5bc6dc 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.8"
+version = "0.3.6-alpha.9"
 license = "MIT"
 
 [lib]
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index f71cec8b3..94b61176b 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -27,8 +27,9 @@ mod v0_3_6_alpha_5;
 mod v0_3_6_alpha_6;
 mod v0_3_6_alpha_7;
 mod v0_3_6_alpha_8;
+mod v0_3_6_alpha_9;
 
-pub type Current = v0_3_6_alpha_8::Version; // VERSION_BUMP
+pub type Current = v0_3_6_alpha_9::Version; // VERSION_BUMP
 
 impl Current {
     #[instrument(skip(self, db))]
@@ -106,6 +107,7 @@ enum Version {
     V0_3_6_alpha_6(Wrapper<v0_3_6_alpha_6::Version>),
     V0_3_6_alpha_7(Wrapper<v0_3_6_alpha_7::Version>),
     V0_3_6_alpha_8(Wrapper<v0_3_6_alpha_8::Version>),
+    V0_3_6_alpha_9(Wrapper<v0_3_6_alpha_9::Version>),
     Other(exver::Version),
 }
 
@@ -138,6 +140,7 @@ impl Version {
             Self::V0_3_6_alpha_6(v) => DynVersion(Box::new(v.0)),
             Self::V0_3_6_alpha_7(v) => DynVersion(Box::new(v.0)),
             Self::V0_3_6_alpha_8(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_9(v) => DynVersion(Box::new(v.0)),
             Self::Other(v) => {
                 return Err(Error::new(
                     eyre!("unknown version {v}"),
@@ -162,6 +165,7 @@ impl Version {
             Version::V0_3_6_alpha_6(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_7(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_8(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_9(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
diff --git a/core/startos/src/version/v0_3_6_alpha_9.rs b/core/startos/src/version/v0_3_6_alpha_9.rs
new file mode 100644
index 000000000..e01ad298e
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_9.rs
@@ -0,0 +1,36 @@
+use exver::{PreReleaseSegment, VersionRange};
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_8, VersionT};
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_9: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 9.into()]
+    );
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_8::Version;
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
+    }
+    fn semver(self) -> exver::Version {
+        V0_3_6_alpha_9.clone()
+    }
+    fn compat(self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    fn up(self, _: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+        Ok(())
+    }
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index ae1831704..4ce2d6dac 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -206,8 +206,8 @@ if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 		echo "Configuring raspi kernel '\$v'"
     	extract-ikconfig "/usr/lib/modules/\$v/kernel/kernel/configs.ko.xz" > /boot/config-\$v
 	done
-	mkinitramfs -c gzip -o /boot/initramfs8 6.6.51-v8+
-	mkinitramfs -c gzip -o /boot/initramfs_2712 6.6.51-v8-16k+
+	mkinitramfs -c gzip -o /boot/initramfs8 6.6.62-v8+
+	mkinitramfs -c gzip -o /boot/initramfs_2712 6.6.62-v8-16k+
 fi
 
 useradd --shell /bin/bash -G embassy -m start9
diff --git a/web/package-lock.json b/web/package-lock.json
index 764694127..a36b7511e 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.8",
+  "version": "0.3.6-alpha.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "startos-ui",
-      "version": "0.3.6-alpha.8",
+      "version": "0.3.6-alpha.9",
       "license": "MIT",
       "dependencies": {
         "@angular/animations": "^14.1.0",
diff --git a/web/package.json b/web/package.json
index e8aafc8c7..3f3709e11 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.8",
+  "version": "0.3.6-alpha.9",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index c6b967e29..bf6ad5b13 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -21,5 +21,5 @@
   "ackInstructions": {},
   "theme": "Dark",
   "widgets": [],
-  "ack-welcome": "0.3.6-alpha.8"
+  "ack-welcome": "0.3.6-alpha.9"
 }

From ef28b01286d212ffbad8c91c9c124c0948696c77 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Mon, 2 Dec 2024 16:58:39 -0700
Subject: [PATCH 331/341] delete patch dump and ack-welcome references

---
 Makefile                 |   4 -
 code                     | 690 ---------------------------------------
 web/patchdb-ui-seed.json |   5 +-
 3 files changed, 1 insertion(+), 698 deletions(-)
 delete mode 100644 code

diff --git a/Makefile b/Makefile
index 132270636..e0f89f3f9 100644
--- a/Makefile
+++ b/Makefile
@@ -304,10 +304,6 @@ $(COMPRESSED_WEB_UIS): $(WEB_UIS) $(ENVIRONMENT_FILE)
 web/config.json: $(GIT_HASH_FILE) web/config-sample.json
 	jq '.useMocks = false' web/config-sample.json | jq '.gitHash = "$(shell cat GIT_HASH.txt)"' > web/config.json
 
-web/patchdb-ui-seed.json: web/package.json
-	jq '."ack-welcome" = $(shell jq '.version' web/package.json)' web/patchdb-ui-seed.json > ui-seed.tmp
-	mv ui-seed.tmp web/patchdb-ui-seed.json
-
 patch-db/client/node_modules/.package-lock.json: patch-db/client/package.json
 	npm --prefix patch-db/client ci
 	touch patch-db/client/node_modules/.package-lock.json
diff --git a/code b/code
deleted file mode 100644
index 2a071fb30..000000000
--- a/code
+++ /dev/null
@@ -1,690 +0,0 @@
-{
-  "id": 4228,
-  "value": {
-    "serverInfo": {
-      "arch": "x86_64",
-      "platform": "x86_64",
-      "id": "81260ce3-b6f2-471e-a77e-0250c11fb907",
-      "hostname": "tasty-mahogany",
-      "version": "0.3.6-alpha.7",
-      "lastBackup": null,
-      "lanAddress": "https://tasty-mahogany.local/",
-      "postInitMigrationTodos": [],
-      "torAddress": "https://4iqvmnjyqlqiq2nfavk7emhyjwhq6s454oubur4givisxblfdwxfj6ad.onion/",
-      "onionAddress": "4iqvmnjyqlqiq2nfavk7emhyjwhq6s454oubur4givisxblfdwxfj6ad",
-      "ipInfo": {
-        "enp8s0": {
-          "ipv4Range": "192.168.122.86/24",
-          "ipv6Range": null,
-          "ipv4": "192.168.122.86",
-          "ipv6": null
-        }
-      },
-      "statusInfo": {
-        "backupProgress": null,
-        "updated": false,
-        "updateProgress": null,
-        "shuttingDown": false,
-        "restarting": false
-      },
-      "wifi": {
-        "ssids": [],
-        "selected": null,
-        "interface": null,
-        "lastRegion": null
-      },
-      "unreadNotificationCount": 0,
-      "passwordHash": "$argon2id$v=19$m=65536,t=3,p=1$qZNXS7Xk+qeOfi7ZO18OpA$VHr96ABySCvi/fa5p+N+SY8XJ/FyhxVp3LlBxmxQa6Y",
-      "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1ThH4SGEGzCFoKlkmMw3tNXvx975xXKEn/dNnBDEGb",
-      "caFingerprint": "88:CF:91:19:FC:35:18:E8:B1:8E:B1:36:53:B2:22:6A:EA:5B:58:E6:35:7A:A5:82:1B:39:1:D5:E4:F8:57:3C",
-      "ntpSynced": true,
-      "zram": true,
-      "governor": null,
-      "smtp": null,
-      "devices": [
-        {
-          "class": "processor",
-          "product": "AMD Ryzen 9 5950X 16-Core Processor"
-        },
-        {
-          "class": "processor",
-          "product": "AMD Ryzen 9 5950X 16-Core Processor"
-        },
-        {
-          "class": "processor",
-          "product": "AMD Ryzen 9 5950X 16-Core Processor"
-        },
-        {
-          "class": "processor",
-          "product": "AMD Ryzen 9 5950X 16-Core Processor"
-        },
-        {
-          "class": "processor",
-          "product": "AMD Ryzen 9 5950X 16-Core Processor"
-        },
-        {
-          "class": "processor",
-          "product": "AMD Ryzen 9 5950X 16-Core Processor"
-        },
-        {
-          "class": "display",
-          "product": "Virtio 1.0 GPU"
-        }
-      ],
-      "packageVersionCompat": ">=0.3.0:0 <=0.3.6-alpha.7:0",
-      "ram": 10285481984
-    },
-    "packageData": {
-      "vaultwarden": {
-        "stateInfo": {
-          "state": "installed",
-          "manifest": {
-            "id": "vaultwarden",
-            "title": "Vaultwarden",
-            "version": "1.32.1:0",
-            "satisfies": [],
-            "releaseNotes": "* Updated to the latest upstream code with notable changes:\n  - Fixed syncing and login issues with native mobile clients\n* Full change log available [here](https://github.com/dani-garcia/vaultwarden/releases/tag/1.32.1)",
-            "canMigrateTo": "!",
-            "canMigrateFrom": "*",
-            "license": "AGPLv3",
-            "wrapperRepo": "https://github.com/Start9Labs/vaultwarden-startos",
-            "upstreamRepo": "https://github.com/dani-garcia/vaultwarden",
-            "supportSite": "https://vaultwarden.discourse.group/",
-            "marketingSite": "https://github.com/dani-garcia/vaultwarden/",
-            "donationUrl": "https://www.paypal.com/paypalme/DaniGG",
-            "description": {
-              "short": "Secure password management",
-              "long": "Vaultwarden is a lightweight and secure password manager for storing and auto-filling sensitive information such as usernames and passwords, credit cards, identities, and notes. It is an alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients. All data is stored in an encrypted vault on your server."
-            },
-            "images": {
-              "main": {
-                "source": "packed",
-                "arch": [
-                  "aarch64",
-                  "x86_64"
-                ],
-                "emulateMissingAs": null
-              }
-            },
-            "assets": [],
-            "volumes": [
-              "main"
-            ],
-            "alerts": {
-              "install": null,
-              "uninstall": null,
-              "restore": null,
-              "start": null,
-              "stop": null
-            },
-            "dependencies": {},
-            "hardwareRequirements": {
-              "device": [],
-              "ram": null,
-              "arch": [
-                "aarch64",
-                "x86_64"
-              ]
-            },
-            "gitHash": "74a504429097e933285782e1e4c425da5895d516\n",
-            "osVersion": "0.3.5.1"
-          }
-        },
-        "dataVersion": null,
-        "status": {
-          "main": "error",
-          "debug": "Error { source: \n   0: \u001b[91minvalid type: map, expected a sequence at line 1 column 1353\u001b[0m\n\nLocation:\n   \u001b[35m/home/rust/src/core/models/src/errors.rs\u001b[0m:\u001b[35m509\u001b[0m\n\n  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n   0: \u001b[91mstartos::s9pk::v2\u001b[0m\u001b[91m::\u001b[0m\u001b[91mdeserialize\u001b[0m\n      at \u001b[35mstartos/src/s9pk/v2/mod.rs\u001b[0m:\u001b[35m265\u001b[0m\n   1: \u001b[91mstartos::service\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/mod.rs\u001b[0m:\u001b[35m271\u001b[0m\n   2: \u001b[91mstartos::service::service_map\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/service_map.rs\u001b[0m:\u001b[35m80\u001b[0m\n\nBacktrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.\nRun with RUST_BACKTRACE=full to include source snippets., kind: Deserialization, revision: None }",
-          "message": "Deserialization Error: invalid type: map, expected a sequence at line 1 column 1353",
-          "onRebuild": "start"
-        },
-        "registry": null,
-        "developerKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAIwXjctXTc37QTXRYWxLxElY1r2NhoKJRrl604Nu/0l4=\n-----END PUBLIC KEY-----\n",
-        "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAAflBMVEUAAADh4eHZ2dnZ2dna2trZ2dnc3NzZ2dna2trZ2dnZ2dnZ2dna2trc3Nza2trb29vZ2dna2trZ2dna2trZ2dna2trZ2dkAAAA2NjaHh4dra2vR0dEaGhqjo6NeXl7Ly8u9vb0oKChGRkaxsbGXl5dRUVF7e3vFxcWpqal0dHSQl0TIAAAAFnRSTlMADejca/IbzkXAsoBeJpJUnjqmdYgyp8THagAAKQJJREFUeNrs2ttygyAUBVBAkKsoak6mfenk/3+y6VMvYyeaqAGz1y+wOZcBBgDwEnidTJDex663tvqi6EpVV9pa23ed9zK0puEMDoM3JvjOakFLVNp2PiAKJeNJ+l4LeozQLkpTMyhIbWS0gtakdD8gBgU4taMTtBVlozwxyFMToqY96CgbBjnhZnCK9qScNxgQs8CNt/QcekQIniwtPXyE4Dhq6RTlQDmJ/WBvyVeUkyoaBjvhphOUH9UHNIPt8dDnUfgnOWRgUzw4yh0ysBXe5nz3f3ItMrC6FHPs+/9RMTFYT53ZzD9H5bEbrqTNv/FPs2gFj6vHkkr/X2LEs9FrXv5vtmVwHz6U1/mniAGd4A5NpOPo8I1koVR+7f/N4q1ggdbS8ejAYJag6ZiExDBwE5fHmPymCY8I3Dj+krf+ORQikNHxv13O58v7B+0IEfhk1852G4WhMABnmTRJN3X9f8MYDBgi9f1fcNqqKkkPsREYRoV81xE3xz5bfN7Y4bean7TFuDaXxUCD2zXGZfgtw8hWfxYXJ3ZbjE3xm8Lo1peh8MjjHuHYSqk0gU/EIxF87KEo4gQBbS+roS9XTwjHVPykDJwMT5h2X60MAtpfFsTvljcIyOT8khu4pDyRtv9qSA+XbvB2hZBislWsLH+waCDiT1YIajPzbvB1j6AyHilwnmLN2wcW5DATw9xbgeUDAjuw5rqtEYUI51Q8dkBo13N9PHi7Qmi6XWU3bGDQrOKJHOE9L2bobo/gbMtrnbLmOy2R7BbC287uFfnyBgNI2yV2y5ovspHjoIR0P695YLfGEDSFBJJiIwUpoaAxiPWMmsHlAwZRtrvXEWuedGHZoMQQZrQU2K0wjKpVZjc8y+CUZZMKA1nN4gV59+ufWLixkTY4kbLmLu9GsxHcTJKho6fpJ4HHNTqJNEkdG9dPKMmVoKWDxRGTe0uFZGK+KyJ0s5p4J7B8QTcV/Y83CrY5AYoOyh1//4rR6n51YuKdwOsW3VTeTZyztlcyTfgvd+XtFaRD72lx0uPAH3RkeaQwjgrgOwGGHkbEv30NMIUYQDt5WUzS1TW6SvnJXQZyOsT1l9zSNj/MHek/xMJoO8V/B/oMf7kIp5TR6a2M4rRQ9FJFGkflG50ySLE4Jd1tpjcQvqAHGSXjKL8jkI2IkWcL7cyiF7zao4eMLVa8miPS+CGhlKGP9ZTei/Xc/SUURBmwHJUV6V9K0MtmOu+Gn9HPgYIoAylHlYr0Lx3Q0/1iEpbX6MQf3BI1jkujVroOSXtTnQbu1uhL+e9hyZGV/tyj0Nvq9z8U2W3Qm+Y5eYYPptQcmS7/4kOWO7JEAL+9EXhGAO6baN8U/wv1j717XWobBqIAHALhkl4olJ6VbCv4Ipvw/i9YZihVA3IiOStnxfT7S2aSyR4irS7JcwdLe2CSTzUR+AEGHWWqA4ebfFcELq/AwVCmDFic5/plk7+WYFFQpgrwWOW5P3i7Ao+eMtWDS44XyC7ARVGmFI6U8w7xd7ChbIHP/SIrZ/cIVg+tUkON9z51AOpBKTU84pBMm4GzGwSz9KqvsSP/JmC8Dah7eqUR7jyfdeGY9k/TX70ZeUS2NHxM73lEgGUu7WDM6n9N/1IGf+XfBfr7QKPoXzXCrfLYGYhq/3vapTTeaymV3pq6NranVFq8pxXt2gD4XAm4WyGCovcq7XkIG//z6IqSUHBGnqfCYVktCcXVH/7SPKZvAopZxhnAefTHDHGknxaNXf4jP3cFrNSUgp1nqqlLuCtjfgiSy6LgLSLRmKJ+LX9FKVh/O8qveo1AXdAY7Mg8AbeIVdGovoZpKIkC83UbzRZ1v+fP2JV1An4imqI9Kkqjgleyp6M9FGLJ/U6pW8RTdAIWXpZOQMEjz88Af/0FBqCaMB45EgIgMgHX8JMXgA1GbCiAiAAI7AbvVpiip/lZQM4Y0GNEZgkIqr+QhX4DQfuOBcZllIBve+svLACiTh4UmErSqvC3Jfb5H4BxBaZaybk+fHmOvYQF4HMMAYLOB5xdYbKBDvvUAdA4SPoZoaDzX5Lec1FtoMERzkWcE1wjhKAAiFoIMggi+KTodwQRFAAy8l9LqPViIhlf/nSiN72BV0MhZAXg5DdGLnCcjk5hkDIfjbxBLG9rMPJnf2S03i+MkM8iIhxr+XVxOpdLHIuSatqiJ58urP590TaUFI624l0O4F8A6IbBYBQlo4ptOX7abwj5/Nd4UW4LRclglBl0Bw9BzeAaB7h7EKowcwag2djywHlPZXZepI/Gm9JuGkoCXuZP5iqLADeL0/iCwzQ5vhBsiV3V68eg6V2zMTVQm7HaDtjxpPuK2G29xXc0AvxYnMI1DrPk+EIwELNW1/4YxtP4qNYtMRu8xXcMPhLRCgTtADfkfAxB2TJX35bw08fW3yltS6z60hXfQ8FDwN7w2TkOq8n5GIJHRYyULjFOH19/p9S8r7x0xffoEGA5+77QGgEMzaR5fsJ+mqP+zlPR0EwsQlzN3Ar8hKAAbDocpnnq73QbmoUG5E0EryEmAG7gP0AzvuduOpCeQZiLBQPuFUBKrNIlgmnm+rvLi0kh1IwrgjcIpCilxpYA2BOgEaO0DaWk8ELYNOABoQpKR1nEGijAgFhWUToF/pAzDbhAMEOpKIMJNOv/v2MUpWIAR8Q0IGoLkNJoO0yjeevvdC2lAQ+2jcH0v/+oKIG2hgdLAjSipI+AQoz1DAl4QIyC2PU1jqG56+/UPbErEOVhkdrXFWIYIjn//QcToHGkWhEzgyjpf3L0CnGIl8XxNH/9HVsRK0RaJu4FvyCSIk4VOGjy0uAwECeFWPeLlO4QqyBWHThopvqnT3yBaCkHgbNzxDLEagMWA30wgMUTsTKIkH4Q+I54xKsEC0vvWPB4JlaYYL1I5RoTKGJlwMM0RE6zBZOGOClM4W4KnHwA4J8E9ODi9nJbAy41sSowxepy8UrAAMC/ElCCj3lu22cDRoWIz7u3QUDAACBzJSCdilhhkrdOQMIA8Ju8M21uGgbCMDmacpWrsCvLsmzLlhP+/x+kMxwephAdq1XW8Hxmir1S9nwll08CHAjmgkVRkAVPJfAGMtFYlhbkYrEoGvLgkAY8QC4dlqUBsbRYlg4yYTgo8AqyQfxfYsCMZYFcyp8YPUI2PRamB6l4QW/6pmwFcIBcWoUFER0DWiyMaiGbQ9Eg8AGycVgaBUKZsTQe8vlUUgUC2TRYnjPI5Mdel+Lt3tZTgQzeIOKonvD6iaZ7YloL48J8BZG0yMAET0zdE41+wqsnRkRUYWXcfseUAd78674jiIRgBg7vUC4P3O1lvTjiABJRWJkZApyq6IB7rI4GgZyRAMcPoVQ/8AS/IeGCRQMCWbA6CwQo8kmBT3Adh/W5gDxGrI6DAK9K6EDFhb4nLIhjwPooCPG+RAko0AMIHAlqrI+CEAf6XTASYx9iB9IwWJ8FghypU+B7kb4PPQhjQgKM5fD9Q/EmsIiPP4qLARbr4yGCN8QekND0R5o0sEUCjA6AKhE+Agh1AcJkIR0S4A2D70gOQOzbC4sBHgkwJ8InigMQ2gWXJgtpsT4KInlHcACCHaAoWciMBNgr4VN+D0DsIEyYNNBhdRREku8CHg4gdRQuLAa0SID/9Q9f8jMAwX0wQTGgweoYiCbbBRwAQLAJBEkDHZLg938nShNQrAsQIw3ssToGkvhMcgBSXYAYaSD13fkToLsMfeh7+IHYX4EYaaBCIvwl0JGkA5A6DxciDTxjiNu/+Z6YAch0AUKkgV+xOj2k8pb6USgWF6DMvyANHJGCUVVc32v+6wCG9Hfv9T8gDZyQhD7XSX4+8l8I5dN/wMM/MBLU1Ez2UkEOleoCdneQzpBRx4/bl4UYci2rq1Q/J/77IDJaucvmpYEXuq6zVTVy389Fm0D0majp4Ynz5mOALdDPPteQRN/tuB3AmJPBq43HgBZJqBw3MraQw5FUA4Zpshr5zcalgXOZlq5m3/YpaeAJMmhN1iy33XgM8GUev1UVXMBH4nnwgg7A9OsoddOykLaUAzuzv3XCrUF7SKJrtFPZLbx507IQ4tPP2dWEcrrpIJFd4Vuhp057Re3gtZuWhTgk0VLLCeV1N0Esj6VSwKFbrDKFArelFtI3pC3Yym4NYZ5gl26AIIcSDqCzY9ljXZcNx4Cm5DCrQSKjDW2Cl3QxuC2v5jTbjQGq6DhbsR8Xe0dWgngGIY/erCzkXPbJB+YDg3HdwC9hl1d4wYbNSgOXwpI2y35g6D1xEKyQjGlLX680wa0YC+/c1nAfl3hNawIMPAf7l43KQobi9cuMdOAqJ9IcqEcyjh5KxUgDNZI487hYuMqRdisgkhnokUWMNNAgBcXkYwe4xmuaFMggEV0itxQSAyYk0XB4lbA/PCUcB6GvVCAD3PZI0DI8ND0P1HCdIyEC0F1AV6alLkIWQh0E8ly2YXq4zj0hAtDdXltmqCZCGkhcqZlnX00Q4oGmBVuQwleAfyYGUKUgLOeMFgjySNSCOZbXtpuLAdRBIMufdRDiegzYQZjeIAFdRlwtQBo485SumpoAhDkRj4R3LC7AbC0GOJZirScnAGGO1M8DaiSgy/zRm0sDW0RxZtAQxau/q4EPFabgfZG++s1lIQ1Lu66vYYPDiXAnAP0xbZHJ2s1lIQopjBy5cA+RvCfLwTuG51yQxAJV6Vmetqc12WL5FNACMacBlkVdM0JVFhZ/ZTkTgJW7AgeCVPm3V9SoWhPFkbGcayVBHykpAN1ZWZa0SkNFziw1iyUF1gTeFDgSOhd3AS11DFoRzdG1GKq1Ql//OQLsIQUb8klKK5XkAhx1DFKPkaNv6QOGLKeI2D8EvhBJNoL/uRqdj4/X82ZkIROSmOMdgO/gO5MvlwH/pRB8AwGiPZYbYGVw+AzPEgNaYIRfCuKDhiyVAP/lgMgrSGSOTHGW2Ce2VLVJLQyDqxrChmyKzUIPL57zcAepmMh1aCKj4GUjMeDCMQh0EbXCXCr9vXsgFIEBl91EVXjDlkeClqFcmVIMSX/vt/QUAKCJz3Bd3D/Tm5CFUAeBFAu5Qu/9oUAKAD6+IdHHFW3DJmQhM0PLcoo05FBEEvnHJACSSXkWH7dY4xZigGMYWrgMQ65AOidqFwBgSunGTHH/ckEULwtpkcRCME/A6im8JacA85i0F+P89Rnlx4AGyw8CVY4hV8YZUvkcOBESYLKpMykVVw0pJNEDPw6LDwIvmYZcMXaCJO4JV8MNi0kfydm4d2xQegzoGZ5QhQ0ZrpTMMkACu0wtQN+MuEJ67sufA6xwaWCDxfPUjmbIlbHpIZaXWd8Ia1zuUF5HrpZD4dJAVT5LUdmu9DmugTge0wXhsyf8AlVkRTyjbGngGUnMkbW9I2xAP0MEHxLbQJM1+Bxa8qpjYoAwaeCCJFp4jqUYMjMlfNYKugukfSNRlTFcWa2AOWRJA0ekYKP/5ECUIozBlHAX/ZGw3mM0PilyRZVEoqSBA5K4RP+mLf1Msu7hGi9jR4H9iAn0KbVTGzMSFCUN1OUfrs00ZJixhys8xuaAHlPwKalrnI0lSQMNUtAJUd3yLMbKh0hBcIdpdAl/I87LCpKFXBDLJygEQ1J+DYfIPqCm/wSnv3rErY0ELTKUKIZgSEpVvIu7GMJhKnPstrWRlZYYaSB1EJgYYztyj0TBFb7EfSLAYTK2h5XeBnZKsNci58aoDp9Db1POBENSbHGMmwVrzMAO8J1BZ+i4ldQY4JGCyvjemv5lSFu8KH4Td0P4hFkYr7X2JuARI+ctQqSBLZJo0ruLqyEZwuHryEawRx7GNtrQQmQhM5NnakfkQcE19sEiINwIYmraOpkxwHHtywFZGHu4yi5QBPDugC7lpyZCFtLyRaYOV6qtPzzEigF6h6Uxa1d8M7KQhtEvXQyWxvUQ4GVgEsCYByypDRcJ0kDF2qFcsCwegjyuVWDdHaCDC3QRGAPOSOICAXqNBbEQ5kOKHKgpufxhjLwYsCB1EFhxCzQQZlUG30O9HWD7rLGrAGmgQmTXKfS24vrDfZokvEM69gxVhBdfoThnatEbx5n924Er+13ascCJf/lXRhQmDdTkB6q2BSaI5CHxTMBkkIAfIC3iypIGGmLZk8DgkYCZIJaXgVkgoSVEWP7V40qSBk5Vk5LBU9o/0RzXz4Uz7wA3QCoKRUkDbeWyZHD86w+PgVkgTSG84iYIwPxpfjqtqd6YmBym43tI4PO6AeLxrMu/0oqSBna3GE9NjlkM8zqoCKU7QxVY/o2MBO1tBtSTYs187gN9ILpzVgRPPAuSBrY3k6hcFGOg2Qf6QNQmjSItQitIGjjf0Bt1iq323QfUAERrzEDDyokBrmg+Isfgu6wN0FSqxC5ipIHtjSsStlrjy9oITGCpNZIzUqSBzY17EorncoQfrcAvkIitFYS1lBjgbtyV9Fz/0duAIIxkjgWoDEJkId+4OxO0xmEYCptSoIWB2Z+y703L/S84y8dMZiNO8qxGnf8AtDWyJOvZUrm2LvGs5fPeLOgSXRbnW//axrWQeG1lMiYuW4zy4BkZTy1GB5rextXAiBQCaTotr/fkuRFIVaZy0ByFX/rVv8URNLlW5fWd50YgdWGpBU9kIQY8r/4lTjICEweeZjWJjc9/JyNeffMBqFdPRVutj/wwwwO00Qqrnxq4FlKtfxitRHQUuP1kMbAs1jmGN7L61cBk/XJUqXD5epAD90quGDS8CtOCJxOGDh4IR8jHgetBDaa8/1IDuIRrISehSBECGYGIA4MHILw/WwFXntBFU6hZIG8AfBxwX7kmvD+/9uoz+kaxLwRyYSiGB68BVJEspEYYsnV3YKfpgfRPolGJEfwG0IoHtgBiXhI8CEMCD3RBjHwm4mkUXhLbr0EYKqHoQJEKRYUwNCpOyO8BElnfAMhC3AEUnTDU8MAYAJ8H+D1AvX7+qzCiQWHlteeXHLSs0PM22MABKNSQllUiwBE8/FkUf3BpBqAwpklJjPLnwZdmAEwIOIBCvzuXvu3FoOBDgN8M3VfYped3nn6HVuXoY/pWaoIRfPOiDBwDFYa1zsk/TWwB6hhYYgSfAbSZ2rrrn8X4VKwWhg48fChqMcKNtxRcrl4KDjyn4cKugtCl4AqjuK9sTItBWpNa9KvQBV7BkBi0+W4ApuVghVlNqsvOC4H8N/HLwZdzIURtWht/FZPYAGYuhGy+G4DlK2Fa8xr1A0+CgIgHqlns3vKlUD4dGzLhyxQCR74K5f2HEPDB8LVwrZnN/HMcMvNkC1K89x8M4B52H4aEatWdYj4HYegRkIrw/qPcW38aFqoom+OFyxMCPeko9zRs7zEAKg6cwKA/roMvP/J1UBOPQx/wgr3n4WtKgo0wxODQfx4+GMAWsygLBQOw16kvPZPBrdsg4ukfBmCoRYzW0D59j9MgKL3Wp24X9QgqFOKuuV6NzfkczjpNoggDeFbIg6xdCyktRQDlNnG3+A07jSLX7Ncck4eOsGRamedOtVVsiqCchKKEB+LUqT2sQC3wvF9kAC1RCWI448yGIyk+haVVq73eOs+VIMo9xghLcr7SzLMdIVB1wa+WzAso1lqH6nzF2dqMEPiNRGvFr53z6MGURtIgMPW55JnWjhDoOZJyjzH2ntHBxNAolYXoz/V/SewIgR7D54ZG7T1Do9ixcZiFmemtbLp5RGBkBGps3JNz82rBZa25EjbmN9MHzgiBOYqWBTw452kXzj0TyTELM4MbCmGIQTBHDOZHx76dNzq2XX0pUqFoAeDChEAAsdLv/Dk7+IowxKAVUSPDmzphaMDCO6Qc0/j8YgAbTCC2sBZnkQQPwtAhNJFWGLq5cs5pvgwQEGh45/wSIwBkBMoCbtwL91q7okJoCmE46HuZAqFp1b7HvXvhScsrxpiFjc69jTCcEJpezdifnJt2DiwnrgmfBBjo3Z0KQ4bgLF78Eh4e3Au7QOUfPgkw0L0/FoYE8+ANkigJ7dwLV9z/P+CVAANNGyJhqBCaVtQs4PNPA9horUiPmaw+wecoDDUIiBRgUR6wuXI/uOPqPwGTgNUbN/Uitgy+EVHywHfuJ+/Ugm4KAg1JsFR1MEeEJtUzyL37yYPHAi0lAbrNGythiBCck57De3A/2Vmem3rW9q2JgnVRPItoJQFb95PPtqemnfHddmYs4Glegfjs3JRjQCvW1qQRhmeM0P5n1p7jdTZXbmCvJo6dQHD2IQ6FMHQIzkkvAly7X3giCkHEhltlV1QXJAQiEdEqBL1zA+NqQJnYSoz1+rflwlCAgEgBFt4QHg4BfjWg6mtL24Lzi9kFRbtSllL3FcbZuV+4vYGHtsjMHI3YHq4XIwQuPfJmRQsfN7fuV+7gpztYiQFKXZw7Y0Lgwghw6DCBjRuY/joobiyUR7UkwcaYELjkdzYxJjHkgDPfBpRxbWBn1Bqn49SaEDjb09Vxiak8uN94j+lUfbZ2bOw1jsextaI35q1zX2EGO/cbV9eYQ1usmx0fhYIMuGykY087/rTPz+bW/c49ZtLV8jcXcT4W6cIbVQQC9lRad5jJUAf0K8J83TwFj34bv1gYYhCwOUmL2Xxyf/AesyE2HIFa0TYi/yIBeyrFfN64P3i8wQich2pAoNnK1x8BLuInHjCbm0c34BMEeTdcgkX/BWcvDB2CU2p++N79xRPmkl5GgJxokrUwpAhOr/fhQxnIUwpacEy9EEkwDltcLEDAFrsyzOetG/C/DuG9cAUO/T4uiTCcEJxKNf7cOkcnAZVMJwGHfienTAgyhCcRxf21d//gEzxMdFEXcVlGeuoyIG/fRI5D6xBDFYCpBBTEevPwV/gpa9KPcL1qDvLG/YPbDTwQx7AsBYH+I55MCGoEJ1U8hg5CACEHVFzazcM/41uUUZp9/VJiMsOrQEIOiERWdwEB1ZuCdCahSTPi5/jZun/yiMkkIgZcQDD9NiVNKTixbiL63v2bDSaSi4gBFxDsBkcuAxZM2+cAyL6sN25gUTW4NFIuD7ZxC2Nl4Jgpb/t5cq+wwzQiK7lyE0YPSK0JgbVuKHrjXuH2GlNIzChmXRjX3RkTAjvdetT1rXuND5hAbidZChQDDsYiQC0LaTGFvRtYoAiWmSwlR2iKEDEgNSYE5rKUrMQEPrpXedzAS2PpvHQKEQNyY0JgpJuPbB7d69zrlt9ahCYLkL4VtoTAVrkoeedG2MJDa6xkEqKHWWZLCIxEd49t3QhX/gTAVs2k4hP41pYQGIvoeqRHN8a9f8PZSplrITgAwLMpITAV0d1j926UrT/k2sqZe9oeI1NCYCGi6wK2bpSrKRmApTzwKAw5UJoSAluhwTiPzhExQGhqBCYSgoKMuRECUwsNRvngPLxRMADVPDAWggxo/psfMyktfXAeHhVax6vmgSm3Wqml31IKT4Mxrh+dj3cKMoVqHtgIQd9xix2WQt3D7p2XncL0KDoPVDPKiFrzDkFpheeAUd44L7d32hZQIyzCkAkBgpLWQlNglLsr5+cTRqmKWkhi8PCOU3W1V8kA6yLHOO/cBHbwUuV9ERF7p0RITrISJxCEzACzqOjzCl5u3rsp7DGRNk8OkYGtk8kqZGDhg2t0SPIWU7lzk9hiHnmcNDPtIEdIElmFBARsLhs1SZxjJlvnwTM+gohgqiXUSlahQkCO+lnU8CicSAND3WWPUgSklhWoQcCdAOoUS7h3E9lhCfF6/rMXfXSFwELfAQzNQYk0kDBizTTgKKroR7H8HL7n2k1miyV06y1gJGcnAgFnwB0WsXXT2WAJImulAbHMxlA1K430j5/+FJBPA6v1jlGp6KEvBBZnOX58cjN4v4EXvpKRIxiNKMILgVQCwHcG9VcB/aKwn2rNPKoTJfSFwKN+BWKKEMyfBBPxwKUBxmLAF/budT1tHAgDsAIBAoGk2TbfSLZ8toHc/w1utn265IB1sCQsk7x/66cQNJZHM7Lt75vzy9Qg75idDSwVwaupMbUEc/iSXKabNmeWtrCUBG+oxdQSPMKT7EJtiC2zNYeV4gIF9XhaghKelJdpqJ/eFB2sGCRoGHmAuWhaggn8OMgLVSFuGQs8BUjScW9sxNMSLOFFIS80BS1uGAs7BQg68bwUOGT7JHkRxwMQS0uwgtrhKF6SZJ8dEGwToICNBzbAbgVzkvxHQFq2Lx1/c1wTS0twD5Wmertj56UtU/UCMPwUMN+xIe6hEPQlXmkjkro6c2AZR0vwgH5lTZ9UdSKaNNRrj/R+sEGe5zDFfeVUxVHktaReWQwtQT5sWSfrXBwLX5ULDmPzZ8bCTgGZhzn1kO1zTloigpag23fg+T47ePi2mcME4HsK4ORKkqnj+OXg1MO9PZJccecJQO/BYQIIRRZjtwRro2VdeJnrBKB3s8B/4urFJmO3BNs4ilHUwcySDXcfXQnmVTryNSD1WQ4PX466Z2rutwh0dFli3JZgPn4WajUFLJmL+/gmAOrGbQkeozkTqITeT8bcp4BYKnB/SJuC5JV9+nt7xy6AeUcgri3Zo7YEE/SiS6uhdctcreILgGbMy1FpXAQIj0NndsNcbeNaBP6nHbElWEW0MZU66GyZu3VsOQAlI36ZfSRbUn7bQ2POPHiObRVA9YgtwUNMU2EBjTvmw0Nse/Kr8TISHseOlD+Efh+IF8sF1AT51rUNgFJ0dJbTdwn2m9NZnSgBNG0X4Lvo7Jgf99AoO05EFX/VJa9E9qrBq8zxLysSRSY+Qjk4tbwUJoVjbB7xqsleieRVx19VRCS70qEIHHB/qHtWVhd4q6zok3asRUltdyWsSrxV1P7TPEC/BHS3hZ6vAcnxQVFZ/SwtBdQCFqFeFa7NihoOtsyffzBYWtkubfURkEOBAoJCRx9Uju0Cxy3zK+bR0xyDHcgCN7q6cijkFEwOBU4flM6rlAOGm98xn35iOLJQmqX2UDhSMEebP1O4V03g4BfzarnBUBmZ6wx/3BQKkgKRUDgYHtyRuQyDbW6YX08YKiFzjeH/cVR/YCAJFI6GBzcuH2jukfn2gIG4h1OsMZhew9emSygIw1iGJGMcQz0w725mGMbhCnCiz8bC12QrnOhzT8DDuhgDLZbMv0cMkpG5xHQaqaGypyD2UOGmJ29C5jLoaLeBjF4MSEIEgITKgYI4QEWGCIAEg/xgQSwXGICHCABKNZ8ZAIdKSiECgGOQHQvjFgOQlwCodClW+JaggEpjnDAkZAFD3LJQNrCWkYUacKiyBG4JpjYxp00CAyYBKxbM0wq2ErKBHo3lxbEm72rLv7PRxHKwJGD1xMJ5hC1OevqA7yyHoyXvWsuQyzVTYrAk4CcL6QGWvJxmhXZNHv4akEKpoo8KLwkqFNxXAOHLQRnZaUwbfFDLybPcOuJy3cUsSBKw2LGwHmewkZCdqjD80UooHcmzI5RKw2AuKrKTwMpiy0K7hw1OljrDk6aFmiSvJAYkHY0mmQmQBPzDgrv5BxbIWmf22I2949Tj+UR8oTNk4eH+YdjYLJnCCAXBjOxVpVFC3+rmZK/KYauOVru/1W8S8Mwu4RbGEhoiKU8RxKlP1WrSco8qKKRtRX14dhr+gT8GzN2yy3iAKU7D1PssK7M2l6RStemFWoJ79EpFRSoyb7Myy/Y1DcNhbMMuZLeBIQpMivQiLcFD//BLCgymNjt2KbuFaQoQXt2mwVuCvG/urym8DIaemNIYaYCgi8ibwB8ucEaT00VkkSUANmlASxdSvRxCloNTfHR4qehCssgSAJtt4g314UmGgpNHXKShWoL1pwu/329eIEs49SnjqQC8tZzBAO8b/N/SOmg60JInbdALf53it54gqGBi8cwubTuDXnZ28E9eyLNaNKeh8n8FaPY1efaCk3NB0MLA7JFd3hYGRM/gB1wnyFqUXluCOX4rRS3JuyNOzgWBgIl7NoZfMNDK0+CfQ0HIThyAo7cxOohOUhA4ORMEPIOJBzaONUw0Yp+NUSqq8laSB7LNKwoGvbK9aGBkfsPG8byGQhy1wtjB3fqZjWW3gKXvAPAfAE9sPNsZrETweNXINHA027Ix3cJNRl9cBjuRLABOfsHYdwA4BUCc429xy+h3AAQIgDUb3dIwAr4DIEAA/Fiy8d2sYCyCR41HRsDBPIbxZ+xpDVMRPGI9MgmGWz+xOOxm0PgOgAABsIhl/Bl7XEHpOwACBMD8kcXjaQGF7wAIEQAxjT9jdzAy/qv2YtNhoFsWl0eYiOCVY5Hh6DOt8VdEwHcABAiAnyw+twuc8x0A/gNgEeP4D2sMcVKQdBWkawBEswMowBxQUa+uRHsFIVC1KDvFP+OzKc7/Q+cA6pOUeJWKiYeAFKnmzmB8NNnzf9AcQOedXraVTrpbsE97Xn92AkuL+PJ/lzng/FlTXMumMbxRCGkQABOe/wetBukTKa5nocDxnpDaQzC59b9bBHT0HhcRvJLXmxofCU7vdfjjasafsbsFzJX0Fs+uq12Q4KTnoTclPphQ/d9Lb1DQ/7qs54jJEjgn6xRHqKymMf6M7eY4MY2Arry+XWMZzjoVBlp8MJH+v87TBuaKPed8fxr+K7p3BL3KPef1voSFzXTGn7HlGra+VgDYW8Wx/8/9eaLmJr8O5PBnfcOm5eYXXE1+00gHb+6nNv6vbuFo8uvABL78YlO0ncOLliYqgx+rLZum5xl8aEhF0ogkqTTwYjal9P+95Qo+kEKLtM0ljUDmbaqeneBgsun/e8sHeCCpT1Xit6aiC6sa7SPgJXz4NcH0z3cqyKlHPl6e0OKvPMgqMJ7bv13dzeAq1w4CQJclDZLUHM4WU6n+h00E9nQOLxRBElqOk75n3u7har5j1+DmB9xkBovshsLRJ/hJkFXgZuKX/5PbOVyUJr+upAuSJjFawsl8Cps/TD3P4UI1/Y/yqIk9TnovA3Ayu2PXxK05VBnUWEtSemlFktectHidJ6J9IaUSJ32XgQqGrnz6/+t2hcFyeks2PVGikJjmirniQM3YNnLAIuALTP9/7VYwoc0C6wJnCZO+XEEahUkPUuCsovaUAsyf2VX6haFyg8VVYdSXFaQkjLrQBXrsvfSC/7m66f+vxzUG6hTTv3b/eFXghOu2cOjf81yjVyOdx3891d5f2FxQ1PQqKVSH6MZfXzBoYBIBAv2KRBKRFBhqPeXej8Pdg3plVkCNzpKFKqNU5W2FpLOg1mSwN5U7v9wtNwilM+rKF+bX9kaRUQSxuo7ar8Z2gRCMX+IvzJP7RlHi9e4rnP6BJwFpNlrcvH2b0ScSgay/xOkfdBLIzfK1hs4yfAFtjgCiv+/ft+eHBfxrDPP13KJ9LxRx4s/i4Qud/n/czeFfZXayFjbVnU5bBnY3u4aNH7Zu7uHd3jBdFzaL+07TCHT3cLWlP7XdBp6VhgU7cJsNfMoSv7vVlVb+TWzX8Kt7VwDs15hf2d+XBBN4deWVX5PrwAI+FZXR+H/KA3OH/9XB9Hd9u1v+gE9FR791heY4ekd3ND/9rz5tvlzur30Drbss+bedu01OGATCADywGEIghBDd0U4/ddr7H7HO9B/TmppEEmCfK+wK78rq+fx1wTGnIAGOeHk9Hj8vuCiZ19bXDB1gfMcgAcbGy/rm5zYmFMb2HrwXxqVE8Zf/jTQYx+U5WDKJJs0/fAhk0AJvTx/XXH/C6GzmSx9TVRZL4Cj6l9wCVP6xFthhxsp79EshC/yN7v5VsIFjfjgl//9jRmJegOb+O/UN5kOVuPAxW5tLHqTkNxUT6d8EMNDZP8fBY8o8PfjNxgbANMFAY98yepvgXEgf/iWxLq2hQBm6+X+kvTMwjdR09D9GlUAPSE1D3yNVesuTIVX/V4WcA2qg6sfCjN/WXLBrKPXF1uutHARga6r+KljnANfFXUeRf1WVWa0JeCMK/l3nllSdlRiXtIYi36awevCAMfBG052/UUEXUO2LxHphG1i89FZQ7VPCDkZ7yXEuLv1e9FT6VLG2FnunJL+77o3Tom6p8tmo2roTeu+8UnAVFhwApPJOa2HqnkZ7UohvgG87pEol7PoAAAAASUVORK5CYII=",
-        "lastBackup": null,
-        "currentDependencies": {},
-        "actions": {
-          "config": {
-            "name": "Configure",
-            "description": "Customize Vaultwarden",
-            "warning": null,
-            "visibility": "enabled",
-            "allowedStatuses": "any",
-            "hasInput": true,
-            "group": null
-          },
-          "properties": {
-            "name": "Properties",
-            "description": "Runtime information, credentials, and other values of interest",
-            "warning": null,
-            "visibility": "enabled",
-            "allowedStatuses": "any",
-            "hasInput": false,
-            "group": null
-          }
-        },
-        "requestedActions": {},
-        "serviceInterfaces": {
-          "main-8080": {
-            "id": "main-8080",
-            "name": "Web Interface/Bitwarden Protocol",
-            "description": "Main user interface for interacting with Vaultwarden in a web browser. Also serves the bitwarden protocol.",
-            "hasPrimary": false,
-            "masked": false,
-            "addressInfo": {
-              "username": null,
-              "hostId": "main",
-              "internalPort": 8080,
-              "scheme": "http",
-              "sslScheme": "https",
-              "suffix": ""
-            },
-            "type": "ui"
-          }
-        },
-        "hosts": {
-          "main": {
-            "kind": "multi",
-            "bindings": {
-              "8080": {
-                "enabled": false,
-                "options": {
-                  "preferredExternalPort": 80,
-                  "addSsl": {
-                    "preferredExternalPort": 443,
-                    "alpn": {
-                      "specified": [
-                        "http/1.1"
-                      ]
-                    }
-                  },
-                  "secure": null
-                },
-                "lan": {
-                  "assignedPort": null,
-                  "assignedSslPort": 49152
-                }
-              },
-              "3443": {
-                "enabled": false,
-                "options": {
-                  "preferredExternalPort": 443,
-                  "addSsl": null,
-                  "secure": null
-                },
-                "lan": {
-                  "assignedPort": null,
-                  "assignedSslPort": null
-                }
-              }
-            },
-            "addresses": [
-              {
-                "kind": "onion",
-                "address": "mibog33n4dzldkve2uqm2muqkhrbnibkpu22rms6qrrhylwssuv7h2ad"
-              }
-            ],
-            "hostnameInfo": {}
-          }
-        },
-        "storeExposedDependents": []
-      },
-      "bitcoind": {
-        "stateInfo": {
-          "state": "installed",
-          "manifest": {
-            "id": "bitcoind",
-            "title": "Bitcoin Core",
-            "version": "27.1.0:0",
-            "satisfies": [],
-            "releaseNotes": "* Update Bitcoin to [v27.1](https://github.com/bitcoin/bitcoin/releases/tag/v27.1)\n* Add 'Reindex Chainstate' Action\n* Improve config descriptions and instructions\n* Notice! If Bitcoin gets stuck in \"Stopping\" status after the update, the solution is to restart your server. System -> Restart.\n",
-            "canMigrateTo": "!",
-            "canMigrateFrom": "*",
-            "license": "MIT",
-            "wrapperRepo": "https://github.com/Start9Labs/bitcoind-startos",
-            "upstreamRepo": "https://github.com/bitcoin/bitcoin",
-            "supportSite": "https://github.com/bitcoin/bitcoin/issues",
-            "marketingSite": "https://bitcoincore.org/",
-            "donationUrl": null,
-            "description": {
-              "short": "A Bitcoin Full Node by Bitcoin Core",
-              "long": "Bitcoin is an innovative payment network and a new kind of money. Bitcoin uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the issuing of bitcoins is carried out collectively by the network. Bitcoin is open-source; its design is public, nobody owns or controls Bitcoin and everyone can take part. Through many of its unique properties, Bitcoin allows exciting uses that could not be covered by any previous payment system."
-            },
-            "images": {
-              "compat": {
-                "source": "packed",
-                "arch": [
-                  "aarch64",
-                  "x86_64"
-                ],
-                "emulateMissingAs": null
-              },
-              "main": {
-                "source": "packed",
-                "arch": [
-                  "aarch64",
-                  "x86_64"
-                ],
-                "emulateMissingAs": null
-              }
-            },
-            "assets": [
-              "compat"
-            ],
-            "volumes": [
-              "main"
-            ],
-            "alerts": {
-              "install": null,
-              "uninstall": "Uninstalling Bitcoin Core will result in permanent loss of data. Without a backup, any funds stored on your node's default hot wallet will be lost forever. If you are unsure, we recommend making a backup, just to be safe.",
-              "restore": "Restoring Bitcoin Core will overwrite its current data. You will lose any transactions recorded in watch-only wallets, and any funds you have received to the hot wallet, since the last backup.",
-              "start": null,
-              "stop": null
-            },
-            "dependencies": {},
-            "hardwareRequirements": {
-              "device": [],
-              "ram": null,
-              "arch": null
-            },
-            "gitHash": "c995ed1b85f79135fde30a0c056fdb4ee465b50d\n",
-            "osVersion": "0.3.4.4"
-          }
-        },
-        "dataVersion": null,
-        "status": {
-          "main": "error",
-          "debug": "Error { source: \n   0: \u001b[91minvalid type: map, expected a sequence at line 1 column 1985\u001b[0m\n\nLocation:\n   \u001b[35m/home/rust/src/core/models/src/errors.rs\u001b[0m:\u001b[35m509\u001b[0m\n\n  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n   0: \u001b[91mstartos::s9pk::v2\u001b[0m\u001b[91m::\u001b[0m\u001b[91mdeserialize\u001b[0m\n      at \u001b[35mstartos/src/s9pk/v2/mod.rs\u001b[0m:\u001b[35m265\u001b[0m\n   1: \u001b[91mstartos::service\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/mod.rs\u001b[0m:\u001b[35m271\u001b[0m\n   2: \u001b[91mstartos::service::service_map\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/service_map.rs\u001b[0m:\u001b[35m80\u001b[0m\n\nBacktrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.\nRun with RUST_BACKTRACE=full to include source snippets., kind: Deserialization, revision: None }",
-          "message": "Deserialization Error: invalid type: map, expected a sequence at line 1 column 1985",
-          "onRebuild": "start"
-        },
-        "registry": null,
-        "developerKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAIwXjctXTc37QTXRYWxLxElY1r2NhoKJRrl604Nu/0l4=\n-----END PUBLIC KEY-----\n",
-        "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAB0VBMVEUAAAD4kxr3kxopFxX4lBpCKQk+KAgzIgsgHBxDKgjzkRrghhhgQAsnJyckHRH3kxn4lBvchRdOMQuBTg5wRA33kxs7OzuQVxB9TRHxjxnPfBbzkRp/TQ8rHQ3qjBncgxidXxGaXBHkiBjQfRZrRAxfOwxJLgo1IQr3kxrujhrsjRrmiRm8cRR9TQ/ujxrQfBbAcxXAdRS2bRSRWg9uRA1jPAvniRm3bRO8cRSUWBCaXRFfOws6JAn2kxrliRizbBPchBe9cRS7cBSvbRKNVQ/OfxWVWBGSXw/EdhWSWBFwRQ3ZhBd8Sw3pixnZhhawaRS/gxGaZw/3kxr////4lBr//v7//vz//Pj4nC34njH3lR7/+fL/+/X6uGj//Pr4ozv+9+35qUj/+/f4pD781qj4pkH81KP7zZT3liH3lh/5p0X4mSb+9er96c//+vP93rn++PD7y5H4min3lyL+69T83LT6umz6tWL5r1T+9uv+7dj7yo76wHr80qD8z5n7yIv6t2X3lyP+8uL+8N/7x4f6tF/5slr+9Oj+69X96tH82Kz4oTj95sn82a/7w3/5q0z+8+b827H6vXP4oDX+79z948T958z94b75rVD7xYT+9+/5HOTYAAAAUnRSTlMA/PYL/SUeFgki68wzBg/y+sAsY0v4BGlP6bHwWxLfxH5607ZBOTIZ9ObZ2JJV4b2hnY1kR0Xkmpl+bT4c8M+SyLGjhXeodFqob1K7cOq2jIRnsm3jFQAAGitJREFUeNrs3VtPE0EUB/CzbSmlhRYLgqIoKnIREEXr/Y4KeE3OjtYHo8FbovHyYNDEF2NiYmJijL75bW0RQi3t0m67u3Nm/r+v0Onuf8+cOUMWiXeO7bg1fTkzdTsXc5RSvE6V9MbOn5jae2W+bzQ/3ENgjnjHzNzsiZjipqjc1OWrhfEBArGGj89dmFDcokR69upYnECSZN+BXYrbKnHiSv8wge56zp6cVBwYZ2qkg0BTYyfTHAa1Z6SLQCvZvv0JDtX22f4UgQ46901yNNT+PqTDaMUHD3O01P4ZVA0icnavYi04Q3mCcMVHdrFWJgfxIAhNctFhDfUe7SQIXH6bJg/+WtQBlAkC1bGXdadmsQYCcu6Axv/9SmponKDNUtNavvfrcS6iTNROC5pl/kbkdhO0RfISC5XBnkHrlrazYM4+ghZ06p/6t5RJEvjTn2MjxJAG/JgT8tHXkJNoLmxOdhsbJoM6ceO69rCB0mMEjegW+NHfmNhxgq0UYmwwB3nQ245eNlziDIG9P3+ZwhKorSC65teMRB9BtW6j3/3VnB0ElZJptkysm2Bd/BBbKI22kTVDbKkL6Bop2ccWO0q2Oyiq06v9lN2VobiRRf/m5CzuFzjKULKN7DSaYPjnGNknhad/hV3WdQuMMPznCNlkfIKhimNRafAIg8VhsMuKTV8/1ChZ4BpDXRkyXRJ/f0/qIBntFMMWbpK5soYc9QmWY2xteJChIXNkJCu7PvxJGzhyLG/SUb/gGXeEZJqhKUNkkoGdDE2aMGgOcZ7B5tfAPIMvi2QEpH/fdpJ8w5Z3fbZGiZ8z1s/QAvHdYqj9t0j49yBe/20wSVKlrDrwGxwnSyJ1MLSJyHbBGYa2GSRxUPxvI4Fd48YNeoyWuG7BwwxtJasqOIBzHwHYLqZLJI7qbyASQu6vH2cIiIidAWz+V7GsIDDKEKACae4GQ6AWSGvHGGqwpii4xBC466Qtq0f+hec0aeo0Qy22rAD8/vXYsQLw+4dIwwtJrzOEaIk0g6PfjTG1W3iBIWQ3SCMFhtBpNFKsmyECedJEF0MkzpEWsgwR0WKEQA+mvkfG0eFWemuue9TRBEUOw18idZgilmGIUOQjxjH4PXLT1CQUgJm/v3jMxpih5qAAxFx0XfetMYugg5qAAkCZW2bOIkhRNMQeAFp2K7x99pSFi1EkJlmqFbfKQ+GL4BA1AXd+c9EtMWoRnKLG4ATAKreeh8+es0z91BDsAJYtu17+sEidFC7J0/9XXC8PWCSHGoAdgFVF1wsLFWoQXGTJXC/fWKp5Cs1xluyV6+Uri5WnkKRYtF8mRoBVAxQO4SOgfEWAL27x1yvW3E6qBxWgDf4iwG+3rLiyzDqbppoQADb4jQCf3BL9F0GeAtfDwvmLAPfcEv0XgaJaUAHY4DsCbFJ895P1c4gCdpelc7285to+uDU90m8RDFKgkiyddwT4zLWsRQAZiyBLm6AHZIPvCODhPuskRwG6w+L5jABe3rBWTlFgDrJ8PiOAl4+slyRVwh5wBf8RwMtL1ksvBeQSy/fD9AhQdo3+gzHQFZ4YHwHKumgVXgDVrIgAvOklgGug1tgRAcqO0DocA6sQSAS4xzoapxKUgKr4jADvpUWAv+zdd28TQRAF8KUX0bvoHQECBKKJjoQQgr94L3ZsxwTTS4BAaDEBQhIg9I4on5YzneCcb/fO3Mya30dIVr63s7Oz+GNyxP974D81SgSoWGgSNQpeCI8AXajukboIACR9Y3QOxGi/5/onb6AIEJhvAj7eAyOZeXzvLOzVJQI8hlRLTXIgRwcDbovAMQIcYZh7kGq4ScwhyPGCAcdFcKqBIkBgvZddIL38U+bxkYiLoLEiQMUw/xIgwCoy16IsggaLAEgsB66BIB0MuC4ChimjGr0RoGKZf4dALxgIWQRXMRjXCHCNYc5CsiEmAVsgSS8DjovgCcPkUY3mCBBY5N1FEEaReVRlEThGgLMMcw3C+TYMuINRXb77FAPUIQIcgXCzTUwrIMpt2mg5eR6/hEeAK6hGdwQA4m8Fx0KUXtpqff/wHAINGQECq/xqA6GTTN+LHFBswAiAuE3iQyFKG91dbsQIEBhrYpgFWW4zBqcI8Fh5BAiM86gPrI8xNGQEQKxR0nMhDOvE4wgQ2GRcSXsQro31UkJ19zg4HREgMN04OgxhpEWAq9Bhlic/AHWMANVfDvEiAgQmefIDgAzrqPnDwwIGOMcwj6DFLD9+ANpYb5lbtzvwkycRIDDJiy0AbvOfKP06RrroRQQIbPKgBuAQAdwVn5wHfIkAcKoFbII4Gf5Tze0fPYkAgXHaTwECbZTlBhSZYyxNgThvKIuiCBAYo38i7DuKoikCBObrvw2coSi3oMsExZ2A37y5JWoJqIoAgcnGwgzIVOj80EwheqCM3rsAA5w63cL0KYsAgQ06r4NXl79Soq3GjgBAk9LbgIPKn7nMFL16CGWmKS4CDeZGL1N08Sg0mWgi2gFNbhaZnuxpFX2h341SvAcMc/44U1TuhBYLfImAf7nLNGXuFKCDiWQ/9DnGdN3KQ4NtJopJUOgEU9byEfJNVzcSKrojTFurguLwSI/fBRFwWJh9A+H2eBkBv+mhAFnpvwIae0Gj6qMErbJ3hXN1DQW08pEyXJa8I5hjahgNvSjFM8F1gdEePw6dpRi3IdVudbcBouunHJc7INMQfb2AkV2kJF2QaYcJMxuKvacoJZl940v0zAW2I+0XIPAAAjWZEGOgWSulaYdAI8zglkAz2iu2sK5KAjeEC3z9ArykvftA/lNfhnWTzUEcX78A7bSXw1eFzvbjrJPzkGaKn3sApwiA37w9U2Y9iOsenuznFwC0148Bct1lulA1SqbJyyqQYwSo4umTZiZJ3sNCI011W6GZWwSornDjFZMk7Ij4gKluOjRrpj2E6HzH5DyFJENUvA5kxzEChHv4ilHpGicyzFQzFZq5RoBwhe4sE3Eckiwy1ayEZjEiQLgTfUzCMwgyx6tu0IqYESDc1XZGoGozqGQumA3au4CoCicZl6x3xrd7VwY8RnvdiK7Qzrh6IccCz5rBgOu0l4ONtl7WoKgm3KRnLlQkjhHAUmeGsWQhxzAz0EGoRnsXYO0ZQylqE5xpBtoFzdwigL0HjAVirPXsJNAtAjhoa2UM3RDDpxtBcIwAbl4xEunDBed5cyc04BgBHF1jJMKPBRf9jwBw9YjOLkCKtf8jAJz105mcLmGvjoLdIoC7LF3JmSEywfxuI1SjvQuIIU9XZUgx1aMbIS4RoAtxXGEt4ksBuzzqBntNeznE0syahDeHDf/fCxDHMTo6Ayk8mA34A+2VEVORtUg/FF5uflkEzc7TXhdiesAwGoqBW80vq6GZSwTIIy6G0ZACx0p+KNxCKhEAkeqBwhvEvcmAtFdGTOHfABXbAIw3P4yAZi4R4Apiu8owGs6DlnmSAZ/TXh7xMYSKYvAW88NiaHac9pCALJ3chxQrPWkIpr0yEtDCQemoBDX5kQFTigBAv/YFAPPdBGiWUgSI0hsmvTV4h/lmGjRLKwLgM528gBhTvZgMQnslJKGZNYifF7PEfDMfip2ivStIQoZOjkGMnT4UglOLAKAbQZMjm3zYBKQWAfIMo6EtFDBfDYNmtFdCEroZQsNpIH7cDlkOxVwiwBkkoZ+1iL8ijI2mYh8Ue8LqxEaAVxBkg6lYB8WKtIckvKSbkxBkl6kYC8Vor4Qk9HFQSk6DAxPV7wJTiwDnODglDUGBJvW7wNQiwHWG0LIJANQPB7qTyaTyLzjHUBquB381WvuQeNorIQG3GELJWWDFGGPMduiVVgR4wFA6CsEVs5SXAU7SXh6x9bAGLRHgayFgL/RKqQrQSlfXIMtk5beCaK+lgLiKdPYRsmw2xkyEWifoorX9GGLoaWUtar4AGKp7OtBJurp05y3cdLI2NV8ANOmuAxUZR6krB2vPGMdRSKN7ATC28pmnsHCFkag4Cv5G9XywE0xE84eHPYig5wmj0dAQ/MNoMw9qnWRyWj4cySFER1eRrsRGwMAozTeDi0xY5vKz7s5cAX9q+3inn0n4Qt59NSkRBVEAbnMqc7bMWoYylT7og2UOVVr6cg6D6w6CCpjQNccy55zzr5XFiLLA3Lmz043fL6B2G+bcMN1HoM8iWQizmJhgX3jw0d3XV8N9AX1R+QOAaYanBRZpy1kotEe2waoSTVG4BKhaLlthVQ9N0bYL/N0WGQ+raIq6TcDvRtntDmIrAuhpD1hvmayFUUdoSRk67ZUNMMpUBFDUFqTeWBkIo2jIKWg1UMbBpgLtUHYV+E8DzF4HMBQBzkCvjNkCsBMBDkIxuwVAK95DM7MFYCYCXIRqGasXgqxEgANQzmoB2IgAYQXaWS0AWqCnL3RfzBaAhQjw5DgMMFoA+iPAXWWvgTZmtgBC6nbqHIwwWgDULH9fUzPIpqwWQIHR3bhz6VSWicvfMPPlr7JaAC4R4Bl6HSqFTM6py4a++1VmdwJDRodful7eC5iIQM9EqM4uAEYXos7xB8+zTMA+Rd3gO7cAnCIA/tF95UOW3t29A0MyJieG3WB0BTTUfflxwIjM3v9qYLLJK2HOEaCxc2d76NXh/bBiickOMYwuRHMP7jGCzvkR2CDTYc4zRncDLR16Qn8OGlkPrrXYJMw1ArT26hrj0jgcqon5MgrmeI4A9S6F9OQWDBhvsU8kowvRvsob+vEB+m2V5bDGJQIcQSQHDtOHu1Bvm+yBNW4RIKLiI7bB9I3wmokyDdY4RYDout4zvhDKLTQ4NK7f/g9d99iK+d+AIbIYxrhFADeFHrZg/L0QzLI3N9QtArg6wBaMvxky2l6r2DOMDjF8YEyXoJjBXsGMrgdxnAjoROuYmDr22sW7RwB3jxnLPqiVEZHJMMUtAsT0krG8gFZjRax1iXKKALGVGYva+wHLRGQOTGF0PYivkmUTZveDtojIGljiFgE86M4zhsvQabuIrIAlNxldET50Z9k3m42CgfUixgYGOEUAPypswmijiGEixrYCGV0PPCnSXR4qTbE2Pv4doyvBl/t0V4RGIsZ2gtwigDev6ewaFBosvZbADqcI4M9xutI5MGak9NoIOxhdDh4dZUuWVoKrpNcmmOEWAXwK6Ooe9NkuvSbBjJQjANqZHWrpGbBIeg2DGWfS/7uzJUOnwoNEbK0DGV0Oft1jRJoHx4rYWgemHwGAh3T1GNoMlho7U2PSjwBVbMXOZuBa+W4VjFAQAYAsazR8lLi2So2d6bGMLgff3EOAujfGp8l3Q2HDK0ZXgm8lNmdoGTBGRNMy4BxaCBldEb5dZytmOgaIqFoG9DC8uR99O0AH8O4yXd2GLgPkp6VQYD9rTn45h4bu0EEO3j2kq+vQZZn8tA4KXOMv79/eQT3XO3kleHebLZiZHzFXflqP9HWzTvD4Ul0RFAO6KMO7l2zBTM+YIfLTcKTvCP8RvH/ZhZrie7qBf0/ZhKlfABFRtAxgH4JcmKerHPy7x2YMZYCM/DYSabvEJJTgX5bNmbkSMlt+W4207WMSyvCPTRnaB5grv6TfJ6bARACaPqmyNwRHyG9TkLK7TEIO/pXoTNkYOanSshd4nol4Cv/ydKTtNHCc/Gk+UnWRiSjDu3N0FkCVVfKnqUgVkwH/TtORunfEJ8mfZiFN15mIHPyju09QZbSIaNkKyjIRT+HdUbrTNVEsIzUqDgQPMRll+NZNZ9rug8yXenORnpNMBrw7pevjxDFR6g1DaipMxmH49pDO1DWLGySiJQR8YCL8R4AK4zgNTTLyt5VICxNyAp7lGccraDJf/rYLKbnFpORPH4JHhxmDtgiwQv42BinJMkm5UgFeVPKM5TBUGS29NBwHXGHivh7dn/7HvAFNBsi/NiMVIfvFyVtdiOE549F2FjxD/rUeaehi/zl4swAn1xmTupOgCVKlYiF4iv0r/+FyBdG8zDIudTMEpZEN6H/dTEN48UEF7Sl8pAfa2gSOlBoFu8E3mZr8taOvKmjmzoFrrOm4J8BUqVKxEAyYsiB8fOTtoa5jqFMpX/90hk4sbANiuDQ0GP3tMhUJgmw2nw0CeqftJHCcNLYD/S3H/4Oy7jCrpbER6Gfv+J9Q1iBsmNRo2Awsl/6LHwGokpG+zEEaih1fBM+hygLpywSko9OL4BxUGSI1ajYDfyqWetiRTkKVjPyg50Dot+KRDiwCXbuAGC+i8BnwS+cVwRnoMkRE6TPgD4UjITtFGapkpCGFXWMLNzqiCJQlAMyQhpQ2DX1mvwh03QQBFssPWs4DWiqYzgTK9gAwQBrS1TLwX+UX+2iTtg7Rm6QJ3XNEX33K0xxlncGA4dLCWCjW/fBjlpYchDIbpE9Whgccu3Qt9WskbatAmZlSY2EroG8KLhJZfQBAWhsF9c7TBn3zgkfJH7RcC4nuEk1Qdg+o1whpwzho95gmKDsFrhog7dgJ7WxEgM9QZ55U2Y+BNiKAvgBYHwE13wpo4QANOAt9Rkl7FkO3C2zmLjW4CYWGSpuWQLWATWSBrpupHyFq/P5joLRrNzQ7xmY+oqb8Zh/Toq0n5Df27r03hiiM4/hvW/S2LqVKUZdQtyCuCY2QEPcEeWapSwX9g6IoWiqVEtFSKSGlwqvVuHTT7uzsnNm5PM85z+ct7GT2O2fOeea/NSjB54CAgeAEGKUZQxOXvQyw+zLEfwjvKDE2YPD69drow9SfGbvYvQD4aw/+kP8kWCEBSvTeGEjvImA3CqKoFaWYnREKoXIC+Op97KVkjJhqQhlsZgWE9KZCAvi75aViitiqg5G1xNV4pB1YXhq6bxJbjTAzn7gySICiq17yLo8SY5thaDXxdC/SLfiul7QuZp+FnKMGpjqIJ54J8JbZ8Z8SLTC2nFh66AW5R/68INWOBeoa5rb3u0QO5lqIpQQS4CPRzXfjXV4kj4aZrvvMsgwR5Iih4AR4SP7uhjq9ee/+z4nrJneDnkFeHwEoax6i2EkMvfCC+IdYpQSg2R7c/vz4bU/whXDp1uPn/HZ8ldUJ2HILSCABuqmMpzfHXo0MTn3r63/U3dPT0329/8uHH3deDU32kiwFwJpbwOUkEsB2nfAhc39wxASQNMAhbjMFYMWDQPwJwG2IXwKWIbIaYib2BGD3MZ/45TBD/nJgAgnwiSy3ElVoJFauRUqAJ04nQA3KkndQcFQTwFgeVdlOnExpAphqRAnBW4MCE+AS+XE9AQ6jShuJD00AY0fgS+gG4eAEeEN+HE+Aephg8zExX5oA5vZgFunvhDQBDBVgjM03ZX0EJ8A4+QtOgPtkszWIxTbiYSxSArx0NwEW4x9LHgUnvCC95MfpBFiAmOwmFjQBzDSjAmHHxTUBDCE++4mB4AS4QX5cToB9iNEuyp4mgJHViFM9ZS+BBPhK9qpDrI5T1oITYID8OJwAu+FL8O6wIU0AAznE7TBlbnKkP94E6CJr5RG7E8TB9EWgCVBZM+aw6qXQ5MivsAkw7GYCFBCK5KEhk3dvaQKUtQmJWEW8XC1eBM/Ij6sJ0IQZlv4JFE1fBJoAcxQQwKZN4sWL4Dv5cTUBOpCYPSSLkwlwDnNYtRxkws0EyCFJ7STJFS/IIFmpAYnqJEGGJQ51r9JRGLNlhmypPvcSoBFlWLY7KJzhPucSYCESlydJrrzucykBWpCCgyTMlXfvHUmAVUhFG8kzfRHYnwA1SEcryTR9EdidALUoz+EMmOXpzy/WJsB+pGYvSTZ9EdiYAKdRkV3bxKsiaNBvSG0Iweo3w24rIF11pFhpQMpWkmJkH8JxeG+A1VYhFA1BS8USgNZ8Vso9OWSjlhQLi5CRpaQYyCMzp0hlbgUytINUxnYjU+tIZaoJkdk1RNBRbcicsKMCdlmO7LXOI5WRwkIwwGWQqIPawcICUploABOCt4hJlgcbB0ilrgWM6JJg6k6BlRWkUtUJZk6SStFJsHOIVGoOgaGLpPy58fvrFVCOK78/h5HiTtgAtjaQ8mF9/xWdIZWwfWBNV4QSdhbMtZBK0Caw10EqMUshAKux8nY5DBHaBU2SkyRXCyEW6qGxBGxthRwSB4kxtwuiNJGKVTOEOUYqRjsgji4KxmgNBNIFgdjMh0jtOkosFsvrIZU+DMRgOwQ7T6pKByGa7ha2afd/FPN1XbgKOSan/6rRqiHg5t8/tw/PC3QBltBNItIPf1arVseIGGuT9PJPnwf/cnvxX/8G4lMQsffLTH0jqVCsqX+dKhnRCliqQd8OhbB1Eex1jlQg8Wv/lXToynCgJWwmf82iuwVTcgIO2KQ3gTKWCN35oyPG45D54Pc05XW+cImaLXCJviGcYz0cU7eY1Iy1cvd96m6x6s0TcOo/Ec2kfrd3fz0Jw0AAwLvBGKJz4AQWQZibgIiAgEIi4gR58EFfmn7/zyIxMTHGqIv70+vd72nv7dpr73bDFfx9VaB9gI/AfPSdiCbySwGtw7C75ohJ3PIvPUWfI3XCyLt7lLUilyqnfaPqoKsaLRUY+WyIqlhEV6jkOzYzNAeC6i0j37lDMQU0lxG8U6BMw/8zR+lYQKfF/3eusm0mGxT6/c2BkvcCLfXrPePTU650tELXPtHUJlwdYspIdE1Frgdt8H1+MlNQYCdo4yr2jJ0H+lhYle4XvwAZYJeBR0r4xMQBWDrWANngWVrFENRWoIUY67wT1guAJApEAOTnTvAYAArJ2wq295GJIfM6ICo0+ikwJ1LGA9ozBf2pseqS5YsaHu7vO7JwFEiyEIj2kpFMWENf8GyN6vTqZyvnZDYJ+mcmIzKwjsdlnqq8P6MEv2T2vJbgaSgtuoxIyvAGGk+M6C86FiOyO3Q3rTyPlVgFDh3zYcl1t+PSv+eBsB/CG4r1AKuZy+16YAseidDnlenQoJyeSqxT49x52oz9+eqiLHb4h92zptuvg/311YvbNTEN+xv+iIU0EItw3wAAAABJRU5ErkJggg==",
-        "lastBackup": null,
-        "currentDependencies": {},
-        "actions": {
-          "delete-coinstatsindex": {
-            "name": "Delete Coinstats Index",
-            "description": "Deletes the Coinstats Index (coinstatsindex) in case it gets corrupted.",
-            "warning": "The Coinstats Index will be rebuilt once Bitcoin Core is started again, unless you deactivate it in the config settings. Please don't do this unless instructed to by Start9 support staff.",
-            "visibility": "enabled",
-            "allowedStatuses": "only-stopped",
-            "hasInput": true,
-            "group": null
-          },
-          "delete-peers": {
-            "name": "Delete Peer List",
-            "description": "Deletes the Peer List (peers.dat) in case it gets corrupted.",
-            "warning": null,
-            "visibility": "enabled",
-            "allowedStatuses": "only-stopped",
-            "hasInput": true,
-            "group": null
-          },
-          "delete-txindex": {
-            "name": "Delete Transaction Index",
-            "description": "Deletes the Transaction Index (txindex) in case it gets corrupted.",
-            "warning": "The Transaction Index will be rebuilt once Bitcoin Core is started again, unless you deactivate it in the config settings. Please don't do this unless instructed to by Start9 support staff.",
-            "visibility": "enabled",
-            "allowedStatuses": "only-stopped",
-            "hasInput": true,
-            "group": null
-          },
-          "reindex": {
-            "name": "Reindex Blockchain",
-            "description": "Rebuilds the block and chainstate databases starting from genesis. If blocks already exist on disk, these are used rather than being redownloaded. For pruned nodes, this means downloading the entire blockchain over again.",
-            "warning": "Blocks not stored on disk will be redownloaded in order to rebuild the database. If your node is pruned, this action is equivalent to syncing the node from scratch, so this process could take weeks on low-end hardware.",
-            "visibility": "enabled",
-            "allowedStatuses": "any",
-            "hasInput": true,
-            "group": null
-          },
-          "reindex-chainstate": {
-            "name": "Reindex Chainstate",
-            "description": "Rebuilds the chainstate database using existing block index data; as the block index is not rebuilt, 'reindex_chainstate' should be strictly faster than 'reindex'. This action should only be used in the case of chainstate corruption; if the blocks stored on disk are corrupted, the 'reindex' action will need to be run instead.",
-            "warning": "While faster than 'Reindex', 'Reindex Chainstate' can still take several days or more to complete. Pruned nodes do not allow 'reindex-chainstate'; if you are running a pruned node and suspect chainstate corruption the 'reindex' action (requiring redownloading the entire Blockchain) should be run instead.",
-            "visibility": "enabled",
-            "allowedStatuses": "any",
-            "hasInput": true,
-            "group": null
-          },
-          "config": {
-            "name": "Configure",
-            "description": "Customize Bitcoin Core",
-            "warning": null,
-            "visibility": "enabled",
-            "allowedStatuses": "any",
-            "hasInput": true,
-            "group": null
-          },
-          "properties": {
-            "name": "Properties",
-            "description": "Runtime information, credentials, and other values of interest",
-            "warning": null,
-            "visibility": "enabled",
-            "allowedStatuses": "any",
-            "hasInput": false,
-            "group": null
-          }
-        },
-        "requestedActions": {},
-        "serviceInterfaces": {
-          "peer-8333": {
-            "id": "peer-8333",
-            "name": "Peer Interface",
-            "description": "Listens for incoming connections from peers on the bitcoin network",
-            "hasPrimary": false,
-            "masked": false,
-            "addressInfo": {
-              "username": null,
-              "hostId": "peer",
-              "internalPort": 8333,
-              "scheme": null,
-              "sslScheme": null,
-              "suffix": ""
-            },
-            "type": "api"
-          },
-          "rpc-8332": {
-            "id": "rpc-8332",
-            "name": "RPC Interface",
-            "description": "Listens for JSON-RPC commands",
-            "hasPrimary": false,
-            "masked": false,
-            "addressInfo": {
-              "username": null,
-              "hostId": "rpc",
-              "internalPort": 8332,
-              "scheme": "http",
-              "sslScheme": "https",
-              "suffix": ""
-            },
-            "type": "api"
-          },
-          "zmq-28332": {
-            "id": "zmq-28332",
-            "name": "ZeroMQ Interface",
-            "description": "Listens for subscriptions to the ZeroMQ raw block and raw transaction event streams",
-            "hasPrimary": false,
-            "masked": false,
-            "addressInfo": {
-              "username": null,
-              "hostId": "zmq",
-              "internalPort": 28332,
-              "scheme": null,
-              "sslScheme": null,
-              "suffix": ""
-            },
-            "type": "api"
-          }
-        },
-        "hosts": {
-          "peer": {
-            "kind": "multi",
-            "bindings": {
-              "8333": {
-                "enabled": false,
-                "options": {
-                  "preferredExternalPort": 8333,
-                  "addSsl": null,
-                  "secure": null
-                },
-                "lan": {
-                  "assignedPort": null,
-                  "assignedSslPort": null
-                }
-              }
-            },
-            "addresses": [
-              {
-                "kind": "onion",
-                "address": "m27eb66v4tndzhowirshkysxt6rmt6iubmjxxc2l2leca7lphcbs7sid"
-              }
-            ],
-            "hostnameInfo": {}
-          },
-          "rpc": {
-            "kind": "multi",
-            "bindings": {
-              "8332": {
-                "enabled": false,
-                "options": {
-                  "preferredExternalPort": 8332,
-                  "addSsl": {
-                    "preferredExternalPort": 443,
-                    "alpn": {
-                      "specified": [
-                        "http/1.1"
-                      ]
-                    }
-                  },
-                  "secure": null
-                },
-                "lan": {
-                  "assignedPort": null,
-                  "assignedSslPort": 49153
-                }
-              }
-            },
-            "addresses": [
-              {
-                "kind": "onion",
-                "address": "4dc6awce5nc4ldc36b4naibuzzsj5dwgyfvp43uc3mjp2nnvprchniyd"
-              }
-            ],
-            "hostnameInfo": {}
-          },
-          "zmq": {
-            "kind": "multi",
-            "bindings": {
-              "28332": {
-                "enabled": false,
-                "options": {
-                  "preferredExternalPort": 28332,
-                  "addSsl": null,
-                  "secure": null
-                },
-                "lan": {
-                  "assignedPort": null,
-                  "assignedSslPort": null
-                }
-              },
-              "28333": {
-                "enabled": false,
-                "options": {
-                  "preferredExternalPort": 28333,
-                  "addSsl": null,
-                  "secure": null
-                },
-                "lan": {
-                  "assignedPort": null,
-                  "assignedSslPort": null
-                }
-              }
-            },
-            "addresses": [
-              {
-                "kind": "onion",
-                "address": "dmdx34vr7mpjgtmxuhj67vmec7xvh7omxaxyunqpg35dvcbs4pvdh7id"
-              }
-            ],
-            "hostnameInfo": {}
-          }
-        },
-        "storeExposedDependents": []
-      },
-      "hello-world": {
-        "stateInfo": {
-          "state": "installed",
-          "manifest": {
-            "id": "hello-world",
-            "title": "Hello World",
-            "version": "0.3.6:0",
-            "satisfies": [],
-            "releaseNotes": "Revamped for StartOS 0.3.6",
-            "canMigrateTo": "=0.3.6:0",
-            "canMigrateFrom": "=0.3.6:0 || <0.3.6:0",
-            "license": "mit",
-            "wrapperRepo": "https://github.com/Start9Labs/hello-world-wrapper",
-            "upstreamRepo": "https://github.com/Start9Labs/hello-world",
-            "supportSite": "https://docs.start9.com/",
-            "marketingSite": "https://start9.com/",
-            "donationUrl": "https://donate.start9.com/",
-            "description": {
-              "short": "Bare bones example of a StartOS service",
-              "long": "Hello World is a template service that provides examples of basic StartOS features."
-            },
-            "images": {
-              "main": {
-                "source": "packed",
-                "arch": [
-                  "aarch64",
-                  "x86_64"
-                ],
-                "emulateMissingAs": "aarch64"
-              }
-            },
-            "assets": [],
-            "volumes": [
-              "main"
-            ],
-            "alerts": {
-              "install": "Optional alert to display before installing the service",
-              "uninstall": null,
-              "restore": null,
-              "start": null,
-              "stop": null
-            },
-            "dependencies": {},
-            "hardwareRequirements": {
-              "device": [],
-              "ram": null,
-              "arch": null
-            },
-            "gitHash": null,
-            "osVersion": "0.3.6"
-          }
-        },
-        "dataVersion": "0.3.6:0",
-        "status": {
-          "main": "error",
-          "debug": "Error { source: \n   0: \u001b[91minvalid type: map, expected a sequence at line 1 column 922\u001b[0m\n\nLocation:\n   \u001b[35m/home/rust/src/core/models/src/errors.rs\u001b[0m:\u001b[35m509\u001b[0m\n\n  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n   0: \u001b[91mstartos::s9pk::v2\u001b[0m\u001b[91m::\u001b[0m\u001b[91mdeserialize\u001b[0m\n      at \u001b[35mstartos/src/s9pk/v2/mod.rs\u001b[0m:\u001b[35m265\u001b[0m\n   1: \u001b[91mstartos::service\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/mod.rs\u001b[0m:\u001b[35m271\u001b[0m\n   2: \u001b[91mstartos::service::service_map\u001b[0m\u001b[91m::\u001b[0m\u001b[91mload\u001b[0m\n      at \u001b[35mstartos/src/service/service_map.rs\u001b[0m:\u001b[35m80\u001b[0m\n   3: \u001b[91mstartos::service::service_map\u001b[0m\u001b[91m::\u001b[0m\u001b[91minit\u001b[0m\n      at \u001b[35mstartos/src/service/service_map.rs\u001b[0m:\u001b[35m60\u001b[0m\n   4: \u001b[91mstartos::context::rpc\u001b[0m\u001b[91m::\u001b[0m\u001b[91mcleanup_and_initialize\u001b[0m\n      at \u001b[35mstartos/src/context/rpc.rs\u001b[0m:\u001b[35m300\u001b[0m\n   5: \u001b[91mstartos::context::rpc\u001b[0m\u001b[91m::\u001b[0m\u001b[91minit\u001b[0m\n      at \u001b[35mstartos/src/context/rpc.rs\u001b[0m:\u001b[35m118\u001b[0m\n   6: \u001b[91mstartos::bins::start_init\u001b[0m\u001b[91m::\u001b[0m\u001b[91msetup_or_init\u001b[0m\n      at \u001b[35mstartos/src/bins/start_init.rs\u001b[0m:\u001b[35m21\u001b[0m\n   7: \u001b[91mstartos::bins::start_init\u001b[0m\u001b[91m::\u001b[0m\u001b[91mmain\u001b[0m\n      at \u001b[35mstartos/src/bins/start_init.rs\u001b[0m:\u001b[35m204\u001b[0m\n   8: \u001b[91mstartos::bins::startd\u001b[0m\u001b[91m::\u001b[0m\u001b[91minner_main\u001b[0m\n      at \u001b[35mstartos/src/bins/startd.rs\u001b[0m:\u001b[35m21\u001b[0m\n\nBacktrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.\nRun with RUST_BACKTRACE=full to include source snippets., kind: Deserialization, revision: None }",
-          "message": "Deserialization Error: invalid type: map, expected a sequence at line 1 column 922",
-          "onRebuild": "start"
-        },
-        "registry": null,
-        "developerKey": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAhUw/T99KgSZQYh1mp1FzDaZCOLmSG9qYSMNjw5WCfP4=\n-----END PUBLIC KEY-----\n",
-        "icon": "data:image/png;base64,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",
-        "lastBackup": null,
-        "currentDependencies": {},
-        "actions": {
-          "set-name": {
-            "name": "Set Name",
-            "description": "Set your name so Hello World can say hello to you",
-            "warning": null,
-            "visibility": "enabled",
-            "allowedStatuses": "any",
-            "hasInput": true,
-            "group": null
-          },
-          "show-secret-phrase": {
-            "name": "Show Secret Phrase",
-            "description": "Reveal the secret phrase for Hello World",
-            "warning": null,
-            "visibility": "enabled",
-            "allowedStatuses": "any",
-            "hasInput": false,
-            "group": null
-          },
-          "name-to-logs": {
-            "name": "Print name to Logs",
-            "description": "Prints \"Hello [Name]\" to the service logs.",
-            "warning": null,
-            "visibility": "enabled",
-            "allowedStatuses": "only-running",
-            "hasInput": false,
-            "group": null
-          }
-        },
-        "requestedActions": {},
-        "serviceInterfaces": {
-          "ui": {
-            "id": "ui",
-            "name": "Web UI",
-            "description": "The web interface of Hello World",
-            "hasPrimary": false,
-            "masked": false,
-            "addressInfo": {
-              "username": null,
-              "hostId": "ui-multi",
-              "internalPort": 80,
-              "scheme": "http",
-              "sslScheme": "https",
-              "suffix": ""
-            },
-            "type": "ui"
-          }
-        },
-        "hosts": {
-          "ui-multi": {
-            "kind": "multi",
-            "bindings": {
-              "80": {
-                "enabled": false,
-                "options": {
-                  "preferredExternalPort": 80,
-                  "addSsl": {
-                    "preferredExternalPort": 443,
-                    "alpn": {
-                      "specified": [
-                        "http/1.1"
-                      ]
-                    }
-                  },
-                  "secure": null
-                },
-                "lan": {
-                  "assignedPort": null,
-                  "assignedSslPort": 49154
-                }
-              }
-            },
-            "addresses": [
-              {
-                "kind": "onion",
-                "address": "b5vx4e3liq2twdeuqqp5bcuvqvoh2hil3yyci7re4ioeiwz4q3qlg2qd"
-              }
-            ],
-            "hostnameInfo": {}
-          }
-        },
-        "storeExposedDependents": []
-      }
-    },
-    "ui": {
-      "name": null,
-      "ack-welcome": "0.3.5.1",
-      "marketplace": {
-        "selected-url": "https://registry.start9.com/",
-        "known-hosts": {
-          "https://registry.start9.com/": {
-            "name": "Start9 Registry"
-          },
-          "https://community-registry.start9.com/": {
-            "name": "Community Registry"
-          }
-        }
-      },
-      "dev": {},
-      "gaming": {
-        "snake": {
-          "high-score": 0
-        }
-      },
-      "ack-instructions": {},
-      "theme": "Dark",
-      "widgets": [],
-      "ackWelcome": "0.3.6-alpha.7"
-    }
-  }
-}
diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json
index bf6ad5b13..13d3450b2 100644
--- a/web/patchdb-ui-seed.json
+++ b/web/patchdb-ui-seed.json
@@ -1,6 +1,5 @@
 {
   "name": null,
-  "ackWelcome": "0.0.0",
   "marketplace": {
     "selectedUrl": "https://registry.start9.com/",
     "knownHosts": {
@@ -12,7 +11,6 @@
       }
     }
   },
-  "dev": {},
   "gaming": {
     "snake": {
       "highScore": 0
@@ -20,6 +18,5 @@
   },
   "ackInstructions": {},
   "theme": "Dark",
-  "widgets": [],
-  "ack-welcome": "0.3.6-alpha.9"
+  "widgets": []
 }

From f15251096c00682531e6318b5a5b40a917d66a41 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 3 Dec 2024 16:47:45 -0700
Subject: [PATCH 332/341] sdk beta.0

---
 sdk/package/package-lock.json | 4 ++--
 sdk/package/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
index 1f5715258..9abc963fb 100644
--- a/sdk/package/package-lock.json
+++ b/sdk/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha.21",
+  "version": "0.3.6-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha.21",
+      "version": "0.3.6-beta.0",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/sdk/package/package.json b/sdk/package/package.json
index 2bf4b71f5..a5bb78159 100644
--- a/sdk/package/package.json
+++ b/sdk/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-alpha.21",
+  "version": "0.3.6-beta.0",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",

From 1859c0505e1170d29b20d4b63899112cc6523177 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Fri, 6 Dec 2024 08:53:59 -0700
Subject: [PATCH 333/341] remove deprecated useHash param

---
 web/projects/install-wizard/src/app/app-routing.module.ts | 1 -
 web/projects/setup-wizard/src/app/app-routing.module.ts   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/web/projects/install-wizard/src/app/app-routing.module.ts b/web/projects/install-wizard/src/app/app-routing.module.ts
index 80901192f..ab9831822 100644
--- a/web/projects/install-wizard/src/app/app-routing.module.ts
+++ b/web/projects/install-wizard/src/app/app-routing.module.ts
@@ -14,7 +14,6 @@ const routes: Routes = [
     RouterModule.forRoot(routes, {
       scrollPositionRestoration: 'enabled',
       preloadingStrategy: PreloadAllModules,
-      useHash: true,
     }),
   ],
   exports: [RouterModule],
diff --git a/web/projects/setup-wizard/src/app/app-routing.module.ts b/web/projects/setup-wizard/src/app/app-routing.module.ts
index aa56c382d..78088236a 100644
--- a/web/projects/setup-wizard/src/app/app-routing.module.ts
+++ b/web/projects/setup-wizard/src/app/app-routing.module.ts
@@ -47,7 +47,6 @@ const routes: Routes = [
     RouterModule.forRoot(routes, {
       scrollPositionRestoration: 'enabled',
       preloadingStrategy: PreloadAllModules,
-      useHash: true,
       initialNavigation: 'disabled',
     }),
   ],

From c675d0feeec8837944ae4a04e310ad1c8637f39f Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Tue, 10 Dec 2024 17:55:20 +0100
Subject: [PATCH 334/341] Escape backslashes in /etc/issue to prevent unwanted
 newlines (#2797)

---
 debian/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/postinst b/debian/postinst
index 3714df8d4..bf9a8938e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -26,7 +26,7 @@ if [ -f /etc/default/grub ]; then
 fi
 
 # set local and remote login prompt
-echo "StartOS v$(cat /usr/lib/startos/VERSION.txt) [\m] on \n.local (\l)" > /etc/issue
+echo "StartOS v$(cat /usr/lib/startos/VERSION.txt) [\\m] on \\n.local (\\l)" > /etc/issue
 echo "StartOS v$(cat /usr/lib/startos/VERSION.txt)" > /etc/issue.net
 
 # change timezone

From e9d851e4d39d00416bd1d827c60eab4d6ea6498f Mon Sep 17 00:00:00 2001
From: Alex Inkin <alexander@inkin.ru>
Date: Thu, 12 Dec 2024 03:14:01 +0400
Subject: [PATCH 335/341] fix: reset sideload service after websocket completes
 (#2798)

* fix: reset sideload service after websocket completes

* chore: fix comment
---
 web/package-lock.json                         | 4515 ++++++++++-------
 web/package.json                              |    3 +-
 .../server-routes/sideload/sideload.page.ts   |    4 +-
 .../sideload/sideload.service.ts              |   12 +-
 4 files changed, 2596 insertions(+), 1938 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index a36b7511e..5652a0406 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -30,6 +30,7 @@
         "@start9labs/emver": "^0.1.5",
         "@start9labs/start-sdk": "file:../sdk/baseDist",
         "@taiga-ui/addon-charts": "3.96.0",
+        "@taiga-ui/addon-commerce": "3.96.0",
         "@taiga-ui/cdk": "3.96.0",
         "@taiga-ui/core": "3.96.0",
         "@taiga-ui/experimental": "3.96.0",
@@ -61,7 +62,7 @@
         "pbkdf2": "^3.1.2",
         "rxjs": "^7.8.1",
         "swiper": "^8.2.4",
-        "ts-matches": "^5.5.1",
+        "ts-matches": "^6.1.0",
         "tslib": "^2.3.0",
         "uuid": "^8.3.2",
         "zone.js": "^0.11.5"
@@ -115,72 +116,20 @@
         "rxjs": ">=7.0.0"
       }
     },
-    "../sdk/baseDist": {
-      "name": "@start9labs/start-sdk-base",
-      "license": "MIT",
-      "dependencies": {
-        "@iarna/toml": "^2.2.5",
-        "@noble/curves": "^1.4.0",
-        "@noble/hashes": "^1.4.0",
-        "isomorphic-fetch": "^3.0.0",
-        "lodash.merge": "^4.6.2",
-        "mime-types": "^2.1.35",
-        "ts-matches": "^5.5.1",
-        "yaml": "^2.2.2"
-      },
-      "devDependencies": {
-        "@types/jest": "^29.4.0",
-        "@types/lodash.merge": "^4.6.2",
-        "@types/mime-types": "^2.1.4",
-        "jest": "^29.4.3",
-        "peggy": "^3.0.2",
-        "prettier": "^3.2.5",
-        "ts-jest": "^29.0.5",
-        "ts-node": "^10.9.1",
-        "ts-pegjs": "^4.2.1",
-        "tsx": "^4.7.1",
-        "typescript": "^5.0.4"
-      }
-    },
-    "../sdk/dist": {
-      "name": "@start9labs/start-sdk",
-      "version": "0.3.6-alpha8",
-      "extraneous": true,
-      "license": "MIT",
-      "dependencies": {
-        "@iarna/toml": "^2.2.5",
-        "@noble/curves": "^1.4.0",
-        "@noble/hashes": "^1.4.0",
-        "isomorphic-fetch": "^3.0.0",
-        "lodash.merge": "^4.6.2",
-        "mime": "^4.0.3",
-        "ts-matches": "^5.5.1",
-        "yaml": "^2.2.2"
-      },
-      "devDependencies": {
-        "@types/jest": "^29.4.0",
-        "@types/lodash.merge": "^4.6.2",
-        "jest": "^29.4.3",
-        "peggy": "^3.0.2",
-        "prettier": "^3.2.5",
-        "ts-jest": "^29.0.5",
-        "ts-node": "^10.9.1",
-        "ts-pegjs": "^4.2.1",
-        "tsx": "^4.7.1",
-        "typescript": "^5.0.4"
-      }
-    },
+    "../sdk/baseDist": {},
     "node_modules/@adobe/css-tools": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz",
-      "integrity": "sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==",
-      "dev": true
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.1.tgz",
+      "integrity": "sha512-12WGKBQzjUAI4ayyF4IAtfw2QR/IDoqk6jTddXDhtYTJF9ASmoE1zst7cVtP0aL/F1jUJL5r+JxKXKEgHNbEUQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
       "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.1.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -194,6 +143,7 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1402.13.tgz",
       "integrity": "sha512-n0ISBuvkZHoOpAzuAZql1TU9VLHUE9e/a9g4VNOPHewjMzpN02VqeGKvJfOCKtzkCs6gVssIlILm2/SXxkIFxQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@angular-devkit/core": "14.2.13",
         "rxjs": "6.6.7"
@@ -209,6 +159,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "devOptional": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -220,13 +171,15 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "0BSD"
     },
     "node_modules/@angular-devkit/build-angular": {
       "version": "14.2.13",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-14.2.13.tgz",
       "integrity": "sha512-FJZKQ3xYFvEJ807sxVy4bCVyGU2NMl3UUPNfLIdIdzwwDEP9tx/cc+c4VtVPEZZfU8jVenu8XOvL6L0vpjt3yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.2.0",
         "@angular-devkit/architect": "0.1402.13",
@@ -335,6 +288,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
@@ -344,25 +298,29 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
       "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
       "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
       "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -373,13 +331,15 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
       "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -392,6 +352,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -401,6 +362,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
@@ -409,13 +371,15 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
       "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -432,6 +396,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
@@ -445,6 +410,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -457,6 +423,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -471,6 +438,7 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@xtuc/long": "4.2.2"
@@ -481,6 +449,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -497,6 +466,7 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
@@ -505,19 +475,22 @@
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -529,13 +502,15 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/schema-utils": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -553,13 +528,15 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
       "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
       "version": "5.76.1",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
       "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -607,6 +584,7 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1402.13.tgz",
       "integrity": "sha512-K27aJmuw86ZOdiu5PoGeGDJ2v7g2ZCK0bGwc8jzkjTLRfvd4FRKIIZumGv3hbQ3vQRLikiU6WMDRTFyCZky/EA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@angular-devkit/architect": "0.1402.13",
         "rxjs": "6.6.7"
@@ -626,6 +604,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -637,12 +616,14 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/@angular-devkit/core": {
       "version": "14.2.13",
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-14.2.13.tgz",
       "integrity": "sha512-aIefeZcbjghQg/V6U9CTLtyB5fXDJ63KwYqVYkWP+i0XriS5A9puFgq2u/OVsWxAfYvqpDqp5AdQ0g0bi3CAsA==",
+      "license": "MIT",
       "dependencies": {
         "ajv": "8.11.0",
         "ajv-formats": "2.1.1",
@@ -668,6 +649,7 @@
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -678,12 +660,14 @@
     "node_modules/@angular-devkit/core/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
     },
     "node_modules/@angular-devkit/schematics": {
       "version": "14.2.13",
       "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.2.13.tgz",
       "integrity": "sha512-2zczyeNzeBcrT2HOysv52X9SH3tZoHfWJvVf6H0SIa74rfDKEl7hFpKNXnh3x8sIMLj5mZn05n5RCqGxCczcIg==",
+      "license": "MIT",
       "dependencies": {
         "@angular-devkit/core": "14.2.13",
         "jsonc-parser": "3.1.0",
@@ -701,6 +685,7 @@
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -711,12 +696,14 @@
     "node_modules/@angular-devkit/schematics/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
     },
     "node_modules/@angular/animations": {
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-14.3.0.tgz",
       "integrity": "sha512-QoBcIKy1ZiU+4qJsAh5Ls20BupWiXiZzKb0s6L9/dntPt5Msr4Ao289XR2P6O1L+kTsCprH9Kt41zyGQ/bkRqg==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -732,6 +719,7 @@
       "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-14.2.13.tgz",
       "integrity": "sha512-I5EepRem2CCyS3GDzQxZ2ZrqQwVqoGoLY+ZQhsK1QGWUnUyFOjbv3OlUGxRUYwcedu19V1EBAKjmQ96HzMIcVQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@angular-devkit/architect": "0.1402.13",
         "@angular-devkit/core": "14.2.13",
@@ -767,6 +755,7 @@
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-14.3.0.tgz",
       "integrity": "sha512-pV9oyG3JhGWeQ+TFB0Qub6a1VZWMNZ6/7zEopvYivdqa5yDLLDSBRWb6P80RuONXyGnM1pa7l5nYopX+r/23GQ==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -782,6 +771,7 @@
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-14.3.0.tgz",
       "integrity": "sha512-E15Rh0t3vA+bctbKnBCaDmLvc3ix+ZBt6yFZmhZalReQ+KpOlvOJv+L9oiFEgg+rYVl2QdvN7US1fvT0PqswLw==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -802,6 +792,7 @@
       "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-14.3.0.tgz",
       "integrity": "sha512-eoKpKdQ2X6axMgzcPUMZVYl3bIlTMzMeTo5V29No4BzgiUB+QoOTYGNJZkGRyqTNpwD9uSBJvmT2vG9+eC4ghQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.17.2",
         "chokidar": "^3.0.0",
@@ -831,6 +822,7 @@
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-14.3.0.tgz",
       "integrity": "sha512-wYiwItc0Uyn4FWZ/OAx/Ubp2/WrD3EgUJ476y1XI7yATGPF8n9Ld5iCXT08HOvc4eBcYlDfh90kTXR6/MfhzdQ==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -846,6 +838,7 @@
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-14.3.0.tgz",
       "integrity": "sha512-fBZZC2UFMom2AZPjGQzROPXFWO6kvCsPDKctjJwClVC8PuMrkm+RRyiYRdBbt2qxWHEqOZM2OCQo73xUyZOYHw==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -864,6 +857,7 @@
       "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-14.3.0.tgz",
       "integrity": "sha512-Sij3OQzj1UGs1O8H9PxVAY/o27+oqZwQRnib66rsWvtbIBTjHp4FV3dTs5iVcr62GGv4V4Mff/2I82NP10GPQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || >=16.10.0"
       }
@@ -872,6 +866,7 @@
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-14.3.0.tgz",
       "integrity": "sha512-w9Y3740UmTz44T0Egvc+4QV9sEbO61L+aRHbpkLTJdlEGzHByZvxJmJyBYmdqeyTPwc/Zpy7c02frlpfAlyB7A==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -893,6 +888,7 @@
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-14.3.0.tgz",
       "integrity": "sha512-rneZiMrIiYRhrkQvdL40E2ErKRn4Zdo6EtjBM9pAmWeyoM8oMnOZb9gz5vhrkNWg06kVMVg0yKqluP5How7j3A==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -910,6 +906,7 @@
       "version": "14.2.13",
       "resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-14.2.13.tgz",
       "integrity": "sha512-WPkTgT3+VC/KeZMydZnTQJWTG5IVTSdkJfqmNQWfHXzpmm1CG4KvFRj3xEOXvaDmcL56nnqKhL/o66kpai15Qw==",
+      "license": "MIT",
       "dependencies": {
         "@angular-devkit/schematics": "14.2.13",
         "@schematics/angular": "14.2.13",
@@ -933,6 +930,7 @@
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-14.3.0.tgz",
       "integrity": "sha512-uip0V7w7k7xyxxpTPbr7EuMnYLj3FzJrwkLVJSEw3TMMGHt5VU5t4BBa9veGZOta2C205XFrTAHnp8mD+XYY1w==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -950,6 +948,7 @@
       "version": "14.3.0",
       "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-14.3.0.tgz",
       "integrity": "sha512-i5O7m1gQijWm7cgva0XTmOVBFrPrttNxFDwoMLMYCh8rHOCQUQ4DcVO1qTBPWU4SrY5BYPEvR+r05dYQLFYCBw==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -968,15 +967,18 @@
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz",
       "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -984,10 +986,11 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
-      "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz",
+      "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -997,6 +1000,7 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
       "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
@@ -1027,6 +1031,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -1036,6 +1041,7 @@
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz",
       "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.18.10",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -1050,6 +1056,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
       "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -1064,6 +1071,7 @@
       "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
       "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.18.6"
       },
@@ -1071,28 +1079,16 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
-      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
-      "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.24.7",
-        "@babel/helper-validator-option": "^7.24.7",
-        "browserslist": "^4.22.2",
+        "@babel/compat-data": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -1105,24 +1101,24 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz",
-      "integrity": "sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.7",
-        "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1133,12 +1129,13 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1149,18 +1146,20 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
-      "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+      "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1171,12 +1170,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1187,6 +1187,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -1196,6 +1197,7 @@
       "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
       "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.17.7",
         "@babel/helper-plugin-utils": "^7.16.7",
@@ -1213,6 +1215,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -1222,45 +1225,7 @@
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
       "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
-      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
-      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
-      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.24.7"
       },
@@ -1269,42 +1234,43 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz",
-      "integrity": "sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
-      "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1314,35 +1280,38 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
-      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
-      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
-      "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-wrap-function": "^7.24.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1352,26 +1321,28 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
-      "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+      "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.7",
-        "@babel/helper-optimise-call-expression": "^7.24.7"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1380,147 +1351,118 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
-      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
-      "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
-      "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
-      "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
-      "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers/node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+    "node_modules/@babel/parser": {
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/types": "^7.26.3"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
-      "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
-      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1529,12 +1471,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
-      "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1544,14 +1487,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
-      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1566,6 +1510,7 @@
       "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-plugin-utils": "^7.18.9",
@@ -1585,6 +1530,7 @@
       "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -1602,6 +1548,7 @@
       "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-static-block instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.21.0",
         "@babel/helper-plugin-utils": "^7.20.2",
@@ -1620,6 +1567,7 @@
       "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-dynamic-import instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
@@ -1637,6 +1585,7 @@
       "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.9",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
@@ -1654,6 +1603,7 @@
       "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-json-strings instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
@@ -1671,6 +1621,7 @@
       "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-logical-assignment-operators instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
@@ -1688,6 +1639,7 @@
       "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
@@ -1705,6 +1657,7 @@
       "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
@@ -1722,6 +1675,7 @@
       "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.20.5",
         "@babel/helper-compilation-targets": "^7.20.7",
@@ -1742,6 +1696,7 @@
       "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
@@ -1759,6 +1714,7 @@
       "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
@@ -1777,6 +1733,7 @@
       "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -1794,6 +1751,7 @@
       "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-create-class-features-plugin": "^7.21.0",
@@ -1813,6 +1771,7 @@
       "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
       "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -1829,6 +1788,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -1841,6 +1801,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -1853,6 +1814,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -1868,6 +1830,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
       "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -1880,6 +1843,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
       "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.3"
       },
@@ -1888,12 +1852,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
-      "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1907,6 +1872,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -1919,6 +1885,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -1931,6 +1898,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -1943,6 +1911,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -1955,6 +1924,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -1967,6 +1937,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -1979,6 +1950,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -1991,6 +1963,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -2006,6 +1979,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -2017,12 +1991,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
-      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2036,6 +2011,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
       "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6",
@@ -2049,12 +2025,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
-      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+      "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2064,12 +2041,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
-      "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2079,18 +2057,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz",
-      "integrity": "sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -2101,25 +2078,27 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
-      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/template": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2129,26 +2108,28 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz",
-      "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2158,13 +2139,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
-      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2174,12 +2156,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
-      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2189,13 +2172,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
-      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2205,13 +2188,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
-      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+      "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2221,14 +2205,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
-      "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2238,12 +2223,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
-      "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2253,12 +2239,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
-      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2268,13 +2255,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
-      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2284,14 +2272,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz",
-      "integrity": "sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2301,15 +2289,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
-      "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2319,13 +2308,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
-      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2335,13 +2325,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
-      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2351,12 +2342,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
-      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2366,13 +2358,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
-      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2382,14 +2375,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz",
-      "integrity": "sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2399,12 +2392,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
-      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2414,12 +2408,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
-      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2429,12 +2424,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
-      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -2445,12 +2441,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
-      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2464,6 +2461,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz",
       "integrity": "sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.9",
@@ -2484,17 +2482,19 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
-      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2504,13 +2504,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
-      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2520,12 +2521,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
-      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2535,12 +2537,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
-      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+      "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2550,12 +2553,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz",
-      "integrity": "sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+      "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2565,12 +2569,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
-      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2580,13 +2585,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
-      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2600,6 +2606,7 @@
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz",
       "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.18.8",
         "@babel/helper-compilation-targets": "^7.18.9",
@@ -2689,6 +2696,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -2698,6 +2706,7 @@
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz",
       "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
@@ -2709,17 +2718,12 @@
         "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
     "node_modules/@babel/runtime": {
       "version": "7.18.9",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
       "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -2732,6 +2736,7 @@
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
       "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
         "@babel/parser": "^7.18.10",
@@ -2742,19 +2747,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
-      "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7",
+      "version": "7.26.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+      "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.3",
+        "@babel/parser": "^7.26.3",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.3",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -2763,15 +2766,32 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
-      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+      "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.7",
+        "@babel/parser": "^7.26.3",
+        "@babel/types": "^7.26.3",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/@babel/template": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2782,6 +2802,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
       "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -2791,15 +2812,28 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/traverse/node_modules/jsesc": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@babel/types": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
-      "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2810,6 +2844,7 @@
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
       "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
       },
@@ -2822,6 +2857,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
       "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -2832,6 +2868,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
       "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.2",
         "postcss-selector-parser": "^6.0.10"
@@ -2847,11 +2884,43 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/@csstools/postcss-cascade-layers/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "license": "CC0-1.0",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@csstools/postcss-color-function": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
       "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -2872,6 +2941,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
       "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2891,6 +2961,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
       "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2910,6 +2981,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
       "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -2930,6 +3002,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
       "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.0",
         "postcss-selector-parser": "^6.0.10"
@@ -2945,11 +3018,43 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/@csstools/postcss-is-pseudo-class/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "license": "CC0-1.0",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@csstools/postcss-nested-calc": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
       "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2969,6 +3074,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
       "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -2988,6 +3094,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
       "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -3008,6 +3115,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
       "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -3023,6 +3131,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
       "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -3042,6 +3151,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
       "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -3061,6 +3171,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
       "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -3080,6 +3191,7 @@
       "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
       "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
       "dev": true,
+      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -3091,27 +3203,12 @@
         "postcss": "^8.2"
       }
     },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
-      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -3124,6 +3221,7 @@
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3136,12 +3234,14 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
       "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@ionic/angular": {
       "version": "6.7.5",
       "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.7.5.tgz",
       "integrity": "sha512-nV8HP7RedjYkIAT8nVr5ifHNT0D3XzA74RPG3/WCCFJKunERNJ9SBiNkCTWhUpSkqsYYwEB4+SOOHz+R5NLk/w==",
+      "license": "MIT",
       "dependencies": {
         "@ionic/core": "6.7.5",
         "ionicons": "^6.1.3",
@@ -3161,6 +3261,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/cli/-/cli-6.20.9.tgz",
       "integrity": "sha512-sItLCi7zXq1zARWIpZDinHhK8hvy+wzOx176QMOJV90BjDybkjGYu3rGu5TBjoqn104dRIZTC8rtCsnD/P3cQw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ionic/cli-framework": "5.1.3",
         "@ionic/cli-framework-output": "2.2.5",
@@ -3201,6 +3302,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-5.1.3.tgz",
       "integrity": "sha512-T2KN/TurzNoAcc3iDt1KHU6GeEa7x9kXngMnu5xs+DzJv5HhBKjVOoo74b8rgVxdPx+dLOV8aLrorlyvsHR/tQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ionic/cli-framework-output": "2.2.5",
         "@ionic/utils-array": "2.1.5",
@@ -3227,6 +3329,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.5.tgz",
       "integrity": "sha512-YeDLTnTaE6V4IDUxT8GDIep0GuRIFaR7YZDLANMuuWJZDmnTku6DP+MmQoltBeLmVvz1BAAZgk41xzxdq6H2FQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ionic/utils-terminal": "2.3.3",
         "debug": "^4.0.0",
@@ -3241,6 +3344,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.10.tgz",
       "integrity": "sha512-h8HbA0teR0vWtGKB3ahzRbDq4yYaxfukgbOqhu9CAEJHosoFlBmDB8PbPnGFYxUg2J1MuCqeiN2ftJQYV/BO1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ionic/utils-terminal": "2.3.3",
         "debug": "^4.0.0",
@@ -3251,69 +3355,12 @@
         "node": ">=10.3.0"
       }
     },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@ionic/cli-framework-prompts/node_modules/inquirer": {
       "version": "7.3.3",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
       "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.1.0",
@@ -3338,6 +3385,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -3349,180 +3397,31 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
-    "node_modules/@ionic/cli-framework-prompts/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@ionic/cli/node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli-framework/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli-framework/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@ionic/cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@ionic/cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@ionic/core": {
       "version": "6.7.5",
       "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.7.5.tgz",
       "integrity": "sha512-zRkRn+h/Vs3xt/EVgBdShMKDyeGOM4RU31NPF2icfu3CUTH+VrMV569MUnNjYvd1Lu2xK90pYy4TaicSWmC1Pw==",
+      "license": "MIT",
       "dependencies": {
         "@stencil/core": "^2.18.0",
         "ionicons": "^6.1.3",
@@ -3534,6 +3433,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
       "integrity": "sha512-HD72a71IQVBmQckDwmA8RxNVMTbxnaLbgFOl+dO5tbvW9CkkSFCv41h6fUuNsSEVgngfkn0i98HDuZC8mk+lTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -3547,6 +3447,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.6.tgz",
       "integrity": "sha512-eikrNkK89CfGPmexjTfSWl4EYqsPSBh0Ka7by4F0PLc1hJZYtJxUZV3X4r5ecA8ikjicUmcbU7zJmAjmqutG/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.0",
         "debug": "^4.0.0",
@@ -3562,6 +3463,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.5.tgz",
       "integrity": "sha512-HUQ1Ec4Mh2MXzzKdbbbDS6xYKwpFJ2XRY7SYXbaZT8+jiNahfHbsOfe62/p8bk41Yil7E9EagzGC2JvIFJh01w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -3575,6 +3477,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.5.tgz",
       "integrity": "sha512-XnYNSwfewUqxq+yjER1hxTKggftpNjFLJH0s37jcrNDwbzmbpFTQTVAp4ikNK4rd9DOebX/jbeZb8jfD86IYxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -3588,6 +3491,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.10.tgz",
       "integrity": "sha512-mZ7JEowcuGQK+SKsJXi0liYTcXd2bNMR3nE0CyTROpMECUpJeAvvaBaPGZf5ERQUPeWBVuwqAqjUmIdxhz5bxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ionic/utils-object": "2.1.5",
         "@ionic/utils-terminal": "2.3.3",
@@ -3605,6 +3509,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.5.tgz",
       "integrity": "sha512-hkm46uHvEC05X/8PHgdJi4l4zv9VQDELZTM+Kz69odtO9zZYfnt8DkfXHJqJ+PxmtiE5mk/ehJWLnn/XAczTUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "tslib": "^2.0.1"
@@ -3618,6 +3523,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.11.tgz",
       "integrity": "sha512-6zCDixNmZCbMCy5np8klSxOZF85kuDyzZSTTQKQP90ZtYNCcPYmuFSzaqDwApJT4r5L3MY3JrqK1gLkc6xiUPw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ionic/utils-array": "2.1.5",
         "@ionic/utils-fs": "3.1.6",
@@ -3637,6 +3543,7 @@
       "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.3.tgz",
       "integrity": "sha512-RnuSfNZ5fLEyX3R5mtcMY97cGD1A0NVBbarsSQ6yMMfRJ5YHU7hHVyUfvZeClbqkBC/pAqI/rYJuXKCT9YeMCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/slice-ansi": "^4.0.0",
         "debug": "^4.0.0",
@@ -3657,6 +3564,7 @@
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -3673,6 +3581,7 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -3682,6 +3591,7 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -3694,13 +3604,15 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3710,6 +3622,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
       "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.0.0",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -3723,6 +3636,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -3732,6 +3646,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -3741,6 +3656,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
@@ -3751,6 +3667,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
       "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -3772,6 +3689,7 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -3781,7 +3699,8 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@maskito/angular": {
       "version": "1.9.0",
@@ -3824,6 +3743,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/@materia-ui/ngx-monaco-editor/-/ngx-monaco-editor-6.0.0.tgz",
       "integrity": "sha512-gTqNQjOGznZxOC0NlmKdKSGCJuTts8YmK4dsTQAGc5IgIV7cZdQWiW6AL742h0ruED6q0cAunEYjXT6jzHBoIQ==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -3890,6 +3810,7 @@
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-14.2.13.tgz",
       "integrity": "sha512-RQx/rGX7K/+R55x1R6Ax1JzyeHi8cW11dEXpzHWipyuSpusQLUN53F02eMB4VTakXsL3mFNWWy4bX3/LSq8/9w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || >=16.10.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
@@ -3902,22 +3823,39 @@
       }
     },
     "node_modules/@noble/curves": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
-      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.7.0.tgz",
+      "integrity": "sha512-UTMhXK9SeDhFJVrHeUJ5uZlI6ajXg10O6Ddocf9S6GjbSBVZsJo88HzKwXznNfGpMTRDyJkqMjNDPYgf0qFWnw==",
+      "license": "MIT",
       "dependencies": {
-        "@noble/hashes": "1.4.0"
+        "@noble/hashes": "1.6.0"
+      },
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/curves/node_modules/@noble/hashes": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.6.0.tgz",
+      "integrity": "sha512-YUULf0Uk4/mAA89w+k3+yUYh6NrEvxZa5T6SY3wlMvE2chHkxFUUIDI8/XW1QSC357iA5pSnqt7XEhvFOqmDyQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.6.1.tgz",
+      "integrity": "sha512-pq5D8h10hHBjyqX+cfBm0i8JUXJ0UhczFc4r74zbuT9XgewFo2E3J1cOaGtdZynILNmQ685YWGzGE1Zv6io50w==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 16"
+        "node": "^14.21.3 || >=16"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
@@ -3928,6 +3866,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -3941,6 +3880,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -3950,6 +3890,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -3963,6 +3904,7 @@
       "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz",
       "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "@gar/promisify": "^1.1.3",
         "semver": "^7.3.5"
@@ -3976,6 +3918,7 @@
       "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-3.0.2.tgz",
       "integrity": "sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "@npmcli/promise-spawn": "^3.0.0",
         "lru-cache": "^7.4.4",
@@ -3996,6 +3939,7 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
       "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -4005,6 +3949,7 @@
       "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz",
       "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "npm-bundled": "^1.1.1",
         "npm-normalize-package-bin": "^1.0.1"
@@ -4022,6 +3967,7 @@
       "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==",
       "deprecated": "This functionality has been moved to @npmcli/fs",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "mkdirp": "^1.0.4",
         "rimraf": "^3.0.2"
@@ -4035,6 +3981,7 @@
       "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz",
       "integrity": "sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
@@ -4044,6 +3991,7 @@
       "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz",
       "integrity": "sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "infer-owner": "^1.0.4"
       },
@@ -4056,6 +4004,7 @@
       "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-4.2.1.tgz",
       "integrity": "sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "@npmcli/node-gyp": "^2.0.0",
         "@npmcli/promise-spawn": "^3.0.0",
@@ -4068,16 +4017,18 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.25",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
-      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
-      "dev": true
+      "version": "1.0.0-next.28",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
+      "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@rollup/plugin-json": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
       "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^3.0.8"
       },
@@ -4090,6 +4041,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz",
       "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "@types/resolve": "1.17.1",
@@ -4110,6 +4062,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
       "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "0.0.39",
         "estree-walker": "^1.0.1",
@@ -4126,12 +4079,14 @@
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@schematics/angular": {
       "version": "14.2.13",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-14.2.13.tgz",
       "integrity": "sha512-MLxTpTU3E8QACQ/5c0sENMR2gRiMXpGaKeD5IHY+3wyU2fUSJVB0QPU/l1WhoyZbX8N9ospBgf5UEG7taVF9rg==",
+      "license": "MIT",
       "dependencies": {
         "@angular-devkit/core": "14.2.13",
         "@angular-devkit/schematics": "14.2.13",
@@ -4151,7 +4106,8 @@
     "node_modules/@start9labs/emver": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/@start9labs/emver/-/emver-0.1.5.tgz",
-      "integrity": "sha512-1dhiG03VkfEwSLx/JPKVms6srAbYFQgwfSGhwpUKMDliMXuAHGVaueStmqzVxn3JpH/HEVz0QW8w/PXHqjdiIg=="
+      "integrity": "sha512-1dhiG03VkfEwSLx/JPKVms6srAbYFQgwfSGhwpUKMDliMXuAHGVaueStmqzVxn3JpH/HEVz0QW8w/PXHqjdiIg==",
+      "license": "MIT"
     },
     "node_modules/@start9labs/start-sdk": {
       "resolved": "../sdk/baseDist",
@@ -4161,6 +4117,7 @@
       "version": "2.22.3",
       "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz",
       "integrity": "sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==",
+      "license": "MIT",
       "bin": {
         "stencil": "bin/stencil"
       },
@@ -4191,7 +4148,6 @@
       "resolved": "https://registry.npmjs.org/@taiga-ui/addon-commerce/-/addon-commerce-3.96.0.tgz",
       "integrity": "sha512-Y1MACB6KrQVnNjgeKQrNfbz51jMXbU7j83sL28+6q8DS9LNv4DVcv/r/UvK2VZ1PhESkBU85NJAIHf5iy9GN4g==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "tslib": ">=2.7.0"
       },
@@ -4237,9 +4193,9 @@
       }
     },
     "node_modules/@taiga-ui/cdk/node_modules/@angular-devkit/core": {
-      "version": "18.2.9",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.9.tgz",
-      "integrity": "sha512-bsVt//5E0ua7FZfO0dCF/qGGY6KQD34/bNGyRu5B6HedimpdU2/0PGDptksU5v3yKEc9gNw0xC6mT0UsY/R9pA==",
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.0.4.tgz",
+      "integrity": "sha512-+imxIj1JLr2hbUYQePHgkTUKr0VmlxNSZvIREcCWtXUcdCypiwhJAtGXv6MfpB4hAx+FJZYEpVWeLwYOS/gW0A==",
       "license": "MIT",
       "optional": true,
       "peer": true,
@@ -4257,7 +4213,7 @@
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "chokidar": "^3.5.2"
+        "chokidar": "^4.0.0"
       },
       "peerDependenciesMeta": {
         "chokidar": {
@@ -4266,16 +4222,16 @@
       }
     },
     "node_modules/@taiga-ui/cdk/node_modules/@angular-devkit/schematics": {
-      "version": "18.2.9",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.9.tgz",
-      "integrity": "sha512-aIY5/IomDOINGCtFYi77uo0acDpdQNNCighfBBUGEBNMQ1eE3oGNGpLAH/qWeuxJndgmxrdKsvws9DdT46kLig==",
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.0.4.tgz",
+      "integrity": "sha512-2r6Qs4N5NSPho+qzegCYS8kIgylXyH4DHaS7HJ5+4XvM1I8V8AII8payLWkUK0i29XufVoD5XfPUFnjxZrBfYQ==",
       "license": "MIT",
       "optional": true,
       "peer": true,
       "dependencies": {
-        "@angular-devkit/core": "18.2.9",
+        "@angular-devkit/core": "19.0.4",
         "jsonc-parser": "3.3.1",
-        "magic-string": "0.30.11",
+        "magic-string": "0.30.12",
         "ora": "5.4.1",
         "rxjs": "7.8.1"
       },
@@ -4322,6 +4278,23 @@
         }
       }
     },
+    "node_modules/@taiga-ui/cdk/node_modules/chokidar": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@taiga-ui/cdk/node_modules/jsonc-parser": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
@@ -4330,9 +4303,9 @@
       "optional": true
     },
     "node_modules/@taiga-ui/cdk/node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "license": "MIT",
       "optional": true,
       "peer": true,
@@ -4388,6 +4361,21 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/@taiga-ui/cdk/node_modules/readdirp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@taiga-ui/core": {
       "version": "3.96.0",
       "resolved": "https://registry.npmjs.org/@taiga-ui/core/-/core-3.96.0.tgz",
@@ -4433,9 +4421,9 @@
       }
     },
     "node_modules/@taiga-ui/i18n": {
-      "version": "3.96.0",
-      "resolved": "https://registry.npmjs.org/@taiga-ui/i18n/-/i18n-3.96.0.tgz",
-      "integrity": "sha512-SGO89mRhmdD3BldQJiSqDCftEjjaOKXLJFFEZWBtrhelxKX5hWJ2lL0O+WzVAMegbQqHoT60HoHrWZIlSy9tVQ==",
+      "version": "3.99.0",
+      "resolved": "https://registry.npmjs.org/@taiga-ui/i18n/-/i18n-3.99.0.tgz",
+      "integrity": "sha512-2ZfdNXVIej+DZ4t7sZ1O87+FOOkZLFYFnoxqSZy+hOMPSqqXc5EvQza/mtQFzaOAOLk9Jd8nKJQQzmHQJbuDcw==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": ">=2.7.0"
@@ -4490,6 +4478,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@tinkoff/ng-dompurify/-/ng-dompurify-4.0.0.tgz",
       "integrity": "sha512-BjKUweWLrOx8UOZw+Tl+Dae5keYuSbeMkppcXQdsvwASMrPfmP7d3Q206Q6HDqOV2WnpnFqGUB95IMbLAeRRuw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -4504,6 +4493,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@tinkoff/ng-event-plugins/-/ng-event-plugins-3.2.0.tgz",
       "integrity": "sha512-n56R5xNfiytabh2WmWdQXfNU6m7dfOo3LLxlARE+DX7f5yciW2xBdDkuEHX74q8dlCuAVlW9aslSfz8c//ymwA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -4517,6 +4507,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/@tinkoff/ng-polymorpheus/-/ng-polymorpheus-4.3.0.tgz",
       "integrity": "sha512-Ck/XCLuBwlUgvK22PxTlLTZhGG6I32kLqLYtDQh8N/QZZhs40+hb/78/ElFGzD567CCvrzNnueFkaOoXhuEVrw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "2.6.2"
       },
@@ -4528,13 +4519,15 @@
     "node_modules/@tinkoff/ng-polymorpheus/node_modules/tslib": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "license": "0BSD"
     },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
       "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -4588,31 +4581,36 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
       "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
       "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
       "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
       "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/body-parser": {
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
       "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -4623,6 +4621,7 @@
       "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
       "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4632,6 +4631,7 @@
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4641,6 +4641,7 @@
       "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
       "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/express-serve-static-core": "*",
         "@types/node": "*"
@@ -4650,15 +4651,17 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.4.0.tgz",
       "integrity": "sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==",
+      "license": "MIT",
       "dependencies": {
         "@types/trusted-types": "*"
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.56.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
-      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -4669,6 +4672,7 @@
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -4678,13 +4682,15 @@
       "version": "0.0.51",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
       "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/express": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
       "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
@@ -4693,10 +4699,11 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.19.5",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
-      "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz",
+      "integrity": "sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -4704,26 +4711,42 @@
         "@types/send": "*"
       }
     },
-    "node_modules/@types/fs-extra": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
-      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+    "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
+      "version": "4.19.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
-      }
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/http-errors": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
       "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.14",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
-      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
+      "version": "1.17.15",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+      "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4732,25 +4755,29 @@
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
       "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/marked": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.3.2.tgz",
       "integrity": "sha512-a79Yc3TOk6dGdituy8hmTTJXjOkZ7zsFYV10L337ttq/rec8lRMDBpV7fL3uLx6TgbFCa5DU/h8FmIBQPSbU0w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/minimatch": {
       "version": "3.0.5",
@@ -4763,19 +4790,22 @@
       "version": "4.2.5",
       "resolved": "https://registry.npmjs.org/@types/mustache/-/mustache-4.2.5.tgz",
       "integrity": "sha512-PLwiVvTBg59tGFL/8VpcGvqOu3L4OuveNvPi0EYbWchRdEVP++yRUXJPFl+CApKEq13017/4Nf7aQ5lTtHUNsA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "16.18.101",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.101.tgz",
-      "integrity": "sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA==",
-      "dev": true
+      "version": "16.18.121",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.121.tgz",
+      "integrity": "sha512-Gk/pOy8H0cvX8qNrwzElYIECpcUn87w4EAEFXFvPJ8qsP9QR/YqukUORSy0zmyDyvdo149idPpy4W6iC5aSbQA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node-forge": {
       "version": "1.3.11",
       "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
       "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4785,6 +4815,7 @@
       "resolved": "https://registry.npmjs.org/@types/node-jose/-/node-jose-1.1.13.tgz",
       "integrity": "sha512-QjMd4yhwy1EvSToQn0YI3cD29YhyfxFwj7NecuymjLys2/P0FwxWnkgBlFxCai6Y3aBCe7rbwmqwJJawxlgcXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4793,34 +4824,39 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
       "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/pbkdf2": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.2.tgz",
       "integrity": "sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.15",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
-      "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
-      "dev": true
+      "version": "6.9.17",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
+      "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
       "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/resolve": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
       "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4829,13 +4865,15 @@
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
       "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/send": {
       "version": "0.17.4",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
       "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
         "@types/node": "*"
@@ -4846,6 +4884,7 @@
       "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
       "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
@@ -4855,6 +4894,7 @@
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
       "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
         "@types/node": "*",
@@ -4865,13 +4905,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/sockjs": {
       "version": "0.3.36",
       "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
       "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -4879,181 +4921,199 @@
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "license": "MIT"
     },
     "node_modules/@types/uuid": {
       "version": "8.3.4",
       "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
       "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/ws": {
-      "version": "8.5.10",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
-      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+      "version": "8.5.13",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
+      "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
+      "license": "Apache-2.0",
       "peer": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -5061,38 +5121,44 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/@yarnpkg/lockfile": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "deprecated": "Use your platform's native atob() and btoa() methods instead",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -5101,11 +5167,22 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5117,26 +5194,19 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
       "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "deprecated": "package has been renamed to acorn-import-attributes",
       "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-      "dev": true,
-      "peer": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^8"
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.0"
       },
@@ -5149,6 +5219,7 @@
       "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
       "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "loader-utils": "^2.0.0",
         "regex-parser": "^2.2.11"
@@ -5162,6 +5233,7 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
       "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -5176,6 +5248,7 @@
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "4"
       },
@@ -5188,6 +5261,7 @@
       "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz",
       "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "humanize-ms": "^1.2.1"
       },
@@ -5200,6 +5274,7 @@
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
       "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -5212,6 +5287,7 @@
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
       "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -5227,6 +5303,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -5244,6 +5321,7 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -5255,6 +5333,7 @@
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/angular-svg-round-progressbar/-/angular-svg-round-progressbar-9.0.0.tgz",
       "integrity": "sha512-q8d2AEG9u+GMAMrZY40NgejN5fHwR4iK+rRxtJ7NnMEvvuAMqt9UEtKe0SqVQHvZYE6W16L5J9yaO+TEtfRjpw==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -5268,6 +5347,7 @@
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
       "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5277,6 +5357,7 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -5295,6 +5376,7 @@
       "engines": [
         "node >= 0.8.0"
       ],
+      "license": "Apache-2.0",
       "bin": {
         "ansi-html": "bin/ansi-html"
       }
@@ -5303,26 +5385,31 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/ansi-to-html": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.7.2.tgz",
       "integrity": "sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g==",
+      "license": "MIT",
       "dependencies": {
         "entities": "^2.2.0"
       },
@@ -5338,6 +5425,7 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -5350,7 +5438,8 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
       "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/are-we-there-yet": {
       "version": "3.0.1",
@@ -5358,6 +5447,7 @@
       "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
       "deprecated": "This package is no longer supported.",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "delegates": "^1.0.0",
         "readable-stream": "^3.6.0"
@@ -5370,12 +5460,14 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
     },
     "node_modules/array-differ": {
       "version": "3.0.0",
@@ -5391,7 +5483,8 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/array-union": {
       "version": "2.1.0",
@@ -5418,6 +5511,7 @@
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
       "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.1"
       },
@@ -5430,6 +5524,7 @@
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5438,13 +5533,15 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -5454,6 +5551,7 @@
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true,
+      "license": "(MIT OR Apache-2.0)",
       "bin": {
         "atob": "bin/atob.js"
       },
@@ -5462,9 +5560,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.19",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
-      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
+      "version": "10.4.20",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
       "dev": true,
       "funding": [
         {
@@ -5480,12 +5578,13 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.0",
-        "caniuse-lite": "^1.0.30001599",
+        "browserslist": "^4.23.3",
+        "caniuse-lite": "^1.0.30001646",
         "fraction.js": "^4.3.7",
         "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
+        "picocolors": "^1.0.1",
         "postcss-value-parser": "^4.2.0"
       },
       "bin": {
@@ -5503,6 +5602,7 @@
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
       "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-cache-dir": "^3.3.1",
         "loader-utils": "^2.0.0",
@@ -5522,6 +5622,7 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
       "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -5536,6 +5637,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -5552,6 +5654,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
       "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.17.7",
         "@babel/helper-define-polyfill-provider": "^0.3.3",
@@ -5566,6 +5669,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -5575,6 +5679,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz",
       "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.3.2",
         "core-js-compat": "^3.21.0"
@@ -5588,6 +5693,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
       "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.3.3"
       },
@@ -5599,7 +5705,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
@@ -5618,12 +5725,14 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/base64url": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -5632,13 +5741,15 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -5648,6 +5759,7 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -5659,6 +5771,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "license": "MIT",
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -5683,16 +5796,18 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.5",
@@ -5702,7 +5817,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -5717,6 +5832,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -5725,15 +5841,17 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/body-parser/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -5743,10 +5861,11 @@
       }
     },
     "node_modules/bonjour-service": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "multicast-dns": "^7.2.5"
@@ -5756,13 +5875,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -5772,6 +5893,7 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -5780,9 +5902,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
-      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
       "dev": true,
       "funding": [
         {
@@ -5798,11 +5920,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001629",
-        "electron-to-chromium": "^1.4.796",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.16"
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5829,6 +5952,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.2.1"
@@ -5838,13 +5962,15 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
       "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -5857,6 +5983,7 @@
       "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
       "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.0.0"
       }
@@ -5866,6 +5993,7 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -5875,6 +6003,7 @@
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.2.tgz",
       "integrity": "sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "@npmcli/fs": "^2.1.0",
         "@npmcli/move-file": "^2.0.0",
@@ -5904,21 +6033,22 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
       "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5927,11 +6057,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.0.tgz",
+      "integrity": "sha512-CCKAP2tkPau7D3GE8+V8R6sQubA9R5foIzGp+85EXCVSCivuxBNAWqcpn72PKYiIcqoViv/kcUDpaEIMBVi1lQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5940,14 +6085,15 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001640",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
-      "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
+      "version": "1.0.30001687",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz",
+      "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==",
       "dev": true,
       "funding": [
         {
@@ -5962,47 +6108,54 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/cbor": {
       "name": "@jprochazk/cbor",
       "version": "0.4.9",
       "resolved": "https://registry.npmjs.org/@jprochazk/cbor/-/cbor-0.4.9.tgz",
-      "integrity": "sha512-FWNnkOtWrFOLXKG2nzOHR/EnCCGZZPvatAvWXDmkTDxgjj9JHDK3DkMUHcFCY3a9weylMCSO/nLOUM170NAO0Q=="
+      "integrity": "sha512-FWNnkOtWrFOLXKG2nzOHR/EnCCGZZPvatAvWXDmkTDxgjj9JHDK3DkMUHcFCY3a9weylMCSO/nLOUM170NAO0Q==",
+      "license": "MIT"
     },
     "node_modules/cbor-web": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/cbor-web/-/cbor-web-8.1.0.tgz",
       "integrity": "sha512-2hWHHMVrfffgoEmsAUh8vCxHoLa1vgodtC73+C5cSarkJlwTapnqAzcHINlP6Ej0DXuP4OmmJ9LF+JaNM5Lj/g==",
+      "license": "MIT",
       "engines": {
         "node": ">=12.19"
       }
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/chardet": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -6027,6 +6180,7 @@
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -6036,6 +6190,7 @@
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
       "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0"
       }
@@ -6044,15 +6199,20 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.6.tgz",
+      "integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==",
+      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "^2.0.4",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
     "node_modules/clean-stack": {
@@ -6060,6 +6220,7 @@
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6068,6 +6229,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
       "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^3.1.0"
       },
@@ -6079,6 +6241,7 @@
       "version": "2.9.2",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
       "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -6091,6 +6254,7 @@
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
       "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^5.0.0",
         "string-width": "^5.0.0"
@@ -6103,10 +6267,11 @@
       }
     },
     "node_modules/cli-truncate/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6119,6 +6284,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6130,13 +6296,15 @@
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cli-truncate/node_modules/is-fullwidth-code-point": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
       "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6149,6 +6317,7 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
       "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.0.0",
         "is-fullwidth-code-point": "^4.0.0"
@@ -6165,6 +6334,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -6182,6 +6352,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -6197,6 +6368,7 @@
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
       "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">= 10"
       }
@@ -6206,6 +6378,7 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -6216,6 +6389,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
       "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -6225,6 +6399,7 @@
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -6242,25 +6417,29 @@
       "optional": true
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "devOptional": true,
+      "license": "ISC",
       "bin": {
         "color-support": "bin.js"
       }
@@ -6269,13 +6448,15 @@
       "version": "2.0.20",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -6288,6 +6469,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
       "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || >=14"
       }
@@ -6296,19 +6478,22 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/compare-versions": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
       "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/component-emitter": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -6318,6 +6503,7 @@
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
       },
@@ -6326,37 +6512,30 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
+      "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
         "debug": "2.6.9",
+        "negotiator": "~0.6.4",
         "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/compression/node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/compression/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -6365,25 +6544,22 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
       "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -6392,13 +6568,15 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -6411,6 +6589,7 @@
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6419,13 +6598,15 @@
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6434,19 +6615,22 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cookiejar": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
       "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/copy-anything": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
       "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-what": "^3.14.1"
       },
@@ -6459,6 +6643,7 @@
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
       "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-glob": "^3.2.11",
         "glob-parent": "^6.0.1",
@@ -6483,6 +6668,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -6495,6 +6681,7 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
       "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -6510,22 +6697,24 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.37.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
-      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==",
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
+      "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==",
       "hasInstallScript": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.37.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz",
-      "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+      "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.0"
+        "browserslist": "^4.24.2"
       },
       "funding": {
         "type": "opencollective",
@@ -6536,13 +6725,15 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cosmiconfig": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
       "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -6558,6 +6749,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "license": "MIT",
       "dependencies": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -6570,6 +6762,7 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "license": "MIT",
       "dependencies": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -6583,13 +6776,15 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/critters": {
       "version": "0.0.16",
       "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz",
       "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "chalk": "^4.1.0",
         "css-select": "^4.2.0",
@@ -6599,81 +6794,12 @@
         "pretty-bytes": "^5.3.0"
       }
     },
-    "node_modules/critters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/critters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/critters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/critters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -6688,6 +6814,7 @@
       "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
       "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -6701,11 +6828,26 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/css-blank-pseudo/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/css-has-pseudo": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
       "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -6719,11 +6861,26 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/css-has-pseudo/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/css-loader": {
       "version": "6.7.1",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
       "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.1.0",
         "postcss": "^8.4.7",
@@ -6750,6 +6907,7 @@
       "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
       "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
       "dev": true,
+      "license": "CC0-1.0",
       "bin": {
         "css-prefers-color-scheme": "dist/cli.cjs"
       },
@@ -6765,6 +6923,7 @@
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
       "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^6.0.1",
@@ -6781,6 +6940,7 @@
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
       "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
       },
@@ -6802,13 +6962,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/csstools"
         }
-      ]
+      ],
+      "license": "CC0-1.0"
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -6820,13 +6982,15 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
       "integrity": "sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/data-uri-to-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
       "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -6835,13 +6999,15 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
       "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6858,6 +7024,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6867,6 +7034,7 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
@@ -6875,13 +7043,15 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6891,6 +7061,7 @@
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
       "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "execa": "^5.0.0"
       },
@@ -6902,6 +7073,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
       "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "license": "MIT",
       "dependencies": {
         "clone": "^1.0.2"
       },
@@ -6914,6 +7086,7 @@
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -6931,6 +7104,7 @@
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -6940,6 +7114,7 @@
       "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.4.tgz",
       "integrity": "sha512-Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ast-types": "^0.13.2",
         "escodegen": "^1.8.1",
@@ -6955,6 +7130,7 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -6963,13 +7139,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -6979,6 +7157,7 @@
       "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
       "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -6988,6 +7167,7 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
@@ -6997,13 +7177,15 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -7011,13 +7193,15 @@
     "node_modules/dijkstrajs": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
-      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
+      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
+      "license": "MIT"
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -7030,6 +7214,7 @@
       "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
       "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
       },
@@ -7042,6 +7227,7 @@
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
       "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -7055,6 +7241,7 @@
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.6.tgz",
       "integrity": "sha512-emjdpPLhpNubapLFdjNL9tP06Sr+GZkrIHEXLWvOGsytACUrkbeIdjO5g77m00BrHTznnlcNqgmn7pCN192TBA==",
+      "license": "MIT",
       "dependencies": {
         "ssr-window": "^4.0.0"
       }
@@ -7069,13 +7256,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/fb55"
         }
-      ]
+      ],
+      "license": "BSD-2-Clause"
     },
     "node_modules/domhandler": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
       "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.2.0"
       },
@@ -7087,15 +7276,17 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.5.tgz",
-      "integrity": "sha512-FgbqnEPiv5Vdtwt6Mxl7XSylttCC03cqP5ldNT2z+Kj0nLxPHJH4+1Cyf5Jasxhw93Rl4Oo11qRoUV72fmya2Q=="
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.7.tgz",
+      "integrity": "sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q==",
+      "license": "(MPL-2.0 OR Apache-2.0)"
     },
     "node_modules/domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
       "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^1.0.1",
         "domelementtype": "^2.2.0",
@@ -7105,17 +7296,34 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.0.tgz",
+      "integrity": "sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
       "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "readable-stream": "^2.0.2"
       }
@@ -7125,6 +7333,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -7139,13 +7348,15 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/duplexer2/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -7154,25 +7365,29 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.816",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.816.tgz",
-      "integrity": "sha512-EKH5X5oqC6hLmiS7/vYtZHZFTNdhsYG5NVPRN6Yn0kQHNBlT59+xSM8HBy66P5fxWpKgZbPqb+diC64ng295Jw==",
-      "dev": true
+      "version": "1.5.71",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz",
+      "integrity": "sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/elementtree": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
       "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "sax": "1.1.4"
       },
@@ -7183,27 +7398,25 @@
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
-    "node_modules/encode-utf8": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
-      "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
-    },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -7213,6 +7426,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
@@ -7223,6 +7437,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -7236,15 +7451,17 @@
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.17.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
-      "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -7257,6 +7474,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "license": "BSD-2-Clause",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -7266,6 +7484,7 @@
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
       "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7274,13 +7493,15 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
       "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "prr": "~1.0.1"
@@ -7294,18 +7515,17 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -7315,6 +7535,7 @@
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -7324,12 +7545,14 @@
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
       "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "license": "MIT"
     },
     "node_modules/esbuild": {
       "version": "0.15.5",
@@ -7337,6 +7560,7 @@
       "integrity": "sha512-VSf6S1QVqvxfIsSKb3UKr3VhUCis7wgDbtF4Vd9z84UJr05/Sp2fRKmzC+CSPG/dNAPPJZ0BTBLTT1Fhd6N9Gg==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "bin": {
         "esbuild": "bin/esbuild"
@@ -7376,6 +7600,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -7392,6 +7617,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -7408,6 +7634,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -7424,6 +7651,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -7440,6 +7668,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -7456,6 +7685,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -7472,6 +7702,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -7488,6 +7719,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -7504,6 +7736,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -7520,6 +7753,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -7536,6 +7770,7 @@
         "mips64el"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -7552,6 +7787,7 @@
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -7568,6 +7804,7 @@
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -7584,6 +7821,7 @@
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -7600,6 +7838,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -7616,6 +7855,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -7632,6 +7872,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -7645,6 +7886,7 @@
       "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.15.5.tgz",
       "integrity": "sha512-lTJOEKekN/4JI/eOEq0wLcx53co2N6vaT/XjBz46D1tvIVoUEyM0o2K6txW6gEotf31szFD/J1PbxmnbkGlK9A==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -7660,6 +7902,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -7676,6 +7919,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -7692,6 +7936,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -7701,10 +7946,11 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7713,13 +7959,15 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -7729,6 +7977,7 @@
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
       "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
@@ -7751,6 +8000,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -7761,6 +8011,7 @@
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -7774,6 +8025,7 @@
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -7787,6 +8039,7 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -7799,6 +8052,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -7808,6 +8062,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -7816,13 +8071,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
       "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7832,6 +8089,7 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -7840,19 +8098,22 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz",
       "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }
@@ -7862,6 +8123,7 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -7884,40 +8146,42 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
       "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "Apache-2.0"
     },
     "node_modules/express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -7926,6 +8190,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
@@ -7933,6 +8201,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -7941,15 +8210,17 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/express/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -7963,6 +8234,7 @@
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
       "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
@@ -7975,13 +8247,15 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
       "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -7996,25 +8270,29 @@
     "node_modules/fast-json-patch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
-      "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ=="
+      "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==",
+      "license": "MIT"
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-uri": {
       "version": "3.0.3",
@@ -8029,6 +8307,7 @@
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
       "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -8038,6 +8317,7 @@
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "websocket-driver": ">=0.5.1"
       },
@@ -8050,6 +8330,7 @@
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
       "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -8065,6 +8346,7 @@
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
       "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -8074,6 +8356,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -8082,13 +8365,14 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -8104,6 +8388,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -8112,13 +8397,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/find-cache-dir": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
       "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -8135,6 +8422,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -8148,6 +8436,7 @@
       "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz",
       "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver-regex": "^3.1.2"
       },
@@ -8159,9 +8448,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true,
       "funding": [
         {
@@ -8169,6 +8458,7 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -8179,10 +8469,11 @@
       }
     },
     "node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.2.tgz",
+      "integrity": "sha512-sJe+TQb2vIaIyO783qN6BlMYWMw3WBOHA1Ay2qxsnjuafEOQFJ2JakedOQirT6D5XPRxDvS7AHYyem9fTpb4LQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -8198,6 +8489,7 @@
       "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
       "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
@@ -8207,6 +8499,7 @@
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -8216,6 +8509,7 @@
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
       "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       },
@@ -8229,6 +8523,7 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -8238,6 +8533,7 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -8253,6 +8549,7 @@
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -8264,13 +8561,15 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
       "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
-      "dev": true
+      "dev": true,
+      "license": "Unlicense"
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -8278,6 +8577,7 @@
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -8303,13 +8603,15 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
       "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ftp/node_modules/readable-stream": {
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
       "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.1",
@@ -8321,13 +8623,15 @@
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
       "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "devOptional": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -8336,6 +8640,7 @@
       "version": "6.6.2",
       "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
       "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
       }
@@ -8346,6 +8651,7 @@
       "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
       "deprecated": "This package is no longer supported.",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "aproba": "^1.0.3 || ^2.0.0",
         "color-support": "^1.1.3",
@@ -8365,6 +8671,7 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -8373,21 +8680,26 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.5.tgz",
+      "integrity": "sha512-Y4+pKa7XeRUPWFNvOOYHkRYrfzW07oraURSvjDmRVOJ748OrVmeXtpE4+GCEHncjCjkTxPNRt8kEbxDhsn6VTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "dunder-proto": "^1.0.0",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8401,6 +8713,7 @@
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
@@ -8410,6 +8723,7 @@
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -8422,6 +8736,7 @@
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
       "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "data-uri-to-buffer": "3",
@@ -8439,6 +8754,7 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -8448,6 +8764,7 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -8462,6 +8779,7 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
+      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -8471,6 +8789,7 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -8481,6 +8800,7 @@
       "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -8500,6 +8820,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -8511,13 +8832,15 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -8527,6 +8850,7 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
       "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dir-glob": "^3.0.1",
         "fast-glob": "^3.3.0",
@@ -8542,12 +8866,13 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8557,13 +8882,15 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
       "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "duplexer": "^0.1.2"
       },
@@ -8578,15 +8905,16 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
@@ -8594,6 +8922,7 @@
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -8601,23 +8930,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8629,12 +8947,14 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
       "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
@@ -8649,6 +8969,7 @@
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -8661,6 +8982,7 @@
       "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz",
       "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==",
       "dev": true,
+      "license": "BSD",
       "dependencies": {
         "@assemblyscript/loader": "^0.10.1",
         "base64-js": "^1.2.0",
@@ -8671,19 +8993,22 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
       "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
+      "dev": true,
+      "license": "(MIT AND Zlib)"
     },
     "node_modules/hdr-histogram-percentiles-obj": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz",
       "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "he": "bin/he"
       }
@@ -8693,6 +9018,7 @@
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz",
       "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^7.5.1"
       },
@@ -8705,6 +9031,7 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
       "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -8714,6 +9041,7 @@
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
       "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -8726,6 +9054,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -8740,13 +9069,15 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/hpack.js/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -8765,31 +9096,36 @@
           "type": "patreon",
           "url": "https://patreon.com/mdevils"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
       "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
       "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -8805,13 +9141,15 @@
       "version": "0.5.8",
       "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
       "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
       "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
@@ -8826,6 +9164,7 @@
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "2",
         "agent-base": "6",
@@ -8836,10 +9175,11 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -8864,6 +9204,7 @@
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -8877,6 +9218,7 @@
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
@@ -8886,6 +9228,7 @@
       "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
       "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.0.0"
       }
@@ -8896,6 +9239,7 @@
       "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "ci-info": "^2.0.0",
@@ -8920,60 +9264,12 @@
         "url": "https://opencollective.com/husky"
       }
     },
-    "node_modules/husky/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/husky/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/husky/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/husky/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/husky/node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -8985,20 +9281,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/husky/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/husky/node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -9014,6 +9302,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -9029,6 +9318,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -9044,6 +9334,7 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
       "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^5.0.0"
       },
@@ -9056,18 +9347,7 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/husky/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -9077,6 +9357,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -9089,6 +9370,7 @@
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -9113,13 +9395,15 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -9129,6 +9413,7 @@
       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz",
       "integrity": "sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "minimatch": "^5.0.1"
       },
@@ -9141,6 +9426,7 @@
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "bin": {
         "image-size": "bin/image-size.js"
@@ -9150,16 +9436,18 @@
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
-      "dev": true
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -9176,6 +9464,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9185,6 +9474,7 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -9194,6 +9484,7 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -9202,7 +9493,8 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
       "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/inflight": {
       "version": "1.0.6",
@@ -9210,6 +9502,7 @@
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -9218,13 +9511,15 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
     },
     "node_modules/ini": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.0.tgz",
       "integrity": "sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
@@ -9234,6 +9529,7 @@
       "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.4.0.tgz",
       "integrity": "sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       }
@@ -9243,6 +9539,7 @@
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz",
       "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.1.1",
@@ -9264,80 +9561,11 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "devOptional": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "devOptional": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "devOptional": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "devOptional": true
-    },
-    "node_modules/inquirer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "devOptional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "devOptional": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ionicons": {
       "version": "6.1.3",
       "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.1.3.tgz",
       "integrity": "sha512-ptzz38dd/Yq+PgjhXegh7yhb/SLIk1bvL9vQDtLv1aoSc7alO6mX2DIMgcKYzt9vrNWkRu1f9Jr78zIFFyOXqw==",
+      "license": "MIT",
       "dependencies": {
         "@stencil/core": "^2.18.0"
       }
@@ -9346,13 +9574,15 @@
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
       "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ip-address": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
       "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "jsbn": "1.1.0",
         "sprintf-js": "^1.1.3"
@@ -9366,6 +9596,7 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
       "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -9374,13 +9605,15 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -9393,6 +9626,7 @@
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
       "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "builtin-modules": "^3.3.0"
       },
@@ -9404,10 +9638,11 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -9423,6 +9658,7 @@
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "devOptional": true,
+      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -9438,6 +9674,7 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9446,6 +9683,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -9455,6 +9693,7 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -9466,6 +9705,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -9474,19 +9714,22 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
       "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
       "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -9496,6 +9739,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -9508,6 +9752,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -9520,6 +9765,7 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -9531,12 +9777,14 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -9548,13 +9796,15 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
       "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-wsl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -9566,19 +9816,22 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9588,6 +9841,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
@@ -9597,6 +9851,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
       "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -9613,6 +9868,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -9622,22 +9878,14 @@
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
@@ -9645,6 +9893,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9659,6 +9908,7 @@
       "version": "4.15.9",
       "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz",
       "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
@@ -9667,12 +9917,14 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -9684,13 +9936,15 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
       "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -9702,18 +9956,21 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT"
     },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -9724,13 +9981,15 @@
     "node_modules/jsonc-parser": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz",
-      "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg=="
+      "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==",
+      "license": "MIT"
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -9745,13 +10004,15 @@
       "devOptional": true,
       "engines": [
         "node >= 0.2.0"
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/karma-source-map-support": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
       "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "source-map-support": "^0.5.5"
       }
@@ -9761,6 +10022,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9770,6 +10032,7 @@
       "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
       "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -9779,6 +10042,7 @@
       "resolved": "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz",
       "integrity": "sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^2.1.0",
         "lodash.assign": "^3.2.0",
@@ -9790,6 +10054,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -9798,13 +10063,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/less": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz",
       "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "copy-anything": "^2.0.1",
         "parse-node-version": "^1.0.1",
@@ -9831,6 +10098,7 @@
       "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.0.0.tgz",
       "integrity": "sha512-9+LOWWjuoectIEx3zrfN83NAGxSUB5pWEabbbidVQVgZhN+wN68pOvuyirVlH1IK4VT1f3TmlyvAnCXh8O5KEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "klona": "^2.0.4"
       },
@@ -9851,6 +10119,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "pify": "^4.0.1",
@@ -9865,6 +10134,7 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "bin": {
         "mime": "cli.js"
@@ -9878,6 +10148,7 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
       "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=6"
@@ -9888,6 +10159,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "optional": true,
       "bin": {
         "semver": "bin/semver"
@@ -9898,6 +10170,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -9908,6 +10181,7 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -9921,6 +10195,7 @@
       "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
       "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "webpack-sources": "^3.0.0"
       },
@@ -9938,6 +10213,7 @@
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
       "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -9946,13 +10222,15 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lint-staged": {
       "version": "12.5.0",
       "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.5.0.tgz",
       "integrity": "sha512-BKLUjWDsKquV/JuIcoQW4MSAI3ggwEImF1+sB4zaKvyVx1wBk3FsG7UK9bpnmBTN1pm7EH2BBcMwINJzCRv12g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^3.1.0",
         "colorette": "^2.0.16",
@@ -9984,6 +10262,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
       "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -9996,6 +10275,7 @@
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
       "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^2.1.0",
         "colorette": "^2.0.16",
@@ -10018,26 +10298,12 @@
         }
       }
     },
-    "node_modules/listr2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/listr2/node_modules/cli-truncate": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
       "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^3.0.0",
         "string-width": "^4.2.0"
@@ -10049,29 +10315,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/listr2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/listr2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/listr2/node_modules/slice-ansi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
       "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -10086,6 +10335,7 @@
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
       }
@@ -10095,6 +10345,7 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
       "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 12.13.0"
       }
@@ -10103,6 +10354,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -10113,13 +10365,15 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
     },
     "node_modules/lodash._baseassign": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
       "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash._basecopy": "^3.0.0",
         "lodash.keys": "^3.0.0"
@@ -10129,19 +10383,22 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
       "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash._bindcallback": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
       "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash._createassigner": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
       "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash._bindcallback": "^3.0.0",
         "lodash._isiterateecall": "^3.0.0",
@@ -10152,19 +10409,22 @@
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
       "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.assign": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
       "integrity": "sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash._baseassign": "^3.0.0",
         "lodash._createassigner": "^3.0.0",
@@ -10175,25 +10435,29 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
       "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.isarray": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
       "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.keys": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
       "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lodash._getnative": "^3.0.0",
         "lodash.isarguments": "^3.0.0",
@@ -10204,12 +10468,14 @@
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
       "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
       "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
@@ -10221,75 +10487,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/log-update": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
       "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.3.0",
         "cli-cursor": "^3.1.0",
@@ -10303,44 +10506,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-update/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-update/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/log-update/node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -10353,13 +10524,15 @@
     "node_modules/long": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
-      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+      "license": "Apache-2.0"
     },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -10369,6 +10542,7 @@
       "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz",
       "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -10380,6 +10554,7 @@
       "version": "0.26.2",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz",
       "integrity": "sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==",
+      "license": "MIT",
       "dependencies": {
         "sourcemap-codec": "^1.4.8"
       },
@@ -10392,6 +10567,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -10407,6 +10583,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -10415,13 +10592,15 @@
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/make-fetch-happen": {
       "version": "10.2.1",
       "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz",
       "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "agentkeepalive": "^4.2.1",
         "cacache": "^16.1.0",
@@ -10449,6 +10628,7 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
       "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -10457,6 +10637,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
       "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "license": "MIT",
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -10468,6 +10649,7 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "license": "MIT",
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -10479,6 +10661,7 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -10488,6 +10671,7 @@
       "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
       "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dev": true,
+      "license": "Unlicense",
       "dependencies": {
         "fs-monkey": "^1.0.4"
       },
@@ -10496,22 +10680,28 @@
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -10521,15 +10711,17 @@
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -10539,12 +10731,13 @@
       }
     },
     "node_modules/mime": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
-      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.4.tgz",
+      "integrity": "sha512-v8yqInVjhXyqP6+Kw4fV3ZzeMRqEW6FotRsKXjRS5VMTNIuXsdRoAvklpoRgSqXm6o9VNH4/C0mgedko9DdLsQ==",
       "funding": [
         "https://github.com/sponsors/broofa"
       ],
+      "license": "MIT",
       "bin": {
         "mime": "bin/cli.js"
       },
@@ -10557,6 +10750,7 @@
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -10566,6 +10760,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -10577,6 +10772,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -10586,6 +10782,7 @@
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
       "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "schema-utils": "^4.0.0"
       },
@@ -10605,6 +10802,7 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
       "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -10623,13 +10821,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/minimatch": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
       "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -10642,6 +10842,7 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -10651,6 +10852,7 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -10663,6 +10865,7 @@
       "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
       "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -10675,6 +10878,7 @@
       "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz",
       "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "minipass": "^3.1.6",
         "minipass-sized": "^1.0.3",
@@ -10692,6 +10896,7 @@
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
       "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -10700,10 +10905,11 @@
       }
     },
     "node_modules/minipass-json-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
-      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz",
+      "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "jsonparse": "^1.3.1",
         "minipass": "^3.0.0"
@@ -10714,6 +10920,7 @@
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
       "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -10726,6 +10933,7 @@
       "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
       "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -10737,13 +10945,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/minizlib": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -10756,13 +10966,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "devOptional": true,
+      "license": "MIT",
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -10773,13 +10985,15 @@
     "node_modules/monaco-editor": {
       "version": "0.33.0",
       "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz",
-      "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
+      "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==",
+      "license": "MIT"
     },
     "node_modules/mrmime": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
       "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -10788,13 +11002,15 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
       "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dns-packet": "^5.2.2",
         "thunky": "^1.0.2"
@@ -10851,6 +11067,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
       "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+      "license": "MIT",
       "bin": {
         "mustache": "bin/mustache"
       }
@@ -10859,12 +11076,13 @@
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "dev": true,
       "funding": [
         {
@@ -10872,6 +11090,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -10884,6 +11103,7 @@
       "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
       "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.3",
@@ -10901,6 +11121,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -10914,13 +11135,15 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
       "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
       "dev": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -10929,13 +11152,15 @@
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/netmask": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
       "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -10945,6 +11170,7 @@
       "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-14.2.2.tgz",
       "integrity": "sha512-AqwHcMM6x+JkCHT++IsbulnTdyoXcC2Cr4tbPamuieacc77+fFbB195hdcqEFwsKX5410cymx/ZUyHird9rxlg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/plugin-json": "^4.1.0",
         "@rollup/plugin-node-resolve": "^13.1.3",
@@ -10990,6 +11216,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/ng-qrcode/-/ng-qrcode-7.0.0.tgz",
       "integrity": "sha512-Mx7nf8rtGMVYxGe2qfy8/JNiCnxKD7uFsqpP2Hm5eJSQrOEapQl9FR0yuK0I4MMQorJ7s8mZZDxmszQiH8R2Kg==",
+      "license": "MIT",
       "dependencies": {
         "qrcode": "^1.5.0",
         "tslib": "^2.4.0"
@@ -11005,6 +11232,7 @@
       "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "!win32"
@@ -11019,12 +11247,14 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
       "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
       }
@@ -11034,6 +11264,7 @@
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz",
       "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
@@ -11055,10 +11286,11 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "bin": {
         "node-gyp-build": "bin.js",
@@ -11071,6 +11303,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -11082,6 +11315,7 @@
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11102,6 +11336,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -11114,6 +11349,7 @@
       "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz",
       "integrity": "sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "css-select": "^4.2.1",
         "he": "1.2.0"
@@ -11123,6 +11359,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/node-jose/-/node-jose-2.2.0.tgz",
       "integrity": "sha512-XPCvJRr94SjLrSIm4pbYHKLEaOsDvJCpyFw/6V/KK/IXmyZ6SFBzAUDO9HQf4DB/nTEFcRGH87mNciOP23kFjw==",
+      "license": "Apache-2.0",
       "dependencies": {
         "base64url": "^3.0.1",
         "buffer": "^6.0.3",
@@ -11143,21 +11380,24 @@
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
       ],
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/nopt": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
       "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "abbrev": "^1.0.0"
       },
@@ -11173,6 +11413,7 @@
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-4.0.1.tgz",
       "integrity": "sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==",
       "devOptional": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^5.0.0",
         "is-core-module": "^2.8.1",
@@ -11188,6 +11429,7 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11197,6 +11439,7 @@
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11206,6 +11449,7 @@
       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
       "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "npm-normalize-package-bin": "^1.0.1"
       }
@@ -11215,6 +11459,7 @@
       "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-5.0.0.tgz",
       "integrity": "sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==",
       "devOptional": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "semver": "^7.1.1"
       },
@@ -11226,13 +11471,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/npm-package-arg": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.1.0.tgz",
       "integrity": "sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "hosted-git-info": "^5.0.0",
         "proc-log": "^2.0.1",
@@ -11248,6 +11495,7 @@
       "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.3.tgz",
       "integrity": "sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^8.0.1",
         "ignore-walk": "^5.0.1",
@@ -11266,6 +11514,7 @@
       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-2.0.1.tgz",
       "integrity": "sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "npm-normalize-package-bin": "^2.0.0"
       },
@@ -11278,6 +11527,7 @@
       "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz",
       "integrity": "sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
@@ -11287,6 +11537,7 @@
       "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz",
       "integrity": "sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "npm-install-checks": "^5.0.0",
         "npm-normalize-package-bin": "^1.0.1",
@@ -11302,6 +11553,7 @@
       "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz",
       "integrity": "sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "make-fetch-happen": "^10.0.6",
         "minipass": "^3.1.6",
@@ -11320,6 +11572,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -11333,6 +11586,7 @@
       "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
       "deprecated": "This package is no longer supported.",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "are-we-there-yet": "^3.0.0",
         "console-control-strings": "^1.1.0",
@@ -11348,6 +11602,7 @@
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
       "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -11356,10 +11611,11 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+      "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -11371,13 +11627,15 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
       "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -11390,6 +11648,7 @@
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11399,6 +11658,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -11407,6 +11667,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -11422,6 +11683,7 @@
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
       "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -11439,6 +11701,7 @@
       "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
       "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "opencollective-postinstall": "index.js"
       }
@@ -11448,6 +11711,7 @@
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
       "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true,
+      "license": "(WTFPL OR MIT)",
       "bin": {
         "opener": "bin/opener-bin.js"
       }
@@ -11457,6 +11721,7 @@
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
       "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -11473,6 +11738,7 @@
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
       "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "license": "MIT",
       "dependencies": {
         "bl": "^4.1.0",
         "chalk": "^4.1.0",
@@ -11491,75 +11757,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/os-name": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
       "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "macos-release": "^2.5.0",
         "windows-release": "^4.0.0"
@@ -11576,6 +11779,7 @@
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11584,6 +11788,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -11598,6 +11803,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -11610,6 +11816,7 @@
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
       "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -11625,6 +11832,7 @@
       "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
       "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/retry": "0.12.0",
         "retry": "^0.13.1"
@@ -11638,6 +11846,7 @@
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
       "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -11646,6 +11855,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -11655,6 +11865,7 @@
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -11675,6 +11886,7 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -11684,6 +11896,7 @@
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
       "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -11698,6 +11911,7 @@
       "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "^6.0.2",
         "debug": "4",
@@ -11712,6 +11926,7 @@
       "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.1.tgz",
       "integrity": "sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "degenerator": "^3.0.2",
         "ip": "^1.1.5",
@@ -11726,6 +11941,7 @@
       "resolved": "https://registry.npmjs.org/pacote/-/pacote-13.6.2.tgz",
       "integrity": "sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "@npmcli/git": "^3.0.0",
         "@npmcli/installed-package-contents": "^1.0.7",
@@ -11759,13 +11975,15 @@
     "node_modules/pako": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
-      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
+      "license": "(MIT AND Zlib)"
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -11778,6 +11996,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -11796,6 +12015,7 @@
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
       "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
@@ -11803,12 +12023,14 @@
     "node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "license": "MIT"
     },
     "node_modules/parse5-html-rewriting-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz",
       "integrity": "sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==",
+      "license": "MIT",
       "dependencies": {
         "parse5": "^6.0.1",
         "parse5-sax-parser": "^6.0.1"
@@ -11819,6 +12041,7 @@
       "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parse5": "^6.0.1"
       }
@@ -11827,6 +12050,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz",
       "integrity": "sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==",
+      "license": "MIT",
       "dependencies": {
         "parse5": "^6.0.1"
       }
@@ -11836,6 +12060,7 @@
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11854,6 +12079,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -11863,6 +12089,7 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11872,6 +12099,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -11880,19 +12108,22 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-      "dev": true
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -11901,6 +12132,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
       "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "license": "MIT",
       "dependencies": {
         "create-hash": "^1.1.2",
         "create-hmac": "^1.1.4",
@@ -11913,16 +12145,18 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -11935,6 +12169,7 @@
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
       "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "pidtree": "bin/pidtree.js"
       },
@@ -11947,6 +12182,7 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11956,6 +12192,7 @@
       "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz",
       "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eventemitter-asyncresource": "^1.0.0",
         "hdr-histogram-js": "^2.0.1",
@@ -11970,6 +12207,7 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -11982,6 +12220,7 @@
       "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
       "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver-compare": "^1.0.0"
       }
@@ -11990,6 +12229,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
       "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
@@ -12013,6 +12253,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
@@ -12027,6 +12268,7 @@
       "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
       "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -12041,11 +12283,26 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-clamp": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
       "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12061,6 +12318,7 @@
       "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
       "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12080,6 +12338,7 @@
       "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
       "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12099,6 +12358,7 @@
       "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
       "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12118,6 +12378,7 @@
       "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
       "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12137,6 +12398,7 @@
       "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
       "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12156,6 +12418,7 @@
       "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
       "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.4"
       },
@@ -12170,11 +12433,26 @@
         "postcss": "^8.3"
       }
     },
+    "node_modules/postcss-custom-selectors/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-dir-pseudo-class": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
       "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -12189,11 +12467,26 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-dir-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-double-position-gradients": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
       "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -12214,6 +12507,7 @@
       "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
       "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12229,6 +12523,7 @@
       "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
       "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -12239,11 +12534,26 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/postcss-focus-visible/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-focus-within": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
       "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.9"
       },
@@ -12254,11 +12564,26 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/postcss-focus-within/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-font-variant": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
       "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.1.0"
       }
@@ -12268,6 +12593,7 @@
       "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
       "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
       "dev": true,
+      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -12284,6 +12610,7 @@
       "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
       "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12303,6 +12630,7 @@
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.0.0.tgz",
       "integrity": "sha512-Y20shPQ07RitgBGv2zvkEAu9bqvrD77C9axhj/aA1BQj4czape2MdClCExvB27EwYEJdGgKZBpKanb0t1rK2Kg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
@@ -12320,6 +12648,7 @@
       "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
       "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.0.0"
       }
@@ -12329,6 +12658,7 @@
       "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
       "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
@@ -12349,6 +12679,7 @@
       "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.1.tgz",
       "integrity": "sha512-VRviFEyYlLjctSM93gAZtcJJ/iSkPZ79zWbN/1fSH+NisBByEiVLqpdVDrPLVSi8DX0oJo12kL/GppTBdKVXiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cosmiconfig": "^7.0.0",
         "klona": "^2.0.5",
@@ -12371,6 +12702,7 @@
       "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
       "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
       "dev": true,
+      "license": "CC0-1.0",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -12383,6 +12715,7 @@
       "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
       "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -12395,6 +12728,7 @@
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
       "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -12403,13 +12737,14 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
-      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz",
+      "integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
@@ -12420,12 +12755,13 @@
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
-      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -12439,6 +12775,7 @@
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "icss-utils": "^5.0.0"
       },
@@ -12454,6 +12791,7 @@
       "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
       "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/selector-specificity": "^2.0.0",
         "postcss-selector-parser": "^6.0.10"
@@ -12469,6 +12807,37 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "license": "CC0-1.0",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-opacity-percentage": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
@@ -12484,6 +12853,7 @@
           "url": "https://liberapay.com/mrcgrtz"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
@@ -12496,6 +12866,7 @@
       "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
       "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12515,6 +12886,7 @@
       "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
       "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8"
       }
@@ -12524,6 +12896,7 @@
       "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
       "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -12543,6 +12916,7 @@
       "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.0.tgz",
       "integrity": "sha512-leqiqLOellpLKfbHkD06E04P6d9ZQ24mat6hu4NSqun7WG0UhspHR5Myiv/510qouCjoo4+YJtNOqg5xHaFnCA==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "@csstools/postcss-cascade-layers": "^1.0.5",
         "@csstools/postcss-color-function": "^1.1.1",
@@ -12610,6 +12984,7 @@
       "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
       "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
       "dev": true,
+      "license": "CC0-1.0",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -12624,11 +12999,26 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-replace-overflow-wrap": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
       "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "postcss": "^8.0.3"
       }
@@ -12638,6 +13028,7 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
       "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.0.10"
       },
@@ -12652,11 +13043,26 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-selector-not/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
-      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+      "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -12670,6 +13076,7 @@
       "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-10.1.3.tgz",
       "integrity": "sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "make-dir": "~3.1.0",
         "mime": "~2.5.2",
@@ -12688,6 +13095,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -12698,6 +13106,7 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
       "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -12710,6 +13119,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
       "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -12721,7 +13131,8 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
@@ -12737,6 +13148,7 @@
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
       "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -12752,6 +13164,7 @@
       "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
       "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -12764,6 +13177,7 @@
       "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz",
       "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
@@ -12772,6 +13186,7 @@
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -12780,19 +13195,22 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
       "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/promise-retry": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
       "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "err-code": "^2.0.2",
         "retry": "^0.12.0"
@@ -12806,6 +13224,7 @@
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
       "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -12819,6 +13238,7 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
@@ -12828,6 +13248,7 @@
       "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz",
       "integrity": "sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "^6.0.0",
         "debug": "4",
@@ -12847,6 +13268,7 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -12856,6 +13278,7 @@
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
       "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "1",
         "agent-base": "6",
@@ -12870,6 +13293,7 @@
       "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "^6.0.2",
         "debug": "4",
@@ -12883,20 +13307,23 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -12906,17 +13333,18 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/qrcode": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.3.tgz",
-      "integrity": "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
+      "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
+      "license": "MIT",
       "dependencies": {
         "dijkstrajs": "^1.0.1",
-        "encode-utf8": "^1.0.3",
         "pngjs": "^5.0.0",
         "yargs": "^15.3.1"
       },
@@ -12927,50 +13355,22 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/qrcode/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/qrcode/node_modules/cliui": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
       "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
         "wrap-ansi": "^6.2.0"
       }
     },
-    "node_modules/qrcode/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/qrcode/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/qrcode/node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -12983,12 +13383,14 @@
     "node_modules/qrcode/node_modules/y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "license": "ISC"
     },
     "node_modules/qrcode/node_modules/yargs": {
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
       "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "license": "MIT",
       "dependencies": {
         "cliui": "^6.0.0",
         "decamelize": "^1.2.0",
@@ -13010,6 +13412,7 @@
       "version": "18.1.3",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
       "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -13019,10 +13422,11 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.12.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.2.tgz",
-      "integrity": "sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==",
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",
+      "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.6"
       },
@@ -13051,13 +13455,15 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -13067,6 +13473,7 @@
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -13076,6 +13483,7 @@
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
       "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -13091,6 +13499,7 @@
       "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
       "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "loader-utils": "^2.0.0",
         "schema-utils": "^3.0.0"
@@ -13111,6 +13520,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -13127,6 +13537,7 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
@@ -13135,13 +13546,15 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/raw-loader/node_modules/loader-utils": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
       "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -13156,6 +13569,7 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -13174,6 +13588,7 @@
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pify": "^2.3.0"
       }
@@ -13184,6 +13599,7 @@
       "integrity": "sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q==",
       "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^8.0.1",
         "json-parse-even-better-errors": "^2.3.1",
@@ -13199,6 +13615,7 @@
       "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
       "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "json-parse-even-better-errors": "^2.3.0",
         "npm-normalize-package-bin": "^1.0.1"
@@ -13212,6 +13629,7 @@
       "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz",
       "integrity": "sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
@@ -13220,6 +13638,7 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -13234,6 +13653,7 @@
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -13245,19 +13665,22 @@
       "version": "0.1.14",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz",
       "integrity": "sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -13269,13 +13692,15 @@
       "version": "0.13.9",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
       "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
       "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
@@ -13284,18 +13709,20 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
       "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -13303,31 +13730,44 @@
         "node": ">=4"
       }
     },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
     "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13336,6 +13776,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13343,19 +13784,22 @@
     "node_modules/require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "license": "ISC"
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
       "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
@@ -13373,6 +13817,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13382,6 +13827,7 @@
       "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
       "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "adjust-sourcemap-loader": "^4.0.0",
         "convert-source-map": "^1.7.0",
@@ -13398,6 +13844,7 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
       "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -13412,6 +13859,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13420,6 +13868,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
       "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -13433,6 +13882,7 @@
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
       "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -13442,6 +13892,7 @@
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -13451,7 +13902,8 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
       "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
@@ -13459,6 +13911,7 @@
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -13474,6 +13927,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -13485,6 +13939,7 @@
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -13505,6 +13960,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13516,16 +13972,18 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "license": "MIT",
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
       }
     },
     "node_modules/rollup": {
-      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+      "version": "2.79.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
+      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -13541,6 +13999,7 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz",
       "integrity": "sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^3.0.9",
         "source-map-resolve": "^0.6.0"
@@ -13563,6 +14022,7 @@
       "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
       "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "0.12.* || 4.* || 6.* || >= 7.*"
       }
@@ -13572,6 +14032,7 @@
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -13595,6 +14056,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -13603,6 +14065,7 @@
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
       "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -13624,19 +14087,22 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/sass": {
       "version": "1.54.4",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.54.4.tgz",
       "integrity": "sha512-3tmF16yvnBwtlPrNBHw/H907j8MlOX8aTBnlNX1yrKx24RKcJGPyLhFUwkoKBKesR3unP93/2z14Ll8NicwQUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -13654,6 +14120,7 @@
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz",
       "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "klona": "^2.0.4",
         "neo-async": "^2.6.2"
@@ -13691,13 +14158,15 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
       "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/schema-utils": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
       "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.5",
         "ajv": "^6.12.4",
@@ -13716,6 +14185,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -13732,6 +14202,7 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
@@ -13740,19 +14211,22 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
       "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/selfsigned": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
       "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node-forge": "^1.3.0",
         "node-forge": "^1"
@@ -13766,6 +14240,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
       "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -13780,13 +14255,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
       "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/semver-regex": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.4.tgz",
       "integrity": "sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -13799,6 +14276,7 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -13810,13 +14288,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -13841,6 +14321,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -13849,13 +14330,25 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -13867,13 +14360,15 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -13883,6 +14378,7 @@
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -13901,6 +14397,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -13910,6 +14407,7 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -13919,6 +14417,7 @@
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
@@ -13933,39 +14432,44 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/serve-index/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/serve-index/node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -13974,13 +14478,15 @@
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "license": "ISC"
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -13997,12 +14503,14 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "license": "(MIT AND BSD-3-Clause)",
       "dependencies": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -14016,6 +14524,7 @@
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^6.0.2"
       },
@@ -14028,6 +14537,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -14040,6 +14550,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -14049,6 +14560,7 @@
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
       "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
@@ -14065,13 +14577,15 @@
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "license": "ISC"
     },
     "node_modules/sirv": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
       "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@polka/url": "^1.0.0-next.24",
         "mrmime": "^2.0.0",
@@ -14086,6 +14600,7 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
       "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -14098,6 +14613,7 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -14110,44 +14626,12 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -14158,6 +14642,7 @@
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
       "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "faye-websocket": "^0.11.3",
         "uuid": "^8.3.2",
@@ -14169,6 +14654,7 @@
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
       "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "ip-address": "^9.0.5",
         "smart-buffer": "^4.2.0"
@@ -14183,6 +14669,7 @@
       "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
       "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "^6.0.2",
         "debug": "^4.3.3",
@@ -14196,15 +14683,17 @@
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
       "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14214,6 +14703,7 @@
       "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.0.tgz",
       "integrity": "sha512-i3KVgM3+QPAHNbGavK+VBq03YoJl24m9JWNbLgsjTj8aJzXG9M61bantBTNBt7CNwY2FYf+RJRYJ3pzalKjIrw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "iconv-lite": "^0.6.3",
@@ -14235,6 +14725,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -14248,6 +14739,7 @@
       "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
       "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0"
@@ -14258,6 +14750,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -14268,6 +14761,7 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14276,13 +14770,15 @@
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead",
+      "license": "MIT"
     },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
       "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "devOptional": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -14292,29 +14788,33 @@
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
       "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "CC-BY-3.0"
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.18",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
-      "devOptional": true
+      "version": "3.0.20",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+      "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
+      "devOptional": true,
+      "license": "CC0-1.0"
     },
     "node_modules/spdy": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
       "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "handle-thing": "^2.0.0",
@@ -14331,6 +14831,7 @@
       "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
         "detect-node": "^2.0.4",
@@ -14345,6 +14846,7 @@
       "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
       "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "readable-stream": "^3.0.0"
       }
@@ -14353,24 +14855,28 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/ssh-config": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz",
       "integrity": "sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ssr-window": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.2.tgz",
-      "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ=="
+      "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==",
+      "license": "MIT"
     },
     "node_modules/ssri": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
       "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "minipass": "^3.1.1"
       },
@@ -14383,6 +14889,7 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -14392,6 +14899,7 @@
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "duplexer2": "~0.1.0",
         "readable-stream": "^2.0.2"
@@ -14402,6 +14910,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -14416,13 +14925,15 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/stream-combiner2/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -14431,6 +14942,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -14440,6 +14952,7 @@
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
       "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.19"
       }
@@ -14448,6 +14961,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -14461,6 +14975,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -14473,6 +14988,7 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -14482,6 +14998,7 @@
       "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.59.0.tgz",
       "integrity": "sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@adobe/css-tools": "^4.0.1",
         "debug": "^4.3.2",
@@ -14504,6 +15021,7 @@
       "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-7.0.0.tgz",
       "integrity": "sha512-WTbtLrNfOfLgzTaR9Lj/BPhQroKk/LC1hfTXSUbrxmxgfUo3Y3LpmKRVA2R1XbjvTAvOfaian9vOyfv1z99E+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-glob": "^3.2.11",
         "klona": "^2.0.5",
@@ -14526,6 +15044,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -14537,6 +15056,7 @@
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -14557,6 +15077,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -14568,7 +15089,8 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/superagent": {
       "version": "5.3.1",
@@ -14576,6 +15098,7 @@
       "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
       "deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.2",
@@ -14598,6 +15121,7 @@
       "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-3.0.0.tgz",
       "integrity": "sha512-wAlRInOeDFyd9pyonrkJspdRAxdLrcsZ6aSnS+8+nu4x1aXbz6FWSTT9M6Ibze+eG60szlL7JA8wEIV7bPWuyQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.3.2",
         "proxy-agent": "^5.0.0"
@@ -14614,6 +15138,7 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
       "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -14622,15 +15147,15 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -14638,6 +15163,7 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -14660,6 +15186,7 @@
         }
       ],
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "dom7": "^4.0.4",
         "ssr-window": "^4.0.2"
@@ -14673,6 +15200,7 @@
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
       "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
@@ -14682,6 +15210,7 @@
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -14691,6 +15220,7 @@
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
       "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -14708,6 +15238,7 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
       "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">=8"
       }
@@ -14716,13 +15247,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/terser": {
       "version": "5.14.2",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
       "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.2",
         "acorn": "^8.5.0",
@@ -14741,6 +15274,7 @@
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
       "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.20",
         "jest-worker": "^27.4.5",
@@ -14775,6 +15309,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -14791,6 +15326,7 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
@@ -14799,19 +15335,22 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -14826,10 +15365,11 @@
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/terser": {
-      "version": "5.31.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz",
-      "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==",
+      "version": "5.37.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
+      "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -14847,13 +15387,15 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -14868,6 +15410,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -14879,6 +15422,7 @@
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -14899,6 +15443,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -14916,25 +15461,29 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "os-tmpdir": "~1.0.2"
       },
@@ -14942,20 +15491,12 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -14968,6 +15509,7 @@
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
@@ -14977,6 +15519,7 @@
       "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
       "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -14986,14 +15529,16 @@
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "tree-kill": "cli.js"
       }
     },
     "node_modules/ts-matches": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-5.5.1.tgz",
-      "integrity": "sha512-UFYaKgfqlg9FROK7bdpYqFwG1CJvP4kOJdjXuWoqxo9jCmANoDw1GxkSCpJgoTeIiSTaTH5Qr1klSspb8c+ydg=="
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.2.1.tgz",
+      "integrity": "sha512-qdnMgTHsGCEGGK6QiaNMY2vD9eQtRp2Q+pAxcOAzxHJKDKTBYsc1ISTg1zp8H2+EmtCB0eko/1TwYUA5/mUGug==",
+      "license": "MIT"
     },
     "node_modules/ts-morph": {
       "version": "23.0.0",
@@ -15011,6 +15556,7 @@
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -15050,9 +15596,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
     "node_modules/tslint": {
@@ -15061,6 +15607,7 @@
       "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
       "deprecated": "TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information.",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
@@ -15086,11 +15633,25 @@
         "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 4.0.0-dev"
       }
     },
+    "node_modules/tslint/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/tslint/node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -15100,6 +15661,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -15110,15 +15672,49 @@
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
       "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/tslint/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tslint/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/tslint/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tslint/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tslint/node_modules/glob": {
       "version": "7.2.3",
@@ -15126,6 +15722,7 @@
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -15141,11 +15738,22 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/tslint/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/tslint/node_modules/js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -15159,6 +15767,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -15171,6 +15780,7 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -15183,6 +15793,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -15191,19 +15802,35 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/tslint/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
     "node_modules/tslint/node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/tsutils": {
       "version": "2.29.0",
       "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
       "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -15215,13 +15842,15 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "~1.1.2"
       },
@@ -15234,6 +15863,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "devOptional": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -15246,6 +15876,7 @@
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
       "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -15258,13 +15889,15 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
       "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-typedarray": "^1.0.0"
       }
@@ -15274,6 +15907,7 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
       "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -15283,10 +15917,11 @@
       }
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -15296,6 +15931,7 @@
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
         "unicode-property-aliases-ecmascript": "^2.0.0"
@@ -15305,10 +15941,11 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -15318,6 +15955,7 @@
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -15327,6 +15965,7 @@
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "unique-slug": "^2.0.0"
       }
@@ -15336,6 +15975,7 @@
       "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
       "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
       }
@@ -15345,6 +15985,7 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -15354,6 +15995,7 @@
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -15363,14 +16005,15 @@
       "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
       "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "dev": true,
       "funding": [
         {
@@ -15386,9 +16029,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -15401,6 +16045,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -15408,13 +16053,15 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -15423,6 +16070,7 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -15431,13 +16079,15 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "devOptional": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
@@ -15448,6 +16098,7 @@
       "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz",
       "integrity": "sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "builtins": "^5.0.0"
       },
@@ -15460,6 +16111,7 @@
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -15470,6 +16122,7 @@
       "integrity": "sha512-J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg==",
       "deprecated": "The library contains critical security issues and should not be used for production! The maintenance of the project has been discontinued. Consider migrating your code to isolated-vm.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"
@@ -15482,10 +16135,11 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
-      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -15499,6 +16153,7 @@
       "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimalistic-assert": "^1.0.0"
       }
@@ -15507,27 +16162,28 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
       "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "license": "MIT",
       "dependencies": {
         "defaults": "^1.0.3"
       }
     },
     "node_modules/webpack": {
-      "version": "5.92.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
-      "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
+      "version": "5.97.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.0",
+        "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -15564,6 +16220,7 @@
       "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
       "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@discoveryjs/json-ext": "0.5.7",
         "acorn": "^8.0.4",
@@ -15590,6 +16247,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -15599,6 +16257,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -15611,6 +16270,7 @@
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
       "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^3.4.3",
@@ -15634,6 +16294,7 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
       "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -15653,6 +16314,7 @@
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.0.tgz",
       "integrity": "sha512-L5S4Q2zT57SK7tazgzjMiSMBdsw+rGYIX27MgPgx7LDhWO0lViPrHKoLS7jo5In06PWYAhlYu3PbyoC6yAThbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
@@ -15708,6 +16370,7 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
       "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -15727,6 +16390,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -15748,6 +16412,7 @@
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
       "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clone-deep": "^4.0.1",
         "wildcard": "^2.0.0"
@@ -15761,6 +16426,7 @@
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
@@ -15770,6 +16436,7 @@
       "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz",
       "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "typed-assert": "^1.0.8"
       },
@@ -15787,10 +16454,11 @@
       }
     },
     "node_modules/webpack/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/webpack/node_modules/ajv": {
@@ -15798,6 +16466,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -15815,6 +16484,7 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "peerDependencies": {
         "ajv": "^6.9.1"
@@ -15825,6 +16495,7 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/webpack/node_modules/schema-utils": {
@@ -15832,6 +16503,7 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
       "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -15851,6 +16523,7 @@
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
@@ -15865,6 +16538,7 @@
       "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -15874,6 +16548,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -15887,13 +16562,15 @@
     "node_modules/which-module": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "license": "ISC"
     },
     "node_modules/which-pm-runs": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz",
       "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -15903,6 +16580,7 @@
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
       "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
       "devOptional": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
@@ -15911,13 +16589,15 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
       "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/windows-release": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
       "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "execa": "^4.0.2"
       },
@@ -15933,6 +16613,7 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
       "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -15956,6 +16637,7 @@
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -15971,6 +16653,7 @@
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=8.12.0"
       }
@@ -15980,6 +16663,7 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15989,6 +16673,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -16001,50 +16686,19 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "devOptional": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "devOptional": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "devOptional": true
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/write-file-atomic": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
@@ -16057,6 +16711,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
       "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -16078,6 +16733,7 @@
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
       "integrity": "sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -16087,6 +16743,7 @@
       "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
       "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cuint": "^0.2.2"
       }
@@ -16096,6 +16753,7 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -16104,13 +16762,15 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/yaml": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">= 6"
       }
@@ -16120,6 +16780,7 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
       "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -16138,6 +16799,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "devOptional": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -16147,6 +16809,7 @@
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -16156,6 +16819,7 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -16167,6 +16831,7 @@
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz",
       "integrity": "sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
       }
diff --git a/web/package.json b/web/package.json
index 3f3709e11..ecc253904 100644
--- a/web/package.json
+++ b/web/package.json
@@ -52,6 +52,7 @@
     "@start9labs/emver": "^0.1.5",
     "@start9labs/start-sdk": "file:../sdk/baseDist",
     "@taiga-ui/addon-charts": "3.96.0",
+    "@taiga-ui/addon-commerce": "3.96.0",
     "@taiga-ui/cdk": "3.96.0",
     "@taiga-ui/core": "3.96.0",
     "@taiga-ui/experimental": "3.96.0",
@@ -83,7 +84,7 @@
     "pbkdf2": "^3.1.2",
     "rxjs": "^7.8.1",
     "swiper": "^8.2.4",
-    "ts-matches": "^5.5.1",
+    "ts-matches": "^6.1.0",
     "tslib": "^2.3.0",
     "uuid": "^8.3.2",
     "zone.js": "^0.11.5"
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index d9bc2dff3..39a69037f 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -6,7 +6,7 @@ import cbor from 'cbor'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
 import { SideloadService } from './sideload.service'
-import { firstValueFrom } from 'rxjs'
+import { filter, firstValueFrom } from 'rxjs'
 import mime from 'mime'
 
 interface Positions {
@@ -124,7 +124,7 @@ export class SideloadPage {
       this.api
         .uploadPackage(res.upload, this.toUpload.file!)
         .catch(e => console.error(e))
-      await firstValueFrom(this.sideloadService.websocketConnected$)
+      await firstValueFrom(this.progress$.pipe(filter(Boolean)))
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
index 79f871bba..d157272ff 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core'
 import { T } from '@start9labs/start-sdk'
-import { endWith, ReplaySubject, shareReplay, Subject, switchMap } from 'rxjs'
+import { BehaviorSubject, endWith, shareReplay, Subject, switchMap } from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 @Injectable({
@@ -9,17 +9,9 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 export class SideloadService {
   private readonly guid$ = new Subject<string>()
 
-  readonly websocketConnected$ = new ReplaySubject()
-
   readonly progress$ = this.guid$.pipe(
     switchMap(guid =>
-      this.api
-        .openWebsocket$<T.FullProgress>(guid, {
-          openObserver: {
-            next: () => this.websocketConnected$.next(''),
-          },
-        })
-        .pipe(endWith(null)),
+      this.api.openWebsocket$<T.FullProgress>(guid).pipe(endWith(null)),
     ),
     shareReplay(1),
   )

From 45ca9405d363d3d20305fcaeaded2de0be534473 Mon Sep 17 00:00:00 2001
From: Dominion5254 <musashidisciple@proton.me>
Date: Thu, 9 Jan 2025 13:43:53 -0700
Subject: [PATCH 336/341] Feat/test smtp (#2806)

* add test-smtp server subcommand

* return error is password is None

* fix return type

* borrow variables

* convert args to &str

* Tuple needs to have the same types apparently

* Clone instead

* fix formatting

* improve test email body

* Update core/startos/src/system.rs

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* add tls connection

* remove commented code

* use aidens mail-send fork

---------

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>
---
 core/Cargo.lock                               | 499 ++++++++++++++++--
 core/models/Cargo.toml                        |   1 +
 core/models/src/errors.rs                     |   5 +
 core/startos/Cargo.toml                       |   3 +
 core/startos/src/lib.rs                       |   7 +
 core/startos/src/lxc/dev.rs                   |   6 +-
 core/startos/src/lxc/mod.rs                   |   3 +-
 core/startos/src/net/vhost.rs                 |  10 +-
 core/startos/src/notifications.rs             |   4 +-
 .../src/service/effects/subcontainer/mod.rs   |   5 +-
 core/startos/src/system.rs                    |  57 ++
 11 files changed, 535 insertions(+), 65 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index cdafe81a1..48c26ce61 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -42,6 +42,17 @@ dependencies = [
  "opaque-debug",
 ]
 
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher 0.4.4",
+ "cpufeatures",
+]
+
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -166,6 +177,15 @@ version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
+[[package]]
+name = "arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -205,7 +225,7 @@ dependencies = [
  "nom 7.1.3",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -244,12 +264,12 @@ dependencies = [
  "log",
  "pem",
  "rcgen",
- "ring",
- "rustls 0.23.17",
+ "ring 0.17.8",
+ "rustls 0.23.20",
  "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "x509-parser",
 ]
@@ -491,7 +511,7 @@ dependencies = [
  "deku",
  "flate2",
  "rustc-hash",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "xz2",
  "zstd",
@@ -521,7 +541,7 @@ checksum = "be5951c75bdabb58753d140dd5802f12ff3a483cb2e16fb5276e111b94b19e87"
 dependencies = [
  "concurrent-queue 1.2.4",
  "event-listener",
- "spin",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -758,6 +778,27 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
+[[package]]
+name = "bzip2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.11+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "cache-padded"
 version = "1.3.0"
@@ -1361,6 +1402,12 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
+[[package]]
+name = "deflate64"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
+
 [[package]]
 name = "deku"
 version = "0.17.0"
@@ -1433,6 +1480,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.18"
@@ -1837,7 +1895,7 @@ checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
 dependencies = [
  "futures-core",
  "futures-sink",
- "spin",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -2038,6 +2096,16 @@ dependencies = [
  "webpki-roots 0.26.6",
 ]
 
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -2252,6 +2320,57 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hickory-proto"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 1.0.3",
+ "ipnet",
+ "once_cell",
+ "rand 0.8.5",
+ "ring 0.16.20",
+ "rustls 0.21.12",
+ "rustls-pemfile 1.0.4",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot",
+ "rand 0.8.5",
+ "resolv-conf",
+ "rustls 0.21.12",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tracing",
+]
+
 [[package]]
 name = "hifijson"
 version = "0.2.2"
@@ -2285,6 +2404,17 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi",
+]
+
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -2414,7 +2544,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.5.1",
  "hyper-util",
- "rustls 0.23.17",
+ "rustls 0.23.20",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.0",
@@ -2781,6 +2911,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "ipconfig"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+dependencies = [
+ "socket2",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.10.1"
@@ -2824,7 +2966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ea1dc4bf0fb4904ba83ffdb98af3d9c325274e92e6e295e4151e86c96363e04"
 dependencies = [
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2939,7 +3081,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -2969,7 +3111,7 @@ dependencies = [
  "imbl",
  "imbl-value",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3045,7 +3187,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -3117,6 +3259,12 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e281a65eeba3d4503a2839252f86374528f9ceafe6fed97c1d3b52e1fb625c1"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -3145,12 +3293,37 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
 version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "lzma-rs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
+dependencies = [
+ "byteorder",
+ "crc",
+]
+
 [[package]]
 name = "lzma-sys"
 version = "0.1.20"
@@ -3162,6 +3335,70 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "mail-auth"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd9d657de66a3d5ac360c3eab8c9f5cac2565f2b97cc032d5de4c900ef470de"
+dependencies = [
+ "ahash 0.8.11",
+ "flate2",
+ "hickory-resolver",
+ "lru-cache",
+ "mail-builder",
+ "mail-parser",
+ "parking_lot",
+ "quick-xml",
+ "ring 0.17.8",
+ "rustls-pemfile 2.2.0",
+ "serde",
+ "serde_json",
+ "zip",
+]
+
+[[package]]
+name = "mail-builder"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25f5871d5270ed80f2ee750b95600c8d69b05f8653ad3be913b2ad2e924fefcb"
+dependencies = [
+ "gethostname",
+]
+
+[[package]]
+name = "mail-parser"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93c3b9e5d8b17faf573330bbc43b37d6e918c0a3bf8a88e7d0a220ebc84af9fc"
+dependencies = [
+ "encoding_rs",
+]
+
+[[package]]
+name = "mail-send"
+version = "0.4.9"
+source = "git+https://github.com/dr-bonez/mail-send.git?branch=main#57545dadab5808d59145d133de64f81b8ba01979"
+dependencies = [
+ "base64 0.22.1",
+ "gethostname",
+ "mail-auth",
+ "mail-builder",
+ "md5",
+ "rand 0.8.5",
+ "rustls 0.23.20",
+ "rustls-pki-types",
+ "smtp-proto",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "webpki-roots 0.26.6",
+]
+
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -3187,7 +3424,7 @@ dependencies = [
  "bitvec 1.0.1",
  "serde",
  "serde-big-array",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3200,6 +3437,12 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "md5"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -3301,11 +3544,12 @@ dependencies = [
  "regex",
  "reqwest",
  "rpc-toolkit",
+ "rustls 0.23.20",
  "serde",
  "serde_json",
  "sqlx",
  "ssh-key",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "torut",
  "tracing",
@@ -3599,7 +3843,7 @@ dependencies = [
  "byteorder",
  "md-5",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3751,7 +3995,7 @@ dependencies = [
  "patch-db-macro",
  "serde",
  "serde_cbor",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "tracing-error",
@@ -3818,7 +4062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.69",
  "ucd-trie",
 ]
 
@@ -4138,6 +4382,15 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
+[[package]]
+name = "quick-xml"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.37"
@@ -4265,7 +4518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1"
 dependencies = [
  "pem",
- "ring",
+ "ring 0.17.8",
  "time",
  "yasna",
 ]
@@ -4302,7 +4555,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom 0.2.15",
  "libredox",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -4409,6 +4662,16 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "resolv-conf"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
+dependencies = [
+ "hostname",
+ "quick-error",
+]
+
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -4419,6 +4682,21 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.8"
@@ -4429,8 +4707,8 @@ dependencies = [
  "cfg-if",
  "getrandom 0.2.15",
  "libc",
- "spin",
- "untrusted",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
  "windows-sys 0.52.0",
 ]
 
@@ -4466,7 +4744,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "url",
@@ -4564,7 +4842,8 @@ version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
- "ring",
+ "log",
+ "ring 0.17.8",
  "rustls-webpki 0.101.7",
  "sct",
 ]
@@ -4576,7 +4855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
- "ring",
+ "ring 0.17.8",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle",
@@ -4585,14 +4864,14 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.17"
+version = "0.23.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
+checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
- "ring",
+ "ring 0.17.8",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle",
@@ -4619,9 +4898,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
 
 [[package]]
 name = "rustls-webpki"
@@ -4629,8 +4908,8 @@ version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -4640,9 +4919,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "aws-lc-rs",
- "ring",
+ "ring 0.17.8",
  "rustls-pki-types",
- "untrusted",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -4674,7 +4953,7 @@ dependencies = [
  "futures-util",
  "pin-project",
  "thingbuf",
- "thiserror",
+ "thiserror 1.0.69",
  "unicode-segmentation",
  "unicode-width 0.1.12",
 ]
@@ -4715,8 +4994,8 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -4833,7 +5112,7 @@ checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -5016,6 +5295,12 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "simple-logging"
 version = "2.0.2"
@@ -5054,6 +5339,12 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
+[[package]]
+name = "smtp-proto"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51b8ad3dd187f0d4debab02ad65405a9919d6a4f7bce25bd64a258781063a53a"
+
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -5064,6 +5355,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -5141,7 +5438,7 @@ dependencies = [
  "sha2 0.10.8",
  "smallvec",
  "sqlformat",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -5226,7 +5523,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "whoami",
 ]
@@ -5265,7 +5562,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "whoami",
 ]
@@ -5373,7 +5670,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 name = "start-os"
 version = "0.3.6-alpha.9"
 dependencies = [
- "aes",
+ "aes 0.7.5",
  "async-acme",
  "async-compression",
  "async-stream",
@@ -5433,6 +5730,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
+ "mail-send",
  "mbrman",
  "models",
  "new_mime_guess",
@@ -5461,6 +5759,8 @@ dependencies = [
  "rpassword",
  "rpc-toolkit",
  "rust-argon2",
+ "rustls 0.23.20",
+ "rustls-pki-types",
  "rustyline-async",
  "semver",
  "serde",
@@ -5478,7 +5778,7 @@ dependencies = [
  "ssh-key",
  "tar",
  "textwrap",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-rustls 0.26.0",
  "tokio-socks",
@@ -5699,7 +5999,16 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a"
+dependencies = [
+ "thiserror-impl 2.0.8",
 ]
 
 [[package]]
@@ -5713,6 +6022,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "thiserror-impl"
+version = "2.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "thread-id"
 version = "3.3.0"
@@ -5849,6 +6169,16 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.12",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.25.0"
@@ -5866,7 +6196,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.17",
+ "rustls 0.23.20",
  "rustls-pki-types",
  "tokio",
 ]
@@ -5879,7 +6209,7 @@ checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
 dependencies = [
  "either",
  "futures-util",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -6221,7 +6551,7 @@ dependencies = [
  "once_cell",
  "rand 0.8.5",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
  "tinyvec",
  "tokio",
  "tracing",
@@ -6242,7 +6572,7 @@ dependencies = [
  "futures-executor",
  "futures-util",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "toml 0.7.8",
@@ -6261,7 +6591,7 @@ name = "ts-rs"
 version = "8.1.0"
 source = "git+https://github.com/dr-bonez/ts-rs.git?branch=feature%2Ftop-level-as#7ae88ade90b5e724159048a663a0bdb04bed27f7"
 dependencies = [
- "thiserror",
+ "thiserror 1.0.69",
  "ts-rs-macros",
 ]
 
@@ -6303,7 +6633,7 @@ dependencies = [
  "native-tls",
  "rand 0.8.5",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
  "utf-8",
 ]
@@ -6322,7 +6652,7 @@ dependencies = [
  "log",
  "rand 0.8.5",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -6443,6 +6773,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -6701,6 +7037,12 @@ dependencies = [
  "wasite",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -6937,6 +7279,16 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "write16"
 version = "1.0.0"
@@ -6977,7 +7329,7 @@ dependencies = [
  "nom 7.1.3",
  "oid-registry",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -7019,7 +7371,7 @@ dependencies = [
  "anyhow",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -7151,6 +7503,49 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "zip"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae9c1ea7b3a5e1f4b922ff856a129881167511563dc219869afe3787fc0c1a45"
+dependencies = [
+ "aes 0.8.4",
+ "arbitrary",
+ "bzip2",
+ "constant_time_eq",
+ "crc32fast",
+ "crossbeam-utils",
+ "deflate64",
+ "displaydoc",
+ "flate2",
+ "hmac",
+ "indexmap 2.6.0",
+ "lzma-rs",
+ "memchr",
+ "pbkdf2",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror 2.0.8",
+ "time",
+ "zeroize",
+ "zopfli",
+ "zstd",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
+]
+
 [[package]]
 name = "zstd"
 version = "0.13.2"
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index 44295745d..f5637c22d 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -25,6 +25,7 @@ rand = "0.8.5"
 regex = "1.10.2"
 reqwest = "0.12"
 rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "refactor/no-dyn-ctx" }
+rustls = "0.23"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 sqlx = { version = "0.7.2", features = [
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index 2077a8bbd..b57312f05 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -327,6 +327,11 @@ impl From<torut::onion::OnionAddressParseError> for Error {
         Error::new(e, ErrorKind::Tor)
     }
 }
+impl From<rustls::Error> for Error {
+    fn from(e: rustls::Error) -> Self {
+        Error::new(e, ErrorKind::OpenSsl)
+    }
+}
 impl From<patch_db::value::Error> for Error {
     fn from(value: patch_db::value::Error) -> Self {
         match value.kind {
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index cba5bc6dc..0cde21e72 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -217,6 +217,9 @@ url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.4.1", features = ["v4"] }
 zeroize = "1.6.0"
+mail-send = { git = "https://github.com/dr-bonez/mail-send.git", branch = "main" }
+rustls = "0.23.20"
+rustls-pki-types = { version = "1.10.1", features = ["alloc"]}
 
 [profile.test]
 opt-level = 3
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 3c5875e36..8033f5e09 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -295,6 +295,13 @@ pub fn server<C: Context>() -> ParentHandler<C> {
                 .with_about("Set system smtp server and credentials")
                 .with_call_remote::<CliContext>()
         )
+        .subcommand(
+            "test-smtp", 
+            from_fn_async(system::test_system_smtp)
+                .no_display()
+                .with_about("Send test email using system smtp server and credentials")
+                .with_call_remote::<CliContext>()
+        )
         .subcommand(
             "clear-smtp",
             from_fn_async(system::clear_system_smtp)
diff --git a/core/startos/src/lxc/dev.rs b/core/startos/src/lxc/dev.rs
index 248546d88..a918672da 100644
--- a/core/startos/src/lxc/dev.rs
+++ b/core/startos/src/lxc/dev.rs
@@ -8,13 +8,11 @@ use rpc_toolkit::{
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+use crate::context::{CliContext, RpcContext};
 use crate::lxc::{ContainerId, LxcConfig};
 use crate::prelude::*;
 use crate::rpc_continuations::Guid;
-use crate::{
-    context::{CliContext, RpcContext},
-    service::ServiceStats,
-};
+use crate::service::ServiceStats;
 
 pub fn lxc<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index c0fb6eaba..60f9f4301 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -1,8 +1,9 @@
+use std::collections::BTreeSet;
+use std::ffi::OsString;
 use std::net::Ipv4Addr;
 use std::path::Path;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
-use std::{collections::BTreeSet, ffi::OsString};
 
 use clap::builder::ValueParserFactory;
 use futures::{AsyncWriteExt, StreamExt};
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index 7d48b1469..fb7c6f957 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -35,8 +35,8 @@ use crate::net::acme::AcmeCertCache;
 use crate::net::static_server::server_error;
 use crate::prelude::*;
 use crate::util::io::BackTrackingIO;
-use crate::util::sync::SyncMutex;
 use crate::util::serde::MaybeUtf8String;
+use crate::util::sync::SyncMutex;
 
 #[derive(Debug)]
 struct SingleCertResolver(Arc<CertifiedKey>);
@@ -126,7 +126,11 @@ struct VHostServer {
 }
 impl VHostServer {
     #[instrument(skip_all)]
-    async fn new(port: u16, db: TypedPatchDb<Database>, crypto_provider: Arc<CryptoProvider>) -> Result<Self, Error> {
+    async fn new(
+        port: u16,
+        db: TypedPatchDb<Database>,
+        crypto_provider: Arc<CryptoProvider>,
+    ) -> Result<Self, Error> {
         let acme_tls_alpn_cache = Arc::new(SyncMutex::new(BTreeMap::<
             InternedString,
             watch::Receiver<Option<Arc<CertifiedKey>>>,
@@ -273,7 +277,7 @@ impl VHostServer {
                                                         let domains = [domain.to_string()];
                                                         let (send, recv) = watch::channel(None);
                                                         acme_tls_alpn_cache.mutate(|c| c.insert(domain.clone(), recv));
-                                                        let cert = 
+                                                        let cert =
                                                             async_acme::rustls_helper::order(
                                                                 |_, cert| {
                                                                     send.send_replace(Some(Arc::new(cert)));
diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs
index 4b45531a4..19376026d 100644
--- a/core/startos/src/notifications.rs
+++ b/core/startos/src/notifications.rs
@@ -13,11 +13,11 @@ use serde::{Deserialize, Serialize};
 use tracing::instrument;
 use ts_rs::TS;
 
+use crate::backup::BackupReport;
 use crate::context::{CliContext, RpcContext};
-use crate::db::model::DatabaseModel;
+use crate::db::model::{Database, DatabaseModel};
 use crate::prelude::*;
 use crate::util::serde::HandlerExtSerde;
-use crate::{backup::BackupReport, db::model::Database};
 
 // #[command(subcommands(list, delete, delete_before, create))]
 pub fn notification<C: Context>() -> ParentHandler<C> {
diff --git a/core/startos/src/service/effects/subcontainer/mod.rs b/core/startos/src/service/effects/subcontainer/mod.rs
index 65fcbd387..943c70dbf 100644
--- a/core/startos/src/service/effects/subcontainer/mod.rs
+++ b/core/startos/src/service/effects/subcontainer/mod.rs
@@ -4,12 +4,11 @@ use imbl_value::InternedString;
 use models::ImageId;
 use tokio::process::Command;
 
+use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::rpc_continuations::Guid;
 use crate::service::effects::prelude::*;
+use crate::service::persistent_container::Subcontainer;
 use crate::util::Invoke;
-use crate::{
-    disk::mount::filesystem::overlayfs::OverlayGuard, service::persistent_container::Subcontainer,
-};
 
 #[cfg(feature = "container-runtime")]
 mod sync;
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index e64f30e98..d05af09b5 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -1,12 +1,18 @@
 use std::collections::BTreeSet;
 use std::fmt;
+use std::sync::Arc;
 
 use chrono::Utc;
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::FutureExt;
 use imbl::vector;
+use mail_send::mail_builder::MessageBuilder;
+use mail_send::SmtpClientBuilder;
 use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
+use rustls::crypto::CryptoProvider;
+use rustls::RootCertStore;
+use rustls_pki_types::CertificateDer;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use tokio::process::Command;
 use tokio::sync::broadcast::Receiver;
@@ -871,6 +877,57 @@ pub async fn clear_system_smtp(ctx: RpcContext) -> Result<(), Error> {
     }
     Ok(())
 }
+pub async fn test_system_smtp(
+    _: RpcContext,
+    SmtpValue {
+        server,
+        port,
+        from,
+        login,
+        password,
+    }: SmtpValue,
+) -> Result<(), Error> {
+    use rustls_pki_types::pem::PemObject;
+
+    let Some(pass_val) = password else {
+        return Err(Error::new(
+            eyre!("mail-send requires a password"),
+            ErrorKind::InvalidRequest,
+        ));
+    };
+
+    let mut root_cert_store = RootCertStore::empty();
+    let pem = tokio::fs::read("/etc/ssl/certs/ca-certificates.crt").await?;
+    for cert in CertificateDer::pem_slice_iter(&pem) {
+        root_cert_store.add_parsable_certificates([cert.with_kind(ErrorKind::OpenSsl)?]);
+    }
+
+    let cfg = Arc::new(
+        rustls::ClientConfig::builder_with_provider(Arc::new(
+            rustls::crypto::ring::default_provider(),
+        ))
+        .with_safe_default_protocol_versions()?
+        .with_root_certificates(root_cert_store)
+        .with_no_client_auth(),
+    );
+    let client = SmtpClientBuilder::new_with_tls_config(server, port, cfg)
+        .implicit_tls(false)
+        .credentials((login.clone().split_once("@").unwrap().0.to_owned(), pass_val));
+
+    let message = MessageBuilder::new()
+        .from((from.clone(), login.clone()))
+        .to(vec![(from, login)])
+        .subject("StartOS Test Email")
+        .text_body("This is a test email sent from your StartOS Server");
+    client
+        .connect()
+        .await
+        .map_err(|e| Error::new(eyre!("mail-send connection error: {:?}", e), ErrorKind::Unknown))?
+        .send(message)
+        .await
+        .map_err(|e| Error::new(eyre!("mail-send send error: {:?}", e), ErrorKind::Unknown))?;
+    Ok(())
+}
 
 #[tokio::test]
 #[ignore]

From 29e821078254623c2afd01d8b49ddc2d65307ca8 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 9 Jan 2025 16:34:34 -0700
Subject: [PATCH 337/341] enabling support for wireguard and firewall (#2713)

* wip: enabling support for wireguard and firewall

* wip

* wip

* wip

* wip

* wip

* implement some things

* fix warning

* wip

* alpha.23

* misc fixes

* remove ufw since no longer required

* remove debug info

* add cli bindings

* debugging

* fixes

* individualized acme and privacy settings for domains and bindings

* sdk version bump

* migration

* misc fixes

* refactor Host::update

* debug info

* refactor webserver

* misc fixes

* misc fixes

* refactor port forwarding

* recheck interfaces every 5 min if no dbus event

* misc fixes and cleanup

* misc fixes
---
 CLEARNET.md                                   |   40 -
 Makefile                                      |    3 +-
 build/dpkg-deps/depends                       |    2 +
 build/lib/scripts/dhclient-exit-hook          |    1 -
 build/lib/scripts/enable-kiosk                |    4 +-
 .../src/Adapters/EffectCreator.ts             |    6 -
 container-runtime/src/Adapters/RpcListener.ts |   28 +-
 .../Systems/SystemForEmbassy/index.ts         |    1 -
 .../src/Adapters/Systems/SystemForStartOs.ts  |    9 +-
 core/Cargo.lock                               | 1143 +++++++++++------
 core/models/Cargo.toml                        |    1 +
 core/models/src/errors.rs                     |    7 +
 core/startos/Cargo.toml                       |   17 +-
 core/startos/src/action.rs                    |    1 -
 core/startos/src/auth.rs                      |    3 +-
 core/startos/src/backup/restore.rs            |    3 +-
 core/startos/src/bins/container_cli.rs        |    4 +-
 core/startos/src/bins/registry.rs             |   10 +-
 core/startos/src/bins/start_cli.rs            |    5 +-
 core/startos/src/bins/start_init.rs           |   29 +-
 core/startos/src/bins/startd.rs               |   30 +-
 core/startos/src/context/config.rs            |   16 +-
 core/startos/src/context/diagnostic.rs        |    5 +-
 core/startos/src/context/rpc.rs               |   11 +-
 core/startos/src/context/setup.rs             |   19 +-
 core/startos/src/db/model/public.rs           |   81 +-
 core/startos/src/diagnostic.rs                |    4 +-
 core/startos/src/disk/mount/backup.rs         |    1 -
 core/startos/src/disk/mount/filesystem/mod.rs |    1 -
 core/startos/src/init.rs                      |   29 +-
 core/startos/src/install/mod.rs               |    3 -
 core/startos/src/lib.rs                       |    7 +-
 core/startos/src/lxc/mod.rs                   |    1 -
 core/startos/src/net/acme.rs                  |  174 +--
 core/startos/src/net/dhcp.rs                  |   99 --
 core/startos/src/net/forward.rs               |  371 ++++--
 core/startos/src/net/host/address.rs          |  321 ++++-
 core/startos/src/net/host/binding.rs          |  139 +-
 core/startos/src/net/host/mod.rs              |  163 +--
 core/startos/src/net/mod.rs                   |   17 +-
 core/startos/src/net/net_controller.rs        |  554 ++++----
 core/startos/src/net/network_interface.rs     | 1116 ++++++++++++++++
 core/startos/src/net/service_interface.rs     |    6 +-
 core/startos/src/net/ssl.rs                   |    1 -
 core/startos/src/net/static_server.rs         |   27 +-
 core/startos/src/net/utils.rs                 |   61 +-
 core/startos/src/net/vhost.rs                 | 1053 ++++++++-------
 core/startos/src/net/web_server.rs            |  327 +++--
 core/startos/src/net/wifi.rs                  |   21 +-
 core/startos/src/os_install/gpt.rs            |    2 +-
 core/startos/src/prelude.rs                   |   17 +
 core/startos/src/registry/context.rs          |    1 -
 core/startos/src/registry/mod.rs              |    7 +-
 core/startos/src/registry/package/index.rs    |    1 -
 .../signer/commitment/merkle_archive.rs       |    4 +-
 core/startos/src/s9pk/git_hash.rs             |   29 +-
 core/startos/src/s9pk/v2/manifest.rs          |    5 +-
 core/startos/src/service/effects/callbacks.rs |    2 +-
 .../startos/src/service/effects/dependency.rs |    4 +-
 core/startos/src/service/effects/mod.rs       |    4 -
 core/startos/src/service/effects/net/bind.rs  |   37 +-
 core/startos/src/service/effects/net/host.rs  |   25 -
 .../src/service/effects/net/interface.rs      |    3 -
 core/startos/src/service/effects/net/ssl.rs   |   20 +-
 core/startos/src/service/effects/store.rs     |    2 +-
 core/startos/src/service/mod.rs               |   30 +-
 .../src/service/persistent_container.rs       |   10 +-
 core/startos/src/service/rpc.rs               |    2 +-
 core/startos/src/service/service_actor.rs     |   37 +-
 core/startos/src/service/service_map.rs       |    8 +-
 core/startos/src/service/transition/backup.rs |    3 +-
 .../startos/src/service/transition/restore.rs |    5 +-
 core/startos/src/setup.rs                     |   46 +-
 core/startos/src/shutdown.rs                  |    8 +-
 core/startos/src/status/mod.rs                |    2 +-
 core/startos/src/system.rs                    |    9 +-
 core/startos/src/update/mod.rs                |    2 +-
 core/startos/src/util/actor/background.rs     |    9 +-
 core/startos/src/util/future.rs               |   62 +-
 core/startos/src/util/io.rs                   |   38 +-
 core/startos/src/util/logger.rs               |   66 +-
 core/startos/src/util/rpc.rs                  |    1 -
 core/startos/src/util/rpc_client.rs           |    6 +-
 core/startos/src/util/sync.rs                 |    1 +
 core/startos/src/version/mod.rs               |   11 +-
 core/startos/src/version/v0_3_6_alpha_0.rs    |   18 +-
 core/startos/src/version/v0_3_6_alpha_10.rs   |   94 ++
 core/startos/src/version/v0_3_6_alpha_6.rs    |    2 +-
 core/startos/src/version/v0_3_6_alpha_7.rs    |    2 +-
 core/startos/src/version/v0_3_6_alpha_8.rs    |    5 +-
 core/startos/src/volume.rs                    |    7 +-
 debian/postinst                               |   14 +-
 image-recipe/build.sh                         |    4 +-
 patch-db                                      |    2 +-
 sdk/base/lib/Effects.ts                       |   10 +-
 .../lib/actions/input/builder/inputSpec.ts    |    4 +-
 sdk/base/lib/actions/input/builder/value.ts   |    3 +
 .../lib/dependencies/setupDependencies.ts     |   20 +-
 sdk/base/lib/interfaces/Origin.ts             |    2 -
 .../lib/interfaces/ServiceInterfaceBuilder.ts |    1 -
 .../{HostAddress.ts => AcmeProvider.ts}       |    4 +-
 sdk/base/lib/osBindings/AcmeSettings.ts       |   12 +-
 sdk/base/lib/osBindings/BindInfo.ts           |    4 +-
 sdk/base/lib/osBindings/DomainConfig.ts       |    4 +
 .../ExportServiceInterfaceParams.ts           |    1 -
 .../lib/osBindings/ForgetInterfaceParams.ts   |    3 +
 .../lib/osBindings/GetPrimaryUrlParams.ts     |   10 -
 sdk/base/lib/osBindings/GitHash.ts            |    3 +
 sdk/base/lib/osBindings/Host.ts               |    5 +-
 sdk/base/lib/osBindings/IpHostname.ts         |    8 +-
 sdk/base/lib/osBindings/IpInfo.ts             |   10 +-
 sdk/base/lib/osBindings/Manifest.ts           |    3 +-
 .../lib/osBindings/{LanInfo.ts => NetInfo.ts} |    3 +-
 .../lib/osBindings/NetworkInterfaceInfo.ts    |    7 +
 .../lib/osBindings/NetworkInterfaceType.ts    |    3 +
 sdk/base/lib/osBindings/PackageVersionInfo.ts |    3 +-
 sdk/base/lib/osBindings/ServerInfo.ts         |    7 +-
 sdk/base/lib/osBindings/ServiceInterface.ts   |    1 -
 sdk/base/lib/osBindings/SetPublicParams.ts    |    3 +
 sdk/base/lib/osBindings/UnsetPublicParams.ts  |    3 +
 sdk/base/lib/osBindings/index.ts              |   12 +-
 .../lib/test/startosTypeValidation.test.ts    |    2 -
 sdk/base/lib/types.ts                         |   27 -
 sdk/base/lib/util/getServiceInterface.ts      |   31 +-
 sdk/base/lib/util/getServiceInterfaces.ts     |   12 -
 sdk/base/lib/util/patterns.ts                 |   22 +-
 sdk/base/package-lock.json                    |    8 +-
 sdk/base/package.json                         |    2 +-
 sdk/package/lib/StartSdk.ts                   |   20 +-
 sdk/package/lib/mainFn/CommandController.ts   |   94 +-
 sdk/package/lib/mainFn/Daemon.ts              |    2 +
 sdk/package/lib/mainFn/Daemons.ts             |   59 +-
 sdk/package/lib/mainFn/HealthDaemon.ts        |   13 +
 sdk/package/lib/manifest/setupManifest.ts     |   11 -
 sdk/package/lib/test/host.test.ts             |    1 -
 sdk/package/package-lock.json                 |   12 +-
 sdk/package/package.json                      |    4 +-
 web/package-lock.json                         |    4 +-
 web/package.json                              |    2 +-
 .../app-interfaces/app-interfaces.page.ts     |   31 +-
 .../server-specs/server-specs.page.html       |   41 +-
 .../server-specs/server-specs.page.ts         |    1 +
 .../ui/src/app/services/api/api.fixures.ts    |   22 +-
 .../ui/src/app/services/api/mock-patch.ts     |   52 +-
 144 files changed, 4872 insertions(+), 2392 deletions(-)
 delete mode 100644 CLEARNET.md
 delete mode 100755 build/lib/scripts/dhclient-exit-hook
 delete mode 100644 core/startos/src/net/dhcp.rs
 create mode 100644 core/startos/src/net/network_interface.rs
 create mode 100644 core/startos/src/version/v0_3_6_alpha_10.rs
 rename sdk/base/lib/osBindings/{HostAddress.ts => AcmeProvider.ts} (51%)
 create mode 100644 sdk/base/lib/osBindings/DomainConfig.ts
 create mode 100644 sdk/base/lib/osBindings/ForgetInterfaceParams.ts
 delete mode 100644 sdk/base/lib/osBindings/GetPrimaryUrlParams.ts
 create mode 100644 sdk/base/lib/osBindings/GitHash.ts
 rename sdk/base/lib/osBindings/{LanInfo.ts => NetInfo.ts} (80%)
 create mode 100644 sdk/base/lib/osBindings/NetworkInterfaceInfo.ts
 create mode 100644 sdk/base/lib/osBindings/NetworkInterfaceType.ts
 create mode 100644 sdk/base/lib/osBindings/SetPublicParams.ts
 create mode 100644 sdk/base/lib/osBindings/UnsetPublicParams.ts

diff --git a/CLEARNET.md b/CLEARNET.md
deleted file mode 100644
index 457a2e4f7..000000000
--- a/CLEARNET.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Setting up clearnet for a service interface
-
-NOTE: this guide is for HTTPS only! Other configurations may require a more bespoke setup depending on the service. Please consult the service documentation or the Start9 Community for help with non-HTTPS applications
-
-## Initialize ACME certificate generation
-
-The following command will register your device with an ACME certificate provider, such as letsencrypt
-
-This only needs to be done once.
-
-```
-start-cli net acme init --provider=letsencrypt --contact="mailto:me@drbonez.dev"
-```
-
-- `provider` can be `letsencrypt`, `letsencrypt-staging` (useful if you're doing a lot of testing and want to avoid being rate limited), or the url of any provider that supports the [RFC8555](https://datatracker.ietf.org/doc/html/rfc8555) ACME api
-- `contact` can be any valid contact url, typically `mailto:` urls. it can be specified multiple times to set multiple contacts
-
-## Whitelist a domain for ACME certificate acquisition
-
-The following command will tell the OS to use ACME certificates instead of system signed ones for the provided url. In this example, `testing.drbonez.dev`
-
-This must be done for every domain you wish to host on clearnet.
-
-```
-start-cli net acme domain add "testing.drbonez.dev"
-```
-
-## Forward clearnet port
-
-Go into your router settings, and map port 443 on your router to port 5443 on your start-os device. This one port should cover most use cases
-
-## Add domain to service host
-
-The following command will tell the OS to route https requests from the WAN to the provided hostname to the specified service. In this example, we are adding `testing.drbonez.dev` to the host `ui-multi` on the package `hello-world`. To see a list of available host IDs for a given package, run `start-cli package host <PACKAGE> list`
-
-This must be done for every domain you wish to host on clearnet.
-
-```
-start-cli package host hello-world address ui-multi add testing.drbonez.dev
-```
diff --git a/Makefile b/Makefile
index e0f89f3f9..a00a5c1c9 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ GZIP_BIN := $(shell which pigz || which gzip)
 TAR_BIN := $(shell which gtar || which tar)
 COMPILED_TARGETS := core/target/$(ARCH)-unknown-linux-musl/release/startbox core/target/$(ARCH)-unknown-linux-musl/release/containerbox system-images/compat/docker-images/$(ARCH).tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar container-runtime/rootfs.$(ARCH).squashfs
 ALL_TARGETS := $(STARTD_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) $(COMPILED_TARGETS) cargo-deps/$(ARCH)-unknown-linux-musl/release/startos-backup-fs $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo cargo-deps/aarch64-unknown-linux-musl/release/pi-beep; fi)  $(shell /bin/bash -c 'if [[ "${ENVIRONMENT}" =~ (^|-)unstable($$|-) ]]; then echo cargo-deps/$(ARCH)-unknown-linux-musl/release/tokio-console; fi') $(PLATFORM_FILE) 
+REBUILD_TYPES = 1
 
 ifeq ($(REMOTE),)
 	mkdir = mkdir -p $1
@@ -226,7 +227,7 @@ container-runtime/node_modules/.package-lock.json: container-runtime/package.jso
 	npm --prefix container-runtime ci
 	touch container-runtime/node_modules/.package-lock.json
 
-sdk/base/lib/osBindings/index.ts: core/startos/bindings/index.ts
+sdk/base/lib/osBindings/index.ts: $(shell if [ "$(REBUILD_TYPES)" -ne 0 ]; then echo core/startos/bindings/index.ts; fi)
 	mkdir -p sdk/base/lib/osBindings
 	rsync -ac --delete core/startos/bindings/ sdk/base/lib/osBindings/
 	touch sdk/base/lib/osBindings/index.ts
diff --git a/build/dpkg-deps/depends b/build/dpkg-deps/depends
index f495df85d..4c2dbc557 100644
--- a/build/dpkg-deps/depends
+++ b/build/dpkg-deps/depends
@@ -11,6 +11,7 @@ cryptsetup
 curl
 dnsutils
 dmidecode
+dnsutils
 dosfstools
 e2fsprogs
 ecryptfs-utils
@@ -57,4 +58,5 @@ systemd-timesyncd
 tor
 util-linux
 vim
+wireguard-tools
 wireless-tools
diff --git a/build/lib/scripts/dhclient-exit-hook b/build/lib/scripts/dhclient-exit-hook
deleted file mode 100755
index 8c4a97746..000000000
--- a/build/lib/scripts/dhclient-exit-hook
+++ /dev/null
@@ -1 +0,0 @@
-start-cli net dhcp update $interface
\ No newline at end of file
diff --git a/build/lib/scripts/enable-kiosk b/build/lib/scripts/enable-kiosk
index 45bed5fe9..cd48fc032 100755
--- a/build/lib/scripts/enable-kiosk
+++ b/build/lib/scripts/enable-kiosk
@@ -4,7 +4,7 @@ set -e
 
 # install dependencies
 /usr/bin/apt update
-/usr/bin/apt install --no-install-recommends -y xserver-xorg x11-xserver-utils xinit firefox-esr matchbox-window-manager libnss3-tools
+/usr/bin/apt install --no-install-recommends -y xserver-xorg x11-xserver-utils xinit firefox-esr matchbox-window-manager libnss3-tools p11-kit-modules
 
 #Change a default preference set by stock debian firefox-esr
 sed -i 's|^pref("extensions.update.enabled", true);$|pref("extensions.update.enabled", false);|' /etc/firefox-esr/firefox-esr.js
@@ -83,6 +83,8 @@ user_pref("toolkit.telemetry.updatePing.enabled", false);
 user_pref("toolkit.telemetry.cachedClientID", "");
 EOF
 
+ln -sf /usr/lib/$(uname -m)-linux-gnu/pkcs11/p11-kit-trust.so /usr/lib/firefox-esr/libnssckbi.so
+
 # create kiosk script
 cat > /home/kiosk/kiosk.sh << 'EOF'
 #!/bin/sh
diff --git a/container-runtime/src/Adapters/EffectCreator.ts b/container-runtime/src/Adapters/EffectCreator.ts
index 0123b0cbc..4bda0ed5d 100644
--- a/container-runtime/src/Adapters/EffectCreator.ts
+++ b/container-runtime/src/Adapters/EffectCreator.ts
@@ -216,12 +216,6 @@ export function makeEffects(context: EffectContext): Effects {
       }) as ReturnType<T.Effects["getServiceInterface"]>
     },
 
-    getPrimaryUrl(...[options]: Parameters<T.Effects["getPrimaryUrl"]>) {
-      return rpcRound("get-primary-url", {
-        ...options,
-        callback: context.callbacks?.addCallback(options.callback) || null,
-      }) as ReturnType<T.Effects["getPrimaryUrl"]>
-    },
     getServicePortForward(
       ...[options]: Parameters<T.Effects["getServicePortForward"]>
     ) {
diff --git a/container-runtime/src/Adapters/RpcListener.ts b/container-runtime/src/Adapters/RpcListener.ts
index 3e86e60d1..c2dc8bafe 100644
--- a/container-runtime/src/Adapters/RpcListener.ts
+++ b/container-runtime/src/Adapters/RpcListener.ts
@@ -212,16 +212,22 @@ export class RpcListener {
       s.on("data", (a) =>
         Promise.resolve(a)
           .then((b) => b.toString())
-          .then(logData("dataIn"))
-          .then(jsonParse)
-          .then(captureId)
-          .then((x) => this.dealWithInput(x))
-          .catch(mapError)
-          .then(logData("response"))
-          .then(writeDataToSocket)
-          .catch((e) => {
-            console.error(`Major error in socket handling: ${e}`)
-            console.debug(`Data in: ${a.toString()}`)
+          .then((buf) => {
+            for (let s of buf.split("\n")) {
+              if (s)
+                Promise.resolve(s)
+                  .then(logData("dataIn"))
+                  .then(jsonParse)
+                  .then(captureId)
+                  .then((x) => this.dealWithInput(x))
+                  .catch(mapError)
+                  .then(logData("response"))
+                  .then(writeDataToSocket)
+                  .catch((e) => {
+                    console.error(`Major error in socket handling: ${e}`)
+                    console.debug(`Data in: ${a.toString()}`)
+                  })
+            }
           }),
       )
     })
@@ -390,7 +396,7 @@ export class RpcListener {
 
       .defaultToLazy(() => {
         console.warn(
-          `Coudln't parse the following input ${JSON.stringify(input)}`,
+          `Couldn't parse the following input ${JSON.stringify(input)}`,
         )
         return {
           jsonrpc,
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
index 531b30cd2..e74ef317d 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
@@ -425,7 +425,6 @@ export class SystemForEmbassy implements System {
               name: interfaceValue.name,
               id: `${id}-${internal}`,
               description: interfaceValue.description,
-              hasPrimary: false,
               type:
                 interfaceValue.ui &&
                 (origin.scheme === "http" || origin.sslScheme === "https")
diff --git a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
index 334764a87..1d38c83e6 100644
--- a/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForStartOs.ts
@@ -74,8 +74,8 @@ export class SystemForStartOs implements System {
   async exit(): Promise<void> {}
 
   async start(effects: Effects): Promise<void> {
+    if (this.runningMain) return
     effects.constRetry = utils.once(() => effects.restart())
-    if (this.runningMain) await this.stop()
     let mainOnTerm: () => Promise<void> | undefined
     const started = async (onTerm: () => Promise<void>) => {
       await effects.setMainStatus({ status: "running" })
@@ -98,8 +98,11 @@ export class SystemForStartOs implements System {
 
   async stop(): Promise<void> {
     if (this.runningMain) {
-      await this.runningMain.stop()
-      this.runningMain = undefined
+      try {
+        await this.runningMain.stop()
+      } finally {
+        this.runningMain = undefined
+      }
     }
   }
 }
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 48c26ce61..41b912eaf 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -103,9 +103,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android-tzdata"
@@ -173,9 +173,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.93"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "arbitrary"
@@ -237,7 +237,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
  "synstructure",
 ]
 
@@ -249,13 +249,13 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
 name = "async-acme"
-version = "0.5.0"
-source = "git+https://github.com/dr-bonez/async-acme.git#b9ff31ad900adc9086c0d1437ce51661d30856d2"
+version = "0.6.0"
+source = "git+https://github.com/dr-bonez/async-acme.git#0ddf25152237b5fc1726d977a7931e44513ce309"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -274,6 +274,18 @@ dependencies = [
  "x509-parser",
 ]
 
+[[package]]
+name = "async-broadcast"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
+dependencies = [
+ "event-listener 5.4.0",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -281,15 +293,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue 2.5.0",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
 ]
 
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue 2.5.0",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-compression"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
+checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
 dependencies = [
  "brotli",
  "flate2",
@@ -299,6 +323,108 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "async-executor"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+dependencies = [
+ "async-task",
+ "concurrent-queue 2.5.0",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue 2.5.0",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener 5.4.0",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+dependencies = [
+ "async-channel 2.3.1",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener 5.4.0",
+ "futures-lite",
+ "rustix",
+ "tracing",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "async-stream"
 version = "0.3.6"
@@ -318,18 +444,24 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -355,28 +487,26 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7c2840b66236045acd2607d5866e274380afd87ef99d6226e961e2cb47df45"
+checksum = "f409eb70b561706bf8abba8ca9c112729c481595893fd06a2dd9af8ed8441148"
 dependencies = [
  "aws-lc-sys",
- "mirai-annotations",
  "paste",
  "zeroize",
 ]
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.23.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad3a619a9de81e1d7de1f1186dcba4506ed661a0e483d84410fdef0ee87b2f96"
+checksum = "923ded50f602b3007e5e63e3f094c479d9c8a9b42d7f4034e4afe456aa48bfd2"
 dependencies = [
  "bindgen",
  "cc",
  "cmake",
  "dunce",
  "fs_extra",
- "libc",
  "paste",
 ]
 
@@ -393,7 +523,7 @@ dependencies = [
  "futures-util",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.31",
+ "hyper 0.14.32",
  "itoa",
  "matchit",
  "memchr",
@@ -419,10 +549,10 @@ dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.1",
+ "hyper 1.5.2",
  "hyper-util",
  "itoa",
  "matchit",
@@ -436,10 +566,10 @@ dependencies = [
  "serde_path_to_error",
  "serde_urlencoded",
  "sha1",
- "sync_wrapper 1.0.1",
+ "sync_wrapper 1.0.2",
  "tokio",
  "tokio-tungstenite 0.24.0",
- "tower 0.5.1",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -471,37 +601,18 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 1.0.1",
+ "sync_wrapper 1.0.2",
  "tower-layer",
  "tower-service",
  "tracing",
 ]
 
-[[package]]
-name = "axum-server"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad46c3ec4e12f4a4b6835e173ba21c25e484c9d02b49770bf006ce5367c036"
-dependencies = [
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.5.1",
- "hyper-util",
- "pin-project-lite",
- "tokio",
- "tower 0.4.13",
- "tower-service",
-]
-
 [[package]]
 name = "backhand"
 version = "0.18.0"
@@ -540,7 +651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be5951c75bdabb58753d140dd5802f12ff3a483cb2e16fb5276e111b94b19e87"
 dependencies = [
  "concurrent-queue 1.2.4",
- "event-listener",
+ "event-listener 2.5.3",
  "spin 0.9.8",
 ]
 
@@ -619,7 +730,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.87",
+ "syn 2.0.95",
  "which",
 ]
 
@@ -629,7 +740,16 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.6.3",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec 0.8.0",
 ]
 
 [[package]]
@@ -638,6 +758,12 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -696,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
+checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e"
 dependencies = [
  "arrayref",
  "arrayvec 0.7.6",
@@ -727,6 +853,19 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel 2.3.1",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
 [[package]]
 name = "brotli"
 version = "7.0.0"
@@ -756,9 +895,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.20.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 
 [[package]]
 name = "byteorder"
@@ -774,9 +913,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "bzip2"
@@ -807,9 +946,9 @@ checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21"
 
 [[package]]
 name = "cc"
-version = "1.2.1"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
 dependencies = [
  "jobserver",
  "libc",
@@ -839,9 +978,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -920,9 +1059,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.21"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -930,9 +1069,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.21"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
 dependencies = [
  "anstream",
  "anstyle",
@@ -942,27 +1081,27 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "cmake"
-version = "0.1.51"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
+checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
 dependencies = [
  "cc",
 ]
@@ -1020,15 +1159,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.8"
+version = "0.15.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
 dependencies = [
- "encode_unicode 0.3.6",
- "lazy_static",
+ "encode_unicode",
  "libc",
- "unicode-width 0.1.12",
- "windows-sys 0.52.0",
+ "once_cell",
+ "unicode-width 0.2.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1077,18 +1216,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const_format"
-version = "0.2.31"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.31"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1163,9 +1302,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -1196,18 +1335,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -1224,18 +1363,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crossterm"
@@ -1358,7 +1497,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1382,7 +1521,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1393,7 +1532,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1430,7 +1569,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1467,7 +1606,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1488,7 +1627,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1501,7 +1640,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1554,7 +1693,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1713,12 +1852,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
 [[package]]
 name = "encode_unicode"
 version = "1.0.0"
@@ -1734,6 +1867,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
 [[package]]
 name = "enum-as-inner"
 version = "0.6.1"
@@ -1743,7 +1882,28 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
+]
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1765,12 +1925,12 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1800,6 +1960,27 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[package]]
+name = "event-listener"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+dependencies = [
+ "concurrent-queue 2.5.0",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
+dependencies = [
+ "event-listener 5.4.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "exver"
 version = "0.2.0"
@@ -1830,9 +2011,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fd-lock-rs"
@@ -1884,7 +2065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide 0.8.2",
 ]
 
 [[package]]
@@ -2014,6 +2195,19 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
+[[package]]
+name = "futures-lite"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.31"
@@ -2022,7 +2216,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -2085,7 +2279,7 @@ checksum = "75cec8bb4d3d32542cfcb9517f78366b52c17931e30d7ee1682c13686c19cee7"
 dependencies = [
  "futures",
  "futures-rustls",
- "hyper 1.5.1",
+ "hyper 1.5.2",
  "log",
  "serde",
  "serde_json",
@@ -2093,7 +2287,7 @@ dependencies = [
  "serde_urlencoded",
  "tokio",
  "tokio-rustls 0.25.0",
- "webpki-roots 0.26.6",
+ "webpki-roots 0.26.7",
 ]
 
 [[package]]
@@ -2136,9 +2330,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gpt"
@@ -2175,7 +2369,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2193,8 +2387,8 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.1.0",
- "indexmap 2.6.0",
+ "http 1.2.0",
+ "indexmap 2.7.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2244,9 +2438,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "hashlink"
@@ -2397,11 +2591,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2428,9 +2622,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -2455,7 +2649,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.1.0",
+ "http 1.2.0",
 ]
 
 [[package]]
@@ -2466,7 +2660,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "pin-project-lite",
 ]
@@ -2491,9 +2685,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.31"
+version = "0.14.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2515,15 +2709,15 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "h2 0.4.7",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "httparse",
  "httpdate",
@@ -2536,18 +2730,18 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.3"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
- "http 1.1.0",
- "hyper 1.5.1",
+ "http 1.2.0",
+ "hyper 1.5.2",
  "hyper-util",
  "rustls 0.23.20",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls 0.26.1",
  "tower-service",
 ]
 
@@ -2557,7 +2751,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.31",
+ "hyper 0.14.32",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2571,7 +2765,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.5.1",
+ "hyper 1.5.2",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2588,9 +2782,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
- "hyper 1.5.1",
+ "hyper 1.5.2",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2736,7 +2930,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -2812,17 +3006,17 @@ dependencies = [
 
 [[package]]
 name = "imbl-sized-chunks"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63"
+checksum = "8f4241005618a62f8d57b2febd02510fb96e0137304728543dfc5fd6f052c22d"
 dependencies = [
  "bitmaps",
 ]
 
 [[package]]
 name = "imbl-value"
-version = "0.1.0"
-source = "git+https://github.com/Start9Labs/imbl-value.git#3ce01b17ae5e756fc829ee5e3513a1b19b2a03fc"
+version = "0.1.1"
+source = "git+https://github.com/Start9Labs/imbl-value.git#1900943e17116def03bf00bff05cf12e54d810bc"
 dependencies = [
  "imbl",
  "serde",
@@ -2869,12 +3063,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -3016,9 +3210,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jaq-core"
@@ -3087,10 +3281,11 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.72"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -3141,7 +3336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
 dependencies = [
  "ascii-canvas",
- "bit-set",
+ "bit-set 0.5.3",
  "ena",
  "itertools 0.11.0",
  "lalrpop-util",
@@ -3171,7 +3366,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06cf485d4867e0714e35c1652e736bcf892d28fceecca01036764575db64ba84"
 dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
  "futures",
 ]
 
@@ -3211,15 +3406,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.164"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.6",
@@ -3239,7 +3434,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.5.7",
+ "redox_syscall 0.5.8",
 ]
 
 [[package]]
@@ -3267,15 +3462,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "litemap"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "litrs"
@@ -3389,8 +3584,8 @@ dependencies = [
  "rustls-pki-types",
  "smtp-proto",
  "tokio",
- "tokio-rustls 0.26.0",
- "webpki-roots 0.26.6",
+ "tokio-rustls 0.26.1",
+ "webpki-roots 0.26.7",
 ]
 
 [[package]]
@@ -3476,6 +3671,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -3499,32 +3703,25 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi 0.3.9",
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "mirai-annotations"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
-
 [[package]]
 name = "models"
 version = "0.1.0"
@@ -3555,6 +3752,7 @@ dependencies = [
  "tracing",
  "ts-rs",
  "yasi",
+ "zbus",
 ]
 
 [[package]]
@@ -3625,6 +3823,7 @@ dependencies = [
  "cfg-if",
  "cfg_aliases",
  "libc",
+ "memoffset 0.9.1",
 ]
 
 [[package]]
@@ -3794,7 +3993,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -3869,7 +4068,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -3900,6 +4099,16 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3950,6 +4159,12 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -3968,7 +4183,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.7",
+ "redox_syscall 0.5.8",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -4057,20 +4272,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
 dependencies = [
  "memchr",
- "thiserror 1.0.69",
+ "thiserror 2.0.10",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4078,22 +4293,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.14"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
 dependencies = [
  "once_cell",
  "pest",
@@ -4107,7 +4322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
 ]
 
 [[package]]
@@ -4127,29 +4342,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
+checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
+checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -4157,6 +4372,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
 [[package]]
 name = "pkcs1"
 version = "0.7.5"
@@ -4184,11 +4410,26 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
+[[package]]
+name = "polling"
+version = "3.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue 2.5.0",
+ "hermit-abi 0.4.0",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "portable-atomic"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -4213,12 +4454,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.25"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
+checksum = "483f8c21f64f3ea09fe0f30f5d48c3e8eefe5dac9129f0075f76593b4c1da705"
 dependencies = [
  "proc-macro2",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -4228,11 +4469,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
 dependencies = [
  "csv",
- "encode_unicode 1.0.0",
+ "encode_unicode",
  "is-terminal",
  "lazy_static",
  "term",
- "unicode-width 0.1.12",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -4255,9 +4496,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -4290,12 +4531,12 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
- "bit-set",
- "bit-vec",
+ "bit-set 0.8.0",
+ "bit-vec 0.8.0",
  "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
@@ -4310,13 +4551,13 @@ dependencies = [
 
 [[package]]
 name = "proptest-derive"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
+checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -4339,7 +4580,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -4393,9 +4634,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -4540,9 +4781,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -4604,9 +4845,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.9"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4616,10 +4857,10 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.4.7",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.1",
+ "hyper 1.5.2",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
@@ -4635,12 +4876,13 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
+ "sync_wrapper 1.0.2",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tokio-socks",
  "tokio-util",
+ "tower 0.5.2",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -4733,7 +4975,7 @@ dependencies = [
  "axum 0.7.9",
  "clap",
  "futures",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body-util",
  "imbl-value",
  "itertools 0.12.1",
@@ -4753,9 +4995,9 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -4825,15 +5067,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.41"
+version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
+checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
  "bitflags 2.6.0",
- "errno 0.3.9",
+ "errno 0.3.10",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4926,9 +5168,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "rusty-fork"
@@ -4944,18 +5186,17 @@ dependencies = [
 
 [[package]]
 name = "rustyline-async"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc9396d834c31f9fddd716e7c279e7cb70207092a1e59767918610f5c560c6eb"
+checksum = "6fa3f78c2ea57b827be4c11adbfed26e5fe1b49fb6fb7826e2a9eebbc2e8db10"
 dependencies = [
  "crossterm",
- "futures-channel",
  "futures-util",
  "pin-project",
  "thingbuf",
- "thiserror 1.0.69",
+ "thiserror 2.0.10",
  "unicode-segmentation",
- "unicode-width 0.1.12",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -5027,9 +5268,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5037,18 +5278,18 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -5072,22 +5313,22 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itoa",
  "memchr",
  "ryu",
@@ -5115,6 +5356,17 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "serde_spanned"
 version = "0.6.8"
@@ -5138,15 +5390,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.11.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5156,14 +5408,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.11.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -5172,7 +5424,7 @@ version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ce6afeda22f0b55dde2c34897bce76a629587348480384231205c14b59a01f"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itoa",
  "libyml",
  "log",
@@ -5347,9 +5599,9 @@ checksum = "51b8ad3dd187f0d4debab02ad65405a9919d6a4f7bce25bd64a258781063a53a"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -5417,7 +5669,7 @@ dependencies = [
  "crc",
  "crossbeam-queue",
  "either",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-channel",
  "futures-core",
  "futures-intrusive",
@@ -5425,7 +5677,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "log",
  "memchr",
  "once_cell",
@@ -5593,9 +5845,9 @@ dependencies = [
 
 [[package]]
 name = "sscanf"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d"
+checksum = "c713ebd15ce561dd4a13ed62bc2a0368e16806fc30dcaf66ecf1256b2a3fdde6"
 dependencies = [
  "const_format",
  "lazy_static",
@@ -5605,17 +5857,17 @@ dependencies = [
 
 [[package]]
 name = "sscanf_macro"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc"
+checksum = "84955aa74a157e5834d58a07be11af7f0ab923f0194a0bb2ea6b3db8b5d1611d"
 dependencies = [
  "convert_case 0.6.0",
  "proc-macro2",
  "quote",
  "regex-syntax 0.6.29",
  "strsim 0.10.0",
- "syn 2.0.87",
- "unicode-width 0.1.12",
+ "syn 2.0.95",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -5668,7 +5920,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "start-os"
-version = "0.3.6-alpha.9"
+version = "0.3.6-alpha.10"
 dependencies = [
  "aes 0.7.5",
  "async-acme",
@@ -5676,7 +5928,6 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum 0.7.9",
- "axum-server",
  "backhand",
  "barrage",
  "base32 0.5.1",
@@ -5691,6 +5942,7 @@ dependencies = [
  "color-eyre",
  "console",
  "console-subscriber",
+ "const_format",
  "cookie",
  "cookie_store",
  "der",
@@ -5707,14 +5959,15 @@ dependencies = [
  "helpers",
  "hex",
  "hmac",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body-util",
+ "hyper 1.5.2",
  "hyper-util",
  "id-pool",
  "imbl",
  "imbl-value",
  "include_dir",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "indicatif",
  "integer-encoding",
  "ipnet",
@@ -5732,6 +5985,7 @@ dependencies = [
  "log",
  "mail-send",
  "mbrman",
+ "mio",
  "models",
  "new_mime_guess",
  "nix 0.29.0",
@@ -5780,7 +6034,7 @@ dependencies = [
  "textwrap",
  "thiserror 1.0.69",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls 0.26.1",
  "tokio-socks",
  "tokio-stream",
  "tokio-tar",
@@ -5802,6 +6056,7 @@ dependencies = [
  "url",
  "urlencoding",
  "uuid",
+ "zbus",
  "zeroize",
 ]
 
@@ -5866,9 +6121,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5883,9 +6138,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -5898,7 +6153,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -5936,17 +6191,18 @@ checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
 dependencies = [
  "filetime",
  "libc",
- "xattr 1.3.1",
+ "xattr 1.4.0",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "getrandom 0.2.15",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -5980,7 +6236,7 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width 0.1.12",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -6004,11 +6260,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.8"
+version = "2.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a"
+checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3"
 dependencies = [
- "thiserror-impl 2.0.8",
+ "thiserror-impl 2.0.10",
 ]
 
 [[package]]
@@ -6019,18 +6275,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.8"
+version = "2.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943"
+checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -6056,9 +6312,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -6077,9 +6333,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6106,9 +6362,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -6121,9 +6377,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.41.1"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -6150,13 +6406,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -6192,12 +6448,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls 0.23.20",
- "rustls-pki-types",
  "tokio",
 ]
 
@@ -6215,9 +6470,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -6267,9 +6522,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6317,7 +6572,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -6330,11 +6585,11 @@ version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.20",
+ "winnow 0.6.22",
 ]
 
 [[package]]
@@ -6351,7 +6606,7 @@ dependencies = [
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.31",
+ "hyper 0.14.32",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -6405,14 +6660,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "sync_wrapper 0.1.2",
+ "sync_wrapper 1.0.2",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -6433,9 +6688,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -6445,20 +6700,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -6466,9 +6721,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-error"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
 dependencies = [
  "tracing",
  "tracing-subscriber",
@@ -6486,9 +6741,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-journald"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd"
+checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657"
 dependencies = [
  "libc",
  "tracing-core",
@@ -6508,9 +6763,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -6603,7 +6858,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
  "termcolor",
 ]
 
@@ -6627,7 +6882,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 1.1.0",
+ "http 1.2.0",
  "httparse",
  "log",
  "native-tls",
@@ -6647,7 +6902,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 1.1.0",
+ "http 1.2.0",
  "httparse",
  "log",
  "rand 0.8.5",
@@ -6673,7 +6928,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -6688,6 +6943,17 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
+[[package]]
+name = "uds_windows"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+dependencies = [
+ "memoffset 0.9.1",
+ "tempfile",
+ "winapi",
+]
+
 [[package]]
 name = "unarray"
 version = "0.1.4"
@@ -6696,21 +6962,21 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicase"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-linebreak"
@@ -6741,9 +7007,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
@@ -6787,9 +7053,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.3"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna 1.0.3",
@@ -6902,9 +7168,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6913,36 +7179,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.45"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6950,22 +7216,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wasm-streams"
@@ -6982,9 +7248,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.72"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7008,9 +7274,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.6"
+version = "0.26.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -7033,7 +7299,7 @@ version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.5.7",
+ "redox_syscall 0.5.8",
  "wasite",
 ]
 
@@ -7272,9 +7538,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980"
 dependencies = [
  "memchr",
 ]
@@ -7344,15 +7610,25 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909"
 dependencies = [
  "libc",
  "linux-raw-sys",
  "rustix",
 ]
 
+[[package]]
+name = "xdg-home"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "xz2"
 version = "0.1.7"
@@ -7397,9 +7673,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -7409,16 +7685,79 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
  "synstructure",
 ]
 
+[[package]]
+name = "zbus"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb67eadba43784b6fb14857eba0d8fc518686d3ee537066eb6086dc318e2c8a1"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener 5.4.0",
+ "futures-core",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "serde",
+ "serde_repr",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.59.0",
+ "winnow 0.6.22",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d49ebc960ceb660f2abe40a5904da975de6986f2af0d7884b39eec6528c57"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+ "zbus_names",
+ "zvariant",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "winnow 0.6.22",
+ "zvariant",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -7437,27 +7776,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
  "synstructure",
 ]
 
@@ -7478,7 +7817,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -7500,7 +7839,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -7519,13 +7858,13 @@ dependencies = [
  "displaydoc",
  "flate2",
  "hmac",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "lzma-rs",
  "memchr",
  "pbkdf2",
  "rand 0.8.5",
  "sha1",
- "thiserror 2.0.8",
+ "thiserror 2.0.10",
  "time",
  "zeroize",
  "zopfli",
@@ -7573,3 +7912,45 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
+
+[[package]]
+name = "zvariant"
+version = "5.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "winnow 0.6.22",
+ "zvariant_derive",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "5.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "static_assertions",
+ "syn 2.0.95",
+ "winnow 0.6.22",
+]
diff --git a/core/models/Cargo.toml b/core/models/Cargo.toml
index f5637c22d..5defd1986 100644
--- a/core/models/Cargo.toml
+++ b/core/models/Cargo.toml
@@ -40,3 +40,4 @@ tokio = { version = "1", features = ["full"] }
 torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies" }
 tracing = "0.1.39"
 yasi = "0.1.5"
+zbus = "5"
diff --git a/core/models/src/errors.rs b/core/models/src/errors.rs
index b57312f05..e7b73b0ec 100644
--- a/core/models/src/errors.rs
+++ b/core/models/src/errors.rs
@@ -90,6 +90,7 @@ pub enum ErrorKind {
     Lxc = 72,
     Cancelled = 73,
     Git = 74,
+    DBus = 75,
 }
 impl ErrorKind {
     pub fn as_str(&self) -> &'static str {
@@ -169,6 +170,7 @@ impl ErrorKind {
             Lxc => "LXC Error",
             Cancelled => "Cancelled",
             Git => "Git Error",
+            DBus => "DBus Error",
         }
     }
 }
@@ -327,6 +329,11 @@ impl From<torut::onion::OnionAddressParseError> for Error {
         Error::new(e, ErrorKind::Tor)
     }
 }
+impl From<zbus::Error> for Error {
+    fn from(e: zbus::Error) -> Self {
+        Error::new(e, ErrorKind::DBus)
+    }
+}
 impl From<rustls::Error> for Error {
     fn from(e: rustls::Error) -> Self {
         Error::new(e, ErrorKind::OpenSsl)
diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml
index 0cde21e72..a476db313 100644
--- a/core/startos/Cargo.toml
+++ b/core/startos/Cargo.toml
@@ -14,7 +14,7 @@ keywords = [
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.3.6-alpha.9"
+version = "0.3.6-alpha.10"
 license = "MIT"
 
 [lib]
@@ -50,7 +50,7 @@ test = []
 
 [dependencies]
 aes = { version = "0.7.5", features = ["ctr"] }
-async-acme = { version = "0.5.0", git = "https://github.com/dr-bonez/async-acme.git", features = [
+async-acme = { version = "0.6.0", git = "https://github.com/dr-bonez/async-acme.git", features = [
   "use_rustls",
   "use_tokio",
 ] }
@@ -62,7 +62,6 @@ async-compression = { version = "0.4.4", features = [
 async-stream = "0.3.5"
 async-trait = "0.1.74"
 axum = { version = "0.7.3", features = ["ws"] }
-axum-server = "0.6.0"
 barrage = "0.2.3"
 backhand = "0.18.0"
 base32 = "0.5.0"
@@ -76,6 +75,7 @@ clap = "4.4.12"
 color-eyre = "0.6.2"
 console = "0.15.7"
 console-subscriber = { version = "0.3.0", optional = true }
+const_format = "0.2.34"
 cookie = "0.18.0"
 cookie_store = "0.21.0"
 der = { version = "0.7.9", features = ["derive", "pem"] }
@@ -102,11 +102,15 @@ hex = "0.4.3"
 hmac = "0.12.1"
 http = "1.0.0"
 http-body-util = "0.1"
-hyper-util = { version = "0.1.5", features = [
-  "tokio",
+hyper = { version = "1.5", features = ["server", "http1", "http2"] }
+hyper-util = { version = "0.1.10", features = [
+  "server",
+  "server-auto",
+  "server-graceful",
   "service",
   "http1",
   "http2",
+  "tokio",
 ] }
 id-pool = { version = "0.2.2", default-features = false, features = [
   "serde",
@@ -131,12 +135,14 @@ lazy_format = "2.0"
 lazy_static = "1.4.0"
 libc = "0.2.149"
 log = "0.4.20"
+mio = "1"
 mbrman = "0.5.2"
 models = { version = "*", path = "../models" }
 new_mime_guess = "4"
 nix = { version = "0.29.0", features = [
   "fs",
   "mount",
+  "net",
   "process",
   "sched",
   "signal",
@@ -216,6 +222,7 @@ unix-named-pipe = "0.2.0"
 url = { version = "2.4.1", features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.4.1", features = ["v4"] }
+zbus = "5.1.1"
 zeroize = "1.6.0"
 mail-send = { git = "https://github.com/dr-bonez/mail-send.git", branch = "main" }
 rustls = "0.23.20"
diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs
index 801360a44..b29768d73 100644
--- a/core/startos/src/action.rs
+++ b/core/startos/src/action.rs
@@ -1,4 +1,3 @@
-use std::collections::BTreeMap;
 use std::fmt;
 
 use clap::{CommandFactory, FromArgMatches, Parser};
diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs
index a6b624b70..9085709ab 100644
--- a/core/startos/src/auth.rs
+++ b/core/startos/src/auth.rs
@@ -187,9 +187,8 @@ pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<(
     Ok(())
 }
 
-#[derive(Deserialize, Serialize, Parser, TS)]
+#[derive(Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
 #[ts(export)]
 pub struct LoginParams {
     password: Option<PasswordType>,
diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs
index 28d70653f..e2e9e2158 100644
--- a/core/startos/src/backup/restore.rs
+++ b/core/startos/src/backup/restore.rs
@@ -109,9 +109,10 @@ pub async fn recover_full_embassy(
     db.put(&ROOT, &Database::init(&os_backup.account)?).await?;
     drop(db);
 
-    let InitResult { net_ctrl } = init(&ctx.config, init_phases).await?;
+    let InitResult { net_ctrl } = init(&ctx.webserver, &ctx.config, init_phases).await?;
 
     let rpc_ctx = RpcContext::init(
+        &ctx.webserver,
         &ctx.config,
         disk_guid.clone(),
         Some(net_ctrl),
diff --git a/core/startos/src/bins/container_cli.rs b/core/startos/src/bins/container_cli.rs
index b0da1cb00..118133f55 100644
--- a/core/startos/src/bins/container_cli.rs
+++ b/core/startos/src/bins/container_cli.rs
@@ -4,7 +4,7 @@ use rpc_toolkit::CliApp;
 use serde_json::Value;
 
 use crate::service::cli::{ContainerCliContext, ContainerClientConfig};
-use crate::util::logger::EmbassyLogger;
+use crate::util::logger::LOGGER;
 use crate::version::{Current, VersionT};
 
 lazy_static::lazy_static! {
@@ -12,7 +12,7 @@ lazy_static::lazy_static! {
 }
 
 pub fn main(args: impl IntoIterator<Item = OsString>) {
-    EmbassyLogger::init();
+    LOGGER.enable();
     if let Err(e) = CliApp::new(
         |cfg: ContainerClientConfig| Ok(ContainerCliContext::init(cfg)),
         crate::service::effects::handler(),
diff --git a/core/startos/src/bins/registry.rs b/core/startos/src/bins/registry.rs
index 132e0984a..9c2cd2b92 100644
--- a/core/startos/src/bins/registry.rs
+++ b/core/startos/src/bins/registry.rs
@@ -1,20 +1,20 @@
 use std::ffi::OsString;
 
 use clap::Parser;
-use futures::FutureExt;
+use futures::{FutureExt};
 use tokio::signal::unix::signal;
 use tracing::instrument;
 
-use crate::net::web_server::WebServer;
+use crate::net::web_server::{Acceptor, WebServer};
 use crate::prelude::*;
 use crate::registry::context::{RegistryConfig, RegistryContext};
-use crate::util::logger::EmbassyLogger;
+use crate::util::logger::LOGGER;
 
 #[instrument(skip_all)]
 async fn inner_main(config: &RegistryConfig) -> Result<(), Error> {
     let server = async {
         let ctx = RegistryContext::init(config).await?;
-        let mut server = WebServer::new(ctx.listen);
+        let mut server = WebServer::new(Acceptor::bind([ctx.listen]).await?);
         server.serve_registry(ctx.clone());
 
         let mut shutdown_recv = ctx.shutdown.subscribe();
@@ -63,7 +63,7 @@ async fn inner_main(config: &RegistryConfig) -> Result<(), Error> {
 }
 
 pub fn main(args: impl IntoIterator<Item = OsString>) {
-    EmbassyLogger::init();
+    LOGGER.enable();
 
     let config = RegistryConfig::parse_from(args).load().unwrap();
 
diff --git a/core/startos/src/bins/start_cli.rs b/core/startos/src/bins/start_cli.rs
index 2e92e0cc0..bda5e00d3 100644
--- a/core/startos/src/bins/start_cli.rs
+++ b/core/startos/src/bins/start_cli.rs
@@ -5,7 +5,7 @@ use serde_json::Value;
 
 use crate::context::config::ClientConfig;
 use crate::context::CliContext;
-use crate::util::logger::EmbassyLogger;
+use crate::util::logger::LOGGER;
 use crate::version::{Current, VersionT};
 
 lazy_static::lazy_static! {
@@ -13,7 +13,8 @@ lazy_static::lazy_static! {
 }
 
 pub fn main(args: impl IntoIterator<Item = OsString>) {
-    EmbassyLogger::init();
+    LOGGER.enable();
+
     if let Err(e) = CliApp::new(
         |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
         crate::expanded_api(),
diff --git a/core/startos/src/bins/start_init.rs b/core/startos/src/bins/start_init.rs
index 394d42c8d..7ff903090 100644
--- a/core/startos/src/bins/start_init.rs
+++ b/core/startos/src/bins/start_init.rs
@@ -1,3 +1,4 @@
+use std::path::Path;
 use std::sync::Arc;
 
 use tokio::process::Command;
@@ -11,16 +12,16 @@ use crate::disk::main::DEFAULT_PASSWORD;
 use crate::disk::REPAIR_DISK_PATH;
 use crate::firmware::{check_for_firmware_update, update_firmware};
 use crate::init::{InitPhases, InitResult, STANDBY_MODE_PATH};
-use crate::net::web_server::WebServer;
+use crate::net::web_server::{UpgradableListener, WebServer};
 use crate::prelude::*;
 use crate::progress::FullProgressTracker;
 use crate::shutdown::Shutdown;
 use crate::util::Invoke;
-use crate::PLATFORM;
+use crate::{DATA_DIR, PLATFORM};
 
 #[instrument(skip_all)]
 async fn setup_or_init(
-    server: &mut WebServer,
+    server: &mut WebServer<UpgradableListener>,
     config: &ServerConfig,
 ) -> Result<Result<(RpcContext, FullProgressTracker), Shutdown>, Error> {
     if let Some(firmware) = check_for_firmware_update()
@@ -111,7 +112,7 @@ async fn setup_or_init(
         .await
         .is_err()
     {
-        let ctx = SetupContext::init(config)?;
+        let ctx = SetupContext::init(server, config)?;
 
         server.serve_setup(ctx.clone());
 
@@ -156,7 +157,7 @@ async fn setup_or_init(
             let disk_guid = Arc::new(String::from(guid_string.trim()));
             let requires_reboot = crate::disk::main::import(
                 &**disk_guid,
-                config.datadir(),
+                DATA_DIR,
                 if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
                     RepairStrategy::Aggressive
                 } else {
@@ -178,18 +179,26 @@ async fn setup_or_init(
             tracing::info!("Loaded Disk");
 
             if requires_reboot.0 {
+                tracing::info!("Rebooting...");
                 let mut reboot_phase = handle.add_phase("Rebooting".into(), Some(1));
                 reboot_phase.start();
                 return Ok(Err(Shutdown {
-                    export_args: Some((disk_guid, config.datadir().to_owned())),
+                    export_args: Some((disk_guid, Path::new(DATA_DIR).to_owned())),
                     restart: true,
                 }));
             }
 
-            let InitResult { net_ctrl } = crate::init::init(config, init_phases).await?;
+            let InitResult { net_ctrl } =
+                crate::init::init(&server.acceptor_setter(), config, init_phases).await?;
 
-            let rpc_ctx =
-                RpcContext::init(config, disk_guid, Some(net_ctrl), rpc_ctx_phases).await?;
+            let rpc_ctx = RpcContext::init(
+                &server.acceptor_setter(),
+                config,
+                disk_guid,
+                Some(net_ctrl),
+                rpc_ctx_phases,
+            )
+            .await?;
 
             Ok::<_, Error>(Ok((rpc_ctx, handle)))
         }
@@ -203,7 +212,7 @@ async fn setup_or_init(
 
 #[instrument(skip_all)]
 pub async fn main(
-    server: &mut WebServer,
+    server: &mut WebServer<UpgradableListener>,
     config: &ServerConfig,
 ) -> Result<Result<(RpcContext, FullProgressTracker), Shutdown>, Error> {
     if &*PLATFORM == "raspberrypi" && tokio::fs::metadata(STANDBY_MODE_PATH).await.is_ok() {
diff --git a/core/startos/src/bins/startd.rs b/core/startos/src/bins/startd.rs
index d383f3091..2bf32724e 100644
--- a/core/startos/src/bins/startd.rs
+++ b/core/startos/src/bins/startd.rs
@@ -1,6 +1,6 @@
 use std::cmp::max;
 use std::ffi::OsString;
-use std::net::{Ipv6Addr, SocketAddr};
+use std::net::IpAddr;
 use std::sync::Arc;
 
 use clap::Parser;
@@ -12,21 +12,26 @@ use tracing::instrument;
 use crate::context::config::ServerConfig;
 use crate::context::rpc::InitRpcContextPhases;
 use crate::context::{DiagnosticContext, InitContext, RpcContext};
-use crate::net::web_server::WebServer;
+use crate::net::utils::ipv6_is_local;
+use crate::net::web_server::{Acceptor, UpgradableListener, WebServer};
 use crate::shutdown::Shutdown;
 use crate::system::launch_metrics_task;
-use crate::util::logger::EmbassyLogger;
+use crate::util::io::append_file;
+use crate::util::logger::LOGGER;
 use crate::{Error, ErrorKind, ResultExt};
 
 #[instrument(skip_all)]
 async fn inner_main(
-    server: &mut WebServer,
+    server: &mut WebServer<UpgradableListener>,
     config: &ServerConfig,
 ) -> Result<Option<Shutdown>, Error> {
     let rpc_ctx = if !tokio::fs::metadata("/run/startos/initialized")
         .await
         .is_ok()
     {
+        LOGGER.set_logfile(Some(
+            append_file("/run/startos/init.log").await?.into_std().await,
+        ));
         let (ctx, handle) = match super::start_init::main(server, &config).await? {
             Err(s) => return Ok(Some(s)),
             Ok(ctx) => ctx,
@@ -34,6 +39,7 @@ async fn inner_main(
         tokio::fs::write("/run/startos/initialized", "").await?;
 
         server.serve_main(ctx.clone());
+        LOGGER.set_logfile(None);
         handle.complete();
 
         ctx
@@ -44,6 +50,7 @@ async fn inner_main(
         server.serve_init(init_ctx);
 
         let ctx = RpcContext::init(
+            &server.acceptor_setter(),
             config,
             Arc::new(
                 tokio::fs::read_to_string("/media/startos/config/disk.guid") // unique identifier for volume group - keeps track of the disk that goes with your embassy
@@ -131,7 +138,7 @@ async fn inner_main(
 }
 
 pub fn main(args: impl IntoIterator<Item = OsString>) {
-    EmbassyLogger::init();
+    LOGGER.enable();
 
     let config = ServerConfig::parse_from(args).load().unwrap();
 
@@ -142,7 +149,18 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
             .build()
             .expect("failed to initialize runtime");
         rt.block_on(async {
-            let mut server = WebServer::new(SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 80));
+            let addrs = crate::net::utils::all_socket_addrs_for(80).await?;
+            let mut server = WebServer::new(
+                Acceptor::bind_upgradable(addrs.into_iter().filter(|addr| match addr.ip() {
+                    IpAddr::V4(ip4) => {
+                        ip4.is_loopback()
+                        || (ip4.is_private() && !ip4.octets().starts_with(&[10, 59])) // reserving 10.59 for public wireguard configurations
+                        || ip4.is_link_local()
+                    }
+                    IpAddr::V6(ip6) => ipv6_is_local(ip6),
+                }))
+                .await?,
+            );
             match inner_main(&mut server, &config).await {
                 Ok(a) => {
                     server.shutdown().await;
diff --git a/core/startos/src/context/config.rs b/core/startos/src/context/config.rs
index e02648919..3f631c1e4 100644
--- a/core/startos/src/context/config.rs
+++ b/core/startos/src/context/config.rs
@@ -13,6 +13,7 @@ use crate::disk::OsPartitionInfo;
 use crate::init::init_postgres;
 use crate::prelude::*;
 use crate::util::serde::IoFormat;
+use crate::MAIN_DATA;
 
 pub const DEVICE_CONFIG_PATH: &str = "/media/startos/config/config.yaml"; // "/media/startos/config/config.yaml";
 pub const CONFIG_PATH: &str = "/etc/startos/config.yaml";
@@ -103,8 +104,6 @@ pub struct ServerConfig {
     #[arg(skip)]
     pub os_partitions: Option<OsPartitionInfo>,
     #[arg(long)]
-    pub bind_rpc: Option<SocketAddr>,
-    #[arg(long)]
     pub tor_control: Option<SocketAddr>,
     #[arg(long)]
     pub tor_socks: Option<SocketAddr>,
@@ -112,8 +111,6 @@ pub struct ServerConfig {
     pub dns_bind: Option<Vec<SocketAddr>>,
     #[arg(long)]
     pub revision_cache_size: Option<usize>,
-    #[arg(short, long)]
-    pub datadir: Option<PathBuf>,
     #[arg(long)]
     pub disable_encryption: Option<bool>,
     #[arg(long)]
@@ -126,7 +123,6 @@ impl ContextConfig for ServerConfig {
     fn merge_with(&mut self, other: Self) {
         self.ethernet_interface = self.ethernet_interface.take().or(other.ethernet_interface);
         self.os_partitions = self.os_partitions.take().or(other.os_partitions);
-        self.bind_rpc = self.bind_rpc.take().or(other.bind_rpc);
         self.tor_control = self.tor_control.take().or(other.tor_control);
         self.tor_socks = self.tor_socks.take().or(other.tor_socks);
         self.dns_bind = self.dns_bind.take().or(other.dns_bind);
@@ -134,7 +130,6 @@ impl ContextConfig for ServerConfig {
             .revision_cache_size
             .take()
             .or(other.revision_cache_size);
-        self.datadir = self.datadir.take().or(other.datadir);
         self.disable_encryption = self.disable_encryption.take().or(other.disable_encryption);
         self.multi_arch_s9pks = self.multi_arch_s9pks.take().or(other.multi_arch_s9pks);
     }
@@ -148,13 +143,8 @@ impl ServerConfig {
         self.load_path_rec(Some(CONFIG_PATH))?;
         Ok(self)
     }
-    pub fn datadir(&self) -> &Path {
-        self.datadir
-            .as_deref()
-            .unwrap_or_else(|| Path::new("/embassy-data"))
-    }
     pub async fn db(&self) -> Result<PatchDb, Error> {
-        let db_path = self.datadir().join("main").join("embassy.db");
+        let db_path = Path::new(MAIN_DATA).join("embassy.db");
         let db = PatchDb::open(&db_path)
             .await
             .with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?;
@@ -163,7 +153,7 @@ impl ServerConfig {
     }
     #[instrument(skip_all)]
     pub async fn secret_store(&self) -> Result<PgPool, Error> {
-        init_postgres(self.datadir()).await?;
+        init_postgres("/media/startos/data").await?;
         let secret_store =
             PgPool::connect_with(PgConnectOptions::new().database("secrets").username("root"))
                 .await?;
diff --git a/core/startos/src/context/diagnostic.rs b/core/startos/src/context/diagnostic.rs
index 0bf67e172..6acb21e30 100644
--- a/core/startos/src/context/diagnostic.rs
+++ b/core/startos/src/context/diagnostic.rs
@@ -1,5 +1,4 @@
 use std::ops::Deref;
-use std::path::PathBuf;
 use std::sync::Arc;
 
 use rpc_toolkit::yajrc::RpcError;
@@ -13,7 +12,6 @@ use crate::shutdown::Shutdown;
 use crate::Error;
 
 pub struct DiagnosticContextSeed {
-    pub datadir: PathBuf,
     pub shutdown: Sender<Shutdown>,
     pub error: Arc<RpcError>,
     pub disk_guid: Option<Arc<String>>,
@@ -25,7 +23,7 @@ pub struct DiagnosticContext(Arc<DiagnosticContextSeed>);
 impl DiagnosticContext {
     #[instrument(skip_all)]
     pub fn init(
-        config: &ServerConfig,
+        _config: &ServerConfig,
         disk_guid: Option<Arc<String>>,
         error: Error,
     ) -> Result<Self, Error> {
@@ -35,7 +33,6 @@ impl DiagnosticContext {
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
 
         Ok(Self(Arc::new(DiagnosticContextSeed {
-            datadir: config.datadir().to_owned(),
             shutdown,
             disk_guid,
             error: Arc::new(error.into()),
diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs
index 73d103adc..a00b9d681 100644
--- a/core/startos/src/context/rpc.rs
+++ b/core/startos/src/context/rpc.rs
@@ -2,7 +2,6 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::future::Future;
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 use std::ops::Deref;
-use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
@@ -31,6 +30,7 @@ use crate::init::check_time_is_synchronized;
 use crate::lxc::{ContainerId, LxcContainer, LxcManager};
 use crate::net::net_controller::{NetController, PreInitNetController};
 use crate::net::utils::{find_eth_iface, find_wifi_iface};
+use crate::net::web_server::{UpgradableListener, WebServerAcceptorSetter};
 use crate::net::wifi::WpaCli;
 use crate::prelude::*;
 use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle};
@@ -47,7 +47,6 @@ pub struct RpcContextSeed {
     pub os_partitions: OsPartitionInfo,
     pub wifi_interface: Option<String>,
     pub ethernet_interface: String,
-    pub datadir: PathBuf,
     pub disk_guid: Arc<String>,
     pub ephemeral_sessions: SyncMutex<Sessions>,
     pub db: TypedPatchDb<Database>,
@@ -117,6 +116,7 @@ pub struct RpcContext(Arc<RpcContextSeed>);
 impl RpcContext {
     #[instrument(skip_all)]
     pub async fn init(
+        webserver: &WebServerAcceptorSetter<UpgradableListener>,
         config: &ServerConfig,
         disk_guid: Arc<String>,
         net_ctrl: Option<PreInitNetController>,
@@ -149,7 +149,7 @@ impl RpcContext {
                 if let Some(net_ctrl) = net_ctrl {
                     net_ctrl
                 } else {
-                    PreInitNetController::init(
+                    let net_ctrl = PreInitNetController::init(
                         db.clone(),
                         config
                             .tor_control
@@ -158,7 +158,9 @@ impl RpcContext {
                         &account.hostname,
                         account.tor_key.clone(),
                     )
-                    .await?
+                    .await?;
+                    webserver.try_upgrade(|a| net_ctrl.net_iface.upgrade_listener(a))?;
+                    net_ctrl
                 },
                 config
                     .dns_bind
@@ -210,7 +212,6 @@ impl RpcContext {
 
         let seed = Arc::new(RpcContextSeed {
             is_closed: AtomicBool::new(false),
-            datadir: config.datadir().to_path_buf(),
             os_partitions: config.os_partitions.clone().ok_or_else(|| {
                 Error::new(
                     eyre!("OS Partition Information Missing"),
diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index 96ec07700..30ca1ad39 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -1,5 +1,5 @@
 use std::ops::Deref;
-use std::path::PathBuf;
+use std::path::{Path};
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -10,8 +10,6 @@ use josekit::jwk::Jwk;
 use patch_db::PatchDb;
 use rpc_toolkit::Context;
 use serde::{Deserialize, Serialize};
-use sqlx::postgres::PgConnectOptions;
-use sqlx::PgPool;
 use tokio::sync::broadcast::Sender;
 use tokio::sync::OnceCell;
 use tracing::instrument;
@@ -22,12 +20,13 @@ use crate::context::config::ServerConfig;
 use crate::context::RpcContext;
 use crate::disk::OsPartitionInfo;
 use crate::hostname::Hostname;
-use crate::init::init_postgres;
+use crate::net::web_server::{UpgradableListener, WebServer, WebServerAcceptorSetter};
 use crate::prelude::*;
 use crate::progress::FullProgressTracker;
 use crate::rpc_continuations::{Guid, RpcContinuation, RpcContinuations};
 use crate::setup::SetupProgress;
 use crate::util::net::WebSocketExt;
+use crate::MAIN_DATA;
 
 lazy_static::lazy_static! {
     pub static ref CURRENT_SECRET: Jwk = Jwk::generate_ec_key(josekit::jwk::alg::ec::EcCurve::P256).unwrap_or_else(|e| {
@@ -61,6 +60,7 @@ impl TryFrom<&AccountInfo> for SetupResult {
 }
 
 pub struct SetupContextSeed {
+    pub webserver: WebServerAcceptorSetter<UpgradableListener>,
     pub config: ServerConfig,
     pub os_partitions: OsPartitionInfo,
     pub disable_encryption: bool,
@@ -68,7 +68,6 @@ pub struct SetupContextSeed {
     pub task: OnceCell<NonDetachingJoinHandle<()>>,
     pub result: OnceCell<Result<(SetupResult, RpcContext), Error>>,
     pub shutdown: Sender<()>,
-    pub datadir: PathBuf,
     pub rpc_continuations: RpcContinuations,
 }
 
@@ -76,10 +75,13 @@ pub struct SetupContextSeed {
 pub struct SetupContext(Arc<SetupContextSeed>);
 impl SetupContext {
     #[instrument(skip_all)]
-    pub fn init(config: &ServerConfig) -> Result<Self, Error> {
+    pub fn init(
+        webserver: &WebServer<UpgradableListener>,
+        config: &ServerConfig,
+    ) -> Result<Self, Error> {
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
-        let datadir = config.datadir().to_owned();
         Ok(Self(Arc::new(SetupContextSeed {
+            webserver: webserver.acceptor_setter(),
             config: config.clone(),
             os_partitions: config.os_partitions.clone().ok_or_else(|| {
                 Error::new(
@@ -92,13 +94,12 @@ impl SetupContext {
             task: OnceCell::new(),
             result: OnceCell::new(),
             shutdown,
-            datadir,
             rpc_continuations: RpcContinuations::new(),
         })))
     }
     #[instrument(skip_all)]
     pub async fn db(&self) -> Result<PatchDb, Error> {
-        let db_path = self.datadir.join("main").join("embassy.db");
+        let db_path = Path::new(MAIN_DATA).join("embassy.db");
         let db = PatchDb::open(&db_path)
             .await
             .with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?;
diff --git a/core/startos/src/db/model/public.rs b/core/startos/src/db/model/public.rs
index 85978134d..90df469ba 100644
--- a/core/startos/src/db/model/public.rs
+++ b/core/startos/src/db/model/public.rs
@@ -1,10 +1,10 @@
 use std::collections::{BTreeMap, BTreeSet};
-use std::net::{Ipv4Addr, Ipv6Addr};
+use std::net::{IpAddr, Ipv4Addr};
 
 use chrono::{DateTime, Utc};
 use exver::{Version, VersionRange};
 use imbl_value::InternedString;
-use ipnet::{Ipv4Net, Ipv6Net};
+use ipnet::IpNet;
 use isocountry::CountryCode;
 use itertools::Itertools;
 use models::PackageId;
@@ -17,7 +17,7 @@ use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::db::model::package::AllPackageData;
-use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr};
+use crate::net::acme::AcmeProvider;
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::system::SmtpValue;
@@ -54,8 +54,8 @@ impl Public {
                 tor_address: format!("https://{}", account.tor_key.public().get_onion_address())
                     .parse()
                     .unwrap(),
-                ip_info: BTreeMap::new(),
-                acme: None,
+                network_interfaces: BTreeMap::new(),
+                acme: BTreeMap::new(),
                 status_info: ServerStatus {
                     backup_progress: None,
                     updated: false,
@@ -130,8 +130,11 @@ pub struct ServerInfo {
     /// for backwards compatibility
     #[ts(type = "string")]
     pub tor_address: Url,
-    pub ip_info: BTreeMap<String, IpInfo>,
-    pub acme: Option<AcmeSettings>,
+    #[ts(as = "BTreeMap::<String, NetworkInterfaceInfo>")]
+    #[serde(default)]
+    pub network_interfaces: BTreeMap<InternedString, NetworkInterfaceInfo>,
+    #[serde(default)]
+    pub acme: BTreeMap<AcmeProvider, AcmeSettings>,
     #[serde(default)]
     pub status_info: ServerStatus,
     pub wifi: WifiInfo,
@@ -151,43 +154,61 @@ pub struct ServerInfo {
     pub devices: Vec<LshwDevice>,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
-pub struct IpInfo {
-    #[ts(type = "string | null")]
-    pub ipv4_range: Option<Ipv4Net>,
-    pub ipv4: Option<Ipv4Addr>,
-    #[ts(type = "string | null")]
-    pub ipv6_range: Option<Ipv6Net>,
-    pub ipv6: Option<Ipv6Addr>,
+pub struct NetworkInterfaceInfo {
+    pub public: Option<bool>,
+    pub ip_info: Option<IpInfo>,
 }
-impl IpInfo {
-    pub async fn for_interface(iface: &str) -> Result<Self, Error> {
-        let (ipv4, ipv4_range) = get_iface_ipv4_addr(iface).await?.unzip();
-        let (ipv6, ipv6_range) = get_iface_ipv6_addr(iface).await?.unzip();
-        Ok(Self {
-            ipv4_range,
-            ipv4,
-            ipv6_range,
-            ipv6,
+impl NetworkInterfaceInfo {
+    pub fn public(&self) -> bool {
+        self.public.unwrap_or_else(|| {
+            !self.ip_info.as_ref().map_or(true, |ip_info| {
+                ip_info.subnets.iter().all(|ipnet| {
+                    match ipnet.addr() {
+                        IpAddr::V4(ip4) => {
+                            ip4.is_loopback()
+                            || (ip4.is_private() && !ip4.octets().starts_with(&[10, 59])) // reserving 10.59 for public wireguard configurations
+                            || ip4.is_link_local()
+                        }
+                        IpAddr::V6(_) => true,
+                    }
+                })
+            })
         })
     }
 }
 
+#[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct IpInfo {
+    pub scope_id: u32,
+    pub device_type: Option<NetworkInterfaceType>,
+    #[ts(type = "string[]")]
+    pub subnets: BTreeSet<IpNet>,
+    pub wan_ip: Option<Ipv4Addr>,
+    #[ts(type = "string[]")]
+    pub ntp_servers: BTreeSet<InternedString>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "kebab-case")]
+pub enum NetworkInterfaceType {
+    Ethernet,
+    Wireless,
+    Wireguard,
+}
+
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct AcmeSettings {
-    #[ts(type = "string")]
-    pub provider: Url,
-    /// email addresses for letsencrypt
     pub contact: Vec<String>,
-    #[ts(type = "string[]")]
-    /// domains to get letsencrypt certs for
-    pub domains: BTreeSet<InternedString>,
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs
index f0c142706..73ef93125 100644
--- a/core/startos/src/diagnostic.rs
+++ b/core/startos/src/diagnostic.rs
@@ -10,7 +10,7 @@ use crate::context::{CliContext, DiagnosticContext, RpcContext};
 use crate::init::SYSTEM_REBUILD_PATH;
 use crate::shutdown::Shutdown;
 use crate::util::io::delete_file;
-use crate::Error;
+use crate::{Error, DATA_DIR};
 
 pub fn diagnostic<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -71,7 +71,7 @@ pub fn restart(ctx: DiagnosticContext) -> Result<(), Error> {
             export_args: ctx
                 .disk_guid
                 .clone()
-                .map(|guid| (guid, ctx.datadir.clone())),
+                .map(|guid| (guid, Path::new(DATA_DIR).to_owned())),
             restart: true,
         })
         .expect("receiver dropped");
diff --git a/core/startos/src/disk/mount/backup.rs b/core/startos/src/disk/mount/backup.rs
index 2c322c284..3c6f97d91 100644
--- a/core/startos/src/disk/mount/backup.rs
+++ b/core/startos/src/disk/mount/backup.rs
@@ -7,7 +7,6 @@ use models::PackageId;
 use tokio::io::AsyncWriteExt;
 use tracing::instrument;
 
-use super::filesystem::ecryptfs::EcryptFS;
 use super::guard::{GenericMountGuard, TmpMountGuard};
 use crate::auth::check_password;
 use crate::backup::target::BackupInfo;
diff --git a/core/startos/src/disk/mount/filesystem/mod.rs b/core/startos/src/disk/mount/filesystem/mod.rs
index 818549a0a..80bfcc903 100644
--- a/core/startos/src/disk/mount/filesystem/mod.rs
+++ b/core/startos/src/disk/mount/filesystem/mod.rs
@@ -1,7 +1,6 @@
 use std::ffi::OsStr;
 use std::fmt::{Display, Write};
 use std::path::Path;
-use std::time::Duration;
 
 use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs
index a81e7e336..21d23ab5a 100644
--- a/core/startos/src/init.rs
+++ b/core/startos/src/init.rs
@@ -7,6 +7,7 @@ use std::time::{Duration, SystemTime};
 
 use axum::extract::ws::{self};
 use color_eyre::eyre::eyre;
+use const_format::formatcp;
 use futures::{StreamExt, TryStreamExt};
 use itertools::Itertools;
 use models::ResultExt;
@@ -25,6 +26,7 @@ use crate::db::model::Database;
 use crate::disk::mount::util::unmount;
 use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH;
 use crate::net::net_controller::PreInitNetController;
+use crate::net::web_server::{UpgradableListener, WebServerAcceptorSetter};
 use crate::prelude::*;
 use crate::progress::{
     FullProgress, FullProgressTracker, PhaseProgressTrackerHandle, PhasedProgressBar,
@@ -37,7 +39,7 @@ use crate::util::io::{create_file, IOHook};
 use crate::util::lshw::lshw;
 use crate::util::net::WebSocketExt;
 use crate::util::{cpupower, Invoke};
-use crate::Error;
+use crate::{Error, MAIN_DATA, PACKAGE_DATA};
 
 pub const SYSTEM_REBUILD_PATH: &str = "/media/startos/config/system-rebuild";
 pub const STANDBY_MODE_PATH: &str = "/media/startos/config/standby";
@@ -274,6 +276,7 @@ pub async fn run_script<P: AsRef<Path>>(path: P, mut progress: PhaseProgressTrac
 
 #[instrument(skip_all)]
 pub async fn init(
+    webserver: &WebServerAcceptorSetter<UpgradableListener>,
     cfg: &ServerConfig,
     InitPhases {
         preinit,
@@ -317,7 +320,7 @@ pub async fn init(
         })?;
         tokio::fs::set_permissions(LOCAL_AUTH_COOKIE_PATH, Permissions::from_mode(0o046)).await?;
         Command::new("chown")
-            .arg("root:embassy")
+            .arg("root:startos")
             .arg(LOCAL_AUTH_COOKIE_PATH)
             .invoke(crate::ErrorKind::Filesystem)
             .await?;
@@ -356,10 +359,11 @@ pub async fn init(
         account.tor_key,
     )
     .await?;
+    webserver.try_upgrade(|a| net_ctrl.net_iface.upgrade_listener(a))?;
     start_net.complete();
 
     mount_logs.start();
-    let log_dir = cfg.datadir().join("main/logs");
+    let log_dir = Path::new(MAIN_DATA).join("logs");
     if tokio::fs::metadata(&log_dir).await.is_err() {
         tokio::fs::create_dir_all(&log_dir).await?;
     }
@@ -419,36 +423,28 @@ pub async fn init(
     load_ca_cert.complete();
 
     load_wifi.start();
-    crate::net::wifi::synchronize_wpa_supplicant_conf(
-        &cfg.datadir().join("main"),
-        &mut server_info.wifi,
-    )
-    .await?;
+    crate::net::wifi::synchronize_network_manager(MAIN_DATA, &mut server_info.wifi).await?;
     load_wifi.complete();
     tracing::info!("Synchronized WiFi");
 
     init_tmp.start();
-    let tmp_dir = cfg.datadir().join("package-data/tmp");
+    let tmp_dir = Path::new(PACKAGE_DATA).join("tmp");
     if tokio::fs::metadata(&tmp_dir).await.is_ok() {
         tokio::fs::remove_dir_all(&tmp_dir).await?;
     }
     if tokio::fs::metadata(&tmp_dir).await.is_err() {
         tokio::fs::create_dir_all(&tmp_dir).await?;
     }
-    let tmp_var = cfg.datadir().join(format!("package-data/tmp/var"));
+    let tmp_var = Path::new(PACKAGE_DATA).join("tmp/var");
     if tokio::fs::metadata(&tmp_var).await.is_ok() {
         tokio::fs::remove_dir_all(&tmp_var).await?;
     }
     crate::disk::mount::util::bind(&tmp_var, "/var/tmp", false).await?;
-    let downloading = cfg
-        .datadir()
-        .join(format!("package-data/archive/downloading"));
+    let downloading = Path::new(PACKAGE_DATA).join("archive/downloading");
     if tokio::fs::metadata(&downloading).await.is_ok() {
         tokio::fs::remove_dir_all(&downloading).await?;
     }
-    let tmp_docker = cfg
-        .datadir()
-        .join(format!("package-data/tmp/{CONTAINER_TOOL}"));
+    let tmp_docker = Path::new(PACKAGE_DATA).join(formatcp!("tmp/{CONTAINER_TOOL}"));
     crate::disk::mount::util::bind(&tmp_docker, CONTAINER_DATADIR, false).await?;
     init_tmp.complete();
 
@@ -509,7 +505,6 @@ pub async fn init(
     enable_zram.complete();
 
     update_server_info.start();
-    server_info.ip_info = crate::net::dhcp::init_ips().await?;
     server_info.ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024;
     server_info.devices = lshw().await?;
     server_info.status_info = ServerStatus {
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index f153c88ad..bc971da37 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -202,9 +202,6 @@ pub async fn sideload(
                     use axum::extract::ws::Message;
                     async move {
                         if let Err(e) = async {
-                            type RpcResponse = rpc_toolkit::yajrc::RpcResponse<
-                                GenericRpcMethod<&'static str, (), FullProgress>,
-                            >;
                             tokio::select! {
                                 res = async {
                                     while let Some(progress) = progress_listener.next().await {
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 8033f5e09..6ab0529c2 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -1,6 +1,11 @@
+use const_format::formatcp;
+
+pub const DATA_DIR: &str = "/media/startos/data";
+pub const MAIN_DATA: &str = formatcp!("{DATA_DIR}/main");
+pub const PACKAGE_DATA: &str = formatcp!("{DATA_DIR}/package-data");
 pub const DEFAULT_REGISTRY: &str = "https://registry.start9.com";
 // pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com";
-pub const HOST_IP: [u8; 4] = [172, 18, 0, 1];
+pub const HOST_IP: [u8; 4] = [10, 0, 3, 1];
 pub use std::env::consts::ARCH;
 lazy_static::lazy_static! {
     pub static ref PLATFORM: String = {
diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs
index 60f9f4301..ce5d28970 100644
--- a/core/startos/src/lxc/mod.rs
+++ b/core/startos/src/lxc/mod.rs
@@ -1,5 +1,4 @@
 use std::collections::BTreeSet;
-use std::ffi::OsString;
 use std::net::Ipv4Addr;
 use std::path::Path;
 use std::sync::{Arc, Weak};
diff --git a/core/startos/src/net/acme.rs b/core/startos/src/net/acme.rs
index 95f9d4adb..5d8da41f1 100644
--- a/core/startos/src/net/acme.rs
+++ b/core/startos/src/net/acme.rs
@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::str::FromStr;
 
+use async_acme::acme::Identifier;
 use clap::builder::ValueParserFactory;
 use clap::Parser;
 use imbl_value::InternedString;
@@ -10,6 +11,7 @@ use openssl::pkey::{PKey, Private};
 use openssl::x509::X509;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 use url::Url;
 
 use crate::context::{CliContext, RpcContext};
@@ -78,10 +80,18 @@ impl<'a> async_acme::cache::AcmeCache for AcmeCertCache<'a> {
 
     async fn read_certificate(
         &self,
-        domains: &[String],
+        identifiers: &[Identifier],
         directory_url: &str,
     ) -> Result<Option<(String, String)>, Self::Error> {
-        let domains = JsonKey::new(domains.into_iter().map(InternedString::intern).collect());
+        let identifiers = JsonKey::new(
+            identifiers
+                .into_iter()
+                .map(|d| match d {
+                    Identifier::Dns(d) => d.into(),
+                    Identifier::Ip(ip) => InternedString::from_display(ip),
+                })
+                .collect(),
+        );
         let directory_url = directory_url
             .parse::<Url>()
             .with_kind(ErrorKind::ParseUrl)?;
@@ -94,7 +104,7 @@ impl<'a> async_acme::cache::AcmeCache for AcmeCertCache<'a> {
             .into_acme()
             .into_certs()
             .into_idx(&directory_url)
-            .and_then(|a| a.into_idx(&domains))
+            .and_then(|a| a.into_idx(&identifiers))
         else {
             return Ok(None);
         };
@@ -120,13 +130,21 @@ impl<'a> async_acme::cache::AcmeCache for AcmeCertCache<'a> {
 
     async fn write_certificate(
         &self,
-        domains: &[String],
+        identifiers: &[Identifier],
         directory_url: &str,
         key_pem: &str,
         certificate_pem: &str,
     ) -> Result<(), Self::Error> {
-        tracing::info!("Saving new certificate for {domains:?}");
-        let domains = JsonKey::new(domains.into_iter().map(InternedString::intern).collect());
+        tracing::info!("Saving new certificate for {identifiers:?}");
+        let identifiers = JsonKey::new(
+            identifiers
+                .into_iter()
+                .map(|d| match d {
+                    Identifier::Dns(d) => d.into(),
+                    Identifier::Ip(ip) => InternedString::from_display(ip),
+                })
+                .collect(),
+        );
         let directory_url = directory_url
             .parse::<Url>()
             .with_kind(ErrorKind::ParseUrl)?;
@@ -146,7 +164,7 @@ impl<'a> async_acme::cache::AcmeCache for AcmeCertCache<'a> {
                     .as_acme_mut()
                     .as_certs_mut()
                     .upsert(&directory_url, || Ok(BTreeMap::new()))?
-                    .insert(&domains, &cert)
+                    .insert(&identifiers, &cert)
             })
             .await?;
 
@@ -155,22 +173,17 @@ impl<'a> async_acme::cache::AcmeCache for AcmeCertCache<'a> {
 }
 
 pub fn acme<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new()
-        .subcommand(
-            "init",
-            from_fn_async(init)
-                .no_display()
-                .with_about("Setup ACME certificate acquisition")
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "domain",
-            domain::<C>()
-                .with_about("Add, remove, or view domains for which to acquire ACME certificates"),
-        )
+    ParentHandler::new().subcommand(
+        "init",
+        from_fn_async(init)
+            .no_display()
+            .with_about("Setup ACME certificate acquisition")
+            .with_call_remote::<CliContext>(),
+    )
 }
 
-#[derive(Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
+#[ts(type = "string")]
 pub struct AcmeProvider(pub Url);
 impl FromStr for AcmeProvider {
     type Err = <Url as FromStr>::Err;
@@ -183,6 +196,11 @@ impl FromStr for AcmeProvider {
         .map(Self)
     }
 }
+impl AsRef<str> for AcmeProvider {
+    fn as_ref(&self) -> &str {
+        self.0.as_str()
+    }
+}
 impl ValueParserFactory for AcmeProvider {
     type Parser = FromStrParser<Self>;
     fn value_parser() -> Self::Parser {
@@ -200,125 +218,15 @@ pub struct InitAcmeParams {
 
 pub async fn init(
     ctx: RpcContext,
-    InitAcmeParams {
-        provider: AcmeProvider(provider),
-        contact,
-    }: InitAcmeParams,
+    InitAcmeParams { provider, contact }: InitAcmeParams,
 ) -> Result<(), Error> {
     ctx.db
         .mutate(|db| {
             db.as_public_mut()
                 .as_server_info_mut()
                 .as_acme_mut()
-                .map_mutate(|acme| {
-                    Ok(Some(AcmeSettings {
-                        provider,
-                        contact,
-                        domains: acme.map(|acme| acme.domains).unwrap_or_default(),
-                    }))
-                })
+                .insert(&provider, &AcmeSettings { contact })
         })
         .await?;
     Ok(())
 }
-
-pub fn domain<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new()
-        .subcommand(
-            "add",
-            from_fn_async(add_domain)
-                .no_display()
-                .with_about("Add a domain for which to acquire ACME certificates")
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "remove",
-            from_fn_async(remove_domain)
-                .no_display()
-                .with_about("Remove a domain for which to acquire ACME certificates")
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "list",
-            from_fn_async(list_domains)
-                .with_custom_display_fn(|_, res| {
-                    for domain in res {
-                        println!("{domain}")
-                    }
-                    Ok(())
-                })
-                .with_about("List domains for which to acquire ACME certificates")
-                .with_call_remote::<CliContext>(),
-        )
-}
-
-#[derive(Deserialize, Serialize, Parser)]
-pub struct DomainParams {
-    pub domain: InternedString,
-}
-
-pub async fn add_domain(
-    ctx: RpcContext,
-    DomainParams { domain }: DomainParams,
-) -> Result<(), Error> {
-    ctx.db
-        .mutate(|db| {
-            db.as_public_mut()
-                .as_server_info_mut()
-                .as_acme_mut()
-                .transpose_mut()
-                .ok_or_else(|| {
-                    Error::new(
-                        eyre!("Please call `start-cli net acme init` before adding a domain"),
-                        ErrorKind::InvalidRequest,
-                    )
-                })?
-                .as_domains_mut()
-                .mutate(|domains| {
-                    domains.insert(domain);
-                    Ok(())
-                })
-        })
-        .await?;
-    Ok(())
-}
-
-pub async fn remove_domain(
-    ctx: RpcContext,
-    DomainParams { domain }: DomainParams,
-) -> Result<(), Error> {
-    ctx.db
-        .mutate(|db| {
-            if let Some(acme) = db
-                .as_public_mut()
-                .as_server_info_mut()
-                .as_acme_mut()
-                .transpose_mut()
-            {
-                acme.as_domains_mut().mutate(|domains| {
-                    domains.remove(&domain);
-                    Ok(())
-                })
-            } else {
-                Ok(())
-            }
-        })
-        .await?;
-    Ok(())
-}
-
-pub async fn list_domains(ctx: RpcContext) -> Result<BTreeSet<InternedString>, Error> {
-    if let Some(acme) = ctx
-        .db
-        .peek()
-        .await
-        .into_public()
-        .into_server_info()
-        .into_acme()
-        .transpose()
-    {
-        acme.into_domains().de()
-    } else {
-        Ok(BTreeSet::new())
-    }
-}
diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs
deleted file mode 100644
index e323ba371..000000000
--- a/core/startos/src/net/dhcp.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::net::IpAddr;
-
-use clap::Parser;
-use futures::TryStreamExt;
-use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
-use serde::{Deserialize, Serialize};
-use tokio::sync::RwLock;
-use ts_rs::TS;
-
-use crate::context::{CliContext, RpcContext};
-use crate::db::model::public::IpInfo;
-use crate::net::utils::{iface_is_physical, list_interfaces};
-use crate::prelude::*;
-use crate::Error;
-
-lazy_static::lazy_static! {
-    static ref CACHED_IPS: RwLock<BTreeSet<IpAddr>> = RwLock::new(BTreeSet::new());
-}
-
-async fn _ips() -> Result<BTreeSet<IpAddr>, Error> {
-    Ok(init_ips()
-        .await?
-        .values()
-        .flat_map(|i| {
-            std::iter::empty()
-                .chain(i.ipv4.map(IpAddr::from))
-                .chain(i.ipv6.map(IpAddr::from))
-        })
-        .collect())
-}
-
-pub async fn ips() -> Result<BTreeSet<IpAddr>, Error> {
-    let ips = CACHED_IPS.read().await.clone();
-    if !ips.is_empty() {
-        return Ok(ips);
-    }
-    let ips = _ips().await?;
-    *CACHED_IPS.write().await = ips.clone();
-    Ok(ips)
-}
-
-pub async fn init_ips() -> Result<BTreeMap<String, IpInfo>, Error> {
-    let mut res = BTreeMap::new();
-    let mut ifaces = list_interfaces();
-    while let Some(iface) = ifaces.try_next().await? {
-        if iface_is_physical(&iface).await {
-            let ip_info = IpInfo::for_interface(&iface).await?;
-            res.insert(iface, ip_info);
-        }
-    }
-    Ok(res)
-}
-
-// #[command(subcommands(update))]
-pub fn dhcp<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new().subcommand(
-        "update",
-        from_fn_async::<_, _, (), Error, (RpcContext, UpdateParams)>(update)
-            .no_display()
-            .with_about("Update IP assigned by dhcp")
-            .with_call_remote::<CliContext>(),
-    )
-}
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct UpdateParams {
-    interface: String,
-}
-
-pub async fn update(
-    ctx: RpcContext,
-    UpdateParams { interface }: UpdateParams,
-) -> Result<(), Error> {
-    if iface_is_physical(&interface).await {
-        let ip_info = IpInfo::for_interface(&interface).await?;
-        ctx.db
-            .mutate(|db| {
-                db.as_public_mut()
-                    .as_server_info_mut()
-                    .as_ip_info_mut()
-                    .insert(&interface, &ip_info)
-            })
-            .await?;
-
-        let mut cached = CACHED_IPS.write().await;
-        if cached.is_empty() {
-            *cached = _ips().await?;
-        } else {
-            cached.extend(
-                std::iter::empty()
-                    .chain(ip_info.ipv4.map(IpAddr::from))
-                    .chain(ip_info.ipv6.map(IpAddr::from)),
-            );
-        }
-    }
-    Ok(())
-}
diff --git a/core/startos/src/net/forward.rs b/core/startos/src/net/forward.rs
index e954bc36a..ba62945a0 100644
--- a/core/startos/src/net/forward.rs
+++ b/core/startos/src/net/forward.rs
@@ -1,12 +1,16 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 use std::net::SocketAddr;
 use std::sync::{Arc, Weak};
 
+use futures::channel::oneshot;
+use helpers::NonDetachingJoinHandle;
 use id_pool::IdPool;
+use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
-use tokio::sync::Mutex;
+use tokio::sync::{mpsc, watch};
 
+use crate::db::model::public::NetworkInterfaceInfo;
 use crate::prelude::*;
 use crate::util::Invoke;
 
@@ -34,144 +38,269 @@ impl AvailablePorts {
     }
 }
 
+#[derive(Debug)]
+struct ForwardRequest {
+    public: bool,
+    target: SocketAddr,
+    rc: Weak<()>,
+}
+
+#[derive(Debug, Default)]
+struct ForwardState {
+    requested: BTreeMap<u16, ForwardRequest>,
+    current: BTreeMap<u16, BTreeMap<InternedString, SocketAddr>>,
+}
+impl ForwardState {
+    async fn sync(&mut self, interfaces: &BTreeMap<InternedString, bool>) -> Result<(), Error> {
+        let private_interfaces = interfaces
+            .iter()
+            .filter(|(_, public)| !*public)
+            .map(|(i, _)| i)
+            .collect::<BTreeSet<_>>();
+        let all_interfaces = interfaces.keys().collect::<BTreeSet<_>>();
+        self.requested.retain(|_, req| req.rc.strong_count() > 0);
+        for external in self
+            .requested
+            .keys()
+            .chain(self.current.keys())
+            .copied()
+            .collect::<BTreeSet<_>>()
+        {
+            match (
+                self.requested.get(&external),
+                self.current.get_mut(&external),
+            ) {
+                (Some(req), Some(cur)) => {
+                    let expected = if req.public {
+                        &all_interfaces
+                    } else {
+                        &private_interfaces
+                    };
+                    let actual = cur.keys().collect::<BTreeSet<_>>();
+                    let mut to_rm = actual
+                        .difference(expected)
+                        .copied()
+                        .cloned()
+                        .collect::<BTreeSet<_>>();
+                    let mut to_add = expected
+                        .difference(&actual)
+                        .copied()
+                        .cloned()
+                        .collect::<BTreeSet<_>>();
+                    for interface in actual.intersection(expected).copied() {
+                        if cur[interface] != req.target {
+                            to_rm.insert(interface.clone());
+                            to_add.insert(interface.clone());
+                        }
+                    }
+                    for interface in to_rm {
+                        unforward(external, &*interface, cur[&interface]).await?;
+                        cur.remove(&interface);
+                    }
+                    for interface in to_add {
+                        forward(external, &*interface, req.target).await?;
+                        cur.insert(interface, req.target);
+                    }
+                }
+                (Some(req), None) => {
+                    let cur = self.current.entry(external).or_default();
+                    for interface in if req.public {
+                        &all_interfaces
+                    } else {
+                        &private_interfaces
+                    }
+                    .into_iter()
+                    .copied()
+                    .cloned()
+                    {
+                        forward(external, &*interface, req.target).await?;
+                        cur.insert(interface, req.target);
+                    }
+                }
+                (None, Some(cur)) => {
+                    let to_rm = cur.keys().cloned().collect::<BTreeSet<_>>();
+                    for interface in to_rm {
+                        unforward(external, &*interface, cur[&interface]).await?;
+                        cur.remove(&interface);
+                    }
+                    self.current.remove(&external);
+                }
+                _ => (),
+            }
+        }
+        Ok(())
+    }
+}
+
+fn err_has_exited<T>(_: T) -> Error {
+    Error::new(
+        eyre!("PortForwardController thread has exited"),
+        ErrorKind::Unknown,
+    )
+}
+
 pub struct LanPortForwardController {
-    forwards: Mutex<BTreeMap<u16, BTreeMap<SocketAddr, Weak<()>>>>,
+    req: mpsc::UnboundedSender<(
+        Option<(u16, ForwardRequest)>,
+        oneshot::Sender<Result<(), Error>>,
+    )>,
+    _thread: NonDetachingJoinHandle<()>,
 }
 impl LanPortForwardController {
-    pub fn new() -> Self {
+    pub fn new(
+        mut net_iface: watch::Receiver<BTreeMap<InternedString, NetworkInterfaceInfo>>,
+    ) -> Self {
+        let (req_send, mut req_recv) = mpsc::unbounded_channel();
+        let thread = NonDetachingJoinHandle::from(tokio::spawn(async move {
+            let mut state = ForwardState::default();
+            let mut interfaces = net_iface
+                .borrow_and_update()
+                .iter()
+                .map(|(iface, info)| (iface.clone(), info.public()))
+                .collect();
+            let mut reply: Option<oneshot::Sender<Result<(), Error>>> = None;
+            loop {
+                tokio::select! {
+                    msg = req_recv.recv() => {
+                        if let Some((msg, re)) = msg {
+                            if let Some((external, req)) = msg {
+                                state.requested.insert(external, req);
+                            }
+                            reply = Some(re);
+                        } else {
+                            break;
+                        }
+                    }
+                    _ = net_iface.changed() => {
+                        interfaces = net_iface
+                            .borrow()
+                            .iter()
+                            .map(|(iface, info)| (iface.clone(), info.public()))
+                            .collect();
+                    }
+                }
+                let res = state.sync(&interfaces).await;
+                if let Err(e) = &res {
+                    tracing::error!("Error in PortForwardController: {e}");
+                    tracing::debug!("{e:?}");
+                }
+                if let Some(re) = reply.take() {
+                    let _ = re.send(res);
+                }
+            }
+        }));
         Self {
-            forwards: Mutex::new(BTreeMap::new()),
+            req: req_send,
+            _thread: thread,
         }
     }
-    pub async fn add(&self, port: u16, addr: SocketAddr) -> Result<Arc<()>, Error> {
-        let mut writable = self.forwards.lock().await;
-        let (prev, mut forward) = if let Some(forward) = writable.remove(&port) {
-            (
-                forward.keys().next().cloned(),
-                forward
-                    .into_iter()
-                    .filter(|(_, rc)| rc.strong_count() > 0)
-                    .collect(),
-            )
-        } else {
-            (None, BTreeMap::new())
-        };
+    pub async fn add(&self, port: u16, public: bool, target: SocketAddr) -> Result<Arc<()>, Error> {
         let rc = Arc::new(());
-        forward.insert(addr, Arc::downgrade(&rc));
-        let next = forward.keys().next().cloned();
-        if !forward.is_empty() {
-            writable.insert(port, forward);
-        }
-
-        update_forward(port, prev, next).await?;
-        Ok(rc)
-    }
-    pub async fn gc(&self, external: u16) -> Result<(), Error> {
-        let mut writable = self.forwards.lock().await;
-        let (prev, forward) = if let Some(forward) = writable.remove(&external) {
-            (
-                forward.keys().next().cloned(),
-                forward
-                    .into_iter()
-                    .filter(|(_, rc)| rc.strong_count() > 0)
-                    .collect(),
-            )
-        } else {
-            (None, BTreeMap::new())
-        };
-        let next = forward.keys().next().cloned();
-        if !forward.is_empty() {
-            writable.insert(external, forward);
-        }
+        let (send, recv) = oneshot::channel();
+        self.req
+            .send((
+                Some((
+                    port,
+                    ForwardRequest {
+                        public,
+                        target,
+                        rc: Arc::downgrade(&rc),
+                    },
+                )),
+                send,
+            ))
+            .map_err(err_has_exited)?;
 
-        update_forward(external, prev, next).await
+        recv.await.map_err(err_has_exited)?.map(|_| rc)
     }
-}
+    pub async fn gc(&self) -> Result<(), Error> {
+        let (send, recv) = oneshot::channel();
+        self.req.send((None, send)).map_err(err_has_exited)?;
 
-async fn update_forward(
-    external: u16,
-    prev: Option<SocketAddr>,
-    next: Option<SocketAddr>,
-) -> Result<(), Error> {
-    if prev != next {
-        if let Some(prev) = prev {
-            unforward(START9_BRIDGE_IFACE, external, prev).await?;
-        }
-        if let Some(next) = next {
-            forward(START9_BRIDGE_IFACE, external, next).await?;
-        }
+        recv.await.map_err(err_has_exited)?
     }
-    Ok(())
 }
 
 // iptables -I FORWARD -o br-start9 -p tcp -d 172.18.0.2 --dport 8333 -j ACCEPT
 // iptables -t nat -I PREROUTING -p tcp --dport 32768 -j DNAT --to 172.18.0.2:8333
-async fn forward(iface: &str, external: u16, addr: SocketAddr) -> Result<(), Error> {
-    Command::new("iptables")
-        .arg("-I")
-        .arg("FORWARD")
-        .arg("-o")
-        .arg(iface)
-        .arg("-p")
-        .arg("tcp")
-        .arg("-d")
-        .arg(addr.ip().to_string())
-        .arg("--dport")
-        .arg(addr.port().to_string())
-        .arg("-j")
-        .arg("ACCEPT")
-        .invoke(crate::ErrorKind::Network)
-        .await?;
-    Command::new("iptables")
-        .arg("-t")
-        .arg("nat")
-        .arg("-I")
-        .arg("PREROUTING")
-        .arg("-p")
-        .arg("tcp")
-        .arg("--dport")
-        .arg(external.to_string())
-        .arg("-j")
-        .arg("DNAT")
-        .arg("--to")
-        .arg(addr.to_string())
-        .invoke(crate::ErrorKind::Network)
-        .await?;
+async fn forward(external: u16, interface: &str, target: SocketAddr) -> Result<(), Error> {
+    for proto in ["tcp", "udp"] {
+        Command::new("iptables")
+            .arg("-I")
+            .arg("FORWARD")
+            .arg("-i")
+            .arg(interface)
+            .arg("-o")
+            .arg(START9_BRIDGE_IFACE)
+            .arg("-p")
+            .arg(proto)
+            .arg("-d")
+            .arg(target.ip().to_string())
+            .arg("--dport")
+            .arg(target.port().to_string())
+            .arg("-j")
+            .arg("ACCEPT")
+            .invoke(crate::ErrorKind::Network)
+            .await?;
+        Command::new("iptables")
+            .arg("-t")
+            .arg("nat")
+            .arg("-I")
+            .arg("PREROUTING")
+            .arg("-i")
+            .arg(interface)
+            .arg("-p")
+            .arg(proto)
+            .arg("--dport")
+            .arg(external.to_string())
+            .arg("-j")
+            .arg("DNAT")
+            .arg("--to")
+            .arg(target.to_string())
+            .invoke(crate::ErrorKind::Network)
+            .await?;
+    }
     Ok(())
 }
 
 // iptables -D FORWARD -o br-start9 -p tcp -d 172.18.0.2 --dport 8333 -j ACCEPT
 // iptables -t nat -D PREROUTING -p tcp --dport 32768 -j DNAT --to 172.18.0.2:8333
-async fn unforward(iface: &str, external: u16, addr: SocketAddr) -> Result<(), Error> {
-    Command::new("iptables")
-        .arg("-D")
-        .arg("FORWARD")
-        .arg("-o")
-        .arg(iface)
-        .arg("-p")
-        .arg("tcp")
-        .arg("-d")
-        .arg(addr.ip().to_string())
-        .arg("--dport")
-        .arg(addr.port().to_string())
-        .arg("-j")
-        .arg("ACCEPT")
-        .invoke(crate::ErrorKind::Network)
-        .await?;
-    Command::new("iptables")
-        .arg("-t")
-        .arg("nat")
-        .arg("-D")
-        .arg("PREROUTING")
-        .arg("-p")
-        .arg("tcp")
-        .arg("--dport")
-        .arg(external.to_string())
-        .arg("-j")
-        .arg("DNAT")
-        .arg("--to")
-        .arg(addr.to_string())
-        .invoke(crate::ErrorKind::Network)
-        .await?;
+async fn unforward(external: u16, interface: &str, target: SocketAddr) -> Result<(), Error> {
+    for proto in ["tcp", "udp"] {
+        Command::new("iptables")
+            .arg("-D")
+            .arg("FORWARD")
+            .arg("-i")
+            .arg(interface)
+            .arg("-o")
+            .arg(START9_BRIDGE_IFACE)
+            .arg("-p")
+            .arg(proto)
+            .arg("-d")
+            .arg(target.ip().to_string())
+            .arg("--dport")
+            .arg(target.port().to_string())
+            .arg("-j")
+            .arg("ACCEPT")
+            .invoke(crate::ErrorKind::Network)
+            .await?;
+        Command::new("iptables")
+            .arg("-t")
+            .arg("nat")
+            .arg("-D")
+            .arg("PREROUTING")
+            .arg("-i")
+            .arg(interface)
+            .arg("-p")
+            .arg(proto)
+            .arg("--dport")
+            .arg(external.to_string())
+            .arg("-j")
+            .arg("DNAT")
+            .arg("--to")
+            .arg(target.to_string())
+            .invoke(crate::ErrorKind::Network)
+            .await?;
+    }
     Ok(())
 }
diff --git a/core/startos/src/net/host/address.rs b/core/startos/src/net/host/address.rs
index 05942ffa9..3d639b31e 100644
--- a/core/startos/src/net/host/address.rs
+++ b/core/startos/src/net/host/address.rs
@@ -1,57 +1,298 @@
-use std::fmt;
-use std::str::FromStr;
-
-use clap::builder::ValueParserFactory;
+use clap::Parser;
 use imbl_value::InternedString;
-use models::FromStrParser;
+use models::{HostId, PackageId};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
 use ts_rs::TS;
 
+use crate::context::{CliContext, RpcContext};
+use crate::net::acme::AcmeProvider;
 use crate::prelude::*;
+use crate::util::serde::{display_serializable, HandlerExtSerde};
 
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, TS)]
-#[serde(rename_all = "camelCase")]
-#[serde(tag = "kind")]
-#[ts(export)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum HostAddress {
     Onion {
-        #[ts(type = "string")]
         address: OnionAddressV3,
     },
     Domain {
-        #[ts(type = "string")]
         address: InternedString,
+        public: bool,
+        acme: Option<AcmeProvider>,
     },
 }
 
-impl FromStr for HostAddress {
-    type Err = Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if let Some(addr) = s.strip_suffix(".onion") {
-            Ok(HostAddress::Onion {
-                address: addr
-                    .parse::<OnionAddressV3>()
-                    .with_kind(ErrorKind::ParseUrl)?,
-            })
-        } else {
-            Ok(HostAddress::Domain { address: s.into() })
-        }
-    }
-}
-
-impl fmt::Display for HostAddress {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Onion { address } => write!(f, "{address}"),
-            Self::Domain { address } => write!(f, "{address}"),
-        }
-    }
-}
-
-impl ValueParserFactory for HostAddress {
-    type Parser = FromStrParser<Self>;
-    fn value_parser() -> Self::Parser {
-        Self::Parser::new()
-    }
+#[derive(Debug, Deserialize, Serialize, TS)]
+pub struct DomainConfig {
+    pub public: bool,
+    pub acme: Option<AcmeProvider>,
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct AddressApiParams {
+    host: HostId,
+}
+
+pub fn address<C: Context>() -> ParentHandler<C, AddressApiParams, PackageId> {
+    ParentHandler::<C, AddressApiParams, PackageId>::new()
+        .subcommand(
+            "domain",
+            ParentHandler::<C, Empty, (PackageId, HostId)>::new()
+                .subcommand(
+                    "add",
+                    from_fn_async(add_domain)
+                        .with_inherited(|_, a| a)
+                        .no_display()
+                        .with_about("Add an address to this host")
+                        .with_call_remote::<CliContext>(),
+                )
+                .subcommand(
+                    "remove",
+                    from_fn_async(remove_domain)
+                        .with_inherited(|_, a| a)
+                        .no_display()
+                        .with_about("Remove an address from this host")
+                        .with_call_remote::<CliContext>(),
+                )
+                .with_inherited(|AddressApiParams { host }, package| (package, host)),
+        )
+        .subcommand(
+            "onion",
+            ParentHandler::<C, Empty, (PackageId, HostId)>::new()
+                .subcommand(
+                    "add",
+                    from_fn_async(add_onion)
+                        .with_inherited(|_, a| a)
+                        .no_display()
+                        .with_about("Add an address to this host")
+                        .with_call_remote::<CliContext>(),
+                )
+                .subcommand(
+                    "remove",
+                    from_fn_async(remove_onion)
+                        .with_inherited(|_, a| a)
+                        .no_display()
+                        .with_about("Remove an address from this host")
+                        .with_call_remote::<CliContext>(),
+                )
+                .with_inherited(|AddressApiParams { host }, package| (package, host)),
+        )
+        .subcommand(
+            "list",
+            from_fn_async(list_addresses)
+                .with_inherited(|AddressApiParams { host }, package| (package, host))
+                .with_display_serializable()
+                .with_custom_display_fn(|HandlerArgs { params, .. }, res| {
+                    use prettytable::*;
+
+                    if let Some(format) = params.format {
+                        display_serializable(format, res);
+                        return Ok(());
+                    }
+
+                    let mut table = Table::new();
+                    table.add_row(row![bc => "ADDRESS", "PUBLIC", "ACME PROVIDER"]);
+                    for address in &res {
+                        match address {
+                            HostAddress::Onion { address } => {
+                                table.add_row(row![address, true, "N/A"]);
+                            }
+                            HostAddress::Domain {
+                                address,
+                                public,
+                                acme,
+                            } => {
+                                table.add_row(row![
+                                    address,
+                                    *public,
+                                    acme.as_ref().map(|a| a.0.as_str()).unwrap_or("NONE")
+                                ]);
+                            }
+                        }
+                    }
+
+                    table.print_tty(false)?;
+
+                    Ok(())
+                })
+                .with_about("List addresses for this host")
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct AddDomainParams {
+    pub domain: InternedString,
+    #[arg(long)]
+    pub private: bool,
+    #[arg(long)]
+    pub acme: Option<AcmeProvider>,
+}
+
+pub async fn add_domain(
+    ctx: RpcContext,
+    AddDomainParams {
+        domain,
+        private,
+        acme,
+    }: AddDomainParams,
+    (package, host): (PackageId, HostId),
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            if let Some(acme) = &acme {
+                if !db.as_public().as_server_info().as_acme().contains_key(&acme)? {
+                    return Err(Error::new(eyre!("unknown acme provider {}, please run acme.init for this provider first", acme.0), ErrorKind::InvalidRequest));
+                }
+            }
+
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package)
+                .or_not_found(&package)?
+                .as_hosts_mut()
+                .as_idx_mut(&host)
+                .or_not_found(&host)?
+                .as_domains_mut()
+                .insert(
+                    &domain,
+                    &DomainConfig {
+                        public: !private,
+                        acme,
+                    },
+                )
+        })
+        .await?;
+    let service = ctx.services.get(&package).await;
+    let service_ref = service.as_ref().or_not_found(&package)?;
+    service_ref.update_host(host).await?;
+
+    Ok(())
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct RemoveDomainParams {
+    pub domain: InternedString,
+}
+
+pub async fn remove_domain(
+    ctx: RpcContext,
+    RemoveDomainParams { domain }: RemoveDomainParams,
+    (package, host): (PackageId, HostId),
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package)
+                .or_not_found(&package)?
+                .as_hosts_mut()
+                .as_idx_mut(&host)
+                .or_not_found(&host)?
+                .as_domains_mut()
+                .remove(&domain)
+        })
+        .await?;
+    let service = ctx.services.get(&package).await;
+    let service_ref = service.as_ref().or_not_found(&package)?;
+    service_ref.update_host(host).await?;
+
+    Ok(())
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct OnionParams {
+    pub onion: String,
+}
+
+pub async fn add_onion(
+    ctx: RpcContext,
+    OnionParams { onion }: OnionParams,
+    (package, host): (PackageId, HostId),
+) -> Result<(), Error> {
+    let onion = onion
+        .strip_suffix(".onion")
+        .ok_or_else(|| {
+            Error::new(
+                eyre!("onion hostname must end in .onion"),
+                ErrorKind::InvalidOnionAddress,
+            )
+        })?
+        .parse::<OnionAddressV3>()?;
+    ctx.db
+        .mutate(|db| {
+            db.as_private().as_key_store().as_onion().get_key(&onion)?;
+
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package)
+                .or_not_found(&package)?
+                .as_hosts_mut()
+                .as_idx_mut(&host)
+                .or_not_found(&host)?
+                .as_onions_mut()
+                .mutate(|a| Ok(a.insert(onion)))
+        })
+        .await?;
+    let service = ctx.services.get(&package).await;
+    let service_ref = service.as_ref().or_not_found(&package)?;
+    service_ref.update_host(host).await?;
+
+    Ok(())
+}
+
+pub async fn remove_onion(
+    ctx: RpcContext,
+    OnionParams { onion }: OnionParams,
+    (package, host): (PackageId, HostId),
+) -> Result<(), Error> {
+    let onion = onion
+        .strip_suffix(".onion")
+        .ok_or_else(|| {
+            Error::new(
+                eyre!("onion hostname must end in .onion"),
+                ErrorKind::InvalidOnionAddress,
+            )
+        })?
+        .parse::<OnionAddressV3>()?;
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package)
+                .or_not_found(&package)?
+                .as_hosts_mut()
+                .as_idx_mut(&host)
+                .or_not_found(&host)?
+                .as_onions_mut()
+                .mutate(|a| Ok(a.remove(&onion)))
+        })
+        .await?;
+    let service = ctx.services.get(&package).await;
+    let service_ref = service.as_ref().or_not_found(&package)?;
+    service_ref.update_host(host).await?;
+
+    Ok(())
+}
+
+pub async fn list_addresses(
+    ctx: RpcContext,
+    _: Empty,
+    (package, host): (PackageId, HostId),
+) -> Result<Vec<HostAddress>, Error> {
+    Ok(ctx
+        .db
+        .peek()
+        .await
+        .into_public()
+        .into_package_data()
+        .into_idx(&package)
+        .or_not_found(&package)?
+        .into_hosts()
+        .into_idx(&host)
+        .or_not_found(&host)?
+        .de()?
+        .addresses()
+        .collect())
 }
diff --git a/core/startos/src/net/host/binding.rs b/core/startos/src/net/host/binding.rs
index 174f0330f..d56f607a9 100644
--- a/core/startos/src/net/host/binding.rs
+++ b/core/startos/src/net/host/binding.rs
@@ -1,13 +1,18 @@
+use std::collections::BTreeMap;
 use std::str::FromStr;
 
 use clap::builder::ValueParserFactory;
-use models::{FromStrParser, HostId};
+use clap::Parser;
+use models::{FromStrParser, HostId, PackageId};
+use rpc_toolkit::{from_fn_async, Context, Empty, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+use crate::context::{CliContext, RpcContext};
 use crate::net::forward::AvailablePorts;
 use crate::net::vhost::AlpnInfo;
 use crate::prelude::*;
+use crate::util::serde::{display_serializable, HandlerExtSerde};
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, TS)]
 #[ts(export)]
@@ -41,12 +46,14 @@ impl FromStr for BindId {
 pub struct BindInfo {
     pub enabled: bool,
     pub options: BindOptions,
-    pub lan: LanInfo,
+    pub net: NetInfo,
 }
+
 #[derive(Clone, Copy, Debug, Deserialize, Serialize, TS, PartialEq, Eq, PartialOrd, Ord)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
-pub struct LanInfo {
+pub struct NetInfo {
+    pub public: bool,
     pub assigned_port: Option<u16>,
     pub assigned_ssl_port: Option<u16>,
 }
@@ -63,7 +70,8 @@ impl BindInfo {
         Ok(Self {
             enabled: true,
             options,
-            lan: LanInfo {
+            net: NetInfo {
+                public: false,
                 assigned_port,
                 assigned_ssl_port,
             },
@@ -74,7 +82,7 @@ impl BindInfo {
         available_ports: &mut AvailablePorts,
         options: BindOptions,
     ) -> Result<Self, Error> {
-        let Self { mut lan, .. } = self;
+        let Self { net: mut lan, .. } = self;
         if options
             .secure
             .map_or(false, |s| !(s.ssl && options.add_ssl.is_some()))
@@ -104,7 +112,7 @@ impl BindInfo {
         Ok(Self {
             enabled: true,
             options,
-            lan,
+            net: lan,
         })
     }
     pub fn disable(&mut self) {
@@ -137,3 +145,122 @@ pub struct AddSslOptions {
     // pub add_x_forwarded_headers: bool, // TODO
     pub alpn: Option<AlpnInfo>,
 }
+
+#[derive(Deserialize, Serialize, Parser)]
+pub struct BindingApiParams {
+    host: HostId,
+}
+
+pub fn binding<C: Context>() -> ParentHandler<C, BindingApiParams, PackageId> {
+    ParentHandler::<C, BindingApiParams, PackageId>::new()
+        .subcommand(
+            "list",
+            from_fn_async(list_bindings)
+                .with_inherited(|BindingApiParams { host }, package| (package, host))
+                .with_display_serializable()
+                .with_custom_display_fn(|HandlerArgs { params, .. }, res| {
+                    use prettytable::*;
+
+                    if let Some(format) = params.format {
+                        return Ok(display_serializable(format, res));
+                    }
+
+                    let mut table = Table::new();
+                    table.add_row(row![bc => "INTERNAL PORT", "ENABLED", "PUBLIC", "EXTERNAL PORT", "EXTERNAL SSL PORT"]);
+                    for (internal, info) in res {
+                        table.add_row(row![
+                            internal,
+                            info.enabled,
+                            info.net.public,
+                            if let Some(port) = info.net.assigned_port {
+                                port.to_string()
+                            } else {
+                                "N/A".to_owned()
+                            },
+                            if let Some(port) = info.net.assigned_ssl_port {
+                                port.to_string()
+                            } else {
+                                "N/A".to_owned()
+                            },
+                        ]);
+                    }
+
+                    table.print_tty(false).unwrap();
+
+                    Ok(())
+                })
+                .with_about("List bindinges for this host")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "set-public",
+            from_fn_async(set_public)
+                .with_inherited(|BindingApiParams { host }, package| (package, host))
+                .no_display()
+                .with_about("Add an binding to this host")
+                .with_call_remote::<CliContext>(),
+        )
+}
+
+pub async fn list_bindings(
+    ctx: RpcContext,
+    _: Empty,
+    (package, host): (PackageId, HostId),
+) -> Result<BTreeMap<u16, BindInfo>, Error> {
+    ctx.db
+        .peek()
+        .await
+        .into_public()
+        .into_package_data()
+        .into_idx(&package)
+        .or_not_found(&package)?
+        .into_hosts()
+        .into_idx(&host)
+        .or_not_found(&host)?
+        .into_bindings()
+        .de()
+}
+
+#[derive(Deserialize, Serialize, Parser)]
+#[serde(rename_all = "camelCase")]
+pub struct SetPublicParams {
+    internal_port: u16,
+    #[arg(long)]
+    public: Option<bool>,
+}
+
+pub async fn set_public(
+    ctx: RpcContext,
+    SetPublicParams {
+        internal_port,
+        public,
+    }: SetPublicParams,
+    (package, host): (PackageId, HostId),
+) -> Result<(), Error> {
+    ctx.db
+        .mutate(|db| {
+            db.as_public_mut()
+                .as_package_data_mut()
+                .as_idx_mut(&package)
+                .or_not_found(&package)?
+                .as_hosts_mut()
+                .as_idx_mut(&host)
+                .or_not_found(&host)?
+                .as_bindings_mut()
+                .mutate(|b| {
+                    b.get_mut(&internal_port)
+                        .or_not_found(internal_port)?
+                        .net
+                        .public = public.unwrap_or(true);
+                    Ok(())
+                })
+        })
+        .await?;
+    ctx.services
+        .get(&package)
+        .await
+        .as_ref()
+        .or_not_found(&package)?
+        .update_host(host)
+        .await
+}
diff --git a/core/startos/src/net/host/mod.rs b/core/startos/src/net/host/mod.rs
index be5db0f2d..9f4194866 100644
--- a/core/startos/src/net/host/mod.rs
+++ b/core/startos/src/net/host/mod.rs
@@ -5,13 +5,14 @@ use imbl_value::InternedString;
 use models::{HostId, PackageId};
 use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
+use torut::onion::OnionAddressV3;
 use ts_rs::TS;
 
-use crate::context::{CliContext, RpcContext};
+use crate::context::RpcContext;
 use crate::db::model::DatabaseModel;
 use crate::net::forward::AvailablePorts;
-use crate::net::host::address::HostAddress;
-use crate::net::host::binding::{BindInfo, BindOptions};
+use crate::net::host::address::{address, DomainConfig, HostAddress};
+use crate::net::host::binding::{binding, BindInfo, BindOptions};
 use crate::net::service_interface::HostnameInfo;
 use crate::prelude::*;
 
@@ -25,7 +26,10 @@ pub mod binding;
 pub struct Host {
     pub kind: HostKind,
     pub bindings: BTreeMap<u16, BindInfo>,
-    pub addresses: BTreeSet<HostAddress>,
+    #[ts(type = "string[]")]
+    pub onions: BTreeSet<OnionAddressV3>,
+    #[ts(as = "BTreeMap::<String, DomainConfig>")]
+    pub domains: BTreeMap<InternedString, DomainConfig>,
     /// COMPUTED: NetService::update
     pub hostname_info: BTreeMap<u16, Vec<HostnameInfo>>, // internal port -> Hostnames
 }
@@ -39,13 +43,27 @@ impl Host {
         Self {
             kind,
             bindings: BTreeMap::new(),
-            addresses: BTreeSet::new(),
+            onions: BTreeSet::new(),
+            domains: BTreeMap::new(),
             hostname_info: BTreeMap::new(),
         }
     }
-    pub fn addresses(&self) -> impl Iterator<Item = &HostAddress> {
-        // TODO: handle primary
-        self.addresses.iter()
+    pub fn addresses<'a>(&'a self) -> impl Iterator<Item = HostAddress> + 'a {
+        self.onions
+            .iter()
+            .cloned()
+            .map(|address| HostAddress::Onion { address })
+            .chain(
+                self.domains
+                    .iter()
+                    .map(
+                        |(address, DomainConfig { public, acme })| HostAddress::Domain {
+                            address: address.clone(),
+                            public: *public,
+                            acme: acme.clone(),
+                        },
+                    ),
+            )
     }
 }
 
@@ -104,12 +122,12 @@ pub fn host_for<'a>(
     };
     host_info(db, package_id)?.upsert(host_id, || {
         let mut h = Host::new(host_kind);
-        h.addresses.insert(HostAddress::Onion {
-            address: tor_key
+        h.onions.insert(
+            tor_key
                 .or_not_found("generated tor key")?
                 .public()
                 .get_onion_address(),
-        });
+        );
         Ok(h)
     })
 }
@@ -161,6 +179,10 @@ pub fn host<C: Context>() -> ParentHandler<C, HostParams> {
             "address",
             address::<C>().with_inherited(|HostParams { package }, _| package),
         )
+        .subcommand(
+            "binding",
+            binding::<C>().with_inherited(|HostParams { package }, _| package),
+        )
 }
 
 pub async fn list_hosts(
@@ -178,122 +200,3 @@ pub async fn list_hosts(
         .into_hosts()
         .keys()
 }
-
-#[derive(Deserialize, Serialize, Parser)]
-pub struct AddressApiParams {
-    host: HostId,
-}
-
-pub fn address<C: Context>() -> ParentHandler<C, AddressApiParams, PackageId> {
-    ParentHandler::<C, AddressApiParams, PackageId>::new()
-        .subcommand(
-            "add",
-            from_fn_async(add_address)
-                .with_inherited(|AddressApiParams { host }, package| (package, host))
-                .no_display()
-                .with_about("Add an address to this host")
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "remove",
-            from_fn_async(remove_address)
-                .with_inherited(|AddressApiParams { host }, package| (package, host))
-                .no_display()
-                .with_about("Remove an address from this host")
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "list",
-            from_fn_async(list_addresses)
-                .with_inherited(|AddressApiParams { host }, package| (package, host))
-                .with_custom_display_fn(|_, res| {
-                    for address in res {
-                        println!("{address}")
-                    }
-                    Ok(())
-                })
-                .with_about("List addresses for this host")
-                .with_call_remote::<CliContext>(),
-        )
-}
-
-#[derive(Deserialize, Serialize, Parser)]
-pub struct AddressParams {
-    pub address: HostAddress,
-}
-
-pub async fn add_address(
-    ctx: RpcContext,
-    AddressParams { address }: AddressParams,
-    (package, host): (PackageId, HostId),
-) -> Result<(), Error> {
-    ctx.db
-        .mutate(|db| {
-            if let HostAddress::Onion { address } = address {
-                db.as_private()
-                    .as_key_store()
-                    .as_onion()
-                    .get_key(&address)?;
-            }
-
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package)
-                .or_not_found(&package)?
-                .as_hosts_mut()
-                .as_idx_mut(&host)
-                .or_not_found(&host)?
-                .as_addresses_mut()
-                .mutate(|a| Ok(a.insert(address)))
-        })
-        .await?;
-    let service = ctx.services.get(&package).await;
-    let service_ref = service.as_ref().or_not_found(&package)?;
-    service_ref.update_host(host).await?;
-
-    Ok(())
-}
-
-pub async fn remove_address(
-    ctx: RpcContext,
-    AddressParams { address }: AddressParams,
-    (package, host): (PackageId, HostId),
-) -> Result<(), Error> {
-    ctx.db
-        .mutate(|db| {
-            db.as_public_mut()
-                .as_package_data_mut()
-                .as_idx_mut(&package)
-                .or_not_found(&package)?
-                .as_hosts_mut()
-                .as_idx_mut(&host)
-                .or_not_found(&host)?
-                .as_addresses_mut()
-                .mutate(|a| Ok(a.remove(&address)))
-        })
-        .await?;
-    let service = ctx.services.get(&package).await;
-    let service_ref = service.as_ref().or_not_found(&package)?;
-    service_ref.update_host(host).await?;
-
-    Ok(())
-}
-
-pub async fn list_addresses(
-    ctx: RpcContext,
-    _: Empty,
-    (package, host): (PackageId, HostId),
-) -> Result<BTreeSet<HostAddress>, Error> {
-    ctx.db
-        .peek()
-        .await
-        .into_public()
-        .into_package_data()
-        .into_idx(&package)
-        .or_not_found(&package)?
-        .into_hosts()
-        .into_idx(&host)
-        .or_not_found(&host)?
-        .into_addresses()
-        .de()
-}
diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs
index 53b94454d..49d3560ef 100644
--- a/core/startos/src/net/mod.rs
+++ b/core/startos/src/net/mod.rs
@@ -1,13 +1,13 @@
 use rpc_toolkit::{Context, HandlerExt, ParentHandler};
 
 pub mod acme;
-pub mod dhcp;
 pub mod dns;
 pub mod forward;
 pub mod host;
 pub mod keys;
 pub mod mdns;
 pub mod net_controller;
+pub mod network_interface;
 pub mod service_interface;
 pub mod ssl;
 pub mod static_server;
@@ -17,20 +17,23 @@ pub mod vhost;
 pub mod web_server;
 pub mod wifi;
 
-pub const PACKAGE_CERT_PATH: &str = "/var/lib/embassy/ssl";
-
 pub fn net<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "tor",
             tor::tor::<C>().with_about("Tor commands such as list-services, logs, and reset"),
         )
-        .subcommand(
-            "dhcp",
-            dhcp::dhcp::<C>().with_about("Command to update IP assigned from dhcp"),
-        )
         .subcommand(
             "acme",
             acme::acme::<C>().with_about("Setup automatic clearnet certificate acquisition"),
         )
+        .subcommand(
+            "network-interface",
+            network_interface::network_interface_api::<C>()
+                .with_about("View and edit network interface configurations"),
+        )
+        .subcommand(
+            "vhost",
+            vhost::vhost_api::<C>().with_about("Manage ssl virtual host proxy"),
+        )
 }
diff --git a/core/startos/src/net/net_controller.rs b/core/startos/src/net/net_controller.rs
index a8beaf55f..7ff707fbe 100644
--- a/core/startos/src/net/net_controller.rs
+++ b/core/startos/src/net/net_controller.rs
@@ -5,6 +5,7 @@ use std::sync::{Arc, Weak};
 use color_eyre::eyre::eyre;
 use imbl::OrdMap;
 use imbl_value::InternedString;
+use ipnet::IpNet;
 use models::{HostId, OptionExt, PackageId};
 use torut::onion::{OnionAddressV3, TorSecretKeyV3};
 use tracing::instrument;
@@ -15,11 +16,13 @@ use crate::hostname::Hostname;
 use crate::net::dns::DnsController;
 use crate::net::forward::LanPortForwardController;
 use crate::net::host::address::HostAddress;
-use crate::net::host::binding::{AddSslOptions, BindId, BindOptions, LanInfo};
+use crate::net::host::binding::{BindId, BindOptions};
 use crate::net::host::{host_for, Host, HostKind, Hosts};
+use crate::net::network_interface::NetworkInterfaceController;
 use crate::net::service_interface::{HostnameInfo, IpHostname, OnionHostname};
 use crate::net::tor::TorController;
-use crate::net::vhost::{AlpnInfo, VHostController};
+use crate::net::utils::ipv6_is_local;
+use crate::net::vhost::{AlpnInfo, TargetInfo, VHostController};
 use crate::prelude::*;
 use crate::util::serde::MaybeUtf8String;
 use crate::HOST_IP;
@@ -28,6 +31,7 @@ pub struct PreInitNetController {
     pub db: TypedPatchDb<Database>,
     tor: TorController,
     vhost: VHostController,
+    pub net_iface: Arc<NetworkInterfaceController>,
     os_bindings: Vec<Arc<()>>,
     server_hostnames: Vec<Option<InternedString>>,
 }
@@ -40,10 +44,12 @@ impl PreInitNetController {
         hostname: &Hostname,
         os_tor_key: TorSecretKeyV3,
     ) -> Result<Self, Error> {
+        let net_iface = Arc::new(NetworkInterfaceController::new(db.clone()));
         let mut res = Self {
             db: db.clone(),
             tor: TorController::new(tor_control, tor_socks),
-            vhost: VHostController::new(db),
+            vhost: VHostController::new(db, net_iface.clone()),
+            net_iface,
             os_bindings: Vec::new(),
             server_hostnames: Vec::new(),
         };
@@ -56,11 +62,6 @@ impl PreInitNetController {
         hostname: &Hostname,
         tor_key: TorSecretKeyV3,
     ) -> Result<(), Error> {
-        let alpn = Err(AlpnInfo::Specified(vec![
-            MaybeUtf8String("http/1.1".into()),
-            MaybeUtf8String("h2".into()),
-        ]));
-
         self.server_hostnames = vec![
             // LAN IP
             None,
@@ -74,27 +75,29 @@ impl PreInitNetController {
             Some(hostname.local_domain_name()),
         ];
 
+        let vhost_target = TargetInfo {
+            public: false,
+            acme: None,
+            addr: ([127, 0, 0, 1], 80).into(),
+            connect_ssl: Err(AlpnInfo::Specified(vec![
+                MaybeUtf8String("http/1.1".into()),
+                MaybeUtf8String("h2".into()),
+            ])),
+        };
+
         for hostname in self.server_hostnames.iter().cloned() {
-            self.os_bindings.push(
-                self.vhost
-                    .add(hostname, 443, ([127, 0, 0, 1], 80).into(), alpn.clone())
-                    .await?,
-            );
+            self.os_bindings
+                .push(self.vhost.add(hostname, 443, vhost_target.clone())?);
         }
 
         // Tor
-        self.os_bindings.push(
-            self.vhost
-                .add(
-                    Some(InternedString::from_display(
-                        &tor_key.public().get_onion_address(),
-                    )),
-                    443,
-                    ([127, 0, 0, 1], 80).into(),
-                    alpn.clone(),
-                )
-                .await?,
-        );
+        self.os_bindings.push(self.vhost.add(
+            Some(InternedString::from_display(
+                &tor_key.public().get_onion_address(),
+            )),
+            443,
+            vhost_target,
+        )?);
         self.os_bindings.extend(
             self.tor
                 .add(
@@ -115,6 +118,7 @@ pub struct NetController {
     db: TypedPatchDb<Database>,
     pub(super) tor: TorController,
     pub(super) vhost: VHostController,
+    pub net_iface: Arc<NetworkInterfaceController>,
     pub(super) dns: DnsController,
     pub(super) forward: LanPortForwardController,
     pub(super) os_bindings: Vec<Arc<()>>,
@@ -127,6 +131,7 @@ impl NetController {
             db,
             tor,
             vhost,
+            net_iface,
             os_bindings,
             server_hostnames,
         }: PreInitNetController,
@@ -137,7 +142,8 @@ impl NetController {
             tor,
             vhost,
             dns: DnsController::init(dns_bind).await?,
-            forward: LanPortForwardController::new(),
+            forward: LanPortForwardController::new(net_iface.subscribe()),
+            net_iface,
             os_bindings,
             server_hostnames,
         };
@@ -169,15 +175,8 @@ impl NetController {
 
 #[derive(Default, Debug)]
 struct HostBinds {
-    lan: BTreeMap<
-        u16,
-        (
-            LanInfo,
-            Option<AddSslOptions>,
-            BTreeSet<InternedString>,
-            Vec<Arc<()>>,
-        ),
-    >,
+    forwards: BTreeMap<u16, (SocketAddr, bool, Arc<()>)>,
+    vhosts: BTreeMap<(Option<InternedString>, u16), (TargetInfo, Arc<()>)>,
     tor: BTreeMap<OnionAddressV3, (OrdMap<u16, SocketAddr>, Vec<Arc<()>>)>,
 }
 
@@ -206,7 +205,7 @@ impl NetService {
         internal_port: u16,
         options: BindOptions,
     ) -> Result<(), Error> {
-        dbg!("bind", &kind, &id, internal_port, &options);
+        crate::dbg!("bind", &kind, &id, internal_port, &options);
         let pkg_id = &self.id;
         let host = self
             .net_controller()?
@@ -263,134 +262,161 @@ impl NetService {
 
     pub async fn update(&mut self, id: HostId, host: Host) -> Result<(), Error> {
         let ctrl = self.net_controller()?;
-        let mut hostname_info = BTreeMap::new();
+        let mut forwards: BTreeMap<u16, (SocketAddr, bool)> = BTreeMap::new();
+        let mut vhosts: BTreeMap<(Option<InternedString>, u16), TargetInfo> = BTreeMap::new();
+        let mut tor: BTreeMap<OnionAddressV3, (TorSecretKeyV3, OrdMap<u16, SocketAddr>)> =
+            BTreeMap::new();
+        let mut hostname_info: BTreeMap<u16, Vec<HostnameInfo>> = BTreeMap::new();
         let binds = self.binds.entry(id.clone()).or_default();
 
         let peek = ctrl.db.peek().await;
 
         // LAN
         let server_info = peek.as_public().as_server_info();
-        let ip_info = server_info.as_ip_info().de()?;
+        let net_ifaces = server_info.as_network_interfaces().de()?;
         let hostname = server_info.as_hostname().de()?;
         for (port, bind) in &host.bindings {
             if !bind.enabled {
                 continue;
             }
-            let old_lan_bind = binds.lan.remove(port);
-            let lan_bind = old_lan_bind
-                .as_ref()
-                .filter(|(external, ssl, _, _)| {
-                    ssl == &bind.options.add_ssl && bind.lan == *external
-                })
-                .cloned(); // only keep existing binding if relevant details match
-            if bind.lan.assigned_port.is_some() || bind.lan.assigned_ssl_port.is_some() {
-                let new_lan_bind = if let Some(b) = lan_bind {
-                    b
-                } else {
-                    let mut rcs = Vec::with_capacity(2 + host.addresses.len());
-                    let mut hostnames = BTreeSet::new();
-                    if let Some(ssl) = &bind.options.add_ssl {
-                        let external = bind
-                            .lan
-                            .assigned_ssl_port
-                            .or_not_found("assigned ssl port")?;
-                        let target = (self.ip, *port).into();
-                        let connect_ssl = if let Some(alpn) = ssl.alpn.clone() {
-                            Err(alpn)
+            if bind.net.assigned_port.is_some() || bind.net.assigned_ssl_port.is_some() {
+                let mut hostnames = BTreeSet::new();
+                if let Some(ssl) = &bind.options.add_ssl {
+                    let external = bind
+                        .net
+                        .assigned_ssl_port
+                        .or_not_found("assigned ssl port")?;
+                    let addr = (self.ip, *port).into();
+                    let connect_ssl = if let Some(alpn) = ssl.alpn.clone() {
+                        Err(alpn)
+                    } else {
+                        if bind.options.secure.as_ref().map_or(false, |s| s.ssl) {
+                            Ok(())
                         } else {
-                            if bind.options.secure.as_ref().map_or(false, |s| s.ssl) {
-                                Ok(())
-                            } else {
-                                Err(AlpnInfo::Reflect)
-                            }
-                        };
-                        for hostname in ctrl.server_hostnames.iter().cloned() {
-                            rcs.push(
-                                ctrl.vhost
-                                    .add(hostname, external, target, connect_ssl.clone())
-                                    .await?,
-                            );
+                            Err(AlpnInfo::Reflect)
                         }
-                        for address in host.addresses() {
-                            match address {
-                                HostAddress::Onion { address } => {
-                                    let hostname = InternedString::from_display(address);
-                                    if hostnames.insert(hostname.clone()) {
-                                        rcs.push(
-                                            ctrl.vhost
-                                                .add(
-                                                    Some(hostname),
-                                                    external,
-                                                    target,
-                                                    connect_ssl.clone(),
-                                                )
-                                                .await?,
-                                        );
-                                    }
+                    };
+                    for hostname in ctrl.server_hostnames.iter().cloned() {
+                        vhosts.insert(
+                            (hostname, external),
+                            TargetInfo {
+                                public: bind.net.public,
+                                acme: None,
+                                addr,
+                                connect_ssl: connect_ssl.clone(),
+                            },
+                        );
+                    }
+                    for address in host.addresses() {
+                        match address {
+                            HostAddress::Onion { address } => {
+                                let hostname = InternedString::from_display(&address);
+                                if hostnames.insert(hostname.clone()) {
+                                    vhosts.insert(
+                                        (Some(hostname), external),
+                                        TargetInfo {
+                                            public: false,
+                                            acme: None,
+                                            addr,
+                                            connect_ssl: connect_ssl.clone(),
+                                        },
+                                    );
                                 }
-                                HostAddress::Domain { address } => {
-                                    if hostnames.insert(address.clone()) {
-                                        let address = Some(address.clone());
-                                        rcs.push(
-                                            ctrl.vhost
-                                                .add(
-                                                    address.clone(),
-                                                    external,
-                                                    target,
-                                                    connect_ssl.clone(),
-                                                )
-                                                .await?,
-                                        );
-                                        if ssl.preferred_external_port == 443 {
-                                            rcs.push(
-                                                ctrl.vhost
-                                                    .add(
-                                                        address.clone(),
-                                                        5443,
-                                                        target,
-                                                        connect_ssl.clone(),
-                                                    )
-                                                    .await?,
+                            }
+                            HostAddress::Domain {
+                                address,
+                                public,
+                                acme,
+                            } => {
+                                if hostnames.insert(address.clone()) {
+                                    let address = Some(address.clone());
+                                    if ssl.preferred_external_port == 443 {
+                                        if public && bind.net.public {
+                                            vhosts.insert(
+                                                (address.clone(), 5443),
+                                                TargetInfo {
+                                                    public: false,
+                                                    acme: acme.clone(),
+                                                    addr,
+                                                    connect_ssl: connect_ssl.clone(),
+                                                },
                                             );
                                         }
+                                        vhosts.insert(
+                                            (address.clone(), 443),
+                                            TargetInfo {
+                                                public: public && bind.net.public,
+                                                acme,
+                                                addr,
+                                                connect_ssl: connect_ssl.clone(),
+                                            },
+                                        );
+                                    } else {
+                                        vhosts.insert(
+                                            (address.clone(), external),
+                                            TargetInfo {
+                                                public: public && bind.net.public,
+                                                acme,
+                                                addr,
+                                                connect_ssl: connect_ssl.clone(),
+                                            },
+                                        );
                                     }
                                 }
                             }
                         }
                     }
-                    if let Some(security) = bind.options.secure {
-                        if bind.options.add_ssl.is_some() && security.ssl {
-                            // doesn't make sense to have 2 listening ports, both with ssl
-                        } else {
-                            let external =
-                                bind.lan.assigned_port.or_not_found("assigned lan port")?;
-                            rcs.push(ctrl.forward.add(external, (self.ip, *port).into()).await?);
-                        }
+                }
+                if let Some(security) = bind.options.secure {
+                    if bind.options.add_ssl.is_some() && security.ssl {
+                        // doesn't make sense to have 2 listening ports, both with ssl
+                    } else {
+                        let external = bind.net.assigned_port.or_not_found("assigned lan port")?;
+                        forwards.insert(external, ((self.ip, *port).into(), bind.net.public));
                     }
-                    (bind.lan, bind.options.add_ssl.clone(), hostnames, rcs)
-                };
+                }
                 let mut bind_hostname_info: Vec<HostnameInfo> =
                     hostname_info.remove(port).unwrap_or_default();
-                for (interface, ip_info) in &ip_info {
-                    bind_hostname_info.push(HostnameInfo::Ip {
-                        network_interface_id: interface.clone(),
-                        public: false,
-                        hostname: IpHostname::Local {
-                            value: InternedString::from_display(&{
-                                let hostname = &hostname;
-                                lazy_format!("{hostname}.local")
-                            }),
-                            port: new_lan_bind.0.assigned_port,
-                            ssl_port: new_lan_bind.0.assigned_ssl_port,
-                        },
-                    });
+                for (interface, public, ip_info) in
+                    net_ifaces.iter().filter_map(|(interface, info)| {
+                        if let Some(ip_info) = &info.ip_info {
+                            Some((interface, info.public(), ip_info))
+                        } else {
+                            None
+                        }
+                    })
+                {
+                    if !public {
+                        bind_hostname_info.push(HostnameInfo::Ip {
+                            network_interface_id: interface.clone(),
+                            public: false,
+                            hostname: IpHostname::Local {
+                                value: InternedString::from_display(&{
+                                    let hostname = &hostname;
+                                    lazy_format!("{hostname}.local")
+                                }),
+                                port: bind.net.assigned_port,
+                                ssl_port: bind.net.assigned_ssl_port,
+                            },
+                        });
+                    }
                     for address in host.addresses() {
-                        if let HostAddress::Domain { address } = address {
-                            if let Some(ssl) = &new_lan_bind.1 {
-                                if ssl.preferred_external_port == 443 {
+                        if let HostAddress::Domain {
+                            address,
+                            public: domain_public,
+                            ..
+                        } = address
+                        {
+                            if !public || (domain_public && bind.net.public) {
+                                if bind
+                                    .options
+                                    .add_ssl
+                                    .as_ref()
+                                    .map_or(false, |ssl| ssl.preferred_external_port == 443)
+                                {
                                     bind_hostname_info.push(HostnameInfo::Ip {
                                         network_interface_id: interface.clone(),
-                                        public: false,
+                                        public: public && domain_public && bind.net.public, // TODO: check if port forward is active
                                         hostname: IpHostname::Domain {
                                             domain: address.clone(),
                                             subdomain: None,
@@ -398,71 +424,65 @@ impl NetService {
                                             ssl_port: Some(443),
                                         },
                                     });
+                                } else {
+                                    bind_hostname_info.push(HostnameInfo::Ip {
+                                        network_interface_id: interface.clone(),
+                                        public,
+                                        hostname: IpHostname::Domain {
+                                            domain: address.clone(),
+                                            subdomain: None,
+                                            port: bind.net.assigned_port,
+                                            ssl_port: bind.net.assigned_ssl_port,
+                                        },
+                                    });
                                 }
                             }
                         }
                     }
-                    if let Some(ipv4) = ip_info.ipv4 {
-                        bind_hostname_info.push(HostnameInfo::Ip {
-                            network_interface_id: interface.clone(),
-                            public: false,
-                            hostname: IpHostname::Ipv4 {
-                                value: ipv4,
-                                port: new_lan_bind.0.assigned_port,
-                                ssl_port: new_lan_bind.0.assigned_ssl_port,
-                            },
-                        });
-                    }
-                    if let Some(ipv6) = ip_info.ipv6 {
-                        bind_hostname_info.push(HostnameInfo::Ip {
-                            network_interface_id: interface.clone(),
-                            public: false,
-                            hostname: IpHostname::Ipv6 {
-                                value: ipv6,
-                                port: new_lan_bind.0.assigned_port,
-                                ssl_port: new_lan_bind.0.assigned_ssl_port,
-                            },
-                        });
+                    if !public || bind.net.public {
+                        if let Some(wan_ip) = ip_info.wan_ip.filter(|_| public) {
+                            bind_hostname_info.push(HostnameInfo::Ip {
+                                network_interface_id: interface.clone(),
+                                public,
+                                hostname: IpHostname::Ipv4 {
+                                    value: wan_ip,
+                                    port: bind.net.assigned_port,
+                                    ssl_port: bind.net.assigned_ssl_port,
+                                },
+                            });
+                        }
+                        for ipnet in &ip_info.subnets {
+                            match ipnet {
+                                IpNet::V4(net) => {
+                                    if !public {
+                                        bind_hostname_info.push(HostnameInfo::Ip {
+                                            network_interface_id: interface.clone(),
+                                            public,
+                                            hostname: IpHostname::Ipv4 {
+                                                value: net.addr(),
+                                                port: bind.net.assigned_port,
+                                                ssl_port: bind.net.assigned_ssl_port,
+                                            },
+                                        });
+                                    }
+                                }
+                                IpNet::V6(net) => {
+                                    bind_hostname_info.push(HostnameInfo::Ip {
+                                        network_interface_id: interface.clone(),
+                                        public: public && !ipv6_is_local(net.addr()),
+                                        hostname: IpHostname::Ipv6 {
+                                            value: net.addr(),
+                                            scope_id: ip_info.scope_id,
+                                            port: bind.net.assigned_port,
+                                            ssl_port: bind.net.assigned_ssl_port,
+                                        },
+                                    });
+                                }
+                            }
+                        }
                     }
                 }
                 hostname_info.insert(*port, bind_hostname_info);
-                binds.lan.insert(*port, new_lan_bind);
-            }
-            if let Some((lan, _, hostnames, _)) = old_lan_bind {
-                if let Some(external) = lan.assigned_ssl_port {
-                    for hostname in ctrl.server_hostnames.iter().cloned() {
-                        ctrl.vhost.gc(hostname, external).await?;
-                    }
-                    for hostname in hostnames {
-                        ctrl.vhost.gc(Some(hostname), external).await?;
-                    }
-                }
-                if let Some(external) = lan.assigned_port {
-                    ctrl.forward.gc(external).await?;
-                }
-            }
-        }
-        let mut removed = BTreeSet::new();
-        binds.lan.retain(|internal, (external, _, hostnames, _)| {
-            if host.bindings.get(internal).map_or(false, |b| b.enabled) {
-                true
-            } else {
-                removed.insert((*external, std::mem::take(hostnames)));
-
-                false
-            }
-        });
-        for (lan, hostnames) in removed {
-            if let Some(external) = lan.assigned_ssl_port {
-                for hostname in ctrl.server_hostnames.iter().cloned() {
-                    ctrl.vhost.gc(hostname, external).await?;
-                }
-                for hostname in hostnames {
-                    ctrl.vhost.gc(Some(hostname), external).await?;
-                }
-            }
-            if let Some(external) = lan.assigned_port {
-                ctrl.forward.gc(external).await?;
             }
         }
 
@@ -481,7 +501,7 @@ impl NetService {
                 SocketAddr::from((self.ip, *internal)),
             );
             if let (Some(ssl), Some(ssl_internal)) =
-                (&info.options.add_ssl, info.lan.assigned_ssl_port)
+                (&info.options.add_ssl, info.net.assigned_ssl_port)
             {
                 tor_binds.insert(
                     ssl.preferred_external_port,
@@ -506,31 +526,13 @@ impl NetService {
             }
         }
 
-        let mut keep_tor_addrs = BTreeSet::new();
-        for tor_addr in host.addresses().filter_map(|a| {
-            if let HostAddress::Onion { address } = a {
-                Some(address)
-            } else {
-                None
-            }
-        }) {
-            keep_tor_addrs.insert(tor_addr);
-            let old_tor_bind = binds.tor.remove(tor_addr);
-            let tor_bind = old_tor_bind.filter(|(ports, _)| ports == &tor_binds);
-            let new_tor_bind = if let Some(tor_bind) = tor_bind {
-                tor_bind
-            } else {
-                let key = peek
-                    .as_private()
-                    .as_key_store()
-                    .as_onion()
-                    .get_key(tor_addr)?;
-                let rcs = ctrl
-                    .tor
-                    .add(key, tor_binds.clone().into_iter().collect())
-                    .await?;
-                (tor_binds.clone(), rcs)
-            };
+        for tor_addr in host.onions.iter() {
+            let key = peek
+                .as_private()
+                .as_key_store()
+                .as_onion()
+                .get_key(tor_addr)?;
+            tor.insert(key.public().get_onion_address(), (key, tor_binds.clone()));
             for (internal, ports) in &tor_hostname_ports {
                 let mut bind_hostname_info = hostname_info.remove(internal).unwrap_or_default();
                 bind_hostname_info.push(HostnameInfo::Onion {
@@ -542,16 +544,91 @@ impl NetService {
                 });
                 hostname_info.insert(*internal, bind_hostname_info);
             }
-            binds.tor.insert(tor_addr.clone(), new_tor_bind);
         }
-        for addr in binds.tor.keys() {
-            if !keep_tor_addrs.contains(addr) {
-                ctrl.tor.gc(Some(addr.clone()), None).await?;
+
+        let all = binds
+            .forwards
+            .keys()
+            .chain(forwards.keys())
+            .copied()
+            .collect::<BTreeSet<_>>();
+        for external in all {
+            let mut prev = binds.forwards.remove(&external);
+            if let Some((internal, public)) = forwards.remove(&external) {
+                prev = prev.filter(|(i, p, _)| i == &internal && *p == public);
+                binds.forwards.insert(
+                    external,
+                    if let Some(prev) = prev {
+                        prev
+                    } else {
+                        (
+                            internal,
+                            public,
+                            ctrl.forward.add(external, public, internal).await?,
+                        )
+                    },
+                );
             }
         }
+        ctrl.forward.gc().await?;
 
-        self.net_controller()?
-            .db
+        let all = binds
+            .vhosts
+            .keys()
+            .chain(vhosts.keys())
+            .cloned()
+            .collect::<BTreeSet<_>>();
+        for key in all {
+            let mut prev = binds.vhosts.remove(&key);
+            if let Some(target) = vhosts.remove(&key) {
+                prev = prev.filter(|(t, _)| t == &target);
+                binds.vhosts.insert(
+                    key.clone(),
+                    if let Some(prev) = prev {
+                        prev
+                    } else {
+                        (target.clone(), ctrl.vhost.add(key.0, key.1, target)?)
+                    },
+                );
+            } else {
+                if let Some((_, rc)) = prev {
+                    drop(rc);
+                    ctrl.vhost.gc(key.0, key.1);
+                }
+            }
+        }
+
+        let all = binds
+            .tor
+            .keys()
+            .chain(tor.keys())
+            .cloned()
+            .collect::<BTreeSet<_>>();
+        for onion in all {
+            let mut prev = binds.tor.remove(&onion);
+            if let Some((key, tor_binds)) = tor.remove(&onion) {
+                prev = prev.filter(|(b, _)| b == &tor_binds);
+                binds.tor.insert(
+                    onion,
+                    if let Some(prev) = prev {
+                        prev
+                    } else {
+                        let rcs = ctrl
+                            .tor
+                            .add(key, tor_binds.iter().map(|(k, v)| (*k, *v)).collect())
+                            .await?;
+                        (tor_binds, rcs)
+                    },
+                );
+            } else {
+                if let Some((_, rc)) = prev {
+                    drop(rc);
+                    ctrl.tor.gc(Some(onion), None).await?;
+                }
+            }
+        }
+
+        ctrl.db
             .mutate(|db| {
                 host_for(db, &self.id, &id, host.kind)?
                     .as_hostname_info_mut()
@@ -579,29 +656,6 @@ impl NetService {
     pub fn get_ip(&self) -> Ipv4Addr {
         self.ip
     }
-
-    pub fn get_lan_port(&self, host_id: HostId, internal_port: u16) -> Result<LanInfo, Error> {
-        let host_id_binds = self.binds.get_key_value(&host_id);
-        match host_id_binds {
-            Some((_, binds)) => {
-                if let Some((lan, _, _, _)) = binds.lan.get(&internal_port) {
-                    Ok(*lan)
-                } else {
-                    Err(Error::new(
-                        eyre!(
-                            "Internal Port {} not found in NetService binds",
-                            internal_port
-                        ),
-                        crate::ErrorKind::NotFound,
-                    ))
-                }
-            }
-            None => Err(Error::new(
-                eyre!("HostID {} not found in NetService binds", host_id),
-                crate::ErrorKind::NotFound,
-            )),
-        }
-    }
 }
 
 impl Drop for NetService {
diff --git a/core/startos/src/net/network_interface.rs b/core/startos/src/net/network_interface.rs
new file mode 100644
index 000000000..991765c86
--- /dev/null
+++ b/core/startos/src/net/network_interface.rs
@@ -0,0 +1,1116 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::future::Future;
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV6};
+use std::pin::Pin;
+use std::sync::{Arc, Weak};
+use std::task::Poll;
+use std::time::Duration;
+
+use clap::Parser;
+use futures::{FutureExt, Stream, StreamExt, TryStreamExt};
+use helpers::NonDetachingJoinHandle;
+use imbl_value::InternedString;
+use ipnet::IpNet;
+use itertools::Itertools;
+use nix::net::if_::if_nametoindex;
+use patch_db::json_ptr::JsonPointer;
+use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
+use serde::{Deserialize, Serialize};
+use tokio::io::{AsyncBufReadExt, BufReader};
+use tokio::net::{TcpListener, TcpStream};
+use tokio::process::Command;
+use tokio::sync::watch;
+use ts_rs::TS;
+use zbus::proxy::{PropertyChanged, PropertyStream, SignalStream};
+use zbus::zvariant::{
+    DeserializeDict, Dict, OwnedObjectPath, OwnedValue, Type as ZType, Value as ZValue,
+};
+use zbus::{proxy, Connection};
+
+use crate::context::{CliContext, RpcContext};
+use crate::db::model::public::{IpInfo, NetworkInterfaceInfo, NetworkInterfaceType};
+use crate::db::model::Database;
+use crate::net::utils::{ipv6_is_link_local, ipv6_is_local};
+use crate::prelude::*;
+use crate::util::future::Until;
+use crate::util::io::open_file;
+use crate::util::serde::{display_serializable, HandlerExtSerde};
+use crate::util::sync::SyncMutex;
+use crate::util::Invoke;
+
+pub fn network_interface_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .subcommand(
+            "list",
+            from_fn_async(list_interfaces)
+                .with_display_serializable()
+                .with_custom_display_fn(|HandlerArgs { params, .. }, res| {
+                    use prettytable::*;
+
+                    if let Some(format) = params.format {
+                        return Ok(display_serializable(format, res));
+                    }
+
+                    let mut table = Table::new();
+                    table.add_row(row![bc => "INTERFACE", "TYPE", "PUBLIC", "ADDRESSES", "WAN IP"]);
+                    for (iface, info) in res {
+                        table.add_row(row![
+                            iface,
+                            info.ip_info.as_ref()
+                                .and_then(|ip_info| ip_info.device_type)
+                                .map_or_else(|| "UNKNOWN".to_owned(), |ty| format!("{ty:?}")),
+                            info.public(),
+                            info.ip_info.as_ref().map_or_else(
+                                || "<DISCONNECTED>".to_owned(),
+                                |ip_info| ip_info.subnets
+                                    .iter()
+                                    .map(|ipnet| match ipnet.addr() {
+                                        IpAddr::V4(ip) => format!("{ip}/{}", ipnet.prefix_len()),
+                                        IpAddr::V6(ip) => format!(
+                                            "[{ip}%{}]/{}",
+                                            ip_info.scope_id,
+                                            ipnet.prefix_len()
+                                        ),
+                                    })
+                                    .join(", ")),
+                            info.ip_info.as_ref()
+                                .and_then(|ip_info| ip_info.wan_ip)
+                                .map_or_else(|| "N/A".to_owned(), |ip| ip.to_string())
+                        ]);
+                    }
+
+                    table.print_tty(false).unwrap();
+
+                    Ok(())
+                })
+                .with_about("Show network interfaces StartOS can listen on")
+                .with_call_remote::<CliContext>(),
+        )
+        .subcommand(
+            "set-public",
+            from_fn_async(set_public)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_about("Indicate whether this interface is publicly addressable")
+                .with_call_remote::<CliContext>(),
+        ).subcommand(
+            "unset-public",
+            from_fn_async(unset_public)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_about("Allow this interface to infer whether it is publicly addressable based on its IPv4 address")
+                .with_call_remote::<CliContext>(),
+        ).subcommand("forget",
+            from_fn_async(forget_iface)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_about("Forget a disconnected interface")
+                .with_call_remote::<CliContext>()
+        )
+}
+
+async fn list_interfaces(
+    ctx: RpcContext,
+) -> Result<BTreeMap<InternedString, NetworkInterfaceInfo>, Error> {
+    Ok(ctx.net_controller.net_iface.ip_info.borrow().clone())
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
+struct SetPublicParams {
+    #[ts(type = "string")]
+    interface: InternedString,
+    public: Option<bool>,
+}
+
+async fn set_public(
+    ctx: RpcContext,
+    SetPublicParams { interface, public }: SetPublicParams,
+) -> Result<(), Error> {
+    ctx.net_controller
+        .net_iface
+        .set_public(&interface, Some(public.unwrap_or(true)))
+        .await
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
+struct UnsetPublicParams {
+    #[ts(type = "string")]
+    interface: InternedString,
+}
+
+async fn unset_public(
+    ctx: RpcContext,
+    UnsetPublicParams { interface }: UnsetPublicParams,
+) -> Result<(), Error> {
+    ctx.net_controller
+        .net_iface
+        .set_public(&interface, None)
+        .await
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[ts(export)]
+struct ForgetInterfaceParams {
+    #[ts(type = "string")]
+    interface: InternedString,
+}
+
+async fn forget_iface(
+    ctx: RpcContext,
+    ForgetInterfaceParams { interface }: ForgetInterfaceParams,
+) -> Result<(), Error> {
+    ctx.net_controller.net_iface.forget(&interface).await
+}
+
+#[proxy(
+    interface = "org.freedesktop.NetworkManager",
+    default_service = "org.freedesktop.NetworkManager",
+    default_path = "/org/freedesktop/NetworkManager"
+)]
+trait NetworkManager {
+    #[zbus(property)]
+    fn all_devices(&self) -> Result<Vec<OwnedObjectPath>, Error>;
+
+    #[zbus(signal)]
+    fn device_added(&self) -> Result<(), Error>;
+
+    #[zbus(signal)]
+    fn device_removed(&self) -> Result<(), Error>;
+
+    #[zbus(signal)]
+    fn state_changed(&self) -> Result<(), Error>;
+}
+
+mod active_connection {
+    use zbus::proxy;
+    use zbus::zvariant::OwnedObjectPath;
+
+    use crate::prelude::*;
+
+    #[proxy(
+        interface = "org.freedesktop.NetworkManager.Connection.Active",
+        default_service = "org.freedesktop.NetworkManager"
+    )]
+    pub trait ActiveConnection {
+        #[zbus(property)]
+        fn state_flags(&self) -> Result<u32, Error>;
+
+        #[zbus(property, name = "Type")]
+        fn connection_type(&self) -> Result<String, Error>;
+
+        #[zbus(signal)]
+        fn state_changed(&self) -> Result<(), Error>;
+
+        #[zbus(property)]
+        fn dhcp4_config(&self) -> Result<OwnedObjectPath, Error>;
+    }
+}
+
+#[proxy(
+    interface = "org.freedesktop.NetworkManager.IP4Config",
+    default_service = "org.freedesktop.NetworkManager"
+)]
+trait Ip4Config {
+    #[zbus(property)]
+    fn address_data(&self) -> Result<Vec<AddressData>, Error>;
+}
+
+#[proxy(
+    interface = "org.freedesktop.NetworkManager.IP6Config",
+    default_service = "org.freedesktop.NetworkManager"
+)]
+trait Ip6Config {
+    #[zbus(property)]
+    fn address_data(&self) -> Result<Vec<AddressData>, Error>;
+}
+
+#[derive(Clone, Debug, DeserializeDict, ZValue, ZType)]
+#[zvariant(signature = "dict")]
+struct AddressData {
+    address: String,
+    prefix: u32,
+}
+impl TryFrom<AddressData> for IpNet {
+    type Error = Error;
+    fn try_from(value: AddressData) -> Result<Self, Self::Error> {
+        IpNet::new(value.address.parse()?, value.prefix as u8).with_kind(ErrorKind::ParseNetAddress)
+    }
+}
+
+#[proxy(
+    interface = "org.freedesktop.NetworkManager.DHCP4Config",
+    default_service = "org.freedesktop.NetworkManager"
+)]
+trait Dhcp4Config {
+    #[zbus(property)]
+    fn options(&self) -> Result<Dhcp4Options, Error>;
+}
+
+#[derive(Clone, Debug, DeserializeDict, ZType)]
+#[zvariant(signature = "dict")]
+struct Dhcp4Options {
+    ntp_servers: Option<String>,
+}
+impl TryFrom<OwnedValue> for Dhcp4Options {
+    type Error = zbus::Error;
+    fn try_from(value: OwnedValue) -> Result<Self, Self::Error> {
+        let dict = value.downcast_ref::<Dict>()?;
+        Ok(Self {
+            ntp_servers: dict.get::<_, String>(&zbus::zvariant::Str::from_static("ntp_servers"))?,
+        })
+    }
+}
+
+mod device {
+    use zbus::proxy;
+    use zbus::zvariant::OwnedObjectPath;
+
+    use crate::prelude::*;
+
+    #[proxy(
+        interface = "org.freedesktop.NetworkManager.Device",
+        default_service = "org.freedesktop.NetworkManager"
+    )]
+    pub trait Device {
+        #[zbus(property)]
+        fn ip_interface(&self) -> Result<String, Error>;
+
+        #[zbus(property)]
+        fn managed(&self) -> Result<bool, Error>;
+
+        #[zbus(property)]
+        fn active_connection(&self) -> Result<OwnedObjectPath, Error>;
+
+        #[zbus(property)]
+        fn ip4_config(&self) -> Result<OwnedObjectPath, Error>;
+
+        #[zbus(property)]
+        fn ip6_config(&self) -> Result<OwnedObjectPath, Error>;
+
+        #[zbus(property, name = "State")]
+        fn _state(&self) -> Result<u32, Error>;
+
+        #[zbus(property)]
+        fn device_type(&self) -> Result<u32, Error>;
+
+        #[zbus(signal)]
+        fn state_changed(&self) -> Result<(), Error>;
+    }
+}
+
+trait StubStream<'a> {
+    fn stub(self) -> impl Stream<Item = Result<(), Error>> + 'a;
+}
+impl<'a, T> StubStream<'a> for PropertyStream<'a, T>
+where
+    T: Unpin + TryFrom<OwnedValue> + std::fmt::Debug + 'a,
+    T::Error: Into<zbus::Error>,
+{
+    fn stub(self) -> impl Stream<Item = Result<(), Error>> + 'a {
+        StreamExt::then(self, |d| async move {
+            PropertyChanged::get(&d).await.map(|_| ())
+        })
+        .map_err(Error::from)
+    }
+}
+impl<'a> StubStream<'a> for SignalStream<'a> {
+    fn stub(self) -> impl Stream<Item = Result<(), Error>> + 'a {
+        self.map(|_| Ok(()))
+    }
+}
+
+#[instrument(skip_all)]
+async fn watcher(write_to: watch::Sender<BTreeMap<InternedString, NetworkInterfaceInfo>>) {
+    loop {
+        let res: Result<(), Error> = async {
+            let connection = Connection::system().await?;
+
+            let netman_proxy = NetworkManagerProxy::new(&connection).await?;
+
+            let mut until = Until::new()
+                .with_stream(netman_proxy.receive_all_devices_changed().await.stub())
+                .with_stream(
+                    netman_proxy
+                        .receive_device_added()
+                        .await?
+                        .into_inner()
+                        .stub(),
+                )
+                .with_stream(
+                    netman_proxy
+                        .receive_device_removed()
+                        .await?
+                        .into_inner()
+                        .stub(),
+                )
+                .with_stream(
+                    netman_proxy
+                        .receive_state_changed()
+                        .await?
+                        .into_inner()
+                        .stub(),
+                );
+
+            loop {
+                until
+                    .run(async {
+                        let devices = netman_proxy.all_devices().await?;
+                        let mut ifaces = BTreeSet::new();
+                        let mut jobs = Vec::new();
+                        for device in devices {
+                            let device_proxy =
+                                device::DeviceProxy::new(&connection, device.clone()).await?;
+                            let iface = InternedString::intern(device_proxy.ip_interface().await?);
+                            if iface.is_empty() {
+                                continue;
+                            }
+
+                            jobs.push(watch_ip(
+                                &connection,
+                                device_proxy.clone(),
+                                iface.clone(),
+                                &write_to,
+                            ));
+                            ifaces.insert(iface);
+                        }
+
+                        write_to.send_if_modified(|m| {
+                            let mut changed = false;
+                            for (iface, info) in m {
+                                if !ifaces.contains(iface) {
+                                    info.ip_info = None;
+                                    changed = true;
+                                }
+                            }
+                            changed
+                        });
+                        futures::future::try_join_all(jobs).await?;
+
+                        Ok::<_, Error>(())
+                    })
+                    .await?;
+            }
+        }
+        .await;
+        if let Err(e) = res {
+            tracing::error!("{e}");
+            tracing::debug!("{e:?}");
+        }
+    }
+}
+
+async fn get_wan_ipv4(iface: &str) -> Result<Option<Ipv4Addr>, Error> {
+    Ok(reqwest::Client::builder()
+        .interface(iface)
+        .build()?
+        .get("http://ip4only.me/api/")
+        .timeout(Duration::from_secs(10))
+        .send()
+        .await?
+        .error_for_status()?
+        .text()
+        .await?
+        .split(",")
+        .skip(1)
+        .next()
+        .filter(|s| !s.is_empty())
+        .map(|s| s.parse())
+        .transpose()?)
+}
+
+#[instrument(skip(connection, device_proxy, write_to))]
+async fn watch_ip(
+    connection: &Connection,
+    device_proxy: device::DeviceProxy<'_>,
+    iface: InternedString,
+    write_to: &watch::Sender<BTreeMap<InternedString, NetworkInterfaceInfo>>,
+) -> Result<(), Error> {
+    let mut until = Until::new()
+        .with_stream(
+            device_proxy
+                .receive_active_connection_changed()
+                .await
+                .stub(),
+        )
+        .with_stream(
+            device_proxy
+                .receive_state_changed()
+                .await?
+                .into_inner()
+                .stub(),
+        )
+        .with_stream(device_proxy.receive_ip4_config_changed().await.stub())
+        .with_stream(device_proxy.receive_ip6_config_changed().await.stub())
+        .with_async_fn(|| {
+            async {
+                tokio::time::sleep(Duration::from_secs(300)).await;
+                Ok(())
+            }
+            .fuse()
+        });
+
+    loop {
+        until
+            .run(async {
+                let ip4_config = device_proxy.ip4_config().await?;
+                let ip6_config = device_proxy.ip6_config().await?;
+
+                let managed = device_proxy.managed().await?;
+                if !managed {
+                    return Ok(());
+                }
+                let dac = device_proxy.active_connection().await?;
+                if &*dac == "/" {
+                    return Ok(());
+                }
+
+                let active_connection_proxy =
+                    active_connection::ActiveConnectionProxy::new(&connection, dac).await?;
+
+                let mut until = Until::new()
+                    .with_stream(
+                        active_connection_proxy
+                            .receive_state_changed()
+                            .await?
+                            .into_inner()
+                            .stub(),
+                    )
+                    .with_stream(
+                        active_connection_proxy
+                            .receive_dhcp4_config_changed()
+                            .await
+                            .stub(),
+                    );
+
+                loop {
+                    until
+                        .run(async {
+                            let external = active_connection_proxy.state_flags().await? & 0x80 != 0;
+                            if external {
+                                return Ok(());
+                            }
+
+                            let device_type = match device_proxy.device_type().await? {
+                                1 => Some(NetworkInterfaceType::Ethernet),
+                                2 => Some(NetworkInterfaceType::Wireless),
+                                29 => Some(NetworkInterfaceType::Wireguard),
+                                _ => None,
+                            };
+
+                            let dhcp4_config = active_connection_proxy.dhcp4_config().await?;
+                            let ip4_proxy =
+                                Ip4ConfigProxy::new(&connection, ip4_config.clone()).await?;
+                            let ip6_proxy =
+                                Ip6ConfigProxy::new(&connection, ip6_config.clone()).await?;
+                            let mut until = Until::new()
+                                .with_stream(ip4_proxy.receive_address_data_changed().await.stub())
+                                .with_stream(ip6_proxy.receive_address_data_changed().await.stub());
+
+                            let dhcp4_proxy = if &*dhcp4_config != "/" {
+                                let dhcp4_proxy =
+                                    Dhcp4ConfigProxy::new(&connection, dhcp4_config).await?;
+                                until = until.with_stream(
+                                    dhcp4_proxy.receive_options_changed().await.stub(),
+                                );
+                                Some(dhcp4_proxy)
+                            } else {
+                                None
+                            };
+
+                            loop {
+                                until
+                                    .run(async {
+                                        let addresses = ip4_proxy
+                                            .address_data()
+                                            .await?
+                                            .into_iter()
+                                            .chain(ip6_proxy.address_data().await?)
+                                            .collect_vec();
+                                        let mut ntp_servers = BTreeSet::new();
+                                        if let Some(dhcp4_proxy) = &dhcp4_proxy {
+                                            let dhcp = dhcp4_proxy.options().await?;
+                                            if let Some(ntp) = dhcp.ntp_servers {
+                                                ntp_servers.extend(
+                                                    ntp.split_whitespace()
+                                                        .map(InternedString::intern),
+                                                );
+                                            }
+                                        }
+                                        let scope_id = if_nametoindex(&*iface)
+                                            .with_kind(ErrorKind::Network)?;
+                                        let subnets: BTreeSet<IpNet> = addresses
+                                            .into_iter()
+                                            .map(TryInto::try_into)
+                                            .try_collect()?;
+                                        let ip_info = if !subnets.is_empty() {
+                                            let wan_ip = match get_wan_ipv4(&*iface).await {
+                                                Ok(a) => a,
+                                                Err(e) => {
+                                                    tracing::error!(
+                                                    "Failed to determine WAN IP for {iface}: {e}"
+                                                );
+                                                    tracing::debug!("{e:?}");
+                                                    None
+                                                }
+                                            };
+                                            Some(IpInfo {
+                                                scope_id,
+                                                device_type,
+                                                subnets,
+                                                wan_ip,
+                                                ntp_servers,
+                                            })
+                                        } else {
+                                            None
+                                        };
+
+                                        write_to.send_if_modified(|m| {
+                                            let public = m.get(&iface).map_or(None, |i| i.public);
+                                            m.insert(
+                                                iface.clone(),
+                                                NetworkInterfaceInfo {
+                                                    public,
+                                                    ip_info: ip_info.clone(),
+                                                },
+                                            )
+                                            .filter(|old| &old.ip_info == &ip_info)
+                                            .is_none()
+                                        });
+
+                                        Ok::<_, Error>(())
+                                    })
+                                    .await?;
+                            }
+                        })
+                        .await?;
+                }
+            })
+            .await?;
+    }
+}
+
+pub struct NetworkInterfaceController {
+    db: TypedPatchDb<Database>,
+    ip_info: watch::Sender<BTreeMap<InternedString, NetworkInterfaceInfo>>,
+    _watcher: NonDetachingJoinHandle<()>,
+    listeners: SyncMutex<BTreeMap<u16, Weak<()>>>,
+}
+impl NetworkInterfaceController {
+    pub fn subscribe(&self) -> watch::Receiver<BTreeMap<InternedString, NetworkInterfaceInfo>> {
+        self.ip_info.subscribe()
+    }
+
+    async fn sync(
+        db: &TypedPatchDb<Database>,
+        info: &BTreeMap<InternedString, NetworkInterfaceInfo>,
+    ) -> Result<(), Error> {
+        tracing::debug!("syncronizing {info:?} to db");
+
+        db.mutate(|db| {
+            db.as_public_mut()
+                .as_server_info_mut()
+                .as_network_interfaces_mut()
+                .ser(info)
+        })
+        .await?;
+
+        let ntp: BTreeSet<_> = info
+            .values()
+            .filter_map(|i| i.ip_info.as_ref())
+            .flat_map(|i| &i.ntp_servers)
+            .cloned()
+            .collect();
+        let prev_ntp = tokio_stream::wrappers::LinesStream::new(
+            BufReader::new(open_file("/etc/systemd/timesyncd.conf").await?).lines(),
+        )
+        .try_filter_map(|l| async move {
+            Ok(l.strip_prefix("NTP=").map(|s| {
+                s.split_whitespace()
+                    .map(InternedString::intern)
+                    .collect::<BTreeSet<_>>()
+            }))
+        })
+        .boxed()
+        .try_next()
+        .await?
+        .unwrap_or_default();
+        if ntp != prev_ntp {
+            // sed -i '/\(^\|#\)NTP=/c\NTP='"${servers}" /etc/systemd/timesyncd.conf
+            Command::new("sed")
+                .arg("-i")
+                .arg(
+                    [r#"/\(^\|#\)NTP=/c\NTP="#]
+                        .into_iter()
+                        .chain(Itertools::intersperse(
+                            {
+                                fn to_str(ntp: &InternedString) -> &str {
+                                    &*ntp
+                                }
+                                ntp.iter().map(to_str)
+                            },
+                            " ",
+                        ))
+                        .join(""),
+                )
+                .arg("/etc/systemd/timesyncd.conf")
+                .invoke(ErrorKind::Filesystem)
+                .await?;
+            Command::new("systemctl")
+                .arg("restart")
+                .arg("systemd-timesyncd")
+                .invoke(ErrorKind::Systemd)
+                .await?;
+        }
+
+        Ok(())
+    }
+    pub fn new(db: TypedPatchDb<Database>) -> Self {
+        let (ip_info, mut recv) = watch::channel(BTreeMap::new());
+        Self {
+            db: db.clone(),
+            ip_info: ip_info.clone(),
+            _watcher: tokio::spawn(async move {
+                match db
+                    .peek()
+                    .await
+                    .as_public()
+                    .as_server_info()
+                    .as_network_interfaces()
+                    .de()
+                {
+                    Ok(mut info) => {
+                        for info in info.values_mut() {
+                            info.ip_info = None;
+                        }
+                        ip_info.send_replace(info);
+                    }
+                    Err(e) => {
+                        tracing::error!("Error loading network interface info: {e}");
+                        tracing::debug!("{e:?}");
+                    }
+                };
+                tokio::join!(watcher(ip_info.clone()), async {
+                    let res: Result<(), Error> = async {
+                        loop {
+                            if let Err(e) = async {
+                                let ip_info = { recv.borrow().clone() };
+                                Self::sync(&db, &ip_info).boxed().await?;
+
+                                Ok::<_, Error>(())
+                            }
+                            .await
+                            {
+                                tracing::error!("Error syncing ip info to db: {e}");
+                                tracing::debug!("{e:?}");
+                            }
+
+                            let _ = recv.changed().await;
+                        }
+                    }
+                    .await;
+                    if let Err(e) = res {
+                        tracing::error!("Error syncing ip info to db: {e}");
+                        tracing::debug!("{e:?}");
+                    }
+                });
+            })
+            .into(),
+            listeners: SyncMutex::new(BTreeMap::new()),
+        }
+    }
+
+    pub fn bind(&self, port: u16) -> Result<NetworkInterfaceListener, Error> {
+        let arc = Arc::new(());
+        self.listeners.mutate(|l| {
+            if l.get(&port).filter(|w| w.strong_count() > 0).is_some() {
+                return Err(Error::new(
+                    std::io::Error::from_raw_os_error(libc::EADDRINUSE),
+                    ErrorKind::Network,
+                ));
+            }
+            l.insert(port, Arc::downgrade(&arc));
+            Ok(())
+        })?;
+        let mut ip_info = self.ip_info.subscribe();
+        ip_info.mark_changed();
+        Ok(NetworkInterfaceListener {
+            _arc: arc,
+            ip_info,
+            changed: None,
+            listeners: ListenerMap::new(port),
+        })
+    }
+
+    pub fn upgrade_listener(
+        &self,
+        listener: impl IntoIterator<Item = TcpListener>,
+    ) -> Result<NetworkInterfaceListener, Error> {
+        let listeners = ListenerMap::from_listener(listener)?;
+        let port = listeners.port;
+        let arc = Arc::new(());
+        self.listeners.mutate(|l| {
+            if l.get(&port).filter(|w| w.strong_count() > 0).is_some() {
+                return Err(Error::new(
+                    std::io::Error::from_raw_os_error(libc::EADDRINUSE),
+                    ErrorKind::Network,
+                ));
+            }
+            l.insert(port, Arc::downgrade(&arc));
+            Ok(())
+        })?;
+        let mut ip_info = self.ip_info.subscribe();
+        ip_info.mark_changed();
+        Ok(NetworkInterfaceListener {
+            _arc: arc,
+            ip_info,
+            changed: None,
+            listeners,
+        })
+    }
+
+    pub async fn set_public(
+        &self,
+        interface: &InternedString,
+        public: Option<bool>,
+    ) -> Result<(), Error> {
+        let mut sub = self
+            .db
+            .subscribe(
+                "/public/serverInfo/networkInterfaces"
+                    .parse::<JsonPointer<_, _>>()
+                    .with_kind(ErrorKind::Database)?,
+            )
+            .await;
+        let mut err = None;
+        let changed = self.ip_info.send_if_modified(|ip_info| {
+            let prev = std::mem::replace(
+                &mut match ip_info.get_mut(interface).or_not_found(interface) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        err = Some(e);
+                        return false;
+                    }
+                }
+                .public,
+                public,
+            );
+            prev != public
+        });
+        if let Some(e) = err {
+            return Err(e);
+        }
+        if changed {
+            sub.recv().await;
+        }
+        Ok(())
+    }
+
+    pub async fn forget(&self, interface: &InternedString) -> Result<(), Error> {
+        let mut sub = self
+            .db
+            .subscribe(
+                "/public/serverInfo/networkInterfaces"
+                    .parse::<JsonPointer<_, _>>()
+                    .with_kind(ErrorKind::Database)?,
+            )
+            .await;
+        let mut err = None;
+        let changed = self.ip_info.send_if_modified(|ip_info| {
+            if ip_info
+                .get(interface)
+                .map_or(false, |i| i.ip_info.is_some())
+            {
+                err = Some(Error::new(
+                    eyre!("Cannot forget currently connected interface"),
+                    ErrorKind::InvalidRequest,
+                ));
+                return false;
+            }
+            ip_info.remove(interface).is_some()
+        });
+        if let Some(e) = err {
+            return Err(e);
+        }
+        if changed {
+            sub.recv().await;
+        }
+        Ok(())
+    }
+}
+
+struct ListenerMap {
+    prev_public: bool,
+    port: u16,
+    listeners: BTreeMap<SocketAddr, (TcpListener, bool, Option<Ipv4Addr>)>,
+}
+impl ListenerMap {
+    fn from_listener(listener: impl IntoIterator<Item = TcpListener>) -> Result<Self, Error> {
+        let mut prev_public = false;
+        let mut port = 0;
+        let mut listeners = BTreeMap::<SocketAddr, (TcpListener, bool, Option<Ipv4Addr>)>::new();
+        for listener in listener {
+            let mut local = listener.local_addr().with_kind(ErrorKind::Network)?;
+            if let SocketAddr::V6(l) = &mut local {
+                if ipv6_is_link_local(*l.ip()) && l.scope_id() == 0 {
+                    continue; // TODO determine scope id
+                }
+            }
+            if port != 0 && port != local.port() {
+                return Err(Error::new(
+                    eyre!("Provided listeners are bound to different ports"),
+                    ErrorKind::InvalidRequest,
+                ));
+            }
+            let public = match local.ip() {
+                IpAddr::V4(ip4) => {
+                    !ip4.is_loopback()
+                    && (!ip4.is_private() || ip4.octets().starts_with(&[10, 59])) // reserving 10.59 for public wireguard configurations
+                    && !ip4.is_link_local()
+                }
+                IpAddr::V6(ip6) => !ipv6_is_local(ip6),
+            };
+            prev_public |= public;
+            port = local.port();
+            listeners.insert(local, (listener, public, None));
+        }
+        if port == 0 {
+            return Err(Error::new(
+                eyre!("Listener array cannot be empty"),
+                ErrorKind::InvalidRequest,
+            ));
+        }
+        Ok(Self {
+            prev_public,
+            port,
+            listeners,
+        })
+    }
+}
+impl ListenerMap {
+    fn new(port: u16) -> Self {
+        Self {
+            prev_public: false,
+            port,
+            listeners: BTreeMap::new(),
+        }
+    }
+
+    #[instrument(skip(self))]
+    fn update(
+        &mut self,
+        ip_info: &BTreeMap<InternedString, NetworkInterfaceInfo>,
+        public: bool,
+    ) -> Result<(), Error> {
+        let mut keep = BTreeSet::<SocketAddr>::new();
+        for info in ip_info.values().chain([&NetworkInterfaceInfo {
+            public: Some(false),
+            ip_info: Some(IpInfo {
+                scope_id: 1,
+                device_type: None,
+                subnets: [
+                    IpNet::new(Ipv4Addr::LOCALHOST.into(), 8).unwrap(),
+                    IpNet::new(Ipv6Addr::LOCALHOST.into(), 128).unwrap(),
+                ]
+                .into_iter()
+                .collect(),
+                wan_ip: None,
+                ntp_servers: Default::default(),
+            }),
+        }]) {
+            if public || !info.public() {
+                if let Some(ip_info) = &info.ip_info {
+                    for ipnet in &ip_info.subnets {
+                        let addr = match ipnet.addr() {
+                            IpAddr::V6(ip6) => SocketAddrV6::new(
+                                ip6,
+                                self.port,
+                                0,
+                                if ipv6_is_link_local(ip6) {
+                                    ip_info.scope_id
+                                } else {
+                                    0
+                                },
+                            )
+                            .into(),
+                            ip => SocketAddr::new(ip, self.port),
+                        };
+                        keep.insert(addr);
+                        if let Some((_, is_public, wan_ip)) = self.listeners.get_mut(&addr) {
+                            *is_public = info.public();
+                            *wan_ip = info.ip_info.as_ref().and_then(|i| i.wan_ip);
+                            continue;
+                        }
+                        self.listeners.insert(
+                            addr,
+                            (
+                                TcpListener::from_std(
+                                    mio::net::TcpListener::bind(addr)
+                                        .with_ctx(|_| {
+                                            (
+                                                ErrorKind::Network,
+                                                lazy_format!("binding to {addr:?}"),
+                                            )
+                                        })?
+                                        .into(),
+                                )
+                                .with_kind(ErrorKind::Network)?,
+                                info.public(),
+                                info.ip_info.as_ref().and_then(|i| i.wan_ip),
+                            ),
+                        );
+                    }
+                }
+            }
+        }
+        self.listeners.retain(|key, _| keep.contains(key));
+        self.prev_public = public;
+        Ok(())
+    }
+    fn poll_accept(&self, cx: &mut std::task::Context<'_>) -> Poll<Result<Accepted, Error>> {
+        for (bind_addr, listener) in self.listeners.iter() {
+            if let Poll::Ready((stream, addr)) = listener.0.poll_accept(cx)? {
+                return Poll::Ready(Ok(Accepted {
+                    stream,
+                    peer: addr,
+                    is_public: listener.1,
+                    wan_ip: listener.2,
+                    bind: *bind_addr,
+                }));
+            }
+        }
+        Poll::Pending
+    }
+}
+
+pub struct NetworkInterfaceListener {
+    ip_info: watch::Receiver<BTreeMap<InternedString, NetworkInterfaceInfo>>,
+    listeners: ListenerMap,
+    changed: Option<Pin<Box<dyn Future<Output = ()> + Send + Sync + 'static>>>,
+    _arc: Arc<()>,
+}
+impl NetworkInterfaceListener {
+    pub fn port(&self) -> u16 {
+        self.listeners.port
+    }
+
+    fn poll_ip_info_changed(&mut self, cx: &mut std::task::Context<'_>) -> Poll<()> {
+        let mut changed = if let Some(changed) = self.changed.take() {
+            changed
+        } else {
+            let mut ip_info = self.ip_info.clone();
+            Box::pin(async move {
+                let _ = ip_info.changed().await;
+            })
+        };
+        let res = changed.poll_unpin(cx);
+        if res.is_pending() {
+            self.changed = Some(changed);
+        }
+        res
+    }
+
+    pub fn poll_accept(
+        &mut self,
+        cx: &mut std::task::Context<'_>,
+        public: bool,
+    ) -> Poll<Result<Accepted, Error>> {
+        if self.poll_ip_info_changed(cx).is_ready() || public != self.listeners.prev_public {
+            self.listeners.update(&*self.ip_info.borrow(), public)?;
+        }
+        self.listeners.poll_accept(cx)
+    }
+
+    pub async fn accept(&mut self, public: bool) -> Result<Accepted, Error> {
+        futures::future::poll_fn(|cx| self.poll_accept(cx, public)).await
+    }
+}
+
+pub struct Accepted {
+    pub stream: TcpStream,
+    pub peer: SocketAddr,
+    pub is_public: bool,
+    pub wan_ip: Option<Ipv4Addr>,
+    pub bind: SocketAddr,
+}
+
+// async fn _ips() -> Result<BTreeSet<IpAddr>, Error> {
+//     Ok(init_ips()
+//         .await?
+//         .values()
+//         .flat_map(|i| {
+//             std::iter::empty()
+//                 .chain(i.ipv4.map(IpAddr::from))
+//                 .chain(i.ipv6.map(IpAddr::from))
+//         })
+//         .collect())
+// }
+
+// pub async fn ips() -> Result<BTreeSet<IpAddr>, Error> {
+//     let ips = CACHED_IPS.read().await.clone();
+//     if !ips.is_empty() {
+//         return Ok(ips);
+//     }
+//     let ips = _ips().await?;
+//     *CACHED_IPS.write().await = ips.clone();
+//     Ok(ips)
+// }
+
+// pub async fn init_ips() -> Result<BTreeMap<String, IpInfo>, Error> {
+//     let mut res = BTreeMap::new();
+//     let mut ifaces = list_interfaces();
+//     while let Some(iface) = ifaces.try_next().await? {
+//         if iface_is_physical(&iface).await {
+//             let ip_info = IpInfo::for_interface(&iface).await?;
+//             res.insert(iface, ip_info);
+//         }
+//     }
+//     Ok(res)
+// }
+
+// // #[command(subcommands(update))]
+// pub fn dhcp<C: Context>() -> ParentHandler<C> {
+//     ParentHandler::new().subcommand(
+//         "update",
+//         from_fn_async::<_, _, (), Error, (RpcContext, UpdateParams)>(update)
+//             .no_display()
+//             .with_about("Update IP assigned by dhcp")
+//             .with_call_remote::<CliContext>(),
+//     )
+// }
+// #[derive(Deserialize, Serialize, Parser, TS)]
+// #[serde(rename_all = "camelCase")]
+// #[command(rename_all = "kebab-case")]
+// pub struct UpdateParams {
+//     interface: String,
+// }
+
+// pub async fn update(
+//     ctx: RpcContext,
+//     UpdateParams { interface }: UpdateParams,
+// ) -> Result<(), Error> {
+//     if iface_is_physical(&interface).await {
+//         let ip_info = IpInfo::for_interface(&interface).await?;
+//         ctx.db
+//             .mutate(|db| {
+//                 db.as_public_mut()
+//                     .as_server_info_mut()
+//                     .as_ip_info_mut()
+//                     .insert(&interface, &ip_info)
+//             })
+//             .await?;
+
+//         let mut cached = CACHED_IPS.write().await;
+//         if cached.is_empty() {
+//             *cached = _ips().await?;
+//         } else {
+//             cached.extend(
+//                 std::iter::empty()
+//                     .chain(ip_info.ipv4.map(IpAddr::from))
+//                     .chain(ip_info.ipv6.map(IpAddr::from)),
+//             );
+//         }
+//     }
+//     Ok(())
+// }
diff --git a/core/startos/src/net/service_interface.rs b/core/startos/src/net/service_interface.rs
index ade10d959..ad2900da7 100644
--- a/core/startos/src/net/service_interface.rs
+++ b/core/startos/src/net/service_interface.rs
@@ -12,7 +12,8 @@ use ts_rs::TS;
 #[serde(tag = "kind")]
 pub enum HostnameInfo {
     Ip {
-        network_interface_id: String,
+        #[ts(type = "string")]
+        network_interface_id: InternedString,
         public: bool,
         hostname: IpHostname,
     },
@@ -43,6 +44,8 @@ pub enum IpHostname {
     },
     Ipv6 {
         value: Ipv6Addr,
+        #[serde(default)]
+        scope_id: u32,
         port: Option<u16>,
         ssl_port: Option<u16>,
     },
@@ -69,7 +72,6 @@ pub struct ServiceInterface {
     pub id: ServiceInterfaceId,
     pub name: String,
     pub description: String,
-    pub has_primary: bool,
     pub masked: bool,
     pub address_info: AddressInfo,
     #[serde(rename = "type")]
diff --git a/core/startos/src/net/ssl.rs b/core/startos/src/net/ssl.rs
index 29bcd9652..a89853591 100644
--- a/core/startos/src/net/ssl.rs
+++ b/core/startos/src/net/ssl.rs
@@ -17,7 +17,6 @@ use openssl::x509::{X509Builder, X509Extension, X509NameBuilder, X509};
 use openssl::*;
 use patch_db::HasModel;
 use serde::{Deserialize, Serialize};
-use tokio::time::Instant;
 use tracing::instrument;
 
 use crate::account::AccountInfo;
diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs
index c070d7920..d1070f9e1 100644
--- a/core/startos/src/net/static_server.rs
+++ b/core/startos/src/net/static_server.rs
@@ -8,15 +8,15 @@ use std::time::UNIX_EPOCH;
 use async_compression::tokio::bufread::GzipEncoder;
 use axum::body::Body;
 use axum::extract::{self as x, Request};
-use axum::response::Response;
-use axum::routing::{any, get, post};
+use axum::response::{Redirect, Response};
+use axum::routing::{any, get};
 use axum::Router;
 use base64::display::Base64Display;
 use digest::Digest;
 use futures::future::ready;
 use http::header::{
     ACCEPT_ENCODING, ACCEPT_RANGES, CACHE_CONTROL, CONNECTION, CONTENT_ENCODING, CONTENT_LENGTH,
-    CONTENT_RANGE, CONTENT_TYPE, ETAG, RANGE,
+    CONTENT_RANGE, CONTENT_TYPE, ETAG, HOST, RANGE,
 };
 use http::request::Parts as RequestParts;
 use http::{HeaderValue, Method, StatusCode};
@@ -26,7 +26,6 @@ use new_mime_guess::MimeGuess;
 use openssl::hash::MessageDigest;
 use openssl::x509::X509;
 use rpc_toolkit::{Context, HttpServer, Server};
-use sqlx::query;
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeekExt, BufReader};
 use tokio_util::io::ReaderStream;
 use url::Url;
@@ -47,7 +46,7 @@ use crate::s9pk::S9pk;
 use crate::util::io::open_file;
 use crate::util::net::SyncBody;
 use crate::util::serde::BASE64;
-use crate::{diagnostic_api, init_api, install_api, main_api, setup_api};
+use crate::{diagnostic_api, init_api, install_api, main_api, setup_api, DATA_DIR};
 
 const NOT_FOUND: &[u8] = b"Not Found";
 const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
@@ -230,6 +229,20 @@ pub fn refresher() -> Router {
     }))
 }
 
+pub fn redirecter() -> Router {
+    Router::new().fallback(get(|request: Request| async move {
+        Redirect::temporary(&format!(
+            "https://{}{}",
+            request
+                .headers()
+                .get(HOST)
+                .and_then(|s| s.to_str().ok())
+                .unwrap_or("localhost"),
+            request.uri()
+        ))
+    }))
+}
+
 async fn proxy_request(ctx: RpcContext, request: Request, url: String) -> Result<Response, Error> {
     if_authorized(&ctx, request, |mut request| async {
         for header in PROXY_STRIP_HEADERS {
@@ -253,7 +266,7 @@ fn s9pk_router(ctx: RpcContext) -> Router {
                         let (parts, _) = request.into_parts();
                         match FileData::from_path(
                             &parts,
-                            &ctx.datadir
+                            &Path::new(DATA_DIR)
                                 .join(PKG_ARCHIVE_DIR)
                                 .join("installed")
                                 .join(s9pk),
@@ -279,7 +292,7 @@ fn s9pk_router(ctx: RpcContext) -> Router {
                         let s9pk = S9pk::deserialize(
                             &MultiCursorFile::from(
                                 open_file(
-                                    ctx.datadir
+                                    Path::new(DATA_DIR)
                                         .join(PKG_ARCHIVE_DIR)
                                         .join("installed")
                                         .join(s9pk),
diff --git a/core/startos/src/net/utils.rs b/core/startos/src/net/utils.rs
index 9cba8a0cd..d6dcdde15 100644
--- a/core/startos/src/net/utils.rs
+++ b/core/startos/src/net/utils.rs
@@ -1,16 +1,25 @@
-use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV6};
 use std::path::Path;
 
 use async_stream::try_stream;
 use color_eyre::eyre::eyre;
 use futures::stream::BoxStream;
 use futures::{StreamExt, TryStreamExt};
-use ipnet::{Ipv4Net, Ipv6Net};
+use ipnet::{IpNet, Ipv4Net, Ipv6Net};
+use nix::net::if_::if_nametoindex;
 use tokio::net::{TcpListener, TcpStream};
 use tokio::process::Command;
 
+use crate::prelude::*;
 use crate::util::Invoke;
-use crate::Error;
+
+pub fn ipv6_is_link_local(addr: Ipv6Addr) -> bool {
+    (addr.segments()[0] & 0xffc0) == 0xfe80
+}
+
+pub fn ipv6_is_local(addr: Ipv6Addr) -> bool {
+    addr.is_loopback() || (addr.segments()[0] & 0xfe00) == 0xfc00 || ipv6_is_link_local(addr)
+}
 
 fn parse_iface_ip(output: &str) -> Result<Vec<&str>, Error> {
     let output = output.trim();
@@ -112,6 +121,52 @@ pub async fn find_eth_iface() -> Result<String, Error> {
     ))
 }
 
+pub async fn all_socket_addrs_for(port: u16) -> Result<Vec<SocketAddr>, Error> {
+    let mut res = Vec::new();
+
+    let raw = String::from_utf8(
+        Command::new("ip")
+            .arg("-o")
+            .arg("addr")
+            .arg("show")
+            .invoke(ErrorKind::ParseSysInfo)
+            .await?,
+    )?;
+    let err = |item: &str, lineno: usize, line: &str| {
+        Error::new(
+            eyre!("failed to parse ip info ({item}[line:{lineno}]) from {line:?}"),
+            ErrorKind::ParseSysInfo,
+        )
+    };
+    for (idx, line) in raw
+        .lines()
+        .map(|l| l.trim())
+        .enumerate()
+        .filter(|(_, l)| !l.is_empty())
+    {
+        let mut split = line.split_whitespace();
+        let _num = split.next();
+        let ifname = split.next().ok_or_else(|| err("ifname", idx, line))?;
+        let _kind = split.next();
+        let ipnet_str = split.next().ok_or_else(|| err("ipnet", idx, line))?;
+        let ipnet = ipnet_str
+            .parse::<IpNet>()
+            .with_ctx(|_| (ErrorKind::ParseSysInfo, err("ipnet", idx, ipnet_str)))?;
+        match ipnet.addr() {
+            IpAddr::V4(ip4) => res.push(SocketAddr::new(ip4.into(), port)),
+            IpAddr::V6(ip6) => res.push(SocketAddr::V6(SocketAddrV6::new(
+                ip6,
+                port,
+                0,
+                if_nametoindex(ifname)
+                    .with_ctx(|_| (ErrorKind::ParseSysInfo, "reading scope_id"))?,
+            ))),
+        }
+    }
+
+    Ok(res)
+}
+
 pub struct TcpListeners {
     listeners: Vec<TcpListener>,
 }
diff --git a/core/startos/src/net/vhost.rs b/core/startos/src/net/vhost.rs
index fb7c6f957..dc6f422bf 100644
--- a/core/startos/src/net/vhost.rs
+++ b/core/startos/src/net/vhost.rs
@@ -1,22 +1,24 @@
-use std::collections::BTreeMap;
-use std::net::{IpAddr, Ipv6Addr, SocketAddr};
+use std::collections::{BTreeMap, BTreeSet};
+use std::net::{IpAddr, SocketAddr};
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
-use async_acme::acme::ACME_TLS_ALPN_NAME;
+use async_acme::acme::{Identifier, ACME_TLS_ALPN_NAME};
 use axum::body::Body;
 use axum::extract::Request;
 use axum::response::Response;
 use color_eyre::eyre::eyre;
+use futures::FutureExt;
 use helpers::NonDetachingJoinHandle;
 use http::Uri;
 use imbl_value::InternedString;
 use models::ResultExt;
+use rpc_toolkit::{from_fn, Context, HandlerArgs, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncWriteExt;
-use tokio::net::{TcpListener, TcpStream};
-use tokio::sync::{watch, Mutex, RwLock};
+use tokio::net::TcpStream;
+use tokio::sync::watch;
 use tokio_rustls::rustls::crypto::CryptoProvider;
 use tokio_rustls::rustls::pki_types::{
     CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer, ServerName,
@@ -30,14 +32,61 @@ use tokio_stream::StreamExt;
 use tracing::instrument;
 use ts_rs::TS;
 
+use crate::context::{CliContext, RpcContext};
 use crate::db::model::Database;
-use crate::net::acme::AcmeCertCache;
+use crate::net::acme::{AcmeCertCache, AcmeProvider};
+use crate::net::network_interface::{
+    Accepted, NetworkInterfaceController, NetworkInterfaceListener,
+};
 use crate::net::static_server::server_error;
 use crate::prelude::*;
 use crate::util::io::BackTrackingIO;
-use crate::util::serde::MaybeUtf8String;
+use crate::util::serde::{display_serializable, HandlerExtSerde, MaybeUtf8String};
 use crate::util::sync::SyncMutex;
 
+pub fn vhost_api<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new().subcommand(
+        "dump-table",
+        from_fn(|ctx: RpcContext| Ok(ctx.net_controller.vhost.dump_table()))
+            .with_display_serializable()
+            .with_custom_display_fn(|HandlerArgs { params, .. }, res| {
+                use prettytable::*;
+
+                if let Some(format) = params.format {
+                    display_serializable(format, res);
+                    return Ok::<_, Error>(());
+                }
+
+                let mut table = Table::new();
+                table.add_row(row![bc => "FROM", "TO", "PUBLIC", "ACME", "CONNECT SSL", "ACTIVE"]);
+
+                for (external, targets) in res {
+                    for (host, targets) in targets {
+                        for (idx, target) in targets.into_iter().enumerate() {
+                            table.add_row(row![
+                                format!(
+                                    "{}:{}",
+                                    host.as_ref().map(|s| &**s).unwrap_or("*"),
+                                    external.0
+                                ),
+                                target.addr,
+                                target.public,
+                                target.acme.as_ref().map(|a| a.0.as_str()).unwrap_or("NONE"),
+                                target.connect_ssl.is_ok(),
+                                idx == 0
+                            ]);
+                        }
+                    }
+                }
+
+                table.print_tty(false)?;
+
+                Ok(())
+            })
+            .with_call_remote::<CliContext>(),
+    )
+}
+
 #[derive(Debug)]
 struct SingleCertResolver(Arc<CertifiedKey>);
 impl ResolvesServerCert for SingleCertResolver {
@@ -49,62 +98,108 @@ impl ResolvesServerCert for SingleCertResolver {
 // not allowed: <=1024, >=32768, 5355, 5432, 9050, 6010, 9051, 5353
 
 pub struct VHostController {
-    crypto_provider: Arc<CryptoProvider>,
     db: TypedPatchDb<Database>,
-    servers: Mutex<BTreeMap<u16, VHostServer>>,
+    interfaces: Arc<NetworkInterfaceController>,
+    crypto_provider: Arc<CryptoProvider>,
+    acme_tls_alpn_cache: AcmeTlsAlpnCache,
+    servers: SyncMutex<BTreeMap<u16, VHostServer>>,
 }
 impl VHostController {
-    pub fn new(db: TypedPatchDb<Database>) -> Self {
+    pub fn new(db: TypedPatchDb<Database>, interfaces: Arc<NetworkInterfaceController>) -> Self {
         Self {
-            crypto_provider: Arc::new(tokio_rustls::rustls::crypto::ring::default_provider()),
             db,
-            servers: Mutex::new(BTreeMap::new()),
+            interfaces,
+            crypto_provider: Arc::new(tokio_rustls::rustls::crypto::ring::default_provider()),
+            acme_tls_alpn_cache: Arc::new(SyncMutex::new(BTreeMap::new())),
+            servers: SyncMutex::new(BTreeMap::new()),
         }
     }
     #[instrument(skip_all)]
-    pub async fn add(
+    pub fn add(
         &self,
         hostname: Option<InternedString>,
         external: u16,
-        target: SocketAddr,
-        connect_ssl: Result<(), AlpnInfo>, // Ok: yes, connect using ssl, pass through alpn; Err: connect tcp, use provided strategy for alpn
+        TargetInfo {
+            public,
+            acme,
+            addr,
+            connect_ssl,
+        }: TargetInfo,
     ) -> Result<Arc<()>, Error> {
-        let mut writable = self.servers.lock().await;
-        let server = if let Some(server) = writable.remove(&external) {
-            server
-        } else {
-            tracing::info!("Listening on {external}");
-            VHostServer::new(external, self.db.clone(), self.crypto_provider.clone()).await?
-        };
-        let rc = server
-            .add(
+        self.servers.mutate(|writable| {
+            let server = if let Some(server) = writable.remove(&external) {
+                server
+            } else {
+                VHostServer::new(
+                    external,
+                    self.db.clone(),
+                    self.interfaces.clone(),
+                    self.crypto_provider.clone(),
+                    self.acme_tls_alpn_cache.clone(),
+                )?
+            };
+            let rc = server.add(
                 hostname,
                 TargetInfo {
-                    addr: target,
+                    public,
+                    acme,
+                    addr,
                     connect_ssl,
                 },
-            )
-            .await;
-        writable.insert(external, server);
-        Ok(rc?)
+            );
+            writable.insert(external, server);
+            Ok(rc?)
+        })
     }
+
+    pub fn dump_table(
+        &self,
+    ) -> BTreeMap<JsonKey<u16>, BTreeMap<JsonKey<Option<InternedString>>, BTreeSet<TargetInfo>>>
+    {
+        self.servers.peek(|s| {
+            s.iter()
+                .map(|(k, v)| {
+                    (
+                        JsonKey::new(*k),
+                        v.mapping
+                            .borrow()
+                            .iter()
+                            .map(|(k, v)| {
+                                (
+                                    JsonKey::new(k.clone()),
+                                    v.iter()
+                                        .filter(|(_, v)| v.strong_count() > 0)
+                                        .map(|(k, _)| k)
+                                        .cloned()
+                                        .collect(),
+                                )
+                            })
+                            .collect(),
+                    )
+                })
+                .collect()
+        })
+    }
+
     #[instrument(skip_all)]
-    pub async fn gc(&self, hostname: Option<InternedString>, external: u16) -> Result<(), Error> {
-        let mut writable = self.servers.lock().await;
-        if let Some(server) = writable.remove(&external) {
-            server.gc(hostname).await?;
-            if !server.is_empty().await? {
-                writable.insert(external, server);
+    pub fn gc(&self, hostname: Option<InternedString>, external: u16) {
+        self.servers.mutate(|writable| {
+            if let Some(server) = writable.remove(&external) {
+                server.gc(hostname);
+                if !server.is_empty() {
+                    writable.insert(external, server);
+                }
             }
-        }
-        Ok(())
+        })
     }
 }
 
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
-struct TargetInfo {
-    addr: SocketAddr,
-    connect_ssl: Result<(), AlpnInfo>,
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
+pub struct TargetInfo {
+    pub public: bool,
+    pub acme: Option<AcmeProvider>,
+    pub addr: SocketAddr,
+    pub connect_ssl: Result<(), AlpnInfo>, // Ok: yes, connect using ssl, pass through alpn; Err: connect tcp, use provided strategy for alpn
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
@@ -120,425 +215,498 @@ impl Default for AlpnInfo {
     }
 }
 
+type AcmeTlsAlpnCache =
+    Arc<SyncMutex<BTreeMap<InternedString, watch::Receiver<Option<Arc<CertifiedKey>>>>>>;
+type Mapping = BTreeMap<Option<InternedString>, BTreeMap<TargetInfo, Weak<()>>>;
+
 struct VHostServer {
-    mapping: Weak<RwLock<BTreeMap<Option<InternedString>, BTreeMap<TargetInfo, Weak<()>>>>>,
+    mapping: watch::Sender<Mapping>,
     _thread: NonDetachingJoinHandle<()>,
 }
+
 impl VHostServer {
-    #[instrument(skip_all)]
-    async fn new(
-        port: u16,
+    async fn accept(
+        listener: &mut NetworkInterfaceListener,
+        mut mapping: watch::Receiver<Mapping>,
         db: TypedPatchDb<Database>,
+        acme_tls_alpn_cache: AcmeTlsAlpnCache,
         crypto_provider: Arc<CryptoProvider>,
-    ) -> Result<Self, Error> {
-        let acme_tls_alpn_cache = Arc::new(SyncMutex::new(BTreeMap::<
-            InternedString,
-            watch::Receiver<Option<Arc<CertifiedKey>>>,
-        >::new()));
-        // check if port allowed
-        let listener = TcpListener::bind(SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), port))
-            .await
-            .with_kind(crate::ErrorKind::Network)?;
-        let mapping = Arc::new(RwLock::new(BTreeMap::new()));
-        Ok(Self {
-            mapping: Arc::downgrade(&mapping),
-            _thread: tokio::spawn(async move {
-                loop {
-                    match listener.accept().await {
-                        Ok((stream, _)) => {
-                            if let Err(e) = socket2::SockRef::from(&stream).set_tcp_keepalive(
-                                &socket2::TcpKeepalive::new()
-                                    .with_time(Duration::from_secs(900))
-                                    .with_interval(Duration::from_secs(60))
-                                    .with_retries(5),
-                            ) {
-                                tracing::error!("Failed to set tcp keepalive: {e}");
-                                tracing::debug!("{e:?}");
-                            }
+    ) -> Result<(), Error> {
+        let accepted;
 
-                            let mut stream = BackTrackingIO::new(stream);
-                            let mapping = mapping.clone();
-                            let db = db.clone();
-                            let acme_tls_alpn_cache = acme_tls_alpn_cache.clone();
-                            let crypto_provider = crypto_provider.clone();
-                            tokio::spawn(async move {
-                                if let Err(e) = async {
-                                    let mid: tokio_rustls::StartHandshake<&mut BackTrackingIO<TcpStream>> = match LazyConfigAcceptor::new(
-                                        Acceptor::default(),
-                                        &mut stream,
-                                    )
-                                    .await
-                                    {
-                                        Ok(a) => a,
-                                        Err(_) => {
-                                            stream.rewind();
-                                            return hyper_util::server::conn::auto::Builder::new(hyper_util::rt::TokioExecutor::new())
-                                                .serve_connection(
-                                                    hyper_util::rt::TokioIo::new(stream),
-                                                    hyper_util::service::TowerToHyperService::new(axum::Router::new().fallback(
-                                                        axum::routing::method_routing::any(move |req: Request| async move {
-                                                            match async move {
-                                                                let host = req
-                                                                    .headers()
-                                                                    .get(http::header::HOST)
-                                                                    .and_then(|host| host.to_str().ok());
-                                                                let uri = Uri::from_parts({
-                                                                    let mut parts = req.uri().to_owned().into_parts();
-                                                                    parts.scheme = Some("https".parse()?);
-                                                                    parts.authority = host.map(FromStr::from_str).transpose()?;
-                                                                    parts
-                                                                })?;
-                                                                Response::builder()
-                                                                    .status(http::StatusCode::TEMPORARY_REDIRECT)
-                                                                    .header(http::header::LOCATION, uri.to_string())
-                                                                    .body(Body::default())
-                                                            }.await {
-                                                                Ok(a) => a,
-                                                                Err(e) => {
-                                                                    tracing::warn!("Error redirecting http request on ssl port: {e}");
-                                                                    tracing::error!("{e:?}");
-                                                                    server_error(Error::new(e, ErrorKind::Network))
-                                                                }
-                                                            }
-                                                        }),
-                                                    )),
-                                                )
-                                                .await
-                                                .map_err(|e| Error::new(color_eyre::eyre::Report::msg(e), ErrorKind::Network));
-                                        }
-                                    };
-                                    let target_name =
-                                        mid.client_hello().server_name().map(|s| s.into());
-                                    let target = {
-                                        let mapping = mapping.read().await;
-                                        mapping
-                                            .get(&target_name)
-                                            .into_iter()
-                                            .flatten()
-                                            .find(|(_, rc)| rc.strong_count() > 0)
-                                            .or_else(|| {
-                                                if target_name
-                                                    .as_ref()
-                                                    .map(|s| s.parse::<IpAddr>().is_ok())
-                                                    .unwrap_or(true)
-                                                {
-                                                    mapping
-                                                        .get(&None)
-                                                        .into_iter()
-                                                        .flatten()
-                                                        .find(|(_, rc)| rc.strong_count() > 0)
-                                                } else {
-                                                    None
-                                                }
-                                            })
-                                            .map(|(target, _)| target.clone())
-                                    };
-                                    if let Some(target) = target {
-                                        let peek = db.peek().await;
-                                        let root = peek.as_private().as_key_store().as_local_certs().as_root_cert().de()?;
-                                        let mut cfg = match async {
-                                            if let Some(acme_settings) = peek.as_public().as_server_info().as_acme().de()? {
-                                                if let Some(domain) = target_name.as_ref().filter(|target_name| acme_settings.domains.contains(*target_name)) {
-                                                    if mid
-                                                        .client_hello()
-                                                        .alpn()
-                                                        .into_iter()
-                                                        .flatten()
-                                                        .any(|alpn| alpn == ACME_TLS_ALPN_NAME)
-                                                    {
-                                                        let cert = WatchStream::new(
-                                                            acme_tls_alpn_cache.peek(|c| c.get(&**domain).cloned())
-                                                                .ok_or_else(|| {
-                                                                    Error::new(
-                                                                        eyre!("No challenge recv available for {domain}"),
-                                                                        ErrorKind::OpenSsl
-                                                                    )
-                                                                })?,
-                                                        );
-                                                        tracing::info!("Waiting for verification cert for {domain}");
-                                                        let cert = cert
-                                                            .filter(|c| c.is_some())
-                                                            .next()
-                                                            .await
-                                                            .flatten()
-                                                            .ok_or_else(|| {
-                                                                Error::new(eyre!("No challenge available for {domain}"), ErrorKind::OpenSsl)
-                                                            })?;
-                                                        tracing::info!("Verification cert received for {domain}");
-                                                        let mut cfg = ServerConfig::builder_with_provider(crypto_provider.clone())
-                                                            .with_safe_default_protocol_versions()
-                                                            .with_kind(crate::ErrorKind::OpenSsl)?
-                                                            .with_no_client_auth()
-                                                            .with_cert_resolver(Arc::new(SingleCertResolver(cert)));
+        loop {
+            let any_public = mapping
+                .borrow()
+                .iter()
+                .any(|(_, targets)| targets.iter().any(|(target, _)| target.public));
 
-                                                        cfg.alpn_protocols = vec![ACME_TLS_ALPN_NAME.to_vec()];
-                                                        return Ok(Err(cfg));
-                                                    } else {
-                                                        let domains = [domain.to_string()];
-                                                        let (send, recv) = watch::channel(None);
-                                                        acme_tls_alpn_cache.mutate(|c| c.insert(domain.clone(), recv));
-                                                        let cert =
-                                                            async_acme::rustls_helper::order(
-                                                                |_, cert| {
-                                                                    send.send_replace(Some(Arc::new(cert)));
-                                                                    Ok(())
-                                                                },
-                                                                acme_settings.provider.as_str(),
-                                                                &domains,
-                                                                Some(&AcmeCertCache(&db)),
-                                                                &acme_settings.contact,
-                                                            )
-                                                            .await
-                                                            .with_kind(ErrorKind::OpenSsl)?;
-                                                        return Ok(Ok(
-                                                                ServerConfig::builder_with_provider(crypto_provider.clone())
-                                                                    .with_safe_default_protocol_versions()
-                                                                    .with_kind(crate::ErrorKind::OpenSsl)?
-                                                                    .with_no_client_auth()
-                                                                    .with_cert_resolver(Arc::new(SingleCertResolver(Arc::new(cert))))
-                                                            ));
-                                                    }
-                                                }
-                                            }
-                                            let hostnames = target_name
-                                                .into_iter()
-                                                .chain(
-                                                    peek
-                                                        .as_public()
-                                                        .as_server_info()
-                                                        .as_ip_info()
-                                                        .as_entries()?
-                                                        .into_iter()
-                                                        .flat_map(|(_, ips)| [
-                                                            ips.as_ipv4().de().map(|ip| ip.map(IpAddr::V4)),
-                                                            ips.as_ipv6().de().map(|ip| ip.map(IpAddr::V6))
-                                                        ])
-                                                        .filter_map(|a| a.transpose())
-                                                        .map(|a| a.map(|ip| InternedString::from_display(&ip)))
-                                                        .collect::<Result<Vec<_>, _>>()?,
-                                                )
-                                                .collect();
-                                            let key = db
-                                                .mutate(|v| {
-                                                    v.as_private_mut()
-                                                        .as_key_store_mut()
-                                                        .as_local_certs_mut()
-                                                        .cert_for(&hostnames)
-                                                })
-                                                .await?;
-                                            let cfg = ServerConfig::builder_with_provider(crypto_provider.clone())
-                                                .with_safe_default_protocol_versions()
-                                                .with_kind(crate::ErrorKind::OpenSsl)?
-                                                .with_no_client_auth();
-                                            if mid.client_hello().signature_schemes().contains(
-                                                &tokio_rustls::rustls::SignatureScheme::ED25519,
-                                            ) {
-                                                cfg.with_single_cert(
-                                                    key.fullchain_ed25519()
-                                                        .into_iter()
-                                                        .map(|c| {
-                                                            Ok(tokio_rustls::rustls::pki_types::CertificateDer::from(
-                                                                c.to_der()?,
-                                                            ))
-                                                        })
-                                                        .collect::<Result<_, Error>>()?,
-                                                    PrivateKeyDer::from(PrivatePkcs8KeyDer::from(
-                                                        key.leaf
-                                                            .keys
-                                                            .ed25519
-                                                            .private_key_to_pkcs8()?,
-                                                    )),
-                                                )
-                                            } else {
-                                                cfg.with_single_cert(
-                                                    key.fullchain_nistp256()
-                                                        .into_iter()
-                                                        .map(|c| {
-                                                            Ok(tokio_rustls::rustls::pki_types::CertificateDer::from(
-                                                                c.to_der()?,
-                                                            ))
-                                                        })
-                                                        .collect::<Result<_, Error>>()?,
-                                                    PrivateKeyDer::from(PrivatePkcs8KeyDer::from(
-                                                        key.leaf
-                                                            .keys
-                                                            .nistp256
-                                                            .private_key_to_pkcs8()?,
-                                                    )),
-                                                )
-                                            }
-                                            .with_kind(crate::ErrorKind::OpenSsl)
-                                            .map(Ok)
-                                        }.await? {
+            let changed_public = mapping
+                .wait_for(|m| {
+                    m.iter()
+                        .any(|(_, targets)| targets.iter().any(|(target, _)| target.public))
+                        != any_public
+                })
+                .boxed();
+
+            tokio::select! {
+                a = listener.accept(any_public) => {
+                    accepted = a?;
+                    break;
+                }
+                _ = changed_public => {
+                    tracing::debug!("port {} {} public bindings", listener.port(), if any_public { "no longer has" } else { "now has" });
+                }
+            }
+        }
+
+        if let Err(e) = socket2::SockRef::from(&accepted.stream).set_tcp_keepalive(
+            &socket2::TcpKeepalive::new()
+                .with_time(Duration::from_secs(900))
+                .with_interval(Duration::from_secs(60))
+                .with_retries(5),
+        ) {
+            tracing::error!("Failed to set tcp keepalive: {e}");
+            tracing::debug!("{e:?}");
+        }
+
+        tokio::spawn(async move {
+            let bind = accepted.bind;
+            if let Err(e) =
+                Self::handle_stream(accepted, mapping, db, acme_tls_alpn_cache, crypto_provider)
+                    .await
+            {
+                tracing::error!("Error in VHostController on {bind}: {e}");
+                tracing::debug!("{e:?}")
+            }
+        });
+        Ok(())
+    }
+
+    async fn handle_stream(
+        Accepted {
+            stream,
+            is_public,
+            wan_ip,
+            bind,
+            ..
+        }: Accepted,
+        mapping: watch::Receiver<Mapping>,
+        db: TypedPatchDb<Database>,
+        acme_tls_alpn_cache: AcmeTlsAlpnCache,
+        crypto_provider: Arc<CryptoProvider>,
+    ) -> Result<(), Error> {
+        let mut stream = BackTrackingIO::new(stream);
+        let mid: tokio_rustls::StartHandshake<&mut BackTrackingIO<TcpStream>> =
+            match LazyConfigAcceptor::new(Acceptor::default(), &mut stream).await {
+                Ok(a) => a,
+                Err(e) => {
+                    let (_, buf) = stream.rewind();
+                    if std::str::from_utf8(buf)
+                        .ok()
+                        .and_then(|buf| {
+                            buf.lines()
+                                .map(|l| l.trim())
+                                .filter(|l| !l.is_empty())
+                                .next()
+                        })
+                        .map_or(false, |buf| {
+                            regex::Regex::new("[A-Z]+ (.+) HTTP/1")
+                                .unwrap()
+                                .is_match(buf)
+                        })
+                    {
+                        return hyper_util::server::conn::auto::Builder::new(
+                            hyper_util::rt::TokioExecutor::new(),
+                        )
+                        .serve_connection(
+                            hyper_util::rt::TokioIo::new(stream),
+                            hyper_util::service::TowerToHyperService::new(
+                                axum::Router::new().fallback(axum::routing::method_routing::any(
+                                    move |req: Request| async move {
+                                        match async move {
+                                            let host = req
+                                                .headers()
+                                                .get(http::header::HOST)
+                                                .and_then(|host| host.to_str().ok());
+                                            let uri = Uri::from_parts({
+                                                let mut parts = req.uri().to_owned().into_parts();
+                                                parts.scheme = Some("https".parse()?);
+                                                parts.authority =
+                                                    host.map(FromStr::from_str).transpose()?;
+                                                parts
+                                            })?;
+                                            Response::builder()
+                                                .status(http::StatusCode::TEMPORARY_REDIRECT)
+                                                .header(http::header::LOCATION, uri.to_string())
+                                                .body(Body::default())
+                                        }
+                                        .await
+                                        {
                                             Ok(a) => a,
-                                            Err(cfg) => {
-                                                tracing::info!("performing ACME auth challenge");
-                                                let mut accept = mid.into_stream(Arc::new(cfg));
-                                                let io = accept.get_mut().unwrap();
-                                                let buffered = io.stop_buffering();
-                                                io.write_all(&buffered).await?;
-                                                accept.await?;
-                                                tracing::info!("ACME auth challenge completed");
-                                                return Ok(());
-                                            }
-                                        };
-                                        let mut tcp_stream =
-                                            TcpStream::connect(target.addr).await?;
-                                        match target.connect_ssl {
-                                            Ok(()) => {
-                                                let mut client_cfg =
-                                                tokio_rustls::rustls::ClientConfig::builder_with_provider(crypto_provider)
-                                                        .with_safe_default_protocol_versions()
-                                                        .with_kind(crate::ErrorKind::OpenSsl)?
-                                                        .with_root_certificates({
-                                                            let mut store = RootCertStore::empty();
-                                                            store.add(
-                                                        CertificateDer::from(
-                                                            root.to_der()?,
-                                                        ),
-                                                    ).with_kind(crate::ErrorKind::OpenSsl)?;
-                                                            store
-                                                        })
-                                                        .with_no_client_auth();
-                                                client_cfg.alpn_protocols = mid
-                                                    .client_hello()
-                                                    .alpn()
-                                                    .into_iter()
-                                                    .flatten()
-                                                    .map(|x| x.to_vec())
-                                                    .collect();
-                                                let mut target_stream =
-                                                    TlsConnector::from(Arc::new(client_cfg))
-                                                        .connect_with(
-                                                            ServerName::IpAddress(
-                                                                target.addr.ip().into(),
-                                                            ),
-                                                            tcp_stream,
-                                                            |conn| {
-                                                                cfg.alpn_protocols.extend(
-                                                                    conn.alpn_protocol()
-                                                                        .into_iter()
-                                                                        .map(|p| p.to_vec()),
-                                                                )
-                                                            },
-                                                        )
-                                                        .await
-                                                        .with_kind(crate::ErrorKind::OpenSsl)?;
-                                                let mut accept = mid.into_stream(Arc::new(cfg));
-                                                let io = accept.get_mut().unwrap();
-                                                let buffered = io.stop_buffering();
-                                                io.write_all(&buffered).await?;
-                                                let mut tls_stream =
-                                                    match accept.await {
-                                                        Ok(a) => a,
-                                                        Err(e) => {
-                                                            tracing::trace!( "VHostController: failed to accept TLS connection on port {port}: {e}");
-                                                            tracing::trace!("{e:?}");
-                                                            return Ok(())
-                                                        }
-                                                    };
-                                                tokio::io::copy_bidirectional(
-                                                    &mut tls_stream,
-                                                    &mut target_stream,
-                                                )
-                                                .await
-                                            }
-                                            Err(AlpnInfo::Reflect) => {
-                                                for proto in
-                                                    mid.client_hello().alpn().into_iter().flatten()
-                                                {
-                                                    cfg.alpn_protocols.push(proto.into());
-                                                }
-                                                let mut accept = mid.into_stream(Arc::new(cfg));
-                                                let io = accept.get_mut().unwrap();
-                                                let buffered = io.stop_buffering();
-                                                io.write_all(&buffered).await?;
-                                                let mut tls_stream =
-                                                    match accept.await {
-                                                        Ok(a) => a,
-                                                        Err(e) => {
-                                                            tracing::trace!( "VHostController: failed to accept TLS connection on port {port}: {e}");
-                                                            tracing::trace!("{e:?}");
-                                                            return Ok(())
-                                                        }
-                                                    };
-                                                tokio::io::copy_bidirectional(
-                                                    &mut tls_stream,
-                                                    &mut tcp_stream,
-                                                )
-                                                .await
-                                            }
-                                            Err(AlpnInfo::Specified(alpn)) => {
-                                                cfg.alpn_protocols = alpn.into_iter().map(|a| a.0).collect();
-                                                let mut accept = mid.into_stream(Arc::new(cfg));
-                                                let io = accept.get_mut().unwrap();
-                                                let buffered = io.stop_buffering();
-                                                io.write_all(&buffered).await?;
-                                                let mut tls_stream =
-                                                    match accept.await {
-                                                        Ok(a) => a,
-                                                        Err(e) => {
-                                                            tracing::trace!( "VHostController: failed to accept TLS connection on port {port}: {e}");
-                                                            tracing::trace!("{e:?}");
-                                                            return Ok(())
-                                                        }
-                                                    };
-                                                tokio::io::copy_bidirectional(
-                                                    &mut tls_stream,
-                                                    &mut tcp_stream,
-                                                )
-                                                .await
+                                            Err(e) => {
+                                                tracing::warn!(
+                                                "Error redirecting http request on ssl port: {e}"
+                                            );
+                                                tracing::error!("{e:?}");
+                                                server_error(Error::new(e, ErrorKind::Network))
                                             }
                                         }
-                                        .map_or_else(
-                                            |e| {
-                                                use std::io::ErrorKind as E;
-                                                match e.kind() {
-                                                    E::UnexpectedEof | E::BrokenPipe | E::ConnectionAborted | E::ConnectionReset | E::ConnectionRefused | E::TimedOut | E::Interrupted | E::NotConnected => Ok(()),
-                                                _ => Err(e),
-                                            }},
-                                            |_| Ok(()),
-                                        )?;
-                                    } else {
-                                        // 503
-                                    }
-                                    Ok::<_, Error>(())
-                                }
-                                .await
-                                {
-                                    tracing::error!("Error in VHostController on port {port}: {e}");
-                                    tracing::debug!("{e:?}")
-                                }
-                            });
+                                    },
+                                )),
+                            ),
+                        )
+                        .await
+                        .map_err(|e| {
+                            Error::new(color_eyre::eyre::Report::msg(e), ErrorKind::Network)
+                        });
+                    } else {
+                        return Err(e).with_kind(ErrorKind::Network);
+                    }
+                }
+            };
+        let target_name: Option<InternedString> =
+            mid.client_hello().server_name().map(|s| s.into());
+        if let Some(domain) = target_name.as_ref() {
+            if mid
+                .client_hello()
+                .alpn()
+                .into_iter()
+                .flatten()
+                .any(|alpn| alpn == ACME_TLS_ALPN_NAME)
+            {
+                let cert = WatchStream::new(
+                    acme_tls_alpn_cache
+                        .peek(|c| c.get(&**domain).cloned())
+                        .ok_or_else(|| {
+                            Error::new(
+                                eyre!("No challenge recv available for {domain}"),
+                                ErrorKind::OpenSsl,
+                            )
+                        })?,
+                );
+                tracing::info!("Waiting for verification cert for {domain}");
+                let cert = cert
+                    .filter(|c| c.is_some())
+                    .next()
+                    .await
+                    .flatten()
+                    .ok_or_else(|| {
+                        Error::new(
+                            eyre!("No challenge available for {domain}"),
+                            ErrorKind::OpenSsl,
+                        )
+                    })?;
+                tracing::info!("Verification cert received for {domain}");
+                let mut cfg = ServerConfig::builder_with_provider(crypto_provider.clone())
+                    .with_safe_default_protocol_versions()
+                    .with_kind(crate::ErrorKind::OpenSsl)?
+                    .with_no_client_auth()
+                    .with_cert_resolver(Arc::new(SingleCertResolver(cert)));
+
+                cfg.alpn_protocols = vec![ACME_TLS_ALPN_NAME.to_vec()];
+                tracing::info!("performing ACME auth challenge");
+                let mut accept = mid.into_stream(Arc::new(cfg));
+                let io = accept.get_mut().unwrap();
+                let buffered = io.stop_buffering();
+                io.write_all(&buffered).await?;
+                accept.await?;
+                tracing::info!("ACME auth challenge completed");
+                return Ok(());
+            }
+        }
+        let target = {
+            let m = mapping.borrow();
+            m.get(&target_name)
+                .into_iter()
+                .flatten()
+                .find(|(_, rc)| rc.strong_count() > 0)
+                .or_else(|| {
+                    if target_name
+                        .as_ref()
+                        .map(|s| s.parse::<IpAddr>().is_ok())
+                        .unwrap_or(true)
+                    {
+                        m.get(&None)
+                            .into_iter()
+                            .flatten()
+                            .find(|(_, rc)| rc.strong_count() > 0)
+                    } else {
+                        None
+                    }
+                })
+                .map(|(target, _)| target.clone())
+        };
+        if let Some(target) = target {
+            if is_public && !target.public {
+                log::warn!(
+                    "Rejecting connection from public interface to private bind: {bind} -> {target:?}"
+                );
+                return Ok(());
+            }
+            let peek = db.peek().await;
+            let root = peek
+                .as_private()
+                .as_key_store()
+                .as_local_certs()
+                .as_root_cert()
+                .de()?;
+            let mut cfg = async {
+                if let Some((domain, provider, settings)) =
+                    target_name.as_ref().and_then(|domain| {
+                        target.acme.as_ref().and_then(|a| {
+                            peek.as_public()
+                                .as_server_info()
+                                .as_acme()
+                                .as_idx(a)
+                                .map(|s| (domain, a, s))
+                        })
+                    })
+                {
+                    let acme_settings = settings.de()?;
+                    let mut identifiers = vec![Identifier::Dns(domain.to_string())];
+                    if false
+                    // Requires RFC 8738
+                    {
+                        if let Some(wan_ip) = wan_ip {
+                            identifiers.push(Identifier::Ip(wan_ip.into()));
+                        }
+                    }
+                    let (send, recv) = watch::channel(None);
+                    acme_tls_alpn_cache.mutate(|c| c.insert(domain.clone(), recv));
+                    let cert = async_acme::rustls_helper::order(
+                        |_, cert| {
+                            send.send_replace(Some(Arc::new(cert)));
+                            Ok(())
+                        },
+                        provider.0.as_str(),
+                        &identifiers,
+                        Some(&AcmeCertCache(&db)),
+                        &acme_settings.contact,
+                    )
+                    .await
+                    .with_kind(ErrorKind::OpenSsl)?;
+                    return Ok(ServerConfig::builder_with_provider(crypto_provider.clone())
+                        .with_safe_default_protocol_versions()
+                        .with_kind(crate::ErrorKind::OpenSsl)?
+                        .with_no_client_auth()
+                        .with_cert_resolver(Arc::new(SingleCertResolver(Arc::new(cert)))));
+                }
+
+                let hostnames = target_name
+                    .into_iter()
+                    .chain([InternedString::from_display(&bind.ip())])
+                    .chain(wan_ip.as_ref().map(InternedString::from_display))
+                    .collect();
+                let key = db
+                    .mutate(|v| {
+                        v.as_private_mut()
+                            .as_key_store_mut()
+                            .as_local_certs_mut()
+                            .cert_for(&hostnames)
+                    })
+                    .await?;
+                let cfg = ServerConfig::builder_with_provider(crypto_provider.clone())
+                    .with_safe_default_protocol_versions()
+                    .with_kind(crate::ErrorKind::OpenSsl)?
+                    .with_no_client_auth();
+                if mid
+                    .client_hello()
+                    .signature_schemes()
+                    .contains(&tokio_rustls::rustls::SignatureScheme::ED25519)
+                {
+                    cfg.with_single_cert(
+                        key.fullchain_ed25519()
+                            .into_iter()
+                            .map(|c| {
+                                Ok(tokio_rustls::rustls::pki_types::CertificateDer::from(
+                                    c.to_der()?,
+                                ))
+                            })
+                            .collect::<Result<_, Error>>()?,
+                        PrivateKeyDer::from(PrivatePkcs8KeyDer::from(
+                            key.leaf.keys.ed25519.private_key_to_pkcs8()?,
+                        )),
+                    )
+                } else {
+                    cfg.with_single_cert(
+                        key.fullchain_nistp256()
+                            .into_iter()
+                            .map(|c| {
+                                Ok(tokio_rustls::rustls::pki_types::CertificateDer::from(
+                                    c.to_der()?,
+                                ))
+                            })
+                            .collect::<Result<_, Error>>()?,
+                        PrivateKeyDer::from(PrivatePkcs8KeyDer::from(
+                            key.leaf.keys.nistp256.private_key_to_pkcs8()?,
+                        )),
+                    )
+                }
+                .with_kind(crate::ErrorKind::OpenSsl)
+            }
+            .await?;
+            let mut tcp_stream = TcpStream::connect(target.addr).await?;
+            match target.connect_ssl {
+                Ok(()) => {
+                    let mut client_cfg =
+                        tokio_rustls::rustls::ClientConfig::builder_with_provider(crypto_provider)
+                            .with_safe_default_protocol_versions()
+                            .with_kind(crate::ErrorKind::OpenSsl)?
+                            .with_root_certificates({
+                                let mut store = RootCertStore::empty();
+                                store
+                                    .add(CertificateDer::from(root.to_der()?))
+                                    .with_kind(crate::ErrorKind::OpenSsl)?;
+                                store
+                            })
+                            .with_no_client_auth();
+                    client_cfg.alpn_protocols = mid
+                        .client_hello()
+                        .alpn()
+                        .into_iter()
+                        .flatten()
+                        .map(|x| x.to_vec())
+                        .collect();
+                    let mut target_stream = TlsConnector::from(Arc::new(client_cfg))
+                        .connect_with(
+                            ServerName::IpAddress(target.addr.ip().into()),
+                            tcp_stream,
+                            |conn| {
+                                cfg.alpn_protocols
+                                    .extend(conn.alpn_protocol().into_iter().map(|p| p.to_vec()))
+                            },
+                        )
+                        .await
+                        .with_kind(crate::ErrorKind::OpenSsl)?;
+                    let mut accept = mid.into_stream(Arc::new(cfg));
+                    let io = accept.get_mut().unwrap();
+                    let buffered = io.stop_buffering();
+                    io.write_all(&buffered).await?;
+                    let mut tls_stream = match accept.await {
+                        Ok(a) => a,
+                        Err(e) => {
+                            tracing::trace!(
+                                "VHostController: failed to accept TLS connection on {bind}: {e}"
+                            );
+                            tracing::trace!("{e:?}");
+                            return Ok(());
                         }
+                    };
+                    tokio::io::copy_bidirectional(&mut tls_stream, &mut target_stream).await
+                }
+                Err(AlpnInfo::Reflect) => {
+                    for proto in mid.client_hello().alpn().into_iter().flatten() {
+                        cfg.alpn_protocols.push(proto.into());
+                    }
+                    let mut accept = mid.into_stream(Arc::new(cfg));
+                    let io = accept.get_mut().unwrap();
+                    let buffered = io.stop_buffering();
+                    io.write_all(&buffered).await?;
+                    let mut tls_stream = match accept.await {
+                        Ok(a) => a,
                         Err(e) => {
                             tracing::trace!(
-                                "VHostController: failed to accept connection on port {port}: {e}"
+                                "VHostController: failed to accept TLS connection on {bind}: {e}"
                             );
                             tracing::trace!("{e:?}");
+                            return Ok(());
                         }
+                    };
+                    tokio::io::copy_bidirectional(&mut tls_stream, &mut tcp_stream).await
+                }
+                Err(AlpnInfo::Specified(alpn)) => {
+                    cfg.alpn_protocols = alpn.into_iter().map(|a| a.0).collect();
+                    let mut accept = mid.into_stream(Arc::new(cfg));
+                    let io = accept.get_mut().unwrap();
+                    let buffered = io.stop_buffering();
+                    io.write_all(&buffered).await?;
+                    let mut tls_stream = match accept.await {
+                        Ok(a) => a,
+                        Err(e) => {
+                            tracing::trace!(
+                                "VHostController: failed to accept TLS connection on {bind}: {e}"
+                            );
+                            tracing::trace!("{e:?}");
+                            return Ok(());
+                        }
+                    };
+                    tokio::io::copy_bidirectional(&mut tls_stream, &mut tcp_stream).await
+                }
+            }
+            .map_or_else(
+                |e| {
+                    use std::io::ErrorKind as E;
+                    match e.kind() {
+                        E::UnexpectedEof
+                        | E::BrokenPipe
+                        | E::ConnectionAborted
+                        | E::ConnectionReset
+                        | E::ConnectionRefused
+                        | E::TimedOut
+                        | E::Interrupted
+                        | E::NotConnected => Ok(()),
+                        _ => Err(e),
+                    }
+                },
+                |_| Ok(()),
+            )?;
+        } else {
+            // 503
+        }
+        Ok::<_, Error>(())
+    }
+
+    #[instrument(skip_all)]
+    fn new(
+        port: u16,
+        db: TypedPatchDb<Database>,
+        iface_ctrl: Arc<NetworkInterfaceController>,
+        crypto_provider: Arc<CryptoProvider>,
+        acme_tls_alpn_cache: AcmeTlsAlpnCache,
+    ) -> Result<Self, Error> {
+        let mut listener = iface_ctrl.bind(port).with_kind(crate::ErrorKind::Network)?;
+        let (map_send, map_recv) = watch::channel(BTreeMap::new());
+        Ok(Self {
+            mapping: map_send,
+            _thread: tokio::spawn(async move {
+                loop {
+                    if let Err(e) = Self::accept(
+                        &mut listener,
+                        map_recv.clone(),
+                        db.clone(),
+                        acme_tls_alpn_cache.clone(),
+                        crypto_provider.clone(),
+                    )
+                    .await
+                    {
+                        tracing::error!(
+                            "VHostController: failed to accept connection on {port}: {e}"
+                        );
+                        tracing::debug!("{e:?}");
                     }
                 }
             })
             .into(),
         })
     }
-    async fn add(
-        &self,
-        hostname: Option<InternedString>,
-        target: TargetInfo,
-    ) -> Result<Arc<()>, Error> {
-        if let Some(mapping) = Weak::upgrade(&self.mapping) {
-            let mut writable = mapping.write().await;
+    fn add(&self, hostname: Option<InternedString>, target: TargetInfo) -> Result<Arc<()>, Error> {
+        let mut res = Ok(Arc::new(()));
+        self.mapping.send_if_modified(|writable| {
+            let mut changed = false;
             let mut targets = writable.remove(&hostname).unwrap_or_default();
             let rc = if let Some(rc) = Weak::upgrade(&targets.remove(&target).unwrap_or_default()) {
                 rc
             } else {
+                changed = true;
                 Arc::new(())
             };
             targets.insert(target, Arc::downgrade(&rc));
             writable.insert(hostname, targets);
-            Ok(rc)
+            res = Ok(rc);
+            changed
+        });
+        if !self.mapping.is_closed() {
+            res
         } else {
             Err(Error::new(
                 eyre!("VHost Service Thread has exited"),
@@ -546,33 +714,22 @@ impl VHostServer {
             ))
         }
     }
-    async fn gc(&self, hostname: Option<InternedString>) -> Result<(), Error> {
-        if let Some(mapping) = Weak::upgrade(&self.mapping) {
-            let mut writable = mapping.write().await;
+    fn gc(&self, hostname: Option<InternedString>) {
+        self.mapping.send_if_modified(|writable| {
             let mut targets = writable.remove(&hostname).unwrap_or_default();
+            let pre = targets.len();
             targets = targets
                 .into_iter()
                 .filter(|(_, rc)| rc.strong_count() > 0)
                 .collect();
+            let post = targets.len();
             if !targets.is_empty() {
                 writable.insert(hostname, targets);
             }
-            Ok(())
-        } else {
-            Err(Error::new(
-                eyre!("VHost Service Thread has exited"),
-                crate::ErrorKind::Network,
-            ))
-        }
+            pre == post
+        });
     }
-    async fn is_empty(&self) -> Result<bool, Error> {
-        if let Some(mapping) = Weak::upgrade(&self.mapping) {
-            Ok(mapping.read().await.is_empty())
-        } else {
-            Err(Error::new(
-                eyre!("VHost Service Thread has exited"),
-                crate::ErrorKind::Network,
-            ))
-        }
+    fn is_empty(&self) -> bool {
+        self.mapping.borrow().is_empty()
     }
 }
diff --git a/core/startos/src/net/web_server.rs b/core/startos/src/net/web_server.rs
index d1ad64d01..b38a7ee56 100644
--- a/core/startos/src/net/web_server.rs
+++ b/core/startos/src/net/web_server.rs
@@ -1,134 +1,299 @@
-use std::convert::Infallible;
+use std::future::Future;
 use std::net::SocketAddr;
+use std::ops::Deref;
+use std::sync::atomic::AtomicBool;
+use std::sync::{Arc, RwLock};
 use std::task::Poll;
 use std::time::Duration;
 
-use axum::extract::Request;
 use axum::Router;
-use axum_server::Handle;
-use bytes::Bytes;
-use futures::future::{ready, BoxFuture};
+use futures::future::{BoxFuture, Either};
 use futures::FutureExt;
 use helpers::NonDetachingJoinHandle;
+use hyper_util::rt::{TokioIo, TokioTimer};
+use hyper_util::service::TowerToHyperService;
+use tokio::net::{TcpListener, TcpStream};
 use tokio::sync::{oneshot, watch};
 
 use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
+use crate::net::network_interface::NetworkInterfaceListener;
 use crate::net::static_server::{
-    diagnostic_ui_router, init_ui_router, install_ui_router, main_ui_router, refresher,
+    diagnostic_ui_router, init_ui_router, install_ui_router, main_ui_router, redirecter, refresher,
     setup_ui_router,
 };
 use crate::prelude::*;
+use crate::util::actor::background::BackgroundJobQueue;
 
-#[derive(Clone)]
-pub struct SwappableRouter(watch::Sender<Router>);
-impl SwappableRouter {
-    pub fn new(router: Router) -> Self {
-        Self(watch::channel(router).0)
+pub struct Accepted {
+    pub https_redirect: bool,
+    pub stream: TcpStream,
+}
+
+pub trait Accept {
+    fn poll_accept(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<Accepted, Error>>;
+}
+
+impl Accept for Vec<TcpListener> {
+    fn poll_accept(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<Accepted, Error>> {
+        for listener in &*self {
+            if let Poll::Ready((stream, _)) = listener.poll_accept(cx)? {
+                return Poll::Ready(Ok(Accepted {
+                    https_redirect: false,
+                    stream,
+                }));
+            }
+        }
+        Poll::Pending
     }
-    pub fn swap(&self, router: Router) {
-        let _ = self.0.send_replace(router);
+}
+impl Accept for NetworkInterfaceListener {
+    fn poll_accept(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<Accepted, Error>> {
+        NetworkInterfaceListener::poll_accept(self, cx, true).map(|res| {
+            res.map(|a| Accepted {
+                https_redirect: a.is_public,
+                stream: a.stream,
+            })
+        })
     }
 }
 
-pub struct SwappableRouterService {
-    router: watch::Receiver<Router>,
+impl<A: Accept, B: Accept> Accept for Either<A, B> {
+    fn poll_accept(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<Accepted, Error>> {
+        match self {
+            Either::Left(a) => a.poll_accept(cx),
+            Either::Right(b) => b.poll_accept(cx),
+        }
+    }
+}
+impl<A: Accept> Accept for Option<A> {
+    fn poll_accept(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<Accepted, Error>> {
+        match self {
+            None => Poll::Pending,
+            Some(a) => a.poll_accept(cx),
+        }
+    }
+}
+
+#[pin_project::pin_project]
+pub struct Acceptor<A: Accept> {
+    acceptor: (watch::Sender<A>, watch::Receiver<A>),
     changed: Option<BoxFuture<'static, ()>>,
 }
-impl SwappableRouterService {
-    fn router(&self) -> Router {
-        self.router.borrow().clone()
+impl<A: Accept + Send + Sync + 'static> Acceptor<A> {
+    pub fn new(acceptor: A) -> Self {
+        Self {
+            acceptor: watch::channel(acceptor),
+            changed: None,
+        }
     }
-    fn changed(&mut self, cx: &mut std::task::Context<'_>) -> Poll<()> {
+
+    fn poll_changed(&mut self, cx: &mut std::task::Context<'_>) -> Poll<()> {
         let mut changed = if let Some(changed) = self.changed.take() {
             changed
         } else {
-            let mut router = self.router.clone();
+            let mut recv = self.acceptor.1.clone();
             async move {
-                router.changed().await;
+                let _ = recv.changed().await;
             }
             .boxed()
         };
-        if changed.poll_unpin(cx).is_ready() {
-            return Poll::Ready(());
+        let res = changed.poll_unpin(cx);
+        if res.is_pending() {
+            self.changed = Some(changed);
         }
-        self.changed = Some(changed);
-        Poll::Pending
+        res
     }
-}
-impl Clone for SwappableRouterService {
-    fn clone(&self) -> Self {
-        Self {
-            router: self.router.clone(),
-            changed: None,
-        }
+
+    fn poll_accept(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<Accepted, Error>> {
+        let _ = self.poll_changed(cx);
+        let mut res = Poll::Pending;
+        self.acceptor.0.send_if_modified(|a| {
+            res = a.poll_accept(cx);
+            false
+        });
+        res
+    }
+
+    async fn accept(&mut self) -> Result<Accepted, Error> {
+        std::future::poll_fn(|cx| self.poll_accept(cx)).await
     }
 }
-impl<B> tower_service::Service<Request<B>> for SwappableRouterService
-where
-    B: axum::body::HttpBody<Data = Bytes> + Send + 'static,
-    B::Error: Into<axum::BoxError>,
-{
-    type Response = <Router as tower_service::Service<Request<B>>>::Response;
-    type Error = <Router as tower_service::Service<Request<B>>>::Error;
-    type Future = <Router as tower_service::Service<Request<B>>>::Future;
-    #[inline]
-    fn poll_ready(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<(), Self::Error>> {
-        if self.changed(cx).is_ready() {
-            return Poll::Ready(Ok(()));
-        }
-        tower_service::Service::<Request<B>>::poll_ready(&mut self.router(), cx)
+impl Acceptor<Vec<TcpListener>> {
+    pub async fn bind(listen: impl IntoIterator<Item = SocketAddr>) -> Result<Self, Error> {
+        Ok(Self::new(
+            futures::future::try_join_all(listen.into_iter().map(TcpListener::bind)).await?,
+        ))
     }
-    fn call(&mut self, req: Request<B>) -> Self::Future {
-        self.router().call(req)
+}
+
+pub type UpgradableListener = Option<Either<Vec<TcpListener>, NetworkInterfaceListener>>;
+
+impl Acceptor<UpgradableListener> {
+    pub async fn bind_upgradable(
+        listen: impl IntoIterator<Item = SocketAddr>,
+    ) -> Result<Self, Error> {
+        Ok(Self::new(Some(Either::Left(
+            futures::future::try_join_all(listen.into_iter().map(TcpListener::bind)).await?,
+        ))))
     }
 }
 
-impl<T> tower_service::Service<T> for SwappableRouter {
-    type Response = SwappableRouterService;
-    type Error = Infallible;
-    type Future = futures::future::Ready<Result<Self::Response, Self::Error>>;
-    #[inline]
-    fn poll_ready(
-        &mut self,
-        _: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-    fn call(&mut self, _: T) -> Self::Future {
-        ready(Ok(SwappableRouterService {
-            router: self.0.subscribe(),
-            changed: None,
-        }))
+pub struct WebServerAcceptorSetter<A: Accept> {
+    acceptor: watch::Sender<A>,
+}
+impl<A: Accept, B: Accept> WebServerAcceptorSetter<Option<Either<A, B>>> {
+    pub fn try_upgrade<F: FnOnce(A) -> Result<B, Error>>(&self, f: F) -> Result<(), Error> {
+        let mut res = Ok(());
+        self.acceptor.send_modify(|a| {
+            *a = match a.take() {
+                Some(Either::Left(a)) => match f(a) {
+                    Ok(b) => Some(Either::Right(b)),
+                    Err(e) => {
+                        res = Err(e);
+                        None
+                    }
+                },
+                x => x,
+            }
+        });
+        res
+    }
+}
+impl<A: Accept> Deref for WebServerAcceptorSetter<A> {
+    type Target = watch::Sender<A>;
+    fn deref(&self) -> &Self::Target {
+        &self.acceptor
     }
 }
 
-pub struct WebServer {
+pub struct WebServer<A: Accept> {
     shutdown: oneshot::Sender<()>,
-    router: SwappableRouter,
+    router: watch::Sender<Option<Router>>,
+    acceptor: watch::Sender<A>,
     thread: NonDetachingJoinHandle<()>,
 }
-impl WebServer {
-    pub fn new(bind: SocketAddr) -> Self {
-        let router = SwappableRouter::new(refresher());
-        let thread_router = router.clone();
+impl<A: Accept + Send + Sync + 'static> WebServer<A> {
+    pub fn acceptor_setter(&self) -> WebServerAcceptorSetter<A> {
+        WebServerAcceptorSetter {
+            acceptor: self.acceptor.clone(),
+        }
+    }
+
+    pub fn new(mut acceptor: Acceptor<A>) -> Self {
+        let acceptor_send = acceptor.acceptor.0.clone();
+        let (router, service) = watch::channel::<Option<Router>>(None);
         let (shutdown, shutdown_recv) = oneshot::channel();
         let thread = NonDetachingJoinHandle::from(tokio::spawn(async move {
-            let handle = Handle::new();
-            let mut server = axum_server::bind(bind).handle(handle.clone());
-            server.http_builder().http1().preserve_header_case(true);
-            server.http_builder().http1().title_case_headers(true);
-
-            if let (Err(e), _) = tokio::join!(server.serve(thread_router), async {
-                let _ = shutdown_recv.await;
-                handle.graceful_shutdown(Some(Duration::from_secs(0)));
-            }) {
-                tracing::error!("Spawning hyper server error: {}", e);
+            #[derive(Clone)]
+            struct QueueRunner {
+                queue: Arc<RwLock<Option<BackgroundJobQueue>>>,
+            }
+            impl<Fut> hyper::rt::Executor<Fut> for QueueRunner
+            where
+                Fut: Future + Send + 'static,
+            {
+                fn execute(&self, fut: Fut) {
+                    if let Some(q) = &*self.queue.read().unwrap() {
+                        q.add_job(fut);
+                    } else {
+                        tracing::warn!("job queued after shutdown");
+                    }
+                }
+            }
+
+            let accept = AtomicBool::new(true);
+            let queue_cell = Arc::new(RwLock::new(None));
+            let graceful = hyper_util::server::graceful::GracefulShutdown::new();
+            let mut server = hyper_util::server::conn::auto::Builder::new(QueueRunner {
+                queue: queue_cell.clone(),
+            });
+            server
+                .http1()
+                .timer(TokioTimer::new())
+                .title_case_headers(true)
+                .preserve_header_case(true)
+                .http2()
+                .timer(TokioTimer::new())
+                .enable_connect_protocol()
+                .keep_alive_interval(Duration::from_secs(60))
+                .keep_alive_timeout(Duration::from_secs(300));
+            let (queue, mut runner) = BackgroundJobQueue::new();
+            *queue_cell.write().unwrap() = Some(queue.clone());
+
+            let handler = async {
+                loop {
+                    if let Err(e) = async {
+                        let accepted = acceptor.accept().await?;
+                        if accepted.https_redirect {
+                            queue.add_job(
+                                graceful.watch(
+                                    server
+                                        .serve_connection_with_upgrades(
+                                            TokioIo::new(accepted.stream),
+                                            TowerToHyperService::new(redirecter().into_service()),
+                                        )
+                                        .into_owned(),
+                                ),
+                            );
+                        } else {
+                            let service = { service.borrow().clone() };
+                            if let Some(service) = service {
+                                queue.add_job(
+                                    graceful.watch(
+                                        server
+                                            .serve_connection_with_upgrades(
+                                                TokioIo::new(accepted.stream),
+                                                TowerToHyperService::new(service.into_service()),
+                                            )
+                                            .into_owned(),
+                                    ),
+                                );
+                            } else {
+                                queue.add_job(
+                                    graceful.watch(
+                                        server
+                                            .serve_connection_with_upgrades(
+                                                TokioIo::new(accepted.stream),
+                                                TowerToHyperService::new(
+                                                    refresher().into_service(),
+                                                ),
+                                            )
+                                            .into_owned(),
+                                    ),
+                                );
+                            }
+                        }
+
+                        Ok::<_, Error>(())
+                    }
+                    .await
+                    {
+                        tracing::error!("Error accepting HTTP connection: {e}");
+                        tracing::debug!("{e:?}");
+                    }
+                }
+            }
+            .boxed();
+
+            tokio::select! {
+                _ = shutdown_recv => (),
+                _ = handler => (),
+                _ = &mut runner => (),
+            }
+
+            accept.store(false, std::sync::atomic::Ordering::SeqCst);
+            drop(queue);
+            drop(queue_cell.write().unwrap().take());
+
+            if !runner.is_empty() {
+                runner.await;
             }
         }));
         Self {
             shutdown,
             router,
             thread,
+            acceptor: acceptor_send,
         }
     }
 
@@ -138,7 +303,7 @@ impl WebServer {
     }
 
     pub fn serve_router(&mut self, router: Router) {
-        self.router.swap(router)
+        self.router.send_replace(Some(router));
     }
 
     pub fn serve_main(&mut self, ctx: RpcContext) {
diff --git a/core/startos/src/net/wifi.rs b/core/startos/src/net/wifi.rs
index 056a403de..b2e59c20f 100644
--- a/core/startos/src/net/wifi.rs
+++ b/core/startos/src/net/wifi.rs
@@ -298,7 +298,7 @@ fn display_wifi_info(params: WithIoFormat<Empty>, info: WifiListInfo) {
     let mut table_global = Table::new();
     table_global.add_row(row![bc =>
         "CONNECTED",
-        "SIGNAL_STRENGTH",
+        "SIGNAL STRENGTH",
         "COUNTRY",
         "ETHERNET",
     ]);
@@ -306,12 +306,12 @@ fn display_wifi_info(params: WithIoFormat<Empty>, info: WifiListInfo) {
         &info
             .connected
             .as_ref()
-            .map_or("[N/A]".to_owned(), |c| c.0.clone()),
+            .map_or("N/A".to_owned(), |c| c.0.clone()),
         &info
             .connected
             .as_ref()
             .and_then(|x| info.ssids.get(x))
-            .map_or("[N/A]".to_owned(), |ss| format!("{}", ss.0)),
+            .map_or("N/A".to_owned(), |ss| format!("{}", ss.0)),
         info.country.as_ref().map(|c| c.alpha2()).unwrap_or("00"),
         &format!("{}", info.ethernet)
     ]);
@@ -897,32 +897,29 @@ impl TypedValueParser for CountryCodeParser {
 }
 
 #[instrument(skip_all)]
-pub async fn synchronize_wpa_supplicant_conf<P: AsRef<Path>>(
+pub async fn synchronize_network_manager<P: AsRef<Path>>(
     main_datadir: P,
     wifi: &mut WifiInfo,
 ) -> Result<(), Error> {
     wifi.interface = find_wifi_iface().await?;
-    let Some(wifi_iface) = &wifi.interface else {
-        return Ok(());
-    };
     let persistent = main_datadir.as_ref().join("system-connections");
-    tracing::debug!("persistent: {:?}", persistent);
-    // let supplicant = Path::new("/etc/wpa_supplicant.conf");
 
     if tokio::fs::metadata(&persistent).await.is_err() {
         tokio::fs::create_dir_all(&persistent).await?;
     }
     crate::disk::mount::util::bind(&persistent, "/etc/NetworkManager/system-connections", false)
         .await?;
-    // if tokio::fs::metadata(&supplicant).await.is_err() {
-    //     tokio::fs::write(&supplicant, include_str!("wpa_supplicant.conf.base")).await?;
-    // }
 
     Command::new("systemctl")
         .arg("restart")
         .arg("NetworkManager")
         .invoke(ErrorKind::Wifi)
         .await?;
+
+    let Some(wifi_iface) = &wifi.interface else {
+        return Ok(());
+    };
+
     Command::new("ifconfig")
         .arg(wifi_iface)
         .arg("up")
diff --git a/core/startos/src/os_install/gpt.rs b/core/startos/src/os_install/gpt.rs
index 01703083b..4833f4ea7 100644
--- a/core/startos/src/os_install/gpt.rs
+++ b/core/startos/src/os_install/gpt.rs
@@ -50,7 +50,7 @@ pub async fn partition(disk: &DiskInfo, overwrite: bool) -> Result<OsPartitionIn
                         if part_info.guid.is_some() {
                             if entry.first_lba < if use_efi { 33759266 } else { 33570850 } {
                                 return Err(Error::new(
-                                    eyre!("Not enough space before embassy data"),
+                                    eyre!("Not enough space before StartOS data"),
                                     crate::ErrorKind::InvalidRequest,
                                 ));
                             }
diff --git a/core/startos/src/prelude.rs b/core/startos/src/prelude.rs
index dddc1ecda..702d77c2d 100644
--- a/core/startos/src/prelude.rs
+++ b/core/startos/src/prelude.rs
@@ -6,3 +6,20 @@ pub use tracing::instrument;
 pub use crate::db::prelude::*;
 pub use crate::ensure_code;
 pub use crate::error::{Error, ErrorCollection, ErrorKind, ResultExt};
+
+#[macro_export]
+macro_rules! dbg {
+    () => {{
+        tracing::debug!("[{}:{}:{}]", file!(), line!(), column!());
+    }};
+    ($e:expr) => {{
+        let e = $e;
+        tracing::debug!("[{}:{}:{}] {} = {e:?}", file!(), line!(), column!(), stringify!($e));
+        e
+    }};
+    ($($e:expr),+) => {
+        ($(
+            crate::dbg!($e)
+        ),+)
+    }
+}
diff --git a/core/startos/src/registry/context.rs b/core/startos/src/registry/context.rs
index 16c6465ed..d78fde50e 100644
--- a/core/startos/src/registry/context.rs
+++ b/core/startos/src/registry/context.rs
@@ -19,7 +19,6 @@ use crate::context::config::{ContextConfig, CONFIG_PATH};
 use crate::context::{CliContext, RpcContext};
 use crate::prelude::*;
 use crate::registry::auth::{SignatureHeader, AUTH_SIG_HEADER};
-use crate::registry::device_info::{DeviceInfo, DEVICE_INFO_HEADER};
 use crate::registry::signer::sign::AnySigningKey;
 use crate::registry::RegistryDatabase;
 use crate::rpc_continuations::RpcContinuations;
diff --git a/core/startos/src/registry/mod.rs b/core/startos/src/registry/mod.rs
index 0cbbce4e0..4e1411ea9 100644
--- a/core/startos/src/registry/mod.rs
+++ b/core/startos/src/registry/mod.rs
@@ -2,7 +2,6 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use axum::Router;
 use futures::future::ready;
-use imbl_value::InternedString;
 use models::DataUrl;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler, Server};
 use serde::{Deserialize, Serialize};
@@ -11,13 +10,13 @@ use ts_rs::TS;
 use crate::context::CliContext;
 use crate::middleware::cors::Cors;
 use crate::net::static_server::{bad_request, not_found, server_error};
-use crate::net::web_server::WebServer;
+use crate::net::web_server::{Accept, WebServer};
 use crate::prelude::*;
 use crate::registry::auth::Auth;
 use crate::registry::context::RegistryContext;
 use crate::registry::device_info::DeviceInfoMiddleware;
 use crate::registry::os::index::OsIndex;
-use crate::registry::package::index::{Category, PackageIndex};
+use crate::registry::package::index::PackageIndex;
 use crate::registry::signer::SignerInfo;
 use crate::rpc_continuations::Guid;
 use crate::util::serde::HandlerExtSerde;
@@ -144,7 +143,7 @@ pub fn registry_router(ctx: RegistryContext) -> Router {
         )
 }
 
-impl WebServer {
+impl<A: Accept + Send + Sync + 'static> WebServer<A> {
     pub fn serve_registry(&mut self, ctx: RegistryContext) {
         self.serve_router(registry_router(ctx))
     }
diff --git a/core/startos/src/registry/package/index.rs b/core/startos/src/registry/package/index.rs
index 428200165..9973bae7e 100644
--- a/core/startos/src/registry/package/index.rs
+++ b/core/startos/src/registry/package/index.rs
@@ -72,7 +72,6 @@ pub struct PackageVersionInfo {
     pub icon: DataUrl<'static>,
     pub description: Description,
     pub release_notes: String,
-    #[ts(type = "string")]
     pub git_hash: GitHash,
     #[ts(type = "string")]
     pub license: InternedString,
diff --git a/core/startos/src/registry/signer/commitment/merkle_archive.rs b/core/startos/src/registry/signer/commitment/merkle_archive.rs
index 1b9d7d1e0..b27fb7ef4 100644
--- a/core/startos/src/registry/signer/commitment/merkle_archive.rs
+++ b/core/startos/src/registry/signer/commitment/merkle_archive.rs
@@ -24,10 +24,10 @@ impl MerkleArchiveCommitment {
     pub fn from_query(query: &str) -> Result<Option<Self>, Error> {
         let mut root_sighash = None;
         let mut root_maxsize = None;
-        for (k, v) in form_urlencoded::parse(dbg!(query).as_bytes()) {
+        for (k, v) in form_urlencoded::parse(query.as_bytes()) {
             match &*k {
                 "rootSighash" => {
-                    root_sighash = Some(dbg!(v).parse()?);
+                    root_sighash = Some(v.parse()?);
                 }
                 "rootMaxsize" => {
                     root_maxsize = Some(v.parse()?);
diff --git a/core/startos/src/s9pk/git_hash.rs b/core/startos/src/s9pk/git_hash.rs
index 02f83bf4a..762ef8704 100644
--- a/core/startos/src/s9pk/git_hash.rs
+++ b/core/startos/src/s9pk/git_hash.rs
@@ -1,11 +1,13 @@
 use std::path::Path;
 
 use tokio::process::Command;
+use ts_rs::TS;
 
 use crate::prelude::*;
 use crate::util::Invoke;
 
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+#[derive(Clone, Debug, serde::Serialize, serde::Deserialize, TS)]
+#[ts(type = "string")]
 pub struct GitHash(String);
 
 impl GitHash {
@@ -31,6 +33,31 @@ impl GitHash {
         }
         Ok(GitHash(hash))
     }
+    pub fn load_sync() -> Option<GitHash> {
+        let mut hash = String::from_utf8(
+            std::process::Command::new("git")
+                .arg("rev-parse")
+                .arg("HEAD")
+                .output()
+                .ok()?
+                .stdout,
+        )
+        .ok()?;
+        if !std::process::Command::new("git")
+            .arg("diff-index")
+            .arg("--quiet")
+            .arg("HEAD")
+            .arg("--")
+            .output()
+            .ok()?
+            .status
+            .success()
+        {
+            hash += "-modified";
+        }
+
+        Some(GitHash(hash))
+    }
 }
 
 impl AsRef<str> for GitHash {
diff --git a/core/startos/src/s9pk/v2/manifest.rs b/core/startos/src/s9pk/v2/manifest.rs
index 85f3cd796..11ea0d9af 100644
--- a/core/startos/src/s9pk/v2/manifest.rs
+++ b/core/startos/src/s9pk/v2/manifest.rs
@@ -3,7 +3,6 @@ use std::path::Path;
 
 use color_eyre::eyre::eyre;
 use exver::{Version, VersionRange};
-use helpers::const_true;
 use imbl_value::InternedString;
 pub use models::PackageId;
 use models::{mime, ImageId, VolumeId};
@@ -62,8 +61,8 @@ pub struct Manifest {
     pub dependencies: Dependencies,
     #[serde(default)]
     pub hardware_requirements: HardwareRequirements,
-    #[serde(default)]
-    #[ts(type = "string | null")]
+    #[ts(optional)]
+    #[serde(default = "GitHash::load_sync")]
     pub git_hash: Option<GitHash>,
     #[serde(default = "current_version")]
     #[ts(type = "string")]
diff --git a/core/startos/src/service/effects/callbacks.rs b/core/startos/src/service/effects/callbacks.rs
index 65eb707d8..19946672c 100644
--- a/core/startos/src/service/effects/callbacks.rs
+++ b/core/startos/src/service/effects/callbacks.rs
@@ -294,7 +294,7 @@ impl CallbackHandler {
         }
     }
     pub async fn call(mut self, args: Vector<Value>) -> Result<(), Error> {
-        dbg!(eyre!("callback fired: {}", self.handle.is_active()));
+        crate::dbg!(eyre!("callback fired: {}", self.handle.is_active()));
         if let Some(seed) = self.seed.upgrade() {
             seed.persistent_container
                 .callback(self.handle.take(), args)
diff --git a/core/startos/src/service/effects/dependency.rs b/core/startos/src/service/effects/dependency.rs
index ed43b7a9c..2a16b4155 100644
--- a/core/startos/src/service/effects/dependency.rs
+++ b/core/startos/src/service/effects/dependency.rs
@@ -17,11 +17,11 @@ use crate::db::model::package::{
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
 use crate::disk::mount::filesystem::{FileSystem, MountType};
-use crate::rpc_continuations::Guid;
 use crate::service::effects::prelude::*;
 use crate::status::health_check::NamedHealthCheckResult;
 use crate::util::Invoke;
 use crate::volume::data_dir;
+use crate::DATA_DIR;
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[ts(export)]
@@ -55,7 +55,7 @@ pub async fn mount(
     let context = context.deref()?;
     let subpath = subpath.unwrap_or_default();
     let subpath = subpath.strip_prefix("/").unwrap_or(&subpath);
-    let source = data_dir(&context.seed.ctx.datadir, &package_id, &volume_id).join(subpath);
+    let source = data_dir(DATA_DIR, &package_id, &volume_id).join(subpath);
     if tokio::fs::metadata(&source).await.is_err() {
         tokio::fs::create_dir_all(&source).await?;
     }
diff --git a/core/startos/src/service/effects/mod.rs b/core/startos/src/service/effects/mod.rs
index f68985268..e9df6f9f2 100644
--- a/core/startos/src/service/effects/mod.rs
+++ b/core/startos/src/service/effects/mod.rs
@@ -130,10 +130,6 @@ pub fn handler<C: Context>() -> ParentHandler<C> {
             "get-host-info",
             from_fn_async(net::host::get_host_info).no_cli(),
         )
-        .subcommand(
-            "get-primary-url",
-            from_fn_async(net::host::get_primary_url).no_cli(),
-        )
         .subcommand(
             "get-container-ip",
             from_fn_async(net::info::get_container_ip).no_cli(),
diff --git a/core/startos/src/service/effects/net/bind.rs b/core/startos/src/service/effects/net/bind.rs
index 5619375eb..2f3edb07b 100644
--- a/core/startos/src/service/effects/net/bind.rs
+++ b/core/startos/src/service/effects/net/bind.rs
@@ -1,6 +1,6 @@
 use models::{HostId, PackageId};
 
-use crate::net::host::binding::{BindId, BindOptions, LanInfo};
+use crate::net::host::binding::{BindId, BindOptions, NetInfo};
 use crate::net::host::HostKind;
 use crate::service::effects::prelude::*;
 
@@ -53,15 +53,36 @@ pub struct GetServicePortForwardParams {
     #[ts(optional)]
     package_id: Option<PackageId>,
     host_id: HostId,
-    internal_port: u32,
+    internal_port: u16,
 }
 pub async fn get_service_port_forward(
     context: EffectContext,
-    data: GetServicePortForwardParams,
-) -> Result<LanInfo, Error> {
-    let internal_port = data.internal_port as u16;
-
+    GetServicePortForwardParams {
+        package_id,
+        host_id,
+        internal_port,
+    }: GetServicePortForwardParams,
+) -> Result<NetInfo, Error> {
     let context = context.deref()?;
-    let net_service = context.seed.persistent_container.net_service.lock().await;
-    net_service.get_lan_port(data.host_id, internal_port)
+
+    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
+
+    Ok(context
+        .seed
+        .ctx
+        .db
+        .peek()
+        .await
+        .as_public()
+        .as_package_data()
+        .as_idx(&package_id)
+        .or_not_found(&package_id)?
+        .as_hosts()
+        .as_idx(&host_id)
+        .or_not_found(&host_id)?
+        .as_bindings()
+        .de()?
+        .get(&internal_port)
+        .or_not_found(lazy_format!("binding for port {internal_port}"))?
+        .net)
 }
diff --git a/core/startos/src/service/effects/net/host.rs b/core/startos/src/service/effects/net/host.rs
index d320e7fe9..570d5033d 100644
--- a/core/startos/src/service/effects/net/host.rs
+++ b/core/startos/src/service/effects/net/host.rs
@@ -1,35 +1,10 @@
 use models::{HostId, PackageId};
 
-use crate::net::host::address::HostAddress;
 use crate::net::host::Host;
 use crate::service::effects::callbacks::CallbackHandler;
 use crate::service::effects::prelude::*;
 use crate::service::rpc::CallbackId;
 
-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-pub struct GetPrimaryUrlParams {
-    #[ts(optional)]
-    package_id: Option<PackageId>,
-    host_id: HostId,
-    #[ts(optional)]
-    callback: Option<CallbackId>,
-}
-pub async fn get_primary_url(
-    context: EffectContext,
-    GetPrimaryUrlParams {
-        package_id,
-        host_id,
-        callback,
-    }: GetPrimaryUrlParams,
-) -> Result<Option<HostAddress>, Error> {
-    let context = context.deref()?;
-    let package_id = package_id.unwrap_or_else(|| context.seed.id.clone());
-
-    Ok(None) // TODO
-}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/core/startos/src/service/effects/net/interface.rs b/core/startos/src/service/effects/net/interface.rs
index 44258c36a..5de9638c4 100644
--- a/core/startos/src/service/effects/net/interface.rs
+++ b/core/startos/src/service/effects/net/interface.rs
@@ -15,7 +15,6 @@ pub struct ExportServiceInterfaceParams {
     id: ServiceInterfaceId,
     name: String,
     description: String,
-    has_primary: bool,
     masked: bool,
     address_info: AddressInfo,
     r#type: ServiceInterfaceType,
@@ -26,7 +25,6 @@ pub async fn export_service_interface(
         id,
         name,
         description,
-        has_primary,
         masked,
         address_info,
         r#type,
@@ -39,7 +37,6 @@ pub async fn export_service_interface(
         id: id.clone(),
         name,
         description,
-        has_primary,
         masked,
         address_info,
         interface_type: r#type,
diff --git a/core/startos/src/service/effects/net/ssl.rs b/core/startos/src/service/effects/net/ssl.rs
index d37a2d241..66b4fa1e6 100644
--- a/core/startos/src/service/effects/net/ssl.rs
+++ b/core/startos/src/service/effects/net/ssl.rs
@@ -51,10 +51,16 @@ pub async fn get_ssl_certificate(
                 .iter()
                 .map(|(_, m)| m.as_hosts().as_entries())
                 .flatten_ok()
-                .map_ok(|(_, m)| m.as_addresses().de())
+                .map_ok(|(_, m)| {
+                    Ok(m.as_onions()
+                        .de()?
+                        .iter()
+                        .map(InternedString::from_display)
+                        .chain(m.as_domains().keys()?)
+                        .collect::<Vec<_>>())
+                })
                 .map(|a| a.and_then(|a| a))
                 .flatten_ok()
-                .map_ok(|a| InternedString::from_display(&a))
                 .try_collect::<_, BTreeSet<_>, _>()?;
             for hostname in &hostnames {
                 if let Some(internal) = hostname
@@ -135,10 +141,16 @@ pub async fn get_ssl_key(
                 .into_iter()
                 .map(|m| m.as_hosts().as_entries())
                 .flatten_ok()
-                .map_ok(|(_, m)| m.as_addresses().de())
+                .map_ok(|(_, m)| {
+                    Ok(m.as_onions()
+                        .de()?
+                        .iter()
+                        .map(InternedString::from_display)
+                        .chain(m.as_domains().keys()?)
+                        .collect::<Vec<_>>())
+                })
                 .map(|a| a.and_then(|a| a))
                 .flatten_ok()
-                .map_ok(|a| InternedString::from_display(&a))
                 .try_collect::<_, BTreeSet<_>, _>()?;
             for hostname in &hostnames {
                 if let Some(internal) = hostname
diff --git a/core/startos/src/service/effects/store.rs b/core/startos/src/service/effects/store.rs
index 1d4a07086..39166c333 100644
--- a/core/startos/src/service/effects/store.rs
+++ b/core/startos/src/service/effects/store.rs
@@ -26,7 +26,7 @@ pub async fn get_store(
         callback,
     }: GetStoreParams,
 ) -> Result<Value, Error> {
-    dbg!(&callback);
+    crate::dbg!(&callback);
     let context = context.deref()?;
     let peeked = context.seed.ctx.db.peek().await;
     let package_id = package_id.unwrap_or(context.seed.id.clone());
diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs
index d73c51beb..5bc7fd999 100644
--- a/core/startos/src/service/mod.rs
+++ b/core/startos/src/service/mod.rs
@@ -48,7 +48,7 @@ use crate::util::net::WebSocketExt;
 use crate::util::serde::{NoOutput, Pem};
 use crate::util::Never;
 use crate::volume::data_dir;
-use crate::CAP_1_KiB;
+use crate::{CAP_1_KiB, DATA_DIR, PACKAGE_DATA};
 
 pub mod action;
 pub mod cli;
@@ -149,10 +149,10 @@ impl ServiceRef {
                                     .values()
                                     .flat_map(|h| h.bindings.values())
                                     .flat_map(|b| {
-                                        b.lan
+                                        b.net
                                             .assigned_port
                                             .into_iter()
-                                            .chain(b.lan.assigned_ssl_port)
+                                            .chain(b.net.assigned_ssl_port)
                                     }),
                             );
                             Ok(())
@@ -167,17 +167,18 @@ impl ServiceRef {
             {
                 let state = pde.state_info.expect_removing()?;
                 for volume_id in &state.manifest.volumes {
-                    let path = data_dir(&ctx.datadir, &state.manifest.id, volume_id);
+                    let path = data_dir(DATA_DIR, &state.manifest.id, volume_id);
                     if tokio::fs::metadata(&path).await.is_ok() {
                         tokio::fs::remove_dir_all(&path).await?;
                     }
                 }
-                let logs_dir = ctx.datadir.join("logs").join(&state.manifest.id);
+                let logs_dir = Path::new(PACKAGE_DATA)
+                    .join("logs")
+                    .join(&state.manifest.id);
                 if tokio::fs::metadata(&logs_dir).await.is_ok() {
                     tokio::fs::remove_dir_all(&logs_dir).await?;
                 }
-                let archive_path = ctx
-                    .datadir
+                let archive_path = Path::new(PACKAGE_DATA)
                     .join("archive")
                     .join("installed")
                     .join(&state.manifest.id);
@@ -278,7 +279,7 @@ impl Service {
             let ctx = ctx.clone();
             move |s9pk: S9pk, i: Model<PackageDataEntry>| async move {
                 for volume_id in &s9pk.as_manifest().volumes {
-                    let path = data_dir(&ctx.datadir, &s9pk.as_manifest().id, volume_id);
+                    let path = data_dir(DATA_DIR, &s9pk.as_manifest().id, volume_id);
                     if tokio::fs::metadata(&path).await.is_err() {
                         tokio::fs::create_dir_all(&path).await?;
                     }
@@ -291,7 +292,7 @@ impl Service {
                 Self::new(ctx, s9pk, start_stop).await.map(Some)
             }
         };
-        let s9pk_dir = ctx.datadir.join(PKG_ARCHIVE_DIR).join("installed"); // TODO: make this based on hash
+        let s9pk_dir = Path::new(DATA_DIR).join(PKG_ARCHIVE_DIR).join("installed"); // TODO: make this based on hash
         let s9pk_path = s9pk_dir.join(id).with_extension("s9pk");
         let Some(entry) = ctx
             .db
@@ -605,6 +606,7 @@ impl Service {
     }
 
     pub async fn update_host(&self, host_id: HostId) -> Result<(), Error> {
+        let mut service = self.seed.persistent_container.net_service.lock().await;
         let host = self
             .seed
             .ctx
@@ -619,13 +621,7 @@ impl Service {
             .as_idx(&host_id)
             .or_not_found(&host_id)?
             .de()?;
-        self.seed
-            .persistent_container
-            .net_service
-            .lock()
-            .await
-            .update(host_id, host)
-            .await
+        service.update(host_id, host).await
     }
 }
 
@@ -934,7 +930,6 @@ pub async fn attach(
                                 .with_kind(ErrorKind::Network)?;
                             current_out = "stdout";
                         }
-                        dbg!(&current_out);
                         ws.send(Message::Binary(out))
                             .await
                             .with_kind(ErrorKind::Network)?;
@@ -948,7 +943,6 @@ pub async fn attach(
                                 .with_kind(ErrorKind::Network)?;
                             current_out = "stderr";
                         }
-                        dbg!(&current_out);
                         ws.send(Message::Binary(err))
                             .await
                             .with_kind(ErrorKind::Network)?;
diff --git a/core/startos/src/service/persistent_container.rs b/core/startos/src/service/persistent_container.rs
index 13cb7688c..d99d9bb49 100644
--- a/core/startos/src/service/persistent_container.rs
+++ b/core/startos/src/service/persistent_container.rs
@@ -39,7 +39,7 @@ use crate::util::io::create_file;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::Invoke;
 use crate::volume::data_dir;
-use crate::ARCH;
+use crate::{ARCH, DATA_DIR, PACKAGE_DATA};
 
 const RPC_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
 
@@ -121,8 +121,8 @@ impl PersistentContainer {
             .lxc_manager
             .create(
                 Some(
-                    &ctx.datadir
-                        .join("package-data/logs")
+                    &Path::new(PACKAGE_DATA)
+                        .join("logs")
                         .join(&s9pk.as_manifest().id),
                 ),
                 LxcConfig::default(),
@@ -157,7 +157,7 @@ impl PersistentContainer {
                 .await?;
             let mount = MountGuard::mount(
                 &IdMapped::new(
-                    Bind::new(data_dir(&ctx.datadir, &s9pk.as_manifest().id, volume)),
+                    Bind::new(data_dir(DATA_DIR, &s9pk.as_manifest().id, volume)),
                     0,
                     100000,
                     65536,
@@ -452,7 +452,7 @@ impl PersistentContainer {
     #[instrument(skip_all)]
     pub async fn exit(mut self) -> Result<(), Error> {
         if let Some(destroy) = self.destroy(false) {
-            dbg!(destroy.await)?;
+            destroy.await?;
         }
         tracing::info!("Service for {} exited", self.s9pk.as_manifest().id);
 
diff --git a/core/startos/src/service/rpc.rs b/core/startos/src/service/rpc.rs
index f008de5c7..61eb5d592 100644
--- a/core/startos/src/service/rpc.rs
+++ b/core/startos/src/service/rpc.rs
@@ -155,7 +155,7 @@ impl serde::Serialize for Sandbox {
 pub struct CallbackId(u64);
 impl CallbackId {
     pub fn register(self, container: &PersistentContainer) -> CallbackHandle {
-        dbg!(eyre!(
+        crate::dbg!(eyre!(
             "callback {} registered for {}",
             self.0,
             container.s9pk.as_manifest().id
diff --git a/core/startos/src/service/service_actor.rs b/core/startos/src/service/service_actor.rs
index 712baaf1e..b88136650 100644
--- a/core/startos/src/service/service_actor.rs
+++ b/core/startos/src/service/service_actor.rs
@@ -36,7 +36,41 @@ impl Actor for ServiceActor {
                     ServiceActorLoopNext::DontWait => (),
                 }
             }
-        })
+        });
+        let seed = self.0.clone();
+        let mut ip_info = seed.ctx.net_controller.net_iface.subscribe();
+        jobs.add_job(async move {
+            loop {
+                if let Err(e) = async {
+                    let mut service = seed.persistent_container.net_service.lock().await;
+                    let hosts = seed
+                        .ctx
+                        .db
+                        .peek()
+                        .await
+                        .as_public()
+                        .as_package_data()
+                        .as_idx(&seed.id)
+                        .or_not_found(&seed.id)?
+                        .as_hosts()
+                        .de()?;
+                    for (host_id, host) in hosts.0 {
+                        service.update(host_id, host).await?;
+                    }
+
+                    Ok::<_, Error>(())
+                }
+                .await
+                {
+                    tracing::error!("Error syncronizing net host after network change: {e}");
+                    tracing::debug!("{e:?}");
+                }
+
+                if ip_info.changed().await.is_err() {
+                    break;
+                };
+            }
+        });
     }
 }
 
@@ -92,7 +126,6 @@ async fn service_actor_loop(
                             ..
                         } => MainStatus::Stopped,
                     };
-                    let previous = i.as_status().de()?;
                     i.as_status_mut().ser(&main_status)?;
                     return Ok(previous
                         .major_changes(&main_status)
diff --git a/core/startos/src/service/service_map.rs b/core/startos/src/service/service_map.rs
index 0faab8dd5..104e191ba 100644
--- a/core/startos/src/service/service_map.rs
+++ b/core/startos/src/service/service_map.rs
@@ -1,3 +1,4 @@
+use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -27,6 +28,7 @@ use crate::service::start_stop::StartStop;
 use crate::service::{LoadDisposition, Service, ServiceRef};
 use crate::status::MainStatus;
 use crate::util::serde::Pem;
+use crate::DATA_DIR;
 
 pub type DownloadInstallFuture = BoxFuture<'static, Result<InstallFuture, Error>>;
 pub type InstallFuture = BoxFuture<'static, Result<(), Error>>;
@@ -220,8 +222,7 @@ impl ServiceMap {
         Ok(async move {
             let (installed_path, sync_progress_task) = reload_guard
                 .handle(async {
-                    let download_path = ctx
-                        .datadir
+                    let download_path = Path::new(DATA_DIR)
                         .join(PKG_ARCHIVE_DIR)
                         .join("downloading")
                         .join(&id)
@@ -251,8 +252,7 @@ impl ServiceMap {
                     file.sync_all().await?;
                     download_progress.complete();
 
-                    let installed_path = ctx
-                        .datadir
+                    let installed_path = Path::new(DATA_DIR)
                         .join(PKG_ARCHIVE_DIR)
                         .join("installed")
                         .join(&id)
diff --git a/core/startos/src/service/transition/backup.rs b/core/startos/src/service/transition/backup.rs
index 0d4116078..6205cdd61 100644
--- a/core/startos/src/service/transition/backup.rs
+++ b/core/startos/src/service/transition/backup.rs
@@ -15,6 +15,7 @@ use crate::service::ServiceActor;
 use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::{ConflictBuilder, Handler};
 use crate::util::future::RemoteCancellable;
+use crate::util::serde::NoOutput;
 
 pub(in crate::service) struct Backup {
     pub path: PathBuf,
@@ -48,7 +49,7 @@ impl Handler<Backup> for ServiceActor {
                 .mount_backup(path, ReadWrite)
                 .await?;
             seed.persistent_container
-                .execute(id, ProcedureName::CreateBackup, Value::Null, None)
+                .execute::<NoOutput>(id, ProcedureName::CreateBackup, Value::Null, None)
                 .await?;
             backup_guard.unmount(true).await?;
 
diff --git a/core/startos/src/service/transition/restore.rs b/core/startos/src/service/transition/restore.rs
index 1c4020ea4..7061b0c1e 100644
--- a/core/startos/src/service/transition/restore.rs
+++ b/core/startos/src/service/transition/restore.rs
@@ -11,6 +11,7 @@ use crate::service::ServiceActor;
 use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::{ConflictBuilder, Handler};
 use crate::util::future::RemoteCancellable;
+use crate::util::serde::NoOutput;
 
 pub(in crate::service) struct Restore {
     pub path: PathBuf,
@@ -38,7 +39,7 @@ impl Handler<Restore> for ServiceActor {
                     .mount_backup(path, ReadOnly)
                     .await?;
                 seed.persistent_container
-                    .execute(id, ProcedureName::RestoreBackup, Value::Null, None)
+                    .execute::<NoOutput>(id, ProcedureName::RestoreBackup, Value::Null, None)
                     .await?;
                 backup_guard.unmount(true).await?;
 
@@ -48,7 +49,7 @@ impl Handler<Restore> for ServiceActor {
                 Ok::<_, Error>(())
             }
             .map(|x| {
-                if let Err(err) = dbg!(x) {
+                if let Err(err) = x {
                     tracing::debug!("{:?}", err);
                     tracing::warn!("{}", err);
                 }
diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs
index 1319ffae4..e9109cabe 100644
--- a/core/startos/src/setup.rs
+++ b/core/startos/src/setup.rs
@@ -4,6 +4,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use color_eyre::eyre::eyre;
+use const_format::formatcp;
 use josekit::jwk::Jwk;
 use patch_db::json_ptr::ROOT;
 use rpc_toolkit::yajrc::RpcError;
@@ -38,7 +39,7 @@ use crate::rpc_continuations::Guid;
 use crate::util::crypto::EncryptedWire;
 use crate::util::io::{create_file, dir_copy, dir_size, Counter};
 use crate::util::Invoke;
-use crate::{Error, ErrorKind, ResultExt};
+use crate::{Error, ErrorKind, ResultExt, DATA_DIR, MAIN_DATA, PACKAGE_DATA};
 
 pub fn setup<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -80,7 +81,7 @@ async fn setup_init(
     password: Option<String>,
     init_phases: InitPhases,
 ) -> Result<(AccountInfo, PreInitNetController), Error> {
-    let InitResult { net_ctrl } = init(&ctx.config, init_phases).await?;
+    let InitResult { net_ctrl } = init(&ctx.webserver, &ctx.config, init_phases).await?;
 
     let account = net_ctrl
         .db
@@ -140,7 +141,7 @@ pub async fn attach(
             disk_phase.start();
             let requires_reboot = crate::disk::main::import(
                 &*disk_guid,
-                &setup_ctx.datadir,
+                DATA_DIR,
                 if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
                     RepairStrategy::Aggressive
                 } else {
@@ -155,7 +156,7 @@ pub async fn attach(
                     .with_ctx(|_| (ErrorKind::Filesystem, REPAIR_DISK_PATH))?;
             }
             if requires_reboot.0 {
-                crate::disk::main::export(&*disk_guid, &setup_ctx.datadir).await?;
+                crate::disk::main::export(&*disk_guid, DATA_DIR).await?;
                 return Err(Error::new(
                     eyre!(
                         "Errors were corrected with your disk, but the server must be restarted in order to proceed"
@@ -167,7 +168,7 @@ pub async fn attach(
 
             let (account, net_ctrl) = setup_init(&setup_ctx, password, init_phases).await?;
 
-            let rpc_ctx = RpcContext::init(&setup_ctx.config, disk_guid, Some(net_ctrl), rpc_ctx_phases).await?;
+            let rpc_ctx = RpcContext::init(&setup_ctx.webserver, &setup_ctx.config, disk_guid, Some(net_ctrl), rpc_ctx_phases).await?;
 
             Ok(((&account).try_into()?, rpc_ctx))
         })?;
@@ -391,18 +392,13 @@ pub async fn execute_inner(
         crate::disk::main::create(
             &[start_os_logicalname],
             &pvscan().await?,
-            &ctx.datadir,
+            DATA_DIR,
             encryption_password,
         )
         .await?,
     );
-    let _ = crate::disk::main::import(
-        &*guid,
-        &ctx.datadir,
-        RepairStrategy::Preen,
-        encryption_password,
-    )
-    .await?;
+    let _ = crate::disk::main::import(&*guid, DATA_DIR, RepairStrategy::Preen, encryption_password)
+        .await?;
     disk_phase.complete();
 
     let progress = SetupExecuteProgress {
@@ -456,9 +452,16 @@ async fn fresh_setup(
     db.put(&ROOT, &Database::init(&account)?).await?;
     drop(db);
 
-    let InitResult { net_ctrl } = init(&ctx.config, init_phases).await?;
+    let InitResult { net_ctrl } = init(&ctx.webserver, &ctx.config, init_phases).await?;
 
-    let rpc_ctx = RpcContext::init(&ctx.config, guid, Some(net_ctrl), rpc_ctx_phases).await?;
+    let rpc_ctx = RpcContext::init(
+        &ctx.webserver,
+        &ctx.config,
+        guid,
+        Some(net_ctrl),
+        rpc_ctx_phases,
+    )
+    .await?;
 
     Ok(((&account).try_into()?, rpc_ctx))
 }
@@ -513,10 +516,10 @@ async fn migrate(
     )
     .await?;
 
-    let main_transfer_args = ("/media/startos/migrate/main/", "/embassy-data/main/");
+    let main_transfer_args = ("/media/startos/migrate/main/", formatcp!("{MAIN_DATA}/"));
     let package_data_transfer_args = (
         "/media/startos/migrate/package-data/",
-        "/embassy-data/package-data/",
+        formatcp!("{PACKAGE_DATA}/"),
     );
 
     let tmpdir = Path::new(package_data_transfer_args.0).join("tmp");
@@ -571,7 +574,14 @@ async fn migrate(
 
     let (account, net_ctrl) = setup_init(&ctx, Some(start_os_password), init_phases).await?;
 
-    let rpc_ctx = RpcContext::init(&ctx.config, guid, Some(net_ctrl), rpc_ctx_phases).await?;
+    let rpc_ctx = RpcContext::init(
+        &ctx.webserver,
+        &ctx.config,
+        guid,
+        Some(net_ctrl),
+        rpc_ctx_phases,
+    )
+    .await?;
 
     Ok(((&account).try_into()?, rpc_ctx))
 }
diff --git a/core/startos/src/shutdown.rs b/core/startos/src/shutdown.rs
index f6a984897..4e45f74c0 100644
--- a/core/startos/src/shutdown.rs
+++ b/core/startos/src/shutdown.rs
@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use crate::context::RpcContext;
@@ -7,7 +7,7 @@ use crate::init::{STANDBY_MODE_PATH, SYSTEM_REBUILD_PATH};
 use crate::prelude::*;
 use crate::sound::SHUTDOWN;
 use crate::util::Invoke;
-use crate::PLATFORM;
+use crate::{DATA_DIR, PLATFORM};
 
 #[derive(Debug, Clone)]
 pub struct Shutdown {
@@ -87,7 +87,7 @@ pub async fn shutdown(ctx: RpcContext) -> Result<(), Error> {
         .await?;
     ctx.shutdown
         .send(Some(Shutdown {
-            export_args: Some((ctx.disk_guid.clone(), ctx.datadir.clone())),
+            export_args: Some((ctx.disk_guid.clone(), Path::new(DATA_DIR).to_owned())),
             restart: false,
         }))
         .map_err(|_| ())
@@ -107,7 +107,7 @@ pub async fn restart(ctx: RpcContext) -> Result<(), Error> {
         .await?;
     ctx.shutdown
         .send(Some(Shutdown {
-            export_args: Some((ctx.disk_guid.clone(), ctx.datadir.clone())),
+            export_args: Some((ctx.disk_guid.clone(), Path::new(DATA_DIR).to_owned())),
             restart: true,
         }))
         .map_err(|_| ())
diff --git a/core/startos/src/status/mod.rs b/core/startos/src/status/mod.rs
index 398797a5a..cf1ca0658 100644
--- a/core/startos/src/status/mod.rs
+++ b/core/startos/src/status/mod.rs
@@ -80,7 +80,7 @@ impl MainStatus {
         }
     }
 
-    pub fn backing_up(self) -> Self {
+    pub fn backing_up(&self) -> Self {
         MainStatus::BackingUp {
             on_complete: if self.running() {
                 StartStop::Start
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index d05af09b5..e44431894 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -30,6 +30,7 @@ use crate::util::cpupower::{get_available_governors, set_governor, Governor};
 use crate::util::io::open_file;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
 use crate::util::Invoke;
+use crate::{MAIN_DATA, PACKAGE_DATA};
 
 pub fn experimental<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -808,10 +809,10 @@ pub async fn get_mem_info() -> Result<MetricsMemory, Error> {
 
 #[instrument(skip_all)]
 async fn get_disk_info() -> Result<MetricsDisk, Error> {
-    let package_used_task = get_used("/embassy-data/package-data");
-    let package_available_task = get_available("/embassy-data/package-data");
-    let os_used_task = get_used("/embassy-data/main");
-    let os_available_task = get_available("/embassy-data/main");
+    let package_used_task = get_used(PACKAGE_DATA);
+    let package_available_task = get_available(PACKAGE_DATA);
+    let os_used_task = get_used(MAIN_DATA);
+    let os_available_task = get_available(MAIN_DATA);
 
     let (package_used, package_available, os_used, os_available) = futures::try_join!(
         package_used_task,
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index 51d8d77ae..d88838d4a 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -20,7 +20,7 @@ use ts_rs::TS;
 use crate::context::{CliContext, RpcContext};
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
-use crate::disk::mount::filesystem::efivarfs::{self, EfiVarFs};
+use crate::disk::mount::filesystem::efivarfs::{ EfiVarFs};
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::disk::mount::filesystem::MountType;
 use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
diff --git a/core/startos/src/util/actor/background.rs b/core/startos/src/util/actor/background.rs
index f37e10c14..7666cbf04 100644
--- a/core/startos/src/util/actor/background.rs
+++ b/core/startos/src/util/actor/background.rs
@@ -15,8 +15,13 @@ impl BackgroundJobQueue {
             },
         )
     }
-    pub fn add_job(&self, fut: impl Future<Output = ()> + Send + 'static) {
-        let _ = self.0.send(fut.boxed());
+    pub fn add_job(&self, fut: impl Future + Send + 'static) {
+        let _ = self.0.send(
+            async {
+                fut.await;
+            }
+            .boxed(),
+        );
     }
 }
 
diff --git a/core/startos/src/util/future.rs b/core/startos/src/util/future.rs
index f40e847bf..c690f9754 100644
--- a/core/startos/src/util/future.rs
+++ b/core/startos/src/util/future.rs
@@ -1,11 +1,13 @@
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-use futures::future::abortable;
-use futures::stream::{AbortHandle, Abortable};
-use futures::Future;
+use futures::future::{abortable, pending, BoxFuture, FusedFuture};
+use futures::stream::{AbortHandle, Abortable, BoxStream};
+use futures::{Future, FutureExt, Stream, StreamExt};
 use tokio::sync::watch;
 
+use crate::prelude::*;
+
 #[pin_project::pin_project(PinnedDrop)]
 pub struct DropSignaling<F> {
     #[pin]
@@ -102,6 +104,60 @@ impl CancellationHandle {
     }
 }
 
+#[derive(Default)]
+pub struct Until<'a> {
+    streams: Vec<BoxStream<'a, Result<(), Error>>>,
+    async_fns: Vec<Box<dyn FnMut() -> BoxFuture<'a, Result<(), Error>> + Send + 'a>>,
+}
+impl<'a> Until<'a> {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn with_stream(
+        mut self,
+        stream: impl Stream<Item = Result<(), Error>> + Send + 'a,
+    ) -> Self {
+        self.streams.push(stream.boxed());
+        self
+    }
+
+    pub fn with_async_fn<F, Fut>(mut self, mut f: F) -> Self
+    where
+        F: FnMut() -> Fut + Send + 'a,
+        Fut: Future<Output = Result<(), Error>> + FusedFuture + Send + 'a,
+    {
+        self.async_fns.push(Box::new(move || f().boxed()));
+        self
+    }
+
+    pub async fn run<Fut: Future<Output = Result<(), Error>> + Send>(
+        &mut self,
+        fut: Fut,
+    ) -> Result<(), Error> {
+        let (res, _, _) = futures::future::select_all(
+            self.streams
+                .iter_mut()
+                .map(|s| {
+                    async {
+                        s.next().await.transpose()?.ok_or_else(|| {
+                            Error::new(eyre!("stream is empty"), ErrorKind::Cancelled)
+                        })
+                    }
+                    .boxed()
+                })
+                .chain(self.async_fns.iter_mut().map(|f| f()))
+                .chain([async {
+                    fut.await?;
+                    pending().await
+                }
+                .boxed()]),
+        )
+        .await;
+        res
+    }
+}
+
 #[tokio::test]
 async fn test_cancellable() {
     use std::sync::Arc;
diff --git a/core/startos/src/util/io.rs b/core/startos/src/util/io.rs
index 0e7aada54..f0bae7a0a 100644
--- a/core/startos/src/util/io.rs
+++ b/core/startos/src/util/io.rs
@@ -15,7 +15,7 @@ use futures::future::{BoxFuture, Fuse};
 use futures::{AsyncSeek, FutureExt, Stream, TryStreamExt};
 use helpers::NonDetachingJoinHandle;
 use nix::unistd::{Gid, Uid};
-use tokio::fs::File;
+use tokio::fs::{File, OpenOptions};
 use tokio::io::{
     duplex, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, DuplexStream, ReadBuf, WriteHalf,
 };
@@ -460,18 +460,30 @@ impl<T> BackTrackingIO<T> {
             }
         }
     }
-    pub fn rewind(&mut self) -> Vec<u8> {
+    pub fn rewind<'a>(&'a mut self) -> (Vec<u8>, &'a [u8]) {
         match std::mem::take(&mut self.buffer) {
             BTBuffer::Buffering { read, write } => {
                 self.buffer = BTBuffer::Rewound {
                     read: Cursor::new(read),
                 };
-                write
+                (
+                    write,
+                    match &self.buffer {
+                        BTBuffer::Rewound { read } => read.get_ref(),
+                        _ => unreachable!(),
+                    },
+                )
             }
-            BTBuffer::NotBuffering => Vec::new(),
+            BTBuffer::NotBuffering => (Vec::new(), &[]),
             BTBuffer::Rewound { read } => {
                 self.buffer = BTBuffer::Rewound { read };
-                Vec::new()
+                (
+                    Vec::new(),
+                    match &self.buffer {
+                        BTBuffer::Rewound { read } => read.get_ref(),
+                        _ => unreachable!(),
+                    },
+                )
             }
         }
     }
@@ -529,7 +541,6 @@ impl<T: std::io::Read> std::io::Read for BackTrackingIO<T> {
             }
             BTBuffer::NotBuffering => self.io.read(buf),
             BTBuffer::Rewound { read } => {
-                let mut ready = false;
                 if (read.position() as usize) < read.get_ref().len() {
                     let n = std::io::Read::read(read, buf)?;
                     if n != 0 {
@@ -923,6 +934,21 @@ pub async fn create_file(path: impl AsRef<Path>) -> Result<File, Error> {
         .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("create {path:?}")))
 }
 
+pub async fn append_file(path: impl AsRef<Path>) -> Result<File, Error> {
+    let path = path.as_ref();
+    if let Some(parent) = path.parent() {
+        tokio::fs::create_dir_all(parent)
+            .await
+            .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("mkdir -p {parent:?}")))?;
+    }
+    OpenOptions::new()
+        .create(true)
+        .append(true)
+        .open(path)
+        .await
+        .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("create {path:?}")))
+}
+
 pub async fn delete_file(path: impl AsRef<Path>) -> Result<(), Error> {
     let path = path.as_ref();
     tokio::fs::remove_file(path)
diff --git a/core/startos/src/util/logger.rs b/core/startos/src/util/logger.rs
index c464b328d..816721d5b 100644
--- a/core/startos/src/util/logger.rs
+++ b/core/startos/src/util/logger.rs
@@ -1,13 +1,62 @@
-use std::io;
+use std::fs::File;
+use std::io::{self, Write};
+use std::sync::{Arc, Mutex, MutexGuard};
 
+use lazy_static::lazy_static;
 use tracing::Subscriber;
+use tracing_subscriber::fmt::MakeWriter;
 use tracing_subscriber::util::SubscriberInitExt;
 
+lazy_static! {
+    pub static ref LOGGER: StartOSLogger = StartOSLogger::init();
+}
+
 #[derive(Clone)]
-pub struct EmbassyLogger {}
+pub struct StartOSLogger {
+    logfile: LogFile,
+}
+
+#[derive(Clone, Default)]
+struct LogFile(Arc<Mutex<Option<File>>>);
+impl<'a> MakeWriter<'a> for LogFile {
+    type Writer = Box<dyn Write + 'a>;
+    fn make_writer(&'a self) -> Self::Writer {
+        let f = self.0.lock().unwrap();
+        if f.is_some() {
+            struct TeeWriter<'a>(MutexGuard<'a, Option<File>>);
+            impl<'a> Write for TeeWriter<'a> {
+                fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+                    let n = if let Some(f) = &mut *self.0 {
+                        f.write(buf)?
+                    } else {
+                        buf.len()
+                    };
+                    io::stderr().write_all(&buf[..n])?;
+                    Ok(n)
+                }
+                fn flush(&mut self) -> io::Result<()> {
+                    if let Some(f) = &mut *self.0 {
+                        f.flush()?;
+                    }
+                    Ok(())
+                }
+            }
+            Box::new(TeeWriter(f))
+        } else {
+            drop(f);
+            Box::new(io::stderr())
+        }
+    }
+}
+
+impl StartOSLogger {
+    pub fn enable(&self) {}
+
+    pub fn set_logfile(&self, logfile: Option<File>) {
+        *self.logfile.0.lock().unwrap() = logfile;
+    }
 
-impl EmbassyLogger {
-    fn base_subscriber() -> impl Subscriber {
+    fn base_subscriber(logfile: LogFile) -> impl Subscriber {
         use tracing_error::ErrorLayer;
         use tracing_subscriber::prelude::*;
         use tracing_subscriber::{fmt, EnvFilter};
@@ -24,7 +73,7 @@ impl EmbassyLogger {
             .add_directive("tokio=trace".parse().unwrap())
             .add_directive("runtime=trace".parse().unwrap());
         let fmt_layer = fmt::layer()
-            .with_writer(io::stderr)
+            .with_writer(logfile)
             .with_line_number(true)
             .with_file(true)
             .with_target(true);
@@ -39,11 +88,12 @@ impl EmbassyLogger {
 
         sub
     }
-    pub fn init() -> Self {
-        Self::base_subscriber().init();
+    fn init() -> Self {
+        let logfile = LogFile::default();
+        Self::base_subscriber(logfile.clone()).init();
         color_eyre::install().unwrap_or_else(|_| tracing::warn!("tracing too many times"));
 
-        EmbassyLogger {}
+        StartOSLogger { logfile }
     }
 }
 
diff --git a/core/startos/src/util/rpc.rs b/core/startos/src/util/rpc.rs
index b2dea340e..f7c91eb82 100644
--- a/core/startos/src/util/rpc.rs
+++ b/core/startos/src/util/rpc.rs
@@ -3,7 +3,6 @@ use std::path::Path;
 use clap::Parser;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
-use url::Url;
 
 use crate::context::CliContext;
 use crate::prelude::*;
diff --git a/core/startos/src/util/rpc_client.rs b/core/startos/src/util/rpc_client.rs
index fc93e4c64..82ce11e20 100644
--- a/core/startos/src/util/rpc_client.rs
+++ b/core/startos/src/util/rpc_client.rs
@@ -47,7 +47,7 @@ impl RpcClient {
                 let mut lines = BufReader::new(reader).lines();
                 while let Some(line) = lines.next_line().await.transpose() {
                     match line.map_err(Error::from).and_then(|l| {
-                        serde_json::from_str::<RpcResponse>(dbg!(&l))
+                        serde_json::from_str::<RpcResponse>(crate::dbg!(&l))
                             .with_kind(ErrorKind::Deserialization)
                     }) {
                         Ok(l) => {
@@ -114,7 +114,7 @@ impl RpcClient {
             let (send, recv) = oneshot::channel();
             w.lock().await.insert(id.clone(), send);
             self.writer
-                .write_all((dbg!(serde_json::to_string(&request))? + "\n").as_bytes())
+                .write_all((crate::dbg!(serde_json::to_string(&request))? + "\n").as_bytes())
                 .await
                 .map_err(|e| {
                     let mut err = rpc_toolkit::yajrc::INTERNAL_ERROR.clone();
@@ -154,7 +154,7 @@ impl RpcClient {
             params,
         };
         self.writer
-            .write_all((dbg!(serde_json::to_string(&request))? + "\n").as_bytes())
+            .write_all((crate::dbg!(serde_json::to_string(&request))? + "\n").as_bytes())
             .await
             .map_err(|e| {
                 let mut err = rpc_toolkit::yajrc::INTERNAL_ERROR.clone();
diff --git a/core/startos/src/util/sync.rs b/core/startos/src/util/sync.rs
index 1edd21ce1..2630858a9 100644
--- a/core/startos/src/util/sync.rs
+++ b/core/startos/src/util/sync.rs
@@ -1,3 +1,4 @@
+#[derive(Debug, Default)]
 pub struct SyncMutex<T>(std::sync::Mutex<T>);
 impl<T> SyncMutex<T> {
     pub fn new(t: T) -> Self {
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index 94b61176b..e8d5f2249 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -7,12 +7,10 @@ use futures::future::BoxFuture;
 use futures::{Future, FutureExt};
 use imbl::Vector;
 use imbl_value::{to_value, InternedString};
-use patch_db::json_ptr::{JsonPointer, ROOT};
+use patch_db::json_ptr::{ ROOT};
 
 use crate::context::RpcContext;
-use crate::db::model::Database;
 use crate::prelude::*;
-use crate::progress::PhaseProgressTrackerHandle;
 use crate::Error;
 
 mod v0_3_5;
@@ -29,7 +27,9 @@ mod v0_3_6_alpha_7;
 mod v0_3_6_alpha_8;
 mod v0_3_6_alpha_9;
 
-pub type Current = v0_3_6_alpha_9::Version; // VERSION_BUMP
+mod v0_3_6_alpha_10;
+
+pub type Current = v0_3_6_alpha_10::Version; // VERSION_BUMP
 
 impl Current {
     #[instrument(skip(self, db))]
@@ -108,6 +108,7 @@ enum Version {
     V0_3_6_alpha_7(Wrapper<v0_3_6_alpha_7::Version>),
     V0_3_6_alpha_8(Wrapper<v0_3_6_alpha_8::Version>),
     V0_3_6_alpha_9(Wrapper<v0_3_6_alpha_9::Version>),
+    V0_3_6_alpha_10(Wrapper<v0_3_6_alpha_10::Version>),
     Other(exver::Version),
 }
 
@@ -141,6 +142,7 @@ impl Version {
             Self::V0_3_6_alpha_7(v) => DynVersion(Box::new(v.0)),
             Self::V0_3_6_alpha_8(v) => DynVersion(Box::new(v.0)),
             Self::V0_3_6_alpha_9(v) => DynVersion(Box::new(v.0)),
+            Self::V0_3_6_alpha_10(v) => DynVersion(Box::new(v.0)),
             Self::Other(v) => {
                 return Err(Error::new(
                     eyre!("unknown version {v}"),
@@ -166,6 +168,7 @@ impl Version {
             Version::V0_3_6_alpha_7(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_8(Wrapper(x)) => x.semver(),
             Version::V0_3_6_alpha_9(Wrapper(x)) => x.semver(),
+            Version::V0_3_6_alpha_10(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
diff --git a/core/startos/src/version/v0_3_6_alpha_0.rs b/core/startos/src/version/v0_3_6_alpha_0.rs
index 7a6045a3a..7c594a9f9 100644
--- a/core/startos/src/version/v0_3_6_alpha_0.rs
+++ b/core/startos/src/version/v0_3_6_alpha_0.rs
@@ -1,19 +1,16 @@
 use std::collections::BTreeMap;
-use std::future::Future;
 use std::path::Path;
 
 use chrono::{DateTime, Utc};
+use const_format::formatcp;
 use ed25519_dalek::SigningKey;
 use exver::{PreReleaseSegment, VersionRange};
 use imbl_value::{json, InternedString};
-use itertools::Itertools;
 use models::PackageId;
-use openssl::pkey::{PKey, Private};
+use openssl::pkey::PKey;
 use openssl::x509::X509;
-use patch_db::ModelExt;
 use sqlx::postgres::PgConnectOptions;
 use sqlx::{PgPool, Row};
-use ssh_key::Fingerprint;
 use tokio::process::Command;
 use torut::onion::TorSecretKeyV3;
 
@@ -23,15 +20,11 @@ use crate::account::AccountInfo;
 use crate::auth::Sessions;
 use crate::backup::target::cifs::CifsTargets;
 use crate::context::RpcContext;
-use crate::db::model::Database;
 use crate::disk::mount::filesystem::cifs::Cifs;
 use crate::disk::mount::util::unmount;
 use crate::hostname::Hostname;
 use crate::net::forward::AvailablePorts;
 use crate::net::keys::KeyStore;
-use crate::net::ssl::CertStore;
-use crate::net::tor;
-use crate::net::tor::OnionStore;
 use crate::notifications::{Notification, Notifications};
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
@@ -39,6 +32,7 @@ use crate::ssh::{SshKeys, SshPubKey};
 use crate::util::crypto::ed25519_expand_key;
 use crate::util::serde::{Pem, PemEncoding};
 use crate::util::Invoke;
+use crate::{DATA_DIR, PACKAGE_DATA};
 
 lazy_static::lazy_static! {
     static ref V0_3_6_alpha_0: exver::Version = exver::Version::new(
@@ -191,7 +185,6 @@ async fn init_postgres(datadir: impl AsRef<Path>) -> Result<PgPool, Error> {
         .run(&secret_store)
         .await
         .with_kind(crate::ErrorKind::Database)?;
-    dbg!("Init Postgres Done");
     Ok(secret_store)
 }
 
@@ -208,7 +201,7 @@ impl VersionT for Version {
         &V0_3_0_COMPAT
     }
     async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
-        let pg = init_postgres("/embassy-data").await?;
+        let pg = init_postgres(DATA_DIR).await?;
         let account = previous_account_info(&pg).await?;
 
         let ssh_keys = previous_ssh_keys(&pg).await?;
@@ -315,7 +308,6 @@ impl VersionT for Version {
             "private": private,
         });
 
-        dbg!("Should be done with the up");
         *db = next;
         Ok(())
     }
@@ -329,7 +321,7 @@ impl VersionT for Version {
     #[instrument(skip(self, ctx))]
     /// MUST be idempotent, and is run after *all* db migrations
     async fn post_up(self, ctx: &RpcContext) -> Result<(), Error> {
-        let path = Path::new("/embassy-data/package-data/archive/");
+        let path = Path::new(formatcp!("{PACKAGE_DATA}/archive/"));
         if !path.is_dir() {
             return Err(Error::new(
                 eyre!(
diff --git a/core/startos/src/version/v0_3_6_alpha_10.rs b/core/startos/src/version/v0_3_6_alpha_10.rs
new file mode 100644
index 000000000..d81fc91ca
--- /dev/null
+++ b/core/startos/src/version/v0_3_6_alpha_10.rs
@@ -0,0 +1,94 @@
+use std::collections::{BTreeMap, BTreeSet};
+
+use exver::{PreReleaseSegment, VersionRange};
+use imbl_value::InternedString;
+use serde::{Deserialize, Serialize};
+use torut::onion::OnionAddressV3;
+
+use super::v0_3_5::V0_3_0_COMPAT;
+use super::{v0_3_6_alpha_9, VersionT};
+use crate::net::host::address::DomainConfig;
+use crate::prelude::*;
+
+lazy_static::lazy_static! {
+    static ref V0_3_6_alpha_10: exver::Version = exver::Version::new(
+        [0, 3, 6],
+        [PreReleaseSegment::String("alpha".into()), 10.into()]
+    );
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
+#[serde(rename_all = "camelCase")]
+#[serde(tag = "kind")]
+enum HostAddress {
+    Onion { address: OnionAddressV3 },
+    Domain { address: InternedString },
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Version;
+
+impl VersionT for Version {
+    type Previous = v0_3_6_alpha_9::Version;
+    type PreUpRes = ();
+
+    async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
+        Ok(())
+    }
+    fn semver(self) -> exver::Version {
+        V0_3_6_alpha_10.clone()
+    }
+    fn compat(self) -> &'static VersionRange {
+        &V0_3_0_COMPAT
+    }
+    fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+        for (_, package) in db["public"]["packageData"]
+            .as_object_mut()
+            .ok_or_else(|| {
+                Error::new(
+                    eyre!("expected public.packageData to be an object"),
+                    ErrorKind::Database,
+                )
+            })?
+            .iter_mut()
+        {
+            for (_, host) in package["hosts"]
+                .as_object_mut()
+                .ok_or_else(|| {
+                    Error::new(
+                        eyre!("expected public.packageData[id].hosts to be an object"),
+                        ErrorKind::Database,
+                    )
+                })?
+                .iter_mut()
+            {
+                let mut onions = BTreeSet::new();
+                let mut domains = BTreeMap::new();
+                let addresses = from_value::<BTreeSet<HostAddress>>(host["addresses"].clone())?;
+                for address in addresses {
+                    match address {
+                        HostAddress::Onion { address } => {
+                            onions.insert(address);
+                        }
+                        HostAddress::Domain { address } => {
+                            domains.insert(
+                                address,
+                                DomainConfig {
+                                    public: true,
+                                    acme: None,
+                                },
+                            );
+                        }
+                    }
+                }
+                host["onions"] = to_value(&onions)?;
+                host["domains"] = to_value(&domains)?;
+            }
+        }
+
+        Ok(())
+    }
+    fn down(self, _db: &mut Value) -> Result<(), Error> {
+        Ok(())
+    }
+}
diff --git a/core/startos/src/version/v0_3_6_alpha_6.rs b/core/startos/src/version/v0_3_6_alpha_6.rs
index d91caa82b..7d62773ea 100644
--- a/core/startos/src/version/v0_3_6_alpha_6.rs
+++ b/core/startos/src/version/v0_3_6_alpha_6.rs
@@ -27,7 +27,7 @@ impl VersionT for Version {
     async fn pre_up(self) -> Result<Self::PreUpRes, Error> {
         Ok(())
     }
-    fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
     async fn post_up<'a>(self, ctx: &'a crate::context::RpcContext) -> Result<(), Error> {
diff --git a/core/startos/src/version/v0_3_6_alpha_7.rs b/core/startos/src/version/v0_3_6_alpha_7.rs
index bbf9468ff..baf7aaa35 100644
--- a/core/startos/src/version/v0_3_6_alpha_7.rs
+++ b/core/startos/src/version/v0_3_6_alpha_7.rs
@@ -1,5 +1,5 @@
 use exver::{PreReleaseSegment, VersionRange};
-use imbl_value::{json, InOMap};
+use imbl_value::json;
 use tokio::process::Command;
 
 use super::v0_3_5::V0_3_0_COMPAT;
diff --git a/core/startos/src/version/v0_3_6_alpha_8.rs b/core/startos/src/version/v0_3_6_alpha_8.rs
index fcef96a69..99920c767 100644
--- a/core/startos/src/version/v0_3_6_alpha_8.rs
+++ b/core/startos/src/version/v0_3_6_alpha_8.rs
@@ -1,3 +1,5 @@
+use std::path::Path;
+
 use exver::{PreReleaseSegment, VersionRange};
 use tokio::fs::File;
 
@@ -12,6 +14,7 @@ use crate::s9pk::v2::SIG_CONTEXT;
 use crate::s9pk::S9pk;
 use crate::service::LoadDisposition;
 use crate::util::io::create_file;
+use crate::DATA_DIR;
 
 lazy_static::lazy_static! {
     static ref V0_3_6_alpha_8: exver::Version = exver::Version::new(
@@ -40,7 +43,7 @@ impl VersionT for Version {
         Ok(())
     }
     async fn post_up(self, ctx: &crate::context::RpcContext) -> Result<(), Error> {
-        let s9pk_dir = ctx.datadir.join(PKG_ARCHIVE_DIR).join("installed");
+        let s9pk_dir = Path::new(DATA_DIR).join(PKG_ARCHIVE_DIR).join("installed");
 
         if tokio::fs::metadata(&s9pk_dir).await.is_ok() {
             let mut read_dir = tokio::fs::read_dir(&s9pk_dir).await?;
diff --git a/core/startos/src/volume.rs b/core/startos/src/volume.rs
index c7165b202..113802286 100644
--- a/core/startos/src/volume.rs
+++ b/core/startos/src/volume.rs
@@ -1,10 +1,9 @@
 use std::path::{Path, PathBuf};
 
 pub use helpers::script_dir;
+use models::PackageId;
 pub use models::VolumeId;
-use models::{HostId, PackageId};
 
-use crate::net::PACKAGE_CERT_PATH;
 use crate::prelude::*;
 use crate::util::VersionString;
 
@@ -36,7 +35,3 @@ pub fn asset_dir<P: AsRef<Path>>(
 pub fn backup_dir(pkg_id: &PackageId) -> PathBuf {
     Path::new(BACKUP_DIR).join(pkg_id).join("data")
 }
-
-pub fn cert_dir(pkg_id: &PackageId, host_id: &HostId) -> PathBuf {
-    Path::new(PACKAGE_CERT_PATH).join(pkg_id).join(host_id)
-}
diff --git a/debian/postinst b/debian/postinst
index bf9a8938e..14164dbf1 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -86,6 +86,8 @@ sed -i '/^\s*#\?\s*issue_discards\s*=\s*/c\issue_discards = 1' /etc/lvm/lvm.conf
 sed -i '/\(^\|#\)\s*unqualified-search-registries\s*=\s*/c\unqualified-search-registries = ["docker.io"]' /etc/containers/registries.conf
 sed -i 's/\(#\|\^\)\s*\([^=]\+\)=\(suspend\|hibernate\)\s*$/\2=ignore/g' /etc/systemd/logind.conf
 sed -i '/\(^\|#\)MulticastDNS=/c\MulticastDNS=no' /etc/systemd/resolved.conf
+sed -i 's/\[Service\]/[Service]\nEnvironment=SYSTEMD_LOG_LEVEL=debug/' /lib/systemd/system/systemd-timesyncd.service
+sed -i '/\(^\|#\)RootDistanceMaxSec=/c\RootDistanceMaxSec=10' /etc/systemd/timesyncd.conf
 
 mkdir -p /etc/nginx/ssl
 
@@ -103,7 +105,7 @@ rm -rf /var/lib/tor/*
 ln -sf /usr/lib/startos/scripts/tor-check.sh /usr/bin/tor-check
 ln -sf /usr/lib/startos/scripts/gather_debug_info.sh /usr/bin/gather-debug
 
-echo "fs.inotify.max_user_watches=1048576" > /etc/sysctl.d/97-embassy.conf
+echo "fs.inotify.max_user_watches=1048576" > /etc/sysctl.d/97-startos.conf
 
 # Old pi was set with this locale, because of pg we are now stuck with including that locale
 locale-gen en_GB en_GB.UTF-8 
@@ -112,16 +114,14 @@ update-locale  LANGUAGE
 rm -f "/etc/locale.gen"
 dpkg-reconfigure --frontend noninteractive locales
 
-if ! getent group | grep '^embassy:'; then
-    groupadd embassy
+if ! getent group | grep '^startos:'; then
+    groupadd startos
 fi
 
-ln -sf /usr/lib/startos/scripts/dhclient-exit-hook /etc/dhcp/dhclient-exit-hooks.d/embassy
-
 rm -f /etc/motd
-ln -sf /usr/lib/startos/motd /etc/update-motd.d/00-embassy
+ln -sf /usr/lib/startos/motd /etc/update-motd.d/00-startos
 chmod -x /etc/update-motd.d/*
-chmod +x /etc/update-motd.d/00-embassy
+chmod +x /etc/update-motd.d/00-startos
 
 # LXC
 cat /etc/subuid | grep -v '^root:' > /etc/subuid.tmp || true
diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 4ce2d6dac..9e61999e6 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -166,7 +166,7 @@ echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gp
 # Dependencies
 
 ## Base dependencies
-dpkg-deb --fsys-tarfile $base_dir/deb/${IMAGE_BASENAME}.deb | tar --to-stdout -xvf - ./usr/lib/startos/depends > config/package-lists/embassy-depends.list.chroot
+dpkg-deb --fsys-tarfile $base_dir/deb/${IMAGE_BASENAME}.deb | tar --to-stdout -xvf - ./usr/lib/startos/depends > config/package-lists/startos-depends.list.chroot
 
 ## Firmware
 if [ "$NON_FREE" = 1 ]; then
@@ -210,7 +210,7 @@ if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
 	mkinitramfs -c gzip -o /boot/initramfs_2712 6.6.62-v8-16k+
 fi
 
-useradd --shell /bin/bash -G embassy -m start9
+useradd --shell /bin/bash -G startos -m start9
 echo start9:embassy | chpasswd
 usermod -aG sudo start9
 
diff --git a/patch-db b/patch-db
index 99076d349..2600a784a 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 99076d349c6768000483ea8d47216d273586552e
+Subproject commit 2600a784a9899a6f8e0c9abe0bf4c4ce48cb85a9
diff --git a/sdk/base/lib/Effects.ts b/sdk/base/lib/Effects.ts
index e4424fafb..dcb03af4e 100644
--- a/sdk/base/lib/Effects.ts
+++ b/sdk/base/lib/Effects.ts
@@ -8,7 +8,7 @@ import {
   SetHealth,
   BindParams,
   HostId,
-  LanInfo,
+  NetInfo,
   Host,
   ExportServiceInterfaceParams,
   ServiceInterface,
@@ -117,7 +117,7 @@ export type Effects = {
     packageId?: PackageId
     hostId: HostId
     internalPort: number
-  }): Promise<LanInfo>
+  }): Promise<NetInfo>
   /** Removes all network bindings, called in the setupInputSpec */
   clearBindings(options: {
     except: { id: HostId; internalPort: number }[]
@@ -129,12 +129,6 @@ export type Effects = {
     hostId: HostId
     callback?: () => void
   }): Promise<Host | null>
-  /** Returns the primary url that a user has selected for a host, if it exists */
-  getPrimaryUrl(options: {
-    packageId?: PackageId
-    hostId: HostId
-    callback?: () => void
-  }): Promise<UrlString | null>
   /** Returns the IP address of the container */
   getContainerIp(): Promise<string>
   // interface
diff --git a/sdk/base/lib/actions/input/builder/inputSpec.ts b/sdk/base/lib/actions/input/builder/inputSpec.ts
index 31e06df4f..5d4d5c6bb 100644
--- a/sdk/base/lib/actions/input/builder/inputSpec.ts
+++ b/sdk/base/lib/actions/input/builder/inputSpec.ts
@@ -94,8 +94,8 @@ export class InputSpec<Type extends Record<string, any>, Store = never> {
     },
     public validator: Parser<unknown, Type>,
   ) {}
-  _TYPE: Type = null as any as Type
-  _PARTIAL: DeepPartial<Type> = null as any as DeepPartial<Type>
+  public _TYPE: Type = null as any as Type
+  public _PARTIAL: DeepPartial<Type> = null as any as DeepPartial<Type>
   async build(options: LazyBuildOptions<Store>) {
     const answer = {} as {
       [K in keyof Type]: ValueSpec
diff --git a/sdk/base/lib/actions/input/builder/value.ts b/sdk/base/lib/actions/input/builder/value.ts
index 676c4aac1..3ff3c2d24 100644
--- a/sdk/base/lib/actions/input/builder/value.ts
+++ b/sdk/base/lib/actions/input/builder/value.ts
@@ -49,6 +49,9 @@ export class Value<Type, Store> {
     public build: LazyBuild<Store, ValueSpec>,
     public validator: Parser<unknown, Type>,
   ) {}
+  public _TYPE: Type = null as any as Type
+  public _PARTIAL: DeepPartial<Type> = null as any as DeepPartial<Type>
+
   static toggle(a: {
     name: string
     description?: string | null
diff --git a/sdk/base/lib/dependencies/setupDependencies.ts b/sdk/base/lib/dependencies/setupDependencies.ts
index 6b15ef0d1..4583ae749 100644
--- a/sdk/base/lib/dependencies/setupDependencies.ts
+++ b/sdk/base/lib/dependencies/setupDependencies.ts
@@ -31,7 +31,7 @@ export type CurrentDependenciesResult<Manifest extends T.SDKManifest> = {
   [K in RequiredDependenciesOf<Manifest>]: DependencyRequirement
 } & {
   [K in OptionalDependenciesOf<Manifest>]?: DependencyRequirement
-} & Record<string, DependencyRequirement>
+}
 
 export function setupDependencies<Manifest extends T.SDKManifest>(
   fn: (options: {
@@ -48,14 +48,16 @@ export function setupDependencies<Manifest extends T.SDKManifest>(
     }
     const dependencyType = await fn(options)
     return await options.effects.setDependencies({
-      dependencies: Object.entries(dependencyType).map(
-        ([id, { versionRange, ...x }, ,]) =>
-          ({
-            // id,
-            ...x,
-            versionRange: versionRange.toString(),
-          }) as T.DependencyRequirement,
-      ),
+      dependencies: Object.entries(dependencyType)
+        .map(([k, v]) => [k, v as DependencyRequirement] as const)
+        .map(
+          ([id, { versionRange, ...x }]) =>
+            ({
+              id,
+              ...x,
+              versionRange: versionRange.toString(),
+            }) as T.DependencyRequirement,
+        ),
     })
   }
   return cell.updater
diff --git a/sdk/base/lib/interfaces/Origin.ts b/sdk/base/lib/interfaces/Origin.ts
index 5e12713e6..9985176e4 100644
--- a/sdk/base/lib/interfaces/Origin.ts
+++ b/sdk/base/lib/interfaces/Origin.ts
@@ -46,7 +46,6 @@ export class Origin<T extends Host> {
       const {
         name,
         description,
-        hasPrimary,
         id,
         type,
         username,
@@ -67,7 +66,6 @@ export class Origin<T extends Host> {
         id,
         name,
         description,
-        hasPrimary,
         addressInfo,
         type,
         masked,
diff --git a/sdk/base/lib/interfaces/ServiceInterfaceBuilder.ts b/sdk/base/lib/interfaces/ServiceInterfaceBuilder.ts
index 4ef294b4f..036180ad3 100644
--- a/sdk/base/lib/interfaces/ServiceInterfaceBuilder.ts
+++ b/sdk/base/lib/interfaces/ServiceInterfaceBuilder.ts
@@ -20,7 +20,6 @@ export class ServiceInterfaceBuilder {
       name: string
       id: string
       description: string
-      hasPrimary: boolean
       type: ServiceInterfaceType
       username: string | null
       path: string
diff --git a/sdk/base/lib/osBindings/HostAddress.ts b/sdk/base/lib/osBindings/AcmeProvider.ts
similarity index 51%
rename from sdk/base/lib/osBindings/HostAddress.ts
rename to sdk/base/lib/osBindings/AcmeProvider.ts
index 73b46d8e5..0ad3f0052 100644
--- a/sdk/base/lib/osBindings/HostAddress.ts
+++ b/sdk/base/lib/osBindings/AcmeProvider.ts
@@ -1,5 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type HostAddress =
-  | { kind: "onion"; address: string }
-  | { kind: "domain"; address: string }
+export type AcmeProvider = string
diff --git a/sdk/base/lib/osBindings/AcmeSettings.ts b/sdk/base/lib/osBindings/AcmeSettings.ts
index bdf151ec7..44e70d9df 100644
--- a/sdk/base/lib/osBindings/AcmeSettings.ts
+++ b/sdk/base/lib/osBindings/AcmeSettings.ts
@@ -1,13 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AcmeSettings = {
-  provider: string
-  /**
-   * email addresses for letsencrypt
-   */
-  contact: Array<string>
-  /**
-   * domains to get letsencrypt certs for
-   */
-  domains: string[]
-}
+export type AcmeSettings = { contact: Array<string> }
diff --git a/sdk/base/lib/osBindings/BindInfo.ts b/sdk/base/lib/osBindings/BindInfo.ts
index 85fc38e94..b03dbe6b2 100644
--- a/sdk/base/lib/osBindings/BindInfo.ts
+++ b/sdk/base/lib/osBindings/BindInfo.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BindOptions } from "./BindOptions"
-import type { LanInfo } from "./LanInfo"
+import type { NetInfo } from "./NetInfo"
 
-export type BindInfo = { enabled: boolean; options: BindOptions; lan: LanInfo }
+export type BindInfo = { enabled: boolean; options: BindOptions; net: NetInfo }
diff --git a/sdk/base/lib/osBindings/DomainConfig.ts b/sdk/base/lib/osBindings/DomainConfig.ts
new file mode 100644
index 000000000..433bc65f5
--- /dev/null
+++ b/sdk/base/lib/osBindings/DomainConfig.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AcmeProvider } from "./AcmeProvider"
+
+export type DomainConfig = { public: boolean; acme: AcmeProvider | null }
diff --git a/sdk/base/lib/osBindings/ExportServiceInterfaceParams.ts b/sdk/base/lib/osBindings/ExportServiceInterfaceParams.ts
index 28ac89916..675c3e06d 100644
--- a/sdk/base/lib/osBindings/ExportServiceInterfaceParams.ts
+++ b/sdk/base/lib/osBindings/ExportServiceInterfaceParams.ts
@@ -7,7 +7,6 @@ export type ExportServiceInterfaceParams = {
   id: ServiceInterfaceId
   name: string
   description: string
-  hasPrimary: boolean
   masked: boolean
   addressInfo: AddressInfo
   type: ServiceInterfaceType
diff --git a/sdk/base/lib/osBindings/ForgetInterfaceParams.ts b/sdk/base/lib/osBindings/ForgetInterfaceParams.ts
new file mode 100644
index 000000000..b3532602c
--- /dev/null
+++ b/sdk/base/lib/osBindings/ForgetInterfaceParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ForgetInterfaceParams = { interface: string }
diff --git a/sdk/base/lib/osBindings/GetPrimaryUrlParams.ts b/sdk/base/lib/osBindings/GetPrimaryUrlParams.ts
deleted file mode 100644
index 06bf73976..000000000
--- a/sdk/base/lib/osBindings/GetPrimaryUrlParams.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CallbackId } from "./CallbackId"
-import type { HostId } from "./HostId"
-import type { PackageId } from "./PackageId"
-
-export type GetPrimaryUrlParams = {
-  packageId?: PackageId
-  hostId: HostId
-  callback?: CallbackId
-}
diff --git a/sdk/base/lib/osBindings/GitHash.ts b/sdk/base/lib/osBindings/GitHash.ts
new file mode 100644
index 000000000..43f6adde3
--- /dev/null
+++ b/sdk/base/lib/osBindings/GitHash.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GitHash = string
diff --git a/sdk/base/lib/osBindings/Host.ts b/sdk/base/lib/osBindings/Host.ts
index 7d8cf3a90..5436e9955 100644
--- a/sdk/base/lib/osBindings/Host.ts
+++ b/sdk/base/lib/osBindings/Host.ts
@@ -1,13 +1,14 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { BindInfo } from "./BindInfo"
-import type { HostAddress } from "./HostAddress"
+import type { DomainConfig } from "./DomainConfig"
 import type { HostKind } from "./HostKind"
 import type { HostnameInfo } from "./HostnameInfo"
 
 export type Host = {
   kind: HostKind
   bindings: { [key: number]: BindInfo }
-  addresses: Array<HostAddress>
+  onions: string[]
+  domains: { [key: string]: DomainConfig }
   /**
    * COMPUTED: NetService::update
    */
diff --git a/sdk/base/lib/osBindings/IpHostname.ts b/sdk/base/lib/osBindings/IpHostname.ts
index 4a6b5e87c..9b3ddd6d1 100644
--- a/sdk/base/lib/osBindings/IpHostname.ts
+++ b/sdk/base/lib/osBindings/IpHostname.ts
@@ -2,7 +2,13 @@
 
 export type IpHostname =
   | { kind: "ipv4"; value: string; port: number | null; sslPort: number | null }
-  | { kind: "ipv6"; value: string; port: number | null; sslPort: number | null }
+  | {
+      kind: "ipv6"
+      value: string
+      scopeId: number
+      port: number | null
+      sslPort: number | null
+    }
   | {
       kind: "local"
       value: string
diff --git a/sdk/base/lib/osBindings/IpInfo.ts b/sdk/base/lib/osBindings/IpInfo.ts
index ae8c88d1b..260add9e6 100644
--- a/sdk/base/lib/osBindings/IpInfo.ts
+++ b/sdk/base/lib/osBindings/IpInfo.ts
@@ -1,8 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { NetworkInterfaceType } from "./NetworkInterfaceType"
 
 export type IpInfo = {
-  ipv4Range: string | null
-  ipv4: string | null
-  ipv6Range: string | null
-  ipv6: string | null
+  scopeId: number
+  deviceType: NetworkInterfaceType | null
+  subnets: string[]
+  wanIp: string | null
+  ntpServers: string[]
 }
diff --git a/sdk/base/lib/osBindings/Manifest.ts b/sdk/base/lib/osBindings/Manifest.ts
index 8007b565b..2c9a2457e 100644
--- a/sdk/base/lib/osBindings/Manifest.ts
+++ b/sdk/base/lib/osBindings/Manifest.ts
@@ -2,6 +2,7 @@
 import type { Alerts } from "./Alerts"
 import type { Dependencies } from "./Dependencies"
 import type { Description } from "./Description"
+import type { GitHash } from "./GitHash"
 import type { HardwareRequirements } from "./HardwareRequirements"
 import type { ImageConfig } from "./ImageConfig"
 import type { ImageId } from "./ImageId"
@@ -30,6 +31,6 @@ export type Manifest = {
   alerts: Alerts
   dependencies: Dependencies
   hardwareRequirements: HardwareRequirements
-  gitHash: string | null
+  gitHash?: GitHash
   osVersion: string
 }
diff --git a/sdk/base/lib/osBindings/LanInfo.ts b/sdk/base/lib/osBindings/NetInfo.ts
similarity index 80%
rename from sdk/base/lib/osBindings/LanInfo.ts
rename to sdk/base/lib/osBindings/NetInfo.ts
index 59b8a5519..e790cadaa 100644
--- a/sdk/base/lib/osBindings/LanInfo.ts
+++ b/sdk/base/lib/osBindings/NetInfo.ts
@@ -1,6 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type LanInfo = {
+export type NetInfo = {
+  public: boolean
   assignedPort: number | null
   assignedSslPort: number | null
 }
diff --git a/sdk/base/lib/osBindings/NetworkInterfaceInfo.ts b/sdk/base/lib/osBindings/NetworkInterfaceInfo.ts
new file mode 100644
index 000000000..796046b93
--- /dev/null
+++ b/sdk/base/lib/osBindings/NetworkInterfaceInfo.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { IpInfo } from "./IpInfo"
+
+export type NetworkInterfaceInfo = {
+  public: boolean | null
+  ipInfo: IpInfo | null
+}
diff --git a/sdk/base/lib/osBindings/NetworkInterfaceType.ts b/sdk/base/lib/osBindings/NetworkInterfaceType.ts
new file mode 100644
index 000000000..e20067dcc
--- /dev/null
+++ b/sdk/base/lib/osBindings/NetworkInterfaceType.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type NetworkInterfaceType = "ethernet" | "wireless" | "wireguard"
diff --git a/sdk/base/lib/osBindings/PackageVersionInfo.ts b/sdk/base/lib/osBindings/PackageVersionInfo.ts
index 80481acb3..c71fd5921 100644
--- a/sdk/base/lib/osBindings/PackageVersionInfo.ts
+++ b/sdk/base/lib/osBindings/PackageVersionInfo.ts
@@ -3,6 +3,7 @@ import type { Alerts } from "./Alerts"
 import type { DataUrl } from "./DataUrl"
 import type { DependencyMetadata } from "./DependencyMetadata"
 import type { Description } from "./Description"
+import type { GitHash } from "./GitHash"
 import type { HardwareRequirements } from "./HardwareRequirements"
 import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment"
 import type { PackageId } from "./PackageId"
@@ -13,7 +14,7 @@ export type PackageVersionInfo = {
   icon: DataUrl
   description: Description
   releaseNotes: string
-  gitHash: string
+  gitHash: GitHash
   license: string
   wrapperRepo: string
   upstreamRepo: string
diff --git a/sdk/base/lib/osBindings/ServerInfo.ts b/sdk/base/lib/osBindings/ServerInfo.ts
index 89d7fc1b0..6eec14745 100644
--- a/sdk/base/lib/osBindings/ServerInfo.ts
+++ b/sdk/base/lib/osBindings/ServerInfo.ts
@@ -1,8 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AcmeProvider } from "./AcmeProvider"
 import type { AcmeSettings } from "./AcmeSettings"
 import type { Governor } from "./Governor"
-import type { IpInfo } from "./IpInfo"
 import type { LshwDevice } from "./LshwDevice"
+import type { NetworkInterfaceInfo } from "./NetworkInterfaceInfo"
 import type { ServerStatus } from "./ServerStatus"
 import type { SmtpValue } from "./SmtpValue"
 import type { WifiInfo } from "./WifiInfo"
@@ -22,8 +23,8 @@ export type ServerInfo = {
    * for backwards compatibility
    */
   torAddress: string
-  ipInfo: { [key: string]: IpInfo }
-  acme: AcmeSettings | null
+  networkInterfaces: { [key: string]: NetworkInterfaceInfo }
+  acme: { [key: AcmeProvider]: AcmeSettings }
   statusInfo: ServerStatus
   wifi: WifiInfo
   unreadNotificationCount: number
diff --git a/sdk/base/lib/osBindings/ServiceInterface.ts b/sdk/base/lib/osBindings/ServiceInterface.ts
index 9bcec0056..6a58675a4 100644
--- a/sdk/base/lib/osBindings/ServiceInterface.ts
+++ b/sdk/base/lib/osBindings/ServiceInterface.ts
@@ -7,7 +7,6 @@ export type ServiceInterface = {
   id: ServiceInterfaceId
   name: string
   description: string
-  hasPrimary: boolean
   masked: boolean
   addressInfo: AddressInfo
   type: ServiceInterfaceType
diff --git a/sdk/base/lib/osBindings/SetPublicParams.ts b/sdk/base/lib/osBindings/SetPublicParams.ts
new file mode 100644
index 000000000..03bc3082b
--- /dev/null
+++ b/sdk/base/lib/osBindings/SetPublicParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type SetPublicParams = { interface: string; public: boolean | null }
diff --git a/sdk/base/lib/osBindings/UnsetPublicParams.ts b/sdk/base/lib/osBindings/UnsetPublicParams.ts
new file mode 100644
index 000000000..db8f730e1
--- /dev/null
+++ b/sdk/base/lib/osBindings/UnsetPublicParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UnsetPublicParams = { interface: string }
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index f76f595c9..6eff86872 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -1,4 +1,5 @@
 export { AcceptSigners } from "./AcceptSigners"
+export { AcmeProvider } from "./AcmeProvider"
 export { AcmeSettings } from "./AcmeSettings"
 export { ActionId } from "./ActionId"
 export { ActionInput } from "./ActionInput"
@@ -66,6 +67,7 @@ export { DepInfo } from "./DepInfo"
 export { Description } from "./Description"
 export { DestroySubcontainerFsParams } from "./DestroySubcontainerFsParams"
 export { DeviceFilter } from "./DeviceFilter"
+export { DomainConfig } from "./DomainConfig"
 export { Duration } from "./Duration"
 export { EchoParams } from "./EchoParams"
 export { EditSignerParams } from "./EditSignerParams"
@@ -73,6 +75,7 @@ export { EncryptedWire } from "./EncryptedWire"
 export { ExportActionParams } from "./ExportActionParams"
 export { ExportServiceInterfaceParams } from "./ExportServiceInterfaceParams"
 export { ExposeForDependentsParams } from "./ExposeForDependentsParams"
+export { ForgetInterfaceParams } from "./ForgetInterfaceParams"
 export { FullIndex } from "./FullIndex"
 export { FullProgress } from "./FullProgress"
 export { GetActionInputParams } from "./GetActionInputParams"
@@ -82,7 +85,6 @@ export { GetOsVersionParams } from "./GetOsVersionParams"
 export { GetPackageParams } from "./GetPackageParams"
 export { GetPackageResponseFull } from "./GetPackageResponseFull"
 export { GetPackageResponse } from "./GetPackageResponse"
-export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams"
 export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams"
 export { GetServicePortForwardParams } from "./GetServicePortForwardParams"
 export { GetSslCertificateParams } from "./GetSslCertificateParams"
@@ -90,11 +92,11 @@ export { GetSslKeyParams } from "./GetSslKeyParams"
 export { GetStatusParams } from "./GetStatusParams"
 export { GetStoreParams } from "./GetStoreParams"
 export { GetSystemSmtpParams } from "./GetSystemSmtpParams"
+export { GitHash } from "./GitHash"
 export { Governor } from "./Governor"
 export { Guid } from "./Guid"
 export { HardwareRequirements } from "./HardwareRequirements"
 export { HealthCheckId } from "./HealthCheckId"
-export { HostAddress } from "./HostAddress"
 export { HostId } from "./HostId"
 export { HostKind } from "./HostKind"
 export { HostnameInfo } from "./HostnameInfo"
@@ -112,7 +114,6 @@ export { InstallingState } from "./InstallingState"
 export { InstallParams } from "./InstallParams"
 export { IpHostname } from "./IpHostname"
 export { IpInfo } from "./IpInfo"
-export { LanInfo } from "./LanInfo"
 export { ListPackageSignersParams } from "./ListPackageSignersParams"
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"
 export { ListVersionSignersParams } from "./ListVersionSignersParams"
@@ -128,6 +129,9 @@ export { MountParams } from "./MountParams"
 export { MountTarget } from "./MountTarget"
 export { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 export { NamedProgress } from "./NamedProgress"
+export { NetInfo } from "./NetInfo"
+export { NetworkInterfaceInfo } from "./NetworkInterfaceInfo"
+export { NetworkInterfaceType } from "./NetworkInterfaceType"
 export { OnionHostname } from "./OnionHostname"
 export { OsIndex } from "./OsIndex"
 export { OsVersionInfoMap } from "./OsVersionInfoMap"
@@ -172,6 +176,7 @@ export { SetIconParams } from "./SetIconParams"
 export { SetMainStatusStatus } from "./SetMainStatusStatus"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetNameParams } from "./SetNameParams"
+export { SetPublicParams } from "./SetPublicParams"
 export { SetStoreParams } from "./SetStoreParams"
 export { SetupExecuteParams } from "./SetupExecuteParams"
 export { SetupProgress } from "./SetupProgress"
@@ -181,6 +186,7 @@ export { SignAssetParams } from "./SignAssetParams"
 export { SignerInfo } from "./SignerInfo"
 export { SmtpValue } from "./SmtpValue"
 export { StartStop } from "./StartStop"
+export { UnsetPublicParams } from "./UnsetPublicParams"
 export { UpdatingState } from "./UpdatingState"
 export { VerifyCifsParams } from "./VerifyCifsParams"
 export { VersionSignerParams } from "./VersionSignerParams"
diff --git a/sdk/base/lib/test/startosTypeValidation.test.ts b/sdk/base/lib/test/startosTypeValidation.test.ts
index 509da0894..2de7b43a4 100644
--- a/sdk/base/lib/test/startosTypeValidation.test.ts
+++ b/sdk/base/lib/test/startosTypeValidation.test.ts
@@ -26,7 +26,6 @@ import { SetDependenciesParams } from ".././osBindings"
 import { GetSystemSmtpParams } from ".././osBindings"
 import { GetServicePortForwardParams } from ".././osBindings"
 import { ExportServiceInterfaceParams } from ".././osBindings"
-import { GetPrimaryUrlParams } from ".././osBindings"
 import { ListServiceInterfacesParams } from ".././osBindings"
 import { ExportActionParams } from ".././osBindings"
 import { MountParams } from ".././osBindings"
@@ -83,7 +82,6 @@ describe("startosTypeValidation ", () => {
       getServicePortForward: {} as GetServicePortForwardParams,
       clearServiceInterfaces: {} as ClearServiceInterfacesParams,
       exportServiceInterface: {} as ExportServiceInterfaceParams,
-      getPrimaryUrl: {} as WithCallback<GetPrimaryUrlParams>,
       listServiceInterfaces: {} as WithCallback<ListServiceInterfacesParams>,
       mount: {} as MountParams,
       checkDependencies: {} as CheckDependenciesParam,
diff --git a/sdk/base/lib/types.ts b/sdk/base/lib/types.ts
index 36d4bd293..85a8c4404 100644
--- a/sdk/base/lib/types.ts
+++ b/sdk/base/lib/types.ts
@@ -138,33 +138,6 @@ export declare const hostName: unique symbol
 // asdflkjadsf.onion | 1.2.3.4
 export type Hostname = string & { [hostName]: never }
 
-export type HostnameInfoIp = {
-  kind: "ip"
-  networkInterfaceId: string
-  public: boolean
-  hostname:
-    | {
-        kind: "ipv4" | "ipv6" | "local"
-        value: string
-        port: number | null
-        sslPort: number | null
-      }
-    | {
-        kind: "domain"
-        domain: string
-        subdomain: string | null
-        port: number | null
-        sslPort: number | null
-      }
-}
-
-export type HostnameInfoOnion = {
-  kind: "onion"
-  hostname: { value: string; port: number | null; sslPort: number | null }
-}
-
-export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion
-
 export type ServiceInterfaceId = string
 
 export { ServiceInterface }
diff --git a/sdk/base/lib/util/getServiceInterface.ts b/sdk/base/lib/util/getServiceInterface.ts
index cbbb345cb..2e81e5ee2 100644
--- a/sdk/base/lib/util/getServiceInterface.ts
+++ b/sdk/base/lib/util/getServiceInterface.ts
@@ -1,15 +1,6 @@
 import { ServiceInterfaceType } from "../types"
 import { knownProtocols } from "../interfaces/Host"
-import {
-  AddressInfo,
-  Host,
-  HostAddress,
-  Hostname,
-  HostnameInfo,
-  HostnameInfoIp,
-  HostnameInfoOnion,
-  IpInfo,
-} from "../types"
+import { AddressInfo, Host, Hostname, HostnameInfo } from "../types"
 import { Effects } from "../Effects"
 
 export type UrlString = string
@@ -48,8 +39,6 @@ export type ServiceInterfaceFilled = {
   name: string
   /** Human readable description, used as tooltip usually */
   description: string
-  /** Whether or not the interface has a primary URL */
-  hasPrimary: boolean
   /** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
   masked: boolean
   /** Information about the host for this binding */
@@ -58,10 +47,6 @@ export type ServiceInterfaceFilled = {
   addressInfo: FilledAddressInfo | null
   /** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
   type: ServiceInterfaceType
-  /** The primary hostname for the service, as chosen by the user */
-  primaryHostname: Hostname | null
-  /** The primary URL for the service, as chosen by the user */
-  primaryUrl: UrlString | null
 }
 const either =
   <A>(...args: ((a: A) => boolean)[]) =>
@@ -89,7 +74,9 @@ export const addressHostToUrl = (
       if (host.hostname.kind === "domain") {
         hostname = `${host.hostname.subdomain ? `${host.hostname.subdomain}.` : ""}${host.hostname.domain}`
       } else if (host.hostname.kind === "ipv6") {
-        hostname = `[${host.hostname.value}]`
+        hostname = host.hostname.value.startsWith("fe80::")
+          ? `[${host.hostname.value}%${host.hostname.scopeId}]`
+          : `[${host.hostname.value}]`
       } else {
         hostname = host.hostname.value
       }
@@ -200,23 +187,13 @@ const makeInterfaceFilled = async ({
     hostId,
     callback,
   })
-  const primaryUrl = await effects.getPrimaryUrl({
-    hostId,
-    packageId,
-    callback,
-  })
 
   const interfaceFilled: ServiceInterfaceFilled = {
     ...serviceInterfaceValue,
-    primaryUrl: primaryUrl,
     host,
     addressInfo: host
       ? filledAddress(host, serviceInterfaceValue.addressInfo)
       : null,
-    get primaryHostname() {
-      if (primaryUrl == null) return null
-      return getHostname(primaryUrl)
-    },
   }
   return interfaceFilled
 }
diff --git a/sdk/base/lib/util/getServiceInterfaces.ts b/sdk/base/lib/util/getServiceInterfaces.ts
index 1d83684d6..faeb508b4 100644
--- a/sdk/base/lib/util/getServiceInterfaces.ts
+++ b/sdk/base/lib/util/getServiceInterfaces.ts
@@ -30,22 +30,10 @@ const makeManyInterfaceFilled = async ({
       if (!host) {
         throw new Error(`host ${hostId} not found!`)
       }
-      const primaryUrl = await effects
-        .getPrimaryUrl({
-          hostId,
-          packageId,
-          callback,
-        })
-        .catch(() => null)
       return {
         ...serviceInterfaceValue,
-        primaryUrl: primaryUrl,
         host,
         addressInfo: filledAddress(host, serviceInterfaceValue.addressInfo),
-        get primaryHostname() {
-          if (primaryUrl == null) return null
-          return getHostname(primaryUrl)
-        },
       }
     }),
   )
diff --git a/sdk/base/lib/util/patterns.ts b/sdk/base/lib/util/patterns.ts
index 2c9c7010d..c117c89e5 100644
--- a/sdk/base/lib/util/patterns.ts
+++ b/sdk/base/lib/util/patterns.ts
@@ -2,58 +2,58 @@ import { Pattern } from "../actions/input/inputSpecTypes"
 import * as regexes from "./regexes"
 
 export const ipv6: Pattern = {
-  regex: regexes.ipv6.toString(),
+  regex: regexes.ipv6.source,
   description: "Must be a valid IPv6 address",
 }
 
 export const ipv4: Pattern = {
-  regex: regexes.ipv4.toString(),
+  regex: regexes.ipv4.source,
   description: "Must be a valid IPv4 address",
 }
 
 export const hostname: Pattern = {
-  regex: regexes.hostname.toString(),
+  regex: regexes.hostname.source,
   description: "Must be a valid hostname",
 }
 
 export const localHostname: Pattern = {
-  regex: regexes.localHostname.toString(),
+  regex: regexes.localHostname.source,
   description: 'Must be a valid ".local" hostname',
 }
 
 export const torHostname: Pattern = {
-  regex: regexes.torHostname.toString(),
+  regex: regexes.torHostname.source,
   description: 'Must be a valid Tor (".onion") hostname',
 }
 
 export const url: Pattern = {
-  regex: regexes.url.toString(),
+  regex: regexes.url.source,
   description: "Must be a valid URL",
 }
 
 export const localUrl: Pattern = {
-  regex: regexes.localUrl.toString(),
+  regex: regexes.localUrl.source,
   description: 'Must be a valid ".local" URL',
 }
 
 export const torUrl: Pattern = {
-  regex: regexes.torUrl.toString(),
+  regex: regexes.torUrl.source,
   description: 'Must be a valid Tor (".onion") URL',
 }
 
 export const ascii: Pattern = {
-  regex: regexes.ascii.toString(),
+  regex: regexes.ascii.source,
   description:
     "May only contain ASCII characters. See https://www.w3schools.com/charsets/ref_html_ascii.asp",
 }
 
 export const email: Pattern = {
-  regex: regexes.email.toString(),
+  regex: regexes.email.source,
   description: "Must be a valid email address",
 }
 
 export const base64: Pattern = {
-  regex: regexes.base64.toString(),
+  regex: regexes.base64.source,
   description:
     "May only contain base64 characters. See https://base64.guru/learn/base64-characters",
 }
diff --git a/sdk/base/package-lock.json b/sdk/base/package-lock.json
index d7b491303..4d5625489 100644
--- a/sdk/base/package-lock.json
+++ b/sdk/base/package-lock.json
@@ -14,7 +14,7 @@
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
         "mime-types": "^2.1.35",
-        "ts-matches": "^6.1.0",
+        "ts-matches": "^6.2.1",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
@@ -3897,9 +3897,9 @@
       "dev": true
     },
     "node_modules/ts-matches": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.1.0.tgz",
-      "integrity": "sha512-01qvbIpOiKdbzzXDH84JeHunvCwBGFdZw94jS6kOGLSN5ms+1nBZtfe8WSuYMIPb1xPA+qyAiVgznFi2VCQ6UQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.2.1.tgz",
+      "integrity": "sha512-qdnMgTHsGCEGGK6QiaNMY2vD9eQtRp2Q+pAxcOAzxHJKDKTBYsc1ISTg1zp8H2+EmtCB0eko/1TwYUA5/mUGug==",
       "license": "MIT"
     },
     "node_modules/ts-morph": {
diff --git a/sdk/base/package.json b/sdk/base/package.json
index 4cc2fc7ca..6eae719a7 100644
--- a/sdk/base/package.json
+++ b/sdk/base/package.json
@@ -27,7 +27,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
     "mime-types": "^2.1.35",
-    "ts-matches": "^6.1.0",
+    "ts-matches": "^6.2.1",
     "yaml": "^2.2.2"
   },
   "prettier": {
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index e7e87f963..65ef23883 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -102,7 +102,6 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
       | "clearServiceInterfaces"
       | "bind"
       | "getHostInfo"
-      | "getPrimaryUrl"
     type MainUsedEffects = "setMainStatus" | "setHealth"
     type CallbackEffects = "constRetry" | "clearCallbacks"
     type AlreadyExposed = "getSslCertificate" | "getSystemSmtp"
@@ -379,7 +378,6 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           id: 'ui',
           description: 'The primary web app for this service.',
           type: 'ui',
-          hasPrimary: false,
           masked: false,
           schemeOverride: null,
           username: null,
@@ -397,8 +395,6 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           id: string
           /** The human readable description. */
           description: string
-          /** No effect until StartOS v0.4.0. If true, forces the user to select one URL (i.e. .onion, .local, or IP address) as the primary URL. This is needed by some services to function properly. */
-          hasPrimary: boolean
           /** Affects how the interface appears to the user. One of: 'ui', 'api', 'p2p'. If 'ui', the user will see a "Launch UI" button */
           type: ServiceInterfaceType
           /** (optional) prepends the provided username to all URLs. */
@@ -562,7 +558,6 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               id: 'primary-ui',
               description: 'The primary web app for this service.',
               type: 'ui',
-              hasPrimary: false,
               masked: false,
               schemeOverride: null,
               username: null,
@@ -575,7 +570,6 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               id: 'admin-ui',
               description: 'The admin web app for this service.',
               type: 'ui',
-              hasPrimary: false,
               masked: false,
               schemeOverride: null,
               username: null,
@@ -596,7 +590,6 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
               id: 'api',
               description: 'The advanced API for this service.',
               type: 'api',
-              hasPrimary: false,
               masked: false,
               schemeOverride: null,
               username: null,
@@ -688,6 +681,18 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           return Daemons.of<Manifest>({ effects, started, healthReceipts })
         },
       },
+      SubContainer: {
+        of(
+          effects: Effects,
+          image: {
+            id: T.ImageId & keyof Manifest["images"]
+            sharedRun?: boolean
+          },
+          name: string,
+        ) {
+          return SubContainer.of(effects, image, name)
+        },
+      },
       List: {
         /**
          * @description Create a list of text inputs.
@@ -1269,7 +1274,6 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
                * @example default: 'radio1'
                */
               default: keyof Variants & string
-              required: boolean
               /**
                * @description A mapping of unique radio options to their human readable display format.
                * @example
diff --git a/sdk/package/lib/mainFn/CommandController.ts b/sdk/package/lib/mainFn/CommandController.ts
index 3b2285adb..498de2843 100644
--- a/sdk/package/lib/mainFn/CommandController.ts
+++ b/sdk/package/lib/mainFn/CommandController.ts
@@ -60,51 +60,59 @@ export class CommandController {
               }
               return subc
             })()
-      let childProcess: cp.ChildProcess
-      if (options.runAsInit) {
-        childProcess = await subc.launch(commands, {
-          env: options.env,
-        })
-      } else {
-        childProcess = await subc.spawn(commands, {
-          env: options.env,
-          stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
-        })
-      }
 
-      if (options.onStdout) childProcess.stdout?.on("data", options.onStdout)
-      if (options.onStderr) childProcess.stderr?.on("data", options.onStderr)
+      try {
+        let childProcess: cp.ChildProcess
+        if (options.runAsInit) {
+          childProcess = await subc.launch(commands, {
+            env: options.env,
+          })
+        } else {
+          childProcess = await subc.spawn(commands, {
+            env: options.env,
+            stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
+          })
+        }
 
-      const state = { exited: false }
-      const answer = new Promise<null>((resolve, reject) => {
-        childProcess.on("exit", (code) => {
-          state.exited = true
-          if (
-            code === 0 ||
-            code === 143 ||
-            (code === null && childProcess.signalCode == "SIGTERM")
-          ) {
-            return resolve(null)
-          }
-          if (code) {
-            return reject(new Error(`${commands[0]} exited with code ${code}`))
-          } else {
-            return reject(
-              new Error(
-                `${commands[0]} exited with signal ${childProcess.signalCode}`,
-              ),
-            )
-          }
+        if (options.onStdout) childProcess.stdout?.on("data", options.onStdout)
+        if (options.onStderr) childProcess.stderr?.on("data", options.onStderr)
+
+        const state = { exited: false }
+        const answer = new Promise<null>((resolve, reject) => {
+          childProcess.on("exit", (code) => {
+            state.exited = true
+            if (
+              code === 0 ||
+              code === 143 ||
+              (code === null && childProcess.signalCode == "SIGTERM")
+            ) {
+              return resolve(null)
+            }
+            if (code) {
+              return reject(
+                new Error(`${commands[0]} exited with code ${code}`),
+              )
+            } else {
+              return reject(
+                new Error(
+                  `${commands[0]} exited with signal ${childProcess.signalCode}`,
+                ),
+              )
+            }
+          })
         })
-      })
 
-      return new CommandController(
-        answer,
-        state,
-        subc,
-        childProcess,
-        options.sigtermTimeout,
-      )
+        return new CommandController(
+          answer,
+          state,
+          subc,
+          childProcess,
+          options.sigtermTimeout,
+        )
+      } catch (e) {
+        await subc.destroy()
+        throw e
+      }
     }
   }
   get subContainerHandle() {
@@ -121,7 +129,7 @@ export class CommandController {
       if (!this.state.exited) {
         this.process.kill("SIGKILL")
       }
-      await this.subcontainer.destroy?.().catch((_) => {})
+      await this.subcontainer.destroy().catch((_) => {})
     }
   }
   async term({ signal = SIGTERM, timeout = this.sigtermTimeout } = {}) {
@@ -141,7 +149,7 @@ export class CommandController {
 
       await this.runningAnswer
     } finally {
-      await this.subcontainer.destroy?.()
+      await this.subcontainer.destroy()
     }
   }
 }
diff --git a/sdk/package/lib/mainFn/Daemon.ts b/sdk/package/lib/mainFn/Daemon.ts
index d9db89b6a..0cbc9cd94 100644
--- a/sdk/package/lib/mainFn/Daemon.ts
+++ b/sdk/package/lib/mainFn/Daemon.ts
@@ -60,6 +60,8 @@ export class Daemon {
     let timeoutCounter = 0
     new Promise(async () => {
       while (this.shouldBeRunning) {
+        if (this.commandController)
+          await this.commandController.term().catch((err) => console.error(err))
         this.commandController = await this.startCommand()
         await this.commandController.wait().catch((err) => console.error(err))
         await new Promise((resolve) => setTimeout(resolve, timeoutCounter))
diff --git a/sdk/package/lib/mainFn/Daemons.ts b/sdk/package/lib/mainFn/Daemons.ts
index 495e6c527..e18fa2314 100644
--- a/sdk/package/lib/mainFn/Daemons.ts
+++ b/sdk/package/lib/mainFn/Daemons.ts
@@ -5,7 +5,7 @@ import { HealthCheckResult } from "../health/checkFns"
 import { Trigger } from "../trigger"
 import * as T from "../../../base/lib/types"
 import { Mounts } from "./Mounts"
-import { ExecSpawnable, MountOptions } from "../util/SubContainer"
+import { ExecSpawnable, MountOptions, SubContainer } from "../util/SubContainer"
 
 import { promisify } from "node:util"
 import * as CP from "node:child_process"
@@ -49,16 +49,18 @@ type DaemonsParams<
 > = {
   /** The command line command to start the daemon */
   command: T.CommandType
-  /** Information about the image in which the daemon runs */
-  image: {
-    /** The ID of the image. Must be one of the image IDs declared in the manifest */
-    id: keyof Manifest["images"] & T.ImageId
-    /**
-     * Whether or not to share the `/run` directory with the parent container.
-     * This is useful if you are trying to connect to a service that exposes a unix domain socket or auth cookie via the `/run` directory
-     */
-    sharedRun?: boolean
-  }
+  /** Information about the subcontainer in which the daemon runs */
+  subcontainer:
+    | {
+        /** The ID of the image. Must be one of the image IDs declared in the manifest */
+        id: keyof Manifest["images"] & T.ImageId
+        /**
+         * Whether or not to share the `/run` directory with the parent container.
+         * This is useful if you are trying to connect to a service that exposes a unix domain socket or auth cookie via the `/run` directory
+         */
+        sharedRun?: boolean
+      }
+    | SubContainer
   /** For mounting the necessary volumes. Syntax: sdk.Mounts.of().addVolume() */
   mounts: Mounts<Manifest>
   env?: Record<string, string>
@@ -147,11 +149,16 @@ export class Daemons<Manifest extends T.SDKManifest, Ids extends string>
     options: DaemonsParams<Manifest, Ids, Command, Id>,
   ) {
     const daemonIndex = this.daemons.length
-    const daemon = Daemon.of()(this.effects, options.image, options.command, {
-      ...options,
-      mounts: options.mounts.build(),
-      subcontainerName: id,
-    })
+    const daemon = Daemon.of()(
+      this.effects,
+      options.subcontainer,
+      options.command,
+      {
+        ...options,
+        mounts: options.mounts.build(),
+        subcontainerName: id,
+      },
+    )
     const healthDaemon = new HealthDaemon(
       daemon,
       daemonIndex,
@@ -178,14 +185,18 @@ export class Daemons<Manifest extends T.SDKManifest, Ids extends string>
   }
 
   async build() {
-    this.updateMainHealth()
-    this.healthDaemons.forEach((x) =>
-      x.addWatcher(() => this.updateMainHealth()),
-    )
     const built = {
-      term: async (options?: { signal?: Signals; timeout?: number }) => {
+      term: async () => {
         try {
-          await Promise.all(this.healthDaemons.map((x) => x.term(options)))
+          for (let result of await Promise.allSettled(
+            this.healthDaemons.map((x) =>
+              x.term({ timeout: x.sigtermTimeout }),
+            ),
+          )) {
+            if (result.status === "rejected") {
+              console.error(result.reason)
+            }
+          }
         } finally {
           this.effects.setMainStatus({ status: "stopped" })
         }
@@ -194,8 +205,4 @@ export class Daemons<Manifest extends T.SDKManifest, Ids extends string>
     this.started(() => built.term())
     return built
   }
-
-  private updateMainHealth() {
-    this.effects.setMainStatus({ status: "running" })
-  }
 }
diff --git a/sdk/package/lib/mainFn/HealthDaemon.ts b/sdk/package/lib/mainFn/HealthDaemon.ts
index b66e3e406..ac459f08c 100644
--- a/sdk/package/lib/mainFn/HealthDaemon.ts
+++ b/sdk/package/lib/mainFn/HealthDaemon.ts
@@ -25,6 +25,8 @@ export class HealthDaemon {
   private _health: HealthCheckResult = { result: "starting", message: null }
   private healthWatchers: Array<() => unknown> = []
   private running = false
+  private resolveReady: (() => void) | undefined
+  private readyPromise: Promise<void>
   constructor(
     private readonly daemon: Promise<Daemon>,
     readonly daemonIndex: number,
@@ -35,6 +37,7 @@ export class HealthDaemon {
     readonly effects: Effects,
     readonly sigtermTimeout: number = DEFAULT_SIGTERM_TIMEOUT,
   ) {
+    this.readyPromise = new Promise((resolve) => (this.resolveReady = resolve))
     this.updateStatus()
     this.dependencies.forEach((d) => d.addWatcher(() => this.updateStatus()))
   }
@@ -112,6 +115,12 @@ export class HealthDaemon {
               message: "message" in err ? err.message : String(err),
             }
           })
+          if (
+            this.resolveReady &&
+            (response.result === "success" || response.result === "disabled")
+          ) {
+            this.resolveReady()
+          }
           await this.setHealth(response)
         } else {
           await this.setHealth({
@@ -129,6 +138,10 @@ export class HealthDaemon {
     }
   }
 
+  onReady() {
+    return this.readyPromise
+  }
+
   private async setHealth(health: HealthCheckResult) {
     this._health = health
     this.healthWatchers.forEach((watcher) => watcher())
diff --git a/sdk/package/lib/manifest/setupManifest.ts b/sdk/package/lib/manifest/setupManifest.ts
index 1a78c062c..3cd4f8bfb 100644
--- a/sdk/package/lib/manifest/setupManifest.ts
+++ b/sdk/package/lib/manifest/setupManifest.ts
@@ -26,16 +26,6 @@ export function setupManifest<
   return manifest
 }
 
-function gitHash(): string {
-  const hash = execSync("git rev-parse HEAD").toString().trim()
-  try {
-    execSync("git diff-index --quiet HEAD --")
-    return hash
-  } catch (e) {
-    return hash + "-modified"
-  }
-}
-
 export function buildManifest<
   Id extends string,
   Version extends string,
@@ -68,7 +58,6 @@ export function buildManifest<
   )
   return {
     ...manifest,
-    gitHash: gitHash(),
     osVersion: SDKVersion,
     version: versions.current.options.version,
     releaseNotes: versions.current.options.releaseNotes,
diff --git a/sdk/package/lib/test/host.test.ts b/sdk/package/lib/test/host.test.ts
index 87f22b8bd..4492804ec 100644
--- a/sdk/package/lib/test/host.test.ts
+++ b/sdk/package/lib/test/host.test.ts
@@ -15,7 +15,6 @@ describe("host", () => {
         name: "Foo",
         id: "foo",
         description: "A Foo",
-        hasPrimary: false,
         type: "ui",
         username: "bar",
         path: "/baz",
diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
index 9abc963fb..58a37e357 100644
--- a/sdk/package/package-lock.json
+++ b/sdk/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-beta.0",
+  "version": "0.3.6-beta.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-beta.0",
+      "version": "0.3.6-beta.3",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
@@ -15,7 +15,7 @@
         "isomorphic-fetch": "^3.0.0",
         "lodash.merge": "^4.6.2",
         "mime-types": "^2.1.35",
-        "ts-matches": "^6.1.0",
+        "ts-matches": "^6.2.1",
         "yaml": "^2.2.2"
       },
       "devDependencies": {
@@ -3918,9 +3918,9 @@
       "dev": true
     },
     "node_modules/ts-matches": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.1.0.tgz",
-      "integrity": "sha512-01qvbIpOiKdbzzXDH84JeHunvCwBGFdZw94jS6kOGLSN5ms+1nBZtfe8WSuYMIPb1xPA+qyAiVgznFi2VCQ6UQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ts-matches/-/ts-matches-6.2.1.tgz",
+      "integrity": "sha512-qdnMgTHsGCEGGK6QiaNMY2vD9eQtRp2Q+pAxcOAzxHJKDKTBYsc1ISTg1zp8H2+EmtCB0eko/1TwYUA5/mUGug==",
       "license": "MIT"
     },
     "node_modules/ts-morph": {
diff --git a/sdk/package/package.json b/sdk/package/package.json
index a5bb78159..1a68b9d1b 100644
--- a/sdk/package/package.json
+++ b/sdk/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-beta.0",
+  "version": "0.3.6-beta.3",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",
@@ -33,7 +33,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
     "mime-types": "^2.1.35",
-    "ts-matches": "^6.1.0",
+    "ts-matches": "^6.2.1",
     "yaml": "^2.2.2",
     "@iarna/toml": "^2.2.5",
     "@noble/curves": "^1.4.0",
diff --git a/web/package-lock.json b/web/package-lock.json
index 5652a0406..1c34d8dc8 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.9",
+  "version": "0.3.6-alpha.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "startos-ui",
-      "version": "0.3.6-alpha.9",
+      "version": "0.3.6-alpha.10",
       "license": "MIT",
       "dependencies": {
         "@angular/animations": "^14.1.0",
diff --git a/web/package.json b/web/package.json
index ecc253904..d71b2f0a2 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "startos-ui",
-  "version": "0.3.6-alpha.9",
+  "version": "0.3.6-alpha.10",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "license": "MIT",
diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
index 0b31dce4b..ca8645f18 100644
--- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
+++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
@@ -121,9 +121,34 @@ function getAddresses(
 ): MappedAddress[] {
   const addressInfo = serviceInterface.addressInfo
 
-  const hostnames =
+  let hostnames =
     host.kind === 'multi' ? host.hostnameInfo[addressInfo.internalPort] : []
 
+  hostnames = hostnames.filter(
+    h =>
+      window.location.host === 'localhost' ||
+      h.kind !== 'ip' ||
+      h.hostname.kind !== 'ipv6' ||
+      !h.hostname.value.startsWith('fe80::'),
+  )
+  if (window.location.host === 'localhost') {
+    const local = hostnames.find(
+      h => h.kind === 'ip' && h.hostname.kind === 'local',
+    )
+    if (local) {
+      hostnames.unshift({
+        kind: 'ip',
+        networkInterfaceId: 'lo',
+        public: false,
+        hostname: {
+          kind: 'local',
+          port: local.hostname.port,
+          sslPort: local.hostname.sslPort,
+          value: 'localhost',
+        },
+      })
+    }
+  }
   const addressesWithNames = hostnames.flatMap(h => {
     let name = ''
 
@@ -144,14 +169,14 @@ function getAddresses(
 
     const addresses = utils.addressHostToUrl(addressInfo, h)
     if (addresses.length > 1) {
-      return utils.addressHostToUrl(addressInfo, h).map(url => ({
+      return addresses.map(url => ({
         name: `${name} (${new URL(url).protocol
           .replace(':', '')
           .toUpperCase()})`,
         url,
       }))
     } else {
-      return utils.addressHostToUrl(addressInfo, h).map(url => ({
+      return addresses.map(url => ({
         name,
         url,
       }))
diff --git a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
index 03d7ef3d7..c7bdf6a2a 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
@@ -58,25 +58,28 @@ <h2>LAN</h2>
         <ion-icon slot="icon-only" name="copy-outline"></ion-icon>
       </ion-button>
     </ion-item>
-    <ng-container *ngFor="let iface of server.ipInfo| keyvalue">
-      <ion-item *tuiLet="iface.value.ipv4 as ipv4">
-        <ion-label>
-          <h2>{{ iface.key }} (IPv4)</h2>
-          <p>{{ ipv4 || 'n/a' }}</p>
-        </ion-label>
-        <ion-button *ngIf="ipv4" slot="end" fill="clear" (click)="copy(ipv4)">
-          <ion-icon slot="icon-only" name="copy-outline"></ion-icon>
-        </ion-button>
-      </ion-item>
-      <ion-item *tuiLet="iface.value.ipv6 as ipv6">
-        <ion-label>
-          <h2>{{ iface.key }} (IPv6)</h2>
-          <p>{{ ipv6 || 'n/a' }}</p>
-        </ion-label>
-        <ion-button *ngIf="ipv6" slot="end" fill="clear" (click)="copy(ipv6)">
-          <ion-icon slot="icon-only" name="copy-outline"></ion-icon>
-        </ion-button>
-      </ion-item>
+    <ng-container *ngFor="let iface of server.networkInterfaces | keyvalue">
+      <ng-container *ngIf="(isLocalhost || iface.key !== 'lo') && iface.value.ipInfo">
+        <ng-container  *ngFor="let ipnet of iface.value.ipInfo.subnets">
+          <ng-container *ngIf="!ipnet.includes('fe80::') || isLocalhost">
+            <ion-item *tuiLet="ipnet.split('/')[0] as ipAddr">
+              <ion-label>
+                <h2>{{ iface.key }} ({{ ipAddr.includes("::") ? "IPv6" : "IPv4" }})</h2>
+                <p>{{
+                  ipAddr.includes("fe80::")
+                    ? "[" + ipAddr + "%" + iface.value.ipInfo.scopeId + "]"
+                    : ipAddr.includes("::")
+                      ? "[" + ipAddr + "]"
+                      : ipAddr 
+                }}</p>
+              </ion-label>
+              <ion-button slot="end" fill="clear" (click)="copy(ipAddr)">
+                <ion-icon slot="icon-only" name="copy-outline"></ion-icon>
+              </ion-button>
+            </ion-item>
+          </ng-container>
+        </ng-container>
+      </ng-container>
     </ng-container>
 
     <ion-item-divider>Device Credentials</ion-item-divider>
diff --git a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts
index 0055ff6c1..6c7b41399 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts
@@ -14,6 +14,7 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 })
 export class ServerSpecsPage {
   readonly server$ = this.patch.watch$('serverInfo')
+  readonly isLocalhost = window.location.host === 'localhost'
 
   constructor(
     private readonly toastCtrl: ToastController,
diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts
index a3562caa6..a91976493 100644
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1721,7 +1721,6 @@ export module Mock {
     serviceInterfaces: {
       ui: {
         id: 'ui',
-        hasPrimary: false,
         masked: false,
         name: 'Web UI',
         description:
@@ -1738,7 +1737,6 @@ export module Mock {
       },
       rpc: {
         id: 'rpc',
-        hasPrimary: false,
         masked: false,
         name: 'RPC',
         description:
@@ -1755,7 +1753,6 @@ export module Mock {
       },
       p2p: {
         id: 'p2p',
-        hasPrimary: true,
         masked: false,
         name: 'P2P',
         description:
@@ -1776,7 +1773,8 @@ export module Mock {
       abcdefg: {
         kind: 'multi',
         bindings: [],
-        addresses: [],
+        onions: [],
+        domains: {},
         hostnameInfo: {
           80: [
             {
@@ -1829,7 +1827,8 @@ export module Mock {
               public: false,
               hostname: {
                 kind: 'ipv6',
-                value: '[FE80:CD00:0000:0CDE:1257:0000:211E:729CD]',
+                value: '[fe80:cd00:0000:0cde:1257:0000:211e:72cd]',
+                scopeId: 2,
                 port: null,
                 sslPort: 1234,
               },
@@ -1840,7 +1839,8 @@ export module Mock {
               public: false,
               hostname: {
                 kind: 'ipv6',
-                value: '[FE80:CD00:0000:0CDE:1257:0000:211E:1234]',
+                value: '[fe80:cd00:0000:0cde:1257:0000:211e:1234]',
+                scopeId: 3,
                 port: null,
                 sslPort: 1234,
               },
@@ -1859,7 +1859,8 @@ export module Mock {
       bcdefgh: {
         kind: 'multi',
         bindings: [],
-        addresses: [],
+        onions: [],
+        domains: {},
         hostnameInfo: {
           8332: [],
         },
@@ -1867,7 +1868,8 @@ export module Mock {
       cdefghi: {
         kind: 'multi',
         bindings: [],
-        addresses: [],
+        onions: [],
+        domains: {},
         hostnameInfo: {
           8333: [],
         },
@@ -1914,7 +1916,6 @@ export module Mock {
     serviceInterfaces: {
       ui: {
         id: 'ui',
-        hasPrimary: false,
         masked: false,
         name: 'Web UI',
         description: 'A launchable web app for Bitcoin Proxy',
@@ -1960,7 +1961,6 @@ export module Mock {
     serviceInterfaces: {
       grpc: {
         id: 'grpc',
-        hasPrimary: false,
         masked: false,
         name: 'GRPC',
         description:
@@ -1977,7 +1977,6 @@ export module Mock {
       },
       lndconnect: {
         id: 'lndconnect',
-        hasPrimary: false,
         masked: true,
         name: 'LND Connect',
         description:
@@ -1994,7 +1993,6 @@ export module Mock {
       },
       p2p: {
         id: 'p2p',
-        hasPrimary: true,
         masked: false,
         name: 'P2P',
         description:
diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts
index 81e316b56..4e7928581 100644
--- a/web/projects/ui/src/app/services/api/mock-patch.ts
+++ b/web/projects/ui/src/app/services/api/mock-patch.ts
@@ -41,21 +41,32 @@ export const mockPatchData: DataModel = {
     lastBackup: new Date(new Date().valueOf() - 604800001).toISOString(),
     lanAddress: 'https://adjective-noun.local',
     torAddress: 'https://myveryownspecialtoraddress.onion',
-    ipInfo: {
+    networkInterfaces: {
       eth0: {
-        ipv4: '10.0.0.1',
-        ipv4Range: '10.0.0.1/24',
-        ipv6: null,
-        ipv6Range: null,
+        public: false,
+        ipInfo: {
+          scopeId: 1,
+          deviceType: 'ethernet',
+          subnets: ['10.0.0.1/24'],
+          wanIp: null,
+          ntpServers: [],
+        },
       },
       wlan0: {
-        ipv4: '10.0.90.12',
-        ipv4Range: '10.0.90.12/24',
-        ipv6: 'FE80:CD00:0000:0CDE:1257:0000:211E:729CD',
-        ipv6Range: 'FE80:CD00:0000:0CDE:1257:0000:211E:729CD/64',
+        public: false,
+        ipInfo: {
+          scopeId: 2,
+          deviceType: 'wireless',
+          subnets: [
+            '10.0.90.12/24',
+            'FE80:CD00:0000:0CDE:1257:0000:211E:729CD/64',
+          ],
+          wanIp: null,
+          ntpServers: [],
+        },
       },
     },
-    acme: null,
+    acme: {},
     unreadNotificationCount: 4,
     // password is asdfasdf
     passwordHash:
@@ -140,7 +151,6 @@ export const mockPatchData: DataModel = {
       serviceInterfaces: {
         ui: {
           id: 'ui',
-          hasPrimary: false,
           masked: false,
           name: 'Web UI',
           description:
@@ -157,7 +167,6 @@ export const mockPatchData: DataModel = {
         },
         rpc: {
           id: 'rpc',
-          hasPrimary: false,
           masked: false,
           name: 'RPC',
           description:
@@ -174,7 +183,6 @@ export const mockPatchData: DataModel = {
         },
         p2p: {
           id: 'p2p',
-          hasPrimary: true,
           masked: false,
           name: 'P2P',
           description:
@@ -195,7 +203,8 @@ export const mockPatchData: DataModel = {
         abcdefg: {
           kind: 'multi',
           bindings: [],
-          addresses: [],
+          onions: [],
+          domains: {},
           hostnameInfo: {
             80: [
               {
@@ -248,7 +257,8 @@ export const mockPatchData: DataModel = {
                 public: false,
                 hostname: {
                   kind: 'ipv6',
-                  value: '[FE80:CD00:0000:0CDE:1257:0000:211E:729CD]',
+                  value: '[fe80:cd00:0000:0cde:1257:0000:211e:72cd]',
+                  scopeId: 2,
                   port: null,
                   sslPort: 1234,
                 },
@@ -259,7 +269,8 @@ export const mockPatchData: DataModel = {
                 public: false,
                 hostname: {
                   kind: 'ipv6',
-                  value: '[FE80:CD00:0000:0CDE:1257:0000:211E:1234]',
+                  value: '[fe80:cd00:0000:0cde:1257:0000:211e:1234]',
+                  scopeId: 3,
                   port: null,
                   sslPort: 1234,
                 },
@@ -278,7 +289,8 @@ export const mockPatchData: DataModel = {
         bcdefgh: {
           kind: 'multi',
           bindings: [],
-          addresses: [],
+          onions: [],
+          domains: {},
           hostnameInfo: {
             8332: [],
           },
@@ -286,7 +298,8 @@ export const mockPatchData: DataModel = {
         cdefghi: {
           kind: 'multi',
           bindings: [],
-          addresses: [],
+          onions: [],
+          domains: {},
           hostnameInfo: {
             8333: [],
           },
@@ -335,7 +348,6 @@ export const mockPatchData: DataModel = {
       serviceInterfaces: {
         grpc: {
           id: 'grpc',
-          hasPrimary: false,
           masked: false,
           name: 'GRPC',
           description:
@@ -352,7 +364,6 @@ export const mockPatchData: DataModel = {
         },
         lndconnect: {
           id: 'lndconnect',
-          hasPrimary: false,
           masked: true,
           name: 'LND Connect',
           description:
@@ -369,7 +380,6 @@ export const mockPatchData: DataModel = {
         },
         p2p: {
           id: 'p2p',
-          hasPrimary: true,
           masked: false,
           name: 'P2P',
           description:

From eb1f3a0ced982d16d0d77eef0cb9b8b1a0fc54e0 Mon Sep 17 00:00:00 2001
From: Remco Ros <remcoros@live.nl>
Date: Fri, 10 Jan 2025 00:40:41 +0100
Subject: [PATCH 338/341] sdk: checkPortListening: check tcp6/udp6 ports
 (#2763)

* sdk: checkPortListening: check tcp6/udp6 ports

* allow ipv6 if unspecified address

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 .../lib/health/checkFns/checkPortListening.ts | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/sdk/package/lib/health/checkFns/checkPortListening.ts b/sdk/package/lib/health/checkFns/checkPortListening.ts
index 0d6792b86..59cd9717f 100644
--- a/sdk/package/lib/health/checkFns/checkPortListening.ts
+++ b/sdk/package/lib/health/checkFns/checkPortListening.ts
@@ -6,16 +6,17 @@ import * as CP from "node:child_process"
 
 const cpExec = promisify(CP.exec)
 
-export function containsAddress(x: string, port: number) {
+export function containsAddress(x: string, port: number, address?: bigint) {
   const readPorts = x
     .split("\n")
     .filter(Boolean)
     .splice(1)
-    .map((x) => x.split(" ").filter(Boolean)[1]?.split(":")?.[1])
-    .filter(Boolean)
-    .map((x) => Number.parseInt(x, 16))
-    .filter(Number.isFinite)
-  return readPorts.indexOf(port) >= 0
+    .map((x) => x.split(" ").filter(Boolean)[1]?.split(":"))
+    .filter((x) => x?.length > 1)
+    .map(([addr, p]) => [BigInt(`0x${addr}`), Number.parseInt(p, 16)] as const)
+  return !!readPorts.find(
+    ([addr, p]) => (address === undefined || address === addr) && port === p,
+  )
 }
 
 /**
@@ -39,9 +40,19 @@ export async function checkPortListening(
           await cpExec(`cat /proc/net/tcp`, {}).then(stringFromStdErrOut),
           port,
         ) ||
+        containsAddress(
+          await cpExec(`cat /proc/net/tcp6`, {}).then(stringFromStdErrOut),
+          port,
+          BigInt(0),
+        ) ||
         containsAddress(
           await cpExec("cat /proc/net/udp", {}).then(stringFromStdErrOut),
           port,
+        ) ||
+        containsAddress(
+          await cpExec("cat /proc/net/udp6", {}).then(stringFromStdErrOut),
+          port,
+          BigInt(0),
         )
       if (hasAddress) {
         return { result: "success", message: options.successMessage }

From 5d759f810ca02cea240392d593afded852165a7e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 14 Jan 2025 03:39:52 +0000
Subject: [PATCH 339/341] Bugfix/websockets (#2808)

* retry logic for init status

* fix login flashing and sideload hanging

* add logging

* misc backend bugfixes

* use closingObserver instead

* always show reinstall button

* go back to endWith

* show error if sideload fails

* refactor more watch channels

* navigate to services page on sideload complete

* handle error closure events properly

* handle error scenario better in sideload websocket

* remove a clone

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>
---
 core/startos/src/context/setup.rs             |  37 +++--
 core/startos/src/db/mod.rs                    |  29 ++--
 core/startos/src/install/mod.rs               |  49 +++---
 core/startos/src/logs.rs                      |  47 +++---
 core/startos/src/net/forward.rs               |  31 ++--
 core/startos/src/net/network_interface.rs     |  54 ++-----
 core/startos/src/net/web_server.rs            | 126 +++++++---------
 core/startos/src/service/service_actor.rs     |   4 +-
 core/startos/src/update/mod.rs                |  26 ++--
 core/startos/src/util/net.rs                  |  21 +--
 core/startos/src/util/sync.rs                 | 141 ++++++++++++++++++
 .../src/version/update_details/v0_3_6.md      |  29 ++--
 web/projects/ui/src/app/app-routing.module.ts |   2 +-
 .../ui/src/app/pages/init/init.service.ts     |  54 +++----
 .../marketplace-show-controls.component.html  |  20 ++-
 .../marketplace-show-controls.component.ts    |   4 -
 .../server-routes/sideload/sideload.page.ts   |   9 +-
 .../sideload/sideload.service.ts              |  39 ++++-
 .../app/services/api/embassy-api.service.ts   |   3 +-
 .../services/api/embassy-live-api.service.ts  |   4 +-
 .../services/api/embassy-mock-api.service.ts  |  11 +-
 .../ui/src/app/services/auth.service.ts       |   4 +-
 22 files changed, 451 insertions(+), 293 deletions(-)

diff --git a/core/startos/src/context/setup.rs b/core/startos/src/context/setup.rs
index 30ca1ad39..5c2bf8bfc 100644
--- a/core/startos/src/context/setup.rs
+++ b/core/startos/src/context/setup.rs
@@ -1,5 +1,5 @@
 use std::ops::Deref;
-use std::path::{Path};
+use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -162,21 +162,30 @@ impl SetupContext {
                         if let Err(e) = async {
                             let mut stream =
                                 progress_tracker.stream(Some(Duration::from_millis(100)));
-                            while let Some(progress) = stream.next().await {
-                                ws.send(ws::Message::Text(
-                                    serde_json::to_string(&progress)
-                                        .with_kind(ErrorKind::Serialization)?,
-                                ))
-                                .await
-                                .with_kind(ErrorKind::Network)?;
-                                if progress.overall.is_complete() {
-                                    break;
+                            loop {
+                                tokio::select! {
+                                    progress = stream.next() => {
+                                        if let Some(progress) = progress {
+                                            ws.send(ws::Message::Text(
+                                                serde_json::to_string(&progress)
+                                                    .with_kind(ErrorKind::Serialization)?,
+                                            ))
+                                            .await
+                                            .with_kind(ErrorKind::Network)?;
+                                            if progress.overall.is_complete() {
+                                                return ws.normal_close("complete").await;
+                                            }
+                                        } else {
+                                            return ws.normal_close("complete").await;
+                                        }
+                                    }
+                                    msg = ws.recv() => {
+                                        if msg.transpose().with_kind(ErrorKind::Network)?.is_none() {
+                                            return Ok(())
+                                        }
+                                    }
                                 }
                             }
-
-                            ws.normal_close("complete").await?;
-
-                            Ok::<_, Error>(())
                         }
                         .await
                         {
diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs
index c7e38e81c..135153935 100644
--- a/core/startos/src/db/mod.rs
+++ b/core/startos/src/db/mod.rs
@@ -198,17 +198,26 @@ pub async fn subscribe(
                 session,
                 |mut ws| async move {
                     if let Err(e) = async {
-                        while let Some(rev) = sub.recv().await {
-                            ws.send(ws::Message::Text(
-                                serde_json::to_string(&rev).with_kind(ErrorKind::Serialization)?,
-                            ))
-                            .await
-                            .with_kind(ErrorKind::Network)?;
+                        loop {
+                            tokio::select! {
+                                rev = sub.recv() => {
+                                    if let Some(rev) = rev {
+                                        ws.send(ws::Message::Text(
+                                            serde_json::to_string(&rev).with_kind(ErrorKind::Serialization)?,
+                                        ))
+                                        .await
+                                        .with_kind(ErrorKind::Network)?;
+                                    } else {
+                                        return ws.normal_close("complete").await;
+                                    }
+                                }
+                                msg = ws.recv() => {
+                                    if msg.transpose().with_kind(ErrorKind::Network)?.is_none() {
+                                        return Ok(())
+                                    }
+                                }
+                            }
                         }
-
-                        ws.normal_close("complete").await?;
-
-                        Ok::<_, Error>(())
                     }
                     .await
                     {
diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs
index bc971da37..33c2ea6c7 100644
--- a/core/startos/src/install/mod.rs
+++ b/core/startos/src/install/mod.rs
@@ -2,6 +2,7 @@ use std::ops::Deref;
 use std::path::PathBuf;
 use std::time::Duration;
 
+use axum::extract::ws;
 use clap::builder::ValueParserFactory;
 use clap::{value_parser, CommandFactory, FromArgMatches, Parser};
 use color_eyre::eyre::eyre;
@@ -12,7 +13,7 @@ use itertools::Itertools;
 use models::{FromStrParser, VersionString};
 use reqwest::header::{HeaderMap, CONTENT_LENGTH};
 use reqwest::Url;
-use rpc_toolkit::yajrc::{GenericRpcMethod, RpcError};
+use rpc_toolkit::yajrc::RpcError;
 use rpc_toolkit::HandlerArgs;
 use rustyline_async::ReadlineEvent;
 use serde::{Deserialize, Serialize};
@@ -188,7 +189,7 @@ pub async fn sideload(
     SideloadParams { session }: SideloadParams,
 ) -> Result<SideloadResponse, Error> {
     let (upload, file) = upload(&ctx, session.clone()).await?;
-    let (err_send, err_recv) = oneshot::channel::<Error>();
+    let (err_send, mut err_recv) = oneshot::channel::<Error>();
     let progress = Guid::new();
     let progress_tracker = FullProgressTracker::new();
     let mut progress_listener = progress_tracker.stream(Some(Duration::from_millis(200)));
@@ -198,40 +199,44 @@ pub async fn sideload(
             RpcContinuation::ws_authed(
                 &ctx,
                 session,
-                |mut ws| {
-                    use axum::extract::ws::Message;
-                    async move {
-                        if let Err(e) = async {
+                |mut ws| async move {
+                    if let Err(e) = async {
+                        loop {
                             tokio::select! {
-                                res = async {
-                                    while let Some(progress) = progress_listener.next().await {
-                                        ws.send(Message::Text(
+                                progress = progress_listener.next() => {
+                                    if let Some(progress) = progress {
+                                        ws.send(ws::Message::Text(
                                             serde_json::to_string(&progress)
                                                 .with_kind(ErrorKind::Serialization)?,
                                         ))
                                         .await
                                         .with_kind(ErrorKind::Network)?;
+                                        if progress.overall.is_complete() {
+                                            return ws.normal_close("complete").await;
+                                        }
+                                    } else {
+                                        return ws.normal_close("complete").await;
                                     }
-                                    Ok::<_, Error>(())
-                                } => res?,
-                                err = err_recv => {
+                                }
+                                msg = ws.recv() => {
+                                    if msg.transpose().with_kind(ErrorKind::Network)?.is_none() {
+                                        return Ok(())
+                                    }
+                                }
+                                err = (&mut err_recv) => {
                                     if let Ok(e) = err {
                                         ws.close_result(Err::<&str, _>(e.clone_output())).await?;
                                         return Err(e)
                                     }
                                 }
                             }
-
-                            ws.normal_close("complete").await?;
-
-                            Ok::<_, Error>(())
-                        }
-                        .await
-                        {
-                            tracing::error!("Error tracking sideload progress: {e}");
-                            tracing::debug!("{e:?}");
                         }
                     }
+                    .await
+                    {
+                        tracing::error!("Error tracking sideload progress: {e}");
+                        tracing::debug!("{e:?}");
+                    }
                 },
                 Duration::from_secs(600),
             ),
@@ -255,9 +260,9 @@ pub async fn sideload(
         }
         .await
         {
-            let _ = err_send.send(e.clone_output());
             tracing::error!("Error sideloading package: {e}");
             tracing::debug!("{e:?}");
+            let _ = err_send.send(e);
         }
     });
     Ok(SideloadResponse { upload, progress })
diff --git a/core/startos/src/logs.rs b/core/startos/src/logs.rs
index 1cb3327b6..be5e9cb8f 100644
--- a/core/startos/src/logs.rs
+++ b/core/startos/src/logs.rs
@@ -30,6 +30,7 @@ use crate::error::ResultExt;
 use crate::lxc::ContainerId;
 use crate::prelude::*;
 use crate::rpc_continuations::{Guid, RpcContinuation, RpcContinuations};
+use crate::util::net::WebSocketExt;
 use crate::util::serde::Reversible;
 use crate::util::Invoke;
 
@@ -80,34 +81,28 @@ async fn ws_handler(
             .with_kind(ErrorKind::Network)?;
     }
 
-    let mut ws_closed = false;
-    while let Some(entry) = tokio::select! {
-        a = logs.try_next() => Some(a?),
-        a = stream.try_next() => { a.with_kind(crate::ErrorKind::Network)?; ws_closed = true; None }
-    } {
-        if let Some(entry) = entry {
-            let (_, log_entry) = entry.log_entry()?;
-            stream
-                .send(ws::Message::Text(
-                    serde_json::to_string(&log_entry).with_kind(ErrorKind::Serialization)?,
-                ))
-                .await
-                .with_kind(ErrorKind::Network)?;
+    loop {
+        tokio::select! {
+            entry = logs.try_next() => {
+                if let Some(entry) = entry? {
+                    let (_, log_entry) = entry.log_entry()?;
+                    stream
+                        .send(ws::Message::Text(
+                            serde_json::to_string(&log_entry).with_kind(ErrorKind::Serialization)?,
+                        ))
+                        .await
+                        .with_kind(ErrorKind::Network)?;
+                } else {
+                    return stream.normal_close("complete").await;
+                }
+            },
+            msg = stream.try_next() => {
+                if msg.with_kind(crate::ErrorKind::Network)?.is_none() {
+                    return Ok(())
+                }
+            }
         }
     }
-
-    if !ws_closed {
-        stream
-            .send(ws::Message::Close(Some(ws::CloseFrame {
-                code: ws::close_code::NORMAL,
-                reason: "Log Stream Finished".into(),
-            })))
-            .await
-            .with_kind(ErrorKind::Network)?;
-        drop(stream);
-    }
-
-    Ok(())
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
diff --git a/core/startos/src/net/forward.rs b/core/startos/src/net/forward.rs
index ba62945a0..6f3abee15 100644
--- a/core/startos/src/net/forward.rs
+++ b/core/startos/src/net/forward.rs
@@ -8,10 +8,11 @@ use id_pool::IdPool;
 use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
-use tokio::sync::{mpsc, watch};
+use tokio::sync::mpsc;
 
 use crate::db::model::public::NetworkInterfaceInfo;
 use crate::prelude::*;
+use crate::util::sync::Watch;
 use crate::util::Invoke;
 
 pub const START9_BRIDGE_IFACE: &str = "lxcbr0";
@@ -147,17 +148,16 @@ pub struct LanPortForwardController {
     _thread: NonDetachingJoinHandle<()>,
 }
 impl LanPortForwardController {
-    pub fn new(
-        mut net_iface: watch::Receiver<BTreeMap<InternedString, NetworkInterfaceInfo>>,
-    ) -> Self {
+    pub fn new(mut ip_info: Watch<BTreeMap<InternedString, NetworkInterfaceInfo>>) -> Self {
         let (req_send, mut req_recv) = mpsc::unbounded_channel();
         let thread = NonDetachingJoinHandle::from(tokio::spawn(async move {
             let mut state = ForwardState::default();
-            let mut interfaces = net_iface
-                .borrow_and_update()
-                .iter()
-                .map(|(iface, info)| (iface.clone(), info.public()))
-                .collect();
+            let mut interfaces = ip_info.peek_and_mark_seen(|ip_info| {
+                ip_info
+                    .iter()
+                    .map(|(iface, info)| (iface.clone(), info.public()))
+                    .collect()
+            });
             let mut reply: Option<oneshot::Sender<Result<(), Error>>> = None;
             loop {
                 tokio::select! {
@@ -171,12 +171,13 @@ impl LanPortForwardController {
                             break;
                         }
                     }
-                    _ = net_iface.changed() => {
-                        interfaces = net_iface
-                            .borrow()
-                            .iter()
-                            .map(|(iface, info)| (iface.clone(), info.public()))
-                            .collect();
+                    _ = ip_info.changed() => {
+                        interfaces = ip_info.peek(|ip_info| {
+                            ip_info
+                                .iter()
+                                .map(|(iface, info)| (iface.clone(), info.public()))
+                                .collect()
+                        });
                     }
                 }
                 let res = state.sync(&interfaces).await;
diff --git a/core/startos/src/net/network_interface.rs b/core/startos/src/net/network_interface.rs
index 991765c86..4f7696c97 100644
--- a/core/startos/src/net/network_interface.rs
+++ b/core/startos/src/net/network_interface.rs
@@ -1,7 +1,5 @@
 use std::collections::{BTreeMap, BTreeSet};
-use std::future::Future;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV6};
-use std::pin::Pin;
 use std::sync::{Arc, Weak};
 use std::task::Poll;
 use std::time::Duration;
@@ -19,7 +17,6 @@ use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio::net::{TcpListener, TcpStream};
 use tokio::process::Command;
-use tokio::sync::watch;
 use ts_rs::TS;
 use zbus::proxy::{PropertyChanged, PropertyStream, SignalStream};
 use zbus::zvariant::{
@@ -35,7 +32,7 @@ use crate::prelude::*;
 use crate::util::future::Until;
 use crate::util::io::open_file;
 use crate::util::serde::{display_serializable, HandlerExtSerde};
-use crate::util::sync::SyncMutex;
+use crate::util::sync::{SyncMutex, Watch};
 use crate::util::Invoke;
 
 pub fn network_interface_api<C: Context>() -> ParentHandler<C> {
@@ -112,7 +109,7 @@ pub fn network_interface_api<C: Context>() -> ParentHandler<C> {
 async fn list_interfaces(
     ctx: RpcContext,
 ) -> Result<BTreeMap<InternedString, NetworkInterfaceInfo>, Error> {
-    Ok(ctx.net_controller.net_iface.ip_info.borrow().clone())
+    Ok(ctx.net_controller.net_iface.ip_info.read())
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
@@ -322,7 +319,7 @@ impl<'a> StubStream<'a> for SignalStream<'a> {
 }
 
 #[instrument(skip_all)]
-async fn watcher(write_to: watch::Sender<BTreeMap<InternedString, NetworkInterfaceInfo>>) {
+async fn watcher(write_to: Watch<BTreeMap<InternedString, NetworkInterfaceInfo>>) {
     loop {
         let res: Result<(), Error> = async {
             let connection = Connection::system().await?;
@@ -425,7 +422,7 @@ async fn watch_ip(
     connection: &Connection,
     device_proxy: device::DeviceProxy<'_>,
     iface: InternedString,
-    write_to: &watch::Sender<BTreeMap<InternedString, NetworkInterfaceInfo>>,
+    write_to: &Watch<BTreeMap<InternedString, NetworkInterfaceInfo>>,
 ) -> Result<(), Error> {
     let mut until = Until::new()
         .with_stream(
@@ -593,13 +590,13 @@ async fn watch_ip(
 
 pub struct NetworkInterfaceController {
     db: TypedPatchDb<Database>,
-    ip_info: watch::Sender<BTreeMap<InternedString, NetworkInterfaceInfo>>,
+    ip_info: Watch<BTreeMap<InternedString, NetworkInterfaceInfo>>,
     _watcher: NonDetachingJoinHandle<()>,
     listeners: SyncMutex<BTreeMap<u16, Weak<()>>>,
 }
 impl NetworkInterfaceController {
-    pub fn subscribe(&self) -> watch::Receiver<BTreeMap<InternedString, NetworkInterfaceInfo>> {
-        self.ip_info.subscribe()
+    pub fn subscribe(&self) -> Watch<BTreeMap<InternedString, NetworkInterfaceInfo>> {
+        self.ip_info.clone_unseen()
     }
 
     async fn sync(
@@ -667,7 +664,7 @@ impl NetworkInterfaceController {
         Ok(())
     }
     pub fn new(db: TypedPatchDb<Database>) -> Self {
-        let (ip_info, mut recv) = watch::channel(BTreeMap::new());
+        let mut ip_info = Watch::new(BTreeMap::new());
         Self {
             db: db.clone(),
             ip_info: ip_info.clone(),
@@ -695,7 +692,7 @@ impl NetworkInterfaceController {
                     let res: Result<(), Error> = async {
                         loop {
                             if let Err(e) = async {
-                                let ip_info = { recv.borrow().clone() };
+                                let ip_info = ip_info.read();
                                 Self::sync(&db, &ip_info).boxed().await?;
 
                                 Ok::<_, Error>(())
@@ -706,7 +703,7 @@ impl NetworkInterfaceController {
                                 tracing::debug!("{e:?}");
                             }
 
-                            let _ = recv.changed().await;
+                            let _ = ip_info.changed().await;
                         }
                     }
                     .await;
@@ -733,12 +730,10 @@ impl NetworkInterfaceController {
             l.insert(port, Arc::downgrade(&arc));
             Ok(())
         })?;
-        let mut ip_info = self.ip_info.subscribe();
-        ip_info.mark_changed();
+        let ip_info = self.ip_info.clone_unseen();
         Ok(NetworkInterfaceListener {
             _arc: arc,
             ip_info,
-            changed: None,
             listeners: ListenerMap::new(port),
         })
     }
@@ -760,12 +755,11 @@ impl NetworkInterfaceController {
             l.insert(port, Arc::downgrade(&arc));
             Ok(())
         })?;
-        let mut ip_info = self.ip_info.subscribe();
+        let ip_info = self.ip_info.clone_unseen();
         ip_info.mark_changed();
         Ok(NetworkInterfaceListener {
             _arc: arc,
             ip_info,
-            changed: None,
             listeners,
         })
     }
@@ -985,9 +979,8 @@ impl ListenerMap {
 }
 
 pub struct NetworkInterfaceListener {
-    ip_info: watch::Receiver<BTreeMap<InternedString, NetworkInterfaceInfo>>,
+    ip_info: Watch<BTreeMap<InternedString, NetworkInterfaceInfo>>,
     listeners: ListenerMap,
-    changed: Option<Pin<Box<dyn Future<Output = ()> + Send + Sync + 'static>>>,
     _arc: Arc<()>,
 }
 impl NetworkInterfaceListener {
@@ -995,29 +988,14 @@ impl NetworkInterfaceListener {
         self.listeners.port
     }
 
-    fn poll_ip_info_changed(&mut self, cx: &mut std::task::Context<'_>) -> Poll<()> {
-        let mut changed = if let Some(changed) = self.changed.take() {
-            changed
-        } else {
-            let mut ip_info = self.ip_info.clone();
-            Box::pin(async move {
-                let _ = ip_info.changed().await;
-            })
-        };
-        let res = changed.poll_unpin(cx);
-        if res.is_pending() {
-            self.changed = Some(changed);
-        }
-        res
-    }
-
     pub fn poll_accept(
         &mut self,
         cx: &mut std::task::Context<'_>,
         public: bool,
     ) -> Poll<Result<Accepted, Error>> {
-        if self.poll_ip_info_changed(cx).is_ready() || public != self.listeners.prev_public {
-            self.listeners.update(&*self.ip_info.borrow(), public)?;
+        while self.ip_info.poll_changed(cx).is_ready() || public != self.listeners.prev_public {
+            self.ip_info
+                .peek(|ip_info| self.listeners.update(ip_info, public))?;
         }
         self.listeners.poll_accept(cx)
     }
diff --git a/core/startos/src/net/web_server.rs b/core/startos/src/net/web_server.rs
index b38a7ee56..468b5d5db 100644
--- a/core/startos/src/net/web_server.rs
+++ b/core/startos/src/net/web_server.rs
@@ -7,13 +7,12 @@ use std::task::Poll;
 use std::time::Duration;
 
 use axum::Router;
-use futures::future::{BoxFuture, Either};
+use futures::future::Either;
 use futures::FutureExt;
 use helpers::NonDetachingJoinHandle;
 use hyper_util::rt::{TokioIo, TokioTimer};
-use hyper_util::service::TowerToHyperService;
 use tokio::net::{TcpListener, TcpStream};
-use tokio::sync::{oneshot, watch};
+use tokio::sync::oneshot;
 
 use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::net::network_interface::NetworkInterfaceListener;
@@ -23,6 +22,7 @@ use crate::net::static_server::{
 };
 use crate::prelude::*;
 use crate::util::actor::background::BackgroundJobQueue;
+use crate::util::sync::Watch;
 
 pub struct Accepted {
     pub https_redirect: bool,
@@ -76,42 +76,22 @@ impl<A: Accept> Accept for Option<A> {
 
 #[pin_project::pin_project]
 pub struct Acceptor<A: Accept> {
-    acceptor: (watch::Sender<A>, watch::Receiver<A>),
-    changed: Option<BoxFuture<'static, ()>>,
+    acceptor: Watch<A>,
 }
 impl<A: Accept + Send + Sync + 'static> Acceptor<A> {
     pub fn new(acceptor: A) -> Self {
         Self {
-            acceptor: watch::channel(acceptor),
-            changed: None,
+            acceptor: Watch::new(acceptor),
         }
     }
 
     fn poll_changed(&mut self, cx: &mut std::task::Context<'_>) -> Poll<()> {
-        let mut changed = if let Some(changed) = self.changed.take() {
-            changed
-        } else {
-            let mut recv = self.acceptor.1.clone();
-            async move {
-                let _ = recv.changed().await;
-            }
-            .boxed()
-        };
-        let res = changed.poll_unpin(cx);
-        if res.is_pending() {
-            self.changed = Some(changed);
-        }
-        res
+        self.acceptor.poll_changed(cx)
     }
 
     fn poll_accept(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Result<Accepted, Error>> {
         let _ = self.poll_changed(cx);
-        let mut res = Poll::Pending;
-        self.acceptor.0.send_if_modified(|a| {
-            res = a.poll_accept(cx);
-            false
-        });
-        res
+        self.acceptor.peek_mut(|a| a.poll_accept(cx))
     }
 
     async fn accept(&mut self) -> Result<Accepted, Error> {
@@ -139,7 +119,7 @@ impl Acceptor<UpgradableListener> {
 }
 
 pub struct WebServerAcceptorSetter<A: Accept> {
-    acceptor: watch::Sender<A>,
+    acceptor: Watch<A>,
 }
 impl<A: Accept, B: Accept> WebServerAcceptorSetter<Option<Either<A, B>>> {
     pub fn try_upgrade<F: FnOnce(A) -> Result<B, Error>>(&self, f: F) -> Result<(), Error> {
@@ -160,7 +140,7 @@ impl<A: Accept, B: Accept> WebServerAcceptorSetter<Option<Either<A, B>>> {
     }
 }
 impl<A: Accept> Deref for WebServerAcceptorSetter<A> {
-    type Target = watch::Sender<A>;
+    type Target = Watch<A>;
     fn deref(&self) -> &Self::Target {
         &self.acceptor
     }
@@ -168,8 +148,8 @@ impl<A: Accept> Deref for WebServerAcceptorSetter<A> {
 
 pub struct WebServer<A: Accept> {
     shutdown: oneshot::Sender<()>,
-    router: watch::Sender<Option<Router>>,
-    acceptor: watch::Sender<A>,
+    router: Watch<Option<Router>>,
+    acceptor: Watch<A>,
     thread: NonDetachingJoinHandle<()>,
 }
 impl<A: Accept + Send + Sync + 'static> WebServer<A> {
@@ -180,8 +160,9 @@ impl<A: Accept + Send + Sync + 'static> WebServer<A> {
     }
 
     pub fn new(mut acceptor: Acceptor<A>) -> Self {
-        let acceptor_send = acceptor.acceptor.0.clone();
-        let (router, service) = watch::channel::<Option<Router>>(None);
+        let acceptor_send = acceptor.acceptor.clone();
+        let router = Watch::<Option<Router>>::new(None);
+        let service = router.clone_unseen();
         let (shutdown, shutdown_recv) = oneshot::channel();
         let thread = NonDetachingJoinHandle::from(tokio::spawn(async move {
             #[derive(Clone)]
@@ -201,6 +182,34 @@ impl<A: Accept + Send + Sync + 'static> WebServer<A> {
                 }
             }
 
+            struct SwappableRouter(Watch<Option<Router>>, bool);
+            impl hyper::service::Service<hyper::Request<hyper::body::Incoming>> for SwappableRouter {
+                type Response = <Router as tower_service::Service<
+                    hyper::Request<hyper::body::Incoming>,
+                >>::Response;
+                type Error = <Router as tower_service::Service<
+                    hyper::Request<hyper::body::Incoming>,
+                >>::Error;
+                type Future = <Router as tower_service::Service<
+                    hyper::Request<hyper::body::Incoming>,
+                >>::Future;
+
+                fn call(&self, req: hyper::Request<hyper::body::Incoming>) -> Self::Future {
+                    use tower_service::Service;
+
+                    if self.1 {
+                        redirecter().call(req)
+                    } else {
+                        let router = self.0.read();
+                        if let Some(mut router) = router {
+                            router.call(req)
+                        } else {
+                            refresher().call(req)
+                        }
+                    }
+                }
+            }
+
             let accept = AtomicBool::new(true);
             let queue_cell = Arc::new(RwLock::new(None));
             let graceful = hyper_util::server::graceful::GracefulShutdown::new();
@@ -224,45 +233,16 @@ impl<A: Accept + Send + Sync + 'static> WebServer<A> {
                 loop {
                     if let Err(e) = async {
                         let accepted = acceptor.accept().await?;
-                        if accepted.https_redirect {
-                            queue.add_job(
-                                graceful.watch(
-                                    server
-                                        .serve_connection_with_upgrades(
-                                            TokioIo::new(accepted.stream),
-                                            TowerToHyperService::new(redirecter().into_service()),
-                                        )
-                                        .into_owned(),
-                                ),
-                            );
-                        } else {
-                            let service = { service.borrow().clone() };
-                            if let Some(service) = service {
-                                queue.add_job(
-                                    graceful.watch(
-                                        server
-                                            .serve_connection_with_upgrades(
-                                                TokioIo::new(accepted.stream),
-                                                TowerToHyperService::new(service.into_service()),
-                                            )
-                                            .into_owned(),
-                                    ),
-                                );
-                            } else {
-                                queue.add_job(
-                                    graceful.watch(
-                                        server
-                                            .serve_connection_with_upgrades(
-                                                TokioIo::new(accepted.stream),
-                                                TowerToHyperService::new(
-                                                    refresher().into_service(),
-                                                ),
-                                            )
-                                            .into_owned(),
-                                    ),
-                                );
-                            }
-                        }
+                        queue.add_job(
+                            graceful.watch(
+                                server
+                                    .serve_connection_with_upgrades(
+                                        TokioIo::new(accepted.stream),
+                                        SwappableRouter(service.clone(), accepted.https_redirect),
+                                    )
+                                    .into_owned(),
+                            ),
+                        );
 
                         Ok::<_, Error>(())
                     }
@@ -303,7 +283,7 @@ impl<A: Accept + Send + Sync + 'static> WebServer<A> {
     }
 
     pub fn serve_router(&mut self, router: Router) {
-        self.router.send_replace(Some(router));
+        self.router.send(Some(router))
     }
 
     pub fn serve_main(&mut self, ctx: RpcContext) {
diff --git a/core/startos/src/service/service_actor.rs b/core/startos/src/service/service_actor.rs
index b88136650..bb30d2a98 100644
--- a/core/startos/src/service/service_actor.rs
+++ b/core/startos/src/service/service_actor.rs
@@ -66,9 +66,7 @@ impl Actor for ServiceActor {
                     tracing::debug!("{e:?}");
                 }
 
-                if ip_info.changed().await.is_err() {
-                    break;
-                };
+                ip_info.changed().await;
             }
         });
     }
diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs
index d88838d4a..7daa4f3b2 100644
--- a/core/startos/src/update/mod.rs
+++ b/core/startos/src/update/mod.rs
@@ -20,7 +20,7 @@ use ts_rs::TS;
 use crate::context::{CliContext, RpcContext};
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
-use crate::disk::mount::filesystem::efivarfs::{ EfiVarFs};
+use crate::disk::mount::filesystem::efivarfs::EfiVarFs;
 use crate::disk::mount::filesystem::overlayfs::OverlayGuard;
 use crate::disk::mount::filesystem::MountType;
 use crate::disk::mount::guard::{GenericMountGuard, MountGuard, TmpMountGuard};
@@ -106,7 +106,7 @@ pub async fn update_system(
                                         .with_kind(ErrorKind::Database)?,
                                 )
                                 .await;
-                            while {
+                            loop {
                                 let progress = ctx
                                     .db
                                     .peek()
@@ -122,14 +122,22 @@ pub async fn update_system(
                                 ))
                                 .await
                                 .with_kind(ErrorKind::Network)?;
-                                progress.is_some()
-                            } {
-                                sub.recv().await;
+                                if progress.is_none() {
+                                    return ws.normal_close("complete").await;
+                                }
+                                tokio::select! {
+                                    _ = sub.recv() => (),
+                                    res = async {
+                                        loop {
+                                            if ws.recv().await.transpose().with_kind(ErrorKind::Network)?.is_none() {
+                                                return Ok(())
+                                            }
+                                        }
+                                     } => {
+                                        return res
+                                    }
+                                }
                             }
-
-                            ws.normal_close("complete").await?;
-
-                            Ok::<_, Error>(())
                         }
                         .await
                         {
diff --git a/core/startos/src/util/net.rs b/core/startos/src/util/net.rs
index 9e1beeaba..1189f70f2 100644
--- a/core/startos/src/util/net.rs
+++ b/core/startos/src/util/net.rs
@@ -19,13 +19,8 @@ pub trait WebSocketExt {
 }
 
 impl WebSocketExt for ws::WebSocket {
-    async fn normal_close(mut self, msg: impl Into<Cow<'static, str>> + Send) -> Result<(), Error> {
-        self.send(ws::Message::Close(Some(CloseFrame {
-            code: 1000,
-            reason: msg.into(),
-        })))
-        .await
-        .with_kind(ErrorKind::Network)
+    async fn normal_close(self, msg: impl Into<Cow<'static, str>> + Send) -> Result<(), Error> {
+        self.close_result(Ok::<_, Error>(msg)).await
     }
     async fn close_result(
         mut self,
@@ -38,15 +33,23 @@ impl WebSocketExt for ws::WebSocket {
                     reason: msg.into(),
                 })))
                 .await
-                .with_kind(ErrorKind::Network),
+                .with_kind(ErrorKind::Network)?,
             Err(e) => self
                 .send(ws::Message::Close(Some(CloseFrame {
                     code: 1011,
                     reason: e.to_string().into(),
                 })))
                 .await
-                .with_kind(ErrorKind::Network),
+                .with_kind(ErrorKind::Network)?,
         }
+        while !matches!(
+            self.recv()
+                .await
+                .transpose()
+                .with_kind(ErrorKind::Network)?,
+            Some(ws::Message::Close(_)) | None
+        ) {}
+        Ok(())
     }
 }
 
diff --git a/core/startos/src/util/sync.rs b/core/startos/src/util/sync.rs
index 2630858a9..ca7b4c6bb 100644
--- a/core/startos/src/util/sync.rs
+++ b/core/startos/src/util/sync.rs
@@ -1,3 +1,7 @@
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::{Poll, Waker};
+
 #[derive(Debug, Default)]
 pub struct SyncMutex<T>(std::sync::Mutex<T>);
 impl<T> SyncMutex<T> {
@@ -11,3 +15,140 @@ impl<T> SyncMutex<T> {
         f(&*self.0.lock().unwrap())
     }
 }
+
+struct WatchShared<T> {
+    version: u64,
+    data: T,
+    wakers: Vec<Waker>,
+}
+impl<T> WatchShared<T> {
+    fn modified(&mut self) {
+        self.version += 1;
+        for waker in self.wakers.drain(..) {
+            waker.wake();
+        }
+    }
+}
+
+#[pin_project::pin_project]
+pub struct Watch<T> {
+    shared: Arc<SyncMutex<WatchShared<T>>>,
+    version: u64,
+}
+impl<T> Clone for Watch<T> {
+    fn clone(&self) -> Self {
+        Self {
+            shared: self.shared.clone(),
+            version: self.version,
+        }
+    }
+}
+impl<T> Watch<T> {
+    pub fn new(init: T) -> Self {
+        Self {
+            shared: Arc::new(SyncMutex::new(WatchShared {
+                version: 1,
+                data: init,
+                wakers: Vec::new(),
+            })),
+            version: 0,
+        }
+    }
+    pub fn clone_unseen(&self) -> Self {
+        Self {
+            shared: self.shared.clone(),
+            version: 0,
+        }
+    }
+    pub fn poll_changed(&mut self, cx: &mut std::task::Context<'_>) -> Poll<()> {
+        self.shared.mutate(|shared| {
+            if shared.version != self.version {
+                self.version = shared.version;
+                Poll::Ready(())
+            } else {
+                let waker = cx.waker();
+                if !shared.wakers.iter().any(|w| w.will_wake(waker)) {
+                    shared.wakers.push(waker.clone());
+                }
+                Poll::Pending
+            }
+        })
+    }
+    pub async fn changed(&mut self) {
+        futures::future::poll_fn(|cx| self.poll_changed(cx)).await
+    }
+    pub fn send_if_modified<F: FnOnce(&mut T) -> bool>(&self, modify: F) -> bool {
+        self.shared.mutate(|shared| {
+            let changed = modify(&mut shared.data);
+            if changed {
+                shared.modified();
+            }
+            changed
+        })
+    }
+    pub fn send_modify<U, F: FnOnce(&mut T) -> U>(&self, modify: F) -> U {
+        self.shared.mutate(|shared| {
+            let res = modify(&mut shared.data);
+            shared.modified();
+            res
+        })
+    }
+    pub fn send_replace(&self, new: T) -> T {
+        self.send_modify(|a| std::mem::replace(a, new))
+    }
+    pub fn send(&self, new: T) {
+        self.send_replace(new);
+    }
+    pub fn mark_changed(&self) {
+        self.shared.mutate(|shared| shared.modified())
+    }
+    pub fn mark_unseen(&mut self) {
+        self.version = 0;
+    }
+    pub fn mark_seen(&mut self) {
+        self.shared.peek(|shared| {
+            self.version = shared.version;
+        })
+    }
+    pub fn peek<U, F: FnOnce(&T) -> U>(&self, f: F) -> U {
+        self.shared.peek(|shared| f(&shared.data))
+    }
+    pub fn peek_and_mark_seen<U, F: FnOnce(&T) -> U>(&mut self, f: F) -> U {
+        self.shared.peek(|shared| {
+            self.version = shared.version;
+            f(&shared.data)
+        })
+    }
+    pub fn peek_mut<U, F: FnOnce(&mut T) -> U>(&self, f: F) -> U {
+        self.shared.mutate(|shared| f(&mut shared.data))
+    }
+}
+impl<T: Clone> Watch<T> {
+    pub fn read(&self) -> T {
+        self.peek(|a| a.clone())
+    }
+}
+impl<T: Clone> futures::Stream for Watch<T> {
+    type Item = T;
+    fn poll_next(
+        self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> Poll<Option<Self::Item>> {
+        let this = self.project();
+        this.shared.mutate(|shared| {
+            if shared.version != *this.version {
+                *this.version = shared.version;
+                Poll::Ready(Some(shared.data.clone()))
+            } else {
+                let waker = cx.waker();
+                if !shared.wakers.iter().any(|w| w.will_wake(waker)) {
+                    shared.wakers.push(waker.clone());
+                }
+                Poll::Pending
+            }
+        })
+    }
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (1, None)
+    }
+}
diff --git a/core/startos/src/version/update_details/v0_3_6.md b/core/startos/src/version/update_details/v0_3_6.md
index b93e8ad1a..177845f08 100644
--- a/core/startos/src/version/update_details/v0_3_6.md
+++ b/core/startos/src/version/update_details/v0_3_6.md
@@ -17,17 +17,16 @@ StartOS v0.3.6 is a complete rewrite of the OS internals (everything you don't s
 ## Changelog
 
 - [Switch to lxc-based container runtime](#lxc)
-- [Update s9pk archive format](#new-s9pk-archive-format)
-- [Improve config](#better-config)
-- [Unify Actions](#unify-actions)
+- [Update s9pk archive format](#s9pk-archive-format)
+- [Improve Actions](#actions)
 - [Use squashfs images for OS updates](#squashfs-updates)
-- [Introduce Typescript package API and SDK](#typescript-package-api-and-sdk)
+- [Introduce Typescript package API and SDK](#typescript-sdk)
 - [Remove Postgresql](#remove-postgressql)
 - [Implement detailed progress reporting](#progress-reporting)
 - [Improve registry protocol](#registry-protocol)
 - [Replace unique .local URLs with unique ports](#lan-port-forwarding)
 - [Use start-fs Fuse module for improved backups](#improved-backups)
-- [Switch to Exver for versioning](#Exver)
+- [Switch to Exver for versioning](#exver)
 - [Support clearnet hosting via start-cli](#clearnet)
 
 ### LXC
@@ -38,21 +37,17 @@ StartOS now uses a nested container paradigm based on LXC for the outer containe
 
 The S9PK archive format has been overhauled to allow for signature verification of partial downloads, and allow direct mounting of container images without unpacking the s9pk.
 
-### Better config
-
-Expanded support for input types and a new UI makes configuring services easier and more powerful.
-
 ### Actions
 
-Actions take arbitrary form input _and_ return arbitrary responses, thus satisfying the needs of both Config and Properties, which will be removed in a future release. This gives packages developers the ability to break up Config and Properties into smaller, more specific formats, or to exclude them entirely without polluting the UI.
+Actions take arbitrary form input and return arbitrary responses, thus satisfying the needs of both Config and Properties, which have been removed. The new actions API gives packages developers the ability to break up Config and Properties into smaller, more specific formats, or to exclude them entirely without polluting the UI. Improved form design and new input types round out the actions experience.
 
 ### Squashfs updates
 
 StartOS now uses squashfs images to represent OS updates. This allows for better update verification, and improved reliability over rsync updates.
 
-### Typescript package API and SDK
+### Typescript SDK
 
-StartOS now exposes a Typescript API. Package developers can take advantage in a simple, typesafe way using the new start-sdk. A barebones StartOS package (s9pk) can be produced in minutes with minimal knowledge or skill. More advanced developers can use the SDK to create highly customized user experiences with their service.
+Package developers can now take advantage of StartOS APIs using the new start-sdk, available in Typescript. A barebones StartOS package (s9pk) can be produced in minutes with minimal knowledge or skill. More advanced developers can use the SDK to create highly customized user experiences with their service.
 
 ### Remove PostgresSQL
 
@@ -76,8 +71,14 @@ The new start-fs fuse module unifies file system expectations for various platfo
 
 ### Exver
 
-StartOS now uses Extended Versioning (Exver), which consists of three parts, separated by semicolons: (1) a Semver-compliant upstream version, (2) a Semver-compliant wrapper version, and (3) an optional "flavor" prefix. Flavors can be thought of as alternative implementations of services, where a user would only want one or the other installed, and data can feasibly be migrating beetween the two. Another common characteristic of flavors is that they satisfy the same API requirement of dependents, though this is not strictly necessary. A valid Exver looks something like this: `#knots:28.0.:1.0-beta.1`. This would translate to "the first beta release of StartOS wrapper version 1.0 of Bitcoin Knots version 27.0".
+StartOS now uses Extended Versioning (Exver), which consists of three parts: (1) a Semver-compliant upstream version, (2) a Semver-compliant wrapper version, and (3) an optional "flavor" prefix. Flavors can be thought of as alternative implementations of services, where a user would only want one or the other installed, and data can feasibly be migrating between the two. Another common characteristic of flavors is that they satisfy the same API requirement of dependents, though this is not strictly necessary. A valid Exver looks something like this: `#knots:28.0.:1.0-beta.1`. This would translate to "the first beta release of StartOS wrapper version 1.0 of Bitcoin Knots version 27.0".
 
 ### Clearnet
 
-It is now possible, and quite easy, to expose specific services interfaces to the public Internet on a standard domain using start-cli. This functionality will be expanded upon and moved into the StartOS UI in a future release.
+It is now possible, and quite easy, to expose service interfaces to the public Internet on a standard domain using start-cli. In addition to choosing which service interfaces to expose on which domains/subdomains, users have two options:
+
+1. Open ports on their router. This option is free and easy to accomplish with most routers. The drawback is that the user's home IP address is revealed to anyone accessing the exposes resources. For example, hosting a blog in this way would reveal your home IP address, and therefor your approximate location on Earth, to your readers.
+
+2. Use a Wireguard VPN to proxy web traffic. This option requires the user to provision a $5-$10/month remote VPS and perform a few, simple commands. The result is the successful obfuscation of the users home IP address.
+
+The CLI-driven clearnet functionality will be expanded upon and moved into the main StartOS UI in a future release.
diff --git a/web/projects/ui/src/app/app-routing.module.ts b/web/projects/ui/src/app/app-routing.module.ts
index e7a2036ec..e16085a97 100644
--- a/web/projects/ui/src/app/app-routing.module.ts
+++ b/web/projects/ui/src/app/app-routing.module.ts
@@ -12,7 +12,7 @@ const routes: Routes = [
   },
   {
     path: 'login',
-    canActivate: [UnauthGuard],
+    canActivate: [UnauthGuard, stateNot(['error', 'initializing'])],
     loadChildren: () =>
       import('./pages/login/login.module').then(m => m.LoginPageModule),
   },
diff --git a/web/projects/ui/src/app/pages/init/init.service.ts b/web/projects/ui/src/app/pages/init/init.service.ts
index c58e7777e..9fbcc933d 100644
--- a/web/projects/ui/src/app/pages/init/init.service.ts
+++ b/web/projects/ui/src/app/pages/init/init.service.ts
@@ -1,10 +1,8 @@
 import { inject, Injectable } from '@angular/core'
-import { ErrorService } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import {
   catchError,
   defer,
-  EMPTY,
   from,
   map,
   Observable,
@@ -24,40 +22,46 @@ interface MappedProgress {
 export class InitService extends Observable<MappedProgress> {
   private readonly state = inject(StateService)
   private readonly api = inject(ApiService)
-  private readonly errorService = inject(ErrorService)
   private readonly progress$ = defer(() =>
     from(this.api.initGetProgress()),
   ).pipe(
     switchMap(({ guid, progress }) =>
-      this.api.openWebsocket$<T.FullProgress>(guid).pipe(startWith(progress)),
+      this.api
+        .openWebsocket$<T.FullProgress>(guid, {
+          closeObserver: {
+            next: () => {
+              this.state.syncState()
+            },
+          },
+        })
+        .pipe(startWith(progress)),
     ),
-    map(({ phases, overall }) => {
-      return {
-        total: getOverallDecimal(overall),
-        message: phases
-          .filter(
-            (
-              p,
-            ): p is {
-              name: string
-              progress: {
-                done: number
-                total: number | null
-              }
-            } => p.progress !== true && p.progress !== null,
-          )
-          .map(p => `<b>${p.name}</b>${getPhaseBytes(p.progress)}`)
-          .join(', '),
-      }
-    }),
+    map(({ phases, overall }) => ({
+      total: getOverallDecimal(overall),
+      message: phases
+        .filter(
+          (
+            p,
+          ): p is {
+            name: string
+            progress: {
+              done: number
+              total: number | null
+            }
+          } => p.progress !== true && p.progress !== null,
+        )
+        .map(p => `<b>${p.name}</b>${getPhaseBytes(p.progress)}`)
+        .join(', '),
+    })),
     tap(({ total }) => {
       if (total === 1) {
         this.state.syncState()
       }
     }),
-    catchError(e => {
+    catchError((e, caught$) => {
       console.error(e)
-      return EMPTY
+      this.state.syncState()
+      return caught$
     }),
   )
 
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
index bdfe8e3ed..6178ebccc 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.html
@@ -35,19 +35,17 @@
         >
           Downgrade
         </ion-button>
-        <ng-container *ngIf="showDevTools$ | async">
-          <ion-button
-            *ngIf="(manifest.version | compareExver : pkg.version) === 0"
-            expand="block"
-            color="success"
-            (click)="tryInstall()"
-          >
-            Reinstall
-          </ion-button>
-        </ng-container>
+        <ion-button
+          *ngIf="(manifest.version | compareExver : pkg.version) === 0"
+          expand="block"
+          color="success"
+          (click)="tryInstall()"
+        >
+          Reinstall
+        </ion-button>
       </ng-container>
     </ng-container>
-  
+
     <ng-template #install>
       <ion-button
         expand="block"
diff --git a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
index 40b443b27..ab2efa6c7 100644
--- a/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
+++ b/web/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show-controls/marketplace-show-controls.component.ts
@@ -18,7 +18,6 @@ import {
 } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
 import { firstValueFrom } from 'rxjs'
-import { ClientStorageService } from 'src/app/services/client-storage.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import {
   DataModel,
@@ -50,11 +49,8 @@ export class MarketplaceShowControlsComponent {
   @Input()
   conflict?: string | null
 
-  readonly showDevTools$ = this.ClientStorageService.showDevTools$
-
   constructor(
     private readonly alertCtrl: AlertController,
-    private readonly ClientStorageService: ClientStorageService,
     @Inject(AbstractMarketplaceService)
     private readonly marketplaceService: MarketplaceService,
     private readonly loader: LoadingService,
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
index 39a69037f..0a531b5f3 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
@@ -1,13 +1,12 @@
 import { Component } from '@angular/core'
 import { isPlatform } from '@ionic/angular'
 import { ErrorService, LoadingService } from '@start9labs/shared'
-import { S9pk, T } from '@start9labs/start-sdk'
+import { S9pk } from '@start9labs/start-sdk'
 import cbor from 'cbor'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
 import { SideloadService } from './sideload.service'
 import { filter, firstValueFrom } from 'rxjs'
-import mime from 'mime'
 
 interface Positions {
   [key: string]: [bigint, bigint] // [position, length]
@@ -121,10 +120,8 @@ export class SideloadPage {
     try {
       const res = await this.api.sideloadPackage()
       this.sideloadService.followProgress(res.progress)
-      this.api
-        .uploadPackage(res.upload, this.toUpload.file!)
-        .catch(e => console.error(e))
-      await firstValueFrom(this.progress$.pipe(filter(Boolean)))
+      await this.api.uploadPackage(res.upload, this.toUpload.file!)
+      await firstValueFrom(this.progress$)
     } catch (e: any) {
       this.errorService.handleError(e)
     } finally {
diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
index d157272ff..df6ec0868 100644
--- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
+++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.service.ts
@@ -1,6 +1,16 @@
-import { Injectable } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
+import { Router } from '@angular/router'
+import { ErrorService } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
-import { BehaviorSubject, endWith, shareReplay, Subject, switchMap } from 'rxjs'
+import {
+  catchError,
+  EMPTY,
+  endWith,
+  shareReplay,
+  Subject,
+  switchMap,
+  tap,
+} from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 @Injectable({
@@ -8,11 +18,34 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 })
 export class SideloadService {
   private readonly guid$ = new Subject<string>()
+  private readonly errorService = inject(ErrorService)
+  private readonly router = inject(Router)
 
   readonly progress$ = this.guid$.pipe(
     switchMap(guid =>
-      this.api.openWebsocket$<T.FullProgress>(guid).pipe(endWith(null)),
+      this.api
+        .openWebsocket$<T.FullProgress>(guid, {
+          closeObserver: {
+            next: event => {
+              if (event.code !== 1000) {
+                this.errorService.handleError(event.reason)
+              }
+            },
+          },
+        })
+        .pipe(
+          tap(p => {
+            if (p.overall === true) {
+              this.router.navigate([''], { replaceUrl: true })
+            }
+          }),
+          endWith(null),
+        ),
     ),
+    catchError(e => {
+      this.errorService.handleError('Websocket connection broken. Try again.')
+      return EMPTY
+    }),
     shareReplay(1),
   )
 
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 280ac79f3..551011533 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -7,6 +7,7 @@ import {
   GetPackagesRes,
   MarketplacePkg,
 } from '@start9labs/marketplace'
+import { WebSocketSubject } from 'rxjs/webSocket'
 
 export abstract class ApiService {
   // http
@@ -30,7 +31,7 @@ export abstract class ApiService {
   abstract openWebsocket$<T>(
     guid: string,
     config?: RR.WebsocketConfig<T>,
-  ): Observable<T>
+  ): WebSocketSubject<T>
 
   // state
 
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 6241eaad7..9893585a4 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -11,7 +11,7 @@ import { PATCH_CACHE } from 'src/app/services/patch-db/patch-db-source'
 import { ApiService } from './embassy-api.service'
 import { RR } from './api.types'
 import { ConfigService } from '../config.service'
-import { webSocket } from 'rxjs/webSocket'
+import { webSocket, WebSocketSubject } from 'rxjs/webSocket'
 import { Observable, filter, firstValueFrom } from 'rxjs'
 import { AuthService } from '../auth.service'
 import { DOCUMENT } from '@angular/common'
@@ -85,7 +85,7 @@ export class LiveApiService extends ApiService {
   openWebsocket$<T>(
     guid: string,
     config: RR.WebsocketConfig<T> = {},
-  ): Observable<T> {
+  ): WebSocketSubject<T> {
     const { location } = this.document.defaultView!
     const protocol = location.protocol === 'http:' ? 'ws' : 'wss'
     const host = location.host
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 93925cc73..23296ad15 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -37,6 +37,7 @@ import {
   GetPackagesRes,
   MarketplacePkg,
 } from '@start9labs/marketplace'
+import { WebSocketSubject } from 'rxjs/webSocket'
 
 const PROGRESS: T.FullProgress = {
   overall: {
@@ -107,11 +108,11 @@ export class MockApiService extends ApiService {
   openWebsocket$<T>(
     guid: string,
     config: RR.WebsocketConfig<T> = {},
-  ): Observable<T> {
+  ): WebSocketSubject<T> {
     if (guid === 'db-guid') {
       return this.mockWsSource$.pipe<any>(
         shareReplay({ bufferSize: 1, refCount: true }),
-      )
+      ) as WebSocketSubject<T>
     } else if (guid === 'logs-guid') {
       return interval(50).pipe<any>(
         map((_, index) => {
@@ -120,16 +121,16 @@ export class MockApiService extends ApiService {
           if (index === 100) throw new Error('HAAHHA')
           return Mock.ServerLogs[0]
         }),
-      )
+      ) as WebSocketSubject<T>
     } else if (guid === 'init-progress-guid') {
       return from(this.initProgress()).pipe(
         startWith(PROGRESS),
-      ) as Observable<T>
+      ) as WebSocketSubject<T>
     } else if (guid === 'sideload-progress-guid') {
       config.openObserver?.next(new Event(''))
       return from(this.initProgress()).pipe(
         startWith(PROGRESS),
-      ) as Observable<T>
+      ) as WebSocketSubject<T>
     } else {
       throw new Error('invalid guid type')
     }
diff --git a/web/projects/ui/src/app/services/auth.service.ts b/web/projects/ui/src/app/services/auth.service.ts
index 9c16d0e26..2db008d8e 100644
--- a/web/projects/ui/src/app/services/auth.service.ts
+++ b/web/projects/ui/src/app/services/auth.service.ts
@@ -27,9 +27,9 @@ export class AuthService {
   ) {}
 
   init(): void {
-    const loggedIn = this.storage.get(this.LOGGED_IN_KEY)
+    const loggedIn = this.storage.get<boolean>(this.LOGGED_IN_KEY)
     if (loggedIn) {
-      this.setVerified()
+      this.authState$.next(AuthState.VERIFIED)
     } else {
       this.setUnverified()
     }

From e012a29b5e376d2bc7a58a8bb4e47a54acbb828c Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:32:19 -0700
Subject: [PATCH 340/341] add smtp to frontend (#2802)

* add smtp to frontend

* left align headers

* just email

* change all to email

* fix test-smtp api

* types

* fix email from and login address handling

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 core/startos/src/bins/registry.rs             |  2 +-
 core/startos/src/lib.rs                       |  4 +-
 core/startos/src/system.rs                    | 52 ++++++++++--
 core/startos/src/version/mod.rs               |  2 +-
 .../lib/actions/input/inputSpecConstants.ts   |  4 +-
 sdk/base/lib/osBindings/TestSmtpParams.ts     | 10 +++
 sdk/base/lib/osBindings/index.ts              |  1 +
 sdk/base/lib/util/patterns.ts                 |  5 ++
 sdk/base/lib/util/regexes.ts                  |  8 +-
 web/package-lock.json                         | 28 ++++++-
 .../pages/server-routes/email/email.module.ts | 42 ++++++++++
 .../pages/server-routes/email/email.page.html | 70 ++++++++++++++++
 .../pages/server-routes/email/email.page.scss |  9 ++
 .../pages/server-routes/email/email.page.ts   | 83 +++++++++++++++++++
 .../server-routes/server-routing.module.ts    |  7 +-
 .../server-show/server-show.page.ts           | 13 ++-
 .../pages/server-routes/wifi/wifi.page.html   |  2 +-
 .../ui/src/app/services/api/api.types.ts      | 11 +++
 .../app/services/api/embassy-api.service.ts   |  8 ++
 .../services/api/embassy-live-api.service.ts  | 14 ++++
 .../services/api/embassy-mock-api.service.ts  | 35 ++++++++
 21 files changed, 389 insertions(+), 21 deletions(-)
 create mode 100644 sdk/base/lib/osBindings/TestSmtpParams.ts
 create mode 100644 web/projects/ui/src/app/pages/server-routes/email/email.module.ts
 create mode 100644 web/projects/ui/src/app/pages/server-routes/email/email.page.html
 create mode 100644 web/projects/ui/src/app/pages/server-routes/email/email.page.scss
 create mode 100644 web/projects/ui/src/app/pages/server-routes/email/email.page.ts

diff --git a/core/startos/src/bins/registry.rs b/core/startos/src/bins/registry.rs
index 9c2cd2b92..a71b737af 100644
--- a/core/startos/src/bins/registry.rs
+++ b/core/startos/src/bins/registry.rs
@@ -1,7 +1,7 @@
 use std::ffi::OsString;
 
 use clap::Parser;
-use futures::{FutureExt};
+use futures::FutureExt;
 use tokio::signal::unix::signal;
 use tracing::instrument;
 
diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs
index 6ab0529c2..ad214da34 100644
--- a/core/startos/src/lib.rs
+++ b/core/startos/src/lib.rs
@@ -302,9 +302,9 @@ pub fn server<C: Context>() -> ParentHandler<C> {
         )
         .subcommand(
             "test-smtp", 
-            from_fn_async(system::test_system_smtp)
+            from_fn_async(system::test_smtp)
                 .no_display()
-                .with_about("Send test email using system smtp server and credentials")
+                .with_about("Send test email using provided smtp server and credentials")
                 .with_call_remote::<CliContext>()
         )
         .subcommand(
diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs
index e44431894..123fdec42 100644
--- a/core/startos/src/system.rs
+++ b/core/startos/src/system.rs
@@ -7,7 +7,7 @@ use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::FutureExt;
 use imbl::vector;
-use mail_send::mail_builder::MessageBuilder;
+use mail_send::mail_builder::{self, MessageBuilder};
 use mail_send::SmtpClientBuilder;
 use rpc_toolkit::{from_fn_async, Context, Empty, HandlerExt, ParentHandler};
 use rustls::crypto::CryptoProvider;
@@ -878,15 +878,33 @@ pub async fn clear_system_smtp(ctx: RpcContext) -> Result<(), Error> {
     }
     Ok(())
 }
-pub async fn test_system_smtp(
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct TestSmtpParams {
+    #[arg(long)]
+    pub server: String,
+    #[arg(long)]
+    pub port: u16,
+    #[arg(long)]
+    pub from: String,
+    #[arg(long)]
+    pub to: String,
+    #[arg(long)]
+    pub login: String,
+    #[arg(long)]
+    pub password: Option<String>,
+}
+pub async fn test_smtp(
     _: RpcContext,
-    SmtpValue {
+    TestSmtpParams {
         server,
         port,
         from,
+        to,
         login,
         password,
-    }: SmtpValue,
+    }: TestSmtpParams,
 ) -> Result<(), Error> {
     use rustls_pki_types::pem::PemObject;
 
@@ -913,17 +931,35 @@ pub async fn test_system_smtp(
     );
     let client = SmtpClientBuilder::new_with_tls_config(server, port, cfg)
         .implicit_tls(false)
-        .credentials((login.clone().split_once("@").unwrap().0.to_owned(), pass_val));
+        .credentials((login.split("@").next().unwrap().to_owned(), pass_val));
+
+    fn parse_address<'a>(addr: &'a str) -> mail_builder::headers::address::Address<'a> {
+        if addr.find("<").map_or(false, |start| {
+            addr.find(">").map_or(false, |end| start < end)
+        }) {
+            addr.split_once("<")
+                .map(|(name, addr)| (name.trim(), addr.strip_suffix(">").unwrap_or(addr)))
+                .unwrap()
+                .into()
+        } else {
+            addr.into()
+        }
+    }
 
     let message = MessageBuilder::new()
-        .from((from.clone(), login.clone()))
-        .to(vec![(from, login)])
+        .from(parse_address(&from))
+        .to(parse_address(&to))
         .subject("StartOS Test Email")
         .text_body("This is a test email sent from your StartOS Server");
     client
         .connect()
         .await
-        .map_err(|e| Error::new(eyre!("mail-send connection error: {:?}", e), ErrorKind::Unknown))?
+        .map_err(|e| {
+            Error::new(
+                eyre!("mail-send connection error: {:?}", e),
+                ErrorKind::Unknown,
+            )
+        })?
         .send(message)
         .await
         .map_err(|e| Error::new(eyre!("mail-send send error: {:?}", e), ErrorKind::Unknown))?;
diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs
index e8d5f2249..ff7c3da99 100644
--- a/core/startos/src/version/mod.rs
+++ b/core/startos/src/version/mod.rs
@@ -7,7 +7,7 @@ use futures::future::BoxFuture;
 use futures::{Future, FutureExt};
 use imbl::Vector;
 use imbl_value::{to_value, InternedString};
-use patch_db::json_ptr::{ ROOT};
+use patch_db::json_ptr::ROOT;
 
 use crate::context::RpcContext;
 use crate::prelude::*;
diff --git a/sdk/base/lib/actions/input/inputSpecConstants.ts b/sdk/base/lib/actions/input/inputSpecConstants.ts
index 57bf8a79b..64857d419 100644
--- a/sdk/base/lib/actions/input/inputSpecConstants.ts
+++ b/sdk/base/lib/actions/input/inputSpecConstants.ts
@@ -25,9 +25,9 @@ export const customSmtp = InputSpec.of<InputSpecOf<SmtpValue>, never>({
     name: "From Address",
     required: true,
     default: null,
-    placeholder: "<name>test@example.com",
+    placeholder: "Example Name <test@example.com>",
     inputmode: "email",
-    patterns: [Patterns.email],
+    patterns: [Patterns.emailWithName],
   }),
   login: Value.text({
     name: "Login",
diff --git a/sdk/base/lib/osBindings/TestSmtpParams.ts b/sdk/base/lib/osBindings/TestSmtpParams.ts
new file mode 100644
index 000000000..06b218a34
--- /dev/null
+++ b/sdk/base/lib/osBindings/TestSmtpParams.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type TestSmtpParams = {
+  server: string
+  port: number
+  from: string
+  to: string
+  login: string
+  password: string | null
+}
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index 6eff86872..c8b49d00a 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -186,6 +186,7 @@ export { SignAssetParams } from "./SignAssetParams"
 export { SignerInfo } from "./SignerInfo"
 export { SmtpValue } from "./SmtpValue"
 export { StartStop } from "./StartStop"
+export { TestSmtpParams } from "./TestSmtpParams"
 export { UnsetPublicParams } from "./UnsetPublicParams"
 export { UpdatingState } from "./UpdatingState"
 export { VerifyCifsParams } from "./VerifyCifsParams"
diff --git a/sdk/base/lib/util/patterns.ts b/sdk/base/lib/util/patterns.ts
index c117c89e5..46f67b6b8 100644
--- a/sdk/base/lib/util/patterns.ts
+++ b/sdk/base/lib/util/patterns.ts
@@ -52,6 +52,11 @@ export const email: Pattern = {
   description: "Must be a valid email address",
 }
 
+export const emailWithName: Pattern = {
+  regex: regexes.emailWithName.source,
+  description: "Must be a valid email address, optionally with a name",
+}
+
 export const base64: Pattern = {
   regex: regexes.base64.source,
   description:
diff --git a/sdk/base/lib/util/regexes.ts b/sdk/base/lib/util/regexes.ts
index f26196381..e4e11766a 100644
--- a/sdk/base/lib/util/regexes.ts
+++ b/sdk/base/lib/util/regexes.ts
@@ -26,8 +26,12 @@ export const torUrl =
 // https://ihateregex.io/expr/ascii/
 export const ascii = /^[ -~]*$/
 
-//https://ihateregex.io/expr/email/
-export const email = /[^@ \t\r\n]+@[^@ \t\r\n]+\.[^@ \t\r\n]+/
+// https://www.regular-expressions.info/email.html
+export const email = /[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}/
+
+export const emailWithName = new RegExp(
+  `(${email.source})|([^<]*<(${email.source})>)`,
+)
 
 //https://rgxdb.com/r/1NUN74O6
 export const base64 =
diff --git a/web/package-lock.json b/web/package-lock.json
index 1c34d8dc8..ee7a93d8d 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -116,7 +116,33 @@
         "rxjs": ">=7.0.0"
       }
     },
-    "../sdk/baseDist": {},
+    "../sdk/baseDist": {
+      "name": "@start9labs/start-sdk-base",
+      "license": "MIT",
+      "dependencies": {
+        "@iarna/toml": "^2.2.5",
+        "@noble/curves": "^1.4.0",
+        "@noble/hashes": "^1.4.0",
+        "isomorphic-fetch": "^3.0.0",
+        "lodash.merge": "^4.6.2",
+        "mime-types": "^2.1.35",
+        "ts-matches": "^6.1.0",
+        "yaml": "^2.2.2"
+      },
+      "devDependencies": {
+        "@types/jest": "^29.4.0",
+        "@types/lodash.merge": "^4.6.2",
+        "@types/mime-types": "^2.1.4",
+        "jest": "^29.4.3",
+        "peggy": "^3.0.2",
+        "prettier": "^3.2.5",
+        "ts-jest": "^29.0.5",
+        "ts-node": "^10.9.1",
+        "ts-pegjs": "^4.2.1",
+        "tsx": "^4.7.1",
+        "typescript": "^5.0.4"
+      }
+    },
     "node_modules/@adobe/css-tools": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.1.tgz",
diff --git a/web/projects/ui/src/app/pages/server-routes/email/email.module.ts b/web/projects/ui/src/app/pages/server-routes/email/email.module.ts
new file mode 100644
index 000000000..f6b0c735d
--- /dev/null
+++ b/web/projects/ui/src/app/pages/server-routes/email/email.module.ts
@@ -0,0 +1,42 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { Routes, RouterModule } from '@angular/router'
+import { TuiInputModule } from '@taiga-ui/kit'
+import {
+  TuiNotificationModule,
+  TuiTextfieldControllerModule,
+} from '@taiga-ui/core'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { EmailPage } from './email.page'
+import { FormModule } from 'src/app/components/form/form.module'
+import { IonicModule } from '@ionic/angular'
+import { TuiErrorModule, TuiModeModule } from '@taiga-ui/core'
+import { TuiAppearanceModule, TuiButtonModule } from '@taiga-ui/experimental'
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EmailPage,
+  },
+]
+
+@NgModule({
+  imports: [
+    CommonModule,
+    IonicModule,
+    RouterModule.forChild(routes),
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    TuiButtonModule,
+    TuiInputModule,
+    FormModule,
+    TuiNotificationModule,
+    TuiTextfieldControllerModule,
+    TuiAppearanceModule,
+    TuiModeModule,
+    TuiErrorModule,
+  ],
+  declarations: [EmailPage],
+})
+export class EmailPageModule {}
diff --git a/web/projects/ui/src/app/pages/server-routes/email/email.page.html b/web/projects/ui/src/app/pages/server-routes/email/email.page.html
new file mode 100644
index 000000000..5e0e58fa4
--- /dev/null
+++ b/web/projects/ui/src/app/pages/server-routes/email/email.page.html
@@ -0,0 +1,70 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>Email</ion-title>
+    <ion-buttons slot="start">
+      <ion-back-button defaultHref="system"></ion-back-button>
+    </ion-buttons>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content class="ion-padding">
+  <tui-notification>
+    Fill out the form below to connect to an external SMTP server. With your
+    permission, installed services can use the SMTP server to send emails. To
+    grant permission to a particular service, visit that service's "Actions"
+    page. Not all services support sending emails.
+    <a
+      href="https://docs.start9.com/latest/user-manual/0.3.5.x/smtp"
+      target="_blank"
+      rel="noreferrer"
+    >
+      View instructions
+    </a>
+  </tui-notification>
+  <ng-container *ngIf="form$ | async as form">
+    <form [formGroup]="form" [style.text-align]="'right'">
+      <h3 class="g-title">SMTP Credentials</h3>
+      <form-group
+        *ngIf="spec | async as resolved"
+        [spec]="resolved"
+      ></form-group>
+      <button
+        *ngIf="isSaved"
+        tuiButton
+        appearance="destructive"
+        [style.margin-top.rem]="1"
+        [style.margin-right.rem]="1"
+        (click)="save(null)"
+      >
+        Delete
+      </button>
+      <button
+        tuiButton
+        [style.margin-top.rem]="1"
+        [disabled]="form.invalid"
+        (click)="save(form.value)"
+      >
+        Save
+      </button>
+    </form>
+    <form [style.text-align]="'right'">
+      <h3 class="g-title">Send Test Email</h3>
+      <tui-input
+        [(ngModel)]="testAddress"
+        [ngModelOptions]="{ standalone: true }"
+      >
+        To Address
+        <input tuiTextfield inputmode="email" />
+      </tui-input>
+      <button
+        tuiButton
+        appearance="secondary"
+        [style.margin-top.rem]="1"
+        [disabled]="!testAddress || form.invalid"
+        (click)="sendTestEmail(form.value)"
+      >
+        Send
+      </button>
+    </form>
+  </ng-container>
+</ion-content>
diff --git a/web/projects/ui/src/app/pages/server-routes/email/email.page.scss b/web/projects/ui/src/app/pages/server-routes/email/email.page.scss
new file mode 100644
index 000000000..b15986fc9
--- /dev/null
+++ b/web/projects/ui/src/app/pages/server-routes/email/email.page.scss
@@ -0,0 +1,9 @@
+form {
+  padding-top: 24px;
+  margin: auto;
+  max-width: 30rem;
+}
+
+h3 {
+  display: flex;
+}
\ No newline at end of file
diff --git a/web/projects/ui/src/app/pages/server-routes/email/email.page.ts b/web/projects/ui/src/app/pages/server-routes/email/email.page.ts
new file mode 100644
index 000000000..ebe59742e
--- /dev/null
+++ b/web/projects/ui/src/app/pages/server-routes/email/email.page.ts
@@ -0,0 +1,83 @@
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
+import { ErrorService, LoadingService } from '@start9labs/shared'
+import { IST, inputSpec } from '@start9labs/start-sdk'
+import { TuiDialogService } from '@taiga-ui/core'
+import { PatchDB } from 'patch-db-client'
+import { switchMap, tap } from 'rxjs'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { FormService } from 'src/app/services/form.service'
+import { DataModel } from 'src/app/services/patch-db/data-model'
+import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
+
+@Component({
+  selector: 'email-page',
+  templateUrl: './email.page.html',
+  styleUrls: ['./email.page.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EmailPage {
+  private readonly dialogs = inject(TuiDialogService)
+  private readonly loader = inject(LoadingService)
+  private readonly errorService = inject(ErrorService)
+  private readonly formService = inject(FormService)
+  private readonly patch = inject<PatchDB<DataModel>>(PatchDB)
+  private readonly api = inject(ApiService)
+
+  isSaved = false
+  testAddress = ''
+
+  readonly spec: Promise<IST.InputSpec> = configBuilderToSpec(
+    inputSpec.constants.customSmtp,
+  )
+  readonly form$ = this.patch.watch$('serverInfo', 'smtp').pipe(
+    tap(value => (this.isSaved = !!value)),
+    switchMap(async value =>
+      this.formService.createForm(await this.spec, value),
+    ),
+  )
+
+  async save(
+    value: typeof inputSpec.constants.customSmtp._TYPE | null,
+  ): Promise<void> {
+    const loader = this.loader.open('Saving...').subscribe()
+
+    try {
+      if (value) {
+        await this.api.setSmtp(value)
+        this.isSaved = true
+      } else {
+        await this.api.clearSmtp({})
+        this.isSaved = false
+      }
+    } catch (e: any) {
+      this.errorService.handleError(e)
+    } finally {
+      loader.unsubscribe()
+    }
+  }
+
+  async sendTestEmail(value: typeof inputSpec.constants.customSmtp._TYPE) {
+    const loader = this.loader.open('Sending email...').subscribe()
+
+    try {
+      await this.api.testSmtp({
+        to: this.testAddress,
+        ...value,
+      })
+    } catch (e: any) {
+      this.errorService.handleError(e)
+    } finally {
+      loader.unsubscribe()
+    }
+
+    this.dialogs
+      .open(
+        `A test email has been sent to ${this.testAddress}.<br /><br /><b>Check your spam folder and mark as not spam</b>`,
+        {
+          label: 'Success',
+          size: 's',
+        },
+      )
+      .subscribe()
+  }
+}
diff --git a/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts b/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
index 945f1b1c9..004bd53b1 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-routing.module.ts
@@ -76,10 +76,15 @@ const routes: Routes = [
       import('./ssh-keys/ssh-keys.module').then(m => m.SSHKeysPageModule),
   },
   {
-    path: 'wireless',
+    path: 'wifi',
     loadChildren: () =>
       import('./wifi/wifi.module').then(m => m.WifiPageModule),
   },
+  {
+    path: 'email',
+    loadChildren: () =>
+      import('./email/email.module').then(m => m.EmailPageModule),
+  },
 ]
 
 @NgModule({
diff --git a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 3b89deba3..fa3f26702 100644
--- a/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/web/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -463,6 +463,15 @@ export class ServerShowPage {
         detail: true,
         disabled$: of(false),
       },
+      {
+        title: 'Email',
+        description: 'Connect to an external SMTP server for sending emails',
+        icon: 'mail-outline',
+        action: () =>
+          this.navCtrl.navigateForward(['email'], { relativeTo: this.route }),
+        detail: true,
+        disabled$: of(false),
+      },
       {
         title: 'SSH',
         description:
@@ -474,12 +483,12 @@ export class ServerShowPage {
         disabled$: of(false),
       },
       {
-        title: 'Wireless',
+        title: 'WiFi',
         description:
           'Connect your server to WiFi instead of Ethernet (not recommended)',
         icon: 'wifi',
         action: () =>
-          this.navCtrl.navigateForward(['wireless'], {
+          this.navCtrl.navigateForward(['wifi'], {
             relativeTo: this.route,
           }),
         detail: true,
diff --git a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
index 1ddb44225..ce5ceb56f 100644
--- a/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/web/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -3,7 +3,7 @@
     <ion-buttons slot="start">
       <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
-    <ion-title>Wireless Settings</ion-title>
+    <ion-title>WiFi Settings</ion-title>
     <ion-buttons slot="end" *ngIf="hasWifi$ | async">
       <ion-button (click)="getWifi()">
         Refresh
diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts
index 9120a2df7..bae63b12a 100644
--- a/web/projects/ui/src/app/services/api/api.types.ts
+++ b/web/projects/ui/src/app/services/api/api.types.ts
@@ -102,6 +102,17 @@ export module RR {
   } // net.tor.reset
   export type ResetTorRes = null
 
+  // smtp
+
+  export type SetSMTPReq = T.SmtpValue // server.set-smtp
+  export type SetSMTPRes = null
+
+  export type ClearSMTPReq = {} // server.clear-smtp
+  export type ClearSMTPRes = null
+
+  export type TestSMTPReq = SetSMTPReq & { to: string } // server.test-smtp
+  export type TestSMTPRes = null
+
   // sessions
 
   export type GetSessionsReq = {} // sessions.list
diff --git a/web/projects/ui/src/app/services/api/embassy-api.service.ts b/web/projects/ui/src/app/services/api/embassy-api.service.ts
index 551011533..5bbd4238a 100644
--- a/web/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -128,6 +128,14 @@ export abstract class ApiService {
 
   abstract resetTor(params: RR.ResetTorReq): Promise<RR.ResetTorRes>
 
+  // smtp
+
+  abstract setSmtp(params: RR.SetSMTPReq): Promise<RR.SetSMTPRes>
+
+  abstract clearSmtp(params: RR.ClearSMTPReq): Promise<RR.ClearSMTPRes>
+
+  abstract testSmtp(params: RR.TestSMTPReq): Promise<RR.TestSMTPRes>
+
   // marketplace URLs
 
   abstract registryRequest<T>(
diff --git a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
index 9893585a4..f61b217bf 100644
--- a/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-live-api.service.ts
@@ -382,6 +382,20 @@ export class LiveApiService extends ApiService {
     return this.rpcRequest({ method: 'wifi.delete', params })
   }
 
+  // smtp
+
+  async setSmtp(params: RR.SetSMTPReq): Promise<RR.SetSMTPRes> {
+    return this.rpcRequest({ method: 'server.set-smtp', params })
+  }
+
+  async clearSmtp(params: RR.ClearSMTPReq): Promise<RR.ClearSMTPRes> {
+    return this.rpcRequest({ method: 'server.clear-smtp', params })
+  }
+
+  async testSmtp(params: RR.TestSMTPReq): Promise<RR.TestSMTPRes> {
+    return this.rpcRequest({ method: 'server.test-smtp', params })
+  }
+
   // ssh
 
   async getSshKeys(params: RR.GetSSHKeysReq): Promise<RR.GetSSHKeysRes> {
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 23296ad15..c2a30d1cb 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -557,6 +557,41 @@ export class MockApiService extends ApiService {
     return null
   }
 
+  // smtp
+
+  async setSmtp(params: RR.SetSMTPReq): Promise<RR.SetSMTPRes> {
+    await pauseFor(2000)
+    const patch = [
+      {
+        op: PatchOp.REPLACE,
+        path: '/serverInfo/smtp',
+        value: params,
+      },
+    ]
+    this.mockRevision(patch)
+
+    return null
+  }
+
+  async clearSmtp(params: RR.ClearSMTPReq): Promise<RR.ClearSMTPRes> {
+    await pauseFor(2000)
+    const patch = [
+      {
+        op: PatchOp.REPLACE,
+        path: '/serverInfo/smtp',
+        value: null,
+      },
+    ]
+    this.mockRevision(patch)
+
+    return null
+  }
+
+  async testSmtp(params: RR.TestSMTPReq): Promise<RR.TestSMTPRes> {
+    await pauseFor(2000)
+    return null
+  }
+
   // ssh
 
   async getSshKeys(params: RR.GetSSHKeysReq): Promise<RR.GetSSHKeysRes> {

From 5e103770fd83ce378397144d30518d1f9e28ff57 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:58:50 +0000
Subject: [PATCH 341/341] rename some things in the sdk (#2809)

* rename some things in the sdk

* fix docs

* rename some types exported from rust
---
 .../DockerProcedureContainer.ts                |  2 +-
 .../SystemForEmbassy/polyfillEffects.ts        |  6 +++---
 core/startos/src/net/host/address.rs           |  8 +++++++-
 core/startos/src/net/host/binding.rs           |  9 +++++----
 core/startos/src/net/network_interface.rs      |  4 ++--
 ...blicParams.ts => BindingSetPublicParams.ts} |  5 ++++-
 sdk/base/lib/osBindings/HostAddress.ts         | 11 +++++++++++
 .../NetworkInterfaceSetPublicParams.ts         |  6 ++++++
 sdk/base/lib/osBindings/index.ts               |  4 +++-
 sdk/package/lib/StartSdk.ts                    | 18 +++++++-----------
 sdk/package/lib/mainFn/CommandController.ts    |  2 +-
 sdk/package/lib/mainFn/Daemon.ts               |  2 +-
 sdk/package/lib/mainFn/Daemons.ts              |  2 +-
 sdk/package/lib/test/host.test.ts              |  2 +-
 sdk/package/lib/util/SubContainer.ts           | 10 +++++-----
 sdk/package/package-lock.json                  |  4 ++--
 sdk/package/package.json                       |  2 +-
 17 files changed, 61 insertions(+), 36 deletions(-)
 rename sdk/base/lib/osBindings/{SetPublicParams.ts => BindingSetPublicParams.ts} (55%)
 create mode 100644 sdk/base/lib/osBindings/HostAddress.ts
 create mode 100644 sdk/base/lib/osBindings/NetworkInterfaceSetPublicParams.ts

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
index 26e4dd8bf..806216786 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/DockerProcedureContainer.ts
@@ -43,7 +43,7 @@ export class DockerProcedureContainer {
   ) {
     const subcontainer = await SubContainer.of(
       effects,
-      { id: data.image },
+      { imageId: data.image },
       name,
     )
 
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
index 7438070ea..5cbec945a 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/polyfillEffects.ts
@@ -109,7 +109,7 @@ export const polyfillEffects = (
       return startSdk
         .runCommand(
           effects,
-          { id: manifest.main.image },
+          { imageId: manifest.main.image },
           commands,
           {},
           commands.join(" "),
@@ -165,7 +165,7 @@ export const polyfillEffects = (
       await startSdk
         .runCommand(
           effects,
-          { id: manifest.main.image },
+          { imageId: manifest.main.image },
           commands,
           {
             mounts: [
@@ -207,7 +207,7 @@ export const polyfillEffects = (
       await startSdk
         .runCommand(
           effects,
-          { id: manifest.main.image },
+          { imageId: manifest.main.image },
           commands,
           {
             mounts: [
diff --git a/core/startos/src/net/host/address.rs b/core/startos/src/net/host/address.rs
index 3d639b31e..fa41824a5 100644
--- a/core/startos/src/net/host/address.rs
+++ b/core/startos/src/net/host/address.rs
@@ -11,12 +11,18 @@ use crate::net::acme::AcmeProvider;
 use crate::prelude::*;
 use crate::util::serde::{display_serializable, HandlerExtSerde};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "kebab-case")]
+#[serde(rename_all_fields = "camelCase")]
+#[serde(tag = "kind")]
+#[ts(export)]
 pub enum HostAddress {
     Onion {
+        #[ts(type = "string")]
         address: OnionAddressV3,
     },
     Domain {
+        #[ts(type = "string")]
         address: InternedString,
         public: bool,
         acme: Option<AcmeProvider>,
diff --git a/core/startos/src/net/host/binding.rs b/core/startos/src/net/host/binding.rs
index d56f607a9..08f9f68c4 100644
--- a/core/startos/src/net/host/binding.rs
+++ b/core/startos/src/net/host/binding.rs
@@ -221,9 +221,10 @@ pub async fn list_bindings(
         .de()
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
-pub struct SetPublicParams {
+#[ts(export)]
+pub struct BindingSetPublicParams {
     internal_port: u16,
     #[arg(long)]
     public: Option<bool>,
@@ -231,10 +232,10 @@ pub struct SetPublicParams {
 
 pub async fn set_public(
     ctx: RpcContext,
-    SetPublicParams {
+    BindingSetPublicParams {
         internal_port,
         public,
-    }: SetPublicParams,
+    }: BindingSetPublicParams,
     (package, host): (PackageId, HostId),
 ) -> Result<(), Error> {
     ctx.db
diff --git a/core/startos/src/net/network_interface.rs b/core/startos/src/net/network_interface.rs
index 4f7696c97..920bdd4e4 100644
--- a/core/startos/src/net/network_interface.rs
+++ b/core/startos/src/net/network_interface.rs
@@ -114,7 +114,7 @@ async fn list_interfaces(
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
 #[ts(export)]
-struct SetPublicParams {
+struct NetworkInterfaceSetPublicParams {
     #[ts(type = "string")]
     interface: InternedString,
     public: Option<bool>,
@@ -122,7 +122,7 @@ struct SetPublicParams {
 
 async fn set_public(
     ctx: RpcContext,
-    SetPublicParams { interface, public }: SetPublicParams,
+    NetworkInterfaceSetPublicParams { interface, public }: NetworkInterfaceSetPublicParams,
 ) -> Result<(), Error> {
     ctx.net_controller
         .net_iface
diff --git a/sdk/base/lib/osBindings/SetPublicParams.ts b/sdk/base/lib/osBindings/BindingSetPublicParams.ts
similarity index 55%
rename from sdk/base/lib/osBindings/SetPublicParams.ts
rename to sdk/base/lib/osBindings/BindingSetPublicParams.ts
index 03bc3082b..077cf8510 100644
--- a/sdk/base/lib/osBindings/SetPublicParams.ts
+++ b/sdk/base/lib/osBindings/BindingSetPublicParams.ts
@@ -1,3 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type SetPublicParams = { interface: string; public: boolean | null }
+export type BindingSetPublicParams = {
+  internalPort: number
+  public: boolean | null
+}
diff --git a/sdk/base/lib/osBindings/HostAddress.ts b/sdk/base/lib/osBindings/HostAddress.ts
new file mode 100644
index 000000000..fe16c89d7
--- /dev/null
+++ b/sdk/base/lib/osBindings/HostAddress.ts
@@ -0,0 +1,11 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AcmeProvider } from "./AcmeProvider"
+
+export type HostAddress =
+  | { kind: "onion"; address: string }
+  | {
+      kind: "domain"
+      address: string
+      public: boolean
+      acme: AcmeProvider | null
+    }
diff --git a/sdk/base/lib/osBindings/NetworkInterfaceSetPublicParams.ts b/sdk/base/lib/osBindings/NetworkInterfaceSetPublicParams.ts
new file mode 100644
index 000000000..516bfc817
--- /dev/null
+++ b/sdk/base/lib/osBindings/NetworkInterfaceSetPublicParams.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type NetworkInterfaceSetPublicParams = {
+  interface: string
+  public: boolean | null
+}
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index c8b49d00a..3c16f6e70 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -38,6 +38,7 @@ export { BackupTargetFS } from "./BackupTargetFS"
 export { Base64 } from "./Base64"
 export { BindId } from "./BindId"
 export { BindInfo } from "./BindInfo"
+export { BindingSetPublicParams } from "./BindingSetPublicParams"
 export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
 export { Blake3Commitment } from "./Blake3Commitment"
@@ -97,6 +98,7 @@ export { Governor } from "./Governor"
 export { Guid } from "./Guid"
 export { HardwareRequirements } from "./HardwareRequirements"
 export { HealthCheckId } from "./HealthCheckId"
+export { HostAddress } from "./HostAddress"
 export { HostId } from "./HostId"
 export { HostKind } from "./HostKind"
 export { HostnameInfo } from "./HostnameInfo"
@@ -131,6 +133,7 @@ export { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 export { NamedProgress } from "./NamedProgress"
 export { NetInfo } from "./NetInfo"
 export { NetworkInterfaceInfo } from "./NetworkInterfaceInfo"
+export { NetworkInterfaceSetPublicParams } from "./NetworkInterfaceSetPublicParams"
 export { NetworkInterfaceType } from "./NetworkInterfaceType"
 export { OnionHostname } from "./OnionHostname"
 export { OsIndex } from "./OsIndex"
@@ -176,7 +179,6 @@ export { SetIconParams } from "./SetIconParams"
 export { SetMainStatusStatus } from "./SetMainStatusStatus"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetNameParams } from "./SetNameParams"
-export { SetPublicParams } from "./SetPublicParams"
 export { SetStoreParams } from "./SetStoreParams"
 export { SetupExecuteParams } from "./SetupExecuteParams"
 export { SetupProgress } from "./SetupProgress"
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index 65ef23883..667e4297b 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -215,18 +215,14 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           }),
       },
 
-      host: {
-        // static: (effects: Effects, id: string) =>
-        //   new StaticHost({ id, effects }),
-        // single: (effects: Effects, id: string) =>
-        //   new SingleHost({ id, effects }),
-        multi: (effects: Effects, id: string) => new MultiHost({ id, effects }),
+      MultiHost: {
+        of: (effects: Effects, id: string) => new MultiHost({ id, effects }),
       },
       nullIfEmpty,
       runCommand: async <A extends string>(
         effects: Effects,
         image: {
-          id: keyof Manifest["images"] & T.ImageId
+          imageId: keyof Manifest["images"] & T.ImageId
           sharedRun?: boolean
         },
         command: T.CommandType,
@@ -548,7 +544,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
           inputSpecSpec,
           async ({ effects, input }) => {
             // ** UI multi-host **
-            const uiMulti = sdk.host.multi(effects, 'ui-multi')
+            const uiMulti = sdk.MultiHost.of(effects, 'ui-multi')
             const uiMultiOrigin = await uiMulti.bindPort(80, {
               protocol: 'http',
             })
@@ -580,7 +576,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             const uiReceipt = await uiMultiOrigin.export([primaryUi, adminUi])
        
             // ** API multi-host **
-            const apiMulti = sdk.host.multi(effects, 'api-multi')
+            const apiMulti = sdk.MultiHost.of(effects, 'api-multi')
             const apiMultiOrigin = await apiMulti.bindPort(5959, {
               protocol: 'http',
             })
@@ -685,7 +681,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
         of(
           effects: Effects,
           image: {
-            id: T.ImageId & keyof Manifest["images"]
+            imageId: T.ImageId & keyof Manifest["images"]
             sharedRun?: boolean
           },
           name: string,
@@ -1414,7 +1410,7 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
 
 export async function runCommand<Manifest extends T.SDKManifest>(
   effects: Effects,
-  image: { id: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean },
+  image: { imageId: keyof Manifest["images"] & T.ImageId; sharedRun?: boolean },
   command: string | [string, ...string[]],
   options: CommandOptions & {
     mounts?: { path: string; options: MountOptions }[]
diff --git a/sdk/package/lib/mainFn/CommandController.ts b/sdk/package/lib/mainFn/CommandController.ts
index 498de2843..a7375b369 100644
--- a/sdk/package/lib/mainFn/CommandController.ts
+++ b/sdk/package/lib/mainFn/CommandController.ts
@@ -23,7 +23,7 @@ export class CommandController {
       effects: T.Effects,
       subcontainer:
         | {
-            id: keyof Manifest["images"] & T.ImageId
+            imageId: keyof Manifest["images"] & T.ImageId
             sharedRun?: boolean
           }
         | SubContainer,
diff --git a/sdk/package/lib/mainFn/Daemon.ts b/sdk/package/lib/mainFn/Daemon.ts
index 0cbc9cd94..864ae4122 100644
--- a/sdk/package/lib/mainFn/Daemon.ts
+++ b/sdk/package/lib/mainFn/Daemon.ts
@@ -22,7 +22,7 @@ export class Daemon {
       effects: T.Effects,
       subcontainer:
         | {
-            id: keyof Manifest["images"] & T.ImageId
+            imageId: keyof Manifest["images"] & T.ImageId
             sharedRun?: boolean
           }
         | SubContainer,
diff --git a/sdk/package/lib/mainFn/Daemons.ts b/sdk/package/lib/mainFn/Daemons.ts
index e18fa2314..8d0e6297a 100644
--- a/sdk/package/lib/mainFn/Daemons.ts
+++ b/sdk/package/lib/mainFn/Daemons.ts
@@ -53,7 +53,7 @@ type DaemonsParams<
   subcontainer:
     | {
         /** The ID of the image. Must be one of the image IDs declared in the manifest */
-        id: keyof Manifest["images"] & T.ImageId
+        imageId: keyof Manifest["images"] & T.ImageId
         /**
          * Whether or not to share the `/run` directory with the parent container.
          * This is useful if you are trying to connect to a service that exposes a unix domain socket or auth cookie via the `/run` directory
diff --git a/sdk/package/lib/test/host.test.ts b/sdk/package/lib/test/host.test.ts
index 4492804ec..88ca7c4b6 100644
--- a/sdk/package/lib/test/host.test.ts
+++ b/sdk/package/lib/test/host.test.ts
@@ -5,7 +5,7 @@ import { sdk } from "../test/output.sdk"
 describe("host", () => {
   test("Testing that the types work", () => {
     async function test(effects: Effects) {
-      const foo = sdk.host.multi(effects, "foo")
+      const foo = sdk.MultiHost.of(effects, "foo")
       const fooOrigin = await foo.bindPort(80, {
         protocol: "http" as const,
         preferredExternalPort: 80,
diff --git a/sdk/package/lib/util/SubContainer.ts b/sdk/package/lib/util/SubContainer.ts
index f9b5a1084..77b31fec8 100644
--- a/sdk/package/lib/util/SubContainer.ts
+++ b/sdk/package/lib/util/SubContainer.ts
@@ -86,12 +86,12 @@ export class SubContainer implements ExecSpawnable {
   }
   static async of(
     effects: T.Effects,
-    image: { id: T.ImageId; sharedRun?: boolean },
+    image: { imageId: T.ImageId; sharedRun?: boolean },
     name: string,
   ) {
-    const { id, sharedRun } = image
+    const { imageId, sharedRun } = image
     const [rootfs, guid] = await effects.subcontainer.createFs({
-      imageId: id as string,
+      imageId,
       name,
     })
 
@@ -111,12 +111,12 @@ export class SubContainer implements ExecSpawnable {
       await execFile("mount", ["--rbind", from, to])
     }
 
-    return new SubContainer(effects, id, rootfs, guid)
+    return new SubContainer(effects, imageId, rootfs, guid)
   }
 
   static async with<T>(
     effects: T.Effects,
-    image: { id: T.ImageId; sharedRun?: boolean },
+    image: { imageId: T.ImageId; sharedRun?: boolean },
     mounts: { options: MountOptions; path: string }[],
     name: string,
     fn: (subContainer: SubContainer) => Promise<T>,
diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
index 58a37e357..6f2cf74d8 100644
--- a/sdk/package/package-lock.json
+++ b/sdk/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-beta.3",
+  "version": "0.3.6-beta.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-beta.3",
+      "version": "0.3.6-beta.4",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/sdk/package/package.json b/sdk/package/package.json
index 1a68b9d1b..5e80f5a94 100644
--- a/sdk/package/package.json
+++ b/sdk/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-beta.3",
+  "version": "0.3.6-beta.4",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",